[Pcre-svn] [1050] code/trunk: unicode: Update to Unicode 6.2

Góra strony
Delete this message
Autor: Subversion repository
Data:  
Dla: pcre-svn
Temat: [Pcre-svn] [1050] code/trunk: unicode: Update to Unicode 6.2
Revision: 1050
          http://vcs.pcre.org/viewvc?view=rev&revision=1050
Author:   chpe
Date:     2012-09-30 19:20:10 +0100 (Sun, 30 Sep 2012)


Log Message:
-----------
unicode: Update to Unicode 6.2

Modified Paths:
--------------
    code/trunk/ChangeLog
    code/trunk/doc/pcre.3
    code/trunk/maint/GenerateUtt.py
    code/trunk/maint/MultiStage2.py
    code/trunk/maint/Unicode.tables/CaseFolding.txt
    code/trunk/maint/Unicode.tables/DerivedGeneralCategory.txt
    code/trunk/maint/Unicode.tables/GraphemeBreakProperty.txt
    code/trunk/maint/Unicode.tables/Scripts.txt
    code/trunk/maint/Unicode.tables/UnicodeData.txt
    code/trunk/pcre_tables.c
    code/trunk/pcre_ucd.c
    code/trunk/testdata/testinput6
    code/trunk/testdata/testoutput6
    code/trunk/ucp.h


Modified: code/trunk/ChangeLog
===================================================================
--- code/trunk/ChangeLog    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/ChangeLog    2012-09-30 18:20:10 UTC (rev 1050)
@@ -116,6 +116,7 @@
     (f) General caseless matching of characters with more than one other case 
         is supported.


+22. Unicode character properties were updated from Unicode 6.2.0

Version 8.31 06-July-2012
-------------------------

Modified: code/trunk/doc/pcre.3
===================================================================
--- code/trunk/doc/pcre.3    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/doc/pcre.3    2012-09-30 18:20:10 UTC (rev 1050)
@@ -33,7 +33,7 @@
 The current implementation of PCRE corresponds approximately with Perl 5.12,
 including support for UTF-8/16 encoded strings and Unicode general category
 properties. However, UTF-8/16 and Unicode support has to be explicitly enabled;
-it is not the default. The Unicode tables correspond to Unicode release 6.0.0.
+it is not the default. The Unicode tables correspond to Unicode release 6.2.0.
 .P
 In addition to the Perl-compatible matching function, PCRE contains an
 alternative function that matches the same compiled patterns in a different


Modified: code/trunk/maint/GenerateUtt.py
===================================================================
--- code/trunk/maint/GenerateUtt.py    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/maint/GenerateUtt.py    2012-09-30 18:20:10 UTC (rev 1050)
@@ -16,6 +16,8 @@
 # Modified by PH 01-March-2010 to add new scripts for Unicode 5.2.0.
 # Modified by PH 04-May-2010 to add new "X.." special categories.
 # Modified by PH 30-April-2011 to add new scripts for Unicode 6.0.0
+# Modified by ChPe 30-September-2012 to add this note; no other changes were
+# necessary for Unicode 6.2.0 support.


 script_names = ['Arabic', 'Armenian', 'Bengali', 'Bopomofo', 'Braille', 'Buginese', 'Buhid', 'Canadian_Aboriginal', \
  'Cherokee', 'Common', 'Coptic', 'Cypriot', 'Cyrillic', 'Deseret', 'Devanagari', 'Ethiopic', 'Georgian', \
@@ -101,6 +103,6 @@
         value = 'ucp_' + utt[0]
     if utt == utt_table[-1]:
         last = ''
-    print '  { %3d, %s, %s }%s ' % (offset, utt[1], value, last)
+    print '  { %3d, %s, %s }%s' % (offset, utt[1], value, last)
     offset += len(utt[0]) + 1
 print '};'


Modified: code/trunk/maint/MultiStage2.py
===================================================================
--- code/trunk/maint/MultiStage2.py    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/maint/MultiStage2.py    2012-09-30 18:20:10 UTC (rev 1050)
@@ -107,6 +107,7 @@
 #                      not much bigger than before.
 # 18-September-2012: Added code for multiple caseless sets. This uses the
 #                      final hole in the structure.
+# 30-September-2012: Added RegionalIndicator break property from Unicode 6.2.0
 ##############################################################################



@@ -304,8 +305,8 @@
'Mc', 'Me', 'Mn', 'Nd', 'Nl', 'No', 'Pc', 'Pd', 'Pe', 'Pf', 'Pi', 'Po', 'Ps',
'Sc', 'Sk', 'Sm', 'So', 'Zl', 'Zp', 'Zs' ]

-break_property_names = ['CR', 'LF', 'Control', 'Extend', 'Prepend',
- 'SpacingMark', 'L', 'V', 'T', 'LV', 'LVT', 'Other' ]
+break_property_names = ['CR', 'LF', 'Control', 'Extend', 'Prepend',
+ 'SpacingMark', 'L', 'V', 'T', 'LV', 'LVT', 'Regional_Indicator', 'Other' ]

test_record_size()


Modified: code/trunk/maint/Unicode.tables/CaseFolding.txt
===================================================================
--- code/trunk/maint/Unicode.tables/CaseFolding.txt    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/maint/Unicode.tables/CaseFolding.txt    2012-09-30 18:20:10 UTC (rev 1050)
@@ -1,8 +1,8 @@
-# CaseFolding-6.1.0.txt
-# Date: 2011-07-25, 21:21:56 GMT [MD]
+# CaseFolding-6.2.0.txt
+# Date: 2012-08-14, 17:54:49 GMT [MD]
 #
 # Unicode Character Database
-# Copyright (c) 1991-2011 Unicode, Inc.
+# Copyright (c) 1991-2012 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 # For documentation, see http://www.unicode.org/reports/tr44/
 #
@@ -1222,3 +1222,5 @@
 10425; C; 1044D; # DESERET CAPITAL LETTER ENG
 10426; C; 1044E; # DESERET CAPITAL LETTER OI
 10427; C; 1044F; # DESERET CAPITAL LETTER EW
+#
+# EOF


Modified: code/trunk/maint/Unicode.tables/DerivedGeneralCategory.txt
===================================================================
--- code/trunk/maint/Unicode.tables/DerivedGeneralCategory.txt    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/maint/Unicode.tables/DerivedGeneralCategory.txt    2012-09-30 18:20:10 UTC (rev 1050)
@@ -1,8 +1,8 @@
-# DerivedGeneralCategory-6.1.0.txt
-# Date: 2011-11-27, 05:10:22 GMT [MD]
+# DerivedGeneralCategory-6.2.0.txt
+# Date: 2012-05-20, 00:42:34 GMT [MD]
 #
 # Unicode Character Database
-# Copyright (c) 1991-2011 Unicode, Inc.
+# Copyright (c) 1991-2012 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 # For documentation, see http://www.unicode.org/reports/tr44/


@@ -275,7 +275,7 @@
 2072..2073    ; Cn #   [2] <reserved-2072>..<reserved-2073>
 208F          ; Cn #       <reserved-208F>
 209D..209F    ; Cn #   [3] <reserved-209D>..<reserved-209F>
-20BA..20CF    ; Cn #  [22] <reserved-20BA>..<reserved-20CF>
+20BB..20CF    ; Cn #  [21] <reserved-20BB>..<reserved-20CF>
 20F1..20FF    ; Cn #  [15] <reserved-20F1>..<reserved-20FF>
 218A..218F    ; Cn #   [6] <reserved-218A>..<reserved-218F>
 23F4..23FF    ; Cn #  [12] <reserved-23F4>..<reserved-23FF>
@@ -554,7 +554,7 @@
 FFFFE..FFFFF  ; Cn #   [2] <noncharacter-FFFFE>..<noncharacter-FFFFF>
 10FFFE..10FFFF; Cn #   [2] <noncharacter-10FFFE>..<noncharacter-10FFFF>


-# Total code points: 864415
+# Total code points: 864414

# ================================================

@@ -3230,7 +3230,7 @@
 0BF9          ; Sc #       TAMIL RUPEE SIGN
 0E3F          ; Sc #       THAI CURRENCY SYMBOL BAHT
 17DB          ; Sc #       KHMER CURRENCY SYMBOL RIEL
-20A0..20B9    ; Sc #  [26] EURO-CURRENCY SIGN..INDIAN RUPEE SIGN
+20A0..20BA    ; Sc #  [27] EURO-CURRENCY SIGN..TURKISH LIRA SIGN
 A838          ; Sc #       NORTH INDIC RUPEE MARK
 FDFC          ; Sc #       RIAL SIGN
 FE69          ; Sc #       SMALL DOLLAR SIGN
@@ -3238,7 +3238,7 @@
 FFE0..FFE1    ; Sc #   [2] FULLWIDTH CENT SIGN..FULLWIDTH POUND SIGN
 FFE5..FFE6    ; Sc #   [2] FULLWIDTH YEN SIGN..FULLWIDTH WON SIGN


-# Total code points: 48
+# Total code points: 49

# ================================================


Modified: code/trunk/maint/Unicode.tables/GraphemeBreakProperty.txt
===================================================================
--- code/trunk/maint/Unicode.tables/GraphemeBreakProperty.txt    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/maint/Unicode.tables/GraphemeBreakProperty.txt    2012-09-30 18:20:10 UTC (rev 1050)
@@ -1,8 +1,8 @@
-# GraphemeBreakProperty-6.1.0.txt
-# Date: 2011-12-05, 16:44:15 GMT [MD]
+# GraphemeBreakProperty-6.2.0.txt
+# Date: 2012-08-13, 19:12:02 GMT [MD]
 #
 # Unicode Character Database
-# Copyright (c) 1991-2011 Unicode, Inc.
+# Copyright (c) 1991-2012 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 # For documentation, see http://www.unicode.org/reports/tr44/


@@ -308,6 +308,12 @@

# ================================================

+1F1E6..1F1FF  ; Regional_Indicator # So  [26] REGIONAL INDICATOR SYMBOL LETTER A..REGIONAL INDICATOR SYMBOL LETTER Z
+
+# Total code points: 26
+
+# ================================================
+
 0903          ; SpacingMark # Mc       DEVANAGARI SIGN VISARGA
 093B          ; SpacingMark # Mc       DEVANAGARI VOWEL SIGN OOE
 093E..0940    ; SpacingMark # Mc   [3] DEVANAGARI VOWEL SIGN AA..DEVANAGARI VOWEL SIGN II


Modified: code/trunk/maint/Unicode.tables/Scripts.txt
===================================================================
--- code/trunk/maint/Unicode.tables/Scripts.txt    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/maint/Unicode.tables/Scripts.txt    2012-09-30 18:20:10 UTC (rev 1050)
@@ -1,8 +1,8 @@
-# Scripts-6.1.0.txt
-# Date: 2011-11-27, 05:10:50 GMT [MD]
+# Scripts-6.2.0.txt
+# Date: 2012-06-04, 17:21:29 GMT [MD]
 #
 # Unicode Character Database
-# Copyright (c) 1991-2011 Unicode, Inc.
+# Copyright (c) 1991-2012 Unicode, Inc.
 # For terms of use, see http://www.unicode.org/terms_of_use.html
 # For documentation, see http://www.unicode.org/reports/tr44/


@@ -146,7 +146,7 @@
 208A..208C    ; Common # Sm   [3] SUBSCRIPT PLUS SIGN..SUBSCRIPT EQUALS SIGN
 208D          ; Common # Ps       SUBSCRIPT LEFT PARENTHESIS
 208E          ; Common # Pe       SUBSCRIPT RIGHT PARENTHESIS
-20A0..20B9    ; Common # Sc  [26] EURO-CURRENCY SIGN..INDIAN RUPEE SIGN
+20A0..20BA    ; Common # Sc  [27] EURO-CURRENCY SIGN..TURKISH LIRA SIGN
 2100..2101    ; Common # So   [2] ACCOUNT OF..ADDRESSED TO THE SUBJECT
 2102          ; Common # L&       DOUBLE-STRUCK CAPITAL C
 2103..2106    ; Common # So   [4] DEGREE CELSIUS..CADA UNA
@@ -576,7 +576,7 @@
 E0001         ; Common # Cf       LANGUAGE TAG
 E0020..E007F  ; Common # Cf  [96] TAG SPACE..CANCEL TAG


-# Total code points: 6412
+# Total code points: 6413

# ================================================

@@ -760,7 +760,7 @@
 061E          ; Arabic # Po       ARABIC TRIPLE DOT PUNCTUATION MARK
 0620..063F    ; Arabic # Lo  [32] ARABIC LETTER KASHMIRI YEH..ARABIC LETTER FARSI YEH WITH THREE DOTS ABOVE
 0641..064A    ; Arabic # Lo  [10] ARABIC LETTER FEH..ARABIC LETTER YEH
