diff lib/unictype/blocks.h @ 14152:c5273d4d49b3

Update to Unicode 5.2.0. * lib/gen-uni-tables.c (output_predicate, output_category, output_combclass, output_bidi_category, output_decimal_digit_test, output_decimal_digit, output_digit_test, output_digit, output_numeric_test, output_numeric, output_mirror, output_scripts, output_scripts_byname, output_blocks, output_ident_category): Fix comment header. (is_WBP_MIDNUMLET, is_WBP_MIDLETTER): New functions, extracted from get_wbp. (PROP_CASED, PROP_CASE_IGNORABLE, PROP_CHANGES_WHEN_*): New enumeration items. (fill_properties): Also fill the peoperties Cased, Case_Ignorable, Changes_When_Lowercased, Changes_When_Uppercased, Changes_When_Titlecased, Changes_When_Casefolded, Changes_When_Casemapped. (is_property_alphabetic, is_property_default_ignorable_code_point): Update for Unicode 5.2.0. (is_property_cased, is_property_case_ignorable, is_property_changes_when_lowercased, is_property_changes_when_uppercased, is_property_changes_when_titlecased, is_property_changes_when_casefolded, is_property_changes_when_casemapped): New functions. (output_properties): Output also the properties cased, case_ignorable, changes_when_lowercased, changes_when_uppercased, changes_when_titlecased, changes_when_casefolded, changes_when_casemapped. (symbolic_width): Update for Unicode 5.2.0, incorporating changes from Unicode TR#11 revision 17 -> 19. (LBP_CP): New enumeration value. (LBP_*): Adjust values accordingly. (get_lbp): Update for Unicode 5.2.0, incorporating changes from Unicode TR#14 revision 22 -> 24. (debug_output_lbp): Allow for LBP_* bits >= 32. Support LBP_CP. (fill_org_lbp, debug_output_org_lbp, output_lbp): Support LBP_CP. (get_wbp): Update for Unicode 5.2.0, incorporating changes from Unicode TR#29 revision 13 -> 15. Use functions is_WBP_MIDNUMLET, is_WBP_MIDLETTER. (output_composition_tables): Allow for 24 bits instead of 16 bits in the code1 and code2 of each composition rule. * lib/unicase/cased.h: Regenerated for Unicode 5.2.0. * lib/unicase/ignorable.h: Likewise. * lib/unicase/tocasefold.h: Likewise. * lib/unicase/tolower.h: Likewise. * lib/unicase/totitle.h: Likewise. * lib/unicase/toupper.h: Likewise. * lib/unictype/bidi_of.h: Likewise. * lib/unictype/blocks.h: Likewise. * lib/unictype/categ_C.h: Likewise. * lib/unictype/categ_Cf.h: Likewise. * lib/unictype/categ_Cn.h: Likewise. * lib/unictype/categ_L.h: Likewise. * lib/unictype/categ_Ll.h: Likewise. * lib/unictype/categ_Lm.h: Likewise. * lib/unictype/categ_Lo.h: Likewise. * lib/unictype/categ_Lu.h: Likewise. * lib/unictype/categ_M.h: Likewise. * lib/unictype/categ_Mc.h: Likewise. * lib/unictype/categ_Mn.h: Likewise. * lib/unictype/categ_N.h: Likewise. * lib/unictype/categ_Nd.h: Likewise. * lib/unictype/categ_Nl.h: Likewise. * lib/unictype/categ_No.h: Likewise. * lib/unictype/categ_P.h: Likewise. * lib/unictype/categ_Pd.h: Likewise. * lib/unictype/categ_Po.h: Likewise. * lib/unictype/categ_S.h: Likewise. * lib/unictype/categ_Sc.h: Likewise. * lib/unictype/categ_So.h: Likewise. * lib/unictype/categ_of.h: Likewise. * lib/unictype/combining.h: Likewise. * lib/unictype/ctype_alnum.h: Likewise. * lib/unictype/ctype_alpha.h: Likewise. * lib/unictype/ctype_graph.h: Likewise. * lib/unictype/ctype_lower.h: Likewise. * lib/unictype/ctype_print.h: Likewise. * lib/unictype/ctype_punct.h: Likewise. * lib/unictype/ctype_upper.h: Likewise. * lib/unictype/decdigit.h: Likewise. * lib/unictype/digit.h: Likewise. * lib/unictype/numeric.h: Likewise. * lib/unictype/pr_alphabetic.h: Likewise. * lib/unictype/pr_bidi_arabic_digit.h: Likewise. * lib/unictype/pr_bidi_eur_num_terminator.h: Likewise. * lib/unictype/pr_bidi_european_digit.h: Likewise. * lib/unictype/pr_bidi_hebrew_right_to_left.h: Likewise. * lib/unictype/pr_bidi_left_to_right.h: Likewise. * lib/unictype/pr_bidi_non_spacing_mark.h: Likewise. * lib/unictype/pr_bidi_other_neutral.h: Likewise. * lib/unictype/pr_combining.h: Likewise. * lib/unictype/pr_composite.h: Likewise. * lib/unictype/pr_currency_symbol.h: Likewise. * lib/unictype/pr_dash.h: Likewise. * lib/unictype/pr_decimal_digit.h: Likewise. * lib/unictype/pr_deprecated.h: Likewise. * lib/unictype/pr_diacritic.h: Likewise. * lib/unictype/pr_extender.h: Likewise. * lib/unictype/pr_grapheme_base.h: Likewise. * lib/unictype/pr_grapheme_extend.h: Likewise. * lib/unictype/pr_grapheme_link.h: Likewise. * lib/unictype/pr_id_continue.h: Likewise. * lib/unictype/pr_id_start.h: Likewise. * lib/unictype/pr_ideographic.h: Likewise. * lib/unictype/pr_ignorable_control.h: Likewise. * lib/unictype/pr_logical_order_exception.h: Likewise. * lib/unictype/pr_lowercase.h: Likewise. * lib/unictype/pr_numeric.h: Likewise. * lib/unictype/pr_other_alphabetic.h: Likewise. * lib/unictype/pr_punctuation.h: Likewise. * lib/unictype/pr_sentence_terminal.h: Likewise. * lib/unictype/pr_terminal_punctuation.h: Likewise. * lib/unictype/pr_unassigned_code_value.h: Likewise. * lib/unictype/pr_unified_ideograph.h: Likewise. * lib/unictype/pr_uppercase.h: Likewise. * lib/unictype/pr_xid_continue.h: Likewise. * lib/unictype/pr_xid_start.h: Likewise. * lib/unictype/pr_zero_width.h: Likewise. * lib/unictype/scripts.h: Likewise. * lib/unictype/scripts_byname.gperf: Likewise. * lib/unictype/sy_java_ident.h: Likewise. * lib/unigbrk/gbrkprop.h: Likewise. * lib/unilbrk/lbrkprop1.h: Likewise. * lib/unilbrk/lbrkprop2.h: Likewise. * lib/unilbrk/lbrktables.h: Likewise. * lib/unilbrk/lbrktables.c (unilbrk_table): Add a row and column for LBP_CP. Implement rule LB30. * lib/uniwidth/width.c (nonspacing_table_data): Add U+0816..U+0819, U+081B..U+0823, U+0825..U+0827, U+0829..U+082D, U+0900, U+0955, U+109D, U+1A56, U+1A58..U+1A5E, U+1A60, U+1A62, U+1A65..U+1A6C, U+1A73..U+1A7C, U+1A7F, U+1CD0..U+1CD2, U+1CD4..U+1CE0, U+1CE2..U+1CE8, U+1CED, U+1DFD, U+2CEF..U+2CF1, U+A6F0..U+A6F1, U+A8E0..U+A8F1, U+A980..U+A982, U+A9B3, U+A9B6..U+A9B9, U+A9BC, U+AAB0, U+AAB2..U+AAB4, U+AAB7..U+AAB8, U+AABE..U+AABF, U+AAC1, U+ABE5, U+ABE8, U+ABED, U+11080..U+11081, U+110B3..U+110B6, U+110B9..U+110BA, U+110BD. (uc_width): Return 2 also for unassigned code points of planes 2 and 3. * lib/uninorm/composition-table.gperf: Regenerated for Unicode 5.2.0. * lib/uninorm/composition.c (struct composition_rule): Allow for 24 bits instead of 16 bits in the code1 and code2 of each composition rule. (uc_composition): Update for Unicode 5.2.0. * lib/uninorm/decomposition-table1.h: Regenerated for Unicode 5.2.0. * lib/uninorm/decomposition-table2.h: Likewise. * lib/uniwbrk/wbrkprop.h: Likewise. * tests/unicase/test-cased.c: Likewise. * tests/unicase/test-ignorable.c: Likewise. * tests/unicase/test-uc_tolower.c: Likewise. * tests/unicase/test-uc_totitle.c: Likewise. * tests/unicase/test-uc_toupper.c: Likewise. * tests/unictype/test-categ_C.c: Likewise. * tests/unictype/test-categ_Cf.c: Likewise. * tests/unictype/test-categ_Cn.c: Likewise. * tests/unictype/test-categ_L.c: Likewise. * tests/unictype/test-categ_Ll.c: Likewise. * tests/unictype/test-categ_Lm.c: Likewise. * tests/unictype/test-categ_Lo.c: Likewise. * tests/unictype/test-categ_Lu.c: Likewise. * tests/unictype/test-categ_M.c: Likewise. * tests/unictype/test-categ_Mc.c: Likewise. * tests/unictype/test-categ_Mn.c: Likewise. * tests/unictype/test-categ_N.c: Likewise. * tests/unictype/test-categ_Nd.c: Likewise. * tests/unictype/test-categ_Nl.c: Likewise. * tests/unictype/test-categ_No.c: Likewise. * tests/unictype/test-categ_P.c: Likewise. * tests/unictype/test-categ_Pd.c: Likewise. * tests/unictype/test-categ_Po.c: Likewise. * tests/unictype/test-categ_S.c: Likewise. * tests/unictype/test-categ_Sc.c: Likewise. * tests/unictype/test-categ_So.c: Likewise. * tests/unictype/test-ctype_alnum.c: Likewise. * tests/unictype/test-ctype_alpha.c: Likewise. * tests/unictype/test-ctype_graph.c: Likewise. * tests/unictype/test-ctype_lower.c: Likewise. * tests/unictype/test-ctype_print.c: Likewise. * tests/unictype/test-ctype_punct.c: Likewise. * tests/unictype/test-ctype_upper.c: Likewise. * tests/unictype/test-decdigit.h: Likewise. * tests/unictype/test-digit.h: Likewise. * tests/unictype/test-numeric.h: Likewise. * tests/unictype/test-pr_alphabetic.c: Likewise. * tests/unictype/test-pr_bidi_arabic_digit.c: Likewise. * tests/unictype/test-pr_bidi_eur_num_terminator.c: Likewise. * tests/unictype/test-pr_bidi_european_digit.c: Likewise. * tests/unictype/test-pr_bidi_hebrew_right_to_left.c: Likewise. * tests/unictype/test-pr_bidi_left_to_right.c: Likewise. * tests/unictype/test-pr_bidi_non_spacing_mark.c: Likewise. * tests/unictype/test-pr_bidi_other_neutral.c: Likewise. * tests/unictype/test-pr_combining.c: Likewise. * tests/unictype/test-pr_composite.c: Likewise. * tests/unictype/test-pr_currency_symbol.c: Likewise. * tests/unictype/test-pr_dash.c: Likewise. * tests/unictype/test-pr_decimal_digit.c: Likewise. * tests/unictype/test-pr_deprecated.c: Likewise. * tests/unictype/test-pr_diacritic.c: Likewise. * tests/unictype/test-pr_extender.c: Likewise. * tests/unictype/test-pr_grapheme_base.c: Likewise. * tests/unictype/test-pr_grapheme_extend.c: Likewise. * tests/unictype/test-pr_grapheme_link.c: Likewise. * tests/unictype/test-pr_id_continue.c: Likewise. * tests/unictype/test-pr_id_start.c: Likewise. * tests/unictype/test-pr_ideographic.c: Likewise. * tests/unictype/test-pr_ignorable_control.c: Likewise. * tests/unictype/test-pr_logical_order_exception.c: Likewise. * tests/unictype/test-pr_lowercase.c: Likewise. * tests/unictype/test-pr_numeric.c: Likewise. * tests/unictype/test-pr_other_alphabetic.c: Likewise. * tests/unictype/test-pr_punctuation.c: Likewise. * tests/unictype/test-pr_sentence_terminal.c: Likewise. * tests/unictype/test-pr_terminal_punctuation.c: Likewise. * tests/unictype/test-pr_unassigned_code_value.c: Likewise. * tests/unictype/test-pr_unified_ideograph.c: Likewise. * tests/unictype/test-pr_uppercase.c: Likewise. * tests/unictype/test-pr_xid_continue.c: Likewise. * tests/unictype/test-pr_xid_start.c: Likewise. * tests/unictype/test-pr_zero_width.c: Likewise. * tests/unigbrk/test-uc-gbrk-prop.h: Likewise. * tests/unilbrk/test-u8-possible-linebreaks.c (main): Update for changed behaviour: line breaking is now disallowed between a letter or '=' and '('. * tests/unilbrk/test-u16-possible-linebreaks.c (main): Likewise. * tests/unilbrk/test-u32-possible-linebreaks.c (main): Likewise. * tests/unilbrk/test-ulc-possible-linebreaks.c (main): Likewise. * tests/unilbrk/test-ulc-width-linebreaks.c (main): Likewise. * tests/uniwidth/test-uc_width2.sh: Same updates as in lib/uniwidth/width.c. * tests/uninorm/NormalizationTest.txt: Update from Unicode 5.2.0, without comments, but with the original copyright notice. * lib/unicase/special-casing-table.gperf: Regenerated; only comment changes. * lib/unictype/categ_Cc.h: Likewise. * lib/unictype/categ_Co.h: Likewise. * lib/unictype/categ_Cs.h: Likewise. * lib/unictype/categ_Lt.h: Likewise. * lib/unictype/categ_Me.h: Likewise. * lib/unictype/categ_Pc.h: Likewise. * lib/unictype/categ_Pe.h: Likewise. * lib/unictype/categ_Pf.h: Likewise. * lib/unictype/categ_Pi.h: Likewise. * lib/unictype/categ_Ps.h: Likewise. * lib/unictype/categ_Sk.h: Likewise. * lib/unictype/categ_Sm.h: Likewise. * lib/unictype/categ_Z.h: Likewise. * lib/unictype/categ_Zl.h: Likewise. * lib/unictype/categ_Zp.h: Likewise. * lib/unictype/categ_Zs.h: Likewise. * lib/unictype/ctype_blank.h: Likewise. * lib/unictype/ctype_cntrl.h: Likewise. * lib/unictype/ctype_digit.h: Likewise. * lib/unictype/ctype_space.h: Likewise. * lib/unictype/ctype_xdigit.h: Likewise. * lib/unictype/mirror.h: Likewise. * lib/unictype/pr_ascii_hex_digit.h: Likewise. * lib/unictype/pr_bidi_arabic_right_to_left.h: Likewise. * lib/unictype/pr_bidi_block_separator.h: Likewise. * lib/unictype/pr_bidi_boundary_neutral.h: Likewise. * lib/unictype/pr_bidi_common_separator.h: Likewise. * lib/unictype/pr_bidi_control.h: Likewise. * lib/unictype/pr_bidi_embedding_or_override.h: Likewise. * lib/unictype/pr_bidi_eur_num_separator.h: Likewise. * lib/unictype/pr_bidi_pdf.h: Likewise. * lib/unictype/pr_bidi_segment_separator.h: Likewise. * lib/unictype/pr_bidi_whitespace.h: Likewise. * lib/unictype/pr_default_ignorable_code_point.h: Likewise. * lib/unictype/pr_format_control.h: Likewise. * lib/unictype/pr_hex_digit.h: Likewise. * lib/unictype/pr_hyphen.h: Likewise. * lib/unictype/pr_ids_binary_operator.h: Likewise. * lib/unictype/pr_ids_trinary_operator.h: Likewise. * lib/unictype/pr_iso_control.h: Likewise. * lib/unictype/pr_join_control.h: Likewise. * lib/unictype/pr_left_of_pair.h: Likewise. * lib/unictype/pr_line_separator.h: Likewise. * lib/unictype/pr_math.h: Likewise. * lib/unictype/pr_non_break.h: Likewise. * lib/unictype/pr_not_a_character.h: Likewise. * lib/unictype/pr_other_default_ignorable_code_point.h: Likewise. * lib/unictype/pr_other_grapheme_extend.h: Likewise. * lib/unictype/pr_other_id_continue.h: Likewise. * lib/unictype/pr_other_id_start.h: Likewise. * lib/unictype/pr_other_lowercase.h: Likewise. * lib/unictype/pr_other_math.h: Likewise. * lib/unictype/pr_other_uppercase.h: Likewise. * lib/unictype/pr_paired_punctuation.h: Likewise. * lib/unictype/pr_paragraph_separator.h: Likewise. * lib/unictype/pr_pattern_syntax.h: Likewise. * lib/unictype/pr_pattern_white_space.h: Likewise. * lib/unictype/pr_private_use.h: Likewise. * lib/unictype/pr_quotation_mark.h: Likewise. * lib/unictype/pr_radical.h: Likewise. * lib/unictype/pr_soft_dotted.h: Likewise. * lib/unictype/pr_space.h: Likewise. * lib/unictype/pr_titlecase.h: Likewise. * lib/unictype/pr_variation_selector.h: Likewise. * lib/unictype/pr_white_space.h: Likewise. * lib/unictype/sy_c_ident.h: Likewise. * lib/unictype/sy_c_whitespace.h: Likewise. * lib/unictype/sy_java_whitespace.h: Likewise. * modules/uni*/*: Bump version number of expected libunistring version. Reported by Simon Josefsson.
author Bruno Haible <bruno@clisp.org>
date Sun, 09 Jan 2011 11:09:25 +0100
parents 5bfb3f92b613
children aaf4bb6264c3
line wrap: on
line diff
--- a/lib/unictype/blocks.h
+++ b/lib/unictype/blocks.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Unicode blocks.  */
-/* Generated automatically by gen-ctype.c for Unicode 5.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 5.2.0.  */
 static const uc_block_t blocks[] =
 {
   { 0x0000, 0x007F, "Basic Latin" },
@@ -20,6 +20,7 @@
   { 0x0750, 0x077F, "Arabic Supplement" },
   { 0x0780, 0x07BF, "Thaana" },
   { 0x07C0, 0x07FF, "NKo" },
+  { 0x0800, 0x083F, "Samaritan" },
   { 0x0900, 0x097F, "Devanagari" },
   { 0x0980, 0x09FF, "Bengali" },
   { 0x0A00, 0x0A7F, "Gurmukhi" },
@@ -48,15 +49,18 @@
   { 0x1760, 0x177F, "Tagbanwa" },
   { 0x1780, 0x17FF, "Khmer" },
   { 0x1800, 0x18AF, "Mongolian" },
+  { 0x18B0, 0x18FF, "Unified Canadian Aboriginal Syllabics Extended" },
   { 0x1900, 0x194F, "Limbu" },
   { 0x1950, 0x197F, "Tai Le" },
   { 0x1980, 0x19DF, "New Tai Lue" },
   { 0x19E0, 0x19FF, "Khmer Symbols" },
   { 0x1A00, 0x1A1F, "Buginese" },
+  { 0x1A20, 0x1AAF, "Tai Tham" },
   { 0x1B00, 0x1B7F, "Balinese" },
   { 0x1B80, 0x1BBF, "Sundanese" },
   { 0x1C00, 0x1C4F, "Lepcha" },
   { 0x1C50, 0x1C7F, "Ol Chiki" },
+  { 0x1CD0, 0x1CFF, "Vedic Extensions" },
   { 0x1D00, 0x1D7F, "Phonetic Extensions" },
   { 0x1D80, 0x1DBF, "Phonetic Extensions Supplement" },
   { 0x1DC0, 0x1DFF, "Combining Diacritical Marks Supplement" },
@@ -113,17 +117,27 @@
   { 0x4E00, 0x9FFF, "CJK Unified Ideographs" },
   { 0xA000, 0xA48F, "Yi Syllables" },
   { 0xA490, 0xA4CF, "Yi Radicals" },
+  { 0xA4D0, 0xA4FF, "Lisu" },
   { 0xA500, 0xA63F, "Vai" },
   { 0xA640, 0xA69F, "Cyrillic Extended-B" },
+  { 0xA6A0, 0xA6FF, "Bamum" },
   { 0xA700, 0xA71F, "Modifier Tone Letters" },
   { 0xA720, 0xA7FF, "Latin Extended-D" },
   { 0xA800, 0xA82F, "Syloti Nagri" },
+  { 0xA830, 0xA83F, "Common Indic Number Forms" },
   { 0xA840, 0xA87F, "Phags-pa" },
   { 0xA880, 0xA8DF, "Saurashtra" },
+  { 0xA8E0, 0xA8FF, "Devanagari Extended" },
   { 0xA900, 0xA92F, "Kayah Li" },
   { 0xA930, 0xA95F, "Rejang" },
+  { 0xA960, 0xA97F, "Hangul Jamo Extended-A" },
+  { 0xA980, 0xA9DF, "Javanese" },
   { 0xAA00, 0xAA5F, "Cham" },
+  { 0xAA60, 0xAA7F, "Myanmar Extended-A" },
+  { 0xAA80, 0xAADF, "Tai Viet" },
+  { 0xABC0, 0xABFF, "Meetei Mayek" },
   { 0xAC00, 0xD7AF, "Hangul Syllables" },
+  { 0xD7B0, 0xD7FF, "Hangul Jamo Extended-B" },
   { 0xD800, 0xDB7F, "High Surrogates" },
   { 0xDB80, 0xDBFF, "High Private Use Surrogates" },
   { 0xDC00, 0xDFFF, "Low Surrogates" },
@@ -155,11 +169,20 @@
   { 0x10450, 0x1047F, "Shavian" },
   { 0x10480, 0x104AF, "Osmanya" },
   { 0x10800, 0x1083F, "Cypriot Syllabary" },
+  { 0x10840, 0x1085F, "Imperial Aramaic" },
   { 0x10900, 0x1091F, "Phoenician" },
   { 0x10920, 0x1093F, "Lydian" },
   { 0x10A00, 0x10A5F, "Kharoshthi" },
+  { 0x10A60, 0x10A7F, "Old South Arabian" },
+  { 0x10B00, 0x10B3F, "Avestan" },
+  { 0x10B40, 0x10B5F, "Inscriptional Parthian" },
+  { 0x10B60, 0x10B7F, "Inscriptional Pahlavi" },
+  { 0x10C00, 0x10C4F, "Old Turkic" },
+  { 0x10E60, 0x10E7F, "Rumi Numeral Symbols" },
+  { 0x11080, 0x110CF, "Kaithi" },
   { 0x12000, 0x123FF, "Cuneiform" },
   { 0x12400, 0x1247F, "Cuneiform Numbers and Punctuation" },
+  { 0x13000, 0x1342F, "Egyptian Hieroglyphs" },
   { 0x1D000, 0x1D0FF, "Byzantine Musical Symbols" },
   { 0x1D100, 0x1D1FF, "Musical Symbols" },
   { 0x1D200, 0x1D24F, "Ancient Greek Musical Notation" },
@@ -168,7 +191,10 @@
   { 0x1D400, 0x1D7FF, "Mathematical Alphanumeric Symbols" },
   { 0x1F000, 0x1F02F, "Mahjong Tiles" },
   { 0x1F030, 0x1F09F, "Domino Tiles" },
+  { 0x1F100, 0x1F1FF, "Enclosed Alphanumeric Supplement" },
+  { 0x1F200, 0x1F2FF, "Enclosed Ideographic Supplement" },
   { 0x20000, 0x2A6DF, "CJK Unified Ideographs Extension B" },
+  { 0x2A700, 0x2B73F, "CJK Unified Ideographs Extension C" },
   { 0x2F800, 0x2FA1F, "CJK Compatibility Ideographs Supplement" },
   { 0xE0000, 0xE007F, "Tags" },
   { 0xE0100, 0xE01EF, "Variation Selectors Supplement" },
@@ -187,766 +213,766 @@
     9,  12,
    12,  13,
    13,  17,
-   17,  17,
-   17,  19,
-   19,  21,
-   21,  23,
-   23,  25,
-   25,  27,
-   27,  29,
-   29,  30,
-   30,  32,
-   32,  33,
+   17,  18,
+   18,  20,
+   20,  22,
+   22,  24,
+   24,  26,
+   26,  28,
+   28,  30,
+   30,  31,
+   31,  33,
    33,  34,
-   33,  36,
-   36,  37,
-   36,  37,
-   36,  39,
-   39,  44,
-   44,  45,
-   45,  49,
-   49,  50,
-   50,  52,
-   52,  54,
-   54,  57,
-   57,  58,
-   58,  59,
-   59,  63,
-   63,  66,
-   66,  67,
-   67,  68,
-   68,  71,
-   71,  74,
-   74,  75,
+   34,  35,
+   34,  37,
+   37,  38,
+   37,  38,
+   37,  40,
+   40,  45,
+   45,  47,
+   47,  51,
+   51,  53,
+   53,  55,
+   55,  58,
+   58,  61,
+   61,  62,
+   62,  63,
+   63,  67,
+   67,  70,
+   70,  71,
+   71,  72,
+   72,  75,
    75,  78,
    78,  79,
-   79,  81,
-   81,  82,
+   79,  82,
    82,  83,
-   83,  86,
-   86,  90,
-   90,  92,
-   92,  94,
-   94,  97,
-   97, 103,
-  103, 104,
-  104, 105,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 106,
-  105, 107,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
-  107, 108,
+   83,  85,
+   85,  86,
+   86,  87,
+   87,  90,
+   90,  94,
+   94,  96,
+   96,  98,
+   98, 101,
+  101, 107,
   107, 108,
   108, 109,
-  108, 109,
-  108, 109,
-  108, 109,
-  108, 110,
-  110, 111,
-  110, 112,
-  112, 114,
-  114, 117,
-  117, 119,
-  119, 120,
-  120, 120,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  120, 121,
-  121, 122,
-  121, 122,
-  121, 122,
-  121, 123,
-  123, 124,
-  123, 124,
-  123, 124,
-  123, 124,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  124, 125,
-  125, 126,
-  125, 126,
-  126, 128,
-  127, 128,
-  127, 128,
-  128, 134,
-  134, 136,
-  136, 138,
-  138, 142,
-  142, 144,
-  144, 148,
-  148, 151,
-  151, 151,
-  151, 151,
-  151, 151,
-  151, 152,
-  152, 154,
-  154, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 155,
-  155, 156,
-  155, 156,
-  155, 156,
-  155, 156,
-  156, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 157,
-  157, 158,
-  158, 159,
-  159, 160,
-  160, 162,
-  162, 163,
-  162, 163,
-  162, 163,
-  162, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 163,
-  163, 165,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 110,
+  109, 111,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  111, 112,
+  112, 113,
+  112, 113,
+  112, 113,
+  112, 113,
+  112, 115,
+  115, 116,
+  115, 118,
+  118, 120,
+  120, 125,
+  125, 129,
+  129, 132,
+  132, 133,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 134,
+  133, 135,
+  135, 136,
+  135, 136,
+  135, 136,
+  135, 137,
+  137, 138,
+  137, 138,
+  137, 138,
+  137, 138,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  138, 139,
+  139, 140,
+  139, 140,
+  140, 142,
+  141, 142,
+  141, 142,
+  142, 148,
+  148, 150,
+  150, 152,
+  152, 156,
+  156, 158,
+  158, 162,
+  162, 165,
   165, 165,
   165, 165,
   165, 165,
-  165, 165,
-  165, 165,
-  165, 165,
-  165, 165,
-  165, 165,
-  165, 165,
-  165, 165,
-  165, 165,
-  165, 165,
-  165, 165,
-  165, 165,
-  165, 165,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  165, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 166,
-  166, 167,
-  166, 167,
-  166, 167,
-  167, 167,
-  167, 167,
-  167, 167,
-  167, 167,
-  167, 167
+  165, 167,
+  167, 169,
+  169, 171,
+  171, 174,
+  174, 175,
+  175, 175,
+  175, 176,
+  176, 176,
+  176, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 177,
+  177, 178,
+  177, 178,
+  177, 178,
+  177, 178,
+  178, 179,
+  179, 179,
+  179, 179,
+  179, 179,
+  179, 179,
+  179, 179,
+  179, 179,
+  179, 179,
+  179, 179,
+  179, 179,
+  179, 179,
+  179, 179,
+  179, 180,
+  179, 180,
+  179, 180,
+  179, 180,
+  179, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 180,
+  180, 181,
+  181, 182,
+  182, 183,
+  183, 185,
+  185, 186,
+  185, 186,
+  185, 186,
+  185, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 186,
+  186, 188,
+  188, 189,
+  189, 190,
+  190, 190,
+  190, 190,
+  190, 190,
+  190, 190,
+  190, 190,
+  190, 190,
+  190, 190,
+  190, 190,
+  190, 190,
+  190, 190,
+  190, 190,
+  190, 190,
+  190, 190,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  190, 191,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  191, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 192,
+  192, 193,
+  192, 193,
+  192, 193,
+  193, 193,
+  193, 193,
+  193, 193,
+  193, 193,
+  193, 193
 };
-#define blocks_upper_first_index 167
-#define blocks_upper_last_index 171
+#define blocks_upper_first_index 193
+#define blocks_upper_last_index 197