texlive[46939] Build/source/texk: gregorio-5.1.0

commits+kakuto at tug.org commits+kakuto at tug.org
Tue Mar 13 00:07:15 CET 2018


Revision: 46939
          http://tug.org/svn/texlive?view=revision&revision=46939
Author:   kakuto
Date:     2018-03-13 00:07:15 +0100 (Tue, 13 Mar 2018)
Log Message:
-----------
gregorio-5.1.0

Modified Paths:
--------------
    trunk/Build/source/texk/README
    trunk/Build/source/texk/gregorio/ChangeLog
    trunk/Build/source/texk/gregorio/Makefile.am
    trunk/Build/source/texk/gregorio/Makefile.in
    trunk/Build/source/texk/gregorio/TLpatches/ChangeLog
    trunk/Build/source/texk/gregorio/TLpatches/TL-Changes
    trunk/Build/source/texk/gregorio/configure
    trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
    trunk/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md
    trunk/Build/source/texk/gregorio/gregorio-src/README.md
    trunk/Build/source/texk/gregorio/gregorio-src/configure.ac
    trunk/Build/source/texk/gregorio/gregorio-src/contrib/README.md
    trunk/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
    trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
    trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
    trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c
    trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l
    trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c
    trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h
    trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c
    trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c
    trunk/Build/source/texk/gregorio/gregorio-src/src/struct.c
    trunk/Build/source/texk/gregorio/gregorio-src/src/struct.h
    trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c
    trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h
    trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
    trunk/Build/source/texk/gregorio/gregorio.test
    trunk/Build/source/texk/gregorio/version.ac

Removed Paths:
-------------
    trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version
    trunk/Build/source/texk/gregorio/gregorio-src/doc/
    trunk/Build/source/texk/gregorio/gregorio-src/examples/

Modified: trunk/Build/source/texk/README
===================================================================
--- trunk/Build/source/texk/README	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/README	2018-03-12 23:07:15 UTC (rev 46939)
@@ -62,8 +62,8 @@
 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?
 

Modified: trunk/Build/source/texk/gregorio/ChangeLog
===================================================================
--- trunk/Build/source/texk/gregorio/ChangeLog	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/ChangeLog	2018-03-12 23:07:15 UTC (rev 46939)
@@ -1,3 +1,10 @@
+2018-03-12  Akira Kakuto  <kakuto at 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 at fuk.kindai.ac.jp>
 
 	* Import gregorio-5.0.2. (nothing changed except for the version)

Modified: trunk/Build/source/texk/gregorio/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/Makefile.am	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/Makefile.am	2018-03-12 23:07:15 UTC (rev 46939)
@@ -60,4 +60,4 @@
 gregorio.log: gregorio$(EXEEXT)
 
 EXTRA_DIST += $(TESTS)
-DISTCLEANFILES = factus.gtex veni.gtex
+DISTCLEANFILES =

Modified: trunk/Build/source/texk/gregorio/Makefile.in
===================================================================
--- trunk/Build/source/texk/gregorio/Makefile.in	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/Makefile.in	2018-03-12 23:07:15 UTC (rev 46939)
@@ -601,7 +601,7 @@
 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
 

Modified: trunk/Build/source/texk/gregorio/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/texk/gregorio/TLpatches/ChangeLog	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/TLpatches/ChangeLog	2018-03-12 23:07:15 UTC (rev 46939)
@@ -1,3 +1,7 @@
+2018-03-12  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
+
+	Import gregorio-5.1.0.
+
 2017-12-29  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	Import gregorio-5.0.2.

Modified: trunk/Build/source/texk/gregorio/TLpatches/TL-Changes
===================================================================
--- trunk/Build/source/texk/gregorio/TLpatches/TL-Changes	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/TLpatches/TL-Changes	2018-03-12 23:07:15 UTC (rev 46939)
@@ -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 @@
 	configure
 	contrib/Makefile.in
 	contrib/TeXShop/Makefile.in
-	doc/Makefile.in
-	examples/Makefile.in
-	fonts/
 	src/Makefile.in
 	src/config_.h.in
-	tex/

Modified: trunk/Build/source/texk/gregorio/configure
===================================================================
--- trunk/Build/source/texk/gregorio/configure	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/configure	2018-03-12 23:07:15 UTC (rev 46939)
@@ -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 at tug.org>.
 #
@@ -590,8 +590,8 @@
 # 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 at tug.org'
 PACKAGE_URL='http://gregorio-project.github.io/'
 
@@ -1330,7 +1330,7 @@
   # 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 @@
 
 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 @@
 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 @@
 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 @@
 
 # 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 @@
 Report bugs to <bug-libtool at 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 @@
 # 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 @@
 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\\"
 

Deleted: trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/.gregorio-version	2018-03-12 23:07:15 UTC (rev 46939)
@@ -1,4 +0,0 @@
-5.0.1
-
-*** Do not modify this file. ***
-Use VersionManager.py to change the version.

Modified: trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md	2018-03-12 23:07:15 UTC (rev 46939)
@@ -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

Modified: trunk/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/CONTRIBUTING.md	2018-03-12 23:07:15 UTC (rev 46939)
@@ -6,7 +6,7 @@
 
 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
 