-0656..065E    ; Arabic # Mn   [9] ARABIC SUBSCRIPT ALEF..ARABIC FATHA WITH TWO DOTS
+0656..065F    ; Arabic # Mn  [10] ARABIC SUBSCRIPT ALEF..ARABIC WAVY HAMZA BELOW
 066A..066D    ; Arabic # Po   [4] ARABIC PERCENT SIGN..ARABIC FIVE POINTED STAR
 066E..066F    ; Arabic # Lo   [2] ARABIC LETTER DOTLESS BEH..ARABIC LETTER DOTLESS QAF
 0671..06D3    ; Arabic # Lo  [99] ARABIC LETTER ALEF WASLA..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE
@@ -827,7 +827,7 @@
 1EEAB..1EEBB  ; Arabic # Lo  [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN
 1EEF0..1EEF1  ; Arabic # Sm   [2] ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL..ARABIC MATHEMATICAL OPERATOR HAH WITH DAL


-# Total code points: 1234
+# Total code points: 1235

# ================================================

@@ -1477,7 +1477,6 @@
 0300..036F    ; Inherited # Mn [112] COMBINING GRAVE ACCENT..COMBINING LATIN SMALL LETTER X
 0485..0486    ; Inherited # Mn   [2] COMBINING CYRILLIC DASIA PNEUMATA..COMBINING CYRILLIC PSILI PNEUMATA
 064B..0655    ; Inherited # Mn  [11] ARABIC FATHATAN..ARABIC HAMZA BELOW
-065F          ; Inherited # Mn       ARABIC WAVY HAMZA BELOW
 0670          ; Inherited # Mn       ARABIC LETTER SUPERSCRIPT ALEF
 0951..0952    ; Inherited # Mn   [2] DEVANAGARI STRESS SIGN UDATTA..DEVANAGARI STRESS SIGN ANUDATTA
 1CD0..1CD2    ; Inherited # Mn   [3] VEDIC TONE KARSHANA..VEDIC TONE PRENKHA
@@ -1504,7 +1503,7 @@
 1D1AA..1D1AD  ; Inherited # Mn   [4] MUSICAL SYMBOL COMBINING DOWN BOW..MUSICAL SYMBOL COMBINING SNAP PIZZICATO
 E0100..E01EF  ; Inherited # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256


-# Total code points: 524
+# Total code points: 523

# ================================================


Modified: code/trunk/maint/Unicode.tables/UnicodeData.txt
===================================================================
--- code/trunk/maint/Unicode.tables/UnicodeData.txt    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/maint/Unicode.tables/UnicodeData.txt    2012-09-30 18:20:10 UTC (rev 1050)
@@ -7190,6 +7190,7 @@
 20B7;SPESMILO SIGN;Sc;0;ET;;;;;N;;;;;
 20B8;TENGE SIGN;Sc;0;ET;;;;;N;;;;;
 20B9;INDIAN RUPEE SIGN;Sc;0;ET;;;;;N;;;;;
+20BA;TURKISH LIRA SIGN;Sc;0;ET;;;;;N;;;;;
 20D0;COMBINING LEFT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING LEFT HARPOON ABOVE;;;;
 20D1;COMBINING RIGHT HARPOON ABOVE;Mn;230;NSM;;;;;N;NON-SPACING RIGHT HARPOON ABOVE;;;;
 20D2;COMBINING LONG VERTICAL LINE OVERLAY;Mn;1;NSM;;;;;N;NON-SPACING LONG VERTICAL BAR OVERLAY;;;;
@@ -18703,8 +18704,8 @@
 1242F;CUNEIFORM NUMERIC SIGN THREE SHARU VARIANT FORM;Nl;0;L;;;;3;N;;;;;
 12430;CUNEIFORM NUMERIC SIGN FOUR SHARU;Nl;0;L;;;;4;N;;;;;
 12431;CUNEIFORM NUMERIC SIGN FIVE SHARU;Nl;0;L;;;;5;N;;;;;
-12432;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH;Nl;0;L;;;;;N;;;;;
-12433;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN;Nl;0;L;;;;;N;;;;;
+12432;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS DISH;Nl;0;L;;;;216000;N;;;;;
+12433;CUNEIFORM NUMERIC SIGN SHAR2 TIMES GAL PLUS MIN;Nl;0;L;;;;432000;N;;;;;
 12434;CUNEIFORM NUMERIC SIGN ONE BURU;Nl;0;L;;;;1;N;;;;;
 12435;CUNEIFORM NUMERIC SIGN TWO BURU;Nl;0;L;;;;2;N;;;;;
 12436;CUNEIFORM NUMERIC SIGN THREE BURU;Nl;0;L;;;;3;N;;;;;
@@ -18739,8 +18740,8 @@
 12453;CUNEIFORM NUMERIC SIGN FOUR BAN2 VARIANT FORM;Nl;0;L;;;;4;N;;;;;
 12454;CUNEIFORM NUMERIC SIGN FIVE BAN2;Nl;0;L;;;;5;N;;;;;
 12455;CUNEIFORM NUMERIC SIGN FIVE BAN2 VARIANT FORM;Nl;0;L;;;;5;N;;;;;
-12456;CUNEIFORM NUMERIC SIGN NIGIDAMIN;Nl;0;L;;;;;N;;;;;
-12457;CUNEIFORM NUMERIC SIGN NIGIDAESH;Nl;0;L;;;;;N;;;;;
+12456;CUNEIFORM NUMERIC SIGN NIGIDAMIN;Nl;0;L;;;;-1;N;;;;;
+12457;CUNEIFORM NUMERIC SIGN NIGIDAESH;Nl;0;L;;;;-1;N;;;;;
 12458;CUNEIFORM NUMERIC SIGN ONE ESHE3;Nl;0;L;;;;1;N;;;;;
 12459;CUNEIFORM NUMERIC SIGN TWO ESHE3;Nl;0;L;;;;2;N;;;;;
 1245A;CUNEIFORM NUMERIC SIGN ONE THIRD DISH;Nl;0;L;;;;1/3;N;;;;;


Modified: code/trunk/pcre_tables.c
===================================================================
--- code/trunk/pcre_tables.c    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/pcre_tables.c    2012-09-30 18:20:10 UTC (rev 1050)
@@ -171,7 +171,8 @@
      (1<<ucp_gbT),


    (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)|(1<<ucp_gbT),   /* 10 LVT */  
-   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)                 /* 11 Other */
+   (1<<ucp_gbRegionalIndicator),                            /* 11 RegionalIndicator */
+   (1<<ucp_gbExtend)|(1<<ucp_gbSpacingMark)                 /* 12 Other */
 }; 


#ifdef SUPPORT_JIT

Modified: code/trunk/pcre_ucd.c
===================================================================
--- code/trunk/pcre_ucd.c    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/pcre_ucd.c    2012-09-30 18:20:10 UTC (rev 1050)
@@ -20,7 +20,7 @@


/* Unicode character database. */
/* This file was autogenerated by the MultiStage2.py script. */
-/* Total size: 65688 bytes, block size: 128. */
+/* Total size: 65696 bytes, block size: 128. */

