--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,305 @@
+2011-01-09  Bruno Haible  <bruno@clisp.org>
+
+	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.
+
 2011-01-09  Karl Heuer  <kwzh@gnu.org>
 
 	useless-if-before-free: fix typo in --help and make the internal,

--- a/lib/gen-uni-tables.c
+++ b/lib/gen-uni-tables.c
@@ -31,7 +31,7 @@
                       /usr/local/share/Unidata/CompositionExclusions.txt \
                       /usr/local/share/Unidata/SpecialCasing.txt \
                       /usr/local/share/Unidata/CaseFolding.txt \
-                      5.1.0
+                      5.2.0
  */
 
 #include <stdbool.h>
@@ -690,7 +690,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* %s of Unicode characters.  */\n", comment);
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   t.p = 4; /* or: 5 */
@@ -994,7 +994,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Categories of Unicode characters.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   t.p = 7;
@@ -1158,7 +1158,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Combining class of Unicode characters.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   t.p = 7;
@@ -1498,7 +1498,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Bidi categories of Unicode characters.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   t.p = 7;
@@ -1655,7 +1655,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Decimal digit values of Unicode characters.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   need_comma = false;
@@ -1702,7 +1702,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Decimal digit values of Unicode characters.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   t.p = 7;
@@ -1842,7 +1842,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Digit values of Unicode characters.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   need_comma = false;
@@ -1889,7 +1889,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Digit values of Unicode characters.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   t.p = 7;
@@ -2046,7 +2046,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Numeric values of Unicode characters.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   need_comma = false;
@@ -2102,7 +2102,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Numeric values of Unicode characters.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   /* Create table of occurring fractions.  */
@@ -2387,7 +2387,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Mirrored Unicode characters.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   t.p = 7;
@@ -2491,6 +2491,24 @@
 
 /* ========================================================================= */
 
+/* Particular values of the word break property.  */
+
+static bool
+is_WBP_MIDNUMLET (unsigned int ch)
+{
+  return (ch == 0x0027 || ch == 0x002E || ch == 0x2018 || ch == 0x2019
+          || ch == 0x2024 || ch == 0xFE52 || ch == 0xFF07 || ch == 0xFF0E);
+}
+
+static bool
+is_WBP_MIDLETTER (unsigned int ch)
+{
+  return (ch == 0x00B7 || ch == 0x05F4 || ch == 0x2027 || ch == 0x003A
+          || ch == 0x0387 || ch == 0xFE13 || ch == 0xFE55 || ch == 0xFF1A);
+}
+
+/* ========================================================================= */
+
 /* Properties.  */
 
 /* Reading PropList.txt and DerivedCoreProperties.txt.  */
@@ -2534,6 +2552,13 @@
   PROP_ALPHABETIC,
   PROP_LOWERCASE,
   PROP_UPPERCASE,
+  PROP_CASED,
+  PROP_CASE_IGNORABLE,
+  PROP_CHANGES_WHEN_LOWERCASED,
+  PROP_CHANGES_WHEN_UPPERCASED,
+  PROP_CHANGES_WHEN_TITLECASED,
+  PROP_CHANGES_WHEN_CASEFOLDED,
+  PROP_CHANGES_WHEN_CASEMAPPED,
   PROP_ID_START,
   PROP_ID_CONTINUE,
   PROP_XID_START,
@@ -2632,6 +2657,13 @@
       PROP ("Alphabetic", PROP_ALPHABETIC)
       PROP ("Lowercase", PROP_LOWERCASE)
       PROP ("Uppercase", PROP_UPPERCASE)
+      PROP ("Cased", PROP_CASED)
+      PROP ("Case_Ignorable", PROP_CASE_IGNORABLE)
+      PROP ("Changes_When_Lowercased", PROP_CHANGES_WHEN_LOWERCASED)
+      PROP ("Changes_When_Uppercased", PROP_CHANGES_WHEN_UPPERCASED)
+      PROP ("Changes_When_Titlecased", PROP_CHANGES_WHEN_TITLECASED)
+      PROP ("Changes_When_Casefolded", PROP_CHANGES_WHEN_CASEFOLDED)
+      PROP ("Changes_When_Casemapped", PROP_CHANGES_WHEN_CASEMAPPED)
       PROP ("ID_Start", PROP_ID_START)
       PROP ("ID_Continue", PROP_ID_CONTINUE)
       PROP ("XID_Start", PROP_XID_START)
@@ -2777,6 +2809,7 @@
     || (ch == 0x3007) /* IDEOGRAPHIC NUMBER ZERO */
     || (ch >= 0x3021 && ch <= 0x3029) /* HANGZHOU NUMERAL */
     || (ch >= 0x3038 && ch <= 0x303A) /* HANGZHOU NUMERAL */
+    || (ch >= 0xA6E6 && ch <= 0xA6EF) /* BAMUM LETTERS */
     || (ch >= 0x10140 && ch <= 0x10174) /* GREEK ACROPHONICS */
     || (ch == 0x10341) /* GOTHIC LETTER NINETY */
     || (ch == 0x1034A) /* GOTHIC LETTER NINE HUNDRED */
@@ -2812,7 +2845,10 @@
   bool result1 =
     (is_category_Cf (ch)
      && !(ch >= 0xFFF9 && ch <= 0xFFFB) /* Annotations */
-     && !((ch >= 0x0600 && ch <= 0x0603) || ch == 0x06DD || ch == 0x070F))
+     && !((ch >= 0x0600 && ch <= 0x0603) || ch == 0x06DD || ch == 0x070F)
+     /* For some reason, the following are not listed as having property
+        Default_Ignorable_Code_Point.  */
+     && !(ch == 0x110BD))
     || ((unicode_properties[ch] & (1ULL << PROP_OTHER_DEFAULT_IGNORABLE_CODE_POINT)) != 0)
     || ((unicode_properties[ch] & (1ULL << PROP_VARIATION_SELECTOR)) != 0);
   bool result2 =
@@ -2921,6 +2957,79 @@
   return is_category_Lt (ch);
 }
 
+/* See DerivedCoreProperties.txt.  */
+static bool
+is_property_cased (unsigned int ch)
+{
+  bool result1 = (is_property_lowercase (ch)
+                  || is_property_uppercase (ch)
+                  || is_category_Lt (ch));
+  bool result2 = ((unicode_properties[ch] & (1ULL << PROP_CASED)) != 0);
+
+  if (result1 != result2)
+    abort ();
+  return result1;
+}
+
+/* See DerivedCoreProperties.txt.  */
+static bool
+is_property_case_ignorable (unsigned int ch)
+{
+  bool result1 = (is_WBP_MIDLETTER (ch) || is_WBP_MIDNUMLET (ch)
+                  || is_category_Mn (ch)
+                  || is_category_Me (ch)
+                  || is_category_Cf (ch)
+                  || is_category_Lm (ch)
+                  || is_category_Sk (ch));
+  bool result2 = ((unicode_properties[ch] & (1ULL << PROP_CASE_IGNORABLE)) != 0);
+
+  if (result1 != result2)
+    abort ();
+  return result1;
+}
+
+/* See DerivedCoreProperties.txt.  */
+static bool
+is_property_changes_when_lowercased (unsigned int ch)
+{
+  bool result1 = ((unicode_properties[ch] & (1ULL << PROP_CHANGES_WHEN_LOWERCASED)) != 0);
+  bool result2 = (unicode_attributes[ch].name != NULL
+                  && unicode_attributes[ch].lower != NONE
+                  && unicode_attributes[ch].lower != ch);
+
+  if (result1 != result2)
+    abort ();
+  return result1;
+}
+
+/* See DerivedCoreProperties.txt.  */
+static bool
+is_property_changes_when_uppercased (unsigned int ch)
+{
+  return ((unicode_properties[ch] & (1ULL << PROP_CHANGES_WHEN_UPPERCASED)) != 0);
+}
+
+/* See DerivedCoreProperties.txt.  */
+static bool
+is_property_changes_when_titlecased (unsigned int ch)
+{
+  return ((unicode_properties[ch] & (1ULL << PROP_CHANGES_WHEN_TITLECASED)) != 0);
+}
+
+/* See DerivedCoreProperties.txt.  */
+static bool
+is_property_changes_when_casefolded (unsigned int ch)
+{
+  return ((unicode_properties[ch] & (1ULL << PROP_CHANGES_WHEN_CASEFOLDED)) != 0);
+}
+
+/* See DerivedCoreProperties.txt.  */
+static bool
+is_property_changes_when_casemapped (unsigned int ch)
+{
+  return ((unicode_properties[ch] & (1ULL << PROP_CHANGES_WHEN_CASEMAPPED)) != 0);
+}
+
 /* See PropList.txt, UCD.html.  */
 static bool
 is_property_soft_dotted (unsigned int ch)
@@ -3467,6 +3576,13 @@
   PROPERTY(lowercase)
   PROPERTY(other_lowercase)
   PROPERTY(titlecase)
+  PROPERTY(cased)
+  PROPERTY(case_ignorable)
+  PROPERTY(changes_when_lowercased)
+  PROPERTY(changes_when_uppercased)
+  PROPERTY(changes_when_titlecased)
+  PROPERTY(changes_when_casefolded)
+  PROPERTY(changes_when_casemapped)
   PROPERTY(soft_dotted)
   PROPERTY(id_start)
   PROPERTY(other_id_start)
