gregoriotex (17apr17)

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

11 files changed, 2357 insertions, 466 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 7c5cd65747a..843cbefcb6f 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Appendix_Font_Tables.tex
@@ -1,7 +1,7 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -24,60 +24,66 @@
 
 \subsection{Score Font Glyphs}
 
-The following table lists all of the score glyphs available in the greciliae,
-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
-component notes.  These are listed with English words for the numbers in
-italics, such as {\itshape TwoTwo}.  The gabc column lists a gabc sequence that
-uses the given glyph.  If there are small, slanted characters, such as
-\excluded{gege} in this column, they produce glyphs additional to the given
-glyph, but are necessary for the given glyph to appear.  Note: glyphs for the
-horizontal episema (activated using {\ttfamily\char`_} in gabc) are excluded from
-this table.
+The following table lists all of the score glyphs available in the greciliae
+font and any variant glyphs contained within.  Some of the glyphs listed are
+representative of sets of glyphs differentiated by the ambitus of the component
+notes.  These are listed with English words for the numbers in italics, such as
+{\itshape TwoTwo}.  The gabc column lists a gabc sequence that uses the given
+glyph.  If there are small, slanted characters, such as \excluded{gege} in this
+column, they produce glyphs additional to the given glyph, but are necessary
+for the given glyph to appear.  Note: glyphs for the horizontal episema
+(activated using {\ttfamily\char`_} in gabc) are excluded from this table.
 
 \newcommand\ScoreFontTable[1]{%
-	\begin{longtable}{llccccccc}
+	\begin{longtable}{llc|cc|lc|cc}
 			\caption{Score Glyphs}\\
-			&&&&&\multicolumn{4}{c}{\bfseries Variants}\\
-			\hhline{>{\arrayrulecolor{lightgray}}----->{\arrayrulecolor{black}}----}
+			&
+			&%
+			&%
+			\multicolumn{2}{c|}{\bfseries Variants}&
+			\multicolumn{2}{c|}{\bfseries Cavum}&
+			\multicolumn{2}{c}{\bfseries Cavum Variants}\\
+			\hhline{>{\arrayrulecolor{lightgray}}--->{\arrayrulecolor{black}}------}
 			{\bfseries Glyph Name}&%
 			{\scriptsize\bfseries Sample gabc}&%
-			{\scriptsize\bfseries greciliae}&%
-			{\scriptsize\bfseries gregorio}&%
-			{\scriptsize\bfseries granapadano}&%
+			{\scriptsize\bfseries Glyph}&%
 			{\scriptsize\bfseries Name}&%
-			{\scriptsize\bfseries greciliae}&%
-			{\scriptsize\bfseries gregorio}&%
-			{\scriptsize\bfseries granapadano}\\
+			{\scriptsize\bfseries Glyph}&%
+			{\scriptsize\bfseries Sample gabc}&%
+			{\scriptsize\bfseries Glyph}&%
+			{\scriptsize\bfseries Name}&%
+			{\scriptsize\bfseries Glyph}\\
 			\hline
 		\endfirsthead
-			&&&&&\multicolumn{4}{c}{\bfseries Variants}\\
-			\hhline{>{\arrayrulecolor{lightgray}}----->{\arrayrulecolor{black}}----}
+			&%
+			&%
+			&%
+			\multicolumn{2}{c|}{\bfseries Variants}&
+			\multicolumn{2}{c|}{\bfseries Cavum}&
+			\multicolumn{2}{c}{\bfseries Cavum Variants}\\
+			\hhline{>{\arrayrulecolor{lightgray}}--->{\arrayrulecolor{black}}------}
 			{\bfseries Glyph Name}&%
 			{\scriptsize\bfseries Sample gabc}&%
-			{\scriptsize\bfseries greciliae}&%
-			{\scriptsize\bfseries gregorio}&%
-			{\scriptsize\bfseries granapadano}&%
+			{\scriptsize\bfseries Glyph}&%
+			{\scriptsize\bfseries Name}&%
+			{\scriptsize\bfseries Glyph}&%
+			{\scriptsize\bfseries Sample gabc}&%
+			{\scriptsize\bfseries Glyph}&%
 			{\scriptsize\bfseries Name}&%
-			{\scriptsize\bfseries greciliae}&%
-			{\scriptsize\bfseries gregorio}&%
-			{\scriptsize\bfseries granapadano}\\
+			{\scriptsize\bfseries Glyph}\\
 			\hline
 		\endhead
 		\directlua{GregorioRef.emit_score_glyphs(#1)}
 	\end{longtable}
 }%
-\ScoreFontTable{'greciliae','gregorio','granapadano'}
+\ScoreFontTable{'greciliae', 'greciliaeHollow'}
 
 \subsection{Dominican Score Font Glyphs}
 
 The following table lists all of the score glyphs available in the Dominican
-versions of the greciliae, gregorio, and granapadano fonts in the same vein as
-the prior table.
+versions of the greciliae fonts in the same vein as the prior table.
 
-\ScoreFontTable{'greciliaeOp','gregorioOp','granapadanoOp'}
+\ScoreFontTable{'greciliaeOp', 'greciliaeOpHollow'}
 
 \subsection{Extra Glyphs}\label{subsec:greextra}
 
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 418b53414d6..bf897bf711c 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_User.tex
@@ -1,7 +1,7 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -38,7 +38,7 @@ The optional arguments are:
 \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.\\
+	\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 categories (see \nameref{DebugCategory}) 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.\\
@@ -252,7 +252,8 @@ Macro to create one of Gregorio\TeX’s distances.  Used to initialize distances
 	\#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{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}
@@ -262,7 +263,26 @@ Macro to change one of Gregorio\TeX’s distances.  This function will check to
 	\#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{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 grechangenextscorelinedim}{\{\#1\}\{\#2\}\{\#3\}\{\#4\}}{gregoriotex-spaces.tex}
+Changes one of Gregorio\TeX’s distances for a given line in the next included score.  This works with \texttt{spaceabovelines}, \texttt{spacebeneathtext}, and \texttt{spacelinestext}.
+
+\begin{argtable}
+	\#1 & list of integers & A comma-separated list of line numbers in the next
+													 score to be adjusted.\\
+	\#2 & string & The name of the distance to be changed.  See
+								 \nameref{distances} below.\\
+	\#3 & 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.\\
+	\#4 & \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 \#3 should
+												 be the name of another Gregorio\TeX\ distance.
 \end{argtable}
 
 \macroname{\textbackslash grescaledim}{\{\#1\}\{\#2\}}{gregoriotex-spaces.tex}
@@ -277,13 +297,24 @@ Macro to turn on or off scaling with the staff size for a particular distance.
 \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.\\
+	\#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 grechangenextscorelinecount}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-spaces.tex}
+Changes one of Gregorio\TeX’s counts or penalties for a given line in the next included score.
+
+\begin{argtable}
+	\#1 & list of integers & A comma-separated list of line numbers in the next
+													 score to be adjusted.\\
+	\#2 & string & The name of the count to be changed.  See \nameref{counts} and
+								 \nameref{penalties} below.\\
+	\#3 & 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.
 
@@ -422,6 +453,14 @@ This function is the same as above, with a third argument to scale the font. The
 
 The two first arguments are the same as \texttt{\textbackslash gresetgregoriofont}. The third argument is an integer representing the scaling factor, where the one used by \texttt{\textbackslash gresetgregoriofont} is 100000.
 
+\macroname{\textbackslash greloadholehollowfonts}{\{\#1\}}{gregoriotex-main.tex}
+
+If set to false, will not load the \texttt{hollow} and \texttt{hole} variants of the next font to load. Use it before loading third party fonts not having these variants (rare case).
+
+\begin{argtable}
+	\#1 & string & \texttt{true} or \texttt{false}.\\
+\end{argtable}
+
 \subsubsection{Glyph Alteration}
 In addition to the normal glyphs loaded by the choice of font, Gregorio\TeX\ also supports several methods for fine tuning the choice of glyphs.  Using the below functions, you can choose from alternative glyphs which are already built into Gregorio\TeX\ or import custom glyphs you have designed yourself.
 
@@ -482,6 +521,36 @@ form, use the following:\par\medskip
 	\greresetglyph{TorculusResupinus*}
 \end{latexcode}
 
+\macroname{\textbackslash grechangecavumglyph}{\{\#1\}\{\#2\}\{\#3\}[\optional{\#4}][\optional{\#5}]}{gregoriotex-main.tex}
+Substitutes the given Gregorio\TeX\ score cavum glyphs with the specified glyphs
+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 for the cavum glyph.\\
+	\#3 & number & The code point of the cavum glyph to use.\\
+	& \texttt{.}string & The name of the variant (appended to \#1) to use for the cavum glyph.\\
+	& string & (any other string) The name of the cavum glyph to use.\\
+	\#4 & string & The name of the font to use for the glyph to fill in the cavum hole.\\
+	\#5 & number & The code point of the glyph to use to fill in the cavum hole.\\
+	& \texttt{.}string & The name of the variant (appended to \#1) to use to fill in the the cavum hole.\\
+	& string & (any other string) The name of the glyph to use to fill in the cavum hole.\\
+\end{argtable}
+
+\textbf{Nota Bene:} The usage of wildcards (\texttt{*}s) for \texttt{\#1},
+\texttt{\#2}, and \texttt{\#4} is similar to \verb=\grechangeglyph=.
+
+\macroname{\textbackslash greresetcavumglyph}{\{\#1\}}{gregoriotex-main.tex}
+Removes a pair of Gregorio\TeX\ score cavum glyph substitution, restoring them
+back to their original form.
+
+\begin{argtable}
+	\#1 & string & The name of the Gregorio\TeX\ cavum glyph to restore.\\
+\end{argtable}
+
+\textbf{Nota Bene:} The usage of wildcards (\texttt{*}s) for \texttt{\#1} is
+similar to \verb=\greresetcavumglyph=.
+
 \macroname{\textbackslash gredefsymbol}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-symbols.tex}
 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.
@@ -715,7 +784,8 @@ Different elements of an include score have different styles applied.  These ele
 	\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{commentary} & the commentary & {\footnotesize\it footnote-size italics} (\LaTeX)\\
+	&& {\textit{italics}} (Plain \TeX)\\
 	\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\\
@@ -725,10 +795,10 @@ Different elements of an include score have different styles applied.  These ele
 	\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{modeline} & the rendered annotation from the \texttt{mode: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textsc{\textbf{bold small capitals}}} (\LaTeX)\\
+	& & \textbf{bold} (Plain\TeX)\\
 	\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{nabc} & ancient notation & {\color{gregoriocolor}gregoriocolor}\\
 	\stylename{normalstafflines} & Full length staff lines & none\\
 	\stylename{translation} & Translation text (appears below lyrics) & {\it italics}\\
 \end{tabular}
@@ -798,7 +868,7 @@ Macro to add an illuminated initial.
 
 \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}
@@ -807,15 +877,24 @@ Sets the number of lines the score initial requires.
 
 \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.\\
+	\#1 & \texttt{roman-minuscule} & Use lower-case Roman numerals (the default in \LaTeX, good for small capitals).\\
+			& \texttt{roman-majuscule} & Use upper-case Roman numerals (the default in Plain\TeX).\\
 			& \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.
 
@@ -875,6 +954,55 @@ Macro to specify which part of the control line in the annotation should be alig
 
 \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).
 
+\macroname{\textbackslash gresetsyllablerewriting}{\{\#1\}}{gregoriotex-syllable.tex}
+Sets whether the last part of a non-final syllable of a word is moved to the
+next syllable when there is no hyphen.  The ``last part'' of a syllable is
+the part that comes after the part that is centered under the first note of
+the syllable.  This feature may allow Lua\TeX{} to find better opportunities
+for ligaturing based on \TeX{} and font settings.
+
+\begin{argtable}
+	\#1 & \texttt{auto} & Gregorio\TeX{} will move the last part of a syllable
+												to the next syllable in a word when there is no
+												hyphen (default).\\
+			& \texttt{off}  & Gregorio\TeX{} will not attempt to rewrite any
+												syllables.\\
+\end{argtable}
+
+\macroname{\textbackslash gresetprotrusionfactor}{\{\#1\}\{\#2\}}{gregoriotex-spaces.tex}
+Sets a global protrusion factor.  Depending on the first argument, these
+protrusion factors will be used for various characters as well as for
+\verb=<pr>= tags with no specified protrusion factor.  A protrusion factor of 0
+means no protrusion and 1 means full protrusion.  Any floating-point value from
+0 to 1 is allowed.  All of these global protrusion factors may be set in
+gsp-default.tex or in your own \TeX\ files.
+
+\begin{argtable}
+	\#1 & \texttt{,}         & Sets the automatic protrusion factor for a comma at
+														 the end of a syllable.  Default is
+														 \GreProtrusionFactor{comma}.\\
+			& \texttt{;}         & Sets the automatic protrusion factor for a
+														 semicolon at the end of a syllable.  Default is
+														 \GreProtrusionFactor{semicolon}.\\
+			& \texttt{:}         & Sets the automatic protrusion factor for a colon at
+														 the end of a syllable.  Default is
+														 \GreProtrusionFactor{colon}.\\
+			& \texttt{.}         & Sets the automatic protrusion factor for a period
+														 at the end of a syllable.  Default is
+														 \GreProtrusionFactor{period}.\\
+			& \texttt{eolhyphen} & Sets the protrusion factor for a hyphen at
+														 the end of a line.  Default is
+														 \GreProtrusionFactor{eolhyphen}.  This protrusion
+														 factor only applies to hyphens inserted by the Lua
+														 pass), so use it with caution.\\
+			& \texttt{default}   & Sets the default protrusion factor for a
+														 \verb=<pr>= tag in gabc.  Default is
+														 \GreProtrusionFactor{default}.\\
+	\#2 & factor             & The desired protrusion factor, a floating point
+														 value from 0 (no protrusion) to 1 (full
+														 protrusion).  See defaults above.\\
+\end{argtable}
+
 \subsubsection{End of Line Behavior}
 While Gregorio\TeX\ will automatically wrap scores to fit your page, there are several ways to fine tune that line breaking behavior with the following commands.
 
@@ -913,6 +1041,15 @@ Macro to determine whether line breaks are allowed inside a translation.
 	& \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.
 
@@ -949,6 +1086,26 @@ Macro to determine whether Gregorio\TeX\ should apply a small shift at the begin
 	& \texttt{disable} & The shifts are not applied.
 \end{argtable}
 
+\macroname{\textbackslash grebolshiftcleftype}{\{\#1\}}{gregoriotex-spaces.tex}
+Macro to determine how notes should be left aligned in the case where clefs of different widths appear in the same score.
+
+\begin{argtable}
+	\#1 & \texttt{largest} & The notes are aligned as if all clefs had the width of the largest clef (default)\\
+	& \texttt{current} & The notes are aligned on the current clef, which leads to unaligned notes. This was the default of Gregorio < \texttt{5.0}.
+\end{argtable}
+
+\macroname{\textbackslash grelocalbolshiftcleftype}{\{\#1\}}{gregoriotex-spaces.tex}
+Equivalent of \verb=\grebolshiftcleftype= but valid only until the next end of a score, and with more options. This can be used before a score or even inside a \verb=<v>verbatim</v>= in gabc for corner cases like different alignment on a score taking two pages.
+
+\begin{argtable}
+	\#1 & \texttt{largest} & The notes are aligned as if all clefs had the width of the largest clef (default)\\
+	& \texttt{current} & The notes are aligned on the current clef, which leads to unaligned notes\\
+	& \texttt{f} & Force left alignment of notes as if all clef were f clef\\
+	& \texttt{c} & Idem with c clef\\
+	& \texttt{fb} & Idem with flatted f clef\\
+	& \texttt{cb} & Idem with flatted c clef\\
+\end{argtable}
+
 \macroname{\textbackslash gresetlastline}{\{\#1\}}{gregoriotex-main.tex}
 Macro to determine whether the last line of the score should be justified or not.
 
@@ -957,6 +1114,21 @@ Macro to determine whether the last line of the score should be justified or not
 	& \texttt{ragged} & Set the last line ragged (default)
 \end{argtable}
 
+\macroname{\textbackslash gresetunbreakablesyllablenotes}{\{\#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}
+
 
 \subsubsection{Bar spacing}
 
@@ -978,12 +1150,31 @@ 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 (Default)\\
+	& \texttt{old} & Activates the old behavior\\
 \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 gresetnabc}{\{\#1\}\{\#2\}}{gregoriotex-nabc.tex}
+Sets the visibility of a nabc voice.
+
+\begin{argtable}
+	\#1 & integer & The nabc voice number.\\
+	\#2 & \texttt{visible} & Notes are visible (default).\\
+	& \texttt{invisible} & Notes are not visible.\\
+\end{argtable}
+
 \macroname{\textbackslash greprintsigns}{\{\#1\}\{\#2\}}{gregoriotex-signs.tex}
 Macro to prevent rythmic signs from printing (all signs are printed by default):
 
@@ -993,7 +1184,7 @@ Macro to prevent rythmic signs from printing (all signs are printed by default):
 	& \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\\
+	& \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.
@@ -1024,15 +1215,6 @@ Marco to determine how much space the hyphen at the end of a line occupies for t
 	& \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
-\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.
-
 \subsubsection{Clef Visibility}
 
 \macroname{\textbackslash gresetclef}{\{\#1\}}{gregoriotex-signs.tex}
@@ -1167,22 +1349,31 @@ Macro to set the font to be used for the ancient notation.
 
 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.
-
-Default: \texttt{2}
-
-\macroname{additionaltopspacealtthreshold}{}{gsp-default.tex}
+vertical space. For instance with a threshold of \texttt{2} and four line
+staves, 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}
 
+\begin{gcount}{additionaltopspacealtthreshold}
 Same as \texttt{additionaltopspacethreshold} but setting the threshold for
 notes taken into account with above lines text vertical placement.
+\end{gcount}
+
+\begin{gcount}{additionaltopspacenabcthreshold}
+Same as \texttt{additionaltopspacethreshold} but setting the threshold for
+notes taken into account with above lines nabc neume vertical placement
+baseline.
+\end{gcount}
 
-Default: \texttt{0}
+\begin{gcount}{noteadditionalspacelinestextthreshold}
+The number of low notes which will add on the
+\texttt{noteadditionalspacelinestext} space.  For instance, with a threshold of
+\texttt{2}, every note below \texttt{c} will add {noteadditionalspacelinestext}
+space for each pitch needed below \texttt{c}, accounting for the various signs.
+\end{gcount}
 
 \subsection{Distances}\label{distances}
 
@@ -1308,7 +1499,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}
@@ -1316,7 +1511,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}
@@ -1324,11 +1520,15 @@ 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}{descendingpunctuminclinatumascendingshift}
+Space between descending puncta inclinata shapes in an ascent of pitch.
 \end{gdimension}
 
 \begin{gdimension}{ascendingpunctuminclinatumshift}
@@ -1348,6 +1548,10 @@ Space between ascending puncta inclinata, larger ambitus (range=3rd).
 Space between ascending puncta inclinata, larger ambitus (range=4th or 5th).
 \end{gdimension}
 
+\begin{gdimension}{ascendingpunctuminclinatumdescendingshift}
+Space between ascending puncta inclinata shapes in a descent of pitch.
+\end{gdimension}
+
 \begin{gdimension}{descendinginclinatumtonobarshift}
 Space between a punctum inclinatum and a no-bar (stemless) glyph one pitch
 below.
@@ -1411,6 +1615,10 @@ Minimal space in front of the lyrics at the beginning of a line when \texttt{bol
 Space to force the initial width to.  Ignored when 0.
 \end{gdimension}
 
+\begin{gdimension}{minimalinitialwidth}
+Minimum width of the initial.  Ignored when \texttt{manualinitialwidth} is non-zero.
+\end{gdimension}
+
 \begin{gdimension}{annotationseparation}
 This space is the one between lines in the annotation (text above the initial).
 
@@ -1466,6 +1674,11 @@ The space above the lines.
 The space between the lines and the bottom of the text.
 \end{gdimension}
 
+\begin{gdimension}{noteadditionalspacelinestext}
+The space added between the lines and the bottom of the text for every pitch
+below the \texttt{noteadditionalspacelinestextthreshold}.
+\end{gdimension}
+
 \begin{gdimension}{spacebeneathtext}
 The space beneath the text.
 \end{gdimension}
@@ -1479,7 +1692,7 @@ Height that is added at the top of the lines if there is text above the lines (i
 \end{gdimension}
 
 \begin{gdimension}{braceshift}
-An additional shift you can give to the brace above the bars.
+An additional shift you can give to the brace above the staff.
 \end{gdimension}
 
 \begin{gdimension}{curlybraceaccentusshift}
@@ -1570,20 +1783,58 @@ 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}
+\begin{gdimension}{bracketupshift}
+Distance to shift a bracket up when the lowest note in the brackets is on a
+line or below the staff.
+\end{gdimension}
+
+\begin{gdimension}{bracketdownshift}
+Distance to shift a bracket down when the lowest note in the brackets is
+neither on a line nor below the staff.
+\end{gdimension}
+
+\begin{gdimension}{parskip}
+The effective \verb=\parskip= inside of a score.
+\end{gdimension}
+
+\begin{gdimension}{lineskip}
+The effective \verb=\lineskip= inside of a score.
+\end{gdimension}
+
+\begin{gdimension}{baselineskip}
+The effective \verb=\baselineskip= inside of a score.
+\end{gdimension}
+
+\begin{gdimension}{lineskiplimit}
+The effective \verb=\lineskiplimit= inside of a score.
+\end{gdimension}
+
+\begin{gdimension}{shortspaceafterlineclef}
+Space after a clef at the beginning of a line, when the clef and first note are vertically distant.
+\end{gdimension}
+
+\subsubsection{Bar distances}
 
 \begin{gdimension}{bar@finalfinalis}
 This space is added before the final divisio final of a score (old bar spacing algorithm only).
 \end{gdimension}
 
-Spaces around bars when they are typeset inside a syllable:
+Spaces around bars when they are typeset inside a syllable. The \verb=@short= suffix for virgula
+and divisio minima indicates the space used when the notes surrounding the bar are strictly lower
+than \texttt{g} (in a four-line score).
 
 \begin{gdimension}{bar@virgula}
 \end{gdimension}
 
+\begin{gdimension}{bar@virgula@short}
+\end{gdimension}
+
 \begin{gdimension}{bar@minima}
 \end{gdimension}
 
+\begin{gdimension}{bar@minima@short}
+\end{gdimension}
+
 \begin{gdimension}{bar@minor}
 \end{gdimension}
 
@@ -1601,9 +1852,15 @@ Spaces around bars in standalone syllables, when these have text (new bar spacin
 \begin{gdimension}{bar@virgula@standalone@text}
 \end{gdimension}
 
+\begin{gdimension}{bar@virgula@standalone@text@short}
+\end{gdimension}
+
 \begin{gdimension}{bar@minima@standalone@text}
 \end{gdimension}
 
+\begin{gdimension}{bar@minima@standalone@text@short}
+\end{gdimension}
+
 \begin{gdimension}{bar@minor@standalone@text}
 \end{gdimension}
 
@@ -1624,9 +1881,15 @@ Spaces around bars in standalone syllables, when these have no text (new bar spa
 \begin{gdimension}{bar@virgula@standalone@notext}
 \end{gdimension}
 
+\begin{gdimension}{bar@virgula@standalone@notext@short}
+\end{gdimension}
+
 \begin{gdimension}{bar@minima@standalone@notext}
 \end{gdimension}
 
+\begin{gdimension}{bar@minima@standalone@notext@short}
+\end{gdimension}
+
 \begin{gdimension}{bar@minor@standalone@notext}
 \end{gdimension}
 
@@ -1700,89 +1963,79 @@ Maximum distance by which the center of a bar and the center of its associated t
 Same as \texttt{maxbaroffsettextleft@eol} but when the center of the text goes right of the center of the bar.
 \end{gdimension}
 
+\begin{gdimension}{alterationadjustmentbar}
+In the case of an alteration after a bar, the alteration will go a bit left of this value. This can be compared to \texttt{moraadjustmentbar}.
+\end{gdimension}
 
 \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.
 
@@ -1791,11 +2044,8 @@ 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}
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 973fd307daf..0bd6bcff49d 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_gregorio.tex
@@ -1,7 +1,7 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -38,7 +38,7 @@ respecting the annotation value in the \texttt{main.tex} file.
 	\#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}
+\macroname{\textbackslash GreBeginScore}{\#1\#2\#3\#4\#5\#6\#7\#8}{gregoriotex-main.tex}
 Macro to start a score.
 
 \begin{argtable}
@@ -51,6 +51,8 @@ Macro to start a 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\\
+	\#8 & \TeX\ code & macros to run before the score (\eg, setting clef
+										 extrema)\\
 \end{argtable}
 
 \macroname{\textbackslash GreEndScore}{}{gregoriotex-main.tex}
@@ -67,25 +69,26 @@ 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.\\
+	\#2 & string  & Type of glyph the episema is attached to. See \Nameref{NoteOffset} for a 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}.\\
+	\#1 & string  & See \Nameref{NoteOffset}.\\
 	\#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.\\
+	\#3 & integer & The number of notes in the syllable prior to this macro.\\
 \end{argtable}
 
 \macroname{\textbackslash GreAugmentumDuplex}{\#1\#2\#3}{gregoriotex-signs.tex}
@@ -101,7 +104,7 @@ Macro for typesetting an augmentum duplex (a pair of punctum mora)
 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{NoteOffset} for a description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreBarSyllable}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-syllable.tex}
@@ -124,7 +127,7 @@ Macro for typesetting a bar syllable.
 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{NoteOffset} for a description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreBeginEUOUAE}{\#1}{gregoriotex-main.tex}
@@ -151,6 +154,18 @@ Makes argument bold.  Accesses \LaTeX\ \verb=\textbf= (\textit{gregoriotex.sty})
 	\#1 & string & Text to be typeset in bold.\\
 \end{argtable}
 
+\macroname{\textbackslash GreBracket}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
+Typesets a bracket.
+
+\begin{argtable}
+	\#1 & \texttt{0} & Typeset a left bracket.\\
+			& \texttt{1} & Typeset a right bracket.\\
+	\#2 & integer    & The height of the lowest note within the brackets.\\
+	\#3 & integer    & The height of the highest note within the brackets.\\
+	\#4 & string     & the line, byte offset, and column address for textedit
+										 links when point-and-click is enabled.\\
+\end{argtable}
+
 \macroname{\textbackslash GreChangeClef}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
 Macro called when key changes
 
@@ -170,9 +185,12 @@ 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.\\
+	\#2 & string  & Type of glyph the circulus is attached to.  See \Nameref{NoteOffset} for a description of options.\\
 \end{argtable}
 
+\macroname{\textbackslash GreClearSyllableText}{\#1\#2}{gregoriotex-syllable.tex}
+Macro indicating that the text in this syllable should not overlap any previous syllable.
+
 \macroname{\textbackslash GreColored}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
 Colors argument (a string) in \verb=gregoriocolor.=  Corresponds to ``<c></c>'' tags in gabc.  Does nothing in Plain \TeX\ because color is not supported there.
 
@@ -188,12 +206,28 @@ defined and re-defined by the \verb=\gresetgregoriofont= macro.
 \macroname{\textbackslash GreCP...}{}{gregoriotex-main.tex}
 A class of macros which point to the individual characters in a Gregoiro\TeX\ compatible font.  This class of macros is dynamically mapped from the glyph names embedded in the \texttt{ttf} file via a Lua script to ensure that the code points match up with the installed font.
 
+\macroname{\textbackslash GreHollowCP...}{}{gregoriotex-main.tex}
+A class of macros which point to the individual characters in a Gregoiro\TeX\ compatible cavum neume font.  This class of macros is dynamically mapped from the glyph names embedded in the \texttt{ttf} file via a Lua script to ensure that the code points match up with the installed font.
+
+\macroname{\textbackslash GreHoleCP...}{}{gregoriotex-main.tex}
+A class of macros which point to the individual characters in a Gregoiro\TeX\ compatible cavum neume hole font.  This class of macros is dynamically mapped from the glyph names embedded in the \texttt{ttf} file via a Lua script to ensure that the code points match up with the installed font.
+
+\macroname{\textbackslash GreCavum}{\#1}{gregoriotex-signs.tex}
+Typesets a cavum glyph.
+
+\begin{argtable}
+	\#1 & string & The name of the cavum glyph.\\
+\end{argtable}
+
 \macroname{\textbackslash GreCustos}{\#1\#2}{gregoriotex-signs.tex}
 Typesets a custos.
 
 \begin{argtable}
 	\#1 & integer & Height number of custos.\\
-	\#2 & integer & Indicate if the custo is the last of the score.\\
+	\#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}
@@ -226,13 +260,15 @@ Macro to typeset a divisio maior.
 	\#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}
+\macroname{\textbackslash GreDivisioMinima}{\#1\#2\#3}{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=).\\
+	\#3 & \texttt{0} & The notes around the bar are vertically close to the bar.\\
+	& \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
 \end{argtable}
 
 \macroname{\textbackslash GreDivisioMinor}{\#1\#2}{gregoriotex-signs.tex}
@@ -291,7 +327,7 @@ Macro to mark the end of a EUOUAE block.
 	& \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}
@@ -302,6 +338,7 @@ Macro to end elements.
 	& \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}
@@ -345,11 +382,15 @@ Macro to end a glyph without ending the element.
 	& \texttt{22} & Half-space. \\
 \end{argtable}
 
-\macroname{\textbackslash GreFinalCustos}{\#1}{gregoriotex-signs.tex}
+\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.\\
+	\#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}
@@ -433,7 +474,7 @@ 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\\
+	\#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.\\
@@ -478,7 +519,7 @@ Macro to typeset an horizontal episema.
 
 \begin{argtable}
 	\#1 & integer & Height number of the episema.\\
-	\#2 & string  & See \nameref{EpisemaSpecial}.\\
+	\#2 & string  & See \Nameref{NoteOffset}.\\
 	\#3 & integer & The ambitus for a two note episema at the diagonal stroke of a
 		porrectus, porrectus flexus, orculus resupinus, or torculus resupinus
 		flexus.\\
@@ -550,7 +591,7 @@ Same as \verb=\GreDivisioFinalis= except inside a syllable.
 \macroname{\textbackslash GreInDivisioMaior}{\#1\#2}{gregoriotex-signs.tex}
 Same as \verb=\GreDivisioMaior= except inside a syllable.
 
-\macroname{\textbackslash GreInDivisioMinima}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreInDivisioMinima}{\#1\#2\#3}{gregoriotex-signs.tex}
 Same as \verb=\GreDivisioMinima= except inside a syllable.
 
 \macroname{\textbackslash GreInDivisioMinor}{\#1\#2}{gregoriotex-signs.tex}
@@ -559,7 +600,16 @@ Same as \verb=\GreDivisioMinor= except inside a syllable.
 \macroname{\textbackslash GreInDominica}{\#1\#2\#3}{gregoriotex-signs.tex}
 Same as \verb=\GreDominica= except inside a syllable.
 
-\macroname{\textbackslash GreInVirgula}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreInitialClefPosition}{\#1\#2}{gregoriotex-signs.tex}
+Saves the extrema of the initial clef.
+
+\begin{argtable}
+	\#1 & integer & the line of the primary clef (1 is the bottom line)\\
+	\#2 & integer & the line of the secondary clef (1 is the bottom line, 0 means
+									no secondary clef)\\
+\end{argtable}
+
+\macroname{\textbackslash GreInVirgula}{\#1\#2\#3}{gregoriotex-signs.tex}
 Same as \verb=\GreVirgula= except inside a syllable.
 
 \macroname{\textbackslash GreItalic}{\#1}{gregoriotex.sty or gregoriotex.tex}
@@ -586,27 +636,6 @@ Indicates that this syllable is the last syllable before a 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.\\
-\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.
-\end{argtable}
-
 \macroname{\textbackslash GreLowChoralSign}{\#1\#2\#3}{gregoriotex-signs.tex}
 Macro for typesetting low choral signs.
 
@@ -630,6 +659,30 @@ is used, then this function does nothing.
 	\#3 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modedifferentia} style, after \#2.\\
 \end{argtable}
 
+\macroname{\textbackslash GreMusicaFictaFlat}{\#1\#2}{gregoriotex-signs.tex}
+Macro for typesetting a musica ficta flat.
+
+\begin{argtable}
+	\#1 & integer & Height number of the musica ficta flat.\\
+	\#2 & string  & Type of glyph the musica ficta flat is attached to. See \Nameref{NoteOffset} for a description of options.\\
+\end{argtable}
+
+\macroname{\textbackslash GreMusicaFictaNatural}{\#1\#2}{gregoriotex-signs.tex}
+Macro for typesetting a musica ficta natural.
+
+\begin{argtable}
+	\#1 & integer & Height number of the musica ficta natural.\\
+	\#2 & string  & Type of glyph the musica ficta natural is attached to. See \Nameref{NoteOffset} for a description of options.\\
+\end{argtable}
+
+\macroname{\textbackslash GreMusicaFictaSharp}{\#1\#2}{gregoriotex-signs.tex}
+Macro for typesetting a musica ficta sharp.
+
+\begin{argtable}
+	\#1 & integer & Height number of the musica ficta sharp.\\
+	\#2 & string  & Type of glyph the musica ficta sharp is attached to. See \Nameref{NoteOffset} for a description of options.\\
+\end{argtable}
+
 \macroname{\textbackslash GreNatural}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
 Macro to typeset a natural.
 
@@ -648,14 +701,29 @@ 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 GreFinalNewLine}{}{gregoriotex-main.tex}
+Handles a new line after the final bar.  This currently just advances \verb=\gre@knownline= in order to prevent a potential error message with a two-line initial on a two-line score.
+
+\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.\\
+	\#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 GreSuppressEolCustos}{}{gregoriotex-main.tex}
+Macro which disables automatic custos at the end of lines.
+
+\macroname{\textbackslash GreResetEolCustos}{}{gregoriotex-main.tex}
+Alias that resets the use of automatic custos to the value set by
+\verb=\greseteolcustos=.  This macro is aliased to \verb=\gre@useautoeolcustos=
+or \verb=\GreSuppressEolCustos= by \verb=\greseteolcustos=.
+
 \macroname{\textbackslash GreNextSyllableBeginsEUOUAE}{\#1\#2}{gregoriotex-syllable.tex}
 Indicates that the syllable which follows begins a EUOUAE block.
 
@@ -665,42 +733,6 @@ Indicates that the syllable which follows begins a 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).
-
-\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.
-\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).
-
-\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.
-\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.
-\end{argtable}
-
 \macroname{\textbackslash GreOverBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
 Macro to typeset a round brace above the lines.
 
@@ -725,40 +757,23 @@ Macro to typeset a curly brace above the lines.
 	& \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.
-\end{argtable}
-
-\macroname{\textbackslash GrePunctumCavumInclinatum}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset a punctum cavum inclinatus.
+\macroname{\textbackslash GreProtrusion}{\#1\#2}{gregoriotex-spaces.tex}
+Typesets a protrusion.
 
 \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 & float & The protrusion factor.  May be a call to \verb=\GreProtrusionFactor=\\
+	\#2 & \TeX\ code & The content of the protrusion.\\
 \end{argtable}
 
-\macroname{\textbackslash GrePunctumCavumInclinatumAuctus}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset a punctum cavum inclinatus auctus.
+\macroname{\textbackslash GreProtrusionFactor}{\#1}{gregoriotex-spaces.tex}
+Returns a automatic protrusion factor.  The argument is character whose
+automatic protrusion factor is desired.
 
 \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 & \texttt{,} & The comma protrusion factor.\\
+			& \texttt{;} & The semicolon protrusion factor.\\
+			& \texttt{:} & The colon protrusion factor.\\
+			& \texttt{.} & The period protrusion factor.\\
 \end{argtable}
 
 \macroname{\textbackslash GrePunctumMora}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
@@ -781,7 +796,7 @@ 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.\\
+	\#2 & string  & Type of glyph the accentus is attached to. See \Nameref{NoteOffset} for a description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreReversedSemicirculus}{\#1\#2}{gregoriotex-signs.tex}
@@ -789,7 +804,7 @@ 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.\\
+	\#2 & string  & Type of glyph the semicirculus is attached to. See \Nameref{NoteOffset} for a description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreScoreOpening}{\#1\#2\#3\#4\#5}{gregoriotex-syllable.tex}
@@ -808,7 +823,7 @@ 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.\\
+	\#2 & string  & Type of glyph the semicirculus is attached to. See \Nameref{NoteOffset} for a description of options.\\
 \end{argtable}
 
 \macroname{\textbackslash GreSetFirstSyllableText}{\#1\#2\#3\#4\#5\#6}{gregoriotex-syllable.tex}
@@ -857,7 +872,7 @@ ligatures. In this example we should call \verb=\grefixedtext{\textit{ffj}}=.
 	\#1 & character & The initial letter of the score.\\
 \end{argtable}
 
-\macroname{\textbackslash GreSetInitialClef}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreSetInitialClef}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
 Macro for writing initial clef.
 
 \begin{argtable}
@@ -867,9 +882,10 @@ Macro for writing initial clef.
 	\#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).\\
+	\#7 & integer & \texttt{0} if clef and first note are far enough to use a shorter space, 1 otherwise.\\
 \end{argtable}
 
-\macroname{\textbackslash GreSetLinesClef}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-main.tex}
+\macroname{\textbackslash GreSetLinesClef}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
 Macro to define the clef that will appear at the beginning of the lines.
 
 \begin{argtable}
@@ -883,6 +899,19 @@ Macro to define the clef that will appear at the beginning of the lines.
 	\#7 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
 \end{argtable}
 
+\macroname{\textbackslash GreSetLargestClef}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
+Macro defining the largest clef of the score (for notes left alignment).
+The arguments are the same as \verb=\GreSetInitialClef= without the \#7th one, which is always considered
+to be \texttt{1}.
+
+\macroname{\textbackslash GreSetNabcAboveLines}{\#1}{gregoriotex-main.tex}
+Macro to place argument containing Nabc neumes above the lines and empty
+\verb=\gre@currenttextabovelines= when done.
+
+\begin{argtable}
+	\#1 & string & Nabc neumes to be placed above the lines.\\
+\end{argtable}
+
 \macroname{\textbackslash GreSetNextSyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
 Macro to set the text of the next syllable for spacing purposes.
 
@@ -981,6 +1010,13 @@ Macro to typeset the syllable.
 	\#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}
 Macro to end the centering of the translation text.
 
@@ -1050,16 +1086,18 @@ 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.\\
+	\#2 & string  & Type of glyph the episema is attached to. See \Nameref{NoteOffset} for a description of options.\\
 \end{argtable}
 
-\macroname{\textbackslash GreVirgula}{\#1\#2}{gregoriotex-signs.tex}
+\macroname{\textbackslash GreVirgula}{\#1\#2\#3}{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=).\\
+	\#3 & \texttt{0} & The notes around the bar are vertically close to the bar.\\
+	& \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
 \end{argtable}
 
 \macroname{\textbackslash GreWriteTranslation}{\#1}{gregoriotex-main.tex}
@@ -1086,12 +1124,14 @@ Macro used to prevent a line break from occurring at a given position.
 \macroname{\textbackslash GreScoreId}{}{gregoriotex-main.tex}
 A Lua\TeX\ attribute which designates a unique identifier for each score.
 
-\macroname{\textbackslash GreNABCNeumes}{\#1\#2}{gregoriotex-nabc.tex}
+\macroname{\textbackslash GreNABCNeumes}{\#1\#2\#3\#4}{gregoriotex-nabc.tex}
 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\\
+	\#3 & integer & The high pitch of the notes covered by the nabc character(s).\\
+	\#4 & integer & The low pitch of the notes covered by the nabc character(s).\\
 \end{argtable}
 
 \macroname{\textbackslash GreNABCChar}{\#1}{gregoriotex-nabc.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 d8fa5d33d83..0b7fc789bae 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Command_Index_internal.tex
@@ -1,7 +1,7 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -47,7 +47,7 @@ Executes \MP{} commands using luamplib.
 	\#1 & \MP{} commands & The \MP{} commands to execute.
 \end{argtable}
 
-\macroname{\textbackslash gre@deprecated}{\#1\#2}{gregoriotex-main.tex}
+\macroname{\textbackslash gre@deprecated}{\#1\#2}{gregoriotex-common.tex}
 Macro that handles deprecation messages. By default, deprecated macros
 are allowed and a warning is printed. If the package option
 \texttt{deprecated=false} is set, then deprecated macros raise a
@@ -58,7 +58,7 @@ package error, halting \TeX.
 	\#2 & string & name of the correct macro to use\\
 \end{argtable}
 
-\macroname{\textbackslash gre@obsolete}{\#1\#2}{gregoriotex-main.tex}
+\macroname{\textbackslash gre@obsolete}{\#1\#2}{gregoriotex-common.tex}
 Macro that handles obsolescence errors.
 
 \begin{argtable}
@@ -66,6 +66,11 @@ Macro that handles obsolescence errors.
 	\#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.
 
@@ -91,13 +96,14 @@ Macro which calculates \verb=\gre@additionalbottomspace= and\\
 	& \texttt{1} & there is above lines text
  \end{argtable}
 
-\macroname{\textbackslash gre@calculate@textaligncenter}{\#1\#2\#3}{gregoriotex-spaces.tex}
+\macroname{\textbackslash gre@calculate@textaligncenter}{\#1\#2\#3\#4}{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.\\
+	\#1 & string & The carry-over letters from the previous syllable that should be moved to the current.\\
+	\#2 & string & The first part of the syllable (any preceding consonants in Latin).\\
+	\#3 & string & The middle part of the syllable (the vowel in Latin, the whole syllable in English).\\
+	\#4 & \texttt{0} & Calculation is being performed for the current syllable.\\
 	& \texttt{1} & Calculation is being performed for the next syllable.\\
 \end{argtable}
 
@@ -155,6 +161,7 @@ Calculates the raise value for a glyph (glyphraisevalue) based on where it is to
 	& \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\\
+	& \texttt{17} & case of the bracket\\
 	\#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\\
@@ -194,7 +201,7 @@ 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}.\\
+	\#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}
@@ -207,14 +214,15 @@ Rescales all the distances (and \texttt{stafflinefactor}) which are supposed to
 	\#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}
+\macroname{\textbackslash gre@calculate@nextbegindifference}{\#1\#2\#3\#4\#5}{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}.\\
+	\#1 & string & the carry-over letters for the next syllable\\
+	\#2 & string & the first letters of the next syllable\\
+	\#3 & string & the middle letters of the next syllable (the vowel in Latin, the whole syllable in English)\\
+	\#4 & string & the end letters of the next syllable\\
+	\#5 & $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}
@@ -277,14 +285,6 @@ argument.
 	\#2 & string & Relative or absolute path to the score.\\
 \end{argtable}
 
-\macroname{\textbackslash gre@gabcsnippet}{\#1}{gregoriotex-main.tex}
-Macro that handles \verb=\gabcsnippet= calls when they do not have an
-optional argument.
-
-\begin{argtable}
-	\#1 & string & Snippet of gabc code.\\
-\end{argtable}
-
 \macroname{\textbackslash gre@writemode}{\#1\#2\#3}{gregoriotex-main.tex}
 Macro that writes its arguments with \verb=\greannotation=.  This
 macro is typically called by \verb=\GreMode= in the gtex file.
@@ -411,6 +411,13 @@ Evaluates to \verb=#1= if running under \LaTeX{}.
 	\#1 & \TeX{} code & the \TeX{} code to use if running under \LaTeX{}.
 \end{argtable}
 
+\macroname{\textbackslash gre@ifnotlatex}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
+Evaluates to \verb=#1= if not running under \LaTeX{}.
+
+\begin{argtable}
+	\#1 & \TeX{} code & the \TeX{} code to use if not running under \LaTeX{}.
+\end{argtable}
+
 \macroname{\textbackslash gre@latex@barredsymbol}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
 Internal method used by \verb=\grelatexsimpledefarredsymbol= to simplify
 the cascading of conditionals used to implement that macro.
@@ -443,8 +450,22 @@ Macro to pick the appropriate custos character.
 	\#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.
@@ -511,8 +532,14 @@ Macro redrawing a key from \verb=\gre@clefnum=, useful for vertical space change
 \macroname{\textbackslash gre@currenttextabovelines}{}{gregoriotex-main.tex}
 Macro for storing the text which needs to be placed above the lines.
 
-\macroname{\textbackslash gre@typesettextabovelines}{\#1}{gregoriotex-main.tex}
-Macro for typesetting the text above the lines.
+\macroname{\textbackslash gre@typesettextabovelines}{\#1\#2}{gregoriotex-main.tex}
+Macro for typesetting the text or nabc neumes above the lines.
+
+\begin{argtable}
+	\#1 & string & Text to be typeset\\
+	\#2 & \texttt{0} & Use alt text above the lines vertical spacing\\
+	& \texttt{1} & Use nabc neumes above the lines vertical spacing\\
+\end{argtable}
 
 \macroname{\textbackslash gre@dotranslationcenterend}{}{gregoriotex-main.tex}
 Macro to typeset a centered translation.
@@ -565,6 +592,9 @@ Macro called at end of a syllable, adds a penalty and a space.
 	& \texttt{0} & otherwise\\
 \end{argtable}
 
+\macroname{\textbackslash gre@endofglyphcommon}{}{gregoriotex-syllable.tex}
+Macro called at the end of every glyph.  Checks to see if glyph being ended is the last of the score and does some clean-up if it is.
+
 \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.
 
@@ -588,11 +618,13 @@ Count which stores the current staff size.
 
 Default: 17 (approximately the size found in graduals)
 
-\macroname{\textbackslash gre@fillhole}{\#1}{gregoriotex-signs.tex}
+\macroname{\textbackslash gre@fillhole}{\#1\#2}{gregoriotex-signs.tex}
 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 & \texttt{0} & the hole is being filled for an alteration\\
+	\#1 & \texttt{1} & the hole is being filled for a cavum glyph\\
 \end{argtable}
 
 \macroname{\textbackslash gre@calculate@notesaligncenter}{\#1}{gregoriotex-syllable.tex}
@@ -680,7 +712,7 @@ Macro to typeset a vertical episema or a rare accent (like accentus, circulus, e
 
 \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}\\
+	\#2 & string & See \Nameref{NoteOffset}.\\
 	\#3 & Gregorio\TeX\ glyph & the sign glyph\\
 	\#4 & \texttt{1} & vertical episema\\
 	& \texttt{2} & rare sign\\
@@ -720,9 +752,6 @@ Macro to store the catcode for ``@'' so that we can use said symbol in function
 \macroname{\textbackslash gre@prephepisemaledgerlineheuristics}{}{gregoriotex-spaces.tex}
 Prepares the system to accept ledger line heuristics for the horizontal episema.
 
-\macroname{\textbackslash gre@reseteolcustos}{}{gregoriotex-main.tex}
-Alias that resets the use of automatic custos to the value set by \verb=\greseteolcustos=.  This macro is aliased to \verb=\gre@useautoeolcustos= or \verb=\gre@usemanualeolcustos= by \verb=\greseteolcustos=.
-
 \macroname{\textbackslash gre@resetledgerlineheuristics}{}{gregoriotex-spaces.tex}
 Resets the ledger line heuristic flags.
 
@@ -754,7 +783,7 @@ Saves clef information for use in \verb=gre@updatelinesclef=.
 	\#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}
+\macroname{\textbackslash gre@typeclef}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-signs.tex}
 Macro which typesets the clef.
 
 \begin{argtable}
@@ -763,13 +792,18 @@ Macro which typesets the clef.
 	\#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\\
+	& \texttt{1} & we must type a normal space after the clef\\
+	& \texttt{2} & we must type a short 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@boxclef}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-signs.tex}
+Macro filling \verb=\gre@box@temp@width= with a clef. The arguments are the same as \verb=gre@typeclef=.
+
+
 \macroname{\textbackslash gre@typesingleclef}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
 Macro which typesets a single clef.
 
@@ -787,16 +821,13 @@ Macro to update the box printed a the left end of every line (the one which hold
 \macroname{\textbackslash gre@useautoeolcustos}{}{gregoriotex-main.tex}
 Macro which enables automatic custos at the end of lines.
 
-\macroname{\textbackslash gre@usemanualeolcustos}{}{gregoriotex-main.tex}
-Macro which disables automatic custos at the end of lines.
-
 \macroname{\textbackslash gre@usestylecommon}{}{gregoriotex-signs.tex}
 Macro which specifies the alternate glyphs which are common to all of the styles.
 
 \macroname{\textbackslash gre@widthof}{\#1}{gregoriotex-main.tex}
 Macro for calculating the width of its argument and storing it in \verb=\gre@dimen@temp@three=.
 
-\macroname{\textbackslash gre@writebar}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
+\macroname{\textbackslash gre@writebar}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
 Macro to write a bar.
 
 \begin{argtable}
@@ -811,6 +842,8 @@ Macro to write a bar.
 	\#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)\\
+	\#5 & \texttt{0} & The notes around the bar are vertically close to the bar.\\
+	& \texttt{1} & The notes around the bar are far, \verb=@short= versions of spaces will be used.\\
 \end{argtable}
 
 \macroname{\textbackslash gre@@arg}{}{gregoriotex-syllable.tex}
@@ -837,6 +870,10 @@ Workhorse function behind \verb=\grecommentary=.
 	\#2 & string & the new commentary content\\
 \end{argtable}
 
+\macroname{\textbackslash gre@printcommentary}{}{gregoriotex-main.tex}
+Computes the true ``raise'' and prints the commentary contained in
+\verb=\gre@box@commentary=.
+
 \macroname{\textbackslash gre@atletter}{}{gregoriotex-main.tex}
 A Lua\TeX\ catcode table which makes sure that Lua\TeX\ treats `@‘ corectly.
 
@@ -855,6 +892,44 @@ Macro for raising a bug error when some calculation goes awry and comes up with
 \macroname{\textbackslash gre@changestyle}{\#1\#2[\#3]}{gregoriotex.sty \textup{and} gregoriotex.tex}
 Workhorse function behind \verb=\grechangestyle=.  Necessary because the internals of the definition are slightly different in \LaTeX\ and Plain \TeX.
 
+\macroname{\textbackslash gre@bolshiftcleftypeglobal}{}{gregoriotex-spaces.tex}
+Takes on the value \texttt{1}, \texttt{2}, or \texttt{3} depending on whether
+to calculate the beginning-of-line shift based on the largest, current, or
+forced clef width (\ie, directly use the value stored in
+\verb=\gre@dimen@clefwidth@bol=), respectively.  This is the ``global'' value,
+used to initialize \verb=\gre@bolshiftcleftypelocal= at the start of a score.
+
+\macroname{\textbackslash gre@bolshiftcleftypelocal}{}{gregoriotex-spaces.tex}
+Takes on the value \texttt{1}, \texttt{2}, or \texttt{3} depending on whether
+to calculate the beginning-of-line shift based on the largest, current, or
+forced clef width (\ie, directly use the value stored in
+\verb=\gre@dimen@clefwidth@bol=), respectively.  This is the ``local'' value,
+used in the actual computation.
+
+\macroname{\textbackslash gre@update@clefwidth@largest}{\#1}{gregoriotex-spaces.tex}
+Updates the ``largest'' clef width, used when \verb=\gre@bolshiftcleftypelocal=
+is \texttt{1}.
+
+\begin{argtable}
+	\#1 & distance & The new value to use for the ``largest'' clef width.\\
+\end{argtable}
+
+\macroname{\textbackslash gre@update@clefwidth@current}{\#1}{gregoriotex-spaces.tex}
+Updates the ``current'' clef width, used when \verb=\gre@bolshiftcleftypelocal=
+is \texttt{2}.
+
+\begin{argtable}
+	\#1 & distance & The new value to use for the ``current'' clef width.\\
+\end{argtable}
+
+\macroname{\textbackslash gre@update@clefwidth@forced}{\#1}{gregoriotex-spaces.tex}
+Updates the ``forced'' clef width, used when \verb=\gre@bolshiftcleftypelocal=
+is \texttt{3}.
+
+\begin{argtable}
+	\#1 & distance & The new value to use for the ``forced'' clef width.\\
+\end{argtable}
+
 \macroname{\textbackslash gre@calculate@bolshift}{\#1\#2}{gregoriotex-spaces.tex}
 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.
 
@@ -886,16 +961,29 @@ Macro computing the skip at the end of the syllable.
 Macro to hold the original distance which is to be scaled by \verb=\gre@changeonedimenfactor=
 
 \macroname{\textbackslash gre@debug}{}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Macro to hold the list of debug messages which should be designated as printing.
+Macro to hold the list of debug messages which should be designated as printing.  Contains comma-separated values from \Nameref{DebugCategory}, set via the \texttt{debug} package keyword parameter.
 
-\macroname{\textbackslash gre@debugmsg}{\#1\#2}{gregoriotex-main.tex}
+\macroname{\textbackslash gre@debugmsg}{\#1\#2}{gregoriotex-common.tex}
 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\\
+	\#1 & string & The category of the message (used in conjunction with \verb=\gre@debug= to determine whether to print the message or not; see \Nameref{DebugCategory}\\
 	\#2 & string & The debug message\\
 \end{argtable}
 
+\macroname{\textbackslash gre@trace}{\#1}{gregoriotex-common.tex}
+Macro to mark the beginning of a function in the log with a GreTrace message.
+
+\begin{argtable}
+	\#1 & string & name and argument list of the function being identified.
+\end{argtable}
+
+\macroname{\textbackslash gre@trace@end}{\#1}{gregoriotex-common.tex}
+Macro to mark the end of a function in the log with a GreTrace message.
+
+\macroname{\textbackslash gre@trace@prefix}{gregoriotex-common.tex}
+Macro to hold the prefix of GreTrace messages (value is manipulated to control indentation and indicate nesting).
+
 \macroname{\textbackslash gre@declarefileversion}{\#1\#2}{gregoriotex-main.tex}
 Macro which checks for version consistency between Gregorio\TeX\ files.
 
@@ -920,20 +1008,6 @@ Macro for defining the various types of horizontal episema porrectus.
 	\#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.
-\end{argtable}
-
 \macroname{\textbackslash gre@get@spaceskip}{\#1}{gregoriotex-signs.tex}
 Loads \verb=\gre@skip@temp@four= with the appropriate rubber length given the
 desired case.
@@ -988,6 +1062,9 @@ Macro which stores the first part of the next syllable (that which comes before
 \macroname{\textbackslash gre@nextmiddlesyllablepart}{}{gregoriotex-syllable.tex}
 Macro which stores the middle part of the next syllable (the part which aligns with the notes).
 
+\macroname{\textbackslash gre@fixdebug}{}{gregoriotex-common.tex}
+Fixes the raw \verb=\gre@debug= value for use with \verb=\gre@debugmsg=.
+
 \macroname{\textbackslash gre@fixedtextformat}{\#1}{gregoriotex-syllable.tex}
 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.
 
@@ -1002,13 +1079,63 @@ A macro which applies formatting that needs to apply to the whole syllable (rath
 	\#1 & string & The syllable (usually built as \verb=\gre@nextfirstsyllablepart\gre@nextmiddlesyllablepart\gre@nextendsyllablepart=\\
 \end{argtable}
 
+\macroname{\textbackslash gre@if@rewritesyllable}{\#1\#2}{gregoriotex-syllable.tex}
+Performs \#1 if the syllable should be rewritten, else \#2.
+
+\begin{argtable}
+	\#1 & \TeX\ code & Code to perform when rewriting the syllable\\
+	\#2 & \TeX\ code & Code to perform when \emph{not} rewriting the syllable\\
+\end{argtable}
+
+\macroname{\textbackslash gre@save@endsyllablepart}{}{gregoriotex-syllable.tex}
+Control sequence aliased to the carry-over syllable part to be moved to the next syllable.
+
+\macroname{\textbackslash gre@save@fixedtextformat}{\#1}{gregoriotex-syllable.tex}
+Control sequence aliased to the fixed text format for the carry-over syllable part to be moved to the next syllable.
+
+\begin{argtable}
+	\#1 & string & The carry-over syllable part, as with \verb=\gre@fixednexttextformat=\\
+\end{argtable}
+
+\macroname{\textbackslash gre@save@pointandclick}{}{gregoriotex-syllable.tex}
+Control sequence aliased to the line:char:column of the point-and-click link for the carry-over syllable part to be moved to the next syllable\\
+
+\macroname{\textbackslash gre@push@endsyllable}{\#1}{gregoriotex-syllable.tex}
+Sets the save aliases to push the end-syllable part of the current syllable to the next syllable if necessary.
+
+\begin{argtable}
+	\#1 & link target & line:char:column for the link to use for the pushed syllable part\\
+\end{argtable}
+
+\macroname{\textbackslash gre@emit@syllabletext}{\#1}{gregoriotex-syllable.tex}
+Emits the text for the syllable, prepending the carry-over syllable part if necessary and consolidating the fixed text styles if possible.
+
+\begin{argtable}
+	\#1 & \TeX\ code & Code that emits the syllable text\\
+\end{argtable}
+
+\macroname{\textbackslash gre@emit@endsyllablepart}{}{gregoriotex-syllable.tex}
+Emits the text for the end syllable part if it \emph{is not} to be moved to the next syllable.
+
+\macroname{\textbackslash gre@emit@endsyllablepartfornextsyllable}{}{gregoriotex-syllable.tex}
+Emits the text for the end syllable part if it \emph{is} to be moved to the next syllable.  This is used when projecting the next syllable text while processing some syllable.
+
+\macroname{\textbackslash gre@syllable@args}{}{gregoriotex-syllable.tex}
+Saves the arguments to \verb=\GreSyllable=.  Needed so that \verb=\GreSyllable= can look forward to see if the next token is \verb=\GreBarSyllable=.
+
+\macroname{\textbackslash gre@syllable@expand}{}{gregoriotex-syllable.tex}
+Calls \verb=\gre@syllable@act=, passing the arguments saved in \verb=gre@syllable@args=.  Needed so that \verb=\GreSyllable= can look forward to see if the next token is \verb=\GreBarSyllable=.
+
+\macroname{\textbackslash gre@syllable@act}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-syllable.tex}
+Typesets the syllable.  Same arguments as \verb=\GreSyllable=.  See the description of that macro for more information.  Needed so that \verb=\GreSyllable= can look forward to see if the next token is \verb=\GreBarSyllable=.
+
 \macroname{\textbackslash gre@gabcname}{}{gregoriotex-main.tex}
 Macro which holds the point-and-click file name.
 
 \macroname{\textbackslash gre@gregoriotexluaversion}{}{gregoriotex-main.tex}
 Macro to hold the version number of \emph{gregoriotex.lua} so that it can be checked for consistency.
 
-\macroname{\textbackslash gre@gregorioversion}{}{gregoriotex-main.tex}
+\macroname{\textbackslash gre@gregoriotexversion}{}{gregoriotex-main.tex}
 Macro to hold the version number of Gregorio\TeX\ so that it can be checked for consistency.
 
 \macroname{\textbackslash gre@leftfill}{}{gregoriotex-main.tex}
@@ -1068,6 +1195,25 @@ 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@pitch@cleftop}{}{gregoriotex-spaces.tex}
+The pitch of the highest point of the current clef.
+
+\macroname{\textbackslash gre@pitch@clefbottom}{}{gregoriotex-spaces.tex}
+The pitch of the lowest point of the current clef.
+
+\macroname{\textbackslash gre@saveclefextrema}{\#1\#2}{gregoriotex-signs.tex}
+Computes the pitches of the lowest and highest points of a clef and saves them
+into \verb=\gre@pitch@cleftop= and \verb=\gre@pitch@clefbottom=.
+
+\begin{argtable}
+	\#1 & integer & the line of the primary clef (1 is the bottom line)\\
+	\#2 & integer & the line of the secondary clef (1 is the bottom line, 0 means
+									no secondary clef)\\
+\end{argtable}
+
 \macroname{\textbackslash gre@pointandclick}{\#1\#2}{gregoriotex-main.tex}
 Macro to generate the point-and-click links.
 
@@ -1077,7 +1223,10 @@ Macro to generate the point-and-click links.
 \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.
@@ -1132,7 +1281,17 @@ 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@changedimforline}{\#1\#2\#3}{gregoriotex-spaces.tex}
+Saves the current value of the dimension and then changes it.  The arguments
+are the same as \verb=\grechangedim=.  Used to temporarily change the dimension
+for a given line, which is restored at the next beginning of the next line.
+
+\macroname{\textbackslash gre@changecountforline}{\#1\#2}{gregoriotex-spaces.tex}
+Saves the current value of the count and then changes it.  The arguments
+are the same as \verb=\grechangeocount=.  Used to temporarily change the count
+for a given line, which is restored at the next beginning of the next line.
 
 \macroname{\textbackslash gre@setstafflines}{\#1}{gregoriotex-main.tex}
 Sets the number of staff lines.
@@ -1158,12 +1317,16 @@ Typesets its numeric argument as a lower-case Roman numeral.
 	\#1 & integer & The number to typeset\\
 \end{argtable}
 
-\macroname{\textbackslash gre@bar@space@suffix}{\#1\#2}{gregoriotex-symbols.tex}
+\macroname{\textbackslash gre@bar@space@suffix}{\#1\#2\#3}{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}\\
+	& \texttt{1} emits \verb=@standalone=\\
+	\#2 & \texttt{0} & emits \verb=@notext= (only if standalone)\\
+	& \texttt{1} emits \verb=@text= (only if standalone)\\
+	\#3 & \texttt{0} & emits nothing\\
+	& \texttt{1} emits \verb=@short=\\
 \end{argtable}
 
 \macroname{\textbackslash gre@drawadditionalline}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
@@ -1207,7 +1370,7 @@ Macro for calculating the position of the elements of a bar syllable using the n
 \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}\\
+	\#2 & integer & alignment type of the first glyph in the next syllable.  See \Nameref{notesalign}\\
 \end{argtable}
 
 \macroname{\textbackslash gre@newlinearg}{}{gregoriotex-syllable.tex}
@@ -1234,6 +1397,47 @@ Macro to typeset a punctum mora.
 	& 0 & other cases\\
 \end{argtable}
 
+\macroname{\textbackslash gre@changecavumhole}{\#1[\#2][\#3]}{gregoriotex-main.tex}
+Macro used by \verb=\grechangecavumglyph= to handle the optional arguments.
+
+\macroname{\textbackslash gre@alterationadjustment}{\#1}{gregoriotex-spaces.tex}
+Macro to make adjustments to \verb=nextbegindifference= in order to account for an alteration at the begining of the next syllable.
+
+\macroname{\textbackslash gre@punctummoraadjustment}{}{gregoriotex-spaces.tex}
+Macro to make adjustments to cursor position and \verb=previousenddifference= based on the presence of a punctum mora at the end of the last syllable.
+
+\macroname{\textbackslash gre@num@min}{\#1\#2}{gregoriotex-spaces.tex}
+Puts the lower of its two integer arguments into \verb=\gre@count@temp@one=.
+
+\begin{argtable}
+	\#1 & integer & the first value to compare\\
+	\#2 & integer & the second value to compare\\
+\end{argtable}
+
+\macroname{\textbackslash gre@num@max}{\#1\#2}{gregoriotex-spaces.tex}
+Puts the greater of its two integer arguments into \verb=\gre@count@temp@one=.
+
+\begin{argtable}
+	\#1 & integer & the first value to compare\\
+	\#2 & integer & the second value to compare\\
+\end{argtable}
+
+\macroname{\textbackslash gre@evaluatenextsyllable}{\#1}{gregoriotex-syllable.tex}
+Evaluates its first argument as an advance computation against the next syllable.  Twiddles the \verb=ifgre@evaluatingnextsyllable= flag around evaluation of the macro argument.
+
+\macroname{\textbackslash gre@save@additionalspaces}{}{gregoriotex-spaces.tex}
+Macro to save the additional vertical spaces associated with the line (\texttt{additionalbottomspace}, \texttt{additionaltopspace}, \texttt{additionaltopspacealt}, \texttt{additionaltopspacenabc}, \texttt{currenttranslationheight}, \texttt{textlower}, \texttt{currentabovelinestextheight}, and \texttt{constantglyphraise}) so that they can be restored later.
+
+\macroname{\textbackslash gre@restore@additionalspaces}{}{gregoriotex-spaces.tex}
+Macro to restore the additional vertical spaces associated with the line from their saved values.
+
+\macroname{\textbackslash gre@clearsyllable}{\#1}{gregoriotex-spaces.tex}
+Prevents the current syllable from overlapping with the previous syllable.
+
+\begin{argtable}
+	\#1 & bar  & the current syllable is a bar syllable.\\
+			& note & the current syllable is a note syllable.\\
+\end{argtable}
 
 \subsection{Auxiliary File}
 Gregorio\TeX\ creates its own auxiliary file (extension \texttt{gaux}) which it uses to store information between successive typesetting runs.  This allows for such features as the dynamic interline spacing.  The following functions are used to interact with that auxiliary file.
@@ -1261,6 +1465,12 @@ Gregorio\TeX\ loads a number of fonts which are referred to by the following mac
 \macroname{\textbackslash gre@font@music}{}{gregoriotex-main.tex}
 The font for the neumes and other principle score elements.
 
+\macroname{\textbackslash gre@font@music@hollow}{}{gregoriotex-main.tex}
+The font for cavum neumes.
+
+\macroname{\textbackslash gre@font@music@hole}{}{gregoriotex-main.tex}
+The font for cavum neume holes.
+
 \macroname{\textbackslash gre@font@style}{}{gregoriotex-main.tex}
 The font for some of the extra characters, such as the bar for barred letters.
 
@@ -1298,18 +1508,6 @@ The sharp character.
 \macroname{\textbackslash gre@fontchar@sharphole}{}{gregoriotex-chars.tex}
 The sharp hole character (\ie, the character needed to prevent lines from showing through the center of the sharp).
 
-\macroname{\textbackslash gre@fontchar@punctumcavum}{}{gregoriotex-signs.tex}
-The punctum cavum character.
-
-\macroname{\textbackslash gre@fontchar@punctumcavumhole}{}{gregoriotex-signs.tex}
-The punctum cavum hole character (\ie, the character needed to prevent lines from showing through the center of the punctum cavum).
-
-\macroname{\textbackslash gre@fontchar@lineapunctumcavum}{}{gregoriotex-signs.tex}
-The linea punctum cavum character.
-
-\macroname{\textbackslash gre@fontchar@lineapunctumcavumhole}{}{gregoriotex-signs.tex}
-The linea punctum cavum hole character (\ie, the character needed to prevent lines from showing through the center of the linea punctum cavum).
-
 \macroname{\textbackslash gre@fontchar@incclef}{}{gregoriotex-chars.tex}
 The \texttt{c}-clef which appears in the middle of a line.
 
@@ -1396,6 +1594,14 @@ A fused character consisting of a leading quilisma (of ambitus two) and a regula
 \macroname{\textbackslash gre@char@he@...}{\#1}{gregoriotex-chars.tex}
 A class of macros for the horizontal episema which populates the \verb=\gre@box@hep= box.
 
+\macroname{\textbackslash gre@nabccharno}{\#1\#2\#3}{gregoriotex-nabc.tex}
+Prints the nabc glyphs for the given nabc string.
+
+\begin{argtable}
+	\#1 & string & nabc code representing the character\\
+	\#2 & string & name of nabc font to use\\
+	\#3 & integer & scaling factor\\
+\end{argtable}
 
 
 \subsection{Flags}
@@ -1476,6 +1682,9 @@ Boolean to mark the last syllable of the score.
 \macroname{\textbackslash ifgre@firstglyph}{}{gregoriotex-syllable.tex}
 Boolean that tells us if the current glyph is the first glyph or not.
 
+\macroname{\textbackslash ifgre@rewritesyllables}{}{gregoriotex-syllable.tex}
+Boolean that enables moving the last part of a syllable to the next if there is no hyphen.
+
 \macroname{\textbackslash gre@attr@dash}{}{gregoriotex-main.tex}
 A Lua\TeX\ attribute which indicates whether a syllable takes a dash if it ends a line.
 
@@ -1491,6 +1700,9 @@ A Lua\TeX\ attribute which identifies the high point of the glyph.  Used for dyn
 \macroname{\textbackslash gre@attr@glyph@bottom}{}{gregoriotex-main.tex}
 A Lua\TeX\ attribute which identifies the low point of the glyph.  Used for dynamic line spacing.
 
+\macroname{\textbackslash gre@attr@syllable@id}{}{gregoriotex-main.tex}
+A Lua\TeX\ attribute which identifies one syllable from the next.  Used to position the text after the center of a syllable on the next syllable if the text flows properly, in order to improve ligaturing.
+
 \macroname{\textbackslash gre@clivisalignment}{}{gregoriotex-syllable.tex}
 Count to indicate how the clivis is to be aligned with its respective syllable text.  Values: \texttt{0}) always align clivis on its center; \texttt{1}) align clivis on first punctum; \texttt{2}) align clivis on its center, except if notes would go left of text or consonants after vowels are larger than \verb=\gre@dimen@clivisalignmentmin=.
 
@@ -1524,6 +1736,9 @@ Boolean which specifies whether ledger line heuristics will be used or not.
 \macroname{\textbackslash ifgre@usestylefont}{}{gregoriotex-main.tex}
 Boolean which specifies whether the style font should be loaded or not.
 
+\macroname{\textbackslash ifgre@loadholehollowfonts}{}{gregoriotex-main.tex}
+Boolean which specifies whether the hole and hollow fonts should be loaded or not.
+
 \macroname{\textbackslash ifgre@keeprightbox}{}{gregoriotex-signs.tex}
 Boolean which specifies if we have to keep the localrightbox until the end.
 
@@ -1539,11 +1754,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.
@@ -1637,6 +1858,44 @@ 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@nabcvoice@i@visible}{}{gregoriotex-nabc.tex}
+Boolean indicating whether the first nabc voice should be shown.
+
+\macroname{\textbackslash ifgre@showlyrics}{}{gregoriotex-syllable.tex}
+Boolean indicating whether the lyrics should be shown.
+
+\macroname{\textbackslash gre@initiallines}{}{gregoriotex-syllable.tex}
+Number of lines the initial takes up.  Currently limited to 0, 1, or 2.  Not currently a count, but will be changed to one in 5.0.
+
+\macroname{\textbackslash ifgre@rewritethissyllable}{}{gregoriotex-syllable.tex}
+Boolean indicating that a syllable should be rewritten to improve ligature rendering.
+
+\macroname{\textbackslash ifgre@textcleared}{}{gregoriotex-syllable.tex}
+Boolean indicating that the text of this syllable should not overlap any previous syllable.
+
+\macroname{\textbackslash ifgre@evaluatingnextsyllable}{}{gregoriotex-syllable.tex}
+Boolean indicating that some aspect of the next syllable is being evaluated in advance.
 
 \subsection{Boxes}
 
@@ -1686,10 +1945,11 @@ Box holding the horizontal episema.
 
 
 \subsection{Protrusion factors}
-Protrusion factors are counts representing a protrusion factor over 100.
 
-\macroname{\textbackslash gre@count@protrusion@hyphen@eol}{}{gregoriotex-spaces.tex}
-Protrusion factor applied to hyphens at end of lines.
+
+\macroname{\textbackslash gre@protrusionfactor@...}{}{gregoriotex-spaces.tex}
+Macros that store the protrusion factors created by
+\verb=\gresetprotrusionfactor=.
 
 
 \subsection{Distances}
@@ -1701,12 +1961,22 @@ second is the name of the distance.
 
 These additional distances are calculated by Gregorio based on the values for the user customizable distances and what may be going on in the score at the time of their use.
 
+In some cases it is necessary to temporarily manipulate some of these distances for the purpose of some particular operation and then restore them to their previous values.  In that case the distance will have a \verb=\gre@saved@...= register associated with it (\eg \verb=\gre@dimen@constantglyphraise= is saved to and restored from \verb=\gre@saved@dimen@constantglyphraise=).
+
+We also have save registries for \verb=\baselineskip=, \verb=\lineskip=, \verb=\lineskiplimit=, \verb=\parskip=, and \verb=\parfillskip= so that we can modify the way line breaking decisions are handled inside a score without affecting the rest of the document.
+
 \macroname{\textbackslash gre@dimen@morawidth}{}{gregoriotex-spaces.tex}
 Width of a punctum mora (reinitialized at each score, lazily recomputed).
 
-\macroname{\textbackslash gre@dimen@clefwidth}{}{gregoriotex-spaces.tex}
+\macroname{\textbackslash gre@dimen@clefwidth@current}{}{gregoriotex-spaces.tex}
 Width of the current clef.
 
+\macroname{\textbackslash gre@dimen@clefwidth@largest}{}{gregoriotex-spaces.tex}
+Width of the largest clef in the score.
+
+\macroname{\textbackslash gre@dimen@clefwidth@bol}{}{gregoriotex-spaces.tex}
+Width of the clef used to compute bolshift.
+
 \macroname{\textbackslash gre@dimen@constantglyphraise}{}{gregoriotex-spaces.tex}
 Dimension representing the space between the 0 of the gregorian fonts and the effective 0 of the TeX score.
 
@@ -1729,6 +1999,9 @@ Dimension representing extra space above the staff needed for high notes.
 \macroname{\textbackslash gre@dimen@additionaltopspacealt}{}{gregoriotex-spaces.tex}
 Dimension representing extra space above the staff needed for above lines text.
 
+\macroname{\textbackslash gre@dimen@additionaltopspacenabc}{}{gregoriotex-spaces.tex}
+Dimension representing extra space above the staff needed for nabc notation.
+
 \macroname{\textbackslash gre@dimen@textlower}{}{gregoriotex-spaces.tex}
 Dimension representing the height of the separation between the 0th
 line (which is invisible except for notes in the a or b position) and
@@ -1778,6 +2051,9 @@ Stored value of enddifference prior to the current one after adjusting for the p
 \macroname{\textbackslash gre@skip@nextbegindifference}{}{gregoriotex-spaces.tex}
 The difference between the start of the notes and the start of the text for the next syllable.  Positive when when text begins first, negative in other case.
 
+\macroname{\textbackslash gre@skip@adjustednextbegindifference}{}{gregoriotex-spaces.tex}
+Only used in new bar spacing algorithm. It is \verb=grebegindifference= adjusted with \verb=alterationadjustmentbar= if relevant.
+
 \macroname{\textbackslash gre@dimen@begindifference}{}{gregoriotex-spaces.tex}
 The difference between the start of the notes and the start of the text for the current syllable.  Positive when when text begins first, negative in other case.  This means that \verb=\kern\gre@dimen@begindifference= will take you from the start of the notes to the start of the text.
 
@@ -1795,9 +2071,6 @@ Temporary dimensions used in calculations.  There are currently five of these.
 \macroname{\textbackslash gre@skip@temp@...}{}{gregoriotex-spaces.tex}
 Temporary skips used in calculations.  There are currently four of these.
 
-\macroname{\textbackslash gre@dimen@savedglyphraise}{}{gregoriotex-signs.tex}
-Macro to hold the value of the glyph raise so that it can be restored after some calculations which may change it are performed.
-
 \macroname{\textbackslash gre@dimen@eolshift}{}{gregoriotex-spaces.tex}
 The left kern that should appear before an end of line.
 
@@ -1831,9 +2104,6 @@ Minimum shift required for the text.
 \macroname{\textbackslash gre@skip@minShiftNotes}{}{gregoriotex-spaces.tex}
 Minimum shift required for the notes.
 
-\macroname{\textbackslash gre@save@parfillskip}{}{gregoriotex-main.tex}
-Macro to store \verb=\parfillskip= value so that we can restore it at the end of the score (needed to force the last line of a score to be justified).
-
 \macroname{\textbackslash gre@scaledist}{}{gregoriotex-spaces.tex}
 Working alias for \verb=\gre@skip@temp@one= or \verb=\gre@dimen@temp@one=, as appropriate, used when rescaling a distance due to a change in \verb=\gre@factor=.
 
@@ -1866,7 +2136,11 @@ Space required by the text in the new bar spacing algorithm.
 Skip after the most recent bar.
 
 \macroname{\textbackslash gre@skip@punctummorashift}{}{gregoriotex-spaces.tex}
-Displacement of whole syllable to account for the presence of a punctum mora at the end of the previous syllable
+Displacement of whole syllable to account for the presence of a punctum mora at the end of the previous syllable.
+
+\macroname{\textbackslash gre@skip@alterationshift}{}{gregoriotex-spaces.tex}
+Displacement of whole syllable to account for the presence of an alteration at the beginning of the next syllable.
+
 
 
 \subsection{Penalties}
@@ -1951,6 +2225,38 @@ A place to save the current value of the tolerance so that we can change it temp
 A place to save the current value of the pretolerance so that we can change it temporarily and then restore it later.
 
 
+\subsection{Backwards compatibility}
+Depending on version of Lua\TeX / \LaTeX, some primitives have different names
+We define the following local aliases to account for this eventuality.
+
+\macroname{\textbackslash gre@localleftbox}{}{gregoriotex-main.tex}
+Current primitive: \verb=\localleftbox=
+Legacy primitive: \verb=\luatexlocalleftbox=
+
+\macroname{\textbackslash gre@localrightbox}{}{gregoriotex-main.tex}
+Current primitive: \verb=\localrightbox=
+Legacy primitive: \verb=\luatexlocalrightbox=
+
+\macroname{\textbackslash gre@startlink}{}{gregoriotex-main.tex}
+Current primitive: \verb=\pdfextension startlink=
+Legacy primitive: \verb=\pdfstartlink=
+
+\macroname{\textbackslash gre@endlink}{}{gregoriotex-main.tex}
+Current primitive: \verb=\pdfextension endlink=
+Legacy primitive: \verb=\pdfendlink=
+
+\macroname{\textbackslash gre@savepos}{}{gregoriotex-main.tex}
+Current primitive: \verb=\savepos=
+Legacy primitive: \verb=\pdfsavepos=
+
+\macroname{\textbackslash gre@lastxpos}{}{gregoriotex-main.tex}
+Current primitive: \verb=\lastxpos=
+Legacy primitive: \verb=\pdflastxpos=
+
+\macroname{\textbackslash gre@lastypos}{}{gregoriotex-main.tex}
+Current primitive: \verb=\lastypos=
+Legacy primitive: \verb=\pdflastypos=
+
 
 \subsection{\LaTeX/Plain \TeX\ compatibility}
 While every effort has been made to use only primitives which are compatible with both \LaTeX\ and Plain \TeX, it is sometimes necessary to use primitives which are defined for one but not the other (usually its \LaTeX\ that has what we need built in).  In these cases we have to provide an equivalent macro to the \TeX\ version which is lacking.
@@ -1995,7 +2301,7 @@ rather than have multiple definitions.
 	\texttt{16} & no note
  \end{tabulary}
 
-\subsection{Episema Special}\label{EpisemaSpecial}
+\subsection{Note Offset Specifier}\label{NoteOffset}
 \definecolor{shadecolor}{named}{lightgray}%
 \begin{shaded*}%
 \vspace{-1.4\baselineskip}
@@ -2063,6 +2369,39 @@ rather than have multiple definitions.
 \end{description}
 \end{shaded*}
 
+\subsection{Debug Category}\label{DebugCategory}
+\definecolor{shadecolor}{named}{lightgray}%
+\begin{shaded*}%
+\vspace{-1.4\baselineskip}
+\begin{center}String with the following possibilities:\end{center}
+\vspace{-0.8\baselineskip}
+\hrule
+\vspace{-0.8\baselineskip}
+\begin{description}
+	\item[annotation] Annotation-related (text above the score initial) messages.
+	\item[barspacing] Bar spacing computations.
+	\item[bolshift] Beginning-of-line shift computations.
+	\item[clear] Syllable clearing messages.  Generated when handling the \texttt{<clear>} gabc directive.
+	\item[changeglyph] Glyph changes.  Generated when glyph substitutions are made.
+	\item[commentary] Commentary-related messages.
+	\item[compile] Auto-compile messages.  Generating when handing \verb=\gregorioscore=
+	\item[custos] Custos-related messages.  Generating when computing and handling custodes.
+	\item[eolshift] End-of-line shift computations.
+	\item[general] Non-specific messages.
+	\item[hyphen] Hyphen-related messages.  Generated when computing and handling automatic hyphens.
+	\item[ifdim] Dimension comparisons.
+	\item[initial] Score-initial-related messages.
+	\item[lineheight] Line height events.  Generated when line heights are computed or exercised.
+	\item[linesglue] Messages about line glue.  Generated during line break processing in Lua.
+	\item[mapfont] Font mapping messages.  Generated when analyzing score fonts.
+	\item[offsetcase] Offset case messages.  Generated when the offset cases (for \Nameref{NoteOffset}) are generated in Lua.
+	\item[spacing] Random spacing-related messages.
+	\item[syllablerewriting] Syllable rewrite messages.  Generated when rewriting syllables for better kerning and ligaturing.
+	\item[syllablespacing] Syllable spacing computations.
+	\item[trace] Messages to trace the calling of functions.
+\end{description}
+\end{shaded*}
+
 %%% Local Variables:
 %%% mode: latex
 %%% TeX-master: “GregorioRef”
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex b/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex
index a3680cd715b..0054aa102b6 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/Gabc.tex
@@ -1,7 +1,7 @@
 % !TEX root = GregorioRef.tex
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -69,7 +69,8 @@ Some headers have special meaning to Gregorio:
 	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/>;
+		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]
@@ -84,7 +85,7 @@ Some headers have special meaning to Gregorio:
 	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 There is a \verb=\greannotation= defined immediately 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
@@ -181,6 +182,15 @@ Some examples:
 	{\scriptsize\verb=t. irregularis=} & & & \writemode{t. irregularis}{}{} \\
 \end{tabularx}
 
+\subsection{General Syntax}
+
+\subsection{Note Syntax}
+
+\verb=[nocustos]= will prevent a custos from appearing at the point where
+specified, if line formatting causes a line break there.  The \verb=[nocustos]=
+tag must appear \emph{before} spaces appearing at the point specified or it will
+have no effect.
+
 \subsection{Neume Fusion}
 
 Neume fusion allows for the composition of new shapes based on a set of
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf
index 8eb60496aa1..1bc18a0099f 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.pdf
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
index 6b69c7ef28f..3c645e02d80 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioNabcRef.tex
@@ -1,6 +1,6 @@
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -23,6 +23,7 @@
 \usepackage{fontspec}
 \usepackage{luacode}
 \usepackage{multicol}
+\usepackage{multirow}
 \usepackage{fixltx2e}
 \usepackage{hyperref}
 \usepackage{color}
@@ -59,9 +60,30 @@
 			\end{list}%
 		\endgroup%
 
+		\vspace{1cm}
+		\begingroup%
+			\greannotation{\scriptsize{CO}}
+			\greannotation{\scriptsize{II}}
+			\gresetnabcfont{grelaon}{8}
+			\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]{omnes}}}}%
+			\end{list}%
+		\endgroup%
+
 \vfill
 \pagebreak
 
+\gresetnabcfont{grelaon}{8}
 \gresetnabcfont{gresgmodern}{8}
 \gresetnabcfont{gregall}{8}
 
@@ -105,12 +127,26 @@
 	\endgroup %
 }
 
+\def\lneume{%
+	\begingroup %
+		\catcode`\~=12{}%
+		\catcode`\@=11{}%
+		\lneumebody%
+}
+
+\def\lneumebody#1{%
+		\font\grefontnabc={name:grelaon} at 6pt\grefontnabc\begin{gre@style@nabc}%
+		\directlua{tex.sprint(gregoriotex.nabc_font_tables["grelaon"]["\luatexluaescapestring{#1}"] or "")}%
+		\end{gre@style@nabc}%
+	\endgroup %
+}
+
 {
 \setlength\parindent{0cm}
 
 The \texttt{nabc} language provides the ability to describe some adiastematic neumes, for
-now just the St.\ Gallen style.  The language is partially based on Dom
-Eugène Cardine's Table of neumatic signs, but for more complex neumes
+now just the St.\ Gallen and Laon (Metz notation family) style.  The language is partially
+based on Dom Eugène Cardine's Table of neumatic signs, but for more complex neumes
 doesn't always match how the neumes are called; instead attempts to make it
 easier to compose complex neumes from basic glyphs.  To describe
 adiastematic neumes in \texttt{gabc}, the header should contain
@@ -164,6 +200,10 @@ Each \textit{glyph descriptor} consists of a \textit{basic glyph descriptor},
 followed by optional \textit{glyph modifiers}, followed by optional
 \textit{pitch descriptor}.
 
+The following description is for the St. Gall family of neumes,
+when using the gregall or gresgmodern fonts.  For details on Laon (Metz
+notation family) neumes see \pageref{nabclaon}.
+
 The \textit{basic glyph descriptor} is a two-letter string from the
 following table:
 \begin{multicols}{5}
@@ -205,7 +245,7 @@ characters optionally followed by a number:
 	\item \texttt{M} melodic modification
 	\item \texttt{-} addition of episema
 	\item \texttt{>} augmentive liquescence
-	\item ~~\texttt{\~} diminutive liquescence
+	\item \texttt{\textasciitilde} 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
@@ -217,8 +257,8 @@ variant.
 The \textit{pitch descriptor} allows to specify the vertical position of the
 neume.  There are no staves, so the vertical position is only rough.  For
 pitches the same letters as in \texttt{gabc} are used, \texttt{a} through
-\texttt{m}.  If the \textit{pitch descriptor} is missing, the default is
-\texttt{hf}, otherwise it consists of the letter \texttt{h} followed by
+\texttt{n} and \texttt{p}.  If the \textit{pitch descriptor} is missing, the default
+is \texttt{hf}, otherwise it consists of the letter \texttt{h} followed by
 the pitch letter.  Within the \textit{complex glyph descriptor}, each
 \textit{basic glyph descriptor} has its own pitch, but in the current fonts
 there are no glyphs with different relative pitches, so if you use a
@@ -304,6 +344,7 @@ by the above mentioned position digit:
 \texttt{lspar} \sneume{lspar} paratim\\
 \texttt{lspfec} \sneume{lspfec} perfecte\\
 \texttt{lspm} \sneume{lspm} parvum mediocriter\\
+\texttt{lspulcre} \sneume{lspulcre} pulcre\\
 \texttt{lss} \sneume{lss} sursum\\
 \texttt{lssb} \sneume{lssb} sursum bene\\
 \texttt{lssc} \sneume{lssc} sursum celeriter\\
@@ -348,6 +389,109 @@ tractulis.
 
 \texttt{ql>ppu3} \GreNABCChar{ql>ppu3} is a 3 loop liquescent quilisma
 with 3 tractulis with episema before it.
+
+\vfill
+\pagebreak
+
+\label{nabclaon}
+The \textit{basic glyph descriptor} for Laon neumes is very similar to the
+one used for St. Gall neumes, but with uncinus and oriscus-clivis added and
+stropha, 2 loops quilisma and gravis removed:
+\begin{multicols}{4}
+\texttt{un} \lneume{un} uncinus\\
+\texttt{vi} \lneume{vi} virga\\
+\texttt{pu} \lneume{pu} punctum\\
+\texttt{ta} \lneume{ta} tractulus\\
+\texttt{gr} \lneume{gr} gravis\\
+\texttt{cl} \lneume{cl} clivis\\
+\texttt{oc} \lneume{oc} oriscus-clivis\\
+\texttt{pe} \lneume{pe} pes\\
+\texttt{po} \lneume{po} porrectus\\
+\texttt{to} \lneume{to} torculus\\
+\texttt{ci} \lneume{ci} climacus\\
+\texttt{sc} \lneume{sc} scandicus\\
+\texttt{pf} \lneume{pf} porrectus flexus\\
+\texttt{sf} \lneume{sf} scandicus flexus\\
+\texttt{tr} \lneume{tr} torculus resupinus\\
+\texttt{ds} \lneume{ds} distropha\\
+\texttt{ts} \lneume{ts} tristropha\\
+\texttt{tg} \lneume{tg} trigonus\\
+\texttt{bv} \lneume{bv} bivirga\\
+\texttt{tv} \lneume{tv} trivirga\\
+\texttt{pr} \lneume{pr} pressus maior\\
+\texttt{pi} \lneume{pi} pressus minor\\
+\texttt{vs} \lneume{vs} virga strata\\
+\texttt{or} \lneume{or} oriscus\\
+\texttt{sa} \lneume{sa} scandicus\\
+\texttt{pq} \lneume{pq} pes quassus\\
+\texttt{ql} \lneume{ql} quilisma\\
+\texttt{pt} \lneume{pt1} pes stratus
+\end{multicols}
+
+The \textit{subpunctis and prepunctis descriptor} consists of the letters
+\texttt{su} for subpunctis or \texttt{pp} for prepunctis, followed
+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{n} \lneume{un} uncinus
+	\item \texttt{q} \lneume{ql} quilisma
+	\item \texttt{z} \lneume{vi} virga
+	\item \texttt{x} \lneume{vi>} cephalicus
+\end{itemize}
+
+The \textit{significant letter descriptor} for Laon neumes allows another
+position, \texttt{5}, which stands for inside the neume.  The exact position
+of the letter depends on the glyph, if there is no glyph with the neume
+inside of it, it can't be positioned inside the neume.
+
+The shorthands, including the \texttt{ls} prefix, which should be followed
+by the above mentioned position digit for Laon neumes are:
+\begin{multicols}{2}
+\texttt{lsa} \lneume{lsa} augete\\
+\texttt{lsc} \lneume{lsc} celeriter\\
+\texttt{lseq} \lneume{lseq} equaliter\\
+\texttt{lseq-} \lneume{lseq-} equaliter\\
+\texttt{lsequ} \lneume{lsequ} equaliter\\
+\texttt{lsf} \lneume{lsf} fastigium\\
+\texttt{lsh} \lneume{lsh} humiliter\\
+\texttt{lshn} \lneume{lshn} humiliter nectum\\
+\texttt{lshp} \lneume{lshp} humiliter parum\\
+\texttt{lsl} \lneume{lsl} levare\\
+\texttt{lsn} \lneume{lsn} non (tenere), negare, nectum, naturaliter\\
+\texttt{lsnl} \lneume{lsnl} non levare\\
+\texttt{lsnt} \lneume{lsnt} non tenere\\
+\texttt{lsm} \lneume{lsm} mediocriter\\
+\texttt{lsmd} \lneume{lsmd} mediocriter\\
+\texttt{lss} \lneume{lss} sursum\\
+\texttt{lssimp} \lneume{lssimp} simpliciter\\
+\texttt{lssimpl} \lneume{lssimpl} simpliciter\\
+\texttt{lssp} \lneume{lssp} sursum parum\\
+\texttt{lsst} \lneume{lsst} sursum tenere\\
+\texttt{lst} \lneume{lst} tenere\\
+\texttt{lsth} \lneume{lsth} tenere humiliter
+\end{multicols}
+
+For the Tironian notes the form of the \textit{significant letter descriptor}
+starts with the \texttt{lt} prefix followed by letters from the following
+list, followed by above mentioned position digit (\texttt{5} can't be used):
+\begin{multicols}{2}
+\texttt{lti} \lneume{lti} iusum\\
+\texttt{ltdo} \lneume{ltdo} deorsum\\
+\texttt{ltdr} \lneume{ltdr} devertit\\
+\texttt{ltdx} \lneume{ltdx} devexum\\
+\texttt{ltps} \lneume{ltps} prode sub eam (trade subtus)\\
+\texttt{ltqm} \lneume{ltqm} quam mox\\
+\texttt{ltsb} \lneume{ltsb} sub\\
+\texttt{ltse} \lneume{ltse} seorsum\\
+\texttt{ltsj} \lneume{ltsj} subjice\\
+\texttt{ltsl} \lneume{ltsl} saltim\\
+\texttt{ltsn} \lneume{ltsn} sonare\\
+\texttt{ltsp} \lneume{ltsp} supra\\
+\texttt{ltsr} \lneume{ltsr} sursum\\
+\texttt{ltst} \lneume{ltst} saltate (salte)\\
+\texttt{ltus} \lneume{ltus} ut supra
+\end{multicols}
 }
 
 \vfill
@@ -402,6 +546,53 @@ Table from Cardine's Gregorian Semiology, pp.\ 12-13 with nabc strings and grega
 \vfill
 \pagebreak
 
+\gresetnabcfont{grelaon}{8}
+
+{
+\noindent\footnotesize
+\begin{tabular}{|l|l|l|l|l|l|l|l|l|}
+\hline
+Name of & Simple & \multicolumn{3}{c|}{Symbols differentiated by} & \multicolumn{3}{c|}{Symbols indicating} \\
+Symbols & Symbols & \multicolumn{3}{c|}{} & \multicolumn{3}{c|}{a special meaning} \\ \hline
+& & \multicolumn{2}{c|}{the modification} & the addition & melodic & \multicolumn{2}{c|}{phonetic} \\ \cline{3-4}\cline{6-8}
+& & of the mark & of the grouping & of letters & & \multicolumn{2}{c|}{Liquescence} \\ \cline{7-8}
+& & & (neumatic break) & & & augment. & diminut. \\ \cline{3-5}\cline{7-8}
+uncinus & \neume{un} & & & & & & \\
+punctum & \neume{pu} & & & & & & \\
+virga & \neume{vi} & \neume{viS} \neume{vipp2su2vihh} & & & & \neume{vi>1} & \\
+tractulus & \neume{ta} & \neume{ds} \neume{ts} & & \neume{talst2} \neume{tslsc2lst2} & & \neume{ta>2} & \\
+clivis & \neume{cl} & & \neume{clG} & \neume{cllsn9} \neume{cllst9} \neume{clGlsa5} & \neume{clG1} \neume{clM} & \neume{cl>} \neume{cl>1} & \neume{vi>} \neume{ta>2} \\
+pes & \neume{pe} & & \neume{peG} & \neume{pelsn3} \neume{pelst2} \neume{pelsc2} & & \neume{pe>1} & \neume{ta>} \\
+porrectus & \neume{po} & & \neume{poG} & & \neume{poM} & \neume{po>} & \\
+torculus & \neume{to} & \neume{toS1} & \neume{toG} & \neume{toGlsa5} \neume{toSlsa5} \neume{toSsun1lsa5} \neume{tolst9} & & \neume{to>} & \\
+climacus & \neume{ci} & \neume{pusu1sun1} \neume{visu2} \neume{unsun2} & & \neume{visu2lst3} & & & \neume{cl>1} \\
+scandicus & \neume{sc} \neume{sc1} & \neume{vippn1pp1} \neume{vippn2} & \neume{pevihl} & \neume{sclst2} \neume{pelst2vihl} \neume{pelsa2vihl} & & \neume{vi>1pp2} & \neume{ta>ppn1} \neume{ta>pp2} \\
+\vbox{\hbox{porrectus}\hbox{flexus}} & \neume{pf1} & \neume{pfS} & \neume{unhg`to} \neume{po`un} & \neume{unhglst2`to} \neume{po`unlsa2} & \neume{pfM} & \neume{pf>} & \\
+\vbox{\hbox{(pes}\hbox{subbipunctis)}} & \neume{tosu1} & \neume{tosun1} & \neume{vippn1su2} \neume{unppn1sun2} & \neume{tosu1lsc5} \neume{tosun1lsa5} & & & \\
+& & & \multicolumn{1}{r|}{\neume{visu1sun1}} & \multicolumn{1}{r|}{\neume{unlst2`puhisu1sun1}} & & & \\
+\vbox{\hbox{scandicus}\hbox{flexus}} & \neume{sf} & & \neume{unhd`to} \neume{sfG} & \neume{unhdlst2`to} \neume{pelst2clhh} & & & \\
+\vbox{\hbox{torculus}\hbox{resupinus}} & \neume{tr} & \neume{trS} & \neume{poppn1} \neume{pe`peG} & \neume{trSlsc1} \neume{trlst3} \neume{trlst9} & & \neume{tr>} & \neume{pe`ta>} \\
+& & & \multicolumn{1}{r|}{\neume{tovihg} \neume{toGvihg}} & & & & \\
+\vbox{\hbox{clivis + pes}\hbox{or torculus}} & \multicolumn{1}{l}{\neume{cl!pe} \neume{cl!to}} & \multicolumn{1}{l}{\rightarrow \hspace{5mm} \neume{toS!pe}} & \multicolumn{5}{l|}{\neume{toS!to}} \\
+\multirow{7}{*}{oriscus} & \multicolumn{1}{l}{\multirow{7}{*}{\neume{or} \neume{or1} $ \left\{ \rule{0pt}{22mm} \right. $ }} & \multicolumn{1}{l}{isolated  \&} & \multicolumn{3}{l}{\neume{ql}} & \multicolumn{2}{l|}{\neume{or>}} \\
+& \multicolumn{1}{l}{} & \multicolumn{1}{l}{\vbox{\hbox{at the syllabic}\hbox{articulation}}} & \multicolumn{5}{l|}{\neume{oc} \neume{oc!vi} \neume{pq} \neume{pq1}} \\
+& \multicolumn{1}{l}{} & \multicolumn{1}{l}{\multirow{5}{*}{\vbox{\hbox{inside}\hbox{the neume}} $ \left\{ \rule{0pt}{18mm} \right. $ }} & \multicolumn{5}{l|}{\neume{tg}} \\
+& \multicolumn{1}{l}{} & \multicolumn{1}{l}{} & \multicolumn{5}{l|}{\neume{cl1!or} \neume{cl1!pi} \neume{cl1!pi!vi} \neume{cl1!pi!cl} \neume{cl1!pi!to} } \\
+& \multicolumn{1}{l}{} & \multicolumn{1}{l}{} & \multicolumn{5}{l|}{\neume{to!or}} \\
+& \multicolumn{1}{l}{} & \multicolumn{1}{l}{} & \multicolumn{5}{l|}{\neume{sa} \neume{sa1}} \\
+& \multicolumn{1}{l}{} & \multicolumn{1}{l}{} & \multicolumn{1}{l}{\neume{vs} \neume{vsG}} & \multicolumn{1}{r}{\neume{pe!or}} & \multicolumn{3}{l|}{} \\
+quilisma & \multicolumn{7}{l|}{\neume{ql} \neume{ql!cl} \neume{ql!po}} \\
+pes stratus & \multicolumn{1}{l}{} & \multicolumn{6}{l|}{\neume{pt1}} \\ \hline
+\end{tabular}
+}
+
+\begin{center}
+Table from Cardine's Gregorian Semiology, pp.\ 14-15 with nabc strings and grelaon glyphs.
+\end{center}
+
+\vfill
+\pagebreak
+
 \begin{center}
 Table with nabc strings and corresponding gregall and gresgmodern glyphs:
 \end{center}
@@ -447,6 +638,34 @@ Table with nabc strings and corresponding gregall and gresgmodern glyphs:
 \pagebreak
 
 \begin{center}
+Table with nabc strings and corresponding grelaon 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['grelaon']) do
+		table.insert(arr, key)
+	end
+	table.sort(arr)
+	tex.sprint("\\begin{multicols}{4}\\noindent");
+	for i, key in ipairs(arr) do
+		keym = key:gsub("~","\\~{}")
+		str = keym .. "\\hfill"
+		str = str .. "{\\font\\grefontnabc={name:grelaon} at 8pt\\grefontnabc\\begin{gre@style@nabc}" .. gregoriotex.nabc_font_tables['grelaon'][key] .. "\\end{gre@style@nabc}}"
+		tex.sprint(str .. "\\\\")
+	end
+	tex.sprint("\\end{multicols}")
+\end{luacode*}
+
+\vfill
+\pagebreak
+
+\begin{center}
 \huge{manuscript sources of the gregall font}
 \end{center}
 
@@ -509,6 +728,7 @@ only present in the font source file to help drawing the glyphs.}
 \texttt{C54A} Audi filia \texttt{GT417}\\
 \texttt{C56B} Beatus vir \texttt{GT475}\\
 \texttt{C56D} Desiderium animae \texttt{GT432}\\
+\texttt{C57B} Beatus vir \texttt{GT481}\\
 \texttt{C58A} Adiutor \texttt{GT69}\\
 \texttt{C59D} De profundis \texttt{GT673}\\
 \texttt{C60S} Sciant gentes \texttt{GT88}\\
@@ -541,6 +761,7 @@ only present in the font source file to help drawing the glyphs.}
 \texttt{C118C} Clamaverunt iusti \texttt{GT454}\\
 \texttt{C122I} In omnem terram \texttt{GT427}\\
 \texttt{C123C} Constitues eos \texttt{GT426}\\
+\texttt{C132D} Domine praevenisti \texttt{GT509}\\
 \texttt{C134B} Benedicite Dominum \texttt{GT608}\\
 \texttt{C137A} Audi filia \texttt{GT406}\\
 \texttt{C139A} Alleluia Benedictus es \texttt{GT375}\\
@@ -552,6 +773,7 @@ only present in the font source file to help drawing the glyphs.}
 \texttt{C149A} Alleluia. Paratum cor meum \texttt{GT344}\\
 \texttt{C150L} Alleluia Laetatus \texttt{GT19}\\
 \texttt{C153S} Alleluia Sancti tui, Domine, benedicent \texttt{GT463}\\
+\texttt{C153B} Alleluia Beatus vir qui suffert \texttt{GT511}\\
 \texttt{C154A} Alleluia Gaudete iusti \texttt{GT430}
 
 \noindent\textbf{Einsiedeln codex 121}
@@ -576,6 +798,7 @@ only present in the font source file to help drawing the glyphs.}
 \texttt{E39E} Exiit sermo inter \texttt{GT636}\\
 \texttt{E42A} Anima nostra \texttt{GT466}\\
 \texttt{E51R} Reges tharsis \texttt{OT21}\\
+\texttt{E64L} Laetamini in Domino \texttt{OT140}\\
 \texttt{E69P} Posuisti Domine \texttt{GT477}\\
 \texttt{E75G} Gaudeamus omnes \texttt{GT545}\\
 \texttt{E82D} De profundis \texttt{GT673}\\
@@ -648,18 +871,37 @@ only present in the font source file to help drawing the glyphs.}
 \texttt{H114N} Nativitas tua \texttt{AM1035}\\
 \texttt{H118G} Gaude, Maria Virgo \texttt{NR130*}\\
 \texttt{H119C} Cum inducerent\\
+\texttt{H173I} Insurrexerunt in me \texttt{NR364}\\
+\texttt{H173C} Contumelias et terrores \texttt{NR365}\\
 \texttt{H179L} Liberavit Dominus \texttt{ARII183}\\
 \texttt{H179A} Amicus meus osculi \texttt{NR381}\\
 \texttt{H179I} Iudas mercator \texttt{NR382}\\
+\texttt{H219T} Tradiderunt me \texttt{NR408}\\
+\texttt{H219I} Iesum tradidit impius \texttt{NR409}\\
 \texttt{H266D} Domino si in tempore\\
 \texttt{H269S} Spiritus Sanctus\\
 \texttt{H269D} Dum complerentur \texttt{NR493}\\
 \texttt{H269R} Repleti sunt omnes \texttt{NR494}\\
 \texttt{H270S} Spiritus Domini \texttt{AM520}\\
 \texttt{H271L} Loquebantur variis \texttt{AM521}\\
+\texttt{H297B} Beatam me dicent \texttt{NR[172]}\\
+\texttt{H305H} Hodie nata est \texttt{NR278*}\\
+\texttt{H305G} Gloriosae virginis Mariae \texttt{NR279*}\\
+\texttt{H306N} Nativitas gloriosae \texttt{NR280*}\\
+\texttt{H307N} Nativitas tua \texttt{NR281*}\\
+\texttt{H307F} Felix namque \texttt{NR[171]}\\
+\texttt{H320R} Regem confessorum\\
+\texttt{H322B} Beatus Gallus zelo\\
+\texttt{H322C} Columbanus itaque beato\\
+\texttt{H323B} Beatus Gallus cum\\
+\texttt{H323D} Domine Iesu Christe\\
+\texttt{H324P} Pater sanctus\\
+\texttt{H324V} Vir Deo plenus\\
+\texttt{H325I} Iste sanctus digne\\
 \texttt{H367V} Viri sancti \texttt{NR[54]}\\
 \texttt{H424M} Magnificat\\
-\texttt{H428A} Ascendens Iesus \texttt{AM593}
+\texttt{H428A} Ascendens Iesus \texttt{AM593}\\
+\texttt{H443V} Venite exsultemus \texttt{NRXXVIII}
 
 \noindent\textbf{St.\ Gall codex 339}
 
@@ -828,6 +1070,7 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{toS3lst2} & \texttt{toS3lst2} & \texttt{C59D} & tuae\\
 \sneume{pq!cl-} & \texttt{pq!cl-} & \texttt{C87E} & sanasti\\
 \sneume{to>1} & \texttt{to>1} & \texttt{E130I} & obdormiam & \fbox{2.166x}\\
+\sneume{to>2} & \texttt{to>2} & \texttt{H219T} & fortes: & \fbox{1.63x}\\
 \sneume{to->} & \texttt{to->} & \texttt{E158D} & respexit & \fbox{2.166x}\\
 \sneume{toS2sux1} & \texttt{toS2sux1} & \texttt{C46O} & Surge\\ \hline
 & \multicolumn{3}{l}{\textbf{climacus}} & \\
@@ -879,13 +1122,17 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{vi-su1sut1} & \texttt{vi-su1sut1} \textit{Cf.} \sneume{vi-su1sut1su2} & \multicolumn{3}{l}{\texttt{vi-su1sut1su2} minus subpunctis}\\
 \sneume{vi-su2sut1} & \texttt{vi-su2sut1} & \texttt{N296V} & alleluia\\
 \sneume{vi-su1sux1} & \texttt{vi-su1sux1} & \texttt{E373B} & Sanctum & \fbox{2.133x}\\
+\sneume{vi-su2sux1} & \texttt{vi-su2sux1} & \texttt{C49I} & eum\\
 \sneume{vi-sut4} & \texttt{vi-sut4} & \texttt{H16A} & servient & \fbox{1.7x}\\
 \sneume{vi-suu2} & \texttt{vi-suu2} & \texttt{H23E} & ecce & \fbox{1.7x}\\
 \sneume{vi-suu3} & \texttt{vi-suu3} & \texttt{H35G} & veniet & \fbox{1.7x}\\
 \sneume{visu2sux1} & \texttt{visu2sux1} & \texttt{H48B} & mater & \fbox{1.7x}\\
 \sneume{vi-sut1su2} & \texttt{vi-sut1su2} & \texttt{H22S} & elegi & \fbox{1.71x}\\
 \sneume{vi-su1suu1} & \texttt{vi-su1suu1} & \texttt{H114C} & gloriam & \fbox{1.71x}\\
-\sneume{vi-su1suu1su2} & \texttt{vi-su1suu1su2} & \texttt{H114N} & nobis & \fbox{1.71x}\\ \hline
+\sneume{vi-su1suu1su2} & \texttt{vi-su1suu1su2} & \texttt{H114N} & nobis & \fbox{1.71x}\\
+\sneume{vi-su1sut2} & \texttt{vi-su1sut2} & \texttt{H324P} & aetatis & \fbox{2.0x}\\
+\sneume{vi-su3} & \texttt{vi-su3} & \texttt{H307F} & natalem & \fbox{2.0x}\\
+\sneume{vi-sut1suu1} & \texttt{vi-sut1suu1} & \texttt{325I} & peregrinatione & \fbox{2.0x}\\ \hline
 & \multicolumn{3}{l}{\textbf{scandicus}} & \\
 \sneume{sc} & \texttt{sc} & \texttt{G11P} & imperium & \fbox{0.85x}\\
 \sneume{sc1} & \texttt{sc1} \textit{Cf.} \sneume{vipp4} & \multicolumn{3}{l}{\texttt{vipp4} minus first punctum}\\
@@ -925,6 +1172,7 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{pe-su2} & \texttt{pe-su2} & \texttt{H73S} & adoraverunt\\
 \sneume{pe-1su2} & \texttt{pe-1su2} & \texttt{C64Q} & habitat\\
 \sneume{pe-1sut2} & \texttt{pe-1sut2} & \texttt{H104T} & confitemur\\
+\sneume{pe-1sut1suw1} & \texttt{pe-1sut1suw1} & \texttt{H219I} & videret & \fbox{1.63x}\\
 \sneume{peSsu2} & \texttt{peSsu2} & \texttt{A17T} & eius\\
 \sneume{peSsut2} & \texttt{peSsut2} & \texttt{C27E} & sanctos\\
 \sneume{vippt1su2} & \texttt{vippt1su2} & \texttt{C56B} & benedicetur.\\
@@ -952,7 +1200,12 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{peSsut1su2} & \texttt{peSsut1su2} & \texttt{E13P} & Domine & \fbox{2.133x}\\
 \sneume{pesu1sux1} & \texttt{pesu1sux1} & \texttt{H25E} & angelum & \fbox{1.7x}\\
 \sneume{pe-1su1suw1} & \texttt{pe-1su1suw1} & \texttt{H29E} & deprecabuntur & \fbox{1.7x}\\
-\sneume{pesu1sut1} & \texttt{pesu1sut1} \textit{Cf.} \sneume{pesu1sut3} & \multicolumn{3}{l}{\texttt{pesu1sut3} minus 2 tractulis}\\ \hline
+\sneume{pesu1sut1} & \texttt{pesu1sut1} \textit{Cf.} \sneume{pesu1sut3} & \multicolumn{3}{l}{\texttt{pesu1sut3} minus 2 tractulis}\\
+\sneume{pe-1su1sut1} & \texttt{pe-1su1sut1} & \texttt{H306N} & de & \fbox{2.0x}\\
+\sneume{pe-1su1sut2} & \texttt{pe-1su1sut2} & \texttt{H305G} & Mariae & \fbox{2.0x}\\
+\sneume{pe-1su1suu2} & \texttt{pe-1su1suu2} & \texttt{H305G} & vidente & \fbox{2.0x}\\
+\sneume{pe-su4} & \texttt{pe-su4} & \texttt{C139A} & Alleluia\\
+\sneume{pesuv1su1sut1} & \texttt{pesuv1su1sut1} & \texttt{C139A} & Alleluia\\ \hline
 & \multicolumn{3}{l}{\textbf{scandicus flexus}} & \\
 \sneume{sf} & \texttt{sf} & \texttt{C64Q} & habitat\\
 \sneume{sflsc3} & \texttt{sflsc3} & \texttt{C27E} & Deus\\
@@ -976,7 +1229,8 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{tr-~} & \texttt{tr-\char`\~} & \texttt{C27Q} & et\\
 \sneume{tr-~1} & \texttt{tr-\char`\~1} & \texttt{C107A} & Alleluia.\\
 \sneume{trS-} & \texttt{trS-} & \texttt{C89T} & pedes,\\
-\sneume{trS1} & \texttt{trS1} & \texttt{E26L} & eeiieiue & \fbox{2.166x}\\ \hline
+\sneume{trS1} & \texttt{trS1} & \texttt{E26L} & eeiieiue & \fbox{2.166x}\\
+\sneume{tr-3} & \texttt{tr-3} & \texttt{H323D} & honore & \fbox{2.0x}\\ \hline
 & \multicolumn{3}{l}{\textbf{stropha}} & \\
 \sneume{st} & \texttt{st} & \texttt{C80Q} & commovebitur\\
 \sneume{st-} & \texttt{st-} & \texttt{C52P} & Desiderium\\
@@ -1061,7 +1315,8 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{saM3} & \texttt{saM3} & \texttt{N53A} & fratres\\
 \sneume{saM-4} & \texttt{saM-4} & \texttt{N296V} & amoris\\
 \sneume{sa>2} & \texttt{sa>2} & \texttt{H73S} & viderunt\\
-\sneume{sa1!cl->} & \texttt{sa1!cl->} & \texttt{H32N} & eius & \fbox{1.7x}\\ \hline
+\sneume{sa1!cl->} & \texttt{sa1!cl->} & \texttt{H32N} & eius & \fbox{1.7x}\\
+\sneume{sapp1} & \texttt{sapp1} & \texttt{H320R} & venite & \fbox{2.0x}\\ \hline
 & \multicolumn{3}{l}{\textbf{pes quassus}} & \\
 \sneume{pq} & \texttt{pq} & \texttt{C27E} & sacrificia.\\
 \sneume{pqlsfr1} & \texttt{pqlsfr1} & \texttt{C150L} & nostri\\
@@ -1092,7 +1347,9 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{su1sut2} & \texttt{su1sut2} \textit{Cf.} \sneume{visu1sut2} & \multicolumn{2}{l}{\texttt{visu1sut2}}\\
 \sneume{su1suu1} & \texttt{su1suu1} \textit{Cf.} \sneume{visu1suu1} & \multicolumn{2}{l}{\texttt{visu1suu1}}\\
 \sneume{su2suw1} & \texttt{su2suw1} \textit{Cf.} \sneume{visu2suw1} & \multicolumn{2}{l}{\texttt{visu2suw1}}\\
+\sneume{su2sux1} & \texttt{su2sux1} \textit{Cf.} \sneume{vi-su2sux1} & \multicolumn{2}{l}{\texttt{vi-su2sux1}}\\
 \sneume{sut1su2} & \texttt{sut1su2} \textit{Cf.} \sneume{visut1su2} & \multicolumn{2}{l}{\texttt{visut1su2}}\\
+\sneume{sut1suw1} & \texttt{sut1suw1} \textit{Cf.} \sneume{pe-1sut1suw1} & \multicolumn{2}{l}{\texttt{pe-1sut1suw1}}\\
 \sneume{sut3} & \texttt{sut3} \textit{Cf.} \sneume{visut3} & \multicolumn{2}{l}{\texttt{visut3}}\\
 \sneume{suv1su2} & \texttt{suv1su2} \textit{Cf.} \sneume{visuv1su2} & \multicolumn{2}{l}{\texttt{visuv1su2}}\\
 \sneume{sut4} & \texttt{sut4} \textit{Cf.} \sneume{visut4} & \multicolumn{2}{l}{\texttt{visut4}}\\
@@ -1123,7 +1380,10 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{sut2suu1} & \texttt{sut2suu1} \textit{Cf.} \sneume{ql-ppt1sut2suu1} & \multicolumn{2}{l}{\texttt{ql-ppt1sut2suu1}}\\
 \sneume{suu3} & \texttt{suu3} \textit{Cf.} \sneume{vi-suu3} & \multicolumn{2}{l}{\texttt{vi-suu3}}\\
 \sneume{su1} & \texttt{su1} \textit{Cf.} \sneume{ci} & \multicolumn{2}{l}{\texttt{ci}}\\
-\sneume{sut1} & \texttt{sut1} \textit{Cf.} \sneume{ciS1} & \multicolumn{2}{l}{\texttt{ciS1}}\\ \hline
+\sneume{sut1} & \texttt{sut1} \textit{Cf.} \sneume{ciS1} & \multicolumn{2}{l}{\texttt{ciS1}}\\
+\sneume{su1suv1su2} & \texttt{su1suv1su2} \textit{Cf.} \sneume{ql-ppt2su1suv1su2} & \multicolumn{2}{l}{\texttt{ql-ppt2su1suv1su2}}\\
+\sneume{sut1suu1} & \texttt{sut1suu1} \textit{Cf.} \sneume{vi-sut1suu1} & \multicolumn{2}{l}{\texttt{vi-sut1suu1}}\\
+\sneume{suv1su1sut1} & \texttt{suv1su1sut1} \textit{Cf.} \sneume{pesuv1su1sut1} & \multicolumn{2}{l}{\texttt{pesuv1su1sut1}}\\ \hline
 \\
 & \multicolumn{3}{l}{\textbf{prepunctis}} & \\
 \sneume{pp2} & \texttt{pp2} \textit{Cf.} \sneume{vi-pp2} & \texttt{vi-pp2}\\
@@ -1162,6 +1422,11 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{ql!vssut2} & \texttt{ql!vssut2} \textit{Cf.} \sneume{ql!vsppt1sut2} & \multicolumn{3}{l}{\texttt{ql!vsppt1sut2} minus tractulus}\\
 \sneume{qi!vs} & \texttt{qi!vs} \textit{Cf.} \sneume{qi!vssu2} & \multicolumn{3}{l}{\texttt{qi!vssu2} minus subbipunctis}\\
 \sneume{qi!vssu2} & \texttt{qi!vssu2} \textit{Cf.} \sneume{qi!vsppt1su2} & \multicolumn{3}{l}{\texttt{qi!vsppt1su2} minus tractulus}\\
+\sneume{ql-su1suu1} & \texttt{ql-su1suu1} \textit{Cf.} \sneume{ql-ppt1su1suu1} & \multicolumn{3}{l}{\texttt{ql-ppt1su1suu1} minus tractulus}\\
+\sneume{ql-su1suv1su2} & \texttt{ql-su1suv1su2} \textit{Cf.} \sneume{ql-ppt2su1suv1su2} & \multicolumn{3}{l}{\texttt{ql-ppt2su1suv1su2} minus tractulis}\\
+\sneume{qisut2} & \texttt{qisut2} \textit{Cf.} \sneume{qippt2sut2} & \multicolumn{3}{l}{\texttt{qippt2sut2} minus tractulis}\\
+\sneume{ql-su3} & \texttt{ql-su3} \textit{Cf.} \sneume{ql-ppt1su3} & \multicolumn{3}{l}{\texttt{ql-ppt1su3} minus tractulus}\\
+\sneume{qlsut3} & \texttt{qlsut3} \textit{Cf.} \sneume{qlppt1sut3} & \multicolumn{3}{l}{\texttt{qlppt1sut3} minus tractulus}\\
 \sneume{ql-su2} & \texttt{ql-su2} \textit{Cf.} \sneume{ql-ppt1su2} & \multicolumn{3}{l}{\texttt{ql-ppt1su2} minus tractulus}\\
 \sneume{ql-sut2} & \texttt{ql-sut2} & \texttt{H73S} & cedebat\\
 \sneume{ql-su1sux1} & \texttt{ql-su1sux1} \textit{Cf.} \sneume{ql-ppt1su1sux1} & \multicolumn{3}{l}{\texttt{ql-ppt1su1sux1} minus tractulus}\\
@@ -1177,6 +1442,7 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{qi!cl-} & \texttt{qi!cl-} & \texttt{C148A} & factus\\
 \sneume{qi!cl>} & \texttt{qi!cl>} & \texttt{H77S} & Magi\\
 \sneume{qi!po} & \texttt{qi!po} & \texttt{H87E} & Deus\\
+\sneume{qi!po>} & \texttt{qi!po>} & \texttt{H173C} & adversum & \fbox{1.9x}\\
 \sneume{pf!clM-ppt1} & \texttt{pf!clM-ppt1} & \texttt{E327O} & narante & \fbox{2.166x}\\
 \sneume{cl!po>ppt1} & \texttt{cl!po>ppt1} & \texttt{E327O} & narante & \fbox{2.166x}\\
 \sneume{qlppt1} & \texttt{qlppt1} & \texttt{C38T} & Sede\\
@@ -1213,7 +1479,16 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{ql!vsppt1} & \texttt{ql!vsppt1} \textit{Cf.} \sneume{ql!vsppt1su2} & \multicolumn{3}{l}{\texttt{ql!vsppt1su2} minus subbipunctis}\\
 \sneume{ql!vsppt1sut2} & \texttt{ql!vsppt1sut2} & \texttt{H73S} & gaudio\\
 \sneume{qi!vsppt1su2} & \texttt{qi!vsppt1su2} & \texttt{H74I} & Domini\\
-\sneume{to!ciG} & \texttt{to!ciG} & \texttt{C28T} & gloriae.\\
+\sneume{qi-sut3} & \texttt{qi-sut3} & \texttt{H322B} & in & \fbox{2.0x}\\
+\sneume{ql-ppt1su1suu1} & \texttt{ql-ppt1su1suu1} & \texttt{H305H} & David & \fbox{2.0x}\\
+\sneume{ql-ppt1su3} & \texttt{ql-ppt1su3} & \texttt{H323D} & subire & \fbox{2.0x}\\
+\sneume{qlppt1sut3} & \texttt{qlppt1sut3} & \texttt{H305G} & Redemptorem & \fbox{2.0x}\\
+\sneume{ql-ppt2su1suv1su2} & \texttt{ql-ppt2su1suv1su2} & \texttt{H306N} & illustrat & \fbox{2.0x}\\
+\sneume{ql-su1sut1} & \texttt{ql-su1sut1} & \texttt{H307F} & iustitiae & \fbox{2.0x}\\
+\sneume{qippt2sut2} & \texttt{qippt2sut2} & \texttt{H297B} & generationes & \fbox{2.0x}\\
+\sneume{ql!vssu3} & \texttt{ql!vssu3} & \texttt{H443V} & ei & \fbox{2.0x}\\
+\sneume{to!ciG} & \texttt{to!ciG} & \texttt{E51R} & eum & \fbox{2.0x}\\
+\sneume{to!ciGhh} & \texttt{to!ciG} & \texttt{C28T} & gloriae.\\
 \sneume{to!cl} & \texttt{to!cl} & \texttt{C84T} & pupillo\\
 \sneume{to!cl!cl!cl} & \texttt{to!cl!cl!cl} & \texttt{C64Q} & sepavit,\\
 \sneume{to!cl!po} & \texttt{to!cl!po} & \texttt{E31T} & veritas & \fbox{2.166x}\\
@@ -1225,6 +1500,7 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{to!clS} & \texttt{to!clS} & \texttt{C43A} & terram.\\
 \sneume{to!cl!cl} & \texttt{to!cl!cl} & \texttt{C43A} & Domini,\\
 \sneume{to!po} & \texttt{to!po} & \texttt{C64Q} & sagitta\\
+\sneume{to!posu2} & \texttt{to!posu2} & \texttt{C49I} & eo,\\
 \sneume{to!pr} & \texttt{to!pr} & \texttt{G11V} & Deo & \fbox{0.85x}\\
 \sneume{to!pi} & \texttt{to!pi} & \texttt{C60C} & tui.\\
 \sneume{toSsu2} & \texttt{toSsu2} & \texttt{H72H} & mihi\\
@@ -1238,11 +1514,23 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{cl!po} & \texttt{cl!po} & \texttt{C26A} & nobis.\\
 \sneume{cl!po-1} & \texttt{cl!po-1} & \texttt{H119C} & in\\
 \sneume{tr-1su2} & \texttt{tr-1su2} & \texttt{H73O} & dona\\
+\sneume{trSsut2} & \texttt{trSsut2} & \texttt{H305H} & devotissime & \fbox{2.0x}\\
 \sneume{ci-pp2} & \texttt{ci-pp2} & \texttt{H73S} & magno\\
 \sneume{toS2su2} & \texttt{toS2su2} & \texttt{H73S} & eam\\
 \sneume{toS2sut2} & \texttt{toS2sut2} & \texttt{C150L} & dicta\\
-\sneume{po-1pp2su1sux1} & \texttt{po-1pp2su1sux1} & \texttt{E75G} & filium & \fbox{2.2x}\\
-\sneume{po-1su1sux1} & \texttt{po-1su1sux1} \textit{Cf.} \sneume{po-1pp2su1sux1} & \multicolumn{3}{l}{\texttt{po-1pp2su1sux1} minus bipunctis}\\ \hline
+\sneume{to-1su2} & \texttt{to-1su2} & \texttt{H322C} & ostendere & \fbox{2.0x}\\
+\sneume{to-1su1} & \texttt{to-1su1} & \texttt{H323B} & Gallus & \fbox{2.0x}\\
+\sneume{to-1suu1} & \texttt{to-1suu1} & \texttt{H173I} & me & \fbox{1.8x}\\
+\sneume{to-1suu1su2} & \texttt{to-1suu1su2} & \texttt{H324V} & cognovi & \fbox{2.0x}\\
+\sneume{po-1pp2su1sux1} & \texttt{po-1pp2su1sux1} & \texttt{H323D} & desiderium & \fbox{2.0x}\\
+\sneume{po-1su1sux1} & \texttt{po-1su1sux1} \textit{Cf.} \sneume{po-1pp2su1sux1} & \multicolumn{3}{l}{\texttt{po-1pp2su1sux1} minus bipunctis}\\
+\sneume{pisu1} & \texttt{pisu1} & \texttt{H307N} & annuntiavit & \fbox{2.0x}\\
+\sneume{pisut1} & \texttt{pisut1} & \texttt{C153B} & Alleluia\\
+\sneume{pq-su2} & \texttt{pq-su2} & \texttt{C132D} & praetioso\\
+\sneume{pe!vi} & \texttt{pe!vi} & \texttt{C57B} & qui\\
+\sneume{tgsuu1} & \texttt{tgsuu1} & \texttt{C49I} & eum.\\
+\sneume{tgSsuu1} & \texttt{tgSsuu1} & \texttt{C57B} & nimis.\\
+\sneume{sa-su2sut1} & \texttt{sa-su2sut1} & \texttt{C49I} & eum\\ \hline
 \end{supertabular}
 
 \begin{supertabular}{llllll}\noindent
@@ -1278,6 +1566,7 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{lspar} & \texttt{lspar} & \texttt{E104S} & miserere & paratim & \fbox{2.166x}\\
 \sneume{lspfec} & \texttt{lspfec} & \texttt{E2D} & fructum & perfecte & \fbox{2.166x}\\
 \sneume{lspm} & \texttt{lspm} & \texttt{C40V} & suam. & \multicolumn{2}{l}{parvum mediocriter}\\
+\sneume{lspulcre} & \texttt{lspulcre} & \texttt{E64L} & hac & pulcre & \fbox{2.0x}\\
 \sneume{lss} & \texttt{lss} & \texttt{C27E} & sanctos & \multicolumn{2}{l}{sursum}\\
 \sneume{lssb} & \texttt{lssb} & \texttt{C40V} & iustitiam & \multicolumn{2}{l}{sursum bene}\\
 \sneume{lssc} & \texttt{lssc} & \texttt{C84T} & Tibi & \multicolumn{2}{l}{sursum celeriter}\\
@@ -1294,6 +1583,812 @@ only present in the font source file to help drawing the glyphs.}
 \sneume{lsvol} & \texttt{lsvol} & \texttt{C58A} & aeternum & \multicolumn{2}{l}{volubiliter}\\
 \sneume{lsx} & \texttt{lsx} & \texttt{C87E} & me: & \multicolumn{2}{l}{expectare}\\ \hline
 \end{supertabular}
+\onecolumn
+}
+
+\vfill
+\pagebreak
+
+\begin{center}
+\huge{manuscript sources of the grelaon font}
+\end{center}
+
+\textit{The list of glyphs uses following abbreviations for manuscript
+references; the page number is always for the start of some antiphon,
+responsory, mass propers, even when the actual neume is on a later page.
+At the end of lines, \texttt{GT} stands for Graduale Triplex, Solesmes,
+1979, \texttt{OT} for Offertoriale Triplex, Solesmes, 1985, \texttt{GN}
+for Graduale Novum de Dominicis et Festis, Conbrio Verlag Regensburg, 2011,
+followed by page number which also contains the corresponding
+propers, antiphons or responsories.}
+
+\textit{All the grelaon font glyphs taken from the LAON\_BM\_ms239 codex with
+the permission from the Bibliothèque municipale de la ville de Laon
+\url{http://manuscrit.ville-laon.fr}, the picture fragments from there are
+only present in the font source file to help drawing the glyphs.}
+
+{\footnotesize
+
+\begin{multicols}{2}
+
+\noindent\textbf{Graduale Laudunensis, codex 239}
+
+\noindent 
+\texttt{L1} = \url{http://manuscrit.ville-laon.fr/_app/_visualisation.php?cote=Ms239&vue=9}\\
+\texttt{L8U} Universi qui te \texttt{GT16}\\
+\texttt{L8A} Ad te Domine levavi \texttt{OT5}\\
+\texttt{L8D} Dominus dabit \texttt{GT17}\\
+\texttt{L9E} Ex Sion species \texttt{GT18}\\
+\texttt{L10I} Ierusalem surge \texttt{GT20}\\
+\texttt{L11Q} Qui sedes, Domine \texttt{GT22}\\
+\texttt{L13A} Ave Maria \texttt{GT36}\\
+\texttt{L14P} Prope es tu Domine \texttt{GT24}\\
+\texttt{L14O} Ostende nobis \texttt{GT31}\\
+\texttt{L17H} Hodie scietis \texttt{GT38}\\
+\texttt{L19B} Benedictus qui venit \texttt{GT45}\\
+\texttt{L20P} Puer natus est \texttt{GT47}\\
+\texttt{L24D} Dextera Domini \texttt{GT194}\\
+\texttt{L24T} Timebunt gentes \texttt{GT265}\\
+\texttt{L25L} Laetabitur iustus \texttt{GT473}\\
+\texttt{L25M} Mirabantus omnes \texttt{GN232}\\
+\texttt{L28G} Gaudeamus omnes \texttt{GT545}\\
+\texttt{L31D} De profundis \texttt{GT673}\\
+\texttt{L33S} Sciant gentes \texttt{GT88}\\
+\texttt{L33C} Commovisti Domine \texttt{GT89}\\
+\texttt{L33P} Perfice gressus \texttt{OT90}\\
+\texttt{L34E} Esto mihi in Deum \texttt{GT275}\\
+\texttt{L35T} Tu es Deus \texttt{GT244}\\
+\texttt{L37M} Misereris omnium \texttt{GT62}\\
+\texttt{L37S} Miserere mei Deus \texttt{GT63}\\
+\texttt{L38I} Iacta cogitatum \texttt{GT285}\\
+\texttt{L40Q} Qui habitat \texttt{GT73}\\
+\texttt{L43L} Levabo oculos meos \texttt{GT78}\\
+\texttt{L43S} Scapulis suis \texttt{GT77}\\
+\texttt{L43I} Sicut oculi servorum \texttt{GT77}\\
+\texttt{L44D} Domine refugium \texttt{GT79}\\
+\texttt{L44I} Dirigatur oratio \texttt{GT340}\\
+\texttt{L45R} Reminiscere miserationum \texttt{GT81}\\
+\texttt{L53C} Confitemini Domino \texttt{GT158}\\
+\texttt{L54A} Adiutor meus \texttt{GT86}\\
+\texttt{L54B} Benedicam Dominum \texttt{OT88}\\
+\texttt{L56D} Deus in adiutorium \texttt{GT315}\\
+\texttt{L56S} Salvum fac populum \texttt{GT354}\\
+\texttt{L56I} Iustus Dominus \texttt{GT93}\\
+\texttt{L56P} Propitius esto Domine \texttt{GT288}\\
+\texttt{L58A} Ad Dominum dum tribularer \texttt{GT282}\\
+\texttt{L60E} Exsurge Domine \texttt{GT96}\\
+\texttt{L60A} Ad te levavi \texttt{GT97}\\
+\texttt{L61I} Iustitiae Domini \texttt{GT309}\\
+\texttt{L64O} Oculi omnium \texttt{GT343}\\
+\texttt{L64D} Domine fac mecum \texttt{OT37}\\
+\texttt{L67Q} Qui biberit aquam \texttt{GT99}\\
+\texttt{L67S} Si ambulem \texttt{GT125}\\
+\texttt{L68N} Nemo te condemnavit \texttt{GT124}\\
+\texttt{L68Q} Qui confidunt \texttt{GT109}\\
+\texttt{L71D} Dum santificatus fuero \texttt{GT249}\\
+\texttt{L72B} Benedicite gentes \texttt{GT231}\\
+\texttt{L75V} Videns Dominus \texttt{GT124}\\
+\texttt{L76E} Eripe me Domine \texttt{GT121}\\
+\texttt{L77S} Saepe expugnaverunt \texttt{GT122}\\
+\texttt{L77C} Confitebor tibi Domine \texttt{GT123}\\
+\texttt{L78H} Hoc corpus \texttt{GT170}\\
+\texttt{L80S} Sperent in te omnes \texttt{GT286}\\
+\texttt{L81E} Exaltabo te Domine \texttt{GT112}\\
+\texttt{L81R} Eripe me de inimicis \texttt{GT129}\\
+\texttt{L82O} Omnia quae fecisti \texttt{GT342}\\
+\texttt{L82T} Tollite hostias \texttt{GT272}\\
+\texttt{L84B} Benedictus es, Domine \texttt{OT48}\\
+\texttt{L90D} Deus Deus meus \texttt{GT144}\\
+\texttt{L92E} Exsurge Domine \texttt{GT150}\\
+\texttt{L93E} Erubescant et revereantur \texttt{GT152}\\
+\texttt{L93G} Ego autem dum mihi \texttt{GT152}\\
+\texttt{L94C} Custodi me Domine \texttt{GT154}\\
+\texttt{L95D} Domine, exaudi orationem \texttt{GT172}\\
+\texttt{L99P} Popule meus quid \texttt{GT176}\\
+\texttt{L101V} Vinea facta est \texttt{GT188}\\
+\texttt{L103R} Resurrexi \texttt{GT196}\\
+\texttt{L103H} Haec dies \texttt{GT196}\\
+\texttt{L103P} Alleluia Pascha nostrum \texttt{GT197}\\
+\texttt{L103T} Terra tremuit \texttt{GT199}\\
+\texttt{L104I} Introduxit vos Dominus \texttt{GT200}\\
+\texttt{L105A} Angelus Dominus \texttt{GT217}\\
+\texttt{L105N} Angelus Dominus \texttt{GT201}\\
+\texttt{L106S} Surrexit Dominus \texttt{GT207}\\
+\texttt{L107H} Haec dies \texttt{GT206}\\
+\texttt{L109P} Populus acquisitionis \texttt{GT210}\\
+\texttt{L112D} Deus Deus meus \texttt{GT224}\\
+\texttt{L112O} Omnes qui in Christo \texttt{GT61}\\
+\texttt{L113E} Ego sum pastor \texttt{GT224}\\
+\texttt{L114C} Cantate Domino \texttt{GT225}\\
+\texttt{L114V} Vocem iucunditatis \texttt{GT229}\\
+\texttt{L117R} Repleti sumus \texttt{GT441}\\
+\texttt{L118E} Ego sum vitis vera \texttt{GT228}\\
+\texttt{L122N} Non vos relinquam \texttt{GT232}\\
+\texttt{L122V} Viri Galilaei \texttt{OT172}\\
+\texttt{L123A} Ascendit Deus \texttt{GT237}\\
+\texttt{L123E} Exaudi Domine vocem \texttt{GT241}\\
+\texttt{L125U} Ultimo festivitatis \texttt{GT251}\\
+\texttt{L125S} Spiritus Domini \texttt{GT252}\\
+\texttt{L126F} Factus est repente \texttt{GT256}\\
+\texttt{L128S} Spiritus ubi vult spirat \texttt{GT218}\\
+\texttt{L132E} Ecce quam bonum \texttt{GT351}\\
+\texttt{L136A} Amen dico vobis quod vos \texttt{GT436}\\
+\texttt{L138S} Semel iuravi \texttt{GT492}\\
+\texttt{L144C} Clamaverunt iusti \texttt{GT454}\\
+\texttt{L149E} Ego dixi Domine \texttt{GT279}\\
+\texttt{L149C} Cantabo Domino qui bona \texttt{GT283}\\
+\texttt{L152S} Sicut in holocausto \texttt{GT299}\\
+\texttt{L152I} Inclina aurem tuam \texttt{GT300}\\
+\texttt{L164D} De profundis \texttt{GT368}\\
+\texttt{L168I} Iubilate Deo \texttt{GT258}\\
+\texttt{L168S} Specie tua \texttt{GT416}\\
+\texttt{L168L} Laudate Deum \texttt{GT262}\\
+\texttt{L169A} Adorabo ad templum \texttt{GT270}\\
+\texttt{L173D} Deus iudes iustus \texttt{GT286}\\
+\texttt{L174D} Domine in virtute tua \texttt{GT292}\\
+\texttt{L174I} In te Domine speravi \texttt{GT296}\\
+\texttt{L174O} Omnes gentes plaudite manibus \texttt{GT298}\\
+\texttt{L174T} Te dece hymnus \texttt{GT305}\\
+
+\end{multicols}
+}
+
+{
+\footnotesize
+\twocolumn
+\begin{supertabular}{lllll}\noindent
+& \multicolumn{3}{l}{\textbf{uncinus}} & \\
+\lneume{un} & \texttt{un} & \texttt{L78H} & testamenti\\
+\lneume{un1} & \texttt{un1} & \texttt{L78H} & calix\\
+\lneume{un2} & \texttt{un2} \textit{Cf.} \lneume{un2lsm1} & \multicolumn{3}{l}{\texttt{un2lsm1} minus letter} \\
+\lneume{un2lsm1} & \texttt{un2lsm1} & \texttt{L82O} & fecisti\\
+\lneume{unlsm1} & \texttt{unlsm1} & \texttt{L75V} & qui\\
+\lneume{unlst1} & \texttt{unlst1} & \texttt{L103R} & alleluia\\
+\lneume{unlst2} & \texttt{unlst2} & \texttt{L82O} & fac\\
+\lneume{unlst8} & \texttt{unlst8} & \texttt{L24D} & opera\\
+\lneume{un1lst8} & \texttt{un1lst8} & \texttt{L112O} & Christo\\
+\lneume{unlsm2lss3lst8} & \texttt{unlsm2lss3lst8} & \texttt{L43S} & scuto\\ \hline
+& \multicolumn{3}{l}{\textbf{punctum}} & \\
+\lneume{pu} & \texttt{pu} & \texttt{L82O} & iudicio\\
+\lneume{pu1} & \texttt{pu1} & \texttt{L56D} & revereantur\\
+\lneume{pulsnt3} & \texttt{pulsnt3} & \texttt{L75V} & flentes\\ \hline
+& \multicolumn{3}{l}{\textbf{virga}} & \\
+\lneume{vi} & \texttt{vi} & \texttt{L82O} & Domine\\
+\lneume{viS} & \texttt{viS} \textit{Cf.} \lneume{vipp2su2} & \multicolumn{3}{l}{\texttt{vipp2su2} minus punctis} \\
+\lneume{vi>} & \texttt{vi>} & \texttt{L78H} & in\\
+\lneume{vi>1} & \texttt{vi>1} \textit{Cf.} \lneume{vi>1lsa2lsc8} & \multicolumn{3}{l}{\texttt{vi>1lsa2lsc8} minus letters} \\
+\lneume{vi>2} & \texttt{vi>2} & \texttt{L82O} & nobiscum\\
+\lneume{vilst1} & \texttt{vilst1} & \texttt{L78H} & meam\\
+\lneume{vilst2} & \texttt{vilst2} & \texttt{L95D} & meus\\
+\lneume{vilst9} & \texttt{vilst9} & \texttt{L105A} & quaeritis,\\
+\lneume{vilss1} & \texttt{vilss1} & \texttt{L103P} & Alleluia.\\
+\lneume{vilss2} & \texttt{vilss2} & \texttt{L95D} & avertas\\
+\lneume{vilsst1} & \texttt{vilsst1} & \texttt{L103P} & Alleluia.\\
+\lneume{vilst2lsa8} & \texttt{vilst2lsa8} & \texttt{L95D} & eius.\\
+\lneume{vi>lsa6} & \texttt{vi>lsa6} & \texttt{L78H} & testamenti\\
+\lneume{vi>lsc6} & \texttt{vi>lsc6} & \texttt{L56D} & adiuvandum\\
+\lneume{vi>1lsa2lsc8} & \texttt{vi>1lsa2lsc8} & \texttt{L126F} & loquentes\\ \hline
+& \multicolumn{3}{l}{\textbf{tractulus}} & \\
+\lneume{ta} & \texttt{ta} & \texttt{L24T} & tuam.\\
+\lneume{ta>} & \texttt{ta>} & \texttt{L78H} & dicit\\
+\lneume{ta>1} & \texttt{ta>1} & \texttt{L82O} & mandatis\\
+\lneume{ta>2} & \texttt{ta>2} & \texttt{L90D} & sancto\\
+\lneume{ta>lsnl2} & \texttt{ta>lsnl2} & \texttt{L45R} & dominentur\\
+\lneume{ta>2lsc2} & \texttt{ta>2lsc2} & \texttt{L90D} & Libera\\ \hline
+& \multicolumn{3}{l}{\textbf{pes}} & \\
+\lneume{pe} & \texttt{pe} & \texttt{L78H} & commemorationem\\
+\lneume{peG} & \texttt{peG} & \texttt{L78H} & vobis\\
+\lneume{pe>} & \texttt{pe>} & \texttt{L95D} & exaudi\\
+\lneume{pe>1} & \texttt{pe>1} & \texttt{L78H} & sanguine\\
+\lneume{peG1} & \texttt{peG1} & \texttt{L67S} & tua,\\
+\lneume{pelsa2} & \texttt{pelsa2} & \texttt{L82O} & peccavimus\\
+\lneume{pelsc2} & \texttt{pelsc2} & \texttt{L67S} & tuus,\\
+\lneume{pelsl2} & \texttt{pelsl2} & \texttt{L43L} & iustitiam\\
+\lneume{pelsm2} & \texttt{pelsm2} & \texttt{L81E} & meam,\\
+\lneume{pelsn2} & \texttt{pelsn2} & \texttt{L149C} & qui\\
+\lneume{pelsn3} & \texttt{pelsn3} & \texttt{L125S} & replevit\\
+\lneume{pelsst1} & \texttt{pelsst1} & \texttt{L103P} & immolatum\\
+\lneume{pelsst1lsm4} & \texttt{pelsst1lsm4} & \texttt{L44I} & Elevatio\\
+\lneume{pelst2} & \texttt{pelst2} & \texttt{L103H} & saeculum\\
+\lneume{peGlsf1} & \texttt{peGlsf1} & \texttt{L67S} & non\\
+\lneume{peGlsa6} & \texttt{peGlsa6} & \texttt{L109P} & vocavit\\
+\lneume{pe>1lsa6} & \texttt{pe>1lsa6} & \texttt{L114V} & alleluia\\ \hline
+& \multicolumn{3}{l}{\textbf{porrectus}} & \\
+\lneume{po} & \texttt{po} & \texttt{L78H} & facite\\
+\lneume{poG} & \texttt{poG} & \texttt{L64D} & mecum\\
+\lneume{poM} & \texttt{poM} \textit{Cf.} \lneume{poMsun1} & \multicolumn{3}{l}{\texttt{poMsun1} minus uncinus} \\
+\lneume{po>} & \texttt{po>} \textit{Cf.} \lneume{po>pp2} & \multicolumn{3}{l}{\texttt{po>pp2} minus prepunctis} \\
+\lneume{po>1} & \texttt{po>1} & \texttt{L81E} & descendentibus\\
+\lneume{polsf2lst3} & \texttt{polsf2lst3} & \texttt{L95D} & meus\\
+\lneume{polst2} & \texttt{polst2} & \texttt{L103H} & saeculum\\ \hline
+& \multicolumn{3}{l}{\textbf{clivis}} & \\
+\lneume{cl} & \texttt{cl} \textit{Cf.} \lneume{cllsn9} & \multicolumn{3}{l}{\texttt{cllsn9} minus letter} \\
+\lneume{clG} & \texttt{clG} & \texttt{L78H} & hoc\\
+\lneume{clG1} & \texttt{clG1} & \texttt{L105N} & accedens\\
+\lneume{clGlsa5} & \texttt{clGlsa5} & \texttt{L82O} & obedivimus\\
+\lneume{clGlsnl2} & \texttt{clGlsnl2} & \texttt{L44I} & Elevatio\\
+\lneume{clM} & \texttt{clM} & \texttt{L78H} & quotiescumque\\
+\lneume{cl>} & \texttt{cl>} & \texttt{L75V} & monumentum\\
+\lneume{cl>1} & \texttt{cl>1} & \texttt{L34E} & locum\\
+\lneume{cllshn8} & \texttt{cllshn8} & \texttt{L64O} & imples\\
+\lneume{cllsn8} & \texttt{cllsn8} & \texttt{L95D} & velociter\\
+\lneume{cllsn9} & \texttt{cllsn9} & \texttt{L67S} & tua,\\
+\lneume{cllsst8} & \texttt{cllsst8} & \texttt{L64O} & imples\\
+\lneume{cllst9} & \texttt{cllst9} & \texttt{L95D} & tempus\\
+\lneume{cllsst6} & \texttt{cllsst6} & \texttt{L43L} & mirabilia\\
+\lneume{cllsm2} & \texttt{cllsm2} & \texttt{L45R} & nobis\\
+\lneume{cllsnt2} & \texttt{cllsnt2} & \texttt{L92E} & me\\
+\lneume{cl>lsa5} & \texttt{cl>lsa5} & \texttt{L71D} & effundam\\ \hline
+& \multicolumn{3}{l}{\textbf{oriscus-clivis}} & \\
+\lneume{oc} & \texttt{oc} & \texttt{L78H} & sanguine\\
+\lneume{ocG} & \texttt{ocG} & \texttt{L56D} & Deus\\
+\lneume{ocG1} & \texttt{ocG1} & \texttt{L11Q} & veniet\\
+\lneume{ocGlsa5} & \texttt{ocGlsa5} & \texttt{L103T} & resurgeret\\
+\lneume{oclst8} & \texttt{oclst8} & \texttt{L95D} & Domine\\ \hline
+& \multicolumn{3}{l}{\textbf{torculus}} & \\
+\lneume{to} & \texttt{to} & \texttt{L78H} & pro\\
+\lneume{toS} & \texttt{toS} & \texttt{L56S} & populum\\
+\lneume{toS1} & \texttt{toS1} & \texttt{L68N} & Nemo\\
+\lneume{toG} & \texttt{toG} & \texttt{L78H} & tradetur\\
+\lneume{to>} & \texttt{to>} & \texttt{L67S} & mortis\\
+\lneume{to~} & \texttt{to~} & \texttt{L37M} & et\\
+\lneume{tolsf4} & \texttt{tolsf4} & \texttt{L95D} & tempus\\
+\lneume{tolsn8} & \texttt{tolsn8} & \texttt{L44I} & vespertinum.\\
+\lneume{tolst9} & \texttt{tolst9} & \texttt{L103P} & Alleluia.\\
+\lneume{tolsth8} & \texttt{tolsth8} & \texttt{L56I} & Dominus,\\
+\lneume{tolsnt2lst9} & \texttt{tolsnt2lst9} & \texttt{L92E} & me\\
+\lneume{toGlsa1lst8} & \texttt{toGlsa1lst8} & \texttt{L109P} & alleluia.\\
+\lneume{toGlsa5} & \texttt{toGlsa5} & \texttt{L68N} & condemnabo\\
+\lneume{toSlsa5} & \texttt{toSlsa5} & \texttt{L77S} & enim\\
+\lneume{to>lsa5} & \texttt{to>lsa5} & \texttt{L118E} & in\\
+\lneume{to>2lsa3} & \texttt{to>2lsa3} & \texttt{L67Q} & salientis\\
+\lneume{to>2lsc1lsa3} & \texttt{to>2lsc1lsa3} & \texttt{L104I} & terram\\ \hline
+& \multicolumn{3}{l}{\textbf{climacus}} & \\
+\lneume{ci} & \texttt{ci} & \texttt{L95D} & eius.\\
+\lneume{unsun2} & \texttt{unsun2} & \texttt{L82O} & da\\
+\lneume{unsun3} & \texttt{unsun3} & \texttt{L103P} & immolatus\\
+\lneume{unsux1} & \texttt{unsux1} & \texttt{L169A} & sanctum\\
+\lneume{unsun1su2} & \texttt{unsun1su2} & \texttt{L109P} & tenebris\\
+\lneume{pusu1sun1} & \texttt{pusu1sun1} & \texttt{L78H} & tradetur\\
+\lneume{pusu1sun2} & \texttt{pusu1sun2} & \texttt{L95D} & Sion\\
+\lneume{pusu2sun1} & \texttt{pusu2sun1} & \texttt{L95D} & eius.\\
+\lneume{visu1sun1} & \texttt{visu1sun1} & \texttt{L95D} & faciem\\
+\lneume{visu1sun2} & \texttt{visu1sun2} & \texttt{L40Q} & latere\\
+\lneume{visu1sun2lsa5} & \texttt{visu1sun2lsa5} & \texttt{L174D} & et\\
+\lneume{visu1sun2lsa6} & \texttt{visu1sun2lsa6} & \texttt{L174D} & et\\
+\lneume{visu1sun1su1} & \texttt{visu1sun1su1} \textit{Cf.} \lneume{visu1sun1su1lst6} & \multicolumn{3}{l}{\texttt{visu1sun1su1lst6} minus letter} \\
+\lneume{visu1sun1su1lst6} & \texttt{visu1sun1su1lst6} & \texttt{L105N} & descendit\\
+\lneume{visu1sun1su2} & \texttt{visu1sun1su2} \textit{Cf.} \lneume{visu1sun1su2lss1lst6} & \multicolumn{3}{l}{\texttt{visu1sun1su2lss1lst6} minus letters} \\
+\lneume{visu1sun1su2lss1lst6} & \texttt{visu1sun1su2lss1lst6} & \texttt{L168I} & Alleluia.\\
+\lneume{visu2} & \texttt{visu2} & \texttt{L95D} & misereberis\\
+\lneume{visun1su1sun1} & \texttt{visun1su1sun1} & \texttt{L60E} & conspectu\\
+\lneume{visun1su1sun1lst6} & \texttt{visun1su1sun1lst6} & \texttt{L35T} & virtutem\\
+\lneume{cilsf1} & \texttt{cilsf1} & \texttt{L95D} & Sion\\
+\lneume{cilsn8} & \texttt{cilsn8} & \texttt{L58A} & iniquis,\\
+\lneume{pusu1sun1lsf1} & \texttt{pusu1sun1lsf1} & \texttt{L95D} & mei\\
+\lneume{pusu1sun2lsa5} & \texttt{pusu1sun2lsa5} & \texttt{L67S} & timebo\\
+\lneume{pusu1sun1lst7} & \texttt{pusu1sun1lst7} & \texttt{L60E} & homo\\
+\lneume{pusu3} & \texttt{pusu3} & \texttt{L64O} & escam\\
+\lneume{pusu4} & \texttt{pusu4} & \texttt{L92E} & persequntur.\\
+\lneume{unsun2su1} & \texttt{unsun2su1} & \texttt{L64O} & escam\\
+\lneume{unsun1su1} & \texttt{unsun1su1} \textit{Cf.} \lneume{unsun1su1lst2lsc6} & \multicolumn{3}{l}{\texttt{unsun1su1lst2lsc6} minus letters} \\
+\end{supertabular}
+
+\vfill
+\pagebreak
+
+\begin{supertabular}{lllll}\noindent
+\lneume{unsun1su1lst2lsc6} & \texttt{unsun1su1lst2lsc6} & \texttt{L11Q} & deducis\\
+\lneume{unsun2lsa5} & \texttt{unsun2lsa5} & \texttt{L19B} & mirabile\\
+\lneume{unsun3lsa3} & \texttt{unsun3lsa3} & \texttt{L24T} & gentes\\
+\lneume{unsun3lsa6} & \texttt{unsun3lsa6} & \texttt{L24T} & tuam.\\
+\lneume{unsun2su2} & \texttt{unsun2su2} & \texttt{L169A} & confitebor\\
+\lneume{un1sun2su2} & \texttt{un1sun2su2} & \texttt{L136A} & aeternam\\
+\lneume{un1sun1su1sun1lsa1lsc4} & \texttt{un1sun1su1sun1lsa1lsc4} & \texttt{L60E} & retrorsum\\
+\lneume{un1sun1su1sun1lsa3lsc6} & \texttt{un1sun1su1sun1lsa3lsc6} & \texttt{L60E} & retrorsum\\
+\lneume{un1sun1su2} & \texttt{un1sun1su2} \textit{Cf.} \lneume{un1sun1su2lsa5} & \multicolumn{3}{l}{\texttt{un1sun1su2lsa5} minus letter} \\
+\lneume{un1sun1su2lsa5} & \texttt{un1sun1su2lsa5} & \texttt{L107H} & Domini\\ \hline
+& \multicolumn{3}{l}{\textbf{scandicus}} & \\
+\lneume{sc} & \texttt{sc} \textit{Cf.} \lneume{sclst2} & \multicolumn{3}{l}{\texttt{sclst2} minus letter} \\
+\lneume{sc1} & \texttt{sc1} & \texttt{L82O} & quia\\
+\lneume{sclst2} & \texttt{sclst2} & \texttt{L78H} & quotiescumque\\
+\lneume{sc1lsc4} & \texttt{sc1lsc4} & \texttt{L109P} & vocavit\\ \hline
+& \multicolumn{3}{l}{\textbf{porrectus flexus}} & \\
+\lneume{pf} & \texttt{pf} & \texttt{L78H} & corpus\\
+\lneume{pf1} & \texttt{pf1} & \texttt{L95D} & exaudi\\
+\lneume{pf2} & \texttt{pf2} & \texttt{L101V} & Sorec,\\
+\lneume{pfS} & \texttt{pfS} & \texttt{L56D} & festina\\
+\lneume{pfM} & \texttt{pfM} \textit{Cf.} \lneume{pfMlsmd3} & \multicolumn{3}{l}{\texttt{pfMlsmd3} minus letter} \\
+\lneume{pfMlsmd3} & \texttt{pfMlsmd3} & \texttt{L81E} & meam,\\
+\lneume{pf>} & \texttt{pf>} & \texttt{L164D} & ad\\
+\lneume{pf>1} & \texttt{pf>1} & \texttt{L90D} & miserunt\\
+\lneume{pf>2} & \texttt{pf>2} & \texttt{L104I} & alleluia,\\
+\lneume{pf~} & \texttt{pf~} & \texttt{L95D} & clamor\\
+\lneume{pf~1} & \texttt{pf~1} & \texttt{L31D} & ad\\ \hline
+& \multicolumn{3}{l}{\textbf{pes subbipunctis}} & \\
+\lneume{tosu1} & \texttt{tosu1} & \texttt{L82O} & Domine\\
+\lneume{tosun1} & \texttt{tosun1} & \texttt{L95D} & fumus\\
+\lneume{tosun2} & \texttt{tosun2} & \texttt{L105N} & revolvit\\
+\lneume{vippn1su2} & \texttt{vippn1su2} & \texttt{L82O} & misericordiae\\
+\lneume{topp1su1} & \texttt{topp1su1} \textit{Cf.} \lneume{topp1su1lsa6} & \multicolumn{3}{l}{\texttt{topp1su1lsa6} minus letter} \\
+\lneume{topp1su1lsa6} & \texttt{topp1su1lsa6} & \texttt{L95D} & ad\\
+\lneume{pesu2} & \texttt{pesu2} \textit{Cf.} \lneume{pesu2lst3} & \multicolumn{3}{l}{\texttt{pesu2lst3} minus letter} \\
+\lneume{pesu2lst3} & \texttt{pesu2lst3} & \texttt{L152I} & eruas\\
+\lneume{pesun3} & \texttt{pesun3} \textit{Cf.} \lneume{pesun3lss1lsa3} & \multicolumn{3}{l}{\texttt{pesun3lss1lsa3} minus letters} \\
+\lneume{pesun3lss1lsa3} & \texttt{pesun3lss1lsa3} & \texttt{L67S} & medio\\
+\lneume{pesu2sun1} & \texttt{pesu2sun1} & \texttt{L24T} & terrae\\
+\lneume{tosun1lsa5} & \texttt{tosun1lsa5} & \texttt{L67S} & tua,\\
+\lneume{tosu1lsc5} & \texttt{tosu1lsc5} & \texttt{L19B} & venit\\
+\lneume{toSsun1lsa5} & \texttt{toSsun1lsa5} & \texttt{L138S} & luna\\
+\lneume{tosun1su1sun1} & \texttt{tosun1su1sun1} & \texttt{L33S} & venti.\\
+\lneume{tosun1su2lsn3lst6} & \texttt{tosun1su2lsn3lst6} & \texttt{L112D} & nomine\\
+\lneume{tosun2lsa6} & \texttt{tosun2lsa6} & \texttt{L123A} & alleluia.\\ \hline
+& \multicolumn{3}{l}{\textbf{scandicus flexus}} & \\
+\lneume{sf} & \texttt{sf} & \texttt{L78H} & meo\\
+\lneume{sfG} & \texttt{sfG} & \texttt{L33C} & eam.\\ \hline
+& \multicolumn{3}{l}{\textbf{torculus resupinus}} & \\
+\lneume{tr} & \texttt{tr} & \texttt{L78H} & sumitis\\
+\lneume{trS} & \texttt{trS} & \texttt{L95D} & Domine,\\
+\lneume{tr>} & \texttt{tr>} & \texttt{L64D} & diligerent\\
+\lneume{poppn1} & \texttt{poppn1} & \texttt{L82O} & vero\\
+\lneume{po>ppn1} & \texttt{po>ppn1} & \texttt{L82O} & secundum\\
+\lneume{po>pp2} & \texttt{po>pp2} & \texttt{L28G} & angeli,\\
+\lneume{trlst3lshp7} & \texttt{trlst3lshp7} & \texttt{L109P} & alleluia.\\
+\lneume{trlss1lss3} & \texttt{trlss1lss3} & \texttt{L103P} & Christus.\\
+\lneume{trSlsc1} & \texttt{trSlsc1} & \texttt{L103P} & nostrum\\ \hline
+& \multicolumn{3}{l}{\textbf{distropha}} & \\
+\lneume{ds} & \texttt{ds} \textit{Cf.} \lneume{dslst2} & \multicolumn{3}{l}{\texttt{dslst2} minus letter} \\
+\lneume{dslst2} & \texttt{dslst2} & \texttt{L95D} & meam\\
+\lneume{dslst8} & \texttt{dslst8} & \texttt{L71D} & effundam\\
+\lneume{ds1} & \texttt{ds1} \textit{Cf.} \lneume{ds1pp3} & \multicolumn{3}{l}{\texttt{ds1pp3} minus prepunctis} \\ \hline
+\end{supertabular}
+
+\vfill
+\pagebreak
+
+\begin{supertabular}{lllll}\noindent
+& \multicolumn{3}{l}{\textbf{tristropha}} & \\
+\lneume{ts} & \texttt{ts} & \texttt{L82O} & fac\\
+\lneume{ts1} & \texttt{ts1} & \texttt{L76E} & Eripe\\
+\lneume{ts>} & \texttt{ts>} & \texttt{L56D} & adiuvandum\\
+\lneume{ts>1} & \texttt{ts>1} & \texttt{L103R} & alleluia\\
+\lneume{tslsa2} & \texttt{tslsa2} & \texttt{L13A} & tecum\\
+\lneume{tslsc2lst2} & \texttt{tslsc2lst2} & \texttt{L58A} & Domine,\\
+\lneume{ts>lsc2} & \texttt{ts>lsc2} & \texttt{L103R} & alleluia\\
+\lneume{ts>lsc6} & \texttt{ts>lsc6} & \texttt{L103T} & dum\\ \hline
+& \multicolumn{3}{l}{\textbf{trigonus}} & \\
+\lneume{tg} & \texttt{tg} & \texttt{L67S} & tua,\\
+\lneume{tglsn8} & \texttt{tglsn8} & \texttt{L67S} & mala\\
+\lneume{tglst9} & \texttt{tglst9} & \texttt{L103R} & alleluia\\ \hline
+& \multicolumn{3}{l}{\textbf{bivirga}} & \\
+\lneume{bv} & \texttt{bv} & \texttt{L82O} & Domine\\
+\lneume{bvlsa2} & \texttt{bvlsa2} & \texttt{L82O} & nobis\\ \hline
+& \multicolumn{3}{l}{\textbf{trivirga}} & \\
+\lneume{tv} & \texttt{tv} & \texttt{L103H} & bonus\\
+\lneume{tvlsm2} & \texttt{tvlsm2} & \texttt{L44I} & Elevatio\\ \hline
+& \multicolumn{3}{l}{\textbf{pressus}} & \\
+\lneume{pr} & \texttt{pr} & \texttt{L95D} & veniat\\
+\lneume{pi} & \texttt{pi} \textit{Cf.} \lneume{cl1!pi} & \multicolumn{3}{l}{\texttt{cl1!pi} minus clivis} \\ \hline
+& \multicolumn{3}{l}{\textbf{virga strata}} & \\
+\lneume{vs} & \texttt{vs} & \texttt{L64D} & Deus\\
+\lneume{vsG} & \texttt{vsG} & \texttt{L64D} & suavis\\ \hline
+& \multicolumn{3}{l}{\textbf{oriscus}} & \\
+\lneume{or} & \texttt{or} \textit{Cf.} \lneume{ocG} & \multicolumn{3}{l}{\texttt{ocG} minus uncinus} \\
+\lneume{orlst3} & \texttt{orlst3} & \texttt{L103P} & Alleluia.\\
+\lneume{or1} & \texttt{or1} \textit{Cf.} \lneume{ocG1} & \multicolumn{3}{l}{\texttt{ocG1} minus uncinus} \\
+\lneume{or>} & \texttt{or>} \textit{Cf.} \lneume{or>lsa1} & \multicolumn{3}{l}{\texttt{or>lsa1} minus letter} \\
+\lneume{or>lsa1} & \texttt{or>lsa1} & \texttt{L103R} & alleluia,\\ \hline
+& \multicolumn{3}{l}{\textbf{salicus}} & \\
+\lneume{sa} & \texttt{sa} & \texttt{L82O} & nomini\\
+\lneume{sa1} & \texttt{sa1} & \texttt{L78H} & novi\\
+\lneume{sa>1} & \texttt{sa>1} & \texttt{L9E} & sanctos\\
+\lneume{salsc4} & \texttt{salsc4} & \texttt{L93G} & exsurge\\
+\lneume{salsc6} & \texttt{salsc6} & \texttt{L93G} & autem,\\
+\lneume{sa1lsc4} & \texttt{sa1lsc4} & \texttt{L81E} & salvasti\\
+\lneume{sa1lsc6} & \texttt{sa1lsc6} & \texttt{L113E} & bonus,\\ \hline
+& \multicolumn{3}{l}{\textbf{pes quassus}} & \\
+\lneume{pq} & \texttt{pq} & \texttt{L103H} & eius.\\
+\lneume{pq1} & \texttt{pq1} & \texttt{L169A} & Alleluia. & \texttt{L174T}\\ \hline
+& \multicolumn{3}{l}{\textbf{quilisma}} & \\
+\lneume{ql} & \texttt{ql} \textit{Cf.} \lneume{qllsst2} & \multicolumn{3}{l}{\texttt{qllsst2} minus letter} \\
+\lneume{qllsst2} & \texttt{qllsst2} & \texttt{L53C} & Domine,\\
+\lneume{ql>} & \texttt{ql>} \textit{Cf.} \lneume{ql>ppn1} & \multicolumn{3}{l}{\texttt{ql>ppn1} minus uncinus} \\ \hline
+& \multicolumn{3}{l}{\textbf{pes stratus}} & \\
+\lneume{pt1} & \texttt{pt1} & \texttt{L13A} & ventris\\
+\lneume{pt2} & \texttt{pt2} & \texttt{L8U} & confundentur,\\
+\lneume{pt3} & \texttt{pt3} & \texttt{L94C} & Domine.\\ \hline
+& \multicolumn{3}{l}{\textbf{subpunctis}} & \\
+\lneume{su1} & \texttt{su1} \textit{Cf.} \lneume{cl1!pi!tosu1} & \multicolumn{2}{l}{\texttt{cl1!pi!tosu1}}\\
+\lneume{su1sun1} & \texttt{su1sun1} \textit{Cf.} \lneume{cl!toppz1su1sun1} & \multicolumn{2}{l}{\texttt{cl!toppz1su1sun1}}\\
+\lneume{su1sun1su1} & \texttt{su1sun1su1} \textit{Cf.} \lneume{visu1sun1su1lst6} & \multicolumn{2}{l}{\texttt{visu1sun1su1lst6}}\\
+\lneume{su1sun1su2} & \texttt{su1sun1su2} \textit{Cf.} \lneume{visu1sun1su2lss1lst6} & \multicolumn{2}{l}{\texttt{visu1sun1su2lss1lst6}}\\
+\lneume{su1sun2} & \texttt{su1sun2} \textit{Cf.} \lneume{pusu1sun2} & \multicolumn{2}{l}{\texttt{pusu1sun2}}\\
+\lneume{su1sux1} & \texttt{su1sux1} \textit{Cf.} \lneume{popp2su1sux1} & \multicolumn{2}{l}{\texttt{popp2su1sux1}}\\
+\lneume{su2} & \texttt{su2} \textit{Cf.} \lneume{cl1!pi!pesu2} & \multicolumn{2}{l}{\texttt{cl1!pi!pesu2}}\\
+\lneume{su2sun1} & \texttt{su2sun1} \textit{Cf.} \lneume{clsu2sun1lst6} & \multicolumn{2}{l}{\texttt{clsu2sun1lst6}}\\
+\lneume{su3} & \texttt{su3} \textit{Cf.} \lneume{pusu3} & \multicolumn{2}{l}{\texttt{pusu3}}\\
+\lneume{su4} & \texttt{su4} \textit{Cf.} \lneume{pusu4} & \multicolumn{2}{l}{\texttt{pusu4}}\\
+\lneume{sun1} & \texttt{sun1} \textit{Cf.} \lneume{cl1!pi!orsun1} & \multicolumn{2}{l}{\texttt{cl1!pi!orsun1}}\\
+\lneume{sun1su1} & \texttt{sun1su1} \textit{Cf.} \lneume{unsun1su1lst2lsc6} & \multicolumn{2}{l}{\texttt{unsun1su1lst2lsc6}}\\
+\lneume{sun1su1sun1} & \texttt{sun1su1sun1} \textit{Cf.} \lneume{visun1su1sun1} & \multicolumn{2}{l}{\texttt{visun1su1sun1}}\\
+\lneume{sun1su2} & \texttt{sun1su2} \textit{Cf.} \lneume{qlppn1sun1su2} & \multicolumn{2}{l}{\texttt{qlppn1sun1su2}}\\
+\lneume{sun2} & \texttt{sun2} \textit{Cf.} \lneume{qlsun2} & \multicolumn{2}{l}{\texttt{qlsun2}}\\
+\lneume{sun2su1} & \texttt{sun2su1} \textit{Cf.} \lneume{unsun2su1} & \multicolumn{2}{l}{\texttt{unsun2su1}}\\
+\lneume{sun2su2} & \texttt{sun2su2} \textit{Cf.} \lneume{unsun2su2} & \multicolumn{2}{l}{\texttt{unsun2su2}}\\
+\end{supertabular}
+
+\vfill
+\pagebreak
+
+\begin{supertabular}{lllll}\noindent
+\lneume{sun3} & \texttt{sun3} \textit{Cf.} \lneume{unsun3} & \multicolumn{2}{l}{\texttt{unsun3}}\\
+\lneume{sun4} & \texttt{sun4} \textit{Cf.} \lneume{bvsun4} & \multicolumn{2}{l}{\texttt{bvsun4}}\\
+\lneume{sux1} & \texttt{sux1} \textit{Cf.} \lneume{posux1} & \multicolumn{2}{l}{\texttt{posux1}}\\ \hline
+& \multicolumn{3}{l}{\textbf{prepunctis}} & \\
+\lneume{pp1} & \texttt{pp1} \textit{Cf.} \lneume{pupp1su2} & \multicolumn{2}{l}{\texttt{pupp1su2}}\\
+\lneume{pp2} & \texttt{pp2} \textit{Cf.} \lneume{cl1!pipp2} & \multicolumn{2}{l}{\texttt{cl1!pipp2}}\\
+\lneume{pp2ppn1} & \texttt{pp2ppn1} \textit{Cf.} \lneume{vipp2ppn1} & \multicolumn{2}{l}{\texttt{vipp2ppn1}}\\
+\lneume{pp3} & \texttt{pp3} \textit{Cf.} \lneume{vipp3lsn3} & \multicolumn{2}{l}{\texttt{vipp3lsn3}}\\
+\lneume{pp4} & \texttt{pp4} \textit{Cf.} \lneume{vipp4lst2} & \multicolumn{2}{l}{\texttt{vipp4lst2}}\\
+\lneume{ppn1} & \texttt{ppn1} \textit{Cf.} \lneume{po>ppn1} & \multicolumn{2}{l}{\texttt{po>ppn1}}\\
+\lneume{ppn1pp1} & \texttt{ppn1pp1} \textit{Cf.} \lneume{vippn1pp1} & \multicolumn{2}{l}{\texttt{vippn1pp1}}\\
+\lneume{ppn1pp1ppz1} & \texttt{ppn1pp1ppz1} \textit{Cf.} \lneume{vippn1pp1ppz1lst8} & \multicolumn{2}{l}{\texttt{vippn1pp1ppz1lst8}}\\
+\lneume{ppn1ppq1} & \texttt{ppn1ppq1} \textit{Cf.} \lneume{vippn1ppq1} & \multicolumn{2}{l}{\texttt{vippn1ppq1}}\\
+\lneume{ppn1ppz1} & \texttt{ppn1ppz1} \textit{Cf.} \lneume{ql!cl!orppn1ppz1} & \multicolumn{2}{l}{\texttt{ql!cl!orppn1ppz1}}\\
+\lneume{ppn1ppz1ppq1} & \texttt{ppn1ppz1ppq1} \textit{Cf.} \lneume{vi>1ppn1ppz1ppq1} & \multicolumn{2}{l}{\texttt{vi>1ppn1ppz1ppq1}}\\
+\lneume{ppn2} & \texttt{ppn2} \textit{Cf.} \lneume{vippn2lst3lsa4} & \multicolumn{2}{l}{\texttt{vippn2lst3lsa4}}\\
+\lneume{ppn2ppz1} & \texttt{ppn2ppz1} \textit{Cf.} \lneume{vippn2ppz1sun1lsa5} & \multicolumn{2}{l}{\texttt{vippn2ppz1sun1lsa5}}\\
+\lneume{ppn2ppz1ppq1} & \texttt{ppn2ppz1ppq1} \textit{Cf.} \lneume{vippn2ppz1ppq1lst2lsa8} & \multicolumn{2}{l}{\texttt{vippn2ppz1ppq1lst2lsa8}}\\
+\lneume{ppn3} & \texttt{ppn3} \textit{Cf.} \lneume{unppn3sun1lsa5} & \multicolumn{2}{l}{\texttt{unppn3sun1lsa5}}\\
+\lneume{ppn3ppz1} & \texttt{ppn3ppz1} \textit{Cf.} \lneume{toppn3ppz1sun1} & \multicolumn{2}{l}{\texttt{toppn3ppz1sun1}}\\
+\lneume{ppn4} & \texttt{ppn4} \textit{Cf.} \lneume{vippn4} & \multicolumn{2}{l}{\texttt{vippn4}}\\
+\lneume{ppq1} & \texttt{ppq1} \textit{Cf.} \lneume{vippq1} & \multicolumn{2}{l}{\texttt{vippq1}}\\
+\lneume{ppz1} & \texttt{ppz1} \textit{Cf.} \lneume{puppz1su2} & \multicolumn{2}{l}{\texttt{puppz1su2}}\\
+\lneume{ppz1ppq1} & \texttt{ppz1ppq1} \textit{Cf.} \lneume{vi>1ppz1ppq1} & \multicolumn{2}{l}{\texttt{vi>1ppz1ppq1}}\\ \hline
+& \multicolumn{3}{l}{\textbf{combined glyphs}} & \\
+\lneume{pe!ta} & \texttt{pe!ta} \textit{Cf.} \lneume{pe!talsa2} & \multicolumn{3}{l}{\texttt{pe!talsa2} minus letter} \\
+\lneume{pe!talsa2} & \texttt{pe!talsa2} & \texttt{L82O} & iudicio\\
+\lneume{pe!talsc1lst2} & \texttt{pe!talsc1lst2} & \texttt{L114C} & revelavit\\
+\lneume{pe!un} & \texttt{pe!un} \textit{Cf.} \lneume{pe!unlsc2} & \multicolumn{3}{l}{\texttt{pe!unlsc2} minus letter} \\
+\lneume{pe!unlsc2} & \texttt{pe!unlsc2} & \texttt{L95D} & meam\\
+\lneume{pe!pu} & \texttt{pe!pu} & \texttt{L95D} & eius.\\
+\lneume{pe!ta>2} & \texttt{pe!ta>2} \textit{Cf.} \lneume{pe!ta>2lsa2} & \multicolumn{3}{l}{\texttt{pe!ta>2lsa2} minus letter} \\
+\lneume{pe!ta>2lsa2} & \texttt{pe!ta>2lsa2} & \texttt{L60E} & gentes\\
+\lneume{pe!or} & \texttt{pe!or} & \texttt{L93G} & induebam\\
+\lneume{qlppn1sun1} & \texttt{qlppn1sun1} & \texttt{L53C} & Domino,\\
+\lneume{qlppn1sun1su2} & \texttt{qlppn1sun1su2} & \texttt{L82O} & tibi\\
+\lneume{qlppn1su1sun2} & \texttt{qlppn1su1sun2} & \texttt{L95D} & frixorio\\
+\lneume{qlppn1su2} & \texttt{qlppn1su2} \textit{Cf.} \lneume{qlppn1su2lsnl1} & \multicolumn{3}{l}{\texttt{qlppn1su2lsnl1} minus letters} \\
+\lneume{qlppn1su2lsnl1} & \texttt{qlppn1su2lsnl1} & \texttt{L75V} & mortuus.\\
+\lneume{qlppn1sun1lsc5} & \texttt{qlppn1sun1lsc5} & \texttt{L54B} & quoniam\\
+\lneume{qlppn1su1sun1} & \texttt{qlppn1su1sun1} & \texttt{L107H} & fecit\\
+\lneume{qlsu1sun1} & \texttt{qlsu1sun1} & \texttt{L43L} & tua\\
+\lneume{qlsu2} & \texttt{qlsu2} & \texttt{L67S} & tua,\\
+\lneume{qlsux1} & \texttt{qlsux1} & \texttt{L53C} & quoniam\\
+\lneume{qlsun1su2} & \texttt{qlsun1su2} & \texttt{L44I} & mearum\\
+\lneume{qlsun1} & \texttt{qlsun1} \textit{Cf.} \lneume{qlsun1lsa5} & \multicolumn{3}{l}{\texttt{qlsun1lsa5} minus letter} \\
+\lneume{qlsun1lsa5} & \texttt{qlsun1lsa5} & \texttt{L40Q} & millia\\
+\lneume{qlsun2} & \texttt{qlsun2} & \texttt{L122N} & alleluia.\\
+\lneume{qlsun2lsa5} & \texttt{qlsun2lsa5} & \texttt{L125U} & alleluia.\\
+\lneume{ql!po} & \texttt{ql!po} & \texttt{L82O} & obedivimus\\
+\lneume{ql!poppz1} & \texttt{ql!poppz1} \textit{Cf.} \lneume{ql!poppz1lsa3} & \multicolumn{3}{l}{\texttt{ql!poppz1lsa3} minus letter} \\
+\lneume{ql!poppz1lsa3} & \texttt{ql!poppz1lsa3} & \texttt{L95D} & Domine,\\
+\lneume{ql!poppn1} & \texttt{ql!poppn1} & \texttt{L43L} & Domine,\\
+\lneume{ql!posu1sun1} & \texttt{ql!posu1sun1} \textit{Cf.} \lneume{ql!poppz1su1sun1} & \multicolumn{3}{l}{\texttt{ql!poppz1su1sun1} minus uncinus} \\
+\lneume{ql!poppz1su1sun1} & \texttt{ql!poppz1su1sun1} & \texttt{L43L} & mandata\\
+\lneume{ql!posun1} & \texttt{ql!posun1} \textit{Cf.} \lneume{ql!poppn1sun1} & \multicolumn{3}{l}{\texttt{ql!poppn1sun1} minus uncinus} \\
+\lneume{ql!poppn1sun1} & \texttt{ql!poppn1sun1} & \texttt{L61I} & Iustitiae\\
+\lneume{ql!poppn1lst2} & \texttt{ql!poppn1lst2} & \texttt{L103P} & Alleluia.\\
+\lneume{ql!posux1} & \texttt{ql!posux1} \textit{Cf.} \lneume{ql!poppn1sux1} & \multicolumn{3}{l}{\texttt{ql!poppn1sux1} minus uncinus} \\
+\lneume{ql!poppn1sux1} & \texttt{ql!poppn1sux1} & \texttt{L61I} & corda,\\
+\end{supertabular}
+
+\vfill
+\pagebreak
+
+\begin{supertabular}{lllll}\noindent
+\lneume{ql!polsm1} & \texttt{ql!polsm1} & \texttt{L103P} & immolatus\\
+\lneume{ql!polsa1lsa3lsa9} & \texttt{ql!polsa1lsa3lsa9} & \texttt{L56P} & nostris\\
+\lneume{ql!po>} & \texttt{ql!po>} \textit{Cf.} \lneume{ql!po>ppn1} & \multicolumn{3}{l}{\texttt{ql!po>ppn1} minus uncinus} \\
+\lneume{ql!po>ppn1} & \texttt{ql!po>ppn1} & \texttt{L60A} & ancillae\\
+\lneume{ql!cl} & \texttt{ql!cl} & \texttt{L43L} & doceas\\
+\lneume{ql!cl!to} & \texttt{ql!cl!to} \textit{Cf.} \lneume{ql!cl!tolst6} & \multicolumn{3}{l}{\texttt{ql!cl!tolst6} minus letter} \\
+\lneume{ql!cl!tolst6} & \texttt{ql!cl!tolst6} & \texttt{L95D} & me.\\
+\lneume{ql!cl!to!or} & \texttt{ql!cl!to!or} \textit{Cf.} \lneume{ql!cl!to!orsun1} & \multicolumn{3}{l}{\texttt{ql!cl!to!orsun1} minus uncinus} \\
+\lneume{ql!cl!to!orsun1} & \texttt{ql!cl!to!orsun1} & \texttt{L19B} & nobis.\\
+\lneume{ql!cl!toppn1} & \texttt{ql!cl!toppn1} & \texttt{L72B} & vitam,\\
+\lneume{ql!cl!tosu3} & \texttt{ql!cl!tosu3} \textit{Cf.} \lneume{ql!cl!tosu3lst6} & \multicolumn{3}{l}{\texttt{ql!cl!tosu3lst6} minus letter} \\
+\lneume{ql!cl!tosu3lst6} & \texttt{ql!cl!tosu3lst6} & \texttt{L82T} & hostias,\\
+\lneume{ql!cl!or} & \texttt{ql!cl!or} \textit{Cf.} \lneume{ql!cl!orppn1ppz1} & \multicolumn{3}{l}{\texttt{ql!cl!orppn1ppz1} minus uncinus \& virga} \\
+\lneume{ql!cl!orppn1ppz1} & \texttt{ql!cl!orppn1ppz1} & \texttt{L109P} & Populus\\
+\lneume{ql!cl!tr>} & \texttt{ql!cl!tr>} \textit{Cf.} \lneume{ql!cl!tr>ppz1} & \multicolumn{3}{l}{\texttt{ql!cl!tr>ppz1} minus virga} \\
+\lneume{ql!cl!tr>ppz1} & \texttt{ql!cl!tr>ppz1} & \texttt{L54B} & vias\\
+\lneume{ql!clppn1} & \texttt{ql!clppn1} & \texttt{L54B} & a\\
+\lneume{qlppn1} & \texttt{qlppn1} & \texttt{L82O} & nomini\\
+\lneume{qlppn1ppz1} & \texttt{qlppn1ppz1} & \texttt{L82O} & gloriam\\
+\lneume{qlppn1ppz1lst2} & \texttt{qlppn1ppz1lst2} & \texttt{L82O} & da\\
+\lneume{qlppn1ppz1sun1} & \texttt{qlppn1ppz1sun1} \textit{Cf.} \lneume{qlppn1ppz1sun1lsa5} & \multicolumn{3}{l}{\texttt{qlppn1ppz1sun1lsa5} minus letter} \\
+\lneume{qlppn1ppz1sun1lsa5} & \texttt{qlppn1ppz1sun1lsa5} & \texttt{L54B} & mihi\\
+\lneume{qlppn1ppz1su1sun1} & \texttt{qlppn1ppz1su1sun1} & \texttt{L43I} & dominorum\\
+\lneume{qlppn2sun1} & \texttt{qlppn2sun1} \textit{Cf.} \lneume{qlppn2sun1lsa5} & \multicolumn{3}{l}{\texttt{qlppn2sun1lsa5} minus letter} \\
+\lneume{qlppn2sun1lsa5} & \texttt{qlppn2sun1lsa5} & \texttt{L53C} & Beati\\
+\lneume{qlppn2sun2} & \texttt{qlppn2sun2} \textit{Cf.} \lneume{qlppn2sun2lsa5lsa5} & \multicolumn{3}{l}{\texttt{qlppn2sun2lsa5lsa5} minus letters} \\
+\lneume{qlppn2sun2lsa5lsa5} & \texttt{qlppn2sun2lsa5lsa5} & \texttt{L122V} & sic\\
+\lneume{qlppz1su2} & \texttt{qlppz1su2} & \texttt{L40Q} & draconem.\\
+\lneume{qlppz1su1sun1} & \texttt{qlppz1su1sun1} & \texttt{L53C} & nos\\
+\lneume{ql>ppn1} & \texttt{ql>ppn1} & \texttt{L95D} & confrixa\\
+\lneume{ql>ppn1lsc3} & \texttt{ql>ppn1lsc3} & \texttt{L90D} & speraverunt\\
+\lneume{popp2} & \texttt{popp2} & \texttt{L82O} & multitudinem\\
+\lneume{popp2su1sux1} & \texttt{popp2su1sux1} & \texttt{L8U} & confundentur,\\
+\lneume{posux1} & \texttt{posux1} & \texttt{L20P} & eius\\
+\lneume{posux1lsa5} & \texttt{posux1lsa5} & \texttt{L114V} & alleluia,\\
+\lneume{posun1lsa5} & \texttt{posun1lsa5} & \texttt{L123A} & alleluia.\\
+\lneume{poMsun1} & \texttt{poMsun1} & \texttt{L81E} & meos\\
+\lneume{posu1sun1} & \texttt{posu1sun1} & \texttt{L123E} & alleluia.\\
+\lneume{vippn1su1} & \texttt{vippn1su1} & \texttt{L56D} & Deus\\
+\lneume{vippn1sux1} & \texttt{vippn1sux1} & \texttt{L53C} & Memento\\
+\lneume{vippn1su1sun1} & \texttt{vippn1su1sun1} & \texttt{L45R} & tuae,\\
+\lneume{vippn1su1sun1lst2} & \texttt{vippn1su1sun1lst2} & \texttt{L95D} & Domine,\\
+\lneume{vippn2sun1} & \texttt{vippn2sun1} \textit{Cf.} \lneume{vippn2sun1lsa4} & \multicolumn{3}{l}{\texttt{vippn2sun1lsa4} minus letter} \\
+\lneume{vippn2sun1lsa4} & \texttt{vippn2sun1lsa4} & \texttt{L44I} & mea\\
+\lneume{vippn2} & \texttt{vippn2} \textit{Cf.} \lneume{vippn2lsa4} & \multicolumn{3}{l}{\texttt{vippn2lsa4} minus letter} \\
+\lneume{vippn2lsc4} & \texttt{vippn2lsc4} & \texttt{L56D} & quaerunt\\
+\lneume{vippn2lsa4} & \texttt{vippn2lsa4} & \texttt{L44I} & Elevatio\\
+\lneume{vippn2lst3lsa4} & \texttt{vippn2lst3lsa4} & \texttt{L103P} & Alleluia.\\
+\lneume{vippn3} & \texttt{vippn3} & \texttt{L38I} & Domino,\\
+\lneume{vippn4} & \texttt{vippn4} & \texttt{L60E} & homo\\
+\lneume{vipp2ppn1} & \texttt{vipp2ppn1} & \texttt{L13A} & gratia\\
+\lneume{cl!pe} & \texttt{cl!pe} \textit{Cf.} \lneume{cl!pelsc2} & \multicolumn{3}{l}{\texttt{cl!pelsc2} minus letter} \\
+\lneume{cl!pelst2} & \texttt{cl!pelst2} & \texttt{L95D} & sum\\
+\lneume{cl!pelsc2} & \texttt{cl!pelsc2} & \texttt{L105A} & Domini\\
+\lneume{cl!pelsn7} & \texttt{cl!pelsn7} & \texttt{L103H} & ea.\\
+\lneume{vipp2su2} & \texttt{vipp2su2} & \texttt{L43L} & mihi\\
+\lneume{vipp2sun1lsa5} & \texttt{vipp2sun1lsa5} & \texttt{L168L} & eum\\
+\lneume{vipp3} & \texttt{vipp3} \textit{Cf.} \lneume{vipp3lsn3} & \multicolumn{3}{l}{\texttt{vipp3lsn3} minus letter} \\
+\end{supertabular}
+
+\vfill
+\pagebreak
+
+\begin{supertabular}{lllll}\noindent
+\lneume{vipp3lsn3} & \texttt{vipp3lsn3} & \texttt{L152S} & Sicut\\
+\lneume{vippn1pp1} & \texttt{vippn1pp1} & \texttt{L11Q} & Israel,\\
+\lneume{vippn1pp1su1sun2} & \texttt{vippn1pp1su1sun2} & \texttt{L40Q} & volante\\
+\lneume{vippn3su4} & \texttt{vippn3su4} & \texttt{L173D} & Alleluia.\\
+\lneume{vipp4} & \texttt{vipp4} \textit{Cf.} \lneume{vipp4lst2} & \multicolumn{3}{l}{\texttt{vipp4lst2} minus letter} \\
+\lneume{vipp4lst2} & \texttt{vipp4lst2} & \texttt{L13A} & Ave\\
+\lneume{vippz1ppq1} & \texttt{vippz1ppq1} & \texttt{L40Q} & lapidem\\
+\lneume{vippn1ppq1} & \texttt{vippn1ppq1} & \texttt{L33S} & venti.\\
+\lneume{vippn1ppz1ppq1} & \texttt{vippn1ppz1ppq1} & \texttt{L101V} & Israel\\
+\lneume{vippn1pp1ppz1} & \texttt{vippn1pp1ppz1} \textit{Cf.} \lneume{vippn1pp1ppz1lst8} & \multicolumn{3}{l}{\texttt{vippn1pp1ppz1lst8} minus letter} \\
+\lneume{vippn1pp1ppz1lst8} & \texttt{vippn1pp1ppz1lst8} & \texttt{L25M} & ore\\
+\lneume{vippn2ppz1ppq1} & \texttt{vippn2ppz1ppq1} \textit{Cf.} \lneume{vippn2ppz1ppq1lst2lsa8} & \multicolumn{3}{l}{\texttt{vippn2ppz1ppq1lst2lsa8} minus} \\
+& & \multicolumn{3}{r}{letters} \\
+\lneume{vippn2ppz1ppq1lst2lsa8} & \texttt{vippn2ppz1ppq1lst2lsa8} & \texttt{L169A} & confitebor\\
+\lneume{vippn2ppz1sun1lsa5} & \texttt{vippn2ppz1sun1lsa5} & \texttt{L173D} & Alleluia.\\
+\lneume{vippn3sun1lsa5} & \texttt{vippn3sun1lsa5} & \texttt{L173D} & Alleluia.\\
+\lneume{vippq1} & \texttt{vippq1} & \texttt{L168S} & regna.\\
+\lneume{cl1!or} & \texttt{cl1!or} \textit{Cf.} \lneume{cl1!orlss3} & \multicolumn{3}{l}{\texttt{cl1!orlss3} minus letter} \\
+\lneume{cl1!orlss3} & \texttt{cl1!orlss3} & \texttt{L60E} & iudicentur\\
+\lneume{cl1!orlsc3} & \texttt{cl1!orlsc3} & \texttt{L60E} & conspectu\\
+\lneume{cl1!pi} & \texttt{cl1!pi} & \texttt{L95D} & avertas\\
+\lneume{cl1!pi>} & \texttt{cl1!pi>} & \texttt{L53C} & misericordia\\
+\lneume{cl1!pi!to} & \texttt{cl1!pi!to} & \texttt{L82O} & fecisti\\
+\lneume{cl1!pi!vi} & \texttt{cl1!pi!vi} & \texttt{L95D} & Domine,\\
+\lneume{cl!pi!vi>} & \texttt{cl!pi!vi>} & \texttt{L67S} & Virga\\
+\lneume{cl1!pi!cl} & \texttt{cl1!pi!cl} & \texttt{L64O} & implebis\\
+\lneume{cl1!pi!pesu2} & \texttt{cl1!pi!pesu2} & \texttt{L61I} & dulciora\\
+\lneume{cl1!pilsm3lsa6} & \texttt{cl1!pilsm3lsa6} & \texttt{L174I} & me\\
+\lneume{cl1!pilsn8} & \texttt{cl1!pilsn8} & \texttt{L53C} & iudicium,\\
+\lneume{cl1!pilsn9} & \texttt{cl1!pilsn9} & \texttt{L64O} & Aperis\\
+\lneume{cl1!pilst9} & \texttt{cl1!pilst9} & \texttt{L90D} & Longe\\
+\lneume{cl1!pipp2} & \texttt{cl1!pipp2} & \texttt{L60A} & Deum\\
+\lneume{cl1!pi!orsun1} & \texttt{cl1!pi!orsun1} & \texttt{L90D} & Israel.\\
+\lneume{cl!po} & \texttt{cl!po} & \texttt{L67S} & es,\\
+\lneume{cl!popp3} & \texttt{cl!popp3} & \texttt{L122V} & ascendentem\\
+\lneume{cl!to} & \texttt{cl!to} & \texttt{L17H} & eius.\\
+\lneume{cl!tosu1} & \texttt{cl!tosu1} & \texttt{L17H} & eius.\\
+\lneume{cl!tosu1lsc6} & \texttt{cl!tosu1lsc6} & \texttt{L81E} & me\\
+\lneume{cl!tosu1lsc6lst8} & \texttt{cl!tosu1lsc6lst8} & \texttt{L81E} & me\\
+\lneume{cl!topp2} & \texttt{cl!topp2} & \texttt{L64D} & misericordia\\
+\lneume{cl!toppz1su1sun1} & \texttt{cl!toppz1su1sun1} & \texttt{L35T} & Israel\\
+\lneume{cl!tolst9} & \texttt{cl!tolst9} & \texttt{L56I} & dilexit\\
+\lneume{cl!to>} & \texttt{cl!to>} & \texttt{L56I} & aequitatem\\
+\lneume{cl!tosun1lsa5} & \texttt{cl!tosun1lsa5} & \texttt{L164D} & meam.\\
+\lneume{cl!to!pi} & \texttt{cl!to!pi} \textit{Cf.} \lneume{cl!to!pipp2} & \multicolumn{3}{l}{\texttt{cl!to!pipp2} minus prepunctis} \\
+\lneume{cl!to!pipp2} & \texttt{cl!to!pipp2} & \texttt{L33C} & arcus,\\
+\lneume{cl!to!pi!cl} & \texttt{cl!to!pi!cl} & \texttt{L77S} & Israel\\
+\lneume{cl!to!pi!clpp2} & \texttt{cl!to!pi!clpp2} & \texttt{L33C} & eius,\\
+\lneume{cl!to!pi!clpp2lsn9} & \texttt{cl!to!pi!clpp2lsn9} & \texttt{L68Q} & Sion\\
+\lneume{cl!to!cl!cl} & \texttt{cl!to!cl!cl} & \texttt{L81R} & meis,\\
+\lneume{to!cl} & \texttt{to!cl} & \texttt{L95D} & Domine,\\
+\lneume{to!cl!cl} & \texttt{to!cl!cl} \textit{Cf.} \lneume{to!cl!cllst9} & \multicolumn{3}{l}{\texttt{to!cl!cllst9} minus letter} \\
+\lneume{to!cl!clsun2} & \texttt{to!cl!clsun2} \textit{Cf.} \lneume{to!cl!clsun2lsa5} & \multicolumn{3}{l}{\texttt{to!cl!clsun2lsa5} minus letter} \\
+\lneume{to!cl!clsun2lsa5} & \texttt{to!cl!clsun2lsa5} & \texttt{L43L} & tuam\\
+\lneume{to!cl!cllst9} & \texttt{to!cl!cllst9} & \texttt{L8A} & invocavite.\\
+\lneume{to!cl!clsu1} & \texttt{to!cl!clsu1} & \texttt{L33P} & meam.\\
+\lneume{to!cl!pi} & \texttt{to!cl!pi} & \texttt{L84B} & iniqui\\
+\lneume{to!cl!orsun1} & \texttt{to!cl!orsun1} & \texttt{L114V} & terrae\\
+\lneume{to!clsun1} & \texttt{to!clsun1} & \texttt{L54B} & quoniam\\
+\lneume{to!clsun1lsa5} & \texttt{to!clsun1lsa5} & \texttt{L11Q} & Ioseph.\\
+\lneume{to!clsu2} & \texttt{to!clsu2} \textit{Cf.} \lneume{to!clsu2lsn6} & \multicolumn{3}{l}{\texttt{to!clsu2lsn6} minus letter} \\
+\lneume{to!clsu2lsn6} & \texttt{to!clsu2lsn6} & \texttt{L8D} & dabit\\
+\lneume{to!clsu1sun1} & \texttt{to!clsu1sun1} \textit{Cf.} \lneume{to!clsu1sun1lsm6} & \multicolumn{3}{l}{\texttt{to!clsu1sun1lsm6} minus letter} \\
+\lneume{to!clsu1sun1lsm6} & \texttt{to!clsu1sun1lsm6} & \texttt{L24D} & opera\\
+\lneume{clsu2sun1lst6} & \texttt{clsu2sun1lst6} & \texttt{L35T} & tuam.\\
+\end{supertabular}
+
+\vfill
+\pagebreak
+
+\begin{supertabular}{lllll}\noindent
+\lneume{to!clM} & \texttt{to!clM} & \texttt{L77C} & corde\\
+\lneume{to!cl>1} & \texttt{to!cl>1} & \texttt{L77C} & tuum,\\
+\lneume{to!po} & \texttt{to!po} & \texttt{L84B} & Appropinquaverunt\\
+\lneume{to!pohd} & \texttt{to!pohd} & \texttt{L105A} & quaeritis,\\
+\lneume{to!to} & \texttt{to!to} \textit{Cf.} \lneume{to!toppn1sun1} & \multicolumn{3}{l}{\texttt{to!toppn1sun1} minus 2x uncinus} \\
+\lneume{to!tosun1} & \texttt{to!tosun1} \textit{Cf.} \lneume{to!toppn1sun1} & \multicolumn{3}{l}{\texttt{to!toppn1sun1} minus uncinus} \\
+\lneume{to!toppn1sun1} & \texttt{to!toppn1sun1} & \texttt{L43L} & discam\\
+\lneume{to!to!pi!cl} & \texttt{to!to!pi!cl} \textit{Cf.} \lneume{to!to!pi!clpp2} & \multicolumn{3}{l}{\texttt{to!to!pi!clpp2} minus prepunctis} \\
+\lneume{to!to!pi!clpp2} & \texttt{to!to!pi!clpp2} & \texttt{L60A} & nostrum,\\
+\lneume{toS!to} & \texttt{toS!to} & \texttt{L53C} & Confitemini\\
+\lneume{toS!tolst9} & \texttt{toS!tolst9} & \texttt{L90D} & Deus,\\
+\lneume{toS!pe} & \texttt{toS!pe} & \texttt{L123E} & Exaudi,\\
+\lneume{to!or} & \texttt{to!or} & \texttt{L67S} & Domine.\\
+\lneume{to!orsun1lsa5} & \texttt{to!orsun1lsa5} & \texttt{L8U} & Domine.\\
+\lneume{to!orlst3} & \texttt{to!orlst3} & \texttt{L114V} & audiatur,\\
+\lneume{to!orlsc6} & \texttt{to!orlsc6} & \texttt{L152S} & taurorum,\\
+\lneume{to!pi!cl} & \texttt{to!pi!cl} & \texttt{L31D} & est,\\
+\lneume{to!pi!cl!pi!pi} & \texttt{to!pi!cl!pi!pi} & \texttt{L40Q} & millia\\
+\lneume{to!pi!cl!pi!orsun1lsa5} & \texttt{to!pi!cl!pi!orsun1lsa5} & \texttt{L40Q} & speravit,\\
+\lneume{oc!vi} & \texttt{oc!vi} \textit{Cf.} \lneume{oc!visun1} & \multicolumn{3}{l}{\texttt{oc!visun1} minus uncinus} \\
+\lneume{oc!visun1} & \texttt{oc!visun1} & \texttt{L95D} & Domine,\\
+\lneume{orsu1sun1} & \texttt{orsu1sun1} & \texttt{L94C} & Domine.\\
+\lneume{orsu1sun1lsc2} & \texttt{orsu1sun1lsc2} & \texttt{L94C} & Domine.\\
+\lneume{orsu1sun1lsc3} & \texttt{orsu1sun1lsc3} & \texttt{L94C} & iniquis\\
+\lneume{un!clG} & \texttt{un!clG} & \texttt{L95D} & exaudi\\
+\lneume{topp2} & \texttt{topp2} & \texttt{L95D} & meus\\
+\lneume{topp2sun1} & \texttt{topp2sun1} & \texttt{L45R} & tuarum,\\
+\lneume{toppn3ppz1sun1} & \texttt{toppn3ppz1sun1} & \texttt{L58A} & me.\\
+\lneume{to>pp2} & \texttt{to>pp2} & \texttt{L90D} & insipientiam\\
+\lneume{pupp2su1sun1} & \texttt{pupp2su1sun1} & \texttt{L95D} & sunt.\\
+\lneume{pupp2su2} & \texttt{pupp2su2} & \texttt{L93E} & me.\\
+\lneume{pupp1su2} & \texttt{pupp1su2} & \texttt{L64O} & opportuno.\\
+\lneume{pupp1su1sun1} & \texttt{pupp1su1sun1} & \texttt{L58A} & clamavi,\\
+\lneume{puppn1su1sun2} & \texttt{puppn1su1sun2} & \texttt{L40Q} & mille,\\
+\lneume{puppz1su1sun2} & \texttt{puppz1su1sun2} & \texttt{L40Q} & mille,\\
+\lneume{puppz1su2} & \texttt{puppz1su2} & \texttt{L168S} & tua\\
+\lneume{ds1!ds1} & \texttt{ds1!ds1} & \texttt{L43L} & meos,\\
+\lneume{ds1!ts} & \texttt{ds1!ts} & \texttt{L67S} & mecum\\
+\lneume{ds1!ts1} & \texttt{ds1!ts1} & \texttt{L60E} & tuo.\\
+\lneume{cl1!orsun1} & \texttt{cl1!orsun1} & \texttt{L43L} & considerabo\\
+\lneume{cl1!orsun1lsa5} & \texttt{cl1!orsun1lsa5} & \texttt{L8U} & fac\\
+\lneume{cl!or} & \texttt{cl!or} \textit{Cf.} \lneume{cl!orpp2} & \multicolumn{3}{l}{\texttt{cl!orpp2} minus prepunctis} \\
+\lneume{cl!orpp2} & \texttt{cl!orpp2} & \texttt{L93G} & induebam\\
+\lneume{cl1!orpp2} & \texttt{cl1!orpp2} & \texttt{L103R} & mirabilis\\
+\lneume{ds1!clsun2} & \texttt{ds1!clsun2} \textit{Cf.} \lneume{ds1!clsun2lst5} & \multicolumn{3}{l}{\texttt{ds1!clsun2lst5} minus letter} \\
+\lneume{ds1!clsun2lst5} & \texttt{ds1!clsun2lst5} & \texttt{L43L} & doceas\\
+\lneume{ds1!clsu1sun1} & \texttt{ds1!clsu1sun1} \textit{Cf.} \lneume{ds1!clsu1sun1lst5} & \multicolumn{3}{l}{\texttt{ds1!clsu1sun1lst5} minus letter} \\
+\lneume{ds1!clsu1sun1lst5} & \texttt{ds1!clsu1sun1lst5} & \texttt{L56S} & Salvum\\
+\lneume{ds1pp3} & \texttt{ds1pp3} & \texttt{L149E} & tibi.\\
+\lneume{vi>1pp2} & \texttt{vi>1pp2} & \texttt{L67S} & umbrae\\
+\lneume{vi>1ppz1ppq1} & \texttt{vi>1ppz1ppq1} & \texttt{L40Q} & custodiant\\
+\lneume{vi>1ppn1ppz1ppq1} & \texttt{vi>1ppn1ppz1ppq1} & \texttt{L106S} & Alleluia.\\
+\lneume{pfsun1} & \texttt{pfsun1} \textit{Cf.} \lneume{pfsun1lsn5} & \multicolumn{3}{l}{\texttt{pfsun1lsn5} minus letter} \\
+\lneume{pfsun1lsn5} & \texttt{pfsun1lsn5} & \texttt{L67S} & tua,\\
+\lneume{pfppn1ppq1sun1lsa5} & \texttt{pfppn1ppq1sun1lsa5} & \texttt{L123A} & Deus\\
+\lneume{un1ppn1ppq1sun2} & \texttt{un1ppn1ppq1sun2} & \texttt{L112O} & estis,\\
+\lneume{un1sun2} & \texttt{un1sun2} \textit{Cf.} \lneume{un1ppn1ppq1sun2} & \multicolumn{3}{l}{\texttt{un1ppn1ppq1sun2} minus uncinus} \\
+& & \multicolumn{3}{r}{\& quilisma} \\
+\lneume{un1ppn1sun2} & \texttt{un1ppn1sun2} & \texttt{L112O} & Christum\\
+\lneume{un1ppn1sun1su2lsa5} & \texttt{un1ppn1sun1su2lsa5} & \texttt{L152I} & accelera,\\
+\lneume{clsun1lst5} & \texttt{clsun1lst5} & \texttt{L44I} & vespertinum.\\
+\lneume{clsu3lst5} & \texttt{clsu3lst5} & \texttt{L60E} & tuo.\\
+\lneume{tosu1sun1} & \texttt{tosu1sun1} \textit{Cf.} \lneume{tosu1sun1lsn6} & \multicolumn{3}{l}{\texttt{tosu1sun1lsn6} minus letter} \\
+\lneume{tosu1sun1lsc6lst7} & \texttt{tosu1sun1lsc6lst7} & \texttt{L109P} & vocavit\\
+\end{supertabular}
+
+\vfill
+\pagebreak
+
+\begin{supertabular}{lllll}\noindent
+\lneume{tosu1sun1lsn6} & \texttt{tosu1sun1lsn6} & \texttt{L19B} & venit\\
+\lneume{tosu2} & \texttt{tosu2} \textit{Cf.} \lneume{tosu2lst6} & \multicolumn{3}{l}{\texttt{tosu2lst6} minus letter} \\
+\lneume{tosu2lst6} & \texttt{tosu2lst6} & \texttt{L37M} & tu\\
+\lneume{tgsun1lsa5} & \texttt{tgsun1lsa5} & \texttt{L103H} & quoniam\\
+\lneume{cl!cl!clsun1lsa5} & \texttt{cl!cl!clsun1lsa5} & \texttt{L103P} & Alleluia.\\
+\lneume{cl!cl!cl} & \texttt{cl!cl!cl} \textit{Cf.} \lneume{cl!cl!cllsn9} & \multicolumn{3}{l}{\texttt{cl!cl!cllsn9} minus letter} \\
+\lneume{cl!cl!cllsn9} & \texttt{cl!cl!cllsn9} & \texttt{L31D} & Domine\\
+\lneume{cl!cl!pi} & \texttt{cl!cl!pi} & \texttt{L54B} & commovear\\
+\lneume{cl!cl!pi!vi} & \texttt{cl!cl!pi!vi} & \texttt{L123A} & Dominus\\
+\lneume{cl!cl!to} & \texttt{cl!cl!to} & \texttt{L149E} & meam,\\
+\lneume{cl!cl!po} & \texttt{cl!cl!po} & \texttt{L81R} & insurgentibus\\
+\lneume{cl1!pi!pi!vi} & \texttt{cl1!pi!pi!vi} & \texttt{L54B} & es\\
+\lneume{cl1!pi!pisun1lsa5} & \texttt{cl1!pi!pisun1lsa5} & \texttt{L174O} & plaudite\\
+\lneume{cl1!pi!tosu1} & \texttt{cl1!pi!tosu1} & \texttt{L37S} & mei\\
+\lneume{cl1!pi!tosun1} & \texttt{cl1!pi!tosun1} & \texttt{L174O} & plaudite\\
+\lneume{sa1sun1lsa5} & \texttt{sa1sun1lsa5} & \texttt{L11Q} & tuam\\
+\lneume{trsun2} & \texttt{trsun2} \textit{Cf.} \lneume{trsun2lsa5} & \multicolumn{3}{l}{\texttt{trsun2lsa5} minus letter} \\
+\lneume{trsun2lsa5} & \texttt{trsun2lsa5} & \texttt{L13A} & Ave\\
+\lneume{trsux1} & \texttt{trsux1} \textit{Cf.} \lneume{trsux1lsa5} & \multicolumn{3}{l}{\texttt{trsux1lsa5} minus letter} \\
+\lneume{trsux1lst8} & \texttt{trsux1lst8} & \texttt{L20P} & eius,\\
+\lneume{trsux1lsa5} & \texttt{trsux1lsa5} & \texttt{L136A} & aeternam\\
+\lneume{trsu2} & \texttt{trsu2} \textit{Cf.} \lneume{trsu2lst3lsm8} & \multicolumn{3}{l}{\texttt{trsu2lst3lsm8} minus letters} \\
+\lneume{trsu2lst3lsm8} & \texttt{trsu2lst3lsm8} & \texttt{L136A} & vobis\\
+\lneume{trsun1su2} & \texttt{trsun1su2} \textit{Cf.} \lneume{trsun1su2lsa3} & \multicolumn{3}{l}{\texttt{trsun1su2lsa3} minus letter} \\
+\lneume{trsun1su2lsa3} & \texttt{trsun1su2lsa3} & \texttt{L149C} & Domini\\
+\lneume{bvsun4} & \texttt{bvsun4} & \texttt{L8U} & me.\\
+\lneume{oc!cl} & \texttt{oc!cl} & \texttt{L31D} & Domine.\\
+\lneume{oc!clM} & \texttt{oc!clM} & \texttt{L77S} & peccatorum.\\
+\lneume{oc!pe!pu} & \texttt{oc!pe!pu} & \texttt{L53C} & tuo.\\
+\lneume{tg!cl} & \texttt{tg!cl} & \texttt{L31D} & est,\\
+\lneume{tg!cl>1} & \texttt{tg!cl>1} & \texttt{L33C} & eius,\\
+\lneume{tg!cllsn9} & \texttt{tg!cllsn9} & \texttt{L68Q} & Sion\\
+\lneume{tg!or} & \texttt{tg!or} & \texttt{L77C} & tibi\\
+\lneume{unppn1sun2} & \texttt{unppn1sun2} & \texttt{L40Q} & Cadent\\
+\lneume{unppn1sun2lsa5} & \texttt{unppn1sun2lsa5} & \texttt{L123E} & quaesivi\\
+\lneume{unppn1sux1} & \texttt{unppn1sux1} & \texttt{L72B} & eius\\
+\lneume{unppn1sux1lsa5} & \texttt{unppn1sux1lsa5} & \texttt{L24D} & exaltavit\\
+\lneume{unppn1sun1su2} & \texttt{unppn1sun1su2} & \texttt{L58A} & Domine,\\
+\lneume{unppn1ppz1sun1} & \texttt{unppn1ppz1sun1} \textit{Cf.} \lneume{unppn1ppz1sun1lsa5} & \multicolumn{3}{l}{\texttt{unppn1ppz1sun1lsa5} minus letter} \\
+\lneume{unppn1ppz1sun1lsa5} & \texttt{unppn1ppz1sun1lsa5} & \texttt{L80S} & habitat\\
+\lneume{unppn3sun1lsa5} & \texttt{unppn3sun1lsa5} & \texttt{L24D} & fecit\\
+\lneume{ta>ppn1} & \texttt{ta>ppn1} & \texttt{L95D} & et\\
+\lneume{ta>pp2} & \texttt{ta>pp2} & \texttt{L33C} & ut\\
+\lneume{pt1ppn1} & \texttt{pt1ppn1} & \texttt{L99P} & tuo.\\
+\lneume{tssun1lsa5} & \texttt{tssun1lsa5} & \texttt{L24D} & dextera\\
+\lneume{cl>1pp2} & \texttt{cl>1pp2} & \texttt{L114C} & alleluia,\\
+\lneume{tasu2} & \texttt{tasu2} & \texttt{L24T} & tuam.\\ \hline
+\end{supertabular}
+
+\vfill
+\pagebreak
+
+\begin{supertabular}{llllll}\noindent
+& \multicolumn{4}{l}{\textbf{significative letters}} & \\
+\lneume{lsa} & \texttt{lsa} \textit{Cf.} \lneume{vi>lsa6} & \multicolumn{2}{l}{\texttt{vi>lsa6}} & augete\\
+\lneume{lsc} & \texttt{lsc} \textit{Cf.} \lneume{pe!unlsc2} & \multicolumn{2}{l}{\texttt{pe!unlsc2}} & celeriter\\
+\lneume{lseq} & \texttt{lseq} & \texttt{L78H} & hic & equaliter\\
+\lneume{lseq-} & \texttt{lseq-} & \texttt{L78H} & quotiescumque & equaliter\\
+\lneume{lsequ} & \texttt{lsequ} & \texttt{L56D} & confundantur & equaliter\\
+\lneume{lsf} & \texttt{lsf} \textit{Cf.} \lneume{polsf2lst3} & \multicolumn{2}{l}{\texttt{polsf2lst3}} & fastigium\\
+\lneume{lsh} & \texttt{lsh} & \texttt{L44D} & a & humiliter\\
+\lneume{lshn} & \texttt{lshn} \textit{Cf.} \lneume{cllshn8} & \multicolumn{2}{l}{\texttt{cllshn8}} & humiliter nectum\\
+\lneume{lshp} & \texttt{lshp} \textit{Cf.} \lneume{trlst3lshp7} & \multicolumn{2}{l}{\texttt{trlst3lshp7}} & humiliter parum\\
+\lneume{lsl} & \texttt{lsl} \textit{Cf.} \lneume{pelsl2} & \multicolumn{2}{l}{\texttt{pelsl2}} & levare\\
+\lneume{lsn} & \texttt{lsn} \textit{Cf.} \lneume{cllsn9} & \multicolumn{2}{l}{\texttt{cllsn9}} & non (tenere), negare,\\
+& & & & nectum, naturaliter\\
+\lneume{lsnl} & \texttt{lsnl} \textit{Cf.} \lneume{clGlsnl2} & \multicolumn{2}{l}{\texttt{clGlsnl2}} & non levare\\
+\lneume{lsnt} & \texttt{lsnt} \textit{Cf.} \lneume{pulsnt3} & \multicolumn{2}{l}{\texttt{pulsnt3}} & non tenere\\
+\lneume{lsm} & \texttt{lsm} & \texttt{L67S} & Virga & mediocriter\\
+\lneume{lsmd} & \texttt{lsmd} & \texttt{L82O} & da & mediocriter\\
+\lneume{lss} & \texttt{lss} & \texttt{L95D} & tempus & sursum\\
+\lneume{lssimp} & \texttt{lssimp} & \texttt{L8U} & Domine, & simpliciter\\
+\lneume{lssimpl} & \texttt{lssimpl} & \texttt{L81R} & insurgentibus & simpliciter\\
+\lneume{lssp} & \texttt{lssp} & \texttt{L54Ae} & Domine, & sursum parum\\
+\lneume{lsst} & \texttt{lsst} \textit{Cf.} \lneume{pelsst1lsm4} & \multicolumn{2}{l}{\texttt{pelsst1lsm4}} & sursum tenere\\
+\lneume{lst} & \texttt{lst} \textit{Cf.} \lneume{clsun1lst5} & \multicolumn{2}{l}{\texttt{clsun1lst5}} & tenere\\
+\lneume{lsth} & \texttt{lsth} \textit{Cf.} \lneume{tolsth8} & \multicolumn{2}{l}{\texttt{tolsth8}} & tenere humiliter\\ \hline
+\end{supertabular}
+
+\begin{supertabular}{llllll}\noindent
+& \multicolumn{4}{l}{\textbf{tironian notes}} & \\
+\lneume{lti} & \texttt{lti} & \texttt{L78H} & pro & iusum\\
+\lneume{ltdo} & \texttt{ltdo} & \texttt{L14O} & misericordiam & deorsum\\
+\lneume{ltdr} & \texttt{ltdr} & \texttt{L132E} & descendit & devertit\\
+\lneume{ltdx} & \texttt{ltdx} & \texttt{L122V} & intuerentus & devexum\\
+\lneume{ltps} & \texttt{ltps} & \texttt{L128S} & veniat, & prode sub eam (trade subtus)\\
+\lneume{ltqm} & \texttt{ltqm} & \texttt{L118E} & sum & quam mox\\
+\lneume{ltsb} & \texttt{ltsb} & \texttt{L11Q} & et & sub\\
+\lneume{ltse} & \texttt{ltse} & \texttt{L144C} & corde & seorsum\\
+\lneume{ltsj} & \texttt{ltsj} & \texttt{L164D} & meam & subjice\\
+\lneume{ltsl} & \texttt{ltsl} & \texttt{L117R} & delectati & saltim\\
+\lneume{ltsn} & \texttt{ltsn} & \texttt{L17H} & gloriam & sonare\\
+\lneume{ltsp} & \texttt{ltsp} & \texttt{L10I} & Ierusalem & supra\\
+\lneume{ltsr} & \texttt{ltsr} & \texttt{L14P} & et & sursum\\
+\lneume{ltst} & \texttt{ltst} & \texttt{L25L} & omnes & saltate (salte)\\
+\lneume{ltus} & \texttt{ltus} & \texttt{L17H} & eius. & ut supra\\ \hline
+\end{supertabular}
 }
 
 \end{document}
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
index 2e7d06dd5be..fb28a8886f9 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.lua
@@ -1,4 +1,4 @@
--- Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+-- Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
 --
 -- This file is part of Gregorio.
 --
@@ -43,7 +43,70 @@ end
 local EXCLUDE = {
   ['.notdef'] = true,
   ['.null'] = true,
+  notdef = true,
   nonmarkingreturn = true,
+  AscendensOriscusLineBLTR = true,
+  AscendensOriscusLineTR = true,
+  BracketLeftZero = true,
+  BracketLeftSix = true,
+  BracketLeftSeven = true,
+  BracketLeftEight = true,
+  BracketLeftNine = true,
+  BracketLeftTen = true,
+  BracketLeftEleven = true,
+  BracketLeftTwelve = true,
+  BracketLeftThirteen = true,
+  BracketLeftFourteen = true,
+  BracketLeftShortZero = true,
+  BracketLeftShortSix = true,
+  BracketLeftShortSeven = true,
+  BracketLeftShortEight = true,
+  BracketLeftShortNine = true,
+  BracketLeftShortTen = true,
+  BracketLeftShortEleven = true,
+  BracketLeftShortTwelve = true,
+  BracketLeftShortThirteen = true,
+  BracketLeftShortFourteen = true,
+  BracketLeftLongZero = true,
+  BracketLeftLongSix = true,
+  BracketLeftLongSeven = true,
+  BracketLeftLongEight = true,
+  BracketLeftLongNine = true,
+  BracketLeftLongTen = true,
+  BracketLeftLongEleven = true,
+  BracketLeftLongTwelve = true,
+  BracketLeftLongThirteen = true,
+  BracketLeftLongFourteen = true,
+  BracketRightZero = true,
+  BracketRightSix = true,
+  BracketRightSeven = true,
+  BracketRightEight = true,
+  BracketRightNine = true,
+  BracketRightTen = true,
+  BracketRightEleven = true,
+  BracketRightTwelve = true,
+  BracketRightThirteen = true,
+  BracketRightFourteen = true,
+  BracketRightShortZero = true,
+  BracketRightShortSix = true,
+  BracketRightShortSeven = true,
+  BracketRightShortEight = true,
+  BracketRightShortNine = true,
+  BracketRightShortTen = true,
+  BracketRightShortEleven = true,
+  BracketRightShortTwelve = true,
+  BracketRightShortThirteen = true,
+  BracketRightShortFourteen = true,
+  BracketRightLongZero = true,
+  BracketRightLongSix = true,
+  BracketRightLongSeven = true,
+  BracketRightLongEight = true,
+  BracketRightLongNine = true,
+  BracketRightLongTen = true,
+  BracketRightLongEleven = true,
+  BracketRightLongTwelve = true,
+  BracketRightLongThirteen = true,
+  BracketRightLongFourteen = true,
   PunctumAuctusLineBL = true,
   PunctumLineBLBR = true,
   PunctumLineBR = true,
@@ -51,7 +114,8 @@ local EXCLUDE = {
   PunctumSmall = true,
   FlexusLineBL = true,
   FlexusAmOneLineBL = true,
-  OriscusLineTR = true,
+  DescendensOriscusLineTR = true,
+  DescendensOriscusLineBLTR = true,
   QuilismaLineTR = true,
   VirgaLineBR = true,
   SalicusOriscus = true,
@@ -70,13 +134,28 @@ local EXCLUDE = {
   VirgaBaseLineBL = true,
 }
 
+-- &&& in the following two tables is a placeholder for the cavum shape 'r'
+
 local GABC = {
   Accentus = [[\excluded{g}r1]],
   AccentusReversus = [[\excluded{g}r2]],
-  Ancus = [[gec]],
-  AncusLongqueue = [[hfd]],
+  Ancus = [[g&&&ec]],
+  AncusLongqueue = [[h&&&fd]],
+  AscendensOriscus = [[g&&&o1]],
+  AscendensOriscusLineBL = [[\excluded{e}@g&&&o1]],
+  AscendensOriscusLineTL = [[\excluded{i}@g&&&o1]],
+  AscendensOriscusScapus = [[g&&&O1]],
+  AscendensOriscusScapusLongqueue = [[h&&&O1]],
+  AscendensOriscusScapusOpenqueue = [[a&&&O1]],
+  AscendensPunctumInclinatum = [[G&&&1]],
   AuctumMora = [[\excluded{g}.]],
   BarBrace = [[\excluded{,}\_]],
+  BracketLeft = [=[[[\excluded{ce]]}]=],
+  BracketLeftShort = [=[[[\excluded{fh]]}]=],
+  BracketLeftLong = [=[[[\excluded{gi]]}]=],
+  BracketRight = [=[\excluded{[[ce}]]]=],
+  BracketRightShort = [=[\excluded{[[fh}]]]=],
+  BracketRightLong = [=[\excluded{[[gi}]]]=],
   CClef = [[c3]],
   CClefChange = [[c3]],
   Circulus = [[\excluded{g}r3]],
@@ -87,150 +166,181 @@ local GABC = {
   CustosUpLong = [[f+]],
   CustosUpMedium = [[a+]],
   CustosUpShort = [[g+]],
+  DescendensOriscus = [[g&&&o0]],
+  DescendensOriscusLineBL = [[\excluded{e}@g&&&o0]],
+  DescendensOriscusLineTL = [[\excluded{i}@g&&&o0]],
+  DescendensOriscusScapus = [[g&&&O0]],
+  DescendensOriscusScapusLongqueue = [[h&&&O0]],
+  DescendensOriscusScapusOpenqueue = [[a&&&O0]],
+  DescendensPunctumInclinatum = [[G&&&0]],
   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]],
-  FlexusOriscusScapus = [[gOe]],
-  FlexusOriscusScapusLongqueue = [[hOf]],
-  LeadingOriscus = [[go\excluded{igig}]],
-  LeadingPunctum = [[g\excluded{igig}]],
-  LeadingQuilisma = [[gw\excluded{igig}]],
-  Linea = [[g=]],
-  LineaPunctum = [[gR]],
-  LineaPunctumCavum = [[gr0]],
-  LineaPunctumCavumHole = [[\excluded{gr0}]],
+  Flexus = [[g&&&e]],
+  FlexusLongqueue = [[h&&&f]],
+  FlexusNobar = [[@h&&&f]],
+  FlexusOriscus = [[g&&&oe]],
+  FlexusOriscusInusitatus = [[g&&&o1e]],
+  FlexusOriscusScapus = [[g&&&Oe]],
+  FlexusOriscusScapusInusitatus = [[g&&&O1e]],
+  FlexusOriscusScapusInusitatusLongqueue = [[h&&&O1f]],
+  FlexusOriscusScapusLongqueue = [[h&&&Of]],
+  LeadingOriscus = [[g&&&o\excluded{igig}]],
+  LeadingPunctum = [[g&&&\excluded{igig}]],
+  LeadingQuilisma = [[g&&&w\excluded{igig}]],
+  Linea = [[g&&&=]],
+  LineaPunctum = [[g&&&R]],
   Natural = [[gy]],
   NaturalHole = [[\excluded{gy}]],
-  Oriscus = [[go1]],
-  OriscusCavum = [[go1r]],
-  OriscusCavumDeminutus = [[gor\~{}]],
-  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]],
-  PesQuassusLongqueue = [[hoj]],
-  PesQuilisma = [[gwi]],
-  PesQuilismaQuadratum = [[gWi]],
-  PesQuilismaQuadratumLongqueue = [[hWj]],
-  Porrectus = [[geg]],
-  PorrectusFlexus = [[gege]],
-  PorrectusFlexusNobar = [[\excluded{e}gege]],
-  PorrectusLongqueue = [[hfh]],
-  PorrectusNobar = [[@geg]],
-  Punctum = [[g]],
-  PunctumCavum = [[gr]],
-  PunctumCavumHole = [[\excluded{gr}]],
-  PunctumCavumInclinatum = [[Gr]],
-  PunctumCavumInclinatumAuctus = [[Gr>]],
-  PunctumCavumInclinatumAuctusHole = [[\excluded{Gr>}]],
-  PunctumCavumInclinatumHole = [[\excluded{Gr}]],
-  PunctumInclinatum = [[G]],
-  PunctumInclinatumAuctus = [[G>]],
-  PunctumLineBL = [[\excluded{e}@g]],
-  PunctumLineTL = [[\excluded{i}@g]],
-  Quilisma = [[gw]],
-  RoundBrace = '[ob:1;6mm]',
+  OblatusAscendensOriscus = [[g&&&o1]],
+  OblatusDescendensOriscus = [[g&&&o0]],
+  OblatusFlexusOriscus = [[g&&&oe]],
+  OblatusFlexusOriscusInusitatus = [[g&&&o1e]],
+  OblatusPesQuassus = [[g&&&oi]],
+  OblatusPesQuassusLongqueue = [[h&&&oj]],
+  OblatusPesQuassusInusitatus = [[g&&&o0i]],
+  OblatusPesQuassusInusitatusLongqueue = [[h&&&o0j]],
+  Oriscus = [[g&&&o]], -- for Deminutus
+  Pes = [[g&&&i]],
+  PesAscendensOriscus = [[g&&&iO\excluded{/j}]],
+  PesDescendensOriscus = [[g&&&iO\excluded{/h}]],
+  PesQuadratum = [[g&&&qi]],
+  PesQuadratumLongqueue = [[h&&&qj]],
+  PesQuassus = [[g&&&oi]],
+  PesQuassusInusitatus = [[g&&&o0i]],
+  PesQuassusInusitatusLongqueue = [[h&&&o0j]],
+  PesQuassusLongqueue = [[h&&&oj]],
+  PorrectusFlexus = [[g&&&ege]],
+  PorrectusFlexusNobar = [[\excluded{e}g&&&ege]],
+  Porrectus = [[g&&&eg]],
+  PorrectusLongqueue = [[h&&&fh]],
+  PorrectusNobar = [[@g&&&eg]],
+  Punctum = [[g&&&]],
+  PunctumInclinatum = [[G&&&]], -- for deminutus
+  PunctumInclinatumAuctus = [[G&&&>]],
+  PunctumLineBL = [[\excluded{e}@g&&&]],
+  PunctumLineTL = [[\excluded{i}@g&&&]],
+  Quilisma = [[g&&&w]],
+  QuilismaPes = [[g&&&wi]],
+  QuilismaPesQuadratum = [[g&&&Wi]],
+  QuilismaPesQuadratumLongqueue = [[h&&&Wj]],
   RoundBraceDown = '[ub:1;6mm]',
-  Salicus = [[giOk]],
-  SalicusFlexus = [[giOki]],
-  SalicusLongqueue = [[hjOl]],
-  Scandicus = [[gik]],
+  RoundBrace = '[ob:1;6mm]',
+  SalicusFlexus = [[g&&&iOki]],
+  Salicus = [[g&&&iOk]],
+  SalicusLongqueue = [[h&&&jOl]],
+  Scandicus = [[g&&&ik]],
   Semicirculus = [[\excluded{g}r4]],
   SemicirculusReversus = [[\excluded{g}r5]],
   Sharp = [[g\#{}]],
   SharpHole = [[\excluded{g\#{}}]],
-  Stropha = [[gs]],
-  StrophaAucta = [[gs>]],
-  StrophaAuctaLongtail = [[hs>]],
-  Torculus = [[gig]],
-  TorculusLiquescens = [[gige]],
-  TorculusLiquescensQuilisma = [[gwige]],
-  TorculusQuilisma = [[gwig]],
-  TorculusResupinus = [[gigi]],
-  TorculusResupinusQuilisma = [[gwigi]],
+  StrophaAucta = [[g&&&s>]],
+  StrophaAuctaLongtail = [[h&&&s>]],
+  Stropha = [[g&&&s]],
+  Torculus = [[g&&&ig]],
+  TorculusLiquescens = [[g&&&ige]],
+  TorculusLiquescensQuilisma = [[g&&&wige]],
+  TorculusQuilisma = [[g&&&wig]],
+  TorculusResupinus = [[g&&&igi]],
+  TorculusResupinusQuilisma = [[g&&&wigi]],
   VEpisema = [[\excluded{g}^^^^0027]],
-  Virga = [[gv]],
-  VirgaLongqueue = [[hv]],
-  VirgaOpenqueue = [[av]],
-  VirgaReversa = [[gV]],
-  VirgaReversaLongqueue = [[hV]],
-  VirgaReversaOpenqueue = [[aV]],
-  VirgaStrata = [[giO]],
+  Virga = [[g&&&v]],
+  VirgaLongqueue = [[h&&&v]],
+  VirgaOpenqueue = [[a&&&v]],
+  VirgaReversa = [[g&&&V]],
+  VirgaReversaLongqueue = [[h&&&V]],
+  VirgaReversaOpenqueue = [[a&&&V]],
   Virgula = [[^^^^0060]],
 }
 
 local GABC_AMBITUS_ONE = {
-  PorrectusLongqueue = [[hgh]],
-  PorrectusFlexusLongqueue = [[hghg]],
-  FlexusOpenqueue = [[ba]],
-  FlexusOriscusScapusOpenqueue = [[bOa]],
-  PesQuadratumOpenqueue = [[aqb]],
-  PesQuassusOpenqueue = [[aob]],
-  PesQuilismaQuadratumOpenqueue = [[aWb]],
+  PorrectusLongqueue = [[h&&&gh]],
+  PorrectusFlexusLongqueue = [[h&&&ghg]],
+  FlexusOpenqueue = [[b&&&a]],
+  FlexusOriscusScapusOpenqueue = [[b&&&Oa]],
+  PesQuadratumOpenqueue = [[a&&&qb]],
+  PesQuassusOpenqueue = [[a&&&ob]],
+  QuilismaPesQuadratumOpenqueue = [[a&&&Wb]],
+  OblatusPesQuassusInusitatusOpenqueue = [[a&&&o0b]],
+  OblatusPesQuassusOpenqueue = [[b&&&oc]],
 }
 
 -- if the item is a table, the values will replace fuse_head and gabc
 local GABC_FUSE = {
   Upper = {
     Punctum = [[\excluded{e}@]],
-    Oriscus = [[\excluded{e}@]],
+    AscendensOriscus = [[\excluded{e}@]],
+    DescendensOriscus = [[\excluded{e}@]],
+    OblatusAscendensOriscus = [[\excluded{f}@]],
+    OblatusFlexusOriscusInusitatus = [[\excluded{f}@]],
+    OblatusPesQuassus = [[\excluded{f}@]],
+    OblatusPesQuassusLongqueue = [[\excluded{g}@]],
+    OblatusPesQuassusOpenqueue = [[\excluded{a}@]],
     Pes = [[\excluded{e}@]],
     PesQuadratum = [[\excluded{e}@]],
     PesQuadratumLongqueue = [[\excluded{f}@]],
-    PesQuadratumOpenqueue = { [[\excluded{a}@]], [[bq[ll:0]c]] },
+    PesQuadratumOpenqueue = { [[\excluded{a}@]], [[bqc]] },
     PesQuassus = [[\excluded{e}@]],
+    PesQuassusInusitatus = [[\excluded{e}@]],
+    PesQuassusInusitatusLongqueue = [[\excluded{f}@]],
     PesQuassusLongqueue = [[\excluded{f}@]],
-    PesQuassusOpenqueue = { [[\excluded{a}@]], [[bo[ll:0]c]] },
+    PesQuassusOpenqueue = { [[\excluded{a}@]], [[cod]] },
     Flexus = [[\excluded{e}@]],
+    FlexusOriscus = [[\excluded{e}@]],
+    FlexusOriscusInusitatus = [[\excluded{e}@]],
   },
   Lower = {
     Punctum = [[\excluded{i}@]],
-    Oriscus = [[\excluded{i}@]],
+    AscendensOriscus = [[\excluded{i}@]],
+    DescendensOriscus = [[\excluded{i}@]],
+    OblatusDescendensOriscus = [[\excluded{h}@]],
+    OblatusFlexusOriscus = [[\excluded{h}@]],
+    OblatusPesQuassusInusitatus = [[\excluded{h}@]],
+    OblatusPesQuassusInusitatusLongqueue = [[\excluded{i}@]],
+    OblatusPesQuassusInusitatusOpenqueue = [[\excluded{b}@]],
     Pes = [[\excluded{i}@]],
     PesQuadratum = [[\excluded{i}@]],
     PesQuadratumLongqueue = [[\excluded{j}@]],
     PesQuadratumOpenqueue = [[\excluded{b}@]],
     PesQuassus = [[\excluded{i}@]],
+    PesQuassusInusitatus = [[\excluded{i}@]],
+    PesQuassusInusitatusLongqueue = [[\excluded{j}@]],
+    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}]],
+    OblatusAscendensOriscus = [[\excluded{@i}]],
+    OblatusDescendensOriscus = [[\excluded{@i}]],
     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}]],
+    OblatusAscendensOriscus = [[\excluded{@e}]],
+    OblatusDescendensOriscus = [[\excluded{@e}]],
     VirgaReversa = [[\excluded{@eg}]],
     VirgaReversaLongqueue = [[\excluded{@fg}]],
   },
@@ -251,18 +361,20 @@ local LIQUESCENCE = {
 
 GregorioRef = {}
 
-function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_granapadano)
+function GregorioRef.emit_score_glyphs(cs_normal, cs_hollow)
   local common_glyphs = {}
-  local greciliae = {}
-  local gregorio = {}
-  local granapadano = {}
+  local normal_variants = {}
+  local normal_names = {}
+  local hollow_variants = {}
+  local hollow_names = {}
 
-  local function index_font(csname, variants, common)
+  local function index_font(csname, variants, names, common)
     local glyphs = font.fonts[font.id(csname)].resources.unicodes
     -- force-load the code points of the font --
     local ignored = glyphs['___magic___']
     local glyph, cp
     for glyph, cp in pairs(glyphs) do
+      names[glyph] = true
       if cp >= 0xe000 and not EXCLUDE[glyph] and not glyph:match('^HEpisema') then
         local name, variant = glyph:match('^([^.]*)(%.%a*)$')
         if name then
@@ -279,9 +391,8 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_granapadano
     end
   end
 
-  index_font(cs_greciliae, greciliae, common_glyphs)
-  index_font(cs_gregorio, gregorio)
-  index_font(cs_granapadano, granapadano)
+  index_font(cs_normal, normal_variants, normal_names, common_glyphs)
+  index_font(cs_hollow, hollow_variants, hollow_names, common_glyphs)
 
   local function maybe_emit_glyph(csname, variants, name, variant)
     local cp = variants[name]
@@ -321,26 +432,46 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_granapadano
         liq = ''
       end
       gabc = '('..fuse_head..DEBILIS[debilis]..gabc..LIQUESCENCE[liq]..fuse_tail..')'
+    else
+      texio.write_nl('GregorioRef Warning: missing GABC for '..name)
     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_granapadano, char
-    ))
+    local sorted_normal = sort_unique_keys{normal_variants[name]}
+    local sorted_hollow = sort_unique_keys{hollow_variants[name]}
+    local n = math.max(1, #sorted_normal, #sorted_hollow)
     local emitted = false, i, variant
-    for i, variant in ipairs(sort_unique_keys{greciliae[name], gregorio[name], granapadano[name]}) do
+    for i = 1,n do
       if emitted then
-        tex.sprint([[\nopagebreak&&&&&]])
+        tex.sprint([[\nopagebreak&&&]])
       else
-        emitted = true
+        tex.sprint(string.format(
+            [[{\scriptsize %s{\bfseries %s}{\itshape %s}%s%s}&{\ttfamily\small %s}&{\%s\char%d}&]],
+            fusion, shape, ambitus, debilis, liquescence, gabc and gabc:gsub('&&&', '') or '', cs_normal, char
+        ))
+      end
+      variant = sorted_normal[i]
+      if variant then
+        tex.sprint(string.format([[{\scriptsize %s}]], variant))
+        maybe_emit_glyph(cs_normal, normal_variants, name, variant)
+      else
+        tex.print([[&]])
+      end
+      if emitted or not hollow_names[name] then
+        tex.sprint([[&&&]])
+      else
+        tex.sprint(string.format(
+            [[&{\ttfamily\small %s}&{\%s\char%d}&]],
+            gabc and gabc:gsub('&&&', 'r') or '', cs_hollow, char
+        ))
+      end
+      variant = sorted_hollow[i]
+      if variant then
+        tex.sprint(string.format([[{\scriptsize %s}]], variant))
+        maybe_emit_glyph(cs_hollow, hollow_variants, name, variant)
+      else
+        tex.print([[&]])
       end
-      tex.sprint(string.format([[{\scriptsize %s}]], variant))
-      maybe_emit_glyph('greciliae', greciliae, name, variant)
-      maybe_emit_glyph('gregorio', gregorio, name, variant)
-      maybe_emit_glyph('granapadano', granapadano, name, variant)
       tex.print([[\\]])
-    end
-    if not emitted then
-      tex.print([[&&&\\]])
+      emitted = true
     end
   end
 
@@ -353,8 +484,8 @@ function GregorioRef.emit_score_glyphs(cs_greciliae, cs_gregorio, cs_granapadano
   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.pdf b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf
index c1c252c01e4..d58c3b2ab0f 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.pdf
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
index dcd96d1dc2f..a79a05d2c8f 100644
--- a/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/GregorioRef.tex
@@ -1,6 +1,6 @@
 % !TEX program = LuaLaTeX+se
 %
-% Copyright (C) 2006-2016 The Gregorio Project (see CONTRIBUTORS.md)
+% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
 %
 % This file is part of Gregorio.
 %
@@ -105,7 +105,7 @@
 	\ifbreakable%
 		\filbreak%
 	\else%
-		\breakabletrue%
+		\global\breakabletrue%
 	\fi%
 	\makebox[\linewidth]{\ttfamily\bfseries #1#2%
 	\hspace{\fill}\normalfont\itshape #3}%
@@ -124,11 +124,9 @@
 
 % for the character tables
 \font\greciliae = {name:greciliae} at 1000000 sp\relax
-\font\gregorio = {name:gregorio} at 1000000 sp\relax
-\font\granapadano = {name:granapadano} at 1000000 sp\relax
+\font\greciliaeHollow = {name:greciliae-hollow} at 1000000 sp\relax
 \font\greciliaeOp = {name:greciliae-op} at 1000000 sp\relax
-\font\gregorioOp = {name:gregorio-op} at 1000000 sp\relax
-\font\granapadanoOp = {name:granapadano-op} at 1000000 sp\relax
+\font\greciliaeOpHollow = {name:greciliae-op-hollow} at 1000000 sp\relax
 \font\greextra = {name:greextra} at 12 pt\relax
 \newcommand{\excluded}[1]{{\tiny\itshape #1}}
 
@@ -150,11 +148,20 @@
 	\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 %
 }
+
+\newcommand{\getgrecount}[1]{%
+	\the\csname gre@count@#1\endcsname%
+}
 \makeatother
 
 \setlength{\parindent}{0mm} % Default is 15pt
@@ -170,7 +177,7 @@
 
 		\vspace{1cm}
 
-		\large Version \textbf{4.1.5}, 18 August 2016 %% PARSE_VERSION_DATE
+		\large Version \textbf{5.0.1}, 16 April 2017 %% PARSE_VERSION_DATE
 
 		\vspace{1.5cm}
 	\end{center}
diff --git a/Master/texmf-dist/doc/luatex/gregoriotex/omnes.gabc b/Master/texmf-dist/doc/luatex/gregoriotex/omnes.gabc
new file mode 100644
index 00000000000..f8d9c9c339d
--- /dev/null
+++ b/Master/texmf-dist/doc/luatex/gregoriotex/omnes.gabc
@@ -0,0 +1,13 @@
+name: Omnes qui;
+office-part: Communio;
+mode: 2;
+book: Graduale Romanum, 1961, p. 261; Graduale Triplex, 1976, p. 61;
+transcriber: Andrew Hinkley, Jakub Jelínek;
+nabc-lines: 1;
+%%
+(f3)
+OM(f_c/ef~|clGhhta>)nes(f.|un1hg) *(,)
+qui(e|puhd) in(f|pu) Chris(f/ghf|un1helst8`tohi)to(f_ef.|clGhglsa5vi) (,)
+bap(f|puhd)ti(hh|bvlsa2)zá(h|un)ti(fe|unhd) es(e!gwh!ivHG'/hwihi|un1hbppn1ppq1sun2ql!po)tis,(ie..|clGhg) (;)
+Chris(f_e/f!gwhh|clGhdlsa5vihbqlheunhh)tum(hiH'F|un1heppn1sun2) in(hhf~|unlsa2`vi>)du(hh|bvlsa2)í(fgF'E|tosu1)stis,(e.|unhd) (;)
+al(hhf~|unlsa2`vi>)le(hh|bvlsa2)lú(hih|to>ltsr6)ia.(f.|unhd) (::)