gregorio-5.1.0

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

49 files changed, 4160 insertions, 12352 deletions

diff --git a/Build/source/texk/README b/Build/source/texk/README
index d0da15f98f5..f984e6272b9 100644
--- a/Build/source/texk/README
+++ b/Build/source/texk/README
@@ -62,8 +62,8 @@ dvipsk - maintained here, by us
 dvisvgm 2.3.3 - checked 21feb18
   http://dvisvgm.bplaced.net/Downloads
 
-gregorio 5.0.1 - checked 16apr17
-  https://github.com/gregorio-project/gregorio/releases/
+gregorio 5.1.0 - checked 12mar18
+  CTAN/support/gregoriotex/gregorio-5.1.0.zip
 
 gsftopk - from Paul Vojta's xdvi?
 
diff --git a/Build/source/texk/gregorio/ChangeLog b/Build/source/texk/gregorio/ChangeLog
index 075ff3fa5bf..4d1d2a0b0c6 100644
--- a/Build/source/texk/gregorio/ChangeLog
+++ b/Build/source/texk/gregorio/ChangeLog
@@ -1,3 +1,10 @@
+2018-03-12  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	* Import gregorio-5.1.0.
+	* version.ac: Adapted.
+	* gregorio.test: remove two tests, since doc directory
+	does not exist.
+
 2017-12-29  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	* Import gregorio-5.0.2. (nothing changed except for the version)
diff --git a/Build/source/texk/gregorio/Makefile.am b/Build/source/texk/gregorio/Makefile.am
index 1de6788f0e4..521814ca183 100644
--- a/Build/source/texk/gregorio/Makefile.am
+++ b/Build/source/texk/gregorio/Makefile.am
@@ -60,4 +60,4 @@ TESTS = gregorio.test
 gregorio.log: gregorio$(EXEEXT)
 
 EXTRA_DIST += $(TESTS)
-DISTCLEANFILES = factus.gtex veni.gtex
+DISTCLEANFILES =
diff --git a/Build/source/texk/gregorio/Makefile.in b/Build/source/texk/gregorio/Makefile.in
index 6ae8cab72ba..21cd5084132 100644
--- a/Build/source/texk/gregorio/Makefile.in
+++ b/Build/source/texk/gregorio/Makefile.in
@@ -601,7 +601,7 @@ gregorio_SOURCES = \
 LDADD = $(KPATHSEA_LIBS)
 AM_TESTS_ENVIRONMENT = GREGORIO_TREE='$(GREGORIO_TREE)'; export GREGORIO_TREE;
 TESTS = gregorio.test
-DISTCLEANFILES = factus.gtex veni.gtex
+DISTCLEANFILES = 
 all: config_.h
 	$(MAKE) $(AM_MAKEFLAGS) all-am
 
diff --git a/Build/source/texk/gregorio/TLpatches/ChangeLog b/Build/source/texk/gregorio/TLpatches/ChangeLog
index 4ec9eecebd4..ba415f0f67d 100644
--- a/Build/source/texk/gregorio/TLpatches/ChangeLog
+++ b/Build/source/texk/gregorio/TLpatches/ChangeLog
@@ -1,3 +1,7 @@
+2018-03-12  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
+
+	Import gregorio-5.1.0.
+
 2017-12-29  Akira Kakuto  <kakuto@fuk.kindai.ac.jp>
 
 	Import gregorio-5.0.2.
diff --git a/Build/source/texk/gregorio/TLpatches/TL-Changes b/Build/source/texk/gregorio/TLpatches/TL-Changes
index a424725db52..09c98ac1f46 100644
--- a/Build/source/texk/gregorio/TLpatches/TL-Changes
+++ b/Build/source/texk/gregorio/TLpatches/TL-Changes
@@ -1,5 +1,5 @@
-Changes applied to the gregorio-5.0.2 tree as obtained from:
-	https://github.com/gregorio-project/gregorio/releases/download/v5.0.2
+Changes applied to the gregorio-5.1.0 tree as obtained from:
+	CTAN/support/gregoriotex/gregorio-5.1.0.zip
 
 Remove:
 	Makefile.in
@@ -8,9 +8,5 @@ Remove:
 	configure
 	contrib/Makefile.in
 	contrib/TeXShop/Makefile.in
-	doc/Makefile.in
-	examples/Makefile.in
-	fonts/
 	src/Makefile.in
 	src/config_.h.in
-	tex/
diff --git a/Build/source/texk/gregorio/configure b/Build/source/texk/gregorio/configure
index b5f0ece63ac..fcc63e5a027 100755
--- a/Build/source/texk/gregorio/configure
+++ b/Build/source/texk/gregorio/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 5.0.2.
+# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 5.1.0.
 #
 # Report bugs to <tex-k@tug.org>.
 #
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Gregorio (TeX Live)'
 PACKAGE_TARNAME='gregorio--tex-live-'
-PACKAGE_VERSION='5.0.2'
-PACKAGE_STRING='Gregorio (TeX Live) 5.0.2'
+PACKAGE_VERSION='5.1.0'
+PACKAGE_STRING='Gregorio (TeX Live) 5.1.0'
 PACKAGE_BUGREPORT='tex-k@tug.org'
 PACKAGE_URL='http://gregorio-project.github.io/'
 
@@ -1330,7 +1330,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures Gregorio (TeX Live) 5.0.2 to adapt to many kinds of systems.
+\`configure' configures Gregorio (TeX Live) 5.1.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1401,7 +1401,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Gregorio (TeX Live) 5.0.2:";;
+     short | recursive ) echo "Configuration of Gregorio (TeX Live) 5.1.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1521,7 +1521,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Gregorio (TeX Live) configure 5.0.2
+Gregorio (TeX Live) configure 5.1.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2360,7 +2360,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Gregorio (TeX Live) $as_me 5.0.2, which was
+It was created by Gregorio (TeX Live) $as_me 5.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -8046,7 +8046,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='gregorio--tex-live-'
- VERSION='5.0.2'
+ VERSION='5.1.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14466,7 +14466,7 @@ Usage: $0 [OPTIONS]
 Report bugs to <bug-libtool@gnu.org>."
 
 lt_cl_version="\
-Gregorio (TeX Live) config.lt 5.0.2
+Gregorio (TeX Live) config.lt 5.1.0
 configured by $0, generated by GNU Autoconf 2.69.
 
 Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16053,7 +16053,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Gregorio (TeX Live) $as_me 5.0.2, which was
+This file was extended by Gregorio (TeX Live) $as_me 5.1.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16120,7 +16120,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Gregorio (TeX Live) config.status 5.0.2
+Gregorio (TeX Live) config.status 5.1.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/Build/source/texk/gregorio/gregorio-src/.gregorio-version b/Build/source/texk/gregorio/gregorio-src/.gregorio-version
deleted file mode 100644
index b3ba84e82cc..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/.gregorio-version
+++ /dev/null
@@ -1,4 +0,0 @@
-5.0.1
-
-*** Do not modify this file. ***
-Use VersionManager.py to change the version.
diff --git a/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
index cbb5d798743..9d14be3ac10 100644
--- a/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
+++ b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
@@ -2,10 +2,25 @@
 All notable changes to this project will be documented in this file.
 As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). It follows [some conventions](http://keepachangelog.com/).
 
-## [Unreleased][unreleased]
+## [5.1.0] - 2018-03-11
+### Added
+- Added support for virgula (gabc: `` `0``) and divisio minima (gabc: `,0`) on the ledger line above the staff (see [#1370](https://github.com/gregorio-project/gregorio/issues/1370)).
+- Added support for a dotted bar (gabc: `:?`) (See [#1360](https://github.com/gregorio-project/gregorio/issues/1360) and [#1387](https://github.com/gregorio-project/gregorio/issues/1387))
+- 10 new St. Gall neume glyphs have been added to the `gregall` font (see [#1328](https://github.com/gregorio-project/gregorio/issues/1328), [#1330](https://github.com/gregorio-project/gregorio/issues/1330), [#1337](https://github.com/gregorio-project/gregorio/issues/1337), [#1340](https://github.com/gregorio-project/gregorio/issues/1340), [#1341](https://github.com/gregorio-project/gregorio/issues/1341), [#1342](https://github.com/gregorio-project/gregorio/issues/1342), [#1343](https://github.com/gregorio-project/gregorio/issues/1343), [#1345](https://github.com/gregorio-project/gregorio/issues/1345)).
+- 4 new Laon neume glyphs have been added to the `grelaon` font.
+- A more modern-looking sharp symbol has been added to the `greciliae` font.  To switch to this, use `\grechangeglyph{Sharp}{greciliae}{.modern}\grechangeglyph{SharpHole}{greciliae}{.modern}` in your TeX file.  See [#1399](https://github.com/gregorio-project/gregorio/issues/1399).
+- Added documentation note about loading microtype after gregoriotex (see [#1364](https://github.com/gregorio-project/gregorio/issues/1364)).
 
+### Fixed
+- Fixed issue with Tex Live 2017 latexmk not detecting auto-compiled gabc files as dependencies (see [#1367](https://github.com/gregorio-project/gregorio/issues/1367)).
+- Fixed issue where an altered note (glyph) throws off the position of an episema in the glyph that immediately precedes it (see [#1379](https://github.com/gregorio-project/gregorio/issues/1379)).
+
+## [5.0.2] - 2017-05-24
+### Fixed
+- Worked around an issue discovered during the TeX Live 2017 pre-test.  See [#1362](https://github.com/gregorio-project/gregorio/issues/1362).
 
 ## [5.0.1] - 2017-04-16
+### Fixed
 - Fixed a bug in the TeXLive compatibility code for Windows users.  Thanks to Akira Kakuto for the catch.
 
 ## [5.0.0] - 2017-04-15
diff --git a/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md b/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md
index 4e408f81820..fe6d94a797a 100644
--- a/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md
+++ b/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md
@@ -6,7 +6,7 @@ You can report a bug and request a new feature on the [bug tracker](https://gith
 
 Please search for existing issues before reporting a new one.
 
-Please do not use the issue tracker for personal support requests, instead use the mailing-list (https://gna.org/mail/?group=gregorio) or IRC: #gregorio on freenode.
+Please do not use the issue tracker for personal support requests, instead use the mailing-list (https://groups.google.com/forum/#!forum/gregorio-users) or IRC: #gregorio on freenode.
 
 ### Report a bug
 
diff --git a/Build/source/texk/gregorio/gregorio-src/README.md b/Build/source/texk/gregorio/gregorio-src/README.md
index d2b4bc0a189..782a4e3c4f2 100644
--- a/Build/source/texk/gregorio/gregorio-src/README.md
+++ b/Build/source/texk/gregorio/gregorio-src/README.md
@@ -16,12 +16,6 @@ You can also try it online [here](http://dev.illuminarepublications.com/gregorio
 
 You need a recent and working [TeXLive](https://www.tug.org/texlive/), on top of which you just need to install latest [Gregorio release](https://github.com/gregorio-project/gregorio/releases). See [the website](http://gregorio-project.github.io/installation.html) for more details.
 
-**Note:** Due to a bug in the v2.7-fix-3 release of `luaotfload` the documentation cannot be built against TeXLive 2016 if you have that version of `luaotfload` (see [#1188](https://github.com/gregorio-project/gregorio/issues/1188)).  The result is that users should do one of the following:
-
-- Install from the distribution tar ball where the documentation is already built (recommended for those installing a stable release).
-- Switch to TeXLive 2015 (which uses an earlier version of `luaotfload`) to build the docs.
-- Upgrade your `luaotfload` to a more recent version (v2.8 or later).
-
 ## Building for inclusion in TeXLive
 
 When building gregorio for inclusion in TeXLive, the gregorio executable must not have the version number suffix that is used for other builds.  To make this happen, run `configure` with the `--disable-version-in-exe` option, and the generated Makefile will create a gregorio executable without the version number suffix (i.e., the executable will simply be named `gregorio`).
diff --git a/Build/source/texk/gregorio/gregorio-src/configure.ac b/Build/source/texk/gregorio/gregorio-src/configure.ac
index f57f07fe78a..19767019d8e 100644
--- a/Build/source/texk/gregorio/gregorio-src/configure.ac
+++ b/Build/source/texk/gregorio/gregorio-src/configure.ac
@@ -16,8 +16,8 @@ dnl
 dnl You should have received a copy of the GNU General Public License
 dnl along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
 
-AC_INIT([gregorio],[5.0.1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="5_0_1"
+AC_INIT([gregorio],[5.1.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="5_1_0"
 AC_SUBST(FILENAME_VERSION)
 AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
 MK=""
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/README.md b/Build/source/texk/gregorio/gregorio-src/contrib/README.md
index 4372f39c6b0..57b1ee3ba84 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/README.md
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/README.md
@@ -23,7 +23,7 @@ under Windows).
 After that you can insert a render frame using Gregorio, and simply
 typing gabc (`right-click->edit sources`).
 
-For more details see [the website](http://home.gna.org/gregorio/scribus).
+For more details see [the website](http://gregorio-project.github.io/introduction-scribus.html).
 
 ## Syllabation checker
 
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
index d00b413b5cb..e2a01e0c266 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
@@ -29,8 +29,10 @@ syn match gabcTextOrNoteMarkup "</\?nlba>" contained
 syn match gabcTextCenter "[{}]" contained
 syn match gabcFuse "@" contained
 syn match gabcFuseEnd "\]" contained
-syn match gabcBar "[`:]" contained
-syn match gabcBar "[,;][1-8]\?" contained
+syn match gabcBar ":?\?" contained
+syn match gabcBar ";[1-8]\?" contained
+syn match gabcBar ",[0-8]\?" contained
+syn match gabcBar "`0\?" contained
 syn match gabcSpace "[! ]" contained
 syn match gabcSpace "/0\?" contained
 syn match gabcSpace "z[-+0]\?" contained
diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
index effa1f772cb..88095de511d 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
@@ -237,7 +237,7 @@ echo.
 echo system-setup.log created and saved in a temporary location.

 echo Upon exiting this script, the log will be opened in Notepad for you.

 echo Please save the file to a convenient location and email it to

-echo gregorio-users@gna.org as part of your bug report.

+echo gregorio-users@googlegroups.com as part of your bug report.

 echo.

 echo You can also create an issue at

 echo http://github.org/gregorio-project/gregorio/issues

diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
index a26c8c31ba8..3617d53802a 100644
--- a/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
+++ b/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
@@ -221,8 +221,8 @@ echo "" >> $OUTPUT
 echo ""
 echo ""
 echo "system-setup.log created and saved the working directory from which you"
-echo "ran this script.  Please email it to gregorio-users@gna.org as part of"
-echo "your bug report."
+echo "ran this script.  Please email it to gregorio-users@googlegroups.com as"
+echo "part of your bug report."
 echo ""
 echo "You can also create an issue at "
 echo "http://github.org/gregorio-project/gregorio/issues"
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Appendix_Font_Tables.tex b/Build/source/texk/gregorio/gregorio-src/doc/Appendix_Font_Tables.tex
deleted file mode 100644
index 843cbefcb6f..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/Appendix_Font_Tables.tex
+++ /dev/null
@@ -1,106 +0,0 @@
-% !TEX root = GregorioRef.tex
-% !TEX program = LuaLaTeX+se
-%
-% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
-%
-% This file is part of Gregorio.
-%
-% Gregorio is free software: you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version.
-%
-% Gregorio is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
-%
-\begin{landscape}
-
-\section{Font Glyph Tables}\label{glyphtable}
-
-\subsection{Score Font Glyphs}
-
-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}{llc|cc|lc|cc}
-			\caption{Score Glyphs}\\
-			&
-			&%
-			&%
-			\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 Glyph}&%
-			{\scriptsize\bfseries Name}&%
-			{\scriptsize\bfseries Glyph}&%
-			{\scriptsize\bfseries Sample gabc}&%
-			{\scriptsize\bfseries Glyph}&%
-			{\scriptsize\bfseries Name}&%
-			{\scriptsize\bfseries Glyph}\\
-			\hline
-		\endfirsthead
-			&%
-			&%
-			&%
-			\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 Glyph}&%
-			{\scriptsize\bfseries Name}&%
-			{\scriptsize\bfseries Glyph}&%
-			{\scriptsize\bfseries Sample gabc}&%
-			{\scriptsize\bfseries Glyph}&%
-			{\scriptsize\bfseries Name}&%
-			{\scriptsize\bfseries Glyph}\\
-			\hline
-		\endhead
-		\directlua{GregorioRef.emit_score_glyphs(#1)}
-	\end{longtable}
-}%
-\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 fonts in the same vein as the prior table.
-
-\ScoreFontTable{'greciliaeOp', 'greciliaeOpHollow'}
-
-\subsection{Extra Glyphs}\label{subsec:greextra}
-
-The following table lists the glyphs available in the greextra font.  There are
-score glyphs which may be substituted into the score, text glyphs meant to be
-used in the verses or in the \TeX{} document, and miscellaneous glyphs like
-decorative lines for more specialized use.
-
-\begin{longtable}{lc|lc}
-		\caption{Extra Glyphs}\\
-		{\bfseries Glyph Name}&{\bfseries Glyph}&{\bfseries Glyph Name}&{\bfseries Glyph}\\
-		\hline
-	\endfirsthead
-		{\bfseries Glyph Name}&{\bfseries Glyph}&{\bfseries Glyph Name}&{\bfseries Glyph}\\
-		\hline
-	\endhead
-	\directlua{GregorioRef.emit_extra_glyphs('greextra')}
-\end{longtable}
-
-\end{landscape}
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex
deleted file mode 100644
index bf897bf711c..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex
+++ /dev/null
@@ -1,2066 +0,0 @@
-% !TEX root = GregorioRef.tex
-% !TEX program = LuaLaTeX+se
-%
-% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
-%
-% This file is part of Gregorio.
-%
-% Gregorio is free software: you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version.
-%
-% Gregorio is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
-%
-\section{User Controls}
-
-These functions are available to the user to customize elements of the
-score which cannot be controlled from the gabc file. They can be added
-to any \verb=.tex= file. Do not add them to any \verb=.gtex= or
-\verb=.gabc= file.
-
-\subsection{Using the Package}
-
-To use the Gregorio\TeX\ package in a \LaTeX\ document, include \verb=\usepackage{gregoriotex}=
-in the document preamble. This macro has the following form:
-
-\macroname{\textbackslash usepackage}{[\optional{(options)}]\{gregoriotex\}}{gregoriotex.sty}
-
-The optional arguments are:
-
-\bigskip\rowcolors{1}{lightgray}{lightgray}
-\begin{tabular}{lp{10cm plus .5cm}}
-	Argument & Description \\
-	\hline
-	\texttt{debug} & Debug messages will be printed to the output log.  Can also be specified as \verb:debug={<types>}:, in which case only messages of the 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.\\
-	\texttt{autocompile} & Gregorio\TeX\ will automatically compile gtex files from gabc %
-		files when necessary. If the gabc has been modified, or the %
-		gtex has an outdated version, or the gtex file does not exist, %
-		THEN Gregorio\TeX\ will compile a new gtex file.\\
-	\texttt{forcecompile} & Gregorio\TeX\ will compile all scores from their gabc files.\\
-	\hline
-	\texttt{allowdeprecated=false} & Force all deprecated commands to raise a package error %
-		rather than a warning. This allows the user to ensure that their file is %
-		compliant with the current version of Gregorio\TeX.\\
-\end{tabular}\bigskip
-
-\textbf{Note:} \verb=nevercompile=, \verb=autocompile=, and
-\verb=forcecompile= conflict with eachother. Only one should be
-specified in the options list.\bigskip
-
-To use the package in a Plain \TeX\ document, include \verb=\input gregoriotex.tex= near the top of the document (the area which would correspond to the preamble in \LaTeX).
-
-To use the \texttt{debug} option in Plain \TeX, you'll need to define \verb=\gre@debug= manually as a string listing the kinds of messages you want printed (or as \verb=all= if you want all messages printed).
-
-To use the \texttt{allowdeprecated=false} option, you'll need \verb=\gre@allowdeprecatedfalse=.
-
-The compilation options can be set using \verb=\gresetcompilegabc= (see below).
-
-\textbf{Important:} Gregorio\TeX{} may require up to two passes (runs of
-\texttt{lualatex} or \texttt{luatex}) to compute the line heights correctly.  If a second
-pass is required, Gregorio\TeX{} will emit the following
-warning:\par\medskip
-
-\begin{scriptsize}
-\begin{latexcode}
-Module gregoriotex warning: Line heights or variable brace lengths may have changed. Rerun to fix.
-\end{latexcode}
-\end{scriptsize}
-
-Gregorio\TeX{} two-pass processing is compatible with \texttt{latexmk}.
-
-If you only need the special symbols which Gregorio\TeX\ contains, and not the ability to include scores or musical glyphs, then you can load \texttt{gregoriosyms} instead of \texttt{gregoriotex}.  It supports all of the above options except those specifically related to scores.  \textbf{You should not try to load both packages}.
-
-
-\subsection{Commands}
-
-Once you've included the package in your document (as explained above) the following commands allow you to insert scores and manipulate the way they appear in the document.
-
-\subsubsection{Including scores}
-
-\macroname{\textbackslash gregorioscore}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
-Macro for including scores.  Works on both gabc and tex files.
-
-\begin{argtable}
-	\#1 & \texttt{n} & Optional. \#2 will be included as is. \\
-			& \texttt{a} & Optional. Gregorio\TeX\ will automatically compile gabc files if necessary.\\
-			& \texttt{f} & Optional. Forces Gregorio\TeX\ to compile the gabc file.\\
-	\#2 & string & Relative or absolute path to the score.\\
-\end{argtable}
-
-Example:\par\medskip
-\begin{latexcode}
-	\gregorioscore[n]{TecumPrincipium.gtex}
-	\gregorioscore{Chant/VirgoVirginum.gabc}
-	\gregorioscore{/home/user/chant/AdTeLevavi}
-	\gregorioscore[a]{AveMaria}
-
-	%The following lines include the same score:
-	\gregorioscore{Christus}
-	\gregorioscore{Christus.gtex}
-	\gregorioscore{./Christus}
-	\gregorioscore{./Christus.gabc}
-
-	%With the optional arg [f], #2 must be a file usable by \TeX.
-	\gregorioscore[f]{TecumPrincipium.gabc} % Wrong
-\end{latexcode}
-
-\textbf{Important:} For the sake of clarity it is recommended that the
-file extension be omitted from \texttt{\#2} unless using the \texttt{nevercompile} option. When the \texttt{nevercompile}
-option is in effect (either via package option
-\texttt{[nevercompile]}, or \verb=\gresetcompilegabc{never}=, or
-\verb=\gregorioscore[n]=) \#2 must be a \TeX\ file that exists and
-the file extension (normally gtex) must be given.
-
-When called with the optional argument \texttt{[a]} Gregorio\TeX\ will
-automatically generate a \texttt{gtex} file in this format:
-\texttt{\textit{scorename}-x\_x\_x.gtex} where \texttt{x\_x\_x} is the
-gregorio version. This resulting file is not intended to be modified
-by the user and will be removed when the gabc file is recompiled. The
-rules that Gregorio\TeX\ uses to determine if a gabc file needs to be
-compiled are:
-
-\begin{itemize}
-\item If a gtex file does not exist.
-\item If the modification time of the gabc file is newer than its
-	corresponding gtex file.
-\item If the version of the gtex file is outdated.
-\end{itemize}
-
-When called with the optional argument \texttt{[n]} Gregorio\TeX\ will
-include the score without doing anything else. This is the same as the
-old behavior of Gregorio\TeX\ and therefore the default behavior.
-
-When called with the optional argument \texttt{[f]} Gregorio\TeX\ will
-compile the gabc file into a gtex file. This is similar to
-\texttt{[a]} except the gabc is compiled every time.
-
-\macroname{\textbackslash gresetcompilegabc}{\{\#1\}}{gregoriotex-main.tex}
-A macro to change the behavior of the way Gregorio\TeX\ includes scores.  This is similar to using the package options \verb=[forcecompile]=, \verb=[autocompile]=, and \verb=[nevercompile]=, but does not necessarly apply to the entire document.
-
-
-\begin{argtable}
-	\#1 & \texttt{force} & all later calls of \verb=\gregorioscore= will compile the gabc
-file into a gtex file.\\
-	& \texttt{auto} & all later calls of \verb=\gregorioscore= will use Gregorio\TeX's
-automatic compilation of gabc files.\\
-	& \texttt{never} & all later calls of \verb=\gregorioscore= will include the score
-without doing anything else.
-\end{argtable}
-
-\medskip This macro can be combined in the same document with different arguments to
-switch between different behaviors: \par\medskip
-\begin{latexcode}
-	\usepackage{gregoriotex} % [nevercompile] is the default.
-	----
-	\gregorioscore{TecumPrincipium} % gabc never compiled.
-	\gregorioscore[f]{TecumPrincipium} % gabc always compiled.
-	\gregorioscore[a]{TecumPrincipium} % gabc auto compiled.
-
-	\gresetcompilegabc{auto}
-	\gregorioscore{TecumPrincipium} % gabc auto compiled.
-	\gregorioscore[n]{TecumPrincipium} % gabc never compiled.
-	\gregorioscore[f]{TecumPrincipium} % gabc always compiled.
-
-	\gresetcompilegabc{force}
-	\gregorioscore{TecumPrincipium} % gabc always compiled.
-	\gregorioscore[n]{TecumPrincipium} % gabc never compiled.
-	\gregorioscore[a]{TecumPrincipium} % gabc auto compiled.
-\end{latexcode}
-
-\macroname{\textbackslash gabcsnippet}{\{\#1\}}{gregoriotex-main.tex}
-Converts the gabc notation specified in \texttt{\#1} to Gregorio\TeX\ and
-includes it directly in the document.
-
-\begin{argtable}
-	\#1 & string & The gabc to insert into the document.\\
-\end{argtable}
-
-\medskip For example:\par\medskip
-\begin{latexcode}
-	\gabcsnippet{(c3) Al(eg~)le(gv.fhg)lu(efe___)ia(e.) (::)}
-\end{latexcode}
-
-
-\subsubsection{Point-and-click}
-
-Gregorio can add Lilypond-like point-and-click links into the output PDF
-file.  The URLs added to the PDF conform with Lilypond and will use the
-Lilypond scripts if they are enabled on your system.  To configure your
-system for this feature, please see the documentation for Lilypond since
-they established the feature.\bigskip
-
-In addition to switching this feature on in \TeX{}, you must also pass the
-\texttt{-p} option to \texttt{gregorio} when converting your gabc files to
-Gregorio\TeX{} for inclusion.  This will automatically be done for auto- and
-force-compiled scores, but if an auto-compiled score was compiled without the
-option, Gregorio\TeX{} will not realize it has changed to recompile it.  In
-this case, remove the corresponding \texttt{.gtex} file to force it to
-recompile.\bigskip
-
-\textbf{Important:} As with LilyPond, you should always turn off
-point-and-click before producing gtex and/or PDF files for distribution.
-This feature embeds absolute filenames from your computer as links in
-the PDF, which can pose a security risk.  This is why this feature is
-disabled by default.
-
-\macroname{\textbackslash gresetpointandclick}{\{\#1\}}{gregoriotex-syllable.tex}
-Macro to enable or disable the point-and-click feature.
-
-\begin{argtable}
-	\#1 & \texttt{on}  & Enable point-and-click link generation.\\
-	& \texttt{off} & Disable point-and-click link generation (default).
-\end{argtable}
-
-This feature may be switched on and off as desired between scores.
-
-
-\subsubsection{Overall Size}
-While the default size for Gregorio scores is designed to approximate that found in most liturgical books, Gregorio\TeX\ also provides mechanisms for changing the size of your scores for use in any application.
-
-\macroname{\textbackslash grechangestaffsize}{\{\#1\}}{gregoriotex-main.tex}
-Macro to adjust the size of the staff.
-
-\begin{argtable}
-	\#1 & integer & The size of the staff lines.  Default value is 17.  Higher numbers yield larger staves.
-\end{argtable}
-
-\macroname{\textbackslash grechangestafflinethickness}{\{\#1\}}{gregoriotex-spaces.tex}
-Macro to adjust the thickness of the staff lines.
-
-\begin{argtable}
-	\#1 & integer & The thickness of the staff lines.  The default value is same as staff size.
-\end{argtable}
-
-
-\subsubsection{Fine Tuning Dimensions}
-In addition to providing control over the overall size of your scores, Gregorio\TeX\ allows you to fine tune the spacings around and between the various elements using the following functions.
-
-\macroname{\textbackslash grecreatedim}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-spaces.tex}
-Macro to create one of Gregorio\TeX’s distances.  Used to initialize distances in a space configuration file.  For an example of such a file, please see \textit{gsp-default.tex}, which contains the default spacing configuration for Gregorio\TeX.
-
-\begin{argtable}
-	\#1 & string & The name of the distance to be changed.  See \nameref{distances} below.\\
-	\#2 & string & The distance in string format.  \textbf{Note:} You cannot use a length register for this argument.  You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
-	\#3 & \texttt{fixed} & Distance will not scale when staff size is changed.\\
-	& \texttt{scalable} & Distance will scale when staff size is changed.\\
-	& \texttt{inherited} & Distance will inherit its value from another distance.  When this argument is used, then \#2 should be the name of another Gregorio\TeX\ distance.
-\end{argtable}
-
-\macroname{\textbackslash grechangedim}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-spaces.tex}
-Macro to change one of Gregorio\TeX’s distances.  This function will check to make sure the distance you are trying to change exists first.
-
-\begin{argtable}
-	\#1 & string & The name of the distance to be changed.  See \nameref{distances} below.\\
-	\#2 & string & The distance in string format.  \textbf{Note:} You cannot use a length register for this argument.  You \emph{must} use a string because of the way that Gregorio\TeX\ handles spaces.\\
-	\#3 & \texttt{fixed} & Distance will not scale when staff size is changed.\\
-	& \texttt{scalable} & Distance will scale when staff size is changed.\\
-	& \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}
-Macro to turn on or off scaling with the staff size for a particular distance.
-
-\begin{argtable}
-	\#1 & string & The name of the distance for which scaling is to changed.  See \nameref{distances} below.\\
-	\#2 & \texttt{yes}/\texttt{true}/\texttt{on}/\texttt{scalable} & Choose just one of the given keywords.  Scale the distance when changing the size of the staff.\\
-	& string not in list above & Do not scale the distance when changing the size of the staff.
-\end{argtable}
-
-\textbf{Nota bene:} This macro also can be used to change whether or not the staff line thickness scales with the staff size by specifying \texttt{stafflinefactor} for the first argument.
-
-\macroname{\textbackslash grechangecount}{\{\#1\}\{\#2\}}{gregoriotex-spaces.tex}
-Macro to change one of Gregorio\TeX’s counts or penalities (numeric values).
-
-\begin{argtable}
-	\#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.
-
-\begin{argtable}
-	\#1 & string & The identifier of the space configuration file.
-\end{argtable}
-
-Example:\par\medskip
-\begin{latexcode}
-	% loads gsp-default.tex, the default configuration file
-	\greloadspaceconf{default}
-	% loads a custom configuration called gsp-myspaces.tex
-	\greloadspaceconf{myspaces}
-\end{latexcode}
-
-\macroname{\textbackslash greconffactor}{}{gsp-default.tex}
-A count which indicates the staff size that a space configuration file is designed for.  Each space configuration file must have this value set as Gregorio\TeX\ will compare it to the current staff size to determine if the configuration file being loaded needs to be rescaled.
-
-\macroname{\textbackslash gresetlineheightexpansion}{\{\#1\}}{gregoriotex-main.tex}
-Macro to configure line height expansion behavior when notes appear
-above or below the staff lines.
-
-\begin{argtable}
-		\#1 & \texttt{variable} & Expand lines within a score independently
-															of each other \\
-				& \texttt{uniform}  & Expand all lines within a score uniformly
-\end{argtable}
-
-By default, Gregorio\TeX{} uses \texttt{variable} line expansion.  This
-produces output similar to modern liturgical books.  However, this
-feature imposes a slight performance impact and typically requires a
-second pass (run of \texttt{lualatex}) to get the heights right.\bigskip
-
-The older behavior of Gregorio\TeX{}, \texttt{uniform} line expansion,
-does not have this performance impact.  However, the extra space it adds
-below the staff lines may look out-of-place in a section where there are
-no notes below the staff lines.\bigskip
-
-This behavior may be switched as needed within a \TeX{} document and
-affects all the scores which follow.  However, if \texttt{variable} line
-expansion is enabled anywhere in the document, the second pass will be
-necessary.
-
-\begin{small}
-\begin{framed}
-		\textit{For experts only:}\bigskip
-
-		It is possible to suppress the line height computation and just use
-		whatever has been computed from the previous run.  If you are sure
-		that the score line heights haven't changed from the previous run,
-		define the \verb=\greskipheightcomputation= control sequence before
-		including the Gregorio\TeX{} package.  This will save a little bit
-		of time per run.
-\end{framed}
-\end{small}
-
-\macroname{\textbackslash gresetledgerlineheuristic}{\{\#1\}}{gregoriotex-spaces.tex}
-Macro which enables or disables ledger line heuristics.  Currently, ledger
-line heuristics allow Gregorio to reduce the space between a note and a
-horizontal episema that surround a line on which a ledger line may appear
-when the ledger line \textit{does not} appear.
-
-\begin{argtable}
-		\#1 & \texttt{enable}  & Ledger line heuristics will be used in placing
-														 the horizontal episema \\
-				& \texttt{disable} & Ledger line heuristics will not be used in
-														 placing the horizontal episema \\
-\end{argtable}
-
-Because of the complexity of computing distances exactly, the heuristic may
-guess incorrectly, causing the horizontal episema to be placed incorrectly.
-This may be overridden on a note-by-note basic by using the
-\texttt{[hl:\textit{n}]} and \texttt{[ll:\textit{n}]} gabc directives.  The
-\texttt{hl} directive sets an explicit high ledger line (above the staff),
-and the \texttt{ll} directive sets an explicit low ledger line (below the
-staff).  The \texttt{\textit{n}} should be set to indicate whether the
-system should act as if the ledger line exists (\texttt{1}) or not
-(\texttt{0}).
-
-
-\subsubsection{Staff Lines}
-
-\macroname{\textbackslash gresetlinecolor}{\{\#1\}}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Macro for changing the color of the staff lines.   The two most common colors you're going to want to use are \texttt{gregoriocolor} (see \nameref{colors}) and \texttt{black} (the default).
-
-\begin{argtable}
-	\#1 & color name & The color of the staff lines
-\end{argtable}
-
-\macroname{\textbackslash gresetlines}{\{\#1\}}{gregoriotex-main.tex}
-Macro for setting whether the staff lines should be rendered or not.
-
-\begin{argtable}
-	\#1 & \texttt{visible} & The staff lines should be printed (default)\\
-	& \texttt{invisible} & The staff lines should not be printed
-\end{argtable}
-
-\macroname{\textbackslash gresetlinesbehindpunctumcavum}{\{\#1\}}{gregoriotex-signs.tex}
-Macro for setting whether the staff lines behind a punctum cavum should be shown or not.
-
-\begin{argtable}
-	\#1 & \texttt{visible} & The staff lines behind a punctum cavum should be printed (Plain \TeX\ default)\\
-	& \texttt{invisible} & The staff lines behind a punctum cavum should not be printed (\LaTeX\ default)
-\end{argtable}
-
-\macroname{\textbackslash gresetlinesbehindalteration}{\{\#1\}}{gregoriotex-signs.tex}
-Macro for setting whether the staff lines behind an alternation (\ie, an accidental) should be shown or not.
-
-\begin{argtable}
-	\#1 & \texttt{visible} & The staff lines behind an alteration should be printed (Plain \TeX\ default)\\
-	& \texttt{invisible} & The staff lines behind an alteration should not be printed (\LaTeX\ default)
-\end{argtable}
-
-
-\subsubsection{Score Font}
-Gregorio\TeX\ currently supports 3 different fonts for the glyphs in a score (neumes, clefs, alterations, \etc): Greciliae (a customized version of Caeciliae by Fr.\ Matthew Spencer, OSJ), Gregorio, and Grana Padano (née Parmesan, developed for Lilypond by Juergen Reuter).
-
-\macroname{\textbackslash gresetgregoriofont}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
-Set the font used for the neumes.  The optional argument \texttt{[\#1]}
-may be used to specify an alternate font/rule set.  Currently, the only
-available alternate font/rule set is \texttt{op} for Dominican neumes.
-
-Note that the font will be looked up by name through luaotfload, see the documentation of luaotfload for what it implies.
-
-\begin{argtable}
-	\#1 & \textit{(omitted)} & Use the normal font and rule set (default).\\
-	& \texttt{op} & Use the alternate Dominican font/rule set.\\
-	\#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
-	& \texttt{gregorio} & Use the Gregorio font.\\
-	& \texttt{granapadano} & Use the Grana Padano font.\\
-\end{argtable}
-
-\macroname{\textbackslash gresetgregoriofontscaled}{[\optional{\#1}]\{\#2\}\{\#3\}}{gregoriotex-main.tex}
-
-This function is the same as above, with a third argument to scale the font. The fonts shipped with Gregorio do not need to use this function, but some custom fonts do. Note that you cannot use this to scale glyphs up or down, as they would not be placed correctly on the staff.
-
-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.
-
-\macroname{\textbackslash grechangeglyph}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-main.tex}
-Substitutes the given Gregorio\TeX\ score glyph with the specified glyph
-from the specified font.
-
-\begin{argtable}
-	\#1 & string & The name of the Gregorio\TeX\ glyph to replace.\\
-	\#2 & string & The name of the font to use.\\
-	\#3 & number & The code point of the glyph to use.\\
-	& \texttt{.}string & The name of the variant (appended to \#1) to use.\\
-	& string & (any other string) The name of the glyph to use.
-\end{argtable}
-
-\medskip If \texttt{\#1} has a wildcard (a \texttt{*}) in it, then
-\texttt{\#3} must start with a dot and all glyphs matching \texttt{\#1}
-will be replaced with corresponding glyphs whose names have \texttt{\#3}
-appended.
-
-\medskip If \texttt{\#2} is \texttt{*}, then the substitution is assumed
-to be available in all score fonts.
-
-\medskip For example, to use the old glyphs (from Caeciliae) for the
-strophicus, use the following:\par\medskip
-\begin{latexcode}
-	\grechangeglyph{Stropha}{greciliae}{.caeciliae}
-	\grechangeglyph{StrophaAucta}{greciliae}{.caeciliae}
-\end{latexcode}
-
-\medskip To replace all torculus resupinus glyphs with their alternate
-versions, use the following:\par\medskip
-\begin{latexcode}
-	\grechangeglyph{TorculusResupinus*}{*}{.alt}
-\end{latexcode}
-
-\macroname{\textbackslash greresetglyph}{\{\#1\}}{gregoriotex-main.tex}
-Removes a Gregorio\TeX\ score glyph substitution, restoring it back to
-its original form.
-
-\begin{argtable}
-	\#1 & string & The name of the Gregorio\TeX\ glyph to restore.\\
-\end{argtable}
-
-\medskip If \texttt{\#1} has a wildcard (a \texttt{*}) in it, then
-all glyphs matching \texttt{\#1} will be restored.
-
-\medskip For example, to restore the strophicus back to the new glyphs,
-use the following:\par\medskip
-\begin{latexcode}
-	\greresetglyph{Stropha}
-	\greresetglyph{StrophaAucta}
-\end{latexcode}
-
-\medskip To restore all torculus resupinus glyphs to their original
-form, use the following:\par\medskip
-\begin{latexcode}
-	\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.
-
-\begin{argtable}
-	\#1 & string & The name of the \TeX\ control sequence (without leading backslash).\\
-	\#2 & string & The name of the font to use.\\
-	\#3 & number & The code point of the glyph to use.\\
-	& string & The name of the glyph to use.
-\end{argtable}
-
-\macroname{\textbackslash gredefsizedsymbol}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-symbols.tex}
-Defines (or redefines) a \TeX\ control sequence to be a non-score symbol
-which requires a single numeric argument (in points) to which the symbol
-will be scaled.
-
-\begin{argtable}
-	\#1 & string & The name of the \TeX\ control sequence (without leading backslash).\\
-	\#2 & string & The name of the font to use.\\
-	\#3 & number & The code point of the glyph to use.\\
-	& string & The name of the glyph to use.
-\end{argtable}
-
-\macroname{\textbackslash gresethepisema}{\{\#1\}}{gregoriotex-signs.tex}
-Determines whether Gregorio\TeX\ should join (bridge) horizontal episemata on adjacent notes.
-
-\begin{argtable}
-	\#1 & \texttt{bridge} & Adjacent horizontal episemata are joined together (default).\\
-	& \texttt{break} & Adjacent horizontal episemata are not joined.
-\end{argtable}
-
-\macroname{\textbackslash gresetpunctumcavum}{\{\#1\}}{gregoriotex-signs.tex}
-A shortcut for switching to the alternative punctum cavum and back.
-
-\begin{argtable}
-	\#1 & \texttt{alternate} & use the alternate punctum cavum\\
-	& \texttt{normal} & use the normal punctum cavum
-\end{argtable}
-
-Using the alternate punctum cavum is the equivalent of issuing the following commands:
-
-\begin{latexcode}
-	\grechangeglyph{PunctumCavum}{greciliae}{.caeciliae}%
-	\grechangeglyph{LineaPunctumCavum}{greciliae}{.caeciliae}%
-	\grechangeglyph{PunctumCavumHole}{greciliae}{.caeciliae}%
-	\grechangeglyph{LineaPunctumCavumHole}{greciliae}{.caeciliae}%
-\end{latexcode}
-
-\macroname{\textbackslash gresetglyphstyle}{\{\#1\}}{gregoriotex-chars.tex}
-Gregorio\TeX\ supports several glyph styles which can be changed with this macro.  These style replace some non-note glyphs with alternatives.
-
-\begin{argtable}
-	\#1 & \texttt{default} & Use the default style\\
-	& \texttt{medicaea} & Use a Medicaea style\\
-	& \texttt{hufnagel} & Use the hufnagel style\\
-	& \texttt{mensural} & Use the mensural style
-\end{argtable}
-
-%%%  Should there be a table here or in the appendix which shows the affected glyphs in each of the styles?
-
-
-\subsubsection[Barred letters (A/, etc.)]{Barred letters (\Abar, etc.)}
-
-\macroname{\textbackslash gresimpledefbarredsymbol}{\{\#1\}\{\#2\}}{gregoriotex-symbols.tex}
-Redefines a \TeX\ control sequence to be a a barred symbol.
-
-\begin{argtable}
-	\#1 & character & must be \texttt{A}, \texttt{R}, or \texttt{V}.\\
-	\#2 & dimension & how much the bar will be shifted left.\\
-\end{argtable}
-
-Gregorio\TeX\ does not have precomposed barred letters, instead, it has bars that you
-can use to composed barred letters in your text font. This command is the most
-simple version.
-
-For example:
-
-\medskip \begin{latexcode}
-	\gresimpledefbarredsymbol{A}{0.3em}
-\end{latexcode}
-
-Will define \texttt{\textbackslash Abar} to be a A with a bar shifted right
-of \texttt{0.3em} from the beginning of the glyph. This is the default definition
-and fits well with the Linux Libertine font. If you use another font, you'll
-certainly have to change this value by calling the \texttt{\textbackslash gresimpledefbarglyph} command.
-
-\macroname{\textbackslash gredefbarredsymbol}{\{\#1\}\{\#2\}\{\#3\}\{\#4\}\{\#5\}\{\#6\}}{gregoriotex-symbols.tex}
-Redefines a \TeX\ control sequence to be a barred symbol.
-
-\begin{argtable}
-	\#1 & string & the name of the command you want to define.\\
-	\#2 & string & command to typeset the text.\\
-	\#3 & string & symbol of the bar (must be defined through \texttt{gredefsizedsymbol}).\\
-	\#4 & number & the size of greextra to use (in pt).\\
-	\#5 & dimension & horizontal right shift of the bar.\\
-	\#6 & dimension & vertical shift of the bar glyph.\\
-\end{argtable}
-
-This is a more complete version of the previous command, it allows you to define
-barred letters with a different style. For example you can choose another bar
-drawing, or take a bar more adapted to small font size.
-
-For example:
-
-\begin{footnotesize}
-\begin{latexcode}
-	\gredefbarredsymbol{RBarBold}{\textbf{R}}{greRBarSmall}{13}{1.7mm}{0.1mm}
-\end{latexcode}
-\end{footnotesize}
-
-\gredefbarredsymbol{RBarBold}{\textbf{R}}{greRBarSmall}{13}{1.7mm}{0.1mm}
-Will define \texttt{\textbackslash RBarBold} to be a bold \textbf{R} with
-the bar made for small text (a bit bolder, named \texttt{RBarSmall} in greextra)
-, at 12pt, shifted right of \texttt{1.7mm} from the beginning of the glyph, and lowered down
-by \texttt{0.1mm}. The result is that \texttt{\textbackslash RBarBold} will typeset \RBarBold .
-
-See Appendix \ref{subsec:greextra} for a list of bars and other
-symbols present in the greextra font.
-
-\macroname{\textbackslash grelatexsimpledefbarredsymbol}{\{\#1\}\{\#2\}\{\#3\}\{\#4\}\{\#5\}}{gregoriotex-symbols.tex}
-Redefines a \TeX\ control sequence to be a barred symbol.
-
-\bigskip\textbf{Only available in \LaTeX.}
-
-\begin{argtable}
-	\#1 & character & must be \texttt{A}, \texttt{R}, or \texttt{V}.\\
-	\#2 & dimension & how much the bar will be shifted left when upright and medium weight.\\
-	\#3 & dimension & how much the bar will be shifted left when italic/slanted and medium weight.\\
-	\#4 & dimension & how much the bar will be shifted left when upright and bold.\\
-	\#5 & dimension & how much the bar will be shifted left when italic/slanted and bold.\\
-\end{argtable}
-
-This is like \verb=\gresimpledefbarglyph=, but allows setting different shifts
-for different font shapes and weights.  If you need something more elaborate,
-you will need to redefine the bar macro(s) manually.  This macro is only
-available in \LaTeX{} because it depends upon the \LaTeX{} font system.
-
-\macroname{\textbackslash grebarredsymbol}{\{\#1\}\{\#2\}\{\#3\}\{\#4\}\{\#5\}}{gregoriotex-symbols.tex}
-Generates a barred symbol.  This macro does not change any barred symbol
-definitions.  Instead, it actually generates the code that would show the
-barred symbol.
-
-\begin{argtable}
-	\#1 & string    & command to typeset the text.\\
-	\#2 & string    & symbol of the bar (must be defined through \texttt{gredefsizedsymbol}).\\
-	\#3 & number    & the size of greextra to use (in pt).\\
-	\#4 & dimension & horizontal right shift of the bar.\\
-	\#5 & dimension & vertical shift of the bar glyph.\\
-\end{argtable}
-
-\macroname{\textbackslash gothRbar}{}{gregoriotex-symbols.tex}
-Prints \gothRbar.  Defined with \verb=\gredefsymbol=.
-
-\macroname{\textbackslash gothVbar}{}{gregoriotex-symbols.tex}
-Prints \gothVbar.  Defined with \verb=\gredefsymbol=.
-
-\macroname{\textbackslash grealtcross}{}{gregoriotex-symbols.tex}
-Prints \grealtcross.  Defined with \verb=\gredefsymbol=.
-
-\macroname{\textbackslash grecross}{}{gregoriotex-symbols.tex}
-Prints \grecross.  Defined with \verb=\gredefsymbol=.
-
-\macroname{\textbackslash greheightstar}{}{gregoriotex-symbols.tex}
-Prints \greheightstar.  Defined with \verb=\gredefsymbol=.
-
-\macroname{\textbackslash gresixstar}{}{gregoriotex-symbols.tex}
-Prints \gresixstar.  Defined with \verb=\gredefsymbol=.
-
-\macroname{\textbackslash greseparator}{\{\#1\}\{\#2\}}{gregoriotex-symbols.tex}
-A macro for invoking one of the five separators (fancy lines) which are contained in the greextra font.
-
-\begin{argtable}
-	\#1 & \texttt{1}--\texttt{5} & Choose the number of the line desired\\
-	\#2 & integer & the point size at which to print the line\\
-\end{argtable}
-
-\macroname{\textbackslash greornamentation}{\{\#1\}\{\#2\}}{gregoriotex-symbols.tex}
-A macro for invoking one of the ornamentation elements which are contained in the greextra font.
-
-\begin{argtable}
-	\#1 & \texttt{1}--\texttt{2} & Choose the number of the ornamentation desired\\
-	\#2 & integer & the point size at which to print the line\\
-\end{argtable}
-
-
-\subsubsection{Special Characters}
-
-% this is defined in gregoriotex-symbols.texx as having one argument, but the
-% lua code generates a \gdef\<something> which then requires a second argument
-\macroname{\textbackslash gresetspecial}{\{\#1\}\{\#2\}}{gregoriotex-symbols.tex}
-Sets a special character.  Special characters are used from gabc within
-\texttt{<sp>} and \texttt{</sp>}.
-
-\begin{argtable}
-	\#1 & string & The text between \texttt{<sp>} and \texttt{</sp>}.\\
-	\#2 & \TeX\ code & The \TeX\ code to substitute when \texttt{<sp>\#1</sp>}
-										 is used in gabc.\\
-\end{argtable}
-
-\textbf{Nota Bene:} If you need to use a character in \#1 that is made special
-by \TeX{} (\ie, \textbackslash, \%, \etc), you should instead use
-\verb=\string\nnn=, where \texttt{nnn} is a three-digit, zero-padded number
-representing the ASCII code of the character (\ie, \textbackslash{} would be
-\verb=\string\092=).
-
-\macroname{\textbackslash greunsetspecial}{\{\#1\}}{gregoriotex-symbols.tex}
-Un-sets a special character.  Using an unset special character will use its
-text directly.
-
-\begin{argtable}
-	\#1 & string & The text between \texttt{<sp>} and \texttt{</sp>}.\\
-\end{argtable}
-
-\textbf{Nota Bene:} The same rules apply for \#1 as in \verb=\gresetspecial=.
-
-\macroname{\textbackslash gretilde}{}{gregoriotex-main.tex}
-Macro to print $\sim$.  This macro is set using the above for \texttt{<sp>$\sim$</sp>}.
-
-
-
-\subsubsection{Styling}
-Different elements of an include score have different styles applied.  These elements and their defaults are listed below:
-
-\begin{adjustbox}{center}
-\let\stylename\texttt
-\renewcommand{\thefootnote}{\fnsymbol{footnote}}
-\bigskip\rowcolors{1}{lightgray}{lightgray}
-\begin{tabular}{lp{7cm plus .5cm}r}
-	Element Name & Description & Default\\
-	\hline
-	\stylename{abovelinestext} & above line text (\texttt{<alt></alt>} in gabc, appears above the staff) & normal\\
-	\stylename{additionalstafflines} & short lines behind notes above or below the staff & special\footnotemark[1]\\
-	\stylename{annotation} & the annotation & none\\
-	\stylename{commentary} & the commentary & {\footnotesize\it footnote-size italics} (\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\\
-	\stylename{firstsyllableinitial} & the first letter of the first syllable of a score which is not the score initial & none\\
-	\stylename{firstword} & the first word of the first score excluding the score initial & none\\
-	\stylename{highchoralsign} & high choral signs & none\\
-	\stylename{initial} & Score initial (the first letter of the score, when offset from the rest of the text) & 40 pt font\\
-	\stylename{lowchoralsign} & low choral signs & none\\
-	\stylename{modedifferentia} & the rendered annotation from the \texttt{mode-differentia: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textbf{bold}}\\
-	\stylename{modeline} & the rendered annotation from the \texttt{mode: ;} header in the gabc file & \parbox[t]{2.2cm}{\raggedleft\textsc{\textbf{bold small capitals}}} (\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}\\
-	\stylename{normalstafflines} & Full length staff lines & none\\
-	\stylename{translation} & Translation text (appears below lyrics) & {\it italics}\\
-\end{tabular}
-\end{adjustbox}
-
-\footnotemark[1]\textit{Special:} By default, \texttt{additionalstafflines} inherits its properties from \texttt{normalstafflines}.  To decouple these environments, you must manually change \texttt{additionalstafflines} using \texttt{\textbackslash grechangestyle}.
-\renewcommand{\thefootnote}{\arabic{footnote}}\breakabletrue
-
-\macroname{\textbackslash grechangestyle}{\{\#1\}\{\#2\}[\optional{\#3}]}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Command to change styling of a score element.
-
-\begin{argtable}
-	\#1 & string & element whose styling is to be changed (see list above for options)\\
-	\#2 & \TeX\ code & the code necessary to turn on the styling\\
-	\#3 & \TeX\ code & Optional.  The code necessary to turn off the styling (\eg, if the code to turn on the styling contains a \verb=\begin{environment}= then the code to turn it off must have the matching \verb=\end{environment}=.
-\end{argtable}
-
-Examples:\par\medskip
-\begin{latexcode}
-	% This one works for both PlainTeX and LaTeX this would make
-	% the translations bold and italic
-	\grechangestyle{translation}{\it\bf}
-
-	% This one is LaTeX only, and would make the above lines
-	% text small and italic
-	\grechangestyle{abovelinestext}{\begin{small}\begin{itshape}}%
-		[\end{itshape}\end{small}]
-
-	% This would make the initial print in 36pt font.
-	\grechangestyle{initial}{\fontsize{36}{36}\selectfont}
-\end{latexcode}
-
-\bigskip
-Each element will be typeset within an isolated group to prevent styling commands from leaking from one element to the next.  As a result, if a styling command has an ``on-switch'' but no ``off-switch'' (like \verb=\it= or \verb=\bf= in the first example above) it is not necessary to encapsulate them within \verb=\begingroup= and \verb=\endgroup=.  As a result, the third argument is only necessary for styling commands which come in pairs (like the environments in the second example).
-
-\subsubsection{Text Elements}
-While the gabc headers provide support for some of the text elements commonly found on chant scores, Gregorio\TeX\ provides the following functions to allow you to enter and control those elements with a greater degree of precision than the gabc headers.
-
-\macroname{\textbackslash greannotation}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
-Macro to add annotations (the text which appears above the initial) to a score.  While a single call of the function does not support multiple lines, successive calls to the function will be added to the annotation as a new line below what is already there.
-
-\begin{argtable}
-	\#1 & \texttt{c} & When adding a new line, align the center of the new line with the center of the existing lines\\
-	& \texttt{l} & When adding a new line, align the left side of the new line with the left side of the existing lines\\
-	& \texttt{r} & When adding a new line, align the right side of the new line with the right side of the existing lines\\
-	\#2 & string & the text of the annotation
-\end{argtable}
-
-\textbf{Nota Bene:} The first argument does not affect the alignment of lines already in the annotation, only the way the new line aligns with the existing lines as a whole.
-
-\macroname{\textbackslash grecommentary}{[\optional{\#1}]\{\#2\}}{gregoriotex-main.tex}
-Macro to add commentary (the text flush right at the top, usually a scripture reference) to a score.  While a single call of this function does not support multiple lines, successive calls to the function will add a new line to the commentary directly below the previous.
-
-\begin{argtable}
-	\#1 & distance & Optional.  Additional distance to be placed between the commentary and the top staff line for the next score only.\\
-	\#2 & string & The text of the commentary.\\
-\end{argtable}
-
-\textbf{Nota Bene:} If your commentary is multi-lined, then the optional argument of the last line, and only the last line, will be taken into account.  Further, pay attention to the fact that the optional argument is \emph{additional} distance, \ie, it will be added to \texttt{commentaryraise} to determine the distance from the baseline of the commentary to the top line of the staff.
-
-\macroname{\textbackslash greillumination}{\{\#1\}}{gregoriotex-main.tex}
-Macro to add an illuminated initial.
-
-\begin{argtable}
-	\#1 & \TeX\ code & the code necessary to make the illuminated initial appear\\
-\end{argtable}
-
-\textbf{Nota Bene:} Usually the argument of this command should be an \verb=\includegraphics= command, but you may use what ever you want as the illuminated initial.
-
-\macroname{\textbackslash gresetinitiallines}{\{\#1\}}{gregoriotex-syllable.tex}
-Sets the number of lines the score initial requires.
-
-\begin{argtable}
-	\#1 & number & The number of lines required by the initial.  If \texttt{0}, the score will have no separated initial.\\
-\end{argtable}
-
-\textbf{Nota Bene:} As currently implemented, you cannot set an initial which is larger than 2 lines and in order to do so you must set manual line breaks in the gabc for the first two lines.
-
-\macroname{\textbackslash gresetmodenumbersystem}{\{\#1\}}{gregoriotex-main.tex}
-Sets the number system used for the mode number.
-
-\begin{argtable}
-	\#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.
-
-\macroname{\textbackslash gresetlyriccentering}{\{\#1\}}{gregoriotex-syllable.tex}
-Macro to set how the text of the lyrics aligns with the alignment point of its respective neumes.  The alignment point of the neumes is determined as follows:
-
-\begin{itemize}
-\item If the first glyph is only one note, or is a normal pes, or is composed of three or more notes, the alignment point is the middle of the first note.
-\item If the first glyph is composed of two notes (other than a normal pes), the alignment point is the middle of the glyph.
-\item In the case of a porrectus, the alignment point is the middle of an imaginary square punctum beginning at the same point as the porrectus.
-\end{itemize}
-
-\begin{argtable}
-	\#1 & \texttt{vowel} & The center of the vowel in the syllable will align with the alignment point of the neumes\\
-	& \texttt{syllable} & The center of the syllable will align with the alignment point of the neumes\\
-	& \texttt{firstletter} & The center of the first letter/character of the syllable will align with the alignment point of the neumes\\
-\end{argtable}
-
-\textbf{Nota Bene:} What constitutes the ``vowel'' of the syllable is determined by the language the lyric text is written in, as specified by the use of the \texttt{language} header in the gabc file.  Out of the box, Gregorio\TeX\ explicitly supports only Latin and English, but the rules for Latin have a high degree of overlap with many Romance languages, allowing them to fall back on the Latin rules with acceptable results.
-
-You can also define your own languages in \texttt{gregorio-vowels.dat}.  If you do define a language, please consider sharing your work by submitting it to the project (see CONTRIBUTING.md for instructions).
-
-Finally, in cases where you want some sort of exceptional alignment, you can force Gregorio to consider a particular part of the syllable to be the ``vowel'' by enclosing it in curly braces (``\{'' and ``\}'') in your gabc file.  Curly braces only affect alignment when using vowel centering.  Syllable centering will always use the entire syllable, and firstletter centering will always use the first character of the syllable --- regardless of curly braces in the gabc file.
-
-\macroname{\textbackslash gresetgabcforcecenters}{\{\#1\}}{gregoriotex-syllable.tex}
-Macro to determine whether a forced center (\ie, one specified by curly braces (``\{'' and ``\}'') in your gabc file) should influence the alignment of that syllable when \texttt{syllable} and \texttt{firstletter} alignments are in effect.
-
-\begin{argtable}
-	\#1 & \texttt{allow} & Forced centers in gabc are allowed to influence the syllable alignment (default).\\
-	& \texttt{prohibit} & Forced centers in gabc do not influence the syllable alignment.\\
-\end{argtable}
-
-\macroname{\textbackslash gresettranslationcentering}{\{\#1\}}{gregoriotex-main.tex}
-Macro to specify how the translation text should be aligned with it respective syllable text.
-
-\begin{argtable}
-	\#1 & \texttt{left} & The translation text is left aligned with its respective syllable text.\\
-	& \texttt{center} & The translation text is centered under its respective syllable.
-\end{argtable}
-
-\macroname{\textbackslash gresetannotationby}{\{\#1\}}{gregoriotex-main.tex}
-Macro to specify which line of the annotation should be used to determine its starting placement (i.e. before \texttt{annotationraise} is applied).
-
-\begin{argtable}
-	\#1 & \texttt{firstline} & Annotation placement is determined by the first line (default)\\
-	& \texttt{lastline} & annotation placement is determined by the last line\\
-\end{argtable}
-
-\macroname{\textbackslash gresetannotationvalign}{\{\#1\}}{gregoriotex-main.tex}
-Macro to specify which part of the control line in the annotation should be aligned with the top line of the staff before \texttt{annotationraise} is applied.
-
-\begin{argtable}
-	\#1 & \texttt{top} & The top of the annotation control line will align with the top line of the staff\\
-	& \texttt{baseline} & The baseline of the control line is used (default)\\
-	& \texttt{bottom} & The bottom of the control line is used\\
-\end{argtable}
-
-\textbf{Nota Bene:} These variable refer to the actual contents of the line and not to the ``hypothetical'' limits for the font.  As a result if the top of an annotation containing only short letters will be different from one which contains tall ones even if both use the same font.  Likewise, if the annotation contains no descenders, then baseline and bottom will be the same.  If this is a problem, then the use of struts within the annotation can be used to control the line height (distance from baseline to top) and depth (distance from baseline to bottom).
-
-\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.
-
-\macroname{\textbackslash gresetbreakbeforeeuouae}{\{\#1\}}{gregoriotex-main.tex}
-Macro to determine whether an automatic linebreak before a EUOUAE area is justified or not.
-
-\begin{argtable}
-	\#1 & \texttt{justified} & Automatic line breaks before EUOUAE areas should be justified (default)\\
-	& \texttt{ragged} & Automatic line breaks before EUOUAE areas should be ragged\\
-\end{argtable}
-
-\textbf{Important:} When set to \texttt{ragged}, Gregorio\TeX{} will require a
-second pass (run of \texttt{lualatex} or \texttt{luatex}) to typeset the line
-endings correctly.  When an additional pass is required, Gregorio\TeX{} will
-emit the following warning:\par\medskip
-
-\begin{scriptsize}
-\begin{latexcode}
-Module gregoriotex warning: Line heights or variable brace lengths may have changed. Rerun to fix.
-\end{latexcode}
-\end{scriptsize}
-
-\macroname{\textbackslash gresetbreakineuouae}{\{\#1\}}{gregoriotex-main.tex}
-Macro to determine whether line breaks are allowed inside a EUOUAE area (delimited by \texttt{<eu></eu>} tags in gabc).
-
-\begin{argtable}
-	\#1 & \texttt{allow} & Line breaks are allowed\\
-	& \texttt{prohibit} & Line breaks are prohibited, the entire EUOUAE area should appear on one line
-\end{argtable}
-
-\macroname{\textbackslash gresetbreakintranslation}{\{\#1\}}{gregoriotex-main.tex}
-Macro to determine whether line breaks are allowed inside a translation.
-
-\begin{argtable}
-	\#1 & \texttt{allow} & Line breaks are allowed\\
-	& \texttt{prohibit} & Line breaks are prohibited, the entire translation should appear on one line
-\end{argtable}
-
-\macroname{\textbackslash gresetcustosalteration}{\{\#1\}}{gregoriotex-signs.tex}
-Macro for setting whether an alteration (flat, sharp, or natural) should be
-rendered before a custos or not.
-
-\begin{argtable}
-	\#1 & \texttt{visible} & The custos alteration should be printed (default)\\
-			& \texttt{invisible} & The custos alteration should not be printed
-\end{argtable}
-
-\macroname{\textbackslash greseteolcustos}{\{\#1\}}{gregoriotex-main.tex}
-Macro to determine whether Gregorio\TeX\ should automatically place the custos at a line break.
-
-\begin{argtable}
-	\#1 & \texttt{auto} & Custos will be automatically placed at each line break\\
-	& \texttt{manual} & Custos will only be placed at line breaks if they are specified in the gabc (\eg \texttt{(g+z)})
-\end{argtable}
-
-\textbf{Nota Bene:} This command only effects the custos that appears at the end of a line.  Custos which are placed at a key change are unaffected.  Further, if custos are specified in the gabc file manually and Gregorio\TeX\ is set to place custos automatically, you will get two custos at the line breaks.
-
-\macroname{\textbackslash greseteolcustosbeforeeuouae}{\{\#1\}}{gregoriotex-main.tex}
-Macro to determine whether Gregorio\TeX\ should automatically place the custos at a line break before a EUOUAE.  Since the EUOUAE block is typically not a continuation of the melody but rather a reminder of the end of the tone that follows, this is set to \texttt{suppressed} (no custos) by default.
-
-\begin{argtable}
-	\#1 & \texttt{suppressed} & Custos will not automatically be placed at a line break before a EUOUAE block (the default)\\
-	& \texttt{auto} & Custos will behave according to \verb=greseteolcustos= at a line break before a EUOUAE block\\
-\end{argtable}
-
-\textbf{Nota Bene:} If \verb=\greseteolcustos= is set to \texttt{manual}, this setting is effectively ignored.
-
-\macroname{\textbackslash greseteolshifts}{\{\#1\}}{gregoriotex-main.tex}
-Macro to determine whether Gregorio\TeX\ should apply a small shift at the end of each line which allows lyrics to stretch under the final custos.
-
-\begin{argtable}
-	\#1 & \texttt{enable} & The shifts are applied (default)\\
-	& \texttt{disable} & The shifts are not applied.
-\end{argtable}
-
-\macroname{\textbackslash gresetbolshifts}{\{\#1\}}{gregoriotex-main.tex}
-Macro to determine whether Gregorio\TeX\ should apply a small shift at the beginning of each line so that lines are aligned on the notes rather than the syllable text.
-
-\begin{argtable}
-	\#1 & \texttt{enable} & The shifts are applied (default)\\
-	& \texttt{disable} & The shifts are not applied.
-\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.
-
-\begin{argtable}
-	\#1 & \texttt{justified} & Set the last line justified with the rest of the score\\
-	& \texttt{ragged} & Set the last line ragged (default)
-\end{argtable}
-
-\macroname{\textbackslash 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}
-
-\macroname{\textbackslash gresetshiftaftermora}{\{\#1\}}{gregoriotex-signs.tex}
-Macro to change the behaviour for separation between notes of two syllables when the first ends with a punctum mora. The argument changes the cases in which punctum mora are ignored in space computation:
-
-\begin{argtable}
-	\#1 & \texttt{always} & punctum mora are always ignored (default)\\
-	& \texttt{notesonly} & punctum mora are ignored before notes, not bars\\
-	& \texttt{barsonly} & punctum mora are ignored before bars, not notes\\
-	& \texttt{notextonly} & punctum mora are ignored only before bars inside syllables, or bars having their own syllable without text\\
-	& \texttt{insideonly} & punctum mora are ignored only before bars inside syllables\\
-	& \texttt{never} & punctum mora are never ignored\\
-\end{argtable}
-
-When a punctum mora is ignored, the bar will also be shifted by \texttt{moraadjustmentbar} (zero by default), see its description in the \nameref{distances} section.
-
-\macroname{\textbackslash gresetbarspacing}{\{\#1\}}{gregoriotex-syllable.tex}
-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 (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):
-
-\begin{argtable}
-	\#1 & \texttt{vepisema} & sets the printing of vertical episema\\
-	& \texttt{hepisema} & sets the printing of horizontal episema\\
-	& \texttt{mora} & sets the printing of punctum mora and auctum duplex\\
-	& \texttt{all} & set the printing of all of these\\
-	\#2 & \texttt{enable} & enable the printing\\
-	& \texttt{disable} & disable the 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.
-
-\subsubsection{Hyphenation}
-
-\macroname{\textbackslash gresethyphen}{\{\#1\}}{gregoriotex-main.tex}
-Tells Gregorio\TeX\ how to place a hyphen between syllables in polysyllabic words in a score.
-
-\begin{argtable}
-	\#1 & \texttt{force} & Hyphens will appear between all syllables in polysyllabic words.\\
-	& \texttt{auto} & Hyphens will appear based on the setting of \texttt{maximumspacewithoutdash} (default)
-\end{argtable}
-
-\macroname{\textbackslash gresetemptyfirstsyllablehyphen}{\{\#1\}}{gregoriotex-syllable.tex}
-Tells Gregorio\TeX\ how to place a hyphen after an empty first syllable (\ie, when the first syllable consists only of the big initial).
-
-\begin{argtable}
-	\#1 & \texttt{force} & A hyphen will appear after an empty first syllable. (default)\\
-	& \texttt{auto} & A hyphen will appear after an empty first syllable based on the setting of \texttt{maximumspacewithoutdash}
-\end{argtable}
-
-\macroname{\textbackslash greseteolhyphen}{\{\#1\}}{gregoriotex-main.tex}
-Marco to determine how much space the hyphen at the end of a line occupies for the purposes of spacing calculations (the visible appearance of the hyphen is unchanged).
-
-\begin{argtable}
-	\#1 & \texttt{normal} & The hyphen occupies its normal space\\
-	& \texttt{zero} & The hyphen is considered to take up no space
-\end{argtable}
-
-\subsubsection{Clef Visibility}
-
-\macroname{\textbackslash gresetclef}{\{\#1\}}{gregoriotex-signs.tex}
-Macro to tell Gregorio\TeX\ whether the clefs should be printed or not.
-
-\begin{argtable}
-	\#1 & \texttt{visible} & Clefs will be printed (default)\\
-	& \texttt{invisible} & Clefs will not be printed
-\end{argtable}
-
-
-\subsubsection{Clivis Alignment}
-Since the center of the clivis is different from most neumes, Gregorio\TeX\ supports several behaviors for determining how to align it with its lyrics.
-
-\macroname{\textbackslash gresetclivisalignment}{\{\#1\}}{gregoriotex-syllable.tex}
-Macro to determine the method used for aligning the clivis with its lyrics.
-
-\begin{argtable}
-	\#1 & \texttt{always} & Align on the real center of the clivis\\
-	& \texttt{never} & align on the center of the first punctum in the clivis\\
-	& \texttt{special} & align on the real center of the clivis except when (1) notes would go left of text or (2) consonants after vowels are larger than \verb=\gre@dimen@clivisalignmentmin= (default)
-\end{argtable}
-
-
-
-\subsubsection{Braces}
-
-\macroname{\textbackslash gresetbracerendering}{[\optional{\#1}]\{\#2\}}{gregoriotex-signs.tex}
-Macro to tell Gregorio\TeX{} whether to use \MP{} or fonts to render
-braces.  \MP{} braces, the default, are tailored to better maintain
-optical line weight when stretched.  \MP{} braces are designed to
-harmonize (and thus match best) with greciliae, but they still look good
-with the other score fonts.
-
-\begin{argtable}
-	\#1 & \textit{(omitted)} & change all braces\\
-			& \texttt{brace} & change round braces that appear over the staff\\
-			& \texttt{underbrace} & change round braces that appear under the staff\\
-			& \texttt{curlybrace} & change curly braces\\
-			& \texttt{barbrace} & change round braces that appear over divisio bars\\
-	\#2 & \texttt{metapost} & \MP{} will be used to render braces\\
-			& \texttt{font} & The score font will be used to render braces\\
-\end{argtable}
-
-\macroname{\textbackslash grebarbracewidth}{}{gregoriotex-signs.tex}
-Returns the em-relative width of a bar brace when braces are rendered by
-\MP{} (as opposed to fonts).  The value is scaled by the Gregorio\TeX\ score
-size factor and thus is a score-relative value with a precise (but
-obscure) mathematical meaning.  Suffice it to say that larger numbers
-make the bar brace wider and smaller numbers make the brace narrower.
-This must be a positive number, defaults to \texttt{.58879}, and
-harmonizes with the greciliae font.  This macro must be redefined should
-a different value be desired.
-
-
-\subsubsection{Headers}
-
-\macroname{\textbackslash gresetheadercapture}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-main.tex}
-Macro to tell Gregorio\TeX{} to capture a given header of the gabc file, passing it to a
-specified \TeX{} macro.  Passing an empty \#2 will cancel capture of the given header.
-
-\begin{argtable}
-	\#1 & string & The name of the gabc header\\
-	\#2 & string & The name of the macro to use (without the leading backslash)
-								 or empty to stop capturing the given header\\
-	\#3 & string & a comma-separated list of options\\
-\end{argtable}
-
-The options are:
-
-\begin{tabular}{ll}
-	\texttt{name}   & The header name should also be passed to the macro\\
-	\texttt{string} & The header value should be passed to the macro as a string\\
-\end{tabular}
-
-If the \texttt{name} option is not supplied, the macro is called with one
-argument: the value of the header.
-
-If the \texttt{name} option is supplied, the macro is called with two
-arguments: the name and the value of the header (in that order).
-
-If the \texttt{string} option is supplied, the value will be passed with
-catcode 12 associated with all non-space characters (and catcode 10 for all spaces).
-If not, the value will be evaluated as regular \TeX{} input.
-
-Other than the headers that define macros, which are not passed to \TeX{},
-the headers will be processed in the order they were presented in the gabc
-file.  Headers will be processed in the \TeX{} state at the point of the
-\verb=\gregorioscore= call.  This means, for example, that should the
-capturing macro produce something, it will be typeset within the same
-paragraph as the \verb=\gregorioscore= call.
-
-As an example, you can use
-
-\verb=\gresetheadercapture{commentary}{grecommentary}{string}=
-
-\noindent to capture the
-\texttt{commentary} header of gabc files and feed it to \verb=\grecommentary=,
-thus automatically printing the content of the header above the score.
-
-\macroname{\textbackslash grebeforeheaders}{\{\#1\}}{gregoriotex-main.tex}
-Specifies \TeX{} code processed before the processing of the headers of a score.
-Defaults to nothing.  If this is called multiple times, the most recent call
-will define the behavior at the next set of headers.
-
-\begin{argtable}
-		\#1 & \TeX\ code & The code to process before a set of headers.\\
-\end{argtable}
-
-\macroname{\textbackslash greafterheaders}{\{\#1\}}{gregoriotex-main.tex}
-Specifies \TeX{} code processed after the processing of the headers of a score.
-Defaults to nothing.  If this is called multiple times, the most recent call
-will define the behavior at the next set of headers.
-
-\begin{argtable}
-		\#1 & \TeX\ code & The code to process after a set of headers.\\
-\end{argtable}
-
-
-\subsubsection{Ancient Notation}
-For a full description of how to make use of the ancient notation capabilities of Gregorio and Gregorio\TeX, look at the GregorioNabcRef documentation.  The commands listed here allow the manipulation of settings related to that notation.
-
-\macroname{\textbackslash gresetnabcfont}{\{\#1\}\{\#2\}}{gregoriotex-nabc.tex}
-Macro to set the font to be used for the ancient notation.
-
-\begin{argtable}
-	\#1 & string & the name of the font\\
-	\#2 & integer & point size at which the font should be loaded\\
-\end{argtable}
-
-\subsection{Counts}\label{counts}
-
-Each of the following counts controls some aspect of the configuration of the Gregorio\TeX\ score.  They are changed using \verb=\grechangecount=, documented above.
-
-\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} 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}
-
-\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}
-
-Each of the following distances controls some aspect of the spacing of the Gregorio\TeX\ score.  They are changed using \verb=\grechangedim=, documented above.  If the distance permits a rubber value, then the default value will indicate the stretch and shrink (even if they are zero by default).  Distances whose default value does not include a stretch or shrink may not take a rubber value.
-
-While it may seem strange that many of these distances are defined to 5 decimal places in centimeters (much smaller than most people can see) this is a legacy of how these distances were originally defined in small points.  Since most people don’t know what small points are, the distances were converted to a unit more familiar to most people, but no rounding was applied to the conversions so that scores wouldn’t change their appearance as a result of the conversion.  Users should feel under no obligation to maintain this level of precision when adjusting them to suit their own tastes.
-
-\textbf{Nota Bene:} Because of the way Gregorio\TeX\ handles distances, these cannot be manipulated as if they were normal \TeX\ dimensions or skips.  As a result they should only be changed using the command defined by Gregorio\TeX\ for this purpose.
-
-\begin{gdimension}{additionallineswidth}
-The additional width of the additional lines (\ie, the value added to the width of the glyph with which they're associated to get the width of the line).
-\end{gdimension}
-
-\begin{gdimension}{alterationspace}
-Space between an alteration (flat or natural) and the next glyph.
-\end{gdimension}
-
-\begin{gdimension}{beforealterationspace}
-When beginning of line shifts (bolshifts) are enabled, minimum space between a clef at the beginning of the line and a leading alteration glyph.  This distance should be larger than \texttt{clefflatspace} so that a flatted clef can be distinguished from a flat which is part of the first glyph on a line, but also smaller than \texttt{spaceafterlineclef}, the distance from the clef to the first notes.
-\end{gdimension}
-
-\begin{gdimension}{beforelowchoralsignspace}
-Space before a low choral sign.
-\end{gdimension}
-
-\begin{gdimension}{clefflatspace}
-Space between a clef and a flat (for clefs with flat).
-\end{gdimension}
-
-\begin{gdimension}{interglyphspace}
-Space between glyphs in the same element.
-\end{gdimension}
-
-\begin{gdimension}{zerowidthspace}
-Null space.
-\end{gdimension}
-
-\begin{gdimension}{halfspace}
-Half-space between elements.
-\end{gdimension}
-
-\begin{gdimension}{interelementspace}
-Space between elements.
-\end{gdimension}
-
-\begin{gdimension}{largerspace}
-Larger space between elements.
-\end{gdimension}
-
-\begin{gdimension}{glyphspace}
-Space between elements which has the size of a note.
-\end{gdimension}
-
-\begin{gdimension}{spacebeforeeolcustos}
-Space before custos at the end of a line.
-\end{gdimension}
-
-\begin{gdimension}{spacebeforeinlinecustos}
-Space before custos within a line.
-\end{gdimension}
-
-\begin{gdimension}{spacebeforesigns}
-Space before punctum mora and augmentum duplex.
-\end{gdimension}
-
-\begin{gdimension}{moraadjustment}
-When a syllable (bar or not) is shifted left because of a preceding punctum
-mora, this space is also added. Use it to make the syllable a bit further from
-the punctum mora if you want.
-\end{gdimension}
-
-\begin{gdimension}{moraadjustmentbar}
-Same as previous one but specific to cases where puntum mora precedes a bar.
-\end{gdimension}
-
-\begin{gdimension}{spaceaftersigns}
-Space after punctum mora and augmentum duplex.
-\end{gdimension}
-
-\begin{gdimension}{spaceafterlineclef}
-Space after a clef at the beginning of a line.
-\end{gdimension}
-
-\begin{gdimension}{intersyllablespacenotes}
-Minimum space between notes of different syllables.
-\end{gdimension}
-
-\begin{gdimension}{intersyllablespacestretchhyphen}
-Stretching added in the case where the text of two syllables of the same word are
-separated with an automatic hyphen.
-\end{gdimension}
-
-\begin{gdimension}{interwordspacenotes}
-Minimum space between notes of syllables from different words.
-\end{gdimension}
-
-\begin{gdimension}{interwordspacetext}
-Minimum space between texts of different words. Please keep the same \texttt{plus} and \texttt{minus} as \texttt{interwordspacenotes}.
-\end{gdimension}
-
-\begin{gdimension}{interwordspacenotes@alteration}
-Same as \texttt{interwordspacenotes} for the case where the second syllable starts with an alteration.
-\end{gdimension}
-
-\begin{gdimension}{intersyllablespacenotes@alteration}
-Same as \texttt{intersyllablespacenotes} for the case where the second syllable starts with an alteration.
-\end{gdimension}
-
-\begin{gdimension}{interwordspacenotes@euouae}
-Same as \texttt{interwordspacenotes} for \texttt{euouae} blocks.
-\end{gdimension}
-
-\begin{gdimension}{interwordspacetext@euouae}
-Same as \texttt{interwordspacetext} for \texttt{euouae} blocks.
-\end{gdimension}
-
-\begin{gdimension}{bitrivirspace}
-Space between notes of a bivirga or trivirga.
-\end{gdimension}
-
-\begin{gdimension}{bitristrospace}
-Space between notes of a bistropha or tristrophae.
-\end{gdimension}
-
-\begin{gdimension}{punctuminclinatumshift}
-Space between two descending puncta inclinata.
-\end{gdimension}
-
-\begin{gdimension}{punctuminclinatumunisonshift}
-Space between two unison puncta inclinata.
-\end{gdimension}
-
-\begin{gdimension}{beforepunctainclinatashift}
-Space before puncta inclinata.
-\end{gdimension}
-
-\begin{gdimension}{punctuminclinatumanddebilisshift}
-Space between a punctum inclinatum and a punctum inclinatum deminutus,
-descending.
-\end{gdimension}
-
-\begin{gdimension}{punctuminclinatumdebilisshift}
-Space between two punctum inclinatum deminutus.
-\end{gdimension}
-
-\begin{gdimension}{punctuminclinatumbigshift}
-Space between descending puncta inclinata, larger ambitus (range=3rd).
-\end{gdimension}
-
-\begin{gdimension}{punctuminclinatummaxshift}
-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}
-Space between two ascending puncta inclinata.
-\end{gdimension}
-
-\begin{gdimension}{ascendingpunctuminclinatumanddebilisshift}
-Space between a punctum inclinatum and a punctum inclinatum deminutus,
-ascending.
-\end{gdimension}
-
-\begin{gdimension}{ascendingpunctuminclinatumbigshift}
-Space between ascending puncta inclinata, larger ambitus (range=3rd).
-\end{gdimension}
-
-\begin{gdimension}{ascendingpunctuminclinatummaxshift}
-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.
-\end{gdimension}
-
-\begin{gdimension}{descendinginclinatumtonobarbigshift}
-Space between a punctum inclinatum and a no-bar (stemless) glyph two pitches
-below.
-\end{gdimension}
-
-\begin{gdimension}{descendinginclinatumtonobarmaxshift}
-Space between a punctum inclinatum and a no-bar (stemless) glyph three or four
-pitches below.
-\end{gdimension}
-
-\begin{gdimension}{ascendinginclinatumtonobarshift}
-Space between a punctum inclinatum and a no-bar (stemless) glyph one pitch
-above.
-\end{gdimension}
-
-\begin{gdimension}{ascendinginclinatumtonobarbigshift}
-Space between a punctum inclinatum and a no-bar (stemless) glyph two pitches
-above.
-\end{gdimension}
-
-\begin{gdimension}{ascendinginclinatumtonobarmaxshift}
-Space between a punctum inclinatum and a no-bar (stemless) glyph three or four
-pitches above.
-\end{gdimension}
-
-\begin{gdimension}{ascendinginclinatumtonobarmaxshift}
-Space between a punctum inclinatum and a no-bar (stemless) glyph three or four
-pitches above.
-\end{gdimension}
-
-\begin{gdimension}{maximumspacewithoutdash}
-Maximal space between two syllables for which we consider a dash is not needed.
-\end{gdimension}
-
-\begin{gdimension}{afterclefnospace}
-An extensible space for the beginning of lines.
-\end{gdimension}
-
-\begin{gdimension}{additionalcustoslineswidth}
-Width of the additional lines, used only for the custos.  The width is the one for the custos at end of lines, the line for custos in the middle of a score is the same multiplied by 2.
-\end{gdimension}
-
-\begin{gdimension}{afterinitialshift}
-Space between the initial and the beginning of the score.
-\end{gdimension}
-
-\begin{gdimension}{beforeinitialshift}
-Space between the initial and the beginning of the score.
-\end{gdimension}
-
-\begin{gdimension}{minimalspaceatlinebeginning}
-Minimal space in front of the lyrics at the beginning of a line when \texttt{bolshift}s are enabled.
-\end{gdimension}
-
-\begin{gdimension}{manualinitialwidth}
-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).
-
-\textbf{Nota Bene:} This is the absolute space.  If the lower line contains only short letters then it will get moved up so only this space shows (not the space above the letters on a normal line plus this space).  You should use struts to control the line height of the lower line if this is a problem.
-\end{gdimension}
-
-\begin{gdimension}{annotationraise}
-Amount to raise (positive) or lower (negative) the annotation from its normal position (set with \verb=\gresetannotationby= and \verb=\gresetannotationvalign=).
-\end{gdimension}
-
-\begin{gdimension}{commentaryseparation}
-This space is the one between lines in the commentary (text above the first staff line on the right).
-
-\textbf{Nota Bene:} This is the absolute space.  If the lower line contains only short letters then it will get moved up so only this space shows (not the space above the letters on a normal line plus this space).  You should use struts to control the line height of the lower line if this is a problem.
-\end{gdimension}
-
-\begin{gdimension}{commentaryraise}
-Distance from the commentary to the top line of the staff.
-\end{gdimension}
-
-\begin{gdimension}{noclefspace}
-Space at the beginning of the lines if there is no clef.
-\end{gdimension}
-
-\begin{gdimension}{choralsigndownshift}
-The distance to shift choral signs down.  The following choral signs are shifted down:
-
-\begin{itemize}
-	\item Low choral signs that are not lower than the note
-	\item High choral signs which are in a space
-	\item Low choral signs that are lower than the note which are in a space
-\end{itemize}
-\end{gdimension}
-
-\begin{gdimension}{choralsignupshift}
-The distance to shift choral signs up.  The following choral signs are shifted up:
-
-\begin{itemize}
-	\item High choral signs which are on a line
-	\item Low choral signs that are lower than the note which are on a line
-\end{itemize}
-\end{gdimension}
-
-\begin{gdimension}{translationheight}
-The space for the translation.
-\end{gdimension}
-
-\begin{gdimension}{spaceabovelines}
-The space above the lines.
-\end{gdimension}
-
-\begin{gdimension}{spacelinestext}
-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}
-
-\begin{gdimension}{abovelinestextraise}
-Height of the text above the note line.
-\end{gdimension}
-
-\begin{gdimension}{abovelinestextheight}
-Height that is added at the top of the lines if there is text above the lines (it must be bigger than the text for it to be taken into consideration).
-\end{gdimension}
-
-\begin{gdimension}{braceshift}
-An additional shift you can give to the brace above the staff.
-\end{gdimension}
-
-\begin{gdimension}{curlybraceaccentusshift}
-A shift you can give to the accentus above the curly brace.
-\end{gdimension}
-
-\begin{gdimension}{nabcinterelementspace}
-Space between elements in ancient notation.
-\end{gdimension}
-
-\begin{gdimension}{nabclargerspace}
-Larger space between elements in ancient notation.
-\end{gdimension}
-
-\begin{gdimension}{clivisalignmentmin}
-When \verb=\gre@clivisalignment= is 2, this distance is the maximum length of the consonants after vowels for which the clivis will be aligned on its center.
-\end{gdimension}
-
-\begin{gdimension}{clefchangespace}
-Space around a clef change.
-\end{gdimension}
-
-\begin{gdimension}{initialraise}
-Distance the initial will be raised above its default baseline.  The default baseline for the initial coincides with the baseline for the text below the staff.
-\end{gdimension}
-
-\begin{gdimension}{overslurshift}
-Distance an over-the-notes slur will be raised above the baseline of a note at the same height.
-\end{gdimension}
-
-\begin{gdimension}{underslurshift}
-Distance an under-the-notes slur will be raised above the baseline of a note at the same height.
-\end{gdimension}
-
-\begin{gdimension}{divisiofinalissep}
-Space separating the two bars of a divisio finalis.
-\end{gdimension}
-
-\begin{gdimension}{overhepisemalowshift}
-Distance to place a a horizontal episema over a note in a low position in the space.
-\end{gdimension}
-
-\begin{gdimension}{overhepisemahighshift}
-Distance to place a horizontal episema over a note in a high position in the space.
-\end{gdimension}
-
-\begin{gdimension}{underhepisemalowshift}
-Distance to place a horizontal episema under a note in a low position in the space.
-\end{gdimension}
-
-\begin{gdimension}{underhepisemahighshift}
-Distance to place a horizontal episema under a note in a high position in the space.
-\end{gdimension}
-
-\begin{gdimension}{hepisemamiddleshift}
-Distance to place a horizontal episema in the middle of a space.
-\end{gdimension}
-
-\begin{gdimension}{vepisemalowshift}
-Distance to place a vertical episema in a low position in the space.
-\end{gdimension}
-
-\begin{gdimension}{vepisemahighshift}
-Distance to place a vertical episema in a high position in the space.
-\end{gdimension}
-
-\begin{gdimension}{linepunctummorashift}
-Vertical distance to place a punctum mora for a note on a line.
-\end{gdimension}
-
-\begin{gdimension}{spacepunctummorashift}
-Vertical distance to place a punctum mora for a note in a space.
-\end{gdimension}
-
-\begin{gdimension}{spaceamonepespunctummorashift}
-Vertical distance to place a punctum mora for the second note (in a space) of a pes with ambitus one.
-\end{gdimension}
-
-\begin{gdimension}{lineporrectuspunctummorashift}
-Vertical distance to place a punctum mora for the second note in a porrectus (or similar figure), on a line
-\end{gdimension}
-
-\begin{gdimension}{spaceporrectuspunctummorashift}
-Vertical distance to place a punctum mora for the second note in a porrectus (or similar figure), in a space
-\end{gdimension}
-
-\begin{gdimension}{raresignshift}
-Distance to place a ``rare'' sign above the top space in a score.
-\end{gdimension}
-
-\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. 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}
-
-\begin{gdimension}{bar@dominican}
-\end{gdimension}
-
-\begin{gdimension}{bar@maior}
-\end{gdimension}
-
-\begin{gdimension}{bar@finalis}
-\end{gdimension}
-
-Spaces around bars in standalone syllables, when these have text (new bar spacing algorithm only):
-
-\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}
-
-\begin{gdimension}{bar@dominican@standalone@text}
-\end{gdimension}
-
-\begin{gdimension}{bar@maior@standalone@text}
-\end{gdimension}
-
-\begin{gdimension}{bar@finalis@standalone@text}
-\end{gdimension}
-
-\begin{gdimension}{bar@finalfinalis@standalone@text}
-\end{gdimension}
-
-Spaces around bars in standalone syllables, when these have no text (new bar spacing algorithm only):
-
-\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}
-
-\begin{gdimension}{bar@dominican@standalone@notext}
-\end{gdimension}
-
-\begin{gdimension}{bar@maior@standalone@notext}
-\end{gdimension}
-
-\begin{gdimension}{bar@finalis@standalone@notext}
-\end{gdimension}
-
-\begin{gdimension}{bar@finalfinalis@standalone@notext}
-\end{gdimension}
-
-\begin{gdimension}{spacearoundclefbars}
-Additional space that will appear around bars that are preceded by a custos and followed by a key.
-\end{gdimension}
-
-\begin{gdimension}{bar@rubber}
-A rubber value applied on both sides of all bars in standalone syllables, in new bar spacing algorithm only.
-
-\textbf{Nota Bene:} This distance should always have a base value of 0pt.
-\end{gdimension}
-
-\begin{gdimension}{interwordspacetext@bars}
-Minimum space between texts of different words when one of the syllable contains only a bar (new bar spacing algorithm only).
-\end{gdimension}
-
-\begin{gdimension}{interwordspacetext@bars@euouae}
-Same as \texttt{interwordspacetext@bars} for \texttt{euouae} blocks (so quite rare).
-\end{gdimension}
-
-\begin{gdimension}{interwordspacetext@bars@notext}
-Minimum space between texts of adjacent words when they are separated by a bar syllable which has no text associated with it (new bar spacing algorithm only).
-\end{gdimension}
-
-\begin{gdimension}{interwordspacetext@bars@notext@euouae}
-Same as \texttt{interwordspacetext@bars@notext} for \texttt{euouae} blocks (so quite rare).
-\end{gdimension}
-
-\begin{gdimension}{textbartextspace}
-Space between the text of previous syllable and the text associated with the bar (old bar spacing algorithm only).
-\end{gdimension}
-
-\begin{gdimension}{notebarspace}
-Minimal space between a note and a bar.
-\end{gdimension}
-
-\begin{gdimension}{maxbaroffsettextleft}
-Maximum distance by which the center of a bar and the center of its associated text can be separated, when the center of the text goes left of the center of the bar (new bar spacing algorithm only).
-\end{gdimension}
-
-\begin{gdimension}{maxbaroffsettextright}
-Same as \texttt{maxbaroffsettextleft} but when the center of the text goes right of the center of the bar.
-\end{gdimension}
-
-\begin{gdimension}{maxbaroffsettextleft@nobar}
-Maximum distance by which the center of a “no-bar” (\ie something like \texttt{*()} in gabc) and the center of its associated text can be separated, when the center of the text goes left of the center of the no-bar (new bar spacing algorithm only).
-\end{gdimension}
-
-\begin{gdimension}{maxbaroffsettextright@nobar}
-Same as \texttt{maxbaroffsettextleft@nobar} but when the center of the text goes right of the center of the no-bar.
-\end{gdimension}
-
-\begin{gdimension}{maxbaroffsettextleft@eol}
-Maximum distance by which the center of a bar and the center of its associated text can be separated, when the center of the text goes left of the center of the bar and the bar syllable contains a manual line break (new bar spacing algorithm only).
-\end{gdimension}
-
-\begin{gdimension}{maxbaroffsettextright@eol}
-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.  With the exception of \texttt{emergencystretch} (which should be changed using \verb=\grechangedim=) these should be changed using \verb=\grechangecount=, described above.
-
-\begin{gcount}{brokenpenalty}
-The vertical penalty inserted after a break on a clef change.
-\end{gcount}
-
-\begin{gcount}{clubpenalty}
-The club penalty (determines how important it is to prevent orphans from occurring).
-\end{gcount}
-
-\begin{gcount}{widowpenalty}
-The widow penalty (determines how important it is to prevent widows from occurring).
-\end{gcount}
-
-\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=
-
-\begin{gcount}{endafterbarpenalty}
-The end after bar penalty.
-\end{gcount}
-
-\begin{gcount}{endafterbaraltpenalty}{}{gsp-default.tex}
-The alternate end after bar penalty (used when there is no text under the bar).
-\end{gcount}
-
-\begin{gcount}{endofelementpenalty}{}{gsp-default.tex}
-The end of element penalty.
-\end{gcount}
-
-\begin{gcount}{endofsyllablepenalty}{}{gsp-default.tex}
-The end of element penalty.
-\end{gcount}
-
-\begin{gcount}{endofwordpenalty}{}{gsp-default.tex}
-The end of element penalty.
-\end{gcount}
-
-\begin{gcount}{hyphenpenalty}{}{gsp-default.tex}
-The hyphen penalty.
-\end{gcount}
-
-\begin{gcount}{nobreakpenalty}{}{gsp-default.tex}
-Penalty to prevent a line break.
-\end{gcount}
-
-\begin{gcount}{newlinepenalty}
-Penalty to force a line break.
-\end{gcount}
-
-\begin{gcount}{finalpenalty}
-The penalty applied after the final element of a score.
-\end{gcount}
-
-\macroname{looseness}{}{gsp-default.tex}
-The \TeX\ looseness within a score.
-
-Default: \verb=\looseness=
-
-\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}
-
-\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)]
-
-\textit{Nota bene:} For more details on why this is necessary see the comments in gsp-default.tex.
-
-
-
-
-
-\subsection{Colors}\label{colors}
-All colors can be redefined using \verb=\definecolor=.  See the
-\verb=xcolor= (\LaTeX) or \verb=color= (Plain\TeX) package for documentation.
-
-Example:\par\medskip
-\begin{latexcode}
-	\definecolor{gregoriocolor}{RGB}{229,53,44}
-\end{latexcode}
-
-\macroname{grebackgroundcolor}{}{gregoriotex.sty}
-The color Gregorio\TeX\ uses to block out elements which have been printed,
-but shouldn't show (\eg, the staff line going through the interior of
-a punctum cavum).  The default is white.
-
-\macroname{gregoriocolor}{}{gregoriotex.sty}
-A red similar to that found in liturgical documents.  This is the color that Gregorio\TeX\ uses for text formatted with \texttt{<c></c>} tags in gabc.
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: "GregorioRef"
-%%% End:
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex
deleted file mode 100644
index 0bd6bcff49d..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex
+++ /dev/null
@@ -1,1172 +0,0 @@
-% !TEX root = GregorioRef.tex
-% !TEX program = LuaLaTeX+se
-%
-% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
-%
-% This file is part of Gregorio.
-%
-% Gregorio is free software: you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version.
-%
-% Gregorio is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
-%
-\section{Gregorio Controls}
-
-These functions are the ones written by gregorio to the gtex file.
-While one could, in theory, use/change them to alter the appearance of
-elements of the score, it is far better to make your changes in the
-gabc file and let gregorio make the changes to the gtex file.
-
-\macroname{\textbackslash GreAnnotationLines}{\#1\#2}{gregoriotex-main.tex}
-A wrapper macro for placing annotations above the initial. The
-arguments are provided by the \texttt{gabc} file in the
-\texttt{annotation} header field.  This macro tests for the presence
-of the annotation box which means that the annotation is explicitly
-defined in the \texttt{main.tex} file. If so, this macro does nothing,
-respecting the annotation value in the \texttt{main.tex} file.
-
-\begin{argtable}
-	\#1 & string & First line text to place above the initial.\\
-	\#2 & string & Second line text to place above the initial.\\
-\end{argtable}
-
-\macroname{\textbackslash GreBeginScore}{\#1\#2\#3\#4\#5\#6\#7\#8}{gregoriotex-main.tex}
-Macro to start a score.
-
-\begin{argtable}
-	\#1 & string  & a unique identifier for the score (currently an SHA-1-based digest of the gabc file)\\
-	\#2 & integer & the height number of the top pitch of the entire score, including signs\\
-	\#3 & integer & the height number of the bottom pitch of the entire score, including signs\\
-	\#4 & 0 & there is no translation line in the score\\
-			& 1 & there is a translation line somewhere in the score\\
-	\#5 & 0 & there is no above lines text in the score\\
-			& 1 & there is above lines text somewhere in the score\\
-	\#6 & string  & the absolute filename of the gabc file if point-and-click is enabled\\
-	\#7 & integer & the number of staff lines\\
-	\#8 & \TeX\ code & macros to run before the score (\eg, setting clef
-										 extrema)\\
-\end{argtable}
-
-\macroname{\textbackslash GreEndScore}{}{gregoriotex-main.tex}
-Macro to end a score.
-
-\macroname{\textbackslash GreBeginHeaders}{}{gregoriotex-main.tex}
-Macro called at the beginning of a set of gabc headers.
-
-\macroname{\textbackslash GreEndHeaders}{}{gregoriotex-main.tex}
-Macro called at the end of a set of gabc headers.
-
-\macroname{\textbackslash GreAccentus}{\#1\#2}{gregoriotex-signs.tex}
-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{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{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\#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}
-Macro for typesetting an augmentum duplex (a pair of punctum mora)
-
-\begin{argtable}
-	\#1 & integer & Height number for first punctum mora.\\
-	\#2 & integer & Height number for second punctum mora.\\
-	\#3 & integer & First punctum mora occurs before last note of a podatus, prorectus, or toculus resupinus (1), or not (0).\\
-\end{argtable}
-
-\macroname{\textbackslash GreBarBrace}{\#1}{gregoriotex-signs.tex}
-Macro for typesetting a bar brace.
-
-\begin{argtable}
-	\#1 & string & Type of glyph the episema is attached to.  See \Nameref{NoteOffset} for a description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreBarSyllable}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-syllable.tex}
-Macro for typesetting a bar syllable.
-
-\begin{argtable}
-	\#1 & \TeX\ code & macro setting syllable letters for the current syllable\\
-	\#2 & empty & reserved for future use\\
-	\#3 & \TeX\ control sequence & the control sequence to use for styling the hyphen\\
-	\#4 & \texttt{0} & this syllable is not the end of a word\\
-	& \texttt{1} & this syllable is the end of a word\\
-	\#5 & \TeX\ code & macros setting syllable letters for the next syllable\\
-	\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
-	\#7 & & alignment type of the first next glyph\\
-	\#8 &\TeX\ code & other macros (translation, double text, etc.) that don't fit in the limitation of the number of arguments\\
-	\#9 & \TeX\ code & The bar line (usually a \textit{writebar} call).
-\end{argtable}
-
-\macroname{\textbackslash GreBarVEpisema}{\#1}{gregoriotex-signs.tex}
-Macro to typeset a vertical episema on a bar.
-
-\begin{argtable}
-	\#1 & string & Type of glyph the episema is attached to.  See \Nameref{NoteOffset} for a description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreBeginEUOUAE}{\#1}{gregoriotex-main.tex}
-Macro to mark the beginning of a EUOUAE block.  Alters spacings and prohibits a line break until the end of the block.
-
-\begin{argtable}
-	\#1 & integer & The identifier of the EUOUAE block.\\
-\end{argtable}
-
-\macroname{\textbackslash GreBeginNLBArea}{\#1\#2}{gregoriotex-main.tex}
-Macro called at beginning of a no line break area.
-
-\begin{argtable}
-	\#1 & \texttt{0} & Not in the neumes.\\
-	& \texttt{1} & In the neumes.\\
-	\#2 & \texttt{0} & Call didn't come from translation centering.\\
-	& \texttt{1} & Call came from translation centering.
-\end{argtable}
-
-\macroname{\textbackslash GreBold}{\#1}{gregoriotex.sty and gregoriotex.tex}
-Makes argument bold.  Accesses \LaTeX\ \verb=\textbf= (\textit{gregoriotex.sty}) or Plain \TeX\ \verb=\bf= (\textit{gregoriotex.tex}) as appropriate.  Corresponds to ``<b></b>'' tags in gabc.
-
-\begin{argtable}
-	\#1 & string & Text to be typeset in bold.\\
-\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
-
-\begin{argtable}
-	\#1 & character & Type of new clef (c or f).\\
-	\#2 & \texttt{1}--\texttt{5} & Line of new clef.\\
-	\#3 & \texttt{0} & Print space before clef.\\
-	& \texttt{1} & Do not print space before clef.\\
-	\#4 & integer & Height number of flat in clef (\texttt{3} for no flat).\\
-	\#5 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
-	\#6 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
-	\#7 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
-\end{argtable}
-
-\macroname{\textbackslash GreCirculus}{\#1\#2}{gregoriotex-signs.tex}
-Macro for typesetting a circulus.
-
-\begin{argtable}
-	\#1 & integer & Height number of circulus.\\
-	\#2 & string  & Type of glyph the circulus is attached to.  See \Nameref{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.
-
-\macroname{\textbackslash GreCPVirgaReversaAscendensOnDLine}{\#1}{gregoriotex-main.tex}
-Allows the Dominican rule set to force long stems to be used for virga
-reversa ascendens neumes on the ``d'' (lowest) line.  This macro is
-defined and re-defined by the \verb=\gresetgregoriofont= macro.
-
-\begin{argtable}
-	\#1 & \TeX{} code & The \TeX{} code to use when long stems are not forced.\\
-\end{argtable}
-
-\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 & \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}
-Macro to typeset a dagger (\GreDagger).
-
-\macroname{\textbackslash GreDiscretionary}{\#1\#2\#3}{gregoriotex-signs.tex}
-A Gregorio\TeX-specific discretionary. Currently only used to avoid clef change at beginning or end of line, or even with more complex data (z0::c3 for instance).  We require a special function because in the normal discretionary function you cannot use \verb=\hskip= (but you can use \verb=\kern=) and you cannot use \verb=\penalty= (which is useless indeed).  This macro corrects for these two limitations. The first argument allows to select the penalty assigned to the discretionary by recent version of Lua\TeX.
-
-\begin{argtable}
-	\#1 & integer & Type of discretionary (for penalty assignment). Currently possible value is 0 for clef change discretionaries.\\
-	\#2 & \TeX\ code & First argument of resulting \verb=\discretionary=.\\
-	\#3 & \TeX\ code & Third argument of resulting \verb=\discretionary=.\\
-\end{argtable}
-
-\macroname{\textbackslash GreDivisioFinalis}{\#1\#2}{gregoriotex-signs.tex}
-Macro to typeset a divisio finalis.
-
-\begin{argtable}
-	\#1 & \texttt{0} & There is no text under the bar.\\
-	& \texttt{1} & There is text under the bar.\\
-	\#2 & \TeX\ code & Macros which may happen before the skip but after the divisio finalis (typically \verb=\grevepisema=).\\
-\end{argtable}
-
-\macroname{\textbackslash GreDivisioMaior}{\#1\#2}{gregoriotex-signs.tex}
-Macro to typeset a divisio maior.
-
-\begin{argtable}
-	\#1 & \texttt{0} & There is no text under the bar.\\
-	& \texttt{1} & There is text under the bar.\\
-	\#2 & \TeX\ code & Macros which may happen before the skip but after the divisio maior (typically \verb=\grevepisema=).\\
-\end{argtable}
-
-\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}
-Macro to typeset a divisio minor.
-
-\begin{argtable}
-	\#1 & \texttt{0} & There is no text under the bar.\\
-	& \texttt{1} & There is text under the bar.\\
-	\#2 & \TeX\ code & Macros which may happen before the skip but after the divisio minor (typically \verb=\grevepisema=).\\
-\end{argtable}
-
-\macroname{\textbackslash GreDominica}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro to typeset a dominican bar.
-
-\begin{argtable}
-	\#1 & \texttt{1}--\texttt{6} & Type of dominican bar.  Corresponds to bar types 6--13 in \verb=\grewritebar=.\\
-	\#2 & \texttt{0} & There is no text under the bar.\\
-	& \texttt{1} & There is text under the bar.\\
-	\#3 & \TeX\ code    & Macros which may happen before the skip but after the divisio dominica (typically \verb=\grevepisema=).\\
-\end{argtable}
-
-\macroname{\textbackslash GreDrawAdditionalLine}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to draw ledger lines.
-
-\begin{argtable}
-	\#1 & \texttt{0} & Draw an over-the-staff ledger line. \\
-			& \texttt{1} & Draw an under-the-staff ledger line. \\
-	\#2 & distance   & The length of the line, with TeX units, excluding any left or right distances coming from the rest of the arguments. \\
-	\#3 & \texttt{0} & Start the line at this point. \\
-			& \texttt{1} & Start the line to the left of this point by \verb=gre@dimen@additionallineswidth=. \\
-			& \texttt{2} & Start the line to the left of this point by \#4. \\
-	\#4 & distance   & The distance to move left before starting the line if \#3 is \texttt{2}. \\
-	\#5 & \texttt{0} & End the line exactly \#2 to the right of this point. \\
-			& \texttt{1} & End the line \verb=gre@dimen@additionallineswidth= to the right of \#2 from this point. \\
-			& \texttt{2} & End the line \#6 to the right of \#2 from this point. \\
-	\#6 & distance   & The distance to end the line after \#2 from this point if \#3 is \texttt{2}. \\
-\end{argtable}
-
-\macroname{\textbackslash GreElision}{\#1}{gregoriotex-syllable.tex}
-Typesets \#1 using the \texttt{elision} style.
-
-\begin{argtable}
-	\#1 & string & Text to be typeset in the \texttt{elision} style.\\
-\end{argtable}
-
-\macroname{\textbackslash GreEmptyFirstSyllableHyphen}{}{gregoriotex-syllable.tex}
-Macro that indicates the position of an empty-first-syllable hyphen, should one be desired.
-
-\macroname{\textbackslash GreEndEUOUAE}{\#1}{gregoriotex-main.tex}
-Macro to mark the end of a EUOUAE block.
-
-\begin{argtable}
-	\#1 & \texttt{0} & ending element\\
-	& \texttt{1} & ending syllable\\
-	& \texttt{2} & ending score\\
-	& \texttt{3} & before bar
-\end{argtable}
-
-\macroname{\textbackslash GreEndOfElement}{\#1\#2\#3}{gregoriotex-main.tex}
-Macro to end elements.
-
-\begin{argtable}
-	\#1 & \texttt{0} & Default space.\\
-	& \texttt{1} & Larger space.\\
-	& \texttt{2} & Glyph space.\\
-	& \texttt{3} & Zero-width space.\\
-	& \texttt{4} & Ad-hoc space.\\
-	\#2 & \texttt{0} & Space is breakable.\\
-	& \texttt{1} & Space is unbreakable.\\
-	\#3 & integer & The number of notes in the syllable prior to this macro.\\
-\end{argtable}
-
-\macroname{\textbackslash GreEndNLBArea}{\#1\#2}{gregoriotex-main.tex}
-Macro to end a no line break area.
-
-\begin{argtable}
-	\#1 & 0 & ending element\\
-	& \texttt{1} & ending syllable\\
-	& \texttt{2} & ending score\\
-	& \texttt{3} & before bar\\
-	\#2 & \texttt{0} & ??\\ %I can’t tell what this flag is for
-	& else & ??
-\end{argtable}
-
-\macroname{\textbackslash GreEndOfGlyph}{\#1}{gregoriotex-main.tex}
-Macro to end a glyph without ending the element.
-
-\begin{argtable}
-	\#1 & \texttt{0} & Default space.\\
-	& \texttt{1} & Zero-width space.\\
-	& \texttt{2} & Space between flat or natural and a note.\\
-	& \texttt{3} & Space between two puncta inclinata, descending.\\
-	& \texttt{4} & Space between bivirga or trivirga.\\
-	& \texttt{5} & space between bistropha or tristropha.\\
-	& \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
-	& \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis, descending.\\
-	& \texttt{8} & Space between two puncta inclinata debilis.\\
-	& \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
-	& \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), descending.\\
-	& \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), descending.\\
-	& \texttt{12} & Space between two puncta inclinata, ascending. \\
-	& \texttt{13} & Space between a punctum inclinatum and a punctum inclinatum debilis, ascending. \\
-	& \texttt{14} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), ascending. \\
-	& \texttt{15} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), ascending. \\
-	& \texttt{16} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch below. \\
-	& \texttt{17} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches below. \\
-	& \texttt{18} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches below \\
-	& \texttt{19} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch above. \\
-	& \texttt{20} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches above. \\
-	& \texttt{21} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches above \\
-	& \texttt{22} & Half-space. \\
-\end{argtable}
-
-\macroname{\textbackslash GreFinalCustos}{\#1\#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}
-Macro to end a score with a divisio finalis.
-
-\begin{argtable}
-	\#1 & \texttt{0} & Something does not need to be placed after the divisio finalis.\\
-	& \texttt{1} & Something needs to be placed after the divisio finalis.\\
-\end{argtable}
-
-\macroname{\textbackslash GreFinalDivisioMaior}{\#1}{gregoriotex-signs.tex}
-Macro to end a score with a divisio maior.
-
-\begin{argtable}
-	\#1 & \texttt{0} & Something does not need to be placed after the divisio maior.\\
-	& \texttt{1} & Something needs to be placed after the divisio maior.\\
-\end{argtable}
-
-\macroname{\textbackslash GreFirstSyllable}{\#1}{gregoriotex-syllable.tex}
-A macro which is called with the text of the first syllable, excluding the
-initial of the score.  This macro may be redefined to style the first syllable
-appropriately.  This macro may be called up to three times: for the letters
-before the centered letters, for the centered letters, and for the letters
-after the centered letters.
-
-\begin{argtable}
-	\#1 & string & Text from the first syllable.
-\end{argtable}
-
-\macroname{\textbackslash GreFirstSyllableInitial}{\#1}{gregoriotex-syllable.tex}
-A macro which is called with the first letter of the first syllable which is
-not the initial of the score.  If the \texttt{initial-style} is \texttt{0}, the
-first letter of the syllable will be passed.  If the \texttt{initial-style} is
-\texttt{1} or \texttt{2}, the \emph{second} letter will be passed.  This macro
-may be redefined to style the first letter appropriately.
-
-\begin{argtable}
-	\#1 & string & The first letter of the first syllable which is not the
-								 initial of the score.
-\end{argtable}
-
-\macroname{\textbackslash GreFirstWord}{\#1}{gregoriotex-syllable.tex}
-A macro which is called with the text of the first word, excluding the
-initial of the score.  This macro may be redefined to style the first word
-appropriately.  This macro may be called multiple times, depending on how
-many syllables are in the word.
-
-\begin{argtable}
-	\#1 & string & Text from the first word.
-\end{argtable}
-
-\macroname{\textbackslash GreFlat}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
-Macro to typeset a flat.
-
-\begin{argtable}
-	\#1 & integer & Height number of the flat.\\
-	\#2 & \texttt{0} & The flat is not part of the clef.\\
-	& \texttt{1} & The flat is part of the clef.\\
-	\#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
-	\#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
-	\#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
-\end{argtable}
-
-\macroname{\textbackslash GreForceHyphen}{}{gregoriotex-syllable.tex}
-Macro that indicates that a hyphen should be forced (if enabled) after the given syllable.
-
-\macroname{\textbackslash GreFuse}{}{gregoriotex-main.tex}
-Macro used between two fused glyphs.
-
-\macroname{\textbackslash GreFuseTwo}{\#1\#2}{gregoriotex-main.tex}
-Macro for fusing two glyphs to create a larger neume.
-
-\begin{argtable}
-	\#1 & Gregorio\TeX\ glyph & The first glyph in the sequence.\\
-	\#2 & Gregorio\TeX\ glyph & The second.
-\end{argtable}
-
-\macroname{\textbackslash GreGlyph}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-syllable.tex}
-Macro to typeset a glyph.
-
-\begin{argtable}
-	\#1 & character & the character that it must call\\
-	\#2 & integer & The number for where the glyph is located.  \texttt{a} in gabc is 1, \texttt{b} is 2, \etc\\
-	\#3 & \TeX\ code & code to set the next custos (using \verb=\GreNextCustos=)\\
-	\#4 & \texttt{0} & One-note glyph or more than two notes glyph except porrectus: \ie,  we must put the aligncenter in the middle of the first note\\
-	& \texttt{1} & Two notes glyph (podatus is considered as a one-note glyph): \ie, we put the aligncenter in the middle of the glyph\\
-	& \texttt{2} & Porrectus: has a special align center.\\
-	& \texttt{3} & initio-debilis : same as 1 but the first note is much smaller\\
-	& \texttt{4} & case of a glyph starting with a quilisma\\
-	& \texttt{5} & case of a glyph starting with an oriscus\\
-	& \texttt{6} & case of a punctum inclinatum\\
-	& \texttt{7} & case of a stropha\\
-	& \texttt{8} & flexus with an ambitus of one\\
-	& \texttt{9} & flexus deminutus\\
-	\#5 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
-	\#6 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
-	\#7 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled
-\end{argtable}
-
-\macroname{\textbackslash GreGlyphHeights}{\#1\#2}{gregoriotex-syllable.tex}
-Passes the glyph height limits.
-
-\begin{argtable}
-	\#1 & integer & the high height\\
-	\#2 & integer & the low height
-\end{argtable}
-
-\macroname{\textbackslash GregorioTeXAPIVersion}{\#1}{gregoriotex-main.tex}
-Checks to see if Gregorio\TeX\ API is version specified by argument (and
-therefore compatible with the score.
-
-\begin{argtable}
-	\#1 & string & Version number for Gregorio\TeX.\\
-\end{argtable}
-
-\macroname{\textbackslash GreHeader}{\#1\#2}{gregoriotex-main.tex}
-Macro used to pass headers to TeX.
-
-\begin{argtable}
-	\#1 & string & The header name.\\
-	\#2 & string & The header value.\\
-\end{argtable}
-
-\macroname{\textbackslash GreHEpisema}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-signs.tex}
-Macro to typeset an horizontal episema.
-
-\begin{argtable}
-	\#1 & integer & Height number of the episema.\\
-	\#2 & string  & See \Nameref{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.\\
-	\#4 & \texttt{0} & an horizontal episema\\
-	& \texttt{1} & an horizontal episema under a note\\
-	& \texttt{2} & a line at the top\\
-	& \texttt{3} & a line at the bottom\\
-	\#5 & \texttt{f} & a normal episema\\
-	& \texttt{l} & a small episema aligned left\\
-	& \texttt{c} & a small episema aligned center\\
-	& \texttt{r} & a small episema aligned right\\
-	\#6 & integer & Replacement for \#1 if a bridge causes a height substitution.\\
-	\#7 & \TeX\ code & code that sets heuristics\\
-	\#8 & string & a positive or negative "nudge" (dimension) for the vertical position of the horizontal episema\\
-	\#9 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\
-	& \texttt{1} & for horizontal episema cases, position in the middle of the space\\
-	& \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-	& \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\
-	& \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-	& \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\
-\end{argtable}
-
-\macroname{\textbackslash GreHEpisemaBridge}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Macro to typeset a bridge episema for the last note of a glyph
-(element, syllable) if the next episema is at the same height.
-
-\begin{argtable}
-	\#1 & integer & Height number of the episema.\\
-	\#2 & \texttt{0} & Episema above the note.\\
-	& \texttt{1} & Episema below the note.\\
-	\#3 & \texttt{0} & Default space.\\
-	& \texttt{1} & Zero-width space.\\
-	& \texttt{2} & Space between flat or natural and a note.\\
-	& \texttt{3} & Space between two puncta inclinata.\\
-	& \texttt{4} & Space between bivirga or trivirga.\\
-	& \texttt{5} & space between bistropha or tristropha.\\
-	& \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
-	& \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis.\\
-	& \texttt{8} & Space between two puncta inclinata debilis.\\
-	& \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
-	& \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\
-	& \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).\\
-	\#4 & \TeX\ code & code that sets heuristics\\
-	\#5 & string & a positive or negative "nudge" (dimension) for the vertical position of the horizontal episema\\
-	\#6 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\
-	& \texttt{1} & for horizontal episema cases, position in the middle of the space\\
-	& \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-	& \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\
-	& \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-	& \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\
-\end{argtable}
-
-\macroname{\textbackslash GreHighChoralSign}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro for typesetting high choral signs.
-
-\begin{argtable}
-	\#1 & integer & Height number of the sign.\\
-	\#2 & string  & The choral sign.\\
-	\#3 & \texttt{0} & Choral sign does not occur before last note of podatus, porrectus, or torculus resupinus.\\
-	& \texttt{1} & Choral sign occurs before last note of podatus, porrectus, or torculus resupinus.\\
-\end{argtable}
-
-\macroname{\textbackslash GreHyph}{}{gregoriotex-main.tex}
-Macro used for end of line hyphens.  Defaults to \verb=\gre@char@normalhyph=.
-
-\macroname{\textbackslash GreInDivisioFinalis}{\#1\#2}{gregoriotex-signs.tex}
-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\#3}{gregoriotex-signs.tex}
-Same as \verb=\GreDivisioMinima= except inside a syllable.
-
-\macroname{\textbackslash GreInDivisioMinor}{\#1\#2}{gregoriotex-signs.tex}
-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 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}
-Makes argument (a string) italic.  Accesses \LaTeX\ \verb=\textit= or
-Plain \TeX\ \verb=\it= as appropriate.  Corresponds to ``<i></i>'' tags
-in gabc.
-
-\begin{argtable}
-	\#1 & string & Text to be typeset in italic font.\\
-\end{argtable}
-
-\macroname{\textbackslash GreLastOfLine}{}{gregoriotex-main.tex}
-Macro to set \verb=\gre@lastoflinecount= to 1 (\ie, mark that this syllable is the last of the line).
-
-\macroname{\textbackslash GreLastOfScore}{}{gregoriotex-main.tex}
-Macro to mark the syllable as the last of the score.
-
-\macroname{\textbackslash GreLastSyllableBeforeEUOUAE}{\#1\#2}{gregoriotex-syllable.tex}
-Indicates that this syllable is the last syllable before a EUOUAE block.
-
-\begin{argtable}
-	\#1 & integer & The identifier of the EUOUAE block.\\
-	\#2 & \texttt{0} & There is no line break between this syllable and the EUOUAE block.\\
-			& \texttt{1} & There is a line break between this syllable and the beginning of the EUOUAE block.\\
-\end{argtable}
-
-\macroname{\textbackslash GreLowChoralSign}{\#1\#2\#3}{gregoriotex-signs.tex}
-Macro for typesetting low choral signs.
-
-\begin{argtable}
-	\#1 & integer & Height number of the sign.\\
-	\#2 & string  & The choral sign.\\
-	\#3 & \texttt{0} & Choral sign does not occur before last note of podatus, porrectus, or torculus resupinus.\\
-	& \texttt{1} & Choral sign occurs before last note of podatus, porrectus, or torculus resupinus.\\
-\end{argtable}
-
-\macroname{\textbackslash GreMode}{\#1\#2\#3}{gregoriotex-main.tex}
-If the gabc file contains a mode in the header, then this function
-places said mode as the first (top) annotation.  If the user has
-manually added a first annotation in the \TeX\ file, then this
-function does nothing. Also, if the \texttt{annotation} header field
-is used, then this function does nothing.
-
-\begin{argtable}
-	\#1 & \TeX\ code & Mode text to place above the initial of a score in the \texttt{modeline} style.\\
-	\#2 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modemodifier} style, after the mode text.\\
-	\#3 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modedifferentia} style, after \#2.\\
-\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.
-
-\begin{argtable}
-	\#1 & integer & Height number of the natural.\\
-	\#2 & \texttt{0} & The natural is not part of the clef.\\
-	& \texttt{1} & The natural is part of the clef (doesn't happen).\\
-	\#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
-	\#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
-	\#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
-\end{argtable}
-
-\macroname{\textbackslash GreNewLine}{}{gregoriotex-main.tex}
-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 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.
-
-\begin{argtable}
-	\#1 & integer & The identifier of the EUOUAE block.\\
-	\#2 & \texttt{0} & There is no line break between this syllable and the EUOUAE block.\\
-			& \texttt{1} & There is a line break between this syllable and the beginning of the EUOUAE block.\\
-\end{argtable}
-
-\macroname{\textbackslash GreOverBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
-Macro to typeset a round brace above the lines.
-
-\begin{argtable}
-	\#1 & length & The width of the brace.\\
-	\#2 & length & A vertical shift.\\
-	\#3 & length & A horizontal shift.\\
-	\#4 & \texttt{0} & Don't shift before starting the brace.\\
-	& \texttt{1} & Shift back a punctum's width before starting the brace.
-\end{argtable}
-
-\macroname{\textbackslash GreOverCurlyBrace}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
-Macro to typeset a curly brace above the lines.
-
-\begin{argtable}
-	\#1 & length & The width of the brace.\\
-	\#2 & length & A vertical shift.\\
-	\#3 & length & A horizontal shift.\\
-	\#4 & \texttt{0} & Don't shift before starting the brace.\\
-	& \texttt{1} & Shift back a punctum's width before starting the brace.\\
-	\#5 & \texttt{0} & No accentus above the brace.\\
-	& \texttt{1} & Typeset an accentus above the brace.
-\end{argtable}
-
-\macroname{\textbackslash GreProtrusion}{\#1\#2}{gregoriotex-spaces.tex}
-Typesets a protrusion.
-
-\begin{argtable}
-	\#1 & float & The protrusion factor.  May be a call to \verb=\GreProtrusionFactor=\\
-	\#2 & \TeX\ code & The content of the protrusion.\\
-\end{argtable}
-
-\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 & \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}
-Macro for typesetting punctum mora.
-
-\begin{argtable}
-	\#1 & integer & Height number of punctum mora.\\
-	\#2 & \texttt{0} & General case.\\
-	& \texttt{1} & Make the punctum mora zero width.\\
-	& \texttt{2} & Shift left width of 1 punctum.\\
-	& \texttt{3} & Shift left width of 1 punctum if last ambitus is 1.\\
-	\#3 & \texttt{0} & Punctum mora does not occur before last note of podatus, porrectus, or torculus resupinus.\\
-	& \texttt{1} & Punctum mora occurs before last note of podatus, porrectus, or torculus resupinus.\\
-	\#4 & \texttt{0} & No punctum inclinatum.\\
-	& \texttt{1} & Punctum inclinatum.\\
-\end{argtable}
-
-\macroname{\textbackslash GreReversedAccentus}{\#1\#2}{gregoriotex-signs.tex}
-Macro for typesetting a reversed accentus.
-
-\begin{argtable}
-	\#1 & integer & Height number of accentus.\\
-	\#2 & string  & Type of glyph the accentus is attached to. See \Nameref{NoteOffset} for a description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreReversedSemicirculus}{\#1\#2}{gregoriotex-signs.tex}
-Macro for typesetting a reversed semicirculus.
-
-\begin{argtable}
-	\#1 & integer & Height number of semicirculus.\\
-	\#2 & string  & Type of glyph the semicirculus is attached to. See \Nameref{NoteOffset} for a description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreScoreOpening}{\#1\#2\#3\#4\#5}{gregoriotex-syllable.tex}
-Opens the score.
-
-\begin{argtable}
-	\#1 & \TeX\ code & Macros rendering the things after the initial but before the notes.\\
-	\#2 & \TeX\ code & Macros rendering the things after starting notes but before the syllable.\\
-	\#3 & \TeX\ code & Macros rendering the things before the initial.\\
-	\#4 & \TeX\ control sequence & Control sequence for the syllable.\\
-	\#5 & \TeX\ code & Macros rendering the first syllable; should emit the initial and populate \verb=\gre@opening@syllabletext=.\\
-\end{argtable}
-
-\macroname{\textbackslash GreSemicirculus}{\#1\#2}{gregoriotex-signs.tex}
-Macro for typesetting a semicirculus.
-
-\begin{argtable}
-	\#1 & integer & Height number of semicirculus.\\
-	\#2 & string  & Type of glyph the semicirculus is attached to. See \Nameref{NoteOffset} for a description of options.\\
-\end{argtable}
-
-\macroname{\textbackslash GreSetFirstSyllableText}{\#1\#2\#3\#4\#5\#6}{gregoriotex-syllable.tex}
-Sets the first syllable text.
-
-\begin{argtable}
-	\#1 & \TeX\ code & Initial.\\
-	\#2 & \TeX\ code & First letter after the initial.\\
-	\#3 & \TeX\ code & Everything else in the syllable.\\
-	\#4 & \TeX\ code & Three syllable parts when there is a separated initial.\\
-	\#5 & \TeX\ code & Three syllable parts where there is no separated initial.\\
-	\#6 & \TeX\ code & Extra macros to run if there is an initial.\\
-\end{argtable}
-
-\macroname{\textbackslash GreSetFixedNextTextFormat}{\#1}{gregoriotex-syllable.tex}
-Same as \verb=\GreSetFixedTextFormat= except for next syllable.
-
-\macroname{\textbackslash GreSetFixedTextFormat}{\#1}{gregoriotex-syllable.tex}
-Macro to specify a text which is different from \verb=#1#2#3= (of \verb=\GreSyllable=). It is useful for styles, for instance with:
-\par\medskip
-\begin{gabccode}
-	<i>ffj</i>(gh)
-\end{gabccode}
-
-we will have
-
-\begin{latexcode}
-	#1 = \textit{f}
-	#2 = \textit{f}
-	#3 = \textit{j}
-\end{latexcode}
-
-and thus \verb=#1#2#3= will be \verb=\textit{f}\textit{f}\textit{j}=, which won't typeset
-ligatures. In this example we should call \verb=\grefixedtext{\textit{ffj}}=.
-
-\begin{argtable}
-	\#1 & \texttt{0} & nothing (normal text)\\
-	& \texttt{1}& italic\\
-	& \texttt{2} & bold\\
-	& \texttt{3} & small caps\\
-	& \texttt{4} & typewriter\\
-	& \texttt{5} & underline
-\end{argtable}
-
-\begin{argtable}
-	\#1 & character & The initial letter of the score.\\
-\end{argtable}
-
-\macroname{\textbackslash GreSetInitialClef}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
-Macro for writing initial clef.
-
-\begin{argtable}
-	\#1 & \texttt{c} or \texttt{f} & Type of clef.\\
-	\#2 & \texttt{1}--\texttt{5} & Line of clef.\\
-	\#3 & integer & Height number of flat in clef (\texttt{3} for no flat).\\
-	\#4 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
-	\#5 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
-	\#6 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
-	\#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-signs.tex}
-Macro to define the clef that will appear at the beginning of the lines.
-
-\begin{argtable}
-	\#1 & \texttt{c} or \texttt{f} & Type of clef.\\
-	\#2 & \texttt{1}--\texttt{5} & Line of clef.\\
-	\#3 & \texttt{0} & No space after clef.\\
-	& \texttt{1} & Space after clef.\\
-	\#4 & integer & Height of flat in clef (\texttt{3} for no flat).\\
-	\#5 & \texttt{c} or \texttt{f} & Type of secondary clef.\\
-	\#6 & \texttt{0}--\texttt{5} & Line of secondary clef (\texttt{0} for no secondary clef).\\
-	\#7 & integer & Height of flat in secondary clef (\texttt{3} for no flat).\\
-\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.
-
-\begin{argtable}
-	\#1 & string & the first letters of the syllable, that don't count for the alignment\\
-	\#2 & string & the middle letters of the syllable, we must align in the middle of them\\
-	\#3 & string & the end letters, they don't count for alignment\\
-\end{argtable}
-
-\macroname{\textbackslash GreSetNoFirstSyllableText}{}{gregoriotex-syllable.tex}
-Macro that indicates there is no next in the first syllable.
-
-\macroname{\textbackslash GreSetTextAboveLines}{\#1}{gregoriotex-main.tex}
-Macro to place argument above the lines and empty
-\verb=\gre@currenttextabovelines= when done.
-
-\begin{argtable}
-	\#1 & string & Text to be placed above the lines.\\
-\end{argtable}
-
-\macroname{\textbackslash GreSetThisSyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
-Macro to set the text of the current syllable.
-
-\begin{argtable}
-	\#1 & string & the first letters of the syllable, that don't count for the alignment\\
-	\#2 & string & the middle letters of the syllable, we must align in the middle of them\\
-	\#3 & string & the end letters, they don't count for alignment\\
-\end{argtable}
-
-\macroname{\textbackslash GreSharp}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
-Macro to typeset a sharp.
-
-\begin{argtable}
-	\#1 & integer & Height number of the sharp.\\
-	\#2 & \texttt{0} & The sharp is not part of the clef.\\
-	& \texttt{1} & The sharp is part of the clef (doesn't happen).\\
-	\#3 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
-	\#4 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
-	\#5 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
-\end{argtable}
-
-\macroname{\textbackslash GreSmallCaps}{\#1}{gregoriotex.sty and gregoriotex.tex}
-Makes argument small capitals. Accesses \LaTeX\ \verb=\textsc= or
-Plain \TeX\ \verb=\sc= as appropriate Corresponds to ``<sc></sc>'' tags
-in gabc.
-
-\begin{argtable}
-	\#1 & string & Text to be typeset in small caps font.\\
-\end{argtable}
-
-\macroname{\textbackslash GreSlur}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Typesets a slur.
-
-\begin{argtable}
-	\#1 & integer & Height number of the pitch.\\
-	\#2 & \texttt{-1} & The slur should appear under the note.\\
-			& \texttt{1} & The slur should appear over the note.\\
-	\#3 & \texttt{0} & The slur should start at the right end of the note.\\
-			& \texttt{1} & The slur should start at one punctum's width to the left of the right end of the note.\\
-			& \texttt{2} & The slur should start at one-half punctum's width to the left of the right end of the note.\\
-	\#4 & string & The horizontal dimension of the slur.\\
-	\#5 & string & The vertical dimension of the slur.\\
-	\#6 & integer & Height number of the pitch.\\
-\end{argtable}
-
-\macroname{\textbackslash GreSpecial}{\#1}{gregoriotex-symbols.tex}
-Typesets a special character.  If the \#1 special character wasn't defined by
-\verb=\gresetspecial=, the text of \#1 will be output directly.
-
-\begin{argtable}
-	\#1 & string & The text between \texttt{<sp>} and \texttt{</sp>}.\\
-\end{argtable}
-
-\macroname{\textbackslash GreStar}{}{gregoriotex-symbol.tex}
-Macro to typeset an asterisk (\GreStar).
-
-\macroname{\textbackslash GreSupposeHighLedgerLine}{}{gregoriotex-spaces.tex}
-Indicates that the system should act as if a ledger line exists above the staff.
-
-\macroname{\textbackslash GreSupposeLowLedgerLine}{}{gregoriotex-spaces.tex}
-Indicates that the system should act as if a ledger line exists below the staff.
-
-\macroname{\textbackslash GreSyllable}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-syllable.tex}
-Macro to typeset the syllable.
-
-\begin{argtable}
-	\#1 & \TeX\ code & macro setting syllable letters for the current syllable\\
-	\#2 & empty & reserved for future use\\
-	\#3 & \TeX\ control sequence & the control sequence to use for styling the hyphen\\
-	\#4 & \texttt{0} & this syllable is not the end of a word\\
-	& \texttt{1} & this syllable is the end of a word\\
-	\#5 & \TeX\ code & macros setting syllable letters for the next syllable\\
-	\#6 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
-	\#7 & & alignment type of the first next glyph\\
-	\#8 &\TeX\ code & other macros (translation, double text, etc.) that don't fit in the limitation of the number of arguments\\
-	\#9 & Gregorio\TeX\ glyphs & all the notes
-\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.
-
-\macroname{\textbackslash GreTypewriter}{\#1}{gregoriotex.sty and gregoriotex.tex}
-Makes argument typewriter font.  Accesses \LaTeX\ \verb=\texttt= or
-Plain \TeX\ \verb=\tt= as appropriate.
-
-\begin{argtable}
-	\#1 & string & Text to typeset in typewriter font.\\
-\end{argtable}
-
-\macroname{\textbackslash GreUnderBrace}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
-Macro to typeset a round brace below the lines.
-
-\begin{argtable}
-	\#1 & length & The width of the brace.\\
-	\#2 & length & A vertical shift.\\
-	\#3 & length & A horizontal shift.\\
-	\#4 & \texttt{0} & Don't shift before starting the brace.\\
-	& \texttt{1} & Shift back a punctum's width before starting the brace.
-\end{argtable}
-
-\macroname{\textbackslash GreUnderline}{\#1}{gregoriotex.sty and gregoriotex.tex}
-Makes argument underlined under \LaTeX\ using \verb=\underline=.  Does
-nothing in Plain \TeX.
-
-\begin{argtable}
-	\#1 & string & Text to typeset underlined.\\
-\end{argtable}
-
-\macroname{\textbackslash GreUnstyled}{\#1}{gregoriotex-syllable.tex}
-Returns its argument as-is.
-
-\begin{argtable}
-	\#1 & string & Text to typeset without any extra styling.\\
-\end{argtable}
-
-\macroname{\textbackslash GreUpcomingNewLineForcesCustos}{\#1}{gregoriotex-syllable.tex}
-Indicates that the new line in the next syllable forces a custos.
-
-\begin{argtable}
-	\#1 & \texttt{0} & The custos is forced off.\\
-			& \texttt{1} & The custos is forced on.\\
-\end{argtable}
-
-\macroname{\textbackslash GreVarBraceLength}{\#1}{gregoriotex-signs.tex}
-Returns the computed length of the given brace or ledger line.
-
-\begin{argtable}
-	\#1 & string & unique identifier for the brace within the score.
-\end{argtable}
-
-\macroname{\textbackslash GreVarBraceSavePos}{\#1\#2\#3}{gregoriotex-signs.tex}
-Records positions to compute the lengths of variable-sized braces and ledger lines.
-
-\begin{argtable}
-	\#1 & string & unique identifier for the brace within the score.\\
-	\#2 & \texttt{0} & Don't shift before recording the position.\\
-	& \texttt{1} & Shift back a punctum's width before recording the position.\\
-	& \texttt{2} & Shift back one-half a punctum's width before recording the position.\\
-	\#3 & \texttt{1} & Position to save is the start of brace.\\
-	& \texttt{2} & Position to save is the end of brace.
-\end{argtable}
-
-\macroname{\textbackslash GreVEpisema}{\#1\#2}{gregoriotex-signs.tex}
-Macro for typesetting the vertical episema.
-
-\begin{argtable}
-	\#1 & integer & Height number of episema.\\
-	\#2 & string  & Type of glyph the episema is attached to. See \Nameref{NoteOffset} for a description of options.\\
-\end{argtable}
-
-\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}
-Macro to typeset argument in the translation position.
-
-\begin{argtable}
-	\#1 & string & Text to typeset in the translation.\\
-\end{argtable}
-
-\macroname{\textbackslash GreWriteTranslationWithCenterBeginning}{\#1}{gregoriotex-main.tex}
-Macro to typeset argument (a string) in the translation position (at
-the beginning of a line?).
-
-\begin{argtable}
-	\#1 & string & Text to typeset in the translation (at the beginning of a line).\\
-\end{argtable}
-
-\macroname{\textbackslash GreForceBreak}{}{gregoriotex-spaces.tex}
-Macro used to force a line break to occur at a given position.
-
-\macroname{\textbackslash GreNoBreak}{}{gregoriotex-spaces.tex}
-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\#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}
-Macro to print a nabc character.
-
-\begin{argtable}
-	\#1 & string & The \texttt{nabc} syntax which indicates what neumes are to be printed\\
-\end{argtable}
-
-\macroname{\textbackslash GreScoreNABCLines}{\#1}{gregoriotex-nabc.tex}
-Macro which sets the number of \texttt{nabc} lines in the score.
-
-\begin{argtable}
-	\#1 & integer & the number of \texttt{nabc} lines (currently only 1 is supported)\\
-\end{argtable}
-
-
-\macroname{\textbackslash GreModeNumber}{\#1}{gregoriotex-main.tex}
-Macro which formats the mode in roman or arabic numerals according to the appropriate setting.
-
-\begin{argtable}
-	\#1 & \texttt{1}--\texttt{8} & The mode to be formated\\
-\end{argtable}
-
-\macroname{\textbackslash GreNoNoteSyllable}{}{gregoriotex-syllable.tex}
-Alias for \verb=\GreSyllable= or \verb=\GreBarSyllable= depending on whether the old or new bar spacing algorithm (respectively) is active.  This is used only for syllables which have no notes.
-
-\macroname{\textbackslash GreGABCForceCenters}{}{gregoriotex-syllable.tex}
-Macro inserted into \verb=\GreSyllable= and \verb=\GreBarSyllable= to indicate that the center of the of the current syllable was forced in the gabc with curly braces (``\{'' and ``\}'').
-
-\macroname{\textbackslash GreGABCNextForceCenters}{}{gregoriotex-syllable.tex}
-Macro inserted into \verb=\GreSyllable= and \verb=\GreBarSyllable= to indicate that the center of the of the next syllable was forced in the gabc with curly braces (``\{'' and ``\}'').
-
-
-%%% Local Variables:
-%%% mode: latex
-%%% TeX-master: "GregorioRef"
-%%% End:
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex
deleted file mode 100644
index 0b7fc789bae..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex
+++ /dev/null
@@ -1,2408 +0,0 @@
-% !TEX root = GregorioRef.tex
-% !TEX program = LuaLaTeX+se
-%
-% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
-%
-% This file is part of Gregorio.
-%
-% Gregorio is free software: you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version.
-%
-% Gregorio is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
-%
-\section{Gregorio\TeX{} Controls}
-
-These functions are the ones used by Gregorio\TeX{} internally as it
-process the commands listed above.  They should not appear in any user
-document and are listed here for programmer documentation purposes
-only.
-
-\macroname{\textbackslash gre@error}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Prints an error to the \TeX\ output log.
-
-\begin{argtable}
-	\#1 & string & error message\\
-\end{argtable}
-
-
-\macroname{\textbackslash gre@warning}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Prints a warning to the \TeX\ output log.
-
-\begin{argtable}
-	\#1 & string & warning message\\
-\end{argtable}
-
-\macroname{\textbackslash gre@metapost}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Executes \MP{} commands using luamplib.
-
-\begin{argtable}
-	\#1 & \MP{} commands & The \MP{} commands to execute.
-\end{argtable}
-
-\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
-package error, halting \TeX.
-
-\begin{argtable}
-	\#1 & string & name of the deprecated macro\\
-	\#2 & string & name of the correct macro to use\\
-\end{argtable}
-
-\macroname{\textbackslash gre@obsolete}{\#1\#2}{gregoriotex-common.tex}
-Macro that handles obsolescence errors.
-
-\begin{argtable}
-	\#1 & string & name of the obsolete macro\\
-	\#2 & string & name of the correct macro to use\\
-\end{argtable}
-
-\macroname{\textbackslash gre@allowdeprecated@asboolean}{}{gregoriotex-main.tex}
-Macro that evaluates \texttt{true} or \texttt{false} depending on whether
-deprecated usage is allowed.  This is used to pass the value of
-\verb=\ifgre@allowdeprecated= to Lua.
-
-\macroname{\textbackslash gre@loadgregoriofont}{}{gregoriotex-main.tex}
-Loads the chosen font for the neumes at the correct size.
-
-\macroname{\textbackslash gre@calculate@constantglyphraise}{}{gregoriotex-spaces.tex}
-Macro to calculate \verb=\gre@constantglyphraise=
-
-\macroname{\textbackslash gre@addtranslationspace}{}{gregoriotex-spaces.tex}
-Macro to tell Gregorio to set space for the translation.
-
-\macroname{\textbackslash gre@removetranslationspace}{}{gregoriotexspaces.tex}
-Macro to tell Gregorio to remove the space allocated to the translation.
-
-\macroname{\textbackslash gre@calculate@additionalspaces}{\#1\#2\#3\#4}{gregoriotex-spaces.tex}
-Macro which calculates \verb=\gre@additionalbottomspace= and\\
-\verb=\gre@additionaltopspace=
-
-\begin{argtable}
-	\#1 & integer & the height number of the top pitch, including signs\\
-	\#2 & integer & the height number of the bottom pitch, including signs\\
-	\#3 & \texttt{0} & there is no translation line\\
-	& \texttt{1} & there is a translation line\\
-	\#4 & \texttt{0} & there is no above lines text\\
-	& \texttt{1} & there is above lines text
- \end{argtable}
-
-\macroname{\textbackslash gre@calculate@textaligncenter}{\#1\#2\#3\#4}{gregoriotex-spaces.tex}
-Macro for calculating \verb=\gre@textaligncenter=.
-
-\begin{argtable}
-	\#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}
-
-\macroname{\textbackslash gre@calculate@annotationtrueraise}{}{gregoriotex-spaces.tex}
-Macro to calculate \verb=\gre@dimen@annotationtrueraise=.
-
-\macroname{\textbackslash gre@calculate@commentarytrueraise}{}{gregoriotex-spaces.tex}
-Macro to calculate \verb=\gre@dimen@commentarytrueraise=.
-
-\macroname{\textbackslash gre@calculate@textlower}{}{gregoriotex-spaces.tex}
-Calculates the value of \texttt{textlower}.  Default is \texttt{spacebeneathtext}.
-
-\macroname{\textbackslash gre@calculate@linewidth}{}{gregoriotex-spaces.tex}
-Calculates the line width.  Default is the width of the printable space (\verb=\hsize=).
-
-\macroname{\textbackslash gre@calculate@stafflinewidth}{}{gregoriotex-spaces.tex}
-Calculates the width of the staff lines.  Default is \texttt{linewidth}.
-
-\macroname{\textbackslash gre@calculate@stafflineheight}{}{gregoriotex-spaces.tex}
-Calculates the height (thickness) of the staff lines.  Dependent on \texttt{stafflineheightfactor} and \texttt{gre@factor}.
-
-\macroname{\textbackslash gre@calculate@interstafflinespace}{}{gregoriotex-spaces.tex}
-Calculates the distance between the staff lines.  Dependent on \texttt{stafflineheight} and \texttt{gre@factor}
-
-\macroname{\textbackslash gre@calculate@stafflinediff}{}{gregoriotex-spaces.tex}
-Calculates a correction factor for when the staff lines are not their default thickness.  Dependent on \texttt{stafflineheight} and \texttt{gre@factor}.
-
-\macroname{\textbackslash gre@calculate@staffheight}{}{gregoriotex-spaces.tex}
-Calculates the total height of the staff.  Dependent on \texttt{stafflineheight} and \texttt{interstafflinespace}.
-
-\macroname{\textbackslash gre@calculate@constantglyphraise}{}{gregoriotex-spaces.tex}
-Calculates the baseline correction for the glyphs.  Dependent on \texttt{gre@factor}, \texttt{additionalbottomspace}, \texttt{spacebeneathtext}, \texttt{spacelinestext}, \texttt{interstafflinespace}, \texttt{stafflineheight}, \texttt{currenttranslationheight}, and \texttt{stafflinediff}.
-
-\macroname{\textbackslash gre@computespaces}{}{gregoriotex-spaces.tex}
-Aggregates all of the global distance calculations and calls them in the order needed to respect dependencies.
-
-\macroname{\textbackslash gre@calculate@glyphraisevalue}{\#1\#2\#3}{gregoriotex-spaces.tex}
-Calculates the raise value for a glyph (glyphraisevalue) based on where it is to be placed and what kind of a glyph it is.  This is a time of use calculation.
-
-\begin{argtable}
-	\#1 & integer & The number for where the glyph is located.  \texttt{a} in gabc is \texttt{1}, \texttt{b} is \texttt{2}, \etc\\
-	\#2 & \texttt{0} & no modification\\
-	& \texttt{1} & puts the value on the interline just above if it is on a line\\
-	& \texttt{2} & puts the value on the interline just beneath if it is on a line\\
-	& \texttt{3} & case of the vertical episema, which is not placed at the same place if the corresponding note is on a line or not\\
-	& \texttt{4} & case of the punctum mora, for the same reason\\
-	& \texttt{5} & case of the horizontal episema under a note, that must be placed a bit lower if the note is on a line\\
-	& \texttt{6} & case of the signs above (accentus, \etc)\\
-	& \texttt{8} & case of the punctum mora of the first note of a podatus or the 2nd note of a porrectus, \etc\\
-	& \texttt{9} & case of the horizontal episema, that must be placed a bit lower if the note is on a line\\
-	& \texttt{10} & case of the low choral sign\\
-	& \texttt{11} & case of the high choral sign\\
-	& \texttt{12} & case of the low choral sign which is lower than the note\\
-	& \texttt{13} & case of the brace above the bars\\
-	& \texttt{14} & case of the punctum mora in a space with a note on the line below it\\
-	& \texttt{15} & case of the over-the-notes slur\\
-	& \texttt{16} & case of the under-the-notes slur\\
-	& \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\\
-	& \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\
-	& \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-	& \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\
-\end{argtable}
-
-\macroname{\textbackslash gre@stafflinefactor}{}{gregoriotex-spaces.tex}
-A number indicating the thickness of the staff lines.
-
-\macroname{\textbackslash gre@calculate@textaligncenter}{\#1\#2\#3}{gregoriotex-spaces.tex}
-Macro to calculate the distance from the beginning of the text of a syllable to its alignment point (the center of the vowel for Latin centering, the center of the syllable for English centering).  This is a time of use calculation.
-
-\begin{argtable}
-	\#1 & string & the first part of the syllable\\
-	\#2 & string & the middle part of the syllable\\
-	\#3 & \texttt{0} & perform this calculation for the current syllable\\
-	& \texttt{1} & perform this calculation for the next syllable
-\end{argtable}
-
-\macroname{\textbackslash gre@calculate@enddifference}{\#1\#2\#3\#4\#5}{gregoriotex-spaces.tex}
-Calculates the difference between the end of the notes and the end of the syllable text.  Also stores the value for the previous syllable if needed.  This is a time of use calculation.
-
-\begin{argtable}
-	\#1 & length & the total width of the notes\\
-	\#2 & length & the total width of the syllable text\\
-	\#3 & length & the alignment distance for the text (\texttt{textaligncenter})\\
-	\#4 & length & the alignment distance for the notes (\texttt{notesaligncenter})\\
-	\#5 & \texttt{0} & do not save the value for the previous syllable before calculating the new value\\
-	& \texttt{1} & save the value for the previous syllable before calculating the new value
-\end{argtable}
-
-The formula used is \verb=#1 - #2 + #3 - #4= or (more sensibly) \verb=(#1 - #4) - (#2 - #3)=.  This is also equivalent to \verb=-#4 - \gre@dimen@begindifference + #3=, a fact we take advantage of when calculating the end difference for a bar syllable under the new bar spacing algorithm.
-
-\macroname{\textbackslash gre@changeonedimenfactor}{\#1\#2\#3}{gregoriotex-spaces.tex}
-Change the scale of a single distance from one factor to another.
-
-\begin{argtable}
-	\#1 & string & name of the distance to be scaled.  See \Nameref{distances}.\\
-	\#2 & integer & the factor the distance is currently in\\
-	\#3 & integer & the factor the distance is to be put into\\
-\end{argtable}
-
-\macroname{\textbackslash gre@changedimenfactor}{\#1\#2}{gregoriotex-spaces.tex}
-Rescales all the distances (and \texttt{stafflinefactor}) which are supposed to scale with a change in staff size.
-
-\begin{argtable}
-	\#1 & integer & the factor the distances are currently in\\
-	\#2 & integer & the factor the distances are to be put into\\
-\end{argtable}
-
-\macroname{\textbackslash gre@calculate@nextbegindifference}{\#1\#2\#3\#4\#5}{gregoriotex-spaces.tex}
-Macro to calculate \texttt{nextbegindifference}.
-
-\begin{argtable}
-	\#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}
-
-\macroname{\textbackslash gre@strip@pt}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Strips the units from a distance.  Under \LaTeX{}, this is an alias to \verb=\strip@pt=.
-
-\begin{argtable}
-	\#1 & control sequence & should be the control sequence for the the distance register (including the leading backslash)\\
-\end{argtable}
-
-\macroname{\textbackslash gre@rem@pt}{\#1}{gregoriotex.tex}
-Strips the units from a distance.  Used internally by \verb=\gre@strip@pt=.  Under \LaTeX{}, this is not defined.
-
-\begin{argtable}
-	\#1 & distance & should be in the form ``[0-9]+.[0-9]+pt’’. (\ie the result of applying \verb=\the= to a distance register)\\
-\end{argtable}
-
-\macroname{\textbackslash gre@count@temp@...}{}{gregoriotex-spaces.tex}
-Temporary count used in calculations.  There are currently three of these.
-
-\macroname{\textbackslash gre@convertto}{\#1\#2}{gregoriotex-spaces.tex}
-Macro which converts a distance into a particular set of units.  Result is placed in \verb=\gre@converted= as a string.
-
-\begin{argtable}
-	\#1 & string & two letter abbreviation for the units.  Should recognize all legal \TeX\ units.\\
-	\#2 & distance & Distance to be converted.
-\end{argtable}
-
-\macroname{\textbackslash gre@converted}{}{gregoriotex-spaces.tex}
-Macro holding result of last call to \verb=\gre@convertto=.
-
-\macroname{\textbackslash gre@consistentunits}{\#1\#2}{gregoriotex-spaces.tex}
-This function takes a distance and formats it as a string so that its units conform to the pattern set by a string representation of a distance.  Result is placed in \verb=\gre@stringdist=.
-
-\begin{argtable}
-	\#1 & string & the standard whose format is to be matched.\\
-	\#2 & distance & the distance to be adjusted.
-\end{argtable}
-
-\macroname{\textbackslash gre@stringdist}{}{gregoriotex-spaces.tex}
-Macro holding result of last call to \verb=\gre@consistentunits=.
-
-\macroname{\textbackslash gre@gregorioscore}{\#1}{gregoriotex-main.tex}
-Macro that handles \verb=\gregorioscore= calls when they do not have an
-optional argument.
-
-\begin{argtable}
-	\#1 & string & Relative or absolute path to the score.\\
-\end{argtable}
-
-\macroname{\textbackslash gre@gregorioscore@option}{[\#1]\#2}{gregoriotex-main.tex}
-Macro that handles \verb=\gregorioscore= calls when they have an optional
-argument.
-
-\begin{argtable}
-	\#1 & \texttt{n} & \#2 will be included as is. \\
-			& \texttt{a} & Gregorio\TeX\ will automatically compile gabc files if necessary.\\
-			& \texttt{f} & Forces Gregorio\TeX\ to compile the gabc file.\\
-	\#2 & string & Relative or absolute path to the score.\\
-\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.
-
-\begin{argtable}
-	\#1 & \TeX\ code & Mode text to place above the initial of a score in the \texttt{modeline} style.\\
-	\#2 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modemodifier} style, after the mode text.\\
-	\#3 & \TeX\ code & Arbitrary code to typeset, in the \texttt{modedifferentia} style, after \#2.\\
-\end{argtable}
-
-\macroname{\textbackslash gre@setallbracerendering}{\#1}{gregoriotex-signs.tex}
-Macro used by \verb=\gresetbracerendering= to change all braces.
-
-\begin{argtable}
-	\#1 & \texttt{metapost} & \MP{} will be used to render braces\\
-			& \texttt{font} & The score font will be used to render braces\\
-\end{argtable}
-
-\macroname{\textbackslash gre@setbracerendering}{[\#1]\#2}{gregoriotex-signs.tex}
-Macro used by \verb=\gresetbracerendering= to change a single type of brace.
-
-\begin{argtable}
-	\#1 & \texttt{brace} & change round braces that appear over the staff\\
-			& \texttt{underbrace} & change round braces that appear under the staff\\
-			& \texttt{curlybrace} & change curly braces\\
-			& \texttt{barbrace} & change round braces that appear over divisio bars\\
-	\#2 & \texttt{metapost} & \MP{} will be used to render braces\\
-			& \texttt{font} & The score font will be used to render braces\\
-\end{argtable}
-
-\macroname{\textbackslash gre@@setbracerendering}{\#1\#2}{gregoriotex-signs.tex}
-Secondary macro used by \verb=\gre@setallbracerendering= and
-\verb=\gre@setbracerendering= to change a single type of brace.  As a
-secondary macro, it doesn't check its first argument.
-
-\begin{argtable}
-	\#1 & \texttt{brace} & change round braces that appear over the staff\\
-			& \texttt{underbrace} & change round braces that appear under the staff\\
-			& \texttt{curlybrace} & change curly braces\\
-			& \texttt{barbrace} & change round braces that appear over divisio bars\\
-	\#2 & \texttt{metapost} & \MP{} will be used to render braces\\
-			& \texttt{font} & The score font will be used to render braces\\
-\end{argtable}
-
-\macroname{\textbackslash gre@brace@common}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
-Common macro used internally to render braces.
-
-\begin{argtable}
-	\#1 & length  & The width of the brace.\\
-	\#2 & length  & A vertical shift.\\
-	\#3 & length  & A horizontal shift.\\
-	\#4 & \texttt{0} & Don’t shift before starting the brace.\\
-	& \texttt{1} & Shift back a punctum’s width before starting the brace.\\
-	\#5 & \texttt{0} & No accentus above the brace.\\
-	& \texttt{1} & Typeset an accentus above the brace.\\
-	\#6 & integer & The height number for the brace.\\
-	\#7 & csname  & The control sequence name representing the brace.
-\end{argtable}
-
-\macroname{\textbackslash gre@render@barbrace}{}{gregoriotex-signs.tex}
-Draws a divisio brace.
-
-\macroname{\textbackslash grebracemetapostpreamble}{\#1}{gregoriotex-signs.tex}
-Returns the \MP{} preamble for braces.  The control sequence name does
-not have the \texttt{@} symbol because this macro is used within \MP{}.
-
-\begin{argtable}
-	\#1 & string & the width of the brace; if \texttt{*}, use the bar brace width.
-\end{argtable}
-
-\macroname{\textbackslash gre@draw@curlybrace}{\#1}{gregoriotex-signs.tex}
-Draws a curly over-brace using \MP{}.
-
-\begin{argtable}
-	\#1 & length & the width of the brace.
-\end{argtable}
-
-\macroname{\textbackslash gre@draw@brace}{\#1}{gregoriotex-signs.tex}
-Draws a round over-brace using \MP{}.
-
-\begin{argtable}
-	\#1 & string & the width of the brace; if \texttt{*}, use the bar brace width.
-\end{argtable}
-
-\macroname{\textbackslash gre@draw@fontbrace}{\#1\#2}{gregoriotex-signs.tex}
-Draws a brace using the score font.
-
-\begin{argtable}
-	\#1 & string & the width of the brace.\\
-	\#2 & \TeX\ code & \TeX\ code that renders the brace using the score font.\\
-\end{argtable}
-
-\macroname{\textbackslash gre@draw@underbrace}{\#1}{gregoriotex-signs.tex}
-Draws a round under-brace using \MP{}.
-
-\begin{argtable}
-	\#1 & length & the width of the brace.
-\end{argtable}
-
-\macroname{\textbackslash gre@draw@roundbrace}{\#1\#2\#3}{gregoriotex-signs.tex}
-Draws a round over- or under-brace using \MP{}.
-
-\begin{argtable}
-	\#1 & length         & the width of the brace.\\
-	\#2 & number         & the height of the bounding box in em-relative units.\\
-	\#3 & \MP{} commands & \MP{} commands to draw the brace outline.
-\end{argtable}
-
-\macroname{\textbackslash gre@draw@slur}{\#1\#2\#3}{gregoriotex-signs.tex}
-Draws a slur using \MP{}.
-
-\begin{argtable}
-	\#1 & length      & the x-dimension of the slur.\\
-	\#2 & length      & the y-dimension of the slur.\\
-	\#3 & \texttt{-1} & draw an under-the-notes slur.\\
-			& \texttt{1}  & draw an over-the-notes slur.\\
-\end{argtable}
-
-
-\macroname{\textbackslash gre@iflatex}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Evaluates to \verb=#1= if running under \LaTeX{}.
-
-\begin{argtable}
-	\#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.
-
-\bigskip\textbf{Only available in \LaTeX.}
-
-\begin{argtable}
-	\#1 & string      & the value of \verb=\f@series/\f@shape= to match.\\
-	\#2 & \TeX{} code & the \TeX{} for the base symbol (\ie, \texttt{A}, \texttt{R}, or \texttt{V}).\\
-	\#3 & string      & the control sequence name created by \verb=\gredefsizedsymbol= to use for the bar.\\
-	\#4 & dimension   & the amount to shift the bar to the left from the end of the base symbol.
-\end{argtable}
-
-\macroname{\textbackslash gre@additionalbottomcustoslineend}{}{gregoriotex-signs.tex}
-Macro to place a bottom custos with an additional line (positions \texttt{a} and \texttt{b}) at the end of a line.
-
-\macroname{\textbackslash gre@additionalbottomcustoslinemiddle}{}{gregoriotex-signs.tex}
-Macro to place a bottom custos with an additional line (positions \texttt{a} and \texttt{b}) in the middle of a line.
-
-\macroname{\textbackslash gre@additionaltopcustoslineend}{}{gregoriotex-signs.tex}
-Macro to place a top custos with an additional line (positions \texttt{l} and \texttt{m}) at the end of a line.
-
-\macroname{\textbackslash gre@additionaltopcustoslinemiddle}{}{gregoriotex-signs.tex}
-Macro to place a top custos with an additional line (positions \texttt{l} and \texttt{m}) in the middle of a line.
-
-\macroname{\textbackslash gre@pickcustos}{\#1}{gregoriotex-signs.tex}
-Macro to pick the appropriate custos character.
-
-\begin{argtable}
-	\#1 & integer & height of the custos character to be placed\\
-\end{argtable}
-
-\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.
-
-\macroname{\textbackslash gre@noinitial}{}{gregoriotex-main.tex}
-Macro called when no initial is being set.
-
-\macroname{\textbackslash gre@setbiginitial}{}{gregoriotex-main.tex}
-Macro which indicates that a 2-line initial is desired.
-
-\macroname{\textbackslash gre@setinitial}{\#1}{gregoriotex-main.tex}
-Macro to set the initial in the score.
-
-\macroname{\textbackslash gre@adjustsecondline}{}{gregoriotex.tex}
-Macro to call before first syllable, but after \verb=\GreSetInitialClef=.
-
-\macroname{\textbackslash gre@adjustthirdline}{}{gregoriotex-main.tex}
-Macro to call during the second line.
-
-\macroname{\textbackslash gre@adjustlineifnecessary}{}{gregoriotex-main.tex}
-Macro that calls \verb=\gre@adjustthirdline= if indicated by \verb=\ifgre@thirdlineadjustmentnecessary=.
-
-\macroname{\textbackslash gre@addspaceabove}{}{gregoriotex-main.tex}
-Macro to increase the space above the lines to account for above lines text.
-
-\macroname{\textbackslash gre@removespaceabove}{}{gregoriotex-main.tex}
-Macro to decrease the space above the lines as there is no longer any above lines text.
-
-\macroname{\textbackslash gre@alteration}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
-Macro to typeset an alteration.
-
-\begin{argtable}
-	\#1 & integer & height of the alteration\\
-	\#2 & character alias & the alteration\\
-	\#3 & character alias & the hole of the alteration\\
-	\#4 & \texttt{1} & the alteration is part of the clef\\
-	& \texttt{0} & the alteration is not part of the clef\\
-	\#5 & \TeX\ code & signs to typeset before the glyph (typically additional bars, as they must be "behind" the glyph)\\
-	\#6 & \TeX\ code & signs to typeset after the glyph (almost all signs)\\
-	\#7 & string & the line, byte offset, and column address for textedit links when point-and-click is enabled\\
-\end{argtable}
-
-\macroname{\textbackslash gre@clef}{}{gregoriotex-signs.tex}
-Macro holding the current clef type.
-
-\macroname{\textbackslash gre@clefheight}{}{gregoriotex-signs.tex}
-Macro holding the current clef line.
-
-\macroname{\textbackslash gre@clefflatheight}{}{gregoriotex-signs.tex}
-Macro to hold the height of the current flat for the clef (\texttt{3} if no flat).
-
-\macroname{\textbackslash gre@cleftwo}{}{gregoriotex-signs.tex}
-Macro holding the current secondary clef type.
-
-\macroname{\textbackslash gre@cleftwoheight}{}{gregoriotex-signs.tex}
-Macro holding the current secondary clef line (or 0 for no secondary clef).
-
-\macroname{\textbackslash gre@cleftwoflatheight}{}{gregoriotex-signs.tex}
-Macro to hold the height of the current flat for the secondary clef (\texttt{3} if no flat).
-
-\macroname{\textbackslash gre@updatelinesclef}{}{gregoriotex-signs.tex}
-Macro redrawing a key from \verb=\gre@clefnum=, useful for vertical space changes.
-
-\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\#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.
-
-\macroname{\textbackslash gre@drawfirstlines}{}{gregoriotex-main.tex}
-Macro to draw the first set of lines in a score (when shortened by an initial).
-
-\macroname{\textbackslash gre@generatelines}{}{gregoriotex-main.tex}
-Macro to (re)populate the box containing the lines.
-
-\macroname{\textbackslash gre@updatelinewidth}{}{gregoriotex-main.tex}
-Macro to shorten the lines to account for the presence of the initial.
-
-\macroname{\textbackslash gre@knownline}{}{gregoriotex-main.tex}
-A count which keeps track of which line of the score we’re on.
-
-\macroname{\textbackslash gre@lastoflinecount}{}{gregoriotex-main.tex}
-Count to track where on the line we are.  Values are \texttt{0} (we are not near the end of a line), \texttt{1} (we’re at the last syllable of the line), and \texttt{2} (we just set the last syllable of the line and so are at the first syllable of a new line).
-
-\macroname{\textbackslash gre@savedlastoflinecount}{}{gregoriotex-main.tex}
-A spot to save the \verb=\gre@lastoflinecount= so we can change it temporarily and revert to the saved value later.
-
-\macroname{\textbackslash gre@newlinecommon}{\#1\#2}{gregoriotex-main.tex}
-The macro which needs to be called each time a new lines is started.
-
-\begin{argtable}
-	\#1 & \texttt{0} & Justifying the line being ended\\
-	& \texttt{1} & Do not justify the line being ended\\
-	\#2 & \texttt{0} & Take care of eolshift\\
-	& \texttt{1} & Do not adjust end of line (when already done by the new spacing algorithm)\\
-\end{argtable}
-
-\macroname{\textbackslash gre@endafterbar}{\#1}{gregoriotex-main.tex}
-Macro to call after ending a bar.
-
-\begin{argtable}
-	\#1 & \texttt{0} & We are at the end of a line\\
-	& \texttt{1} & We not at the end of a line\\
-\end{argtable}
-
-\macroname{\textbackslash gre@endofsyllable}{\#1\#2\#3}{gregoriotex-syllable.tex}
-Macro called at end of a syllable, adds a penalty and a space.
-
-\begin{argtable}
-	\#1 & \texttt{0} & to only add the penalty\\
-	& \texttt{1} & adds both penalty and space\\
-	\#2 & \texttt{0} & if end of syllable\\
-	& \texttt{1} & if end of word\\
-	\#3 & \texttt{1} & if next syllable is a bar\\
-	& \texttt{0} & otherwise\\
-\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.
-
-\begin{argtable}
-	\#1 & \TeX\ code & First part of the syllable (before the vowel)\\
-	\#2 & \TeX\ code & Middle part of the syllable (the vowel)\\
-	\#3 & \TeX\ code & Last part of the syllable (after the vowel)\\
-	\#4 & \TeX\ code & First letter of the syllable\\
-	\#5 & \TeX\ code & Everything after the first letter of the syllable\\
-	\#6 & \TeX\ code & Macros to run after the text is emitted\\
-\end{argtable}
-
-\macroname{\textbackslash gre@opening@syllabletext}{}{gregoriotex-syllable.tex}
-Macro that stores the computed \TeX\ code for rendering the text of the first syllable.
-
-\macroname{\textbackslash gre@exhyphencharsave}{}{gregoriotex-main.tex}
-Macro for saving the ex hyphen character so that it can be restored at the end of the score.
-
-\macroname{\textbackslash gre@factor}{}{gregoriotex-main.tex}
-Count which stores the current staff size.
-
-Default: 17 (approximately the size found in graduals)
-
-\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}
-Macro to find the alignment center for a group of notes.  The value is the distance from the left edge of the group to the alignment point and is stored in \verb=\gre@dimen@notesaligncenter=.
-
-\begin{argtable}
-	\#1 & Note alignment type & See \ref{notesalign}\\
-\end{argtable}
-
-\macroname{\textbackslash gre@calculate@nextnotesaligncenter}{\#1}{gregoriotex-syllable.tex}
-Same as previous, but for the next syllable.
-
-\begin{argtable}
-	\#1 & Note alignment type & See \ref{notesalign}\\
-\end{argtable}
-
-\macroname{\textbackslash gre@calculate@simplenotesaligncenter}{\#1\#2}{gregoriotex-syllable.tex}
-Workhorse function behind \verb=\gre@calculate@notesaligncenter= and\\ \verb=\gre@calculate@nextnotesaligncenter=.
-
-\begin{argtable}
-	\#1 & Note alignment type & See \ref{notesalign}\\
-	\#2 & \texttt{0} & this is for the current syllable\\
-	& \texttt{1} & this is for the next syllable\\
-\end{argtable}
-
-\macroname{\textbackslash gre@gregoriofontname}{}{gregoriotex-main.tex}
-Macro which stores the name of the currently selected font for the neumes.
-
-\macroname{\textbackslash gre@handleclivisspecialalignment}{\#1\#2\#3}{gregoriotex-syllable.tex}
-Macro for aligning clivis syllables according to the flag \verb=\gre@clivisalignment=.
-
-\begin{argtable}
-	\#1 & Gregorio\TeX\ glyph & Glyph to use when aligning clivis on its center\\
-	\#2 & Gregorio\TeX\ glyph & Glyph to use when aligning clivis on the center of the first punctum\\
-	\#3 &  \texttt{0} & this is for the current syllable\\
-	& \texttt{1} & this is for the next syllable\\
-\end{argtable}
-
-\macroname{\textbackslash gre@hepisorline}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
-Macro to typeset a horizontal line (either an additional staff line or an episema).
-
-\begin{argtable}
-	\#1 & character & The letter of the height of the episema (not the height of the note it corresponds to).\\
-	\#2 & \texttt{0} & go back to the beginning of the previous glyph; this starts the episema at the beginning of the previous glyph\\
-	& \texttt{1} & stay at the end of the glyph; doesn’t make much sense to use this\\
-	& \texttt{2} & go back the width of \#1; this starts the episema at the glyph from the end that starts at \#1’s width from the end\\
-	& \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1; this starts the episema at the glyph from the start that starts just after \#1’s width from the start\\
-	& \texttt{4} & go back to the beginning of the previous glyph and then forward the width of \#1, then back the width of \#2; this ends the episema at the end of \#1\\
-	\#3 & integer &the ambitus for a two note episema at the diagonal stroke of a porrectus, porrectus flexus, orculus resupinus, or torculus resupinus flexus\\
-	\#4 & \texttt{0} & an horizontal episema\\
-	& \texttt{1} & an horizontal episema under a note\\
-	& \texttt{2} & a line at the top\\
-	& \texttt{3} & a line at the bottom\\
-	\#5 & \texttt{f} & a normal episema\\
-	& \texttt{l} & a small episema aligned left\\
-	& \texttt{c} & a small episema aligned center\\
-	& \texttt{r} & for a small episema aligned right\\
-	\#6 & string & a positive or negative "nudge" (dimension) for the vertical position of the horizontal episema\\
-	\#7 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\
-	& \texttt{1} & for horizontal episema cases, position in the middle of the space\\
-	& \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-	& \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\
-	& \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\
-	& \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\
-\end{argtable}
-
-\macroname{\textbackslash gre@hepisorlineaux}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
-Macro that will help in the typesetting of a horizontal episema and additional lines.
-
-\begin{argtable}
-	\#1 & Gregorio\TeX\ glyph & an offset glyph (see \#3, below)\\
-	\#2 & Gregorio\TeX\ glyph & the episema glyph\\
-	\#3 & \texttt{0} & go back to the beginning of the previous glyph; this starts the episema at the beginning of the previous glyph\\
-	& \texttt{1} & stay at the end of the glyph; doesn’t make much sense to use this\\
-	& \texttt{2} & go back the width of \#1; this starts the episema at the glyph from the end that starts at \#1’s width from the end\\
-	& \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1; this starts the episema at the glyph from the start that starts just after \#1’s width from the start\\
-	\#4 & \texttt{0} & an horizontal episema\\
-	& \texttt{1} & an horizontal episema under a note\\
-	& \texttt{2} & a line at the top\\
-	& \texttt{3} & a line at the bottom\\
-\end{argtable}
-
-\macroname{\textbackslash gre@vepisemaorrare}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex}
-Macro to typeset a vertical episema or a rare accent (like accentus, circulus, etc.).  This function must be called after a call to \verb=\GreGlyph=.
-
-\begin{argtable}
-	\#1 & character & the letter of the height of the episema (not the height of the note it corresponds to.\\
-	\#2 & string & See \Nameref{NoteOffset}.\\
-	\#3 & Gregorio\TeX\ glyph & the sign glyph\\
-	\#4 & \texttt{1} & vertical episema\\
-	& \texttt{2} & rare sign\\
-	& \texttt{3} & choral sign\\
-	& \texttt{4} & brace above the bar\\
-	\#5 & string & the choral sign, if relevant\\
-\end{argtable}
-
-\macroname{\textbackslash gre@vepisemaorrareaux}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex}
-Macro to help typesetting vertical episema.
-
-\begin{argtable}
-	\#1 & Gregorio\TeX\ glyph & is an offset glyph (see \#3 below)\\
-	\#2 & Gregorio\TeX glyph & the glyph upon which the sign is to be centered\\
-	\#3 & \texttt{0} & go back to the beginning of the previous glyph and then forward half the width of \#2; this puts the sign at the beginning of the previous glyph, whose first note is the size of \#2\\
-	& \texttt{1} & go back half the width of \#2; this puts the sign at the end of the previous glyph, whose last note is the size of \#2\\
-	& \texttt{2} & go back the width of \#1 and then forward half the width of \#2; this puts the sign at the glyph from the end that starts at \#1’s width from the end\\
-	& \texttt{3} & go back to the beginning of the previous glyph and then forward the width of \#1 and then back half the width of \#2; this puts the sign at the glyph from the start that ends at \#1’s width from the start\\
-	\#4 & dimension & a shift that we want to get applied, useful for punctum inclinatum for example\\
-	\#5 & integer & is the glyph number\\
-	\#6 & \texttt{1} & vertical episema\\
-	& \texttt{2} & rare sign\\
-	& \texttt{3} & choral sign\\
-	& \texttt{4} & brace above the bar\\
-	\#7 & string & the choral sign if relevant\\
-\end{argtable}
-
-\macroname{\textbackslash gre@newglyphcommon}{}{gregoriotex-syllable.tex}
-Macro called before each glyph.
-
-\macroname{\textbackslash gre@normalinitial}{}{gregoriotex-main.tex}
-Macro called at the end of the score to ensure that a big initial setting doesn’t carry into the next score.
-
-\macroname{\textbackslash greoldcatcode}{}{gregoriotex.tex}
-Macro to store the catcode for ``@'' so that we can use said symbol in function names under Plain \TeX\ and then restore the original catcode after the package is done loading.
-
-\macroname{\textbackslash gre@prephepisemaledgerlineheuristics}{}{gregoriotex-spaces.tex}
-Prepares the system to accept ledger line heuristics for the horizontal episema.
-
-\macroname{\textbackslash gre@resetledgerlineheuristics}{}{gregoriotex-spaces.tex}
-Resets the ledger line heuristic flags.
-
-\macroname{\textbackslash gre@setstylefont}{}{gregoriotex-main.tex}
-Macro for opening up greextra font.
-
-\macroname{\textbackslash gre@syllablenotes}{\#1}{gregoriotex-syllable.tex}
-Macro for populating \verb=\gre@box@syllablenotes=.
-
-\begin{argtable}
-	\#1 & string & The contents to be placed in the box\\
-\end{argtable}
-
-\macroname{\textbackslash gre@symbolfontsize}{}{gregoriotex-symbols.tex}
-The font size at which symbols are to be loaded.
-
-\macroname{\textbackslash gre@textnormal}{\#1}{gregoriotex-syllable.tex}
-Macro which applies the default text format.
-
-\macroname{\textbackslash gre@save@clef}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex}
-Saves clef information for use in \verb=gre@updatelinesclef=.
-
-\begin{argtable}
-	\#1 & character & the type of the clef: c or f\\
-	\#2 & integer & the line of the clef (1 is the lowest)\\
-	\#3 & integer & if \texttt{3}, it means that we must not put a flat after the clef, otherwise it’s the height of the flat\\
-	\#4 & character & the type of the secondary clef: c or f\\
-	\#5 & integer & the line of the secondary clef (1 is the lowest, 0 for no secondary clef)\\
-	\#6 & integer & if \texttt{3}, it means that we must not put a flat after the secondary clef, otherwise it’s the height of the flat\\
-\end{argtable}
-
-\macroname{\textbackslash gre@typeclef}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-signs.tex}
-Macro which typesets the clef.
-
-\begin{argtable}
-	\#1 & character & the type of the clef: c or f\\
-	\#2 & integer & the line of the clef (1 is the lowest)\\
-	\#3 & \texttt{0} & no need to use small clef characters (inside a line)\\
-	& \texttt{1} & we must use small clef characters (inside a line)\\
-	\#4 & \texttt{0} & no extra space is needed after the clef\\
-	& \texttt{1} & we must type a 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.
-
-\begin{argtable}
-	\#1 & character & the type of the clef: c or f\\
-	\#2 & integer & the line of the clef (1 is the lowest)\\
-	\#3 & \texttt{0} & no need to use small clef characters (inside a line)\\
-	& \texttt{1} & we must use small clef characters (inside a line)\\
-	\#4 & integer & if \texttt{3}, it means that we must not put a flat after the clef, otherwise it’s the height of the flat\\
-\end{argtable}
-
-\macroname{\textbackslash gre@updateleftbox}{}{gregoriotex-main.tex}
-Macro to update the box printed a the left end of every line (the one which holds the staff lines).
-
-\macroname{\textbackslash gre@useautoeolcustos}{}{gregoriotex-main.tex}
-Macro which enables 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\#5}{gregoriotex-signs.tex}
-Macro to write a bar.
-
-\begin{argtable}
-	\#1 & \texttt{0} & virgula\\
-	& \texttt{1} & minima\\
-	& \texttt{2} & minor\\
-	& \texttt{3} & major\\
-	& \texttt{4} & finalis\\
-	& \texttt{5} & the last finalis\\
-	\#2 & \texttt{0} & in a syllable containing only this bar\\
-	& \texttt{1} & in a syllable containing other notes\\
-	\#3 & \texttt{0} & if there is no text underneath the bar\\
-	& \texttt{1} & if there is text underneath the bar\\
-	\#4 & \TeX\ code & macros that may happen before the skip after the bar (typically GreVEpisema)\\
-	\#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}
-A dummy macro which is used to store a macro which takes an argument so that it can be used in a \verb=\ifx= comparison.  The value of the argument is provided at the time this macro is created.
-
-\macroname{\textbackslash gre@nothing}{}{gregoriotex-main.tex}
-A dummy macro which has not contents.  Used for \verb=\ifx= comparisons.
-
-\macroname{\textbackslash gre@annotation}{[\#1]\#2}{gregoriotex-main.tex}
-Workhorse function behind \verb=\greannotation=.
-
-\begin{argtable}
-	\#1 & \texttt{c} & center align the new line with the existing annotation content\\
-	& \texttt{l} & left align the new line with the existing annotation content\\
-	& \texttt{r} & right align the new line with the existing annotation content\\
-	\#2 & string & the new annotation content\\
-\end{argtable}
-
-\macroname{\textbackslash gre@commentary}{[\#1]\#2}{gregoriotex-main.tex}
-Workhorse function behind \verb=\grecommentary=.
-
-\begin{argtable}
-	\#1 & distance & Additional distance to be placed between the commentary and the top staff line for the next score only.\\
-	\#2 & string & the new commentary content\\
-\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.
-
-\macroname{\textbackslash gre@baseunit}{}{gregoriotex-spaces.tex}
-The units attached to base dimension in a string distance.  These units are extracted as part of coercing one distance to have the same units as another\\ (\verb=\gre@consistentunits=).
-
-\macroname{\textbackslash gre@stretchunit}{}{gregoriotex-spaces.tex}
-The units attached to stretch dimension in a string distance.  These units are extracted as part of coercing one distance to have the same units as another (\verb=\gre@consistentunits=).
-
-\macroname{\textbackslash gre@shrinkunit}{}{gregoriotex-spaces.tex}
-The units attached to shrink dimension in a string distance.  These units are extracted as part of coercing one distance to have the same units as another (\verb=\gre@consistentunits=).
-
-\macroname{\textbackslash gre@bug}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Macro for raising a bug error when some calculation goes awry and comes up with a non-sensical result.  Generally will be found in Lua code, not \TeX\ code.
-
-\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.
-
-\begin{argtable}
-	\#1 & dimension & \verb=begindifference= of the syllable\\
-\end{argtable}
-
-\macroname{\textbackslash gre@calculate@eolshift}{\#1}{gregoriotex-spaces.tex}
-Macro used in \verb=\GreSyllable=. Sets \verb=\gre@dimen@eolshift= to the left kern that
-should appear before an end of line. The improvement is tiny: when
-text go further than notes in the last syllable of a line, the idea
-is to allow text to go a bit further right, under the custos.  This shift is applied to the left after every syllable and then to the right after setting the line break penalty.  If the line break occurs after this syllable, it will occur between the two shifts, pushing the shift right to the beginning of the next line where \TeX\ will ignore it as leading white space.
-
-\begin{argtable}
-	\#1 & dimension & The \verb=enddifference= of the corresponding syllable\\
-\end{argtable}
-
-\macroname{\textbackslash gre@calculate@syllablefinalskip}{\#1\#2}{gregoriotex-spaces.tex}
-Macro computing the skip at the end of the syllable.
-
-\begin{argtable}
-	\#1 & \texttt{0} & if end of syllable\\
-	& \texttt{1} & if end of word\\
-	\#2 & \texttt{0} & if next syllable is normal\\
-	& \texttt{1} & if it’s a bar\\
-\end{argtable}
-
-\macroname{\textbackslash gre@convert}{}{gregoriotex-spaces.tex}
-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.  Contains comma-separated values from \Nameref{DebugCategory}, set via the \texttt{debug} package keyword parameter.
-
-\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; 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.
-
-\begin{argtable}
-	\#1 & string & name of the current file\\
-	\#2 & string & version of the current file\\
-\end{argtable}
-
-\macroname{\textbackslash gre@def@char@he}{\#1\#2}{gregoriotex-chars.tex}
-Macro for defining the various types of horizontal episema.
-
-\begin{argtable}
-	\#1 & string & name of the horizontal episema to be defined\\
-	\#2 & string & Camel case name of horizontal episema to be defined\\
-\end{argtable}
-
-\macroname{\textbackslash gre@def@char@he@porr}{\#1\#2}{gregoriotex-chars.tex}
-Macro for defining the various types of horizontal episema porrectus.
-
-\begin{argtable}
-	\#1 & string & name of the horizontal episema porrectus to be defined\\
-	\#2 & string & Camel case name of horizontal episema porrectus to be defined\\
-\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.
-
-\begin{argtable}
-	\#1 & \texttt{0} & Default space.\\
-	& \texttt{1} & Zero-width space.\\
-	& \texttt{2} & Space between flat or natural and a note.\\
-	& \texttt{3} & Space between two puncta inclinata, descending.\\
-	& \texttt{4} & Space between bivirga or trivirga.\\
-	& \texttt{5} & space between bistropha or tristropha.\\
-	& \texttt{6} & Space after a punctum mora XXX: not used yet, not so sure it is a good idea\ldots\\
-	& \texttt{7} & Space between a punctum inclinatum and a punctum inclinatum debilis, descending.\\
-	& \texttt{8} & Space between two puncta inclinata debilis.\\
-	& \texttt{9} & Space before a punctum (or something else) and a punctum inclinatum.\\
-	& \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), descending.\\
-	& \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), descending.\\
-	& \texttt{12} & Space between two puncta inclinata, ascending. \\
-	& \texttt{13} & Space between a punctum inclinatum and a punctum inclinatum debilis, ascending. \\
-	& \texttt{14} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd), ascending. \\
-	& \texttt{15} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or 5th), ascending. \\
-	& \texttt{16} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch below. \\
-	& \texttt{17} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches below. \\
-	& \texttt{18} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches below \\
-	& \texttt{19} & Space between a punctum inclinatum and a ``no-bar'' glyph one pitch above. \\
-	& \texttt{20} & Space between a punctum inclinatum and a ``no-bar'' glyph two pitches above. \\
-	& \texttt{21} & Space between a punctum inclinatum and a ``no-bar'' glyph three or four pitches above \\
-	& \texttt{22} & Half-space. \\
-\end{argtable}
-
-\macroname{\textbackslash gre@nabcfontname}{}{gregoriotex-main.tex}
-Macro which stores the name of the currently selected font for \texttt{nabc}.
-
-\macroname{\textbackslash gre@nabcfontsize}{}{gregoriotex-main.tex}
-Macro which stores the size of the currently selected font for \texttt{nabc}.
-
-\macroname{\textbackslash gre@endsyllablepart}{}{gregoriotex-syllable.tex}
-Macro which stores the end part of the current syllable (that which comes after the alignment part).
-
-\macroname{\textbackslash gre@firstsyllablepart}{}{gregoriotex-syllable.tex}
-Macro which stores the first part of the current syllable (that which comes before the alignment part).
-
-\macroname{\textbackslash gre@middlesyllablepart}{}{gregoriotex-syllable.tex}
-Macro which stores the middle part of the current syllable (the part which aligns with the notes).
-
-\macroname{\textbackslash gre@nextendsyllablepart}{}{gregoriotex-syllable.tex}
-Macro which stores the end part of the next syllable (that which comes after the alignment part).
-
-\macroname{\textbackslash gre@nextfirstsyllablepart}{}{gregoriotex-syllable.tex}
-Macro which stores the first part of the next syllable (that which comes before the alignment part).
-
-\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.
-
-\begin{argtable}
-	\#1 & string & The syllable (usually built as \verb=\gre@firstsyllablepart\gre@middlesyllablepart\gre@endsyllablepart=\\
-\end{argtable}
-
-\macroname{\textbackslash gre@fixednexttextformat}{\#1}{gregoriotex-syllable.tex}
-A macro which applies formatting that needs to apply to the whole syllable (rather than the parts individually) for the next syllable.  Necessary to preserve ligatures across parts within a syllable.
-
-\begin{argtable}
-	\#1 & string & The syllable (usually built as \verb=\gre@nextfirstsyllablepart\gre@nextmiddlesyllablepart\gre@nextendsyllablepart=\\
-\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@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}
-Macro set to \verb=\hfil= or \verb=\relax= depending on alignment choices.
-
-\macroname{\textbackslash gre@lyriccentering}{}{gregoriotex-syllable.tex}
-Macro set to \verb=0= for full-syllable centering, \verb=1= for vowel centering (the default), or \verb=2= for first-letter centering.
-
-\macroname{\textbackslash gre@rightfill}{}{gregoriotex-main.tex}
-Macro set to \verb=\hfil= or \verb=\relax= depending on alignment choices.
-
-\macroname{\textbackslash gre@mark@abovelinestext}{}{gregoriotex-main.tex}
-Macro to set the point-and-click position for above lines text.
-
-\macroname{\textbackslash gre@mark@translation}{}{gregoriotex-main.tex}
-Macro to set the point-and-click position for translations.
-
-\macroname{\textbackslash gre@pitch@[a-n,p]}{}{gregoriotex-main.tex}
-Macros which map gabc pitch letters (the final part of the macro name) to the numerical value that Gregorio\TeX\ uses in processing note placement.
-
-\macroname{\textbackslash gre@pitch@adjust@top}{}{gregoriotex-main.tex}
-If any note appears above this pitch, the space above the lines must be adjusted to account for it.
-
-\macroname{\textbackslash gre@pitch@adjust@bottom}{}{gregoriotex-main.tex}
-If any note appears below this pitch, the space below the lines must be adjusted to account for it.
-
-\macroname{\textbackslash gre@pitch@abovestaff}{}{gregoriotex-main.tex}
-The pitch above the staff.
-
-\macroname{\textbackslash gre@pitch@belowstaff}{}{gregoriotex-main.tex}
-The pitch below the staff.
-
-\macroname{\textbackslash gre@pitch@ledger@above}{}{gregoriotex-main.tex}
-The pitch of the ledger line above the staff.
-
-\macroname{\textbackslash gre@pitch@ledger@below}{}{gregoriotex-main.tex}
-The pitch of the ledger line below the staff.
-
-\macroname{\textbackslash gre@pitch@barvepisema}{}{gregoriotex-main.tex}
-The pitch of the bar episema.
-
-\macroname{\textbackslash gre@pitch@underbrace}{}{gregoriotex-main.tex}
-The pitch of the under-the-staff brace.
-
-\macroname{\textbackslash gre@pitch@overbrace}{}{gregoriotex-main.tex}
-The pitch of the over-the-staff brace.
-
-\macroname{\textbackslash gre@pitch@overbraceglyph}{}{gregoriotex-main.tex}
-The pitch of the over-the-staff brace glyph.
-
-\macroname{\textbackslash gre@pitch@bar}{}{gregoriotex-main.tex}
-The pitch of the bar glyph.
-
-\macroname{\textbackslash gre@pitch@raresign}{}{gregoriotex-main.tex}
-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.
-
-\begin{argtable}
-	\#1 & \TeX\ code & the entity which is to contain the link\\
-	\#2 & link target & line:char:column for the link\\
-\end{argtable}
-
-\macroname{\textbackslash gre@prefix}{}{gregoriotex-spaces.tex}
-Either \texttt{skip} or \texttt{dimen} according to the distance being set or changed at the given moment.
-
-\macroname{\textbackslash gre@prefixII}{}{gregoriotex-spaces.tex}
-Same as \verb=\gre@prefix=.  Used when we were dealing with two distances simultaneously.
-
-\macroname{\textbackslash gre@rubberpermit}{\#1}{gregoriotex-spaces.tex}
-Determines whether the given distance is allowed to take a rubber length.
-
-\begin{argtable}
-	\#1 & string & the name of the distance to check\\
-\end{argtable}
-
-\macroname{\textbackslash gre@setgregoriofont}{[\#1]\#2}{gregoriotex-main.tex}
-Workhorse function behind \verb=\gresetgregoriofont=.
-
-\begin{argtable}
-	\#1 & \textit{(omitted)} & Use the normal font and rule set (default).\\
-	& \texttt{op} & Use the alternate Dominican font/rule set.\\
-	\#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
-	& \texttt{gregorio} & Use the Gregorio font.\\
-	& \texttt{granapadano} & Use the Grana Padano font.\\
-\end{argtable}
-
-\macroname{\textbackslash gre@syllable@end}{\#1\#2\#3}{gregoriotex-syllable.tex}
-Macro to make a few checks and call the right macros between \verb=\endbeforebar, \endofword, \endofsyllable=.
-
-\begin{argtable}
-	\#1 & & next syllable type (\#7 of \verb=\GreSyllable=)\\
-	\#2 & string & next syllable text\\
-	\#3 & \texttt{0} & this syllable is not the end of a word\\
-	& \texttt{1} & this syllable is the end of a word\\
-\end{argtable}
-
-\macroname{\textbackslash gre@typeout}{\#1}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Macro which points to \verb=\typeout= in \LaTeX\ or \verb=\message= in Plain \TeX.
-
-\macroname{\textbackslash gre@unsetfixedtextformat}{}{gregoriotex-syllable.tex}
-Macro which changes \verb=\gre@fixedtextformat= back to normal text.
-
-\macroname{\textbackslash gre@unsetfixednexttextformat}{}{gregoriotex-syllable.tex}
-Macro which changes \verb=\gre@fixednexttextformat= back to normal text.
-
-\macroname{\textbackslash gregoriotex@symbols@loaded}{}{gregoriotex-symbols.tex}
-Empty macro which is used to determine if the symbols have been loaded and prevent loading them again if they have.
-
-\macroname{\textbackslash gre@hskip}{}{gregoriotex-signs.tex}
-Alias for \verb=\hskip= or \verb=\kern=.  We use this rather than those functions directly so that the same element can appear in discretionaries where \verb=\kern= is allowed but \verb=\hskip= is not by simply changing the assignment of this macro when we enter one.
-
-\macroname{\textbackslash gre@localleftbox}{}{gregoriotex-main.tex}
-Alias for \verb=\luatexlocalleftbox= or \verb=\localleftbox=, depending on \LaTeX\ version.
-
-\macroname{\textbackslash gre@localrightbox}{}{gregoriotex-main.tex}
-Alias for \verb=\luatexlocalrightbox= or \verb=\localrightbox=, depending on \LaTeX\ version.
-
-\macroname{\textbackslash gre@resizebox}{}{gregoriotex-main.tex}
-Alias for \verb=\resizebox=.
-
-\macroname{\textbackslash gre@dimension}{}{gregoriotex-spaces.tex}
-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.
-
-\begin{argtable}
-	\#1 & integer & The number of staff lines\\
-\end{argtable}
-
-\macroname{\textbackslash gre@stafflines}{}{gregoriotex-main.tex}
-Contains the number of staff lines.
-
-\macroname{\textbackslash gre@romannumeral@majuscule}{\#1}{gregoriotex-main.tex}
-Typesets its numeric argument as an upper-case Roman numeral.
-
-\begin{argtable}
-	\#1 & integer & The number to typeset\\
-\end{argtable}
-
-\macroname{\textbackslash gre@romannumeral@minuscule}{\#1}{gregoriotex-main.tex}
-Typesets its numeric argument as a lower-case Roman numeral.
-
-\begin{argtable}
-	\#1 & integer & The number to typeset\\
-\end{argtable}
-
-\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 \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}
-Workhorse function behind \verb=\GreDrawAdditionalLine=.
-
-\begin{argtable}
-	\#1 & \texttt{0} & Draw an over-the-staff ledger line. \\
-			& \texttt{1} & Draw an under-the-staff ledger line. \\
-	\#2 & distance   & The length of the line, with TeX units, excluding any left or right distances coming from the rest of the arguments. \\
-	\#3 & \texttt{0} & Start the line at this point. \\
-			& \texttt{1} & Start the line to the left of this point by \verb=gre@dimen@additionallineswidth=. \\
-			& \texttt{2} & Start the line to the left of this point by \#4. \\
-	\#4 & distance   & The distance to move left before starting the line if \#3 is \texttt{2}. \\
-	\#5 & \texttt{0} & End the line exactly \#2 to the right of this point. \\
-			& \texttt{1} & End the line \verb=gre@dimen@additionallineswidth= to the right of \#2 from this point. \\
-			& \texttt{2} & End the line \#6 to the right of \#2 from this point. \\
-	\#6 & distance   & The distance to end the line after \#2 from this point if \#3 is \texttt{2}. \\
-\end{argtable}
-
-\macroname{\textbackslash gre@get@unkern@aftermora}{}{gregoriotex-signs.tex}
-Calculates the amount of shift needed to take into account the presence of a punctum mora at the end of a syllable according to the setting in \verb=\gre@count@shiftaftermora=.
-
-\macroname{\textbackslash gre@unkern@bar@aftermora}{}{gregoriotex-signs.tex}
-Macro which kerns between a punctum mora and a bar according to the setting in \verb=\gre@count@shiftaftermora=.
-
-\macroname{\textbackslash gre@setgregoriofontscaled}{[\#1]\#2\#3}{gregoriotex-main.tex}
-Workhorse behind \verb=\gresetgregoriofontscaled=.
-
-\begin{argtable}
-	\#1 & \textit{(omitted)} & Use the normal font and rule set.\\
-	& \texttt{op} & Use the alternate Dominican font/rule set.\\
-	\#2 & \texttt{greciliae} & Use the Greciliae font (default).\\
-	& \texttt{gregorio} & Use the Gregorio font.\\
-	& \texttt{granapadano} & Use the Grana Padano font.\\
-	\#3 & integer & the scaling factor\\
-\end{argtable}
-
-\macroname{\textbackslash gre@calculate@barposition}{\#1\#2}{gregoriotex-spaces.tex}
-Macro for calculating the position of the elements of a bar syllable using the new bar positioning algorithm.
-
-\begin{argtable}
-	\#1 & 0 & bar is not the end of a word\\
-	& 1 & bar is the end of a word\\
-	\#2 & integer & alignment type of the first glyph in the next syllable.  See \Nameref{notesalign}\\
-\end{argtable}
-
-\macroname{\textbackslash gre@newlinearg}{}{gregoriotex-syllable.tex}
-Macro for storing the argument for \verb=\gre@newlinecommon= when the line break must be delayed (i.e. in the new bar spacing algorithm).
-
-\macroname{\textbackslash gre@newlinecommondelayed}{}{gregoriotex-syllable.tex}
-Macro used in place of \verb=\gre@newlinecommon= when the line break must be delayed.
-
-\macroname{\textbackslash gre@newlinecommonsaved}{}{gregoriotex-syllable.tex}
-Macro for storing original behavior of \verb=\gre@newlinecommon= so that it can be restored after the delayed line break takes effect.
-
-\macroname{\textbackslash gre@punctum@mora}{\#1\#2\#3\#4}{gregoriotex-signs.tex}
-Macro to typeset a punctum mora.
-
-\begin{argtable}
-	\#1 & pitch & height of the punctum mora (one of the \verb=\gre@pitch@...= macros.\\
-	\#2 & 0 & general case\\
-	& 1 & make the punctum mora zero-width\\
-	& 2 & shift the width of one punctum to the left\\
-	& 3 & same as 2 but with ambitus of one\\
-	\#3 & 1 & punctum mora in the note before the last note of a podatus, porrectus, or torculus resupinus\\
-	& 0 & other cases\\
-	\#4 & 1 & punctum inclinatum\\
-	& 0 & other cases\\
-\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.
-
-\macroname{\textbackslash gre@gaux}{}{gregoriotex-main.tex}
-The handle for the auxiliary file.
-
-\macroname{\textbackslash gre@open@gaux}{}{gregoriotex-main.tex}
-Macro for opening the auxiliary file.
-
-\macroname{\textbackslash gre@close@gaux}{}{gregoriotex-main.tex}
-Macro for closing the auxiliary file.
-
-\macroname{\textbackslash gre@write@gaux}{\#1}{gregoriotex-main.tex}
-Macro for writing the auxiliary file.
-
-\begin{argtable}
-	\#1 & string & contents to be written to the auxiliary file\\
-\end{argtable}
-
-
-\subsection{Fonts}
-Gregorio\TeX\ loads a number of fonts which are referred to by the following macros.
-
-\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.
-
-\macroname{\textbackslash gre@font@nabc}{}{gregoriotex-nabc.tex}
-The font for ancient notation.
-
-\macroname{\textbackslash gre@font@initial}{}{gregoriotex.tex}
-The font for the default initial format in Plain \TeX.
-
-\macroname{\textbackslash gre@fontfactor@...}{}{gregoriotex-main.tex}
-Macro holding the factor at which the font is loaded.  There is one of these macros for each chant font which has been loaded with the ending of the macro name being the name of the chant font (gregorio, granapadano, \etc).
-
-
-\subsection{Character Reference Aliases}
-To make referencing and changing them easier, Gregorio\TeX\ stores reference information for certain characters using the following macros.
-
-\macroname{\textbackslash gre@fontchar@abovebarbrace}{}{gregoriotex-chars.tex}
-The above bar brace.
-
-\macroname{\textbackslash gre@fontchar@flat}{}{gregoriotex-chars.tex}
-The flat character.
-
-\macroname{\textbackslash gre@fontchar@flathole}{}{gregoriotex-chars.tex}
-The flat hole character (\ie, the character needed to prevent lines from showing through the center of the flat).
-
-\macroname{\textbackslash gre@fontchar@natural}{}{gregoriotex-chars.tex}
-The natural character.
-
-\macroname{\textbackslash gre@fontchar@naturalhole}{}{gregoriotex-chars.tex}
-The natural hole character (\ie, the character needed to prevent lines from showing through the center of the natural).
-
-\macroname{\textbackslash gre@fontchar@sharp}{}{gregoriotex-chars.tex}
-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@incclef}{}{gregoriotex-chars.tex}
-The \texttt{c}-clef which appears in the middle of a line.
-
-\macroname{\textbackslash gre@fontchar@infclef}{}{gregoriotex-chars.tex}
-The \texttt{f}-clef which appears in the middle of a line.
-
-\macroname{\textbackslash gre@fontchar@cclef}{}{gregoriotex-chars.tex}
-The \texttt{c}-clef which appears at the beginning of a line.
-
-\macroname{\textbackslash gre@fontchar@fclef}{}{gregoriotex-chars.tex}
-The \texttt{f}-clef which appears at the beginning of a line.
-
-\macroname{\textbackslash gre@fontchar@punctum}{}{gregoriotex-chars.tex}
-The punctum character.
-
-\macroname{\textbackslash gre@fontchar@punctummora}{}{gregoriotex-chars.tex}
-The punctum mora character.
-
-\macroname{\textbackslash gre@fontchar@underbrace}{}{gregoriotex-signs.tex}
-The under brace character.
-
-\macroname{\textbackslash gre@fontchar@verticalepisema}{}{gregoriotex-chars.tex}
-The vertical episema character.
-
-\macroname{\textbackslash gre@fontchar@brace}{}{gregoriotex-signs.tex}
-The (rounded) brace character.
-
-\macroname{\textbackslash gre@fontchar@curlybrace}{}{gregoriotex-signs.tex}
-The curly brace character.
-
-\macroname{\textbackslash gre@fontchar@custosbottomlong}{}{gregoriotex-chars.tex}
-The custos character with a long upwards directed vigra.
-
-\macroname{\textbackslash gre@fontchar@custosbottommiddle}{}{gregoriotex-chars.tex}
-The custos character with a middle upwards directed vigra.
-
-\macroname{\textbackslash gre@fontchar@custosbottomshort}{}{gregoriotex-chars.tex}
-The custos character with a short upwards directed vigra.
-
-\macroname{\textbackslash gre@fontchar@custostoplong}{}{gregoriotex-chars.tex}
-The custos character with a long downwards directed vigra.
-
-\macroname{\textbackslash gre@fontchar@custostopmiddle}{}{gregoriotex-chars.tex}
-The custos character with a middle downwards directed vigra.
-
-\macroname{\textbackslash gre@fontchar@custostopshort}{}{gregoriotex-chars.tex}
-The custos character with a short downwards directed vigra.
-
-\macroname{\textbackslash gre@fontchar@divisiofinalis}{}{gregoriotex-signs.tex}
-The divisio finalis.
-
-\macroname{\textbackslash gre@fontchar@divisiomaior}{}{gregoriotex-signs.tex}
-The divisio maior.
-
-\macroname{\textbackslash gre@char@normalhyphen}{}{gregoriotex-main.tex}
-A normal hyphen in the text font.
-
-\macroname{\textbackslash gre@char@zerohyph}{}{gregoriotex-main.tex}
-Macro to typeset a zero-width hyphen (the hyphen is visible, it is only
-treated as if it had 0 width when calculating spaces).  Used for fine tuning spacing
-(especially at line endings).
-
-\macroname{\textbackslash gre@char@fuse@debilis}{}{gregoriotex-chars.tex}
-A fused character consisting of a leading punctum initio debilis (of ambitus one) and a regular punctum.
-
-\macroname{\textbackslash gre@char@fuse@oriscus@one}{}{gregoriotex-chars.tex}
-A fused character consisting of a leading oriscus (of ambitus one) and a regular punctum.
-
-\macroname{\textbackslash gre@char@fuse@oriscus@two}{}{gregoriotex-chars.tex}
-A fused character consisting of a leading oriscus (of ambitus two) and a regular punctum.
-
-\macroname{\textbackslash gre@char@fuse@punctum@one}{}{gregoriotex-chars.tex}
-A fused character consisting of a leading punctum (of ambitus one) and a regular punctum.
-
-\macroname{\textbackslash gre@char@fuse@punctum@two}{}{gregoriotex-chars.tex}
-A fused character consisting of a leading punctum (of ambitus two) and a regular punctum.
-
-\macroname{\textbackslash gre@char@fuse@quilisma@one}{}{gregoriotex-chars.tex}
-A fused character consisting of a leading quilisma (of ambitus one) and a regular punctum.
-
-\macroname{\textbackslash gre@char@fuse@quilisma@two}{}{gregoriotex-chars.tex}
-A fused character consisting of a leading quilisma (of ambitus two) and a regular punctum.
-
-\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}
-
-Flags are either boolean (defined with \verb=\newif=), Lua\TeX\ attributes, or counts (defined with \verb=\newcount=).  They store settings and/or the current state of something so that Gregorio\TeX\ can typeset things in the desired manner.
-
-All distances in \nameref{distances} and \texttt{stafflinefactor} have a boolean associated with them, of the form \verb=\ifgre@scale@*=.  This boolean
-indicates if the distance should scale when the staff size changes (true)
-or not (false).
-
-\macroname{\textbackslash ifgre@annotationbottomline}{}{gregoriotex-main.tex}
-Boolean used to indicate if the bottom line of the annotation should be used as the control line for its initial vertical alignment.
-
-\macroname{\textbackslash gre@count@annotationvalign}{}{gregoriotex-main.tex}
-Count used to indicate which part of the annotation control line should be initially aligned with the top line of the staff.  Values: \texttt{0}, top; \texttt{1}, baseline; or \texttt{2}, bottom.
-
-\macroname{\textbackslash ifgre@forcehyphen}{}{gregoriotex-main.tex}
-Boolean used to indicate if hyphens should be forced between all syllables in a polysyllabic word.
-
-\macroname{\textbackslash ifgre@checklength}{}{gregoriotex-spaces.tex}
-Boolean used in \verb=\gresetdim= to indicate if we are attempting to set a rubber length.
-
-\macroname{\textbackslash ifgre@rubber}{}{gregoriotex-spaces.tex}
-Boolean used in \verb=\gre@changeonedimenfactor= to indicate if we are dealing with one of the distances which can accept a rubber length.
-
-\macroname{\textbackslash ifgre@stretch}{}{gregoriotex-spaces.tex}
-Boolean used in \verb=\gre@changeonedimenfactor= as we test for the presence of a stretch.
-
-\macroname{\textbackslash ifgre@shrink}{}{gregoriotex-spaces.tex}
-Boolean used in \verb=\gre@changeonedimenfactor= as we test for the presence of a shrink.
-
-\macroname{\textbackslash ifgre@translationcentering}{}{gregoriotex-main.tex}
-Boolean used to specify whether the translation text should be centered below its respective syllable.
-
-\macroname{\textbackslash ifgre@showlines}{}{gregoriotex-main.tex}
-Boolean used to specify whether the staff lines should be shown or not.
-
-\macroname{\textbackslash ifgre@hidepclines}{}{gregoriotex-signs.tex}
-Boolean used to specify whether the staff lines behind a punctum cavum should be hidden.
-
-\macroname{\textbackslash ifgre@hidealtlines}{}{gregoriotex-signs.tex}
-Boolean used to specify whether the staff lines behind an alteration should be hidden.
-
-\macroname{\textbackslash ifgre@hepisemabridge}{}{gregoriotex-signs.tex}
-Boolean used to specify whether adjacent horizontal episemata should be joined together.
-
-\macroname{\textbackslash ifgre@metapost@brace}{}{gregoriotex-signs.tex}
-Boolean used to specify whether round over-the-staff braces should be drawn by
-\MP{} as opposed to rendered via the score font.
-
-\macroname{\textbackslash ifgre@metapost@underbrace}{}{gregoriotex-signs.tex}
-Boolean used to specify whether round under-the-staff braces should be drawn by
-\MP{} as opposed to rendered via the score font.
-
-\macroname{\textbackslash ifgre@metapost@curlybrace}{}{gregoriotex-signs.tex}
-Boolean used to specify whether curly braces should be drawn by \MP{} as
-opposed to rendered via the score font.
-
-\macroname{\textbackslash ifgre@metapost@barbrace}{}{gregoriotex-signs.tex}
-Boolean used to specify whether divisio braces should be drawn by \MP{} as
-opposed to rendered via the score font.
-
-\macroname{\textbackslash gre@biginitial}{}{gregoriotex-main.tex}
-Count to track whether the initial is big (2-lines) or normal (1-line).
-
-\macroname{\textbackslash ifgre@boxing}{}{gregoriotex-syllable.tex}
-Boolean to track whether we’re placing the contents of syllable notes into their box or actually printing that box (helps prevent spurious spaces from occurring when the box is being filled but not printed).
-
-\macroname{\textbackslash ifgre@mustdotranslationcenterend}{}{gregoriotex-main.tex}
-Boolean to track whether we must do translation centering.
-
-\macroname{\textbackslash ifgre@beginningofscore}{}{gregoriotex-main.tex}
-Boolean to mark the first syllable of the score (set to true until we start work on the first syllable, false afterwards).
-
-\macroname{\textbackslash ifgre@endofscore}{}{gregoriotex-syllable.tex}
-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.
-
-\macroname{\textbackslash gre@attr@center}{}{gregoriotex-main.tex}
-A Lua\TeX\ attribute which indicates the type of translation centering.
-
-\macroname{\textbackslash gre@attr@glyph@id}{}{gregoriotex-main.tex}
-A Lua\TeX\ attribute which identifies the glyph we are at.  Used for dynamic line spacing.
-
-\macroname{\textbackslash gre@attr@glyph@top}{}{gregoriotex-main.tex}
-A Lua\TeX\ attribute which identifies the high point of the glyph.  Used for dynamic line spacing.
-
-\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=.
-
-\macroname{\textbackslash gre@insidediscretionary}{}{gregoriotex-signs.tex}
-Macro which indicates whether we are currently inside a discretionary (\texttt{1}) or not (\texttt{0}).  Cannot be converted to a \TeX\ boolean because it’s value needs to be passed to Lua.
-
-\macroname{\textbackslash ifgre@isonaline}{}{gregoriotex-syllable.tex}
-Boolean which indicates whether the current note is on a line or not (used to adjust the height of some symbols so they won’t print on a line).
-
-\macroname{\textbackslash ifgre@lastendswithmora}{}{gregoriotex-syllable.tex}
-Boolean which indicates if the previous syllable ends with a punctum mora (set glyph by glyph, do not rely on it when typesetting glyph).
-
-\macroname{\textbackslash ifgre@thisendswithmora}{}{gregoriotex-syllable.tex}
-Same as previous one but for current syllable.
-
-\macroname{\textbackslash ifgre@ledgerline@above}{}{gregoriotex-spaces.tex}
-Boolean which indicates whether the system should act as if there is a ledger line above the staff.
-
-\macroname{\textbackslash ifgre@ledgerline@below}{}{gregoriotex-spaces.tex}
-Boolean which indicates whether the system should act as if there is a ledger line below the staff.
-
-\macroname{\textbackslash gre@nlbstate}{}{gregoriotex-main.tex}
-Macro which indicates if we are in a no line break area due to translation centering (\texttt{1}), an explicit no line break designation in the gabc (\texttt{2}), or not at all (\texttt{0}).
-
-\macroname{\textbackslash gre@nlbinitialstate}{}{gregoriotex-main.tex}
-Macro to store \verb=\gre@nlbstate= as we initialize or end a no line break area so that we can manipulate said flag as part of the process.
-
-\macroname{\textbackslash ifgre@useledgerlineheuristic}{}{gregoriotex-spaces.tex}
-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.
-
-\macroname{\textbackslash gre@compilegabc}{}{gregoriotex-main.tex}
-Macro which specifies the default compilation behavior: never compile (\texttt{0}), auto compile (\texttt{1}), or always compile (\texttt{2}).
-
-\macroname{\textbackslash ifgre@nabcfontloaded}{}{gregoriotex-nabc.tex}
-Boolean which indicates whether the \texttt{nabc} font has been loaded.
-
-\macroname{\textbackslash gre@generate@pointandclick}{}{gregoriotex-syllable.tex}
-Count which indicates whether the point-and-click functionality should be implemented (\texttt{1}) or not (\texttt{0}).  Not a boolean because it needs to be readable by Lua.
-
-\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.
-
-\macroname{\textbackslash ifgre@breakintranslation}{}{gregoriotex-main.tex}
-Boolean which indicates if line breaks are allowed inside a translation.
-
-\macroname{\textbackslash ifgre@bolshiftsenabled}{}{gregoriotex-main.tex}
-Boolean which indicates if the left shift for the first syllables of lines is enabled.
-
-\macroname{\textbackslash ifgre@eolshiftsenabled}{}{gregoriotex-main.tex}
-Boolean which indicates if the left shift for the last syllables of lines is enabled.
-
-\macroname{\textbackslash ifgre@euouae@implies@nlba}{}{gregoriotex-main.tex}
-Boolean which indicates if line breaks are prohibited in an \texttt{euouae} area.
-
-\macroname{\textbackslash ifgre@in@euouae}{}{gregoriotex-main.tex}
-Boolean which indicates that we are in an \texttt{euouae} area.
-
-\macroname{\textbackslash ifgre@justifylastline}{}{gregoriotex-main.tex}
-Boolean which indicates that the last line of the score should be justified.
-
-\macroname{\textbackslash ifgre@showclef}{}{gregoriotex-main.tex}
-Boolean which indicates that the clef should be visible.
-
-\macroname{\textbackslash ifgre@forceemptyfirstsyllablehyphen}{}{gregoriotex-syllable.tex}
-Boolean which indicates that a hyphen after an empty first syllable should be forced.
-
-\macroname{\textbackslash ifgre@showhyphenafterthissyllable}{}{gregoriotex-syllable.tex}
-Boolean set and used by \verb=\GreSyllable= to decide if a hyphen should be shown after the syllable.
-
-\macroname{\textbackslash ifgre@possibleluahyphenafterthissyllable}{}{gregoriotex-syllable.tex}
-Boolean set by \verb=\GreSyllable= indicating if the Lua pass may add an hyphen after the syllable, used by \verb=\gre@calculate@eolshift= for protrusion calculation.
-
-\macroname{\textbackslash ifgre@thirdlineadjustmentnecessary}{}{gregoriotex-syllable.tex}
-Boolean which indicates that a third-line adjustment to staff line width is necessary.
-
-\macroname{\textbackslash ifgre@scale@stafflinefactor}{}{gregoriotex-spaces.tex}
-Boolean indicating whether the stafflinefactor should scale with changes of \texttt{grefactor}, or not.
-
-\macroname{\textbackslash ifgre@haslinethree}{}{gregoriotex-spaces.tex}
-Boolean indicating whether the staff has a third line.
-
-\macroname{\textbackslash ifgre@haslinefour}{}{gregoriotex-spaces.tex}
-Boolean indicating whether the staff has a fourth line.
-
-\macroname{\textbackslash ifgre@haslinefive}{}{gregoriotex-spaces.tex}
-Boolean indicating whether the staff has a fifth line.
-
-\macroname{\textbackslash gre@count@shiftaftermora}{}{gregoriotex-signs.tex}
-Count indicating when the presence of a punctum mora at the end of a syllable should affect the spacing with the next syllable.
-
-\macroname{\textbackslash gre@count@lastglyphiscavum}{}{gregoriotex-spaces.tex}
-Count indicating if the last glyph has a cavum (this includes flats, naturals, punctum cavum, etc.), when staff line shouldn't appear underneath this empty part. Can be:
-\begin{itemize}
-\item 0: previous and current glyph are not cavum
-\item 1: current glyph is (set when line is hidden, at the end of the glyph)
-\item 2: previous glyph is (set at beginning of glyph)
-\end{itemize}
-
-\macroname{\textbackslash ifgre@allowdeprecated}{}{gregoriotex.sty \textup{and} gregoriotex.tex}
-Boolean which controls whether deprecated functions raise a warning (true) or an error (false).
-
-\macroname{\textbackslash ifgre@newbarspacing}{}{gregoriotex-syllable.tex}
-Boolean which controls whether the new bar spacing algorithm is activated.
-
-\macroname{\textbackslash ifgre@disablehepisema}{}{gregoriotex-signs.tex}
-Boolean to disable the printing of horizontal episemata.
-
-\macroname{\textbackslash ifgre@disablemora}{}{gregoriotex-signs.tex}
-Boolean to disable the printing of punctum morae.
-
-\macroname{\textbackslash ifgre@disablevepisema}{}{gregoriotex-signs.tex}
-Boolean to disable the printing of vertical episemata.
-
-\macroname{\textbackslash ifgre@lastendswithmorasave}{}{gregoriotex-syllable.tex}
-Boolean for saving \verb=\ifgre@lastendswithmora= for later restoration.
-
-\macroname{\textbackslash gre@lasteuouaeindex}{}{gregoriotex-main.tex}
-Count which keeps track of the most recent euouae area.
-
-\macroname{\textbackslash ifgre@firstin@euouae}{}{gregoriotex-main.tex}
-Boolean indicating we're dealing with the first syllable in an euouae area.
-
-\macroname{\textbackslash ifgre@gabcforcecenters}{}{gregoriotex-syllable.tex}
-Boolean for determining whether forced centers in gabc are allowed to determine syllable alignment in \texttt{syllable} and \texttt{firstletter} alignment modes.
-
-\macroname{\textbackslash ifgre@forcedcentering}{}{gregoriotex-syllable.tex}
-Boolean indicating that the current syllable had a forced center in the gabc which is to be respected.
-
-\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}
-
-Boxes are used to store elements of the score before they are printed for the purposes of reusing them and/or measuring them in order to determine their appropriate placement.
-
-\macroname{\textbackslash gre@box@hep}{}{gregoriotex-chars.tex}
-Box for horizontal episemi.
-
-\macroname{\textbackslash gre@box@temp@width}{}{gregoriotex-main.tex}
-Box for holding an element in order to determine its width.
-
-\macroname{\textbackslash gre@box@initial}{}{gregoriotex-main.tex}
-Box which holds the initial of the score.
-
-\macroname{\textbackslash gre@box@annotation}{}{gregoriotex-main.tex}
-Box holding the annotation which goes above the initial.
-
-\macroname{\textbackslash gre@box@commentary}{}{gregoriotex-main.tex}
-Box holding the commentary which goes above the first staff line on the right.
-
-\macroname{\textbackslash gre@box@add}{}{gregoriotex-main.tex}
-Box used for the new line to be added to the box being built (used in multi-line commentaries and annotations).
-
-\macroname{\textbackslash gre@box@old}{}{gregoriotex-main.tex}
-Box used for the existing lines in the box being build when a new line is being added (used in multi-line commentaries and annotations).
-
-\macroname{\textbackslash gre@box@lines}{}{gregoriotex-main.tex}
-Box holding the staff lines.
-
-\macroname{\textbackslash gre@box@temp@sign}{}{gregoriotex-signs.tex}
-Box to hold a sign so we can measure it for placement.
-
-\macroname{\textbackslash gre@box@temp@clef}{}{gregoriotex-signs.tex}
-Box for holding (and measuring) the clef when stacking non-overlapping clefs.
-
-\macroname{\textbackslash gre@box@temp@cleftwo}{}{gregoriotex-signs.tex}
-Box for holding (and measuring) the secondary clef when stacking non-overlapping clefs.
-
-\macroname{\textbackslash gre@box@syllablenotes}{}{gregoriotex-syllable.tex}
-Box holding the notes associated with a syllable.
-
-\macroname{\textbackslash gre@box@syllabletext}{}{gregoriotex-syllable.tex}
-Box holding the text associated with a syllable.
-
-\macroname{\textbackslash gre@box@hep}{}{gregoriotex-chars.tex}
-Box holding the horizontal episema.
-
-
-\subsection{Protrusion factors}
-
-
-\macroname{\textbackslash gre@protrusionfactor@...}{}{gregoriotex-spaces.tex}
-Macros that store the protrusion factors created by
-\verb=\gresetprotrusionfactor=.
-
-
-\subsection{Distances}
-All of the distances listed in \nameref{distances} have an internal associated
-with them, of the form of \verb=\gre@space@*@*=, which stores the value of the
-distance (in string representation).  The first wildcard is either
-\texttt{skip} or \texttt{dimen} according to the distance type, while the
-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@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.
-
-\macroname{\textbackslash gre@dimen@currenttranslationheight}{}{gregoriotex-spaces.tex}
-Dimension representing the space for the translation beneath the text.
-
-\macroname{\textbackslash gre@dimen@stafflinewidth}{}{gregoriotex-spaces.tex}
-Dimension representing the width of a line of staff.  Can vary, for
-example, at the first line.
-
-\macroname{\textbackslash gre@dimen@linewidth}{}{gregoriotex-spaces.tex}
-Dimension representing the width of the score (including initial).
-
-\macroname{\textbackslash gre@dimen@additionalbottomspace}{}{gregoriotex-spaces.tex}
-Dimension representing extra space below the staff needed for low notes.
-
-\macroname{\textbackslash gre@dimen@additionaltopspace}{}{gregoriotex-spaces.tex}
-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
-the bottom of the text.
-
-\macroname{\textbackslash gre@dimen@textaligncenter}{}{gregoriotex-spaces.tex}
-Dimension representing the width from the beginning of the letters in
-a syllable to the middle of the middle letters.  Used for lining up
-neumes and syllables.
-
-\macroname{\textbackslash gre@dimen@additionalleftspace}{}{gregoriotex-spaces.tex}
-Dimension representing the additional space that has to be added to
-the localleftbox for a big initial (one taking two lines).
-
-\macroname{\textbackslash gre@dimen@initialwidth}{}{gregoriotex-spaces.tex}
-Dimension representing the width of the initial (and the space after).
-
-\macroname{\textbackslash gre@dimen@currentabovelinestextheight}{}{gregoriotex-spaces.tex}
-Dimension representing the space allocated above the lines for text.
-
-\macroname{\textbackslash gre@dimen@staffheight}{}{gregoriotex-spaces.tex}
-The total height of the staff including the width of the lines and the spaces between them.
-
-\macroname{\textbackslash gre@dimen@stafflinediff}{}{gregoriotex-spaces.tex}
-Distance representing the difference between the actual size of the staff lines and the ``standard’’ size.
-
-\macroname{\textbackslash gre@dimen@stafflineheight}{}{gregoriotex-spaces.tex}
-The height of the staff line.
-
-\macroname{\textbackslash gre@dimen@interstafflinespace}{}{gregoriotex-spaces.tex}
-The space between the lines.
-
-\macroname{\textbackslash gre@dimen@glyphraisevalue}{}{gregoriotex-spaces.tex}
-The value that a particular glyph must be raised to be set in the correct position.
-
-\macroname{\textbackslash gre@dimen@enddifference}{}{gregoriotex-spaces.tex}
-Distance from the end of the notes to the end of the text for the previous syllable.  Positive values when notes go further than text, negative in the other case.  This means that \verb=\kern\gre@dimen@enddifference= will take you from the end of the text to the end of the notes.
-
-For regular syllables and bar syllables using the old bar spacing algorithm this is calculated using \verb=\gre@calculate@enddifference=.  For bar syllables using the new bar spacing algorithm the calculation is \verb=-\wd\gre@box@syllabletext - \gre@dimen@begindifference + \wd\gre@box@syllablenotes=
-
-\macroname{\textbackslash gre@dimen@previousenddifference}{}{gregoriotex-spaces.tex}
-Stored value of enddifference prior to the current one.
-
-\macroname{\textbackslash gre@dimen@adjustedpreviousenddifference}{}{gregoriotex-spaces.tex}
-Stored value of enddifference prior to the current one after adjusting for the possibility of a punctum mora at the end of the last syllable (and the setting of \verb=\gre@count@aftermorashift=.
-
-\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.
-
-For regular syllables and bar syllables using the old bar spacing algorithm this is calculated as \verb=\gre@dimen@notesaligncenter - \gre@dimen@textaligncenter=.  For bar syllables using the new bar spacing algorithm the calculation is \verb= -\wd\gre@box@syllablenotes/2 - \gre@dimen@bar@shift - \gre@skip@bar@allocation - \gre@dimen@adjustedpreviousenddifference + \gre@skip@text@allocation + \gre@dimen@text@shift -\wd\gre@box@syllabletext/2=.
-
-\macroname{\textbackslash gre@dimen@lastglyphwidth}{}{gregoriotex-spaces.tex}
-The width of the last glyph.
-
-\macroname{\textbackslash gre@dimen@notesaligncenter}{}{gregoriotex-spaces.tex}
-Distance from beginning of notes to their point of alignment.
-
-\macroname{\textbackslash gre@dimen@temp@...}{}{gregoriotex-spaces.tex}
-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@eolshift}{}{gregoriotex-spaces.tex}
-The left kern that should appear before an end of line.
-
-\macroname{\textbackslash gre@dimen@bolshift}{}{gregoriotex-spaces.tex}
-The left kern that should appear at the beginning of line in case of a forced line break.
-
-\macroname{\textbackslash gre@dimen@bolextra}{}{gregoriotex-spaces.tex}
-An extra space that is added to \verb=\gre@dimen@bolshift= when the first glyph is a flat or a natural.
-
-\macroname{\textbackslash gre@dimen@annotationtrueraise}{}{gregoriotex-spaces.tex}
-The distance from the baseline of the initial to the baseline of the annotation.
-
-\macroname{\textbackslash gre@dimen@commentarytrueraise}{}{gregoriotex-spaces.tex}
-The distance from the baseline of the initial to the baseline of the commentary.
-
-\macroname{\textbackslash gre@skip@minTextDistance}{}{gregoriotex-spaces.tex}
-Minimum distance between text.
-
-\macroname{\textbackslash gre@skip@minNotesDistance}{}{gregoriotex-spaces.tex}
-Minimum distance between notes.
-
-\macroname{\textbackslash gre@dimen@curTextDistance}{}{gregoriotex-spaces.tex}
-Current distance between text.
-
-\macroname{\textbackslash gre@dimen@curNotesDistance}{}{gregoriotex-spaces.tex}
-Current distance between notes.
-
-\macroname{\textbackslash gre@skip@minShiftText}{}{gregoriotex-spaces.tex}
-Minimum shift required for the text.
-
-\macroname{\textbackslash gre@skip@minShiftNotes}{}{gregoriotex-spaces.tex}
-Minimum shift required for the notes.
-
-\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=.
-
-\macroname{\textbackslash gre@skip@syllablefinalskip}{}{gregoriotex-spaces.tex}
-The final distance to skip at the end of a syllable.
-
-\macroname{\textbackslash greslurheight}{}{gregoriotex-signs.tex}
-Stores the computed height of a variable-length slur.  The control sequence name
-does not have the \texttt{@} symbol because this dimension is used within \MP{}.
-
-\macroname{\textbackslash gre@dimen@bar@shift}{}{gregoriotex-spaces.tex}
-Shift of the bar away from its center position to account for the offset limits in the new bar spacing algorithm.
-
-\macroname{\textbackslash gre@dimen@text@shift}{}{gregoriotex-spaces.tex}
-Shift of the text away from its center position to account for the offset limits in the new bar spacing algorithm.
-
-\macroname{\textbackslash gre@skip@bar@allocation}{}{gregoriotex-spaces.tex}
-Space allocated to the bar in the new bar spacing algorithm.
-
-\macroname{\textbackslash gre@skip@bar@requirement}{}{gregoriotex-spaces.tex}
-Space required by the bar in the new bar spacing algorithm.
-
-\macroname{\textbackslash gre@skip@text@allocation}{}{gregoriotex-spaces.tex}
-Space allocated to the text in the new bar spacing algorithm.
-
-\macroname{\textbackslash gre@skip@text@requirement}{}{gregoriotex-spaces.tex}
-Space required by the text in the new bar spacing algorithm.
-
-\macroname{\textbackslash gre@skip@bar@lastskip}{}{gregoriotex-signs.tex}
-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.
-
-\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}
-These are the macros that Gregorio\TeX\ uses to manipulate the penalties in order to control line and page breaks within a score without affect the surrounding text.
-
-\macroname{\textbackslash gre@penalty}{\#1}{gregoriotex-signs.tex}
-Top level function that aliases \verb=\gre@truepenalty= or \verb=\gre@falsepenalty= according to whether penalties should be in play or not.
-
-\begin{argtable}
-	\#1 & integer & The penalty to be applied or gobbled\\
-\end{argtable}
-
-\macroname{\textbackslash gre@truepenalty}{\#1}{gregoriotex-signs.tex}
-Alias for \verb=\penalty=.
-
-\begin{argtable}
-	\#1 & integer & The penalty to be applied\\
-\end{argtable}
-
-\macroname{\textbackslash gre@falsepenalty}{\#1}{gregoriotex-signs.tex}
-Macro to gobble (suppress) its argument.
-
-\begin{argtable}
-	\#1 & integer & The penalty to be gobbled\\
-\end{argtable}
-
-\macroname{\textbackslash gre@cancelpenalties}{}{gregoriotex-spaces.tex}
-Macro called at the beginning of the score to swap text penalties for score penalties.
-
-\macroname{\textbackslash gre@restorepenalties}{}{gregoriotex-spaces.tex}
-Macro called at the end of the score to restore the text penalties.
-
-\macroname{\textbackslash gre@brokenpenaltysave}{}{gregoriotex-spaces.tex}
-A place to save the current value of the broken penalty so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@clubpenaltysave}{}{gregoriotex-spaces.tex}
-A place to save the current value of the club penalty so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@widowpenaltysave}{}{gregoriotex-spaces.tex}
-A place to save the current value of the widow penalty so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@emergencystretchsave}{}{gregoriotex-spaces.tex}
-A place to save the current value of the emergency stretch so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@endafterbarpenaltysave}{}{gregoriotex-main.tex}
-A place to save the current value of the end after bar penalty so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@endafterbaraltpenaltysave}{}{gregoriotex-main.tex}
-A place to save the current value of the alternate end after bar penalty so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@endofelementpenaltysave}{}{gregoriotex-main.tex}
-A place to save the current value of the end of element penalty so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@endofsyllablepenaltysave}{}{gregoriotex-main.tex}
-A place to save the current value of the end of syllable penalty so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@endofwordpenaltysave}{}{gregoriotex-main.tex}
-A place to save the current value of the end of word penalty so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@exhyphenpenaltysave}{}{gregoriotex-spaces.tex}
-A place to save the current value of the ex hyphen penalty so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@hyphenpenaltysave}{}{gregoriotex-main.tex \textup{and} gregoriotex-spaces.tex}
-A place to save the current value of the hyphen penalty so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@nobreakpenaltysave}{}{gregoriotex-main.tex}
-A place to save the current value of the no break penalty so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@doublehyphendemeritssave}{}{gregoriotex-spaces.tex}
-A place to save the current value of the double hyphen demerits so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@finalhyphendemeritssave}{}{gregoriotex-spaces.tex}
-A place to save the current value of the final hyphen demerits so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@loosenesssave}{}{gregoriotex-spaces.tex}
-A place to save the current value of the looseness so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@tolerancesave}{}{gregoriotex-spaces.tex}
-A place to save the current value of the tolerance so that we can change it temporarily and then restore it later.
-
-\macroname{\textbackslash gre@pretolerancesave}{}{gregoriotex-spaces.tex}
-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.
-
-\macroname{\textbackslash MessageBreak}{}{gregoriotex.tex}
-Creates a line break in typeout, warning, bug, and error messages.  Copied from \LaTeX\ source.
-
-\macroname{\textbackslash protect}{}{gregoriotex.tex}
-Prints the name of the macro, rather than its contents in typeout, warning, bug, and error messages.  Copied from \LaTeX\ source.
-
-\macroname{\textbackslash f@size}{}{gregoriotex.tex}
-Macro which stores the current font size.
-
-
-\section{Special arguments}
-
-These arguments are used by multiple functions and take a lot of space
-to describe so we describe them once here and refer to this section
-rather than have multiple definitions.
-
-\subsection{Note Alignment Type}\label{notesalign}
-\rowcolors{1}{lightgray}{lightgray}
-\begin{tabulary}{\textwidth}{cL}
-	\multicolumn{2}{c}{Integer with the following possibilities:} \\
-	\hline
-	\texttt{0} & one-note glyph or more than two notes glyph except porrectus : here we must put the aligncenter in the middle of the first note\\
-	\texttt{1} & two notes glyph (podatus is considered as a one-note glyph) : here we put the aligncenter in the middle of the glyph\\
-	\texttt{2} & porrectus : has a special align center\\
-	\texttt{3} & initio-debilis : same as 1 but the first note is much smaller\\
-	\texttt{4} & case of a glyph starting with a quilisma\\
-	\texttt{5} & case of a glyph starting with an oriscus\\
-	\texttt{6} & case of a punctum inclinatum\\
-	\texttt{7} & case of a stropha\\
-	\texttt{8} & flexus with an ambitus of one\\
-	\texttt{9} & flexus deminutus\\
-	\texttt{10} & virgula\\
-	\texttt{11} & divisio minima\\
-	\texttt{12} & divisio minor\\
-	\texttt{13} & divisio maior\\
-	\texttt{14} & dominican bar\\
-	\texttt{15} & divisio finalis\\
-	\texttt{16} & no note
- \end{tabulary}
-
-\subsection{Note Offset Specifier}\label{NoteOffset}
-\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[FinalPunctum] Last note, which is a standard punctum (works with pes).
-	\item[FinalDeminutus] Same, but the last note is a deminutus.
-	\item[PenultBeforePunctumWide] The note before the last note, which is a standard punctum.
-	\item[PenultBeforeDeminutus] Idem, but the note is the note preceding a deminutus.
-	\item[AntepenultBeforePunctum] The note before the note before the last note (for porrectus flexus).
-	\item[AntepenultBeforeDeminutus] Idem, but when the two last notes are a deminutus.
-	\item[InitialPunctum] The first note, if it is a standard punctum.
-	\item[InitioDebilis] The first note, if it is an initio debilis.
-	\item[PorrNonAuctusInitialWide] first note of a non-auctus porrectus with a second ambitus of at least two.
-	\item[PorrNonAuctusInitialOne] first note of a non-auctus porrectus with a second ambitus of one
-	\item[PorrAuctusInitialAny] first note of an auctus porrectus, regardless of second ambitus
-	\item[FinalInclinatum] punctum inclinatum as last note
-	\item[FinalInclinatumDeminutus] punctum inclinatum deminutus as last note
-	\item[FinalStropha] stropha as last note
-	\item[FinalQuilisma] quilisma as last note
-	\item[FinalOriscus] oriscus as last note
-	\item[PenultBeforePunctumOne] second-to-last note, with a second ambitus of one, when last note is a standard punctum (like the second note of ghg)
-	\item[FinalUpperPunctum] “upper smaller punctum” as last note (concerning simple podatus, podatus, and torculus resupinus)
-	\item[InitialOriscus] oriscus as first note, disconnected from next note
-	\item[InitialQuilisma] quilisma as first note, disconnected from next note
-	\item[TorcResNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with a punctum, with a first and second ambitus of at least two
-	\item[TorcResNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with a punctum, with a first ambitus of one and a second ambitus of at least two
-	\item[TorcResDebilisNonAuctusSecondAnyWide] second note of a non-auctus torculus resupinus initio debilis with any first ambitus and a second ambitus of at least two
-	\item[FinalLineaPunctum] linea punctum (cavum) as last note
-	\item[BarStandard] standard bar
-	\item[BarVirgula] virgula
-	\item[BarDivisioFinalis] divisio finalis
-	\item[TorcResQuilismaNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with a quilisma, with a first and second ambitus of at least two
-	\item[TorcResOriscusNonAuctusSecondWideWide] second note of a non-auctus torculus resupinus starting with an oriscus, with a first and second ambitus of at least two
-	\item[TorcResQuilismaNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with a quilisma, with a first ambitus of one and and second ambitus of at least two
-	\item[TorcResOriscusNonAuctusSecondOneWide] second note of a non-auctus torculus resupinus starting with an oriscus, with a first ambitus of one and and second ambitus of at least two
-	\item[TorcResNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with a punctum, with a first ambitus of at least two and a second ambitus of one
-	\item[TorcResDebilisNonAuctusSecondAnyOne] second note of a non-auctus torculus resupinus initio debilis with any first ambitus and a second ambitus of one
-	\item[TorcResQuilismaNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with a quilisma, with a first ambitus of at least two and a second ambitus of one
-	\item[TorcResOriscusNonAuctusSecondWideOne] second note of a non-auctus torculus resupinus starting with an oriscus, with a first ambitus of at least two and a second ambitus of one
-	\item[TorcResNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with a punctum, with a first and second ambitus of one
-	\item[TorcResQuilismaNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with a quilisma, with a first and second ambitus of one
-	\item[TorcResOriscusNonAuctusSecondOneOne] second note of a non-auctus torculus resupinus starting with an oriscus, with a first and second ambitus of one
-	\item[TorcResAuctusSecondWideAny] second note of an auctus torculus resupinus starting with a punctum, with a first ambitus of at least two and any second ambitus
-	\item[TorcResDebilisAuctusSecondAnyAny] second note of an auctus torculus resupinus initio debilis with any first and second ambitus
-	\item[TorcResQuilismaAuctusSecondWideAny] second note of an auctus torculus resupinus starting with a quilisma, with a first ambitus of at least two and any second ambitus
-	\item[TorcResOriscusAuctusSecondWideAny] second note of an auctus torculus resupinus starting with an oriscus, with a first ambitus of at least two and any second ambitus
-	\item[TorcResAuctusSecondOneAny] second note of an auctus torculus resupinus starting with a punctum, with a first ambitus of one and any second ambitus
-	\item[TorcResQuilismaAuctusSecondOneAny] second note of an auctus torculus resupinus starting with a quilisma, with a first ambitus of one and any second ambitus
-	\item[TorcResOriscusAuctusSecondOneAny] second note of an auctus torculus resupinus starting with an oriscus, with a first ambitus of one and any second ambitus
-	\item[ConnectedPenultBeforePunctumWide] second-to-last note connected to prior note, with a second ambitus of at least two, when last note is a standard punctum (like the second note of \textit{gig})
-	\item[ConnectedPenultBeforePunctumOne] second-to-last note connected to prior note, with a second ambitus of one, when last note is a standard punctum (like the second note of \textit{gih})
-	\item[InitialConnectedPunctum] standard punctum as first note, connected to next higher note
-	\item[InitialConnectedVirga] “virga” as first note, connected to next lower note
-	\item[InitialConnectedQuilisma] quilisma as first note, connected to next higher note
-	\item[InitialConnectedOriscus] oriscus as first note, connected to next higher note
-	\item[FinalConnectedPunctum] punctum as last note, connected to prior higher note
-	\item[FinalConnectedAuctus] auctus as last note, connected to prior lower note
-	\item[FinalVirgaAuctus] virga aucta as last note
-	\item[FinalConnectedVirga] “virga” as last note, connected to prior lower note
-	\item[InitialVirga] “virga” as first note, disconnected from next note
-\end{description}
-\end{shaded*}
-
-\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”
-%%% End:
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex b/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex
deleted file mode 100644
index 0054aa102b6..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex
+++ /dev/null
@@ -1,511 +0,0 @@
-% !TEX root = GregorioRef.tex
-% !TEX program = LuaLaTeX+se
-%
-% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
-%
-% This file is part of Gregorio.
-%
-% Gregorio is free software: you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version.
-%
-% Gregorio is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
-%
-\section{The GABC File}
-
-gabc is a simple notation based exclusively on ASCII characters that
-enables the user to describe Gregorian chant scores. The name
-\textit{gabc} was given in reference to the
-\href{http://www.walshaw.plus.com/abc/}{ABC} notation for modern
-music.
-
-The gabc notation was developed by a monk of the
-\href{http://www.barroux.org}{Abbey of Sainte Madeleine du Barroux}
-and has been improved by Élie Roux and by other monks of the same
-abbey to produce the best possible notation.
-
-This section will cover the elements of a gabc file.
-
-\subsection{File Structure}
-Files written in gabc have the extension \texttt{.gabc} and have the
-following structure:
-
-\begin{lstlisting}[autogobble]
-name: incipit;
-gabc-copyright: copyright on this gabc file;
-score-copyright: copyright on the source score;
-author: if known;
-language: latin;
-mode: 6;
-mode-modifier: t.;
-annotation: IN.;
-annotation: 6;
-%%
-(clef) text(notes)
-\end{lstlisting}
-
-\subsection{Headers}
-
-The headers, such as \texttt{name: incipit;}, above, each have a name
-before the colon and a value, between the colon and the semicolon.  The
-header name is composed of ASCII letters and numbers, optionally separated
-by dashes.  If you wish to write a value over several lines, omit the
-semicolon at the end of the first line, and end the header value with
-\texttt{;;} (two semicolons).
-
-Some headers have special meaning to Gregorio:
-
-\begin{description}
-\item[name] This is the name of the piece, in almost all cases the
-	incipit, the first few words. In the case of the mass ordinary, the
-	form as \texttt{Kyrie X Alme Pater} or \texttt{Sanctus XI} is
-	recommended where appropriate. \textbf{This field is required.}
-\item[gabc-copyright] This license is the copyright notice (in English) of the gabc file, as chosen by the person named in the transcriber field. As well as the notice itself, it may include a brief description of the license, such as public domain, CC-by-sa; for a list of commonly found open source licenses and exceptions, please see \url{https://spdx.org/licenses/}.  A separate text file will be necessary for the complete legal license. For the legal issues about Gregorian chant scores, please see \url{http://gregorio-project.github.io/legalissues}. An example of this field would be:
-	\begin{lstlisting}[autogobble]
-		gabc-copyright: CC0-1.0 by Elie Roux, 2009
-		<http://creativecommons.org/publicdomain/zero/1.0/>;;
-	\end{lstlisting}
-\item[score-copyright] This license is the copyright notice (in English) of the score itself from which the gabc was transcribed. Like the \texttt{gabc-copyright}, there may be a brief description of the license too. In unclear or complex cases it may be omitted; it is most suitable for use when the transcriber is the copyright holder and licensor of the score as well. One again, reading the page on legal issues (linked above) is recommended. An example of this field would be:
-	\begin{lstlisting}[autogobble]
-		score-copyright: (C) Abbaye de Solesmes, 1934;
-	\end{lstlisting}
-\item[author] The author of the piece, if known; of course, the author of most traditional chant is not known.
-\item[language] The language of the lyrics.
-\item[oriscus-orientation] If \texttt{legacy}, the orientation of an unconnected oriscus must be set manually.
-\item[mode] The mode of the piece. This should normally be an arabic
-	number between 1 and 8, but may be any text required for unusual
-	cases. The mode number will be converted to roman numerals and
-	placed above the initial unless one of the following conditions are
-	met:
-	\begin{itemize}
-	\item There is a \verb=\greannotation= defined 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
-	\TeX\ code to typeset after the mode, if the mode is typeset.  If the mode
-	is not typeset, the mode-modifier will also not be typeset.
-\item[mode-differentia] The mode or tone differentia of the piece.  Typically,
-	this expresses the variant of the psalm tone to use for the piece.  This may
-	be any \TeX\ code to typeset after the mode-modifier, if the mode is typeset.
-	If the mode is not typeset, the mode-differentia will also not be typeset.
-\item[annotation] The annotation is the text to appear above the
-	initial letter. Usually this is an abbreviation of the office-part
-	in the upper line, and an indication of the mode (and differentia
-	for antiphons) in the lower. Either one or two annotation fields may
-	be used; if two are used, the first is the upper line, the second
-	the lower. Example:
-	\begin{lstlisting}[autogobble]
-		annotation:Ad Magnif.;
-		annotation:VIII G;
-	\end{lstlisting}
-	Full \TeX\ markup is accepted:
-	\begin{lstlisting}[autogobble]
-		annotation:{\color{red}Ad Magnif.};
-		annotation:{\color{red}VIII G};
-	\end{lstlisting}
-	If the user already defined annotation(s) in the main \TeX\ file via
-	\verb=\greannotation= then the \texttt{annotation} header field will not
-	overwrite that definition.
-\end{description}
-
-Although gregorio ascribes no special meaning to them, other suggested headers are:
-
-\begin{description}
-\item[office-part] The office-part is the category of chant (in Latin), according to its liturgical rôle. Examples are: antiphona, hymnus, responsorium brevium, responsorium prolixum, introitus, graduale, tractus, offertorium, communio, kyrie, gloria, credo, sanctus, benedictus, agnus dei.
-\item[occasion] The occasion is the liturgical occasion, in Latin. For example, Dominica II Adventus, Commune doctorum, Feria secunda.
-\item[meter] For hymns and anything else with repetitive stanzas, the meter, the numbers of syllables in each line of a stanza. For example, 8.8.8.8 for typical Ambrosian-style hymns: 4 lines each of 8 syllables.
-\item[commentary] This is intended for notes about the source of the text, such as references to the Bible.
-\item[arranger] The name of a modern arranger, when a traditional chant melody has been adapted for new words, or when a manuscript is transcribed into square notation. This may be a corporate name, like Solesmes.
-\item[date] The date of composition, or the date of earliest attestation. With most traditional chant, this will only be approximate; e.g. XI. s. for eleventh century. The convention is to put it with the latin style, like the previous examples (capital letters, roman numerals, s for seculum and the dots).
-\item[manuscript] For transcriptions direct from a manuscript, the text normally used to identify the manuscript, for example Montpellier H.159
-\item[manuscript-reference] A unique reference for the piece, according to some well-known system. For example, the reference beginning cao in the Cantus database of office chants. If the reference is unclear as to which system it uses, it should be prefixed by the name of the system. Note that this should be a reference identifying the piece, not the manuscript as a whole; anything identifying the manuscript as a whole should be put in the manuscript field.
-\item[manuscript-storage-place] For transcriptions direct from a manuscript, where the manuscript is held; e.g. Bibliothèque Nationale, Paris.
-\item[book] For transcriptions from a modern book (such as Solesmes editions; modern goes back at least to the 19th century revival), the name of the book; e.g. Liber Usualis.
-\item[transcriber] The name of the transcriber into gabc.
-\item[transcription-date] The date the gabc was written, with the following convention yyyymmdd, like 20090129 for January the 29th 2009.
-\item[user-notes] This may contain any text in addition to the other headers -- any notes the transcriber may wish. However, it is recommended to use the specific header fields where they are suitable, so that it is easier to find particular information.
-\end{description}
-
-\subsubsection{Mode Headers}
-
-The three mode headers described above (\texttt{mode}, \texttt{mode-modifier},
-and \texttt{mode-differentia}) will be typeset above the initial if neither
-the \texttt{annotation} gabc header nor the \verb=\greannotation= \TeX{}
-command is used.
-
-The mode annotation will look like
-\writemode{mode}{\thinspace mode-modifier}{\thinspace mode-differentia}.
-
-The \texttt{mode} header is typically a number that will be typeset as a
-Roman numeral using the \texttt{modeline} style.  Therefore, if the first
-character of \texttt{mode} is a number from one (\texttt{1}) through eight
-(\texttt{8}), that number will be converted according to the
-\verb=\gresetmodenumbersystem= setting.  However, there are other modes,
-so all other parts of \texttt{mode} will be typeset directly.  If the
-\texttt{mode} header is omitted, none of the other mode headers will be
-typeset.
-
-The \texttt{mode-modifier} header is some text (typeset in the
-\texttt{modemodifier} style) that appears after \texttt{mode}, but before
-\texttt{mode-differentia}.  This is meant for an extra notation that
-indicates something without altering the mode itself.  An example would be
-\writemode{}{t.}{} to indicate a transposed mode.  If the
-\texttt{mode-modifier} header starts with punctuation, there will be no space
-before it, otherwise there will be a \verb=\thinspace= before it.
-
-The \texttt{mode-differentia} header is some text (typeset in the
-\texttt{modedifferentia} style) that appears after \texttt{mode-modifier}.
-This is meant for indicating the psalm tone ending to use for the paired
-psalm tone.  If the \texttt{mode-differentia} header starts with punctuation,
-there will be no space before it, otherwise there will be a \verb=\thinspace=
-before it.
-
-Some examples:
-
-\begin{tabularx}{\textwidth}{l|l|l|X}
-	\texttt{mode} & \texttt{mode-modifier} & \texttt{mode-differentia} & Result \\
-	\hline
-	\verb=6= & & & \writemode{\romannumeral 6}{}{} \\
-	\verb=4A= & & & \writemode{\romannumeral 4\relax A}{}{} \\
-	\verb=4a= & & & \writemode{\romannumeral 4\relax a}{}{} \\
-	\verb=2*= & \verb=t.= & & \writemode{\romannumeral 2*}{\thinspace t.}{} \\
-	\verb=5= & \verb=,\thinspace t.= & & \writemode{\romannumeral 5}{,\thinspace t.}{} \\
-	\verb=7= & & {\scriptsize\verb=c\raise0.5ex\hbox{\small2}=} & \writemode{\romannumeral 7}{}{\thinspace c\raise0.5ex\hbox{\small2}} \\
-	\verb=8= & \verb=-t.= & \verb=G*= & \writemode{\romannumeral 8}{-t.}{\thinspace G*} \\
-	{\scriptsize\verb=t. irregularis=} & & & \writemode{t. irregularis}{}{} \\
-\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
-primitive neumes.  These primitives are:
-
-\begin{tabularx}{\textwidth}{l|l|X}
-	Gabc & Description & Rules \\
-	\hline
-	\texttt{g} & punctum & fuses from higher or lower notes, and can fuse to higher or lower notes \\
-	\texttt{go} & oriscus & may only fuse in the direction it was fused from \\
-	\texttt{gO} & oriscus scapus & at the start only, next note must be higher to fuse \\
-	\texttt{gw} & quilisma & does not fuse from anything, and only fuses to a higher note \\
-	\texttt{gV} & virga reversa & at the start only, next note must be lower to fuse \\
-	\texttt{gf} & flexus & if not at the end, must be followed by a higher note to fuse \\
-	\texttt{gh} & pes & at the end only; in non-liquescent form, the previous note must be lower to fuse \\
-	\texttt{gfg} & porrectus & at the end only, previous note must be lower to fuse \\
-\end{tabularx}
-
-Placing the \texttt{@} character between two notes will attempt to use the above
-rules to fuse the notes together.  If a shape that is not fusable is used,
-Gregorio will typically fall back on the non-fusable form, but in some cases
-will result in a syntax error.
-
-Placing the \texttt{@} character before a primitive that would get a stem will
-suppress the stem.  Given the above list of primitives, this means the flexus
-and the porrectus.
-
-Here are some examples of fusion:
-
-\gresetinitiallines{0}\gresetlyriccentering{firstletter}%
-\gabcsnippet{
-(c3) h@iw@ji@j@ih<sp>~</sp>(h@iw@ji@j@ih~)
-(;) d@eo@fd(d@eo@fd)
-(;) IJ@kh(IJ@kh)
-}
-
-As a convenience, a sequence of notes enclosed within \texttt{@[} and
-\texttt{]} will be fused automatically based on an algorithm that breaks up
-the notes into the above primitives.  Using the same examples as before:
-
-\gabcsnippet{
-(c3) @<v>[</v>hiwjijih<sp>~</sp><v>]</v>(@[hiwjijih~])
-(;) @<v>[</v>deofd<v>]</v>(@[deofd])
-(;) @<v>[</v>IJkh<v>]</v>(@[IJkh])
-}
-
-\subsection{Stem length for the bottom lines}
-
-Gregorio will determine the length of the stem for most neumes.
-Some manual input might be needed for notes on the bottom staff
-line (\textit{d}). Most of the time they will take a short form:
-
-\gabcsnippet{(c3) dv(dv) ed(ed) ed~(ed~) dcd(dcd)}
-
-But when a ledger line is drawn below these notes, they should take a long
-form. The problem is that many cases are ambiguous: for instance if a note
-is close to a ledger line, one may want to make it long, others may not.
-To solve this problem, you can add \texttt{[ll:0]} to the note carrying the stem
-to get its short form, or \texttt{[ll:1]} to force its long form.
-
-% This snippet makes LuaTeX segfault!
-%\gabcsnippet{
-%  (c3) dv<v>[</v>ll:1<v>]</v>(dv[ll:1]) ed<v>[</v>ll:1<v>]</v>(ed[ll:1])
-%       ed<sp>~</sp><v>[</v>ll:1<v>]</v>(ed~[ll:1]) dcd<v>[</v>ll:1<v>]</v>(dcd[ll:1] Z)
-%       b!dv<v>[</v>ll:0<v>]</v>(b!dv[ll:0]) b!ed<v>[</v>ll:0<v>]</v>(b!ed[ll:0])
-%       b!ed<sp>~</sp><v>[</v>ll:0<v>]</v>(b!ed~[ll:0]) dcd<v>[</v>ll:0<v>]</v>!b(dcd[ll:0]!b)
-%  }
-
-\subsection{Custom Ledger Lines}
-
-To specify a custom ledger line, use
-\texttt{[oll:}\textit{left}\texttt{;}\textit{right}\texttt{]} to create an
-over-the-staff ledger line with specified lengths to the left and right of the
-point where it is introduced.  If \textit{left} is \texttt{0}, the ledger line
-will start at the introduction point.  If \textit{left} is \texttt{1}, the
-ledger line will start at the \textit{additionaallineswidth} distance to the
-left of the introduction point.  Otherwise, the line will start at the
-\textit{left} distance (taken to be an explicit length, with \TeX{} units
-required) to the left of the introduction point.  When using this form,
-\texttt{right} must be an explicit length to the right of the introduction
-point at which to end the line.
-
-Alternately, use
-\texttt{[oll:}\textit{left}\texttt{\{}\textit{right}\texttt{]} to specify the
-start of an over-the-staff ledger line, followed by \texttt{[oll:\}]} at some
-point later to specify its end.  When using this form, \textit{left} has the
-same meaning as before.  However, \textit{right} takes on similar values as
-\textit{left}, which are instead applied to the right of the specified
-endpoint.
-
-Use \texttt{ull} instead of \texttt{oll} (with either form) to create an
-under-the-staff ledger line.
-
-When using this feature with fusion, you will not be able to start or end a
-ledger line in the middle of two-note primitive shapes.  To work around this,
-either adjust the parameters of the ledger line or use manual fusion to break
-up those two notes.
-
-\subsection{Simple Slurs}
-
-To specify a simple slur, use
-\texttt{[oslur:}\textit{shift}\texttt{;}\textit{width}\texttt{,}\textit{height}\texttt{]}
-to create an over-the-notes slur with the specified \textit{width} and
-\textit{height}.  If \textit{shift} is \texttt{0}, the slur will start on the
-right side of the note to which it is atteched.  If \textit{shift} is
-\texttt{1}, the slur will start one punctum's width to the left of the right
-side of the note to which it is attached.  If \textit{shift} is \texttt{2},
-the slur will start one-half punctum's width to the left of the right side of
-the note to which it is attached.
-
-Alternately, use
-\texttt{[oslur:}\textit{shift}\texttt{\{]} to specify the start of an
-over-the-notes slur, followed by \texttt{[oslur:}\textit{shift}\texttt{\}]} at
-some point later to specify its end.  When using this form, \textit{shift} has
-the same meaning as before, but applies to both ends of the slur.
-
-Use \texttt{uslur} instead of \texttt{oslur} (with either form) to create an
-under-the-staff slur.
-
-\subsection{Horizontal episema placement for very high and low notes}
-
-Gregorio places horizontal episema under c and above k (or the not above upper line when
-staff does not have exactly 4 lines) closer to the notes when no ledger line is present.
-The heuristics used by Gregorio are not perfect so it may be necessary to make
-the presence or absence of ledger line explicit for horizontal episema placement.
-This is done in the exact same way as for stem length: place \texttt{[ll:0]} or
-\texttt{[ll:1]} on the note carrying the episema, to force gregorio to consider the
-absence or presence of a ledger line in episema placement.
-
-\subsection{Horizontal Episema Tuning}
-
-The horizontal episema position within the space can be adjusted should the
-defaults not be satisfactory.
-
-There are five tunable dimensions:
-
-\begin{tabularx}{\textwidth}{l|X}
-	Dimension & Description \\
-	\hline
-	\texttt{overhepisemalowshift} & The shift for positioning a horizontal episema that is over a note in a low position in the space\\
-	\texttt{overhepisemahighhift} & The shift for positioning a horizontal episema that is over a note in a high position in the space\\
-	\texttt{underhepisemalowshift} & The shift for positioning a horizontal episema that is under a note in a low position in the space\\
-	\texttt{underhepisemahighhift} & The shift for positioning a horizontal episema that is under a note in a high position in the space\\
-	\texttt{hepisemamiddleshift} & The shift for centering the horizontal episema in the middle of a space\\
-\end{tabularx}
-
-In addition, gabc allows you to adjust the positioning of a given episema by
-appending \texttt{[oh:\textit{p}]} (for the episema over the note) or
-\texttt{[uh:\textit{p}]} (for the episema under the note).  Here,
-\texttt{\textit{p}} is an optional position specifier followed by an optional
-nudge.  However at least one or the other must be specified.
-
-The position specifier allows you to select which of the five tunable
-dimensions will be used for the base position:
-
-\begin{tabularx}{\textwidth}{l|X}
-	Specifier & Base shift \\
-	\hline
-	\textit{omitted} & Use the default shift based on the position of the episema relative to the note\\
-	\texttt{m} & Use \texttt{hepisemamiddleshift}.\\
-	\texttt{l} & Use \texttt{overhepisemalowshift} or \texttt{underhepisemalowshift} depending on whether the episema is over or under the note.\\
-	\texttt{h} & Use \texttt{overhepisemahighshift} or \texttt{underhepisemahighshift} depending on whether the episema is over or under the note.\\
-	\texttt{ol} & Use \texttt{overhepisemalowshift}.\\
-	\texttt{oh} & Use \texttt{overhepisemahighshift}.\\
-	\texttt{ul} & Use \texttt{underhepisemalowshift}.\\
-	\texttt{uh} & Use \texttt{underhepisemahighshift}.\\
-\end{tabularx}
-
-The nudge is a \TeX{} dimension specification (number and units) that starts
-with \texttt{+} for a nudge upwards or \texttt{-} for a nudge downwards from
-base position selected by the position speciifer.  If omitted, the episema will
-be drawn at the base position.
-
-In addition, gabc also allows you to specify that a block of notes---possibly
-separated with spaces and in different syllables--should be considered a single
-unit when it comes to positioning the horizontal episema.  To do this, put
-\texttt{[oh:\textit{p}\{]} (for the episema over the note) or
-\texttt{[uh:\textit{p}\{]} (for the episema under the note) before the first
-note of the block and the corresponding \texttt{[oh\}]} or \texttt{[uh\}]}
-after the last note of the block.  When using this syntax, \texttt{\textit{p}}
-is the position specifier as before, but is entirely optional, and when
-completely omitted, allows the \texttt{:} to also be omitted.
-
-\subsection{Lyric Centering}
-
-Gregorio centers the text of each syllable around the first note of each
-syllable.  There are three basic modes, selected with the command \verb=\gresetlyriccentering{<mode>}=:
-
-\begin{description}
-\item[syllable] the entire syllable is centered around the first note
-\item[firstletter] the first letter of the syllable is centered around the first note
-\item[vowel] the vowel sound of the syllable is centered around the first note
-\end{description}
-
-The default is \texttt{vowel}, being common in most Gregorian chant
-books with text in Latin.
-
-All modes allow you to force the centering with curly brackets,
-for example \verb=a{b}c= will center the notes around \texttt{b}.
-
-\subsubsection{Vowel detection}
-
-The default rules built into Gregorio for \texttt{vowel} mode are for
-Ecclesiatical Latin and work fairly well (though not perfectly) for
-other languages (especially Romance languages).  However, Gregorio
-provides a gabc \texttt{language} header which allows the language of
-the lyrics to be set. The default is Latin.
-
-Special characters (input with \texttt{<sp>}) or verbatim text (\texttt{<v>})
-count as consonants, so you have to force centering around them, for example
-\verb=gr{<sp>'ae</sp>}=. If an elision (input with \texttt{<e>}) is present in
-the syllable, Gregorio will consider it as consonant too.
-
-If no vowel is found, the notes are centered around the whole syllable.
-
-\subsubsection{Vowel file}
-
-When run, Gregorio will look for a file named
-\texttt{gregorio-vowels.dat} in your working directory or amongst the
-GregorioTeX files.  If it finds the language requested by the header (matched in a
-\emph{case-sensitive} fashion) in one of these files (henceforth called
-vowel files), Gregorio will use the rules contained within for vowel
-centering.  If it cannot find the requested language in any of the vowel
-files or is unable to parse the rules, Gregorio will fall back on the
-Latin rules.  If multiple vowel files have the desired language,
-Gregorio will use the first matching language section in the first
-matching file, according to Kpathsea order.  You may wish to enable
-verbose output (by passing the \texttt{-v} argument to
-\texttt{gregorio}), if there is a problem, for more information.
-
-The vowel file is a list of statements, each starting with a keyword and
-ending with a semicolon (\texttt{;}).  Multiple statements with the same
-keyword are allowed, and all will apply.  Comments start with a hash
-symbol (\texttt{\#}) and end at the end of the line.
-
-In general, Gregorio does no case folding, so the keywords and language
-names are case-sensitive and both upper- and lower-case characters
-should be listed after the keywords if they should both be considered in
-their given categories.
-
-The keywords are:
-
-\begin{description}
-
-\item[alias]
-
-The \texttt{alias} keyword indicates that a given name is an alias for a
-given language.  The \texttt{alias} keyword must be followed by the name
-of the alias (enclosed in square brackets), the \texttt{to} keyword, the
-name of the target language (enclosed in square brackets), and a
-semicolon.  Since gregorio reads the vowel files sequentially, aliases
-should precede the language they are aliasing, for best performance.
-
-\item[language]
-
-The \texttt{language} keyword indicates that the rules which follow are
-for the specified language.  It must be followed by the language name,
-enclosed in square brackets, and a semicolon.  The language specified
-applies until the next language statement.
-
-\item[vowel]
-
-The \texttt{vowel} keyword indicates that the characters which follow,
-until the next semicolon, should be considered vowels.
-
-\item[prefix]
-
-The \texttt{prefix} keyword lists strings of characters which end in a
-vowel, but when followed by a sequence of vowels, \emph{should not} be
-considered part of the vowel sound.  These strings follow the keyword
-and must be separated by space and end with a semicolon.  Examples of
-prefixes include \emph{i} and \emph{u} in Latin and \emph{qu} in
-English.
-
-\item[suffix]
-
-The \texttt{suffix} keyword lists strings of characters which don't
-start with a vowel, but when appearing after a sequence of vowels,
-\emph{should} be considered part of the vowel sound.  These strings
-follow the keyword and must be separated by space and end with a
-semicolon.  Examples of suffixes include \emph{w} and \emph{we} in
-English and \emph{y} in Spanish.
-
-\item[secondary]
-
-The "secondary" keyword lists strings of characters which do not contain
-vowels, but for which, when there are no vowels present in a syllable,
-define the center of the syllable.  These strings follow the keyword and
-must be separated by space and end with a semicolon.  Examples of
-secondary sequences include \emph{w} from Welsh loanwords in English and
-the syllabic consonants \emph{l} and \emph{r} in Czech.
-
-\end{description}
-
-By way of example, here is a vowel file that works for English:
-
-\begin{lstlisting}[autogobble]
-alias [english] to [English];
-
-language [English];
-
-vowel aàáAÀÁ;
-vowel eèéëEÈÉË;
-vowel iìíIÌÍ;
-vowel oòóOÒÓ;
-vowel uùúUÙÚ;
-vowel yỳýYỲÝ;
-vowel æǽÆǼ;
-vowel œŒ;
-
-prefix qu Qu qU QU;
-prefix y Y;
-
-suffix w W;
-suffix we We wE WE;
-
-secondary w W;
-\end{lstlisting}
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf
deleted file mode 100644
index 1bc18a0099f..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.pdf
+++ /dev/null
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.tex b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.tex
deleted file mode 100644
index 3c645e02d80..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef.tex
+++ /dev/null
@@ -1,2394 +0,0 @@
-% !TEX program = LuaLaTeX+se
-%
-% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
-%
-% This file is part of Gregorio.
-%
-% Gregorio is free software: you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version.
-%
-% Gregorio is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
-%
-\documentclass[a4paper]{article}
-\usepackage{color}
-\usepackage[margin=1cm]{geometry}
-\usepackage{fontspec}
-\usepackage{luacode}
-\usepackage{multicol}
-\usepackage{multirow}
-\usepackage{fixltx2e}
-\usepackage{hyperref}
-\usepackage{color}
-\usepackage[allowdeprecated=false]{gregoriotex}
-\usepackage{longtable}
-\usepackage{supertabular}
-\usepackage{carolmin}
-\setlength{\columnsep}{0.3cm} \setlength{\columnseprule}{1pt}
-\setmainfont{Linux Libertine O}
-\pagestyle{empty}
-\begin{document}
-
-\begin{center}
-\huge{nabc language for gregorio}
-\end{center}
-
-		\vspace{1.5cm}
-		\begingroup%
-			\gredefbarredsymbol{Vbar}{V}{greVBar}{9.5}{0.05em}{0pt}%
-			\greannotation{\scriptsize{AL}}
-			\greannotation{\scriptsize{II}}
-			\color{black!60}
-			\setmainfont[SmallCapsFont=AlegreyaSC]{Alegreya}%
-			\addtolength{\hsize}{-4cm}%
-			\setlength{\fboxsep}{5mm}%
-			\begin{list}{}{%
-				\setlength{\topsep}{0pt}%
-				\setlength{\leftmargin}{1.5cm}%
-				\setlength{\rightmargin}{1.5cm}%
-				\setlength{\listparindent}{0pt}%
-				\setlength{\itemindent}{0pt}%
-				\setlength{\parsep}{0pt}%
-			}\item[]{\fbox{\parbox{\hsize}{\gregorioscore[f]{veni}}}}%
-			\end{list}%
-		\endgroup%
-
-		\vspace{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}
-
-\def\neume{%
-	\begingroup %
-		\catcode`\~=12{}%
-		\catcode`\@=11{}%
-		\neumebody%
-}
-
-\def\neumebody#1{%
-		\vbox{\hbox{\vspace{1mm}}\hbox{\noindent\GreNABCChar{#1}\hspace{1mm}}%
-		\hbox{\vspace{1mm}}\hbox{\noindent{\fontsize{6}{6}\texttt{#1}\hspace{1mm}}}}%
-	\endgroup %
-}
-
-\def\neumer{%
-	\begingroup %
-		\catcode`\~=12{}%
-		\catcode`\@=11{}%
-		\neumerbody%
-}
-
-\def\neumerbody#1{%
-		\vbox{\hbox{\vspace{1mm}}\hbox{\noindent\hspace{8mm}\GreNABCChar{#1}\hspace{1mm}}%
-		\hbox{\vspace{1mm}}\hbox{\noindent{\fontsize{6}{6}\texttt{#1}\hspace{1mm}}}}%
-	\endgroup %
-}
-
-\def\sneume{%
-	\begingroup %
-		\catcode`\~=12{}%
-		\catcode`\@=11{}%
-		\sneumebody%
-}
-
-\def\sneumebody#1{%
-		\font\grefontnabc={name:gregall} at 6pt\grefontnabc\begin{gre@style@nabc}%
-		\directlua{tex.sprint(gregoriotex.nabc_font_tables["gregall"]["\luatexluaescapestring{#1}"] or "")}%
-		\end{gre@style@nabc}%
-	\endgroup %
-}
-
-\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 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
-\texttt{nabc-lines: 1;} line, like:
-
-\begin{verbatim}
-nabc-lines: 1;
-(f3) AL(ef~|ta>)le(fg/hggf|peclhgpi)lú(ef~|ta>)ia.(f.|ta-) (,)
-(ii//|bv-|gh!ivHG//|vi-hhppu2su1sut1|fhg/|to|eef.|pt) (;)
-\end{verbatim}
-
-The \texttt{nabc} snippets are then separated by \texttt{|} character from
-\texttt{gabc} snippets or other \texttt{nabc} snippets.  Every \texttt{gabc}
-snippet may be followed by multiple \texttt{nabc} snippets.  The maximum
-number of consecutive \texttt{nabc} snippets is the number declared in the
-header field \texttt{nabc-lines: x;}.  After reaching that number of
-consecutive \texttt{nabc} snippets another \texttt{gabc} snippet followed
-by \texttt{nabc} snippets can follow.  A single \texttt{nabc} snippet is not
-split into multiple lines, so for larger melismatic pieces it is desirable
-to synchronize the \texttt{gabc} snippets with corresponding \texttt{nabc}
-snippets.  With \texttt{nabc-lines: 1;} the
-\texttt{gabc} and \texttt{nabc} snippets form an alternating pattern, like
-\texttt{(gabc|nabc|gabc|nabc|gabc)}, in this case the last \texttt{gabc}
-snippet does not have any corresponding \texttt{nabc} neumes.  With
-\texttt{nabc-lines: 2;} the snippets ordering could be
-e.g.\ \texttt{(gabc|nabc1|nabc2|gabc|nabc1)}.
-
-Each \texttt{nabc} snippet consists of a sequence of \textit{complex neume
-descriptors}.  Each \textit{complex neume descriptor} consists of
-optional \textit{horizontal spacing adjustment descriptor}, then \textit{complex glyph
-descriptor}, optionally followed by a sequence of \textit{subpunctis and prepunctis
-descriptor}s, optionally followed by a sequence of \textit{significant letter
-descriptor}s.
-
-The \textit{horizontal spacing adjustment descriptor}
-consists of a sequence of horizontal spacing adjustment characters
-\texttt{/} and \texttt{`}.
-\begin{itemize}
-	\item \texttt{//} move by \texttt{nabclargerspace} skip to the right
-	\item \texttt{/} move by \texttt{nabcinterelementspace} skip to the right
-	\item \texttt{``} move by \texttt{nabclargerspace} skip to the left
-	\item \texttt{`} move by \texttt{nabcinterelementspace} skip to the left
-\end{itemize}
-
-The \textit{complex glyph descriptor} consists of a \textit{glyph descriptor},
-optionally followed by a sequence of other \textit{glyph descriptor}s, all
-separated by the \texttt{!} character.  This is used to describe more
-complex glyphs, where certain basic glyphs are connected together.
-
-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}
-\texttt{vi} \sneume{vi} virga\\
-\texttt{pu} \sneume{pu} punctum\\
-\texttt{ta} \sneume{ta} tractulus\\
-\texttt{gr} \sneume{gr} gravis\\
-\texttt{cl} \sneume{cl} clivis\\
-\texttt{pe} \sneume{pe} pes\\
-\texttt{po} \sneume{po} porrectus\\
-\texttt{to} \sneume{to} torculus\\
-\texttt{ci} \sneume{ci} climacus\\
-\texttt{sc} \sneume{sc} scandicus\\
-\texttt{pf} \sneume{pf} porrectus flexus\\
-\texttt{sf} \sneume{sf} scandicus flexus\\
-\texttt{tr} \sneume{tr} torculus resupinus\\
-\texttt{st} \sneume{st} stropha\\
-\texttt{ds} \sneume{ds} distropha\\
-\texttt{ts} \sneume{ts} tristropha\\
-\texttt{tg} \sneume{tg} trigonus\\
-\texttt{bv} \sneume{bv} bivirga\\
-\texttt{tv} \sneume{tv} trivirga\\
-\texttt{pr} \sneume{pr} pressus maior\\
-\texttt{pi} \sneume{pi} pressus minor\\
-\texttt{vs} \sneume{vs} virga strata\\
-\texttt{or} \sneume{or} oriscus\\
-\texttt{sa} \sneume{sa} scandicus\\
-\texttt{pq} \sneume{pq} pes quassus\\
-\texttt{ql} \sneume{ql} quilisma (3 loops)\\
-\texttt{qi} \sneume{qi} quilisma (2 loops)\\
-\texttt{pt} \sneume{pt} pes stratus
-\end{multicols}
-
-The \texttt{glyph modifiers} is a possibly empty sequence of following
-characters optionally followed by a number:
-\begin{itemize}
-	\item \texttt{S} modification of the mark
-	\item \texttt{G} modification of the grouping (neumatic break)
-	\item \texttt{M} melodic modification
-	\item \texttt{-} addition of episema
-	\item \texttt{>} augmentive liquescence
-	\item \texttt{\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
-clivis the table shows two different glyphs, the ancus \texttt{cl>} \sneume{cl>}
-and then another neume - \texttt{cl>1} \sneume{cl>1}, the first neume does
-not contain any number after it, while the \texttt{1} indicates first
-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{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
-\textit{pitch descriptor} on any of the \textit{basic glyph descriptor}s
-in the \textit{complex glyph descriptor}, it is best to use the same one on all
-the other \textit{basic glyph descriptor}s in the same \textit{complex glyph descriptor}.
-
-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{t} \sneume{ta} tractulus
-	\item \texttt{u} \sneume{ta-} tractulus with episema
-	\item \texttt{v} \sneume{suv1} tractulus with double episema
-	\item \texttt{w} \sneume{gr} gravis
-	\item \texttt{x} \sneume{st>} liquescens stropha
-	\item \texttt{y} \sneume{gr-} gravis with episema
-\end{itemize}
-Only subpunctis are normally used in neume classification, the prepunctis is
-a \texttt{nabc} concept to describe the rising sequence of punctis, tractulis
-etc.\ in the left low corner of some neume.  While e.g.\ \texttt{vipp2}
-\sneume{sc} describes the same neume as \texttt{sc} \sneume{sc}, the
-former form allows better control on how many punctis or tractulis or
-tractulis with episema etc.\ there are.  Some examples:
-\texttt{ppt3} \sneume{ppt3} stands for 3 raising tractulis with episema,
-while \texttt{su1sut1sux1} \sneume{su1sut1sux1} stands for a punctum,
-followed by tractulus, followed by liquescens stropha.
-
-The \textit{significant letter descriptor} consists of the letters
-\texttt{ls}, followed by a shorthand of the significant letter or common
-group of them, followed by a number - a rough position relative to the
-\textit{complex glyph descriptor} glyph with prepunctis and subpunctis
-attached to it.  If more than one \textit{significant letter descriptor}
-is used on the same \textit{complex neume descriptors} for the same
-position, then they are ordered in the order they are written in the
-\texttt{nabc} snippet at that position.  The position numbers are:
-
-
-\makebox[6cm][l]{\texttt{1} \GreNABCChar{vilsc1} left upper corner}
-\makebox[6cm][l]{\texttt{2} \GreNABCChar{vilsc2} above the neume}
-\makebox[6cm][l]{\texttt{3} \GreNABCChar{vilsc3} right upper corner}\\
-\makebox[6cm][l]{\texttt{4} \GreNABCChar{vilsc4} to the left of the neume}
-\makebox[6cm][l]{}
-\makebox[6cm][l]{\texttt{6} \GreNABCChar{vilsc6} to the right of the neume}\\
-\makebox[6cm][l]{\texttt{7} \GreNABCChar{vilsc7} left bottom corner}
-\makebox[6cm][l]{\texttt{8} \GreNABCChar{vilsc8} below the neume}
-\makebox[6cm][l]{\texttt{9} \GreNABCChar{vilsc9} right bottom corner}\\
-
-
-The shorthands, including the \texttt{ls} prefix, which should be followed
-by the above mentioned position digit:
-\begin{multicols}{3}
-\texttt{lsal} \sneume{lsal} altius\\
-\texttt{lsam} \sneume{lsam} altius mediocriter\\
-\texttt{lsb} \sneume{lsb} bene\\
-\texttt{lsc} \sneume{lsc} celeriter\\
-\texttt{lscm} \sneume{lscm} celeriter mediocriter\\
-\texttt{lsco} \sneume{lsco} coniunguntur\\
-\texttt{lscw} \sneume{lscw} celeriter (wide form)\\
-\texttt{lsd} \sneume{lsd} deprimatur\\
-\texttt{lse} \sneume{lse} equaliter\\
-\texttt{lseq} \sneume{lseq} equaliter\\
-\texttt{lsew} \sneume{lsew} equaliter (wide form)\\
-\texttt{lsfid} \sneume{lsfid} fideliter\\
-\texttt{lsfr} \sneume{lsfr} frendor\\
-\texttt{lsg} \sneume{lsg} gutture\\
-\texttt{lsi} \sneume{lsi} iusum\\
-\texttt{lsim} \sneume{lsim} iusum mediocriter\\
-\texttt{lsiv} \sneume{lsiv} iusum valde\\
-\texttt{lsk} \sneume{lsk} klenche\\
-\texttt{lsl} \sneume{lsl} levare\\
-\texttt{lslb} \sneume{lslb} levare bene\\
-\texttt{lslc} \sneume{lslc} levare celeriter\\
-\texttt{lslen} \sneume{lslen} leniter\\
-\texttt{lslm} \sneume{lslm} levare mediocriter\\
-\texttt{lslp} \sneume{lslp} levare parvum\\
-\texttt{lslt} \sneume{lslt} levare tenere\\
-\texttt{lsm} \sneume{lsm} mediocriter\\
-\texttt{lsmoll} \sneume{lsmoll} molliter\\
-\texttt{lsp} \sneume{lsp} parvum\\
-\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\\
-\texttt{lssimil} \sneume{lssimil} similiter\\
-\texttt{lssimul} \sneume{lssimul} simul\\
-\texttt{lssm} \sneume{lssm} sursum mediocriter\\
-\texttt{lsst} \sneume{lsst} sursum tenere\\
-\texttt{lssta} \sneume{lssta} statim\\
-\texttt{lst} \sneume{lst} tenere\\
-\texttt{lstb} \sneume{lstb} tenere bene\\
-\texttt{lstm} \sneume{lstm} tenere mediocriter\\
-\texttt{lstw} \sneume{lstw} tenere (wide form)\\
-\texttt{lsv} \sneume{lsv} valde\\
-\texttt{lsvol} \sneume{lsvol} volubiliter\\
-\texttt{lsx} \sneume{lsx} expectare
-\end{multicols}
-
-Finally a commented example of a \texttt{nabc} snippet:
-
-\texttt{```po////pe>2lse7lsl3qlhh!vshhppt1sut2ql>ppu3}
-
-\GreNABCChar{```po////pe>2lse7lsl3qlhh!vshhppt1sut2ql>ppu3}
-
-\texttt{```} stands for a negative horizontal skip (move to the left)
-by \texttt{nabcinterelementspace} and \texttt{nabclargerspace}.
-
-\texttt{po} \sneume{po} is a basic porrectus, at the default pitch
-(height \texttt{hf}).
-
-\texttt{////} stands for a horizontal skip (move to the right) by
-two times \texttt{nabclargerspace}.
-
-\texttt{pe>2lse7lsl3} \GreNABCChar{pe>2lse7lsl3} stands for the
-3rd augmentive liquescent form of podatus (epiphonus with tractulus, see the
-following page) at the default pitch, with equaliter in the low left corner
-and levare in the upper right corner.
-
-\texttt{qlhh!vshhppt1sut2} \GreNABCChar{qlhh!vshhppt1sut2} stands for
-a 3 loop quilisma joined with virga strata, both at relative pitch 2 above
-the default one, with a single tractulus before it and two subpunctis -
-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
-\pagebreak
-
-{
-\noindent\footnotesize
-\begin{tabular}{|l|l|l|l|l|l|l|l|l|}
-\hline
-Names of & Simple & \multicolumn{4}{c|}{Symbols differentiated by} & \multicolumn{3}{c|}{Symbols indicating} \\
-Symbols & Symbols & \multicolumn{4}{c|}{} & \multicolumn{3}{c|}{a special meaning} \\ \hline
-& & \multicolumn{2}{c|}{the addition} & \multicolumn{2}{c|}{the modification} & melodic & \multicolumn{2}{c|}{phonetic} \\ \cline{3-9}
-& & of letters & of episemas & of the mark & of the grouping & & \multicolumn{2}{c|}{liquescence} \\ \cline{8-9}
-& & & & & (neumatic break) & & augment.\ & dimi \\
-& & & & & & & & nut.\ \\ \cline{3-6}\cline{8-9}
-virga & \neume{vi} & \neume{vilsc3}\neume{vilst1}\neume{vippt1lsc2} & \neume{vi-} & & & & \neume{vi>} & \\
-tractulus & \neume{ta} & \neume{talsc3}\neume{talst2} & & & & & \neume{ta>} & \\
-punctum & \neume{pu} & & & & & & \neume{st}\neume{visu1sux1} & \\
-gravis & \neume{gr} & & & & & & & \\
-clivis & \neume{cl} & \neume{cllsc3}\neume{cllst2}\neume{cl-lst2} & \neume{cl-}\neume{clS-} & \neume{clS}\neume{clS1} & & \neume{clM} & \neume{cl>}\neume{cl>1} & \neume{cl~} \\
-pes & \neume{pe} & & \neume{pe-}\neume{pe-1} & \neume{peS} & \neume{peG} & \neume{peG} & \neume{pe>}\neume{pe>1}\neume{pe>2} & \neume{pe~} \\
-porrectus & \neume{po} & \neume{polsc2} & \neume{po-}\neume{po-1} & & \neume{poG} & & \neume{po>} & \neume{po~} \\
-torculus & \neume{to} & \neume{tolsc3}\neume{tolsc4lst3}\neume{tolst2} & \neume{to-}\neume{to-1} & \neume{toS}\neume{toS1}\neume{toS2}\neume{toS3} & \neume{toG} & \neume{toM}\neume{toM1} & \neume{to>} & \neume{pe>} \\
-climacus & \neume{ci}\neume{ci1} & \neume{cilsc3}\neume{cilst2} & \neume{ci-} & \neume{ciS}\neume{ciS1}\neume{visut1su2} & \neume{ciG}\neume{ciG1} & \neume{ciM} & \neume{ci>} & \neume{ci~} \\
-scandicus & \neume{sc} & & \neume{sc-} & \neume{scS} & \neume{scG}\neume{scG1} & \multicolumn{1}{r|}{\neume{scM1}} & \neume{sc>} & \neume{sc~} \\
-& \multicolumn{1}{r|}{\neume{sc1}} & & \multicolumn{1}{r|}{\neumer{vi-hevi-hivi-hm}} & & & \neume{vihevihivihm} & & \\
-\vbox{\hbox{porrectus}\hbox{flexus}} & \neume{pf} & \neume{pflsc2}\neume{pf1lsc2}\neume{pflst2} & \neume{pf-} & \neume{pfS} & \neume{sfM} & \neume{pfM} & \neume{pf>} & \neume{pf~} \\
-\vbox{\hbox{pes}\hbox{subbipunctis}} & \neume{pesu2} & \neume{vippt1su2lsc3} & \neume{pe-su2}\neume{pe-1su2} & \neume{peSsu2}\neume{peSsut2} & \neume{vippt1su2} & \neume{vi-!ci}\neume{pesu1suw1} & \neume{pesu1sux1} & \neume{to>} \\
-& & & \multicolumn{1}{r|}{\neume{pe-1sut2}} & & \multicolumn{1}{r|}{\neume{toS2sut1}} & & & \\
-\vbox{\hbox{scandicus}\hbox{flexus}} & \neume{sf} & \neume{sflsc3} & \neume{sf-} & \neume{sfS} & \neume{vi-tohk}\neume{peclhi} & \neume{sfM} & \neume{cl>ppt2} & \neume{sc>} \\
-\vbox{\hbox{torculus}\hbox{resupinus}} & \neume{tr} & \neume{trlsc2}\neume{trlst2} & \multicolumn{1}{r|}{\neume{tr-1}} & \neume{trS} & \neume{trG}\neume{trG1}\neume{trG2} & \neume{trM} & \neume{tr>} & \neume{tr~} \\ \hline
-apostropha & \neume{st} & & \neume{st-} & \neume{stS} & & & \neume{st>} & \\
-distropha & \neume{ds} & \neume{ds-lsx6} & \neume{ds-} & & & & \neume{ds>} & \\
-tristropha & \neume{ts} & \neume{ts-lsx6} & \neume{ts-} & & & \neume{tsM} & \neume{ts>} & \\
-trigonus & \neume{tg}\neume{tg1} & & & \neume{tgS}\neume{tgS1}\neume{tgS3} & & \neume{tgM} & & \neume{ds>} \\
-\vbox{\hbox{bigirga \&}\hbox{trivirga}} & \neume{bv}\neume{tv} & & \neume{bv-}\neume{tv-} & & & & \neume{bv>} & \\ \hline
-pressus & \neume{pr}\neume{pi} & \neume{prlsc2}\neume{pr-lsc2}\neume{prlst2} & \neume{pr-} & & & \neume{prM} & \neume{pr>}\neume{pi>} & \neume{vs>} \\
-& & \neume{pilsc2}\neume{pilst2} & & & & & & \neume{or>} \\
-\vbox{\hbox{virga}\hbox{strata}} & \neume{vs} & \neume{vslsc3}\neume{vslst2} & \neume{vs-} & & & & \neume{vs>} & \neume{ta>} \\
-oriscus & \neume{or} & & & & & & \neume{or>} & \\
-salicus & \neume{sa}\neume{sa1} & \neume{salsfr1}\neume{saM1lsfr1} & \neume{sa-}\neume{sa-1} & & \neume{saG} & \neume{saM}\neume{saM1}\neume{saM2} & \neume{sa>}\neume{sa->1} & \neume{pe>2} \\
-pes quassus & \neume{pq} & \neume{pqlsfr1} & \neume{pq-} & & & & \neume{pq>} & \\
-quilisma & \neume{ql}\neume{qi} & & \neume{ql-}\neume{qi-} & & & & \neume{ql>}\neume{qi>} & \\ \hline
-\vbox{\hbox{pes}\hbox{stratus}} & \neume{pt} & & & & & & & \\ \hline
-\end{tabular}
-}
-
-\begin{center}
-Table from Cardine's Gregorian Semiology, pp.\ 12-13 with nabc strings and gregall glyphs.
-\end{center}
-
-\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}
-
-\begin{luacode*}
-	local i
-	local last
-	local key
-	local str
-	local keym
-	local arr = {}
-	for key in pairs(gregoriotex.nabc_font_tables['gregall']) do
-		table.insert(arr, key)
-	end
-	for key in pairs(gregoriotex.nabc_font_tables['gresgmodern']) do
-		table.insert(arr, key)
-	end
-	table.sort(arr)
-	tex.sprint("\\begin{multicols}{3}\\noindent");
-	for i, key in ipairs(arr) do
-		if last ~= key then
-			last = key
-			keym = key:gsub("~","\\~{}")
-			str = keym .. "\\hfill"
-			if gregoriotex.nabc_font_tables['gregall'][key] then
-				str = str .. "{\\font\\grefontnabc={name:gregall} at 8pt\\grefontnabc\\begin{gre@style@nabc}" .. gregoriotex.nabc_font_tables['gregall'][key] .. "\\end{gre@style@nabc}}"
-			else
-				str = str .. "{\\color{blue}missing}"
-			end
-			str = str .. "\\hfill"
-			if gregoriotex.nabc_font_tables['gresgmodern'][key] then
-				str = str .. "{\\font\\grefontnabc={name:gresgmodern} at 8pt\\grefontnabc\\begin{gre@style@nabc}" .. gregoriotex.nabc_font_tables['gresgmodern'][key] .. "\\end{gre@style@nabc}}"
-			else
-				str = str .. "{\\color{blue}missing}"
-			end
-			tex.sprint(str .. "\\\\")
-		end
-	end
-	tex.sprint("\\end{multicols}")
-\end{luacode*}
-
-\vfill
-\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}
-
-\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{AM}
-for Antiphonale Monasticum, Solesmes, 1934, \texttt{ARII} for Antiphonale
-Romanum II, Solesmes, 2009 and \texttt{NR} for Nocturnale Romanum, Hartker
-Verlag, 2002, followed by page number which also contains the corresponding
-propers, antiphons or responsories.}
-
-\textit{Most of the glyphs taken from the e-codices Virtual Manuscript Library
-of Switzerland, \url{http://www.e-codices.unifr.ch/en}, with permission
-from Stiftsbibliothek, St.\ Gallen \url{http://www.stibi.ch/} and
-Stiftsbibliothek, Einsiedeln\\
-\url{http://kloster-einsiedeln.ch/}, the picture fragments from there are
-only present in the font source file to help drawing the glyphs.}
-
-{\footnotesize
-
-\begin{multicols}{2}
-
-\noindent\textbf{Cantatorium codex 359}
-
-\noindent
-\texttt{C1} = \url{http://www.e-codices.unifr.ch/en/download/csg-0359_001/max}\\
-\texttt{C25U} Universi \texttt{GT16}\\
-\texttt{C26A} Alleluia Ostende \texttt{GT16}\\
-\texttt{C26D} Dilexisti iustitiam \texttt{GT499}\\
-\texttt{C27E} Ex Sion \texttt{GT18}\\
-\texttt{C27Q} Qui sedes \texttt{GT22}\\
-\texttt{C28A} Alleluia. Excita Domine \texttt{GT23}\\
-\texttt{C28T} Tollite portas \texttt{GT25}\\
-\texttt{C32B} Benedictus es in firmamento \texttt{GT664}\\
-\texttt{C35Q} Qui regis Israel intende\\
-\texttt{C37A} Alleluia. Veni, Domine \texttt{GT36}\\
-\texttt{C38T} Tecum principium \texttt{GT42}\\
-\texttt{C38A} Alleluia Dominus dixit \texttt{GT43}\\
-\texttt{C39B} Benedictus qui \texttt{GT45}\\
-\texttt{C40A} Alleluia Dies sanctificatus \texttt{GT49}\\
-\texttt{C40V} Viderunt omnes \texttt{GT48}\\
-\texttt{C42A} Alleluia. Hic est discipulus \texttt{GT636}\\
-\texttt{C43A} Anima nostra \texttt{GT453}\\
-\texttt{C43L} Laus tibi Christe\\
-\texttt{C44E} Ecce sacerdos \texttt{GT486}\\
-\texttt{C44D} Diffusa est gratia \texttt{GT408}\\
-\texttt{C45S} Speciosus forma \texttt{GT54}\\
-\texttt{C46O} Omnes de Saba \texttt{GT57}\\
-\texttt{C46B} Benedictus Dominus \texttt{GT257}\\
-\texttt{C46A} Alleluia Vidimus stellam \texttt{GT58}\\
-\texttt{C47I} Iuravit Dominus \texttt{GT486}\\
-\texttt{C49I} Inveni David \texttt{GT445}\\
-\texttt{C50G} Gloriosus Deus \texttt{GT456}\\
-\texttt{C52T} Timebunt gentes \texttt{GT265}\\
-\texttt{C52P} Posuisti Domine \texttt{GT477}\\
-\texttt{C53S} Suscepimus Deus \texttt{GT360}\\
-\texttt{C53A} Alleluia. Adorabo ad templum \texttt{GT270}\\
-\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}\\
-\texttt{C60C} Commovisti Domine \texttt{GT89}\\
-\texttt{C61T} Tu es Deus \texttt{GT275}\\
-\texttt{C61I} Iubilate Domino \texttt{GT185}\\
-\texttt{C62M} Miserere mei \texttt{GT63}\\
-\texttt{C64Q} Qui habitat \texttt{GT73}\\
-\texttt{C67D} Dirigatur \texttt{GT340}\\
-\texttt{C71L} Laudate Dominum \texttt{GT187}\\
-\texttt{C73P} Propitius esto \texttt{GT288}\\
-\texttt{C74B} Bonum est \texttt{GT327}\\
-\texttt{C78O} Oculi omnium \texttt{GT343}\\
-\texttt{C79L} Leatatus sum \texttt{GT336}\\
-\texttt{C80Q} Qui confidunt \texttt{GT109}\\
-\texttt{C81E} Exsurge Domine \texttt{GT114}\\
-\texttt{C82B} Beata gens \texttt{GT333}\\
-\texttt{C82R} Respice Domine \texttt{GT320}\\
-\texttt{C82V} Venite filii \texttt{GT298}\\
-\texttt{C84T} Tibi Domine \texttt{GT118}\\
-\texttt{C87E} Exaltabo te \texttt{GT112}\\
-\texttt{C88T} Tollite hostias \texttt{GT272}\\
-\texttt{C89T} Tenuisti manum \texttt{GT133}\\
-\texttt{C95D} Domine exaudi \texttt{GT172}\\
-\texttt{C97D} Domine audivi\\
-\texttt{C100C} Crux fidelis \texttt{GT182}\\
-\texttt{C103C} Cantemus Domino \texttt{GT186}\\
-\texttt{C104V} Vinea facta \texttt{GT188}\\
-\texttt{C107A} Alleluia Pascha nostrum \texttt{GT197}\\
-\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}\\
-\texttt{C139B} Benedictus es \texttt{GT372}\\
-\texttt{C145L} Liberasti nos \texttt{GT366}\\
-\texttt{C148A} Alleluia Domine refugium \texttt{GT321}\\
-\texttt{C148Q} Alleluia Quoniam Deus \texttt{GT327}\\
-\texttt{C148V} Alleluia Venite \texttt{GT324}\\
-\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}
-
-\noindent
-\texttt{E1} = \url{http://www.e-codices.unifr.ch/en/download/sbe-0121_001/max}\\
-\texttt{E2R} Respice in me \texttt{OT5}\\
-\texttt{E2D} Dominus dabit \texttt{GT17}\\
-\texttt{E3D} Deus tu convertens \texttt{GT20}\\
-\texttt{E10P} Prope est Dominus \texttt{GT35}\\
-\texttt{E11C} Confortamini \texttt{OT9}\\
-\texttt{E13P} Prope es tu \texttt{GT24}\\
-\texttt{E16B} Benedictus es\\
-\texttt{E20E} Exsulta satis \texttt{GT28}\\
-\texttt{E23T} Tollite portas \texttt{OT14}\\
-\texttt{E26L} Lux fulgebit \texttt{GT44}\\
-\texttt{E29E} Exsulta filia sion \texttt{GT47}\\
-\texttt{E31T} Tui sunt caeli \texttt{OT18}\\
-\texttt{E33V} Viderunt omnes \texttt{GT50}\\
-\texttt{E34I} In virtute tua \texttt{OT152}\\
-\texttt{E35E} Elegerunt apostoli \texttt{OT161}\\
-\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}\\
-\texttt{E92I} Immutemur \texttt{GT65}\\
-\texttt{E104S} Sicut oculi \texttt{GT77}\\
-\texttt{E125P} Precatus est Moyses \texttt{GT317}\\
-\texttt{E130I} Illumina oculos \texttt{GT290}\\
-\texttt{E131O} Oculi mei semper \texttt{GT96}\\
-\texttt{E133I} Iustitiae Domini \texttt{GT309}\\
-\texttt{E147L} Laetare Ierusalem \texttt{GT108}\\
-\texttt{E148L} Laudate Dominum \texttt{GT110}\\
-\texttt{E155B} Benedicite gentes Domino \texttt{GT231}\\
-\texttt{E158D} Domine ad adiuvandum \texttt{OT42}\\
-\texttt{E161S} Sitientes venite \texttt{GT114}\\
-\texttt{E162F} Factus est Dominus \texttt{GT119}\\
-\texttt{E166C} Confitebor tibi Domine \texttt{OT44}\\
-\texttt{E173E} Eripe me \texttt{GT129}\\
-\texttt{E193D} Domine, exaudi orationem \texttt{OT53}\\
-\texttt{E195D} Dominus Iesus \texttt{GT165}\\
-\texttt{E205R} Resurrexi \texttt{GT196}\\
-\texttt{E248V} Viri Galilaei \texttt{GT235}\\
-\texttt{E255S} Spiritus Domini \texttt{GT252}\\
-\texttt{E256C} Confirma hoc \texttt{OT79}\\
-\texttt{E262S} Sapientiam sanctorum \texttt{GT452}\\
-\texttt{E272M} Mihi autem nimis \texttt{OT128}\\
-\texttt{E293V} Vindica Domine\\
-\texttt{E320I} Inclina aurem \texttt{GT300}\\
-\texttt{E327O} Oravi Deum meum \texttt{OT107}\\
-\texttt{E324R} Respice, Domine \texttt{GT320}\\
-\texttt{E336I} In voluntate tua \texttt{GT346}\\
-\texttt{E339S} Si iniquitates \texttt{GT350}\\
-\texttt{E373B} Benedictus es \texttt{GT372}
-
-\noindent\textbf{Hartker codex 390/391}
-
-\noindent
-\texttt{H1} = \url{http://www.e-codices.unifr.ch/en/download/csg-0390_001/max}\\
-\texttt{H195} = \url{http://www.e-codices.unifr.ch/en/download/csg-0391_001/max}\\
-\texttt{H16A} Aspiciebam in visu \texttt{NR111}\\
-\texttt{H16M} Missus est Gabriel \texttt{NR111}\\
-\texttt{H16V} Ave Maria \texttt{NR113}\\
-\texttt{H22S} Sicut mater consolator \texttt{NR127}\\
-\texttt{H23E} Egredietur Dominus de Samaria \texttt{NR129}\\
-\texttt{H25E} Ecce mitto Angelum \texttt{AM201}\\
-\texttt{H26G} Grata facta est \texttt{NR25*}\\
-\texttt{H28Q} Qui venturus est \texttt{NR134}\\
-\texttt{H29E} Ecce radix Jesse \texttt{NR137}\\
-\texttt{H32N} Nascetur nobis \texttt{NR149}\\
-\texttt{H33I} Iuravi dicit Dominus \texttt{NR151}\\
-\texttt{H34F} Festina ne tardaveris \texttt{NR130}\\
-\texttt{H35G} Germinaverunt campi \texttt{NR144}\\
-\texttt{H36A} Adnuntiatum est\\
-\texttt{H48B} Beata et venerabilis\\
-\texttt{H50Q} Quem vidistis pastores \texttt{AM240}\\
-\texttt{H72V} Venit lumen tuum \texttt{AM290}\\
-\texttt{H72H} Hodie in Iordane \texttt{NR229}\\
-\texttt{H73O} Omnes de Saba \texttt{NR237}\\
-\texttt{H73S} Stella ista \texttt{NR242}\\
-\texttt{H74I} Illuminare, illuminare \texttt{NR236}\\
-\texttt{H75I} In columbae specie \texttt{NR231}\\
-\texttt{H75V} Videntes stellam \texttt{NR242}\\
-\texttt{H77S} Stella ista \texttt{AM291}\\
-\texttt{H77A} Ab Oriente \texttt{AM297}\\
-\texttt{H87E} Exaudi Deus\\
-\texttt{H103S} Spes nostra salus \texttt{NR512}\\
-\texttt{H103M} Magnus Dominus \texttt{NR516}\\
-\texttt{H104T} Te Deum patrem\\
-\texttt{H112S} Stans a dextris \texttt{AM798}\\
-\texttt{H114C} Corde et animo \texttt{AM1033}\\
-\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{H443V} Venite exsultemus \texttt{NRXXVIII}
-
-\noindent\textbf{St.\ Gall codex 339}
-
-\noindent
-\texttt{G1} = \url{http://www.e-codices.unifr.ch/en/download/csg-0339_033/max}\\
-\texttt{G56} = \url{http://www.e-codices.unifr.ch/en/download/csg-0339_088/max}\\
-\texttt{G57} = \url{http://www.e-codices.unifr.ch/en/download/csg-0339_088a/max}\\
-\texttt{G58} = \url{http://www.e-codices.unifr.ch/en/download/csg-0339_089/max}\\
-\texttt{G8E} Exulta satis \texttt{OT11}\\
-\texttt{G9A} Alleluia Veni Domine \texttt{GT36}\\
-\texttt{G11P} Puer natus est \texttt{GT47}\\
-\texttt{G11V} Viderunt omnes \texttt{GT48}\\
-\texttt{G12T} Tui sunt caeli \texttt{OT18}\\
-\texttt{G20I} Iubilate Deo universa terra \texttt{GT227}\\
-\texttt{G22D} Domine quinque talenta \texttt{GT515}\\
-\texttt{G25P} Posuisti Domine \texttt{GT477}\\
-\texttt{G30E} Exsurge quare obdormis \texttt{GT91}\\
-\texttt{G35D} Domine vivifica me \texttt{OT31}\\
-\texttt{G42D} Domine Deus salutis \texttt{OT112}\\
-\texttt{G44P} Precatus est Moyses \texttt{GT317}\\
-\texttt{G45D} Domine in auxilium \texttt{OT106}\\
-\texttt{G51I} Intende voci \texttt{GT280}\\
-\texttt{G51S} Si ambulabem \texttt{GT125}\\
-\texttt{G57F} Factus est Dominus \texttt{GT119}\\
-\texttt{G89D} Domine Deus in simplicitate \texttt{OT159}\\
-\texttt{G113A} Alleluia. Dilexit Andream \texttt{GT625}\\
-\texttt{G116C} Cantabo Domino \texttt{GT283}\\
-\texttt{G126D} Alleluia. Domine Deus meus \texttt{GT282}\\
-\texttt{G128A} Alleluia. Attendite popule\\
-\texttt{G132A} Alleluia. Mirabilis Dominus \texttt{GT462}\\
-\texttt{G132V} Alleluia. Vox exultationis\\
-\texttt{G139A} Asperges me Domine\\
-\texttt{G140O} Oremus dilectissimi nobis\\
-\texttt{G141O} Omnipotens Deus
-
-\noindent\textbf{St.\ Gall codex 376}
-
-\noindent
-\texttt{N1} = \url{http://www.e-codices.unifr.ch/en/download/csg-0376_001/max}\\
-\texttt{N39H} Hodie cantandus est nobis\\
-\texttt{N53A} Audite fratres dilecti\\
-\texttt{N59N} Nativitatem venerandam\\
-\texttt{N65G} Gloriatis laus tua Deus\\
-\texttt{N67G} Gloria in excelsis Deo\\
-\texttt{N68G} Gloria in excelsis Deo\\
-\texttt{N69G} Gloria in excelsis Deo\\
-\texttt{N73G} Kyrie eleison\\
-\texttt{N86D} Dilexisti iustitiam \texttt{GT498}\\
-\texttt{N100T} Tui sunt caeli \texttt{OT18}\\
-\texttt{N171D} Deus exaudi orationem \texttt{GT107}\\
-\texttt{N221N} Alleluia. Non vos relinquam \texttt{GT242}\\
-\texttt{N270A} Alleluia. Benedictus es \texttt{GT375}\\
-\texttt{N293A} Alleluia. Sancti tui, Domine, benedicent \texttt{GT463}\\
-\texttt{N296V} Alleluia. Veni Sancte Spiritus \texttt{GT263}\\
-\texttt{N363C} Carmen suo dilecto\\
-\texttt{N368L} Letamente canamus Domino nostro\\
-\texttt{N372O} O quam mira sunt Deus
-
-\noindent\textbf{St.\ Gall codex 374}
-
-\noindent
-\texttt{A1} = \url{http://www.e-codices.unifr.ch/en/download/csg-0374_001/max}\\
-\texttt{A17T} Tui sunt caeli \texttt{OT18}\\
-\texttt{A22V} Vox in Rama \texttt{GT638}\\
-\texttt{A26F} Fili quid fecisti \texttt{GT51}\\
-\texttt{A56C} Custodi me Domine \texttt{GT304}\\
-\texttt{A127E} Exultabunt sancti \texttt{OT143}\\
-\texttt{A167O} Oravi Deum meum \texttt{OT107}\\
-\texttt{A174A} Alleluia. Eripe me \texttt{GT308}
-
-\noindent
-\textbf{Bamberg, lit.\ 6, Gradual of St.\ Emmeram}
-
-\noindent
-\texttt{B9v} = \url{http://bsbsbb.bsb.lrz-muenchen.de/~db/0000/sbb00000128/images/index.html?id=00000128no=19&seite=22&signatur=Msc.Lit.6}\\
-\texttt{B9vA} Anima nostra \texttt{GT466}
-
-\end{multicols}
-}
-
-{
-\footnotesize
-\twocolumn
-\begin{supertabular}{lllll}\noindent
-& \multicolumn{3}{l}{\textbf{virga}} & \\
-\sneume{vi} & \texttt{vi} & \texttt{C78O} & tu\\
-\sneume{vilsc3} & \texttt{vilsc3} & \texttt{C82R} & testamentum\\
-\sneume{vilst1} & \texttt{vilst1} & \texttt{E29E} & rex & \fbox{2.166x}\\
-\sneume{vi-} & \texttt{vi-} & \texttt{C80Q} & montes\\
-\sneume{vi>} & \texttt{vi>} & \texttt{C27E} & eius\\
-\sneume{vi-lst3} & \texttt{vi-lst3} & \texttt{H50Q} & Quem\\
-\sneume{vi->} & \texttt{vi->} & \texttt{E20E} & sanctus & \fbox{2.166x}\\ \hline
-& \multicolumn{3}{l}{\textbf{tractulus}} & \\
-\sneume{ta} & \texttt{ta} & \texttt{C26A} & Domine\\
-\sneume{talsc3} & \texttt{talsc3} & \texttt{E262S} & saeculum & \fbox{2.166x}\\
-\sneume{talst2} & \texttt{talst2} & \texttt{C56D} & Desiderium\\
-\sneume{ta-} & \texttt{ta-} & \texttt{C81E} & antiquis.\\
-\sneume{ta>} & \texttt{ta>} & \texttt{C25U} & et\\
-\sneume{suv1} & \texttt{suv1} \textit{Cf.} \sneume{pesu2suv1} & \texttt{pesu2suv1}\\ \hline
-& \multicolumn{3}{l}{\textbf{punctum}} & \\
-\sneume{pu} & \texttt{pu} & \texttt{C137A} & Audi\\
-\textit{Cf.} \sneume{st} & \texttt{st}\\
-\textit{Cf.} \sneume{ci>} & \texttt{ci>}\\ \hline
-& \multicolumn{3}{l}{\textbf{gravis}} & \\
-\sneume{gr} & \texttt{gr} & \texttt{H271L} & Loquebantur\\
-\sneume{gr-} & \texttt{gr-} & \texttt{H270S} & Spiritus\\
-\sneume{gr-lsc6} & \texttt{gr-lsc6} & \texttt{H270S} & replevit\\ \hline
-& \multicolumn{3}{l}{\textbf{clivis}} & \\
-\sneume{cl} & \texttt{cl} & \texttt{C78O} & sperant\\
-\sneume{cllsc3} & \texttt{cllsc3} & \texttt{C26A} & nobis\\
-\sneume{cllst2} & \texttt{cllst2} & \texttt{C25U} & exspectant\\
-\sneume{cl-lst2} & \texttt{cl-lst2} & \texttt{C52P} & pretioso.\\
-\sneume{cl-} & \texttt{cl-} & \texttt{C78O} & omnium\\
-\sneume{clS-} & \texttt{clS-} & \texttt{C81E} & opem\\
-\sneume{clS} & \texttt{clS} & \texttt{C78O} & opportuno.\\
-\sneume{clS1} & \texttt{clS1} & \texttt{H424M} & potentiam\\
-\sneume{clM} & \texttt{clM} & \texttt{C148V} & nostro\\
-\textit{Cf.} \sneume{cl>} & \texttt{cl>}\\
-\sneume{cl>1} & \texttt{cl>1} & \texttt{H36A} & virginis\\
-\textit{Cf.} \sneume{vi>} & \texttt{vi>}\\
-\sneume{cl->1} & \texttt{cl->1} & \texttt{H50Q} & natum\\
-\sneume{cl->} & \texttt{cl->} & \texttt{H50Q} & angelorum\\
-\sneume{clM-} & \texttt{clM-} & \texttt{C27Q} & super\\
-\sneume{clS-1} & \texttt{clS-1} & \texttt{H428A} & navem\\ \hline
-& \multicolumn{3}{l}{\textbf{pes}} & \\
-\sneume{pe} & \texttt{pe} & \texttt{C80Q} & Domine\\
-\sneume{pe-} & \texttt{pe-} & \texttt{C80Q} & aeternum\\
-\sneume{pe-1} & \texttt{pe-1} & \texttt{C64Q} & Scapulis\\
-\sneume{peS} & \texttt{peS} & \texttt{C78O} & in\\
-\sneume{peG} & \texttt{peG} & \texttt{B9vA} & erepta & \fbox{0.5x}\\
-\textit{Cf.} \sneume{peG} & \texttt{peG}\\
-\sneume{pe>} & \texttt{pe>} & \texttt{C100C} & germine\\
-\sneume{pe>1} & \texttt{pe>1} & \texttt{C27E} & eius\\
-\sneume{pe>2} & \texttt{pe>2} & \texttt{C71L} & misericordia\\
-\sneume{pe->} & \texttt{pe->} & \texttt{N296V} & tuorum\\
-\textit{Cf.} \sneume{ta>} & \texttt{ta>}\\
-\sneume{pe->1} & \texttt{pe->1} & \texttt{H35G} & Germinaverunt & \fbox{1.7x}\\ \hline
-& \multicolumn{3}{l}{\textbf{porrectus}} & \\
-\sneume{po} & \texttt{po} & \texttt{C139B} & super\\
-\sneume{polsc2} & \texttt{polsc2} & \texttt{C82R} & iudica\\
-\sneume{po-} & \texttt{po-} & \texttt{G20I} & anime & \fbox{0.85x}\\
-\sneume{po-1} & \texttt{po-1} & \texttt{C26A} & tuum\\
-\sneume{poG} & \texttt{poG} & \texttt{C40V} & salutare\\
-\sneume{po>} & \texttt{po>} & \texttt{C80Q} & commovebitur\\
-\sneume{po~} & \texttt{po\char`\~} & \texttt{C58A} & aeternum\\
-\sneume{poG-} & \texttt{poG-} & \texttt{A167O} & meum\\
-\sneume{posu2} & \texttt{posu2} & \texttt{C46O} & gloria\\
-\sneume{po-1su2} & \texttt{po-1su2} & \texttt{H269R} & alleluia\\ \hline
-& \multicolumn{3}{l}{\textbf{torculus}} & \\
-\sneume{to} & \texttt{to} & \texttt{C78O} & Domine\\
-\sneume{tolsc3} & \texttt{tolsc3} & \texttt{C39B} & nomine\\
-\sneume{tolsc4lst3} & \texttt{tolsc4lst3} & \texttt{E125P} & Domine, & \fbox{2.166x}\\
-\sneume{tolst2} & \texttt{tolst2} & \texttt{C74B} & misericordiam\\
-\sneume{to-} & \texttt{to-} & \texttt{G44P} & animae\\
-\sneume{to-1} & \texttt{to-1} & \texttt{C139A} & nostrorum\\
-\sneume{toS} & \texttt{toS} & \texttt{C38A} & hodie\\
-\sneume{toS1} & \texttt{toS1} & \texttt{E205R} & Resurrexi, & \fbox{0.5x}\\
-\sneume{toS2} & \texttt{toS2} & \texttt{E161S} & Sitientes & \fbox{1.75x}\\
-\sneume{toS3} & \texttt{toS3} & \texttt{C104V} & circumfodit\\
-\sneume{toG} & \texttt{toG} & \texttt{G12T} & eius\\
-\sneume{toM} & \texttt{toM} & \texttt{C49I} & servum\\
-\sneume{toM1} & \texttt{toM1} & \texttt{H22S} & auxilium & \fbox{1.71x}\\
-\sneume{toM3} & \texttt{toM3} & \texttt{C39B} & mirabile\\
-\sneume{to>} & \texttt{to>} & \texttt{C26A} & misericordiam\\
-\textit{Cf.} \sneume{pe>} & \texttt{pe>}\\
-\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}} & \\
-\sneume{ci} & \texttt{ci} & \texttt{C26A} & tuum\\
-\sneume{ci1} & \texttt{ci1} & \texttt{G73P} & gentes\\
-\sneume{cilsc3} & \texttt{cilsc3} & \texttt{C74B} & tuo\\
-\sneume{ci-} & \texttt{ci-} & \texttt{C81E} & nos\\
-\sneume{ciS} & \texttt{ciS} & \texttt{C81E} & Domine\\
-\sneume{ciS1} & \texttt{ciS1} & \texttt{C139A} & Deus\\
-\sneume{visut1su2} & \texttt{visut1su2} & \texttt{C53A} & Adorabo\\
-\sneume{ciG} & \texttt{ciG} & \texttt{C64Q} & lapidem\\
-\sneume{ciG1} & \texttt{ciG1} & \texttt{C42A} & ille\\
-\sneume{ciM} & \texttt{ciM} & \texttt{C154A} & Alleluia\\
-\sneume{ci>} & \texttt{ci>} & \texttt{C46O} & orta\\
-\sneume{cl>} & \texttt{cl>} & \texttt{C79L} & domum\\
-\sneume{visuv1su2} & \texttt{visuv1su2} & \texttt{C35Q} & nos\\
-\sneume{visut3} & \texttt{visut3} & \texttt{C38T} & meo\\
-\sneume{visu1suu1} & \texttt{visu1suu1} & \texttt{C26D} & laetitia.\\
-\sneume{visut4} & \texttt{visut4} & \texttt{C25U} & me.\\
-\sneume{cl-1su2} & \texttt{cl-1su2} & \texttt{C40A} & magna\\
-\sneume{visu1sut2} & \texttt{visu1sut2} & \texttt{C43L} & Domine\\
-\sneume{visu1suv1} & \texttt{visu1suv1} & \texttt{C53S} & terrae.\\
-\sneume{visuu1su2} & \texttt{visuu1su2} & \texttt{C56D} & eius\\
-\sneume{visuu2su2} & \texttt{visuu2su2} & \texttt{H103S} & salus\\
-\sneume{vi-suu2su2} & \texttt{vi-suu2su2} & \texttt{H103S} & o\\
-\sneume{visu2suw1} & \texttt{visu2suw1} & \texttt{G113A} & Alleluia & \fbox{0.85x}\\
-\sneume{visut2su2} & \texttt{visut2su2} & \texttt{G128A} & Alleluia & \fbox{0.85x}\\
-\sneume{visut3suw1} & \texttt{visut3suw1} & \texttt{C153S} & dicent.\\
-\sneume{visu1sut1sux1} & \texttt{visu1sut1sux1} & \texttt{G126D} & salvum & \fbox{0.85x}\\
-\sneume{visu1sut1su2} & \texttt{visu1sut1su2} & \texttt{N39H} & puer\\
-\sneume{visu1sut1su1sut1} & \texttt{visu1sut1su1sut1} & \texttt{N39H} & generavit\\
-\sneume{vi-su1sut1su2} & \texttt{vi-su1sut1su2} & \texttt{N39H} & enim\\
-\sneume{visut1sux1} & \texttt{visut1sux1} & \texttt{N59N} & filium\\
-\sneume{clSsu1sut1} & \texttt{clSsu1sut1} & \texttt{N65G} & tui\\
-\sneume{vi-su4} & \texttt{vi-su4} & \texttt{N68G} & Amen.\\
-\sneume{vi-su1sut2su1} & \texttt{vi-su1sut2su1} & \texttt{N73K} & Christe\\
-\sneume{visu1sut1suy1} & \texttt{visu1sut1suy1} & \texttt{N221N} & Alleluia.\\
-\sneume{visut3suy1} & \texttt{visut3suy1} & \texttt{N293A} & dicent.\\
-\sneume{visut2suy1} & \texttt{visut2suy1} & \texttt{N363C} & sacro & \fbox{1.25x}\\
-\sneume{visu5} & \texttt{visu5} & \texttt{N368L} & fornacibus & \fbox{1.25x}\\
-\sneume{visu1suu1su2} & \texttt{visu1suu1su2} & \texttt{N372O} & erogatione & \fbox{1.25x}\\
-\sneume{vi-su1suu2} & \texttt{vi-su1suu2} & \texttt{A174A} & meus\\
-\sneume{vi-su1suu1su1} & \texttt{vi-su1suu1su1} & \texttt{A174A} & Alleluia.\\
-\sneume{vi-sut2} & \texttt{vi-sut2} & \texttt{H74I} & illuminare\\
-\sneume{clS-su2} & \texttt{clS-su2} & \texttt{C46A} & eius\\
-\sneume{vi-suu1su2} & \texttt{vi-suu1su2} & \texttt{H75I} & sanctus\\
-\sneume{clSsut2} & \texttt{clSsut2} & \texttt{E51R} & suscipiant & \fbox{2.0x}\\
-\sneume{vi-sut3} & \texttt{vi-sut3} & \texttt{H269D} & dicentes\\
-\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}\\
-\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}\\
-\sneume{sc-} & \texttt{sc-} & \texttt{C123C} & terram\\
-\sneume{scS} & \texttt{scS} & \texttt{C154A} & Alleluia\\
-\sneume{scG} & \texttt{scG} & \texttt{H179I} & Iudas\\
-\sneume{scG1} & \texttt{scG1} & \texttt{C52P} & Posuisti\\
-\sneume{scM1} & \texttt{scM1} & \texttt{C67D} & Domine\\
-\sneume{sc>} & \texttt{sc>} & \texttt{C26A} & Alleluia\\
-\textit{Cf.} \sneume{pe>2} & \texttt{pe>2}\\
-\sneume{vi-pp2} & \texttt{vi-pp2} & \texttt{C26A} & Domine\\
-\sneume{vi-ppt3} & \texttt{vi-ppt3} & \texttt{C27E} & veniet.\\
-\sneume{scM2} & \texttt{scM2} & \texttt{C44E} & Ecce\\
-\sneume{vi>ppt3} & \texttt{vi>ppt3} & \texttt{E2R} & non & \fbox{2.166x}\\
-\sneume{cl>ppt2} & \texttt{cl>ppt2} & \texttt{H73O} & annuntiantes\\
-\sneume{vi-!vi!vi} & \texttt{vi-!vi!vi} & \texttt{E155B} & Benedicite & \fbox{2.166x}\\
-\sneume{vippt3} & \texttt{vippt3} & \texttt{G140O} & ae & \fbox{0.85x}\\
-\sneume{vi-pp4} & \texttt{vi-pp4} & \texttt{C154A} & rectos\\
-\sneume{vi-!vi-!vi} & \texttt{vi-!vi-!vi} & \texttt{H118G} & erubescat\\
-\sneume{vipp4} & \texttt{vipp4} & \texttt{A127E} & eum\\
-\sneume{vi>ppt2} & \texttt{vi>ppt2} & \texttt{H75V} & apertis\\ \hline
-& \multicolumn{3}{l}{\textbf{porrectus flexus}} & \\
-\sneume{pf} & \texttt{pf} & \texttt{C27E} & sacrificia\\
-\sneume{pflsc2} & \texttt{pflsc2} & \texttt{C58D} & intendentes\\
-\sneume{pf1lsc2} & \texttt{pf1lsc2} & \texttt{C61I} & Ipse\\
-\sneume{pflst2} & \texttt{pflst2} & \texttt{C122I} & fines\\
-\sneume{pf-} & \texttt{pf-} & \texttt{C81E} & antiquis.\\
-\sneume{pfS} & \texttt{pfS} & \texttt{G116C} & tribuit & \fbox{0.85x}\\
-\sneume{sfM} & \texttt{sfM} & \texttt{E248V} & alleluia, & \fbox{2.166x}\\
-\sneume{pfM} & \texttt{pfM} & \texttt{E39E} & manere & \fbox{2.166x}\\
-\sneume{pf>} & \texttt{pf>} & \texttt{C95D} & manducare\\
-\textit{Cf.} \sneume{po>} & \texttt{po>}\\
-\sneume{pfMsut1} & \texttt{pfMsut1} & \texttt{E34I} & eum & \fbox{2.166x}\\ \hline
-& \multicolumn{3}{l}{\textbf{pes subbipunctis}} & \\
-\sneume{pesu2} & \texttt{pesu2} & \texttt{C81E} & antiquis.\\
-\sneume{vippt1su2lsc3} & \texttt{vippt1su2lsc3} & \texttt{C61T} & solus:\\
-\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.\\
-\sneume{toS2sut1} & \texttt{toS2sut1} & \texttt{C139A} & Alleluia\\
-\sneume{vi-!ci} & \texttt{vi-!ci} & \texttt{E272M} & cognovisti & \fbox{2.166x}\\
-\sneume{pesu1suw1} & \texttt{pesu1suw1} & \texttt{G8E} & plebem\\
-\sneume{pe-su1sut1} & \texttt{pe-su1sut1} & \texttt{N296V} & alleluia\\
-\sneume{pe-su2suy1} & \texttt{pe-su2suy1} & \texttt{N296V} & alleluia\\
-\sneume{pe-1sut3} & \texttt{pe-1sut3} & \texttt{H179A} & malum\\
-\textit{Cf.} \sneume{to>} & \texttt{to>}\\
-\sneume{pesu1suu1} & \texttt{pesu1suu1} & \texttt{C27E} & Deus\\
-\sneume{pesu3} & \texttt{pesu3} & \texttt{C27Q} & regis\\
-\sneume{vippt1su1sut1} & \texttt{vippt1su1sut1} & \texttt{C40V} & omnes\\
-\sneume{vippu1su2} & \texttt{vippu1su2} & \texttt{C74B} & Altissime.\\
-\sneume{pesu1sut3} & \texttt{pesu1sut3} & \texttt{C60S} & venti.\\
-\sneume{pesu2suv1} & \texttt{pesu2suv1} & \texttt{C60C} & Sana\\
-\sneume{vippu1su2lsc3} & \texttt{vippu1su2lsc3} & \texttt{C32B} & caeli\\
-\sneume{pe-1su1suu1} & \texttt{pe-1su1suu1} & \texttt{C61I} & pascuae\\
-\sneume{peSsu1sux1} & \texttt{peSsu1sux1} & \texttt{G89D} & filii & \fbox{0.85x}\\
-\sneume{pe-su3sut1} & \texttt{pe-su3sut1} & \texttt{N270A} & saecula.\\
-\sneume{pe-1sut1sux1} & \texttt{pe-1sut1sux1} & \texttt{H72V} & orta\\
-\sneume{peSsut3} & \texttt{peSsut3} & \texttt{C46O} & Jerusalem\\
-\sneume{pesut2} & \texttt{pesut2} & \texttt{H77S} & magi\\
-\sneume{pe-1suw2} & \texttt{pe-1suw2} & \texttt{E255S} & Domini & \fbox{2.133x}\\
-\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}\\
-\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\\
-\sneume{sf-} & \texttt{sf-} & \texttt{C39B} & est\\
-\sneume{sfS} & \texttt{sfS} & \texttt{C97D} & Deus\\
-\sneume{toppu1} & \texttt{toppu1} & \texttt{C103C} & Cantemus\\
-\textit{Cf.} \sneume{sfM} & \texttt{sfM}\\
-\textit{Cf.} \sneume{sc>} & \texttt{sc>}\\
-\sneume{to>pp2} & \texttt{to>pp2} & \texttt{E324R} & testamentum & \fbox{2.0x}\\ \hline
-& \multicolumn{3}{l}{\textbf{torculus resupinus}} & \\
-\sneume{tr} & \texttt{tr} & \texttt{C25U} & edoce\\
-\sneume{trlst2} & \texttt{trlst2} & \texttt{E69P} & eius & \fbox{2.0x}\\
-\sneume{tr-1} & \texttt{tr-1} & \texttt{C38T} & meo\\
-\sneume{trS} & \texttt{trS} & \texttt{C58A} & Domine\\
-\sneume{trG} & \texttt{trG} & \texttt{E336I} & fecisti & \fbox{2.166x}\\
-\sneume{trG1} & \texttt{trG1} & \texttt{G25P} & ei\\
-\sneume{trG2} & \texttt{trG2} & \texttt{E147L} & Laetare & \fbox{2.166x}\\
-\sneume{trM} & \texttt{trM} & \texttt{E336I} & resistere & \fbox{2.166x}\\
-\sneume{tr>} & \texttt{tr>} & \texttt{C82V} & nonconfundentur\\
-\sneume{tr~} & \texttt{tr\char`\~} & \texttt{C60S} & Altissimus\\
-\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}\\
-\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\\
-\sneume{stS} & \texttt{stS} & \texttt{E263V} & est. & \fbox{2.166x}\\
-\sneume{st>} & \texttt{st>} & \texttt{C49I} & servum\\ \hline
-& \multicolumn{3}{l}{\textbf{distropha}} & \\
-\sneume{ds} & \texttt{ds} & \texttt{C46O} & super\\
-\sneume{dslsx6} & \texttt{dslsx6} & \texttt{C45S} & forma\\
-\sneume{ds-} & \texttt{ds-} & \texttt{C81E} & Domine\\
-\sneume{ds>} & \texttt{ds>} & \texttt{C38A} & Alleluia\\ \hline
-& \multicolumn{3}{l}{\textbf{tristropha}} & \\
-\sneume{ts} & \texttt{ts} & \texttt{C80Q} & Dominus\\
-\sneume{tslsx6} & \texttt{tslsx6} & \texttt{C44D} & mansuetudinem\\
-\sneume{ts-} & \texttt{ts-} & \texttt{C150L} & ibimus\\
-\sneume{tsM} & \texttt{tsM} & \texttt{C62M} & anima\\
-\sneume{ts>} & \texttt{ts>} & \texttt{C62M} & conculcantes\\
-\sneume{tsM-} & \texttt{tsM-} & \texttt{A26F} & ego\\ \hline
-& \multicolumn{3}{l}{\textbf{trigonus}} & \\
-\sneume{tg} & \texttt{tg} & \texttt{C80Q} & aeternum\\
-\sneume{tg1} & \texttt{tg1} & \texttt{C81E} & antiquis.\\
-\sneume{tgS} & \texttt{tgS} & \texttt{C139B} & omnibus\\
-\sneume{tgS1} & \texttt{tgS1} & \texttt{N171D} & mei\\
-\sneume{tgS3} & \texttt{tgS3} & \texttt{C61I} & laetitia.\\
-\sneume{tgM} & \texttt{tgM} & \texttt{C118C} & Dominus\\
-\sneume{tgS-} & \texttt{tgS-} & \texttt{C118C} & Dominus\\
-\sneume{tgS4} & \texttt{tgS4} & \texttt{C86D} & mei\\ \hline
-& \multicolumn{3}{l}{\textbf{bivirga}} & \\
-\sneume{bv} & \texttt{bv} & \texttt{C26D} & Propterea\\
-\sneume{bv-} & \texttt{bv-} & \texttt{C82B} & populus\\
-\sneume{bv>} & \texttt{bv>} & \texttt{H33I} & montes\\ \hline
-& \multicolumn{3}{l}{\textbf{trivirga}} & \\
-\sneume{tv} & \texttt{tv} & \texttt{C56D} & pretioso\\
-\sneume{tv-} & \texttt{tv-} & \texttt{C61I} & eius.\\ \hline
-& \multicolumn{3}{l}{\textbf{pressus}} & \\
-\sneume{pr} & \texttt{pr} & \texttt{C26A} & Alleluia\\
-\sneume{pi} & \texttt{pi} & \texttt{C82R} & Domine,\\
-\sneume{prlsc2} & \texttt{prlsc2} & \texttt{E339S} & Si & \fbox{2.166x}\\
-\sneume{pr-lsc3} & \texttt{pr-lsc3} & \texttt{C122I} & Dei\\
-\sneume{prlst2} & \texttt{prlst2} & \texttt{C145L} & tuo\\
-\sneume{pilsc2} & \texttt{pilsc2} & \texttt{C122I} & Dei\\
-\sneume{pilst2} & \texttt{pilst2} & \texttt{C26A} & Alleluia\\
-\sneume{pr-} & \texttt{pr-} & \texttt{C59D} & Si\\
-\sneume{prM} & \texttt{prM} & \texttt{E173E} & insurgentibus & \fbox{2.166x}\\
-\sneume{pr>} & \texttt{pr>} & \texttt{H72H} & in\\
-\sneume{pi>} & \texttt{pi>} & \texttt{H103M} & Magnus\\
-\textit{Cf.} \sneume{vs>} & \texttt{vs>}\\
-\textit{Cf.} \sneume{or>} & \texttt{or>}\\ \hline
-& \multicolumn{3}{l}{\textbf{virga strata}} & \\
-\sneume{vs} & \texttt{vs} & \texttt{C148A} & generatio\\
-\sneume{vslsc3} & \texttt{vslsc3} & \texttt{C39B} & nomine\\
-\sneume{vslst2} & \texttt{vslst2} & \texttt{E195D} & suis, & \fbox{2.166x}\\
-\sneume{vs-} & \texttt{vs-} & \texttt{C82B} & Domini\\
-\sneume{vs>} & \texttt{vs>} & \texttt{C64Q} & pennis\\
-\textit{Cf.} \sneume{ta>} & \texttt{ta>}\\
-\sneume{vs->} & \texttt{vs->} & \texttt{A22V} & Rama\\ \hline
-& \multicolumn{3}{l}{\textbf{oriscus}} & \\
-\sneume{or} & \texttt{or} & \texttt{H112S} & candidior\\
-\sneume{or>} & \texttt{or>} & \texttt{C148V} & salutari\\ \hline
-& \multicolumn{3}{l}{\textbf{salicus}} & \\
-\sneume{sa} & \texttt{sa} & \texttt{C27E} & super\\
-\sneume{sa1} & \texttt{sa1} & \texttt{C148A} & Alleluia.\\
-\sneume{salsfr1} & \texttt{salsfr1} & \texttt{E3D} & Deus & \fbox{2.166x}\\
-\sneume{sa-} & \texttt{sa-} & \texttt{C25U} & tuas\\
-\sneume{sa-1} & \texttt{sa-1} & \texttt{G30E} & tribulationis\\
-\sneume{saG} & \texttt{saG} & \texttt{C107A} & Alleluia.\\
-\sneume{saM} & \texttt{saM} & \texttt{H16V} & venient & \fbox{1.7x}\\
-\sneume{saM1} & \texttt{saM1} & \texttt{H23E} & homo & \fbox{1.71x}\\
-\sneume{saM2} & \texttt{saM2} & \texttt{C27Q} & regis\\
-\sneume{saM4} & \texttt{saM4} & \texttt{E10P} & omnis & \fbox{2.166x}\\
-\sneume{sa>} & \texttt{sa>} & \texttt{C27E} & sanctos\\
-\sneume{sa->1} & \texttt{sa->1} & \texttt{H77A} & magi\\
-\textit{Cf.} \sneume{pe>2} & \texttt{pe>2}\\
-\sneume{sa!clS1} & \texttt{sa!clS1} & \texttt{C80Q} & sicut\\
-\sneume{sa!clS-1} & \texttt{sa!clS-1} & \texttt{C27Q} & tuam\\
-\sneume{sa!clS1lsc2} & \texttt{sa!clS1lsc2} & \texttt{C46B} & Deus\\
-\sneume{sa-lsfr1} & \texttt{sa-lsfr1} & \texttt{C134B} & nomen\\
-\sneume{sa1!cl>} & \texttt{sa1!cl>} & \texttt{G45D} & respexit & \fbox{0.85x}\\
-\sneume{sa!cl>} & \texttt{sa!cl>} & \texttt{G22D} & euge & \fbox{0.85x}\\
-\sneume{sa!cl} & \texttt{sa!cl} & \texttt{G141O} & fortitudo & \fbox{0.85x}\\
-\sneume{saM-1} & \texttt{saM-1} & \texttt{G139A} & Domine & \fbox{0.85x}\\
-\sneume{sa!cl-} & \texttt{sa!cl-} & \texttt{G132V} & Alleluia. & \fbox{0.85x}\\
-\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}\\
-\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\\
-\sneume{pq-} & \texttt{pq-} & \texttt{C148V} & nostro\\
-\sneume{pq>} & \texttt{pq>} & \texttt{C84T} & pupillo\\
-\sneume{pqS} & \texttt{pqS} & \texttt{C52T} & maiestate\\
-\sneume{pqS>} & \texttt{pqS>} & \texttt{H424M} & potentiam\\
-\sneume{pq!cl>} & \texttt{pq!cl>} & \texttt{G57F} & firmamentum & \fbox{0.85x}\\
-\sneume{pq!cl} & \texttt{pq!cl} & \texttt{E23T} & Domini & \fbox{2.166x}\\ \hline
-& \multicolumn{3}{l}{\textbf{quilisma}} & \\
-\sneume{ql} & \texttt{ql} & \texttt{C80Q} & commovebitur\\
-\sneume{qi} & \texttt{qi} & \texttt{C103C} & Hic\\
-\sneume{ql-} & \texttt{ql-} & \texttt{C148A} & generatio\\
-\sneume{qi-} & \texttt{qi-} & \texttt{H28Q} & veniet.\\
-\sneume{ql>} & \texttt{ql>} & \texttt{C40V} & gentium\\
-\sneume{qi>} & \texttt{qi>} & \texttt{C28A} & et\\ \hline
-& \multicolumn{3}{l}{\textbf{pes stratus}} & \\
-\sneume{pt} & \texttt{pt} & \texttt{G140O} & ae & \fbox{0.85x}\\ \hline
-\\
-& \multicolumn{3}{l}{\textbf{subpunctis}} & \\
-\sneume{su2} & \texttt{su2} \textit{Cf.} \sneume{ci} & \multicolumn{2}{l}{\texttt{ci}}\\
-\sneume{su3} & \texttt{su3} \textit{Cf.} \sneume{ci1} & \multicolumn{2}{l}{\texttt{ci1}}\\
-\sneume{su1sut1} & \texttt{su1sut1} \textit{Cf.} \sneume{ciS} & \multicolumn{2}{l}{\texttt{ciS}}\\
-\sneume{sut2} & \texttt{sut2} \textit{Cf.} \sneume{ciS1} & \multicolumn{2}{l}{\texttt{ciS1}}\\
-\sneume{suu1su2} & \texttt{suu1su2} \textit{Cf.} \sneume{visuu1su2} & \multicolumn{2}{l}{\texttt{visuu1su2}}\\
-\sneume{su1suw1} & \texttt{su1suw1} \textit{Cf.} \sneume{ciM} & \multicolumn{2}{l}{\texttt{ciM}}\\
-\sneume{su1sux1} & \texttt{su1sux1} \textit{Cf.} \sneume{ci>} & \multicolumn{2}{l}{\texttt{ci>}}\\
-\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}}\\
-\sneume{su1suv1} & \texttt{su1suv1} \textit{Cf.} \sneume{visu1suv1} & \multicolumn{2}{l}{\texttt{visu1suv1}}\\
-\sneume{suu2su2} & \texttt{suu2su2} \textit{Cf.} \sneume{vi-suu2su2} & \multicolumn{2}{l}{\texttt{vi-suu2su2}}\\
-\sneume{sut2su2} & \texttt{sut2su2} \textit{Cf.} \sneume{visut2su2} & \multicolumn{2}{l}{\texttt{visut2su2}}\\
-\sneume{su1sut3} & \texttt{su1sut3} \textit{Cf.} \sneume{pesu1sut3} & \multicolumn{2}{l}{\texttt{pesu1sut3}}\\
-\sneume{su2suv1} & \texttt{su2suv1} \textit{Cf.} \sneume{pesu2suv1} & \multicolumn{2}{l}{\texttt{pesu2suv1}}\\
-\sneume{sut3suw1} & \texttt{sut3suw1} \textit{Cf.} \sneume{visut3suw1} & \multicolumn{2}{l}{\texttt{visut3suw1}}\\
-\sneume{su1sut1sux1} & \texttt{su1sut1sux1} \textit{Cf.} \sneume{visu1sut1sux1} & \multicolumn{2}{l}{\texttt{visu1sut1sux1}}\\
-\sneume{su1sut1su2} & \texttt{su1sut1su2} \textit{Cf.} \sneume{visu1sut1su2} & \multicolumn{2}{l}{\texttt{visu1sut1su2}}\\
-\sneume{su1sut1su1sut1} & \texttt{su1sut1su1sut1} \textit{Cf.} \sneume{visu1sut1su1sut1} & \multicolumn{2}{l}{\texttt{visu1sut1su1sut1}}\\
-\sneume{sut1sux1} & \texttt{sut1sux1} \textit{Cf.} \sneume{visut1sux1} & \multicolumn{2}{l}{\texttt{visut1sux1}}\\
-\sneume{su4} & \texttt{su4} \textit{Cf.} \sneume{vi-su4} & \multicolumn{2}{l}{\texttt{vi-su4}}\\
-\sneume{su1sut2su1} & \texttt{su1sut2su1} \textit{Cf.} \sneume{vi-su1sut2su1} & \multicolumn{2}{l}{\texttt{vi-su1sut2su1}}\\
-\sneume{su1sut1suy1} & \texttt{su1sut1suy1} \textit{Cf.} \sneume{visu1sut1suy1} & \multicolumn{2}{l}{\texttt{visu1sut1suy1}}\\
-\sneume{sut3suy1} & \texttt{sut3suy1} \textit{Cf.} \sneume{visut3suy1} & \multicolumn{2}{l}{\texttt{visut3suy1}}\\
-\sneume{sut2suy1} & \texttt{sut2suy1} \textit{Cf.} \sneume{visut2suy1} & \multicolumn{2}{l}{\texttt{visut2suy1}}\\
-\sneume{su5} & \texttt{su5} \textit{Cf.} \sneume{visu5} & \multicolumn{2}{l}{\texttt{visu5}}\\
-\sneume{su1suu1su2} & \texttt{su1suu1su2} \textit{Cf.} \sneume{visu1suu1su2} & \multicolumn{2}{l}{\texttt{visu1suu1su2}}\\
-\sneume{su1suu2} & \texttt{su1suu2} \textit{Cf.} \sneume{vi-su1suu2} & \multicolumn{2}{l}{\texttt{vi-su1suu2}}\\
-\sneume{su1suu1su1} & \texttt{su1suu1su1} \textit{Cf.} \sneume{vi-su1suu1su1} & \multicolumn{2}{l}{\texttt{vi-su1suu1su1}}\\
-\sneume{su3sut1} & \texttt{su3sut1} \textit{Cf.} \sneume{pe-su3sut1} & \multicolumn{2}{l}{\texttt{pe-su3sut1}}\\
-\sneume{suu2} & \texttt{suu2} \textit{Cf.} \sneume{ql-ppt1suu2} & \multicolumn{2}{l}{\texttt{ql-ppt1suu2}}\\
-\sneume{su2sut1} & \texttt{su2sut1} \textit{Cf.} \sneume{vi-su2sut1} & \multicolumn{2}{l}{\texttt{vi-su2sut1}}\\
-\sneume{su2suy1} & \texttt{su2suy1} \textit{Cf.} \sneume{pe-su2suy1} & \multicolumn{2}{l}{\texttt{pe-su2suy1}}\\
-\sneume{suw2} & \texttt{suw2} \textit{Cf.} \sneume{pe-1suw2} & \multicolumn{2}{l}{\texttt{pe-1suw2}}\\
-\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}}\\
-\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}\\
-\sneume{ppu2} & \texttt{ppu2} \textit{Cf.} \sneume{scS} & \texttt{scS}\\
-\sneume{ppt2} & \texttt{ppt2} \textit{Cf.} \sneume{sfS} & \texttt{sfS}\\
-\sneume{ppu3} & \texttt{ppu3} & \texttt{C47I} & Sede\\
-\sneume{ppu4} & \texttt{ppu4} & \texttt{C58A} & Domine\\
-\sneume{ppu5} & \texttt{ppu5} & \texttt{C50G} & confregit\\
-\sneume{pp4} & \texttt{pp4} & \texttt{C78O} & escam\\
-\sneume{pp3} & \texttt{pp3} \textit{Cf.} \sneume{pp4} & \texttt{pp4}\\
-\sneume{ppt3} & \texttt{ppt3} \textit{Cf.} \sneume{vi>ppt3} & \texttt{vi>ppt3}\\
-\sneume{ppt4} & \texttt{ppt4} & \texttt{N69G} & amin.\\
-\sneume{ppt5} & \texttt{ppt5} & \texttt{A56C} & videant\\
-\sneume{pp1} & \texttt{pp1} \textit{Cf.} \sneume{vi-pp2} & \texttt{vi-pp2}\\ \hline
-\\
-& \multicolumn{3}{l}{\textbf{combined glyphs}} & \\
-\sneume{cl!pi} & \texttt{cl!pi} & \texttt{C82R} & Domine\\
-\sneume{cl!pilsc1lst3} & \texttt{cl!pilsc1lst3} & \texttt{C89T} & manum\\
-\sneume{cl!pilsc2} & \texttt{cl!pilsc2} & \texttt{C149A} & cantabo\\
-\sneume{cl!pr} & \texttt{cl!pr} & \texttt{G51S} & ipsa & \fbox{0.85x}\\
-\sneume{cl-!pi} & \texttt{cl-!pi} & \texttt{E35E} & illis & \fbox{2.166x}\\
-\sneume{ql!cl} & \texttt{ql!cl} & \texttt{C148A} & Domine\\
-\sneume{ql!cl!cl>} & \texttt{ql!cl!cl>} \textit{Cf.} \sneume{ql!cl!cl>ppt1} & \multicolumn{3}{l}{\texttt{ql!cl!cl>ppt1} minus tractulus}\\
-\sneume{ql!cl!pi} & \texttt{ql!cl!pi} \textit{Cf.} \sneume{ql!cl!pippt1} & \multicolumn{3}{l}{\texttt{ql!cl!pippt1} minus tractulus}\\
-\sneume{ql!pf-} & \texttt{ql!pf-} & \texttt{G42D} & mane & \fbox{0.85x}\\
-\sneume{ql!pf} & \texttt{ql!pf} & \texttt{G35D} & Domine\\
-\sneume{ql!cl-} & \texttt{ql!cl-} & \texttt{C26A} & Alleluia\\
-\sneume{ql!clM} & \texttt{ql!clM} \textit{Cf.} \sneume{ql!clMppt1} & \multicolumn{3}{l}{\texttt{ql!clMppt1} minus tractulus}\\
-\sneume{ql!cl->} & \texttt{ql!cl->} \textit{Cf.} \sneume{ql!cl->ppt1} & \multicolumn{3}{l}{\texttt{ql!cl->ppt1} minus tractulus}\\
-\sneume{ql!cl>} & \texttt{ql!cl>} & \texttt{H26L} & salva & \fbox{0.5x}\\
-\sneume{ql!po} & \texttt{ql!po} & \texttt{C148V} & nostro\\
-\sneume{ql!po-1} & \texttt{ql!po-1} & \texttt{C148A} & Alleluia.\\
-\sneume{ql!po>} & \texttt{ql!po>} & \texttt{H33I} & terram\\
-\sneume{ql!vs} & \texttt{ql!vs} & \texttt{C148A} & refugium\\
-\sneume{ql!vssu2} & \texttt{ql!vssu2} \textit{Cf.} \sneume{ql!vsppt1su2} & \multicolumn{3}{l}{\texttt{ql!vsppt1su2} minus tractulus}\\
-\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}\\
-\sneume{ql-su1sut2} & \texttt{ql-su1sut2} \textit{Cf.} \sneume{ql-ppt1su1sut2} & \multicolumn{3}{l}{\texttt{ql-ppt1su1sut2} minus tractulus}\\
-\sneume{ql-sut1sux1} & \texttt{ql-sut1sux1} & \texttt{H72H} & complacui\\
-\sneume{ql-suu2} & \texttt{ql-suu2} \textit{Cf.} \sneume{ql-ppt1suu2} & \multicolumn{3}{l}{\texttt{ql-ppt1suu2} minus tractulus}\\
-\sneume{ql-sut2suu1} & \texttt{ql-sut2suu1} \textit{Cf.} \sneume{ql-ppt1sut2suu1} & \multicolumn{3}{l}{\texttt{ql-ppt1sut2suu1} minus tractulus}\\
-\sneume{qi-su2} & \texttt{qi-su2} & \texttt{H73S} & cedebat\\
-\sneume{qi-su1sut2} & \texttt{qi-su1sut2} \textit{Cf.} \sneume{qi-ppt1su1sut2} & \multicolumn{3}{l}{\texttt{qi-ppt1su1sut2} minus tractulus}\\
-\sneume{qi-su1sux1} & \texttt{qi-su1sux1} & \texttt{H26G} & certamine & \fbox{1.7x}\\
-\sneume{ql-su1suu2} & \texttt{ql-su1suu2} & \texttt{H34F} & facinora & \fbox{1.71x}\\
-\sneume{qi!cl} & \texttt{qi!cl} & \texttt{C82B} & spiritu\\
-\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\\
-\sneume{qippt1} & \texttt{qippt1} & \texttt{C37A} & Domine\\
-\sneume{qi!clppt1} & \texttt{qi!clppt1} & \texttt{C88T} & hostias,\\
-\sneume{ql-ppt1} & \texttt{ql-ppt1} & \texttt{C26D} & laetitiae.\\
-\sneume{ql>ppt1} & \texttt{ql>ppt1} & \texttt{C38T} & virtutis\\
-\sneume{qi>ppt1} & \texttt{qi>ppt1} & \texttt{C60S} & terram.\\
-\sneume{qisut1sux1} & \texttt{qisut1sux1} & \texttt{H269S} & linguarum\\
-\sneume{qlsut2} & \texttt{qlsut2} & \texttt{H269D} & alleluia\\
-\sneume{qi-sut2} & \texttt{qi-sut2} & \texttt{H269D} & alleluia\\
-\sneume{qi-ppt1su1sut2} & \texttt{qi-ppt1su1sut2} & \texttt{H269R} & magnalia\\
-\sneume{ql!cl>ppt1} & \texttt{ql!cl>ppt1} & \texttt{H73O} & aurum\\
-\sneume{ql!clppt1} & \texttt{ql!clppt1} & \texttt{C39B} & Domini:\\
-\sneume{ql!cl!cl>ppt1} & \texttt{ql!cl!cl>ppt1} & \texttt{E133I} & corda & \fbox{2.166x}\\
-\sneume{ql!cl!pippt1} & \texttt{ql!cl!pippt1} & \texttt{E31T} & maris & \fbox{2.166x}\\
-\sneume{ql!cl-ppt1} & \texttt{ql!cl-ppt1} & \texttt{C40A} & terram.\\
-\sneume{ql!clMppt1} & \texttt{ql!clMppt1} & \texttt{E324R} & tuum & \fbox{2.166x}\\
-\sneume{ql!cl->ppt1} & \texttt{ql!cl->ppt1} & \texttt{G132A} & Alleluia. & \fbox{0.85x}\\
-\sneume{ql!clS-2ppt1sut1} & \texttt{ql!clS-2ppt1sut1} & \texttt{E3D} & et. & \fbox{2.0x}\\
-\sneume{ql!clS-2sut1} & \texttt{ql!clS-2sut1} \textit{Cf.} \sneume{ql!clS-2ppt1sut1} & \multicolumn{3}{l}{\texttt{ql!clS-2ppt1sut1} minus tractulus}\\
-\sneume{ql!clS-2ppt1} & \texttt{ql!clS-2ppt1} \textit{Cf.} \sneume{ql!clS-2ppt1sut1} & \multicolumn{3}{l}{\texttt{ql!clS-2ppt1sut1} minus tractulus}\\
-\sneume{ql!clS-2} & \texttt{ql!clS-2} \textit{Cf.} \sneume{ql!clS-2ppt1sut1} & \multicolumn{3}{l}{\texttt{ql!clS-2ppt1sut1} minus 2 tractulis}\\
-\sneume{ql!poppt1} & \texttt{ql!poppt1} & \texttt{C59D} & Domine.\\
-\sneume{ql!po-1ppt1} & \texttt{ql!po-1ppt1} & \texttt{C58A} & homo.\\
-\sneume{ql!po~ppt1} & \texttt{ql!po\char`\~ppt1} & \texttt{H179L} & pauperem\\
-\sneume{ql!po~} & \texttt{ql!po\char`\~} \textit{Cf.} \sneume{ql!po~} & \multicolumn{3}{l}{\texttt{ql!po\char`\~} minus tractulus}\\
-\sneume{ql-ppt1su2} & \texttt{ql-ppt1su2} & \texttt{H72V} & Jerusalem\\
-\sneume{ql-ppt1su1sux1} & \texttt{ql-ppt1su1sux1} & \texttt{H73O} & Reges\\
-\sneume{ql-ppt1su1sut2} & \texttt{ql-ppt1su1sut2} & \texttt{H75I} & patris\\
-\sneume{ql-ppt1suu2} & \texttt{ql-ppt1suu2} & \texttt{H72H} & Hic\\
-\sneume{ql-ppt1sut2suu1} & \texttt{ql-ppt1sut2suu1} & \texttt{H16M} & altissimi & \fbox{1.7x}\\
-\sneume{ql!vsppt1su2} & \texttt{ql!vsppt1su2} & \texttt{H73O} & Domino\\
-\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{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}\\
-\sneume{to!cl!po-1} & \texttt{to!cl!po-1} & \texttt{N100T} & veritas\\
-\sneume{to!cl!pi} & \texttt{to!cl!pi} & \texttt{C45S} & mea\\
-\sneume{to!cl-} & \texttt{to!cl-} & \texttt{N86D} & propterea\\
-\sneume{to!cl-!cl-} & \texttt{to!cl-!cl-} & \texttt{C54A} & Adducentur\\
-\sneume{to!cl-1} & \texttt{to!cl-1} & \texttt{C45S} & filiis\\
-\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\\
-\sneume{pf!cl-} & \texttt{pf!cl-} & \texttt{G51I} & meus\\
-\sneume{pf!clM-} & \texttt{pf!clM-} \textit{Cf.} \sneume{pf!clM-ppt1} & \multicolumn{3}{l}{\texttt{pf!clM-ppt1} minus tractulus}\\
-\sneume{pf!pr} & \texttt{pf!pr} & \texttt{G9A} & Alleluia\\
-\sneume{cl!po>} & \texttt{cl!po>} \textit{Cf.} \sneume{cl!po>ppt1} & \multicolumn{3}{l}{\texttt{cl!po>ppt1} minus tractulus}\\
-\sneume{cl!cl>1} & \texttt{cl!cl>1} & \texttt{N67G} & mundi\\
-\sneume{cl!clSsut2} & \texttt{cl!clSsut2} & \texttt{E256C} & psallite & \fbox{2.166x}\\
-\sneume{cl!clS} & \texttt{cl!clS} \textit{Cf.} \sneume{cl!clSsut2} & \multicolumn{3}{l}{\texttt{cl!clSsut2} minus 2 tractulis}\\
-\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{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
-& \multicolumn{4}{l}{\textbf{significative letters}} & \\
-\sneume{lsam} & \texttt{lsam} & \texttt{C87E} & abstraxisti & \multicolumn{2}{l}{altius}\\
-\sneume{lsal} & \texttt{lsal} & \texttt{E20E} & Sion, & altius mediocriter & \fbox{2.166x}\\
-\sneume{lsb} & \texttt{lsb} & \texttt{C39B} & Domino & \multicolumn{2}{l}{bene}\\
-\sneume{lsc} & \texttt{lsc} & \texttt{C27E} & eius & \multicolumn{2}{l}{celeriter}\\
-\sneume{lscw} & \texttt{lscw} & \texttt{C148V} & nostro. & \multicolumn{2}{l}{celeriter (wide form)}\\
-\sneume{lsco} & \texttt{lsco} & \texttt{C134B} & nomen & \multicolumn{2}{l}{coniunguntur}\\
-\sneume{lscm} & \texttt{lscm} & \texttt{C58A} & oblivio & \multicolumn{2}{l}{celeriter mediocriter}\\
-\sneume{lsd} & \texttt{lsd} & \texttt{E11C} & Virgo & deprimatur & \fbox{1.85x}\\
-\sneume{lse} & \texttt{lse} & \texttt{C84T} & adiutor & \multicolumn{2}{l}{equaliter}\\
-\sneume{lsew} & \texttt{lsew} & \texttt{H266D} & si & \multicolumn{2}{l}{equaliter (wide form)}\\
-\sneume{lseq} & \texttt{lseq} & \texttt{C64Q} & viis & \multicolumn{2}{l}{equaliter}\\
-\sneume{lsfid} & \texttt{lsfid} & \texttt{E16B} & Domino & fideliter & \fbox{2.166x}\\
-\sneume{lsfr} & \texttt{lsfr} & \texttt{C58A} & non & \multicolumn{2}{l}{frendor}\\
-\sneume{lsg} & \texttt{lsg} & \texttt{C27Q} & ovem & \multicolumn{2}{l}{gutture}\\
-\sneume{lsi} & \texttt{lsi} & \texttt{C87E} & Domine & \multicolumn{2}{l}{iusum}\\
-\sneume{lsim} & \texttt{lsim} & \texttt{E336I} & universa & iusum mediocriter & \fbox{2.166x}\\
-\sneume{lsiv} & \texttt{lsiv} & \texttt{E92I} & misericors & iusum valde & \fbox{2.166x}\\
-\sneume{lsk} & \texttt{lsk} & \texttt{C62M} & confidit & \multicolumn{2}{l}{klenge}\\
-\sneume{lsl} & \texttt{lsl} & \texttt{C38T} & Tecum & \multicolumn{2}{l}{levare}\\
-\sneume{lslb} & \texttt{lslb} & \texttt{C58A} & non & \multicolumn{2}{l}{levare bene}\\
-\sneume{lslc} & \texttt{lslc} & \texttt{E151A} & ab & levare celeriter & \fbox{2.166x}\\
-\sneume{lslen} & \texttt{lslen} & \texttt{C59D} & servitui. & \multicolumn{2}{l}{leniter}\\
-\sneume{lslm} & \texttt{lslm} & \texttt{C38T} & Tecum & \multicolumn{2}{l}{levare mediocriter}\\
-\sneume{lslp} & \texttt{lslp} & \texttt{E161S} & dicit & levare parvum & \fbox{2.166x}\\
-\sneume{lslt} & \texttt{lslt} & \texttt{E148L} & Laudate & levare tenete & \fbox{2.0x}\\
-\sneume{lsm} & \texttt{lsm} & \texttt{C38T} & principium & \multicolumn{2}{l}{mediocriter}\\
-\sneume{lsmoll} & \texttt{lsmoll} & \texttt{E33V} & fines & molliter & \fbox{2.166x}\\
-\sneume{lsp} & \texttt{lsp} & \texttt{C64Q} & altissimi & \multicolumn{2}{l}{parvum}\\
-\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}\\
-\sneume{lssimil} & \texttt{lssimil} & \texttt{E193D} & ne & similiter & \fbox{2.166x}\\
-\sneume{lssimul} & \texttt{lssimul} & \texttt{E42A} & sumus. & simul & \fbox{2.166x}\\
-\sneume{lssm} & \texttt{lssm} & \texttt{C59D} & Si & \multicolumn{2}{l}{sursum mediocriter}\\
-\sneume{lsst} & \texttt{lsst} & \texttt{C87E} & Domine & \multicolumn{2}{l}{sursum tenere}\\
-\sneume{lssta} & \texttt{lssta} & \texttt{C27E} & Congregate & \multicolumn{2}{l}{statim}\\
-\sneume{lst} & \texttt{lst} & \texttt{C39B} & Domino & \multicolumn{2}{l}{tenete}\\
-\sneume{lstw} & \texttt{lstw} & \texttt{C58A} & non & \multicolumn{2}{l}{tenete (wide form)}\\
-\sneume{lstb} & \texttt{lstb} & \texttt{C39B} & Domino & \multicolumn{2}{l}{tenete bene}\\
-\sneume{lstm} & \texttt{lstm} & \texttt{E3D} & tu & tenete mediocriter & \fbox{2.166x}\\
-\sneume{lsv} & \texttt{lsv} & \texttt{E131O} & semper & valde & \fbox{2.0x}\\
-\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/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua
deleted file mode 100644
index fb28a8886f9..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.lua
+++ /dev/null
@@ -1,570 +0,0 @@
--- Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
---
--- This file is part of Gregorio.
---
--- Gregorio is free software: you can redistribute it and/or modify
--- it under the terms of the GNU General Public License as published by
--- the Free Software Foundation, either version 3 of the License, or
--- (at your option) any later version.
---
--- Gregorio is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
---
--- You should have received a copy of the GNU General Public License
--- along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
-
-local P = lpeg.P
-local R = lpeg.R
-local C = lpeg.C
-
-local function sort_keys(table_to_sort, compare)
-  local sorted = {}, key
-  for key in pairs(table_to_sort) do
-    table.insert(sorted, key)
-  end
-  table.sort(sorted, compare)
-  return sorted
-end
-
-local function sort_unique_keys(tables, compare)
-  local set = {}, ignored, table_to_scan, key
-  for ignored, table_to_scan in pairs(tables) do
-    if table_to_scan then
-      for key in pairs(table_to_scan) do
-        set[key] = true
-      end
-    end
-  end
-  return sort_keys(set)
-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,
-  PunctumLineTR = true,
-  PunctumSmall = true,
-  FlexusLineBL = true,
-  FlexusAmOneLineBL = true,
-  DescendensOriscusLineTR = true,
-  DescendensOriscusLineBLTR = true,
-  QuilismaLineTR = true,
-  VirgaLineBR = true,
-  SalicusOriscus = true,
-  ['Virgula.2'] = true,
-  ['Virgula.3'] = true,
-  ['Virgula.5'] = true,
-  ['DivisioMinima.2'] = true,
-  ['DivisioMinima.3'] = true,
-  ['DivisioMinima.5'] = true,
-  ['DivisioMinor.2'] = true,
-  ['DivisioMinor.3'] = true,
-  ['DivisioMinor.5'] = true,
-  ['DivisioMaior.2'] = true,
-  ['DivisioMaior.3'] = true,
-  ['DivisioMaior.5'] = true,
-  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 = [[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]],
-  CurlyBrace = '[ocb:1;6mm]',
-  CustosDownLong = [[j+]],
-  CustosDownMedium = [[m+]],
-  CustosDownShort = [[k+]],
-  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 = [[;]],
-  FClefChange = [[f3]],
-  FClef = [[f3]],
-  Flat = [[gx]],
-  FlatHole = [[\excluded{gx}]],
-  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}]],
-  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]',
-  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\#{}}]],
-  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 = [[g&&&v]],
-  VirgaLongqueue = [[h&&&v]],
-  VirgaOpenqueue = [[a&&&v]],
-  VirgaReversa = [[g&&&V]],
-  VirgaReversaLongqueue = [[h&&&V]],
-  VirgaReversaOpenqueue = [[a&&&V]],
-  Virgula = [[^^^^0060]],
-}
-
-local GABC_AMBITUS_ONE = {
-  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}@]],
-    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}@]], [[bqc]] },
-    PesQuassus = [[\excluded{e}@]],
-    PesQuassusInusitatus = [[\excluded{e}@]],
-    PesQuassusInusitatusLongqueue = [[\excluded{f}@]],
-    PesQuassusLongqueue = [[\excluded{f}@]],
-    PesQuassusOpenqueue = { [[\excluded{a}@]], [[cod]] },
-    Flexus = [[\excluded{e}@]],
-    FlexusOriscus = [[\excluded{e}@]],
-    FlexusOriscusInusitatus = [[\excluded{e}@]],
-  },
-  Lower = {
-    Punctum = [[\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}]],
-    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}]],
-    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}]],
-  },
-}
-
-local DEBILIS = {
-  InitioDebilis = [[-]],
-  [''] = [[]],
-}
-
-local LIQUESCENCE = {
-  Ascendens = [[<]],
-  Descendens = [[>]],
-  Deminutus = [[\~{}]],
-  Nothing = [[]],
-  [''] = [[]],
-}
-
-GregorioRef = {}
-
-function GregorioRef.emit_score_glyphs(cs_normal, cs_hollow)
-  local common_glyphs = {}
-  local normal_variants = {}
-  local normal_names = {}
-  local hollow_variants = {}
-  local hollow_names = {}
-
-  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
-          local glyph_variants = variants[name]
-          if glyph_variants == nil then
-            glyph_variants = {}
-            variants[name] = glyph_variants
-          end
-          glyph_variants[variant] = cp
-        elseif common then
-          common[glyph] = cp
-        end
-      end
-    end
-  end
-
-  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]
-    if cp then
-      cp = cp[variant]
-      if cp then
-        tex.sprint(string.format([[&{\%s\char%d}]], csname, cp))
-      end
-    end
-    if not cp then
-      tex.sprint(string.format([[&{\tiny\itshape N/A}]], csname, cp))
-    end
-  end
-
-  local function emit_score_glyph(fusion, shape, ambitus, debilis, liquescence)
-    local name = fusion..shape..ambitus..debilis..liquescence
-    local char = common_glyphs[name]
-    local gabc = GABC[shape] or GABC_AMBITUS_ONE[shape]
-    if gabc then
-      local fuse_head = ''
-      local fuse_tail = ''
-      if fusion ~= '' then
-        fuse_head = GABC_FUSE[fusion][shape]
-        if fuse_head == nil then
-          tex.error('No head fusion for '..name)
-        end
-        if type(fuse_head) == 'table' then
-          fuse_head, gabc = fuse_head[1], fuse_head[2]
-        end
-      end
-      local liq = liquescence
-      if liq == 'Up' or liq == 'Down' then
-        fuse_tail = GABC_FUSE[liq][shape]
-        if fuse_tail == nil then
-          tex.error('No tail fusion for '..name)
-        end
-        liq = ''
-      end
-      gabc = '('..fuse_head..DEBILIS[debilis]..gabc..LIQUESCENCE[liq]..fuse_tail..')'
-    else
-      texio.write_nl('GregorioRef Warning: missing GABC for '..name)
-    end
-    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 = 1,n do
-      if emitted then
-        tex.sprint([[\nopagebreak&&&]])
-      else
-        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.print([[\\]])
-      emitted = true
-    end
-  end
-
-  local glyph_names = {}
-  local ambitus = P'One' + P'Two' + P'Three' + P'Four' + P'Five'
-  local majuscule = R'AZ'
-  local minuscule = R'az'
-  local fusion = P'Upper' + P'Lower'
-  local debilis = P'InitioDebilis'
-  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) + ((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
-  local only_twos = P'Two'^1 * -1
-  local ambitus_one = P'One' * P'Two'^0 * -1
-  for name in pairs(common_glyphs) do
-    local a, b, c, d, e = pattern:match(name)
-    if b then
-      table.insert(glyph_names, { a, b, c, d, e })
-    else
-      -- if parse fails, just use the name
-      table.insert(glyph_names, { '', name, '', '', '' })
-    end
-  end
-  local function compare(x, y)
-    local nx = x[1]..x[2]
-    local ny = y[1]..y[2]
-    if nx < ny then
-      return true
-    elseif nx == ny then
-      if x[4] < y[4] then
-        return true
-      elseif x[4] == y[4] then
-        if x[5] < y[5] then
-          return true
-        elseif x[5] == y[5] and x[3] < y[3] then
-          return true
-        end
-      end
-    end
-    return false
-  end
-  table.sort(glyph_names, compare)
-  local first = true
-  local i, name
-  for i, name in ipairs(glyph_names) do
-    if not EXCLUDE[name[2]] then
-      if (name[3] == '' and name[5] == '') or name[3] == '' or only_twos:match(name[3])
-          or (GABC_AMBITUS_ONE[name[2]] and ambitus_one:match(name[3])) then
-        if first then
-          first = false
-        else
-          tex.print([[\hline]])
-        end
-        emit_score_glyph(name[1], name[2], name[3], name[4], name[5])
-      end
-    end
-  end
-end
-
-function GregorioRef.emit_extra_glyphs(csname)
-  local glyphs = font.fonts[font.id(csname)].resources.unicodes
-  local first = true
-  local odd = true
-  for i, name in ipairs(sort_keys(glyphs)) do
-    local cp = glyphs[name]
-    if cp >= 0xe000 and not EXCLUDE[name] then
-      if first then
-        first = false
-      elseif odd then
-        tex.print([[\hline]])
-      end
-      tex.sprint(string.format([[{\scriptsize %s}&{\%s\char%d}]], name, csname, cp))
-      if odd then
-        tex.sprint([[&]])
-      else
-        tex.print([[\\]])
-      end
-      odd = not odd
-    end
-  end
-  if not odd then
-    tex.print([[&\\]])
-  end
-end
-
-function GregorioRef.emit_dimension(value)
-  value = string.gsub(value, '(-?%d+%.%d+)%s*(%a+)', [[\unit[%1]{%2}]])
-  value = string.gsub(value, '(-?%d+%.)%s*(%a+)', [[\unit[%1]{%2}]])
-  value = string.gsub(value, '(-?%.?%d+)%s*(%a+)', [[\unit[%1]{%2}]])
-  tex.sprint(value)
-end
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf
deleted file mode 100644
index d58c3b2ab0f..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.pdf
+++ /dev/null
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
deleted file mode 100644
index a79a05d2c8f..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex
+++ /dev/null
@@ -1,259 +0,0 @@
-% !TEX program = LuaLaTeX+se
-%
-% Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
-%
-% This file is part of Gregorio.
-%
-% Gregorio is free software: you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation, either version 3 of the License, or
-% (at your option) any later version.
-%
-% Gregorio is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
-%
-\documentclass[12pt,a4paper]{article}
-\usepackage[titletoc,toc,title]{appendix}
-\usepackage{fontspec}
-\defaultfontfeatures{Ligatures=TeX}
-\setmainfont[
-		BoldFont=LinLibertineOZ,
-		BoldItalicFont=LinLibertineOZI,
-		SmallCapsFont=LinLibertineO,
-		SmallCapsFeatures={Letters=SmallCaps},
-]{LinuxLibertineO}
-\setsansfont[Extension=.otf,
-		BoldFont=LinBiolinum_RB,
-		ItalicFont=LinBiolinum_RI,
-		BoldItalicFont=LinBiolinum_RB,% fake
-		SmallCapsFont=LinBiolinum_R,
-		SmallCapsFeatures={Letters=SmallCaps},
-		]{LinBiolinum_R}
-\setmonofont[Extension=.otf,
-		ItalicFont=Inconsolatazi4-Regular,
-		BoldFont=Inconsolatazi4-Bold,
-		BoldItalicFont=Inconsolatazi4-Bold,
-		AutoFakeSlant,
-		ItalicFeatures={FakeSlant},
-		BoldItalicFeatures={FakeSlant}
-		]{Inconsolatazi4-Regular}
-\usepackage{enumitem}
-\usepackage{xspace}
-\usepackage{multicol}
-\usepackage{units}
-\usepackage{framed}
-\usepackage{url}
-\usepackage{tabulary}
-\usepackage{tabularx}
-\usepackage{xparse}
-
-\usepackage{makeidx}
-\makeindex
-
-\usepackage[table]{xcolor}
-\definecolor{lightgray}{gray}{0.9}
-\definecolor{green}{HTML}{0c700c}
-\definecolor{myred}{HTML}{FF3333}
-
-\usepackage{adjustbox} % must be after xcolor
-\usepackage{minted} % must be after xcolor
-\makeatletter
-\@ifpackagelater{minted}{2013/12/21}{%
-	\newminted{latex}{autogobble,bgcolor=lightgray}%
-}{%
-	\newminted{latex}{gobble=2,bgcolor=lightgray}%
-}%
-\makeatother
-%\newminted{gabc}{bgcolor=lightgray} % can this be done?
-\newenvironment{gabccode}{\tt}{}
-
-
-\usepackage[allowdeprecated=false]{gregoriotex}
-
-\usepackage{carolmin}
-\usepackage{mflogo}
-
-\usepackage{hyperref}
-\hypersetup{colorlinks, citecolor=black, filecolor=black, linkcolor=green, urlcolor=green}
-
-\usepackage{longtable}
-\usepackage{multirow}
-\usepackage{pdflscape}
-\usepackage{hhline}
-\usepackage{listings}
-\usepackage{lstautogobble}
-\directlua{dofile('GregorioRef.lua')}
-
-\newcommand*{\eg}{e.g.\@\xspace}
-\newcommand*{\nb}{n.b.\@\xspace}
-\newcommand*{\ie}{i.e.\@\xspace}
-\newcommand*{\etc}{etc.\@\xspace}
-
-\newif\ifbreakable
-\let\oldsubsection\subsection
-\def\subsection{\filbreak\breakablefalse\oldsubsection}
-\let\oldsubsubsection\subsubsection
-\def\subsubsection{\filbreak\breakablefalse\oldsubsubsection}
-
-\newcommand{\macroname}[3]{%
-	\vspace{3.25ex plus 1ex minus .2ex}%
-	\ifbreakable%
-		\filbreak%
-	\else%
-		\global\breakabletrue%
-	\fi%
-	\makebox[\linewidth]{\ttfamily\bfseries #1#2%
-	\hspace{\fill}\normalfont\itshape #3}%
-	\vspace{1.5ex plus .2ex}%
-	\index{#1}}
-	%\addcontentsline{toc}{subsubsection}{#1}}
-
-\newcommand{\optional}[1]{{\itshape #1}}
-
-\lstset{backgroundcolor=\color{lightgray},
-				basicstyle=\small\ttfamily,
-				numbers=left,
-				numberstyle=\footnotesize,
-				stepnumber=1,
-				numbersep=5pt}
-
-% for the character tables
-\font\greciliae = {name:greciliae} at 1000000 sp\relax
-\font\greciliaeHollow = {name:greciliae-hollow} at 1000000 sp\relax
-\font\greciliaeOp = {name:greciliae-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}}
-
-\newenvironment{argtable}{%
-	\bigskip\rowcolors{1}{lightgray}{lightgray}
-	\tabularx{\textwidth}{clX}
-		Arg & Value & Description \\
-		\hline}%
-	{\endtabularx\bigskip}
-
-\makeatletter%
-\NewDocumentEnvironment{gdimension}{m}{\macroname{#1}{}{gsp-default.tex}}{%
-
-	\gre@rubberpermit{#1}%
-	\ifgre@rubber%
-		Default: \directlua{GregorioRef.emit_dimension("\luaescapestring{\csname gre@space@skip@#1\endcsname}")}
-	\else%
-		Default: \directlua{GregorioRef.emit_dimension("\luaescapestring{\csname gre@space@dimen@#1\endcsname}")}
-	\fi%
-}
-
-\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
-
-\begin{document}
-
-\begin{titlepage}
-	\begin{center}
-		\Huge
-		\textcolor{myred}{Gregorio} and \textcolor{myred}{Gregorio\TeX}:
-
-		Tools for gregorian score engraving.
-
-		\vspace{1cm}
-
-		\large Version \textbf{5.0.1}, 16 April 2017 %% PARSE_VERSION_DATE
-
-		\vspace{1.5cm}
-	\end{center}
-	\gresetlinecolor{gregoriocolor}
-	\grechangestyle{lowchoralsign}{\cminfamily\small}%
-	\grechangestyle{highchoralsign}{\cminfamily\small}%
-	\def\GreStar{\greheightstar}%
-	\greannotation{\scriptsize Comm.}%
-	\greannotation{\scriptsize VII}%
-	\begingroup%
-		\color{black!60}%
-		\setmainfont[SmallCapsFont=AlegreyaSC]{Alegreya}%
-		\newlength{\mini}%
-		\setlength{\mini}{\hsize}%
-		\addtolength{\mini}{-4cm}%
-		\setlength{\fboxsep}{5mm}%
-		\hfill\fbox{\parbox{\mini}{\gregorioscore[f]{factus}}}\hfill%
-	\endgroup
-	\begin{center}
-		\vspace{1.5cm}%
-		\href{http://gregorio-project.github.io/}{Homepage}
-
-		Source code available on
-		\href{http://github.com/gregorio-project/gregorio}{GitHub}.
-	\end{center}
-
-	\vspace{2cm}
-\end{titlepage}
-
-\cleardoublepage
-
-\tableofcontents
-
-\setlength{\parskip}{\bigskipamount}
-\cleardoublepage
-
-\section{Gregorio\TeX{} Macros}
-The following sections document the macros available in the Gregorio\TeX{} package. The format is as follows:
-
-\macroname{MacroName}{\{Args\}}{Source File}
-Description of macro.
-
-\begin{argtable}
-	Arg \# & Data type & Description of argument\\
-	Arg \# & \texttt{keyword} & Description of the setting the keyword corresponds to
-\end{argtable}
-
-The source file where the macro is defined is included for developers
-who wish to consult it.
-
-Some of the macros intended for inclusion in the main.tex file by the user
-include usage examples.
-
-Macros are divided into three groups:
-\begin{description}
-\item[User Commands] These macros are meant to be used by your average user in their \TeX\ files in order to fine tune the appearance of their scores.  They should have names which consist solely of lowercase letters and be prefixed with the \texttt{gre}.  Where the name clearly identifies the function as belonging to Gregorio\TeX, the prefix may be omitted.
-\item[Gregorio Controls] These macros are written by the command line tool to gtex files and should not appear outside of gtex files.  They should have names which are in CamelCase and be prefixed with \texttt{Gre}.
-\item[Gregorio\TeX\ internals] These macros are used by Gregorio\TeX\ to process and typeset a score and should not appear in a user's document anywhere (not even in gtex files).  They should have names which are all lowercase and be prefixed with \makeatletter\texttt{gre@}\makeatother.
-\end{description}
-
-
-\include{Command_Index_User}
-\include{Command_Index_gregorio}
-\include{Command_Index_internal}
-\include{Gabc}
-
-\begin{appendices}
-	%Turn off the \filbreak stuff to prevent it from messing up the long tables in the appendicies
-	\let\subsection\oldsubsection
-	\let\subsubsection\oldsubsubsection
-	\renewcommand\thetable{\thesection\arabic{table}}
-	\renewcommand\thefigure{\thesection\arabic{figure}}
-	\include{Appendix_Font_Tables}
-\end{appendices}
-
-\addcontentsline{toc}{section}{Index}
-\printindex
-
-\end{document}
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am b/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am
deleted file mode 100644
index 526553fa230..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
-#
-# This file is part of Gregorio.
-#
-# Gregorio is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Gregorio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
-
-# GregorioRef.tex must be the first source file
-SRCFILES = GregorioRef.tex Command_Index_gregorio.tex \
-		   Command_Index_internal.tex Command_Index_User.tex \
-		   Gabc.tex Appendix_Font_Tables.tex GregorioRef.lua factus.gabc
-NABCSRCFILES = GregorioNabcRef.tex veni.gabc omnes.gabc
-
-GREGORIO=gregorio-$(FILENAME_VERSION)
-
-.NOTPARALLEL:
-
-# I know these rules look wrong, but they must not depend on anything that
-# gets generated or make distcheck will fail.
-
-GregorioRef.pdf: $(SRCFILES)
-	$(MAKE) $(AM_MAKEFLAGS) -C ../src $(GREGORIO)
-	../src/$(GREGORIO) -o factus.gtex $(<D)/factus.gabc
-	TEXINPUTS=$(<D):$(<D)/../tex: LUAINPUTS=$(<D):$(<D)/../tex: \
-		 TTFONTS=$(<D)/../fonts: PATH=../src:${PATH} latexmk -f -recorder -pdf \
-		 -interaction=nonstopmode -halt-on-error \
-		 -pdflatex='lualatex --shell-escape %O %S' \
-		 -jobname=GregorioRef $< || rm $@
-
-GregorioNabcRef.pdf: $(NABCSRCFILES)
-	$(MAKE) $(AM_MAKEFLAGS) -C ../src $(GREGORIO)
-	../src/$(GREGORIO) -o veni.gtex $(<D)/veni.gabc
-	../src/$(GREGORIO) -o omnes.gtex $(<D)/omnes.gabc
-	TEXINPUTS=$(<D):$(<D)/../tex: LUAINPUTS=$(<D):$(<D)/../tex: \
-		 TTFONTS=$(<D)/../fonts: PATH=../src:${PATH} latexmk -recorder -pdf \
-		 -interaction=nonstopmode -halt-on-error \
-		 -pdflatex='lualatex --shell-escape %O %S' \
-		 -jobname=GregorioNabcRef $< || rm $@
-
-doc: GregorioRef.pdf GregorioNabcRef.pdf
-
-pdf-local: doc
-
-clean-doc-intermediate:
-	latexmk -quiet -c -f -jobname=GregorioRef GregorioRef.tex
-	latexmk -quiet -c -f -jobname=GregorioNabcRef GregorioNabcRef.tex
-	rm -rf _minted* *.gtex *.aux *.gaux *.glog
-
-clean-doc: clean-doc-intermediate
-	rm -rf GregorioRef.pdf
-	rm -rf GregorioNabcRef.pdf
-
-distclean-local: clean-doc-intermediate
-
-maintainer-clean-local: clean-doc
-
-EXTRA_DIST = $(SRCFILES) $(NABCSRCFILES) \
-	     GregorioRef.pdf \
-	     GregorioNabcRef.pdf \
-	     README.md
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/README.md b/Build/source/texk/gregorio/gregorio-src/doc/README.md
deleted file mode 100644
index 4bbd40f2dab..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Documentation for gregorio and gregoriotex
-==========================================
-
-This folder contains the source files of a manual is primarily intended for
-developers. Users should not expect to find an indepth guide on using gregorio.
-
-You can find a compiled PDF version in the files of each [Gregorio release](https://github.com/gregorio-project/gregorio/releases).
-
-Developers can use this manual as a reference for information on the
-internal workings of gregorio.
-
-## Building
-
-To compile the pdf you must have
- * an up-to-date [TeXLive](https://www.tug.org/texlive/) system, with at least the `luatex` bundle and `latexmk`
- * the [Linux Libertine](http://www.linuxlibertine.org/index.php?id=1&L=1) and [Inconsolata](http://www.levien.com/type/myfonts/inconsolata.html) fonts (distributed by TeXLive too)
- * the [`pygments` library](http://pygments.org/)
-
-Once you have run `./configure` in the main directory, run `make doc` in this directory.
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/factus.gabc b/Build/source/texk/gregorio/gregorio-src/doc/factus.gabc
deleted file mode 100644
index 5c290d30f73..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/factus.gabc
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Factus est repente;
-office-part: Communio;
-occasion: Dominica Pentecostes ad Missam in die;
-book: Graduale Novum;
-mode: 7;
-user-notes: with choral annotations and episema from the non-diastematic neumes;
-annotation: Comm.;
-annotation: VII.;
-%%
-(c3) F<sc>Ac</sc>(e)<sc>tus</sc>(ei) est(i) re(i)pen(i)te(f[cs:t]) <sp>*</sp>()
-de(i) cæ(i)lo(h) so(kjk[cs:c]i)nus(i) (,)
-ad(i)ve(i)ni(ij)en(j[cs:t]i~)tis(ji__) spi(hj)ri(i)tus(h)
-vehe(h_f!gwh)men(hi~)tis,(g) (;)
-u(eh[cs:c]g)bi(h) e(iji)rant(hi[cs:t]h)
-se(h[cs:c]g)den-(fhg[cs:c]e~)tes,(fe__) (,)
-al(eg~)le(gv_/fhg)lu(ef[cs:t]e)ia:(e) (:e+)
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/omnes.gabc b/Build/source/texk/gregorio/gregorio-src/doc/omnes.gabc
deleted file mode 100644
index f8d9c9c339d..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/omnes.gabc
+++ /dev/null
@@ -1,13 +0,0 @@
-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) (::)
diff --git a/Build/source/texk/gregorio/gregorio-src/doc/veni.gabc b/Build/source/texk/gregorio/gregorio-src/doc/veni.gabc
deleted file mode 100644
index e13be15d58b..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/doc/veni.gabc
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Veni Sancte Spiritus;
-office-part: Alleluia;
-mode: 2;
-book: Graduale Romanum, 1908, p. 249; Graduale Triplex, 1979, p. 253; Sg. 376 p. 296;
-transcriber: Andrew Hinkley, Jakub Jelínek;
-nabc-lines: 1;
-annotation: II;
-%%
-(f3)
-AL(ef~|ta>)le(fg/hggf|peclhgpi)lú(ef~|ta>)ia.(f.|ta-) (,)
-(ii//|bv-|gh!ivHG//|vi-hhppu2su1sut1|fhg/|to|eef.|pt) (;)
-(kxjj//|/////bv-|ikJI'/|pe-hhsu1sut1|ivHF.//|vi-su2sut1|giHG'E/|pe-su2suy1|ggf.|pr) <sp>V/</sp>.(::)
-Ve(e!fwg/|``qlppt1|hggf/ef|ci-or>peS)ni(f.|vi-) (,)
-Sanc(f|vi-)te(g!hwi|ql-ppt1) Spí(iv.//|vi-|hig/|tohh|hfg|cl-hhvi-hi)ri(gef|po-1)tus,(f.|vi-) (;)
-re(h|vi-)plé(gvFEf/ggf.|vi-su1sut1vi-hhpr-hh) (,)
-tu(f|ta)ó(hg|vi-)rum(hi|pe->) cor(i_|vi>)da(ghfg|vi-po-1hh) fi(g|vi-)dé(gf|cl-hh)li(ef|pehh)um:(f.|vi-hh) (:)
-et(g|vi-) tu(i|vi-)i(ij|pe) a(j|vi-)mór(kxkvJI'/|/////vi-hhsu1sut1|ivHF.//|vi-su1sut1|ghGF'/|pe-su1sut1|ef.,|pi|kxeg//i_j!kvJI'/ivHF.//|tahksaM-4hkvi-hisu1sut1vi-hisu1sut1|ghGF'/|``pe-su1sut1|ef.//|``pi|e!fwg'!hv|``ql-ppt1vi-hj)is(g.|//vi-) (;)
-in(gef|po-1) e(gf|cl)is(f.|ta-) ig(ef~|ta>)nem(f|vi-) ac(fg/hggf|pecl!pr)cén(ef~|ta>)de.(f.|vi-) (,)
-(ii//|bv-|gh!ivHG//|vi-hhppt2su1sut1|fhg//|to|eef.|pt) (;)
-(kxjj//ikJI'/ivHF.//giHG'E/ggf.) (::)
diff --git a/Build/source/texk/gregorio/gregorio-src/examples/FactusEst.gabc b/Build/source/texk/gregorio/gregorio-src/examples/FactusEst.gabc
deleted file mode 100644
index 2245a652b97..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/examples/FactusEst.gabc
+++ /dev/null
@@ -1,24 +0,0 @@
-% !TEX TS-program = LuaLaTeX+se
-% !TEX root = main-lualatex.tex
-
-% This example demonstrates the use of nabc
-
-name: Factus est cum Alleluia;
-office-part: Communio;
-mode: 7;
-book: Graduale Romanum, 1961, p. 296;
-transcriber: Andrew Hinkley, Jakub Jelínek;
-
-% You have to put the number of nabc lines here, only 1 is allowed for now
-
-nabc-lines: 1;
-%%
-(c3)
-FAc(e|talsi8)tus(ei|pe) est(i|vi) re(i|vihh)pén(i|vihi)te(e.|tahglsi9) de(i|vihhlsl2) cæ(i|vihhlse1)lo(h|ta) so(kjki|pfhhlsl2lsc2)nus(i.|ta) (,)
-ad(i|talse8)ve(i|ta)ni(ij|pe)én(ji~|vi>lst2)tis(j_i|cl-hh) spí(hj|````peSlsl3lsm7lsi8)ri(i|vi)tus(h|ta) ve(h.|cl-lse4)he(f!gwh|ql)mén(hi~|ta>)tis,(h.|vi) (;)
-u(hg|tolsi7lsc2)bi(h|vi) e(iji|to)rant(hih|tolst2lss9lsc7) se(hg|cllsc3lse7)dén(fhG'E|to>lsc2lsi9)tes,(fe..|cl-) (,)
-al(eg~|````ta>lse4)le(gv./fhg|vi-tohhlsi7lss6)lú(efe___|toS)ia:(e.|ta) (:)
-et(e|talse4) re(f|vilsc1)plé(h!i'j|vi-hhpehjlss7)ti(i|ta) sunt(i|ta) om(ij~|ta>)nes(i|talse6) Spí(j|vihh)ri(i|vi)tu(h|talsc3) Sanc(ij~|ta>lss1)to,(j.|vi) (;)
-lo(i|vilsim2)quén(hg/h_ih~|cllsc2pq>lst2)tes(f|ta) ma(eg~|```ta>lse4lsl3)gná(ghg___//e!f'g|vicl-sahhlsi7)li(fd|clMlsc3lsi9)a(f|vi) De(efe___|toS)i,(e.|ta) (;)
-al(eg~|ta>lsl1lsp2)le(g|vi)lú(hih|to>)ia,(f.|vi) (,)
-al(eg~|ta>lsi8)le(gv.fhg|vi-tohi)lú(efe___|toS)ia.(e.|ta) (::)
diff --git a/Build/source/texk/gregorio/gregorio-src/examples/Makefile.am b/Build/source/texk/gregorio/gregorio-src/examples/Makefile.am
deleted file mode 100644
index 21b8f26fc05..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/examples/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright (C) 2006-2017 The Gregorio Project (see CONTRIBUTORS.md)
-#
-# This file is part of Gregorio.
-#
-# Gregorio is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# Gregorio is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Gregorio.  If not, see <http://www.gnu.org/licenses/>.
-
-EXTRA_DIST=PopulusSion.gabc main-lualatex.tex FactusEst.gabc debugging.tex
diff --git a/Build/source/texk/gregorio/gregorio-src/examples/PopulusSion.gabc b/Build/source/texk/gregorio/gregorio-src/examples/PopulusSion.gabc
deleted file mode 100644
index 856dde3d091..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/examples/PopulusSion.gabc
+++ /dev/null
@@ -1,27 +0,0 @@
-% !TEX TS-program = LuaLaTeX+se
-% !TEX root = main-lualatex.tex
-
-% The first part of the score is called the header, you can input some useful informations here:
-
-name: Pópulus Sion;
-office-part: Introitus;
-occasion: Dominica II Adventus;
-date: 2006;
-commentary: Cf. Is. 30, 19 . 30 ; Ps. 79;
-transcriber: Elie Roux;
-transcription-date: 2006;
-style: modern;
-
-% Then, when gregorio encounters the following line (%%), it switches to the score, where you input the notes
-
-%%
-
-% The syntax in this part is called gabc. Please refer to http://home.gna.org/gregorio/gabc/#basis
-
-Pó(c3eh/hi)pu(h)lus(h) Si(hi)on,(hgh.) *(;) ec(hihi)ce(e.) Dó(e.f!gwhhi)mi(h){n}us(h) vé(hi)ni(ig//ih)et(h.) (,) ad(iv./hig) sal(fe~)ván(ghg)das(fg) gen(e_f_e_)tes(e.) :(:)
-
-et(e) au(eh)dí(hhi)tam(i) fá(kjki)ci(i)et(i) Dó(ij)mi(ihi)nus(iv./hiHF.) (,) gló(h!i'j)ri(ji/kvJI)am(ij~) vo(j.i!jwk)cis(j_i) su(i_j_i_)æ,(i.) (;) in(e) læ(e)tí(e!f'h)ti(h)a(hi!jvji)
-
-cor(gh!ijI'~H~)dis(ihhf!gwh) ve(e_f_e_)stri.(e.) <i>Ps.</i>(::) Qui(ehg) re(hi)gis(i) I(i)sra(i)el,(ik) in(j)tén(ji~)de(ij..) :(:) qui(ig) de(hi)dú(i)cis(i)
-
-vel(i)ut(i!jwk) o(i')vem(h) Jo(hhh)seph.(fe..) (::) Gló(ehg)ri(hi)a(i) Pa(i)tri.(i) (:) <eu>E(i) u(i!jwk) o(i) u(h) a(hhh) e</eu>(fe..) (::)
diff --git a/Build/source/texk/gregorio/gregorio-src/examples/debugging.tex b/Build/source/texk/gregorio/gregorio-src/examples/debugging.tex
deleted file mode 100644
index 9aeee8d0558..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/examples/debugging.tex
+++ /dev/null
@@ -1,10 +0,0 @@
-% !TEX program = LuaLaTeX+se
-\documentclass{article}
-
-\usepackage[debug]{gregoriotex}
-
-\listfiles
-
-\begin{document}
-Debugging document
-\end{document}
diff --git a/Build/source/texk/gregorio/gregorio-src/examples/main-lualatex.tex b/Build/source/texk/gregorio/gregorio-src/examples/main-lualatex.tex
deleted file mode 100644
index 018a0a06b37..00000000000
--- a/Build/source/texk/gregorio/gregorio-src/examples/main-lualatex.tex
+++ /dev/null
@@ -1,48 +0,0 @@
-% !TEX program = LuaLaTeX+se
-
-% This is a simple template for a LuaLaTeX document using gregorio scores.
-
-\documentclass[11pt]{article} % use larger type; default would be 10pt
-
-% usual packages loading:
-\usepackage{fontspec}
-\usepackage{graphicx} % support the \includegraphics command and options
-\usepackage{geometry} % See geometry.pdf to learn the layout options. There are lots.
-\geometry{a4paper} % or letterpaper (US) or a5paper or....
-\usepackage{gregoriotex} % for gregorio score inclusion
-\usepackage{fullpage} % to reduce the margins
-\usepackage{libertine} % Decent (free) font for Gregorian, but should be changed if you have high standards
-
-\begin{document}
-
-% The title:
-\begin{center}\begin{huge}\textsc{Populus Sion}\end{huge}\end{center}
-
-% Here we set the space around the initial.
-% Please report to http://gregorio-project.github.io/gregoriotex/details.html for more details and options
-\grechangedim{beforeinitialshift}{2.2mm}{scalable}
-\grechangedim{afterinitialshift}{2.2mm}{scalable}
-
-% Here we set the initial font. Change 43 if you want a bigger initial.
-\grechangestyle{initial}{\fontsize{43}{43}\selectfont}%
-
-% We set red lines here, comment it if you want black ones.
-\gresetlinecolor{gregoriocolor}
-
-% We set VII above the initial manually
-\grechangestyle{annotation}{\small\bfseries}
-\greannotation{Intr.}
-\greannotation{\textsc{vii}}
-
-% We use the "commentary" field of the score in the top right corner:
-\gresetheadercapture{commentary}{grecommentary}{string}
-
-% and finally we include the scores. The file must be in the same directory as this one.
-\gregorioscore[a]{PopulusSion}
-
-\bigskip
-\begin{center}\begin{huge}\textsc{Factus Est}\end{huge}\end{center}
-
-\gregorioscore[a]{FactusEst}
-
-\end{document}
diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c
index ed25c70fe30..36595065aef 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c
@@ -1,6 +1,6 @@
-#line 2 "gabc/gabc-notes-determination-l.c"
+#line 1 "gabc/gabc-notes-determination-l.c"
 
-#line 4 "gabc/gabc-notes-determination-l.c"
+#line 3 "gabc/gabc-notes-determination-l.c"
 
 #define  YY_INT_ALIGNED long int
 
@@ -8,11 +8,17 @@
 
 #define yy_create_buffer gabc_notes_determination__create_buffer
 #define yy_delete_buffer gabc_notes_determination__delete_buffer
-#define yy_flex_debug gabc_notes_determination__flex_debug
+#define yy_scan_buffer gabc_notes_determination__scan_buffer
+#define yy_scan_string gabc_notes_determination__scan_string
+#define yy_scan_bytes gabc_notes_determination__scan_bytes
 #define yy_init_buffer gabc_notes_determination__init_buffer
 #define yy_flush_buffer gabc_notes_determination__flush_buffer
 #define yy_load_buffer_state gabc_notes_determination__load_buffer_state
 #define yy_switch_to_buffer gabc_notes_determination__switch_to_buffer
+#define yypush_buffer_state gabc_notes_determination_push_buffer_state
+#define yypop_buffer_state gabc_notes_determination_pop_buffer_state
+#define yyensure_buffer_stack gabc_notes_determination_ensure_buffer_stack
+#define yy_flex_debug gabc_notes_determination__flex_debug
 #define yyin gabc_notes_determination_in
 #define yyleng gabc_notes_determination_leng
 #define yylex gabc_notes_determination_lex
@@ -28,11 +34,245 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 0
+#define YY_FLEX_SUBMINOR_VERSION 4
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
 
+#ifdef yy_create_buffer
+#define gabc_notes_determination__create_buffer_ALREADY_DEFINED
+#else
+#define yy_create_buffer gabc_notes_determination__create_buffer
+#endif
+
+#ifdef yy_delete_buffer
+#define gabc_notes_determination__delete_buffer_ALREADY_DEFINED
+#else
+#define yy_delete_buffer gabc_notes_determination__delete_buffer
+#endif
+
+#ifdef yy_scan_buffer
+#define gabc_notes_determination__scan_buffer_ALREADY_DEFINED
+#else
+#define yy_scan_buffer gabc_notes_determination__scan_buffer
+#endif
+
+#ifdef yy_scan_string
+#define gabc_notes_determination__scan_string_ALREADY_DEFINED
+#else
+#define yy_scan_string gabc_notes_determination__scan_string
+#endif
+
+#ifdef yy_scan_bytes
+#define gabc_notes_determination__scan_bytes_ALREADY_DEFINED
+#else
+#define yy_scan_bytes gabc_notes_determination__scan_bytes
+#endif
+
+#ifdef yy_init_buffer
+#define gabc_notes_determination__init_buffer_ALREADY_DEFINED
+#else
+#define yy_init_buffer gabc_notes_determination__init_buffer
+#endif
+
+#ifdef yy_flush_buffer
+#define gabc_notes_determination__flush_buffer_ALREADY_DEFINED
+#else
+#define yy_flush_buffer gabc_notes_determination__flush_buffer
+#endif
+
+#ifdef yy_load_buffer_state
+#define gabc_notes_determination__load_buffer_state_ALREADY_DEFINED
+#else
+#define yy_load_buffer_state gabc_notes_determination__load_buffer_state
+#endif
+
+#ifdef yy_switch_to_buffer
+#define gabc_notes_determination__switch_to_buffer_ALREADY_DEFINED
+#else
+#define yy_switch_to_buffer gabc_notes_determination__switch_to_buffer
+#endif
+
+#ifdef yypush_buffer_state
+#define gabc_notes_determination_push_buffer_state_ALREADY_DEFINED
+#else
+#define yypush_buffer_state gabc_notes_determination_push_buffer_state
+#endif
+
+#ifdef yypop_buffer_state
+#define gabc_notes_determination_pop_buffer_state_ALREADY_DEFINED
+#else
+#define yypop_buffer_state gabc_notes_determination_pop_buffer_state
+#endif
+
+#ifdef yyensure_buffer_stack
+#define gabc_notes_determination_ensure_buffer_stack_ALREADY_DEFINED
+#else
+#define yyensure_buffer_stack gabc_notes_determination_ensure_buffer_stack
+#endif
+
+#ifdef yylex
+#define gabc_notes_determination_lex_ALREADY_DEFINED
+#else
+#define yylex gabc_notes_determination_lex
+#endif
+
+#ifdef yyrestart
+#define gabc_notes_determination_restart_ALREADY_DEFINED
+#else
+#define yyrestart gabc_notes_determination_restart
+#endif
+
+#ifdef yylex_init
+#define gabc_notes_determination_lex_init_ALREADY_DEFINED
+#else
+#define yylex_init gabc_notes_determination_lex_init
+#endif
+
+#ifdef yylex_init_extra
+#define gabc_notes_determination_lex_init_extra_ALREADY_DEFINED
+#else
+#define yylex_init_extra gabc_notes_determination_lex_init_extra
+#endif
+
+#ifdef yylex_destroy
+#define gabc_notes_determination_lex_destroy_ALREADY_DEFINED
+#else
+#define yylex_destroy gabc_notes_determination_lex_destroy
+#endif
+
+#ifdef yyget_debug
+#define gabc_notes_determination_get_debug_ALREADY_DEFINED
+#else
+#define yyget_debug gabc_notes_determination_get_debug
+#endif
+
+#ifdef yyset_debug
+#define gabc_notes_determination_set_debug_ALREADY_DEFINED
+#else
+#define yyset_debug gabc_notes_determination_set_debug
+#endif
+
+#ifdef yyget_extra
+#define gabc_notes_determination_get_extra_ALREADY_DEFINED
+#else
+#define yyget_extra gabc_notes_determination_get_extra
+#endif
+
+#ifdef yyset_extra
+#define gabc_notes_determination_set_extra_ALREADY_DEFINED
+#else
+#define yyset_extra gabc_notes_determination_set_extra
+#endif
+
+#ifdef yyget_in
+#define gabc_notes_determination_get_in_ALREADY_DEFINED
+#else
+#define yyget_in gabc_notes_determination_get_in
+#endif
+
+#ifdef yyset_in
+#define gabc_notes_determination_set_in_ALREADY_DEFINED
+#else
+#define yyset_in gabc_notes_determination_set_in
+#endif
+
+#ifdef yyget_out
+#define gabc_notes_determination_get_out_ALREADY_DEFINED
+#else
+#define yyget_out gabc_notes_determination_get_out
+#endif
+
+#ifdef yyset_out
+#define gabc_notes_determination_set_out_ALREADY_DEFINED
+#else
+#define yyset_out gabc_notes_determination_set_out
+#endif
+
+#ifdef yyget_leng
+#define gabc_notes_determination_get_leng_ALREADY_DEFINED
+#else
+#define yyget_leng gabc_notes_determination_get_leng
+#endif
+
+#ifdef yyget_text
+#define gabc_notes_determination_get_text_ALREADY_DEFINED
+#else
+#define yyget_text gabc_notes_determination_get_text
+#endif
+
+#ifdef yyget_lineno
+#define gabc_notes_determination_get_lineno_ALREADY_DEFINED
+#else
+#define yyget_lineno gabc_notes_determination_get_lineno
+#endif
+
+#ifdef yyset_lineno
+#define gabc_notes_determination_set_lineno_ALREADY_DEFINED
+#else
+#define yyset_lineno gabc_notes_determination_set_lineno
+#endif
+
+#ifdef yywrap
+#define gabc_notes_determination_wrap_ALREADY_DEFINED
+#else
+#define yywrap gabc_notes_determination_wrap
+#endif
+
+#ifdef yyalloc
+#define gabc_notes_determination_alloc_ALREADY_DEFINED
+#else
+#define yyalloc gabc_notes_determination_alloc
+#endif
+
+#ifdef yyrealloc
+#define gabc_notes_determination_realloc_ALREADY_DEFINED
+#else
+#define yyrealloc gabc_notes_determination_realloc
+#endif
+
+#ifdef yyfree
+#define gabc_notes_determination_free_ALREADY_DEFINED
+#else
+#define yyfree gabc_notes_determination_free
+#endif
+
+#ifdef yytext
+#define gabc_notes_determination_text_ALREADY_DEFINED
+#else
+#define yytext gabc_notes_determination_text
+#endif
+
+#ifdef yyleng
+#define gabc_notes_determination_leng_ALREADY_DEFINED
+#else
+#define yyleng gabc_notes_determination_leng
+#endif
+
+#ifdef yyin
+#define gabc_notes_determination_in_ALREADY_DEFINED
+#else
+#define yyin gabc_notes_determination_in
+#endif
+
+#ifdef yyout
+#define gabc_notes_determination_out_ALREADY_DEFINED
+#else
+#define yyout gabc_notes_determination_out
+#endif
+
+#ifdef yy_flex_debug
+#define gabc_notes_determination__flex_debug_ALREADY_DEFINED
+#else
+#define yy_flex_debug gabc_notes_determination__flex_debug
+#endif
+
+#ifdef yylineno
+#define gabc_notes_determination_lineno_ALREADY_DEFINED
+#else
+#define yylineno gabc_notes_determination_lineno
+#endif
+
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
 /* begin standard C headers. */
@@ -103,60 +343,48 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
+
 #endif /* ! C99 */
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
+/* begin standard C++ headers. */
 
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
 #define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
 #else
-#define yyconst
+#define yynoreturn
 #endif
 
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
+/* Promotes a possibly negative, possibly signed char to an
+ *   integer in range [0..255] for use as an array index.
  */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
 
 /* Enter a start condition.  This macro really ought to take a parameter,
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
 #define BEGIN (yy_start) = 1 + 2 *
-
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
 #define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
-
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE gabc_notes_determination_restart(gabc_notes_determination_in  )
-
+#define YY_NEW_FILE yyrestart( yyin  )
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
@@ -186,14 +414,14 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t yy_size_t;
 #endif
 
-extern yy_size_t gabc_notes_determination_leng;
+extern int yyleng;
 
-extern FILE *gabc_notes_determination_in, *gabc_notes_determination_out;
+extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
-
+    
     #define YY_LESS_LINENO(n)
     #define YY_LINENO_REWIND_TO(ptr)
     
@@ -201,16 +429,15 @@ extern FILE *gabc_notes_determination_in, *gabc_notes_determination_out;
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up gabc_notes_determination_text. */ \
+		/* Undo effects of setting up yytext. */ \
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
 		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
 		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up gabc_notes_determination_text again */ \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
-
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -225,12 +452,12 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	yy_size_t yy_buf_size;
+	int yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -253,7 +480,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -270,8 +497,8 @@ struct yy_buffer_state
 	 * possible backing-up.
 	 *
 	 * When we actually see the EOF, we change the status to "new"
-	 * (via gabc_notes_determination_restart()), so that the user can continue scanning by
-	 * just pointing gabc_notes_determination_in at a new input file.
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
 
@@ -281,7 +508,7 @@ struct yy_buffer_state
 /* Stack of input buffers. */
 static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
 static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -292,95 +519,88 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
                           ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
                           : NULL)
-
 /* Same as previous macro, but useful when we know that the buffer stack is not
  * NULL or when we need an lvalue. For internal use only.
  */
 #define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when gabc_notes_determination_text is formed. */
+/* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t gabc_notes_determination_leng;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int yyleng;
 
 /* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
+static char *yy_c_buf_p = NULL;
 static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow gabc_notes_determination_wrap()'s to do buffer switches
- * instead of setting up a fresh gabc_notes_determination_in.  A bit of a hack ...
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void gabc_notes_determination_restart (FILE *input_file  );
-void gabc_notes_determination__switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE gabc_notes_determination__create_buffer (FILE *file,int size  );
-void gabc_notes_determination__delete_buffer (YY_BUFFER_STATE b  );
-void gabc_notes_determination__flush_buffer (YY_BUFFER_STATE b  );
-void gabc_notes_determination_push_buffer_state (YY_BUFFER_STATE new_buffer  );
-void gabc_notes_determination_pop_buffer_state (void );
-
-static void gabc_notes_determination_ensure_buffer_stack (void );
-static void gabc_notes_determination__load_buffer_state (void );
-static void gabc_notes_determination__init_buffer (YY_BUFFER_STATE b,FILE *file  );
-
-#define YY_FLUSH_BUFFER gabc_notes_determination__flush_buffer(YY_CURRENT_BUFFER )
+void yyrestart ( FILE *input_file  );
+void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
+void yy_delete_buffer ( YY_BUFFER_STATE b  );
+void yy_flush_buffer ( YY_BUFFER_STATE b  );
+void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state ( void );
 
-YY_BUFFER_STATE gabc_notes_determination__scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE gabc_notes_determination__scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE gabc_notes_determination__scan_bytes (yyconst char *bytes,yy_size_t len  );
+static void yyensure_buffer_stack ( void );
+static void yy_load_buffer_state ( void );
+static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
+#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
 
-void *gabc_notes_determination_alloc (yy_size_t  );
-void *gabc_notes_determination_realloc (void *,yy_size_t  );
-void gabc_notes_determination_free (void *  );
+YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string ( const char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len  );
 
-#define yy_new_buffer gabc_notes_determination__create_buffer
+void *yyalloc ( yy_size_t  );
+void *yyrealloc ( void *, yy_size_t  );
+void yyfree ( void *  );
 
+#define yy_new_buffer yy_create_buffer
 #define yy_set_interactive(is_interactive) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){ \
-        gabc_notes_determination_ensure_buffer_stack (); \
+        yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-            gabc_notes_determination__create_buffer(gabc_notes_determination_in,YY_BUF_SIZE ); \
+            yy_create_buffer( yyin, YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
-
 #define yy_set_bol(at_bol) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){\
-        gabc_notes_determination_ensure_buffer_stack (); \
+        yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-            gabc_notes_determination__create_buffer(gabc_notes_determination_in,YY_BUF_SIZE ); \
+            yy_create_buffer( yyin, YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
-
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
 /* Begin user sect3 */
 
 #define gabc_notes_determination_wrap() (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
+typedef flex_uint8_t YY_CHAR;
 
-typedef unsigned char YY_CHAR;
-
-FILE *gabc_notes_determination_in = (FILE *) 0, *gabc_notes_determination_out = (FILE *) 0;
+FILE *yyin = NULL, *yyout = NULL;
 
 typedef int yy_state_type;
 
-extern int gabc_notes_determination_lineno;
-
-int gabc_notes_determination_lineno = 1;
+extern int yylineno;
+int yylineno = 1;
 
-extern char *gabc_notes_determination_text;
+extern char *yytext;
 #ifdef yytext_ptr
 #undef yytext_ptr
 #endif
-#define yytext_ptr gabc_notes_determination_text
+#define yytext_ptr yytext
 
-static yyconst flex_int32_t yy_nxt[][256] =
+static const flex_int32_t yy_nxt[][256] =
     {
     {
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -1872,8 +2092,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,
       -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,
       -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,
-      -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  112,
-      112,  112,  112,  112,  112,  112,  112,  -47,  -47,  -47,
+      -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  112,  113,
+      113,  113,  113,  113,  113,  113,  113,  -47,  -47,  -47,
       -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,
       -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,  -47,
 
@@ -1906,12 +2126,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
       -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
       -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
-      -48,  -48,  -48,  -48,  -48,  113,  113,  113,  113,  113,
-      113,  113,  113,  113,  113,  113,  113,  113,  113,  -48,
-      113,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
-      -48,  -48,  -48,  -48,  -48,  -48,  -48,  114,  114,  114,
-      114,  114,  114,  114,  114,  114,  114,  114,  114,  114,
-      114,  -48,  114,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
+      -48,  -48,  -48,  -48,  -48,  114,  114,  114,  114,  114,
+      114,  114,  114,  114,  114,  114,  114,  114,  114,  -48,
+      114,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
+      -48,  -48,  -48,  -48,  -48,  -48,  -48,  115,  115,  115,
+      115,  115,  115,  115,  115,  115,  115,  115,  115,  115,
+      115,  -48,  115,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
 
       -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
       -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,  -48,
@@ -1935,7 +2155,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,
       -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,
       -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,
-      -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  115,  115,
+      -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  116,  116,
       -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,
 
       -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,  -49,
@@ -1966,13 +2186,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
        39,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
       -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
       -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
-      -50,  -50,  -50,  116,  -50,  -50,  -50,  -50,  -50,  -50,
-      -50,  -50,  -50,  -50,  -50,  -50,  -50,  117,  118,  -50,
+      -50,  -50,  -50,  117,  -50,  -50,  -50,  -50,  -50,  -50,
+      -50,  -50,  -50,  -50,  -50,  -50,  -50,  118,  119,  -50,
       -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
       -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
       -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
       -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
-      -50,  119,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
+      -50,  120,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
 
       -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
       -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,  -50,
@@ -2000,8 +2220,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,
 
       -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,
-      -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  120,  -51,
-      -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,
+      -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  121,  -51,
+      -51,  -51,  -51,  122,  -51,  -51,  -51,  -51,  -51,  -51,
       -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,
       -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,
       -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,  -51,
@@ -2030,8 +2250,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
       -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
       -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
-      -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  112,
-      112,  112,  112,  112,  112,  112,  112,  -52,  -52,  -52,
+      -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  113,
+      113,  113,  113,  113,  113,  113,  113,  -52,  -52,  -52,
       -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
       -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,  -52,
 
@@ -2062,14 +2282,14 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
       -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
       -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
-      -53,  -53,  -53,  -53,  -53,  -53,  -53,  121,  -53,  -53,
+      -53,  -53,  -53,  -53,  -53,  -53,  -53,  123,  -53,  -53,
       -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
       -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
       -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
       -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
       -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
       -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
-      122,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
+      124,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
 
       -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
       -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,  -53,
@@ -2159,12 +2379,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
       -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,
       -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,
-      -56,  -56,  -56,  -56,  -56,  123,  123,  123,  123,  123,
-      123,  123,  123,  123,  123,  123,  123,  123,  123,  -56,
-      123,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,
-      -56,  124,  -56,  -56,  -56,  -56,  -56,  125,  125,  126,
-      125,  125,  126,  125,  125,  125,  125,  125,  125,  125,
-      125,  -56,  125,  -56,  -56,  -56,  -56,  -56,  -56,  -56,
+      -56,  -56,  -56,  -56,  -56,  125,  125,  125,  125,  125,
+      125,  125,  125,  125,  125,  125,  125,  125,  125,  -56,
+      125,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,
+      -56,  126,  -56,  -56,  -56,  -56,  -56,  127,  127,  128,
+      127,  127,  128,  127,  127,  127,  127,  127,  127,  127,
+      127,  -56,  127,  -56,  -56,  -56,  -56,  -56,  -56,  -56,
       -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,
       -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,  -56,
 
@@ -2188,15 +2408,15 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
       -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
       -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
-      -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  127,  127,
+      -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  129,  129,
       -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
       -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
       -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
 
-      -57,  -57,  -57,  -57,  -57,  -57,  128,  -57,  -57,  -57,
+      -57,  -57,  -57,  -57,  -57,  -57,  130,  -57,  -57,  -57,
       -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
       -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
-      -57,  -57,  -57,  -57,  -57,  129,  -57,  -57,  130,  -57,
+      -57,  -57,  -57,  -57,  -57,  131,  -57,  -57,  132,  -57,
       -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
       -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
       -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,  -57,
@@ -2220,7 +2440,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
       -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,
       -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,
-      -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  131,  132,
+      -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  133,  134,
       -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,
       -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,
       -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,  -58,
@@ -2346,7 +2566,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,
       -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,
       -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,
-      -62,  -62,  -62,  133,  -62,  134,  -62,  -62,  -62,  -62,
+      -62,  -62,  -62,  135,  -62,  136,  -62,  -62,  -62,  -62,
       -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,
       -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,
       -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,  -62,
@@ -2383,9 +2603,9 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,
       -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,
       -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,
-      -63,  135,  -63,  -63,  -63,  -63,  -63,  136,  -63,  137,
-      -63,  138,  -63,  139,  140,  -63,  -63,  -63,  141,  -63,
-      142,  143,  -63,  -63,  -63,  -63,  -63,  144,  -63,  -63,
+      -63,  137,  -63,  -63,  -63,  -63,  -63,  138,  -63,  139,
+      -63,  140,  -63,  141,  142,  -63,  -63,  -63,  143,  -63,
+      144,  145,  -63,  -63,  -63,  -63,  -63,  146,  -63,  -63,
 
       -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,
       -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,  -63,
@@ -2415,7 +2635,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,
       -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,
       -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,
-      -64,  -64,  -64,  145,  -64,  -64,  -64,  -64,  -64,  -64,
+      -64,  -64,  -64,  147,  -64,  -64,  -64,  -64,  -64,  -64,
       -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,
       -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,
       -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,  -64,
@@ -2441,8 +2661,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,
       -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,
       -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,
-      -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  146,  146,
-      146,  146,  146,  146,  -65,  -65,  -65,  -65,  -65,  -65,
+      -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  148,  148,
+      148,  148,  148,  148,  -65,  -65,  -65,  -65,  -65,  -65,
       -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,
       -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,
       -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,  -65,
@@ -2473,7 +2693,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
       -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
 
-      -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
+      -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  149,  -66,
       -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
       -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
       -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,  -66,
@@ -2504,15 +2724,15 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
       -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
       -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
-      -67,  -67,  -67,  147,  -67,  -67,  -67,  -67,  -67,  -67,
+      -67,  -67,  -67,  150,  -67,  -67,  -67,  -67,  -67,  -67,
       -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
       -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
       -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
 
-      -67,  -67,  -67,  -67,  -67,  -67,  128,  -67,  -67,  -67,
+      -67,  -67,  -67,  -67,  -67,  -67,  130,  -67,  -67,  -67,
       -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
       -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
-      -67,  -67,  -67,  -67,  -67,  129,  -67,  -67,  130,  -67,
+      -67,  -67,  -67,  -67,  -67,  131,  -67,  -67,  132,  -67,
       -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
       -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
       -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,  -67,
@@ -2536,14 +2756,14 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
       -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,
       -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,
-      -68,  -68,  -68,  147,  -68,  -68,  -68,  -68,  -68,  148,
-      148,  148,  148,  148,  -68,  -68,  -68,  -68,  -68,  -68,
+      -68,  -68,  -68,  150,  -68,  -68,  -68,  -68,  -68,  151,
+      151,  151,  151,  151,  -68,  -68,  -68,  -68,  -68,  -68,
       -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,
       -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,
-      -68,  -68,  -68,  -68,  -68,  -68,  128,  -68,  -68,  -68,
-      -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  149,  -68,
+      -68,  -68,  -68,  -68,  -68,  -68,  130,  -68,  -68,  -68,
+      -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  152,  -68,
       -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,
-      -68,  -68,  -68,  -68,  -68,  129,  -68,  -68,  130,  -68,
+      -68,  -68,  -68,  -68,  -68,  131,  -68,  -68,  132,  -68,
 
       -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,
       -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,  -68,
@@ -2567,7 +2787,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,
       -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,
       -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,
-      -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  150,  151,
+      -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  153,  154,
       -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,
 
       -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,  -69,
@@ -2631,8 +2851,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,
       -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,
 
-      -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  152,  153,
-      154,  155,  156,  157,  158,  159,  160,  -71,  -71,  -71,
+      -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  155,  156,
+      157,  158,  159,  160,  161,  162,  163,  -71,  -71,  -71,
       -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,
       -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,
       -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,  -71,
@@ -2820,7 +3040,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,
       -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,
       -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,
-      -77,  -77,  -77,  161,  -77,  162,  -77,  -77,  163,  -77,
+      -77,  -77,  -77,  164,  -77,  165,  -77,  -77,  166,  -77,
       -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,
       -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,
       -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,  -77,
@@ -2942,35 +3162,35 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
+       39,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
 
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  -81,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  -81,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
 
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
 
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164
+      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
+      167,  167,  167,  167,  167,  167
     },
 
     {
@@ -3005,114 +3225,17 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  -83,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165
-    },
-
-    {
-       39,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  -84,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166
-
-    },
-
-    {
-       39,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  -85,  167,  167,  167,  167,  167,  167,
-
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167,  167,  167,  167,  167,
-      167,  167,  167,  167,  167,  167
-    },
-
-    {
        39,  168,  168,  168,  168,  168,  168,  168,  168,  168,
       168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
-      168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
-      168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
 
       168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
       168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
       168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
       168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
       168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
-      168,  168,  168,  -86,  168,  168,  168,  168,  168,  168,
       168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
       168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+      168,  168,  168,  -83,  168,  168,  168,  168,  168,  168,
       168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
       168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
 
@@ -3128,6 +3251,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
       168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
 
       168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+      168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
+      168,  168,  168,  168,  168,  168,  168,  168,  168,  168,
       168,  168,  168,  168,  168,  168
     },
 
@@ -3138,13 +3263,11 @@ static yyconst flex_int32_t yy_nxt[][256] =
       169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
       169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
       169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
-      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
-      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
 
       169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
-      169,  169,  169,  -87,  169,  169,  169,  169,  169,  169,
       169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
       169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  -84,  169,  169,  169,  169,  169,  169,
       169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
       169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
       169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
@@ -3159,15 +3282,14 @@ static yyconst flex_int32_t yy_nxt[][256] =
       169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
       169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
       169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
+      169,  169,  169,  169,  169,  169,  169,  169,  169,  169,
       169,  169,  169,  169,  169,  169
+
     },
 
     {
        39,  170,  170,  170,  170,  170,  170,  170,  170,  170,
-      -88,  170,  170,  -88,  170,  170,  170,  170,  170,  170,
-
-      170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
-      170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
@@ -3176,6 +3298,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
+      170,  170,  170,  -85,  170,  170,  170,  170,  170,  170,
 
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
@@ -3191,39 +3314,41 @@ static yyconst flex_int32_t yy_nxt[][256] =
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
+      170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
+      170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170
     },
 
     {
-       39,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      171,  -89,  -89,  171,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+       39,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
 
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  -86,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
 
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
-      -89,  -89,  -89,  -89,  -89,  -89
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
 
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171
     },
 
     {
@@ -3235,11 +3360,9 @@ static yyconst flex_int32_t yy_nxt[][256] =
       172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
       172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
       172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
-      172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
-      172,  172,  172,  -90,  172,  172,  172,  172,  172,  172,
 
       172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
-      172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
+      172,  172,  172,  -87,  172,  172,  172,  172,  172,  172,
       172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
       172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
       172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
@@ -3254,21 +3377,21 @@ static yyconst flex_int32_t yy_nxt[][256] =
       172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
       172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
       172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
+      172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
+      172,  172,  172,  172,  172,  172,  172,  172,  172,  172,
       172,  172,  172,  172,  172,  172
     },
 
     {
        39,  173,  173,  173,  173,  173,  173,  173,  173,  173,
-      173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
-      173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
-      173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
+      -88,  173,  173,  -88,  173,  173,  173,  173,  173,  173,
 
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
-      173,  173,  173,  -91,  173,  173,  173,  173,  173,  173,
+      173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
@@ -3286,54 +3409,54 @@ static yyconst flex_int32_t yy_nxt[][256] =
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
 
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
+      173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
+      173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173
     },
 
     {
-       39,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
+       39,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      174,  -89,  -89,  174,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
 
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  -92,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,  -89,
+      -89,  -89,  -89,  -89,  -89,  -89
 
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174
     },
 
     {
        39,  175,  175,  175,  175,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
-
-      175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
-      175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
-      175,  175,  175,  -93,  175,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
+      175,  175,  175,  -90,  175,  175,  175,  175,  175,  175,
 
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
@@ -3349,10 +3472,107 @@ static yyconst flex_int32_t yy_nxt[][256] =
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
+      175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
+      175,  175,  175,  175,  175,  175,  175,  175,  175,  175,
       175,  175,  175,  175,  175,  175
     },
 
     {
+       39,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  -91,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176
+    },
+
+    {
+       39,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  -92,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177
+    },
+
+    {
+       39,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  -93,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178
+    },
+
+    {
        39,  -94,  -94,  -94,  -94,  -94,  -94,  -94,  -94,  -94,
       -94,  -94,  -94,  -94,  -94,  -94,  -94,  -94,  -94,  -94,
       -94,  -94,  -94,  -94,  -94,  -94,  -94,  -94,  -94,  -94,
@@ -3389,8 +3609,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,
       -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,
       -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,
-      -95,  -95,  -95,  -95,  -95,  -95,  176,  -95,  177,  177,
-      177,  177,  177,  177,  177,  177,  177,  177,  -95,  -95,
+      -95,  -95,  -95,  -95,  -95,  -95,  179,  -95,  180,  180,
+      180,  180,  180,  180,  180,  180,  180,  180,  -95,  -95,
       -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,
       -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,
       -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,  -95,
@@ -3421,8 +3641,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,
       -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,
 
-      -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  178,  178,
-      178,  178,  178,  178,  178,  178,  178,  178,  -96,  -96,
+      -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  181,  181,
+      181,  181,  181,  181,  181,  181,  181,  181,  -96,  -96,
       -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,
       -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,
       -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,  -96,
@@ -3452,13 +3672,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,
       -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,
       -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,
-      -97,  -97,  -97,  -97,  -97,  -97,  179,  -97,  177,  177,
-      177,  177,  177,  177,  177,  177,  177,  177,  -97,  -97,
+      -97,  -97,  -97,  -97,  -97,  -97,  182,  -97,  180,  180,
+      180,  180,  180,  180,  180,  180,  180,  180,  -97,  -97,
       -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,
       -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,
 
       -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,
-      -97,  -97,  -97,  180,  -97,  -97,  -97,  -97,  -97,  -97,
+      -97,  -97,  -97,  183,  -97,  -97,  -97,  -97,  -97,  -97,
       -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,
       -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,
       -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,  -97,
@@ -3484,8 +3704,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
       -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,
       -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,
-      -98,  -98,  -98,  -98,  -98,  -98,  181,  -98,  182,  182,
-      182,  182,  182,  182,  182,  182,  182,  182,  -98,  -98,
+      -98,  -98,  -98,  -98,  -98,  -98,  184,  -98,  185,  185,
+      185,  185,  185,  185,  185,  185,  185,  185,  -98,  -98,
       -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,
       -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,
       -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,  -98,
@@ -3515,8 +3735,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
       -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,
       -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,
       -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,
-      -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  183,  183,
-      183,  183,  183,  183,  183,  183,  183,  183,  -99,  -99,
+      -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186,  -99,  -99,
 
       -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,
       -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,  -99,
@@ -3547,12 +3767,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
      -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
      -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
-     -100, -100, -100, -100, -100, -100,  184, -100,  182,  182,
-      182,  182,  182,  182,  182,  182,  182,  182, -100, -100,
+     -100, -100, -100, -100, -100, -100,  187, -100,  185,  185,
+      185,  185,  185,  185,  185,  185,  185,  185, -100, -100,
      -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
      -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
      -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
-     -100, -100, -100,  185, -100, -100, -100, -100, -100, -100,
+     -100, -100, -100,  188, -100, -100, -100, -100, -100, -100,
 
      -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
      -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
@@ -3574,117 +3794,20 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186, -101,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186, -101,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186
-    },
-
-    {
-       39,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187, -102,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187
-    },
-
-    {
-       39,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188, -103,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188
-    },
-
-    {
        39,  189,  189,  189,  189,  189,  189,  189,  189,  189,
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
-      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
-      189,  189,  189,  189,  189,  189,  189,  189,  189, -104,
 
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
+      189,  189,  189,  189,  189,  189,  189,  189,  189, -101,
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
-      189,  189,  189, -104,  189,  189,  189,  189,  189,  189,
-      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
+      189,  189,  189, -101,  189,  189,  189,  189,  189,  189,
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
@@ -3696,8 +3819,10 @@ static yyconst flex_int32_t yy_nxt[][256] =
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
       189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
-      189,  189,  189,  189,  189,  189
+      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
 
+      189,  189,  189,  189,  189,  189,  189,  189,  189,  189,
+      189,  189,  189,  189,  189,  189
     },
 
     {
@@ -3709,11 +3834,9 @@ static yyconst flex_int32_t yy_nxt[][256] =
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
-      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
-      190,  190,  190, -105,  190,  190,  190,  190,  190,  190,
 
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
-      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190,  190, -102,  190,  190,  190,  190,  190,  190,
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
@@ -3728,23 +3851,23 @@ static yyconst flex_int32_t yy_nxt[][256] =
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
       190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
+      190,  190,  190,  190,  190,  190,  190,  190,  190,  190,
       190,  190,  190,  190,  190,  190
     },
 
     {
        39,  191,  191,  191,  191,  191,  191,  191,  191,  191,
       191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
-      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
-      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
 
       191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
       191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
       191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
       191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
       191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
-      191,  191,  191, -106,  191,  191,  191,  191,  191,  191,
       191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
       191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191, -103,  191,  191,  191,  191,  191,  191,
       191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
       191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
 
@@ -3760,10 +3883,107 @@ static yyconst flex_int32_t yy_nxt[][256] =
       191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
 
       191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
+      191,  191,  191,  191,  191,  191,  191,  191,  191,  191,
       191,  191,  191,  191,  191,  191
     },
 
     {
+       39,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192, -104,
+
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192, -104,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192
+
+    },
+
+    {
+       39,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193, -105,  193,  193,  193,  193,  193,  193,
+
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193
+    },
+
+    {
+       39,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194, -106,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194
+    },
+
+    {
        39, -107, -107, -107, -107, -107, -107, -107, -107,  107,
       107, -107, -107,  107, -107, -107, -107, -107, -107, -107,
      -107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
@@ -3862,13 +4082,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
        39, -110, -110, -110, -110, -110, -110, -110, -110, -110,
      -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
      -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
-     -110, -110, -110,  116, -110, -110, -110, -110, -110, -110,
-     -110, -110, -110, -110, -110, -110, -110,  192,  118, -110,
+     -110, -110, -110,  117, -110, -110, -110, -110, -110, -110,
+     -110, -110, -110, -110, -110, -110, -110,  195,  119, -110,
      -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
      -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
      -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
      -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
-     -110,  193, -110, -110, -110, -110, -110, -110, -110, -110,
+     -110,  196, -110, -110, -110, -110, -110, -110, -110, -110,
 
      -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
      -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
@@ -3958,7 +4178,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -113, -113, -113, -113, -113, -113, -113, -113, -113, -113,
      -113, -113, -113, -113, -113, -113, -113, -113, -113, -113,
-     -113, -113, -113, -113, -113, -113, -113, -113,  194,  194,
+     -113, -113, -113, -113, -113, -113, -113, -113, -113, -113,
      -113, -113, -113, -113, -113, -113, -113, -113, -113, -113,
      -113, -113, -113, -113, -113, -113, -113, -113, -113, -113,
      -113, -113, -113, -113, -113, -113, -113, -113, -113, -113,
@@ -3989,7 +4209,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
      -114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
      -114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
-     -114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
+     -114, -114, -114, -114, -114, -114, -114, -114,  197,  197,
      -114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
 
      -114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
@@ -4090,7 +4310,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -117, -117, -117, -117, -117, -117, -117, -117, -117, -117,
 
      -117, -117, -117, -117, -117, -117, -117, -117, -117, -117,
-     -117,  195, -117, -117, -117, -117, -117, -117, -117, -117,
+     -117, -117, -117, -117, -117, -117, -117, -117, -117, -117,
      -117, -117, -117, -117, -117, -117, -117, -117, -117, -117,
      -117, -117, -117, -117, -117, -117, -117, -117, -117, -117,
      -117, -117, -117, -117, -117, -117, -117, -117, -117, -117,
@@ -4121,7 +4341,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
      -118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
      -118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
-     -118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
+     -118,  198, -118, -118, -118, -118, -118, -118, -118, -118,
      -118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
      -118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
 
@@ -4218,7 +4438,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -121, -121, -121, -121, -121, -121, -121, -121, -121, -121,
      -121, -121, -121, -121, -121, -121, -121, -121, -121, -121,
      -121, -121, -121, -121, -121, -121, -121, -121, -121, -121,
-      196, -121, -121, -121, -121, -121, -121, -121, -121, -121,
+     -121, -121, -121, -121, -121, -121, -121, -121, -121, -121,
      -121, -121, -121, -121, -121, -121, -121, -121, -121, -121,
      -121, -121, -121, -121, -121, -121, -121, -121, -121, -121,
 
@@ -4249,7 +4469,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -122, -122, -122, -122, -122, -122, -122, -122, -122, -122,
      -122, -122, -122, -122, -122, -122, -122, -122, -122, -122,
-     -122, -122, -122, -122, -122, -122, -122, -122,  197, -122,
+     -122, -122, -122, -122, -122, -122, -122, -122, -122, -122,
      -122, -122, -122, -122, -122, -122, -122, -122, -122, -122,
      -122, -122, -122, -122, -122, -122, -122, -122, -122, -122,
      -122, -122, -122, -122, -122, -122, -122, -122, -122, -122,
@@ -4274,7 +4494,6 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
      -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
-     -123, -123, -123, -123, -123, -123, -123, -123,  198,  198,
      -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
      -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
      -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
@@ -4282,6 +4501,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
      -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
      -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
+      199, -123, -123, -123, -123, -123, -123, -123, -123, -123,
 
      -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
      -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
@@ -4312,7 +4532,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -124, -124, -124, -124, -124, -124, -124, -124, -124, -124,
      -124, -124, -124, -124, -124, -124, -124, -124, -124, -124,
      -124, -124, -124, -124, -124, -124, -124, -124, -124, -124,
-     -124, -124, -124, -124, -124, -124, -124, -124, -124, -124,
+     -124, -124, -124, -124, -124, -124, -124, -124,  200, -124,
      -124, -124, -124, -124, -124, -124, -124, -124, -124, -124,
      -124, -124, -124, -124, -124, -124, -124, -124, -124, -124,
      -124, -124, -124, -124, -124, -124, -124, -124, -124, -124,
@@ -4337,7 +4557,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
      -125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
      -125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
-     -125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
+     -125, -125, -125, -125, -125, -125, -125, -125,  201,  201,
      -125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
      -125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
      -125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
@@ -4369,12 +4589,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
      -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
 
-     -126, -126, -126, -126, -126, -126, -126, -126, -126,  199,
-      199,  199,  199,  199, -126, -126, -126, -126, -126, -126,
      -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
      -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
      -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
-     -126, -126, -126, -126, -126, -126, -126, -126,  200, -126,
+     -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
+     -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
+     -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
      -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
      -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
      -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
@@ -4432,12 +4652,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
      -128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
+     -128, -128, -128, -128, -128, -128, -128, -128, -128,  202,
+      202,  202,  202,  202, -128, -128, -128, -128, -128, -128,
      -128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
      -128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
      -128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
-     -128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
-     -128, -128, -128, -128, -128, -128,  201, -128, -128, -128,
-     -128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
+     -128, -128, -128, -128, -128, -128, -128, -128,  203, -128,
      -128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
      -128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
 
@@ -4471,7 +4691,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
      -129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
      -129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-     -129, -129, -129, -129, -129,  202, -129, -129, -129, -129,
+     -129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
      -129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
      -129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
      -129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
@@ -4499,11 +4719,11 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
      -130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
      -130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
-     -130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
+     -130, -130, -130, -130, -130, -130,  204, -130, -130, -130,
      -130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
 
      -130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
-     -130, -130, -130, -130, -130, -130, -130, -130,  203, -130,
+     -130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
      -130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
      -130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
      -130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
@@ -4534,7 +4754,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
      -131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
      -131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
-     -131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
+     -131, -131, -131, -131, -131,  205, -131, -131, -131, -131,
      -131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
      -131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
 
@@ -4566,7 +4786,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -132, -132, -132, -132, -132, -132, -132, -132, -132, -132,
      -132, -132, -132, -132, -132, -132, -132, -132, -132, -132,
      -132, -132, -132, -132, -132, -132, -132, -132, -132, -132,
-     -132, -132, -132, -132, -132, -132, -132, -132, -132, -132,
+     -132, -132, -132, -132, -132, -132, -132, -132,  206, -132,
      -132, -132, -132, -132, -132, -132, -132, -132, -132, -132,
      -132, -132, -132, -132, -132, -132, -132, -132, -132, -132,
      -132, -132, -132, -132, -132, -132, -132, -132, -132, -132,
@@ -4691,7 +4911,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -136, -136, -136, -136, -136, -136, -136, -136, -136, -136,
      -136, -136, -136, -136, -136, -136, -136, -136, -136, -136,
      -136, -136, -136, -136, -136, -136, -136, -136, -136, -136,
-     -136, -136, -136, -136, -136, -136, -136, -136,  204, -136,
+     -136, -136, -136, -136, -136, -136, -136, -136, -136, -136,
      -136, -136, -136, -136, -136, -136, -136, -136, -136, -136,
      -136, -136, -136, -136, -136, -136, -136, -136, -136, -136,
      -136, -136, -136, -136, -136, -136, -136, -136, -136, -136,
@@ -4724,7 +4944,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -137, -137, -137, -137, -137, -137, -137, -137, -137, -137,
      -137, -137, -137, -137, -137, -137, -137, -137, -137, -137,
      -137, -137, -137, -137, -137, -137, -137, -137, -137, -137,
-      205, -137, -137, -137, -137,  206, -137, -137, -137, -137,
+     -137, -137, -137, -137, -137, -137, -137, -137, -137, -137,
      -137, -137, -137, -137, -137, -137, -137, -137, -137, -137,
      -137, -137, -137, -137, -137, -137, -137, -137, -137, -137,
      -137, -137, -137, -137, -137, -137, -137, -137, -137, -137,
@@ -4754,8 +4974,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
      -138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
      -138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
-     -138, -138, -138, -138, -138, -138, -138, -138, -138,  207,
-     -138, -138, -138, -138, -138, -138, -138, -138,  208, -138,
+     -138, -138, -138, -138, -138, -138, -138, -138,  207, -138,
+     -138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
 
      -138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
      -138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
@@ -4786,8 +5006,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
      -139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
      -139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
-     -139, -139, -139, -139, -139, -139, -139, -139, -139,  209,
-     -139, -139, -139, -139, -139, -139, -139, -139,  210, -139,
+     -139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
+      208, -139, -139, -139, -139,  209, -139, -139, -139, -139,
      -139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
      -139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
      -139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
@@ -4818,6 +5038,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
      -140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
 
+     -140, -140, -140, -140, -140, -140, -140, -140, -140,  210,
      -140, -140, -140, -140, -140, -140, -140, -140,  211, -140,
      -140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
      -140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
@@ -4827,7 +5048,6 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
      -140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
      -140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
-     -140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
 
      -140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
      -140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
@@ -4849,8 +5069,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -141, -141, -141, -141, -141, -141, -141, -141, -141, -141,
      -141, -141, -141, -141, -141, -141, -141, -141, -141, -141,
      -141, -141, -141, -141, -141, -141, -141, -141, -141, -141,
-     -141, -141, -141, -141, -141, -141, -141, -141,  212, -141,
-     -141, -141, -141, -141, -141, -141, -141, -141, -141, -141,
+     -141, -141, -141, -141, -141, -141, -141, -141, -141,  212,
+     -141, -141, -141, -141, -141, -141, -141, -141,  213, -141,
      -141, -141, -141, -141, -141, -141, -141, -141, -141, -141,
      -141, -141, -141, -141, -141, -141, -141, -141, -141, -141,
 
@@ -4881,8 +5101,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
      -142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
-     -142, -142, -142, -142, -142, -142, -142, -142, -142,  213,
-     -142,  214, -142, -142, -142, -142, -142, -142,  215, -142,
+     -142, -142, -142, -142, -142, -142, -142, -142,  214, -142,
+     -142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
      -142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
      -142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
      -142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
@@ -4911,9 +5131,9 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -143, -143, -143, -143, -143, -143, -143, -143, -143, -143,
      -143, -143, -143, -143, -143, -143, -143, -143, -143, -143,
      -143, -143, -143, -143, -143, -143, -143, -143, -143, -143,
-     -143, -143, -143, -143, -143, -143, -143, -143,  216,  217,
-     -143, -143, -143, -143,  218, -143, -143, -143,  219, -143,
-     -143, -143, -143, -143, -143,  220, -143, -143, -143, -143,
+     -143, -143, -143, -143, -143, -143, -143, -143, -143, -143,
+     -143, -143, -143, -143, -143, -143, -143, -143,  215, -143,
+     -143, -143, -143, -143, -143, -143, -143, -143, -143, -143,
 
      -143, -143, -143, -143, -143, -143, -143, -143, -143, -143,
      -143, -143, -143, -143, -143, -143, -143, -143, -143, -143,
@@ -4943,9 +5163,9 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
      -144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
      -144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
-     -144, -144, -144, -144, -144, -144, -144, -144,  221, -144,
-     -144, -144, -144, -144,  218, -144, -144, -144,  222, -144,
-     -144, -144, -144, -144, -144,  220, -144, -144, -144, -144,
+     -144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
+     -144, -144, -144, -144, -144, -144, -144, -144, -144,  216,
+     -144,  217, -144, -144, -144, -144, -144, -144,  218, -144,
      -144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
      -144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
      -144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
@@ -4974,10 +5194,10 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
      -145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
      -145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
-     -145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
+     -145, -145, -145, -145, -145, -145, -145, -145,  219,  220,
 
-     -145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
-     -145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
+     -145, -145, -145, -145,  221, -145, -145, -145,  222, -145,
+     -145, -145, -145, -145, -145,  223, -145, -145, -145, -145,
      -145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
      -145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
      -145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
@@ -5001,14 +5221,14 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
      -146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
 
-     -146, -146, -146, -146, -146, -146, -146, -146,  146,  146,
-      146,  146,  146,  146, -146, -146, -146, -146, -146, -146,
-     -146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
      -146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
      -146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
      -146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
      -146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
      -146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
+     -146, -146, -146, -146, -146, -146, -146, -146,  224, -146,
+     -146, -146, -146, -146,  221, -146, -146, -146,  225, -146,
+     -146, -146, -146, -146, -146,  223, -146, -146, -146, -146,
      -146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
      -146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
 
@@ -5064,8 +5284,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
      -148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
-     -148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
-     -148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
+     -148, -148, -148, -148, -148, -148, -148, -148,  148,  148,
+      148,  148,  148,  148, -148, -148, -148, -148, -148, -148,
      -148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
      -148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
      -148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
@@ -5095,8 +5315,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -149, -149, -149, -149, -149, -149, -149, -149, -149, -149,
      -149, -149, -149, -149, -149, -149, -149, -149, -149, -149,
      -149, -149, -149, -149, -149, -149, -149, -149, -149, -149,
-     -149, -149, -149, -149, -149, -149, -149, -149, -149,  223,
-      223,  223,  223,  223, -149, -149, -149, -149, -149, -149,
+     -149, -149, -149, -149, -149, -149, -149, -149, -149, -149,
+     -149, -149, -149, -149, -149, -149, -149, -149, -149, -149,
 
      -149, -149, -149, -149, -149, -149, -149, -149, -149, -149,
      -149, -149, -149, -149, -149, -149, -149, -149, -149, -149,
@@ -5190,8 +5410,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
      -152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
      -152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
-     -152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
-     -152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
+     -152, -152, -152, -152, -152, -152, -152, -152, -152,  226,
+      226,  226,  226,  226, -152, -152, -152, -152, -152, -152,
      -152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
      -152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
 
@@ -5565,98 +5785,98 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164, -164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164
-
-    },
-
-    {
-       39,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165, -165,  165,  165,  165,  165,  165,  165,
-
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165
-    },
-
-    {
-       39,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166, -166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166
+       39, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164
+
+    },
+
+    {
+       39, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165
+    },
+
+    {
+       39, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166
     },
 
     {
@@ -5756,7 +5976,6 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
     {
        39,  170,  170,  170,  170,  170,  170,  170,  170,  170,
-     -170,  170,  170, -170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
@@ -5765,6 +5984,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
+      170,  170,  170, -170,  170,  170,  170,  170,  170,  170,
 
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
       170,  170,  170,  170,  170,  170,  170,  170,  170,  170,
@@ -5786,35 +6006,35 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-      171, -171, -171,  171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
+       39,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
 
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171, -171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
 
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
 
-     -171, -171, -171, -171, -171, -171, -171, -171, -171, -171,
-     -171, -171, -171, -171, -171, -171
+      171,  171,  171,  171,  171,  171,  171,  171,  171,  171,
+      171,  171,  171,  171,  171,  171
     },
 
     {
@@ -5850,7 +6070,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
     {
        39,  173,  173,  173,  173,  173,  173,  173,  173,  173,
-      173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
+     -173,  173,  173, -173,  173,  173,  173,  173,  173,  173,
 
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
@@ -5859,7 +6079,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
-      173,  173,  173, -173,  173,  173,  173,  173,  173,  173,
+      173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
 
@@ -5881,34 +6101,34 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
+       39, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+      174, -174, -174,  174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
 
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174, -174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
 
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+     -174, -174, -174, -174, -174, -174
 
     },
 
@@ -5944,98 +6164,98 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-
-     -176, -176, -176, -176, -176, -176, -176, -176,  178,  178,
-      178,  178,  178,  178,  178,  178,  178,  178, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176
-    },
-
-    {
-       39, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177,  179, -177,  177,  177,
-      177,  177,  177,  177,  177,  177,  177,  177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177,  180, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177
-    },
-
-    {
-       39, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178,  178,  178,
-      178,  178,  178,  178,  178,  178,  178,  178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178,  180, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178
+       39,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176, -176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176
+    },
+
+    {
+       39,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177, -177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177
+    },
+
+    {
+       39,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178, -178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178
     },
 
     {
@@ -6043,13 +6263,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
      -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
      -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
-     -179, -179, -179, -179, -179, -179, -179, -179,  224,  224,
-      224,  224,  224,  224,  224,  224,  224,  224, -179, -179,
+     -179, -179, -179, -179, -179, -179, -179, -179,  181,  181,
+      181,  181,  181,  181,  181,  181,  181,  181, -179, -179,
 
      -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
      -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
      -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
-     -179, -179, -179,  180, -179, -179, -179, -179, -179, -179,
+     -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
      -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
      -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
      -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
@@ -6075,12 +6295,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
      -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
      -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
+     -180, -180, -180, -180, -180, -180,  182, -180,  180,  180,
+      180,  180,  180,  180,  180,  180,  180,  180, -180, -180,
      -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
      -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
      -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
-     -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
-     -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
-     -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
+     -180, -180, -180,  183, -180, -180, -180, -180, -180, -180,
 
      -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
      -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
@@ -6107,12 +6327,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
      -181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
 
-     -181, -181, -181, -181, -181, -181, -181, -181,  183,  183,
-      183,  183,  183,  183,  183,  183,  183,  183, -181, -181,
-     -181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
+     -181, -181, -181, -181, -181, -181, -181, -181,  181,  181,
+      181,  181,  181,  181,  181,  181,  181,  181, -181, -181,
      -181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
      -181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
      -181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
+     -181, -181, -181,  183, -181, -181, -181, -181, -181, -181,
      -181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
      -181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
      -181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
@@ -6138,13 +6358,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
      -182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
      -182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
-     -182, -182, -182, -182, -182, -182,  184, -182,  182,  182,
-      182,  182,  182,  182,  182,  182,  182,  182, -182, -182,
+     -182, -182, -182, -182, -182, -182, -182, -182,  227,  227,
+      227,  227,  227,  227,  227,  227,  227,  227, -182, -182,
      -182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
      -182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
 
      -182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
-     -182, -182, -182,  185, -182, -182, -182, -182, -182, -182,
+     -182, -182, -182,  183, -182, -182, -182, -182, -182, -182,
      -182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
      -182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
      -182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
@@ -6170,12 +6390,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
      -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
-     -183, -183, -183, -183, -183, -183, -183, -183,  183,  183,
-      183,  183,  183,  183,  183,  183,  183,  183, -183, -183,
      -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
      -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
      -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
-     -183, -183, -183,  185, -183, -183, -183, -183, -183, -183,
+     -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
+     -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
+     -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
      -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
      -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
 
@@ -6201,13 +6421,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
      -184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
      -184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
-     -184, -184, -184, -184, -184, -184, -184, -184,  225,  225,
-      225,  225,  225,  225,  225,  225,  225,  225, -184, -184,
+     -184, -184, -184, -184, -184, -184, -184, -184,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186, -184, -184,
 
      -184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
      -184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
      -184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
-     -184, -184, -184,  185, -184, -184, -184, -184, -184, -184,
+     -184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
      -184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
      -184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
      -184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
@@ -6233,12 +6453,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
      -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
      -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
+     -185, -185, -185, -185, -185, -185,  187, -185,  185,  185,
+      185,  185,  185,  185,  185,  185,  185,  185, -185, -185,
      -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
      -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
      -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
-     -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
-     -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
-     -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
+     -185, -185, -185,  188, -185, -185, -185, -185, -185, -185,
 
      -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
      -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
@@ -6260,98 +6480,98 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186, -186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186, -186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-
-      186,  186,  186,  186,  186,  186,  186,  186,  186,  186,
-      186,  186,  186,  186,  186,  186
-    },
-
-    {
-       39,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187, -187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187
-    },
-
-    {
-       39,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188, -188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188
+       39, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+
+     -186, -186, -186, -186, -186, -186, -186, -186,  186,  186,
+      186,  186,  186,  186,  186,  186,  186,  186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186,  188, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186
+    },
+
+    {
+       39, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187,  228,  228,
+      228,  228,  228,  228,  228,  228,  228,  228, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187,  188, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187
+    },
+
+    {
+       39, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188
     },
 
     {
@@ -6450,97 +6670,97 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192,  226, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192
-    },
-
-    {
-       39, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193
-    },
-
-    {
-       39, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194
+       39,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192, -192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192, -192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192
+    },
+
+    {
+       39,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193, -193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193
+    },
+
+    {
+       39,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194, -194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194
 
     },
 
@@ -6554,7 +6774,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
      -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
      -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
-     -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
+     -195,  229, -195, -195, -195, -195, -195, -195, -195, -195,
 
      -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
      -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
@@ -6587,7 +6807,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
      -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
      -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
-     -196, -196, -196, -196, -196, -196, -196, -196,  227, -196,
+     -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
      -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
      -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
      -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
@@ -6618,7 +6838,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -197, -197, -197, -197, -197, -197, -197, -197, -197, -197,
 
      -197, -197, -197, -197, -197, -197, -197, -197, -197, -197,
-     -197, -197, -197, -197, -197, -197, -197, -197,  228, -197,
+     -197, -197, -197, -197, -197, -197, -197, -197, -197, -197,
      -197, -197, -197, -197, -197, -197, -197, -197, -197, -197,
      -197, -197, -197, -197, -197, -197, -197, -197, -197, -197,
      -197, -197, -197, -197, -197, -197, -197, -197, -197, -197,
@@ -6682,7 +6902,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
      -199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
      -199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
-     -199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
+     -199, -199, -199, -199, -199, -199, -199, -199,  230, -199,
      -199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
      -199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
      -199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
@@ -6707,12 +6927,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
      -200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
      -200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
-     -200, -200, -200, -200, -200, -200, -200, -200, -200,  229,
-      229,  229,  229,  229, -200, -200, -200, -200, -200, -200,
      -200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
      -200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
      -200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
      -200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
+     -200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
+     -200, -200, -200, -200, -200, -200, -200, -200,  231, -200,
 
      -200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
      -200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
@@ -6743,7 +6963,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
      -201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
      -201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
-     -201, -201, -201, -201, -201, -201,  230, -201, -201, -201,
+     -201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
      -201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
      -201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
      -201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
@@ -6772,13 +6992,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
      -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
      -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
-      231, -202,  231, -202, -202, -202, -202, -202, -202, -202,
+     -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
      -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
 
      -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
      -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
      -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
-     -202, -202, -202, -202, -202,  232, -202, -202, -202, -202,
+     -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
      -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
      -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
      -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
@@ -6802,14 +7022,14 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
      -203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
+     -203, -203, -203, -203, -203, -203, -203, -203, -203,  232,
+      232,  232,  232,  232, -203, -203, -203, -203, -203, -203,
      -203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
      -203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
      -203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
      -203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
      -203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
      -203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
-     -203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
-     -203, -203, -203, -203, -203, -203, -203, -203,  233, -203,
 
      -203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
      -203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
@@ -6838,10 +7058,10 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -204, -204, -204, -204, -204, -204, -204, -204, -204, -204,
      -204, -204, -204, -204, -204, -204, -204, -204, -204, -204,
+     -204, -204, -204, -204, -204, -204,  233, -204, -204, -204,
      -204, -204, -204, -204, -204, -204, -204, -204, -204, -204,
      -204, -204, -204, -204, -204, -204, -204, -204, -204, -204,
      -204, -204, -204, -204, -204, -204, -204, -204, -204, -204,
-     -204, -204, -204, -204, -204, -204,  234, -204, -204, -204,
      -204, -204, -204, -204, -204, -204, -204, -204, -204, -204,
      -204, -204, -204, -204, -204, -204, -204, -204, -204, -204,
      -204, -204, -204, -204, -204, -204, -204, -204, -204, -204,
@@ -6866,14 +7086,14 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
      -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
      -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-     -205, -205, -205, -205, -205, -205, -205, -205,  235, -205,
      -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
+      234, -205,  234, -205, -205, -205, -205, -205, -205, -205,
      -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
      -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
      -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
 
      -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-     -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
+     -205, -205, -205, -205, -205,  235, -205, -205, -205, -205,
      -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
      -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
      -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
@@ -6898,13 +7118,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -206, -206, -206, -206, -206, -206, -206, -206, -206, -206,
 
      -206, -206, -206, -206, -206, -206, -206, -206, -206, -206,
-     -206, -206, -206, -206, -206, -206, -206, -206,  236, -206,
      -206, -206, -206, -206, -206, -206, -206, -206, -206, -206,
      -206, -206, -206, -206, -206, -206, -206, -206, -206, -206,
      -206, -206, -206, -206, -206, -206, -206, -206, -206, -206,
      -206, -206, -206, -206, -206, -206, -206, -206, -206, -206,
      -206, -206, -206, -206, -206, -206, -206, -206, -206, -206,
      -206, -206, -206, -206, -206, -206, -206, -206, -206, -206,
+     -206, -206, -206, -206, -206, -206, -206, -206,  236, -206,
      -206, -206, -206, -206, -206, -206, -206, -206, -206, -206,
      -206, -206, -206, -206, -206, -206, -206, -206, -206, -206,
 
@@ -6928,15 +7148,15 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
      -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
      -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
-     -207, -207, -207, -207, -207, -207, -207, -207, -207,  237,
-      237,  237,  237,  237,  237,  237,  237,  237, -207, -207,
      -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
      -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
-
      -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
      -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
+
+     -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
      -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
      -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
+     -207, -207, -207, -207, -207, -207,  237, -207, -207, -207,
      -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
      -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
      -207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
@@ -6991,8 +7211,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -209, -209, -209, -209, -209, -209, -209, -209, -209, -209,
      -209, -209, -209, -209, -209, -209, -209, -209, -209, -209,
      -209, -209, -209, -209, -209, -209, -209, -209, -209, -209,
-     -209, -209, -209, -209, -209, -209, -209, -209, -209,  239,
-      239,  239,  239,  239,  239,  239,  239,  239, -209, -209,
+     -209, -209, -209, -209, -209, -209, -209, -209, -209, -209,
+     -209, -209, -209, -209, -209, -209, -209, -209,  239, -209,
 
      -209, -209, -209, -209, -209, -209, -209, -209, -209, -209,
      -209, -209, -209, -209, -209, -209, -209, -209, -209, -209,
@@ -7023,8 +7243,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
      -210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
      -210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
-     -210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
-     -210, -210, -210, -210, -210, -210, -210, -210,  240, -210,
+     -210, -210, -210, -210, -210, -210, -210, -210, -210,  240,
+      240,  240,  240,  240,  240,  240,  240,  240, -210, -210,
      -210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
      -210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
      -210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
@@ -7086,8 +7306,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -212, -212, -212, -212, -212, -212, -212, -212, -212, -212,
      -212, -212, -212, -212, -212, -212, -212, -212, -212, -212,
      -212, -212, -212, -212, -212, -212, -212, -212, -212, -212,
-     -212, -212, -212, -212, -212, -212, -212, -212, -212, -212,
-     -212, -212, -212, -212, -212, -212, -212, -212,  242, -212,
+     -212, -212, -212, -212, -212, -212, -212, -212, -212,  242,
+      242,  242,  242,  242,  242,  242,  242,  242, -212, -212,
      -212, -212, -212, -212, -212, -212, -212, -212, -212, -212,
      -212, -212, -212, -212, -212, -212, -212, -212, -212, -212,
 
@@ -7118,8 +7338,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -213, -213, -213, -213, -213, -213, -213, -213, -213, -213,
      -213, -213, -213, -213, -213, -213, -213, -213, -213, -213,
-     -213, -213, -213, -213, -213, -213, -213, -213, -213,  243,
-      243,  243,  243,  243,  243,  243,  243,  243, -213, -213,
+     -213, -213, -213, -213, -213, -213, -213, -213, -213, -213,
+     -213, -213, -213, -213, -213, -213, -213, -213,  243, -213,
      -213, -213, -213, -213, -213, -213, -213, -213, -213, -213,
      -213, -213, -213, -213, -213, -213, -213, -213, -213, -213,
      -213, -213, -213, -213, -213, -213, -213, -213, -213, -213,
@@ -7150,12 +7370,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
      -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
      -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
-     -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
+     -214, -214, -214, -214, -214, -214, -214, -214,  244, -214,
 
      -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
      -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
      -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
-     -214, -214, -214, -214, -214, -214, -214, -214, -214,  244,
+     -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
      -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
      -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
      -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
@@ -7213,8 +7433,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
      -216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
 
-     -216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
-     -216, -216, -216, -216, -216, -216, -216, -216,  246, -216,
+     -216, -216, -216, -216, -216, -216, -216, -216, -216,  246,
+      246,  246,  246,  246,  246,  246,  246,  246, -216, -216,
      -216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
      -216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
      -216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
@@ -7250,7 +7470,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
 
      -217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
-     -217, -217, -217, -217, -217, -217, -217, -217,  247, -217,
+     -217, -217, -217, -217, -217, -217, -217, -217, -217,  247,
      -217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
      -217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
      -217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
@@ -7285,7 +7505,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
      -218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
 
-     -218, -218, -218,  249, -218,  250, -218, -218, -218, -218,
+     -218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
      -218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
      -218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
      -218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
@@ -7308,13 +7528,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
      -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
      -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
-     -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
+     -219, -219, -219, -219, -219, -219, -219, -219,  249, -219,
 
      -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
      -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
      -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
      -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
-     -219, -219, -219, -219, -219, -219, -219, -219,  251, -219,
+     -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
      -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
      -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
      -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
@@ -7344,9 +7564,9 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
      -220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
      -220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
-     -220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
+     -220, -220, -220, -220, -220, -220, -220, -220,  250, -220,
 
-     -220, -220, -220, -220, -220, -220, -220, -220,  252, -220,
+     -220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
      -220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
      -220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
      -220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
@@ -7372,14 +7592,14 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
 
      -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
-     -221, -221, -221, -221, -221, -221, -221, -221,  253, -221,
-     -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
+     -221, -221, -221, -221, -221, -221, -221, -221,  251, -221,
      -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
      -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
      -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
      -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
      -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
      -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
+     -221, -221, -221,  252, -221,  253, -221, -221, -221, -221,
      -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
 
      -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
@@ -7440,7 +7660,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
      -223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
      -223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
-     -223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
+     -223, -223, -223, -223, -223, -223, -223, -223,  255, -223,
      -223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
 
      -223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
@@ -7465,13 +7685,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
      -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
      -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-     -224, -224, -224, -224, -224, -224, -224, -224,  224,  224,
-      224,  224,  224,  224,  224,  224,  224,  224, -224, -224,
+     -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
+     -224, -224, -224, -224, -224, -224, -224, -224,  256, -224,
 
      -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
      -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
      -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-     -224, -224, -224,  180, -224, -224, -224, -224, -224, -224,
+     -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
      -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
      -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
      -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
@@ -7497,16 +7717,16 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
      -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
      -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
-     -225, -225, -225, -225, -225, -225, -225, -225,  225,  225,
-      225,  225,  225,  225,  225,  225,  225,  225, -225, -225,
      -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
      -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
      -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
-     -225, -225, -225,  185, -225, -225, -225, -225, -225, -225,
-
      -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
      -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
      -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
+
+     -225, -225, -225, -225, -225, -225, -225, -225,  257, -225,
+     -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
+     -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
      -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
      -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
      -225, -225, -225, -225, -225, -225, -225, -225, -225, -225,
@@ -7560,13 +7780,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
      -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
      -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
-     -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
-     -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
+     -227, -227, -227, -227, -227, -227, -227, -227,  227,  227,
+      227,  227,  227,  227,  227,  227,  227,  227, -227, -227,
      -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
      -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
 
      -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
-     -227, -227, -227, -227, -227, -227, -227, -227,  255, -227,
+     -227, -227, -227,  183, -227, -227, -227, -227, -227, -227,
      -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
      -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
      -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
@@ -7592,12 +7812,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
      -228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
+     -228, -228, -228, -228, -228, -228, -228, -228,  228,  228,
+      228,  228,  228,  228,  228,  228,  228,  228, -228, -228,
      -228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
      -228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
      -228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
-     -228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
-     -228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
-     -228, -228, -228, -228, -228, -228, -228,  256, -228, -228,
+     -228, -228, -228,  188, -228, -228, -228, -228, -228, -228,
      -228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
      -228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
 
@@ -7660,7 +7880,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
      -230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
      -230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
-     -230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
+     -230, -230, -230, -230, -230, -230, -230, -230,  258, -230,
 
      -230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
      -230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
@@ -7692,7 +7912,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
      -231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
      -231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
-     -231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
+     -231, -231, -231, -231, -231, -231, -231,  259, -231, -231,
      -231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
      -231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
      -231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
@@ -7720,7 +7940,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
      -232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
      -232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
-      257, -232,  257, -232, -232, -232, -232, -232, -232, -232,
+     -232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
      -232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
 
      -232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
@@ -7782,13 +8002,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -234, -234, -234, -234, -234, -234, -234, -234, -234, -234,
      -234, -234, -234, -234, -234, -234, -234, -234, -234, -234,
      -234, -234, -234, -234, -234, -234, -234, -234, -234, -234,
-     -234, -234, -234, -234, -234, -234, -234, -234,  258, -234,
+     -234, -234, -234, -234, -234, -234, -234, -234, -234, -234,
 
      -234, -234, -234, -234, -234, -234, -234, -234, -234, -234,
      -234, -234, -234, -234, -234, -234, -234, -234, -234, -234,
      -234, -234, -234, -234, -234, -234, -234, -234, -234, -234,
      -234, -234, -234, -234, -234, -234, -234, -234, -234, -234,
-     -234, -234, -234, -234, -234, -234, -234, -234, -234,  259,
+     -234, -234, -234, -234, -234, -234, -234, -234, -234, -234,
      -234, -234, -234, -234, -234, -234, -234, -234, -234, -234,
      -234, -234, -234, -234, -234, -234, -234, -234, -234, -234,
      -234, -234, -234, -234, -234, -234, -234, -234, -234, -234,
@@ -7815,7 +8035,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
      -235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
      -235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
-     -235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
+      260, -235,  260, -235, -235, -235, -235, -235, -235, -235,
      -235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
      -235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
      -235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
@@ -7877,13 +8097,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
      -237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
      -237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
-     -237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
+     -237, -237, -237, -237, -237, -237, -237, -237,  261, -237,
      -237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
      -237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
 
      -237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
-     -237, -237, -237,  260, -237, -237, -237, -237, -237, -237,
      -237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
+     -237, -237, -237, -237, -237, -237, -237, -237, -237,  262,
      -237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
      -237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
      -237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
@@ -7945,7 +8165,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
      -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
      -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
-     -239, -239, -239,  261, -239, -239, -239, -239, -239, -239,
+     -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
      -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
      -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
      -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
@@ -7976,7 +8196,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
      -240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
      -240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
-     -240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
+     -240, -240, -240,  263, -240, -240, -240, -240, -240, -240,
 
      -240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
      -240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
@@ -8003,7 +8223,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -241, -241, -241, -241, -241, -241, -241, -241, -241, -241,
      -241, -241, -241, -241, -241, -241, -241, -241, -241, -241,
 
-     -241, -241, -241, -241, -241, -241, -241, -241,  262,  263,
+     -241, -241, -241, -241, -241, -241, -241, -241, -241, -241,
      -241, -241, -241, -241, -241, -241, -241, -241, -241, -241,
      -241, -241, -241, -241, -241, -241, -241, -241, -241, -241,
      -241, -241, -241, -241, -241, -241, -241, -241, -241, -241,
@@ -8034,13 +8254,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
      -242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
      -242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
-     -242, -242, -242, -242, -242, -242, -242, -242,  264,  265,
      -242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
      -242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
      -242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
-
      -242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
+
      -242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
+     -242, -242, -242,  264, -242, -242, -242, -242, -242, -242,
      -242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
      -242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
      -242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
@@ -8071,7 +8291,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -243, -243, -243, -243, -243, -243, -243, -243, -243, -243,
      -243, -243, -243, -243, -243, -243, -243, -243, -243, -243,
      -243, -243, -243, -243, -243, -243, -243, -243, -243, -243,
-     -243, -243, -243,  266, -243, -243, -243, -243, -243, -243,
+     -243, -243, -243, -243, -243, -243, -243, -243, -243, -243,
      -243, -243, -243, -243, -243, -243, -243, -243, -243, -243,
      -243, -243, -243, -243, -243, -243, -243, -243, -243, -243,
 
@@ -8097,7 +8317,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-     -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
+     -244, -244, -244, -244, -244, -244, -244, -244,  265,  266,
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
 
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
@@ -8105,7 +8325,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-     -244, -244, -244, -244, -244, -244, -244,  267, -244, -244,
+     -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
@@ -8129,7 +8349,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
      -245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
      -245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
-     -245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
+     -245, -245, -245, -245, -245, -245, -245, -245,  267,  268,
      -245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
      -245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
      -245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
@@ -8161,12 +8381,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
      -246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
 
-     -246, -246, -246, -246, -246, -246, -246, -246,  268,  268,
      -246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
      -246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
      -246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
      -246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
      -246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
+     -246, -246, -246,  269, -246, -246, -246, -246, -246, -246,
      -246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
      -246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
      -246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
@@ -8193,14 +8413,14 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
      -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
      -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
-     -247, -247, -247, -247, -247, -247, -247, -247,  269, -247,
+     -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
      -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
      -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
 
      -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
-     -247, -247, -247, -247, -247, -247, -247,  270, -247, -247,
      -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
      -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
+     -247, -247, -247, -247, -247, -247, -247,  270, -247, -247,
      -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
      -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
      -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
@@ -8224,16 +8444,16 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
      -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
-     -248, -248, -248,  271, -248,  271, -248, -248, -248, -248,
      -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
      -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
      -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
      -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
      -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
-     -248, -248, -248, -248,  272, -248, -248, -248,  272,  272,
-     -248,  273, -248, -248, -248, -248, -248,  273, -248, -248,
+     -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
+     -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
+     -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
 
-     -248, -248, -248,  249, -248,  250, -248, -248, -248, -248,
+     -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
      -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
      -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
      -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
@@ -8255,13 +8475,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
      -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
      -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
-     -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
+     -249, -249, -249, -249, -249, -249, -249, -249,  271,  271,
      -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
 
      -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
      -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
      -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
-     -249, -249, -249,  274, -249, -249, -249, -249, -249, -249,
+     -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
      -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
      -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
      -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
@@ -8288,11 +8508,11 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
      -250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
      -250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
+     -250, -250, -250, -250, -250, -250, -250, -250,  272, -250,
      -250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
      -250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
      -250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
-     -250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
-     -250, -250, -250,  275, -250, -250, -250, -250, -250, -250,
+     -250, -250, -250, -250, -250, -250, -250,  273, -250, -250,
 
      -250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
      -250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
@@ -8319,15 +8539,15 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
      -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
 
-     -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
-     -251, -251, -251, -251, -251, -251, -251, -251,  276, -251,
-     -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
-     -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
+     -251, -251, -251,  274, -251,  274, -251, -251, -251, -251,
      -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
      -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
      -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
      -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
      -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
+     -251, -251, -251, -251,  275, -251, -251, -251,  275,  275,
+     -251,  276, -251, -251, -251, -251, -251,  276, -251, -251,
+     -251, -251, -251,  252, -251,  253, -251, -251, -251, -251,
      -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
 
      -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
@@ -8356,9 +8576,9 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -252, -252, -252, -252, -252, -252, -252, -252, -252, -252,
 
      -252, -252, -252, -252, -252, -252, -252, -252, -252, -252,
+     -252, -252, -252,  277, -252, -252, -252, -252, -252, -252,
      -252, -252, -252, -252, -252, -252, -252, -252, -252, -252,
      -252, -252, -252, -252, -252, -252, -252, -252, -252, -252,
-     -252, -252, -252, -252, -252, -252, -252,  277, -252, -252,
      -252, -252, -252, -252, -252, -252, -252, -252, -252, -252,
      -252, -252, -252, -252, -252, -252, -252, -252, -252, -252,
      -252, -252, -252, -252, -252, -252, -252, -252, -252, -252,
@@ -8382,12 +8602,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
      -253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
-     -253, -253, -253, -253, -253, -253, -253, -253,  278,  278,
      -253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
      -253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
      -253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
      -253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
      -253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
+     -253, -253, -253,  278, -253, -253, -253, -253, -253, -253,
      -253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
      -253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
 
@@ -8450,10 +8670,10 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
      -255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
      -255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
-     -255, -255, -255, -255, -255, -255, -255,  280, -255, -255,
-
      -255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
+
      -255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
+     -255, -255, -255, -255, -255, -255, -255,  280, -255, -255,
      -255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
      -255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
      -255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
@@ -8477,9 +8697,9 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
      -256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
 
+     -256, -256, -256, -256, -256, -256, -256, -256,  281,  281,
      -256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
      -256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
-     -256, -256,  281, -256, -256, -256, -256, -256, -256, -256,
      -256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
      -256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
      -256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
@@ -8509,7 +8729,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
      -257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
      -257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-     -257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
+     -257, -257, -257, -257, -257, -257, -257, -257,  282, -257,
      -257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
      -257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
 
@@ -8545,7 +8765,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
      -258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
      -258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
-     -258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
+     -258, -258, -258, -258, -258, -258, -258,  283, -258, -258,
      -258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
      -258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
 
@@ -8571,11 +8791,11 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
      -259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
      -259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
-     -259, -259, -259, -259, -259, -259, -259, -259, -259,  282,
-      282,  282,  282,  282,  282,  282,  282,  282, -259, -259,
-
      -259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
      -259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
+
+     -259, -259,  284, -259, -259, -259, -259, -259, -259, -259,
+     -259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
      -259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
      -259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
      -259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
@@ -8666,13 +8886,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
      -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
      -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
-     -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
-     -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
+     -262, -262, -262, -262, -262, -262, -262, -262, -262,  285,
+      285,  285,  285,  285,  285,  285,  285,  285, -262, -262,
      -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
      -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
 
      -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
-     -262, -262, -262,  283, -262, -262, -262, -262, -262, -262,
+     -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
      -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
      -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
      -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
@@ -8703,7 +8923,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -263, -263, -263, -263, -263, -263, -263, -263, -263, -263,
      -263, -263, -263, -263, -263, -263, -263, -263, -263, -263,
      -263, -263, -263, -263, -263, -263, -263, -263, -263, -263,
-     -263, -263, -263,  284, -263, -263, -263, -263, -263, -263,
+     -263, -263, -263, -263, -263, -263, -263, -263, -263, -263,
      -263, -263, -263, -263, -263, -263, -263, -263, -263, -263,
      -263, -263, -263, -263, -263, -263, -263, -263, -263, -263,
 
@@ -8735,7 +8955,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
      -264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
      -264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
-     -264, -264, -264,  285, -264, -264, -264, -264, -264, -264,
+     -264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
      -264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
      -264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
      -264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
@@ -8798,7 +9018,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
      -266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
      -266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
-     -266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
+     -266, -266, -266,  287, -266, -266, -266, -266, -266, -266,
      -266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
      -266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
      -266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
@@ -8830,9 +9050,9 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -267, -267, -267, -267, -267, -267, -267, -267, -267, -267,
 
      -267, -267, -267, -267, -267, -267, -267, -267, -267, -267,
+     -267, -267, -267,  288, -267, -267, -267, -267, -267, -267,
      -267, -267, -267, -267, -267, -267, -267, -267, -267, -267,
      -267, -267, -267, -267, -267, -267, -267, -267, -267, -267,
-     -267, -267, -267, -267, -267,  287, -267, -267, -267, -267,
      -267, -267, -267, -267, -267, -267, -267, -267, -267, -267,
      -267, -267, -267, -267, -267, -267, -267, -267, -267, -267,
      -267, -267, -267, -267, -267, -267, -267, -267, -267, -267,
@@ -8857,15 +9077,15 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
-     -268, -268, -268, -268, -268, -268, -268, -268, -268,  288,
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
+     -268, -268, -268,  289, -268, -268, -268, -268, -268, -268,
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
 
-     -268, -268, -268,  289, -268,  290, -268, -268, -268, -268,
+     -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
@@ -8887,7 +9107,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
      -269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
      -269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
-     -269, -269, -269, -269, -269, -269, -269, -269,  291,  291,
+     -269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
      -269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
 
      -269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
@@ -8920,14 +9140,14 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
      -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
      -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
-     -270, -270, -270, -270, -270, -270, -270, -270,  292, -270,
      -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
      -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
      -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
      -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
-
      -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
+
      -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
+     -270, -270, -270, -270, -270,  290, -270, -270, -270, -270,
      -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
      -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
      -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
@@ -8946,35 +9166,35 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
+       39, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
 
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293, -271,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293, -271,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271,  291,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271,  292, -271,  293, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
 
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
 
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293
+     -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+     -271, -271, -271, -271, -271, -271
     },
 
     {
@@ -8982,16 +9202,16 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
      -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
      -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
-     -272, -272, -272,  271, -272,  271, -272, -272, -272, -272,
+     -272, -272, -272, -272, -272, -272, -272, -272,  294,  294,
      -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
      -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
      -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
 
      -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
-     -272, -272, -272,  274, -272, -272, -272, -272, -272, -272,
      -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
      -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
-     -272, -272, -272,  249, -272, -272, -272, -272, -272, -272,
+     -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
+     -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
      -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
      -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
      -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
@@ -9015,12 +9235,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
      -273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
      -273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
+     -273, -273, -273, -273, -273, -273, -273, -273,  295, -273,
      -273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
      -273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
      -273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
      -273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
      -273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
-     -273, -273, -273, -273,  272, -273, -273, -273,  272, -273,
      -273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
 
      -273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
@@ -9041,34 +9261,34 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+       39,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
 
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296, -274,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296, -274,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
 
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
-     -274, -274, -274, -274, -274, -274
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296
 
     },
 
@@ -9077,16 +9297,16 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
      -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
      -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
+     -275, -275, -275,  274, -275,  274, -275, -275, -275, -275,
      -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
      -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
      -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
      -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-     -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-     -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
+     -275, -275, -275,  277, -275, -275, -275, -275, -275, -275,
 
      -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
      -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-     -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
+     -275, -275, -275,  252, -275, -275, -275, -275, -275, -275,
      -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
      -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
      -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
@@ -9109,15 +9329,15 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
 
-     -276, -276, -276, -276, -276, -276, -276, -276,  294,  295,
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
+     -276, -276, -276, -276,  275, -276, -276, -276,  275, -276,
+     -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
-     -276, -276, -276, -276, -276,  296, -276, -276, -276, -276,
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
 
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
@@ -9148,7 +9368,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
      -277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
      -277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
-     -277, -277, -277, -277,  297, -277, -277, -277, -277, -277,
+     -277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
      -277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
      -277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
      -277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
@@ -9173,7 +9393,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
      -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
      -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
-     -278, -278, -278, -278, -278, -278, -278, -278, -278,  298,
+     -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
      -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
      -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
      -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
@@ -9181,7 +9401,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
      -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
 
-     -278, -278, -278,  299, -278,  300, -278, -278, -278, -278,
+     -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
      -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
      -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
      -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
@@ -9203,7 +9423,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
      -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
      -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
-     -279, -279, -279, -279, -279, -279, -279, -279,  301,  302,
+     -279, -279, -279, -279, -279, -279, -279, -279,  297,  298,
      -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
 
      -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
@@ -9212,7 +9432,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
      -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
      -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
-     -279, -279, -279, -279, -279,  303, -279, -279, -279, -279,
+     -279, -279, -279, -279, -279,  299, -279, -279, -279, -279,
      -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
      -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
      -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
@@ -9237,13 +9457,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
      -280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
      -280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
-     -280, -280,  304, -280, -280, -280, -280, -280, -280, -280,
      -280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
      -280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
      -280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
-
      -280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
+
      -280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
+     -280, -280, -280, -280,  300, -280, -280, -280, -280, -280,
      -280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
      -280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
      -280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
@@ -9268,14 +9488,14 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
 
      -281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
+     -281, -281, -281, -281, -281, -281, -281, -281, -281,  301,
      -281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
      -281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
      -281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
      -281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
      -281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
      -281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
-     -281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
-     -281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
+     -281, -281, -281,  302, -281,  303, -281, -281, -281, -281,
      -281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
 
      -281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
@@ -9298,16 +9518,16 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
-     -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
+     -282, -282, -282, -282, -282, -282, -282, -282,  304,  305,
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
 
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
-     -282, -282, -282,  305, -282, -282, -282, -282, -282, -282,
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
+     -282, -282, -282, -282, -282,  306, -282, -282, -282, -282,
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
      -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
@@ -9332,7 +9552,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
      -283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
      -283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
-     -283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
+     -283, -283,  307, -283, -283, -283, -283, -283, -283, -283,
      -283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
      -283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
      -283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
@@ -9398,7 +9618,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
      -285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
      -285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
-     -285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
+     -285, -285, -285,  308, -285, -285, -285, -285, -285, -285,
 
      -285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
      -285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
@@ -9464,7 +9684,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
      -287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
      -287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
-     -287, -287, -287, -287, -287, -287,  306, -287, -287, -287,
+     -287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
      -287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
      -287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
      -287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
@@ -9525,7 +9745,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -289, -289, -289, -289, -289, -289, -289, -289, -289, -289,
      -289, -289, -289, -289, -289, -289, -289, -289, -289, -289,
      -289, -289, -289, -289, -289, -289, -289, -289, -289, -289,
-     -289, -289, -289,  307, -289, -289, -289, -289, -289, -289,
+     -289, -289, -289, -289, -289, -289, -289, -289, -289, -289,
      -289, -289, -289, -289, -289, -289, -289, -289, -289, -289,
      -289, -289, -289, -289, -289, -289, -289, -289, -289, -289,
      -289, -289, -289, -289, -289, -289, -289, -289, -289, -289,
@@ -9556,10 +9776,10 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
      -290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
      -290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
-     -290, -290, -290,  308, -290, -290, -290, -290, -290, -290,
-
      -290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
+
      -290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
+     -290, -290, -290, -290, -290, -290,  309, -290, -290, -290,
      -290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
      -290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
      -290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
@@ -9584,14 +9804,14 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
 
      -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
-     -291, -291, -291, -291, -291, -291, -291, -291, -291,  309,
      -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
      -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
      -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
      -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
      -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
      -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
-     -291, -291, -291,  310, -291,  311, -291, -291, -291, -291,
+     -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
+     -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
      -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
 
      -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
@@ -9614,13 +9834,13 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
      -292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
      -292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
-     -292, -292, -292, -292, -292, -292, -292, -292,  312,  312,
      -292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
      -292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
      -292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
-
      -292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
+
      -292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
+     -292, -292, -292,  310, -292, -292, -292, -292, -292, -292,
      -292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
      -292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
      -292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
@@ -9641,35 +9861,35 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
+       39, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
 
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  274,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293,  311, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
 
-      293,  293,  293,  313,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
 
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293,  293,  293,  293,  293,
-      293,  293,  293,  293,  293,  293
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+     -293, -293, -293, -293, -293, -293
     },
 
     {
@@ -9678,15 +9898,15 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
      -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
      -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
-     -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
+     -294, -294, -294, -294, -294, -294, -294, -294, -294,  312,
 
      -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
      -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
      -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
-     -294, -294, -294,  314, -294, -294, -294, -294, -294, -294,
      -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
      -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
      -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
+     -294, -294, -294,  313, -294,  314, -294, -294, -294, -294,
      -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
      -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
      -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
@@ -9709,12 +9929,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
      -295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
      -295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
+     -295, -295, -295, -295, -295, -295, -295, -295,  315,  315,
      -295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
      -295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
      -295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
      -295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
      -295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
-     -295, -295, -295,  315, -295, -295, -295, -295, -295, -295,
 
      -295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
      -295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
@@ -9736,35 +9956,35 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+       39,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
 
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296,  316, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  277,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  316,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
 
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
 
-     -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
-     -296, -296, -296, -296, -296, -296
+      296,  296,  296,  296,  296,  296,  296,  296,  296,  296,
+      296,  296,  296,  296,  296,  296
     },
 
     {
@@ -9773,12 +9993,12 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
      -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
      -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-     -297, -297, -297, -297, -297, -297, -297, -297,  317, -297,
      -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
      -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-
      -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
+
      -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
+     -297, -297, -297,  317, -297, -297, -297, -297, -297, -297,
      -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
      -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
      -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
@@ -9809,7 +10029,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
      -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
      -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
-     -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
+     -298, -298, -298,  318, -298, -298, -298, -298, -298, -298,
      -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
      -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
 
@@ -9841,7 +10061,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -299, -299, -299, -299, -299, -299, -299, -299, -299, -299,
      -299, -299, -299, -299, -299, -299, -299, -299, -299, -299,
      -299, -299, -299, -299, -299, -299, -299, -299, -299, -299,
-     -299, -299, -299,  318, -299, -299, -299, -299, -299, -299,
+     -299, -299, -299,  319, -299, -299, -299, -299, -299, -299,
      -299, -299, -299, -299, -299, -299, -299, -299, -299, -299,
      -299, -299, -299, -299, -299, -299, -299, -299, -299, -299,
      -299, -299, -299, -299, -299, -299, -299, -299, -299, -299,
@@ -9868,11 +10088,11 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
      -300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
      -300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
+     -300, -300, -300, -300, -300, -300, -300, -300,  320, -300,
      -300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
      -300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
      -300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
      -300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
-     -300, -300, -300,  319, -300, -300, -300, -300, -300, -300,
 
      -300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
      -300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
@@ -9904,7 +10124,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
      -301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
      -301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
-     -301, -301, -301,  320, -301, -301, -301, -301, -301, -301,
+     -301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
      -301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
      -301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
      -301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
@@ -9999,7 +10219,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -304, -304, -304, -304, -304, -304, -304, -304, -304, -304,
      -304, -304, -304, -304, -304, -304, -304, -304, -304, -304,
      -304, -304, -304, -304, -304, -304, -304, -304, -304, -304,
-     -304, -304, -304, -304, -304, -304, -304, -304, -304, -304,
+     -304, -304, -304,  323, -304, -304, -304, -304, -304, -304,
      -304, -304, -304, -304, -304, -304, -304, -304, -304, -304,
      -304, -304, -304, -304, -304, -304, -304, -304, -304, -304,
      -304, -304, -304, -304, -304, -304, -304, -304, -304, -304,
@@ -10030,7 +10250,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -305, -305, -305, -305, -305, -305, -305, -305, -305, -305,
      -305, -305, -305, -305, -305, -305, -305, -305, -305, -305,
      -305, -305, -305, -305, -305, -305, -305, -305, -305, -305,
-     -305, -305, -305, -305, -305, -305, -305, -305, -305, -305,
+     -305, -305, -305,  324, -305, -305, -305, -305, -305, -305,
 
      -305, -305, -305, -305, -305, -305, -305, -305, -305, -305,
      -305, -305, -305, -305, -305, -305, -305, -305, -305, -305,
@@ -10062,9 +10282,9 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -306, -306, -306, -306, -306, -306, -306, -306, -306, -306,
      -306, -306, -306, -306, -306, -306, -306, -306, -306, -306,
      -306, -306, -306, -306, -306, -306, -306, -306, -306, -306,
+     -306, -306, -306,  325, -306, -306, -306, -306, -306, -306,
      -306, -306, -306, -306, -306, -306, -306, -306, -306, -306,
      -306, -306, -306, -306, -306, -306, -306, -306, -306, -306,
-     -306,  323, -306, -306, -306, -306, -306, -306, -306, -306,
      -306, -306, -306, -306, -306, -306, -306, -306, -306, -306,
      -306, -306, -306, -306, -306, -306, -306, -306, -306, -306,
 
@@ -10159,7 +10379,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
      -309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
      -309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
-     -309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
+     -309,  326, -309, -309, -309, -309, -309, -309, -309, -309,
      -309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
      -309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
      -309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
@@ -10188,7 +10408,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -310, -310, -310, -310, -310, -310, -310, -310, -310, -310,
      -310, -310, -310, -310, -310, -310, -310, -310, -310, -310,
      -310, -310, -310, -310, -310, -310, -310, -310, -310, -310,
-     -310, -310, -310,  324, -310, -310, -310, -310, -310, -310,
+     -310, -310, -310, -310, -310, -310, -310, -310, -310, -310,
 
      -310, -310, -310, -310, -310, -310, -310, -310, -310, -310,
      -310, -310, -310, -310, -310, -310, -310, -310, -310, -310,
@@ -10220,7 +10440,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
      -311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
      -311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
-     -311, -311, -311,  325, -311, -311, -311, -311, -311, -311,
+     -311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
      -311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
      -311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
      -311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
@@ -10247,7 +10467,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
      -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
      -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
-     -312, -312, -312, -312, -312, -312, -312, -312, -312,  326,
+     -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
      -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
      -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
 
@@ -10255,7 +10475,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
      -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
      -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
-     -312, -312, -312,  327, -312,  328, -312, -312, -312, -312,
+     -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
      -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
      -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
      -312, -312, -312, -312, -312, -312, -312, -312, -312, -312,
@@ -10283,7 +10503,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
      -313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
      -313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
-     -313, -313, -313,  274, -313, -313, -313, -313, -313, -313,
+     -313, -313, -313,  327, -313, -313, -313, -313, -313, -313,
      -313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
      -313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
 
@@ -10315,7 +10535,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
      -314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
      -314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
-     -314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
+     -314, -314, -314,  328, -314, -314, -314, -314, -314, -314,
      -314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
      -314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
      -314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
@@ -10342,7 +10562,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
      -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
      -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-     -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
+     -315, -315, -315, -315, -315, -315, -315, -315, -315,  329,
      -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
      -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
      -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
@@ -10350,7 +10570,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
 
      -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
      -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-     -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
+     -315, -315, -315,  330, -315,  331, -315, -315, -315, -315,
      -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
      -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
      -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
@@ -10378,7 +10598,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
      -316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
      -316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
-     -316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
+     -316, -316, -316,  277, -316, -316, -316, -316, -316, -316,
      -316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
      -316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
      -316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
@@ -10404,8 +10624,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
      -317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
      -317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-     -317, -317, -317, -317, -317, -317, -317, -317,  329,  329,
-      329, -317, -317, -317, -317, -317, -317, -317, -317, -317,
+     -317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
+     -317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
      -317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
      -317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
 
@@ -10499,8 +10719,8 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
      -320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
      -320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
-     -320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
-     -320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
+     -320, -320, -320, -320, -320, -320, -320, -320,  332,  332,
+      332, -320, -320, -320, -320, -320, -320, -320, -320, -320,
      -320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
      -320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
      -320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
@@ -10601,7 +10821,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -323, -323, -323, -323, -323, -323, -323, -323, -323, -323,
      -323, -323, -323, -323, -323, -323, -323, -323, -323, -323,
      -323, -323, -323, -323, -323, -323, -323, -323, -323, -323,
-     -323, -323, -323, -323, -323,  330, -323, -323, -323, -323,
+     -323, -323, -323, -323, -323, -323, -323, -323, -323, -323,
 
      -323, -323, -323, -323, -323, -323, -323, -323, -323, -323,
      -323, -323, -323, -323, -323, -323, -323, -323, -323, -323,
@@ -10696,7 +10916,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
      -326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
      -326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
-     -326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
+     -326, -326, -326, -326, -326,  333, -326, -326, -326, -326,
      -326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
      -326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
 
@@ -10726,7 +10946,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -327, -327, -327, -327, -327, -327, -327, -327, -327, -327,
 
      -327, -327, -327, -327, -327, -327, -327, -327, -327, -327,
-     -327, -327, -327,  331, -327, -327, -327, -327, -327, -327,
+     -327, -327, -327, -327, -327, -327, -327, -327, -327, -327,
      -327, -327, -327, -327, -327, -327, -327, -327, -327, -327,
      -327, -327, -327, -327, -327, -327, -327, -327, -327, -327,
      -327, -327, -327, -327, -327, -327, -327, -327, -327, -327,
@@ -10757,7 +10977,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
      -328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
      -328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
-     -328, -328, -328,  332, -328, -328, -328, -328, -328, -328,
+     -328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
      -328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
      -328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
 
@@ -10784,7 +11004,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
-     -329, -329, -329, -329, -329, -329, -329, -329, -329,  333,
+     -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
 
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
@@ -10792,7 +11012,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
-     -329, -329, -329,  334, -329,  335, -329, -329, -329, -329,
+     -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
@@ -10820,7 +11040,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -330, -330, -330, -330, -330, -330, -330, -330, -330, -330,
      -330, -330, -330, -330, -330, -330, -330, -330, -330, -330,
      -330, -330, -330, -330, -330, -330, -330, -330, -330, -330,
-     -330, -330, -330,  336, -330, -330, -330, -330, -330, -330,
+     -330, -330, -330,  334, -330, -330, -330, -330, -330, -330,
 
      -330, -330, -330, -330, -330, -330, -330, -330, -330, -330,
      -330, -330, -330, -330, -330, -330, -330, -330, -330, -330,
@@ -10852,7 +11072,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
      -331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
      -331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
-     -331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
+     -331, -331, -331,  335, -331, -331, -331, -331, -331, -331,
      -331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
      -331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
      -331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
@@ -10879,7 +11099,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
      -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
      -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
-     -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
+     -332, -332, -332, -332, -332, -332, -332, -332, -332,  336,
      -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
      -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
 
@@ -10887,7 +11107,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
      -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
      -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
-     -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
+     -332, -332, -332,  337, -332,  338, -332, -332, -332, -332,
      -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
      -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
      -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
@@ -10905,35 +11125,35 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
+       39, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
 
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337, -333,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333,  339, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
 
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
 
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
+     -333, -333, -333, -333, -333, -333
     },
 
     {
@@ -10947,7 +11167,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
      -334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
      -334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
-     -334, -334, -334,  338, -334, -334, -334, -334, -334, -334,
+     -334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
      -334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
      -334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
      -334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
@@ -10978,7 +11198,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -335, -335, -335, -335, -335, -335, -335, -335, -335, -335,
      -335, -335, -335, -335, -335, -335, -335, -335, -335, -335,
      -335, -335, -335, -335, -335, -335, -335, -335, -335, -335,
-     -335, -335, -335,  339, -335, -335, -335, -335, -335, -335,
+     -335, -335, -335, -335, -335, -335, -335, -335, -335, -335,
 
      -335, -335, -335, -335, -335, -335, -335, -335, -335, -335,
      -335, -335, -335, -335, -335, -335, -335, -335, -335, -335,
@@ -11000,66 +11220,66 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-
-     -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336
-    },
-
-    {
-       39,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  340,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337
+       39,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+
+      340,  340,  340,  340, -336,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340
+    },
+
+    {
+       39, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337,  341, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337
     },
 
     {
@@ -11073,7 +11293,7 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
      -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
      -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
-     -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
+     -338, -338, -338,  342, -338, -338, -338, -338, -338, -338,
      -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
      -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
 
@@ -11127,66 +11347,66 @@ static yyconst flex_int32_t yy_nxt[][256] =
     },
 
     {
-       39,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341, -340,  341,  341,  341,  341,  341,  341,
-
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341
-    },
-
-    {
-       39,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  342,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341
+       39,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  343,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340
+    },
+
+    {
+       39, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341
     },
 
     {
@@ -11220,28 +11440,119 @@ static yyconst flex_int32_t yy_nxt[][256] =
      -342, -342, -342, -342, -342, -342
     },
 
+    {
+       39,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344, -343,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344
+    },
+
+    {
+       39,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  345,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344,  344,  344,  344,  344,
+      344,  344,  344,  344,  344,  344
+
+    },
+
+    {
+       39, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+     -345, -345, -345, -345, -345, -345
+    },
+
     } ;
 
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-#if defined(__GNUC__) && __GNUC__ >= 3
-__attribute__((__noreturn__))
-#endif
-static void yy_fatal_error (yyconst char msg[]  );
+static yy_state_type yy_get_previous_state ( void );
+static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  );
+static int yy_get_next_buffer ( void );
+static void yynoreturn yy_fatal_error ( const char* msg  );
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up gabc_notes_determination_text.
+ * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	gabc_notes_determination_leng = (size_t) (yy_cp - yy_bp); \
+	yyleng = (int) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-
-#define YY_NUM_RULES 151
-#define YY_END_OF_BUFFER 152
+#define YY_NUM_RULES 154
+#define YY_END_OF_BUFFER 155
 /* This struct is not used in this scanner,
    but its presence is necessary. */
 struct yy_trans_info
@@ -11249,52 +11560,52 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int32_t yy_accept[343] =
+static const flex_int32_t yy_accept[346] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    3,    3,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    0,  152,  150,
-       69,  107,  150,  100,    1,  128,   83,  150,  130,  104,
-       86,   85,  133,  113,  132,  150,  125,  138,   89,  144,
-      142,   75,  150,   29,  129,   82,  122,  122,  135,  134,
-       88,  145,  143,  141,   99,  101,   72,   66,   67,  131,
+        0,    0,    0,    0,    0,    0,    0,    0,  155,  153,
+       69,  110,  153,  103,    1,  131,   84,  153,  133,  107,
+       88,   87,  136,  116,  135,  153,  128,  141,   92,  147,
+      145,   75,  153,   29,  132,   82,  125,  125,  138,  137,
+       91,  148,  146,  144,  102,  104,   72,   66,   67,  134,
        36,   58,   37,   38,   34,   35,   39,    3,    2,   30,
-       31,   32,   33,  151,  151,  151,  151,  151,  151,  151,
-
-       48,  151,  151,   55,  151,  151,   69,  112,  111,  108,
-      128,   84,  126,  123,  130,  103,  106,  102,   40,   87,
-        0,    0,  127,   28,  124,  124,  125,    0,    0,    0,
-      139,  140,   76,   77,   64,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,   65,  129,   68,   78,    0,  136,
-      137,   90,   91,   92,   93,   94,   95,   96,   97,   98,
-       73,   74,   71,   36,   37,   38,   34,   35,   39,    3,
-        2,   30,   31,   32,   33,    0,    0,    0,    0,   41,
-        0,    0,    0,    0,   43,   48,   49,   50,   55,   56,
-       57,  110,   42,  126,  105,    0,    0,  127,   80,    0,
-
-      116,  118,  114,    0,    0,    0,    0,    0,    0,    0,
+       31,   32,   33,  154,  154,  154,  154,  154,  154,  154,
+
+       48,  154,  154,   55,  154,  154,   69,  115,  114,  111,
+      131,   85,   86,  129,  126,  133,  106,  109,  105,   40,
+       89,   90,    0,    0,  130,   28,  127,  127,  128,    0,
+        0,    0,  142,  143,   76,   77,   64,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,   65,  132,   83,   68,
+       78,    0,  139,  140,   93,   94,   95,   96,   97,   98,
+       99,  100,  101,   73,   74,   71,   36,   37,   38,   34,
+       35,   39,    3,    2,   30,   31,   32,   33,    0,    0,
+        0,    0,   41,    0,    0,    0,    0,   43,   48,   49,
+       50,   55,   56,   57,  113,   42,  129,  108,    0,    0,
+
+      130,   80,    0,  119,  121,  117,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,   79,    0,    0,  109,    0,    0,   81,  117,
-      119,  120,  115,    0,    5,    4,    0,   24,    0,   23,
-        0,    0,    0,    0,   22,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,    0,  121,   25,    0,   20,
-       19,    0,    0,    0,    0,   18,    0,    0,    0,    0,
-        0,    0,    0,   62,   63,   47,    0,    0,   54,    0,
-       26,    0,  147,  146,  149,  148,    0,    6,    0,    0,
-        0,    0,    0,    0,    0,    0,    0,    7,    0,    0,
-
-        0,    0,    0,   27,   21,    0,   10,   14,    8,    0,
-        0,    0,    0,   45,   44,   46,    0,   11,   15,   52,
-       51,   53,    0,   12,   16,    9,    0,    0,    0,    0,
-       13,   17,    0,    0,    0,   70,    0,   60,   61,    0,
-        0,   59
+        0,    0,    0,    0,    0,   79,    0,    0,  112,    0,
+        0,   81,  120,  122,  123,  118,    0,    5,    4,    0,
+       24,    0,   23,    0,    0,    0,    0,   22,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,    0,  124,
+       25,    0,   20,   19,    0,    0,    0,    0,   18,    0,
+        0,    0,    0,    0,    0,    0,   62,   63,   47,    0,
+        0,   54,    0,   26,    0,  150,  149,  152,  151,    0,
+        6,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+
+        7,    0,    0,    0,    0,    0,   27,   21,    0,   10,
+       14,    8,    0,    0,    0,    0,   45,   44,   46,    0,
+       11,   15,   52,   51,   53,    0,   12,   16,    9,    0,
+        0,    0,    0,   13,   17,    0,    0,    0,   70,    0,
+       60,   61,    0,    0,   59
     } ;
 
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
-static yyconst yy_state_type yy_NUL_trans[343] =
+static const yy_state_type yy_NUL_trans[346] =
     {   0,
        40,   40,   81,   81,   83,   83,   84,   84,   85,   85,
        86,   86,   87,   87,   88,   88,   90,   90,   91,   91,
@@ -11304,19 +11615,19 @@ static yyconst yy_state_type yy_NUL_trans[343] =
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      164,    0,  165,  166,  167,  168,  169,  170,    0,  172,
-      173,  174,  175,    0,    0,    0,    0,    0,    0,    0,
+      167,    0,  168,  169,  170,  171,  172,  173,    0,  175,
+      176,  177,  178,    0,    0,    0,    0,    0,    0,    0,
 
-      186,  187,  188,  189,  190,  191,    0,    0,    0,    0,
+      189,  190,  191,  192,  193,  194,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,    0,  164,  165,  166,  167,  168,  169,  170,
-        0,  172,  173,  174,  175,    0,    0,    0,    0,    0,
-        0,    0,    0,    0,    0,  186,  187,  188,  189,  190,
-      191,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,    0,  167,  168,  169,  170,
+      171,  172,  173,    0,  175,  176,  177,  178,    0,    0,
+        0,    0,    0,    0,    0,    0,    0,    0,  189,  190,
+      191,  192,  193,  194,    0,    0,    0,    0,    0,    0,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -11325,19 +11636,19 @@ static yyconst yy_state_type yy_NUL_trans[343] =
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-      293,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,  296,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  293,    0,    0,    0,    0,    0,    0,    0,
+        0,    0,    0,    0,    0,  296,    0,    0,    0,    0,
 
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
-        0,    0,  337,    0,    0,    0,  337,    0,    0,  341,
-      341,    0
+        0,    0,    0,    0,    0,  340,    0,    0,    0,  340,
+        0,    0,  344,  344,    0
     } ;
 
-extern int gabc_notes_determination__flex_debug;
-int gabc_notes_determination__flex_debug = 0;
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
 
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
@@ -11346,7 +11657,7 @@ int gabc_notes_determination__flex_debug = 0;
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-char *gabc_notes_determination_text;
+char *yytext;
 #line 1 "gabc/gabc-notes-determination.l"
 #line 2 "gabc/gabc-notes-determination.l"
 /*
@@ -12092,23 +12403,9 @@ void gabc_det_notes_finish(void)
     }
 }
 
+#line 12406 "gabc/gabc-notes-determination-l.c"
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#line 12112 "gabc/gabc-notes-determination-l.c"
+#line 12408 "gabc/gabc-notes-determination-l.c"
 
 #define INITIAL 0
 #define texverbnote 1
@@ -12142,36 +12439,36 @@ void gabc_det_notes_finish(void)
 #define YY_EXTRA_TYPE void *
 #endif
 
-static int yy_init_globals (void );
+static int yy_init_globals ( void );
 
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int gabc_notes_determination_lex_destroy (void );
+int yylex_destroy ( void );
 
-int gabc_notes_determination_get_debug (void );
+int yyget_debug ( void );
 
-void gabc_notes_determination_set_debug (int debug_flag  );
+void yyset_debug ( int debug_flag  );
 
-YY_EXTRA_TYPE gabc_notes_determination_get_extra (void );
+YY_EXTRA_TYPE yyget_extra ( void );
 
-void gabc_notes_determination_set_extra (YY_EXTRA_TYPE user_defined  );
+void yyset_extra ( YY_EXTRA_TYPE user_defined  );
 
-FILE *gabc_notes_determination_get_in (void );
+FILE *yyget_in ( void );
 
-void gabc_notes_determination_set_in  (FILE * _in_str  );
+void yyset_in  ( FILE * _in_str  );
 
-FILE *gabc_notes_determination_get_out (void );
+FILE *yyget_out ( void );
 
-void gabc_notes_determination_set_out  (FILE * _out_str  );
+void yyset_out  ( FILE * _out_str  );
 
-yy_size_t gabc_notes_determination_get_leng (void );
+			int yyget_leng ( void );
 
-char *gabc_notes_determination_get_text (void );
+char *yyget_text ( void );
 
-int gabc_notes_determination_get_lineno (void );
+int yyget_lineno ( void );
 
-void gabc_notes_determination_set_lineno (int _line_number  );
+void yyset_lineno ( int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -12179,9 +12476,9 @@ void gabc_notes_determination_set_lineno (int _line_number  );
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int gabc_notes_determination_wrap (void );
+extern "C" int yywrap ( void );
 #else
-extern int gabc_notes_determination_wrap (void );
+extern int yywrap ( void );
 #endif
 #endif
 
@@ -12190,19 +12487,18 @@ extern int gabc_notes_determination_wrap (void );
 #endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy ( char *, const char *, int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen ( const char * );
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+static int yyinput ( void );
 #else
-static int input (void );
+static int input ( void );
 #endif
 
 #endif
@@ -12226,7 +12522,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( gabc_notes_determination_text, gabc_notes_determination_leng, 1, gabc_notes_determination_out )) {} } while (0)
+#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -12237,20 +12533,20 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
-			     (c = getc( gabc_notes_determination_in )) != EOF && c != '\n'; ++n ) \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( gabc_notes_determination_in ) ) \
+		if ( c == EOF && ferror( yyin ) ) \
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, gabc_notes_determination_in))==0 && ferror(gabc_notes_determination_in)) \
+		while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -12258,7 +12554,7 @@ static int input (void );
 				break; \
 				} \
 			errno=0; \
-			clearerr(gabc_notes_determination_in); \
+			clearerr(yyin); \
 			} \
 		}\
 \
@@ -12291,12 +12587,12 @@ static int input (void );
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int gabc_notes_determination_lex (void);
+extern int yylex (void);
 
-#define YY_DECL int gabc_notes_determination_lex (void)
+#define YY_DECL int yylex (void)
 #endif /* !YY_DECL */
 
-/* Code executed at the beginning of each rule, after gabc_notes_determination_text and gabc_notes_determination_leng
+/* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -12330,31 +12626,31 @@ YY_DECL
 		if ( ! (yy_start) )
 			(yy_start) = 1;	/* first start state */
 
-		if ( ! gabc_notes_determination_in )
-			gabc_notes_determination_in = stdin;
+		if ( ! yyin )
+			yyin = stdin;
 
-		if ( ! gabc_notes_determination_out )
-			gabc_notes_determination_out = stdout;
+		if ( ! yyout )
+			yyout = stdout;
 
 		if ( ! YY_CURRENT_BUFFER ) {
-			gabc_notes_determination_ensure_buffer_stack ();
+			yyensure_buffer_stack ();
 			YY_CURRENT_BUFFER_LVALUE =
-				gabc_notes_determination__create_buffer(gabc_notes_determination_in,YY_BUF_SIZE );
+				yy_create_buffer( yyin, YY_BUF_SIZE );
 		}
 
-		gabc_notes_determination__load_buffer_state( );
+		yy_load_buffer_state(  );
 		}
 
 	{
 #line 779 "gabc/gabc-notes-determination.l"
 
-#line 12352 "gabc/gabc-notes-determination-l.c"
+#line 12647 "gabc/gabc-notes-determination-l.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
 
-		/* Support of gabc_notes_determination_text. */
+		/* Support of yytext. */
 		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
@@ -12835,9 +13131,9 @@ YY_RULE_SETUP
     }
 	YY_BREAK
 case 41:
-*yy_cp = (yy_hold_char); /* undo effects of setting up gabc_notes_determination_text */
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
 (yy_c_buf_p) = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up gabc_notes_determination_text again */
+YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
 #line 1050 "gabc/gabc-notes-determination.l"
 {
@@ -12853,9 +13149,9 @@ YY_RULE_SETUP
     }
 	YY_BREAK
 case 43:
-*yy_cp = (yy_hold_char); /* undo effects of setting up gabc_notes_determination_text */
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
 (yy_c_buf_p) = yy_cp -= 1;
-YY_DO_BEFORE_ACTION; /* set up gabc_notes_determination_text again */
+YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
 #line 1057 "gabc/gabc-notes-determination.l"
 {
@@ -13175,533 +13471,554 @@ case 83:
 YY_RULE_SETUP
 #line 1208 "gabc/gabc-notes-determination.l"
 {
-        add_bar_as_note(B_DIVISIO_MINIMA);
+        add_bar_as_note(B_VIRGULA_HIGH);
     }
 	YY_BREAK
 case 84:
 YY_RULE_SETUP
 #line 1211 "gabc/gabc-notes-determination.l"
 {
-        add_bar_as_note(parse_dominican_bar(gabc_notes_determination_text[1]));
+        add_bar_as_note(B_DIVISIO_MINIMA);
     }
 	YY_BREAK
 case 85:
 YY_RULE_SETUP
 #line 1214 "gabc/gabc-notes-determination.l"
 {
-        add_bar_as_note(B_DIVISIO_MINOR);
+        add_bar_as_note(B_DIVISIO_MINIMA_HIGH);
     }
 	YY_BREAK
 case 86:
 YY_RULE_SETUP
 #line 1217 "gabc/gabc-notes-determination.l"
 {
-        add_bar_as_note(B_DIVISIO_MAIOR);
+        add_bar_as_note(parse_dominican_bar(gabc_notes_determination_text[1]));
     }
 	YY_BREAK
 case 87:
 YY_RULE_SETUP
 #line 1220 "gabc/gabc-notes-determination.l"
 {
-        add_bar_as_note(B_DIVISIO_FINALIS);
+        add_bar_as_note(B_DIVISIO_MINOR);
     }
 	YY_BREAK
 case 88:
 YY_RULE_SETUP
 #line 1223 "gabc/gabc-notes-determination.l"
 {
-        gregorio_add_cavum(current_note);
+        add_bar_as_note(B_DIVISIO_MAIOR);
     }
 	YY_BREAK
 case 89:
 YY_RULE_SETUP
 #line 1226 "gabc/gabc-notes-determination.l"
 {
-        gregorio_change_shape(current_note, S_LINEA_PUNCTUM,
-                legacy_oriscus_orientation);
+        add_bar_as_note(B_DIVISIO_FINALIS);
     }
 	YY_BREAK
 case 90:
 YY_RULE_SETUP
-#line 1230 "gabc/gabc-notes-determination.l"
+#line 1229 "gabc/gabc-notes-determination.l"
 {
-        gregorio_change_shape(current_note, S_LINEA_PUNCTUM,
-                legacy_oriscus_orientation);
-        gregorio_add_cavum(current_note);
+        add_bar_as_note(B_DIVISIO_MAIOR_DOTTED);
     }
 	YY_BREAK
 case 91:
 YY_RULE_SETUP
-#line 1235 "gabc/gabc-notes-determination.l"
+#line 1232 "gabc/gabc-notes-determination.l"
 {
-        gregorio_add_special_sign(current_note, _ACCENTUS);
+        gregorio_add_cavum(current_note);
     }
 	YY_BREAK
 case 92:
 YY_RULE_SETUP
-#line 1238 "gabc/gabc-notes-determination.l"
+#line 1235 "gabc/gabc-notes-determination.l"
 {
-        gregorio_add_special_sign(current_note, _ACCENTUS_REVERSUS);
+        gregorio_change_shape(current_note, S_LINEA_PUNCTUM,
+                legacy_oriscus_orientation);
     }
 	YY_BREAK
 case 93:
 YY_RULE_SETUP
-#line 1241 "gabc/gabc-notes-determination.l"
+#line 1239 "gabc/gabc-notes-determination.l"
 {
-        gregorio_add_special_sign(current_note, _CIRCULUS);
+        gregorio_change_shape(current_note, S_LINEA_PUNCTUM,
+                legacy_oriscus_orientation);
+        gregorio_add_cavum(current_note);
     }
 	YY_BREAK
 case 94:
 YY_RULE_SETUP
 #line 1244 "gabc/gabc-notes-determination.l"
 {
-        gregorio_add_special_sign(current_note, _SEMI_CIRCULUS);
+        gregorio_add_special_sign(current_note, _ACCENTUS);
     }
 	YY_BREAK
 case 95:
 YY_RULE_SETUP
 #line 1247 "gabc/gabc-notes-determination.l"
 {
-        gregorio_add_special_sign(current_note, _SEMI_CIRCULUS_REVERSUS);
+        gregorio_add_special_sign(current_note, _ACCENTUS_REVERSUS);
     }
 	YY_BREAK
 case 96:
 YY_RULE_SETUP
 #line 1250 "gabc/gabc-notes-determination.l"
 {
-        gregorio_add_special_sign(current_note, _MUSICA_FICTA_FLAT);
+        gregorio_add_special_sign(current_note, _CIRCULUS);
     }
 	YY_BREAK
 case 97:
 YY_RULE_SETUP
 #line 1253 "gabc/gabc-notes-determination.l"
 {
-        gregorio_add_special_sign(current_note, _MUSICA_FICTA_NATURAL);
+        gregorio_add_special_sign(current_note, _SEMI_CIRCULUS);
     }
 	YY_BREAK
 case 98:
 YY_RULE_SETUP
 #line 1256 "gabc/gabc-notes-determination.l"
 {
-        gregorio_add_special_sign(current_note, _MUSICA_FICTA_SHARP);
+        gregorio_add_special_sign(current_note, _SEMI_CIRCULUS_REVERSUS);
     }
 	YY_BREAK
 case 99:
 YY_RULE_SETUP
 #line 1259 "gabc/gabc-notes-determination.l"
 {
-        gregorio_change_shape(current_note, S_FLAT, legacy_oriscus_orientation);
+        gregorio_add_special_sign(current_note, _MUSICA_FICTA_FLAT);
     }
 	YY_BREAK
 case 100:
 YY_RULE_SETUP
 #line 1262 "gabc/gabc-notes-determination.l"
 {
+        gregorio_add_special_sign(current_note, _MUSICA_FICTA_NATURAL);
+    }
+	YY_BREAK
+case 101:
+YY_RULE_SETUP
+#line 1265 "gabc/gabc-notes-determination.l"
+{
+        gregorio_add_special_sign(current_note, _MUSICA_FICTA_SHARP);
+    }
+	YY_BREAK
+case 102:
+YY_RULE_SETUP
+#line 1268 "gabc/gabc-notes-determination.l"
+{
+        gregorio_change_shape(current_note, S_FLAT, legacy_oriscus_orientation);
+    }
+	YY_BREAK
+case 103:
+YY_RULE_SETUP
+#line 1271 "gabc/gabc-notes-determination.l"
+{
         gregorio_change_shape(current_note, S_SHARP,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 101:
+case 104:
 YY_RULE_SETUP
-#line 1266 "gabc/gabc-notes-determination.l"
+#line 1275 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_NATURAL,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 102:
+case 105:
 YY_RULE_SETUP
-#line 1270 "gabc/gabc-notes-determination.l"
+#line 1279 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_space_as_note(&current_note, SP_HALF_SPACE, NULL,
                 &notes_lloc);
     }
 	YY_BREAK
-case 103:
+case 106:
 YY_RULE_SETUP
-#line 1274 "gabc/gabc-notes-determination.l"
+#line 1283 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_space_as_note(&current_note, SP_INTERGLYPH_SPACE, NULL,
                 &notes_lloc);
     }
 	YY_BREAK
-case 104:
+case 107:
 YY_RULE_SETUP
-#line 1278 "gabc/gabc-notes-determination.l"
+#line 1287 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_space_as_note(&current_note, SP_NEUMATIC_CUT, NULL,
                 &notes_lloc);
     }
 	YY_BREAK
-case 105:
-*yy_cp = (yy_hold_char); /* undo effects of setting up gabc_notes_determination_text */
+case 108:
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
 (yy_c_buf_p) = yy_cp = yy_bp + 1;
-YY_DO_BEFORE_ACTION; /* set up gabc_notes_determination_text again */
+YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 1282 "gabc/gabc-notes-determination.l"
+#line 1291 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_space_as_note(&current_note, SP_NEUMATIC_CUT, NULL,
                 &notes_lloc);
     }
 	YY_BREAK
-case 106:
+case 109:
 YY_RULE_SETUP
-#line 1286 "gabc/gabc-notes-determination.l"
+#line 1295 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_space_as_note(&current_note, SP_LARGER_SPACE, NULL,
                 &notes_lloc);
     }
 	YY_BREAK
-case 107:
+case 110:
 YY_RULE_SETUP
-#line 1290 "gabc/gabc-notes-determination.l"
+#line 1299 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_space_as_note(&current_note, SP_GLYPH_SPACE, NULL,
                 &notes_lloc);
     }
 	YY_BREAK
-case 108:
+case 111:
 YY_RULE_SETUP
-#line 1294 "gabc/gabc-notes-determination.l"
+#line 1303 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_space_as_note(&current_note, SP_NEUMATIC_CUT_NB, NULL,
                 &notes_lloc);
     }
 	YY_BREAK
-case 109:
-*yy_cp = (yy_hold_char); /* undo effects of setting up gabc_notes_determination_text */
+case 112:
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
 (yy_c_buf_p) = yy_cp = yy_bp + 2;
-YY_DO_BEFORE_ACTION; /* set up gabc_notes_determination_text again */
+YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 1298 "gabc/gabc-notes-determination.l"
+#line 1307 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_space_as_note(&current_note, SP_NEUMATIC_CUT_NB, NULL,
                 &notes_lloc);
     }
 	YY_BREAK
-case 110:
+case 113:
 YY_RULE_SETUP
-#line 1302 "gabc/gabc-notes-determination.l"
+#line 1311 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_space_as_note(&current_note, SP_LARGER_SPACE_NB, NULL,
                 &notes_lloc);
     }
 	YY_BREAK
-case 111:
+case 114:
 YY_RULE_SETUP
-#line 1306 "gabc/gabc-notes-determination.l"
+#line 1315 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_space_as_note(&current_note, SP_GLYPH_SPACE_NB, NULL,
                 &notes_lloc);
     }
 	YY_BREAK
-case 112:
-/* rule 112 can match eol */
-*yy_cp = (yy_hold_char); /* undo effects of setting up gabc_notes_determination_text */
+case 115:
+/* rule 115 can match eol */
+*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
 YY_LINENO_REWIND_TO(yy_bp + 1);
 (yy_c_buf_p) = yy_cp = yy_bp + 1;
-YY_DO_BEFORE_ACTION; /* set up gabc_notes_determination_text again */
+YY_DO_BEFORE_ACTION; /* set up yytext again */
 YY_RULE_SETUP
-#line 1310 "gabc/gabc-notes-determination.l"
+#line 1319 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_space_as_note(&current_note, SP_ZERO_WIDTH, NULL,
                 &notes_lloc);
     }
 	YY_BREAK
-case 113:
+case 116:
 YY_RULE_SETUP
-#line 1314 "gabc/gabc-notes-determination.l"
+#line 1323 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_LINEA,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 114:
+case 117:
 YY_RULE_SETUP
-#line 1318 "gabc/gabc-notes-determination.l"
+#line 1327 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(0, S_BIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA);
     }
 	YY_BREAK
-case 115:
+case 118:
 YY_RULE_SETUP
-#line 1321 "gabc/gabc-notes-determination.l"
+#line 1330 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(0, S_TRIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA);
     }
 	YY_BREAK
-case 116:
+case 119:
 YY_RULE_SETUP
-#line 1324 "gabc/gabc-notes-determination.l"
+#line 1333 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(0, S_BIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA);
     }
 	YY_BREAK
-case 117:
+case 120:
 YY_RULE_SETUP
-#line 1327 "gabc/gabc-notes-determination.l"
+#line 1336 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(0, S_TRIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA);
     }
 	YY_BREAK
-case 118:
+case 121:
 YY_RULE_SETUP
-#line 1330 "gabc/gabc-notes-determination.l"
+#line 1339 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(0, S_DISTROPHA, _NO_SIGN, L_NO_LIQUESCENTIA);
     }
 	YY_BREAK
-case 119:
+case 122:
 YY_RULE_SETUP
-#line 1333 "gabc/gabc-notes-determination.l"
+#line 1342 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(0, S_DISTROPHA, _NO_SIGN, L_AUCTUS_ASCENDENS);
     }
 	YY_BREAK
-case 120:
+case 123:
 YY_RULE_SETUP
-#line 1336 "gabc/gabc-notes-determination.l"
+#line 1345 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(0, S_TRISTROPHA, _NO_SIGN, L_NO_LIQUESCENTIA);
     }
 	YY_BREAK
-case 121:
+case 124:
 YY_RULE_SETUP
-#line 1339 "gabc/gabc-notes-determination.l"
+#line 1348 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(0, S_TRISTROPHA, _NO_SIGN, L_AUCTUS_ASCENDENS);
     }
 	YY_BREAK
-case 122:
+case 125:
 YY_RULE_SETUP
-#line 1342 "gabc/gabc-notes-determination.l"
+#line 1351 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(0, S_PUNCTUM, _NO_SIGN, L_NO_LIQUESCENTIA);
     }
 	YY_BREAK
-case 123:
+case 126:
 YY_RULE_SETUP
-#line 1345 "gabc/gabc-notes-determination.l"
+#line 1354 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(1, S_PUNCTUM, _NO_SIGN, L_INITIO_DEBILIS);
     }
 	YY_BREAK
-case 124:
+case 127:
 YY_RULE_SETUP
-#line 1348 "gabc/gabc-notes-determination.l"
+#line 1357 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(1, S_PUNCTUM, _NO_SIGN, L_FUSED);
     }
 	YY_BREAK
-case 125:
+case 128:
 YY_RULE_SETUP
-#line 1351 "gabc/gabc-notes-determination.l"
+#line 1360 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(0, punctum_inclinatum(gabc_notes_determination_text[1]),
                 _NO_SIGN, L_NO_LIQUESCENTIA);
     }
 	YY_BREAK
-case 126:
+case 129:
 YY_RULE_SETUP
-#line 1355 "gabc/gabc-notes-determination.l"
+#line 1364 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(1, punctum_inclinatum(gabc_notes_determination_text[2]),
                 _NO_SIGN, L_INITIO_DEBILIS);
     }
 	YY_BREAK
-case 127:
+case 130:
 YY_RULE_SETUP
-#line 1359 "gabc/gabc-notes-determination.l"
+#line 1368 "gabc/gabc-notes-determination.l"
 {
         lex_add_note(1, punctum_inclinatum(gabc_notes_determination_text[2]),
                 _NO_SIGN, L_FUSED);
     }
 	YY_BREAK
-case 128:
+case 131:
 YY_RULE_SETUP
-#line 1363 "gabc/gabc-notes-determination.l"
+#line 1372 "gabc/gabc-notes-determination.l"
 {
         add_sign(_V_EPISEMA);
     }
 	YY_BREAK
-case 129:
+case 132:
 YY_RULE_SETUP
-#line 1366 "gabc/gabc-notes-determination.l"
+#line 1375 "gabc/gabc-notes-determination.l"
 {
         add_h_episema();
     }
 	YY_BREAK
-case 130:
+case 133:
 YY_RULE_SETUP
-#line 1369 "gabc/gabc-notes-determination.l"
+#line 1378 "gabc/gabc-notes-determination.l"
 {
         add_sign(_PUNCTUM_MORA);
     }
 	YY_BREAK
-case 131:
+case 134:
 YY_RULE_SETUP
-#line 1372 "gabc/gabc-notes-determination.l"
+#line 1381 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_tail_liquescentia(current_note, L_DEMINUTUS,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 132:
+case 135:
 YY_RULE_SETUP
-#line 1376 "gabc/gabc-notes-determination.l"
+#line 1385 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_tail_liquescentia(current_note, L_AUCTUS_DESCENDENS,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 133:
+case 136:
 YY_RULE_SETUP
-#line 1380 "gabc/gabc-notes-determination.l"
+#line 1389 "gabc/gabc-notes-determination.l"
 {
         gregorio_add_tail_liquescentia(current_note, L_AUCTUS_ASCENDENS,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 134:
+case 137:
 YY_RULE_SETUP
-#line 1384 "gabc/gabc-notes-determination.l"
+#line 1393 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_QUADRATUM,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 135:
+case 138:
 YY_RULE_SETUP
-#line 1388 "gabc/gabc-notes-determination.l"
+#line 1397 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_ORISCUS_UNDETERMINED,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 136:
+case 139:
 YY_RULE_SETUP
-#line 1392 "gabc/gabc-notes-determination.l"
+#line 1401 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_ORISCUS_DESCENDENS,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 137:
+case 140:
 YY_RULE_SETUP
-#line 1396 "gabc/gabc-notes-determination.l"
+#line 1405 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_ORISCUS_ASCENDENS,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 138:
+case 141:
 YY_RULE_SETUP
-#line 1400 "gabc/gabc-notes-determination.l"
+#line 1409 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_ORISCUS_SCAPUS_UNDETERMINED,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 139:
+case 142:
 YY_RULE_SETUP
-#line 1404 "gabc/gabc-notes-determination.l"
+#line 1413 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_ORISCUS_SCAPUS_DESCENDENS,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 140:
+case 143:
 YY_RULE_SETUP
-#line 1408 "gabc/gabc-notes-determination.l"
+#line 1417 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_ORISCUS_SCAPUS_ASCENDENS,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 141:
+case 144:
 YY_RULE_SETUP
-#line 1412 "gabc/gabc-notes-determination.l"
+#line 1421 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_QUILISMA,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 142:
+case 145:
 YY_RULE_SETUP
-#line 1416 "gabc/gabc-notes-determination.l"
+#line 1425 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_QUILISMA_QUADRATUM,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 143:
+case 146:
 YY_RULE_SETUP
-#line 1420 "gabc/gabc-notes-determination.l"
+#line 1429 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_VIRGA,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 144:
+case 147:
 YY_RULE_SETUP
-#line 1424 "gabc/gabc-notes-determination.l"
+#line 1433 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_VIRGA_REVERSA,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 145:
+case 148:
 YY_RULE_SETUP
-#line 1428 "gabc/gabc-notes-determination.l"
+#line 1437 "gabc/gabc-notes-determination.l"
 {
         gregorio_change_shape(current_note, S_STROPHA,
                 legacy_oriscus_orientation);
     }
 	YY_BREAK
-case 146:
+case 149:
 YY_RULE_SETUP
-#line 1432 "gabc/gabc-notes-determination.l"
+#line 1441 "gabc/gabc-notes-determination.l"
 {
         LEDGER(high, EXPLICIT, true);
     }
 	YY_BREAK
-case 147:
+case 150:
 YY_RULE_SETUP
-#line 1435 "gabc/gabc-notes-determination.l"
+#line 1444 "gabc/gabc-notes-determination.l"
 {
         LEDGER(high, EXPLICIT, false);
     }
 	YY_BREAK
-case 148:
+case 151:
 YY_RULE_SETUP
-#line 1438 "gabc/gabc-notes-determination.l"
+#line 1447 "gabc/gabc-notes-determination.l"
 {
         LEDGER(low, EXPLICIT, true);
     }
 	YY_BREAK
-case 149:
+case 152:
 YY_RULE_SETUP
-#line 1441 "gabc/gabc-notes-determination.l"
+#line 1450 "gabc/gabc-notes-determination.l"
 {
         LEDGER(low, EXPLICIT, false);
     }
 	YY_BREAK
-case 150:
-/* rule 150 can match eol */
+case 153:
+/* rule 153 can match eol */
 YY_RULE_SETUP
-#line 1444 "gabc/gabc-notes-determination.l"
+#line 1453 "gabc/gabc-notes-determination.l"
 {
         gregorio_messagef("det_notes_from_string", VERBOSITY_ERROR, 0,
                 _("unrecognized character: \"%c\""),
                 gabc_notes_determination_text[0]);
     }
 	YY_BREAK
-case 151:
+case 154:
 YY_RULE_SETUP
-#line 1450 "gabc/gabc-notes-determination.l"
+#line 1459 "gabc/gabc-notes-determination.l"
 ECHO;
 	YY_BREAK
-#line 13705 "gabc/gabc-notes-determination-l.c"
+#line 14021 "gabc/gabc-notes-determination-l.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(texverbnote):
 case YY_STATE_EOF(texverbglyph):
@@ -13736,15 +14053,15 @@ case YY_STATE_EOF(endledger):
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
-			 * just pointed gabc_notes_determination_in at a new source and called
-			 * gabc_notes_determination_lex().  If so, then we have to assure
+			 * just pointed yyin at a new source and called
+			 * yylex().  If so, then we have to assure
 			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
 			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = gabc_notes_determination_in;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
 			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
@@ -13797,11 +14114,11 @@ case YY_STATE_EOF(endledger):
 				{
 				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( gabc_notes_determination_wrap( ) )
+				if ( yywrap(  ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
-					 * gabc_notes_determination_text, we can now set up
+					 * yytext, we can now set up
 					 * yy_c_buf_p so that if some total
 					 * hoser (like flex itself) wants to
 					 * call the scanner after we return the
@@ -13851,7 +14168,7 @@ case YY_STATE_EOF(endledger):
 	} /* end of action switch */
 		} /* end of scanning one token */
 	} /* end of user's declarations */
-} /* end of gabc_notes_determination_lex */
+} /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -13864,7 +14181,7 @@ static int yy_get_next_buffer (void)
 {
     	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
 	char *source = (yytext_ptr);
-	yy_size_t number_to_move, i;
+	int number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -13893,7 +14210,7 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -13906,7 +14223,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -13920,7 +14237,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				yy_size_t new_size = b->yy_buf_size * 2;
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -13929,11 +14246,12 @@ static int yy_get_next_buffer (void)
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					gabc_notes_determination_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					yyrealloc( (void *) b->yy_ch_buf,
+							 (yy_size_t) (b->yy_buf_size + 2)  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
+				b->yy_ch_buf = NULL;
 
 			if ( ! b->yy_ch_buf )
 				YY_FATAL_ERROR(
@@ -13961,7 +14279,7 @@ static int yy_get_next_buffer (void)
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			gabc_notes_determination_restart(gabc_notes_determination_in  );
+			yyrestart( yyin  );
 			}
 
 		else
@@ -13975,12 +14293,15 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+	if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) gabc_notes_determination_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
+			(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size  );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+		/* "- 2" to take care of EOB's */
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
 	}
 
 	(yy_n_chars) += number_to_move;
@@ -14072,7 +14393,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -14089,14 +14410,14 @@ static int yy_get_next_buffer (void)
 					 */
 
 					/* Reset buffer status. */
-					gabc_notes_determination_restart(gabc_notes_determination_in );
+					yyrestart( yyin );
 
 					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( gabc_notes_determination_wrap( ) )
-						return EOF;
+					if ( yywrap(  ) )
+						return 0;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -14115,7 +14436,7 @@ static int yy_get_next_buffer (void)
 		}
 
 	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve gabc_notes_determination_text */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
 	(yy_hold_char) = *++(yy_c_buf_p);
 
 	return c;
@@ -14127,32 +14448,32 @@ static int yy_get_next_buffer (void)
  * 
  * @note This function does not reset the start condition to @c INITIAL .
  */
-    void gabc_notes_determination_restart  (FILE * input_file )
+    void yyrestart  (FILE * input_file )
 {
     
 	if ( ! YY_CURRENT_BUFFER ){
-        gabc_notes_determination_ensure_buffer_stack ();
+        yyensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
-            gabc_notes_determination__create_buffer(gabc_notes_determination_in,YY_BUF_SIZE );
+            yy_create_buffer( yyin, YY_BUF_SIZE );
 	}
 
-	gabc_notes_determination__init_buffer(YY_CURRENT_BUFFER,input_file );
-	gabc_notes_determination__load_buffer_state( );
+	yy_init_buffer( YY_CURRENT_BUFFER, input_file );
+	yy_load_buffer_state(  );
 }
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
  * 
  */
-    void gabc_notes_determination__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
     
 	/* TODO. We should be able to replace this entire function body
 	 * with
-	 *		gabc_notes_determination_pop_buffer_state();
-	 *		gabc_notes_determination_push_buffer_state(new_buffer);
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
      */
-	gabc_notes_determination_ensure_buffer_stack ();
+	yyensure_buffer_stack ();
 	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
@@ -14165,21 +14486,21 @@ static int yy_get_next_buffer (void)
 		}
 
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	gabc_notes_determination__load_buffer_state( );
+	yy_load_buffer_state(  );
 
 	/* We don't actually know whether we did this switch during
-	 * EOF (gabc_notes_determination_wrap()) processing, but the only time this flag
-	 * is looked at is after gabc_notes_determination_wrap() is called, so it's safe
+	 * EOF (yywrap()) processing, but the only time this flag
+	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
 	(yy_did_buffer_switch_on_eof) = 1;
 }
 
-static void gabc_notes_determination__load_buffer_state  (void)
+static void yy_load_buffer_state  (void)
 {
     	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
 	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	gabc_notes_determination_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
 	(yy_hold_char) = *(yy_c_buf_p);
 }
 
@@ -14189,35 +14510,35 @@ static void gabc_notes_determination__load_buffer_state  (void)
  * 
  * @return the allocated buffer state.
  */
-    YY_BUFFER_STATE gabc_notes_determination__create_buffer  (FILE * file, int  size )
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
     
-	b = (YY_BUFFER_STATE) gabc_notes_determination_alloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in gabc_notes_determination__create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
-	b->yy_buf_size = (yy_size_t)size;
+	b->yy_buf_size = size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) gabc_notes_determination_alloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2)  );
 	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in gabc_notes_determination__create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	gabc_notes_determination__init_buffer(b,file );
+	yy_init_buffer( b, file );
 
 	return b;
 }
 
 /** Destroy the buffer.
- * @param b a buffer created with gabc_notes_determination__create_buffer()
+ * @param b a buffer created with yy_create_buffer()
  * 
  */
-    void gabc_notes_determination__delete_buffer (YY_BUFFER_STATE  b )
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
 {
     
 	if ( ! b )
@@ -14227,27 +14548,27 @@ static void gabc_notes_determination__load_buffer_state  (void)
 		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		gabc_notes_determination_free((void *) b->yy_ch_buf  );
+		yyfree( (void *) b->yy_ch_buf  );
 
-	gabc_notes_determination_free((void *) b  );
+	yyfree( (void *) b  );
 }
 
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
- * such as during a gabc_notes_determination_restart() or at EOF.
+ * such as during a yyrestart() or at EOF.
  */
-    static void gabc_notes_determination__init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
 {
 	int oerrno = errno;
     
-	gabc_notes_determination__flush_buffer(b );
+	yy_flush_buffer( b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* If b is the current buffer, then gabc_notes_determination__init_buffer was _probably_
-     * called from gabc_notes_determination_restart() or through yy_get_next_buffer.
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
      * In that case, we don't want to reset the lineno or column.
      */
     if (b != YY_CURRENT_BUFFER){
@@ -14264,7 +14585,7 @@ static void gabc_notes_determination__load_buffer_state  (void)
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
  * 
  */
-    void gabc_notes_determination__flush_buffer (YY_BUFFER_STATE  b )
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
 {
     	if ( ! b )
 		return;
@@ -14284,7 +14605,7 @@ static void gabc_notes_determination__load_buffer_state  (void)
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
 	if ( b == YY_CURRENT_BUFFER )
-		gabc_notes_determination__load_buffer_state( );
+		yy_load_buffer_state(  );
 }
 
 /** Pushes the new state onto the stack. The new state becomes
@@ -14293,14 +14614,14 @@ static void gabc_notes_determination__load_buffer_state  (void)
  *  @param new_buffer The new state.
  *  
  */
-void gabc_notes_determination_push_buffer_state (YY_BUFFER_STATE new_buffer )
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
     	if (new_buffer == NULL)
 		return;
 
-	gabc_notes_determination_ensure_buffer_stack();
+	yyensure_buffer_stack();
 
-	/* This block is copied from gabc_notes_determination__switch_to_buffer. */
+	/* This block is copied from yy_switch_to_buffer. */
 	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
@@ -14314,8 +14635,8 @@ void gabc_notes_determination_push_buffer_state (YY_BUFFER_STATE new_buffer )
 		(yy_buffer_stack_top)++;
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
 
-	/* copied from gabc_notes_determination__switch_to_buffer. */
-	gabc_notes_determination__load_buffer_state( );
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state(  );
 	(yy_did_buffer_switch_on_eof) = 1;
 }
 
@@ -14323,18 +14644,18 @@ void gabc_notes_determination_push_buffer_state (YY_BUFFER_STATE new_buffer )
  *  The next element becomes the new top.
  *  
  */
-void gabc_notes_determination_pop_buffer_state (void)
+void yypop_buffer_state (void)
 {
     	if (!YY_CURRENT_BUFFER)
 		return;
 
-	gabc_notes_determination__delete_buffer(YY_CURRENT_BUFFER );
+	yy_delete_buffer(YY_CURRENT_BUFFER );
 	YY_CURRENT_BUFFER_LVALUE = NULL;
 	if ((yy_buffer_stack_top) > 0)
 		--(yy_buffer_stack_top);
 
 	if (YY_CURRENT_BUFFER) {
-		gabc_notes_determination__load_buffer_state( );
+		yy_load_buffer_state(  );
 		(yy_did_buffer_switch_on_eof) = 1;
 	}
 }
@@ -14342,7 +14663,7 @@ void gabc_notes_determination_pop_buffer_state (void)
 /* Allocates the stack if it does not exist.
  *  Guarantees space for at least one push.
  */
-static void gabc_notes_determination_ensure_buffer_stack (void)
+static void yyensure_buffer_stack (void)
 {
 	yy_size_t num_to_alloc;
     
@@ -14352,15 +14673,15 @@ static void gabc_notes_determination_ensure_buffer_stack (void)
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-		num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
-		(yy_buffer_stack) = (struct yy_buffer_state**)gabc_notes_determination_alloc
+      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in gabc_notes_determination_ensure_buffer_stack()" );
-								  
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
+
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -14372,12 +14693,12 @@ static void gabc_notes_determination_ensure_buffer_stack (void)
 		yy_size_t grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)gabc_notes_determination_realloc
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in gabc_notes_determination_ensure_buffer_stack()" );
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -14389,9 +14710,9 @@ static void gabc_notes_determination_ensure_buffer_stack (void)
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
  * 
- * @return the newly allocated buffer state object. 
+ * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE gabc_notes_determination__scan_buffer  (char * base, yy_size_t  size )
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 {
 	YY_BUFFER_STATE b;
     
@@ -14399,69 +14720,69 @@ YY_BUFFER_STATE gabc_notes_determination__scan_buffer  (char * base, yy_size_t
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
-		return 0;
+		return NULL;
 
-	b = (YY_BUFFER_STATE) gabc_notes_determination_alloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in gabc_notes_determination__scan_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_size = (int) (size - 2);	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
 	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
+	b->yy_input_file = NULL;
 	b->yy_n_chars = b->yy_buf_size;
 	b->yy_is_interactive = 0;
 	b->yy_at_bol = 1;
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	gabc_notes_determination__switch_to_buffer(b  );
+	yy_switch_to_buffer( b  );
 
 	return b;
 }
 
-/** Setup the input buffer state to scan a string. The next call to gabc_notes_determination_lex() will
+/** Setup the input buffer state to scan a string. The next call to yylex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
  * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
- *       gabc_notes_determination__scan_bytes() instead.
+ *       yy_scan_bytes() instead.
  */
-YY_BUFFER_STATE gabc_notes_determination__scan_string (yyconst char * yystr )
+YY_BUFFER_STATE yy_scan_string (const char * yystr )
 {
     
-	return gabc_notes_determination__scan_bytes(yystr,strlen(yystr) );
+	return yy_scan_bytes( yystr, (int) strlen(yystr) );
 }
 
-/** Setup the input buffer state to scan the given bytes. The next call to gabc_notes_determination_lex() will
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE gabc_notes_determination__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	yy_size_t i;
+	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) gabc_notes_determination_alloc(n  );
+	n = (yy_size_t) (_yybytes_len + 2);
+	buf = (char *) yyalloc( n  );
 	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in gabc_notes_determination__scan_bytes()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
 	for ( i = 0; i < _yybytes_len; ++i )
 		buf[i] = yybytes[i];
 
 	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = gabc_notes_determination__scan_buffer(buf,n );
+	b = yy_scan_buffer( buf, n );
 	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in gabc_notes_determination__scan_bytes()" );
+		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
 	/* It's okay to grow etc. this buffer, and we should throw it
 	 * away when we're done.
@@ -14475,9 +14796,9 @@ YY_BUFFER_STATE gabc_notes_determination__scan_bytes  (yyconst char * yybytes, y
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yy_fatal_error (yyconst char* msg )
+static void yynoreturn yy_fatal_error (const char* msg )
 {
-			(void) fprintf( stderr, "%s\n", msg );
+			fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -14487,14 +14808,14 @@ static void yy_fatal_error (yyconst char* msg )
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up gabc_notes_determination_text. */ \
+		/* Undo effects of setting up yytext. */ \
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
-		gabc_notes_determination_text[gabc_notes_determination_leng] = (yy_hold_char); \
-		(yy_c_buf_p) = gabc_notes_determination_text + yyless_macro_arg; \
+		yytext[yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
 		(yy_hold_char) = *(yy_c_buf_p); \
 		*(yy_c_buf_p) = '\0'; \
-		gabc_notes_determination_leng = yyless_macro_arg; \
+		yyleng = yyless_macro_arg; \
 		} \
 	while ( 0 )
 
@@ -14503,91 +14824,91 @@ static void yy_fatal_error (yyconst char* msg )
 /** Get the current line number.
  * 
  */
-int gabc_notes_determination_get_lineno  (void)
+int yyget_lineno  (void)
 {
-        
-    return gabc_notes_determination_lineno;
+    
+    return yylineno;
 }
 
 /** Get the input stream.
  * 
  */
-FILE *gabc_notes_determination_get_in  (void)
+FILE *yyget_in  (void)
 {
-        return gabc_notes_determination_in;
+        return yyin;
 }
 
 /** Get the output stream.
  * 
  */
-FILE *gabc_notes_determination_get_out  (void)
+FILE *yyget_out  (void)
 {
-        return gabc_notes_determination_out;
+        return yyout;
 }
 
 /** Get the length of the current token.
  * 
  */
-yy_size_t gabc_notes_determination_get_leng  (void)
+int yyget_leng  (void)
 {
-        return gabc_notes_determination_leng;
+        return yyleng;
 }
 
 /** Get the current token.
  * 
  */
 
-char *gabc_notes_determination_get_text  (void)
+char *yyget_text  (void)
 {
-        return gabc_notes_determination_text;
+        return yytext;
 }
 
 /** Set the current line number.
  * @param _line_number line number
  * 
  */
-void gabc_notes_determination_set_lineno (int  _line_number )
+void yyset_lineno (int  _line_number )
 {
     
-    gabc_notes_determination_lineno = _line_number;
+    yylineno = _line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param _in_str A readable stream.
  * 
- * @see gabc_notes_determination__switch_to_buffer
+ * @see yy_switch_to_buffer
  */
-void gabc_notes_determination_set_in (FILE *  _in_str )
+void yyset_in (FILE *  _in_str )
 {
-        gabc_notes_determination_in = _in_str ;
+        yyin = _in_str ;
 }
 
-void gabc_notes_determination_set_out (FILE *  _out_str )
+void yyset_out (FILE *  _out_str )
 {
-        gabc_notes_determination_out = _out_str ;
+        yyout = _out_str ;
 }
 
-int gabc_notes_determination_get_debug  (void)
+int yyget_debug  (void)
 {
-        return gabc_notes_determination__flex_debug;
+        return yy_flex_debug;
 }
 
-void gabc_notes_determination_set_debug (int  _bdebug )
+void yyset_debug (int  _bdebug )
 {
-        gabc_notes_determination__flex_debug = _bdebug ;
+        yy_flex_debug = _bdebug ;
 }
 
 static int yy_init_globals (void)
 {
         /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from gabc_notes_determination_lex_destroy(), so don't allocate here.
+     * This function is called from yylex_destroy(), so don't allocate here.
      */
 
-    (yy_buffer_stack) = 0;
+    (yy_buffer_stack) = NULL;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
+    (yy_c_buf_p) = NULL;
     (yy_init) = 0;
     (yy_start) = 0;
 
@@ -14597,40 +14918,40 @@ static int yy_init_globals (void)
 
 /* Defined in main.c */
 #ifdef YY_STDINIT
-    gabc_notes_determination_in = stdin;
-    gabc_notes_determination_out = stdout;
+    yyin = stdin;
+    yyout = stdout;
 #else
-    gabc_notes_determination_in = (FILE *) 0;
-    gabc_notes_determination_out = (FILE *) 0;
+    yyin = NULL;
+    yyout = NULL;
 #endif
 
     /* For future reference: Set errno on error, since we are called by
-     * gabc_notes_determination_lex_init()
+     * yylex_init()
      */
     return 0;
 }
 
-/* gabc_notes_determination_lex_destroy is for both reentrant and non-reentrant scanners. */
-int gabc_notes_determination_lex_destroy  (void)
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
 {
     
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
-		gabc_notes_determination__delete_buffer(YY_CURRENT_BUFFER  );
+		yy_delete_buffer( YY_CURRENT_BUFFER  );
 		YY_CURRENT_BUFFER_LVALUE = NULL;
-		gabc_notes_determination_pop_buffer_state();
+		yypop_buffer_state();
 	}
 
 	/* Destroy the stack itself. */
-	gabc_notes_determination_free((yy_buffer_stack) );
+	yyfree((yy_buffer_stack) );
 	(yy_buffer_stack) = NULL;
 
     /* Destroy the start condition stack. */
-        gabc_notes_determination_free((yy_start_stack)  );
+        yyfree( (yy_start_stack)  );
         (yy_start_stack) = NULL;
 
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * gabc_notes_determination_lex() is called, initialization will occur. */
+     * yylex() is called, initialization will occur. */
     yy_init_globals( );
 
     return 0;
@@ -14641,7 +14962,7 @@ int gabc_notes_determination_lex_destroy  (void)
  */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+static void yy_flex_strncpy (char* s1, const char * s2, int n )
 {
 		
 	int i;
@@ -14651,7 +14972,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
+static int yy_flex_strlen (const char * s )
 {
 	int n;
 	for ( n = 0; s[n]; ++n )
@@ -14661,12 +14982,12 @@ static int yy_flex_strlen (yyconst char * s )
 }
 #endif
 
-void *gabc_notes_determination_alloc (yy_size_t  size )
+void *yyalloc (yy_size_t  size )
 {
-			return (void *) malloc( size );
+			return malloc(size);
 }
 
-void *gabc_notes_determination_realloc  (void * ptr, yy_size_t  size )
+void *yyrealloc  (void * ptr, yy_size_t  size )
 {
 		
 	/* The cast to (char *) in the following accommodates both
@@ -14676,18 +14997,17 @@ void *gabc_notes_determination_realloc  (void * ptr, yy_size_t  size )
 	 * any pointer type to void*, and deal with argument conversions
 	 * as though doing an assignment.
 	 */
-	return (void *) realloc( (char *) ptr, size );
+	return realloc(ptr, size);
 }
 
-void gabc_notes_determination_free (void * ptr )
+void yyfree (void * ptr )
 {
-			free( (char *) ptr );	/* see gabc_notes_determination_realloc() for (char *) cast */
+			free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"
 
-#line 1450 "gabc/gabc-notes-determination.l"
-
+#line 1459 "gabc/gabc-notes-determination.l"
 
 
 gregorio_note *gabc_det_notes_from_string(char *str, char *newmacros[10],
@@ -14717,10 +15037,10 @@ gregorio_note *gabc_det_notes_from_string(char *str, char *newmacros[10],
     }
     nbof_isolated_episema = 0;
     current_note = NULL;
-    buf = gabc_notes_determination__scan_string(str);
-    gabc_notes_determination_lex();
-    gabc_notes_determination__flush_buffer(buf);
-    gabc_notes_determination__delete_buffer(buf);
+    buf = yy_scan_string(str);
+    yylex();
+    yy_flush_buffer(buf);
+    yy_delete_buffer(buf);
     gregorio_go_to_first_note(&current_note);
     return current_note;
 }
diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l
index dd02ffe1a21..26932393ef9 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l
@@ -1205,9 +1205,15 @@ Z-  {
 `   {
         add_bar_as_note(B_VIRGULA);
     }
+`0  {
+        add_bar_as_note(B_VIRGULA_HIGH);
+    }
 ,   {
         add_bar_as_note(B_DIVISIO_MINIMA);
     }
+,0  {
+        add_bar_as_note(B_DIVISIO_MINIMA_HIGH);
+    }
 [,;][1-8] {
         add_bar_as_note(parse_dominican_bar(gabc_notes_determination_text[1]));
     }
@@ -1220,6 +1226,9 @@ Z-  {
 ::  {
         add_bar_as_note(B_DIVISIO_FINALIS);
     }
+:\? {
+        add_bar_as_note(B_DIVISIO_MAIOR_DOTTED);
+    }
 r   {
         gregorio_add_cavum(current_note);
     }
diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c
index 5a3953c2ad6..bba78baf267 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c
@@ -1,6 +1,6 @@
-#line 2 "gabc/gabc-score-determination-l.c"
+#line 1 "gabc/gabc-score-determination-l.c"
 
-#line 4 "gabc/gabc-score-determination-l.c"
+#line 3 "gabc/gabc-score-determination-l.c"
 
 #define  YY_INT_ALIGNED long int
 
@@ -8,11 +8,17 @@
 
 #define yy_create_buffer gabc_score_determination__create_buffer
 #define yy_delete_buffer gabc_score_determination__delete_buffer
-#define yy_flex_debug gabc_score_determination__flex_debug
+#define yy_scan_buffer gabc_score_determination__scan_buffer
+#define yy_scan_string gabc_score_determination__scan_string
+#define yy_scan_bytes gabc_score_determination__scan_bytes
 #define yy_init_buffer gabc_score_determination__init_buffer
 #define yy_flush_buffer gabc_score_determination__flush_buffer
 #define yy_load_buffer_state gabc_score_determination__load_buffer_state
 #define yy_switch_to_buffer gabc_score_determination__switch_to_buffer
+#define yypush_buffer_state gabc_score_determination_push_buffer_state
+#define yypop_buffer_state gabc_score_determination_pop_buffer_state
+#define yyensure_buffer_stack gabc_score_determination_ensure_buffer_stack
+#define yy_flex_debug gabc_score_determination__flex_debug
 #define yyin gabc_score_determination_in
 #define yyleng gabc_score_determination_leng
 #define yylex gabc_score_determination_lex
@@ -28,11 +34,245 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 0
+#define YY_FLEX_SUBMINOR_VERSION 4
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
 
+#ifdef yy_create_buffer
+#define gabc_score_determination__create_buffer_ALREADY_DEFINED
+#else
+#define yy_create_buffer gabc_score_determination__create_buffer
+#endif
+
+#ifdef yy_delete_buffer
+#define gabc_score_determination__delete_buffer_ALREADY_DEFINED
+#else
+#define yy_delete_buffer gabc_score_determination__delete_buffer
+#endif
+
+#ifdef yy_scan_buffer
+#define gabc_score_determination__scan_buffer_ALREADY_DEFINED
+#else
+#define yy_scan_buffer gabc_score_determination__scan_buffer
+#endif
+
+#ifdef yy_scan_string
+#define gabc_score_determination__scan_string_ALREADY_DEFINED
+#else
+#define yy_scan_string gabc_score_determination__scan_string
+#endif
+
+#ifdef yy_scan_bytes
+#define gabc_score_determination__scan_bytes_ALREADY_DEFINED
+#else
+#define yy_scan_bytes gabc_score_determination__scan_bytes
+#endif
+
+#ifdef yy_init_buffer
+#define gabc_score_determination__init_buffer_ALREADY_DEFINED
+#else
+#define yy_init_buffer gabc_score_determination__init_buffer
+#endif
+
+#ifdef yy_flush_buffer
+#define gabc_score_determination__flush_buffer_ALREADY_DEFINED
+#else
+#define yy_flush_buffer gabc_score_determination__flush_buffer
+#endif
+
+#ifdef yy_load_buffer_state
+#define gabc_score_determination__load_buffer_state_ALREADY_DEFINED
+#else
+#define yy_load_buffer_state gabc_score_determination__load_buffer_state
+#endif
+
+#ifdef yy_switch_to_buffer
+#define gabc_score_determination__switch_to_buffer_ALREADY_DEFINED
+#else
+#define yy_switch_to_buffer gabc_score_determination__switch_to_buffer
+#endif
+
+#ifdef yypush_buffer_state
+#define gabc_score_determination_push_buffer_state_ALREADY_DEFINED
+#else
+#define yypush_buffer_state gabc_score_determination_push_buffer_state
+#endif
+
+#ifdef yypop_buffer_state
+#define gabc_score_determination_pop_buffer_state_ALREADY_DEFINED
+#else
+#define yypop_buffer_state gabc_score_determination_pop_buffer_state
+#endif
+
+#ifdef yyensure_buffer_stack
+#define gabc_score_determination_ensure_buffer_stack_ALREADY_DEFINED
+#else
+#define yyensure_buffer_stack gabc_score_determination_ensure_buffer_stack
+#endif
+
+#ifdef yylex
+#define gabc_score_determination_lex_ALREADY_DEFINED
+#else
+#define yylex gabc_score_determination_lex
+#endif
+
+#ifdef yyrestart
+#define gabc_score_determination_restart_ALREADY_DEFINED
+#else
+#define yyrestart gabc_score_determination_restart
+#endif
+
+#ifdef yylex_init
+#define gabc_score_determination_lex_init_ALREADY_DEFINED
+#else
+#define yylex_init gabc_score_determination_lex_init
+#endif
+
+#ifdef yylex_init_extra
+#define gabc_score_determination_lex_init_extra_ALREADY_DEFINED
+#else
+#define yylex_init_extra gabc_score_determination_lex_init_extra
+#endif
+
+#ifdef yylex_destroy
+#define gabc_score_determination_lex_destroy_ALREADY_DEFINED
+#else
+#define yylex_destroy gabc_score_determination_lex_destroy
+#endif
+
+#ifdef yyget_debug
+#define gabc_score_determination_get_debug_ALREADY_DEFINED
+#else
+#define yyget_debug gabc_score_determination_get_debug
+#endif
+
+#ifdef yyset_debug
+#define gabc_score_determination_set_debug_ALREADY_DEFINED
+#else
+#define yyset_debug gabc_score_determination_set_debug
+#endif
+
+#ifdef yyget_extra
+#define gabc_score_determination_get_extra_ALREADY_DEFINED
+#else
+#define yyget_extra gabc_score_determination_get_extra
+#endif
+
+#ifdef yyset_extra
+#define gabc_score_determination_set_extra_ALREADY_DEFINED
+#else
+#define yyset_extra gabc_score_determination_set_extra
+#endif
+
+#ifdef yyget_in
+#define gabc_score_determination_get_in_ALREADY_DEFINED
+#else
+#define yyget_in gabc_score_determination_get_in
+#endif
+
+#ifdef yyset_in
+#define gabc_score_determination_set_in_ALREADY_DEFINED
+#else
+#define yyset_in gabc_score_determination_set_in
+#endif
+
+#ifdef yyget_out
+#define gabc_score_determination_get_out_ALREADY_DEFINED
+#else
+#define yyget_out gabc_score_determination_get_out
+#endif
+
+#ifdef yyset_out
+#define gabc_score_determination_set_out_ALREADY_DEFINED
+#else
+#define yyset_out gabc_score_determination_set_out
+#endif
+
+#ifdef yyget_leng
+#define gabc_score_determination_get_leng_ALREADY_DEFINED
+#else
+#define yyget_leng gabc_score_determination_get_leng
+#endif
+
+#ifdef yyget_text
+#define gabc_score_determination_get_text_ALREADY_DEFINED
+#else
+#define yyget_text gabc_score_determination_get_text
+#endif
+
+#ifdef yyget_lineno
+#define gabc_score_determination_get_lineno_ALREADY_DEFINED
+#else
+#define yyget_lineno gabc_score_determination_get_lineno
+#endif
+
+#ifdef yyset_lineno
+#define gabc_score_determination_set_lineno_ALREADY_DEFINED
+#else
+#define yyset_lineno gabc_score_determination_set_lineno
+#endif
+
+#ifdef yywrap
+#define gabc_score_determination_wrap_ALREADY_DEFINED
+#else
+#define yywrap gabc_score_determination_wrap
+#endif
+
+#ifdef yyalloc
+#define gabc_score_determination_alloc_ALREADY_DEFINED
+#else
+#define yyalloc gabc_score_determination_alloc
+#endif
+
+#ifdef yyrealloc
+#define gabc_score_determination_realloc_ALREADY_DEFINED
+#else
+#define yyrealloc gabc_score_determination_realloc
+#endif
+
+#ifdef yyfree
+#define gabc_score_determination_free_ALREADY_DEFINED
+#else
+#define yyfree gabc_score_determination_free
+#endif
+
+#ifdef yytext
+#define gabc_score_determination_text_ALREADY_DEFINED
+#else
+#define yytext gabc_score_determination_text
+#endif
+
+#ifdef yyleng
+#define gabc_score_determination_leng_ALREADY_DEFINED
+#else
+#define yyleng gabc_score_determination_leng
+#endif
+
+#ifdef yyin
+#define gabc_score_determination_in_ALREADY_DEFINED
+#else
+#define yyin gabc_score_determination_in
+#endif
+
+#ifdef yyout
+#define gabc_score_determination_out_ALREADY_DEFINED
+#else
+#define yyout gabc_score_determination_out
+#endif
+
+#ifdef yy_flex_debug
+#define gabc_score_determination__flex_debug_ALREADY_DEFINED
+#else
+#define yy_flex_debug gabc_score_determination__flex_debug
+#endif
+
+#ifdef yylineno
+#define gabc_score_determination_lineno_ALREADY_DEFINED
+#else
+#define yylineno gabc_score_determination_lineno
+#endif
+
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
 /* begin standard C headers. */
@@ -103,60 +343,48 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
+
 #endif /* ! C99 */
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
+/* begin standard C++ headers. */
 
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
 #define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
 #else
-#define yyconst
+#define yynoreturn
 #endif
 
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
+/* Promotes a possibly negative, possibly signed char to an
+ *   integer in range [0..255] for use as an array index.
  */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
 
 /* Enter a start condition.  This macro really ought to take a parameter,
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
 #define BEGIN (yy_start) = 1 + 2 *
-
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
 #define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
-
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE gabc_score_determination_restart(gabc_score_determination_in  )
-
+#define YY_NEW_FILE yyrestart( yyin  )
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
@@ -186,14 +414,14 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t yy_size_t;
 #endif
 
-extern yy_size_t gabc_score_determination_leng;
+extern int yyleng;
 
-extern FILE *gabc_score_determination_in, *gabc_score_determination_out;
+extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
-
+    
     #define YY_LESS_LINENO(n)
     #define YY_LINENO_REWIND_TO(ptr)
     
@@ -201,16 +429,15 @@ extern FILE *gabc_score_determination_in, *gabc_score_determination_out;
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up gabc_score_determination_text. */ \
+		/* Undo effects of setting up yytext. */ \
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
 		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
 		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up gabc_score_determination_text again */ \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
-
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -225,12 +452,12 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	yy_size_t yy_buf_size;
+	int yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -253,7 +480,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -270,8 +497,8 @@ struct yy_buffer_state
 	 * possible backing-up.
 	 *
 	 * When we actually see the EOF, we change the status to "new"
-	 * (via gabc_score_determination_restart()), so that the user can continue scanning by
-	 * just pointing gabc_score_determination_in at a new input file.
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
 
@@ -281,7 +508,7 @@ struct yy_buffer_state
 /* Stack of input buffers. */
 static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
 static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -292,112 +519,101 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
                           ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
                           : NULL)
-
 /* Same as previous macro, but useful when we know that the buffer stack is not
  * NULL or when we need an lvalue. For internal use only.
  */
 #define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when gabc_score_determination_text is formed. */
+/* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t gabc_score_determination_leng;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int yyleng;
 
 /* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
+static char *yy_c_buf_p = NULL;
 static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow gabc_score_determination_wrap()'s to do buffer switches
- * instead of setting up a fresh gabc_score_determination_in.  A bit of a hack ...
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void gabc_score_determination_restart (FILE *input_file  );
-void gabc_score_determination__switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE gabc_score_determination__create_buffer (FILE *file,int size  );
-void gabc_score_determination__delete_buffer (YY_BUFFER_STATE b  );
-void gabc_score_determination__flush_buffer (YY_BUFFER_STATE b  );
-void gabc_score_determination_push_buffer_state (YY_BUFFER_STATE new_buffer  );
-void gabc_score_determination_pop_buffer_state (void );
-
-static void gabc_score_determination_ensure_buffer_stack (void );
-static void gabc_score_determination__load_buffer_state (void );
-static void gabc_score_determination__init_buffer (YY_BUFFER_STATE b,FILE *file  );
+void yyrestart ( FILE *input_file  );
+void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
+void yy_delete_buffer ( YY_BUFFER_STATE b  );
+void yy_flush_buffer ( YY_BUFFER_STATE b  );
+void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state ( void );
 
-#define YY_FLUSH_BUFFER gabc_score_determination__flush_buffer(YY_CURRENT_BUFFER )
+static void yyensure_buffer_stack ( void );
+static void yy_load_buffer_state ( void );
+static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
+#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
 
-YY_BUFFER_STATE gabc_score_determination__scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE gabc_score_determination__scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE gabc_score_determination__scan_bytes (yyconst char *bytes,yy_size_t len  );
+YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string ( const char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len  );
 
-void *gabc_score_determination_alloc (yy_size_t  );
-void *gabc_score_determination_realloc (void *,yy_size_t  );
-void gabc_score_determination_free (void *  );
-
-#define yy_new_buffer gabc_score_determination__create_buffer
+void *yyalloc ( yy_size_t  );
+void *yyrealloc ( void *, yy_size_t  );
+void yyfree ( void *  );
 
+#define yy_new_buffer yy_create_buffer
 #define yy_set_interactive(is_interactive) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){ \
-        gabc_score_determination_ensure_buffer_stack (); \
+        yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-            gabc_score_determination__create_buffer(gabc_score_determination_in,YY_BUF_SIZE ); \
+            yy_create_buffer( yyin, YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
-
 #define yy_set_bol(at_bol) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){\
-        gabc_score_determination_ensure_buffer_stack (); \
+        yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-            gabc_score_determination__create_buffer(gabc_score_determination_in,YY_BUF_SIZE ); \
+            yy_create_buffer( yyin, YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
-
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
 /* Begin user sect3 */
 
 #define gabc_score_determination_wrap() (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
+typedef flex_uint8_t YY_CHAR;
 
-typedef unsigned char YY_CHAR;
-
-FILE *gabc_score_determination_in = (FILE *) 0, *gabc_score_determination_out = (FILE *) 0;
+FILE *yyin = NULL, *yyout = NULL;
 
 typedef int yy_state_type;
 
-extern int gabc_score_determination_lineno;
-
-int gabc_score_determination_lineno = 1;
+extern int yylineno;
+int yylineno = 1;
 
-extern char *gabc_score_determination_text;
+extern char *yytext;
 #ifdef yytext_ptr
 #undef yytext_ptr
 #endif
-#define yytext_ptr gabc_score_determination_text
+#define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-#if defined(__GNUC__) && __GNUC__ >= 3
-__attribute__((__noreturn__))
-#endif
-static void yy_fatal_error (yyconst char msg[]  );
+static yy_state_type yy_get_previous_state ( void );
+static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  );
+static int yy_get_next_buffer ( void );
+static void yynoreturn yy_fatal_error ( const char* msg  );
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up gabc_score_determination_text.
+ * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	gabc_score_determination_leng = (size_t) (yy_cp - yy_bp); \
+	yyleng = (int) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-
 #define YY_NUM_RULES 77
 #define YY_END_OF_BUFFER 78
 /* This struct is not used in this scanner,
@@ -407,7 +623,7 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int32_t yy_accept[309] =
+static const flex_int32_t yy_accept[309] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
         0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
@@ -445,7 +661,7 @@ static yyconst flex_int32_t yy_accept[309] =
        23,   12,   16,   23,   23,   23,   22,    0
     } ;
 
-static yyconst YY_CHAR yy_ec[256] =
+static const YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         1,    1,    4,    1,    1,    1,    1,    1,    1,    1,
@@ -477,7 +693,7 @@ static yyconst YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst YY_CHAR yy_meta[48] =
+static const YY_CHAR yy_meta[48] =
     {   0,
         1,    1,    2,    2,    1,    1,    3,    3,    4,    3,
         5,    3,    1,    6,    3,    7,    8,    1,    6,    3,
@@ -486,7 +702,7 @@ static yyconst YY_CHAR yy_meta[48] =
         6,    9,    4,    9,    1,    1,    1
     } ;
 
-static yyconst flex_uint32_t yy_base[326] =
+static const flex_int32_t yy_base[326] =
     {   0,
         0,   45,  707,  706,   90,  132,   41,   44,   71,   78,
       704,  703,   51,   53,   55,   57,  702,  701,   50,   51,
@@ -526,7 +742,7 @@ static yyconst flex_uint32_t yy_base[326] =
       624,  631,  640,  649,   67
     } ;
 
-static yyconst flex_int32_t yy_def[326] =
+static const flex_int32_t yy_def[326] =
     {   0,
       308,    1,  309,  309,  310,  310,  311,  311,  312,  312,
       313,  313,  314,  314,  315,  315,  313,  313,  316,  316,
@@ -566,7 +782,7 @@ static yyconst flex_int32_t yy_def[326] =
       308,  308,  308,  308,  308
     } ;
 
-static yyconst flex_uint32_t yy_nxt[772] =
+static const flex_int32_t yy_nxt[772] =
     {   0,
        24,   24,   25,   24,   24,   24,   26,   24,   24,   24,
        24,   24,   24,   27,   28,   24,   24,   24,   27,   24,
@@ -655,7 +871,7 @@ static yyconst flex_uint32_t yy_nxt[772] =
       308
     } ;
 
-static yyconst flex_int32_t yy_chk[772] =
+static const flex_int32_t yy_chk[772] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -747,8 +963,8 @@ static yyconst flex_int32_t yy_chk[772] =
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
-extern int gabc_score_determination__flex_debug;
-int gabc_score_determination__flex_debug = 0;
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
 
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
@@ -757,7 +973,7 @@ int gabc_score_determination__flex_debug = 0;
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-char *gabc_score_determination_text;
+char *yytext;
 #line 1 "gabc/gabc-score-determination.l"
 #line 2 "gabc/gabc-score-determination.l"
 /*
@@ -860,21 +1076,13 @@ static bool eof_found = false;
 #define YY_USER_ACTION gabc_update_location(&gabc_score_determination_lloc, \
         gabc_score_determination_text, gabc_score_determination_leng);
 
-
-
-
-
-
-
-
-
-
+#line 1079 "gabc/gabc-score-determination-l.c"
 
 /* The expression for attribute below is rather messy because we allow
 for (a) single-line values, ending with a semicolon at end of line or a
 double semicolon, (b) multi-line values, which end at a double
 semicolon. */
-#line 878 "gabc/gabc-score-determination-l.c"
+#line 1085 "gabc/gabc-score-determination-l.c"
 
 #define INITIAL 0
 #define attribute 1
@@ -900,36 +1108,36 @@ semicolon. */
 #define YY_EXTRA_TYPE void *
 #endif
 
-static int yy_init_globals (void );
+static int yy_init_globals ( void );
 
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int gabc_score_determination_lex_destroy (void );
+int yylex_destroy ( void );
 
-int gabc_score_determination_get_debug (void );
+int yyget_debug ( void );
 
-void gabc_score_determination_set_debug (int debug_flag  );
+void yyset_debug ( int debug_flag  );
 
-YY_EXTRA_TYPE gabc_score_determination_get_extra (void );
+YY_EXTRA_TYPE yyget_extra ( void );
 
-void gabc_score_determination_set_extra (YY_EXTRA_TYPE user_defined  );
+void yyset_extra ( YY_EXTRA_TYPE user_defined  );
 
-FILE *gabc_score_determination_get_in (void );
+FILE *yyget_in ( void );
 
-void gabc_score_determination_set_in  (FILE * _in_str  );
+void yyset_in  ( FILE * _in_str  );
 
-FILE *gabc_score_determination_get_out (void );
+FILE *yyget_out ( void );
 
-void gabc_score_determination_set_out  (FILE * _out_str  );
+void yyset_out  ( FILE * _out_str  );
 
-yy_size_t gabc_score_determination_get_leng (void );
+			int yyget_leng ( void );
 
-char *gabc_score_determination_get_text (void );
+char *yyget_text ( void );
 
-int gabc_score_determination_get_lineno (void );
+int yyget_lineno ( void );
 
-void gabc_score_determination_set_lineno (int _line_number  );
+void yyset_lineno ( int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -937,9 +1145,9 @@ void gabc_score_determination_set_lineno (int _line_number  );
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int gabc_score_determination_wrap (void );
+extern "C" int yywrap ( void );
 #else
-extern int gabc_score_determination_wrap (void );
+extern int yywrap ( void );
 #endif
 #endif
 
@@ -948,19 +1156,18 @@ extern int gabc_score_determination_wrap (void );
 #endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy ( char *, const char *, int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen ( const char * );
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+static int yyinput ( void );
 #else
-static int input (void );
+static int input ( void );
 #endif
 
 #endif
@@ -984,7 +1191,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( gabc_score_determination_text, gabc_score_determination_leng, 1, gabc_score_determination_out )) {} } while (0)
+#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -995,20 +1202,20 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
-			     (c = getc( gabc_score_determination_in )) != EOF && c != '\n'; ++n ) \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( gabc_score_determination_in ) ) \
+		if ( c == EOF && ferror( yyin ) ) \
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, gabc_score_determination_in))==0 && ferror(gabc_score_determination_in)) \
+		while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -1016,7 +1223,7 @@ static int input (void );
 				break; \
 				} \
 			errno=0; \
-			clearerr(gabc_score_determination_in); \
+			clearerr(yyin); \
 			} \
 		}\
 \
@@ -1049,12 +1256,12 @@ static int input (void );
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int gabc_score_determination_lex (void);
+extern int yylex (void);
 
-#define YY_DECL int gabc_score_determination_lex (void)
+#define YY_DECL int yylex (void)
 #endif /* !YY_DECL */
 
-/* Code executed at the beginning of each rule, after gabc_score_determination_text and gabc_score_determination_leng
+/* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -1067,9 +1274,9 @@ extern int gabc_score_determination_lex (void);
 #endif
 
 #define YY_RULE_SETUP \
-	if ( gabc_score_determination_leng > 0 ) \
+	if ( yyleng > 0 ) \
 		YY_CURRENT_BUFFER_LVALUE->yy_at_bol = \
-				(gabc_score_determination_text[gabc_score_determination_leng - 1] == '\n'); \
+				(yytext[yyleng - 1] == '\n'); \
 	YY_USER_ACTION
 
 /** The main scanner function which does all the work.
@@ -1091,31 +1298,31 @@ YY_DECL
 		if ( ! (yy_start) )
 			(yy_start) = 1;	/* first start state */
 
-		if ( ! gabc_score_determination_in )
-			gabc_score_determination_in = stdin;
+		if ( ! yyin )
+			yyin = stdin;
 
-		if ( ! gabc_score_determination_out )
-			gabc_score_determination_out = stdout;
+		if ( ! yyout )
+			yyout = stdout;
 
 		if ( ! YY_CURRENT_BUFFER ) {
-			gabc_score_determination_ensure_buffer_stack ();
+			yyensure_buffer_stack ();
 			YY_CURRENT_BUFFER_LVALUE =
-				gabc_score_determination__create_buffer(gabc_score_determination_in,YY_BUF_SIZE );
+				yy_create_buffer( yyin, YY_BUF_SIZE );
 		}
 
-		gabc_score_determination__load_buffer_state( );
+		yy_load_buffer_state(  );
 		}
 
 	{
 #line 136 "gabc/gabc-score-determination.l"
 
-#line 1113 "gabc/gabc-score-determination-l.c"
+#line 1319 "gabc/gabc-score-determination-l.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
 
-		/* Support of gabc_score_determination_text. */
+		/* Support of yytext. */
 		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
@@ -1138,9 +1345,9 @@ yy_match:
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
 				if ( yy_current_state >= 309 )
-					yy_c = yy_meta[(unsigned int) yy_c];
+					yy_c = yy_meta[yy_c];
 				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
 		while ( yy_base[yy_current_state] != 724 );
@@ -1797,7 +2004,7 @@ YY_RULE_SETUP
 #line 429 "gabc/gabc-score-determination.l"
 ECHO;
 	YY_BREAK
-#line 1801 "gabc/gabc-score-determination-l.c"
+#line 2007 "gabc/gabc-score-determination-l.c"
 
 	case YY_END_OF_BUFFER:
 		{
@@ -1812,15 +2019,15 @@ ECHO;
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
-			 * just pointed gabc_score_determination_in at a new source and called
-			 * gabc_score_determination_lex().  If so, then we have to assure
+			 * just pointed yyin at a new source and called
+			 * yylex().  If so, then we have to assure
 			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
 			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = gabc_score_determination_in;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
 			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
@@ -1873,11 +2080,11 @@ ECHO;
 				{
 				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( gabc_score_determination_wrap( ) )
+				if ( yywrap(  ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
-					 * gabc_score_determination_text, we can now set up
+					 * yytext, we can now set up
 					 * yy_c_buf_p so that if some total
 					 * hoser (like flex itself) wants to
 					 * call the scanner after we return the
@@ -1927,7 +2134,7 @@ ECHO;
 	} /* end of action switch */
 		} /* end of scanning one token */
 	} /* end of user's declarations */
-} /* end of gabc_score_determination_lex */
+} /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -1940,7 +2147,7 @@ static int yy_get_next_buffer (void)
 {
     	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
 	char *source = (yytext_ptr);
-	yy_size_t number_to_move, i;
+	int number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1969,7 +2176,7 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -1982,7 +2189,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -1996,7 +2203,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				yy_size_t new_size = b->yy_buf_size * 2;
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -2005,11 +2212,12 @@ static int yy_get_next_buffer (void)
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					gabc_score_determination_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					yyrealloc( (void *) b->yy_ch_buf,
+							 (yy_size_t) (b->yy_buf_size + 2)  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
+				b->yy_ch_buf = NULL;
 
 			if ( ! b->yy_ch_buf )
 				YY_FATAL_ERROR(
@@ -2037,7 +2245,7 @@ static int yy_get_next_buffer (void)
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			gabc_score_determination_restart(gabc_score_determination_in  );
+			yyrestart( yyin  );
 			}
 
 		else
@@ -2051,12 +2259,15 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+	if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) gabc_score_determination_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
+			(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size  );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+		/* "- 2" to take care of EOB's */
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
 	}
 
 	(yy_n_chars) += number_to_move;
@@ -2090,9 +2301,9 @@ static int yy_get_next_buffer (void)
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
 			if ( yy_current_state >= 309 )
-				yy_c = yy_meta[(unsigned int) yy_c];
+				yy_c = yy_meta[yy_c];
 			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 		}
 
 	return yy_current_state;
@@ -2118,9 +2329,9 @@ static int yy_get_next_buffer (void)
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
 		if ( yy_current_state >= 309 )
-			yy_c = yy_meta[(unsigned int) yy_c];
+			yy_c = yy_meta[yy_c];
 		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 	yy_is_jam = (yy_current_state == 308);
 
 		return yy_is_jam ? 0 : yy_current_state;
@@ -2154,7 +2365,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -2171,14 +2382,14 @@ static int yy_get_next_buffer (void)
 					 */
 
 					/* Reset buffer status. */
-					gabc_score_determination_restart(gabc_score_determination_in );
+					yyrestart( yyin );
 
 					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( gabc_score_determination_wrap( ) )
-						return EOF;
+					if ( yywrap(  ) )
+						return 0;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -2197,7 +2408,7 @@ static int yy_get_next_buffer (void)
 		}
 
 	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve gabc_score_determination_text */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
 	(yy_hold_char) = *++(yy_c_buf_p);
 
 	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = (c == '\n');
@@ -2211,32 +2422,32 @@ static int yy_get_next_buffer (void)
  * 
  * @note This function does not reset the start condition to @c INITIAL .
  */
-    void gabc_score_determination_restart  (FILE * input_file )
+    void yyrestart  (FILE * input_file )
 {
     
 	if ( ! YY_CURRENT_BUFFER ){
-        gabc_score_determination_ensure_buffer_stack ();
+        yyensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
-            gabc_score_determination__create_buffer(gabc_score_determination_in,YY_BUF_SIZE );
+            yy_create_buffer( yyin, YY_BUF_SIZE );
 	}
 
-	gabc_score_determination__init_buffer(YY_CURRENT_BUFFER,input_file );
-	gabc_score_determination__load_buffer_state( );
+	yy_init_buffer( YY_CURRENT_BUFFER, input_file );
+	yy_load_buffer_state(  );
 }
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
  * 
  */
-    void gabc_score_determination__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
     
 	/* TODO. We should be able to replace this entire function body
 	 * with
-	 *		gabc_score_determination_pop_buffer_state();
-	 *		gabc_score_determination_push_buffer_state(new_buffer);
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
      */
-	gabc_score_determination_ensure_buffer_stack ();
+	yyensure_buffer_stack ();
 	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
@@ -2249,21 +2460,21 @@ static int yy_get_next_buffer (void)
 		}
 
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	gabc_score_determination__load_buffer_state( );
+	yy_load_buffer_state(  );
 
 	/* We don't actually know whether we did this switch during
-	 * EOF (gabc_score_determination_wrap()) processing, but the only time this flag
-	 * is looked at is after gabc_score_determination_wrap() is called, so it's safe
+	 * EOF (yywrap()) processing, but the only time this flag
+	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
 	(yy_did_buffer_switch_on_eof) = 1;
 }
 
-static void gabc_score_determination__load_buffer_state  (void)
+static void yy_load_buffer_state  (void)
 {
     	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
 	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	gabc_score_determination_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
 	(yy_hold_char) = *(yy_c_buf_p);
 }
 
@@ -2273,35 +2484,35 @@ static void gabc_score_determination__load_buffer_state  (void)
  * 
  * @return the allocated buffer state.
  */
-    YY_BUFFER_STATE gabc_score_determination__create_buffer  (FILE * file, int  size )
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
     
-	b = (YY_BUFFER_STATE) gabc_score_determination_alloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in gabc_score_determination__create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
-	b->yy_buf_size = (yy_size_t)size;
+	b->yy_buf_size = size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) gabc_score_determination_alloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2)  );
 	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in gabc_score_determination__create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	gabc_score_determination__init_buffer(b,file );
+	yy_init_buffer( b, file );
 
 	return b;
 }
 
 /** Destroy the buffer.
- * @param b a buffer created with gabc_score_determination__create_buffer()
+ * @param b a buffer created with yy_create_buffer()
  * 
  */
-    void gabc_score_determination__delete_buffer (YY_BUFFER_STATE  b )
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
 {
     
 	if ( ! b )
@@ -2311,27 +2522,27 @@ static void gabc_score_determination__load_buffer_state  (void)
 		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		gabc_score_determination_free((void *) b->yy_ch_buf  );
+		yyfree( (void *) b->yy_ch_buf  );
 
-	gabc_score_determination_free((void *) b  );
+	yyfree( (void *) b  );
 }
 
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
- * such as during a gabc_score_determination_restart() or at EOF.
+ * such as during a yyrestart() or at EOF.
  */
-    static void gabc_score_determination__init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
 {
 	int oerrno = errno;
     
-	gabc_score_determination__flush_buffer(b );
+	yy_flush_buffer( b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* If b is the current buffer, then gabc_score_determination__init_buffer was _probably_
-     * called from gabc_score_determination_restart() or through yy_get_next_buffer.
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
      * In that case, we don't want to reset the lineno or column.
      */
     if (b != YY_CURRENT_BUFFER){
@@ -2348,7 +2559,7 @@ static void gabc_score_determination__load_buffer_state  (void)
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
  * 
  */
-    void gabc_score_determination__flush_buffer (YY_BUFFER_STATE  b )
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
 {
     	if ( ! b )
 		return;
@@ -2368,7 +2579,7 @@ static void gabc_score_determination__load_buffer_state  (void)
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
 	if ( b == YY_CURRENT_BUFFER )
-		gabc_score_determination__load_buffer_state( );
+		yy_load_buffer_state(  );
 }
 
 /** Pushes the new state onto the stack. The new state becomes
@@ -2377,14 +2588,14 @@ static void gabc_score_determination__load_buffer_state  (void)
  *  @param new_buffer The new state.
  *  
  */
-void gabc_score_determination_push_buffer_state (YY_BUFFER_STATE new_buffer )
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
     	if (new_buffer == NULL)
 		return;
 
-	gabc_score_determination_ensure_buffer_stack();
+	yyensure_buffer_stack();
 
-	/* This block is copied from gabc_score_determination__switch_to_buffer. */
+	/* This block is copied from yy_switch_to_buffer. */
 	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
@@ -2398,8 +2609,8 @@ void gabc_score_determination_push_buffer_state (YY_BUFFER_STATE new_buffer )
 		(yy_buffer_stack_top)++;
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
 
-	/* copied from gabc_score_determination__switch_to_buffer. */
-	gabc_score_determination__load_buffer_state( );
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state(  );
 	(yy_did_buffer_switch_on_eof) = 1;
 }
 
@@ -2407,18 +2618,18 @@ void gabc_score_determination_push_buffer_state (YY_BUFFER_STATE new_buffer )
  *  The next element becomes the new top.
  *  
  */
-void gabc_score_determination_pop_buffer_state (void)
+void yypop_buffer_state (void)
 {
     	if (!YY_CURRENT_BUFFER)
 		return;
 
-	gabc_score_determination__delete_buffer(YY_CURRENT_BUFFER );
+	yy_delete_buffer(YY_CURRENT_BUFFER );
 	YY_CURRENT_BUFFER_LVALUE = NULL;
 	if ((yy_buffer_stack_top) > 0)
 		--(yy_buffer_stack_top);
 
 	if (YY_CURRENT_BUFFER) {
-		gabc_score_determination__load_buffer_state( );
+		yy_load_buffer_state(  );
 		(yy_did_buffer_switch_on_eof) = 1;
 	}
 }
@@ -2426,7 +2637,7 @@ void gabc_score_determination_pop_buffer_state (void)
 /* Allocates the stack if it does not exist.
  *  Guarantees space for at least one push.
  */
-static void gabc_score_determination_ensure_buffer_stack (void)
+static void yyensure_buffer_stack (void)
 {
 	yy_size_t num_to_alloc;
     
@@ -2436,15 +2647,15 @@ static void gabc_score_determination_ensure_buffer_stack (void)
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-		num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
-		(yy_buffer_stack) = (struct yy_buffer_state**)gabc_score_determination_alloc
+      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in gabc_score_determination_ensure_buffer_stack()" );
-								  
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
+
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -2456,12 +2667,12 @@ static void gabc_score_determination_ensure_buffer_stack (void)
 		yy_size_t grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)gabc_score_determination_realloc
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in gabc_score_determination_ensure_buffer_stack()" );
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -2473,9 +2684,9 @@ static void gabc_score_determination_ensure_buffer_stack (void)
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
  * 
- * @return the newly allocated buffer state object. 
+ * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE gabc_score_determination__scan_buffer  (char * base, yy_size_t  size )
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 {
 	YY_BUFFER_STATE b;
     
@@ -2483,69 +2694,69 @@ YY_BUFFER_STATE gabc_score_determination__scan_buffer  (char * base, yy_size_t
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
-		return 0;
+		return NULL;
 
-	b = (YY_BUFFER_STATE) gabc_score_determination_alloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in gabc_score_determination__scan_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_size = (int) (size - 2);	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
 	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
+	b->yy_input_file = NULL;
 	b->yy_n_chars = b->yy_buf_size;
 	b->yy_is_interactive = 0;
 	b->yy_at_bol = 1;
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	gabc_score_determination__switch_to_buffer(b  );
+	yy_switch_to_buffer( b  );
 
 	return b;
 }
 
-/** Setup the input buffer state to scan a string. The next call to gabc_score_determination_lex() will
+/** Setup the input buffer state to scan a string. The next call to yylex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
  * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
- *       gabc_score_determination__scan_bytes() instead.
+ *       yy_scan_bytes() instead.
  */
-YY_BUFFER_STATE gabc_score_determination__scan_string (yyconst char * yystr )
+YY_BUFFER_STATE yy_scan_string (const char * yystr )
 {
     
-	return gabc_score_determination__scan_bytes(yystr,strlen(yystr) );
+	return yy_scan_bytes( yystr, (int) strlen(yystr) );
 }
 
-/** Setup the input buffer state to scan the given bytes. The next call to gabc_score_determination_lex() will
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE gabc_score_determination__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	yy_size_t i;
+	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) gabc_score_determination_alloc(n  );
+	n = (yy_size_t) (_yybytes_len + 2);
+	buf = (char *) yyalloc( n  );
 	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in gabc_score_determination__scan_bytes()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
 	for ( i = 0; i < _yybytes_len; ++i )
 		buf[i] = yybytes[i];
 
 	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = gabc_score_determination__scan_buffer(buf,n );
+	b = yy_scan_buffer( buf, n );
 	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in gabc_score_determination__scan_bytes()" );
+		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
 	/* It's okay to grow etc. this buffer, and we should throw it
 	 * away when we're done.
@@ -2559,9 +2770,9 @@ YY_BUFFER_STATE gabc_score_determination__scan_bytes  (yyconst char * yybytes, y
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yy_fatal_error (yyconst char* msg )
+static void yynoreturn yy_fatal_error (const char* msg )
 {
-			(void) fprintf( stderr, "%s\n", msg );
+			fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -2571,14 +2782,14 @@ static void yy_fatal_error (yyconst char* msg )
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up gabc_score_determination_text. */ \
+		/* Undo effects of setting up yytext. */ \
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
-		gabc_score_determination_text[gabc_score_determination_leng] = (yy_hold_char); \
-		(yy_c_buf_p) = gabc_score_determination_text + yyless_macro_arg; \
+		yytext[yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
 		(yy_hold_char) = *(yy_c_buf_p); \
 		*(yy_c_buf_p) = '\0'; \
-		gabc_score_determination_leng = yyless_macro_arg; \
+		yyleng = yyless_macro_arg; \
 		} \
 	while ( 0 )
 
@@ -2587,91 +2798,91 @@ static void yy_fatal_error (yyconst char* msg )
 /** Get the current line number.
  * 
  */
-int gabc_score_determination_get_lineno  (void)
+int yyget_lineno  (void)
 {
-        
-    return gabc_score_determination_lineno;
+    
+    return yylineno;
 }
 
 /** Get the input stream.
  * 
  */
-FILE *gabc_score_determination_get_in  (void)
+FILE *yyget_in  (void)
 {
-        return gabc_score_determination_in;
+        return yyin;
 }
 
 /** Get the output stream.
  * 
  */
-FILE *gabc_score_determination_get_out  (void)
+FILE *yyget_out  (void)
 {
-        return gabc_score_determination_out;
+        return yyout;
 }
 
 /** Get the length of the current token.
  * 
  */
-yy_size_t gabc_score_determination_get_leng  (void)
+int yyget_leng  (void)
 {
-        return gabc_score_determination_leng;
+        return yyleng;
 }
 
 /** Get the current token.
  * 
  */
 
-char *gabc_score_determination_get_text  (void)
+char *yyget_text  (void)
 {
-        return gabc_score_determination_text;
+        return yytext;
 }
 
 /** Set the current line number.
  * @param _line_number line number
  * 
  */
-void gabc_score_determination_set_lineno (int  _line_number )
+void yyset_lineno (int  _line_number )
 {
     
-    gabc_score_determination_lineno = _line_number;
+    yylineno = _line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param _in_str A readable stream.
  * 
- * @see gabc_score_determination__switch_to_buffer
+ * @see yy_switch_to_buffer
  */
-void gabc_score_determination_set_in (FILE *  _in_str )
+void yyset_in (FILE *  _in_str )
 {
-        gabc_score_determination_in = _in_str ;
+        yyin = _in_str ;
 }
 
-void gabc_score_determination_set_out (FILE *  _out_str )
+void yyset_out (FILE *  _out_str )
 {
-        gabc_score_determination_out = _out_str ;
+        yyout = _out_str ;
 }
 
-int gabc_score_determination_get_debug  (void)
+int yyget_debug  (void)
 {
-        return gabc_score_determination__flex_debug;
+        return yy_flex_debug;
 }
 
-void gabc_score_determination_set_debug (int  _bdebug )
+void yyset_debug (int  _bdebug )
 {
-        gabc_score_determination__flex_debug = _bdebug ;
+        yy_flex_debug = _bdebug ;
 }
 
 static int yy_init_globals (void)
 {
         /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from gabc_score_determination_lex_destroy(), so don't allocate here.
+     * This function is called from yylex_destroy(), so don't allocate here.
      */
 
-    (yy_buffer_stack) = 0;
+    (yy_buffer_stack) = NULL;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
+    (yy_c_buf_p) = NULL;
     (yy_init) = 0;
     (yy_start) = 0;
 
@@ -2681,40 +2892,40 @@ static int yy_init_globals (void)
 
 /* Defined in main.c */
 #ifdef YY_STDINIT
-    gabc_score_determination_in = stdin;
-    gabc_score_determination_out = stdout;
+    yyin = stdin;
+    yyout = stdout;
 #else
-    gabc_score_determination_in = (FILE *) 0;
-    gabc_score_determination_out = (FILE *) 0;
+    yyin = NULL;
+    yyout = NULL;
 #endif
 
     /* For future reference: Set errno on error, since we are called by
-     * gabc_score_determination_lex_init()
+     * yylex_init()
      */
     return 0;
 }
 
-/* gabc_score_determination_lex_destroy is for both reentrant and non-reentrant scanners. */
-int gabc_score_determination_lex_destroy  (void)
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
 {
     
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
-		gabc_score_determination__delete_buffer(YY_CURRENT_BUFFER  );
+		yy_delete_buffer( YY_CURRENT_BUFFER  );
 		YY_CURRENT_BUFFER_LVALUE = NULL;
-		gabc_score_determination_pop_buffer_state();
+		yypop_buffer_state();
 	}
 
 	/* Destroy the stack itself. */
-	gabc_score_determination_free((yy_buffer_stack) );
+	yyfree((yy_buffer_stack) );
 	(yy_buffer_stack) = NULL;
 
     /* Destroy the start condition stack. */
-        gabc_score_determination_free((yy_start_stack)  );
+        yyfree( (yy_start_stack)  );
         (yy_start_stack) = NULL;
 
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * gabc_score_determination_lex() is called, initialization will occur. */
+     * yylex() is called, initialization will occur. */
     yy_init_globals( );
 
     return 0;
@@ -2725,7 +2936,7 @@ int gabc_score_determination_lex_destroy  (void)
  */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+static void yy_flex_strncpy (char* s1, const char * s2, int n )
 {
 		
 	int i;
@@ -2735,7 +2946,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
+static int yy_flex_strlen (const char * s )
 {
 	int n;
 	for ( n = 0; s[n]; ++n )
@@ -2745,12 +2956,12 @@ static int yy_flex_strlen (yyconst char * s )
 }
 #endif
 
-void *gabc_score_determination_alloc (yy_size_t  size )
+void *yyalloc (yy_size_t  size )
 {
-			return (void *) malloc( size );
+			return malloc(size);
 }
 
-void *gabc_score_determination_realloc  (void * ptr, yy_size_t  size )
+void *yyrealloc  (void * ptr, yy_size_t  size )
 {
 		
 	/* The cast to (char *) in the following accommodates both
@@ -2760,12 +2971,12 @@ void *gabc_score_determination_realloc  (void * ptr, yy_size_t  size )
 	 * any pointer type to void*, and deal with argument conversions
 	 * as though doing an assignment.
 	 */
-	return (void *) realloc( (char *) ptr, size );
+	return realloc(ptr, size);
 }
 
-void gabc_score_determination_free (void * ptr )
+void yyfree (void * ptr )
 {
-			free( (char *) ptr );	/* see gabc_score_determination_realloc() for (char *) cast */
+			free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"
@@ -2774,4 +2985,3 @@ void gabc_score_determination_free (void * ptr )
 
 
 
-
diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h
index a53d97e76c7..7e311979a47 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h
@@ -2,9 +2,9 @@
 #define gabc_score_determination_HEADER_H 1
 #define gabc_score_determination_IN_HEADER 1
 
-#line 6 "gabc/gabc-score-determination-l.h"
+#line 5 "gabc/gabc-score-determination-l.h"
 
-#line 8 "gabc/gabc-score-determination-l.h"
+#line 7 "gabc/gabc-score-determination-l.h"
 
 #define  YY_INT_ALIGNED long int
 
@@ -13,11 +13,245 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 0
+#define YY_FLEX_SUBMINOR_VERSION 4
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
 
+#ifdef yy_create_buffer
+#define gabc_score_determination__create_buffer_ALREADY_DEFINED
+#else
+#define yy_create_buffer gabc_score_determination__create_buffer
+#endif
+
+#ifdef yy_delete_buffer
+#define gabc_score_determination__delete_buffer_ALREADY_DEFINED
+#else
+#define yy_delete_buffer gabc_score_determination__delete_buffer
+#endif
+
+#ifdef yy_scan_buffer
+#define gabc_score_determination__scan_buffer_ALREADY_DEFINED
+#else
+#define yy_scan_buffer gabc_score_determination__scan_buffer
+#endif
+
+#ifdef yy_scan_string
+#define gabc_score_determination__scan_string_ALREADY_DEFINED
+#else
+#define yy_scan_string gabc_score_determination__scan_string
+#endif
+
+#ifdef yy_scan_bytes
+#define gabc_score_determination__scan_bytes_ALREADY_DEFINED
+#else
+#define yy_scan_bytes gabc_score_determination__scan_bytes
+#endif
+
+#ifdef yy_init_buffer
+#define gabc_score_determination__init_buffer_ALREADY_DEFINED
+#else
+#define yy_init_buffer gabc_score_determination__init_buffer
+#endif
+
+#ifdef yy_flush_buffer
+#define gabc_score_determination__flush_buffer_ALREADY_DEFINED
+#else
+#define yy_flush_buffer gabc_score_determination__flush_buffer
+#endif
+
+#ifdef yy_load_buffer_state
+#define gabc_score_determination__load_buffer_state_ALREADY_DEFINED
+#else
+#define yy_load_buffer_state gabc_score_determination__load_buffer_state
+#endif
+
+#ifdef yy_switch_to_buffer
+#define gabc_score_determination__switch_to_buffer_ALREADY_DEFINED
+#else
+#define yy_switch_to_buffer gabc_score_determination__switch_to_buffer
+#endif
+
+#ifdef yypush_buffer_state
+#define gabc_score_determination_push_buffer_state_ALREADY_DEFINED
+#else
+#define yypush_buffer_state gabc_score_determination_push_buffer_state
+#endif
+
+#ifdef yypop_buffer_state
+#define gabc_score_determination_pop_buffer_state_ALREADY_DEFINED
+#else
+#define yypop_buffer_state gabc_score_determination_pop_buffer_state
+#endif
+
+#ifdef yyensure_buffer_stack
+#define gabc_score_determination_ensure_buffer_stack_ALREADY_DEFINED
+#else
+#define yyensure_buffer_stack gabc_score_determination_ensure_buffer_stack
+#endif
+
+#ifdef yylex
+#define gabc_score_determination_lex_ALREADY_DEFINED
+#else
+#define yylex gabc_score_determination_lex
+#endif
+
+#ifdef yyrestart
+#define gabc_score_determination_restart_ALREADY_DEFINED
+#else
+#define yyrestart gabc_score_determination_restart
+#endif
+
+#ifdef yylex_init
+#define gabc_score_determination_lex_init_ALREADY_DEFINED
+#else
+#define yylex_init gabc_score_determination_lex_init
+#endif
+
+#ifdef yylex_init_extra
+#define gabc_score_determination_lex_init_extra_ALREADY_DEFINED
+#else
+#define yylex_init_extra gabc_score_determination_lex_init_extra
+#endif
+
+#ifdef yylex_destroy
+#define gabc_score_determination_lex_destroy_ALREADY_DEFINED
+#else
+#define yylex_destroy gabc_score_determination_lex_destroy
+#endif
+
+#ifdef yyget_debug
+#define gabc_score_determination_get_debug_ALREADY_DEFINED
+#else
+#define yyget_debug gabc_score_determination_get_debug
+#endif
+
+#ifdef yyset_debug
+#define gabc_score_determination_set_debug_ALREADY_DEFINED
+#else
+#define yyset_debug gabc_score_determination_set_debug
+#endif
+
+#ifdef yyget_extra
+#define gabc_score_determination_get_extra_ALREADY_DEFINED
+#else
+#define yyget_extra gabc_score_determination_get_extra
+#endif
+
+#ifdef yyset_extra
+#define gabc_score_determination_set_extra_ALREADY_DEFINED
+#else
+#define yyset_extra gabc_score_determination_set_extra
+#endif
+
+#ifdef yyget_in
+#define gabc_score_determination_get_in_ALREADY_DEFINED
+#else
+#define yyget_in gabc_score_determination_get_in
+#endif
+
+#ifdef yyset_in
+#define gabc_score_determination_set_in_ALREADY_DEFINED
+#else
+#define yyset_in gabc_score_determination_set_in
+#endif
+
+#ifdef yyget_out
+#define gabc_score_determination_get_out_ALREADY_DEFINED
+#else
+#define yyget_out gabc_score_determination_get_out
+#endif
+
+#ifdef yyset_out
+#define gabc_score_determination_set_out_ALREADY_DEFINED
+#else
+#define yyset_out gabc_score_determination_set_out
+#endif
+
+#ifdef yyget_leng
+#define gabc_score_determination_get_leng_ALREADY_DEFINED
+#else
+#define yyget_leng gabc_score_determination_get_leng
+#endif
+
+#ifdef yyget_text
+#define gabc_score_determination_get_text_ALREADY_DEFINED
+#else
+#define yyget_text gabc_score_determination_get_text
+#endif
+
+#ifdef yyget_lineno
+#define gabc_score_determination_get_lineno_ALREADY_DEFINED
+#else
+#define yyget_lineno gabc_score_determination_get_lineno
+#endif
+
+#ifdef yyset_lineno
+#define gabc_score_determination_set_lineno_ALREADY_DEFINED
+#else
+#define yyset_lineno gabc_score_determination_set_lineno
+#endif
+
+#ifdef yywrap
+#define gabc_score_determination_wrap_ALREADY_DEFINED
+#else
+#define yywrap gabc_score_determination_wrap
+#endif
+
+#ifdef yyalloc
+#define gabc_score_determination_alloc_ALREADY_DEFINED
+#else
+#define yyalloc gabc_score_determination_alloc
+#endif
+
+#ifdef yyrealloc
+#define gabc_score_determination_realloc_ALREADY_DEFINED
+#else
+#define yyrealloc gabc_score_determination_realloc
+#endif
+
+#ifdef yyfree
+#define gabc_score_determination_free_ALREADY_DEFINED
+#else
+#define yyfree gabc_score_determination_free
+#endif
+
+#ifdef yytext
+#define gabc_score_determination_text_ALREADY_DEFINED
+#else
+#define yytext gabc_score_determination_text
+#endif
+
+#ifdef yyleng
+#define gabc_score_determination_leng_ALREADY_DEFINED
+#else
+#define yyleng gabc_score_determination_leng
+#endif
+
+#ifdef yyin
+#define gabc_score_determination_in_ALREADY_DEFINED
+#else
+#define yyin gabc_score_determination_in
+#endif
+
+#ifdef yyout
+#define gabc_score_determination_out_ALREADY_DEFINED
+#else
+#define yyout gabc_score_determination_out
+#endif
+
+#ifdef yy_flex_debug
+#define gabc_score_determination__flex_debug_ALREADY_DEFINED
+#else
+#define yy_flex_debug gabc_score_determination__flex_debug
+#endif
+
+#ifdef yylineno
+#define gabc_score_determination_lineno_ALREADY_DEFINED
+#else
+#define yylineno gabc_score_determination_lineno
+#endif
+
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
 /* begin standard C headers. */
@@ -88,29 +322,23 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
+
 #endif /* ! C99 */
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
+/* begin standard C++ headers. */
 
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
 #define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
 #else
-#define yyconst
+#define yynoreturn
 #endif
 
 /* Size of default input buffer. */
@@ -136,9 +364,9 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t yy_size_t;
 #endif
 
-extern yy_size_t gabc_score_determination_leng;
+extern int yyleng;
 
-extern FILE *gabc_score_determination_in, *gabc_score_determination_out;
+extern FILE *yyin, *yyout;
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
@@ -152,12 +380,12 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	yy_size_t yy_buf_size;
+	int yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -180,7 +408,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -191,34 +419,34 @@ struct yy_buffer_state
 	};
 #endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-void gabc_score_determination_restart (FILE *input_file  );
-void gabc_score_determination__switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE gabc_score_determination__create_buffer (FILE *file,int size  );
-void gabc_score_determination__delete_buffer (YY_BUFFER_STATE b  );
-void gabc_score_determination__flush_buffer (YY_BUFFER_STATE b  );
-void gabc_score_determination_push_buffer_state (YY_BUFFER_STATE new_buffer  );
-void gabc_score_determination_pop_buffer_state (void );
+void yyrestart ( FILE *input_file  );
+void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
+void yy_delete_buffer ( YY_BUFFER_STATE b  );
+void yy_flush_buffer ( YY_BUFFER_STATE b  );
+void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state ( void );
 
-YY_BUFFER_STATE gabc_score_determination__scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE gabc_score_determination__scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE gabc_score_determination__scan_bytes (yyconst char *bytes,yy_size_t len  );
+YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string ( const char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len  );
 
-void *gabc_score_determination_alloc (yy_size_t  );
-void *gabc_score_determination_realloc (void *,yy_size_t  );
-void gabc_score_determination_free (void *  );
+void *yyalloc ( yy_size_t  );
+void *yyrealloc ( void *, yy_size_t  );
+void yyfree ( void *  );
 
 /* Begin user sect3 */
 
 #define gabc_score_determination_wrap() (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
 
-extern int gabc_score_determination_lineno;
+extern int yylineno;
 
-extern char *gabc_score_determination_text;
+extern char *yytext;
 #ifdef yytext_ptr
 #undef yytext_ptr
 #endif
-#define yytext_ptr gabc_score_determination_text
+#define yytext_ptr yytext
 
 #ifdef YY_HEADER_EXPORT_START_CONDITIONS
 #define INITIAL 0
@@ -250,31 +478,31 @@ extern char *gabc_score_determination_text;
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int gabc_score_determination_lex_destroy (void );
+int yylex_destroy ( void );
 
-int gabc_score_determination_get_debug (void );
+int yyget_debug ( void );
 
-void gabc_score_determination_set_debug (int debug_flag  );
+void yyset_debug ( int debug_flag  );
 
-YY_EXTRA_TYPE gabc_score_determination_get_extra (void );
+YY_EXTRA_TYPE yyget_extra ( void );
 
-void gabc_score_determination_set_extra (YY_EXTRA_TYPE user_defined  );
+void yyset_extra ( YY_EXTRA_TYPE user_defined  );
 
-FILE *gabc_score_determination_get_in (void );
+FILE *yyget_in ( void );
 
-void gabc_score_determination_set_in  (FILE * _in_str  );
+void yyset_in  ( FILE * _in_str  );
 
-FILE *gabc_score_determination_get_out (void );
+FILE *yyget_out ( void );
 
-void gabc_score_determination_set_out  (FILE * _out_str  );
+void yyset_out  ( FILE * _out_str  );
 
-yy_size_t gabc_score_determination_get_leng (void );
+			int yyget_leng ( void );
 
-char *gabc_score_determination_get_text (void );
+char *yyget_text ( void );
 
-int gabc_score_determination_get_lineno (void );
+int yyget_lineno ( void );
 
-void gabc_score_determination_set_lineno (int _line_number  );
+void yyset_lineno ( int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -282,18 +510,18 @@ void gabc_score_determination_set_lineno (int _line_number  );
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int gabc_score_determination_wrap (void );
+extern "C" int yywrap ( void );
 #else
-extern int gabc_score_determination_wrap (void );
+extern int yywrap ( void );
 #endif
 #endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy ( char *, const char *, int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen ( const char * );
 #endif
 
 #ifndef YY_NO_INPUT
@@ -321,9 +549,9 @@ static int yy_flex_strlen (yyconst char * );
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int gabc_score_determination_lex (void);
+extern int yylex (void);
 
-#define YY_DECL int gabc_score_determination_lex (void)
+#define YY_DECL int yylex (void)
 #endif /* !YY_DECL */
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
@@ -340,9 +568,154 @@ extern int gabc_score_determination_lex (void);
 #undef YY_DECL
 #endif
 
+#ifndef gabc_score_determination__create_buffer_ALREADY_DEFINED
+#undef yy_create_buffer
+#endif
+#ifndef gabc_score_determination__delete_buffer_ALREADY_DEFINED
+#undef yy_delete_buffer
+#endif
+#ifndef gabc_score_determination__scan_buffer_ALREADY_DEFINED
+#undef yy_scan_buffer
+#endif
+#ifndef gabc_score_determination__scan_string_ALREADY_DEFINED
+#undef yy_scan_string
+#endif
+#ifndef gabc_score_determination__scan_bytes_ALREADY_DEFINED
+#undef yy_scan_bytes
+#endif
+#ifndef gabc_score_determination__init_buffer_ALREADY_DEFINED
+#undef yy_init_buffer
+#endif
+#ifndef gabc_score_determination__flush_buffer_ALREADY_DEFINED
+#undef yy_flush_buffer
+#endif
+#ifndef gabc_score_determination__load_buffer_state_ALREADY_DEFINED
+#undef yy_load_buffer_state
+#endif
+#ifndef gabc_score_determination__switch_to_buffer_ALREADY_DEFINED
+#undef yy_switch_to_buffer
+#endif
+#ifndef gabc_score_determination_push_buffer_state_ALREADY_DEFINED
+#undef yypush_buffer_state
+#endif
+#ifndef gabc_score_determination_pop_buffer_state_ALREADY_DEFINED
+#undef yypop_buffer_state
+#endif
+#ifndef gabc_score_determination_ensure_buffer_stack_ALREADY_DEFINED
+#undef yyensure_buffer_stack
+#endif
+#ifndef gabc_score_determination_lex_ALREADY_DEFINED
+#undef yylex
+#endif
+#ifndef gabc_score_determination_restart_ALREADY_DEFINED
+#undef yyrestart
+#endif
+#ifndef gabc_score_determination_lex_init_ALREADY_DEFINED
+#undef yylex_init
+#endif
+#ifndef gabc_score_determination_lex_init_extra_ALREADY_DEFINED
+#undef yylex_init_extra
+#endif
+#ifndef gabc_score_determination_lex_destroy_ALREADY_DEFINED
+#undef yylex_destroy
+#endif
+#ifndef gabc_score_determination_get_debug_ALREADY_DEFINED
+#undef yyget_debug
+#endif
+#ifndef gabc_score_determination_set_debug_ALREADY_DEFINED
+#undef yyset_debug
+#endif
+#ifndef gabc_score_determination_get_extra_ALREADY_DEFINED
+#undef yyget_extra
+#endif
+#ifndef gabc_score_determination_set_extra_ALREADY_DEFINED
+#undef yyset_extra
+#endif
+#ifndef gabc_score_determination_get_in_ALREADY_DEFINED
+#undef yyget_in
+#endif
+#ifndef gabc_score_determination_set_in_ALREADY_DEFINED
+#undef yyset_in
+#endif
+#ifndef gabc_score_determination_get_out_ALREADY_DEFINED
+#undef yyget_out
+#endif
+#ifndef gabc_score_determination_set_out_ALREADY_DEFINED
+#undef yyset_out
+#endif
+#ifndef gabc_score_determination_get_leng_ALREADY_DEFINED
+#undef yyget_leng
+#endif
+#ifndef gabc_score_determination_get_text_ALREADY_DEFINED
+#undef yyget_text
+#endif
+#ifndef gabc_score_determination_get_lineno_ALREADY_DEFINED
+#undef yyget_lineno
+#endif
+#ifndef gabc_score_determination_set_lineno_ALREADY_DEFINED
+#undef yyset_lineno
+#endif
+#ifndef gabc_score_determination_get_column_ALREADY_DEFINED
+#undef yyget_column
+#endif
+#ifndef gabc_score_determination_set_column_ALREADY_DEFINED
+#undef yyset_column
+#endif
+#ifndef gabc_score_determination_wrap_ALREADY_DEFINED
+#undef yywrap
+#endif
+#ifndef gabc_score_determination_get_lval_ALREADY_DEFINED
+#undef yyget_lval
+#endif
+#ifndef gabc_score_determination_set_lval_ALREADY_DEFINED
+#undef yyset_lval
+#endif
+#ifndef gabc_score_determination_get_lloc_ALREADY_DEFINED
+#undef yyget_lloc
+#endif
+#ifndef gabc_score_determination_set_lloc_ALREADY_DEFINED
+#undef yyset_lloc
+#endif
+#ifndef gabc_score_determination_alloc_ALREADY_DEFINED
+#undef yyalloc
+#endif
+#ifndef gabc_score_determination_realloc_ALREADY_DEFINED
+#undef yyrealloc
+#endif
+#ifndef gabc_score_determination_free_ALREADY_DEFINED
+#undef yyfree
+#endif
+#ifndef gabc_score_determination_text_ALREADY_DEFINED
+#undef yytext
+#endif
+#ifndef gabc_score_determination_leng_ALREADY_DEFINED
+#undef yyleng
+#endif
+#ifndef gabc_score_determination_in_ALREADY_DEFINED
+#undef yyin
+#endif
+#ifndef gabc_score_determination_out_ALREADY_DEFINED
+#undef yyout
+#endif
+#ifndef gabc_score_determination__flex_debug_ALREADY_DEFINED
+#undef yy_flex_debug
+#endif
+#ifndef gabc_score_determination_lineno_ALREADY_DEFINED
+#undef yylineno
+#endif
+#ifndef gabc_score_determination_tables_fload_ALREADY_DEFINED
+#undef yytables_fload
+#endif
+#ifndef gabc_score_determination_tables_destroy_ALREADY_DEFINED
+#undef yytables_destroy
+#endif
+#ifndef gabc_score_determination_TABLES_NAME_ALREADY_DEFINED
+#undef yyTABLES_NAME
+#endif
+
 #line 429 "gabc/gabc-score-determination.l"
 
 
-#line 347 "gabc/gabc-score-determination-l.h"
+#line 719 "gabc/gabc-score-determination-l.h"
 #undef gabc_score_determination_IN_HEADER
 #endif /* gabc_score_determination_HEADER_H */
diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c
index f783c84a035..a773b8d1c65 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c
@@ -377,6 +377,15 @@ static void gabc_write_bar(FILE *f, gregorio_bar type)
     case B_DIVISIO_MINOR_D8:
         fprintf(f, ";8");
         break;
+    case B_VIRGULA_HIGH:
+        fprintf(f, "`0");
+        break;
+    case B_DIVISIO_MINIMA_HIGH:
+        fprintf(f, ",0");
+        break;
+    case B_DIVISIO_MAIOR_DOTTED:
+        fprintf(f, ":?");
+        break;
     default:
         /* not reachable unless there's a programming error */
         /* LCOV_EXCL_START */
diff --git a/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c
index 0ba25b0e9f7..c1e1eaecefe 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c
@@ -1624,6 +1624,7 @@ static void write_bar(FILE *f, const gregorio_score *const score,
     const bool has_text = !element->previous && syllable->text;
     /* the type number of function vepisemaorrare */
     const char *offset_case = BarStandard;
+    signed char far_pitch_adjustment = 0;
     /* don't use "In" version of bars in the first argument of a GreDiscretionary */
     if (is_inside_bar && first_of_disc != 1) {
         fprintf(f, "\\GreIn");
@@ -1672,6 +1673,16 @@ static void write_bar(FILE *f, const gregorio_score *const score,
     case B_DIVISIO_MINOR_D8:
         fprintf(f, "Dominica{8}");
         break;
+    case B_VIRGULA_HIGH:
+        fprintf(f, "VirgulaHigh");
+        offset_case = BarVirgula;
+        break;
+    case B_DIVISIO_MINIMA_HIGH:
+        fprintf(f, "DivisioMinimaHigh");
+        break;
+    case B_DIVISIO_MAIOR_DOTTED:
+        fprintf(f, "DivisioMaiorDotted");
+        break;
     default:
         /* not reachable unless there's a programming error */
         /* LCOV_EXCL_START */
@@ -1696,72 +1707,83 @@ static void write_bar(FILE *f, const gregorio_score *const score,
         fprintf(f, "{}");
         break;
     }
-    if (type == B_VIRGULA || type == B_DIVISIO_MINIMA) {
-        char result = '0';
-        const gregorio_element *e;
-        const gregorio_syllable *s;
-        const gregorio_glyph *g;
-        const gregorio_note *n;
-        signed char pitch;
-        /* find the prior element */
-        e = element->previous;
-        if (!e) {
-            for (s = syllable->previous_syllable; s; s = s->previous_syllable) {
-                /* loop to find the previous syllable with elements */
-                if (s->elements && *s->elements) {
-                    for (e = *s->elements; e->next; e = e->next) {
-                        /* just loop to find the last element */
+    switch (type) {
+    case B_VIRGULA_HIGH:
+    case B_DIVISIO_MINIMA_HIGH:
+        far_pitch_adjustment = 2;
+        /* fall through */
+
+    case B_VIRGULA:
+    case B_DIVISIO_MINIMA:
+        {
+            char is_far = '0';
+            const gregorio_element *e;
+            const gregorio_syllable *s;
+            const gregorio_glyph *g;
+            const gregorio_note *n;
+            signed char pitch;
+
+            /* find the prior element */
+            e = element->previous;
+            if (!e) {
+                for (s = syllable->previous_syllable; s; s = s->previous_syllable) {
+                    /* loop to find the previous syllable with elements */
+                    if (s->elements && *s->elements) {
+                        for (e = *s->elements; e->next; e = e->next) {
+                            /* just loop to find the last element */
+                        }
+                        break;
                     }
-                    break;
-                }
-            }
-        }
-        if (e && e->type == GRE_ELEMENT) {
-            g = e->u.first_glyph;
-            if (g) {
-                while (g->next) {
-                    /* loop to find the last glyph in the prior element */
-                    g = g->next;
                 }
             }
-            if (g && g->type == GRE_GLYPH && (n = g->u.notes.first_note)) {
-                while (n->next) {
-                    /* loop to find the last note */
-                    n = n->next;
-                }
-                pitch = n->u.note.pitch;
-                if (g->u.notes.liquescentia & L_DEMINUTUS && n->previous
-                        && n->previous->u.note.pitch > pitch) {
-                    pitch = n->previous->u.note.pitch;
+            if (e && e->type == GRE_ELEMENT) {
+                g = e->u.first_glyph;
+                if (g) {
+                    while (g->next) {
+                        /* loop to find the last glyph in the prior element */
+                        g = g->next;
+                    }
                 }
-                if (pitch < score->virgula_far_pitch) {
-                    /* find next element */
-                    e = element->next;
-                    if (!e) {
-                        for (s = syllable->next_syllable; s;
-                                s = s->next_syllable) {
-                            /* loop to find the next syllable with elements */
-                            if (s->elements && *s->elements) {
-                                e = *s->elements;
-                                break;
+                if (g && g->type == GRE_GLYPH && (n = g->u.notes.first_note)) {
+                    while (n->next) {
+                        /* loop to find the last note */
+                        n = n->next;
+                    }
+                    pitch = n->u.note.pitch;
+                    if (g->u.notes.liquescentia & L_DEMINUTUS && n->previous
+                            && n->previous->u.note.pitch > pitch) {
+                        pitch = n->previous->u.note.pitch;
+                    }
+                    if (pitch < score->virgula_far_pitch + far_pitch_adjustment) {
+                        /* find next element */
+                        e = element->next;
+                        if (!e) {
+                            for (s = syllable->next_syllable; s;
+                                    s = s->next_syllable) {
+                                /* loop to find the next syllable with elements */
+                                if (s->elements && *s->elements) {
+                                    e = *s->elements;
+                                    break;
+                                }
                             }
                         }
-                    }
-                    if (e) {
-                        if (e->type == GRE_END_OF_LINE) {
-                            result = '1';
-                        } else if (e->type == GRE_ELEMENT) {
-                            g = e->u.first_glyph;
-                            if (g && g->type == GRE_GLYPH) {
-                                n = g->u.notes.first_note;
-                                if (n) {
-                                    if (g->u.notes.glyph_type == G_PODATUS
-                                            && n->next) {
-                                        n = n->next;
-                                    }
-                                    if (n->u.note.pitch
-                                            < score->virgula_far_pitch) {
-                                        result = '1';
+                        if (e) {
+                            if (e->type == GRE_END_OF_LINE) {
+                                is_far = '1';
+                            } else if (e->type == GRE_ELEMENT) {
+                                g = e->u.first_glyph;
+                                if (g && g->type == GRE_GLYPH) {
+                                    n = g->u.notes.first_note;
+                                    if (n) {
+                                        if (g->u.notes.glyph_type == G_PODATUS
+                                                && n->next) {
+                                            n = n->next;
+                                        }
+                                        if (n->u.note.pitch
+                                                < score->virgula_far_pitch
+                                                + far_pitch_adjustment) {
+                                            is_far = '1';
+                                        }
                                     }
                                 }
                             }
@@ -1769,10 +1791,13 @@ static void write_bar(FILE *f, const gregorio_score *const score,
                     }
                 }
             }
+            fprintf(f, "{%c}%%\n", is_far);
         }
-        fprintf(f, "{%c}%%\n", result);
-    } else {
+        break;
+
+    default:
         fprintf(f, "%%\n");
+        break;
     }
 }
 
@@ -2560,15 +2585,18 @@ static int gregoriotex_syllable_first_type(gregorio_syllable *syllable)
             switch (element->u.misc.unpitched.info.bar) {
             case B_NO_BAR:
             case B_VIRGULA:
+            case B_VIRGULA_HIGH:
                 result = 10;
                 break;
             case B_DIVISIO_MINIMA:
+            case B_DIVISIO_MINIMA_HIGH:
                 result = 11;
                 break;
             case B_DIVISIO_MINOR:
                 result = 12;
                 break;
             case B_DIVISIO_MAIOR:
+            case B_DIVISIO_MAIOR_DOTTED:
                 result = 13;
                 break;
             case B_DIVISIO_MINOR_D1:
diff --git a/Build/source/texk/gregorio/gregorio-src/src/struct.c b/Build/source/texk/gregorio/gregorio-src/src/struct.c
index 6259e9ad0e6..952e47ba210 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/struct.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/struct.c
@@ -1104,6 +1104,9 @@ static void gregorio_free_one_syllable(gregorio_syllable **syllable,
     }
     free((*syllable)->abovelinestext);
     next = (*syllable)->next_syllable;
+    if (next) {
+        next->previous_syllable = NULL;
+    }
     free((*syllable)->elements);
     free(*syllable);
     *syllable = next;
diff --git a/Build/source/texk/gregorio/gregorio-src/src/struct.h b/Build/source/texk/gregorio/gregorio-src/src/struct.h
index 97061b6716a..144c020f722 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/struct.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/struct.h
@@ -155,7 +155,10 @@ ENUM(gregorio_shape, GREGORIO_SHAPE);
     E(B_DIVISIO_MINOR_D5) \
     E(B_DIVISIO_MINOR_D6) \
     E(B_DIVISIO_MINOR_D7) \
-    L(B_DIVISIO_MINOR_D8)
+    E(B_DIVISIO_MINOR_D8) \
+    E(B_VIRGULA_HIGH) \
+    E(B_DIVISIO_MINIMA_HIGH) \
+    L(B_DIVISIO_MAIOR_DOTTED)
 ENUM(gregorio_bar, GREGORIO_BAR);
 
 /* definition of the signs. You can notice that the values are made so
@@ -395,7 +398,7 @@ ENUM(gregorio_ledger_specificity, GREGORIO_LEDGER_SPECIFICITY);
 
 typedef struct gregorio_extra_info {
     char *ad_hoc_space_factor;
-    ENUM_BITFIELD(gregorio_bar) bar:4;
+    ENUM_BITFIELD(gregorio_bar) bar:5;
     ENUM_BITFIELD(gregorio_space) space:4;
     ENUM_BITFIELD(gregorio_nlba) nlba:2;
     bool eol_ragged:1;
diff --git a/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c
index bb8e4e99f27..fff40068a1b 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c
+++ b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c
@@ -1,6 +1,6 @@
-#line 2 "vowel/vowel-rules-l.c"
+#line 1 "vowel/vowel-rules-l.c"
 
-#line 4 "vowel/vowel-rules-l.c"
+#line 3 "vowel/vowel-rules-l.c"
 
 #define  YY_INT_ALIGNED long int
 
@@ -8,11 +8,17 @@
 
 #define yy_create_buffer gregorio_vowel_rulefile__create_buffer
 #define yy_delete_buffer gregorio_vowel_rulefile__delete_buffer
-#define yy_flex_debug gregorio_vowel_rulefile__flex_debug
+#define yy_scan_buffer gregorio_vowel_rulefile__scan_buffer
+#define yy_scan_string gregorio_vowel_rulefile__scan_string
+#define yy_scan_bytes gregorio_vowel_rulefile__scan_bytes
 #define yy_init_buffer gregorio_vowel_rulefile__init_buffer
 #define yy_flush_buffer gregorio_vowel_rulefile__flush_buffer
 #define yy_load_buffer_state gregorio_vowel_rulefile__load_buffer_state
 #define yy_switch_to_buffer gregorio_vowel_rulefile__switch_to_buffer
+#define yypush_buffer_state gregorio_vowel_rulefile_push_buffer_state
+#define yypop_buffer_state gregorio_vowel_rulefile_pop_buffer_state
+#define yyensure_buffer_stack gregorio_vowel_rulefile_ensure_buffer_stack
+#define yy_flex_debug gregorio_vowel_rulefile__flex_debug
 #define yyin gregorio_vowel_rulefile_in
 #define yyleng gregorio_vowel_rulefile_leng
 #define yylex gregorio_vowel_rulefile_lex
@@ -28,11 +34,245 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 0
+#define YY_FLEX_SUBMINOR_VERSION 4
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
 
+#ifdef yy_create_buffer
+#define gregorio_vowel_rulefile__create_buffer_ALREADY_DEFINED
+#else
+#define yy_create_buffer gregorio_vowel_rulefile__create_buffer
+#endif
+
+#ifdef yy_delete_buffer
+#define gregorio_vowel_rulefile__delete_buffer_ALREADY_DEFINED
+#else
+#define yy_delete_buffer gregorio_vowel_rulefile__delete_buffer
+#endif
+
+#ifdef yy_scan_buffer
+#define gregorio_vowel_rulefile__scan_buffer_ALREADY_DEFINED
+#else
+#define yy_scan_buffer gregorio_vowel_rulefile__scan_buffer
+#endif
+
+#ifdef yy_scan_string
+#define gregorio_vowel_rulefile__scan_string_ALREADY_DEFINED
+#else
+#define yy_scan_string gregorio_vowel_rulefile__scan_string
+#endif
+
+#ifdef yy_scan_bytes
+#define gregorio_vowel_rulefile__scan_bytes_ALREADY_DEFINED
+#else
+#define yy_scan_bytes gregorio_vowel_rulefile__scan_bytes
+#endif
+
+#ifdef yy_init_buffer
+#define gregorio_vowel_rulefile__init_buffer_ALREADY_DEFINED
+#else
+#define yy_init_buffer gregorio_vowel_rulefile__init_buffer
+#endif
+
+#ifdef yy_flush_buffer
+#define gregorio_vowel_rulefile__flush_buffer_ALREADY_DEFINED
+#else
+#define yy_flush_buffer gregorio_vowel_rulefile__flush_buffer
+#endif
+
+#ifdef yy_load_buffer_state
+#define gregorio_vowel_rulefile__load_buffer_state_ALREADY_DEFINED
+#else
+#define yy_load_buffer_state gregorio_vowel_rulefile__load_buffer_state
+#endif
+
+#ifdef yy_switch_to_buffer
+#define gregorio_vowel_rulefile__switch_to_buffer_ALREADY_DEFINED
+#else
+#define yy_switch_to_buffer gregorio_vowel_rulefile__switch_to_buffer
+#endif
+
+#ifdef yypush_buffer_state
+#define gregorio_vowel_rulefile_push_buffer_state_ALREADY_DEFINED
+#else
+#define yypush_buffer_state gregorio_vowel_rulefile_push_buffer_state
+#endif
+
+#ifdef yypop_buffer_state
+#define gregorio_vowel_rulefile_pop_buffer_state_ALREADY_DEFINED
+#else
+#define yypop_buffer_state gregorio_vowel_rulefile_pop_buffer_state
+#endif
+
+#ifdef yyensure_buffer_stack
+#define gregorio_vowel_rulefile_ensure_buffer_stack_ALREADY_DEFINED
+#else
+#define yyensure_buffer_stack gregorio_vowel_rulefile_ensure_buffer_stack
+#endif
+
+#ifdef yylex
+#define gregorio_vowel_rulefile_lex_ALREADY_DEFINED
+#else
+#define yylex gregorio_vowel_rulefile_lex
+#endif
+
+#ifdef yyrestart
+#define gregorio_vowel_rulefile_restart_ALREADY_DEFINED
+#else
+#define yyrestart gregorio_vowel_rulefile_restart
+#endif
+
+#ifdef yylex_init
+#define gregorio_vowel_rulefile_lex_init_ALREADY_DEFINED
+#else
+#define yylex_init gregorio_vowel_rulefile_lex_init
+#endif
+
+#ifdef yylex_init_extra
+#define gregorio_vowel_rulefile_lex_init_extra_ALREADY_DEFINED
+#else
+#define yylex_init_extra gregorio_vowel_rulefile_lex_init_extra
+#endif
+
+#ifdef yylex_destroy
+#define gregorio_vowel_rulefile_lex_destroy_ALREADY_DEFINED
+#else
+#define yylex_destroy gregorio_vowel_rulefile_lex_destroy
+#endif
+
+#ifdef yyget_debug
+#define gregorio_vowel_rulefile_get_debug_ALREADY_DEFINED
+#else
+#define yyget_debug gregorio_vowel_rulefile_get_debug
+#endif
+
+#ifdef yyset_debug
+#define gregorio_vowel_rulefile_set_debug_ALREADY_DEFINED
+#else
+#define yyset_debug gregorio_vowel_rulefile_set_debug
+#endif
+
+#ifdef yyget_extra
+#define gregorio_vowel_rulefile_get_extra_ALREADY_DEFINED
+#else
+#define yyget_extra gregorio_vowel_rulefile_get_extra
+#endif
+
+#ifdef yyset_extra
+#define gregorio_vowel_rulefile_set_extra_ALREADY_DEFINED
+#else
+#define yyset_extra gregorio_vowel_rulefile_set_extra
+#endif
+
+#ifdef yyget_in
+#define gregorio_vowel_rulefile_get_in_ALREADY_DEFINED
+#else
+#define yyget_in gregorio_vowel_rulefile_get_in
+#endif
+
+#ifdef yyset_in
+#define gregorio_vowel_rulefile_set_in_ALREADY_DEFINED
+#else
+#define yyset_in gregorio_vowel_rulefile_set_in
+#endif
+
+#ifdef yyget_out
+#define gregorio_vowel_rulefile_get_out_ALREADY_DEFINED
+#else
+#define yyget_out gregorio_vowel_rulefile_get_out
+#endif
+
+#ifdef yyset_out
+#define gregorio_vowel_rulefile_set_out_ALREADY_DEFINED
+#else
+#define yyset_out gregorio_vowel_rulefile_set_out
+#endif
+
+#ifdef yyget_leng
+#define gregorio_vowel_rulefile_get_leng_ALREADY_DEFINED
+#else
+#define yyget_leng gregorio_vowel_rulefile_get_leng
+#endif
+
+#ifdef yyget_text
+#define gregorio_vowel_rulefile_get_text_ALREADY_DEFINED
+#else
+#define yyget_text gregorio_vowel_rulefile_get_text
+#endif
+
+#ifdef yyget_lineno
+#define gregorio_vowel_rulefile_get_lineno_ALREADY_DEFINED
+#else
+#define yyget_lineno gregorio_vowel_rulefile_get_lineno
+#endif
+
+#ifdef yyset_lineno
+#define gregorio_vowel_rulefile_set_lineno_ALREADY_DEFINED
+#else
+#define yyset_lineno gregorio_vowel_rulefile_set_lineno
+#endif
+
+#ifdef yywrap
+#define gregorio_vowel_rulefile_wrap_ALREADY_DEFINED
+#else
+#define yywrap gregorio_vowel_rulefile_wrap
+#endif
+
+#ifdef yyalloc
+#define gregorio_vowel_rulefile_alloc_ALREADY_DEFINED
+#else
+#define yyalloc gregorio_vowel_rulefile_alloc
+#endif
+
+#ifdef yyrealloc
+#define gregorio_vowel_rulefile_realloc_ALREADY_DEFINED
+#else
+#define yyrealloc gregorio_vowel_rulefile_realloc
+#endif
+
+#ifdef yyfree
+#define gregorio_vowel_rulefile_free_ALREADY_DEFINED
+#else
+#define yyfree gregorio_vowel_rulefile_free
+#endif
+
+#ifdef yytext
+#define gregorio_vowel_rulefile_text_ALREADY_DEFINED
+#else
+#define yytext gregorio_vowel_rulefile_text
+#endif
+
+#ifdef yyleng
+#define gregorio_vowel_rulefile_leng_ALREADY_DEFINED
+#else
+#define yyleng gregorio_vowel_rulefile_leng
+#endif
+
+#ifdef yyin
+#define gregorio_vowel_rulefile_in_ALREADY_DEFINED
+#else
+#define yyin gregorio_vowel_rulefile_in
+#endif
+
+#ifdef yyout
+#define gregorio_vowel_rulefile_out_ALREADY_DEFINED
+#else
+#define yyout gregorio_vowel_rulefile_out
+#endif
+
+#ifdef yy_flex_debug
+#define gregorio_vowel_rulefile__flex_debug_ALREADY_DEFINED
+#else
+#define yy_flex_debug gregorio_vowel_rulefile__flex_debug
+#endif
+
+#ifdef yylineno
+#define gregorio_vowel_rulefile_lineno_ALREADY_DEFINED
+#else
+#define yylineno gregorio_vowel_rulefile_lineno
+#endif
+
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
 /* begin standard C headers. */
@@ -103,60 +343,48 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
+
 #endif /* ! C99 */
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
-
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
+/* begin standard C++ headers. */
 
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
 #define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
 #else
-#define yyconst
+#define yynoreturn
 #endif
 
 /* Returned upon end-of-file. */
 #define YY_NULL 0
 
-/* Promotes a possibly negative, possibly signed char to an unsigned
- * integer for use as an array index.  If the signed char is negative,
- * we want to instead treat it as an 8-bit unsigned char, hence the
- * double cast.
+/* Promotes a possibly negative, possibly signed char to an
+ *   integer in range [0..255] for use as an array index.
  */
-#define YY_SC_TO_UI(c) ((unsigned int) (unsigned char) c)
+#define YY_SC_TO_UI(c) ((YY_CHAR) (c))
 
 /* Enter a start condition.  This macro really ought to take a parameter,
  * but we do it the disgusting crufty way forced on us by the ()-less
  * definition of BEGIN.
  */
 #define BEGIN (yy_start) = 1 + 2 *
-
 /* Translate the current start state into a value that can be later handed
  * to BEGIN to return to the state.  The YYSTATE alias is for lex
  * compatibility.
  */
 #define YY_START (((yy_start) - 1) / 2)
 #define YYSTATE YY_START
-
 /* Action number for EOF rule of a given start state. */
 #define YY_STATE_EOF(state) (YY_END_OF_BUFFER + state + 1)
-
 /* Special action meaning "start processing a new file". */
-#define YY_NEW_FILE gregorio_vowel_rulefile_restart(gregorio_vowel_rulefile_in  )
-
+#define YY_NEW_FILE yyrestart( yyin  )
 #define YY_END_OF_BUFFER_CHAR 0
 
 /* Size of default input buffer. */
@@ -186,14 +414,14 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t yy_size_t;
 #endif
 
-extern yy_size_t gregorio_vowel_rulefile_leng;
+extern int yyleng;
 
-extern FILE *gregorio_vowel_rulefile_in, *gregorio_vowel_rulefile_out;
+extern FILE *yyin, *yyout;
 
 #define EOB_ACT_CONTINUE_SCAN 0
 #define EOB_ACT_END_OF_FILE 1
 #define EOB_ACT_LAST_MATCH 2
-
+    
     #define YY_LESS_LINENO(n)
     #define YY_LINENO_REWIND_TO(ptr)
     
@@ -201,16 +429,15 @@ extern FILE *gregorio_vowel_rulefile_in, *gregorio_vowel_rulefile_out;
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up gregorio_vowel_rulefile_text. */ \
+		/* Undo effects of setting up yytext. */ \
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
 		*yy_cp = (yy_hold_char); \
 		YY_RESTORE_YY_MORE_OFFSET \
 		(yy_c_buf_p) = yy_cp = yy_bp + yyless_macro_arg - YY_MORE_ADJ; \
-		YY_DO_BEFORE_ACTION; /* set up gregorio_vowel_rulefile_text again */ \
+		YY_DO_BEFORE_ACTION; /* set up yytext again */ \
 		} \
 	while ( 0 )
-
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -225,12 +452,12 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	yy_size_t yy_buf_size;
+	int yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -253,7 +480,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -270,8 +497,8 @@ struct yy_buffer_state
 	 * possible backing-up.
 	 *
 	 * When we actually see the EOF, we change the status to "new"
-	 * (via gregorio_vowel_rulefile_restart()), so that the user can continue scanning by
-	 * just pointing gregorio_vowel_rulefile_in at a new input file.
+	 * (via yyrestart()), so that the user can continue scanning by
+	 * just pointing yyin at a new input file.
 	 */
 #define YY_BUFFER_EOF_PENDING 2
 
@@ -281,7 +508,7 @@ struct yy_buffer_state
 /* Stack of input buffers. */
 static size_t yy_buffer_stack_top = 0; /**< index of top of stack. */
 static size_t yy_buffer_stack_max = 0; /**< capacity of stack. */
-static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
+static YY_BUFFER_STATE * yy_buffer_stack = NULL; /**< Stack as an array. */
 
 /* We provide macros for accessing buffer states in case in the
  * future we want to put the buffer states in a more general
@@ -292,112 +519,101 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 #define YY_CURRENT_BUFFER ( (yy_buffer_stack) \
                           ? (yy_buffer_stack)[(yy_buffer_stack_top)] \
                           : NULL)
-
 /* Same as previous macro, but useful when we know that the buffer stack is not
  * NULL or when we need an lvalue. For internal use only.
  */
 #define YY_CURRENT_BUFFER_LVALUE (yy_buffer_stack)[(yy_buffer_stack_top)]
 
-/* yy_hold_char holds the character lost when gregorio_vowel_rulefile_text is formed. */
+/* yy_hold_char holds the character lost when yytext is formed. */
 static char yy_hold_char;
-static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
-yy_size_t gregorio_vowel_rulefile_leng;
+static int yy_n_chars;		/* number of characters read into yy_ch_buf */
+int yyleng;
 
 /* Points to current character in buffer. */
-static char *yy_c_buf_p = (char *) 0;
+static char *yy_c_buf_p = NULL;
 static int yy_init = 0;		/* whether we need to initialize */
 static int yy_start = 0;	/* start state number */
 
-/* Flag which is used to allow gregorio_vowel_rulefile_wrap()'s to do buffer switches
- * instead of setting up a fresh gregorio_vowel_rulefile_in.  A bit of a hack ...
+/* Flag which is used to allow yywrap()'s to do buffer switches
+ * instead of setting up a fresh yyin.  A bit of a hack ...
  */
 static int yy_did_buffer_switch_on_eof;
 
-void gregorio_vowel_rulefile_restart (FILE *input_file  );
-void gregorio_vowel_rulefile__switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE gregorio_vowel_rulefile__create_buffer (FILE *file,int size  );
-void gregorio_vowel_rulefile__delete_buffer (YY_BUFFER_STATE b  );
-void gregorio_vowel_rulefile__flush_buffer (YY_BUFFER_STATE b  );
-void gregorio_vowel_rulefile_push_buffer_state (YY_BUFFER_STATE new_buffer  );
-void gregorio_vowel_rulefile_pop_buffer_state (void );
+void yyrestart ( FILE *input_file  );
+void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
+void yy_delete_buffer ( YY_BUFFER_STATE b  );
+void yy_flush_buffer ( YY_BUFFER_STATE b  );
+void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state ( void );
 
-static void gregorio_vowel_rulefile_ensure_buffer_stack (void );
-static void gregorio_vowel_rulefile__load_buffer_state (void );
-static void gregorio_vowel_rulefile__init_buffer (YY_BUFFER_STATE b,FILE *file  );
+static void yyensure_buffer_stack ( void );
+static void yy_load_buffer_state ( void );
+static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file  );
+#define YY_FLUSH_BUFFER yy_flush_buffer( YY_CURRENT_BUFFER )
 
-#define YY_FLUSH_BUFFER gregorio_vowel_rulefile__flush_buffer(YY_CURRENT_BUFFER )
+YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string ( const char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len  );
 
-YY_BUFFER_STATE gregorio_vowel_rulefile__scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE gregorio_vowel_rulefile__scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE gregorio_vowel_rulefile__scan_bytes (yyconst char *bytes,yy_size_t len  );
-
-void *gregorio_vowel_rulefile_alloc (yy_size_t  );
-void *gregorio_vowel_rulefile_realloc (void *,yy_size_t  );
-void gregorio_vowel_rulefile_free (void *  );
-
-#define yy_new_buffer gregorio_vowel_rulefile__create_buffer
+void *yyalloc ( yy_size_t  );
+void *yyrealloc ( void *, yy_size_t  );
+void yyfree ( void *  );
 
+#define yy_new_buffer yy_create_buffer
 #define yy_set_interactive(is_interactive) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){ \
-        gregorio_vowel_rulefile_ensure_buffer_stack (); \
+        yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-            gregorio_vowel_rulefile__create_buffer(gregorio_vowel_rulefile_in,YY_BUF_SIZE ); \
+            yy_create_buffer( yyin, YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_is_interactive = is_interactive; \
 	}
-
 #define yy_set_bol(at_bol) \
 	{ \
 	if ( ! YY_CURRENT_BUFFER ){\
-        gregorio_vowel_rulefile_ensure_buffer_stack (); \
+        yyensure_buffer_stack (); \
 		YY_CURRENT_BUFFER_LVALUE =    \
-            gregorio_vowel_rulefile__create_buffer(gregorio_vowel_rulefile_in,YY_BUF_SIZE ); \
+            yy_create_buffer( yyin, YY_BUF_SIZE ); \
 	} \
 	YY_CURRENT_BUFFER_LVALUE->yy_at_bol = at_bol; \
 	}
-
 #define YY_AT_BOL() (YY_CURRENT_BUFFER_LVALUE->yy_at_bol)
 
 /* Begin user sect3 */
 
 #define gregorio_vowel_rulefile_wrap() (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
+typedef flex_uint8_t YY_CHAR;
 
-typedef unsigned char YY_CHAR;
-
-FILE *gregorio_vowel_rulefile_in = (FILE *) 0, *gregorio_vowel_rulefile_out = (FILE *) 0;
+FILE *yyin = NULL, *yyout = NULL;
 
 typedef int yy_state_type;
 
-extern int gregorio_vowel_rulefile_lineno;
-
-int gregorio_vowel_rulefile_lineno = 1;
+extern int yylineno;
+int yylineno = 1;
 
-extern char *gregorio_vowel_rulefile_text;
+extern char *yytext;
 #ifdef yytext_ptr
 #undef yytext_ptr
 #endif
-#define yytext_ptr gregorio_vowel_rulefile_text
+#define yytext_ptr yytext
 
-static yy_state_type yy_get_previous_state (void );
-static yy_state_type yy_try_NUL_trans (yy_state_type current_state  );
-static int yy_get_next_buffer (void );
-#if defined(__GNUC__) && __GNUC__ >= 3
-__attribute__((__noreturn__))
-#endif
-static void yy_fatal_error (yyconst char msg[]  );
+static yy_state_type yy_get_previous_state ( void );
+static yy_state_type yy_try_NUL_trans ( yy_state_type current_state  );
+static int yy_get_next_buffer ( void );
+static void yynoreturn yy_fatal_error ( const char* msg  );
 
 /* Done after the current pattern has been matched and before the
- * corresponding action - sets up gregorio_vowel_rulefile_text.
+ * corresponding action - sets up yytext.
  */
 #define YY_DO_BEFORE_ACTION \
 	(yytext_ptr) = yy_bp; \
-	gregorio_vowel_rulefile_leng = (size_t) (yy_cp - yy_bp); \
+	yyleng = (int) (yy_cp - yy_bp); \
 	(yy_hold_char) = *yy_cp; \
 	*yy_cp = '\0'; \
 	(yy_c_buf_p) = yy_cp;
-
 #define YY_NUM_RULES 17
 #define YY_END_OF_BUFFER 18
 /* This struct is not used in this scanner,
@@ -407,7 +623,7 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static yyconst flex_int32_t yy_accept[71] =
+static const flex_int32_t yy_accept[71] =
     {   0,
         0,    0,    0,    0,    0,    0,    0,    0,   18,   16,
        15,   15,   13,    7,   16,   16,   16,   16,   16,   16,
@@ -418,7 +634,7 @@ static yyconst flex_int32_t yy_accept[71] =
         0,    3,    0,    4,    0,    0,    1,    0,    5,    0
     } ;
 
-static yyconst YY_CHAR yy_ec[256] =
+static const YY_CHAR yy_ec[256] =
     {   0,
         1,    1,    1,    1,    1,    1,    1,    1,    2,    3,
         2,    2,    4,    1,    1,    1,    1,    1,    1,    1,
@@ -450,7 +666,7 @@ static yyconst YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static yyconst YY_CHAR yy_meta[32] =
+static const YY_CHAR yy_meta[32] =
     {   0,
         1,    2,    3,    3,    2,    2,    2,    1,    4,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
@@ -458,7 +674,7 @@ static yyconst YY_CHAR yy_meta[32] =
         1
     } ;
 
-static yyconst flex_uint32_t yy_base[78] =
+static const flex_int32_t yy_base[78] =
     {   0,
         0,   30,   60,   66,   72,    0,   94,  102,   92,  139,
       139,  139,    0,  139,   74,   80,   68,    0,   69,   58,
@@ -470,7 +686,7 @@ static yyconst flex_uint32_t yy_base[78] =
       111,  115,  119,  123,  127,  131,  134
     } ;
 
-static yyconst flex_int32_t yy_def[78] =
+static const flex_int32_t yy_def[78] =
     {   0,
        71,   71,   72,   72,   71,    5,   73,   73,   70,   70,
        70,   70,   74,   70,   70,   70,   70,   70,   70,   70,
@@ -482,7 +698,7 @@ static yyconst flex_int32_t yy_def[78] =
        70,   70,   70,   70,   70,   70,   70
     } ;
 
-static yyconst flex_uint32_t yy_nxt[171] =
+static const flex_int32_t yy_nxt[171] =
     {   0,
        70,   11,   12,   11,   13,   70,   14,   40,   40,   15,
        70,   70,   34,   30,   40,   40,   16,   70,   70,   17,
@@ -504,7 +720,7 @@ static yyconst flex_uint32_t yy_nxt[171] =
        70,   70,   70,   70,   70,   70,   70,   70,   70,   70
     } ;
 
-static yyconst flex_int32_t yy_chk[171] =
+static const flex_int32_t yy_chk[171] =
     {   0,
         0,    1,    1,    1,    1,    0,    1,   27,   27,    1,
         0,    0,   18,   27,   41,   41,    1,    0,    0,    1,
@@ -529,8 +745,8 @@ static yyconst flex_int32_t yy_chk[171] =
 static yy_state_type yy_last_accepting_state;
 static char *yy_last_accepting_cpos;
 
-extern int gregorio_vowel_rulefile__flex_debug;
-int gregorio_vowel_rulefile__flex_debug = 0;
+extern int yy_flex_debug;
+int yy_flex_debug = 0;
 
 /* The intent behind this definition is that it'll catch
  * any uses of REJECT which flex missed.
@@ -539,7 +755,7 @@ int gregorio_vowel_rulefile__flex_debug = 0;
 #define yymore() yymore_used_but_not_detected
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
-char *gregorio_vowel_rulefile_text;
+char *yytext;
 #line 1 "vowel/vowel-rules.l"
 #line 2 "vowel/vowel-rules.l"
 /*
@@ -594,10 +810,9 @@ static __inline void invalid(void)
             _("invalid character in vowel file: %c"),
             *gregorio_vowel_rulefile_text);
 }
+#line 813 "vowel/vowel-rules-l.c"
 
-
-
-#line 601 "vowel/vowel-rules-l.c"
+#line 815 "vowel/vowel-rules-l.c"
 
 #define INITIAL 0
 #define chars 1
@@ -616,36 +831,36 @@ static __inline void invalid(void)
 #define YY_EXTRA_TYPE void *
 #endif
 
-static int yy_init_globals (void );
+static int yy_init_globals ( void );
 
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int gregorio_vowel_rulefile_lex_destroy (void );
+int yylex_destroy ( void );
 
-int gregorio_vowel_rulefile_get_debug (void );
+int yyget_debug ( void );
 
-void gregorio_vowel_rulefile_set_debug (int debug_flag  );
+void yyset_debug ( int debug_flag  );
 
-YY_EXTRA_TYPE gregorio_vowel_rulefile_get_extra (void );
+YY_EXTRA_TYPE yyget_extra ( void );
 
-void gregorio_vowel_rulefile_set_extra (YY_EXTRA_TYPE user_defined  );
+void yyset_extra ( YY_EXTRA_TYPE user_defined  );
 
-FILE *gregorio_vowel_rulefile_get_in (void );
+FILE *yyget_in ( void );
 
-void gregorio_vowel_rulefile_set_in  (FILE * _in_str  );
+void yyset_in  ( FILE * _in_str  );
 
-FILE *gregorio_vowel_rulefile_get_out (void );
+FILE *yyget_out ( void );
 
-void gregorio_vowel_rulefile_set_out  (FILE * _out_str  );
+void yyset_out  ( FILE * _out_str  );
 
-yy_size_t gregorio_vowel_rulefile_get_leng (void );
+			int yyget_leng ( void );
 
-char *gregorio_vowel_rulefile_get_text (void );
+char *yyget_text ( void );
 
-int gregorio_vowel_rulefile_get_lineno (void );
+int yyget_lineno ( void );
 
-void gregorio_vowel_rulefile_set_lineno (int _line_number  );
+void yyset_lineno ( int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -653,9 +868,9 @@ void gregorio_vowel_rulefile_set_lineno (int _line_number  );
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int gregorio_vowel_rulefile_wrap (void );
+extern "C" int yywrap ( void );
 #else
-extern int gregorio_vowel_rulefile_wrap (void );
+extern int yywrap ( void );
 #endif
 #endif
 
@@ -664,19 +879,18 @@ extern int gregorio_vowel_rulefile_wrap (void );
 #endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy ( char *, const char *, int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen ( const char * );
 #endif
 
 #ifndef YY_NO_INPUT
-
 #ifdef __cplusplus
-static int yyinput (void );
+static int yyinput ( void );
 #else
-static int input (void );
+static int input ( void );
 #endif
 
 #endif
@@ -700,7 +914,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO do { if (fwrite( gregorio_vowel_rulefile_text, gregorio_vowel_rulefile_leng, 1, gregorio_vowel_rulefile_out )) {} } while (0)
+#define ECHO do { if (fwrite( yytext, (size_t) yyleng, 1, yyout )) {} } while (0)
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -711,20 +925,20 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		size_t n; \
+		int n; \
 		for ( n = 0; n < max_size && \
-			     (c = getc( gregorio_vowel_rulefile_in )) != EOF && c != '\n'; ++n ) \
+			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
 		if ( c == '\n' ) \
 			buf[n++] = (char) c; \
-		if ( c == EOF && ferror( gregorio_vowel_rulefile_in ) ) \
+		if ( c == EOF && ferror( yyin ) ) \
 			YY_FATAL_ERROR( "input in flex scanner failed" ); \
 		result = n; \
 		} \
 	else \
 		{ \
 		errno=0; \
-		while ( (result = fread(buf, 1, max_size, gregorio_vowel_rulefile_in))==0 && ferror(gregorio_vowel_rulefile_in)) \
+		while ( (result = (int) fread(buf, 1, (yy_size_t) max_size, yyin)) == 0 && ferror(yyin)) \
 			{ \
 			if( errno != EINTR) \
 				{ \
@@ -732,7 +946,7 @@ static int input (void );
 				break; \
 				} \
 			errno=0; \
-			clearerr(gregorio_vowel_rulefile_in); \
+			clearerr(yyin); \
 			} \
 		}\
 \
@@ -765,12 +979,12 @@ static int input (void );
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int gregorio_vowel_rulefile_lex (void);
+extern int yylex (void);
 
-#define YY_DECL int gregorio_vowel_rulefile_lex (void)
+#define YY_DECL int yylex (void)
 #endif /* !YY_DECL */
 
-/* Code executed at the beginning of each rule, after gregorio_vowel_rulefile_text and gregorio_vowel_rulefile_leng
+/* Code executed at the beginning of each rule, after yytext and yyleng
  * have been set up.
  */
 #ifndef YY_USER_ACTION
@@ -804,32 +1018,32 @@ YY_DECL
 		if ( ! (yy_start) )
 			(yy_start) = 1;	/* first start state */
 
-		if ( ! gregorio_vowel_rulefile_in )
-			gregorio_vowel_rulefile_in = stdin;
+		if ( ! yyin )
+			yyin = stdin;
 
-		if ( ! gregorio_vowel_rulefile_out )
-			gregorio_vowel_rulefile_out = stdout;
+		if ( ! yyout )
+			yyout = stdout;
 
 		if ( ! YY_CURRENT_BUFFER ) {
-			gregorio_vowel_rulefile_ensure_buffer_stack ();
+			yyensure_buffer_stack ();
 			YY_CURRENT_BUFFER_LVALUE =
-				gregorio_vowel_rulefile__create_buffer(gregorio_vowel_rulefile_in,YY_BUF_SIZE );
+				yy_create_buffer( yyin, YY_BUF_SIZE );
 		}
 
-		gregorio_vowel_rulefile__load_buffer_state( );
+		yy_load_buffer_state(  );
 		}
 
 	{
 #line 75 "vowel/vowel-rules.l"
 
 
-#line 827 "vowel/vowel-rules-l.c"
+#line 1040 "vowel/vowel-rules-l.c"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
 
-		/* Support of gregorio_vowel_rulefile_text. */
+		/* Support of yytext. */
 		*yy_cp = (yy_hold_char);
 
 		/* yy_bp points to the position in yy_ch_buf of the start of
@@ -851,9 +1065,9 @@ yy_match:
 				{
 				yy_current_state = (int) yy_def[yy_current_state];
 				if ( yy_current_state >= 71 )
-					yy_c = yy_meta[(unsigned int) yy_c];
+					yy_c = yy_meta[yy_c];
 				}
-			yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
 		while ( yy_base[yy_current_state] != 139 );
@@ -967,7 +1181,7 @@ YY_RULE_SETUP
 #line 94 "vowel/vowel-rules.l"
 ECHO;
 	YY_BREAK
-#line 971 "vowel/vowel-rules-l.c"
+#line 1184 "vowel/vowel-rules-l.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(chars):
 case YY_STATE_EOF(lang):
@@ -987,15 +1201,15 @@ case YY_STATE_EOF(langname):
 			{
 			/* We're scanning a new file or input source.  It's
 			 * possible that this happened because the user
-			 * just pointed gregorio_vowel_rulefile_in at a new source and called
-			 * gregorio_vowel_rulefile_lex().  If so, then we have to assure
+			 * just pointed yyin at a new source and called
+			 * yylex().  If so, then we have to assure
 			 * consistency between YY_CURRENT_BUFFER and our
 			 * globals.  Here is the right place to do so, because
 			 * this is the first action (other than possibly a
 			 * back-up) that will match for the new input source.
 			 */
 			(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
-			YY_CURRENT_BUFFER_LVALUE->yy_input_file = gregorio_vowel_rulefile_in;
+			YY_CURRENT_BUFFER_LVALUE->yy_input_file = yyin;
 			YY_CURRENT_BUFFER_LVALUE->yy_buffer_status = YY_BUFFER_NORMAL;
 			}
 
@@ -1048,11 +1262,11 @@ case YY_STATE_EOF(langname):
 				{
 				(yy_did_buffer_switch_on_eof) = 0;
 
-				if ( gregorio_vowel_rulefile_wrap( ) )
+				if ( yywrap(  ) )
 					{
 					/* Note: because we've taken care in
 					 * yy_get_next_buffer() to have set up
-					 * gregorio_vowel_rulefile_text, we can now set up
+					 * yytext, we can now set up
 					 * yy_c_buf_p so that if some total
 					 * hoser (like flex itself) wants to
 					 * call the scanner after we return the
@@ -1102,7 +1316,7 @@ case YY_STATE_EOF(langname):
 	} /* end of action switch */
 		} /* end of scanning one token */
 	} /* end of user's declarations */
-} /* end of gregorio_vowel_rulefile_lex */
+} /* end of yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
  *
@@ -1115,7 +1329,7 @@ static int yy_get_next_buffer (void)
 {
     	char *dest = YY_CURRENT_BUFFER_LVALUE->yy_ch_buf;
 	char *source = (yytext_ptr);
-	yy_size_t number_to_move, i;
+	int number_to_move, i;
 	int ret_val;
 
 	if ( (yy_c_buf_p) > &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] )
@@ -1144,7 +1358,7 @@ static int yy_get_next_buffer (void)
 	/* Try to read more data. */
 
 	/* First move last chars to start of buffer. */
-	number_to_move = (yy_size_t) ((yy_c_buf_p) - (yytext_ptr)) - 1;
+	number_to_move = (int) ((yy_c_buf_p) - (yytext_ptr) - 1);
 
 	for ( i = 0; i < number_to_move; ++i )
 		*(dest++) = *(source++);
@@ -1157,7 +1371,7 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			yy_size_t num_to_read =
+			int num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -1171,7 +1385,7 @@ static int yy_get_next_buffer (void)
 
 			if ( b->yy_is_our_buffer )
 				{
-				yy_size_t new_size = b->yy_buf_size * 2;
+				int new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -1180,11 +1394,12 @@ static int yy_get_next_buffer (void)
 
 				b->yy_ch_buf = (char *)
 					/* Include room in for 2 EOB chars. */
-					gregorio_vowel_rulefile_realloc((void *) b->yy_ch_buf,b->yy_buf_size + 2  );
+					yyrealloc( (void *) b->yy_ch_buf,
+							 (yy_size_t) (b->yy_buf_size + 2)  );
 				}
 			else
 				/* Can't grow it, we don't own it. */
-				b->yy_ch_buf = 0;
+				b->yy_ch_buf = NULL;
 
 			if ( ! b->yy_ch_buf )
 				YY_FATAL_ERROR(
@@ -1212,7 +1427,7 @@ static int yy_get_next_buffer (void)
 		if ( number_to_move == YY_MORE_ADJ )
 			{
 			ret_val = EOB_ACT_END_OF_FILE;
-			gregorio_vowel_rulefile_restart(gregorio_vowel_rulefile_in  );
+			yyrestart( yyin  );
 			}
 
 		else
@@ -1226,12 +1441,15 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
-	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+	if (((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
 		/* Extend the array by 50%, plus the number we really need. */
-		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
-		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) gregorio_vowel_rulefile_realloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		int new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) yyrealloc(
+			(void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf, (yy_size_t) new_size  );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
 			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+		/* "- 2" to take care of EOB's */
+		YY_CURRENT_BUFFER_LVALUE->yy_buf_size = (int) (new_size - 2);
 	}
 
 	(yy_n_chars) += number_to_move;
@@ -1264,9 +1482,9 @@ static int yy_get_next_buffer (void)
 			{
 			yy_current_state = (int) yy_def[yy_current_state];
 			if ( yy_current_state >= 71 )
-				yy_c = yy_meta[(unsigned int) yy_c];
+				yy_c = yy_meta[yy_c];
 			}
-		yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 		}
 
 	return yy_current_state;
@@ -1292,9 +1510,9 @@ static int yy_get_next_buffer (void)
 		{
 		yy_current_state = (int) yy_def[yy_current_state];
 		if ( yy_current_state >= 71 )
-			yy_c = yy_meta[(unsigned int) yy_c];
+			yy_c = yy_meta[yy_c];
 		}
-	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
+	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 	yy_is_jam = (yy_current_state == 70);
 
 		return yy_is_jam ? 0 : yy_current_state;
@@ -1328,7 +1546,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
+			int offset = (int) ((yy_c_buf_p) - (yytext_ptr));
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -1345,14 +1563,14 @@ static int yy_get_next_buffer (void)
 					 */
 
 					/* Reset buffer status. */
-					gregorio_vowel_rulefile_restart(gregorio_vowel_rulefile_in );
+					yyrestart( yyin );
 
 					/*FALLTHROUGH*/
 
 				case EOB_ACT_END_OF_FILE:
 					{
-					if ( gregorio_vowel_rulefile_wrap( ) )
-						return EOF;
+					if ( yywrap(  ) )
+						return 0;
 
 					if ( ! (yy_did_buffer_switch_on_eof) )
 						YY_NEW_FILE;
@@ -1371,7 +1589,7 @@ static int yy_get_next_buffer (void)
 		}
 
 	c = *(unsigned char *) (yy_c_buf_p);	/* cast for 8-bit char's */
-	*(yy_c_buf_p) = '\0';	/* preserve gregorio_vowel_rulefile_text */
+	*(yy_c_buf_p) = '\0';	/* preserve yytext */
 	(yy_hold_char) = *++(yy_c_buf_p);
 
 	return c;
@@ -1383,32 +1601,32 @@ static int yy_get_next_buffer (void)
  * 
  * @note This function does not reset the start condition to @c INITIAL .
  */
-    void gregorio_vowel_rulefile_restart  (FILE * input_file )
+    void yyrestart  (FILE * input_file )
 {
     
 	if ( ! YY_CURRENT_BUFFER ){
-        gregorio_vowel_rulefile_ensure_buffer_stack ();
+        yyensure_buffer_stack ();
 		YY_CURRENT_BUFFER_LVALUE =
-            gregorio_vowel_rulefile__create_buffer(gregorio_vowel_rulefile_in,YY_BUF_SIZE );
+            yy_create_buffer( yyin, YY_BUF_SIZE );
 	}
 
-	gregorio_vowel_rulefile__init_buffer(YY_CURRENT_BUFFER,input_file );
-	gregorio_vowel_rulefile__load_buffer_state( );
+	yy_init_buffer( YY_CURRENT_BUFFER, input_file );
+	yy_load_buffer_state(  );
 }
 
 /** Switch to a different input buffer.
  * @param new_buffer The new input buffer.
  * 
  */
-    void gregorio_vowel_rulefile__switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
+    void yy_switch_to_buffer  (YY_BUFFER_STATE  new_buffer )
 {
     
 	/* TODO. We should be able to replace this entire function body
 	 * with
-	 *		gregorio_vowel_rulefile_pop_buffer_state();
-	 *		gregorio_vowel_rulefile_push_buffer_state(new_buffer);
+	 *		yypop_buffer_state();
+	 *		yypush_buffer_state(new_buffer);
      */
-	gregorio_vowel_rulefile_ensure_buffer_stack ();
+	yyensure_buffer_stack ();
 	if ( YY_CURRENT_BUFFER == new_buffer )
 		return;
 
@@ -1421,21 +1639,21 @@ static int yy_get_next_buffer (void)
 		}
 
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
-	gregorio_vowel_rulefile__load_buffer_state( );
+	yy_load_buffer_state(  );
 
 	/* We don't actually know whether we did this switch during
-	 * EOF (gregorio_vowel_rulefile_wrap()) processing, but the only time this flag
-	 * is looked at is after gregorio_vowel_rulefile_wrap() is called, so it's safe
+	 * EOF (yywrap()) processing, but the only time this flag
+	 * is looked at is after yywrap() is called, so it's safe
 	 * to go ahead and always set it.
 	 */
 	(yy_did_buffer_switch_on_eof) = 1;
 }
 
-static void gregorio_vowel_rulefile__load_buffer_state  (void)
+static void yy_load_buffer_state  (void)
 {
     	(yy_n_chars) = YY_CURRENT_BUFFER_LVALUE->yy_n_chars;
 	(yytext_ptr) = (yy_c_buf_p) = YY_CURRENT_BUFFER_LVALUE->yy_buf_pos;
-	gregorio_vowel_rulefile_in = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
+	yyin = YY_CURRENT_BUFFER_LVALUE->yy_input_file;
 	(yy_hold_char) = *(yy_c_buf_p);
 }
 
@@ -1445,35 +1663,35 @@ static void gregorio_vowel_rulefile__load_buffer_state  (void)
  * 
  * @return the allocated buffer state.
  */
-    YY_BUFFER_STATE gregorio_vowel_rulefile__create_buffer  (FILE * file, int  size )
+    YY_BUFFER_STATE yy_create_buffer  (FILE * file, int  size )
 {
 	YY_BUFFER_STATE b;
     
-	b = (YY_BUFFER_STATE) gregorio_vowel_rulefile_alloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in gregorio_vowel_rulefile__create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
-	b->yy_buf_size = (yy_size_t)size;
+	b->yy_buf_size = size;
 
 	/* yy_ch_buf has to be 2 characters longer than the size given because
 	 * we need to put in 2 end-of-buffer characters.
 	 */
-	b->yy_ch_buf = (char *) gregorio_vowel_rulefile_alloc(b->yy_buf_size + 2  );
+	b->yy_ch_buf = (char *) yyalloc( (yy_size_t) (b->yy_buf_size + 2)  );
 	if ( ! b->yy_ch_buf )
-		YY_FATAL_ERROR( "out of dynamic memory in gregorio_vowel_rulefile__create_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_create_buffer()" );
 
 	b->yy_is_our_buffer = 1;
 
-	gregorio_vowel_rulefile__init_buffer(b,file );
+	yy_init_buffer( b, file );
 
 	return b;
 }
 
 /** Destroy the buffer.
- * @param b a buffer created with gregorio_vowel_rulefile__create_buffer()
+ * @param b a buffer created with yy_create_buffer()
  * 
  */
-    void gregorio_vowel_rulefile__delete_buffer (YY_BUFFER_STATE  b )
+    void yy_delete_buffer (YY_BUFFER_STATE  b )
 {
     
 	if ( ! b )
@@ -1483,27 +1701,27 @@ static void gregorio_vowel_rulefile__load_buffer_state  (void)
 		YY_CURRENT_BUFFER_LVALUE = (YY_BUFFER_STATE) 0;
 
 	if ( b->yy_is_our_buffer )
-		gregorio_vowel_rulefile_free((void *) b->yy_ch_buf  );
+		yyfree( (void *) b->yy_ch_buf  );
 
-	gregorio_vowel_rulefile_free((void *) b  );
+	yyfree( (void *) b  );
 }
 
 /* Initializes or reinitializes a buffer.
  * This function is sometimes called more than once on the same buffer,
- * such as during a gregorio_vowel_rulefile_restart() or at EOF.
+ * such as during a yyrestart() or at EOF.
  */
-    static void gregorio_vowel_rulefile__init_buffer  (YY_BUFFER_STATE  b, FILE * file )
+    static void yy_init_buffer  (YY_BUFFER_STATE  b, FILE * file )
 
 {
 	int oerrno = errno;
     
-	gregorio_vowel_rulefile__flush_buffer(b );
+	yy_flush_buffer( b );
 
 	b->yy_input_file = file;
 	b->yy_fill_buffer = 1;
 
-    /* If b is the current buffer, then gregorio_vowel_rulefile__init_buffer was _probably_
-     * called from gregorio_vowel_rulefile_restart() or through yy_get_next_buffer.
+    /* If b is the current buffer, then yy_init_buffer was _probably_
+     * called from yyrestart() or through yy_get_next_buffer.
      * In that case, we don't want to reset the lineno or column.
      */
     if (b != YY_CURRENT_BUFFER){
@@ -1520,7 +1738,7 @@ static void gregorio_vowel_rulefile__load_buffer_state  (void)
  * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER.
  * 
  */
-    void gregorio_vowel_rulefile__flush_buffer (YY_BUFFER_STATE  b )
+    void yy_flush_buffer (YY_BUFFER_STATE  b )
 {
     	if ( ! b )
 		return;
@@ -1540,7 +1758,7 @@ static void gregorio_vowel_rulefile__load_buffer_state  (void)
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
 	if ( b == YY_CURRENT_BUFFER )
-		gregorio_vowel_rulefile__load_buffer_state( );
+		yy_load_buffer_state(  );
 }
 
 /** Pushes the new state onto the stack. The new state becomes
@@ -1549,14 +1767,14 @@ static void gregorio_vowel_rulefile__load_buffer_state  (void)
  *  @param new_buffer The new state.
  *  
  */
-void gregorio_vowel_rulefile_push_buffer_state (YY_BUFFER_STATE new_buffer )
+void yypush_buffer_state (YY_BUFFER_STATE new_buffer )
 {
     	if (new_buffer == NULL)
 		return;
 
-	gregorio_vowel_rulefile_ensure_buffer_stack();
+	yyensure_buffer_stack();
 
-	/* This block is copied from gregorio_vowel_rulefile__switch_to_buffer. */
+	/* This block is copied from yy_switch_to_buffer. */
 	if ( YY_CURRENT_BUFFER )
 		{
 		/* Flush out information for old buffer. */
@@ -1570,8 +1788,8 @@ void gregorio_vowel_rulefile_push_buffer_state (YY_BUFFER_STATE new_buffer )
 		(yy_buffer_stack_top)++;
 	YY_CURRENT_BUFFER_LVALUE = new_buffer;
 
-	/* copied from gregorio_vowel_rulefile__switch_to_buffer. */
-	gregorio_vowel_rulefile__load_buffer_state( );
+	/* copied from yy_switch_to_buffer. */
+	yy_load_buffer_state(  );
 	(yy_did_buffer_switch_on_eof) = 1;
 }
 
@@ -1579,18 +1797,18 @@ void gregorio_vowel_rulefile_push_buffer_state (YY_BUFFER_STATE new_buffer )
  *  The next element becomes the new top.
  *  
  */
-void gregorio_vowel_rulefile_pop_buffer_state (void)
+void yypop_buffer_state (void)
 {
     	if (!YY_CURRENT_BUFFER)
 		return;
 
-	gregorio_vowel_rulefile__delete_buffer(YY_CURRENT_BUFFER );
+	yy_delete_buffer(YY_CURRENT_BUFFER );
 	YY_CURRENT_BUFFER_LVALUE = NULL;
 	if ((yy_buffer_stack_top) > 0)
 		--(yy_buffer_stack_top);
 
 	if (YY_CURRENT_BUFFER) {
-		gregorio_vowel_rulefile__load_buffer_state( );
+		yy_load_buffer_state(  );
 		(yy_did_buffer_switch_on_eof) = 1;
 	}
 }
@@ -1598,7 +1816,7 @@ void gregorio_vowel_rulefile_pop_buffer_state (void)
 /* Allocates the stack if it does not exist.
  *  Guarantees space for at least one push.
  */
-static void gregorio_vowel_rulefile_ensure_buffer_stack (void)
+static void yyensure_buffer_stack (void)
 {
 	yy_size_t num_to_alloc;
     
@@ -1608,15 +1826,15 @@ static void gregorio_vowel_rulefile_ensure_buffer_stack (void)
 		 * scanner will even need a stack. We use 2 instead of 1 to avoid an
 		 * immediate realloc on the next call.
          */
-		num_to_alloc = 1; // After all that talk, this was set to 1 anyways...
-		(yy_buffer_stack) = (struct yy_buffer_state**)gregorio_vowel_rulefile_alloc
+      num_to_alloc = 1; /* After all that talk, this was set to 1 anyways... */
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in gregorio_vowel_rulefile_ensure_buffer_stack()" );
-								  
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
+
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
-				
+
 		(yy_buffer_stack_max) = num_to_alloc;
 		(yy_buffer_stack_top) = 0;
 		return;
@@ -1628,12 +1846,12 @@ static void gregorio_vowel_rulefile_ensure_buffer_stack (void)
 		yy_size_t grow_size = 8 /* arbitrary grow size */;
 
 		num_to_alloc = (yy_buffer_stack_max) + grow_size;
-		(yy_buffer_stack) = (struct yy_buffer_state**)gregorio_vowel_rulefile_realloc
+		(yy_buffer_stack) = (struct yy_buffer_state**)yyrealloc
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
 		if ( ! (yy_buffer_stack) )
-			YY_FATAL_ERROR( "out of dynamic memory in gregorio_vowel_rulefile_ensure_buffer_stack()" );
+			YY_FATAL_ERROR( "out of dynamic memory in yyensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -1645,9 +1863,9 @@ static void gregorio_vowel_rulefile_ensure_buffer_stack (void)
  * @param base the character buffer
  * @param size the size in bytes of the character buffer
  * 
- * @return the newly allocated buffer state object. 
+ * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE gregorio_vowel_rulefile__scan_buffer  (char * base, yy_size_t  size )
+YY_BUFFER_STATE yy_scan_buffer  (char * base, yy_size_t  size )
 {
 	YY_BUFFER_STATE b;
     
@@ -1655,69 +1873,69 @@ YY_BUFFER_STATE gregorio_vowel_rulefile__scan_buffer  (char * base, yy_size_t  s
 	     base[size-2] != YY_END_OF_BUFFER_CHAR ||
 	     base[size-1] != YY_END_OF_BUFFER_CHAR )
 		/* They forgot to leave room for the EOB's. */
-		return 0;
+		return NULL;
 
-	b = (YY_BUFFER_STATE) gregorio_vowel_rulefile_alloc(sizeof( struct yy_buffer_state )  );
+	b = (YY_BUFFER_STATE) yyalloc( sizeof( struct yy_buffer_state )  );
 	if ( ! b )
-		YY_FATAL_ERROR( "out of dynamic memory in gregorio_vowel_rulefile__scan_buffer()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_buffer()" );
 
-	b->yy_buf_size = size - 2;	/* "- 2" to take care of EOB's */
+	b->yy_buf_size = (int) (size - 2);	/* "- 2" to take care of EOB's */
 	b->yy_buf_pos = b->yy_ch_buf = base;
 	b->yy_is_our_buffer = 0;
-	b->yy_input_file = 0;
+	b->yy_input_file = NULL;
 	b->yy_n_chars = b->yy_buf_size;
 	b->yy_is_interactive = 0;
 	b->yy_at_bol = 1;
 	b->yy_fill_buffer = 0;
 	b->yy_buffer_status = YY_BUFFER_NEW;
 
-	gregorio_vowel_rulefile__switch_to_buffer(b  );
+	yy_switch_to_buffer( b  );
 
 	return b;
 }
 
-/** Setup the input buffer state to scan a string. The next call to gregorio_vowel_rulefile_lex() will
+/** Setup the input buffer state to scan a string. The next call to yylex() will
  * scan from a @e copy of @a str.
  * @param yystr a NUL-terminated string to scan
  * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
- *       gregorio_vowel_rulefile__scan_bytes() instead.
+ *       yy_scan_bytes() instead.
  */
-YY_BUFFER_STATE gregorio_vowel_rulefile__scan_string (yyconst char * yystr )
+YY_BUFFER_STATE yy_scan_string (const char * yystr )
 {
     
-	return gregorio_vowel_rulefile__scan_bytes(yystr,strlen(yystr) );
+	return yy_scan_bytes( yystr, (int) strlen(yystr) );
 }
 
-/** Setup the input buffer state to scan the given bytes. The next call to gregorio_vowel_rulefile_lex() will
+/** Setup the input buffer state to scan the given bytes. The next call to yylex() will
  * scan from a @e copy of @a bytes.
  * @param yybytes the byte buffer to scan
  * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE gregorio_vowel_rulefile__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
+YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	yy_size_t i;
+	int i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
-	n = _yybytes_len + 2;
-	buf = (char *) gregorio_vowel_rulefile_alloc(n  );
+	n = (yy_size_t) (_yybytes_len + 2);
+	buf = (char *) yyalloc( n  );
 	if ( ! buf )
-		YY_FATAL_ERROR( "out of dynamic memory in gregorio_vowel_rulefile__scan_bytes()" );
+		YY_FATAL_ERROR( "out of dynamic memory in yy_scan_bytes()" );
 
 	for ( i = 0; i < _yybytes_len; ++i )
 		buf[i] = yybytes[i];
 
 	buf[_yybytes_len] = buf[_yybytes_len+1] = YY_END_OF_BUFFER_CHAR;
 
-	b = gregorio_vowel_rulefile__scan_buffer(buf,n );
+	b = yy_scan_buffer( buf, n );
 	if ( ! b )
-		YY_FATAL_ERROR( "bad buffer in gregorio_vowel_rulefile__scan_bytes()" );
+		YY_FATAL_ERROR( "bad buffer in yy_scan_bytes()" );
 
 	/* It's okay to grow etc. this buffer, and we should throw it
 	 * away when we're done.
@@ -1731,9 +1949,9 @@ YY_BUFFER_STATE gregorio_vowel_rulefile__scan_bytes  (yyconst char * yybytes, yy
 #define YY_EXIT_FAILURE 2
 #endif
 
-static void yy_fatal_error (yyconst char* msg )
+static void yynoreturn yy_fatal_error (const char* msg )
 {
-			(void) fprintf( stderr, "%s\n", msg );
+			fprintf( stderr, "%s\n", msg );
 	exit( YY_EXIT_FAILURE );
 }
 
@@ -1743,14 +1961,14 @@ static void yy_fatal_error (yyconst char* msg )
 #define yyless(n) \
 	do \
 		{ \
-		/* Undo effects of setting up gregorio_vowel_rulefile_text. */ \
+		/* Undo effects of setting up yytext. */ \
         int yyless_macro_arg = (n); \
         YY_LESS_LINENO(yyless_macro_arg);\
-		gregorio_vowel_rulefile_text[gregorio_vowel_rulefile_leng] = (yy_hold_char); \
-		(yy_c_buf_p) = gregorio_vowel_rulefile_text + yyless_macro_arg; \
+		yytext[yyleng] = (yy_hold_char); \
+		(yy_c_buf_p) = yytext + yyless_macro_arg; \
 		(yy_hold_char) = *(yy_c_buf_p); \
 		*(yy_c_buf_p) = '\0'; \
-		gregorio_vowel_rulefile_leng = yyless_macro_arg; \
+		yyleng = yyless_macro_arg; \
 		} \
 	while ( 0 )
 
@@ -1759,91 +1977,91 @@ static void yy_fatal_error (yyconst char* msg )
 /** Get the current line number.
  * 
  */
-int gregorio_vowel_rulefile_get_lineno  (void)
+int yyget_lineno  (void)
 {
-        
-    return gregorio_vowel_rulefile_lineno;
+    
+    return yylineno;
 }
 
 /** Get the input stream.
  * 
  */
-FILE *gregorio_vowel_rulefile_get_in  (void)
+FILE *yyget_in  (void)
 {
-        return gregorio_vowel_rulefile_in;
+        return yyin;
 }
 
 /** Get the output stream.
  * 
  */
-FILE *gregorio_vowel_rulefile_get_out  (void)
+FILE *yyget_out  (void)
 {
-        return gregorio_vowel_rulefile_out;
+        return yyout;
 }
 
 /** Get the length of the current token.
  * 
  */
-yy_size_t gregorio_vowel_rulefile_get_leng  (void)
+int yyget_leng  (void)
 {
-        return gregorio_vowel_rulefile_leng;
+        return yyleng;
 }
 
 /** Get the current token.
  * 
  */
 
-char *gregorio_vowel_rulefile_get_text  (void)
+char *yyget_text  (void)
 {
-        return gregorio_vowel_rulefile_text;
+        return yytext;
 }
 
 /** Set the current line number.
  * @param _line_number line number
  * 
  */
-void gregorio_vowel_rulefile_set_lineno (int  _line_number )
+void yyset_lineno (int  _line_number )
 {
     
-    gregorio_vowel_rulefile_lineno = _line_number;
+    yylineno = _line_number;
 }
 
 /** Set the input stream. This does not discard the current
  * input buffer.
  * @param _in_str A readable stream.
  * 
- * @see gregorio_vowel_rulefile__switch_to_buffer
+ * @see yy_switch_to_buffer
  */
-void gregorio_vowel_rulefile_set_in (FILE *  _in_str )
+void yyset_in (FILE *  _in_str )
 {
-        gregorio_vowel_rulefile_in = _in_str ;
+        yyin = _in_str ;
 }
 
-void gregorio_vowel_rulefile_set_out (FILE *  _out_str )
+void yyset_out (FILE *  _out_str )
 {
-        gregorio_vowel_rulefile_out = _out_str ;
+        yyout = _out_str ;
 }
 
-int gregorio_vowel_rulefile_get_debug  (void)
+int yyget_debug  (void)
 {
-        return gregorio_vowel_rulefile__flex_debug;
+        return yy_flex_debug;
 }
 
-void gregorio_vowel_rulefile_set_debug (int  _bdebug )
+void yyset_debug (int  _bdebug )
 {
-        gregorio_vowel_rulefile__flex_debug = _bdebug ;
+        yy_flex_debug = _bdebug ;
 }
 
 static int yy_init_globals (void)
 {
         /* Initialization is the same as for the non-reentrant scanner.
-     * This function is called from gregorio_vowel_rulefile_lex_destroy(), so don't allocate here.
+     * This function is called from yylex_destroy(), so don't allocate here.
      */
 
-    (yy_buffer_stack) = 0;
+    (yy_buffer_stack) = NULL;
     (yy_buffer_stack_top) = 0;
     (yy_buffer_stack_max) = 0;
-    (yy_c_buf_p) = (char *) 0;
+    (yy_c_buf_p) = NULL;
     (yy_init) = 0;
     (yy_start) = 0;
 
@@ -1853,40 +2071,40 @@ static int yy_init_globals (void)
 
 /* Defined in main.c */
 #ifdef YY_STDINIT
-    gregorio_vowel_rulefile_in = stdin;
-    gregorio_vowel_rulefile_out = stdout;
+    yyin = stdin;
+    yyout = stdout;
 #else
-    gregorio_vowel_rulefile_in = (FILE *) 0;
-    gregorio_vowel_rulefile_out = (FILE *) 0;
+    yyin = NULL;
+    yyout = NULL;
 #endif
 
     /* For future reference: Set errno on error, since we are called by
-     * gregorio_vowel_rulefile_lex_init()
+     * yylex_init()
      */
     return 0;
 }
 
-/* gregorio_vowel_rulefile_lex_destroy is for both reentrant and non-reentrant scanners. */
-int gregorio_vowel_rulefile_lex_destroy  (void)
+/* yylex_destroy is for both reentrant and non-reentrant scanners. */
+int yylex_destroy  (void)
 {
     
     /* Pop the buffer stack, destroying each element. */
 	while(YY_CURRENT_BUFFER){
-		gregorio_vowel_rulefile__delete_buffer(YY_CURRENT_BUFFER  );
+		yy_delete_buffer( YY_CURRENT_BUFFER  );
 		YY_CURRENT_BUFFER_LVALUE = NULL;
-		gregorio_vowel_rulefile_pop_buffer_state();
+		yypop_buffer_state();
 	}
 
 	/* Destroy the stack itself. */
-	gregorio_vowel_rulefile_free((yy_buffer_stack) );
+	yyfree((yy_buffer_stack) );
 	(yy_buffer_stack) = NULL;
 
     /* Destroy the start condition stack. */
-        gregorio_vowel_rulefile_free((yy_start_stack)  );
+        yyfree( (yy_start_stack)  );
         (yy_start_stack) = NULL;
 
     /* Reset the globals. This is important in a non-reentrant scanner so the next time
-     * gregorio_vowel_rulefile_lex() is called, initialization will occur. */
+     * yylex() is called, initialization will occur. */
     yy_init_globals( );
 
     return 0;
@@ -1897,7 +2115,7 @@ int gregorio_vowel_rulefile_lex_destroy  (void)
  */
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
+static void yy_flex_strncpy (char* s1, const char * s2, int n )
 {
 		
 	int i;
@@ -1907,7 +2125,7 @@ static void yy_flex_strncpy (char* s1, yyconst char * s2, int n )
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * s )
+static int yy_flex_strlen (const char * s )
 {
 	int n;
 	for ( n = 0; s[n]; ++n )
@@ -1917,12 +2135,12 @@ static int yy_flex_strlen (yyconst char * s )
 }
 #endif
 
-void *gregorio_vowel_rulefile_alloc (yy_size_t  size )
+void *yyalloc (yy_size_t  size )
 {
-			return (void *) malloc( size );
+			return malloc(size);
 }
 
-void *gregorio_vowel_rulefile_realloc  (void * ptr, yy_size_t  size )
+void *yyrealloc  (void * ptr, yy_size_t  size )
 {
 		
 	/* The cast to (char *) in the following accommodates both
@@ -1932,12 +2150,12 @@ void *gregorio_vowel_rulefile_realloc  (void * ptr, yy_size_t  size )
 	 * any pointer type to void*, and deal with argument conversions
 	 * as though doing an assignment.
 	 */
-	return (void *) realloc( (char *) ptr, size );
+	return realloc(ptr, size);
 }
 
-void gregorio_vowel_rulefile_free (void * ptr )
+void yyfree (void * ptr )
 {
-			free( (char *) ptr );	/* see gregorio_vowel_rulefile_realloc() for (char *) cast */
+			free( (char *) ptr );	/* see yyrealloc() for (char *) cast */
 }
 
 #define YYTABLES_NAME "yytables"
@@ -1946,4 +2164,3 @@ void gregorio_vowel_rulefile_free (void * ptr )
 
 
 
-
diff --git a/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h
index 1fd571a88f1..cecacf9603c 100644
--- a/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h
+++ b/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h
@@ -2,9 +2,9 @@
 #define gregorio_vowel_rulefile_HEADER_H 1
 #define gregorio_vowel_rulefile_IN_HEADER 1
 
-#line 6 "vowel/vowel-rules-l.h"
+#line 5 "vowel/vowel-rules-l.h"
 
-#line 8 "vowel/vowel-rules-l.h"
+#line 7 "vowel/vowel-rules-l.h"
 
 #define  YY_INT_ALIGNED long int
 
@@ -13,11 +13,245 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 6
-#define YY_FLEX_SUBMINOR_VERSION 0
+#define YY_FLEX_SUBMINOR_VERSION 4
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
 
+#ifdef yy_create_buffer
+#define gregorio_vowel_rulefile__create_buffer_ALREADY_DEFINED
+#else
+#define yy_create_buffer gregorio_vowel_rulefile__create_buffer
+#endif
+
+#ifdef yy_delete_buffer
+#define gregorio_vowel_rulefile__delete_buffer_ALREADY_DEFINED
+#else
+#define yy_delete_buffer gregorio_vowel_rulefile__delete_buffer
+#endif
+
+#ifdef yy_scan_buffer
+#define gregorio_vowel_rulefile__scan_buffer_ALREADY_DEFINED
+#else
+#define yy_scan_buffer gregorio_vowel_rulefile__scan_buffer
+#endif
+
+#ifdef yy_scan_string
+#define gregorio_vowel_rulefile__scan_string_ALREADY_DEFINED
+#else
+#define yy_scan_string gregorio_vowel_rulefile__scan_string
+#endif
+
+#ifdef yy_scan_bytes
+#define gregorio_vowel_rulefile__scan_bytes_ALREADY_DEFINED
+#else
+#define yy_scan_bytes gregorio_vowel_rulefile__scan_bytes
+#endif
+
+#ifdef yy_init_buffer
+#define gregorio_vowel_rulefile__init_buffer_ALREADY_DEFINED
+#else
+#define yy_init_buffer gregorio_vowel_rulefile__init_buffer
+#endif
+
+#ifdef yy_flush_buffer
+#define gregorio_vowel_rulefile__flush_buffer_ALREADY_DEFINED
+#else
+#define yy_flush_buffer gregorio_vowel_rulefile__flush_buffer
+#endif
+
+#ifdef yy_load_buffer_state
+#define gregorio_vowel_rulefile__load_buffer_state_ALREADY_DEFINED
+#else
+#define yy_load_buffer_state gregorio_vowel_rulefile__load_buffer_state
+#endif
+
+#ifdef yy_switch_to_buffer
+#define gregorio_vowel_rulefile__switch_to_buffer_ALREADY_DEFINED
+#else
+#define yy_switch_to_buffer gregorio_vowel_rulefile__switch_to_buffer
+#endif
+
+#ifdef yypush_buffer_state
+#define gregorio_vowel_rulefile_push_buffer_state_ALREADY_DEFINED
+#else
+#define yypush_buffer_state gregorio_vowel_rulefile_push_buffer_state
+#endif
+
+#ifdef yypop_buffer_state
+#define gregorio_vowel_rulefile_pop_buffer_state_ALREADY_DEFINED
+#else
+#define yypop_buffer_state gregorio_vowel_rulefile_pop_buffer_state
+#endif
+
+#ifdef yyensure_buffer_stack
+#define gregorio_vowel_rulefile_ensure_buffer_stack_ALREADY_DEFINED
+#else
+#define yyensure_buffer_stack gregorio_vowel_rulefile_ensure_buffer_stack
+#endif
+
+#ifdef yylex
+#define gregorio_vowel_rulefile_lex_ALREADY_DEFINED
+#else
+#define yylex gregorio_vowel_rulefile_lex
+#endif
+
+#ifdef yyrestart
+#define gregorio_vowel_rulefile_restart_ALREADY_DEFINED
+#else
+#define yyrestart gregorio_vowel_rulefile_restart
+#endif
+
+#ifdef yylex_init
+#define gregorio_vowel_rulefile_lex_init_ALREADY_DEFINED
+#else
+#define yylex_init gregorio_vowel_rulefile_lex_init
+#endif
+
+#ifdef yylex_init_extra
+#define gregorio_vowel_rulefile_lex_init_extra_ALREADY_DEFINED
+#else
+#define yylex_init_extra gregorio_vowel_rulefile_lex_init_extra
+#endif
+
+#ifdef yylex_destroy
+#define gregorio_vowel_rulefile_lex_destroy_ALREADY_DEFINED
+#else
+#define yylex_destroy gregorio_vowel_rulefile_lex_destroy
+#endif
+
+#ifdef yyget_debug
+#define gregorio_vowel_rulefile_get_debug_ALREADY_DEFINED
+#else
+#define yyget_debug gregorio_vowel_rulefile_get_debug
+#endif
+
+#ifdef yyset_debug
+#define gregorio_vowel_rulefile_set_debug_ALREADY_DEFINED
+#else
+#define yyset_debug gregorio_vowel_rulefile_set_debug
+#endif
+
+#ifdef yyget_extra
+#define gregorio_vowel_rulefile_get_extra_ALREADY_DEFINED
+#else
+#define yyget_extra gregorio_vowel_rulefile_get_extra
+#endif
+
+#ifdef yyset_extra
+#define gregorio_vowel_rulefile_set_extra_ALREADY_DEFINED
+#else
+#define yyset_extra gregorio_vowel_rulefile_set_extra
+#endif
+
+#ifdef yyget_in
+#define gregorio_vowel_rulefile_get_in_ALREADY_DEFINED
+#else
+#define yyget_in gregorio_vowel_rulefile_get_in
+#endif
+
+#ifdef yyset_in
+#define gregorio_vowel_rulefile_set_in_ALREADY_DEFINED
+#else
+#define yyset_in gregorio_vowel_rulefile_set_in
+#endif
+
+#ifdef yyget_out
+#define gregorio_vowel_rulefile_get_out_ALREADY_DEFINED
+#else
+#define yyget_out gregorio_vowel_rulefile_get_out
+#endif
+
+#ifdef yyset_out
+#define gregorio_vowel_rulefile_set_out_ALREADY_DEFINED
+#else
+#define yyset_out gregorio_vowel_rulefile_set_out
+#endif
+
+#ifdef yyget_leng
+#define gregorio_vowel_rulefile_get_leng_ALREADY_DEFINED
+#else
+#define yyget_leng gregorio_vowel_rulefile_get_leng
+#endif
+
+#ifdef yyget_text
+#define gregorio_vowel_rulefile_get_text_ALREADY_DEFINED
+#else
+#define yyget_text gregorio_vowel_rulefile_get_text
+#endif
+
+#ifdef yyget_lineno
+#define gregorio_vowel_rulefile_get_lineno_ALREADY_DEFINED
+#else
+#define yyget_lineno gregorio_vowel_rulefile_get_lineno
+#endif
+
+#ifdef yyset_lineno
+#define gregorio_vowel_rulefile_set_lineno_ALREADY_DEFINED
+#else
+#define yyset_lineno gregorio_vowel_rulefile_set_lineno
+#endif
+
+#ifdef yywrap
+#define gregorio_vowel_rulefile_wrap_ALREADY_DEFINED
+#else
+#define yywrap gregorio_vowel_rulefile_wrap
+#endif
+
+#ifdef yyalloc
+#define gregorio_vowel_rulefile_alloc_ALREADY_DEFINED
+#else
+#define yyalloc gregorio_vowel_rulefile_alloc
+#endif
+
+#ifdef yyrealloc
+#define gregorio_vowel_rulefile_realloc_ALREADY_DEFINED
+#else
+#define yyrealloc gregorio_vowel_rulefile_realloc
+#endif
+
+#ifdef yyfree
+#define gregorio_vowel_rulefile_free_ALREADY_DEFINED
+#else
+#define yyfree gregorio_vowel_rulefile_free
+#endif
+
+#ifdef yytext
+#define gregorio_vowel_rulefile_text_ALREADY_DEFINED
+#else
+#define yytext gregorio_vowel_rulefile_text
+#endif
+
+#ifdef yyleng
+#define gregorio_vowel_rulefile_leng_ALREADY_DEFINED
+#else
+#define yyleng gregorio_vowel_rulefile_leng
+#endif
+
+#ifdef yyin
+#define gregorio_vowel_rulefile_in_ALREADY_DEFINED
+#else
+#define yyin gregorio_vowel_rulefile_in
+#endif
+
+#ifdef yyout
+#define gregorio_vowel_rulefile_out_ALREADY_DEFINED
+#else
+#define yyout gregorio_vowel_rulefile_out
+#endif
+
+#ifdef yy_flex_debug
+#define gregorio_vowel_rulefile__flex_debug_ALREADY_DEFINED
+#else
+#define yy_flex_debug gregorio_vowel_rulefile__flex_debug
+#endif
+
+#ifdef yylineno
+#define gregorio_vowel_rulefile_lineno_ALREADY_DEFINED
+#else
+#define yylineno gregorio_vowel_rulefile_lineno
+#endif
+
 /* First, we deal with  platform-specific or compiler-specific issues. */
 
 /* begin standard C headers. */
@@ -88,29 +322,23 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
+
 #endif /* ! C99 */
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
-
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
+/* begin standard C++ headers. */
 
-#else	/* ! __cplusplus */
-
-/* C99 requires __STDC__ to be defined as 1. */
-#if defined (__STDC__)
-
-#define YY_USE_CONST
-
-#endif	/* defined (__STDC__) */
-#endif	/* ! __cplusplus */
-
-#ifdef YY_USE_CONST
+/* TODO: this is always defined, so inline it */
 #define yyconst const
+
+#if defined(__GNUC__) && __GNUC__ >= 3
+#define yynoreturn __attribute__((__noreturn__))
 #else
-#define yyconst
+#define yynoreturn
 #endif
 
 /* Size of default input buffer. */
@@ -136,9 +364,9 @@ typedef struct yy_buffer_state *YY_BUFFER_STATE;
 typedef size_t yy_size_t;
 #endif
 
-extern yy_size_t gregorio_vowel_rulefile_leng;
+extern int yyleng;
 
-extern FILE *gregorio_vowel_rulefile_in, *gregorio_vowel_rulefile_out;
+extern FILE *yyin, *yyout;
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
@@ -152,12 +380,12 @@ struct yy_buffer_state
 	/* Size of input buffer in bytes, not including room for EOB
 	 * characters.
 	 */
-	yy_size_t yy_buf_size;
+	int yy_buf_size;
 
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	yy_size_t yy_n_chars;
+	int yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -180,7 +408,7 @@ struct yy_buffer_state
 
     int yy_bs_lineno; /**< The line count. */
     int yy_bs_column; /**< The column count. */
-    
+
 	/* Whether to try to fill the input buffer when we reach the
 	 * end of it.
 	 */
@@ -191,34 +419,34 @@ struct yy_buffer_state
 	};
 #endif /* !YY_STRUCT_YY_BUFFER_STATE */
 
-void gregorio_vowel_rulefile_restart (FILE *input_file  );
-void gregorio_vowel_rulefile__switch_to_buffer (YY_BUFFER_STATE new_buffer  );
-YY_BUFFER_STATE gregorio_vowel_rulefile__create_buffer (FILE *file,int size  );
-void gregorio_vowel_rulefile__delete_buffer (YY_BUFFER_STATE b  );
-void gregorio_vowel_rulefile__flush_buffer (YY_BUFFER_STATE b  );
-void gregorio_vowel_rulefile_push_buffer_state (YY_BUFFER_STATE new_buffer  );
-void gregorio_vowel_rulefile_pop_buffer_state (void );
+void yyrestart ( FILE *input_file  );
+void yy_switch_to_buffer ( YY_BUFFER_STATE new_buffer  );
+YY_BUFFER_STATE yy_create_buffer ( FILE *file, int size  );
+void yy_delete_buffer ( YY_BUFFER_STATE b  );
+void yy_flush_buffer ( YY_BUFFER_STATE b  );
+void yypush_buffer_state ( YY_BUFFER_STATE new_buffer  );
+void yypop_buffer_state ( void );
 
-YY_BUFFER_STATE gregorio_vowel_rulefile__scan_buffer (char *base,yy_size_t size  );
-YY_BUFFER_STATE gregorio_vowel_rulefile__scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE gregorio_vowel_rulefile__scan_bytes (yyconst char *bytes,yy_size_t len  );
+YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size  );
+YY_BUFFER_STATE yy_scan_string ( const char *yy_str  );
+YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len  );
 
-void *gregorio_vowel_rulefile_alloc (yy_size_t  );
-void *gregorio_vowel_rulefile_realloc (void *,yy_size_t  );
-void gregorio_vowel_rulefile_free (void *  );
+void *yyalloc ( yy_size_t  );
+void *yyrealloc ( void *, yy_size_t  );
+void yyfree ( void *  );
 
 /* Begin user sect3 */
 
 #define gregorio_vowel_rulefile_wrap() (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
 
-extern int gregorio_vowel_rulefile_lineno;
+extern int yylineno;
 
-extern char *gregorio_vowel_rulefile_text;
+extern char *yytext;
 #ifdef yytext_ptr
 #undef yytext_ptr
 #endif
-#define yytext_ptr gregorio_vowel_rulefile_text
+#define yytext_ptr yytext
 
 #ifdef YY_HEADER_EXPORT_START_CONDITIONS
 #define INITIAL 0
@@ -243,31 +471,31 @@ extern char *gregorio_vowel_rulefile_text;
 /* Accessor methods to globals.
    These are made visible to non-reentrant scanners for convenience. */
 
-int gregorio_vowel_rulefile_lex_destroy (void );
+int yylex_destroy ( void );
 
-int gregorio_vowel_rulefile_get_debug (void );
+int yyget_debug ( void );
 
-void gregorio_vowel_rulefile_set_debug (int debug_flag  );
+void yyset_debug ( int debug_flag  );
 
-YY_EXTRA_TYPE gregorio_vowel_rulefile_get_extra (void );
+YY_EXTRA_TYPE yyget_extra ( void );
 
-void gregorio_vowel_rulefile_set_extra (YY_EXTRA_TYPE user_defined  );
+void yyset_extra ( YY_EXTRA_TYPE user_defined  );
 
-FILE *gregorio_vowel_rulefile_get_in (void );
+FILE *yyget_in ( void );
 
-void gregorio_vowel_rulefile_set_in  (FILE * _in_str  );
+void yyset_in  ( FILE * _in_str  );
 
-FILE *gregorio_vowel_rulefile_get_out (void );
+FILE *yyget_out ( void );
 
-void gregorio_vowel_rulefile_set_out  (FILE * _out_str  );
+void yyset_out  ( FILE * _out_str  );
 
-yy_size_t gregorio_vowel_rulefile_get_leng (void );
+			int yyget_leng ( void );
 
-char *gregorio_vowel_rulefile_get_text (void );
+char *yyget_text ( void );
 
-int gregorio_vowel_rulefile_get_lineno (void );
+int yyget_lineno ( void );
 
-void gregorio_vowel_rulefile_set_lineno (int _line_number  );
+void yyset_lineno ( int _line_number  );
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -275,18 +503,18 @@ void gregorio_vowel_rulefile_set_lineno (int _line_number  );
 
 #ifndef YY_SKIP_YYWRAP
 #ifdef __cplusplus
-extern "C" int gregorio_vowel_rulefile_wrap (void );
+extern "C" int yywrap ( void );
 #else
-extern int gregorio_vowel_rulefile_wrap (void );
+extern int yywrap ( void );
 #endif
 #endif
 
 #ifndef yytext_ptr
-static void yy_flex_strncpy (char *,yyconst char *,int );
+static void yy_flex_strncpy ( char *, const char *, int );
 #endif
 
 #ifdef YY_NEED_STRLEN
-static int yy_flex_strlen (yyconst char * );
+static int yy_flex_strlen ( const char * );
 #endif
 
 #ifndef YY_NO_INPUT
@@ -314,9 +542,9 @@ static int yy_flex_strlen (yyconst char * );
 #ifndef YY_DECL
 #define YY_DECL_IS_OURS 1
 
-extern int gregorio_vowel_rulefile_lex (void);
+extern int yylex (void);
 
-#define YY_DECL int gregorio_vowel_rulefile_lex (void)
+#define YY_DECL int yylex (void)
 #endif /* !YY_DECL */
 
 /* yy_get_previous_state - get the state just before the EOB char was reached */
@@ -333,9 +561,154 @@ extern int gregorio_vowel_rulefile_lex (void);
 #undef YY_DECL
 #endif
 
+#ifndef gregorio_vowel_rulefile__create_buffer_ALREADY_DEFINED
+#undef yy_create_buffer
+#endif
+#ifndef gregorio_vowel_rulefile__delete_buffer_ALREADY_DEFINED
+#undef yy_delete_buffer
+#endif
+#ifndef gregorio_vowel_rulefile__scan_buffer_ALREADY_DEFINED
+#undef yy_scan_buffer
+#endif
+#ifndef gregorio_vowel_rulefile__scan_string_ALREADY_DEFINED
+#undef yy_scan_string
+#endif
+#ifndef gregorio_vowel_rulefile__scan_bytes_ALREADY_DEFINED
+#undef yy_scan_bytes
+#endif
+#ifndef gregorio_vowel_rulefile__init_buffer_ALREADY_DEFINED
+#undef yy_init_buffer
+#endif
+#ifndef gregorio_vowel_rulefile__flush_buffer_ALREADY_DEFINED
+#undef yy_flush_buffer
+#endif
+#ifndef gregorio_vowel_rulefile__load_buffer_state_ALREADY_DEFINED
+#undef yy_load_buffer_state
+#endif
+#ifndef gregorio_vowel_rulefile__switch_to_buffer_ALREADY_DEFINED
+#undef yy_switch_to_buffer
+#endif
+#ifndef gregorio_vowel_rulefile_push_buffer_state_ALREADY_DEFINED
+#undef yypush_buffer_state
+#endif
+#ifndef gregorio_vowel_rulefile_pop_buffer_state_ALREADY_DEFINED
+#undef yypop_buffer_state
+#endif
+#ifndef gregorio_vowel_rulefile_ensure_buffer_stack_ALREADY_DEFINED
+#undef yyensure_buffer_stack
+#endif
+#ifndef gregorio_vowel_rulefile_lex_ALREADY_DEFINED
+#undef yylex
+#endif
+#ifndef gregorio_vowel_rulefile_restart_ALREADY_DEFINED
+#undef yyrestart
+#endif
+#ifndef gregorio_vowel_rulefile_lex_init_ALREADY_DEFINED
+#undef yylex_init
+#endif
+#ifndef gregorio_vowel_rulefile_lex_init_extra_ALREADY_DEFINED
+#undef yylex_init_extra
+#endif
+#ifndef gregorio_vowel_rulefile_lex_destroy_ALREADY_DEFINED
+#undef yylex_destroy
+#endif
+#ifndef gregorio_vowel_rulefile_get_debug_ALREADY_DEFINED
+#undef yyget_debug
+#endif
+#ifndef gregorio_vowel_rulefile_set_debug_ALREADY_DEFINED
+#undef yyset_debug
+#endif
+#ifndef gregorio_vowel_rulefile_get_extra_ALREADY_DEFINED
+#undef yyget_extra
+#endif
+#ifndef gregorio_vowel_rulefile_set_extra_ALREADY_DEFINED
+#undef yyset_extra
+#endif
+#ifndef gregorio_vowel_rulefile_get_in_ALREADY_DEFINED
+#undef yyget_in
+#endif
+#ifndef gregorio_vowel_rulefile_set_in_ALREADY_DEFINED
+#undef yyset_in
+#endif
+#ifndef gregorio_vowel_rulefile_get_out_ALREADY_DEFINED
+#undef yyget_out
+#endif
+#ifndef gregorio_vowel_rulefile_set_out_ALREADY_DEFINED
+#undef yyset_out
+#endif
+#ifndef gregorio_vowel_rulefile_get_leng_ALREADY_DEFINED
+#undef yyget_leng
+#endif
+#ifndef gregorio_vowel_rulefile_get_text_ALREADY_DEFINED
+#undef yyget_text
+#endif
+#ifndef gregorio_vowel_rulefile_get_lineno_ALREADY_DEFINED
+#undef yyget_lineno
+#endif
+#ifndef gregorio_vowel_rulefile_set_lineno_ALREADY_DEFINED
+#undef yyset_lineno
+#endif
+#ifndef gregorio_vowel_rulefile_get_column_ALREADY_DEFINED
+#undef yyget_column
+#endif
+#ifndef gregorio_vowel_rulefile_set_column_ALREADY_DEFINED
+#undef yyset_column
+#endif
+#ifndef gregorio_vowel_rulefile_wrap_ALREADY_DEFINED
+#undef yywrap
+#endif
+#ifndef gregorio_vowel_rulefile_get_lval_ALREADY_DEFINED
+#undef yyget_lval
+#endif
+#ifndef gregorio_vowel_rulefile_set_lval_ALREADY_DEFINED
+#undef yyset_lval
+#endif
+#ifndef gregorio_vowel_rulefile_get_lloc_ALREADY_DEFINED
+#undef yyget_lloc
+#endif
+#ifndef gregorio_vowel_rulefile_set_lloc_ALREADY_DEFINED
+#undef yyset_lloc
+#endif
+#ifndef gregorio_vowel_rulefile_alloc_ALREADY_DEFINED
+#undef yyalloc
+#endif
+#ifndef gregorio_vowel_rulefile_realloc_ALREADY_DEFINED
+#undef yyrealloc
+#endif
+#ifndef gregorio_vowel_rulefile_free_ALREADY_DEFINED
+#undef yyfree
+#endif
+#ifndef gregorio_vowel_rulefile_text_ALREADY_DEFINED
+#undef yytext
+#endif
+#ifndef gregorio_vowel_rulefile_leng_ALREADY_DEFINED
+#undef yyleng
+#endif
+#ifndef gregorio_vowel_rulefile_in_ALREADY_DEFINED
+#undef yyin
+#endif
+#ifndef gregorio_vowel_rulefile_out_ALREADY_DEFINED
+#undef yyout
+#endif
+#ifndef gregorio_vowel_rulefile__flex_debug_ALREADY_DEFINED
+#undef yy_flex_debug
+#endif
+#ifndef gregorio_vowel_rulefile_lineno_ALREADY_DEFINED
+#undef yylineno
+#endif
+#ifndef gregorio_vowel_rulefile_tables_fload_ALREADY_DEFINED
+#undef yytables_fload
+#endif
+#ifndef gregorio_vowel_rulefile_tables_destroy_ALREADY_DEFINED
+#undef yytables_destroy
+#endif
+#ifndef gregorio_vowel_rulefile_TABLES_NAME_ALREADY_DEFINED
+#undef yyTABLES_NAME
+#endif
+
 #line 94 "vowel/vowel-rules.l"
 
 
-#line 340 "vowel/vowel-rules-l.h"
+#line 712 "vowel/vowel-rules-l.h"
 #undef gregorio_vowel_rulefile_IN_HEADER
 #endif /* gregorio_vowel_rulefile_HEADER_H */
diff --git a/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc b/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
index 84f68ea08bc..113be63aff0 100644
--- a/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
+++ b/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
@@ -1,7 +1,7 @@
 IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
 1 VERSIONINFO
-FILEVERSION     5,0,1,30
-PRODUCTVERSION  5,0,1,30
+FILEVERSION     5,1,0,30
+PRODUCTVERSION  5,1,0,30
 BEGIN
   BLOCK "StringFileInfo"
   BEGIN
@@ -9,12 +9,12 @@ BEGIN
     BEGIN
       VALUE "CompanyName", "Gregorio project"
       VALUE "FileDescription", "Gregorio"
-      VALUE "FileVersion", "5.0.1"
+      VALUE "FileVersion", "5.1.0"
       VALUE "InternalName", "gregorio"
       VALUE "LegalCopyright", "See COPYING in the installation directory."
       VALUE "OriginalFilename", "gregorio.exe"
       VALUE "ProductName", "Gregorio"
-      VALUE "ProductVersion", "5.0.1"
+      VALUE "ProductVersion", "5.1.0"
     END
   END
 
diff --git a/Build/source/texk/gregorio/gregorio.test b/Build/source/texk/gregorio/gregorio.test
index 4aaf4067e11..c7f9d42b094 100755
--- a/Build/source/texk/gregorio/gregorio.test
+++ b/Build/source/texk/gregorio/gregorio.test
@@ -8,7 +8,7 @@ TEXMFCNF=$srcdir/../kpathsea
 
 export TEXMFCNF
 
-DOCSRC=$srcdir/$GREGORIO_TREE/doc
+# DOCSRC=$srcdir/$GREGORIO_TREE/doc
 
 gregorio=gregorio
 
@@ -24,15 +24,15 @@ echo "*** gregorio --help" \
 	&& echo && echo "gregorio-help tests OK" && echo \
 	|| failed="$failed gregorio-help"
 
-echo "*** gregorio -o factus.gtex factus.gabc" \
-	&& ./$gregorio -o factus.gtex $DOCSRC/factus.gabc \
-	&& echo && echo "gregorio-factus tests OK" && echo \
-	|| failed="$failed gregorio-factus"
+# echo "*** gregorio -o factus.gtex factus.gabc" \
+# 	&& ./$gregorio -o factus.gtex $DOCSRC/factus.gabc \
+# 	&& echo && echo "gregorio-factus tests OK" && echo \
+# 	|| failed="$failed gregorio-factus"
 
-echo "*** gregorio -o veni.gtex veni.gabc" \
-	&& ./$gregorio -o veni.gtex $DOCSRC/veni.gabc \
-	&& echo && echo "gregorio-veni tests OK" && echo \
-	|| failed="$failed gregorio-veni"
+# echo "*** gregorio -o veni.gtex veni.gabc" \
+# 	&& ./$gregorio -o veni.gtex $DOCSRC/veni.gabc \
+# 	&& echo && echo "gregorio-veni tests OK" && echo \
+# 	|| failed="$failed gregorio-veni"
 
 test -z "$failed" && exit 0
 echo
diff --git a/Build/source/texk/gregorio/version.ac b/Build/source/texk/gregorio/version.ac
index 5b0a21c2245..8feeae694e1 100644
--- a/Build/source/texk/gregorio/version.ac
+++ b/Build/source/texk/gregorio/version.ac
@@ -8,4 +8,4 @@ dnl
 dnl --------------------------------------------------------
 dnl
 dnl  m4-include this file to define the current gregorio version
-m4_define([gregorio_version], [5.0.2])
+m4_define([gregorio_version], [5.1.0])