@@ -3648,7 +3764,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Unicode scripts.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   for (s = 0; s < numscripts; s++)
@@ -3825,7 +3941,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Unicode scripts.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
   fprintf (stream, "struct named_script { const char *name; unsigned int index; };\n");
   fprintf (stream, "%%struct-type\n");
@@ -3965,7 +4081,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Unicode blocks.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   fprintf (stream, "static const uc_block_t blocks[] =\n");
@@ -4382,7 +4498,7 @@
 
   fprintf (stream, "/* DO NOT EDIT! GENERATED AUTOMATICALLY! */\n");
   fprintf (stream, "/* Language syntax properties of Unicode characters.  */\n");
-  fprintf (stream, "/* Generated automatically by gen-ctype.c for Unicode %s.  */\n",
+  fprintf (stream, "/* Generated automatically by gen-uni-tables.c for Unicode %s.  */\n",
            version);
 
   t.p = 7; /* or 8 */
@@ -5277,9 +5393,13 @@
   if (is_property_unassigned_code_value (ch))
     {
       /* Unicode TR#11 section "Unassigned and Private-Use Characters".  */
-      if (ch >= 0xE000 && ch <= 0xF8FF)
+      if (ch >= 0xE000 && ch <= 0xF8FF) /* Private Use */
         return 'A';
-      if ((ch >= 0x20000 && ch <= 0x2FFFD) || (ch >= 0x30000 && ch <= 0x3FFFD))
+      if ((ch >= 0x4E00 && ch <= 0x9FFF) /* CJK Unified Ideographs block */
+          || (ch >= 0x3400 && ch <= 0x4DBF) /* CJK Unified Ideographs Extension A block */
+          || (ch >= 0xF900 && ch <= 0xFAFF) /* CJK Compatibility Ideographs block */
+          || (ch >= 0x20000 && ch <= 0x2FFFD) /* Supplementary Ideographic Plane */
+          || (ch >= 0x30000 && ch <= 0x3FFFD) /* Tertiary Ideographic Plane */)
         return '2';
       return 0;
     }
@@ -5365,47 +5485,49 @@
 
 /* ========================================================================= */
 
-/* Line breaking classification.  */
+/* Line breaking classification.
+   Updated for Unicode TR #14 revision 24.  */
 
 enum
 {
-  /* Values >= 24 are resolved at run time. */
-  LBP_BK = 24, /* mandatory break */
+  /* Values >= 25 are resolved at run time. */
+  LBP_BK = 25, /* mandatory break */
 /*LBP_CR,         carriage return - not used here because it's a DOSism */
 /*LBP_LF,         line feed - not used here because it's a DOSism */
-  LBP_CM = 25, /* attached characters and combining marks */
+  LBP_CM = 26, /* attached characters and combining marks */
 /*LBP_NL,         next line - not used here because it's equivalent to LBP_BK */
 /*LBP_SG,         surrogates - not used here because they are not characters */
   LBP_WJ =  0, /* word joiner */
-  LBP_ZW = 26, /* zero width space */
+  LBP_ZW = 27, /* zero width space */
   LBP_GL =  1, /* non-breaking (glue) */
-  LBP_SP = 27, /* space */
+  LBP_SP = 28, /* space */
   LBP_B2 =  2, /* break opportunity before and after */
   LBP_BA =  3, /* break opportunity after */
   LBP_BB =  4, /* break opportunity before */
   LBP_HY =  5, /* hyphen */
-  LBP_CB = 28, /* contingent break opportunity */
+  LBP_CB = 29, /* contingent break opportunity */
   LBP_CL =  6, /* closing punctuation */
-  LBP_EX =  7, /* exclamation/interrogation */
-  LBP_IN =  8, /* inseparable */
-  LBP_NS =  9, /* non starter */
-  LBP_OP = 10, /* opening punctuation */
-  LBP_QU = 11, /* ambiguous quotation */
-  LBP_IS = 12, /* infix separator (numeric) */
-  LBP_NU = 13, /* numeric */
-  LBP_PO = 14, /* postfix (numeric) */
-  LBP_PR = 15, /* prefix (numeric) */
-  LBP_SY = 16, /* symbols allowing breaks */
-  LBP_AI = 29, /* ambiguous (alphabetic or ideograph) */
-  LBP_AL = 17, /* ordinary alphabetic and symbol characters */
-  LBP_H2 = 18, /* Hangul LV syllable */
-  LBP_H3 = 19, /* Hangul LVT syllable */
-  LBP_ID = 20, /* ideographic */
-  LBP_JL = 21, /* Hangul L Jamo */
-  LBP_JV = 22, /* Hangul V Jamo */
-  LBP_JT = 23, /* Hangul T Jamo */
-  LBP_SA = 30, /* complex context (South East Asian) */
-  LBP_XX = 31  /* unknown */
+  LBP_CP =  7, /* closing parenthesis */
+  LBP_EX =  8, /* exclamation/interrogation */
+  LBP_IN =  9, /* inseparable */
+  LBP_NS = 10, /* non starter */
+  LBP_OP = 11, /* opening punctuation */
+  LBP_QU = 12, /* ambiguous quotation */
+  LBP_IS = 13, /* infix separator (numeric) */
+  LBP_NU = 14, /* numeric */
+  LBP_PO = 15, /* postfix (numeric) */
+  LBP_PR = 16, /* prefix (numeric) */
+  LBP_SY = 17, /* symbols allowing breaks */
+  LBP_AI = 30, /* ambiguous (alphabetic or ideograph) */
+  LBP_AL = 18, /* ordinary alphabetic and symbol characters */
+  LBP_H2 = 19, /* Hangul LV syllable */
+  LBP_H3 = 20, /* Hangul LVT syllable */
+  LBP_ID = 21, /* ideographic */
+  LBP_JL = 22, /* Hangul L Jamo */
+  LBP_JV = 23, /* Hangul V Jamo */
+  LBP_JT = 24, /* Hangul T Jamo */
+  LBP_SA = 31, /* complex context (South East Asian) */
+  LBP_XX = 32  /* unknown */
 };
 
 /* Returns the line breaking classification for ch, as a bit mask.  */
@@ -5454,7 +5576,8 @@
         attr |= (int64_t) 1 << LBP_B2;
 
       /* break opportunity after */
-      if (ch == 0x1680 /* OGHAM SPACE MARK */
+      if (/* Breaking Spaces */
+          ch == 0x1680 /* OGHAM SPACE MARK */
           || ch == 0x2000 /* EN QUAD */
           || ch == 0x2001 /* EM QUAD */
           || ch == 0x2002 /* EN SPACE */
@@ -5466,12 +5589,17 @@
           || ch == 0x2009 /* THIN SPACE */
           || ch == 0x200A /* HAIR SPACE */
           || ch == 0x205F /* MEDIUM MATHEMATICAL SPACE */
+          /* Tabs */
           || ch == 0x0009 /* tab */
+          /* Conditional Hyphens */
           || ch == 0x00AD /* SOFT HYPHEN */
+          /* Breaking Hyphens */
           || ch == 0x058A /* ARMENIAN HYPHEN */
+          || ch == 0x1400 /* CANADIAN SYLLABICS HYPHEN */
           || ch == 0x2010 /* HYPHEN */
           || ch == 0x2012 /* FIGURE DASH */
           || ch == 0x2013 /* EN DASH */
+          /* Visible Word Dividers */
           || ch == 0x05BE /* HEBREW PUNCTUATION MAQAF */
           || ch == 0x0F0B /* TIBETAN MARK INTERSYLLABIC TSHEG */
           || ch == 0x1361 /* ETHIOPIC WORDSPACE */
@@ -5479,6 +5607,7 @@
           || ch == 0x17DA /* KHMER SIGN KOOMUUT */
           || ch == 0x2027 /* HYPHENATION POINT */
           || ch == 0x007C /* VERTICAL LINE */
+          /* Historic Word Separators */
           || ch == 0x16EB /* RUNIC SINGLE PUNCTUATION */
           || ch == 0x16EC /* RUNIC MULTIPLE PUNCTUATION */
           || ch == 0x16ED /* RUNIC CROSS PUNCTUATION */
@@ -5495,6 +5624,7 @@
           || ch == 0x2E2C /* SQUARED FOUR DOT PUNCTUATION */
           || ch == 0x2E2D /* FIVE DOT PUNCTUATION */
           || ch == 0x2E30 /* RING POINT */
+          || ch == 0x2E31 /* WORD SEPARATOR MIDDLE DOT */
           || ch == 0x10100 /* AEGEAN WORD SEPARATOR LINE */
           || ch == 0x10101 /* AEGEAN WORD SEPARATOR DOT */
           || ch == 0x10102 /* AEGEAN CHECK MARK */
@@ -5502,6 +5632,7 @@
           || ch == 0x103D0 /* OLD PERSIAN WORD DIVIDER */
           || ch == 0x1091F /* PHOENICIAN WORD SEPARATOR */
           || ch == 0x12470 /* CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER */
+          /* Dandas */
           || ch == 0x0964 /* DEVANAGARI DANDA */
           || ch == 0x0965 /* DEVANAGARI DOUBLE DANDA */
           || ch == 0x0E5A /* THAI CHARACTER ANGKHANKHU */
@@ -5521,17 +5652,18 @@
           || ch == 0xAA5F /* CHAM PUNCTUATION TRIPLE DANDA */
           || ch == 0x10A56 /* KHAROSHTHI PUNCTUATION DANDA */
           || ch == 0x10A57 /* KHAROSHTHI PUNCTUATION DOUBLE DANDA */
+          /* Tibetan */
           || ch == 0x0F34 /* TIBETAN MARK BSDUS RTAGS */
           || ch == 0x0F7F /* TIBETAN SIGN RNAM BCAD */
           || ch == 0x0F85 /* TIBETAN MARK PALUTA */
           || ch == 0x0FBE /* TIBETAN KU RU KHA */
           || ch == 0x0FBF /* TIBETAN KU RU KHA BZHI MIG CAN */
           || ch == 0x0FD2 /* TIBETAN MARK NYIS TSHEG */
+          /* Other Terminating Punctuation */
           || ch == 0x1804 /* MONGOLIAN COLON */
           || ch == 0x1805 /* MONGOLIAN FOUR DOTS */
           || ch == 0x1B5A /* BALINESE PANTI */
           || ch == 0x1B5B /* BALINESE PAMADA */
-          || ch == 0x1B5C /* BALINESE WINDU */
           || ch == 0x1B5D /* BALINESE CARIK PAMUNGKAH */
           || ch == 0x1B60 /* BALINESE PAMENENG */
           || ch == 0x1C3B /* LEPCHA PUNCTUATION TA-ROL */
@@ -5558,6 +5690,29 @@
           || ch == 0x10A54 /* KHAROSHTHI PUNCTUATION MANGALAM */
           || ch == 0x10A55 /* KHAROSHTHI PUNCTUATION LOTUS */
           /* Extra characters for compatibility with Unicode LineBreak.txt.  */
+          || ch == 0xA4FE /* LISU PUNCTUATION COMMA */
+          || ch == 0xA4FF /* LISU PUNCTUATION FULL STOP */
+          || ch == 0xA6F3 /* BAMUM FULL STOP */
+          || ch == 0xA6F4 /* BAMUM COLON */
+          || ch == 0xA6F5 /* BAMUM COMMA */
+          || ch == 0xA6F6 /* BAMUM SEMICOLON */
+          || ch == 0xA6F7 /* BAMUM QUESTION MARK */
+          || ch == 0xA9C7 /* JAVANESE PADA PANGKAT */
+          || ch == 0xA9C8 /* JAVANESE PADA LINGSA */
+          || ch == 0xA9C9 /* JAVANESE PADA LUNGSI */
+          || ch == 0xABEB /* MEETEI MAYEK CHEIKHEI */
+          || ch == 0x10857 /* IMPERIAL ARAMAIC SECTION SIGN */
+          || ch == 0x10B39 /* AVESTAN ABBREVIATION MARK */
+          || ch == 0x10B3A /* TINY TWO DOTS OVER ONE DOT PUNCTUATION */
+          || ch == 0x10B3B /* SMALL TWO DOTS OVER ONE DOT PUNCTUATION */
+          || ch == 0x10B3C /* LARGE TWO DOTS OVER ONE DOT PUNCTUATION */
+          || ch == 0x10B3D /* LARGE ONE DOT OVER TWO DOTS PUNCTUATION */
+          || ch == 0x10B3E /* LARGE TWO RINGS OVER ONE RING PUNCTUATION */
+          || ch == 0x10B3F /* LARGE ONE RING OVER TWO RINGS PUNCTUATION */
+          || ch == 0x110BE /* KAITHI SECTION MARK */
+          || ch == 0x110BF /* KAITHI DOUBLE SECTION MARK */
+          || ch == 0x110C0 /* KAITHI DANDA */
+          || ch == 0x110C1 /* KAITHI DOUBLE DANDA */
           || ch == 0x12471 /* CUNEIFORM PUNCTUATION SIGN VERTICAL COLON */
           || ch == 0x12472 /* CUNEIFORM PUNCTUATION SIGN DIAGONAL COLON */
           || ch == 0x12473 /* CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON */)
@@ -5593,9 +5748,15 @@
       if (ch == 0xFFFC /* OBJECT REPLACEMENT CHARACTER */)
         attr |= (int64_t) 1 << LBP_CB;
 
+      /* closing parenthesis */
+      if (ch == 0x0029 /* RIGHT PARENTHESIS */
+          || ch == 0x005D /* RIGHT SQUARE BRACKET */)
+        attr |= (int64_t) 1 << LBP_CP;
+
       /* closing punctuation */
       if ((unicode_attributes[ch].category[0] == 'P'
-           && unicode_attributes[ch].category[1] == 'e')
+           && unicode_attributes[ch].category[1] == 'e'
+           && !(attr & ((int64_t) 1 << LBP_CP)))
           || ch == 0x3001 /* IDEOGRAPHIC COMMA */
           || ch == 0x3002 /* IDEOGRAPHIC FULL STOP */
           || ch == 0xFE11 /* PRESENTATION FORM FOR VERTICAL IDEOGRAPHIC COMMA */
@@ -5605,7 +5766,16 @@
           || ch == 0xFF0C /* FULLWIDTH COMMA */
           || ch == 0xFF0E /* FULLWIDTH FULL STOP */
           || ch == 0xFF61 /* HALFWIDTH IDEOGRAPHIC FULL STOP */
-          || ch == 0xFF64 /* HALFWIDTH IDEOGRAPHIC COMMA */)
+          || ch == 0xFF64 /* HALFWIDTH IDEOGRAPHIC COMMA */
+          /* Extra characters for compatibility with Unicode LineBreak.txt.  */
+          || ch == 0x1325B /* EGYPTIAN HIEROGLYPH O006D */
+          || ch == 0x1325C /* EGYPTIAN HIEROGLYPH O006E */
+          || ch == 0x1325D /* EGYPTIAN HIEROGLYPH O006F */
+          || ch == 0x13282 /* EGYPTIAN HIEROGLYPH O033A */
+          || ch == 0x13287 /* EGYPTIAN HIEROGLYPH O036B */
+          || ch == 0x13289 /* EGYPTIAN HIEROGLYPH O036D */
+          || ch == 0x1337A /* EGYPTIAN HIEROGLYPH V011B */
+          || ch == 0x1337B /* EGYPTIAN HIEROGLYPH V011C */)
         attr |= (int64_t) 1 << LBP_CL;
 
       /* exclamation/interrogation */