/* The tables herein are needed only when UCP support is built
into PCRE. This module should not be referenced otherwise, so
@@ -79,634 +79,635 @@

#ifndef PCRE_INCLUDED

-const ucd_record PRIV(ucd_records)[] = { /* 5016 bytes, record size 8 */
+const ucd_record PRIV(ucd_records)[] = { /* 5024 bytes, record size 8 */
   {     9,      0,      2,      0,      0, }, /*   0 */
   {     9,      0,      1,      0,      0, }, /*   1 */
   {     9,      0,      0,      0,      0, }, /*   2 */
-  {     9,     29,     11,      0,      0, }, /*   3 */
-  {     9,     21,     11,      0,      0, }, /*   4 */
-  {     9,     23,     11,      0,      0, }, /*   5 */
-  {     9,     22,     11,      0,      0, }, /*   6 */
-  {     9,     18,     11,      0,      0, }, /*   7 */
-  {     9,     25,     11,      0,      0, }, /*   8 */
-  {     9,     17,     11,      0,      0, }, /*   9 */
-  {     9,     13,     11,      0,      0, }, /*  10 */
-  {    33,      9,     11,      0,     32, }, /*  11 */
-  {    33,      9,     11,     71,     32, }, /*  12 */
-  {    33,      9,     11,      1,     32, }, /*  13 */
-  {     9,     24,     11,      0,      0, }, /*  14 */
-  {     9,     16,     11,      0,      0, }, /*  15 */
-  {    33,      5,     11,      0,    -32, }, /*  16 */
-  {    33,      5,     11,     71,    -32, }, /*  17 */
-  {    33,      5,     11,      1,    -32, }, /*  18 */
-  {     9,     26,     11,      0,      0, }, /*  19 */
-  {    33,      7,     11,      0,      0, }, /*  20 */
-  {     9,     20,     11,      0,      0, }, /*  21 */
+  {     9,     29,     12,      0,      0, }, /*   3 */
+  {     9,     21,     12,      0,      0, }, /*   4 */
+  {     9,     23,     12,      0,      0, }, /*   5 */
+  {     9,     22,     12,      0,      0, }, /*   6 */
+  {     9,     18,     12,      0,      0, }, /*   7 */
+  {     9,     25,     12,      0,      0, }, /*   8 */
+  {     9,     17,     12,      0,      0, }, /*   9 */
+  {     9,     13,     12,      0,      0, }, /*  10 */
+  {    33,      9,     12,      0,     32, }, /*  11 */
+  {    33,      9,     12,     71,     32, }, /*  12 */
+  {    33,      9,     12,      1,     32, }, /*  13 */
+  {     9,     24,     12,      0,      0, }, /*  14 */
+  {     9,     16,     12,      0,      0, }, /*  15 */
+  {    33,      5,     12,      0,    -32, }, /*  16 */
+  {    33,      5,     12,     71,    -32, }, /*  17 */
+  {    33,      5,     12,      1,    -32, }, /*  18 */
+  {     9,     26,     12,      0,      0, }, /*  19 */
+  {    33,      7,     12,      0,      0, }, /*  20 */
+  {     9,     20,     12,      0,      0, }, /*  21 */
   {     9,      1,      2,      0,      0, }, /*  22 */
-  {     9,     15,     11,      0,      0, }, /*  23 */
-  {     9,      5,     11,     26,    775, }, /*  24 */
-  {     9,     19,     11,      0,      0, }, /*  25 */
-  {    33,      9,     11,     75,     32, }, /*  26 */
-  {    33,      5,     11,      0,   7615, }, /*  27 */
-  {    33,      5,     11,     75,    -32, }, /*  28 */
-  {    33,      5,     11,      0,    121, }, /*  29 */
-  {    33,      9,     11,      0,      1, }, /*  30 */
-  {    33,      5,     11,      0,     -1, }, /*  31 */
-  {    33,      9,     11,      0,      0, }, /*  32 */
-  {    33,      5,     11,      0,      0, }, /*  33 */
-  {    33,      9,     11,      0,   -121, }, /*  34 */
-  {    33,      5,     11,      1,   -268, }, /*  35 */
-  {    33,      5,     11,      0,    195, }, /*  36 */
-  {    33,      9,     11,      0,    210, }, /*  37 */
-  {    33,      9,     11,      0,    206, }, /*  38 */
-  {    33,      9,     11,      0,    205, }, /*  39 */
-  {    33,      9,     11,      0,     79, }, /*  40 */
-  {    33,      9,     11,      0,    202, }, /*  41 */
-  {    33,      9,     11,      0,    203, }, /*  42 */
-  {    33,      9,     11,      0,    207, }, /*  43 */
-  {    33,      5,     11,      0,     97, }, /*  44 */
-  {    33,      9,     11,      0,    211, }, /*  45 */
-  {    33,      9,     11,      0,    209, }, /*  46 */
-  {    33,      5,     11,      0,    163, }, /*  47 */
-  {    33,      9,     11,      0,    213, }, /*  48 */
-  {    33,      5,     11,      0,    130, }, /*  49 */
-  {    33,      9,     11,      0,    214, }, /*  50 */
-  {    33,      9,     11,      0,    218, }, /*  51 */
-  {    33,      9,     11,      0,    217, }, /*  52 */
-  {    33,      9,     11,      0,    219, }, /*  53 */
-  {    33,      5,     11,      0,     56, }, /*  54 */
-  {    33,      9,     11,      5,      2, }, /*  55 */
-  {    33,      8,     11,      5,      1, }, /*  56 */
-  {    33,      5,     11,      5,     -2, }, /*  57 */
-  {    33,      9,     11,      9,      2, }, /*  58 */
-  {    33,      8,     11,      9,      1, }, /*  59 */
-  {    33,      5,     11,      9,     -2, }, /*  60 */
-  {    33,      9,     11,     13,      2, }, /*  61 */
-  {    33,      8,     11,     13,      1, }, /*  62 */
-  {    33,      5,     11,     13,     -2, }, /*  63 */
-  {    33,      5,     11,      0,    -79, }, /*  64 */
-  {    33,      9,     11,     17,      2, }, /*  65 */
-  {    33,      8,     11,     17,      1, }, /*  66 */
-  {    33,      5,     11,     17,     -2, }, /*  67 */
-  {    33,      9,     11,      0,    -97, }, /*  68 */
-  {    33,      9,     11,      0,    -56, }, /*  69 */
-  {    33,      9,     11,      0,   -130, }, /*  70 */
-  {    33,      9,     11,      0,  10795, }, /*  71 */
-  {    33,      9,     11,      0,   -163, }, /*  72 */
-  {    33,      9,     11,      0,  10792, }, /*  73 */
-  {    33,      5,     11,      0,  10815, }, /*  74 */
-  {    33,      9,     11,      0,   -195, }, /*  75 */
-  {    33,      9,     11,      0,     69, }, /*  76 */
-  {    33,      9,     11,      0,     71, }, /*  77 */
-  {    33,      5,     11,      0,  10783, }, /*  78 */
-  {    33,      5,     11,      0,  10780, }, /*  79 */
-  {    33,      5,     11,      0,  10782, }, /*  80 */
-  {    33,      5,     11,      0,   -210, }, /*  81 */
-  {    33,      5,     11,      0,   -206, }, /*  82 */
-  {    33,      5,     11,      0,   -205, }, /*  83 */
-  {    33,      5,     11,      0,   -202, }, /*  84 */
-  {    33,      5,     11,      0,   -203, }, /*  85 */
-  {    33,      5,     11,      0,   -207, }, /*  86 */
-  {    33,      5,     11,      0,  42280, }, /*  87 */
-  {    33,      5,     11,      0,  42308, }, /*  88 */
-  {    33,      5,     11,      0,   -209, }, /*  89 */
-  {    33,      5,     11,      0,   -211, }, /*  90 */
-  {    33,      5,     11,      0,  10743, }, /*  91 */
-  {    33,      5,     11,      0,  10749, }, /*  92 */
-  {    33,      5,     11,      0,   -213, }, /*  93 */
-  {    33,      5,     11,      0,   -214, }, /*  94 */
-  {    33,      5,     11,      0,  10727, }, /*  95 */
-  {    33,      5,     11,      0,   -218, }, /*  96 */
-  {    33,      5,     11,      0,    -69, }, /*  97 */
-  {    33,      5,     11,      0,   -217, }, /*  98 */
-  {    33,      5,     11,      0,    -71, }, /*  99 */
-  {    33,      5,     11,      0,   -219, }, /* 100 */
-  {    33,      6,     11,      0,      0, }, /* 101 */
-  {     9,      6,     11,      0,      0, }, /* 102 */
-  {     3,     24,     11,      0,      0, }, /* 103 */
+  {     9,     15,     12,      0,      0, }, /*  23 */
+  {     9,      5,     12,     26,    775, }, /*  24 */
+  {     9,     19,     12,      0,      0, }, /*  25 */
+  {    33,      9,     12,     75,     32, }, /*  26 */
+  {    33,      5,     12,      0,   7615, }, /*  27 */
+  {    33,      5,     12,     75,    -32, }, /*  28 */
+  {    33,      5,     12,      0,    121, }, /*  29 */
+  {    33,      9,     12,      0,      1, }, /*  30 */
+  {    33,      5,     12,      0,     -1, }, /*  31 */
+  {    33,      9,     12,      0,      0, }, /*  32 */
+  {    33,      5,     12,      0,      0, }, /*  33 */
+  {    33,      9,     12,      0,   -121, }, /*  34 */
+  {    33,      5,     12,      1,   -268, }, /*  35 */
+  {    33,      5,     12,      0,    195, }, /*  36 */
+  {    33,      9,     12,      0,    210, }, /*  37 */
+  {    33,      9,     12,      0,    206, }, /*  38 */
+  {    33,      9,     12,      0,    205, }, /*  39 */
+  {    33,      9,     12,      0,     79, }, /*  40 */
+  {    33,      9,     12,      0,    202, }, /*  41 */
+  {    33,      9,     12,      0,    203, }, /*  42 */
+  {    33,      9,     12,      0,    207, }, /*  43 */
+  {    33,      5,     12,      0,     97, }, /*  44 */
+  {    33,      9,     12,      0,    211, }, /*  45 */
+  {    33,      9,     12,      0,    209, }, /*  46 */
+  {    33,      5,     12,      0,    163, }, /*  47 */
+  {    33,      9,     12,      0,    213, }, /*  48 */
+  {    33,      5,     12,      0,    130, }, /*  49 */
+  {    33,      9,     12,      0,    214, }, /*  50 */
+  {    33,      9,     12,      0,    218, }, /*  51 */
+  {    33,      9,     12,      0,    217, }, /*  52 */
+  {    33,      9,     12,      0,    219, }, /*  53 */
+  {    33,      5,     12,      0,     56, }, /*  54 */
+  {    33,      9,     12,      5,      2, }, /*  55 */
+  {    33,      8,     12,      5,      1, }, /*  56 */
+  {    33,      5,     12,      5,     -2, }, /*  57 */
+  {    33,      9,     12,      9,      2, }, /*  58 */
+  {    33,      8,     12,      9,      1, }, /*  59 */
+  {    33,      5,     12,      9,     -2, }, /*  60 */
+  {    33,      9,     12,     13,      2, }, /*  61 */
+  {    33,      8,     12,     13,      1, }, /*  62 */
+  {    33,      5,     12,     13,     -2, }, /*  63 */
+  {    33,      5,     12,      0,    -79, }, /*  64 */
+  {    33,      9,     12,     17,      2, }, /*  65 */
+  {    33,      8,     12,     17,      1, }, /*  66 */
+  {    33,      5,     12,     17,     -2, }, /*  67 */
+  {    33,      9,     12,      0,    -97, }, /*  68 */
+  {    33,      9,     12,      0,    -56, }, /*  69 */
+  {    33,      9,     12,      0,   -130, }, /*  70 */
+  {    33,      9,     12,      0,  10795, }, /*  71 */
+  {    33,      9,     12,      0,   -163, }, /*  72 */
+  {    33,      9,     12,      0,  10792, }, /*  73 */
+  {    33,      5,     12,      0,  10815, }, /*  74 */
+  {    33,      9,     12,      0,   -195, }, /*  75 */
+  {    33,      9,     12,      0,     69, }, /*  76 */
+  {    33,      9,     12,      0,     71, }, /*  77 */
+  {    33,      5,     12,      0,  10783, }, /*  78 */
+  {    33,      5,     12,      0,  10780, }, /*  79 */
+  {    33,      5,     12,      0,  10782, }, /*  80 */
+  {    33,      5,     12,      0,   -210, }, /*  81 */
+  {    33,      5,     12,      0,   -206, }, /*  82 */
+  {    33,      5,     12,      0,   -205, }, /*  83 */
+  {    33,      5,     12,      0,   -202, }, /*  84 */
+  {    33,      5,     12,      0,   -203, }, /*  85 */
+  {    33,      5,     12,      0,   -207, }, /*  86 */
+  {    33,      5,     12,      0,  42280, }, /*  87 */
+  {    33,      5,     12,      0,  42308, }, /*  88 */
+  {    33,      5,     12,      0,   -209, }, /*  89 */
+  {    33,      5,     12,      0,   -211, }, /*  90 */
+  {    33,      5,     12,      0,  10743, }, /*  91 */
+  {    33,      5,     12,      0,  10749, }, /*  92 */
+  {    33,      5,     12,      0,   -213, }, /*  93 */
+  {    33,      5,     12,      0,   -214, }, /*  94 */
+  {    33,      5,     12,      0,  10727, }, /*  95 */
+  {    33,      5,     12,      0,   -218, }, /*  96 */
+  {    33,      5,     12,      0,    -69, }, /*  97 */
+  {    33,      5,     12,      0,   -217, }, /*  98 */
+  {    33,      5,     12,      0,    -71, }, /*  99 */
+  {    33,      5,     12,      0,   -219, }, /* 100 */
+  {    33,      6,     12,      0,      0, }, /* 101 */
+  {     9,      6,     12,      0,      0, }, /* 102 */
+  {     3,     24,     12,      0,      0, }, /* 103 */
   {    27,     12,      3,      0,      0, }, /* 104 */
   {    27,     12,      3,     21,    116, }, /* 105 */
-  {    19,      9,     11,      0,      1, }, /* 106 */
-  {    19,      5,     11,      0,     -1, }, /* 107 */
-  {    19,     24,     11,      0,      0, }, /* 108 */
-  {     9,      2,     11,      0,      0, }, /* 109 */
-  {    19,      6,     11,      0,      0, }, /* 110 */
-  {    19,      5,     11,      0,    130, }, /* 111 */
-  {    19,      9,     11,      0,     38, }, /* 112 */
-  {    19,      9,     11,      0,     37, }, /* 113 */
-  {    19,      9,     11,      0,     64, }, /* 114 */
-  {    19,      9,     11,      0,     63, }, /* 115 */
-  {    19,      5,     11,      0,      0, }, /* 116 */
-  {    19,      9,     11,      0,     32, }, /* 117 */
-  {    19,      9,     11,     34,     32, }, /* 118 */
-  {    19,      9,     11,     59,     32, }, /* 119 */
-  {    19,      9,     11,     38,     32, }, /* 120 */
-  {    19,      9,     11,     21,     32, }, /* 121 */
-  {    19,      9,     11,     51,     32, }, /* 122 */
-  {    19,      9,     11,     26,     32, }, /* 123 */
-  {    19,      9,     11,     47,     32, }, /* 124 */
-  {    19,      9,     11,     55,     32, }, /* 125 */
-  {    19,      9,     11,     30,     32, }, /* 126 */
-  {    19,      9,     11,     43,     32, }, /* 127 */
-  {    19,      9,     11,     67,     32, }, /* 128 */
-  {    19,      5,     11,      0,    -38, }, /* 129 */
-  {    19,      5,     11,      0,    -37, }, /* 130 */
-  {    19,      5,     11,      0,    -32, }, /* 131 */
-  {    19,      5,     11,     34,    -32, }, /* 132 */
-  {    19,      5,     11,     59,    -32, }, /* 133 */
-  {    19,      5,     11,     38,    -32, }, /* 134 */
-  {    19,      5,     11,     21,   -116, }, /* 135 */
-  {    19,      5,     11,     51,    -32, }, /* 136 */
-  {    19,      5,     11,     26,   -775, }, /* 137 */
-  {    19,      5,     11,     47,    -32, }, /* 138 */
-  {    19,      5,     11,     55,    -32, }, /* 139 */
-  {    19,      5,     11,     30,      1, }, /* 140 */
-  {    19,      5,     11,     30,    -32, }, /* 141 */
-  {    19,      5,     11,     43,    -32, }, /* 142 */
-  {    19,      5,     11,     67,    -32, }, /* 143 */
-  {    19,      5,     11,      0,    -64, }, /* 144 */
-  {    19,      5,     11,      0,    -63, }, /* 145 */
-  {    19,      9,     11,      0,      8, }, /* 146 */
-  {    19,      5,     11,     34,    -30, }, /* 147 */
-  {    19,      5,     11,     38,    -25, }, /* 148 */
-  {    19,      9,     11,      0,      0, }, /* 149 */
-  {    19,      5,     11,     43,    -15, }, /* 150 */
-  {    19,      5,     11,     47,    -22, }, /* 151 */
-  {    19,      5,     11,      0,     -8, }, /* 152 */
-  {    10,      9,     11,      0,      1, }, /* 153 */
-  {    10,      5,     11,      0,     -1, }, /* 154 */
-  {    19,      5,     11,     51,    -54, }, /* 155 */
-  {    19,      5,     11,     55,    -48, }, /* 156 */
-  {    19,      5,     11,      0,      7, }, /* 157 */
-  {    19,      9,     11,     38,    -60, }, /* 158 */
-  {    19,      5,     11,     59,    -64, }, /* 159 */
-  {    19,     25,     11,      0,      0, }, /* 160 */
-  {    19,      9,     11,      0,     -7, }, /* 161 */
-  {    19,      9,     11,      0,   -130, }, /* 162 */
-  {    12,      9,     11,      0,     80, }, /* 163 */
-  {    12,      9,     11,      0,     32, }, /* 164 */
-  {    12,      5,     11,      0,    -32, }, /* 165 */
-  {    12,      5,     11,      0,    -80, }, /* 166 */
-  {    12,      9,     11,      0,      1, }, /* 167 */
-  {    12,      5,     11,      0,     -1, }, /* 168 */
-  {    12,     26,     11,      0,      0, }, /* 169 */
+  {    19,      9,     12,      0,      1, }, /* 106 */
+  {    19,      5,     12,      0,     -1, }, /* 107 */
+  {    19,     24,     12,      0,      0, }, /* 108 */
+  {     9,      2,     12,      0,      0, }, /* 109 */
+  {    19,      6,     12,      0,      0, }, /* 110 */
+  {    19,      5,     12,      0,    130, }, /* 111 */
+  {    19,      9,     12,      0,     38, }, /* 112 */
+  {    19,      9,     12,      0,     37, }, /* 113 */
+  {    19,      9,     12,      0,     64, }, /* 114 */
+  {    19,      9,     12,      0,     63, }, /* 115 */
+  {    19,      5,     12,      0,      0, }, /* 116 */
+  {    19,      9,     12,      0,     32, }, /* 117 */
+  {    19,      9,     12,     34,     32, }, /* 118 */
+  {    19,      9,     12,     59,     32, }, /* 119 */
+  {    19,      9,     12,     38,     32, }, /* 120 */
+  {    19,      9,     12,     21,     32, }, /* 121 */
+  {    19,      9,     12,     51,     32, }, /* 122 */
+  {    19,      9,     12,     26,     32, }, /* 123 */
+  {    19,      9,     12,     47,     32, }, /* 124 */
+  {    19,      9,     12,     55,     32, }, /* 125 */
+  {    19,      9,     12,     30,     32, }, /* 126 */
+  {    19,      9,     12,     43,     32, }, /* 127 */
+  {    19,      9,     12,     67,     32, }, /* 128 */
+  {    19,      5,     12,      0,    -38, }, /* 129 */
+  {    19,      5,     12,      0,    -37, }, /* 130 */
+  {    19,      5,     12,      0,    -32, }, /* 131 */
+  {    19,      5,     12,     34,    -32, }, /* 132 */
+  {    19,      5,     12,     59,    -32, }, /* 133 */
+  {    19,      5,     12,     38,    -32, }, /* 134 */
+  {    19,      5,     12,     21,   -116, }, /* 135 */
+  {    19,      5,     12,     51,    -32, }, /* 136 */
+  {    19,      5,     12,     26,   -775, }, /* 137 */
+  {    19,      5,     12,     47,    -32, }, /* 138 */
+  {    19,      5,     12,     55,    -32, }, /* 139 */
+  {    19,      5,     12,     30,      1, }, /* 140 */
+  {    19,      5,     12,     30,    -32, }, /* 141 */
+  {    19,      5,     12,     43,    -32, }, /* 142 */
+  {    19,      5,     12,     67,    -32, }, /* 143 */
+  {    19,      5,     12,      0,    -64, }, /* 144 */
+  {    19,      5,     12,      0,    -63, }, /* 145 */
+  {    19,      9,     12,      0,      8, }, /* 146 */
+  {    19,      5,     12,     34,    -30, }, /* 147 */
+  {    19,      5,     12,     38,    -25, }, /* 148 */
+  {    19,      9,     12,      0,      0, }, /* 149 */
+  {    19,      5,     12,     43,    -15, }, /* 150 */
+  {    19,      5,     12,     47,    -22, }, /* 151 */
+  {    19,      5,     12,      0,     -8, }, /* 152 */
+  {    10,      9,     12,      0,      1, }, /* 153 */
+  {    10,      5,     12,      0,     -1, }, /* 154 */
+  {    19,      5,     12,     51,    -54, }, /* 155 */
+  {    19,      5,     12,     55,    -48, }, /* 156 */
+  {    19,      5,     12,      0,      7, }, /* 157 */
+  {    19,      9,     12,     38,    -60, }, /* 158 */
+  {    19,      5,     12,     59,    -64, }, /* 159 */
+  {    19,     25,     12,      0,      0, }, /* 160 */
+  {    19,      9,     12,      0,     -7, }, /* 161 */
+  {    19,      9,     12,      0,   -130, }, /* 162 */
+  {    12,      9,     12,      0,     80, }, /* 163 */
+  {    12,      9,     12,      0,     32, }, /* 164 */
+  {    12,      5,     12,      0,    -32, }, /* 165 */
+  {    12,      5,     12,      0,    -80, }, /* 166 */
+  {    12,      9,     12,      0,      1, }, /* 167 */
+  {    12,      5,     12,      0,     -1, }, /* 168 */
+  {    12,     26,     12,      0,      0, }, /* 169 */
   {    12,     12,      3,      0,      0, }, /* 170 */
   {    12,     11,      3,      0,      0, }, /* 171 */
-  {    12,      9,     11,      0,     15, }, /* 172 */
-  {    12,      5,     11,      0,    -15, }, /* 173 */
-  {     1,      9,     11,      0,     48, }, /* 174 */
-  {     1,      6,     11,      0,      0, }, /* 175 */
-  {     1,     21,     11,      0,      0, }, /* 176 */
-  {     1,      5,     11,      0,    -48, }, /* 177 */
-  {     1,      5,     11,      0,      0, }, /* 178 */
-  {     1,     17,     11,      0,      0, }, /* 179 */
-  {     1,     23,     11,      0,      0, }, /* 180 */
+  {    12,      9,     12,      0,     15, }, /* 172 */
+  {    12,      5,     12,      0,    -15, }, /* 173 */
+  {     1,      9,     12,      0,     48, }, /* 174 */
+  {     1,      6,     12,      0,      0, }, /* 175 */
+  {     1,     21,     12,      0,      0, }, /* 176 */
+  {     1,      5,     12,      0,    -48, }, /* 177 */
+  {     1,      5,     12,      0,      0, }, /* 178 */
+  {     1,     17,     12,      0,      0, }, /* 179 */
+  {     1,     23,     12,      0,      0, }, /* 180 */
   {    25,     12,      3,      0,      0, }, /* 181 */
-  {    25,     17,     11,      0,      0, }, /* 182 */
-  {    25,     21,     11,      0,      0, }, /* 183 */
-  {    25,      7,     11,      0,      0, }, /* 184 */
+  {    25,     17,     12,      0,      0, }, /* 182 */
+  {    25,     21,     12,      0,      0, }, /* 183 */
+  {    25,      7,     12,      0,      0, }, /* 184 */
   {     0,      1,      2,      0,      0, }, /* 185 */
-  {     0,     25,     11,      0,      0, }, /* 186 */
-  {     0,     21,     11,      0,      0, }, /* 187 */
-  {     0,     23,     11,      0,      0, }, /* 188 */
-  {     0,     26,     11,      0,      0, }, /* 189 */
+  {     0,     25,     12,      0,      0, }, /* 186 */
+  {     0,     21,     12,      0,      0, }, /* 187 */
+  {     0,     23,     12,      0,      0, }, /* 188 */
+  {     0,     26,     12,      0,      0, }, /* 189 */
   {     0,     12,      3,      0,      0, }, /* 190 */
-  {     0,      7,     11,      0,      0, }, /* 191 */
-  {     0,      6,     11,      0,      0, }, /* 192 */
-  {     0,     13,     11,      0,      0, }, /* 193 */
-  {    49,     21,     11,      0,      0, }, /* 194 */
+  {     0,      7,     12,      0,      0, }, /* 191 */
+  {     0,      6,     12,      0,      0, }, /* 192 */
+  {     0,     13,     12,      0,      0, }, /* 193 */
+  {    49,     21,     12,      0,      0, }, /* 194 */
   {    49,      1,      2,      0,      0, }, /* 195 */
-  {    49,      7,     11,      0,      0, }, /* 196 */
+  {    49,      7,     12,      0,      0, }, /* 196 */
   {    49,     12,      3,      0,      0, }, /* 197 */
-  {    55,      7,     11,      0,      0, }, /* 198 */
+  {    55,      7,     12,      0,      0, }, /* 198 */
   {    55,     12,      3,      0,      0, }, /* 199 */
-  {    63,     13,     11,      0,      0, }, /* 200 */
-  {    63,      7,     11,      0,      0, }, /* 201 */
+  {    63,     13,     12,      0,      0, }, /* 200 */
+  {    63,      7,     12,      0,      0, }, /* 201 */
   {    63,     12,      3,      0,      0, }, /* 202 */
-  {    63,      6,     11,      0,      0, }, /* 203 */
-  {    63,     26,     11,      0,      0, }, /* 204 */
-  {    63,     21,     11,      0,      0, }, /* 205 */
-  {    89,      7,     11,      0,      0, }, /* 206 */
+  {    63,      6,     12,      0,      0, }, /* 203 */
+  {    63,     26,     12,      0,      0, }, /* 204 */
+  {    63,     21,     12,      0,      0, }, /* 205 */
+  {    89,      7,     12,      0,      0, }, /* 206 */
   {    89,     12,      3,      0,      0, }, /* 207 */
-  {    89,      6,     11,      0,      0, }, /* 208 */
-  {    89,     21,     11,      0,      0, }, /* 209 */
-  {    94,      7,     11,      0,      0, }, /* 210 */
+  {    89,      6,     12,      0,      0, }, /* 208 */
+  {    89,     21,     12,      0,      0, }, /* 209 */
+  {    94,      7,     12,      0,      0, }, /* 210 */
   {    94,     12,      3,      0,      0, }, /* 211 */
-  {    94,     21,     11,      0,      0, }, /* 212 */
+  {    94,     21,     12,      0,      0, }, /* 212 */
   {    14,     12,      3,      0,      0, }, /* 213 */
   {    14,     10,      5,      0,      0, }, /* 214 */
-  {    14,      7,     11,      0,      0, }, /* 215 */
-  {    14,     13,     11,      0,      0, }, /* 216 */
-  {    14,     21,     11,      0,      0, }, /* 217 */
-  {    14,      6,     11,      0,      0, }, /* 218 */
+  {    14,      7,     12,      0,      0, }, /* 215 */
+  {    14,     13,     12,      0,      0, }, /* 216 */
+  {    14,     21,     12,      0,      0, }, /* 217 */
+  {    14,      6,     12,      0,      0, }, /* 218 */
   {     2,     12,      3,      0,      0, }, /* 219 */
   {     2,     10,      5,      0,      0, }, /* 220 */
-  {     2,      7,     11,      0,      0, }, /* 221 */
+  {     2,      7,     12,      0,      0, }, /* 221 */
   {     2,     10,      3,      0,      0, }, /* 222 */
-  {     2,     13,     11,      0,      0, }, /* 223 */
-  {     2,     23,     11,      0,      0, }, /* 224 */
-  {     2,     15,     11,      0,      0, }, /* 225 */
-  {     2,     26,     11,      0,      0, }, /* 226 */
+  {     2,     13,     12,      0,      0, }, /* 223 */
+  {     2,     23,     12,      0,      0, }, /* 224 */
+  {     2,     15,     12,      0,      0, }, /* 225 */
+  {     2,     26,     12,      0,      0, }, /* 226 */
   {    21,     12,      3,      0,      0, }, /* 227 */
   {    21,     10,      5,      0,      0, }, /* 228 */
-  {    21,      7,     11,      0,      0, }, /* 229 */
-  {    21,     13,     11,      0,      0, }, /* 230 */
+  {    21,      7,     12,      0,      0, }, /* 229 */
+  {    21,     13,     12,      0,      0, }, /* 230 */
   {    20,     12,      3,      0,      0, }, /* 231 */
   {    20,     10,      5,      0,      0, }, /* 232 */
-  {    20,      7,     11,      0,      0, }, /* 233 */
-  {    20,     13,     11,      0,      0, }, /* 234 */
-  {    20,     21,     11,      0,      0, }, /* 235 */
-  {    20,     23,     11,      0,      0, }, /* 236 */
+  {    20,      7,     12,      0,      0, }, /* 233 */
+  {    20,     13,     12,      0,      0, }, /* 234 */
+  {    20,     21,     12,      0,      0, }, /* 235 */
+  {    20,     23,     12,      0,      0, }, /* 236 */
   {    43,     12,      3,      0,      0, }, /* 237 */
   {    43,     10,      5,      0,      0, }, /* 238 */
-  {    43,      7,     11,      0,      0, }, /* 239 */
+  {    43,      7,     12,      0,      0, }, /* 239 */
   {    43,     10,      3,      0,      0, }, /* 240 */
-  {    43,     13,     11,      0,      0, }, /* 241 */
-  {    43,     26,     11,      0,      0, }, /* 242 */
-  {    43,     15,     11,      0,      0, }, /* 243 */
+  {    43,     13,     12,      0,      0, }, /* 241 */
+  {    43,     26,     12,      0,      0, }, /* 242 */
+  {    43,     15,     12,      0,      0, }, /* 243 */
   {    53,     12,      3,      0,      0, }, /* 244 */
-  {    53,      7,     11,      0,      0, }, /* 245 */
+  {    53,      7,     12,      0,      0, }, /* 245 */
   {    53,     10,      3,      0,      0, }, /* 246 */
   {    53,     10,      5,      0,      0, }, /* 247 */
-  {    53,     13,     11,      0,      0, }, /* 248 */
-  {    53,     15,     11,      0,      0, }, /* 249 */
-  {    53,     26,     11,      0,      0, }, /* 250 */
-  {    53,     23,     11,      0,      0, }, /* 251 */
+  {    53,     13,     12,      0,      0, }, /* 248 */
+  {    53,     15,     12,      0,      0, }, /* 249 */
+  {    53,     26,     12,      0,      0, }, /* 250 */
+  {    53,     23,     12,      0,      0, }, /* 251 */
   {    54,     10,      5,      0,      0, }, /* 252 */
-  {    54,      7,     11,      0,      0, }, /* 253 */
+  {    54,      7,     12,      0,      0, }, /* 253 */
   {    54,     12,      3,      0,      0, }, /* 254 */
-  {    54,     13,     11,      0,      0, }, /* 255 */
-  {    54,     15,     11,      0,      0, }, /* 256 */
-  {    54,     26,     11,      0,      0, }, /* 257 */
+  {    54,     13,     12,      0,      0, }, /* 255 */
+  {    54,     15,     12,      0,      0, }, /* 256 */
+  {    54,     26,     12,      0,      0, }, /* 257 */
   {    28,     10,      5,      0,      0, }, /* 258 */
-  {    28,      7,     11,      0,      0, }, /* 259 */
+  {    28,      7,     12,      0,      0, }, /* 259 */
   {    28,     12,      3,      0,      0, }, /* 260 */
   {    28,     10,      3,      0,      0, }, /* 261 */
-  {    28,     13,     11,      0,      0, }, /* 262 */
+  {    28,     13,     12,      0,      0, }, /* 262 */
   {    36,     10,      5,      0,      0, }, /* 263 */
-  {    36,      7,     11,      0,      0, }, /* 264 */
+  {    36,      7,     12,      0,      0, }, /* 264 */
   {    36,     10,      3,      0,      0, }, /* 265 */
   {    36,     12,      3,      0,      0, }, /* 266 */
-  {    36,     13,     11,      0,      0, }, /* 267 */
-  {    36,     15,     11,      0,      0, }, /* 268 */
-  {    36,     26,     11,      0,      0, }, /* 269 */
+  {    36,     13,     12,      0,      0, }, /* 267 */
+  {    36,     15,     12,      0,      0, }, /* 268 */
+  {    36,     26,     12,      0,      0, }, /* 269 */
   {    47,     10,      5,      0,      0, }, /* 270 */
-  {    47,      7,     11,      0,      0, }, /* 271 */
+  {    47,      7,     12,      0,      0, }, /* 271 */
   {    47,     12,      3,      0,      0, }, /* 272 */
   {    47,     10,      3,      0,      0, }, /* 273 */
-  {    47,     21,     11,      0,      0, }, /* 274 */
-  {    56,      7,     11,      0,      0, }, /* 275 */
+  {    47,     21,     12,      0,      0, }, /* 274 */
+  {    56,      7,     12,      0,      0, }, /* 275 */
   {    56,     12,      3,      0,      0, }, /* 276 */
   {    56,      7,      5,      0,      0, }, /* 277 */
-  {    56,      6,     11,      0,      0, }, /* 278 */
-  {    56,     21,     11,      0,      0, }, /* 279 */
-  {    56,     13,     11,      0,      0, }, /* 280 */
-  {    32,      7,     11,      0,      0, }, /* 281 */
+  {    56,      6,     12,      0,      0, }, /* 278 */
+  {    56,     21,     12,      0,      0, }, /* 279 */
+  {    56,     13,     12,      0,      0, }, /* 280 */
+  {    32,      7,     12,      0,      0, }, /* 281 */
   {    32,     12,      3,      0,      0, }, /* 282 */
   {    32,      7,      5,      0,      0, }, /* 283 */
-  {    32,      6,     11,      0,      0, }, /* 284 */
-  {    32,     13,     11,      0,      0, }, /* 285 */
-  {    57,      7,     11,      0,      0, }, /* 286 */
-  {    57,     26,     11,      0,      0, }, /* 287 */
-  {    57,     21,     11,      0,      0, }, /* 288 */
+  {    32,      6,     12,      0,      0, }, /* 284 */
+  {    32,     13,     12,      0,      0, }, /* 285 */
+  {    57,      7,     12,      0,      0, }, /* 286 */
+  {    57,     26,     12,      0,      0, }, /* 287 */
+  {    57,     21,     12,      0,      0, }, /* 288 */
   {    57,     12,      3,      0,      0, }, /* 289 */
-  {    57,     13,     11,      0,      0, }, /* 290 */
-  {    57,     15,     11,      0,      0, }, /* 291 */
-  {    57,     22,     11,      0,      0, }, /* 292 */
-  {    57,     18,     11,      0,      0, }, /* 293 */
+  {    57,     13,     12,      0,      0, }, /* 290 */
+  {    57,     15,     12,      0,      0, }, /* 291 */
+  {    57,     22,     12,      0,      0, }, /* 292 */
+  {    57,     18,     12,      0,      0, }, /* 293 */
   {    57,     10,      5,      0,      0, }, /* 294 */
-  {    38,      7,     11,      0,      0, }, /* 295 */
-  {    38,     10,     11,      0,      0, }, /* 296 */
+  {    38,      7,     12,      0,      0, }, /* 295 */
+  {    38,     10,     12,      0,      0, }, /* 296 */
   {    38,     12,      3,      0,      0, }, /* 297 */
   {    38,     10,      5,      0,      0, }, /* 298 */
-  {    38,     13,     11,      0,      0, }, /* 299 */
-  {    38,     21,     11,      0,      0, }, /* 300 */
-  {    38,     26,     11,      0,      0, }, /* 301 */
-  {    16,      9,     11,      0,   7264, }, /* 302 */
-  {    16,      7,     11,      0,      0, }, /* 303 */
-  {    16,      6,     11,      0,      0, }, /* 304 */
+  {    38,     13,     12,      0,      0, }, /* 299 */
+  {    38,     21,     12,      0,      0, }, /* 300 */
+  {    38,     26,     12,      0,      0, }, /* 301 */
+  {    16,      9,     12,      0,   7264, }, /* 302 */
+  {    16,      7,     12,      0,      0, }, /* 303 */
+  {    16,      6,     12,      0,      0, }, /* 304 */
   {    23,      7,      6,      0,      0, }, /* 305 */
   {    23,      7,      7,      0,      0, }, /* 306 */
   {    23,      7,      8,      0,      0, }, /* 307 */
-  {    15,      7,     11,      0,      0, }, /* 308 */
+  {    15,      7,     12,      0,      0, }, /* 308 */
   {    15,     12,      3,      0,      0, }, /* 309 */
-  {    15,     21,     11,      0,      0, }, /* 310 */
-  {    15,     15,     11,      0,      0, }, /* 311 */
-  {    15,     26,     11,      0,      0, }, /* 312 */
-  {     8,      7,     11,      0,      0, }, /* 313 */
-  {     7,     17,     11,      0,      0, }, /* 314 */
-  {     7,      7,     11,      0,      0, }, /* 315 */
-  {     7,     21,     11,      0,      0, }, /* 316 */
-  {    40,     29,     11,      0,      0, }, /* 317 */
-  {    40,      7,     11,      0,      0, }, /* 318 */
-  {    40,     22,     11,      0,      0, }, /* 319 */
-  {    40,     18,     11,      0,      0, }, /* 320 */
-  {    45,      7,     11,      0,      0, }, /* 321 */
-  {    45,     14,     11,      0,      0, }, /* 322 */
-  {    50,      7,     11,      0,      0, }, /* 323 */
+  {    15,     21,     12,      0,      0, }, /* 310 */
+  {    15,     15,     12,      0,      0, }, /* 311 */
+  {    15,     26,     12,      0,      0, }, /* 312 */
+  {     8,      7,     12,      0,      0, }, /* 313 */
+  {     7,     17,     12,      0,      0, }, /* 314 */
+  {     7,      7,     12,      0,      0, }, /* 315 */
+  {     7,     21,     12,      0,      0, }, /* 316 */
+  {    40,     29,     12,      0,      0, }, /* 317 */
+  {    40,      7,     12,      0,      0, }, /* 318 */
+  {    40,     22,     12,      0,      0, }, /* 319 */
+  {    40,     18,     12,      0,      0, }, /* 320 */
+  {    45,      7,     12,      0,      0, }, /* 321 */
+  {    45,     14,     12,      0,      0, }, /* 322 */
+  {    50,      7,     12,      0,      0, }, /* 323 */
   {    50,     12,      3,      0,      0, }, /* 324 */
-  {    24,      7,     11,      0,      0, }, /* 325 */
+  {    24,      7,     12,      0,      0, }, /* 325 */
   {    24,     12,      3,      0,      0, }, /* 326 */
-  {     6,      7,     11,      0,      0, }, /* 327 */
+  {     6,      7,     12,      0,      0, }, /* 327 */
   {     6,     12,      3,      0,      0, }, /* 328 */
-  {    51,      7,     11,      0,      0, }, /* 329 */
+  {    51,      7,     12,      0,      0, }, /* 329 */
   {    51,     12,      3,      0,      0, }, /* 330 */
-  {    31,      7,     11,      0,      0, }, /* 331 */
+  {    31,      7,     12,      0,      0, }, /* 331 */
   {    31,     12,      3,      0,      0, }, /* 332 */
   {    31,     10,      5,      0,      0, }, /* 333 */
-  {    31,     21,     11,      0,      0, }, /* 334 */
-  {    31,      6,     11,      0,      0, }, /* 335 */
-  {    31,     23,     11,      0,      0, }, /* 336 */
-  {    31,     13,     11,      0,      0, }, /* 337 */
-  {    31,     15,     11,      0,      0, }, /* 338 */
-  {    37,     21,     11,      0,      0, }, /* 339 */
-  {    37,     17,     11,      0,      0, }, /* 340 */
+  {    31,     21,     12,      0,      0, }, /* 334 */
+  {    31,      6,     12,      0,      0, }, /* 335 */
+  {    31,     23,     12,      0,      0, }, /* 336 */
+  {    31,     13,     12,      0,      0, }, /* 337 */
+  {    31,     15,     12,      0,      0, }, /* 338 */
+  {    37,     21,     12,      0,      0, }, /* 339 */
+  {    37,     17,     12,      0,      0, }, /* 340 */
   {    37,     12,      3,      0,      0, }, /* 341 */
-  {    37,     29,     11,      0,      0, }, /* 342 */
-  {    37,     13,     11,      0,      0, }, /* 343 */
-  {    37,      7,     11,      0,      0, }, /* 344 */
-  {    37,      6,     11,      0,      0, }, /* 345 */
-  {    34,      7,     11,      0,      0, }, /* 346 */
+  {    37,     29,     12,      0,      0, }, /* 342 */
+  {    37,     13,     12,      0,      0, }, /* 343 */
+  {    37,      7,     12,      0,      0, }, /* 344 */
+  {    37,      6,     12,      0,      0, }, /* 345 */
+  {    34,      7,     12,      0,      0, }, /* 346 */
   {    34,     12,      3,      0,      0, }, /* 347 */
   {    34,     10,      5,      0,      0, }, /* 348 */
-  {    34,     26,     11,      0,      0, }, /* 349 */
-  {    34,     21,     11,      0,      0, }, /* 350 */
-  {    34,     13,     11,      0,      0, }, /* 351 */
-  {    52,      7,     11,      0,      0, }, /* 352 */
-  {    39,      7,     11,      0,      0, }, /* 353 */
-  {    39,     10,     11,      0,      0, }, /* 354 */
+  {    34,     26,     12,      0,      0, }, /* 349 */
+  {    34,     21,     12,      0,      0, }, /* 350 */
+  {    34,     13,     12,      0,      0, }, /* 351 */
+  {    52,      7,     12,      0,      0, }, /* 352 */
+  {    39,      7,     12,      0,      0, }, /* 353 */
+  {    39,     10,     12,      0,      0, }, /* 354 */
   {    39,     10,      5,      0,      0, }, /* 355 */
-  {    39,     13,     11,      0,      0, }, /* 356 */
-  {    39,     15,     11,      0,      0, }, /* 357 */
-  {    39,     26,     11,      0,      0, }, /* 358 */
-  {    31,     26,     11,      0,      0, }, /* 359 */
-  {     5,      7,     11,      0,      0, }, /* 360 */
+  {    39,     13,     12,      0,      0, }, /* 356 */
+  {    39,     15,     12,      0,      0, }, /* 357 */
+  {    39,     26,     12,      0,      0, }, /* 358 */
+  {    31,     26,     12,      0,      0, }, /* 359 */
+  {     5,      7,     12,      0,      0, }, /* 360 */
   {     5,     12,      3,      0,      0, }, /* 361 */
   {     5,     10,      5,      0,      0, }, /* 362 */
-  {     5,     21,     11,      0,      0, }, /* 363 */
-  {    90,      7,     11,      0,      0, }, /* 364 */
+  {     5,     21,     12,      0,      0, }, /* 363 */
+  {    90,      7,     12,      0,      0, }, /* 364 */
   {    90,     10,      5,      0,      0, }, /* 365 */
   {    90,     12,      3,      0,      0, }, /* 366 */
-  {    90,     10,     11,      0,      0, }, /* 367 */
-  {    90,     13,     11,      0,      0, }, /* 368 */
-  {    90,     21,     11,      0,      0, }, /* 369 */
-  {    90,      6,     11,      0,      0, }, /* 370 */
+  {    90,     10,     12,      0,      0, }, /* 367 */
+  {    90,     13,     12,      0,      0, }, /* 368 */
+  {    90,     21,     12,      0,      0, }, /* 369 */
+  {    90,      6,     12,      0,      0, }, /* 370 */
   {    61,     12,      3,      0,      0, }, /* 371 */
   {    61,     10,      5,      0,      0, }, /* 372 */
-  {    61,      7,     11,      0,      0, }, /* 373 */
-  {    61,     13,     11,      0,      0, }, /* 374 */
-  {    61,     21,     11,      0,      0, }, /* 375 */
-  {    61,     26,     11,      0,      0, }, /* 376 */
+  {    61,      7,     12,      0,      0, }, /* 373 */
+  {    61,     13,     12,      0,      0, }, /* 374 */
+  {    61,     21,     12,      0,      0, }, /* 375 */
+  {    61,     26,     12,      0,      0, }, /* 376 */
   {    75,     12,      3,      0,      0, }, /* 377 */
   {    75,     10,      5,      0,      0, }, /* 378 */
-  {    75,      7,     11,      0,      0, }, /* 379 */
-  {    75,     13,     11,      0,      0, }, /* 380 */
-  {    92,      7,     11,      0,      0, }, /* 381 */
+  {    75,      7,     12,      0,      0, }, /* 379 */
+  {    75,     13,     12,      0,      0, }, /* 380 */
+  {    92,      7,     12,      0,      0, }, /* 381 */
   {    92,     12,      3,      0,      0, }, /* 382 */
   {    92,     10,      5,      0,      0, }, /* 383 */
-  {    92,     21,     11,      0,      0, }, /* 384 */
-  {    69,      7,     11,      0,      0, }, /* 385 */
+  {    92,     21,     12,      0,      0, }, /* 384 */
+  {    69,      7,     12,      0,      0, }, /* 385 */
   {    69,     10,      5,      0,      0, }, /* 386 */
   {    69,     12,      3,      0,      0, }, /* 387 */
-  {    69,     21,     11,      0,      0, }, /* 388 */
-  {    69,     13,     11,      0,      0, }, /* 389 */
-  {    72,     13,     11,      0,      0, }, /* 390 */
-  {    72,      7,     11,      0,      0, }, /* 391 */
-  {    72,      6,     11,      0,      0, }, /* 392 */
-  {    72,     21,     11,      0,      0, }, /* 393 */
-  {    75,     21,     11,      0,      0, }, /* 394 */
+  {    69,     21,     12,      0,      0, }, /* 388 */
+  {    69,     13,     12,      0,      0, }, /* 389 */
+  {    72,     13,     12,      0,      0, }, /* 390 */
+  {    72,      7,     12,      0,      0, }, /* 391 */
+  {    72,      6,     12,      0,      0, }, /* 392 */
+  {    72,     21,     12,      0,      0, }, /* 393 */
+  {    75,     21,     12,      0,      0, }, /* 394 */
   {     9,     10,      5,      0,      0, }, /* 395 */
-  {     9,      7,     11,      0,      0, }, /* 396 */
-  {    12,      5,     11,      0,      0, }, /* 397 */
-  {    12,      6,     11,      0,      0, }, /* 398 */
-  {    33,      5,     11,      0,  35332, }, /* 399 */
-  {    33,      5,     11,      0,   3814, }, /* 400 */
-  {    33,      9,     11,     63,      1, }, /* 401 */
-  {    33,      5,     11,     63,     -1, }, /* 402 */
-  {    33,      5,     11,     63,    -58, }, /* 403 */
-  {    33,      9,     11,      0,  -7615, }, /* 404 */
-  {    19,      5,     11,      0,      8, }, /* 405 */
-  {    19,      9,     11,      0,     -8, }, /* 406 */
-  {    19,      5,     11,      0,     74, }, /* 407 */
-  {    19,      5,     11,      0,     86, }, /* 408 */
-  {    19,      5,     11,      0,    100, }, /* 409 */
-  {    19,      5,     11,      0,    128, }, /* 410 */
-  {    19,      5,     11,      0,    112, }, /* 411 */
-  {    19,      5,     11,      0,    126, }, /* 412 */
-  {    19,      8,     11,      0,     -8, }, /* 413 */
-  {    19,      5,     11,      0,      9, }, /* 414 */
-  {    19,      9,     11,      0,    -74, }, /* 415 */
-  {    19,      8,     11,      0,     -9, }, /* 416 */
-  {    19,      5,     11,     21,  -7173, }, /* 417 */
-  {    19,      9,     11,      0,    -86, }, /* 418 */
-  {    19,      9,     11,      0,   -100, }, /* 419 */
-  {    19,      9,     11,      0,   -112, }, /* 420 */
-  {    19,      9,     11,      0,   -128, }, /* 421 */
-  {    19,      9,     11,      0,   -126, }, /* 422 */
+  {     9,      7,     12,      0,      0, }, /* 396 */
+  {    12,      5,     12,      0,      0, }, /* 397 */
+  {    12,      6,     12,      0,      0, }, /* 398 */
+  {    33,      5,     12,      0,  35332, }, /* 399 */
+  {    33,      5,     12,      0,   3814, }, /* 400 */
+  {    33,      9,     12,     63,      1, }, /* 401 */
+  {    33,      5,     12,     63,     -1, }, /* 402 */
+  {    33,      5,     12,     63,    -58, }, /* 403 */
+  {    33,      9,     12,      0,  -7615, }, /* 404 */
+  {    19,      5,     12,      0,      8, }, /* 405 */
+  {    19,      9,     12,      0,     -8, }, /* 406 */
+  {    19,      5,     12,      0,     74, }, /* 407 */
+  {    19,      5,     12,      0,     86, }, /* 408 */
+  {    19,      5,     12,      0,    100, }, /* 409 */
+  {    19,      5,     12,      0,    128, }, /* 410 */
+  {    19,      5,     12,      0,    112, }, /* 411 */
+  {    19,      5,     12,      0,    126, }, /* 412 */
+  {    19,      8,     12,      0,     -8, }, /* 413 */
+  {    19,      5,     12,      0,      9, }, /* 414 */
+  {    19,      9,     12,      0,    -74, }, /* 415 */
+  {    19,      8,     12,      0,     -9, }, /* 416 */
+  {    19,      5,     12,     21,  -7173, }, /* 417 */
+  {    19,      9,     12,      0,    -86, }, /* 418 */
+  {    19,      9,     12,      0,   -100, }, /* 419 */
+  {    19,      9,     12,      0,   -112, }, /* 420 */
+  {    19,      9,     12,      0,   -128, }, /* 421 */
+  {    19,      9,     12,      0,   -126, }, /* 422 */
   {    27,      1,      3,      0,      0, }, /* 423 */
   {     9,     27,      2,      0,      0, }, /* 424 */
   {     9,     28,      2,      0,      0, }, /* 425 */
   {     9,      2,      2,      0,      0, }, /* 426 */
   {    27,     11,      3,      0,      0, }, /* 427 */
-  {     9,      9,     11,      0,      0, }, /* 428 */
-  {     9,      5,     11,      0,      0, }, /* 429 */
-  {    19,      9,     11,     67,  -7517, }, /* 430 */
-  {    33,      9,     11,     71,  -8383, }, /* 431 */
-  {    33,      9,     11,     75,  -8262, }, /* 432 */
-  {    33,      9,     11,      0,     28, }, /* 433 */
-  {    33,      5,     11,      0,    -28, }, /* 434 */
-  {    33,     14,     11,      0,     16, }, /* 435 */
-  {    33,     14,     11,      0,    -16, }, /* 436 */
-  {    33,     14,     11,      0,      0, }, /* 437 */
-  {     9,     26,     11,      0,     26, }, /* 438 */
-  {     9,     26,     11,      0,    -26, }, /* 439 */
-  {     4,     26,     11,      0,      0, }, /* 440 */
-  {    17,      9,     11,      0,     48, }, /* 441 */
-  {    17,      5,     11,      0,    -48, }, /* 442 */
-  {    33,      9,     11,      0, -10743, }, /* 443 */
-  {    33,      9,     11,      0,  -3814, }, /* 444 */
-  {    33,      9,     11,      0, -10727, }, /* 445 */
-  {    33,      5,     11,      0, -10795, }, /* 446 */
-  {    33,      5,     11,      0, -10792, }, /* 447 */
-  {    33,      9,     11,      0, -10780, }, /* 448 */
-  {    33,      9,     11,      0, -10749, }, /* 449 */
-  {    33,      9,     11,      0, -10783, }, /* 450 */
-  {    33,      9,     11,      0, -10782, }, /* 451 */
-  {    33,      9,     11,      0, -10815, }, /* 452 */
-  {    10,      5,     11,      0,      0, }, /* 453 */
-  {    10,     26,     11,      0,      0, }, /* 454 */
+  {     9,      9,     12,      0,      0, }, /* 428 */
+  {     9,      5,     12,      0,      0, }, /* 429 */
+  {    19,      9,     12,     67,  -7517, }, /* 430 */
+  {    33,      9,     12,     71,  -8383, }, /* 431 */
+  {    33,      9,     12,     75,  -8262, }, /* 432 */
+  {    33,      9,     12,      0,     28, }, /* 433 */
+  {    33,      5,     12,      0,    -28, }, /* 434 */
+  {    33,     14,     12,      0,     16, }, /* 435 */
+  {    33,     14,     12,      0,    -16, }, /* 436 */
+  {    33,     14,     12,      0,      0, }, /* 437 */
+  {     9,     26,     12,      0,     26, }, /* 438 */
+  {     9,     26,     12,      0,    -26, }, /* 439 */
+  {     4,     26,     12,      0,      0, }, /* 440 */
+  {    17,      9,     12,      0,     48, }, /* 441 */
+  {    17,      5,     12,      0,    -48, }, /* 442 */
+  {    33,      9,     12,      0, -10743, }, /* 443 */
+  {    33,      9,     12,      0,  -3814, }, /* 444 */
+  {    33,      9,     12,      0, -10727, }, /* 445 */
+  {    33,      5,     12,      0, -10795, }, /* 446 */
+  {    33,      5,     12,      0, -10792, }, /* 447 */
+  {    33,      9,     12,      0, -10780, }, /* 448 */
+  {    33,      9,     12,      0, -10749, }, /* 449 */
+  {    33,      9,     12,      0, -10783, }, /* 450 */
+  {    33,      9,     12,      0, -10782, }, /* 451 */
+  {    33,      9,     12,      0, -10815, }, /* 452 */
+  {    10,      5,     12,      0,      0, }, /* 453 */
+  {    10,     26,     12,      0,      0, }, /* 454 */
   {    10,     12,      3,      0,      0, }, /* 455 */
-  {    10,     21,     11,      0,      0, }, /* 456 */
-  {    10,     15,     11,      0,      0, }, /* 457 */
-  {    16,      5,     11,      0,  -7264, }, /* 458 */
-  {    58,      7,     11,      0,      0, }, /* 459 */
-  {    58,      6,     11,      0,      0, }, /* 460 */
-  {    58,     21,     11,      0,      0, }, /* 461 */
+  {    10,     21,     12,      0,      0, }, /* 456 */
+  {    10,     15,     12,      0,      0, }, /* 457 */
+  {    16,      5,     12,      0,  -7264, }, /* 458 */
+  {    58,      7,     12,      0,      0, }, /* 459 */
+  {    58,      6,     12,      0,      0, }, /* 460 */
+  {    58,     21,     12,      0,      0, }, /* 461 */
   {    58,     12,      3,      0,      0, }, /* 462 */
-  {    22,     26,     11,      0,      0, }, /* 463 */
-  {    22,      6,     11,      0,      0, }, /* 464 */
-  {    22,     14,     11,      0,      0, }, /* 465 */
+  {    22,     26,     12,      0,      0, }, /* 463 */
+  {    22,      6,     12,      0,      0, }, /* 464 */
+  {    22,     14,     12,      0,      0, }, /* 465 */
   {    23,     10,      3,      0,      0, }, /* 466 */
-  {    26,      7,     11,      0,      0, }, /* 467 */
-  {    26,      6,     11,      0,      0, }, /* 468 */
-  {    29,      7,     11,      0,      0, }, /* 469 */
-  {    29,      6,     11,      0,      0, }, /* 470 */
-  {     3,      7,     11,      0,      0, }, /* 471 */
-  {    23,      7,     11,      0,      0, }, /* 472 */
-  {    23,     26,     11,      0,      0, }, /* 473 */
-  {    29,     26,     11,      0,      0, }, /* 474 */
-  {    22,      7,     11,      0,      0, }, /* 475 */
-  {    60,      7,     11,      0,      0, }, /* 476 */
-  {    60,      6,     11,      0,      0, }, /* 477 */
-  {    60,     26,     11,      0,      0, }, /* 478 */
-  {    85,      7,     11,      0,      0, }, /* 479 */
-  {    85,      6,     11,      0,      0, }, /* 480 */
-  {    85,     21,     11,      0,      0, }, /* 481 */
-  {    76,      7,     11,      0,      0, }, /* 482 */
-  {    76,      6,     11,      0,      0, }, /* 483 */
-  {    76,     21,     11,      0,      0, }, /* 484 */
-  {    76,     13,     11,      0,      0, }, /* 485 */
-  {    12,      7,     11,      0,      0, }, /* 486 */
-  {    12,     21,     11,      0,      0, }, /* 487 */
-  {    78,      7,     11,      0,      0, }, /* 488 */
-  {    78,     14,     11,      0,      0, }, /* 489 */
+  {    26,      7,     12,      0,      0, }, /* 467 */
+  {    26,      6,     12,      0,      0, }, /* 468 */
+  {    29,      7,     12,      0,      0, }, /* 469 */
+  {    29,      6,     12,      0,      0, }, /* 470 */
+  {     3,      7,     12,      0,      0, }, /* 471 */
+  {    23,      7,     12,      0,      0, }, /* 472 */
+  {    23,     26,     12,      0,      0, }, /* 473 */
+  {    29,     26,     12,      0,      0, }, /* 474 */
+  {    22,      7,     12,      0,      0, }, /* 475 */
+  {    60,      7,     12,      0,      0, }, /* 476 */
+  {    60,      6,     12,      0,      0, }, /* 477 */
+  {    60,     26,     12,      0,      0, }, /* 478 */
+  {    85,      7,     12,      0,      0, }, /* 479 */
+  {    85,      6,     12,      0,      0, }, /* 480 */
+  {    85,     21,     12,      0,      0, }, /* 481 */
+  {    76,      7,     12,      0,      0, }, /* 482 */
+  {    76,      6,     12,      0,      0, }, /* 483 */
+  {    76,     21,     12,      0,      0, }, /* 484 */
+  {    76,     13,     12,      0,      0, }, /* 485 */
+  {    12,      7,     12,      0,      0, }, /* 486 */
+  {    12,     21,     12,      0,      0, }, /* 487 */
+  {    78,      7,     12,      0,      0, }, /* 488 */
+  {    78,     14,     12,      0,      0, }, /* 489 */
   {    78,     12,      3,      0,      0, }, /* 490 */
-  {    78,     21,     11,      0,      0, }, /* 491 */
-  {    33,      9,     11,      0, -35332, }, /* 492 */
-  {    33,      9,     11,      0, -42280, }, /* 493 */
-  {    33,      9,     11,      0, -42308, }, /* 494 */
-  {    48,      7,     11,      0,      0, }, /* 495 */
+  {    78,     21,     12,      0,      0, }, /* 491 */
+  {    33,      9,     12,      0, -35332, }, /* 492 */
+  {    33,      9,     12,      0, -42280, }, /* 493 */
+  {    33,      9,     12,      0, -42308, }, /* 494 */
+  {    48,      7,     12,      0,      0, }, /* 495 */
   {    48,     12,      3,      0,      0, }, /* 496 */
   {    48,     10,      5,      0,      0, }, /* 497 */
-  {    48,     26,     11,      0,      0, }, /* 498 */
-  {    64,      7,     11,      0,      0, }, /* 499 */
-  {    64,     21,     11,      0,      0, }, /* 500 */
+  {    48,     26,     12,      0,      0, }, /* 498 */
+  {    64,      7,     12,      0,      0, }, /* 499 */
+  {    64,     21,     12,      0,      0, }, /* 500 */
   {    74,     10,      5,      0,      0, }, /* 501 */
-  {    74,      7,     11,      0,      0, }, /* 502 */
+  {    74,      7,     12,      0,      0, }, /* 502 */
   {    74,     12,      3,      0,      0, }, /* 503 */
-  {    74,     21,     11,      0,      0, }, /* 504 */
-  {    74,     13,     11,      0,      0, }, /* 505 */
-  {    68,     13,     11,      0,      0, }, /* 506 */
-  {    68,      7,     11,      0,      0, }, /* 507 */
+  {    74,     21,     12,      0,      0, }, /* 504 */
+  {    74,     13,     12,      0,      0, }, /* 505 */
+  {    68,     13,     12,      0,      0, }, /* 506 */
+  {    68,      7,     12,      0,      0, }, /* 507 */
   {    68,     12,      3,      0,      0, }, /* 508 */
-  {    68,     21,     11,      0,      0, }, /* 509 */
-  {    73,      7,     11,      0,      0, }, /* 510 */
+  {    68,     21,     12,      0,      0, }, /* 509 */
+  {    73,      7,     12,      0,      0, }, /* 510 */
   {    73,     12,      3,      0,      0, }, /* 511 */
   {    73,     10,      5,      0,      0, }, /* 512 */
-  {    73,     21,     11,      0,      0, }, /* 513 */
+  {    73,     21,     12,      0,      0, }, /* 513 */
   {    83,     12,      3,      0,      0, }, /* 514 */
   {    83,     10,      5,      0,      0, }, /* 515 */
-  {    83,      7,     11,      0,      0, }, /* 516 */
-  {    83,     21,     11,      0,      0, }, /* 517 */
-  {    83,      6,     11,      0,      0, }, /* 518 */
-  {    83,     13,     11,      0,      0, }, /* 519 */
-  {    67,      7,     11,      0,      0, }, /* 520 */
+  {    83,      7,     12,      0,      0, }, /* 516 */
+  {    83,     21,     12,      0,      0, }, /* 517 */
+  {    83,      6,     12,      0,      0, }, /* 518 */
+  {    83,     13,     12,      0,      0, }, /* 519 */
+  {    67,      7,     12,      0,      0, }, /* 520 */
   {    67,     12,      3,      0,      0, }, /* 521 */
   {    67,     10,      5,      0,      0, }, /* 522 */
-  {    67,     13,     11,      0,      0, }, /* 523 */
-  {    67,     21,     11,      0,      0, }, /* 524 */
-  {    38,      6,     11,      0,      0, }, /* 525 */
-  {    91,      7,     11,      0,      0, }, /* 526 */
+  {    67,     13,     12,      0,      0, }, /* 523 */
+  {    67,     21,     12,      0,      0, }, /* 524 */
+  {    38,      6,     12,      0,      0, }, /* 525 */
+  {    91,      7,     12,      0,      0, }, /* 526 */
   {    91,     12,      3,      0,      0, }, /* 527 */
-  {    91,      6,     11,      0,      0, }, /* 528 */
-  {    91,     21,     11,      0,      0, }, /* 529 */
-  {    86,      7,     11,      0,      0, }, /* 530 */
+  {    91,      6,     12,      0,      0, }, /* 528 */
+  {    91,     21,     12,      0,      0, }, /* 529 */
+  {    86,      7,     12,      0,      0, }, /* 530 */
   {    86,     10,      5,      0,      0, }, /* 531 */
   {    86,     12,      3,      0,      0, }, /* 532 */
-  {    86,     21,     11,      0,      0, }, /* 533 */
-  {    86,      6,     11,      0,      0, }, /* 534 */
-  {    86,     13,     11,      0,      0, }, /* 535 */
+  {    86,     21,     12,      0,      0, }, /* 533 */
+  {    86,      6,     12,      0,      0, }, /* 534 */
+  {    86,     13,     12,      0,      0, }, /* 535 */
   {    23,      7,      9,      0,      0, }, /* 536 */
   {    23,      7,     10,      0,      0, }, /* 537 */
   {     9,      4,      2,      0,      0, }, /* 538 */
-  {     9,      3,     11,      0,      0, }, /* 539 */
-  {    25,     25,     11,      0,      0, }, /* 540 */
-  {     0,     24,     11,      0,      0, }, /* 541 */
+  {     9,      3,     12,      0,      0, }, /* 539 */
+  {    25,     25,     12,      0,      0, }, /* 540 */
+  {     0,     24,     12,      0,      0, }, /* 541 */
   {     9,      6,      3,      0,      0, }, /* 542 */
-  {    35,      7,     11,      0,      0, }, /* 543 */
-  {    19,     14,     11,      0,      0, }, /* 544 */
-  {    19,     15,     11,      0,      0, }, /* 545 */
-  {    19,     26,     11,      0,      0, }, /* 546 */
-  {    70,      7,     11,      0,      0, }, /* 547 */
-  {    66,      7,     11,      0,      0, }, /* 548 */
-  {    41,      7,     11,      0,      0, }, /* 549 */
-  {    41,     15,     11,      0,      0, }, /* 550 */
-  {    18,      7,     11,      0,      0, }, /* 551 */
-  {    18,     14,     11,      0,      0, }, /* 552 */
-  {    59,      7,     11,      0,      0, }, /* 553 */
-  {    59,     21,     11,      0,      0, }, /* 554 */
-  {    42,      7,     11,      0,      0, }, /* 555 */
-  {    42,     21,     11,      0,      0, }, /* 556 */
-  {    42,     14,     11,      0,      0, }, /* 557 */
-  {    13,      9,     11,      0,     40, }, /* 558 */
-  {    13,      5,     11,      0,    -40, }, /* 559 */
-  {    46,      7,     11,      0,      0, }, /* 560 */
-  {    44,      7,     11,      0,      0, }, /* 561 */
-  {    44,     13,     11,      0,      0, }, /* 562 */
-  {    11,      7,     11,      0,      0, }, /* 563 */
-  {    80,      7,     11,      0,      0, }, /* 564 */
-  {    80,     21,     11,      0,      0, }, /* 565 */
-  {    80,     15,     11,      0,      0, }, /* 566 */
-  {    65,      7,     11,      0,      0, }, /* 567 */
-  {    65,     15,     11,      0,      0, }, /* 568 */
-  {    65,     21,     11,      0,      0, }, /* 569 */
-  {    71,      7,     11,      0,      0, }, /* 570 */
-  {    71,     21,     11,      0,      0, }, /* 571 */
-  {    97,      7,     11,      0,      0, }, /* 572 */
-  {    96,      7,     11,      0,      0, }, /* 573 */
-  {    30,      7,     11,      0,      0, }, /* 574 */
+  {    35,      7,     12,      0,      0, }, /* 543 */
+  {    19,     14,     12,      0,      0, }, /* 544 */
+  {    19,     15,     12,      0,      0, }, /* 545 */
+  {    19,     26,     12,      0,      0, }, /* 546 */
+  {    70,      7,     12,      0,      0, }, /* 547 */
+  {    66,      7,     12,      0,      0, }, /* 548 */
+  {    41,      7,     12,      0,      0, }, /* 549 */
+  {    41,     15,     12,      0,      0, }, /* 550 */
+  {    18,      7,     12,      0,      0, }, /* 551 */
+  {    18,     14,     12,      0,      0, }, /* 552 */
+  {    59,      7,     12,      0,      0, }, /* 553 */
+  {    59,     21,     12,      0,      0, }, /* 554 */
+  {    42,      7,     12,      0,      0, }, /* 555 */
+  {    42,     21,     12,      0,      0, }, /* 556 */
+  {    42,     14,     12,      0,      0, }, /* 557 */
+  {    13,      9,     12,      0,     40, }, /* 558 */
+  {    13,      5,     12,      0,    -40, }, /* 559 */
+  {    46,      7,     12,      0,      0, }, /* 560 */
+  {    44,      7,     12,      0,      0, }, /* 561 */
+  {    44,     13,     12,      0,      0, }, /* 562 */
+  {    11,      7,     12,      0,      0, }, /* 563 */
+  {    80,      7,     12,      0,      0, }, /* 564 */
+  {    80,     21,     12,      0,      0, }, /* 565 */
+  {    80,     15,     12,      0,      0, }, /* 566 */
+  {    65,      7,     12,      0,      0, }, /* 567 */
+  {    65,     15,     12,      0,      0, }, /* 568 */
+  {    65,     21,     12,      0,      0, }, /* 569 */
+  {    71,      7,     12,      0,      0, }, /* 570 */
+  {    71,     21,     12,      0,      0, }, /* 571 */
+  {    97,      7,     12,      0,      0, }, /* 572 */
+  {    96,      7,     12,      0,      0, }, /* 573 */
+  {    30,      7,     12,      0,      0, }, /* 574 */
   {    30,     12,      3,      0,      0, }, /* 575 */
-  {    30,     15,     11,      0,      0, }, /* 576 */
-  {    30,     21,     11,      0,      0, }, /* 577 */
-  {    87,      7,     11,      0,      0, }, /* 578 */
-  {    87,     15,     11,      0,      0, }, /* 579 */
-  {    87,     21,     11,      0,      0, }, /* 580 */
-  {    77,      7,     11,      0,      0, }, /* 581 */
-  {    77,     21,     11,      0,      0, }, /* 582 */
-  {    82,      7,     11,      0,      0, }, /* 583 */
-  {    82,     15,     11,      0,      0, }, /* 584 */
-  {    81,      7,     11,      0,      0, }, /* 585 */
-  {    81,     15,     11,      0,      0, }, /* 586 */
-  {    88,      7,     11,      0,      0, }, /* 587 */
-  {     0,     15,     11,      0,      0, }, /* 588 */
+  {    30,     15,     12,      0,      0, }, /* 576 */
+  {    30,     21,     12,      0,      0, }, /* 577 */
+  {    87,      7,     12,      0,      0, }, /* 578 */
+  {    87,     15,     12,      0,      0, }, /* 579 */
+  {    87,     21,     12,      0,      0, }, /* 580 */
+  {    77,      7,     12,      0,      0, }, /* 581 */
+  {    77,     21,     12,      0,      0, }, /* 582 */
+  {    82,      7,     12,      0,      0, }, /* 583 */
+  {    82,     15,     12,      0,      0, }, /* 584 */
+  {    81,      7,     12,      0,      0, }, /* 585 */
+  {    81,     15,     12,      0,      0, }, /* 586 */
+  {    88,      7,     12,      0,      0, }, /* 587 */
+  {     0,     15,     12,      0,      0, }, /* 588 */
   {    93,     10,      5,      0,      0, }, /* 589 */
   {    93,     12,      3,      0,      0, }, /* 590 */
-  {    93,      7,     11,      0,      0, }, /* 591 */
-  {    93,     21,     11,      0,      0, }, /* 592 */
-  {    93,     15,     11,      0,      0, }, /* 593 */
-  {    93,     13,     11,      0,      0, }, /* 594 */
+  {    93,      7,     12,      0,      0, }, /* 591 */
+  {    93,     21,     12,      0,      0, }, /* 592 */
+  {    93,     15,     12,      0,      0, }, /* 593 */
+  {    93,     13,     12,      0,      0, }, /* 594 */
   {    84,     12,      3,      0,      0, }, /* 595 */
   {    84,     10,      5,      0,      0, }, /* 596 */
-  {    84,      7,     11,      0,      0, }, /* 597 */
-  {    84,     21,     11,      0,      0, }, /* 598 */
+  {    84,      7,     12,      0,      0, }, /* 597 */
+  {    84,     21,     12,      0,      0, }, /* 598 */
   {    84,      1,      2,      0,      0, }, /* 599 */
-  {   100,      7,     11,      0,      0, }, /* 600 */
-  {   100,     13,     11,      0,      0, }, /* 601 */
+  {   100,      7,     12,      0,      0, }, /* 600 */
+  {   100,     13,     12,      0,      0, }, /* 601 */
   {    95,     12,      3,      0,      0, }, /* 602 */
-  {    95,      7,     11,      0,      0, }, /* 603 */
+  {    95,      7,     12,      0,      0, }, /* 603 */
   {    95,     10,      5,      0,      0, }, /* 604 */
-  {    95,     13,     11,      0,      0, }, /* 605 */
-  {    95,     21,     11,      0,      0, }, /* 606 */
+  {    95,     13,     12,      0,      0, }, /* 605 */
+  {    95,     21,     12,      0,      0, }, /* 606 */
   {    99,     12,      3,      0,      0, }, /* 607 */
   {    99,     10,      5,      0,      0, }, /* 608 */
-  {    99,      7,     11,      0,      0, }, /* 609 */
-  {    99,     21,     11,      0,      0, }, /* 610 */
-  {    99,     13,     11,      0,      0, }, /* 611 */
-  {   101,      7,     11,      0,      0, }, /* 612 */
+  {    99,      7,     12,      0,      0, }, /* 609 */
+  {    99,     21,     12,      0,      0, }, /* 610 */
+  {    99,     13,     12,      0,      0, }, /* 611 */
+  {   101,      7,     12,      0,      0, }, /* 612 */
   {   101,     12,      3,      0,      0, }, /* 613 */
   {   101,     10,      5,      0,      0, }, /* 614 */
-  {   101,     13,     11,      0,      0, }, /* 615 */
-  {    62,      7,     11,      0,      0, }, /* 616 */
-  {    62,     14,     11,      0,      0, }, /* 617 */
-  {    62,     21,     11,      0,      0, }, /* 618 */
-  {    79,      7,     11,      0,      0, }, /* 619 */
-  {    98,      7,     11,      0,      0, }, /* 620 */
+  {   101,     13,     12,      0,      0, }, /* 615 */
+  {    62,      7,     12,      0,      0, }, /* 616 */
+  {    62,     14,     12,      0,      0, }, /* 617 */
+  {    62,     21,     12,      0,      0, }, /* 618 */
+  {    79,      7,     12,      0,      0, }, /* 619 */
+  {    98,      7,     12,      0,      0, }, /* 620 */
   {    98,     10,      5,      0,      0, }, /* 621 */
   {    98,     12,      3,      0,      0, }, /* 622 */
-  {    98,      6,     11,      0,      0, }, /* 623 */
+  {    98,      6,     12,      0,      0, }, /* 623 */
   {     9,     10,      3,      0,      0, }, /* 624 */
   {    19,     12,      3,      0,      0, }, /* 625 */
-  {    26,     26,     11,      0,      0, }, /* 626 */
+  {     9,     26,     11,      0,      0, }, /* 626 */
+  {    26,     26,     12,      0,      0, }, /* 627 */
 };


