gregoriotex (3may16)

git-svn-id: svn://tug.org/texlive/trunk@40872 c570f23f-e606-0410-a88d-b1316a301751

12 files changed, 1677 insertions, 1535 deletions

diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex
index 110fbfa6cf6..78705d2bf61 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex
@@ -7,7 +7,7 @@
 \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
@@ -20,46 +20,46 @@ horizontal episema (activated using {\ttfamily\char`_} in gabc) are excluded fro
 this table.
 
 \newcommand\ScoreFontTable[1]{%
-  \begin{longtable}{llccccccc}
-      \caption{Score Glyphs}\\
-      &&&&&\multicolumn{4}{c}{\bfseries Variants}\\
-      \hhline{>{\arrayrulecolor{lightgray}}----->{\arrayrulecolor{black}}----}
-      {\bfseries Glyph Name}&%
-      {\scriptsize\bfseries Sample gabc}&%
-      {\scriptsize\bfseries greciliae}&%
-      {\scriptsize\bfseries gregorio}&%
-      {\scriptsize\bfseries parmesan}&%
-      {\scriptsize\bfseries Name}&%
-      {\scriptsize\bfseries greciliae}&%
-      {\scriptsize\bfseries gregorio}&%
-      {\scriptsize\bfseries parmesan}\\
-      \hline
-    \endfirsthead
-      &&&&&\multicolumn{4}{c}{\bfseries Variants}\\
-      \hhline{>{\arrayrulecolor{lightgray}}----->{\arrayrulecolor{black}}----}
-      {\bfseries Glyph Name}&%
-      {\scriptsize\bfseries Sample gabc}&%
-      {\scriptsize\bfseries greciliae}&%
-      {\scriptsize\bfseries gregorio}&%
-      {\scriptsize\bfseries parmesan}&%
-      {\scriptsize\bfseries Name}&%
-      {\scriptsize\bfseries greciliae}&%
-      {\scriptsize\bfseries gregorio}&%
-      {\scriptsize\bfseries parmesan}\\
-      \hline
-    \endhead
-    \directlua{GregorioRef.emit_score_glyphs(#1)}
-  \end{longtable}
+	\begin{longtable}{llccccccc}
+			\caption{Score Glyphs}\\
+			&&&&&\multicolumn{4}{c}{\bfseries Variants}\\
+			\hhline{>{\arrayrulecolor{lightgray}}----->{\arrayrulecolor{black}}----}
+			{\bfseries Glyph Name}&%
+			{\scriptsize\bfseries Sample gabc}&%
+			{\scriptsize\bfseries greciliae}&%
+			{\scriptsize\bfseries gregorio}&%
+			{\scriptsize\bfseries granapadano}&%
+			{\scriptsize\bfseries Name}&%
+			{\scriptsize\bfseries greciliae}&%
+			{\scriptsize\bfseries gregorio}&%
+			{\scriptsize\bfseries granapadano}\\
+			\hline
+		\endfirsthead
+			&&&&&\multicolumn{4}{c}{\bfseries Variants}\\
+			\hhline{>{\arrayrulecolor{lightgray}}----->{\arrayrulecolor{black}}----}
+			{\bfseries Glyph Name}&%
+			{\scriptsize\bfseries Sample gabc}&%
+			{\scriptsize\bfseries greciliae}&%
+			{\scriptsize\bfseries gregorio}&%
+			{\scriptsize\bfseries granapadano}&%
+			{\scriptsize\bfseries Name}&%
+			{\scriptsize\bfseries greciliae}&%
+			{\scriptsize\bfseries gregorio}&%
+			{\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}
 
@@ -69,14 +69,14 @@ used in the verses or in the \TeX{} document, and miscellaneous glyphs like
 decorative lines for more specialized use.
 
 \begin{longtable}{lc|lc}
-    \caption{Extra Glyphs}\\
-    {\bfseries Glyph Name}&{\bfseries Glyph}&{\bfseries Glyph Name}&{\bfseries Glyph}\\
-    \hline
-  \endfirsthead
-    {\bfseries Glyph Name}&{\bfseries Glyph}&{\bfseries Glyph Name}&{\bfseries Glyph}\\
-    \hline
-  \endhead
-  \directlua{GregorioRef.emit_extra_glyphs('greextra')}
+		\caption{Extra Glyphs}\\
+		{\bfseries Glyph Name}&{\bfseries Glyph}&{\bfseries Glyph Name}&{\bfseries Glyph}\\
+		\hline
+	\endfirsthead
+		{\bfseries Glyph Name}&{\bfseries Glyph}&{\bfseries Glyph Name}&{\bfseries Glyph}\\
+		\hline
+	\endhead
+	\directlua{GregorioRef.emit_extra_glyphs('greextra')}
 \end{longtable}
 
 \end{landscape}
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
index 4c7380a69c2..ae1dbd80222 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
@@ -18,21 +18,21 @@ The optional arguments are:
 
 \bigskip\rowcolors{1}{lightgray}{lightgray}
 \begin{tabular}{lp{10cm plus .5cm}}
-  Argument & Description \\
-  \hline
-  \texttt{debug} & Debug messages will be printed to the output log.  Can also be specified as \verb:debug={<types>}:, in which case only messages of the types listed will be printed to the output log.\\
-  \hline
-  \texttt{nevercompile} & Default. The classic behavior of Gregorio\TeX. The user is %
-    responsible for compiling gabc scores into gtex files.\\
-  \texttt{autocompile} & Gregorio\TeX\ will automatically compile gtex files from gabc %
-    files when necessary. If the gabc has been modified, or the %
-    gtex has an outdated version, or the gtex file does not exist, %
-    THEN Gregorio\TeX\ will compile a new gtex file.\\
-  \texttt{forcecompile} & Gregorio\TeX\ will compile all scores from their gabc files.\\
-  \hline
-  \texttt{allowdeprecated=false} & Force all deprecated commands to raise a package error %
-    rather than a warning. This allows the user to ensure that their file is %
-    compliant with the current version of Gregorio\TeX.\\
+	Argument & Description \\
+	\hline
+	\texttt{debug} & Debug messages will be printed to the output log.  Can also be specified as \verb:debug={<types>}:, in which case only messages of the types listed will be printed to the output log.\\
+	\hline
+	\texttt{nevercompile} & Default. The classic behavior of Gregorio\TeX. The user is %
+		responsible for compiling gabc scores into gtex files.\\
+	\texttt{autocompile} & Gregorio\TeX\ will automatically compile gtex files from gabc %
+		files when necessary. If the gabc has been modified, or the %
+		gtex has an outdated version, or the gtex file does not exist, %
+		THEN Gregorio\TeX\ will compile a new gtex file.\\
+	\texttt{forcecompile} & Gregorio\TeX\ will compile all scores from their gabc files.\\
+	\hline
+	\texttt{allowdeprecated=false} & Force all deprecated commands to raise a package error %
+		rather than a warning. This allows the user to ensure that their file is %
+		compliant with the current version of Gregorio\TeX.\\
 \end{tabular}\bigskip
 
 \textbf{Note:} \verb=nevercompile=, \verb=autocompile=, and
@@ -73,27 +73,27 @@ Once you've included the package in your document (as explained above) the follo
 Macro for including scores.  Works on both gabc and tex files.
 
 \begin{argtable}
-  \#1 & \texttt{n} & Optional. \#2 will be included as is. \\
-      & \texttt{a} & Optional. Gregorio\TeX\ will automatically compile gabc files if necessary.\\
-      & \texttt{f} & Optional. Forces Gregorio\TeX\ to compile the gabc file.\\
-  \#2 & string & Relative or absolute path to the score.\\
+	\#1 & \texttt{n} & Optional. \#2 will be included as is. \\
+			& \texttt{a} & Optional. Gregorio\TeX\ will automatically compile gabc files if necessary.\\
+			& \texttt{f} & Optional. Forces Gregorio\TeX\ to compile the gabc file.\\
+	\#2 & string & Relative or absolute path to the score.\\
 \end{argtable}
 
 Example:\par\medskip
 \begin{latexcode}
-  \gregorioscore[n]{TecumPrincipium.gtex}
-  \gregorioscore{Chant/VirgoVirginum.gabc}
-  \gregorioscore{/home/user/chant/AdTeLevavi}
-  \gregorioscore[a]{AveMaria}
-
-  %The following lines include the same score:
-  \gregorioscore{Christus}
-  \gregorioscore{Christus.gtex}
-  \gregorioscore{./Christus}
-  \gregorioscore{./Christus.gabc}
-
-  %With the optional arg [f], #2 must be a file usable by \TeX.
-  \gregorioscore[f]{TecumPrincipium.gabc} % Wrong
+	\gregorioscore[n]{TecumPrincipium.gtex}
+	\gregorioscore{Chant/VirgoVirginum.gabc}
+	\gregorioscore{/home/user/chant/AdTeLevavi}
+	\gregorioscore[a]{AveMaria}
+
+	%The following lines include the same score:
+	\gregorioscore{Christus}
+	\gregorioscore{Christus.gtex}
+	\gregorioscore{./Christus}
+	\gregorioscore{./Christus.gabc}
+
+	%With the optional arg [f], #2 must be a file usable by \TeX.
+	\gregorioscore[f]{TecumPrincipium.gabc} % Wrong
 \end{latexcode}
 
 \textbf{Important:} For the sake of clarity it is recommended that the
@@ -114,7 +114,7 @@ compiled are:
 \begin{itemize}
 \item If a gtex file does not exist.
 \item If the modification time of the gabc file is newer than its
-  corresponding gtex file.
+	corresponding gtex file.
 \item If the version of the gtex file is outdated.
 \end{itemize}
 
@@ -131,32 +131,32 @@ A macro to change the behavior of the way Gregorio\TeX\ includes scores.  This i
 
 
 \begin{argtable}
-  \#1 & \texttt{force} & all later calls of \verb=\gregorioscore= will compile the gabc
+	\#1 & \texttt{force} & all later calls of \verb=\gregorioscore= will compile the gabc
 file into a gtex file.\\
-  & \texttt{auto} & all later calls of \verb=\gregorioscore= will use Gregorio\TeX's
+	& \texttt{auto} & all later calls of \verb=\gregorioscore= will use Gregorio\TeX's
 automatic compilation of gabc files.\\
-  & \texttt{never} & all later calls of \verb=\gregorioscore= will include the score
+	& \texttt{never} & all later calls of \verb=\gregorioscore= will include the score
 without doing anything else.
 \end{argtable}
 
 \medskip This macro can be combined in the same document with different arguments to
 switch between different behaviors: \par\medskip
 \begin{latexcode}
-  \usepackage{gregoriotex} % [nevercompile] is the default.
-  ----
-  \gregorioscore{TecumPrincipium} % gabc never compiled.
-  \gregorioscore[f]{TecumPrincipium} % gabc always compiled.
-  \gregorioscore[a]{TecumPrincipium} % gabc auto compiled.
-
-  \gresetcompilegabc{auto}
-  \gregorioscore{TecumPrincipium} % gabc auto compiled.
-  \gregorioscore[n]{TecumPrincipium} % gabc never compiled.
-  \gregorioscore[f]{TecumPrincipium} % gabc always compiled.
-
-  \gresetcompilegabc{force}
-  \gregorioscore{TecumPrincipium} % gabc always compiled.
-  \gregorioscore[n]{TecumPrincipium} % gabc never compiled.
-  \gregorioscore[a]{TecumPrincipium} % gabc auto compiled.
+	\usepackage{gregoriotex} % [nevercompile] is the default.
+	----
+	\gregorioscore{TecumPrincipium} % gabc never compiled.
+	\gregorioscore[f]{TecumPrincipium} % gabc always compiled.
+	\gregorioscore[a]{TecumPrincipium} % gabc auto compiled.
+
+	\gresetcompilegabc{auto}
+	\gregorioscore{TecumPrincipium} % gabc auto compiled.
+	\gregorioscore[n]{TecumPrincipium} % gabc never compiled.
+	\gregorioscore[f]{TecumPrincipium} % gabc always compiled.
+
+	\gresetcompilegabc{force}
+	\gregorioscore{TecumPrincipium} % gabc always compiled.
+	\gregorioscore[n]{TecumPrincipium} % gabc never compiled.
+	\gregorioscore[a]{TecumPrincipium} % gabc auto compiled.
 \end{latexcode}
 
 \macroname{\textbackslash gabcsnippet}{\{\#1\}}{gregoriotex-main.tex}
@@ -164,12 +164,12 @@ Converts the gabc notation specified in \texttt{\#1} to Gregorio\TeX\ and
 includes it directly in the document.
 
 \begin{argtable}
-  \#1 & string & The gabc to insert into the document.\\
+	\#1 & string & The gabc to insert into the document.\\
 \end{argtable}
 
 \medskip For example:\par\medskip
 \begin{latexcode}
-  \gabcsnippet{(c3) Al(eg~)le(gv.fhg)lu(efe___)ia(e.) (::)}
+	\gabcsnippet{(c3) Al(eg~)le(gv.fhg)lu(efe___)ia(e.) (::)}
 \end{latexcode}
 
 
@@ -199,8 +199,8 @@ disabled by default.
 Macro to enable or disable the point-and-click feature.
 
 \begin{argtable}
-  \#1 & \texttt{on}  & Enable point-and-click link generation.\\
-  & \texttt{off} & Disable point-and-click link generation (default).
+	\#1 & \texttt{on}  & Enable point-and-click link generation.\\
+	& \texttt{off} & Disable point-and-click link generation (default).
 \end{argtable}
 
 This feature may be switched on and off as desired between scores.
@@ -213,14 +213,14 @@ While the default size for Gregorio scores is designed to approximate that found
 Macro to adjust the size of the staff.
 
 \begin{argtable}
-  \#1 & integer & The size of the staff lines.  Default value is 17.  Higher numbers yield larger staves.
+	\#1 & integer & The size of the staff lines.  Default value is 17.  Higher numbers yield larger staves.
 \end{argtable}
 
 \macroname{\textbackslash grechangestafflinethickness}{\{\#1\}}{gregoriotex-spaces.tex}
 Macro to adjust the thickness of the staff lines.
 
 \begin{argtable}
-  \#1 & integer & The thickness of the staff lines.  The default value is same as staff size.
+	\#1 & integer & The thickness of the staff lines.  The default value is same as staff size.
 \end{argtable}
 
 
@@ -231,54 +231,56 @@ In addition to providing control over the overall size of your scores, Gregorio\
 Macro to create one of Gregorio\TeX’s distances.  Used to initialize distances in a space configuration file.  For an example of such a file, please see \textit{gsp-default.tex}, which contains the default spacing configuration for Gregorio\TeX.
 
 \begin{argtable}
-  \#1 & string & The name of the distance to be changed.  See \nameref{distances} below.\\
-  \#2 & string & The distance in string format.  \textbf{Note:} You cannot use a length register for this argument.  You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
-  \#3 & \texttt{fixed} & Distance will not scale when staff size is changed.\\
-  & \texttt{scalable} & Distance will scale when staff size is changed.
+	\#1 & string & The name of the distance to be changed.  See \nameref{distances} below.\\
+	\#2 & string & The distance in string format.  \textbf{Note:} You cannot use a length register for this argument.  You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
+	\#3 & \texttt{fixed} & Distance will not scale when staff size is changed.\\
+	& \texttt{scalable} & Distance will scale when staff size is changed.\\
+	& \texttt{inherited} & Distance will inherit its value from another distance.  When this argument is used, then \#2 should be the name of another Gregorio\TeX\ distance.
 \end{argtable}
 
 \macroname{\textbackslash grechangedim}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-spaces.tex}
 Macro to change one of Gregorio\TeX’s distances.  This function will check to make sure the distance you are trying to change exists first.
 
 \begin{argtable}
-  \#1 & string & The name of the distance to be changed.  See \nameref{distances} below.\\
-  \#2 & string & The distance in string format.  \textbf{Note:} You cannot use a length register for this argument.  You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
-  \#3 & \texttt{fixed} & Distance will not scale when staff size is changed.\\
-  & \texttt{scalable} & Distance will scale when staff size is changed.
+	\#1 & string & The name of the distance to be changed.  See \nameref{distances} below.\\
+	\#2 & string & The distance in string format.  \textbf{Note:} You cannot use a length register for this argument.  You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
+	\#3 & \texttt{fixed} & Distance will not scale when staff size is changed.\\
+	& \texttt{scalable} & Distance will scale when staff size is changed.\\
+	& \texttt{inherited} & Distance will inherit its value from another distance.  When this argument is used, then \#2 should be the name of another Gregorio\TeX\ distance.
 \end{argtable}
 
 \macroname{\textbackslash grescaledim}{\{\#1\}\{\#2\}}{gregoriotex-spaces.tex}
 Macro to turn on or off scaling with the staff size for a particular distance.
 
 \begin{argtable}
-  \#1 & string & The name of the distance for which scaling is to changed.  See \nameref{distances} below.\\
-  \#2 & \texttt{yes}/\texttt{true}/\texttt{on}/\texttt{scalable} & Choose just one of the given keywords.  Scale the distance when changing the size of the staff.\\
-  & string not in list above & Do not scale the distance when changing the size of the staff.
+	\#1 & string & The name of the distance for which scaling is to changed.  See \nameref{distances} below.\\
+	\#2 & \texttt{yes}/\texttt{true}/\texttt{on}/\texttt{scalable} & Choose just one of the given keywords.  Scale the distance when changing the size of the staff.\\
+	& string not in list above & Do not scale the distance when changing the size of the staff.
 \end{argtable}
 
 \textbf{Nota bene:} This macro also can be used to change whether or not the staff line thickness scales with the staff size by specifying \texttt{stafflinefactor} for the first argument.
 
 \macroname{\textbackslash grechangecount}{\{\#1\}\{\#2\}}{gregoriotex-spaces.tex}
-Macro to change one of Gregorio\TeX’s counts (numeric values).
+Macro to change one of Gregorio\TeX’s counts or penalities (numeric values).
 
 \begin{argtable}
-  \#1 & string & The name of the count to be changed.  See \nameref{counts} below.\\
-  \#2 & integer & The new value.\\
+	\#1 & string & The name of the count to be changed.  See \nameref{counts} and \nameref{penalties} below.\\
+	\#2 & integer & The new value.\\
 \end{argtable}
 
 \macroname{\textbackslash greloadspaceconf}{\{\#1\}}{gregoriotex-spaces.tex}
 Macro to load a space configuration file.  Space configuration file names have the format \verb=gsp-identifier.tex= and must be in the same directory as your project or in your texmf directory.
 
 \begin{argtable}
-  \#1 & string & The identifier of the space configuration file.
+	\#1 & string & The identifier of the space configuration file.
 \end{argtable}
 
 Example:\par\medskip
 \begin{latexcode}
-  % loads gsp-default.tex, the default configuration file
-  \greloadspaceconf{default}
-  % loads a custom configuration called gsp-myspaces.tex
-  \greloadspaceconf{myspaces}
+	% loads gsp-default.tex, the default configuration file
+	\greloadspaceconf{default}
+	% loads a custom configuration called gsp-myspaces.tex
+	\greloadspaceconf{myspaces}
 \end{latexcode}
 
 \macroname{\textbackslash greconffactor}{}{gsp-default.tex}
@@ -289,9 +291,9 @@ Macro to configure line height expansion behavior when notes appear
 above or below the staff lines.
 
 \begin{argtable}
-    \#1 & \texttt{variable} & Expand lines within a score independently
-                              of each other \\
-        & \texttt{uniform}  & Expand all lines within a score uniformly
+		\#1 & \texttt{variable} & Expand lines within a score independently
+															of each other \\
+				& \texttt{uniform}  & Expand all lines within a score uniformly
 \end{argtable}
 
 By default, Gregorio\TeX{} uses \texttt{variable} line expansion.  This
@@ -311,14 +313,14 @@ necessary.
 
 \begin{small}
 \begin{framed}
-    \textit{For experts only:}\bigskip
-
-    It is possible to suppress the line height computation and just use
-    whatever has been computed from the previous run.  If you are sure
-    that the score line heights haven't changed from the previous run,
-    define the \verb=\greskipheightcomputation= control sequence before
-    including the Gregorio\TeX{} package.  This will save a little bit
-    of time per run.
+		\textit{For experts only:}\bigskip
+
+		It is possible to suppress the line height computation and just use
+		whatever has been computed from the previous run.  If you are sure
+		that the score line heights haven't changed from the previous run,
+		define the \verb=\greskipheightcomputation= control sequence before
+		including the Gregorio\TeX{} package.  This will save a little bit
+		of time per run.
 \end{framed}
 \end{small}
 
@@ -329,10 +331,10 @@ horizontal episema that surround a line on which a ledger line may appear
 when the ledger line \textit{does not} appear.
 
 \begin{argtable}
-    \#1 & \texttt{enable}  & Ledger line heuristics will be used in placing
-                             the horizontal episema \\
-        & \texttt{disable} & Ledger line heuristics will not be used in
-                             placing the horizontal episema \\
+		\#1 & \texttt{enable}  & Ledger line heuristics will be used in placing
+														 the horizontal episema \\
+				& \texttt{disable} & Ledger line heuristics will not be used in
+														 placing the horizontal episema \\
 \end{argtable}
 
 Because of the complexity of computing distances exactly, the heuristic may
@@ -352,36 +354,36 @@ system should act as if the ledger line exists (\texttt{1}) or not
 Macro for changing the color of the staff lines.   The two most common colors you're going to want to use are \texttt{gregoriocolor} (see \nameref{colors}) and \texttt{black} (the default).
 
 \begin{argtable}
-  \#1 & color name & The color of the staff lines
+	\#1 & color name & The color of the staff lines
 \end{argtable}
 
 \macroname{\textbackslash gresetlines}{\{\#1\}}{gregoriotex-main.tex}
 Macro for setting whether the staff lines should be rendered or not.
 
 \begin{argtable}
-  \#1 & \texttt{visible} & The staff lines should be printed (default)\\
-  & \texttt{invisible} & The staff lines should not be printed
+	\#1 & \texttt{visible} & The staff lines should be printed (default)\\
+	& \texttt{invisible} & The staff lines should not be printed
 \end{argtable}
 
 \macroname{\textbackslash gresetlinesbehindpunctumcavum}{\{\#1\}}{gregoriotex-signs.tex}
 Macro for setting whether the staff lines behind a punctum cavum should be shown or not.
 
 \begin{argtable}
-  \#1 & \texttt{visible} & The staff lines behind a punctum cavum should be printed (Plain \TeX\ default)\\
-  & \texttt{invisible} & The staff lines behind a punctum cavum should not be printed (\LaTeX\ default)
+	\#1 & \texttt{visible} & The staff lines behind a punctum cavum should be printed (Plain \TeX\ default)\\
+	& \texttt{invisible} & The staff lines behind a punctum cavum should not be printed (\LaTeX\ default)
 \end{argtable}
 
 \macroname{\textbackslash gresetlinesbehindalteration}{\{\#1\}}{gregoriotex-signs.tex}
 Macro for setting whether the staff lines behind an alternation (\ie, an accidental) should be shown or not.
 
 \begin{argtable}
-  \#1 & \texttt{visible} & The staff lines behind an alteration should be printed (Plain \TeX\ default)\\
-  & \texttt{invisible} & The staff lines behind an alteration should not be printed (\LaTeX\ default)
+	\#1 & \texttt{visible} & The staff lines behind an alteration should be printed (Plain \TeX\ default)\\
+	& \texttt{invisible} & The staff lines behind an alteration should not be printed (\LaTeX\ default)
 \end{argtable}
 
 
 \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]}
@@ -391,11 +393,11 @@ available alternate font/rule set is \texttt{op} for Dominican neumes.
 Note that the font will be looked up by name through luaotfload, see the documentation of luaotfload for what it implies.
 
 \begin{argtable}
-  \#1 & \textit{(omitted)} & Use the normal font and rule set (default).\\
-  & \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.\\
+	\#1 & \textit{(omitted)} & Use the normal font and rule set (default).\\
+	& \texttt{op} & Use the alternate Dominican font/rule set.\\
+	\#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
+	& \texttt{gregorio} & Use the Gregorio font.\\
+	& \texttt{granapadano} & Use the Grana Padano font.\\
 \end{argtable}
 
 \macroname{\textbackslash gresetgregoriofontscaled}{[\optional{\#1}]\{\#2\}\{\#3\}}{gregoriotex-main.tex}
@@ -412,11 +414,11 @@ Substitutes the given Gregorio\TeX\ score glyph with the specified glyph
 from the specified font.
 
 \begin{argtable}
-  \#1 & string & The name of the Gregorio\TeX\ glyph to replace.\\
-  \#2 & string & The name of the font to use.\\
-  \#3 & number & The code point of the glyph to use.\\
-  & \texttt{.}string & The name of the variant (appended to \#1) to use.\\
-  & string & (any other string) The name of the glyph to use.
+	\#1 & string & The name of the Gregorio\TeX\ glyph to replace.\\
+	\#2 & string & The name of the font to use.\\
+	\#3 & number & The code point of the glyph to use.\\
+	& \texttt{.}string & The name of the variant (appended to \#1) to use.\\
+	& string & (any other string) The name of the glyph to use.
 \end{argtable}
 
 \medskip If \texttt{\#1} has a wildcard (a \texttt{*}) in it, then
@@ -430,14 +432,14 @@ to be available in all score fonts.
 \medskip For example, to use the old glyphs (from Caeciliae) for the
 strophicus, use the following:\par\medskip
 \begin{latexcode}
-  \grechangeglyph{Stropha}{greciliae}{.caeciliae}
-  \grechangeglyph{StrophaAucta}{greciliae}{.caeciliae}
+	\grechangeglyph{Stropha}{greciliae}{.caeciliae}
+	\grechangeglyph{StrophaAucta}{greciliae}{.caeciliae}
 \end{latexcode}
 
 \medskip To replace all torculus resupinus glyphs with their alternate
 versions, use the following:\par\medskip
 \begin{latexcode}
-  \grechangeglyph{TorculusResupinus*}{*}{.alt}
+	\grechangeglyph{TorculusResupinus*}{*}{.alt}
 \end{latexcode}
 
 \macroname{\textbackslash greresetglyph}{\{\#1\}}{gregoriotex-main.tex}
@@ -445,7 +447,7 @@ Removes a Gregorio\TeX\ score glyph substitution, restoring it back to
 its original form.
 
 \begin{argtable}
-  \#1 & string & The name of the Gregorio\TeX\ glyph to restore.\\
+	\#1 & string & The name of the Gregorio\TeX\ glyph to restore.\\
 \end{argtable}
 
 \medskip If \texttt{\#1} has a wildcard (a \texttt{*}) in it, then
@@ -454,14 +456,14 @@ all glyphs matching \texttt{\#1} will be restored.
 \medskip For example, to restore the strophicus back to the new glyphs,
 use the following:\par\medskip
 \begin{latexcode}
-  \greresetglyph{Stropha}
-  \greresetglyph{StrophaAucta}
+	\greresetglyph{Stropha}
+	\greresetglyph{StrophaAucta}
 \end{latexcode}
 
 \medskip To restore all torculus resupinus glyphs to their original
 form, use the following:\par\medskip
 \begin{latexcode}
-  \greresetglyph{TorculusResupinus*}
+	\greresetglyph{TorculusResupinus*}
 \end{latexcode}
 
 \macroname{\textbackslash gredefsymbol}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-symbols.tex}
@@ -469,10 +471,10 @@ Defines (or redefines) a \TeX\ control sequence to be a non-score symbol.
 If defined this way, the symbol will scale with the text font.
 
 \begin{argtable}
-  \#1 & string & The name of the \TeX\ control sequence (without leading backslash).\\
-  \#2 & string & The name of the font to use.\\
-  \#3 & number & The code point of the glyph to use.\\
-  & string & The name of the glyph to use.
+	\#1 & string & The name of the \TeX\ control sequence (without leading backslash).\\
+	\#2 & string & The name of the font to use.\\
+	\#3 & number & The code point of the glyph to use.\\
+	& string & The name of the glyph to use.
 \end{argtable}
 
 \macroname{\textbackslash gredefsizedsymbol}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-symbols.tex}
@@ -481,45 +483,45 @@ which requires a single numeric argument (in points) to which the symbol
 will be scaled.
 
 \begin{argtable}
-  \#1 & string & The name of the \TeX\ control sequence (without leading backslash).\\
-  \#2 & string & The name of the font to use.\\
-  \#3 & number & The code point of the glyph to use.\\
-  & string & The name of the glyph to use.
+	\#1 & string & The name of the \TeX\ control sequence (without leading backslash).\\
+	\#2 & string & The name of the font to use.\\
+	\#3 & number & The code point of the glyph to use.\\
+	& string & The name of the glyph to use.
 \end{argtable}
 
 \macroname{\textbackslash gresethepisema}{\{\#1\}}{gregoriotex-signs.tex}
 Determines whether Gregorio\TeX\ should join (bridge) horizontal episemata on adjacent notes.
 
 \begin{argtable}
-  \#1 & \texttt{bridge} & Adjacent horizontal episemata are joined together (default).\\
-  & \texttt{break} & Adjacent horizontal episemata are not joined.
+	\#1 & \texttt{bridge} & Adjacent horizontal episemata are joined together (default).\\
+	& \texttt{break} & Adjacent horizontal episemata are not joined.
 \end{argtable}
 
 \macroname{\textbackslash gresetpunctumcavum}{\{\#1\}}{gregoriotex-signs.tex}
 A shortcut for switching to the alternative punctum cavum and back.
 
 \begin{argtable}
-  \#1 & \texttt{alternate} & use the alternate punctum cavum\\
-  & \texttt{normal} & use the normal punctum cavum
+	\#1 & \texttt{alternate} & use the alternate punctum cavum\\
+	& \texttt{normal} & use the normal punctum cavum
 \end{argtable}
 
 Using the alternate punctum cavum is the equivalent of issuing the following commands:
 
 \begin{latexcode}
-  \grechangeglyph{PunctumCavum}{greciliae}{.caeciliae}%
-  \grechangeglyph{LineaPunctumCavum}{greciliae}{.caeciliae}%
-  \grechangeglyph{PunctumCavumHole}{greciliae}{.caeciliae}%
-  \grechangeglyph{LineaPunctumCavumHole}{greciliae}{.caeciliae}%
+	\grechangeglyph{PunctumCavum}{greciliae}{.caeciliae}%
+	\grechangeglyph{LineaPunctumCavum}{greciliae}{.caeciliae}%
+	\grechangeglyph{PunctumCavumHole}{greciliae}{.caeciliae}%
+	\grechangeglyph{LineaPunctumCavumHole}{greciliae}{.caeciliae}%
 \end{latexcode}
 
 \macroname{\textbackslash gresetglyphstyle}{\{\#1\}}{gregoriotex-chars.tex}
 Gregorio\TeX\ supports several glyph styles which can be changed with this macro.  These style replace some non-note glyphs with alternatives.
 
 \begin{argtable}
-  \#1 & \texttt{default} & Use the default style\\
-  & \texttt{medicaea} & Use a Medicaea style\\
-  & \texttt{hufnagel} & Use the hufnagel style\\
-  & \texttt{mensural} & Use the mensural style
+	\#1 & \texttt{default} & Use the default style\\
+	& \texttt{medicaea} & Use a Medicaea style\\
+	& \texttt{hufnagel} & Use the hufnagel style\\
+	& \texttt{mensural} & Use the mensural style
 \end{argtable}
 
 %%%  Should there be a table here or in the appendix which shows the affected glyphs in each of the styles?
@@ -531,8 +533,8 @@ Gregorio\TeX\ supports several glyph styles which can be changed with this macro
 Redefines a \TeX\ control sequence to be a a barred symbol.
 
 \begin{argtable}
-  \#1 & character & must be \texttt{A}, \texttt{R}, or \texttt{V}.\\
-  \#2 & dimension & how much the bar will be shifted left.\\
+	\#1 & character & must be \texttt{A}, \texttt{R}, or \texttt{V}.\\
+	\#2 & dimension & how much the bar will be shifted left.\\
 \end{argtable}
 
 Gregorio\TeX\ does not have precomposed barred letters, instead, it has bars that you
@@ -542,7 +544,7 @@ simple version.
 For example:
 
 \medskip \begin{latexcode}
-  \gresimpledefbarredsymbol{A}{0.3em}
+	\gresimpledefbarredsymbol{A}{0.3em}
 \end{latexcode}
 
 Will define \texttt{\textbackslash Abar} to be a A with a bar shifted right
@@ -554,12 +556,12 @@ certainly have to change this value by calling the \texttt{\textbackslash gresim
 Redefines a \TeX\ control sequence to be a barred symbol.
 
 \begin{argtable}
-  \#1 & string & the name of the command you want to define.\\
-  \#2 & string & command to typeset the text.\\
-  \#3 & string & symbol of the bar (must be defined through \texttt{gredefsizedsymbol}).\\
-  \#4 & number & the size of greextra to use (in pt).\\
-  \#5 & dimension & horizontal right shift of the bar.\\
-  \#6 & dimension & vertical shift of the bar glyph.\\
+	\#1 & string & the name of the command you want to define.\\
+	\#2 & string & command to typeset the text.\\
+	\#3 & string & symbol of the bar (must be defined through \texttt{gredefsizedsymbol}).\\
+	\#4 & number & the size of greextra to use (in pt).\\
+	\#5 & dimension & horizontal right shift of the bar.\\
+	\#6 & dimension & vertical shift of the bar glyph.\\
 \end{argtable}
 
 This is a more complete version of the previous command, it allows you to define
@@ -570,7 +572,7 @@ For example:
 
 \begin{footnotesize}
 \begin{latexcode}
-  \gredefbarredsymbol{RBarBold}{\textbf{R}}{greRBarSmall}{13}{1.7mm}{0.1mm}
+	\gredefbarredsymbol{RBarBold}{\textbf{R}}{greRBarSmall}{13}{1.7mm}{0.1mm}
 \end{latexcode}
 \end{footnotesize}
 
@@ -589,11 +591,11 @@ Redefines a \TeX\ control sequence to be a barred symbol.
 \bigskip\textbf{Only available in \LaTeX.}
 
 \begin{argtable}
-  \#1 & character & must be \texttt{A}, \texttt{R}, or \texttt{V}.\\
-  \#2 & dimension & how much the bar will be shifted left when upright and medium weight.\\
-  \#3 & dimension & how much the bar will be shifted left when italic/slanted and medium weight.\\
-  \#4 & dimension & how much the bar will be shifted left when upright and bold.\\
-  \#5 & dimension & how much the bar will be shifted left when italic/slanted and bold.\\
+	\#1 & character & must be \texttt{A}, \texttt{R}, or \texttt{V}.\\
+	\#2 & dimension & how much the bar will be shifted left when upright and medium weight.\\
+	\#3 & dimension & how much the bar will be shifted left when italic/slanted and medium weight.\\
+	\#4 & dimension & how much the bar will be shifted left when upright and bold.\\
+	\#5 & dimension & how much the bar will be shifted left when italic/slanted and bold.\\
 \end{argtable}
 
 This is like \verb=\gresimpledefbarglyph=, but allows setting different shifts
@@ -607,11 +609,11 @@ definitions.  Instead, it actually generates the code that would show the
 barred symbol.
 
 \begin{argtable}
-  \#1 & string    & command to typeset the text.\\
-  \#2 & string    & symbol of the bar (must be defined through \texttt{gredefsizedsymbol}).\\
-  \#3 & number    & the size of greextra to use (in pt).\\
-  \#4 & dimension & horizontal right shift of the bar.\\
-  \#5 & dimension & vertical shift of the bar glyph.\\
+	\#1 & string    & command to typeset the text.\\
+	\#2 & string    & symbol of the bar (must be defined through \texttt{gredefsizedsymbol}).\\
+	\#3 & number    & the size of greextra to use (in pt).\\
+	\#4 & dimension & horizontal right shift of the bar.\\
+	\#5 & dimension & vertical shift of the bar glyph.\\
 \end{argtable}
 
 \macroname{\textbackslash gothRbar}{}{gregoriotex-symbols.tex}
@@ -636,16 +638,16 @@ Prints \gresixstar.  Defined with \verb=\gredefsymbol=.
 A macro for invoking one of the five separators (fancy lines) which are contained in the greextra font.
 
 \begin{argtable}
-  \#1 & \texttt{1}--\texttt{5} & Choose the number of the line desired\\
-  \#2 & integer & the point size at which to print the line\\
+	\#1 & \texttt{1}--\texttt{5} & Choose the number of the line desired\\
+	\#2 & integer & the point size at which to print the line\\
 \end{argtable}
 
 \macroname{\textbackslash greornamentation}{\{\#1\}\{\#2\}}{gregoriotex-symbols.tex}
 A macro for invoking one of the ornamentation elements which are contained in the greextra font.
 
 \begin{argtable}
-  \#1 & \texttt{1}--\texttt{2} & Choose the number of the ornamentation desired\\
-  \#2 & integer & the point size at which to print the line\\
+	\#1 & \texttt{1}--\texttt{2} & Choose the number of the ornamentation desired\\
+	\#2 & integer & the point size at which to print the line\\
 \end{argtable}
 
 
@@ -658,9 +660,9 @@ Sets a special character.  Special characters are used from gabc within
 \texttt{<sp>} and \texttt{</sp>}.
 
 \begin{argtable}
-  \#1 & string & The text between \texttt{<sp>} and \texttt{</sp>}.\\
-  \#2 & \TeX\ code & The \TeX\ code to substitute when \texttt{<sp>\#1</sp>}
-                     is used in gabc.\\
+	\#1 & string & The text between \texttt{<sp>} and \texttt{</sp>}.\\
+	\#2 & \TeX\ code & The \TeX\ code to substitute when \texttt{<sp>\#1</sp>}
+										 is used in gabc.\\
 \end{argtable}
 
 \textbf{Nota Bene:} If you need to use a character in \#1 that is made special
@@ -674,13 +676,13 @@ Un-sets a special character.  Using an unset special character will use its
 text directly.
 
 \begin{argtable}
-  \#1 & string & The text between \texttt{<sp>} and \texttt{</sp>}.\\
+	\#1 & string & The text between \texttt{<sp>} and \texttt{</sp>}.\\
 \end{argtable}
 
 \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>}.
 
 
 
@@ -692,55 +694,54 @@ Different elements of an include score have different styles applied.  These ele
 \renewcommand{\thefootnote}{\fnsymbol{footnote}}
 \bigskip\rowcolors{1}{lightgray}{lightgray}
 \begin{tabular}{lp{7cm plus .5cm}r}
-  Element Name & Description & Default\\
-  \hline
-  \stylename{abovelinestext} & above line text (\texttt{<alt></alt>} in gabc, appears above the staff) & normal\\
-  \stylename{additionalstafflines} & short lines behind notes above or below the staff & special\footnotemark[1]\\
-  \stylename{annotation} & the annotation & none\\
-  \stylename{commentary} & the commentary & {\footnotesize\it footnote-size italics}\\
-  \stylename{elision} & elisions (\texttt{<e></e>} in gabc) & {\textit{\small small-size italics}} (\LaTeX)\\
-                      && {\textit{italics}} (Plain \TeX)\\
-  \stylename{firstsyllable} & the first syllable of the score excluding the score initial & none\\
-  \stylename{firstsyllableinitial} & the first letter of the first syllable of a score which is not the score initial & none\\
-  \stylename{firstword} & the first word of the first score excluding the score initial & none\\
-  \stylename{highchoralsign} & high choral signs & none\\
-  \stylename{initial} & Score initial (the first letter of the score, when offset from the rest of the text) & 40 pt font\\
-  \stylename{lowchoralsign} & low choral signs & none\\
-  \stylename{modedifferentia} & the rendered annotation from the \texttt{mode-differentia: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textbf{bold}}\\
-  \stylename{modeline} & the rendered annotation from the \texttt{mode: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textsc{\textbf{bold small capitals}}}\\
-  \stylename{modemodifier} & the rendered annotation from the \texttt{mode-modifier: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textit{\textbf{bold italics}}}\\
-  \stylename{nabc} & ancient notation & {\color{gregoriocolor}gregoriocolor} (\LaTeX)\\
-                   && none (Plain \TeX)\\
-  \stylename{normalstafflines} & Full length staff lines & none\\
-  \stylename{translation} & Translation text (appears below lyrics) & {\it italics}\\
+	Element Name & Description & Default\\
+	\hline
+	\stylename{abovelinestext} & above line text (\texttt{<alt></alt>} in gabc, appears above the staff) & normal\\
+	\stylename{additionalstafflines} & short lines behind notes above or below the staff & special\footnotemark[1]\\
+	\stylename{annotation} & the annotation & none\\
+	\stylename{commentary} & the commentary & {\footnotesize\it footnote-size italics}\\
+	\stylename{elision} & elisions (\texttt{<e></e>} in gabc) & {\textit{\small small-size italics}} (\LaTeX)\\
+											&& {\textit{italics}} (Plain \TeX)\\
+	\stylename{firstsyllable} & the first syllable of the score excluding the score initial & none\\
+	\stylename{firstsyllableinitial} & the first letter of the first syllable of a score which is not the score initial & none\\
+	\stylename{firstword} & the first word of the first score excluding the score initial & none\\
+	\stylename{highchoralsign} & high choral signs & none\\
+	\stylename{initial} & Score initial (the first letter of the score, when offset from the rest of the text) & 40 pt font\\
+	\stylename{lowchoralsign} & low choral signs & none\\
+	\stylename{modedifferentia} & the rendered annotation from the \texttt{mode-differentia: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textbf{bold}}\\
+	\stylename{modeline} & the rendered annotation from the \texttt{mode: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textsc{\textbf{bold small capitals}}}\\
+	\stylename{modemodifier} & the rendered annotation from the \texttt{mode-modifier: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textit{\textbf{bold italics}}}\\
+	\stylename{nabc} & ancient notation & {\color{gregoriocolor}gregoriocolor}\\
+	\stylename{normalstafflines} & Full length staff lines & none\\
+	\stylename{translation} & Translation text (appears below lyrics) & {\it italics}\\
 \end{tabular}
 \end{adjustbox}
 
 \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}
-  \#1 & string & element whose styling is to be changed (see list above for options)\\
-  \#2 & \TeX\ code & the code necessary to turn on the styling\\
-  \#3 & \TeX\ code & Optional.  The code necessary to turn off the styling (\eg, if the code to turn on the styling contains a \verb=\begin{environment}= then the code to turn it off must have the matching \verb=\end{environment}=.
+	\#1 & string & element whose styling is to be changed (see list above for options)\\
+	\#2 & \TeX\ code & the code necessary to turn on the styling\\
+	\#3 & \TeX\ code & Optional.  The code necessary to turn off the styling (\eg, if the code to turn on the styling contains a \verb=\begin{environment}= then the code to turn it off must have the matching \verb=\end{environment}=.
 \end{argtable}
 
 Examples:\par\medskip
 \begin{latexcode}
-  % This one works for both PlainTeX and LaTeX this would make
-  % the translations bold and italic
-  \grechangestyle{translation}{\it\bf}
+	% This one works for both PlainTeX and LaTeX this would make
+	% the translations bold and italic
+	\grechangestyle{translation}{\it\bf}
 
-  % This one is LaTeX only, and would make the above lines
-  % text small and italic
-  \grechangestyle{abovelinestext}{\begin{small}\begin{itshape}}%
-    [\end{itshape}\end{small}]
+	% This one is LaTeX only, and would make the above lines
+	% text small and italic
+	\grechangestyle{abovelinestext}{\begin{small}\begin{itshape}}%
+		[\end{itshape}\end{small}]
 
-  % This would make the initial print in 36pt font.
-  \grechangestyle{initial}{\fontsize{36}{36}\selectfont}
+	% This would make the initial print in 36pt font.
+	\grechangestyle{initial}{\fontsize{36}{36}\selectfont}
 \end{latexcode}
 
 \bigskip
@@ -749,24 +750,24 @@ Each element will be typeset within an isolated group to prevent styling command
 \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}
-  \#1 & \texttt{c} & When adding a new line, align the center of the new line with the center of the existing lines\\
-  & \texttt{l} & When adding a new line, align the left side of the new line with the left side of the existing lines\\
-  & \texttt{r} & When adding a new line, align the right side of the new line with the right side of the existing lines\\
-  \#2 & string & the text of the annotation
+	\#1 & \texttt{c} & When adding a new line, align the center of the new line with the center of the existing lines\\
+	& \texttt{l} & When adding a new line, align the left side of the new line with the left side of the existing lines\\
+	& \texttt{r} & When adding a new line, align the right side of the new line with the right side of the existing lines\\
+	\#2 & string & the text of the annotation
 \end{argtable}
 
 \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}
-  \#1 & distance & Optional.  Additional distance to be placed between the commentary and the top staff line for the next score only.\\
-  \#2 & string & The text of the commentary.\\
+	\#1 & distance & Optional.  Additional distance to be placed between the commentary and the top staff line for the next score only.\\
+	\#2 & string & The text of the commentary.\\
 \end{argtable}
 
 \textbf{Nota Bene:} If your commentary is multi-lined, then the optional argument of the last line, and only the last line, will be taken into account.  Further, pay attention to the fact that the optional argument is \emph{additional} distance, \ie, it will be added to \texttt{commentaryraise} to determine the distance from the baseline of the commentary to the top line of the staff.
@@ -775,29 +776,38 @@ Macro to add commentary (the text flush right at the top, usually a scripture re
 Macro to add an illuminated initial.
 
 \begin{argtable}
-  \#1 & \TeX\ code & the code necessary to make the illuminated initial appear\\
+	\#1 & \TeX\ code & the code necessary to make the illuminated initial appear\\
 \end{argtable}
 
 \textbf{Nota Bene:} Usually the argument of this command should be an \verb=\includegraphics= command, but you may use what ever you want as the illuminated initial.
 
-\macroname{\textbackslash gresetinitiallines}{\#1}{gregoriotex-syllable.tex}
+\macroname{\textbackslash gresetinitiallines}{\{\#1\}}{gregoriotex-syllable.tex}
 Sets the number of lines the score initial requires.
 
 \begin{argtable}
-  \#1 & number & The number of lines required by the initial.  If \texttt{0}, the score will have no separated initial.\\
+	\#1 & number & The number of lines required by the initial.  If \texttt{0}, the score will have no separated initial.\\
 \end{argtable}
 
 \textbf{Nota Bene:} As currently implemented, you cannot set an initial which is larger than 2 lines and in order to do so you must set manual line breaks in the gabc for the first two lines.
 
-\macroname{\textbackslash gresetmodenumbersystem}{\#1}{gregoriotex-main.tex}
+\macroname{\textbackslash gresetmodenumbersystem}{\{\#1\}}{gregoriotex-main.tex}
 Sets the number system used for the mode number.
 
 \begin{argtable}
-  \#1 & \texttt{roman-minuscule} & Use lower-case Roman numerals (the default, good for small capitals).\\
-      & \texttt{roman-majuscule} & Use upper-case Roman numerals.\\
-      & \texttt{arabic} & Use Arabic numerals.\\
+	\#1 & \texttt{roman-minuscule} & Use lower-case Roman numerals (the default, good for small capitals).\\
+			& \texttt{roman-majuscule} & Use upper-case Roman numerals.\\
+			& \texttt{arabic} & Use Arabic numerals.\\
 \end{argtable}
 
+\macroname{\textbackslash gresetlyrics}{\{\#1\}}{gregoriotex-syllable.tex}
+Sets the visibility of the lyrics.
+
+\begin{argtable}
+	\#1 & \texttt{visible} & Lyrics are visible (default).\\
+	& \texttt{invisible} & Lyrics are not visible.\\
+\end{argtable}
+
+
 \subsubsection{Text Alignment}
 Gregorio\TeX\ allows you to manipulate the global alignment behavior of some text elements using the following commands.
 
@@ -811,9 +821,9 @@ Macro to set how the text of the lyrics aligns with the alignment point of its r
 \end{itemize}
 
 \begin{argtable}
-  \#1 & \texttt{vowel} & The center of the vowel in the syllable will align with the alignment point of the neumes\\
-  & \texttt{syllable} & The center of the syllable will align with the alignment point of the neumes\\
-  & \texttt{firstletter} & The center of the first letter/character of the syllable will align with the alignment point of the neumes\\
+	\#1 & \texttt{vowel} & The center of the vowel in the syllable will align with the alignment point of the neumes\\
+	& \texttt{syllable} & The center of the syllable will align with the alignment point of the neumes\\
+	& \texttt{firstletter} & The center of the first letter/character of the syllable will align with the alignment point of the neumes\\
 \end{argtable}
 
 \textbf{Nota Bene:} What constitutes the ``vowel'' of the syllable is determined by the language the lyric text is written in, as specified by the use of the \texttt{language} header in the gabc file.  Out of the box, Gregorio\TeX\ explicitly supports only Latin and English, but the rules for Latin have a high degree of overlap with many Romance languages, allowing them to fall back on the Latin rules with acceptable results.
@@ -826,33 +836,33 @@ Finally, in cases where you want some sort of exceptional alignment, you can for
 Macro to determine whether a forced center (\ie, one specified by curly braces (``\{'' and ``\}'') in your gabc file) should influence the alignment of that syllable when \texttt{syllable} and \texttt{firstletter} alignments are in effect.
 
 \begin{argtable}
-  \#1 & \texttt{allow} & Forced centers in gabc are allowed to influence the syllable alignment (default).\\
-  & \texttt{prohibit} & Forced centers in gabc do not influence the syllable alignment.\\
+	\#1 & \texttt{allow} & Forced centers in gabc are allowed to influence the syllable alignment (default).\\
+	& \texttt{prohibit} & Forced centers in gabc do not influence the syllable alignment.\\
 \end{argtable}
 
 \macroname{\textbackslash gresettranslationcentering}{\{\#1\}}{gregoriotex-main.tex}
 Macro to specify how the translation text should be aligned with it respective syllable text.
 
 \begin{argtable}
-  \#1 & \texttt{left} & The translation text is left aligned with its respective syllable text.\\
-  & \texttt{center} & The translation text is centered under its respective syllable.
+	\#1 & \texttt{left} & The translation text is left aligned with its respective syllable text.\\
+	& \texttt{center} & The translation text is centered under its respective syllable.
 \end{argtable}
 
 \macroname{\textbackslash gresetannotationby}{\{\#1\}}{gregoriotex-main.tex}
 Macro to specify which line of the annotation should be used to determine its starting placement (i.e. before \texttt{annotationraise} is applied).
 
 \begin{argtable}
-  \#1 & \texttt{firstline} & Annotation placement is determined by the first line (default)\\
-  & \texttt{lastline} & annotation placement is determined by the last line\\
+	\#1 & \texttt{firstline} & Annotation placement is determined by the first line (default)\\
+	& \texttt{lastline} & annotation placement is determined by the last line\\
 \end{argtable}
 
 \macroname{\textbackslash gresetannotationvalign}{\{\#1\}}{gregoriotex-main.tex}
 Macro to specify which part of the control line in the annotation should be aligned with the top line of the staff before \texttt{annotationraise} is applied.
 
 \begin{argtable}
-  \#1 & \texttt{top} & The top of the annotation control line will align with the top line of the staff\\
-  & \texttt{baseline} & The baseline of the control line is used (default)\\
-  & \texttt{bottom} & The bottom of the control line is used\\
+	\#1 & \texttt{top} & The top of the annotation control line will align with the top line of the staff\\
+	& \texttt{baseline} & The baseline of the control line is used (default)\\
+	& \texttt{bottom} & The bottom of the control line is used\\
 \end{argtable}
 
 \textbf{Nota Bene:} These variable refer to the actual contents of the line and not to the ``hypothetical'' limits for the font.  As a result if the top of an annotation containing only short letters will be different from one which contains tall ones even if both use the same font.  Likewise, if the annotation contains no descenders, then baseline and bottom will be the same.  If this is a problem, then the use of struts within the annotation can be used to control the line height (distance from baseline to top) and depth (distance from baseline to bottom).
@@ -864,8 +874,8 @@ While Gregorio\TeX\ will automatically wrap scores to fit your page, there are s
 Macro to determine whether an automatic linebreak before a EUOUAE area is justified or not.
 
 \begin{argtable}
-  \#1 & \texttt{justified} & Automatic line breaks before EUOUAE areas should be justified (default)\\
-  & \texttt{ragged} & Automatic line breaks before EUOUAE areas should be ragged\\
+	\#1 & \texttt{justified} & Automatic line breaks before EUOUAE areas should be justified (default)\\
+	& \texttt{ragged} & Automatic line breaks before EUOUAE areas should be ragged\\
 \end{argtable}
 
 \textbf{Important:} When set to \texttt{ragged}, Gregorio\TeX{} will require a
@@ -883,24 +893,33 @@ Module gregoriotex warning: Line heights or variable brace lengths may have chan
 Macro to determine whether line breaks are allowed inside a EUOUAE area (delimited by \texttt{<eu></eu>} tags in gabc).
 
 \begin{argtable}
-  \#1 & \texttt{allow} & Line breaks are allowed\\
-  & \texttt{prohibit} & Line breaks are prohibited, the entire EUOUAE area should appear on one line
+	\#1 & \texttt{allow} & Line breaks are allowed\\
+	& \texttt{prohibit} & Line breaks are prohibited, the entire EUOUAE area should appear on one line
 \end{argtable}
 
 \macroname{\textbackslash gresetbreakintranslation}{\{\#1\}}{gregoriotex-main.tex}
 Macro to determine whether line breaks are allowed inside a translation.
 
 \begin{argtable}
-  \#1 & \texttt{allow} & Line breaks are allowed\\
-  & \texttt{prohibit} & Line breaks are prohibited, the entire translation should appear on one line
+	\#1 & \texttt{allow} & Line breaks are allowed\\
+	& \texttt{prohibit} & Line breaks are prohibited, the entire translation should appear on one line
+\end{argtable}
+
+\macroname{\textbackslash gresetcustosalteration}{\{\#1\}}{gregoriotex-signs.tex}
+Macro for setting whether an alteration (flat, sharp, or natural) should be
+rendered before a custos or not.
+
+\begin{argtable}
+	\#1 & \texttt{visible} & The custos alteration should be printed (default)\\
+			& \texttt{invisible} & The custos alteration should not be printed
 \end{argtable}
 
 \macroname{\textbackslash greseteolcustos}{\{\#1\}}{gregoriotex-main.tex}
 Macro to determine whether Gregorio\TeX\ should automatically place the custos at a line break.
 
 \begin{argtable}
-  \#1 & \texttt{auto} & Custos will be automatically placed at each line break\\
-  & \texttt{manual} & Custos will only be placed at line breaks if they are specified in the gabc (\eg \texttt{(g+z)})
+	\#1 & \texttt{auto} & Custos will be automatically placed at each line break\\
+	& \texttt{manual} & Custos will only be placed at line breaks if they are specified in the gabc (\eg \texttt{(g+z)})
 \end{argtable}
 
 \textbf{Nota Bene:} This command only effects the custos that appears at the end of a line.  Custos which are placed at a key change are unaffected.  Further, if custos are specified in the gabc file manually and Gregorio\TeX\ is set to place custos automatically, you will get two custos at the line breaks.
@@ -909,8 +928,8 @@ Macro to determine whether Gregorio\TeX\ should automatically place the custos a
 Macro to determine whether Gregorio\TeX\ should automatically place the custos at a line break before a EUOUAE.  Since the EUOUAE block is typically not a continuation of the melody but rather a reminder of the end of the tone that follows, this is set to \texttt{suppressed} (no custos) by default.
 
 \begin{argtable}
-  \#1 & \texttt{suppressed} & Custos will not automatically be placed at a line break before a EUOUAE block (the default)\\
-  & \texttt{auto} & Custos will behave according to \verb=greseteolcustos= at a line break before a EUOUAE block\\
+	\#1 & \texttt{suppressed} & Custos will not automatically be placed at a line break before a EUOUAE block (the default)\\
+	& \texttt{auto} & Custos will behave according to \verb=greseteolcustos= at a line break before a EUOUAE block\\
 \end{argtable}
 
 \textbf{Nota Bene:} If \verb=\greseteolcustos= is set to \texttt{manual}, this setting is effectively ignored.
@@ -919,24 +938,39 @@ Macro to determine whether Gregorio\TeX\ should automatically place the custos a
 Macro to determine whether Gregorio\TeX\ should apply a small shift at the end of each line which allows lyrics to stretch under the final custos.
 
 \begin{argtable}
-  \#1 & \texttt{enable} & The shifts are applied (default)\\
-  & \texttt{disable} & The shifts are not applied.
+	\#1 & \texttt{enable} & The shifts are applied (default)\\
+	& \texttt{disable} & The shifts are not applied.
 \end{argtable}
 
 \macroname{\textbackslash gresetbolshifts}{\{\#1\}}{gregoriotex-main.tex}
 Macro to determine whether Gregorio\TeX\ should apply a small shift at the beginning of each line so that lines are aligned on the notes rather than the syllable text.
 
 \begin{argtable}
-  \#1 & \texttt{enable} & The shifts are applied (default)\\
-  & \texttt{disable} & The shifts are not applied.
+	\#1 & \texttt{enable} & The shifts are applied (default)\\
+	& \texttt{disable} & The shifts are not applied.
 \end{argtable}
 
 \macroname{\textbackslash gresetlastline}{\{\#1\}}{gregoriotex-main.tex}
 Macro to determine whether the last line of the score should be justified or not.
 
 \begin{argtable}
-  \#1 & \texttt{justified} & Set the last line justified with the rest of the score\\
-  & \texttt{ragged} & Set the last line ragged (default)
+	\#1 & \texttt{justified} & Set the last line justified with the rest of the score\\
+	& \texttt{ragged} & Set the last line ragged (default)
+\end{argtable}
+
+\macroname{\textbackslash gresetunbreakablesyllablenote}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-syllable.tex}
+Configures how notes should be kept together on line breaks.
+
+\begin{argtable}
+	\#1 & integer & The minimum number of notes in the syllable before the
+									syllable may be broken across lines.  Defaults to
+									\getgrecount{unbreakabletotalnotes}.\\
+	\#2 & integer & The minimum number of notes at the start of a syllable that
+									must be kept together when the syllable is broken across
+									lines.  Defaults to \getgrecount{unbreakableinitialnotes}.\\
+	\#3 & integer & The minimum number of notes at the end of a syllable that
+									must be kept together when the syllable is broken across
+									lines.  Defaults to \getgrecount{unbreakablefinalnotes}.\\
 \end{argtable}
 
 
@@ -946,12 +980,12 @@ Macro to determine whether the last line of the score should be justified or not
 Macro to change the behaviour for separation between notes of two syllables when the first ends with a punctum mora. The argument changes the cases in which punctum mora are ignored in space computation:
 
 \begin{argtable}
-  \#1 & \texttt{always} & punctum mora are always ignored (default)\\
-  & \texttt{notesonly} & punctum mora are ignored before notes, not bars\\
-  & \texttt{barsonly} & punctum mora are ignored before bars, not notes\\
-  & \texttt{notextonly} & punctum mora are ignored only before bars inside syllables, or bars having their own syllable without text\\
-  & \texttt{insideonly} & punctum mora are ignored only before bars inside syllables\\
-  & \texttt{never} & punctum mora are never ignored\\
+	\#1 & \texttt{always} & punctum mora are always ignored (default)\\
+	& \texttt{notesonly} & punctum mora are ignored before notes, not bars\\
+	& \texttt{barsonly} & punctum mora are ignored before bars, not notes\\
+	& \texttt{notextonly} & punctum mora are ignored only before bars inside syllables, or bars having their own syllable without text\\
+	& \texttt{insideonly} & punctum mora are ignored only before bars inside syllables\\
+	& \texttt{never} & punctum mora are never ignored\\
 \end{argtable}
 
 When a punctum mora is ignored, the bar will also be shifted by \texttt{moraadjustmentbar} (zero by default), see its description in the \nameref{distances} section.
@@ -960,22 +994,32 @@ When a punctum mora is ignored, the bar will also be shifted by \texttt{moraadju
 Macro to activate the new bar spacing algorithm.  The new algorithm attempts to place the bar line exactly midway between its surrounding notes.  Any text associated with the bar is placed midway between its surrounding text.  Since this might result in the bar line and the text being widely separated, there are also a limits to the distance between their respective centers: \texttt{maxbaroffsettextleft} and \texttt{maxbaroffsettextright} (when text center is respectively on the left or on the right of bar center).
 
 \begin{argtable}
-  \#1 & \texttt{new} & Activates the new spacing algorithm\\
-  & \texttt{old} & Activates the old behavior (Default)\\
+	\#1 & \texttt{new} & Activates the new spacing algorithm\\
+	& \texttt{old} & Activates the old behavior (Default)\\
 \end{argtable}
 
 \subsubsection{Sign printing}
 
+\macroname{\textbackslash gresetnotes}{\{\#1\}}{gregoriotex-syllable.tex}
+Sets the visibility of the notes.
+
+\begin{argtable}
+	\#1 & \texttt{visible} & Notes are visible (default).\\
+	& \texttt{invisible} & Notes are not visible.\\
+\end{argtable}
+
+\textbf{Nota Bene:} If the notes are set to be invisible, then bar lines, rythmic signs, and the like will also be invisible.  However, the staff lines and clefs will still show up (since their visibility is controlled by other settings).
+
 \macroname{\textbackslash greprintsigns}{\{\#1\}\{\#2\}}{gregoriotex-signs.tex}
 Macro to prevent rythmic signs from printing (all signs are printed by default):
 
 \begin{argtable}
-  \#1 & \texttt{vepisema} & sets the printing of vertical episema\\
-  & \texttt{hepisema} & sets the printing of horizontal episema\\
-  & \texttt{mora} & sets the printing of punctum mora and auctum duplex\\
-  & \texttt{all} & set the printing of all of these\\
-  \#2 & \texttt{enable} & enable the printing\\
-  & \texttt{disable} & disable the priting\\
+	\#1 & \texttt{vepisema} & sets the printing of vertical episema\\
+	& \texttt{hepisema} & sets the printing of horizontal episema\\
+	& \texttt{mora} & sets the printing of punctum mora and auctum duplex\\
+	& \texttt{all} & set the printing of all of these\\
+	\#2 & \texttt{enable} & enable the printing\\
+	& \texttt{disable} & disable the printing\\
 \end{argtable}
 
 Note that punctum mora and auctum duplex have an influence on spacings, so removing them will have an impact on that matter.
@@ -986,31 +1030,31 @@ Note that punctum mora and auctum duplex have an influence on spacings, so remov
 Tells Gregorio\TeX\ how to place a hyphen between syllables in polysyllabic words in a score.
 
 \begin{argtable}
-  \#1 & \texttt{force} & Hyphens will appear between all syllables in polysyllabic words.\\
-  & \texttt{auto} & Hyphens will appear based on the setting of \texttt{maximumspacewithoutdash} (default)
+	\#1 & \texttt{force} & Hyphens will appear between all syllables in polysyllabic words.\\
+	& \texttt{auto} & Hyphens will appear based on the setting of \texttt{maximumspacewithoutdash} (default)
 \end{argtable}
 
 \macroname{\textbackslash gresetemptyfirstsyllablehyphen}{\{\#1\}}{gregoriotex-syllable.tex}
 Tells Gregorio\TeX\ how to place a hyphen after an empty first syllable (\ie, when the first syllable consists only of the big initial).
 
 \begin{argtable}
-  \#1 & \texttt{force} & A hyphen will appear after an empty first syllable. (default)\\
-  & \texttt{auto} & A hyphen will appear after an empty first syllable based on the setting of \texttt{maximumspacewithoutdash}
+	\#1 & \texttt{force} & A hyphen will appear after an empty first syllable. (default)\\
+	& \texttt{auto} & A hyphen will appear after an empty first syllable based on the setting of \texttt{maximumspacewithoutdash}
 \end{argtable}
 
 \macroname{\textbackslash greseteolhyphen}{\{\#1\}}{gregoriotex-main.tex}
 Marco to determine how much space the hyphen at the end of a line occupies for the purposes of spacing calculations (the visible appearance of the hyphen is unchanged).
 
 \begin{argtable}
-  \#1 & \texttt{normal} & The hyphen occupies its normal space\\
-  & \texttt{zero} & The hyphen is considered to take up no space
+	\#1 & \texttt{normal} & The hyphen occupies its normal space\\
+	& \texttt{zero} & The hyphen is considered to take up no space
 \end{argtable}
 
 \macroname{\textbackslash gresethyphenprotrusion}{\{\#1\}}{gregoriotex-spaces.tex}
 Sets the protrusion factor of hyphens at end of lines. The default value is 50, a good compromise in the tested scores.
 
 \begin{argtable}
-  \#1 & \texttt{number} & The protrusion factor, percent
+	\#1 & \texttt{number} & The protrusion factor, percent
 \end{argtable}
 
 Note that a proper interface for setting protrusion factor of punctuation signs might appear in the next version, deprecating this one. Also, this protrusion factor does not apply to all hyphens (only those inserted by the Lua pass), so use it with caution.
@@ -1021,8 +1065,8 @@ Note that a proper interface for setting protrusion factor of punctuation signs
 Macro to tell Gregorio\TeX\ whether the clefs should be printed or not.
 
 \begin{argtable}
-  \#1 & \texttt{visible} & Clefs will be printed (default)\\
-  & \texttt{invisible} & Clefs will not be printed
+	\#1 & \texttt{visible} & Clefs will be printed (default)\\
+	& \texttt{invisible} & Clefs will not be printed
 \end{argtable}
 
 
@@ -1033,9 +1077,9 @@ Since the center of the clivis is different from most neumes, Gregorio\TeX\ supp
 Macro to determine the method used for aligning the clivis with its lyrics.
 
 \begin{argtable}
-  \#1 & \texttt{always} & Align on the real center of the clivis\\
-  & \texttt{never} & align on the center of the first punctum in the clivis\\
-  & \texttt{special} & align on the real center of the clivis except when (1) notes would go left of text or (2) consonants after vowels are larger than \verb=\gre@dimen@clivisalignmentmin= (default)
+	\#1 & \texttt{always} & Align on the real center of the clivis\\
+	& \texttt{never} & align on the center of the first punctum in the clivis\\
+	& \texttt{special} & align on the real center of the clivis except when (1) notes would go left of text or (2) consonants after vowels are larger than \verb=\gre@dimen@clivisalignmentmin= (default)
 \end{argtable}
 
 
@@ -1050,13 +1094,13 @@ harmonize (and thus match best) with greciliae, but they still look good
 with the other score fonts.
 
 \begin{argtable}
-  \#1 & \textit{(omitted)} & change all braces\\
-      & \texttt{brace} & change round braces that appear over the staff\\
-      & \texttt{underbrace} & change round braces that appear under the staff\\
-      & \texttt{curlybrace} & change curly braces\\
-      & \texttt{barbrace} & change round braces that appear over divisio bars\\
-  \#2 & \texttt{metapost} & \MP{} will be used to render braces\\
-      & \texttt{font} & The score font will be used to render braces\\
+	\#1 & \textit{(omitted)} & change all braces\\
+			& \texttt{brace} & change round braces that appear over the staff\\
+			& \texttt{underbrace} & change round braces that appear under the staff\\
+			& \texttt{curlybrace} & change curly braces\\
+			& \texttt{barbrace} & change round braces that appear over divisio bars\\
+	\#2 & \texttt{metapost} & \MP{} will be used to render braces\\
+			& \texttt{font} & The score font will be used to render braces\\
 \end{argtable}
 
 \macroname{\textbackslash grebarbracewidth}{}{gregoriotex-signs.tex}
@@ -1077,17 +1121,17 @@ Macro to tell Gregorio\TeX{} to capture a given header of the gabc file, passing
 specified \TeX{} macro.  Passing an empty \#2 will cancel capture of the given header.
 
 \begin{argtable}
-  \#1 & string & The name of the gabc header\\
-  \#2 & string & The name of the macro to use (without the leading backslash)
-                 or empty to stop capturing the given header\\
-  \#3 & string & a comma-separated list of options\\
+	\#1 & string & The name of the gabc header\\
+	\#2 & string & The name of the macro to use (without the leading backslash)
+								 or empty to stop capturing the given header\\
+	\#3 & string & a comma-separated list of options\\
 \end{argtable}
 
 The options are:
 
 \begin{tabular}{ll}
-  \texttt{name}   & The header name should also be passed to the macro\\
-  \texttt{string} & The header value should be passed to the macro as a string\\
+	\texttt{name}   & The header name should also be passed to the macro\\
+	\texttt{string} & The header value should be passed to the macro as a string\\
 \end{tabular}
 
 If the \texttt{name} option is not supplied, the macro is called with one
@@ -1121,7 +1165,7 @@ Defaults to nothing.  If this is called multiple times, the most recent call
 will define the behavior at the next set of headers.
 
 \begin{argtable}
-    \#1 & \TeX\ code & The code to process before a set of headers.\\
+		\#1 & \TeX\ code & The code to process before a set of headers.\\
 \end{argtable}
 
 \macroname{\textbackslash greafterheaders}{\{\#1\}}{gregoriotex-main.tex}
@@ -1130,7 +1174,7 @@ Defaults to nothing.  If this is called multiple times, the most recent call
 will define the behavior at the next set of headers.
 
 \begin{argtable}
-    \#1 & \TeX\ code & The code to process after a set of headers.\\
+		\#1 & \TeX\ code & The code to process after a set of headers.\\
 \end{argtable}
 
 
@@ -1141,30 +1185,26 @@ For a full description of how to make use of the ancient notation capabilities o
 Macro to set the font to be used for the ancient notation.
 
 \begin{argtable}
-  \#1 & string & the name of the font\\
-  \#2 & integer & point size at which the font should be loaded\\
+	\#1 & string & the name of the font\\
+	\#2 & integer & point size at which the font should be loaded\\
 \end{argtable}
 
 \subsection{Counts}\label{counts}
 
 Each of the following counts controls some aspect of the configuration of the Gregorio\TeX\ score.  They are changed using \verb=\grechangecount=, documented above.
 
-\macroname{additionaltopspacethreshold}{}{gsp-default.tex}
-
+\begin{gcount}{additionaltopspacethreshold}
 The threshold above which we start accounting notes above lines for additional
 vertical space. For instance with a threshold of \texttt{2}, notes with a pitch
 of \texttt{k} and \texttt{l} will not interfere with the space above lines.
 Set it to a high value if you don't want high notes to interfere with space
 above lines.
+\end{gcount}
 
-Default: \texttt{2}
-
-\macroname{additionaltopspacealtthreshold}{}{gsp-default.tex}
-
+\begin{gcount}{additionaltopspacealtthreshold}
 Same as \texttt{additionaltopspacethreshold} but setting the threshold for
 notes taken into account with above lines text vertical placement.
-
-Default: \texttt{0}
+\end{gcount}
 
 \subsection{Distances}\label{distances}
 
@@ -1290,7 +1330,11 @@ Space between notes of a bistropha or tristrophae.
 \end{gdimension}
 
 \begin{gdimension}{punctuminclinatumshift}
-Space between two punctum inclinatum.
+Space between two descending puncta inclinata.
+\end{gdimension}
+
+\begin{gdimension}{punctuminclinatumunisonshift}
+Space between two unison puncta inclinata.
 \end{gdimension}
 
 \begin{gdimension}{beforepunctainclinatashift}
@@ -1298,7 +1342,8 @@ Space before puncta inclinata.
 \end{gdimension}
 
 \begin{gdimension}{punctuminclinatumanddebilisshift}
-Space between a punctum inclinatum and a punctum inclinatum deminutus.
+Space between a punctum inclinatum and a punctum inclinatum deminutus,
+descending.
 \end{gdimension}
 
 \begin{gdimension}{punctuminclinatumdebilisshift}
@@ -1306,11 +1351,11 @@ Space between two punctum inclinatum deminutus.
 \end{gdimension}
 
 \begin{gdimension}{punctuminclinatumbigshift}
-Space between puncta inclinata, larger ambitus (range=3rd).
+Space between descending puncta inclinata, larger ambitus (range=3rd).
 \end{gdimension}
 
 \begin{gdimension}{punctuminclinatummaxshift}
-Space between puncta inclinata, larger ambitus (range=4th or 5th).
+Space between descending puncta inclinata, larger ambitus (range=4th or 5th).
 \end{gdimension}
 
 \begin{gdimension}{ascendingpunctuminclinatumshift}
@@ -1421,9 +1466,9 @@ Space at the beginning of the lines if there is no clef.
 The distance to shift choral signs down.  The following choral signs are shifted down:
 
 \begin{itemize}
-  \item Low choral signs that are not lower than the note
-  \item High choral signs which are in a space
-  \item Low choral signs that are lower than the note which are in a space
+	\item Low choral signs that are not lower than the note
+	\item High choral signs which are in a space
+	\item Low choral signs that are lower than the note which are in a space
 \end{itemize}
 \end{gdimension}
 
@@ -1431,8 +1476,8 @@ The distance to shift choral signs down.  The following choral signs are shifted
 The distance to shift choral signs up.  The following choral signs are shifted up:
 
 \begin{itemize}
-  \item High choral signs which are on a line
-  \item Low choral signs that are lower than the note which are on a line
+	\item High choral signs which are on a line
+	\item Low choral signs that are lower than the note which are on a line
 \end{itemize}
 \end{gdimension}
 
@@ -1552,7 +1597,7 @@ Vertical distance to place a punctum mora for the second note in a porrectus (or
 Distance to place a ``rare'' sign above the top space in a score.
 \end{gdimension}
 
-\subsubsection*{Bar distances}
+\subsubsection{Bar distances}
 
 \begin{gdimension}{bar@finalfinalis}
 This space is added before the final divisio final of a score (old bar spacing algorithm only).
@@ -1684,87 +1729,74 @@ Same as \texttt{maxbaroffsettextleft@eol} but when the center of the text goes r
 
 
 \subsection{Penalties}\label{penalties}
-Penalties are used by \TeX\ to determine where line and page breaks should occur.  Gregorio\TeX\ modifies or defines a few of its own to help with that process in scores.
+Penalties are used by \TeX\ to determine where line and page breaks should occur.  Gregorio\TeX\ modifies or defines a few of its own to help with that process in scores.  With the exception of \texttt{emergencystretch} (which should be changed using \verb=\grechangedim=) these should be changed using \verb=\grechangecount=, described above.
 
-\macroname{\textbackslash grebrokenpenalty}{}{gsp-default.tex}
+\begin{gcount}{brokenpenalty}
 The vertical penalty inserted after a break on a clef change.
+\end{gcount}
 
-Default: 0
-
-\macroname{\textbackslash greclubpenalty}{}{gsp-default.tex}
+\begin{gcount}{clubpenalty}
 The club penalty (determines how important it is to prevent orphans from occurring).
+\end{gcount}
 
-Default: 0
-
-\macroname{\textbackslash grewidowpenalty}{}{gsp-default.tex}
+\begin{gcount}{widowpenalty}
 The widow penalty (determines how important it is to prevent widows from occurring).
+\end{gcount}
 
-Default: 0
-
-\macroname{\textbackslash greemergencystretch}{}{gsp-default.tex}
-The value of the last ditch stretch for overfull boxes.
+\macroname{emergencystretch}{}{gsp-default.tex}
+The value of the last ditch stretch for overfull boxes.  This should be set using \verb=\grechangedim=.
 
 Default: \verb=\emergencystretch=
 
-\macroname{\textbackslash greendafterbarpenalty}{}{gsp-default.tex}
+\begin{gcount}{endafterbarpenalty}
 The end after bar penalty.
+\end{gcount}
 
-Default: $-200$
-
-\macroname{\textbackslash greendafterbaraltpenalty}{}{gsp-default.tex}
+\begin{gcount}{endafterbaraltpenalty}{}{gsp-default.tex}
 The alternate end after bar penalty (used when there is no text under the bar).
+\end{gcount}
 
-Default: $-200$
-
-\macroname{\textbackslash greendofelementpenalty}{}{gsp-default.tex}
+\begin{gcount}{endofelementpenalty}{}{gsp-default.tex}
 The end of element penalty.
+\end{gcount}
 
-Default: $-50$
-
-\macroname{\textbackslash greendofsyllablepenalty}{}{gsp-default.tex}
+\begin{gcount}{endofsyllablepenalty}{}{gsp-default.tex}
 The end of element penalty.
+\end{gcount}
 
-Default: $-50$
-
-\macroname{\textbackslash greendofwordpenalty}{}{gsp-default.tex}
+\begin{gcount}{endofwordpenalty}{}{gsp-default.tex}
 The end of element penalty.
+\end{gcount}
 
-Default: $-100$
-
-\macroname{\textbackslash grehyphenpenalty}{}{gsp-default.tex}
+\begin{gcount}{hyphenpenalty}{}{gsp-default.tex}
 The hyphen penalty.
+\end{gcount}
 
-Default: $-200$
-
-\macroname{\textbackslash grenobreakpenalty}{}{gsp-default.tex}
+\begin{gcount}{nobreakpenalty}{}{gsp-default.tex}
 Penalty to prevent a line break.
+\end{gcount}
 
-Default: 10001
-
-\macroname{\textbackslash grenewlinepenalty}{}{gsp-default.tex}
+\begin{gcount}{newlinepenalty}
 Penalty to force a line break.
+\end{gcount}
 
-Default: $-10001$
-
-\macroname{\textbackslash grefinalpenalty}{}{gsp-default.tex}
+\begin{gcount}{finalpenalty}
 The penalty applied after the final element of a score.
+\end{gcount}
 
-Default: $0$
-
-\macroname{\textbackslash grelooseness}{}{gsp-default.tex}
+\macroname{looseness}{}{gsp-default.tex}
 The \TeX\ looseness within a score.
 
 Default: \verb=\looseness=
 
-\macroname{\textbackslash gretolerance}{}{gsp-default.tex}
+\begin{gcount}{tolerance}
 The \TeX\ tolerance within a score.  See \url{https://en.wikibooks.org/wiki/TeX/tolerance} for an explanation of what tolerance is.
+\end{gcount}
 
-Default: 9000
-
-\macroname{\textbackslash grepretolerance}{}{gsp-default.tex}
+\macroname{pretolerance}{}{gsp-default.tex}
 The \TeX\ pretolerance within a score.  See \url{https://en.wikibooks.org/wiki/TeX/pretolerance} for an explanation of what pretolerance is.
 
-Default: $-1$ (Lua\TeX\ versions prior to 0.80) or \verb=\pretolerance= (versions after, and including, 0.80)
+Default: $-1$ (Lua\TeX\ versions prior to 0.80) or \verb=\pretolerance= (versions after, and including, 0.80)]
 
 \textit{Nota bene:} For more details on why this is necessary see the comments in gsp-default.tex.
 
@@ -1773,15 +1805,12 @@ Default: $-1$ (Lua\TeX\ versions prior to 0.80) or \verb=\pretolerance= (version
 
 
 \subsection{Colors}\label{colors}
-Colors are strictly a \LaTeX\ phenomena as currently implemented.  All
-commands which change a color will raise a warning in Plain \TeX, but will not alter the document.
-
 All colors can be redefined using \verb=\definecolor=.  See the
-\verb=xcolor= package for documentation.
+\verb=xcolor= (\LaTeX) or \verb=color= (Plain\TeX) package for documentation.
 
 Example:\par\medskip
 \begin{latexcode}
-  \definecolor{gregoriocolor}{RGB}{229,53,44}
+	\definecolor{gregoriocolor}{RGB}{229,53,44}
 \end{latexcode}
 
 \macroname{grebackgroundcolor}{}{gregoriotex.sty}
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
index 9319935f362..2ffa06181cb 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
@@ -16,23 +16,23 @@ defined in the \texttt{main.tex} file. If so, this macro does nothing,
 respecting the annotation value in the \texttt{main.tex} file.
 
 \begin{argtable}
-  \#1 & string & First line text to place above the initial.\\
-  \#2 & string & Second line text to place above the initial.\\
+	\#1 & string & First line text to place above the initial.\\
+	\#2 & string & Second line text to place above the initial.\\
 \end{argtable}
 
 \macroname{\textbackslash GreBeginScore}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-main.tex}
 Macro to start a score.
 
 \begin{argtable}
-  \#1 & string  & a unique identifier for the score (currently an SHA-1-based digest of the gabc file)\\
-  \#2 & integer & the height number of the top pitch of the entire score, including signs\\
-  \#3 & integer & the height number of the bottom pitch of the entire score, including signs\\
-  \#4 & 0 & there is no translation line in the score\\
-      & 1 & there is a translation line somewhere in the score\\
-  \#5 & 0 & there is no above lines text in the score\\
-      & 1 & there is above lines text somewhere in the score\\
-  \#6 & string  & the absolute filename of the gabc file if point-and-click is enabled\\
-  \#7 & integer & the number of staff lines\\
+	\#1 & string  & a unique identifier for the score (currently an SHA-1-based digest of the gabc file)\\
+	\#2 & integer & the height number of the top pitch of the entire score, including signs\\
+	\#3 & integer & the height number of the bottom pitch of the entire score, including signs\\
+	\#4 & 0 & there is no translation line in the score\\
+			& 1 & there is a translation line somewhere in the score\\
+	\#5 & 0 & there is no above lines text in the score\\
+			& 1 & there is above lines text somewhere in the score\\
+	\#6 & string  & the absolute filename of the gabc file if point-and-click is enabled\\
+	\#7 & integer & the number of staff lines\\
 \end{argtable}
 
 \macroname{\textbackslash GreEndScore}{}{gregoriotex-main.tex}
@@ -48,111 +48,112 @@ Macro called at the end of a set of gabc headers.
 Macro for typesetting an accentus.
 
 \begin{argtable}
-  \#1 & integer & height number of episema\\
-  \#2 & string  & Type of glyph the episema is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+	\#1 & integer & height number of episema\\
+	\#2 & string  & Type of glyph the episema is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreAdditionalLine}{\#1\#2\#3}{gregoriotex-signs.tex}
 Macro to typeset the additional line above or below the staff.
 
 \begin{argtable}
-  \#1 & string  & See \nameref{EpisemaSpecial}.\\
-  \#2 & integer & The ambitus of the porrectus or porrectus flexus if the first references these glyph types; ignored otherwise.\\
-  \#3 & integer & Set horizontal episema (0), horizontal episema under a note (1), line at top of staff (2), line at bottom of staff (3), choral sign (4).\\
+	\#1 & string  & See \nameref{EpisemaSpecial}.\\
+	\#2 & integer & The ambitus of the porrectus or porrectus flexus if the first references these glyph types; ignored otherwise.\\
+	\#3 & integer & Set horizontal episema (0), horizontal episema under a note (1), line at top of staff (2), line at bottom of staff (3), choral sign (4).\\
 \end{argtable}
 
-\macroname{\textbackslash GreAdHocSpaceEndOfElement}{\#1\#2}{gregoriotex-main.tex}
+\macroname{\textbackslash GreAdHocSpaceEndOfElement}{\#1\#2\#3}{gregoriotex-main.tex}
 Macro to end an element with an ad-hoc space.
 
 \begin{argtable}
-  \#1 & float & The factor to scale the default space for use as an ad-hoc space.\\
-  \#2 & \texttt{0} & Space is breakable.\\
-  & \texttt{1} & Space is unbreakable.\\
+	\#1 & float & The factor to scale the default space for use as an ad-hoc space.\\
+	\#2 & \texttt{0} & Space is breakable.\\
+	& \texttt{1} & Space is unbreakable.\\
+	\#3 & integer & The number of notes in the syllable prior to this macro.\\
 \end{argtable}
 
 \macroname{\textbackslash GreAugmentumDuplex}{\#1\#2\#3}{gregoriotex-signs.tex}
 Macro for typesetting an augmentum duplex (a pair of punctum mora)
 
 \begin{argtable}
-  \#1 & integer & Height number for first punctum mora.\\
-  \#2 & integer & Height number for second punctum mora.\\
-  \#3 & integer & First punctum mora occurs before last note of a podatus, prorectus, or toculus resupinus (1), or not (0).\\
+	\#1 & integer & Height number for first punctum mora.\\
+	\#2 & integer & Height number for second punctum mora.\\
+	\#3 & integer & First punctum mora occurs before last note of a podatus, prorectus, or toculus resupinus (1), or not (0).\\
 \end{argtable}
 
 \macroname{\textbackslash GreBarBrace}{\#1}{gregoriotex-signs.tex}
 Macro for typesetting a bar brace.
 
 \begin{argtable}
-  \#1 & string & Type of glyph the episema is attached to.  See \nameref{EpisemaSpecial} argument for description of options.\\
+	\#1 & string & Type of glyph the episema is attached to.  See \nameref{EpisemaSpecial} argument for description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreBarSyllable}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-syllable.tex}
 Macro for typesetting a bar syllable.
 
 \begin{argtable}
-  \#1 & \TeX\ code & macro setting syllable letters for the current syllable\\
-  \#2 & empty & reserved for future use\\
-  \#3 & \TeX\ control sequence & the control sequence to use for styling the hyphen\\
-  \#4 & \texttt{0} & this syllable is not the end of a word\\
-  & \texttt{1} & this syllable is the end of a word\\
-  \#5 & \TeX\ code & macros setting syllable letters for the next syllable\\
-  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
-  \#7 & & alignment type of the first next glyph\\
-  \#8 &\TeX\ code & other macros (translation, double text, etc.) that don't fit in the limitation of the number of arguments\\
-  \#9 & \TeX\ code & The bar line (usually a \textit{writebar} call).
+	\#1 & \TeX\ code & macro setting syllable letters for the current syllable\\
+	\#2 & empty & reserved for future use\\
+	\#3 & \TeX\ control sequence & the control sequence to use for styling the hyphen\\
+	\#4 & \texttt{0} & this syllable is not the end of a word\\
+	& \texttt{1} & this syllable is the end of a word\\
+	\#5 & \TeX\ code & macros setting syllable letters for the next syllable\\
+	\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
+	\#7 & & alignment type of the first next glyph\\
+	\#8 &\TeX\ code & other macros (translation, double text, etc.) that don't fit in the limitation of the number of arguments\\
+	\#9 & \TeX\ code & The bar line (usually a \textit{writebar} call).
 \end{argtable}
 
 \macroname{\textbackslash GreBarVEpisema}{\#1}{gregoriotex-signs.tex}
 Macro to typeset a vertical episema on a bar.
 
 \begin{argtable}
-  \#1 & string & Type of glyph the episema is attached to.  See \nameref{EpisemaSpecial} argument for description of options.\\
+	\#1 & string & Type of glyph the episema is attached to.  See \nameref{EpisemaSpecial} argument for description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreBeginEUOUAE}{\#1}{gregoriotex-main.tex}
 Macro to mark the beginning of a EUOUAE block.  Alters spacings and prohibits a line break until the end of the block.
 
 \begin{argtable}
-  \#1 & integer & The identifier of the EUOUAE block.\\
+	\#1 & integer & The identifier of the EUOUAE block.\\
 \end{argtable}
 
 \macroname{\textbackslash GreBeginNLBArea}{\#1\#2}{gregoriotex-main.tex}
 Macro called at beginning of a no line break area.
 
 \begin{argtable}
-  \#1 & \texttt{0} & Not in the neumes.\\
-  & \texttt{1} & In the neumes.\\
-  \#2 & \texttt{0} & Call didn't come from translation centering.\\
-  & \texttt{1} & Call came from translation centering.
+	\#1 & \texttt{0} & Not in the neumes.\\
+	& \texttt{1} & In the neumes.\\
+	\#2 & \texttt{0} & Call didn't come from translation centering.\\
+	& \texttt{1} & Call came from translation centering.
 \end{argtable}
 
 \macroname{\textbackslash GreBold}{\#1}{gregoriotex.sty and gregoriotex.tex}
 Makes argument bold.  Accesses \LaTeX\ \verb=\textbf= (\textit{gregoriotex.sty}) or Plain \TeX\ \verb=\bf= (\textit{gregoriotex.tex}) as appropriate.  Corresponds to ``<b></b>'' tags in gabc.
 
 \begin{argtable}
-  \#1 & string & Text to be typeset in bold.\\
+	\#1 & string & Text to be typeset in bold.\\
 \end{argtable}
 
 \macroname{\textbackslash GreChangeClef}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
 Macro called when key changes
 
 \begin{argtable}
-  \#1 & character & Type of new clef (c or f).\\
-  \#2 & \texttt{1}--\texttt{5} & Line of new clef.\\
-  \#3 & \texttt{0} & Print space before clef.\\
-  & \texttt{1} & Do not print space before clef.\\
-  \#4 & integer & Height number of flat in clef (\texttt{3} for no flat).\\
-  \#5 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
-  \#6 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
-  \#7 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
+	\#1 & character & Type of new clef (c or f).\\
+	\#2 & \texttt{1}--\texttt{5} & Line of new clef.\\
+	\#3 & \texttt{0} & Print space before clef.\\
+	& \texttt{1} & Do not print space before clef.\\
+	\#4 & integer & Height number of flat in clef (\texttt{3} for no flat).\\
+	\#5 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
+	\#6 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
+	\#7 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
 \end{argtable}
 
 \macroname{\textbackslash GreCirculus}{\#1\#2}{gregoriotex-signs.tex}
 Macro for typesetting a circulus.
 
 \begin{argtable}
-  \#1 & integer & Height number of circulus.\\
-  \#2 & string  & Type of glyph the circulus is attached to.  See \nameref{EpisemaSpecial} argument for description of options.\\
+	\#1 & integer & Height number of circulus.\\
+	\#2 & string  & Type of glyph the circulus is attached to.  See \nameref{EpisemaSpecial} argument for description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreColored}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
@@ -164,7 +165,7 @@ reversa ascendens neumes on the ``d'' (lowest) line.  This macro is
 defined and re-defined by the \verb=\gresetgregoriofont= macro.
 
 \begin{argtable}
-  \#1 & \TeX{} code & The \TeX{} code to use when long stems are not forced.\\
+	\#1 & \TeX{} code & The \TeX{} code to use when long stems are not forced.\\
 \end{argtable}
 
 \macroname{\textbackslash GreCP...}{}{gregoriotex-main.tex}
@@ -174,8 +175,11 @@ A class of macros which point to the individual characters in a Gregoiro\TeX\ co
 Typesets a custos.
 
 \begin{argtable}
-  \#1 & integer & Height number of custos.\\
-  \#2 & integer & Indicate if the custo is the last of the score.\\
+	\#1 & integer & Height number of custos.\\
+	\#2 & \texttt{Flat} & The custos should have a flat.\\
+			& \texttt{Natural} & The custos should have a natural.\\
+			& \texttt{Sharp} & The custos should have a sharp.\\
+			& \textit{empty} & The custos should not have an alteration.\\
 \end{argtable}
 
 \macroname{\textbackslash GreDagger}{}{gregoriotex-symbols.tex}
@@ -185,79 +189,79 @@ Macro to typeset a dagger (\GreDagger).
 A Gregorio\TeX-specific discretionary. Currently only used to avoid clef change at beginning or end of line, or even with more complex data (z0::c3 for instance).  We require a special function because in the normal discretionary function you cannot use \verb=\hskip= (but you can use \verb=\kern=) and you cannot use \verb=\penalty= (which is useless indeed).  This macro corrects for these two limitations. The first argument allows to select the penalty assigned to the discretionary by recent version of Lua\TeX.
 
 \begin{argtable}
-  \#1 & integer & Type of discretionary (for penalty assignment). Currently possible value is 0 for clef change discretionaries.\\
-  \#2 & \TeX\ code & First argument of resulting \verb=\discretionary=.\\
-  \#3 & \TeX\ code & Third argument of resulting \verb=\discretionary=.\\
+	\#1 & integer & Type of discretionary (for penalty assignment). Currently possible value is 0 for clef change discretionaries.\\
+	\#2 & \TeX\ code & First argument of resulting \verb=\discretionary=.\\
+	\#3 & \TeX\ code & Third argument of resulting \verb=\discretionary=.\\
 \end{argtable}
 
 \macroname{\textbackslash GreDivisioFinalis}{\#1\#2}{gregoriotex-signs.tex}
 Macro to typeset a divisio finalis.
 
 \begin{argtable}
-  \#1 & \texttt{0} & There is no text under the bar.\\
-  & \texttt{1} & There is text under the bar.\\
-  \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio finalis (typically \verb=\grevepisema=).\\
+	\#1 & \texttt{0} & There is no text under the bar.\\
+	& \texttt{1} & There is text under the bar.\\
+	\#2 & \TeX\ code & Macros which may happen before the skip but after the divisio finalis (typically \verb=\grevepisema=).\\
 \end{argtable}
 
 \macroname{\textbackslash GreDivisioMaior}{\#1\#2}{gregoriotex-signs.tex}
 Macro to typeset a divisio maior.
 
 \begin{argtable}
-  \#1 & \texttt{0} & There is no text under the bar.\\
-  & \texttt{1} & There is text under the bar.\\
-  \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio maior (typically \verb=\grevepisema=).\\
+	\#1 & \texttt{0} & There is no text under the bar.\\
+	& \texttt{1} & There is text under the bar.\\
+	\#2 & \TeX\ code & Macros which may happen before the skip but after the divisio maior (typically \verb=\grevepisema=).\\
 \end{argtable}
 
 \macroname{\textbackslash GreDivisioMinima}{\#1\#2}{gregoriotex-signs.tex}
 Macro to typeset a divisio minima.
 
 \begin{argtable}
-  \#1 & \texttt{0} & There is no text under the bar.\\
-  & \texttt{1} & There is text under the bar.\\
-  \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio minima (typically \verb=\grevepisema=).\\
+	\#1 & \texttt{0} & There is no text under the bar.\\
+	& \texttt{1} & There is text under the bar.\\
+	\#2 & \TeX\ code & Macros which may happen before the skip but after the divisio minima (typically \verb=\grevepisema=).\\
 \end{argtable}
 
 \macroname{\textbackslash GreDivisioMinor}{\#1\#2}{gregoriotex-signs.tex}
 Macro to typeset a divisio minor.
 
 \begin{argtable}
-  \#1 & \texttt{0} & There is no text under the bar.\\
-  & \texttt{1} & There is text under the bar.\\
-  \#2 & \TeX\ code & Macros which may happen before the skip but after the divisio minor (typically \verb=\grevepisema=).\\
+	\#1 & \texttt{0} & There is no text under the bar.\\
+	& \texttt{1} & There is text under the bar.\\
+	\#2 & \TeX\ code & Macros which may happen before the skip but after the divisio minor (typically \verb=\grevepisema=).\\
 \end{argtable}
 
 \macroname{\textbackslash GreDominica}{\#1\#2\#3}{gregoriotex-signs.tex}
 Macro to typeset a dominican bar.
 
 \begin{argtable}
-  \#1 & \texttt{1}--\texttt{6} & Type of dominican bar.  Corresponds to bar types 6--13 in \verb=\grewritebar=.\\
-  \#2 & \texttt{0} & There is no text under the bar.\\
-  & \texttt{1} & There is text under the bar.\\
-  \#3 & \TeX\ code    & Macros which may happen before the skip but after the divisio dominica (typically \verb=\grevepisema=).\\
+	\#1 & \texttt{1}--\texttt{6} & Type of dominican bar.  Corresponds to bar types 6--13 in \verb=\grewritebar=.\\
+	\#2 & \texttt{0} & There is no text under the bar.\\
+	& \texttt{1} & There is text under the bar.\\
+	\#3 & \TeX\ code    & Macros which may happen before the skip but after the divisio dominica (typically \verb=\grevepisema=).\\
 \end{argtable}
 
 \macroname{\textbackslash GreDrawAdditionalLine}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
 Macro to draw ledger lines.
 
 \begin{argtable}
-  \#1 & \texttt{0} & Draw an over-the-staff ledger line. \\
-      & \texttt{1} & Draw an under-the-staff ledger line. \\
-  \#2 & distance   & The length of the line, with TeX units, excluding any left or right distances coming from the rest of the arguments. \\
-  \#3 & \texttt{0} & Start the line at this point. \\
-      & \texttt{1} & Start the line to the left of this point by \verb=gre@dimen@additionallineswidth=. \\
-      & \texttt{2} & Start the line to the left of this point by \#4. \\
-  \#4 & distance   & The distance to move left before starting the line if \#3 is \texttt{2}. \\
-  \#5 & \texttt{0} & End the line exactly \#2 to the right of this point. \\
-      & \texttt{1} & End the line \verb=gre@dimen@additionallineswidth= to the right of \#2 from this point. \\
-      & \texttt{2} & End the line \#6 to the right of \#2 from this point. \\
-  \#6 & distance   & The distance to end the line after \#2 from this point if \#3 is \texttt{2}. \\
+	\#1 & \texttt{0} & Draw an over-the-staff ledger line. \\
+			& \texttt{1} & Draw an under-the-staff ledger line. \\
+	\#2 & distance   & The length of the line, with TeX units, excluding any left or right distances coming from the rest of the arguments. \\
+	\#3 & \texttt{0} & Start the line at this point. \\
+			& \texttt{1} & Start the line to the left of this point by \verb=gre@dimen@additionallineswidth=. \\
+			& \texttt{2} & Start the line to the left of this point by \#4. \\
+	\#4 & distance   & The distance to move left before starting the line if \#3 is \texttt{2}. \\
+	\#5 & \texttt{0} & End the line exactly \#2 to the right of this point. \\
+			& \texttt{1} & End the line \verb=gre@dimen@additionallineswidth= to the right of \#2 from this point. \\
+			& \texttt{2} & End the line \#6 to the right of \#2 from this point. \\
+	\#6 & distance   & The distance to end the line after \#2 from this point if \#3 is \texttt{2}. \\
 \end{argtable}
 
 \macroname{\textbackslash GreElision}{\#1}{gregoriotex-syllable.tex}
 Typesets \#1 using the \texttt{elision} style.
 
 \begin{argtable}
-  \#1 & string & Text to be typeset in the \texttt{elision} style.\\
+	\#1 & string & Text to be typeset in the \texttt{elision} style.\\
 \end{argtable}
 
 \macroname{\textbackslash GreEmptyFirstSyllableHyphen}{}{gregoriotex-syllable.tex}
@@ -267,87 +271,92 @@ Macro that indicates the position of an empty-first-syllable hyphen, should one
 Macro to mark the end of a EUOUAE block.
 
 \begin{argtable}
-  \#1 & \texttt{0} & ending element\\
-  & \texttt{1} & ending syllable\\
-  & \texttt{2} & ending score\\
-  & \texttt{3} & before bar
+	\#1 & \texttt{0} & ending element\\
+	& \texttt{1} & ending syllable\\
+	& \texttt{2} & ending score\\
+	& \texttt{3} & before bar
 \end{argtable}
 
-\macroname{\textbackslash GreEndOfElement}{\#1\#2}{gregoriotex-main.tex}
+\macroname{\textbackslash GreEndOfElement}{\#1\#2\#3}{gregoriotex-main.tex}
 Macro to end elements.
 
 \begin{argtable}
-  \#1 & \texttt{0} & Default space.\\
-  & \texttt{1} & Larger space.\\
-  & \texttt{2} & Glyph space.\\
-  & \texttt{3} & Zero-width space.\\
-  & \texttt{4} & Ad-hoc space.\\
-  \#2 & \texttt{0} & Space is breakable.\\
-  & \texttt{1} & Space is unbreakable.\\
+	\#1 & \texttt{0} & Default space.\\
+	& \texttt{1} & Larger space.\\
+	& \texttt{2} & Glyph space.\\
+	& \texttt{3} & Zero-width space.\\
+	& \texttt{4} & Ad-hoc space.\\
+	\#2 & \texttt{0} & Space is breakable.\\
+	& \texttt{1} & Space is unbreakable.\\
+	\#3 & integer & The number of notes in the syllable prior to this macro.\\
 \end{argtable}
 
 \macroname{\textbackslash GreEndNLBArea}{\#1\#2}{gregoriotex-main.tex}
 Macro to end a no line break area.
 
 \begin{argtable}
-  \#1 & 0 & ending element\\
-  & \texttt{1} & ending syllable\\
-  & \texttt{2} & ending score\\
-  & \texttt{3} & before bar\\
-  \#2 & \texttt{0} & ??\\ %I can’t tell what this flag is for
-  & else & ??
+	\#1 & 0 & ending element\\
+	& \texttt{1} & ending syllable\\
+	& \texttt{2} & ending score\\
+	& \texttt{3} & before bar\\
+	\#2 & \texttt{0} & ??\\ %I can’t tell what this flag is for
+	& else & ??
 \end{argtable}
 
 \macroname{\textbackslash GreEndOfGlyph}{\#1}{gregoriotex-main.tex}
 Macro to end a glyph without ending the element.
 
 \begin{argtable}
-  \#1 & \texttt{0} & Default space.\\
-  & \texttt{1} & Zero-width space.\\
-  & \texttt{2} & Space between flat or natural and a note.\\
-  & \texttt{3} & Space between two puncta inclinata, descending.\\
-  & \texttt{4} & Space between bivirga or trivirga.\\
-  & \texttt{5} & space between bistropha or tristropha.\\
-  & \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
-  & \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis, descending.\\
-  & \texttt{8} & Space between two puncta inclinata debilis.\\
-  & \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
-  & \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), descending.\\
-  & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), descending.\\
-  & \texttt{12} & Space between two puncta inclinata, ascending. \\
-  & \texttt{13} & Space between a punctum inclinatum and a punctum inclinatum debilis, ascending. \\
-  & \texttt{14} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), ascending. \\
-  & \texttt{15} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), ascending. \\
-  & \texttt{16} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch below. \\
-  & \texttt{17} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches below. \\
-  & \texttt{18} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches below \\
-  & \texttt{19} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch above. \\
-  & \texttt{20} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches above. \\
-  & \texttt{21} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches above \\
-  & \texttt{22} & Half-space. \\
-\end{argtable}
-
-\macroname{\textbackslash GreFinalCustos}{\#1}{gregoriotex-signs.tex}
+	\#1 & \texttt{0} & Default space.\\
+	& \texttt{1} & Zero-width space.\\
+	& \texttt{2} & Space between flat or natural and a note.\\
+	& \texttt{3} & Space between two puncta inclinata, descending.\\
+	& \texttt{4} & Space between bivirga or trivirga.\\
+	& \texttt{5} & space between bistropha or tristropha.\\
+	& \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
+	& \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis, descending.\\
+	& \texttt{8} & Space between two puncta inclinata debilis.\\
+	& \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
+	& \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), descending.\\
+	& \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), descending.\\
+	& \texttt{12} & Space between two puncta inclinata, ascending. \\
+	& \texttt{13} & Space between a punctum inclinatum and a punctum inclinatum debilis, ascending. \\
+	& \texttt{14} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), ascending. \\
+	& \texttt{15} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), ascending. \\
+	& \texttt{16} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch below. \\
+	& \texttt{17} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches below. \\
+	& \texttt{18} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches below \\
+	& \texttt{19} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch above. \\
+	& \texttt{20} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches above. \\
+	& \texttt{21} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches above \\
+	& \texttt{22} & Half-space. \\
+\end{argtable}
+
+\macroname{\textbackslash GreFinalCustos}{\#1\#2}{gregoriotex-signs.tex}
 Typesets a custos after the final bar in a score.
 
 \begin{argtable}
-  \#1 & integer & Height number of custos.\\
+	\#1 & integer & Height number of custos.\\
+	\#2 & \texttt{Flat} & The custos should have a flat.\\
+			& \texttt{Natural} & The custos should have a natural.\\
+			& \texttt{Sharp} & The custos should have a sharp.\\
+			& \textit{empty} & The custos should not have an alteration.\\
 \end{argtable}
 
 \macroname{\textbackslash GreFinalDivisioFinalis}{\#1}{gregoriotex-signs.tex}
 Macro to end a score with a divisio finalis.
 
 \begin{argtable}
-  \#1 & \texttt{0} & Something does not need to be placed after the divisio finalis.\\
-  & \texttt{1} & Something needs to be placed after the divisio finalis.\\
+	\#1 & \texttt{0} & Something does not need to be placed after the divisio finalis.\\
+	& \texttt{1} & Something needs to be placed after the divisio finalis.\\
 \end{argtable}
 
 \macroname{\textbackslash GreFinalDivisioMaior}{\#1}{gregoriotex-signs.tex}
 Macro to end a score with a divisio maior.
 
 \begin{argtable}
-  \#1 & \texttt{0} & Something does not need to be placed after the divisio maior.\\
-  & \texttt{1} & Something needs to be placed after the divisio maior.\\
+	\#1 & \texttt{0} & Something does not need to be placed after the divisio maior.\\
+	& \texttt{1} & Something needs to be placed after the divisio maior.\\
 \end{argtable}
 
 \macroname{\textbackslash GreFirstSyllable}{\#1}{gregoriotex-syllable.tex}
@@ -358,7 +367,7 @@ before the centered letters, for the centered letters, and for the letters
 after the centered letters.
 
 \begin{argtable}
-  \#1 & string & Text from the first syllable.
+	\#1 & string & Text from the first syllable.
 \end{argtable}
 
 \macroname{\textbackslash GreFirstSyllableInitial}{\#1}{gregoriotex-syllable.tex}
@@ -369,8 +378,8 @@ first letter of the syllable will be passed.  If the \texttt{initial-style} is
 may be redefined to style the first letter appropriately.
 
 \begin{argtable}
-  \#1 & string & The first letter of the first syllable which is not the
-                 initial of the score.
+	\#1 & string & The first letter of the first syllable which is not the
+								 initial of the score.
 \end{argtable}
 
 \macroname{\textbackslash GreFirstWord}{\#1}{gregoriotex-syllable.tex}
@@ -380,19 +389,19 @@ appropriately.  This macro may be called multiple times, depending on how
 many syllables are in the word.
 
 \begin{argtable}
-  \#1 & string & Text from the first word.
+	\#1 & string & Text from the first word.
 \end{argtable}
 
 \macroname{\textbackslash GreFlat}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
 Macro to typeset a flat.
 
 \begin{argtable}
-  \#1 & integer & Height number of the flat.\\
-  \#2 & \texttt{0} & The flat is not part of the clef.\\
-  & \texttt{1} & The flat is part of the clef.\\
-  \#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
-  \#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
-  \#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
+	\#1 & integer & Height number of the flat.\\
+	\#2 & \texttt{0} & The flat is not part of the clef.\\
+	& \texttt{1} & The flat is part of the clef.\\
+	\#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
+	\#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
+	\#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
 \end{argtable}
 
 \macroname{\textbackslash GreForceHyphen}{}{gregoriotex-syllable.tex}
@@ -405,38 +414,38 @@ Macro used between two fused glyphs.
 Macro for fusing two glyphs to create a larger neume.
 
 \begin{argtable}
-  \#1 & Gregorio\TeX\ glyph & The first glyph in the sequence.\\
-  \#2 & Gregorio\TeX\ glyph & The second.
+	\#1 & Gregorio\TeX\ glyph & The first glyph in the sequence.\\
+	\#2 & Gregorio\TeX\ glyph & The second.
 \end{argtable}
 
 \macroname{\textbackslash GreGlyph}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-syllable.tex}
 Macro to typeset a glyph.
 
 \begin{argtable}
-  \#1 & character & the character that it must call\\
-  \#2 & integer & The number for where the glyph is located.  \texttt{a} in gabc is 1, \texttt{b} is 2, \etc\\
-  \#3 & integer & height number of the next note\\
-  \#4 & \texttt{0} & One-note glyph or more than two notes glyph except porrectus: \ie,  we must put the aligncenter in the middle of the first note\\
-  & \texttt{1} & Two notes glyph (podatus is considered as a one-note glyph): \ie, we put the aligncenter in the middle of the glyph\\
-  & \texttt{2} & Porrectus: has a special align center.\\
-  & \texttt{3} & initio-debilis : same as 1 but the first note is much smaller\\
-  & \texttt{4} & case of a glyph starting with a quilisma\\
-  & \texttt{5} & case of a glyph starting with an oriscus\\
-  & \texttt{6} & case of a punctum inclinatum\\
-  & \texttt{7} & case of a stropha\\
-  & \texttt{8} & flexus with an ambitus of one\\
-  & \texttt{9} & flexus deminutus\\
-  \#5 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
-  \#6 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
-  \#7 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled
+	\#1 & character & the character that it must call\\
+	\#2 & integer & The number for where the glyph is located.  \texttt{a} in gabc is 1, \texttt{b} is 2, \etc\\
+	\#3 & \TeX\ code & code to set the next custos (using \verb=\GreNextCustos=)\\
+	\#4 & \texttt{0} & One-note glyph or more than two notes glyph except porrectus: \ie,  we must put the aligncenter in the middle of the first note\\
+	& \texttt{1} & Two notes glyph (podatus is considered as a one-note glyph): \ie, we put the aligncenter in the middle of the glyph\\
+	& \texttt{2} & Porrectus: has a special align center.\\
+	& \texttt{3} & initio-debilis : same as 1 but the first note is much smaller\\
+	& \texttt{4} & case of a glyph starting with a quilisma\\
+	& \texttt{5} & case of a glyph starting with an oriscus\\
+	& \texttt{6} & case of a punctum inclinatum\\
+	& \texttt{7} & case of a stropha\\
+	& \texttt{8} & flexus with an ambitus of one\\
+	& \texttt{9} & flexus deminutus\\
+	\#5 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
+	\#6 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
+	\#7 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled
 \end{argtable}
 
 \macroname{\textbackslash GreGlyphHeights}{\#1\#2}{gregoriotex-syllable.tex}
 Passes the glyph height limits.
 
 \begin{argtable}
-  \#1 & integer & the high height\\
-  \#2 & integer & the low height
+	\#1 & integer & the high height\\
+	\#2 & integer & the low height
 \end{argtable}
 
 \macroname{\textbackslash GregorioTeXAPIVersion}{\#1}{gregoriotex-main.tex}
@@ -444,43 +453,43 @@ Checks to see if Gregorio\TeX\ API is version specified by argument (and
 therefore compatible with the score.
 
 \begin{argtable}
-  \#1 & string & Version number for Gregorio\TeX.\\
+	\#1 & string & Version number for Gregorio\TeX.\\
 \end{argtable}
 
 \macroname{\textbackslash GreHeader}{\#1\#2}{gregoriotex-main.tex}
 Macro used to pass headers to TeX.
 
 \begin{argtable}
-  \#1 & string & The header name.\\
-  \#2 & string & The header value.\\
+	\#1 & string & The header name.\\
+	\#2 & string & The header value.\\
 \end{argtable}
 
 \macroname{\textbackslash GreHEpisema}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-signs.tex}
 Macro to typeset an horizontal episema.
 
 \begin{argtable}
-  \#1 & integer & Height number of the episema.\\
-  \#2 & string  & See \nameref{EpisemaSpecial}.\\
-  \#3 & integer & The ambitus for a two note episema at the diagonal stroke of a
-    porrectus, porrectus flexus, orculus resupinus, or torculus resupinus
-    flexus.\\
-  \#4 & \texttt{0} & an horizontal episema\\
-  & \texttt{1} & an horizontal episema under a note\\
-  & \texttt{2} & a line at the top\\
-  & \texttt{3} & a line at the bottom\\
-  \#5 & \texttt{f} & a normal episema\\
-  & \texttt{l} & a small episema aligned left\\
-  & \texttt{c} & a small episema aligned center\\
-  & \texttt{r} & a small episema aligned right\\
-  \#6 & integer & Replacement for \#1 if a bridge causes a height substitution.\\
-  \#7 & \TeX\ code & code that sets heuristics\\
-  \#8 & string & a positive or negative "nudge" (dimension) for the vertical position of the horizontal episema\\
-  \#9 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\
-  & \texttt{1} & for horizontal episema cases, position in the middle of the space\\
-  & \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-  & \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\
-  & \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-  & \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\
+	\#1 & integer & Height number of the episema.\\
+	\#2 & string  & See \nameref{EpisemaSpecial}.\\
+	\#3 & integer & The ambitus for a two note episema at the diagonal stroke of a
+		porrectus, porrectus flexus, orculus resupinus, or torculus resupinus
+		flexus.\\
+	\#4 & \texttt{0} & an horizontal episema\\
+	& \texttt{1} & an horizontal episema under a note\\
+	& \texttt{2} & a line at the top\\
+	& \texttt{3} & a line at the bottom\\
+	\#5 & \texttt{f} & a normal episema\\
+	& \texttt{l} & a small episema aligned left\\
+	& \texttt{c} & a small episema aligned center\\
+	& \texttt{r} & a small episema aligned right\\
+	\#6 & integer & Replacement for \#1 if a bridge causes a height substitution.\\
+	\#7 & \TeX\ code & code that sets heuristics\\
+	\#8 & string & a positive or negative "nudge" (dimension) for the vertical position of the horizontal episema\\
+	\#9 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\
+	& \texttt{1} & for horizontal episema cases, position in the middle of the space\\
+	& \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\
+	& \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\
+	& \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\
+	& \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\
 \end{argtable}
 
 \macroname{\textbackslash GreHEpisemaBridge}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
@@ -488,39 +497,39 @@ Macro to typeset a bridge episema for the last note of a glyph
 (element, syllable) if the next episema is at the same height.
 
 \begin{argtable}
-  \#1 & integer & Height number of the episema.\\
-  \#2 & \texttt{0} & Episema above the note.\\
-  & \texttt{1} & Episema below the note.\\
-  \#3 & \texttt{0} & Default space.\\
-  & \texttt{1} & Zero-width space.\\
-  & \texttt{2} & Space between flat or natural and a note.\\
-  & \texttt{3} & Space between two puncta inclinata.\\
-  & \texttt{4} & Space between bivirga or trivirga.\\
-  & \texttt{5} & space between bistropha or tristropha.\\
-  & \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
-  & \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis.\\
-  & \texttt{8} & Space between two puncta inclinata debilis.\\
-  & \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
-  & \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\
-  & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).\\
-  \#4 & \TeX\ code & code that sets heuristics\\
-  \#5 & string & a positive or negative "nudge" (dimension) for the vertical position of the horizontal episema\\
-  \#6 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\
-  & \texttt{1} & for horizontal episema cases, position in the middle of the space\\
-  & \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-  & \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\
-  & \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-  & \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\
+	\#1 & integer & Height number of the episema.\\
+	\#2 & \texttt{0} & Episema above the note.\\
+	& \texttt{1} & Episema below the note.\\
+	\#3 & \texttt{0} & Default space.\\
+	& \texttt{1} & Zero-width space.\\
+	& \texttt{2} & Space between flat or natural and a note.\\
+	& \texttt{3} & Space between two puncta inclinata.\\
+	& \texttt{4} & Space between bivirga or trivirga.\\
+	& \texttt{5} & space between bistropha or tristropha.\\
+	& \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
+	& \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis.\\
+	& \texttt{8} & Space between two puncta inclinata debilis.\\
+	& \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
+	& \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\
+	& \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).\\
+	\#4 & \TeX\ code & code that sets heuristics\\
+	\#5 & string & a positive or negative "nudge" (dimension) for the vertical position of the horizontal episema\\
+	\#6 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\
+	& \texttt{1} & for horizontal episema cases, position in the middle of the space\\
+	& \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\
+	& \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\
+	& \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\
+	& \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\
 \end{argtable}
 
 \macroname{\textbackslash GreHighChoralSign}{\#1\#2\#3}{gregoriotex-signs.tex}
 Macro for typesetting high choral signs.
 
 \begin{argtable}
-  \#1 & integer & Height number of the sign.\\
-  \#2 & string  & The choral sign.\\
-  \#3 & \texttt{0} & Choral sign does not occur before last note of podatus, porrectus, or torculus resupinus.\\
-  & \texttt{1} & Choral sign occurs before last note of podatus, porrectus, or torculus resupinus.\\
+	\#1 & integer & Height number of the sign.\\
+	\#2 & string  & The choral sign.\\
+	\#3 & \texttt{0} & Choral sign does not occur before last note of podatus, porrectus, or torculus resupinus.\\
+	& \texttt{1} & Choral sign occurs before last note of podatus, porrectus, or torculus resupinus.\\
 \end{argtable}
 
 \macroname{\textbackslash GreHyph}{}{gregoriotex-main.tex}
@@ -550,7 +559,7 @@ Plain \TeX\ \verb=\it= as appropriate.  Corresponds to ``<i></i>'' tags
 in gabc.
 
 \begin{argtable}
-  \#1 & string & Text to be typeset in italic font.\\
+	\#1 & string & Text to be typeset in italic font.\\
 \end{argtable}
 
 \macroname{\textbackslash GreLastOfLine}{}{gregoriotex-main.tex}
@@ -563,40 +572,40 @@ Macro to mark the syllable as the last of the score.
 Indicates that this syllable is the last syllable before a EUOUAE block.
 
 \begin{argtable}
-  \#1 & integer & The identifier of the EUOUAE block.\\
-  \#2 & \texttt{0} & There is no line break between this syllable and the EUOUAE block.\\
-      & \texttt{1} & There is a line break between this syllable and the beginning of the EUOUAE block.\\
+	\#1 & integer & The identifier of the EUOUAE block.\\
+	\#2 & \texttt{0} & There is no line break between this syllable and the EUOUAE block.\\
+			& \texttt{1} & There is a line break between this syllable and the beginning of the EUOUAE block.\\
 \end{argtable}
 
 \macroname{\textbackslash GreLinea}{\#1\#2\#3}{gregoriotex-signs.tex}
 Macro for typesetting a linea.
 
 \begin{argtable}
-  \#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
-  \#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
-  \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+	\#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+	\#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+	\#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
 \end{argtable}
 
 \macroname{\textbackslash GreLineaPunctumCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
 Macro to typeset a linea punctum cavum.
 
 \begin{argtable}
-  \#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
-  \#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
-  \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
-  \#4 & \TeX\ code    & Macros executed before the punctum cavum is written.\\
-  \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
-  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+	\#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+	\#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+	\#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+	\#4 & \TeX\ code    & Macros executed before the punctum cavum is written.\\
+	\#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+	\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
 \end{argtable}
 
 \macroname{\textbackslash GreLowChoralSign}{\#1\#2\#3}{gregoriotex-signs.tex}
 Macro for typesetting low choral signs.
 
 \begin{argtable}
-  \#1 & integer & Height number of the sign.\\
-  \#2 & string  & The choral sign.\\
-  \#3 & \texttt{0} & Choral sign does not occur before last note of podatus, porrectus, or torculus resupinus.\\
-  & \texttt{1} & Choral sign occurs before last note of podatus, porrectus, or torculus resupinus.\\
+	\#1 & integer & Height number of the sign.\\
+	\#2 & string  & The choral sign.\\
+	\#3 & \texttt{0} & Choral sign does not occur before last note of podatus, porrectus, or torculus resupinus.\\
+	& \texttt{1} & Choral sign occurs before last note of podatus, porrectus, or torculus resupinus.\\
 \end{argtable}
 
 \macroname{\textbackslash GreMode}{\#1\#2\#3}{gregoriotex-main.tex}
@@ -607,21 +616,21 @@ function does nothing. Also, if the \texttt{annotation} header field
 is used, then this function does nothing.
 
 \begin{argtable}
-  \#1 & \TeX\ code & Mode text to place above the initial of a score in the \texttt{modeline} style.\\
-  \#2 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modemodifier} style, after the mode text.\\
-  \#3 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modedifferentia} style, after \#2.\\
+	\#1 & \TeX\ code & Mode text to place above the initial of a score in the \texttt{modeline} style.\\
+	\#2 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modemodifier} style, after the mode text.\\
+	\#3 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modedifferentia} style, after \#2.\\
 \end{argtable}
 
 \macroname{\textbackslash GreNatural}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
 Macro to typeset a natural.
 
 \begin{argtable}
-  \#1 & integer & Height number of the natural.\\
-  \#2 & \texttt{0} & The natural is not part of the clef.\\
-  & \texttt{1} & The natural is part of the clef (doesn't happen).\\
-  \#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
-  \#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
-  \#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
+	\#1 & integer & Height number of the natural.\\
+	\#2 & \texttt{0} & The natural is not part of the clef.\\
+	& \texttt{1} & The natural is part of the clef (doesn't happen).\\
+	\#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
+	\#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
+	\#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
 \end{argtable}
 
 \macroname{\textbackslash GreNewLine}{}{gregoriotex-main.tex}
@@ -630,179 +639,183 @@ Macro to call if you want to go to the next line.
 \macroname{\textbackslash GreNewParLine}{}{gregoriotex-main.tex}
 Same as \verb=\GreNewLine= except line is not justified.
 
-\macroname{\textbackslash GreNextCustos}{\#1}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreNextCustos}{\#1\#2}{gregoriotex-signs.tex}
 Sets the pitch to use for the next custos if it were to happen at the point
 where this macro is called.
 
 \begin{argtable}
-  \#1 & integer & Height number of the custos.\\
+	\#1 & integer & Height number of the custos.\\
+	\#2 & \texttt{Flat} & The custos should have a flat.\\
+			& \texttt{Natural} & The custos should have a natural.\\
+			& \texttt{Sharp} & The custos should have a sharp.\\
+			& \textit{empty} & The custos should not have an alteration.\\
 \end{argtable}
 
 \macroname{\textbackslash GreNextSyllableBeginsEUOUAE}{\#1\#2}{gregoriotex-syllable.tex}
 Indicates that the syllable which follows begins a EUOUAE block.
 
 \begin{argtable}
-  \#1 & integer & The identifier of the EUOUAE block.\\
-  \#2 & \texttt{0} & There is no line break between this syllable and the EUOUAE block.\\
-      & \texttt{1} & There is a line break between this syllable and the beginning of the EUOUAE block.\\
+	\#1 & integer & The identifier of the EUOUAE block.\\
+	\#2 & \texttt{0} & There is no line break between this syllable and the EUOUAE block.\\
+			& \texttt{1} & There is a line break between this syllable and the beginning of the EUOUAE block.\\
 \end{argtable}
 
-\macroname{\textbackslash GreOriscusCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset an oriscus cavum (the oriscus points at a higher note).
+\macroname{\textbackslash GreAscendensOriscus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset an ascending oriscus cavum (the oriscus points at a higher note).
 
 \begin{argtable}
-  \#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
-  \#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
-  \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
-  \#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
-  \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
-  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+	\#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+	\#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+	\#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+	\#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
+	\#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+	\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
 \end{argtable}
 
-\macroname{\textbackslash GreOriscusCavumAuctus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset a reverse oriscus cavum (the oriscus points at a lower note).
+\macroname{\textbackslash GreDescendensOriscusCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro to typeset a descending oriscus cavum (the oriscus points at a lower note).
 
 \begin{argtable}
-  \#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
-  \#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
-  \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
-  \#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
-  \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
-  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+	\#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+	\#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+	\#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+	\#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
+	\#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+	\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
 \end{argtable}
 
 \macroname{\textbackslash GreOriscusCavumDeminutus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
 Macro to typeset a reverse oriscus cavum with a deminutus tail.
 
 \begin{argtable}
-  \#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
-  \#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
-  \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
-  \#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
-  \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
-  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+	\#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+	\#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+	\#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+	\#4 & \TeX\ code & Macros executed before the oriscus cavum is written.\\
+	\#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+	\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
 \end{argtable}
 
 \macroname{\textbackslash GreOverBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
 Macro to typeset a round brace above the lines.
 
 \begin{argtable}
-  \#1 & length & The width of the brace.\\
-  \#2 & length & A vertical shift.\\
-  \#3 & length & A horizontal shift.\\
-  \#4 & \texttt{0} & Don't shift before starting the brace.\\
-  & \texttt{1} & Shift back a punctum's width before starting the brace.
+	\#1 & length & The width of the brace.\\
+	\#2 & length & A vertical shift.\\
+	\#3 & length & A horizontal shift.\\
+	\#4 & \texttt{0} & Don't shift before starting the brace.\\
+	& \texttt{1} & Shift back a punctum's width before starting the brace.
 \end{argtable}
 
 \macroname{\textbackslash GreOverCurlyBrace}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
 Macro to typeset a curly brace above the lines.
 
 \begin{argtable}
-  \#1 & length & The width of the brace.\\
-  \#2 & length & A vertical shift.\\
-  \#3 & length & A horizontal shift.\\
-  \#4 & \texttt{0} & Don't shift before starting the brace.\\
-  & \texttt{1} & Shift back a punctum's width before starting the brace.\\
-  \#5 & \texttt{0} & No accentus above the brace.\\
-  & \texttt{1} & Typeset an accentus above the brace.
+	\#1 & length & The width of the brace.\\
+	\#2 & length & A vertical shift.\\
+	\#3 & length & A horizontal shift.\\
+	\#4 & \texttt{0} & Don't shift before starting the brace.\\
+	& \texttt{1} & Shift back a punctum's width before starting the brace.\\
+	\#5 & \texttt{0} & No accentus above the brace.\\
+	& \texttt{1} & Typeset an accentus above the brace.
 \end{argtable}
 
 \macroname{\textbackslash GrePunctumCavum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
 Macro to typeset a punctum cavum.
 
 \begin{argtable}
-  \#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
-  \#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
-  \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
-  \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
-  \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
-  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+	\#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+	\#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+	\#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+	\#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
+	\#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+	\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
 \end{argtable}
 
 \macroname{\textbackslash GrePunctumCavumInclinatum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
 Macro to typeset a punctum cavum inclinatus.
 
 \begin{argtable}
-  \#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
-  \#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
-  \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
-  \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
-  \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
-  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+	\#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+	\#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+	\#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+	\#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
+	\#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+	\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
 \end{argtable}
 
 \macroname{\textbackslash GrePunctumCavumInclinatumAuctus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
 Macro to typeset a punctum cavum inclinatus auctus.
 
 \begin{argtable}
-  \#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
-  \#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
-  \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
-  \#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
-  \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
-  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
+	\#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+	\#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+	\#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+	\#4 & \TeX\ code & Macros executed before the punctum cavum is written.\\
+	\#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+	\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.
 \end{argtable}
 
 \macroname{\textbackslash GrePunctumMora}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
 Macro for typesetting punctum mora.
 
 \begin{argtable}
-  \#1 & integer & Height number of punctum mora.\\
-  \#2 & \texttt{0} & General case.\\
-  & \texttt{1} & Make the punctum mora zero width.\\
-  & \texttt{2} & Shift left width of 1 punctum.\\
-  & \texttt{3} & Shift left width of 1 punctum if last ambitus is 1.\\
-  \#3 & \texttt{0} & Punctum mora does not occur before last note of podatus, porrectus, or torculus resupinus.\\
-  & \texttt{1} & Punctum mora occurs before last note of podatus, porrectus, or torculus resupinus.\\
-  \#4 & \texttt{0} & No punctum inclinatum.\\
-  & \texttt{1} & Punctum inclinatum.\\
+	\#1 & integer & Height number of punctum mora.\\
+	\#2 & \texttt{0} & General case.\\
+	& \texttt{1} & Make the punctum mora zero width.\\
+	& \texttt{2} & Shift left width of 1 punctum.\\
+	& \texttt{3} & Shift left width of 1 punctum if last ambitus is 1.\\
+	\#3 & \texttt{0} & Punctum mora does not occur before last note of podatus, porrectus, or torculus resupinus.\\
+	& \texttt{1} & Punctum mora occurs before last note of podatus, porrectus, or torculus resupinus.\\
+	\#4 & \texttt{0} & No punctum inclinatum.\\
+	& \texttt{1} & Punctum inclinatum.\\
 \end{argtable}
 
 \macroname{\textbackslash GreReversedAccentus}{\#1\#2}{gregoriotex-signs.tex}
 Macro for typesetting a reversed accentus.
 
 \begin{argtable}
-  \#1 & integer & Height number of accentus.\\
-  \#2 & string  & Type of glyph the accentus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+	\#1 & integer & Height number of accentus.\\
+	\#2 & string  & Type of glyph the accentus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreReversedSemicirculus}{\#1\#2}{gregoriotex-signs.tex}
 Macro for typesetting a reversed semicirculus.
 
 \begin{argtable}
-  \#1 & integer & Height number of semicirculus.\\
-  \#2 & string  & Type of glyph the semicirculus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+	\#1 & integer & Height number of semicirculus.\\
+	\#2 & string  & Type of glyph the semicirculus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreScoreOpening}{\#1\#2\#3\#4\#5}{gregoriotex-syllable.tex}
 Opens the score.
 
 \begin{argtable}
-  \#1 & \TeX\ code & Macros rendering the things after the initial but before the notes.\\
-  \#2 & \TeX\ code & Macros rendering the things after starting notes but before the syllable.\\
-  \#3 & \TeX\ code & Macros rendering the things before the initial.\\
-  \#4 & \TeX\ control sequence & Control sequence for the syllable.\\
-  \#5 & \TeX\ code & Macros rendering the first syllable; should emit the initial and populate \verb=\gre@opening@syllabletext=.\\
+	\#1 & \TeX\ code & Macros rendering the things after the initial but before the notes.\\
+	\#2 & \TeX\ code & Macros rendering the things after starting notes but before the syllable.\\
+	\#3 & \TeX\ code & Macros rendering the things before the initial.\\
+	\#4 & \TeX\ control sequence & Control sequence for the syllable.\\
+	\#5 & \TeX\ code & Macros rendering the first syllable; should emit the initial and populate \verb=\gre@opening@syllabletext=.\\
 \end{argtable}
 
 \macroname{\textbackslash GreSemicirculus}{\#1\#2}{gregoriotex-signs.tex}
 Macro for typesetting a semicirculus.
 
 \begin{argtable}
-  \#1 & integer & Height number of semicirculus.\\
-  \#2 & string  & Type of glyph the semicirculus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+	\#1 & integer & Height number of semicirculus.\\
+	\#2 & string  & Type of glyph the semicirculus is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreSetFirstSyllableText}{\#1\#2\#3\#4\#5\#6}{gregoriotex-syllable.tex}
 Sets the first syllable text.
 
 \begin{argtable}
-  \#1 & \TeX\ code & Initial.\\
-  \#2 & \TeX\ code & First letter after the initial.\\
-  \#3 & \TeX\ code & Everything else in the syllable.\\
-  \#4 & \TeX\ code & Three syllable parts when there is a separated initial.\\
-  \#5 & \TeX\ code & Three syllable parts where there is no separated initial.\\
-  \#6 & \TeX\ code & Extra macros to run if there is an initial.\\
+	\#1 & \TeX\ code & Initial.\\
+	\#2 & \TeX\ code & First letter after the initial.\\
+	\#3 & \TeX\ code & Everything else in the syllable.\\
+	\#4 & \TeX\ code & Three syllable parts when there is a separated initial.\\
+	\#5 & \TeX\ code & Three syllable parts where there is no separated initial.\\
+	\#6 & \TeX\ code & Extra macros to run if there is an initial.\\
 \end{argtable}
 
 \macroname{\textbackslash GreSetFixedNextTextFormat}{\#1}{gregoriotex-syllable.tex}
@@ -812,66 +825,66 @@ Same as \verb=\GreSetFixedTextFormat= except for next syllable.
 Macro to specify a text which is different from \verb=#1#2#3= (of \verb=\GreSyllable=). It is useful for styles, for instance with:
 \par\medskip
 \begin{gabccode}
-  <i>ffj</i>(gh)
+	<i>ffj</i>(gh)
 \end{gabccode}
 
 we will have
 
 \begin{latexcode}
-  #1 = \textit{f}
-  #2 = \textit{f}
-  #3 = \textit{j}
+	#1 = \textit{f}
+	#2 = \textit{f}
+	#3 = \textit{j}
 \end{latexcode}
 
 and thus \verb=#1#2#3= will be \verb=\textit{f}\textit{f}\textit{j}=, which won't typeset
 ligatures. In this example we should call \verb=\grefixedtext{\textit{ffj}}=.
 
 \begin{argtable}
-  \#1 & \texttt{0} & nothing (normal text)\\
-  & \texttt{1}& italic\\
-  & \texttt{2} & bold\\
-  & \texttt{3} & small caps\\
-  & \texttt{4} & typewriter\\
-  & \texttt{5} & underline
+	\#1 & \texttt{0} & nothing (normal text)\\
+	& \texttt{1}& italic\\
+	& \texttt{2} & bold\\
+	& \texttt{3} & small caps\\
+	& \texttt{4} & typewriter\\
+	& \texttt{5} & underline
 \end{argtable}
 
 \begin{argtable}
-  \#1 & character & The initial letter of the score.\\
+	\#1 & character & The initial letter of the score.\\
 \end{argtable}
 
 \macroname{\textbackslash GreSetInitialClef}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
 Macro for writing initial clef.
 
 \begin{argtable}
-  \#1 & \texttt{c} or \texttt{f} & Type of clef.\\
-  \#2 & \texttt{1}--\texttt{5} & Line of clef.\\
-  \#3 & integer & Height number of flat in clef (\texttt{3} for no flat).\\
-  \#4 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
-  \#5 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
-  \#6 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
+	\#1 & \texttt{c} or \texttt{f} & Type of clef.\\
+	\#2 & \texttt{1}--\texttt{5} & Line of clef.\\
+	\#3 & integer & Height number of flat in clef (\texttt{3} for no flat).\\
+	\#4 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
+	\#5 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
+	\#6 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
 \end{argtable}
 
 \macroname{\textbackslash GreSetLinesClef}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-main.tex}
 Macro to define the clef that will appear at the beginning of the lines.
 
 \begin{argtable}
-  \#1 & \texttt{c} or \texttt{f} & Type of clef.\\
-  \#2 & \texttt{1}--\texttt{5} & Line of clef.\\
-  \#3 & \texttt{0} & No space after clef.\\
-  & \texttt{1} & Space after clef.\\
-  \#4 & integer & Height of flat in clef (\texttt{3} for no flat).\\
-  \#5 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
-  \#6 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
-  \#7 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
+	\#1 & \texttt{c} or \texttt{f} & Type of clef.\\
+	\#2 & \texttt{1}--\texttt{5} & Line of clef.\\
+	\#3 & \texttt{0} & No space after clef.\\
+	& \texttt{1} & Space after clef.\\
+	\#4 & integer & Height of flat in clef (\texttt{3} for no flat).\\
+	\#5 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
+	\#6 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
+	\#7 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
 \end{argtable}
 
 \macroname{\textbackslash GreSetNextSyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
 Macro to set the text of the next syllable for spacing purposes.
 
 \begin{argtable}
-  \#1 & string & the first letters of the syllable, that don't count for the alignment\\
-  \#2 & string & the middle letters of the syllable, we must align in the middle of them\\
-  \#3 & string & the end letters, they don't count for alignment\\
+	\#1 & string & the first letters of the syllable, that don't count for the alignment\\
+	\#2 & string & the middle letters of the syllable, we must align in the middle of them\\
+	\#3 & string & the end letters, they don't count for alignment\\
 \end{argtable}
 
 \macroname{\textbackslash GreSetNoFirstSyllableText}{}{gregoriotex-syllable.tex}
@@ -882,28 +895,28 @@ Macro to place argument above the lines and empty
 \verb=\gre@currenttextabovelines= when done.
 
 \begin{argtable}
-  \#1 & string & Text to be placed above the lines.\\
+	\#1 & string & Text to be placed above the lines.\\
 \end{argtable}
 
 \macroname{\textbackslash GreSetThisSyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
 Macro to set the text of the current syllable.
 
 \begin{argtable}
-  \#1 & string & the first letters of the syllable, that don't count for the alignment\\
-  \#2 & string & the middle letters of the syllable, we must align in the middle of them\\
-  \#3 & string & the end letters, they don't count for alignment\\
+	\#1 & string & the first letters of the syllable, that don't count for the alignment\\
+	\#2 & string & the middle letters of the syllable, we must align in the middle of them\\
+	\#3 & string & the end letters, they don't count for alignment\\
 \end{argtable}
 
 \macroname{\textbackslash GreSharp}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
 Macro to typeset a sharp.
 
 \begin{argtable}
-  \#1 & integer & Height number of the sharp.\\
-  \#2 & \texttt{0} & The sharp is not part of the clef.\\
-  & \texttt{1} & The sharp is part of the clef (doesn't happen).\\
-  \#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
-  \#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
-  \#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
+	\#1 & integer & Height number of the sharp.\\
+	\#2 & \texttt{0} & The sharp is not part of the clef.\\
+	& \texttt{1} & The sharp is part of the clef (doesn't happen).\\
+	\#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
+	\#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
+	\#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
 \end{argtable}
 
 \macroname{\textbackslash GreSmallCaps}{\#1}{gregoriotex.sty and gregoriotex.tex}
@@ -912,22 +925,22 @@ Plain \TeX\ \verb=\sc= as appropriate Corresponds to ``<sc></sc>'' tags
 in gabc.
 
 \begin{argtable}
-  \#1 & string & Text to be typeset in small caps font.\\
+	\#1 & string & Text to be typeset in small caps font.\\
 \end{argtable}
 
 \macroname{\textbackslash GreSlur}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
 Typesets a slur.
 
 \begin{argtable}
-  \#1 & integer & Height number of the pitch.\\
-  \#2 & \texttt{-1} & The slur should appear under the note.\\
-      & \texttt{1} & The slur should appear over the note.\\
-  \#3 & \texttt{0} & The slur should start at the right end of the note.\\
-      & \texttt{1} & The slur should start at one punctum's width to the left of the right end of the note.\\
-      & \texttt{2} & The slur should start at one-half punctum's width to the left of the right end of the note.\\
-  \#4 & string & The horizontal dimension of the slur.\\
-  \#5 & string & The vertical dimension of the slur.\\
-  \#6 & integer & Height number of the pitch.\\
+	\#1 & integer & Height number of the pitch.\\
+	\#2 & \texttt{-1} & The slur should appear under the note.\\
+			& \texttt{1} & The slur should appear over the note.\\
+	\#3 & \texttt{0} & The slur should start at the right end of the note.\\
+			& \texttt{1} & The slur should start at one punctum's width to the left of the right end of the note.\\
+			& \texttt{2} & The slur should start at one-half punctum's width to the left of the right end of the note.\\
+	\#4 & string & The horizontal dimension of the slur.\\
+	\#5 & string & The vertical dimension of the slur.\\
+	\#6 & integer & Height number of the pitch.\\
 \end{argtable}
 
 \macroname{\textbackslash GreSpecial}{\#1}{gregoriotex-symbols.tex}
@@ -935,7 +948,7 @@ Typesets a special character.  If the \#1 special character wasn't defined by
 \verb=\gresetspecial=, the text of \#1 will be output directly.
 
 \begin{argtable}
-  \#1 & string & The text between \texttt{<sp>} and \texttt{</sp>}.\\
+	\#1 & string & The text between \texttt{<sp>} and \texttt{</sp>}.\\
 \end{argtable}
 
 \macroname{\textbackslash GreStar}{}{gregoriotex-symbol.tex}
@@ -951,16 +964,23 @@ Indicates that the system should act as if a ledger line exists below the staff.
 Macro to typeset the syllable.
 
 \begin{argtable}
-  \#1 & \TeX\ code & macro setting syllable letters for the current syllable\\
-  \#2 & empty & reserved for future use\\
-  \#3 & \TeX\ control sequence & the control sequence to use for styling the hyphen\\
-  \#4 & \texttt{0} & this syllable is not the end of a word\\
-  & \texttt{1} & this syllable is the end of a word\\
-  \#5 & \TeX\ code & macros setting syllable letters for the next syllable\\
-  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
-  \#7 & & alignment type of the first next glyph\\
-  \#8 &\TeX\ code & other macros (translation, double text, etc.) that don't fit in the limitation of the number of arguments\\
-  \#9 & Gregorio\TeX\ glyphs & all the notes
+	\#1 & \TeX\ code & macro setting syllable letters for the current syllable\\
+	\#2 & empty & reserved for future use\\
+	\#3 & \TeX\ control sequence & the control sequence to use for styling the hyphen\\
+	\#4 & \texttt{0} & this syllable is not the end of a word\\
+	& \texttt{1} & this syllable is the end of a word\\
+	\#5 & \TeX\ code & macros setting syllable letters for the next syllable\\
+	\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
+	\#7 & & alignment type of the first next glyph\\
+	\#8 &\TeX\ code & other macros (translation, double text, etc.) that don't fit in the limitation of the number of arguments\\
+	\#9 & Gregorio\TeX\ glyphs & all the notes
+\end{argtable}
+
+\macroname{\textbackslash GreSyllableNoteCount}{\#1}{gregoriotex-syllable.tex}
+Indicates the number of notes in the current syllable.
+
+\begin{argtable}
+	\#1 & integer & The number of notes in the current syllable.\\
 \end{argtable}
 
 \macroname{\textbackslash GreTranslationCenterEnd}{}{gregoriotex-main.tex}
@@ -971,18 +991,18 @@ Makes argument typewriter font.  Accesses \LaTeX\ \verb=\texttt= or
 Plain \TeX\ \verb=\tt= as appropriate.
 
 \begin{argtable}
-  \#1 & string & Text to typeset in typewriter font.\\
+	\#1 & string & Text to typeset in typewriter font.\\
 \end{argtable}
 
 \macroname{\textbackslash GreUnderBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
 Macro to typeset a round brace below the lines.
 
 \begin{argtable}
-  \#1 & length & The width of the brace.\\
-  \#2 & length & A vertical shift.\\
-  \#3 & length & A horizontal shift.\\
-  \#4 & \texttt{0} & Don't shift before starting the brace.\\
-  & \texttt{1} & Shift back a punctum's width before starting the brace.
+	\#1 & length & The width of the brace.\\
+	\#2 & length & A vertical shift.\\
+	\#3 & length & A horizontal shift.\\
+	\#4 & \texttt{0} & Don't shift before starting the brace.\\
+	& \texttt{1} & Shift back a punctum's width before starting the brace.
 \end{argtable}
 
 \macroname{\textbackslash GreUnderline}{\#1}{gregoriotex.sty and gregoriotex.tex}
@@ -990,65 +1010,65 @@ Makes argument underlined under \LaTeX\ using \verb=\underline=.  Does
 nothing in Plain \TeX.
 
 \begin{argtable}
-  \#1 & string & Text to typeset underlined.\\
+	\#1 & string & Text to typeset underlined.\\
 \end{argtable}
 
 \macroname{\textbackslash GreUnstyled}{\#1}{gregoriotex-syllable.tex}
 Returns its argument as-is.
 
 \begin{argtable}
-  \#1 & string & Text to typeset without any extra styling.\\
+	\#1 & string & Text to typeset without any extra styling.\\
 \end{argtable}
 
 \macroname{\textbackslash GreUpcomingNewLineForcesCustos}{\#1}{gregoriotex-syllable.tex}
 Indicates that the new line in the next syllable forces a custos.
 
 \begin{argtable}
-  \#1 & \texttt{0} & The custos is forced off.\\
-      & \texttt{1} & The custos is forced on.\\
+	\#1 & \texttt{0} & The custos is forced off.\\
+			& \texttt{1} & The custos is forced on.\\
 \end{argtable}
 
 \macroname{\textbackslash GreVarBraceLength}{\#1}{gregoriotex-signs.tex}
 Returns the computed length of the given brace or ledger line.
 
 \begin{argtable}
-  \#1 & string & unique identifier for the brace within the score.
+	\#1 & string & unique identifier for the brace within the score.
 \end{argtable}
 
 \macroname{\textbackslash GreVarBraceSavePos}{\#1\#2\#3}{gregoriotex-signs.tex}
 Records positions to compute the lengths of variable-sized braces and ledger lines.
 
 \begin{argtable}
-  \#1 & string & unique identifier for the brace within the score.\\
-  \#2 & \texttt{0} & Don't shift before recording the position.\\
-  & \texttt{1} & Shift back a punctum's width before recording the position.\\
-  & \texttt{2} & Shift back one-half a punctum's width before recording the position.\\
-  \#3 & \texttt{1} & Position to save is the start of brace.\\
-  & \texttt{2} & Position to save is the end of brace.
+	\#1 & string & unique identifier for the brace within the score.\\
+	\#2 & \texttt{0} & Don't shift before recording the position.\\
+	& \texttt{1} & Shift back a punctum's width before recording the position.\\
+	& \texttt{2} & Shift back one-half a punctum's width before recording the position.\\
+	\#3 & \texttt{1} & Position to save is the start of brace.\\
+	& \texttt{2} & Position to save is the end of brace.
 \end{argtable}
 
 \macroname{\textbackslash GreVEpisema}{\#1\#2}{gregoriotex-signs.tex}
 Macro for typesetting the vertical episema.
 
 \begin{argtable}
-  \#1 & integer & Height number of episema.\\
-  \#2 & string  & Type of glyph the episema is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
+	\#1 & integer & Height number of episema.\\
+	\#2 & string  & Type of glyph the episema is attached to. See \nameref{EpisemaSpecial} argument for description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreVirgula}{\#1\#2}{gregoriotex-signs.tex}
 Macro to typeset a virgula.
 
 \begin{argtable}
-  \#1 & \texttt{0} & There is no text under the bar.\\
-  & \texttt{1} & There is text under the bar.\\
-  \#2 & code & Macros which may happen before the skip but after the virgula (typically \verb=\grevepisema=).\\
+	\#1 & \texttt{0} & There is no text under the bar.\\
+	& \texttt{1} & There is text under the bar.\\
+	\#2 & code & Macros which may happen before the skip but after the virgula (typically \verb=\grevepisema=).\\
 \end{argtable}
 
 \macroname{\textbackslash GreWriteTranslation}{\#1}{gregoriotex-main.tex}
 Macro to typeset argument in the translation position.
 
 \begin{argtable}
-  \#1 & string & Text to typeset in the translation.\\
+	\#1 & string & Text to typeset in the translation.\\
 \end{argtable}
 
 \macroname{\textbackslash GreWriteTranslationWithCenterBeginning}{\#1}{gregoriotex-main.tex}
@@ -1056,7 +1076,7 @@ Macro to typeset argument (a string) in the translation position (at
 the beginning of a line?).
 
 \begin{argtable}
-  \#1 & string & Text to typeset in the translation (at the beginning of a line).\\
+	\#1 & string & Text to typeset in the translation (at the beginning of a line).\\
 \end{argtable}
 
 \macroname{\textbackslash GreForceBreak}{}{gregoriotex-spaces.tex}
@@ -1072,22 +1092,22 @@ A Lua\TeX\ attribute which designates a unique identifier for each score.
 Macro to print a nabc character above the lines.
 
 \begin{argtable}
-  \#1 & integer & the line on which the character should appear (currently unused)\\
-  \#2 & string & The \texttt{nabc} syntax which indicates what neumes are to be printed\\
+	\#1 & integer & the line on which the character should appear (currently unused)\\
+	\#2 & string & The \texttt{nabc} syntax which indicates what neumes are to be printed\\
 \end{argtable}
 
 \macroname{\textbackslash GreNABCChar}{\#1}{gregoriotex-nabc.tex}
 Macro to print a nabc character.
 
 \begin{argtable}
-  \#1 & string & The \texttt{nabc} syntax which indicates what neumes are to be printed\\
+	\#1 & string & The \texttt{nabc} syntax which indicates what neumes are to be printed\\
 \end{argtable}
 
 \macroname{\textbackslash GreScoreNABCLines}{\#1}{gregoriotex-nabc.tex}
 Macro which sets the number of \texttt{nabc} lines in the score.
 
 \begin{argtable}
-  \#1 & integer & the number of \texttt{nabc} lines (currently only 1 is supported)\\
+	\#1 & integer & the number of \texttt{nabc} lines (currently only 1 is supported)\\
 \end{argtable}
 
 
@@ -1095,7 +1115,7 @@ Macro which sets the number of \texttt{nabc} lines in the score.
 Macro which formats the mode in roman or arabic numerals according to the appropriate setting.
 
 \begin{argtable}
-  \#1 & \texttt{1}--\texttt{8} & The mode to be formated\\
+	\#1 & \texttt{1}--\texttt{8} & The mode to be formated\\
 \end{argtable}
 
 \macroname{\textbackslash GreNoNoteSyllable}{}{gregoriotex-syllable.tex}
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
index 6aa2afc5901..17798653673 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
@@ -11,7 +11,7 @@ only.
 Prints an error to the \TeX\ output log.
 
 \begin{argtable}
-  \#1 & string & error message\\
+	\#1 & string & error message\\
 \end{argtable}
 
 
@@ -19,14 +19,14 @@ Prints an error to the \TeX\ output log.
 Prints a warning to the \TeX\ output log.
 
 \begin{argtable}
-  \#1 & string & warning message\\
+	\#1 & string & warning message\\
 \end{argtable}
 
 \macroname{\textbackslash gre@metapost}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
 Executes \MP{} commands using luamplib.
 
 \begin{argtable}
-  \#1 & \MP{} commands & The \MP{} commands to execute.
+	\#1 & \MP{} commands & The \MP{} commands to execute.
 \end{argtable}
 
 \macroname{\textbackslash gre@deprecated}{\#1\#2}{gregoriotex-main.tex}
@@ -36,18 +36,23 @@ are allowed and a warning is printed. If the package option
 package error, halting \TeX.
 
 \begin{argtable}
-  \#1 & string & name of the deprecated macro\\
-  \#2 & string & name of the correct macro to use\\
+	\#1 & string & name of the deprecated macro\\
+	\#2 & string & name of the correct macro to use\\
 \end{argtable}
 
 \macroname{\textbackslash gre@obsolete}{\#1\#2}{gregoriotex-main.tex}
 Macro that handles obsolescence errors.
 
 \begin{argtable}
-  \#1 & string & name of the obsolete macro\\
-  \#2 & string & name of the correct macro to use\\
+	\#1 & string & name of the obsolete macro\\
+	\#2 & string & name of the correct macro to use\\
 \end{argtable}
 
+\macroname{\textbackslash gre@allowdeprecated@asboolean}{}{gregoriotex-main.tex}
+Macro that evaluates \texttt{true} or \texttt{false} depending on whether
+deprecated usage is allowed.  This is used to pass the value of
+\verb=\ifgre@allowdeprecated= to Lua.
+
 \macroname{\textbackslash gre@loadgregoriofont}{}{gregoriotex-main.tex}
 Loads the chosen font for the neumes at the correct size.
 
@@ -65,22 +70,22 @@ Macro which calculates \verb=\gre@additionalbottomspace= and\\
 \verb=\gre@additionaltopspace=
 
 \begin{argtable}
-  \#1 & integer & the height number of the top pitch, including signs\\
-  \#2 & integer & the height number of the bottom pitch, including signs\\
-  \#3 & \texttt{0} & there is no translation line\\
-  & \texttt{1} & there is a translation line\\
-  \#4 & \texttt{0} & there is no above lines text\\
-  & \texttt{1} & there is above lines text
+	\#1 & integer & the height number of the top pitch, including signs\\
+	\#2 & integer & the height number of the bottom pitch, including signs\\
+	\#3 & \texttt{0} & there is no translation line\\
+	& \texttt{1} & there is a translation line\\
+	\#4 & \texttt{0} & there is no above lines text\\
+	& \texttt{1} & there is above lines text
  \end{argtable}
 
 \macroname{\textbackslash gre@calculate@textaligncenter}{\#1\#2\#3}{gregoriotex-spaces.tex}
 Macro for calculating \verb=\gre@textaligncenter=.
 
 \begin{argtable}
-  \#1 & string & The first part of the syllable (any preceding consonants in Latin).\\
-  \#2 & string & The middle part of the syllable (the vowel in Latin, the whole syllable in English).\\
-  \#3 & \texttt{0} & Calculation is being performed for the current syllable.\\
-  & \texttt{1} & Calculation is being performed for the next syllable.\\
+	\#1 & string & The first part of the syllable (any preceding consonants in Latin).\\
+	\#2 & string & The middle part of the syllable (the vowel in Latin, the whole syllable in English).\\
+	\#3 & \texttt{0} & Calculation is being performed for the current syllable.\\
+	& \texttt{1} & Calculation is being performed for the next syllable.\\
 \end{argtable}
 
 \macroname{\textbackslash gre@calculate@annotationtrueraise}{}{gregoriotex-spaces.tex}
@@ -120,29 +125,29 @@ Aggregates all of the global distance calculations and calls them in the order n
 Calculates the raise value for a glyph (glyphraisevalue) based on where it is to be placed and what kind of a glyph it is.  This is a time of use calculation.
 
 \begin{argtable}
-  \#1 & integer & The number for where the glyph is located.  \texttt{a} in gabc is \texttt{1}, \texttt{b} is \texttt{2}, \etc\\
-  \#2 & \texttt{0} & no modification\\
-  & \texttt{1} & puts the value on the interline just above if it is on a line\\
-  & \texttt{2} & puts the value on the interline just beneath if it is on a line\\
-  & \texttt{3} & case of the vertical episema, which is not placed at the same place if the corresponding note is on a line or not\\
-  & \texttt{4} & case of the punctum mora, for the same reason\\
-  & \texttt{5} & case of the horizontal episema under a note, that must be placed a bit lower if the note is on a line\\
-  & \texttt{6} & case of the signs above (accentus, \etc)\\
-  & \texttt{8} & case of the punctum mora of the first note of a podatus or the 2nd note of a porrectus, \etc\\
-  & \texttt{9} & case of the horizontal episema, that must be placed a bit lower if the note is on a line\\
-  & \texttt{10} & case of the low choral sign\\
-  & \texttt{11} & case of the high choral sign\\
-  & \texttt{12} & case of the low choral sign which is lower than the note\\
-  & \texttt{13} & case of the brace above the bars\\
-  & \texttt{14} & case of the punctum mora in a space with a note on the line below it\\
-  & \texttt{15} & case of the over-the-notes slur\\
-  & \texttt{16} & case of the under-the-notes slur\\
-  \#3 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\
-  & \texttt{1} & for horizontal episema cases, position in the middle of the space\\
-  & \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-  & \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\
-  & \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-  & \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\
+	\#1 & integer & The number for where the glyph is located.  \texttt{a} in gabc is \texttt{1}, \texttt{b} is \texttt{2}, \etc\\
+	\#2 & \texttt{0} & no modification\\
+	& \texttt{1} & puts the value on the interline just above if it is on a line\\
+	& \texttt{2} & puts the value on the interline just beneath if it is on a line\\
+	& \texttt{3} & case of the vertical episema, which is not placed at the same place if the corresponding note is on a line or not\\
+	& \texttt{4} & case of the punctum mora, for the same reason\\
+	& \texttt{5} & case of the horizontal episema under a note, that must be placed a bit lower if the note is on a line\\
+	& \texttt{6} & case of the signs above (accentus, \etc)\\
+	& \texttt{8} & case of the punctum mora of the first note of a podatus or the 2nd note of a porrectus, \etc\\
+	& \texttt{9} & case of the horizontal episema, that must be placed a bit lower if the note is on a line\\
+	& \texttt{10} & case of the low choral sign\\
+	& \texttt{11} & case of the high choral sign\\
+	& \texttt{12} & case of the low choral sign which is lower than the note\\
+	& \texttt{13} & case of the brace above the bars\\
+	& \texttt{14} & case of the punctum mora in a space with a note on the line below it\\
+	& \texttt{15} & case of the over-the-notes slur\\
+	& \texttt{16} & case of the under-the-notes slur\\
+	\#3 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\
+	& \texttt{1} & for horizontal episema cases, position in the middle of the space\\
+	& \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\
+	& \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\
+	& \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\
+	& \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\
 \end{argtable}
 
 \macroname{\textbackslash gre@stafflinefactor}{}{gregoriotex-spaces.tex}
@@ -152,22 +157,22 @@ A number indicating the thickness of the staff lines.
 Macro to calculate the distance from the beginning of the text of a syllable to its alignment point (the center of the vowel for Latin centering, the center of the syllable for English centering).  This is a time of use calculation.
 
 \begin{argtable}
-  \#1 & string & the first part of the syllable\\
-  \#2 & string & the middle part of the syllable\\
-  \#3 & \texttt{0} & perform this calculation for the current syllable\\
-  & \texttt{1} & perform this calculation for the next syllable
+	\#1 & string & the first part of the syllable\\
+	\#2 & string & the middle part of the syllable\\
+	\#3 & \texttt{0} & perform this calculation for the current syllable\\
+	& \texttt{1} & perform this calculation for the next syllable
 \end{argtable}
 
 \macroname{\textbackslash gre@calculate@enddifference}{\#1\#2\#3\#4\#5}{gregoriotex-spaces.tex}
 Calculates the difference between the end of the notes and the end of the syllable text.  Also stores the value for the previous syllable if needed.  This is a time of use calculation.
 
 \begin{argtable}
-  \#1 & length & the total width of the notes\\
-  \#2 & length & the total width of the syllable text\\
-  \#3 & length & the alignment distance for the text (\texttt{textaligncenter})\\
-  \#4 & length & the alignment distance for the notes (\texttt{notesaligncenter})\\
-  \#5 & \texttt{0} & do not save the value for the previous syllable before calculating the new value\\
-  & \texttt{1} & save the value for the previous syllable before calculating the new value
+	\#1 & length & the total width of the notes\\
+	\#2 & length & the total width of the syllable text\\
+	\#3 & length & the alignment distance for the text (\texttt{textaligncenter})\\
+	\#4 & length & the alignment distance for the notes (\texttt{notesaligncenter})\\
+	\#5 & \texttt{0} & do not save the value for the previous syllable before calculating the new value\\
+	& \texttt{1} & save the value for the previous syllable before calculating the new value
 \end{argtable}
 
 The formula used is \verb=#1 - #2 + #3 - #4= or (more sensibly) \verb=(#1 - #4) - (#2 - #3)=.  This is also equivalent to \verb=-#4 - \gre@dimen@begindifference + #3=, a fact we take advantage of when calculating the end difference for a bar syllable under the new bar spacing algorithm.
@@ -176,43 +181,43 @@ The formula used is \verb=#1 - #2 + #3 - #4= or (more sensibly) \verb=(#1 - #4)
 Change the scale of a single distance from one factor to another.
 
 \begin{argtable}
-  \#1 & string & name of the distance to be scaled.  See \nameref{distances}.\\
-  \#2 & integer & the factor the distance is currently in\\
-  \#3 & integer & the factor the distance is to be put into\\
+	\#1 & string & name of the distance to be scaled.  See \nameref{distances}.\\
+	\#2 & integer & the factor the distance is currently in\\
+	\#3 & integer & the factor the distance is to be put into\\
 \end{argtable}
 
 \macroname{\textbackslash gre@changedimenfactor}{\#1\#2}{gregoriotex-spaces.tex}
 Rescales all the distances (and \texttt{stafflinefactor}) which are supposed to scale with a change in staff size.
 
 \begin{argtable}
-  \#1 & integer & the factor the distances are currently in\\
-  \#2 & integer & the factor the distances are to be put into\\
+	\#1 & integer & the factor the distances are currently in\\
+	\#2 & integer & the factor the distances are to be put into\\
 \end{argtable}
 
 \macroname{\textbackslash gre@calculate@nextbegindifference}{\#1\#2\#3\#4}{gregoriotex-spaces.tex}
 Macro to calculate \texttt{nextbegindifference}.
 
 \begin{argtable}
-  \#1 & string & the first letters of the next syllable\\
-  \#2 & string & the middle letters of the next syllable (the vowel in Latin, the whole syllable in English)\\
-  \#3 & string & the end letters of the next syllable\\
-  \#4 & $0 \le$ integer $\le 19$ & the type of notes alignment.  See \nameref{notesalign}.\\
-  & $20 \le$ integer $\le 39$ & Same as below 20 except there is a flat before the notes.  Subtract 20 to get the type of notes alignment.\\
-  & $40 \le$ integer $\le 59$ & Same as below 20 except there is a natural before the notes.  Subtract 40 to get the type of notes alignment.
+	\#1 & string & the first letters of the next syllable\\
+	\#2 & string & the middle letters of the next syllable (the vowel in Latin, the whole syllable in English)\\
+	\#3 & string & the end letters of the next syllable\\
+	\#4 & $0 \le$ integer $\le 19$ & the type of notes alignment.  See \nameref{notesalign}.\\
+	& $20 \le$ integer $\le 39$ & Same as below 20 except there is a flat before the notes.  Subtract 20 to get the type of notes alignment.\\
+	& $40 \le$ integer $\le 59$ & Same as below 20 except there is a natural before the notes.  Subtract 40 to get the type of notes alignment.
 \end{argtable}
 
 \macroname{\textbackslash gre@strip@pt}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
 Strips the units from a distance.  Under \LaTeX{}, this is an alias to \verb=\strip@pt=.
 
 \begin{argtable}
-  \#1 & control sequence & should be the control sequence for the the distance register (including the leading backslash)\\
+	\#1 & control sequence & should be the control sequence for the the distance register (including the leading backslash)\\
 \end{argtable}
 
 \macroname{\textbackslash gre@rem@pt}{\#1}{gregoriotex.tex}
 Strips the units from a distance.  Used internally by \verb=\gre@strip@pt=.  Under \LaTeX{}, this is not defined.
 
 \begin{argtable}
-  \#1 & distance & should be in the form ``[0-9]+.[0-9]+pt’’. (\ie the result of applying \verb=\the= to a distance register)\\
+	\#1 & distance & should be in the form ``[0-9]+.[0-9]+pt’’. (\ie the result of applying \verb=\the= to a distance register)\\
 \end{argtable}
 
 \macroname{\textbackslash gre@count@temp@...}{}{gregoriotex-spaces.tex}
@@ -222,8 +227,8 @@ Temporary count used in calculations.  There are currently three of these.
 Macro which converts a distance into a particular set of units.  Result is placed in \verb=\gre@converted= as a string.
 
 \begin{argtable}
-  \#1 & string & two letter abbreviation for the units.  Should recognize all legal \TeX\ units.\\
-  \#2 & distance & Distance to be converted.
+	\#1 & string & two letter abbreviation for the units.  Should recognize all legal \TeX\ units.\\
+	\#2 & distance & Distance to be converted.
 \end{argtable}
 
 \macroname{\textbackslash gre@converted}{}{gregoriotex-spaces.tex}
@@ -233,8 +238,8 @@ Macro holding result of last call to \verb=\gre@convertto=.
 This function takes a distance and formats it as a string so that its units conform to the pattern set by a string representation of a distance.  Result is placed in \verb=\gre@stringdist=.
 
 \begin{argtable}
-  \#1 & string & the standard whose format is to be matched.\\
-  \#2 & distance & the distance to be adjusted.
+	\#1 & string & the standard whose format is to be matched.\\
+	\#2 & distance & the distance to be adjusted.
 \end{argtable}
 
 \macroname{\textbackslash gre@stringdist}{}{gregoriotex-spaces.tex}
@@ -245,7 +250,7 @@ Macro that handles \verb=\gregorioscore= calls when they do not have an
 optional argument.
 
 \begin{argtable}
-  \#1 & string & Relative or absolute path to the score.\\
+	\#1 & string & Relative or absolute path to the score.\\
 \end{argtable}
 
 \macroname{\textbackslash gre@gregorioscore@option}{[\#1]\#2}{gregoriotex-main.tex}
@@ -253,10 +258,10 @@ Macro that handles \verb=\gregorioscore= calls when they have an optional
 argument.
 
 \begin{argtable}
-  \#1 & \texttt{n} & \#2 will be included as is. \\
-      & \texttt{a} & Gregorio\TeX\ will automatically compile gabc files if necessary.\\
-      & \texttt{f} & Forces Gregorio\TeX\ to compile the gabc file.\\
-  \#2 & string & Relative or absolute path to the score.\\
+	\#1 & \texttt{n} & \#2 will be included as is. \\
+			& \texttt{a} & Gregorio\TeX\ will automatically compile gabc files if necessary.\\
+			& \texttt{f} & Forces Gregorio\TeX\ to compile the gabc file.\\
+	\#2 & string & Relative or absolute path to the score.\\
 \end{argtable}
 
 \macroname{\textbackslash gre@gabcsnippet}{\#1}{gregoriotex-main.tex}
@@ -264,7 +269,7 @@ Macro that handles \verb=\gabcsnippet= calls when they do not have an
 optional argument.
 
 \begin{argtable}
-  \#1 & string & Snippet of gabc code.\\
+	\#1 & string & Snippet of gabc code.\\
 \end{argtable}
 
 \macroname{\textbackslash gre@writemode}{\#1\#2\#3}{gregoriotex-main.tex}
@@ -272,29 +277,29 @@ Macro that writes its arguments with \verb=\greannotation=.  This
 macro is typically called by \verb=\GreMode= in the gtex file.
 
 \begin{argtable}
-  \#1 & \TeX\ code & Mode text to place above the initial of a score in the \texttt{modeline} style.\\
-  \#2 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modemodifier} style, after the mode text.\\
-  \#3 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modedifferentia} style, after \#2.\\
+	\#1 & \TeX\ code & Mode text to place above the initial of a score in the \texttt{modeline} style.\\
+	\#2 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modemodifier} style, after the mode text.\\
+	\#3 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modedifferentia} style, after \#2.\\
 \end{argtable}
 
 \macroname{\textbackslash gre@setallbracerendering}{\#1}{gregoriotex-signs.tex}
 Macro used by \verb=\gresetbracerendering= to change all braces.
 
 \begin{argtable}
-  \#1 & \texttt{metapost} & \MP{} will be used to render braces\\
-      & \texttt{font} & The score font will be used to render braces\\
+	\#1 & \texttt{metapost} & \MP{} will be used to render braces\\
+			& \texttt{font} & The score font will be used to render braces\\
 \end{argtable}
 
 \macroname{\textbackslash gre@setbracerendering}{[\#1]\#2}{gregoriotex-signs.tex}
 Macro used by \verb=\gresetbracerendering= to change a single type of brace.
 
 \begin{argtable}
-  \#1 & \texttt{brace} & change round braces that appear over the staff\\
-      & \texttt{underbrace} & change round braces that appear under the staff\\
-      & \texttt{curlybrace} & change curly braces\\
-      & \texttt{barbrace} & change round braces that appear over divisio bars\\
-  \#2 & \texttt{metapost} & \MP{} will be used to render braces\\
-      & \texttt{font} & The score font will be used to render braces\\
+	\#1 & \texttt{brace} & change round braces that appear over the staff\\
+			& \texttt{underbrace} & change round braces that appear under the staff\\
+			& \texttt{curlybrace} & change curly braces\\
+			& \texttt{barbrace} & change round braces that appear over divisio bars\\
+	\#2 & \texttt{metapost} & \MP{} will be used to render braces\\
+			& \texttt{font} & The score font will be used to render braces\\
 \end{argtable}
 
 \macroname{\textbackslash gre@@setbracerendering}{\#1\#2}{gregoriotex-signs.tex}
@@ -303,27 +308,27 @@ Secondary macro used by \verb=\gre@setallbracerendering= and
 secondary macro, it doesn't check its first argument.
 
 \begin{argtable}
-  \#1 & \texttt{brace} & change round braces that appear over the staff\\
-      & \texttt{underbrace} & change round braces that appear under the staff\\
-      & \texttt{curlybrace} & change curly braces\\
-      & \texttt{barbrace} & change round braces that appear over divisio bars\\
-  \#2 & \texttt{metapost} & \MP{} will be used to render braces\\
-      & \texttt{font} & The score font will be used to render braces\\
+	\#1 & \texttt{brace} & change round braces that appear over the staff\\
+			& \texttt{underbrace} & change round braces that appear under the staff\\
+			& \texttt{curlybrace} & change curly braces\\
+			& \texttt{barbrace} & change round braces that appear over divisio bars\\
+	\#2 & \texttt{metapost} & \MP{} will be used to render braces\\
+			& \texttt{font} & The score font will be used to render braces\\
 \end{argtable}
 
 \macroname{\textbackslash gre@brace@common}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
 Common macro used internally to render braces.
 
 \begin{argtable}
-  \#1 & length  & The width of the brace.\\
-  \#2 & length  & A vertical shift.\\
-  \#3 & length  & A horizontal shift.\\
-  \#4 & \texttt{0} & Don’t shift before starting the brace.\\
-  & \texttt{1} & Shift back a punctum’s width before starting the brace.\\
-  \#5 & \texttt{0} & No accentus above the brace.\\
-  & \texttt{1} & Typeset an accentus above the brace.\\
-  \#6 & integer & The height number for the brace.\\
-  \#7 & csname  & The control sequence name representing the brace.
+	\#1 & length  & The width of the brace.\\
+	\#2 & length  & A vertical shift.\\
+	\#3 & length  & A horizontal shift.\\
+	\#4 & \texttt{0} & Don’t shift before starting the brace.\\
+	& \texttt{1} & Shift back a punctum’s width before starting the brace.\\
+	\#5 & \texttt{0} & No accentus above the brace.\\
+	& \texttt{1} & Typeset an accentus above the brace.\\
+	\#6 & integer & The height number for the brace.\\
+	\#7 & csname  & The control sequence name representing the brace.
 \end{argtable}
 
 \macroname{\textbackslash gre@render@barbrace}{}{gregoriotex-signs.tex}
@@ -334,55 +339,55 @@ Returns the \MP{} preamble for braces.  The control sequence name does
 not have the \texttt{@} symbol because this macro is used within \MP{}.
 
 \begin{argtable}
-  \#1 & string & the width of the brace; if \texttt{*}, use the bar brace width.
+	\#1 & string & the width of the brace; if \texttt{*}, use the bar brace width.
 \end{argtable}
 
 \macroname{\textbackslash gre@draw@curlybrace}{\#1}{gregoriotex-signs.tex}
 Draws a curly over-brace using \MP{}.
 
 \begin{argtable}
-  \#1 & length & the width of the brace.
+	\#1 & length & the width of the brace.
 \end{argtable}
 
 \macroname{\textbackslash gre@draw@brace}{\#1}{gregoriotex-signs.tex}
 Draws a round over-brace using \MP{}.
 
 \begin{argtable}
-  \#1 & string & the width of the brace; if \texttt{*}, use the bar brace width.
+	\#1 & string & the width of the brace; if \texttt{*}, use the bar brace width.
 \end{argtable}
 
 \macroname{\textbackslash gre@draw@fontbrace}{\#1\#2}{gregoriotex-signs.tex}
 Draws a brace using the score font.
 
 \begin{argtable}
-  \#1 & string & the width of the brace.\\
-  \#2 & \TeX\ code & \TeX\ code that renders the brace using the score font.\\
+	\#1 & string & the width of the brace.\\
+	\#2 & \TeX\ code & \TeX\ code that renders the brace using the score font.\\
 \end{argtable}
 
 \macroname{\textbackslash gre@draw@underbrace}{\#1}{gregoriotex-signs.tex}
 Draws a round under-brace using \MP{}.
 
 \begin{argtable}
-  \#1 & length & the width of the brace.
+	\#1 & length & the width of the brace.
 \end{argtable}
 
 \macroname{\textbackslash gre@draw@roundbrace}{\#1\#2\#3}{gregoriotex-signs.tex}
 Draws a round over- or under-brace using \MP{}.
 
 \begin{argtable}
-  \#1 & length         & the width of the brace.\\
-  \#2 & number         & the height of the bounding box in em-relative units.\\
-  \#3 & \MP{} commands & \MP{} commands to draw the brace outline.
+	\#1 & length         & the width of the brace.\\
+	\#2 & number         & the height of the bounding box in em-relative units.\\
+	\#3 & \MP{} commands & \MP{} commands to draw the brace outline.
 \end{argtable}
 
 \macroname{\textbackslash gre@draw@slur}{\#1\#2\#3}{gregoriotex-signs.tex}
 Draws a slur using \MP{}.
 
 \begin{argtable}
-  \#1 & length      & the x-dimension of the slur.\\
-  \#2 & length      & the y-dimension of the slur.\\
-  \#3 & \texttt{-1} & draw an under-the-notes slur.\\
-      & \texttt{1}  & draw an over-the-notes slur.\\
+	\#1 & length      & the x-dimension of the slur.\\
+	\#2 & length      & the y-dimension of the slur.\\
+	\#3 & \texttt{-1} & draw an under-the-notes slur.\\
+			& \texttt{1}  & draw an over-the-notes slur.\\
 \end{argtable}
 
 
@@ -390,7 +395,7 @@ Draws a slur using \MP{}.
 Evaluates to \verb=#1= if running under \LaTeX{}.
 
 \begin{argtable}
-  \#1 & \TeX{} code & the \TeX{} code to use if running under \LaTeX{}.
+	\#1 & \TeX{} code & the \TeX{} code to use if running under \LaTeX{}.
 \end{argtable}
 
 \macroname{\textbackslash gre@latex@barredsymbol}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
@@ -400,10 +405,10 @@ the cascading of conditionals used to implement that macro.
 \bigskip\textbf{Only available in \LaTeX.}
 
 \begin{argtable}
-  \#1 & string      & the value of \verb=\f@series/\f@shape= to match.\\
-  \#2 & \TeX{} code & the \TeX{} for the base symbol (\ie, \texttt{A}, \texttt{R}, or \texttt{V}).\\
-  \#3 & string      & the control sequence name created by \verb=\gredefsizedsymbol= to use for the bar.\\
-  \#4 & dimension   & the amount to shift the bar to the left from the end of the base symbol.
+	\#1 & string      & the value of \verb=\f@series/\f@shape= to match.\\
+	\#2 & \TeX{} code & the \TeX{} for the base symbol (\ie, \texttt{A}, \texttt{R}, or \texttt{V}).\\
+	\#3 & string      & the control sequence name created by \verb=\gredefsizedsymbol= to use for the bar.\\
+	\#4 & dimension   & the amount to shift the bar to the left from the end of the base symbol.
 \end{argtable}
 
 \macroname{\textbackslash gre@additionalbottomcustoslineend}{}{gregoriotex-signs.tex}
@@ -422,11 +427,25 @@ Macro to place a top custos with an additional line (positions \texttt{l} and \t
 Macro to pick the appropriate custos character.
 
 \begin{argtable}
-  \#1 & integer & height of the custos character to be placed\\
+	\#1 & integer & height of the custos character to be placed\\
 \end{argtable}
 
-\macroname{\textbackslash gre@nextcustos}{}{gregoriotex-signs.tex}
-Macro that saves the next custos height.
+\macroname{\textbackslash gre@nextcustospitch}{}{gregoriotex-signs.tex}
+Macro that saves the next custos pitch (height).
+
+\macroname{\textbackslash gre@nextcustosalteration}{}{gregoriotex-signs.tex}
+Macro that saves the next custos alteration.
+
+\macroname{\textbackslash gre@custosalteration}{\#1\#2}{gregoriotex-signs.tex}
+Typesets the alteration for a custos, if enabled.
+
+\begin{argtable}
+	\#1 & integer & The pitch (height number) of the custos.\\
+	\#2 & \texttt{Flat} & The custos should have a flat.\\
+			& \texttt{Natural} & The custos should have a natural.\\
+			& \texttt{Sharp} & The custos should have a sharp.\\
+			& \textit{empty} & The custos should not have an alteration.\\
+\end{argtable}
 
 \macroname{\textbackslash gre@beginnotes}{}{gregoriotex-main.tex}
 Macro to draw the staff lines.  Comes after the initial but before the clef.
@@ -459,14 +478,14 @@ Macro to decrease the space above the lines as there is no longer any above line
 Macro to typeset an alteration.
 
 \begin{argtable}
-  \#1 & integer & height of the alteration\\
-  \#2 & character alias & the alteration\\
-  \#3 & character alias & the hole of the alteration\\
-  \#4 & \texttt{1} & the alteration is part of the clef\\
-  & \texttt{0} & the alteration is not part of the clef\\
-  \#5 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
-  \#6 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
-  \#7 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
+	\#1 & integer & height of the alteration\\
+	\#2 & character alias & the alteration\\
+	\#3 & character alias & the hole of the alteration\\
+	\#4 & \texttt{1} & the alteration is part of the clef\\
+	& \texttt{0} & the alteration is not part of the clef\\
+	\#5 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
+	\#6 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
+	\#7 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
 \end{argtable}
 
 \macroname{\textbackslash gre@clef}{}{gregoriotex-signs.tex}
@@ -521,42 +540,42 @@ A spot to save the \verb=\gre@lastoflinecount= so we can change it temporarily a
 The macro which needs to be called each time a new lines is started.
 
 \begin{argtable}
-  \#1 & \texttt{0} & Justifying the line being ended\\
-  & \texttt{1} & Do not justify the line being ended\\
-  \#2 & \texttt{0} & Take care of eolshift\\
-  & \texttt{1} & Do not adjust end of line (when already done by the new spacing algorithm)\\
+	\#1 & \texttt{0} & Justifying the line being ended\\
+	& \texttt{1} & Do not justify the line being ended\\
+	\#2 & \texttt{0} & Take care of eolshift\\
+	& \texttt{1} & Do not adjust end of line (when already done by the new spacing algorithm)\\
 \end{argtable}
 
 \macroname{\textbackslash gre@endafterbar}{\#1}{gregoriotex-main.tex}
 Macro to call after ending a bar.
 
 \begin{argtable}
-  \#1 & \texttt{0} & We are at the end of a line\\
-  & \texttt{1} & We not at the end of a line\\
+	\#1 & \texttt{0} & We are at the end of a line\\
+	& \texttt{1} & We not at the end of a line\\
 \end{argtable}
 
 \macroname{\textbackslash gre@endofsyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
 Macro called at end of a syllable, adds a penalty and a space.
 
 \begin{argtable}
-  \#1 & \texttt{0} & to only add the penalty\\
-  & \texttt{1} & adds both penalty and space\\
-  \#2 & \texttt{0} & if end of syllable\\
-  & \texttt{1} & if end of word\\
-  \#3 & \texttt{1} & if next syllable is a bar\\
-  & \texttt{0} & otherwise\\
+	\#1 & \texttt{0} & to only add the penalty\\
+	& \texttt{1} & adds both penalty and space\\
+	\#2 & \texttt{0} & if end of syllable\\
+	& \texttt{1} & if end of word\\
+	\#3 & \texttt{1} & if next syllable is a bar\\
+	& \texttt{0} & otherwise\\
 \end{argtable}
 
 \macroname{\textbackslash gre@setfirstsyllabletext}{\#1\#2\#3\#4\#5\#6}{gregoriotex-syllable.tex}
 Internal macro to set the first syllable text after all parts are known.
 
 \begin{argtable}
-  \#1 & \TeX\ code & First part of the syllable (before the vowel)\\
-  \#2 & \TeX\ code & Middle part of the syllable (the vowel)\\
-  \#3 & \TeX\ code & Last part of the syllable (after the vowel)\\
-  \#4 & \TeX\ code & First letter of the syllable\\
-  \#5 & \TeX\ code & Everything after the first letter of the syllable\\
-  \#6 & \TeX\ code & Macros to run after the text is emitted\\
+	\#1 & \TeX\ code & First part of the syllable (before the vowel)\\
+	\#2 & \TeX\ code & Middle part of the syllable (the vowel)\\
+	\#3 & \TeX\ code & Last part of the syllable (after the vowel)\\
+	\#4 & \TeX\ code & First letter of the syllable\\
+	\#5 & \TeX\ code & Everything after the first letter of the syllable\\
+	\#6 & \TeX\ code & Macros to run after the text is emitted\\
 \end{argtable}
 
 \macroname{\textbackslash gre@opening@syllabletext}{}{gregoriotex-syllable.tex}
@@ -574,30 +593,30 @@ Default: 17 (approximately the size found in graduals)
 Macro to fill the hole in a glyph so that staff lines do not show through a hole in it.
 
 \begin{argtable}
-  \#1 & Gregorio\TeX\ char & character to use to fill the hole\\
+	\#1 & Gregorio\TeX\ char & character to use to fill the hole\\
 \end{argtable}
 
 \macroname{\textbackslash gre@calculate@notesaligncenter}{\#1}{gregoriotex-syllable.tex}
 Macro to find the alignment center for a group of notes.  The value is the distance from the left edge of the group to the alignment point and is stored in \verb=\gre@dimen@notesaligncenter=.
 
 \begin{argtable}
-  \#1 & Note alignment type & See \ref{notesalign}\\
+	\#1 & Note alignment type & See \ref{notesalign}\\
 \end{argtable}
 
 \macroname{\textbackslash gre@calculate@nextnotesaligncenter}{\#1}{gregoriotex-syllable.tex}
 Same as previous, but for the next syllable.
 
 \begin{argtable}
-  \#1 & Note alignment type & See \ref{notesalign}\\
+	\#1 & Note alignment type & See \ref{notesalign}\\
 \end{argtable}
 
 \macroname{\textbackslash gre@calculate@simplenotesaligncenter}{\#1\#2}{gregoriotex-syllable.tex}
 Workhorse function behind \verb=\gre@calculate@notesaligncenter= and\\ \verb=\gre@calculate@nextnotesaligncenter=.
 
 \begin{argtable}
-  \#1 & Note alignment type & See \ref{notesalign}\\
-  \#2 & \texttt{0} & this is for the current syllable\\
-  & \texttt{1} & this is for the next syllable\\
+	\#1 & Note alignment type & See \ref{notesalign}\\
+	\#2 & \texttt{0} & this is for the current syllable\\
+	& \texttt{1} & this is for the next syllable\\
 \end{argtable}
 
 \macroname{\textbackslash gre@gregoriofontname}{}{gregoriotex-main.tex}
@@ -607,87 +626,87 @@ Macro which stores the name of the currently selected font for the neumes.
 Macro for aligning clivis syllables according to the flag \verb=\gre@clivisalignment=.
 
 \begin{argtable}
-  \#1 & Gregorio\TeX\ glyph & Glyph to use when aligning clivis on its center\\
-  \#2 & Gregorio\TeX\ glyph & Glyph to use when aligning clivis on the center of the first punctum\\
-  \#3 &  \texttt{0} & this is for the current syllable\\
-  & \texttt{1} & this is for the next syllable\\
+	\#1 & Gregorio\TeX\ glyph & Glyph to use when aligning clivis on its center\\
+	\#2 & Gregorio\TeX\ glyph & Glyph to use when aligning clivis on the center of the first punctum\\
+	\#3 &  \texttt{0} & this is for the current syllable\\
+	& \texttt{1} & this is for the next syllable\\
 \end{argtable}
 
 \macroname{\textbackslash gre@hepisorline}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
 Macro to typeset a horizontal line (either an additional staff line or an episema).
 
 \begin{argtable}
-  \#1 & character & The letter of the height of the episema (not the height of the note it corresponds to).\\
-  \#2 & \texttt{0} & go back to the beginning of the previous glyph; this starts the episema at the beginning of the previous glyph\\
-  & \texttt{1} & stay at the end of the glyph; doesn’t make much sense to use this\\
-  & \texttt{2} & go back the width of \#1; this starts the episema at the glyph from the end that starts at \#1’s width from the end\\
-  & \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1; this starts the episema at the glyph from the start that starts just after \#1’s width from the start\\
-  & \texttt{4} & go back to the beginning of the previous glyph and then forward the width of \#1, then back the width of \#2; this ends the episema at the end of \#1\\
-  \#3 & integer &the ambitus for a two note episema at the diagonal stroke of a porrectus, porrectus flexus, orculus resupinus, or torculus resupinus flexus\\
-  \#4 & \texttt{0} & an horizontal episema\\
-  & \texttt{1} & an horizontal episema under a note\\
-  & \texttt{2} & a line at the top\\
-  & \texttt{3} & a line at the bottom\\
-  \#5 & \texttt{f} & a normal episema\\
-  & \texttt{l} & a small episema aligned left\\
-  & \texttt{c} & a small episema aligned center\\
-  & \texttt{r} & for a small episema aligned right\\
-  \#6 & string & a positive or negative "nudge" (dimension) for the vertical position of the horizontal episema\\
-  \#7 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\
-  & \texttt{1} & for horizontal episema cases, position in the middle of the space\\
-  & \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-  & \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\
-  & \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-  & \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\
+	\#1 & character & The letter of the height of the episema (not the height of the note it corresponds to).\\
+	\#2 & \texttt{0} & go back to the beginning of the previous glyph; this starts the episema at the beginning of the previous glyph\\
+	& \texttt{1} & stay at the end of the glyph; doesn’t make much sense to use this\\
+	& \texttt{2} & go back the width of \#1; this starts the episema at the glyph from the end that starts at \#1’s width from the end\\
+	& \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1; this starts the episema at the glyph from the start that starts just after \#1’s width from the start\\
+	& \texttt{4} & go back to the beginning of the previous glyph and then forward the width of \#1, then back the width of \#2; this ends the episema at the end of \#1\\
+	\#3 & integer &the ambitus for a two note episema at the diagonal stroke of a porrectus, porrectus flexus, orculus resupinus, or torculus resupinus flexus\\
+	\#4 & \texttt{0} & an horizontal episema\\
+	& \texttt{1} & an horizontal episema under a note\\
+	& \texttt{2} & a line at the top\\
+	& \texttt{3} & a line at the bottom\\
+	\#5 & \texttt{f} & a normal episema\\
+	& \texttt{l} & a small episema aligned left\\
+	& \texttt{c} & a small episema aligned center\\
+	& \texttt{r} & for a small episema aligned right\\
+	\#6 & string & a positive or negative "nudge" (dimension) for the vertical position of the horizontal episema\\
+	\#7 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\
+	& \texttt{1} & for horizontal episema cases, position in the middle of the space\\
+	& \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\
+	& \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\
+	& \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\
+	& \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\
 \end{argtable}
 
 \macroname{\textbackslash gre@hepisorlineaux}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
 Macro that will help in the typesetting of a horizontal episema and additional lines.
 
 \begin{argtable}
-  \#1 & Gregorio\TeX\ glyph & an offset glyph (see \#3, below)\\
-  \#2 & Gregorio\TeX\ glyph & the episema glyph\\
-  \#3 & \texttt{0} & go back to the beginning of the previous glyph; this starts the episema at the beginning of the previous glyph\\
-  & \texttt{1} & stay at the end of the glyph; doesn’t make much sense to use this\\
-  & \texttt{2} & go back the width of \#1; this starts the episema at the glyph from the end that starts at \#1’s width from the end\\
-  & \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1; this starts the episema at the glyph from the start that starts just after \#1’s width from the start\\
-  \#4 & \texttt{0} & an horizontal episema\\
-  & \texttt{1} & an horizontal episema under a note\\
-  & \texttt{2} & a line at the top\\
-  & \texttt{3} & a line at the bottom\\
+	\#1 & Gregorio\TeX\ glyph & an offset glyph (see \#3, below)\\
+	\#2 & Gregorio\TeX\ glyph & the episema glyph\\
+	\#3 & \texttt{0} & go back to the beginning of the previous glyph; this starts the episema at the beginning of the previous glyph\\
+	& \texttt{1} & stay at the end of the glyph; doesn’t make much sense to use this\\
+	& \texttt{2} & go back the width of \#1; this starts the episema at the glyph from the end that starts at \#1’s width from the end\\
+	& \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1; this starts the episema at the glyph from the start that starts just after \#1’s width from the start\\
+	\#4 & \texttt{0} & an horizontal episema\\
+	& \texttt{1} & an horizontal episema under a note\\
+	& \texttt{2} & a line at the top\\
+	& \texttt{3} & a line at the bottom\\
 \end{argtable}
 
 \macroname{\textbackslash gre@vepisemaorrare}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
 Macro to typeset a vertical episema or a rare accent (like accentus, circulus, etc.).  This function must be called after a call to \verb=\GreGlyph=.
 
 \begin{argtable}
-  \#1 & character & the letter of the height of the episema (not the height of the note it corresponds to.\\
-  \#2 & integer & See \nameref{EpisemaSpecial}\\
-  \#3 & Gregorio\TeX\ glyph & the sign glyph\\
-  \#4 & \texttt{1} & vertical episema\\
-  & \texttt{2} & rare sign\\
-  & \texttt{3} & choral sign\\
-  & \texttt{4} & brace above the bar\\
-  \#5 & string & the choral sign, if relevant\\
+	\#1 & character & the letter of the height of the episema (not the height of the note it corresponds to.\\
+	\#2 & integer & See \nameref{EpisemaSpecial}\\
+	\#3 & Gregorio\TeX\ glyph & the sign glyph\\
+	\#4 & \texttt{1} & vertical episema\\
+	& \texttt{2} & rare sign\\
+	& \texttt{3} & choral sign\\
+	& \texttt{4} & brace above the bar\\
+	\#5 & string & the choral sign, if relevant\\
 \end{argtable}
 
 \macroname{\textbackslash gre@vepisemaorrareaux}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
 Macro to help typesetting vertical episema.
 
 \begin{argtable}
-  \#1 & Gregorio\TeX\ glyph & is an offset glyph (see \#3 below)\\
-  \#2 & Gregorio\TeX glyph & the glyph upon which the sign is to be centered\\
-  \#3 & \texttt{0} & go back to the beginning of the previous glyph and then forward half the width of \#2; this puts the sign at the beginning of the previous glyph, whose first note is the size of \#2\\
-  & \texttt{1} & go back half the width of \#2; this puts the sign at the end of the previous glyph, whose last note is the size of \#2\\
-  & \texttt{2} & go back the width of \#1 and then forward half the width of \#2; this puts the sign at the glyph from the end that starts at \#1’s width from the end\\
-  & \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1 and then back half the width of \#2; this puts the sign at the glyph from the start that ends at \#1’s width from the start\\
-  \#4 & dimension & a shift that we want to get applied, useful for punctum inclinatum for example\\
-  \#5 & integer & is the glyph number\\
-  \#6 & \texttt{1} & vertical episema\\
-  & \texttt{2} & rare sign\\
-  & \texttt{3} & choral sign\\
-  & \texttt{4} & brace above the bar\\
-  \#7 & string & the choral sign if relevant\\
+	\#1 & Gregorio\TeX\ glyph & is an offset glyph (see \#3 below)\\
+	\#2 & Gregorio\TeX glyph & the glyph upon which the sign is to be centered\\
+	\#3 & \texttt{0} & go back to the beginning of the previous glyph and then forward half the width of \#2; this puts the sign at the beginning of the previous glyph, whose first note is the size of \#2\\
+	& \texttt{1} & go back half the width of \#2; this puts the sign at the end of the previous glyph, whose last note is the size of \#2\\
+	& \texttt{2} & go back the width of \#1 and then forward half the width of \#2; this puts the sign at the glyph from the end that starts at \#1’s width from the end\\
+	& \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1 and then back half the width of \#2; this puts the sign at the glyph from the start that ends at \#1’s width from the start\\
+	\#4 & dimension & a shift that we want to get applied, useful for punctum inclinatum for example\\
+	\#5 & integer & is the glyph number\\
+	\#6 & \texttt{1} & vertical episema\\
+	& \texttt{2} & rare sign\\
+	& \texttt{3} & choral sign\\
+	& \texttt{4} & brace above the bar\\
+	\#7 & string & the choral sign if relevant\\
 \end{argtable}
 
 \macroname{\textbackslash gre@newglyphcommon}{}{gregoriotex-syllable.tex}
@@ -715,7 +734,7 @@ Macro for opening up greextra font.
 Macro for populating \verb=\gre@box@syllablenotes=.
 
 \begin{argtable}
-  \#1 & string & The contents to be placed in the box\\
+	\#1 & string & The contents to be placed in the box\\
 \end{argtable}
 
 \macroname{\textbackslash gre@symbolfontsize}{}{gregoriotex-symbols.tex}
@@ -728,39 +747,39 @@ Macro which applies the default text format.
 Saves clef information for use in \verb=gre@updatelinesclef=.
 
 \begin{argtable}
-  \#1 & character & the type of the clef: c or f\\
-  \#2 & integer & the line of the clef (1 is the lowest)\\
-  \#3 & integer & if \texttt{3}, it means that we must not put a flat after the clef, otherwise it’s the height of the flat\\
-  \#4 & character & the type of the secondary clef: c or f\\
-  \#5 & integer & the line of the secondary clef (1 is the lowest, 0 for no secondary clef)\\
-  \#6 & integer & if \texttt{3}, it means that we must not put a flat after the secondary clef, otherwise it’s the height of the flat\\
+	\#1 & character & the type of the clef: c or f\\
+	\#2 & integer & the line of the clef (1 is the lowest)\\
+	\#3 & integer & if \texttt{3}, it means that we must not put a flat after the clef, otherwise it’s the height of the flat\\
+	\#4 & character & the type of the secondary clef: c or f\\
+	\#5 & integer & the line of the secondary clef (1 is the lowest, 0 for no secondary clef)\\
+	\#6 & integer & if \texttt{3}, it means that we must not put a flat after the secondary clef, otherwise it’s the height of the flat\\
 \end{argtable}
 
 \macroname{\textbackslash gre@typeclef}{\#1\#2\#3\#4\#5\#6\#7\#8}{gregoriotex-signs.tex}
 Macro which typesets the clef.
 
 \begin{argtable}
-  \#1 & character & the type of the clef: c or f\\
-  \#2 & integer & the line of the clef (1 is the lowest)\\
-  \#3 & \texttt{0} & no need to use small clef characters (inside a line)\\
-  & \texttt{1} & we must use small clef characters (inside a line)\\
-  \#4 & \texttt{0} & no extra space is needed after the clef\\
-  & \texttt{}1 & we must type a space after the clef\\
-  \#5 & integer & if \texttt{3}, it means that we must not put a flat after the clef, otherwise it’s the height of the flat\\
-  \#6 & character & the type of the secondary clef: c or f\\
-  \#7 & integer & the line of the secondary clef (1 is the lowest, 0 for no secondary clef)\\
-  \#8 & integer & if \texttt{3}, it means that we must not put a flat after the secondary clef, otherwise it’s the height of the flat\\
+	\#1 & character & the type of the clef: c or f\\
+	\#2 & integer & the line of the clef (1 is the lowest)\\
+	\#3 & \texttt{0} & no need to use small clef characters (inside a line)\\
+	& \texttt{1} & we must use small clef characters (inside a line)\\
+	\#4 & \texttt{0} & no extra space is needed after the clef\\
+	& \texttt{}1 & we must type a space after the clef\\
+	\#5 & integer & if \texttt{3}, it means that we must not put a flat after the clef, otherwise it’s the height of the flat\\
+	\#6 & character & the type of the secondary clef: c or f\\
+	\#7 & integer & the line of the secondary clef (1 is the lowest, 0 for no secondary clef)\\
+	\#8 & integer & if \texttt{3}, it means that we must not put a flat after the secondary clef, otherwise it’s the height of the flat\\
 \end{argtable}
 
 \macroname{\textbackslash gre@typesingleclef}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
 Macro which typesets a single clef.
 
 \begin{argtable}
-  \#1 & character & the type of the clef: c or f\\
-  \#2 & integer & the line of the clef (1 is the lowest)\\
-  \#3 & \texttt{0} & no need to use small clef characters (inside a line)\\
-  & \texttt{1} & we must use small clef characters (inside a line)\\
-  \#4 & integer & if \texttt{3}, it means that we must not put a flat after the clef, otherwise it’s the height of the flat\\
+	\#1 & character & the type of the clef: c or f\\
+	\#2 & integer & the line of the clef (1 is the lowest)\\
+	\#3 & \texttt{0} & no need to use small clef characters (inside a line)\\
+	& \texttt{1} & we must use small clef characters (inside a line)\\
+	\#4 & integer & if \texttt{3}, it means that we must not put a flat after the clef, otherwise it’s the height of the flat\\
 \end{argtable}
 
 \macroname{\textbackslash gre@updateleftbox}{}{gregoriotex-main.tex}
@@ -782,17 +801,17 @@ Macro for calculating the width of its argument and storing it in \verb=\gre@dim
 Macro to write a bar.
 
 \begin{argtable}
-  \#1 & \texttt{0} & virgula\\
-  & \texttt{1} & minima\\
-  & \texttt{2} & minor\\
-  & \texttt{3} & major\\
-  & \texttt{4} & finalis\\
-  & \texttt{5} & the last finalis\\
-  \#2 & \texttt{0} & in a syllable containing only this bar\\
-  & \texttt{1} & in a syllable containing other notes\\
-  \#3 & \texttt{0} & if there is no text underneath the bar\\
-  & \texttt{1} & if there is text underneath the bar\\
-  \#4 & \TeX\ code & macros that may happen before the skip after the bar (typically GreVEpisema)\\
+	\#1 & \texttt{0} & virgula\\
+	& \texttt{1} & minima\\
+	& \texttt{2} & minor\\
+	& \texttt{3} & major\\
+	& \texttt{4} & finalis\\
+	& \texttt{5} & the last finalis\\
+	\#2 & \texttt{0} & in a syllable containing only this bar\\
+	& \texttt{1} & in a syllable containing other notes\\
+	\#3 & \texttt{0} & if there is no text underneath the bar\\
+	& \texttt{1} & if there is text underneath the bar\\
+	\#4 & \TeX\ code & macros that may happen before the skip after the bar (typically GreVEpisema)\\
 \end{argtable}
 
 \macroname{\textbackslash gre@@arg}{}{gregoriotex-syllable.tex}
@@ -805,18 +824,18 @@ A dummy macro which has not contents.  Used for \verb=\ifx= comparisons.
 Workhorse function behind \verb=\greannotation=.
 
 \begin{argtable}
-  \#1 & \texttt{c} & center align the new line with the existing annotation content\\
-  & \texttt{l} & left align the new line with the existing annotation content\\
-  & \texttt{r} & right align the new line with the existing annotation content\\
-  \#2 & string & the new annotation content\\
+	\#1 & \texttt{c} & center align the new line with the existing annotation content\\
+	& \texttt{l} & left align the new line with the existing annotation content\\
+	& \texttt{r} & right align the new line with the existing annotation content\\
+	\#2 & string & the new annotation content\\
 \end{argtable}
 
 \macroname{\textbackslash gre@commentary}{[\#1]\#2}{gregoriotex-main.tex}
 Workhorse function behind \verb=\grecommentary=.
 
 \begin{argtable}
-  \#1 & distance & Additional distance to be placed between the commentary and the top staff line for the next score only.\\
-  \#2 & string & the new commentary content\\
+	\#1 & distance & Additional distance to be placed between the commentary and the top staff line for the next score only.\\
+	\#2 & string & the new commentary content\\
 \end{argtable}
 
 \macroname{\textbackslash gre@atletter}{}{gregoriotex-main.tex}
@@ -841,7 +860,7 @@ Workhorse function behind \verb=\grechangestyle=.  Necessary because the interna
 Macro used in \verb=\GreSyllable=. Sets \verb=\gre@skip@bolshift= to the left kern that should appear at the beginning of a line in case of a forced linebreak.  The goal of this left kern is to have all lines aligned on notes.  This shift is applied to the right before every syllable and then to the left after placing an empty box.  At the beginning of the line the shift to the right is ignored by \TeX\ as leading white space, but the shift left is not because of the presence of the “character” of the empty box.
 
 \begin{argtable}
-  \#1 & dimension & \verb=begindifference= of the syllable\\
+	\#1 & dimension & \verb=begindifference= of the syllable\\
 \end{argtable}
 
 \macroname{\textbackslash gre@calculate@eolshift}{\#1}{gregoriotex-spaces.tex}
@@ -851,17 +870,17 @@ text go further than notes in the last syllable of a line, the idea
 is to allow text to go a bit further right, under the custos.  This shift is applied to the left after every syllable and then to the right after setting the line break penalty.  If the line break occurs after this syllable, it will occur between the two shifts, pushing the shift right to the beginning of the next line where \TeX\ will ignore it as leading white space.
 
 \begin{argtable}
-  \#1 & dimension & The \verb=enddifference= of the corresponding syllable\\
+	\#1 & dimension & The \verb=enddifference= of the corresponding syllable\\
 \end{argtable}
 
 \macroname{\textbackslash gre@calculate@syllablefinalskip}{\#1\#2}{gregoriotex-spaces.tex}
 Macro computing the skip at the end of the syllable.
 
 \begin{argtable}
-  \#1 & \texttt{0} & if end of syllable\\
-  & \texttt{1} & if end of word\\
-  \#2 & \texttt{0} & if next syllable is normal\\
-  & \texttt{1} & if it’s a bar\\
+	\#1 & \texttt{0} & if end of syllable\\
+	& \texttt{1} & if end of word\\
+	\#2 & \texttt{0} & if next syllable is normal\\
+	& \texttt{1} & if it’s a bar\\
 \end{argtable}
 
 \macroname{\textbackslash gre@convert}{}{gregoriotex-spaces.tex}
@@ -874,46 +893,46 @@ Macro to hold the list of debug messages which should be designated as printing.
 Macro to print debugging messages.
 
 \begin{argtable}
-  \#1 & string & The category of the message (used in conjunction with \verb=\gre@debug= to determine whether to print the message or not\\
-  \#2 & string & The debug message\\
+	\#1 & string & The category of the message (used in conjunction with \verb=\gre@debug= to determine whether to print the message or not\\
+	\#2 & string & The debug message\\
 \end{argtable}
 
 \macroname{\textbackslash gre@declarefileversion}{\#1\#2}{gregoriotex-main.tex}
 Macro which checks for version consistency between Gregorio\TeX\ files.
 
 \begin{argtable}
-  \#1 & string & name of the current file\\
-  \#2 & string & version of the current file\\
+	\#1 & string & name of the current file\\
+	\#2 & string & version of the current file\\
 \end{argtable}
 
 \macroname{\textbackslash gre@def@char@he}{\#1\#2}{gregoriotex-chars.tex}
 Macro for defining the various types of horizontal episema.
 
 \begin{argtable}
-  \#1 & string & name of the horizontal episema to be defined\\
-  \#2 & string & Camel case name of horizontal episema to be defined\\
+	\#1 & string & name of the horizontal episema to be defined\\
+	\#2 & string & Camel case name of horizontal episema to be defined\\
 \end{argtable}
 
 \macroname{\textbackslash gre@def@char@he@porr}{\#1\#2}{gregoriotex-chars.tex}
 Macro for defining the various types of horizontal episema porrectus.
 
 \begin{argtable}
-  \#1 & string & name of the horizontal episema porrectus to be defined\\
-  \#2 & string & Camel case name of horizontal episema porrectus to be defined\\
+	\#1 & string & name of the horizontal episema porrectus to be defined\\
+	\#2 & string & Camel case name of horizontal episema porrectus to be defined\\
 \end{argtable}
 
 \macroname{\textbackslash gre@char@cavum}{\#1\#2\#3\#4\#5\#6\#7\#8}{gregoriotex-signs.tex}
 Macro to typeset a “cavum” character.
 
 \begin{argtable}
-  \#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
-  \#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
-  \#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
-  \#4 & \TeX\ code    & Macros executed before the punctum cavum is written.\\
-  \#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
-  \#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.\\
-  \#7 & control sequence & The control sequence for the glyph.\\
-  \#8 & control sequence & The control sequence for the hole glyph.
+	\#1 & length  & Argument \#2 from \verb=\GreGlyph=. Height to raise the glyph.\\
+	\#2 & length  & Argument \#3 from \verb=\GreGlyph=. Height of the next note.\\
+	\#3 & integer & Argument \#4 from \verb=\GreGlyph=. The type of glyph.\\
+	\#4 & \TeX\ code    & Macros executed before the punctum cavum is written.\\
+	\#5 & character & Argument \#5 from \verb=\GreGlyph=. The signs to typeset before the glyph.\\
+	\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled.\\
+	\#7 & control sequence & The control sequence for the glyph.\\
+	\#8 & control sequence & The control sequence for the hole glyph.
 \end{argtable}
 
 \macroname{\textbackslash gre@get@spaceskip}{\#1}{gregoriotex-signs.tex}
@@ -921,29 +940,29 @@ Loads \verb=\gre@skip@temp@four= with the appropriate rubber length given the
 desired case.
 
 \begin{argtable}
-  \#1 & \texttt{0} & Default space.\\
-  & \texttt{1} & Zero-width space.\\
-  & \texttt{2} & Space between flat or natural and a note.\\
-  & \texttt{3} & Space between two puncta inclinata, descending.\\
-  & \texttt{4} & Space between bivirga or trivirga.\\
-  & \texttt{5} & space between bistropha or tristropha.\\
-  & \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
-  & \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis, descending.\\
-  & \texttt{8} & Space between two puncta inclinata debilis.\\
-  & \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
-  & \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), descending.\\
-  & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), descending.\\
-  & \texttt{12} & Space between two puncta inclinata, ascending. \\
-  & \texttt{13} & Space between a punctum inclinatum and a punctum inclinatum debilis, ascending. \\
-  & \texttt{14} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), ascending. \\
-  & \texttt{15} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), ascending. \\
-  & \texttt{16} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch below. \\
-  & \texttt{17} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches below. \\
-  & \texttt{18} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches below \\
-  & \texttt{19} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch above. \\
-  & \texttt{20} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches above. \\
-  & \texttt{21} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches above \\
-  & \texttt{22} & Half-space. \\
+	\#1 & \texttt{0} & Default space.\\
+	& \texttt{1} & Zero-width space.\\
+	& \texttt{2} & Space between flat or natural and a note.\\
+	& \texttt{3} & Space between two puncta inclinata, descending.\\
+	& \texttt{4} & Space between bivirga or trivirga.\\
+	& \texttt{5} & space between bistropha or tristropha.\\
+	& \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
+	& \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis, descending.\\
+	& \texttt{8} & Space between two puncta inclinata debilis.\\
+	& \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
+	& \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), descending.\\
+	& \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), descending.\\
+	& \texttt{12} & Space between two puncta inclinata, ascending. \\
+	& \texttt{13} & Space between a punctum inclinatum and a punctum inclinatum debilis, ascending. \\
+	& \texttt{14} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), ascending. \\
+	& \texttt{15} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), ascending. \\
+	& \texttt{16} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch below. \\
+	& \texttt{17} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches below. \\
+	& \texttt{18} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches below \\
+	& \texttt{19} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch above. \\
+	& \texttt{20} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches above. \\
+	& \texttt{21} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches above \\
+	& \texttt{22} & Half-space. \\
 \end{argtable}
 
 \macroname{\textbackslash gre@nabcfontname}{}{gregoriotex-main.tex}
@@ -974,14 +993,14 @@ Macro which stores the middle part of the next syllable (the part which aligns w
 A macro which applies formatting that needs to apply to the whole syllable (rather than the parts individually) for the current syllable.  Necessary to preserve ligatures across parts within a syllable.
 
 \begin{argtable}
-  \#1 & string & The syllable (usually built as \verb=\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart=\\
+	\#1 & string & The syllable (usually built as \verb=\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart=\\
 \end{argtable}
 
 \macroname{\textbackslash gre@fixednexttextformat}{\#1}{gregoriotex-syllable.tex}
 A macro which applies formatting that needs to apply to the whole syllable (rather than the parts individually) for the next syllable.  Necessary to preserve ligatures across parts within a syllable.
 
 \begin{argtable}
-  \#1 & string & The syllable (usually built as \verb=\gre@nextfirstsyllablepart\gre@nextmiddlesyllablepart\gre@nextendsyllablepart=\\
+	\#1 & string & The syllable (usually built as \verb=\gre@nextfirstsyllablepart\gre@nextmiddlesyllablepart\gre@nextendsyllablepart=\\
 \end{argtable}
 
 \macroname{\textbackslash gre@gabcname}{}{gregoriotex-main.tex}
@@ -1050,43 +1069,49 @@ The pitch of a rare sign (semicirculus, \etc).
 \macroname{\textbackslash gre@pitch@dummy}{}{gregoriotex-main.tex}
 A meaningless (don't-care) pitch.
 
+\macroname{\textbackslash gre@pitch@nominal}{}{gregoriotex-main.tex}
+A pitch guaranteed to be in the staff.
+
 \macroname{\textbackslash gre@pointandclick}{\#1\#2}{gregoriotex-main.tex}
 Macro to generate the point-and-click links.
 
 \begin{argtable}
-  \#1 & \TeX\ code & the entity which is to contain the link\\
-  \#2 & link target & line:char:column for the link\\
+	\#1 & \TeX\ code & the entity which is to contain the link\\
+	\#2 & link target & line:char:column for the link\\
 \end{argtable}
 
 \macroname{\textbackslash gre@prefix}{}{gregoriotex-spaces.tex}
-Either ``skip’’ or ``dimen’’ according to the distance being set or changed at the given moment.
+Either \texttt{skip} or \texttt{dimen} according to the distance being set or changed at the given moment.
+
+\macroname{\textbackslash gre@prefixII}{}{gregoriotex-spaces.tex}
+Same as \verb=\gre@prefix=.  Used when we were dealing with two distances simultaneously.
 
 \macroname{\textbackslash gre@rubberpermit}{\#1}{gregoriotex-spaces.tex}
 Determines whether the given distance is allowed to take a rubber length.
 
 \begin{argtable}
-  \#1 & string & the name of the distance to check\\
+	\#1 & string & the name of the distance to check\\
 \end{argtable}
 
 \macroname{\textbackslash gre@setgregoriofont}{[\#1]\#2}{gregoriotex-main.tex}
 Workhorse function behind \verb=\gresetgregoriofont=.
 
 \begin{argtable}
-  \#1 & \textit{(omitted)} & Use the normal font and rule set (default).\\
-  & \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.\\
+	\#1 & \textit{(omitted)} & Use the normal font and rule set (default).\\
+	& \texttt{op} & Use the alternate Dominican font/rule set.\\
+	\#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
+	& \texttt{gregorio} & Use the Gregorio font.\\
+	& \texttt{granapadano} & Use the Grana Padano font.\\
 \end{argtable}
 
 \macroname{\textbackslash gre@syllable@end}{\#1\#2\#3}{gregoriotex-syllable.tex}
 Macro to make a few checks and call the right macros between \verb=\endbeforebar, \endofword, \endofsyllable=.
 
 \begin{argtable}
-  \#1 & & next syllable type (\#7 of \verb=\GreSyllable=)\\
-  \#2 & string & next syllable text\\
-  \#3 & \texttt{0} & this syllable is not the end of a word\\
-  & \texttt{1} & this syllable is the end of a word\\
+	\#1 & & next syllable type (\#7 of \verb=\GreSyllable=)\\
+	\#2 & string & next syllable text\\
+	\#3 & \texttt{0} & this syllable is not the end of a word\\
+	& \texttt{1} & this syllable is the end of a word\\
 \end{argtable}
 
 \macroname{\textbackslash gre@typeout}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
@@ -1114,13 +1139,13 @@ Alias for \verb=\luatexlocalrightbox= or \verb=\localrightbox=, depending on \La
 Alias for \verb=\resizebox=.
 
 \macroname{\textbackslash gre@dimension}{}{gregoriotex-spaces.tex}
-Workhorse function behind \verb=\grecreatedim= and \verb=\grechangedim=.
+Workhorse function for setting distances in \verb=\grecreatedim= and \verb=\grechangedim=.
 
 \macroname{\textbackslash gre@setstafflines}{\#1}{gregoriotex-main.tex}
 Sets the number of staff lines.
 
 \begin{argtable}
-  \#1 & integer & The number of staff lines\\
+	\#1 & integer & The number of staff lines\\
 \end{argtable}
 
 \macroname{\textbackslash gre@stafflines}{}{gregoriotex-main.tex}
@@ -1130,39 +1155,39 @@ Contains the number of staff lines.
 Typesets its numeric argument as an upper-case Roman numeral.
 
 \begin{argtable}
-  \#1 & integer & The number to typeset\\
+	\#1 & integer & The number to typeset\\
 \end{argtable}
 
 \macroname{\textbackslash gre@romannumeral@minuscule}{\#1}{gregoriotex-main.tex}
 Typesets its numeric argument as a lower-case Roman numeral.
 
 \begin{argtable}
-  \#1 & integer & The number to typeset\\
+	\#1 & integer & The number to typeset\\
 \end{argtable}
 
 \macroname{\textbackslash gre@bar@space@suffix}{\#1\#2}{gregoriotex-symbols.tex}
 Macro used to select the corresct suffix of the \verb=bar@x= spaces.
 
 \begin{argtable}
-  \#1 & \texttt{0} & emits nothing\\
-  & \texttt{1} emits \texttt{text}\\
+	\#1 & \texttt{0} & emits nothing\\
+	& \texttt{1} emits \texttt{text}\\
 \end{argtable}
 
 \macroname{\textbackslash gre@drawadditionalline}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
 Workhorse function behind \verb=\GreDrawAdditionalLine=.
 
 \begin{argtable}
-  \#1 & \texttt{0} & Draw an over-the-staff ledger line. \\
-      & \texttt{1} & Draw an under-the-staff ledger line. \\
-  \#2 & distance   & The length of the line, with TeX units, excluding any left or right distances coming from the rest of the arguments. \\
-  \#3 & \texttt{0} & Start the line at this point. \\
-      & \texttt{1} & Start the line to the left of this point by \verb=gre@dimen@additionallineswidth=. \\
-      & \texttt{2} & Start the line to the left of this point by \#4. \\
-  \#4 & distance   & The distance to move left before starting the line if \#3 is \texttt{2}. \\
-  \#5 & \texttt{0} & End the line exactly \#2 to the right of this point. \\
-      & \texttt{1} & End the line \verb=gre@dimen@additionallineswidth= to the right of \#2 from this point. \\
-      & \texttt{2} & End the line \#6 to the right of \#2 from this point. \\
-  \#6 & distance   & The distance to end the line after \#2 from this point if \#3 is \texttt{2}. \\
+	\#1 & \texttt{0} & Draw an over-the-staff ledger line. \\
+			& \texttt{1} & Draw an under-the-staff ledger line. \\
+	\#2 & distance   & The length of the line, with TeX units, excluding any left or right distances coming from the rest of the arguments. \\
+	\#3 & \texttt{0} & Start the line at this point. \\
+			& \texttt{1} & Start the line to the left of this point by \verb=gre@dimen@additionallineswidth=. \\
+			& \texttt{2} & Start the line to the left of this point by \#4. \\
+	\#4 & distance   & The distance to move left before starting the line if \#3 is \texttt{2}. \\
+	\#5 & \texttt{0} & End the line exactly \#2 to the right of this point. \\
+			& \texttt{1} & End the line \verb=gre@dimen@additionallineswidth= to the right of \#2 from this point. \\
+			& \texttt{2} & End the line \#6 to the right of \#2 from this point. \\
+	\#6 & distance   & The distance to end the line after \#2 from this point if \#3 is \texttt{2}. \\
 \end{argtable}
 
 \macroname{\textbackslash gre@get@unkern@aftermora}{}{gregoriotex-signs.tex}
@@ -1175,21 +1200,21 @@ Macro which kerns between a punctum mora and a bar according to the setting in \
 Workhorse behind \verb=\gresetgregoriofontscaled=.
 
 \begin{argtable}
-  \#1 & \textit{(omitted)} & Use the normal font and rule set.\\
-  & \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.\\
-  \#3 & integer & the scaling factor\\
+	\#1 & \textit{(omitted)} & Use the normal font and rule set.\\
+	& \texttt{op} & Use the alternate Dominican font/rule set.\\
+	\#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
+	& \texttt{gregorio} & Use the Gregorio font.\\
+	& \texttt{granapadano} & Use the Grana Padano font.\\
+	\#3 & integer & the scaling factor\\
 \end{argtable}
 
 \macroname{\textbackslash gre@calculate@barposition}{\#1\#2}{gregoriotex-spaces.tex}
 Macro for calculating the position of the elements of a bar syllable using the new bar positioning algorithm.
 
 \begin{argtable}
-  \#1 & 0 & bar is not the end of a word\\
-  & 1 & bar is the end of a word\\
-  \#2 & integer & alignment type of the first glyph in the next syllable.  See \nameref{notesalign}\\
+	\#1 & 0 & bar is not the end of a word\\
+	& 1 & bar is the end of a word\\
+	\#2 & integer & alignment type of the first glyph in the next syllable.  See \nameref{notesalign}\\
 \end{argtable}
 
 \macroname{\textbackslash gre@newlinearg}{}{gregoriotex-syllable.tex}
@@ -1205,15 +1230,15 @@ Macro for storing original behavior of \verb=\gre@newlinecommon= so that it can
 Macro to typeset a punctum mora.
 
 \begin{argtable}
-  \#1 & pitch & height of the punctum mora (one of the \verb=\gre@pitch@...= macros.\\
-  \#2 & 0 & general case\\
-  & 1 & make the punctum mora zero-width\\
-  & 2 & shift the width of one punctum to the left\\
-  & 3 & same as 2 but with ambitus of one\\
-  \#3 & 1 & punctum mora in the note before the last note of a podatus, porrectus, or torculus resupinus\\
-  & 0 & other cases\\
-  \#4 & 1 & punctum inclinatum\\
-  & 0 & other cases\\
+	\#1 & pitch & height of the punctum mora (one of the \verb=\gre@pitch@...= macros.\\
+	\#2 & 0 & general case\\
+	& 1 & make the punctum mora zero-width\\
+	& 2 & shift the width of one punctum to the left\\
+	& 3 & same as 2 but with ambitus of one\\
+	\#3 & 1 & punctum mora in the note before the last note of a podatus, porrectus, or torculus resupinus\\
+	& 0 & other cases\\
+	\#4 & 1 & punctum inclinatum\\
+	& 0 & other cases\\
 \end{argtable}
 
 
@@ -1233,7 +1258,7 @@ Macro for closing the auxiliary file.
 Macro for writing the auxiliary file.
 
 \begin{argtable}
-  \#1 & string & contents to be written to the auxiliary file\\
+	\#1 & string & contents to be written to the auxiliary file\\
 \end{argtable}
 
 
@@ -1253,7 +1278,7 @@ The font for ancient notation.
 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}
@@ -1521,11 +1546,17 @@ Count which indicates whether the point-and-click functionality should be implem
 \macroname{\textbackslash gre@variableheightexpansion}{}{gregoriotex-main.tex}
 Count to indicated if the spacing between lines should be variable (\texttt{1}) or fixed (\texttt{0}).  Not a boolean because it needs to be readable by Lua.
 
+\macroname{\textbackslash ifgre@usecustosalteration}{}{gregoriotex-signs.tex}
+Boolean which indicates whether alterations should be printed for custodes.
+
 \macroname{\textbackslash ifgre@blockeolcustos}{}{gregoriotex-main.tex}
 Boolean which indicates whether the custos at the end of the line should be blocked.
 
 \macroname{\textbackslash ifgre@blockeolcustosbeforeeuouae}{}{gregoriotex-main.tex}
 Boolean which indicates whether the custos at the end of the line should be blocked if a EUOUAE block immediately follows.
+\macroname{\textbackslash ifgre@blockeolcustos}{}{gregoriotex-main.tex}
+Boolean which indicates whether the custos at the end of the line should be blocked.
+
 
 \macroname{\textbackslash ifgre@raggedbreakbeforeeuouae}{}{gregoriotex-main.tex}
 Boolean which indicates whether an automatic line break immediately before a EUOUAE block should be ragged.
@@ -1619,6 +1650,30 @@ Boolean indicating that the current syllable had a forced center in the gabc whi
 \macroname{\textbackslash ifgre@nextforcedcentering}{}{gregoriotex-syllable.tex}
 Boolean indicating that the next syllable had a forced center in the gabc which is to be respected.
 
+\macroname{\textbackslash ifgre@unbreakableendofelement}{}{gregoriotex-main.tex}
+Boolean used by \verb=\GreEndOfElement= to store whether the line may be broken at that point.
+
+\macroname{\textbackslash gre@count@syllablenotes}{}{gregoriotex-syllable.tex}
+Count containing the number of notes in the syllable.
+
+\macroname{\textbackslash gre@count@unbreakabletotalnotes}{}{gregoriotex-syllable.tex}
+Count containing the minimum number of notes in the syllable before the syllable
+may be broken across lines.
+
+\macroname{\textbackslash gre@count@unbreakableinitialnotes}{}{gregoriotex-syllable.tex}
+Count containing the minimum number of notes at the start of a syllable that
+must be kept together when the syllable is broken across lines.
+
+\macroname{\textbackslash gre@count@unbreakablefinalnotes}{}{gregoriotex-syllable.tex}
+Count containing the minimum number of notes at the end of a syllable that must
+be kept together when the syllable is broken across lines.
+
+\macroname{\textbackslash ifgre@shownotes}{}{gregoriotex-syllable.tex}
+Boolean indicating whether the notes should be shown.
+
+\macroname{\textbackslash ifgre@showlyrics}{}{gregoriotex-syllable.tex}
+Boolean indicating whether the lyrics should be shown.
+
 
 \subsection{Boxes}
 
@@ -1858,21 +1913,21 @@ These are the macros that Gregorio\TeX\ uses to manipulate the penalties in orde
 Top level function that aliases \verb=\gre@truepenalty= or \verb=\gre@falsepenalty= according to whether penalties should be in play or not.
 
 \begin{argtable}
-  \#1 & integer & The penalty to be applied or gobbled\\
+	\#1 & integer & The penalty to be applied or gobbled\\
 \end{argtable}
 
 \macroname{\textbackslash gre@truepenalty}{\#1}{gregoriotex-signs.tex}
 Alias for \verb=\penalty=.
 
 \begin{argtable}
-  \#1 & integer & The penalty to be applied\\
+	\#1 & integer & The penalty to be applied\\
 \end{argtable}
 
 \macroname{\textbackslash gre@falsepenalty}{\#1}{gregoriotex-signs.tex}
 Macro to gobble (suppress) its argument.
 
 \begin{argtable}
-  \#1 & integer & The penalty to be gobbled\\
+	\#1 & integer & The penalty to be gobbled\\
 \end{argtable}
 
 \macroname{\textbackslash gre@cancelpenalties}{}{gregoriotex-spaces.tex}
@@ -1956,25 +2011,25 @@ rather than have multiple definitions.
 \subsection{Note Alignment Type}\label{notesalign}
 \rowcolors{1}{lightgray}{lightgray}
 \begin{tabulary}{\textwidth}{cL}
-  \multicolumn{2}{c}{Integer with the following possibilities:} \\
-  \hline
-  \texttt{0} & one-note glyph or more than two notes glyph except porrectus : here we must put the aligncenter in the middle of the first note\\
-  \texttt{1} & two notes glyph (podatus is considered as a one-note glyph) : here we put the aligncenter in the middle of the glyph\\
-  \texttt{2} & porrectus : has a special align center\\
-  \texttt{3} & initio-debilis : same as 1 but the first note is much smaller\\
-  \texttt{4} & case of a glyph starting with a quilisma\\
-  \texttt{5} & case of a glyph starting with an oriscus\\
-  \texttt{6} & case of a punctum inclinatum\\
-  \texttt{7} & case of a stropha\\
-  \texttt{8} & flexus with an ambitus of one\\
-  \texttt{9} & flexus deminutus\\
-  \texttt{10} & virgula\\
-  \texttt{11} & divisio minima\\
-  \texttt{12} & divisio minor\\
-  \texttt{13} & divisio maior\\
-  \texttt{14} & dominican bar\\
-  \texttt{15} & divisio finalis\\
-  \texttt{16} & no note
+	\multicolumn{2}{c}{Integer with the following possibilities:} \\
+	\hline
+	\texttt{0} & one-note glyph or more than two notes glyph except porrectus : here we must put the aligncenter in the middle of the first note\\
+	\texttt{1} & two notes glyph (podatus is considered as a one-note glyph) : here we put the aligncenter in the middle of the glyph\\
+	\texttt{2} & porrectus : has a special align center\\
+	\texttt{3} & initio-debilis : same as 1 but the first note is much smaller\\
+	\texttt{4} & case of a glyph starting with a quilisma\\
+	\texttt{5} & case of a glyph starting with an oriscus\\
+	\texttt{6} & case of a punctum inclinatum\\
+	\texttt{7} & case of a stropha\\
+	\texttt{8} & flexus with an ambitus of one\\
+	\texttt{9} & flexus deminutus\\
+	\texttt{10} & virgula\\
+	\texttt{11} & divisio minima\\
+	\texttt{12} & divisio minor\\
+	\texttt{13} & divisio maior\\
+	\texttt{14} & dominican bar\\
+	\texttt{15} & divisio finalis\\
+	\texttt{16} & no note
  \end{tabulary}
 
 \subsection{Episema Special}\label{EpisemaSpecial}
@@ -1986,62 +2041,62 @@ rather than have multiple definitions.
 \hrule
 \vspace{-0.8\baselineskip}
 \begin{description}
-  \item[FinalPunctum] Last note, which is a standard punctum (works with pes).
-  \item[FinalDeminutus] Same, but the last note is a deminutus.
-  \item[PenultBeforePunctumWide] The note before the last note, which is a standard punctum.
-  \item[PenultBeforeDeminutus] Idem, but the note is the note preceding a deminutus.
-  \item[AntepenultBeforePunctum] The note before the note before the last note (for porrectus flexus).
-  \item[AntepenultBeforeDeminutus] Idem, but when the two last notes are a deminutus.
-  \item[InitialPunctum] The first note, if it is a standard punctum.
-  \item[InitioDebilis] The first note, if it is an initio debilis.
-  \item[PorrNonAuctusInitialWide] first note of a non-auctus porrectus with a second ambitus of at least two.
-  \item[PorrNonAuctusInitialOne] first note of a non-auctus porrectus with a second ambitus of one
-  \item[PorrAuctusInitialAny] first note of an auctus porrectus, regardless of second ambitus
-  \item[FinalInclinatum] punctum inclinatum as last note
-  \item[FinalInclinatumDeminutus] punctum inclinatum deminutus as last note
-  \item[FinalStropha] stropha as last note
-  \item[FinalQuilisma] quilisma as last note
-  \item[FinalOriscus] oriscus as last note
-  \item[PenultBeforePunctumOne] second-to-last note, with a second ambitus of one, when last note is a standard punctum (like the second note of ghg)
-  \item[FinalUpperPunctum] “upper smaller punctum” as last note (concerning simple podatus, podatus, and torculus resupinus)
-  \item[InitialOriscus] oriscus as first note, disconnected from next note
-  \item[InitialQuilisma] quilisma as first note, disconnected from next note
-  \item[TorcResNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with a punctum, with a first and second ambitus of at least two
-  \item[TorcResNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with a punctum, with a first ambitus of one and a second ambitus of at least two
-  \item[TorcResDebilisNonAuctusSecondAnyWide] second note of a non-auctus torculus resupinus initio debilis with any first ambitus and a second ambitus of at least two
-  \item[FinalLineaPunctum] linea punctum (cavum) as last note
-  \item[BarStandard] standard bar
-  \item[BarVirgula] virgula
-  \item[BarDivisioFinalis] divisio finalis
-  \item[TorcResQuilismaNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with a quilisma, with a first and second ambitus of at least two
-  \item[TorcResOriscusNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with an oriscus, with a first and second ambitus of at least two
-  \item[TorcResQuilismaNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with a quilisma, with a first ambitus of one and and second ambitus of at least two
-  \item[TorcResOriscusNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with an oriscus, with a first ambitus of one and and second ambitus of at least two
-  \item[TorcResNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with a punctum, with a first ambitus of at least two and a second ambitus of one
-  \item[TorcResDebilisNonAuctusSecondAnyOne] second note of a non-auctus torculus resupinus initio debilis with any first ambitus and a second ambitus of one
-  \item[TorcResQuilismaNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with a quilisma, with a first ambitus of at least two and a second ambitus of one
-  \item[TorcResOriscusNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with an oriscus, with a first ambitus of at least two and a second ambitus of one
-  \item[TorcResNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with a punctum, with a first and second ambitus of one
-  \item[TorcResQuilismaNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with a quilisma, with a first and second ambitus of one
-  \item[TorcResOriscusNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with an oriscus, with a first and second ambitus of one
-  \item[TorcResAuctusSecondWideAny] second note of an auctus torculus resupinus starting with a punctum, with a first ambitus of at least two and any second ambitus
-  \item[TorcResDebilisAuctusSecondAnyAny] second note of an auctus torculus resupinus initio debilis with any first and second ambitus
-  \item[TorcResQuilismaAuctusSecondWideAny] second note of an auctus torculus resupinus starting with a quilisma, with a first ambitus of at least two and any second ambitus
-  \item[TorcResOriscusAuctusSecondWideAny] second note of an auctus torculus resupinus starting with an oriscus, with a first ambitus of at least two and any second ambitus
-  \item[TorcResAuctusSecondOneAny] second note of an auctus torculus resupinus starting with a punctum, with a first ambitus of one and any second ambitus
-  \item[TorcResQuilismaAuctusSecondOneAny] second note of an auctus torculus resupinus starting with a quilisma, with a first ambitus of one and any second ambitus
-  \item[TorcResOriscusAuctusSecondOneAny] second note of an auctus torculus resupinus starting with an oriscus, with a first ambitus of one and any second ambitus
-  \item[ConnectedPenultBeforePunctumWide] second-to-last note connected to prior note, with a second ambitus of at least two, when last note is a standard punctum (like the second note of \textit{gig})
-  \item[ConnectedPenultBeforePunctumOne] second-to-last note connected to prior note, with a second ambitus of one, when last note is a standard punctum (like the second note of \textit{gih})
-  \item[InitialConnectedPunctum] standard punctum as first note, connected to next higher note
-  \item[InitialConnectedVirga] “virga” as first note, connected to next lower note
-  \item[InitialConnectedQuilisma] quilisma as first note, connected to next higher note
-  \item[InitialConnectedOriscus] oriscus as first note, connected to next higher note
-  \item[FinalConnectedPunctum] punctum as last note, connected to prior higher note
-  \item[FinalConnectedAuctus] auctus as last note, connected to prior lower note
-  \item[FinalVirgaAuctus] virga aucta as last note
-  \item[FinalConnectedVirga] “virga” as last note, connected to prior lower note
-  \item[InitialVirga] “virga” as first note, disconnected from next note
+	\item[FinalPunctum] Last note, which is a standard punctum (works with pes).
+	\item[FinalDeminutus] Same, but the last note is a deminutus.
+	\item[PenultBeforePunctumWide] The note before the last note, which is a standard punctum.
+	\item[PenultBeforeDeminutus] Idem, but the note is the note preceding a deminutus.
+	\item[AntepenultBeforePunctum] The note before the note before the last note (for porrectus flexus).
+	\item[AntepenultBeforeDeminutus] Idem, but when the two last notes are a deminutus.
+	\item[InitialPunctum] The first note, if it is a standard punctum.
+	\item[InitioDebilis] The first note, if it is an initio debilis.
+	\item[PorrNonAuctusInitialWide] first note of a non-auctus porrectus with a second ambitus of at least two.
+	\item[PorrNonAuctusInitialOne] first note of a non-auctus porrectus with a second ambitus of one
+	\item[PorrAuctusInitialAny] first note of an auctus porrectus, regardless of second ambitus
+	\item[FinalInclinatum] punctum inclinatum as last note
+	\item[FinalInclinatumDeminutus] punctum inclinatum deminutus as last note
+	\item[FinalStropha] stropha as last note
+	\item[FinalQuilisma] quilisma as last note
+	\item[FinalOriscus] oriscus as last note
+	\item[PenultBeforePunctumOne] second-to-last note, with a second ambitus of one, when last note is a standard punctum (like the second note of ghg)
+	\item[FinalUpperPunctum] “upper smaller punctum” as last note (concerning simple podatus, podatus, and torculus resupinus)
+	\item[InitialOriscus] oriscus as first note, disconnected from next note
+	\item[InitialQuilisma] quilisma as first note, disconnected from next note
+	\item[TorcResNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with a punctum, with a first and second ambitus of at least two
+	\item[TorcResNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with a punctum, with a first ambitus of one and a second ambitus of at least two
+	\item[TorcResDebilisNonAuctusSecondAnyWide] second note of a non-auctus torculus resupinus initio debilis with any first ambitus and a second ambitus of at least two
+	\item[FinalLineaPunctum] linea punctum (cavum) as last note
+	\item[BarStandard] standard bar
+	\item[BarVirgula] virgula
+	\item[BarDivisioFinalis] divisio finalis
+	\item[TorcResQuilismaNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with a quilisma, with a first and second ambitus of at least two
+	\item[TorcResOriscusNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with an oriscus, with a first and second ambitus of at least two
+	\item[TorcResQuilismaNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with a quilisma, with a first ambitus of one and and second ambitus of at least two
+	\item[TorcResOriscusNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with an oriscus, with a first ambitus of one and and second ambitus of at least two
+	\item[TorcResNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with a punctum, with a first ambitus of at least two and a second ambitus of one
+	\item[TorcResDebilisNonAuctusSecondAnyOne] second note of a non-auctus torculus resupinus initio debilis with any first ambitus and a second ambitus of one
+	\item[TorcResQuilismaNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with a quilisma, with a first ambitus of at least two and a second ambitus of one
+	\item[TorcResOriscusNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with an oriscus, with a first ambitus of at least two and a second ambitus of one
+	\item[TorcResNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with a punctum, with a first and second ambitus of one
+	\item[TorcResQuilismaNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with a quilisma, with a first and second ambitus of one
+	\item[TorcResOriscusNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with an oriscus, with a first and second ambitus of one
+	\item[TorcResAuctusSecondWideAny] second note of an auctus torculus resupinus starting with a punctum, with a first ambitus of at least two and any second ambitus
+	\item[TorcResDebilisAuctusSecondAnyAny] second note of an auctus torculus resupinus initio debilis with any first and second ambitus
+	\item[TorcResQuilismaAuctusSecondWideAny] second note of an auctus torculus resupinus starting with a quilisma, with a first ambitus of at least two and any second ambitus
+	\item[TorcResOriscusAuctusSecondWideAny] second note of an auctus torculus resupinus starting with an oriscus, with a first ambitus of at least two and any second ambitus
+	\item[TorcResAuctusSecondOneAny] second note of an auctus torculus resupinus starting with a punctum, with a first ambitus of one and any second ambitus
+	\item[TorcResQuilismaAuctusSecondOneAny] second note of an auctus torculus resupinus starting with a quilisma, with a first ambitus of one and any second ambitus
+	\item[TorcResOriscusAuctusSecondOneAny] second note of an auctus torculus resupinus starting with an oriscus, with a first ambitus of one and any second ambitus
+	\item[ConnectedPenultBeforePunctumWide] second-to-last note connected to prior note, with a second ambitus of at least two, when last note is a standard punctum (like the second note of \textit{gig})
+	\item[ConnectedPenultBeforePunctumOne] second-to-last note connected to prior note, with a second ambitus of one, when last note is a standard punctum (like the second note of \textit{gih})
+	\item[InitialConnectedPunctum] standard punctum as first note, connected to next higher note
+	\item[InitialConnectedVirga] “virga” as first note, connected to next lower note
+	\item[InitialConnectedQuilisma] quilisma as first note, connected to next higher note
+	\item[InitialConnectedOriscus] oriscus as first note, connected to next higher note
+	\item[FinalConnectedPunctum] punctum as last note, connected to prior higher note
+	\item[FinalConnectedAuctus] auctus as last note, connected to prior lower note
+	\item[FinalVirgaAuctus] virga aucta as last note
+	\item[FinalConnectedVirga] “virga” as last note, connected to prior lower note
+	\item[InitialVirga] “virga” as first note, disconnected from next note
 \end{description}
 \end{shaded*}
 
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex
index 2afcf872343..27ef298188b 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex
@@ -46,54 +46,54 @@ Some headers have special meaning to Gregorio:
 
 \begin{description}
 \item[name] This is the name of the piece, in almost all cases the
-  incipit, the first few words. In the case of the mass ordinary, the
-  form as \texttt{Kyrie X Alme Pater} or \texttt{Sanctus XI} is
-  recommended where appropriate. \textbf{This field is required.}
+	incipit, the first few words. In the case of the mass ordinary, the
+	form as \texttt{Kyrie X Alme Pater} or \texttt{Sanctus XI} is
+	recommended where appropriate. \textbf{This field is required.}
 \item[gabc-copyright] This license is the copyright notice (in English) of the gabc file, as chosen by the person named in the transcriber field. As well as the notice itself, it may include a brief description of the license, such as public domain, CC-by-sa; for a list of commonly found open source licenses and exceptions, please see \url{https://spdx.org/licenses/}.  A separate text file will be necessary for the complete legal license. For the legal issues about Gregorian chant scores, please see \url{http://gregorio-project.github.io/legalissues}. An example of this field would be:
-  \begin{lstlisting}[autogobble]
-    gabc-copyright: CC0-1.0 by Elie Roux, 2009 <http://creativecommons.org/publicdomain/zero/1.0/>;
-  \end{lstlisting}
+	\begin{lstlisting}[autogobble]
+		gabc-copyright: CC0-1.0 by Elie Roux, 2009 <http://creativecommons.org/publicdomain/zero/1.0/>;
+	\end{lstlisting}
 \item[score-copyright] This license is the copyright notice (in English) of the score itself from which the gabc was transcribed. Like the \texttt{gabc-copyright}, there may be a brief description of the license too. In unclear or complex cases it may be omitted; it is most suitable for use when the transcriber is the copyright holder and licensor of the score as well. One again, reading the page on legal issues (linked above) is recommended. An example of this field would be:
-  \begin{lstlisting}[autogobble]
-    score-copyright: (C) Abbaye de Solesmes, 1934;
-  \end{lstlisting}
+	\begin{lstlisting}[autogobble]
+		score-copyright: (C) Abbaye de Solesmes, 1934;
+	\end{lstlisting}
 \item[author] The author of the piece, if known; of course, the author of most traditional chant is not known.
 \item[language] The language of the lyrics.
 \item[oriscus-orientation] If \texttt{legacy}, the orientation of an unconnected oriscus must be set manually.
 \item[mode] The mode of the piece. This should normally be an arabic
-  number between 1 and 8, but may be any text required for unusual
-  cases. The mode number will be converted to roman numerals and
-  placed above the initial unless one of the following conditions are
-  met:
-  \begin{itemize}
-  \item There is a \verb=\greannotation= defined immediatly prior to \verb=\gregorioscore=.
-  \item The \texttt{annotation} header field is defined.
-  \end{itemize}
+	number between 1 and 8, but may be any text required for unusual
+	cases. The mode number will be converted to roman numerals and
+	placed above the initial unless one of the following conditions are
+	met:
+	\begin{itemize}
+	\item There is a \verb=\greannotation= defined immediatly prior to \verb=\gregorioscore=.
+	\item The \texttt{annotation} header field is defined.
+	\end{itemize}
 \item[mode-modifier] The mode ``modifier'' of the piece. This may be any
-  \TeX\ code to typeset after the mode, if the mode is typeset.  If the mode
-  is not typeset, the mode-modifier will also not be typeset.
+	\TeX\ code to typeset after the mode, if the mode is typeset.  If the mode
+	is not typeset, the mode-modifier will also not be typeset.
 \item[mode-differentia] The mode or tone differentia of the piece.  Typically,
-  this expresses the variant of the psalm tone to use for the piece.  This may
-  be any \TeX\ code to typeset after the mode-modifier, if the mode is typeset.
-  If the mode is not typeset, the mode-differentia will also not be typeset.
+	this expresses the variant of the psalm tone to use for the piece.  This may
+	be any \TeX\ code to typeset after the mode-modifier, if the mode is typeset.
+	If the mode is not typeset, the mode-differentia will also not be typeset.
 \item[annotation] The annotation is the text to appear above the
-  initial letter. Usually this is an abbreviation of the office-part
-  in the upper line, and an indication of the mode (and differentia
-  for antiphons) in the lower. Either one or two annotation fields may
-  be used; if two are used, the first is the upper line, the second
-  the lower. Example:
-  \begin{lstlisting}[autogobble]
-    annotation:Ad Magnif.;
-    annotation:VIII G;
-  \end{lstlisting}
-  Full \TeX\ markup is accepted:
-  \begin{lstlisting}[autogobble]
-    annotation:{\color{red}Ad Magnif.};
-    annotation:{\color{red}VIII G};
-  \end{lstlisting}
-  If the user already defined annotation(s) in the main \TeX\ file via
-  \verb=\greannotation= then the \texttt{annotation} header field will not
-  overwrite that definition.
+	initial letter. Usually this is an abbreviation of the office-part
+	in the upper line, and an indication of the mode (and differentia
+	for antiphons) in the lower. Either one or two annotation fields may
+	be used; if two are used, the first is the upper line, the second
+	the lower. Example:
+	\begin{lstlisting}[autogobble]
+		annotation:Ad Magnif.;
+		annotation:VIII G;
+	\end{lstlisting}
+	Full \TeX\ markup is accepted:
+	\begin{lstlisting}[autogobble]
+		annotation:{\color{red}Ad Magnif.};
+		annotation:{\color{red}VIII G};
+	\end{lstlisting}
+	If the user already defined annotation(s) in the main \TeX\ file via
+	\verb=\greannotation= then the \texttt{annotation} header field will not
+	overwrite that definition.
 \end{description}
 
 Although gregorio ascribes no special meaning to them, other suggested headers are:
@@ -151,16 +151,16 @@ before it.
 Some examples:
 
 \begin{tabularx}{\textwidth}{l|l|l|X}
-  \texttt{mode} & \texttt{mode-modifier} & \texttt{mode-differentia} & Result \\
-  \hline
-  \verb=6= & & & \writemode{\romannumeral 6}{}{} \\
-  \verb=4A= & & & \writemode{\romannumeral 4\relax A}{}{} \\
-  \verb=4a= & & & \writemode{\romannumeral 4\relax a}{}{} \\
-  \verb=2*= & \verb=t.= & & \writemode{\romannumeral 2*}{\thinspace t.}{} \\
-  \verb=5= & \verb=,\thinspace t.= & & \writemode{\romannumeral 5}{,\thinspace t.}{} \\
-  \verb=7= & & {\scriptsize\verb=c\raise0.5ex\hbox{\small2}=} & \writemode{\romannumeral 7}{}{\thinspace c\raise0.5ex\hbox{\small2}} \\
-  \verb=8= & \verb=-t.= & \verb=G*= & \writemode{\romannumeral 8}{-t.}{\thinspace G*} \\
-  {\scriptsize\verb=t. irregularis=} & & & \writemode{t. irregularis}{}{} \\
+	\texttt{mode} & \texttt{mode-modifier} & \texttt{mode-differentia} & Result \\
+	\hline
+	\verb=6= & & & \writemode{\romannumeral 6}{}{} \\
+	\verb=4A= & & & \writemode{\romannumeral 4\relax A}{}{} \\
+	\verb=4a= & & & \writemode{\romannumeral 4\relax a}{}{} \\
+	\verb=2*= & \verb=t.= & & \writemode{\romannumeral 2*}{\thinspace t.}{} \\
+	\verb=5= & \verb=,\thinspace t.= & & \writemode{\romannumeral 5}{,\thinspace t.}{} \\
+	\verb=7= & & {\scriptsize\verb=c\raise0.5ex\hbox{\small2}=} & \writemode{\romannumeral 7}{}{\thinspace c\raise0.5ex\hbox{\small2}} \\
+	\verb=8= & \verb=-t.= & \verb=G*= & \writemode{\romannumeral 8}{-t.}{\thinspace G*} \\
+	{\scriptsize\verb=t. irregularis=} & & & \writemode{t. irregularis}{}{} \\
 \end{tabularx}
 
 \subsection{Neume Fusion}
@@ -169,16 +169,16 @@ Neume fusion allows for the composition of new shapes based on a set of
 primitive neumes.  These primitives are:
 
 \begin{tabularx}{\textwidth}{l|l|X}
-  Gabc & Description & Rules \\
-  \hline
-  \texttt{g} & punctum & fuses from higher or lower notes, and can fuse to higher or lower notes \\
-  \texttt{go} & oriscus & may only fuse in the direction it was fused from \\
-  \texttt{gO} & oriscus scapus & at the start only, next note must be higher to fuse \\
-  \texttt{gw} & quilisma & does not fuse from anything, and only fuses to a higher note \\
-  \texttt{gV} & virga reversa & at the start only, next note must be lower to fuse \\
-  \texttt{gf} & flexus & if not at the end, must be followed by a higher note to fuse \\
-  \texttt{gh} & pes & at the end only; in non-liquescent form, the previous note must be lower to fuse \\
-  \texttt{gfg} & porrectus & at the end only, previous note must be lower to fuse \\
+	Gabc & Description & Rules \\
+	\hline
+	\texttt{g} & punctum & fuses from higher or lower notes, and can fuse to higher or lower notes \\
+	\texttt{go} & oriscus & may only fuse in the direction it was fused from \\
+	\texttt{gO} & oriscus scapus & at the start only, next note must be higher to fuse \\
+	\texttt{gw} & quilisma & does not fuse from anything, and only fuses to a higher note \\
+	\texttt{gV} & virga reversa & at the start only, next note must be lower to fuse \\
+	\texttt{gf} & flexus & if not at the end, must be followed by a higher note to fuse \\
+	\texttt{gh} & pes & at the end only; in non-liquescent form, the previous note must be lower to fuse \\
+	\texttt{gfg} & porrectus & at the end only, previous note must be lower to fuse \\
 \end{tabularx}
 
 Placing the \texttt{@} character between two notes will attempt to use the above
@@ -300,13 +300,13 @@ defaults not be satisfactory.
 There are five tunable dimensions:
 
 \begin{tabularx}{\textwidth}{l|X}
-  Dimension & Description \\
-  \hline
-  \texttt{overhepisemalowshift} & The shift for positioning a horizontal episema that is over a note in a low position in the space\\
-  \texttt{overhepisemahighhift} & The shift for positioning a horizontal episema that is over a note in a high position in the space\\
-  \texttt{underhepisemalowshift} & The shift for positioning a horizontal episema that is under a note in a low position in the space\\
-  \texttt{underhepisemahighhift} & The shift for positioning a horizontal episema that is under a note in a high position in the space\\
-  \texttt{hepisemamiddleshift} & The shift for centering the horizontal episema in the middle of a space\\
+	Dimension & Description \\
+	\hline
+	\texttt{overhepisemalowshift} & The shift for positioning a horizontal episema that is over a note in a low position in the space\\
+	\texttt{overhepisemahighhift} & The shift for positioning a horizontal episema that is over a note in a high position in the space\\
+	\texttt{underhepisemalowshift} & The shift for positioning a horizontal episema that is under a note in a low position in the space\\
+	\texttt{underhepisemahighhift} & The shift for positioning a horizontal episema that is under a note in a high position in the space\\
+	\texttt{hepisemamiddleshift} & The shift for centering the horizontal episema in the middle of a space\\
 \end{tabularx}
 
 In addition, gabc allows you to adjust the positioning of a given episema by
@@ -319,16 +319,16 @@ The position specifier allows you to select which of the five tunable
 dimensions will be used for the base position:
 
 \begin{tabularx}{\textwidth}{l|X}
-  Specifier & Base shift \\
-  \hline
-  \textit{omitted} & Use the default shift based on the position of the episema relative to the note\\
-  \texttt{m} & Use \texttt{hepisemamiddleshift}.\\
-  \texttt{l} & Use \texttt{overhepisemalowshift} or \texttt{underhepisemalowshift} depending on whether the episema is over or under the note.\\
-  \texttt{h} & Use \texttt{overhepisemahighshift} or \texttt{underhepisemahighshift} depending on whether the episema is over or under the note.\\
-  \texttt{ol} & Use \texttt{overhepisemalowshift}.\\
-  \texttt{oh} & Use \texttt{overhepisemahighshift}.\\
-  \texttt{ul} & Use \texttt{underhepisemalowshift}.\\
-  \texttt{uh} & Use \texttt{underhepisemahighshift}.\\
+	Specifier & Base shift \\
+	\hline
+	\textit{omitted} & Use the default shift based on the position of the episema relative to the note\\
+	\texttt{m} & Use \texttt{hepisemamiddleshift}.\\
+	\texttt{l} & Use \texttt{overhepisemalowshift} or \texttt{underhepisemalowshift} depending on whether the episema is over or under the note.\\
+	\texttt{h} & Use \texttt{overhepisemahighshift} or \texttt{underhepisemahighshift} depending on whether the episema is over or under the note.\\
+	\texttt{ol} & Use \texttt{overhepisemalowshift}.\\
+	\texttt{oh} & Use \texttt{overhepisemahighshift}.\\
+	\texttt{ul} & Use \texttt{underhepisemalowshift}.\\
+	\texttt{uh} & Use \texttt{underhepisemahighshift}.\\
 \end{tabularx}
 
 The nudge is a \TeX{} dimension specification (number and units) that starts
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_1_1.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_1_1.pdf
deleted file mode 100644
index c5e48fec2aa..00000000000
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_1_1.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_2_0-beta1.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_2_0-beta1.pdf
new file mode 100644
index 00000000000..a23fc2db5a1
--- /dev/null
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef-4_2_0-beta1.pdf
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
index 744e0fbd08a..3e648537460 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
@@ -6,7 +6,6 @@
 \usepackage{fontspec}
 \usepackage{luacode}
 \usepackage{multicol}
-\usepackage{fixltx2e}
 \usepackage{hyperref}
 \usepackage{color}
 \usepackage[allowdeprecated=false]{gregoriotex}
@@ -22,25 +21,25 @@
 \huge{nabc language for gregorio}
 \end{center}
 
-    \vspace{1.5cm}
-    \begingroup%
-      \gredefbarredsymbol{Vbar}{V}{greVBar}{9.5}{0.05em}{0pt}%
-      \greannotation{\scriptsize{AL}}
-      \greannotation{\scriptsize{II}}
-      \color{black!60}
-      \setmainfont[SmallCapsFont=AlegreyaSC]{Alegreya}%
-      \addtolength{\hsize}{-4cm}%
-      \setlength{\fboxsep}{5mm}%
-      \begin{list}{}{%
-        \setlength{\topsep}{0pt}%
-        \setlength{\leftmargin}{1.5cm}%
-        \setlength{\rightmargin}{1.5cm}%
-        \setlength{\listparindent}{0pt}%
-        \setlength{\itemindent}{0pt}%
-        \setlength{\parsep}{0pt}%
-      }\item[]{\fbox{\parbox{\hsize}{\gregorioscore[f]{veni}}}}%
-      \end{list}%
-    \endgroup%
+		\vspace{1.5cm}
+		\begingroup%
+			\gredefbarredsymbol{Vbar}{V}{greVBar}{9.5}{0.05em}{0pt}%
+			\greannotation{\scriptsize{AL}}
+			\greannotation{\scriptsize{II}}
+			\color{black!60}
+			\setmainfont[SmallCapsFont=AlegreyaSC]{Alegreya}%
+			\addtolength{\hsize}{-4cm}%
+			\setlength{\fboxsep}{5mm}%
+			\begin{list}{}{%
+				\setlength{\topsep}{0pt}%
+				\setlength{\leftmargin}{1.5cm}%
+				\setlength{\rightmargin}{1.5cm}%
+				\setlength{\listparindent}{0pt}%
+				\setlength{\itemindent}{0pt}%
+				\setlength{\parsep}{0pt}%
+			}\item[]{\fbox{\parbox{\hsize}{\gregorioscore[f]{veni}}}}%
+			\end{list}%
+		\endgroup%
 
 \vfill
 \pagebreak
@@ -49,43 +48,43 @@
 \gresetnabcfont{gregall}{8}
 
 \def\neume{%
-  \begingroup %
-    \catcode`\~=12{}%
-    \catcode`\@=11{}%
-    \neumebody%
+	\begingroup %
+		\catcode`\~=12{}%
+		\catcode`\@=11{}%
+		\neumebody%
 }
 
 \def\neumebody#1{%
-    \vbox{\hbox{\vspace{1mm}}\hbox{\noindent\GreNABCChar{#1}\hspace{1mm}}%
-    \hbox{\vspace{1mm}}\hbox{\noindent{\fontsize{6}{6}\texttt{#1}\hspace{1mm}}}}%
-  \endgroup %
+		\vbox{\hbox{\vspace{1mm}}\hbox{\noindent\GreNABCChar{#1}\hspace{1mm}}%
+		\hbox{\vspace{1mm}}\hbox{\noindent{\fontsize{6}{6}\texttt{#1}\hspace{1mm}}}}%
+	\endgroup %
 }
 
 \def\neumer{%
-  \begingroup %
-    \catcode`\~=12{}%
-    \catcode`\@=11{}%
-    \neumerbody%
+	\begingroup %
+		\catcode`\~=12{}%
+		\catcode`\@=11{}%
+		\neumerbody%
 }
 
 \def\neumerbody#1{%
-    \vbox{\hbox{\vspace{1mm}}\hbox{\noindent\hspace{8mm}\GreNABCChar{#1}\hspace{1mm}}%
-    \hbox{\vspace{1mm}}\hbox{\noindent{\fontsize{6}{6}\texttt{#1}\hspace{1mm}}}}%
-  \endgroup %
+		\vbox{\hbox{\vspace{1mm}}\hbox{\noindent\hspace{8mm}\GreNABCChar{#1}\hspace{1mm}}%
+		\hbox{\vspace{1mm}}\hbox{\noindent{\fontsize{6}{6}\texttt{#1}\hspace{1mm}}}}%
+	\endgroup %
 }
 
 \def\sneume{%
-  \begingroup %
-    \catcode`\~=12{}%
-    \catcode`\@=11{}%
-    \sneumebody%
+	\begingroup %
+		\catcode`\~=12{}%
+		\catcode`\@=11{}%
+		\sneumebody%
 }
 
 \def\sneumebody#1{%
-    \font\grefontnabc={name:gregall} at 6pt\grefontnabc\begin{gre@style@nabc}%
-    \directlua{tex.sprint(gregoriotex.nabc_font_tables["gregall"]["\luatexluaescapestring{#1}"] or "")}%
-    \end{gre@style@nabc}%
-  \endgroup %
+		\font\grefontnabc={name:gregall} at 6pt\grefontnabc\begin{gre@style@nabc}%
+		\directlua{tex.sprint(gregoriotex.nabc_font_tables["gregall"]["\luatexluaescapestring{#1}"] or "")}%
+		\end{gre@style@nabc}%
+	\endgroup %
 }
 
 {
@@ -132,10 +131,10 @@ The \textit{horizontal spacing adjustment descriptor}
 consists of a sequence of horizontal spacing adjustment characters
 \texttt{/} and \texttt{`}.
 \begin{itemize}
-  \item \texttt{//} move by \texttt{nabclargerspace} skip to the right
-  \item \texttt{/} move by \texttt{nabcinterelementspace} skip to the right
-  \item \texttt{``} move by \texttt{nabclargerspace} skip to the left
-  \item \texttt{`} move by \texttt{nabcinterelementspace} skip to the left
+	\item \texttt{//} move by \texttt{nabclargerspace} skip to the right
+	\item \texttt{/} move by \texttt{nabcinterelementspace} skip to the right
+	\item \texttt{``} move by \texttt{nabclargerspace} skip to the left
+	\item \texttt{`} move by \texttt{nabcinterelementspace} skip to the left
 \end{itemize}
 
 The \textit{complex glyph descriptor} consists of a \textit{glyph descriptor},
@@ -183,12 +182,12 @@ following table:
 The \texttt{glyph modifiers} is a possibly empty sequence of following
 characters optionally followed by a number:
 \begin{itemize}
-  \item \texttt{S} modification of the mark
-  \item \texttt{G} modification of the grouping (neumatic break)
-  \item \texttt{M} melodic modification
-  \item \texttt{-} addition of episema
-  \item \texttt{>} augmentive liquescence
-  \item ~~\texttt{\~} diminutive liquescence
+	\item \texttt{S} modification of the mark
+	\item \texttt{G} modification of the grouping (neumatic break)
+	\item \texttt{M} melodic modification
+	\item \texttt{-} addition of episema
+	\item \texttt{>} augmentive liquescence
+	\item ~~\texttt{\~} diminutive liquescence
 \end{itemize}
 If Dom Cardine's table contains multiple glyphs with the same modifiers,
 a positive number is added afterwards.  E.g.\ for augmentive liquescent
@@ -215,12 +214,12 @@ optionally by a modifier letter from the following table and finally a mandatory
 positive number of repetitions.  If the modifier letter is missing, it is a
 punctum.
 \begin{itemize}
-  \item \texttt{t} \sneume{ta} tractulus
-  \item \texttt{u} \sneume{ta-} tractulus with episema
-  \item \texttt{v} \sneume{suv1} tractulus with double episema
-  \item \texttt{w} \sneume{gr} gravis
-  \item \texttt{x} \sneume{st>} liquescens stropha
-  \item \texttt{y} \sneume{gr-} gravis with episema
+	\item \texttt{t} \sneume{ta} tractulus
+	\item \texttt{u} \sneume{ta-} tractulus with episema
+	\item \texttt{v} \sneume{suv1} tractulus with double episema
+	\item \texttt{w} \sneume{gr} gravis
+	\item \texttt{x} \sneume{st>} liquescens stropha
+	\item \texttt{y} \sneume{gr-} gravis with episema
 \end{itemize}
 Only subpunctis are normally used in neume classification, the prepunctis is
 a \texttt{nabc} concept to describe the rising sequence of punctis, tractulis
@@ -390,40 +389,40 @@ Table with nabc strings and corresponding gregall and gresgmodern glyphs:
 \end{center}
 
 \begin{luacode*}
-  local i
-  local last
-  local key
-  local str
-  local keym
-  local arr = {}
-  for key in pairs(gregoriotex.nabc_font_tables['gregall']) do
-    table.insert(arr, key)
-  end
-  for key in pairs(gregoriotex.nabc_font_tables['gresgmodern']) do
-    table.insert(arr, key)
-  end
-  table.sort(arr)
-  tex.sprint("\\begin{multicols}{3}\\noindent");
-  for i, key in ipairs(arr) do
-    if last ~= key then
-      last = key
-      keym = key:gsub("~","\\~{}")
-      str = keym .. "\\hfill"
-      if gregoriotex.nabc_font_tables['gregall'][key] then
-        str = str .. "{\\font\\grefontnabc={name:gregall} at 8pt\\grefontnabc\\begin{gre@style@nabc}" .. gregoriotex.nabc_font_tables['gregall'][key] .. "\\end{gre@style@nabc}}"
-      else
-        str = str .. "{\\color{blue}missing}"
-      end
-      str = str .. "\\hfill"
-      if gregoriotex.nabc_font_tables['gresgmodern'][key] then
-        str = str .. "{\\font\\grefontnabc={name:gresgmodern} at 8pt\\grefontnabc\\begin{gre@style@nabc}" .. gregoriotex.nabc_font_tables['gresgmodern'][key] .. "\\end{gre@style@nabc}}"
-      else
-        str = str .. "{\\color{blue}missing}"
-      end
-      tex.sprint(str .. "\\\\")
-    end
-  end
-  tex.sprint("\\end{multicols}")
+	local i
+	local last
+	local key
+	local str
+	local keym
+	local arr = {}
+	for key in pairs(gregoriotex.nabc_font_tables['gregall']) do
+		table.insert(arr, key)
+	end
+	for key in pairs(gregoriotex.nabc_font_tables['gresgmodern']) do
+		table.insert(arr, key)
+	end
+	table.sort(arr)
+	tex.sprint("\\begin{multicols}{3}\\noindent");
+	for i, key in ipairs(arr) do
+		if last ~= key then
+			last = key
+			keym = key:gsub("~","\\~{}")
+			str = keym .. "\\hfill"
+			if gregoriotex.nabc_font_tables['gregall'][key] then
+				str = str .. "{\\font\\grefontnabc={name:gregall} at 8pt\\grefontnabc\\begin{gre@style@nabc}" .. gregoriotex.nabc_font_tables['gregall'][key] .. "\\end{gre@style@nabc}}"
+			else
+				str = str .. "{\\color{blue}missing}"
+			end
+			str = str .. "\\hfill"
+			if gregoriotex.nabc_font_tables['gresgmodern'][key] then
+				str = str .. "{\\font\\grefontnabc={name:gresgmodern} at 8pt\\grefontnabc\\begin{gre@style@nabc}" .. gregoriotex.nabc_font_tables['gresgmodern'][key] .. "\\end{gre@style@nabc}}"
+			else
+				str = str .. "{\\color{blue}missing}"
+			end
+			tex.sprint(str .. "\\\\")
+		end
+	end
+	tex.sprint("\\end{multicols}")
 \end{luacode*}
 
 \vfill
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_1_1.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_1_1.pdf
deleted file mode 100644
index 87cf517e6c6..00000000000
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_1_1.pdf
+++ /dev/null
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_2_0-beta1.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_2_0-beta1.pdf
new file mode 100644
index 00000000000..90cf661bbcd
--- /dev/null
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef-4_2_0-beta1.pdf
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
index a846f99a79d..3f6e7e88099 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
@@ -27,6 +27,8 @@ local EXCLUDE = {
   ['.notdef'] = true,
   ['.null'] = true,
   nonmarkingreturn = true,
+  AscendensOriscusLineBLTR = true,
+  AscendensOriscusLineTR = true,
   PunctumAuctusLineBL = true,
   PunctumLineBLBR = true,
   PunctumLineBR = true,
@@ -34,7 +36,8 @@ local EXCLUDE = {
   PunctumSmall = true,
   FlexusLineBL = true,
   FlexusAmOneLineBL = true,
-  OriscusLineTR = true,
+  DescendensOriscusLineTR = true,
+  DescendensOriscusLineBLTR = true,
   QuilismaLineTR = true,
   VirgaLineBR = true,
   SalicusOriscus = true,
@@ -58,6 +61,14 @@ local GABC = {
   AccentusReversus = [[\excluded{g}r2]],
   Ancus = [[gec]],
   AncusLongqueue = [[hfd]],
+  AscendensOriscusCavum = [[go1r]],
+  AscendensOriscusCavumHole = [[\excluded{gor}]],
+  AscendensOriscus = [[go1]],
+  AscendensOriscusLineBL = [[\excluded{e}@go1]],
+  AscendensOriscusLineTL = [[\excluded{i}@go1]],
+  AscendensOriscusScapus = [[gO1]],
+  AscendensOriscusScapusLongqueue = [[hO1]],
+  AscendensOriscusScapusOpenqueue = [[aO1]],
   AuctumMora = [[\excluded{g}.]],
   BarBrace = [[\excluded{,}\_]],
   CClef = [[c3]],
@@ -70,84 +81,84 @@ local GABC = {
   CustosUpLong = [[f+]],
   CustosUpMedium = [[a+]],
   CustosUpShort = [[g+]],
+  DescendensOriscusCavum = [[go0r]],
+  DescendensOriscusCavumHole = [[\excluded{go0r}]],
+  DescendensOriscus = [[go0]],
+  DescendensOriscusLineBL = [[\excluded{e}@go0]],
+  DescendensOriscusLineTL = [[\excluded{i}@go0]],
+  DescendensOriscusScapus = [[gO0]],
+  DescendensOriscusScapusLongqueue = [[hO0]],
+  DescendensOriscusScapusOpenqueue = [[aO0]],
   DivisioDominican = [[,3]],
   DivisioDominicanAlt = [[,4]],
   DivisioMaior = [[:]],
   DivisioMinima = [[,]],
   DivisioMinor = [[;]],
-  FClef = [[f3]],
   FClefChange = [[f3]],
+  FClef = [[f3]],
   Flat = [[gx]],
   FlatHole = [[\excluded{gx}]],
   Flexus = [[ge]],
   FlexusLongqueue = [[hf]],
   FlexusNobar = [[@hf]],
   FlexusOriscus = [[goe]],
+  FlexusOriscusInusitatus = [[go1e]],
   FlexusOriscusScapus = [[gOe]],
+  FlexusOriscusScapusInusitatus = [[gO1e]],
+  FlexusOriscusScapusInusitatusLongqueue = [[hO1f]],
   FlexusOriscusScapusLongqueue = [[hOf]],
   LeadingOriscus = [[go\excluded{igig}]],
   LeadingPunctum = [[g\excluded{igig}]],
   LeadingQuilisma = [[gw\excluded{igig}]],
   Linea = [[g=]],
-  LineaPunctum = [[gR]],
   LineaPunctumCavum = [[gr0]],
   LineaPunctumCavumHole = [[\excluded{gr0}]],
+  LineaPunctum = [[gR]],
   Natural = [[gy]],
   NaturalHole = [[\excluded{gy}]],
-  Oriscus = [[go1]],
-  OriscusCavum = [[go1r]],
-  OriscusCavumDeminutus = [[gor\~{}]],
+  Oriscus = [[go]], -- for Deminutus
+  OriscusCavum = [[gor]], -- for Deminutus
   OriscusCavumDeminutusHole = [[\excluded{gor\~{}}]],
-  OriscusCavumHole = [[\excluded{gor}]],
-  OriscusCavumReversus = [[go0r]],
-  OriscusCavumReversusHole = [[\excluded{go0r}]],
-  OriscusLineBL = [[\excluded{e}@go]],
-  OriscusReversus = [[go0]],
-  OriscusReversusLineTL = [[\excluded{i}@go]],
-  OriscusScapus = [[gO1]],
-  OriscusScapusLongqueue = [[hO1]],
-  OriscusScapusOpenqueue = [[aO1]],
-  OriscusScapusReversus = [[gO0]],
-  OriscusScapusReversusLongqueue = [[hO0]],
-  OriscusScapusReversusOpenqueue = [[aO0]],
   Pes = [[gi]],
   PesQuadratum = [[gqi]],
   PesQuadratumLongqueue = [[hqj]],
   PesQuassus = [[goi]],
+  PesQuassusInusitatus = [[go0i]],
+  PesQuassusInusitatusLongqueue = [[ho0j]],
   PesQuassusLongqueue = [[hoj]],
   PesQuilisma = [[gwi]],
   PesQuilismaQuadratum = [[gWi]],
   PesQuilismaQuadratumLongqueue = [[hWj]],
-  Porrectus = [[geg]],
   PorrectusFlexus = [[gege]],
   PorrectusFlexusNobar = [[\excluded{e}gege]],
+  Porrectus = [[geg]],
   PorrectusLongqueue = [[hfh]],
   PorrectusNobar = [[@geg]],
-  Punctum = [[g]],
   PunctumCavum = [[gr]],
   PunctumCavumHole = [[\excluded{gr}]],
-  PunctumCavumInclinatum = [[Gr]],
   PunctumCavumInclinatumAuctus = [[Gr>]],
   PunctumCavumInclinatumAuctusHole = [[\excluded{Gr>}]],
+  PunctumCavumInclinatum = [[Gr]],
   PunctumCavumInclinatumHole = [[\excluded{Gr}]],
-  PunctumInclinatum = [[G]],
+  Punctum = [[g]],
   PunctumInclinatumAuctus = [[G>]],
+  PunctumInclinatum = [[G]],
   PunctumLineBL = [[\excluded{e}@g]],
   PunctumLineTL = [[\excluded{i}@g]],
   Quilisma = [[gw]],
-  RoundBrace = '[ob:1;6mm]',
   RoundBraceDown = '[ub:1;6mm]',
-  Salicus = [[giOk]],
+  RoundBrace = '[ob:1;6mm]',
   SalicusFlexus = [[giOki]],
+  Salicus = [[giOk]],
   SalicusLongqueue = [[hjOl]],
   Scandicus = [[gik]],
   Semicirculus = [[\excluded{g}r4]],
   SemicirculusReversus = [[\excluded{g}r5]],
   Sharp = [[g\#{}]],
   SharpHole = [[\excluded{g\#{}}]],
-  Stropha = [[gs]],
   StrophaAucta = [[gs>]],
   StrophaAuctaLongtail = [[hs>]],
+  Stropha = [[gs]],
   Torculus = [[gig]],
   TorculusLiquescens = [[gige]],
   TorculusLiquescensQuilisma = [[gwige]],
@@ -179,41 +190,60 @@ local GABC_AMBITUS_ONE = {
 local GABC_FUSE = {
   Upper = {
     Punctum = [[\excluded{e}@]],
-    Oriscus = [[\excluded{e}@]],
+    AscendensOriscus = [[\excluded{e}@]],
+    DescendensOriscus = [[\excluded{e}@]],
     Pes = [[\excluded{e}@]],
     PesQuadratum = [[\excluded{e}@]],
     PesQuadratumLongqueue = [[\excluded{f}@]],
     PesQuadratumOpenqueue = { [[\excluded{a}@]], [[bq[ll:0]c]] },
     PesQuassus = [[\excluded{e}@]],
+    PesQuassusInusitatus = [[\excluded{e}@]],
+    PesQuassusInusitatusLongqueue = [[\excluded{f}@]],
+    PesQuassusInusitatusOpenqueue = { [[\excluded{a}@]], [[bo0[ll:0]c]] },
     PesQuassusLongqueue = [[\excluded{f}@]],
     PesQuassusOpenqueue = { [[\excluded{a}@]], [[bo[ll:0]c]] },
     Flexus = [[\excluded{e}@]],
+    FlexusOriscus = [[\excluded{e}@]],
+    FlexusOriscusInusitatus = [[\excluded{e}@]],
   },
   Lower = {
     Punctum = [[\excluded{i}@]],
-    Oriscus = [[\excluded{i}@]],
+    AscendensOriscus = [[\excluded{i}@]],
+    DescendensOriscus = [[\excluded{i}@]],
     Pes = [[\excluded{i}@]],
     PesQuadratum = [[\excluded{i}@]],
     PesQuadratumLongqueue = [[\excluded{j}@]],
     PesQuadratumOpenqueue = [[\excluded{b}@]],
     PesQuassus = [[\excluded{i}@]],
+    PesQuassusInusitatus = [[\excluded{i}@]],
+    PesQuassusInusitatusLongqueue = [[\excluded{j}@]],
+    PesQuassusInusitatusOpenqueue = [[\excluded{b}@]],
+    PesQuassusLongqueue = [[\excluded{j}@]],
+    PesQuassusOpenqueue = [[\excluded{b}@]],
     Flexus = [[\excluded{i}@]],
     FlexusOriscus = [[\excluded{i}@]],
+    FlexusOriscusInusitatus = [[\excluded{i}@]],
   },
   Up = {
     Punctum = [[\excluded{@ij}]],
-    Oriscus = [[\excluded{@ij}]],
-    OriscusScapus = [[\excluded{@ij}]],
-    OriscusScapusLongqueue = [[\excluded{@jk}]],
+    AscendensOriscus = [[\excluded{@ij}]],
+    AscendensOriscusScapus = [[\excluded{@ij}]],
+    AscendensOriscusScapusLongqueue = [[\excluded{@jk}]],
+    DescendensOriscus = [[\excluded{@ij}]],
+    DescendensOriscusScapus = [[\excluded{@ij}]],
+    DescendensOriscusScapusLongqueue = [[\excluded{@jk}]],
     Quilisma = [[\excluded{@ij}]],
     Flexus = [[\excluded{@gi}]],
     FlexusNobar = [[\excluded{@hj}]],
   },
   Down = {
     Punctum = [[\excluded{@eg}]],
-    Oriscus = [[\excluded{@eg}]],
-    OriscusScapus = [[\excluded{@eg}]],
-    OriscusScapusLongqueue = [[\excluded{@eg}]],
+    AscendensOriscus = [[\excluded{@eg}]],
+    AscendensOriscusScapus = [[\excluded{@eg}]],
+    AscendensOriscusScapusLongqueue = [[\excluded{@eg}]],
+    DescendensOriscus = [[\excluded{@eg}]],
+    DescendensOriscusScapus = [[\excluded{@eg}]],
+    DescendensOriscusScapusLongqueue = [[\excluded{@eg}]],
     VirgaReversa = [[\excluded{@eg}]],
     VirgaReversaLongqueue = [[\excluded{@fg}]],
   },
@@ -234,11 +264,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 +294,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 +337,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 +349,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
@@ -336,8 +366,8 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_parmesan)
   local post_word_liquescentia = P'Nothing' + P'Deminutus' + P'Ascendens' +
       P'Descendens'
   local liquescentia = post_word_liquescentia + P'Up' + P'Down'
-  local word = (majuscule * minuscule^0) - fusion - ambitus - debilis -
-      post_word_liquescentia
+  local word = ((majuscule * minuscule^0) - fusion - ambitus - debilis -
+      post_word_liquescentia) + ((P'Ascendens' + P'Descendens') * P'Oriscus')
   local liquescence = debilis^-1 * liquescentia^-1
   local pattern = C(fusion^-1) * C(word^1) * C(ambitus^0) * C(debilis^-1) *
       C(liquescentia^-1) * -1
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
index 5253fd8c896..406769c2064 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
@@ -4,26 +4,26 @@
 \usepackage{fontspec}
 \defaultfontfeatures{Ligatures=TeX}
 \setmainfont[
-    BoldFont=LinLibertineOZ,
-    BoldItalicFont=LinLibertineOZI,
-    SmallCapsFont=LinLibertineO,
-    SmallCapsFeatures={Letters=SmallCaps},
+		BoldFont=LinLibertineOZ,
+		BoldItalicFont=LinLibertineOZI,
+		SmallCapsFont=LinLibertineO,
+		SmallCapsFeatures={Letters=SmallCaps},
 ]{LinuxLibertineO}
 \setsansfont[Extension=.otf,
-    BoldFont=LinBiolinum_RB,
-    ItalicFont=LinBiolinum_RI,
-    BoldItalicFont=LinBiolinum_RB,% fake
-    SmallCapsFont=LinBiolinum_R,
-    SmallCapsFeatures={Letters=SmallCaps},
-    ]{LinBiolinum_R}
+		BoldFont=LinBiolinum_RB,
+		ItalicFont=LinBiolinum_RI,
+		BoldItalicFont=LinBiolinum_RB,% fake
+		SmallCapsFont=LinBiolinum_R,
+		SmallCapsFeatures={Letters=SmallCaps},
+		]{LinBiolinum_R}
 \setmonofont[Extension=.otf,
-    ItalicFont=Inconsolatazi4-Regular,
-    BoldFont=Inconsolatazi4-Bold,
-    BoldItalicFont=Inconsolatazi4-Bold,
-    AutoFakeSlant,
-    ItalicFeatures={FakeSlant},
-    BoldItalicFeatures={FakeSlant}
-    ]{Inconsolatazi4-Regular}
+		ItalicFont=Inconsolatazi4-Regular,
+		BoldFont=Inconsolatazi4-Bold,
+		BoldItalicFont=Inconsolatazi4-Bold,
+		AutoFakeSlant,
+		ItalicFeatures={FakeSlant},
+		BoldItalicFeatures={FakeSlant}
+		]{Inconsolatazi4-Regular}
 \usepackage{enumitem}
 \usepackage{xspace}
 \usepackage{multicol}
@@ -46,9 +46,9 @@
 \usepackage{minted} % must be after xcolor
 \makeatletter
 \@ifpackagelater{minted}{2013/12/21}{%
-  \newminted{latex}{autogobble,bgcolor=lightgray}%
+	\newminted{latex}{autogobble,bgcolor=lightgray}%
 }{%
-  \newminted{latex}{gobble=2,bgcolor=lightgray}%
+	\newminted{latex}{gobble=2,bgcolor=lightgray}%
 }%
 \makeatother
 %\newminted{gabc}{bgcolor=lightgray} % can this be done?
@@ -83,59 +83,68 @@
 \def\subsubsection{\filbreak\breakablefalse\oldsubsubsection}
 
 \newcommand{\macroname}[3]{%
-  \vspace{3.25ex plus 1ex minus .2ex}%
-  \ifbreakable%
-    \filbreak%
-  \else%
-    \breakabletrue%
-  \fi%
-  \makebox[\linewidth]{\ttfamily\bfseries #1#2%
-  \hspace{\fill}\normalfont\itshape #3}%
-  \vspace{1.5ex plus .2ex}%
-  \index{#1}}
-  %\addcontentsline{toc}{subsubsection}{#1}}
+	\vspace{3.25ex plus 1ex minus .2ex}%
+	\ifbreakable%
+		\filbreak%
+	\else%
+		\global\breakabletrue%
+	\fi%
+	\makebox[\linewidth]{\ttfamily\bfseries #1#2%
+	\hspace{\fill}\normalfont\itshape #3}%
+	\vspace{1.5ex plus .2ex}%
+	\index{#1}}
+	%\addcontentsline{toc}{subsubsection}{#1}}
 
 \newcommand{\optional}[1]{{\itshape #1}}
 
 \lstset{backgroundcolor=\color{lightgray},
-        basicstyle=\small\ttfamily,
-        numbers=left,
-        numberstyle=\footnotesize,
-        stepnumber=1,
-        numbersep=5pt}
+				basicstyle=\small\ttfamily,
+				numbers=left,
+				numberstyle=\footnotesize,
+				stepnumber=1,
+				numbersep=5pt}
 
 % 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}}
 
 \newenvironment{argtable}{%
-  \bigskip\rowcolors{1}{lightgray}{lightgray}
-  \tabularx{\textwidth}{clX}
-    Arg & Value & Description \\
-    \hline}%
-  {\endtabularx\bigskip}
+	\bigskip\rowcolors{1}{lightgray}{lightgray}
+	\tabularx{\textwidth}{clX}
+		Arg & Value & Description \\
+		\hline}%
+	{\endtabularx\bigskip}
 
 \makeatletter%
 \NewDocumentEnvironment{gdimension}{m}{\macroname{#1}{}{gsp-default.tex}}{%
 
-  \gre@rubberpermit{#1}%
-  \ifgre@rubber%
-    Default: \directlua{GregorioRef.emit_dimension("\luaescapestring{\csname gre@space@skip@#1\endcsname}")}
-  \else%
-    Default: \directlua{GregorioRef.emit_dimension("\luaescapestring{\csname gre@space@dimen@#1\endcsname}")}
-  \fi%
+	\gre@rubberpermit{#1}%
+	\ifgre@rubber%
+		Default: \directlua{GregorioRef.emit_dimension("\luaescapestring{\csname gre@space@skip@#1\endcsname}")}
+	\else%
+		Default: \directlua{GregorioRef.emit_dimension("\luaescapestring{\csname gre@space@dimen@#1\endcsname}")}
+	\fi%
+}
+
+\NewDocumentEnvironment{gcount}{m}{\macroname{#1}{}{gsp-default.tex}}{%
+
+	Default: \expandafter$\expandafter\the\csname gre@space@count@#1\endcsname$
 }
 
 \newcommand{\writemode}[3]{%
-  \gre@style@modeline #1\endgre@style@modeline %
-  \gre@style@modemodifier #2\endgre@style@modemodifier %
-  \gre@style@modedifferentia #3\endgre@style@modedifferentia %
+	\gre@style@modeline #1\endgre@style@modeline %
+	\gre@style@modemodifier #2\endgre@style@modemodifier %
+	\gre@style@modedifferentia #3\endgre@style@modedifferentia %
+}
+
+\newcommand{\getgrecount}[1]{%
+	\the\csname gre@count@#1\endcsname%
 }
 \makeatother
 
@@ -144,42 +153,42 @@
 \begin{document}
 
 \begin{titlepage}
-  \begin{center}
-    \Huge
-    \textcolor{myred}{Gregorio} and \textcolor{myred}{Gregorio\TeX}:
-
-    Tools for gregorian score engraving.
-
-    \vspace{1cm}
-
-    \large Version \textbf{4.1.1}, 10 March 2016 %% PARSE_VERSION_DATE
-
-    \vspace{1.5cm}
-  \end{center}
-  \gresetlinecolor{gregoriocolor}
-  \grechangestyle{lowchoralsign}{\cminfamily\small}%
-  \grechangestyle{highchoralsign}{\cminfamily\small}%
-  \def\GreStar{\greheightstar}%
-  \greannotation{\scriptsize Comm.}%
-  \greannotation{\scriptsize VII}%
-  \begingroup%
-    \color{black!60}%
-    \setmainfont[SmallCapsFont=AlegreyaSC]{Alegreya}%
-    \newlength{\mini}%
-    \setlength{\mini}{\hsize}%
-    \addtolength{\mini}{-4cm}%
-    \setlength{\fboxsep}{5mm}%
-    \hfill\fbox{\parbox{\mini}{\gregorioscore[f]{factus}}}\hfill%
-  \endgroup
-  \begin{center}
-    \vspace{1.5cm}%
-    \href{http://gregorio-project.github.io/}{Homepage}
-
-    Source code available on
-    \href{http://github.com/gregorio-project/gregorio}{GitHub}.
-  \end{center}
-
-  \vspace{2cm}
+	\begin{center}
+		\Huge
+		\textcolor{myred}{Gregorio} and \textcolor{myred}{Gregorio\TeX}:
+
+		Tools for gregorian score engraving.
+
+		\vspace{1cm}
+
+		\large Version \textbf{4.2.0-beta1}, 27 April 2016 %% PARSE_VERSION_DATE
+
+		\vspace{1.5cm}
+	\end{center}
+	\gresetlinecolor{gregoriocolor}
+	\grechangestyle{lowchoralsign}{\cminfamily\small}%
+	\grechangestyle{highchoralsign}{\cminfamily\small}%
+	\def\GreStar{\greheightstar}%
+	\greannotation{\scriptsize Comm.}%
+	\greannotation{\scriptsize VII}%
+	\begingroup%
+		\color{black!60}%
+		\setmainfont[SmallCapsFont=AlegreyaSC]{Alegreya}%
+		\newlength{\mini}%
+		\setlength{\mini}{\hsize}%
+		\addtolength{\mini}{-4cm}%
+		\setlength{\fboxsep}{5mm}%
+		\hfill\fbox{\parbox{\mini}{\gregorioscore[f]{factus}}}\hfill%
+	\endgroup
+	\begin{center}
+		\vspace{1.5cm}%
+		\href{http://gregorio-project.github.io/}{Homepage}
+
+		Source code available on
+		\href{http://github.com/gregorio-project/gregorio}{GitHub}.
+	\end{center}
+
+	\vspace{2cm}
 \end{titlepage}
 
 \cleardoublepage
@@ -196,8 +205,8 @@ The following sections document the macros available in the Gregorio\TeX{} packa
 Description of macro.
 
 \begin{argtable}
-  Arg \# & Data type & Description of argument\\
-  Arg \# & \texttt{keyword} & Description of the setting the keyword corresponds to
+	Arg \# & Data type & Description of argument\\
+	Arg \# & \texttt{keyword} & Description of the setting the keyword corresponds to
 \end{argtable}
 
 The source file where the macro is defined is included for developers
@@ -220,12 +229,12 @@ Macros are divided into three groups:
 \include{Gabc}
 
 \begin{appendices}
-  %Turn off the \filbreak stuff to prevent it from messing up the long tables in the appendicies
-  \let\subsection\oldsubsection
-  \let\subsubsection\oldsubsubsection
-  \renewcommand\thetable{\thesection\arabic{table}}
-  \renewcommand\thefigure{\thesection\arabic{figure}}
-  \include{Appendix_Font_Tables}
+	%Turn off the \filbreak stuff to prevent it from messing up the long tables in the appendicies
+	\let\subsection\oldsubsection
+	\let\subsubsection\oldsubsubsection
+	\renewcommand\thetable{\thesection\arabic{table}}
+	\renewcommand\thefigure{\thesection\arabic{figure}}
+	\include{Appendix_Font_Tables}
 \end{appendices}
 
 \addcontentsline{toc}{section}{Index}