@@ -5690,7 +5860,14 @@
            && unicode_attributes[ch].category[1] == 's')
           || ch == 0x00A1 /* INVERTED EXCLAMATION MARK */
           || ch == 0x00BF /* INVERTED QUESTION MARK */
-          || ch == 0x2E18 /* INVERTED INTERROBANG */)
+          || ch == 0x2E18 /* INVERTED INTERROBANG */
+          /* Extra characters for compatibility with Unicode LineBreak.txt.  */
+          || ch == 0x13258 /* EGYPTIAN HIEROGLYPH O006A */
+          || ch == 0x13259 /* EGYPTIAN HIEROGLYPH O006B */
+          || ch == 0x1325A /* EGYPTIAN HIEROGLYPH O006C */
+          || ch == 0x13286 /* EGYPTIAN HIEROGLYPH O036A */
+          || ch == 0x13288 /* EGYPTIAN HIEROGLYPH O036C */
+          || ch == 0x13379 /* EGYPTIAN HIEROGLYPH V011A */)
         attr |= (int64_t) 1 << LBP_OP;
 
       /* ambiguous quotation */
@@ -5759,7 +5936,12 @@
           /* Extra characters for compatibility with Unicode LineBreak.txt.  */
           || ch == 0x0609 /* ARABIC-INDIC PER MILLE SIGN */
           || ch == 0x060A /* ARABIC-INDIC PER TEN THOUSAND SIGN */
-          || ch == 0x0D79 /* MALAYALAM DATE MARK */)
+          || ch == 0x09F2 /* BENGALI RUPEE MARK */
+          || ch == 0x09F3 /* BENGALI RUPEE SIGN */
+          || ch == 0x09F9 /* BENGALI CURRENCY DENOMINATOR SIXTEEN */
+          || ch == 0x0D79 /* MALAYALAM DATE MARK */
+          || ch == 0x20B6 /* LIVRE TOURNOIS SIGN */
+          || ch == 0xA838 /* NORTH INDIC RUPEE MARK */)
         attr |= (int64_t) 1 << LBP_PO;
 
       /* prefix (numeric) */
@@ -5784,13 +5966,13 @@
       if (ch >= 0xAC00 && ch <= 0xD7A3 && ((ch - 0xAC00) % 28) != 0)
         attr |= (int64_t) 1 << LBP_H3;
 
-      if ((ch >= 0x1100 && ch <= 0x1159) || ch == 0x115F)
+      if ((ch >= 0x1100 && ch <= 0x115F) || (ch >= 0xA960 && ch <= 0xA97C))
         attr |= (int64_t) 1 << LBP_JL;
 