const pcre_uint8 PRIV(ucd_stage1)[] = { /* 8704 bytes */
@@ -1383,7 +1384,7 @@
191,191,191,191,191,191,191,191,191,191,191,191,191,191,191,191,
191,191,191,191,191,191,191,191,191,191,191,191,191,191,191,191,
102,191,191,191,191,191,191,191,191,191,191,104,104,104,104,104,
-104,104,104,104,104,104,190,190,190,190,190,190,190,190,190,104,
+104,104,104,104,104,104,190,190,190,190,190,190,190,190,190,190,
10, 10, 10, 10, 10, 10, 10, 10, 10, 10,187,187,187,187,191,191,
104,191,191,191,191,191,191,191,191,191,191,191,191,191,191,191,

@@ -1891,7 +1892,7 @@
23, 23, 23, 23, 23, 23, 23, 23, 23, 23, 8, 8, 8, 6, 7,109,
101,101,101,101,101,101,101,101,101,101,101,101,101,109,109,109,
5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
- 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,109,109,109,109,109,109,
+ 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,109,109,109,109,109,
109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
104,104,104,104,104,104,104,104,104,104,104,104,104,427,427,427,
427,104,427,427,427,104,104,104,104,104,104,104,104,104,104,104,
@@ -3104,11 +3105,11 @@
109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,109,
-109,109,109,109,109,109, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
- 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
+109,109,109,109,109,109,626,626,626,626,626,626,626,626,626,626,
+626,626,626,626,626,626,626,626,626,626,626,626,626,626,626,626,

/* block 185 */
-626, 19, 19,109,109,109,109,109,109,109,109,109,109,109,109,109,
+627, 19, 19,109,109,109,109,109,109,109,109,109,109,109,109,109,
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,
19, 19, 19, 19, 19, 19, 19, 19, 19, 19, 19,109,109,109,109,109,

Modified: code/trunk/testdata/testinput6
===================================================================
--- code/trunk/testdata/testinput6    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/testdata/testinput6    2012-09-30 18:20:10 UTC (rev 1050)
@@ -671,6 +671,7 @@
     \x{65c} 
     \x{65d} 
     \x{65e} 
+    \x{65f}
     \x{66a} 
     \x{6e9} 
     \x{6ef}
@@ -682,7 +683,6 @@
     \x{653}  
     \x{654} 
     \x{655} 
-    \x{65f}  


 /^\p{Cyrillic}/8
     \x{1d2b} 


Modified: code/trunk/testdata/testoutput6
===================================================================
--- code/trunk/testdata/testoutput6    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/testdata/testoutput6    2012-09-30 18:20:10 UTC (rev 1050)
@@ -1145,6 +1145,8 @@
  0: \x{65d}
     \x{65e} 
  0: \x{65e}
+    \x{65f}
+ 0: \x{65f}
     \x{66a} 
  0: \x{66a}
     \x{6e9} 
@@ -1167,8 +1169,6 @@
 No match
     \x{655} 
 No match
-    \x{65f}  
-No match


 /^\p{Cyrillic}/8
     \x{1d2b} 


Modified: code/trunk/ucp.h
===================================================================
--- code/trunk/ucp.h    2012-09-29 04:07:46 UTC (rev 1049)
+++ code/trunk/ucp.h    2012-09-30 18:20:10 UTC (rev 1050)
@@ -65,18 +65,19 @@
 the number to 16 or more, the code will have to be rewritten. */


 enum {
-  ucp_gbCR,             /*  0 */
-  ucp_gbLF,             /*  1 */
-  ucp_gbControl,        /*  2 */
-  ucp_gbExtend,         /*  3 */
-  ucp_gbPrepend,        /*  4 */
-  ucp_gbSpacingMark,    /*  5 */
-  ucp_gbL,              /*  6 Hangul syllable type L */
-  ucp_gbV,              /*  7 Hangul syllable type V */
-  ucp_gbT,              /*  8 Hangul syllable type T */
-  ucp_gbLV,             /*  9 Hangul syllable type LV */
-  ucp_gbLVT,            /* 10 Hangul syllable type LVT */
-  ucp_gbOther           /* 11 */
+  ucp_gbCR,                /*  0 */
+  ucp_gbLF,                /*  1 */
+  ucp_gbControl,           /*  2 */
+  ucp_gbExtend,            /*  3 */
+  ucp_gbPrepend,           /*  4 */
+  ucp_gbSpacingMark,       /*  5 */
+  ucp_gbL,                 /*  6 Hangul syllable type L */
+  ucp_gbV,                 /*  7 Hangul syllable type V */
+  ucp_gbT,                 /*  8 Hangul syllable type T */
+  ucp_gbLV,                /*  9 Hangul syllable type LV */
+  ucp_gbLVT,               /* 10 Hangul syllable type LVT */
+  ucp_gbRegionalIndicator, /* 11 */
+  ucp_gbOther              /* 12 */
 };


/* These are the script identifications. */