diff --git a/maint/GenerateCommon.py b/maint/GenerateCommon.py index 03f9ac559..58896d565 100644 --- a/maint/GenerateCommon.py +++ b/maint/GenerateCommon.py @@ -16,32 +16,32 @@ # DATA LISTS # --------------------------------------------------------------------------- -# BIDI classes in the DerivedBidiClass.txt file, with comments. +# BIDI classes in the DerivedBidiClass.txt file, short and long identifiers. bidi_classes = [ - 'AL', 'Arabic letter', - 'AN', 'Arabic number', - 'B', 'Paragraph separator', - 'BN', 'Boundary neutral', - 'CS', 'Common separator', - 'EN', 'European number', - 'ES', 'European separator', - 'ET', 'European terminator', - 'FSI', 'First strong isolate', - 'L', 'Left to right', - 'LRE', 'Left to right embedding', - 'LRI', 'Left to right isolate', - 'LRO', 'Left to right override', - 'NSM', 'Non-spacing mark', - 'ON', 'Other neutral', - 'PDF', 'Pop directional format', - 'PDI', 'Pop directional isolate', - 'R', 'Right to left', - 'RLE', 'Right to left embedding', - 'RLI', 'Right to left isolate', - 'RLO', 'Right to left override', - 'S', 'Segment separator', - 'WS', 'White space' + 'AL', 'Arabic_Letter', + 'AN', 'Arabic_Number', + 'B', 'Paragraph_Separator', + 'BN', 'Boundary_Neutral', + 'CS', 'Common_Separator', + 'EN', 'European_Number', + 'ES', 'European_Separator', + 'ET', 'European_Terminator', + 'FSI', 'First_Strong_Isolate', + 'L', 'Left_To_Right', + 'LRE', 'Left_To_Right_Embedding', + 'LRI', 'Left_To_Right_Isolate', + 'LRO', 'Left_To_Right_Override', + 'NSM', 'Nonspacing_Mark', + 'ON', 'Other_Neutral', + 'PDF', 'Pop_Directional_Format', + 'PDI', 'Pop_Directional_Isolate', + 'R', 'Right_To_Left', + 'RLE', 'Right_To_Left_Embedding', + 'RLI', 'Right_To_Left_Isolate', + 'RLO', 'Right_To_Left_Override', + 'S', 'Segment_Separator', + 'WS', 'White_Space' ] # Particular category property names, with comments. NOTE: If ever this list diff --git a/maint/GenerateUcd.py b/maint/GenerateUcd.py index 583f5722d..9ad4ea556 100755 --- a/maint/GenerateUcd.py +++ b/maint/GenerateUcd.py @@ -271,19 +271,27 @@ # --------------------------------------------------------------------------- -# Parse a line of Scripts.txt, GraphemeBreakProperty.txt, DerivedBidiClass.txt -# or DerivedGeneralCategory.txt +# Parse a line of Scripts.txt, GraphemeBreakProperty.txt or DerivedGeneralCategory.txt def make_get_names(enum): return lambda chardata: enum.index(chardata[1]) +# Parse a line of DerivedBidiClass.txt + +def get_bidi(chardata): + if len(chardata[1]) > 3: + return bidi_classes_long.index(chardata[1]) + else: + return bidi_classes_short.index(chardata[1]) + + # Parse a line of CaseFolding.txt def get_other_case(chardata): if chardata[1] == 'C' or chardata[1] == 'S': return int(chardata[2], 16) - int(chardata[0], 16) - return 0 + return None # Parse a line of ScriptExtensions.txt @@ -318,11 +326,16 @@ def read_table(file_name, get_value, default_value): table = [default_value] * MAX_UNICODE for line in file: + if file_base == 'DerivedBidiClass': + line = re.sub(r'# @missing: ', '', line) + line = re.sub(r'#.*', '', line) chardata = list(map(str.strip, line.split(';'))) if len(chardata) <= 1: continue value = get_value(chardata) + if value is None: + continue m = re.match(r'([0-9a-fA-F]+)(\.\.([0-9a-fA-F]+))?$', chardata[0]) char = int(m.group(1), 16) if m.group(3) is None: @@ -330,11 +343,8 @@ def read_table(file_name, get_value, default_value): else: last = int(m.group(3), 16) for i in range(char, last + 1): - # It is important not to overwrite a previously set value because in the - # CaseFolding file there are lines to be ignored (returning the default - # value of 0) which often come after a line which has already set data. - if table[i] == default_value: - table[i] = value + table[i] = value + file.close() return table @@ -508,7 +518,8 @@ def write_bitsets(list, item_size): # strings for use by GenerateUcpHeader. The comments are not wanted here, so # remove them. -bidi_classes = bidi_classes[::2] +bidi_classes_short = bidi_classes[::2] +bidi_classes_long = bidi_classes[1::2] break_properties = break_properties[::2] category_names = category_names[::2] @@ -518,7 +529,7 @@ def write_bitsets(list, item_size): category = read_table('Unicode.tables/DerivedGeneralCategory.txt', make_get_names(category_names), category_names.index('Cn')) break_props = read_table('Unicode.tables/GraphemeBreakProperty.txt', make_get_names(break_properties), break_properties.index('Other')) other_case = read_table('Unicode.tables/CaseFolding.txt', get_other_case, 0) -bidi_class = read_table('Unicode.tables/DerivedBidiClass.txt', make_get_names(bidi_classes), bidi_classes.index('L')) +bidi_class = read_table('Unicode.tables/DerivedBidiClass.txt', get_bidi, bidi_classes_short.index('L')) # The grapheme breaking rules were changed for Unicode 11.0.0 (June 2018). Now # we need to find the Extended_Pictographic property for emoji characters. This diff --git a/maint/Unicode.tables/DerivedBidiClass.txt b/maint/Unicode.tables/DerivedBidiClass.txt index 11b6a450d..55b30a66c 100644 --- a/maint/Unicode.tables/DerivedBidiClass.txt +++ b/maint/Unicode.tables/DerivedBidiClass.txt @@ -1188,172 +1188,107 @@ F0000..FFFFD ; L # Co [65534] .. # Bidi_Class=Right_To_Left -0590 ; R # Cn 05BE ; R # Pd HEBREW PUNCTUATION MAQAF 05C0 ; R # Po HEBREW PUNCTUATION PASEQ 05C3 ; R # Po HEBREW PUNCTUATION SOF PASUQ 05C6 ; R # Po HEBREW PUNCTUATION NUN HAFUKHA -05C8..05CF ; R # Cn [8] .. 05D0..05EA ; R # Lo [27] HEBREW LETTER ALEF..HEBREW LETTER TAV -05EB..05EE ; R # Cn [4] .. 05EF..05F2 ; R # Lo [4] HEBREW YOD TRIANGLE..HEBREW LIGATURE YIDDISH DOUBLE YOD 05F3..05F4 ; R # Po [2] HEBREW PUNCTUATION GERESH..HEBREW PUNCTUATION GERSHAYIM -05F5..05FF ; R # Cn [11] .. 07C0..07C9 ; R # Nd [10] NKO DIGIT ZERO..NKO DIGIT NINE 07CA..07EA ; R # Lo [33] NKO LETTER A..NKO LETTER JONA RA 07F4..07F5 ; R # Lm [2] NKO HIGH TONE APOSTROPHE..NKO LOW TONE APOSTROPHE 07FA ; R # Lm NKO LAJANYALAN -07FB..07FC ; R # Cn [2] .. 07FE..07FF ; R # Sc [2] NKO DOROME SIGN..NKO TAMAN SIGN 0800..0815 ; R # Lo [22] SAMARITAN LETTER ALAF..SAMARITAN LETTER TAAF 081A ; R # Lm SAMARITAN MODIFIER LETTER EPENTHETIC YUT 0824 ; R # Lm SAMARITAN MODIFIER LETTER SHORT A 0828 ; R # Lm SAMARITAN MODIFIER LETTER I -082E..082F ; R # Cn [2] .. 0830..083E ; R # Po [15] SAMARITAN PUNCTUATION NEQUDAA..SAMARITAN PUNCTUATION ANNAAU -083F ; R # Cn 0840..0858 ; R # Lo [25] MANDAIC LETTER HALQA..MANDAIC LETTER AIN -085C..085D ; R # Cn [2] .. 085E ; R # Po MANDAIC PUNCTUATION -085F ; R # Cn 200F ; R # Cf RIGHT-TO-LEFT MARK FB1D ; R # Lo HEBREW LETTER YOD WITH HIRIQ FB1F..FB28 ; R # Lo [10] HEBREW LIGATURE YIDDISH YOD YOD PATAH..HEBREW LETTER WIDE TAV FB2A..FB36 ; R # Lo [13] HEBREW LETTER SHIN WITH SHIN DOT..HEBREW LETTER ZAYIN WITH DAGESH -FB37 ; R # Cn FB38..FB3C ; R # Lo [5] HEBREW LETTER TET WITH DAGESH..HEBREW LETTER LAMED WITH DAGESH -FB3D ; R # Cn FB3E ; R # Lo HEBREW LETTER MEM WITH DAGESH -FB3F ; R # Cn FB40..FB41 ; R # Lo [2] HEBREW LETTER NUN WITH DAGESH..HEBREW LETTER SAMEKH WITH DAGESH -FB42 ; R # Cn FB43..FB44 ; R # Lo [2] HEBREW LETTER FINAL PE WITH DAGESH..HEBREW LETTER PE WITH DAGESH -FB45 ; R # Cn FB46..FB4F ; R # Lo [10] HEBREW LETTER TSADI WITH DAGESH..HEBREW LIGATURE ALEF LAMED 10800..10805 ; R # Lo [6] CYPRIOT SYLLABLE A..CYPRIOT SYLLABLE JA -10806..10807 ; R # Cn [2] .. 10808 ; R # Lo CYPRIOT SYLLABLE JO -10809 ; R # Cn 1080A..10835 ; R # Lo [44] CYPRIOT SYLLABLE KA..CYPRIOT SYLLABLE WO -10836 ; R # Cn 10837..10838 ; R # Lo [2] CYPRIOT SYLLABLE XA..CYPRIOT SYLLABLE XE -10839..1083B ; R # Cn [3] .. 1083C ; R # Lo CYPRIOT SYLLABLE ZA -1083D..1083E ; R # Cn [2] .. 1083F..10855 ; R # Lo [23] CYPRIOT SYLLABLE ZO..IMPERIAL ARAMAIC LETTER TAW -10856 ; R # Cn 10857 ; R # Po IMPERIAL ARAMAIC SECTION SIGN 10858..1085F ; R # No [8] IMPERIAL ARAMAIC NUMBER ONE..IMPERIAL ARAMAIC NUMBER TEN THOUSAND 10860..10876 ; R # Lo [23] PALMYRENE LETTER ALEPH..PALMYRENE LETTER TAW 10877..10878 ; R # So [2] PALMYRENE LEFT-POINTING FLEURON..PALMYRENE RIGHT-POINTING FLEURON 10879..1087F ; R # No [7] PALMYRENE NUMBER ONE..PALMYRENE NUMBER TWENTY 10880..1089E ; R # Lo [31] NABATAEAN LETTER FINAL ALEPH..NABATAEAN LETTER TAW -1089F..108A6 ; R # Cn [8] .. 108A7..108AF ; R # No [9] NABATAEAN NUMBER ONE..NABATAEAN NUMBER ONE HUNDRED -108B0..108DF ; R # Cn [48] .. 108E0..108F2 ; R # Lo [19] HATRAN LETTER ALEPH..HATRAN LETTER QOPH -108F3 ; R # Cn 108F4..108F5 ; R # Lo [2] HATRAN LETTER SHIN..HATRAN LETTER TAW -108F6..108FA ; R # Cn [5] .. 108FB..108FF ; R # No [5] HATRAN NUMBER ONE..HATRAN NUMBER ONE HUNDRED 10900..10915 ; R # Lo [22] PHOENICIAN LETTER ALF..PHOENICIAN LETTER TAU 10916..1091B ; R # No [6] PHOENICIAN NUMBER ONE..PHOENICIAN NUMBER THREE -1091C..1091E ; R # Cn [3] .. 10920..10939 ; R # Lo [26] LYDIAN LETTER A..LYDIAN LETTER C -1093A..1093E ; R # Cn [5] .. 1093F ; R # Po LYDIAN TRIANGULAR MARK -10940..1097F ; R # Cn [64] .. 10980..109B7 ; R # Lo [56] MEROITIC HIEROGLYPHIC LETTER A..MEROITIC CURSIVE LETTER DA -109B8..109BB ; R # Cn [4] .. 109BC..109BD ; R # No [2] MEROITIC CURSIVE FRACTION ELEVEN TWELFTHS..MEROITIC CURSIVE FRACTION ONE HALF 109BE..109BF ; R # Lo [2] MEROITIC CURSIVE LOGOGRAM RMT..MEROITIC CURSIVE LOGOGRAM IMN 109C0..109CF ; R # No [16] MEROITIC CURSIVE NUMBER ONE..MEROITIC CURSIVE NUMBER SEVENTY -109D0..109D1 ; R # Cn [2] .. 109D2..109FF ; R # No [46] MEROITIC CURSIVE NUMBER ONE HUNDRED..MEROITIC CURSIVE FRACTION TEN TWELFTHS 10A00 ; R # Lo KHAROSHTHI LETTER A -10A04 ; R # Cn -10A07..10A0B ; R # Cn [5] .. 10A10..10A13 ; R # Lo [4] KHAROSHTHI LETTER KA..KHAROSHTHI LETTER GHA -10A14 ; R # Cn 10A15..10A17 ; R # Lo [3] KHAROSHTHI LETTER CA..KHAROSHTHI LETTER JA -10A18 ; R # Cn 10A19..10A35 ; R # Lo [29] KHAROSHTHI LETTER NYA..KHAROSHTHI LETTER VHA -10A36..10A37 ; R # Cn [2] .. -10A3B..10A3E ; R # Cn [4] .. 10A40..10A48 ; R # No [9] KHAROSHTHI DIGIT ONE..KHAROSHTHI FRACTION ONE HALF -10A49..10A4F ; R # Cn [7] .. 10A50..10A58 ; R # Po [9] KHAROSHTHI PUNCTUATION DOT..KHAROSHTHI PUNCTUATION LINES -10A59..10A5F ; R # Cn [7] .. 10A60..10A7C ; R # Lo [29] OLD SOUTH ARABIAN LETTER HE..OLD SOUTH ARABIAN LETTER THETH 10A7D..10A7E ; R # No [2] OLD SOUTH ARABIAN NUMBER ONE..OLD SOUTH ARABIAN NUMBER FIFTY 10A7F ; R # Po OLD SOUTH ARABIAN NUMERIC INDICATOR 10A80..10A9C ; R # Lo [29] OLD NORTH ARABIAN LETTER HEH..OLD NORTH ARABIAN LETTER ZAH 10A9D..10A9F ; R # No [3] OLD NORTH ARABIAN NUMBER ONE..OLD NORTH ARABIAN NUMBER TWENTY -10AA0..10ABF ; R # Cn [32] .. 10AC0..10AC7 ; R # Lo [8] MANICHAEAN LETTER ALEPH..MANICHAEAN LETTER WAW 10AC8 ; R # So MANICHAEAN SIGN UD 10AC9..10AE4 ; R # Lo [28] MANICHAEAN LETTER ZAYIN..MANICHAEAN LETTER TAW -10AE7..10AEA ; R # Cn [4] .. 10AEB..10AEF ; R # No [5] MANICHAEAN NUMBER ONE..MANICHAEAN NUMBER ONE HUNDRED 10AF0..10AF6 ; R # Po [7] MANICHAEAN PUNCTUATION STAR..MANICHAEAN PUNCTUATION LINE FILLER -10AF7..10AFF ; R # Cn [9] .. 10B00..10B35 ; R # Lo [54] AVESTAN LETTER A..AVESTAN LETTER HE -10B36..10B38 ; R # Cn [3] .. 10B40..10B55 ; R # Lo [22] INSCRIPTIONAL PARTHIAN LETTER ALEPH..INSCRIPTIONAL PARTHIAN LETTER TAW -10B56..10B57 ; R # Cn [2] .. 10B58..10B5F ; R # No [8] INSCRIPTIONAL PARTHIAN NUMBER ONE..INSCRIPTIONAL PARTHIAN NUMBER ONE THOUSAND 10B60..10B72 ; R # Lo [19] INSCRIPTIONAL PAHLAVI LETTER ALEPH..INSCRIPTIONAL PAHLAVI LETTER TAW -10B73..10B77 ; R # Cn [5] .. 10B78..10B7F ; R # No [8] INSCRIPTIONAL PAHLAVI NUMBER ONE..INSCRIPTIONAL PAHLAVI NUMBER ONE THOUSAND 10B80..10B91 ; R # Lo [18] PSALTER PAHLAVI LETTER ALEPH..PSALTER PAHLAVI LETTER TAW -10B92..10B98 ; R # Cn [7] .. 10B99..10B9C ; R # Po [4] PSALTER PAHLAVI SECTION MARK..PSALTER PAHLAVI FOUR DOTS WITH DOT -10B9D..10BA8 ; R # Cn [12] .. 10BA9..10BAF ; R # No [7] PSALTER PAHLAVI NUMBER ONE..PSALTER PAHLAVI NUMBER ONE HUNDRED -10BB0..10BFF ; R # Cn [80] .. 10C00..10C48 ; R # Lo [73] OLD TURKIC LETTER ORKHON A..OLD TURKIC LETTER ORKHON BASH -10C49..10C7F ; R # Cn [55] .. 10C80..10CB2 ; R # L& [51] OLD HUNGARIAN CAPITAL LETTER A..OLD HUNGARIAN CAPITAL LETTER US -10CB3..10CBF ; R # Cn [13] .. 10CC0..10CF2 ; R # L& [51] OLD HUNGARIAN SMALL LETTER A..OLD HUNGARIAN SMALL LETTER US -10CF3..10CF9 ; R # Cn [7] .. 10CFA..10CFF ; R # No [6] OLD HUNGARIAN NUMBER ONE..OLD HUNGARIAN NUMBER ONE THOUSAND -10D40..10E5F ; R # Cn [288] .. -10E7F ; R # Cn 10E80..10EA9 ; R # Lo [42] YEZIDI LETTER ELIF..YEZIDI LETTER ET -10EAA ; R # Cn 10EAD ; R # Pd YEZIDI HYPHENATION MARK -10EAE..10EAF ; R # Cn [2] .. 10EB0..10EB1 ; R # Lo [2] YEZIDI LETTER LAM WITH DOT ABOVE..YEZIDI LETTER YOT WITH CIRCUMFLEX ABOVE -10EB2..10EFF ; R # Cn [78] .. 10F00..10F1C ; R # Lo [29] OLD SOGDIAN LETTER ALEPH..OLD SOGDIAN LETTER FINAL TAW WITH VERTICAL TAIL 10F1D..10F26 ; R # No [10] OLD SOGDIAN NUMBER ONE..OLD SOGDIAN FRACTION ONE HALF 10F27 ; R # Lo OLD SOGDIAN LIGATURE AYIN-DALETH -10F28..10F2F ; R # Cn [8] .. 10F70..10F81 ; R # Lo [18] OLD UYGHUR LETTER ALEPH..OLD UYGHUR LETTER LESH 10F86..10F89 ; R # Po [4] OLD UYGHUR PUNCTUATION BAR..OLD UYGHUR PUNCTUATION FOUR DOTS -10F8A..10FAF ; R # Cn [38] .. 10FB0..10FC4 ; R # Lo [21] CHORASMIAN LETTER ALEPH..CHORASMIAN LETTER TAW 10FC5..10FCB ; R # No [7] CHORASMIAN NUMBER ONE..CHORASMIAN NUMBER ONE HUNDRED -10FCC..10FDF ; R # Cn [20] .. 10FE0..10FF6 ; R # Lo [23] ELYMAIC LETTER ALEPH..ELYMAIC LIGATURE ZAYIN-YODH -10FF7..10FFF ; R # Cn [9] .. 1E800..1E8C4 ; R # Lo [197] MENDE KIKAKUI SYLLABLE M001 KI..MENDE KIKAKUI SYLLABLE M060 NYON -1E8C5..1E8C6 ; R # Cn [2] .. 1E8C7..1E8CF ; R # No [9] MENDE KIKAKUI DIGIT ONE..MENDE KIKAKUI DIGIT NINE -1E8D7..1E8FF ; R # Cn [41] .. 1E900..1E943 ; R # L& [68] ADLAM CAPITAL LETTER ALIF..ADLAM SMALL LETTER SHA 1E94B ; R # Lm ADLAM NASALIZATION MARK -1E94C..1E94F ; R # Cn [4] .. 1E950..1E959 ; R # Nd [10] ADLAM DIGIT ZERO..ADLAM DIGIT NINE -1E95A..1E95D ; R # Cn [4] .. 1E95E..1E95F ; R # Po [2] ADLAM INITIAL EXCLAMATION MARK..ADLAM INITIAL QUESTION MARK -1E960..1EC6F ; R # Cn [784] .. -1ECC0..1ECFF ; R # Cn [64] .. -1ED50..1EDFF ; R # Cn [176] .. -1EF00..1EFFF ; R # Cn [256] .. -# Total code points: 3711 +# The above property value applies to 2156 code points not listed here. +# Total code points: 3647 # ================================================ @@ -1413,7 +1348,6 @@ FF0D ; ES # Pd FULLWIDTH HYPHEN-MINUS 17DB ; ET # Sc KHMER CURRENCY SYMBOL RIEL 2030..2034 ; ET # Po [5] PER MILLE SIGN..TRIPLE PRIME 20A0..20C0 ; ET # Sc [33] EURO-CURRENCY SIGN..SOM SIGN -20C1..20CF ; ET # Cn [15] .. 212E ; ET # So ESTIMATED SYMBOL 2213 ; ET # Sm MINUS-OR-PLUS SIGN A838 ; ET # Sc NORTH INDIC RUPEE MARK @@ -1429,6 +1363,7 @@ FFE5..FFE6 ; ET # Sc [2] FULLWIDTH YEN SIGN..FULLWIDTH WON SIGN 11FDD..11FE0 ; ET # Sc [4] TAMIL SIGN KAACU..TAMIL SIGN VARAAKAN 1E2FF ; ET # Sc WANCHO NGUN SIGN +# The above property value applies to 15 code points not listed here. # Total code points: 92 # ================================================ @@ -2437,125 +2372,74 @@ E0100..E01EF ; NSM # Mn [240] VARIATION SELECTOR-17..VARIATION SELECTOR-256 06FD..06FE ; AL # So [2] ARABIC SIGN SINDHI AMPERSAND..ARABIC SIGN SINDHI POSTPOSITION MEN 06FF ; AL # Lo ARABIC LETTER HEH WITH INVERTED V 0700..070D ; AL # Po [14] SYRIAC END OF PARAGRAPH..SYRIAC HARKLEAN ASTERISCUS -070E ; AL # Cn 070F ; AL # Cf SYRIAC ABBREVIATION MARK 0710 ; AL # Lo SYRIAC LETTER ALAPH 0712..072F ; AL # Lo [30] SYRIAC LETTER BETH..SYRIAC LETTER PERSIAN DHALATH -074B..074C ; AL # Cn [2] .. 074D..07A5 ; AL # Lo [89] SYRIAC LETTER SOGDIAN ZHAIN..THAANA LETTER WAAVU 07B1 ; AL # Lo THAANA LETTER NAA -07B2..07BF ; AL # Cn [14] .. 0860..086A ; AL # Lo [11] SYRIAC LETTER MALAYALAM NGA..SYRIAC LETTER MALAYALAM SSA -086B..086F ; AL # Cn [5] .. 0870..0887 ; AL # Lo [24] ARABIC LETTER ALEF WITH ATTACHED FATHA..ARABIC BASELINE ROUND DOT 0888 ; AL # Sk ARABIC RAISED ROUND DOT 0889..088E ; AL # Lo [6] ARABIC LETTER NOON WITH INVERTED SMALL V..ARABIC VERTICAL TAIL -088F ; AL # Cn -0892..0897 ; AL # Cn [6] .. 08A0..08C8 ; AL # Lo [41] ARABIC LETTER BEH WITH SMALL V BELOW..ARABIC LETTER GRAF 08C9 ; AL # Lm ARABIC SMALL FARSI YEH FB50..FBB1 ; AL # Lo [98] ARABIC LETTER ALEF WASLA ISOLATED FORM..ARABIC LETTER YEH BARREE WITH HAMZA ABOVE FINAL FORM FBB2..FBC2 ; AL # Sk [17] ARABIC SYMBOL DOT ABOVE..ARABIC SYMBOL WASLA ABOVE -FBC3..FBD2 ; AL # Cn [16] .. FBD3..FD3D ; AL # Lo [363] ARABIC LETTER NG ISOLATED FORM..ARABIC LIGATURE ALEF WITH FATHATAN ISOLATED FORM FD50..FD8F ; AL # Lo [64] ARABIC LIGATURE TEH WITH JEEM WITH MEEM INITIAL FORM..ARABIC LIGATURE MEEM WITH KHAH WITH MEEM INITIAL FORM -FD90..FD91 ; AL # Cn [2] .. FD92..FDC7 ; AL # Lo [54] ARABIC LIGATURE MEEM WITH JEEM WITH KHAH INITIAL FORM..ARABIC LIGATURE NOON WITH JEEM WITH YEH FINAL FORM -FDC8..FDCE ; AL # Cn [7] .. FDF0..FDFB ; AL # Lo [12] ARABIC LIGATURE SALLA USED AS KORANIC STOP SIGN ISOLATED FORM..ARABIC LIGATURE JALLAJALALOUHOU FDFC ; AL # Sc RIAL SIGN FE70..FE74 ; AL # Lo [5] ARABIC FATHATAN ISOLATED FORM..ARABIC KASRATAN ISOLATED FORM -FE75 ; AL # Cn FE76..FEFC ; AL # Lo [135] ARABIC FATHA ISOLATED FORM..ARABIC LIGATURE LAM WITH ALEF FINAL FORM -FEFD..FEFE ; AL # Cn [2] .. 10D00..10D23 ; AL # Lo [36] HANIFI ROHINGYA LETTER A..HANIFI ROHINGYA MARK NA KHONNA -10D28..10D2F ; AL # Cn [8] .. -10D3A..10D3F ; AL # Cn [6] .. 10F30..10F45 ; AL # Lo [22] SOGDIAN LETTER ALEPH..SOGDIAN INDEPENDENT SHIN 10F51..10F54 ; AL # No [4] SOGDIAN NUMBER ONE..SOGDIAN NUMBER ONE HUNDRED 10F55..10F59 ; AL # Po [5] SOGDIAN PUNCTUATION TWO VERTICAL BARS..SOGDIAN PUNCTUATION HALF CIRCLE WITH DOT -10F5A..10F6F ; AL # Cn [22] .. -1EC70 ; AL # Cn 1EC71..1ECAB ; AL # No [59] INDIC SIYAQ NUMBER ONE..INDIC SIYAQ NUMBER PREFIXED NINE 1ECAC ; AL # So INDIC SIYAQ PLACEHOLDER 1ECAD..1ECAF ; AL # No [3] INDIC SIYAQ FRACTION ONE QUARTER..INDIC SIYAQ FRACTION THREE QUARTERS 1ECB0 ; AL # Sc INDIC SIYAQ RUPEE MARK 1ECB1..1ECB4 ; AL # No [4] INDIC SIYAQ NUMBER ALTERNATE ONE..INDIC SIYAQ ALTERNATE LAKH MARK -1ECB5..1ECBF ; AL # Cn [11] .. -1ED00 ; AL # Cn 1ED01..1ED2D ; AL # No [45] OTTOMAN SIYAQ NUMBER ONE..OTTOMAN SIYAQ NUMBER NINETY THOUSAND 1ED2E ; AL # So OTTOMAN SIYAQ MARRATAN 1ED2F..1ED3D ; AL # No [15] OTTOMAN SIYAQ ALTERNATE NUMBER TWO..OTTOMAN SIYAQ FRACTION ONE SIXTH -1ED3E..1ED4F ; AL # Cn [18] .. 1EE00..1EE03 ; AL # Lo [4] ARABIC MATHEMATICAL ALEF..ARABIC MATHEMATICAL DAL -1EE04 ; AL # Cn 1EE05..1EE1F ; AL # Lo [27] ARABIC MATHEMATICAL WAW..ARABIC MATHEMATICAL DOTLESS QAF -1EE20 ; AL # Cn 1EE21..1EE22 ; AL # Lo [2] ARABIC MATHEMATICAL INITIAL BEH..ARABIC MATHEMATICAL INITIAL JEEM -1EE23 ; AL # Cn 1EE24 ; AL # Lo ARABIC MATHEMATICAL INITIAL HEH -1EE25..1EE26 ; AL # Cn [2] .. 1EE27 ; AL # Lo ARABIC MATHEMATICAL INITIAL HAH -1EE28 ; AL # Cn 1EE29..1EE32 ; AL # Lo [10] ARABIC MATHEMATICAL INITIAL YEH..ARABIC MATHEMATICAL INITIAL QAF -1EE33 ; AL # Cn 1EE34..1EE37 ; AL # Lo [4] ARABIC MATHEMATICAL INITIAL SHEEN..ARABIC MATHEMATICAL INITIAL KHAH -1EE38 ; AL # Cn 1EE39 ; AL # Lo ARABIC MATHEMATICAL INITIAL DAD -1EE3A ; AL # Cn 1EE3B ; AL # Lo ARABIC MATHEMATICAL INITIAL GHAIN -1EE3C..1EE41 ; AL # Cn [6] .. 1EE42 ; AL # Lo ARABIC MATHEMATICAL TAILED JEEM -1EE43..1EE46 ; AL # Cn [4] .. 1EE47 ; AL # Lo ARABIC MATHEMATICAL TAILED HAH -1EE48 ; AL # Cn 1EE49 ; AL # Lo ARABIC MATHEMATICAL TAILED YEH -1EE4A ; AL # Cn 1EE4B ; AL # Lo ARABIC MATHEMATICAL TAILED LAM -1EE4C ; AL # Cn 1EE4D..1EE4F ; AL # Lo [3] ARABIC MATHEMATICAL TAILED NOON..ARABIC MATHEMATICAL TAILED AIN -1EE50 ; AL # Cn 1EE51..1EE52 ; AL # Lo [2] ARABIC MATHEMATICAL TAILED SAD..ARABIC MATHEMATICAL TAILED QAF -1EE53 ; AL # Cn 1EE54 ; AL # Lo ARABIC MATHEMATICAL TAILED SHEEN -1EE55..1EE56 ; AL # Cn [2] .. 1EE57 ; AL # Lo ARABIC MATHEMATICAL TAILED KHAH -1EE58 ; AL # Cn 1EE59 ; AL # Lo ARABIC MATHEMATICAL TAILED DAD -1EE5A ; AL # Cn 1EE5B ; AL # Lo ARABIC MATHEMATICAL TAILED GHAIN -1EE5C ; AL # Cn 1EE5D ; AL # Lo ARABIC MATHEMATICAL TAILED DOTLESS NOON -1EE5E ; AL # Cn 1EE5F ; AL # Lo ARABIC MATHEMATICAL TAILED DOTLESS QAF -1EE60 ; AL # Cn 1EE61..1EE62 ; AL # Lo [2] ARABIC MATHEMATICAL STRETCHED BEH..ARABIC MATHEMATICAL STRETCHED JEEM -1EE63 ; AL # Cn 1EE64 ; AL # Lo ARABIC MATHEMATICAL STRETCHED HEH -1EE65..1EE66 ; AL # Cn [2] .. 1EE67..1EE6A ; AL # Lo [4] ARABIC MATHEMATICAL STRETCHED HAH..ARABIC MATHEMATICAL STRETCHED KAF -1EE6B ; AL # Cn 1EE6C..1EE72 ; AL # Lo [7] ARABIC MATHEMATICAL STRETCHED MEEM..ARABIC MATHEMATICAL STRETCHED QAF -1EE73 ; AL # Cn 1EE74..1EE77 ; AL # Lo [4] ARABIC MATHEMATICAL STRETCHED SHEEN..ARABIC MATHEMATICAL STRETCHED KHAH -1EE78 ; AL # Cn 1EE79..1EE7C ; AL # Lo [4] ARABIC MATHEMATICAL STRETCHED DAD..ARABIC MATHEMATICAL STRETCHED DOTLESS BEH -1EE7D ; AL # Cn 1EE7E ; AL # Lo ARABIC MATHEMATICAL STRETCHED DOTLESS FEH -1EE7F ; AL # Cn 1EE80..1EE89 ; AL # Lo [10] ARABIC MATHEMATICAL LOOPED ALEF..ARABIC MATHEMATICAL LOOPED YEH -1EE8A ; AL # Cn 1EE8B..1EE9B ; AL # Lo [17] ARABIC MATHEMATICAL LOOPED LAM..ARABIC MATHEMATICAL LOOPED GHAIN -1EE9C..1EEA0 ; AL # Cn [5] .. 1EEA1..1EEA3 ; AL # Lo [3] ARABIC MATHEMATICAL DOUBLE-STRUCK BEH..ARABIC MATHEMATICAL DOUBLE-STRUCK DAL -1EEA4 ; AL # Cn 1EEA5..1EEA9 ; AL # Lo [5] ARABIC MATHEMATICAL DOUBLE-STRUCK WAW..ARABIC MATHEMATICAL DOUBLE-STRUCK YEH -1EEAA ; AL # Cn 1EEAB..1EEBB ; AL # Lo [17] ARABIC MATHEMATICAL DOUBLE-STRUCK LAM..ARABIC MATHEMATICAL DOUBLE-STRUCK GHAIN -1EEBC..1EEEF ; AL # Cn [52] .. -1EEF2..1EEFF ; AL # Cn [14] .. -# Total code points: 1708 +# The above property value applies to 298 code points not listed here. +# Total code points: 1769 # ================================================ diff --git a/maint/ucptest.c b/maint/ucptest.c index 93822494a..0ef72fbc4 100644 --- a/maint/ucptest.c +++ b/maint/ucptest.c @@ -183,29 +183,29 @@ static const unsigned char *gb_names[] = { }; static const unsigned char *bd_names[] = { - US"AL", US"Arabic letter", - US"AN", US"Arabid number", - US"B", US"Paragraph separator", - US"BN", US"Boundary neutral", - US"CS", US"Common separator", - US"EN", US"European number", - US"ES", US"European separator", - US"ET", US"European terminator", - US"FSI", US"First string isolate", - US"L", US"Left-to-right", - US"LRE", US"Left-to-right embedding", - US"LRI", US"Left-to-right isolate", - US"LRO", US"Left-to-right override", - US"NSM", US"Non-spacing mark", - US"ON", US"Other neutral", - US"PDF", US"Pop directional format", - US"PDI", US"Pop directional isolate", - US"R", US"Right-to-left", - US"RLE", US"Right-to-left embedding", - US"RLI", US"Right-to-left isolate", - US"RLO", US"Right-to-left override", - US"S", US"Segment separator", - US"WS", US"White space" + US"AL", US"ArabicLetter", + US"AN", US"ArabicNumber", + US"B", US"ParagraphSeparator", + US"BN", US"BoundaryNeutral", + US"CS", US"CommonSeparator", + US"EN", US"EuropeanNumber", + US"ES", US"EuropeanSeparator", + US"ET", US"EuropeanTerminator", + US"FSI", US"FirstStrongIsolate", + US"L", US"LeftToRight", + US"LRE", US"LeftToRightEmbedding", + US"LRI", US"LeftToRightIsolate", + US"LRO", US"LeftToRightOverride", + US"NSM", US"NonspacingMark", + US"ON", US"OtherNeutral", + US"PDF", US"PopDirectionalFormat", + US"PDI", US"PopDirectionalIsolate", + US"R", US"RightToLeft", + US"RLE", US"RightToLeftEmbedding", + US"RLI", US"RightToLeftIsolate", + US"RLO", US"RightToLeftOverride", + US"S", US"SegmentSeparator", + US"WS", US"WhiteSpace" }; @@ -642,7 +642,7 @@ while (*s != 0) bidiclass_not = TRUE; offset = 1; } - for (i = 0; i < sizeof(bd_names)/sizeof(char *); i += 2) + for (i = 0; i < sizeof(bd_names)/sizeof(char *); i++) { if (strcasecmp(CS (value + offset), CCS bd_names[i]) == 0) { diff --git a/maint/ucptestdata/testinput2 b/maint/ucptestdata/testinput2 index a3c70da05..975b41331 100644 --- a/maint/ucptestdata/testinput2 +++ b/maint/ucptestdata/testinput2 @@ -14,6 +14,7 @@ find bidi RLI find bidi RLO find bidi S find bidi WS +find bidi white_space bool ascii find script bopo find bool prependedconcatenationmark find bool pcm diff --git a/maint/ucptestdata/testoutput1 b/maint/ucptestdata/testoutput1 index 7096190be..8cfc5d924 100644 --- a/maint/ucptestdata/testoutput1 +++ b/maint/ucptestdata/testoutput1 @@ -311,7 +311,7 @@ U+FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changesw findprop 10000 10001 e01ef f0000 100000 U+10000 L Letter: Other letter, linearb, Other, [alphabetic, diacritic, graphemebase, idcontinue, xidcontinue] U+10001 L Letter: Other letter, linearb, Other, [alphabetic, diacritic, graphemebase, idcontinue, xidcontinue] -U+E01EF NSM Mark: Non-spacing mark, inherited, Extend, [ascii, alphabetic, cased, emojicomponent] +U+E01EF NSM Mark: Non-spacing mark, inherited, Extend, [sentenceterminal, terminalpunctuation, uppercase, xidcontinue] U+F0000 L Control: Private use, unknown, Other U+100000 L Control: Private use, unknown, Other diff --git a/maint/ucptestdata/testoutput2 b/maint/ucptestdata/testoutput2 index 532d67433..5983dae74 100644 --- a/maint/ucptestdata/testoutput2 +++ b/maint/ucptestdata/testoutput2 @@ -29,12 +29,13 @@ U+FA70..U+FAD9 L Letter: Other letter, han, Other, [changeswhenuppercased, dep U+16FE3 L Letter: Modifier letter, han, Other, [emoji, emojimodifierbase, emojipresentation, extendedpictographic, graphemebase, patternsyntax] U+16FF0..U+16FF1 L Mark: Spacing mark, han, SpacingMark, [caseignorable, graphemeextend, idcontinue, ideographic, xidcontinue] U+20000..U+2A6DF L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] -U+2A700..U+2B738 L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] +U+2A700..U+2B739 L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+2B740..U+2B81D L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+2B820..U+2CEA1 L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+2CEB0..U+2EBE0 L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+2F800..U+2FA1D L Letter: Other letter, han, Other, [changeswhenuppercased, deprecated, emojimodifier, emojimodifierbase, emojipresentation, extendedpictographic, quotationmark, regionalindicator, xidcontinue, xidstart] U+30000..U+3134A L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] +U+31350..U+323AF L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] find type Pe script Common scriptx Hangul U+3009 ON Punctuation: Close punctuation, common, Other, [hangul, hiragana, katakana, bopomofo, han, yiii], [softdotted, terminalpunctuation, unifiedideograph, whitespace, xidcontinue] U+300B ON Punctuation: Close punctuation, common, Other, [hangul, hiragana, katakana, bopomofo, han, yiii], [softdotted, terminalpunctuation, unifiedideograph, whitespace, xidcontinue] @@ -254,6 +255,9 @@ U+2000..U+200A WS Separator: Space separator, common, Other, [alphabetic, casei U+2028 WS Separator: Line separator, common, Control, [caseignorable, defaultignorablecodepoint, graphemeextend, idcontinue, xidcontinue] U+205F WS Separator: Space separator, common, Other, [alphabetic, caseignorable, cased, diacritic, graphemebase, idcontinue, idstart, lowercase] U+3000 WS Separator: Space separator, common, Other, [alphabetic, caseignorable, cased, diacritic, graphemebase, idcontinue, idstart, lowercase] +find bidi white_space bool ascii +U+000C WS Control: Control, common, Control, [ascii, graphemebase, patternsyntax, sentenceterminal, terminalpunctuation] +U+0020 WS Separator: Space separator, common, Other, [ascii, emoji, emojicomponent, graphemebase, patternsyntax] find script bopo U+02EA..U+02EB ON Symbol: Modifier symbol, bopomofo, Other, [alphabetic, cased, graphemebase, idcontinue, idstart, math, uppercase, xidcontinue, xidstart] U+3105..U+312F L Letter: Other letter, bopomofo, Other, [alphabetic, diacritic, graphemebase, idcontinue, xidcontinue] @@ -287,7 +291,7 @@ U+FDD0..U+FDEF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, U+FF10..U+FF19 EN Number: Decimal number, common, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, noncharactercodepoint, patternwhitespace, prependedconcatenationmark] U+FFF9..U+FFFB ON Control: Format, common, Control, [changeswhencasemapped, changeswhentitlecased, emojimodifier, emojimodifierbase, graphemeextend, hexdigit, logicalorderexception, lowercase, math, noncharactercodepoint, patternsyntax, patternwhitespace, prependedconcatenationmark, quotationmark, radical, regionalindicator, sentenceterminal, softdotted, terminalpunctuation, unifiedideograph, uppercase, variationselector, whitespace, xidcontinue, xidstart] U+FFFE..U+FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, math, patternwhitespace, prependedconcatenationmark] -U+13430..U+13438 L Control: Format, egyptianhieroglyphs, Control, [changeswhencasemapped, changeswhentitlecased, emojimodifier, emojimodifierbase, graphemeextend, hexdigit, logicalorderexception, lowercase, math, noncharactercodepoint, patternsyntax, patternwhitespace, prependedconcatenationmark, quotationmark, radical, regionalindicator, sentenceterminal, softdotted, terminalpunctuation, unifiedideograph, uppercase, variationselector, whitespace, xidcontinue, xidstart] +U+13430..U+1343F L Control: Format, egyptianhieroglyphs, Control, [changeswhencasemapped, changeswhentitlecased, emojimodifier, emojimodifierbase, graphemeextend, hexdigit, logicalorderexception, lowercase, math, noncharactercodepoint, patternsyntax, patternwhitespace, prependedconcatenationmark, quotationmark, radical, regionalindicator, sentenceterminal, softdotted, terminalpunctuation, unifiedideograph, uppercase, variationselector, whitespace, xidcontinue, xidstart] U+1BCA0..U+1BCA3 BN Control: Format, common, Control, [duployan], [caseignorable, prependedconcatenationmark] U+1D16E..U+1D172 L Mark: Spacing mark, common, Extend, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, lowercase, prependedconcatenationmark, quotationmark, radical, regionalindicator, sentenceterminal, softdotted, terminalpunctuation, unifiedideograph, uppercase, variationselector, whitespace, xidcontinue, xidstart] U+1D173..U+1D17A BN Control: Format, common, Control, [caseignorable, prependedconcatenationmark] @@ -335,12 +339,13 @@ U+1F170..U+1F171 L Symbol: Other symbol, common, Extended Pictographic, [chang U+1F17E..U+1F17F L Symbol: Other symbol, common, Extended Pictographic, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, math, patternwhitespace, prependedconcatenationmark, quotationmark, radical, regionalindicator, sentenceterminal, softdotted, terminalpunctuation, unifiedideograph, uppercase, variationselector, whitespace, xidcontinue, xidstart] U+1FFFE..U+1FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, math, patternwhitespace, prependedconcatenationmark] U+20000..U+2A6DF L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] -U+2A700..U+2B738 L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] +U+2A700..U+2B739 L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+2B740..U+2B81D L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+2B820..U+2CEA1 L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+2CEB0..U+2EBE0 L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+2FFFE..U+2FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, math, patternwhitespace, prependedconcatenationmark] U+30000..U+3134A L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] +U+31350..U+323AF L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+3FFFE..U+3FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, math, patternwhitespace, prependedconcatenationmark] U+4FFFE..U+4FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, math, patternwhitespace, prependedconcatenationmark] U+5FFFE..U+5FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, math, patternwhitespace, prependedconcatenationmark] @@ -385,7 +390,7 @@ U+FDD0..U+FDEF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, U+FF10..U+FF19 EN Number: Decimal number, common, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, noncharactercodepoint, patternwhitespace, prependedconcatenationmark] U+FFF9..U+FFFB ON Control: Format, common, Control, [changeswhencasemapped, changeswhentitlecased, emojimodifier, emojimodifierbase, graphemeextend, hexdigit, logicalorderexception, lowercase, math, noncharactercodepoint, patternsyntax, patternwhitespace, prependedconcatenationmark, quotationmark, radical, regionalindicator, sentenceterminal, softdotted, terminalpunctuation, unifiedideograph, uppercase, variationselector, whitespace, xidcontinue, xidstart] U+FFFE..U+FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, math, patternwhitespace, prependedconcatenationmark] -U+13430..U+13438 L Control: Format, egyptianhieroglyphs, Control, [changeswhencasemapped, changeswhentitlecased, emojimodifier, emojimodifierbase, graphemeextend, hexdigit, logicalorderexception, lowercase, math, noncharactercodepoint, patternsyntax, patternwhitespace, prependedconcatenationmark, quotationmark, radical, regionalindicator, sentenceterminal, softdotted, terminalpunctuation, unifiedideograph, uppercase, variationselector, whitespace, xidcontinue, xidstart] +U+13430..U+1343F L Control: Format, egyptianhieroglyphs, Control, [changeswhencasemapped, changeswhentitlecased, emojimodifier, emojimodifierbase, graphemeextend, hexdigit, logicalorderexception, lowercase, math, noncharactercodepoint, patternsyntax, patternwhitespace, prependedconcatenationmark, quotationmark, radical, regionalindicator, sentenceterminal, softdotted, terminalpunctuation, unifiedideograph, uppercase, variationselector, whitespace, xidcontinue, xidstart] U+1BCA0..U+1BCA3 BN Control: Format, common, Control, [duployan], [caseignorable, prependedconcatenationmark] U+1D16E..U+1D172 L Mark: Spacing mark, common, Extend, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, lowercase, prependedconcatenationmark, quotationmark, radical, regionalindicator, sentenceterminal, softdotted, terminalpunctuation, unifiedideograph, uppercase, variationselector, whitespace, xidcontinue, xidstart] U+1D173..U+1D17A BN Control: Format, common, Control, [caseignorable, prependedconcatenationmark] @@ -433,12 +438,13 @@ U+1F170..U+1F171 L Symbol: Other symbol, common, Extended Pictographic, [chang U+1F17E..U+1F17F L Symbol: Other symbol, common, Extended Pictographic, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, math, patternwhitespace, prependedconcatenationmark, quotationmark, radical, regionalindicator, sentenceterminal, softdotted, terminalpunctuation, unifiedideograph, uppercase, variationselector, whitespace, xidcontinue, xidstart] U+1FFFE..U+1FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, math, patternwhitespace, prependedconcatenationmark] U+20000..U+2A6DF L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] -U+2A700..U+2B738 L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] +U+2A700..U+2B739 L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+2B740..U+2B81D L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+2B820..U+2CEA1 L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+2CEB0..U+2EBE0 L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+2FFFE..U+2FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, math, patternwhitespace, prependedconcatenationmark] U+30000..U+3134A L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] +U+31350..U+323AF L Letter: Other letter, han, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, logicalorderexception, lowercase, math, patternwhitespace, prependedconcatenationmark] U+3FFFE..U+3FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, math, patternwhitespace, prependedconcatenationmark] U+4FFFE..U+4FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, math, patternwhitespace, prependedconcatenationmark] U+5FFFE..U+5FFFF BN Control: Unassigned, unknown, Other, [changeswhencasemapped, changeswhenuppercased, emojimodifier, emojimodifierbase, joincontrol, logicalorderexception, math, patternwhitespace, prependedconcatenationmark] diff --git a/src/pcre2_ucd.c b/src/pcre2_ucd.c index 80d5f13a3..97dbc8b26 100644 --- a/src/pcre2_ucd.c +++ b/src/pcre2_ucd.c @@ -74,7 +74,7 @@ const uint16_t PRIV(ucd_stage2)[] = {0}; const uint32_t PRIV(ucd_caseless_sets)[] = {0}; #else -/* Total size: 112576 bytes, block size: 128. */ +/* Total size: 112564 bytes, block size: 128. */ const char *PRIV(unicode_version) = "15.0.0"; @@ -424,7 +424,7 @@ offset to multichar other cases or zero (8 bits), offset to other case or zero (32 bits, signed), bidi class (5 bits) and script extension (11 bits) packed into a 16-bit field, and offset in binary properties table (16 bits). */ -const ucd_record PRIV(ucd_records)[] = { /* 17088 bytes, record size 12 */ +const ucd_record PRIV(ucd_records)[] = { /* 17076 bytes, record size 12 */ { 69, 0, 2, 0, 0, 6144, 2, }, /* 0 */ { 69, 0, 2, 0, 0, 43008, 4, }, /* 1 */ { 69, 0, 1, 0, 0, 4096, 4, }, /* 2 */ @@ -1517,338 +1517,337 @@ const ucd_record PRIV(ucd_records)[] = { /* 17088 bytes, record size 12 */ { 65, 7, 12, 0, 0, 34816, 82, }, /* 1089 */ { 65, 12, 3, 0, 0, 26624, 130, }, /* 1090 */ { 65, 17, 12, 0, 0, 34816, 126, }, /* 1091 */ - { 3, 12, 3, 0, 0, 34816, 96, }, /* 1092 */ - { 152, 7, 12, 0, 0, 34816, 82, }, /* 1093 */ - { 152, 15, 12, 0, 0, 34816, 68, }, /* 1094 */ - { 63, 7, 12, 0, 0, 0, 82, }, /* 1095 */ - { 63, 12, 3, 0, 0, 26624, 96, }, /* 1096 */ - { 63, 15, 12, 0, 0, 0, 68, }, /* 1097 */ - { 63, 21, 12, 0, 0, 0, 124, }, /* 1098 */ - { 67, 7, 12, 0, 0, 34816, 82, }, /* 1099 */ - { 67, 12, 3, 0, 0, 26624, 96, }, /* 1100 */ - { 67, 21, 12, 0, 0, 34816, 124, }, /* 1101 */ - { 156, 7, 12, 0, 0, 34816, 82, }, /* 1102 */ - { 156, 15, 12, 0, 0, 34816, 68, }, /* 1103 */ - { 153, 7, 12, 0, 0, 34816, 82, }, /* 1104 */ - { 120, 10, 5, 0, 0, 18432, 144, }, /* 1105 */ - { 120, 12, 3, 0, 0, 26624, 130, }, /* 1106 */ - { 120, 7, 12, 0, 0, 18432, 82, }, /* 1107 */ - { 120, 12, 3, 0, 0, 26624, 146, }, /* 1108 */ - { 120, 21, 12, 0, 0, 18432, 124, }, /* 1109 */ - { 120, 21, 12, 0, 0, 18432, 106, }, /* 1110 */ - { 120, 15, 12, 0, 0, 28672, 68, }, /* 1111 */ - { 120, 13, 12, 0, 0, 18432, 138, }, /* 1112 */ - { 120, 12, 3, 0, 0, 26624, 184, }, /* 1113 */ - { 41, 12, 3, 0, 0, 26624, 130, }, /* 1114 */ - { 41, 10, 5, 0, 0, 18432, 144, }, /* 1115 */ - { 41, 7, 12, 0, 0, 18432, 82, }, /* 1116 */ - { 41, 12, 3, 0, 0, 26624, 146, }, /* 1117 */ - { 41, 12, 3, 0, 0, 26624, 96, }, /* 1118 */ - { 41, 21, 12, 0, 0, 18432, 68, }, /* 1119 */ - { 41, 1, 4, 0, 0, 18432, 132, }, /* 1120 */ - { 41, 21, 12, 0, 0, 18432, 124, }, /* 1121 */ - { 124, 7, 12, 0, 0, 18432, 82, }, /* 1122 */ - { 124, 13, 12, 0, 0, 18432, 138, }, /* 1123 */ - { 43, 12, 3, 0, 0, 26624, 130, }, /* 1124 */ - { 43, 7, 12, 0, 0, 18432, 82, }, /* 1125 */ - { 43, 10, 5, 0, 0, 18432, 144, }, /* 1126 */ - { 43, 12, 3, 0, 0, 26624, 146, }, /* 1127 */ - { 43, 13, 12, 0, 0, 18432, 138, }, /* 1128 */ - { 43, 21, 12, 0, 0, 18432, 68, }, /* 1129 */ - { 43, 21, 12, 0, 0, 18432, 124, }, /* 1130 */ - { 50, 7, 12, 0, 0, 18432, 82, }, /* 1131 */ - { 50, 12, 3, 0, 0, 26624, 96, }, /* 1132 */ - { 50, 21, 12, 0, 0, 18432, 68, }, /* 1133 */ - { 44, 12, 3, 0, 0, 26624, 130, }, /* 1134 */ - { 44, 10, 5, 0, 0, 18432, 144, }, /* 1135 */ - { 44, 7, 12, 0, 0, 18432, 82, }, /* 1136 */ - { 44, 10, 5, 0, 0, 18432, 174, }, /* 1137 */ - { 44, 7, 4, 0, 0, 18432, 82, }, /* 1138 */ - { 44, 21, 12, 0, 0, 18432, 124, }, /* 1139 */ - { 44, 21, 12, 0, 0, 18432, 68, }, /* 1140 */ - { 44, 12, 3, 0, 0, 26624, 102, }, /* 1141 */ - { 44, 12, 3, 0, 0, 26624, 96, }, /* 1142 */ - { 44, 13, 12, 0, 0, 18432, 138, }, /* 1143 */ - { 15, 15, 12, 0, 0, 18432, 68, }, /* 1144 */ - { 48, 7, 12, 0, 0, 18432, 82, }, /* 1145 */ - { 48, 10, 5, 0, 0, 18432, 144, }, /* 1146 */ - { 48, 12, 3, 0, 0, 26624, 130, }, /* 1147 */ - { 48, 10, 5, 0, 0, 18432, 174, }, /* 1148 */ - { 48, 12, 3, 0, 0, 26624, 96, }, /* 1149 */ - { 48, 21, 12, 0, 0, 18432, 124, }, /* 1150 */ - { 48, 21, 12, 0, 0, 18432, 106, }, /* 1151 */ - { 48, 21, 12, 0, 0, 18432, 68, }, /* 1152 */ - { 57, 7, 12, 0, 0, 18432, 82, }, /* 1153 */ - { 57, 21, 12, 0, 0, 18432, 124, }, /* 1154 */ - { 55, 7, 12, 0, 0, 18432, 82, }, /* 1155 */ - { 55, 12, 3, 0, 0, 26624, 130, }, /* 1156 */ - { 55, 10, 5, 0, 0, 18432, 144, }, /* 1157 */ - { 55, 12, 3, 0, 0, 26624, 96, }, /* 1158 */ - { 55, 12, 3, 0, 0, 26624, 146, }, /* 1159 */ - { 55, 13, 12, 0, 0, 18432, 138, }, /* 1160 */ - { 47, 12, 3, 0, 0, 26624, 130, }, /* 1161 */ - { 47, 12, 3, 0, 0, 26705, 130, }, /* 1162 */ - { 47, 10, 5, 0, 0, 18432, 144, }, /* 1163 */ - { 47, 10, 5, 0, 0, 18513, 144, }, /* 1164 */ - { 47, 7, 12, 0, 0, 18432, 82, }, /* 1165 */ - { 84, 12, 3, 0, 0, 26705, 102, }, /* 1166 */ - { 47, 12, 3, 0, 0, 26705, 96, }, /* 1167 */ - { 47, 10, 3, 0, 0, 18432, 148, }, /* 1168 */ - { 47, 10, 5, 0, 0, 18432, 174, }, /* 1169 */ - { 47, 7, 12, 0, 0, 18432, 324, }, /* 1170 */ - { 47, 12, 3, 0, 0, 26624, 96, }, /* 1171 */ - { 144, 7, 12, 0, 0, 18432, 82, }, /* 1172 */ - { 144, 10, 5, 0, 0, 18432, 144, }, /* 1173 */ - { 144, 12, 3, 0, 0, 26624, 130, }, /* 1174 */ - { 144, 12, 3, 0, 0, 26624, 146, }, /* 1175 */ - { 144, 12, 3, 0, 0, 26624, 96, }, /* 1176 */ - { 144, 21, 12, 0, 0, 18432, 124, }, /* 1177 */ - { 144, 21, 12, 0, 0, 18432, 106, }, /* 1178 */ - { 144, 21, 12, 0, 0, 18432, 68, }, /* 1179 */ - { 144, 13, 12, 0, 0, 18432, 138, }, /* 1180 */ - { 144, 12, 3, 0, 0, 26624, 102, }, /* 1181 */ - { 56, 7, 12, 0, 0, 18432, 82, }, /* 1182 */ - { 56, 10, 3, 0, 0, 18432, 148, }, /* 1183 */ - { 56, 10, 5, 0, 0, 18432, 144, }, /* 1184 */ - { 56, 12, 3, 0, 0, 26624, 130, }, /* 1185 */ - { 56, 12, 3, 0, 0, 26624, 146, }, /* 1186 */ - { 56, 12, 3, 0, 0, 26624, 96, }, /* 1187 */ - { 56, 21, 12, 0, 0, 18432, 68, }, /* 1188 */ - { 56, 13, 12, 0, 0, 18432, 138, }, /* 1189 */ - { 135, 7, 12, 0, 0, 18432, 82, }, /* 1190 */ - { 135, 10, 3, 0, 0, 18432, 148, }, /* 1191 */ - { 135, 10, 5, 0, 0, 18432, 144, }, /* 1192 */ - { 135, 12, 3, 0, 0, 26624, 130, }, /* 1193 */ - { 135, 12, 3, 0, 0, 26624, 146, }, /* 1194 */ - { 135, 12, 3, 0, 0, 26624, 96, }, /* 1195 */ - { 135, 21, 12, 0, 0, 18432, 68, }, /* 1196 */ - { 135, 21, 12, 0, 0, 18432, 124, }, /* 1197 */ - { 135, 21, 12, 0, 0, 18432, 106, }, /* 1198 */ - { 135, 21, 12, 0, 0, 18432, 178, }, /* 1199 */ - { 52, 7, 12, 0, 0, 18432, 82, }, /* 1200 */ - { 52, 10, 5, 0, 0, 18432, 144, }, /* 1201 */ - { 52, 12, 3, 0, 0, 26624, 130, }, /* 1202 */ - { 52, 12, 3, 0, 0, 26624, 146, }, /* 1203 */ - { 52, 21, 12, 0, 0, 18432, 124, }, /* 1204 */ - { 52, 21, 12, 0, 0, 18432, 68, }, /* 1205 */ - { 52, 13, 12, 0, 0, 18432, 138, }, /* 1206 */ - { 45, 7, 12, 0, 0, 18432, 82, }, /* 1207 */ - { 45, 12, 3, 0, 0, 26624, 130, }, /* 1208 */ - { 45, 10, 5, 0, 0, 18432, 144, }, /* 1209 */ - { 45, 10, 5, 0, 0, 18432, 174, }, /* 1210 */ - { 45, 12, 3, 0, 0, 26624, 96, }, /* 1211 */ - { 45, 21, 12, 0, 0, 18432, 68, }, /* 1212 */ - { 45, 13, 12, 0, 0, 18432, 138, }, /* 1213 */ - { 137, 7, 12, 0, 0, 18432, 82, }, /* 1214 */ - { 137, 12, 3, 0, 0, 26624, 130, }, /* 1215 */ - { 137, 10, 12, 0, 0, 18432, 144, }, /* 1216 */ - { 137, 10, 5, 0, 0, 18432, 144, }, /* 1217 */ - { 137, 12, 3, 0, 0, 26624, 146, }, /* 1218 */ - { 137, 13, 12, 0, 0, 18432, 138, }, /* 1219 */ - { 137, 15, 12, 0, 0, 18432, 68, }, /* 1220 */ - { 137, 21, 12, 0, 0, 18432, 124, }, /* 1221 */ - { 137, 26, 12, 0, 0, 18432, 68, }, /* 1222 */ - { 60, 7, 12, 0, 0, 18432, 82, }, /* 1223 */ - { 60, 10, 5, 0, 0, 18432, 144, }, /* 1224 */ - { 60, 12, 3, 0, 0, 26624, 130, }, /* 1225 */ - { 60, 12, 3, 0, 0, 26624, 146, }, /* 1226 */ - { 60, 12, 3, 0, 0, 26624, 96, }, /* 1227 */ - { 60, 21, 12, 0, 0, 18432, 68, }, /* 1228 */ - { 136, 9, 12, 0, 32, 18432, 74, }, /* 1229 */ - { 136, 5, 12, 0, -32, 18432, 76, }, /* 1230 */ - { 136, 13, 12, 0, 0, 18432, 138, }, /* 1231 */ - { 136, 15, 12, 0, 0, 18432, 68, }, /* 1232 */ - { 136, 7, 12, 0, 0, 18432, 82, }, /* 1233 */ - { 157, 7, 12, 0, 0, 18432, 82, }, /* 1234 */ - { 157, 10, 3, 0, 0, 18432, 148, }, /* 1235 */ - { 157, 10, 5, 0, 0, 18432, 144, }, /* 1236 */ - { 157, 12, 3, 0, 0, 26624, 130, }, /* 1237 */ - { 157, 10, 5, 0, 0, 18432, 174, }, /* 1238 */ - { 157, 12, 3, 0, 0, 26624, 146, }, /* 1239 */ - { 157, 7, 4, 0, 0, 18432, 82, }, /* 1240 */ - { 157, 12, 3, 0, 0, 26624, 96, }, /* 1241 */ - { 157, 21, 12, 0, 0, 18432, 124, }, /* 1242 */ - { 157, 21, 12, 0, 0, 18432, 68, }, /* 1243 */ - { 157, 13, 12, 0, 0, 18432, 138, }, /* 1244 */ - { 64, 7, 12, 0, 0, 18432, 82, }, /* 1245 */ - { 64, 10, 5, 0, 0, 18432, 144, }, /* 1246 */ - { 64, 12, 3, 0, 0, 26624, 130, }, /* 1247 */ - { 64, 12, 3, 0, 0, 26624, 146, }, /* 1248 */ - { 64, 21, 12, 0, 0, 18432, 68, }, /* 1249 */ - { 149, 7, 12, 0, 0, 18432, 82, }, /* 1250 */ - { 149, 12, 3, 0, 0, 26624, 130, }, /* 1251 */ - { 149, 12, 3, 0, 0, 18432, 130, }, /* 1252 */ - { 149, 12, 3, 0, 0, 26624, 102, }, /* 1253 */ - { 149, 12, 3, 0, 0, 26624, 146, }, /* 1254 */ - { 149, 10, 5, 0, 0, 18432, 144, }, /* 1255 */ - { 149, 7, 4, 0, 0, 18432, 82, }, /* 1256 */ - { 149, 21, 12, 0, 0, 18432, 68, }, /* 1257 */ - { 149, 21, 12, 0, 0, 18432, 124, }, /* 1258 */ - { 148, 7, 12, 0, 0, 18432, 82, }, /* 1259 */ - { 148, 12, 3, 0, 0, 26624, 130, }, /* 1260 */ - { 148, 10, 5, 0, 0, 18432, 144, }, /* 1261 */ - { 148, 7, 4, 0, 0, 18432, 82, }, /* 1262 */ - { 148, 12, 3, 0, 0, 26624, 326, }, /* 1263 */ - { 148, 12, 3, 0, 0, 26624, 146, }, /* 1264 */ - { 148, 21, 12, 0, 0, 18432, 68, }, /* 1265 */ - { 148, 21, 12, 0, 0, 18432, 124, }, /* 1266 */ - { 148, 21, 12, 0, 0, 18432, 106, }, /* 1267 */ - { 134, 7, 12, 0, 0, 18432, 82, }, /* 1268 */ - { 142, 7, 12, 0, 0, 18432, 82, }, /* 1269 */ - { 142, 10, 5, 0, 0, 18432, 144, }, /* 1270 */ - { 142, 12, 3, 0, 0, 26624, 130, }, /* 1271 */ - { 142, 12, 3, 0, 0, 18432, 146, }, /* 1272 */ - { 142, 21, 12, 0, 0, 18432, 124, }, /* 1273 */ - { 142, 21, 12, 0, 0, 18432, 106, }, /* 1274 */ - { 142, 21, 12, 0, 0, 18432, 68, }, /* 1275 */ - { 142, 13, 12, 0, 0, 18432, 138, }, /* 1276 */ - { 142, 15, 12, 0, 0, 18432, 68, }, /* 1277 */ - { 143, 21, 12, 0, 0, 18432, 68, }, /* 1278 */ - { 143, 21, 12, 0, 0, 18432, 106, }, /* 1279 */ - { 143, 7, 12, 0, 0, 18432, 82, }, /* 1280 */ - { 143, 12, 3, 0, 0, 26624, 130, }, /* 1281 */ - { 143, 10, 5, 0, 0, 18432, 144, }, /* 1282 */ - { 59, 7, 12, 0, 0, 18432, 82, }, /* 1283 */ - { 59, 12, 3, 0, 0, 26624, 130, }, /* 1284 */ - { 59, 12, 3, 0, 0, 26624, 96, }, /* 1285 */ - { 59, 12, 3, 0, 0, 26624, 146, }, /* 1286 */ - { 59, 7, 4, 0, 0, 18432, 82, }, /* 1287 */ - { 59, 13, 12, 0, 0, 18432, 138, }, /* 1288 */ - { 61, 7, 12, 0, 0, 18432, 82, }, /* 1289 */ - { 61, 10, 5, 0, 0, 18432, 144, }, /* 1290 */ - { 61, 12, 3, 0, 0, 26624, 130, }, /* 1291 */ - { 61, 12, 3, 0, 0, 26624, 146, }, /* 1292 */ - { 61, 13, 12, 0, 0, 18432, 138, }, /* 1293 */ - { 150, 7, 12, 0, 0, 18432, 82, }, /* 1294 */ - { 150, 12, 3, 0, 0, 26624, 130, }, /* 1295 */ - { 150, 10, 5, 0, 0, 18432, 144, }, /* 1296 */ - { 150, 21, 12, 0, 0, 18432, 124, }, /* 1297 */ - { 162, 12, 3, 0, 0, 26624, 130, }, /* 1298 */ - { 162, 7, 4, 0, 0, 18432, 82, }, /* 1299 */ - { 162, 10, 5, 0, 0, 18432, 144, }, /* 1300 */ - { 162, 7, 12, 0, 0, 18432, 82, }, /* 1301 */ - { 162, 10, 5, 0, 0, 18432, 176, }, /* 1302 */ - { 162, 12, 3, 0, 0, 26624, 184, }, /* 1303 */ - { 162, 21, 12, 0, 0, 18432, 124, }, /* 1304 */ - { 162, 21, 12, 0, 0, 18432, 68, }, /* 1305 */ - { 162, 13, 12, 0, 0, 18432, 138, }, /* 1306 */ - { 11, 15, 12, 0, 0, 18432, 68, }, /* 1307 */ - { 11, 21, 12, 0, 0, 18432, 68, }, /* 1308 */ - { 94, 7, 12, 0, 0, 18432, 82, }, /* 1309 */ - { 94, 14, 12, 0, 0, 18432, 82, }, /* 1310 */ - { 94, 21, 12, 0, 0, 18432, 106, }, /* 1311 */ - { 66, 7, 12, 0, 0, 18432, 82, }, /* 1312 */ - { 66, 21, 12, 0, 0, 18432, 68, }, /* 1313 */ - { 109, 7, 12, 0, 0, 18432, 82, }, /* 1314 */ - { 109, 1, 2, 0, 0, 18432, 322, }, /* 1315 */ - { 109, 12, 3, 0, 0, 26624, 102, }, /* 1316 */ - { 109, 12, 3, 0, 0, 26624, 96, }, /* 1317 */ - { 138, 7, 12, 0, 0, 18432, 82, }, /* 1318 */ - { 130, 7, 12, 0, 0, 18432, 82, }, /* 1319 */ - { 130, 13, 12, 0, 0, 18432, 138, }, /* 1320 */ - { 130, 21, 12, 0, 0, 18432, 124, }, /* 1321 */ - { 159, 7, 12, 0, 0, 18432, 82, }, /* 1322 */ - { 159, 13, 12, 0, 0, 18432, 138, }, /* 1323 */ - { 126, 7, 12, 0, 0, 18432, 82, }, /* 1324 */ - { 126, 12, 3, 0, 0, 26624, 96, }, /* 1325 */ - { 126, 21, 12, 0, 0, 18432, 124, }, /* 1326 */ - { 128, 7, 12, 0, 0, 18432, 82, }, /* 1327 */ - { 128, 12, 3, 0, 0, 26624, 96, }, /* 1328 */ - { 128, 21, 12, 0, 0, 18432, 124, }, /* 1329 */ - { 128, 21, 12, 0, 0, 18432, 106, }, /* 1330 */ - { 128, 21, 12, 0, 0, 18432, 68, }, /* 1331 */ - { 128, 26, 12, 0, 0, 18432, 68, }, /* 1332 */ - { 128, 6, 12, 0, 0, 18432, 142, }, /* 1333 */ - { 128, 6, 12, 0, 0, 18432, 136, }, /* 1334 */ - { 128, 13, 12, 0, 0, 18432, 138, }, /* 1335 */ - { 128, 15, 12, 0, 0, 18432, 68, }, /* 1336 */ - { 151, 9, 12, 0, 32, 18432, 74, }, /* 1337 */ - { 151, 5, 12, 0, -32, 18432, 76, }, /* 1338 */ - { 151, 15, 12, 0, 0, 18432, 68, }, /* 1339 */ - { 151, 21, 12, 0, 0, 18432, 106, }, /* 1340 */ - { 151, 21, 12, 0, 0, 18432, 124, }, /* 1341 */ - { 151, 21, 12, 0, 0, 18432, 68, }, /* 1342 */ - { 123, 7, 12, 0, 0, 18432, 82, }, /* 1343 */ - { 123, 12, 3, 0, 0, 26624, 130, }, /* 1344 */ - { 123, 10, 5, 0, 0, 18432, 144, }, /* 1345 */ - { 123, 12, 3, 0, 0, 26624, 128, }, /* 1346 */ - { 123, 6, 12, 0, 0, 18432, 92, }, /* 1347 */ - { 146, 6, 12, 0, 0, 18432, 136, }, /* 1348 */ - { 147, 6, 12, 0, 0, 18432, 136, }, /* 1349 */ - { 23, 21, 12, 0, 0, 28672, 68, }, /* 1350 */ - { 158, 12, 3, 0, 0, 26624, 328, }, /* 1351 */ - { 23, 10, 5, 0, 0, 18432, 164, }, /* 1352 */ - { 146, 7, 12, 0, 0, 18432, 284, }, /* 1353 */ - { 158, 7, 12, 0, 0, 18432, 284, }, /* 1354 */ - { 21, 6, 12, 0, 0, 18432, 92, }, /* 1355 */ - { 147, 7, 12, 0, 0, 18432, 284, }, /* 1356 */ - { 46, 7, 12, 0, 0, 18432, 82, }, /* 1357 */ - { 46, 26, 12, 0, 0, 18432, 68, }, /* 1358 */ - { 46, 12, 3, 0, 0, 26624, 102, }, /* 1359 */ - { 46, 12, 3, 0, 0, 26624, 130, }, /* 1360 */ - { 46, 21, 12, 0, 0, 18432, 124, }, /* 1361 */ - { 69, 1, 2, 0, 0, 6153, 66, }, /* 1362 */ - { 69, 10, 3, 0, 0, 18432, 330, }, /* 1363 */ - { 69, 10, 5, 0, 0, 18432, 138, }, /* 1364 */ - { 69, 10, 5, 0, 0, 18432, 160, }, /* 1365 */ - { 69, 10, 3, 0, 0, 18432, 286, }, /* 1366 */ - { 1, 12, 3, 0, 0, 26624, 102, }, /* 1367 */ - { 69, 25, 12, 0, 0, 18432, 118, }, /* 1368 */ - { 69, 13, 12, 0, 0, 10240, 214, }, /* 1369 */ - { 141, 26, 12, 0, 0, 18432, 68, }, /* 1370 */ - { 141, 12, 3, 0, 0, 26624, 102, }, /* 1371 */ - { 141, 21, 12, 0, 0, 18432, 106, }, /* 1372 */ - { 141, 21, 12, 0, 0, 18432, 124, }, /* 1373 */ - { 141, 21, 12, 0, 0, 18432, 68, }, /* 1374 */ - { 35, 12, 3, 0, 0, 26624, 130, }, /* 1375 */ - { 2, 6, 12, 0, 0, 18432, 90, }, /* 1376 */ - { 154, 7, 12, 0, 0, 18432, 82, }, /* 1377 */ - { 154, 12, 3, 0, 0, 26624, 96, }, /* 1378 */ - { 154, 6, 12, 0, 0, 18432, 142, }, /* 1379 */ - { 154, 6, 12, 0, 0, 18432, 136, }, /* 1380 */ - { 154, 13, 12, 0, 0, 18432, 138, }, /* 1381 */ - { 154, 26, 12, 0, 0, 18432, 68, }, /* 1382 */ - { 160, 7, 12, 0, 0, 18432, 82, }, /* 1383 */ - { 160, 12, 3, 0, 0, 26624, 96, }, /* 1384 */ - { 155, 7, 12, 0, 0, 18432, 82, }, /* 1385 */ - { 155, 12, 3, 0, 0, 26624, 96, }, /* 1386 */ - { 155, 13, 12, 0, 0, 18432, 138, }, /* 1387 */ - { 155, 23, 12, 0, 0, 14336, 68, }, /* 1388 */ - { 163, 7, 12, 0, 0, 18432, 82, }, /* 1389 */ - { 163, 6, 12, 0, 0, 18432, 142, }, /* 1390 */ - { 163, 12, 3, 0, 0, 26624, 102, }, /* 1391 */ - { 163, 13, 12, 0, 0, 18432, 138, }, /* 1392 */ - { 129, 7, 12, 0, 0, 34816, 82, }, /* 1393 */ - { 129, 15, 12, 0, 0, 34816, 68, }, /* 1394 */ - { 129, 12, 3, 0, 0, 26624, 96, }, /* 1395 */ - { 58, 9, 12, 0, 34, 34816, 74, }, /* 1396 */ - { 58, 5, 12, 0, -34, 34816, 76, }, /* 1397 */ - { 58, 12, 3, 0, 0, 26624, 150, }, /* 1398 */ - { 58, 12, 3, 0, 0, 26624, 130, }, /* 1399 */ - { 58, 12, 3, 0, 0, 26624, 96, }, /* 1400 */ - { 58, 6, 12, 0, 0, 34816, 142, }, /* 1401 */ - { 58, 13, 12, 0, 0, 34816, 138, }, /* 1402 */ - { 58, 21, 12, 0, 0, 34816, 68, }, /* 1403 */ - { 69, 15, 12, 0, 0, 0, 68, }, /* 1404 */ - { 69, 26, 12, 0, 0, 0, 68, }, /* 1405 */ - { 69, 23, 12, 0, 0, 0, 68, }, /* 1406 */ - { 3, 7, 12, 0, 0, 0, 240, }, /* 1407 */ - { 69, 26, 14, 0, 0, 28672, 332, }, /* 1408 */ - { 69, 26, 14, 0, 0, 28672, 334, }, /* 1409 */ - { 68, 2, 14, 0, 0, 18432, 336, }, /* 1410 */ - { 69, 26, 12, 0, 0, 18432, 338, }, /* 1411 */ - { 69, 26, 14, 0, 0, 18432, 340, }, /* 1412 */ - { 69, 26, 14, 0, 0, 18432, 334, }, /* 1413 */ - { 69, 26, 11, 0, 0, 18432, 342, }, /* 1414 */ - { 20, 26, 12, 0, 0, 18432, 68, }, /* 1415 */ - { 69, 26, 14, 0, 0, 18432, 236, }, /* 1416 */ - { 69, 26, 14, 0, 0, 18447, 334, }, /* 1417 */ - { 69, 26, 14, 0, 0, 28672, 344, }, /* 1418 */ - { 69, 26, 14, 0, 0, 28672, 346, }, /* 1419 */ - { 69, 24, 3, 0, 0, 28672, 348, }, /* 1420 */ - { 69, 26, 14, 0, 0, 28672, 350, }, /* 1421 */ - { 69, 13, 12, 0, 0, 10240, 138, }, /* 1422 */ - { 69, 1, 3, 0, 0, 6144, 352, }, /* 1423 */ + { 152, 7, 12, 0, 0, 34816, 82, }, /* 1092 */ + { 152, 15, 12, 0, 0, 34816, 68, }, /* 1093 */ + { 63, 7, 12, 0, 0, 0, 82, }, /* 1094 */ + { 63, 12, 3, 0, 0, 26624, 96, }, /* 1095 */ + { 63, 15, 12, 0, 0, 0, 68, }, /* 1096 */ + { 63, 21, 12, 0, 0, 0, 124, }, /* 1097 */ + { 67, 7, 12, 0, 0, 34816, 82, }, /* 1098 */ + { 67, 12, 3, 0, 0, 26624, 96, }, /* 1099 */ + { 67, 21, 12, 0, 0, 34816, 124, }, /* 1100 */ + { 156, 7, 12, 0, 0, 34816, 82, }, /* 1101 */ + { 156, 15, 12, 0, 0, 34816, 68, }, /* 1102 */ + { 153, 7, 12, 0, 0, 34816, 82, }, /* 1103 */ + { 120, 10, 5, 0, 0, 18432, 144, }, /* 1104 */ + { 120, 12, 3, 0, 0, 26624, 130, }, /* 1105 */ + { 120, 7, 12, 0, 0, 18432, 82, }, /* 1106 */ + { 120, 12, 3, 0, 0, 26624, 146, }, /* 1107 */ + { 120, 21, 12, 0, 0, 18432, 124, }, /* 1108 */ + { 120, 21, 12, 0, 0, 18432, 106, }, /* 1109 */ + { 120, 15, 12, 0, 0, 28672, 68, }, /* 1110 */ + { 120, 13, 12, 0, 0, 18432, 138, }, /* 1111 */ + { 120, 12, 3, 0, 0, 26624, 184, }, /* 1112 */ + { 41, 12, 3, 0, 0, 26624, 130, }, /* 1113 */ + { 41, 10, 5, 0, 0, 18432, 144, }, /* 1114 */ + { 41, 7, 12, 0, 0, 18432, 82, }, /* 1115 */ + { 41, 12, 3, 0, 0, 26624, 146, }, /* 1116 */ + { 41, 12, 3, 0, 0, 26624, 96, }, /* 1117 */ + { 41, 21, 12, 0, 0, 18432, 68, }, /* 1118 */ + { 41, 1, 4, 0, 0, 18432, 132, }, /* 1119 */ + { 41, 21, 12, 0, 0, 18432, 124, }, /* 1120 */ + { 124, 7, 12, 0, 0, 18432, 82, }, /* 1121 */ + { 124, 13, 12, 0, 0, 18432, 138, }, /* 1122 */ + { 43, 12, 3, 0, 0, 26624, 130, }, /* 1123 */ + { 43, 7, 12, 0, 0, 18432, 82, }, /* 1124 */ + { 43, 10, 5, 0, 0, 18432, 144, }, /* 1125 */ + { 43, 12, 3, 0, 0, 26624, 146, }, /* 1126 */ + { 43, 13, 12, 0, 0, 18432, 138, }, /* 1127 */ + { 43, 21, 12, 0, 0, 18432, 68, }, /* 1128 */ + { 43, 21, 12, 0, 0, 18432, 124, }, /* 1129 */ + { 50, 7, 12, 0, 0, 18432, 82, }, /* 1130 */ + { 50, 12, 3, 0, 0, 26624, 96, }, /* 1131 */ + { 50, 21, 12, 0, 0, 18432, 68, }, /* 1132 */ + { 44, 12, 3, 0, 0, 26624, 130, }, /* 1133 */ + { 44, 10, 5, 0, 0, 18432, 144, }, /* 1134 */ + { 44, 7, 12, 0, 0, 18432, 82, }, /* 1135 */ + { 44, 10, 5, 0, 0, 18432, 174, }, /* 1136 */ + { 44, 7, 4, 0, 0, 18432, 82, }, /* 1137 */ + { 44, 21, 12, 0, 0, 18432, 124, }, /* 1138 */ + { 44, 21, 12, 0, 0, 18432, 68, }, /* 1139 */ + { 44, 12, 3, 0, 0, 26624, 102, }, /* 1140 */ + { 44, 12, 3, 0, 0, 26624, 96, }, /* 1141 */ + { 44, 13, 12, 0, 0, 18432, 138, }, /* 1142 */ + { 15, 15, 12, 0, 0, 18432, 68, }, /* 1143 */ + { 48, 7, 12, 0, 0, 18432, 82, }, /* 1144 */ + { 48, 10, 5, 0, 0, 18432, 144, }, /* 1145 */ + { 48, 12, 3, 0, 0, 26624, 130, }, /* 1146 */ + { 48, 10, 5, 0, 0, 18432, 174, }, /* 1147 */ + { 48, 12, 3, 0, 0, 26624, 96, }, /* 1148 */ + { 48, 21, 12, 0, 0, 18432, 124, }, /* 1149 */ + { 48, 21, 12, 0, 0, 18432, 106, }, /* 1150 */ + { 48, 21, 12, 0, 0, 18432, 68, }, /* 1151 */ + { 57, 7, 12, 0, 0, 18432, 82, }, /* 1152 */ + { 57, 21, 12, 0, 0, 18432, 124, }, /* 1153 */ + { 55, 7, 12, 0, 0, 18432, 82, }, /* 1154 */ + { 55, 12, 3, 0, 0, 26624, 130, }, /* 1155 */ + { 55, 10, 5, 0, 0, 18432, 144, }, /* 1156 */ + { 55, 12, 3, 0, 0, 26624, 96, }, /* 1157 */ + { 55, 12, 3, 0, 0, 26624, 146, }, /* 1158 */ + { 55, 13, 12, 0, 0, 18432, 138, }, /* 1159 */ + { 47, 12, 3, 0, 0, 26624, 130, }, /* 1160 */ + { 47, 12, 3, 0, 0, 26705, 130, }, /* 1161 */ + { 47, 10, 5, 0, 0, 18432, 144, }, /* 1162 */ + { 47, 10, 5, 0, 0, 18513, 144, }, /* 1163 */ + { 47, 7, 12, 0, 0, 18432, 82, }, /* 1164 */ + { 84, 12, 3, 0, 0, 26705, 102, }, /* 1165 */ + { 47, 12, 3, 0, 0, 26705, 96, }, /* 1166 */ + { 47, 10, 3, 0, 0, 18432, 148, }, /* 1167 */ + { 47, 10, 5, 0, 0, 18432, 174, }, /* 1168 */ + { 47, 7, 12, 0, 0, 18432, 324, }, /* 1169 */ + { 47, 12, 3, 0, 0, 26624, 96, }, /* 1170 */ + { 144, 7, 12, 0, 0, 18432, 82, }, /* 1171 */ + { 144, 10, 5, 0, 0, 18432, 144, }, /* 1172 */ + { 144, 12, 3, 0, 0, 26624, 130, }, /* 1173 */ + { 144, 12, 3, 0, 0, 26624, 146, }, /* 1174 */ + { 144, 12, 3, 0, 0, 26624, 96, }, /* 1175 */ + { 144, 21, 12, 0, 0, 18432, 124, }, /* 1176 */ + { 144, 21, 12, 0, 0, 18432, 106, }, /* 1177 */ + { 144, 21, 12, 0, 0, 18432, 68, }, /* 1178 */ + { 144, 13, 12, 0, 0, 18432, 138, }, /* 1179 */ + { 144, 12, 3, 0, 0, 26624, 102, }, /* 1180 */ + { 56, 7, 12, 0, 0, 18432, 82, }, /* 1181 */ + { 56, 10, 3, 0, 0, 18432, 148, }, /* 1182 */ + { 56, 10, 5, 0, 0, 18432, 144, }, /* 1183 */ + { 56, 12, 3, 0, 0, 26624, 130, }, /* 1184 */ + { 56, 12, 3, 0, 0, 26624, 146, }, /* 1185 */ + { 56, 12, 3, 0, 0, 26624, 96, }, /* 1186 */ + { 56, 21, 12, 0, 0, 18432, 68, }, /* 1187 */ + { 56, 13, 12, 0, 0, 18432, 138, }, /* 1188 */ + { 135, 7, 12, 0, 0, 18432, 82, }, /* 1189 */ + { 135, 10, 3, 0, 0, 18432, 148, }, /* 1190 */ + { 135, 10, 5, 0, 0, 18432, 144, }, /* 1191 */ + { 135, 12, 3, 0, 0, 26624, 130, }, /* 1192 */ + { 135, 12, 3, 0, 0, 26624, 146, }, /* 1193 */ + { 135, 12, 3, 0, 0, 26624, 96, }, /* 1194 */ + { 135, 21, 12, 0, 0, 18432, 68, }, /* 1195 */ + { 135, 21, 12, 0, 0, 18432, 124, }, /* 1196 */ + { 135, 21, 12, 0, 0, 18432, 106, }, /* 1197 */ + { 135, 21, 12, 0, 0, 18432, 178, }, /* 1198 */ + { 52, 7, 12, 0, 0, 18432, 82, }, /* 1199 */ + { 52, 10, 5, 0, 0, 18432, 144, }, /* 1200 */ + { 52, 12, 3, 0, 0, 26624, 130, }, /* 1201 */ + { 52, 12, 3, 0, 0, 26624, 146, }, /* 1202 */ + { 52, 21, 12, 0, 0, 18432, 124, }, /* 1203 */ + { 52, 21, 12, 0, 0, 18432, 68, }, /* 1204 */ + { 52, 13, 12, 0, 0, 18432, 138, }, /* 1205 */ + { 45, 7, 12, 0, 0, 18432, 82, }, /* 1206 */ + { 45, 12, 3, 0, 0, 26624, 130, }, /* 1207 */ + { 45, 10, 5, 0, 0, 18432, 144, }, /* 1208 */ + { 45, 10, 5, 0, 0, 18432, 174, }, /* 1209 */ + { 45, 12, 3, 0, 0, 26624, 96, }, /* 1210 */ + { 45, 21, 12, 0, 0, 18432, 68, }, /* 1211 */ + { 45, 13, 12, 0, 0, 18432, 138, }, /* 1212 */ + { 137, 7, 12, 0, 0, 18432, 82, }, /* 1213 */ + { 137, 12, 3, 0, 0, 26624, 130, }, /* 1214 */ + { 137, 10, 12, 0, 0, 18432, 144, }, /* 1215 */ + { 137, 10, 5, 0, 0, 18432, 144, }, /* 1216 */ + { 137, 12, 3, 0, 0, 26624, 146, }, /* 1217 */ + { 137, 13, 12, 0, 0, 18432, 138, }, /* 1218 */ + { 137, 15, 12, 0, 0, 18432, 68, }, /* 1219 */ + { 137, 21, 12, 0, 0, 18432, 124, }, /* 1220 */ + { 137, 26, 12, 0, 0, 18432, 68, }, /* 1221 */ + { 60, 7, 12, 0, 0, 18432, 82, }, /* 1222 */ + { 60, 10, 5, 0, 0, 18432, 144, }, /* 1223 */ + { 60, 12, 3, 0, 0, 26624, 130, }, /* 1224 */ + { 60, 12, 3, 0, 0, 26624, 146, }, /* 1225 */ + { 60, 12, 3, 0, 0, 26624, 96, }, /* 1226 */ + { 60, 21, 12, 0, 0, 18432, 68, }, /* 1227 */ + { 136, 9, 12, 0, 32, 18432, 74, }, /* 1228 */ + { 136, 5, 12, 0, -32, 18432, 76, }, /* 1229 */ + { 136, 13, 12, 0, 0, 18432, 138, }, /* 1230 */ + { 136, 15, 12, 0, 0, 18432, 68, }, /* 1231 */ + { 136, 7, 12, 0, 0, 18432, 82, }, /* 1232 */ + { 157, 7, 12, 0, 0, 18432, 82, }, /* 1233 */ + { 157, 10, 3, 0, 0, 18432, 148, }, /* 1234 */ + { 157, 10, 5, 0, 0, 18432, 144, }, /* 1235 */ + { 157, 12, 3, 0, 0, 26624, 130, }, /* 1236 */ + { 157, 10, 5, 0, 0, 18432, 174, }, /* 1237 */ + { 157, 12, 3, 0, 0, 26624, 146, }, /* 1238 */ + { 157, 7, 4, 0, 0, 18432, 82, }, /* 1239 */ + { 157, 12, 3, 0, 0, 26624, 96, }, /* 1240 */ + { 157, 21, 12, 0, 0, 18432, 124, }, /* 1241 */ + { 157, 21, 12, 0, 0, 18432, 68, }, /* 1242 */ + { 157, 13, 12, 0, 0, 18432, 138, }, /* 1243 */ + { 64, 7, 12, 0, 0, 18432, 82, }, /* 1244 */ + { 64, 10, 5, 0, 0, 18432, 144, }, /* 1245 */ + { 64, 12, 3, 0, 0, 26624, 130, }, /* 1246 */ + { 64, 12, 3, 0, 0, 26624, 146, }, /* 1247 */ + { 64, 21, 12, 0, 0, 18432, 68, }, /* 1248 */ + { 149, 7, 12, 0, 0, 18432, 82, }, /* 1249 */ + { 149, 12, 3, 0, 0, 26624, 130, }, /* 1250 */ + { 149, 12, 3, 0, 0, 18432, 130, }, /* 1251 */ + { 149, 12, 3, 0, 0, 26624, 102, }, /* 1252 */ + { 149, 12, 3, 0, 0, 26624, 146, }, /* 1253 */ + { 149, 10, 5, 0, 0, 18432, 144, }, /* 1254 */ + { 149, 7, 4, 0, 0, 18432, 82, }, /* 1255 */ + { 149, 21, 12, 0, 0, 18432, 68, }, /* 1256 */ + { 149, 21, 12, 0, 0, 18432, 124, }, /* 1257 */ + { 148, 7, 12, 0, 0, 18432, 82, }, /* 1258 */ + { 148, 12, 3, 0, 0, 26624, 130, }, /* 1259 */ + { 148, 10, 5, 0, 0, 18432, 144, }, /* 1260 */ + { 148, 7, 4, 0, 0, 18432, 82, }, /* 1261 */ + { 148, 12, 3, 0, 0, 26624, 326, }, /* 1262 */ + { 148, 12, 3, 0, 0, 26624, 146, }, /* 1263 */ + { 148, 21, 12, 0, 0, 18432, 68, }, /* 1264 */ + { 148, 21, 12, 0, 0, 18432, 124, }, /* 1265 */ + { 148, 21, 12, 0, 0, 18432, 106, }, /* 1266 */ + { 134, 7, 12, 0, 0, 18432, 82, }, /* 1267 */ + { 142, 7, 12, 0, 0, 18432, 82, }, /* 1268 */ + { 142, 10, 5, 0, 0, 18432, 144, }, /* 1269 */ + { 142, 12, 3, 0, 0, 26624, 130, }, /* 1270 */ + { 142, 12, 3, 0, 0, 18432, 146, }, /* 1271 */ + { 142, 21, 12, 0, 0, 18432, 124, }, /* 1272 */ + { 142, 21, 12, 0, 0, 18432, 106, }, /* 1273 */ + { 142, 21, 12, 0, 0, 18432, 68, }, /* 1274 */ + { 142, 13, 12, 0, 0, 18432, 138, }, /* 1275 */ + { 142, 15, 12, 0, 0, 18432, 68, }, /* 1276 */ + { 143, 21, 12, 0, 0, 18432, 68, }, /* 1277 */ + { 143, 21, 12, 0, 0, 18432, 106, }, /* 1278 */ + { 143, 7, 12, 0, 0, 18432, 82, }, /* 1279 */ + { 143, 12, 3, 0, 0, 26624, 130, }, /* 1280 */ + { 143, 10, 5, 0, 0, 18432, 144, }, /* 1281 */ + { 59, 7, 12, 0, 0, 18432, 82, }, /* 1282 */ + { 59, 12, 3, 0, 0, 26624, 130, }, /* 1283 */ + { 59, 12, 3, 0, 0, 26624, 96, }, /* 1284 */ + { 59, 12, 3, 0, 0, 26624, 146, }, /* 1285 */ + { 59, 7, 4, 0, 0, 18432, 82, }, /* 1286 */ + { 59, 13, 12, 0, 0, 18432, 138, }, /* 1287 */ + { 61, 7, 12, 0, 0, 18432, 82, }, /* 1288 */ + { 61, 10, 5, 0, 0, 18432, 144, }, /* 1289 */ + { 61, 12, 3, 0, 0, 26624, 130, }, /* 1290 */ + { 61, 12, 3, 0, 0, 26624, 146, }, /* 1291 */ + { 61, 13, 12, 0, 0, 18432, 138, }, /* 1292 */ + { 150, 7, 12, 0, 0, 18432, 82, }, /* 1293 */ + { 150, 12, 3, 0, 0, 26624, 130, }, /* 1294 */ + { 150, 10, 5, 0, 0, 18432, 144, }, /* 1295 */ + { 150, 21, 12, 0, 0, 18432, 124, }, /* 1296 */ + { 162, 12, 3, 0, 0, 26624, 130, }, /* 1297 */ + { 162, 7, 4, 0, 0, 18432, 82, }, /* 1298 */ + { 162, 10, 5, 0, 0, 18432, 144, }, /* 1299 */ + { 162, 7, 12, 0, 0, 18432, 82, }, /* 1300 */ + { 162, 10, 5, 0, 0, 18432, 176, }, /* 1301 */ + { 162, 12, 3, 0, 0, 26624, 184, }, /* 1302 */ + { 162, 21, 12, 0, 0, 18432, 124, }, /* 1303 */ + { 162, 21, 12, 0, 0, 18432, 68, }, /* 1304 */ + { 162, 13, 12, 0, 0, 18432, 138, }, /* 1305 */ + { 11, 15, 12, 0, 0, 18432, 68, }, /* 1306 */ + { 11, 21, 12, 0, 0, 18432, 68, }, /* 1307 */ + { 94, 7, 12, 0, 0, 18432, 82, }, /* 1308 */ + { 94, 14, 12, 0, 0, 18432, 82, }, /* 1309 */ + { 94, 21, 12, 0, 0, 18432, 106, }, /* 1310 */ + { 66, 7, 12, 0, 0, 18432, 82, }, /* 1311 */ + { 66, 21, 12, 0, 0, 18432, 68, }, /* 1312 */ + { 109, 7, 12, 0, 0, 18432, 82, }, /* 1313 */ + { 109, 1, 2, 0, 0, 18432, 322, }, /* 1314 */ + { 109, 12, 3, 0, 0, 26624, 102, }, /* 1315 */ + { 109, 12, 3, 0, 0, 26624, 96, }, /* 1316 */ + { 138, 7, 12, 0, 0, 18432, 82, }, /* 1317 */ + { 130, 7, 12, 0, 0, 18432, 82, }, /* 1318 */ + { 130, 13, 12, 0, 0, 18432, 138, }, /* 1319 */ + { 130, 21, 12, 0, 0, 18432, 124, }, /* 1320 */ + { 159, 7, 12, 0, 0, 18432, 82, }, /* 1321 */ + { 159, 13, 12, 0, 0, 18432, 138, }, /* 1322 */ + { 126, 7, 12, 0, 0, 18432, 82, }, /* 1323 */ + { 126, 12, 3, 0, 0, 26624, 96, }, /* 1324 */ + { 126, 21, 12, 0, 0, 18432, 124, }, /* 1325 */ + { 128, 7, 12, 0, 0, 18432, 82, }, /* 1326 */ + { 128, 12, 3, 0, 0, 26624, 96, }, /* 1327 */ + { 128, 21, 12, 0, 0, 18432, 124, }, /* 1328 */ + { 128, 21, 12, 0, 0, 18432, 106, }, /* 1329 */ + { 128, 21, 12, 0, 0, 18432, 68, }, /* 1330 */ + { 128, 26, 12, 0, 0, 18432, 68, }, /* 1331 */ + { 128, 6, 12, 0, 0, 18432, 142, }, /* 1332 */ + { 128, 6, 12, 0, 0, 18432, 136, }, /* 1333 */ + { 128, 13, 12, 0, 0, 18432, 138, }, /* 1334 */ + { 128, 15, 12, 0, 0, 18432, 68, }, /* 1335 */ + { 151, 9, 12, 0, 32, 18432, 74, }, /* 1336 */ + { 151, 5, 12, 0, -32, 18432, 76, }, /* 1337 */ + { 151, 15, 12, 0, 0, 18432, 68, }, /* 1338 */ + { 151, 21, 12, 0, 0, 18432, 106, }, /* 1339 */ + { 151, 21, 12, 0, 0, 18432, 124, }, /* 1340 */ + { 151, 21, 12, 0, 0, 18432, 68, }, /* 1341 */ + { 123, 7, 12, 0, 0, 18432, 82, }, /* 1342 */ + { 123, 12, 3, 0, 0, 26624, 130, }, /* 1343 */ + { 123, 10, 5, 0, 0, 18432, 144, }, /* 1344 */ + { 123, 12, 3, 0, 0, 26624, 128, }, /* 1345 */ + { 123, 6, 12, 0, 0, 18432, 92, }, /* 1346 */ + { 146, 6, 12, 0, 0, 18432, 136, }, /* 1347 */ + { 147, 6, 12, 0, 0, 18432, 136, }, /* 1348 */ + { 23, 21, 12, 0, 0, 28672, 68, }, /* 1349 */ + { 158, 12, 3, 0, 0, 26624, 328, }, /* 1350 */ + { 23, 10, 5, 0, 0, 18432, 164, }, /* 1351 */ + { 146, 7, 12, 0, 0, 18432, 284, }, /* 1352 */ + { 158, 7, 12, 0, 0, 18432, 284, }, /* 1353 */ + { 21, 6, 12, 0, 0, 18432, 92, }, /* 1354 */ + { 147, 7, 12, 0, 0, 18432, 284, }, /* 1355 */ + { 46, 7, 12, 0, 0, 18432, 82, }, /* 1356 */ + { 46, 26, 12, 0, 0, 18432, 68, }, /* 1357 */ + { 46, 12, 3, 0, 0, 26624, 102, }, /* 1358 */ + { 46, 12, 3, 0, 0, 26624, 130, }, /* 1359 */ + { 46, 21, 12, 0, 0, 18432, 124, }, /* 1360 */ + { 69, 1, 2, 0, 0, 6153, 66, }, /* 1361 */ + { 69, 10, 3, 0, 0, 18432, 330, }, /* 1362 */ + { 69, 10, 5, 0, 0, 18432, 138, }, /* 1363 */ + { 69, 10, 5, 0, 0, 18432, 160, }, /* 1364 */ + { 69, 10, 3, 0, 0, 18432, 286, }, /* 1365 */ + { 1, 12, 3, 0, 0, 26624, 102, }, /* 1366 */ + { 69, 25, 12, 0, 0, 18432, 118, }, /* 1367 */ + { 69, 13, 12, 0, 0, 10240, 214, }, /* 1368 */ + { 141, 26, 12, 0, 0, 18432, 68, }, /* 1369 */ + { 141, 12, 3, 0, 0, 26624, 102, }, /* 1370 */ + { 141, 21, 12, 0, 0, 18432, 106, }, /* 1371 */ + { 141, 21, 12, 0, 0, 18432, 124, }, /* 1372 */ + { 141, 21, 12, 0, 0, 18432, 68, }, /* 1373 */ + { 35, 12, 3, 0, 0, 26624, 130, }, /* 1374 */ + { 2, 6, 12, 0, 0, 18432, 90, }, /* 1375 */ + { 154, 7, 12, 0, 0, 18432, 82, }, /* 1376 */ + { 154, 12, 3, 0, 0, 26624, 96, }, /* 1377 */ + { 154, 6, 12, 0, 0, 18432, 142, }, /* 1378 */ + { 154, 6, 12, 0, 0, 18432, 136, }, /* 1379 */ + { 154, 13, 12, 0, 0, 18432, 138, }, /* 1380 */ + { 154, 26, 12, 0, 0, 18432, 68, }, /* 1381 */ + { 160, 7, 12, 0, 0, 18432, 82, }, /* 1382 */ + { 160, 12, 3, 0, 0, 26624, 96, }, /* 1383 */ + { 155, 7, 12, 0, 0, 18432, 82, }, /* 1384 */ + { 155, 12, 3, 0, 0, 26624, 96, }, /* 1385 */ + { 155, 13, 12, 0, 0, 18432, 138, }, /* 1386 */ + { 155, 23, 12, 0, 0, 14336, 68, }, /* 1387 */ + { 163, 7, 12, 0, 0, 18432, 82, }, /* 1388 */ + { 163, 6, 12, 0, 0, 18432, 142, }, /* 1389 */ + { 163, 12, 3, 0, 0, 26624, 102, }, /* 1390 */ + { 163, 13, 12, 0, 0, 18432, 138, }, /* 1391 */ + { 129, 7, 12, 0, 0, 34816, 82, }, /* 1392 */ + { 129, 15, 12, 0, 0, 34816, 68, }, /* 1393 */ + { 129, 12, 3, 0, 0, 26624, 96, }, /* 1394 */ + { 58, 9, 12, 0, 34, 34816, 74, }, /* 1395 */ + { 58, 5, 12, 0, -34, 34816, 76, }, /* 1396 */ + { 58, 12, 3, 0, 0, 26624, 150, }, /* 1397 */ + { 58, 12, 3, 0, 0, 26624, 130, }, /* 1398 */ + { 58, 12, 3, 0, 0, 26624, 96, }, /* 1399 */ + { 58, 6, 12, 0, 0, 34816, 142, }, /* 1400 */ + { 58, 13, 12, 0, 0, 34816, 138, }, /* 1401 */ + { 58, 21, 12, 0, 0, 34816, 68, }, /* 1402 */ + { 69, 15, 12, 0, 0, 0, 68, }, /* 1403 */ + { 69, 26, 12, 0, 0, 0, 68, }, /* 1404 */ + { 69, 23, 12, 0, 0, 0, 68, }, /* 1405 */ + { 3, 7, 12, 0, 0, 0, 240, }, /* 1406 */ + { 69, 26, 14, 0, 0, 28672, 332, }, /* 1407 */ + { 69, 26, 14, 0, 0, 28672, 334, }, /* 1408 */ + { 68, 2, 14, 0, 0, 18432, 336, }, /* 1409 */ + { 69, 26, 12, 0, 0, 18432, 338, }, /* 1410 */ + { 69, 26, 14, 0, 0, 18432, 340, }, /* 1411 */ + { 69, 26, 14, 0, 0, 18432, 334, }, /* 1412 */ + { 69, 26, 11, 0, 0, 18432, 342, }, /* 1413 */ + { 20, 26, 12, 0, 0, 18432, 68, }, /* 1414 */ + { 69, 26, 14, 0, 0, 18432, 236, }, /* 1415 */ + { 69, 26, 14, 0, 0, 18447, 334, }, /* 1416 */ + { 69, 26, 14, 0, 0, 28672, 344, }, /* 1417 */ + { 69, 26, 14, 0, 0, 28672, 346, }, /* 1418 */ + { 69, 24, 3, 0, 0, 28672, 348, }, /* 1419 */ + { 69, 26, 14, 0, 0, 28672, 350, }, /* 1420 */ + { 69, 13, 12, 0, 0, 10240, 138, }, /* 1421 */ + { 69, 1, 3, 0, 0, 6144, 352, }, /* 1422 */ }; const uint16_t PRIV(ucd_stage1)[] = { /* 17408 bytes */ @@ -4105,166 +4104,166 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089, 1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,262,1090,1090,1091,262,262, 1089,1089,262,262,262,262,262,262,262,262,262,262,262,262,262,262, -262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, -262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, -262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, -262,262,262,262,262,262,262,262,262,262,262,262,262,1092,1092,1092, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, +302,302,302,302,302,302,302,302,302,302,302,302,302,291,291,291, /* block 171 */ -1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093, -1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1094,1094,1094, -1094,1094,1094,1094,1094,1094,1094,1093,262,262,262,262,262,262,262,262, -1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095, -1095,1095,1095,1095,1095,1095,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096, -1096,1097,1097,1097,1097,1098,1098,1098,1098,1098,302,302,302,302,302,302, +1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092, +1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1093,1093,1093, +1093,1093,1093,1093,1093,1093,1093,1092,262,262,262,262,262,262,262,262, +1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094, +1094,1094,1094,1094,1094,1094,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095, +1095,1096,1096,1096,1096,1097,1097,1097,1097,1097,302,302,302,302,302,302, 302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, -1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099, +1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098, /* block 172 */ -1099,1099,1100,1100,1100,1100,1101,1101,1101,1101,262,262,262,262,262,262, +1098,1098,1099,1099,1099,1099,1100,1100,1100,1100,262,262,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, -1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102, -1102,1102,1102,1102,1102,1103,1103,1103,1103,1103,1103,1103,262,262,262,262, +1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101, +1101,1101,1101,1101,1101,1102,1102,1102,1102,1102,1102,1102,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, -1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104, -1104,1104,1104,1104,1104,1104,1104,262,262,262,262,262,262,262,262,262, +1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103, +1103,1103,1103,1103,1103,1103,1103,262,262,262,262,262,262,262,262,262, /* block 173 */ -1105,1106,1105,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107, -1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107, -1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107, -1107,1107,1107,1107,1107,1107,1107,1107,1106,1106,1106,1106,1106,1106,1106,1106, -1106,1106,1106,1106,1106,1106,1108,1109,1109,1110,1110,1110,1110,1110,163,163, -163,163,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111, -1111,1111,1111,1111,1111,1111,1112,1112,1112,1112,1112,1112,1112,1112,1112,1112, -1108,1107,1107,1106,1106,1107,163,163,163,163,163,163,163,163,163,1113, +1104,1105,1104,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106, +1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106, +1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106, +1106,1106,1106,1106,1106,1106,1106,1106,1105,1105,1105,1105,1105,1105,1105,1105, +1105,1105,1105,1105,1105,1105,1107,1108,1108,1109,1109,1109,1109,1109,163,163, +163,163,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110, +1110,1110,1110,1110,1110,1110,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111, +1107,1106,1106,1105,1105,1106,163,163,163,163,163,163,163,163,163,1112, /* block 174 */ -1114,1114,1115,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116, -1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116, -1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116, -1115,1115,1115,1114,1114,1114,1114,1115,1115,1117,1118,1119,1119,1120,1121,1121, -1121,1121,1114,163,163,163,163,163,163,163,163,163,163,1120,163,163, -1122,1122,1122,1122,1122,1122,1122,1122,1122,1122,1122,1122,1122,1122,1122,1122, -1122,1122,1122,1122,1122,1122,1122,1122,1122,163,163,163,163,163,163,163, -1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,163,163,163,163,163,163, +1113,1113,1114,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115, +1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115, +1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115, +1114,1114,1114,1113,1113,1113,1113,1114,1114,1116,1117,1118,1118,1119,1120,1120, +1120,1120,1113,163,163,163,163,163,163,163,163,163,163,1119,163,163, +1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121, +1121,1121,1121,1121,1121,1121,1121,1121,1121,163,163,163,163,163,163,163, +1122,1122,1122,1122,1122,1122,1122,1122,1122,1122,163,163,163,163,163,163, /* block 175 */ -1124,1124,1124,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125, -1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125, -1125,1125,1125,1125,1125,1125,1125,1124,1124,1124,1124,1124,1126,1124,1124,1124, -1124,1124,1124,1127,1127,163,1128,1128,1128,1128,1128,1128,1128,1128,1128,1128, -1129,1130,1130,1130,1125,1126,1126,1125,163,163,163,163,163,163,163,163, -1131,1131,1131,1131,1131,1131,1131,1131,1131,1131,1131,1131,1131,1131,1131,1131, -1131,1131,1131,1131,1131,1131,1131,1131,1131,1131,1131,1131,1131,1131,1131,1131, -1131,1131,1131,1132,1133,1133,1131,163,163,163,163,163,163,163,163,163, +1123,1123,1123,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124, +1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124, +1124,1124,1124,1124,1124,1124,1124,1123,1123,1123,1123,1123,1125,1123,1123,1123, +1123,1123,1123,1126,1126,163,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127, +1128,1129,1129,1129,1124,1125,1125,1124,163,163,163,163,163,163,163,163, +1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130, +1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130, +1130,1130,1130,1131,1132,1132,1130,163,163,163,163,163,163,163,163,163, /* block 176 */ -1134,1134,1135,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136, -1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136, -1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136,1136, -1136,1136,1136,1135,1135,1135,1134,1134,1134,1134,1134,1134,1134,1134,1134,1135, -1137,1136,1138,1138,1136,1139,1139,1140,1140,1141,1142,1142,1142,1139,1135,1134, -1143,1143,1143,1143,1143,1143,1143,1143,1143,1143,1136,1140,1136,1140,1139,1139, -163,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144, -1144,1144,1144,1144,1144,163,163,163,163,163,163,163,163,163,163,163, +1133,1133,1134,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135, +1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135, +1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135, +1135,1135,1135,1134,1134,1134,1133,1133,1133,1133,1133,1133,1133,1133,1133,1134, +1136,1135,1137,1137,1135,1138,1138,1139,1139,1140,1141,1141,1141,1138,1134,1133, +1142,1142,1142,1142,1142,1142,1142,1142,1142,1142,1135,1139,1135,1139,1138,1138, +163,1143,1143,1143,1143,1143,1143,1143,1143,1143,1143,1143,1143,1143,1143,1143, +1143,1143,1143,1143,1143,163,163,163,163,163,163,163,163,163,163,163, /* block 177 */ -1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145, -1145,1145,163,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145, -1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1145,1146,1146,1146,1147, -1147,1147,1146,1146,1147,1148,1149,1147,1150,1150,1151,1150,1150,1152,1147,1145, -1145,1147,163,163,163,163,163,163,163,163,163,163,163,163,163,163, +1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144, +1144,1144,163,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144, +1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1144,1145,1145,1145,1146, +1146,1146,1145,1145,1146,1147,1148,1146,1149,1149,1150,1149,1149,1151,1146,1144, +1144,1146,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 178 */ -1153,1153,1153,1153,1153,1153,1153,163,1153,163,1153,1153,1153,1153,163,1153, -1153,1153,1153,1153,1153,1153,1153,1153,1153,1153,1153,1153,1153,1153,163,1153, -1153,1153,1153,1153,1153,1153,1153,1153,1153,1154,163,163,163,163,163,163, -1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155, -1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155, -1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1155,1156, -1157,1157,1157,1156,1156,1156,1156,1156,1156,1158,1159,163,163,163,163,163, -1160,1160,1160,1160,1160,1160,1160,1160,1160,1160,163,163,163,163,163,163, +1152,1152,1152,1152,1152,1152,1152,163,1152,163,1152,1152,1152,1152,163,1152, +1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,1152,163,1152, +1152,1152,1152,1152,1152,1152,1152,1152,1152,1153,163,163,163,163,163,163, +1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154, +1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154, +1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1154,1155, +1156,1156,1156,1155,1155,1155,1155,1155,1155,1157,1158,163,163,163,163,163, +1159,1159,1159,1159,1159,1159,1159,1159,1159,1159,163,163,163,163,163,163, /* block 179 */ -1161,1162,1163,1164,163,1165,1165,1165,1165,1165,1165,1165,1165,163,163,1165, -1165,163,163,1165,1165,1165,1165,1165,1165,1165,1165,1165,1165,1165,1165,1165, -1165,1165,1165,1165,1165,1165,1165,1165,1165,163,1165,1165,1165,1165,1165,1165, -1165,163,1165,1165,163,1165,1165,1165,1165,1165,163,1166,1167,1165,1168,1163, -1161,1163,1163,1163,1163,163,163,1163,1163,163,163,1163,1163,1169,163,163, -1165,163,163,163,163,163,163,1168,163,163,163,163,163,1170,1165,1165, -1165,1165,1163,1163,163,163,1171,1171,1171,1171,1171,1171,1171,163,163,163, -1171,1171,1171,1171,1171,163,163,163,163,163,163,163,163,163,163,163, +1160,1161,1162,1163,163,1164,1164,1164,1164,1164,1164,1164,1164,163,163,1164, +1164,163,163,1164,1164,1164,1164,1164,1164,1164,1164,1164,1164,1164,1164,1164, +1164,1164,1164,1164,1164,1164,1164,1164,1164,163,1164,1164,1164,1164,1164,1164, +1164,163,1164,1164,163,1164,1164,1164,1164,1164,163,1165,1166,1164,1167,1162, +1160,1162,1162,1162,1162,163,163,1162,1162,163,163,1162,1162,1168,163,163, +1164,163,163,163,163,163,163,1167,163,163,163,163,163,1169,1164,1164, +1164,1164,1162,1162,163,163,1170,1170,1170,1170,1170,1170,1170,163,163,163, +1170,1170,1170,1170,1170,163,163,163,163,163,163,163,163,163,163,163, /* block 180 */ -1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172, -1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172, -1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172,1172, -1172,1172,1172,1172,1172,1173,1173,1173,1174,1174,1174,1174,1174,1174,1174,1174, -1173,1173,1175,1174,1174,1173,1176,1172,1172,1172,1172,1177,1177,1178,1179,1179, -1180,1180,1180,1180,1180,1180,1180,1180,1180,1180,1178,1178,163,1179,1181,1172, -1172,1172,163,163,163,163,163,163,163,163,163,163,163,163,163,163, +1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171, +1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171, +1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171,1171, +1171,1171,1171,1171,1171,1172,1172,1172,1173,1173,1173,1173,1173,1173,1173,1173, +1172,1172,1174,1173,1173,1172,1175,1171,1171,1171,1171,1176,1176,1177,1178,1178, +1179,1179,1179,1179,1179,1179,1179,1179,1179,1179,1177,1177,163,1178,1180,1171, +1171,1171,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 181 */ -1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182, -1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182, -1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182,1182, -1183,1184,1184,1185,1185,1185,1185,1185,1185,1184,1185,1184,1184,1183,1184,1185, -1185,1184,1186,1187,1182,1182,1188,1182,163,163,163,163,163,163,163,163, -1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,163,163,163,163,163,163, +1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181, +1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181, +1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181,1181, +1182,1183,1183,1184,1184,1184,1184,1184,1184,1183,1184,1183,1183,1182,1183,1184, +1184,1183,1185,1186,1181,1181,1187,1181,163,163,163,163,163,163,163,163, +1188,1188,1188,1188,1188,1188,1188,1188,1188,1188,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 182 */ -1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190, -1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190, -1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1190,1191, -1192,1192,1193,1193,1193,1193,163,163,1192,1192,1192,1192,1193,1193,1192,1194, -1195,1196,1197,1197,1198,1198,1199,1199,1199,1197,1197,1197,1197,1197,1197,1197, -1197,1197,1197,1197,1197,1197,1197,1197,1190,1190,1190,1190,1193,1193,163,163, +1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189, +1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189, +1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1189,1190, +1191,1191,1192,1192,1192,1192,163,163,1191,1191,1191,1191,1192,1192,1191,1193, +1194,1195,1196,1196,1197,1197,1198,1198,1198,1196,1196,1196,1196,1196,1196,1196, +1196,1196,1196,1196,1196,1196,1196,1196,1189,1189,1189,1189,1192,1192,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 183 */ -1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200, -1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200, -1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200,1200, -1201,1201,1201,1202,1202,1202,1202,1202,1202,1202,1202,1201,1201,1202,1201,1203, -1202,1204,1204,1205,1200,163,163,163,163,163,163,163,163,163,163,163, -1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,163,163,163,163,163,163, +1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199, +1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199, +1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199,1199, +1200,1200,1200,1201,1201,1201,1201,1201,1201,1201,1201,1200,1200,1201,1200,1202, +1201,1203,1203,1204,1199,163,163,163,163,163,163,163,163,163,163,163, +1205,1205,1205,1205,1205,1205,1205,1205,1205,1205,163,163,163,163,163,163, 531,531,531,531,531,531,531,531,531,531,531,531,531,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 184 */ -1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207, -1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207, -1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1207,1208,1209,1208,1209,1209, -1208,1208,1208,1208,1208,1208,1210,1211,1207,1212,163,163,163,163,163,163, -1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,163,163,163,163,163,163, +1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206, +1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206, +1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1206,1207,1208,1207,1208,1208, +1207,1207,1207,1207,1207,1207,1209,1210,1206,1211,163,163,163,163,163,163, +1212,1212,1212,1212,1212,1212,1212,1212,1212,1212,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 185 */ -1214,1214,1214,1214,1214,1214,1214,1214,1214,1214,1214,1214,1214,1214,1214,1214, -1214,1214,1214,1214,1214,1214,1214,1214,1214,1214,1214,163,163,1215,1215,1215, -1216,1216,1215,1215,1215,1215,1217,1215,1215,1215,1215,1218,163,163,163,163, -1219,1219,1219,1219,1219,1219,1219,1219,1219,1219,1220,1220,1221,1221,1221,1222, -1214,1214,1214,1214,1214,1214,1214,163,163,163,163,163,163,163,163,163, +1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213, +1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,1213,163,163,1214,1214,1214, +1215,1215,1214,1214,1214,1214,1216,1214,1214,1214,1214,1217,163,163,163,163, +1218,1218,1218,1218,1218,1218,1218,1218,1218,1218,1219,1219,1220,1220,1220,1221, +1213,1213,1213,1213,1213,1213,1213,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 186 */ -1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223, -1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223, -1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1223,1224,1224,1224,1225, -1225,1225,1225,1225,1225,1225,1225,1225,1224,1226,1227,1228,163,163,163,163, +1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222, +1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222, +1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1222,1223,1223,1223,1224, +1224,1224,1224,1224,1224,1224,1224,1224,1223,1225,1226,1227,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4273,52 +4272,52 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ /* block 187 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, +1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, +1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228,1228, 1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229, 1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229,1229, -1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230, -1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1230, -1231,1231,1231,1231,1231,1231,1231,1231,1231,1231,1232,1232,1232,1232,1232,1232, -1232,1232,1232,163,163,163,163,163,163,163,163,163,163,163,163,1233, +1230,1230,1230,1230,1230,1230,1230,1230,1230,1230,1231,1231,1231,1231,1231,1231, +1231,1231,1231,163,163,163,163,163,163,163,163,163,163,163,163,1232, /* block 188 */ -1234,1234,1234,1234,1234,1234,1234,163,163,1234,163,163,1234,1234,1234,1234, -1234,1234,1234,1234,163,1234,1234,163,1234,1234,1234,1234,1234,1234,1234,1234, -1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234,1234, -1235,1236,1236,1236,1236,1236,163,1236,1236,163,163,1237,1237,1238,1239,1240, -1236,1240,1236,1241,1242,1243,1242,163,163,163,163,163,163,163,163,163, -1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,163,163,163,163,163,163, +1233,1233,1233,1233,1233,1233,1233,163,163,1233,163,163,1233,1233,1233,1233, +1233,1233,1233,1233,163,1233,1233,163,1233,1233,1233,1233,1233,1233,1233,1233, +1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,1233,1233, +1234,1235,1235,1235,1235,1235,163,1235,1235,163,163,1236,1236,1237,1238,1239, +1235,1239,1235,1240,1241,1242,1241,163,163,163,163,163,163,163,163,163, +1243,1243,1243,1243,1243,1243,1243,1243,1243,1243,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 189 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, -1245,1245,1245,1245,1245,1245,1245,1245,163,163,1245,1245,1245,1245,1245,1245, -1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,1245, -1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,1245,1245, -1245,1246,1246,1246,1247,1247,1247,1247,163,163,1247,1247,1246,1246,1246,1246, -1248,1245,1249,1245,1246,163,163,163,163,163,163,163,163,163,163,163, +1244,1244,1244,1244,1244,1244,1244,1244,163,163,1244,1244,1244,1244,1244,1244, +1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244, +1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244,1244, +1244,1245,1245,1245,1246,1246,1246,1246,163,163,1246,1246,1245,1245,1245,1245, +1247,1244,1248,1244,1245,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 190 */ -1250,1251,1251,1251,1251,1251,1251,1252,1252,1251,1251,1250,1250,1250,1250,1250, -1250,1250,1250,1250,1250,1250,1250,1250,1250,1250,1250,1250,1250,1250,1250,1250, -1250,1250,1250,1250,1250,1250,1250,1250,1250,1250,1250,1250,1250,1250,1250,1250, -1250,1250,1250,1253,1254,1251,1251,1251,1251,1255,1256,1251,1251,1251,1251,1257, -1257,1257,1258,1258,1257,1257,1257,1254,163,163,163,163,163,163,163,163, -1259,1260,1260,1260,1260,1260,1260,1261,1261,1260,1260,1260,1259,1259,1259,1259, -1259,1259,1259,1259,1259,1259,1259,1259,1259,1259,1259,1259,1259,1259,1259,1259, -1259,1259,1259,1259,1259,1259,1259,1259,1259,1259,1259,1259,1259,1259,1259,1259, +1249,1250,1250,1250,1250,1250,1250,1251,1251,1250,1250,1249,1249,1249,1249,1249, +1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249, +1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249,1249, +1249,1249,1249,1252,1253,1250,1250,1250,1250,1254,1255,1250,1250,1250,1250,1256, +1256,1256,1257,1257,1256,1256,1256,1253,163,163,163,163,163,163,163,163, +1258,1259,1259,1259,1259,1259,1259,1260,1260,1259,1259,1259,1258,1258,1258,1258, +1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258, +1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258,1258, /* block 191 */ -1259,1259,1259,1259,1262,1262,1262,1262,1262,1262,1260,1260,1260,1260,1260,1260, -1260,1260,1260,1260,1260,1260,1260,1261,1263,1264,1265,1266,1266,1259,1265,1265, -1265,1267,1267,163,163,163,163,163,163,163,163,163,163,163,163,163, +1258,1258,1258,1258,1261,1261,1261,1261,1261,1261,1259,1259,1259,1259,1259,1259, +1259,1259,1259,1259,1259,1259,1259,1260,1262,1263,1264,1265,1265,1258,1264,1264, +1264,1266,1266,163,163,163,163,163,163,163,163,163,163,163,163,163, 496,496,496,496,496,496,496,496,496,496,496,496,496,496,496,496, -1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268, -1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268, -1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268, -1268,1268,1268,1268,1268,1268,1268,1268,1268,163,163,163,163,163,163,163, +1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267, +1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267, +1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267,1267, +1267,1267,1267,1267,1267,1267,1267,1267,1267,163,163,163,163,163,163,163, /* block 192 */ 343,343,343,343,343,343,343,343,343,343,163,163,163,163,163,163, @@ -4331,39 +4330,39 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 193 */ -1269,1269,1269,1269,1269,1269,1269,1269,1269,163,1269,1269,1269,1269,1269,1269, -1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269, -1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1269,1270, -1271,1271,1271,1271,1271,1271,1271,163,1271,1271,1271,1271,1271,1271,1270,1272, -1269,1273,1273,1274,1275,1275,163,163,163,163,163,163,163,163,163,163, -1276,1276,1276,1276,1276,1276,1276,1276,1276,1276,1277,1277,1277,1277,1277,1277, -1277,1277,1277,1277,1277,1277,1277,1277,1277,1277,1277,1277,1277,163,163,163, -1278,1279,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280, +1268,1268,1268,1268,1268,1268,1268,1268,1268,163,1268,1268,1268,1268,1268,1268, +1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268, +1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1268,1269, +1270,1270,1270,1270,1270,1270,1270,163,1270,1270,1270,1270,1270,1270,1269,1271, +1268,1272,1272,1273,1274,1274,163,163,163,163,163,163,163,163,163,163, +1275,1275,1275,1275,1275,1275,1275,1275,1275,1275,1276,1276,1276,1276,1276,1276, +1276,1276,1276,1276,1276,1276,1276,1276,1276,1276,1276,1276,1276,163,163,163, +1277,1278,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279, /* block 194 */ -1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280, -163,163,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281,1281, -1281,1281,1281,1281,1281,1281,1281,1281,163,1282,1281,1281,1281,1281,1281,1281, -1281,1282,1281,1281,1282,1281,1281,163,163,163,163,163,163,163,163,163, +1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279,1279, +163,163,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280,1280, +1280,1280,1280,1280,1280,1280,1280,1280,163,1281,1280,1280,1280,1280,1280,1280, +1280,1281,1280,1280,1281,1280,1280,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 195 */ -1283,1283,1283,1283,1283,1283,1283,163,1283,1283,163,1283,1283,1283,1283,1283, -1283,1283,1283,1283,1283,1283,1283,1283,1283,1283,1283,1283,1283,1283,1283,1283, -1283,1283,1283,1283,1283,1283,1283,1283,1283,1283,1283,1283,1283,1283,1283,1283, -1283,1284,1284,1284,1284,1284,1284,163,163,163,1284,163,1284,1284,163,1284, -1284,1284,1285,1284,1286,1286,1287,1284,163,163,163,163,163,163,163,163, -1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,163,163,163,163,163,163, -1289,1289,1289,1289,1289,1289,163,1289,1289,163,1289,1289,1289,1289,1289,1289, -1289,1289,1289,1289,1289,1289,1289,1289,1289,1289,1289,1289,1289,1289,1289,1289, +1282,1282,1282,1282,1282,1282,1282,163,1282,1282,163,1282,1282,1282,1282,1282, +1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282, +1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282,1282, +1282,1283,1283,1283,1283,1283,1283,163,163,163,1283,163,1283,1283,163,1283, +1283,1283,1284,1283,1285,1285,1286,1283,163,163,163,163,163,163,163,163, +1287,1287,1287,1287,1287,1287,1287,1287,1287,1287,163,163,163,163,163,163, +1288,1288,1288,1288,1288,1288,163,1288,1288,163,1288,1288,1288,1288,1288,1288, +1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1288, /* block 196 */ -1289,1289,1289,1289,1289,1289,1289,1289,1289,1289,1290,1290,1290,1290,1290,163, -1291,1291,163,1290,1290,1291,1290,1292,1289,163,163,163,163,163,163,163, -1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,163,163,163,163,163,163, +1288,1288,1288,1288,1288,1288,1288,1288,1288,1288,1289,1289,1289,1289,1289,163, +1290,1290,163,1289,1289,1290,1289,1291,1288,163,163,163,163,163,163,163, +1292,1292,1292,1292,1292,1292,1292,1292,1292,1292,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4377,16 +4376,16 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, -1294,1294,1294,1294,1294,1294,1294,1294,1294,1294,1294,1294,1294,1294,1294,1294, -1294,1294,1294,1295,1295,1296,1296,1297,1297,163,163,163,163,163,163,163, +1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,1293,1293, +1293,1293,1293,1294,1294,1295,1295,1296,1296,163,163,163,163,163,163,163, /* block 198 */ -1298,1298,1299,1300,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301, -1301,163,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301, -1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301,1301, -1301,1301,1301,1301,1300,1300,1298,1298,1298,1298,1298,163,163,163,1300,1300, -1298,1302,1303,1304,1304,1305,1305,1305,1305,1305,1305,1305,1305,1305,1305,1305, -1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,163,163,163,163,163,163, +1297,1297,1298,1299,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300, +1300,163,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300, +1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300,1300, +1300,1300,1300,1300,1299,1299,1297,1297,1297,1297,1297,163,163,163,1299,1299, +1297,1301,1302,1303,1303,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304,1304, +1305,1305,1305,1305,1305,1305,1305,1305,1305,1305,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4395,24 +4394,24 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 843,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, -1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307,1307, -388,388,1307,388,1307,390,390,390,390,390,390,390,390,391,391,391, +1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306,1306, +388,388,1306,388,1306,390,390,390,390,390,390,390,390,391,391,391, 391,390,390,390,390,390,390,390,390,390,390,390,390,390,390,390, -390,390,163,163,163,163,163,163,163,163,163,163,163,163,163,1308, +390,390,163,163,163,163,163,163,163,163,163,163,163,163,163,1307, /* block 200 */ -1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, -1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, -1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, -1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, -1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, -1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, -1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, -1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, /* block 201 */ -1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, -1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,163,163,163,163,163,163, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4421,71 +4420,71 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 202 */ -1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310, -1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310, -1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310, -1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310, -1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310, -1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310, -1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,1310,163, -1311,1311,1311,1311,1311,163,163,163,163,163,163,163,163,163,163,163, - -/* block 203 */ 1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, 1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, 1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, 1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, -1309,1309,1309,1309,163,163,163,163,163,163,163,163,163,163,163,163, +1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, +1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309, +1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,1309,163, +1310,1310,1310,1310,1310,163,163,163,163,163,163,163,163,163,163,163, + +/* block 203 */ +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, +1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308,1308, +1308,1308,1308,1308,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 204 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, -1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312, -1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312, -1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312, -1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312, -1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312, -1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312,1312, -1312,1313,1313,163,163,163,163,163,163,163,163,163,163,163,163,163, +1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311, +1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311, +1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311, +1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311, +1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311, +1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311,1311, +1311,1312,1312,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 205 */ -1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314, -1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314, -1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314, -1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314, -1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314, -1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314, -1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314, -1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314, +1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313, +1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313, +1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313, +1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313, +1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313, +1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313, +1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313, +1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313, /* block 206 */ +1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313, +1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313, +1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313,1313, 1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314, -1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314, -1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314,1314, -1315,1315,1315,1315,1315,1315,1315,1315,1315,1315,1315,1315,1315,1315,1315,1315, -1316,1314,1314,1314,1314,1314,1314,1317,1317,1317,1317,1317,1317,1317,1317,1317, -1317,1317,1317,1317,1317,1317,163,163,163,163,163,163,163,163,163,163, +1315,1313,1313,1313,1313,1313,1313,1316,1316,1316,1316,1316,1316,1316,1316,1316, +1316,1316,1316,1316,1316,1316,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 207 */ -1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, -1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, -1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, -1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, -1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, -1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, -1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, -1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, +1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317, +1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317, +1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317, +1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317, +1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317, +1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317, +1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317, +1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317, /* block 208 */ -1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, -1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, -1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, -1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, -1318,1318,1318,1318,1318,1318,1318,163,163,163,163,163,163,163,163,163, +1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317, +1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317, +1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317, +1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317,1317, +1317,1317,1317,1317,1317,1317,1317,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4505,33 +4504,33 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859, 859,859,859,859,859,859,859,859,859,859,859,859,859,859,859,859, 859,859,859,859,859,859,859,859,859,163,163,163,163,163,163,163, -1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,1319, -1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,163, -1320,1320,1320,1320,1320,1320,1320,1320,1320,1320,163,163,163,163,1321,1321, -1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322, +1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318, +1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,1318,163, +1319,1319,1319,1319,1319,1319,1319,1319,1319,1319,163,163,163,163,1320,1320, +1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321, /* block 211 */ -1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322, -1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322, -1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322, -1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,163, -1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,163,163,163,163,163,163, -1324,1324,1324,1324,1324,1324,1324,1324,1324,1324,1324,1324,1324,1324,1324,1324, -1324,1324,1324,1324,1324,1324,1324,1324,1324,1324,1324,1324,1324,1324,163,163, -1325,1325,1325,1325,1325,1326,163,163,163,163,163,163,163,163,163,163, +1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321, +1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321, +1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321, +1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,1321,163, +1322,1322,1322,1322,1322,1322,1322,1322,1322,1322,163,163,163,163,163,163, +1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323, +1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,1323,163,163, +1324,1324,1324,1324,1324,1325,163,163,163,163,163,163,163,163,163,163, /* block 212 */ -1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327, -1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327, -1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327, -1328,1328,1328,1328,1328,1328,1328,1329,1329,1330,1331,1331,1332,1332,1332,1332, -1333,1333,1334,1334,1329,1332,163,163,163,163,163,163,163,163,163,163, -1335,1335,1335,1335,1335,1335,1335,1335,1335,1335,163,1336,1336,1336,1336,1336, -1336,1336,163,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327, -1327,1327,1327,1327,1327,1327,1327,1327,163,163,163,163,163,1327,1327,1327, +1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326, +1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326, +1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326, +1327,1327,1327,1327,1327,1327,1327,1328,1328,1329,1330,1330,1331,1331,1331,1331, +1332,1332,1333,1333,1328,1331,163,163,163,163,163,163,163,163,163,163, +1334,1334,1334,1334,1334,1334,1334,1334,1334,1334,163,1335,1335,1335,1335,1335, +1335,1335,163,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326, +1326,1326,1326,1326,1326,1326,1326,1326,163,163,163,163,163,1326,1326,1326, /* block 213 */ -1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327,1327, +1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326,1326, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4545,14 +4544,14 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, +1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336, +1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336,1336, 1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337, 1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337,1337, -1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338, -1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338, /* block 215 */ -1339,1339,1339,1339,1339,1339,1339,1339,1339,1339,1339,1339,1339,1339,1339,1339, -1339,1339,1339,1339,1339,1339,1339,1340,1341,1342,1342,163,163,163,163,163, +1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338,1338, +1338,1338,1338,1338,1338,1338,1338,1339,1340,1341,1341,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4561,26 +4560,46 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 216 */ -1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343, -1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343, -1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343, -1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343, -1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,1343,163,163,163,163,1344, -1343,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345, -1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345, -1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345,1345, +1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342, +1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342, +1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342, +1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342, +1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,1342,163,163,163,163,1343, +1342,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344, +1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344, +1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344,1344, /* block 217 */ -1345,1345,1345,1345,1345,1345,1345,1345,163,163,163,163,163,163,163,1346, -1346,1346,1346,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347,1347, +1344,1344,1344,1344,1344,1344,1344,1344,163,163,163,163,163,163,163,1345, +1345,1345,1345,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346,1346, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, -1348,1349,1350,800,1351,163,163,163,163,163,163,163,163,163,163,163, -1352,1352,163,163,163,163,163,163,163,163,163,163,163,163,163,163, +1347,1348,1349,800,1350,163,163,163,163,163,163,163,163,163,163,163, +1351,1351,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 218 */ +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, + +/* block 219 */ +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352,1352, +1352,1352,1352,1352,1352,1352,1352,1352,163,163,163,163,163,163,163,163, + +/* block 220 */ 1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353, 1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353, 1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353, @@ -4590,38 +4609,18 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353, 1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353, -/* block 219 */ -1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353, -1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353, +/* block 221 */ 1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353, 1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353, 1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353, 1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353, 1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353,1353, -1353,1353,1353,1353,1353,1353,1353,1353,163,163,163,163,163,163,163,163, - -/* block 220 */ -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, - -/* block 221 */ -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, -1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354,1354, -1354,1354,1354,1354,1354,1354,163,163,163,163,163,163,163,163,163,163, +1353,1353,1353,1353,1353,1353,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 222 */ -1353,1353,1353,1353,1353,1353,1353,1353,1353,163,163,163,163,163,163,163, +1352,1352,1352,1352,1352,1352,1352,1352,1352,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4638,7 +4637,7 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, -1355,1355,1355,1355,163,1355,1355,1355,1355,1355,1355,1355,163,1355,1355,163, +1354,1354,1354,1354,163,1354,1354,1354,1354,1354,1354,1354,163,1354,1354,163, /* block 224 */ 825,820,820,820,820,820,820,820,820,820,820,820,820,820,820,820, @@ -4668,42 +4667,42 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 820,820,820,163,163,825,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,825,825,825,825,163,163,163,163,163,163,163,163, -1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, /* block 227 */ -1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, -1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, -1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, -1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, -1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, -1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, -1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, -1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, /* block 228 */ +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355, +1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,1355,163,163,163,163, + +/* block 229 */ 1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, 1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, 1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, 1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, 1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, 1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, -1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356, -1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,163,163,163,163, - -/* block 229 */ -1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357, -1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357, -1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357, -1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357, -1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357, -1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357, -1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,163,163,163,163,163, -1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,163,163,163, +1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,163,163,163,163,163, +1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,163,163,163, /* block 230 */ -1357,1357,1357,1357,1357,1357,1357,1357,1357,163,163,163,163,163,163,163, -1357,1357,1357,1357,1357,1357,1357,1357,1357,1357,163,163,1358,1359,1360,1361, -1362,1362,1362,1362,163,163,163,163,163,163,163,163,163,163,163,163, +1356,1356,1356,1356,1356,1356,1356,1356,1356,163,163,163,163,163,163,163, +1356,1356,1356,1356,1356,1356,1356,1356,1356,1356,163,163,1357,1358,1359,1360, +1361,1361,1361,1361,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4757,8 +4756,8 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461, 461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461, 461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461, -461,461,461,461,461,1363,1364,154,154,154,461,461,461,1365,1366,1366, -1366,1366,1366, 51, 51, 51, 51, 51, 51, 51, 51,154,154,154,154,154, +461,461,461,461,461,1362,1363,154,154,154,461,461,461,1364,1365,1365, +1365,1365,1365, 51, 51, 51, 51, 51, 51, 51, 51,154,154,154,154,154, /* block 236 */ 154,154,154,461,461,154,154,154,154,154,154,154,461,461,461,461, @@ -4775,7 +4774,7 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001, 1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001, 1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001, -1001,1001,1367,1367,1367,1001,163,163,163,163,163,163,163,163,163,163, +1001,1001,1366,1366,1366,1001,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4855,55 +4854,55 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 726,726,737,737,726,726,726,726,726,726,726,726,726,726,726,726, 726,726,726,726,726,726,163,163,725,725,725,725,725,725,725,725, 725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725, -725,1368,726,726,726,726,726,726,726,726,726,726,726,726,726,726, +725,1367,726,726,726,726,726,726,726,726,726,726,726,726,726,726, 726,726,726,726,726,726,726,726,726,726,726,716,726,726,726,726, 726,726,725,725,725,725,725,725,725,725,725,725,725,725,725,725, -725,725,725,725,725,725,725,725,725,725,725,1368,726,726,726,726, +725,725,725,725,725,725,725,725,725,725,725,1367,726,726,726,726, /* block 246 */ 726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,726, 726,726,726,726,726,716,726,726,726,726,726,726,725,725,725,725, 725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725, -725,725,725,725,725,1368,726,726,726,726,726,726,726,726,726,726, +725,725,725,725,725,1367,726,726,726,726,726,726,726,726,726,726, 726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,716, 726,726,726,726,726,726,725,725,725,725,725,725,725,725,725,725, -725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,1368, +725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,1367, 726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,726, /* block 247 */ 726,726,726,726,726,726,726,726,726,716,726,726,726,726,726,726, 725,725,725,725,725,725,725,725,725,725,725,725,725,725,725,725, -725,725,725,725,725,725,725,725,725,1368,726,726,726,726,726,726, +725,725,725,725,725,725,725,725,725,1367,726,726,726,726,726,726, 726,726,726,726,726,726,726,726,726,726,726,726,726,726,726,726, -726,726,726,716,726,726,726,726,726,726,725,726,163,163,1369,1369, +726,726,726,716,726,726,726,726,726,726,725,726,163,163,1368,1368, +1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368, +1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368, +1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368,1368, + +/* block 248 */ +1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369, +1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369, +1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369, +1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369, +1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369, 1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369, 1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369, 1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369, -/* block 248 */ -1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, -1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, -1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, +/* block 249 */ 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, +1370,1370,1370,1370,1370,1370,1370,1369,1369,1369,1369,1370,1370,1370,1370,1370, 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, 1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, - -/* block 249 */ -1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371, -1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371, -1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371, -1371,1371,1371,1371,1371,1371,1371,1370,1370,1370,1370,1371,1371,1371,1371,1371, -1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371, -1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371, -1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1370,1370,1370, -1370,1370,1370,1370,1370,1371,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, +1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1369,1369,1369, +1369,1369,1369,1369,1369,1370,1369,1369,1369,1369,1369,1369,1369,1369,1369,1369, /* block 250 */ -1370,1370,1370,1370,1371,1370,1370,1372,1373,1372,1372,1374,163,163,163,163, -163,163,163,163,163,163,163,163,163,163,163,1371,1371,1371,1371,1371, -163,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371,1371, +1369,1369,1369,1369,1370,1369,1369,1371,1372,1371,1371,1373,163,163,163,163, +163,163,163,163,163,163,163,163,163,163,163,1370,1370,1370,1370,1370, +163,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370,1370, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4921,13 +4920,13 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 252 */ -1375,1375,1375,1375,1375,1375,1375,163,1375,1375,1375,1375,1375,1375,1375,1375, -1375,1375,1375,1375,1375,1375,1375,1375,1375,163,163,1375,1375,1375,1375,1375, -1375,1375,163,1375,1375,163,1375,1375,1375,1375,1375,163,163,163,163,163, +1374,1374,1374,1374,1374,1374,1374,163,1374,1374,1374,1374,1374,1374,1374,1374, +1374,1374,1374,1374,1374,1374,1374,1374,1374,163,163,1374,1374,1374,1374,1374, +1374,1374,163,1374,1374,163,1374,1374,1374,1374,1374,163,163,163,163,163, 858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858, -858,858,858,858,858,858,858,858,858,858,858,858,1376,1376,858,858, +858,858,858,858,858,858,858,858,858,858,858,858,1375,1375,858,858, 858,858,858,858,858,858,858,858,858,858,858,858,858,858,858,858, -858,858,858,858,858,858,858,858,1376,858,858,858,858,858,163,163, +858,858,858,858,858,858,858,858,1375,858,858,858,858,858,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 253 */ @@ -4941,24 +4940,24 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 254 */ -1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377, -1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377, -1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,1377,163,163,163, -1378,1378,1378,1378,1378,1378,1378,1379,1379,1379,1379,1379,1380,1380,163,163, -1381,1381,1381,1381,1381,1381,1381,1381,1381,1381,163,163,163,163,1377,1382, +1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376, +1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376, +1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,1376,163,163,163, +1377,1377,1377,1377,1377,1377,1377,1378,1378,1378,1378,1378,1379,1379,163,163, +1380,1380,1380,1380,1380,1380,1380,1380,1380,1380,163,163,163,163,1376,1381, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, /* block 255 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, -1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383, -1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1383,1384,163, +1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382, +1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1382,1383,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, -1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385, -1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385, -1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1385,1386,1386,1386,1386, -1387,1387,1387,1387,1387,1387,1387,1387,1387,1387,163,163,163,163,163,1388, +1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384, +1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384, +1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1384,1385,1385,1385,1385, +1386,1386,1386,1386,1386,1386,1386,1386,1386,1386,163,163,163,163,163,1387, /* block 256 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4966,9 +4965,9 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, -1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389, -1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1389,1390,1391,1391,1391,1391, -1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,163,163,163,163,163,163, +1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388, +1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1388,1389,1390,1390,1390,1390, +1391,1391,1391,1391,1391,1391,1391,1391,1391,1391,163,163,163,163,163,163, /* block 257 */ 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, @@ -4981,32 +4980,32 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 484,484,484,484,484,484,484,484,484,484,484,484,484,484,484,163, /* block 258 */ -1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393, -1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393, -1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393, -1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393, -1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393, -1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393, -1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393, -1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393, +1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392, +1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392, +1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392, +1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392, +1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392, +1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392, +1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392, +1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392, /* block 259 */ -1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393, -1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393, -1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393, -1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393,1393, -1393,1393,1393,1393,1393,262,262,1394,1394,1394,1394,1394,1394,1394,1394,1394, -1395,1395,1395,1395,1395,1395,1395,262,262,262,262,262,262,262,262,262, +1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392, +1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392, +1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392, +1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392,1392, +1392,1392,1392,1392,1392,262,262,1393,1393,1393,1393,1393,1393,1393,1393,1393, +1394,1394,1394,1394,1394,1394,1394,262,262,262,262,262,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, /* block 260 */ +1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395, +1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395,1395, +1395,1395,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396, 1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396, -1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396,1396, -1396,1396,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397, -1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397,1397, -1397,1397,1397,1397,1398,1398,1398,1399,1400,1400,1400,1401,262,262,262,262, -1402,1402,1402,1402,1402,1402,1402,1402,1402,1402,262,262,262,262,1403,1403, +1396,1396,1396,1396,1397,1397,1397,1398,1399,1399,1399,1400,262,262,262,262, +1401,1401,1401,1401,1401,1401,1401,1401,1401,1401,262,262,262,262,1402,1402, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, @@ -5018,187 +5017,187 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, -302,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404, +302,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403, /* block 262 */ -1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404, -1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404, -1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1405,1404,1404,1404, -1406,1404,1404,1404,1404,302,302,302,302,302,302,302,302,302,302,302, +1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403, +1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403, +1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1404,1403,1403,1403, +1405,1403,1403,1403,1403,302,302,302,302,302,302,302,302,302,302,302, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, /* block 263 */ -302,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404, -1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404, -1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1405,1404, -1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,1404,302,302, +302,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403, +1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403, +1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1404,1403, +1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,1403,302,302, 302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, 262,262,262,262,262,262,262,262,262,262,262,262,262,262,262,262, /* block 264 */ -1407,1407,1407,1407,302,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, -1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, -302,1407,1407,302,1407,302,302,1407,302,1407,1407,1407,1407,1407,1407,1407, -1407,1407,1407,302,1407,1407,1407,1407,302,1407,302,1407,302,302,302,302, -302,302,1407,302,302,302,302,1407,302,1407,302,1407,302,1407,1407,1407, -302,1407,1407,302,1407,302,302,1407,302,1407,302,1407,302,1407,302,1407, -302,1407,1407,302,1407,302,302,1407,1407,1407,1407,302,1407,1407,1407,1407, -1407,1407,1407,302,1407,1407,1407,1407,302,1407,1407,1407,1407,302,1407,302, +1406,1406,1406,1406,302,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406, +1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406, +302,1406,1406,302,1406,302,302,1406,302,1406,1406,1406,1406,1406,1406,1406, +1406,1406,1406,302,1406,1406,1406,1406,302,1406,302,1406,302,302,302,302, +302,302,1406,302,302,302,302,1406,302,1406,302,1406,302,1406,1406,1406, +302,1406,1406,302,1406,302,302,1406,302,1406,302,1406,302,1406,302,1406, +302,1406,1406,302,1406,302,302,1406,1406,1406,1406,302,1406,1406,1406,1406, +1406,1406,1406,302,1406,1406,1406,1406,302,1406,1406,1406,1406,302,1406,302, /* block 265 */ -1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,302,1407,1407,1407,1407,1407, -1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,302,302,302,302, -302,1407,1407,1407,302,1407,1407,1407,1407,1407,302,1407,1407,1407,1407,1407, -1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,302,302,302,302, +1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,302,1406,1406,1406,1406,1406, +1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,302,302,302,302, +302,1406,1406,1406,302,1406,1406,1406,1406,1406,302,1406,1406,1406,1406,1406, +1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,1406,302,302,302,302, 302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, 302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, 302,302,302,302,302,302,302,302,302,302,302,302,302,302,302,302, 274,274,302,302,302,302,302,302,302,302,302,302,302,302,302,302, /* block 266 */ -1408,1408,1408,1408,1409,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1410,1410,1410,1410, -1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1407,1407,1407,1407,1408,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1409,1409,1409,1409, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, /* block 267 */ -1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1408,1408,1408,1408,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1410, -1410,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1410,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1409, -1410,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1408,1408,1408,1408,1408,1408,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1409, +1409,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1409,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1408, +1409,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1407,1407,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, /* block 268 */ - 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 58, 58,1408,1408,1408, + 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 54, 58, 58,1407,1407,1407, 461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,461, -461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,1408, -1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411, -1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,461,461,461,461,461,461, -1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411, -1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,724,724,1408,1408,1408,1408, -1412,1412,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,1412,1412, - -/* block 269 */ -1411,1411,1411,1411,1411,1411,1411,1411,1411,1411,461,461,461,461,1413,461, -461,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,461,461,461,461,461, -461,461,461,461,461,461,461,461,461,461,461,461,461,1408,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, +461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,1407, 1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, +1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,461,461,461,461,461,461, 1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414, -1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414,1414, +1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,724,724,1407,1407,1407,1407, +1411,1411,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1411,1411, + +/* block 269 */ +1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,461,461,461,461,1412,461, +461,1412,1412,1412,1412,1412,1412,1412,1412,1412,1412,461,461,461,461,461, +461,461,461,461,461,461,461,461,461,461,461,461,461,1407,1409,1409, +1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1409,1409,1409,1409,1409,1409,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413, +1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413,1413, /* block 270 */ -1415,1413,1416,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -461,461,461,461,461,461,461,461,461,461,1413,461,461,461,461,461, -461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,1413, -461,461,1413,1413,1413,1413,1413,1416,1413,1413,1413,461,1410,1410,1410,1410, -461,461,461,461,461,461,461,461,461,1410,1410,1410,1410,1410,1410,1410, -1417,1417,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1408,1408,1408,1408,1408,1408,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, +1414,1412,1415,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +461,461,461,461,461,461,461,461,461,461,1412,461,461,461,461,461, +461,461,461,461,461,461,461,461,461,461,461,461,461,461,461,1412, +461,461,1412,1412,1412,1412,1412,1415,1412,1412,1412,461,1409,1409,1409,1409, +461,461,461,461,461,461,461,461,461,1409,1409,1409,1409,1409,1409,1409, +1416,1416,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1407,1407,1407,1407,1407,1407,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, /* block 271 */ -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, - -/* block 272 */ 1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, 1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,728,1408,1408,728,728,728,728,728,728,728,728,728,1409,1409,1409, -1409,1409,1409,1409,1409,1409,728,1409,1409,1409,1409,1409,1409,1409,1409,1409, 1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, 1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, 1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,728,1409,1409, - -/* block 273 */ -1409,1409,1409,1409,1409,1418,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1408,1408,728,728,1408,728,728,728,1408,1408,728,728, 1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, 1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1418,1418,1418,1409,1409,1418,1409,1409,1418,1419,1419,728,728,1409, -1409,1409,1409,1409,728,728,728,728,728,728,728,728,728,728,728,728, 1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1408,1408,728,1409,728,1408,728,1409,1409,1409,1420,1420,1420,1420,1420, + +/* block 272 */ +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,728,1407,1407,728,728,728,728,728,728,728,728,728,1408,1408,1408, +1408,1408,1408,1408,1408,1408,728,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,728,1408,1408, + +/* block 273 */ +1408,1408,1408,1408,1408,1417,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1407,1407,728,728,1407,728,728,728,1407,1407,728,728, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1417,1417,1417,1408,1408,1417,1408,1408,1417,1418,1418,728,728,1408, +1408,1408,1408,1408,728,728,728,728,728,728,728,728,728,728,728,728, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1407,1407,728,1408,728,1407,728,1408,1408,1408,1419,1419,1419,1419,1419, /* block 274 */ -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,728, -1409,728,1418,1418,1409,1409,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418, -1418,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418, -1418,1418,1418,1418,1418,1418,1418,1418,1418,1409,1409,1409,1418,1409,1409,1409, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,728, +1408,728,1417,1417,1408,1408,1417,1417,1417,1417,1417,1417,1417,1417,1417,1417, +1417,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1417,1417,1417,1417,1417,1417,1417,1417,1417,1417, +1417,1417,1417,1417,1417,1417,1417,1417,1417,1408,1408,1408,1417,1408,1408,1408, /* block 275 */ -1409,1418,1418,1418,1409,1418,1418,1418,1409,1409,1409,1409,1409,1409,1409,1418, -1409,1418,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1418,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,728,1408,1409, +1408,1417,1417,1417,1408,1417,1417,1417,1408,1408,1408,1408,1408,1408,1408,1417, +1408,1417,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1417,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,728,1407,1408, /* block 276 */ -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,724,724, -724,724,724,724,724,724,1408,1408,1408,728,728,1409,1409,1409,1409,1408, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1408,1408,1408,1408,1408,1408,1408,728, -728,1408,1408,728,1419,1419,728,728,728,728,1418,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,724,724, +724,724,724,724,724,724,1407,1407,1407,728,728,1408,1408,1408,1408,1407, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1407,1407,1407,1407,1407,1407,1407,728, +728,1407,1407,728,1418,1418,728,728,728,728,1417,1407,1407,1407,1407,1407, /* block 277 */ -1408,1408,1408,1408,1408,1408,1408,728,1408,1408,728,728,728,728,1408,1408, -1419,1408,1408,1408,1408,1418,1418,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1408,1408,1408,1408,1409,728,1408,1408,728,1408,1408,1408,1408,1408,1408,1408, -1408,728,728,1408,1408,1408,1408,1408,1408,1408,1408,1408,728,1408,1408,1408, -1408,1408,728,728,728,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1408,728,728,728,1408,1408,1408,1408,1408,1408,1408,1408,728,728,728,1408, -1408,728,1408,728,1408,1408,1408,1408,728,1408,1408,1408,1408,1408,1408,728, -1408,1408,1408,728,1408,1408,1408,1408,1408,1408,728,1409,1409,1409,1409,1409, +1407,1407,1407,1407,1407,1407,1407,728,1407,1407,728,728,728,728,1407,1407, +1418,1407,1407,1407,1407,1417,1417,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1408,728,1407,1407,728,1407,1407,1407,1407,1407,1407,1407, +1407,728,728,1407,1407,1407,1407,1407,1407,1407,1407,1407,728,1407,1407,1407, +1407,1407,728,728,728,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,728,728,728,1407,1407,1407,1407,1407,1407,1407,1407,728,728,728,1407, +1407,728,1407,728,1407,1407,1407,1407,728,1407,1407,1407,1407,1407,1407,728, +1407,1407,1407,728,1407,1407,1407,1407,1407,1407,728,1408,1408,1408,1408,1408, /* block 278 */ -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1418,1418,1418,1409,1409,1409,1418,1418,1418,1418,1418, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1417,1417,1417,1408,1408,1408,1417,1417,1417,1417,1417, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, /* block 279 */ -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1418,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1418,1418,1418,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1418,1409,1409,1409,1409,1409,1408,1408,1408,1408,1408,728,1418,728,728,728, -1409,1409,1409,1408,1408,1409,1409,1409,1410,1410,1410,1410,1409,1409,1409,1409, -728,728,728,728,728,728,1408,1408,1408,728,1408,1409,1409,1410,1410,1410, -728,1408,1408,728,1409,1409,1409,1409,1409,1409,1409,1409,1409,1410,1410,1410, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1417,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1417,1417,1417,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1417,1408,1408,1408,1408,1408,1407,1407,1407,1407,1407,728,1417,728,728,728, +1408,1408,1408,1407,1407,1408,1408,1408,1409,1409,1409,1409,1408,1408,1408,1408, +728,728,728,728,728,728,1407,1407,1407,728,1407,1408,1408,1409,1409,1409, +728,1407,1407,728,1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1409,1409, /* block 280 */ 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, @@ -5208,7 +5207,7 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, -724,724,724,724,1408,1408,1408,1410,1410,1410,1410,1408,1408,1408,1408,1408, +724,724,724,724,1407,1407,1407,1409,1409,1409,1409,1407,1407,1407,1407,1407, /* block 281 */ 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, @@ -5216,69 +5215,69 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, -724,724,724,724,724,1408,1408,1408,1408,1408,1410,1410,1410,1410,1410,1410, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1410,1410,1410,1410, -1409,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, +724,724,724,724,724,1407,1407,1407,1407,1407,1409,1409,1409,1409,1409,1409, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1409,1409,1409, +1408,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, /* block 282 */ -724,724,724,724,724,724,724,724,724,724,724,724,1410,1410,1410,1410, +724,724,724,724,724,724,724,724,724,724,724,724,1409,1409,1409,1409, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, -724,724,724,724,724,724,724,724,1410,1410,1410,1410,1410,1410,1410,1410, -724,724,724,724,724,724,724,724,724,724,1410,1410,1410,1410,1410,1410, +724,724,724,724,724,724,724,724,1409,1409,1409,1409,1409,1409,1409,1409, +724,724,724,724,724,724,724,724,724,724,1409,1409,1409,1409,1409,1409, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, /* block 283 */ -724,724,724,724,724,724,724,724,1410,1410,1410,1410,1410,1410,1410,1410, +724,724,724,724,724,724,724,724,1409,1409,1409,1409,1409,1409,1409,1409, 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, -724,724,724,724,724,724,724,724,724,724,724,724,724,724,1410,1410, -1408,1408,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, - -/* block 284 */ -724,724,724,724,724,724,724,724,724,724,724,724,1418,1409,1409,1418, -1409,1409,1409,1409,1409,1409,1409,1409,1418,1418,1418,1418,1418,1418,1418,1418, -1409,1409,1409,1409,1409,1409,1418,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1409,724,1418,1418,1418,1409, -1409,1409,1409,1409,1409,1409,724,1409,1409,1409,1409,1409,1409,1409,1409,1409, +724,724,724,724,724,724,724,724,724,724,724,724,724,724,1409,1409, +1407,1407,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, 1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, 1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1418,1409,1409,1409,1409,1409,1409,1409,1409, - -/* block 285 */ -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1421,1421,1421,1421,1409,1418,1418,1409,1418,1418,1409,1418,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1418,1418,1418, -1409,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1418,1409,1409, 1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, 1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -/* block 286 */ +/* block 284 */ +724,724,724,724,724,724,724,724,724,724,724,724,1417,1408,1408,1417, +1408,1408,1408,1408,1408,1408,1408,1408,1417,1417,1417,1417,1417,1417,1417,1417, +1408,1408,1408,1408,1408,1408,1417,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1417,1417,1417,1417,1417,1417,1417,1417,1417,1417,1408,724,1417,1417,1417,1408, +1408,1408,1408,1408,1408,1408,724,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1417,1408,1408,1408,1408,1408,1408,1408,1408, + +/* block 285 */ 1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, 1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, 1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1420,1420,1420,1420,1408,1417,1417,1408,1417,1417,1408,1417,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1417,1417,1417, +1408,1417,1417,1417,1417,1417,1417,1417,1417,1417,1417,1417,1417,1417,1408,1408, 1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, 1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, -1408,1408,1408,1408,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1410,1410, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1410,1410,1410, + +/* block 286 */ +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407, +1407,1407,1407,1407,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1407,1409,1409, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1409,1409, /* block 287 */ -1409,1409,1409,1409,1409,1409,1409,1409,1409,1410,1410,1410,1410,1410,1410,1410, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1410,1409, -1409,1409,1409,1418,1418,1418,1410,1410,1410,1410,1410,1410,1410,1410,1409,1409, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1410,1410,1410,1410, -1409,1409,1409,1409,1409,1409,1409,1409,1409,1410,1410,1410,1410,1410,1410,1410, -1418,1418,1418,1418,1418,1418,1418,1418,1418,1410,1410,1410,1410,1410,1410,1410, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1409,1409,1409,1409,1409,1409, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1408, +1408,1408,1408,1417,1417,1417,1409,1409,1409,1409,1409,1409,1409,1409,1408,1408, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1409,1409,1409, +1408,1408,1408,1408,1408,1408,1408,1408,1408,1409,1409,1409,1409,1409,1409,1409, +1417,1417,1417,1417,1417,1417,1417,1417,1417,1409,1409,1409,1409,1409,1409,1409, /* block 288 */ 724,724,724,724,724,724,724,724,724,724,724,724,724,724,724,724, @@ -5298,17 +5297,17 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ 724,724,724,724,724,724,724,724,724,724,724,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, 163,163,163,163,163,163,163,163,163,163,163,163,163,163,163,163, -1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,163,163,163,163,163,163, +1421,1421,1421,1421,1421,1421,1421,1421,1421,1421,163,163,163,163,163,163, /* block 290 */ -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410, -1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,1410,957,957, +1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409, +1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,1409,957,957, /* block 291 */ 839,839,839,839,839,839,839,839,839,839,839,839,839,839,839,839, @@ -5403,12 +5402,12 @@ const uint16_t PRIV(ucd_stage2)[] = { /* 78080 bytes, block = 128 */ /* block 300 */ 708,713,708,708,708,708,708,708,708,708,708,708,708,708,708,708, 708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708, -1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423, -1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423, -1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423, -1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423, -1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423, -1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423,1423, +1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422, +1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422, +1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422, +1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422, +1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422, +1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422,1422, /* block 301 */ 708,708,708,708,708,708,708,708,708,708,708,708,708,708,708,708, diff --git a/src/pcre2_ucp.h b/src/pcre2_ucp.h index db14b5052..9ccc82975 100644 --- a/src/pcre2_ucp.h +++ b/src/pcre2_ucp.h @@ -166,29 +166,29 @@ enum { /* These are the bidi class values. */ enum { - ucp_bidiAL, /* Arabic letter */ - ucp_bidiAN, /* Arabic number */ - ucp_bidiB, /* Paragraph separator */ - ucp_bidiBN, /* Boundary neutral */ - ucp_bidiCS, /* Common separator */ - ucp_bidiEN, /* European number */ - ucp_bidiES, /* European separator */ - ucp_bidiET, /* European terminator */ - ucp_bidiFSI, /* First strong isolate */ - ucp_bidiL, /* Left to right */ - ucp_bidiLRE, /* Left to right embedding */ - ucp_bidiLRI, /* Left to right isolate */ - ucp_bidiLRO, /* Left to right override */ - ucp_bidiNSM, /* Non-spacing mark */ - ucp_bidiON, /* Other neutral */ - ucp_bidiPDF, /* Pop directional format */ - ucp_bidiPDI, /* Pop directional isolate */ - ucp_bidiR, /* Right to left */ - ucp_bidiRLE, /* Right to left embedding */ - ucp_bidiRLI, /* Right to left isolate */ - ucp_bidiRLO, /* Right to left override */ - ucp_bidiS, /* Segment separator */ - ucp_bidiWS, /* White space */ + ucp_bidiAL, /* Arabic_Letter */ + ucp_bidiAN, /* Arabic_Number */ + ucp_bidiB, /* Paragraph_Separator */ + ucp_bidiBN, /* Boundary_Neutral */ + ucp_bidiCS, /* Common_Separator */ + ucp_bidiEN, /* European_Number */ + ucp_bidiES, /* European_Separator */ + ucp_bidiET, /* European_Terminator */ + ucp_bidiFSI, /* First_Strong_Isolate */ + ucp_bidiL, /* Left_To_Right */ + ucp_bidiLRE, /* Left_To_Right_Embedding */ + ucp_bidiLRI, /* Left_To_Right_Isolate */ + ucp_bidiLRO, /* Left_To_Right_Override */ + ucp_bidiNSM, /* Nonspacing_Mark */ + ucp_bidiON, /* Other_Neutral */ + ucp_bidiPDF, /* Pop_Directional_Format */ + ucp_bidiPDI, /* Pop_Directional_Isolate */ + ucp_bidiR, /* Right_To_Left */ + ucp_bidiRLE, /* Right_To_Left_Embedding */ + ucp_bidiRLI, /* Right_To_Left_Isolate */ + ucp_bidiRLO, /* Right_To_Left_Override */ + ucp_bidiS, /* Segment_Separator */ + ucp_bidiWS, /* White_Space */ }; /* These are grapheme break properties. The Extended Pictographic property