diff options
| author | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-02-19 09:50:02 +0000 |
|---|---|---|
| committer | Akira Kakuto <kakuto@fuk.kindai.ac.jp> | 2016-02-19 09:50:02 +0000 |
| commit | cb91fd42ddde6e1b4dc9ab01a7fae48ec8cefd78 (patch) | |
| tree | bcf58cb364986d6620f33d8e3eb27ad239ff5b76 /Build/source/texk | |
| parent | d6e94ab1e1eca4619881ab218358de1aebde4ebb (diff) | |
gregorio 4.1.0-rc1
git-svn-id: svn://tug.org/texlive/trunk@39776 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk')
48 files changed, 3587 insertions, 2271 deletions
diff --git a/Build/source/texk/README b/Build/source/texk/README index 76a597d9ec7..a6bdb9bb96c 100644 --- a/Build/source/texk/README +++ b/Build/source/texk/README @@ -62,7 +62,7 @@ dvipsk - maintained here, by us dvisvgm 1.14.2 - checked 20jan16 http://dvisvgm.bplaced.net/Downloads -gregorio 4.1.0-beta3 - checked 10feb16 +gregorio 4.1.0-rc1 - checked 19feb16 https://github.com/gregorio-project/gregorio/releases/ gsftopk - from Paul Vojta's xdvi? diff --git a/Build/source/texk/gregorio/ChangeLog b/Build/source/texk/gregorio/ChangeLog index b8d4a59c73e..a37f264679e 100644 --- a/Build/source/texk/gregorio/ChangeLog +++ b/Build/source/texk/gregorio/ChangeLog @@ -1,3 +1,8 @@ +2016-02-19 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + Import gregorio-4.1.0-rc1. + * version.ac: Adapted. + 2016-02-10 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import gregorio-4.1.0-beta3. diff --git a/Build/source/texk/gregorio/Makefile.am b/Build/source/texk/gregorio/Makefile.am index e7f3d344117..0bd9d26f90b 100644 --- a/Build/source/texk/gregorio/Makefile.am +++ b/Build/source/texk/gregorio/Makefile.am @@ -6,7 +6,7 @@ ## We want to re-distribute the whole original gregorio source tree. EXTRA_DIST = $(GREGORIO_TREE) ## Patches applied to the original source tree -EXTRA_DIST += $(GREGORIO_TREE)-PATCHES +EXTRA_DIST += gregorio-PATCHES # Files not to be distributed include $(srcdir)/../../am/dist_hook.am diff --git a/Build/source/texk/gregorio/Makefile.in b/Build/source/texk/gregorio/Makefile.in index d65dcac1d39..9cb2229c928 100644 --- a/Build/source/texk/gregorio/Makefile.in +++ b/Build/source/texk/gregorio/Makefile.in @@ -561,7 +561,7 @@ target_alias = @target_alias@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -EXTRA_DIST = $(GREGORIO_TREE) $(GREGORIO_TREE)-PATCHES $(TESTS) +EXTRA_DIST = $(GREGORIO_TREE) gregorio-PATCHES $(TESTS) NEVER_DIST = `find . $(NEVER_NAMES)` # Files not to be distributed diff --git a/Build/source/texk/gregorio/configure b/Build/source/texk/gregorio/configure index d49c56ff31c..5c167a233c1 100755 --- a/Build/source/texk/gregorio/configure +++ b/Build/source/texk/gregorio/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 4.1.0-beta3. +# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 4.1.0-rc1. # # Report bugs to <tex-k@tug.org>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='Gregorio (TeX Live)' PACKAGE_TARNAME='gregorio--tex-live-' -PACKAGE_VERSION='4.1.0-beta3' -PACKAGE_STRING='Gregorio (TeX Live) 4.1.0-beta3' +PACKAGE_VERSION='4.1.0-rc1' +PACKAGE_STRING='Gregorio (TeX Live) 4.1.0-rc1' PACKAGE_BUGREPORT='tex-k@tug.org' PACKAGE_URL='' @@ -1331,7 +1331,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures Gregorio (TeX Live) 4.1.0-beta3 to adapt to many kinds of systems. +\`configure' configures Gregorio (TeX Live) 4.1.0-rc1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1402,7 +1402,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of Gregorio (TeX Live) 4.1.0-beta3:";; + short | recursive ) echo "Configuration of Gregorio (TeX Live) 4.1.0-rc1:";; esac cat <<\_ACEOF @@ -1521,7 +1521,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -Gregorio (TeX Live) configure 4.1.0-beta3 +Gregorio (TeX Live) configure 4.1.0-rc1 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2177,7 +2177,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by Gregorio (TeX Live) $as_me 4.1.0-beta3, which was +It was created by Gregorio (TeX Live) $as_me 4.1.0-rc1, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2526,7 +2526,7 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -FILENAME_VERSION="4_1_0-beta3" +FILENAME_VERSION="4_1_0-rc1" cat >>confdefs.h <<_ACEOF @@ -7870,7 +7870,7 @@ fi # Define the identity of the package. PACKAGE='gregorio--tex-live-' - VERSION='4.1.0-beta3' + VERSION='4.1.0-rc1' cat >>confdefs.h <<_ACEOF @@ -14254,7 +14254,7 @@ Usage: $0 [OPTIONS] Report bugs to <bug-libtool@gnu.org>." lt_cl_version="\ -Gregorio (TeX Live) config.lt 4.1.0-beta3 +Gregorio (TeX Live) config.lt 4.1.0-rc1 configured by $0, generated by GNU Autoconf 2.69. Copyright (C) 2011 Free Software Foundation, Inc. @@ -15841,7 +15841,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by Gregorio (TeX Live) $as_me 4.1.0-beta3, which was +This file was extended by Gregorio (TeX Live) $as_me 4.1.0-rc1, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -15907,7 +15907,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -Gregorio (TeX Live) config.status 4.1.0-beta3 +Gregorio (TeX Live) config.status 4.1.0-rc1 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/Build/source/texk/gregorio/configure.ac b/Build/source/texk/gregorio/configure.ac index 2091717b557..a8b08c6ee6d 100644 --- a/Build/source/texk/gregorio/configure.ac +++ b/Build/source/texk/gregorio/configure.ac @@ -9,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl m4_include([version.ac])[] dnl define gregorio_version AC_INIT([Gregorio (TeX Live)], gregorio_version, [tex-k@tug.org]) -FILENAME_VERSION="4_1_0-beta3" +FILENAME_VERSION="4_1_0-rc1" AC_SUBST(FILENAME_VERSION) AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names]) AC_PREREQ([2.65]) diff --git a/Build/source/texk/gregorio/gregorio-src-PATCHES/ChangeLog b/Build/source/texk/gregorio/gregorio-PATCHES/ChangeLog index a789f0431a5..a2f4a6e141d 100644 --- a/Build/source/texk/gregorio/gregorio-src-PATCHES/ChangeLog +++ b/Build/source/texk/gregorio/gregorio-PATCHES/ChangeLog @@ -1,3 +1,7 @@ +2016-02-19 Akira Kakuto <kakuto@fuk.kindai.ac.jp> + + Import gregorio-4.1.0-rc1. + 2016-02-10 Akira Kakuto <kakuto@fuk.kindai.ac.jp> Import gregorio-4.1.0-beta3. diff --git a/Build/source/texk/gregorio/gregorio-src-PATCHES/TL-Changes b/Build/source/texk/gregorio/gregorio-PATCHES/TL-Changes index 67e083a1dc3..2a0e7d400d0 100644 --- a/Build/source/texk/gregorio/gregorio-src-PATCHES/TL-Changes +++ b/Build/source/texk/gregorio/gregorio-PATCHES/TL-Changes @@ -1,5 +1,5 @@ -Changes applied to the gregorio-4.1.0-beta3 tree as obtained from: - https://github.com/gregorio-project/gregorio/releases/tag/v4.1.0-beta3/ +Changes applied to the gregorio-4.1.0-rc1 tree as obtained from: + https://github.com/gregorio-project/gregorio/releases/tag/v4.1.0-rc1/ Remove: Makefile.in diff --git a/Build/source/texk/gregorio/gregorio-src/._CHANGELOG.md b/Build/source/texk/gregorio/gregorio-src/._CHANGELOG.md Binary files differdeleted file mode 100644 index cd621b2a872..00000000000 --- a/Build/source/texk/gregorio/gregorio-src/._CHANGELOG.md +++ /dev/null diff --git a/Build/source/texk/gregorio/gregorio-src/._VersionManager.py b/Build/source/texk/gregorio/gregorio-src/._VersionManager.py Binary files differdeleted file mode 100644 index cd621b2a872..00000000000 --- a/Build/source/texk/gregorio/gregorio-src/._VersionManager.py +++ /dev/null diff --git a/Build/source/texk/gregorio/gregorio-src/.gregorio-version b/Build/source/texk/gregorio/gregorio-src/.gregorio-version index 409c908fa2e..423d25a1291 100644 --- a/Build/source/texk/gregorio/gregorio-src/.gregorio-version +++ b/Build/source/texk/gregorio/gregorio-src/.gregorio-version @@ -1,4 +1,4 @@ -4.1.0-beta3 +4.1.0-rc1 *** Do not modify this file. *** Use VersionManager.py to change the version. diff --git a/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md index 2c60b1d7c2e..89ea5efcdfd 100644 --- a/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md +++ b/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md @@ -5,6 +5,30 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased][unreleased] +## [4.1.0-rc1] - 2016-02-18 +### Fixed +- New bar spacing algorithm now accounts for translations (and other below lyrics stuff). +- Horizontal episema on initio debilis is now sized correctly (see [#880](https://github.com/gregorio-project/gregorio/issues/880)). +- Elisions immediately after the vowel are now properly left out of the center (see [#907](https://github.com/gregorio-project/gregorio/issues/907)) +- New bar spacing algorithm now respects the setting of `\gresetshiftaftermora`. See [#919](https://github.com/gregorio-project/gregorio/issues/919) +- Space between the text of two syllables of the same word when no hyphen is necessary is now strictly 0 (see [#922](https://github.com/gregorio-project/gregorio/issues/922)) +- A horizontal episema on the first note of a torculus deminutus is now placed correctly. See [#926](https://github.com/gregorio-project/gregorio/issues/926). +- Corrected determination of repercussive figures and other edge cases (introduced in 4.1.0-beta2). See [#928](https://github.com/gregorio-project/gregorio/issues/928) and [#929](https://github.com/gregorio-project/gregorio/issues/929). + +### Changed +- Adjustments to the heuristic for ledger lines to include adjacent notes (see [#862](https://github.com/gregorio-project/gregorio/issues/862)). +- The stem length determination will use the ledger line below the note with the stem (see [#863](https://github.com/gregorio-project/gregorio/issues/863)). +- Made the oriscus orientation dependent on the note that follows. Using `1` will force the ascending oriscus and `0` will force the descending oriscus. The old behavior may be restored by setting the `oriscus-orientation` gabc header to `legacy`. See UPGRADE.md for details (for the change request, see [#774](https://github.com/gregorio-project/gregorio/issues/774) and [#898](https://github.com/gregorio-project/gregorio/issues/898)). +- Add new lines as needed to the gabc output. (see [#905](https://github.com/gregorio-project/gregorio/issues/905)). +- Syllable with no notes are now treated as bar syllables rather than note syllables. This increase their spacing under the old algorithm and, more importantly, allows them to use the new spacing algorithm. +- `maxbaroffset` has been split into `maxbaroffsettextleft` and `maxbaroffsettextright` + +### Added +- Controls for tuning horizontal episema vertical position. See GregorioRef for details (for the change request, see [#872](https://github.com/gregorio-project/gregorio/issues/872)). +- More dimensions are tunable: `overhepisemalowshift`, `overhepisemahighshift`, `underhepisemalowshift`, `underhepisemahighshift`, `hepisemamiddleshift`, `vepisemalowshift`, `vepisemahighshift`, `linepunctummorashift`, `spacepunctummorashift`, `spaceamonepespunctummorashift`, `lineporrectuspunctummorashift`, `spaceporrectuspunctummorashift`, `raresignshift`, `interwordspacetext@bars`, `interwordspacetext@bars@euouae`. See GregorioRef for details (for the change request for most of these, see comments in [#872](https://github.com/gregorio-project/gregorio/issues/872)). +- A new dimension, `intersyllablespacestretchhyphen` is now available to add stretching in the case of syllables separated by an hyphen (see comments in [#922](https://github.com/gregorio-project/gregorio/issues/922)) + + ## [4.1.0-beta3] - 2016-02-09 ### Fixed - Missing file from manifests and system-setup scripts has been added (new bug in 4.1.0-beta2) @@ -54,7 +78,6 @@ As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). - The space between note and horizontal episema has been tightened for notes at the `c` or `k` height when there is no ledger line. Due to the intricacies of measurement, the system tries to make a best guess as to the existence of the ledger line. If the guess is wrong, you may use the `[hl:n]` and `[ll:n]` notations in gabc to override the guess. See [UPGRADE.md](UPGRADE.md) for details (for the change request, see [#716](https://github.com/gregorio-project/gregorio/issues/716)). - The custos that might appear immediately before a `<eu>` block is now suppressed by default. This behavior is controlled by the `\greseteolcustosbeforeeuouae` command. See GregorioRef and [UPGRADE.md](UPGRADE.md) for details (for the change request, see [#761](https://github.com/gregorio-project/gregorio/issues/761)). - Different glyphs will now be used for the liquescent stropha on a line or between lines, if supported by the font. If you prefer the old behavior, use `\grechangeglyph{StrophaAuctaLongtail}{*}{StrophaAucta}` in your TeX file. See [#773](https://github.com/gregorio-project/gregorio/issues/773). -- Made the oriscus orientation dependent on the note that follows. Using `<` will force the ascending oriscus and `>` will force the descending oriscus. The old behavior may be restored by setting the `oriscus-orientation` gabc header to `legacy`. See UPGRADE.md for details (for the change request, see [#774](https://github.com/gregorio-project/gregorio/issues/774)). - Headers not recognized by gregorio, rather than inducing an error, are now simply accepted by gregorio. Most of the old "standard" headers, like `book` and `manuscript-location`, are now handled in this way and thus are no longer limited to one instance. See GregorioRef for details. - `mode` will now be converted to Roman numerals in lower case so that it shows up as small capitals using the default `modeline` style. See [UPGRADE.md](UPGRADE.md) for details (for the change request, see [#756](https://github.com/gregorio-project/gregorio/issues/756)). - `\grecommentary` is now less restrictive about where it occurs and need not occur directly before the score anymore. diff --git a/Build/source/texk/gregorio/gregorio-src/UPGRADE.md b/Build/source/texk/gregorio/gregorio-src/UPGRADE.md index 47f65589469..e456ccf9956 100644 --- a/Build/source/texk/gregorio/gregorio-src/UPGRADE.md +++ b/Build/source/texk/gregorio/gregorio-src/UPGRADE.md @@ -42,7 +42,19 @@ If you prefer the old behavior, you may switch this off by issuing `\gresetledge In the past, Gregorio handled the notes of an `<eu>` block like any other, which meant that a custos would appear before the `<eu>` block if it happened to start on a new line. However, the '<eu>' block is not a continuation of the melody, but rather a reminder of the ending to use for the paired psalm tone. As a result, a custos immediately before an EUOUAE block is now suppressed by default. If you desire the old behaviour, use `\greseteolcustosbeforeeuouae{auto}` in your TeX document. To once again suppress the custos, use `\greseteolcustosbeforeeuouae{suppressed}`. -### Spacing around bars (divisio) with text underneath +### Spacing around bars + +#### New algorithm + +A new algorithm has been implemented but is turned off by default. We hope this will be a significant improvement over previous one, but it still has a few bugs. You can turn it on with + +``` +\gresetbarspacing{new} +``` + +If you do give it a try, please be sure to report any bugs you find. + +#### Spaces difference according to presence of text The following spaces have been added: @@ -56,7 +68,7 @@ By default, these are sized one half millimeter larger than their "non-text" cou ### Oriscus orientation -The oriscus orientation (whether it points up or down) is now dependent on the note the follows, even if the note is not directly connected to the oriscus (as it would be in a salicus or a pressus). Appending a `<` to an unconnected oriscus in gabc will force the oriscus to point upwards and `>` will force the oriscus to point downwards. +The oriscus orientation (whether it points up or down) is now dependent on the note the follows, even if the note is not directly connected to the oriscus (as it would be in a salicus or a pressus). Appending a `1` to an unconnected oriscus in gabc will force the oriscus to point upwards and `0` will force the oriscus to point downwards. Prior to version 4.1, Gregorio automatically oriented the oriscus when it was within a neume, but left the orientation up the user otherwise. If you prefer this behavior, set the `oriscus-orientation` header in gabc to `legacy`. In legacy mode, the orientation of an unconnected oriscus will (by default) point downwards and may be reversed by appending `<` or `>` to the oriscus. diff --git a/Build/source/texk/gregorio/gregorio-src/configure.ac b/Build/source/texk/gregorio/gregorio-src/configure.ac index acc41db0793..14266bf9c1c 100644 --- a/Build/source/texk/gregorio/gregorio-src/configure.ac +++ b/Build/source/texk/gregorio/gregorio-src/configure.ac @@ -16,8 +16,8 @@ dnl dnl You should have received a copy of the GNU General Public License dnl along with Gregorio. If not, see <http://www.gnu.org/licenses/>. -AC_INIT([gregorio],[4.1.0-beta3],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) -FILENAME_VERSION="4_1_0-beta3" +AC_INIT([gregorio],[4.1.0-rc1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/]) +FILENAME_VERSION="4_1_0-rc1" AC_SUBST(FILENAME_VERSION) AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names]) MK="" diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/._Makefile.am b/Build/source/texk/gregorio/gregorio-src/contrib/._Makefile.am Binary files differdeleted file mode 100644 index cd621b2a872..00000000000 --- a/Build/source/texk/gregorio/gregorio-src/contrib/._Makefile.am +++ /dev/null diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/._system-setup.bat b/Build/source/texk/gregorio/gregorio-src/contrib/._system-setup.bat Binary files differdeleted file mode 100644 index 6adb72ec537..00000000000 --- a/Build/source/texk/gregorio/gregorio-src/contrib/._system-setup.bat +++ /dev/null diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/._system-setup.command b/Build/source/texk/gregorio/gregorio-src/contrib/._system-setup.command Binary files differdeleted file mode 100644 index 14f037e2011..00000000000 --- a/Build/source/texk/gregorio/gregorio-src/contrib/._system-setup.command +++ /dev/null diff --git a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim index 654c06bab90..cb8b08b7f40 100644 --- a/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim +++ b/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim @@ -1,7 +1,6 @@ " Vim syntax file " Language: Gabc gregorian chant notation -" Maintainer: Elie Roux <elie.roux@telecom-bretagne.eu> -" Last Change: 2008 Nov 29 +" Last Change: 2016 Feb 11 " Quit when a (custom) syntax file was already loaded if exists("b:current_syntax") @@ -9,24 +8,79 @@ if exists("b:current_syntax") endif syn match gabcAttributeName /^[^:]*:/ -syn match gabcAttributeNameb ";" -syn match gabcTextMarkup "</\?\w>" contained -syn match gabcTranslation "\[[^\[\(]*\]\?" contained -syn match gabcBasicNote "[a-mA-M]" contained -syn match gabcAlteration "[\<\>~xXyYvVoOwWqQ\-Ss\._'1234]" contained -syn match gabcSpace "[`,;!: /zZ]" contained -syn region gabcNotes matchgroup=gabcNote start="(" end=")" contains=gabcBasicNote,gabcAlteration,gabcSpace contained -syn region gabcText start="%%" end="%%zz" contains=gabcNotes,gabcTextMarkup,gabcTranslation +syn match gabcAttributeEnd ";" +syn match gabcNoteError "." contained +syn match gabcBasicNote "[a-npA-NP]" contained +syn match gabcAlteration "[\<\>~xy#vVwWqQR\-Ss\.+]" contained +syn match gabcAlteration "_[0-5]*" contained +syn match gabcAlteration "[oO'\.][01]\?" contained +syn match gabcAlteration "r[0-5]\?" contained +syn match gabcClef "[cf]b\?[1-5]" contained +syn match gabcTextMarkup "</\?e>" contained +syn match gabcTextMarkup "</\?b>" contained +syn match gabcTextMarkup "</\?i>" contained +syn match gabcTextMarkup "</\?c>" contained +syn match gabcTextMarkup "</\?ul>" contained +syn match gabcTextMarkup "</\?tt>" contained +syn match gabcTextMarkup "</\?sc>" contained +syn match gabcTextMarkup "</\?eu>" contained +syn match gabcTextOrNoteMarkup "</\?nlba>" contained +syn match gabcTextCenter "[{}]" contained +syn match gabcFuse "@" contained +syn match gabcFuseEnd "\]" contained +syn match gabcBar "[`:]" contained +syn match gabcBar "[,;][1-8]\?" contained +syn match gabcSpace "[! ]" contained +syn match gabcSpace "/0\?" contained +syn match gabcSpace "z[-+0]\?" contained +syn match gabcSpace "Z[-+]\?" contained +syn match gabcSpace "/\[[^\]]*\]" contained extend +syn match gabcCommand "@\@<!\[[^\]]*\]" contained extend +syn region gabcComment start="%" end="$" contained keepend extend +syn region gabcAlt matchgroup=gabcTextMarkup start="<alt>" end="</alt>" + \ contained +syn region gabcSpecial matchgroup=gabcTextMarkup start="<sp>" end="</sp>" + \ contained +syn region gabcVerbatim matchgroup=gabcTextMarkup start="<v>" end="</v>" + \ contained +syn region gabcNabc matchgroup=gabcNabcCut start="|" end="[|)]" keepend +syn cluster gabcFusable contains=gabcBasicNote,gabcAlteration,gabcBar,gabcSpace, + \gabcComment,gabcCommand,gabcNoteError,gabcFuse, + \gabcTextOrNoteMarkup,gabcClef,gabcNabc +syn region gabcFuseGroup matchGroup=gabcFuseGroup start="@\[" end="\]" + \ contains=@gabcFusable,gabcFuseEnd contained keepend +syn region gabcNotes matchgroup=gabcNote start="(" end=")" + \ contains=@gabcFusable,gabcFuseGroup contained keepend +syn region gabcTranslation matchgroup=gabcTextMarkup start="\[" end="\]" + \ contained extend +syn region gabcText start="^\(%%\)\@=" end="\%$" + \ contains=gabcNotes,gabcTextMarkup,gabcTextOrNoteMarkup, + \gabcTextCenter,gabcTranslation,gabcComment,gabcAlt,gabcSpecial, + \gabcVerbatim " Define the default highlighting. -hi def link gabcAttributeName Comment -hi def link gabcAttributeNameb Comment -hi def link gabcText Comment -hi def link gabcTextMarkup PreProc -hi def link gabcBasicNote Statement -hi def link gabcNote Type -hi def link gabcAlteration Type -hi def link gabcSpace Special +hi def link gabcAttributeName Statement +hi def link gabcAttributeEnd Statement +hi def link gabcText Constant +hi def link gabcTranslation Constant +hi def link gabcComment Comment +hi def link gabcTextMarkup Delimiter +hi def link gabcTextOrNoteMarkup Delimiter +hi def link gabcTextCenter Delimiter +hi def link gabcSpecial Constant +hi def link gabcVerbatim Constant +hi def link gabcAlt Constant +hi def link gabcClef Statement +hi def link gabcBasicNote Statement +hi def link gabcAlteration PreProc +hi def link gabcCommand Type +hi def link gabcBar Special +hi def link gabcSpace Special +hi def link gabcNabcCut Delimiter +hi def link gabcFuse Constant +hi def link gabcFuseGroup Constant +hi def link gabcFuseEnd Constant +hi def link gabcNoteError Error let b:current_syntax = "gabc" diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex index 2a08b030f62..c8f9983dce0 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex +++ b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_User.tex @@ -926,10 +926,10 @@ Macro to change the behaviour for separation between notes of two syllables when & \texttt{never} & punctum mora are never ignored\\ \end{argtable} -When a punctum mora is ignored, the bar will also be shifted by \texttt{barmoraadjustment} (zero by default), see its description in the \textbf{Distances} section. +When a punctum mora is ignored, the bar will also be shifted by \texttt{moraadjustmentbar} (zero by default), see its description in the \nameref{distances} section. \macroname{\textbackslash gresetbarspacing}{\{\#1\}}{gregoriotex-syllable.tex} -Macro to activate the new bar spacing algorithm. The new algorithm attempts to place the bar line exactly midway between its surrounding notes. Any text associated with the bar is placed midway between its surrounding text. Since this might result in the bar line and the text being widely separated, there is also a limit to the distance between their centers: \texttt{maxbaroffset}. +Macro to activate the new bar spacing algorithm. The new algorithm attempts to place the bar line exactly midway between its surrounding notes. Any text associated with the bar is placed midway between its surrounding text. Since this might result in the bar line and the text being widely separated, there are also a limits to the distance between their respective centers: \texttt{maxbaroffsettextleft} and \texttt{maxbaroffsettextright} (when text center is respectively on the left or on the right of bar center). \begin{argtable} \#1 & \texttt{new} & Activates the new spacing algorithm\\ @@ -1021,11 +1021,11 @@ a different value be desired. \subsubsection{Headers} \macroname{\textbackslash gresetheadercapture}{\{\#1\}\{\#2\}\{\#3\}}{gregoriotex-main.tex} -Macro to tell Gregorio\TeX{} to capture a given header by calling a specified -macro. Passing an empty \#2 will cancel capture of the given header. +Macro to tell Gregorio\TeX{} to capture a given header of the gabc file, passing it to a +specified \TeX{} macro. Passing an empty \#2 will cancel capture of the given header. \begin{argtable} - \#1 & string & The name of the header\\ + \#1 & string & The name of the gabc header\\ \#2 & string & The name of the macro to use (without the leading backslash) or empty to stop capturing the given header\\ \#3 & string & a comma-separated list of options\\ @@ -1038,15 +1038,15 @@ The options are: \texttt{string} & The header value should be passed to the macro as a string\\ \end{tabular} -If the \texttt{name} option is not supplied, the macro supplied must take one +If the \texttt{name} option is not supplied, the macro is called with one argument: the value of the header. -If the \texttt{name} option is supplied, the macro supplied must take two +If the \texttt{name} option is supplied, the macro is called with two arguments: the name and the value of the header (in that order). -If the \texttt{string} option is supplied, the value will be passed with all -non-space characters as \TeX{} catcode 12 (and all spaces as catcode 10). -If not, the value will be evaluated as \TeX{}. +If the \texttt{string} option is supplied, the value will be passed with +catcode 12 associated with all non-space characters (and catcode 10 for all spaces). +If not, the value will be evaluated as regular \TeX{} input. Other than the headers that define macros, which are not passed to \TeX{}, the headers will be processed in the order they were presented in the gabc @@ -1055,12 +1055,16 @@ file. Headers will be processed in the \TeX{} state at the point of the capturing macro produce something, it will be typeset within the same paragraph as the \verb=\gregorioscore= call. -Gregorio will call whatever is passed to \verb=\grebeforeheaders= before -processing a given set of headers and to \verb=\greafterheaders= after -processing them. +As an example, you can use + +\verb=\gresetheadercapture{commentary}{grecommentary}{string}= + +\noindent to capture the +\texttt{commentary} header of gabc files and feed it to \verb=\grecommentary=, +thus automatically printing the content of the header above the score. \macroname{\textbackslash grebeforeheaders}{\{\#1\}}{gregoriotex-main.tex} -Specifies something to be done before a set of headers is processed. +Specifies \TeX{} code processed before the processing of the headers of a score. Defaults to nothing. If this is called multiple times, the most recent call will define the behavior at the next set of headers. @@ -1069,7 +1073,7 @@ will define the behavior at the next set of headers. \end{argtable} \macroname{\textbackslash greafterheaders}{\{\#1\}}{gregoriotex-main.tex} -Specifies something to be done after a set of headers is processed. +Specifies \TeX{} code processed after the processing of the headers of a score. Defaults to nothing. If this is called multiple times, the most recent call will define the behavior at the next set of headers. @@ -1079,7 +1083,7 @@ will define the behavior at the next set of headers. \subsubsection{Ancient Notation} -For a full description of how to make use of the ancient notation capabilities of gregorio and Gregorio\TeX, look at the GregorioNabcRef documentation. The commands listed here allow the manipulation of settings related to that notation. +For a full description of how to make use of the ancient notation capabilities of Gregorio and Gregorio\TeX, look at the GregorioNabcRef documentation. The commands listed here allow the manipulation of settings related to that notation. \macroname{\textbackslash gresetnabcfont}{\{\#1\}\{\#2\}}{gregoriotex-nabc.tex} Macro to set the font to be used for the ancient notation. @@ -1176,6 +1180,11 @@ Space after a clef at the beginning of a line. Minimum space between notes of different syllables. \end{gdimension} +\begin{gdimension}{intersyllablespacestretchhyphen} +Stretching added in the case where the text of two syllables of the same word are +separated with an automatic hyphen. +\end{gdimension} + \begin{gdimension}{interwordspacenotes} Minimum space between notes of syllables from different words. \end{gdimension} @@ -1184,6 +1193,10 @@ Minimum space between notes of syllables from different words. Minimum space between texts of different words. Please keep the same \texttt{plus} and \texttt{minus} as \texttt{interwordspacenotes}. \end{gdimension} +\begin{gdimension}{interwordspacetext@bars} +Minimum space between texts of different words when one of the syllable contains only a bar. +\end{gdimension} + \begin{gdimension}{interwordspacenotes@alteration} Same as \texttt{interwordspacenotes} for the case where the second syllable starts with an alteration. \end{gdimension} @@ -1200,6 +1213,10 @@ Same as \texttt{interwordspacenotes} for \texttt{euouae} blocks. Same as \texttt{interwordspacetext} for \texttt{euouae} blocks. \end{gdimension} +\begin{gdimension}{interwordspacetext@bars@euouae} +Same as \texttt{interwordspacetext@bars} for \texttt{euouae} blocks. +\end{gdimension} + \begin{gdimension}{bitrivirspace} Space between notes of a bivirga or trivirga. \end{gdimension} @@ -1329,7 +1346,7 @@ Additional space that will appear around bars that are preceded by a custos and \end{gdimension} \begin{gdimension}{textbartextspace} -Space between the text and the text of the bar. +Space between the text of previous syllable and the text associated with the bar (old bar spacing algorithm only). \end{gdimension} \begin{gdimension}{notebarspace} @@ -1467,8 +1484,64 @@ Distance an over-the-notes slur will be raised above the baseline of a note at t Distance an under-the-notes slur will be raised above the baseline of a note at the same height. \end{gdimension} -\begin{gdimension}{maxbaroffset} -When the new bar spacing algorithm is active, this is the maximum distance by which a bar and its associated text can be separated. +\begin{gdimension}{maxbaroffsettextleft} +Maximum distance by which the center of a bar and the center of its associated text can be separated, when the center of the text goes left of the center of the bar (new bar spacing algorithm only). +\end{gdimension} + +\begin{gdimension}{maxbaroffsettextright} +Same as \texttt{maxbaroffsettextleft} but when the center of the text goes right of the center of the bar. +\end{gdimension} + +\begin{gdimension}{overhepisemalowshift} +Distance to place a a horizontal episema over a note in a low position in the space. +\end{gdimension} + +\begin{gdimension}{overhepisemahighshift} +Distance to place a horizontal episema over a note in a high position in the space. +\end{gdimension} + +\begin{gdimension}{underhepisemalowshift} +Distance to place a horizontal episema under a note in a low position in the space. +\end{gdimension} + +\begin{gdimension}{underhepisemahighshift} +Distance to place a horizontal episema under a note in a high position in the space. +\end{gdimension} + +\begin{gdimension}{hepisemamiddleshift} +Distance to place a horizontal episema in the middle of a space. +\end{gdimension} + +\begin{gdimension}{vepisemalowshift} +Distance to place a vertical episema in a low position in the space. +\end{gdimension} + +\begin{gdimension}{vepisemahighshift} +Distance to place a vertical episema in a high position in the space. +\end{gdimension} + +\begin{gdimension}{linepunctummorashift} +Vertical distance to place a punctum mora for a note on a line. +\end{gdimension} + +\begin{gdimension}{spacepunctummorashift} +Vertical distance to place a punctum mora for a note in a space. +\end{gdimension} + +\begin{gdimension}{spaceamonepespunctummorashift} +Vertical distance to place a punctum mora for the second note (in a space) of a pes with ambitus one. +\end{gdimension} + +\begin{gdimension}{lineporrectuspunctummorashift} +Vertical distance to place a punctum mora for the second note in a porrectus (or similar figure), on a line +\end{gdimension} + +\begin{gdimension}{spaceporrectuspunctummorashift} +Vertical distance to place a punctum mora for the second note in a porrectus (or similar figure), in a space +\end{gdimension} + +\begin{gdimension}{raresignshift} +Distance to place a ``rare'' sign above the top space in a score. \end{gdimension} diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex index 9798b70d8f5..97da3bf208e 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex +++ b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_gregorio.tex @@ -454,7 +454,7 @@ Macro used to pass headers to TeX. \#2 & string & The header value.\\ \end{argtable} -\macroname{\textbackslash GreHEpisema}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex} +\macroname{\textbackslash GreHEpisema}{\#1\#2\#3\#4\#5\#6\#7\#8\#9}{gregoriotex-signs.tex} Macro to typeset an horizontal episema. \begin{argtable} @@ -473,9 +473,16 @@ Macro to typeset an horizontal episema. & \texttt{r} & a small episema aligned right\\ \#6 & integer & Replacement for \#1 if a bridge causes a height substitution.\\ \#7 & \TeX\ code & code that sets heuristics\\ + \#8 & string & a positive or negative "nudge" (dimension) for the vertical position of the horizontal episema\\ + \#9 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\ + & \texttt{1} & for horizontal episema cases, position in the middle of the space\\ + & \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\ + & \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\ + & \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\ + & \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\ \end{argtable} -\macroname{\textbackslash GreHEpisemaBridge}{\#1\#2\#3\#4}{gregoriotex-signs.tex} +\macroname{\textbackslash GreHEpisemaBridge}{\#1\#2\#3\#4\#5\#6}{gregoriotex-signs.tex} Macro to typeset a bridge episema for the last note of a glyph (element, syllable) if the next episema is at the same height. @@ -496,6 +503,13 @@ Macro to typeset a bridge episema for the last note of a glyph & \texttt{10} & Space between puncta inclinata (also debilis for now), larger ambitus (range=3rd).\\ & \texttt{11} & Space between puncta inclinata (also debilis for now), larger ambitus (range=4th or more).\\ \#4 & \TeX\ code & code that sets heuristics\\ + \#5 & string & a positive or negative "nudge" (dimension) for the vertical position of the horizontal episema\\ + \#6 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\ + & \texttt{1} & for horizontal episema cases, position in the middle of the space\\ + & \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\ + & \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\ + & \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\ + & \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\ \end{argtable} \macroname{\textbackslash GreHighChoralSign}{\#1\#2\#3}{gregoriotex-signs.tex} diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex index cb2f6b1470d..8577c6c1975 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex +++ b/Build/source/texk/gregorio/gregorio-src/doc/Command_Index_internal.tex @@ -116,7 +116,7 @@ Calculates the baseline correction for the glyphs. Dependent on \texttt{gre@fac \macroname{\textbackslash gre@computespaces}{}{gregoriotex-spaces.tex} Aggregates all of the global distance calculations and calls them in the order needed to respect dependencies. -\macroname{\textbackslash gre@calculate@glyphraisevalue}{\#1\#2}{gregoriotex-spaces.tex} +\macroname{\textbackslash gre@calculate@glyphraisevalue}{\#1\#2\#3}{gregoriotex-spaces.tex} Calculates the raise value for a glyph (glyphraisevalue) based on where it is to be placed and what kind of a glyph it is. This is a time of use calculation. \begin{argtable} @@ -137,6 +137,12 @@ Calculates the raise value for a glyph (glyphraisevalue) based on where it is to & \texttt{14} & case of the punctum mora in a space with a note on the line below it\\ & \texttt{15} & case of the over-the-notes slur\\ & \texttt{16} & case of the under-the-notes slur\\ + \#3 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\ + & \texttt{1} & for horizontal episema cases, position in the middle of the space\\ + & \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\ + & \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\ + & \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\ + & \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\ \end{argtable} \macroname{\textbackslash gre@stafflinefactor}{}{gregoriotex-spaces.tex} @@ -603,7 +609,7 @@ Macro for aligning clivis syllables according to the flag \verb=\gre@clivisalign & \texttt{1} & this is for the next syllable\\ \end{argtable} -\macroname{\textbackslash gre@hepisorline}{\#1\#2\#3\#4\#5}{gregoriotex-signs.tex} +\macroname{\textbackslash gre@hepisorline}{\#1\#2\#3\#4\#5\#6\#7}{gregoriotex-signs.tex} Macro to typeset a horizontal line (either an additional staff line or an episema). \begin{argtable} @@ -622,6 +628,13 @@ Macro to typeset a horizontal line (either an additional staff line or an episem & \texttt{l} & a small episema aligned left\\ & \texttt{c} & a small episema aligned center\\ & \texttt{r} & for a small episema aligned right\\ + \#6 & string & a positive or negative "nudge" (dimension) for the vertical position of the horizontal episema\\ + \#7 & \texttt{0} & for horizontal episema cases, use automatic positioning within the space\\ + & \texttt{1} & for horizontal episema cases, position in the middle of the space\\ + & \texttt{2} & for horizontal episema cases, position low within the space as if the episema is over the note\\ + & \texttt{3} & for horizontal episema cases, position high within the space as if the episema is under the note\\ + & \texttt{4} & for horizontal episema cases, position low within the space as if the episema is over the note\\ + & \texttt{5} & for horizontal episema cases, position high within the space as if the episema is under the note\\ \end{argtable} \macroname{\textbackslash gre@hepisorlineaux}{\#1\#2\#3\#4}{gregoriotex-signs.tex} @@ -1843,8 +1856,9 @@ rather than have multiple definitions. \texttt{8} & flexus with an ambitus of one\\ \texttt{9} & flexus deminutus\\ \texttt{10} & virgula\\ - \texttt{11} & divisio minima, minor and maior\\ - \texttt{12} & divisio finalis + \texttt{11} & divisio minima, minor, maior or dominican bar\\ + \texttt{12} & divisio finalis\\ + \texttt{13} & no note \end{tabulary} \subsection{Episema Special}\label{EpisemaSpecial} diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex b/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex index b770c35b457..27ef298188b 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex +++ b/Build/source/texk/gregorio/gregorio-src/doc/Gabc.tex @@ -220,9 +220,8 @@ line (\textit{d}). Most of the time they will take a short form: But when a ledger line is drawn below these notes, they should take a long form. The problem is that many cases are ambiguous: for instance if a note is close to a ledger line, one may want to make it long, others may not. -To solve this problem, you can add \texttt{[ll:0]} to any note of a glyph to -force the stem of the glyph to get its short form, or \texttt{[ll:1]} to force -its long form. +To solve this problem, you can add \texttt{[ll:0]} to the note carrying the stem +to get its short form, or \texttt{[ll:1]} to force its long form. % This snippet makes LuaTeX segfault! %\gabcsnippet{ @@ -283,22 +282,107 @@ the same meaning as before, but applies to both ends of the slur. Use \texttt{uslur} instead of \texttt{oslur} (with either form) to create an under-the-staff slur. +\subsection{Horizontal episema placement for very high and low notes} + +Gregorio places horizontal episema under c and above k (or the not above upper line when +staff does not have exactly 4 lines) closer to the notes when no ledger line is present. +The heuristics used by Gregorio are not perfect so it may be necessary to make +the presence or absence of ledger line explicit for horizontal episema placement. +This is done in the exact same way as for stem length: place \texttt{[ll:0]} or +\texttt{[ll:1]} on the note carrying the episema, to force gregorio to consider the +absence or presence of a ledger line in episema placement. + +\subsection{Horizontal Episema Tuning} + +The horizontal episema position within the space can be adjusted should the +defaults not be satisfactory. + +There are five tunable dimensions: + +\begin{tabularx}{\textwidth}{l|X} + Dimension & Description \\ + \hline + \texttt{overhepisemalowshift} & The shift for positioning a horizontal episema that is over a note in a low position in the space\\ + \texttt{overhepisemahighhift} & The shift for positioning a horizontal episema that is over a note in a high position in the space\\ + \texttt{underhepisemalowshift} & The shift for positioning a horizontal episema that is under a note in a low position in the space\\ + \texttt{underhepisemahighhift} & The shift for positioning a horizontal episema that is under a note in a high position in the space\\ + \texttt{hepisemamiddleshift} & The shift for centering the horizontal episema in the middle of a space\\ +\end{tabularx} + +In addition, gabc allows you to adjust the positioning of a given episema by +appending \texttt{[oh:\textit{p}]} (for the episema over the note) or +\texttt{[uh:\textit{p}]} (for the episema under the note). Here, +\texttt{\textit{p}} is an optional position specifier followed by an optional +nudge. However at least one or the other must be specified. + +The position specifier allows you to select which of the five tunable +dimensions will be used for the base position: + +\begin{tabularx}{\textwidth}{l|X} + Specifier & Base shift \\ + \hline + \textit{omitted} & Use the default shift based on the position of the episema relative to the note\\ + \texttt{m} & Use \texttt{hepisemamiddleshift}.\\ + \texttt{l} & Use \texttt{overhepisemalowshift} or \texttt{underhepisemalowshift} depending on whether the episema is over or under the note.\\ + \texttt{h} & Use \texttt{overhepisemahighshift} or \texttt{underhepisemahighshift} depending on whether the episema is over or under the note.\\ + \texttt{ol} & Use \texttt{overhepisemalowshift}.\\ + \texttt{oh} & Use \texttt{overhepisemahighshift}.\\ + \texttt{ul} & Use \texttt{underhepisemalowshift}.\\ + \texttt{uh} & Use \texttt{underhepisemahighshift}.\\ +\end{tabularx} + +The nudge is a \TeX{} dimension specification (number and units) that starts +with \texttt{+} for a nudge upwards or \texttt{-} for a nudge downwards from +base position selected by the position speciifer. If omitted, the episema will +be drawn at the base position. + +In addition, gabc also allows you to specify that a block of notes---possibly +separated with spaces and in different syllables--should be considered a single +unit when it comes to positioning the horizontal episema. To do this, put +\texttt{[oh:\textit{p}\{]} (for the episema over the note) or +\texttt{[uh:\textit{p}\{]} (for the episema under the note) before the first +note of the block and the corresponding \texttt{[oh\}]} or \texttt{[uh\}]} +after the last note of the block. When using this syntax, \texttt{\textit{p}} +is the position specifier as before, but is entirely optional, and when +completely omitted, allows the \texttt{:} to also be omitted. + \subsection{Lyric Centering} Gregorio centers the text of each syllable around the first note of each -syllable. There are three basic modes: \verb:syllable:, \verb:vowel:, and \verb:firstletter:, which are selected with the command \verb=\gresetlyriccentering{<mode>}=. In \texttt{syllable} mode, the -entire syllable is centered around the first note. This is common in -modern music. In \texttt{vowel} mode, the vowel sound of the syllable is -centered around the first note. This is common in most Gregorian chant -books with text in Latin. In \texttt{firstletter} mode, the first letter of the syllable is centered around the first note. While not a common choice, this was explicitly requested by a user and we try to be responsive to our user base. +syllable. There are three basic modes, selected with the command \verb=\gresetlyriccentering{<mode>}=: + +\begin{description} +\item[syllable] the entire syllable is centered around the first note +\item[firstletter] the first letter of the syllable is centered around the first note +\item[vowel] the vowel sound of the syllable is centered around the first note +\end{description} + +The default is \texttt{vowel}, being common in most Gregorian chant +books with text in Latin. + +All modes allow you to force the centering with curly brackets, +for example \verb=a{b}c= will center the notes around \texttt{b}. + +\subsubsection{Vowel detection} The default rules built into Gregorio for \texttt{vowel} mode are for Ecclesiatical Latin and work fairly well (though not perfectly) for other languages (especially Romance languages). However, Gregorio provides a gabc \texttt{language} header which allows the language of -the lyrics to be set. Gregorio will look for a file named +the lyrics to be set. The default is Latin. + +Special characters (input with \texttt{<sp>}) or verbatim text (\texttt{<v>}) +count as consonants, so you have to force centering around them, for example +\verb=gr{<sp>'ae</sp>}=. If an elision (input with \texttt{<e>}) is present in +the syllable, Gregorio will consider it as consonant too. + +If no vowel is found, the notes are centered around the whole syllable. + +\subsubsection{Vowel file} + +When run, Gregorio will look for a file named \texttt{gregorio-vowels.dat} in your working directory or amongst the -GregorioTeX files. If it finds the requested language (matched in a +GregorioTeX files. If it finds the language requested by the header (matched in a \emph{case-sensitive} fashion) in one of these files (henceforth called vowel files), Gregorio will use the rules contained within for vowel centering. If it cannot find the requested language in any of the vowel diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_0-beta3.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_0-rc1.pdf Binary files differindex 51564c9754e..4bd86d99db4 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_0-beta3.pdf +++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioNabcRef-4_1_0-rc1.pdf diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta3.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta3.pdf Binary files differdeleted file mode 100644 index ae826264761..00000000000 --- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-beta3.pdf +++ /dev/null diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-rc1.pdf b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-rc1.pdf Binary files differnew file mode 100644 index 00000000000..e6807bd2cf4 --- /dev/null +++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef-4_1_0-rc1.pdf diff --git a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex index ff6df09c4dd..0125d118a2b 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex +++ b/Build/source/texk/gregorio/gregorio-src/doc/GregorioRef.tex @@ -122,7 +122,7 @@ {\endtabularx\bigskip} \makeatletter% -\NewDocumentEnvironment{gdimension}{m}{\macroname{#1}{}{gp-default.tex}}{% +\NewDocumentEnvironment{gdimension}{m}{\macroname{#1}{}{gsp-default.tex}}{% \gre@rubberpermit{#1}% \ifgre@rubber% @@ -152,7 +152,7 @@ \vspace{1cm} - \large Version \textbf{4.1.0-beta3}, 9 February 2016 %% PARSE_VERSION_DATE + \large Version \textbf{4.1.0-rc1}, 18 February 2016 %% PARSE_VERSION_DATE \vspace{1.5cm} \end{center} diff --git a/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am b/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am index 0c971c18a05..b6b9a8018c1 100644 --- a/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am +++ b/Build/source/texk/gregorio/gregorio-src/doc/Makefile.am @@ -49,10 +49,12 @@ pdf-local: doc distclean-local: latexmk -quiet -c -f -jobname=GregorioRef-@FILENAME_VERSION@ GregorioRef.tex latexmk -quiet -c -f -jobname=GregorioNabcRef-@FILENAME_VERSION@ GregorioNabcRef.tex - rm -rf _minted* factus.gtex veni.gtex + rm -rf _minted* *.gtex *.aux *.gaux EXTRA_DIST = $(SRCFILES) $(NABCSRCFILES) \ GregorioRef-@FILENAME_VERSION@.pdf \ GregorioNabcRef-@FILENAME_VERSION@.pdf -MAINTAINERCLEANFILES = GregorioRef-@FILENAME_VERSION@.pdf \ - GregorioNabcRef-@FILENAME_VERSION@.pdf + +maintainer-clean-local: + rm -rf GregorioRef*.pdf + rm -rf GregorioRef-* GregorioNabcRef-* diff --git a/Build/source/texk/gregorio/gregorio-src/examples/._Makefile.am b/Build/source/texk/gregorio/gregorio-src/examples/._Makefile.am Binary files differdeleted file mode 100644 index cd621b2a872..00000000000 --- a/Build/source/texk/gregorio/gregorio-src/examples/._Makefile.am +++ /dev/null diff --git a/Build/source/texk/gregorio/gregorio-src/examples/._debugging.tex b/Build/source/texk/gregorio/gregorio-src/examples/._debugging.tex Binary files differdeleted file mode 100644 index ea5fb3922eb..00000000000 --- a/Build/source/texk/gregorio/gregorio-src/examples/._debugging.tex +++ /dev/null diff --git a/Build/source/texk/gregorio/gregorio-src/src/characters.c b/Build/source/texk/gregorio/gregorio-src/src/characters.c index b840587c31c..51c68b51f96 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/characters.c +++ b/Build/source/texk/gregorio/gregorio-src/src/characters.c @@ -893,16 +893,29 @@ void gregorio_rebuild_characters(gregorio_character **const param_character, switch (current_character->cos.s.type) { case ST_T_BEGIN: /* the beginning of a style */ - switch (style) { - case ST_VERBATIM: - case ST_SPECIAL_CHAR: - /* if we are determining the end of the middle and we have - * a VERBATIM or SPECIAL_CHAR style, we end the center - * determination */ - if (center_is_determined == CENTER_DETERMINING_MIDDLE) { + + if (center_is_determined == CENTER_DETERMINING_MIDDLE + && index == end - 1) { + /* if we are determining the end of the center and we have + * a, ELISION, VERBATIM or SPECIAL_CHAR style, we end the + * center determination */ + switch (style) { + case ST_VERBATIM: + case ST_SPECIAL_CHAR: + case ST_ELISION: end_center(center_type, current_character, &first_style); center_is_determined = CENTER_FULLY_DETERMINED; + break; + + default: + /* something else; don't do anything */ + break; } + } + + switch (style) { + case ST_VERBATIM: + case ST_SPECIAL_CHAR: /* Here we pass all the characters after a verbatim (or * special char) beginning, until we find a style (begin or * end) */ diff --git a/Build/source/texk/gregorio/gregorio-src/src/dump/dump.c b/Build/source/texk/gregorio/gregorio-src/src/dump/dump.c index 8fd22fcf508..c394acf3fa4 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/dump/dump.c +++ b/Build/source/texk/gregorio/gregorio-src/src/dump/dump.c @@ -90,6 +90,22 @@ static const char *dump_pitch(const char height, const char highest_pitch) { return buf; } +static void dump_hepisema_adjustment(FILE *const f, const gregorio_note *note, + const gregorio_sign_orientation orientation, const char *const which) { + unsigned short index = note->he_adjustment_index[orientation]; + if (index) { + gregorio_hepisema_adjustment *adj = gregorio_get_hepisema_adjustment( + index); + fprintf(f, " %s hepisema group %d\n", which, index); + fprintf(f, " %s hep. vbasepos %d (%s)\n", which, + adj->vbasepos, + gregorio_hepisema_vbasepos_to_string(adj->vbasepos)); + if (adj->nudge) { + fprintf(f, " %s hepisema nudge %s\n", which, adj->nudge); + } + } +} + void dump_write_score(FILE *f, gregorio_score *score) { gregorio_voice_info *voice_info = score->first_voice_info; @@ -452,6 +468,9 @@ void dump_write_score(FILE *f, gregorio_score *score) dump_bool(note->h_episema_below_connect)); } } + dump_hepisema_adjustment(f, note, SO_OVER, "above"); + dump_hepisema_adjustment(f, note, SO_UNDER, + "below"); if (note->explicit_high_ledger_line) { fprintf(f, " explicit high line %s\n", dump_bool(note->supposed_high_ledger_line)); diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-elements-determination.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-elements-determination.c index dddde3ae4b8..d279f6a3d59 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-elements-determination.c +++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-elements-determination.c @@ -28,40 +28,37 @@ #include "gabc.h" -/* - * - * two inline functions that will be useful in the future: they are the tests - * to put in a if statement to determine if a glyph type is puncta incliata - * ascendens or descendens - * - */ +#define SINGLE_NOTE_GLYPH \ + G_PUNCTUM: \ + case G_VIRGA: \ + case G_BIVIRGA: \ + case G_TRIVIRGA: \ + case G_VIRGA_REVERSA: \ + case G_STROPHA: \ + case G_STROPHA_AUCTA: \ + case G_DISTROPHA: \ + case G_DISTROPHA_AUCTA: \ + case G_TRISTROPHA: \ + case G_TRISTROPHA_AUCTA -static __inline bool is_puncta_ascendens(gregorio_glyph_type glyph) -{ - switch (glyph) { - case G_2_PUNCTA_INCLINATA_ASCENDENS: - case G_3_PUNCTA_INCLINATA_ASCENDENS: - case G_4_PUNCTA_INCLINATA_ASCENDENS: - case G_5_PUNCTA_INCLINATA_ASCENDENS: - case G_PUNCTUM_INCLINATUM: - return true; - default: - return false; - } -} +#define PUNCTA_INCLINATA_ASCENDENS_GLYPH \ + G_2_PUNCTA_INCLINATA_ASCENDENS: \ + case G_3_PUNCTA_INCLINATA_ASCENDENS: \ + case G_4_PUNCTA_INCLINATA_ASCENDENS: \ + case G_5_PUNCTA_INCLINATA_ASCENDENS + +#define PUNCTA_INCLINATA_DESCENDENS_GLYPH \ + G_2_PUNCTA_INCLINATA_DESCENDENS: \ + case G_3_PUNCTA_INCLINATA_DESCENDENS: \ + case G_4_PUNCTA_INCLINATA_DESCENDENS: \ + case G_5_PUNCTA_INCLINATA_DESCENDENS -static __inline bool is_puncta_descendens(gregorio_glyph_type glyph) +static __inline signed char glyph_note_ambitus( + const gregorio_glyph *const current_glyph, + const gregorio_glyph *const previous_glyph) { - switch (glyph) { - case G_2_PUNCTA_INCLINATA_DESCENDENS: - case G_3_PUNCTA_INCLINATA_DESCENDENS: - case G_4_PUNCTA_INCLINATA_DESCENDENS: - case G_5_PUNCTA_INCLINATA_DESCENDENS: - case G_PUNCTUM_INCLINATUM: - return true; - default: - return false; - } + return current_glyph->u.notes.first_note->u.note.pitch - + gregorio_glyph_last_note(previous_glyph)->u.note.pitch; } /* @@ -93,14 +90,12 @@ static void close_element(gregorio_element **current_element, */ static __inline void cut_before(gregorio_glyph *current_glyph, gregorio_glyph **first_glyph, - gregorio_glyph **previous_glyph, gregorio_element **current_element) { if (*first_glyph != current_glyph) { close_element(current_element, first_glyph, current_glyph); /* yes, this is changing value close_element sets for first_glyph */ *first_glyph = current_glyph; - *previous_glyph = current_glyph; } } @@ -123,10 +118,9 @@ static gregorio_element *gabc_det_elements_from_glyphs( gregorio_glyph *first_glyph = current_glyph; /* the last real (GRE_GLYPH) that we have processed */ gregorio_glyph *previous_glyph = NULL; - /* a char that is necessary to determine some cases */ + /* boolean necessary to determine some cases */ bool do_not_cut = false; - /* a char that is necesarry to determine the type of the current_glyph */ - gregorio_glyph_type current_glyph_type; + bool force_cut = false; gregorio_not_null(current_glyph, gabc_det_elements_from_glyphs, return NULL); /* first we go to the first glyph in the chained list of glyphs (maybe to @@ -135,6 +129,7 @@ static gregorio_element *gabc_det_elements_from_glyphs( while (current_glyph) { if (current_glyph->type != GRE_GLYPH) { + force_cut = false; /* we must not cut after a glyph-level space */ if (current_glyph->type == GRE_SPACE) { switch (current_glyph->u.misc.unpitched.info.space) { @@ -151,9 +146,8 @@ static gregorio_element *gabc_det_elements_from_glyphs( /* any other space should be handled normally */ break; } - } - /* we must not cut after a texverb */ - if (current_glyph->type == GRE_TEXVERB_GLYPH) { + } else if (current_glyph->type == GRE_TEXVERB_GLYPH) { + /* we must not cut after a texverb */ if (!current_glyph->next) { close_element(¤t_element, &first_glyph, current_glyph); } @@ -162,8 +156,7 @@ static gregorio_element *gabc_det_elements_from_glyphs( continue; } /* clef change or space or end of line */ - cut_before(current_glyph, &first_glyph, &previous_glyph, - ¤t_element); + cut_before(current_glyph, &first_glyph, ¤t_element); /* if statement to make neumatic cuts not appear in elements, as * there is always one between elements, unless the next element * is a space */ @@ -189,84 +182,94 @@ static gregorio_element *gabc_det_elements_from_glyphs( if (is_fused(current_glyph->u.notes.liquescentia)) { do_not_cut = true; + } else if (force_cut) { + cut_before(current_glyph, &first_glyph, ¤t_element); + previous_glyph = NULL; } + force_cut = false; - if (is_puncta_ascendens(current_glyph->u.notes.glyph_type)) { - current_glyph_type = G_PUNCTA_ASCENDENS; - } else { - if (is_puncta_descendens(current_glyph->u.notes.glyph_type)) { - current_glyph_type = G_PUNCTA_DESCENDENS; - } else { - current_glyph_type = current_glyph->u.notes.glyph_type; - } - } - switch (current_glyph_type) { - case G_PUNCTA_ASCENDENS: + switch (current_glyph->u.notes.glyph_type) { + case PUNCTA_INCLINATA_ASCENDENS_GLYPH: + case G_PUNCTUM_INCLINATUM: case G_ALTERATION: if (!do_not_cut) { - cut_before(current_glyph, &first_glyph, &previous_glyph, - ¤t_element); + cut_before(current_glyph, &first_glyph, ¤t_element); do_not_cut = true; - } else { - previous_glyph = current_glyph; } break; - case G_PUNCTA_DESCENDENS: + + case PUNCTA_INCLINATA_DESCENDENS_GLYPH: /* we don't cut before, so we don't do anything */ if (do_not_cut) { do_not_cut = false; } break; - /* one note glyphs */ - case G_PUNCTUM: - case G_VIRGA: - case G_BIVIRGA: - case G_TRIVIRGA: - case G_VIRGA_REVERSA: - case G_STROPHA: - case G_STROPHA_AUCTA: - case G_DISTROPHA: - case G_DISTROPHA_AUCTA: - case G_TRISTROPHA: - case G_TRISTROPHA_AUCTA: - if (previous_glyph && !is_tail_liquescentia( + + default: + if (previous_glyph && previous_glyph->type == GRE_GLYPH + && !is_tail_liquescentia( previous_glyph->u.notes.liquescentia)) { - if (previous_glyph) { - signed char last_pitch; + bool break_early = false; + signed char ambitus; + + switch (previous_glyph->u.notes.glyph_type) { + case SINGLE_NOTE_GLYPH: /* we determine the last pitch */ - gregorio_note *tmp_note; - tmp_note = previous_glyph->u.notes.first_note; - while (tmp_note->next) { - tmp_note = tmp_note->next; - } - last_pitch = tmp_note->u.note.pitch; - if (current_glyph->u.notes.first_note->u.note.pitch - == last_pitch) { + ambitus = glyph_note_ambitus(current_glyph, previous_glyph); + if (ambitus == 0) { do_not_cut = false; - previous_glyph = current_glyph; + break_early = true; + } + break; + + case PUNCTA_INCLINATA_DESCENDENS_GLYPH: + case G_PUNCTUM_INCLINATUM: + switch (current_glyph->u.notes.glyph_type) { + case SINGLE_NOTE_GLYPH: + ambitus = glyph_note_ambitus(current_glyph, previous_glyph); + if (ambitus > -2 && ambitus < 2) { + do_not_cut = false; + break_early = true; + } + break; + + default: + /* do nothing in particular */ break; } + break; + + default: + /* do nothing in particular */ + break; + } + + if (break_early) { + break; } } - /* else we fall in the default case */ - default: + if (do_not_cut) { do_not_cut = false; - previous_glyph = current_glyph; } else { - cut_before(current_glyph, &first_glyph, &previous_glyph, - ¤t_element); + cut_before(current_glyph, &first_glyph, ¤t_element); } } - /* - * we must determine the first element, that we will return - */ + + if (gregorio_glyph_last_note(current_glyph)->signs + & (_PUNCTUM_MORA | _AUCTUM_DUPLEX)) { + force_cut = true; + } + + /* we must determine the first element, that we will return */ if (!first_element && current_element) { first_element = current_element; } if (!current_glyph->next) { close_element(¤t_element, &first_glyph, current_glyph); } + + previous_glyph = current_glyph; current_glyph = current_glyph->next; } /* end of while */ diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-glyphs-determination.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-glyphs-determination.c index 8c5a0b86971..3d06eadda00 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-glyphs-determination.c +++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-glyphs-determination.c @@ -281,7 +281,9 @@ static char gregorio_add_note_to_a_glyph(gregorio_glyph_type current_glyph_type, *end_of_glyph = DET_END_OF_PREVIOUS; next_glyph_type = G_PES_QUILISMA_QUADRATUM_FIRST_PART; break; - case S_ORISCUS_SCAPUS: + case S_ORISCUS_SCAPUS_UNDETERMINED: + case S_ORISCUS_SCAPUS_ASCENDENS: + case S_ORISCUS_SCAPUS_DESCENDENS: if (current_glyph_type == G_PUNCTUM && last_pitch < current_pitch) { next_glyph_type = G_VIRGA_STRATA; } else { @@ -997,7 +999,7 @@ gregorio_glyph *gabc_det_glyphs_from_notes(gregorio_note *current_note, switch (current_note->u.note.shape) { case S_PUNCTUM: case S_ORISCUS_UNDETERMINED: - case S_ORISCUS_SCAPUS: + case S_ORISCUS_SCAPUS_UNDETERMINED: case S_QUILISMA: case S_QUADRATUM: case S_QUILISMA_QUADRATUM: diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c index df9700984f1..a776c4bb5cb 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c +++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c @@ -2209,7 +2209,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -58, -58, -58, -58, -58, -58, -58, -58, -58, -58, -58, -58, -58, -58, -58, -58, -58, -58, -58, -58, - -58, -58, -58, -58, -58, -58, -58, -58, -58, -58, + -58, -58, -58, -58, -58, -58, -58, -58, 128, 129, -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, @@ -2335,7 +2335,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, -62, - -62, -62, -62, 128, -62, 129, -62, -62, -62, -62, + -62, -62, -62, 130, -62, 131, -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, @@ -2372,9 +2372,9 @@ static yyconst flex_int32_t yy_nxt[][256] = -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, - -63, -63, -63, -63, -63, -63, -63, 130, -63, 131, - -63, 132, -63, 133, 134, -63, -63, -63, 135, -63, - 136, 137, -63, -63, -63, -63, -63, 138, -63, -63, + -63, -63, -63, -63, -63, -63, -63, 132, -63, 133, + -63, 134, -63, 135, 136, -63, -63, -63, 137, -63, + 138, 139, -63, -63, -63, -63, -63, 140, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, -63, @@ -2430,8 +2430,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, -65, - -65, -65, -65, -65, -65, -65, -65, -65, 139, 139, - 139, 139, 139, 139, -65, -65, -65, -65, -65, -65, + -65, -65, -65, -65, -65, -65, -65, -65, 141, 141, + 141, 141, 141, 141, -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, @@ -2493,7 +2493,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, -67, - -67, -67, -67, 140, -67, -67, -67, -67, -67, -67, + -67, -67, -67, 142, -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, @@ -2525,12 +2525,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, - -68, -68, -68, 140, -68, -68, -68, -68, -68, 141, - 141, 141, 141, 141, -68, -68, -68, -68, -68, -68, + -68, -68, -68, 142, -68, -68, -68, -68, -68, 143, + 143, 143, 143, 143, -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, 125, -68, -68, -68, - -68, -68, -68, -68, -68, -68, -68, -68, 142, -68, + -68, -68, -68, -68, -68, -68, -68, -68, 144, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, -68, 126, -68, -68, 127, -68, @@ -2556,7 +2556,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, - -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, + -69, -69, -69, -69, -69, -69, -69, -69, 145, 146, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, -69, @@ -2620,8 +2620,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -71, -71, -71, -71, -71, -71, -71, -71, -71, -71, -71, -71, -71, -71, -71, -71, -71, -71, -71, -71, - -71, -71, -71, -71, -71, -71, -71, -71, 143, 144, - 145, 146, 147, 148, -71, -71, -71, -71, -71, -71, + -71, -71, -71, -71, -71, -71, -71, -71, 147, 148, + 149, 150, 151, 152, -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, -71, -71, -71, @@ -2809,7 +2809,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, -77, - -77, -77, -77, 149, -77, 150, -77, -77, 151, -77, + -77, -77, -77, 153, -77, 154, -77, -77, 155, -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, @@ -2931,35 +2931,35 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, 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, + 39, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 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, -81, 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, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, -81, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 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, 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, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 152, 152, 152, 152, 152, 152, 152, 152, 152, 152, - 152, 152, 152, 152, 152, 152 + 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, + 156, 156, 156, 156, 156, 156 }, { @@ -2994,157 +2994,31 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, -83, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153 - }, - - { - 39, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, -84, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154 - - }, - - { - 39, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, -85, 155, 155, 155, 155, 155, 155, - - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155 - }, - - { - 39, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, -86, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - - 156, 156, 156, 156, 156, 156, 156, 156, 156, 156, - 156, 156, 156, 156, 156, 156 - }, - - { 39, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, - 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, - 157, 157, 157, -87, 157, 157, 157, 157, 157, 157, + 157, 157, 157, -83, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, - 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, + 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, 157, @@ -3153,66 +3027,65 @@ static yyconst flex_int32_t yy_nxt[][256] = { 39, 158, 158, 158, 158, 158, 158, 158, 158, 158, - -88, 158, 158, -88, 158, 158, 158, 158, 158, 158, - 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, + 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, + 158, 158, 158, -84, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, - 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, + 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, - 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158 + }, { - 39, -89, -89, -89, -89, -89, -89, -89, -89, -89, - 159, -89, -89, 159, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -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, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, -85, 159, 159, 159, 159, 159, 159, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - -89, -89, -89, -89, -89, -89 + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159 }, { @@ -3220,28 +3093,29 @@ static yyconst flex_int32_t yy_nxt[][256] = 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, + 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, - 160, 160, 160, -90, 160, 160, 160, 160, 160, 160, - + 160, 160, 160, -86, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, + 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, - 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, + 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160, 160 }, @@ -3251,35 +3125,36 @@ static yyconst flex_int32_t yy_nxt[][256] = 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, - 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, + 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, - 161, 161, 161, -91, 161, 161, 161, 161, 161, 161, + 161, 161, 161, -87, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, - 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, + 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, - 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161, 161 }, { 39, 162, 162, 162, 162, 162, 162, 162, 162, 162, + -88, 162, 162, -88, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, @@ -3287,22 +3162,21 @@ static yyconst flex_int32_t yy_nxt[][256] = 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, -92, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, @@ -3310,35 +3184,161 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + 39, -89, -89, -89, -89, -89, -89, -89, -89, -89, + 163, -89, -89, 163, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, -93, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89, -89, -89, -89, -89, + -89, -89, -89, -89, -89, -89 + + }, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163 + { + 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, -90, 164, 164, 164, 164, 164, 164, + + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 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, -91, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 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, -92, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 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, -93, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167 }, { @@ -3378,8 +3378,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, -95, - -95, -95, -95, -95, -95, -95, 164, -95, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165, -95, -95, + -95, -95, -95, -95, -95, -95, 168, -95, 169, 169, + 169, 169, 169, 169, 169, 169, 169, 169, -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, @@ -3410,8 +3410,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, -96, - -96, -96, -96, -96, -96, -96, -96, -96, 166, 166, - 166, 166, 166, 166, 166, 166, 166, 166, -96, -96, + -96, -96, -96, -96, -96, -96, -96, -96, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, -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, @@ -3441,13 +3441,13 @@ static yyconst flex_int32_t yy_nxt[][256] = -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, -97, - -97, -97, -97, -97, -97, -97, 167, -97, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165, -97, -97, + -97, -97, -97, -97, -97, -97, 171, -97, 169, 169, + 169, 169, 169, 169, 169, 169, 169, 169, -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, 168, -97, -97, -97, -97, -97, -97, + -97, -97, -97, 172, -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, @@ -3473,8 +3473,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, -98, - -98, -98, -98, -98, -98, -98, 169, -98, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, -98, -98, + -98, -98, -98, -98, -98, -98, 173, -98, 174, 174, + 174, 174, 174, 174, 174, 174, 174, 174, -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, @@ -3504,8 +3504,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, - -99, -99, -99, -99, -99, -99, -99, -99, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, -99, -99, + -99, -99, -99, -99, -99, -99, -99, -99, 175, 175, + 175, 175, 175, 175, 175, 175, 175, 175, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, -99, @@ -3536,12 +3536,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, -100, - -100, -100, -100, -100, -100, -100, 172, -100, 170, 170, - 170, 170, 170, 170, 170, 170, 170, 170, -100, -100, + -100, -100, -100, -100, -100, -100, 176, -100, 174, 174, + 174, 174, 174, 174, 174, 174, 174, 174, -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, 173, -100, -100, -100, -100, -100, -100, + -100, -100, -100, 177, -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, @@ -3563,159 +3563,33 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, -101, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, -101, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174 - }, - - { - 39, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, -102, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175 - }, - - { - 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, -103, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 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, -104, - - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, -104, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 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, -101, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, - 178, 178, 178, -105, 178, 178, 178, 178, 178, 178, - - 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, + 178, 178, 178, -101, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, + 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, - 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, + 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178 }, @@ -3725,34 +3599,160 @@ static yyconst flex_int32_t yy_nxt[][256] = 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, 179, - 179, 179, 179, 179, 179, 179, 179, 179, 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, -106, 179, 179, 179, 179, 179, 179, + 179, 179, 179, -102, 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, 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, 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 }, { + 39, 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, 180, 180, 180, + 180, 180, 180, 180, 180, 180, 180, 180, 180, 180, + 180, 180, 180, -103, 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, + 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, 180, 180, 180, 180, + 180, 180, 180, 180, 180, 180 + }, + + { + 39, 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, -104, + + 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, -104, 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, + 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 + + }, + + { + 39, 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, 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, 182, 182, 182, 182, 182, 182, 182, + 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, + 182, 182, 182, -105, 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, + 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, 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, 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, 182, 182, + 182, 182, 182, 182, 182, 182, 182, 182, 182, 182, + 182, 182, 182, 182, 182, 182 + }, + + { + 39, 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, 183, 183, 183, + 183, 183, 183, 183, 183, 183, 183, 183, 183, 183, + 183, 183, 183, -106, 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, + 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, 183, 183, 183, 183, + 183, 183, 183, 183, 183, 183 + }, + + { 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, @@ -3852,12 +3852,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, -110, 115, -110, -110, -110, -110, -110, -110, - -110, -110, -110, -110, -110, -110, -110, 180, 117, -110, + -110, -110, -110, -110, -110, -110, -110, 184, 117, -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, 181, -110, -110, -110, -110, -110, -110, -110, -110, + -110, 185, -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, @@ -4047,7 +4047,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, - -116, 182, -116, -116, -116, -116, -116, -116, -116, -116, + -116, 186, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, -116, @@ -4176,7 +4176,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, - 183, -120, -120, -120, -120, -120, -120, -120, -120, -120, + 187, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, -120, @@ -4206,7 +4206,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, -121, - -121, -121, -121, -121, -121, -121, -121, -121, 184, -121, + -121, -121, -121, -121, -121, -121, -121, -121, 188, -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, @@ -4294,13 +4294,13 @@ static yyconst flex_int32_t yy_nxt[][256] = -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, -124, - -124, -124, -124, -124, -124, -124, -124, -124, -124, 185, - 185, 185, 185, 185, -124, -124, -124, -124, -124, -124, + -124, -124, -124, -124, -124, -124, -124, -124, -124, 189, + 189, 189, 189, 189, -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, 186, -124, + -124, -124, -124, -124, -124, -124, -124, -124, 190, -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, @@ -4330,7 +4330,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, - -125, -125, -125, -125, -125, -125, 187, -125, -125, -125, + -125, -125, -125, -125, -125, -125, 191, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, -125, @@ -4365,7 +4365,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, - -126, -126, -126, -126, -126, 188, -126, -126, -126, -126, + -126, -126, -126, -126, -126, 192, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, -126, @@ -4397,7 +4397,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, - -127, -127, -127, -127, -127, -127, -127, -127, 189, -127, + -127, -127, -127, -127, -127, -127, -127, -127, 193, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, -127, @@ -4491,7 +4491,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, -130, - -130, -130, -130, -130, -130, -130, -130, -130, 190, -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, @@ -4523,7 +4523,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, -131, - 191, -131, -131, -131, -131, 192, -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, @@ -4554,7 +4554,6 @@ static yyconst flex_int32_t yy_nxt[][256] = -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, - -132, -132, -132, -132, -132, -132, -132, -132, -132, 193, -132, -132, -132, -132, -132, -132, -132, -132, 194, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, @@ -4562,6 +4561,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, + -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, -132, @@ -4585,8 +4585,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, - -133, -133, -133, -133, -133, -133, -133, -133, -133, 195, - -133, -133, -133, -133, -133, -133, -133, -133, 196, -133, + -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, + 195, -133, -133, -133, -133, 196, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, -133, @@ -4617,8 +4617,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, - -134, -134, -134, -134, -134, -134, -134, -134, 197, -134, - -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, + -134, -134, -134, -134, -134, -134, -134, -134, -134, 197, + -134, -134, -134, -134, -134, -134, -134, -134, 198, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, -134, @@ -4649,8 +4649,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, - -135, -135, -135, -135, -135, -135, -135, -135, 198, -135, - -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, + -135, -135, -135, -135, -135, -135, -135, -135, -135, 199, + -135, -135, -135, -135, -135, -135, -135, -135, 200, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, -135, @@ -4680,8 +4680,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, -136, - -136, -136, -136, -136, -136, -136, -136, -136, -136, 199, - -136, -136, -136, -136, -136, -136, -136, -136, 200, -136, + -136, -136, -136, -136, -136, -136, -136, -136, 201, -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, @@ -4711,9 +4711,9 @@ static yyconst flex_int32_t yy_nxt[][256] = -137, -137, -137, -137, -137, -137, -137, -137, -137, -137, -137, -137, -137, -137, -137, -137, -137, -137, -137, -137, - -137, -137, -137, -137, -137, -137, -137, -137, 201, 202, - -137, -137, -137, -137, -137, -137, -137, -137, 203, -137, - -137, -137, -137, -137, -137, 204, -137, -137, -137, -137, + -137, -137, -137, -137, -137, -137, -137, -137, -137, -137, + -137, -137, -137, -137, -137, -137, -137, -137, 202, -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, @@ -4742,9 +4742,9 @@ static yyconst flex_int32_t yy_nxt[][256] = -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, - -138, -138, -138, -138, -138, -138, -138, -138, 205, -138, - -138, -138, -138, -138, -138, -138, -138, -138, 206, -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, 203, + -138, -138, -138, -138, -138, -138, -138, -138, 204, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, -138, @@ -4768,15 +4768,15 @@ static yyconst flex_int32_t yy_nxt[][256] = -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, -139, - -139, -139, -139, -139, -139, -139, -139, -139, 139, 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, -139, -139, -139, -139, -139, -139, -139, + -139, -139, -139, -139, -139, -139, -139, -139, 205, 206, + -139, -139, -139, -139, 207, -139, -139, -139, 208, -139, + -139, -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, @@ -4805,10 +4805,10 @@ static yyconst flex_int32_t yy_nxt[][256] = -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, - -140, -140, -140, -140, -140, -140, -140, -140, -140, -140, + -140, -140, -140, -140, -140, -140, -140, -140, 210, -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, 207, -140, -140, -140, 211, -140, + -140, -140, -140, -140, -140, 209, -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, @@ -4832,8 +4832,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, - -141, -141, -141, -141, -141, -141, -141, -141, -141, -141, - -141, -141, -141, -141, -141, -141, -141, -141, -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, -141, @@ -4863,8 +4863,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, -142, - -142, -142, -142, -142, -142, -142, -142, -142, -142, 208, - 208, 208, 208, 208, -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, @@ -4926,8 +4926,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, - -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, - -144, -144, -144, -144, -144, -144, -144, -144, -144, -144, + -144, -144, -144, -144, -144, -144, -144, -144, -144, 212, + 212, 212, 212, 212, -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, @@ -5175,129 +5175,129 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, 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, 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, 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, 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 - }, - - { - 39, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, -153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153, 153, 153, 153, 153, - 153, 153, 153, 153, 153, 153 - }, - - { - 39, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, -154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154, 154, 154, 154, 154, - 154, 154, 154, 154, 154, 154 - - }, - - { - 39, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, -155, 155, 155, 155, 155, 155, 155, - - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155, 155, 155, 155, 155, - 155, 155, 155, 155, 155, 155 + 39, -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, -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, -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, -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 + }, + + { + 39, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153, -153, -153, -153, -153, + -153, -153, -153, -153, -153, -153 + }, + + { + 39, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154, -154, -154, -154, -154, + -154, -154, -154, -154, -154, -154 + + }, + + { + 39, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155, -155, -155, -155, -155, + -155, -155, -155, -155, -155, -155 }, { @@ -5365,9 +5365,8 @@ static yyconst flex_int32_t yy_nxt[][256] = { 39, 158, 158, 158, 158, 158, 158, 158, 158, 158, - -158, 158, 158, -158, 158, 158, 158, 158, 158, 158, - 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, + 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, @@ -5375,6 +5374,7 @@ static yyconst flex_int32_t yy_nxt[][256] = 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, + 158, 158, 158, -158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, 158, @@ -5396,34 +5396,34 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, -159, -159, -159, -159, -159, -159, -159, -159, -159, - 159, -159, -159, 159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, + 39, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, -159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159, -159, -159, -159, -159, - -159, -159, -159, -159, -159, -159 + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159, 159, 159, 159, 159, + 159, 159, 159, 159, 159, 159 }, @@ -5492,7 +5492,7 @@ static yyconst flex_int32_t yy_nxt[][256] = { 39, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, + -162, 162, 162, -162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, @@ -5501,7 +5501,7 @@ static yyconst flex_int32_t yy_nxt[][256] = 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, - 162, 162, 162, -162, 162, 162, 162, 162, 162, 162, + 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, 162, @@ -5522,161 +5522,161 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, -163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163, 163, 163, 163, 163, - 163, 163, 163, 163, 163, 163 - }, - - { - 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, 166, 166, - 166, 166, 166, 166, 166, 166, 166, 166, -164, -164, - - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -164, -164, -164, -164, -164, -164, -164, -164, - -164, -164, -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, 167, -165, 165, 165, - 165, 165, 165, 165, 165, 165, 165, 165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, 168, -165, -165, -165, -165, -165, -165, - - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -165, -165, -165, -165, -165, -165, -165, -165, - -165, -165, -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, 168, -166, -166, -166, -166, -166, -166, - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - -166, -166, -166, -166, -166, -166, -166, -166, -166, -166, - -166, -166, -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, 209, 209, - 209, 209, 209, 209, 209, 209, 209, 209, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, 168, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -167, -167, -167, -167, -167, -167, -167, -167, - -167, -167, -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, -163, -163, -163, -163, -163, -163, -163, -163, -163, + 163, -163, -163, 163, -163, -163, -163, -163, -163, -163, + + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163, -163, -163, -163, -163, + -163, -163, -163, -163, -163, -163 + }, + + { + 39, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, -164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164, 164, 164, 164, 164, + 164, 164, 164, 164, 164, 164 + + }, + + { + 39, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, -165, 165, 165, 165, 165, 165, 165, + + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165, 165, 165, 165, 165, + 165, 165, 165, 165, 165, 165 + }, + + { + 39, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, -166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + + 166, 166, 166, 166, 166, 166, 166, 166, 166, 166, + 166, 166, 166, 166, 166, 166 + }, + + { + 39, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, -167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167, 167, 167, 167, 167, + 167, 167, 167, 167, 167, 167 }, { @@ -5685,8 +5685,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, - -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, - -168, -168, -168, -168, -168, -168, -168, -168, -168, -168, + -168, -168, -168, -168, -168, -168, -168, -168, 170, 170, + 170, 170, 170, 170, 170, 170, 170, 170, -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, @@ -5716,13 +5716,13 @@ static yyconst flex_int32_t yy_nxt[][256] = -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, -169, - -169, -169, -169, -169, -169, -169, -169, -169, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, -169, -169, + -169, -169, -169, -169, -169, -169, 171, -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, 172, -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, @@ -5748,12 +5748,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, - -170, -170, -170, -170, -170, -170, 172, -170, 170, 170, + -170, -170, -170, -170, -170, -170, -170, -170, 170, 170, 170, 170, 170, 170, 170, 170, 170, 170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, - -170, -170, -170, 173, -170, -170, -170, -170, -170, -170, + -170, -170, -170, 172, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, -170, @@ -5780,12 +5780,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, - -171, -171, -171, -171, -171, -171, -171, -171, 171, 171, - 171, 171, 171, 171, 171, 171, 171, 171, -171, -171, + -171, -171, -171, -171, -171, -171, -171, -171, 213, 213, + 213, 213, 213, 213, 213, 213, 213, 213, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, - -171, -171, -171, 173, -171, -171, -171, -171, -171, -171, + -171, -171, -171, 172, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, -171, @@ -5811,13 +5811,13 @@ static yyconst flex_int32_t yy_nxt[][256] = -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, -172, - -172, -172, -172, -172, -172, -172, -172, -172, 210, 210, - 210, 210, 210, 210, 210, 210, 210, 210, -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, 173, -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, @@ -5843,8 +5843,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, - -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, - -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, + -173, -173, -173, -173, -173, -173, -173, -173, 175, 175, + 175, 175, 175, 175, 175, 175, 175, 175, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, -173, @@ -5870,129 +5870,129 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, -174, - - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, -174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 174, 174, 174 - - }, - - { - 39, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, -175, 175, 175, 175, 175, 175, 175, - - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175, 175, 175, 175, 175, - 175, 175, 175, 175, 175, 175 - }, - - { - 39, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, -176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - - 176, 176, 176, 176, 176, 176, 176, 176, 176, 176, - 176, 176, 176, 176, 176, 176 - }, - - { - 39, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, -177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, -177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177, 177, 177, 177, 177, - 177, 177, 177, 177, 177, 177 + 39, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, 176, -174, 174, 174, + 174, 174, 174, 174, 174, 174, 174, 174, -174, -174, + + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, 177, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174, -174, -174, -174, -174, + -174, -174, -174, -174, -174, -174 + + }, + + { + 39, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, 175, 175, + 175, 175, 175, 175, 175, 175, 175, 175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, 177, -175, -175, -175, -175, -175, -175, + + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175, -175, -175, -175, -175, + -175, -175, -175, -175, -175, -175 + }, + + { + 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, 214, 214, + 214, 214, 214, 214, 214, 214, 214, 214, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, 177, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + + -176, -176, -176, -176, -176, -176, -176, -176, -176, -176, + -176, -176, -176, -176, -176, -176 + }, + + { + 39, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177, -177, -177, -177, -177, + -177, -177, -177, -177, -177, -177 }, { @@ -6002,15 +6002,15 @@ static yyconst flex_int32_t yy_nxt[][256] = 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, + 178, 178, 178, 178, 178, 178, 178, 178, 178, -178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, - 178, 178, 178, -178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, - 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, + 178, 178, 178, -178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, 178, @@ -6060,129 +6060,129 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, -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, -180, -180, -180, - -180, -180, -180, -180, -180, -180, -180, -180, -180, -180, - -180, 211, -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, -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, -180, -180, -180, -180, -180, -180, - -180, -180, -180, -180, -180, -180 - }, - - { - 39, -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, -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, -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, -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 - }, - - { - 39, -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, -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, -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, -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, -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, -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, -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, -182, -182, -182 - }, - - { - 39, -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, -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, 212, -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, -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 + 39, 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, 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, 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, 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 + }, + + { + 39, 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, 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, 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, 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 + }, + + { + 39, 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, 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, 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, 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, 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, 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, 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, 182, 182, 182 + }, + + { + 39, 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, 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, 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, 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 }, { @@ -6196,7 +6196,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, -184, - -184, -184, -184, -184, -184, -184, -184, -184, 213, -184, + -184, 215, -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, @@ -6254,8 +6254,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, - -186, -186, -186, -186, -186, -186, -186, -186, -186, 214, - 214, 214, 214, 214, -186, -186, -186, -186, -186, -186, + -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, + -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, -186, @@ -6290,9 +6290,9 @@ static yyconst flex_int32_t yy_nxt[][256] = -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, - -187, -187, -187, -187, -187, -187, 215, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, + -187, -187, -187, -187, -187, -187, -187, -187, 216, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, -187, @@ -6319,12 +6319,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, - 216, -188, 216, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, + -188, -188, -188, -188, -188, -188, -188, -188, 217, -188, + -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, - -188, -188, -188, -188, -188, 217, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, -188, @@ -6356,7 +6356,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, -189, - -189, -189, -189, -189, -189, -189, -189, -189, 218, -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, @@ -6380,15 +6380,15 @@ static yyconst flex_int32_t yy_nxt[][256] = -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, - -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, - -190, -190, -190, -190, -190, -190, -190, -190, -190, -190, + -190, -190, -190, -190, -190, -190, -190, -190, -190, 218, + 218, 218, 218, 218, -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, -190, -190, 219, -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, @@ -6413,10 +6413,10 @@ static yyconst flex_int32_t yy_nxt[][256] = -191, -191, -191, -191, -191, -191, -191, -191, -191, -191, -191, -191, -191, -191, -191, -191, -191, -191, -191, -191, - -191, -191, -191, -191, -191, -191, -191, -191, 220, -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, 219, -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, @@ -6444,14 +6444,14 @@ static yyconst flex_int32_t yy_nxt[][256] = -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, - -192, -192, -192, -192, -192, -192, -192, -192, 221, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, + 220, -192, 220, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, - -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, + -192, -192, -192, -192, -192, 221, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, -192, @@ -6475,14 +6475,14 @@ static yyconst flex_int32_t yy_nxt[][256] = -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, - -193, -193, -193, -193, -193, -193, -193, -193, -193, 222, - 222, 222, 222, 222, 222, 222, 222, 222, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, + -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, + -193, -193, -193, -193, -193, -193, -193, -193, 222, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, -193, @@ -6507,14 +6507,14 @@ static yyconst flex_int32_t yy_nxt[][256] = -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, - -194, -194, -194, -194, -194, -194, -194, -194, 223, -194, - -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, + -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, + -194, -194, -194, -194, -194, -194, 223, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, -194, @@ -6538,8 +6538,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, - -195, -195, -195, -195, -195, -195, -195, -195, -195, 224, - 224, 224, 224, 224, 224, 224, 224, 224, -195, -195, + -195, -195, -195, -195, -195, -195, -195, -195, -195, -195, + -195, -195, -195, -195, -195, -195, -195, -195, 224, -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, @@ -6601,8 +6601,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, - -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, - -197, -197, -197, -197, -197, -197, -197, -197, 226, -197, + -197, -197, -197, -197, -197, -197, -197, -197, -197, 226, + 226, 226, 226, 226, 226, 226, 226, 226, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, -197, @@ -6760,12 +6760,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, - -202, -202, -202, -202, -202, -202, -202, -202, -202, -202, + -202, -202, -202, -202, -202, -202, -202, -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, 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, @@ -6791,14 +6791,14 @@ static yyconst flex_int32_t yy_nxt[][256] = -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, + -203, -203, -203, -203, -203, -203, -203, -203, -203, 232, + 232, 232, 232, 232, 232, 232, 232, 232, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, -203, - -203, -203, -203, -203, -203, -203, -203, -203, 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, @@ -6823,13 +6823,13 @@ static yyconst flex_int32_t yy_nxt[][256] = -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -204, -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, -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, -204, -204, @@ -6891,11 +6891,11 @@ static yyconst flex_int32_t yy_nxt[][256] = -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, - -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, 235, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, + -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, -206, @@ -6918,15 +6918,15 @@ static yyconst flex_int32_t yy_nxt[][256] = -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, - -207, -207, -207, -207, -207, -207, -207, -207, -207, -207, + -207, -207, -207, -207, -207, -207, -207, -207, 236, -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, 236, -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, 238, -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, @@ -6955,7 +6955,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, - -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, + -208, -208, -208, -208, -208, -208, -208, -208, 239, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, -208, @@ -6980,14 +6980,14 @@ static yyconst flex_int32_t yy_nxt[][256] = -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, - -209, -209, -209, -209, -209, -209, -209, -209, 209, 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, -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, 168, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, -209, + -209, -209, -209, -209, -209, -209, -209, -209, 240, -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, @@ -7012,12 +7012,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, - -210, -210, -210, -210, -210, -210, -210, -210, 210, 210, - 210, 210, 210, 210, 210, 210, 210, 210, -210, -210, + -210, -210, -210, -210, -210, -210, -210, -210, -210, -210, + -210, -210, -210, -210, -210, -210, -210, -210, 241, -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, 173, -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, @@ -7050,7 +7050,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, - -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, + -211, -211, -211, -211, -211, -211, -211, -211, 242, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, -211, @@ -7081,7 +7081,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -212, -212, -212, -212, -212, -212, -212, -212, -212, -212, -212, -212, -212, -212, -212, -212, -212, -212, -212, -212, - -212, -212, -212, -212, -212, -212, -212, -212, 237, -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, @@ -7107,12 +7107,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, -213, + -213, -213, -213, -213, -213, -213, -213, -213, 213, 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, 238, -213, -213, + -213, -213, -213, 172, -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, @@ -7138,13 +7138,13 @@ static yyconst flex_int32_t yy_nxt[][256] = -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, - -214, -214, -214, -214, -214, -214, -214, -214, -214, -214, - -214, -214, -214, -214, -214, -214, -214, -214, -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, -214, -214, + -214, -214, -214, 177, -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, @@ -7207,7 +7207,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, - -216, -216, -216, -216, -216, -216, -216, -216, -216, -216, + -216, -216, -216, -216, -216, -216, -216, -216, 243, -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, @@ -7235,11 +7235,11 @@ static yyconst flex_int32_t yy_nxt[][256] = -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, -217, - 239, -217, 239, -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, -217, -217, -217, -217, -217, -217, -217, + -217, -217, -217, -217, -217, -217, -217, 244, -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, -217, -217, @@ -7297,13 +7297,13 @@ static yyconst flex_int32_t yy_nxt[][256] = -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, -219, - -219, -219, -219, -219, -219, -219, -219, -219, 240, -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, 241, + -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, @@ -7362,7 +7362,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, - -221, -221, -221, -221, -221, -221, -221, -221, -221, -221, + 245, -221, 245, -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, @@ -7397,7 +7397,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, - -222, -222, -222, 242, -222, -222, -222, -222, -222, -222, + -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, -222, @@ -7424,12 +7424,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, 246, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, - -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, + -223, -223, -223, -223, -223, -223, -223, -223, -223, 247, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, -223, @@ -7460,7 +7460,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, -224, - -224, -224, -224, 243, -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, @@ -7518,12 +7518,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, - -226, -226, -226, -226, -226, -226, -226, -226, 244, 245, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, + -226, -226, -226, 248, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, -226, @@ -7549,7 +7549,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, -227, - -227, -227, -227, -227, -227, -227, -227, -227, 246, 247, + -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, @@ -7586,7 +7586,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, -228, - -228, -228, -228, 248, -228, -228, -228, -228, -228, -228, + -228, -228, -228, 249, -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, @@ -7644,7 +7644,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, -230, - -230, -230, -230, -230, -230, -230, -230, -230, 249, 249, + -230, -230, -230, -230, -230, -230, -230, -230, 250, 251, -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, @@ -7676,12 +7676,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -231, -231, -231, -231, -231, -231, -231, -231, -231, -231, -231, -231, -231, -231, -231, -231, -231, -231, -231, -231, + -231, -231, -231, -231, -231, -231, -231, -231, 252, 253, + -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, 250, -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, 251, -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, @@ -7708,12 +7708,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, -232, - -232, -232, -232, -232, -232, -232, -232, -232, 252, -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, 254, -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, @@ -7746,7 +7746,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, - -233, -233, -233, -233, -233, -233, -233, 253, -233, -233, + -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, -233, @@ -7770,7 +7770,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, - -234, -234, -234, -234, -234, -234, -234, -234, 254, 254, + -234, -234, -234, -234, -234, -234, -234, -234, 255, 255, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, -234, @@ -7803,11 +7803,11 @@ static yyconst flex_int32_t yy_nxt[][256] = -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, - -235, -235, -235, -235, -235, -235, -235, -235, 255, -235, - -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, + -235, -235, -235, -235, -235, -235, -235, -235, 256, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, + -235, -235, -235, -235, -235, -235, -235, 257, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, -235, @@ -7834,15 +7834,15 @@ static yyconst flex_int32_t yy_nxt[][256] = -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, + -236, -236, -236, 258, -236, 258, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, - -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, - -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, - -236, -236, -236, -236, -236, -236, -236, 256, -236, -236, - -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, + -236, -236, -236, -236, 259, -236, -236, -236, 259, 259, + -236, 260, -236, -236, -236, -236, -236, 260, -236, -236, + -236, -236, -236, 237, -236, 238, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, -236, @@ -7871,7 +7871,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -237, -237, -237, -237, -237, -237, -237, -237, -237, -237, -237, -237, -237, -237, -237, -237, -237, -237, -237, -237, - -237, -237, -237, -237, -237, -237, -237, 257, -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, @@ -7899,10 +7899,10 @@ static yyconst flex_int32_t yy_nxt[][256] = -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, - -238, -238, 258, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, + -238, -238, -238, 262, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, -238, @@ -7929,7 +7929,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, - -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, + -239, -239, -239, -239, -239, -239, -239, -239, 263, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, -239, @@ -7968,7 +7968,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, - -240, -240, -240, -240, -240, -240, -240, -240, -240, -240, + -240, -240, -240, -240, -240, -240, -240, 264, -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, @@ -7992,8 +7992,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -241, -241, -241, -241, -241, -241, -241, -241, -241, -241, -241, -241, -241, -241, -241, -241, -241, -241, -241, -241, - -241, -241, -241, -241, -241, -241, -241, -241, -241, 259, - 259, 259, 259, 259, 259, 259, 259, 259, -241, -241, + -241, -241, -241, -241, -241, -241, -241, -241, 265, 265, + -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, @@ -8024,7 +8024,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, - -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, + -242, -242, -242, -242, -242, -242, -242, -242, 266, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, -242, @@ -8060,7 +8060,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, - -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, + -243, -243, -243, -243, -243, -243, -243, 267, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, -243, @@ -8089,10 +8089,10 @@ static yyconst flex_int32_t yy_nxt[][256] = -244, -244, -244, -244, -244, -244, -244, -244, -244, -244, -244, -244, -244, -244, -244, -244, -244, -244, -244, -244, + -244, -244, 268, -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, 260, -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, @@ -8123,7 +8123,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, -245, - -245, -245, -245, 261, -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, @@ -8155,7 +8155,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, -246, - -246, -246, -246, 262, -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, @@ -8181,13 +8181,13 @@ static yyconst flex_int32_t yy_nxt[][256] = -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, - -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, - -247, -247, -247, -247, -247, -247, -247, -247, -247, -247, + -247, -247, -247, -247, -247, -247, -247, -247, -247, 269, + 269, 269, 269, 269, 269, 269, 269, 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, 263, -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, @@ -8245,7 +8245,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, - -249, -249, -249, -249, -249, -249, -249, -249, -249, 264, + -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, @@ -8253,7 +8253,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, -249, - -249, -249, -249, 265, -249, 266, -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, @@ -8276,12 +8276,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, -250, - -250, -250, -250, -250, -250, -250, -250, -250, 267, 267, -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, -250, -250, -250, -250, -250, -250, + -250, -250, -250, 270, -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, @@ -8309,11 +8309,11 @@ static yyconst flex_int32_t yy_nxt[][256] = -251, -251, -251, -251, -251, -251, -251, -251, -251, -251, -251, -251, -251, -251, -251, -251, -251, -251, -251, -251, - -251, -251, -251, -251, -251, -251, -251, -251, 268, -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, 271, -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, @@ -8345,10 +8345,10 @@ static yyconst flex_int32_t yy_nxt[][256] = -252, -252, -252, -252, -252, -252, -252, -252, -252, -252, -252, -252, -252, -252, -252, -252, -252, -252, -252, -252, + -252, -252, -252, 272, -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, -252, -252, -252, - -252, -252, -252, -252, -252, 269, -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, -252, @@ -8376,9 +8376,9 @@ static yyconst flex_int32_t yy_nxt[][256] = -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, -253, + -253, -253, -253, 273, -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, 270, -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, @@ -8403,7 +8403,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, - -254, -254, -254, -254, -254, -254, -254, -254, -254, 271, + -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, @@ -8411,7 +8411,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, - -254, -254, -254, 272, -254, 273, -254, -254, -254, -254, + -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, -254, @@ -8435,7 +8435,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, - -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, + -255, -255, -255, -255, -255, -255, -255, -255, -255, 274, -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, @@ -8443,7 +8443,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, -255, - -255, -255, -255, -255, -255, 274, -255, -255, -255, -255, + -255, -255, -255, 275, -255, 276, -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, @@ -8466,6 +8466,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, + -256, -256, -256, -256, -256, -256, -256, -256, 277, 277, -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, @@ -8473,7 +8474,6 @@ static yyconst flex_int32_t yy_nxt[][256] = -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, -256, - -256, -256, -256, -256, 275, -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, @@ -8498,8 +8498,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, + -257, -257, -257, -257, -257, -257, -257, -257, 278, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, -257, - -257, -257, 276, -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, @@ -8524,35 +8524,35 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, -258, -258, -258, -258, -258, -258, -258, -258, -258, - -258, -258, -258, -258, -258, -258, -258, -258, -258, -258, + 39, 279, 279, 279, 279, 279, 279, 279, 279, 279, + 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - -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, -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, + 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, 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, -258, 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, - -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, -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, + 279, 279, 279, -258, 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, 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, + 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, + 279, 279, 279, 279, 279, 279, 279, 279, 279, 279, - -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 + 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 }, { @@ -8560,16 +8560,16 @@ static yyconst flex_int32_t yy_nxt[][256] = -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, - -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, + -259, -259, -259, 258, -259, 258, -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, 277, -259, -259, -259, -259, -259, -259, - -259, -259, -259, -259, -259, -259, -259, -259, -259, -259, + -259, -259, -259, 261, -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, 237, -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, @@ -8599,7 +8599,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, - -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, + -260, -260, -260, -260, 259, -260, -260, -260, 259, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, -260, @@ -8696,7 +8696,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -263, -263, -263, -263, -263, -263, -263, -263, -263, -263, -263, -263, -263, -263, -263, -263, -263, -263, -263, -263, - -263, -263, -263, -263, -263, -263, -263, -263, -263, -263, + -263, -263, -263, -263, -263, 280, -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, @@ -8726,7 +8726,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, - -264, -264, -264, -264, -264, -264, -264, -264, -264, -264, + -264, -264, -264, -264, 281, -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, @@ -8751,15 +8751,15 @@ static yyconst flex_int32_t yy_nxt[][256] = -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, + -265, -265, -265, -265, -265, -265, -265, -265, -265, 282, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, - -265, -265, -265, 278, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, - -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, + -265, -265, -265, 283, -265, 284, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, -265, @@ -8787,10 +8787,10 @@ static yyconst flex_int32_t yy_nxt[][256] = -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, - -266, -266, -266, 279, -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, 285, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, -266, @@ -8814,15 +8814,15 @@ static yyconst flex_int32_t yy_nxt[][256] = -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, - -267, -267, -267, -267, -267, -267, -267, -267, -267, 280, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, + -267, -267, 286, -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, -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, 281, -267, 282, -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, -267, -267, -267, -267, -267, -267, -267, -267, -267, -267, @@ -8845,7 +8845,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -268, -268, -268, -268, -268, -268, -268, -268, -268, -268, -268, -268, -268, -268, -268, -268, -268, -268, -268, -268, - -268, -268, -268, -268, -268, -268, -268, -268, 283, 283, + -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, @@ -8882,7 +8882,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, -269, - -269, -269, -269, 284, -269, -269, -269, -269, -269, -269, + -269, -269, -269, 287, -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, @@ -8909,7 +8909,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, -270, - -270, -270, -270, -270, -270, -270, -270, -270, 285, -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, @@ -8977,7 +8977,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -272, -272, -272, -272, -272, -272, -272, -272, -272, -272, -272, -272, -272, -272, -272, -272, -272, -272, -272, -272, - -272, -272, -272, 286, -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, @@ -9008,7 +9008,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, -273, - -273, -273, -273, 287, -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, @@ -9040,7 +9040,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, - -274, -274, -274, 288, -274, -274, -274, -274, -274, -274, + -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, -274, @@ -9067,11 +9067,11 @@ static yyconst flex_int32_t yy_nxt[][256] = -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, -275, - -275, -275, -275, -275, -275, -275, -275, -275, 289, -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, 288, -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, @@ -9103,7 +9103,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, - -276, -276, -276, -276, -276, -276, -276, -276, -276, -276, + -276, -276, -276, 289, -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, @@ -9130,7 +9130,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, - -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, + -277, -277, -277, -277, -277, -277, -277, -277, -277, 290, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, @@ -9138,7 +9138,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, - -277, -277, -277, -277, -277, -277, -277, -277, -277, -277, + -277, -277, -277, 291, -277, 292, -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, @@ -9161,7 +9161,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -278, -278, -278, -278, -278, -278, -278, -278, -278, -278, -278, -278, -278, -278, -278, -278, -278, -278, -278, -278, - -278, -278, -278, -278, -278, -278, -278, -278, -278, -278, + -278, -278, -278, -278, -278, -278, -278, -278, 293, 293, -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, @@ -9188,34 +9188,34 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, -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, -279, - -279, -279, -279, -279, -279, -279, -279, -279, -279, -279, - -279, -279, -279, -279, -279, -279, -279, -279, -279, -279, + 39, 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, 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, -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, -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, -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, 279, 279, 261, 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, 294, 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, -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, - -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, -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, + 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, 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 }, @@ -9229,7 +9229,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, - -280, -280, -280, -280, -280, -280, -280, -280, -280, -280, + -280, -280, -280, 295, -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, @@ -9257,11 +9257,11 @@ static yyconst flex_int32_t yy_nxt[][256] = -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, -281, + -281, -281, -281, -281, -281, -281, -281, -281, 296, -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, 290, -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, @@ -9293,7 +9293,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -282, -282, -282, -282, -282, -282, -282, -282, -282, -282, -282, -282, -282, -282, -282, -282, -282, -282, -282, -282, - -282, -282, -282, 291, -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, @@ -9320,15 +9320,15 @@ static yyconst flex_int32_t yy_nxt[][256] = -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, -283, - -283, -283, -283, -283, -283, -283, -283, -283, -283, 292, -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, 297, -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, 293, -283, 294, -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, @@ -9356,7 +9356,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, - -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, + -284, -284, -284, 298, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, -284, @@ -9382,12 +9382,12 @@ static yyconst flex_int32_t yy_nxt[][256] = -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, - -285, -285, -285, -285, -285, -285, -285, -285, 295, 295, - 295, -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, -285, -285, -285, -285, -285, -285, + -285, -285, -285, -285, -285, -285, -285, -285, -285, -285, + -285, -285, -285, 299, -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, @@ -9508,8 +9508,8 @@ static yyconst flex_int32_t yy_nxt[][256] = -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, -289, - -289, -289, -289, -289, -289, -289, -289, -289, 296, 296, - 296, -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, @@ -9577,7 +9577,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, - -291, -291, -291, -291, -291, -291, -291, -291, -291, -291, + -291, -291, -291, 300, -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, @@ -9609,7 +9609,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -292, -292, -292, -292, -292, -292, -292, -292, -292, -292, -292, -292, -292, -292, -292, -292, -292, -292, -292, -292, - -292, -292, -292, -292, -292, -292, -292, -292, -292, -292, + -292, -292, -292, 301, -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, @@ -9636,15 +9636,15 @@ static yyconst flex_int32_t yy_nxt[][256] = -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, + -293, -293, -293, -293, -293, -293, -293, -293, -293, 302, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, - -293, -293, -293, 297, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, - -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, + -293, -293, -293, 303, -293, 304, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, -293, @@ -9672,7 +9672,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, -294, - -294, -294, -294, 298, -294, -294, -294, -294, -294, -294, + -294, -294, -294, 261, -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, @@ -9699,7 +9699,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, - -295, -295, -295, -295, -295, -295, -295, -295, -295, 299, + -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, @@ -9707,7 +9707,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, -295, - -295, -295, -295, 300, -295, 301, -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, @@ -9730,15 +9730,15 @@ static yyconst flex_int32_t yy_nxt[][256] = -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, + -296, -296, -296, -296, -296, -296, -296, -296, 305, 305, + 305, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, - -296, -296, -296, -296, -296, -296, -296, -296, -296, 302, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, - -296, -296, -296, 303, -296, 304, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, -296, @@ -9820,34 +9820,34 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, 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, -299, 305, 305, 305, 305, 305, - 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, + 39, -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, -299, -299, -299, + -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, + -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, - 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, 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, 305, 305, 305, 305, - 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, + -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, -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, -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, - 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, 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, 305, 305, 305, 305, - 305, 305, 305, 305, 305, 305 + -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, -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, -299, -299, -299, -299, -299, -299, -299, -299, + -299, -299, -299, -299, -299, -299, -299, -299, -299, -299, + -299, -299, -299, -299, -299, -299 }, @@ -9861,7 +9861,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, -300, - -300, -300, -300, 306, -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, @@ -9893,7 +9893,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, -301, - -301, -301, -301, 307, -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, @@ -9915,34 +9915,34 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, -302, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 39, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308 + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302, -302, -302, -302, -302, + -302, -302, -302, -302, -302, -302 }, { @@ -9956,7 +9956,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, - -303, -303, -303, 309, -303, -303, -303, -303, -303, -303, + -303, -303, -303, 306, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, -303, @@ -9988,7 +9988,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, -304, - -304, -304, -304, 310, -304, -304, -304, -304, -304, -304, + -304, -304, -304, 307, -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, @@ -10010,34 +10010,34 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, 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, 311, 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, 305, 305, - 305, 305, 305, 305, 305, 305, 305, 305, 305, 305, + 39, -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, -305, -305, -305, -305, -305, -305, + -305, -305, -305, -305, -305, -305, -305, -305, -305, 308, + -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, 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, 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, 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, 309, -305, 310, -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, -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, 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, 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, -305, -305, -305, -305, -305, -305, -305, -305, + -305, -305, -305, -305, -305, -305 }, { @@ -10104,35 +10104,35 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 39, 311, 311, 311, 311, 311, 311, 311, 311, 311, + 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 312, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, + 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, + 311, 311, 311, 311, -308, 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, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, + 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, 311, 311, 311, 311, + 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, + 311, 311, 311, 311, 311, 311, 311, 311, 311, 311, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308, 308, 308, 308, 308, - 308, 308, 308, 308, 308, 308 + 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 }, { @@ -10146,7 +10146,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, - -309, -309, -309, -309, -309, -309, -309, -309, -309, -309, + -309, -309, -309, 312, -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, @@ -10177,7 +10177,7 @@ static yyconst flex_int32_t yy_nxt[][256] = -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, - -310, -310, -310, -310, -310, -310, -310, -310, -310, -310, + -310, -310, -310, 313, -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, @@ -10199,161 +10199,161 @@ static yyconst flex_int32_t yy_nxt[][256] = }, { - 39, 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, 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, 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, -311, 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, 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, - 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, 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, 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 - }, - - { - 39, 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, 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, -312, 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, 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, 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 - }, - - { - 39, 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, 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, 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, 315, 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, 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, - 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, 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, 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 - }, - - { - 39, 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, 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, 316, 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, 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, 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 - - }, - - { - 39, -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, -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, -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, - -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 + 39, 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, 314, 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, 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, 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 + }, + + { + 39, -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, -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, -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, -312, -312, -312 + }, + + { + 39, -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, -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, -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, + -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, -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, -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, -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, -313, -313, -313, -313, -313, -313, -313, -313, + -313, -313, -313, -313, -313, -313, -313, -313, -313, -313, + -313, -313, -313, -313, -313, -313 + }, + + { + 39, 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, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, -314, 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, 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, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315 + + }, + + { + 39, 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, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 316, 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, 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, + 315, 315, 315, 315, 315, 315, 315, 315, 315, 315, + 315, 315, 315, 315, 315, 315 }, { @@ -10405,8 +10405,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 135 -#define YY_END_OF_BUFFER 136 +#define YY_NUM_RULES 138 +#define YY_END_OF_BUFFER 139 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -10419,38 +10419,38 @@ static yyconst flex_int32_t yy_accept[317] = 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, 136, 134, - 64, 98, 134, 91, 1, 116, 77, 134, 118, 95, - 80, 79, 121, 104, 120, 134, 113, 124, 83, 128, - 126, 69, 134, 29, 117, 76, 113, 113, 123, 122, - 82, 129, 127, 125, 90, 92, 66, 61, 62, 119, + 0, 0, 0, 0, 0, 0, 0, 0, 139, 137, + 63, 97, 137, 90, 1, 115, 76, 137, 117, 94, + 79, 78, 120, 103, 119, 137, 112, 125, 82, 131, + 129, 68, 137, 29, 116, 75, 112, 112, 122, 121, + 81, 132, 130, 128, 89, 91, 65, 60, 61, 118, 36, 54, 37, 38, 34, 35, 39, 3, 2, 30, - 31, 32, 33, 135, 135, 135, 135, 135, 135, 135, - - 46, 135, 135, 51, 135, 135, 64, 103, 102, 99, - 116, 78, 114, 118, 94, 97, 93, 40, 81, 0, - 0, 115, 28, 115, 0, 0, 0, 70, 71, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 117, 63, - 72, 0, 84, 85, 86, 87, 88, 89, 67, 68, - 65, 36, 37, 38, 34, 35, 39, 3, 2, 30, - 31, 32, 33, 0, 0, 0, 0, 41, 0, 0, - 0, 0, 43, 46, 47, 48, 51, 52, 53, 101, - 42, 96, 0, 0, 74, 0, 107, 109, 105, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 31, 32, 33, 138, 138, 138, 138, 138, 138, 138, + + 46, 138, 138, 51, 138, 138, 63, 102, 101, 98, + 115, 77, 113, 117, 93, 96, 92, 40, 80, 0, + 0, 114, 28, 114, 0, 0, 0, 126, 127, 69, + 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 116, 62, 71, 0, 123, 124, 83, 84, 85, 86, + 87, 88, 66, 67, 64, 36, 37, 38, 34, 35, + 39, 3, 2, 30, 31, 32, 33, 0, 0, 0, + 0, 41, 0, 0, 0, 0, 43, 46, 47, 48, + 51, 52, 53, 100, 42, 95, 0, 0, 73, 0, + 106, 108, 104, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 73, 0, 0, - 100, 0, 0, 75, 108, 110, 111, 106, 0, 5, - 4, 0, 24, 0, 23, 0, 0, 0, 22, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 112, 25, - 0, 20, 19, 0, 0, 0, 0, 18, 0, 0, - 0, 45, 0, 0, 50, 0, 0, 26, 0, 131, - 130, 133, 132, 6, 0, 0, 0, 0, 0, 0, - 7, 0, 0, 0, 0, 27, 21, 10, 14, 8, - 0, 0, 0, 44, 0, 11, 15, 49, 0, 12, - 16, 9, 0, 0, 0, 0, 13, 17, 0, 0, - - 0, 0, 0, 0, 0, 56, 57, 0, 59, 60, - 0, 0, 0, 0, 55, 58 + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 72, 0, 0, 99, 0, 0, 74, 107, 109, + 110, 105, 0, 5, 4, 0, 24, 0, 23, 0, + 0, 0, 22, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 111, 25, 0, 20, 19, 0, + 0, 0, 0, 18, 0, 0, 0, 0, 0, 0, + 58, 59, 45, 0, 0, 50, 0, 26, 0, 134, + 133, 136, 135, 6, 0, 0, 0, 0, 0, 0, + 0, 7, 0, 0, 0, 27, 21, 10, 14, 8, + 0, 0, 0, 0, 44, 0, 11, 15, 49, 12, + + 16, 9, 0, 0, 0, 13, 17, 0, 0, 0, + 0, 56, 57, 0, 0, 55 } ; static yy_state_type yy_last_accepting_state; @@ -10466,18 +10466,18 @@ static yyconst yy_state_type yy_NUL_trans[317] = 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, - 152, 0, 153, 154, 155, 156, 157, 158, 0, 160, - 161, 162, 163, 0, 0, 0, 0, 0, 0, 0, + 156, 0, 157, 158, 159, 160, 161, 162, 0, 164, + 165, 166, 167, 0, 0, 0, 0, 0, 0, 0, - 174, 175, 176, 177, 178, 179, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 178, 179, 180, 181, 182, 183, 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, 152, 153, 154, 155, 156, 157, 158, 0, 160, - 161, 162, 163, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 174, 175, 176, 177, 178, 179, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 156, 157, 158, 159, 160, + 161, 162, 0, 164, 165, 166, 167, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 178, 179, 180, + 181, 182, 183, 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, @@ -10485,14 +10485,14 @@ static yyconst yy_state_type yy_NUL_trans[317] = 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, 279, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 279, 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, 305, 0, - 0, 308, 0, 0, 305, 0, 0, 308, 0, 0, - 313, 314, 313, 314, 0, 0 + 0, 0, 0, 0, 0, 0, 0, 311, 0, 0, + 311, 0, 0, 315, 315, 0 } ; extern int gabc_notes_determination__flex_debug; @@ -10560,14 +10560,46 @@ static int ledger_var[2] = { 0, 0 }; static unsigned char staff_lines; static signed char highest_pitch; static bool legacy_oriscus_orientation; -static int slur_var[2] = { 0, 0 }; -static char slur_shift[2] = { '\0', '\0' }; -static gregorio_note *slur_start[] = { NULL, NULL }; +static unsigned short he_adjustment_index[2] = { 0, 0 }; + +typedef struct slur_info { + int var; + char shift; + gregorio_note *start; +} slur_info; + +static slur_info slur[2] = { { 0, '\0', NULL }, { 0, '\0', NULL } }; -typedef enum sign_orientation { - SO_OVER = 0, - SO_UNDER = 1 -} sign_orientation; +static __inline gregorio_sign_orientation letter_to_sign_orientation( + const char letter) { + switch (letter) { + case 'u': /* "u"under */ + return SO_UNDER; + case 'o': /* "o"ver */ + return SO_OVER; + } + /* not reachable unless there's a programming error */ + /* LCOV_EXCL_START */ + gregorio_fail2(letter_to_sign_orientation, + "invalid sign orientation letter: %c", letter); + return SO_OVER; + /* LCOV_EXCL_STOP */ +} + +static __inline int letter_to_pitch_adjustment(const char letter) { + switch (letter_to_sign_orientation(letter)) { + case SO_OVER: + return 1; + case SO_UNDER: + return -1; + } + /* not reachable unless there's a programming error */ + /* LCOV_EXCL_START */ + gregorio_fail2(letter_to_pitch_adjustment, + "invalid sign orientation letter: %c", letter); + return 0; + /* LCOV_EXCL_STOP */ +} static __inline char pitch_letter_to_height(const char pitch) { char result = pitch - 'a' + LOWEST_PITCH; @@ -10598,6 +10630,8 @@ static __inline void lex_add_note(int i, gregorio_shape shape, char signs, gregorio_add_note(¤t_note, pitch_letter_to_height( tolower((unsigned char)gabc_notes_determination_text[i])), shape, signs, liquescentia, NULL, ¬es_lloc); + current_note->he_adjustment_index[SO_OVER] = he_adjustment_index[SO_OVER]; + current_note->he_adjustment_index[SO_UNDER] = he_adjustment_index[SO_UNDER]; if (ledger_var[SO_OVER]) { current_note->supposed_high_ledger_line = true; @@ -10694,7 +10728,8 @@ static void save_before_ledger(const char *const before_ledger) } } -static void add_static_ledger(const sign_orientation type, const char *length) { +static void add_static_ledger(const gregorio_sign_orientation type, + const char *length) { gregorio_snprintf(tempstr, sizeof tempstr, "\\GreDrawAdditionalLine{%d}{%s}{%d}{%s}{0}{}", type, length + 1, before_ledger_type, before_ledger_length); @@ -10708,7 +10743,8 @@ static void add_static_ledger(const sign_orientation type, const char *length) { GRE_TEXVERB_GLYPH, ¬es_lloc); } -static __inline const char *sign_orientation_name(const sign_orientation type) { +static __inline const char *over_or_under( + const gregorio_sign_orientation type) { switch (type) { case SO_OVER: return "over"; @@ -10717,16 +10753,16 @@ static __inline const char *sign_orientation_name(const sign_orientation type) { } /* not reachable unless there's a programming error */ /* LCOV_EXCL_START */ - gregorio_fail2(sign_orientation_name, "invalid ledger type %d", type); + gregorio_fail2(over_or_under, "invalid ledger type %d", type); return ""; /* LCOV_EXCL_STOP */ } -static void add_variable_ledger(const sign_orientation type, +static void add_variable_ledger(const gregorio_sign_orientation type, const char *after_ledger) { if (ledger_var[type]) { - const char *const typename = sign_orientation_name(type); + const char *const typename = over_or_under(type); gregorio_messagef("add_variable_ledger", VERBOSITY_ERROR, 0, _("variable %s-staff ledger line without termination of " "previous %s-staff ledger line"), typename, typename); @@ -10765,10 +10801,10 @@ static void add_variable_ledger(const sign_orientation type, } } -static void end_variable_ledger(const sign_orientation type) +static void end_variable_ledger(const gregorio_sign_orientation type) { if (!ledger_var[type]) { - const char *const typename = sign_orientation_name(type); + const char *const typename = over_or_under(type); gregorio_messagef("end_variable_ledger", VERBOSITY_ERROR, 0, _("variable %s-staff ledger line termination without variable " "%s-staff ledger line start"), typename, typename); @@ -10864,8 +10900,10 @@ static char *parse_slur_shift(char *shift) return c; } -static void parse_slur(int direction) +static void parse_slur(void) { + const int direction = letter_to_pitch_adjustment( + gabc_notes_determination_text[1]); char shift, *width, *height, *end; if (!current_note || current_note->type != GRE_NOTE) { @@ -10892,8 +10930,11 @@ static void parse_slur(int direction) gregorio_add_texverb_to_note(current_note, gregorio_strdup(tempstr)); } -static void start_var_slur(const sign_orientation index) +static void start_var_slur(void) { + const gregorio_sign_orientation index = letter_to_sign_orientation( + gabc_notes_determination_text[1]); + if (!current_note || current_note->type != GRE_NOTE) { gregorio_message( _("cannot add a slur to something that is not a note"), @@ -10901,20 +10942,24 @@ static void start_var_slur(const sign_orientation index) return; } - if (slur_var[index]) { + if (slur[index].var) { gregorio_messagef("start_var_slur", VERBOSITY_ERROR, 0, _("variable %s-note slur without termination of previous slur"), - sign_orientation_name(index)); + over_or_under(index)); return; } - slur_var[index] = ++brace_var_counter; - parse_slur_shift(slur_shift + index); - slur_start[index] = current_note; + slur[index].var = ++brace_var_counter; + parse_slur_shift(&(slur[index].shift)); + slur[index].start = current_note; } -static void end_var_slur(const int direction, const sign_orientation index) +static void end_var_slur(void) { + const int direction = letter_to_pitch_adjustment( + gabc_notes_determination_text[1]); + const gregorio_sign_orientation index = letter_to_sign_orientation( + gabc_notes_determination_text[1]); char shift; if (!current_note || current_note->type != GRE_NOTE) { @@ -10924,10 +10969,10 @@ static void end_var_slur(const int direction, const sign_orientation index) return; } - if (!slur_var[index] || !slur_shift[index] || !slur_start[index]) { + if (!slur[index].var || !slur[index].shift || !slur[index].start) { gregorio_messagef("end_var_slur", VERBOSITY_ERROR, 0, _("variable %s-note slur end without start"), - sign_orientation_name(index)); + over_or_under(index)); return; } @@ -10936,25 +10981,141 @@ static void end_var_slur(const int direction, const sign_orientation index) gregorio_snprintf(tempstr, sizeof tempstr, "\\GreVarBraceSavePos{%d}{%c}{1}" "\\GreSlur{%d}{%d}{%c}{\\GreVarBraceLength{%d}}{}{%d}", - slur_var[index], slur_shift[index], - slur_start[index]->u.note.pitch + direction, direction, - slur_shift[index], slur_var[index], + slur[index].var, slur[index].shift, + slur[index].start->u.note.pitch + direction, direction, + slur[index].shift, slur[index].var, current_note->u.note.pitch + direction); - gregorio_add_texverb_to_note(slur_start[index], gregorio_strdup(tempstr)); + gregorio_add_texverb_to_note(slur[index].start, gregorio_strdup(tempstr)); gregorio_snprintf(tempstr, sizeof tempstr, - "\\GreVarBraceSavePos{%d}{%c}{2}", slur_var[index], shift); + "\\GreVarBraceSavePos{%d}{%c}{2}", slur[index].var, shift); gregorio_add_texverb_to_note(current_note, gregorio_strdup(tempstr)); - slur_var[index] = 0; - slur_shift[index] = '\0'; - slur_start[index] = NULL; + slur[index].var = 0; + slur[index].shift = '\0'; + slur[index].start = NULL; +} + +void parse_hepisema_adjustment(void) +{ + /* [xh:yz{] + * - x indicates l(ow) or h(igh) episema + * - y (optional) for l(ow), m(iddle), or h(igh) vertical position in space + * - z (optional) nudge dimension that starts with + or - + * - { (optional) starts a group + * - at least one of y, z, or w must be provided + * - if y and z are omitted, : may be omitted + */ + + const gregorio_sign_orientation index = letter_to_sign_orientation( + gabc_notes_determination_text[1]); + gregorio_sign_orientation det_index = index; + char *ch = gabc_notes_determination_text + 3; + gregorio_hepisema_vbasepos vbasepos = HVB_AUTO; + char *nudge = NULL; + char save; + short hepisema_adjustment_id; + + if (he_adjustment_index[index]) { + gregorio_messagef("parse_hepisema_adustment", VERBOSITY_ERROR, 0, + _("horizontal %s-episema adjustment start before ending the " + "previous adjustment"), over_or_under(index)); + return; + } + + if (*ch == ':') { + ++ch; + if (*ch == 'm') { + vbasepos = HVB_MIDDLE; + } else { + switch (*ch) { + case 'o': + ++ch; + det_index = SO_OVER; + break; + case 'u': + ++ch; + det_index = SO_UNDER; + break; + } + + switch (*ch) { + case 'l': + switch (det_index) { + case SO_OVER: + vbasepos = HVB_O_LOW; + break; + case SO_UNDER: + vbasepos = HVB_U_LOW; + break; + } + break; + case 'h': + switch (det_index) { + case SO_OVER: + vbasepos = HVB_O_HIGH; + break; + case SO_UNDER: + vbasepos = HVB_U_HIGH; + break; + } + break; + } + } + if (vbasepos) { + ++ch; + } + if (*ch == '+' || *ch == '-') { + nudge = ch; + do { + ++ch; + } while (*ch && *ch != '{' && *ch != ']'); + save = *ch; + *ch = '\0'; + nudge = gregorio_strdup(nudge); + *ch = save; + } + } + + hepisema_adjustment_id = gregorio_add_hepisema_adjustment(vbasepos, nudge); + + if (*ch == '{') { + he_adjustment_index[index] = hepisema_adjustment_id; + } else { + if (!current_note || current_note->type != GRE_NOTE) { + gregorio_message(_("cannot add a horizontal episema adjustment to " + "something that is not a note"), + "parse_hepisema_adjustment", VERBOSITY_ERROR, 0); + return; + } + current_note->he_adjustment_index[index] = hepisema_adjustment_id; + } +} + +void end_hepisema_adjustment(void) +{ + /* [xh:}] + * - x indicates l(ow) or h(igh) episema + * - : is optional + */ + + const gregorio_sign_orientation index = letter_to_sign_orientation( + gabc_notes_determination_text[1]); + + if (!he_adjustment_index[index]) { + gregorio_messagef("end_hepisema_adustment", VERBOSITY_ERROR, 0, + _("horizontal %s-episema adjustment end with no matching " + "start"), over_or_under(index)); + return; + } + + he_adjustment_index[index] = 0; } void gabc_det_notes_finish(void) { - sign_orientation orientation; + gregorio_sign_orientation orientation; if (overbrace_var) { gregorio_message(_("unclosed variable over-staff brace"), "gabc_det_notes_finish", VERBOSITY_ERROR, 0); @@ -10966,18 +11127,24 @@ void gabc_det_notes_finish(void) underbrace_var = 0; } for (orientation = SO_OVER; orientation <= SO_UNDER; ++orientation) { - const char *name = sign_orientation_name(orientation); + const char *name = over_or_under(orientation); if (ledger_var[orientation]) { gregorio_messagef("gabc_det_notes_finish", VERBOSITY_ERROR, 0, _("unclosed variable %s-staff ledger line"), name); ledger_var[orientation] = 0; } - if (slur_var[orientation]) { + if (slur[orientation].var) { gregorio_messagef("gabc_det_notes_finish", VERBOSITY_ERROR, 0, _("unclosed variable %s-note slur"), name); - slur_var[orientation] = 0; - slur_shift[orientation] = '\0'; - slur_start[orientation] = NULL; + slur[orientation].var = 0; + slur[orientation].shift = '\0'; + slur[orientation].start = NULL; + } + if (he_adjustment_index[orientation]) { + gregorio_messagef("gabc_det_notes_finish", VERBOSITY_ERROR, 0, + _("unclosed horizontal %s-episema adjustment"), + over_or_under(orientation)); + ledger_var[orientation] = 0; } } } @@ -10998,7 +11165,7 @@ void gabc_det_notes_finish(void) -#line 11002 "gabc/gabc-notes-determination-l.c" +#line 11169 "gabc/gabc-notes-determination-l.c" #define INITIAL 0 #define texverbnote 1 @@ -11227,9 +11394,9 @@ YY_DECL } { -#line 510 "gabc/gabc-notes-determination.l" +#line 677 "gabc/gabc-notes-determination.l" -#line 11233 "gabc/gabc-notes-determination-l.c" +#line 11400 "gabc/gabc-notes-determination-l.c" while ( 1 ) /* loops until end-of-file is reached */ { @@ -11276,7 +11443,7 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 511 "gabc/gabc-notes-determination.l" +#line 678 "gabc/gabc-notes-determination.l" { BEGIN(comments); } @@ -11284,35 +11451,35 @@ YY_RULE_SETUP case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 514 "gabc/gabc-notes-determination.l" +#line 681 "gabc/gabc-notes-determination.l" { BEGIN(INITIAL); } YY_BREAK case 3: YY_RULE_SETUP -#line 517 "gabc/gabc-notes-determination.l" +#line 684 "gabc/gabc-notes-determination.l" { /* ignored */ } YY_BREAK case 4: YY_RULE_SETUP -#line 520 "gabc/gabc-notes-determination.l" +#line 687 "gabc/gabc-notes-determination.l" { BEGIN(choralsign); } YY_BREAK case 5: YY_RULE_SETUP -#line 523 "gabc/gabc-notes-determination.l" +#line 690 "gabc/gabc-notes-determination.l" { BEGIN(choralnabc); } YY_BREAK case 6: YY_RULE_SETUP -#line 526 "gabc/gabc-notes-determination.l" +#line 693 "gabc/gabc-notes-determination.l" { char_for_brace = gabc_notes_determination_text[4]-'0'; BEGIN(overbrace); @@ -11320,7 +11487,7 @@ YY_RULE_SETUP YY_BREAK case 7: YY_RULE_SETUP -#line 530 "gabc/gabc-notes-determination.l" +#line 697 "gabc/gabc-notes-determination.l" { char_for_brace = gabc_notes_determination_text[4]-'0'; BEGIN(underbrace); @@ -11328,7 +11495,7 @@ YY_RULE_SETUP YY_BREAK case 8: YY_RULE_SETUP -#line 534 "gabc/gabc-notes-determination.l" +#line 701 "gabc/gabc-notes-determination.l" { char_for_brace = gabc_notes_determination_text[5]-'0'; BEGIN(overcurlybrace); @@ -11336,7 +11503,7 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 538 "gabc/gabc-notes-determination.l" +#line 705 "gabc/gabc-notes-determination.l" { char_for_brace = gabc_notes_determination_text[6]-'0'; BEGIN(overcurlyaccentusbrace); @@ -11344,7 +11511,7 @@ YY_RULE_SETUP YY_BREAK case 10: YY_RULE_SETUP -#line 542 "gabc/gabc-notes-determination.l" +#line 709 "gabc/gabc-notes-determination.l" { if (overbrace_var) { gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0, @@ -11364,7 +11531,7 @@ YY_RULE_SETUP YY_BREAK case 11: YY_RULE_SETUP -#line 558 "gabc/gabc-notes-determination.l" +#line 725 "gabc/gabc-notes-determination.l" { if (underbrace_var) { gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0, @@ -11383,7 +11550,7 @@ YY_RULE_SETUP YY_BREAK case 12: YY_RULE_SETUP -#line 573 "gabc/gabc-notes-determination.l" +#line 740 "gabc/gabc-notes-determination.l" { if (overbrace_var) { gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0, @@ -11403,7 +11570,7 @@ YY_RULE_SETUP YY_BREAK case 13: YY_RULE_SETUP -#line 589 "gabc/gabc-notes-determination.l" +#line 756 "gabc/gabc-notes-determination.l" { if (overbrace_var) { gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0, @@ -11423,7 +11590,7 @@ YY_RULE_SETUP YY_BREAK case 14: YY_RULE_SETUP -#line 605 "gabc/gabc-notes-determination.l" +#line 772 "gabc/gabc-notes-determination.l" { if (!overbrace_var) { gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0, @@ -11446,7 +11613,7 @@ YY_RULE_SETUP YY_BREAK case 15: YY_RULE_SETUP -#line 624 "gabc/gabc-notes-determination.l" +#line 791 "gabc/gabc-notes-determination.l" { if (!underbrace_var) { gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0, @@ -11464,7 +11631,7 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 638 "gabc/gabc-notes-determination.l" +#line 805 "gabc/gabc-notes-determination.l" { if (!overbrace_var) { gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0, @@ -11487,7 +11654,7 @@ YY_RULE_SETUP YY_BREAK case 17: YY_RULE_SETUP -#line 657 "gabc/gabc-notes-determination.l" +#line 824 "gabc/gabc-notes-determination.l" { if (!overbrace_var) { gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0, @@ -11510,7 +11677,7 @@ YY_RULE_SETUP YY_BREAK case 18: YY_RULE_SETUP -#line 676 "gabc/gabc-notes-determination.l" +#line 843 "gabc/gabc-notes-determination.l" { if (notesmacros[gabc_notes_determination_text[3]-'0']) { gregorio_add_texverb_to_note(current_note, @@ -11520,7 +11687,7 @@ YY_RULE_SETUP YY_BREAK case 19: YY_RULE_SETUP -#line 682 "gabc/gabc-notes-determination.l" +#line 849 "gabc/gabc-notes-determination.l" { if (notesmacros[gabc_notes_determination_text[3]-'0']) { gregorio_add_texverb_as_note(¤t_note, @@ -11531,7 +11698,7 @@ YY_RULE_SETUP YY_BREAK case 20: YY_RULE_SETUP -#line 689 "gabc/gabc-notes-determination.l" +#line 856 "gabc/gabc-notes-determination.l" { if (notesmacros[gabc_notes_determination_text[3]-'0']) { gregorio_add_texverb_as_note(¤t_note, @@ -11542,7 +11709,7 @@ YY_RULE_SETUP YY_BREAK case 21: YY_RULE_SETUP -#line 696 "gabc/gabc-notes-determination.l" +#line 863 "gabc/gabc-notes-determination.l" { if (notesmacros[gabc_notes_determination_text[5]-'0']) { gregorio_add_texverb_as_note(¤t_note, @@ -11553,56 +11720,56 @@ YY_RULE_SETUP YY_BREAK case 22: YY_RULE_SETUP -#line 703 "gabc/gabc-notes-determination.l" +#line 870 "gabc/gabc-notes-determination.l" { BEGIN(texverbnote); } YY_BREAK case 23: YY_RULE_SETUP -#line 706 "gabc/gabc-notes-determination.l" +#line 873 "gabc/gabc-notes-determination.l" { BEGIN(texverbglyph); } YY_BREAK case 24: YY_RULE_SETUP -#line 709 "gabc/gabc-notes-determination.l" +#line 876 "gabc/gabc-notes-determination.l" { BEGIN(texverbelement); } YY_BREAK case 25: YY_RULE_SETUP -#line 712 "gabc/gabc-notes-determination.l" +#line 879 "gabc/gabc-notes-determination.l" { BEGIN(alt); } YY_BREAK case 26: YY_RULE_SETUP -#line 715 "gabc/gabc-notes-determination.l" +#line 882 "gabc/gabc-notes-determination.l" { gregorio_add_nlba_as_note(¤t_note, NLBA_BEGINNING, ¬es_lloc); } YY_BREAK case 27: YY_RULE_SETUP -#line 718 "gabc/gabc-notes-determination.l" +#line 885 "gabc/gabc-notes-determination.l" { gregorio_add_nlba_as_note(¤t_note, NLBA_END, ¬es_lloc); } YY_BREAK case 28: YY_RULE_SETUP -#line 721 "gabc/gabc-notes-determination.l" +#line 888 "gabc/gabc-notes-determination.l" { gregorio_start_autofuse(¤t_note, ¬es_lloc); } YY_BREAK case 29: YY_RULE_SETUP -#line 724 "gabc/gabc-notes-determination.l" +#line 891 "gabc/gabc-notes-determination.l" { gregorio_end_autofuse(¤t_note, ¬es_lloc); } @@ -11610,7 +11777,7 @@ YY_RULE_SETUP case 30: /* rule 30 can match eol */ YY_RULE_SETUP -#line 727 "gabc/gabc-notes-determination.l" +#line 894 "gabc/gabc-notes-determination.l" { gregorio_snprintf(tempstr, sizeof tempstr, "\\GreOverBrace{%s}{0pt}{0pt}{%d}", @@ -11621,7 +11788,7 @@ YY_RULE_SETUP case 31: /* rule 31 can match eol */ YY_RULE_SETUP -#line 733 "gabc/gabc-notes-determination.l" +#line 900 "gabc/gabc-notes-determination.l" { gregorio_snprintf(tempstr, sizeof tempstr, "\\GreUnderBrace{%s}{0pt}{0pt}{%d}", @@ -11632,7 +11799,7 @@ YY_RULE_SETUP case 32: /* rule 32 can match eol */ YY_RULE_SETUP -#line 739 "gabc/gabc-notes-determination.l" +#line 906 "gabc/gabc-notes-determination.l" { gregorio_snprintf(tempstr, sizeof tempstr, "\\GreOverCurlyBrace{%s}{0pt}{0pt}{%d}{0}", @@ -11643,7 +11810,7 @@ YY_RULE_SETUP case 33: /* rule 33 can match eol */ YY_RULE_SETUP -#line 745 "gabc/gabc-notes-determination.l" +#line 912 "gabc/gabc-notes-determination.l" { gregorio_snprintf(tempstr, sizeof tempstr, "\\GreOverCurlyBrace{%s}{0pt}{0pt}{%d}{1}", @@ -11654,7 +11821,7 @@ YY_RULE_SETUP case 34: /* rule 34 can match eol */ YY_RULE_SETUP -#line 751 "gabc/gabc-notes-determination.l" +#line 918 "gabc/gabc-notes-determination.l" { gregorio_add_cs_to_note(¤t_note, gregorio_strdup(gabc_notes_determination_text), false); @@ -11663,7 +11830,7 @@ YY_RULE_SETUP case 35: /* rule 35 can match eol */ YY_RULE_SETUP -#line 755 "gabc/gabc-notes-determination.l" +#line 922 "gabc/gabc-notes-determination.l" { gregorio_add_cs_to_note(¤t_note, gregorio_strdup(gabc_notes_determination_text), true); @@ -11672,7 +11839,7 @@ YY_RULE_SETUP case 36: /* rule 36 can match eol */ YY_RULE_SETUP -#line 759 "gabc/gabc-notes-determination.l" +#line 926 "gabc/gabc-notes-determination.l" { gregorio_add_texverb_to_note(current_note, gregorio_strdup(gabc_notes_determination_text)); @@ -11681,7 +11848,7 @@ YY_RULE_SETUP case 37: /* rule 37 can match eol */ YY_RULE_SETUP -#line 763 "gabc/gabc-notes-determination.l" +#line 930 "gabc/gabc-notes-determination.l" { gregorio_add_texverb_as_note(¤t_note, gregorio_strdup(gabc_notes_determination_text), @@ -11691,7 +11858,7 @@ YY_RULE_SETUP case 38: /* rule 38 can match eol */ YY_RULE_SETUP -#line 768 "gabc/gabc-notes-determination.l" +#line 935 "gabc/gabc-notes-determination.l" { gregorio_add_texverb_as_note(¤t_note, gregorio_strdup(gabc_notes_determination_text), @@ -11701,7 +11868,7 @@ YY_RULE_SETUP case 39: /* rule 39 can match eol */ YY_RULE_SETUP -#line 773 "gabc/gabc-notes-determination.l" +#line 940 "gabc/gabc-notes-determination.l" { gregorio_add_texverb_as_note(¤t_note, gregorio_strdup(gabc_notes_determination_text), GRE_ALT, @@ -11710,7 +11877,7 @@ YY_RULE_SETUP YY_BREAK case 40: YY_RULE_SETUP -#line 778 "gabc/gabc-notes-determination.l" +#line 945 "gabc/gabc-notes-determination.l" { BEGIN(space); } @@ -11720,7 +11887,7 @@ case 41: (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up gabc_notes_determination_text again */ YY_RULE_SETUP -#line 781 "gabc/gabc-notes-determination.l" +#line 948 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_AD_HOC_SPACE, gregorio_strdup(gabc_notes_determination_text), ¬es_lloc); @@ -11728,7 +11895,7 @@ YY_RULE_SETUP YY_BREAK case 42: YY_RULE_SETUP -#line 785 "gabc/gabc-notes-determination.l" +#line 952 "gabc/gabc-notes-determination.l" { BEGIN(nbspace); } @@ -11738,7 +11905,7 @@ case 43: (yy_c_buf_p) = yy_cp -= 1; YY_DO_BEFORE_ACTION; /* set up gabc_notes_determination_text again */ YY_RULE_SETUP -#line 788 "gabc/gabc-notes-determination.l" +#line 955 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_AD_HOC_SPACE_NB, gregorio_strdup(gabc_notes_determination_text), ¬es_lloc); @@ -11746,14 +11913,14 @@ YY_RULE_SETUP YY_BREAK case 44: YY_RULE_SETUP -#line 792 "gabc/gabc-notes-determination.l" +#line 959 "gabc/gabc-notes-determination.l" { end_variable_ledger(SO_OVER); } YY_BREAK case 45: YY_RULE_SETUP -#line 795 "gabc/gabc-notes-determination.l" +#line 962 "gabc/gabc-notes-determination.l" { BEGIN(overledger); } @@ -11761,7 +11928,7 @@ YY_RULE_SETUP case 46: /* rule 46 can match eol */ YY_RULE_SETUP -#line 798 "gabc/gabc-notes-determination.l" +#line 965 "gabc/gabc-notes-determination.l" { save_before_ledger(gabc_notes_determination_text); BEGIN(overledger2); @@ -11770,7 +11937,7 @@ YY_RULE_SETUP case 47: /* rule 47 can match eol */ YY_RULE_SETUP -#line 802 "gabc/gabc-notes-determination.l" +#line 969 "gabc/gabc-notes-determination.l" { add_static_ledger(SO_OVER, gabc_notes_determination_text); BEGIN(endledger); @@ -11779,7 +11946,7 @@ YY_RULE_SETUP case 48: /* rule 48 can match eol */ YY_RULE_SETUP -#line 806 "gabc/gabc-notes-determination.l" +#line 973 "gabc/gabc-notes-determination.l" { add_variable_ledger(SO_OVER, gabc_notes_determination_text); BEGIN(endledger); @@ -11787,14 +11954,14 @@ YY_RULE_SETUP YY_BREAK case 49: YY_RULE_SETUP -#line 810 "gabc/gabc-notes-determination.l" +#line 977 "gabc/gabc-notes-determination.l" { end_variable_ledger(SO_UNDER); } YY_BREAK case 50: YY_RULE_SETUP -#line 813 "gabc/gabc-notes-determination.l" +#line 980 "gabc/gabc-notes-determination.l" { BEGIN(underledger); } @@ -11802,7 +11969,7 @@ YY_RULE_SETUP case 51: /* rule 51 can match eol */ YY_RULE_SETUP -#line 816 "gabc/gabc-notes-determination.l" +#line 983 "gabc/gabc-notes-determination.l" { save_before_ledger(gabc_notes_determination_text); BEGIN(underledger2); @@ -11811,7 +11978,7 @@ YY_RULE_SETUP case 52: /* rule 52 can match eol */ YY_RULE_SETUP -#line 820 "gabc/gabc-notes-determination.l" +#line 987 "gabc/gabc-notes-determination.l" { add_static_ledger(SO_UNDER, gabc_notes_determination_text); BEGIN(endledger); @@ -11820,7 +11987,7 @@ YY_RULE_SETUP case 53: /* rule 53 can match eol */ YY_RULE_SETUP -#line 824 "gabc/gabc-notes-determination.l" +#line 991 "gabc/gabc-notes-determination.l" { add_variable_ledger(SO_UNDER, gabc_notes_determination_text); BEGIN(endledger); @@ -11828,7 +11995,7 @@ YY_RULE_SETUP YY_BREAK case 54: YY_RULE_SETUP -#line 828 "gabc/gabc-notes-determination.l" +#line 995 "gabc/gabc-notes-determination.l" { BEGIN(INITIAL); } @@ -11836,138 +12003,131 @@ YY_RULE_SETUP case 55: /* rule 55 can match eol */ YY_RULE_SETUP -#line 831 "gabc/gabc-notes-determination.l" +#line 998 "gabc/gabc-notes-determination.l" { - parse_slur(1); + parse_slur(); } YY_BREAK case 56: YY_RULE_SETUP -#line 834 "gabc/gabc-notes-determination.l" +#line 1001 "gabc/gabc-notes-determination.l" { - start_var_slur(SO_OVER); + start_var_slur(); } YY_BREAK case 57: YY_RULE_SETUP -#line 837 "gabc/gabc-notes-determination.l" +#line 1004 "gabc/gabc-notes-determination.l" { - end_var_slur(1, SO_OVER); + end_var_slur(); } YY_BREAK case 58: /* rule 58 can match eol */ YY_RULE_SETUP -#line 840 "gabc/gabc-notes-determination.l" +#line 1011 "gabc/gabc-notes-determination.l" { - parse_slur(-1); + parse_hepisema_adjustment(); } YY_BREAK case 59: YY_RULE_SETUP -#line 843 "gabc/gabc-notes-determination.l" +#line 1014 "gabc/gabc-notes-determination.l" { - start_var_slur(SO_UNDER); + end_hepisema_adjustment(); } YY_BREAK case 60: YY_RULE_SETUP -#line 846 "gabc/gabc-notes-determination.l" -{ - end_var_slur(-1, SO_UNDER); - } - YY_BREAK -case 61: -YY_RULE_SETUP -#line 849 "gabc/gabc-notes-determination.l" +#line 1017 "gabc/gabc-notes-determination.l" { gregorio_add_texverb_as_note(¤t_note, gregorio_strdup("\\hbox to 0pt{"), GRE_TEXVERB_ELEMENT, ¬es_lloc); } YY_BREAK -case 62: +case 61: YY_RULE_SETUP -#line 854 "gabc/gabc-notes-determination.l" +#line 1022 "gabc/gabc-notes-determination.l" { gregorio_add_texverb_as_note(¤t_note, gregorio_strdup("\\hss%\n}%\n\\GreNoBreak\\relax "), GRE_TEXVERB_ELEMENT, ¬es_lloc); } YY_BREAK -case 63: +case 62: YY_RULE_SETUP -#line 859 "gabc/gabc-notes-determination.l" +#line 1027 "gabc/gabc-notes-determination.l" { gregorio_add_manual_custos_as_note(¤t_note, pitch_letter_to_height(gabc_notes_determination_text[0]), ¬es_lloc); } YY_BREAK -case 64: -/* rule 64 can match eol */ +case 63: +/* rule 63 can match eol */ YY_RULE_SETUP -#line 864 "gabc/gabc-notes-determination.l" +#line 1032 "gabc/gabc-notes-determination.l" /* ignore ends of line and tabs */; YY_BREAK -case 65: +case 64: YY_RULE_SETUP -#line 865 "gabc/gabc-notes-determination.l" +#line 1033 "gabc/gabc-notes-determination.l" { gregorio_add_custo_as_note(¤t_note, ¬es_lloc); } YY_BREAK -case 66: +case 65: YY_RULE_SETUP -#line 868 "gabc/gabc-notes-determination.l" +#line 1036 "gabc/gabc-notes-determination.l" { gregorio_add_end_of_line_as_note(¤t_note, false, false, false, ¬es_lloc); } YY_BREAK -case 67: +case 66: YY_RULE_SETUP -#line 872 "gabc/gabc-notes-determination.l" +#line 1040 "gabc/gabc-notes-determination.l" { gregorio_add_end_of_line_as_note(¤t_note, false, true, true, ¬es_lloc); } YY_BREAK -case 68: +case 67: YY_RULE_SETUP -#line 876 "gabc/gabc-notes-determination.l" +#line 1044 "gabc/gabc-notes-determination.l" { gregorio_add_end_of_line_as_note(¤t_note, false, true, false, ¬es_lloc); } YY_BREAK -case 69: +case 68: YY_RULE_SETUP -#line 880 "gabc/gabc-notes-determination.l" +#line 1048 "gabc/gabc-notes-determination.l" { gregorio_add_end_of_line_as_note(¤t_note, true, false, false, ¬es_lloc); } YY_BREAK -case 70: +case 69: YY_RULE_SETUP -#line 884 "gabc/gabc-notes-determination.l" +#line 1052 "gabc/gabc-notes-determination.l" { gregorio_add_end_of_line_as_note(¤t_note, true, true, true, ¬es_lloc); } YY_BREAK -case 71: +case 70: YY_RULE_SETUP -#line 888 "gabc/gabc-notes-determination.l" +#line 1056 "gabc/gabc-notes-determination.l" { gregorio_add_end_of_line_as_note(¤t_note, true, true, false, ¬es_lloc); } YY_BREAK -case 72: +case 71: YY_RULE_SETUP -#line 892 "gabc/gabc-notes-determination.l" +#line 1060 "gabc/gabc-notes-determination.l" { gregorio_add_clef_as_note(¤t_note, letter_to_clef(gabc_notes_determination_text[0]), @@ -11975,9 +12135,9 @@ YY_RULE_SETUP ¬es_lloc); } YY_BREAK -case 73: +case 72: YY_RULE_SETUP -#line 898 "gabc/gabc-notes-determination.l" +#line 1066 "gabc/gabc-notes-determination.l" { gregorio_add_clef_as_note(¤t_note, letter_to_clef(gabc_notes_determination_text[0]), @@ -11985,492 +12145,524 @@ YY_RULE_SETUP ¬es_lloc); } YY_BREAK -case 74: +case 73: YY_RULE_SETUP -#line 904 "gabc/gabc-notes-determination.l" +#line 1072 "gabc/gabc-notes-determination.l" { gregorio_add_secondary_clef_to_note(current_note, letter_to_clef(gabc_notes_determination_text[1]), parse_clef_line(gabc_notes_determination_text[2]), false); } YY_BREAK -case 75: +case 74: YY_RULE_SETUP -#line 909 "gabc/gabc-notes-determination.l" +#line 1077 "gabc/gabc-notes-determination.l" { gregorio_add_secondary_clef_to_note(current_note, letter_to_clef(gabc_notes_determination_text[1]), parse_clef_line(gabc_notes_determination_text[3]), true); } YY_BREAK -case 76: +case 75: YY_RULE_SETUP -#line 914 "gabc/gabc-notes-determination.l" +#line 1082 "gabc/gabc-notes-determination.l" { add_bar_as_note(B_VIRGULA); } YY_BREAK -case 77: +case 76: YY_RULE_SETUP -#line 917 "gabc/gabc-notes-determination.l" +#line 1085 "gabc/gabc-notes-determination.l" { add_bar_as_note(B_DIVISIO_MINIMA); } YY_BREAK -case 78: +case 77: YY_RULE_SETUP -#line 920 "gabc/gabc-notes-determination.l" +#line 1088 "gabc/gabc-notes-determination.l" { add_bar_as_note(parse_dominican_bar(gabc_notes_determination_text[1])); } YY_BREAK -case 79: +case 78: YY_RULE_SETUP -#line 923 "gabc/gabc-notes-determination.l" +#line 1091 "gabc/gabc-notes-determination.l" { add_bar_as_note(B_DIVISIO_MINOR); } YY_BREAK -case 80: +case 79: YY_RULE_SETUP -#line 926 "gabc/gabc-notes-determination.l" +#line 1094 "gabc/gabc-notes-determination.l" { add_bar_as_note(B_DIVISIO_MAIOR); } YY_BREAK -case 81: +case 80: YY_RULE_SETUP -#line 929 "gabc/gabc-notes-determination.l" +#line 1097 "gabc/gabc-notes-determination.l" { add_bar_as_note(B_DIVISIO_FINALIS); } YY_BREAK -case 82: +case 81: YY_RULE_SETUP -#line 932 "gabc/gabc-notes-determination.l" +#line 1100 "gabc/gabc-notes-determination.l" { gregorio_change_shape(current_note, S_PUNCTUM_CAVUM, legacy_oriscus_orientation); } YY_BREAK -case 83: +case 82: YY_RULE_SETUP -#line 936 "gabc/gabc-notes-determination.l" +#line 1104 "gabc/gabc-notes-determination.l" { gregorio_change_shape(current_note, S_LINEA_PUNCTUM, legacy_oriscus_orientation); } YY_BREAK -case 84: +case 83: YY_RULE_SETUP -#line 940 "gabc/gabc-notes-determination.l" +#line 1108 "gabc/gabc-notes-determination.l" { gregorio_change_shape(current_note, S_LINEA_PUNCTUM_CAVUM, legacy_oriscus_orientation); } YY_BREAK -case 85: +case 84: YY_RULE_SETUP -#line 944 "gabc/gabc-notes-determination.l" +#line 1112 "gabc/gabc-notes-determination.l" { gregorio_add_special_sign(current_note, _ACCENTUS); } YY_BREAK -case 86: +case 85: YY_RULE_SETUP -#line 947 "gabc/gabc-notes-determination.l" +#line 1115 "gabc/gabc-notes-determination.l" { gregorio_add_special_sign(current_note, _ACCENTUS_REVERSUS); } YY_BREAK -case 87: +case 86: YY_RULE_SETUP -#line 950 "gabc/gabc-notes-determination.l" +#line 1118 "gabc/gabc-notes-determination.l" { gregorio_add_special_sign(current_note, _CIRCULUS); } YY_BREAK -case 88: +case 87: YY_RULE_SETUP -#line 953 "gabc/gabc-notes-determination.l" +#line 1121 "gabc/gabc-notes-determination.l" { gregorio_add_special_sign(current_note, _SEMI_CIRCULUS); } YY_BREAK -case 89: +case 88: YY_RULE_SETUP -#line 956 "gabc/gabc-notes-determination.l" +#line 1124 "gabc/gabc-notes-determination.l" { gregorio_add_special_sign(current_note, _SEMI_CIRCULUS_REVERSUS); } YY_BREAK -case 90: +case 89: YY_RULE_SETUP -#line 959 "gabc/gabc-notes-determination.l" +#line 1127 "gabc/gabc-notes-determination.l" { gregorio_change_shape(current_note, S_FLAT, legacy_oriscus_orientation); } YY_BREAK -case 91: +case 90: YY_RULE_SETUP -#line 962 "gabc/gabc-notes-determination.l" +#line 1130 "gabc/gabc-notes-determination.l" { gregorio_change_shape(current_note, S_SHARP, legacy_oriscus_orientation); } YY_BREAK -case 92: +case 91: YY_RULE_SETUP -#line 966 "gabc/gabc-notes-determination.l" +#line 1134 "gabc/gabc-notes-determination.l" { gregorio_change_shape(current_note, S_NATURAL, legacy_oriscus_orientation); } YY_BREAK -case 93: +case 92: YY_RULE_SETUP -#line 970 "gabc/gabc-notes-determination.l" +#line 1138 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_HALF_SPACE, NULL, ¬es_lloc); } YY_BREAK -case 94: +case 93: YY_RULE_SETUP -#line 974 "gabc/gabc-notes-determination.l" +#line 1142 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_INTERGLYPH_SPACE, NULL, ¬es_lloc); } YY_BREAK -case 95: +case 94: YY_RULE_SETUP -#line 978 "gabc/gabc-notes-determination.l" +#line 1146 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_NEUMATIC_CUT, NULL, ¬es_lloc); } YY_BREAK -case 96: +case 95: *yy_cp = (yy_hold_char); /* undo effects of setting up gabc_notes_determination_text */ (yy_c_buf_p) = yy_cp = yy_bp + 1; YY_DO_BEFORE_ACTION; /* set up gabc_notes_determination_text again */ YY_RULE_SETUP -#line 982 "gabc/gabc-notes-determination.l" +#line 1150 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_NEUMATIC_CUT, NULL, ¬es_lloc); } YY_BREAK -case 97: +case 96: YY_RULE_SETUP -#line 986 "gabc/gabc-notes-determination.l" +#line 1154 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_LARGER_SPACE, NULL, ¬es_lloc); } YY_BREAK -case 98: +case 97: YY_RULE_SETUP -#line 990 "gabc/gabc-notes-determination.l" +#line 1158 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_GLYPH_SPACE, NULL, ¬es_lloc); } YY_BREAK -case 99: +case 98: YY_RULE_SETUP -#line 994 "gabc/gabc-notes-determination.l" +#line 1162 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_NEUMATIC_CUT_NB, NULL, ¬es_lloc); } YY_BREAK -case 100: +case 99: *yy_cp = (yy_hold_char); /* undo effects of setting up gabc_notes_determination_text */ (yy_c_buf_p) = yy_cp = yy_bp + 2; YY_DO_BEFORE_ACTION; /* set up gabc_notes_determination_text again */ YY_RULE_SETUP -#line 998 "gabc/gabc-notes-determination.l" +#line 1166 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_NEUMATIC_CUT_NB, NULL, ¬es_lloc); } YY_BREAK -case 101: +case 100: YY_RULE_SETUP -#line 1002 "gabc/gabc-notes-determination.l" +#line 1170 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_LARGER_SPACE_NB, NULL, ¬es_lloc); } YY_BREAK -case 102: +case 101: YY_RULE_SETUP -#line 1006 "gabc/gabc-notes-determination.l" +#line 1174 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_GLYPH_SPACE_NB, NULL, ¬es_lloc); } YY_BREAK -case 103: -/* rule 103 can match eol */ +case 102: +/* rule 102 can match eol */ *yy_cp = (yy_hold_char); /* undo effects of setting up gabc_notes_determination_text */ 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_RULE_SETUP -#line 1010 "gabc/gabc-notes-determination.l" +#line 1178 "gabc/gabc-notes-determination.l" { gregorio_add_space_as_note(¤t_note, SP_ZERO_WIDTH, NULL, ¬es_lloc); } YY_BREAK -case 104: +case 103: YY_RULE_SETUP -#line 1014 "gabc/gabc-notes-determination.l" +#line 1182 "gabc/gabc-notes-determination.l" { gregorio_change_shape(current_note, S_LINEA, legacy_oriscus_orientation); } YY_BREAK -case 105: +case 104: YY_RULE_SETUP -#line 1018 "gabc/gabc-notes-determination.l" +#line 1186 "gabc/gabc-notes-determination.l" { lex_add_note(0, S_BIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA); } YY_BREAK -case 106: +case 105: YY_RULE_SETUP -#line 1021 "gabc/gabc-notes-determination.l" +#line 1189 "gabc/gabc-notes-determination.l" { lex_add_note(0, S_TRIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA); } YY_BREAK -case 107: +case 106: YY_RULE_SETUP -#line 1024 "gabc/gabc-notes-determination.l" +#line 1192 "gabc/gabc-notes-determination.l" { lex_add_note(0, S_BIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA); } YY_BREAK -case 108: +case 107: YY_RULE_SETUP -#line 1027 "gabc/gabc-notes-determination.l" +#line 1195 "gabc/gabc-notes-determination.l" { lex_add_note(0, S_TRIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA); } YY_BREAK -case 109: +case 108: YY_RULE_SETUP -#line 1030 "gabc/gabc-notes-determination.l" +#line 1198 "gabc/gabc-notes-determination.l" { lex_add_note(0, S_DISTROPHA, _NO_SIGN, L_NO_LIQUESCENTIA); } YY_BREAK -case 110: +case 109: YY_RULE_SETUP -#line 1033 "gabc/gabc-notes-determination.l" +#line 1201 "gabc/gabc-notes-determination.l" { lex_add_note(0, S_DISTROPHA, _NO_SIGN, L_AUCTUS_ASCENDENS); } YY_BREAK -case 111: +case 110: YY_RULE_SETUP -#line 1036 "gabc/gabc-notes-determination.l" +#line 1204 "gabc/gabc-notes-determination.l" { lex_add_note(0, S_TRISTROPHA, _NO_SIGN, L_NO_LIQUESCENTIA); } YY_BREAK -case 112: +case 111: YY_RULE_SETUP -#line 1039 "gabc/gabc-notes-determination.l" +#line 1207 "gabc/gabc-notes-determination.l" { lex_add_note(0, S_TRISTROPHA, _NO_SIGN, L_AUCTUS_ASCENDENS); } YY_BREAK -case 113: +case 112: YY_RULE_SETUP -#line 1042 "gabc/gabc-notes-determination.l" +#line 1210 "gabc/gabc-notes-determination.l" { lex_add_note(0, punctum(gabc_notes_determination_text[0]), _NO_SIGN, L_NO_LIQUESCENTIA); } YY_BREAK -case 114: +case 113: YY_RULE_SETUP -#line 1046 "gabc/gabc-notes-determination.l" +#line 1214 "gabc/gabc-notes-determination.l" { lex_add_note(1, punctum(gabc_notes_determination_text[1]), _NO_SIGN, L_INITIO_DEBILIS); } YY_BREAK -case 115: +case 114: YY_RULE_SETUP -#line 1050 "gabc/gabc-notes-determination.l" +#line 1218 "gabc/gabc-notes-determination.l" { lex_add_note(1, punctum(gabc_notes_determination_text[1]), _NO_SIGN, L_FUSED); } YY_BREAK -case 116: +case 115: YY_RULE_SETUP -#line 1054 "gabc/gabc-notes-determination.l" +#line 1222 "gabc/gabc-notes-determination.l" { add_sign(_V_EPISEMA); } YY_BREAK -case 117: +case 116: YY_RULE_SETUP -#line 1057 "gabc/gabc-notes-determination.l" +#line 1225 "gabc/gabc-notes-determination.l" { add_h_episema(); } YY_BREAK -case 118: +case 117: YY_RULE_SETUP -#line 1060 "gabc/gabc-notes-determination.l" +#line 1228 "gabc/gabc-notes-determination.l" { add_sign(_PUNCTUM_MORA); } YY_BREAK -case 119: +case 118: YY_RULE_SETUP -#line 1063 "gabc/gabc-notes-determination.l" +#line 1231 "gabc/gabc-notes-determination.l" { gregorio_add_tail_liquescentia(current_note, L_DEMINUTUS, legacy_oriscus_orientation); } YY_BREAK -case 120: +case 119: YY_RULE_SETUP -#line 1067 "gabc/gabc-notes-determination.l" +#line 1235 "gabc/gabc-notes-determination.l" { gregorio_add_tail_liquescentia(current_note, L_AUCTUS_DESCENDENS, legacy_oriscus_orientation); } YY_BREAK -case 121: +case 120: YY_RULE_SETUP -#line 1071 "gabc/gabc-notes-determination.l" +#line 1239 "gabc/gabc-notes-determination.l" { gregorio_add_tail_liquescentia(current_note, L_AUCTUS_ASCENDENS, legacy_oriscus_orientation); } YY_BREAK -case 122: +case 121: YY_RULE_SETUP -#line 1075 "gabc/gabc-notes-determination.l" +#line 1243 "gabc/gabc-notes-determination.l" { gregorio_change_shape(current_note, S_QUADRATUM, legacy_oriscus_orientation); } YY_BREAK -case 123: +case 122: YY_RULE_SETUP -#line 1079 "gabc/gabc-notes-determination.l" +#line 1247 "gabc/gabc-notes-determination.l" { gregorio_change_shape(current_note, S_ORISCUS_UNDETERMINED, legacy_oriscus_orientation); } YY_BREAK +case 123: +YY_RULE_SETUP +#line 1251 "gabc/gabc-notes-determination.l" +{ + gregorio_change_shape(current_note, S_ORISCUS_DESCENDENS, + legacy_oriscus_orientation); + } + YY_BREAK case 124: YY_RULE_SETUP -#line 1083 "gabc/gabc-notes-determination.l" +#line 1255 "gabc/gabc-notes-determination.l" { - gregorio_change_shape(current_note, S_ORISCUS_SCAPUS, + gregorio_change_shape(current_note, S_ORISCUS_ASCENDENS, legacy_oriscus_orientation); } YY_BREAK case 125: YY_RULE_SETUP -#line 1087 "gabc/gabc-notes-determination.l" +#line 1259 "gabc/gabc-notes-determination.l" { - gregorio_change_shape(current_note, S_QUILISMA, + gregorio_change_shape(current_note, S_ORISCUS_SCAPUS_UNDETERMINED, legacy_oriscus_orientation); } YY_BREAK case 126: YY_RULE_SETUP -#line 1091 "gabc/gabc-notes-determination.l" +#line 1263 "gabc/gabc-notes-determination.l" { - gregorio_change_shape(current_note, S_QUILISMA_QUADRATUM, + gregorio_change_shape(current_note, S_ORISCUS_SCAPUS_DESCENDENS, legacy_oriscus_orientation); } YY_BREAK case 127: YY_RULE_SETUP -#line 1095 "gabc/gabc-notes-determination.l" +#line 1267 "gabc/gabc-notes-determination.l" { - gregorio_change_shape(current_note, S_VIRGA, + gregorio_change_shape(current_note, S_ORISCUS_SCAPUS_ASCENDENS, legacy_oriscus_orientation); } YY_BREAK case 128: YY_RULE_SETUP -#line 1099 "gabc/gabc-notes-determination.l" +#line 1271 "gabc/gabc-notes-determination.l" { - gregorio_change_shape(current_note, S_VIRGA_REVERSA, + gregorio_change_shape(current_note, S_QUILISMA, legacy_oriscus_orientation); } YY_BREAK case 129: YY_RULE_SETUP -#line 1103 "gabc/gabc-notes-determination.l" +#line 1275 "gabc/gabc-notes-determination.l" { - gregorio_change_shape(current_note, S_STROPHA, + gregorio_change_shape(current_note, S_QUILISMA_QUADRATUM, legacy_oriscus_orientation); } YY_BREAK case 130: YY_RULE_SETUP -#line 1107 "gabc/gabc-notes-determination.l" +#line 1279 "gabc/gabc-notes-determination.l" +{ + gregorio_change_shape(current_note, S_VIRGA, + legacy_oriscus_orientation); + } + YY_BREAK +case 131: +YY_RULE_SETUP +#line 1283 "gabc/gabc-notes-determination.l" +{ + gregorio_change_shape(current_note, S_VIRGA_REVERSA, + legacy_oriscus_orientation); + } + YY_BREAK +case 132: +YY_RULE_SETUP +#line 1287 "gabc/gabc-notes-determination.l" +{ + gregorio_change_shape(current_note, S_STROPHA, + legacy_oriscus_orientation); + } + YY_BREAK +case 133: +YY_RULE_SETUP +#line 1291 "gabc/gabc-notes-determination.l" { current_note->supposed_high_ledger_line = true; current_note->explicit_high_ledger_line = true; } YY_BREAK -case 131: +case 134: YY_RULE_SETUP -#line 1111 "gabc/gabc-notes-determination.l" +#line 1295 "gabc/gabc-notes-determination.l" { current_note->supposed_high_ledger_line = false; current_note->explicit_high_ledger_line = true; } YY_BREAK -case 132: +case 135: YY_RULE_SETUP -#line 1115 "gabc/gabc-notes-determination.l" +#line 1299 "gabc/gabc-notes-determination.l" { current_note->supposed_low_ledger_line = true; current_note->explicit_low_ledger_line = true; } YY_BREAK -case 133: +case 136: YY_RULE_SETUP -#line 1119 "gabc/gabc-notes-determination.l" +#line 1303 "gabc/gabc-notes-determination.l" { current_note->supposed_low_ledger_line = false; current_note->explicit_low_ledger_line = true; } YY_BREAK -case 134: -/* rule 134 can match eol */ +case 137: +/* rule 137 can match eol */ YY_RULE_SETUP -#line 1123 "gabc/gabc-notes-determination.l" +#line 1307 "gabc/gabc-notes-determination.l" { gregorio_messagef("det_notes_from_string", VERBOSITY_ERROR, 0, _("unrecognized character: \"%c\""), gabc_notes_determination_text[0]); } YY_BREAK -case 135: +case 138: YY_RULE_SETUP -#line 1129 "gabc/gabc-notes-determination.l" +#line 1313 "gabc/gabc-notes-determination.l" ECHO; YY_BREAK -#line 12474 "gabc/gabc-notes-determination-l.c" +#line 12666 "gabc/gabc-notes-determination-l.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(texverbnote): case YY_STATE_EOF(texverbglyph): @@ -13449,7 +13641,7 @@ void gabc_notes_determination_free (void * ptr ) #define YYTABLES_NAME "yytables" -#line 1129 "gabc/gabc-notes-determination.l" +#line 1313 "gabc/gabc-notes-determination.l" diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l index d47eb1a7027..9682d53c7e3 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l +++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l @@ -51,14 +51,46 @@ static int ledger_var[2] = { 0, 0 }; static unsigned char staff_lines; static signed char highest_pitch; static bool legacy_oriscus_orientation; -static int slur_var[2] = { 0, 0 }; -static char slur_shift[2] = { '\0', '\0' }; -static gregorio_note *slur_start[] = { NULL, NULL }; +static unsigned short he_adjustment_index[2] = { 0, 0 }; -typedef enum sign_orientation { - SO_OVER = 0, - SO_UNDER = 1 -} sign_orientation; +typedef struct slur_info { + int var; + char shift; + gregorio_note *start; +} slur_info; + +static slur_info slur[2] = { { 0, '\0', NULL }, { 0, '\0', NULL } }; + +static __inline gregorio_sign_orientation letter_to_sign_orientation( + const char letter) { + switch (letter) { + case 'u': /* "u"under */ + return SO_UNDER; + case 'o': /* "o"ver */ + return SO_OVER; + } + /* not reachable unless there's a programming error */ + /* LCOV_EXCL_START */ + gregorio_fail2(letter_to_sign_orientation, + "invalid sign orientation letter: %c", letter); + return SO_OVER; + /* LCOV_EXCL_STOP */ +} + +static __inline int letter_to_pitch_adjustment(const char letter) { + switch (letter_to_sign_orientation(letter)) { + case SO_OVER: + return 1; + case SO_UNDER: + return -1; + } + /* not reachable unless there's a programming error */ + /* LCOV_EXCL_START */ + gregorio_fail2(letter_to_pitch_adjustment, + "invalid sign orientation letter: %c", letter); + return 0; + /* LCOV_EXCL_STOP */ +} static __inline char pitch_letter_to_height(const char pitch) { char result = pitch - 'a' + LOWEST_PITCH; @@ -89,6 +121,8 @@ static __inline void lex_add_note(int i, gregorio_shape shape, char signs, gregorio_add_note(¤t_note, pitch_letter_to_height( tolower((unsigned char)gabc_notes_determination_text[i])), shape, signs, liquescentia, NULL, ¬es_lloc); + current_note->he_adjustment_index[SO_OVER] = he_adjustment_index[SO_OVER]; + current_note->he_adjustment_index[SO_UNDER] = he_adjustment_index[SO_UNDER]; if (ledger_var[SO_OVER]) { current_note->supposed_high_ledger_line = true; @@ -185,7 +219,8 @@ static void save_before_ledger(const char *const before_ledger) } } -static void add_static_ledger(const sign_orientation type, const char *length) { +static void add_static_ledger(const gregorio_sign_orientation type, + const char *length) { gregorio_snprintf(tempstr, sizeof tempstr, "\\GreDrawAdditionalLine{%d}{%s}{%d}{%s}{0}{}", type, length + 1, before_ledger_type, before_ledger_length); @@ -199,7 +234,8 @@ static void add_static_ledger(const sign_orientation type, const char *length) { GRE_TEXVERB_GLYPH, ¬es_lloc); } -static __inline const char *sign_orientation_name(const sign_orientation type) { +static __inline const char *over_or_under( + const gregorio_sign_orientation type) { switch (type) { case SO_OVER: return "over"; @@ -208,16 +244,16 @@ static __inline const char *sign_orientation_name(const sign_orientation type) { } /* not reachable unless there's a programming error */ /* LCOV_EXCL_START */ - gregorio_fail2(sign_orientation_name, "invalid ledger type %d", type); + gregorio_fail2(over_or_under, "invalid ledger type %d", type); return ""; /* LCOV_EXCL_STOP */ } -static void add_variable_ledger(const sign_orientation type, +static void add_variable_ledger(const gregorio_sign_orientation type, const char *after_ledger) { if (ledger_var[type]) { - const char *const typename = sign_orientation_name(type); + const char *const typename = over_or_under(type); gregorio_messagef("add_variable_ledger", VERBOSITY_ERROR, 0, _("variable %s-staff ledger line without termination of " "previous %s-staff ledger line"), typename, typename); @@ -256,10 +292,10 @@ static void add_variable_ledger(const sign_orientation type, } } -static void end_variable_ledger(const sign_orientation type) +static void end_variable_ledger(const gregorio_sign_orientation type) { if (!ledger_var[type]) { - const char *const typename = sign_orientation_name(type); + const char *const typename = over_or_under(type); gregorio_messagef("end_variable_ledger", VERBOSITY_ERROR, 0, _("variable %s-staff ledger line termination without variable " "%s-staff ledger line start"), typename, typename); @@ -355,8 +391,10 @@ static char *parse_slur_shift(char *shift) return c; } -static void parse_slur(int direction) +static void parse_slur(void) { + const int direction = letter_to_pitch_adjustment( + gabc_notes_determination_text[1]); char shift, *width, *height, *end; if (!current_note || current_note->type != GRE_NOTE) { @@ -383,8 +421,11 @@ static void parse_slur(int direction) gregorio_add_texverb_to_note(current_note, gregorio_strdup(tempstr)); } -static void start_var_slur(const sign_orientation index) +static void start_var_slur(void) { + const gregorio_sign_orientation index = letter_to_sign_orientation( + gabc_notes_determination_text[1]); + if (!current_note || current_note->type != GRE_NOTE) { gregorio_message( _("cannot add a slur to something that is not a note"), @@ -392,20 +433,24 @@ static void start_var_slur(const sign_orientation index) return; } - if (slur_var[index]) { + if (slur[index].var) { gregorio_messagef("start_var_slur", VERBOSITY_ERROR, 0, _("variable %s-note slur without termination of previous slur"), - sign_orientation_name(index)); + over_or_under(index)); return; } - slur_var[index] = ++brace_var_counter; - parse_slur_shift(slur_shift + index); - slur_start[index] = current_note; + slur[index].var = ++brace_var_counter; + parse_slur_shift(&(slur[index].shift)); + slur[index].start = current_note; } -static void end_var_slur(const int direction, const sign_orientation index) +static void end_var_slur(void) { + const int direction = letter_to_pitch_adjustment( + gabc_notes_determination_text[1]); + const gregorio_sign_orientation index = letter_to_sign_orientation( + gabc_notes_determination_text[1]); char shift; if (!current_note || current_note->type != GRE_NOTE) { @@ -415,10 +460,10 @@ static void end_var_slur(const int direction, const sign_orientation index) return; } - if (!slur_var[index] || !slur_shift[index] || !slur_start[index]) { + if (!slur[index].var || !slur[index].shift || !slur[index].start) { gregorio_messagef("end_var_slur", VERBOSITY_ERROR, 0, _("variable %s-note slur end without start"), - sign_orientation_name(index)); + over_or_under(index)); return; } @@ -427,25 +472,141 @@ static void end_var_slur(const int direction, const sign_orientation index) gregorio_snprintf(tempstr, sizeof tempstr, "\\GreVarBraceSavePos{%d}{%c}{1}" "\\GreSlur{%d}{%d}{%c}{\\GreVarBraceLength{%d}}{}{%d}", - slur_var[index], slur_shift[index], - slur_start[index]->u.note.pitch + direction, direction, - slur_shift[index], slur_var[index], + slur[index].var, slur[index].shift, + slur[index].start->u.note.pitch + direction, direction, + slur[index].shift, slur[index].var, current_note->u.note.pitch + direction); - gregorio_add_texverb_to_note(slur_start[index], gregorio_strdup(tempstr)); + gregorio_add_texverb_to_note(slur[index].start, gregorio_strdup(tempstr)); gregorio_snprintf(tempstr, sizeof tempstr, - "\\GreVarBraceSavePos{%d}{%c}{2}", slur_var[index], shift); + "\\GreVarBraceSavePos{%d}{%c}{2}", slur[index].var, shift); gregorio_add_texverb_to_note(current_note, gregorio_strdup(tempstr)); - slur_var[index] = 0; - slur_shift[index] = '\0'; - slur_start[index] = NULL; + slur[index].var = 0; + slur[index].shift = '\0'; + slur[index].start = NULL; +} + +void parse_hepisema_adjustment(void) +{ + /* [xh:yz{] + * - x indicates l(ow) or h(igh) episema + * - y (optional) for l(ow), m(iddle), or h(igh) vertical position in space + * - z (optional) nudge dimension that starts with + or - + * - { (optional) starts a group + * - at least one of y, z, or w must be provided + * - if y and z are omitted, : may be omitted + */ + + const gregorio_sign_orientation index = letter_to_sign_orientation( + gabc_notes_determination_text[1]); + gregorio_sign_orientation det_index = index; + char *ch = gabc_notes_determination_text + 3; + gregorio_hepisema_vbasepos vbasepos = HVB_AUTO; + char *nudge = NULL; + char save; + short hepisema_adjustment_id; + + if (he_adjustment_index[index]) { + gregorio_messagef("parse_hepisema_adustment", VERBOSITY_ERROR, 0, + _("horizontal %s-episema adjustment start before ending the " + "previous adjustment"), over_or_under(index)); + return; + } + + if (*ch == ':') { + ++ch; + if (*ch == 'm') { + vbasepos = HVB_MIDDLE; + } else { + switch (*ch) { + case 'o': + ++ch; + det_index = SO_OVER; + break; + case 'u': + ++ch; + det_index = SO_UNDER; + break; + } + + switch (*ch) { + case 'l': + switch (det_index) { + case SO_OVER: + vbasepos = HVB_O_LOW; + break; + case SO_UNDER: + vbasepos = HVB_U_LOW; + break; + } + break; + case 'h': + switch (det_index) { + case SO_OVER: + vbasepos = HVB_O_HIGH; + break; + case SO_UNDER: + vbasepos = HVB_U_HIGH; + break; + } + break; + } + } + if (vbasepos) { + ++ch; + } + if (*ch == '+' || *ch == '-') { + nudge = ch; + do { + ++ch; + } while (*ch && *ch != '{' && *ch != ']'); + save = *ch; + *ch = '\0'; + nudge = gregorio_strdup(nudge); + *ch = save; + } + } + + hepisema_adjustment_id = gregorio_add_hepisema_adjustment(vbasepos, nudge); + + if (*ch == '{') { + he_adjustment_index[index] = hepisema_adjustment_id; + } else { + if (!current_note || current_note->type != GRE_NOTE) { + gregorio_message(_("cannot add a horizontal episema adjustment to " + "something that is not a note"), + "parse_hepisema_adjustment", VERBOSITY_ERROR, 0); + return; + } + current_note->he_adjustment_index[index] = hepisema_adjustment_id; + } +} + +void end_hepisema_adjustment(void) +{ + /* [xh:}] + * - x indicates l(ow) or h(igh) episema + * - : is optional + */ + + const gregorio_sign_orientation index = letter_to_sign_orientation( + gabc_notes_determination_text[1]); + + if (!he_adjustment_index[index]) { + gregorio_messagef("end_hepisema_adustment", VERBOSITY_ERROR, 0, + _("horizontal %s-episema adjustment end with no matching " + "start"), over_or_under(index)); + return; + } + + he_adjustment_index[index] = 0; } void gabc_det_notes_finish(void) { - sign_orientation orientation; + gregorio_sign_orientation orientation; if (overbrace_var) { gregorio_message(_("unclosed variable over-staff brace"), "gabc_det_notes_finish", VERBOSITY_ERROR, 0); @@ -457,18 +618,24 @@ void gabc_det_notes_finish(void) underbrace_var = 0; } for (orientation = SO_OVER; orientation <= SO_UNDER; ++orientation) { - const char *name = sign_orientation_name(orientation); + const char *name = over_or_under(orientation); if (ledger_var[orientation]) { gregorio_messagef("gabc_det_notes_finish", VERBOSITY_ERROR, 0, _("unclosed variable %s-staff ledger line"), name); ledger_var[orientation] = 0; } - if (slur_var[orientation]) { + if (slur[orientation].var) { gregorio_messagef("gabc_det_notes_finish", VERBOSITY_ERROR, 0, _("unclosed variable %s-note slur"), name); - slur_var[orientation] = 0; - slur_shift[orientation] = '\0'; - slur_start[orientation] = NULL; + slur[orientation].var = 0; + slur[orientation].shift = '\0'; + slur[orientation].start = NULL; + } + if (he_adjustment_index[orientation]) { + gregorio_messagef("gabc_det_notes_finish", VERBOSITY_ERROR, 0, + _("unclosed horizontal %s-episema adjustment"), + over_or_under(orientation)); + ledger_var[orientation] = 0; } } } @@ -828,23 +995,24 @@ void gabc_det_notes_finish(void) <texverbnote,texverbglyph,texverbelement,choralsign,choralnabc,alt,overcurlyaccentusbrace,overcurlybrace,overbrace,underbrace,space,nbspace,endledger>\] { BEGIN(INITIAL); } -<INITIAL>\[oslur:[012];[^,]+,[^\]]+\] { - parse_slur(1); - } -<INITIAL>\[oslur:[012]\{\] { - start_var_slur(SO_OVER); +<INITIAL>\[[ou]slur:[012];[^,]+,[^\]]+\] { + parse_slur(); } -<INITIAL>\[oslur:[012]\}\] { - end_var_slur(1, SO_OVER); +<INITIAL>\[[ou]slur:[012]\{\] { + start_var_slur(); } -<INITIAL>\[uslur:[012];[^,]+,[^\]]+\] { - parse_slur(-1); +<INITIAL>\[[ou]slur:[012]\}\] { + end_var_slur(); } -<INITIAL>\[uslur:[012]\{\] { - start_var_slur(SO_UNDER); +<INITIAL>\[[ou]h(?x: + :(m|[ou]?[lh])\{? +| :(m|[ou]?[lh])?[+-][^\]\{]+\{? +| :?\{ +)\] { + parse_hepisema_adjustment(); } -<INITIAL>\[uslur:[012]\}\] { - end_var_slur(-1, SO_UNDER); +<INITIAL>\[[ou]h:?\}\] { + end_hepisema_adjustment(); } \{ { gregorio_add_texverb_as_note(¤t_note, @@ -1080,8 +1248,24 @@ o { gregorio_change_shape(current_note, S_ORISCUS_UNDETERMINED, legacy_oriscus_orientation); } +o0 { + gregorio_change_shape(current_note, S_ORISCUS_DESCENDENS, + legacy_oriscus_orientation); + } +o1 { + gregorio_change_shape(current_note, S_ORISCUS_ASCENDENS, + legacy_oriscus_orientation); + } O { - gregorio_change_shape(current_note, S_ORISCUS_SCAPUS, + gregorio_change_shape(current_note, S_ORISCUS_SCAPUS_UNDETERMINED, + legacy_oriscus_orientation); + } +O0 { + gregorio_change_shape(current_note, S_ORISCUS_SCAPUS_DESCENDENS, + legacy_oriscus_orientation); + } +O1 { + gregorio_change_shape(current_note, S_ORISCUS_SCAPUS_ASCENDENS, legacy_oriscus_orientation); } w { diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.c index 8fd16bb08ef..b352627d418 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.c +++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.c @@ -650,6 +650,10 @@ static void determine_oriscus_orientation(gregorio_score *score) { oriscus->u.note.shape = S_ORISCUS_DESCENDENS; break; + case S_ORISCUS_SCAPUS_UNDETERMINED: + oriscus->u.note.shape = + S_ORISCUS_SCAPUS_DESCENDENS; + break; case S_ORISCUS_CAVUM_UNDETERMINED: oriscus->u.note.shape = S_ORISCUS_CAVUM_DESCENDENS; @@ -670,6 +674,10 @@ static void determine_oriscus_orientation(gregorio_score *score) { oriscus->u.note.shape = S_ORISCUS_ASCENDENS; break; + case S_ORISCUS_SCAPUS_UNDETERMINED: + oriscus->u.note.shape = + S_ORISCUS_SCAPUS_ASCENDENS; + break; case S_ORISCUS_CAVUM_UNDETERMINED: oriscus->u.note.shape = S_ORISCUS_CAVUM_ASCENDENS; @@ -690,6 +698,7 @@ static void determine_oriscus_orientation(gregorio_score *score) { switch (note->u.note.shape) { case S_ORISCUS_UNDETERMINED: + case S_ORISCUS_SCAPUS_UNDETERMINED: case S_ORISCUS_CAVUM_UNDETERMINED: oriscus = note; break; @@ -711,6 +720,9 @@ static void determine_oriscus_orientation(gregorio_score *score) { case S_ORISCUS_UNDETERMINED: oriscus->u.note.shape = S_ORISCUS_DESCENDENS; break; + case S_ORISCUS_SCAPUS_UNDETERMINED: + oriscus->u.note.shape = S_ORISCUS_SCAPUS_DESCENDENS; + break; case S_ORISCUS_CAVUM_UNDETERMINED: oriscus->u.note.shape = S_ORISCUS_CAVUM_DESCENDENS; break; @@ -799,7 +811,7 @@ static void gabc_y_add_notes(char *notes, YYLTYPE loc) { } } -#line 803 "gabc/gabc-score-determination-y.c" /* yacc.c:339 */ +#line 815 "gabc/gabc-score-determination-y.c" /* yacc.c:339 */ # ifndef YY_NULLPTR # if defined __cplusplus && 201103L <= __cplusplus @@ -984,7 +996,7 @@ int gabc_score_determination_parse (void); /* Copy the second part of user declarations. */ -#line 988 "gabc/gabc-score-determination-y.c" /* yacc.c:358 */ +#line 1000 "gabc/gabc-score-determination-y.c" /* yacc.c:358 */ #ifdef short # undef short @@ -1289,15 +1301,15 @@ static const yytype_uint8 yytranslate[] = /* YYRLINE[YYN] -- Source line where rule number YYN was defined. */ static const yytype_uint16 yyrline[] = { - 0, 765, 765, 769, 774, 775, 779, 783, 789, 794, - 803, 809, 814, 819, 824, 829, 834, 842, 850, 860, - 869, 874, 878, 883, 884, 888, 893, 899, 910, 914, - 922, 923, 924, 928, 931, 934, 937, 940, 943, 946, - 949, 952, 955, 964, 967, 970, 973, 976, 979, 982, - 985, 988, 991, 1000, 1003, 1009, 1012, 1018, 1019, 1022, - 1023, 1024, 1025, 1029, 1032, 1037, 1038, 1039, 1043, 1049, - 1052, 1058, 1064, 1069, 1077, 1080, 1089, 1092, 1098, 1099, - 1102, 1103 + 0, 777, 777, 781, 786, 787, 791, 795, 801, 806, + 815, 821, 826, 831, 836, 841, 846, 854, 862, 872, + 881, 886, 890, 895, 896, 900, 905, 911, 922, 926, + 934, 935, 936, 940, 943, 946, 949, 952, 955, 958, + 961, 964, 967, 976, 979, 982, 985, 988, 991, 994, + 997, 1000, 1003, 1012, 1015, 1021, 1024, 1030, 1031, 1034, + 1035, 1036, 1037, 1041, 1044, 1049, 1050, 1051, 1055, 1061, + 1064, 1070, 1076, 1081, 1089, 1092, 1101, 1104, 1110, 1111, + 1114, 1115 }; #endif @@ -2079,7 +2091,7 @@ yyparse (void) yychar = YYEMPTY; /* Cause a token to be read. */ /* User initialization code. */ -#line 729 "gabc/gabc-score-determination.y" /* yacc.c:1429 */ +#line 741 "gabc/gabc-score-determination.y" /* yacc.c:1429 */ { yylloc.first_line = 1; yylloc.first_column = 0; @@ -2089,7 +2101,7 @@ yyparse (void) yylloc.last_offset = 0; } -#line 2093 "gabc/gabc-score-determination-y.c" /* yacc.c:1429 */ +#line 2105 "gabc/gabc-score-determination-y.c" /* yacc.c:1429 */ yylsp[0] = yylloc; goto yysetstate; @@ -2276,41 +2288,41 @@ yyreduce: switch (yyn) { case 3: -#line 769 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 781 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { end_definitions(); } -#line 2284 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2296 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 6: -#line 779 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 791 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { (yyval).text = (yyvsp[-1]).text; } -#line 2292 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2304 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 7: -#line 783 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 795 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { (yyval).text = NULL; } -#line 2300 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2312 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 8: -#line 789 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 801 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { /* these definitions are not passed through */ free(macros[(yyvsp[-1]).character - '0']); macros[(yyvsp[-1]).character - '0'] = (yyvsp[0]).text; } -#line 2310 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2322 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 9: -#line 794 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 806 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { if ((yyvsp[0]).text == NULL) { gregorio_message("name can't be empty","det_score", @@ -2320,72 +2332,72 @@ yyreduce: gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text); score->name = (yyvsp[0]).text; } -#line 2324 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2336 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 10: -#line 803 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 815 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { check_multiple("language", got_language); gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text); gregorio_set_centering_language((yyvsp[0]).text); got_language = true; } -#line 2335 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2347 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 11: -#line 809 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 821 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { check_multiple("gabc-copyright", score->gabc_copyright != NULL); gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text); score->gabc_copyright = (yyvsp[0]).text; } -#line 2345 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2357 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 12: -#line 814 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 826 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { check_multiple("score_copyright", score->score_copyright != NULL); gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text); score->score_copyright = (yyvsp[0]).text; } -#line 2355 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2367 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 13: -#line 819 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 831 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { check_multiple("mode", score->mode != 0); gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text); score->mode = (yyvsp[0]).text; } -#line 2365 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2377 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 14: -#line 824 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 836 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { check_multiple("mode-modifier", score->mode_modifier != NULL); gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text); score->mode_modifier = (yyvsp[0]).text; } -#line 2375 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2387 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 15: -#line 829 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 841 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { check_multiple("mode-differentia", score->mode_differentia != NULL); gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text); score->mode_differentia = (yyvsp[0]).text; } -#line 2385 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2397 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 16: -#line 834 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 846 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { check_multiple("staff-lines", got_staff_lines); if ((yyvsp[0]).text) { @@ -2394,11 +2406,11 @@ yyreduce: got_staff_lines = true; } } -#line 2398 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2410 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 17: -#line 842 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 854 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { check_multiple("nabc lines", score->nabc_lines != 0); if ((yyvsp[0]).text) { @@ -2407,11 +2419,11 @@ yyreduce: score->nabc_lines=nabc_lines; } } -#line 2411 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2423 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 18: -#line 850 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 862 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { if ((yyvsp[0]).text) { /* DEPRECATED by 4.1 */ @@ -2422,11 +2434,11 @@ yyreduce: free((yyvsp[0]).text); } } -#line 2426 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2438 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 19: -#line 860 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 872 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { if (score->annotation [MAX_ANNOTATIONS - 1]) { gregorio_messagef("det_score", VERBOSITY_WARNING, 0, @@ -2436,59 +2448,59 @@ yyreduce: gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text); gregorio_set_score_annotation(score, (yyvsp[0]).text); } -#line 2440 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2452 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 20: -#line 869 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 881 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { check_multiple("author", score->author != NULL); gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text); score->author = (yyvsp[0]).text; } -#line 2450 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2462 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 21: -#line 874 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 886 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text); score->legacy_oriscus_orientation = (strcmp((yyvsp[0]).text, "legacy") == 0); } -#line 2459 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2471 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 22: -#line 878 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 890 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text); } -#line 2467 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2479 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 25: -#line 888 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 900 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gabc_y_add_notes((yyvsp[-1]).text, (yylsp[-1])); free((yyvsp[-1]).text); nabc_state=0; } -#line 2477 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2489 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 26: -#line 893 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 905 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gabc_y_add_notes((yyvsp[-1]).text, (yylsp[-1])); free((yyvsp[-1]).text); nabc_state=0; update_position_with_space(); } -#line 2488 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2500 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 27: -#line 899 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 911 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { if (!nabc_lines) { gregorio_message(_("You used character \"|\" in gabc without " @@ -2500,294 +2512,294 @@ yyreduce: free((yyvsp[-1]).text); nabc_state = (nabc_state + 1) % (nabc_lines+1); } -#line 2504 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2516 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 28: -#line 910 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 922 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { elements[voice]=NULL; nabc_state=0; } -#line 2513 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2525 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 29: -#line 914 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 926 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { elements[voice]=NULL; nabc_state=0; update_position_with_space(); } -#line 2523 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2535 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 33: -#line 928 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 940 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_style(ST_ITALIC); } -#line 2531 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2543 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 34: -#line 931 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 943 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_style(ST_TT); } -#line 2539 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2551 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 35: -#line 934 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 946 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_style(ST_UNDERLINED); } -#line 2547 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2559 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 36: -#line 937 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 949 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_style(ST_COLORED); } -#line 2555 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2567 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 37: -#line 940 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 952 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_style(ST_BOLD); } -#line 2563 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2575 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 38: -#line 943 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 955 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_style(ST_SMALL_CAPS); } -#line 2571 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2583 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 39: -#line 946 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 958 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_style(ST_VERBATIM); } -#line 2579 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2591 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 40: -#line 949 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 961 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_style(ST_SPECIAL_CHAR); } -#line 2587 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2599 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 41: -#line 952 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 964 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_style(ST_ELISION); } -#line 2595 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2607 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 42: -#line 955 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 967 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { if (!center_is_determined) { gregorio_gabc_add_style(ST_FORCED_CENTER); center_is_determined=CENTER_HALF_DETERMINED; } } -#line 2606 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2618 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 43: -#line 964 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 976 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_end_style(ST_ITALIC); } -#line 2614 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2626 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 44: -#line 967 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 979 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_end_style(ST_TT); } -#line 2622 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2634 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 45: -#line 970 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 982 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_end_style(ST_UNDERLINED); } -#line 2630 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2642 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 46: -#line 973 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 985 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_end_style(ST_COLORED); } -#line 2638 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2650 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 47: -#line 976 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 988 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_end_style(ST_BOLD); } -#line 2646 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2658 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 48: -#line 979 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 991 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_end_style(ST_SMALL_CAPS); } -#line 2654 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2666 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 49: -#line 982 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 994 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_end_style(ST_VERBATIM); } -#line 2662 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2674 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 50: -#line 985 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 997 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_end_style(ST_SPECIAL_CHAR); } -#line 2670 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2682 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 51: -#line 988 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1000 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_end_style(ST_ELISION); } -#line 2678 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2690 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 52: -#line 991 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1003 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { if (center_is_determined==CENTER_HALF_DETERMINED) { gregorio_gabc_end_style(ST_FORCED_CENTER); center_is_determined=CENTER_FULLY_DETERMINED; } } -#line 2689 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2701 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 53: -#line 1000 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1012 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { euouae = EUOUAE_BEGINNING; } -#line 2697 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2709 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 54: -#line 1003 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1015 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { euouae = EUOUAE_END; } -#line 2705 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2717 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 55: -#line 1009 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1021 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { no_linebreak_area = NLBA_BEGINNING; } -#line 2713 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2725 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 56: -#line 1012 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1024 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { no_linebreak_area = NLBA_END; } -#line 2721 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2733 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 58: -#line 1019 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1031 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_text((yyvsp[0]).text); } -#line 2729 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2741 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 63: -#line 1029 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1041 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_text(gregorio_strdup("-")); } -#line 2737 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2749 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 64: -#line 1032 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1044 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_text(gregorio_strdup("-")); } -#line 2745 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2757 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 68: -#line 1043 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1055 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { start_translation(TR_NORMAL); } -#line 2753 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2765 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 69: -#line 1049 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1061 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { end_translation(); } -#line 2761 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2773 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 70: -#line 1052 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1064 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { start_translation(TR_WITH_CENTER_END); } -#line 2769 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2781 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 71: -#line 1058 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1070 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { abovelinestext = (yyvsp[-1]).text; } -#line 2777 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2789 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 72: -#line 1064 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1076 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { ready_characters(); first_text_character = current_character; close_syllable(&(yylsp[-2])); } -#line 2787 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2799 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 73: -#line 1069 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1081 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_style(ST_VERBATIM); gregorio_gabc_add_text(gregorio_strdup("\\GreForceHyphen")); @@ -2796,46 +2808,46 @@ yyreduce: first_text_character = current_character; close_syllable(&(yylsp[-3])); } -#line 2800 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2812 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 74: -#line 1077 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1089 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { close_syllable(&(yylsp[-3])); } -#line 2808 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2820 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 75: -#line 1080 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1092 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { gregorio_gabc_add_style(ST_VERBATIM); gregorio_gabc_add_text(gregorio_strdup("\\GreForceHyphen")); gregorio_gabc_end_style(ST_VERBATIM); close_syllable(&(yylsp[-4])); } -#line 2819 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2831 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 76: -#line 1089 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1101 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { close_syllable(NULL); } -#line 2827 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2839 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; case 77: -#line 1092 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ +#line 1104 "gabc/gabc-score-determination.y" /* yacc.c:1646 */ { close_syllable(NULL); } -#line 2835 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2847 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ break; -#line 2839 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ +#line 2851 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */ default: break; } /* User semantic actions sometimes alter yychar, and that requires diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.y b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.y index 5a8460ac550..fb964071b07 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.y +++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.y @@ -576,6 +576,10 @@ static void determine_oriscus_orientation(gregorio_score *score) { oriscus->u.note.shape = S_ORISCUS_DESCENDENS; break; + case S_ORISCUS_SCAPUS_UNDETERMINED: + oriscus->u.note.shape = + S_ORISCUS_SCAPUS_DESCENDENS; + break; case S_ORISCUS_CAVUM_UNDETERMINED: oriscus->u.note.shape = S_ORISCUS_CAVUM_DESCENDENS; @@ -596,6 +600,10 @@ static void determine_oriscus_orientation(gregorio_score *score) { oriscus->u.note.shape = S_ORISCUS_ASCENDENS; break; + case S_ORISCUS_SCAPUS_UNDETERMINED: + oriscus->u.note.shape = + S_ORISCUS_SCAPUS_ASCENDENS; + break; case S_ORISCUS_CAVUM_UNDETERMINED: oriscus->u.note.shape = S_ORISCUS_CAVUM_ASCENDENS; @@ -616,6 +624,7 @@ static void determine_oriscus_orientation(gregorio_score *score) { switch (note->u.note.shape) { case S_ORISCUS_UNDETERMINED: + case S_ORISCUS_SCAPUS_UNDETERMINED: case S_ORISCUS_CAVUM_UNDETERMINED: oriscus = note; break; @@ -637,6 +646,9 @@ static void determine_oriscus_orientation(gregorio_score *score) { case S_ORISCUS_UNDETERMINED: oriscus->u.note.shape = S_ORISCUS_DESCENDENS; break; + case S_ORISCUS_SCAPUS_UNDETERMINED: + oriscus->u.note.shape = S_ORISCUS_SCAPUS_DESCENDENS; + break; case S_ORISCUS_CAVUM_UNDETERMINED: oriscus->u.note.shape = S_ORISCUS_CAVUM_DESCENDENS; break; diff --git a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c index 5f4a68e24dc..e29a5be4602 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c +++ b/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c @@ -450,6 +450,12 @@ static void write_note_heuristics(FILE *f, gregorio_note *note) { } } +typedef struct glyph_context { + gregorio_syllable *syllable; + gregorio_element *element; + unsigned short he_adjustment_index[2]; +} glyph_context; + /* * * The function that writes one gregorio_note. @@ -509,16 +515,24 @@ static void gabc_write_gregorio_note(FILE *f, gregorio_note *note, fprintf(f, "%cV", pitch_letter(note->u.note.pitch)); break; case S_ORISCUS_ASCENDENS: + fprintf(f, "%co1", pitch_letter(note->u.note.pitch)); + break; case S_ORISCUS_DESCENDENS: + fprintf(f, "%co0", pitch_letter(note->u.note.pitch)); + break; case S_ORISCUS_DEMINUTUS: fprintf(f, "%co", pitch_letter(note->u.note.pitch)); - /* Note: the ASCENDENS, DESCENDENS, or DEMINUTUS is also in the liquescentia */ + /* Note: the DEMINUTUS is also in the liquescentia */ break; case S_ORISCUS_CAVUM_ASCENDENS: + fprintf(f, "%co1r", pitch_letter(note->u.note.pitch)); + break; case S_ORISCUS_CAVUM_DESCENDENS: + fprintf(f, "%co0r", pitch_letter(note->u.note.pitch)); + break; case S_ORISCUS_CAVUM_DEMINUTUS: fprintf(f, "%cor", pitch_letter(note->u.note.pitch)); - /* Note: the ASCENDENS, DESCENDENS, or DEMINUTUS is also in the liquescentia */ + /* Note: the DEMINUTUS is also in the liquescentia */ break; case S_QUILISMA: if (is_quadratum) { @@ -539,8 +553,11 @@ static void gabc_write_gregorio_note(FILE *f, gregorio_note *note, case S_LINEA_PUNCTUM_CAVUM: fprintf(f, "%cr0", pitch_letter(note->u.note.pitch)); break; - case S_ORISCUS_SCAPUS: - fprintf(f, "%cO", pitch_letter(note->u.note.pitch)); + case S_ORISCUS_SCAPUS_ASCENDENS: + fprintf(f, "%cO1", pitch_letter(note->u.note.pitch)); + break; + case S_ORISCUS_SCAPUS_DESCENDENS: + fprintf(f, "%cO0", pitch_letter(note->u.note.pitch)); break; case S_STROPHA: case S_STROPHA_AUCTA: @@ -630,6 +647,141 @@ static void gabc_write_gregorio_note(FILE *f, gregorio_note *note, } } +static void get_next_hepisema_adjustments(unsigned short *adjustment_index, + const gregorio_syllable *syllable, const gregorio_element *element, + const gregorio_glyph *glyph, const gregorio_note *note) +{ + while (note) { + note = note->next; + if (!note) { + while (glyph) { + glyph = glyph->next; + if (!glyph) { + while (element) { + element = element->next; + if (!element) { + syllable = syllable->next_syllable; + if (syllable) { + element = syllable->elements[0]; + } + } + if (element && element->type == GRE_ELEMENT) { + glyph = element->u.first_glyph; + break; + } + } + } + if (glyph && glyph->type == GRE_GLYPH) { + note = glyph->u.notes.first_note; + break; + } + } + } + if (note && note->type == GRE_NOTE) { + break; + } + } + + if (note) { + adjustment_index[SO_OVER] = note->he_adjustment_index[SO_OVER]; + adjustment_index[SO_UNDER] = note->he_adjustment_index[SO_UNDER]; + } else { + adjustment_index[SO_OVER] = 0; + adjustment_index[SO_UNDER] = 0; + } +} + +static __inline void emit_hepisema_adjustment(FILE *const f, + const gregorio_note *const note, const gregorio_sign_orientation index, + const char which, const bool open_brace) +{ + gregorio_hepisema_adjustment *adj = gregorio_get_hepisema_adjustment( + note->he_adjustment_index[index]); + + fprintf(f, "[%ch", which); + if (adj->vbasepos || adj->nudge) { + fputc(':', f); + switch (adj->vbasepos) { + case HVB_AUTO: + break; + case HVB_MIDDLE: + fputc('m', f); + break; + case HVB_O_LOW: + if (index == SO_OVER) { + fputc('l', f); + } else { + fprintf(f, "ol"); + } + break; + case HVB_O_HIGH: + if (index == SO_OVER) { + fputc('h', f); + } else { + fprintf(f, "oh"); + } + break; + case HVB_U_LOW: + if (index == SO_UNDER) { + fputc('l', f); + } else { + fprintf(f, "ul"); + } + break; + case HVB_U_HIGH: + if (index == SO_UNDER) { + fputc('h', f); + } else { + fprintf(f, "uh"); + } + break; + } + if (adj->nudge) { + fprintf(f, "%s", adj->nudge); + } + } + if (open_brace) { + fputc('{', f); + } + fputc(']', f); +} + +static __inline void open_hepisema_adjustment(FILE *const f, + const gregorio_note *const note, + const unsigned short *const prev_adjustment_index, + const unsigned short *const next_adjustment_index, + const gregorio_sign_orientation index, const char which) +{ + const unsigned short adjustment_index = + note->he_adjustment_index[index]; + + if (adjustment_index + && adjustment_index != prev_adjustment_index[index] + && adjustment_index == next_adjustment_index[index]) { + emit_hepisema_adjustment(f, note, index, which, true); + } +} + +static __inline void close_hepisema_adjustment(FILE *const f, + const gregorio_note *const note, + const unsigned short *const prev_adjustment_index, + const unsigned short *const next_adjustment_index, + const gregorio_sign_orientation index, const char which) +{ + const unsigned short adjustment_index = + note->he_adjustment_index[index]; + + if (adjustment_index) { + if (adjustment_index != next_adjustment_index[index]) { + if (adjustment_index == prev_adjustment_index[index]) { + fprintf(f, "[%ch}]", which); + } else { + emit_hepisema_adjustment(f, note, index, which, false); + } + } + } +} + /* * * The function that writes one glyph. If it is really a glyph (meaning not a @@ -638,9 +790,10 @@ static void gabc_write_gregorio_note(FILE *f, gregorio_note *note, * */ -static void gabc_write_gregorio_glyph(FILE *f, gregorio_glyph *glyph) +static void gabc_write_gregorio_glyph(FILE *f, gregorio_glyph *glyph, + glyph_context *context) { - + unsigned short next_adjustment_index[2] = { 0, 0 }; gregorio_note *current_note; gregorio_assert(glyph, gabc_write_gregorio_glyph, "call with NULL argument", @@ -688,10 +841,33 @@ static void gabc_write_gregorio_glyph(FILE *f, gregorio_glyph *glyph) current_note = glyph->u.notes.first_note; while (current_note) { + get_next_hepisema_adjustments(next_adjustment_index, + context->syllable, context->element, glyph, current_note); + + open_hepisema_adjustment(f, current_note, + context->he_adjustment_index, next_adjustment_index, + SO_OVER, 'o'); + open_hepisema_adjustment(f, current_note, + context->he_adjustment_index, next_adjustment_index, + SO_UNDER, 'u'); + + /* third argument necessary for the special shape pes quadratum */ gabc_write_gregorio_note(f, current_note, glyph->u.notes.glyph_type == G_PES_QUADRATUM && current_note == glyph->u.notes.first_note); - /* third argument necessary for the special shape pes quadratum */ + + close_hepisema_adjustment(f, current_note, + context->he_adjustment_index, next_adjustment_index, + SO_OVER, 'o'); + close_hepisema_adjustment(f, current_note, + context->he_adjustment_index, next_adjustment_index, + SO_UNDER, 'u'); + + context->he_adjustment_index[SO_OVER] = + current_note->he_adjustment_index[SO_OVER]; + context->he_adjustment_index[SO_UNDER] = + current_note->he_adjustment_index[SO_UNDER]; + current_note = current_note->next; } gabc_write_end_liquescentia(f, glyph->u.notes.liquescentia); @@ -715,7 +891,8 @@ static void gabc_write_gregorio_glyph(FILE *f, gregorio_glyph *glyph) * */ -static void gabc_write_gregorio_element(FILE *f, gregorio_element *element) +static void gabc_write_gregorio_element(FILE *f, gregorio_element *element, + glyph_context *context) { gregorio_glyph *current_glyph; gregorio_assert(element, gabc_write_gregorio_element, @@ -724,7 +901,7 @@ static void gabc_write_gregorio_element(FILE *f, gregorio_element *element) switch (element->type) { case GRE_ELEMENT: while (current_glyph) { - gabc_write_gregorio_glyph(f, current_glyph); + gabc_write_gregorio_glyph(f, current_glyph, context); current_glyph = current_glyph->next; } break; @@ -803,10 +980,13 @@ static void gabc_write_gregorio_element(FILE *f, gregorio_element *element) * */ -static void gabc_write_gregorio_elements(FILE *f, gregorio_element *element) +static bool gabc_write_gregorio_elements(FILE *f, gregorio_element *element, + glyph_context *context) { + bool linebreak_or_bar_in_element = false; while (element) { - gabc_write_gregorio_element(f, element); + context->element = element; + gabc_write_gregorio_element(f, element, context); /* we don't want a bar after an end of line */ if (element->type != GRE_END_OF_LINE && (element->type != GRE_SPACE @@ -814,8 +994,13 @@ static void gabc_write_gregorio_elements(FILE *f, gregorio_element *element) && element->next && element->next->type == GRE_ELEMENT) { fprintf(f, "/"); } + if (element->type == GRE_END_OF_LINE || element->type == GRE_BAR) + { + linebreak_or_bar_in_element = true; + } element = element->next; } + return linebreak_or_bar_in_element; } /* @@ -824,9 +1009,10 @@ static void gabc_write_gregorio_elements(FILE *f, gregorio_element *element) * */ -static void gabc_write_gregorio_syllable(FILE *f, gregorio_syllable *syllable) +static void gabc_write_gregorio_syllable(FILE *f, gregorio_syllable *syllable, + glyph_context *context) { - int voice = 0; + bool linebreak_or_bar_in_element; gregorio_assert(syllable, gabc_write_gregorio_syllable, "call with NULL argument", return); if (syllable->no_linebreak_area == NLBA_BEGINNING) { @@ -859,14 +1045,19 @@ static void gabc_write_gregorio_syllable(FILE *f, gregorio_syllable *syllable) } fprintf(f, "("); /* we write all the elements of the syllable. */ - gabc_write_gregorio_elements(f, syllable->elements[voice]); - if (syllable->position == WORD_END - || syllable->position == WORD_ONE_SYLLABLE - || gregorio_is_only_special(syllable->elements[0])) + linebreak_or_bar_in_element = gabc_write_gregorio_elements(f, syllable->elements[0], context); + if (linebreak_or_bar_in_element) { - fprintf(f, ") "); + fprintf(f, ")\n"); } else { - fprintf(f, ")"); + if (syllable->position == WORD_END + || syllable->position == WORD_ONE_SYLLABLE + || gregorio_is_only_special(syllable->elements[0])) + { + fprintf(f, ") "); + } else { + fprintf(f, ")"); + } } } @@ -879,11 +1070,15 @@ static void gabc_write_gregorio_syllable(FILE *f, gregorio_syllable *syllable) void gabc_write_score(FILE *f, gregorio_score *score) { + glyph_context context; gregorio_syllable *syllable; gregorio_header *header; gregorio_assert(f, gabc_write_score, "call with NULL file", return); + context.he_adjustment_index[0] = 0; + context.he_adjustment_index[1] = 0; + for (header = score->headers; header; header = header->next) { gabc_write_str_attribute(f, header->name, header->value); } @@ -901,7 +1096,8 @@ void gabc_write_score(FILE *f, gregorio_score *score) syllable = score->first_syllable; /* the we write every syllable */ while (syllable) { - gabc_write_gregorio_syllable(f, syllable); + context.syllable = syllable; + gabc_write_gregorio_syllable(f, syllable, &context); syllable = syllable->next_syllable; } fprintf(f, "\n"); diff --git a/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c index 58f135d76ea..151cae35f49 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c +++ b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c @@ -1031,6 +1031,7 @@ static bool is_bridgeable_space(const gregorio_element *const element) typedef struct height_computation { const gregorio_vposition vpos; + const gregorio_sign_orientation orientation; bool (*const is_applicable)(const gregorio_note *); bool (*const is_shown)(const gregorio_note *); bool (*const is_connected)(const gregorio_note *); @@ -1047,6 +1048,7 @@ typedef struct height_computation { const gregorio_element *last_connected_element; const gregorio_glyph *last_connected_glyph; gregorio_note *last_connected_note; + unsigned short adjustment_index; } height_computation; static bool is_h_episema_above_applicable(const gregorio_note *const note) @@ -1103,6 +1105,24 @@ static bool is_h_episema_below_better_height(const signed char new_height, return new_height < old_height; } +static void adjust_h_episema_above_if_better(gregorio_note *const note, + signed char potential_height) +{ + if (is_h_episema_above_better_height(potential_height, + note->h_episema_above)) { + note->h_episema_above = potential_height; + } +} + +static void adjust_h_episema_below_if_better(gregorio_note *const note, + signed char potential_height) +{ + if (is_h_episema_below_better_height(potential_height, + note->h_episema_below)) { + note->h_episema_below = potential_height; + } +} + static __inline bool has_high_ledger_line(const signed char height, bool is_sign, const gregorio_score *const score) { @@ -1135,7 +1155,18 @@ static __inline void position_h_episema(gregorio_note *const note, const height_computation *const h, const bool connect, const bool high_ledger_line, const bool low_ledger_line) { + const unsigned short adjustment_index = + note->he_adjustment_index[h->orientation]; + h->position(note, h->height, connect); + if (adjustment_index) { + gregorio_hepisema_adjustment *adj = gregorio_get_hepisema_adjustment( + adjustment_index); + if (adj->pitch_extremum == NO_PITCH + || h->is_better_height(h->height, adj->pitch_extremum)) { + adj->pitch_extremum = h->height; + } + } if (!note->explicit_high_ledger_line && !note->supposed_high_ledger_line) { note->supposed_high_ledger_line = high_ledger_line; } @@ -1351,6 +1382,7 @@ static __inline void end_h_episema(height_computation *const h, } } if (end && end->type == GRE_NOTE && is_connected_left(h->get_size(end)) + && !(end->u.note.liquescentia & L_DEMINUTUS) && h->last_connected_note && is_connected_right(h->get_size(h->last_connected_note))) { if (h->last_connected_note->next) { @@ -1429,7 +1461,7 @@ static __inline void compute_h_episema(height_computation *const h, end_h_episema(h, note, score); } } else if (!h->is_shown(note)) { - /* special handling for porrectus shapes because of their shape: + /* special handling for porrectus shapes because of their shape: * the lower note of the porrectus stroke is normally not applicable, * but we have to end the episema on the upper note if the episema * on the lower note is not shown. */ @@ -1582,7 +1614,8 @@ static __inline int compute_fused_shift(const gregorio_glyph *glyph) * fusible from above */ if (shift < 0 && ((next_is_fused && glyph->u.notes.glyph_type == G_FLEXA) || glyph->u.notes.glyph_type == G_PORRECTUS - || glyph->u.notes.glyph_type == G_PODATUS + || (glyph->u.notes.glyph_type == G_PODATUS + && !(glyph->u.notes.liquescentia & L_DEMINUTUS)) || (previous->u.notes.glyph_type == G_PUNCTUM && is_initio_debilis(previous->u.notes.liquescentia)))) { /* may not be fused from above */ @@ -1595,7 +1628,8 @@ static __inline int compute_fused_shift(const gregorio_glyph *glyph) const gregorio_glyph *next_glyph; case S_ORISCUS_ASCENDENS: case S_ORISCUS_DESCENDENS: - case S_ORISCUS_SCAPUS: + case S_ORISCUS_SCAPUS_ASCENDENS: + case S_ORISCUS_SCAPUS_DESCENDENS: next_note = first_note->next; if (!next_note && (next_glyph = gregorio_next_non_texverb_glyph(glyph)) && next_glyph->type == GRE_GLYPH @@ -1626,11 +1660,77 @@ static __inline int compute_fused_shift(const gregorio_glyph *glyph) return shift; } -void gregoriotex_compute_positioning(const gregorio_element *element, +static __inline void guess_ledger_lines(const gregorio_element *element, + const gregorio_score *const score) +{ + bool high_ledger_line = false; + bool low_ledger_line = false; + gregorio_note *prev = NULL; + + for (; element; element = element->next) { + if (element->type == GRE_ELEMENT) { + gregorio_glyph *glyph; + for (glyph = element->u.first_glyph; glyph; + glyph = glyph->next) { + if (glyph->type == GRE_GLYPH) { + gregorio_note *note; + for (note = glyph->u.notes.first_note; note; + note = note->next) { + if (note->type == GRE_NOTE) { + if (high_ledger_line + && !note->explicit_high_ledger_line + && !note->supposed_high_ledger_line) { + note->supposed_high_ledger_line = true; + } + if (low_ledger_line + && !note->explicit_low_ledger_line + && !note->supposed_low_ledger_line) { + note->supposed_low_ledger_line = true; + } + high_ledger_line = has_high_ledger_line( + note->u.note.pitch, false, score); + low_ledger_line = has_low_ledger_line( + note->u.note.pitch, false); + if (high_ledger_line) { + if (!note->explicit_high_ledger_line + && !note->supposed_high_ledger_line) { + note->supposed_high_ledger_line = true; + } + if (prev && !prev->explicit_high_ledger_line + && !prev->supposed_high_ledger_line) { + prev->supposed_high_ledger_line = true; + } + } + if (low_ledger_line) { + if (!note->explicit_low_ledger_line + && !note->supposed_low_ledger_line) { + note->supposed_low_ledger_line = true; + } + if (prev && !prev->explicit_low_ledger_line + && !prev->supposed_low_ledger_line) { + prev->supposed_low_ledger_line = true; + } + } + prev = note; + } + } + } + } + /* this heuristic ends eith the element */ + high_ledger_line = false; + low_ledger_line = false; + prev = NULL; + } + } +} + +void gregoriotex_compute_positioning( + const gregorio_element *const param_element, const gregorio_score *const score) { height_computation above = { /*.vpos =*/ VPOS_ABOVE, + /*.orientation =*/ SO_OVER, /*.is_applicable =*/ &is_h_episema_above_applicable, /*.is_shown =*/ >ex_is_h_episema_above_shown, /*.is_connected =*/ &is_h_episema_above_connected, @@ -1647,9 +1747,11 @@ void gregoriotex_compute_positioning(const gregorio_element *element, /*.last_connected_element =*/ NULL, /*.last_connected_glyph =*/ NULL, /*.last_connected_note =*/ NULL, + /*.adjustment_index =*/ 0, }; height_computation below = { /*.vpos =*/ VPOS_BELOW, + /*.orientation =*/ SO_UNDER, /*.is_applicable =*/ &is_h_episema_below_applicable, /*.is_shown =*/ >ex_is_h_episema_below_shown, /*.is_connected =*/ &is_h_episema_below_connected, @@ -1666,12 +1768,16 @@ void gregoriotex_compute_positioning(const gregorio_element *element, /*.last_connected_element =*/ NULL, /*.last_connected_glyph =*/ NULL, /*.last_connected_note =*/ NULL, + /*.adjustment_index =*/ 0, }; int i; gtex_alignment ignored; gtex_type type; + const gregorio_element *element; - for (; element; element = element->next) { + guess_ledger_lines(param_element, score); + + for (element = param_element; element; element = element->next) { if (element->type == GRE_ELEMENT) { gregorio_glyph *glyph; for (glyph = element->u.first_glyph; glyph; @@ -1700,3 +1806,54 @@ void gregoriotex_compute_positioning(const gregorio_element *element, end_h_episema(&below, NULL, score); } +static __inline void adjust_hepisema(gregorio_note *const note, + const gregorio_sign_orientation orientation, + bool (*const is_shown)(const gregorio_note *), + void (*const adjust_if_better)(gregorio_note *, signed char)) +{ + const unsigned short adjustment_index = + note->he_adjustment_index[orientation]; + + if (adjustment_index && is_shown(note)) { + gregorio_hepisema_adjustment *adj = gregorio_get_hepisema_adjustment( + adjustment_index); + + adjust_if_better(note, adj->pitch_extremum); + } +} + +void gregoriotex_compute_cross_syllable_positioning( + const gregorio_score *const score) +{ + gregorio_syllable *syllable; + for (syllable = score->first_syllable; syllable; + syllable = syllable->next_syllable) { + int voice; + for (voice = 0; voice < score->number_of_voices; ++voice) { + gregorio_element *element; + for (element = syllable->elements[voice]; element; + element = element->next) { + if (element->type == GRE_ELEMENT) { + gregorio_glyph *glyph; + for (glyph = element->u.first_glyph; glyph; + glyph = glyph->next) { + if (glyph->type == GRE_GLYPH) { + gregorio_note *note; + for (note = glyph->u.notes.first_note; note; + note = note->next) { + if (note->type == GRE_NOTE) { + adjust_hepisema(note, SO_OVER, + gtex_is_h_episema_above_shown, + adjust_h_episema_above_if_better); + adjust_hepisema(note, SO_UNDER, + gtex_is_h_episema_below_shown, + adjust_h_episema_below_if_better); + } + } + } + } + } + } + } + } +} diff --git a/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c index 853121708b7..647d1ab8341 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c +++ b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c @@ -96,6 +96,9 @@ SHAPE(OriscusReversusLineTL); SHAPE(OriscusScapus); SHAPE(OriscusScapusLongqueue); SHAPE(OriscusScapusOpenqueue); +SHAPE(OriscusScapusReversus); +SHAPE(OriscusScapusReversusLongqueue); +SHAPE(OriscusScapusReversusOpenqueue); SHAPE(Pes); SHAPE(PesQuadratum); SHAPE(PesQuadratumLongqueue); @@ -108,10 +111,10 @@ SHAPE(PesQuilismaQuadratum); SHAPE(PesQuilismaQuadratumLongqueue); SHAPE(PesQuilismaQuadratumOpenqueue); SHAPE(Porrectus); -SHAPE(PorrectusLongqueue); SHAPE(PorrectusFlexus); SHAPE(PorrectusFlexusLongqueue); SHAPE(PorrectusFlexusNobar); +SHAPE(PorrectusLongqueue); SHAPE(PorrectusNobar); SHAPE(Punctum); SHAPE(PunctumAscendens); @@ -191,7 +194,7 @@ typedef enum queuetype { } queuetype; static queuetype adjusted_queuetype_of(const gregorio_note *const note, - const signed char adjustment) + const gregorio_note *const queue_note, const signed char adjustment) { switch (note->u.note.pitch + adjustment - LOWEST_PITCH) { case 0: @@ -199,11 +202,11 @@ static queuetype adjusted_queuetype_of(const gregorio_note *const note, case 1: return Q_ON_BOTTOM_LINE; case 2: - return note->supposed_low_ledger_line? Q_ON_SPACE_ABOVE_BOTTOM_LINE - : Q_ON_SPACE_BELOW_BOTTOM_LINE; + return queue_note->supposed_low_ledger_line? + Q_ON_SPACE_ABOVE_BOTTOM_LINE : Q_ON_SPACE_BELOW_BOTTOM_LINE; case 3: - return note->supposed_low_ledger_line? Q_ON_LINE_ABOVE_BOTTOM_LINE - : Q_ON_BOTTOM_LINE; + return queue_note->supposed_low_ledger_line? + Q_ON_LINE_ABOVE_BOTTOM_LINE : Q_ON_BOTTOM_LINE; case 5: case 7: case 9: @@ -216,7 +219,7 @@ static queuetype adjusted_queuetype_of(const gregorio_note *const note, } static queuetype queuetype_of(const gregorio_note *const note) { - return adjusted_queuetype_of(note, 0); + return adjusted_queuetype_of(note, note, 0); } static grestyle_style gregoriotex_ignore_style = ST_NO_STYLE; @@ -345,7 +348,8 @@ static const char *compute_glyph_name(const gregorio_glyph *const glyph, switch (previous_note->u.note.shape) { case S_ORISCUS_ASCENDENS: case S_ORISCUS_DESCENDENS: - case S_ORISCUS_SCAPUS: + case S_ORISCUS_SCAPUS_ASCENDENS: + case S_ORISCUS_SCAPUS_DESCENDENS: fuse_head = FUSE_Lower; break; default: @@ -397,6 +401,24 @@ static const char *compute_glyph_name(const gregorio_glyph *const glyph, shape = SHAPE_Oriscus; } + if (*fuse_tail) { + if (is_fused(glyph->u.notes.liquescentia)) { + if (shape == SHAPE_OriscusScapusReversus + || shape == SHAPE_OriscusScapusReversusLongqueue + || shape == SHAPE_OriscusScapusReversusOpenqueue) { + shape = SHAPE_Oriscus; + } + } else { + if (shape == SHAPE_OriscusScapusReversus) { + shape = SHAPE_OriscusScapus; + } else if (shape == SHAPE_OriscusScapusReversusLongqueue) { + shape = SHAPE_OriscusScapusLongqueue; + } else if (shape == SHAPE_OriscusScapusReversusOpenqueue) { + shape = SHAPE_OriscusScapusOpenqueue; + } + } + } + current_note = glyph->u.notes.first_note; if (is_single_note) { if (liquescentia == LIQ_Nothing) { @@ -486,25 +508,34 @@ static const char *fusible_queued_shape(const gregorio_note *const note, const char *const base_shape, const char *const longqueue_shape, const char *const openqueue_shape) { - const char *name = ""; + const char *name = NULL; if (glyph->u.notes.fuse_to_next_glyph < 0) { /* queue size depends on the following note if fused down */ - if (glyph->u.notes.fuse_to_next_glyph == -1) { - switch (adjusted_queuetype_of(note, - glyph->u.notes.fuse_to_next_glyph)) { - case Q_ON_SPACE_BELOW_BOTTOM_LINE: - case Q_ON_BOTTOM_LINE: + bool ambitus_one = (glyph->u.notes.fuse_to_next_glyph == -1); + switch (adjusted_queuetype_of(note, note, + glyph->u.notes.fuse_to_next_glyph)) { + case Q_ON_SPACE_BELOW_BOTTOM_LINE: + if (ambitus_one) { name = openqueue_shape; break; - case Q_ON_SPACE_ABOVE_BOTTOM_LINE: - name = base_shape; - break; - case Q_ON_LINE_ABOVE_BOTTOM_LINE: - name = longqueue_shape; + } + /* else fall through */ + case Q_ON_SPACE_ABOVE_BOTTOM_LINE: + /* at ambitus one, long and short are swapped becuase the queue where + * the second note is on a space is longer than on a line */ + name = ambitus_one? longqueue_shape : base_shape; + break; + case Q_ON_BOTTOM_LINE: + if (ambitus_one) { + name = openqueue_shape; break; } - } else { - name = base_shape; + /* else fall through */ + case Q_ON_LINE_ABOVE_BOTTOM_LINE: + /* at ambitus one, long and short are swapped becuase the queue where + * the second note is on a line is shorter than on a space */ + name = ambitus_one? base_shape : longqueue_shape; + break; } } else { switch (queuetype_of(note)) { @@ -518,6 +549,7 @@ static const char *fusible_queued_shape(const gregorio_note *const note, break; } } + gregorio_not_null(name, fusible_queued_shape, return base_shape); return compute_glyph_name(glyph, name, LG_NONE, true); } @@ -613,9 +645,13 @@ static const char *gregoriotex_determine_note_glyph_name(gregorio_note *note, case S_QUILISMA: *type = AT_QUILISMA; return compute_glyph_name(glyph, SHAPE_Quilisma, LG_NONE, true); - case S_ORISCUS_SCAPUS: + case S_ORISCUS_SCAPUS_ASCENDENS: return fusible_queued_shape(note, glyph, SHAPE_OriscusScapus, SHAPE_OriscusScapusLongqueue, SHAPE_OriscusScapusOpenqueue); + case S_ORISCUS_SCAPUS_DESCENDENS: + return fusible_queued_shape(note, glyph, SHAPE_OriscusScapusReversus, + SHAPE_OriscusScapusReversusLongqueue, + SHAPE_OriscusScapusReversusOpenqueue); case S_STROPHA: *type = AT_STROPHA; if (!(note->u.note.liquescentia & @@ -729,7 +765,8 @@ static __inline const char *flexus_shape(const gregorio_glyph *const glyph, const signed char ambitus, const char *base_shape, const char *longqueue_shape, const char *openqueue_shape) { const bool ambitus_one = (ambitus == 1); - switch (queuetype_of(second_note_of(glyph))) { + switch (adjusted_queuetype_of(second_note_of(glyph), first_note_of(glyph), + 0)) { case Q_ON_SPACE_BELOW_BOTTOM_LINE: if (ambitus_one) { return openqueue_shape; @@ -762,7 +799,8 @@ static __inline const char *quadratum_shape(const gregorio_glyph *const glyph, const bool ambitus_one = (second_pitch_of(glyph) - first_pitch_of(glyph) == 1); if (!is_tail_liquescentia(glyph->u.notes.liquescentia)) { - switch (queuetype_of(first_note_of(glyph))) { + switch (adjusted_queuetype_of(first_note_of(glyph), + second_note_of(glyph), 0)) { case Q_ON_SPACE_BELOW_BOTTOM_LINE: if (ambitus_one) { return openqueue_shape; @@ -826,7 +864,8 @@ const char *gregoriotex_determine_glyph_name(const gregorio_glyph *const glyph, break; case S_ORISCUS_ASCENDENS: case S_ORISCUS_DESCENDENS: - case S_ORISCUS_SCAPUS: + case S_ORISCUS_SCAPUS_ASCENDENS: + case S_ORISCUS_SCAPUS_DESCENDENS: *type = AT_ORISCUS; *gtype = T_PESQUASSUS; shape = quadratum_shape(glyph, SHAPE_PesQuassus, @@ -891,7 +930,8 @@ const char *gregoriotex_determine_glyph_name(const gregorio_glyph *const glyph, ltype = LG_NO_INITIO; break; - case S_ORISCUS_SCAPUS: + case S_ORISCUS_SCAPUS_ASCENDENS: + case S_ORISCUS_SCAPUS_DESCENDENS: *gtype = T_FLEXUS_ORISCUS_SCAPUS; shape = flexus_shape(glyph, ambitus, SHAPE_FlexusOriscusScapus, SHAPE_FlexusOriscusScapusLongqueue, @@ -1971,16 +2011,19 @@ static __inline int get_punctum_inclinatum_to_nobar_space_case( } static __inline void write_single_hepisema(FILE *const f, int hepisema_case, - const gregorio_note *const note, bool connect, char height, - const grehepisema_size size, const int i, + const gregorio_note *const note, gregorio_sign_orientation orientation, + bool connect, char height, const grehepisema_size size, const int i, const gregorio_glyph *const glyph, const int porrectus_long_episema_index, bool (*const is_episema_shown)(const gregorio_note *)) { - char ambitus = 0; - char size_arg; - if (height) { + const gregorio_hepisema_adjustment *adj = + gregorio_get_hepisema_adjustment( + note->he_adjustment_index[orientation]); + char ambitus = 0; + char size_arg; + switch (size) { case H_SMALL_LEFT: size_arg = 'l'; @@ -2014,11 +2057,13 @@ static __inline void write_single_hepisema(FILE *const f, int hepisema_case, != SP_ZERO_WIDTH)) { /* not followed by a zero-width space */ /* try to fuse from punctum inclinatum to nobar glyph */ - fprintf(f, "\\GreHEpisemaBridge{%d}{%d}{%d}{%s%s}%%\n", + fprintf(f, + "\\GreHEpisemaBridge{%d}{%d}{%d}{%s%s}{%s}{%d}%%\n", pitch_value(height), hepisema_case, get_punctum_inclinatum_to_nobar_space_case(glyph), suppose_high_ledger_line(note), - suppose_low_ledger_line(note)); + suppose_low_ledger_line(note), + adj->nudge? adj->nudge : "", adj->vbasepos); } else if (note->next && (note->next->u.note.shape == S_PUNCTUM_INCLINATUM || note->next->u.note.shape @@ -2026,18 +2071,20 @@ static __inline void write_single_hepisema(FILE *const f, int hepisema_case, || note->next->u.note.shape == S_PUNCTUM_INCLINATUM_AUCTUS)) { /* is a punctum inclinatum of some sort */ - fprintf(f, "\\GreHEpisemaBridge{%d}{%d}{%d}{%s%s}%%\n", + fprintf(f, "\\GreHEpisemaBridge{%d}{%d}{%d}{%s%s}{%s}{%d}%%\n", pitch_value(height), hepisema_case, get_punctum_inclinatum_space_case(note->next), suppose_high_ledger_line(note), - suppose_low_ledger_line(note)); + suppose_low_ledger_line(note), + adj->nudge? adj->nudge : "", adj->vbasepos); } } fprintf(f, "\\GreHEpisema{%d}{\\GreOCase%s}{%d}{%d}{%c}{%d}" - "{%s%s}%%\n", pitch_value(height), note->gtex_offset_case, - ambitus, hepisema_case, size_arg, pitch_value(height), - suppose_high_ledger_line(note), - suppose_low_ledger_line(note)); + "{%s%s}{%s}{%d}%%\n", pitch_value(height), + note->gtex_offset_case, ambitus, hepisema_case, size_arg, + pitch_value(height), suppose_high_ledger_line(note), + suppose_low_ledger_line(note), adj->nudge? adj->nudge : "", + adj->vbasepos); } } } @@ -2069,10 +2116,10 @@ static void gregoriotex_write_hepisema(FILE *const f, break; } - write_single_hepisema(f, 1, note, note->h_episema_below_connect, + write_single_hepisema(f, 1, note, SO_UNDER, note->h_episema_below_connect, note->h_episema_below, note->h_episema_below_size, i, glyph, porrectus_long_episema_index, >ex_is_h_episema_below_shown); - write_single_hepisema(f, 0, note, note->h_episema_above_connect, + write_single_hepisema(f, 0, note, SO_OVER, note->h_episema_above_connect, note->h_episema_above, note->h_episema_above_size, i, glyph, porrectus_long_episema_index, >ex_is_h_episema_above_shown); } @@ -2231,34 +2278,19 @@ static void gregoriotex_write_note(FILE *f, gregorio_note *note, if (note->u.note.shape == S_PUNCTUM) { switch (note->u.note.liquescentia) { case L_AUCTUS_ASCENDENS: - /* not reachable unless there's a programming error */ - /* LCOV_EXCL_START */ - gregorio_fail(gregoriotex_write_note, - "encounted S_PUNCTUM with L_AUCTUS_ASCENDENS"); - /* should have been changed by this point */ note->u.note.shape = S_PUNCTUM_AUCTUS_ASCENDENS; break; - /* LCOV_EXCL_STOP */ case L_AUCTUS_DESCENDENS: - /* not reachable unless there's a programming error */ - /* LCOV_EXCL_START */ - gregorio_fail(gregoriotex_write_note, - "encounted S_PUNCTUM with L_AUCTUS_DESCENDENS"); - /* should have been changed by this point */ note->u.note.shape = S_PUNCTUM_AUCTUS_DESCENDENS; break; - /* LCOV_EXCL_STOP */ case L_INITIO_DEBILIS: if (glyph->u.notes.fuse_to_next_glyph > 0) { break; } /* else fall through to next case */ case L_DEMINUTUS: - /* not reachable unless there's a programming error */ + /* this is a currenly unused, but we keep it as a fallback case */ /* LCOV_EXCL_START */ - gregorio_fail(gregoriotex_write_note, - "encounted S_PUNCTUM with L_DEMINUTUS"); - /* should have been changed by this point */ note->u.note.shape = S_PUNCTUM_DEMINUTUS; break; /* LCOV_EXCL_STOP */ @@ -2435,7 +2467,13 @@ static int gregoriotex_syllable_first_type(gregorio_syllable *syllable) } } } - return 0; + if (syllable->elements[0]) { + /* if there is anything else in the next syllable */ + return 0; + } + /* the only thing that should reach this point is an empty next syllable + * we treat that kind of syllable as a bar */ + return 13; } static __inline void write_low_choral_sign(FILE *const f, @@ -2762,16 +2800,30 @@ static void write_glyph(FILE *f, gregorio_syllable *syllable, /* TODO: handle fusion to next note */ break; case G_SCANDICUS: - gregorio_assert((glyph->u.notes.liquescentia & L_DEMINUTUS) + if ((glyph->u.notes.liquescentia & L_DEMINUTUS) || glyph->u.notes.liquescentia == L_NO_LIQUESCENTIA - || glyph->u.notes.liquescentia == L_FUSED, write_glyph, - "encountered an invalid scandicus", break); - shape = gregoriotex_determine_glyph_name(glyph, &type, >ype); - fprintf(f, "\\GreGlyph{\\GreCP%s}{%d}{%d}{%d}", shape, - pitch_value(glyph->u.notes.first_note->u.note.pitch), - pitch_value(next_note_pitch), type); - gregoriotex_write_signs(f, gtype, glyph, glyph->u.notes.first_note, - fuse_to_next_note, status, score); + || glyph->u.notes.liquescentia == L_FUSED) { + shape = gregoriotex_determine_glyph_name(glyph, &type, >ype); + fprintf(f, "\\GreGlyph{\\GreCP%s}{%d}{%d}{%d}", shape, + pitch_value(glyph->u.notes.first_note->u.note.pitch), + pitch_value(next_note_pitch), type); + gregoriotex_write_signs(f, gtype, glyph, glyph->u.notes.first_note, + fuse_to_next_note, status, score); + } else { + while (current_note) { + if (current_note->next) { + gregoriotex_write_note(f, current_note, glyph, + current_note->next->u.note.pitch); + } else { + gregoriotex_write_note(f, current_note, glyph, + next_note_pitch); + } + gregoriotex_write_signs(f, T_ONE_NOTE, glyph, current_note, + current_note->next ? 0 : fuse_to_next_note, status, + score); + current_note = current_note->next; + } + } break; case G_ANCUS: gregorio_assert(glyph->u.notes.liquescentia & L_DEMINUTUS, @@ -2835,7 +2887,8 @@ static void write_glyph(FILE *f, gregorio_syllable *syllable, case S_ORISCUS_CAVUM_ASCENDENS: case S_ORISCUS_CAVUM_DESCENDENS: case S_ORISCUS_CAVUM_DEMINUTUS: - case S_ORISCUS_SCAPUS: + case S_ORISCUS_SCAPUS_ASCENDENS: + case S_ORISCUS_SCAPUS_DESCENDENS: /* don't change the oriscus */ break; @@ -3390,7 +3443,7 @@ static void write_syllable(FILE *f, gregorio_syllable *syllable, } else { write_fixed_text_styles(f, syllable->text, syllable->next_syllable? syllable->next_syllable->text : NULL); - syllable_type = "\\GreSyllable"; + syllable_type = "\\GreBarSyllable"; } write_this_syllable_text(f, syllable_type, syllable->text, end_of_word); fprintf(f, "{}{\\Gre%s}", syllable->first_word ? "FirstWord" : "Unstyled"); @@ -3622,6 +3675,18 @@ static void initialize_score(gregoriotex_status *const status, status->top_height = status->bottom_height = UNDETERMINED_HEIGHT; status->abovelinestext = status->translation = false; + /* first pass to compute positioning */ + for (syllable = score->first_syllable; syllable; + syllable = syllable->next_syllable) { + int voice; + + for (voice = 0; voice < score->number_of_voices; ++voice) { + gregoriotex_compute_positioning(syllable->elements[voice], score); + } + } + + gregoriotex_compute_cross_syllable_positioning(score); + for (syllable = score->first_syllable; syllable; syllable = syllable->next_syllable) { int voice; @@ -3637,7 +3702,6 @@ static void initialize_score(gregoriotex_status *const status, for (voice = 0; voice < score->number_of_voices; ++voice) { gregorio_element *element; - gregoriotex_compute_positioning(syllable->elements[voice], score); for (element = syllable->elements[voice]; element; element = element->next) { gregorio_glyph *glyph; diff --git a/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex.h b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex.h index 129667ed34e..65c2caaeb6c 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex.h +++ b/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex.h @@ -145,5 +145,7 @@ const char *gregoriotex_determine_glyph_name(const gregorio_glyph *const glyph, gtex_alignment *const type, gtex_type *const gtype); void gregoriotex_compute_positioning(const gregorio_element *element, const gregorio_score *score); +void gregoriotex_compute_cross_syllable_positioning( + const gregorio_score *score); #endif diff --git a/Build/source/texk/gregorio/gregorio-src/src/messages.h b/Build/source/texk/gregorio/gregorio-src/src/messages.h index 9ebc6e39b80..7b0282946b8 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/messages.h +++ b/Build/source/texk/gregorio/gregorio-src/src/messages.h @@ -29,12 +29,12 @@ #if ENABLE_NLS == 1 #include "gettext.h" #define _(str) gettext(str) -#define N_(str) str +#define N_(str) (str) #define ngt_(str, strtwo, count) ngettext(str, strtwo, count) #else -#define _(str) str -#define N_(str) str -#define ngt_(str, strtwo, count) str +#define _(str) (str) +#define N_(str) (str) +#define ngt_(str, strtwo, count) (str) #endif typedef enum gregorio_verbosity { diff --git a/Build/source/texk/gregorio/gregorio-src/src/struct.c b/Build/source/texk/gregorio/gregorio-src/src/struct.c index b1826f66df1..cd260b4886c 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/struct.c +++ b/Build/source/texk/gregorio/gregorio-src/src/struct.c @@ -44,6 +44,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <limits.h> #include <assert.h> #include "struct.h" #include "unicode.h" @@ -61,6 +62,32 @@ gregorio_clef_info gregorio_default_clef = { /*.secondary_flatted =*/ false, }; +static size_t hepisema_adjustments_capacity; +static unsigned short hepisema_adjustments_last; +static gregorio_hepisema_adjustment *hepisema_adjustments; + +void gregorio_struct_init(void) +{ + hepisema_adjustments_capacity = 8; + hepisema_adjustments = gregorio_grow_buffer(NULL, + &hepisema_adjustments_capacity, gregorio_hepisema_adjustment); + hepisema_adjustments[0].vbasepos = HVB_AUTO; + hepisema_adjustments[0].nudge = NULL; +} + +void gregorio_struct_destroy(void) +{ + size_t i; + gregorio_hepisema_adjustment *adj; + for (i = 0, adj = hepisema_adjustments; i <= hepisema_adjustments_last; + ++i, ++adj) { + if (adj->nudge) { + free(adj->nudge); + } + } + free(hepisema_adjustments); +} + static gregorio_note *create_and_link_note(gregorio_note **current_note, const gregorio_scanner_location *const loc) { @@ -127,6 +154,10 @@ void gregorio_add_note(gregorio_note **current_note, signed char pitch, set_h_episema_below(element, prototype->h_episema_below, prototype->h_episema_below_size, prototype->h_episema_below_connect); + element->he_adjustment_index[SO_OVER] = + prototype->he_adjustment_index[SO_OVER]; + element->he_adjustment_index[SO_UNDER] = + prototype->he_adjustment_index[SO_UNDER]; } element->texverb = NULL; element->choral_sign = NULL; @@ -326,20 +357,32 @@ static void fix_oriscus_liquescentia(gregorio_note *const note, break; } } else { + note->u.note.liquescentia &= ((~TAIL_LIQUESCENTIA_MASK) | L_DEMINUTUS); + if (note->u.note.liquescentia & L_DEMINUTUS) { + note->u.note.shape = S_ORISCUS_DEMINUTUS; + } + } +} + +static void fix_oriscus_scapus_liquescentia(gregorio_note *const note, + const bool legacy_oriscus_orientation) +{ + if (legacy_oriscus_orientation) { switch (note->u.note.liquescentia) { case L_AUCTUS_ASCENDENS: - note->u.note.shape = S_ORISCUS_ASCENDENS; - break; + note->u.note.liquescentia = + (note->u.note.liquescentia & ~TAIL_LIQUESCENTIA_MASK) + | L_AUCTUS_DESCENDENS; + /* fall through */ case L_AUCTUS_DESCENDENS: - note->u.note.shape = S_ORISCUS_DESCENDENS; - break; - case L_DEMINUTUS: - note->u.note.shape = S_ORISCUS_DEMINUTUS; + note->u.note.shape = S_ORISCUS_SCAPUS_DESCENDENS; break; default: - note->u.note.shape = S_ORISCUS_UNDETERMINED; + note->u.note.shape = S_ORISCUS_SCAPUS_ASCENDENS; break; } + } else { + note->u.note.liquescentia &= ~TAIL_LIQUESCENTIA_MASK; } } @@ -364,19 +407,9 @@ static void fix_oriscus_cavum_liquescentia(gregorio_note *const note, break; } } else { - switch (note->u.note.liquescentia) { - case L_AUCTUS_ASCENDENS: - note->u.note.shape = S_ORISCUS_CAVUM_ASCENDENS; - break; - case L_AUCTUS_DESCENDENS: - note->u.note.shape = S_ORISCUS_CAVUM_DESCENDENS; - break; - case L_DEMINUTUS: + note->u.note.liquescentia &= ((~TAIL_LIQUESCENTIA_MASK) | L_DEMINUTUS); + if (note->u.note.liquescentia & L_DEMINUTUS) { note->u.note.shape = S_ORISCUS_CAVUM_DEMINUTUS; - break; - default: - note->u.note.shape = S_ORISCUS_CAVUM_UNDETERMINED; - break; } } } @@ -403,13 +436,24 @@ void gregorio_change_shape(gregorio_note *const note, break; case S_ORISCUS_UNDETERMINED: - case S_ORISCUS_ASCENDENS: - case S_ORISCUS_DESCENDENS: case S_ORISCUS_DEMINUTUS: + case S_ORISCUS_SCAPUS_UNDETERMINED: note->u.note.shape = S_ORISCUS_CAVUM_UNDETERMINED; fix_oriscus_cavum_liquescentia(note, legacy_oriscus_orientation); break; + case S_ORISCUS_ASCENDENS: + case S_ORISCUS_SCAPUS_ASCENDENS: + note->u.note.shape = S_ORISCUS_CAVUM_ASCENDENS; + fix_oriscus_cavum_liquescentia(note, legacy_oriscus_orientation); + break; + + case S_ORISCUS_DESCENDENS: + case S_ORISCUS_SCAPUS_DESCENDENS: + note->u.note.shape = S_ORISCUS_CAVUM_DESCENDENS; + fix_oriscus_cavum_liquescentia(note, legacy_oriscus_orientation); + break; + default: break; } @@ -425,11 +469,51 @@ void gregorio_change_shape(gregorio_note *const note, switch (old_shape) { case S_PUNCTUM_CAVUM: case S_PUNCTUM_CAVUM_INCLINATUM: + note->u.note.shape = S_ORISCUS_CAVUM_UNDETERMINED; + fix_oriscus_cavum_liquescentia(note, legacy_oriscus_orientation); + break; + + case S_ORISCUS_CAVUM_UNDETERMINED: + case S_ORISCUS_CAVUM_ASCENDENS: + case S_ORISCUS_CAVUM_DESCENDENS: + case S_ORISCUS_CAVUM_DEMINUTUS: + note->u.note.shape = old_shape; + fix_oriscus_cavum_liquescentia(note, legacy_oriscus_orientation); + break; + + default: + fix_oriscus_liquescentia(note, legacy_oriscus_orientation); + break; + } + break; + + case S_ORISCUS_ASCENDENS: + switch (old_shape) { + case S_PUNCTUM_CAVUM: + case S_PUNCTUM_CAVUM_INCLINATUM: case S_ORISCUS_CAVUM_UNDETERMINED: case S_ORISCUS_CAVUM_ASCENDENS: case S_ORISCUS_CAVUM_DESCENDENS: case S_ORISCUS_CAVUM_DEMINUTUS: - note->u.note.shape = S_ORISCUS_CAVUM_UNDETERMINED; + note->u.note.shape = S_ORISCUS_CAVUM_ASCENDENS; + fix_oriscus_cavum_liquescentia(note, legacy_oriscus_orientation); + break; + + default: + fix_oriscus_liquescentia(note, legacy_oriscus_orientation); + break; + } + break; + + case S_ORISCUS_DESCENDENS: + switch (old_shape) { + case S_PUNCTUM_CAVUM: + case S_PUNCTUM_CAVUM_INCLINATUM: + case S_ORISCUS_CAVUM_UNDETERMINED: + case S_ORISCUS_CAVUM_ASCENDENS: + case S_ORISCUS_CAVUM_DESCENDENS: + case S_ORISCUS_CAVUM_DEMINUTUS: + note->u.note.shape = S_ORISCUS_CAVUM_DESCENDENS; fix_oriscus_cavum_liquescentia(note, legacy_oriscus_orientation); break; @@ -439,6 +523,12 @@ void gregorio_change_shape(gregorio_note *const note, } break; + case S_ORISCUS_SCAPUS_UNDETERMINED: + case S_ORISCUS_SCAPUS_ASCENDENS: + case S_ORISCUS_SCAPUS_DESCENDENS: + fix_oriscus_scapus_liquescentia(note, legacy_oriscus_orientation); + break; + default: break; } @@ -458,6 +548,10 @@ void gregorio_add_tail_liquescentia(gregorio_note *note, | (liq & TAIL_LIQUESCENTIA_MASK); switch (note->u.note.shape) { + case S_PUNCTUM_CAVUM_INCLINATUM: + fix_punctum_cavum_inclinatum_liquescentia(note); + break; + case S_STROPHA: case S_DISTROPHA: case S_TRISTROPHA: @@ -475,8 +569,10 @@ void gregorio_add_tail_liquescentia(gregorio_note *note, fix_oriscus_liquescentia(note, legacy_oriscus_orientation); break; - case S_PUNCTUM_CAVUM_INCLINATUM: - fix_punctum_cavum_inclinatum_liquescentia(note); + case S_ORISCUS_SCAPUS_UNDETERMINED: + case S_ORISCUS_SCAPUS_ASCENDENS: + case S_ORISCUS_SCAPUS_DESCENDENS: + fix_oriscus_scapus_liquescentia(note, legacy_oriscus_orientation); break; case S_ORISCUS_CAVUM_UNDETERMINED: @@ -1441,6 +1537,37 @@ gregorio_element *gregorio_get_clef_change(gregorio_syllable *syllable) return NULL; } +unsigned short gregorio_add_hepisema_adjustment( + const gregorio_hepisema_vbasepos vbasepos, char *const nudge) +{ + if (hepisema_adjustments_last == USHRT_MAX) { + /* It's not reasonable to trigger this condition while testing */ + /* LCOV_EXCL_START */ + gregorio_message(_("too many horizontal episema adjustments"), + "gregorio_add_hepisema_adjustment", VERBOSITY_ERROR, 0); + return 0; + /* LCOV_EXCL_STOP */ + } + ++hepisema_adjustments_last; + if (hepisema_adjustments_last >= hepisema_adjustments_capacity) { + hepisema_adjustments = gregorio_grow_buffer(hepisema_adjustments, + &hepisema_adjustments_capacity, gregorio_hepisema_adjustment); + } + hepisema_adjustments[hepisema_adjustments_last].vbasepos = vbasepos; + hepisema_adjustments[hepisema_adjustments_last].nudge = nudge; + hepisema_adjustments[hepisema_adjustments_last].pitch_extremum = NO_PITCH; + return hepisema_adjustments_last; +} + +gregorio_hepisema_adjustment *gregorio_get_hepisema_adjustment( + const unsigned short index) +{ + gregorio_assert(index <= hepisema_adjustments_last, + gregorio_get_hepisema_adjustment, "array index out of bounds", + return &hepisema_adjustments[0]); + return &hepisema_adjustments[index]; +} + ENUM_TO_STRING(gregorio_type, GREGORIO_TYPE) ENUM_TO_STRING(gregorio_shape, GREGORIO_SHAPE) ENUM_TO_STRING(gregorio_bar, GREGORIO_BAR) @@ -1451,8 +1578,8 @@ ENUM_TO_STRING(grehepisema_size, GREHEPISEMA_SIZE) ENUM_TO_STRING(gregorio_vposition, GREGORIO_VPOSITION) ENUM_TO_STRING(gregorio_glyph_type, GREGORIO_GLYPH_TYPE) ENUM_TO_STRING(grestyle_style, GRESTYLE_STYLE) -/* ENUM_TO_STRING(grestyle_type, GRESTYLE_TYPE) */ ENUM_TO_STRING(gregorio_tr_centering, GREGORIO_TR_CENTERING) ENUM_TO_STRING(gregorio_nlba, GREGORIO_NLBA) ENUM_TO_STRING(gregorio_euouae, GREGORIO_EUOUAE) ENUM_TO_STRING(gregorio_word_position, GREGORIO_WORD_POSITION) +ENUM_TO_STRING(gregorio_hepisema_vbasepos, GREGORIO_HEPISEMA_VBASEPOS) diff --git a/Build/source/texk/gregorio/gregorio-src/src/struct.h b/Build/source/texk/gregorio/gregorio-src/src/struct.h index 108ecefc243..636c0082022 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/struct.h +++ b/Build/source/texk/gregorio/gregorio-src/src/struct.h @@ -108,7 +108,8 @@ ENUM(gregorio_clef, GREGORIO_CLEF); E(S_ORISCUS_ASCENDENS) \ E(S_ORISCUS_DESCENDENS) \ E(S_ORISCUS_DEMINUTUS) \ - E(S_ORISCUS_SCAPUS) \ + E(S_ORISCUS_SCAPUS_ASCENDENS) \ + E(S_ORISCUS_SCAPUS_DESCENDENS) \ E(S_QUILISMA) \ E(S_STROPHA) \ E(S_STROPHA_AUCTA) \ @@ -130,6 +131,7 @@ ENUM(gregorio_clef, GREGORIO_CLEF); * and quilisma quadratum is the shape of the first note of a pes * quislisma quadratum */ \ E(S_ORISCUS_UNDETERMINED) \ + E(S_ORISCUS_SCAPUS_UNDETERMINED) \ E(S_ORISCUS_CAVUM_UNDETERMINED) \ E(S_QUADRATUM) \ /* those shapes are for now used only in gregoriotex */ \ @@ -362,6 +364,21 @@ ENUM(gregorio_euouae, GREGORIO_EUOUAE); L(WORD_ONE_SYLLABLE) ENUM(gregorio_word_position, GREGORIO_WORD_POSITION); +#define GREGORIO_SIGN_ORIENTATION(A,E,X,L) \ + A(SO_OVER, 0) \ + X(SO_UNDER, 1) +ENUM(gregorio_sign_orientation, GREGORIO_SIGN_ORIENTATION); + +/* the numeric values will be directly passed to TeX */ +#define GREGORIO_HEPISEMA_VBASEPOS(A,E,X,L) \ + A(HVB_AUTO, 0) \ + A(HVB_MIDDLE, 1) \ + A(HVB_O_LOW, 2) \ + A(HVB_O_HIGH, 3) \ + A(HVB_U_LOW, 4) \ + X(HVB_U_HIGH, 5) +ENUM(gregorio_hepisema_vbasepos, GREGORIO_HEPISEMA_VBASEPOS); + typedef struct gregorio_extra_info { char *ad_hoc_space_factor; ENUM_BITFIELD(gregorio_bar) bar:4; @@ -438,6 +455,7 @@ typedef struct gregorio_note { /* these go to the end for structure alignment */ unsigned short src_line, src_column, src_offset; + unsigned short he_adjustment_index[2]; /* we have seen that notes are always real notes, that is to say * GRE_NOTE. the type is always that in the final structure. But there @@ -704,6 +722,12 @@ typedef struct gregorio_voice_info { struct gregorio_voice_info *next_voice_info; } gregorio_voice_info; +typedef struct gregorio_hepisema_adjustment { + gregorio_hepisema_vbasepos vbasepos; + char *nudge; + signed char pitch_extremum; +} gregorio_hepisema_adjustment; + /* the maximum number of voices, more than this is total nonsense in * gregorian chant. */ #define MAX_NUMBER_OF_VOICES 10 @@ -755,9 +779,13 @@ static __inline bool is_fused(char liquescentia) #define DUMMY_PITCH (LOWEST_PITCH + 6) #define LOW_LEDGER_LINE_PITCH (LOWEST_PITCH + 1) +#define NO_PITCH -128 + /* defines the maximal interval between two notes of the same glyph */ #define MAX_AMBITUS 5 +void gregorio_struct_init(void); +void gregorio_struct_destroy(void); gregorio_score *gregorio_new_score(void); void gregorio_add_note(gregorio_note **current_note, signed char pitch, gregorio_shape shape, gregorio_sign signs, @@ -855,6 +883,10 @@ signed char gregorio_determine_next_pitch(gregorio_syllable *syllable, gregorio_element *element, gregorio_glyph *glyph); const char *gregorio_unknown(int value); gregorio_element *gregorio_get_clef_change(gregorio_syllable *syllable); +unsigned short gregorio_add_hepisema_adjustment( + gregorio_hepisema_vbasepos vbasepos, char *nudge); +gregorio_hepisema_adjustment *gregorio_get_hepisema_adjustment( + unsigned short index); static __inline void gregorio_go_to_first_character_c(gregorio_character **character) { diff --git a/Build/source/texk/gregorio/gregorio-src/src/support.c b/Build/source/texk/gregorio/gregorio-src/src/support.c index d96d772808a..39451726189 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/support.c +++ b/Build/source/texk/gregorio/gregorio-src/src/support.c @@ -28,6 +28,7 @@ #include <ctype.h> #include <errno.h> #include "support.h" +#include "struct.h" #include "messages.h" /* Our version of snprintf; this is NOT semantically the same as C99's @@ -82,6 +83,23 @@ char *gregorio_strdup(const char *s) return (char *)assert_successful_allocation(strdup(s), "gregorio_strdup"); } +void *_gregorio_grow_buffer(void *buffer, size_t *nmemb, size_t size) +{ + if (buffer == NULL) { + return gregorio_malloc(*nmemb * size); + } + if (*nmemb >= MAX_BUF_GROWTH) { + /* it's not realistic to test this case */ + /* LCOV_EXCL_START */ + gregorio_message(_("buffer too large"), "gregorio_grow_buffer", + VERBOSITY_FATAL, 0); + gregorio_exit(1); + /* LCOV_EXCL_STOP */ + } + *nmemb <<= 1; + return gregorio_realloc(buffer, *nmemb * size); +} + #ifdef USE_KPSE static kpathsea kpse = NULL; #define USED_FOR_KPSE @@ -94,6 +112,7 @@ void gregorio_support_init(const char *const program USED_FOR_KPSE, { gregorio_set_error_out(stderr); gregorio_set_verbosity_mode(VERBOSITY_ERROR); + gregorio_struct_init(); #ifdef USE_KPSE kpse = kpathsea_new(); kpathsea_set_program_name(kpse, argv0, program); @@ -152,7 +171,7 @@ static bool gregorio_readline(char **buf, size_t *bufsize, FILE *file) size_t oldsize; if (*buf == NULL) { *bufsize = 128; - *buf = (char *)gregorio_malloc(*bufsize); + *buf = gregorio_grow_buffer(NULL, bufsize, char); } else { if (*bufsize < 128) { /* not reachable unless there's a programming error */ @@ -184,18 +203,8 @@ static bool gregorio_readline(char **buf, size_t *bufsize, FILE *file) return (*buf)[0] != '\0'; } - if (*bufsize >= MAX_BUF_GROWTH) { - /* it's not realistic to test this case */ - /* LCOV_EXCL_START */ - gregorio_message(_("Line too long"), "gregorio_getline", - VERBOSITY_FATAL, 0); - gregorio_exit(1); - /* LCOV_EXCL_STOP */ - } - oldsize = *bufsize; - *bufsize <<= 1; - *buf = gregorio_realloc(*buf, *bufsize); + *buf = gregorio_grow_buffer(*buf, bufsize, char); } } #endif @@ -268,5 +277,6 @@ void gregorio_exit(int status) kpathsea_finish(kpse); } #endif + gregorio_struct_destroy(); exit(status); } /* the prior line exits; LCOV_EXCL_LINE */ diff --git a/Build/source/texk/gregorio/gregorio-src/src/support.h b/Build/source/texk/gregorio/gregorio-src/src/support.h index 9b355504076..a4b6738b2ee 100644 --- a/Build/source/texk/gregorio/gregorio-src/src/support.h +++ b/Build/source/texk/gregorio/gregorio-src/src/support.h @@ -40,13 +40,19 @@ void gregorio_snprintf(char *s, size_t size, const char *format, ...) __attribute__((__format__ (__printf__, 3, 4))); void *gregorio_malloc(size_t size) __attribute__((malloc)); void *gregorio_calloc(size_t nmemb, size_t size) __attribute__((malloc)); -void *gregorio_realloc(void *ptr, size_t size) __attribute__((warn_unused_result)); +void *gregorio_realloc(void *ptr, size_t size) + __attribute__((warn_unused_result)); char *gregorio_strdup(const char *s) __attribute__((malloc)); +void *_gregorio_grow_buffer(void *buffer, size_t *nmemb, size_t size) + __attribute__((warn_unused_result)); void gregorio_support_init(const char *program, const char *argv0); void gregorio_print_version(const char *copyright); char **gregorio_kpse_find(const char *filename); void gregorio_exit(int status) __attribute__((noreturn)); +#define gregorio_grow_buffer(BUFFER, NMEMB, TYPE) \ + ((TYPE *)_gregorio_grow_buffer(BUFFER, NMEMB, sizeof(TYPE))) + #ifdef USE_KPSE bool gregorio_read_ok(const char *filename, gregorio_verbosity verbosity); bool gregorio_write_ok(const char *filename, gregorio_verbosity verbosity); diff --git a/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc b/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc index 85327e248d5..fcb9ce7118f 100644 --- a/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc +++ b/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc @@ -1,7 +1,7 @@ IDI_ICON1 ICON DISCARDABLE "gregorio.ico" 1 VERSIONINFO -FILEVERSION 4,1,0,13 -PRODUCTVERSION 4,1,0,13 +FILEVERSION 4,1,0,21 +PRODUCTVERSION 4,1,0,21 BEGIN BLOCK "StringFileInfo" BEGIN @@ -9,12 +9,12 @@ BEGIN BEGIN VALUE "CompanyName", "Gregorio project" VALUE "FileDescription", "Gregorio" - VALUE "FileVersion", "4.1.0-beta3" + VALUE "FileVersion", "4.1.0-rc1" VALUE "InternalName", "gregorio" VALUE "LegalCopyright", "See COPYING in the installation directory." VALUE "OriginalFilename", "gregorio.exe" VALUE "ProductName", "Gregorio" - VALUE "ProductVersion", "4.1.0-beta3" + VALUE "ProductVersion", "4.1.0-rc1" END END diff --git a/Build/source/texk/gregorio/version.ac b/Build/source/texk/gregorio/version.ac index 290cc4fa987..2affd2b70b8 100644 --- a/Build/source/texk/gregorio/version.ac +++ b/Build/source/texk/gregorio/version.ac @@ -8,4 +8,4 @@ dnl dnl -------------------------------------------------------- dnl dnl m4-include this file to define the current gregorio version -m4_define([gregorio_version], [4.1.0-beta3]) +m4_define([gregorio_version], [4.1.0-rc1]) |