Modified: trunk/Build/source/texk/gregorio/gregorio-src/README.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/README.md	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/README.md	2018-03-12 23:07:15 UTC (rev 46939)
@@ -16,12 +16,6 @@
 
 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`).

Modified: trunk/Build/source/texk/gregorio/gregorio-src/configure.ac
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/configure.ac	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/configure.ac	2018-03-12 23:07:15 UTC (rev 46939)
@@ -16,8 +16,8 @@
 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=""

Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/README.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/README.md	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/README.md	2018-03-12 23:07:15 UTC (rev 46939)
@@ -23,7 +23,7 @@
 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
 

Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim	2018-03-12 23:07:15 UTC (rev 46939)
@@ -29,8 +29,10 @@
 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

Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat	2018-03-12 23:07:15 UTC (rev 46939)
@@ -237,7 +237,7 @@
 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 at gna.org as part of your bug report.
+echo gregorio-users at 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

Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command	2018-03-12 23:07:15 UTC (rev 46939)
@@ -221,8 +221,8 @@
 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 at gna.org as part of"
-echo "your bug report."
+echo "ran this script.  Please email it to gregorio-users at 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"

Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c	2018-03-12 23:07:15 UTC (rev 46939)
@@ -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,40 +343,32 @@
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
+
 #endif /* ! C99 */
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
+/* begin standard C++ headers. */
 
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
+/* TODO: this is always defined, so inline it */
+#define yyconst const
 
-#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
-#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
@@ -143,7 +375,6 @@
  * 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.
@@ -150,13 +381,10 @@
  */
 #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 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 @@
 #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 @@
 	/* 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 @@
 
     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 @@
 	 * 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 @@
 /* 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,71 +519,66 @@
 #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 );
+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 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  );
+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 gabc_notes_determination__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 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  );
+void *yyalloc ( yy_size_t  );
+void *yyrealloc ( void *, yy_size_t  );
+void yyfree ( void *  );
 
-void *gabc_notes_determination_alloc (yy_size_t  );
-void *gabc_notes_determination_realloc (void *,yy_size_t  );
-void gabc_notes_determination_free (void *  );
-
-#define yy_new_buffer gabc_notes_determination__create_buffer
-
+#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 */
@@ -363,24 +585,22 @@
 
 #define gabc_notes_determination_wrap() (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
+typedef flex_uint8_t YY_CHAR;
 
-typedef unsigned char YY_CHAR;
+FILE *yyin = NULL, *yyout = NULL;
 
-FILE *gabc_notes_determination_in = (FILE *) 0, *gabc_notes_determination_out = (FILE *) 0;
-
 typedef int yy_state_type;
 
-extern int gabc_notes_determination_lineno;
+extern int yylineno;
+int yylineno = 1;
 
-int gabc_notes_determination_lineno = 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 @@
       -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 @@
       -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 @@
       -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 @@
        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,7 +2220,8 @@
       -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,  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,
@@ -2008,7 +2229,6 @@
       -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,  -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 @@
       -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,7 +2282,7 @@
 
       -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,
@@ -2069,7 +2289,7 @@
       -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 @@
 
       -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 @@
       -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 @@
 
       -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 @@
       -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 @@
       -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 @@
       -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 @@
       -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,6 +2693,7 @@
       -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,
@@ -2482,7 +2703,6 @@
       -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,  -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 @@
       -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 @@
 
       -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 @@
       -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 @@
       -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 @@
       -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 @@
     },
 
     {
-       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,105 +3225,8 @@
     },
 
     {
-       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,
@@ -3110,9 +3233,9 @@
       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 @@
       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 @@
       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,13 +3282,14 @@
       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,
@@ -3174,8 +3298,7 @@
       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,  -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 @@
       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,10 +3360,9 @@
       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,  -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,
@@ -3247,7 +3371,6 @@
       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,  172,  172,  172,  172,
@@ -3254,25 +3377,25 @@
       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,
+      -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,  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,
 
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
@@ -3286,44 +3409,46 @@
       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,
 
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  174,  174,  174,  174,  174,  174,  174,  174,
-      174,  174,  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
+
     },
 
     {
        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,
@@ -3331,9 +3456,7 @@
       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 @@
       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 @@
       -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 @@
       -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 @@
       -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 @@
 
       -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 @@
       -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 @@
      -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,118 +3794,21 @@
     },
 
     {
-       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, -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,
@@ -3696,8 +3819,10 @@
       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,10 +3834,9 @@
       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, -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,
@@ -3721,7 +3845,6 @@
       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,  190,  190,  190,  190,
@@ -3728,6 +3851,8 @@
       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
     },
 
@@ -3734,8 +3859,6 @@
     {
        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,
@@ -3742,9 +3865,9 @@
       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 @@
       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 @@
        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,6 @@
 
      -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,
@@ -3966,6 +4185,7 @@
      -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,
 
      -113, -113, -113, -113, -113, -113, -113, -113, -113, -113,
      -113, -113, -113, -113, -113, -113, -113, -113, -113, -113,
@@ -3989,8 +4209,8 @@
      -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,
 
      -114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
      -114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
@@ -4090,7 +4310,6 @@
      -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,
@@ -4099,6 +4318,7 @@
      -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, -117, -117,
      -117, -117, -117, -117, -117, -117, -117, -117, -117, -117,
@@ -4121,9 +4341,9 @@
      -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,
-     -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,
@@ -4218,9 +4438,9 @@
      -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,
 
      -121, -121, -121, -121, -121, -121, -121, -121, -121, -121,
      -121, -121, -121, -121, -121, -121, -121, -121, -121, -121,
@@ -4249,7 +4469,6 @@
 
      -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,
@@ -4257,6 +4476,7 @@
      -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, -122, -122, -122, -122, -122, -122, -122, -122, -122,
      -122, -122, -122, -122, -122, -122, -122, -122, -122, -122,
@@ -4274,7 +4494,6 @@
 
      -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 @@
      -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,12 +4532,12 @@
      -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,
      -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, -124, -124,
@@ -4337,12 +4557,12 @@
      -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,
      -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, -125, -125,
@@ -4369,16 +4589,16 @@
      -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,
+     -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,14 +4652,14 @@
 
      -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,  203, -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, -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,
@@ -4471,11 +4691,11 @@
      -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,
+     -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,10 @@
      -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, -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,
@@ -4512,6 +4731,7 @@
      -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, -130, -130, -130, -130,
      -130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
@@ -4534,9 +4754,9 @@
      -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,
-     -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,
@@ -4566,6 +4786,7 @@
      -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,
@@ -4572,7 +4793,6 @@
      -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, -132, -132,
      -132, -132, -132, -132, -132, -132, -132, -132, -132, -132,
@@ -4691,10 +4911,10 @@
      -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,
 
      -136, -136, -136, -136, -136, -136, -136, -136, -136, -136,
      -136, -136, -136, -136, -136, -136, -136, -136, -136, -136,
@@ -4724,7 +4944,6 @@
      -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,
@@ -4731,6 +4950,7 @@
      -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, -137, -137, -137, -137, -137, -137,
      -137, -137, -137, -137, -137, -137, -137, -137, -137, -137,
@@ -4754,8 +4974,8 @@
      -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,12 +5006,12 @@
      -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,
+     -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 @@
      -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 @@
      -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,10 +5069,10 @@
      -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,  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,
-     -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,
@@ -4881,8 +5101,7 @@
 
      -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,
@@ -4889,6 +5108,7 @@
      -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, -142, -142, -142, -142, -142, -142, -142, -142, -142,
      -142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
@@ -4911,9 +5131,9 @@
      -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,13 +5163,13 @@
      -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,
+     -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,8 +5194,10 @@
      -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,  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,
@@ -4984,8 +5206,6 @@
      -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, -145, -145,
 
      -145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
      -145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
@@ -5001,16 +5221,16 @@
      -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,
-     -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,
@@ -5064,6 +5284,8 @@
 
      -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,
@@ -5070,8 +5292,6 @@
      -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 @@
      -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,10 +5410,10 @@
      -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,
-     -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,
@@ -5565,98 +5785,98 @@
     },
 
     {
-       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,
+       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, -164, -164, -164, -164,
 
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164,  164,  164,  164,  164,
-      164,  164,  164,  164,  164,  164
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -164, -164, -164, -164, -164, -164, -164, -164,
+     -164, -164, -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,
+       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, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
 
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165,  165,  165,  165,  165,
-      165,  165,  165,  165,  165,  165
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -165, -165, -165, -165, -165, -165, -165, -165,
+     -165, -165, -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,
+       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,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
-      166,  166,  166,  166,  166,  166,  166,  166,  166,  166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
+     -166, -166, -166, -166, -166, -166, -166, -166, -166, -166,
 
-      166,  166,  166,  166,  166,  166,  166,  166,  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 @@
 
     {
        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 @@
       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 @@
     },
 
     {
-       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 @@
 
     {
        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,9 +6079,9 @@
       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,
 
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
       173,  173,  173,  173,  173,  173,  173,  173,  173,  173,
@@ -5881,34 +6101,34 @@
     },
 
     {
-       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 @@
     },
 
     {
-       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,
+       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, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
-     -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
+      176,  176,  176,  176,  176,  176,  176,  176,  176,  176,
 
-     -176, -176, -176, -176, -176, -176, -176, -176, -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,
+       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,  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,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
 
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177, -177, -177, -177, -177,
-     -177, -177, -177, -177, -177, -177
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  177,  177,  177,  177,  177,  177,  177,  177,
+      177,  177,  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,
+       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, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
 
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178, -178, -178, -178, -178,
-     -178, -178, -178, -178, -178, -178
+      178,  178,  178,  178,  178,  178,  178,  178,  178,  178,
+      178,  178,  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,12 @@
      -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,
@@ -6056,6 +6275,7 @@
      -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, -179, -179, -179, -179,
      -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
@@ -6075,12 +6295,12 @@
      -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,16 +6327,16 @@
      -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,  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, -181,
      -181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
@@ -6138,13 +6358,13 @@
      -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,14 +6390,14 @@
 
      -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,
 
      -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
      -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
@@ -6201,13 +6421,12 @@
      -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,
@@ -6214,6 +6433,7 @@
      -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, -184, -184, -184, -184,
      -184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
@@ -6233,12 +6453,12 @@
      -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 @@
     },
 
     {
-       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,
+       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,  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, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+     -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
 
-      186,  186,  186,  186,  186,  186,  186,  186,  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,
+       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, -187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  187,
-      187,  187,  187,  187,  187,  187,  187,  187,  187,  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
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
+     -187, -187, -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,
+       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,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
 
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188,  188,  188,  188,  188,
-      188,  188,  188,  188,  188,  188
+     -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+     -188, -188, -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 @@
     },
 
     {
-       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,
+       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,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
 
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192, -192, -192, -192, -192,
-     -192, -192, -192, -192, -192, -192
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  192,  192,  192,  192,  192,  192,  192,  192,
+      192,  192,  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,
+       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, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
 
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193, -193, -193, -193, -193,
-     -193, -193, -193, -193, -193, -193
+      193,  193,  193,  193,  193,  193,  193,  193,  193,  193,
+      193,  193,  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,
+       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,  194,  194,  194,  194,
 
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194, -194, -194, -194, -194,
-     -194, -194, -194, -194, -194, -194
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  194,  194,  194,  194,  194,  194,  194,  194,
+      194,  194,  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 @@
      -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,10 +6807,10 @@
      -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,
 
      -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
      -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
@@ -6618,7 +6838,6 @@
      -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,
@@ -6627,6 +6846,7 @@
      -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, -197, -197, -197, -197, -197, -197, -197, -197, -197,
      -197, -197, -197, -197, -197, -197, -197, -197, -197, -197,
@@ -6682,12 +6902,12 @@
      -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,
      -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, -199, -199,
@@ -6707,12 +6927,12 @@
      -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,12 +6963,12 @@
      -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,
      -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,12 @@
      -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,
@@ -6785,6 +7004,7 @@
      -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,
@@ -6802,6 +7022,8 @@
 
      -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,
@@ -6808,8 +7030,6 @@
      -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 @@
 
      -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,13 +7086,14 @@
      -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,  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,
@@ -6881,7 +7102,6 @@
      -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,
@@ -6898,7 +7118,6 @@
      -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,
@@ -6905,6 +7124,7 @@
      -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,14 +7148,15 @@
      -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,
@@ -6942,7 +7163,6 @@
      -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,
@@ -6991,8 +7211,8 @@
      -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,12 +7243,12 @@
      -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,
+      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,  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, -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,10 +7306,10 @@
      -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,
+      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,  242, -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,
@@ -7118,14 +7338,14 @@
 
      -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,
      -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, -213, -213, -213, -213, -213, -213, -213, -213, -213,
      -213, -213, -213, -213, -213, -213, -213, -213, -213, -213,
@@ -7150,12 +7370,11 @@
      -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,
@@ -7162,6 +7381,7 @@
      -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, -214, -214,
      -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
@@ -7213,8 +7433,9 @@
      -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,
+      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,  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,
@@ -7222,7 +7443,6 @@
      -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, -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 @@
      -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,6 @@
      -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,
@@ -7295,6 +7514,7 @@
      -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, -218, -218, -218, -218, -218, -218,
      -218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
@@ -7308,18 +7528,18 @@
      -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,
      -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,8 @@
      -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,
@@ -7356,6 +7575,7 @@
      -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, -220, -220,
      -220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
@@ -7372,7 +7592,7 @@
      -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,  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,
@@ -7379,8 +7599,8 @@
      -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,
 
      -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
      -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
@@ -7440,8 +7660,8 @@
      -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,
 
      -223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
      -223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
@@ -7465,13 +7685,12 @@
      -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,
@@ -7478,6 +7697,7 @@
      -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,
@@ -7497,13 +7717,14 @@
      -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,
@@ -7513,7 +7734,6 @@
      -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,
@@ -7560,13 +7780,13 @@
      -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,14 +7812,14 @@
 
      -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,  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,
-     -228, -228, -228, -228, -228, -228, -228,  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,
@@ -7660,7 +7880,7 @@
      -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,11 +7912,11 @@
      -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,
      -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,
@@ -7720,8 +7940,8 @@
      -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,
      -232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
@@ -7782,18 +8002,18 @@
      -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,
      -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,10 +8035,10 @@
      -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,
-     -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 @@
      -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, -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,6 @@
      -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,
@@ -7952,6 +8171,7 @@
      -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, -239, -239, -239, -239,
      -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
@@ -7976,7 +8196,7 @@
      -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,6 @@
      -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,
@@ -8013,6 +8232,7 @@
      -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,
 
      -241, -241, -241, -241, -241, -241, -241, -241, -241, -241,
      -241, -241, -241, -241, -241, -241, -241, -241, -241, -241,
@@ -8034,12 +8254,13 @@
      -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,
@@ -8048,7 +8269,6 @@
      -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, -242, -242, -242, -242, -242, -242, -242,
@@ -8071,9 +8291,9 @@
      -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,
 
      -243, -243, -243, -243, -243, -243, -243, -243, -243, -243,
      -243, -243, -243, -243, -243, -243, -243, -243, -243, -243,
@@ -8097,8 +8317,8 @@
      -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,
 
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
      -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
@@ -8105,11 +8325,11 @@
      -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,
+     -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,12 +8349,12 @@
      -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,
      -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, -245, -245,
@@ -8161,12 +8381,12 @@
      -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 @@
      -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,15 @@
 
      -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,
@@ -8243,6 +8462,7 @@
      -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, -248, -248,
@@ -8255,13 +8475,12 @@
      -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, -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,
@@ -8268,6 +8487,7 @@
      -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, -249, -249,
      -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
@@ -8288,11 +8508,11 @@
      -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,16 +8539,16 @@
      -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,  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, -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,
-     -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,
@@ -8356,9 +8576,9 @@
      -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 @@
 
      -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,9 +8670,10 @@
      -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,
@@ -8461,7 +8682,6 @@
      -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, -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 @@
      -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,9 +8729,9 @@
      -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,
-     -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,
@@ -8545,9 +8765,9 @@
      -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,
-     -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,
@@ -8571,9 +8791,10 @@
      -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,
@@ -8583,7 +8804,6 @@
      -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, -259, -259, -259,
      -259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
@@ -8666,13 +8886,14 @@
      -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, -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,
@@ -8680,7 +8901,6 @@
      -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, -262,
@@ -8703,9 +8923,9 @@
      -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,
 
      -263, -263, -263, -263, -263, -263, -263, -263, -263, -263,
      -263, -263, -263, -263, -263, -263, -263, -263, -263, -263,
@@ -8735,7 +8955,6 @@
      -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,
@@ -8742,6 +8961,7 @@
      -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, -264, -264, -264, -264,
      -264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
@@ -8798,11 +9018,11 @@
      -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,
      -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,
@@ -8830,9 +9050,9 @@
      -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,14 @@
      -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,
@@ -8875,6 +9094,7 @@
      -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, -268, -268, -268, -268, -268, -268,
      -268, -268, -268, -268, -268, -268, -268, -268, -268, -268,
@@ -8887,8 +9107,8 @@
      -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,
      -269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
@@ -8920,13 +9140,14 @@
      -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,
@@ -8935,7 +9156,6 @@
      -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,
@@ -8946,35 +9166,35 @@
     },
 
     {
-       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,21 +9202,21 @@
      -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,
+     -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 @@
      -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 @@
     },
 
     {
-       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,15 +9297,16 @@
      -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,  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,
@@ -9093,7 +9314,6 @@
      -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,
@@ -9109,7 +9329,6 @@
      -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,
@@ -9116,9 +9335,10 @@
      -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,  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,
 
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
      -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
@@ -9148,7 +9368,6 @@
      -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,
@@ -9155,6 +9374,7 @@
      -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, -277, -277, -277, -277, -277,
      -277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
@@ -9173,7 +9393,6 @@
      -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,
@@ -9180,8 +9399,8 @@
      -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,  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,
@@ -9191,6 +9410,7 @@
      -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, -278, -278, -278, -278, -278, -278,
      -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
@@ -9203,7 +9423,7 @@
      -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 @@
      -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,12 +9457,13 @@
      -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,
@@ -9251,7 +9472,6 @@
      -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,
@@ -9268,6 +9488,7 @@
      -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,
@@ -9274,9 +9495,8 @@
      -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,
-     -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,
@@ -9298,16 +9518,16 @@
      -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, -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,12 +9552,12 @@
      -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,
      -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, -283, -283, -283, -283, -283, -283, -283, -283,
@@ -9398,7 +9618,7 @@
      -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,6 @@
      -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,
@@ -9471,6 +9690,7 @@
      -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, -287, -287, -287, -287, -287, -287, -287,
      -287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
@@ -9525,7 +9745,6 @@
      -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,
@@ -9532,6 +9751,7 @@
      -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, -289, -289, -289, -289,
      -289, -289, -289, -289, -289, -289, -289, -289, -289, -289,
@@ -9556,9 +9776,10 @@
      -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,
@@ -9567,7 +9788,6 @@
      -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, -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,7 +9804,6 @@
      -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,
@@ -9591,8 +9810,9 @@
      -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,
      -291, -291, -291, -291, -291, -291, -291, -291, -291, -291,
@@ -9614,12 +9834,13 @@
      -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,
@@ -9628,7 +9849,6 @@
      -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, -292, -292, -292, -292, -292, -292, -292,
@@ -9641,35 +9861,35 @@
     },
 
     {
-       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 @@
      -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 @@
      -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 @@
     },
 
     {
-       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,11 +9993,12 @@
      -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,
@@ -9786,7 +10007,6 @@
      -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, -297, -297, -297, -297, -297, -297,
      -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
@@ -9809,9 +10029,9 @@
      -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,
-     -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,
@@ -9841,7 +10061,7 @@
      -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 @@
      -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,11 +10124,11 @@
      -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,
+     -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,6 +10219,7 @@
      -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,
@@ -10005,7 +10226,6 @@
      -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, -304, -304, -304, -304, -304, -304, -304,
      -304, -304, -304, -304, -304, -304, -304, -304, -304, -304,
@@ -10030,7 +10250,7 @@
      -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 @@
      -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,11 +10379,11 @@
      -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,
      -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,
@@ -10188,7 +10408,7 @@
      -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,11 +10440,11 @@
      -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,
+     -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,20 +10467,20 @@
      -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,
 
      -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,  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,
      -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 @@
      -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,6 +10535,7 @@
      -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,
@@ -10321,7 +10542,6 @@
      -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, -314, -314, -314, -314, -314, -314, -314,
      -314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
@@ -10342,14 +10562,15 @@
      -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,
      -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,  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,
@@ -10357,7 +10578,6 @@
      -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, -315,
      -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
@@ -10378,11 +10598,11 @@
      -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,
      -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,
@@ -10404,10 +10624,10 @@
      -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,
 
      -317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
      -317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
@@ -10499,12 +10719,12 @@
      -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,
      -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,
@@ -10601,7 +10821,7 @@
      -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,9 +10916,9 @@
      -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,
-     -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,
@@ -10726,7 +10946,6 @@
      -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,
@@ -10735,6 +10954,7 @@
      -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, -327, -327, -327, -327,
      -327, -327, -327, -327, -327, -327, -327, -327, -327, -327,
@@ -10757,9 +10977,9 @@
      -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,
 
      -328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
      -328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
@@ -10784,7 +11004,7 @@
      -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,10 +11012,10 @@
      -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,
 
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
      -329, -329, -329, -329, -329, -329, -329, -329, -329, -329,
@@ -10820,7 +11040,7 @@
      -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,11 +11072,11 @@
      -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,
      -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,
@@ -10879,20 +11099,20 @@
      -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,
-     -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, -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,
      -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, -332,
@@ -10905,35 +11125,35 @@
     },
 
     {
-       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,6 @@
      -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,
@@ -10954,6 +11173,7 @@
      -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, -334, -334, -334, -334,
      -334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
@@ -10978,7 +11198,7 @@
      -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 @@
     },
 
     {
-       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,
+       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,
 
-     -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,
+      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,
 
-     -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,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  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, -336, -336, -336, -336, -336, -336, -336, -336, -336,
-     -336, -336, -336, -336, -336, -336
+      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,  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,
+       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,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  337,
-      337,  337,  337,  337,  337,  337,  337,  337,  337,  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
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+     -337, -337, -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,9 +11293,9 @@
      -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,
-     -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,
@@ -11127,66 +11347,66 @@
     },
 
     {
-       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,
+       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,
 
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  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,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  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
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  340,  340,  340,  340,  340,  340,  340,  340,
+      340,  340,  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,
+       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,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
-      341,  341,  341,  341,  341,  341,  341,  341,  341,  341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
+     -341, -341, -341, -341, -341, -341, -341, -341, -341, -341,
 
-      341,  341,  341,  341,  341,  341,  341,  341,  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 @@
      -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 @@
 	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,
+       31,   32,   33,  154,  154,  154,  154,  154,  154,  154,
 
-       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,
+       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,
 
-      116,  118,  114,    0,    0,    0,    0,    0,    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,    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,
 
-        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
+        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 @@
         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 @@
         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 @@
 #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,24 +12403,10 @@
     }
 }
 
+#line 12406 "gabc/gabc-notes-determination-l.c"
 
+#line 12408 "gabc/gabc-notes-determination-l.c"
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-#line 12112 "gabc/gabc-notes-determination-l.c"
-
 #define INITIAL 0
 #define texverbnote 1
 #define texverbglyph 2
@@ -12142,36 +12439,36 @@
 #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 @@
 
 #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 @@
 #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 @@
 /* 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,13 +12533,13 @@
 	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; \
 		} \
@@ -12250,7 +12546,7 @@
 	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 @@
 				break; \
 				} \
 			errno=0; \
-			clearerr(gabc_notes_determination_in); \
+			clearerr(yyin); \
 			} \
 		}\
 \
@@ -12291,12 +12587,12 @@
 #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 @@
 		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_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_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,7 +13471,7 @@
 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:
@@ -13182,7 +13478,7 @@
 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:
@@ -13189,7 +13485,7 @@
 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:
@@ -13196,7 +13492,7 @@
 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:
@@ -13203,7 +13499,7 @@
 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:
@@ -13210,7 +13506,7 @@
 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:
@@ -13217,38 +13513,38 @@
 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:
@@ -13255,7 +13551,7 @@
 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:
@@ -13262,7 +13558,7 @@
 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:
@@ -13269,7 +13565,7 @@
 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:
@@ -13276,7 +13572,7 @@
 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:
@@ -13283,7 +13579,7 @@
 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:
@@ -13290,7 +13586,7 @@
 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:
@@ -13297,399 +13593,420 @@
 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\""),
@@ -13696,12 +14013,12 @@
                 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,8 +14053,8 @@
 			{
 			/* 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
@@ -13744,7 +14061,7 @@
 			 * 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 @@
 				{
 				(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 @@
 	} /* 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 @@
 {
     	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 @@
 	/* 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 @@
 
 	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 @@
 
 			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 @@
 
 				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 @@
 		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 @@
 	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 @@
 
 		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 @@
 					 */
 
 					/* 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 @@
 		}
 
 	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,17 +14448,17 @@
  * 
  * @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.
@@ -14144,15 +14465,15 @@
  * @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 @@
 		}
 
 	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 @@
  * 
  * @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 @@
 		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 @@
  * @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 @@
 	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 @@
  *  @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 @@
 		(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 @@
  *  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 @@
 /* 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 @@
 		 * 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 @@
 		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 @@
  * @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,16 +14720,16 @@
 	     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;
@@ -14415,26 +14736,26 @@
 	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.
@@ -14441,18 +14762,18 @@
  * 
  * @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];
@@ -14459,9 +14780,9 @@
 
 	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 @@
 #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 @@
 #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,34 +14824,34 @@
 /** 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.
@@ -14537,9 +14858,9 @@
  * 
  */
 
-char *gabc_notes_determination_get_text  (void)
+char *yyget_text  (void)
 {
-        return gabc_notes_determination_text;
+        return yytext;
 }
 
 /** Set the current line number.
@@ -14546,10 +14867,10 @@
  * @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
@@ -14556,38 +14877,38 @@
  * 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 @@
 
 /* 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 @@
  */
 
 #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 @@
 #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 @@
 }
 #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,20 +14997,19 @@
 	 * 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],
         gregorio_scanner_location *loc, const gregorio_score *const score)
 {
@@ -14717,10 +15037,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;
 }

Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l	2018-03-12 23:07:15 UTC (rev 46939)
@@ -1205,9 +1205,15 @@
 `   {
         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 @@
 ::  {
         add_bar_as_note(B_DIVISIO_FINALIS);
     }
+:\? {
+        add_bar_as_note(B_DIVISIO_MAIOR_DOTTED);
+    }
 r   {
         gregorio_add_cavum(current_note);
     }

Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c	2018-03-12 23:07:15 UTC (rev 46939)
@@ -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,40 +343,32 @@
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
+
 #endif /* ! C99 */
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
+/* begin standard C++ headers. */
 
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
+/* TODO: this is always defined, so inline it */
+#define yyconst const
 
-#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
-#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
@@ -143,7 +375,6 @@
  * 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.
@@ -150,13 +381,10 @@
  */
 #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 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 @@
 #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 @@
 	/* 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 @@
 
     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 @@
 	 * 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 @@
 /* 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,71 +519,66 @@
 #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 );
+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 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  );
+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 gabc_score_determination__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 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  );
+void *yyalloc ( yy_size_t  );
+void *yyrealloc ( void *, yy_size_t  );
+void yyfree ( void *  );
 
-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
-
+#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 */
@@ -363,41 +585,35 @@
 
 #define gabc_score_determination_wrap() (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
+typedef flex_uint8_t YY_CHAR;
 
-typedef unsigned char YY_CHAR;
+FILE *yyin = NULL, *yyout = NULL;
 
-FILE *gabc_score_determination_in = (FILE *) 0, *gabc_score_determination_out = (FILE *) 0;
-
 typedef int yy_state_type;
 
-extern int gabc_score_determination_lineno;
+extern int yylineno;
+int yylineno = 1;
 
-int gabc_score_determination_lineno = 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 @@
 	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 @@
        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 @@
         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 @@
         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 @@
       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 @@
       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 @@
       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 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 @@
 #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 @@
 #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 @@
 #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 @@
 
 #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 @@
 #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 @@
 /* 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,13 +1202,13 @@
 	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; \
 		} \
@@ -1008,7 +1215,7 @@
 	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 @@
 				break; \
 				} \
 			errno=0; \
-			clearerr(gabc_score_determination_in); \
+			clearerr(yyin); \
 			} \
 		}\
 \
@@ -1049,12 +1256,12 @@
 #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 @@
 #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 @@
 		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_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 @@
 #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,8 +2019,8 @@
 			{
 			/* 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
@@ -1820,7 +2027,7 @@
 			 * 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 @@
 				{
 				(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 @@
 	} /* 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 @@
 {
     	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 @@
 	/* 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 @@
 
 	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 @@
 
 			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 @@
 
 				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 @@
 		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 @@
 	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 @@
 			{
 			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 @@
 		{
 		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 @@
 
 		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 @@
 					 */
 
 					/* 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 @@
 		}
 
 	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,17 +2422,17 @@
  * 
  * @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.
@@ -2228,15 +2439,15 @@
  * @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 @@
 		}
 
 	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 @@
  * 
  * @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 @@
 		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 @@
  * @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 @@
 	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 @@
  *  @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 @@
 		(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 @@
  *  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 @@
 /* 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 @@
 		 * 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 @@
 		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 @@
  * @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,16 +2694,16 @@
 	     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;
@@ -2499,26 +2710,26 @@
 	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.
@@ -2525,18 +2736,18 @@
  * 
  * @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];
@@ -2543,9 +2754,9 @@
 
 	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 @@
 #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 @@
 #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,34 +2798,34 @@
 /** 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.
@@ -2621,9 +2832,9 @@
  * 
  */
 
-char *gabc_score_determination_get_text  (void)
+char *yyget_text  (void)
 {
-        return gabc_score_determination_text;
+        return yytext;
 }
 
 /** Set the current line number.
@@ -2630,10 +2841,10 @@
  * @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
@@ -2640,38 +2851,38 @@
  * 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 @@
 
 /* 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 @@
  */
 
 #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 @@
 #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 @@
 }
 #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 @@
 	 * 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 @@
 
 
 