-      if (ch >= 0x1160 && ch <= 0x11A2)
+      if ((ch >= 0x1160 && ch <= 0x11A7) || (ch >= 0xD7B0 && ch <= 0xD7C6))
         attr |= (int64_t) 1 << LBP_JV;
 
-      if (ch >= 0x11A8 && ch <= 0x11F9)
+      if ((ch >= 0x11A8 && ch <= 0x11FF) || (ch >= 0xD7CB && ch <= 0xD7FB))
         attr |= (int64_t) 1 << LBP_JT;
 
       /* complex context (South East Asian) */
@@ -5801,16 +5983,22 @@
                    || unicode_attributes[ch].category[1] == 'o'))
            || (unicode_attributes[ch].category[0] == 'M'
                && (unicode_attributes[ch].category[1] == 'c'
-                   || unicode_attributes[ch].category[1] == 'n'))
+                   || unicode_attributes[ch].category[1] == 'n')
+               && ch != 0x1A7F /* TAI THAM COMBINING CRYPTOGRAMMIC DOT */)
            /* Extra characters for compatibility with Unicode LineBreak.txt.  */
            || ch == 0x109E /* MYANMAR SYMBOL SHAN ONE */
            || ch == 0x109F /* MYANMAR SYMBOL SHAN EXCLAMATION */
            || ch == 0x19DE /* NEW TAI LUE SIGN LAE */
-           || ch == 0x19DF /* NEW TAI LUE SIGN LAEV */)
-          && ((ch >= 0x0E00 && ch <= 0x0EFF)
-              || (ch >= 0x1000 && ch <= 0x109F)
-              || (ch >= 0x1780 && ch <= 0x17FF)
-              || (ch >= 0x1950 && ch <= 0x19DF)))
+           || ch == 0x19DF /* NEW TAI LUE SIGN LAEV */
+           || (ch >= 0x1AA0 && ch <= 0x1AAD) /* TAI THAM SIGN */
+           || (ch >= 0xAA77 && ch <= 0xAA79) /* MYANMAR SYMBOL AITON */
+           || (ch >= 0xAADE && ch <= 0xAADF) /* TAI VIET SYMBOL */)
+          && ((ch >= 0x0E00 && ch <= 0x0EFF) /* Thai, Lao */
+              || (ch >= 0x1000 && ch <= 0x109F) /* Myanmar */
+              || (ch >= 0x1780 && ch <= 0x17FF) /* Khmer */
+              || (ch >= 0x1950 && ch <= 0x19DF) /* Tai Le, New Tai Lue */
+              || (ch >= 0x1A20 && ch <= 0x1AAF) /* Tai Tham */
+              || (ch >= 0xAA60 && ch <= 0xAADF) /* Myanmar Extended-A, Tai Viet */))
         attr |= (int64_t) 1 << LBP_SA;
 
       /* attached characters and combining marks */
@@ -5820,7 +6008,8 @@
                || unicode_attributes[ch].category[1] == 'n'))
           || (unicode_attributes[ch].category[0] == 'C'
               && (unicode_attributes[ch].category[1] == 'c'
-                  || unicode_attributes[ch].category[1] == 'f')))
+                  || unicode_attributes[ch].category[1] == 'f')
+              && ch != 0x110BD /* KAITHI NUMBER SIGN */))
         if (!(attr & (((int64_t) 1 << LBP_BK) | ((int64_t) 1 << LBP_BA) | ((int64_t) 1 << LBP_GL) | ((int64_t) 1 << LBP_SA) | ((int64_t) 1 << LBP_WJ) | ((int64_t) 1 << LBP_ZW))))
           attr |= (int64_t) 1 << LBP_CM;
 
@@ -5829,8 +6018,8 @@
           || ch == 0x3000 /* IDEOGRAPHIC SPACE */
           || (ch >= 0x3040 && ch <= 0x309F) /* HIRAGANA */
           || (ch >= 0x30A0 && ch <= 0x30FF) /* KATAKANA */
-          || (ch >= 0x3400 && ch <= 0x4DB5) /* CJK Ideograph Extension A */
-          || (ch >= 0x4E00 && ch <= 0x9FC3) /* CJK Ideograph */
+          || (ch >= 0x3400 && ch <= 0x4DBF) /* CJK Ideograph Extension A */
+          || (ch >= 0x4E00 && ch <= 0x9FFF) /* CJK Ideograph */
           || (ch >= 0xF900 && ch <= 0xFAD9) /* CJK COMPATIBILITY IDEOGRAPH */
           || (ch >= 0xA000 && ch <= 0xA48F) /* YI SYLLABLE */
           || (ch >= 0xA490 && ch <= 0xA4CF) /* YI RADICAL */
@@ -5844,7 +6033,7 @@
           || (ch >= 0x2F800 && ch <= 0x2FA1D) /* CJK COMPATIBILITY IDEOGRAPH */
           || strstr (unicode_attributes[ch].name, "FULLWIDTH LATIN ") != NULL
           || (ch >= 0x3000 && ch <= 0x33FF
-              && !(attr & (((int64_t) 1 << LBP_CM) | ((int64_t) 1 << LBP_NS) | ((int64_t) 1 << LBP_OP) | ((int64_t) 1 << LBP_CL))))
+              && !(attr & (((int64_t) 1 << LBP_CM) | ((int64_t) 1 << LBP_NS) | ((int64_t) 1 << LBP_OP) | ((int64_t) 1 << LBP_CL) | ((int64_t) 1 << LBP_CP))))
           /* Extra characters for compatibility with Unicode LineBreak.txt.  */
           || ch == 0xFE30 /* PRESENTATION FORM FOR VERTICAL TWO DOT LEADER */
           || ch == 0xFE31 /* PRESENTATION FORM FOR VERTICAL EM DASH */
@@ -5887,7 +6076,10 @@
           || ch == 0xFF5E /* FULLWIDTH TILDE */
           || ch == 0xFFE2 /* FULLWIDTH NOT SIGN */
           || ch == 0xFFE3 /* FULLWIDTH MACRON */
