texlive[50335] Build/source/texk: gregorio-5.2.0
commits+kakuto at tug.org
commits+kakuto at tug.org
Mon Mar 11 03:46:28 CET 2019
Revision: 50335
http://tug.org/svn/texlive?view=revision&revision=50335
Author: kakuto
Date: 2019-03-11 03:46:28 +0100 (Mon, 11 Mar 2019)
Log Message:
-----------
gregorio-5.2.0
Modified Paths:
--------------
trunk/Build/source/texk/README
trunk/Build/source/texk/gregorio/ChangeLog
trunk/Build/source/texk/gregorio/TLpatches/ChangeLog
trunk/Build/source/texk/gregorio/TLpatches/TL-Changes
trunk/Build/source/texk/gregorio/configure
trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
trunk/Build/source/texk/gregorio/gregorio-src/COPYING.md
trunk/Build/source/texk/gregorio/gregorio-src/Makefile.am
trunk/Build/source/texk/gregorio/gregorio-src/UPGRADE.md
trunk/Build/source/texk/gregorio/gregorio-src/VersionManager.py
trunk/Build/source/texk/gregorio/gregorio-src/configure.ac
trunk/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml
trunk/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am
trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am
trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command
trunk/Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py
trunk/Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang
trunk/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
trunk/Build/source/texk/gregorio/gregorio-src/contrib/gprocess
trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
trunk/Build/source/texk/gregorio/gregorio-src/install-gtex.sh
trunk/Build/source/texk/gregorio/gregorio-src/install.sh
trunk/Build/source/texk/gregorio/gregorio-src/src/Makefile.am
trunk/Build/source/texk/gregorio/gregorio-src/src/bool.h
trunk/Build/source/texk/gregorio/gregorio-src/src/characters.c
trunk/Build/source/texk/gregorio/gregorio-src/src/characters.h
trunk/Build/source/texk/gregorio/gregorio-src/src/config.h
trunk/Build/source/texk/gregorio/gregorio-src/src/dump/dump.c
trunk/Build/source/texk/gregorio/gregorio-src/src/encode_utf8strings.c
trunk/Build/source/texk/gregorio/gregorio-src/src/enum_generator.h
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-elements-determination.c
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-glyphs-determination.c
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.c
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.h
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.c
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.h
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.y
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c
trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc.h
trunk/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c
trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c
trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c
trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex.h
trunk/Build/source/texk/gregorio/gregorio-src/src/messages.c
trunk/Build/source/texk/gregorio/gregorio-src/src/messages.h
trunk/Build/source/texk/gregorio/gregorio-src/src/plugins.h
trunk/Build/source/texk/gregorio/gregorio-src/src/sha1.c
trunk/Build/source/texk/gregorio/gregorio-src/src/sha1.h
trunk/Build/source/texk/gregorio/gregorio-src/src/struct.c
trunk/Build/source/texk/gregorio/gregorio-src/src/struct.h
trunk/Build/source/texk/gregorio/gregorio-src/src/struct_iter.h
trunk/Build/source/texk/gregorio/gregorio-src/src/support.c
trunk/Build/source/texk/gregorio/gregorio-src/src/support.h
trunk/Build/source/texk/gregorio/gregorio-src/src/unicode.c
trunk/Build/source/texk/gregorio/gregorio-src/src/unicode.h
trunk/Build/source/texk/gregorio/gregorio-src/src/utf8strings.h
trunk/Build/source/texk/gregorio/gregorio-src/src/utf8strings.h.in
trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c
trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.c
trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.h
trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.h
trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.l
trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.y
trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.c
trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.h
trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
trunk/Build/source/texk/gregorio/version.ac
Modified: trunk/Build/source/texk/README
===================================================================
--- trunk/Build/source/texk/README 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/README 2019-03-11 02:46:28 UTC (rev 50335)
@@ -67,8 +67,8 @@
dvisvgm 2.6.3 - checked 10mar19
https://dvisvgm.de/Downloads/
-gregorio 5.1.1 - checked 25mar18
- CTAN/support/gregoriotex/gregorio-5.1.1.zip
+gregorio 5.2.0 - checked 11mar19
+ CTAN/support/gregoriotex/gregorio-5.2.0.zip
gsftopk - from Paul Vojta's xdvi?
Modified: trunk/Build/source/texk/gregorio/ChangeLog
===================================================================
--- trunk/Build/source/texk/gregorio/ChangeLog 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/ChangeLog 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,3 +1,8 @@
+2019-03-11 Akira Kakuto <kakuto at w32tex.org>
+
+ * Import gregorio-5.2.0.
+ * version.ac: Adapted.
+
2018-03-25 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
* Import gregorio-5.1.1.
Modified: trunk/Build/source/texk/gregorio/TLpatches/ChangeLog
===================================================================
--- trunk/Build/source/texk/gregorio/TLpatches/ChangeLog 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/TLpatches/ChangeLog 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,3 +1,7 @@
+2019-03-11 Akira Kakuto <kakuto at w32tex.org>
+
+ Import gregorio-5.2.0.
+
2018-03-25 Akira Kakuto <kakuto at fuk.kindai.ac.jp>
Import gregorio-5.1.1.
Modified: trunk/Build/source/texk/gregorio/TLpatches/TL-Changes
===================================================================
--- trunk/Build/source/texk/gregorio/TLpatches/TL-Changes 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/TLpatches/TL-Changes 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,5 +1,5 @@
-Changes applied to the gregorio-5.1.1 tree as obtained from:
- CTAN/support/gregoriotex/gregorio-5.1.1.zip
+Changes applied to the gregorio-5.2.0 tree as obtained from:
+ CTAN/support/gregoriotex/gregorio-5.2.0.zip
Remove:
Makefile.in
Modified: trunk/Build/source/texk/gregorio/configure
===================================================================
--- trunk/Build/source/texk/gregorio/configure 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/configure 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 5.1.1.
+# Generated by GNU Autoconf 2.69 for Gregorio (TeX Live) 5.2.0.
#
# Report bugs to <tex-k at tug.org>.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='Gregorio (TeX Live)'
PACKAGE_TARNAME='gregorio--tex-live-'
-PACKAGE_VERSION='5.1.1'
-PACKAGE_STRING='Gregorio (TeX Live) 5.1.1'
+PACKAGE_VERSION='5.2.0'
+PACKAGE_STRING='Gregorio (TeX Live) 5.2.0'
PACKAGE_BUGREPORT='tex-k at tug.org'
PACKAGE_URL='http://gregorio-project.github.io/'
@@ -1330,7 +1330,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Gregorio (TeX Live) 5.1.1 to adapt to many kinds of systems.
+\`configure' configures Gregorio (TeX Live) 5.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1401,7 +1401,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Gregorio (TeX Live) 5.1.1:";;
+ short | recursive ) echo "Configuration of Gregorio (TeX Live) 5.2.0:";;
esac
cat <<\_ACEOF
@@ -1521,7 +1521,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Gregorio (TeX Live) configure 5.1.1
+Gregorio (TeX Live) configure 5.2.0
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2360,7 +2360,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Gregorio (TeX Live) $as_me 5.1.1, which was
+It was created by Gregorio (TeX Live) $as_me 5.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -8048,7 +8048,7 @@
# Define the identity of the package.
PACKAGE='gregorio--tex-live-'
- VERSION='5.1.1'
+ VERSION='5.2.0'
cat >>confdefs.h <<_ACEOF
@@ -14468,7 +14468,7 @@
Report bugs to <bug-libtool at gnu.org>."
lt_cl_version="\
-Gregorio (TeX Live) config.lt 5.1.1
+Gregorio (TeX Live) config.lt 5.2.0
configured by $0, generated by GNU Autoconf 2.69.
Copyright (C) 2011 Free Software Foundation, Inc.
@@ -16057,7 +16057,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Gregorio (TeX Live) $as_me 5.1.1, which was
+This file was extended by Gregorio (TeX Live) $as_me 5.2.0, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16124,7 +16124,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Gregorio (TeX Live) config.status 5.1.1
+Gregorio (TeX Live) config.status 5.2.0
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
Modified: trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/CHANGELOG.md 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,6 +2,16 @@
All notable changes to this project will be documented in this file.
As of v3.0.0 this project adheres to [Semantic Versioning](http://semver.org/). It follows [some conventions](http://keepachangelog.com/).
+## [5.2.0] - 2019-03-10
+### Fixed
+- `latin` is now supported as a valid language name. This brings Latin into line with other languages where both titlecased and lowercased version of the language name (e.g. `English` and `english`) are both allowed.
+
+### Added
+- Added support for two and three letter language codes for supported languages. [This list of codes](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) (and language names) was used for this support. No new languages are supported as a result of this change, just different ways of specifying the existing names.
+- A non-rotated diamond-shaped variant of the punctum inclinatum. Append a `2` in gabc to the capitalized note pitch letter to force gregorio to use this shape. Otherwise, gregorio will try to use it when a string of these notes is at the unison within a syllable. See [#1425](https://github.com/gregorio-project/gregorio/issues/1425).
+- Support for an eighth bar (nicknamed divisio "minimis") by using `^` in gabc (see [#1424](https://github.com/gregorio-project/gregorio/issues/1424)).
+- 8 new St. Gall neume glyphs have been added to the `gregall` font.
+
## [5.1.1] - 2018-03-25
### Fixed
- Various issues with the documentation.
Modified: trunk/Build/source/texk/gregorio/gregorio-src/COPYING.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/COPYING.md 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/COPYING.md 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,6 +1,6 @@
#License of Gregorio
-The program Gregorio is Copyright (C) 2007-2018 The Gregorio Project,
+The program Gregorio is Copyright (C) 2007-2019 The Gregorio Project,
see [CONTRIBUTORS.md](CONTRIBUTORS.md) for authors. It is distributed
under the GPLv3 license, printed below.
Modified: trunk/Build/source/texk/gregorio/gregorio-src/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/Makefile.am 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/Makefile.am 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
#
# This file is part of Gregorio.
#
Modified: trunk/Build/source/texk/gregorio/gregorio-src/UPGRADE.md
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/UPGRADE.md 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/UPGRADE.md 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,6 +2,10 @@
This file contains instructions to upgrade to a new release of Gregorio. These instructions are cumulative; meaning that you should apply the instructions from all versions between the one you are upgrading from and the current version.
+## Unreleased
+
+Gregorio will now use an "upright" punctum inclinatum shape for a series of unison punctum inclinatum notes over a given syllable. When there is a single punctum inclinatum, Gregorio will use a heuristic to choose a shape. In any of these cases, if the result is not satisfactory, especially in context with nearby syllables, you may select a different shape by using `0` (for the descending shape) or `1` (for the ascending shape) after the capitalized letter indicating the punctum inclinatum. Forced selection of the upright shape is also possible by using `2` after the capitalized letter indicating the punctum inclinatum.
+
## 5.1
No additional steps are needed to upgrade from 5.0 to 5.1.
Modified: trunk/Build/source/texk/gregorio/gregorio-src/VersionManager.py
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/VersionManager.py 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/VersionManager.py 2019-03-11 02:46:28 UTC (rev 50335)
@@ -5,7 +5,7 @@
See VersionUpdate.py -h for help
- Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
This file is part of Gregorio.
Modified: trunk/Build/source/texk/gregorio/gregorio-src/configure.ac
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/configure.ac 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/configure.ac 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,5 +1,5 @@
dnl Gregorio
-dnl Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+dnl Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
dnl
dnl This file is part of Gregorio.
dnl
@@ -16,8 +16,8 @@
dnl You should have received a copy of the GNU General Public License
dnl along with Gregorio. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([gregorio],[5.1.1],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
-FILENAME_VERSION="5_1_1"
+AC_INIT([gregorio],[5.2.0],[https://github.com/gregorio-project/gregorio/issues],[gregorio],[http://gregorio-project.github.io/])
+FILENAME_VERSION="5_2_0"
AC_SUBST(FILENAME_VERSION)
AC_DEFINE_UNQUOTED(FILENAME_VERSION, "$FILENAME_VERSION", [version suitable for file names])
MK=""
@@ -52,6 +52,7 @@
AX_CHECK_COMPILE_FLAG([-Wdeclaration-after-statement], [CFLAGS+=" -Wdeclaration-after-statement"])
AX_CHECK_COMPILE_FLAG([-Wall], [CFLAGS+=" -Wall"])
AX_CHECK_COMPILE_FLAG([-Wextra], [CFLAGS+=" -Wextra"])
+AX_CHECK_COMPILE_FLAG([-Wno-gnu-statement-expression], [CFLAGS+=" -Wno-gnu-statement-expression"])
AX_CHECK_LINK_FLAG([-Wl,-z,relro], [LDFLAGS+=" -Wl,-z,relro"])
AX_CHECK_LINK_FLAG([-Wl,-z,now], [LDFLAGS+=" -Wl,-z,now"])
AX_CHECK_LINK_FLAG([-fPIE], [LDFLAGS+=" -fPIE"])
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/900_gregorio.xml 2019-03-11 02:46:28 UTC (rev 50335)
@@ -3,7 +3,7 @@
XML file for using gregorio inside scribus.
Copyright (C) 2009 Pierre Couderc <pierre at couderc.eu>.
Copyright (C) 2010 Elie Roux <elie.roux at telecom-bretagne.eu>
- Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@
See the different comments in the file to change the default configuration.
-->
<editorsettings description="gregorio" icon="gregorio.png">
- <executable command="texlua"/>
+ <executable command="lualatex --shell-escape --interaction nonstopmode" />
<imagefile extension=".pdf"/>
<highlighter>
<rule name="gabc header" regex="[a-zA-Z]+:" color="blue" minimal="true"/>
@@ -29,66 +29,35 @@
<rule name="gabc delimiter" regex="%%" color="green" minimal="true"/>
<rule name="gabc notes" regex="\([^)]*\)" color="red" minimal="true"/>
</highlighter>
- <empty-frame-text>name: myscore;
-%%
-(c3) Pó(eh/hi)pu(h)lus(h) Si(hi)on,(hgh.)
+ <empty-frame-text>
+ name: myscore;
+ %%
+ (c3) Pó(eh/hi)pu(h)lus(h) Si(hi)on,(hgh.)
</empty-frame-text>
- <!-- you can change the basic headers there -->
- <preamble>data_from_scribus = [==========[% Generated from Scribus
-\documentclass[a4paper,$scribus_grefontsize$]{extarticle}
-\usepackage[left=0cm,top=0cm,right=0cm,bottom=0cm,nohead,nofoot]{geometry}
-\usepackage{color}
-\title{Scribus-Latex-gregorio-File}
-$scribus_additionalgreheaders$
-\usepackage{gregoriotex}
-\author{Scribus}
-\pagestyle{empty}
-\setlength{\textwidth}{$scribus_realwidth$ pt}
-\begin{document}
-$scribus_greconf$
-%%% BEGIN GABC %%%
-</preamble>
- <postamble>]==========]
-require"lfs"
+ <!-- you can change the basic headers here -->
+ <preamble>
+ \documentclass[$scribus_grefontsize$]{extarticle}
+ \usepackage[paperwidth=$scribus_realwidth$ pt,
+ paperheight=$scribus_realheight$ pt,
+ left=0cm,top=0cm,right=0cm,bottom=0cm,nohead,nofoot]{geometry}
+ \usepackage[autocompile]{gregoriotex}
+ \usepackage{filecontents}
+ \title{Scribus-Latex-File}
+ $scribus_additionalgreheaders$
+ \author{Scribus}
+ \pagestyle{empty}
+ \setlength{\textwidth}{$scribus_realwidth$ pt}
-local latexmkbin = "latexmk"
-local lualatexbin = "lualatex"
+ \begin{filecontents}{scribus_file-score.gabc}
+ </preamble>
+ <postamble>
+ \end{filecontents}
-local function basename(name)
- return name and string.match(name,"^.+[/\\](.-)$") or name
-end
-
-local f = basename(arg[0])
-
-local texfile = io.open(f .. ".tex", "w")
-local gabcfile = io.open(f .. "-score.gabc", "w")
-local in_tex = true
-local l
-for l in string.gmatch(data_from_scribus, "[^\r\n]+") do
- if l == "%%% BEGIN GABC %%%" then
- in_tex = false
- elseif in_tex then
- texfile:write(l .. '\n')
- else
- gabcfile:write(l .. '\n')
- end
-end
-
-local format = string.format
-
-texfile:write("\n\\gregorioscore[f]{" .. f .. "-score}\n\\end{document}\n")
-texfile:close()
-gabcfile:close()
-
-print("calling "..latexmkbin.."\n")
-os.exec({
- latexmkbin,
- '-g',
- '-pdf',
- '-pdflatex=' .. lualatexbin .. ' --interaction=nonstopmode --shell-escape',
- f
-})
-</postamble>
+ \begin{document}
+ $scribus_greconf$
+ \gregorioscore{scribus_file-score}
+ \end{document}
+ </postamble>
<tab type="settings">
<title>
<i18n>
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/Makefile.am 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
#
# This file is part of Gregorio.
#
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/Makefile.am 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
#
# This file is part of Gregorio.
#
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/TeXShop/auto-configure.command 2019-03-11 02:46:28 UTC (rev 50335)
@@ -21,23 +21,38 @@
exit 1
fi
SOURCE="/Users/Shared/Gregorio/contrib/TeXShop/LuaLaTeX+se.engine"
-if [ -e "$SOURCE" ]; then
- echo "Copying LuaLaTeX+se.engine into TeXShop configuration"
- cp "$SOURCE" "$ENGINEDIR"
-else
- echo "Cannot find LuaLaTeX+se.engine"
- echo "Please try running the Gregorio intaller again"
- exit 1
+if [ ! -e "$SOURCE" ]; then
+ SOURCE="$PWD/LuaLaTeX+se.engine"
+ if [ ! -e "$SOURCE" ]; then
+ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+ SOURCE="$DIR/LuaLaTeX+se.engine"
+ else
+ echo "Cannot find LuaLaTeX+se.engine"
+ echo "Please try running the Gregorio intaller again"
+ exit 1
+ fi
fi
+echo "Copying LuaLaTeX+se.engine into TeXShop configuration"
+cp "$SOURCE" "$ENGINEDIR"
+
SOURCE="/Users/Shared/Gregorio/contrib/TeXShop/LuaTeX+se.engine"
-if [ -e "$SOURCE" ]; then
- echo "Copying LuaTeX+se.engine into TeXShop configuration"
- cp "$SOURCE" "$ENGINEDIR"
-else
- echo "Cannot find LuaTeX+se.engine"
- echo "Please try running the Gregorio intaller again"
- exit 1
+if [ ! -e "$SOURCE" ]; then
+ SOURCE="$PWD/LuaTeX+se.engine"
+ if [ ! -e "$SOURCE" ]; then
+ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
+ SOURCE="$DIR/LuaTeX+se.engine"
+ else
+ echo "Cannot find LuaTeX+se.engine"
+ echo "Please try running the Gregorio intaller again"
+ exit 1
+ fi
fi
+echo "Copying LuaTeX+se.engine into TeXShop configuration"
+cp "$SOURCE" "$ENGINEDIR"
+#double check the execution bits
+chmod +x "$ENGINEDIR/LuaLaTeX+se.engine"
+chmod +x "$ENGINEDIR/LuaTeX+se.engine"
+
echo "Configuration complete"
exit 0
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/checkSyllabation.py 2019-03-11 02:46:28 UTC (rev 50335)
@@ -5,7 +5,7 @@
See checkSyllabation.py -h for help
- Copyright (C) 2016-2018 Elie Roux
+ Copyright (C) 2016-2019 Elie Roux
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/gabc.lang 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
<!--
Author: Elie Roux <elie.roux at telecom-bretagne.fr>
- Copyright (C) 2008-2018 Elie Roux <elie.roux at telecom-bretagne.fr>
+ Copyright (C) 2008-2019 Elie Roux <elie.roux at telecom-bretagne.fr>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/gabc.vim 2019-03-11 02:46:28 UTC (rev 50335)
@@ -11,11 +11,11 @@
syn match gabcAttributeEnd ";"
syn match gabcNoteError "." contained
syn match gabcBasicNote "[a-np]" contained
-syn match gabcBasicNote "[A-NP][01]\?" 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-8]\?" contained
+syn match gabcBasicNote "[A-NP][012]\?" contained
+syn match gabcNoteShape "[\<\>~xy#vVwWqQR\-Ss\.+]" contained
+syn match gabcNoteShape "_[0-5]*" contained
+syn match gabcNoteShape "[oO'\.][01]\?" contained
+syn match gabcNoteShape "r[0-8]\?" contained
syn match gabcClef "[cf]b\?[1-5]" contained
syn match gabcTextMarkup "</\?e>" contained
syn match gabcTextMarkup "</\?b>" contained
@@ -32,7 +32,7 @@
syn match gabcBar ":?\?" contained
syn match gabcBar ";[1-8]\?" contained
syn match gabcBar ",[0-8]\?" contained
-syn match gabcBar "`0\?" contained
+syn match gabcBar "[`^]0\?" contained
syn match gabcSpace "[! ]" contained
syn match gabcSpace "/0\?" contained
syn match gabcSpace "z[-+0]\?" contained
@@ -51,7 +51,7 @@
syn region gabcVerbatim matchgroup=gabcTextMarkup start="<v>" end="</v>"
\ contained
syn region gabcNabc matchgroup=gabcNabcCut start="|" end="[|)]" keepend
-syn cluster gabcFusible contains=gabcBasicNote,gabcAlteration,gabcBar,gabcSpace,
+syn cluster gabcFusible contains=gabcBasicNote,gabcNoteShape,gabcBar,gabcSpace,
\gabcComment,gabcCommand,gabcNoteError,gabcFuse,
\gabcTextOrNoteMarkup,gabcClef,gabcNabc,gabcBracket
syn region gabcFuseGroup matchGroup=gabcFuseGroup start="@\[" end="\]"
@@ -79,7 +79,7 @@
hi def link gabcAlt Constant
hi def link gabcClef Statement
hi def link gabcBasicNote Statement
-hi def link gabcAlteration PreProc
+hi def link gabcNoteShape PreProc
hi def link gabcCommand Type
hi def link gabcBar Special
hi def link gabcSpace Special
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/gprocess
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/gprocess 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/gprocess 2019-03-11 02:46:28 UTC (rev 50335)
@@ -14,7 +14,7 @@
# --
#
# v0.1
-# Copyright (C) 2008-2018 Richard Chonak <chonak at yahoo.com>
+# Copyright (C) 2008-2019 Richard Chonak <chonak at yahoo.com>
#
# This program is free software: you can redistribute it and/or modify
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.bat 2019-03-11 02:46:28 UTC (rev 50335)
@@ -105,7 +105,7 @@
set loc=%%H
set loc=!loc:/=\!
echo !loc! >> %output%
- for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" !loc!') do set ver=%%I
+ for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" "!loc!"') do set ver=%%I
set ver=!ver:*{=!
set ver=!ver:*{=!
set trash=}!ver:*}=!
@@ -126,7 +126,7 @@
set loc=%%H
set loc=!loc:/=\!
echo !loc! >> %output%
- for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" !loc!') do set ver=%%I
+ for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" "!loc!"') do set ver=%%I
set ver=!ver:*N =!
echo !ver! >> %output% 2>&1
set ver=
@@ -142,7 +142,7 @@
set loc=%%H
set loc=!loc:/=\!
echo !loc! >> %output%
- for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" !loc!') do set ver=%%I
+ for /f "delims=" %%I in ('findstr /r "GREGORIO_VERSION" "!loc!"') do set ver=%%I
set ver=!ver:*'=!
set trash='!ver:*'=!
call set ver=%%ver:!trash!=%%
@@ -161,7 +161,7 @@
set loc=%%H
set loc=!loc:/=\!
echo !loc! >> %output%
- for /f "delims=" %%I in ('findstr /r "PARSE_VERSION_DATE_LTX" !loc!') do set ver=%%I
+ for /f "delims=" %%I in ('findstr /r "PARSE_VERSION_DATE_LTX" "!loc!"') do set ver=%%I
set ver=!ver:*v=!
set trash=G!ver:*G=!
call set ver=%%ver:!trash!=%%
@@ -240,7 +240,7 @@
echo gregorio-users at googlegroups.com as part of your bug report.
echo.
echo You can also create an issue at
-echo http://github.org/gregorio-project/gregorio/issues
+echo http://github.com/gregorio-project/gregorio/issues
echo and copy-paste the content of this file into the description.
echo.
pause
Modified: trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/contrib/system-setup.command 2019-03-11 02:46:28 UTC (rev 50335)
@@ -225,7 +225,7 @@
echo "part of your bug report."
echo ""
echo "You can also create an issue at "
-echo "http://github.org/gregorio-project/gregorio/issues"
+echo "http://github.com/gregorio-project/gregorio/issues"
echo "and copy-paste the content of this file into the description."
echo ""
exit 0
Modified: trunk/Build/source/texk/gregorio/gregorio-src/install-gtex.sh
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/install-gtex.sh 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/install-gtex.sh 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,6 +1,6 @@
#!/usr/bin/env bash
-# Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
#
# This file is part of Gregorio.
#
Modified: trunk/Build/source/texk/gregorio/gregorio-src/install.sh
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/install.sh 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/install.sh 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
#
# This file is part of Gregorio.
#
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/Makefile.am
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/Makefile.am 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/Makefile.am 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,4 +1,4 @@
-# Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+# Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
#
# This file is part of Gregorio.
#
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/bool.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/bool.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/bool.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header provides a minimum of C11-like bool functionality.
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/characters.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/characters.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/characters.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX.
* This file contains functions that deal with lyrics and styles.
*
- * Copyright (C) 2008-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2008-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
@@ -105,7 +105,7 @@
void gregorio_set_centering_language(char *const language)
{
if (!read_vowel_rules(language)) {
- if (strcmp(language, "Latin") != 0) {
+ if (strcmp(language, "Latin") != 0 && strcmp(language, "latin") != 0 && strcmp(language, "la") != 0 && strcmp(language, "lat") != 0) {
gregorio_messagef("gregorio_set_centering_language",
VERBOSITY_WARNING, 0, _("unable to read vowel files for "
"%s; defaulting to Latin rules"), language);
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/characters.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/characters.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/characters.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header prototypes the lyric handling data structures and entry points.
*
- * Copyright (C) 2008-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2008-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/config.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/config.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/config.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -4,7 +4,7 @@
*
* Gregorio configuration headers.
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/dump/dump.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/dump/dump.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/dump/dump.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX.
* This file provides functions to dump out Gregorio structures.
*
- * Copyright (C) 2007-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2007-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/encode_utf8strings.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/encode_utf8strings.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/encode_utf8strings.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,7 +1,7 @@
/*
* Utility program to convert utf8strings.h.in into utf8strings.h
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/enum_generator.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/enum_generator.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/enum_generator.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-elements-determination.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-elements-determination.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-elements-determination.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX.
* This file provides functions for determining elements from notes.
*
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-glyphs-determination.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-glyphs-determination.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-glyphs-determination.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file provides functions for determining glyphs from notes.
*
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
@@ -47,6 +47,21 @@
&& note->u.note.liquescentia != L_INITIO_DEBILIS;
}
+static __inline bool is_punctum_inclinatum(const gregorio_shape shape,
+ const bool determined_only)
+{
+ switch (shape) {
+ case S_PUNCTUM_INCLINATUM_ASCENDENS:
+ case S_PUNCTUM_INCLINATUM_STANS:
+ case S_PUNCTUM_INCLINATUM_DESCENDENS:
+ return true;
+ case S_PUNCTUM_INCLINATUM_UNDETERMINED:
+ return !determined_only;
+ default:
+ return false;
+ }
+}
+
/****************************
*
* This function is the basis of all the determination of glyphs. The
@@ -298,6 +313,7 @@
break;
case S_PUNCTUM_INCLINATUM_UNDETERMINED:
case S_PUNCTUM_INCLINATUM_ASCENDENS:
+ case S_PUNCTUM_INCLINATUM_STANS:
case S_PUNCTUM_INCLINATUM_DESCENDENS:
/*
* Warning : this part of the code is specific to the
@@ -317,8 +333,7 @@
next_glyph_type = G_PUNCTUM_INCLINATUM;
break;
}
- if ((shape == S_PUNCTUM_INCLINATUM_ASCENDENS
- || shape == S_PUNCTUM_INCLINATUM_DESCENDENS)
+ if (is_punctum_inclinatum(shape, true)
&& *punctum_inclinatum_orientation != shape
&& *punctum_inclinatum_orientation
!= S_PUNCTUM_INCLINATUM_UNDETERMINED) {
@@ -471,6 +486,7 @@
switch (shape) {
case S_PUNCTUM_INCLINATUM_ASCENDENS:
+ case S_PUNCTUM_INCLINATUM_STANS:
case S_PUNCTUM_INCLINATUM_DESCENDENS:
*punctum_inclinatum_orientation = shape;
break;
@@ -1160,12 +1176,7 @@
}
/* special cases of the punctum inclinatum deminutus and
* auctus */
- if (current_note->u.note.shape
- == S_PUNCTUM_INCLINATUM_ASCENDENS
- || current_note->u.note.shape
- == S_PUNCTUM_INCLINATUM_DESCENDENS
- || current_note->u.note.shape
- == S_PUNCTUM_INCLINATUM_UNDETERMINED) {
+ if (is_punctum_inclinatum(current_note->u.note.shape, false)) {
if (current_note->u.note.liquescentia == L_DEMINUTUS) {
current_note->u.note.shape =
S_PUNCTUM_INCLINATUM_DEMINUTUS;
@@ -1180,12 +1191,8 @@
if (current_note->next
&& current_note->next->type == GRE_NOTE
- && (current_note->next->u.note.shape
- == S_PUNCTUM_INCLINATUM_ASCENDENS
- || current_note->next->u.note.shape
- == S_PUNCTUM_INCLINATUM_DESCENDENS
- || current_note->next->u.note.shape
- == S_PUNCTUM_INCLINATUM_UNDETERMINED)
+ && is_punctum_inclinatum(
+ current_note->next->u.note.shape, false)
&& current_note->next->u.note.liquescentia
== L_DEMINUTUS) {
last_pitch = current_note->u.note.pitch;
@@ -1222,12 +1229,7 @@
{
/* special cases of the punctum inclinatum deminutus and
* auctus */
- if (current_note->u.note.shape
- == S_PUNCTUM_INCLINATUM_ASCENDENS
- || current_note->u.note.shape
- == S_PUNCTUM_INCLINATUM_DESCENDENS
- || current_note->u.note.shape
- == S_PUNCTUM_INCLINATUM_UNDETERMINED) {
+ if (is_punctum_inclinatum(current_note->u.note.shape, false)) {
if (current_note->u.note.liquescentia == L_DEMINUTUS) {
current_note->u.note.shape =
S_PUNCTUM_INCLINATUM_DEMINUTUS;
@@ -1241,12 +1243,8 @@
}
if (current_note->next
&& current_note->next->type == GRE_NOTE
- && (current_note->next->u.note.shape
- == S_PUNCTUM_INCLINATUM_ASCENDENS
- || current_note->next->u.note.shape
- == S_PUNCTUM_INCLINATUM_DESCENDENS
- || current_note->next->u.note.shape
- == S_PUNCTUM_INCLINATUM_UNDETERMINED)
+ && is_punctum_inclinatum(
+ current_note->next->u.note.shape, false)
&& current_note->next->u.note.liquescentia ==
L_DEMINUTUS) {
current_note = next_note;
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination-l.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -644,10 +644,10 @@
53, 54, 55, 40, 56, 57, 57, 57, 57, 57,
57, 57, 57, 57, 57, 57, 57, 57, 57, 58,
57, 40, 59, 40, 40, 40, 60, 61, 40, 40,
- 62, 63, 40, 64, 40, 65, 66, 67, 67, 68,
- 67, 67, 68, 67, 67, 67, 67, 67, 67, 67,
- 67, 69, 67, 70, 71, 72, 40, 40, 73, 74,
- 75, 76, 77, 78, 40, 79, 80, 40, 40, 40,
+ 62, 63, 40, 64, 65, 66, 67, 68, 68, 69,
+ 68, 68, 69, 68, 68, 68, 68, 68, 68, 68,
+ 68, 70, 68, 71, 72, 73, 40, 40, 74, 75,
+ 76, 77, 78, 79, 40, 80, 81, 40, 40, 40,
40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
@@ -676,10 +676,10 @@
57, 57, 57, 57, 57, 57, 57, 57, 57, 58,
57, 40, 59, 40, 40, 40, 60, 61, 40, 40,
- 62, 63, 40, 64, 40, 65, 66, 67, 67, 68,
- 67, 67, 68, 67, 67, 67, 67, 67, 67, 67,
- 67, 69, 67, 70, 71, 72, 40, 40, 73, 74,
- 75, 76, 77, 78, 40, 79, 80, 40, 40, 40,
+ 62, 63, 40, 64, 65, 66, 67, 68, 68, 69,
+ 68, 68, 69, 68, 68, 68, 68, 68, 68, 68,
+ 68, 70, 68, 71, 72, 73, 40, 40, 74, 75,
+ 76, 77, 78, 79, 40, 80, 81, 40, 40, 40,
40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
40, 40, 40, 40, 40, 40, 40, 40, 40, 40,
@@ -697,133 +697,70 @@
},
{
- 39, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+ 39, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 82, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 83, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82
},
{
- 39, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+ 39, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 82, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 83, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81, 81, 81, 81, 81,
- 81, 81, 81, 81, 81, 81
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82, 82, 82, 82, 82,
+ 82, 82, 82, 82, 82, 82
},
{
- 39, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 82, 83, 83, 83, 83, 83, 83,
-
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
-
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83
- },
-
- {
- 39, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
-
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 82, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
-
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
-
- 83, 83, 83, 83, 83, 83, 83, 83, 83, 83,
- 83, 83, 83, 83, 83, 83
- },
-
- {
39, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
@@ -832,9 +769,10 @@
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+ 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+ 84, 84, 84, 83, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
- 84, 84, 84, 82, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
@@ -843,6 +781,7 @@
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+ 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
@@ -849,8 +788,6 @@
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
- 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
- 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84
},
@@ -857,6 +794,8 @@
{
39, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+ 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+ 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
@@ -863,9 +802,9 @@
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
+ 84, 84, 84, 83, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
- 84, 84, 84, 82, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
@@ -881,8 +820,6 @@
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
- 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
- 84, 84, 84, 84, 84, 84, 84, 84, 84, 84,
84, 84, 84, 84, 84, 84
},
@@ -893,11 +830,13 @@
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+ 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+ 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+ 85, 85, 85, 83, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
- 85, 85, 85, 82, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
@@ -912,15 +851,13 @@
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
- 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
- 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85
-
},
{
39, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
@@ -928,7 +865,9 @@
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
- 85, 85, 85, 82, 85, 85, 85, 85, 85, 85,
+ 85, 85, 85, 83, 85, 85, 85, 85, 85, 85,
+ 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
+ 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
@@ -944,8 +883,6 @@
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
- 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
- 85, 85, 85, 85, 85, 85, 85, 85, 85, 85,
85, 85, 85, 85, 85, 85
},
@@ -954,13 +891,15 @@
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+ 86, 86, 86, 83, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
- 86, 86, 86, 82, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
@@ -975,10 +914,8 @@
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+ 86, 86, 86, 86, 86, 86
- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
- 86, 86, 86, 86, 86, 86
},
{
@@ -990,9 +927,10 @@
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+ 86, 86, 86, 83, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
- 86, 86, 86, 82, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
@@ -1001,6 +939,7 @@
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
+ 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
@@ -1007,8 +946,6 @@
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
- 86, 86, 86, 86, 86, 86, 86, 86, 86, 86,
86, 86, 86, 86, 86, 86
},
@@ -1015,6 +952,8 @@
{
39, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
@@ -1021,9 +960,9 @@
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 83, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 82, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
@@ -1039,8 +978,6 @@
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87
},
@@ -1051,11 +988,13 @@
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
+ 87, 87, 87, 83, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 82, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
@@ -1070,16 +1009,13 @@
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
- 87, 87, 87, 87, 87, 87, 87, 87, 87, 87,
87, 87, 87, 87, 87, 87
-
},
{
39, 88, 88, 88, 88, 88, 88, 88, 88, 88,
- 89, 88, 88, 89, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
+
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
@@ -1087,6 +1023,9 @@
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
+ 88, 88, 88, 83, 88, 88, 88, 88, 88, 88,
+ 88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
+ 88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
@@ -1102,30 +1041,28 @@
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
- 88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
- 88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88
},
{
39, 88, 88, 88, 88, 88, 88, 88, 88, 88,
- 89, 88, 88, 89, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
-
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
+
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
+ 88, 88, 88, 83, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
-
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
+
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
@@ -1134,72 +1071,72 @@
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
-
88, 88, 88, 88, 88, 88, 88, 88, 88, 88,
88, 88, 88, 88, 88, 88
+
},
{
- 39, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
+ 39, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 90, 89, 89, 90, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 82, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 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, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
+ 39, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 90, 89, 89, 90, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 82, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90, 90, 90, 90, 90,
- 90, 90, 90, 90, 90, 90
+ 89, 89, 89, 89, 89, 89, 89, 89, 89, 89,
+ 89, 89, 89, 89, 89, 89
},
{
@@ -1209,11 +1146,13 @@
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+ 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+ 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+ 91, 91, 91, 83, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
- 91, 91, 91, 82, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
@@ -1228,15 +1167,13 @@
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
- 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
- 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91
-
},
{
39, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
@@ -1244,7 +1181,9 @@
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
- 91, 91, 91, 82, 91, 91, 91, 91, 91, 91,
+ 91, 91, 91, 83, 91, 91, 91, 91, 91, 91,
+ 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
+ 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
@@ -1260,8 +1199,6 @@
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
- 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
- 91, 91, 91, 91, 91, 91, 91, 91, 91, 91,
91, 91, 91, 91, 91, 91
},
@@ -1270,13 +1207,15 @@
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+ 92, 92, 92, 83, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
- 92, 92, 92, 82, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
@@ -1291,10 +1230,8 @@
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
- 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+ 92, 92, 92, 92, 92, 92
- 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
- 92, 92, 92, 92, 92, 92
},
{
@@ -1306,9 +1243,10 @@
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+ 92, 92, 92, 83, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
- 92, 92, 92, 82, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
@@ -1317,6 +1255,7 @@
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
+ 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
@@ -1323,8 +1262,6 @@
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
- 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
- 92, 92, 92, 92, 92, 92, 92, 92, 92, 92,
92, 92, 92, 92, 92, 92
},
@@ -1331,6 +1268,8 @@
{
39, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+ 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+ 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
@@ -1337,9 +1276,9 @@
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+ 93, 93, 93, 83, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
- 93, 93, 93, 82, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
@@ -1355,8 +1294,6 @@
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
- 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
- 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93
},
@@ -1367,11 +1304,13 @@
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+ 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+ 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
+ 93, 93, 93, 83, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
- 93, 93, 93, 82, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
@@ -1386,23 +1325,12 @@
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
- 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
- 93, 93, 93, 93, 93, 93, 93, 93, 93, 93,
93, 93, 93, 93, 93, 93
-
},
{
39, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 95, 96, 94, 97, 97,
- 97, 97, 97, 97, 97, 97, 97, 97, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 82, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
@@ -1411,9 +1339,9 @@
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 94, 94, 94, 83, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
@@ -1420,38 +1348,15 @@
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94
- },
-
- {
- 39, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
-
- 94, 94, 94, 94, 94, 95, 96, 94, 97, 97,
- 97, 97, 97, 97, 97, 97, 97, 97, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 82, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
-
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94
},
@@ -1460,15 +1365,13 @@
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 98, 99, 94, 100, 100,
- 100, 100, 100, 100, 100, 100, 100, 100, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 82, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 94, 94, 94, 83, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
@@ -1483,355 +1386,452 @@
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
94, 94, 94, 94, 94, 94
+
},
{
- 39, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 39, 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, 95, 95, 95,
+ 95, 95, 95, 95, 95, 96, 97, 95, 98, 98,
+ 98, 98, 98, 98, 98, 98, 98, 98, 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, 83, 95, 95, 95, 95, 95, 95,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 98, 99, 94, 100, 100,
- 100, 100, 100, 100, 100, 100, 100, 100, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 82, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 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, 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, 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,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 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, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95
+ },
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94
+ {
+ 39, 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, 95, 95, 95,
+
+ 95, 95, 95, 95, 95, 96, 97, 95, 98, 98,
+ 98, 98, 98, 98, 98, 98, 98, 98, 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, 83, 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,
+ 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, 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, 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, 95, 95,
+
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95
},
{
- 39, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 94,
+ 39, 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, 95, 95, 95,
+ 95, 95, 95, 95, 95, 99, 100, 95, 101, 101,
+ 101, 101, 101, 101, 101, 101, 101, 101, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 94, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 83, 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,
+ 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, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101
+ 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, 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, 95, 95, 95, 95
+ },
+ {
+ 39, 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, 95, 95, 95,
+ 95, 95, 95, 95, 95, 99, 100, 95, 101, 101,
+ 101, 101, 101, 101, 101, 101, 101, 101, 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, 83, 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,
+ 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, 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, 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, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95
},
{
- 39, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 94,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+ 39, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 95,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 94, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 95, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101, 101, 101, 101, 101,
- 101, 101, 101, 101, 101, 101
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102
+
},
{
- 39, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 39, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 95,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 102,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 103, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 95, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102, 102, 102, 102, 102,
+ 102, 102, 102, 102, 102, 102
+ },
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94
+ {
+ 39, 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, 95, 95, 95,
+
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 103,
+ 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, 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, 104, 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,
+ 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, 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, 95, 95, 95, 95, 95, 95, 95, 95,
+
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95
},
{
- 39, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 102,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 39, 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, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 103,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 103, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 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, 95, 95, 95, 95,
+ 95, 95, 95, 104, 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,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94
+ 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, 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, 95, 95, 95, 95
},
{
- 39, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 39, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 94,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 95,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
- 104, 104, 104, 94, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 105, 105, 105, 95, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105
},
{
- 39, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 94,
+ 39, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 95,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 94, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 95, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104, 104, 104, 104, 104,
- 104, 104, 104, 104, 104, 104
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105, 105, 105, 105, 105,
+ 105, 105, 105, 105, 105, 105
},
{
- 39, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 105,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 39, 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, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 106,
+ 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, 95, 95, 95, 95,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 106, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 107, 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,
+ 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, 95, 95, 95, 95,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94
+ 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, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95
},
{
- 39, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 39, 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, 95, 95, 95,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 105,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 106, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 106,
+ 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, 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, 107, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 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, 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, 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,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95
},
{
- 39, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 39, 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, 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, 95, 95, 95, 95, 95, 95, 95,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 82, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 83, 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,
+ 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, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94
+ 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, 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, 95, 95, 95, 95
},
{
- 39, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 39, 95, 95, 95, 95, 95, 95, 95, 95, 95,
+ 95, 95, 95, 95, 95, 95, 95, 95, 95, 95,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 82, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 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, 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, 95, 83, 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,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
+ 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, 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, 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,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94, 94, 94, 94, 94,
- 94, 94, 94, 94, 94, 94
+ 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
},
{
@@ -1898,8 +1898,8 @@
},
{
- 39, -41, -41, -41, -41, -41, -41, -41, -41, 107,
- 107, -41, -41, 107, -41, -41, -41, -41, -41, -41,
+ 39, -41, -41, -41, -41, -41, -41, -41, -41, 108,
+ 108, -41, -41, 108, -41, -41, -41, -41, -41, -41,
-41, -41, -41, -41, -41, -41, -41, -41, -41, -41,
-41, -41, -41, -41, -41, -41, -41, -41, -41, -41,
@@ -1961,35 +1961,35 @@
},
{
- 39, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 39, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 109, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 110, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 110, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 111, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108, 108, 108, 108, 108,
- 108, 108, 108, 108, 108, 108
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109, 109, 109, 109, 109,
+ 109, 109, 109, 109, 109, 109
},
{
@@ -2061,7 +2061,7 @@
-46, -46, -46, -46, -46, -46, -46, -46, -46, -46,
-46, -46, -46, -46, -46, -46, -46, -46, -46, -46,
- -46, -46, -46, -46, -46, -46, -46, -46, 111, 111,
+ -46, -46, -46, -46, -46, -46, -46, -46, 112, 112,
-46, -46, -46, -46, -46, -46, -46, -46, -46, -46,
-46, -46, -46, -46, -46, -46, -46, -46, -46, -46,
-46, -46, -46, -46, -46, -46, -46, -46, -46, -46,
@@ -2092,8 +2092,8 @@
-47, -47, -47, -47, -47, -47, -47, -47, -47, -47,
-47, -47, -47, -47, -47, -47, -47, -47, -47, -47,
-47, -47, -47, -47, -47, -47, -47, -47, -47, -47,
- -47, -47, -47, -47, -47, -47, -47, -47, 112, 113,
- 113, 113, 113, 113, 113, 113, 113, -47, -47, -47,
+ -47, -47, -47, -47, -47, -47, -47, -47, 113, 114,
+ 114, 114, 114, 114, 114, 114, 114, -47, -47, -47,
-47, -47, -47, -47, -47, -47, -47, -47, -47, -47,
-47, -47, -47, -47, -47, -47, -47, -47, -47, -47,
@@ -2126,12 +2126,12 @@
-48, -48, -48, -48, -48, -48, -48, -48, -48, -48,
-48, -48, -48, -48, -48, -48, -48, -48, -48, -48,
-48, -48, -48, -48, -48, -48, -48, -48, -48, -48,
- -48, -48, -48, -48, -48, 114, 114, 114, 114, 114,
- 114, 114, 114, 114, 114, 114, 114, 114, 114, -48,
- 114, -48, -48, -48, -48, -48, -48, -48, -48, -48,
- -48, -48, -48, -48, -48, -48, -48, 115, 115, 115,
- 115, 115, 115, 115, 115, 115, 115, 115, 115, 115,
- 115, -48, 115, -48, -48, -48, -48, -48, -48, -48,
+ -48, -48, -48, -48, -48, 115, 115, 115, 115, 115,
+ 115, 115, 115, 115, 115, 115, 115, 115, 115, -48,
+ 115, -48, -48, -48, -48, -48, -48, -48, -48, -48,
+ -48, -48, -48, -48, -48, -48, -48, 116, 116, 116,
+ 116, 116, 116, 116, 116, 116, 116, 116, 116, 116,
+ 116, -48, 116, -48, -48, -48, -48, -48, -48, -48,
-48, -48, -48, -48, -48, -48, -48, -48, -48, -48,
-48, -48, -48, -48, -48, -48, -48, -48, -48, -48,
@@ -2155,7 +2155,7 @@
-49, -49, -49, -49, -49, -49, -49, -49, -49, -49,
-49, -49, -49, -49, -49, -49, -49, -49, -49, -49,
-49, -49, -49, -49, -49, -49, -49, -49, -49, -49,
- -49, -49, -49, -49, -49, -49, -49, -49, 116, 116,
+ -49, -49, -49, -49, -49, -49, -49, -49, 117, 117,
-49, -49, -49, -49, -49, -49, -49, -49, -49, -49,
-49, -49, -49, -49, -49, -49, -49, -49, -49, -49,
@@ -2186,13 +2186,13 @@
39, -50, -50, -50, -50, -50, -50, -50, -50, -50,
-50, -50, -50, -50, -50, -50, -50, -50, -50, -50,
-50, -50, -50, -50, -50, -50, -50, -50, -50, -50,
- -50, -50, -50, 117, -50, -50, -50, -50, -50, -50,
- -50, -50, -50, -50, -50, -50, -50, 118, 119, -50,
+ -50, -50, -50, 118, -50, -50, -50, -50, -50, -50,
+ -50, -50, -50, -50, -50, -50, -50, 119, 120, -50,
-50, -50, -50, -50, -50, -50, -50, -50, -50, -50,
-50, -50, -50, -50, -50, -50, -50, -50, -50, -50,
-50, -50, -50, -50, -50, -50, -50, -50, -50, -50,
-50, -50, -50, -50, -50, -50, -50, -50, -50, -50,
- -50, 120, -50, -50, -50, -50, -50, -50, -50, -50,
+ -50, 121, -50, -50, -50, -50, -50, -50, -50, -50,
-50, -50, -50, -50, -50, -50, -50, -50, -50, -50,
-50, -50, -50, -50, -50, -50, -50, -50, -50, -50,
@@ -2220,8 +2220,8 @@
-51, -51, -51, -51, -51, -51, -51, -51, -51, -51,
-51, -51, -51, -51, -51, -51, -51, -51, -51, -51,
- -51, -51, -51, -51, -51, -51, -51, -51, 121, -51,
- -51, -51, -51, 122, -51, -51, -51, -51, -51, -51,
+ -51, -51, -51, -51, -51, -51, -51, -51, 122, -51,
+ -51, -51, -51, 123, -51, -51, -51, -51, -51, -51,
-51, -51, -51, -51, -51, -51, -51, -51, -51, -51,
-51, -51, -51, -51, -51, -51, -51, -51, -51, -51,
-51, -51, -51, -51, -51, -51, -51, -51, -51, -51,
@@ -2250,8 +2250,8 @@
-52, -52, -52, -52, -52, -52, -52, -52, -52, -52,
-52, -52, -52, -52, -52, -52, -52, -52, -52, -52,
-52, -52, -52, -52, -52, -52, -52, -52, -52, -52,
- -52, -52, -52, -52, -52, -52, -52, -52, -52, 113,
- 113, 113, 113, 113, 113, 113, 113, -52, -52, -52,
+ -52, -52, -52, -52, -52, -52, -52, -52, -52, 114,
+ 114, 114, 114, 114, 114, 114, 114, -52, -52, -52,
-52, -52, -52, -52, -52, -52, -52, -52, -52, -52,
-52, -52, -52, -52, -52, -52, -52, -52, -52, -52,
@@ -2282,7 +2282,7 @@
-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
- -53, -53, -53, -53, -53, -53, -53, 123, -53, -53,
+ -53, -53, -53, -53, -53, -53, -53, 124, -53, -53,
-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
@@ -2289,7 +2289,7 @@
-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
- 124, -53, -53, -53, -53, -53, -53, -53, -53, -53,
+ 125, -53, -53, -53, -53, -53, -53, -53, -53, -53,
-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
-53, -53, -53, -53, -53, -53, -53, -53, -53, -53,
@@ -2379,12 +2379,12 @@
-56, -56, -56, -56, -56, -56, -56, -56, -56, -56,
-56, -56, -56, -56, -56, -56, -56, -56, -56, -56,
- -56, -56, -56, -56, -56, 125, 125, 125, 125, 125,
- 125, 125, 125, 125, 125, 125, 125, 125, 125, -56,
- 125, -56, -56, -56, -56, -56, -56, -56, -56, -56,
- -56, 126, -56, -56, -56, -56, -56, 127, 127, 128,
- 127, 127, 128, 127, 127, 127, 127, 127, 127, 127,
- 127, -56, 127, -56, -56, -56, -56, -56, -56, -56,
+ -56, -56, -56, -56, -56, 126, 126, 126, 126, 126,
+ 126, 126, 126, 126, 126, 126, 126, 126, 126, -56,
+ 126, -56, -56, -56, -56, -56, -56, -56, -56, -56,
+ -56, 127, -56, -56, -56, -56, -56, 128, 128, 129,
+ 128, 128, 129, 128, 128, 128, 128, 128, 128, 128,
+ 128, -56, 128, -56, -56, -56, -56, -56, -56, -56,
-56, -56, -56, -56, -56, -56, -56, -56, -56, -56,
-56, -56, -56, -56, -56, -56, -56, -56, -56, -56,
@@ -2408,15 +2408,15 @@
-57, -57, -57, -57, -57, -57, -57, -57, -57, -57,
-57, -57, -57, -57, -57, -57, -57, -57, -57, -57,
-57, -57, -57, -57, -57, -57, -57, -57, -57, -57,
- -57, -57, -57, -57, -57, -57, -57, -57, 129, 129,
+ -57, -57, -57, -57, -57, -57, -57, -57, 130, 130,
+ 130, -57, -57, -57, -57, -57, -57, -57, -57, -57,
-57, -57, -57, -57, -57, -57, -57, -57, -57, -57,
-57, -57, -57, -57, -57, -57, -57, -57, -57, -57,
- -57, -57, -57, -57, -57, -57, -57, -57, -57, -57,
- -57, -57, -57, -57, -57, -57, 130, -57, -57, -57,
+ -57, -57, -57, -57, -57, -57, 131, -57, -57, -57,
-57, -57, -57, -57, -57, -57, -57, -57, -57, -57,
-57, -57, -57, -57, -57, -57, -57, -57, -57, -57,
- -57, -57, -57, -57, -57, 131, -57, -57, 132, -57,
+ -57, -57, -57, -57, -57, 132, -57, -57, 133, -57,
-57, -57, -57, -57, -57, -57, -57, -57, -57, -57,
-57, -57, -57, -57, -57, -57, -57, -57, -57, -57,
-57, -57, -57, -57, -57, -57, -57, -57, -57, -57,
@@ -2440,7 +2440,7 @@
-58, -58, -58, -58, -58, -58, -58, -58, -58, -58,
-58, -58, -58, -58, -58, -58, -58, -58, -58, -58,
- -58, -58, -58, -58, -58, -58, -58, -58, 133, 134,
+ -58, -58, -58, -58, -58, -58, -58, -58, 134, 135,
-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,
@@ -2566,7 +2566,7 @@
-62, -62, -62, -62, -62, -62, -62, -62, -62, -62,
-62, -62, -62, -62, -62, -62, -62, -62, -62, -62,
-62, -62, -62, -62, -62, -62, -62, -62, -62, -62,
- -62, -62, -62, 135, -62, 136, -62, -62, -62, -62,
+ -62, -62, -62, 136, -62, 137, -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,
@@ -2603,9 +2603,9 @@
-63, -63, -63, -63, -63, -63, -63, -63, -63, -63,
-63, -63, -63, -63, -63, -63, -63, -63, -63, -63,
-63, -63, -63, -63, -63, -63, -63, -63, -63, -63,
- -63, 137, -63, -63, -63, -63, -63, 138, -63, 139,
- -63, 140, -63, 141, 142, -63, -63, -63, 143, -63,
- 144, 145, -63, -63, -63, -63, -63, 146, -63, -63,
+ -63, 138, -63, -63, -63, -63, -63, 139, -63, 140,
+ -63, 141, -63, 142, 143, -63, -63, -63, 144, -63,
+ 145, 146, -63, -63, -63, -63, -63, 147, -63, -63,
-63, -63, -63, -63, -63, -63, -63, -63, -63, -63,
-63, -63, -63, -63, -63, -63, -63, -63, -63, -63,
@@ -2635,7 +2635,7 @@
-64, -64, -64, -64, -64, -64, -64, -64, -64, -64,
-64, -64, -64, -64, -64, -64, -64, -64, -64, -64,
-64, -64, -64, -64, -64, -64, -64, -64, -64, -64,
- -64, -64, -64, 147, -64, -64, -64, -64, -64, -64,
+ -64, -64, -64, 148, -64, -64, -64, -64, -64, -64,
-64, -64, -64, -64, -64, -64, -64, -64, -64, -64,
-64, -64, -64, -64, -64, -64, -64, -64, -64, -64,
-64, -64, -64, -64, -64, -64, -64, -64, -64, -64,
@@ -2661,12 +2661,12 @@
-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, 148, 148,
- 148, 148, 148, 148, -65, -65, -65, -65, -65, -65,
+ -65, -65, -65, -65, -65, -65, -65, -65, 149, -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, -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,
@@ -2693,7 +2693,8 @@
-66, -66, -66, -66, -66, -66, -66, -66, -66, -66,
-66, -66, -66, -66, -66, -66, -66, -66, -66, -66,
- -66, -66, -66, -66, -66, -66, -66, -66, 149, -66,
+ -66, -66, -66, -66, -66, -66, -66, -66, 150, 150,
+ 150, 150, 150, 150, -66, -66, -66, -66, -66, -66,
-66, -66, -66, -66, -66, -66, -66, -66, -66, -66,
-66, -66, -66, -66, -66, -66, -66, -66, -66, -66,
-66, -66, -66, -66, -66, -66, -66, -66, -66, -66,
@@ -2702,7 +2703,6 @@
-66, -66, -66, -66, -66, -66, -66, -66, -66, -66,
-66, -66, -66, -66, -66, -66, -66, -66, -66, -66,
-66, -66, -66, -66, -66, -66, -66, -66, -66, -66,
- -66, -66, -66, -66, -66, -66, -66, -66, -66, -66,
-66, -66, -66, -66, -66, -66, -66, -66, -66, -66,
-66, -66, -66, -66, -66, -66, -66, -66, -66, -66,
@@ -2724,15 +2724,13 @@
-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, 150, -67, -67, -67, -67, -67, -67,
+ -67, -67, -67, -67, -67, -67, -67, -67, 151, -67,
-67, -67, -67, -67, -67, -67, -67, -67, -67, -67,
-67, -67, -67, -67, -67, -67, -67, -67, -67, -67,
-67, -67, -67, -67, -67, -67, -67, -67, -67, -67,
- -67, -67, -67, -67, -67, -67, 130, -67, -67, -67,
-67, -67, -67, -67, -67, -67, -67, -67, -67, -67,
-67, -67, -67, -67, -67, -67, -67, -67, -67, -67,
- -67, -67, -67, -67, -67, 131, -67, -67, 132, -67,
-67, -67, -67, -67, -67, -67, -67, -67, -67, -67,
-67, -67, -67, -67, -67, -67, -67, -67, -67, -67,
-67, -67, -67, -67, -67, -67, -67, -67, -67, -67,
@@ -2739,6 +2737,8 @@
-67, -67, -67, -67, -67, -67, -67, -67, -67, -67,
-67, -67, -67, -67, -67, -67, -67, -67, -67, -67,
-67, -67, -67, -67, -67, -67, -67, -67, -67, -67,
+ -67, -67, -67, -67, -67, -67, -67, -67, -67, -67,
+ -67, -67, -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,
@@ -2756,14 +2756,14 @@
-68, -68, -68, -68, -68, -68, -68, -68, -68, -68,
-68, -68, -68, -68, -68, -68, -68, -68, -68, -68,
- -68, -68, -68, 150, -68, -68, -68, -68, -68, 151,
- 151, 151, 151, 151, -68, -68, -68, -68, -68, -68,
+ -68, -68, -68, 152, -68, -68, -68, -68, -68, -68,
-68, -68, -68, -68, -68, -68, -68, -68, -68, -68,
-68, -68, -68, -68, -68, -68, -68, -68, -68, -68,
- -68, -68, -68, -68, -68, -68, 130, -68, -68, -68,
- -68, -68, -68, -68, -68, -68, -68, -68, 152, -68,
-68, -68, -68, -68, -68, -68, -68, -68, -68, -68,
- -68, -68, -68, -68, -68, 131, -68, -68, 132, -68,
+ -68, -68, -68, -68, -68, -68, 131, -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, 132, -68, -68, 133, -68,
-68, -68, -68, -68, -68, -68, -68, -68, -68, -68,
-68, -68, -68, -68, -68, -68, -68, -68, -68, -68,
@@ -2787,19 +2787,19 @@
-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, 153, 154,
- -69, -69, -69, -69, -69, -69, -69, -69, -69, -69,
+ -69, -69, -69, 152, -69, -69, -69, -69, -69, 153,
+ 153, 153, 153, 153, -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, 131, -69, -69, -69,
+ -69, -69, -69, -69, -69, -69, -69, -69, 154, -69,
-69, -69, -69, -69, -69, -69, -69, -69, -69, -69,
+ -69, -69, -69, -69, -69, 132, -69, -69, 133, -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, -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,
@@ -2819,12 +2819,12 @@
-70, -70, -70, -70, -70, -70, -70, -70, -70, -70,
-70, -70, -70, -70, -70, -70, -70, -70, -70, -70,
-70, -70, -70, -70, -70, -70, -70, -70, -70, -70,
+ -70, -70, -70, -70, -70, -70, -70, -70, 155, 156,
-70, -70, -70, -70, -70, -70, -70, -70, -70, -70,
-70, -70, -70, -70, -70, -70, -70, -70, -70, -70,
-70, -70, -70, -70, -70, -70, -70, -70, -70, -70,
-70, -70, -70, -70, -70, -70, -70, -70, -70, -70,
-70, -70, -70, -70, -70, -70, -70, -70, -70, -70,
- -70, -70, -70, -70, -70, -70, -70, -70, -70, -70,
-70, -70, -70, -70, -70, -70, -70, -70, -70, -70,
-70, -70, -70, -70, -70, -70, -70, -70, -70, -70,
@@ -2851,8 +2851,6 @@
-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, 155, 156,
- 157, 158, 159, 160, 161, 162, 163, -71, -71, -71,
-71, -71, -71, -71, -71, -71, -71, -71, -71, -71,
-71, -71, -71, -71, -71, -71, -71, -71, -71, -71,
-71, -71, -71, -71, -71, -71, -71, -71, -71, -71,
@@ -2861,6 +2859,8 @@
-71, -71, -71, -71, -71, -71, -71, -71, -71, -71,
-71, -71, -71, -71, -71, -71, -71, -71, -71, -71,
-71, -71, -71, -71, -71, -71, -71, -71, -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, -71, -71, -71, -71, -71, -71,
@@ -2882,10 +2882,10 @@
-72, -72, -72, -72, -72, -72, -72, -72, -72, -72,
-72, -72, -72, -72, -72, -72, -72, -72, -72, -72,
-72, -72, -72, -72, -72, -72, -72, -72, -72, -72,
+ -72, -72, -72, -72, -72, -72, -72, -72, 157, 158,
+ 159, 160, 161, 162, 163, 164, 165, -72, -72, -72,
-72, -72, -72, -72, -72, -72, -72, -72, -72, -72,
-72, -72, -72, -72, -72, -72, -72, -72, -72, -72,
- -72, -72, -72, -72, -72, -72, -72, -72, -72, -72,
- -72, -72, -72, -72, -72, -72, -72, -72, -72, -72,
-72, -72, -72, -72, -72, -72, -72, -72, -72, -72,
-72, -72, -72, -72, -72, -72, -72, -72, -72, -72,
@@ -3040,10 +3040,10 @@
-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, 164, -77, 165, -77, -77, 166, -77,
-77, -77, -77, -77, -77, -77, -77, -77, -77, -77,
-77, -77, -77, -77, -77, -77, -77, -77, -77, -77,
-77, -77, -77, -77, -77, -77, -77, -77, -77, -77,
+ -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,
@@ -3072,6 +3072,7 @@
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
+ -78, -78, -78, 166, -78, 167, -78, -78, 168, -78,
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
@@ -3079,7 +3080,6 @@
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
- -78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
-78, -78, -78, -78, -78, -78, -78, -78, -78, -78,
@@ -3162,101 +3162,38 @@
},
{
- 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,
+ 39, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, -81, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167
+ -81, -81, -81, -81, -81, -81, -81, -81, -81, -81,
+ -81, -81, -81, -81, -81, -81
},
{
- 39, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
-
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
-
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82, -82, -82, -82, -82,
- -82, -82, -82, -82, -82, -82
- },
-
- {
- 39, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
-
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, -83, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
-
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 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
- },
-
- {
39, 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,
@@ -3263,11 +3200,13 @@
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
+ 169, 169, 169, -82, 169, 169, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
- 169, 169, 169, -84, 169, 169, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
@@ -3282,10 +3221,39 @@
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
- 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
- 169, 169, 169, 169, 169, 169, 169, 169, 169, 169,
169, 169, 169, 169, 169, 169
+ },
+ {
+ 39, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83, -83, -83, -83, -83,
+ -83, -83, -83, -83, -83, -83
},
{
@@ -3295,11 +3263,11 @@
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
+
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
- 170, 170, 170, -85, 170, 170, 170, 170, 170, 170,
-
+ 170, 170, 170, -84, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
@@ -3306,11 +3274,11 @@
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
+
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
-
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
@@ -3317,6 +3285,7 @@
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170, 170, 170, 170, 170,
170, 170, 170, 170, 170, 170
+
},
{
@@ -3324,18 +3293,17 @@
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
-
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
- 171, 171, 171, -86, 171, 171, 171, 171, 171, 171,
+ 171, 171, 171, -85, 171, 171, 171, 171, 171, 171,
+
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
-
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
@@ -3342,11 +3310,11 @@
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
+
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
-
171, 171, 171, 171, 171, 171, 171, 171, 171, 171,
171, 171, 171, 171, 171, 171
},
@@ -3356,22 +3324,22 @@
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
+
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
-
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
- 172, 172, 172, -87, 172, 172, 172, 172, 172, 172,
+ 172, 172, 172, -86, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
+
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
-
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
172, 172, 172, 172, 172, 172, 172, 172, 172, 172,
@@ -3378,6 +3346,7 @@
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
},
@@ -3384,8 +3353,6 @@
{
39, 173, 173, 173, 173, 173, 173, 173, 173, 173,
- -88, 173, 173, -88, 173, 173, 173, 173, 173, 173,
-
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
@@ -3393,10 +3360,11 @@
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
+
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
+ 173, 173, 173, -87, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
-
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
@@ -3403,11 +3371,11 @@
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
+
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
-
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
@@ -3415,49 +3383,49 @@
},
{
- 39, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- 174, -89, -89, 174, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
+ 39, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, -88, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89, -89, -89, -89, -89,
- -89, -89, -89, -89, -89, -89
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 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,
+ -89, 175, 175, -89, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
+
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
- 175, 175, 175, -90, 175, 175, 175, 175, 175, 175,
-
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
@@ -3464,11 +3432,11 @@
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
+
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
-
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
@@ -3475,38 +3443,38 @@
175, 175, 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,
+ 39, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ 176, -90, -90, 176, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, -91, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
-
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90, -90, -90, -90, -90,
+ -90, -90, -90, -90, -90, -90
},
{
@@ -3514,22 +3482,22 @@
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
+
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
-
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
- 177, 177, 177, -92, 177, 177, 177, 177, 177, 177,
+ 177, 177, 177, -91, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
+
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
-
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
@@ -3536,6 +3504,7 @@
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
+
177, 177, 177, 177, 177, 177, 177, 177, 177, 177,
177, 177, 177, 177, 177, 177
},
@@ -3543,7 +3512,6 @@
{
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,
@@ -3550,11 +3518,11 @@
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
- 178, 178, 178, -93, 178, 178, 178, 178, 178, 178,
+ 178, 178, 178, -92, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
-
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
@@ -3561,11 +3529,11 @@
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
+
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
-
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
178, 178, 178, 178, 178, 178, 178, 178, 178, 178,
@@ -3573,48 +3541,80 @@
},
{
- 39, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
+ 39, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, -93, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94, -94, -94, -94, -94,
- -94, -94, -94, -94, -94, -94
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 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, -94, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 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, -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, -95, -95, -95,
- -95, -95, -95, -95, -95, -95, 179, -95, 180, 180,
- 180, 180, 180, 180, 180, 180, 180, 180, -95, -95,
-95, -95, -95, -95, -95, -95, -95, -95, -95, -95,
-95, -95, -95, -95, -95, -95, -95, -95, -95, -95,
-95, -95, -95, -95, -95, -95, -95, -95, -95, -95,
-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, -95, -95, -95, -95,
-95, -95, -95, -95, -95, -95, -95, -95, -95, -95,
@@ -3641,8 +3641,8 @@
-96, -96, -96, -96, -96, -96, -96, -96, -96, -96,
-96, -96, -96, -96, -96, -96, -96, -96, -96, -96,
- -96, -96, -96, -96, -96, -96, -96, -96, 181, 181,
- 181, 181, 181, 181, 181, 181, 181, 181, -96, -96,
+ -96, -96, -96, -96, -96, -96, 181, -96, 182, 182,
+ 182, 182, 182, 182, 182, 182, 182, 182, -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,
@@ -3672,13 +3672,12 @@
-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, 182, -97, 180, 180,
- 180, 180, 180, 180, 180, 180, 180, 180, -97, -97,
+ -97, -97, -97, -97, -97, -97, -97, -97, 183, 183,
+ 183, 183, 183, 183, 183, 183, 183, 183, -97, -97,
-97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
-97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
-97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
- -97, -97, -97, 183, -97, -97, -97, -97, -97, -97,
-97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
-97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
-97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
@@ -3687,6 +3686,7 @@
-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, -97, -97, -97, -97,
-97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
-97, -97, -97, -97, -97, -97, -97, -97, -97, -97,
@@ -3704,14 +3704,14 @@
-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, 184, -98, 185, 185,
- 185, 185, 185, 185, 185, 185, 185, 185, -98, -98,
+ -98, -98, -98, -98, -98, -98, 184, -98, 182, 182,
+ 182, 182, 182, 182, 182, 182, 182, 182, -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,
+ -98, -98, -98, 185, -98, -98, -98, -98, -98, -98,
-98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
-98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
- -98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
-98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
-98, -98, -98, -98, -98, -98, -98, -98, -98, -98,
@@ -3735,8 +3735,8 @@
-99, -99, -99, -99, -99, -99, -99, -99, -99, -99,
-99, -99, -99, -99, -99, -99, -99, -99, -99, -99,
-99, -99, -99, -99, -99, -99, -99, -99, -99, -99,
- -99, -99, -99, -99, -99, -99, -99, -99, 186, 186,
- 186, 186, 186, 186, 186, 186, 186, 186, -99, -99,
+ -99, -99, -99, -99, -99, -99, 186, -99, 187, 187,
+ 187, 187, 187, 187, 187, 187, 187, 187, -99, -99,
-99, -99, -99, -99, -99, -99, -99, -99, -99, -99,
-99, -99, -99, -99, -99, -99, -99, -99, -99, -99,
@@ -3767,12 +3767,12 @@
-100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
-100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
-100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
- -100, -100, -100, -100, -100, -100, 187, -100, 185, 185,
- 185, 185, 185, 185, 185, 185, 185, 185, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, 188, 188,
+ 188, 188, 188, 188, 188, 188, 188, 188, -100, -100,
-100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
-100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
-100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
- -100, -100, -100, 188, -100, -100, -100, -100, -100, -100,
+ -100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
-100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
-100, -100, -100, -100, -100, -100, -100, -100, -100, -100,
@@ -3794,97 +3794,65 @@
},
{
- 39, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
+ 39, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, -101,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, -101, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
+ -101, -101, -101, -101, -101, -101, 189, -101, 187, 187,
+ 187, 187, 187, 187, 187, 187, 187, 187, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, 190, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189
+ -101, -101, -101, -101, -101, -101, -101, -101, -101, -101,
+ -101, -101, -101, -101, -101, -101
},
{
- 39, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
-
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, -102, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
-
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190
- },
-
- {
39, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
-
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
+ 191, 191, 191, 191, 191, 191, 191, 191, 191, -102,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
+
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
- 191, 191, 191, -103, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
-
+ 191, 191, 191, -102, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
+
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
-
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
- 191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191
},
@@ -3891,22 +3859,21 @@
{
39, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
+
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
- 192, 192, 192, 192, 192, 192, 192, 192, 192, -104,
-
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 192, -103, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
- 192, 192, 192, -104, 192, 192, 192, 192, 192, 192,
+
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
-
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
@@ -3914,10 +3881,11 @@
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
+
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192
-
},
{
@@ -3927,11 +3895,11 @@
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
+
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
- 193, 193, 193, -105, 193, 193, 193, 193, 193, 193,
-
+ 193, 193, 193, -104, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
@@ -3938,11 +3906,11 @@
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
+
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
-
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
@@ -3949,6 +3917,7 @@
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193, 193, 193, 193, 193,
193, 193, 193, 193, 193, 193
+
},
{
@@ -3956,68 +3925,99 @@
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
-
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
+ 194, 194, 194, 194, 194, 194, 194, 194, 194, -105,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
- 194, 194, 194, -106, 194, 194, 194, 194, 194, 194,
+
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
+ 194, 194, 194, -105, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
-
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
+
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
-
- 194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194
},
{
- 39, -107, -107, -107, -107, -107, -107, -107, -107, 107,
- 107, -107, -107, 107, -107, -107, -107, -107, -107, -107,
- -107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -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, -107,
- -107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
+ 39, 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,
- -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, -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, -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, -107, -107, -107,
- -107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, -106, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
- -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, -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, -107, -107,
- -107, -107, -107, -107, -107, -107, -107, -107, -107, -107,
- -107, -107, -107, -107, -107, -107
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 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
},
{
- 39, -108, -108, -108, -108, -108, -108, -108, -108, -108,
- -108, -108, -108, -108, -108, -108, -108, -108, -108, -108,
+ 39, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, -107, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196
+ },
+
+ {
+ 39, -108, -108, -108, -108, -108, -108, -108, -108, 108,
+ 108, -108, -108, 108, -108, -108, -108, -108, -108, -108,
+
-108, -108, -108, -108, -108, -108, -108, -108, -108, -108,
-108, -108, -108, -108, -108, -108, -108, -108, -108, -108,
-108, -108, -108, -108, -108, -108, -108, -108, -108, -108,
@@ -4082,13 +4082,13 @@
39, -110, -110, -110, -110, -110, -110, -110, -110, -110,
-110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
-110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
- -110, -110, -110, 117, -110, -110, -110, -110, -110, -110,
- -110, -110, -110, -110, -110, -110, -110, 195, 119, -110,
-110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
-110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
-110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
-110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
- -110, 196, -110, -110, -110, -110, -110, -110, -110, -110,
+ -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
+ -110, -110, -110, -110, -110, -110, -110, -110, -110, -110,
+ -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,
@@ -4113,18 +4113,18 @@
39, -111, -111, -111, -111, -111, -111, -111, -111, -111,
-111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
-111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
- -111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
+ -111, -111, -111, 118, -111, -111, -111, -111, -111, -111,
+ -111, -111, -111, -111, -111, -111, -111, 197, 120, -111,
-111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
-111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
-111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
-111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
+ -111, 198, -111, -111, -111, -111, -111, -111, -111, -111,
-111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
-111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
-111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
-111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
- -111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
- -111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
-111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
-111, -111, -111, -111, -111, -111, -111, -111, -111, -111,
@@ -4209,8 +4209,8 @@
-114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
-114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
-114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
- -114, -114, -114, -114, -114, -114, -114, -114, 197, 197,
-114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
+ -114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
-114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
-114, -114, -114, -114, -114, -114, -114, -114, -114, -114,
@@ -4241,12 +4241,12 @@
-115, -115, -115, -115, -115, -115, -115, -115, -115, -115,
-115, -115, -115, -115, -115, -115, -115, -115, -115, -115,
-115, -115, -115, -115, -115, -115, -115, -115, -115, -115,
+ -115, -115, -115, -115, -115, -115, -115, -115, 199, 199,
+ 199, -115, -115, -115, -115, -115, -115, -115, -115, -115,
-115, -115, -115, -115, -115, -115, -115, -115, -115, -115,
-115, -115, -115, -115, -115, -115, -115, -115, -115, -115,
-115, -115, -115, -115, -115, -115, -115, -115, -115, -115,
-115, -115, -115, -115, -115, -115, -115, -115, -115, -115,
- -115, -115, -115, -115, -115, -115, -115, -115, -115, -115,
- -115, -115, -115, -115, -115, -115, -115, -115, -115, -115,
-115, -115, -115, -115, -115, -115, -115, -115, -115, -115,
-115, -115, -115, -115, -115, -115, -115, -115, -115, -115,
@@ -4341,9 +4341,9 @@
-118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
-118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
-118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
- -118, 198, -118, -118, -118, -118, -118, -118, -118, -118,
-118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
-118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
+ -118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
-118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
-118, -118, -118, -118, -118, -118, -118, -118, -118, -118,
@@ -4373,6 +4373,7 @@
-119, -119, -119, -119, -119, -119, -119, -119, -119, -119,
-119, -119, -119, -119, -119, -119, -119, -119, -119, -119,
-119, -119, -119, -119, -119, -119, -119, -119, -119, -119,
+ -119, 200, -119, -119, -119, -119, -119, -119, -119, -119,
-119, -119, -119, -119, -119, -119, -119, -119, -119, -119,
-119, -119, -119, -119, -119, -119, -119, -119, -119, -119,
-119, -119, -119, -119, -119, -119, -119, -119, -119, -119,
@@ -4379,7 +4380,6 @@
-119, -119, -119, -119, -119, -119, -119, -119, -119, -119,
-119, -119, -119, -119, -119, -119, -119, -119, -119, -119,
-119, -119, -119, -119, -119, -119, -119, -119, -119, -119,
- -119, -119, -119, -119, -119, -119, -119, -119, -119, -119,
-119, -119, -119, -119, -119, -119, -119, -119, -119, -119,
-119, -119, -119, -119, -119, -119, -119, -119, -119, -119,
@@ -4501,7 +4501,7 @@
-123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
-123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
-123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
- 199, -123, -123, -123, -123, -123, -123, -123, -123, -123,
+ -123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
-123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
-123, -123, -123, -123, -123, -123, -123, -123, -123, -123,
@@ -4532,8 +4532,8 @@
-124, -124, -124, -124, -124, -124, -124, -124, -124, -124,
-124, -124, -124, -124, -124, -124, -124, -124, -124, -124,
-124, -124, -124, -124, -124, -124, -124, -124, -124, -124,
- -124, -124, -124, -124, -124, -124, -124, -124, 200, -124,
-124, -124, -124, -124, -124, -124, -124, -124, -124, -124,
+ 201, -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,
@@ -4557,13 +4557,14 @@
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
- -125, -125, -125, -125, -125, -125, -125, -125, 201, 201,
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
+ -125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
+ -125, -125, -125, -125, -125, -125, -125, -125, 202, -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,
@@ -4573,7 +4574,6 @@
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
- -125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
-125, -125, -125, -125, -125, -125, -125, -125, -125, -125,
@@ -4589,6 +4589,8 @@
-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, 203, 203,
+ 203, -126, -126, -126, -126, -126, -126, -126, -126, -126,
-126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
-126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
-126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
@@ -4597,8 +4599,6 @@
-126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
-126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
-126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
- -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
- -126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
-126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
-126, -126, -126, -126, -126, -126, -126, -126, -126, -126,
@@ -4652,14 +4652,14 @@
-128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
-128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
- -128, -128, -128, -128, -128, -128, -128, -128, -128, 202,
- 202, 202, 202, 202, -128, -128, -128, -128, -128, -128,
-128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
-128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
-128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
- -128, -128, -128, -128, -128, -128, -128, -128, 203, -128,
-128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
-128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
+ -128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
+ -128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
+ -128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
-128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
-128, -128, -128, -128, -128, -128, -128, -128, -128, -128,
@@ -4683,12 +4683,13 @@
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
- -129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
- -129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
+ -129, -129, -129, -129, -129, -129, -129, -129, -129, 204,
+ 204, 204, 204, 204, -129, -129, -129, -129, -129, -129,
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
+ -129, -129, -129, -129, -129, -129, -129, -129, 205, -129,
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
@@ -4695,7 +4696,6 @@
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
- -129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
-129, -129, -129, -129, -129, -129, -129, -129, -129, -129,
@@ -4719,8 +4719,8 @@
-130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
-130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
-130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
- -130, -130, -130, -130, -130, -130, 204, -130, -130, -130,
-130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
+ -130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
-130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
-130, -130, -130, -130, -130, -130, -130, -130, -130, -130,
@@ -4751,10 +4751,10 @@
-131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
-131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
-131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
+ -131, -131, -131, -131, -131, -131, 206, -131, -131, -131,
-131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
-131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
-131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
- -131, -131, -131, -131, -131, 205, -131, -131, -131, -131,
-131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
-131, -131, -131, -131, -131, -131, -131, -131, -131, -131,
@@ -4786,7 +4786,7 @@
-132, -132, -132, -132, -132, -132, -132, -132, -132, -132,
-132, -132, -132, -132, -132, -132, -132, -132, -132, -132,
-132, -132, -132, -132, -132, -132, -132, -132, -132, -132,
- -132, -132, -132, -132, -132, -132, -132, -132, 206, -132,
+ -132, -132, -132, -132, -132, 207, -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,
@@ -4817,7 +4817,7 @@
-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, -133,
+ -133, -133, -133, -133, -133, -133, -133, -133, 208, -133,
-133, -133, -133, -133, -133, -133, -133, -133, -133, -133,
-133, -133, -133, -133, -133, -133, -133, -133, -133, -133,
@@ -4974,8 +4974,8 @@
-138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
-138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
-138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
- -138, -138, -138, -138, -138, -138, -138, -138, 207, -138,
-138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
+ -138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
-138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
-138, -138, -138, -138, -138, -138, -138, -138, -138, -138,
@@ -5006,8 +5006,8 @@
-139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
-139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
-139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
+ -139, -139, -139, -139, -139, -139, -139, -139, 209, -139,
-139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
- 208, -139, -139, -139, -139, 209, -139, -139, -139, -139,
-139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
-139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
-139, -139, -139, -139, -139, -139, -139, -139, -139, -139,
@@ -5038,9 +5038,8 @@
-140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
-140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
- -140, -140, -140, -140, -140, -140, -140, -140, -140, 210,
- -140, -140, -140, -140, -140, -140, -140, -140, 211, -140,
-140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
+ 210, -140, -140, -140, -140, 211, -140, -140, -140, -140,
-140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
-140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
-140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
@@ -5048,6 +5047,7 @@
-140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
-140, -140, -140, -140, -140, -140, -140, -140, -140, -140,
-140, -140, -140, -140, -140, -140, -140, -140, -140, -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,
@@ -5101,7 +5101,8 @@
-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, 214, -142,
+ -142, -142, -142, -142, -142, -142, -142, -142, -142, 214,
+ -142, -142, -142, -142, -142, -142, -142, -142, 215, -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,
@@ -5108,7 +5109,6 @@
-142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
-142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
-142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
- -142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
-142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
-142, -142, -142, -142, -142, -142, -142, -142, -142, -142,
@@ -5132,7 +5132,7 @@
-143, -143, -143, -143, -143, -143, -143, -143, -143, -143,
-143, -143, -143, -143, -143, -143, -143, -143, -143, -143,
-143, -143, -143, -143, -143, -143, -143, -143, -143, -143,
- -143, -143, -143, -143, -143, -143, -143, -143, 215, -143,
+ -143, -143, -143, -143, -143, -143, -143, -143, 216, -143,
-143, -143, -143, -143, -143, -143, -143, -143, -143, -143,
-143, -143, -143, -143, -143, -143, -143, -143, -143, -143,
@@ -5164,12 +5164,12 @@
-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, 216,
- -144, 217, -144, -144, -144, -144, -144, -144, 218, -144,
+ -144, -144, -144, -144, -144, -144, -144, -144, 217, -144,
-144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
-144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
-144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
-144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
+ -144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
-144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
-144, -144, -144, -144, -144, -144, -144, -144, -144, -144,
@@ -5194,10 +5194,10 @@
-145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
-145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
-145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
- -145, -145, -145, -145, -145, -145, -145, -145, 219, 220,
+ -145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
- -145, -145, -145, -145, 221, -145, -145, -145, 222, -145,
- -145, -145, -145, -145, -145, 223, -145, -145, -145, -145,
+ -145, -145, -145, -145, -145, -145, -145, -145, -145, 218,
+ -145, 219, -145, -145, -145, -145, -145, -145, 220, -145,
-145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
-145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
-145, -145, -145, -145, -145, -145, -145, -145, -145, -145,
@@ -5226,9 +5226,9 @@
-146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
-146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
-146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
- -146, -146, -146, -146, -146, -146, -146, -146, 224, -146,
- -146, -146, -146, -146, 221, -146, -146, -146, 225, -146,
- -146, -146, -146, -146, -146, 223, -146, -146, -146, -146,
+ -146, -146, -146, -146, -146, -146, -146, -146, 221, 222,
+ -146, -146, -146, -146, 223, -146, -146, -146, 224, -146,
+ -146, -146, -146, -146, -146, 225, -146, -146, -146, -146,
-146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
-146, -146, -146, -146, -146, -146, -146, -146, -146, -146,
@@ -5258,6 +5258,9 @@
-147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
-147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
+ -147, -147, -147, -147, -147, -147, -147, -147, 226, -147,
+ -147, -147, -147, -147, 223, -147, -147, -147, 227, -147,
+ -147, -147, -147, -147, -147, 225, -147, -147, -147, -147,
-147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
-147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
-147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
@@ -5264,9 +5267,6 @@
-147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
-147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
-147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
- -147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
- -147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
- -147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
-147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
-147, -147, -147, -147, -147, -147, -147, -147, -147, -147,
@@ -5284,8 +5284,6 @@
-148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
-148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
- -148, -148, -148, -148, -148, -148, -148, -148, 148, 148,
- 148, 148, 148, 148, -148, -148, -148, -148, -148, -148,
-148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
-148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
-148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
@@ -5292,6 +5290,8 @@
-148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
-148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
-148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
+ -148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
+ -148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
-148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
-148, -148, -148, -148, -148, -148, -148, -148, -148, -148,
@@ -5347,12 +5347,12 @@
-150, -150, -150, -150, -150, -150, -150, -150, -150, -150,
-150, -150, -150, -150, -150, -150, -150, -150, -150, -150,
-150, -150, -150, -150, -150, -150, -150, -150, -150, -150,
+ -150, -150, -150, -150, -150, -150, -150, -150, 150, 150,
+ 150, 150, 150, 150, -150, -150, -150, -150, -150, -150,
-150, -150, -150, -150, -150, -150, -150, -150, -150, -150,
-150, -150, -150, -150, -150, -150, -150, -150, -150, -150,
-150, -150, -150, -150, -150, -150, -150, -150, -150, -150,
-150, -150, -150, -150, -150, -150, -150, -150, -150, -150,
- -150, -150, -150, -150, -150, -150, -150, -150, -150, -150,
- -150, -150, -150, -150, -150, -150, -150, -150, -150, -150,
-150, -150, -150, -150, -150, -150, -150, -150, -150, -150,
-150, -150, -150, -150, -150, -150, -150, -150, -150, -150,
@@ -5410,10 +5410,10 @@
-152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
-152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
-152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
- -152, -152, -152, -152, -152, -152, -152, -152, -152, 226,
- 226, 226, 226, 226, -152, -152, -152, -152, -152, -152,
-152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
-152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
+ -152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
+ -152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
-152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
-152, -152, -152, -152, -152, -152, -152, -152, -152, -152,
@@ -5473,8 +5473,8 @@
-154, -154, -154, -154, -154, -154, -154, -154, -154, -154,
-154, -154, -154, -154, -154, -154, -154, -154, -154, -154,
-154, -154, -154, -154, -154, -154, -154, -154, -154, -154,
- -154, -154, -154, -154, -154, -154, -154, -154, -154, -154,
- -154, -154, -154, -154, -154, -154, -154, -154, -154, -154,
+ -154, -154, -154, -154, -154, -154, -154, -154, -154, 228,
+ 228, 228, 228, 228, -154, -154, -154, -154, -154, -154,
-154, -154, -154, -154, -154, -154, -154, -154, -154, -154,
-154, -154, -154, -154, -154, -154, -154, -154, -154, -154,
@@ -5880,66 +5880,66 @@
},
{
- 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,
+ 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, -167, -167, -167, -167,
+ -167, -167, -167, -167, -167, -167, -167, -167, -167, -167,
+ -167, -167, -167, -167, -167, -167, -167, -167, -167, -167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167, 167, 167, 167, 167,
- 167, 167, 167, 167, 167, 167
+ -167, -167, -167, -167, -167, -167, -167, -167, -167, -167,
+ -167, -167, -167, -167, -167, -167, -167, -167, -167, -167,
+ -167, -167, -167, -167, -167, -167, -167, -167, -167, -167,
+ -167, -167, -167, -167, -167, -167, -167, -167, -167, -167,
+ -167, -167, -167, -167, -167, -167, -167, -167, -167, -167,
+ -167, -167, -167, -167, -167, -167, -167, -167, -167, -167,
+ -167, -167, -167, -167, -167, -167, -167, -167, -167, -167,
+ -167, -167, -167, -167, -167, -167
},
{
- 39, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
+ 39, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, -168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
+ -168, -168, -168, -168, -168, -168, -168, -168, -168, -168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168, 168, 168, 168, 168,
- 168, 168, 168, 168, 168, 168
+ -168, -168, -168, -168, -168, -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
},
{
@@ -6070,7 +6070,7 @@
{
39, 173, 173, 173, 173, 173, 173, 173, 173, 173,
- -173, 173, 173, -173, 173, 173, 173, 173, 173, 173,
+ 173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
@@ -6079,9 +6079,9 @@
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
+ 173, 173, 173, -173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
- 173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
173, 173, 173, 173, 173, 173, 173, 173, 173, 173,
@@ -6101,39 +6101,40 @@
},
{
- 39, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- 174, -174, -174, 174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+ 39, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, -174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174, -174, -174, -174, -174,
- -174, -174, -174, -174, -174, -174
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174, 174, 174, 174, 174,
+ 174, 174, 174, 174, 174, 174
},
{
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,
@@ -6142,7 +6143,6 @@
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
- 175, 175, 175, -175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
175, 175, 175, 175, 175, 175, 175, 175, 175, 175,
@@ -6164,35 +6164,35 @@
},
{
- 39, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
+ 39, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ 176, -176, -176, 176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, -176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
- 176, 176, 176, 176, 176, 176, 176, 176, 176, 176,
- 176, 176, 176, 176, 176, 176
+ -176, -176, -176, -176, -176, -176, -176, -176, -176, -176,
+ -176, -176, -176, -176, -176, -176
},
{
@@ -6259,66 +6259,66 @@
},
{
- 39, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, 181, 181,
- 181, 181, 181, 181, 181, 181, 181, 181, -179, -179,
+ 39, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, -179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179, -179, -179, -179, -179,
- -179, -179, -179, -179, -179, -179
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 179, 179, 179, 179, 179, 179, 179, 179,
+ 179, 179, 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, 182, -180, 180, 180,
- 180, 180, 180, 180, 180, 180, 180, 180, -180, -180,
- -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
- -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
- -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
- -180, -180, -180, 183, -180, -180, -180, -180, -180, -180,
+ 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, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
- -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
- -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
- -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
- -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
- -180, -180, -180, -180, -180, -180, -180, -180, -180, -180,
- -180, -180, -180, -180, -180, -180
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180, 180, 180, 180, 180,
+ 180, 180, 180, 180, 180, 180
},
{
@@ -6327,16 +6327,16 @@
-181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
-181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
- -181, -181, -181, -181, -181, -181, -181, -181, 181, 181,
- 181, 181, 181, 181, 181, 181, 181, 181, -181, -181,
+ -181, -181, -181, -181, -181, -181, -181, -181, 183, 183,
+ 183, 183, 183, 183, 183, 183, 183, 183, -181, -181,
-181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
-181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
-181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
- -181, -181, -181, 183, -181, -181, -181, -181, -181, -181,
-181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
-181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
-181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
-181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
+ -181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
-181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
-181, -181, -181, -181, -181, -181, -181, -181, -181, -181,
@@ -6358,13 +6358,13 @@
-182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
-182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
-182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
- -182, -182, -182, -182, -182, -182, -182, -182, 227, 227,
- 227, 227, 227, 227, 227, 227, 227, 227, -182, -182,
+ -182, -182, -182, -182, -182, -182, 184, -182, 182, 182,
+ 182, 182, 182, 182, 182, 182, 182, 182, -182, -182,
-182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
-182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
-182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
- -182, -182, -182, 183, -182, -182, -182, -182, -182, -182,
+ -182, -182, -182, 185, -182, -182, -182, -182, -182, -182,
-182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
-182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
-182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
@@ -6390,14 +6390,14 @@
-183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
-183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
+ -183, -183, -183, -183, -183, -183, -183, -183, 183, 183,
+ 183, 183, 183, 183, 183, 183, 183, 183, -183, -183,
-183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
-183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
-183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
+ -183, -183, -183, 185, -183, -183, -183, -183, -183, -183,
-183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
-183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
- -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
- -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
- -183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
-183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
-183, -183, -183, -183, -183, -183, -183, -183, -183, -183,
@@ -6421,12 +6421,13 @@
-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, 186, 186,
- 186, 186, 186, 186, 186, 186, 186, 186, -184, -184,
+ -184, -184, -184, -184, -184, -184, -184, -184, 229, 229,
+ 229, 229, 229, 229, 229, 229, 229, 229, -184, -184,
-184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
-184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
-184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
+ -184, -184, -184, 185, -184, -184, -184, -184, -184, -184,
-184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
-184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
-184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
@@ -6433,7 +6434,6 @@
-184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
-184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
-184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
- -184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
-184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
-184, -184, -184, -184, -184, -184, -184, -184, -184, -184,
@@ -6453,12 +6453,12 @@
-185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
-185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
-185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
- -185, -185, -185, -185, -185, -185, 187, -185, 185, 185,
- 185, 185, 185, 185, 185, 185, 185, 185, -185, -185,
-185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
-185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
-185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
- -185, -185, -185, 188, -185, -185, -185, -185, -185, -185,
+ -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
+ -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
+ -185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
-185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
-185, -185, -185, -185, -185, -185, -185, -185, -185, -185,
@@ -6485,16 +6485,16 @@
-186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
-186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
- -186, -186, -186, -186, -186, -186, -186, -186, 186, 186,
- 186, 186, 186, 186, 186, 186, 186, 186, -186, -186,
+ -186, -186, -186, -186, -186, -186, -186, -186, 188, 188,
+ 188, 188, 188, 188, 188, 188, 188, 188, -186, -186,
-186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
-186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
-186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
- -186, -186, -186, 188, -186, -186, -186, -186, -186, -186,
-186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
-186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
-186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
-186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
+ -186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
-186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
-186, -186, -186, -186, -186, -186, -186, -186, -186, -186,
@@ -6516,13 +6516,13 @@
-187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
-187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
-187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
- -187, -187, -187, -187, -187, -187, -187, -187, 228, 228,
- 228, 228, 228, 228, 228, 228, 228, 228, -187, -187,
+ -187, -187, -187, -187, -187, -187, 189, -187, 187, 187,
+ 187, 187, 187, 187, 187, 187, 187, 187, -187, -187,
-187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
-187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
-187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
- -187, -187, -187, 188, -187, -187, -187, -187, -187, -187,
+ -187, -187, -187, 190, -187, -187, -187, -187, -187, -187,
-187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
-187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
-187, -187, -187, -187, -187, -187, -187, -187, -187, -187,
@@ -6548,14 +6548,14 @@
-188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
-188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+ -188, -188, -188, -188, -188, -188, -188, -188, 188, 188,
+ 188, 188, 188, 188, 188, 188, 188, 188, -188, -188,
-188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
-188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
-188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+ -188, -188, -188, 190, -188, -188, -188, -188, -188, -188,
-188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
-188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
- -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
- -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
- -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
-188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
-188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
@@ -6575,66 +6575,66 @@
},
{
- 39, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, -189,
+ 39, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, 230, 230,
+ 230, 230, 230, 230, 230, 230, 230, 230, -189, -189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, -189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, 190, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189, 189, 189, 189, 189,
- 189, 189, 189, 189, 189, 189
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189, -189, -189, -189, -189,
+ -189, -189, -189, -189, -189, -189
},
{
- 39, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, -190, 190, 190, 190, 190, 190, 190,
+ 39, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190, 190, 190, 190, 190,
- 190, 190, 190, 190, 190, 190
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190, -190, -190, -190, -190,
+ -190, -190, -190, -190, -190, -190
},
{
@@ -6644,15 +6644,15 @@
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
+ 191, 191, 191, 191, 191, 191, 191, 191, 191, -191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
- 191, 191, 191, -191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
+ 191, 191, 191, -191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
- 191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
191, 191, 191, 191, 191, 191, 191, 191, 191, 191,
@@ -6675,15 +6675,15 @@
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
- 192, 192, 192, 192, 192, 192, 192, 192, 192, -192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
+ 192, 192, 192, -192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
- 192, 192, 192, -192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
192, 192, 192, 192, 192, 192, 192, 192, 192, 192,
@@ -6738,15 +6738,15 @@
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
- 194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
+ 194, 194, 194, 194, 194, 194, 194, 194, 194, -194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
- 194, 194, 194, -194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
+ 194, 194, 194, -194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
194, 194, 194, 194, 194, 194, 194, 194, 194, 194,
@@ -6765,66 +6765,66 @@
},
{
- 39, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, 229, -195, -195, -195, -195, -195, -195, -195, -195,
+ 39, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, -195, 195, 195, 195, 195, 195, 195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195, -195, -195, -195, -195,
- -195, -195, -195, -195, -195, -195
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195, 195, 195, 195, 195,
+ 195, 195, 195, 195, 195, 195
},
{
- 39, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
+ 39, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, -196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
- -196, -196, -196, -196, -196, -196, -196, -196, -196, -196,
- -196, -196, -196, -196, -196, -196
+ 196, 196, 196, 196, 196, 196, 196, 196, 196, 196,
+ 196, 196, 196, 196, 196, 196
},
{
@@ -6838,6 +6838,7 @@
-197, -197, -197, -197, -197, -197, -197, -197, -197, -197,
-197, -197, -197, -197, -197, -197, -197, -197, -197, -197,
+ -197, 231, -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,
@@ -6846,7 +6847,6 @@
-197, -197, -197, -197, -197, -197, -197, -197, -197, -197,
-197, -197, -197, -197, -197, -197, -197, -197, -197, -197,
-197, -197, -197, -197, -197, -197, -197, -197, -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,
@@ -6902,12 +6902,12 @@
-199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
-199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
-199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
- -199, -199, -199, -199, -199, -199, -199, -199, 230, -199,
-199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
-199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
-199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
-199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
-199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
+ -199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
-199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
-199, -199, -199, -199, -199, -199, -199, -199, -199, -199,
@@ -6932,7 +6932,7 @@
-200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
-200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
-200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
- -200, -200, -200, -200, -200, -200, -200, -200, 231, -200,
+ -200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
-200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
-200, -200, -200, -200, -200, -200, -200, -200, -200, -200,
@@ -6965,10 +6965,10 @@
-201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
-201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
-201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
+ -201, -201, -201, -201, -201, -201, -201, -201, 232, -201,
-201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
-201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
-201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
- -201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
-201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
-201, -201, -201, -201, -201, -201, -201, -201, -201, -201,
@@ -6996,6 +6996,7 @@
-202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
-202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
+ -202, -202, -202, -202, -202, -202, -202, -202, 233, -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,
@@ -7004,7 +7005,6 @@
-202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
-202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
-202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
- -202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
-202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
-202, -202, -202, -202, -202, -202, -202, -202, -202, -202,
@@ -7022,8 +7022,6 @@
-203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
-203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
- -203, -203, -203, -203, -203, -203, -203, -203, -203, 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,
@@ -7030,6 +7028,8 @@
-203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
-203, -203, -203, -203, -203, -203, -203, -203, -203, -203,
-203, -203, -203, -203, -203, -203, -203, -203, -203, -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,
@@ -7058,7 +7058,6 @@
-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,
@@ -7066,6 +7065,7 @@
-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, -204,
-204, -204, -204, -204, -204, -204, -204, -204, -204, -204,
@@ -7085,15 +7085,14 @@
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
+ -205, -205, -205, -205, -205, -205, -205, -205, -205, 234,
+ 234, 234, 234, 234, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
- 234, -205, 234, -205, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
- -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
- -205, -205, -205, -205, -205, 235, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
@@ -7102,6 +7101,7 @@
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
+ -205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
-205, -205, -205, -205, -205, -205, -205, -205, -205, -205,
@@ -7121,10 +7121,10 @@
-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, 236, -206,
-206, -206, -206, -206, -206, -206, -206, -206, -206, -206,
-206, -206, -206, -206, -206, -206, -206, -206, -206, -206,
@@ -7150,13 +7150,13 @@
-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, 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, -207, -207, -207, -207, -207, -207, -207, -207,
- -207, -207, -207, -207, -207, -207, 237, -207, -207, -207,
+ -207, -207, -207, -207, -207, 237, -207, -207, -207, -207,
-207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
-207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
-207, -207, -207, -207, -207, -207, -207, -207, -207, -207,
@@ -7181,7 +7181,6 @@
-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, 238, -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,
@@ -7188,6 +7187,7 @@
-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, 238, -208,
-208, -208, -208, -208, -208, -208, -208, -208, -208, -208,
-208, -208, -208, -208, -208, -208, -208, -208, -208, -208,
@@ -7212,7 +7212,7 @@
-209, -209, -209, -209, -209, -209, -209, -209, -209, -209,
-209, -209, -209, -209, -209, -209, -209, -209, -209, -209,
-209, -209, -209, -209, -209, -209, -209, -209, -209, -209,
- -209, -209, -209, -209, -209, -209, -209, -209, 239, -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,
@@ -7219,11 +7219,11 @@
-209, -209, -209, -209, -209, -209, -209, -209, -209, -209,
-209, -209, -209, -209, -209, -209, -209, -209, -209, -209,
-209, -209, -209, -209, -209, -209, -209, -209, -209, -209,
+ -209, -209, -209, -209, -209, -209, 239, -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,
@@ -7243,12 +7243,12 @@
-210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
-210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
-210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
- -210, -210, -210, -210, -210, -210, -210, -210, -210, 240,
- 240, 240, 240, 240, 240, 240, 240, 240, -210, -210,
-210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
+ -210, -210, -210, -210, -210, -210, -210, -210, 240, -210,
-210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
-210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
-210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
+ -210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
-210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
-210, -210, -210, -210, -210, -210, -210, -210, -210, -210,
@@ -7369,8 +7369,8 @@
-214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
-214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
-214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
- -214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
- -214, -214, -214, -214, -214, -214, -214, -214, 244, -214,
+ -214, -214, -214, -214, -214, -214, -214, -214, -214, 244,
+ 244, 244, 244, 244, 244, 244, 244, 244, -214, -214,
-214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
-214, -214, -214, -214, -214, -214, -214, -214, -214, -214,
@@ -7433,9 +7433,8 @@
-216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
-216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
- -216, -216, -216, -216, -216, -216, -216, -216, -216, 246,
- 246, 246, 246, 246, 246, 246, 246, 246, -216, -216,
-216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
+ -216, -216, -216, -216, -216, -216, -216, -216, 246, -216,
-216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
-216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
-216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
@@ -7443,6 +7442,7 @@
-216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
-216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
-216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
+ -216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
-216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
-216, -216, -216, -216, -216, -216, -216, -216, -216, -216,
@@ -7465,12 +7465,11 @@
-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, 247, -217,
-217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
-217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
- -217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
-217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
- -217, -217, -217, -217, -217, -217, -217, -217, -217, 247,
-217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
-217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
-217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
@@ -7479,6 +7478,7 @@
-217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
-217, -217, -217, -217, -217, -217, -217, -217, -217, -217,
-217, -217, -217, -217, -217, -217, -217, -217, -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,
@@ -7496,14 +7496,14 @@
-218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
-218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
+ -218, -218, -218, -218, -218, -218, -218, -218, -218, 248,
+ 248, 248, 248, 248, 248, 248, 248, 248, -218, -218,
-218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
- -218, -218, -218, -218, -218, -218, -218, -218, 248, -218,
-218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
-218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
-218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
-218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
-218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
- -218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
-218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
-218, -218, -218, -218, -218, -218, -218, -218, -218, -218,
@@ -7528,11 +7528,12 @@
-219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
-219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
-219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
- -219, -219, -219, -219, -219, -219, -219, -219, 249, -219,
+ -219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
-219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
-219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
-219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
+ -219, -219, -219, -219, -219, -219, -219, -219, -219, 249,
-219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
-219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
-219, -219, -219, -219, -219, -219, -219, -219, -219, -219,
@@ -7539,7 +7540,6 @@
-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,
@@ -7560,11 +7560,11 @@
-220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
-220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
-220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
+ -220, -220, -220, -220, -220, -220, -220, -220, 250, -220,
-220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
-220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
-220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
-220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
- -220, -220, -220, -220, -220, -220, -220, -220, 250, -220,
-220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
-220, -220, -220, -220, -220, -220, -220, -220, -220, -220,
@@ -7599,8 +7599,8 @@
-221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
-221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
-221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
- -221, -221, -221, 252, -221, 253, -221, -221, -221, -221,
-221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
+ -221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
-221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
-221, -221, -221, -221, -221, -221, -221, -221, -221, -221,
@@ -7628,8 +7628,8 @@
-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, 252, -222,
-222, -222, -222, -222, -222, -222, -222, -222, -222, -222,
- -222, -222, -222, -222, -222, -222, -222, -222, 254, -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,
@@ -7655,14 +7655,15 @@
-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, 253, -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, 255, -223,
-223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
+ -223, -223, -223, 254, -223, 255, -223, -223, -223, -223,
-223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
-223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
-223, -223, -223, -223, -223, -223, -223, -223, -223, -223,
@@ -7672,7 +7673,6 @@
-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,
@@ -7686,18 +7686,18 @@
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
- -224, -224, -224, -224, -224, -224, -224, -224, 256, -224,
+ -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
+ -224, -224, -224, -224, -224, -224, -224, -224, 256, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
- -224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
-224, -224, -224, -224, -224, -224, -224, -224, -224, -224,
@@ -7750,6 +7750,7 @@
-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, 258, -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,
@@ -7758,7 +7759,6 @@
-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, -226, -226, -226, -226, -226, -226, -226,
@@ -7780,14 +7780,14 @@
-227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
-227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
-227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
- -227, -227, -227, -227, -227, -227, -227, -227, 227, 227,
- 227, 227, 227, 227, 227, 227, 227, 227, -227, -227,
-227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
-227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
+ -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
+ -227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
-227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
- -227, -227, -227, 183, -227, -227, -227, -227, -227, -227,
-227, -227, -227, -227, -227, -227, -227, -227, -227, -227,
+ -227, -227, -227, -227, -227, -227, -227, -227, 259, -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,
@@ -7812,14 +7812,14 @@
-228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
-228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
- -228, -228, -228, -228, -228, -228, -228, -228, 228, 228,
- 228, 228, 228, 228, 228, 228, 228, 228, -228, -228,
-228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
-228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
-228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
- -228, -228, -228, 188, -228, -228, -228, -228, -228, -228,
-228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
-228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
+ -228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
+ -228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
+ -228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
-228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
-228, -228, -228, -228, -228, -228, -228, -228, -228, -228,
@@ -7843,12 +7843,13 @@
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
- -229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
- -229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
+ -229, -229, -229, -229, -229, -229, -229, -229, 229, 229,
+ 229, 229, 229, 229, 229, 229, 229, 229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
+ -229, -229, -229, 185, -229, -229, -229, -229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
@@ -7855,7 +7856,6 @@
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
- -229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
-229, -229, -229, -229, -229, -229, -229, -229, -229, -229,
@@ -7875,12 +7875,12 @@
-230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
-230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
-230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
+ -230, -230, -230, -230, -230, -230, -230, -230, 230, 230,
+ 230, 230, 230, 230, 230, 230, 230, 230, -230, -230,
-230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
-230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
-230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
- -230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
- -230, -230, -230, -230, -230, -230, -230, -230, -230, -230,
- -230, -230, -230, -230, -230, -230, -230, -230, 258, -230,
+ -230, -230, -230, 190, -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,
@@ -7912,11 +7912,11 @@
-231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
-231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
-231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
- -231, -231, -231, -231, -231, -231, -231, 259, -231, -231,
-231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
-231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
-231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
-231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
+ -231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
-231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
-231, -231, -231, -231, -231, -231, -231, -231, -231, -231,
@@ -7944,6 +7944,7 @@
-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, 260, -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,
@@ -7952,7 +7953,6 @@
-232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
-232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
-232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
- -232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
-232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
-232, -232, -232, -232, -232, -232, -232, -232, -232, -232,
@@ -7975,9 +7975,9 @@
-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, 261, -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, -233, -233, -233, -233, -233,
-233, -233, -233, -233, -233, -233, -233, -233, -233, -233,
@@ -8035,10 +8035,10 @@
-235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
-235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
-235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
- 260, -235, 260, -235, -235, -235, -235, -235, -235, -235,
-235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
-235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
-235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
+ -235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
-235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
-235, -235, -235, -235, -235, -235, -235, -235, -235, -235,
@@ -8097,13 +8097,12 @@
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
- -237, -237, -237, -237, -237, -237, -237, -237, 261, -237,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
+ 262, -237, 262, -237, -237, -237, -237, -237, -237, -237,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
- -237, -237, -237, -237, -237, -237, -237, -237, -237, 262,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
@@ -8111,6 +8110,7 @@
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
+ -237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
-237, -237, -237, -237, -237, -237, -237, -237, -237, -237,
@@ -8160,18 +8160,18 @@
-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,
-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, 264,
-239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
-239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
-239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
-239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
-239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
- -239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
-239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
-239, -239, -239, -239, -239, -239, -239, -239, -239, -239,
@@ -8196,7 +8196,7 @@
-240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
-240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
-240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
- -240, -240, -240, 263, -240, -240, -240, -240, -240, -240,
+ -240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
-240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
-240, -240, -240, -240, -240, -240, -240, -240, -240, -240,
@@ -8260,7 +8260,7 @@
-242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
-242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
- -242, -242, -242, 264, -242, -242, -242, -242, -242, -242,
+ -242, -242, -242, 265, -242, -242, -242, -242, -242, -242,
-242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
-242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
-242, -242, -242, -242, -242, -242, -242, -242, -242, -242,
@@ -8317,12 +8317,13 @@
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
- -244, -244, -244, -244, -244, -244, -244, -244, 265, 266,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
+ -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
+ -244, -244, -244, 266, -244, -244, -244, -244, -244, -244,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
@@ -8329,7 +8330,6 @@
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
- -244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
-244, -244, -244, -244, -244, -244, -244, -244, -244, -244,
@@ -8349,12 +8349,12 @@
-245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
-245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
-245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
- -245, -245, -245, -245, -245, -245, -245, -245, 267, 268,
-245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
-245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
-245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
-245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
-245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
+ -245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
-245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
-245, -245, -245, -245, -245, -245, -245, -245, -245, -245,
@@ -8381,12 +8381,12 @@
-246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
-246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
+ -246, -246, -246, -246, -246, -246, -246, -246, 267, 268,
-246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
-246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
-246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
-246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
-246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
- -246, -246, -246, 269, -246, -246, -246, -246, -246, -246,
-246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
-246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
-246, -246, -246, -246, -246, -246, -246, -246, -246, -246,
@@ -8412,15 +8412,14 @@
-247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
-247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
-247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
+ -247, -247, -247, -247, -247, -247, -247, -247, 269, 270,
-247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
-247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
-247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
- -247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
-247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
-247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
-247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
- -247, -247, -247, -247, -247, -247, -247, 270, -247, -247,
-247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
-247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
-247, -247, -247, -247, -247, -247, -247, -247, -247, -247,
@@ -8427,6 +8426,7 @@
-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, -247,
@@ -8449,9 +8449,9 @@
-248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
-248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
-248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
+ -248, -248, -248, 271, -248, -248, -248, -248, -248, -248,
-248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
-248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
- -248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
-248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
-248, -248, -248, -248, -248, -248, -248, -248, -248, -248,
@@ -8475,8 +8475,8 @@
-249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
-249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
-249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
- -249, -249, -249, -249, -249, -249, -249, -249, 271, 271,
-249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
+ -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
-249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
-249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
@@ -8483,11 +8483,11 @@
-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, 272, -249, -249,
-249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
-249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
-249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
-249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
- -249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
-249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
-249, -249, -249, -249, -249, -249, -249, -249, -249, -249,
@@ -8508,11 +8508,11 @@
-250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
-250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
-250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
- -250, -250, -250, -250, -250, -250, -250, -250, 272, -250,
-250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
-250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
-250, -250, -250, -250, -250, -250, -250, -250, -250, -250,
- -250, -250, -250, -250, -250, -250, -250, 273, -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,
@@ -8539,16 +8539,16 @@
-251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
-251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
- -251, -251, -251, 274, -251, 274, -251, -251, -251, -251,
+ -251, -251, -251, -251, -251, -251, -251, -251, 273, 273,
-251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
-251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
-251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
-251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
-251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
- -251, -251, -251, -251, 275, -251, -251, -251, 275, 275,
- -251, 276, -251, -251, -251, -251, -251, 276, -251, -251,
- -251, -251, -251, 252, -251, 253, -251, -251, -251, -251,
-251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
+ -251, -251, -251, -251, -251, -251, -251, -251, -251, -251,
+ -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,
@@ -8571,12 +8571,12 @@
-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, 274, -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,
- -252, -252, -252, 277, -252, -252, -252, -252, -252, -252,
+ -252, -252, -252, -252, -252, -252, -252, 275, -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,
@@ -8602,15 +8602,16 @@
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
+ -253, -253, -253, 276, -253, 276, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
- -253, -253, -253, 278, -253, -253, -253, -253, -253, -253,
- -253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
- -253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
+ -253, -253, -253, -253, 277, -253, -253, -253, 277, 277,
+ -253, 278, -253, -253, -253, -253, -253, 278, -253, -253,
+ -253, -253, -253, 254, -253, 255, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
@@ -8620,7 +8621,6 @@
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
- -253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
-253, -253, -253, -253, -253, -253, -253, -253, -253, -253,
@@ -8634,11 +8634,12 @@
-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, 279, -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, 279, -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,
@@ -8645,7 +8646,6 @@
-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, -254, -254, -254, -254, -254, -254,
-254, -254, -254, -254, -254, -254, -254, -254, -254, -254,
@@ -8670,10 +8670,9 @@
-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, 280, -255, -255, -255, -255, -255, -255,
-255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
- -255, -255, -255, -255, -255, -255, -255, 280, -255, -255,
-255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
-255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
-255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
@@ -8682,6 +8681,7 @@
-255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
-255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
-255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
+ -255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
-255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
-255, -255, -255, -255, -255, -255, -255, -255, -255, -255,
@@ -8697,8 +8697,8 @@
-256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
-256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
- -256, -256, -256, -256, -256, -256, -256, -256, 281, 281,
-256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
+ -256, -256, -256, -256, -256, -256, -256, -256, 281, -256,
-256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
-256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
-256, -256, -256, -256, -256, -256, -256, -256, -256, -256,
@@ -8729,13 +8729,14 @@
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
- -257, -257, -257, -257, -257, -257, -257, -257, 282, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
+ -257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
+ -257, -257, -257, -257, -257, -257, -257, 282, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
@@ -8742,7 +8743,6 @@
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
- -257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
-257, -257, -257, -257, -257, -257, -257, -257, -257, -257,
@@ -8760,12 +8760,12 @@
-258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
-258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
+ -258, -258, -258, -258, -258, -258, -258, -258, 283, 283,
-258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
-258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
-258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
-258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
-258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
- -258, -258, -258, -258, -258, -258, -258, 283, -258, -258,
-258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
-258, -258, -258, -258, -258, -258, -258, -258, -258, -258,
@@ -8792,9 +8792,8 @@
-259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
-259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
-259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
- -259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
+ -259, -259, -259, -259, -259, -259, -259, -259, 284, -259,
- -259, -259, 284, -259, -259, -259, -259, -259, -259, -259,
-259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
-259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
-259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
@@ -8804,6 +8803,7 @@
-259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
-259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
-259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
+ -259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
-259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
-259, -259, -259, -259, -259, -259, -259, -259, -259, -259,
@@ -8828,7 +8828,7 @@
-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, -260, -260, -260, -260, -260, -260,
+ -260, -260, -260, -260, -260, -260, -260, 285, -260, -260,
-260, -260, -260, -260, -260, -260, -260, -260, -260, -260,
-260, -260, -260, -260, -260, -260, -260, -260, -260, -260,
@@ -8857,6 +8857,7 @@
-261, -261, -261, -261, -261, -261, -261, -261, -261, -261,
-261, -261, -261, -261, -261, -261, -261, -261, -261, -261,
+ -261, -261, 286, -261, -261, -261, -261, -261, -261, -261,
-261, -261, -261, -261, -261, -261, -261, -261, -261, -261,
-261, -261, -261, -261, -261, -261, -261, -261, -261, -261,
-261, -261, -261, -261, -261, -261, -261, -261, -261, -261,
@@ -8864,7 +8865,6 @@
-261, -261, -261, -261, -261, -261, -261, -261, -261, -261,
-261, -261, -261, -261, -261, -261, -261, -261, -261, -261,
-261, -261, -261, -261, -261, -261, -261, -261, -261, -261,
- -261, -261, -261, -261, -261, -261, -261, -261, -261, -261,
-261, -261, -261, -261, -261, -261, -261, -261, -261, -261,
-261, -261, -261, -261, -261, -261, -261, -261, -261, -261,
@@ -8886,10 +8886,10 @@
-262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
-262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
-262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
- -262, -262, -262, -262, -262, -262, -262, -262, -262, 285,
- 285, 285, 285, 285, 285, 285, 285, 285, -262, -262,
-262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
-262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
+ -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
+ -262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
-262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
-262, -262, -262, -262, -262, -262, -262, -262, -262, -262,
@@ -8949,8 +8949,8 @@
-264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
-264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
-264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
- -264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
- -264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
+ -264, -264, -264, -264, -264, -264, -264, -264, -264, 287,
+ 287, 287, 287, 287, 287, 287, 287, 287, -264, -264,
-264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
-264, -264, -264, -264, -264, -264, -264, -264, -264, -264,
@@ -8986,7 +8986,7 @@
-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, 286, -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,
@@ -9018,11 +9018,11 @@
-266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
-266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
-266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
- -266, -266, -266, 287, -266, -266, -266, -266, -266, -266,
-266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
-266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
-266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
-266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
+ -266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
-266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
-266, -266, -266, -266, -266, -266, -266, -266, -266, -266,
@@ -9113,6 +9113,7 @@
-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, 290, -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,
@@ -9119,7 +9120,6 @@
-269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
-269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
-269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
- -269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
-269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
-269, -269, -269, -269, -269, -269, -269, -269, -269, -269,
@@ -9144,10 +9144,9 @@
-270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
-270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
-270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
- -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
+ -270, -270, -270, 291, -270, -270, -270, -270, -270, -270,
-270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
- -270, -270, -270, -270, -270, 290, -270, -270, -270, -270,
-270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
-270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
-270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
@@ -9156,6 +9155,7 @@
-270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
-270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
-270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
+ -270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
-270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
-270, -270, -270, -270, -270, -270, -270, -270, -270, -270,
@@ -9172,7 +9172,6 @@
-271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
-271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
- -271, -271, -271, -271, -271, -271, -271, -271, -271, 291,
-271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
-271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
-271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
@@ -9179,8 +9178,9 @@
-271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
-271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
-271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
- -271, -271, -271, 292, -271, 293, -271, -271, -271, -271,
-271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+ -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
+ -271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
-271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
-271, -271, -271, -271, -271, -271, -271, -271, -271, -271,
@@ -9202,14 +9202,15 @@
-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, 294, 294,
-272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
-272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
-272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
+ -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
-272, -272, -272, -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, 292, -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,
@@ -9216,7 +9217,6 @@
-272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
-272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
-272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
- -272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
-272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
-272, -272, -272, -272, -272, -272, -272, -272, -272, -272,
@@ -9235,7 +9235,7 @@
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
- -273, -273, -273, -273, -273, -273, -273, -273, 295, -273,
+ -273, -273, -273, -273, -273, -273, -273, -273, -273, 293,
-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,
@@ -9243,6 +9243,7 @@
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
+ -273, -273, -273, 294, -273, 295, -273, -273, -273, -273,
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
@@ -9252,7 +9253,6 @@
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
- -273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
-273, -273, -273, -273, -273, -273, -273, -273, -273, -273,
@@ -9261,34 +9261,34 @@
},
{
- 39, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
+ 39, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, 296, 296,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, -274, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, -274, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274, -274, -274, -274, -274,
+ -274, -274, -274, -274, -274, -274
},
@@ -9297,16 +9297,15 @@
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
- -275, -275, -275, 274, -275, 274, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
+ -275, -275, -275, -275, -275, -275, -275, -275, 297, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
- -275, -275, -275, 277, -275, -275, -275, -275, -275, -275,
+ -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
- -275, -275, -275, 252, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
@@ -9314,6 +9313,7 @@
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
+ -275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
-275, -275, -275, -275, -275, -275, -275, -275, -275, -275,
@@ -9324,35 +9324,35 @@
},
{
- 39, -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,
+ 39, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, 275, -276, -276, -276, 275, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, -276, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, -276, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -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,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
- -276, -276, -276, -276, -276, -276, -276, -276, -276, -276,
- -276, -276, -276, -276, -276, -276
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298
},
{
@@ -9360,21 +9360,21 @@
-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, 276, -277, 276, -277, -277, -277, -277,
-277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
-277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
-277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
- -277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
-277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
+ -277, -277, -277, 279, -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, 254, -277, -277, -277, -277, -277, -277,
-277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
-277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
-277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
-277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
-277, -277, -277, -277, -277, -277, -277, -277, -277, -277,
- -277, -277, -277, -277, -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,
@@ -9398,8 +9398,8 @@
-278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
-278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
-278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
+ -278, -278, -278, -278, 277, -278, -278, -278, 277, -278,
-278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
- -278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
-278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
-278, -278, -278, -278, -278, -278, -278, -278, -278, -278,
@@ -9423,8 +9423,8 @@
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
- -279, -279, -279, -279, -279, -279, -279, -279, 297, 298,
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
+ -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
@@ -9432,10 +9432,10 @@
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
- -279, -279, -279, -279, -279, 299, -279, -279, -279, -279,
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
+ -279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
-279, -279, -279, -279, -279, -279, -279, -279, -279, -279,
@@ -9463,7 +9463,6 @@
-280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
-280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
- -280, -280, -280, -280, 300, -280, -280, -280, -280, -280,
-280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
-280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
-280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
@@ -9472,6 +9471,7 @@
-280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
-280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
-280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
+ -280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
-280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
-280, -280, -280, -280, -280, -280, -280, -280, -280, -280,
@@ -9487,8 +9487,8 @@
-281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
-281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
+ -281, -281, -281, -281, -281, -281, -281, -281, 299, 300,
-281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
- -281, -281, -281, -281, -281, -281, -281, -281, -281, 301,
-281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
-281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
-281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
@@ -9495,7 +9495,7 @@
-281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
-281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
-281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
- -281, -281, -281, 302, -281, 303, -281, -281, -281, -281,
+ -281, -281, -281, -281, -281, 301, -281, -281, -281, -281,
-281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
-281, -281, -281, -281, -281, -281, -281, -281, -281, -281,
@@ -9518,16 +9518,16 @@
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
- -282, -282, -282, -282, -282, -282, -282, -282, 304, 305,
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
+ -282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
+ -282, -282, -282, -282, 302, -282, -282, -282, -282, -282,
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
- -282, -282, -282, -282, -282, 306, -282, -282, -282, -282,
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
-282, -282, -282, -282, -282, -282, -282, -282, -282, -282,
@@ -9551,8 +9551,8 @@
-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, 303,
-283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
- -283, -283, 307, -283, -283, -283, -283, -283, -283, -283,
-283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
-283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
-283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
@@ -9559,6 +9559,7 @@
-283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
-283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
+ -283, -283, -283, 304, -283, 305, -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,
@@ -9568,7 +9569,6 @@
-283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
-283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
-283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
- -283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
-283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
-283, -283, -283, -283, -283, -283, -283, -283, -283, -283,
@@ -9581,8 +9581,8 @@
-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, 306, 307,
-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,
@@ -9590,10 +9590,10 @@
-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, 308, -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, -284,
-284, -284, -284, -284, -284, -284, -284, -284, -284, -284,
-284, -284, -284, -284, -284, -284, -284, -284, -284, -284,
@@ -9615,10 +9615,10 @@
-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, 309, -285, -285, -285, -285, -285, -285, -285,
-285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
-285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
-285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
- -285, -285, -285, 308, -285, -285, -285, -285, -285, -285,
-285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
-285, -285, -285, -285, -285, -285, -285, -285, -285, -285,
@@ -9682,6 +9682,7 @@
-287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
-287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
+ -287, -287, -287, 310, -287, -287, -287, -287, -287, -287,
-287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
-287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
-287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
@@ -9690,7 +9691,6 @@
-287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
-287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
-287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
- -287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
-287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
-287, -287, -287, -287, -287, -287, -287, -287, -287, -287,
@@ -9779,7 +9779,6 @@
-290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
-290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
- -290, -290, -290, -290, -290, -290, 309, -290, -290, -290,
-290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
-290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
-290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
@@ -9788,6 +9787,7 @@
-290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
-290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
-290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
+ -290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
-290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
-290, -290, -290, -290, -290, -290, -290, -290, -290, -290,
@@ -9840,9 +9840,9 @@
-292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
-292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
- -292, -292, -292, 310, -292, -292, -292, -292, -292, -292,
-292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
-292, -292, -292, -292, -292, -292, -292, -292, -292, -292,
+ -292, -292, -292, -292, -292, -292, 311, -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,
@@ -9871,9 +9871,9 @@
-293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
-293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
-293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
- -293, -293, -293, 311, -293, -293, -293, -293, -293, -293,
-293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
-293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
+ -293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
-293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
-293, -293, -293, -293, -293, -293, -293, -293, -293, -293,
@@ -9898,15 +9898,15 @@
-294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
-294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
-294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
- -294, -294, -294, -294, -294, -294, -294, -294, -294, 312,
+ -294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
-294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
-294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
-294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
+ -294, -294, -294, 312, -294, -294, -294, -294, -294, -294,
-294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
-294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
-294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
- -294, -294, -294, 313, -294, 314, -294, -294, -294, -294,
-294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
-294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
-294, -294, -294, -294, -294, -294, -294, -294, -294, -294,
@@ -9929,12 +9929,12 @@
-295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
-295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
-295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
- -295, -295, -295, -295, -295, -295, -295, -295, 315, 315,
-295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
-295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
-295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
-295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
-295, -295, -295, -295, -295, -295, -295, -295, -295, -295,
+ -295, -295, -295, 313, -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,
@@ -9956,35 +9956,35 @@
},
{
- 39, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
+ 39, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 277, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 316, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, 314,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, 315, -296, 316, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
- 296, 296, 296, 296, 296, 296, 296, 296, 296, 296,
- 296, 296, 296, 296, 296, 296
+ -296, -296, -296, -296, -296, -296, -296, -296, -296, -296,
+ -296, -296, -296, -296, -296, -296
},
{
@@ -9992,13 +9992,12 @@
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
+ -297, -297, -297, -297, -297, -297, -297, -297, 317, 317,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
- -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
- -297, -297, -297, 317, -297, -297, -297, -297, -297, -297,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
@@ -10007,6 +10006,7 @@
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
+ -297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
-297, -297, -297, -297, -297, -297, -297, -297, -297, -297,
@@ -10019,35 +10019,35 @@
},
{
- 39, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
+ 39, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, 318, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 279, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
+ 298, 298, 298, 318, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298, -298, -298, -298, -298,
- -298, -298, -298, -298, -298, -298
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298, 298, 298, 298, 298,
+ 298, 298, 298, 298, 298, 298
},
{
@@ -10088,11 +10088,11 @@
-300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
-300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
-300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
- -300, -300, -300, -300, -300, -300, -300, -300, 320, -300,
-300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
-300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
-300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
-300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
+ -300, -300, -300, 320, -300, -300, -300, -300, -300, -300,
-300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
-300, -300, -300, -300, -300, -300, -300, -300, -300, -300,
@@ -10124,11 +10124,11 @@
-301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
-301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
-301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
+ -301, -301, -301, 321, -301, -301, -301, -301, -301, -301,
-301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
-301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
-301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
-301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
- -301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
-301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
-301, -301, -301, -301, -301, -301, -301, -301, -301, -301,
@@ -10151,12 +10151,11 @@
-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, 322, -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, 321, -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,
@@ -10165,6 +10164,7 @@
-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,
@@ -10187,9 +10187,9 @@
-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, 322, -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, -303, -303, -303,
-303, -303, -303, -303, -303, -303, -303, -303, -303, -303,
-303, -303, -303, -303, -303, -303, -303, -303, -303, -303,
@@ -10314,6 +10314,7 @@
-307, -307, -307, -307, -307, -307, -307, -307, -307, -307,
-307, -307, -307, -307, -307, -307, -307, -307, -307, -307,
+ -307, -307, -307, 326, -307, -307, -307, -307, -307, -307,
-307, -307, -307, -307, -307, -307, -307, -307, -307, -307,
-307, -307, -307, -307, -307, -307, -307, -307, -307, -307,
-307, -307, -307, -307, -307, -307, -307, -307, -307, -307,
@@ -10322,7 +10323,6 @@
-307, -307, -307, -307, -307, -307, -307, -307, -307, -307,
-307, -307, -307, -307, -307, -307, -307, -307, -307, -307,
-307, -307, -307, -307, -307, -307, -307, -307, -307, -307,
- -307, -307, -307, -307, -307, -307, -307, -307, -307, -307,
-307, -307, -307, -307, -307, -307, -307, -307, -307, -307,
-307, -307, -307, -307, -307, -307, -307, -307, -307, -307,
@@ -10345,9 +10345,9 @@
-308, -308, -308, -308, -308, -308, -308, -308, -308, -308,
-308, -308, -308, -308, -308, -308, -308, -308, -308, -308,
-308, -308, -308, -308, -308, -308, -308, -308, -308, -308,
+ -308, -308, -308, 327, -308, -308, -308, -308, -308, -308,
-308, -308, -308, -308, -308, -308, -308, -308, -308, -308,
-308, -308, -308, -308, -308, -308, -308, -308, -308, -308,
- -308, -308, -308, -308, -308, -308, -308, -308, -308, -308,
-308, -308, -308, -308, -308, -308, -308, -308, -308, -308,
-308, -308, -308, -308, -308, -308, -308, -308, -308, -308,
@@ -10379,11 +10379,11 @@
-309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
-309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
-309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
- -309, 326, -309, -309, -309, -309, -309, -309, -309, -309,
-309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
-309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
-309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
-309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
+ -309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
-309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
-309, -309, -309, -309, -309, -309, -309, -309, -309, -309,
@@ -10442,9 +10442,9 @@
-311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
-311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
-311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
+ -311, 328, -311, -311, -311, -311, -311, -311, -311, -311,
-311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
-311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
- -311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
-311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
-311, -311, -311, -311, -311, -311, -311, -311, -311, -311,
@@ -10503,9 +10503,9 @@
-313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
-313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
-313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
- -313, -313, -313, 327, -313, -313, -313, -313, -313, -313,
-313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
-313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
+ -313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
-313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
-313, -313, -313, -313, -313, -313, -313, -313, -313, -313,
@@ -10535,7 +10535,6 @@
-314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
-314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
-314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
- -314, -314, -314, 328, -314, -314, -314, -314, -314, -314,
-314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
-314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
-314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
@@ -10542,6 +10541,7 @@
-314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
-314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
-314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
+ -314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
-314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
-314, -314, -314, -314, -314, -314, -314, -314, -314, -314,
@@ -10562,15 +10562,14 @@
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
- -315, -315, -315, -315, -315, -315, -315, -315, -315, 329,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
+ -315, -315, -315, 329, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
- -315, -315, -315, 330, -315, 331, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
@@ -10578,6 +10577,7 @@
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
+ -315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
-315, -315, -315, -315, -315, -315, -315, -315, -315, -315,
@@ -10598,7 +10598,7 @@
-316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
-316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
-316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
- -316, -316, -316, 277, -316, -316, -316, -316, -316, -316,
+ -316, -316, -316, 330, -316, -316, -316, -316, -316, -316,
-316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
-316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
-316, -316, -316, -316, -316, -316, -316, -316, -316, -316,
@@ -10625,20 +10625,20 @@
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
+ -317, -317, -317, -317, -317, -317, -317, -317, -317, 331,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
- -317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
+ -317, -317, -317, 332, -317, 333, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
- -317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
-317, -317, -317, -317, -317, -317, -317, -317, -317, -317,
@@ -10661,9 +10661,9 @@
-318, -318, -318, -318, -318, -318, -318, -318, -318, -318,
-318, -318, -318, -318, -318, -318, -318, -318, -318, -318,
-318, -318, -318, -318, -318, -318, -318, -318, -318, -318,
+ -318, -318, -318, 279, -318, -318, -318, -318, -318, -318,
-318, -318, -318, -318, -318, -318, -318, -318, -318, -318,
-318, -318, -318, -318, -318, -318, -318, -318, -318, -318,
- -318, -318, -318, -318, -318, -318, -318, -318, -318, -318,
-318, -318, -318, -318, -318, -318, -318, -318, -318, -318,
-318, -318, -318, -318, -318, -318, -318, -318, -318, -318,
@@ -10719,12 +10719,12 @@
-320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
-320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
-320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
- -320, -320, -320, -320, -320, -320, -320, -320, 332, 332,
- 332, -320, -320, -320, -320, -320, -320, -320, -320, -320,
-320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
-320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
-320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
-320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
+ -320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
+ -320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
-320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
-320, -320, -320, -320, -320, -320, -320, -320, -320, -320,
@@ -10782,10 +10782,10 @@
-322, -322, -322, -322, -322, -322, -322, -322, -322, -322,
-322, -322, -322, -322, -322, -322, -322, -322, -322, -322,
-322, -322, -322, -322, -322, -322, -322, -322, -322, -322,
+ -322, -322, -322, -322, -322, -322, -322, -322, 334, 334,
+ 334, -322, -322, -322, -322, -322, -322, -322, -322, -322,
-322, -322, -322, -322, -322, -322, -322, -322, -322, -322,
-322, -322, -322, -322, -322, -322, -322, -322, -322, -322,
- -322, -322, -322, -322, -322, -322, -322, -322, -322, -322,
- -322, -322, -322, -322, -322, -322, -322, -322, -322, -322,
-322, -322, -322, -322, -322, -322, -322, -322, -322, -322,
-322, -322, -322, -322, -322, -322, -322, -322, -322, -322,
@@ -10916,9 +10916,9 @@
-326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
-326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
-326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
- -326, -326, -326, -326, -326, 333, -326, -326, -326, -326,
-326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
-326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
+ -326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
-326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
-326, -326, -326, -326, -326, -326, -326, -326, -326, -326,
@@ -10979,7 +10979,7 @@
-328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
-328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
-328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
- -328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
+ -328, -328, -328, -328, -328, 335, -328, -328, -328, -328,
-328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
-328, -328, -328, -328, -328, -328, -328, -328, -328, -328,
@@ -11040,7 +11040,7 @@
-330, -330, -330, -330, -330, -330, -330, -330, -330, -330,
-330, -330, -330, -330, -330, -330, -330, -330, -330, -330,
-330, -330, -330, -330, -330, -330, -330, -330, -330, -330,
- -330, -330, -330, 334, -330, -330, -330, -330, -330, -330,
+ -330, -330, -330, -330, -330, -330, -330, -330, -330, -330,
-330, -330, -330, -330, -330, -330, -330, -330, -330, -330,
-330, -330, -330, -330, -330, -330, -330, -330, -330, -330,
@@ -11072,11 +11072,11 @@
-331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
-331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
-331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
- -331, -331, -331, 335, -331, -331, -331, -331, -331, -331,
-331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
-331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
-331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
-331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
+ -331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
-331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
-331, -331, -331, -331, -331, -331, -331, -331, -331, -331,
@@ -11099,15 +11099,15 @@
-332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
-332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
-332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
- -332, -332, -332, -332, -332, -332, -332, -332, -332, 336,
-332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
-332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
+ -332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
-332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
+ -332, -332, -332, 336, -332, -332, -332, -332, -332, -332,
-332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
-332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
-332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
- -332, -332, -332, 337, -332, 338, -332, -332, -332, -332,
-332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
-332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
-332, -332, -332, -332, -332, -332, -332, -332, -332, -332,
@@ -11135,7 +11135,7 @@
-333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
-333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
-333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
- -333, -333, -333, 339, -333, -333, -333, -333, -333, -333,
+ -333, -333, -333, 337, -333, -333, -333, -333, -333, -333,
-333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
-333, -333, -333, -333, -333, -333, -333, -333, -333, -333,
@@ -11162,7 +11162,7 @@
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
- -334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
+ -334, -334, -334, -334, -334, -334, -334, -334, -334, 338,
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
@@ -11170,10 +11170,10 @@
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
+ -334, -334, -334, 339, -334, 340, -334, -334, -334, -334,
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
- -334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
-334, -334, -334, -334, -334, -334, -334, -334, -334, -334,
@@ -11198,7 +11198,7 @@
-335, -335, -335, -335, -335, -335, -335, -335, -335, -335,
-335, -335, -335, -335, -335, -335, -335, -335, -335, -335,
-335, -335, -335, -335, -335, -335, -335, -335, -335, -335,
- -335, -335, -335, -335, -335, -335, -335, -335, -335, -335,
+ -335, -335, -335, 341, -335, -335, -335, -335, -335, -335,
-335, -335, -335, -335, -335, -335, -335, -335, -335, -335,
-335, -335, -335, -335, -335, -335, -335, -335, -335, -335,
@@ -11220,35 +11220,35 @@
},
{
- 39, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
+ 39, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
- 340, 340, 340, 340, -336, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340
+ -336, -336, -336, -336, -336, -336, -336, -336, -336, -336,
+ -336, -336, -336, -336, -336, -336
},
{
@@ -11262,7 +11262,6 @@
-337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
-337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
- -337, -337, -337, 341, -337, -337, -337, -337, -337, -337,
-337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
-337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
-337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
@@ -11271,6 +11270,7 @@
-337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
-337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
-337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
+ -337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
-337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
-337, -337, -337, -337, -337, -337, -337, -337, -337, -337,
@@ -11283,35 +11283,35 @@
},
{
- 39, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
+ 39, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, 342, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, -338, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338, -338, -338, -338, -338,
- -338, -338, -338, -338, -338, -338
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342
},
{
@@ -11325,6 +11325,7 @@
-339, -339, -339, -339, -339, -339, -339, -339, -339, -339,
-339, -339, -339, -339, -339, -339, -339, -339, -339, -339,
-339, -339, -339, -339, -339, -339, -339, -339, -339, -339,
+ -339, -339, -339, 343, -339, -339, -339, -339, -339, -339,
-339, -339, -339, -339, -339, -339, -339, -339, -339, -339,
-339, -339, -339, -339, -339, -339, -339, -339, -339, -339,
-339, -339, -339, -339, -339, -339, -339, -339, -339, -339,
@@ -11331,7 +11332,6 @@
-339, -339, -339, -339, -339, -339, -339, -339, -339, -339,
-339, -339, -339, -339, -339, -339, -339, -339, -339, -339,
-339, -339, -339, -339, -339, -339, -339, -339, -339, -339,
- -339, -339, -339, -339, -339, -339, -339, -339, -339, -339,
-339, -339, -339, -339, -339, -339, -339, -339, -339, -339,
-339, -339, -339, -339, -339, -339, -339, -339, -339, -339,
@@ -11347,34 +11347,34 @@
},
{
- 39, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 343, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
+ 39, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, 344, -340, -340, -340, -340, -340, -340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340, 340, 340, 340, 340,
- 340, 340, 340, 340, 340, 340
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340, -340, -340, -340, -340,
+ -340, -340, -340, -340, -340, -340
},
{
@@ -11410,131 +11410,194 @@
},
{
- 39, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
+ 39, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 345, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342, -342, -342, -342, -342,
- -342, -342, -342, -342, -342, -342
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342, 342, 342, 342, 342,
+ 342, 342, 342, 342, 342, 342
},
{
- 39, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
+ 39, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, -343, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343, -343, -343, -343, -343,
+ -343, -343, -343, -343, -343, -343
},
{
- 39, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
+ 39, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 345, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344, 344, 344, 344, 344,
- 344, 344, 344, 344, 344, 344
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344, -344, -344, -344, -344,
+ -344, -344, -344, -344, -344, -344
},
{
- 39, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+ 39, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, -345, 346, 346, 346, 346, 346, 346,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345, -345, -345, -345, -345,
- -345, -345, -345, -345, -345, -345
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346
},
+ {
+ 39, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 347, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+
+ 346, 346, 346, 346, 346, 346, 346, 346, 346, 346,
+ 346, 346, 346, 346, 346, 346
+ },
+
+ {
+ 39, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347, -347, -347, -347, -347,
+ -347, -347, -347, -347, -347, -347
+ },
+
} ;
static yy_state_type yy_get_previous_state ( void );
@@ -11551,8 +11614,8 @@
(yy_hold_char) = *yy_cp; \
*yy_cp = '\0'; \
(yy_c_buf_p) = yy_cp;
-#define YY_NUM_RULES 154
-#define YY_END_OF_BUFFER 155
+#define YY_NUM_RULES 156
+#define YY_END_OF_BUFFER 157
/* This struct is not used in this scanner,
but its presence is necessary. */
struct yy_trans_info
@@ -11560,74 +11623,74 @@
flex_int32_t yy_verify;
flex_int32_t yy_nxt;
};
-static const flex_int32_t yy_accept[346] =
+static const flex_int32_t yy_accept[348] =
{ 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 3, 3, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 155, 153,
- 69, 110, 153, 103, 1, 131, 84, 153, 133, 107,
- 88, 87, 136, 116, 135, 153, 128, 141, 92, 147,
- 145, 75, 153, 29, 132, 82, 125, 125, 138, 137,
- 91, 148, 146, 144, 102, 104, 72, 66, 67, 134,
- 36, 58, 37, 38, 34, 35, 39, 3, 2, 30,
- 31, 32, 33, 154, 154, 154, 154, 154, 154, 154,
+ 0, 0, 0, 0, 0, 0, 0, 0, 157, 155,
+ 69, 112, 155, 105, 1, 133, 86, 155, 135, 109,
+ 90, 89, 138, 118, 137, 155, 130, 143, 94, 149,
+ 147, 75, 155, 29, 84, 134, 82, 127, 127, 140,
+ 139, 93, 150, 148, 146, 104, 106, 72, 66, 67,
+ 136, 36, 58, 37, 38, 34, 35, 39, 3, 2,
+ 30, 31, 32, 33, 156, 156, 156, 156, 156, 156,
- 48, 154, 154, 55, 154, 154, 69, 115, 114, 111,
- 131, 85, 86, 129, 126, 133, 106, 109, 105, 40,
- 89, 90, 0, 0, 130, 28, 127, 127, 128, 0,
- 0, 0, 142, 143, 76, 77, 64, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 65, 132, 83, 68,
- 78, 0, 139, 140, 93, 94, 95, 96, 97, 98,
- 99, 100, 101, 73, 74, 71, 36, 37, 38, 34,
- 35, 39, 3, 2, 30, 31, 32, 33, 0, 0,
- 0, 0, 41, 0, 0, 0, 0, 43, 48, 49,
- 50, 55, 56, 57, 113, 42, 129, 108, 0, 0,
+ 156, 48, 156, 156, 55, 156, 156, 69, 117, 116,
+ 113, 133, 87, 88, 131, 128, 135, 108, 111, 107,
+ 40, 91, 92, 0, 0, 132, 28, 129, 129, 130,
+ 0, 0, 0, 144, 145, 76, 77, 64, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 65, 85, 134,
+ 83, 68, 78, 0, 141, 142, 95, 96, 97, 98,
+ 99, 100, 101, 102, 103, 73, 74, 71, 36, 37,
+ 38, 34, 35, 39, 3, 2, 30, 31, 32, 33,
+ 0, 0, 0, 0, 41, 0, 0, 0, 0, 43,
+ 48, 49, 50, 55, 56, 57, 115, 42, 131, 110,
- 130, 80, 0, 119, 121, 117, 0, 0, 0, 0,
+ 0, 0, 132, 80, 0, 121, 123, 119, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 79, 0, 0, 112, 0,
- 0, 81, 120, 122, 123, 118, 0, 5, 4, 0,
- 24, 0, 23, 0, 0, 0, 0, 22, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 0, 124,
- 25, 0, 20, 19, 0, 0, 0, 0, 18, 0,
- 0, 0, 0, 0, 0, 0, 62, 63, 47, 0,
- 0, 54, 0, 26, 0, 150, 149, 152, 151, 0,
- 6, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 79, 0, 0,
+ 114, 0, 0, 81, 122, 124, 125, 120, 0, 5,
+ 4, 0, 24, 0, 23, 0, 0, 0, 0, 22,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 0, 126, 25, 0, 20, 19, 0, 0, 0, 0,
+ 18, 0, 0, 0, 0, 0, 0, 0, 62, 63,
+ 47, 0, 0, 54, 0, 26, 0, 152, 151, 154,
+ 153, 0, 6, 0, 0, 0, 0, 0, 0, 0,
- 7, 0, 0, 0, 0, 0, 27, 21, 0, 10,
- 14, 8, 0, 0, 0, 0, 45, 44, 46, 0,
- 11, 15, 52, 51, 53, 0, 12, 16, 9, 0,
- 0, 0, 0, 13, 17, 0, 0, 0, 70, 0,
- 60, 61, 0, 0, 59
+ 0, 0, 7, 0, 0, 0, 0, 0, 27, 21,
+ 0, 10, 14, 8, 0, 0, 0, 0, 45, 44,
+ 46, 0, 11, 15, 52, 51, 53, 0, 12, 16,
+ 9, 0, 0, 0, 0, 13, 17, 0, 0, 0,
+ 70, 0, 60, 61, 0, 0, 59
} ;
static yy_state_type yy_last_accepting_state;
static char *yy_last_accepting_cpos;
-static const yy_state_type yy_NUL_trans[346] =
+static const yy_state_type yy_NUL_trans[348] =
{ 0,
- 40, 40, 81, 81, 83, 83, 84, 84, 85, 85,
- 86, 86, 87, 87, 88, 88, 90, 90, 91, 91,
- 92, 92, 93, 93, 94, 94, 94, 94, 101, 101,
- 94, 94, 104, 104, 94, 94, 94, 94, 0, 0,
- 0, 0, 108, 0, 0, 0, 0, 0, 0, 0,
+ 40, 40, 82, 82, 84, 84, 85, 85, 86, 86,
+ 87, 87, 88, 88, 89, 89, 91, 91, 92, 92,
+ 93, 93, 94, 94, 95, 95, 95, 95, 102, 102,
+ 95, 95, 105, 105, 95, 95, 95, 95, 0, 0,
+ 0, 0, 109, 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,
- 167, 0, 168, 169, 170, 171, 172, 173, 0, 175,
- 176, 177, 178, 0, 0, 0, 0, 0, 0, 0,
+ 0, 169, 0, 170, 171, 172, 173, 174, 175, 0,
+ 177, 178, 179, 180, 0, 0, 0, 0, 0, 0,
- 189, 190, 191, 192, 193, 194, 0, 0, 0, 0,
+ 0, 191, 192, 193, 194, 195, 196, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 0, 167, 168, 169, 170,
- 171, 172, 173, 0, 175, 176, 177, 178, 0, 0,
- 0, 0, 0, 0, 0, 0, 0, 0, 189, 190,
- 191, 192, 193, 194, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 0, 169, 170,
+ 171, 172, 173, 174, 175, 0, 177, 178, 179, 180,
+ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+ 191, 192, 193, 194, 195, 196, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -11636,15 +11699,15 @@
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, 296, 0, 0, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 298, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
- 0, 0, 0, 0, 0, 296, 0, 0, 0, 0,
+ 0, 0, 0, 0, 0, 0, 0, 298, 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, 340, 0, 0, 0, 340,
- 0, 0, 344, 344, 0
+ 0, 0, 0, 0, 0, 0, 0, 342, 0, 0,
+ 0, 342, 0, 0, 346, 346, 0
} ;
extern int yy_flex_debug;
@@ -11664,7 +11727,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file implements the note parser.
*
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
@@ -11788,6 +11851,9 @@
case '0':
return S_PUNCTUM_INCLINATUM_DESCENDENS;
+ case '2':
+ return S_PUNCTUM_INCLINATUM_STANS;
+
case '1':
return S_PUNCTUM_INCLINATUM_ASCENDENS;
}
@@ -12403,9 +12469,9 @@
}
}
-#line 12406 "gabc/gabc-notes-determination-l.c"
+#line 12472 "gabc/gabc-notes-determination-l.c"
-#line 12408 "gabc/gabc-notes-determination-l.c"
+#line 12474 "gabc/gabc-notes-determination-l.c"
#define INITIAL 0
#define texverbnote 1
@@ -12642,9 +12708,9 @@
}
{
-#line 779 "gabc/gabc-notes-determination.l"
+#line 782 "gabc/gabc-notes-determination.l"
-#line 12647 "gabc/gabc-notes-determination-l.c"
+#line 12713 "gabc/gabc-notes-determination-l.c"
while ( /*CONSTCOND*/1 ) /* loops until end-of-file is reached */
{
@@ -12691,7 +12757,7 @@
case 1:
YY_RULE_SETUP
-#line 780 "gabc/gabc-notes-determination.l"
+#line 783 "gabc/gabc-notes-determination.l"
{
BEGIN(comments);
}
@@ -12699,7 +12765,7 @@
case 2:
/* rule 2 can match eol */
YY_RULE_SETUP
-#line 783 "gabc/gabc-notes-determination.l"
+#line 786 "gabc/gabc-notes-determination.l"
{
BEGIN(INITIAL);
}
@@ -12706,7 +12772,7 @@
YY_BREAK
case 3:
YY_RULE_SETUP
-#line 786 "gabc/gabc-notes-determination.l"
+#line 789 "gabc/gabc-notes-determination.l"
{
/* ignored */
}
@@ -12713,7 +12779,7 @@
YY_BREAK
case 4:
YY_RULE_SETUP
-#line 789 "gabc/gabc-notes-determination.l"
+#line 792 "gabc/gabc-notes-determination.l"
{
BEGIN(choralsign);
}
@@ -12720,7 +12786,7 @@
YY_BREAK
case 5:
YY_RULE_SETUP
-#line 792 "gabc/gabc-notes-determination.l"
+#line 795 "gabc/gabc-notes-determination.l"
{
BEGIN(choralnabc);
}
@@ -12727,7 +12793,7 @@
YY_BREAK
case 6:
YY_RULE_SETUP
-#line 795 "gabc/gabc-notes-determination.l"
+#line 798 "gabc/gabc-notes-determination.l"
{
char_for_brace = gabc_notes_determination_text[4]-'0';
BEGIN(overbrace);
@@ -12735,7 +12801,7 @@
YY_BREAK
case 7:
YY_RULE_SETUP
-#line 799 "gabc/gabc-notes-determination.l"
+#line 802 "gabc/gabc-notes-determination.l"
{
char_for_brace = gabc_notes_determination_text[4]-'0';
BEGIN(underbrace);
@@ -12743,7 +12809,7 @@
YY_BREAK
case 8:
YY_RULE_SETUP
-#line 803 "gabc/gabc-notes-determination.l"
+#line 806 "gabc/gabc-notes-determination.l"
{
char_for_brace = gabc_notes_determination_text[5]-'0';
BEGIN(overcurlybrace);
@@ -12751,7 +12817,7 @@
YY_BREAK
case 9:
YY_RULE_SETUP
-#line 807 "gabc/gabc-notes-determination.l"
+#line 810 "gabc/gabc-notes-determination.l"
{
char_for_brace = gabc_notes_determination_text[6]-'0';
BEGIN(overcurlyaccentusbrace);
@@ -12759,7 +12825,7 @@
YY_BREAK
case 10:
YY_RULE_SETUP
-#line 811 "gabc/gabc-notes-determination.l"
+#line 814 "gabc/gabc-notes-determination.l"
{
if (overbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -12779,7 +12845,7 @@
YY_BREAK
case 11:
YY_RULE_SETUP
-#line 827 "gabc/gabc-notes-determination.l"
+#line 830 "gabc/gabc-notes-determination.l"
{
if (underbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -12798,7 +12864,7 @@
YY_BREAK
case 12:
YY_RULE_SETUP
-#line 842 "gabc/gabc-notes-determination.l"
+#line 845 "gabc/gabc-notes-determination.l"
{
if (overbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -12818,7 +12884,7 @@
YY_BREAK
case 13:
YY_RULE_SETUP
-#line 858 "gabc/gabc-notes-determination.l"
+#line 861 "gabc/gabc-notes-determination.l"
{
if (overbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -12838,7 +12904,7 @@
YY_BREAK
case 14:
YY_RULE_SETUP
-#line 874 "gabc/gabc-notes-determination.l"
+#line 877 "gabc/gabc-notes-determination.l"
{
if (!overbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -12861,7 +12927,7 @@
YY_BREAK
case 15:
YY_RULE_SETUP
-#line 893 "gabc/gabc-notes-determination.l"
+#line 896 "gabc/gabc-notes-determination.l"
{
if (!underbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -12879,7 +12945,7 @@
YY_BREAK
case 16:
YY_RULE_SETUP
-#line 907 "gabc/gabc-notes-determination.l"
+#line 910 "gabc/gabc-notes-determination.l"
{
if (!overbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -12902,7 +12968,7 @@
YY_BREAK
case 17:
YY_RULE_SETUP
-#line 926 "gabc/gabc-notes-determination.l"
+#line 929 "gabc/gabc-notes-determination.l"
{
if (!overbrace_var) {
gregorio_messagef("gabc_notes_determination", VERBOSITY_ERROR, 0,
@@ -12925,7 +12991,7 @@
YY_BREAK
case 18:
YY_RULE_SETUP
-#line 945 "gabc/gabc-notes-determination.l"
+#line 948 "gabc/gabc-notes-determination.l"
{
if (notesmacros[gabc_notes_determination_text[3]-'0']) {
gregorio_add_texverb_to_note(current_note, gregorio_strdup(
@@ -12935,7 +13001,7 @@
YY_BREAK
case 19:
YY_RULE_SETUP
-#line 951 "gabc/gabc-notes-determination.l"
+#line 954 "gabc/gabc-notes-determination.l"
{
if (notesmacros[gabc_notes_determination_text[3]-'0']) {
gregorio_add_texverb_as_note(¤t_note, gregorio_strdup(
@@ -12946,7 +13012,7 @@
YY_BREAK
case 20:
YY_RULE_SETUP
-#line 958 "gabc/gabc-notes-determination.l"
+#line 961 "gabc/gabc-notes-determination.l"
{
if (notesmacros[gabc_notes_determination_text[3]-'0']) {
gregorio_add_texverb_as_note(¤t_note, gregorio_strdup(
@@ -12957,7 +13023,7 @@
YY_BREAK
case 21:
YY_RULE_SETUP
-#line 965 "gabc/gabc-notes-determination.l"
+#line 968 "gabc/gabc-notes-determination.l"
{
if (notesmacros[gabc_notes_determination_text[5]-'0']) {
gregorio_add_texverb_as_note(¤t_note, gregorio_strdup(
@@ -12968,7 +13034,7 @@
YY_BREAK
case 22:
YY_RULE_SETUP
-#line 972 "gabc/gabc-notes-determination.l"
+#line 975 "gabc/gabc-notes-determination.l"
{
BEGIN(texverbnote);
}
@@ -12975,7 +13041,7 @@
YY_BREAK
case 23:
YY_RULE_SETUP
-#line 975 "gabc/gabc-notes-determination.l"
+#line 978 "gabc/gabc-notes-determination.l"
{
BEGIN(texverbglyph);
}
@@ -12982,7 +13048,7 @@
YY_BREAK
case 24:
YY_RULE_SETUP
-#line 978 "gabc/gabc-notes-determination.l"
+#line 981 "gabc/gabc-notes-determination.l"
{
BEGIN(texverbelement);
}
@@ -12989,7 +13055,7 @@
YY_BREAK
case 25:
YY_RULE_SETUP
-#line 981 "gabc/gabc-notes-determination.l"
+#line 984 "gabc/gabc-notes-determination.l"
{
BEGIN(alt);
}
@@ -12996,7 +13062,7 @@
YY_BREAK
case 26:
YY_RULE_SETUP
-#line 984 "gabc/gabc-notes-determination.l"
+#line 987 "gabc/gabc-notes-determination.l"
{
gregorio_add_nlba_as_note(¤t_note, NLBA_BEGINNING, ¬es_lloc);
}
@@ -13003,7 +13069,7 @@
YY_BREAK
case 27:
YY_RULE_SETUP
-#line 987 "gabc/gabc-notes-determination.l"
+#line 990 "gabc/gabc-notes-determination.l"
{
gregorio_add_nlba_as_note(¤t_note, NLBA_END, ¬es_lloc);
}
@@ -13010,7 +13076,7 @@
YY_BREAK
case 28:
YY_RULE_SETUP
-#line 990 "gabc/gabc-notes-determination.l"
+#line 993 "gabc/gabc-notes-determination.l"
{
gregorio_start_autofuse(¤t_note, ¬es_lloc);
}
@@ -13017,7 +13083,7 @@
YY_BREAK
case 29:
YY_RULE_SETUP
-#line 993 "gabc/gabc-notes-determination.l"
+#line 996 "gabc/gabc-notes-determination.l"
{
gregorio_end_autofuse(¤t_note, ¬es_lloc);
}
@@ -13025,7 +13091,7 @@
case 30:
/* rule 30 can match eol */
YY_RULE_SETUP
-#line 996 "gabc/gabc-notes-determination.l"
+#line 999 "gabc/gabc-notes-determination.l"
{
gregorio_snprintf(tempstr, sizeof tempstr,
"\\GreOverBrace{%s}{0pt}{0pt}{%d}",
@@ -13036,7 +13102,7 @@
case 31:
/* rule 31 can match eol */
YY_RULE_SETUP
-#line 1002 "gabc/gabc-notes-determination.l"
+#line 1005 "gabc/gabc-notes-determination.l"
{
gregorio_snprintf(tempstr, sizeof tempstr,
"\\GreUnderBrace{%s}{0pt}{0pt}{%d}",
@@ -13047,7 +13113,7 @@
case 32:
/* rule 32 can match eol */
YY_RULE_SETUP
-#line 1008 "gabc/gabc-notes-determination.l"
+#line 1011 "gabc/gabc-notes-determination.l"
{
gregorio_snprintf(tempstr, sizeof tempstr,
"\\GreOverCurlyBrace{%s}{0pt}{0pt}{%d}{0}",
@@ -13058,7 +13124,7 @@
case 33:
/* rule 33 can match eol */
YY_RULE_SETUP
-#line 1014 "gabc/gabc-notes-determination.l"
+#line 1017 "gabc/gabc-notes-determination.l"
{
gregorio_snprintf(tempstr, sizeof tempstr,
"\\GreOverCurlyBrace{%s}{0pt}{0pt}{%d}{1}",
@@ -13069,7 +13135,7 @@
case 34:
/* rule 34 can match eol */
YY_RULE_SETUP
-#line 1020 "gabc/gabc-notes-determination.l"
+#line 1023 "gabc/gabc-notes-determination.l"
{
gregorio_add_cs_to_note(¤t_note,
gregorio_strdup(gabc_notes_determination_text), false);
@@ -13078,7 +13144,7 @@
case 35:
/* rule 35 can match eol */
YY_RULE_SETUP
-#line 1024 "gabc/gabc-notes-determination.l"
+#line 1027 "gabc/gabc-notes-determination.l"
{
gregorio_add_cs_to_note(¤t_note,
gregorio_strdup(gabc_notes_determination_text), true);
@@ -13087,7 +13153,7 @@
case 36:
/* rule 36 can match eol */
YY_RULE_SETUP
-#line 1028 "gabc/gabc-notes-determination.l"
+#line 1031 "gabc/gabc-notes-determination.l"
{
gregorio_add_texverb_to_note(current_note,
gregorio_strdup(gabc_notes_determination_text));
@@ -13096,7 +13162,7 @@
case 37:
/* rule 37 can match eol */
YY_RULE_SETUP
-#line 1032 "gabc/gabc-notes-determination.l"
+#line 1035 "gabc/gabc-notes-determination.l"
{
gregorio_add_texverb_as_note(¤t_note,
gregorio_strdup(gabc_notes_determination_text),
@@ -13106,7 +13172,7 @@
case 38:
/* rule 38 can match eol */
YY_RULE_SETUP
-#line 1037 "gabc/gabc-notes-determination.l"
+#line 1040 "gabc/gabc-notes-determination.l"
{
gregorio_add_texverb_as_note(¤t_note,
gregorio_strdup(gabc_notes_determination_text),
@@ -13116,7 +13182,7 @@
case 39:
/* rule 39 can match eol */
YY_RULE_SETUP
-#line 1042 "gabc/gabc-notes-determination.l"
+#line 1045 "gabc/gabc-notes-determination.l"
{
gregorio_add_texverb_as_note(¤t_note,
gregorio_strdup(gabc_notes_determination_text), GRE_ALT,
@@ -13125,7 +13191,7 @@
YY_BREAK
case 40:
YY_RULE_SETUP
-#line 1047 "gabc/gabc-notes-determination.l"
+#line 1050 "gabc/gabc-notes-determination.l"
{
BEGIN(space);
}
@@ -13135,7 +13201,7 @@
(yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 1050 "gabc/gabc-notes-determination.l"
+#line 1053 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(¤t_note, SP_AD_HOC_SPACE,
gregorio_strdup(gabc_notes_determination_text), ¬es_lloc);
@@ -13143,7 +13209,7 @@
YY_BREAK
case 42:
YY_RULE_SETUP
-#line 1054 "gabc/gabc-notes-determination.l"
+#line 1057 "gabc/gabc-notes-determination.l"
{
BEGIN(nbspace);
}
@@ -13153,7 +13219,7 @@
(yy_c_buf_p) = yy_cp -= 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 1057 "gabc/gabc-notes-determination.l"
+#line 1060 "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);
@@ -13161,7 +13227,7 @@
YY_BREAK
case 44:
YY_RULE_SETUP
-#line 1061 "gabc/gabc-notes-determination.l"
+#line 1064 "gabc/gabc-notes-determination.l"
{
LEDGER(high, EXPLICITLY_DRAWN, true);
}
@@ -13168,7 +13234,7 @@
YY_BREAK
case 45:
YY_RULE_SETUP
-#line 1064 "gabc/gabc-notes-determination.l"
+#line 1067 "gabc/gabc-notes-determination.l"
{
LEDGER(high, EXPLICITLY_DRAWN, false);
}
@@ -13175,7 +13241,7 @@
YY_BREAK
case 46:
YY_RULE_SETUP
-#line 1067 "gabc/gabc-notes-determination.l"
+#line 1070 "gabc/gabc-notes-determination.l"
{
end_variable_ledger(SO_OVER);
}
@@ -13182,7 +13248,7 @@
YY_BREAK
case 47:
YY_RULE_SETUP
-#line 1070 "gabc/gabc-notes-determination.l"
+#line 1073 "gabc/gabc-notes-determination.l"
{
BEGIN(overledger);
}
@@ -13190,7 +13256,7 @@
case 48:
/* rule 48 can match eol */
YY_RULE_SETUP
-#line 1073 "gabc/gabc-notes-determination.l"
+#line 1076 "gabc/gabc-notes-determination.l"
{
save_before_ledger(gabc_notes_determination_text);
BEGIN(overledger2);
@@ -13199,7 +13265,7 @@
case 49:
/* rule 49 can match eol */
YY_RULE_SETUP
-#line 1077 "gabc/gabc-notes-determination.l"
+#line 1080 "gabc/gabc-notes-determination.l"
{
add_static_ledger(SO_OVER, gabc_notes_determination_text);
BEGIN(endledger);
@@ -13208,7 +13274,7 @@
case 50:
/* rule 50 can match eol */
YY_RULE_SETUP
-#line 1081 "gabc/gabc-notes-determination.l"
+#line 1084 "gabc/gabc-notes-determination.l"
{
add_variable_ledger(SO_OVER, gabc_notes_determination_text);
BEGIN(endledger);
@@ -13216,7 +13282,7 @@
YY_BREAK
case 51:
YY_RULE_SETUP
-#line 1085 "gabc/gabc-notes-determination.l"
+#line 1088 "gabc/gabc-notes-determination.l"
{
LEDGER(low, EXPLICITLY_DRAWN, true);
}
@@ -13223,7 +13289,7 @@
YY_BREAK
case 52:
YY_RULE_SETUP
-#line 1088 "gabc/gabc-notes-determination.l"
+#line 1091 "gabc/gabc-notes-determination.l"
{
LEDGER(low, EXPLICITLY_DRAWN, false);
}
@@ -13230,7 +13296,7 @@
YY_BREAK
case 53:
YY_RULE_SETUP
-#line 1091 "gabc/gabc-notes-determination.l"
+#line 1094 "gabc/gabc-notes-determination.l"
{
end_variable_ledger(SO_UNDER);
}
@@ -13237,7 +13303,7 @@
YY_BREAK
case 54:
YY_RULE_SETUP
-#line 1094 "gabc/gabc-notes-determination.l"
+#line 1097 "gabc/gabc-notes-determination.l"
{
BEGIN(underledger);
}
@@ -13245,7 +13311,7 @@
case 55:
/* rule 55 can match eol */
YY_RULE_SETUP
-#line 1097 "gabc/gabc-notes-determination.l"
+#line 1100 "gabc/gabc-notes-determination.l"
{
save_before_ledger(gabc_notes_determination_text);
BEGIN(underledger2);
@@ -13254,7 +13320,7 @@
case 56:
/* rule 56 can match eol */
YY_RULE_SETUP
-#line 1101 "gabc/gabc-notes-determination.l"
+#line 1104 "gabc/gabc-notes-determination.l"
{
add_static_ledger(SO_UNDER, gabc_notes_determination_text);
BEGIN(endledger);
@@ -13263,7 +13329,7 @@
case 57:
/* rule 57 can match eol */
YY_RULE_SETUP
-#line 1105 "gabc/gabc-notes-determination.l"
+#line 1108 "gabc/gabc-notes-determination.l"
{
add_variable_ledger(SO_UNDER, gabc_notes_determination_text);
BEGIN(endledger);
@@ -13271,7 +13337,7 @@
YY_BREAK
case 58:
YY_RULE_SETUP
-#line 1109 "gabc/gabc-notes-determination.l"
+#line 1112 "gabc/gabc-notes-determination.l"
{
BEGIN(INITIAL);
}
@@ -13279,7 +13345,7 @@
case 59:
/* rule 59 can match eol */
YY_RULE_SETUP
-#line 1112 "gabc/gabc-notes-determination.l"
+#line 1115 "gabc/gabc-notes-determination.l"
{
parse_slur();
}
@@ -13286,7 +13352,7 @@
YY_BREAK
case 60:
YY_RULE_SETUP
-#line 1115 "gabc/gabc-notes-determination.l"
+#line 1118 "gabc/gabc-notes-determination.l"
{
start_var_slur();
}
@@ -13293,7 +13359,7 @@
YY_BREAK
case 61:
YY_RULE_SETUP
-#line 1118 "gabc/gabc-notes-determination.l"
+#line 1121 "gabc/gabc-notes-determination.l"
{
end_var_slur();
}
@@ -13301,7 +13367,7 @@
case 62:
/* rule 62 can match eol */
YY_RULE_SETUP
-#line 1125 "gabc/gabc-notes-determination.l"
+#line 1128 "gabc/gabc-notes-determination.l"
{
parse_hepisema_adjustment();
}
@@ -13308,7 +13374,7 @@
YY_BREAK
case 63:
YY_RULE_SETUP
-#line 1128 "gabc/gabc-notes-determination.l"
+#line 1131 "gabc/gabc-notes-determination.l"
{
end_hepisema_adjustment();
}
@@ -13315,7 +13381,7 @@
YY_BREAK
case 64:
YY_RULE_SETUP
-#line 1131 "gabc/gabc-notes-determination.l"
+#line 1134 "gabc/gabc-notes-determination.l"
{
left_bracket();
}
@@ -13322,7 +13388,7 @@
YY_BREAK
case 65:
YY_RULE_SETUP
-#line 1134 "gabc/gabc-notes-determination.l"
+#line 1137 "gabc/gabc-notes-determination.l"
{
right_bracket();
}
@@ -13329,7 +13395,7 @@
YY_BREAK
case 66:
YY_RULE_SETUP
-#line 1137 "gabc/gabc-notes-determination.l"
+#line 1140 "gabc/gabc-notes-determination.l"
{
gregorio_add_texverb_as_note(¤t_note,
gregorio_strdup("\\hbox to 0pt{"), GRE_TEXVERB_ELEMENT,
@@ -13338,7 +13404,7 @@
YY_BREAK
case 67:
YY_RULE_SETUP
-#line 1142 "gabc/gabc-notes-determination.l"
+#line 1145 "gabc/gabc-notes-determination.l"
{
gregorio_add_texverb_as_note(¤t_note,
gregorio_strdup("\\hss%\n}%\n\\GreNoBreak\\relax "),
@@ -13347,7 +13413,7 @@
YY_BREAK
case 68:
YY_RULE_SETUP
-#line 1147 "gabc/gabc-notes-determination.l"
+#line 1150 "gabc/gabc-notes-determination.l"
{
gregorio_add_manual_custos_as_note(¤t_note,
pitch_letter_to_height(gabc_notes_determination_text[0]),
@@ -13357,12 +13423,12 @@
case 69:
/* rule 69 can match eol */
YY_RULE_SETUP
-#line 1152 "gabc/gabc-notes-determination.l"
+#line 1155 "gabc/gabc-notes-determination.l"
/* ignore ends of line and tabs */;
YY_BREAK
case 70:
YY_RULE_SETUP
-#line 1153 "gabc/gabc-notes-determination.l"
+#line 1156 "gabc/gabc-notes-determination.l"
{
gregorio_add_suppress_custos_as_note(¤t_note, ¬es_lloc);
}
@@ -13369,7 +13435,7 @@
YY_BREAK
case 71:
YY_RULE_SETUP
-#line 1156 "gabc/gabc-notes-determination.l"
+#line 1159 "gabc/gabc-notes-determination.l"
{
gregorio_add_custos_as_note(¤t_note, ¬es_lloc);
}
@@ -13376,7 +13442,7 @@
YY_BREAK
case 72:
YY_RULE_SETUP
-#line 1159 "gabc/gabc-notes-determination.l"
+#line 1162 "gabc/gabc-notes-determination.l"
{
gregorio_add_end_of_line_as_note(¤t_note, false, false, false,
¬es_lloc);
@@ -13384,7 +13450,7 @@
YY_BREAK
case 73:
YY_RULE_SETUP
-#line 1163 "gabc/gabc-notes-determination.l"
+#line 1166 "gabc/gabc-notes-determination.l"
{
gregorio_add_end_of_line_as_note(¤t_note, false, true, true,
¬es_lloc);
@@ -13392,7 +13458,7 @@
YY_BREAK
case 74:
YY_RULE_SETUP
-#line 1167 "gabc/gabc-notes-determination.l"
+#line 1170 "gabc/gabc-notes-determination.l"
{
gregorio_add_end_of_line_as_note(¤t_note, false, true, false,
¬es_lloc);
@@ -13400,7 +13466,7 @@
YY_BREAK
case 75:
YY_RULE_SETUP
-#line 1171 "gabc/gabc-notes-determination.l"
+#line 1174 "gabc/gabc-notes-determination.l"
{
gregorio_add_end_of_line_as_note(¤t_note, true, false, false,
¬es_lloc);
@@ -13408,7 +13474,7 @@
YY_BREAK
case 76:
YY_RULE_SETUP
-#line 1175 "gabc/gabc-notes-determination.l"
+#line 1178 "gabc/gabc-notes-determination.l"
{
gregorio_add_end_of_line_as_note(¤t_note, true, true, true,
¬es_lloc);
@@ -13416,7 +13482,7 @@
YY_BREAK
case 77:
YY_RULE_SETUP
-#line 1179 "gabc/gabc-notes-determination.l"
+#line 1182 "gabc/gabc-notes-determination.l"
{
gregorio_add_end_of_line_as_note(¤t_note, true, true, false,
¬es_lloc);
@@ -13424,7 +13490,7 @@
YY_BREAK
case 78:
YY_RULE_SETUP
-#line 1183 "gabc/gabc-notes-determination.l"
+#line 1186 "gabc/gabc-notes-determination.l"
{
gregorio_add_clef_as_note(¤t_note,
letter_to_clef(gabc_notes_determination_text[0]),
@@ -13434,7 +13500,7 @@
YY_BREAK
case 79:
YY_RULE_SETUP
-#line 1189 "gabc/gabc-notes-determination.l"
+#line 1192 "gabc/gabc-notes-determination.l"
{
gregorio_add_clef_as_note(¤t_note,
letter_to_clef(gabc_notes_determination_text[0]),
@@ -13444,7 +13510,7 @@
YY_BREAK
case 80:
YY_RULE_SETUP
-#line 1195 "gabc/gabc-notes-determination.l"
+#line 1198 "gabc/gabc-notes-determination.l"
{
gregorio_add_secondary_clef_to_note(current_note,
letter_to_clef(gabc_notes_determination_text[1]),
@@ -13453,7 +13519,7 @@
YY_BREAK
case 81:
YY_RULE_SETUP
-#line 1200 "gabc/gabc-notes-determination.l"
+#line 1203 "gabc/gabc-notes-determination.l"
{
gregorio_add_secondary_clef_to_note(current_note,
letter_to_clef(gabc_notes_determination_text[1]),
@@ -13462,7 +13528,7 @@
YY_BREAK
case 82:
YY_RULE_SETUP
-#line 1205 "gabc/gabc-notes-determination.l"
+#line 1208 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_VIRGULA);
}
@@ -13469,7 +13535,7 @@
YY_BREAK
case 83:
YY_RULE_SETUP
-#line 1208 "gabc/gabc-notes-determination.l"
+#line 1211 "gabc/gabc-notes-determination.l"
{
add_bar_as_note(B_VIRGULA_HIGH);
}
@@ -13476,71 +13542,85 @@
YY_BREAK
case 84:
YY_RULE_SETUP
-#line 1211 "gabc/gabc-notes-determination.l"
+#line 1214 "gabc/gabc-notes-determination.l"
{
- add_bar_as_note(B_DIVISIO_MINIMA);
+ add_bar_as_note(B_DIVISIO_MINIMIS);
}
YY_BREAK
case 85:
YY_RULE_SETUP
-#line 1214 "gabc/gabc-notes-determination.l"
+#line 1217 "gabc/gabc-notes-determination.l"
{
- add_bar_as_note(B_DIVISIO_MINIMA_HIGH);
+ add_bar_as_note(B_DIVISIO_MINIMIS_HIGH);
}
YY_BREAK
case 86:
YY_RULE_SETUP
-#line 1217 "gabc/gabc-notes-determination.l"
+#line 1220 "gabc/gabc-notes-determination.l"
{
- add_bar_as_note(parse_dominican_bar(gabc_notes_determination_text[1]));
+ add_bar_as_note(B_DIVISIO_MINIMA);
}
YY_BREAK
case 87:
YY_RULE_SETUP
-#line 1220 "gabc/gabc-notes-determination.l"
+#line 1223 "gabc/gabc-notes-determination.l"
{
- add_bar_as_note(B_DIVISIO_MINOR);
+ add_bar_as_note(B_DIVISIO_MINIMA_HIGH);
}
YY_BREAK
case 88:
YY_RULE_SETUP
-#line 1223 "gabc/gabc-notes-determination.l"
+#line 1226 "gabc/gabc-notes-determination.l"
{
- add_bar_as_note(B_DIVISIO_MAIOR);
+ add_bar_as_note(parse_dominican_bar(gabc_notes_determination_text[1]));
}
YY_BREAK
case 89:
YY_RULE_SETUP
-#line 1226 "gabc/gabc-notes-determination.l"
+#line 1229 "gabc/gabc-notes-determination.l"
{
- add_bar_as_note(B_DIVISIO_FINALIS);
+ add_bar_as_note(B_DIVISIO_MINOR);
}
YY_BREAK
case 90:
YY_RULE_SETUP
-#line 1229 "gabc/gabc-notes-determination.l"
+#line 1232 "gabc/gabc-notes-determination.l"
{
- add_bar_as_note(B_DIVISIO_MAIOR_DOTTED);
+ add_bar_as_note(B_DIVISIO_MAIOR);
}
YY_BREAK
case 91:
YY_RULE_SETUP
-#line 1232 "gabc/gabc-notes-determination.l"
+#line 1235 "gabc/gabc-notes-determination.l"
{
- gregorio_add_cavum(current_note);
+ add_bar_as_note(B_DIVISIO_FINALIS);
}
YY_BREAK
case 92:
YY_RULE_SETUP
-#line 1235 "gabc/gabc-notes-determination.l"
+#line 1238 "gabc/gabc-notes-determination.l"
{
+ add_bar_as_note(B_DIVISIO_MAIOR_DOTTED);
+ }
+ YY_BREAK
+case 93:
+YY_RULE_SETUP
+#line 1241 "gabc/gabc-notes-determination.l"
+{
+ gregorio_add_cavum(current_note);
+ }
+ YY_BREAK
+case 94:
+YY_RULE_SETUP
+#line 1244 "gabc/gabc-notes-determination.l"
+{
gregorio_change_shape(current_note, S_LINEA_PUNCTUM,
legacy_oriscus_orientation);
}
YY_BREAK
-case 93:
+case 95:
YY_RULE_SETUP
-#line 1239 "gabc/gabc-notes-determination.l"
+#line 1248 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_LINEA_PUNCTUM,
legacy_oriscus_orientation);
@@ -13547,466 +13627,466 @@
gregorio_add_cavum(current_note);
}
YY_BREAK
-case 94:
+case 96:
YY_RULE_SETUP
-#line 1244 "gabc/gabc-notes-determination.l"
+#line 1253 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _ACCENTUS);
}
YY_BREAK
-case 95:
+case 97:
YY_RULE_SETUP
-#line 1247 "gabc/gabc-notes-determination.l"
+#line 1256 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _ACCENTUS_REVERSUS);
}
YY_BREAK
-case 96:
+case 98:
YY_RULE_SETUP
-#line 1250 "gabc/gabc-notes-determination.l"
+#line 1259 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _CIRCULUS);
}
YY_BREAK
-case 97:
+case 99:
YY_RULE_SETUP
-#line 1253 "gabc/gabc-notes-determination.l"
+#line 1262 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _SEMI_CIRCULUS);
}
YY_BREAK
-case 98:
+case 100:
YY_RULE_SETUP
-#line 1256 "gabc/gabc-notes-determination.l"
+#line 1265 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _SEMI_CIRCULUS_REVERSUS);
}
YY_BREAK
-case 99:
+case 101:
YY_RULE_SETUP
-#line 1259 "gabc/gabc-notes-determination.l"
+#line 1268 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _MUSICA_FICTA_FLAT);
}
YY_BREAK
-case 100:
+case 102:
YY_RULE_SETUP
-#line 1262 "gabc/gabc-notes-determination.l"
+#line 1271 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _MUSICA_FICTA_NATURAL);
}
YY_BREAK
-case 101:
+case 103:
YY_RULE_SETUP
-#line 1265 "gabc/gabc-notes-determination.l"
+#line 1274 "gabc/gabc-notes-determination.l"
{
gregorio_add_special_sign(current_note, _MUSICA_FICTA_SHARP);
}
YY_BREAK
-case 102:
+case 104:
YY_RULE_SETUP
-#line 1268 "gabc/gabc-notes-determination.l"
+#line 1277 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_FLAT, legacy_oriscus_orientation);
}
YY_BREAK
-case 103:
+case 105:
YY_RULE_SETUP
-#line 1271 "gabc/gabc-notes-determination.l"
+#line 1280 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_SHARP,
legacy_oriscus_orientation);
}
YY_BREAK
-case 104:
+case 106:
YY_RULE_SETUP
-#line 1275 "gabc/gabc-notes-determination.l"
+#line 1284 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_NATURAL,
legacy_oriscus_orientation);
}
YY_BREAK
-case 105:
+case 107:
YY_RULE_SETUP
-#line 1279 "gabc/gabc-notes-determination.l"
+#line 1288 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(¤t_note, SP_HALF_SPACE, NULL,
¬es_lloc);
}
YY_BREAK
-case 106:
+case 108:
YY_RULE_SETUP
-#line 1283 "gabc/gabc-notes-determination.l"
+#line 1292 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(¤t_note, SP_INTERGLYPH_SPACE, NULL,
¬es_lloc);
}
YY_BREAK
-case 107:
+case 109:
YY_RULE_SETUP
-#line 1287 "gabc/gabc-notes-determination.l"
+#line 1296 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(¤t_note, SP_NEUMATIC_CUT, NULL,
¬es_lloc);
}
YY_BREAK
-case 108:
+case 110:
*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
(yy_c_buf_p) = yy_cp = yy_bp + 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 1291 "gabc/gabc-notes-determination.l"
+#line 1300 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(¤t_note, SP_NEUMATIC_CUT, NULL,
¬es_lloc);
}
YY_BREAK
-case 109:
+case 111:
YY_RULE_SETUP
-#line 1295 "gabc/gabc-notes-determination.l"
+#line 1304 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(¤t_note, SP_LARGER_SPACE, NULL,
¬es_lloc);
}
YY_BREAK
-case 110:
+case 112:
YY_RULE_SETUP
-#line 1299 "gabc/gabc-notes-determination.l"
+#line 1308 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(¤t_note, SP_GLYPH_SPACE, NULL,
¬es_lloc);
}
YY_BREAK
-case 111:
+case 113:
YY_RULE_SETUP
-#line 1303 "gabc/gabc-notes-determination.l"
+#line 1312 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(¤t_note, SP_NEUMATIC_CUT_NB, NULL,
¬es_lloc);
}
YY_BREAK
-case 112:
+case 114:
*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
(yy_c_buf_p) = yy_cp = yy_bp + 2;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 1307 "gabc/gabc-notes-determination.l"
+#line 1316 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(¤t_note, SP_NEUMATIC_CUT_NB, NULL,
¬es_lloc);
}
YY_BREAK
-case 113:
+case 115:
YY_RULE_SETUP
-#line 1311 "gabc/gabc-notes-determination.l"
+#line 1320 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(¤t_note, SP_LARGER_SPACE_NB, NULL,
¬es_lloc);
}
YY_BREAK
-case 114:
+case 116:
YY_RULE_SETUP
-#line 1315 "gabc/gabc-notes-determination.l"
+#line 1324 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(¤t_note, SP_GLYPH_SPACE_NB, NULL,
¬es_lloc);
}
YY_BREAK
-case 115:
-/* rule 115 can match eol */
+case 117:
+/* rule 117 can match eol */
*yy_cp = (yy_hold_char); /* undo effects of setting up yytext */
YY_LINENO_REWIND_TO(yy_bp + 1);
(yy_c_buf_p) = yy_cp = yy_bp + 1;
YY_DO_BEFORE_ACTION; /* set up yytext again */
YY_RULE_SETUP
-#line 1319 "gabc/gabc-notes-determination.l"
+#line 1328 "gabc/gabc-notes-determination.l"
{
gregorio_add_space_as_note(¤t_note, SP_ZERO_WIDTH, NULL,
¬es_lloc);
}
YY_BREAK
-case 116:
+case 118:
YY_RULE_SETUP
-#line 1323 "gabc/gabc-notes-determination.l"
+#line 1332 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_LINEA,
legacy_oriscus_orientation);
}
YY_BREAK
-case 117:
+case 119:
YY_RULE_SETUP
-#line 1327 "gabc/gabc-notes-determination.l"
+#line 1336 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_BIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
-case 118:
+case 120:
YY_RULE_SETUP
-#line 1330 "gabc/gabc-notes-determination.l"
+#line 1339 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_TRIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
-case 119:
+case 121:
YY_RULE_SETUP
-#line 1333 "gabc/gabc-notes-determination.l"
+#line 1342 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_BIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
-case 120:
+case 122:
YY_RULE_SETUP
-#line 1336 "gabc/gabc-notes-determination.l"
+#line 1345 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_TRIVIRGA, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
-case 121:
+case 123:
YY_RULE_SETUP
-#line 1339 "gabc/gabc-notes-determination.l"
+#line 1348 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_DISTROPHA, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
-case 122:
+case 124:
YY_RULE_SETUP
-#line 1342 "gabc/gabc-notes-determination.l"
+#line 1351 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_DISTROPHA, _NO_SIGN, L_AUCTUS_ASCENDENS);
}
YY_BREAK
-case 123:
+case 125:
YY_RULE_SETUP
-#line 1345 "gabc/gabc-notes-determination.l"
+#line 1354 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_TRISTROPHA, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
-case 124:
+case 126:
YY_RULE_SETUP
-#line 1348 "gabc/gabc-notes-determination.l"
+#line 1357 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_TRISTROPHA, _NO_SIGN, L_AUCTUS_ASCENDENS);
}
YY_BREAK
-case 125:
+case 127:
YY_RULE_SETUP
-#line 1351 "gabc/gabc-notes-determination.l"
+#line 1360 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, S_PUNCTUM, _NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
-case 126:
+case 128:
YY_RULE_SETUP
-#line 1354 "gabc/gabc-notes-determination.l"
+#line 1363 "gabc/gabc-notes-determination.l"
{
lex_add_note(1, S_PUNCTUM, _NO_SIGN, L_INITIO_DEBILIS);
}
YY_BREAK
-case 127:
+case 129:
YY_RULE_SETUP
-#line 1357 "gabc/gabc-notes-determination.l"
+#line 1366 "gabc/gabc-notes-determination.l"
{
lex_add_note(1, S_PUNCTUM, _NO_SIGN, L_FUSED);
}
YY_BREAK
-case 128:
+case 130:
YY_RULE_SETUP
-#line 1360 "gabc/gabc-notes-determination.l"
+#line 1369 "gabc/gabc-notes-determination.l"
{
lex_add_note(0, punctum_inclinatum(gabc_notes_determination_text[1]),
_NO_SIGN, L_NO_LIQUESCENTIA);
}
YY_BREAK
-case 129:
+case 131:
YY_RULE_SETUP
-#line 1364 "gabc/gabc-notes-determination.l"
+#line 1373 "gabc/gabc-notes-determination.l"
{
lex_add_note(1, punctum_inclinatum(gabc_notes_determination_text[2]),
_NO_SIGN, L_INITIO_DEBILIS);
}
YY_BREAK
-case 130:
+case 132:
YY_RULE_SETUP
-#line 1368 "gabc/gabc-notes-determination.l"
+#line 1377 "gabc/gabc-notes-determination.l"
{
lex_add_note(1, punctum_inclinatum(gabc_notes_determination_text[2]),
_NO_SIGN, L_FUSED);
}
YY_BREAK
-case 131:
+case 133:
YY_RULE_SETUP
-#line 1372 "gabc/gabc-notes-determination.l"
+#line 1381 "gabc/gabc-notes-determination.l"
{
add_sign(_V_EPISEMA);
}
YY_BREAK
-case 132:
+case 134:
YY_RULE_SETUP
-#line 1375 "gabc/gabc-notes-determination.l"
+#line 1384 "gabc/gabc-notes-determination.l"
{
add_h_episema();
}
YY_BREAK
-case 133:
+case 135:
YY_RULE_SETUP
-#line 1378 "gabc/gabc-notes-determination.l"
+#line 1387 "gabc/gabc-notes-determination.l"
{
add_sign(_PUNCTUM_MORA);
}
YY_BREAK
-case 134:
+case 136:
YY_RULE_SETUP
-#line 1381 "gabc/gabc-notes-determination.l"
+#line 1390 "gabc/gabc-notes-determination.l"
{
gregorio_add_tail_liquescentia(current_note, L_DEMINUTUS,
legacy_oriscus_orientation);
}
YY_BREAK
-case 135:
+case 137:
YY_RULE_SETUP
-#line 1385 "gabc/gabc-notes-determination.l"
+#line 1394 "gabc/gabc-notes-determination.l"
{
gregorio_add_tail_liquescentia(current_note, L_AUCTUS_DESCENDENS,
legacy_oriscus_orientation);
}
YY_BREAK
-case 136:
+case 138:
YY_RULE_SETUP
-#line 1389 "gabc/gabc-notes-determination.l"
+#line 1398 "gabc/gabc-notes-determination.l"
{
gregorio_add_tail_liquescentia(current_note, L_AUCTUS_ASCENDENS,
legacy_oriscus_orientation);
}
YY_BREAK
-case 137:
+case 139:
YY_RULE_SETUP
-#line 1393 "gabc/gabc-notes-determination.l"
+#line 1402 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_QUADRATUM,
legacy_oriscus_orientation);
}
YY_BREAK
-case 138:
+case 140:
YY_RULE_SETUP
-#line 1397 "gabc/gabc-notes-determination.l"
+#line 1406 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_ORISCUS_UNDETERMINED,
legacy_oriscus_orientation);
}
YY_BREAK
-case 139:
+case 141:
YY_RULE_SETUP
-#line 1401 "gabc/gabc-notes-determination.l"
+#line 1410 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_ORISCUS_DESCENDENS,
legacy_oriscus_orientation);
}
YY_BREAK
-case 140:
+case 142:
YY_RULE_SETUP
-#line 1405 "gabc/gabc-notes-determination.l"
+#line 1414 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_ORISCUS_ASCENDENS,
legacy_oriscus_orientation);
}
YY_BREAK
-case 141:
+case 143:
YY_RULE_SETUP
-#line 1409 "gabc/gabc-notes-determination.l"
+#line 1418 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_ORISCUS_SCAPUS_UNDETERMINED,
legacy_oriscus_orientation);
}
YY_BREAK
-case 142:
+case 144:
YY_RULE_SETUP
-#line 1413 "gabc/gabc-notes-determination.l"
+#line 1422 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_ORISCUS_SCAPUS_DESCENDENS,
legacy_oriscus_orientation);
}
YY_BREAK
-case 143:
+case 145:
YY_RULE_SETUP
-#line 1417 "gabc/gabc-notes-determination.l"
+#line 1426 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_ORISCUS_SCAPUS_ASCENDENS,
legacy_oriscus_orientation);
}
YY_BREAK
-case 144:
+case 146:
YY_RULE_SETUP
-#line 1421 "gabc/gabc-notes-determination.l"
+#line 1430 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_QUILISMA,
legacy_oriscus_orientation);
}
YY_BREAK
-case 145:
+case 147:
YY_RULE_SETUP
-#line 1425 "gabc/gabc-notes-determination.l"
+#line 1434 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_QUILISMA_QUADRATUM,
legacy_oriscus_orientation);
}
YY_BREAK
-case 146:
+case 148:
YY_RULE_SETUP
-#line 1429 "gabc/gabc-notes-determination.l"
+#line 1438 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_VIRGA,
legacy_oriscus_orientation);
}
YY_BREAK
-case 147:
+case 149:
YY_RULE_SETUP
-#line 1433 "gabc/gabc-notes-determination.l"
+#line 1442 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_VIRGA_REVERSA,
legacy_oriscus_orientation);
}
YY_BREAK
-case 148:
+case 150:
YY_RULE_SETUP
-#line 1437 "gabc/gabc-notes-determination.l"
+#line 1446 "gabc/gabc-notes-determination.l"
{
gregorio_change_shape(current_note, S_STROPHA,
legacy_oriscus_orientation);
}
YY_BREAK
-case 149:
+case 151:
YY_RULE_SETUP
-#line 1441 "gabc/gabc-notes-determination.l"
+#line 1450 "gabc/gabc-notes-determination.l"
{
LEDGER(high, EXPLICIT, true);
}
YY_BREAK
-case 150:
+case 152:
YY_RULE_SETUP
-#line 1444 "gabc/gabc-notes-determination.l"
+#line 1453 "gabc/gabc-notes-determination.l"
{
LEDGER(high, EXPLICIT, false);
}
YY_BREAK
-case 151:
+case 153:
YY_RULE_SETUP
-#line 1447 "gabc/gabc-notes-determination.l"
+#line 1456 "gabc/gabc-notes-determination.l"
{
LEDGER(low, EXPLICIT, true);
}
YY_BREAK
-case 152:
+case 154:
YY_RULE_SETUP
-#line 1450 "gabc/gabc-notes-determination.l"
+#line 1459 "gabc/gabc-notes-determination.l"
{
LEDGER(low, EXPLICIT, false);
}
YY_BREAK
-case 153:
-/* rule 153 can match eol */
+case 155:
+/* rule 155 can match eol */
YY_RULE_SETUP
-#line 1453 "gabc/gabc-notes-determination.l"
+#line 1462 "gabc/gabc-notes-determination.l"
{
gregorio_messagef("det_notes_from_string", VERBOSITY_ERROR, 0,
_("unrecognized character: \"%c\""),
@@ -14013,12 +14093,12 @@
gabc_notes_determination_text[0]);
}
YY_BREAK
-case 154:
+case 156:
YY_RULE_SETUP
-#line 1459 "gabc/gabc-notes-determination.l"
+#line 1468 "gabc/gabc-notes-determination.l"
ECHO;
YY_BREAK
-#line 14021 "gabc/gabc-notes-determination-l.c"
+#line 14101 "gabc/gabc-notes-determination-l.c"
case YY_STATE_EOF(INITIAL):
case YY_STATE_EOF(texverbnote):
case YY_STATE_EOF(texverbglyph):
@@ -15007,7 +15087,7 @@
#define YYTABLES_NAME "yytables"
-#line 1459 "gabc/gabc-notes-determination.l"
+#line 1468 "gabc/gabc-notes-determination.l"
gregorio_note *gabc_det_notes_from_string(char *str, char *newmacros[10],
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-notes-determination.l 2019-03-11 02:46:28 UTC (rev 50335)
@@ -3,7 +3,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file implements the note parser.
*
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
@@ -127,6 +127,9 @@
case '0':
return S_PUNCTUM_INCLINATUM_DESCENDENS;
+ case '2':
+ return S_PUNCTUM_INCLINATUM_STANS;
+
case '1':
return S_PUNCTUM_INCLINATUM_ASCENDENS;
}
@@ -1208,6 +1211,12 @@
`0 {
add_bar_as_note(B_VIRGULA_HIGH);
}
+\^ {
+ add_bar_as_note(B_DIVISIO_MINIMIS);
+ }
+\^0 {
+ add_bar_as_note(B_DIVISIO_MINIMIS_HIGH);
+ }
, {
add_bar_as_note(B_DIVISIO_MINIMA);
}
@@ -1357,15 +1366,15 @@
@[a-np] {
lex_add_note(1, S_PUNCTUM, _NO_SIGN, L_FUSED);
}
-[A-NP][01]? {
+[A-NP][012]? {
lex_add_note(0, punctum_inclinatum(gabc_notes_determination_text[1]),
_NO_SIGN, L_NO_LIQUESCENTIA);
}
--[A-NP][01]? {
+-[A-NP][012]? {
lex_add_note(1, punctum_inclinatum(gabc_notes_determination_text[2]),
_NO_SIGN, L_INITIO_DEBILIS);
}
-@[A-NP][01]? {
+@[A-NP][012]? {
lex_add_note(1, punctum_inclinatum(gabc_notes_determination_text[2]),
_NO_SIGN, L_FUSED);
}
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-l.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -981,7 +981,7 @@
* This file implements the score lexer.
*
* Gregorio score determination in gabc input.
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.0.4. */
+/* A Bison parser, made by GNU Bison 3.3.2. */
/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+ Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -40,11 +41,14 @@
define necessary library symbols; they are noted "INFRINGES ON
USER NAME SPACE" below. */
+/* Undocumented macros, especially those whose name start with YY_,
+ are private implementation details. Do not rely on them. */
+
/* Identify Bison output. */
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "3.0.4"
+#define YYBISON_VERSION "3.3.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -70,8 +74,8 @@
#define yychar gabc_score_determination_char
#define yylloc gabc_score_determination_lloc
-/* Copy the first part of user declarations. */
-#line 1 "gabc/gabc-score-determination.y" /* yacc.c:339 */
+/* First part of user prologue. */
+#line 1 "gabc/gabc-score-determination.y" /* yacc.c:337 */
/*
* Gregorio is a program that translates gabc files to GregorioTeX
@@ -78,7 +82,7 @@
* This file implements the score parser.
*
* Gregorio score determination from gabc.
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
@@ -725,13 +729,16 @@
return first;
}
-#line 729 "gabc/gabc-score-determination-y.c" /* yacc.c:339 */
-
+#line 733 "gabc/gabc-score-determination-y.c" /* yacc.c:337 */
# ifndef YY_NULLPTR
-# if defined __cplusplus && 201103L <= __cplusplus
-# define YY_NULLPTR nullptr
+# if defined __cplusplus
+# if 201103L <= __cplusplus
+# define YY_NULLPTR nullptr
+# else
+# define YY_NULLPTR 0
+# endif
# else
-# define YY_NULLPTR 0
+# define YY_NULLPTR ((void*)0)
# endif
# endif
@@ -912,9 +919,7 @@
#endif /* !YY_GABC_SCORE_DETERMINATION_GABC_GABC_SCORE_DETERMINATION_Y_H_INCLUDED */
-/* Copy the second part of user declarations. */
-#line 918 "gabc/gabc-score-determination-y.c" /* yacc.c:358 */
#ifdef short
# undef short
@@ -935,13 +940,13 @@
#ifdef YYTYPE_UINT16
typedef YYTYPE_UINT16 yytype_uint16;
#else
-typedef unsigned short int yytype_uint16;
+typedef unsigned short yytype_uint16;
#endif
#ifdef YYTYPE_INT16
typedef YYTYPE_INT16 yytype_int16;
#else
-typedef short int yytype_int16;
+typedef short yytype_int16;
#endif
#ifndef YYSIZE_T
@@ -953,7 +958,7 @@
# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T size_t
# else
-# define YYSIZE_T unsigned int
+# define YYSIZE_T unsigned
# endif
#endif
@@ -989,15 +994,6 @@
# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
#endif
-#if !defined _Noreturn \
- && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-# define _Noreturn __declspec (noreturn)
-# else
-# define _Noreturn YY_ATTRIBUTE ((__noreturn__))
-# endif
-#endif
-
/* Suppress unused-variable warnings by "using" E. */
#if ! defined lint || defined __GNUC__
# define YYUSE(E) ((void) (E))
@@ -1005,7 +1001,7 @@
# define YYUSE(E) /* empty */
#endif
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
/* Suppress an incorrect diagnostic about yylval being uninitialized. */
# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
_Pragma ("GCC diagnostic push") \
@@ -1169,16 +1165,16 @@
/* YYNSTATES -- Number of states. */
#define YYNSTATES 145
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
- by yylex, with out-of-bounds checking. */
#define YYUNDEFTOK 2
#define YYMAXUTOK 317
+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
+ as returned by yylex, with out-of-bounds checking. */
#define YYTRANSLATE(YYX) \
- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+ ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
- as returned by yylex, without out-of-bounds checking. */
+ as returned by yylex. */
static const yytype_uint8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -1472,22 +1468,22 @@
#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(Token, Value) \
-do \
- if (yychar == YYEMPTY) \
- { \
- yychar = (Token); \
- yylval = (Value); \
- YYPOPSTACK (yylen); \
- yystate = *yyssp; \
- goto yybackup; \
- } \
- else \
- { \
- yyerror (YY_("syntax error: cannot back up")); \
- YYERROR; \
- } \
-while (0)
+#define YYBACKUP(Token, Value) \
+ do \
+ if (yychar == YYEMPTY) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ YYPOPSTACK (yylen); \
+ yystate = *yyssp; \
+ goto yybackup; \
+ } \
+ else \
+ { \
+ yyerror (YY_("syntax error: cannot back up")); \
+ YYERROR; \
+ } \
+ while (0)
/* Error token number */
#define YYTERROR 1
@@ -1546,10 +1542,10 @@
/* Print *YYLOCP on YYO. Private, do not rely on its existence. */
YY_ATTRIBUTE_UNUSED
-static unsigned
+static int
yy_location_print_ (FILE *yyo, YYLTYPE const * const yylocp)
{
- unsigned res = 0;
+ int res = 0;
int end_col = 0 != yylocp->last_column ? yylocp->last_column - 1 : 0;
if (0 <= yylocp->first_line)
{
@@ -1592,40 +1588,40 @@
} while (0)
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT. |
-`----------------------------------------*/
+/*-----------------------------------.
+| Print this symbol's value on YYO. |
+`-----------------------------------*/
static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
+yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
{
- FILE *yyo = yyoutput;
- YYUSE (yyo);
+ FILE *yyoutput = yyo;
+ YYUSE (yyoutput);
YYUSE (yylocationp);
if (!yyvaluep)
return;
# ifdef YYPRINT
if (yytype < YYNTOKENS)
- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+ YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
# endif
YYUSE (yytype);
}
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
+/*---------------------------.
+| Print this symbol on YYO. |
+`---------------------------*/
static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
+yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, YYLTYPE const * const yylocationp)
{
- YYFPRINTF (yyoutput, "%s %s (",
+ YYFPRINTF (yyo, "%s %s (",
yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
- YY_LOCATION_PRINT (yyoutput, *yylocationp);
- YYFPRINTF (yyoutput, ": ");
- yy_symbol_value_print (yyoutput, yytype, yyvaluep, yylocationp);
- YYFPRINTF (yyoutput, ")");
+ YY_LOCATION_PRINT (yyo, *yylocationp);
+ YYFPRINTF (yyo, ": ");
+ yy_symbol_value_print (yyo, yytype, yyvaluep, yylocationp);
+ YYFPRINTF (yyo, ")");
}
/*------------------------------------------------------------------.
@@ -1659,7 +1655,7 @@
static void
yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, YYLTYPE *yylsp, int yyrule)
{
- unsigned long int yylno = yyrline[yyrule];
+ unsigned long yylno = yyrline[yyrule];
int yynrhs = yyr2[yyrule];
int yyi;
YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
@@ -1670,7 +1666,7 @@
YYFPRINTF (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr,
yystos[yyssp[yyi + 1 - yynrhs]],
- &(yyvsp[(yyi + 1) - (yynrhs)])
+ &yyvsp[(yyi + 1) - (yynrhs)]
, &(yylsp[(yyi + 1) - (yynrhs)]) );
YYFPRINTF (stderr, "\n");
}
@@ -1774,7 +1770,10 @@
case '\\':
if (*++yyp != '\\')
goto do_not_strip_quotes;
- /* Fall through. */
+ else
+ goto append;
+
+ append:
default:
if (yyres)
yyres[yyn] = *yyp;
@@ -1792,7 +1791,7 @@
if (! yyres)
return yystrlen (yystr);
- return yystpcpy (yyres, yystr) - yyres;
+ return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
}
# endif
@@ -1870,10 +1869,10 @@
yyarg[yycount++] = yytname[yyx];
{
YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
- if (! (yysize <= yysize1
- && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+ yysize = yysize1;
+ else
return 2;
- yysize = yysize1;
}
}
}
@@ -1885,6 +1884,7 @@
case N: \
yyformat = S; \
break
+ default: /* Avoid compiler warnings. */
YYCASE_(0, YY_("syntax error"));
YYCASE_(1, YY_("syntax error, unexpected %s"));
YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
@@ -1896,9 +1896,10 @@
{
YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+ yysize = yysize1;
+ else
return 2;
- yysize = yysize1;
}
if (*yymsg_alloc < yysize)
@@ -2042,7 +2043,7 @@
yychar = YYEMPTY; /* Cause a token to be read. */
/* User initialization code. */
-#line 655 "gabc/gabc-score-determination.y" /* yacc.c:1429 */
+#line 655 "gabc/gabc-score-determination.y" /* yacc.c:1431 */
{
yylloc.first_line = 1;
yylloc.first_column = 0;
@@ -2053,27 +2054,35 @@
yylloc.generate_point_and_click = generate_point_and_click;
}
-#line 2057 "gabc/gabc-score-determination-y.c" /* yacc.c:1429 */
+#line 2058 "gabc/gabc-score-determination-y.c" /* yacc.c:1431 */
yylsp[0] = yylloc;
goto yysetstate;
+
/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate. |
+| yynewstate -- push a new state, which is found in yystate. |
`------------------------------------------------------------*/
- yynewstate:
+yynewstate:
/* In all cases, when you get here, the value and location stacks
have just been pushed. So pushing a state here evens the stacks. */
yyssp++;
- yysetstate:
- *yyssp = yystate;
+/*--------------------------------------------------------------------.
+| yynewstate -- set current state (the top of the stack) to yystate. |
+`--------------------------------------------------------------------*/
+yysetstate:
+ *yyssp = (yytype_int16) yystate;
+
if (yyss + yystacksize - 1 <= yyssp)
+#if !defined yyoverflow && !defined YYSTACK_RELOCATE
+ goto yyexhaustedlab;
+#else
{
/* Get the current used size of the three stacks, in elements. */
- YYSIZE_T yysize = yyssp - yyss + 1;
+ YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
-#ifdef yyoverflow
+# if defined yyoverflow
{
/* Give user a chance to reallocate the stack. Use copies of
these so that the &'s don't force the real ones into
@@ -2091,15 +2100,11 @@
&yyvs1, yysize * sizeof (*yyvsp),
&yyls1, yysize * sizeof (*yylsp),
&yystacksize);
-
- yyls = yyls1;
yyss = yyss1;
yyvs = yyvs1;
+ yyls = yyls1;
}
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
- goto yyexhaustedlab;
-# else
+# else /* defined YYSTACK_RELOCATE */
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
goto yyexhaustedlab;
@@ -2116,12 +2121,11 @@
YYSTACK_RELOCATE (yyss_alloc, yyss);
YYSTACK_RELOCATE (yyvs_alloc, yyvs);
YYSTACK_RELOCATE (yyls_alloc, yyls);
-# undef YYSTACK_RELOCATE
+# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
}
# endif
-#endif /* no yyoverflow */
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
@@ -2128,11 +2132,12 @@
yylsp = yyls + yysize - 1;
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ (unsigned long) yystacksize));
if (yyss + yystacksize - 1 <= yyssp)
YYABORT;
}
+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -2141,11 +2146,11 @@
goto yybackup;
+
/*-----------.
| yybackup. |
`-----------*/
yybackup:
-
/* Do appropriate processing given the current state. Read a
lookahead token if we need one and don't already have one. */
@@ -2218,7 +2223,7 @@
/*-----------------------------.
-| yyreduce -- Do a reduction. |
+| yyreduce -- do a reduction. |
`-----------------------------*/
yyreduce:
/* yyn is the number of a rule to reduce with. */
@@ -2234,164 +2239,165 @@
GCC warning that YYVAL may be used uninitialized. */
yyval = yyvsp[1-yylen];
- /* Default location. */
+ /* Default location. */
YYLLOC_DEFAULT (yyloc, (yylsp - yylen), yylen);
+ yyerror_range[1] = yyloc;
YY_REDUCE_PRINT (yyn);
switch (yyn)
{
case 3:
-#line 704 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 704 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
end_definitions();
}
-#line 2248 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2254 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 6:
-#line 714 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 714 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- (yyval).text = (yyvsp[0]).text;
+ yyval.text = yyvsp[0].text;
}
-#line 2256 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2262 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 7:
-#line 717 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 717 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- (yyval).text = concatenate((yyvsp[-1]).text, (yyvsp[0]).text);
+ yyval.text = concatenate(yyvsp[-1].text, yyvsp[0].text);
}
-#line 2264 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2270 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 8:
-#line 723 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 723 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- (yyval).text = (yyvsp[-1]).text;
+ yyval.text = yyvsp[-1].text;
}
-#line 2272 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2278 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 9:
-#line 726 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 726 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- (yyval).text = NULL;
+ yyval.text = NULL;
}
-#line 2280 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2286 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 10:
-#line 732 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 732 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
/* these definitions are not passed through */
- free(macros[(yyvsp[-1]).character - '0']);
- macros[(yyvsp[-1]).character - '0'] = (yyvsp[0]).text;
+ free(macros[yyvsp[-1].character - '0']);
+ macros[yyvsp[-1].character - '0'] = yyvsp[0].text;
}
-#line 2290 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2296 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 11:
-#line 737 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 737 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- if ((yyvsp[0]).text == NULL) {
+ if (yyvsp[0].text == NULL) {
gregorio_message("name can't be empty","det_score",
VERBOSITY_WARNING, 0);
}
check_multiple("name", score->name != NULL);
- gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text);
- score->name = (yyvsp[0]).text;
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
+ score->name = yyvsp[0].text;
}
-#line 2304 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2310 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 12:
-#line 746 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 746 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
check_multiple("language", got_language);
- gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text);
- gregorio_set_centering_language((yyvsp[0]).text);
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
+ gregorio_set_centering_language(yyvsp[0].text);
got_language = true;
}
-#line 2315 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2321 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 13:
-#line 752 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 752 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
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;
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
+ score->gabc_copyright = yyvsp[0].text;
}
-#line 2325 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2331 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 14:
-#line 757 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 757 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
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;
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
+ score->score_copyright = yyvsp[0].text;
}
-#line 2335 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2341 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 15:
-#line 762 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 762 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
check_multiple("mode", score->mode != 0);
- gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text);
- score->mode = (yyvsp[0]).text;
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
+ score->mode = yyvsp[0].text;
}
-#line 2345 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2351 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 16:
-#line 767 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 767 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
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;
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
+ score->mode_modifier = yyvsp[0].text;
}
-#line 2355 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2361 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 17:
-#line 772 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 772 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
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;
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
+ score->mode_differentia = yyvsp[0].text;
}
-#line 2365 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2371 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 18:
-#line 777 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 777 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
check_multiple("staff-lines", got_staff_lines);
- if ((yyvsp[0]).text) {
- gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text);
- gregorio_set_score_staff_lines(score, atoi((yyvsp[0]).text));
+ if (yyvsp[0].text) {
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
+ gregorio_set_score_staff_lines(score, atoi(yyvsp[0].text));
got_staff_lines = true;
}
}
-#line 2378 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2384 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 19:
-#line 785 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 785 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
check_multiple("nabc lines", score->nabc_lines != 0);
- if ((yyvsp[0]).text) {
- gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text);
- nabc_lines=atoi((yyvsp[0]).text);
+ if (yyvsp[0].text) {
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
+ nabc_lines=atoi(yyvsp[0].text);
score->nabc_lines=nabc_lines;
}
}
-#line 2391 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2397 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 20:
-#line 793 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 793 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
if (score->annotation [MAX_ANNOTATIONS - 1]) {
gregorio_messagef("det_score", VERBOSITY_WARNING, 0,
@@ -2398,62 +2404,62 @@
_("too many definitions of annotation found, only the "
"first %d will be taken"), MAX_ANNOTATIONS);
}
- gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text);
- gregorio_set_score_annotation(score, (yyvsp[0]).text);
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
+ gregorio_set_score_annotation(score, yyvsp[0].text);
}
-#line 2405 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2411 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 21:
-#line 802 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 802 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
check_multiple("author", score->author != NULL);
- gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text);
- score->author = (yyvsp[0]).text;
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
+ score->author = yyvsp[0].text;
}
-#line 2415 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2421 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 22:
-#line 807 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 807 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text);
- score->legacy_oriscus_orientation = (strcmp((yyvsp[0]).text, "legacy") == 0);
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
+ score->legacy_oriscus_orientation = (strcmp(yyvsp[0].text, "legacy") == 0);
}
-#line 2424 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2430 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 23:
-#line 811 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 811 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- gregorio_add_score_header(score, (yyvsp[-1]).text, (yyvsp[0]).text);
+ gregorio_add_score_header(score, yyvsp[-1].text, yyvsp[0].text);
}
-#line 2432 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2438 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 26:
-#line 821 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 821 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- gabc_y_add_notes((yyvsp[-1]).text, (yylsp[-1]));
- free((yyvsp[-1]).text);
+ gabc_y_add_notes(yyvsp[-1].text, (yylsp[-1]));
+ free(yyvsp[-1].text);
nabc_state=0;
}
-#line 2442 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2448 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 27:
-#line 826 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 826 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- gabc_y_add_notes((yyvsp[-1]).text, (yylsp[-1]));
- free((yyvsp[-1]).text);
+ gabc_y_add_notes(yyvsp[-1].text, (yylsp[-1]));
+ free(yyvsp[-1].text);
nabc_state=0;
update_position_with_space();
}
-#line 2453 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2459 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 28:
-#line 832 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 832 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
if (!nabc_lines) {
gregorio_message(_("You used character \"|\" in gabc without "
@@ -2461,170 +2467,170 @@
"set it in your gabc header."),
"det_score", VERBOSITY_FATAL, 0);
}
- gabc_y_add_notes((yyvsp[-1]).text, (yylsp[-1]));
- free((yyvsp[-1]).text);
+ gabc_y_add_notes(yyvsp[-1].text, (yylsp[-1]));
+ free(yyvsp[-1].text);
nabc_state = (nabc_state + 1) % (nabc_lines+1);
}
-#line 2469 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2475 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 29:
-#line 843 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 843 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
elements[voice]=NULL;
nabc_state=0;
}
-#line 2478 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2484 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 30:
-#line 847 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 847 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
elements[voice]=NULL;
nabc_state=0;
update_position_with_space();
}
-#line 2488 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2494 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 34:
-#line 861 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 861 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_ITALIC);
}
-#line 2496 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2502 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 35:
-#line 864 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 864 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_TT);
}
-#line 2504 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2510 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 36:
-#line 867 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 867 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_UNDERLINED);
}
-#line 2512 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2518 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 37:
-#line 870 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 870 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_COLORED);
}
-#line 2520 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2526 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 38:
-#line 873 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 873 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_BOLD);
}
-#line 2528 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2534 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 39:
-#line 876 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 876 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_SMALL_CAPS);
}
-#line 2536 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2542 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 40:
-#line 879 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 879 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_VERBATIM);
}
-#line 2544 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2550 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 41:
-#line 882 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 882 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_SPECIAL_CHAR);
}
-#line 2552 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2558 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 42:
-#line 888 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 888 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
end_style(ST_ITALIC);
}
-#line 2560 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2566 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 43:
-#line 891 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 891 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
end_style(ST_TT);
}
-#line 2568 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2574 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 44:
-#line 894 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 894 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
end_style(ST_UNDERLINED);
}
-#line 2576 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2582 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 45:
-#line 897 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 897 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
end_style(ST_COLORED);
}
-#line 2584 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2590 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 46:
-#line 900 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 900 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
end_style(ST_BOLD);
}
-#line 2592 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2598 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 47:
-#line 903 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 903 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
end_style(ST_SMALL_CAPS);
}
-#line 2600 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2606 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 48:
-#line 906 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 906 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
end_style(ST_VERBATIM);
}
-#line 2608 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2614 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 49:
-#line 909 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 909 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
end_style(ST_SPECIAL_CHAR);
}
-#line 2616 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2622 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 50:
-#line 915 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 915 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_ELISION);
}
-#line 2624 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2630 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 51:
-#line 918 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 918 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
if (center_is_determined) {
gregorio_message(
@@ -2639,19 +2645,19 @@
center_is_determined = CENTER_HALF_DETERMINED;
}
}
-#line 2643 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2649 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 52:
-#line 935 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 935 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
end_style(ST_ELISION);
}
-#line 2651 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2657 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 53:
-#line 938 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 938 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
if (center_is_determined == CENTER_HALF_DETERMINED) {
end_style(ST_FORCED_CENTER);
@@ -2662,165 +2668,165 @@
"det_score", VERBOSITY_WARNING, 0);
}
}
-#line 2666 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2672 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 54:
-#line 951 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 951 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
euouae = EUOUAE_BEGINNING;
}
-#line 2674 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2680 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 55:
-#line 954 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 954 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
euouae = EUOUAE_END;
}
-#line 2682 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2688 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 56:
-#line 960 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 960 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
no_linebreak_area = NLBA_BEGINNING;
}
-#line 2690 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2696 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 57:
-#line 963 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 963 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
no_linebreak_area = NLBA_END;
}
-#line 2698 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2704 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 58:
-#line 969 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 969 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- add_protrusion((yyvsp[-1]).text);
+ add_protrusion(yyvsp[-1].text);
}
-#line 2706 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2712 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 59:
-#line 972 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 972 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_protrusion(gregorio_strdup("d")); /* d = default */
}
-#line 2714 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2720 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 61:
-#line 979 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 979 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- add_text((yyvsp[0]).text);
+ add_text(yyvsp[0].text);
}
-#line 2722 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2728 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 68:
-#line 988 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 988 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
clear_syllable_text = true;
}
-#line 2730 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2736 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 70:
-#line 992 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 992 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_text(gregorio_strdup("-"));
}
-#line 2738 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2744 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 71:
-#line 995 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 995 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- add_text((yyvsp[0]).text);
+ add_text(yyvsp[0].text);
}
-#line 2746 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2752 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 74:
-#line 1006 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1006 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- add_text((yyvsp[0]).text);
+ add_text(yyvsp[0].text);
}
-#line 2754 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2760 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 77:
-#line 1011 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1011 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_text(gregorio_strdup("-"));
}
-#line 2762 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2768 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 78:
-#line 1014 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1014 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- add_text((yyvsp[0]).text);
+ add_text(yyvsp[0].text);
}
-#line 2770 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2776 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 81:
-#line 1025 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1025 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
start_translation(TR_NORMAL);
}
-#line 2778 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2784 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 82:
-#line 1031 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1031 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
end_translation();
}
-#line 2786 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2792 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 83:
-#line 1034 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1034 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
end_translation();
}
-#line 2794 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2800 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 84:
-#line 1037 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1037 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
start_translation(TR_WITH_CENTER_END);
end_translation();
}
-#line 2803 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2809 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 85:
-#line 1044 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1044 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- abovelinestext = (yyvsp[-1]).text;
+ abovelinestext = yyvsp[-1].text;
}
-#line 2811 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2817 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 86:
-#line 1050 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1050 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
save_text();
close_syllable(&(yylsp[-2]));
}
-#line 2820 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2826 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 87:
-#line 1054 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1054 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_VERBATIM);
add_text(gregorio_strdup("\\GreForceHyphen"));
@@ -2828,11 +2834,11 @@
save_text();
close_syllable(&(yylsp[-2]));
}
-#line 2832 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2838 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 88:
-#line 1061 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1061 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_VERBATIM);
add_text(gregorio_strdup("\\GreForceHyphen"));
@@ -2840,40 +2846,40 @@
save_text();
close_syllable(&(yylsp[-3]));
}
-#line 2844 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2850 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 89:
-#line 1068 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1068 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- add_auto_protrusion((yyvsp[-2]).text);
+ add_auto_protrusion(yyvsp[-2].text);
save_text();
close_syllable(&(yylsp[-2]));
}
-#line 2854 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2860 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 90:
-#line 1073 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1073 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- add_auto_protrusion((yyvsp[-2]).text);
+ add_auto_protrusion(yyvsp[-2].text);
save_text();
close_syllable(&(yylsp[-3]));
}
-#line 2864 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2870 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 91:
-#line 1078 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1078 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
save_text();
close_syllable(&(yylsp[-3]));
}
-#line 2873 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2879 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 92:
-#line 1082 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1082 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_VERBATIM);
add_text(gregorio_strdup("\\GreForceHyphen"));
@@ -2881,11 +2887,11 @@
save_text();
close_syllable(&(yylsp[-3]));
}
-#line 2885 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2891 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 93:
-#line 1089 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1089 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
add_style(ST_VERBATIM);
add_text(gregorio_strdup("\\GreForceHyphen"));
@@ -2893,47 +2899,47 @@
save_text();
close_syllable(&(yylsp[-4]));
}
-#line 2897 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2903 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 94:
-#line 1096 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1096 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- add_auto_protrusion((yyvsp[-3]).text);
+ add_auto_protrusion(yyvsp[-3].text);
save_text();
close_syllable(&(yylsp[-3]));
}
-#line 2907 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2913 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 95:
-#line 1101 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1101 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
- add_auto_protrusion((yyvsp[-3]).text);
+ add_auto_protrusion(yyvsp[-3].text);
save_text();
close_syllable(&(yylsp[-4]));
}
-#line 2917 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2923 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 96:
-#line 1109 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1109 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
close_syllable(NULL);
}
-#line 2925 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2931 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
case 97:
-#line 1112 "gabc/gabc-score-determination.y" /* yacc.c:1646 */
+#line 1112 "gabc/gabc-score-determination.y" /* yacc.c:1652 */
{
close_syllable(NULL);
}
-#line 2933 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2939 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
break;
-#line 2937 "gabc/gabc-score-determination-y.c" /* yacc.c:1646 */
+#line 2943 "gabc/gabc-score-determination-y.c" /* yacc.c:1652 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -2959,15 +2965,14 @@
/* Now 'shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
+ {
+ const int yylhs = yyr1[yyn] - YYNTOKENS;
+ const int yyi = yypgoto[yylhs] + *yyssp;
+ yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
+ ? yytable[yyi]
+ : yydefgoto[yylhs]);
+ }
- yyn = yyr1[yyn];
-
- yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
- if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
- yystate = yytable[yystate];
- else
- yystate = yydefgoto[yyn - YYNTOKENS];
-
goto yynewstate;
@@ -3049,14 +3054,11 @@
| yyerrorlab -- error raised explicitly by YYERROR. |
`---------------------------------------------------*/
yyerrorlab:
+ /* Pacify compilers when the user code never invokes YYERROR and the
+ label yyerrorlab therefore never appears in user code. */
+ if (0)
+ YYERROR;
- /* Pacify compilers like GCC when the user code never invokes
- YYERROR and the label yyerrorlab therefore never appears in user
- code. */
- if (/*CONSTCOND*/ 0)
- goto yyerrorlab;
-
- yyerror_range[1] = yylsp[1-yylen];
/* Do not reclaim the symbols of the rule whose action triggered
this YYERROR. */
YYPOPSTACK (yylen);
@@ -3122,6 +3124,7 @@
yyresult = 0;
goto yyreturn;
+
/*-----------------------------------.
| yyabortlab -- YYABORT comes here. |
`-----------------------------------*/
@@ -3129,6 +3132,7 @@
yyresult = 1;
goto yyreturn;
+
#if !defined yyoverflow || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
@@ -3139,6 +3143,10 @@
/* Fall through. */
#endif
+
+/*-----------------------------------------------------.
+| yyreturn -- parsing is finished, return the result. |
+`-----------------------------------------------------*/
yyreturn:
if (yychar != YYEMPTY)
{
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination-y.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.0.4. */
+/* A Bison parser, made by GNU Bison 3.3.2. */
/* Bison interface for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+ Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,6 +31,9 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
+/* Undocumented macros, especially those whose name start with YY_,
+ are private implementation details. Do not rely on them. */
+
#ifndef YY_GABC_SCORE_DETERMINATION_GABC_GABC_SCORE_DETERMINATION_Y_H_INCLUDED
# define YY_GABC_SCORE_DETERMINATION_GABC_GABC_SCORE_DETERMINATION_Y_H_INCLUDED
/* Debug traces. */
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -3,7 +3,7 @@
* This file implements the score parser.
*
* Gregorio score determination from gabc utilities.
- * Copyright (C) 2016-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2016-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
@@ -305,6 +305,8 @@
gregorio_note_iter_position first, previous;
gregorio_shape orientation;
int running;
+ int count;
+ bool unison;
} punctum_inclinatum_vars;
/* data must be (gregorio_shape *) */
@@ -314,6 +316,39 @@
p->note->u.note.shape = *((gregorio_shape *)data);
}
+static __inline void set_punctum_inclinatum_orientation(
+ punctum_inclinatum_vars *const v)
+{
+ if (v->orientation == S_UNDETERMINED) {
+ if (v->unison && (v->count > 1 || (v->count == 1 && v->running == 0))) {
+ v->orientation = S_PUNCTUM_INCLINATUM_STANS;
+ } else if (v->running > 0) {
+ v->orientation = S_PUNCTUM_INCLINATUM_ASCENDENS;
+ } else {
+ v->orientation = S_PUNCTUM_INCLINATUM_DESCENDENS;
+ }
+ }
+}
+
+static __inline void finalize_punctum_inclinatum_orientation(
+ punctum_inclinatum_vars *const v)
+{
+ if (v->first.note) {
+ set_punctum_inclinatum_orientation(v);
+ gregorio_assert_only(v->orientation != S_UNDETERMINED,
+ punctum_inclinatum_orientation_end_item,
+ "orientation should not be S_UNDETERMINED");
+ gregorio_from_note_to_note(&v->first, &v->previous, true, set_shape,
+ NULL, GRESTRUCT_NONE, &v->orientation);
+ }
+
+ v->first.syllable = NULL;
+ v->first.element = NULL;
+ v->first.glyph = NULL;
+ v->first.note = NULL;
+ v->unison = true;
+}
+
/* data must be (punctum_inclinatum_vars *) */
static void punctum_inclinatum_orientation_visit(
const gregorio_note_iter_position *const p, void *const data)
@@ -330,9 +365,15 @@
if (v->previous.note->u.note.pitch
< p->note->u.note.pitch) {
++ v->running;
+ if (v->count > 0) {
+ v->unison = false;
+ }
} else if (v->previous.note->u.note.pitch
> p->note->u.note.pitch) {
-- v->running;
+ if (v->count > 0) {
+ v->unison = false;
+ }
}
}
if (!v->first.note) {
@@ -339,6 +380,7 @@
v->first = *p;
}
}
+ ++ v->count;
} else { /* non-inclinatum or determined inclinatum */
bool is_punctum_inclinatum;
@@ -348,9 +390,15 @@
v->orientation = S_PUNCTUM_INCLINATUM_ASCENDENS;
is_punctum_inclinatum = true;
break;
- case S_PUNCTUM_INCLINATUM_DESCENDENS:
+ case S_PUNCTUM_INCLINATUM_STANS:
+ v->orientation = S_PUNCTUM_INCLINATUM_STANS;
+ is_punctum_inclinatum = true;
+ break;
case S_PUNCTUM_INCLINATUM_DEMINUTUS:
case S_PUNCTUM_INCLINATUM_AUCTUS:
+ v->unison = false;
+ /* fall through */
+ case S_PUNCTUM_INCLINATUM_DESCENDENS:
v->orientation = S_PUNCTUM_INCLINATUM_DESCENDENS;
is_punctum_inclinatum = true;
break;
@@ -371,27 +419,39 @@
> p->note->u.note.pitch) {
-- v->running;
}
- v->orientation = (v->running > 0)
- ? S_PUNCTUM_INCLINATUM_ASCENDENS
- : S_PUNCTUM_INCLINATUM_DESCENDENS;
}
- gregorio_from_note_to_note(&v->first, &v->previous, true, set_shape,
- NULL, GRESTRUCT_NONE, &v->orientation);
- v->first.syllable = NULL;
- v->first.element = NULL;
- v->first.glyph = NULL;
- v->first.note = NULL;
- v->running = 0;
+ finalize_punctum_inclinatum_orientation(v);
}
- if (!is_punctum_inclinatum) {
+ if (is_punctum_inclinatum) {
+ ++ v->count;
+ /* and leave orientation alone */
+ } else {
+ v->running = 0;
+ v->count = 0;
v->orientation = S_UNDETERMINED;
- } /* otherwise, leave orientation alone */
+ }
}
v->previous = *p;
}
+/* data must be (punctum_inclinatum_vars *) */
+static void punctum_inclinatum_orientation_end_item(
+ const gregorio_note_iter_position *const p __attribute__((__unused__)),
+ const gregorio_note_iter_item_type item_type,
+ void *const data)
+{
+ punctum_inclinatum_vars *const v = (punctum_inclinatum_vars *)data;
+
+ gregorio_assert_only(item_type == GRESTRUCT_SYLLABLE,
+ punctum_inclinatum_orientation_end_item,
+ "item type should be GRESTRUCT_SYLLABLE");
+
+ finalize_punctum_inclinatum_orientation(v);
+ v->count = 0;
+}
+
void gabc_determine_punctum_inclinatum_orientation(
const gregorio_score *const score)
{
@@ -410,15 +470,15 @@
},
/* .orientation = */ S_UNDETERMINED, /* because it's 0 */
/* .running = */ 0,
+ /* .count = */ 0,
+ /* .unison = */ true,
};
- gregorio_for_each_note(score, punctum_inclinatum_orientation_visit, NULL,
- GRESTRUCT_NONE, &v);
+ gregorio_for_each_note(score, punctum_inclinatum_orientation_visit,
+ punctum_inclinatum_orientation_end_item, GRESTRUCT_SYLLABLE, &v);
if (v.first.note) {
- v.orientation = (v.running > 0)
- ? S_PUNCTUM_INCLINATUM_ASCENDENS
- : S_PUNCTUM_INCLINATUM_DESCENDENS;
+ set_punctum_inclinatum_orientation(&v);
gregorio_from_note_to_note(&v.first, &v.previous, true, set_shape, NULL,
GRESTRUCT_NONE, &v.orientation);
}
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -3,7 +3,7 @@
* This header shares definitions between the score parser and lexer.
*
* Gregorio score determination from gabc.
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.l 2019-03-11 02:46:28 UTC (rev 50335)
@@ -4,7 +4,7 @@
* This file implements the score lexer.
*
* Gregorio score determination in gabc input.
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.y
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.y 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-score-determination.y 2019-03-11 02:46:28 UTC (rev 50335)
@@ -4,7 +4,7 @@
* This file implements the score parser.
*
* Gregorio score determination from gabc.
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc-write.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file provides functions for writing gabc from Gregorio structures.
*
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
@@ -386,6 +386,12 @@
case B_DIVISIO_MAIOR_DOTTED:
fprintf(f, ":?");
break;
+ case B_DIVISIO_MINIMIS:
+ fprintf(f, "^");
+ break;
+ case B_DIVISIO_MINIMIS_HIGH:
+ fprintf(f, "^0");
+ break;
default:
/* not reachable unless there's a programming error */
/* LCOV_EXCL_START */
@@ -542,6 +548,9 @@
case S_PUNCTUM_INCLINATUM_DESCENDENS:
fprintf(f, "%c0", toupper((unsigned char)pitch_letter(note->u.note.pitch)));
break;
+ case S_PUNCTUM_INCLINATUM_STANS:
+ fprintf(f, "%c2", toupper((unsigned char)pitch_letter(note->u.note.pitch)));
+ break;
case S_PUNCTUM_INCLINATUM_DEMINUTUS:
if (note->next) {
fprintf(f, "%c~", toupper((unsigned char)pitch_letter(note->u.note.pitch)));
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gabc/gabc.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header prototypes gabc-format handling data structures and entry points.
*
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gregorio-utils.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file implements the command line interface of Gregorio.
*
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
@@ -21,7 +21,7 @@
*/
static const char *copyright =
-"Copyright (C) 2006-2018 Gregorio Project authors (see CONTRIBUTORS.md)";
+"Copyright (C) 2006-2019 Gregorio Project authors (see CONTRIBUTORS.md)";
#include "config.h"
#include <stdio.h>
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-position.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file contains the logic for positioning signs on neumes.
*
- * Copyright (C) 2008-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2008-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex-write.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file contains functions for writing GregorioTeX from Gregorio structures.
*
- * Copyright (C) 2008-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2008-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
@@ -136,6 +136,7 @@
SHAPE(QuilismaPesQuadratum);
SHAPE(QuilismaPesQuadratumLongqueue);
SHAPE(QuilismaPesQuadratumOpenqueue);
+SHAPE(StansPunctumInclinatum);
SHAPE(Salicus);
SHAPE(SalicusFlexus);
SHAPE(SalicusLongqueue);
@@ -599,6 +600,9 @@
case S_PUNCTUM_INCLINATUM_ASCENDENS:
*type = AT_PUNCTUM_INCLINATUM;
return SHAPE_AscendensPunctumInclinatum;
+ case S_PUNCTUM_INCLINATUM_STANS:
+ *type = AT_PUNCTUM_INCLINATUM;
+ return SHAPE_StansPunctumInclinatum;
case S_PUNCTUM_INCLINATUM_DESCENDENS:
*type = AT_PUNCTUM_INCLINATUM;
return SHAPE_DescendensPunctumInclinatum;
@@ -1683,6 +1687,12 @@
case B_DIVISIO_MAIOR_DOTTED:
fprintf(f, "DivisioMaiorDotted");
break;
+ case B_DIVISIO_MINIMIS:
+ fprintf(f, "DivisioMinimis");
+ break;
+ case B_DIVISIO_MINIMIS_HIGH:
+ fprintf(f, "DivisioMinimisHigh");
+ break;
default:
/* not reachable unless there's a programming error */
/* LCOV_EXCL_START */
@@ -1708,11 +1718,19 @@
break;
}
switch (type) {
+ case B_DIVISIO_MINIMIS_HIGH:
+ ++ far_pitch_adjustment;
+ /* fall through */
+
case B_VIRGULA_HIGH:
case B_DIVISIO_MINIMA_HIGH:
- far_pitch_adjustment = 2;
+ ++ far_pitch_adjustment;
/* fall through */
+ case B_DIVISIO_MINIMIS:
+ ++ far_pitch_adjustment;
+ /* fall through */
+
case B_VIRGULA:
case B_DIVISIO_MINIMA:
{
@@ -1967,6 +1985,7 @@
}
switch (current_note->u.note.shape) {
case S_PUNCTUM_INCLINATUM_ASCENDENS:
+ case S_PUNCTUM_INCLINATUM_STANS:
case S_PUNCTUM_INCLINATUM_DESCENDENS:
case S_PUNCTUM_INCLINATUM_DEMINUTUS:
punctum_inclinatum = 1;
@@ -2057,7 +2076,7 @@
switch (note->u.note.shape) {
case S_PUNCTUM_INCLINATUM_ASCENDENS:
if (note->previous) {
- /* means that it is the first note of the puncta inclinata
+ /* means that it is not the first note of the puncta inclinata
* sequence */
temp = note->previous->u.note.pitch - note->u.note.pitch;
/* negative values = ascending ambitus */
@@ -2079,9 +2098,16 @@
}
}
break;
+ case S_PUNCTUM_INCLINATUM_STANS:
+ if (note->previous) {
+ /* means that it is not the first note of the puncta inclinata
+ * sequence */
+ return 26;
+ }
+ break;
case S_PUNCTUM_INCLINATUM_DESCENDENS:
if (note->previous) {
- /* means that it is the first note of the puncta inclinata
+ /* means that it is not the first note of the puncta inclinata
* sequence */
temp = note->previous->u.note.pitch - note->u.note.pitch;
/* negative values = ascending ambitus */
@@ -2105,7 +2131,7 @@
break;
case S_PUNCTUM_INCLINATUM_DEMINUTUS:
if (note->previous) {
- /* means that it is the first note of the puncta inclinata
+ /* means that it is not the first note of the puncta inclinata
* sequence */
temp = note->previous->u.note.pitch - note->u.note.pitch;
if (temp < -2) {
@@ -2588,6 +2614,8 @@
case B_VIRGULA_HIGH:
result = 10;
break;
+ case B_DIVISIO_MINIMIS:
+ case B_DIVISIO_MINIMIS_HIGH:
case B_DIVISIO_MINIMA:
case B_DIVISIO_MINIMA_HIGH:
result = 11;
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/gregoriotex/gregoriotex.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header prototypes GregorioTeX writing data structures and entry points.
*
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/messages.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/messages.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/messages.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file contains functions for logging messages, warnings, and errors.
*
- * Copyright (C) 2009-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2009-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/messages.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/messages.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/messages.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header prototypes the message logging functions.
*
- * Copyright (C) 2009-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2009-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/plugins.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/plugins.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/plugins.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header prototypes the "main" entry points for reading and writing data.
*
- * Copyright (C) 2008-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2008-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/sha1.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/sha1.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/sha1.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* sha1.c - Functions to compute SHA1 message digest of files or
* memory blocks according to the NIST specification FIPS-180-1.
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
* Copyright (C) 2000-2001, 2003-2006, 2008-2014 Free Software Foundation, Inc.
*
* This file is part of Gregorio.
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/sha1.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/sha1.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/sha1.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Declarations of functions and data types used for SHA1 sum
* library functions.
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
* Copyright (C) 2000-2001, 2003, 2005-2006, 2008-2014 Free Software
* Foundation, Inc.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/struct.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/struct.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/struct.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file implements the Gregorio data structures.
*
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/struct.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/struct.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/struct.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header defines the Gregorio data structures and functions.
*
- * Copyright (C) 2006-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2006-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
@@ -102,6 +102,7 @@
E(S_PUNCTUM) \
E(S_PUNCTUM_END_OF_GLYPH) \
E(S_PUNCTUM_INCLINATUM_ASCENDENS) \
+ E(S_PUNCTUM_INCLINATUM_STANS) \
E(S_PUNCTUM_INCLINATUM_DESCENDENS) \
E(S_PUNCTUM_INCLINATUM_DEMINUTUS) \
E(S_PUNCTUM_INCLINATUM_AUCTUS) \
@@ -158,7 +159,9 @@
E(B_DIVISIO_MINOR_D8) \
E(B_VIRGULA_HIGH) \
E(B_DIVISIO_MINIMA_HIGH) \
- L(B_DIVISIO_MAIOR_DOTTED)
+ E(B_DIVISIO_MAIOR_DOTTED) \
+ E(B_DIVISIO_MINIMIS) \
+ L(B_DIVISIO_MINIMIS_HIGH)
ENUM(gregorio_bar, GREGORIO_BAR);
/* definition of the signs. You can notice that the values are made so
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/struct_iter.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/struct_iter.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/struct_iter.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header defines the Gregorio data structures and functions.
*
- * Copyright (C) 2016-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2016-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
@@ -55,7 +55,7 @@
void (*const visit)(const gregorio_note_iter_position *, void *),
void (*const end_item)(const gregorio_note_iter_position *,
gregorio_note_iter_item_type, void *),
- const gregorio_note_iter_item_type desired_iter_items, void *data)
+ const gregorio_note_iter_item_type desired_end_items, void *data)
{
/* Note: include_end is effectively ignored if end is NULL */
@@ -85,39 +85,52 @@
if (at_end) {
if (end_item) {
- /* in 4.2.0, this code is never hit, as
- * end_item will only be supplied from
- * gregorio_for_each_note, which supplies
- * NULL for end */
- /* LCOV_EXCL_START */
- /* to enable the real code, delete this
- * assertion: */
gregorio_fail(gregorio_from_note_to_note,
"unused code path");
- if (desired_iter_items & GRESTRUCT_NOTE) {
+ if (desired_end_items & GRESTRUCT_NOTE) {
+ /* currently unused */
+ /* LCOV_EXCL_START */
+ /* to enable the real code, delete this
+ * assertion: */
+ gregorio_fail(gregorio_from_note_to_note,
+ "unused code path");
end_item(&p, GRESTRUCT_NOTE, data);
}
- if (desired_iter_items & GRESTRUCT_GLYPH) {
+ /* LCOV_EXCL_END */
+ if (desired_end_items & GRESTRUCT_GLYPH) {
+ /* currently unused */
+ /* LCOV_EXCL_START */
+ /* to enable the real code, delete this
+ * assertion: */
+ gregorio_fail(gregorio_from_note_to_note,
+ "unused code path");
end_item(&p, GRESTRUCT_GLYPH, data);
}
- if (desired_iter_items
+ /* LCOV_EXCL_END */
+ if (desired_end_items
& GRESTRUCT_ELEMENT) {
+ /* currently unused */
+ /* LCOV_EXCL_START */
+ /* to enable the real code, delete this
+ * assertion: */
+ gregorio_fail(gregorio_from_note_to_note,
+ "unused code path");
end_item(&p, GRESTRUCT_ELEMENT, data);
}
- if (desired_iter_items
+ /* LCOV_EXCL_END */
+ if (desired_end_items
& GRESTRUCT_SYLLABLE) {
end_item(&p, GRESTRUCT_SYLLABLE, data);
}
}
- /* LCOV_EXCL_END */
return;
}
if (end_item
- && (desired_iter_items & GRESTRUCT_NOTE)) {
+ && (desired_end_items & GRESTRUCT_NOTE)) {
/* in 4.2.0, this code is never hit, as the only
* usage that gets through to here does not
- * include GRESTRUCT_NOTE in desired_iter_items */
+ * include GRESTRUCT_NOTE in desired_end_items */
/* LCOV_EXCL_START */
/* to enable the real code, delete this
* assertion: */
@@ -130,10 +143,10 @@
p.note = p.note->next;
} /* note */
}
- if (end_item && (desired_iter_items & GRESTRUCT_GLYPH)) {
+ if (end_item && (desired_end_items & GRESTRUCT_GLYPH)) {
/* in 4.2.0, this code is never hit, as the only usage
* that gets through to here does not include
- * GRESTRUCT_GLYPH in desired_iter_items */
+ * GRESTRUCT_GLYPH in desired_end_items */
/* LCOV_EXCL_START */
/* to enable the real code, delete this assertion: */
gregorio_fail(gregorio_from_note_to_note,
@@ -144,21 +157,14 @@
p.glyph = p.glyph->next;
} /* glyph */
}
- if (end_item && (desired_iter_items & GRESTRUCT_ELEMENT)) {
+ if (end_item && (desired_end_items & GRESTRUCT_ELEMENT)) {
end_item(&p, GRESTRUCT_ELEMENT, data);
}
p.element = p.element->next;
} /* element */
- if (end_item && (desired_iter_items & GRESTRUCT_SYLLABLE)) {
- /* in 4.2.0, this code is never hit, as the only usage that gets
- * through to here does not include GRESTRUCT_SYLLABLE in
- * desired_iter_items */
- /* LCOV_EXCL_START */
- /* to enable the real code, delete this assertion: */
- gregorio_fail(gregorio_from_note_to_note, "unused code path");
+ if (end_item && (desired_end_items & GRESTRUCT_SYLLABLE)) {
end_item(&p, GRESTRUCT_SYLLABLE, data);
}
- /* LCOV_EXCL_STOP */
p.syllable = p.syllable->next_syllable;
} /* syllable */
}
@@ -167,7 +173,7 @@
void (*const visit)(const gregorio_note_iter_position *, void *),
void (*const end_item)(const gregorio_note_iter_position *,
gregorio_note_iter_item_type, void *),
- const gregorio_note_iter_item_type desired_iter_items, void *data)
+ const gregorio_note_iter_item_type desired_end_items, void *data)
{
gregorio_note_iter_position p = {
/* .syllable = */ NULL,
@@ -179,7 +185,7 @@
p.syllable = score->first_syllable;
gregorio_from_note_to_note(&p, NULL, true, visit, end_item,
- desired_iter_items, data);
+ desired_end_items, data);
}
#endif
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/support.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/support.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/support.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file contains miscellaneous support functions.
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/support.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/support.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/support.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header prototypes the miscellaneous support functions.
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/unicode.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/unicode.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/unicode.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file contains functions providing UTF-8 support.
*
- * Copyright (C) 2008-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2008-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/unicode.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/unicode.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/unicode.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header prototypes the UTF-8 support functions.
*
- * Copyright (C) 2008-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2008-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/utf8strings.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/utf8strings.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/utf8strings.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header file contains UTF-8 encoded strings used by Gregorio
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/utf8strings.h.in
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/utf8strings.h.in 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/utf8strings.h.in 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header file contains UTF-8 encoded strings used by Gregorio
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-l.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -762,7 +762,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file implements the vowel rule lexer.
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.0.4. */
+/* A Bison parser, made by GNU Bison 3.3.2. */
/* Bison implementation for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+ Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -40,11 +41,14 @@
define necessary library symbols; they are noted "INFRINGES ON
USER NAME SPACE" below. */
+/* Undocumented macros, especially those whose name start with YY_,
+ are private implementation details. Do not rely on them. */
+
/* Identify Bison output. */
#define YYBISON 1
/* Bison version. */
-#define YYBISON_VERSION "3.0.4"
+#define YYBISON_VERSION "3.3.2"
/* Skeleton name. */
#define YYSKELETON_NAME "yacc.c"
@@ -69,14 +73,14 @@
#define yylval gregorio_vowel_rulefile_lval
#define yychar gregorio_vowel_rulefile_char
-/* Copy the first part of user declarations. */
-#line 1 "vowel/vowel-rules.y" /* yacc.c:339 */
+/* First part of user prologue. */
+#line 1 "vowel/vowel-rules.y" /* yacc.c:337 */
/*
* Gregorio is a program that translates gabc files to GregorioTeX
* This file implements the vowel rule parser.
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
@@ -173,13 +177,16 @@
#define _ADD(TABLE, CHARS) add(status, gregorio_##TABLE##_table_add, CHARS)
-#line 177 "vowel/vowel-rules-y.c" /* yacc.c:339 */
-
+#line 181 "vowel/vowel-rules-y.c" /* yacc.c:337 */
# ifndef YY_NULLPTR
-# if defined __cplusplus && 201103L <= __cplusplus
-# define YY_NULLPTR nullptr
+# if defined __cplusplus
+# if 201103L <= __cplusplus
+# define YY_NULLPTR nullptr
+# else
+# define YY_NULLPTR 0
+# endif
# else
-# define YY_NULLPTR 0
+# define YY_NULLPTR ((void*)0)
# endif
# endif
@@ -248,9 +255,7 @@
#endif /* !YY_GREGORIO_VOWEL_RULEFILE_VOWEL_VOWEL_RULES_Y_H_INCLUDED */
-/* Copy the second part of user declarations. */
-#line 254 "vowel/vowel-rules-y.c" /* yacc.c:358 */
#ifdef short
# undef short
@@ -271,13 +276,13 @@
#ifdef YYTYPE_UINT16
typedef YYTYPE_UINT16 yytype_uint16;
#else
-typedef unsigned short int yytype_uint16;
+typedef unsigned short yytype_uint16;
#endif
#ifdef YYTYPE_INT16
typedef YYTYPE_INT16 yytype_int16;
#else
-typedef short int yytype_int16;
+typedef short yytype_int16;
#endif
#ifndef YYSIZE_T
@@ -289,7 +294,7 @@
# include <stddef.h> /* INFRINGES ON USER NAME SPACE */
# define YYSIZE_T size_t
# else
-# define YYSIZE_T unsigned int
+# define YYSIZE_T unsigned
# endif
#endif
@@ -325,15 +330,6 @@
# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
#endif
-#if !defined _Noreturn \
- && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
-# if defined _MSC_VER && 1200 <= _MSC_VER
-# define _Noreturn __declspec (noreturn)
-# else
-# define _Noreturn YY_ATTRIBUTE ((__noreturn__))
-# endif
-#endif
-
/* Suppress unused-variable warnings by "using" E. */
#if ! defined lint || defined __GNUC__
# define YYUSE(E) ((void) (E))
@@ -341,7 +337,7 @@
# define YYUSE(E) /* empty */
#endif
-#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+#if defined __GNUC__ && ! defined __ICC && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
/* Suppress an incorrect diagnostic about yylval being uninitialized. */
# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
_Pragma ("GCC diagnostic push") \
@@ -503,16 +499,16 @@
/* YYNSTATES -- Number of states. */
#define YYNSTATES 28
-/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
- by yylex, with out-of-bounds checking. */
#define YYUNDEFTOK 2
#define YYMAXUTOK 268
+/* YYTRANSLATE(TOKEN-NUM) -- Symbol number corresponding to TOKEN-NUM
+ as returned by yylex, with out-of-bounds checking. */
#define YYTRANSLATE(YYX) \
- ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
+ ((unsigned) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
- as returned by yylex, without out-of-bounds checking. */
+ as returned by yylex. */
static const yytype_uint8 yytranslate[] =
{
0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -669,22 +665,22 @@
#define YYRECOVERING() (!!yyerrstatus)
-#define YYBACKUP(Token, Value) \
-do \
- if (yychar == YYEMPTY) \
- { \
- yychar = (Token); \
- yylval = (Value); \
- YYPOPSTACK (yylen); \
- yystate = *yyssp; \
- goto yybackup; \
- } \
- else \
- { \
- yyerror (filename, language, status, YY_("syntax error: cannot back up")); \
- YYERROR; \
- } \
-while (0)
+#define YYBACKUP(Token, Value) \
+ do \
+ if (yychar == YYEMPTY) \
+ { \
+ yychar = (Token); \
+ yylval = (Value); \
+ YYPOPSTACK (yylen); \
+ yystate = *yyssp; \
+ goto yybackup; \
+ } \
+ else \
+ { \
+ yyerror (filename, language, status, YY_("syntax error: cannot back up")); \
+ YYERROR; \
+ } \
+ while (0)
/* Error token number */
#define YYTERROR 1
@@ -724,15 +720,15 @@
} while (0)
-/*----------------------------------------.
-| Print this symbol's value on YYOUTPUT. |
-`----------------------------------------*/
+/*-----------------------------------.
+| Print this symbol's value on YYO. |
+`-----------------------------------*/
static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, const char *const filename, char **language, rulefile_parse_status *const status)
+yy_symbol_value_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, const char *const filename, char **language, rulefile_parse_status *const status)
{
- FILE *yyo = yyoutput;
- YYUSE (yyo);
+ FILE *yyoutput = yyo;
+ YYUSE (yyoutput);
YYUSE (filename);
YYUSE (language);
YYUSE (status);
@@ -740,24 +736,24 @@
return;
# ifdef YYPRINT
if (yytype < YYNTOKENS)
- YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
+ YYPRINT (yyo, yytoknum[yytype], *yyvaluep);
# endif
YYUSE (yytype);
}
-/*--------------------------------.
-| Print this symbol on YYOUTPUT. |
-`--------------------------------*/
+/*---------------------------.
+| Print this symbol on YYO. |
+`---------------------------*/
static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, const char *const filename, char **language, rulefile_parse_status *const status)
+yy_symbol_print (FILE *yyo, int yytype, YYSTYPE const * const yyvaluep, const char *const filename, char **language, rulefile_parse_status *const status)
{
- YYFPRINTF (yyoutput, "%s %s (",
+ YYFPRINTF (yyo, "%s %s (",
yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
- yy_symbol_value_print (yyoutput, yytype, yyvaluep, filename, language, status);
- YYFPRINTF (yyoutput, ")");
+ yy_symbol_value_print (yyo, yytype, yyvaluep, filename, language, status);
+ YYFPRINTF (yyo, ")");
}
/*------------------------------------------------------------------.
@@ -791,7 +787,7 @@
static void
yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule, const char *const filename, char **language, rulefile_parse_status *const status)
{
- unsigned long int yylno = yyrline[yyrule];
+ unsigned long yylno = yyrline[yyrule];
int yynrhs = yyr2[yyrule];
int yyi;
YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
@@ -802,7 +798,7 @@
YYFPRINTF (stderr, " $%d = ", yyi + 1);
yy_symbol_print (stderr,
yystos[yyssp[yyi + 1 - yynrhs]],
- &(yyvsp[(yyi + 1) - (yynrhs)])
+ &yyvsp[(yyi + 1) - (yynrhs)]
, filename, language, status);
YYFPRINTF (stderr, "\n");
}
@@ -906,7 +902,10 @@
case '\\':
if (*++yyp != '\\')
goto do_not_strip_quotes;
- /* Fall through. */
+ else
+ goto append;
+
+ append:
default:
if (yyres)
yyres[yyn] = *yyp;
@@ -924,7 +923,7 @@
if (! yyres)
return yystrlen (yystr);
- return yystpcpy (yyres, yystr) - yyres;
+ return (YYSIZE_T) (yystpcpy (yyres, yystr) - yyres);
}
# endif
@@ -1002,10 +1001,10 @@
yyarg[yycount++] = yytname[yyx];
{
YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
- if (! (yysize <= yysize1
- && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+ yysize = yysize1;
+ else
return 2;
- yysize = yysize1;
}
}
}
@@ -1017,6 +1016,7 @@
case N: \
yyformat = S; \
break
+ default: /* Avoid compiler warnings. */
YYCASE_(0, YY_("syntax error"));
YYCASE_(1, YY_("syntax error, unexpected %s"));
YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
@@ -1028,9 +1028,10 @@
{
YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
- if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+ if (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM)
+ yysize = yysize1;
+ else
return 2;
- yysize = yysize1;
}
if (*yymsg_alloc < yysize)
@@ -1159,23 +1160,31 @@
yychar = YYEMPTY; /* Cause a token to be read. */
goto yysetstate;
+
/*------------------------------------------------------------.
-| yynewstate -- Push a new state, which is found in yystate. |
+| yynewstate -- push a new state, which is found in yystate. |
`------------------------------------------------------------*/
- yynewstate:
+yynewstate:
/* In all cases, when you get here, the value and location stacks
have just been pushed. So pushing a state here evens the stacks. */
yyssp++;
- yysetstate:
- *yyssp = yystate;
+/*--------------------------------------------------------------------.
+| yynewstate -- set current state (the top of the stack) to yystate. |
+`--------------------------------------------------------------------*/
+yysetstate:
+ *yyssp = (yytype_int16) yystate;
+
if (yyss + yystacksize - 1 <= yyssp)
+#if !defined yyoverflow && !defined YYSTACK_RELOCATE
+ goto yyexhaustedlab;
+#else
{
/* Get the current used size of the three stacks, in elements. */
- YYSIZE_T yysize = yyssp - yyss + 1;
+ YYSIZE_T yysize = (YYSIZE_T) (yyssp - yyss + 1);
-#ifdef yyoverflow
+# if defined yyoverflow
{
/* Give user a chance to reallocate the stack. Use copies of
these so that the &'s don't force the real ones into
@@ -1191,14 +1200,10 @@
&yyss1, yysize * sizeof (*yyssp),
&yyvs1, yysize * sizeof (*yyvsp),
&yystacksize);
-
yyss = yyss1;
yyvs = yyvs1;
}
-#else /* no yyoverflow */
-# ifndef YYSTACK_RELOCATE
- goto yyexhaustedlab;
-# else
+# else /* defined YYSTACK_RELOCATE */
/* Extend the stack our own way. */
if (YYMAXDEPTH <= yystacksize)
goto yyexhaustedlab;
@@ -1214,22 +1219,22 @@
goto yyexhaustedlab;
YYSTACK_RELOCATE (yyss_alloc, yyss);
YYSTACK_RELOCATE (yyvs_alloc, yyvs);
-# undef YYSTACK_RELOCATE
+# undef YYSTACK_RELOCATE
if (yyss1 != yyssa)
YYSTACK_FREE (yyss1);
}
# endif
-#endif /* no yyoverflow */
yyssp = yyss + yysize - 1;
yyvsp = yyvs + yysize - 1;
YYDPRINTF ((stderr, "Stack size increased to %lu\n",
- (unsigned long int) yystacksize));
+ (unsigned long) yystacksize));
if (yyss + yystacksize - 1 <= yyssp)
YYABORT;
}
+#endif /* !defined yyoverflow && !defined YYSTACK_RELOCATE */
YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1238,11 +1243,11 @@
goto yybackup;
+
/*-----------.
| yybackup. |
`-----------*/
yybackup:
-
/* Do appropriate processing given the current state. Read a
lookahead token if we need one and don't already have one. */
@@ -1315,7 +1320,7 @@
/*-----------------------------.
-| yyreduce -- Do a reduction. |
+| yyreduce -- do a reduction. |
`-----------------------------*/
yyreduce:
/* yyn is the number of a rule to reduce with. */
@@ -1336,43 +1341,43 @@
switch (yyn)
{
case 4:
-#line 120 "vowel/vowel-rules.y" /* yacc.c:1646 */
- { _MATCH((yyvsp[-1])); }
-#line 1342 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 120 "vowel/vowel-rules.y" /* yacc.c:1652 */
+ { _MATCH(yyvsp[-1]); }
+#line 1347 "vowel/vowel-rules-y.c" /* yacc.c:1652 */
break;
case 5:
-#line 121 "vowel/vowel-rules.y" /* yacc.c:1646 */
- { _ALIAS((yyvsp[-3]), (yyvsp[-1])); }
-#line 1348 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 121 "vowel/vowel-rules.y" /* yacc.c:1652 */
+ { _ALIAS(yyvsp[-3], yyvsp[-1]); }
+#line 1353 "vowel/vowel-rules-y.c" /* yacc.c:1652 */
break;
case 11:
-#line 130 "vowel/vowel-rules.y" /* yacc.c:1646 */
- { _ADD(vowel, (yyvsp[0])); }
-#line 1354 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 130 "vowel/vowel-rules.y" /* yacc.c:1652 */
+ { _ADD(vowel, yyvsp[0]); }
+#line 1359 "vowel/vowel-rules-y.c" /* yacc.c:1652 */
break;
case 13:
-#line 135 "vowel/vowel-rules.y" /* yacc.c:1646 */
- { _ADD(prefix, (yyvsp[0])); }
-#line 1360 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 135 "vowel/vowel-rules.y" /* yacc.c:1652 */
+ { _ADD(prefix, yyvsp[0]); }
+#line 1365 "vowel/vowel-rules-y.c" /* yacc.c:1652 */
break;
case 15:
-#line 140 "vowel/vowel-rules.y" /* yacc.c:1646 */
- { _ADD(suffix, (yyvsp[0])); }
-#line 1366 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 140 "vowel/vowel-rules.y" /* yacc.c:1652 */
+ { _ADD(suffix, yyvsp[0]); }
+#line 1371 "vowel/vowel-rules-y.c" /* yacc.c:1652 */
break;
case 17:
-#line 145 "vowel/vowel-rules.y" /* yacc.c:1646 */
- { _ADD(secondary, (yyvsp[0])); }
-#line 1372 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 145 "vowel/vowel-rules.y" /* yacc.c:1652 */
+ { _ADD(secondary, yyvsp[0]); }
+#line 1377 "vowel/vowel-rules-y.c" /* yacc.c:1652 */
break;
-#line 1376 "vowel/vowel-rules-y.c" /* yacc.c:1646 */
+#line 1381 "vowel/vowel-rules-y.c" /* yacc.c:1652 */
default: break;
}
/* User semantic actions sometimes alter yychar, and that requires
@@ -1397,15 +1402,14 @@
/* Now 'shift' the result of the reduction. Determine what state
that goes to, based on the state we popped back to and the rule
number reduced by. */
+ {
+ const int yylhs = yyr1[yyn] - YYNTOKENS;
+ const int yyi = yypgoto[yylhs] + *yyssp;
+ yystate = (0 <= yyi && yyi <= YYLAST && yycheck[yyi] == *yyssp
+ ? yytable[yyi]
+ : yydefgoto[yylhs]);
+ }
- yyn = yyr1[yyn];
-
- yystate = yypgoto[yyn - YYNTOKENS] + *yyssp;
- if (0 <= yystate && yystate <= YYLAST && yycheck[yystate] == *yyssp)
- yystate = yytable[yystate];
- else
- yystate = yydefgoto[yyn - YYNTOKENS];
-
goto yynewstate;
@@ -1487,13 +1491,11 @@
| yyerrorlab -- error raised explicitly by YYERROR. |
`---------------------------------------------------*/
yyerrorlab:
+ /* Pacify compilers when the user code never invokes YYERROR and the
+ label yyerrorlab therefore never appears in user code. */
+ if (0)
+ YYERROR;
- /* Pacify compilers like GCC when the user code never invokes
- YYERROR and the label yyerrorlab therefore never appears in user
- code. */
- if (/*CONSTCOND*/ 0)
- goto yyerrorlab;
-
/* Do not reclaim the symbols of the rule whose action triggered
this YYERROR. */
YYPOPSTACK (yylen);
@@ -1554,6 +1556,7 @@
yyresult = 0;
goto yyreturn;
+
/*-----------------------------------.
| yyabortlab -- YYABORT comes here. |
`-----------------------------------*/
@@ -1561,6 +1564,7 @@
yyresult = 1;
goto yyreturn;
+
#if !defined yyoverflow || YYERROR_VERBOSE
/*-------------------------------------------------.
| yyexhaustedlab -- memory exhaustion comes here. |
@@ -1571,6 +1575,10 @@
/* Fall through. */
#endif
+
+/*-----------------------------------------------------.
+| yyreturn -- parsing is finished, return the result. |
+`-----------------------------------------------------*/
yyreturn:
if (yychar != YYEMPTY)
{
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules-y.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,8 +1,9 @@
-/* A Bison parser, made by GNU Bison 3.0.4. */
+/* A Bison parser, made by GNU Bison 3.3.2. */
/* Bison interface for Yacc-like parsers in C
- Copyright (C) 1984, 1989-1990, 2000-2015 Free Software Foundation, Inc.
+ Copyright (C) 1984, 1989-1990, 2000-2015, 2018-2019 Free Software Foundation,
+ Inc.
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -30,6 +31,9 @@
This special exception was added by the Free Software Foundation in
version 2.2 of Bison. */
+/* Undocumented macros, especially those whose name start with YY_,
+ are private implementation details. Do not rely on them. */
+
#ifndef YY_GREGORIO_VOWEL_RULEFILE_VOWEL_VOWEL_RULES_Y_H_INCLUDED
# define YY_GREGORIO_VOWEL_RULEFILE_VOWEL_VOWEL_RULES_Y_H_INCLUDED
/* Debug traces. */
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header shares definitions between the vowel parser and lexer.
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.l
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.l 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.l 2019-03-11 02:46:28 UTC (rev 50335)
@@ -3,7 +3,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file implements the vowel rule lexer.
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.y
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.y 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel-rules.y 2019-03-11 02:46:28 UTC (rev 50335)
@@ -3,7 +3,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file implements the vowel rule parser.
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This program is free software: you can redistribute it and/or modify it
* under the terms of the GNU General Public License as published by the Free
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.c
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.c 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.c 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This file implements vowel rule handling (aside from parsing).
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.h
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.h 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/src/vowel/vowel.h 2019-03-11 02:46:28 UTC (rev 50335)
@@ -2,7 +2,7 @@
* Gregorio is a program that translates gabc files to GregorioTeX
* This header prototypes the vowel handling data structures and entry points.
*
- * Copyright (C) 2015-2018 The Gregorio Project (see CONTRIBUTORS.md)
+ * Copyright (C) 2015-2019 The Gregorio Project (see CONTRIBUTORS.md)
*
* This file is part of Gregorio.
*
Modified: trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc
===================================================================
--- trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/gregorio-src/windows/gregorio-resources.rc 2019-03-11 02:46:28 UTC (rev 50335)
@@ -1,7 +1,7 @@
IDI_ICON1 ICON DISCARDABLE "gregorio.ico"
1 VERSIONINFO
-FILEVERSION 5,1,1,30
-PRODUCTVERSION 5,1,1,30
+FILEVERSION 5,2,0,30
+PRODUCTVERSION 5,2,0,30
BEGIN
BLOCK "StringFileInfo"
BEGIN
@@ -9,12 +9,12 @@
BEGIN
VALUE "CompanyName", "Gregorio project"
VALUE "FileDescription", "Gregorio"
- VALUE "FileVersion", "5.1.1"
+ VALUE "FileVersion", "5.2.0"
VALUE "InternalName", "gregorio"
VALUE "LegalCopyright", "See COPYING in the installation directory."
VALUE "OriginalFilename", "gregorio.exe"
VALUE "ProductName", "Gregorio"
- VALUE "ProductVersion", "5.1.1"
+ VALUE "ProductVersion", "5.2.0"
END
END
Modified: trunk/Build/source/texk/gregorio/version.ac
===================================================================
--- trunk/Build/source/texk/gregorio/version.ac 2019-03-11 01:56:18 UTC (rev 50334)
+++ trunk/Build/source/texk/gregorio/version.ac 2019-03-11 02:46:28 UTC (rev 50335)
@@ -8,4 +8,4 @@
dnl --------------------------------------------------------
dnl
dnl m4-include this file to define the current gregorio version
-m4_define([gregorio_version], [5.1.1])
+m4_define([gregorio_version], [5.2.0])
More information about the tex-live-commits
mailing list