-

Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.h	2018-03-12 23:07:15 UTC (rev 46939)
@@ -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 @@
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
+
 #endif /* ! C99 */
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
+/* begin standard C++ headers. */
 
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
+/* TODO: this is always defined, so inline it */
+#define yyconst const
 
-#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
-#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 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 @@
 	/* 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 @@
 
     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,21 +419,21 @@
 	};
 #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 */
 
@@ -212,13 +440,13 @@
 #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 @@
 /* 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 @@
 
 #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 @@
 #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 @@
 #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 */

Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c	2018-03-12 23:07:15 UTC (rev 46939)
@@ -377,6 +377,15 @@
     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 */

Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c	2018-03-12 23:07:15 UTC (rev 46939)
@@ -1624,6 +1624,7 @@
     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 @@
     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,73 +1707,84 @@
         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 (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 (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 (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';
+                                        }
                                     }
-                                    if (n->u.note.pitch
-                                            < score->virgula_far_pitch) {
-                                        result = '1';
-                                    }
                                 }
                             }
                         }
@@ -1769,10 +1791,13 @@
                     }
                 }
             }
+            fprintf(f, "{%c}%%\n", is_far);
         }
-        fprintf(f, "{%c}%%\n", result);
-    } else {
+        break;
+
+    default:
         fprintf(f, "%%\n");
+        break;
     }
 }
 