-          || ch == 0xFFE4 /* FULLWIDTH BROKEN BAR */)
+          || ch == 0xFFE4 /* FULLWIDTH BROKEN BAR */
+          /* Extra characters for compatibility with Unicode LineBreak.txt.  */
+          || (ch >= 0x1F200 && ch <= 0x1F248) /* Enclosed Ideographic Supplement */
+          || (ch >= 0x2A700 && ch <= 0x2B734) /* CJK Ideograph Extension C */)
         if (!(attr & (((int64_t) 1 << LBP_NS) | ((int64_t) 1 << LBP_CM))))
           {
             /* ambiguous (ideograph) ? */
@@ -5928,8 +6120,10 @@
           || ch == 0x2061 /* FUNCTION APPLICATION */
           || ch == 0x2062 /* INVISIBLE TIMES */
           || ch == 0x2063 /* INVISIBLE SEPARATOR */
-          || ch == 0x2064 /* INVISIBLE PLUS */)
-        if (!(attr & (((int64_t) 1 << LBP_GL) | ((int64_t) 1 << LBP_B2) | ((int64_t) 1 << LBP_BA) | ((int64_t) 1 << LBP_BB) | ((int64_t) 1 << LBP_HY) | ((int64_t) 1 << LBP_CB) | ((int64_t) 1 << LBP_CL) | ((int64_t) 1 << LBP_EX) | ((int64_t) 1 << LBP_IN) | ((int64_t) 1 << LBP_NS) | ((int64_t) 1 << LBP_OP) | ((int64_t) 1 << LBP_QU) | ((int64_t) 1 << LBP_IS) | ((int64_t) 1 << LBP_NU) | ((int64_t) 1 << LBP_PO) | ((int64_t) 1 << LBP_PR) | ((int64_t) 1 << LBP_SY) | ((int64_t) 1 << LBP_H2) | ((int64_t) 1 << LBP_H3) | ((int64_t) 1 << LBP_JL) | ((int64_t) 1 << LBP_JV) | ((int64_t) 1 << LBP_JT) | ((int64_t) 1 << LBP_SA) | ((int64_t) 1 << LBP_ID))))
+          || ch == 0x2064 /* INVISIBLE PLUS */
+          /* Extra characters for compatibility with Unicode LineBreak.txt.  */
+          || ch == 0x110BD /* KAITHI NUMBER SIGN */)
+        if (!(attr & (((int64_t) 1 << LBP_GL) | ((int64_t) 1 << LBP_B2) | ((int64_t) 1 << LBP_BA) | ((int64_t) 1 << LBP_BB) | ((int64_t) 1 << LBP_HY) | ((int64_t) 1 << LBP_CB) | ((int64_t) 1 << LBP_CL) | ((int64_t) 1 << LBP_CP) | ((int64_t) 1 << LBP_EX) | ((int64_t) 1 << LBP_IN) | ((int64_t) 1 << LBP_NS) | ((int64_t) 1 << LBP_OP) | ((int64_t) 1 << LBP_QU) | ((int64_t) 1 << LBP_IS) | ((int64_t) 1 << LBP_NU) | ((int64_t) 1 << LBP_PO) | ((int64_t) 1 << LBP_PR) | ((int64_t) 1 << LBP_SY) | ((int64_t) 1 << LBP_H2) | ((int64_t) 1 << LBP_H3) | ((int64_t) 1 << LBP_JL) | ((int64_t) 1 << LBP_JV) | ((int64_t) 1 << LBP_JT) | ((int64_t) 1 << LBP_SA) | ((int64_t) 1 << LBP_ID))))
           {
             /* ambiguous (alphabetic) ? */
             if ((unicode_width[ch] != NULL
@@ -5986,6 +6180,20 @@
             attr &= ~((int64_t) 1 << LBP_CM);
           }
     }
+  else
+    {
+      /* Unassigned character.  */
+      if ((ch >= 0x3400 && ch <= 0x4DBF) /* CJK Unified Ideographs Extension A */
+          || (ch >= 0x4E00 && ch <= 0x9FFF) /* CJK Unified Ideographs */
+          || (ch >= 0xF900 && ch <= 0xFAFF) /* CJK Compatibility Ideographs */
+          || (ch >= 0x20000 && ch <= 0x2A6FF) /* CJK Unified Ideographs Extension B */
+          || (ch >= 0x2A700 && ch <= 0x2F7FF) /* CJK Unified Ideographs Extension C,
+                                                 Supplementary Ideographic Plane (Plane 2) outside of blocks */
+          || (ch >= 0x2F800 && ch <= 0x2FFFD) /* CJK Compatibility Ideographs Supplement,
+                                                 Supplementary Ideographic Plane (Plane 2) outside of blocks */
+          || (ch >= 0x30000 && ch <= 0x3FFFD) /* Tertiary Ideographic Plane (Plane 3) outside of blocks */)
+        attr |= (int64_t) 1 << LBP_ID;
+    }
 
   if (attr == 0)
     /* unknown */
@@ -6007,7 +6215,7 @@
         {
           fprintf (stream, "0x%04X", i);
 #define PRINT_BIT(attr,bit) \
-  if (attr & (1 << bit)) fprintf (stream, " " #bit);
+  if (attr & ((int64_t) 1 << bit)) fprintf (stream, " " #bit);
           PRINT_BIT(attr,LBP_BK);
           PRINT_BIT(attr,LBP_CM);
           PRINT_BIT(attr,LBP_WJ);
@@ -6020,6 +6228,7 @@
           PRINT_BIT(attr,LBP_HY);
           PRINT_BIT(attr,LBP_CB);
           PRINT_BIT(attr,LBP_CL);
+          PRINT_BIT(attr,LBP_CP);
           PRINT_BIT(attr,LBP_EX);
           PRINT_BIT(attr,LBP_IN);
           PRINT_BIT(attr,LBP_NS);
@@ -6133,6 +6342,7 @@
       TRY(LBP_HY)
       TRY(LBP_CB)
       TRY(LBP_CL)
+      TRY(LBP_CP)
       TRY(LBP_EX)
       TRY(LBP_IN)
       TRY(LBP_NS)
@@ -6211,6 +6421,7 @@
           PRINT_BIT(attr,LBP_HY);
           PRINT_BIT(attr,LBP_CB);
           PRINT_BIT(attr,LBP_CL);
+          PRINT_BIT(attr,LBP_CP);
           PRINT_BIT(attr,LBP_EX);
           PRINT_BIT(attr,LBP_IN);
           PRINT_BIT(attr,LBP_NS);
@@ -6383,6 +6594,7 @@
           CASE(LBP_HY);
           CASE(LBP_CB);
           CASE(LBP_CL);
+          CASE(LBP_CP);
           CASE(LBP_EX);
           CASE(LBP_IN);
           CASE(LBP_NS);
@@ -6482,7 +6694,8 @@
 
 /* ========================================================================= */
 
-/* Word break property.  */
+/* Word break property.
+   Updated for Unicode TR #29 revision 15.  */
 
 /* Possible values of the Word_Break property.  */
 enum
@@ -6528,7 +6741,7 @@
 
       if (unicode_attributes[ch].category != NULL
           && strcmp (unicode_attributes[ch].category, "Cf") == 0
-          && ch != 0x200C && ch != 0x200D)
+          && ch != 0x200B && ch != 0x200C && ch != 0x200D)
         attr |= 1 << WBP_FORMAT;
 
       if ((unicode_scripts[ch] < numscripts
@@ -6548,12 +6761,10 @@
           && (attr & (1 << WBP_EXTEND)) == 0)
         attr |= 1 << WBP_ALETTER;
 
-      if (ch == 0x0027 || ch == 0x002E || ch == 0x2018 || ch == 0x2019
-          || ch == 0x2024 || ch == 0xFE52 || ch == 0xFF07 || ch == 0xFF0E)
+      if (is_WBP_MIDNUMLET (ch))
         attr |= 1 << WBP_MIDNUMLET;
 
-      if (ch == 0x00B7 || ch == 0x05F4 || ch == 0x2027 || ch == 0x003A
-          || ch == 0x0387 || ch == 0xFE13 || ch == 0xFE55 || ch == 0xFF1A)
+      if (is_WBP_MIDLETTER (ch))
         attr |= 1 << WBP_MIDLETTER;
 
       if ((((get_lbp (ch) >> LBP_IS) & 1) != 0
@@ -6960,7 +7171,8 @@
 
 /* ========================================================================= */
 
-/* Grapheme break property.  */
+/* Grapheme break property.
+   Updated for Unicode TR #29 revision 15.  */
 
 /* Possible values of the Grapheme_Cluster_Break property.  */
 enum
@@ -7265,6 +7477,9 @@
 
 /* ========================================================================= */
 
+/* Composition and decomposition.
+   Updated for Unicode TR #15 revision 31.  */
+
 /* Maximum number of characters into which a single Unicode character can be
    decomposed.  */
 #define MAX_DECOMP_LENGTH 18
@@ -7713,7 +7928,7 @@
      1527, which is quite good (60% filled).  It requires an auxiliary table
      lookup in a table of size 0.5 KB.  The total tables size is 11 KB.  */
 
-  fprintf (stream, "struct composition_rule { char codes[4]; };\n");
+  fprintf (stream, "struct composition_rule { char codes[6]; };\n");
   fprintf (stream, "%%struct-type\n");
   fprintf (stream, "%%language=ANSI-C\n");
   fprintf (stream, "%%define slot-name codes\n");
@@ -7751,16 +7966,9 @@
               if (strcmp (unicode_attributes[combined].combining, "0") != 0)
                 abort ();
 
-              if (!(code1 < 0x10000))
-                abort ();
-              if (!(code2 < 0x10000))
-                abort ();
-              if (!(combined < 0x10000))
-                abort ();
-
-              fprintf (stream, "\"\\x%02x\\x%02x\\x%02x\\x%02x\", 0x%04x\n",
-                       (code1 >> 8) & 0xff, code1 & 0xff,
-                       (code2 >> 8) & 0xff, code2 & 0xff,
+              fprintf (stream, "\"\\x%02x\\x%02x\\x%02x\\x%02x\\x%02x\\x%02x\", 0x%04x\n",
+                       (code1 >> 16) & 0xff, (code1 >> 8) & 0xff, code1 & 0xff,
+                       (code2 >> 16) & 0xff, (code2 >> 8) & 0xff, code2 & 0xff,
                        combined);
             }
         }
@@ -8900,20 +9108,20 @@
  * compile-command: "
    gcc -O -Wall gen-uni-tables.c -Iunictype -o gen-uni-tables && \
    ./gen-uni-tables \
-        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.1.0/ucd/UnicodeData.txt \
-        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.1.0/ucd/PropList.txt \
-        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.1.0/ucd/DerivedCoreProperties.txt \
-        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.1.0/ucd/Scripts.txt \
-        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.1.0/ucd/Blocks.txt \
+        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.2.0/ucd/UnicodeData.txt \
+        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.2.0/ucd/PropList.txt \
+        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.2.0/ucd/DerivedCoreProperties.txt \
+        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.2.0/ucd/Scripts.txt \
+        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.2.0/ucd/Blocks.txt \
         /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/3.0.1/PropList-3.0.1.txt \
-        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.1.0/ucd/EastAsianWidth.txt \
-        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.1.0/ucd/LineBreak.txt \
-        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.1.0/ucd/auxiliary/WordBreakProperty.txt \
-        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.1.0/ucd/auxiliary/GraphemeBreakProperty.txt \
-        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.1.0/ucd/CompositionExclusions.txt \
-        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.1.0/ucd/SpecialCasing.txt \
-        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.1.0/ucd/CaseFolding.txt \
-        5.1.0 \
+        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.2.0/ucd/EastAsianWidth.txt \
+        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.2.0/ucd/LineBreak.txt \
+        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.2.0/ucd/auxiliary/WordBreakProperty.txt \
+        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.2.0/ucd/auxiliary/GraphemeBreakProperty.txt \
+        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.2.0/ucd/CompositionExclusions.txt \
+        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.2.0/ucd/SpecialCasing.txt \
+        /gfs/petix/Volumes/ExtData/www-archive/software/i18n/unicode/ftp.unicode.org/ArchiveVersions/5.2.0/ucd/CaseFolding.txt \
+        5.2.0 \
    && diff unilbrk/lbrkprop_org.txt unilbrk/lbrkprop.txt \
    && diff uniwbrk/wbrkprop_org.txt uniwbrk/wbrkprop.txt
    "

--- a/lib/unicase/cased.h
+++ b/lib/unicase/cased.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Casing Properties of Unicode characters.  */
-/* Generated automatically by gen-ctype.c for Unicode 5.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 5.2.0.  */
 #define header_0 16
 #define header_2 9
 #define header_3 127
@@ -289,7 +289,7 @@
     0xFFFFD740, 0xFFFFFFFB, 0xFFFFFFFF, 0xFFBFFFFF,
     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
     0xFFFFFC03, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
-    0xFFFFFFFF, 0xFFFE000F, 0x007FFFFF, 0xFFFFFFFE,
+    0xFFFFFFFF, 0xFFFE003F, 0x007FFFFF, 0xFFFFFFFE,
     0x000000FF, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0xFFFFFFFF, 0x0000003F, 0x00000000,
@@ -303,7 +303,7 @@
     0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,
     0x3F3FFFFF, 0xFFFFFFFF, 0xAAFF3F3F, 0x3FFFFFFF,
     0xFFFFFFFF, 0x5FDFFFFF, 0x0FCF1FDC, 0x1FDC1FFF,
-    0x00000000, 0x00000000, 0x00000000, 0x80020000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x001F0000, 0x00000000, 0x00000000, 0x00000000,
     0x3E2FFC84, 0xF21FBD50, 0x000043E0, 0xFFFFFFFF,
     0x00000018, 0x00000000, 0x00000000, 0x00000000,
@@ -311,8 +311,8 @@
     0x00000000, 0xFFC00000, 0xFFFFFFFF, 0x000003FF,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0xFFFFFFFF, 0xFFFF7FFF, 0x7FFFFFFF, 0x3FFEFFFF,
-    0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000001F,
+    0xFFFFFFFF, 0xFFFF7FFF, 0x7FFFFFFF, 0xFFFFFFFF,
+    0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x0000781F,
     0xFFFFFFFF, 0x0000003F, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0xFFFFFFFF, 0x00003FFC,

--- a/lib/unicase/ignorable.h
+++ b/lib/unicase/ignorable.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Casing Properties of Unicode characters.  */
-/* Generated automatically by gen-ctype.c for Unicode 5.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 5.2.0.  */
 #define header_0 16
 #define header_2 9
 #define header_3 127
@@ -11,7 +11,7 @@
     int header[1];
     int level1[15];
     short level2[3 << 7];
-    /*unsigned*/ int level3[30 << 4];
+    /*unsigned*/ int level3[32 << 4];
   }
 u_casing_property_case_ignorable =
 {
@@ -116,10 +116,10 @@
        -1,
        16 +   384 * sizeof (short) / sizeof (int) +   304,
        -1,
-       -1,
        16 +   384 * sizeof (short) / sizeof (int) +   320,
        16 +   384 * sizeof (short) / sizeof (int) +   336,
        16 +   384 * sizeof (short) / sizeof (int) +   352,
+       16 +   384 * sizeof (short) / sizeof (int) +   368,
        -1,
        -1,
        -1,
@@ -159,15 +159,18 @@
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   368,
+       16 +   384 * sizeof (short) / sizeof (int) +   384,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   384,
        16 +   384 * sizeof (short) / sizeof (int) +   400,
+       16 +   384 * sizeof (short) / sizeof (int) +   416,
        -1,
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   416,
+       16 +   384 * sizeof (short) / sizeof (int) +   432,
+       -1,
+       -1,
+       16 +   384 * sizeof (short) / sizeof (int) +   448,
        -1,
        -1,
        -1,
@@ -263,11 +266,8 @@
        -1,
        -1,
        -1,
-       -1,
-       -1,
-       -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   432,
-       16 +   384 * sizeof (short) / sizeof (int) +   448,
+       16 +   384 * sizeof (short) / sizeof (int) +   464,
+       16 +   384 * sizeof (short) / sizeof (int) +   480,
        -1,
        -1,
        -1,
@@ -290,7 +290,7 @@
        -1,
        -1,
        -1,
-       16 +   384 * sizeof (short) / sizeof (int) +   464,
+       16 +   384 * sizeof (short) / sizeof (int) +   496,
        -1,
        -1,
        -1,
@@ -436,9 +436,9 @@
     0x00000000, 0x00000000, 0xFFC00000, 0x00003DFF,
     0x00028000, 0xFFFF0000, 0x000007FF, 0x00000000,
     0x00000000, 0x0001FFC0, 0x00000000, 0x043FF800,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0xFFC00000, 0x00003FFF, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000006, 0x10000000, 0x001E21FE, 0x0002000C,
+    0x00000007, 0x10000000, 0x003E21FE, 0x0002000C,
     0x00000002, 0x10000000, 0x0000201E, 0x0000000C,
     0x00000006, 0x10000000, 0x00023986, 0x00230000,
     0x00000006, 0x10000000, 0x000021BE, 0x0000000C,
@@ -453,7 +453,7 @@
     0x03000000, 0x02A00000, 0x00000000, 0x7FFE0000,
     0xFEFF00DF, 0x1FFFFFFF, 0x00000040, 0x00000000,
     0x00000000, 0x66FDE000, 0xC3000000, 0x001E0001,
-    0x00002064, 0x00000000, 0x00000000, 0x10000000,
+    0x20002064, 0x00000000, 0x00000000, 0x10000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -468,24 +468,24 @@
     0x00000000, 0x00000200, 0x00000000, 0x00000000,
     0x00000000, 0x0E040187, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x01800000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x01800000, 0x00000000, 0x7F400000, 0x9FF81FE5,
+    0x00000000, 0x00000080, 0x00000000, 0x00000000,
     0x0000000F, 0x17D00000, 0x00000004, 0x000FF800,
     0x00000003, 0x0000033C, 0x00000000, 0x00000000,
     0x00000000, 0x00CFF000, 0x00000000, 0x3F000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0xFFF70000, 0x000021FD,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0xFFFFFFFF, 0xC000007F,
+    0x00000000, 0x00000000, 0xFFFFFFFF, 0xE000007F,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0xA0000000, 0xE000E003, 0x6000E000,
-    0x0300F800, 0x00007C90, 0x00000000, 0x0000FC1F,
+    0x0300F800, 0x00007C90, 0x00000000, 0x8002FC1F,
     0x00000000, 0x00000000, 0xFFFF0000, 0x0001FFFF,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00038000,
     0x00000000, 0x00000000, 0x00000000, 0x00008000,
     0x00000000, 0x00000000, 0x00000000, 0xFFFFFFFF,
     0x00000000, 0x00008000, 0x00000000, 0x00000000,
@@ -500,18 +500,22 @@
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x3F000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00001000, 0x00000000, 0x00000000, 0xB0078000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00030000,
     0xFFFFFFFF, 0x00000003, 0x00000000, 0x00000000,
     0x00000700, 0x00000000, 0x00000000, 0x00000000,
     0x00000844, 0x00000060, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000010, 0x00000000,
+    0x00000000, 0x00000000, 0x00000010, 0x0003FFFF,
     0x00000000, 0x00003FC0, 0x0003FF80, 0x00000000,
+    0x00000007, 0x13C80000, 0x00008000, 0x00000000,
+    0x00000000, 0x00667E00, 0x00001008, 0x00010000,
+    0x00000000, 0xC19D0000, 0x20000002, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00667E00, 0x00001008, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000,
-    0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00002120,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x40000000, 0x00000000, 0x00000000, 0x00000000,
@@ -529,6 +533,10 @@
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000003, 0x26780000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0x00000000,
     0x00000000, 0x00000000, 0x00000000, 0xFFF80380,
     0x00000FE7, 0x00003C00, 0x00000000, 0x00000000,

--- a/lib/unicase/special-casing-table.gperf
+++ b/lib/unicase/special-casing-table.gperf
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Special casing rules of Unicode characters.  */
-/* Generated automatically by gen-uni-tables.c for Unicode 5.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 5.2.0.  */
 struct special_casing_rule { char code[3]; };
 %struct-type
 %language=ANSI-C

--- a/lib/unicase/tocasefold.h
+++ b/lib/unicase/tocasefold.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Simple character mapping of Unicode characters.  */
-/* Generated automatically by gen-case.c for Unicode 5.1.0.  */
+/* Generated automatically by gen-case.c for Unicode 5.2.0.  */
 #define mapping_header_0 16
 #define mapping_header_1 2
 #define mapping_header_2 7
@@ -295,7 +295,7 @@
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,     1,     0,     1,     0,
-        1,     0,     1,     0,     0,     0,     0,     0,
+        1,     0,     1,     0,     1,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,    48,    48,    48,    48,    48,    48,    48,
        48,    48,    48,    48,    48,    48,    48,    48,
@@ -449,8 +449,8 @@
         0,     0,     0,     0,     0,     0,     0,     0,
         1,     0, -10743, -3814, -10727,     0,     0,     1,
         0,     1,     0,     1,     0, -10780, -10749, -10783,
-        0,     0,     1,     0,     0,     1,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,
+    -10782,     0,     1,     0,     0,     1,     0,     0,
+        0,     0,     0,     0,     0,     0, -10815, -10815,
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,     1,     0,     1,     0,
@@ -464,7 +464,7 @@
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     1,     0,     1,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,

--- a/lib/unicase/tolower.h
+++ b/lib/unicase/tolower.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Simple character mapping of Unicode characters.  */
-/* Generated automatically by gen-case.c for Unicode 5.1.0.  */
+/* Generated automatically by gen-case.c for Unicode 5.2.0.  */
 #define mapping_header_0 16
 #define mapping_header_1 2
 #define mapping_header_2 7
@@ -295,7 +295,7 @@
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,     1,     0,     1,     0,
-        1,     0,     1,     0,     0,     0,     0,     0,
+        1,     0,     1,     0,     1,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,    48,    48,    48,    48,    48,    48,    48,
        48,    48,    48,    48,    48,    48,    48,    48,
@@ -449,8 +449,8 @@
         0,     0,     0,     0,     0,     0,     0,     0,
         1,     0, -10743, -3814, -10727,     0,     0,     1,
         0,     1,     0,     1,     0, -10780, -10749, -10783,
-        0,     0,     1,     0,     0,     1,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,
+    -10782,     0,     1,     0,     0,     1,     0,     0,
+        0,     0,     0,     0,     0,     0, -10815, -10815,
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,     1,     0,     1,     0,
@@ -464,7 +464,7 @@
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,     1,     0,     1,     0,
         1,     0,     1,     0,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     1,     0,     1,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,

--- a/lib/unicase/totitle.h
+++ b/lib/unicase/totitle.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Simple character mapping of Unicode characters.  */
-/* Generated automatically by gen-case.c for Unicode 5.1.0.  */
+/* Generated automatically by gen-case.c for Unicode 5.2.0.  */
 #define mapping_header_0 16
 #define mapping_header_1 2
 #define mapping_header_2 7
@@ -218,10 +218,10 @@
         0,     0,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,     0,     0,     0,
-        0,     0,     0,     0,    -1,     0,     0,     0,
-        0,     0,    -1,     0,     0,     0,     0,    -1,
+        0,     0,     0,     0,    -1,     0,     0, 10815,
+    10815,     0,    -1,     0,     0,     0,     0,    -1,
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
-    10783, 10780,     0,  -210,  -206,     0,  -205,  -205,
+    10783, 10780, 10782,  -210,  -206,     0,  -205,  -205,
         0,  -202,     0,  -203,     0,     0,     0,     0,
      -205,     0,     0,  -207,     0,     0,     0,     0,
      -209,  -211,     0, 10743,     0,     0,     0,  -211,
@@ -311,7 +311,7 @@
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
-        0,    -1,     0,    -1,     0,     0,     0,     0,
+        0,    -1,     0,    -1,     0,    -1,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
@@ -496,7 +496,7 @@
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,    -1,     0,    -1,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
     -7264, -7264, -7264, -7264, -7264, -7264, -7264, -7264,

--- a/lib/unicase/toupper.h
+++ b/lib/unicase/toupper.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Simple character mapping of Unicode characters.  */
-/* Generated automatically by gen-case.c for Unicode 5.1.0.  */
+/* Generated automatically by gen-case.c for Unicode 5.2.0.  */
 #define mapping_header_0 16
 #define mapping_header_1 2
 #define mapping_header_2 7
@@ -218,10 +218,10 @@
         0,     0,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,     0,     0,     0,
-        0,     0,     0,     0,    -1,     0,     0,     0,
-        0,     0,    -1,     0,     0,     0,     0,    -1,
+        0,     0,     0,     0,    -1,     0,     0, 10815,
+    10815,     0,    -1,     0,     0,     0,     0,    -1,
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
-    10783, 10780,     0,  -210,  -206,     0,  -205,  -205,
+    10783, 10780, 10782,  -210,  -206,     0,  -205,  -205,
         0,  -202,     0,  -203,     0,     0,     0,     0,
      -205,     0,     0,  -207,     0,     0,     0,     0,
      -209,  -211,     0, 10743,     0,     0,     0,  -211,
@@ -311,7 +311,7 @@
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
-        0,    -1,     0,    -1,     0,     0,     0,     0,
+        0,    -1,     0,    -1,     0,    -1,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
@@ -496,7 +496,7 @@
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,    -1,     0,    -1,
         0,    -1,     0,    -1,     0,     0,     0,     0,
-        0,     0,     0,     0,     0,     0,     0,     0,
+        0,     0,     0,     0,    -1,     0,    -1,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
         0,     0,     0,     0,     0,     0,     0,     0,
     -7264, -7264, -7264, -7264, -7264, -7264, -7264, -7264,

--- a/lib/unictype/bidi_of.h
+++ b/lib/unictype/bidi_of.h
@@ -1,6 +1,6 @@
 /* DO NOT EDIT! GENERATED AUTOMATICALLY! */
 /* Bidi categories of Unicode characters.  */
-/* Generated automatically by gen-ctype.c for Unicode 5.1.0.  */
+/* Generated automatically by gen-uni-tables.c for Unicode 5.2.0.  */
 #define bidi_category_header_0 16
 #define bidi_category_header_1 17
 #define bidi_category_header_2 7
@@ -11,7 +11,7 @@
   {
     int level1[17];
     short level2[4 << 9];
-    unsigned short level3[101 * 40 + 1];
+    unsigned short level3[114 * 40 + 1];
   }
 u_bidi_category =
 {
@@ -23,24 +23,24 @@
   {
         0,   128,    -1,    -1,    -1,   256,   384,   512,
        -1,   640,    -1,   768,   896,  1024,  1152,  1280,
-     1408,  1408,  1536,  1664,  1792,  1920,  2048,  2176,
-     2304,  2432,  2560,  2688,  2816,  2944,  3072,  3200,
-     3328,  3456,    -1,    -1,    -1,    -1,  3584,  3712,
-       -1,    -1,    -1,    -1,    -1,  3840,  3968,  4096,
-     4224,  4352,  4480,  4608,  4736,    -1,  4864,  4992,
-     5120,    -1,    -1,  5248,    -1,    -1,    -1,  5376,
-     5504,  5632,  5760,  5888,  6016,  6144,  6272,  6400,
-     6528,  6656,  6144,  6144,  6144,  6784,  6912,  7040,
-       -1,    -1,  6144,  6144,  6144,  6144,  7168,    -1,
-       -1,  7296,    -1,  7424,  7552,  7680,  6144,  7808,
-     7936,  8064,    -1,  8192,  8320,  8448,  8576,  8704,
+     1408,  1536,  1664,  1792,  1920,  2048,  2176,  2304,
+     2432,  2560,  2688,  2816,  2944,  3072,  3200,  3328,
+     3456,  3584,    -1,    -1,    -1,    -1,  3712,  3840,
+     3968,    -1,    -1,    -1,    -1,  4096,  4224,  4352,
+     4480,  4608,  4736,  4864,  4992,    -1,  5120,  5248,
+     5376,  5504,    -1,  5632,    -1,    -1,    -1,  5760,
+     5888,  6016,  6144,  6272,  6400,  6528,  6656,  6784,
+     6912,  7040,  6528,  6528,  6528,  7168,  7296,  7424,
+       -1,    -1,  6528,  6528,  6528,  6528,  7552,    -1,
+       -1,  7680,    -1,  7808,  7936,  8064,  6528,  8192,
+     8320,  8448,    -1,  8576,  8704,  8832,  8960,  9088,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,  8832,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,  9216,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -62,8 +62,8 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,  8960,    -1,    -1,  9088,    -1,  9216,  9344,
-     9472,  9600,  9728,    -1,  9856,    -1,    -1,    -1,
+       -1,  9344,    -1,    -1,  9472,  9600,  9728,  9856,
+     9984, 10112, 10240, 10368, 10496, 10624,    -1, 10752,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -83,12 +83,13 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,  9984, 10112,
-    10112, 10112, 10240, 10368, 10496, 10624, 10752, 10880,
-       -1,    -1, 11008, 11136,    -1,    -1,    -1,    -1,
+       -1,    -1,    -1,    -1,    -1,    -1, 10880, 11008,
+    11008, 11008, 11136, 11264, 11392, 11520, 11648, 11776,
+       -1,    -1, 11904, 12032,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-     1408,  1408, 11264,  1408, 11392,  1408,  1408,  1408,
-     1408,  1408,  1408,  1408,  1408,  1408,  1408,  1408,
+     1536,  1536, 12160,  1536, 12288,  1536, 12416,  1536,
+     1536,  1536,  1536,  1536, 12544,  1536,  1536,  1536,
+       -1, 12672,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -136,19 +137,18 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1, 11520, 11648, 11776,    -1, 11904,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1, 12032,
+       -1,    -1, 12800, 12928, 13056,    -1, 13184,    -1,
+       -1,    -1,    -1,    -1,    -1, 13312, 13440, 13568,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-    12160, 12288,    -1,    -1,    -1,    -1,    -1,    -1,
+    13696, 13824, 13952,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1, 12416,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1, 14080,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -212,11 +212,11 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1, 12416,
-    12544, 12544, 12672, 12800, 12544, 12544, 12544, 12544,
-    12544, 12544, 12544, 12544, 12544, 12544, 12544, 12544,
-    12544, 12544, 12544, 12544, 12544, 12544, 12544, 12544,
-    12544, 12544, 12544, 12544, 12544, 12544, 12544, 12544,
+       -1,    -1,    -1,    -1,    -1,    -1,    -1, 14080,
+    14208, 14208, 14336, 14464, 14208, 14208, 14208, 14208,
+    14208, 14208, 14208, 14208, 14208, 14208, 14208, 14208,
+    14208, 14208, 14208, 14208, 14208, 14208, 14208, 14208,
+    14208, 14208, 14208, 14208, 14208, 14208, 14208, 14208,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
@@ -276,7 +276,7 @@
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
        -1,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-       -1,    -1,    -1,    -1,    -1,    -1,    -1, 12416
+       -1,    -1,    -1,    -1,    -1,    -1,    -1, 14080
   },
   {
     0x39ce, 0x9ce7, 0x0e73, 0x183e, 0x739f, 0x39ce, 0x9ce7, 0xce73,
@@ -334,21 +334,26 @@
     0x0842, 0x8421, 0x4210, 0x2108, 0x8c63, 0xc631, 0x6318, 0x318c,
     0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631,
     0x6318, 0xd68c, 0x6b5a, 0xb5ad, 0x8636, 0x5294, 0x318e, 0x18c6,
+    0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0x4631, 0xad6b,
+    0xd68d, 0x6b5a, 0xb5ad, 0x5a36, 0xa36b, 0xd6b5, 0x18da, 0x8c63,
+    0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c,
+    0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631,
+    0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6,
     0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318,
     0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63,
     0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c,
     0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631,
     0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6,
-    0x35a0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x35ad, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0xd000, 0x0000, 0xb5a0, 0x5ad6, 0x0d6b, 0x0000,
-    0x001a, 0xb5a0, 0x00d6, 0x0000, 0x0000, 0x0000, 0xb400, 0x0006,
+    0x001a, 0xb5a0, 0x1ad6, 0x0000, 0x0000, 0x0000, 0xb400, 0x0006,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x01a0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0xd000, 0x0000, 0xb5a0, 0x00d6, 0x0000, 0x0000,
     0x001a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb400, 0x0006,
-    0x0000, 0x0000, 0x0000, 0x2800, 0x0005, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x2800, 0x0005, 0x0000, 0x0500, 0x0000,
     0x35a0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0xd000, 0x0000, 0x35a0, 0x0000, 0x0d68, 0xd680,
@@ -415,7 +420,7 @@
     0x0000, 0x0000, 0x0000, 0xad00, 0x0001, 0x6b40, 0x000d, 0x0000,
     0x0000, 0x0000, 0x0000, 0xb5a0, 0x00d6, 0x0000, 0x0000, 0x0000,
     0x3400, 0x5a00, 0x0003, 0x0000, 0x001a, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x001a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -429,6 +434,11 @@
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0012, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0011, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x2900, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -467,8 +477,8 @@
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0d68,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x4000, 0xad03, 0xd6b5, 0x035a, 0x340d, 0x5a00,
+    0xad6b, 0xd6b5, 0x0000, 0x8000, 0x5ad6, 0xad6b, 0xd6b5, 0x6800,
     0xb5ad, 0x0006, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x40d0, 0xad6b, 0xd035, 0x0000, 0x3400, 0x0000, 0x0000, 0x0000,
@@ -486,9 +496,14 @@
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x35ad, 0x5ad0, 0xad6b, 0xd6b5, 0x6b5a, 0xb40d, 0x5ad6,
+    0x0d6b, 0x0000, 0x001a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5,
     0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6,
-    0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6b40,
+    0x0003, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6b5a,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x9024, 0x0252, 0x0000, 0x0000, 0x0000,
@@ -501,15 +516,15 @@
     0x8421, 0xe738, 0x739c, 0x0008, 0x1080, 0x0842, 0x24a5, 0x04a5,
     0x2108, 0x1084, 0x0842, 0x24a5, 0x04a5, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a,
-    0x14a5, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x94a5, 0x0a52, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6,
     0xad6b, 0xd6b5, 0x6b5a, 0x000d, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0252, 0xa529, 0x5204, 0x0002, 0x0000, 0x0000, 0x8120, 0x1294,
     0x0000, 0x9480, 0x4a52, 0x2409, 0x4090, 0x0002, 0x0280, 0x0000,
     0x0000, 0x0000, 0x0948, 0x0000, 0x4a52, 0x0129, 0x0000, 0x2948,
-    0x0025, 0x0000, 0xa529, 0x5294, 0x294a, 0x94a5, 0x0000, 0x0000,
+    0x0025, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x4a52, 0xa529, 0x5294,
+    0x0000, 0x0000, 0x4000, 0x0002, 0x0000, 0x4a52, 0xa529, 0x5294,
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52,
     0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a,
     0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529,
@@ -533,7 +548,7 @@
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52,
     0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a,
     0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529,
-    0x0094, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x1294, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294,
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x0004, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x4a52, 0xa529, 0x5294, 0x004a,
@@ -545,14 +560,14 @@
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x2948, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5,
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294,
-    0x294a, 0x0025, 0x4a52, 0xa529, 0x5294, 0x094a, 0x94a4, 0x4a52,
-    0xa529, 0x5294, 0x294a, 0x0001, 0x4a52, 0x0009, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x094a, 0x94a4, 0x4a52,
+    0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a,
+    0x9025, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x0252, 0x0009,
+    0x5200, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5,
     0x4a40, 0x8129, 0x5294, 0x2002, 0x94a5, 0x4a52, 0xa529, 0x5294,
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x4094, 0x294a, 0x94a5, 0x4a52,
     0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x094a,
-    0x9024, 0x4a52, 0x8000, 0x5204, 0x294a, 0x04a5, 0x4a40, 0xa529,
+    0x9024, 0x4a52, 0x8000, 0x5294, 0x294a, 0x04a5, 0x4a40, 0xa529,
     0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5,
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0x0129, 0x5200,
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a40,
@@ -562,20 +577,20 @@
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294,
     0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52,
     0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a,
-    0x0001, 0x4a52, 0x0129, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0001, 0x4a52, 0xa529, 0x5294, 0x0002, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xa400,
-    0x5294, 0x004a, 0x0000, 0x0000, 0x0000, 0x4000, 0x294a, 0x94a5,
+    0x5294, 0x004a, 0x6800, 0x01ad, 0x0000, 0x4000, 0x294a, 0x94a5,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb5ad, 0x5ad6,
     0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a,
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294,
-    0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x0012,
+    0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x0252,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -639,6 +654,11 @@
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x6800, 0x35ad, 0x0009, 0x0000, 0xd000, 0x949a,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x01ad, 0x0000, 0x0000, 0x0000, 0x0000,
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294,
     0x294a, 0x94a5, 0x0252, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -651,25 +671,40 @@
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x3400, 0x4000, 0x0003, 0x0680, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x5a00, 0x5203, 0x094a, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x4a00, 0x0001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0xa520, 0x0094, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x00d0, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb5ad, 0x5ad6,
+    0xad6b, 0xd6b5, 0x6b5a, 0x01ad, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x4000, 0xad6b, 0xd6b5, 0x001a, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xad68, 0xd6b5,
     0x6b5a, 0x01ad, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x35ad, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x8000,
+    0x4006, 0xad6b, 0xd001, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0xa000, 0xd6b5, 0x035a, 0x35a0,
     0x5a00, 0x0003, 0x0000, 0x0000, 0x8000, 0x0006, 0x0000, 0xd000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xb40d,
+    0x00d6, 0x0d68, 0x0000, 0x6b40, 0x01a0, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x1a00,
+    0x0d00, 0x0000, 0x001a, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x1b46, 0x8c63, 0xc631, 0x2318, 0x318d, 0x18c6, 0x8c63,
     0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c,
     0x18c6, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842,
@@ -729,6 +764,21 @@
     0xc631, 0xad18, 0x31b5, 0x68c6, 0x8c63, 0xc631, 0x6318, 0x318c,
     0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631,
     0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6,
+    0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318,
+    0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63,
+    0xc631, 0x4318, 0x294a, 0x94a5, 0x8c63, 0xc631, 0x6318, 0x318c,
+    0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631,
+    0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6,
+    0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318,
+    0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63,
+    0xc631, 0x6318, 0x318c, 0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c,
+    0x18c6, 0x8c63, 0xc631, 0x6318, 0x318c, 0x18c6, 0xad6b, 0xd6b5,
+    0x6b5a, 0xb5ad, 0x5ad6, 0xad6b, 0xd6b5, 0x6b5a, 0xb5ad, 0x1ad6,
+    0x01ad, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x8000,
+    0x5ad6, 0xa003, 0x0035, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
@@ -752,6 +802,16 @@
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0900, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x2400, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x9000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x4000, 0x0002, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0009, 0x0000, 0x0000,
     0x4200, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210, 0x2108, 0x1084,
     0x0842, 0x8421, 0x4210, 0x2108, 0x1084, 0x0842, 0x8421, 0x4210,
     0x4a52, 0xa529, 0x5294, 0x294a, 0x94a5, 0x4a52, 0xa529, 0x5294,
@@ -764,6 +824,11 @@
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x2108, 0x1084, 0x0842, 0x0021, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+    0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
     0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,

--- 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