From d65592bab87f0c1e359c86ff00ceceda94d114a7 Mon Sep 17 00:00:00 2001 From: Peter Breitenlohner Date: Tue, 7 Jun 2011 12:05:43 +0000 Subject: dtex: handle kern and glue specs git-svn-id: svn://tug.org/texlive/trunk@22846 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/texk/detex/detex-2.8-PATCHES/ChangeLog | 5 + .../detex/detex-2.8-PATCHES/patch-05-kern-and-glue | 35 + Build/source/texk/detex/detex-2.8/detex.l | 18 +- Build/source/texk/detex/detex.c | 2039 ++++++++++++-------- 4 files changed, 1276 insertions(+), 821 deletions(-) create mode 100644 Build/source/texk/detex/detex-2.8-PATCHES/patch-05-kern-and-glue (limited to 'Build') diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog b/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog index be1be4dd05d..87557f22a81 100644 --- a/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog +++ b/Build/source/texk/detex/detex-2.8-PATCHES/ChangeLog @@ -1,3 +1,8 @@ +2011-06-07 Peter Breitenlohner + + * patch-05-kern-and-glue (new): Handle `\kern', allow `em/ex' + for dimensions, handle glue specs. + 2010-06-10 Peter Breitenlohner Adapt to detex-2.8. diff --git a/Build/source/texk/detex/detex-2.8-PATCHES/patch-05-kern-and-glue b/Build/source/texk/detex/detex-2.8-PATCHES/patch-05-kern-and-glue new file mode 100644 index 00000000000..784ef2ff5a7 --- /dev/null +++ b/Build/source/texk/detex/detex-2.8-PATCHES/patch-05-kern-and-glue @@ -0,0 +1,35 @@ +diff -ur detex-2.8.orig/detex.l detex-2.8/detex.l +--- detex-2.8.orig/detex.l 2010-06-12 00:15:05.000000000 +0200 ++++ detex-2.8/detex.l 2011-06-07 13:42:05.000000000 +0200 +@@ -157,7 +157,12 @@ + W [a-zA-Z]+ + N [+-]?(([0-9]+(\.[0-9]+)?)|(\.[0-9]+)) + U pt|pc|in|bp|cm|mm|dd|cc|sp +-D {S}(({N}{S}{U})|(\\{W})){S} ++HU {U}|em ++HD {S}(({N}{S}{HU})|(\\{W})){S} ++HG {HD}(plus{HD})?(minus{HD})? ++VU {U}|ex ++VD {S}(({N}{S}{VU})|(\\{W})){S} ++VG {VD}(plus{VD})?(minus{VD})? + Z \*? + + %Start Define Display IncludeOnly Input Math Normal Control +@@ -212,11 +217,12 @@ + "\n" NEWLINE; + . ; + +-"\\vskip"{D} ; +-"\\vspace"{Z}{S}"{"{D}"}" ; +-"\\hskip"{D} ; +-"\\hspace"{Z}{S}"{"{D}"}" ; +-"\\addvspace"{S}"{"{D}"}" ; ++"\\kern"{HD} ; ++"\\vskip"{VG} ; ++"\\vspace"{Z}{S}"{"{VG}"}" ; ++"\\hskip"{HG} ; ++"\\hspace"{Z}{S}"{"{HG}"}" ; ++"\\addvspace"{S}"{"{VG}"}" ; + + "\\newlength" { KILLARGS(1); } + "\\setlength" { KILLARGS(2); } diff --git a/Build/source/texk/detex/detex-2.8/detex.l b/Build/source/texk/detex/detex-2.8/detex.l index db6ec8ba982..7ace6f49ac3 100644 --- a/Build/source/texk/detex/detex-2.8/detex.l +++ b/Build/source/texk/detex/detex-2.8/detex.l @@ -157,7 +157,12 @@ S [ \t\n]* W [a-zA-Z]+ N [+-]?(([0-9]+(\.[0-9]+)?)|(\.[0-9]+)) U pt|pc|in|bp|cm|mm|dd|cc|sp -D {S}(({N}{S}{U})|(\\{W})){S} +HU {U}|em +HD {S}(({N}{S}{HU})|(\\{W})){S} +HG {HD}(plus{HD})?(minus{HD})? +VU {U}|ex +VD {S}(({N}{S}{VU})|(\\{W})){S} +VG {VD}(plus{VD})?(minus{VD})? Z \*? %Start Define Display IncludeOnly Input Math Normal Control @@ -212,11 +217,12 @@ Z \*? "\n" NEWLINE; . ; -"\\vskip"{D} ; -"\\vspace"{Z}{S}"{"{D}"}" ; -"\\hskip"{D} ; -"\\hspace"{Z}{S}"{"{D}"}" ; -"\\addvspace"{S}"{"{D}"}" ; +"\\kern"{HD} ; +"\\vskip"{VG} ; +"\\vspace"{Z}{S}"{"{VG}"}" ; +"\\hskip"{HG} ; +"\\hspace"{Z}{S}"{"{HG}"}" ; +"\\addvspace"{S}"{"{VG}"}" ; "\\newlength" { KILLARGS(1); } "\\setlength" { KILLARGS(2); } diff --git a/Build/source/texk/detex/detex.c b/Build/source/texk/detex/detex.c index da80b732d09..1cfa5e5bee3 100644 --- a/Build/source/texk/detex/detex.c +++ b/Build/source/texk/detex/detex.c @@ -359,8 +359,8 @@ static void yy_fatal_error (yyconst char msg[] ); *yy_cp = '\0'; \ (yy_c_buf_p) = yy_cp; -#define YY_NUM_RULES 141 -#define YY_END_OF_BUFFER 142 +#define YY_NUM_RULES 142 +#define YY_END_OF_BUFFER 143 /* This struct is not used in this scanner, but its presence is necessary. */ struct yy_trans_info @@ -368,86 +368,125 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[708] = +static yyconst flex_int16_t yy_accept[1067] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 121, 121, 0, 0, 0, 0, + 0, 0, 0, 0, 122, 122, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 134, 134, 0, 0, 0, 0, 0, 0, 117, 117, - 0, 0, 142, 141, 79, 78, 77, 91, 90, 91, - 102, 105, 104, 103, 107, 109, 108, 96, 94, 93, - 96, 128, 128, 92, 1, 127, 128, 123, 123, 125, - 122, 121, 120, 119, 122, 122, 121, 11, 11, 10, - 9, 11, 87, 86, 87, 18, 17, 15, 16, 14, - 13, 14, 83, 82, 83, 98, 100, 99, 132, 129, - - 130, 131, 134, 133, 138, 135, 136, 137, 140, 139, - 6, 6, 7, 117, 42, 41, 43, 89, 102, 107, - 95, 124, 88, 1, 127, 0, 126, 116, 114, 80, - 113, 113, 113, 113, 84, 115, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 113, 121, 121, 119, 119, 0, 118, 0, - 0, 9, 0, 0, 0, 85, 15, 0, 81, 98, - 134, 6, 0, 42, 126, 113, 113, 111, 111, 115, - 0, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - - 113, 113, 113, 113, 113, 113, 113, 113, 113, 0, - 0, 0, 0, 110, 110, 0, 115, 113, 113, 113, - 113, 113, 76, 113, 64, 113, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 70, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 0, 0, 12, 0, 113, - 113, 113, 113, 113, 113, 60, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 51, 113, 113, 113, - 113, 113, 113, 31, 113, 113, 113, 113, 113, 113, - - 113, 113, 113, 113, 72, 113, 113, 0, 0, 0, - 0, 113, 113, 3, 113, 113, 113, 45, 113, 113, - 113, 113, 113, 113, 113, 113, 65, 106, 67, 113, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 51, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 0, - 0, 0, 0, 113, 113, 0, 0, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 0, 0, 0, 0, - 0, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 35, 113, 113, 113, 113, 113, 113, 113, - - 113, 113, 113, 113, 113, 113, 113, 113, 113, 113, - 33, 113, 0, 0, 0, 0, 0, 113, 0, 0, - 0, 113, 113, 0, 0, 57, 113, 113, 113, 113, - 113, 113, 113, 113, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 21, 0, 0, 0, 97, 113, - 113, 113, 113, 113, 113, 68, 113, 113, 113, 113, - 113, 113, 113, 32, 113, 52, 113, 113, 113, 113, - 113, 113, 113, 113, 113, 113, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 19, 0, 0, 0, - 0, 0, 0, 113, 113, 0, 113, 59, 47, 113, - - 113, 113, 50, 66, 0, 21, 21, 0, 0, 0, - 0, 0, 113, 113, 113, 113, 113, 113, 113, 113, - 113, 113, 34, 113, 113, 113, 113, 36, 52, 113, - 113, 113, 113, 113, 113, 113, 113, 113, 113, 0, - 19, 19, 0, 0, 0, 0, 0, 0, 0, 0, - 113, 113, 0, 113, 113, 113, 113, 48, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 113, - 113, 112, 113, 113, 24, 113, 49, 69, 55, 113, - 113, 37, 39, 113, 25, 113, 113, 113, 113, 113, - 113, 46, 113, 0, 0, 0, 0, 0, 0, 0, - - 0, 0, 0, 0, 0, 8, 0, 4, 0, 113, - 0, 0, 0, 113, 113, 113, 113, 0, 0, 0, - 22, 113, 113, 73, 113, 30, 55, 38, 113, 37, - 71, 29, 113, 27, 53, 113, 113, 63, 0, 0, - 0, 20, 0, 26, 0, 0, 0, 0, 0, 0, - 113, 44, 113, 113, 113, 101, 113, 113, 28, 53, - 113, 113, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 58, 113, 113, 113, 113, - 74, 113, 56, 0, 0, 0, 0, 23, 0, 62, - 61, 113, 113, 54, 56, 0, 5, 0, 113, 75, - - 54, 0, 2, 40, 40, 40, 0 + 135, 135, 0, 0, 0, 0, 0, 0, 118, 118, + 0, 0, 143, 142, 80, 79, 78, 92, 91, 92, + 103, 106, 105, 104, 108, 110, 109, 97, 95, 94, + 97, 129, 129, 93, 1, 128, 129, 124, 124, 126, + 123, 122, 121, 120, 123, 123, 122, 11, 11, 10, + 9, 11, 88, 87, 88, 18, 17, 15, 16, 14, + 13, 14, 84, 83, 84, 99, 101, 100, 133, 130, + + 131, 132, 135, 134, 139, 136, 137, 138, 141, 140, + 6, 6, 7, 118, 43, 42, 44, 90, 103, 108, + 96, 125, 89, 1, 128, 0, 127, 117, 115, 81, + 114, 114, 114, 114, 85, 116, 114, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + 114, 114, 114, 114, 122, 122, 120, 120, 0, 119, + 0, 0, 9, 0, 0, 0, 86, 15, 0, 82, + 99, 135, 6, 0, 43, 127, 114, 114, 112, 112, + 116, 0, 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, 0, 0, 0, 0, 111, 111, 0, 116, 114, + 114, 114, 114, 114, 77, 114, 65, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + 114, 114, 71, 114, 114, 114, 114, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 0, 0, + 12, 0, 114, 114, 114, 114, 114, 114, 61, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + 52, 114, 114, 114, 114, 114, 114, 32, 114, 114, + + 114, 114, 114, 114, 114, 114, 114, 114, 73, 114, + 114, 0, 0, 0, 0, 114, 114, 3, 114, 114, + 114, 46, 114, 114, 114, 114, 114, 114, 114, 114, + 66, 107, 0, 0, 0, 0, 0, 68, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 52, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 0, 0, + 0, 0, 114, 114, 0, 0, 114, 114, 114, 114, + 114, 114, 114, 114, 114, 0, 0, 0, 0, 0, + 114, 114, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 19, 114, 114, 114, 114, 114, 114, + 114, 114, 114, 36, 114, 114, 114, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + 114, 34, 114, 0, 0, 0, 0, 0, 114, 0, + 0, 0, 114, 114, 0, 0, 58, 114, 114, 114, + 114, 114, 114, 114, 114, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 22, 0, 0, 0, + 98, 0, 19, 19, 114, 114, 114, 114, 114, 114, + 69, 114, 114, 114, 114, 114, 114, 114, 33, 114, + 53, 114, 114, 114, 114, 114, 114, 114, 114, 114, + + 114, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 20, 0, 0, 0, 0, 0, 0, 114, + 114, 0, 114, 60, 48, 114, 114, 114, 51, 67, + 0, 22, 22, 22, 22, 0, 0, 0, 0, 0, + 114, 114, 114, 114, 114, 114, 114, 114, 114, 114, + 35, 114, 114, 114, 114, 37, 53, 114, 114, 114, + 114, 114, 114, 114, 114, 114, 114, 0, 20, 20, + 20, 20, 0, 0, 0, 0, 0, 0, 0, 0, + 114, 114, 0, 114, 114, 114, 114, 49, 0, 0, + 22, 22, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 114, 114, 113, 114, 114, 25, + 114, 50, 70, 56, 114, 114, 38, 40, 114, 26, + 114, 114, 114, 114, 114, 114, 47, 114, 0, 0, + 20, 20, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 8, 0, 4, 0, 114, + 0, 0, 0, 114, 114, 114, 114, 0, 0, 22, + 22, 0, 0, 0, 0, 0, 23, 114, 114, 74, + 114, 31, 56, 39, 114, 38, 72, 30, 114, 28, + 54, 114, 114, 64, 0, 0, 20, 20, 0, 0, + 0, 0, 0, 21, 0, 27, 0, 0, 0, 0, + + 0, 0, 114, 45, 114, 114, 0, 0, 22, 22, + 0, 0, 0, 0, 114, 102, 114, 114, 29, 54, + 114, 114, 0, 0, 20, 20, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 59, 114, 114, 0, 0, 22, + 22, 0, 0, 0, 0, 0, 0, 0, 0, 114, + 114, 75, 114, 57, 0, 0, 20, 20, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 24, 0, 63, 62, 0, 0, 22, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 0, 0, 0, 22, 0, 0, 0, 0, 114, + 114, 55, 57, 0, 0, 20, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 20, 0, 0, 0, 0, 0, 5, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 22, 0, 22, 22, 22, + 0, 0, 0, 0, 0, 0, 0, 0, 114, 76, + 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 20, 0, 20, 20, 20, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + + 0, 2, 0, 22, 22, 22, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 41, 0, 20, 20, 20, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 22, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 41, 41, 20, 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, 22, + + 0, 0, 0, 0, 20, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 22, 0, + 20, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 22, + 0, 20, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -492,188 +531,270 @@ static yyconst flex_int32_t yy_meta[57] = 8, 8, 11, 1, 12, 1 } ; -static yyconst flex_int16_t yy_base[746] = +static yyconst flex_int16_t yy_base[1116] = { 0, 0, 0, 0, 1, 2, 3, 8, 11, 14, 23, 16, 17, 78, 0, 134, 0, 190, 0, 4, 25, 246, 0, 26, 29, 30, 31, 301, 304, 307, 308, - 1604, 1603, 311, 312, 32, 33, 36, 42, 1613, 1612, - 17, 18, 1627, 1632, 1632, 1632, 1632, 1632, 1632, 1620, - 0, 1632, 1632, 1632, 0, 1632, 1632, 1632, 1632, 1632, - 1619, 1632, 1596, 1617, 0, 21, 1614, 367, 1632, 1632, - 1632, 317, 1632, 0, 310, 0, 1568, 1632, 422, 425, - 0, 428, 1632, 1632, 1593, 1632, 1632, 0, 1632, 1632, - 1632, 1586, 1632, 1632, 1608, 0, 1632, 1632, 1632, 1632, - - 1632, 1632, 0, 1632, 1632, 1632, 1632, 1632, 1632, 1632, - 0, 0, 1584, 1632, 0, 1632, 1632, 1632, 0, 0, - 1632, 1632, 1632, 0, 24, 1608, 1607, 1632, 1632, 1632, - 0, 24, 431, 434, 1632, 298, 284, 289, 283, 16, - 1573, 298, 1568, 438, 443, 1579, 448, 1582, 301, 424, - 1577, 1564, 32, 456, 1555, 0, 0, 327, 0, 459, - 462, 0, 480, 1570, 1573, 1632, 0, 1564, 1632, 0, - 0, 0, 1563, 0, 1595, 0, 488, 492, 1632, 1577, - 1574, 1568, 1564, 1568, 1551, 1557, 1561, 1563, 1561, 1550, - 302, 304, 442, 1561, 1549, 1540, 314, 1551, 463, 1541, - - 1538, 1543, 1555, 281, 418, 1533, 1549, 1537, 308, 1539, - 1535, 1546, 1545, 497, 1632, 1549, 1632, 2, 1538, 468, - 1541, 1531, 1535, 1524, 0, 1531, 1530, 1522, 1530, 1537, - 1526, 1531, 1516, 1529, 1528, 484, 1527, 489, 1514, 1519, - 1524, 1519, 1526, 1521, 1503, 1513, 1505, 475, 1505, 1506, - 1502, 481, 1517, 1509, 1516, 1507, 1513, 1632, 523, 1500, - 1496, 1499, 1493, 1501, 1491, 0, 1492, 1494, 1494, 1491, - 1496, 1490, 1487, 1498, 1481, 1477, 1480, 1486, 1494, 1481, - 1481, 1488, 1491, 500, 1484, 1476, 1506, 1483, 1482, 1465, - 1461, 1466, 1481, 0, 1477, 1472, 1466, 1474, 1464, 483, - - 1476, 1473, 1461, 1473, 0, 1458, 1469, 1456, 1469, 530, - 534, 1458, 1453, 537, 1462, 1452, 1442, 1462, 1458, 1457, - 1445, 1455, 1445, 589, 1453, 1453, 0, 0, 0, 1440, - 1443, 1434, 1440, 1432, 1437, 1445, 1431, 1432, 1425, 1632, - 1444, 1442, 1441, 1438, 1437, 1427, 1438, 1425, 1419, 1424, - 510, 1433, 1433, 1418, 1419, 1410, 1428, 614, 1425, 1428, - 1410, 546, 1422, 1421, 1424, 554, 563, 1412, 1416, 1411, - 1407, 1417, 1406, 1416, 1416, 1398, 639, 538, 58, 664, - 0, 558, 1410, 1409, 1401, 1403, 1404, 1405, 1398, 1402, - 1384, 1405, 0, 1391, 1386, 1389, 1400, 1399, 1378, 1385, - - 1385, 1384, 1389, 1390, 1389, 1384, 1374, 1374, 1389, 1378, - 0, 1378, 708, 555, 336, 733, 0, 585, 1380, 1377, - 1369, 1371, 1380, 576, 1368, 0, 1365, 1375, 1357, 1364, - 1359, 1362, 1371, 1369, 558, 427, 471, 1358, 537, 1368, - 1358, 1358, 553, 1354, 610, 617, 620, 777, 435, 1367, - 1366, 1350, 1347, 1362, 1349, 0, 1351, 1346, 1338, 1357, - 1346, 1343, 1342, 0, 1333, 1371, 1335, 1334, 1336, 1341, - 1345, 1339, 1342, 1339, 1331, 1343, 617, 547, 569, 1328, - 569, 1338, 1328, 1328, 579, 1324, 633, 644, 655, 802, - 1333, 1325, 1333, 1302, 1303, 1304, 1291, 0, 0, 1270, - - 618, 1242, 0, 0, 581, 658, 672, 0, 667, 628, - 827, 0, 1247, 1243, 1243, 1232, 1230, 1233, 1226, 1223, - 1223, 1210, 0, 1203, 1198, 1186, 1185, 0, 1632, 1005, - 948, 936, 946, 933, 936, 945, 931, 930, 934, 655, - 683, 686, 0, 676, 661, 871, 0, 696, 711, 939, - 921, 714, 919, 922, 922, 924, 916, 0, 711, 686, - 689, 918, 690, 928, 918, 918, 698, 911, 729, 924, - 913, 0, 919, 909, 0, 898, 0, 0, 936, 895, - 911, 928, 0, 894, 0, 901, 900, 899, 893, 882, - 897, 0, 892, 723, 725, 729, 881, 712, 891, 874, - - 872, 716, 867, 752, 755, 1632, 783, 1632, 863, 871, - 793, 915, 865, 868, 855, 862, 839, 744, 796, 821, - 1632, 846, 833, 0, 843, 0, 1632, 0, 838, 1632, - 0, 0, 832, 0, 866, 834, 826, 0, 752, 830, - 837, 1632, 831, 0, 0, 796, 755, 940, 0, 833, - 814, 0, 818, 817, 814, 0, 812, 804, 0, 1632, - 785, 779, 769, 805, 758, 766, 765, 795, 758, 747, - 737, 806, 710, 845, 678, 0, 624, 631, 615, 609, - 0, 598, 616, 851, 785, 858, 878, 1632, 556, 0, - 0, 550, 505, 511, 1632, 891, 1632, 894, 422, 0, - - 1632, 918, 1632, 985, 0, 0, 1632, 1041, 1053, 1065, - 1077, 1089, 1101, 1113, 1125, 1137, 1149, 1161, 1173, 1185, - 1197, 1209, 1221, 1233, 1243, 1253, 1262, 1270, 1279, 1281, - 441, 431, 1289, 1299, 1311, 1323, 1330, 1332, 1340, 342, - 340, 323, 39, 23, 1352 + 2540, 2539, 311, 312, 32, 33, 36, 42, 2549, 2548, + 17, 18, 2563, 2913, 2913, 2913, 2913, 2913, 2913, 2556, + 0, 2913, 2913, 2913, 0, 2913, 2913, 2913, 2913, 2913, + 2555, 2913, 2531, 2552, 0, 21, 2549, 367, 2913, 2913, + 2913, 317, 2913, 0, 310, 0, 2503, 2913, 422, 425, + 0, 428, 2913, 2913, 2528, 2913, 2913, 0, 2913, 2913, + 2913, 2521, 2913, 2913, 2543, 0, 2913, 2913, 2913, 2913, + + 2913, 2913, 0, 2913, 2913, 2913, 2913, 2913, 2913, 2913, + 0, 0, 2519, 2913, 0, 2913, 2913, 2913, 0, 0, + 2913, 2913, 2913, 0, 24, 2539, 2537, 2913, 2913, 2913, + 0, 24, 431, 434, 2913, 298, 284, 289, 283, 16, + 2503, 298, 2498, 438, 2509, 443, 2508, 448, 2511, 301, + 424, 2506, 2489, 32, 456, 2480, 0, 0, 327, 0, + 459, 462, 0, 480, 2495, 2498, 2913, 0, 2489, 2913, + 0, 0, 0, 2488, 0, 2520, 0, 488, 492, 2913, + 2502, 2499, 2493, 2489, 2493, 2476, 2482, 2485, 2487, 2485, + 2474, 302, 304, 442, 2471, 2484, 2472, 2463, 314, 2474, + + 463, 2464, 2461, 2466, 2478, 281, 418, 2455, 2471, 2459, + 308, 2461, 2457, 2468, 2467, 497, 2913, 2471, 2913, 2, + 2456, 468, 2458, 2448, 2452, 2441, 0, 2448, 2447, 2439, + 2443, 2450, 2439, 2444, 2429, 2434, 2441, 2440, 484, 2439, + 489, 2426, 2431, 2436, 2431, 2438, 2432, 2414, 2424, 2416, + 475, 2416, 2417, 2413, 481, 2428, 2420, 2427, 2418, 2424, + 2913, 523, 2411, 2406, 2409, 2403, 2411, 2401, 0, 2402, + 2404, 2404, 2397, 2401, 2395, 2392, 2403, 2386, 2382, 2385, + 575, 2387, 2395, 2382, 2382, 2389, 2392, 500, 2385, 2377, + 2407, 2384, 2383, 2366, 2362, 2366, 2381, 0, 2377, 2372, + + 2366, 2374, 2364, 483, 2376, 2369, 2356, 2368, 0, 2353, + 2364, 2351, 2364, 530, 534, 2353, 2344, 546, 2353, 2343, + 2333, 2353, 2349, 2348, 2336, 2346, 2336, 600, 2344, 2344, + 0, 0, 625, 524, 58, 650, 0, 0, 2331, 2333, + 2324, 2330, 2322, 2327, 2335, 2321, 2322, 2311, 2913, 2329, + 2327, 2326, 2323, 2322, 2312, 2323, 2306, 2300, 2305, 510, + 2314, 2314, 2299, 2300, 2291, 2309, 694, 2306, 2309, 2291, + 552, 2303, 2301, 2304, 558, 561, 2292, 2296, 2291, 2287, + 2297, 2286, 2292, 2291, 2273, 719, 551, 336, 744, 0, + 569, 2285, 569, 427, 471, 2274, 557, 2284, 2275, 2273, + + 2269, 550, 2265, 603, 2274, 2266, 2268, 2269, 2270, 2263, + 2267, 2249, 2270, 0, 2256, 2251, 2253, 2264, 2263, 2242, + 2249, 2249, 2248, 2253, 2250, 2248, 2243, 2233, 2233, 2248, + 2237, 0, 2237, 788, 593, 541, 813, 0, 621, 2235, + 2231, 2223, 2224, 2233, 616, 2220, 0, 2217, 2227, 2205, + 2212, 2207, 2210, 2219, 2217, 618, 553, 558, 2206, 590, + 2216, 2207, 2205, 2205, 567, 2201, 659, 641, 654, 857, + 435, 578, 666, 669, 2211, 2210, 2194, 2191, 2206, 2193, + 0, 2195, 2190, 2182, 2201, 2186, 2183, 2182, 0, 2173, + 2211, 2175, 2174, 2176, 2177, 2180, 2174, 2177, 2174, 2166, + + 2178, 660, 630, 633, 2163, 624, 2169, 2149, 2157, 2156, + 654, 2152, 701, 710, 713, 882, 2160, 2152, 2161, 2151, + 2152, 2153, 2154, 0, 0, 2143, 647, 2130, 0, 0, + 643, 722, 753, 769, 795, 0, 712, 672, 907, 0, + 2135, 2136, 2138, 2134, 2127, 2131, 2122, 2118, 2124, 2119, + 0, 2112, 2105, 2093, 2090, 0, 2913, 2106, 2102, 2086, + 2085, 2072, 2064, 2067, 2052, 2051, 2059, 702, 822, 837, + 864, 886, 0, 722, 726, 951, 0, 765, 776, 2064, + 2044, 748, 2037, 2039, 2029, 2030, 2022, 0, 2029, 2026, + 916, 929, 806, 737, 766, 2020, 709, 2020, 2008, 2006, + + 2005, 655, 1998, 958, 2008, 1997, 0, 2003, 1993, 0, + 1983, 0, 0, 2021, 1977, 1994, 2011, 0, 1977, 0, + 1984, 1979, 1977, 1971, 1965, 1978, 0, 1967, 1909, 1905, + 971, 975, 832, 769, 778, 1900, 779, 1909, 1887, 1895, + 1891, 787, 1886, 983, 910, 2913, 1000, 2913, 1882, 1891, + 889, 1054, 1886, 1889, 1880, 1893, 1870, 1879, 1869, 1003, + 1032, 791, 1038, 1045, 1049, 311, 2913, 1872, 1863, 0, + 1873, 0, 2913, 0, 1870, 2913, 0, 0, 1864, 0, + 1898, 1871, 1859, 0, 1857, 1849, 1058, 1080, 820, 1092, + 1105, 1109, 514, 2913, 1858, 0, 0, 900, 835, 1163, + + 0, 1857, 1837, 0, 1838, 1843, 1830, 1830, 1113, 1207, + 1837, 1833, 838, 402, 1835, 0, 1835, 1835, 0, 2913, + 1820, 1821, 1806, 1807, 1159, 1249, 1814, 1808, 841, 795, + 1805, 919, 838, 847, 1799, 890, 1809, 1778, 1786, 1781, + 856, 1776, 1134, 1777, 0, 1771, 1775, 1758, 1291, 1316, + 1188, 993, 889, 1341, 0, 1761, 1747, 904, 858, 1751, + 1742, 0, 1740, 1769, 1733, 1385, 1410, 1214, 1004, 911, + 1435, 0, 1736, 1721, 911, 926, 1126, 929, 1233, 1241, + 1297, 599, 2913, 1721, 0, 0, 1479, 0, 1237, 1012, + 973, 1504, 0, 1015, 976, 983, 1719, 985, 1729, 1717, + + 1708, 1708, 918, 1703, 1167, 1697, 1694, 1000, 1548, 1706, + 1690, 1722, 2913, 1584, 0, 1283, 1048, 1057, 1609, 0, + 1124, 1074, 1086, 1684, 993, 1693, 1674, 1673, 1662, 949, + 1654, 1180, 1633, 1633, 1022, 1653, 1183, 2913, 1627, 1614, + 1069, 1007, 1223, 0, 1127, 1102, 1105, 1591, 1093, 1595, + 1557, 1554, 1553, 1068, 1546, 1210, 1110, 1307, 1310, 1358, + 1530, 1689, 1714, 1351, 1243, 1134, 1739, 0, 1528, 0, + 2913, 0, 1252, 1138, 1156, 1518, 1128, 1527, 1490, 1474, + 1452, 1184, 1436, 1268, 1159, 1363, 1405, 1416, 1429, 1783, + 1808, 1430, 1353, 1181, 1833, 0, 1428, 1410, 1050, 1197, + + 1373, 2913, 1232, 1413, 1427, 1457, 1877, 0, 1444, 1425, + 1239, 1902, 0, 1447, 1266, 1274, 1406, 1284, 1391, 1381, + 1369, 1364, 1290, 1353, 1498, 1947, 1281, 1486, 1507, 1514, + 2002, 0, 1526, 1497, 1322, 2027, 0, 1507, 1332, 1347, + 1342, 1285, 1327, 1301, 1305, 1301, 1359, 1286, 1554, 1275, + 1259, 1290, 2071, 1568, 0, 1510, 1363, 1366, 1259, 1404, + 1247, 1234, 1221, 1206, 1412, 1189, 1529, 1376, 1574, 1588, + 1634, 0, 0, 1619, 0, 1587, 1438, 1460, 1186, 1508, + 1173, 1151, 1147, 1117, 1440, 1091, 1603, 1487, 1658, 1679, + 1683, 1086, 2107, 2132, 1692, 1601, 1526, 2157, 0, 1705, + + 1529, 1629, 1708, 1749, 1756, 1551, 1762, 1771, 1789, 2201, + 0, 1803, 1660, 1563, 2226, 0, 1798, 1566, 1603, 1036, + 1604, 1044, 989, 976, 957, 1599, 927, 1829, 2270, 1883, + 2309, 2006, 0, 1823, 1631, 1634, 900, 1632, 868, 831, + 835, 830, 1642, 814, 1852, 1683, 1857, 2022, 2052, 2348, + 2036, 2387, 2097, 1705, 2047, 2076, 2110, 2426, 2480, 2123, + 2101, 2113, 2126, 2534, 1897, 2913, 2589, 2601, 2613, 2625, + 2637, 2649, 2661, 2673, 2685, 2697, 2709, 2721, 2733, 2745, + 2757, 2769, 2781, 2791, 2801, 2810, 2818, 2827, 2829, 819, + 805, 2837, 2847, 2859, 2871, 2878, 2880, 2888, 803, 780, + + 762, 756, 750, 724, 722, 683, 676, 671, 623, 514, + 459, 23, 2900, 39, 323 } ; -static yyconst flex_int16_t yy_def[746] = +static yyconst flex_int16_t yy_def[1116] = { 0, - 708, 708, 709, 709, 710, 710, 711, 711, 712, 712, - 713, 713, 707, 13, 707, 15, 707, 17, 714, 714, - 707, 21, 715, 715, 716, 716, 717, 717, 718, 718, - 719, 719, 720, 720, 721, 721, 722, 722, 708, 708, - 723, 723, 707, 707, 707, 707, 707, 707, 707, 707, - 724, 707, 707, 707, 725, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 726, 707, 727, 707, 707, 707, - 707, 707, 707, 728, 729, 730, 707, 707, 707, 707, - 731, 707, 707, 707, 707, 707, 707, 732, 707, 707, - 707, 707, 707, 707, 707, 733, 707, 707, 707, 707, - - 707, 707, 734, 707, 707, 707, 707, 707, 707, 707, - 735, 735, 707, 707, 736, 707, 707, 707, 724, 725, - 707, 707, 707, 726, 707, 737, 727, 707, 707, 707, - 738, 738, 738, 738, 707, 707, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 707, 707, 728, 728, 729, 730, 707, - 707, 731, 707, 707, 707, 707, 732, 707, 707, 733, - 734, 735, 707, 736, 737, 738, 738, 707, 707, 707, - 739, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - - 738, 738, 738, 738, 738, 738, 738, 738, 738, 707, - 707, 707, 707, 707, 707, 739, 707, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 707, 707, 707, 707, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - - 738, 738, 738, 738, 738, 738, 738, 707, 707, 707, - 707, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 707, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 707, - 707, 707, 707, 738, 738, 707, 707, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 707, 707, 707, 707, - 740, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 707, 707, 707, 707, 741, 738, 707, 707, - 707, 738, 738, 707, 707, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 380, 435, 707, 707, 707, 707, - 707, 707, 707, 707, 740, 707, 707, 707, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 416, 477, 707, 707, - 707, 707, 707, 707, 707, 707, 741, 707, 707, 707, - 707, 707, 707, 738, 738, 707, 738, 738, 738, 738, - - 738, 738, 738, 738, 435, 707, 707, 448, 707, 707, - 707, 742, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 707, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 477, - 707, 707, 490, 707, 707, 707, 743, 707, 707, 707, - 738, 738, 707, 738, 738, 738, 738, 738, 511, 559, - 707, 707, 707, 707, 707, 707, 707, 707, 742, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 738, - 738, 738, 738, 546, 594, 707, 707, 707, 707, 707, - - 707, 707, 707, 743, 707, 707, 707, 707, 707, 738, - 707, 707, 707, 738, 738, 738, 738, 559, 707, 707, - 707, 738, 738, 738, 738, 738, 707, 738, 738, 707, - 738, 738, 738, 738, 738, 738, 738, 738, 594, 707, - 707, 707, 707, 738, 612, 707, 707, 707, 744, 707, - 738, 738, 738, 738, 738, 738, 738, 738, 738, 707, - 738, 738, 707, 648, 664, 707, 707, 707, 707, 707, - 707, 707, 707, 744, 707, 738, 738, 738, 738, 738, - 738, 738, 738, 707, 664, 707, 707, 707, 707, 738, - 738, 738, 738, 738, 707, 707, 707, 707, 738, 738, - - 707, 707, 707, 707, 745, 704, 0, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707 + 1067, 1067, 1068, 1068, 1069, 1069, 1070, 1070, 1071, 1071, + 1072, 1072, 1066, 13, 1066, 15, 1066, 17, 1073, 1073, + 1066, 21, 1074, 1074, 1075, 1075, 1076, 1076, 1077, 1077, + 1078, 1078, 1079, 1079, 1080, 1080, 1081, 1081, 1067, 1067, + 1082, 1082, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1083, 1066, 1066, 1066, 1084, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1085, 1066, 1086, 1066, 1066, 1066, + 1066, 1066, 1066, 1087, 1088, 1089, 1066, 1066, 1066, 1066, + 1090, 1066, 1066, 1066, 1066, 1066, 1066, 1091, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1092, 1066, 1066, 1066, 1066, + + 1066, 1066, 1093, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1094, 1094, 1066, 1066, 1095, 1066, 1066, 1066, 1083, 1084, + 1066, 1066, 1066, 1085, 1066, 1096, 1086, 1066, 1066, 1066, + 1097, 1097, 1097, 1097, 1066, 1066, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1066, 1066, 1087, 1087, 1088, 1089, + 1066, 1066, 1090, 1066, 1066, 1066, 1066, 1091, 1066, 1066, + 1092, 1093, 1094, 1066, 1095, 1096, 1097, 1097, 1066, 1066, + 1066, 1098, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1066, 1066, 1066, 1066, 1066, 1066, 1098, 1066, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1066, 1066, + 1066, 1066, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1066, 1066, 1066, 1066, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1066, 1066, 1066, 1066, 1099, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1066, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1066, 1066, + 1066, 1066, 1097, 1097, 1066, 1066, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1066, 1066, 1066, 1066, 1100, + 1097, 1097, 336, 393, 1066, 1066, 1066, 1066, 1066, 1066, + + 1066, 1066, 1066, 1099, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1066, 1066, 1066, 1066, 1101, 1097, 1066, + 1066, 1066, 1097, 1097, 1066, 1066, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 389, 456, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1100, 1066, 1066, 1066, + 1097, 393, 1066, 1066, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + + 1097, 437, 502, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1101, 1066, 1066, 1066, 1066, 1066, 1066, 1097, + 1097, 1066, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 456, 1066, 1066, 1100, 1100, 470, 1066, 1066, 1066, 1102, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1066, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 502, 1066, 1066, + 1101, 1101, 516, 1066, 1066, 1066, 1103, 1066, 1066, 1066, + 1097, 1097, 1066, 1097, 1097, 1097, 1097, 1097, 1066, 1066, + 1100, 1100, 539, 593, 1066, 1066, 1066, 1066, 1066, 1066, + + 1066, 1066, 1066, 1102, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1097, 1066, 1066, + 1101, 1101, 576, 633, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1103, 1066, 1066, 1066, 1066, 1066, 1097, + 1066, 1066, 1066, 1097, 1097, 1097, 1097, 1066, 1066, 1100, + 1100, 593, 1066, 1066, 1102, 665, 1066, 1097, 1097, 1097, + 1097, 1097, 1066, 1097, 1097, 1066, 1097, 1097, 1097, 1097, + 1097, 1097, 1097, 1097, 1066, 1066, 1101, 1101, 633, 1066, + 1066, 1103, 692, 1066, 1066, 1097, 652, 1066, 1066, 1066, + + 1104, 1066, 1097, 1097, 1097, 1097, 1066, 1066, 1100, 1100, + 1066, 1066, 665, 665, 1097, 1097, 1097, 1097, 1097, 1066, + 1097, 1097, 1066, 1066, 1101, 1101, 1066, 1066, 692, 692, + 1066, 700, 732, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1104, 1066, 1097, 1097, 1097, 1066, 1066, 710, + 749, 1066, 1066, 1066, 1105, 1066, 1066, 665, 665, 1097, + 1097, 1097, 1097, 1097, 1066, 1066, 726, 766, 1066, 1066, + 1066, 1106, 1066, 1066, 692, 692, 1066, 732, 1066, 1066, + 1104, 781, 1066, 1066, 1097, 1097, 1066, 749, 787, 1066, + 1066, 1066, 1107, 754, 794, 1066, 1066, 1066, 1066, 1066, + + 1066, 1066, 1066, 1066, 1105, 1066, 1066, 665, 665, 1097, + 1097, 1097, 1066, 1066, 766, 814, 1066, 1066, 1066, 1108, + 771, 821, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1106, 1066, 1066, 692, 692, 1066, 1066, 1066, 1066, + 781, 781, 1066, 787, 792, 845, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1107, 794, 1066, 1066, 1105, + 1066, 1066, 809, 862, 1066, 1066, 1066, 1109, 1097, 1097, + 1066, 814, 819, 873, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1108, 821, 1066, 1066, 1106, 1066, 1066, + 836, 890, 1066, 1066, 1066, 1110, 1066, 1066, 781, 781, + + 1066, 1066, 845, 1066, 1066, 1105, 1066, 862, 907, 1066, + 1066, 1066, 1111, 867, 914, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1109, 1066, 873, 1066, 1066, 1106, + 1066, 890, 931, 1066, 1066, 1066, 1112, 895, 938, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1110, 1066, + 1066, 781, 781, 1105, 907, 912, 956, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1111, 914, 1066, 1066, + 1109, 1113, 926, 1106, 931, 936, 976, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1112, 938, 1066, 1066, + 1110, 1066, 1066, 953, 993, 1066, 1066, 1066, 1114, 1105, + + 956, 1066, 1066, 1109, 1106, 976, 1066, 1066, 1110, 1066, + 993, 1010, 1066, 1066, 1066, 1115, 998, 1017, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1114, 1105, 1109, + 1106, 1110, 1010, 1015, 1034, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1115, 1017, 1066, 1066, 1114, 1066, + 1109, 1066, 1110, 1034, 1066, 1066, 1114, 1109, 1110, 1114, + 907, 931, 1114, 1114, 1012, 0, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066 } ; -static yyconst flex_int16_t yy_nxt[1689] = +static yyconst flex_int16_t yy_nxt[2970] = { 0, - 707, 707, 46, 46, 49, 49, 84, 50, 50, 52, + 1066, 1066, 46, 46, 49, 49, 84, 50, 50, 52, 53, 52, 52, 53, 52, 56, 57, 56, 59, 59, 52, 60, 60, 52, 56, 57, 56, 84, 91, 85, - 674, 91, 94, 94, 44, 44, 125, 125, 112, 125, - 125, 61, 61, 177, 112, 177, 604, 260, 187, 261, - 85, 92, 47, 47, 92, 95, 95, 188, 110, 110, - 52, 113, 54, 52, 208, 54, 56, 113, 56, 116, - 116, 117, 117, 435, 435, 56, 209, 56, 62, 62, + 987, 91, 94, 94, 44, 44, 125, 125, 112, 125, + 125, 61, 61, 178, 112, 178, 1028, 263, 188, 264, + 85, 92, 47, 47, 92, 95, 95, 189, 110, 110, + 52, 113, 54, 52, 210, 54, 56, 113, 56, 116, + 116, 117, 117, 393, 393, 56, 211, 56, 62, 62, 62, 62, 63, 64, 65, 62, 62, 62, 62, 62, 62, 62, 62, 66, 66, 62, 62, 67, 67, 67, @@ -699,170 +820,311 @@ static yyconst flex_int16_t yy_nxt[1689] = 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 88, 86, 86, - 89, 86, 97, 98, 97, 97, 98, 97, 180, 44, - 44, 247, 177, 44, 44, 182, 177, 157, 154, 185, - 154, 183, 181, 157, 186, 184, 248, 157, 190, 198, - 569, 100, 100, 199, 157, 106, 106, 157, 227, 191, - 157, 229, 200, 228, 157, 254, 230, 487, 237, 445, - 255, 477, 477, 97, 157, 97, 97, 238, 97, 101, - 101, 102, 102, 107, 107, 108, 108, 128, 128, 155, + 89, 86, 97, 98, 97, 97, 98, 97, 181, 44, + 44, 250, 178, 44, 44, 183, 178, 158, 155, 186, + 155, 184, 182, 158, 187, 185, 251, 158, 191, 200, + 1045, 100, 100, 201, 158, 106, 106, 158, 229, 192, + 158, 231, 202, 230, 158, 257, 232, 604, 240, 714, + 258, 456, 456, 97, 158, 97, 97, 241, 97, 101, + 101, 102, 102, 107, 107, 108, 108, 128, 128, 156, 129, 128, 128, 128, 128, 130, 128, 128, 128, 128, 128, 128, 128, 128, 128, 131, 132, 131, 131, 133, 134, 135, 136, 128, 128, 137, 138, 139, 140, 141, - 142, 131, 143, 144, 131, 145, 131, 146, 147, 148, - 149, 150, 151, 152, 153, 131, 131, 131, 131, 128, - 128, 128, 128, 160, 160, 160, 160, 160, 160, 163, - 163, 163, 178, 179, 178, 178, 179, 178, 167, 178, - 179, 178, 707, 707, 178, 179, 178, 249, 162, 178, - 179, 178, 201, 202, 203, 177, 204, 154, 250, 154, - 160, 160, 160, 163, 163, 163, 704, 164, 177, 513, - 205, 194, 231, 232, 161, 165, 514, 161, 193, 195, - 177, 163, 163, 163, 233, 179, 505, 505, 179, 214, - 215, 214, 179, 178, 179, 178, 240, 179, 214, 215, - - 214, 164, 179, 241, 263, 297, 264, 242, 155, 165, - 303, 161, 265, 298, 280, 352, 281, 285, 286, 164, - 299, 701, 282, 304, 310, 310, 310, 165, 283, 353, - 335, 310, 310, 310, 287, 362, 362, 362, 366, 366, - 366, 404, 215, 336, 337, 405, 179, 362, 362, 362, - 700, 215, 379, 380, 380, 366, 366, 366, 406, 446, - 446, 446, 707, 707, 424, 424, 424, 506, 447, 415, - 416, 416, 707, 435, 435, 311, 506, 424, 424, 424, - 699, 363, 311, 506, 540, 540, 488, 488, 488, 367, - 377, 377, 377, 363, 425, 489, 505, 505, 506, 541, - - 378, 698, 378, 379, 380, 380, 367, 425, 541, 541, - 448, 507, 507, 507, 381, 413, 413, 413, 446, 446, - 446, 446, 446, 446, 541, 414, 695, 414, 415, 416, - 416, 707, 477, 477, 542, 542, 542, 490, 694, 417, - 377, 377, 377, 559, 559, 488, 488, 488, 556, 693, - 378, 692, 378, 379, 380, 380, 488, 488, 488, 507, - 507, 507, 557, 691, 381, 436, 436, 436, 690, 448, - 540, 540, 448, 507, 507, 507, 594, 594, 437, 380, - 380, 510, 511, 511, 542, 542, 542, 542, 542, 542, - 545, 546, 546, 438, 439, 440, 490, 605, 605, 605, - - 441, 707, 707, 442, 618, 618, 443, 490, 444, 413, - 413, 413, 607, 607, 607, 611, 611, 611, 689, 414, - 619, 414, 415, 416, 416, 707, 559, 559, 619, 619, - 620, 620, 620, 417, 478, 478, 478, 707, 594, 594, - 707, 707, 640, 619, 639, 639, 640, 479, 416, 416, - 606, 640, 686, 641, 641, 641, 605, 605, 605, 618, - 618, 640, 480, 481, 482, 608, 612, 639, 639, 483, - 664, 664, 484, 707, 707, 485, 686, 486, 508, 508, - 508, 685, 685, 621, 607, 607, 607, 686, 509, 686, - 509, 510, 511, 511, 611, 611, 611, 620, 620, 620, - - 685, 685, 512, 543, 543, 543, 642, 686, 684, 606, - 647, 648, 648, 544, 683, 544, 545, 546, 546, 707, - 664, 664, 620, 620, 620, 686, 682, 547, 560, 560, - 560, 641, 641, 641, 686, 681, 686, 608, 641, 641, - 641, 561, 511, 511, 680, 612, 687, 687, 687, 679, - 621, 686, 696, 696, 696, 678, 562, 563, 564, 687, - 687, 687, 677, 565, 676, 675, 566, 663, 662, 567, - 661, 568, 595, 595, 595, 621, 660, 659, 658, 687, - 687, 687, 657, 656, 642, 596, 546, 546, 655, 654, - 653, 642, 696, 696, 696, 702, 702, 702, 652, 688, - - 597, 598, 599, 651, 650, 697, 644, 600, 643, 640, - 601, 640, 688, 602, 640, 603, 645, 645, 645, 702, - 702, 702, 640, 640, 638, 637, 646, 636, 646, 647, - 648, 648, 688, 635, 634, 633, 632, 631, 630, 629, - 649, 665, 665, 665, 628, 697, 627, 626, 703, 625, - 624, 623, 622, 619, 666, 648, 648, 619, 619, 619, - 619, 617, 616, 615, 614, 613, 610, 609, 593, 667, - 668, 669, 703, 592, 591, 590, 670, 589, 588, 671, - 587, 586, 672, 585, 673, 705, 705, 705, 705, 705, - 705, 705, 705, 705, 705, 705, 705, 705, 705, 705, - - 705, 705, 705, 706, 706, 706, 706, 706, 706, 705, - 705, 705, 705, 706, 706, 706, 706, 706, 706, 706, - 706, 706, 706, 706, 706, 706, 706, 706, 706, 706, - 706, 706, 706, 706, 706, 706, 706, 584, 705, 705, - 705, 44, 44, 44, 44, 44, 44, 44, 44, 44, - 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, - 45, 45, 45, 45, 45, 48, 48, 48, 48, 48, - 48, 48, 48, 48, 48, 48, 48, 51, 51, 51, - 51, 51, 51, 51, 51, 51, 51, 51, 51, 55, - 55, 55, 55, 55, 55, 55, 55, 55, 55, 55, - - 55, 58, 58, 58, 58, 58, 58, 58, 58, 58, - 58, 58, 58, 83, 83, 83, 83, 83, 83, 83, - 83, 83, 83, 83, 83, 90, 90, 90, 90, 90, - 90, 90, 90, 90, 90, 90, 90, 93, 93, 93, - 93, 93, 93, 93, 93, 93, 93, 93, 93, 96, - 96, 96, 96, 96, 96, 96, 96, 96, 96, 96, - 96, 99, 99, 99, 99, 99, 99, 99, 99, 99, - 99, 99, 99, 103, 103, 103, 103, 103, 103, 103, - 103, 103, 103, 103, 103, 105, 105, 105, 105, 105, - 105, 105, 105, 105, 105, 105, 105, 109, 109, 109, - - 109, 109, 109, 109, 109, 109, 109, 109, 109, 111, - 111, 111, 111, 111, 111, 111, 111, 111, 111, 111, - 111, 115, 115, 115, 115, 115, 115, 115, 115, 115, - 115, 115, 115, 119, 583, 582, 119, 581, 119, 119, - 119, 119, 119, 120, 580, 579, 120, 120, 120, 120, - 120, 120, 120, 124, 124, 578, 124, 124, 124, 124, - 124, 124, 124, 124, 124, 127, 577, 576, 575, 127, - 156, 574, 573, 156, 156, 156, 156, 156, 156, 156, - 572, 156, 158, 571, 158, 158, 158, 159, 159, 170, - 570, 558, 170, 170, 170, 170, 170, 170, 170, 171, - - 171, 171, 171, 171, 171, 171, 171, 171, 555, 171, - 171, 172, 172, 172, 172, 172, 172, 172, 172, 554, - 172, 172, 172, 174, 174, 174, 174, 174, 174, 174, - 174, 174, 174, 175, 553, 552, 551, 175, 176, 176, - 216, 216, 216, 216, 216, 216, 216, 216, 216, 216, - 216, 216, 705, 705, 705, 705, 705, 705, 705, 705, - 705, 705, 550, 705, 549, 548, 541, 541, 541, 541, - 541, 539, 538, 537, 536, 535, 534, 533, 532, 531, - 530, 529, 528, 527, 526, 525, 524, 523, 522, 521, - 520, 519, 518, 517, 516, 515, 506, 506, 506, 506, - - 506, 504, 503, 502, 501, 500, 499, 498, 497, 496, - 495, 494, 493, 492, 491, 476, 475, 474, 473, 472, - 471, 470, 469, 468, 467, 466, 465, 464, 463, 462, - 461, 460, 459, 458, 457, 456, 455, 454, 453, 452, - 451, 450, 449, 434, 433, 432, 431, 430, 429, 428, - 427, 426, 423, 422, 421, 420, 419, 418, 412, 411, - 410, 409, 408, 407, 403, 402, 401, 400, 399, 398, - 397, 396, 395, 394, 393, 392, 391, 390, 389, 388, - 387, 386, 385, 384, 383, 382, 376, 375, 374, 373, - 372, 371, 370, 369, 368, 365, 364, 361, 360, 359, - - 358, 357, 356, 355, 354, 351, 350, 349, 348, 347, - 346, 345, 344, 343, 342, 341, 340, 339, 338, 334, - 333, 332, 331, 330, 329, 328, 327, 326, 325, 324, - 323, 322, 321, 320, 319, 318, 317, 316, 315, 314, - 313, 312, 309, 308, 307, 306, 305, 302, 301, 300, - 296, 295, 294, 293, 292, 291, 290, 289, 288, 284, - 279, 278, 277, 276, 275, 274, 273, 272, 271, 270, - 269, 268, 267, 266, 262, 217, 259, 258, 257, 256, - 253, 252, 251, 246, 245, 244, 243, 239, 236, 235, - 234, 226, 225, 224, 223, 222, 221, 220, 219, 218, - - 217, 181, 707, 213, 212, 211, 210, 155, 207, 206, - 197, 196, 192, 189, 126, 126, 173, 169, 168, 166, - 155, 126, 123, 122, 121, 118, 707, 114, 114, 104, - 104, 43, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707 + 142, 131, 143, 144, 145, 146, 131, 147, 148, 149, + 150, 151, 152, 153, 154, 131, 131, 131, 131, 128, + 128, 128, 128, 161, 161, 161, 161, 161, 161, 164, + 164, 164, 179, 180, 179, 179, 180, 179, 604, 179, + 180, 179, 1066, 1066, 179, 180, 179, 252, 759, 179, + 180, 179, 203, 204, 205, 178, 206, 155, 253, 155, + 161, 161, 161, 164, 164, 164, 967, 165, 178, 541, + 207, 196, 233, 234, 162, 166, 542, 162, 194, 197, + 178, 164, 164, 164, 235, 180, 472, 472, 180, 216, + 217, 216, 180, 179, 180, 179, 243, 180, 216, 217, + + 216, 165, 180, 244, 266, 301, 267, 245, 156, 166, + 307, 162, 268, 302, 284, 361, 285, 289, 290, 165, + 303, 949, 286, 308, 314, 314, 314, 166, 287, 362, + 344, 314, 314, 314, 291, 371, 371, 371, 335, 336, + 336, 425, 217, 345, 346, 426, 180, 375, 375, 375, + 644, 217, 730, 371, 371, 371, 502, 502, 427, 375, + 375, 375, 445, 445, 445, 388, 389, 389, 1066, 1066, + 468, 468, 468, 531, 531, 315, 333, 333, 333, 469, + 473, 372, 315, 1066, 393, 393, 334, 473, 334, 335, + 336, 336, 446, 472, 472, 473, 473, 532, 376, 372, + + 337, 386, 386, 386, 474, 474, 474, 436, 437, 437, + 376, 387, 532, 387, 388, 389, 389, 445, 445, 445, + 532, 470, 514, 514, 514, 390, 333, 333, 333, 532, + 925, 515, 1066, 456, 456, 743, 334, 842, 334, 335, + 336, 336, 468, 468, 468, 1066, 1066, 446, 568, 568, + 337, 394, 394, 394, 569, 468, 468, 468, 531, 531, + 533, 533, 533, 569, 395, 336, 336, 474, 474, 474, + 474, 474, 474, 516, 1066, 502, 502, 586, 884, 396, + 397, 398, 399, 856, 569, 663, 400, 593, 593, 401, + 832, 587, 402, 470, 403, 434, 434, 434, 534, 569, + + 663, 535, 570, 570, 570, 435, 470, 435, 436, 437, + 437, 514, 514, 514, 514, 514, 514, 568, 568, 438, + 386, 386, 386, 533, 533, 533, 538, 539, 539, 805, + 387, 743, 387, 388, 389, 389, 575, 576, 576, 663, + 571, 633, 633, 572, 390, 457, 457, 457, 663, 651, + 651, 651, 1066, 1066, 533, 533, 533, 644, 458, 389, + 389, 589, 516, 604, 590, 516, 645, 645, 645, 513, + 533, 533, 533, 459, 460, 461, 462, 647, 647, 647, + 463, 662, 662, 464, 1066, 1066, 465, 467, 466, 434, + 434, 434, 589, 689, 689, 590, 533, 533, 533, 435, + + 652, 435, 436, 437, 437, 591, 662, 662, 534, 690, + 404, 535, 168, 438, 503, 503, 503, 690, 690, 646, + 1066, 593, 593, 570, 570, 570, 163, 504, 437, 437, + 648, 644, 690, 592, 534, 689, 689, 535, 570, 570, + 570, 776, 505, 506, 507, 508, 1066, 633, 633, 509, + 732, 732, 510, 1066, 1066, 511, 1055, 512, 536, 536, + 536, 629, 778, 778, 630, 570, 570, 570, 537, 1055, + 537, 538, 539, 539, 604, 1055, 629, 644, 758, 630, + 1055, 775, 540, 573, 573, 573, 779, 570, 570, 570, + 651, 651, 651, 574, 604, 574, 575, 576, 576, 1055, + + 631, 779, 809, 571, 794, 794, 572, 577, 594, 594, + 594, 645, 645, 645, 699, 700, 700, 533, 533, 533, + 779, 595, 539, 539, 632, 571, 821, 821, 572, 779, + 533, 533, 533, 1066, 732, 732, 596, 597, 598, 599, + 604, 652, 1055, 600, 778, 778, 601, 644, 858, 602, + 808, 603, 634, 634, 634, 534, 660, 835, 535, 664, + 664, 664, 644, 858, 646, 635, 576, 576, 534, 1047, + 836, 535, 570, 570, 570, 661, 570, 570, 570, 886, + 636, 637, 638, 639, 691, 691, 691, 640, 845, 845, + 641, 1066, 1066, 642, 886, 643, 1047, 665, 857, 857, + + 666, 647, 647, 647, 533, 533, 533, 753, 754, 754, + 571, 687, 667, 572, 571, 858, 1047, 572, 770, 771, + 771, 688, 692, 886, 858, 693, 791, 792, 792, 1066, + 794, 794, 886, 533, 533, 533, 604, 694, 1047, 664, + 664, 664, 534, 743, 863, 535, 664, 664, 664, 709, + 664, 664, 664, 900, 648, 697, 697, 697, 644, 570, + 570, 570, 818, 819, 819, 698, 891, 698, 699, 700, + 700, 534, 873, 873, 535, 1047, 710, 711, 1047, 701, + 712, 570, 570, 570, 711, 713, 743, 712, 665, 1066, + 1066, 666, 667, 691, 691, 691, 952, 571, 904, 667, + + 572, 885, 885, 667, 725, 743, 691, 691, 691, 899, + 691, 691, 691, 904, 533, 533, 533, 1066, 1066, 571, + 903, 903, 572, 904, 726, 857, 857, 837, 837, 837, + 1010, 727, 904, 1007, 728, 780, 780, 780, 1066, 821, + 821, 1066, 845, 845, 727, 729, 694, 728, 692, 914, + 914, 693, 534, 1066, 1066, 535, 1007, 750, 928, 694, + 570, 570, 570, 694, 733, 733, 733, 928, 859, 859, + 859, 927, 927, 781, 885, 885, 782, 734, 700, 700, + 838, 887, 887, 887, 837, 837, 837, 1007, 783, 751, + 751, 751, 735, 736, 737, 738, 938, 938, 571, 739, + + 1007, 572, 740, 767, 1007, 741, 860, 742, 751, 751, + 751, 905, 905, 905, 928, 768, 768, 768, 752, 888, + 752, 753, 754, 754, 901, 901, 901, 589, 1007, 928, + 590, 1002, 755, 743, 780, 780, 780, 838, 789, 789, + 789, 953, 780, 780, 780, 1002, 534, 903, 903, 535, + 768, 768, 768, 629, 956, 956, 630, 866, 867, 867, + 769, 1002, 769, 770, 771, 771, 1066, 873, 873, 929, + 929, 929, 839, 1002, 772, 840, 589, 902, 1002, 590, + 839, 1066, 1066, 840, 816, 816, 816, 783, 571, 968, + 968, 572, 788, 788, 788, 783, 927, 927, 780, 780, + + 780, 1002, 752, 993, 752, 753, 754, 754, 859, 859, + 859, 859, 859, 859, 969, 989, 755, 789, 789, 789, + 969, 992, 629, 969, 989, 630, 743, 790, 989, 790, + 791, 792, 792, 841, 994, 969, 781, 976, 976, 782, + 989, 793, 795, 795, 795, 989, 589, 1066, 1066, 589, + 989, 783, 864, 864, 864, 796, 754, 754, 989, 859, + 859, 859, 988, 988, 887, 887, 887, 894, 895, 895, + 797, 798, 799, 800, 901, 901, 901, 801, 1066, 1066, + 802, 1001, 1001, 803, 989, 804, 815, 815, 815, 989, + 711, 968, 968, 712, 906, 969, 769, 860, 769, 770, + + 771, 771, 629, 969, 989, 667, 887, 887, 887, 969, + 772, 816, 816, 816, 905, 905, 905, 887, 887, 887, + 969, 817, 969, 817, 818, 819, 819, 902, 905, 905, + 905, 892, 892, 892, 1002, 820, 822, 822, 822, 911, + 912, 912, 1002, 1002, 629, 909, 909, 909, 969, 823, + 771, 771, 930, 1066, 1066, 888, 951, 1002, 859, 859, + 859, 1066, 914, 914, 824, 825, 826, 827, 950, 727, + 1007, 828, 728, 931, 829, 1006, 1006, 830, 928, 831, + 844, 844, 844, 711, 694, 1007, 712, 929, 929, 929, + 790, 928, 790, 791, 792, 792, 860, 954, 667, 970, + + 970, 970, 988, 988, 793, 846, 846, 846, 929, 929, + 929, 935, 936, 936, 928, 887, 887, 887, 847, 792, + 792, 1066, 938, 938, 1066, 956, 956, 933, 933, 933, + 1003, 1003, 1003, 848, 849, 850, 851, 971, 1007, 928, + 852, 1017, 1017, 853, 1001, 1001, 854, 1007, 855, 864, + 864, 864, 667, 888, 974, 990, 990, 990, 928, 865, + 928, 865, 866, 867, 867, 727, 1006, 1006, 728, 859, + 859, 859, 926, 868, 907, 970, 970, 970, 1034, 1034, + 694, 1066, 1066, 667, 604, 872, 872, 872, 904, 970, + 970, 970, 904, 991, 904, 817, 904, 817, 818, 819, + + 819, 1066, 976, 976, 1008, 1008, 1008, 860, 694, 820, + 874, 874, 874, 711, 1000, 997, 998, 998, 1046, 1046, + 887, 887, 887, 875, 819, 819, 904, 711, 667, 1047, + 1003, 1003, 1003, 904, 1047, 970, 970, 970, 876, 877, + 878, 879, 667, 1047, 1047, 880, 1066, 1066, 881, 1054, + 1054, 882, 898, 883, 892, 892, 892, 694, 888, 990, + 990, 990, 1055, 897, 893, 1005, 893, 894, 895, 895, + 1004, 1055, 1055, 971, 1014, 1015, 1015, 890, 896, 889, + 990, 990, 990, 667, 990, 990, 990, 1055, 667, 644, + 908, 908, 908, 995, 995, 995, 886, 727, 1046, 1046, + + 865, 886, 865, 866, 867, 867, 859, 859, 859, 1003, + 1003, 1003, 694, 886, 868, 909, 909, 909, 727, 1009, + 1054, 1054, 991, 886, 886, 910, 886, 910, 911, 912, + 912, 839, 871, 694, 840, 870, 869, 694, 862, 913, + 915, 915, 915, 861, 860, 858, 783, 858, 858, 1029, + 970, 970, 970, 916, 867, 867, 858, 887, 887, 887, + 858, 858, 667, 1008, 1008, 1008, 843, 834, 917, 918, + 919, 920, 1008, 1008, 1008, 921, 833, 814, 922, 813, + 812, 923, 811, 924, 932, 932, 932, 810, 971, 1030, + 990, 990, 990, 807, 893, 888, 893, 894, 895, 895, + + 1031, 806, 787, 667, 1012, 1012, 1012, 786, 896, 933, + 933, 933, 1066, 1017, 1017, 785, 694, 784, 779, 934, + 779, 934, 935, 936, 936, 694, 779, 779, 991, 1032, + 1048, 1048, 1048, 937, 939, 939, 939, 1066, 1034, 1034, + 779, 779, 839, 694, 777, 840, 774, 940, 895, 895, + 773, 766, 765, 1056, 1056, 1056, 764, 783, 1048, 1048, + 1048, 763, 941, 942, 943, 944, 762, 761, 1049, 945, + 760, 757, 946, 756, 749, 947, 748, 948, 955, 955, + 955, 747, 746, 783, 970, 970, 970, 745, 910, 744, + 910, 911, 912, 912, 731, 724, 839, 723, 1065, 1065, + + 1065, 722, 913, 957, 957, 957, 783, 721, 720, 719, + 718, 783, 717, 716, 715, 708, 958, 912, 912, 707, + 706, 705, 971, 704, 703, 702, 696, 695, 690, 1051, + 690, 959, 960, 961, 962, 690, 690, 667, 963, 1066, + 690, 964, 690, 686, 965, 685, 966, 972, 972, 972, + 972, 972, 972, 972, 972, 972, 972, 972, 972, 972, + 972, 972, 972, 972, 972, 973, 973, 973, 973, 973, + 973, 972, 972, 972, 972, 973, 973, 973, 973, 973, + 973, 973, 973, 973, 973, 973, 973, 973, 973, 973, + 973, 973, 973, 973, 973, 973, 973, 973, 973, 684, + + 972, 972, 972, 975, 975, 975, 683, 990, 990, 990, + 682, 681, 680, 934, 679, 934, 935, 936, 936, 678, + 677, 676, 675, 1048, 1048, 1048, 674, 937, 977, 977, + 977, 673, 672, 671, 670, 669, 668, 970, 970, 970, + 663, 978, 936, 936, 663, 991, 663, 663, 1056, 1056, + 1056, 663, 1053, 1048, 1048, 1048, 979, 980, 981, 982, + 694, 839, 663, 983, 659, 658, 984, 657, 656, 985, + 655, 986, 995, 995, 995, 971, 783, 1056, 1056, 1056, + 1058, 654, 996, 653, 996, 997, 998, 998, 1057, 650, + 667, 1049, 649, 628, 627, 626, 999, 625, 990, 990, + + 990, 783, 1061, 1061, 1061, 624, 783, 743, 1011, 1011, + 1011, 1048, 1048, 1048, 1062, 1062, 1062, 623, 996, 622, + 996, 997, 998, 998, 1048, 1048, 1048, 1048, 1048, 1048, + 783, 621, 999, 1012, 1012, 1012, 991, 620, 619, 618, + 711, 1059, 617, 1013, 616, 1013, 1014, 1015, 1015, 1049, + 1060, 694, 727, 615, 614, 667, 613, 1016, 1018, 1018, + 1018, 612, 1049, 611, 783, 1049, 610, 694, 609, 1063, + 1064, 1019, 998, 998, 608, 607, 606, 783, 605, 588, + 783, 585, 584, 583, 582, 581, 1020, 1021, 1022, 1023, + 580, 579, 578, 1024, 569, 569, 1025, 569, 569, 1026, + + 569, 1027, 1033, 1033, 1033, 569, 567, 566, 565, 564, + 563, 562, 1013, 561, 1013, 1014, 1015, 1015, 560, 559, + 558, 557, 556, 555, 554, 553, 1016, 1035, 1035, 1035, + 552, 551, 550, 549, 548, 547, 546, 545, 544, 543, + 1036, 1015, 1015, 532, 532, 532, 532, 532, 532, 530, + 529, 528, 527, 526, 525, 1037, 1038, 1039, 1040, 524, + 523, 522, 1041, 521, 520, 1042, 519, 518, 1043, 517, + 1044, 1050, 1050, 1050, 501, 500, 499, 498, 497, 496, + 495, 790, 494, 790, 791, 792, 792, 493, 492, 491, + 490, 489, 488, 487, 486, 793, 485, 484, 483, 482, + + 481, 480, 479, 478, 477, 476, 475, 473, 473, 860, + 1052, 1052, 1052, 473, 473, 473, 473, 471, 455, 454, + 817, 453, 817, 818, 819, 819, 452, 451, 450, 449, + 448, 447, 444, 443, 820, 442, 441, 440, 439, 433, + 432, 431, 430, 429, 428, 424, 423, 422, 888, 1050, + 1050, 1050, 421, 420, 419, 418, 417, 416, 415, 790, + 414, 790, 791, 792, 792, 413, 412, 411, 410, 409, + 408, 407, 406, 793, 405, 392, 391, 385, 384, 383, + 382, 381, 380, 379, 378, 377, 374, 589, 1052, 1052, + 1052, 373, 370, 369, 368, 367, 366, 365, 817, 364, + + 817, 818, 819, 819, 363, 360, 359, 358, 357, 356, + 355, 354, 820, 353, 352, 351, 350, 349, 348, 347, + 343, 342, 341, 340, 339, 338, 629, 1061, 1061, 1061, + 332, 331, 330, 329, 328, 327, 326, 910, 325, 910, + 911, 912, 912, 324, 323, 322, 321, 320, 319, 318, + 317, 913, 316, 313, 312, 311, 310, 309, 306, 305, + 304, 300, 299, 298, 297, 971, 296, 295, 294, 293, + 292, 288, 283, 282, 281, 280, 279, 278, 277, 276, + 667, 1062, 1062, 1062, 275, 274, 273, 272, 271, 270, + 269, 934, 265, 934, 935, 936, 936, 219, 262, 261, + + 260, 259, 256, 255, 254, 937, 249, 248, 247, 246, + 242, 239, 238, 237, 236, 228, 227, 226, 225, 991, + 224, 223, 222, 221, 220, 219, 182, 1066, 215, 214, + 213, 212, 156, 209, 694, 1065, 1065, 1065, 208, 199, + 198, 195, 193, 190, 126, 1013, 126, 1013, 1014, 1015, + 1015, 174, 170, 169, 167, 156, 126, 123, 122, 1016, + 121, 118, 1066, 114, 114, 104, 104, 1066, 1066, 1066, + 1066, 1066, 1066, 1049, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 783, 44, + 44, 44, 44, 44, 44, 44, 44, 44, 44, 44, + + 44, 45, 45, 45, 45, 45, 45, 45, 45, 45, + 45, 45, 45, 48, 48, 48, 48, 48, 48, 48, + 48, 48, 48, 48, 48, 51, 51, 51, 51, 51, + 51, 51, 51, 51, 51, 51, 51, 55, 55, 55, + 55, 55, 55, 55, 55, 55, 55, 55, 55, 58, + 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, + 58, 83, 83, 83, 83, 83, 83, 83, 83, 83, + 83, 83, 83, 90, 90, 90, 90, 90, 90, 90, + 90, 90, 90, 90, 90, 93, 93, 93, 93, 93, + 93, 93, 93, 93, 93, 93, 93, 96, 96, 96, + + 96, 96, 96, 96, 96, 96, 96, 96, 96, 99, + 99, 99, 99, 99, 99, 99, 99, 99, 99, 99, + 99, 103, 103, 103, 103, 103, 103, 103, 103, 103, + 103, 103, 103, 105, 105, 105, 105, 105, 105, 105, + 105, 105, 105, 105, 105, 109, 109, 109, 109, 109, + 109, 109, 109, 109, 109, 109, 109, 111, 111, 111, + 111, 111, 111, 111, 111, 111, 111, 111, 111, 115, + 115, 115, 115, 115, 115, 115, 115, 115, 115, 115, + 115, 119, 1066, 1066, 119, 1066, 119, 119, 119, 119, + 119, 120, 1066, 1066, 120, 120, 120, 120, 120, 120, + + 120, 124, 124, 1066, 124, 124, 124, 124, 124, 124, + 124, 124, 124, 127, 1066, 1066, 1066, 127, 157, 1066, + 1066, 157, 157, 157, 157, 157, 157, 157, 1066, 157, + 159, 1066, 159, 159, 159, 160, 160, 171, 1066, 1066, + 171, 171, 171, 171, 171, 171, 171, 172, 172, 172, + 172, 172, 172, 172, 172, 172, 1066, 172, 172, 173, + 173, 173, 173, 173, 173, 173, 173, 1066, 173, 173, + 173, 175, 175, 175, 175, 175, 175, 175, 175, 175, + 175, 176, 1066, 1066, 1066, 176, 177, 177, 218, 218, + 218, 218, 218, 218, 218, 218, 218, 218, 218, 218, + + 972, 972, 972, 972, 972, 972, 972, 972, 972, 972, + 1066, 972, 43, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066 } ; -static yyconst flex_int16_t yy_chk[1689] = +static yyconst flex_int16_t yy_chk[2970] = { 0, 0, 0, 3, 4, 5, 6, 19, 5, 6, 7, 7, 7, 8, 8, 8, 9, 9, 9, 11, 12, 7, 11, 12, 8, 10, 10, 10, 20, 23, 19, - 744, 24, 25, 26, 35, 36, 66, 66, 37, 125, - 125, 11, 12, 132, 38, 132, 743, 218, 140, 218, + 1112, 24, 25, 26, 35, 36, 66, 66, 37, 125, + 125, 11, 12, 132, 38, 132, 1114, 220, 140, 220, 20, 23, 3, 4, 24, 25, 26, 140, 35, 36, - 7, 37, 7, 8, 153, 8, 9, 38, 9, 41, - 42, 41, 42, 379, 379, 10, 153, 10, 13, 13, + 7, 37, 7, 8, 154, 8, 9, 38, 9, 41, + 42, 41, 42, 335, 335, 10, 154, 10, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, @@ -889,11 +1151,11 @@ static yyconst flex_int16_t yy_chk[1689] = 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 27, 27, 27, 28, 28, 28, 136, 29, - 30, 204, 137, 33, 34, 137, 137, 75, 72, 139, - 72, 138, 136, 75, 139, 138, 204, 75, 142, 149, - 742, 29, 30, 149, 158, 33, 34, 75, 191, 142, - 158, 192, 149, 191, 158, 209, 192, 741, 197, 740, - 209, 415, 415, 27, 158, 27, 28, 197, 28, 29, + 30, 206, 137, 33, 34, 137, 137, 75, 72, 139, + 72, 138, 136, 75, 139, 138, 206, 75, 142, 150, + 1115, 29, 30, 150, 159, 33, 34, 75, 192, 142, + 159, 193, 150, 192, 159, 211, 193, 666, 199, 666, + 211, 388, 388, 27, 159, 27, 28, 199, 28, 29, 30, 29, 30, 33, 34, 33, 34, 68, 68, 72, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, @@ -902,144 +1164,285 @@ static yyconst flex_int16_t yy_chk[1689] = 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 68, 79, 79, 79, 80, 80, 80, 82, - 82, 82, 133, 133, 133, 134, 134, 134, 732, 144, - 144, 144, 436, 436, 145, 145, 145, 205, 731, 147, - 147, 147, 150, 150, 150, 134, 150, 154, 205, 154, - 160, 160, 160, 161, 161, 161, 699, 82, 150, 449, - 150, 145, 193, 193, 79, 82, 449, 80, 144, 145, - 147, 163, 163, 163, 193, 133, 437, 437, 134, 177, - 177, 177, 144, 178, 178, 178, 199, 145, 214, 214, - - 214, 161, 147, 199, 220, 248, 220, 199, 154, 161, - 252, 160, 220, 248, 236, 300, 236, 238, 238, 163, - 248, 694, 236, 252, 259, 259, 259, 163, 236, 300, - 284, 310, 310, 310, 238, 311, 311, 311, 314, 314, - 314, 351, 177, 284, 284, 351, 178, 362, 362, 362, - 693, 214, 378, 378, 378, 366, 366, 366, 351, 382, - 382, 382, 478, 478, 367, 367, 367, 439, 382, 414, - 414, 414, 435, 435, 435, 259, 439, 424, 424, 424, - 692, 311, 310, 443, 479, 479, 418, 418, 418, 314, - 324, 324, 324, 362, 367, 418, 505, 505, 443, 481, - - 324, 689, 324, 324, 324, 324, 366, 424, 481, 485, - 382, 445, 445, 445, 324, 358, 358, 358, 446, 446, - 446, 447, 447, 447, 485, 358, 683, 358, 358, 358, - 358, 477, 477, 477, 487, 487, 487, 418, 682, 358, - 377, 377, 377, 510, 510, 488, 488, 488, 501, 680, - 377, 679, 377, 377, 377, 377, 489, 489, 489, 506, - 506, 506, 501, 678, 377, 380, 380, 380, 677, 446, - 540, 540, 447, 507, 507, 507, 545, 545, 380, 380, - 380, 509, 509, 509, 541, 541, 541, 542, 542, 542, - 544, 544, 544, 380, 380, 380, 488, 548, 548, 548, - - 380, 560, 560, 380, 561, 561, 380, 489, 380, 413, - 413, 413, 549, 549, 549, 552, 552, 552, 675, 413, - 563, 413, 413, 413, 413, 559, 559, 559, 567, 563, - 569, 569, 569, 413, 416, 416, 416, 594, 594, 594, - 595, 595, 598, 567, 596, 596, 602, 416, 416, 416, - 548, 598, 673, 604, 604, 604, 605, 605, 605, 618, - 618, 602, 416, 416, 416, 549, 552, 639, 639, 416, - 647, 647, 416, 665, 665, 416, 671, 416, 448, 448, - 448, 666, 666, 569, 607, 607, 607, 670, 448, 669, - 448, 448, 448, 448, 611, 611, 611, 619, 619, 619, - - 685, 685, 448, 490, 490, 490, 604, 667, 663, 605, - 646, 646, 646, 490, 662, 490, 490, 490, 490, 664, - 664, 664, 620, 620, 620, 668, 661, 490, 511, 511, - 511, 640, 640, 640, 668, 658, 672, 607, 641, 641, - 641, 511, 511, 511, 657, 611, 674, 674, 674, 655, - 619, 672, 684, 684, 684, 654, 511, 511, 511, 686, - 686, 686, 653, 511, 651, 650, 511, 643, 637, 511, - 636, 511, 546, 546, 546, 620, 635, 633, 629, 687, - 687, 687, 625, 623, 640, 546, 546, 546, 622, 617, - 616, 641, 696, 696, 696, 698, 698, 698, 615, 674, - - 546, 546, 546, 614, 613, 684, 610, 546, 609, 603, - 546, 601, 686, 546, 600, 546, 612, 612, 612, 702, - 702, 702, 599, 597, 593, 591, 612, 590, 612, 612, - 612, 612, 687, 589, 588, 587, 586, 584, 582, 581, - 612, 648, 648, 648, 580, 696, 579, 576, 698, 574, - 573, 571, 570, 568, 648, 648, 648, 566, 565, 564, - 562, 557, 556, 555, 554, 553, 551, 550, 539, 648, - 648, 648, 702, 538, 537, 536, 648, 535, 534, 648, - 533, 532, 648, 531, 648, 704, 704, 704, 704, 704, - 704, 704, 704, 704, 704, 704, 704, 704, 704, 704, - - 704, 704, 704, 704, 704, 704, 704, 704, 704, 704, - 704, 704, 704, 704, 704, 704, 704, 704, 704, 704, - 704, 704, 704, 704, 704, 704, 704, 704, 704, 704, - 704, 704, 704, 704, 704, 704, 704, 530, 704, 704, - 704, 708, 708, 708, 708, 708, 708, 708, 708, 708, - 708, 708, 708, 709, 709, 709, 709, 709, 709, 709, - 709, 709, 709, 709, 709, 710, 710, 710, 710, 710, - 710, 710, 710, 710, 710, 710, 710, 711, 711, 711, - 711, 711, 711, 711, 711, 711, 711, 711, 711, 712, - 712, 712, 712, 712, 712, 712, 712, 712, 712, 712, - - 712, 713, 713, 713, 713, 713, 713, 713, 713, 713, - 713, 713, 713, 714, 714, 714, 714, 714, 714, 714, - 714, 714, 714, 714, 714, 715, 715, 715, 715, 715, - 715, 715, 715, 715, 715, 715, 715, 716, 716, 716, - 716, 716, 716, 716, 716, 716, 716, 716, 716, 717, - 717, 717, 717, 717, 717, 717, 717, 717, 717, 717, - 717, 718, 718, 718, 718, 718, 718, 718, 718, 718, - 718, 718, 718, 719, 719, 719, 719, 719, 719, 719, - 719, 719, 719, 719, 719, 720, 720, 720, 720, 720, - 720, 720, 720, 720, 720, 720, 720, 721, 721, 721, - - 721, 721, 721, 721, 721, 721, 721, 721, 721, 722, - 722, 722, 722, 722, 722, 722, 722, 722, 722, 722, - 722, 723, 723, 723, 723, 723, 723, 723, 723, 723, - 723, 723, 723, 724, 527, 526, 724, 525, 724, 724, - 724, 724, 724, 725, 524, 522, 725, 725, 725, 725, - 725, 725, 725, 726, 726, 521, 726, 726, 726, 726, - 726, 726, 726, 726, 726, 727, 520, 519, 518, 727, - 728, 517, 516, 728, 728, 728, 728, 728, 728, 728, - 515, 728, 729, 514, 729, 729, 729, 730, 730, 733, - 513, 502, 733, 733, 733, 733, 733, 733, 733, 734, - - 734, 734, 734, 734, 734, 734, 734, 734, 500, 734, - 734, 735, 735, 735, 735, 735, 735, 735, 735, 497, - 735, 735, 735, 736, 736, 736, 736, 736, 736, 736, - 736, 736, 736, 737, 496, 495, 494, 737, 738, 738, - 739, 739, 739, 739, 739, 739, 739, 739, 739, 739, - 739, 739, 745, 745, 745, 745, 745, 745, 745, 745, - 745, 745, 493, 745, 492, 491, 486, 484, 483, 482, - 480, 476, 475, 474, 473, 472, 471, 470, 469, 468, - 467, 466, 465, 463, 462, 461, 460, 459, 458, 457, - 455, 454, 453, 452, 451, 450, 444, 442, 441, 440, - - 438, 434, 433, 432, 431, 430, 429, 428, 427, 425, - 423, 422, 421, 420, 419, 412, 410, 409, 408, 407, - 406, 405, 404, 403, 402, 401, 400, 399, 398, 397, - 396, 395, 394, 392, 391, 390, 389, 388, 387, 386, - 385, 384, 383, 376, 375, 374, 373, 372, 371, 370, - 369, 368, 365, 364, 363, 361, 360, 359, 357, 356, - 355, 354, 353, 352, 350, 349, 348, 347, 346, 345, - 344, 343, 342, 341, 339, 338, 337, 336, 335, 334, - 333, 332, 331, 330, 326, 325, 323, 322, 321, 320, - 319, 318, 317, 316, 315, 313, 312, 309, 308, 307, - - 306, 304, 303, 302, 301, 299, 298, 297, 296, 295, - 293, 292, 291, 290, 289, 288, 287, 286, 285, 283, - 282, 281, 280, 279, 278, 277, 276, 275, 274, 273, - 272, 271, 270, 269, 268, 267, 265, 264, 263, 262, - 261, 260, 257, 256, 255, 254, 253, 251, 250, 249, - 247, 246, 245, 244, 243, 242, 241, 240, 239, 237, - 235, 234, 233, 232, 231, 230, 229, 228, 227, 226, - 224, 223, 222, 221, 219, 216, 213, 212, 211, 210, - 208, 207, 206, 203, 202, 201, 200, 198, 196, 195, - 194, 190, 189, 188, 187, 186, 185, 184, 183, 182, - - 181, 180, 175, 173, 168, 165, 164, 155, 152, 151, - 148, 146, 143, 141, 127, 126, 113, 95, 92, 85, - 77, 67, 64, 63, 61, 50, 43, 40, 39, 32, - 31, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707, 707, 707, - 707, 707, 707, 707, 707, 707, 707, 707 + 82, 82, 133, 133, 133, 134, 134, 134, 714, 144, + 144, 144, 394, 394, 146, 146, 146, 207, 714, 148, + 148, 148, 151, 151, 151, 134, 151, 155, 207, 155, + 161, 161, 161, 162, 162, 162, 1111, 82, 151, 471, + 151, 146, 194, 194, 79, 82, 471, 80, 144, 146, + 148, 164, 164, 164, 194, 133, 395, 395, 134, 178, + 178, 178, 144, 179, 179, 179, 201, 146, 216, 216, + + 216, 162, 148, 201, 222, 251, 222, 201, 155, 162, + 255, 161, 222, 251, 239, 304, 239, 241, 241, 164, + 251, 1110, 239, 255, 262, 262, 262, 164, 239, 304, + 288, 314, 314, 314, 241, 315, 315, 315, 334, 334, + 334, 360, 178, 288, 288, 360, 179, 318, 318, 318, + 693, 216, 693, 371, 371, 371, 436, 436, 360, 375, + 375, 375, 376, 376, 376, 387, 387, 387, 457, 457, + 391, 391, 391, 458, 458, 262, 281, 281, 281, 391, + 402, 315, 314, 393, 393, 393, 281, 397, 281, 281, + 281, 281, 376, 472, 472, 402, 397, 465, 318, 371, + + 281, 328, 328, 328, 404, 404, 404, 435, 435, 435, + 375, 328, 465, 328, 328, 328, 328, 445, 445, 445, + 460, 391, 439, 439, 439, 328, 333, 333, 333, 460, + 1109, 439, 456, 456, 456, 782, 333, 782, 333, 333, + 333, 333, 468, 468, 468, 503, 503, 445, 504, 504, + 333, 336, 336, 336, 506, 469, 469, 469, 531, 531, + 467, 467, 467, 506, 336, 336, 336, 473, 473, 473, + 474, 474, 474, 439, 502, 502, 502, 527, 1108, 336, + 336, 336, 336, 1107, 511, 602, 336, 538, 538, 336, + 1106, 527, 336, 468, 336, 367, 367, 367, 467, 511, + + 602, 467, 513, 513, 513, 367, 469, 367, 367, 367, + 367, 514, 514, 514, 515, 515, 515, 568, 568, 367, + 386, 386, 386, 532, 532, 532, 537, 537, 537, 1105, + 386, 1104, 386, 386, 386, 386, 574, 574, 574, 597, + 513, 575, 575, 513, 386, 389, 389, 389, 597, 582, + 582, 582, 594, 594, 533, 533, 533, 1103, 389, 389, + 389, 532, 514, 1102, 532, 515, 578, 578, 578, 1101, + 534, 534, 534, 389, 389, 389, 389, 579, 579, 579, + 389, 595, 595, 389, 634, 634, 389, 1100, 389, 434, + 434, 434, 533, 635, 635, 533, 535, 535, 535, 434, + + 582, 434, 434, 434, 434, 534, 662, 662, 534, 637, + 1099, 534, 1091, 434, 437, 437, 437, 642, 637, 578, + 593, 593, 593, 569, 569, 569, 1090, 437, 437, 437, + 579, 730, 642, 535, 535, 689, 689, 535, 570, 570, + 570, 730, 437, 437, 437, 437, 633, 633, 633, 437, + 699, 699, 437, 733, 733, 437, 1044, 437, 470, 470, + 470, 569, 734, 734, 569, 571, 571, 571, 470, 1042, + 470, 470, 470, 470, 713, 1041, 570, 729, 713, 570, + 1040, 729, 470, 516, 516, 516, 741, 572, 572, 572, + 651, 651, 651, 516, 759, 516, 516, 516, 516, 1039, + + 571, 741, 759, 571, 753, 753, 571, 516, 539, 539, + 539, 645, 645, 645, 698, 698, 698, 591, 591, 591, + 736, 539, 539, 539, 572, 572, 770, 770, 572, 736, + 592, 592, 592, 732, 732, 732, 539, 539, 539, 539, + 758, 651, 1037, 539, 778, 778, 539, 775, 803, 539, + 758, 539, 576, 576, 576, 591, 591, 775, 591, 604, + 604, 604, 776, 803, 645, 576, 576, 576, 592, 1027, + 776, 592, 631, 631, 631, 592, 632, 632, 632, 830, + 576, 576, 576, 576, 644, 644, 644, 576, 791, 791, + 576, 795, 795, 576, 830, 576, 1025, 604, 796, 796, + + 604, 647, 647, 647, 660, 660, 660, 752, 752, 752, + 631, 631, 604, 631, 632, 798, 1024, 632, 769, 769, + 769, 632, 644, 825, 798, 644, 790, 790, 790, 794, + 794, 794, 825, 661, 661, 661, 808, 644, 1023, 663, + 663, 663, 660, 842, 808, 660, 664, 664, 664, 660, + 665, 665, 665, 842, 647, 652, 652, 652, 835, 687, + 687, 687, 817, 817, 817, 652, 835, 652, 652, 652, + 652, 661, 818, 818, 661, 1022, 661, 663, 1020, 652, + 663, 688, 688, 688, 664, 665, 899, 664, 665, 822, + 822, 665, 663, 690, 690, 690, 899, 687, 854, 664, + + 687, 823, 823, 665, 687, 841, 691, 691, 691, 841, + 692, 692, 692, 854, 709, 709, 709, 846, 846, 688, + 847, 847, 688, 849, 688, 857, 857, 777, 777, 777, + 992, 690, 849, 986, 690, 743, 743, 743, 821, 821, + 821, 845, 845, 845, 691, 692, 690, 691, 692, 866, + 866, 692, 709, 874, 874, 709, 984, 709, 877, 691, + 725, 725, 725, 692, 700, 700, 700, 877, 805, 805, + 805, 875, 875, 743, 885, 885, 743, 700, 700, 700, + 777, 832, 832, 832, 837, 837, 837, 983, 743, 751, + 751, 751, 700, 700, 700, 700, 894, 894, 725, 700, + + 982, 725, 700, 725, 981, 700, 805, 700, 710, 710, + 710, 856, 856, 856, 882, 768, 768, 768, 710, 832, + 710, 710, 710, 710, 843, 843, 843, 751, 979, 882, + 751, 966, 710, 900, 779, 779, 779, 837, 789, 789, + 789, 900, 780, 780, 780, 964, 710, 903, 903, 710, + 726, 726, 726, 768, 911, 911, 768, 865, 865, 865, + 726, 963, 726, 726, 726, 726, 873, 873, 873, 884, + 884, 884, 779, 962, 726, 779, 789, 843, 961, 789, + 780, 915, 915, 780, 816, 816, 816, 779, 726, 916, + 916, 726, 749, 749, 749, 780, 927, 927, 781, 781, + + 781, 959, 749, 951, 749, 749, 749, 749, 858, 858, + 858, 859, 859, 859, 918, 942, 749, 750, 750, 750, + 923, 950, 816, 918, 942, 816, 952, 750, 948, 750, + 750, 750, 750, 781, 952, 923, 781, 935, 935, 781, + 946, 750, 754, 754, 754, 945, 858, 939, 939, 859, + 944, 781, 864, 864, 864, 754, 754, 754, 943, 860, + 860, 860, 940, 940, 886, 886, 886, 893, 893, 893, + 754, 754, 754, 754, 901, 901, 901, 754, 957, 957, + 754, 958, 958, 754, 941, 754, 766, 766, 766, 947, + 864, 968, 968, 864, 860, 924, 766, 860, 766, 766, + + 766, 766, 886, 922, 947, 864, 887, 887, 887, 921, + 766, 767, 767, 767, 904, 904, 904, 888, 888, 888, + 920, 767, 919, 767, 767, 767, 767, 901, 905, 905, + 905, 892, 892, 892, 960, 767, 771, 771, 771, 910, + 910, 910, 965, 960, 887, 909, 909, 909, 917, 771, + 771, 771, 888, 977, 977, 888, 898, 965, 906, 906, + 906, 914, 914, 914, 771, 771, 771, 771, 897, 892, + 985, 771, 892, 889, 771, 978, 978, 771, 883, 771, + 787, 787, 787, 909, 892, 985, 909, 928, 928, 928, + 787, 881, 787, 787, 787, 787, 906, 906, 909, 925, + + 925, 925, 988, 988, 787, 792, 792, 792, 929, 929, + 929, 934, 934, 934, 880, 930, 930, 930, 792, 792, + 792, 938, 938, 938, 956, 956, 956, 933, 933, 933, + 967, 967, 967, 792, 792, 792, 792, 925, 980, 879, + 792, 997, 997, 792, 1001, 1001, 792, 980, 792, 809, + 809, 809, 925, 930, 930, 949, 949, 949, 878, 809, + 876, 809, 809, 809, 809, 933, 1006, 1006, 933, 954, + 954, 954, 869, 809, 861, 969, 969, 969, 1014, 1014, + 933, 1018, 1018, 967, 809, 814, 814, 814, 855, 970, + 970, 970, 853, 949, 852, 814, 851, 814, 814, 814, + + 814, 976, 976, 976, 987, 987, 987, 954, 949, 814, + 819, 819, 819, 969, 954, 996, 996, 996, 1019, 1019, + 974, 974, 974, 819, 819, 819, 850, 970, 969, 1026, + 1002, 1002, 1002, 848, 1021, 971, 971, 971, 819, 819, + 819, 819, 970, 1021, 1026, 819, 1035, 1035, 819, 1036, + 1036, 819, 840, 819, 836, 836, 836, 987, 974, 989, + 989, 989, 1038, 839, 836, 974, 836, 836, 836, 836, + 971, 1038, 1043, 971, 1013, 1013, 1013, 834, 836, 833, + 990, 990, 990, 1002, 991, 991, 991, 1043, 971, 836, + 862, 862, 862, 995, 995, 995, 831, 989, 1046, 1046, + + 862, 829, 862, 862, 862, 862, 1000, 1000, 1000, 1003, + 1003, 1003, 989, 828, 862, 863, 863, 863, 990, 991, + 1054, 1054, 991, 827, 826, 863, 824, 863, 863, 863, + 863, 995, 812, 990, 995, 811, 810, 991, 807, 863, + 867, 867, 867, 806, 1000, 804, 995, 802, 801, 1000, + 1004, 1004, 1004, 867, 867, 867, 800, 1005, 1005, 1005, + 799, 797, 1003, 1007, 1007, 1007, 784, 774, 867, 867, + 867, 867, 1008, 1008, 1008, 867, 773, 765, 867, 764, + 763, 867, 761, 867, 890, 890, 890, 760, 1004, 1004, + 1009, 1009, 1009, 757, 890, 1005, 890, 890, 890, 890, + + 1005, 756, 748, 1004, 1012, 1012, 1012, 747, 890, 891, + 891, 891, 1017, 1017, 1017, 746, 1007, 744, 742, 891, + 740, 891, 891, 891, 891, 1008, 739, 738, 1009, 1009, + 1028, 1028, 1028, 891, 895, 895, 895, 1034, 1034, 1034, + 737, 735, 1012, 1009, 731, 1012, 728, 895, 895, 895, + 727, 724, 723, 1045, 1045, 1045, 722, 1012, 1047, 1047, + 1047, 721, 895, 895, 895, 895, 718, 717, 1028, 895, + 715, 712, 895, 711, 708, 895, 707, 895, 907, 907, + 907, 706, 705, 1028, 1030, 1030, 1030, 703, 907, 702, + 907, 907, 907, 907, 695, 686, 1047, 685, 1065, 1065, + + 1065, 683, 907, 912, 912, 912, 1045, 682, 681, 679, + 675, 1047, 671, 669, 668, 659, 912, 912, 912, 658, + 657, 656, 1030, 655, 654, 653, 650, 649, 643, 1030, + 641, 912, 912, 912, 912, 640, 639, 1030, 912, 1065, + 638, 912, 636, 630, 912, 629, 912, 926, 926, 926, + 926, 926, 926, 926, 926, 926, 926, 926, 926, 926, + 926, 926, 926, 926, 926, 926, 926, 926, 926, 926, + 926, 926, 926, 926, 926, 926, 926, 926, 926, 926, + 926, 926, 926, 926, 926, 926, 926, 926, 926, 926, + 926, 926, 926, 926, 926, 926, 926, 926, 926, 628, + + 926, 926, 926, 931, 931, 931, 626, 1032, 1032, 1032, + 625, 624, 623, 931, 622, 931, 931, 931, 931, 621, + 619, 617, 616, 1048, 1048, 1048, 615, 931, 936, 936, + 936, 614, 611, 609, 608, 606, 605, 1051, 1051, 1051, + 603, 936, 936, 936, 601, 1032, 600, 599, 1055, 1055, + 1055, 598, 1032, 1049, 1049, 1049, 936, 936, 936, 936, + 1032, 1048, 596, 936, 590, 589, 936, 587, 586, 936, + 585, 936, 953, 953, 953, 1051, 1048, 1056, 1056, 1056, + 1051, 584, 953, 583, 953, 953, 953, 953, 1049, 581, + 1051, 1049, 580, 567, 566, 565, 953, 564, 1053, 1053, + + 1053, 1055, 1061, 1061, 1061, 563, 1049, 953, 993, 993, + 993, 1057, 1057, 1057, 1062, 1062, 1062, 562, 993, 561, + 993, 993, 993, 993, 1060, 1060, 1060, 1063, 1063, 1063, + 1056, 560, 993, 994, 994, 994, 1053, 559, 558, 555, + 1061, 1053, 554, 994, 553, 994, 994, 994, 994, 1057, + 1057, 1053, 1062, 552, 550, 1061, 549, 994, 998, 998, + 998, 548, 1060, 547, 1057, 1063, 546, 1062, 545, 1060, + 1063, 998, 998, 998, 544, 543, 542, 1060, 541, 528, + 1063, 526, 523, 522, 521, 520, 998, 998, 998, 998, + 519, 518, 517, 998, 512, 510, 998, 509, 508, 998, + + 507, 998, 1010, 1010, 1010, 505, 501, 500, 499, 498, + 497, 496, 1010, 495, 1010, 1010, 1010, 1010, 494, 493, + 492, 491, 490, 488, 487, 486, 1010, 1015, 1015, 1015, + 485, 484, 483, 482, 480, 479, 478, 477, 476, 475, + 1015, 1015, 1015, 466, 464, 463, 462, 461, 459, 455, + 454, 453, 452, 451, 450, 1015, 1015, 1015, 1015, 449, + 448, 446, 1015, 444, 443, 1015, 442, 441, 1015, 440, + 1015, 1029, 1029, 1029, 433, 431, 430, 429, 428, 427, + 426, 1029, 425, 1029, 1029, 1029, 1029, 424, 423, 422, + 421, 420, 419, 418, 417, 1029, 416, 415, 413, 412, + + 411, 410, 409, 408, 407, 406, 405, 403, 401, 1029, + 1031, 1031, 1031, 400, 399, 398, 396, 392, 385, 384, + 1031, 383, 1031, 1031, 1031, 1031, 382, 381, 380, 379, + 378, 377, 374, 373, 1031, 372, 370, 369, 368, 366, + 365, 364, 363, 362, 361, 359, 358, 357, 1031, 1050, + 1050, 1050, 356, 355, 354, 353, 352, 351, 350, 1050, + 348, 1050, 1050, 1050, 1050, 347, 346, 345, 344, 343, + 342, 341, 340, 1050, 339, 330, 329, 327, 326, 325, + 324, 323, 322, 321, 320, 319, 317, 1050, 1052, 1052, + 1052, 316, 313, 312, 311, 310, 308, 307, 1052, 306, + + 1052, 1052, 1052, 1052, 305, 303, 302, 301, 300, 299, + 297, 296, 1052, 295, 294, 293, 292, 291, 290, 289, + 287, 286, 285, 284, 283, 282, 1052, 1058, 1058, 1058, + 280, 279, 278, 277, 276, 275, 274, 1058, 273, 1058, + 1058, 1058, 1058, 272, 271, 270, 268, 267, 266, 265, + 264, 1058, 263, 260, 259, 258, 257, 256, 254, 253, + 252, 250, 249, 248, 247, 1058, 246, 245, 244, 243, + 242, 240, 238, 237, 236, 235, 234, 233, 232, 231, + 1058, 1059, 1059, 1059, 230, 229, 228, 226, 225, 224, + 223, 1059, 221, 1059, 1059, 1059, 1059, 218, 215, 214, + + 213, 212, 210, 209, 208, 1059, 205, 204, 203, 202, + 200, 198, 197, 196, 195, 191, 190, 189, 188, 1059, + 187, 186, 185, 184, 183, 182, 181, 176, 174, 169, + 166, 165, 156, 153, 1059, 1064, 1064, 1064, 152, 149, + 147, 145, 143, 141, 127, 1064, 126, 1064, 1064, 1064, + 1064, 113, 95, 92, 85, 77, 67, 64, 63, 1064, + 61, 50, 43, 40, 39, 32, 31, 0, 0, 0, + 0, 0, 0, 1064, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 1064, 1067, + 1067, 1067, 1067, 1067, 1067, 1067, 1067, 1067, 1067, 1067, + + 1067, 1068, 1068, 1068, 1068, 1068, 1068, 1068, 1068, 1068, + 1068, 1068, 1068, 1069, 1069, 1069, 1069, 1069, 1069, 1069, + 1069, 1069, 1069, 1069, 1069, 1070, 1070, 1070, 1070, 1070, + 1070, 1070, 1070, 1070, 1070, 1070, 1070, 1071, 1071, 1071, + 1071, 1071, 1071, 1071, 1071, 1071, 1071, 1071, 1071, 1072, + 1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072, 1072, + 1072, 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, 1073, + 1073, 1073, 1073, 1074, 1074, 1074, 1074, 1074, 1074, 1074, + 1074, 1074, 1074, 1074, 1074, 1075, 1075, 1075, 1075, 1075, + 1075, 1075, 1075, 1075, 1075, 1075, 1075, 1076, 1076, 1076, + + 1076, 1076, 1076, 1076, 1076, 1076, 1076, 1076, 1076, 1077, + 1077, 1077, 1077, 1077, 1077, 1077, 1077, 1077, 1077, 1077, + 1077, 1078, 1078, 1078, 1078, 1078, 1078, 1078, 1078, 1078, + 1078, 1078, 1078, 1079, 1079, 1079, 1079, 1079, 1079, 1079, + 1079, 1079, 1079, 1079, 1079, 1080, 1080, 1080, 1080, 1080, + 1080, 1080, 1080, 1080, 1080, 1080, 1080, 1081, 1081, 1081, + 1081, 1081, 1081, 1081, 1081, 1081, 1081, 1081, 1081, 1082, + 1082, 1082, 1082, 1082, 1082, 1082, 1082, 1082, 1082, 1082, + 1082, 1083, 0, 0, 1083, 0, 1083, 1083, 1083, 1083, + 1083, 1084, 0, 0, 1084, 1084, 1084, 1084, 1084, 1084, + + 1084, 1085, 1085, 0, 1085, 1085, 1085, 1085, 1085, 1085, + 1085, 1085, 1085, 1086, 0, 0, 0, 1086, 1087, 0, + 0, 1087, 1087, 1087, 1087, 1087, 1087, 1087, 0, 1087, + 1088, 0, 1088, 1088, 1088, 1089, 1089, 1092, 0, 0, + 1092, 1092, 1092, 1092, 1092, 1092, 1092, 1093, 1093, 1093, + 1093, 1093, 1093, 1093, 1093, 1093, 0, 1093, 1093, 1094, + 1094, 1094, 1094, 1094, 1094, 1094, 1094, 0, 1094, 1094, + 1094, 1095, 1095, 1095, 1095, 1095, 1095, 1095, 1095, 1095, + 1095, 1096, 0, 0, 0, 1096, 1097, 1097, 1098, 1098, + 1098, 1098, 1098, 1098, 1098, 1098, 1098, 1098, 1098, 1098, + + 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, 1113, + 0, 1113, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, + 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066, 1066 } ; static yy_state_type yy_last_accepting_state; @@ -1214,7 +1617,7 @@ int csb = 0; /* depth of flex context stack */ -#line 1218 "detex.c" +#line 1621 "detex.c" #define INITIAL 0 #define Define 1 @@ -1416,9 +1819,9 @@ YY_DECL register char *yy_cp, *yy_bp; register int yy_act; -#line 168 "detex.l" +#line 173 "detex.l" -#line 1422 "detex.c" +#line 1825 "detex.c" if ( !(yy_init) ) { @@ -1471,13 +1874,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 708 ) + if ( yy_current_state >= 1067 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_base[yy_current_state] != 1632 ); + while ( yy_base[yy_current_state] != 2913 ); yy_find_action: yy_act = yy_accept[yy_current_state]; @@ -1503,24 +1906,24 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 169 "detex.l" +#line 174 "detex.l" /* ignore comments */ ; YY_BREAK case 2: /* rule 2 can match eol */ YY_RULE_SETUP -#line 171 "detex.l" +#line 176 "detex.l" {LATEX; IGNORE;} YY_BREAK case 3: YY_RULE_SETUP -#line 173 "detex.l" +#line 178 "detex.l" /* environment start */ {LaBEGIN LaBegin; IGNORE;} YY_BREAK case 4: /* rule 4 can match eol */ YY_RULE_SETUP -#line 175 "detex.l" +#line 180 "detex.l" { if (BeginEnv("verbatim")) BEGIN LaEnv; else @@ -1531,24 +1934,24 @@ YY_RULE_SETUP case 5: /* rule 5 can match eol */ YY_RULE_SETUP -#line 182 "detex.l" +#line 187 "detex.l" /* verbatim mode */ {BEGIN Normal; IGNORE;} YY_BREAK case 6: /* rule 6 can match eol */ YY_RULE_SETUP -#line 183 "detex.l" +#line 188 "detex.l" ECHO; YY_BREAK case 7: YY_RULE_SETUP -#line 184 "detex.l" +#line 189 "detex.l" ECHO; YY_BREAK case 8: /* rule 8 can match eol */ YY_RULE_SETUP -#line 186 "detex.l" +#line 191 "detex.l" { KILLARGS(1); if (BeginEnv("minpage")) BEGIN LaEnv; @@ -1559,7 +1962,7 @@ YY_RULE_SETUP YY_BREAK case 9: YY_RULE_SETUP -#line 194 "detex.l" +#line 199 "detex.l" { if (BeginEnv(yytext)) BEGIN LaEnv; else @@ -1570,33 +1973,33 @@ YY_RULE_SETUP case 10: /* rule 10 can match eol */ YY_RULE_SETUP -#line 200 "detex.l" +#line 205 "detex.l" NEWLINE; YY_BREAK case 11: YY_RULE_SETUP -#line 201 "detex.l" +#line 206 "detex.l" ; YY_BREAK case 12: YY_RULE_SETUP -#line 203 "detex.l" +#line 208 "detex.l" /* absorb some environments */ {LaBEGIN LaEnd; IGNORE;} YY_BREAK case 13: /* rule 13 can match eol */ YY_RULE_SETUP -#line 204 "detex.l" +#line 209 "detex.l" NEWLINE; YY_BREAK case 14: YY_RULE_SETUP -#line 205 "detex.l" +#line 210 "detex.l" ; YY_BREAK case 15: YY_RULE_SETUP -#line 207 "detex.l" +#line 212 "detex.l" /* end environment */ { if (EndEnv(yytext)) BEGIN Normal; IGNORE; @@ -1604,295 +2007,301 @@ YY_RULE_SETUP YY_BREAK case 16: YY_RULE_SETUP -#line 211 "detex.l" +#line 216 "detex.l" {BEGIN LaEnv; IGNORE;} YY_BREAK case 17: /* rule 17 can match eol */ YY_RULE_SETUP -#line 212 "detex.l" +#line 217 "detex.l" NEWLINE; YY_BREAK case 18: YY_RULE_SETUP -#line 213 "detex.l" +#line 218 "detex.l" ; YY_BREAK case 19: /* rule 19 can match eol */ YY_RULE_SETUP -#line 215 "detex.l" +#line 220 "detex.l" ; YY_BREAK case 20: /* rule 20 can match eol */ YY_RULE_SETUP -#line 216 "detex.l" +#line 221 "detex.l" ; YY_BREAK case 21: /* rule 21 can match eol */ YY_RULE_SETUP -#line 217 "detex.l" +#line 222 "detex.l" ; YY_BREAK case 22: /* rule 22 can match eol */ YY_RULE_SETUP -#line 218 "detex.l" +#line 223 "detex.l" ; YY_BREAK case 23: /* rule 23 can match eol */ YY_RULE_SETUP -#line 219 "detex.l" +#line 224 "detex.l" ; YY_BREAK case 24: +/* rule 24 can match eol */ YY_RULE_SETUP -#line 221 "detex.l" -{ KILLARGS(1); } +#line 225 "detex.l" +; YY_BREAK case 25: YY_RULE_SETUP -#line 222 "detex.l" -{ KILLARGS(2); } +#line 227 "detex.l" +{ KILLARGS(1); } YY_BREAK case 26: YY_RULE_SETUP -#line 223 "detex.l" +#line 228 "detex.l" { KILLARGS(2); } YY_BREAK case 27: YY_RULE_SETUP -#line 224 "detex.l" +#line 229 "detex.l" { KILLARGS(2); } YY_BREAK case 28: YY_RULE_SETUP -#line 225 "detex.l" +#line 230 "detex.l" { KILLARGS(2); } YY_BREAK case 29: YY_RULE_SETUP -#line 226 "detex.l" +#line 231 "detex.l" { KILLARGS(2); } YY_BREAK case 30: YY_RULE_SETUP -#line 227 "detex.l" -{ KILLARGS(1); } +#line 232 "detex.l" +{ KILLARGS(2); } YY_BREAK case 31: YY_RULE_SETUP -#line 228 "detex.l" +#line 233 "detex.l" { KILLARGS(1); } YY_BREAK case 32: YY_RULE_SETUP -#line 229 "detex.l" -{ KILLARGS(2); } +#line 234 "detex.l" +{ KILLARGS(1); } YY_BREAK case 33: YY_RULE_SETUP -#line 230 "detex.l" -{ KILLARGS(1); } +#line 235 "detex.l" +{ KILLARGS(2); } YY_BREAK case 34: YY_RULE_SETUP -#line 231 "detex.l" -{ STRIPARGS(2); } +#line 236 "detex.l" +{ KILLARGS(1); } YY_BREAK case 35: YY_RULE_SETUP -#line 232 "detex.l" -{ KILLARGS(1); } +#line 237 "detex.l" +{ STRIPARGS(2); } YY_BREAK case 36: YY_RULE_SETUP -#line 233 "detex.l" -{ STRIPARGS(2); } +#line 238 "detex.l" +{ KILLARGS(1); } YY_BREAK case 37: YY_RULE_SETUP -#line 234 "detex.l" -{ KILLARGS(2); } +#line 239 "detex.l" +{ STRIPARGS(2); } YY_BREAK case 38: YY_RULE_SETUP -#line 235 "detex.l" -; +#line 240 "detex.l" +{ KILLARGS(2); } YY_BREAK case 39: YY_RULE_SETUP -#line 236 "detex.l" -{ KILLARGS(1); } +#line 241 "detex.l" +; YY_BREAK case 40: -/* rule 40 can match eol */ YY_RULE_SETUP -#line 237 "detex.l" -{ LaBEGIN LaPicture; } +#line 242 "detex.l" +{ KILLARGS(1); } YY_BREAK case 41: +/* rule 41 can match eol */ YY_RULE_SETUP -#line 239 "detex.l" -; +#line 243 "detex.l" +{ LaBEGIN LaPicture; } YY_BREAK case 42: -/* rule 42 can match eol */ YY_RULE_SETUP -#line 240 "detex.l" -{ printf("", yytext); } +#line 245 "detex.l" +; YY_BREAK case 43: +/* rule 43 can match eol */ YY_RULE_SETUP -#line 241 "detex.l" -BEGIN Normal; +#line 246 "detex.l" +{ printf("", yytext); } YY_BREAK case 44: YY_RULE_SETUP -#line 243 "detex.l" -{ KILLARGS(3); } +#line 247 "detex.l" +BEGIN Normal; YY_BREAK case 45: YY_RULE_SETUP -#line 244 "detex.l" -{ KILLARGS(1); } +#line 249 "detex.l" +{ KILLARGS(3); } YY_BREAK case 46: YY_RULE_SETUP -#line 245 "detex.l" -{ KILLARGS(2); } +#line 250 "detex.l" +{ KILLARGS(1); } YY_BREAK case 47: YY_RULE_SETUP -#line 246 "detex.l" +#line 251 "detex.l" { KILLARGS(2); } YY_BREAK case 48: YY_RULE_SETUP -#line 247 "detex.l" -{ KILLARGS(3); } +#line 252 "detex.l" +{ KILLARGS(2); } YY_BREAK case 49: YY_RULE_SETUP -#line 248 "detex.l" -{ KILLARGS(1); } +#line 253 "detex.l" +{ KILLARGS(3); } YY_BREAK case 50: YY_RULE_SETUP -#line 249 "detex.l" -{ STRIPARGS(1); } +#line 254 "detex.l" +{ KILLARGS(1); } YY_BREAK case 51: YY_RULE_SETUP -#line 251 "detex.l" -; +#line 255 "detex.l" +{ STRIPARGS(1); } YY_BREAK case 52: YY_RULE_SETUP -#line 252 "detex.l" +#line 257 "detex.l" ; YY_BREAK case 53: YY_RULE_SETUP -#line 253 "detex.l" +#line 258 "detex.l" ; YY_BREAK case 54: YY_RULE_SETUP -#line 254 "detex.l" +#line 259 "detex.l" ; YY_BREAK case 55: YY_RULE_SETUP -#line 255 "detex.l" +#line 260 "detex.l" ; YY_BREAK case 56: YY_RULE_SETUP -#line 256 "detex.l" +#line 261 "detex.l" ; YY_BREAK case 57: YY_RULE_SETUP -#line 258 "detex.l" -/* ignore args */ {KILLARGS(1); IGNORE;} +#line 262 "detex.l" +; YY_BREAK case 58: YY_RULE_SETUP -#line 259 "detex.l" -/* of these \cs */ {KILLARGS(1); IGNORE;} +#line 264 "detex.l" +/* ignore args */ {KILLARGS(1); IGNORE;} YY_BREAK case 59: YY_RULE_SETUP -#line 260 "detex.l" -{KILLARGS(1); IGNORE;} +#line 265 "detex.l" +/* of these \cs */ {KILLARGS(1); IGNORE;} YY_BREAK case 60: YY_RULE_SETUP -#line 261 "detex.l" -{CITE(1); IGNORE;} +#line 266 "detex.l" +{KILLARGS(1); IGNORE;} YY_BREAK case 61: YY_RULE_SETUP -#line 262 "detex.l" -{LATEX; KILLARGS(1); IGNORE;} +#line 267 "detex.l" +{CITE(1); IGNORE;} YY_BREAK case 62: YY_RULE_SETUP -#line 263 "detex.l" +#line 268 "detex.l" {LATEX; KILLARGS(1); IGNORE;} YY_BREAK case 63: YY_RULE_SETUP -#line 264 "detex.l" -{KILLARGS(1); IGNORE;} +#line 269 "detex.l" +{LATEX; KILLARGS(1); IGNORE;} YY_BREAK case 64: YY_RULE_SETUP -#line 265 "detex.l" +#line 270 "detex.l" {KILLARGS(1); IGNORE;} YY_BREAK case 65: YY_RULE_SETUP -#line 266 "detex.l" -{KILLARGS(1); SPACE;} +#line 271 "detex.l" +{KILLARGS(1); IGNORE;} YY_BREAK case 66: YY_RULE_SETUP -#line 267 "detex.l" +#line 272 "detex.l" {KILLARGS(1); SPACE;} YY_BREAK case 67: YY_RULE_SETUP -#line 268 "detex.l" -{KILLARGS(1); IGNORE;} +#line 273 "detex.l" +{KILLARGS(1); SPACE;} YY_BREAK case 68: YY_RULE_SETUP -#line 269 "detex.l" -{CITE(1); IGNORE;} +#line 274 "detex.l" +{KILLARGS(1); IGNORE;} YY_BREAK case 69: YY_RULE_SETUP -#line 270 "detex.l" -{KILLARGS(1); IGNORE;} +#line 275 "detex.l" +{CITE(1); IGNORE;} YY_BREAK case 70: YY_RULE_SETUP -#line 271 "detex.l" -{CITE(1); IGNORE;} +#line 276 "detex.l" +{KILLARGS(1); IGNORE;} YY_BREAK case 71: YY_RULE_SETUP -#line 272 "detex.l" -{KILLARGS(1); IGNORE;} +#line 277 "detex.l" +{CITE(1); IGNORE;} YY_BREAK case 72: YY_RULE_SETUP -#line 273 "detex.l" +#line 278 "detex.l" +{KILLARGS(1); IGNORE;} + YY_BREAK +case 73: +YY_RULE_SETUP +#line 279 "detex.l" /* ignore \verb... */ { if (fLatex) { char verbchar, c; verbchar = input(); @@ -1903,327 +2312,327 @@ YY_RULE_SETUP IGNORE; } YY_BREAK -case 73: -YY_RULE_SETUP -#line 283 "detex.l" -{ LATEX; KILLARGS(2); } - YY_BREAK case 74: YY_RULE_SETUP -#line 284 "detex.l" +#line 289 "detex.l" { LATEX; KILLARGS(2); } YY_BREAK case 75: YY_RULE_SETUP -#line 285 "detex.l" -{ LATEX; KILLARGS(3); } +#line 290 "detex.l" +{ LATEX; KILLARGS(2); } YY_BREAK case 76: YY_RULE_SETUP -#line 287 "detex.l" -/* ignore def begin */ {BEGIN Define; IGNORE;} +#line 291 "detex.l" +{ LATEX; KILLARGS(3); } YY_BREAK case 77: YY_RULE_SETUP -#line 288 "detex.l" -BEGIN Normal; +#line 293 "detex.l" +/* ignore def begin */ {BEGIN Define; IGNORE;} YY_BREAK case 78: -/* rule 78 can match eol */ YY_RULE_SETUP -#line 289 "detex.l" -NEWLINE; +#line 294 "detex.l" +BEGIN Normal; YY_BREAK case 79: +/* rule 79 can match eol */ YY_RULE_SETUP -#line 290 "detex.l" -; +#line 295 "detex.l" +NEWLINE; YY_BREAK case 80: YY_RULE_SETUP -#line 292 "detex.l" -/* formula mode */ {LaBEGIN LaFormula; IGNORE;} +#line 296 "detex.l" +; YY_BREAK case 81: YY_RULE_SETUP -#line 293 "detex.l" -BEGIN Normal; +#line 298 "detex.l" +/* formula mode */ {LaBEGIN LaFormula; IGNORE;} YY_BREAK case 82: -/* rule 82 can match eol */ YY_RULE_SETUP -#line 294 "detex.l" -NEWLINE; +#line 299 "detex.l" +BEGIN Normal; YY_BREAK case 83: +/* rule 83 can match eol */ YY_RULE_SETUP -#line 295 "detex.l" -; +#line 300 "detex.l" +NEWLINE; YY_BREAK case 84: YY_RULE_SETUP -#line 297 "detex.l" -/* display mode */ {LaBEGIN LaDisplay; IGNORE;} +#line 301 "detex.l" +; YY_BREAK case 85: YY_RULE_SETUP -#line 298 "detex.l" -BEGIN Normal; +#line 303 "detex.l" +/* display mode */ {LaBEGIN LaDisplay; IGNORE;} YY_BREAK case 86: -/* rule 86 can match eol */ YY_RULE_SETUP -#line 299 "detex.l" -NEWLINE; +#line 304 "detex.l" +BEGIN Normal; YY_BREAK case 87: +/* rule 87 can match eol */ YY_RULE_SETUP -#line 300 "detex.l" -; +#line 305 "detex.l" +NEWLINE; YY_BREAK case 88: YY_RULE_SETUP -#line 302 "detex.l" -/* display mode */ {BEGIN Display; IGNORE;} +#line 306 "detex.l" +; YY_BREAK case 89: YY_RULE_SETUP -#line 303 "detex.l" -BEGIN Normal; +#line 308 "detex.l" +/* display mode */ {BEGIN Display; IGNORE;} YY_BREAK case 90: -/* rule 90 can match eol */ YY_RULE_SETUP -#line 304 "detex.l" -NEWLINE; +#line 309 "detex.l" +BEGIN Normal; YY_BREAK case 91: +/* rule 91 can match eol */ YY_RULE_SETUP -#line 305 "detex.l" -; +#line 310 "detex.l" +NEWLINE; YY_BREAK case 92: YY_RULE_SETUP -#line 307 "detex.l" -/* math mode */ {BEGIN Math; IGNORE;} +#line 311 "detex.l" +; YY_BREAK case 93: YY_RULE_SETUP -#line 308 "detex.l" -BEGIN Normal; +#line 313 "detex.l" +/* math mode */ {BEGIN Math; IGNORE;} YY_BREAK case 94: -/* rule 94 can match eol */ YY_RULE_SETUP -#line 309 "detex.l" -NEWLINE; +#line 314 "detex.l" +BEGIN Normal; YY_BREAK case 95: +/* rule 95 can match eol */ YY_RULE_SETUP -#line 310 "detex.l" -; +#line 315 "detex.l" +NEWLINE; YY_BREAK case 96: YY_RULE_SETUP -#line 311 "detex.l" +#line 316 "detex.l" ; YY_BREAK case 97: YY_RULE_SETUP -#line 313 "detex.l" -/* process files */ {LaBEGIN LaInclude; IGNORE;} +#line 317 "detex.l" +; YY_BREAK case 98: YY_RULE_SETUP -#line 314 "detex.l" +#line 319 "detex.l" +/* process files */ {LaBEGIN LaInclude; IGNORE;} + YY_BREAK +case 99: +YY_RULE_SETUP +#line 320 "detex.l" { IncludeFile(yytext); BEGIN Normal; } YY_BREAK -case 99: -/* rule 99 can match eol */ +case 100: +/* rule 100 can match eol */ YY_RULE_SETUP -#line 317 "detex.l" +#line 323 "detex.l" NEWLINE; YY_BREAK -case 100: +case 101: YY_RULE_SETUP -#line 318 "detex.l" +#line 324 "detex.l" ; YY_BREAK -case 101: +case 102: YY_RULE_SETUP -#line 320 "detex.l" +#line 326 "detex.l" {BEGIN IncludeOnly; IGNORE;} YY_BREAK -case 102: +case 103: YY_RULE_SETUP -#line 321 "detex.l" +#line 327 "detex.l" AddInclude(yytext); YY_BREAK -case 103: +case 104: YY_RULE_SETUP -#line 322 "detex.l" +#line 328 "detex.l" { if (csbIncList == 0) rgsbIncList[csbIncList++] = '\0'; BEGIN Normal; } YY_BREAK -case 104: -/* rule 104 can match eol */ +case 105: +/* rule 105 can match eol */ YY_RULE_SETUP -#line 326 "detex.l" +#line 332 "detex.l" NEWLINE; YY_BREAK -case 105: +case 106: YY_RULE_SETUP -#line 327 "detex.l" +#line 333 "detex.l" ; YY_BREAK -case 106: +case 107: YY_RULE_SETUP -#line 329 "detex.l" +#line 335 "detex.l" {BEGIN Input; IGNORE;} YY_BREAK -case 107: +case 108: YY_RULE_SETUP -#line 330 "detex.l" +#line 336 "detex.l" { InputFile(yytext); BEGIN Normal; } YY_BREAK -case 108: -/* rule 108 can match eol */ +case 109: +/* rule 109 can match eol */ YY_RULE_SETUP -#line 333 "detex.l" +#line 339 "detex.l" NEWLINE; YY_BREAK -case 109: +case 110: YY_RULE_SETUP -#line 334 "detex.l" +#line 340 "detex.l" ; YY_BREAK -case 110: -/* rule 110 can match eol */ +case 111: +/* rule 111 can match eol */ YY_RULE_SETUP -#line 336 "detex.l" +#line 342 "detex.l" /* handle ligatures */ {(void)printf("%.2s", yytext+1);} YY_BREAK -case 111: -/* rule 111 can match eol */ +case 112: +/* rule 112 can match eol */ YY_RULE_SETUP -#line 337 "detex.l" +#line 343 "detex.l" {(void)printf("%.1s", yytext+1);} YY_BREAK -case 112: +case 113: YY_RULE_SETUP -#line 338 "detex.l" +#line 344 "detex.l" BEGIN LaBreak; YY_BREAK -case 113: +case 114: YY_RULE_SETUP -#line 340 "detex.l" +#line 346 "detex.l" /* ignore other \cs */ {BEGIN Control; IGNORE;} YY_BREAK -case 114: +case 115: YY_RULE_SETUP -#line 341 "detex.l" +#line 347 "detex.l" SPACE; YY_BREAK -case 115: -/* rule 115 can match eol */ +case 116: +/* rule 116 can match eol */ YY_RULE_SETUP -#line 342 "detex.l" +#line 348 "detex.l" NEWLINE; YY_BREAK -case 116: +case 117: YY_RULE_SETUP -#line 343 "detex.l" +#line 349 "detex.l" IGNORE; YY_BREAK -case 117: +case 118: YY_RULE_SETUP -#line 344 "detex.l" +#line 350 "detex.l" { if (yytext==NULL || strlen(yytext)==0 || atoi(yytext)==4) NEWLINE; BEGIN Normal; } YY_BREAK -case 118: +case 119: YY_RULE_SETUP -#line 350 "detex.l" +#line 356 "detex.l" IGNORE; YY_BREAK -case 119: +case 120: YY_RULE_SETUP -#line 351 "detex.l" +#line 357 "detex.l" IGNORE; YY_BREAK -case 120: -/* rule 120 can match eol */ +case 121: +/* rule 121 can match eol */ YY_RULE_SETUP -#line 352 "detex.l" +#line 358 "detex.l" {BEGIN Normal; NEWLINE;} YY_BREAK -case 121: +case 122: YY_RULE_SETUP -#line 353 "detex.l" +#line 359 "detex.l" {BEGIN Normal; IGNORE;} YY_BREAK -case 122: +case 123: YY_RULE_SETUP -#line 354 "detex.l" +#line 360 "detex.l" {yyless(0);BEGIN Normal;} YY_BREAK -case 123: +case 124: YY_RULE_SETUP -#line 356 "detex.l" +#line 362 "detex.l" /* special characters */ IGNORE; YY_BREAK -case 124: +case 125: YY_RULE_SETUP -#line 357 "detex.l" +#line 363 "detex.l" IGNORE; YY_BREAK -case 125: +case 126: YY_RULE_SETUP -#line 358 "detex.l" +#line 364 "detex.l" SPACE; YY_BREAK -case 126: +case 127: YY_RULE_SETUP -#line 360 "detex.l" +#line 366 "detex.l" { if (fWord) (void)printf("%s\n", yytext); else ECHO; } YY_BREAK -case 127: +case 128: YY_RULE_SETUP -#line 365 "detex.l" +#line 371 "detex.l" if (!fWord) ECHO; YY_BREAK -case 128: -/* rule 128 can match eol */ +case 129: +/* rule 129 can match eol */ YY_RULE_SETUP -#line 366 "detex.l" +#line 372 "detex.l" if (!fWord) ECHO; YY_BREAK -case 129: +case 130: YY_RULE_SETUP -#line 368 "detex.l" +#line 374 "detex.l" { BEGIN LaOptArg; } YY_BREAK -case 130: +case 131: YY_RULE_SETUP -#line 369 "detex.l" +#line 375 "detex.l" { cOpenBrace++; } YY_BREAK -case 131: +case 132: YY_RULE_SETUP -#line 370 "detex.l" +#line 376 "detex.l" { cOpenBrace--; if (cOpenBrace == 0) { @@ -2232,30 +2641,30 @@ YY_RULE_SETUP } } YY_BREAK -case 132: +case 133: YY_RULE_SETUP -#line 377 "detex.l" +#line 383 "detex.l" ; YY_BREAK -case 133: +case 134: YY_RULE_SETUP -#line 378 "detex.l" +#line 384 "detex.l" BEGIN LaMacro; YY_BREAK -case 134: -/* rule 134 can match eol */ +case 135: +/* rule 135 can match eol */ YY_RULE_SETUP -#line 379 "detex.l" +#line 385 "detex.l" ; YY_BREAK -case 135: +case 136: YY_RULE_SETUP -#line 381 "detex.l" +#line 387 "detex.l" { BEGIN LaOptArg2; } YY_BREAK -case 136: +case 137: YY_RULE_SETUP -#line 382 "detex.l" +#line 388 "detex.l" { if (cOpenBrace == 0) { if (--cArgs==0) @@ -2267,32 +2676,32 @@ YY_RULE_SETUP cOpenBrace++; } YY_BREAK -case 137: +case 138: YY_RULE_SETUP -#line 392 "detex.l" +#line 398 "detex.l" { cOpenBrace--; } YY_BREAK -case 138: +case 139: YY_RULE_SETUP -#line 393 "detex.l" +#line 399 "detex.l" ; YY_BREAK -case 139: +case 140: YY_RULE_SETUP -#line 394 "detex.l" +#line 400 "detex.l" BEGIN LaMacro2; YY_BREAK -case 140: +case 141: YY_RULE_SETUP -#line 395 "detex.l" +#line 401 "detex.l" ; YY_BREAK -case 141: +case 142: YY_RULE_SETUP -#line 396 "detex.l" +#line 402 "detex.l" ECHO; YY_BREAK -#line 2296 "detex.c" +#line 2705 "detex.c" case YY_STATE_EOF(INITIAL): case YY_STATE_EOF(Define): case YY_STATE_EOF(Display): @@ -2604,7 +3013,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 708 ) + if ( yy_current_state >= 1067 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -2632,11 +3041,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 708 ) + if ( yy_current_state >= 1067 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 707); + yy_is_jam = (yy_current_state == 1066); return yy_is_jam ? 0 : yy_current_state; } @@ -3310,7 +3719,7 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 396 "detex.l" +#line 402 "detex.l" /****** -- cgit v1.2.3