Merge pull request #1094 from rpspringuel/release-4.1

Release 4.1.2

.gitignore

@@ -120,3 +120,5 @@ macosx/build
 macosx/Resources
 res.txt
 *.rc
+gregorio-*
+ctan

.gregorio-version

@@ -1,4 +1,4 @@
-4.1.1
+4.1.2
 
 *** Do not modify this file. ***
 Use VersionManager.py to change the version.

CHANGELOG.md

@@ -2,7 +2,10 @@
 All notable changes to this project will be documented in this file.
 As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). It follows [some conventions](http://keepachangelog.com/).
 
-[Unreleased][unreleased]
+## [4.1.2] - 2016-05-08
+### Changed
+- The parmesan font is now called granapadano.  If you were using `\gresetgregoriofont{parmesan}`, you should now use `\gresetgregoriofont{granapadano}`.  See [#1075](https://github.com/gregorio-project/gregorio/issues/1075).
+- GregorioTeX is now compatible with TeXLive 2016
 
 
 ## [4.1.1] - 2016-03-10

UPGRADE.md

@@ -2,7 +2,26 @@
 
 This file contains instructions to upgrade to a new release of Gregorio.
 
-## Unreleased
+## 4.1.2
+
+### Changes to texmf tree
+
+To better comply with the TeXLive directory structure, the location of `gregoriotex.sty` and `gregoriosyms.sty` have changed.
+
+*Linux and other users installing from source:* `install-gtex.sh` should remove the old versions before installing the new one.
+
+*Mac users installing via pkg installer:* The installer does not attempt to remove the old versions before installing the new ones.  Please run Uninstall-Gregorio.pkg before installing 4.2 to ensure that the old versions don't cause any problems.
+
+*Windows users:* Your installer already should remove old versions of GregorioTeX before installing the new ones.
+
+As always, please file a bug report if you have any problems with the update process.
+
+
+### Parmesan font renamed to Grana Padano
+
+To avoid conflicts with the LilyPond Parmesan font, the Gregorio Parmesan font is now called Grana Padano.  If you were using `\gresetgregoriofont{parmesan}`, you should now use `\gresetgregoriofont{granapadano}`.
+
+## 4.1.1
 
 ### Vertical spacings
 

build-ctan.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env bash
 
-# Script to be executed by make ctan-dist
+# Script to be executed by make ctan
 
 VERSION=`head -1 .gregorio-version`
 FILEVERSION=`echo $VERSION | sed 's/\./_/g'`
@@ -38,5 +38,8 @@ zip -r ../gregorio-$VERSION.zip * --exclude=*.DS_Store*
 cd ..
 rm -rf gregorio-$VERSION
 cd ..
-zip -r ../gregoriotex.zip gregoriotex gregoriotex.tds.zip
+zip -r ../gregoriotex.ctan.zip gregoriotex gregoriotex.tds.zip --exclude=*.DS_Store*
 cd ..
+rm -rf ctan
+rm gregorio-$VERSION.tar.bz2
+rm gregoriotex.tds.zip

configure.ac

@@ -16,8 +16,8 @@ dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([gregorio],[4.1.1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="4_1_1"
+AC_INIT([gregorio],[4.1.2],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="4_1_2"
 AC_SUBST(FILENAME_VERSION)
 AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
 MK=""
@@ -105,6 +105,7 @@ AC_CONFIG_FILES([
     src/Makefile
     examples/Makefile
     contrib/Makefile
+    contrib/TeXShop/Makefile
     doc/Makefile
     tex/Makefile
     fonts/Makefile

contrib/Makefile.am

@@ -15,4 +15,6 @@
 # You should have received a copy of the GNU General Public License
 # along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
 
-EXTRA_DIST = gprocess gabc.xml gabc.lang gabc.vim 900_gregorio.xml gregorio-scribus.lua gregorio.png gabc-syntax.plist README.md TeXShop system-setup.command system-setup.bat config-texworks.command
+SUBDIRS = TeXShop
+
+EXTRA_DIST = gprocess gabc.xml gabc.lang gabc.vim 900_gregorio.xml gregorio-scribus.lua gregorio.png gabc-syntax.plist README.md system-setup.command system-setup.bat config-texworks.command

contrib/TeXShop/Makefile.am

@@ -0,0 +1,18 @@
+# Copyright (C) 2006-2015 The Gregorio Project (see CONTRIBUTORS.md)
+#
+# This file is part of Gregorio.
+#
+# Gregorio is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Gregorio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
+
+EXTRA_DIST = auto-configure.command LuaLaTeX+se.engine

contrib/system-setup.bat

@@ -113,8 +113,8 @@ greextra.ttf ^
 gregorio.ttf ^
 gregorio-op.ttf ^
 gresym.ttf ^
-parmesan.ttf ^
-parmesan-op.ttf ^
+granapadano.ttf ^
+granapadano-op.ttf ^
 gregall.ttf ^
 gregsmodern.ttf
 

contrib/system-setup.command

@@ -141,8 +141,8 @@ greextra.ttf
 gregorio.ttf
 gregorio-op.ttf
 gresym.ttf
-parmesan.ttf
-parmesan-op.ttf
+granapadano.ttf
+granapadano-op.ttf
 gregall.ttf
 gregsmodern.ttf"
 

debian/copyright

@@ -11,7 +11,7 @@ Files: fonts/gregorio*
 Copyright: 2008-2015 The Gregorio Project
 License: GPL-3font+
 
-Files: fonts/parmesan*
+Files: fonts/granapadano*
 Copyright: 2008-2015 Juergen Reuter, the Gregorio Project
 License: GPL-3font+
 

doc/Appendix_Font_Tables.tex

@@ -7,7 +7,7 @@ \section{Font Glyph Tables}\label{glyphtable}
 \subsection{Score Font Glyphs}
 
 The following table lists all of the score glyphs available in the greciliae,
-gregorio, and parmesan fonts, and any variant glyphs contained within.  If a
+gregorio, and granapadano fonts, and any variant glyphs contained within.  If a
 variant glyph is unavailable in a given font, it will be listed as
 {\itshape\small N/A} under the appropriate column.  Some of the glyphs listed
 are representative of sets of glyphs differentiated by the ambitus of the
@@ -28,11 +28,11 @@ \subsection{Score Font Glyphs}
       {\scriptsize\bfseries Sample gabc}&%
       {\scriptsize\bfseries greciliae}&%
       {\scriptsize\bfseries gregorio}&%
-      {\scriptsize\bfseries parmesan}&%
+      {\scriptsize\bfseries granapadano}&%
       {\scriptsize\bfseries Name}&%
       {\scriptsize\bfseries greciliae}&%
       {\scriptsize\bfseries gregorio}&%
-      {\scriptsize\bfseries parmesan}\\
+      {\scriptsize\bfseries granapadano}\\
       \hline
     \endfirsthead
       &&&&&\multicolumn{4}{c}{\bfseries Variants}\\
@@ -41,25 +41,25 @@ \subsection{Score Font Glyphs}
       {\scriptsize\bfseries Sample gabc}&%
       {\scriptsize\bfseries greciliae}&%
       {\scriptsize\bfseries gregorio}&%
-      {\scriptsize\bfseries parmesan}&%
+      {\scriptsize\bfseries granapadano}&%
       {\scriptsize\bfseries Name}&%
       {\scriptsize\bfseries greciliae}&%
       {\scriptsize\bfseries gregorio}&%
-      {\scriptsize\bfseries parmesan}\\
+      {\scriptsize\bfseries granapadano}\\
       \hline
     \endhead
     \directlua{GregorioRef.emit_score_glyphs(#1)}
   \end{longtable}
 }%
-\ScoreFontTable{'greciliae','gregorio','parmesan'}
+\ScoreFontTable{'greciliae','gregorio','granapadano'}
 
 \subsection{Dominican Score Font Glyphs}
 
 The following table lists all of the score glyphs available in the Dominican
-versions of the greciliae, gregorio, and parmesan fonts in the same vein as
+versions of the greciliae, gregorio, and granapadano fonts in the same vein as
 the prior table.
 
-\ScoreFontTable{'greciliaeOp','gregorioOp','parmesanOp'}
+\ScoreFontTable{'greciliaeOp','gregorioOp','granapadanoOp'}
 
 \subsection{Extra Glyphs}\label{subsec:greextra}
 

doc/Command_Index_User.tex

@@ -381,7 +381,7 @@ \subsubsection{Staff Lines}
 
 
 \subsubsection{Score Font}
-Gregorio\TeX\ currently supports 3 different fonts for the glyphs in a score (neumes, clefs, alterations, \etc): Greciliae (a customized version of Caeciliae by Fr.\ Matthew Spencer, OSJ), Gregorio, and Parmesan (developed for Lilypond by Juergen Reuter).
+Gregorio\TeX\ currently supports 3 different fonts for the glyphs in a score (neumes, clefs, alterations, \etc): Greciliae (a customized version of Caeciliae by Fr.\ Matthew Spencer, OSJ), Gregorio, and Grana Padano (née Parmesan, developed for Lilypond by Juergen Reuter).
 
 \macroname{\textbackslash gresetgregoriofont}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
 Set the font used for the neumes.  The optional argument \texttt{[\#1]}
@@ -395,7 +395,7 @@ \subsubsection{Score Font}
   & \texttt{op} & Use the alternate Dominican font/rule set.\\
   \#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
   & \texttt{gregorio} & Use the Gregorio font.\\
-  & \texttt{parmesan} & Use the Parmesan font.\\
+  & \texttt{granapadano} & Use the Grana Padano font.\\
 \end{argtable}
 
 \macroname{\textbackslash gresetgregoriofontscaled}{[\optional{\#1}]\{\#2\}\{\#3\}}{gregoriotex-main.tex}
@@ -680,7 +680,7 @@ \subsubsection{Special Characters}
 \textbf{Nota Bene:} The same rules apply for \#1 as in \verb=\gresetspecial=.
 
 \macroname{\textbackslash gretilde}{}{gregoriotex-main.tex}
-Macro to print $\sim$.  This macro is set using the above for \texttt{<sp>~</sp>}.
+Macro to print $\sim$.  This macro is set using the above for \texttt{<sp>$\sim$</sp>}.
 
 
 
@@ -719,7 +719,7 @@ \subsubsection{Styling}
 \footnotemark[1]\textit{Special:} By default, \texttt{additionalstafflines} inherits its properties from \texttt{normalstafflines}.  To decouple these environments, you must manually change \texttt{additionalstafflines} using \texttt{\textbackslash grechangestyle}.
 \renewcommand{\thefootnote}{\arabic{footnote}}\breakabletrue
 
-\macroname{\textbackslash grechangestyle}{\{\#1\}\{\#2\}[\#3]}{gregoriotex.sty \textup{and} gregoriotex.tex}
+\macroname{\textbackslash grechangestyle}{\{\#1\}\{\#2\}[\optional{\#3}]}{gregoriotex.sty \textup{and} gregoriotex.tex}
 Command to change styling of a score element.
 
 \begin{argtable}
@@ -749,7 +749,7 @@ \subsubsection{Styling}
 \subsubsection{Text Elements}
 While the gabc headers provide support for some of the text elements commonly found on chant scores, Gregorio\TeX\ provides the following functions to allow you to enter and control those elements with a greater degree of precision than the gabc headers.
 
-\macroname{\textbackslash greannotation}{[\#1]\{\#2\}}{gregoriotex-main.tex}
+\macroname{\textbackslash greannotation}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
 Macro to add annotations (the text which appears above the initial) to a score.  While a single call of the function does not support multiple lines, successive calls to the function will be added to the annotation as a new line below what is already there.
 
 \begin{argtable}
@@ -761,7 +761,7 @@ \subsubsection{Text Elements}
 
 \textbf{Nota Bene:} The first argument does not affect the alignment of lines already in the annotation, only the way the new line aligns with the existing lines as a whole.
 
-\macroname{\textbackslash grecommentary}{[\optional{\#2}]\{\#1\}}{gregoriotex-main.tex}
+\macroname{\textbackslash grecommentary}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
 Macro to add commentary (the text flush right at the top, usually a scripture reference) to a score.  While a single call of this function does not support multiple lines, successive calls to the function will add a new line to the commentary directly below the previous.
 
 \begin{argtable}

doc/Command_Index_internal.tex

@@ -1076,7 +1076,7 @@ \section{Gregorio\TeX{} Controls}
   & \texttt{op} & Use the alternate Dominican font/rule set.\\
   \#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
   & \texttt{gregorio} & Use the Gregorio font.\\
-  & \texttt{parmesan} & Use the Parmesan font.\\
+  & \texttt{granapadano} & Use the Grana Padano font.\\
 \end{argtable}
 
 \macroname{\textbackslash gre@syllable@end}{\#1\#2\#3}{gregoriotex-syllable.tex}
@@ -1179,7 +1179,7 @@ \section{Gregorio\TeX{} Controls}
   & \texttt{op} & Use the alternate Dominican font/rule set.\\
   \#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
   & \texttt{gregorio} & Use the Gregorio font.\\
-  & \texttt{parmesan} & Use the Parmesan font.\\
+  & \texttt{granapadano} & Use the Grana Padano font.\\
   \#3 & integer & the scaling factor\\
 \end{argtable}
 
@@ -1253,7 +1253,7 @@ \subsection{Fonts}
 The font for the default initial format in Plain \TeX.
 
 \macroname{\textbackslash gre@fontfactor@...}{}{gregoriotex-main.tex}
-Macro holding the factor at which the font is loaded.  There is one of these macros for each chant font which has been loaded with the ending of the macro name being the name of the chant font (gregorio, parmesan, \etc).
+Macro holding the factor at which the font is loaded.  There is one of these macros for each chant font which has been loaded with the ending of the macro name being the name of the chant font (gregorio, granapadano, \etc).
 
 
 \subsection{Character Reference Aliases}

doc/GregorioRef.lua

@@ -234,11 +234,11 @@ local LIQUESCENCE = {
 
 GregorioRef = {}
 
-function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
+function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_granapadano)
   local common_glyphs = {}
   local greciliae = {}
   local gregorio = {}
-  local parmesan = {}
+  local granapadano = {}
 
   local function index_font(csname, variants, common)
     local glyphs = font.fonts[font.id(csname)].resources.unicodes
@@ -264,7 +264,7 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
 
   index_font(cs_greciliae, greciliae, common_glyphs)
   index_font(cs_gregorio, gregorio)
-  index_font(cs_parmesan, parmesan)
+  index_font(cs_granapadano, granapadano)
 
   local function maybe_emit_glyph(csname, variants, name, variant)
     local cp = variants[name]
@@ -307,10 +307,10 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
     end
     tex.sprint(string.format(
         [[{\scriptsize %s{\bfseries %s}{\itshape %s}%s%s}&{\ttfamily\small %s}&{\%s\char%d}&{\%s\char%d}&{\%s\char%d}&]],
-        fusion, shape, ambitus, debilis, liquescence, gabc or '', cs_greciliae, char, cs_gregorio, char, cs_parmesan, char
+        fusion, shape, ambitus, debilis, liquescence, gabc or '', cs_greciliae, char, cs_gregorio, char, cs_granapadano, char
     ))
     local emitted = false, i, variant
-    for i, variant in ipairs(sort_unique_keys{greciliae[name], gregorio[name], parmesan[name]}) do
+    for i, variant in ipairs(sort_unique_keys{greciliae[name], gregorio[name], granapadano[name]}) do
       if emitted then
         tex.sprint([[\nopagebreak&&&&&]])
       else
@@ -319,7 +319,7 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
       tex.sprint(string.format([[{\scriptsize %s}]], variant))
       maybe_emit_glyph('greciliae', greciliae, name, variant)
       maybe_emit_glyph('gregorio', gregorio, name, variant)
-      maybe_emit_glyph('parmesan', parmesan, name, variant)
+      maybe_emit_glyph('granapadano', granapadano, name, variant)
       tex.print([[\\]])
     end
     if not emitted then

doc/GregorioRef.tex

@@ -107,10 +107,10 @@
 % for the character tables
 \font\greciliae = {name:greciliae} at 1000000 sp\relax
 \font\gregorio = {name:gregorio} at 1000000 sp\relax
-\font\parmesan = {name:parmesan} at 1000000 sp\relax
+\font\granapadano = {name:granapadano} at 1000000 sp\relax
 \font\greciliaeOp = {name:greciliae-op} at 1000000 sp\relax
 \font\gregorioOp = {name:gregorio-op} at 1000000 sp\relax
-\font\parmesanOp = {name:parmesan-op} at 1000000 sp\relax
+\font\granapadanoOp = {name:granapadano-op} at 1000000 sp\relax
 \font\greextra = {name:greextra} at 12 pt\relax
 \newcommand{\excluded}[1]{{\tiny\itshape #1}}
 
@@ -152,7 +152,7 @@
 
     \vspace{1cm}
 
-    \large Version \textbf{4.1.1}, 10 March 2016 %% PARSE_VERSION_DATE
+    \large Version \textbf{4.1.2}, 8 May 2016 %% PARSE_VERSION_DATE
 
     \vspace{1.5cm}
   \end{center}

fonts/Makefile.am

@@ -18,10 +18,10 @@
 # You should have received a copy of the GNU General Public License
 # along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
 
-TTFFILES = gregorio.ttf greciliae.ttf parmesan.ttf \
-		   gregorio-op.ttf greciliae-op.ttf parmesan-op.ttf \
+TTFFILES = gregorio.ttf greciliae.ttf granapadano.ttf \
+		   gregorio-op.ttf greciliae-op.ttf granapadano-op.ttf \
 		   greextra.ttf gregall.ttf gresgmodern.ttf
-SOURCEFILES = gregorio-base.sfd parmesan-base.sfd greciliae-base.sfd \
+SOURCEFILES = gregorio-base.sfd granapadano-base.sfd greciliae-base.sfd \
 			  greextra.sfd gregall.sfd gresgmodern.sfd
 
 EXTRA_DIST = $(TTFFILES) $(SOURCEFILES) squarize.py stemsschemas.py convertsfdtottf.py README.md simplify.py

fonts/parmesan-base.sfd → fonts/granapadano-base.sfd

@@ -1,7 +1,7 @@
 SplineFontDB: 3.0
-FontName: parmesan
-FullName: parmesan
-FamilyName: parmesan
+FontName: granapadano
+FullName: granapadano
+FamilyName: granapadano
 Weight: Medium
 Copyright: LilyPond's pretty-but-neat music font, adapted to the Gregorio Project.\nCopyright (C) 2002-2006 Juergen Reuter <[email protected]>\nCopyright (C) 2007-2015 The Gregorio Project (see CONTRIBUTORS.md)\nThis file is part of Gregorio.\n\n<<GPLV3>>
 UComments: "2007-4-12: Created." 

fonts/squarize.py

@@ -78,7 +78,7 @@
     5: 'Five',
 }
 
-GREGORIO_VERSION = '4.1.1'
+GREGORIO_VERSION = '4.1.2'
 
 # The unicode character at which we start our numbering:
 # U+E000 is the start of the BMP Private Use Area