@@ -2560,9 +2585,11 @@
             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:
@@ -2569,6 +2596,7 @@
                 result = 12;
                 break;
             case B_DIVISIO_MAIOR:
+            case B_DIVISIO_MAIOR_DOTTED:
                 result = 13;
                 break;
             case B_DIVISIO_MINOR_D1:

Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/struct.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/struct.c	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/struct.c	2018-03-12 23:07:15 UTC (rev 46939)
@@ -1104,6 +1104,9 @@
     }
     free((*syllable)->abovelinestext);
     next = (*syllable)->next_syllable;
+    if (next) {
+        next->previous_syllable = NULL;
+    }
     free((*syllable)->elements);
     free(*syllable);
     *syllable = next;

Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/struct.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/struct.h	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/struct.h	2018-03-12 23:07:15 UTC (rev 46939)
@@ -155,7 +155,10 @@
     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 @@
 
 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;

Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c	2018-03-12 23:07:15 UTC (rev 46939)
@@ -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,40 +343,32 @@
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
+
 #endif /* ! C99 */
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
+/* begin standard C++ headers. */
 
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
+/* TODO: this is always defined, so inline it */
+#define yyconst const
 
-#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
-#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
@@ -143,7 +375,6 @@
  * 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.
@@ -150,13 +381,10 @@
  */
 #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 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 @@
 #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 @@
 	/* 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 @@
 
     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 @@
 	 * 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 @@
 /* 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,71 +519,66 @@
 #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 *yyalloc ( yy_size_t  );
+void *yyrealloc ( void *, yy_size_t  );
+void yyfree ( void *  );
 
-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
-
+#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 */
@@ -363,41 +585,35 @@
 
 #define gregorio_vowel_rulefile_wrap() (/*CONSTCOND*/1)
 #define YY_SKIP_YYWRAP
+typedef flex_uint8_t YY_CHAR;
 
-typedef unsigned char YY_CHAR;
+FILE *yyin = NULL, *yyout = NULL;
 
-FILE *gregorio_vowel_rulefile_in = (FILE *) 0, *gregorio_vowel_rulefile_out = (FILE *) 0;
-
 typedef int yy_state_type;
 
-extern int gregorio_vowel_rulefile_lineno;
+extern int yylineno;
+int yylineno = 1;
 
-int gregorio_vowel_rulefile_lineno = 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 @@
 	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 @@
         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 @@
         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 @@
         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 @@
       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 @@
        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 @@
        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 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 @@
 #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,11 +810,10 @@
             _("invalid character in vowel file: %c"),
             *gregorio_vowel_rulefile_text);
 }
+#line 813 "vowel/vowel-rules-l.c"
 
+#line 815 "vowel/vowel-rules-l.c"
 
-
-#line 601 "vowel/vowel-rules-l.c"
-
 #define INITIAL 0
 #define chars 1
 #define lang 2
@@ -616,36 +831,36 @@
 #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 @@
 
 #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 @@
 #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 @@
 /* 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,13 +925,13 @@
 	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; \
 		} \
@@ -724,7 +938,7 @@
 	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 @@
 				break; \
 				} \
 			errno=0; \
-			clearerr(gregorio_vowel_rulefile_in); \
+			clearerr(yyin); \
 			} \
 		}\
 \
@@ -765,12 +979,12 @@
 #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,19 +1018,19 @@
 		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(  );
 		}
 
 	{
@@ -823,13 +1037,13 @@
 #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_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 @@
 #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,8 +1201,8 @@
 			{
 			/* 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
@@ -995,7 +1209,7 @@
 			 * 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 @@
 				{
 				(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 @@
 	} /* 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 @@
 {
     	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 @@
 	/* 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 @@
 
 	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 @@
 
 			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 @@
 
 				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 @@
 		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 @@
 	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 @@
 			{
 			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 @@
 		{
 		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 @@
 
 		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 @@
 					 */
 
 					/* 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 @@
 		}
 
 	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,17 +1601,17 @@
  * 
  * @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.
@@ -1400,15 +1618,15 @@
  * @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 @@
 		}
 
 	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 @@
  * 
  * @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 @@
 		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 @@
  * @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 @@
 	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 @@
  *  @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 @@
 		(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 @@
  *  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 @@
 /* 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 @@
 		 * 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 @@
 		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 @@
  * @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,16 +1873,16 @@
 	     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;
@@ -1671,26 +1889,26 @@
 	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.
@@ -1697,18 +1915,18 @@
  * 
  * @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];
@@ -1715,9 +1933,9 @@
 
 	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 @@
 #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 @@
 #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,34 +1977,34 @@
 /** 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.
@@ -1793,9 +2011,9 @@
  * 
  */
 
-char *gregorio_vowel_rulefile_get_text  (void)
+char *yyget_text  (void)
 {
-        return gregorio_vowel_rulefile_text;
+        return yytext;
 }
 
 /** Set the current line number.
@@ -1802,10 +2020,10 @@
  * @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
@@ -1812,38 +2030,38 @@
  * 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 @@
 
 /* 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 @@
  */
 
 #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 @@
 #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 @@
 }
 #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 @@
 	 * 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 @@
 
 
 
-

Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.h	2018-03-12 23:07:15 UTC (rev 46939)
@@ -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 @@
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#ifndef SIZE_MAX
+#define SIZE_MAX               (~(size_t)0)
+#endif
+
 #endif /* ! C99 */
 
 #endif /* ! FLEXINT_H */
 
-#ifdef __cplusplus
+/* begin standard C++ headers. */
 
-/* The "const" storage-class-modifier is valid. */
-#define YY_USE_CONST
+/* TODO: this is always defined, so inline it */
+#define yyconst const
 
-#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
-#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 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 @@
 	/* 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 @@
 
     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,21 +419,21 @@
 	};
 #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 */
 
@@ -212,13 +440,13 @@
 #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 @@
 /* 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 @@
 
 #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 @@
 #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 @@
 #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 */

Modified: trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc	2018-03-12 23:07:15 UTC (rev 46939)
@@ -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
       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
 

Modified: trunk/Build/source/texk/gregorio/gregorio.test
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio.test	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/gregorio.test	2018-03-12 23:07:15 UTC (rev 46939)
@@ -8,7 +8,7 @@
 
 export TEXMFCNF
 
-DOCSRC=$srcdir/$GREGORIO_TREE/doc
+# DOCSRC=$srcdir/$GREGORIO_TREE/doc
 
 gregorio=gregorio
 
@@ -24,15 +24,15 @@
 	&& 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

Modified: trunk/Build/source/texk/gregorio/version.ac
===================================================================
--- trunk/Build/source/texk/gregorio/version.ac	2018-03-12 23:04:35 UTC (rev 46938)
+++ trunk/Build/source/texk/gregorio/version.ac	2018-03-12 23:07:15 UTC (rev 46939)
@@ -8,4 +8,4 @@
 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])



More information about the tex-live-commits mailing list