From 1fd1fa5d0302e176c43378d287ee52a0e7272d72 Mon Sep 17 00:00:00 2001
From: John Naylor <john.naylor@postgresql.org>
Date: Mon, 8 Sep 2025 17:01:29 +0700
Subject: [PATCH v5 3/3] Update GB18030 encoding from version 2000 to 2022

Summary of changes between GB18030-2000 and GB18030-2022:

* 66 new characters have been added
* Unicode mappings for 18 characters have changed, and affect
  36 code points. This is a break in compatibility, but these
  characters are rarely used.

Release notes: Compatibility section

For further details, see:
https://www.unicode.org/L2/L2022/22274-disruptive-changes.pdf
https://ken-lunde.medium.com/the-gb-18030-2022-standard-3d0ebaeb4132

Author: Chao Li <lic@highgo.com>
Author: Zheng Tao <taoz@highgo.com>
Discussion: https://postgr.es/m/966d9fc.169.198741fe60b.Coremail.jiaoshuntian%40highgo.com
---
 doc/src/sgml/charset.sgml                     |    2 +-
 src/backend/utils/mb/Unicode/Makefile         |    6 +-
 .../utils/mb/Unicode/UCS_to_GB18030.pl        |    6 +-
 .../utils/mb/Unicode/gb18030_to_utf8.map      | 1877 +++++++++--------
 .../utils/mb/Unicode/utf8_to_gb18030.map      | 1340 ++++++------
 src/test/regress/expected/conversion.out      |    7 +-
 src/test/regress/sql/conversion.sql           |    1 +
 7 files changed, 1659 insertions(+), 1580 deletions(-)

diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 59b27c3c370..02bf4cf22b8 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -1876,7 +1876,7 @@ ORDER BY c COLLATE ebcdic;
         </row>
         <row>
          <entry><literal>GB18030</literal></entry>
-         <entry>National Standard</entry>
+         <entry>National Standard, version 2022</entry>
          <entry>Chinese</entry>
          <entry>No</entry>
          <entry>No</entry>
diff --git a/src/backend/utils/mb/Unicode/Makefile b/src/backend/utils/mb/Unicode/Makefile
index 27424b2a001..9f6cdcc96de 100644
--- a/src/backend/utils/mb/Unicode/Makefile
+++ b/src/backend/utils/mb/Unicode/Makefile
@@ -54,7 +54,7 @@ $(eval $(call map_rule,euc_cn,UCS_to_EUC_CN.pl,gb-18030-2000.xml))
 $(eval $(call map_rule,euc_kr,UCS_to_EUC_KR.pl,KSX1001.TXT))
 $(eval $(call map_rule,euc_tw,UCS_to_EUC_TW.pl,CNS11643.TXT))
 $(eval $(call map_rule,sjis,UCS_to_SJIS.pl,CP932.TXT))
-$(eval $(call map_rule,gb18030,UCS_to_GB18030.pl,gb-18030-2000.ucm))
+$(eval $(call map_rule,gb18030,UCS_to_GB18030.pl,gb18030-2022.ucm))
 $(eval $(call map_rule,big5,UCS_to_BIG5.pl,CP950.TXT BIG5.TXT CP950.TXT))
 $(eval $(call map_rule,euc_jis_2004,UCS_to_EUC_JIS_2004.pl,euc-jis-2004-std.txt))
 $(eval $(call map_rule,shift_jis_2004,UCS_to_SHIFT_JIS_2004.pl,sjis-0213-2004-std.txt))
@@ -78,8 +78,8 @@ euc-jis-2004-std.txt sjis-0213-2004-std.txt:
 gb-18030-2000.xml windows-949-2000.xml:
 	$(DOWNLOAD) https://raw.githubusercontent.com/unicode-org/icu-data/master/charset/data/xml/$(@F)
 
-gb-18030-2000.ucm:
-	$(DOWNLOAD) https://raw.githubusercontent.com/unicode-org/icu-data/d9d3a6ed27bb98a7106763e940258f0be8cd995b/charset/data/ucm/$(@F)
+gb18030-2022.ucm:
+	$(DOWNLOAD) https://raw.githubusercontent.com/unicode-org/icu/refs/heads/main/icu4c/source/data/mappings/$(@F)
 
 GB2312.TXT:
 	$(DOWNLOAD) 'http://trac.greenstone.org/browser/trunk/gsdl/unicode/MAPPINGS/EASTASIA/GB/GB2312.TXT?rev=1842&format=txt'
diff --git a/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl b/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl
index 084fdf66af1..a3be0d5700d 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl
@@ -5,8 +5,8 @@
 # src/backend/utils/mb/Unicode/UCS_to_GB18030.pl
 #
 # Generate UTF-8 <--> GB18030 code conversion tables from
-# "gb-18030-2000.ucm", obtained from
-# https://github.com/unicode-org/icu-data/tree/main/charset/data/ucm
+# "gb18030-2022.ucm", obtained from
+# https://github.com/unicode-org/icu/blob/main/icu4c/source/data/mappings/
 #
 # The lines we care about in the source file look like
 #   <UXXXX> \xYY[\xYY...] |n
@@ -23,7 +23,7 @@ my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_GB18030.pl';
 
 # Read the input
 
-my $in_file = "gb-18030-2000.ucm";
+my $in_file = "gb18030-2022.ucm";
 
 open(my $in, '<', $in_file) || die("cannot open $in_file");
 
diff --git a/src/backend/utils/mb/Unicode/gb18030_to_utf8.map b/src/backend/utils/mb/Unicode/gb18030_to_utf8.map
index 1c90d48fbaf..da2b2047db5 100644
--- a/src/backend/utils/mb/Unicode/gb18030_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/gb18030_to_utf8.map
@@ -1,7 +1,7 @@
 /* src/backend/utils/mb/Unicode/gb18030_to_utf8.map */
 /* This file is generated by src/backend/utils/mb/Unicode/UCS_to_GB18030.pl */
 
-static const uint32 gb18030_to_unicode_tree_table[32795];
+static const uint32 gb18030_to_unicode_tree_table[32911];
 
 static const pg_mb_radix_tree gb18030_to_unicode_tree =
 {
@@ -37,7 +37,7 @@ static const pg_mb_radix_tree gb18030_to_unicode_tree =
   0x39  /* b4_4_upper */
 };
 
-static const uint32 gb18030_to_unicode_tree_table[32795] =
+static const uint32 gb18030_to_unicode_tree_table[32911] =
 {
   /*** Dummy map, for invalid values - offset 0x00000 ***/
 
@@ -1885,7 +1885,7 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* 94 */  0xee9799, 0xee979a, 0xee979b, 0xee979c,
   /* 98 */  0xee979d, 0xee979e, 0xee979f, 0xee97a0,
   /* 9c */  0xee97a1, 0xee97a2, 0xee97a3, 0xee97a4,
-  /* a0 */  0xee97a5, 0xefbc81, 0xefbc82, 0xefbc83,
+  /* a0 */  0x000000, 0xefbc81, 0xefbc82, 0xefbc83,
   /* a4 */  0xefbfa5, 0xefbc85, 0xefbc86, 0xefbc87,
   /* a8 */  0xefbc88, 0xefbc89, 0xefbc8a, 0xefbc8b,
   /* ac */  0xefbc8c, 0xefbc8d, 0xefbc8e, 0xefbc8f,
@@ -2052,13 +2052,13 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* cc */  0x00cebc, 0x00cebd, 0x00cebe, 0x00cebf,
   /* d0 */  0x00cf80, 0x00cf81, 0x00cf83, 0x00cf84,
   /* d4 */  0x00cf85, 0x00cf86, 0x00cf87, 0x00cf88,
-  /* d8 */  0x00cf89, 0xee9e8d, 0xee9e8e, 0xee9e8f,
-  /* dc */  0xee9e90, 0xee9e91, 0xee9e92, 0xee9e93,
+  /* d8 */  0x00cf89, 0xefb890, 0xefb892, 0xefb891,
+  /* dc */  0xefb893, 0xefb894, 0xefb895, 0xefb896,
   /* e0 */  0xefb8b5, 0xefb8b6, 0xefb8b9, 0xefb8ba,
   /* e4 */  0xefb8bf, 0xefb980, 0xefb8bd, 0xefb8be,
   /* e8 */  0xefb981, 0xefb982, 0xefb983, 0xefb984,
-  /* ec */  0xee9e94, 0xee9e95, 0xefb8bb, 0xefb8bc,
-  /* f0 */  0xefb8b7, 0xefb8b8, 0xefb8b1, 0xee9e96,
+  /* ec */  0xefb897, 0xefb898, 0xefb8bb, 0xefb8bc,
+  /* f0 */  0xefb8b7, 0xefb8b8, 0xefb8b1, 0xefb899,
   /* f4 */  0xefb8b3, 0xefb8b4, 0xee9e97, 0xee9e98,
   /* f8 */  0xee9e99, 0xee9e9a, 0xee9e9b, 0xee9e9c,
   /* fc */  0xee9e9d, 0xee9e9e, 0xee9e9f,
@@ -2147,7 +2147,7 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* b0 */  0x00c3b2, 0x00c5ab, 0x00c3ba, 0x00c794,
   /* b4 */  0x00c3b9, 0x00c796, 0x00c798, 0x00c79a,
   /* b8 */  0x00c79c, 0x00c3bc, 0x00c3aa, 0x00c991,
-  /* bc */  0xee9f87, 0x00c584, 0x00c588, 0x00c7b9,
+  /* bc */  0xe1b8bf, 0x00c584, 0x00c588, 0x00c7b9,
   /* c0 */  0x00c9a1, 0xee9f89, 0xee9f8a, 0xee9f8b,
   /* c4 */  0xee9f8c, 0xe38485, 0xe38486, 0xe38487,
   /* c8 */  0xe38488, 0xe38489, 0xe3848a, 0xe3848b,
@@ -6508,25 +6508,25 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* 4c */  0xefa8a4, 0xefa8a7, 0xefa8a8, 0xefa8a9,
   /* 50 */  0xe2ba81, 0xeea096, 0xeea097, 0xeea098,
   /* 54 */  0xe2ba84, 0xe391b3, 0xe39187, 0xe2ba88,
-  /* 58 */  0xe2ba8b, 0xeea09e, 0xe3969e, 0xe3989a,
+  /* 58 */  0xe2ba8b, 0xe9beb4, 0xe3969e, 0xe3989a,
   /* 5c */  0xe3988e, 0xe2ba8c, 0xe2ba97, 0xe3a5ae,
-  /* 60 */  0xe3a498, 0xeea0a6, 0xe3a78f, 0xe3a79f,
-  /* 64 */  0xe3a9b3, 0xe3a790, 0xeea0ab, 0xeea0ac,
+  /* 60 */  0xe3a498, 0xe9beb5, 0xe3a78f, 0xe3a79f,
+  /* 64 */  0xe3a9b3, 0xe3a790, 0xe9beb6, 0xe9beb7,
   /* 68 */  0xe3ad8e, 0xe3b1ae, 0xe3b3a0, 0xe2baa7,
-  /* 6c */  0xeea0b1, 0xeea0b2, 0xe2baaa, 0xe48196,
+  /* 6c */  0xeea0b1, 0xe9beb8, 0xe2baaa, 0xe48196,
   /* 70 */  0xe4859f, 0xe2baae, 0xe48cb7, 0xe2bab3,
   /* 74 */  0xe2bab6, 0xe2bab7, 0xeea0bb, 0xe48eb1,
   /* 78 */  0xe48eac, 0xe2babb, 0xe48f9d, 0xe49396,
-  /* 7c */  0xe499a1, 0xe4998c, 0xeea183, 0x000000,
+  /* 7c */  0xe499a1, 0xe4998c, 0xe9beb9, 0x000000,
   /* 80 */  0xe49ca3, 0xe49ca9, 0xe49dbc, 0xe49e8d,
   /* 84 */  0xe2bb8a, 0xe4a587, 0xe4a5ba, 0xe4a5bd,
   /* 88 */  0xe4a682, 0xe4a683, 0xe4a685, 0xe4a686,
   /* 8c */  0xe4a69f, 0xe4a69b, 0xe4a6b7, 0xe4a6b6,
-  /* 90 */  0xeea194, 0xeea195, 0xe4b2a3, 0xe4b29f,
+  /* 90 */  0xe9beba, 0xeea195, 0xe4b2a3, 0xe4b29f,
   /* 94 */  0xe4b2a0, 0xe4b2a1, 0xe4b1b7, 0xe4b2a2,
   /* 98 */  0xe4b493, 0xe4b494, 0xe4b495, 0xe4b496,
   /* 9c */  0xe4b497, 0xe4b498, 0xe4b499, 0xe4b6ae,
-  /* a0 */  0xeea1a4, 0xee91a8, 0xee91a9, 0xee91aa,
+  /* a0 */  0xe9bebb, 0xee91a8, 0xee91a9, 0xee91aa,
   /* a4 */  0xee91ab, 0xee91ac, 0xee91ad, 0xee91ae,
   /* a8 */  0xee91af, 0xee91b0, 0xee91b1, 0xee91b2,
   /* ac */  0xee91b3, 0xee91b4, 0xee91b5, 0xee91b6,
@@ -6558,55 +6558,86 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /*** Four byte table, byte #2: 81xx - offset 0x05f43 ***/
 
   /* 30 */  0x005f67, 0x000000, 0x000000, 0x000000,
-  /* 34 */  0x000000, 0x000000, 0x005fc1, 0x00603f,
-  /* 38 */  0x006067, 0x0060e5,
+  /* 34 */  0x000000, 0x005fb9, 0x00602d, 0x0060ab,
+  /* 38 */  0x0060d3, 0x006151,
 
   /*** Four byte table, byte #2: 82xx - offset 0x05f4d ***/
 
-  /* 30 */  0x006163, 0x0061e1, 0x006235, 0x0062b3,
-  /* 34 */  0x00631c, 0x00639a,
+  /* 30 */  0x0061cf, 0x00624d, 0x0062a1, 0x00631f,
+  /* 34 */  0x006388, 0x006406,
     /* 4 trailing zero values shared with next segment */
 
   /*** Four byte table, byte #2: 83xx - offset 0x05f53 ***/
 
   /* 30 */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* 34 */  0x000000, 0x000000, 0x0063d2, 0x000000,
+  /* 34 */  0x000000, 0x000000, 0x00643e, 0x000000,
   /* 38 */  0x000000, 0x000000,
 
   /*** Four byte table, byte #2: 84xx - offset 0x05f5d ***/
 
-  /* 30 */  0x00644c, 0x0064c6, 0x000000, 0x000000,
+  /* 30 */  0x0064b8, 0x006532, 0x000000, 0x000000,
   /* 34 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 38 */  0x000000, 0x000000,
 
   /*** Four byte table, byte #3: 8130xx - offset 0x05f67 ***/
 
-  /* 81 */  0x006544, 0x00654e, 0x006558, 0x006562,
-  /* 85 */  0x00656c, 0x006576, 0x006580, 0x00658a,
-  /* 89 */  0x006594, 0x00659e, 0x0065a8, 0x0065b2,
-  /* 8d */  0x0065bc, 0x0065c6, 0x0065d0, 0x0065da,
-  /* 91 */  0x0065e4, 0x0065ee, 0x0065f8, 0x006602,
-  /* 95 */  0x00660c, 0x006616, 0x006620, 0x00662a,
-  /* 99 */  0x006634, 0x00663e, 0x006648, 0x006652,
-  /* 9d */  0x00665c, 0x006666, 0x006670, 0x00667a,
-  /* a1 */  0x006684, 0x00668e, 0x006698, 0x0066a2,
-  /* a5 */  0x0066ac, 0x0066b6, 0x0066c0, 0x0066ca,
-  /* a9 */  0x0066d4, 0x0066de, 0x0066e8, 0x0066f2,
-  /* ad */  0x0066fc, 0x006706, 0x006710, 0x00671a,
-  /* b1 */  0x006724, 0x00672e, 0x006738, 0x006742,
-  /* b5 */  0x00674c, 0x006756, 0x006760, 0x00676a,
-  /* b9 */  0x006774, 0x00677e, 0x006788, 0x006792,
-  /* bd */  0x00679c, 0x0067a6, 0x0067b0, 0x0067ba,
-  /* c1 */  0x0067c4, 0x0067ce, 0x0067d8, 0x0067e2,
-  /* c5 */  0x0067ec, 0x0067f6, 0x006800, 0x00680a,
-  /* c9 */  0x006814, 0x00681e, 0x006828, 0x006832,
-  /* cd */  0x00683c, 0x006846, 0x006850, 0x00685a,
-  /* d1 */  0x006864, 0x00686e, 0x000000, 0x000000,
+  /* 81 */  0x0065b0, 0x0065ba, 0x0065c4, 0x0065ce,
+  /* 85 */  0x0065d8, 0x0065e2, 0x0065ec, 0x0065f6,
+  /* 89 */  0x006600, 0x00660a, 0x006614, 0x00661e,
+  /* 8d */  0x006628, 0x006632, 0x00663c, 0x006646,
+  /* 91 */  0x006650, 0x00665a, 0x006664, 0x00666e,
+  /* 95 */  0x006678, 0x006682, 0x00668c, 0x006696,
+  /* 99 */  0x0066a0, 0x0066aa, 0x0066b4, 0x0066be,
+  /* 9d */  0x0066c8, 0x0066d2, 0x0066dc, 0x0066e6,
+  /* a1 */  0x0066f0, 0x0066fa, 0x006704, 0x00670e,
+  /* a5 */  0x006718, 0x006722, 0x00672c, 0x006736,
+  /* a9 */  0x006740, 0x00674a, 0x006754, 0x00675e,
+  /* ad */  0x006768, 0x006772, 0x00677c, 0x006786,
+  /* b1 */  0x006790, 0x00679a, 0x0067a4, 0x0067ae,
+  /* b5 */  0x0067b8, 0x0067c2, 0x0067cc, 0x0067d6,
+  /* b9 */  0x0067e0, 0x0067ea, 0x0067f4, 0x0067fe,
+  /* bd */  0x006808, 0x006812, 0x00681c, 0x006826,
+  /* c1 */  0x006830, 0x00683a, 0x006844, 0x00684e,
+  /* c5 */  0x006858, 0x006862, 0x00686c, 0x006876,
+  /* c9 */  0x006880, 0x00688a, 0x006894, 0x00689e,
+  /* cd */  0x0068a8, 0x0068b2, 0x0068bc, 0x0068c6,
+  /* d1 */  0x0068d0, 0x0068da,
+    /* 44 trailing zero values shared with next segment */
+
+  /*** Four byte table, byte #3: 8135xx - offset 0x05fb9 ***/
+
+  /* 81 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* 85 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* 89 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* 8d */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* 91 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* 95 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* 99 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* 9d */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* a1 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* a5 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* a9 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* ad */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* b1 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* b5 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* b9 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* bd */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* c1 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* c5 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* c9 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* cd */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* d1 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* d5 */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* d9 */  0x000000, 0x000000,
-    /* 36 trailing zero values shared with next segment */
+  /* d9 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* dd */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* e1 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* e5 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* e9 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* ed */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* f1 */  0x000000, 0x000000, 0x000000, 0x0068e4,
+    /* 10 trailing zero values shared with next segment */
 
-  /*** Four byte table, byte #3: 8136xx - offset 0x05fc1 ***/
+  /*** Four byte table, byte #3: 8136xx - offset 0x0602d ***/
 
   /* 81 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 85 */  0x000000, 0x000000, 0x000000, 0x000000,
@@ -6617,45 +6648,45 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* 99 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 9d */  0x000000, 0x000000, 0x000000, 0x000000,
   /* a1 */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* a5 */  0x006878, 0x006882, 0x00688c, 0x006896,
-  /* a9 */  0x0068a0, 0x0068aa, 0x0068b4, 0x0068be,
-  /* ad */  0x0068c8, 0x0068d2, 0x0068dc, 0x0068e6,
-  /* b1 */  0x0068f0, 0x0068fa, 0x006904, 0x00690e,
-  /* b5 */  0x006918, 0x006922, 0x00692c, 0x006936,
-  /* b9 */  0x006940, 0x00694a, 0x006954, 0x00695e,
-  /* bd */  0x006968, 0x006972, 0x00697c, 0x006986,
-  /* c1 */  0x006990, 0x00699a, 0x0069a4, 0x0069ae,
-  /* c5 */  0x0069b8, 0x0069c2, 0x0069cc, 0x0069d6,
-  /* c9 */  0x0069e0, 0x0069ea, 0x0069f4, 0x0069fe,
-  /* cd */  0x006a08, 0x006a12, 0x006a1c, 0x006a26,
-  /* d1 */  0x006a30, 0x006a3a, 0x006a44, 0x006a4e,
-  /* d5 */  0x006a58, 0x006a62, 0x006a6c, 0x006a76,
-  /* d9 */  0x006a80, 0x006a8a, 0x006a94, 0x006a9e,
-  /* dd */  0x006aa8, 0x006ab2, 0x006abc, 0x006ac6,
-  /* e1 */  0x006ad0, 0x006ada, 0x006ae4, 0x006aee,
-  /* e5 */  0x006af8, 0x006b02, 0x006b0c, 0x006b16,
-  /* e9 */  0x006b20, 0x006b2a, 0x006b34, 0x006b3e,
-  /* ed */  0x006b48, 0x006b52, 0x006b5c, 0x006b66,
-  /* f1 */  0x006b70, 0x006b7a, 0x006b84, 0x006b8e,
-  /* f5 */  0x006b98, 0x006ba2, 0x006bac, 0x006bb6,
-  /* f9 */  0x006bc0, 0x006bca, 0x006bd4, 0x006bde,
-  /* fd */  0x006be8, 0x006bf2,
-
-  /*** Four byte table, byte #3: 8137xx - offset 0x0603f ***/
-
-  /* 81 */  0x006bfc, 0x006c06, 0x006c10, 0x006c1a,
-  /* 85 */  0x006c24, 0x006c2e, 0x006c38, 0x006c42,
-  /* 89 */  0x006c4c, 0x006c56, 0x006c60, 0x006c6a,
-  /* 8d */  0x006c74, 0x006c7e, 0x006c88, 0x006c92,
-  /* 91 */  0x006c9c, 0x006ca6, 0x006cb0, 0x006cba,
-  /* 95 */  0x006cc4, 0x006cce, 0x006cd8, 0x006ce2,
-  /* 99 */  0x006cec, 0x006cf6, 0x006d00, 0x006d0a,
-  /* 9d */  0x006d14, 0x006d1e, 0x006d28, 0x006d32,
-  /* a1 */  0x006d3c, 0x006d46, 0x006d50, 0x006d5a,
-  /* a5 */  0x006d64, 0x006d6e, 0x006d78, 0x006d82,
+  /* a5 */  0x0068ec, 0x0068f6, 0x006900, 0x00690a,
+  /* a9 */  0x006914, 0x00691e, 0x006928, 0x006932,
+  /* ad */  0x00693c, 0x006946, 0x006950, 0x00695a,
+  /* b1 */  0x006964, 0x00696e, 0x006978, 0x006982,
+  /* b5 */  0x00698c, 0x006996, 0x0069a0, 0x0069aa,
+  /* b9 */  0x0069b4, 0x0069be, 0x0069c8, 0x0069d2,
+  /* bd */  0x0069dc, 0x0069e6, 0x0069f0, 0x0069fa,
+  /* c1 */  0x006a04, 0x006a0e, 0x006a18, 0x006a22,
+  /* c5 */  0x006a2c, 0x006a36, 0x006a40, 0x006a4a,
+  /* c9 */  0x006a54, 0x006a5e, 0x006a68, 0x006a72,
+  /* cd */  0x006a7c, 0x006a86, 0x006a90, 0x006a9a,
+  /* d1 */  0x006aa4, 0x006aae, 0x006ab8, 0x006ac2,
+  /* d5 */  0x006acc, 0x006ad6, 0x006ae0, 0x006aea,
+  /* d9 */  0x006af4, 0x006afe, 0x006b08, 0x006b12,
+  /* dd */  0x006b1c, 0x006b26, 0x006b30, 0x006b3a,
+  /* e1 */  0x006b44, 0x006b4e, 0x006b58, 0x006b62,
+  /* e5 */  0x006b6c, 0x006b76, 0x006b80, 0x006b8a,
+  /* e9 */  0x006b94, 0x006b9e, 0x006ba8, 0x006bb2,
+  /* ed */  0x006bbc, 0x006bc6, 0x006bd0, 0x006bda,
+  /* f1 */  0x006be4, 0x006bee, 0x006bf8, 0x006c02,
+  /* f5 */  0x006c0c, 0x006c16, 0x006c20, 0x006c2a,
+  /* f9 */  0x006c34, 0x006c3e, 0x006c48, 0x006c52,
+  /* fd */  0x006c5c, 0x006c66,
+
+  /*** Four byte table, byte #3: 8137xx - offset 0x060ab ***/
+
+  /* 81 */  0x006c70, 0x006c7a, 0x006c84, 0x006c8e,
+  /* 85 */  0x006c98, 0x006ca2, 0x006cac, 0x006cb6,
+  /* 89 */  0x006cc0, 0x006cca, 0x006cd4, 0x006cde,
+  /* 8d */  0x006ce8, 0x006cf2, 0x006cfc, 0x006d06,
+  /* 91 */  0x006d10, 0x006d1a, 0x006d24, 0x006d2e,
+  /* 95 */  0x006d38, 0x006d42, 0x006d4c, 0x006d56,
+  /* 99 */  0x006d60, 0x006d6a, 0x006d74, 0x006d7e,
+  /* 9d */  0x006d88, 0x006d92, 0x006d9c, 0x006da6,
+  /* a1 */  0x006db0, 0x006dba, 0x006dc4, 0x006dce,
+  /* a5 */  0x006dd8, 0x006de2, 0x006dec, 0x006df6,
     /* 86 trailing zero values shared with next segment */
 
-  /*** Four byte table, byte #3: 8138xx - offset 0x06067 ***/
+  /*** Four byte table, byte #3: 8138xx - offset 0x060d3 ***/
 
   /* 81 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 85 */  0x000000, 0x000000, 0x000000, 0x000000,
@@ -6688,55 +6719,55 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* f1 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* f5 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* f9 */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* fd */  0x006d8b, 0x006d95,
-
-  /*** Four byte table, byte #3: 8139xx - offset 0x060e5 ***/
-
-  /* 81 */  0x006d9f, 0x006da9, 0x006db3, 0x006dbd,
-  /* 85 */  0x006dc7, 0x006dd1, 0x006ddb, 0x006de5,
-  /* 89 */  0x006def, 0x006df9, 0x006e03, 0x006e0d,
-  /* 8d */  0x006e17, 0x006e21, 0x006e2b, 0x006e35,
-  /* 91 */  0x006e3f, 0x006e49, 0x006e53, 0x006e5d,
-  /* 95 */  0x006e67, 0x006e71, 0x006e7b, 0x006e85,
-  /* 99 */  0x006e8f, 0x006e99, 0x006ea3, 0x006ead,
-  /* 9d */  0x006eb7, 0x006ec1, 0x006ecb, 0x006ed5,
-  /* a1 */  0x006edf, 0x006ee9, 0x006ef3, 0x006efd,
-  /* a5 */  0x006f07, 0x006f11, 0x006f1b, 0x006f25,
-  /* a9 */  0x006f2f, 0x006f39, 0x006f43, 0x006f4d,
-  /* ad */  0x006f57, 0x006f61, 0x006f6b, 0x006f75,
-  /* b1 */  0x006f7f, 0x006f89, 0x006f93, 0x006f9d,
-  /* b5 */  0x006fa7, 0x006fb1, 0x006fbb, 0x006fc5,
-  /* b9 */  0x006fcf, 0x006fd9, 0x006fe3, 0x006fed,
-  /* bd */  0x006ff7, 0x007001, 0x00700b, 0x007015,
-  /* c1 */  0x00701f, 0x007029, 0x007033, 0x00703d,
-  /* c5 */  0x007047, 0x007051, 0x00705b, 0x007065,
-  /* c9 */  0x00706f, 0x007079, 0x007083, 0x00708d,
-  /* cd */  0x007097, 0x0070a1, 0x0070ab, 0x0070b5,
-  /* d1 */  0x0070bf, 0x0070c9, 0x0070d3, 0x0070dd,
-  /* d5 */  0x0070e7, 0x0070f1, 0x0070fb, 0x007105,
-  /* d9 */  0x00710f, 0x007119, 0x007123, 0x00712d,
-  /* dd */  0x007137, 0x007141, 0x00714b, 0x007155,
-  /* e1 */  0x00715f, 0x007169, 0x007173, 0x00717d,
-  /* e5 */  0x007187, 0x007191, 0x00719b, 0x0071a5,
-  /* e9 */  0x0071af, 0x0071b9, 0x0071c3, 0x0071cd,
-  /* ed */  0x0071d7, 0x0071e1, 0x0071eb, 0x0071f5,
-  /* f1 */  0x0071ff, 0x007209, 0x007213, 0x00721d,
-  /* f5 */  0x007227, 0x007231, 0x00723b, 0x007245,
-  /* f9 */  0x00724f, 0x007259, 0x007263, 0x00726d,
-  /* fd */  0x007277, 0x007281,
-
-  /*** Four byte table, byte #3: 8230xx - offset 0x06163 ***/
-
-  /* 81 */  0x00728b, 0x007295, 0x00729f, 0x0072a9,
-  /* 85 */  0x0072b3, 0x0072bd, 0x0072c7, 0x0072d1,
-  /* 89 */  0x0072db, 0x0072e5, 0x0072ef, 0x0072f9,
-  /* 8d */  0x007303, 0x00730d, 0x007317, 0x007321,
-  /* 91 */  0x00732b, 0x007335, 0x00733f, 0x007349,
-  /* 95 */  0x007353, 0x00735d, 0x007367, 0x007371,
-  /* 99 */  0x00737b, 0x007385, 0x00738f, 0x007399,
-  /* 9d */  0x0073a3, 0x0073ad, 0x0073b7, 0x0073c1,
-  /* a1 */  0x0073cb, 0x0073d5, 0x0073df, 0x0073e9,
-  /* a5 */  0x0073f3, 0x0073fd, 0x000000, 0x000000,
+  /* fd */  0x006dff, 0x006e09,
+
+  /*** Four byte table, byte #3: 8139xx - offset 0x06151 ***/
+
+  /* 81 */  0x006e13, 0x006e1d, 0x006e27, 0x006e31,
+  /* 85 */  0x006e3b, 0x006e45, 0x006e4f, 0x006e59,
+  /* 89 */  0x006e63, 0x006e6d, 0x006e77, 0x006e81,
+  /* 8d */  0x006e8b, 0x006e95, 0x006e9f, 0x006ea9,
+  /* 91 */  0x006eb3, 0x006ebd, 0x006ec7, 0x006ed1,
+  /* 95 */  0x006edb, 0x006ee5, 0x006eef, 0x006ef9,
+  /* 99 */  0x006f03, 0x006f0d, 0x006f17, 0x006f21,
+  /* 9d */  0x006f2b, 0x006f35, 0x006f3f, 0x006f49,
+  /* a1 */  0x006f53, 0x006f5d, 0x006f67, 0x006f71,
+  /* a5 */  0x006f7b, 0x006f85, 0x006f8f, 0x006f99,
+  /* a9 */  0x006fa3, 0x006fad, 0x006fb7, 0x006fc1,
+  /* ad */  0x006fcb, 0x006fd5, 0x006fdf, 0x006fe9,
+  /* b1 */  0x006ff3, 0x006ffd, 0x007007, 0x007011,
+  /* b5 */  0x00701b, 0x007025, 0x00702f, 0x007039,
+  /* b9 */  0x007043, 0x00704d, 0x007057, 0x007061,
+  /* bd */  0x00706b, 0x007075, 0x00707f, 0x007089,
+  /* c1 */  0x007093, 0x00709d, 0x0070a7, 0x0070b1,
+  /* c5 */  0x0070bb, 0x0070c5, 0x0070cf, 0x0070d9,
+  /* c9 */  0x0070e3, 0x0070ed, 0x0070f7, 0x007101,
+  /* cd */  0x00710b, 0x007115, 0x00711f, 0x007129,
+  /* d1 */  0x007133, 0x00713d, 0x007147, 0x007151,
+  /* d5 */  0x00715b, 0x007165, 0x00716f, 0x007179,
+  /* d9 */  0x007183, 0x00718d, 0x007197, 0x0071a1,
+  /* dd */  0x0071ab, 0x0071b5, 0x0071bf, 0x0071c9,
+  /* e1 */  0x0071d3, 0x0071dd, 0x0071e7, 0x0071f1,
+  /* e5 */  0x0071fb, 0x007205, 0x00720f, 0x007219,
+  /* e9 */  0x007223, 0x00722d, 0x007237, 0x007241,
+  /* ed */  0x00724b, 0x007255, 0x00725f, 0x007269,
+  /* f1 */  0x007273, 0x00727d, 0x007287, 0x007291,
+  /* f5 */  0x00729b, 0x0072a5, 0x0072af, 0x0072b9,
+  /* f9 */  0x0072c3, 0x0072cd, 0x0072d7, 0x0072e1,
+  /* fd */  0x0072eb, 0x0072f5,
+
+  /*** Four byte table, byte #3: 8230xx - offset 0x061cf ***/
+
+  /* 81 */  0x0072ff, 0x007309, 0x007313, 0x00731d,
+  /* 85 */  0x007327, 0x007331, 0x00733b, 0x007345,
+  /* 89 */  0x00734f, 0x007359, 0x007363, 0x00736d,
+  /* 8d */  0x007377, 0x007381, 0x00738b, 0x007395,
+  /* 91 */  0x00739f, 0x0073a9, 0x0073b3, 0x0073bd,
+  /* 95 */  0x0073c7, 0x0073d1, 0x0073db, 0x0073e5,
+  /* 99 */  0x0073ef, 0x0073f9, 0x007403, 0x00740d,
+  /* 9d */  0x007417, 0x007421, 0x00742b, 0x007435,
+  /* a1 */  0x00743f, 0x007449, 0x007453, 0x00745d,
+  /* a5 */  0x007467, 0x007471, 0x000000, 0x000000,
   /* a9 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* ad */  0x000000, 0x000000, 0x000000, 0x000000,
   /* b1 */  0x000000, 0x000000, 0x000000, 0x000000,
@@ -6755,37 +6786,37 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* e5 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* e9 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* ed */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* f1 */  0x000000, 0x007400, 0x00740a, 0x007414,
-  /* f5 */  0x00741e, 0x007428, 0x007432, 0x00743c,
-  /* f9 */  0x007446, 0x007450, 0x00745a, 0x007464,
-  /* fd */  0x00746e, 0x007478,
-
-  /*** Four byte table, byte #3: 8231xx - offset 0x061e1 ***/
-
-  /* 81 */  0x007482, 0x00748c, 0x007496, 0x0074a0,
-  /* 85 */  0x0074aa, 0x0074b4, 0x0074be, 0x0074c8,
-  /* 89 */  0x0074d2, 0x0074dc, 0x0074e6, 0x0074f0,
-  /* 8d */  0x0074fa, 0x007504, 0x00750e, 0x007518,
-  /* 91 */  0x007522, 0x00752c, 0x007536, 0x007540,
-  /* 95 */  0x00754a, 0x007554, 0x00755e, 0x007568,
-  /* 99 */  0x007572, 0x00757c, 0x007586, 0x007590,
-  /* 9d */  0x00759a, 0x0075a4, 0x0075ae, 0x0075b8,
-  /* a1 */  0x0075c2, 0x0075cc, 0x0075d6, 0x0075e0,
-  /* a5 */  0x0075ea, 0x0075f4, 0x0075fe, 0x007608,
-  /* a9 */  0x007612, 0x00761c, 0x007626, 0x007630,
-  /* ad */  0x00763a, 0x007644, 0x00764e, 0x007658,
-  /* b1 */  0x007662, 0x00766c, 0x007676, 0x007680,
-  /* b5 */  0x00768a, 0x007694, 0x00769e, 0x0076a8,
-  /* b9 */  0x0076b2, 0x0076bc, 0x0076c6, 0x0076d0,
-  /* bd */  0x0076da, 0x0076e4, 0x0076ee, 0x0076f8,
-  /* c1 */  0x007702, 0x00770c, 0x007716, 0x007720,
-  /* c5 */  0x00772a, 0x007734, 0x00773e, 0x007748,
-  /* c9 */  0x007752, 0x00775c, 0x007766, 0x007770,
-  /* cd */  0x00777a, 0x007784, 0x00778e, 0x007798,
-  /* d1 */  0x0077a2, 0x0077ac, 0x0077b6, 0x0077c0,
+  /* f1 */  0x000000, 0x007474, 0x00747e, 0x007488,
+  /* f5 */  0x007492, 0x00749c, 0x0074a6, 0x0074b0,
+  /* f9 */  0x0074ba, 0x0074c4, 0x0074ce, 0x0074d8,
+  /* fd */  0x0074e2, 0x0074ec,
+
+  /*** Four byte table, byte #3: 8231xx - offset 0x0624d ***/
+
+  /* 81 */  0x0074f6, 0x007500, 0x00750a, 0x007514,
+  /* 85 */  0x00751e, 0x007528, 0x007532, 0x00753c,
+  /* 89 */  0x007546, 0x007550, 0x00755a, 0x007564,
+  /* 8d */  0x00756e, 0x007578, 0x007582, 0x00758c,
+  /* 91 */  0x007596, 0x0075a0, 0x0075aa, 0x0075b4,
+  /* 95 */  0x0075be, 0x0075c8, 0x0075d2, 0x0075dc,
+  /* 99 */  0x0075e6, 0x0075f0, 0x0075fa, 0x007604,
+  /* 9d */  0x00760e, 0x007618, 0x007622, 0x00762c,
+  /* a1 */  0x007636, 0x007640, 0x00764a, 0x007654,
+  /* a5 */  0x00765e, 0x007668, 0x007672, 0x00767c,
+  /* a9 */  0x007686, 0x007690, 0x00769a, 0x0076a4,
+  /* ad */  0x0076ae, 0x0076b8, 0x0076c2, 0x0076cc,
+  /* b1 */  0x0076d6, 0x0076e0, 0x0076ea, 0x0076f4,
+  /* b5 */  0x0076fe, 0x007708, 0x007712, 0x00771c,
+  /* b9 */  0x007726, 0x007730, 0x00773a, 0x007744,
+  /* bd */  0x00774e, 0x007758, 0x007762, 0x00776c,
+  /* c1 */  0x007776, 0x007780, 0x00778a, 0x007794,
+  /* c5 */  0x00779e, 0x0077a8, 0x0077b2, 0x0077bc,
+  /* c9 */  0x0077c6, 0x0077d0, 0x0077da, 0x0077e4,
+  /* cd */  0x0077ee, 0x0077f8, 0x007802, 0x00780c,
+  /* d1 */  0x007816, 0x007820, 0x00782a, 0x007834,
     /* 42 trailing zero values shared with next segment */
 
-  /*** Four byte table, byte #3: 8232xx - offset 0x06235 ***/
+  /*** Four byte table, byte #3: 8232xx - offset 0x062a1 ***/
 
   /* 81 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 85 */  0x000000, 0x000000, 0x000000, 0x000000,
@@ -6798,14 +6829,14 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* a1 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* a5 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* a9 */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* ad */  0x000000, 0x000000, 0x0077c8, 0x0077d2,
-  /* b1 */  0x0077dc, 0x0077e6, 0x0077f0, 0x0077fa,
-  /* b5 */  0x007804, 0x00780e, 0x007818, 0x007822,
-  /* b9 */  0x00782c, 0x007836, 0x007840, 0x00784a,
-  /* bd */  0x007854, 0x00785e, 0x007868, 0x007872,
-  /* c1 */  0x00787c, 0x007886, 0x007890, 0x00789a,
-  /* c5 */  0x0078a4, 0x0078ae, 0x0078b8, 0x0078c2,
-  /* c9 */  0x0078cc, 0x000000, 0x000000, 0x000000,
+  /* ad */  0x000000, 0x000000, 0x00783c, 0x007846,
+  /* b1 */  0x007850, 0x00785a, 0x007864, 0x00786e,
+  /* b5 */  0x007878, 0x007882, 0x00788c, 0x007896,
+  /* b9 */  0x0078a0, 0x0078aa, 0x0078b4, 0x0078be,
+  /* bd */  0x0078c8, 0x0078d2, 0x0078dc, 0x0078e6,
+  /* c1 */  0x0078f0, 0x0078fa, 0x007904, 0x00790e,
+  /* c5 */  0x007918, 0x007922, 0x00792c, 0x007936,
+  /* c9 */  0x007940, 0x000000, 0x000000, 0x000000,
   /* cd */  0x000000, 0x000000, 0x000000, 0x000000,
   /* d1 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* d5 */  0x000000, 0x000000, 0x000000, 0x000000,
@@ -6816,21 +6847,21 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* e9 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* ed */  0x000000, 0x000000, 0x000000, 0x000000,
   /* f1 */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* f5 */  0x000000, 0x000000, 0x000000, 0x0078d3,
-  /* f9 */  0x0078dd, 0x0078e7, 0x0078f1, 0x0078fb,
-  /* fd */  0x007905, 0x00790f,
-
-  /*** Four byte table, byte #3: 8233xx - offset 0x062b3 ***/
-
-  /* 81 */  0x007919, 0x007923, 0x00792d, 0x007937,
-  /* 85 */  0x007941, 0x00794b, 0x007955, 0x00795f,
-  /* 89 */  0x007969, 0x007973, 0x00797d, 0x007987,
-  /* 8d */  0x007991, 0x00799b, 0x0079a5, 0x0079af,
-  /* 91 */  0x0079b9, 0x0079c3, 0x0079cd, 0x0079d7,
-  /* 95 */  0x0079e1, 0x0079eb, 0x0079f5, 0x0079ff,
-  /* 99 */  0x007a09, 0x007a13, 0x007a1d, 0x007a27,
-  /* 9d */  0x007a31, 0x007a3b, 0x007a45, 0x007a4f,
-  /* a1 */  0x007a59, 0x007a63, 0x007a6d, 0x000000,
+  /* f5 */  0x000000, 0x000000, 0x000000, 0x007947,
+  /* f9 */  0x007951, 0x00795b, 0x007965, 0x00796f,
+  /* fd */  0x007979, 0x007983,
+
+  /*** Four byte table, byte #3: 8233xx - offset 0x0631f ***/
+
+  /* 81 */  0x00798d, 0x007997, 0x0079a1, 0x0079ab,
+  /* 85 */  0x0079b5, 0x0079bf, 0x0079c9, 0x0079d3,
+  /* 89 */  0x0079dd, 0x0079e7, 0x0079f1, 0x0079fb,
+  /* 8d */  0x007a05, 0x007a0f, 0x007a19, 0x007a23,
+  /* 91 */  0x007a2d, 0x007a37, 0x007a41, 0x007a4b,
+  /* 95 */  0x007a55, 0x007a5f, 0x007a69, 0x007a73,
+  /* 99 */  0x007a7d, 0x007a87, 0x007a91, 0x007a9b,
+  /* 9d */  0x007aa5, 0x007aaf, 0x007ab9, 0x007ac3,
+  /* a1 */  0x007acd, 0x007ad7, 0x007ae1, 0x000000,
   /* a5 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* a9 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* ad */  0x000000, 0x000000, 0x000000, 0x000000,
@@ -6840,28 +6871,28 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* bd */  0x000000, 0x000000, 0x000000, 0x000000,
   /* c1 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* c5 */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* c9 */  0x007a76, 0x007a80, 0x007a8a, 0x007a94,
-  /* cd */  0x007a9e, 0x007aa8, 0x007ab2, 0x007abc,
-  /* d1 */  0x007ac6, 0x007ad0, 0x007ada, 0x007ae4,
-  /* d5 */  0x007aee, 0x007af8, 0x007b02, 0x007b0c,
-  /* d9 */  0x007b16, 0x007b20, 0x007b2a, 0x007b34,
-  /* dd */  0x007b3e, 0x007b48, 0x007b52, 0x007b5c,
-  /* e1 */  0x007b66, 0x007b70, 0x007b7a, 0x007b84,
-  /* e5 */  0x007b8e, 0x007b98, 0x007ba2, 0x007bac,
+  /* c9 */  0x007aea, 0x007af4, 0x007afe, 0x007b08,
+  /* cd */  0x007b12, 0x007b1c, 0x007b26, 0x007b30,
+  /* d1 */  0x007b3a, 0x007b44, 0x007b4e, 0x007b58,
+  /* d5 */  0x007b62, 0x007b6c, 0x007b76, 0x007b80,
+  /* d9 */  0x007b8a, 0x007b94, 0x007b9e, 0x007ba8,
+  /* dd */  0x007bb2, 0x007bbc, 0x007bc6, 0x007bd0,
+  /* e1 */  0x007bda, 0x007be4, 0x007bee, 0x007bf8,
+  /* e5 */  0x007c02, 0x007c0c, 0x007c16, 0x007c20,
   /* e9 */  0x000000,
     /* 21 trailing zero values shared with next segment */
 
-  /*** Four byte table, byte #3: 8234xx - offset 0x0631c ***/
+  /*** Four byte table, byte #3: 8234xx - offset 0x06388 ***/
 
   /* 81 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 85 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 89 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 8d */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 91 */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* 95 */  0x000000, 0x007bb4, 0x007bbe, 0x007bc8,
-  /* 99 */  0x007bd2, 0x007bdc, 0x007be6, 0x007bf0,
-  /* 9d */  0x007bfa, 0x007c04, 0x007c0e, 0x007c18,
-  /* a1 */  0x007c22, 0x000000, 0x000000, 0x000000,
+  /* 95 */  0x000000, 0x007c28, 0x007c32, 0x007c3c,
+  /* 99 */  0x007c46, 0x007c50, 0x007c5a, 0x007c64,
+  /* 9d */  0x007c6e, 0x007c78, 0x007c82, 0x007c8c,
+  /* a1 */  0x007c96, 0x000000, 0x000000, 0x000000,
   /* a5 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* a9 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* ad */  0x000000, 0x000000, 0x000000, 0x000000,
@@ -6878,20 +6909,20 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* d9 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* dd */  0x000000, 0x000000, 0x000000, 0x000000,
   /* e1 */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* e5 */  0x000000, 0x000000, 0x007c28, 0x007c32,
-  /* e9 */  0x007c3c, 0x007c46, 0x007c50, 0x007c5a,
-  /* ed */  0x007c64, 0x007c6e, 0x007c78, 0x007c82,
-  /* f1 */  0x007c8c, 0x007c96, 0x007ca0, 0x007caa,
-  /* f5 */  0x007cb4, 0x007cbe, 0x007cc8, 0x007cd2,
-  /* f9 */  0x007cdc, 0x007ce6, 0x007cf0, 0x007cfa,
-  /* fd */  0x007d04, 0x007d0e,
-
-  /*** Four byte table, byte #3: 8235xx - offset 0x0639a ***/
-
-  /* 81 */  0x007d18, 0x007d22, 0x007d2c, 0x007d36,
-  /* 85 */  0x007d40, 0x007d4a, 0x007d54, 0x007d5e,
-  /* 89 */  0x007d68, 0x007d72, 0x007d7c, 0x007d86,
-  /* 8d */  0x007d90, 0x007d9a, 0x007da4, 0x000000,
+  /* e5 */  0x000000, 0x000000, 0x007c9c, 0x007ca6,
+  /* e9 */  0x007cb0, 0x007cba, 0x007cc4, 0x007cce,
+  /* ed */  0x007cd8, 0x007ce2, 0x007cec, 0x007cf6,
+  /* f1 */  0x007d00, 0x007d0a, 0x007d14, 0x007d1e,
+  /* f5 */  0x007d28, 0x007d32, 0x007d3c, 0x007d46,
+  /* f9 */  0x007d50, 0x007d5a, 0x007d64, 0x007d6e,
+  /* fd */  0x007d78, 0x007d82,
+
+  /*** Four byte table, byte #3: 8235xx - offset 0x06406 ***/
+
+  /* 81 */  0x007d8c, 0x007d96, 0x007da0, 0x007daa,
+  /* 85 */  0x007db4, 0x007dbe, 0x007dc8, 0x007dd2,
+  /* 89 */  0x007ddc, 0x007de6, 0x007df0, 0x007dfa,
+  /* 8d */  0x007e04, 0x007e0e, 0x007e18, 0x000000,
   /* 91 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 95 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 99 */  0x000000, 0x000000, 0x000000, 0x000000,
@@ -6904,7 +6935,7 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* b5 */  0x000000, 0x000000, 0x000000, 0x000000,
     /* 70 trailing zero values shared with next segment */
 
-  /*** Four byte table, byte #3: 8336xx - offset 0x063d2 ***/
+  /*** Four byte table, byte #3: 8336xx - offset 0x0643e ***/
 
   /* 81 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 85 */  0x000000, 0x000000, 0x000000, 0x000000,
@@ -6923,9 +6954,9 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* b9 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* bd */  0x000000, 0x000000, 0x000000, 0x000000,
   /* c1 */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* c5 */  0x000000, 0x000000, 0x007da7, 0x007db1,
-  /* c9 */  0x007dbb, 0x007dc5, 0x007dcf, 0x007dd9,
-  /* cd */  0x007de3, 0x007ded, 0x007df7, 0x000000,
+  /* c5 */  0x000000, 0x000000, 0x007e1b, 0x007e25,
+  /* c9 */  0x007e2f, 0x007e39, 0x007e43, 0x007e4d,
+  /* cd */  0x007e57, 0x007e61, 0x007e6b, 0x000000,
   /* d1 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* d5 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* d9 */  0x000000, 0x000000, 0x000000, 0x000000,
@@ -6939,15 +6970,15 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* f9 */  0x000000, 0x000000,
     /* 4 trailing zero values shared with next segment */
 
-  /*** Four byte table, byte #3: 8430xx - offset 0x0644c ***/
+  /*** Four byte table, byte #3: 8430xx - offset 0x064b8 ***/
 
   /* 81 */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* 85 */  0x007e01, 0x007e0b, 0x007e15, 0x007e1f,
-  /* 89 */  0x007e29, 0x007e33, 0x007e3d, 0x007e47,
-  /* 8d */  0x007e51, 0x007e5b, 0x007e65, 0x007e6f,
-  /* 91 */  0x007e79, 0x007e83, 0x007e8d, 0x007e97,
-  /* 95 */  0x007ea1, 0x007eab, 0x007eb5, 0x007ebf,
-  /* 99 */  0x007ec9, 0x007ed3, 0x007edd, 0x007ee7,
+  /* 85 */  0x007e75, 0x007e7f, 0x007e89, 0x007e93,
+  /* 89 */  0x007e9d, 0x007ea7, 0x007eb1, 0x007ebb,
+  /* 8d */  0x007ec5, 0x007ecf, 0x007ed9, 0x007ee3,
+  /* 91 */  0x007eed, 0x007ef7, 0x007f01, 0x007f0b,
+  /* 95 */  0x007f15, 0x007f1f, 0x007f29, 0x007f33,
+  /* 99 */  0x007f3d, 0x007f47, 0x007f51, 0x007f5b,
   /* 9d */  0x000000, 0x000000, 0x000000, 0x000000,
   /* a1 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* a5 */  0x000000, 0x000000, 0x000000, 0x000000,
@@ -6974,17 +7005,17 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* f9 */  0x000000, 0x000000,
     /* 4 trailing zero values shared with next segment */
 
-  /*** Four byte table, byte #3: 8431xx - offset 0x064c6 ***/
+  /*** Four byte table, byte #3: 8431xx - offset 0x06532 ***/
 
   /* 81 */  0x000000, 0x000000, 0x000000, 0x000000,
-  /* 85 */  0x007eef, 0x007ef9, 0x007f03, 0x007f0d,
-  /* 89 */  0x007f17, 0x007f21, 0x007f2b, 0x007f35,
-  /* 8d */  0x007f3f, 0x007f49, 0x007f53, 0x007f5d,
-  /* 91 */  0x007f67, 0x007f71, 0x007f7b, 0x007f85,
-  /* 95 */  0x007f8f, 0x007f99, 0x007fa3, 0x007fad,
-  /* 99 */  0x007fb7, 0x007fc1, 0x007fcb, 0x007fd5,
-  /* 9d */  0x007fdf, 0x007fe9, 0x007ff3, 0x007ffd,
-  /* a1 */  0x008007, 0x008011, 0x000000, 0x000000,
+  /* 85 */  0x007f63, 0x007f6d, 0x007f77, 0x007f81,
+  /* 89 */  0x007f8b, 0x007f95, 0x007f9f, 0x007fa9,
+  /* 8d */  0x007fb3, 0x007fbd, 0x007fc7, 0x007fd1,
+  /* 91 */  0x007fdb, 0x007fe5, 0x007fef, 0x007ff9,
+  /* 95 */  0x008003, 0x00800d, 0x008017, 0x008021,
+  /* 99 */  0x00802b, 0x008035, 0x00803f, 0x008049,
+  /* 9d */  0x008053, 0x00805d, 0x008067, 0x008071,
+  /* a1 */  0x00807b, 0x008085, 0x000000, 0x000000,
   /* a5 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* a9 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* ad */  0x000000, 0x000000, 0x000000, 0x000000,
@@ -7009,4141 +7040,4147 @@ static const uint32 gb18030_to_unicode_tree_table[32795] =
   /* f9 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* fd */  0x000000, 0x000000,
 
-  /*** Four byte table, leaf: 813081xx - offset 0x06544 ***/
+  /*** Four byte table, leaf: 813081xx - offset 0x065b0 ***/
 
   /* 30 */  0x00c280, 0x00c281, 0x00c282, 0x00c283,
   /* 34 */  0x00c284, 0x00c285, 0x00c286, 0x00c287,
   /* 38 */  0x00c288, 0x00c289,
 
-  /*** Four byte table, leaf: 813082xx - offset 0x0654e ***/
+  /*** Four byte table, leaf: 813082xx - offset 0x065ba ***/
 
   /* 30 */  0x00c28a, 0x00c28b, 0x00c28c, 0x00c28d,
   /* 34 */  0x00c28e, 0x00c28f, 0x00c290, 0x00c291,
   /* 38 */  0x00c292, 0x00c293,
 
-  /*** Four byte table, leaf: 813083xx - offset 0x06558 ***/
+  /*** Four byte table, leaf: 813083xx - offset 0x065c4 ***/
 
   /* 30 */  0x00c294, 0x00c295, 0x00c296, 0x00c297,
   /* 34 */  0x00c298, 0x00c299, 0x00c29a, 0x00c29b,
   /* 38 */  0x00c29c, 0x00c29d,
 
-  /*** Four byte table, leaf: 813084xx - offset 0x06562 ***/
+  /*** Four byte table, leaf: 813084xx - offset 0x065ce ***/
 
   /* 30 */  0x00c29e, 0x00c29f, 0x00c2a0, 0x00c2a1,
   /* 34 */  0x00c2a2, 0x00c2a3, 0x00c2a5, 0x00c2a6,
   /* 38 */  0x00c2a9, 0x00c2aa,
 
-  /*** Four byte table, leaf: 813085xx - offset 0x0656c ***/
+  /*** Four byte table, leaf: 813085xx - offset 0x065d8 ***/
 
   /* 30 */  0x00c2ab, 0x00c2ac, 0x00c2ad, 0x00c2ae,
   /* 34 */  0x00c2af, 0x00c2b2, 0x00c2b3, 0x00c2b4,
   /* 38 */  0x00c2b5, 0x00c2b6,
 
-  /*** Four byte table, leaf: 813086xx - offset 0x06576 ***/
+  /*** Four byte table, leaf: 813086xx - offset 0x065e2 ***/
 
   /* 30 */  0x00c2b8, 0x00c2b9, 0x00c2ba, 0x00c2bb,
   /* 34 */  0x00c2bc, 0x00c2bd, 0x00c2be, 0x00c2bf,
   /* 38 */  0x00c380, 0x00c381,
 
-  /*** Four byte table, leaf: 813087xx - offset 0x06580 ***/
+  /*** Four byte table, leaf: 813087xx - offset 0x065ec ***/
 
   /* 30 */  0x00c382, 0x00c383, 0x00c384, 0x00c385,
   /* 34 */  0x00c386, 0x00c387, 0x00c388, 0x00c389,
   /* 38 */  0x00c38a, 0x00c38b,
 
-  /*** Four byte table, leaf: 813088xx - offset 0x0658a ***/
+  /*** Four byte table, leaf: 813088xx - offset 0x065f6 ***/
 
   /* 30 */  0x00c38c, 0x00c38d, 0x00c38e, 0x00c38f,
   /* 34 */  0x00c390, 0x00c391, 0x00c392, 0x00c393,
   /* 38 */  0x00c394, 0x00c395,
 
-  /*** Four byte table, leaf: 813089xx - offset 0x06594 ***/
+  /*** Four byte table, leaf: 813089xx - offset 0x06600 ***/
 
   /* 30 */  0x00c396, 0x00c398, 0x00c399, 0x00c39a,
   /* 34 */  0x00c39b, 0x00c39c, 0x00c39d, 0x00c39e,
   /* 38 */  0x00c39f, 0x00c3a2,
 
-  /*** Four byte table, leaf: 81308axx - offset 0x0659e ***/
+  /*** Four byte table, leaf: 81308axx - offset 0x0660a ***/
 
   /* 30 */  0x00c3a3, 0x00c3a4, 0x00c3a5, 0x00c3a6,
   /* 34 */  0x00c3a7, 0x00c3ab, 0x00c3ae, 0x00c3af,
   /* 38 */  0x00c3b0, 0x00c3b1,
 
-  /*** Four byte table, leaf: 81308bxx - offset 0x065a8 ***/
+  /*** Four byte table, leaf: 81308bxx - offset 0x06614 ***/
 
   /* 30 */  0x00c3b4, 0x00c3b5, 0x00c3b6, 0x00c3b8,
   /* 34 */  0x00c3bb, 0x00c3bd, 0x00c3be, 0x00c3bf,
   /* 38 */  0x00c480, 0x00c482,
 
-  /*** Four byte table, leaf: 81308cxx - offset 0x065b2 ***/
+  /*** Four byte table, leaf: 81308cxx - offset 0x0661e ***/
 
   /* 30 */  0x00c483, 0x00c484, 0x00c485, 0x00c486,
   /* 34 */  0x00c487, 0x00c488, 0x00c489, 0x00c48a,
   /* 38 */  0x00c48b, 0x00c48c,
 
-  /*** Four byte table, leaf: 81308dxx - offset 0x065bc ***/
+  /*** Four byte table, leaf: 81308dxx - offset 0x06628 ***/
 
   /* 30 */  0x00c48d, 0x00c48e, 0x00c48f, 0x00c490,
   /* 34 */  0x00c491, 0x00c492, 0x00c494, 0x00c495,
   /* 38 */  0x00c496, 0x00c497,
 
-  /*** Four byte table, leaf: 81308exx - offset 0x065c6 ***/
+  /*** Four byte table, leaf: 81308exx - offset 0x06632 ***/
 
   /* 30 */  0x00c498, 0x00c499, 0x00c49a, 0x00c49c,
   /* 34 */  0x00c49d, 0x00c49e, 0x00c49f, 0x00c4a0,
   /* 38 */  0x00c4a1, 0x00c4a2,
 
-  /*** Four byte table, leaf: 81308fxx - offset 0x065d0 ***/
+  /*** Four byte table, leaf: 81308fxx - offset 0x0663c ***/
 
   /* 30 */  0x00c4a3, 0x00c4a4, 0x00c4a5, 0x00c4a6,
   /* 34 */  0x00c4a7, 0x00c4a8, 0x00c4a9, 0x00c4aa,
   /* 38 */  0x00c4ac, 0x00c4ad,
 
-  /*** Four byte table, leaf: 813090xx - offset 0x065da ***/
+  /*** Four byte table, leaf: 813090xx - offset 0x06646 ***/
 
   /* 30 */  0x00c4ae, 0x00c4af, 0x00c4b0, 0x00c4b1,
   /* 34 */  0x00c4b2, 0x00c4b3, 0x00c4b4, 0x00c4b5,
   /* 38 */  0x00c4b6, 0x00c4b7,
 
-  /*** Four byte table, leaf: 813091xx - offset 0x065e4 ***/
+  /*** Four byte table, leaf: 813091xx - offset 0x06650 ***/
 
   /* 30 */  0x00c4b8, 0x00c4b9, 0x00c4ba, 0x00c4bb,
   /* 34 */  0x00c4bc, 0x00c4bd, 0x00c4be, 0x00c4bf,
   /* 38 */  0x00c580, 0x00c581,
 
-  /*** Four byte table, leaf: 813092xx - offset 0x065ee ***/
+  /*** Four byte table, leaf: 813092xx - offset 0x0665a ***/
 
   /* 30 */  0x00c582, 0x00c583, 0x00c585, 0x00c586,
   /* 34 */  0x00c587, 0x00c589, 0x00c58a, 0x00c58b,
   /* 38 */  0x00c58c, 0x00c58e,
 
-  /*** Four byte table, leaf: 813093xx - offset 0x065f8 ***/
+  /*** Four byte table, leaf: 813093xx - offset 0x06664 ***/
 
   /* 30 */  0x00c58f, 0x00c590, 0x00c591, 0x00c592,
   /* 34 */  0x00c593, 0x00c594, 0x00c595, 0x00c596,
   /* 38 */  0x00c597, 0x00c598,
 
-  /*** Four byte table, leaf: 813094xx - offset 0x06602 ***/
+  /*** Four byte table, leaf: 813094xx - offset 0x0666e ***/
 
   /* 30 */  0x00c599, 0x00c59a, 0x00c59b, 0x00c59c,
   /* 34 */  0x00c59d, 0x00c59e, 0x00c59f, 0x00c5a0,
   /* 38 */  0x00c5a1, 0x00c5a2,
 
-  /*** Four byte table, leaf: 813095xx - offset 0x0660c ***/
+  /*** Four byte table, leaf: 813095xx - offset 0x06678 ***/
 
   /* 30 */  0x00c5a3, 0x00c5a4, 0x00c5a5, 0x00c5a6,
   /* 34 */  0x00c5a7, 0x00c5a8, 0x00c5a9, 0x00c5aa,
   /* 38 */  0x00c5ac, 0x00c5ad,
 
-  /*** Four byte table, leaf: 813096xx - offset 0x06616 ***/
+  /*** Four byte table, leaf: 813096xx - offset 0x06682 ***/
 
   /* 30 */  0x00c5ae, 0x00c5af, 0x00c5b0, 0x00c5b1,
   /* 34 */  0x00c5b2, 0x00c5b3, 0x00c5b4, 0x00c5b5,
   /* 38 */  0x00c5b6, 0x00c5b7,
 
-  /*** Four byte table, leaf: 813097xx - offset 0x06620 ***/
+  /*** Four byte table, leaf: 813097xx - offset 0x0668c ***/
 
   /* 30 */  0x00c5b8, 0x00c5b9, 0x00c5ba, 0x00c5bb,
   /* 34 */  0x00c5bc, 0x00c5bd, 0x00c5be, 0x00c5bf,
   /* 38 */  0x00c680, 0x00c681,
 
-  /*** Four byte table, leaf: 813098xx - offset 0x0662a ***/
+  /*** Four byte table, leaf: 813098xx - offset 0x06696 ***/
 
   /* 30 */  0x00c682, 0x00c683, 0x00c684, 0x00c685,
   /* 34 */  0x00c686, 0x00c687, 0x00c688, 0x00c689,
   /* 38 */  0x00c68a, 0x00c68b,
 
-  /*** Four byte table, leaf: 813099xx - offset 0x06634 ***/
+  /*** Four byte table, leaf: 813099xx - offset 0x066a0 ***/
 
   /* 30 */  0x00c68c, 0x00c68d, 0x00c68e, 0x00c68f,
   /* 34 */  0x00c690, 0x00c691, 0x00c692, 0x00c693,
   /* 38 */  0x00c694, 0x00c695,
 
-  /*** Four byte table, leaf: 81309axx - offset 0x0663e ***/
+  /*** Four byte table, leaf: 81309axx - offset 0x066aa ***/
 
   /* 30 */  0x00c696, 0x00c697, 0x00c698, 0x00c699,
   /* 34 */  0x00c69a, 0x00c69b, 0x00c69c, 0x00c69d,
   /* 38 */  0x00c69e, 0x00c69f,
 
-  /*** Four byte table, leaf: 81309bxx - offset 0x06648 ***/
+  /*** Four byte table, leaf: 81309bxx - offset 0x066b4 ***/
 
   /* 30 */  0x00c6a0, 0x00c6a1, 0x00c6a2, 0x00c6a3,
   /* 34 */  0x00c6a4, 0x00c6a5, 0x00c6a6, 0x00c6a7,
   /* 38 */  0x00c6a8, 0x00c6a9,
 
-  /*** Four byte table, leaf: 81309cxx - offset 0x06652 ***/
+  /*** Four byte table, leaf: 81309cxx - offset 0x066be ***/
 
   /* 30 */  0x00c6aa, 0x00c6ab, 0x00c6ac, 0x00c6ad,
   /* 34 */  0x00c6ae, 0x00c6af, 0x00c6b0, 0x00c6b1,
   /* 38 */  0x00c6b2, 0x00c6b3,
 
-  /*** Four byte table, leaf: 81309dxx - offset 0x0665c ***/
+  /*** Four byte table, leaf: 81309dxx - offset 0x066c8 ***/
 
   /* 30 */  0x00c6b4, 0x00c6b5, 0x00c6b6, 0x00c6b7,
   /* 34 */  0x00c6b8, 0x00c6b9, 0x00c6ba, 0x00c6bb,
   /* 38 */  0x00c6bc, 0x00c6bd,
 
-  /*** Four byte table, leaf: 81309exx - offset 0x06666 ***/
+  /*** Four byte table, leaf: 81309exx - offset 0x066d2 ***/
 
   /* 30 */  0x00c6be, 0x00c6bf, 0x00c780, 0x00c781,
   /* 34 */  0x00c782, 0x00c783, 0x00c784, 0x00c785,
   /* 38 */  0x00c786, 0x00c787,
 
-  /*** Four byte table, leaf: 81309fxx - offset 0x06670 ***/
+  /*** Four byte table, leaf: 81309fxx - offset 0x066dc ***/
 
   /* 30 */  0x00c788, 0x00c789, 0x00c78a, 0x00c78b,
   /* 34 */  0x00c78c, 0x00c78d, 0x00c78f, 0x00c791,
   /* 38 */  0x00c793, 0x00c795,
 
-  /*** Four byte table, leaf: 8130a0xx - offset 0x0667a ***/
+  /*** Four byte table, leaf: 8130a0xx - offset 0x066e6 ***/
 
   /* 30 */  0x00c797, 0x00c799, 0x00c79b, 0x00c79d,
   /* 34 */  0x00c79e, 0x00c79f, 0x00c7a0, 0x00c7a1,
   /* 38 */  0x00c7a2, 0x00c7a3,
 
-  /*** Four byte table, leaf: 8130a1xx - offset 0x06684 ***/
+  /*** Four byte table, leaf: 8130a1xx - offset 0x066f0 ***/
 
   /* 30 */  0x00c7a4, 0x00c7a5, 0x00c7a6, 0x00c7a7,
   /* 34 */  0x00c7a8, 0x00c7a9, 0x00c7aa, 0x00c7ab,
   /* 38 */  0x00c7ac, 0x00c7ad,
 
-  /*** Four byte table, leaf: 8130a2xx - offset 0x0668e ***/
+  /*** Four byte table, leaf: 8130a2xx - offset 0x066fa ***/
 
   /* 30 */  0x00c7ae, 0x00c7af, 0x00c7b0, 0x00c7b1,
   /* 34 */  0x00c7b2, 0x00c7b3, 0x00c7b4, 0x00c7b5,
   /* 38 */  0x00c7b6, 0x00c7b7,
 
-  /*** Four byte table, leaf: 8130a3xx - offset 0x06698 ***/
+  /*** Four byte table, leaf: 8130a3xx - offset 0x06704 ***/
 
   /* 30 */  0x00c7b8, 0x00c7ba, 0x00c7bb, 0x00c7bc,
   /* 34 */  0x00c7bd, 0x00c7be, 0x00c7bf, 0x00c880,
   /* 38 */  0x00c881, 0x00c882,
 
-  /*** Four byte table, leaf: 8130a4xx - offset 0x066a2 ***/
+  /*** Four byte table, leaf: 8130a4xx - offset 0x0670e ***/
 
   /* 30 */  0x00c883, 0x00c884, 0x00c885, 0x00c886,
   /* 34 */  0x00c887, 0x00c888, 0x00c889, 0x00c88a,
   /* 38 */  0x00c88b, 0x00c88c,
 
-  /*** Four byte table, leaf: 8130a5xx - offset 0x066ac ***/
+  /*** Four byte table, leaf: 8130a5xx - offset 0x06718 ***/
 
   /* 30 */  0x00c88d, 0x00c88e, 0x00c88f, 0x00c890,
   /* 34 */  0x00c891, 0x00c892, 0x00c893, 0x00c894,
   /* 38 */  0x00c895, 0x00c896,
 
-  /*** Four byte table, leaf: 8130a6xx - offset 0x066b6 ***/
+  /*** Four byte table, leaf: 8130a6xx - offset 0x06722 ***/
 
   /* 30 */  0x00c897, 0x00c898, 0x00c899, 0x00c89a,
   /* 34 */  0x00c89b, 0x00c89c, 0x00c89d, 0x00c89e,
   /* 38 */  0x00c89f, 0x00c8a0,
 
-  /*** Four byte table, leaf: 8130a7xx - offset 0x066c0 ***/
+  /*** Four byte table, leaf: 8130a7xx - offset 0x0672c ***/
 
   /* 30 */  0x00c8a1, 0x00c8a2, 0x00c8a3, 0x00c8a4,
   /* 34 */  0x00c8a5, 0x00c8a6, 0x00c8a7, 0x00c8a8,
   /* 38 */  0x00c8a9, 0x00c8aa,
 
-  /*** Four byte table, leaf: 8130a8xx - offset 0x066ca ***/
+  /*** Four byte table, leaf: 8130a8xx - offset 0x06736 ***/
 
   /* 30 */  0x00c8ab, 0x00c8ac, 0x00c8ad, 0x00c8ae,
   /* 34 */  0x00c8af, 0x00c8b0, 0x00c8b1, 0x00c8b2,
   /* 38 */  0x00c8b3, 0x00c8b4,
 
-  /*** Four byte table, leaf: 8130a9xx - offset 0x066d4 ***/
+  /*** Four byte table, leaf: 8130a9xx - offset 0x06740 ***/
 
   /* 30 */  0x00c8b5, 0x00c8b6, 0x00c8b7, 0x00c8b8,
   /* 34 */  0x00c8b9, 0x00c8ba, 0x00c8bb, 0x00c8bc,
   /* 38 */  0x00c8bd, 0x00c8be,
 
-  /*** Four byte table, leaf: 8130aaxx - offset 0x066de ***/
+  /*** Four byte table, leaf: 8130aaxx - offset 0x0674a ***/
 
   /* 30 */  0x00c8bf, 0x00c980, 0x00c981, 0x00c982,
   /* 34 */  0x00c983, 0x00c984, 0x00c985, 0x00c986,
   /* 38 */  0x00c987, 0x00c988,
 
-  /*** Four byte table, leaf: 8130abxx - offset 0x066e8 ***/
+  /*** Four byte table, leaf: 8130abxx - offset 0x06754 ***/
 
   /* 30 */  0x00c989, 0x00c98a, 0x00c98b, 0x00c98c,
   /* 34 */  0x00c98d, 0x00c98e, 0x00c98f, 0x00c990,
   /* 38 */  0x00c992, 0x00c993,
 
-  /*** Four byte table, leaf: 8130acxx - offset 0x066f2 ***/
+  /*** Four byte table, leaf: 8130acxx - offset 0x0675e ***/
 
   /* 30 */  0x00c994, 0x00c995, 0x00c996, 0x00c997,
   /* 34 */  0x00c998, 0x00c999, 0x00c99a, 0x00c99b,
   /* 38 */  0x00c99c, 0x00c99d,
 
-  /*** Four byte table, leaf: 8130adxx - offset 0x066fc ***/
+  /*** Four byte table, leaf: 8130adxx - offset 0x06768 ***/
 
   /* 30 */  0x00c99e, 0x00c99f, 0x00c9a0, 0x00c9a2,
   /* 34 */  0x00c9a3, 0x00c9a4, 0x00c9a5, 0x00c9a6,
   /* 38 */  0x00c9a7, 0x00c9a8,
 
-  /*** Four byte table, leaf: 8130aexx - offset 0x06706 ***/
+  /*** Four byte table, leaf: 8130aexx - offset 0x06772 ***/
 
   /* 30 */  0x00c9a9, 0x00c9aa, 0x00c9ab, 0x00c9ac,
   /* 34 */  0x00c9ad, 0x00c9ae, 0x00c9af, 0x00c9b0,
   /* 38 */  0x00c9b1, 0x00c9b2,
 
-  /*** Four byte table, leaf: 8130afxx - offset 0x06710 ***/
+  /*** Four byte table, leaf: 8130afxx - offset 0x0677c ***/
 
   /* 30 */  0x00c9b3, 0x00c9b4, 0x00c9b5, 0x00c9b6,
   /* 34 */  0x00c9b7, 0x00c9b8, 0x00c9b9, 0x00c9ba,
   /* 38 */  0x00c9bb, 0x00c9bc,
 
-  /*** Four byte table, leaf: 8130b0xx - offset 0x0671a ***/
+  /*** Four byte table, leaf: 8130b0xx - offset 0x06786 ***/
 
   /* 30 */  0x00c9bd, 0x00c9be, 0x00c9bf, 0x00ca80,
   /* 34 */  0x00ca81, 0x00ca82, 0x00ca83, 0x00ca84,
   /* 38 */  0x00ca85, 0x00ca86,
 
-  /*** Four byte table, leaf: 8130b1xx - offset 0x06724 ***/
+  /*** Four byte table, leaf: 8130b1xx - offset 0x06790 ***/
 
   /* 30 */  0x00ca87, 0x00ca88, 0x00ca89, 0x00ca8a,
   /* 34 */  0x00ca8b, 0x00ca8c, 0x00ca8d, 0x00ca8e,
   /* 38 */  0x00ca8f, 0x00ca90,
 
-  /*** Four byte table, leaf: 8130b2xx - offset 0x0672e ***/
+  /*** Four byte table, leaf: 8130b2xx - offset 0x0679a ***/
 
   /* 30 */  0x00ca91, 0x00ca92, 0x00ca93, 0x00ca94,
   /* 34 */  0x00ca95, 0x00ca96, 0x00ca97, 0x00ca98,
   /* 38 */  0x00ca99, 0x00ca9a,
 
-  /*** Four byte table, leaf: 8130b3xx - offset 0x06738 ***/
+  /*** Four byte table, leaf: 8130b3xx - offset 0x067a4 ***/
 
   /* 30 */  0x00ca9b, 0x00ca9c, 0x00ca9d, 0x00ca9e,
   /* 34 */  0x00ca9f, 0x00caa0, 0x00caa1, 0x00caa2,
   /* 38 */  0x00caa3, 0x00caa4,
 
-  /*** Four byte table, leaf: 8130b4xx - offset 0x06742 ***/
+  /*** Four byte table, leaf: 8130b4xx - offset 0x067ae ***/
 
   /* 30 */  0x00caa5, 0x00caa6, 0x00caa7, 0x00caa8,
   /* 34 */  0x00caa9, 0x00caaa, 0x00caab, 0x00caac,
   /* 38 */  0x00caad, 0x00caae,
 
-  /*** Four byte table, leaf: 8130b5xx - offset 0x0674c ***/
+  /*** Four byte table, leaf: 8130b5xx - offset 0x067b8 ***/
 
   /* 30 */  0x00caaf, 0x00cab0, 0x00cab1, 0x00cab2,
   /* 34 */  0x00cab3, 0x00cab4, 0x00cab5, 0x00cab6,
   /* 38 */  0x00cab7, 0x00cab8,
 
-  /*** Four byte table, leaf: 8130b6xx - offset 0x06756 ***/
+  /*** Four byte table, leaf: 8130b6xx - offset 0x067c2 ***/
 
   /* 30 */  0x00cab9, 0x00caba, 0x00cabb, 0x00cabc,
   /* 34 */  0x00cabd, 0x00cabe, 0x00cabf, 0x00cb80,
   /* 38 */  0x00cb81, 0x00cb82,
 
-  /*** Four byte table, leaf: 8130b7xx - offset 0x06760 ***/
+  /*** Four byte table, leaf: 8130b7xx - offset 0x067cc ***/
 
   /* 30 */  0x00cb83, 0x00cb84, 0x00cb85, 0x00cb86,
   /* 34 */  0x00cb88, 0x00cb8c, 0x00cb8d, 0x00cb8e,
   /* 38 */  0x00cb8f, 0x00cb90,
 
-  /*** Four byte table, leaf: 8130b8xx - offset 0x0676a ***/
+  /*** Four byte table, leaf: 8130b8xx - offset 0x067d6 ***/
 
   /* 30 */  0x00cb91, 0x00cb92, 0x00cb93, 0x00cb94,
   /* 34 */  0x00cb95, 0x00cb96, 0x00cb97, 0x00cb98,
   /* 38 */  0x00cb9a, 0x00cb9b,
 
-  /*** Four byte table, leaf: 8130b9xx - offset 0x06774 ***/
+  /*** Four byte table, leaf: 8130b9xx - offset 0x067e0 ***/
 
   /* 30 */  0x00cb9c, 0x00cb9d, 0x00cb9e, 0x00cb9f,
   /* 34 */  0x00cba0, 0x00cba1, 0x00cba2, 0x00cba3,
   /* 38 */  0x00cba4, 0x00cba5,
 
-  /*** Four byte table, leaf: 8130baxx - offset 0x0677e ***/
+  /*** Four byte table, leaf: 8130baxx - offset 0x067ea ***/
 
   /* 30 */  0x00cba6, 0x00cba7, 0x00cba8, 0x00cba9,
   /* 34 */  0x00cbaa, 0x00cbab, 0x00cbac, 0x00cbad,
   /* 38 */  0x00cbae, 0x00cbaf,
 
-  /*** Four byte table, leaf: 8130bbxx - offset 0x06788 ***/
+  /*** Four byte table, leaf: 8130bbxx - offset 0x067f4 ***/
 
   /* 30 */  0x00cbb0, 0x00cbb1, 0x00cbb2, 0x00cbb3,
   /* 34 */  0x00cbb4, 0x00cbb5, 0x00cbb6, 0x00cbb7,
   /* 38 */  0x00cbb8, 0x00cbb9,
 
-  /*** Four byte table, leaf: 8130bcxx - offset 0x06792 ***/
+  /*** Four byte table, leaf: 8130bcxx - offset 0x067fe ***/
 
   /* 30 */  0x00cbba, 0x00cbbb, 0x00cbbc, 0x00cbbd,
   /* 34 */  0x00cbbe, 0x00cbbf, 0x00cc80, 0x00cc81,
   /* 38 */  0x00cc82, 0x00cc83,
 
-  /*** Four byte table, leaf: 8130bdxx - offset 0x0679c ***/
+  /*** Four byte table, leaf: 8130bdxx - offset 0x06808 ***/
 
   /* 30 */  0x00cc84, 0x00cc85, 0x00cc86, 0x00cc87,
   /* 34 */  0x00cc88, 0x00cc89, 0x00cc8a, 0x00cc8b,
   /* 38 */  0x00cc8c, 0x00cc8d,
 
-  /*** Four byte table, leaf: 8130bexx - offset 0x067a6 ***/
+  /*** Four byte table, leaf: 8130bexx - offset 0x06812 ***/
 
   /* 30 */  0x00cc8e, 0x00cc8f, 0x00cc90, 0x00cc91,
   /* 34 */  0x00cc92, 0x00cc93, 0x00cc94, 0x00cc95,
   /* 38 */  0x00cc96, 0x00cc97,
 
-  /*** Four byte table, leaf: 8130bfxx - offset 0x067b0 ***/
+  /*** Four byte table, leaf: 8130bfxx - offset 0x0681c ***/
 
   /* 30 */  0x00cc98, 0x00cc99, 0x00cc9a, 0x00cc9b,
   /* 34 */  0x00cc9c, 0x00cc9d, 0x00cc9e, 0x00cc9f,
   /* 38 */  0x00cca0, 0x00cca1,
 
-  /*** Four byte table, leaf: 8130c0xx - offset 0x067ba ***/
+  /*** Four byte table, leaf: 8130c0xx - offset 0x06826 ***/
 
   /* 30 */  0x00cca2, 0x00cca3, 0x00cca4, 0x00cca5,
   /* 34 */  0x00cca6, 0x00cca7, 0x00cca8, 0x00cca9,
   /* 38 */  0x00ccaa, 0x00ccab,
 
-  /*** Four byte table, leaf: 8130c1xx - offset 0x067c4 ***/
+  /*** Four byte table, leaf: 8130c1xx - offset 0x06830 ***/
 
   /* 30 */  0x00ccac, 0x00ccad, 0x00ccae, 0x00ccaf,
   /* 34 */  0x00ccb0, 0x00ccb1, 0x00ccb2, 0x00ccb3,
   /* 38 */  0x00ccb4, 0x00ccb5,
 
-  /*** Four byte table, leaf: 8130c2xx - offset 0x067ce ***/
+  /*** Four byte table, leaf: 8130c2xx - offset 0x0683a ***/
 
   /* 30 */  0x00ccb6, 0x00ccb7, 0x00ccb8, 0x00ccb9,
   /* 34 */  0x00ccba, 0x00ccbb, 0x00ccbc, 0x00ccbd,
   /* 38 */  0x00ccbe, 0x00ccbf,
 
-  /*** Four byte table, leaf: 8130c3xx - offset 0x067d8 ***/
+  /*** Four byte table, leaf: 8130c3xx - offset 0x06844 ***/
 
   /* 30 */  0x00cd80, 0x00cd81, 0x00cd82, 0x00cd83,
   /* 34 */  0x00cd84, 0x00cd85, 0x00cd86, 0x00cd87,
   /* 38 */  0x00cd88, 0x00cd89,
 
-  /*** Four byte table, leaf: 8130c4xx - offset 0x067e2 ***/
+  /*** Four byte table, leaf: 8130c4xx - offset 0x0684e ***/
 
   /* 30 */  0x00cd8a, 0x00cd8b, 0x00cd8c, 0x00cd8d,
   /* 34 */  0x00cd8e, 0x00cd8f, 0x00cd90, 0x00cd91,
   /* 38 */  0x00cd92, 0x00cd93,
 
-  /*** Four byte table, leaf: 8130c5xx - offset 0x067ec ***/
+  /*** Four byte table, leaf: 8130c5xx - offset 0x06858 ***/
 
   /* 30 */  0x00cd94, 0x00cd95, 0x00cd96, 0x00cd97,
   /* 34 */  0x00cd98, 0x00cd99, 0x00cd9a, 0x00cd9b,
   /* 38 */  0x00cd9c, 0x00cd9d,
 
-  /*** Four byte table, leaf: 8130c6xx - offset 0x067f6 ***/
+  /*** Four byte table, leaf: 8130c6xx - offset 0x06862 ***/
 
   /* 30 */  0x00cd9e, 0x00cd9f, 0x00cda0, 0x00cda1,
   /* 34 */  0x00cda2, 0x00cda3, 0x00cda4, 0x00cda5,
   /* 38 */  0x00cda6, 0x00cda7,
 
-  /*** Four byte table, leaf: 8130c7xx - offset 0x06800 ***/
+  /*** Four byte table, leaf: 8130c7xx - offset 0x0686c ***/
 
   /* 30 */  0x00cda8, 0x00cda9, 0x00cdaa, 0x00cdab,
   /* 34 */  0x00cdac, 0x00cdad, 0x00cdae, 0x00cdaf,
   /* 38 */  0x00cdb0, 0x00cdb1,
 
-  /*** Four byte table, leaf: 8130c8xx - offset 0x0680a ***/
+  /*** Four byte table, leaf: 8130c8xx - offset 0x06876 ***/
 
   /* 30 */  0x00cdb2, 0x00cdb3, 0x00cdb4, 0x00cdb5,
   /* 34 */  0x00cdb6, 0x00cdb7, 0x00cdb8, 0x00cdb9,
   /* 38 */  0x00cdba, 0x00cdbb,
 
-  /*** Four byte table, leaf: 8130c9xx - offset 0x06814 ***/
+  /*** Four byte table, leaf: 8130c9xx - offset 0x06880 ***/
 
   /* 30 */  0x00cdbc, 0x00cdbd, 0x00cdbe, 0x00cdbf,
   /* 34 */  0x00ce80, 0x00ce81, 0x00ce82, 0x00ce83,
   /* 38 */  0x00ce84, 0x00ce85,
 
-  /*** Four byte table, leaf: 8130caxx - offset 0x0681e ***/
+  /*** Four byte table, leaf: 8130caxx - offset 0x0688a ***/
 
   /* 30 */  0x00ce86, 0x00ce87, 0x00ce88, 0x00ce89,
   /* 34 */  0x00ce8a, 0x00ce8b, 0x00ce8c, 0x00ce8d,
   /* 38 */  0x00ce8e, 0x00ce8f,
 
-  /*** Four byte table, leaf: 8130cbxx - offset 0x06828 ***/
+  /*** Four byte table, leaf: 8130cbxx - offset 0x06894 ***/
 
   /* 30 */  0x00ce90, 0x00cea2, 0x00ceaa, 0x00ceab,
   /* 34 */  0x00ceac, 0x00cead, 0x00ceae, 0x00ceaf,
   /* 38 */  0x00ceb0, 0x00cf82,
 
-  /*** Four byte table, leaf: 8130ccxx - offset 0x06832 ***/
+  /*** Four byte table, leaf: 8130ccxx - offset 0x0689e ***/
 
   /* 30 */  0x00cf8a, 0x00cf8b, 0x00cf8c, 0x00cf8d,
   /* 34 */  0x00cf8e, 0x00cf8f, 0x00cf90, 0x00cf91,
   /* 38 */  0x00cf92, 0x00cf93,
 
-  /*** Four byte table, leaf: 8130cdxx - offset 0x0683c ***/
+  /*** Four byte table, leaf: 8130cdxx - offset 0x068a8 ***/
 
   /* 30 */  0x00cf94, 0x00cf95, 0x00cf96, 0x00cf97,
   /* 34 */  0x00cf98, 0x00cf99, 0x00cf9a, 0x00cf9b,
   /* 38 */  0x00cf9c, 0x00cf9d,
 
-  /*** Four byte table, leaf: 8130cexx - offset 0x06846 ***/
+  /*** Four byte table, leaf: 8130cexx - offset 0x068b2 ***/
 
   /* 30 */  0x00cf9e, 0x00cf9f, 0x00cfa0, 0x00cfa1,
   /* 34 */  0x00cfa2, 0x00cfa3, 0x00cfa4, 0x00cfa5,
   /* 38 */  0x00cfa6, 0x00cfa7,
 
-  /*** Four byte table, leaf: 8130cfxx - offset 0x06850 ***/
+  /*** Four byte table, leaf: 8130cfxx - offset 0x068bc ***/
 
   /* 30 */  0x00cfa8, 0x00cfa9, 0x00cfaa, 0x00cfab,
   /* 34 */  0x00cfac, 0x00cfad, 0x00cfae, 0x00cfaf,
   /* 38 */  0x00cfb0, 0x00cfb1,
 
-  /*** Four byte table, leaf: 8130d0xx - offset 0x0685a ***/
+  /*** Four byte table, leaf: 8130d0xx - offset 0x068c6 ***/
 
   /* 30 */  0x00cfb2, 0x00cfb3, 0x00cfb4, 0x00cfb5,
   /* 34 */  0x00cfb6, 0x00cfb7, 0x00cfb8, 0x00cfb9,
   /* 38 */  0x00cfba, 0x00cfbb,
 
-  /*** Four byte table, leaf: 8130d1xx - offset 0x06864 ***/
+  /*** Four byte table, leaf: 8130d1xx - offset 0x068d0 ***/
 
   /* 30 */  0x00cfbc, 0x00cfbd, 0x00cfbe, 0x00cfbf,
   /* 34 */  0x00d080, 0x00d082, 0x00d083, 0x00d084,
   /* 38 */  0x00d085, 0x00d086,
 
-  /*** Four byte table, leaf: 8130d2xx - offset 0x0686e ***/
+  /*** Four byte table, leaf: 8130d2xx - offset 0x068da ***/
 
   /* 30 */  0x00d087, 0x00d088, 0x00d089, 0x00d08a,
   /* 34 */  0x00d08b, 0x00d08c, 0x00d08d, 0x00d08e,
   /* 38 */  0x00d08f, 0x00d190,
 
-  /*** Four byte table, leaf: 8136a5xx - offset 0x06878 ***/
+  /*** Four byte table, leaf: 8135f4xx - offset 0x068e4 ***/
+
+  /* 30 */  0x000000, 0x000000, 0x000000, 0x000000,
+  /* 34 */  0x000000, 0x000000, 0x000000, 0xee9f87,
+    /* 2 trailing zero values shared with next segment */
+
+  /*** Four byte table, leaf: 8136a5xx - offset 0x068ec ***/
 
   /* 30 */  0x000000, 0x000000, 0xe28091, 0xe28092,
   /* 34 */  0xe28097, 0xe2809a, 0xe2809b, 0xe2809e,
   /* 38 */  0xe2809f, 0xe280a0,
 
-  /*** Four byte table, leaf: 8136a6xx - offset 0x06882 ***/
+  /*** Four byte table, leaf: 8136a6xx - offset 0x068f6 ***/
 
   /* 30 */  0xe280a1, 0xe280a2, 0xe280a3, 0xe280a4,
   /* 34 */  0xe280a7, 0xe280a8, 0xe280a9, 0xe280aa,
   /* 38 */  0xe280ab, 0xe280ac,
 
-  /*** Four byte table, leaf: 8136a7xx - offset 0x0688c ***/
+  /*** Four byte table, leaf: 8136a7xx - offset 0x06900 ***/
 
   /* 30 */  0xe280ad, 0xe280ae, 0xe280af, 0xe280b1,
   /* 34 */  0xe280b4, 0xe280b6, 0xe280b7, 0xe280b8,
   /* 38 */  0xe280b9, 0xe280ba,
 
-  /*** Four byte table, leaf: 8136a8xx - offset 0x06896 ***/
+  /*** Four byte table, leaf: 8136a8xx - offset 0x0690a ***/
 
   /* 30 */  0xe280bc, 0xe280bd, 0xe280be, 0xe280bf,
   /* 34 */  0xe28180, 0xe28181, 0xe28182, 0xe28183,
   /* 38 */  0xe28184, 0xe28185,
 
-  /*** Four byte table, leaf: 8136a9xx - offset 0x068a0 ***/
+  /*** Four byte table, leaf: 8136a9xx - offset 0x06914 ***/
 
   /* 30 */  0xe28186, 0xe28187, 0xe28188, 0xe28189,
   /* 34 */  0xe2818a, 0xe2818b, 0xe2818c, 0xe2818d,
   /* 38 */  0xe2818e, 0xe2818f,
 
-  /*** Four byte table, leaf: 8136aaxx - offset 0x068aa ***/
+  /*** Four byte table, leaf: 8136aaxx - offset 0x0691e ***/
 
   /* 30 */  0xe28190, 0xe28191, 0xe28192, 0xe28193,
   /* 34 */  0xe28194, 0xe28195, 0xe28196, 0xe28197,
   /* 38 */  0xe28198, 0xe28199,
 
-  /*** Four byte table, leaf: 8136abxx - offset 0x068b4 ***/
+  /*** Four byte table, leaf: 8136abxx - offset 0x06928 ***/
 
   /* 30 */  0xe2819a, 0xe2819b, 0xe2819c, 0xe2819d,
   /* 34 */  0xe2819e, 0xe2819f, 0xe281a0, 0xe281a1,
   /* 38 */  0xe281a2, 0xe281a3,
 
-  /*** Four byte table, leaf: 8136acxx - offset 0x068be ***/
+  /*** Four byte table, leaf: 8136acxx - offset 0x06932 ***/
 
   /* 30 */  0xe281a4, 0xe281a5, 0xe281a6, 0xe281a7,
   /* 34 */  0xe281a8, 0xe281a9, 0xe281aa, 0xe281ab,
   /* 38 */  0xe281ac, 0xe281ad,
 
-  /*** Four byte table, leaf: 8136adxx - offset 0x068c8 ***/
+  /*** Four byte table, leaf: 8136adxx - offset 0x0693c ***/
 
   /* 30 */  0xe281ae, 0xe281af, 0xe281b0, 0xe281b1,
   /* 34 */  0xe281b2, 0xe281b3, 0xe281b4, 0xe281b5,
   /* 38 */  0xe281b6, 0xe281b7,
 
-  /*** Four byte table, leaf: 8136aexx - offset 0x068d2 ***/
+  /*** Four byte table, leaf: 8136aexx - offset 0x06946 ***/
 
   /* 30 */  0xe281b8, 0xe281b9, 0xe281ba, 0xe281bb,
   /* 34 */  0xe281bc, 0xe281bd, 0xe281be, 0xe281bf,
   /* 38 */  0xe28280, 0xe28281,
 
-  /*** Four byte table, leaf: 8136afxx - offset 0x068dc ***/
+  /*** Four byte table, leaf: 8136afxx - offset 0x06950 ***/
 
   /* 30 */  0xe28282, 0xe28283, 0xe28284, 0xe28285,
   /* 34 */  0xe28286, 0xe28287, 0xe28288, 0xe28289,
   /* 38 */  0xe2828a, 0xe2828b,
 
-  /*** Four byte table, leaf: 8136b0xx - offset 0x068e6 ***/
+  /*** Four byte table, leaf: 8136b0xx - offset 0x0695a ***/
 
   /* 30 */  0xe2828c, 0xe2828d, 0xe2828e, 0xe2828f,
   /* 34 */  0xe28290, 0xe28291, 0xe28292, 0xe28293,
   /* 38 */  0xe28294, 0xe28295,
 
-  /*** Four byte table, leaf: 8136b1xx - offset 0x068f0 ***/
+  /*** Four byte table, leaf: 8136b1xx - offset 0x06964 ***/
 
   /* 30 */  0xe28296, 0xe28297, 0xe28298, 0xe28299,
   /* 34 */  0xe2829a, 0xe2829b, 0xe2829c, 0xe2829d,
   /* 38 */  0xe2829e, 0xe2829f,
 
-  /*** Four byte table, leaf: 8136b2xx - offset 0x068fa ***/
+  /*** Four byte table, leaf: 8136b2xx - offset 0x0696e ***/
 
   /* 30 */  0xe282a0, 0xe282a1, 0xe282a2, 0xe282a3,
   /* 34 */  0xe282a4, 0xe282a5, 0xe282a6, 0xe282a7,
   /* 38 */  0xe282a8, 0xe282a9,
 
-  /*** Four byte table, leaf: 8136b3xx - offset 0x06904 ***/
+  /*** Four byte table, leaf: 8136b3xx - offset 0x06978 ***/
 
   /* 30 */  0xe282aa, 0xe282ab, 0xe282ad, 0xe282ae,
   /* 34 */  0xe282af, 0xe282b0, 0xe282b1, 0xe282b2,
   /* 38 */  0xe282b3, 0xe282b4,
 
-  /*** Four byte table, leaf: 8136b4xx - offset 0x0690e ***/
+  /*** Four byte table, leaf: 8136b4xx - offset 0x06982 ***/
 
   /* 30 */  0xe282b5, 0xe282b6, 0xe282b7, 0xe282b8,
   /* 34 */  0xe282b9, 0xe282ba, 0xe282bb, 0xe282bc,
   /* 38 */  0xe282bd, 0xe282be,
 
-  /*** Four byte table, leaf: 8136b5xx - offset 0x06918 ***/
+  /*** Four byte table, leaf: 8136b5xx - offset 0x0698c ***/
 
   /* 30 */  0xe282bf, 0xe28380, 0xe28381, 0xe28382,
   /* 34 */  0xe28383, 0xe28384, 0xe28385, 0xe28386,
   /* 38 */  0xe28387, 0xe28388,
 
-  /*** Four byte table, leaf: 8136b6xx - offset 0x06922 ***/
+  /*** Four byte table, leaf: 8136b6xx - offset 0x06996 ***/
 
   /* 30 */  0xe28389, 0xe2838a, 0xe2838b, 0xe2838c,
   /* 34 */  0xe2838d, 0xe2838e, 0xe2838f, 0xe28390,
   /* 38 */  0xe28391, 0xe28392,
 
-  /*** Four byte table, leaf: 8136b7xx - offset 0x0692c ***/
+  /*** Four byte table, leaf: 8136b7xx - offset 0x069a0 ***/
 
   /* 30 */  0xe28393, 0xe28394, 0xe28395, 0xe28396,
   /* 34 */  0xe28397, 0xe28398, 0xe28399, 0xe2839a,
   /* 38 */  0xe2839b, 0xe2839c,
 
-  /*** Four byte table, leaf: 8136b8xx - offset 0x06936 ***/
+  /*** Four byte table, leaf: 8136b8xx - offset 0x069aa ***/
 
   /* 30 */  0xe2839d, 0xe2839e, 0xe2839f, 0xe283a0,
   /* 34 */  0xe283a1, 0xe283a2, 0xe283a3, 0xe283a4,
   /* 38 */  0xe283a5, 0xe283a6,
 
-  /*** Four byte table, leaf: 8136b9xx - offset 0x06940 ***/
+  /*** Four byte table, leaf: 8136b9xx - offset 0x069b4 ***/
 
   /* 30 */  0xe283a7, 0xe283a8, 0xe283a9, 0xe283aa,
   /* 34 */  0xe283ab, 0xe283ac, 0xe283ad, 0xe283ae,
   /* 38 */  0xe283af, 0xe283b0,
 
-  /*** Four byte table, leaf: 8136baxx - offset 0x0694a ***/
+  /*** Four byte table, leaf: 8136baxx - offset 0x069be ***/
 
   /* 30 */  0xe283b1, 0xe283b2, 0xe283b3, 0xe283b4,
   /* 34 */  0xe283b5, 0xe283b6, 0xe283b7, 0xe283b8,
   /* 38 */  0xe283b9, 0xe283ba,
 
-  /*** Four byte table, leaf: 8136bbxx - offset 0x06954 ***/
+  /*** Four byte table, leaf: 8136bbxx - offset 0x069c8 ***/
 
   /* 30 */  0xe283bb, 0xe283bc, 0xe283bd, 0xe283be,
   /* 34 */  0xe283bf, 0xe28480, 0xe28481, 0xe28482,
   /* 38 */  0xe28484, 0xe28486,
 
-  /*** Four byte table, leaf: 8136bcxx - offset 0x0695e ***/
+  /*** Four byte table, leaf: 8136bcxx - offset 0x069d2 ***/
 
   /* 30 */  0xe28487, 0xe28488, 0xe2848a, 0xe2848b,
   /* 34 */  0xe2848c, 0xe2848d, 0xe2848e, 0xe2848f,
   /* 38 */  0xe28490, 0xe28491,
 
-  /*** Four byte table, leaf: 8136bdxx - offset 0x06968 ***/
+  /*** Four byte table, leaf: 8136bdxx - offset 0x069dc ***/
 
   /* 30 */  0xe28492, 0xe28493, 0xe28494, 0xe28495,
   /* 34 */  0xe28497, 0xe28498, 0xe28499, 0xe2849a,
   /* 38 */  0xe2849b, 0xe2849c,
 
-  /*** Four byte table, leaf: 8136bexx - offset 0x06972 ***/
+  /*** Four byte table, leaf: 8136bexx - offset 0x069e6 ***/
 
   /* 30 */  0xe2849d, 0xe2849e, 0xe2849f, 0xe284a0,
   /* 34 */  0xe284a2, 0xe284a3, 0xe284a4, 0xe284a5,
   /* 38 */  0xe284a6, 0xe284a7,
 
-  /*** Four byte table, leaf: 8136bfxx - offset 0x0697c ***/
+  /*** Four byte table, leaf: 8136bfxx - offset 0x069f0 ***/
 
   /* 30 */  0xe284a8, 0xe284a9, 0xe284aa, 0xe284ab,
   /* 34 */  0xe284ac, 0xe284ad, 0xe284ae, 0xe284af,
   /* 38 */  0xe284b0, 0xe284b1,
 
-  /*** Four byte table, leaf: 8136c0xx - offset 0x06986 ***/
+  /*** Four byte table, leaf: 8136c0xx - offset 0x069fa ***/
 
   /* 30 */  0xe284b2, 0xe284b3, 0xe284b4, 0xe284b5,
   /* 34 */  0xe284b6, 0xe284b7, 0xe284b8, 0xe284b9,
   /* 38 */  0xe284ba, 0xe284bb,
 
-  /*** Four byte table, leaf: 8136c1xx - offset 0x06990 ***/
+  /*** Four byte table, leaf: 8136c1xx - offset 0x06a04 ***/
 
   /* 30 */  0xe284bc, 0xe284bd, 0xe284be, 0xe284bf,
   /* 34 */  0xe28580, 0xe28581, 0xe28582, 0xe28583,
   /* 38 */  0xe28584, 0xe28585,
 
-  /*** Four byte table, leaf: 8136c2xx - offset 0x0699a ***/
+  /*** Four byte table, leaf: 8136c2xx - offset 0x06a0e ***/
 
   /* 30 */  0xe28586, 0xe28587, 0xe28588, 0xe28589,
   /* 34 */  0xe2858a, 0xe2858b, 0xe2858c, 0xe2858d,
   /* 38 */  0xe2858e, 0xe2858f,
 
-  /*** Four byte table, leaf: 8136c3xx - offset 0x069a4 ***/
+  /*** Four byte table, leaf: 8136c3xx - offset 0x06a18 ***/
 
   /* 30 */  0xe28590, 0xe28591, 0xe28592, 0xe28593,
   /* 34 */  0xe28594, 0xe28595, 0xe28596, 0xe28597,
   /* 38 */  0xe28598, 0xe28599,
 
-  /*** Four byte table, leaf: 8136c4xx - offset 0x069ae ***/
+  /*** Four byte table, leaf: 8136c4xx - offset 0x06a22 ***/
 
   /* 30 */  0xe2859a, 0xe2859b, 0xe2859c, 0xe2859d,
   /* 34 */  0xe2859e, 0xe2859f, 0xe285ac, 0xe285ad,
   /* 38 */  0xe285ae, 0xe285af,
 
-  /*** Four byte table, leaf: 8136c5xx - offset 0x069b8 ***/
+  /*** Four byte table, leaf: 8136c5xx - offset 0x06a2c ***/
 
   /* 30 */  0xe285ba, 0xe285bb, 0xe285bc, 0xe285bd,
   /* 34 */  0xe285be, 0xe285bf, 0xe28680, 0xe28681,
   /* 38 */  0xe28682, 0xe28683,
 
-  /*** Four byte table, leaf: 8136c6xx - offset 0x069c2 ***/
+  /*** Four byte table, leaf: 8136c6xx - offset 0x06a36 ***/
 
   /* 30 */  0xe28684, 0xe28685, 0xe28686, 0xe28687,
   /* 34 */  0xe28688, 0xe28689, 0xe2868a, 0xe2868b,
   /* 38 */  0xe2868c, 0xe2868d,
 
-  /*** Four byte table, leaf: 8136c7xx - offset 0x069cc ***/
+  /*** Four byte table, leaf: 8136c7xx - offset 0x06a40 ***/
 
   /* 30 */  0xe2868e, 0xe2868f, 0xe28694, 0xe28695,
   /* 34 */  0xe2869a, 0xe2869b, 0xe2869c, 0xe2869d,
   /* 38 */  0xe2869e, 0xe2869f,
 
-  /*** Four byte table, leaf: 8136c8xx - offset 0x069d6 ***/
+  /*** Four byte table, leaf: 8136c8xx - offset 0x06a4a ***/
 
   /* 30 */  0xe286a0, 0xe286a1, 0xe286a2, 0xe286a3,
   /* 34 */  0xe286a4, 0xe286a5, 0xe286a6, 0xe286a7,
   /* 38 */  0xe286a8, 0xe286a9,
 
-  /*** Four byte table, leaf: 8136c9xx - offset 0x069e0 ***/
+  /*** Four byte table, leaf: 8136c9xx - offset 0x06a54 ***/
 
   /* 30 */  0xe286aa, 0xe286ab, 0xe286ac, 0xe286ad,
   /* 34 */  0xe286ae, 0xe286af, 0xe286b0, 0xe286b1,
   /* 38 */  0xe286b2, 0xe286b3,
 
-  /*** Four byte table, leaf: 8136caxx - offset 0x069ea ***/
+  /*** Four byte table, leaf: 8136caxx - offset 0x06a5e ***/
 
   /* 30 */  0xe286b4, 0xe286b5, 0xe286b6, 0xe286b7,
   /* 34 */  0xe286b8, 0xe286b9, 0xe286ba, 0xe286bb,
   /* 38 */  0xe286bc, 0xe286bd,
 
-  /*** Four byte table, leaf: 8136cbxx - offset 0x069f4 ***/
+  /*** Four byte table, leaf: 8136cbxx - offset 0x06a68 ***/
 
   /* 30 */  0xe286be, 0xe286bf, 0xe28780, 0xe28781,
   /* 34 */  0xe28782, 0xe28783, 0xe28784, 0xe28785,
   /* 38 */  0xe28786, 0xe28787,
 
-  /*** Four byte table, leaf: 8136ccxx - offset 0x069fe ***/
+  /*** Four byte table, leaf: 8136ccxx - offset 0x06a72 ***/
 
   /* 30 */  0xe28788, 0xe28789, 0xe2878a, 0xe2878b,
   /* 34 */  0xe2878c, 0xe2878d, 0xe2878e, 0xe2878f,
   /* 38 */  0xe28790, 0xe28791,
 
-  /*** Four byte table, leaf: 8136cdxx - offset 0x06a08 ***/
+  /*** Four byte table, leaf: 8136cdxx - offset 0x06a7c ***/
 
   /* 30 */  0xe28792, 0xe28793, 0xe28794, 0xe28795,
   /* 34 */  0xe28796, 0xe28797, 0xe28798, 0xe28799,
   /* 38 */  0xe2879a, 0xe2879b,
 
-  /*** Four byte table, leaf: 8136cexx - offset 0x06a12 ***/
+  /*** Four byte table, leaf: 8136cexx - offset 0x06a86 ***/
 
   /* 30 */  0xe2879c, 0xe2879d, 0xe2879e, 0xe2879f,
   /* 34 */  0xe287a0, 0xe287a1, 0xe287a2, 0xe287a3,
   /* 38 */  0xe287a4, 0xe287a5,
 
-  /*** Four byte table, leaf: 8136cfxx - offset 0x06a1c ***/
+  /*** Four byte table, leaf: 8136cfxx - offset 0x06a90 ***/
 
   /* 30 */  0xe287a6, 0xe287a7, 0xe287a8, 0xe287a9,
   /* 34 */  0xe287aa, 0xe287ab, 0xe287ac, 0xe287ad,
   /* 38 */  0xe287ae, 0xe287af,
 
-  /*** Four byte table, leaf: 8136d0xx - offset 0x06a26 ***/
+  /*** Four byte table, leaf: 8136d0xx - offset 0x06a9a ***/
 
   /* 30 */  0xe287b0, 0xe287b1, 0xe287b2, 0xe287b3,
   /* 34 */  0xe287b4, 0xe287b5, 0xe287b6, 0xe287b7,
   /* 38 */  0xe287b8, 0xe287b9,
 
-  /*** Four byte table, leaf: 8136d1xx - offset 0x06a30 ***/
+  /*** Four byte table, leaf: 8136d1xx - offset 0x06aa4 ***/
 
   /* 30 */  0xe287ba, 0xe287bb, 0xe287bc, 0xe287bd,
   /* 34 */  0xe287be, 0xe287bf, 0xe28880, 0xe28881,
   /* 38 */  0xe28882, 0xe28883,
 
-  /*** Four byte table, leaf: 8136d2xx - offset 0x06a3a ***/
+  /*** Four byte table, leaf: 8136d2xx - offset 0x06aae ***/
 
   /* 30 */  0xe28884, 0xe28885, 0xe28886, 0xe28887,
   /* 34 */  0xe28889, 0xe2888a, 0xe2888b, 0xe2888c,
   /* 38 */  0xe2888d, 0xe2888e,
 
-  /*** Four byte table, leaf: 8136d3xx - offset 0x06a44 ***/
+  /*** Four byte table, leaf: 8136d3xx - offset 0x06ab8 ***/
 
   /* 30 */  0xe28890, 0xe28892, 0xe28893, 0xe28894,
   /* 34 */  0xe28896, 0xe28897, 0xe28898, 0xe28899,
   /* 38 */  0xe2889b, 0xe2889c,
 
-  /*** Four byte table, leaf: 8136d4xx - offset 0x06a4e ***/
+  /*** Four byte table, leaf: 8136d4xx - offset 0x06ac2 ***/
 
   /* 30 */  0xe288a1, 0xe288a2, 0xe288a4, 0xe288a6,
   /* 34 */  0xe288ac, 0xe288ad, 0xe288af, 0xe288b0,
   /* 38 */  0xe288b1, 0xe288b2,
 
-  /*** Four byte table, leaf: 8136d5xx - offset 0x06a58 ***/
+  /*** Four byte table, leaf: 8136d5xx - offset 0x06acc ***/
 
   /* 30 */  0xe288b3, 0xe288b8, 0xe288b9, 0xe288ba,
   /* 34 */  0xe288bb, 0xe288bc, 0xe288be, 0xe288bf,
   /* 38 */  0xe28980, 0xe28981,
 
-  /*** Four byte table, leaf: 8136d6xx - offset 0x06a62 ***/
+  /*** Four byte table, leaf: 8136d6xx - offset 0x06ad6 ***/
 
   /* 30 */  0xe28982, 0xe28983, 0xe28984, 0xe28985,
   /* 34 */  0xe28986, 0xe28987, 0xe28989, 0xe2898a,
   /* 38 */  0xe2898b, 0xe2898d,
 
-  /*** Four byte table, leaf: 8136d7xx - offset 0x06a6c ***/
+  /*** Four byte table, leaf: 8136d7xx - offset 0x06ae0 ***/
 
   /* 30 */  0xe2898e, 0xe2898f, 0xe28990, 0xe28991,
   /* 34 */  0xe28993, 0xe28994, 0xe28995, 0xe28996,
   /* 38 */  0xe28997, 0xe28998,
 
-  /*** Four byte table, leaf: 8136d8xx - offset 0x06a76 ***/
+  /*** Four byte table, leaf: 8136d8xx - offset 0x06aea ***/
 
   /* 30 */  0xe28999, 0xe2899a, 0xe2899b, 0xe2899c,
   /* 34 */  0xe2899d, 0xe2899e, 0xe2899f, 0xe289a2,
   /* 38 */  0xe289a3, 0xe289a8,
 
-  /*** Four byte table, leaf: 8136d9xx - offset 0x06a80 ***/
+  /*** Four byte table, leaf: 8136d9xx - offset 0x06af4 ***/
 
   /* 30 */  0xe289a9, 0xe289aa, 0xe289ab, 0xe289ac,
   /* 34 */  0xe289ad, 0xe289b0, 0xe289b1, 0xe289b2,
   /* 38 */  0xe289b3, 0xe289b4,
 
-  /*** Four byte table, leaf: 8136daxx - offset 0x06a8a ***/
+  /*** Four byte table, leaf: 8136daxx - offset 0x06afe ***/
 
   /* 30 */  0xe289b5, 0xe289b6, 0xe289b7, 0xe289b8,
   /* 34 */  0xe289b9, 0xe289ba, 0xe289bb, 0xe289bc,
   /* 38 */  0xe289bd, 0xe289be,
 
-  /*** Four byte table, leaf: 8136dbxx - offset 0x06a94 ***/
+  /*** Four byte table, leaf: 8136dbxx - offset 0x06b08 ***/
 
   /* 30 */  0xe289bf, 0xe28a80, 0xe28a81, 0xe28a82,
   /* 34 */  0xe28a83, 0xe28a84, 0xe28a85, 0xe28a86,
   /* 38 */  0xe28a87, 0xe28a88,
 
-  /*** Four byte table, leaf: 8136dcxx - offset 0x06a9e ***/
+  /*** Four byte table, leaf: 8136dcxx - offset 0x06b12 ***/
 
   /* 30 */  0xe28a89, 0xe28a8a, 0xe28a8b, 0xe28a8c,
   /* 34 */  0xe28a8d, 0xe28a8e, 0xe28a8f, 0xe28a90,
   /* 38 */  0xe28a91, 0xe28a92,
 
-  /*** Four byte table, leaf: 8136ddxx - offset 0x06aa8 ***/
+  /*** Four byte table, leaf: 8136ddxx - offset 0x06b1c ***/
 
   /* 30 */  0xe28a93, 0xe28a94, 0xe28a96, 0xe28a97,
   /* 34 */  0xe28a98, 0xe28a9a, 0xe28a9b, 0xe28a9c,
   /* 38 */  0xe28a9d, 0xe28a9e,
 
-  /*** Four byte table, leaf: 8136dexx - offset 0x06ab2 ***/
+  /*** Four byte table, leaf: 8136dexx - offset 0x06b26 ***/
 
   /* 30 */  0xe28a9f, 0xe28aa0, 0xe28aa1, 0xe28aa2,
   /* 34 */  0xe28aa3, 0xe28aa4, 0xe28aa6, 0xe28aa7,
   /* 38 */  0xe28aa8, 0xe28aa9,
 
-  /*** Four byte table, leaf: 8136dfxx - offset 0x06abc ***/
+  /*** Four byte table, leaf: 8136dfxx - offset 0x06b30 ***/
 
   /* 30 */  0xe28aaa, 0xe28aab, 0xe28aac, 0xe28aad,
   /* 34 */  0xe28aae, 0xe28aaf, 0xe28ab0, 0xe28ab1,
   /* 38 */  0xe28ab2, 0xe28ab3,
 
-  /*** Four byte table, leaf: 8136e0xx - offset 0x06ac6 ***/
+  /*** Four byte table, leaf: 8136e0xx - offset 0x06b3a ***/
 
   /* 30 */  0xe28ab4, 0xe28ab5, 0xe28ab6, 0xe28ab7,
   /* 34 */  0xe28ab8, 0xe28ab9, 0xe28aba, 0xe28abb,
   /* 38 */  0xe28abc, 0xe28abd,
 
-  /*** Four byte table, leaf: 8136e1xx - offset 0x06ad0 ***/
+  /*** Four byte table, leaf: 8136e1xx - offset 0x06b44 ***/
 
   /* 30 */  0xe28abe, 0xe28b80, 0xe28b81, 0xe28b82,
   /* 34 */  0xe28b83, 0xe28b84, 0xe28b85, 0xe28b86,
   /* 38 */  0xe28b87, 0xe28b88,
 
-  /*** Four byte table, leaf: 8136e2xx - offset 0x06ada ***/
+  /*** Four byte table, leaf: 8136e2xx - offset 0x06b4e ***/
 
   /* 30 */  0xe28b89, 0xe28b8a, 0xe28b8b, 0xe28b8c,
   /* 34 */  0xe28b8d, 0xe28b8e, 0xe28b8f, 0xe28b90,
   /* 38 */  0xe28b91, 0xe28b92,
 
-  /*** Four byte table, leaf: 8136e3xx - offset 0x06ae4 ***/
+  /*** Four byte table, leaf: 8136e3xx - offset 0x06b58 ***/
 
   /* 30 */  0xe28b93, 0xe28b94, 0xe28b95, 0xe28b96,
   /* 34 */  0xe28b97, 0xe28b98, 0xe28b99, 0xe28b9a,
   /* 38 */  0xe28b9b, 0xe28b9c,
 
-  /*** Four byte table, leaf: 8136e4xx - offset 0x06aee ***/
+  /*** Four byte table, leaf: 8136e4xx - offset 0x06b62 ***/
 
   /* 30 */  0xe28b9d, 0xe28b9e, 0xe28b9f, 0xe28ba0,
   /* 34 */  0xe28ba1, 0xe28ba2, 0xe28ba3, 0xe28ba4,
   /* 38 */  0xe28ba5, 0xe28ba6,
 
-  /*** Four byte table, leaf: 8136e5xx - offset 0x06af8 ***/
+  /*** Four byte table, leaf: 8136e5xx - offset 0x06b6c ***/
 
   /* 30 */  0xe28ba7, 0xe28ba8, 0xe28ba9, 0xe28baa,
   /* 34 */  0xe28bab, 0xe28bac, 0xe28bad, 0xe28bae,
   /* 38 */  0xe28baf, 0xe28bb0,
 
-  /*** Four byte table, leaf: 8136e6xx - offset 0x06b02 ***/
+  /*** Four byte table, leaf: 8136e6xx - offset 0x06b76 ***/
 
   /* 30 */  0xe28bb1, 0xe28bb2, 0xe28bb3, 0xe28bb4,
   /* 34 */  0xe28bb5, 0xe28bb6, 0xe28bb7, 0xe28bb8,
   /* 38 */  0xe28bb9, 0xe28bba,
 
-  /*** Four byte table, leaf: 8136e7xx - offset 0x06b0c ***/
+  /*** Four byte table, leaf: 8136e7xx - offset 0x06b80 ***/
 
   /* 30 */  0xe28bbb, 0xe28bbc, 0xe28bbd, 0xe28bbe,
   /* 34 */  0xe28bbf, 0xe28c80, 0xe28c81, 0xe28c82,
   /* 38 */  0xe28c83, 0xe28c84,
 
-  /*** Four byte table, leaf: 8136e8xx - offset 0x06b16 ***/
+  /*** Four byte table, leaf: 8136e8xx - offset 0x06b8a ***/
 
   /* 30 */  0xe28c85, 0xe28c86, 0xe28c87, 0xe28c88,
   /* 34 */  0xe28c89, 0xe28c8a, 0xe28c8b, 0xe28c8c,
   /* 38 */  0xe28c8d, 0xe28c8e,
 
-  /*** Four byte table, leaf: 8136e9xx - offset 0x06b20 ***/
+  /*** Four byte table, leaf: 8136e9xx - offset 0x06b94 ***/
 
   /* 30 */  0xe28c8f, 0xe28c90, 0xe28c91, 0xe28c93,
   /* 34 */  0xe28c94, 0xe28c95, 0xe28c96, 0xe28c97,
   /* 38 */  0xe28c98, 0xe28c99,
 
-  /*** Four byte table, leaf: 8136eaxx - offset 0x06b2a ***/
+  /*** Four byte table, leaf: 8136eaxx - offset 0x06b9e ***/
 
   /* 30 */  0xe28c9a, 0xe28c9b, 0xe28c9c, 0xe28c9d,
   /* 34 */  0xe28c9e, 0xe28c9f, 0xe28ca0, 0xe28ca1,
   /* 38 */  0xe28ca2, 0xe28ca3,
 
-  /*** Four byte table, leaf: 8136ebxx - offset 0x06b34 ***/
+  /*** Four byte table, leaf: 8136ebxx - offset 0x06ba8 ***/
 
   /* 30 */  0xe28ca4, 0xe28ca5, 0xe28ca6, 0xe28ca7,
   /* 34 */  0xe28ca8, 0xe28ca9, 0xe28caa, 0xe28cab,
   /* 38 */  0xe28cac, 0xe28cad,
 
-  /*** Four byte table, leaf: 8136ecxx - offset 0x06b3e ***/
+  /*** Four byte table, leaf: 8136ecxx - offset 0x06bb2 ***/
 
   /* 30 */  0xe28cae, 0xe28caf, 0xe28cb0, 0xe28cb1,
   /* 34 */  0xe28cb2, 0xe28cb3, 0xe28cb4, 0xe28cb5,
   /* 38 */  0xe28cb6, 0xe28cb7,
 
-  /*** Four byte table, leaf: 8136edxx - offset 0x06b48 ***/
+  /*** Four byte table, leaf: 8136edxx - offset 0x06bbc ***/
 
   /* 30 */  0xe28cb8, 0xe28cb9, 0xe28cba, 0xe28cbb,
   /* 34 */  0xe28cbc, 0xe28cbd, 0xe28cbe, 0xe28cbf,
   /* 38 */  0xe28d80, 0xe28d81,
 
-  /*** Four byte table, leaf: 8136eexx - offset 0x06b52 ***/
+  /*** Four byte table, leaf: 8136eexx - offset 0x06bc6 ***/
 
   /* 30 */  0xe28d82, 0xe28d83, 0xe28d84, 0xe28d85,
   /* 34 */  0xe28d86, 0xe28d87, 0xe28d88, 0xe28d89,
   /* 38 */  0xe28d8a, 0xe28d8b,
 
-  /*** Four byte table, leaf: 8136efxx - offset 0x06b5c ***/
+  /*** Four byte table, leaf: 8136efxx - offset 0x06bd0 ***/
 
   /* 30 */  0xe28d8c, 0xe28d8d, 0xe28d8e, 0xe28d8f,
   /* 34 */  0xe28d90, 0xe28d91, 0xe28d92, 0xe28d93,
   /* 38 */  0xe28d94, 0xe28d95,
 
-  /*** Four byte table, leaf: 8136f0xx - offset 0x06b66 ***/
+  /*** Four byte table, leaf: 8136f0xx - offset 0x06bda ***/
 
   /* 30 */  0xe28d96, 0xe28d97, 0xe28d98, 0xe28d99,
   /* 34 */  0xe28d9a, 0xe28d9b, 0xe28d9c, 0xe28d9d,
   /* 38 */  0xe28d9e, 0xe28d9f,
 
-  /*** Four byte table, leaf: 8136f1xx - offset 0x06b70 ***/
+  /*** Four byte table, leaf: 8136f1xx - offset 0x06be4 ***/
 
   /* 30 */  0xe28da0, 0xe28da1, 0xe28da2, 0xe28da3,
   /* 34 */  0xe28da4, 0xe28da5, 0xe28da6, 0xe28da7,
   /* 38 */  0xe28da8, 0xe28da9,
 
-  /*** Four byte table, leaf: 8136f2xx - offset 0x06b7a ***/
+  /*** Four byte table, leaf: 8136f2xx - offset 0x06bee ***/
 
   /* 30 */  0xe28daa, 0xe28dab, 0xe28dac, 0xe28dad,
   /* 34 */  0xe28dae, 0xe28daf, 0xe28db0, 0xe28db1,
   /* 38 */  0xe28db2, 0xe28db3,
 
-  /*** Four byte table, leaf: 8136f3xx - offset 0x06b84 ***/
+  /*** Four byte table, leaf: 8136f3xx - offset 0x06bf8 ***/
 
   /* 30 */  0xe28db4, 0xe28db5, 0xe28db6, 0xe28db7,
   /* 34 */  0xe28db8, 0xe28db9, 0xe28dba, 0xe28dbb,
   /* 38 */  0xe28dbc, 0xe28dbd,
 
-  /*** Four byte table, leaf: 8136f4xx - offset 0x06b8e ***/
+  /*** Four byte table, leaf: 8136f4xx - offset 0x06c02 ***/
 
   /* 30 */  0xe28dbe, 0xe28dbf, 0xe28e80, 0xe28e81,
   /* 34 */  0xe28e82, 0xe28e83, 0xe28e84, 0xe28e85,
   /* 38 */  0xe28e86, 0xe28e87,
 
-  /*** Four byte table, leaf: 8136f5xx - offset 0x06b98 ***/
+  /*** Four byte table, leaf: 8136f5xx - offset 0x06c0c ***/
 
   /* 30 */  0xe28e88, 0xe28e89, 0xe28e8a, 0xe28e8b,
   /* 34 */  0xe28e8c, 0xe28e8d, 0xe28e8e, 0xe28e8f,
   /* 38 */  0xe28e90, 0xe28e91,
 
-  /*** Four byte table, leaf: 8136f6xx - offset 0x06ba2 ***/
+  /*** Four byte table, leaf: 8136f6xx - offset 0x06c16 ***/
 
   /* 30 */  0xe28e92, 0xe28e93, 0xe28e94, 0xe28e95,
   /* 34 */  0xe28e96, 0xe28e97, 0xe28e98, 0xe28e99,
   /* 38 */  0xe28e9a, 0xe28e9b,
 
-  /*** Four byte table, leaf: 8136f7xx - offset 0x06bac ***/
+  /*** Four byte table, leaf: 8136f7xx - offset 0x06c20 ***/
 
   /* 30 */  0xe28e9c, 0xe28e9d, 0xe28e9e, 0xe28e9f,
   /* 34 */  0xe28ea0, 0xe28ea1, 0xe28ea2, 0xe28ea3,
   /* 38 */  0xe28ea4, 0xe28ea5,
 
-  /*** Four byte table, leaf: 8136f8xx - offset 0x06bb6 ***/
+  /*** Four byte table, leaf: 8136f8xx - offset 0x06c2a ***/
 
   /* 30 */  0xe28ea6, 0xe28ea7, 0xe28ea8, 0xe28ea9,
   /* 34 */  0xe28eaa, 0xe28eab, 0xe28eac, 0xe28ead,
   /* 38 */  0xe28eae, 0xe28eaf,
 
-  /*** Four byte table, leaf: 8136f9xx - offset 0x06bc0 ***/
+  /*** Four byte table, leaf: 8136f9xx - offset 0x06c34 ***/
 
   /* 30 */  0xe28eb0, 0xe28eb1, 0xe28eb2, 0xe28eb3,
   /* 34 */  0xe28eb4, 0xe28eb5, 0xe28eb6, 0xe28eb7,
   /* 38 */  0xe28eb8, 0xe28eb9,
 
-  /*** Four byte table, leaf: 8136faxx - offset 0x06bca ***/
+  /*** Four byte table, leaf: 8136faxx - offset 0x06c3e ***/
 
   /* 30 */  0xe28eba, 0xe28ebb, 0xe28ebc, 0xe28ebd,
   /* 34 */  0xe28ebe, 0xe28ebf, 0xe28f80, 0xe28f81,
   /* 38 */  0xe28f82, 0xe28f83,
 
-  /*** Four byte table, leaf: 8136fbxx - offset 0x06bd4 ***/
+  /*** Four byte table, leaf: 8136fbxx - offset 0x06c48 ***/
 
   /* 30 */  0xe28f84, 0xe28f85, 0xe28f86, 0xe28f87,
   /* 34 */  0xe28f88, 0xe28f89, 0xe28f8a, 0xe28f8b,
   /* 38 */  0xe28f8c, 0xe28f8d,
 
-  /*** Four byte table, leaf: 8136fcxx - offset 0x06bde ***/
+  /*** Four byte table, leaf: 8136fcxx - offset 0x06c52 ***/
 
   /* 30 */  0xe28f8e, 0xe28f8f, 0xe28f90, 0xe28f91,
   /* 34 */  0xe28f92, 0xe28f93, 0xe28f94, 0xe28f95,
   /* 38 */  0xe28f96, 0xe28f97,
 
-  /*** Four byte table, leaf: 8136fdxx - offset 0x06be8 ***/
+  /*** Four byte table, leaf: 8136fdxx - offset 0x06c5c ***/
 
   /* 30 */  0xe28f98, 0xe28f99, 0xe28f9a, 0xe28f9b,
   /* 34 */  0xe28f9c, 0xe28f9d, 0xe28f9e, 0xe28f9f,
   /* 38 */  0xe28fa0, 0xe28fa1,
 
-  /*** Four byte table, leaf: 8136fexx - offset 0x06bf2 ***/
+  /*** Four byte table, leaf: 8136fexx - offset 0x06c66 ***/
 
   /* 30 */  0xe28fa2, 0xe28fa3, 0xe28fa4, 0xe28fa5,
   /* 34 */  0xe28fa6, 0xe28fa7, 0xe28fa8, 0xe28fa9,
   /* 38 */  0xe28faa, 0xe28fab,
 
-  /*** Four byte table, leaf: 813781xx - offset 0x06bfc ***/
+  /*** Four byte table, leaf: 813781xx - offset 0x06c70 ***/
 
   /* 30 */  0xe28fac, 0xe28fad, 0xe28fae, 0xe28faf,
   /* 34 */  0xe28fb0, 0xe28fb1, 0xe28fb2, 0xe28fb3,
   /* 38 */  0xe28fb4, 0xe28fb5,
 
-  /*** Four byte table, leaf: 813782xx - offset 0x06c06 ***/
+  /*** Four byte table, leaf: 813782xx - offset 0x06c7a ***/
 
   /* 30 */  0xe28fb6, 0xe28fb7, 0xe28fb8, 0xe28fb9,
   /* 34 */  0xe28fba, 0xe28fbb, 0xe28fbc, 0xe28fbd,
   /* 38 */  0xe28fbe, 0xe28fbf,
 
-  /*** Four byte table, leaf: 813783xx - offset 0x06c10 ***/
+  /*** Four byte table, leaf: 813783xx - offset 0x06c84 ***/
 
   /* 30 */  0xe29080, 0xe29081, 0xe29082, 0xe29083,
   /* 34 */  0xe29084, 0xe29085, 0xe29086, 0xe29087,
   /* 38 */  0xe29088, 0xe29089,
 
-  /*** Four byte table, leaf: 813784xx - offset 0x06c1a ***/
+  /*** Four byte table, leaf: 813784xx - offset 0x06c8e ***/
 
   /* 30 */  0xe2908a, 0xe2908b, 0xe2908c, 0xe2908d,
   /* 34 */  0xe2908e, 0xe2908f, 0xe29090, 0xe29091,
   /* 38 */  0xe29092, 0xe29093,
 
-  /*** Four byte table, leaf: 813785xx - offset 0x06c24 ***/
+  /*** Four byte table, leaf: 813785xx - offset 0x06c98 ***/
 
   /* 30 */  0xe29094, 0xe29095, 0xe29096, 0xe29097,
   /* 34 */  0xe29098, 0xe29099, 0xe2909a, 0xe2909b,
   /* 38 */  0xe2909c, 0xe2909d,
 
-  /*** Four byte table, leaf: 813786xx - offset 0x06c2e ***/
+  /*** Four byte table, leaf: 813786xx - offset 0x06ca2 ***/
 
   /* 30 */  0xe2909e, 0xe2909f, 0xe290a0, 0xe290a1,
   /* 34 */  0xe290a2, 0xe290a3, 0xe290a4, 0xe290a5,
   /* 38 */  0xe290a6, 0xe290a7,
 
-  /*** Four byte table, leaf: 813787xx - offset 0x06c38 ***/
+  /*** Four byte table, leaf: 813787xx - offset 0x06cac ***/
 
   /* 30 */  0xe290a8, 0xe290a9, 0xe290aa, 0xe290ab,
   /* 34 */  0xe290ac, 0xe290ad, 0xe290ae, 0xe290af,
   /* 38 */  0xe290b0, 0xe290b1,
 
-  /*** Four byte table, leaf: 813788xx - offset 0x06c42 ***/
+  /*** Four byte table, leaf: 813788xx - offset 0x06cb6 ***/
 
   /* 30 */  0xe290b2, 0xe290b3, 0xe290b4, 0xe290b5,
   /* 34 */  0xe290b6, 0xe290b7, 0xe290b8, 0xe290b9,
   /* 38 */  0xe290ba, 0xe290bb,
 
-  /*** Four byte table, leaf: 813789xx - offset 0x06c4c ***/
+  /*** Four byte table, leaf: 813789xx - offset 0x06cc0 ***/
 
   /* 30 */  0xe290bc, 0xe290bd, 0xe290be, 0xe290bf,
   /* 34 */  0xe29180, 0xe29181, 0xe29182, 0xe29183,
   /* 38 */  0xe29184, 0xe29185,
 
-  /*** Four byte table, leaf: 81378axx - offset 0x06c56 ***/
+  /*** Four byte table, leaf: 81378axx - offset 0x06cca ***/
 
   /* 30 */  0xe29186, 0xe29187, 0xe29188, 0xe29189,
   /* 34 */  0xe2918a, 0xe2918b, 0xe2918c, 0xe2918d,
   /* 38 */  0xe2918e, 0xe2918f,
 
-  /*** Four byte table, leaf: 81378bxx - offset 0x06c60 ***/
+  /*** Four byte table, leaf: 81378bxx - offset 0x06cd4 ***/
 
   /* 30 */  0xe29190, 0xe29191, 0xe29192, 0xe29193,
   /* 34 */  0xe29194, 0xe29195, 0xe29196, 0xe29197,
   /* 38 */  0xe29198, 0xe29199,
 
-  /*** Four byte table, leaf: 81378cxx - offset 0x06c6a ***/
+  /*** Four byte table, leaf: 81378cxx - offset 0x06cde ***/
 
   /* 30 */  0xe2919a, 0xe2919b, 0xe2919c, 0xe2919d,
   /* 34 */  0xe2919e, 0xe2919f, 0xe291aa, 0xe291ab,
   /* 38 */  0xe291ac, 0xe291ad,
 
-  /*** Four byte table, leaf: 81378dxx - offset 0x06c74 ***/
+  /*** Four byte table, leaf: 81378dxx - offset 0x06ce8 ***/
 
   /* 30 */  0xe291ae, 0xe291af, 0xe291b0, 0xe291b1,
   /* 34 */  0xe291b2, 0xe291b3, 0xe2929c, 0xe2929d,
   /* 38 */  0xe2929e, 0xe2929f,
 
-  /*** Four byte table, leaf: 81378exx - offset 0x06c7e ***/
+  /*** Four byte table, leaf: 81378exx - offset 0x06cf2 ***/
 
   /* 30 */  0xe292a0, 0xe292a1, 0xe292a2, 0xe292a3,
   /* 34 */  0xe292a4, 0xe292a5, 0xe292a6, 0xe292a7,
   /* 38 */  0xe292a8, 0xe292a9,
 
-  /*** Four byte table, leaf: 81378fxx - offset 0x06c88 ***/
+  /*** Four byte table, leaf: 81378fxx - offset 0x06cfc ***/
 
   /* 30 */  0xe292aa, 0xe292ab, 0xe292ac, 0xe292ad,
   /* 34 */  0xe292ae, 0xe292af, 0xe292b0, 0xe292b1,
   /* 38 */  0xe292b2, 0xe292b3,
 
-  /*** Four byte table, leaf: 813790xx - offset 0x06c92 ***/
+  /*** Four byte table, leaf: 813790xx - offset 0x06d06 ***/
 
   /* 30 */  0xe292b4, 0xe292b5, 0xe292b6, 0xe292b7,
   /* 34 */  0xe292b8, 0xe292b9, 0xe292ba, 0xe292bb,
   /* 38 */  0xe292bc, 0xe292bd,
 
-  /*** Four byte table, leaf: 813791xx - offset 0x06c9c ***/
+  /*** Four byte table, leaf: 813791xx - offset 0x06d10 ***/
 
   /* 30 */  0xe292be, 0xe292bf, 0xe29380, 0xe29381,
   /* 34 */  0xe29382, 0xe29383, 0xe29384, 0xe29385,
   /* 38 */  0xe29386, 0xe29387,
 
-  /*** Four byte table, leaf: 813792xx - offset 0x06ca6 ***/
+  /*** Four byte table, leaf: 813792xx - offset 0x06d1a ***/
 
   /* 30 */  0xe29388, 0xe29389, 0xe2938a, 0xe2938b,
   /* 34 */  0xe2938c, 0xe2938d, 0xe2938e, 0xe2938f,
   /* 38 */  0xe29390, 0xe29391,
 
-  /*** Four byte table, leaf: 813793xx - offset 0x06cb0 ***/
+  /*** Four byte table, leaf: 813793xx - offset 0x06d24 ***/
 
   /* 30 */  0xe29392, 0xe29393, 0xe29394, 0xe29395,
   /* 34 */  0xe29396, 0xe29397, 0xe29398, 0xe29399,
   /* 38 */  0xe2939a, 0xe2939b,
 
-  /*** Four byte table, leaf: 813794xx - offset 0x06cba ***/
+  /*** Four byte table, leaf: 813794xx - offset 0x06d2e ***/
 
   /* 30 */  0xe2939c, 0xe2939d, 0xe2939e, 0xe2939f,
   /* 34 */  0xe293a0, 0xe293a1, 0xe293a2, 0xe293a3,
   /* 38 */  0xe293a4, 0xe293a5,
 
-  /*** Four byte table, leaf: 813795xx - offset 0x06cc4 ***/
+  /*** Four byte table, leaf: 813795xx - offset 0x06d38 ***/
 
   /* 30 */  0xe293a6, 0xe293a7, 0xe293a8, 0xe293a9,
   /* 34 */  0xe293aa, 0xe293ab, 0xe293ac, 0xe293ad,
   /* 38 */  0xe293ae, 0xe293af,
 
-  /*** Four byte table, leaf: 813796xx - offset 0x06cce ***/
+  /*** Four byte table, leaf: 813796xx - offset 0x06d42 ***/
 
   /* 30 */  0xe293b0, 0xe293b1, 0xe293b2, 0xe293b3,
   /* 34 */  0xe293b4, 0xe293b5, 0xe293b6, 0xe293b7,
   /* 38 */  0xe293b8, 0xe293b9,
 
-  /*** Four byte table, leaf: 813797xx - offset 0x06cd8 ***/
+  /*** Four byte table, leaf: 813797xx - offset 0x06d4c ***/
 
   /* 30 */  0xe293ba, 0xe293bb, 0xe293bc, 0xe293bd,
   /* 34 */  0xe293be, 0xe293bf, 0xe2958c, 0xe2958d,
   /* 38 */  0xe2958e, 0xe2958f,
 
-  /*** Four byte table, leaf: 813798xx - offset 0x06ce2 ***/
+  /*** Four byte table, leaf: 813798xx - offset 0x06d56 ***/
 
   /* 30 */  0xe295b4, 0xe295b5, 0xe295b6, 0xe295b7,
   /* 34 */  0xe295b8, 0xe295b9, 0xe295ba, 0xe295bb,
   /* 38 */  0xe295bc, 0xe295bd,
 
-  /*** Four byte table, leaf: 813799xx - offset 0x06cec ***/
+  /*** Four byte table, leaf: 813799xx - offset 0x06d60 ***/
 
   /* 30 */  0xe295be, 0xe295bf, 0xe29680, 0xe29690,
   /* 34 */  0xe29691, 0xe29692, 0xe29696, 0xe29697,
   /* 38 */  0xe29698, 0xe29699,
 
-  /*** Four byte table, leaf: 81379axx - offset 0x06cf6 ***/
+  /*** Four byte table, leaf: 81379axx - offset 0x06d6a ***/
 
   /* 30 */  0xe2969a, 0xe2969b, 0xe2969c, 0xe2969d,
   /* 34 */  0xe2969e, 0xe2969f, 0xe296a2, 0xe296a3,
   /* 38 */  0xe296a4, 0xe296a5,
 
-  /*** Four byte table, leaf: 81379bxx - offset 0x06d00 ***/
+  /*** Four byte table, leaf: 81379bxx - offset 0x06d74 ***/
 
   /* 30 */  0xe296a6, 0xe296a7, 0xe296a8, 0xe296a9,
   /* 34 */  0xe296aa, 0xe296ab, 0xe296ac, 0xe296ad,
   /* 38 */  0xe296ae, 0xe296af,
 
-  /*** Four byte table, leaf: 81379cxx - offset 0x06d0a ***/
+  /*** Four byte table, leaf: 81379cxx - offset 0x06d7e ***/
 
   /* 30 */  0xe296b0, 0xe296b1, 0xe296b4, 0xe296b5,
   /* 34 */  0xe296b6, 0xe296b7, 0xe296b8, 0xe296b9,
   /* 38 */  0xe296ba, 0xe296bb,
 
-  /*** Four byte table, leaf: 81379dxx - offset 0x06d14 ***/
+  /*** Four byte table, leaf: 81379dxx - offset 0x06d88 ***/
 
   /* 30 */  0xe296be, 0xe296bf, 0xe29780, 0xe29781,
   /* 34 */  0xe29782, 0xe29783, 0xe29784, 0xe29785,
   /* 38 */  0xe29788, 0xe29789,
 
-  /*** Four byte table, leaf: 81379exx - offset 0x06d1e ***/
+  /*** Four byte table, leaf: 81379exx - offset 0x06d92 ***/
 
   /* 30 */  0xe2978a, 0xe2978c, 0xe2978d, 0xe29790,
   /* 34 */  0xe29791, 0xe29792, 0xe29793, 0xe29794,
   /* 38 */  0xe29795, 0xe29796,
 
-  /*** Four byte table, leaf: 81379fxx - offset 0x06d28 ***/
+  /*** Four byte table, leaf: 81379fxx - offset 0x06d9c ***/
 
   /* 30 */  0xe29797, 0xe29798, 0xe29799, 0xe2979a,
   /* 34 */  0xe2979b, 0xe2979c, 0xe2979d, 0xe2979e,
   /* 38 */  0xe2979f, 0xe297a0,
 
-  /*** Four byte table, leaf: 8137a0xx - offset 0x06d32 ***/
+  /*** Four byte table, leaf: 8137a0xx - offset 0x06da6 ***/
 
   /* 30 */  0xe297a1, 0xe297a6, 0xe297a7, 0xe297a8,
   /* 34 */  0xe297a9, 0xe297aa, 0xe297ab, 0xe297ac,
   /* 38 */  0xe297ad, 0xe297ae,
 
-  /*** Four byte table, leaf: 8137a1xx - offset 0x06d3c ***/
+  /*** Four byte table, leaf: 8137a1xx - offset 0x06db0 ***/
 
   /* 30 */  0xe297af, 0xe297b0, 0xe297b1, 0xe297b2,
   /* 34 */  0xe297b3, 0xe297b4, 0xe297b5, 0xe297b6,
   /* 38 */  0xe297b7, 0xe297b8,
 
-  /*** Four byte table, leaf: 8137a2xx - offset 0x06d46 ***/
+  /*** Four byte table, leaf: 8137a2xx - offset 0x06dba ***/
 
   /* 30 */  0xe297b9, 0xe297ba, 0xe297bb, 0xe297bc,
   /* 34 */  0xe297bd, 0xe297be, 0xe297bf, 0xe29880,
   /* 38 */  0xe29881, 0xe29882,
 
-  /*** Four byte table, leaf: 8137a3xx - offset 0x06d50 ***/
+  /*** Four byte table, leaf: 8137a3xx - offset 0x06dc4 ***/
 
   /* 30 */  0xe29883, 0xe29884, 0xe29887, 0xe29888,
   /* 34 */  0xe2988a, 0xe2988b, 0xe2988c, 0xe2988d,
   /* 38 */  0xe2988e, 0xe2988f,
 
-  /*** Four byte table, leaf: 8137a4xx - offset 0x06d5a ***/
+  /*** Four byte table, leaf: 8137a4xx - offset 0x06dce ***/
 
   /* 30 */  0xe29890, 0xe29891, 0xe29892, 0xe29893,
   /* 34 */  0xe29894, 0xe29895, 0xe29896, 0xe29897,
   /* 38 */  0xe29898, 0xe29899,
 
-  /*** Four byte table, leaf: 8137a5xx - offset 0x06d64 ***/
+  /*** Four byte table, leaf: 8137a5xx - offset 0x06dd8 ***/
 
   /* 30 */  0xe2989a, 0xe2989b, 0xe2989c, 0xe2989d,
   /* 34 */  0xe2989e, 0xe2989f, 0xe298a0, 0xe298a1,
   /* 38 */  0xe298a2, 0xe298a3,
 
-  /*** Four byte table, leaf: 8137a6xx - offset 0x06d6e ***/
+  /*** Four byte table, leaf: 8137a6xx - offset 0x06de2 ***/
 
   /* 30 */  0xe298a4, 0xe298a5, 0xe298a6, 0xe298a7,
   /* 34 */  0xe298a8, 0xe298a9, 0xe298aa, 0xe298ab,
   /* 38 */  0xe298ac, 0xe298ad,
 
-  /*** Four byte table, leaf: 8137a7xx - offset 0x06d78 ***/
+  /*** Four byte table, leaf: 8137a7xx - offset 0x06dec ***/
 
   /* 30 */  0xe298ae, 0xe298af, 0xe298b0, 0xe298b1,
   /* 34 */  0xe298b2, 0xe298b3, 0xe298b4, 0xe298b5,
   /* 38 */  0xe298b6, 0xe298b7,
 
-  /*** Four byte table, leaf: 8137a8xx - offset 0x06d82 ***/
+  /*** Four byte table, leaf: 8137a8xx - offset 0x06df6 ***/
 
   /* 30 */  0xe298b8, 0xe298b9, 0xe298ba, 0xe298bb,
   /* 34 */  0xe298bc, 0xe298bd, 0xe298be, 0xe298bf,
   /* 38 */  0xe29981,
     /* 1 trailing zero values shared with next segment */
 
-  /*** Four byte table, leaf: 8138fdxx - offset 0x06d8b ***/
+  /*** Four byte table, leaf: 8138fdxx - offset 0x06dff ***/
 
   /* 30 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 34 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 38 */  0x000000, 0xe2ba82,
 
-  /*** Four byte table, leaf: 8138fexx - offset 0x06d95 ***/
+  /*** Four byte table, leaf: 8138fexx - offset 0x06e09 ***/
 
   /* 30 */  0xe2ba83, 0xe2ba85, 0xe2ba86, 0xe2ba87,
   /* 34 */  0xe2ba89, 0xe2ba8a, 0xe2ba8d, 0xe2ba8e,
   /* 38 */  0xe2ba8f, 0xe2ba90,
 
-  /*** Four byte table, leaf: 813981xx - offset 0x06d9f ***/
+  /*** Four byte table, leaf: 813981xx - offset 0x06e13 ***/
 
   /* 30 */  0xe2ba91, 0xe2ba92, 0xe2ba93, 0xe2ba94,
   /* 34 */  0xe2ba95, 0xe2ba96, 0xe2ba98, 0xe2ba99,
   /* 38 */  0xe2ba9a, 0xe2ba9b,
 
-  /*** Four byte table, leaf: 813982xx - offset 0x06da9 ***/
+  /*** Four byte table, leaf: 813982xx - offset 0x06e1d ***/
 
   /* 30 */  0xe2ba9c, 0xe2ba9d, 0xe2ba9e, 0xe2ba9f,
   /* 34 */  0xe2baa0, 0xe2baa1, 0xe2baa2, 0xe2baa3,
   /* 38 */  0xe2baa4, 0xe2baa5,
 
-  /*** Four byte table, leaf: 813983xx - offset 0x06db3 ***/
+  /*** Four byte table, leaf: 813983xx - offset 0x06e27 ***/
 
   /* 30 */  0xe2baa6, 0xe2baa8, 0xe2baa9, 0xe2baab,
   /* 34 */  0xe2baac, 0xe2baad, 0xe2baaf, 0xe2bab0,
   /* 38 */  0xe2bab1, 0xe2bab2,
 
-  /*** Four byte table, leaf: 813984xx - offset 0x06dbd ***/
+  /*** Four byte table, leaf: 813984xx - offset 0x06e31 ***/
 
   /* 30 */  0xe2bab4, 0xe2bab5, 0xe2bab8, 0xe2bab9,
   /* 34 */  0xe2baba, 0xe2babc, 0xe2babd, 0xe2babe,
   /* 38 */  0xe2babf, 0xe2bb80,
 
-  /*** Four byte table, leaf: 813985xx - offset 0x06dc7 ***/
+  /*** Four byte table, leaf: 813985xx - offset 0x06e3b ***/
 
   /* 30 */  0xe2bb81, 0xe2bb82, 0xe2bb83, 0xe2bb84,
   /* 34 */  0xe2bb85, 0xe2bb86, 0xe2bb87, 0xe2bb88,
   /* 38 */  0xe2bb89, 0xe2bb8b,
 
-  /*** Four byte table, leaf: 813986xx - offset 0x06dd1 ***/
+  /*** Four byte table, leaf: 813986xx - offset 0x06e45 ***/
 
   /* 30 */  0xe2bb8c, 0xe2bb8d, 0xe2bb8e, 0xe2bb8f,
   /* 34 */  0xe2bb90, 0xe2bb91, 0xe2bb92, 0xe2bb93,
   /* 38 */  0xe2bb94, 0xe2bb95,
 
-  /*** Four byte table, leaf: 813987xx - offset 0x06ddb ***/
+  /*** Four byte table, leaf: 813987xx - offset 0x06e4f ***/
 
   /* 30 */  0xe2bb96, 0xe2bb97, 0xe2bb98, 0xe2bb99,
   /* 34 */  0xe2bb9a, 0xe2bb9b, 0xe2bb9c, 0xe2bb9d,
   /* 38 */  0xe2bb9e, 0xe2bb9f,
 
-  /*** Four byte table, leaf: 813988xx - offset 0x06de5 ***/
+  /*** Four byte table, leaf: 813988xx - offset 0x06e59 ***/
 
   /* 30 */  0xe2bba0, 0xe2bba1, 0xe2bba2, 0xe2bba3,
   /* 34 */  0xe2bba4, 0xe2bba5, 0xe2bba6, 0xe2bba7,
   /* 38 */  0xe2bba8, 0xe2bba9,
 
-  /*** Four byte table, leaf: 813989xx - offset 0x06def ***/
+  /*** Four byte table, leaf: 813989xx - offset 0x06e63 ***/
 
   /* 30 */  0xe2bbaa, 0xe2bbab, 0xe2bbac, 0xe2bbad,
   /* 34 */  0xe2bbae, 0xe2bbaf, 0xe2bbb0, 0xe2bbb1,
   /* 38 */  0xe2bbb2, 0xe2bbb3,
 
-  /*** Four byte table, leaf: 81398axx - offset 0x06df9 ***/
+  /*** Four byte table, leaf: 81398axx - offset 0x06e6d ***/
 
   /* 30 */  0xe2bbb4, 0xe2bbb5, 0xe2bbb6, 0xe2bbb7,
   /* 34 */  0xe2bbb8, 0xe2bbb9, 0xe2bbba, 0xe2bbbb,
   /* 38 */  0xe2bbbc, 0xe2bbbd,
 
-  /*** Four byte table, leaf: 81398bxx - offset 0x06e03 ***/
+  /*** Four byte table, leaf: 81398bxx - offset 0x06e77 ***/
 
   /* 30 */  0xe2bbbe, 0xe2bbbf, 0xe2bc80, 0xe2bc81,
   /* 34 */  0xe2bc82, 0xe2bc83, 0xe2bc84, 0xe2bc85,
   /* 38 */  0xe2bc86, 0xe2bc87,
 
-  /*** Four byte table, leaf: 81398cxx - offset 0x06e0d ***/
+  /*** Four byte table, leaf: 81398cxx - offset 0x06e81 ***/
 
   /* 30 */  0xe2bc88, 0xe2bc89, 0xe2bc8a, 0xe2bc8b,
   /* 34 */  0xe2bc8c, 0xe2bc8d, 0xe2bc8e, 0xe2bc8f,
   /* 38 */  0xe2bc90, 0xe2bc91,
 
-  /*** Four byte table, leaf: 81398dxx - offset 0x06e17 ***/
+  /*** Four byte table, leaf: 81398dxx - offset 0x06e8b ***/
 
   /* 30 */  0xe2bc92, 0xe2bc93, 0xe2bc94, 0xe2bc95,
   /* 34 */  0xe2bc96, 0xe2bc97, 0xe2bc98, 0xe2bc99,
   /* 38 */  0xe2bc9a, 0xe2bc9b,
 
-  /*** Four byte table, leaf: 81398exx - offset 0x06e21 ***/
+  /*** Four byte table, leaf: 81398exx - offset 0x06e95 ***/
 
   /* 30 */  0xe2bc9c, 0xe2bc9d, 0xe2bc9e, 0xe2bc9f,
   /* 34 */  0xe2bca0, 0xe2bca1, 0xe2bca2, 0xe2bca3,
   /* 38 */  0xe2bca4, 0xe2bca5,
 
-  /*** Four byte table, leaf: 81398fxx - offset 0x06e2b ***/
+  /*** Four byte table, leaf: 81398fxx - offset 0x06e9f ***/
 
   /* 30 */  0xe2bca6, 0xe2bca7, 0xe2bca8, 0xe2bca9,
   /* 34 */  0xe2bcaa, 0xe2bcab, 0xe2bcac, 0xe2bcad,
   /* 38 */  0xe2bcae, 0xe2bcaf,
 
-  /*** Four byte table, leaf: 813990xx - offset 0x06e35 ***/
+  /*** Four byte table, leaf: 813990xx - offset 0x06ea9 ***/
 
   /* 30 */  0xe2bcb0, 0xe2bcb1, 0xe2bcb2, 0xe2bcb3,
   /* 34 */  0xe2bcb4, 0xe2bcb5, 0xe2bcb6, 0xe2bcb7,
   /* 38 */  0xe2bcb8, 0xe2bcb9,
 
-  /*** Four byte table, leaf: 813991xx - offset 0x06e3f ***/
+  /*** Four byte table, leaf: 813991xx - offset 0x06eb3 ***/
 
   /* 30 */  0xe2bcba, 0xe2bcbb, 0xe2bcbc, 0xe2bcbd,
   /* 34 */  0xe2bcbe, 0xe2bcbf, 0xe2bd80, 0xe2bd81,
   /* 38 */  0xe2bd82, 0xe2bd83,
 
-  /*** Four byte table, leaf: 813992xx - offset 0x06e49 ***/
+  /*** Four byte table, leaf: 813992xx - offset 0x06ebd ***/
 
   /* 30 */  0xe2bd84, 0xe2bd85, 0xe2bd86, 0xe2bd87,
   /* 34 */  0xe2bd88, 0xe2bd89, 0xe2bd8a, 0xe2bd8b,
   /* 38 */  0xe2bd8c, 0xe2bd8d,
 
-  /*** Four byte table, leaf: 813993xx - offset 0x06e53 ***/
+  /*** Four byte table, leaf: 813993xx - offset 0x06ec7 ***/
 
   /* 30 */  0xe2bd8e, 0xe2bd8f, 0xe2bd90, 0xe2bd91,
   /* 34 */  0xe2bd92, 0xe2bd93, 0xe2bd94, 0xe2bd95,
   /* 38 */  0xe2bd96, 0xe2bd97,
 
-  /*** Four byte table, leaf: 813994xx - offset 0x06e5d ***/
+  /*** Four byte table, leaf: 813994xx - offset 0x06ed1 ***/
 
   /* 30 */  0xe2bd98, 0xe2bd99, 0xe2bd9a, 0xe2bd9b,
   /* 34 */  0xe2bd9c, 0xe2bd9d, 0xe2bd9e, 0xe2bd9f,
   /* 38 */  0xe2bda0, 0xe2bda1,
 
-  /*** Four byte table, leaf: 813995xx - offset 0x06e67 ***/
+  /*** Four byte table, leaf: 813995xx - offset 0x06edb ***/
 
   /* 30 */  0xe2bda2, 0xe2bda3, 0xe2bda4, 0xe2bda5,
   /* 34 */  0xe2bda6, 0xe2bda7, 0xe2bda8, 0xe2bda9,
   /* 38 */  0xe2bdaa, 0xe2bdab,
 
-  /*** Four byte table, leaf: 813996xx - offset 0x06e71 ***/
+  /*** Four byte table, leaf: 813996xx - offset 0x06ee5 ***/
 
   /* 30 */  0xe2bdac, 0xe2bdad, 0xe2bdae, 0xe2bdaf,
   /* 34 */  0xe2bdb0, 0xe2bdb1, 0xe2bdb2, 0xe2bdb3,
   /* 38 */  0xe2bdb4, 0xe2bdb5,
 
-  /*** Four byte table, leaf: 813997xx - offset 0x06e7b ***/
+  /*** Four byte table, leaf: 813997xx - offset 0x06eef ***/
 
   /* 30 */  0xe2bdb6, 0xe2bdb7, 0xe2bdb8, 0xe2bdb9,
   /* 34 */  0xe2bdba, 0xe2bdbb, 0xe2bdbc, 0xe2bdbd,
   /* 38 */  0xe2bdbe, 0xe2bdbf,
 
-  /*** Four byte table, leaf: 813998xx - offset 0x06e85 ***/
+  /*** Four byte table, leaf: 813998xx - offset 0x06ef9 ***/
 
   /* 30 */  0xe2be80, 0xe2be81, 0xe2be82, 0xe2be83,
   /* 34 */  0xe2be84, 0xe2be85, 0xe2be86, 0xe2be87,
   /* 38 */  0xe2be88, 0xe2be89,
 
-  /*** Four byte table, leaf: 813999xx - offset 0x06e8f ***/
+  /*** Four byte table, leaf: 813999xx - offset 0x06f03 ***/
 
   /* 30 */  0xe2be8a, 0xe2be8b, 0xe2be8c, 0xe2be8d,
   /* 34 */  0xe2be8e, 0xe2be8f, 0xe2be90, 0xe2be91,
   /* 38 */  0xe2be92, 0xe2be93,
 
-  /*** Four byte table, leaf: 81399axx - offset 0x06e99 ***/
+  /*** Four byte table, leaf: 81399axx - offset 0x06f0d ***/
 
   /* 30 */  0xe2be94, 0xe2be95, 0xe2be96, 0xe2be97,
   /* 34 */  0xe2be98, 0xe2be99, 0xe2be9a, 0xe2be9b,
   /* 38 */  0xe2be9c, 0xe2be9d,
 
-  /*** Four byte table, leaf: 81399bxx - offset 0x06ea3 ***/
+  /*** Four byte table, leaf: 81399bxx - offset 0x06f17 ***/
 
   /* 30 */  0xe2be9e, 0xe2be9f, 0xe2bea0, 0xe2bea1,
   /* 34 */  0xe2bea2, 0xe2bea3, 0xe2bea4, 0xe2bea5,
   /* 38 */  0xe2bea6, 0xe2bea7,
 
-  /*** Four byte table, leaf: 81399cxx - offset 0x06ead ***/
+  /*** Four byte table, leaf: 81399cxx - offset 0x06f21 ***/
 
   /* 30 */  0xe2bea8, 0xe2bea9, 0xe2beaa, 0xe2beab,
   /* 34 */  0xe2beac, 0xe2bead, 0xe2beae, 0xe2beaf,
   /* 38 */  0xe2beb0, 0xe2beb1,
 
-  /*** Four byte table, leaf: 81399dxx - offset 0x06eb7 ***/
+  /*** Four byte table, leaf: 81399dxx - offset 0x06f2b ***/
 
   /* 30 */  0xe2beb2, 0xe2beb3, 0xe2beb4, 0xe2beb5,
   /* 34 */  0xe2beb6, 0xe2beb7, 0xe2beb8, 0xe2beb9,
   /* 38 */  0xe2beba, 0xe2bebb,
 
-  /*** Four byte table, leaf: 81399exx - offset 0x06ec1 ***/
+  /*** Four byte table, leaf: 81399exx - offset 0x06f35 ***/
 
   /* 30 */  0xe2bebc, 0xe2bebd, 0xe2bebe, 0xe2bebf,
   /* 34 */  0xe2bf80, 0xe2bf81, 0xe2bf82, 0xe2bf83,
   /* 38 */  0xe2bf84, 0xe2bf85,
 
-  /*** Four byte table, leaf: 81399fxx - offset 0x06ecb ***/
+  /*** Four byte table, leaf: 81399fxx - offset 0x06f3f ***/
 
   /* 30 */  0xe2bf86, 0xe2bf87, 0xe2bf88, 0xe2bf89,
   /* 34 */  0xe2bf8a, 0xe2bf8b, 0xe2bf8c, 0xe2bf8d,
   /* 38 */  0xe2bf8e, 0xe2bf8f,
 
-  /*** Four byte table, leaf: 8139a0xx - offset 0x06ed5 ***/
+  /*** Four byte table, leaf: 8139a0xx - offset 0x06f49 ***/
 
   /* 30 */  0xe2bf90, 0xe2bf91, 0xe2bf92, 0xe2bf93,
   /* 34 */  0xe2bf94, 0xe2bf95, 0xe2bf96, 0xe2bf97,
   /* 38 */  0xe2bf98, 0xe2bf99,
 
-  /*** Four byte table, leaf: 8139a1xx - offset 0x06edf ***/
+  /*** Four byte table, leaf: 8139a1xx - offset 0x06f53 ***/
 
   /* 30 */  0xe2bf9a, 0xe2bf9b, 0xe2bf9c, 0xe2bf9d,
   /* 34 */  0xe2bf9e, 0xe2bf9f, 0xe2bfa0, 0xe2bfa1,
   /* 38 */  0xe2bfa2, 0xe2bfa3,
 
-  /*** Four byte table, leaf: 8139a2xx - offset 0x06ee9 ***/
+  /*** Four byte table, leaf: 8139a2xx - offset 0x06f5d ***/
 
   /* 30 */  0xe2bfa4, 0xe2bfa5, 0xe2bfa6, 0xe2bfa7,
   /* 34 */  0xe2bfa8, 0xe2bfa9, 0xe2bfaa, 0xe2bfab,
   /* 38 */  0xe2bfac, 0xe2bfad,
 
-  /*** Four byte table, leaf: 8139a3xx - offset 0x06ef3 ***/
+  /*** Four byte table, leaf: 8139a3xx - offset 0x06f67 ***/
 
   /* 30 */  0xe2bfae, 0xe2bfaf, 0xe2bfbc, 0xe2bfbd,
   /* 34 */  0xe2bfbe, 0xe2bfbf, 0xe38084, 0xe38098,
   /* 38 */  0xe38099, 0xe3809a,
 
-  /*** Four byte table, leaf: 8139a4xx - offset 0x06efd ***/
+  /*** Four byte table, leaf: 8139a4xx - offset 0x06f71 ***/
 
   /* 30 */  0xe3809b, 0xe3809c, 0xe3809f, 0xe380a0,
   /* 34 */  0xe380aa, 0xe380ab, 0xe380ac, 0xe380ad,
   /* 38 */  0xe380ae, 0xe380af,
 
-  /*** Four byte table, leaf: 8139a5xx - offset 0x06f07 ***/
+  /*** Four byte table, leaf: 8139a5xx - offset 0x06f7b ***/
 
   /* 30 */  0xe380b0, 0xe380b1, 0xe380b2, 0xe380b3,
   /* 34 */  0xe380b4, 0xe380b5, 0xe380b6, 0xe380b7,
   /* 38 */  0xe380b8, 0xe380b9,
 
-  /*** Four byte table, leaf: 8139a6xx - offset 0x06f11 ***/
+  /*** Four byte table, leaf: 8139a6xx - offset 0x06f85 ***/
 
   /* 30 */  0xe380ba, 0xe380bb, 0xe380bc, 0xe380bd,
   /* 34 */  0xe380bf, 0xe38180, 0xe38294, 0xe38295,
   /* 38 */  0xe38296, 0xe38297,
 
-  /*** Four byte table, leaf: 8139a7xx - offset 0x06f1b ***/
+  /*** Four byte table, leaf: 8139a7xx - offset 0x06f8f ***/
 
   /* 30 */  0xe38298, 0xe38299, 0xe3829a, 0xe3829f,
   /* 34 */  0xe382a0, 0xe383b7, 0xe383b8, 0xe383b9,
   /* 38 */  0xe383ba, 0xe383bb,
 
-  /*** Four byte table, leaf: 8139a8xx - offset 0x06f25 ***/
+  /*** Four byte table, leaf: 8139a8xx - offset 0x06f99 ***/
 
   /* 30 */  0xe383bf, 0xe38480, 0xe38481, 0xe38482,
   /* 34 */  0xe38483, 0xe38484, 0xe384aa, 0xe384ab,
   /* 38 */  0xe384ac, 0xe384ad,
 
-  /*** Four byte table, leaf: 8139a9xx - offset 0x06f2f ***/
+  /*** Four byte table, leaf: 8139a9xx - offset 0x06fa3 ***/
 
   /* 30 */  0xe384ae, 0xe384af, 0xe384b0, 0xe384b1,
   /* 34 */  0xe384b2, 0xe384b3, 0xe384b4, 0xe384b5,
   /* 38 */  0xe384b6, 0xe384b7,
 
-  /*** Four byte table, leaf: 8139aaxx - offset 0x06f39 ***/
+  /*** Four byte table, leaf: 8139aaxx - offset 0x06fad ***/
 
   /* 30 */  0xe384b8, 0xe384b9, 0xe384ba, 0xe384bb,
   /* 34 */  0xe384bc, 0xe384bd, 0xe384be, 0xe384bf,
   /* 38 */  0xe38580, 0xe38581,
 
-  /*** Four byte table, leaf: 8139abxx - offset 0x06f43 ***/
+  /*** Four byte table, leaf: 8139abxx - offset 0x06fb7 ***/
 
   /* 30 */  0xe38582, 0xe38583, 0xe38584, 0xe38585,
   /* 34 */  0xe38586, 0xe38587, 0xe38588, 0xe38589,
   /* 38 */  0xe3858a, 0xe3858b,
 
-  /*** Four byte table, leaf: 8139acxx - offset 0x06f4d ***/
+  /*** Four byte table, leaf: 8139acxx - offset 0x06fc1 ***/
 
   /* 30 */  0xe3858c, 0xe3858d, 0xe3858e, 0xe3858f,
   /* 34 */  0xe38590, 0xe38591, 0xe38592, 0xe38593,
   /* 38 */  0xe38594, 0xe38595,
 
-  /*** Four byte table, leaf: 8139adxx - offset 0x06f57 ***/
+  /*** Four byte table, leaf: 8139adxx - offset 0x06fcb ***/
 
   /* 30 */  0xe38596, 0xe38597, 0xe38598, 0xe38599,
   /* 34 */  0xe3859a, 0xe3859b, 0xe3859c, 0xe3859d,
   /* 38 */  0xe3859e, 0xe3859f,
 
-  /*** Four byte table, leaf: 8139aexx - offset 0x06f61 ***/
+  /*** Four byte table, leaf: 8139aexx - offset 0x06fd5 ***/
 
   /* 30 */  0xe385a0, 0xe385a1, 0xe385a2, 0xe385a3,
   /* 34 */  0xe385a4, 0xe385a5, 0xe385a6, 0xe385a7,
   /* 38 */  0xe385a8, 0xe385a9,
 
-  /*** Four byte table, leaf: 8139afxx - offset 0x06f6b ***/
+  /*** Four byte table, leaf: 8139afxx - offset 0x06fdf ***/
 
   /* 30 */  0xe385aa, 0xe385ab, 0xe385ac, 0xe385ad,
   /* 34 */  0xe385ae, 0xe385af, 0xe385b0, 0xe385b1,
   /* 38 */  0xe385b2, 0xe385b3,
 
-  /*** Four byte table, leaf: 8139b0xx - offset 0x06f75 ***/
+  /*** Four byte table, leaf: 8139b0xx - offset 0x06fe9 ***/
 
   /* 30 */  0xe385b4, 0xe385b5, 0xe385b6, 0xe385b7,
   /* 34 */  0xe385b8, 0xe385b9, 0xe385ba, 0xe385bb,
   /* 38 */  0xe385bc, 0xe385bd,
 
-  /*** Four byte table, leaf: 8139b1xx - offset 0x06f7f ***/
+  /*** Four byte table, leaf: 8139b1xx - offset 0x06ff3 ***/
 
   /* 30 */  0xe385be, 0xe385bf, 0xe38680, 0xe38681,
   /* 34 */  0xe38682, 0xe38683, 0xe38684, 0xe38685,
   /* 38 */  0xe38686, 0xe38687,
 
-  /*** Four byte table, leaf: 8139b2xx - offset 0x06f89 ***/
+  /*** Four byte table, leaf: 8139b2xx - offset 0x06ffd ***/
 
   /* 30 */  0xe38688, 0xe38689, 0xe3868a, 0xe3868b,
   /* 34 */  0xe3868c, 0xe3868d, 0xe3868e, 0xe3868f,
   /* 38 */  0xe38690, 0xe38691,
 
-  /*** Four byte table, leaf: 8139b3xx - offset 0x06f93 ***/
+  /*** Four byte table, leaf: 8139b3xx - offset 0x07007 ***/
 
   /* 30 */  0xe38692, 0xe38693, 0xe38694, 0xe38695,
   /* 34 */  0xe38696, 0xe38697, 0xe38698, 0xe38699,
   /* 38 */  0xe3869a, 0xe3869b,
 
-  /*** Four byte table, leaf: 8139b4xx - offset 0x06f9d ***/
+  /*** Four byte table, leaf: 8139b4xx - offset 0x07011 ***/
 
   /* 30 */  0xe3869c, 0xe3869d, 0xe3869e, 0xe3869f,
   /* 34 */  0xe386a0, 0xe386a1, 0xe386a2, 0xe386a3,
   /* 38 */  0xe386a4, 0xe386a5,
 
-  /*** Four byte table, leaf: 8139b5xx - offset 0x06fa7 ***/
+  /*** Four byte table, leaf: 8139b5xx - offset 0x0701b ***/
 
   /* 30 */  0xe386a6, 0xe386a7, 0xe386a8, 0xe386a9,
   /* 34 */  0xe386aa, 0xe386ab, 0xe386ac, 0xe386ad,
   /* 38 */  0xe386ae, 0xe386af,
 
-  /*** Four byte table, leaf: 8139b6xx - offset 0x06fb1 ***/
+  /*** Four byte table, leaf: 8139b6xx - offset 0x07025 ***/
 
   /* 30 */  0xe386b0, 0xe386b1, 0xe386b2, 0xe386b3,
   /* 34 */  0xe386b4, 0xe386b5, 0xe386b6, 0xe386b7,
   /* 38 */  0xe386b8, 0xe386b9,
 
-  /*** Four byte table, leaf: 8139b7xx - offset 0x06fbb ***/
+  /*** Four byte table, leaf: 8139b7xx - offset 0x0702f ***/
 
   /* 30 */  0xe386ba, 0xe386bb, 0xe386bc, 0xe386bd,
   /* 34 */  0xe386be, 0xe386bf, 0xe38780, 0xe38781,
   /* 38 */  0xe38782, 0xe38783,
 
-  /*** Four byte table, leaf: 8139b8xx - offset 0x06fc5 ***/
+  /*** Four byte table, leaf: 8139b8xx - offset 0x07039 ***/
 
   /* 30 */  0xe38784, 0xe38785, 0xe38786, 0xe38787,
   /* 34 */  0xe38788, 0xe38789, 0xe3878a, 0xe3878b,
   /* 38 */  0xe3878c, 0xe3878d,
 
-  /*** Four byte table, leaf: 8139b9xx - offset 0x06fcf ***/
+  /*** Four byte table, leaf: 8139b9xx - offset 0x07043 ***/
 
   /* 30 */  0xe3878e, 0xe3878f, 0xe38790, 0xe38791,
   /* 34 */  0xe38792, 0xe38793, 0xe38794, 0xe38795,
   /* 38 */  0xe38796, 0xe38797,
 
-  /*** Four byte table, leaf: 8139baxx - offset 0x06fd9 ***/
+  /*** Four byte table, leaf: 8139baxx - offset 0x0704d ***/
 
   /* 30 */  0xe38798, 0xe38799, 0xe3879a, 0xe3879b,
   /* 34 */  0xe3879c, 0xe3879d, 0xe3879e, 0xe3879f,
   /* 38 */  0xe387a0, 0xe387a1,
 
-  /*** Four byte table, leaf: 8139bbxx - offset 0x06fe3 ***/
+  /*** Four byte table, leaf: 8139bbxx - offset 0x07057 ***/
 
   /* 30 */  0xe387a2, 0xe387a3, 0xe387a4, 0xe387a5,
   /* 34 */  0xe387a6, 0xe387a7, 0xe387a8, 0xe387a9,
   /* 38 */  0xe387aa, 0xe387ab,
 
-  /*** Four byte table, leaf: 8139bcxx - offset 0x06fed ***/
+  /*** Four byte table, leaf: 8139bcxx - offset 0x07061 ***/
 
   /* 30 */  0xe387ac, 0xe387ad, 0xe387ae, 0xe387af,
   /* 34 */  0xe387b0, 0xe387b1, 0xe387b2, 0xe387b3,
   /* 38 */  0xe387b4, 0xe387b5,
 
-  /*** Four byte table, leaf: 8139bdxx - offset 0x06ff7 ***/
+  /*** Four byte table, leaf: 8139bdxx - offset 0x0706b ***/
 
   /* 30 */  0xe387b6, 0xe387b7, 0xe387b8, 0xe387b9,
   /* 34 */  0xe387ba, 0xe387bb, 0xe387bc, 0xe387bd,
   /* 38 */  0xe387be, 0xe387bf,
 
-  /*** Four byte table, leaf: 8139bexx - offset 0x07001 ***/
+  /*** Four byte table, leaf: 8139bexx - offset 0x07075 ***/
 
   /* 30 */  0xe38880, 0xe38881, 0xe38882, 0xe38883,
   /* 34 */  0xe38884, 0xe38885, 0xe38886, 0xe38887,
   /* 38 */  0xe38888, 0xe38889,
 
-  /*** Four byte table, leaf: 8139bfxx - offset 0x0700b ***/
+  /*** Four byte table, leaf: 8139bfxx - offset 0x0707f ***/
 
   /* 30 */  0xe3888a, 0xe3888b, 0xe3888c, 0xe3888d,
   /* 34 */  0xe3888e, 0xe3888f, 0xe38890, 0xe38891,
   /* 38 */  0xe38892, 0xe38893,
 
-  /*** Four byte table, leaf: 8139c0xx - offset 0x07015 ***/
+  /*** Four byte table, leaf: 8139c0xx - offset 0x07089 ***/
 
   /* 30 */  0xe38894, 0xe38895, 0xe38896, 0xe38897,
   /* 34 */  0xe38898, 0xe38899, 0xe3889a, 0xe3889b,
   /* 38 */  0xe3889c, 0xe3889d,
 
-  /*** Four byte table, leaf: 8139c1xx - offset 0x0701f ***/
+  /*** Four byte table, leaf: 8139c1xx - offset 0x07093 ***/
 
   /* 30 */  0xe3889e, 0xe3889f, 0xe388aa, 0xe388ab,
   /* 34 */  0xe388ac, 0xe388ad, 0xe388ae, 0xe388af,
   /* 38 */  0xe388b0, 0xe388b2,
 
-  /*** Four byte table, leaf: 8139c2xx - offset 0x07029 ***/
+  /*** Four byte table, leaf: 8139c2xx - offset 0x0709d ***/
 
   /* 30 */  0xe388b3, 0xe388b4, 0xe388b5, 0xe388b6,
   /* 34 */  0xe388b7, 0xe388b8, 0xe388b9, 0xe388ba,
   /* 38 */  0xe388bb, 0xe388bc,
 
-  /*** Four byte table, leaf: 8139c3xx - offset 0x07033 ***/
+  /*** Four byte table, leaf: 8139c3xx - offset 0x070a7 ***/
 
   /* 30 */  0xe388bd, 0xe388be, 0xe388bf, 0xe38980,
   /* 34 */  0xe38981, 0xe38982, 0xe38983, 0xe38984,
   /* 38 */  0xe38985, 0xe38986,
 
-  /*** Four byte table, leaf: 8139c4xx - offset 0x0703d ***/
+  /*** Four byte table, leaf: 8139c4xx - offset 0x070b1 ***/
 
   /* 30 */  0xe38987, 0xe38988, 0xe38989, 0xe3898a,
   /* 34 */  0xe3898b, 0xe3898c, 0xe3898d, 0xe3898e,
   /* 38 */  0xe3898f, 0xe38990,
 
-  /*** Four byte table, leaf: 8139c5xx - offset 0x07047 ***/
+  /*** Four byte table, leaf: 8139c5xx - offset 0x070bb ***/
 
   /* 30 */  0xe38991, 0xe38992, 0xe38993, 0xe38994,
   /* 34 */  0xe38995, 0xe38996, 0xe38997, 0xe38998,
   /* 38 */  0xe38999, 0xe3899a,
 
-  /*** Four byte table, leaf: 8139c6xx - offset 0x07051 ***/
+  /*** Four byte table, leaf: 8139c6xx - offset 0x070c5 ***/
 
   /* 30 */  0xe3899b, 0xe3899c, 0xe3899d, 0xe3899e,
   /* 34 */  0xe3899f, 0xe389a0, 0xe389a1, 0xe389a2,
   /* 38 */  0xe389a3, 0xe389a4,
 
-  /*** Four byte table, leaf: 8139c7xx - offset 0x0705b ***/
+  /*** Four byte table, leaf: 8139c7xx - offset 0x070cf ***/
 
   /* 30 */  0xe389a5, 0xe389a6, 0xe389a7, 0xe389a8,
   /* 34 */  0xe389a9, 0xe389aa, 0xe389ab, 0xe389ac,
   /* 38 */  0xe389ad, 0xe389ae,
 
-  /*** Four byte table, leaf: 8139c8xx - offset 0x07065 ***/
+  /*** Four byte table, leaf: 8139c8xx - offset 0x070d9 ***/
 
   /* 30 */  0xe389af, 0xe389b0, 0xe389b1, 0xe389b2,
   /* 34 */  0xe389b3, 0xe389b4, 0xe389b5, 0xe389b6,
   /* 38 */  0xe389b7, 0xe389b8,
 
-  /*** Four byte table, leaf: 8139c9xx - offset 0x0706f ***/
+  /*** Four byte table, leaf: 8139c9xx - offset 0x070e3 ***/
 
   /* 30 */  0xe389b9, 0xe389ba, 0xe389bb, 0xe389bc,
   /* 34 */  0xe389bd, 0xe389be, 0xe389bf, 0xe38a80,
   /* 38 */  0xe38a81, 0xe38a82,
 
-  /*** Four byte table, leaf: 8139caxx - offset 0x07079 ***/
+  /*** Four byte table, leaf: 8139caxx - offset 0x070ed ***/
 
   /* 30 */  0xe38a83, 0xe38a84, 0xe38a85, 0xe38a86,
   /* 34 */  0xe38a87, 0xe38a88, 0xe38a89, 0xe38a8a,
   /* 38 */  0xe38a8b, 0xe38a8c,
 
-  /*** Four byte table, leaf: 8139cbxx - offset 0x07083 ***/
+  /*** Four byte table, leaf: 8139cbxx - offset 0x070f7 ***/
 
   /* 30 */  0xe38a8d, 0xe38a8e, 0xe38a8f, 0xe38a90,
   /* 34 */  0xe38a91, 0xe38a92, 0xe38a93, 0xe38a94,
   /* 38 */  0xe38a95, 0xe38a96,
 
-  /*** Four byte table, leaf: 8139ccxx - offset 0x0708d ***/
+  /*** Four byte table, leaf: 8139ccxx - offset 0x07101 ***/
 
   /* 30 */  0xe38a97, 0xe38a98, 0xe38a99, 0xe38a9a,
   /* 34 */  0xe38a9b, 0xe38a9c, 0xe38a9d, 0xe38a9e,
   /* 38 */  0xe38a9f, 0xe38aa0,
 
-  /*** Four byte table, leaf: 8139cdxx - offset 0x07097 ***/
+  /*** Four byte table, leaf: 8139cdxx - offset 0x0710b ***/
 
   /* 30 */  0xe38aa1, 0xe38aa2, 0xe38aa4, 0xe38aa5,
   /* 34 */  0xe38aa6, 0xe38aa7, 0xe38aa8, 0xe38aa9,
   /* 38 */  0xe38aaa, 0xe38aab,
 
-  /*** Four byte table, leaf: 8139cexx - offset 0x070a1 ***/
+  /*** Four byte table, leaf: 8139cexx - offset 0x07115 ***/
 
   /* 30 */  0xe38aac, 0xe38aad, 0xe38aae, 0xe38aaf,
   /* 34 */  0xe38ab0, 0xe38ab1, 0xe38ab2, 0xe38ab3,
   /* 38 */  0xe38ab4, 0xe38ab5,
 
-  /*** Four byte table, leaf: 8139cfxx - offset 0x070ab ***/
+  /*** Four byte table, leaf: 8139cfxx - offset 0x0711f ***/
 
   /* 30 */  0xe38ab6, 0xe38ab7, 0xe38ab8, 0xe38ab9,
   /* 34 */  0xe38aba, 0xe38abb, 0xe38abc, 0xe38abd,
   /* 38 */  0xe38abe, 0xe38abf,
 
-  /*** Four byte table, leaf: 8139d0xx - offset 0x070b5 ***/
+  /*** Four byte table, leaf: 8139d0xx - offset 0x07129 ***/
 
   /* 30 */  0xe38b80, 0xe38b81, 0xe38b82, 0xe38b83,
   /* 34 */  0xe38b84, 0xe38b85, 0xe38b86, 0xe38b87,
   /* 38 */  0xe38b88, 0xe38b89,
 
-  /*** Four byte table, leaf: 8139d1xx - offset 0x070bf ***/
+  /*** Four byte table, leaf: 8139d1xx - offset 0x07133 ***/
 
   /* 30 */  0xe38b8a, 0xe38b8b, 0xe38b8c, 0xe38b8d,
   /* 34 */  0xe38b8e, 0xe38b8f, 0xe38b90, 0xe38b91,
   /* 38 */  0xe38b92, 0xe38b93,
 
-  /*** Four byte table, leaf: 8139d2xx - offset 0x070c9 ***/
+  /*** Four byte table, leaf: 8139d2xx - offset 0x0713d ***/
 
   /* 30 */  0xe38b94, 0xe38b95, 0xe38b96, 0xe38b97,
   /* 34 */  0xe38b98, 0xe38b99, 0xe38b9a, 0xe38b9b,
   /* 38 */  0xe38b9c, 0xe38b9d,
 
-  /*** Four byte table, leaf: 8139d3xx - offset 0x070d3 ***/
+  /*** Four byte table, leaf: 8139d3xx - offset 0x07147 ***/
 
   /* 30 */  0xe38b9e, 0xe38b9f, 0xe38ba0, 0xe38ba1,
   /* 34 */  0xe38ba2, 0xe38ba3, 0xe38ba4, 0xe38ba5,
   /* 38 */  0xe38ba6, 0xe38ba7,
 
-  /*** Four byte table, leaf: 8139d4xx - offset 0x070dd ***/
+  /*** Four byte table, leaf: 8139d4xx - offset 0x07151 ***/
 
   /* 30 */  0xe38ba8, 0xe38ba9, 0xe38baa, 0xe38bab,
   /* 34 */  0xe38bac, 0xe38bad, 0xe38bae, 0xe38baf,
   /* 38 */  0xe38bb0, 0xe38bb1,
 
-  /*** Four byte table, leaf: 8139d5xx - offset 0x070e7 ***/
+  /*** Four byte table, leaf: 8139d5xx - offset 0x0715b ***/
 
   /* 30 */  0xe38bb2, 0xe38bb3, 0xe38bb4, 0xe38bb5,
   /* 34 */  0xe38bb6, 0xe38bb7, 0xe38bb8, 0xe38bb9,
   /* 38 */  0xe38bba, 0xe38bbb,
 
-  /*** Four byte table, leaf: 8139d6xx - offset 0x070f1 ***/
+  /*** Four byte table, leaf: 8139d6xx - offset 0x07165 ***/
 
   /* 30 */  0xe38bbc, 0xe38bbd, 0xe38bbe, 0xe38bbf,
   /* 34 */  0xe38c80, 0xe38c81, 0xe38c82, 0xe38c83,
   /* 38 */  0xe38c84, 0xe38c85,
 
-  /*** Four byte table, leaf: 8139d7xx - offset 0x070fb ***/
+  /*** Four byte table, leaf: 8139d7xx - offset 0x0716f ***/
 
   /* 30 */  0xe38c86, 0xe38c87, 0xe38c88, 0xe38c89,
   /* 34 */  0xe38c8a, 0xe38c8b, 0xe38c8c, 0xe38c8d,
   /* 38 */  0xe38c8e, 0xe38c8f,
 
-  /*** Four byte table, leaf: 8139d8xx - offset 0x07105 ***/
+  /*** Four byte table, leaf: 8139d8xx - offset 0x07179 ***/
 
   /* 30 */  0xe38c90, 0xe38c91, 0xe38c92, 0xe38c93,
   /* 34 */  0xe38c94, 0xe38c95, 0xe38c96, 0xe38c97,
   /* 38 */  0xe38c98, 0xe38c99,
 
-  /*** Four byte table, leaf: 8139d9xx - offset 0x0710f ***/
+  /*** Four byte table, leaf: 8139d9xx - offset 0x07183 ***/
 
   /* 30 */  0xe38c9a, 0xe38c9b, 0xe38c9c, 0xe38c9d,
   /* 34 */  0xe38c9e, 0xe38c9f, 0xe38ca0, 0xe38ca1,
   /* 38 */  0xe38ca2, 0xe38ca3,
 
-  /*** Four byte table, leaf: 8139daxx - offset 0x07119 ***/
+  /*** Four byte table, leaf: 8139daxx - offset 0x0718d ***/
 
   /* 30 */  0xe38ca4, 0xe38ca5, 0xe38ca6, 0xe38ca7,
   /* 34 */  0xe38ca8, 0xe38ca9, 0xe38caa, 0xe38cab,
   /* 38 */  0xe38cac, 0xe38cad,
 
-  /*** Four byte table, leaf: 8139dbxx - offset 0x07123 ***/
+  /*** Four byte table, leaf: 8139dbxx - offset 0x07197 ***/
 
   /* 30 */  0xe38cae, 0xe38caf, 0xe38cb0, 0xe38cb1,
   /* 34 */  0xe38cb2, 0xe38cb3, 0xe38cb4, 0xe38cb5,
   /* 38 */  0xe38cb6, 0xe38cb7,
 
-  /*** Four byte table, leaf: 8139dcxx - offset 0x0712d ***/
+  /*** Four byte table, leaf: 8139dcxx - offset 0x071a1 ***/
 
   /* 30 */  0xe38cb8, 0xe38cb9, 0xe38cba, 0xe38cbb,
   /* 34 */  0xe38cbc, 0xe38cbd, 0xe38cbe, 0xe38cbf,
   /* 38 */  0xe38d80, 0xe38d81,
 
-  /*** Four byte table, leaf: 8139ddxx - offset 0x07137 ***/
+  /*** Four byte table, leaf: 8139ddxx - offset 0x071ab ***/
 
   /* 30 */  0xe38d82, 0xe38d83, 0xe38d84, 0xe38d85,
   /* 34 */  0xe38d86, 0xe38d87, 0xe38d88, 0xe38d89,
   /* 38 */  0xe38d8a, 0xe38d8b,
 
-  /*** Four byte table, leaf: 8139dexx - offset 0x07141 ***/
+  /*** Four byte table, leaf: 8139dexx - offset 0x071b5 ***/
 
   /* 30 */  0xe38d8c, 0xe38d8d, 0xe38d8e, 0xe38d8f,
   /* 34 */  0xe38d90, 0xe38d91, 0xe38d92, 0xe38d93,
   /* 38 */  0xe38d94, 0xe38d95,
 
-  /*** Four byte table, leaf: 8139dfxx - offset 0x0714b ***/
+  /*** Four byte table, leaf: 8139dfxx - offset 0x071bf ***/
 
   /* 30 */  0xe38d96, 0xe38d97, 0xe38d98, 0xe38d99,
   /* 34 */  0xe38d9a, 0xe38d9b, 0xe38d9c, 0xe38d9d,
   /* 38 */  0xe38d9e, 0xe38d9f,
 
-  /*** Four byte table, leaf: 8139e0xx - offset 0x07155 ***/
+  /*** Four byte table, leaf: 8139e0xx - offset 0x071c9 ***/
 
   /* 30 */  0xe38da0, 0xe38da1, 0xe38da2, 0xe38da3,
   /* 34 */  0xe38da4, 0xe38da5, 0xe38da6, 0xe38da7,
   /* 38 */  0xe38da8, 0xe38da9,
 
-  /*** Four byte table, leaf: 8139e1xx - offset 0x0715f ***/
+  /*** Four byte table, leaf: 8139e1xx - offset 0x071d3 ***/
 
   /* 30 */  0xe38daa, 0xe38dab, 0xe38dac, 0xe38dad,
   /* 34 */  0xe38dae, 0xe38daf, 0xe38db0, 0xe38db1,
   /* 38 */  0xe38db2, 0xe38db3,
 
-  /*** Four byte table, leaf: 8139e2xx - offset 0x07169 ***/
+  /*** Four byte table, leaf: 8139e2xx - offset 0x071dd ***/
 
   /* 30 */  0xe38db4, 0xe38db5, 0xe38db6, 0xe38db7,
   /* 34 */  0xe38db8, 0xe38db9, 0xe38dba, 0xe38dbb,
   /* 38 */  0xe38dbc, 0xe38dbd,
 
-  /*** Four byte table, leaf: 8139e3xx - offset 0x07173 ***/
+  /*** Four byte table, leaf: 8139e3xx - offset 0x071e7 ***/
 
   /* 30 */  0xe38dbe, 0xe38dbf, 0xe38e80, 0xe38e81,
   /* 34 */  0xe38e82, 0xe38e83, 0xe38e84, 0xe38e85,
   /* 38 */  0xe38e86, 0xe38e87,
 
-  /*** Four byte table, leaf: 8139e4xx - offset 0x0717d ***/
+  /*** Four byte table, leaf: 8139e4xx - offset 0x071f1 ***/
 
   /* 30 */  0xe38e88, 0xe38e89, 0xe38e8a, 0xe38e8b,
   /* 34 */  0xe38e8c, 0xe38e8d, 0xe38e90, 0xe38e91,
   /* 38 */  0xe38e92, 0xe38e93,
 
-  /*** Four byte table, leaf: 8139e5xx - offset 0x07187 ***/
+  /*** Four byte table, leaf: 8139e5xx - offset 0x071fb ***/
 
   /* 30 */  0xe38e94, 0xe38e95, 0xe38e96, 0xe38e97,
   /* 34 */  0xe38e98, 0xe38e99, 0xe38e9a, 0xe38e9b,
   /* 38 */  0xe38e9f, 0xe38ea0,
 
-  /*** Four byte table, leaf: 8139e6xx - offset 0x07191 ***/
+  /*** Four byte table, leaf: 8139e6xx - offset 0x07205 ***/
 
   /* 30 */  0xe38ea2, 0xe38ea3, 0xe38ea4, 0xe38ea5,
   /* 34 */  0xe38ea6, 0xe38ea7, 0xe38ea8, 0xe38ea9,
   /* 38 */  0xe38eaa, 0xe38eab,
 
-  /*** Four byte table, leaf: 8139e7xx - offset 0x0719b ***/
+  /*** Four byte table, leaf: 8139e7xx - offset 0x0720f ***/
 
   /* 30 */  0xe38eac, 0xe38ead, 0xe38eae, 0xe38eaf,
   /* 34 */  0xe38eb0, 0xe38eb1, 0xe38eb2, 0xe38eb3,
   /* 38 */  0xe38eb4, 0xe38eb5,
 
-  /*** Four byte table, leaf: 8139e8xx - offset 0x071a5 ***/
+  /*** Four byte table, leaf: 8139e8xx - offset 0x07219 ***/
 
   /* 30 */  0xe38eb6, 0xe38eb7, 0xe38eb8, 0xe38eb9,
   /* 34 */  0xe38eba, 0xe38ebb, 0xe38ebc, 0xe38ebd,
   /* 38 */  0xe38ebe, 0xe38ebf,
 
-  /*** Four byte table, leaf: 8139e9xx - offset 0x071af ***/
+  /*** Four byte table, leaf: 8139e9xx - offset 0x07223 ***/
 
   /* 30 */  0xe38f80, 0xe38f81, 0xe38f82, 0xe38f83,
   /* 34 */  0xe38f85, 0xe38f86, 0xe38f87, 0xe38f88,
   /* 38 */  0xe38f89, 0xe38f8a,
 
-  /*** Four byte table, leaf: 8139eaxx - offset 0x071b9 ***/
+  /*** Four byte table, leaf: 8139eaxx - offset 0x0722d ***/
 
   /* 30 */  0xe38f8b, 0xe38f8c, 0xe38f8d, 0xe38f8f,
   /* 34 */  0xe38f90, 0xe38f93, 0xe38f94, 0xe38f96,
   /* 38 */  0xe38f97, 0xe38f98,
 
-  /*** Four byte table, leaf: 8139ebxx - offset 0x071c3 ***/
+  /*** Four byte table, leaf: 8139ebxx - offset 0x07237 ***/
 
   /* 30 */  0xe38f99, 0xe38f9a, 0xe38f9b, 0xe38f9c,
   /* 34 */  0xe38f9d, 0xe38f9e, 0xe38f9f, 0xe38fa0,
   /* 38 */  0xe38fa1, 0xe38fa2,
 
-  /*** Four byte table, leaf: 8139ecxx - offset 0x071cd ***/
+  /*** Four byte table, leaf: 8139ecxx - offset 0x07241 ***/
 
   /* 30 */  0xe38fa3, 0xe38fa4, 0xe38fa5, 0xe38fa6,
   /* 34 */  0xe38fa7, 0xe38fa8, 0xe38fa9, 0xe38faa,
   /* 38 */  0xe38fab, 0xe38fac,
 
-  /*** Four byte table, leaf: 8139edxx - offset 0x071d7 ***/
+  /*** Four byte table, leaf: 8139edxx - offset 0x0724b ***/
 
   /* 30 */  0xe38fad, 0xe38fae, 0xe38faf, 0xe38fb0,
   /* 34 */  0xe38fb1, 0xe38fb2, 0xe38fb3, 0xe38fb4,
   /* 38 */  0xe38fb5, 0xe38fb6,
 
-  /*** Four byte table, leaf: 8139eexx - offset 0x071e1 ***/
+  /*** Four byte table, leaf: 8139eexx - offset 0x07255 ***/
 
   /* 30 */  0xe38fb7, 0xe38fb8, 0xe38fb9, 0xe38fba,
   /* 34 */  0xe38fbb, 0xe38fbc, 0xe38fbd, 0xe38fbe,
   /* 38 */  0xe38fbf, 0xe39080,
 
-  /*** Four byte table, leaf: 8139efxx - offset 0x071eb ***/
+  /*** Four byte table, leaf: 8139efxx - offset 0x0725f ***/
 
   /* 30 */  0xe39081, 0xe39082, 0xe39083, 0xe39084,
   /* 34 */  0xe39085, 0xe39086, 0xe39087, 0xe39088,
   /* 38 */  0xe39089, 0xe3908a,
 
-  /*** Four byte table, leaf: 8139f0xx - offset 0x071f5 ***/
+  /*** Four byte table, leaf: 8139f0xx - offset 0x07269 ***/
 
   /* 30 */  0xe3908b, 0xe3908c, 0xe3908d, 0xe3908e,
   /* 34 */  0xe3908f, 0xe39090, 0xe39091, 0xe39092,
   /* 38 */  0xe39093, 0xe39094,
 
-  /*** Four byte table, leaf: 8139f1xx - offset 0x071ff ***/
+  /*** Four byte table, leaf: 8139f1xx - offset 0x07273 ***/
 
   /* 30 */  0xe39095, 0xe39096, 0xe39097, 0xe39098,
   /* 34 */  0xe39099, 0xe3909a, 0xe3909b, 0xe3909c,
   /* 38 */  0xe3909d, 0xe3909e,
 
-  /*** Four byte table, leaf: 8139f2xx - offset 0x07209 ***/
+  /*** Four byte table, leaf: 8139f2xx - offset 0x0727d ***/
 
   /* 30 */  0xe3909f, 0xe390a0, 0xe390a1, 0xe390a2,
   /* 34 */  0xe390a3, 0xe390a4, 0xe390a5, 0xe390a6,
   /* 38 */  0xe390a7, 0xe390a8,
 
-  /*** Four byte table, leaf: 8139f3xx - offset 0x07213 ***/
+  /*** Four byte table, leaf: 8139f3xx - offset 0x07287 ***/
 
   /* 30 */  0xe390a9, 0xe390aa, 0xe390ab, 0xe390ac,
   /* 34 */  0xe390ad, 0xe390ae, 0xe390af, 0xe390b0,
   /* 38 */  0xe390b1, 0xe390b2,
 
-  /*** Four byte table, leaf: 8139f4xx - offset 0x0721d ***/
+  /*** Four byte table, leaf: 8139f4xx - offset 0x07291 ***/
 
   /* 30 */  0xe390b3, 0xe390b4, 0xe390b5, 0xe390b6,
   /* 34 */  0xe390b7, 0xe390b8, 0xe390b9, 0xe390ba,
   /* 38 */  0xe390bb, 0xe390bc,
 
-  /*** Four byte table, leaf: 8139f5xx - offset 0x07227 ***/
+  /*** Four byte table, leaf: 8139f5xx - offset 0x0729b ***/
 
   /* 30 */  0xe390bd, 0xe390be, 0xe390bf, 0xe39180,
   /* 34 */  0xe39181, 0xe39182, 0xe39183, 0xe39184,
   /* 38 */  0xe39185, 0xe39186,
 
-  /*** Four byte table, leaf: 8139f6xx - offset 0x07231 ***/
+  /*** Four byte table, leaf: 8139f6xx - offset 0x072a5 ***/
 
   /* 30 */  0xe39188, 0xe39189, 0xe3918a, 0xe3918b,
   /* 34 */  0xe3918c, 0xe3918d, 0xe3918e, 0xe3918f,
   /* 38 */  0xe39190, 0xe39191,
 
-  /*** Four byte table, leaf: 8139f7xx - offset 0x0723b ***/
+  /*** Four byte table, leaf: 8139f7xx - offset 0x072af ***/
 
   /* 30 */  0xe39192, 0xe39193, 0xe39194, 0xe39195,
   /* 34 */  0xe39196, 0xe39197, 0xe39198, 0xe39199,
   /* 38 */  0xe3919a, 0xe3919b,
 
-  /*** Four byte table, leaf: 8139f8xx - offset 0x07245 ***/
+  /*** Four byte table, leaf: 8139f8xx - offset 0x072b9 ***/
 
   /* 30 */  0xe3919c, 0xe3919d, 0xe3919e, 0xe3919f,
   /* 34 */  0xe391a0, 0xe391a1, 0xe391a2, 0xe391a3,
   /* 38 */  0xe391a4, 0xe391a5,
 
-  /*** Four byte table, leaf: 8139f9xx - offset 0x0724f ***/
+  /*** Four byte table, leaf: 8139f9xx - offset 0x072c3 ***/
 
   /* 30 */  0xe391a6, 0xe391a7, 0xe391a8, 0xe391a9,
   /* 34 */  0xe391aa, 0xe391ab, 0xe391ac, 0xe391ad,
   /* 38 */  0xe391ae, 0xe391af,
 
-  /*** Four byte table, leaf: 8139faxx - offset 0x07259 ***/
+  /*** Four byte table, leaf: 8139faxx - offset 0x072cd ***/
 
   /* 30 */  0xe391b0, 0xe391b1, 0xe391b2, 0xe391b4,
   /* 34 */  0xe391b5, 0xe391b6, 0xe391b7, 0xe391b8,
   /* 38 */  0xe391b9, 0xe391ba,
 
-  /*** Four byte table, leaf: 8139fbxx - offset 0x07263 ***/
+  /*** Four byte table, leaf: 8139fbxx - offset 0x072d7 ***/
 
   /* 30 */  0xe391bb, 0xe391bc, 0xe391bd, 0xe391be,
   /* 34 */  0xe391bf, 0xe39280, 0xe39281, 0xe39282,
   /* 38 */  0xe39283, 0xe39284,
 
-  /*** Four byte table, leaf: 8139fcxx - offset 0x0726d ***/
+  /*** Four byte table, leaf: 8139fcxx - offset 0x072e1 ***/
 
   /* 30 */  0xe39285, 0xe39286, 0xe39287, 0xe39288,
   /* 34 */  0xe39289, 0xe3928a, 0xe3928b, 0xe3928c,
   /* 38 */  0xe3928d, 0xe3928e,
 
-  /*** Four byte table, leaf: 8139fdxx - offset 0x07277 ***/
+  /*** Four byte table, leaf: 8139fdxx - offset 0x072eb ***/
 
   /* 30 */  0xe3928f, 0xe39290, 0xe39291, 0xe39292,
   /* 34 */  0xe39293, 0xe39294, 0xe39295, 0xe39296,
   /* 38 */  0xe39297, 0xe39298,
 
-  /*** Four byte table, leaf: 8139fexx - offset 0x07281 ***/
+  /*** Four byte table, leaf: 8139fexx - offset 0x072f5 ***/
 
   /* 30 */  0xe39299, 0xe3929a, 0xe3929b, 0xe3929c,
   /* 34 */  0xe3929d, 0xe3929e, 0xe3929f, 0xe392a0,
   /* 38 */  0xe392a1, 0xe392a2,
 
-  /*** Four byte table, leaf: 823081xx - offset 0x0728b ***/
+  /*** Four byte table, leaf: 823081xx - offset 0x072ff ***/
 
   /* 30 */  0xe392a3, 0xe392a4, 0xe392a5, 0xe392a6,
   /* 34 */  0xe392a7, 0xe392a8, 0xe392a9, 0xe392aa,
   /* 38 */  0xe392ab, 0xe392ac,
 
-  /*** Four byte table, leaf: 823082xx - offset 0x07295 ***/
+  /*** Four byte table, leaf: 823082xx - offset 0x07309 ***/
 
   /* 30 */  0xe392ad, 0xe392ae, 0xe392af, 0xe392b0,
   /* 34 */  0xe392b1, 0xe392b2, 0xe392b3, 0xe392b4,
   /* 38 */  0xe392b5, 0xe392b6,
 
-  /*** Four byte table, leaf: 823083xx - offset 0x0729f ***/
+  /*** Four byte table, leaf: 823083xx - offset 0x07313 ***/
 
   /* 30 */  0xe392b7, 0xe392b8, 0xe392b9, 0xe392ba,
   /* 34 */  0xe392bb, 0xe392bc, 0xe392bd, 0xe392be,
   /* 38 */  0xe392bf, 0xe39380,
 
-  /*** Four byte table, leaf: 823084xx - offset 0x072a9 ***/
+  /*** Four byte table, leaf: 823084xx - offset 0x0731d ***/
 
   /* 30 */  0xe39381, 0xe39382, 0xe39383, 0xe39384,
   /* 34 */  0xe39385, 0xe39386, 0xe39387, 0xe39388,
   /* 38 */  0xe39389, 0xe3938a,
 
-  /*** Four byte table, leaf: 823085xx - offset 0x072b3 ***/
+  /*** Four byte table, leaf: 823085xx - offset 0x07327 ***/
 
   /* 30 */  0xe3938b, 0xe3938c, 0xe3938d, 0xe3938e,
   /* 34 */  0xe3938f, 0xe39390, 0xe39391, 0xe39392,
   /* 38 */  0xe39393, 0xe39394,
 
-  /*** Four byte table, leaf: 823086xx - offset 0x072bd ***/
+  /*** Four byte table, leaf: 823086xx - offset 0x07331 ***/
 
   /* 30 */  0xe39395, 0xe39396, 0xe39397, 0xe39398,
   /* 34 */  0xe39399, 0xe3939a, 0xe3939b, 0xe3939c,
   /* 38 */  0xe3939d, 0xe3939e,
 
-  /*** Four byte table, leaf: 823087xx - offset 0x072c7 ***/
+  /*** Four byte table, leaf: 823087xx - offset 0x0733b ***/
 
   /* 30 */  0xe3939f, 0xe393a0, 0xe393a1, 0xe393a2,
   /* 34 */  0xe393a3, 0xe393a4, 0xe393a5, 0xe393a6,
   /* 38 */  0xe393a7, 0xe393a8,
 
-  /*** Four byte table, leaf: 823088xx - offset 0x072d1 ***/
+  /*** Four byte table, leaf: 823088xx - offset 0x07345 ***/
 
   /* 30 */  0xe393a9, 0xe393aa, 0xe393ab, 0xe393ac,
   /* 34 */  0xe393ad, 0xe393ae, 0xe393af, 0xe393b0,
   /* 38 */  0xe393b1, 0xe393b2,
 
-  /*** Four byte table, leaf: 823089xx - offset 0x072db ***/
+  /*** Four byte table, leaf: 823089xx - offset 0x0734f ***/
 
   /* 30 */  0xe393b3, 0xe393b4, 0xe393b5, 0xe393b6,
   /* 34 */  0xe393b7, 0xe393b8, 0xe393b9, 0xe393ba,
   /* 38 */  0xe393bb, 0xe393bc,
 
-  /*** Four byte table, leaf: 82308axx - offset 0x072e5 ***/
+  /*** Four byte table, leaf: 82308axx - offset 0x07359 ***/
 
   /* 30 */  0xe393bd, 0xe393be, 0xe393bf, 0xe39480,
   /* 34 */  0xe39481, 0xe39482, 0xe39483, 0xe39484,
   /* 38 */  0xe39485, 0xe39486,
 
-  /*** Four byte table, leaf: 82308bxx - offset 0x072ef ***/
+  /*** Four byte table, leaf: 82308bxx - offset 0x07363 ***/
 
   /* 30 */  0xe39487, 0xe39488, 0xe39489, 0xe3948a,
   /* 34 */  0xe3948b, 0xe3948c, 0xe3948d, 0xe3948e,
   /* 38 */  0xe3948f, 0xe39490,
 
-  /*** Four byte table, leaf: 82308cxx - offset 0x072f9 ***/
+  /*** Four byte table, leaf: 82308cxx - offset 0x0736d ***/
 
   /* 30 */  0xe39491, 0xe39492, 0xe39493, 0xe39494,
   /* 34 */  0xe39495, 0xe39496, 0xe39497, 0xe39498,
   /* 38 */  0xe39499, 0xe3949a,
 
-  /*** Four byte table, leaf: 82308dxx - offset 0x07303 ***/
+  /*** Four byte table, leaf: 82308dxx - offset 0x07377 ***/
 
   /* 30 */  0xe3949b, 0xe3949c, 0xe3949d, 0xe3949e,
   /* 34 */  0xe3949f, 0xe394a0, 0xe394a1, 0xe394a2,
   /* 38 */  0xe394a3, 0xe394a4,
 
-  /*** Four byte table, leaf: 82308exx - offset 0x0730d ***/
+  /*** Four byte table, leaf: 82308exx - offset 0x07381 ***/
 
   /* 30 */  0xe394a5, 0xe394a6, 0xe394a7, 0xe394a8,
   /* 34 */  0xe394a9, 0xe394aa, 0xe394ab, 0xe394ac,
   /* 38 */  0xe394ad, 0xe394ae,
 
-  /*** Four byte table, leaf: 82308fxx - offset 0x07317 ***/
+  /*** Four byte table, leaf: 82308fxx - offset 0x0738b ***/
 
   /* 30 */  0xe394af, 0xe394b0, 0xe394b1, 0xe394b2,
   /* 34 */  0xe394b3, 0xe394b4, 0xe394b5, 0xe394b6,
   /* 38 */  0xe394b7, 0xe394b8,
 
-  /*** Four byte table, leaf: 823090xx - offset 0x07321 ***/
+  /*** Four byte table, leaf: 823090xx - offset 0x07395 ***/
 
   /* 30 */  0xe394b9, 0xe394ba, 0xe394bb, 0xe394bc,
   /* 34 */  0xe394bd, 0xe394be, 0xe394bf, 0xe39580,
   /* 38 */  0xe39581, 0xe39582,
 
-  /*** Four byte table, leaf: 823091xx - offset 0x0732b ***/
+  /*** Four byte table, leaf: 823091xx - offset 0x0739f ***/
 
   /* 30 */  0xe39583, 0xe39584, 0xe39585, 0xe39586,
   /* 34 */  0xe39587, 0xe39588, 0xe39589, 0xe3958a,
   /* 38 */  0xe3958b, 0xe3958c,
 
-  /*** Four byte table, leaf: 823092xx - offset 0x07335 ***/
+  /*** Four byte table, leaf: 823092xx - offset 0x073a9 ***/
 
   /* 30 */  0xe3958d, 0xe3958e, 0xe3958f, 0xe39590,
   /* 34 */  0xe39591, 0xe39592, 0xe39593, 0xe39594,
   /* 38 */  0xe39595, 0xe39596,
 
-  /*** Four byte table, leaf: 823093xx - offset 0x0733f ***/
+  /*** Four byte table, leaf: 823093xx - offset 0x073b3 ***/
 
   /* 30 */  0xe39597, 0xe39598, 0xe39599, 0xe3959a,
   /* 34 */  0xe3959b, 0xe3959c, 0xe3959d, 0xe3959e,
   /* 38 */  0xe3959f, 0xe395a0,
 
-  /*** Four byte table, leaf: 823094xx - offset 0x07349 ***/
+  /*** Four byte table, leaf: 823094xx - offset 0x073bd ***/
 
   /* 30 */  0xe395a1, 0xe395a2, 0xe395a3, 0xe395a4,
   /* 34 */  0xe395a5, 0xe395a6, 0xe395a7, 0xe395a8,
   /* 38 */  0xe395a9, 0xe395aa,
 
-  /*** Four byte table, leaf: 823095xx - offset 0x07353 ***/
+  /*** Four byte table, leaf: 823095xx - offset 0x073c7 ***/
 
   /* 30 */  0xe395ab, 0xe395ac, 0xe395ad, 0xe395ae,
   /* 34 */  0xe395af, 0xe395b0, 0xe395b1, 0xe395b2,
   /* 38 */  0xe395b3, 0xe395b4,
 
-  /*** Four byte table, leaf: 823096xx - offset 0x0735d ***/
+  /*** Four byte table, leaf: 823096xx - offset 0x073d1 ***/
 
   /* 30 */  0xe395b5, 0xe395b6, 0xe395b7, 0xe395b8,
   /* 34 */  0xe395b9, 0xe395ba, 0xe395bb, 0xe395bc,
   /* 38 */  0xe395bd, 0xe395be,
 
-  /*** Four byte table, leaf: 823097xx - offset 0x07367 ***/
+  /*** Four byte table, leaf: 823097xx - offset 0x073db ***/
 
   /* 30 */  0xe395bf, 0xe39680, 0xe39681, 0xe39682,
   /* 34 */  0xe39683, 0xe39684, 0xe39685, 0xe39686,
   /* 38 */  0xe39687, 0xe39688,
 
-  /*** Four byte table, leaf: 823098xx - offset 0x07371 ***/
+  /*** Four byte table, leaf: 823098xx - offset 0x073e5 ***/
 
   /* 30 */  0xe39689, 0xe3968a, 0xe3968b, 0xe3968c,
   /* 34 */  0xe3968d, 0xe3968e, 0xe3968f, 0xe39690,
   /* 38 */  0xe39691, 0xe39692,
 
-  /*** Four byte table, leaf: 823099xx - offset 0x0737b ***/
+  /*** Four byte table, leaf: 823099xx - offset 0x073ef ***/
 
   /* 30 */  0xe39693, 0xe39694, 0xe39695, 0xe39696,
   /* 34 */  0xe39697, 0xe39698, 0xe39699, 0xe3969a,
   /* 38 */  0xe3969b, 0xe3969c,
 
-  /*** Four byte table, leaf: 82309axx - offset 0x07385 ***/
+  /*** Four byte table, leaf: 82309axx - offset 0x073f9 ***/
 
   /* 30 */  0xe3969d, 0xe3969f, 0xe396a0, 0xe396a1,
   /* 34 */  0xe396a2, 0xe396a3, 0xe396a4, 0xe396a5,
   /* 38 */  0xe396a6, 0xe396a7,
 
-  /*** Four byte table, leaf: 82309bxx - offset 0x0738f ***/
+  /*** Four byte table, leaf: 82309bxx - offset 0x07403 ***/
 
   /* 30 */  0xe396a8, 0xe396a9, 0xe396aa, 0xe396ab,
   /* 34 */  0xe396ac, 0xe396ad, 0xe396ae, 0xe396af,
   /* 38 */  0xe396b0, 0xe396b1,
 
-  /*** Four byte table, leaf: 82309cxx - offset 0x07399 ***/
+  /*** Four byte table, leaf: 82309cxx - offset 0x0740d ***/
 
   /* 30 */  0xe396b2, 0xe396b3, 0xe396b4, 0xe396b5,
   /* 34 */  0xe396b6, 0xe396b7, 0xe396b8, 0xe396b9,
   /* 38 */  0xe396ba, 0xe396bb,
 
-  /*** Four byte table, leaf: 82309dxx - offset 0x073a3 ***/
+  /*** Four byte table, leaf: 82309dxx - offset 0x07417 ***/
 
   /* 30 */  0xe396bc, 0xe396bd, 0xe396be, 0xe396bf,
   /* 34 */  0xe39780, 0xe39781, 0xe39782, 0xe39783,
   /* 38 */  0xe39784, 0xe39785,
 
-  /*** Four byte table, leaf: 82309exx - offset 0x073ad ***/
+  /*** Four byte table, leaf: 82309exx - offset 0x07421 ***/
 
   /* 30 */  0xe39786, 0xe39787, 0xe39788, 0xe39789,
   /* 34 */  0xe3978a, 0xe3978b, 0xe3978c, 0xe3978d,
   /* 38 */  0xe3978e, 0xe3978f,
 
-  /*** Four byte table, leaf: 82309fxx - offset 0x073b7 ***/
+  /*** Four byte table, leaf: 82309fxx - offset 0x0742b ***/
 
   /* 30 */  0xe39790, 0xe39791, 0xe39792, 0xe39793,
   /* 34 */  0xe39794, 0xe39795, 0xe39796, 0xe39797,
   /* 38 */  0xe39798, 0xe39799,
 
-  /*** Four byte table, leaf: 8230a0xx - offset 0x073c1 ***/
+  /*** Four byte table, leaf: 8230a0xx - offset 0x07435 ***/
 
   /* 30 */  0xe3979a, 0xe3979b, 0xe3979c, 0xe3979d,
   /* 34 */  0xe3979e, 0xe3979f, 0xe397a0, 0xe397a1,
   /* 38 */  0xe397a2, 0xe397a3,
 
-  /*** Four byte table, leaf: 8230a1xx - offset 0x073cb ***/
+  /*** Four byte table, leaf: 8230a1xx - offset 0x0743f ***/
 
   /* 30 */  0xe397a4, 0xe397a5, 0xe397a6, 0xe397a7,
   /* 34 */  0xe397a8, 0xe397a9, 0xe397aa, 0xe397ab,
   /* 38 */  0xe397ac, 0xe397ad,
 
-  /*** Four byte table, leaf: 8230a2xx - offset 0x073d5 ***/
+  /*** Four byte table, leaf: 8230a2xx - offset 0x07449 ***/
 
   /* 30 */  0xe397ae, 0xe397af, 0xe397b0, 0xe397b1,
   /* 34 */  0xe397b2, 0xe397b3, 0xe397b4, 0xe397b5,
   /* 38 */  0xe397b6, 0xe397b7,
 
-  /*** Four byte table, leaf: 8230a3xx - offset 0x073df ***/
+  /*** Four byte table, leaf: 8230a3xx - offset 0x07453 ***/
 
   /* 30 */  0xe397b8, 0xe397b9, 0xe397ba, 0xe397bb,
   /* 34 */  0xe397bc, 0xe397bd, 0xe397be, 0xe397bf,
   /* 38 */  0xe39880, 0xe39881,
 
-  /*** Four byte table, leaf: 8230a4xx - offset 0x073e9 ***/
+  /*** Four byte table, leaf: 8230a4xx - offset 0x0745d ***/
 
   /* 30 */  0xe39882, 0xe39883, 0xe39884, 0xe39885,
   /* 34 */  0xe39886, 0xe39887, 0xe39888, 0xe39889,
   /* 38 */  0xe3988a, 0xe3988b,
 
-  /*** Four byte table, leaf: 8230a5xx - offset 0x073f3 ***/
+  /*** Four byte table, leaf: 8230a5xx - offset 0x07467 ***/
 
   /* 30 */  0xe3988c, 0xe3988d, 0xe3988f, 0xe39890,
   /* 34 */  0xe39891, 0xe39892, 0xe39893, 0xe39894,
   /* 38 */  0xe39895, 0xe39896,
 
-  /*** Four byte table, leaf: 8230a6xx - offset 0x073fd ***/
+  /*** Four byte table, leaf: 8230a6xx - offset 0x07471 ***/
 
   /* 30 */  0xe39897, 0xe39898, 0xe39899,
     /* 7 trailing zero values shared with next segment */
 
-  /*** Four byte table, leaf: 8230f2xx - offset 0x07400 ***/
+  /*** Four byte table, leaf: 8230f2xx - offset 0x07474 ***/
 
   /* 30 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 34 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 38 */  0xe3a499, 0xe3a49a,
 
-  /*** Four byte table, leaf: 8230f3xx - offset 0x0740a ***/
+  /*** Four byte table, leaf: 8230f3xx - offset 0x0747e ***/
 
   /* 30 */  0xe3a49b, 0xe3a49c, 0xe3a49d, 0xe3a49e,
   /* 34 */  0xe3a49f, 0xe3a4a0, 0xe3a4a1, 0xe3a4a2,
   /* 38 */  0xe3a4a3, 0xe3a4a4,
 
-  /*** Four byte table, leaf: 8230f4xx - offset 0x07414 ***/
+  /*** Four byte table, leaf: 8230f4xx - offset 0x07488 ***/
 
   /* 30 */  0xe3a4a5, 0xe3a4a6, 0xe3a4a7, 0xe3a4a8,
   /* 34 */  0xe3a4a9, 0xe3a4aa, 0xe3a4ab, 0xe3a4ac,
   /* 38 */  0xe3a4ad, 0xe3a4ae,
 
-  /*** Four byte table, leaf: 8230f5xx - offset 0x0741e ***/
+  /*** Four byte table, leaf: 8230f5xx - offset 0x07492 ***/
 
   /* 30 */  0xe3a4af, 0xe3a4b0, 0xe3a4b1, 0xe3a4b2,
   /* 34 */  0xe3a4b3, 0xe3a4b4, 0xe3a4b5, 0xe3a4b6,
   /* 38 */  0xe3a4b7, 0xe3a4b8,
 
-  /*** Four byte table, leaf: 8230f6xx - offset 0x07428 ***/
+  /*** Four byte table, leaf: 8230f6xx - offset 0x0749c ***/
 
   /* 30 */  0xe3a4b9, 0xe3a4ba, 0xe3a4bb, 0xe3a4bc,
   /* 34 */  0xe3a4bd, 0xe3a4be, 0xe3a4bf, 0xe3a580,
   /* 38 */  0xe3a581, 0xe3a582,
 
-  /*** Four byte table, leaf: 8230f7xx - offset 0x07432 ***/
+  /*** Four byte table, leaf: 8230f7xx - offset 0x074a6 ***/
 
   /* 30 */  0xe3a583, 0xe3a584, 0xe3a585, 0xe3a586,
   /* 34 */  0xe3a587, 0xe3a588, 0xe3a589, 0xe3a58a,
   /* 38 */  0xe3a58b, 0xe3a58c,
 
-  /*** Four byte table, leaf: 8230f8xx - offset 0x0743c ***/
+  /*** Four byte table, leaf: 8230f8xx - offset 0x074b0 ***/
 
   /* 30 */  0xe3a58d, 0xe3a58e, 0xe3a58f, 0xe3a590,
   /* 34 */  0xe3a591, 0xe3a592, 0xe3a593, 0xe3a594,
   /* 38 */  0xe3a595, 0xe3a596,
 
-  /*** Four byte table, leaf: 8230f9xx - offset 0x07446 ***/
+  /*** Four byte table, leaf: 8230f9xx - offset 0x074ba ***/
 
   /* 30 */  0xe3a597, 0xe3a598, 0xe3a599, 0xe3a59a,
   /* 34 */  0xe3a59b, 0xe3a59c, 0xe3a59d, 0xe3a59e,
   /* 38 */  0xe3a59f, 0xe3a5a0,
 
-  /*** Four byte table, leaf: 8230faxx - offset 0x07450 ***/
+  /*** Four byte table, leaf: 8230faxx - offset 0x074c4 ***/
 
   /* 30 */  0xe3a5a1, 0xe3a5a2, 0xe3a5a3, 0xe3a5a4,
   /* 34 */  0xe3a5a5, 0xe3a5a6, 0xe3a5a7, 0xe3a5a8,
   /* 38 */  0xe3a5a9, 0xe3a5aa,
 
-  /*** Four byte table, leaf: 8230fbxx - offset 0x0745a ***/
+  /*** Four byte table, leaf: 8230fbxx - offset 0x074ce ***/
 
   /* 30 */  0xe3a5ab, 0xe3a5ac, 0xe3a5ad, 0xe3a5af,
   /* 34 */  0xe3a5b0, 0xe3a5b1, 0xe3a5b2, 0xe3a5b3,
   /* 38 */  0xe3a5b4, 0xe3a5b5,
 
-  /*** Four byte table, leaf: 8230fcxx - offset 0x07464 ***/
+  /*** Four byte table, leaf: 8230fcxx - offset 0x074d8 ***/
 
   /* 30 */  0xe3a5b6, 0xe3a5b7, 0xe3a5b8, 0xe3a5b9,
   /* 34 */  0xe3a5ba, 0xe3a5bb, 0xe3a5bc, 0xe3a5bd,
   /* 38 */  0xe3a5be, 0xe3a5bf,
 
-  /*** Four byte table, leaf: 8230fdxx - offset 0x0746e ***/
+  /*** Four byte table, leaf: 8230fdxx - offset 0x074e2 ***/
 
   /* 30 */  0xe3a680, 0xe3a681, 0xe3a682, 0xe3a683,
   /* 34 */  0xe3a684, 0xe3a685, 0xe3a686, 0xe3a687,
   /* 38 */  0xe3a688, 0xe3a689,
 
-  /*** Four byte table, leaf: 8230fexx - offset 0x07478 ***/
+  /*** Four byte table, leaf: 8230fexx - offset 0x074ec ***/
 
   /* 30 */  0xe3a68a, 0xe3a68b, 0xe3a68c, 0xe3a68d,
   /* 34 */  0xe3a68e, 0xe3a68f, 0xe3a690, 0xe3a691,
   /* 38 */  0xe3a692, 0xe3a693,
 
-  /*** Four byte table, leaf: 823181xx - offset 0x07482 ***/
+  /*** Four byte table, leaf: 823181xx - offset 0x074f6 ***/
 
   /* 30 */  0xe3a694, 0xe3a695, 0xe3a696, 0xe3a697,
   /* 34 */  0xe3a698, 0xe3a699, 0xe3a69a, 0xe3a69b,
   /* 38 */  0xe3a69c, 0xe3a69d,
 
-  /*** Four byte table, leaf: 823182xx - offset 0x0748c ***/
+  /*** Four byte table, leaf: 823182xx - offset 0x07500 ***/
 
   /* 30 */  0xe3a69e, 0xe3a69f, 0xe3a6a0, 0xe3a6a1,
   /* 34 */  0xe3a6a2, 0xe3a6a3, 0xe3a6a4, 0xe3a6a5,
   /* 38 */  0xe3a6a6, 0xe3a6a7,
 
-  /*** Four byte table, leaf: 823183xx - offset 0x07496 ***/
+  /*** Four byte table, leaf: 823183xx - offset 0x0750a ***/
 
   /* 30 */  0xe3a6a8, 0xe3a6a9, 0xe3a6aa, 0xe3a6ab,
   /* 34 */  0xe3a6ac, 0xe3a6ad, 0xe3a6ae, 0xe3a6af,
   /* 38 */  0xe3a6b0, 0xe3a6b1,
 
-  /*** Four byte table, leaf: 823184xx - offset 0x074a0 ***/
+  /*** Four byte table, leaf: 823184xx - offset 0x07514 ***/
 
   /* 30 */  0xe3a6b2, 0xe3a6b3, 0xe3a6b4, 0xe3a6b5,
   /* 34 */  0xe3a6b6, 0xe3a6b7, 0xe3a6b8, 0xe3a6b9,
   /* 38 */  0xe3a6ba, 0xe3a6bb,
 
-  /*** Four byte table, leaf: 823185xx - offset 0x074aa ***/
+  /*** Four byte table, leaf: 823185xx - offset 0x0751e ***/
 
   /* 30 */  0xe3a6bc, 0xe3a6bd, 0xe3a6be, 0xe3a6bf,
   /* 34 */  0xe3a780, 0xe3a781, 0xe3a782, 0xe3a783,
   /* 38 */  0xe3a784, 0xe3a785,
 
-  /*** Four byte table, leaf: 823186xx - offset 0x074b4 ***/
+  /*** Four byte table, leaf: 823186xx - offset 0x07528 ***/
 
   /* 30 */  0xe3a786, 0xe3a787, 0xe3a788, 0xe3a789,
   /* 34 */  0xe3a78a, 0xe3a78b, 0xe3a78c, 0xe3a78d,
   /* 38 */  0xe3a78e, 0xe3a791,
 
-  /*** Four byte table, leaf: 823187xx - offset 0x074be ***/
+  /*** Four byte table, leaf: 823187xx - offset 0x07532 ***/
 
   /* 30 */  0xe3a792, 0xe3a793, 0xe3a794, 0xe3a795,
   /* 34 */  0xe3a796, 0xe3a797, 0xe3a798, 0xe3a799,
   /* 38 */  0xe3a79a, 0xe3a79b,
 
-  /*** Four byte table, leaf: 823188xx - offset 0x074c8 ***/
+  /*** Four byte table, leaf: 823188xx - offset 0x0753c ***/
 
   /* 30 */  0xe3a79c, 0xe3a79d, 0xe3a79e, 0xe3a7a0,
   /* 34 */  0xe3a7a1, 0xe3a7a2, 0xe3a7a3, 0xe3a7a4,
   /* 38 */  0xe3a7a5, 0xe3a7a6,
 
-  /*** Four byte table, leaf: 823189xx - offset 0x074d2 ***/
+  /*** Four byte table, leaf: 823189xx - offset 0x07546 ***/
 
   /* 30 */  0xe3a7a7, 0xe3a7a8, 0xe3a7a9, 0xe3a7aa,
   /* 34 */  0xe3a7ab, 0xe3a7ac, 0xe3a7ad, 0xe3a7ae,
   /* 38 */  0xe3a7af, 0xe3a7b0,
 
-  /*** Four byte table, leaf: 82318axx - offset 0x074dc ***/
+  /*** Four byte table, leaf: 82318axx - offset 0x07550 ***/
 
   /* 30 */  0xe3a7b1, 0xe3a7b2, 0xe3a7b3, 0xe3a7b4,
   /* 34 */  0xe3a7b5, 0xe3a7b6, 0xe3a7b7, 0xe3a7b8,
   /* 38 */  0xe3a7b9, 0xe3a7ba,
 
-  /*** Four byte table, leaf: 82318bxx - offset 0x074e6 ***/
+  /*** Four byte table, leaf: 82318bxx - offset 0x0755a ***/
 
   /* 30 */  0xe3a7bb, 0xe3a7bc, 0xe3a7bd, 0xe3a7be,
   /* 34 */  0xe3a7bf, 0xe3a880, 0xe3a881, 0xe3a882,
   /* 38 */  0xe3a883, 0xe3a884,
 
-  /*** Four byte table, leaf: 82318cxx - offset 0x074f0 ***/
+  /*** Four byte table, leaf: 82318cxx - offset 0x07564 ***/
 
   /* 30 */  0xe3a885, 0xe3a886, 0xe3a887, 0xe3a888,
   /* 34 */  0xe3a889, 0xe3a88a, 0xe3a88b, 0xe3a88c,
   /* 38 */  0xe3a88d, 0xe3a88e,
 
-  /*** Four byte table, leaf: 82318dxx - offset 0x074fa ***/
+  /*** Four byte table, leaf: 82318dxx - offset 0x0756e ***/
 
   /* 30 */  0xe3a88f, 0xe3a890, 0xe3a891, 0xe3a892,
   /* 34 */  0xe3a893, 0xe3a894, 0xe3a895, 0xe3a896,
   /* 38 */  0xe3a897, 0xe3a898,
 
-  /*** Four byte table, leaf: 82318exx - offset 0x07504 ***/
+  /*** Four byte table, leaf: 82318exx - offset 0x07578 ***/
 
   /* 30 */  0xe3a899, 0xe3a89a, 0xe3a89b, 0xe3a89c,
   /* 34 */  0xe3a89d, 0xe3a89e, 0xe3a89f, 0xe3a8a0,
   /* 38 */  0xe3a8a1, 0xe3a8a2,
 
-  /*** Four byte table, leaf: 82318fxx - offset 0x0750e ***/
+  /*** Four byte table, leaf: 82318fxx - offset 0x07582 ***/
 
   /* 30 */  0xe3a8a3, 0xe3a8a4, 0xe3a8a5, 0xe3a8a6,
   /* 34 */  0xe3a8a7, 0xe3a8a8, 0xe3a8a9, 0xe3a8aa,
   /* 38 */  0xe3a8ab, 0xe3a8ac,
 
-  /*** Four byte table, leaf: 823190xx - offset 0x07518 ***/
+  /*** Four byte table, leaf: 823190xx - offset 0x0758c ***/
 
   /* 30 */  0xe3a8ad, 0xe3a8ae, 0xe3a8af, 0xe3a8b0,
   /* 34 */  0xe3a8b1, 0xe3a8b2, 0xe3a8b3, 0xe3a8b4,
   /* 38 */  0xe3a8b5, 0xe3a8b6,
 
-  /*** Four byte table, leaf: 823191xx - offset 0x07522 ***/
+  /*** Four byte table, leaf: 823191xx - offset 0x07596 ***/
 
   /* 30 */  0xe3a8b7, 0xe3a8b8, 0xe3a8b9, 0xe3a8ba,
   /* 34 */  0xe3a8bb, 0xe3a8bc, 0xe3a8bd, 0xe3a8be,
   /* 38 */  0xe3a8bf, 0xe3a980,
 
-  /*** Four byte table, leaf: 823192xx - offset 0x0752c ***/
+  /*** Four byte table, leaf: 823192xx - offset 0x075a0 ***/
 
   /* 30 */  0xe3a981, 0xe3a982, 0xe3a983, 0xe3a984,
   /* 34 */  0xe3a985, 0xe3a986, 0xe3a987, 0xe3a988,
   /* 38 */  0xe3a989, 0xe3a98a,
 
-  /*** Four byte table, leaf: 823193xx - offset 0x07536 ***/
+  /*** Four byte table, leaf: 823193xx - offset 0x075aa ***/
 
   /* 30 */  0xe3a98b, 0xe3a98c, 0xe3a98d, 0xe3a98e,
   /* 34 */  0xe3a98f, 0xe3a990, 0xe3a991, 0xe3a992,
   /* 38 */  0xe3a993, 0xe3a994,
 
-  /*** Four byte table, leaf: 823194xx - offset 0x07540 ***/
+  /*** Four byte table, leaf: 823194xx - offset 0x075b4 ***/
 
   /* 30 */  0xe3a995, 0xe3a996, 0xe3a997, 0xe3a998,
   /* 34 */  0xe3a999, 0xe3a99a, 0xe3a99b, 0xe3a99c,
   /* 38 */  0xe3a99d, 0xe3a99e,
 
-  /*** Four byte table, leaf: 823195xx - offset 0x0754a ***/
+  /*** Four byte table, leaf: 823195xx - offset 0x075be ***/
 
   /* 30 */  0xe3a99f, 0xe3a9a0, 0xe3a9a1, 0xe3a9a2,
   /* 34 */  0xe3a9a3, 0xe3a9a4, 0xe3a9a5, 0xe3a9a6,
   /* 38 */  0xe3a9a7, 0xe3a9a8,
 
-  /*** Four byte table, leaf: 823196xx - offset 0x07554 ***/
+  /*** Four byte table, leaf: 823196xx - offset 0x075c8 ***/
 
   /* 30 */  0xe3a9a9, 0xe3a9aa, 0xe3a9ab, 0xe3a9ac,
   /* 34 */  0xe3a9ad, 0xe3a9ae, 0xe3a9af, 0xe3a9b0,
   /* 38 */  0xe3a9b1, 0xe3a9b2,
 
-  /*** Four byte table, leaf: 823197xx - offset 0x0755e ***/
+  /*** Four byte table, leaf: 823197xx - offset 0x075d2 ***/
 
   /* 30 */  0xe3a9b4, 0xe3a9b5, 0xe3a9b6, 0xe3a9b7,
   /* 34 */  0xe3a9b8, 0xe3a9b9, 0xe3a9ba, 0xe3a9bb,
   /* 38 */  0xe3a9bc, 0xe3a9bd,
 
-  /*** Four byte table, leaf: 823198xx - offset 0x07568 ***/
+  /*** Four byte table, leaf: 823198xx - offset 0x075dc ***/
 
   /* 30 */  0xe3a9be, 0xe3a9bf, 0xe3aa80, 0xe3aa81,
   /* 34 */  0xe3aa82, 0xe3aa83, 0xe3aa84, 0xe3aa85,
   /* 38 */  0xe3aa86, 0xe3aa87,
 
-  /*** Four byte table, leaf: 823199xx - offset 0x07572 ***/
+  /*** Four byte table, leaf: 823199xx - offset 0x075e6 ***/
 
   /* 30 */  0xe3aa88, 0xe3aa89, 0xe3aa8a, 0xe3aa8b,
   /* 34 */  0xe3aa8c, 0xe3aa8d, 0xe3aa8e, 0xe3aa8f,
   /* 38 */  0xe3aa90, 0xe3aa91,
 
-  /*** Four byte table, leaf: 82319axx - offset 0x0757c ***/
+  /*** Four byte table, leaf: 82319axx - offset 0x075f0 ***/
 
   /* 30 */  0xe3aa92, 0xe3aa93, 0xe3aa94, 0xe3aa95,
   /* 34 */  0xe3aa96, 0xe3aa97, 0xe3aa98, 0xe3aa99,
   /* 38 */  0xe3aa9a, 0xe3aa9b,
 
-  /*** Four byte table, leaf: 82319bxx - offset 0x07586 ***/
+  /*** Four byte table, leaf: 82319bxx - offset 0x075fa ***/
 
   /* 30 */  0xe3aa9c, 0xe3aa9d, 0xe3aa9e, 0xe3aa9f,
   /* 34 */  0xe3aaa0, 0xe3aaa1, 0xe3aaa2, 0xe3aaa3,
   /* 38 */  0xe3aaa4, 0xe3aaa5,
 
-  /*** Four byte table, leaf: 82319cxx - offset 0x07590 ***/
+  /*** Four byte table, leaf: 82319cxx - offset 0x07604 ***/
 
   /* 30 */  0xe3aaa6, 0xe3aaa7, 0xe3aaa8, 0xe3aaa9,
   /* 34 */  0xe3aaaa, 0xe3aaab, 0xe3aaac, 0xe3aaad,
   /* 38 */  0xe3aaae, 0xe3aaaf,
 
-  /*** Four byte table, leaf: 82319dxx - offset 0x0759a ***/
+  /*** Four byte table, leaf: 82319dxx - offset 0x0760e ***/
 
   /* 30 */  0xe3aab0, 0xe3aab1, 0xe3aab2, 0xe3aab3,
   /* 34 */  0xe3aab4, 0xe3aab5, 0xe3aab6, 0xe3aab7,
   /* 38 */  0xe3aab8, 0xe3aab9,
 
-  /*** Four byte table, leaf: 82319exx - offset 0x075a4 ***/
+  /*** Four byte table, leaf: 82319exx - offset 0x07618 ***/
 
   /* 30 */  0xe3aaba, 0xe3aabb, 0xe3aabc, 0xe3aabd,
   /* 34 */  0xe3aabe, 0xe3aabf, 0xe3ab80, 0xe3ab81,
   /* 38 */  0xe3ab82, 0xe3ab83,
 
-  /*** Four byte table, leaf: 82319fxx - offset 0x075ae ***/
+  /*** Four byte table, leaf: 82319fxx - offset 0x07622 ***/
 
   /* 30 */  0xe3ab84, 0xe3ab85, 0xe3ab86, 0xe3ab87,
   /* 34 */  0xe3ab88, 0xe3ab89, 0xe3ab8a, 0xe3ab8b,
   /* 38 */  0xe3ab8c, 0xe3ab8d,
 
-  /*** Four byte table, leaf: 8231a0xx - offset 0x075b8 ***/
+  /*** Four byte table, leaf: 8231a0xx - offset 0x0762c ***/
 
   /* 30 */  0xe3ab8e, 0xe3ab8f, 0xe3ab90, 0xe3ab91,
   /* 34 */  0xe3ab92, 0xe3ab93, 0xe3ab94, 0xe3ab95,
   /* 38 */  0xe3ab96, 0xe3ab97,
 
-  /*** Four byte table, leaf: 8231a1xx - offset 0x075c2 ***/
+  /*** Four byte table, leaf: 8231a1xx - offset 0x07636 ***/
 
   /* 30 */  0xe3ab98, 0xe3ab99, 0xe3ab9a, 0xe3ab9b,
   /* 34 */  0xe3ab9c, 0xe3ab9d, 0xe3ab9e, 0xe3ab9f,
   /* 38 */  0xe3aba0, 0xe3aba1,
 
-  /*** Four byte table, leaf: 8231a2xx - offset 0x075cc ***/
+  /*** Four byte table, leaf: 8231a2xx - offset 0x07640 ***/
 
   /* 30 */  0xe3aba2, 0xe3aba3, 0xe3aba4, 0xe3aba5,
   /* 34 */  0xe3aba6, 0xe3aba7, 0xe3aba8, 0xe3aba9,
   /* 38 */  0xe3abaa, 0xe3abab,
 
-  /*** Four byte table, leaf: 8231a3xx - offset 0x075d6 ***/
+  /*** Four byte table, leaf: 8231a3xx - offset 0x0764a ***/
 
   /* 30 */  0xe3abac, 0xe3abad, 0xe3abae, 0xe3abaf,
   /* 34 */  0xe3abb0, 0xe3abb1, 0xe3abb2, 0xe3abb3,
   /* 38 */  0xe3abb4, 0xe3abb5,
 
-  /*** Four byte table, leaf: 8231a4xx - offset 0x075e0 ***/
+  /*** Four byte table, leaf: 8231a4xx - offset 0x07654 ***/
 
   /* 30 */  0xe3abb6, 0xe3abb7, 0xe3abb8, 0xe3abb9,
   /* 34 */  0xe3abba, 0xe3abbb, 0xe3abbc, 0xe3abbd,
   /* 38 */  0xe3abbe, 0xe3abbf,
 
-  /*** Four byte table, leaf: 8231a5xx - offset 0x075ea ***/
+  /*** Four byte table, leaf: 8231a5xx - offset 0x0765e ***/
 
   /* 30 */  0xe3ac80, 0xe3ac81, 0xe3ac82, 0xe3ac83,
   /* 34 */  0xe3ac84, 0xe3ac85, 0xe3ac86, 0xe3ac87,
   /* 38 */  0xe3ac88, 0xe3ac89,
 
-  /*** Four byte table, leaf: 8231a6xx - offset 0x075f4 ***/
+  /*** Four byte table, leaf: 8231a6xx - offset 0x07668 ***/
 
   /* 30 */  0xe3ac8a, 0xe3ac8b, 0xe3ac8c, 0xe3ac8d,
   /* 34 */  0xe3ac8e, 0xe3ac8f, 0xe3ac90, 0xe3ac91,
   /* 38 */  0xe3ac92, 0xe3ac93,
 
-  /*** Four byte table, leaf: 8231a7xx - offset 0x075fe ***/
+  /*** Four byte table, leaf: 8231a7xx - offset 0x07672 ***/
 
   /* 30 */  0xe3ac94, 0xe3ac95, 0xe3ac96, 0xe3ac97,
   /* 34 */  0xe3ac98, 0xe3ac99, 0xe3ac9a, 0xe3ac9b,
   /* 38 */  0xe3ac9c, 0xe3ac9d,
 
-  /*** Four byte table, leaf: 8231a8xx - offset 0x07608 ***/
+  /*** Four byte table, leaf: 8231a8xx - offset 0x0767c ***/
 
   /* 30 */  0xe3ac9e, 0xe3ac9f, 0xe3aca0, 0xe3aca1,
   /* 34 */  0xe3aca2, 0xe3aca3, 0xe3aca4, 0xe3aca5,
   /* 38 */  0xe3aca6, 0xe3aca7,
 
-  /*** Four byte table, leaf: 8231a9xx - offset 0x07612 ***/
+  /*** Four byte table, leaf: 8231a9xx - offset 0x07686 ***/
 
   /* 30 */  0xe3aca8, 0xe3aca9, 0xe3acaa, 0xe3acab,
   /* 34 */  0xe3acac, 0xe3acad, 0xe3acae, 0xe3acaf,
   /* 38 */  0xe3acb0, 0xe3acb1,
 
-  /*** Four byte table, leaf: 8231aaxx - offset 0x0761c ***/
+  /*** Four byte table, leaf: 8231aaxx - offset 0x07690 ***/
 
   /* 30 */  0xe3acb2, 0xe3acb3, 0xe3acb4, 0xe3acb5,
   /* 34 */  0xe3acb6, 0xe3acb7, 0xe3acb8, 0xe3acb9,
   /* 38 */  0xe3acba, 0xe3acbb,
 
-  /*** Four byte table, leaf: 8231abxx - offset 0x07626 ***/
+  /*** Four byte table, leaf: 8231abxx - offset 0x0769a ***/
 
   /* 30 */  0xe3acbc, 0xe3acbd, 0xe3acbe, 0xe3acbf,
   /* 34 */  0xe3ad80, 0xe3ad81, 0xe3ad82, 0xe3ad83,
   /* 38 */  0xe3ad84, 0xe3ad85,
 
-  /*** Four byte table, leaf: 8231acxx - offset 0x07630 ***/
+  /*** Four byte table, leaf: 8231acxx - offset 0x076a4 ***/
 
   /* 30 */  0xe3ad86, 0xe3ad87, 0xe3ad88, 0xe3ad89,
   /* 34 */  0xe3ad8a, 0xe3ad8b, 0xe3ad8c, 0xe3ad8d,
   /* 38 */  0xe3ad8f, 0xe3ad90,
 
-  /*** Four byte table, leaf: 8231adxx - offset 0x0763a ***/
+  /*** Four byte table, leaf: 8231adxx - offset 0x076ae ***/
 
   /* 30 */  0xe3ad91, 0xe3ad92, 0xe3ad93, 0xe3ad94,
   /* 34 */  0xe3ad95, 0xe3ad96, 0xe3ad97, 0xe3ad98,
   /* 38 */  0xe3ad99, 0xe3ad9a,
 
-  /*** Four byte table, leaf: 8231aexx - offset 0x07644 ***/
+  /*** Four byte table, leaf: 8231aexx - offset 0x076b8 ***/
 
   /* 30 */  0xe3ad9b, 0xe3ad9c, 0xe3ad9d, 0xe3ad9e,
   /* 34 */  0xe3ad9f, 0xe3ada0, 0xe3ada1, 0xe3ada2,
   /* 38 */  0xe3ada3, 0xe3ada4,
 
-  /*** Four byte table, leaf: 8231afxx - offset 0x0764e ***/
+  /*** Four byte table, leaf: 8231afxx - offset 0x076c2 ***/
 
   /* 30 */  0xe3ada5, 0xe3ada6, 0xe3ada7, 0xe3ada8,
   /* 34 */  0xe3ada9, 0xe3adaa, 0xe3adab, 0xe3adac,
   /* 38 */  0xe3adad, 0xe3adae,
 
-  /*** Four byte table, leaf: 8231b0xx - offset 0x07658 ***/
+  /*** Four byte table, leaf: 8231b0xx - offset 0x076cc ***/
 
   /* 30 */  0xe3adaf, 0xe3adb0, 0xe3adb1, 0xe3adb2,
   /* 34 */  0xe3adb3, 0xe3adb4, 0xe3adb5, 0xe3adb6,
   /* 38 */  0xe3adb7, 0xe3adb8,
 
-  /*** Four byte table, leaf: 8231b1xx - offset 0x07662 ***/
+  /*** Four byte table, leaf: 8231b1xx - offset 0x076d6 ***/
 
   /* 30 */  0xe3adb9, 0xe3adba, 0xe3adbb, 0xe3adbc,
   /* 34 */  0xe3adbd, 0xe3adbe, 0xe3adbf, 0xe3ae80,
   /* 38 */  0xe3ae81, 0xe3ae82,
 
-  /*** Four byte table, leaf: 8231b2xx - offset 0x0766c ***/
+  /*** Four byte table, leaf: 8231b2xx - offset 0x076e0 ***/
 
   /* 30 */  0xe3ae83, 0xe3ae84, 0xe3ae85, 0xe3ae86,
   /* 34 */  0xe3ae87, 0xe3ae88, 0xe3ae89, 0xe3ae8a,
   /* 38 */  0xe3ae8b, 0xe3ae8c,
 
-  /*** Four byte table, leaf: 8231b3xx - offset 0x07676 ***/
+  /*** Four byte table, leaf: 8231b3xx - offset 0x076ea ***/
 
   /* 30 */  0xe3ae8d, 0xe3ae8e, 0xe3ae8f, 0xe3ae90,
   /* 34 */  0xe3ae91, 0xe3ae92, 0xe3ae93, 0xe3ae94,
   /* 38 */  0xe3ae95, 0xe3ae96,
 
-  /*** Four byte table, leaf: 8231b4xx - offset 0x07680 ***/
+  /*** Four byte table, leaf: 8231b4xx - offset 0x076f4 ***/
 
   /* 30 */  0xe3ae97, 0xe3ae98, 0xe3ae99, 0xe3ae9a,
   /* 34 */  0xe3ae9b, 0xe3ae9c, 0xe3ae9d, 0xe3ae9e,
   /* 38 */  0xe3ae9f, 0xe3aea0,
 
-  /*** Four byte table, leaf: 8231b5xx - offset 0x0768a ***/
+  /*** Four byte table, leaf: 8231b5xx - offset 0x076fe ***/
 
   /* 30 */  0xe3aea1, 0xe3aea2, 0xe3aea3, 0xe3aea4,
   /* 34 */  0xe3aea5, 0xe3aea6, 0xe3aea7, 0xe3aea8,
   /* 38 */  0xe3aea9, 0xe3aeaa,
 
-  /*** Four byte table, leaf: 8231b6xx - offset 0x07694 ***/
+  /*** Four byte table, leaf: 8231b6xx - offset 0x07708 ***/
 
   /* 30 */  0xe3aeab, 0xe3aeac, 0xe3aead, 0xe3aeae,
   /* 34 */  0xe3aeaf, 0xe3aeb0, 0xe3aeb1, 0xe3aeb2,
   /* 38 */  0xe3aeb3, 0xe3aeb4,
 
-  /*** Four byte table, leaf: 8231b7xx - offset 0x0769e ***/
+  /*** Four byte table, leaf: 8231b7xx - offset 0x07712 ***/
 
   /* 30 */  0xe3aeb5, 0xe3aeb6, 0xe3aeb7, 0xe3aeb8,
   /* 34 */  0xe3aeb9, 0xe3aeba, 0xe3aebb, 0xe3aebc,
   /* 38 */  0xe3aebd, 0xe3aebe,
 
-  /*** Four byte table, leaf: 8231b8xx - offset 0x076a8 ***/
+  /*** Four byte table, leaf: 8231b8xx - offset 0x0771c ***/
 
   /* 30 */  0xe3aebf, 0xe3af80, 0xe3af81, 0xe3af82,
   /* 34 */  0xe3af83, 0xe3af84, 0xe3af85, 0xe3af86,
   /* 38 */  0xe3af87, 0xe3af88,
 
-  /*** Four byte table, leaf: 8231b9xx - offset 0x076b2 ***/
+  /*** Four byte table, leaf: 8231b9xx - offset 0x07726 ***/
 
   /* 30 */  0xe3af89, 0xe3af8a, 0xe3af8b, 0xe3af8c,
   /* 34 */  0xe3af8d, 0xe3af8e, 0xe3af8f, 0xe3af90,
   /* 38 */  0xe3af91, 0xe3af92,
 
-  /*** Four byte table, leaf: 8231baxx - offset 0x076bc ***/
+  /*** Four byte table, leaf: 8231baxx - offset 0x07730 ***/
 
   /* 30 */  0xe3af93, 0xe3af94, 0xe3af95, 0xe3af96,
   /* 34 */  0xe3af97, 0xe3af98, 0xe3af99, 0xe3af9a,
   /* 38 */  0xe3af9b, 0xe3af9c,
 
-  /*** Four byte table, leaf: 8231bbxx - offset 0x076c6 ***/
+  /*** Four byte table, leaf: 8231bbxx - offset 0x0773a ***/
 
   /* 30 */  0xe3af9d, 0xe3af9e, 0xe3af9f, 0xe3afa0,
   /* 34 */  0xe3afa1, 0xe3afa2, 0xe3afa3, 0xe3afa4,
   /* 38 */  0xe3afa5, 0xe3afa6,
 
-  /*** Four byte table, leaf: 8231bcxx - offset 0x076d0 ***/
+  /*** Four byte table, leaf: 8231bcxx - offset 0x07744 ***/
 
   /* 30 */  0xe3afa7, 0xe3afa8, 0xe3afa9, 0xe3afaa,
   /* 34 */  0xe3afab, 0xe3afac, 0xe3afad, 0xe3afae,
   /* 38 */  0xe3afaf, 0xe3afb0,
 
-  /*** Four byte table, leaf: 8231bdxx - offset 0x076da ***/
+  /*** Four byte table, leaf: 8231bdxx - offset 0x0774e ***/
 
   /* 30 */  0xe3afb1, 0xe3afb2, 0xe3afb3, 0xe3afb4,
   /* 34 */  0xe3afb5, 0xe3afb6, 0xe3afb7, 0xe3afb8,
   /* 38 */  0xe3afb9, 0xe3afba,
 
-  /*** Four byte table, leaf: 8231bexx - offset 0x076e4 ***/
+  /*** Four byte table, leaf: 8231bexx - offset 0x07758 ***/
 
   /* 30 */  0xe3afbb, 0xe3afbc, 0xe3afbd, 0xe3afbe,
   /* 34 */  0xe3afbf, 0xe3b080, 0xe3b081, 0xe3b082,
   /* 38 */  0xe3b083, 0xe3b084,
 
-  /*** Four byte table, leaf: 8231bfxx - offset 0x076ee ***/
+  /*** Four byte table, leaf: 8231bfxx - offset 0x07762 ***/
 
   /* 30 */  0xe3b085, 0xe3b086, 0xe3b087, 0xe3b088,
   /* 34 */  0xe3b089, 0xe3b08a, 0xe3b08b, 0xe3b08c,
   /* 38 */  0xe3b08d, 0xe3b08e,
 
-  /*** Four byte table, leaf: 8231c0xx - offset 0x076f8 ***/
+  /*** Four byte table, leaf: 8231c0xx - offset 0x0776c ***/
 
   /* 30 */  0xe3b08f, 0xe3b090, 0xe3b091, 0xe3b092,
   /* 34 */  0xe3b093, 0xe3b094, 0xe3b095, 0xe3b096,
   /* 38 */  0xe3b097, 0xe3b098,
 
-  /*** Four byte table, leaf: 8231c1xx - offset 0x07702 ***/
+  /*** Four byte table, leaf: 8231c1xx - offset 0x07776 ***/
 
   /* 30 */  0xe3b099, 0xe3b09a, 0xe3b09b, 0xe3b09c,
   /* 34 */  0xe3b09d, 0xe3b09e, 0xe3b09f, 0xe3b0a0,
   /* 38 */  0xe3b0a1, 0xe3b0a2,
 
-  /*** Four byte table, leaf: 8231c2xx - offset 0x0770c ***/
+  /*** Four byte table, leaf: 8231c2xx - offset 0x07780 ***/
 
   /* 30 */  0xe3b0a3, 0xe3b0a4, 0xe3b0a5, 0xe3b0a6,
   /* 34 */  0xe3b0a7, 0xe3b0a8, 0xe3b0a9, 0xe3b0aa,
   /* 38 */  0xe3b0ab, 0xe3b0ac,
 
-  /*** Four byte table, leaf: 8231c3xx - offset 0x07716 ***/
+  /*** Four byte table, leaf: 8231c3xx - offset 0x0778a ***/
 
   /* 30 */  0xe3b0ad, 0xe3b0ae, 0xe3b0af, 0xe3b0b0,
   /* 34 */  0xe3b0b1, 0xe3b0b2, 0xe3b0b3, 0xe3b0b4,
   /* 38 */  0xe3b0b5, 0xe3b0b6,
 
-  /*** Four byte table, leaf: 8231c4xx - offset 0x07720 ***/
+  /*** Four byte table, leaf: 8231c4xx - offset 0x07794 ***/
 
   /* 30 */  0xe3b0b7, 0xe3b0b8, 0xe3b0b9, 0xe3b0ba,
   /* 34 */  0xe3b0bb, 0xe3b0bc, 0xe3b0bd, 0xe3b0be,
   /* 38 */  0xe3b0bf, 0xe3b180,
 
-  /*** Four byte table, leaf: 8231c5xx - offset 0x0772a ***/
+  /*** Four byte table, leaf: 8231c5xx - offset 0x0779e ***/
 
   /* 30 */  0xe3b181, 0xe3b182, 0xe3b183, 0xe3b184,
   /* 34 */  0xe3b185, 0xe3b186, 0xe3b187, 0xe3b188,
   /* 38 */  0xe3b189, 0xe3b18a,
 
-  /*** Four byte table, leaf: 8231c6xx - offset 0x07734 ***/
+  /*** Four byte table, leaf: 8231c6xx - offset 0x077a8 ***/
 
   /* 30 */  0xe3b18b, 0xe3b18c, 0xe3b18d, 0xe3b18e,
   /* 34 */  0xe3b18f, 0xe3b190, 0xe3b191, 0xe3b192,
   /* 38 */  0xe3b193, 0xe3b194,
 
-  /*** Four byte table, leaf: 8231c7xx - offset 0x0773e ***/
+  /*** Four byte table, leaf: 8231c7xx - offset 0x077b2 ***/
 
   /* 30 */  0xe3b195, 0xe3b196, 0xe3b197, 0xe3b198,
   /* 34 */  0xe3b199, 0xe3b19a, 0xe3b19b, 0xe3b19c,
   /* 38 */  0xe3b19d, 0xe3b19e,
 
-  /*** Four byte table, leaf: 8231c8xx - offset 0x07748 ***/
+  /*** Four byte table, leaf: 8231c8xx - offset 0x077bc ***/
 
   /* 30 */  0xe3b19f, 0xe3b1a0, 0xe3b1a1, 0xe3b1a2,
   /* 34 */  0xe3b1a3, 0xe3b1a4, 0xe3b1a5, 0xe3b1a6,
   /* 38 */  0xe3b1a7, 0xe3b1a8,
 
-  /*** Four byte table, leaf: 8231c9xx - offset 0x07752 ***/
+  /*** Four byte table, leaf: 8231c9xx - offset 0x077c6 ***/
 
   /* 30 */  0xe3b1a9, 0xe3b1aa, 0xe3b1ab, 0xe3b1ac,
   /* 34 */  0xe3b1ad, 0xe3b1af, 0xe3b1b0, 0xe3b1b1,
   /* 38 */  0xe3b1b2, 0xe3b1b3,
 
-  /*** Four byte table, leaf: 8231caxx - offset 0x0775c ***/
+  /*** Four byte table, leaf: 8231caxx - offset 0x077d0 ***/
 
   /* 30 */  0xe3b1b4, 0xe3b1b5, 0xe3b1b6, 0xe3b1b7,
   /* 34 */  0xe3b1b8, 0xe3b1b9, 0xe3b1ba, 0xe3b1bb,
   /* 38 */  0xe3b1bc, 0xe3b1bd,
 
-  /*** Four byte table, leaf: 8231cbxx - offset 0x07766 ***/
+  /*** Four byte table, leaf: 8231cbxx - offset 0x077da ***/
 
   /* 30 */  0xe3b1be, 0xe3b1bf, 0xe3b280, 0xe3b281,
   /* 34 */  0xe3b282, 0xe3b283, 0xe3b284, 0xe3b285,
   /* 38 */  0xe3b286, 0xe3b287,
 
-  /*** Four byte table, leaf: 8231ccxx - offset 0x07770 ***/
+  /*** Four byte table, leaf: 8231ccxx - offset 0x077e4 ***/
 
   /* 30 */  0xe3b288, 0xe3b289, 0xe3b28a, 0xe3b28b,
   /* 34 */  0xe3b28c, 0xe3b28d, 0xe3b28e, 0xe3b28f,
   /* 38 */  0xe3b290, 0xe3b291,
 
-  /*** Four byte table, leaf: 8231cdxx - offset 0x0777a ***/
+  /*** Four byte table, leaf: 8231cdxx - offset 0x077ee ***/
 
   /* 30 */  0xe3b292, 0xe3b293, 0xe3b294, 0xe3b295,
   /* 34 */  0xe3b296, 0xe3b297, 0xe3b298, 0xe3b299,
   /* 38 */  0xe3b29a, 0xe3b29b,
 
-  /*** Four byte table, leaf: 8231cexx - offset 0x07784 ***/
+  /*** Four byte table, leaf: 8231cexx - offset 0x077f8 ***/
 
   /* 30 */  0xe3b29c, 0xe3b29d, 0xe3b29e, 0xe3b29f,
   /* 34 */  0xe3b2a0, 0xe3b2a1, 0xe3b2a2, 0xe3b2a3,
   /* 38 */  0xe3b2a4, 0xe3b2a5,
 
-  /*** Four byte table, leaf: 8231cfxx - offset 0x0778e ***/
+  /*** Four byte table, leaf: 8231cfxx - offset 0x07802 ***/
 
   /* 30 */  0xe3b2a6, 0xe3b2a7, 0xe3b2a8, 0xe3b2a9,
   /* 34 */  0xe3b2aa, 0xe3b2ab, 0xe3b2ac, 0xe3b2ad,
   /* 38 */  0xe3b2ae, 0xe3b2af,
 
-  /*** Four byte table, leaf: 8231d0xx - offset 0x07798 ***/
+  /*** Four byte table, leaf: 8231d0xx - offset 0x0780c ***/
 
   /* 30 */  0xe3b2b0, 0xe3b2b1, 0xe3b2b2, 0xe3b2b3,
   /* 34 */  0xe3b2b4, 0xe3b2b5, 0xe3b2b6, 0xe3b2b7,
   /* 38 */  0xe3b2b8, 0xe3b2b9,
 
-  /*** Four byte table, leaf: 8231d1xx - offset 0x077a2 ***/
+  /*** Four byte table, leaf: 8231d1xx - offset 0x07816 ***/
 
   /* 30 */  0xe3b2ba, 0xe3b2bb, 0xe3b2bc, 0xe3b2bd,
   /* 34 */  0xe3b2be, 0xe3b2bf, 0xe3b380, 0xe3b381,
   /* 38 */  0xe3b382, 0xe3b383,
 
-  /*** Four byte table, leaf: 8231d2xx - offset 0x077ac ***/
+  /*** Four byte table, leaf: 8231d2xx - offset 0x07820 ***/
 
   /* 30 */  0xe3b384, 0xe3b385, 0xe3b386, 0xe3b387,
   /* 34 */  0xe3b388, 0xe3b389, 0xe3b38a, 0xe3b38b,
   /* 38 */  0xe3b38c, 0xe3b38d,
 
-  /*** Four byte table, leaf: 8231d3xx - offset 0x077b6 ***/
+  /*** Four byte table, leaf: 8231d3xx - offset 0x0782a ***/
 
   /* 30 */  0xe3b38e, 0xe3b38f, 0xe3b390, 0xe3b391,
   /* 34 */  0xe3b392, 0xe3b393, 0xe3b394, 0xe3b395,
   /* 38 */  0xe3b396, 0xe3b397,
 
-  /*** Four byte table, leaf: 8231d4xx - offset 0x077c0 ***/
+  /*** Four byte table, leaf: 8231d4xx - offset 0x07834 ***/
 
   /* 30 */  0xe3b398, 0xe3b399, 0xe3b39a, 0xe3b39b,
   /* 34 */  0xe3b39c, 0xe3b39d, 0xe3b39e, 0xe3b39f,
     /* 2 trailing zero values shared with next segment */
 
-  /*** Four byte table, leaf: 8232afxx - offset 0x077c8 ***/
+  /*** Four byte table, leaf: 8232afxx - offset 0x0783c ***/
 
   /* 30 */  0x000000, 0x000000, 0x000000, 0xe48197,
   /* 34 */  0xe48198, 0xe48199, 0xe4819a, 0xe4819b,
   /* 38 */  0xe4819c, 0xe4819d,
 
-  /*** Four byte table, leaf: 8232b0xx - offset 0x077d2 ***/
+  /*** Four byte table, leaf: 8232b0xx - offset 0x07846 ***/
 
   /* 30 */  0xe4819e, 0xe4819f, 0xe481a0, 0xe481a1,
   /* 34 */  0xe481a2, 0xe481a3, 0xe481a4, 0xe481a5,
   /* 38 */  0xe481a6, 0xe481a7,
 
-  /*** Four byte table, leaf: 8232b1xx - offset 0x077dc ***/
+  /*** Four byte table, leaf: 8232b1xx - offset 0x07850 ***/
 
   /* 30 */  0xe481a8, 0xe481a9, 0xe481aa, 0xe481ab,
   /* 34 */  0xe481ac, 0xe481ad, 0xe481ae, 0xe481af,
   /* 38 */  0xe481b0, 0xe481b1,
 
-  /*** Four byte table, leaf: 8232b2xx - offset 0x077e6 ***/
+  /*** Four byte table, leaf: 8232b2xx - offset 0x0785a ***/
 
   /* 30 */  0xe481b2, 0xe481b3, 0xe481b4, 0xe481b5,
   /* 34 */  0xe481b6, 0xe481b7, 0xe481b8, 0xe481b9,
   /* 38 */  0xe481ba, 0xe481bb,
 
-  /*** Four byte table, leaf: 8232b3xx - offset 0x077f0 ***/
+  /*** Four byte table, leaf: 8232b3xx - offset 0x07864 ***/
 
   /* 30 */  0xe481bc, 0xe481bd, 0xe481be, 0xe481bf,
   /* 34 */  0xe48280, 0xe48281, 0xe48282, 0xe48283,
   /* 38 */  0xe48284, 0xe48285,
 
-  /*** Four byte table, leaf: 8232b4xx - offset 0x077fa ***/
+  /*** Four byte table, leaf: 8232b4xx - offset 0x0786e ***/
 
   /* 30 */  0xe48286, 0xe48287, 0xe48288, 0xe48289,
   /* 34 */  0xe4828a, 0xe4828b, 0xe4828c, 0xe4828d,
   /* 38 */  0xe4828e, 0xe4828f,
 
-  /*** Four byte table, leaf: 8232b5xx - offset 0x07804 ***/
+  /*** Four byte table, leaf: 8232b5xx - offset 0x07878 ***/
 
   /* 30 */  0xe48290, 0xe48291, 0xe48292, 0xe48293,
   /* 34 */  0xe48294, 0xe48295, 0xe48296, 0xe48297,
   /* 38 */  0xe48298, 0xe48299,
 
-  /*** Four byte table, leaf: 8232b6xx - offset 0x0780e ***/
+  /*** Four byte table, leaf: 8232b6xx - offset 0x07882 ***/
 
   /* 30 */  0xe4829a, 0xe4829b, 0xe4829c, 0xe4829d,
   /* 34 */  0xe4829e, 0xe4829f, 0xe482a0, 0xe482a1,
   /* 38 */  0xe482a2, 0xe482a3,
 
-  /*** Four byte table, leaf: 8232b7xx - offset 0x07818 ***/
+  /*** Four byte table, leaf: 8232b7xx - offset 0x0788c ***/
 
   /* 30 */  0xe482a4, 0xe482a5, 0xe482a6, 0xe482a7,
   /* 34 */  0xe482a8, 0xe482a9, 0xe482aa, 0xe482ab,
   /* 38 */  0xe482ac, 0xe482ad,
 
-  /*** Four byte table, leaf: 8232b8xx - offset 0x07822 ***/
+  /*** Four byte table, leaf: 8232b8xx - offset 0x07896 ***/
 
   /* 30 */  0xe482ae, 0xe482af, 0xe482b0, 0xe482b1,
   /* 34 */  0xe482b2, 0xe482b3, 0xe482b4, 0xe482b5,
   /* 38 */  0xe482b6, 0xe482b7,
 
-  /*** Four byte table, leaf: 8232b9xx - offset 0x0782c ***/
+  /*** Four byte table, leaf: 8232b9xx - offset 0x078a0 ***/
 
   /* 30 */  0xe482b8, 0xe482b9, 0xe482ba, 0xe482bb,
   /* 34 */  0xe482bc, 0xe482bd, 0xe482be, 0xe482bf,
   /* 38 */  0xe48380, 0xe48381,
 
-  /*** Four byte table, leaf: 8232baxx - offset 0x07836 ***/
+  /*** Four byte table, leaf: 8232baxx - offset 0x078aa ***/
 
   /* 30 */  0xe48382, 0xe48383, 0xe48384, 0xe48385,
   /* 34 */  0xe48386, 0xe48387, 0xe48388, 0xe48389,
   /* 38 */  0xe4838a, 0xe4838b,
 
-  /*** Four byte table, leaf: 8232bbxx - offset 0x07840 ***/
+  /*** Four byte table, leaf: 8232bbxx - offset 0x078b4 ***/
 
   /* 30 */  0xe4838c, 0xe4838d, 0xe4838e, 0xe4838f,
   /* 34 */  0xe48390, 0xe48391, 0xe48392, 0xe48393,
   /* 38 */  0xe48394, 0xe48395,
 
-  /*** Four byte table, leaf: 8232bcxx - offset 0x0784a ***/
+  /*** Four byte table, leaf: 8232bcxx - offset 0x078be ***/
 
   /* 30 */  0xe48396, 0xe48397, 0xe48398, 0xe48399,
   /* 34 */  0xe4839a, 0xe4839b, 0xe4839c, 0xe4839d,
   /* 38 */  0xe4839e, 0xe4839f,
 
-  /*** Four byte table, leaf: 8232bdxx - offset 0x07854 ***/
+  /*** Four byte table, leaf: 8232bdxx - offset 0x078c8 ***/
 
   /* 30 */  0xe483a0, 0xe483a1, 0xe483a2, 0xe483a3,
   /* 34 */  0xe483a4, 0xe483a5, 0xe483a6, 0xe483a7,
   /* 38 */  0xe483a8, 0xe483a9,
 
-  /*** Four byte table, leaf: 8232bexx - offset 0x0785e ***/
+  /*** Four byte table, leaf: 8232bexx - offset 0x078d2 ***/
 
   /* 30 */  0xe483aa, 0xe483ab, 0xe483ac, 0xe483ad,
   /* 34 */  0xe483ae, 0xe483af, 0xe483b0, 0xe483b1,
   /* 38 */  0xe483b2, 0xe483b3,
 
-  /*** Four byte table, leaf: 8232bfxx - offset 0x07868 ***/
+  /*** Four byte table, leaf: 8232bfxx - offset 0x078dc ***/
 
   /* 30 */  0xe483b4, 0xe483b5, 0xe483b6, 0xe483b7,
   /* 34 */  0xe483b8, 0xe483b9, 0xe483ba, 0xe483bb,
   /* 38 */  0xe483bc, 0xe483bd,
 
-  /*** Four byte table, leaf: 8232c0xx - offset 0x07872 ***/
+  /*** Four byte table, leaf: 8232c0xx - offset 0x078e6 ***/
 
   /* 30 */  0xe483be, 0xe483bf, 0xe48480, 0xe48481,
   /* 34 */  0xe48482, 0xe48483, 0xe48484, 0xe48485,
   /* 38 */  0xe48486, 0xe48487,
 
-  /*** Four byte table, leaf: 8232c1xx - offset 0x0787c ***/
+  /*** Four byte table, leaf: 8232c1xx - offset 0x078f0 ***/
 
   /* 30 */  0xe48488, 0xe48489, 0xe4848a, 0xe4848b,
   /* 34 */  0xe4848c, 0xe4848d, 0xe4848e, 0xe4848f,
   /* 38 */  0xe48490, 0xe48491,
 
-  /*** Four byte table, leaf: 8232c2xx - offset 0x07886 ***/
+  /*** Four byte table, leaf: 8232c2xx - offset 0x078fa ***/
 
   /* 30 */  0xe48492, 0xe48493, 0xe48494, 0xe48495,
   /* 34 */  0xe48496, 0xe48497, 0xe48498, 0xe48499,
   /* 38 */  0xe4849a, 0xe4849b,
 
-  /*** Four byte table, leaf: 8232c3xx - offset 0x07890 ***/
+  /*** Four byte table, leaf: 8232c3xx - offset 0x07904 ***/
 
   /* 30 */  0xe4849c, 0xe4849d, 0xe4849e, 0xe4849f,
   /* 34 */  0xe484a0, 0xe484a1, 0xe484a2, 0xe484a3,
   /* 38 */  0xe484a4, 0xe484a5,
 
-  /*** Four byte table, leaf: 8232c4xx - offset 0x0789a ***/
+  /*** Four byte table, leaf: 8232c4xx - offset 0x0790e ***/
 
   /* 30 */  0xe484a6, 0xe484a7, 0xe484a8, 0xe484a9,
   /* 34 */  0xe484aa, 0xe484ab, 0xe484ac, 0xe484ad,
   /* 38 */  0xe484ae, 0xe484af,
 
-  /*** Four byte table, leaf: 8232c5xx - offset 0x078a4 ***/
+  /*** Four byte table, leaf: 8232c5xx - offset 0x07918 ***/
 
   /* 30 */  0xe484b0, 0xe484b1, 0xe484b2, 0xe484b3,
   /* 34 */  0xe484b4, 0xe484b5, 0xe484b6, 0xe484b7,
   /* 38 */  0xe484b8, 0xe484b9,
 
-  /*** Four byte table, leaf: 8232c6xx - offset 0x078ae ***/
+  /*** Four byte table, leaf: 8232c6xx - offset 0x07922 ***/
 
   /* 30 */  0xe484ba, 0xe484bb, 0xe484bc, 0xe484bd,
   /* 34 */  0xe484be, 0xe484bf, 0xe48580, 0xe48581,
   /* 38 */  0xe48582, 0xe48583,
 
-  /*** Four byte table, leaf: 8232c7xx - offset 0x078b8 ***/
+  /*** Four byte table, leaf: 8232c7xx - offset 0x0792c ***/
 
   /* 30 */  0xe48584, 0xe48585, 0xe48586, 0xe48587,
   /* 34 */  0xe48588, 0xe48589, 0xe4858a, 0xe4858b,
   /* 38 */  0xe4858c, 0xe4858d,
 
-  /*** Four byte table, leaf: 8232c8xx - offset 0x078c2 ***/
+  /*** Four byte table, leaf: 8232c8xx - offset 0x07936 ***/
 
   /* 30 */  0xe4858e, 0xe4858f, 0xe48590, 0xe48591,
   /* 34 */  0xe48592, 0xe48593, 0xe48594, 0xe48595,
   /* 38 */  0xe48596, 0xe48597,
 
-  /*** Four byte table, leaf: 8232c9xx - offset 0x078cc ***/
+  /*** Four byte table, leaf: 8232c9xx - offset 0x07940 ***/
 
   /* 30 */  0xe48598, 0xe48599, 0xe4859a, 0xe4859b,
   /* 34 */  0xe4859c, 0xe4859d, 0xe4859e,
     /* 3 trailing zero values shared with next segment */
 
-  /*** Four byte table, leaf: 8232f8xx - offset 0x078d3 ***/
+  /*** Four byte table, leaf: 8232f8xx - offset 0x07947 ***/
 
   /* 30 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 34 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 38 */  0xe48cb8, 0xe48cb9,
 
-  /*** Four byte table, leaf: 8232f9xx - offset 0x078dd ***/
+  /*** Four byte table, leaf: 8232f9xx - offset 0x07951 ***/
 
   /* 30 */  0xe48cba, 0xe48cbb, 0xe48cbc, 0xe48cbd,
   /* 34 */  0xe48cbe, 0xe48cbf, 0xe48d80, 0xe48d81,
   /* 38 */  0xe48d82, 0xe48d83,
 
-  /*** Four byte table, leaf: 8232faxx - offset 0x078e7 ***/
+  /*** Four byte table, leaf: 8232faxx - offset 0x0795b ***/
 
   /* 30 */  0xe48d84, 0xe48d85, 0xe48d86, 0xe48d87,
   /* 34 */  0xe48d88, 0xe48d89, 0xe48d8a, 0xe48d8b,
   /* 38 */  0xe48d8c, 0xe48d8d,
 
-  /*** Four byte table, leaf: 8232fbxx - offset 0x078f1 ***/
+  /*** Four byte table, leaf: 8232fbxx - offset 0x07965 ***/
 
   /* 30 */  0xe48d8e, 0xe48d8f, 0xe48d90, 0xe48d91,
   /* 34 */  0xe48d92, 0xe48d93, 0xe48d94, 0xe48d95,
   /* 38 */  0xe48d96, 0xe48d97,
 
-  /*** Four byte table, leaf: 8232fcxx - offset 0x078fb ***/
+  /*** Four byte table, leaf: 8232fcxx - offset 0x0796f ***/
 
   /* 30 */  0xe48d98, 0xe48d99, 0xe48d9a, 0xe48d9b,
   /* 34 */  0xe48d9c, 0xe48d9d, 0xe48d9e, 0xe48d9f,
   /* 38 */  0xe48da0, 0xe48da1,
 
-  /*** Four byte table, leaf: 8232fdxx - offset 0x07905 ***/
+  /*** Four byte table, leaf: 8232fdxx - offset 0x07979 ***/
 
   /* 30 */  0xe48da2, 0xe48da3, 0xe48da4, 0xe48da5,
   /* 34 */  0xe48da6, 0xe48da7, 0xe48da8, 0xe48da9,
   /* 38 */  0xe48daa, 0xe48dab,
 
-  /*** Four byte table, leaf: 8232fexx - offset 0x0790f ***/
+  /*** Four byte table, leaf: 8232fexx - offset 0x07983 ***/
 
   /* 30 */  0xe48dac, 0xe48dad, 0xe48dae, 0xe48daf,
   /* 34 */  0xe48db0, 0xe48db1, 0xe48db2, 0xe48db3,
   /* 38 */  0xe48db4, 0xe48db5,
 
-  /*** Four byte table, leaf: 823381xx - offset 0x07919 ***/
+  /*** Four byte table, leaf: 823381xx - offset 0x0798d ***/
 
   /* 30 */  0xe48db6, 0xe48db7, 0xe48db8, 0xe48db9,
   /* 34 */  0xe48dba, 0xe48dbb, 0xe48dbc, 0xe48dbd,
   /* 38 */  0xe48dbe, 0xe48dbf,
 
-  /*** Four byte table, leaf: 823382xx - offset 0x07923 ***/
+  /*** Four byte table, leaf: 823382xx - offset 0x07997 ***/
 
   /* 30 */  0xe48e80, 0xe48e81, 0xe48e82, 0xe48e83,
   /* 34 */  0xe48e84, 0xe48e85, 0xe48e86, 0xe48e87,
   /* 38 */  0xe48e88, 0xe48e89,
 
-  /*** Four byte table, leaf: 823383xx - offset 0x0792d ***/
+  /*** Four byte table, leaf: 823383xx - offset 0x079a1 ***/
 
   /* 30 */  0xe48e8a, 0xe48e8b, 0xe48e8c, 0xe48e8d,
   /* 34 */  0xe48e8e, 0xe48e8f, 0xe48e90, 0xe48e91,
   /* 38 */  0xe48e92, 0xe48e93,
 
-  /*** Four byte table, leaf: 823384xx - offset 0x07937 ***/
+  /*** Four byte table, leaf: 823384xx - offset 0x079ab ***/
 
   /* 30 */  0xe48e94, 0xe48e95, 0xe48e96, 0xe48e97,
   /* 34 */  0xe48e98, 0xe48e99, 0xe48e9a, 0xe48e9b,
   /* 38 */  0xe48e9c, 0xe48e9d,
 
-  /*** Four byte table, leaf: 823385xx - offset 0x07941 ***/
+  /*** Four byte table, leaf: 823385xx - offset 0x079b5 ***/
 
   /* 30 */  0xe48e9e, 0xe48e9f, 0xe48ea0, 0xe48ea1,
   /* 34 */  0xe48ea2, 0xe48ea3, 0xe48ea4, 0xe48ea5,
   /* 38 */  0xe48ea6, 0xe48ea7,
 
-  /*** Four byte table, leaf: 823386xx - offset 0x0794b ***/
+  /*** Four byte table, leaf: 823386xx - offset 0x079bf ***/
 
   /* 30 */  0xe48ea8, 0xe48ea9, 0xe48eaa, 0xe48eab,
   /* 34 */  0xe48ead, 0xe48eae, 0xe48eaf, 0xe48eb0,
   /* 38 */  0xe48eb2, 0xe48eb3,
 
-  /*** Four byte table, leaf: 823387xx - offset 0x07955 ***/
+  /*** Four byte table, leaf: 823387xx - offset 0x079c9 ***/
 
   /* 30 */  0xe48eb4, 0xe48eb5, 0xe48eb6, 0xe48eb7,
   /* 34 */  0xe48eb8, 0xe48eb9, 0xe48eba, 0xe48ebb,
   /* 38 */  0xe48ebc, 0xe48ebd,
 
-  /*** Four byte table, leaf: 823388xx - offset 0x0795f ***/
+  /*** Four byte table, leaf: 823388xx - offset 0x079d3 ***/
 
   /* 30 */  0xe48ebe, 0xe48ebf, 0xe48f80, 0xe48f81,
   /* 34 */  0xe48f82, 0xe48f83, 0xe48f84, 0xe48f85,
   /* 38 */  0xe48f86, 0xe48f87,
 
-  /*** Four byte table, leaf: 823389xx - offset 0x07969 ***/
+  /*** Four byte table, leaf: 823389xx - offset 0x079dd ***/
 
   /* 30 */  0xe48f88, 0xe48f89, 0xe48f8a, 0xe48f8b,
   /* 34 */  0xe48f8c, 0xe48f8d, 0xe48f8e, 0xe48f8f,
   /* 38 */  0xe48f90, 0xe48f91,
 
-  /*** Four byte table, leaf: 82338axx - offset 0x07973 ***/
+  /*** Four byte table, leaf: 82338axx - offset 0x079e7 ***/
 
   /* 30 */  0xe48f92, 0xe48f93, 0xe48f94, 0xe48f95,
   /* 34 */  0xe48f96, 0xe48f97, 0xe48f98, 0xe48f99,
   /* 38 */  0xe48f9a, 0xe48f9b,
 
-  /*** Four byte table, leaf: 82338bxx - offset 0x0797d ***/
+  /*** Four byte table, leaf: 82338bxx - offset 0x079f1 ***/
 
   /* 30 */  0xe48f9c, 0xe48f9e, 0xe48f9f, 0xe48fa0,
   /* 34 */  0xe48fa1, 0xe48fa2, 0xe48fa3, 0xe48fa4,
   /* 38 */  0xe48fa5, 0xe48fa6,
 
-  /*** Four byte table, leaf: 82338cxx - offset 0x07987 ***/
+  /*** Four byte table, leaf: 82338cxx - offset 0x079fb ***/
 
   /* 30 */  0xe48fa7, 0xe48fa8, 0xe48fa9, 0xe48faa,
   /* 34 */  0xe48fab, 0xe48fac, 0xe48fad, 0xe48fae,
   /* 38 */  0xe48faf, 0xe48fb0,
 
-  /*** Four byte table, leaf: 82338dxx - offset 0x07991 ***/
+  /*** Four byte table, leaf: 82338dxx - offset 0x07a05 ***/
 
   /* 30 */  0xe48fb1, 0xe48fb2, 0xe48fb3, 0xe48fb4,
   /* 34 */  0xe48fb5, 0xe48fb6, 0xe48fb7, 0xe48fb8,
   /* 38 */  0xe48fb9, 0xe48fba,
 
-  /*** Four byte table, leaf: 82338exx - offset 0x0799b ***/
+  /*** Four byte table, leaf: 82338exx - offset 0x07a0f ***/
 
   /* 30 */  0xe48fbb, 0xe48fbc, 0xe48fbd, 0xe48fbe,
   /* 34 */  0xe48fbf, 0xe49080, 0xe49081, 0xe49082,
   /* 38 */  0xe49083, 0xe49084,
 
-  /*** Four byte table, leaf: 82338fxx - offset 0x079a5 ***/
+  /*** Four byte table, leaf: 82338fxx - offset 0x07a19 ***/
 
   /* 30 */  0xe49085, 0xe49086, 0xe49087, 0xe49088,
   /* 34 */  0xe49089, 0xe4908a, 0xe4908b, 0xe4908c,
   /* 38 */  0xe4908d, 0xe4908e,
 
-  /*** Four byte table, leaf: 823390xx - offset 0x079af ***/
+  /*** Four byte table, leaf: 823390xx - offset 0x07a23 ***/
 
   /* 30 */  0xe4908f, 0xe49090, 0xe49091, 0xe49092,
   /* 34 */  0xe49093, 0xe49094, 0xe49095, 0xe49096,
   /* 38 */  0xe49097, 0xe49098,
 
-  /*** Four byte table, leaf: 823391xx - offset 0x079b9 ***/
+  /*** Four byte table, leaf: 823391xx - offset 0x07a2d ***/
 
   /* 30 */  0xe49099, 0xe4909a, 0xe4909b, 0xe4909c,
   /* 34 */  0xe4909d, 0xe4909e, 0xe4909f, 0xe490a0,
   /* 38 */  0xe490a1, 0xe490a2,
 
-  /*** Four byte table, leaf: 823392xx - offset 0x079c3 ***/
+  /*** Four byte table, leaf: 823392xx - offset 0x07a37 ***/
 
   /* 30 */  0xe490a3, 0xe490a4, 0xe490a5, 0xe490a6,
   /* 34 */  0xe490a7, 0xe490a8, 0xe490a9, 0xe490aa,
   /* 38 */  0xe490ab, 0xe490ac,
 
-  /*** Four byte table, leaf: 823393xx - offset 0x079cd ***/
+  /*** Four byte table, leaf: 823393xx - offset 0x07a41 ***/
 
   /* 30 */  0xe490ad, 0xe490ae, 0xe490af, 0xe490b0,
   /* 34 */  0xe490b1, 0xe490b2, 0xe490b3, 0xe490b4,
   /* 38 */  0xe490b5, 0xe490b6,
 
-  /*** Four byte table, leaf: 823394xx - offset 0x079d7 ***/
+  /*** Four byte table, leaf: 823394xx - offset 0x07a4b ***/
 
   /* 30 */  0xe490b7, 0xe490b8, 0xe490b9, 0xe490ba,
   /* 34 */  0xe490bb, 0xe490bc, 0xe490bd, 0xe490be,
   /* 38 */  0xe490bf, 0xe49180,
 
-  /*** Four byte table, leaf: 823395xx - offset 0x079e1 ***/
+  /*** Four byte table, leaf: 823395xx - offset 0x07a55 ***/
 
   /* 30 */  0xe49181, 0xe49182, 0xe49183, 0xe49184,
   /* 34 */  0xe49185, 0xe49186, 0xe49187, 0xe49188,
   /* 38 */  0xe49189, 0xe4918a,
 
-  /*** Four byte table, leaf: 823396xx - offset 0x079eb ***/
+  /*** Four byte table, leaf: 823396xx - offset 0x07a5f ***/
 
   /* 30 */  0xe4918b, 0xe4918c, 0xe4918d, 0xe4918e,
   /* 34 */  0xe4918f, 0xe49190, 0xe49191, 0xe49192,
   /* 38 */  0xe49193, 0xe49194,
 
-  /*** Four byte table, leaf: 823397xx - offset 0x079f5 ***/
+  /*** Four byte table, leaf: 823397xx - offset 0x07a69 ***/
 
   /* 30 */  0xe49195, 0xe49196, 0xe49197, 0xe49198,
   /* 34 */  0xe49199, 0xe4919a, 0xe4919b, 0xe4919c,
   /* 38 */  0xe4919d, 0xe4919e,
 
-  /*** Four byte table, leaf: 823398xx - offset 0x079ff ***/
+  /*** Four byte table, leaf: 823398xx - offset 0x07a73 ***/
 
   /* 30 */  0xe4919f, 0xe491a0, 0xe491a1, 0xe491a2,
   /* 34 */  0xe491a3, 0xe491a4, 0xe491a5, 0xe491a6,
   /* 38 */  0xe491a7, 0xe491a8,
 
-  /*** Four byte table, leaf: 823399xx - offset 0x07a09 ***/
+  /*** Four byte table, leaf: 823399xx - offset 0x07a7d ***/
 
   /* 30 */  0xe491a9, 0xe491aa, 0xe491ab, 0xe491ac,
   /* 34 */  0xe491ad, 0xe491ae, 0xe491af, 0xe491b0,
   /* 38 */  0xe491b1, 0xe491b2,
 
-  /*** Four byte table, leaf: 82339axx - offset 0x07a13 ***/
+  /*** Four byte table, leaf: 82339axx - offset 0x07a87 ***/
 
   /* 30 */  0xe491b3, 0xe491b4, 0xe491b5, 0xe491b6,
   /* 34 */  0xe491b7, 0xe491b8, 0xe491b9, 0xe491ba,
   /* 38 */  0xe491bb, 0xe491bc,
 
-  /*** Four byte table, leaf: 82339bxx - offset 0x07a1d ***/
+  /*** Four byte table, leaf: 82339bxx - offset 0x07a91 ***/
 
   /* 30 */  0xe491bd, 0xe491be, 0xe491bf, 0xe49280,
   /* 34 */  0xe49281, 0xe49282, 0xe49283, 0xe49284,
   /* 38 */  0xe49285, 0xe49286,
 
-  /*** Four byte table, leaf: 82339cxx - offset 0x07a27 ***/
+  /*** Four byte table, leaf: 82339cxx - offset 0x07a9b ***/
 
   /* 30 */  0xe49287, 0xe49288, 0xe49289, 0xe4928a,
   /* 34 */  0xe4928b, 0xe4928c, 0xe4928d, 0xe4928e,
   /* 38 */  0xe4928f, 0xe49290,
 
-  /*** Four byte table, leaf: 82339dxx - offset 0x07a31 ***/
+  /*** Four byte table, leaf: 82339dxx - offset 0x07aa5 ***/
 
   /* 30 */  0xe49291, 0xe49292, 0xe49293, 0xe49294,
   /* 34 */  0xe49295, 0xe49296, 0xe49297, 0xe49298,
   /* 38 */  0xe49299, 0xe4929a,
 
-  /*** Four byte table, leaf: 82339exx - offset 0x07a3b ***/
+  /*** Four byte table, leaf: 82339exx - offset 0x07aaf ***/
 
   /* 30 */  0xe4929b, 0xe4929c, 0xe4929d, 0xe4929e,
   /* 34 */  0xe4929f, 0xe492a0, 0xe492a1, 0xe492a2,
   /* 38 */  0xe492a3, 0xe492a4,
 
-  /*** Four byte table, leaf: 82339fxx - offset 0x07a45 ***/
+  /*** Four byte table, leaf: 82339fxx - offset 0x07ab9 ***/
 
   /* 30 */  0xe492a5, 0xe492a6, 0xe492a7, 0xe492a8,
   /* 34 */  0xe492a9, 0xe492aa, 0xe492ab, 0xe492ac,
   /* 38 */  0xe492ad, 0xe492ae,
 
-  /*** Four byte table, leaf: 8233a0xx - offset 0x07a4f ***/
+  /*** Four byte table, leaf: 8233a0xx - offset 0x07ac3 ***/
 
   /* 30 */  0xe492af, 0xe492b0, 0xe492b1, 0xe492b2,
   /* 34 */  0xe492b3, 0xe492b4, 0xe492b5, 0xe492b6,
   /* 38 */  0xe492b7, 0xe492b8,
 
-  /*** Four byte table, leaf: 8233a1xx - offset 0x07a59 ***/
+  /*** Four byte table, leaf: 8233a1xx - offset 0x07acd ***/
 
   /* 30 */  0xe492b9, 0xe492ba, 0xe492bb, 0xe492bc,
   /* 34 */  0xe492bd, 0xe492be, 0xe492bf, 0xe49380,
   /* 38 */  0xe49381, 0xe49382,
 
-  /*** Four byte table, leaf: 8233a2xx - offset 0x07a63 ***/
+  /*** Four byte table, leaf: 8233a2xx - offset 0x07ad7 ***/
 
   /* 30 */  0xe49383, 0xe49384, 0xe49385, 0xe49386,
   /* 34 */  0xe49387, 0xe49388, 0xe49389, 0xe4938a,
   /* 38 */  0xe4938b, 0xe4938c,
 
-  /*** Four byte table, leaf: 8233a3xx - offset 0x07a6d ***/
+  /*** Four byte table, leaf: 8233a3xx - offset 0x07ae1 ***/
 
   /* 30 */  0xe4938d, 0xe4938e, 0xe4938f, 0xe49390,
   /* 34 */  0xe49391, 0xe49392, 0xe49393, 0xe49394,
   /* 38 */  0xe49395,
     /* 1 trailing zero values shared with next segment */
 
-  /*** Four byte table, leaf: 8233c9xx - offset 0x07a76 ***/
+  /*** Four byte table, leaf: 8233c9xx - offset 0x07aea ***/
 
   /* 30 */  0x000000, 0x000000, 0xe4998d, 0xe4998e,
   /* 34 */  0xe4998f, 0xe49990, 0xe49991, 0xe49992,
   /* 38 */  0xe49993, 0xe49994,
 
-  /*** Four byte table, leaf: 8233caxx - offset 0x07a80 ***/
+  /*** Four byte table, leaf: 8233caxx - offset 0x07af4 ***/
 
   /* 30 */  0xe49995, 0xe49996, 0xe49997, 0xe49998,
   /* 34 */  0xe49999, 0xe4999a, 0xe4999b, 0xe4999c,
   /* 38 */  0xe4999d, 0xe4999e,
 
-  /*** Four byte table, leaf: 8233cbxx - offset 0x07a8a ***/
+  /*** Four byte table, leaf: 8233cbxx - offset 0x07afe ***/
 
   /* 30 */  0xe4999f, 0xe499a0, 0xe499a2, 0xe499a3,
   /* 34 */  0xe499a4, 0xe499a5, 0xe499a6, 0xe499a7,
   /* 38 */  0xe499a8, 0xe499a9,
 
-  /*** Four byte table, leaf: 8233ccxx - offset 0x07a94 ***/
+  /*** Four byte table, leaf: 8233ccxx - offset 0x07b08 ***/
 
   /* 30 */  0xe499aa, 0xe499ab, 0xe499ac, 0xe499ad,
   /* 34 */  0xe499ae, 0xe499af, 0xe499b0, 0xe499b1,
   /* 38 */  0xe499b2, 0xe499b3,
 
-  /*** Four byte table, leaf: 8233cdxx - offset 0x07a9e ***/
+  /*** Four byte table, leaf: 8233cdxx - offset 0x07b12 ***/
 
   /* 30 */  0xe499b4, 0xe499b5, 0xe499b6, 0xe499b7,
   /* 34 */  0xe499b8, 0xe499b9, 0xe499ba, 0xe499bb,
   /* 38 */  0xe499bc, 0xe499bd,
 
-  /*** Four byte table, leaf: 8233cexx - offset 0x07aa8 ***/
+  /*** Four byte table, leaf: 8233cexx - offset 0x07b1c ***/
 
   /* 30 */  0xe499be, 0xe499bf, 0xe49a80, 0xe49a81,
   /* 34 */  0xe49a82, 0xe49a83, 0xe49a84, 0xe49a85,
   /* 38 */  0xe49a86, 0xe49a87,
 
-  /*** Four byte table, leaf: 8233cfxx - offset 0x07ab2 ***/
+  /*** Four byte table, leaf: 8233cfxx - offset 0x07b26 ***/
 
   /* 30 */  0xe49a88, 0xe49a89, 0xe49a8a, 0xe49a8b,
   /* 34 */  0xe49a8c, 0xe49a8d, 0xe49a8e, 0xe49a8f,
   /* 38 */  0xe49a90, 0xe49a91,
 
-  /*** Four byte table, leaf: 8233d0xx - offset 0x07abc ***/
+  /*** Four byte table, leaf: 8233d0xx - offset 0x07b30 ***/
 
   /* 30 */  0xe49a92, 0xe49a93, 0xe49a94, 0xe49a95,
   /* 34 */  0xe49a96, 0xe49a97, 0xe49a98, 0xe49a99,
   /* 38 */  0xe49a9a, 0xe49a9b,
 
-  /*** Four byte table, leaf: 8233d1xx - offset 0x07ac6 ***/
+  /*** Four byte table, leaf: 8233d1xx - offset 0x07b3a ***/
 
   /* 30 */  0xe49a9c, 0xe49a9d, 0xe49a9e, 0xe49a9f,
   /* 34 */  0xe49aa0, 0xe49aa1, 0xe49aa2, 0xe49aa3,
   /* 38 */  0xe49aa4, 0xe49aa5,
 
-  /*** Four byte table, leaf: 8233d2xx - offset 0x07ad0 ***/
+  /*** Four byte table, leaf: 8233d2xx - offset 0x07b44 ***/
 
   /* 30 */  0xe49aa6, 0xe49aa7, 0xe49aa8, 0xe49aa9,
   /* 34 */  0xe49aaa, 0xe49aab, 0xe49aac, 0xe49aad,
   /* 38 */  0xe49aae, 0xe49aaf,
 
-  /*** Four byte table, leaf: 8233d3xx - offset 0x07ada ***/
+  /*** Four byte table, leaf: 8233d3xx - offset 0x07b4e ***/
 
   /* 30 */  0xe49ab0, 0xe49ab1, 0xe49ab2, 0xe49ab3,
   /* 34 */  0xe49ab4, 0xe49ab5, 0xe49ab6, 0xe49ab7,
   /* 38 */  0xe49ab8, 0xe49ab9,
 
-  /*** Four byte table, leaf: 8233d4xx - offset 0x07ae4 ***/
+  /*** Four byte table, leaf: 8233d4xx - offset 0x07b58 ***/
 
   /* 30 */  0xe49aba, 0xe49abb, 0xe49abc, 0xe49abd,
   /* 34 */  0xe49abe, 0xe49abf, 0xe49b80, 0xe49b81,
   /* 38 */  0xe49b82, 0xe49b83,
 
-  /*** Four byte table, leaf: 8233d5xx - offset 0x07aee ***/
+  /*** Four byte table, leaf: 8233d5xx - offset 0x07b62 ***/
 
   /* 30 */  0xe49b84, 0xe49b85, 0xe49b86, 0xe49b87,
   /* 34 */  0xe49b88, 0xe49b89, 0xe49b8a, 0xe49b8b,
   /* 38 */  0xe49b8c, 0xe49b8d,
 
-  /*** Four byte table, leaf: 8233d6xx - offset 0x07af8 ***/
+  /*** Four byte table, leaf: 8233d6xx - offset 0x07b6c ***/
 
   /* 30 */  0xe49b8e, 0xe49b8f, 0xe49b90, 0xe49b91,
   /* 34 */  0xe49b92, 0xe49b93, 0xe49b94, 0xe49b95,
   /* 38 */  0xe49b96, 0xe49b97,
 
-  /*** Four byte table, leaf: 8233d7xx - offset 0x07b02 ***/
+  /*** Four byte table, leaf: 8233d7xx - offset 0x07b76 ***/
 
   /* 30 */  0xe49b98, 0xe49b99, 0xe49b9a, 0xe49b9b,
   /* 34 */  0xe49b9c, 0xe49b9d, 0xe49b9e, 0xe49b9f,
   /* 38 */  0xe49ba0, 0xe49ba1,
 
-  /*** Four byte table, leaf: 8233d8xx - offset 0x07b0c ***/
+  /*** Four byte table, leaf: 8233d8xx - offset 0x07b80 ***/
 
   /* 30 */  0xe49ba2, 0xe49ba3, 0xe49ba4, 0xe49ba5,
   /* 34 */  0xe49ba6, 0xe49ba7, 0xe49ba8, 0xe49ba9,
   /* 38 */  0xe49baa, 0xe49bab,
 
-  /*** Four byte table, leaf: 8233d9xx - offset 0x07b16 ***/
+  /*** Four byte table, leaf: 8233d9xx - offset 0x07b8a ***/
 
   /* 30 */  0xe49bac, 0xe49bad, 0xe49bae, 0xe49baf,
   /* 34 */  0xe49bb0, 0xe49bb1, 0xe49bb2, 0xe49bb3,
   /* 38 */  0xe49bb4, 0xe49bb5,
 
-  /*** Four byte table, leaf: 8233daxx - offset 0x07b20 ***/
+  /*** Four byte table, leaf: 8233daxx - offset 0x07b94 ***/
 
   /* 30 */  0xe49bb6, 0xe49bb7, 0xe49bb8, 0xe49bb9,
   /* 34 */  0xe49bba, 0xe49bbb, 0xe49bbc, 0xe49bbd,
   /* 38 */  0xe49bbe, 0xe49bbf,
 
-  /*** Four byte table, leaf: 8233dbxx - offset 0x07b2a ***/
+  /*** Four byte table, leaf: 8233dbxx - offset 0x07b9e ***/
 
   /* 30 */  0xe49c80, 0xe49c81, 0xe49c82, 0xe49c83,
   /* 34 */  0xe49c84, 0xe49c85, 0xe49c86, 0xe49c87,
   /* 38 */  0xe49c88, 0xe49c89,
 
-  /*** Four byte table, leaf: 8233dcxx - offset 0x07b34 ***/
+  /*** Four byte table, leaf: 8233dcxx - offset 0x07ba8 ***/
 
   /* 30 */  0xe49c8a, 0xe49c8b, 0xe49c8c, 0xe49c8d,
   /* 34 */  0xe49c8e, 0xe49c8f, 0xe49c90, 0xe49c91,
   /* 38 */  0xe49c92, 0xe49c93,
 
-  /*** Four byte table, leaf: 8233ddxx - offset 0x07b3e ***/
+  /*** Four byte table, leaf: 8233ddxx - offset 0x07bb2 ***/
 
   /* 30 */  0xe49c94, 0xe49c95, 0xe49c96, 0xe49c97,
   /* 34 */  0xe49c98, 0xe49c99, 0xe49c9a, 0xe49c9b,
   /* 38 */  0xe49c9c, 0xe49c9d,
 
-  /*** Four byte table, leaf: 8233dexx - offset 0x07b48 ***/
+  /*** Four byte table, leaf: 8233dexx - offset 0x07bbc ***/
 
   /* 30 */  0xe49c9e, 0xe49c9f, 0xe49ca0, 0xe49ca1,
   /* 34 */  0xe49ca2, 0xe49ca4, 0xe49ca5, 0xe49ca6,
   /* 38 */  0xe49ca7, 0xe49ca8,
 
-  /*** Four byte table, leaf: 8233dfxx - offset 0x07b52 ***/
+  /*** Four byte table, leaf: 8233dfxx - offset 0x07bc6 ***/
 
   /* 30 */  0xe49caa, 0xe49cab, 0xe49cac, 0xe49cad,
   /* 34 */  0xe49cae, 0xe49caf, 0xe49cb0, 0xe49cb1,
   /* 38 */  0xe49cb2, 0xe49cb3,
 
-  /*** Four byte table, leaf: 8233e0xx - offset 0x07b5c ***/
+  /*** Four byte table, leaf: 8233e0xx - offset 0x07bd0 ***/
 
   /* 30 */  0xe49cb4, 0xe49cb5, 0xe49cb6, 0xe49cb7,
   /* 34 */  0xe49cb8, 0xe49cb9, 0xe49cba, 0xe49cbb,
   /* 38 */  0xe49cbc, 0xe49cbd,
 
-  /*** Four byte table, leaf: 8233e1xx - offset 0x07b66 ***/
+  /*** Four byte table, leaf: 8233e1xx - offset 0x07bda ***/
 
   /* 30 */  0xe49cbe, 0xe49cbf, 0xe49d80, 0xe49d81,
   /* 34 */  0xe49d82, 0xe49d83, 0xe49d84, 0xe49d85,
   /* 38 */  0xe49d86, 0xe49d87,
 
-  /*** Four byte table, leaf: 8233e2xx - offset 0x07b70 ***/
+  /*** Four byte table, leaf: 8233e2xx - offset 0x07be4 ***/
 
   /* 30 */  0xe49d88, 0xe49d89, 0xe49d8a, 0xe49d8b,
   /* 34 */  0xe49d8c, 0xe49d8d, 0xe49d8e, 0xe49d8f,
   /* 38 */  0xe49d90, 0xe49d91,
 
-  /*** Four byte table, leaf: 8233e3xx - offset 0x07b7a ***/
+  /*** Four byte table, leaf: 8233e3xx - offset 0x07bee ***/
 
   /* 30 */  0xe49d92, 0xe49d93, 0xe49d94, 0xe49d95,
   /* 34 */  0xe49d96, 0xe49d97, 0xe49d98, 0xe49d99,
   /* 38 */  0xe49d9a, 0xe49d9b,
 
-  /*** Four byte table, leaf: 8233e4xx - offset 0x07b84 ***/
+  /*** Four byte table, leaf: 8233e4xx - offset 0x07bf8 ***/
 
   /* 30 */  0xe49d9c, 0xe49d9d, 0xe49d9e, 0xe49d9f,
   /* 34 */  0xe49da0, 0xe49da1, 0xe49da2, 0xe49da3,
   /* 38 */  0xe49da4, 0xe49da5,
 
-  /*** Four byte table, leaf: 8233e5xx - offset 0x07b8e ***/
+  /*** Four byte table, leaf: 8233e5xx - offset 0x07c02 ***/
 
   /* 30 */  0xe49da6, 0xe49da7, 0xe49da8, 0xe49da9,
   /* 34 */  0xe49daa, 0xe49dab, 0xe49dac, 0xe49dad,
   /* 38 */  0xe49dae, 0xe49daf,
 
-  /*** Four byte table, leaf: 8233e6xx - offset 0x07b98 ***/
+  /*** Four byte table, leaf: 8233e6xx - offset 0x07c0c ***/
 
   /* 30 */  0xe49db0, 0xe49db1, 0xe49db2, 0xe49db3,
   /* 34 */  0xe49db4, 0xe49db5, 0xe49db6, 0xe49db7,
   /* 38 */  0xe49db8, 0xe49db9,
 
-  /*** Four byte table, leaf: 8233e7xx - offset 0x07ba2 ***/
+  /*** Four byte table, leaf: 8233e7xx - offset 0x07c16 ***/
 
   /* 30 */  0xe49dba, 0xe49dbb, 0xe49dbd, 0xe49dbe,
   /* 34 */  0xe49dbf, 0xe49e80, 0xe49e81, 0xe49e82,
   /* 38 */  0xe49e83, 0xe49e84,
 
-  /*** Four byte table, leaf: 8233e8xx - offset 0x07bac ***/
+  /*** Four byte table, leaf: 8233e8xx - offset 0x07c20 ***/
 
   /* 30 */  0xe49e85, 0xe49e86, 0xe49e87, 0xe49e88,
   /* 34 */  0xe49e89, 0xe49e8a, 0xe49e8b, 0xe49e8c,
     /* 2 trailing zero values shared with next segment */
 
-  /*** Four byte table, leaf: 823496xx - offset 0x07bb4 ***/
+  /*** Four byte table, leaf: 823496xx - offset 0x07c28 ***/
 
   /* 30 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 34 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 38 */  0x000000, 0xe4a588,
 
-  /*** Four byte table, leaf: 823497xx - offset 0x07bbe ***/
+  /*** Four byte table, leaf: 823497xx - offset 0x07c32 ***/
 
   /* 30 */  0xe4a589, 0xe4a58a, 0xe4a58b, 0xe4a58c,
   /* 34 */  0xe4a58d, 0xe4a58e, 0xe4a58f, 0xe4a590,
   /* 38 */  0xe4a591, 0xe4a592,
 
-  /*** Four byte table, leaf: 823498xx - offset 0x07bc8 ***/
+  /*** Four byte table, leaf: 823498xx - offset 0x07c3c ***/
 
   /* 30 */  0xe4a593, 0xe4a594, 0xe4a595, 0xe4a596,
   /* 34 */  0xe4a597, 0xe4a598, 0xe4a599, 0xe4a59a,
   /* 38 */  0xe4a59b, 0xe4a59c,
 
-  /*** Four byte table, leaf: 823499xx - offset 0x07bd2 ***/
+  /*** Four byte table, leaf: 823499xx - offset 0x07c46 ***/
 
   /* 30 */  0xe4a59d, 0xe4a59e, 0xe4a59f, 0xe4a5a0,
   /* 34 */  0xe4a5a1, 0xe4a5a2, 0xe4a5a3, 0xe4a5a4,
   /* 38 */  0xe4a5a5, 0xe4a5a6,
 
-  /*** Four byte table, leaf: 82349axx - offset 0x07bdc ***/
+  /*** Four byte table, leaf: 82349axx - offset 0x07c50 ***/
 
   /* 30 */  0xe4a5a7, 0xe4a5a8, 0xe4a5a9, 0xe4a5aa,
   /* 34 */  0xe4a5ab, 0xe4a5ac, 0xe4a5ad, 0xe4a5ae,
   /* 38 */  0xe4a5af, 0xe4a5b0,
 
-  /*** Four byte table, leaf: 82349bxx - offset 0x07be6 ***/
+  /*** Four byte table, leaf: 82349bxx - offset 0x07c5a ***/
 
   /* 30 */  0xe4a5b1, 0xe4a5b2, 0xe4a5b3, 0xe4a5b4,
   /* 34 */  0xe4a5b5, 0xe4a5b6, 0xe4a5b7, 0xe4a5b8,
   /* 38 */  0xe4a5b9, 0xe4a5bb,
 
-  /*** Four byte table, leaf: 82349cxx - offset 0x07bf0 ***/
+  /*** Four byte table, leaf: 82349cxx - offset 0x07c64 ***/
 
   /* 30 */  0xe4a5bc, 0xe4a5be, 0xe4a5bf, 0xe4a680,
   /* 34 */  0xe4a681, 0xe4a684, 0xe4a687, 0xe4a688,
   /* 38 */  0xe4a689, 0xe4a68a,
 
-  /*** Four byte table, leaf: 82349dxx - offset 0x07bfa ***/
+  /*** Four byte table, leaf: 82349dxx - offset 0x07c6e ***/
 
   /* 30 */  0xe4a68b, 0xe4a68c, 0xe4a68d, 0xe4a68e,
   /* 34 */  0xe4a68f, 0xe4a690, 0xe4a691, 0xe4a692,
   /* 38 */  0xe4a693, 0xe4a694,
 
-  /*** Four byte table, leaf: 82349exx - offset 0x07c04 ***/
+  /*** Four byte table, leaf: 82349exx - offset 0x07c78 ***/
 
   /* 30 */  0xe4a695, 0xe4a696, 0xe4a697, 0xe4a698,
   /* 34 */  0xe4a699, 0xe4a69a, 0xe4a69c, 0xe4a69d,
   /* 38 */  0xe4a69e, 0xe4a6a0,
 
-  /*** Four byte table, leaf: 82349fxx - offset 0x07c0e ***/
+  /*** Four byte table, leaf: 82349fxx - offset 0x07c82 ***/
 
   /* 30 */  0xe4a6a1, 0xe4a6a2, 0xe4a6a3, 0xe4a6a4,
   /* 34 */  0xe4a6a5, 0xe4a6a6, 0xe4a6a7, 0xe4a6a8,
   /* 38 */  0xe4a6a9, 0xe4a6aa,
 
-  /*** Four byte table, leaf: 8234a0xx - offset 0x07c18 ***/
+  /*** Four byte table, leaf: 8234a0xx - offset 0x07c8c ***/
 
   /* 30 */  0xe4a6ab, 0xe4a6ac, 0xe4a6ad, 0xe4a6ae,
   /* 34 */  0xe4a6af, 0xe4a6b0, 0xe4a6b1, 0xe4a6b2,
   /* 38 */  0xe4a6b3, 0xe4a6b4,
 
-  /*** Four byte table, leaf: 8234a1xx - offset 0x07c22 ***/
+  /*** Four byte table, leaf: 8234a1xx - offset 0x07c96 ***/
 
   /* 30 */  0xe4a6b5, 0x000000, 0x000000, 0x000000,
   /* 34 */  0x000000, 0x000000,
     /* 4 trailing zero values shared with next segment */
 
-  /*** Four byte table, leaf: 8234e7xx - offset 0x07c28 ***/
+  /*** Four byte table, leaf: 8234e7xx - offset 0x07c9c ***/
 
   /* 30 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 34 */  0xe4b1b8, 0xe4b1b9, 0xe4b1ba, 0xe4b1bb,
   /* 38 */  0xe4b1bc, 0xe4b1bd,
 
-  /*** Four byte table, leaf: 8234e8xx - offset 0x07c32 ***/
+  /*** Four byte table, leaf: 8234e8xx - offset 0x07ca6 ***/
 
   /* 30 */  0xe4b1be, 0xe4b1bf, 0xe4b280, 0xe4b281,
   /* 34 */  0xe4b282, 0xe4b283, 0xe4b284, 0xe4b285,
   /* 38 */  0xe4b286, 0xe4b287,
 
-  /*** Four byte table, leaf: 8234e9xx - offset 0x07c3c ***/
+  /*** Four byte table, leaf: 8234e9xx - offset 0x07cb0 ***/
 
   /* 30 */  0xe4b288, 0xe4b289, 0xe4b28a, 0xe4b28b,
   /* 34 */  0xe4b28c, 0xe4b28d, 0xe4b28e, 0xe4b28f,
   /* 38 */  0xe4b290, 0xe4b291,
 
-  /*** Four byte table, leaf: 8234eaxx - offset 0x07c46 ***/
+  /*** Four byte table, leaf: 8234eaxx - offset 0x07cba ***/
 
   /* 30 */  0xe4b292, 0xe4b293, 0xe4b294, 0xe4b295,
   /* 34 */  0xe4b296, 0xe4b297, 0xe4b298, 0xe4b299,
   /* 38 */  0xe4b29a, 0xe4b29b,
 
-  /*** Four byte table, leaf: 8234ebxx - offset 0x07c50 ***/
+  /*** Four byte table, leaf: 8234ebxx - offset 0x07cc4 ***/
 
   /* 30 */  0xe4b29c, 0xe4b29d, 0xe4b29e, 0xe4b2a4,
   /* 34 */  0xe4b2a5, 0xe4b2a6, 0xe4b2a7, 0xe4b2a8,
   /* 38 */  0xe4b2a9, 0xe4b2aa,
 
-  /*** Four byte table, leaf: 8234ecxx - offset 0x07c5a ***/
+  /*** Four byte table, leaf: 8234ecxx - offset 0x07cce ***/
 
   /* 30 */  0xe4b2ab, 0xe4b2ac, 0xe4b2ad, 0xe4b2ae,
   /* 34 */  0xe4b2af, 0xe4b2b0, 0xe4b2b1, 0xe4b2b2,
   /* 38 */  0xe4b2b3, 0xe4b2b4,
 
-  /*** Four byte table, leaf: 8234edxx - offset 0x07c64 ***/
+  /*** Four byte table, leaf: 8234edxx - offset 0x07cd8 ***/
 
   /* 30 */  0xe4b2b5, 0xe4b2b6, 0xe4b2b7, 0xe4b2b8,
   /* 34 */  0xe4b2b9, 0xe4b2ba, 0xe4b2bb, 0xe4b2bc,
   /* 38 */  0xe4b2bd, 0xe4b2be,
 
-  /*** Four byte table, leaf: 8234eexx - offset 0x07c6e ***/
+  /*** Four byte table, leaf: 8234eexx - offset 0x07ce2 ***/
 
   /* 30 */  0xe4b2bf, 0xe4b380, 0xe4b381, 0xe4b382,
   /* 34 */  0xe4b383, 0xe4b384, 0xe4b385, 0xe4b386,
   /* 38 */  0xe4b387, 0xe4b388,
 
-  /*** Four byte table, leaf: 8234efxx - offset 0x07c78 ***/
+  /*** Four byte table, leaf: 8234efxx - offset 0x07cec ***/
 
   /* 30 */  0xe4b389, 0xe4b38a, 0xe4b38b, 0xe4b38c,
   /* 34 */  0xe4b38d, 0xe4b38e, 0xe4b38f, 0xe4b390,
   /* 38 */  0xe4b391, 0xe4b392,
 
-  /*** Four byte table, leaf: 8234f0xx - offset 0x07c82 ***/
+  /*** Four byte table, leaf: 8234f0xx - offset 0x07cf6 ***/
 
   /* 30 */  0xe4b393, 0xe4b394, 0xe4b395, 0xe4b396,
   /* 34 */  0xe4b397, 0xe4b398, 0xe4b399, 0xe4b39a,
   /* 38 */  0xe4b39b, 0xe4b39c,
 
-  /*** Four byte table, leaf: 8234f1xx - offset 0x07c8c ***/
+  /*** Four byte table, leaf: 8234f1xx - offset 0x07d00 ***/
 
   /* 30 */  0xe4b39d, 0xe4b39e, 0xe4b39f, 0xe4b3a0,
   /* 34 */  0xe4b3a1, 0xe4b3a2, 0xe4b3a3, 0xe4b3a4,
   /* 38 */  0xe4b3a5, 0xe4b3a6,
 
-  /*** Four byte table, leaf: 8234f2xx - offset 0x07c96 ***/
+  /*** Four byte table, leaf: 8234f2xx - offset 0x07d0a ***/
 
   /* 30 */  0xe4b3a7, 0xe4b3a8, 0xe4b3a9, 0xe4b3aa,
   /* 34 */  0xe4b3ab, 0xe4b3ac, 0xe4b3ad, 0xe4b3ae,
   /* 38 */  0xe4b3af, 0xe4b3b0,
 
-  /*** Four byte table, leaf: 8234f3xx - offset 0x07ca0 ***/
+  /*** Four byte table, leaf: 8234f3xx - offset 0x07d14 ***/
 
   /* 30 */  0xe4b3b1, 0xe4b3b2, 0xe4b3b3, 0xe4b3b4,
   /* 34 */  0xe4b3b5, 0xe4b3b6, 0xe4b3b7, 0xe4b3b8,
   /* 38 */  0xe4b3b9, 0xe4b3ba,
 
-  /*** Four byte table, leaf: 8234f4xx - offset 0x07caa ***/
+  /*** Four byte table, leaf: 8234f4xx - offset 0x07d1e ***/
 
   /* 30 */  0xe4b3bb, 0xe4b3bc, 0xe4b3bd, 0xe4b3be,
   /* 34 */  0xe4b3bf, 0xe4b480, 0xe4b481, 0xe4b482,
   /* 38 */  0xe4b483, 0xe4b484,
 
-  /*** Four byte table, leaf: 8234f5xx - offset 0x07cb4 ***/
+  /*** Four byte table, leaf: 8234f5xx - offset 0x07d28 ***/
 
   /* 30 */  0xe4b485, 0xe4b486, 0xe4b487, 0xe4b488,
   /* 34 */  0xe4b489, 0xe4b48a, 0xe4b48b, 0xe4b48c,
   /* 38 */  0xe4b48d, 0xe4b48e,
 
-  /*** Four byte table, leaf: 8234f6xx - offset 0x07cbe ***/
+  /*** Four byte table, leaf: 8234f6xx - offset 0x07d32 ***/
 
   /* 30 */  0xe4b48f, 0xe4b490, 0xe4b491, 0xe4b492,
   /* 34 */  0xe4b49a, 0xe4b49b, 0xe4b49c, 0xe4b49d,
   /* 38 */  0xe4b49e, 0xe4b49f,
 
-  /*** Four byte table, leaf: 8234f7xx - offset 0x07cc8 ***/
+  /*** Four byte table, leaf: 8234f7xx - offset 0x07d3c ***/
 
   /* 30 */  0xe4b4a0, 0xe4b4a1, 0xe4b4a2, 0xe4b4a3,
   /* 34 */  0xe4b4a4, 0xe4b4a5, 0xe4b4a6, 0xe4b4a7,
   /* 38 */  0xe4b4a8, 0xe4b4a9,
 
-  /*** Four byte table, leaf: 8234f8xx - offset 0x07cd2 ***/
+  /*** Four byte table, leaf: 8234f8xx - offset 0x07d46 ***/
 
   /* 30 */  0xe4b4aa, 0xe4b4ab, 0xe4b4ac, 0xe4b4ad,
   /* 34 */  0xe4b4ae, 0xe4b4af, 0xe4b4b0, 0xe4b4b1,
   /* 38 */  0xe4b4b2, 0xe4b4b3,
 
-  /*** Four byte table, leaf: 8234f9xx - offset 0x07cdc ***/
+  /*** Four byte table, leaf: 8234f9xx - offset 0x07d50 ***/
 
   /* 30 */  0xe4b4b4, 0xe4b4b5, 0xe4b4b6, 0xe4b4b7,
   /* 34 */  0xe4b4b8, 0xe4b4b9, 0xe4b4ba, 0xe4b4bb,
   /* 38 */  0xe4b4bc, 0xe4b4bd,
 
-  /*** Four byte table, leaf: 8234faxx - offset 0x07ce6 ***/
+  /*** Four byte table, leaf: 8234faxx - offset 0x07d5a ***/
 
   /* 30 */  0xe4b4be, 0xe4b4bf, 0xe4b580, 0xe4b581,
   /* 34 */  0xe4b582, 0xe4b583, 0xe4b584, 0xe4b585,
   /* 38 */  0xe4b586, 0xe4b587,
 
-  /*** Four byte table, leaf: 8234fbxx - offset 0x07cf0 ***/
+  /*** Four byte table, leaf: 8234fbxx - offset 0x07d64 ***/
 
   /* 30 */  0xe4b588, 0xe4b589, 0xe4b58a, 0xe4b58b,
   /* 34 */  0xe4b58c, 0xe4b58d, 0xe4b58e, 0xe4b58f,
   /* 38 */  0xe4b590, 0xe4b591,
 
-  /*** Four byte table, leaf: 8234fcxx - offset 0x07cfa ***/
+  /*** Four byte table, leaf: 8234fcxx - offset 0x07d6e ***/
 
   /* 30 */  0xe4b592, 0xe4b593, 0xe4b594, 0xe4b595,
   /* 34 */  0xe4b596, 0xe4b597, 0xe4b598, 0xe4b599,
   /* 38 */  0xe4b59a, 0xe4b59b,
 
-  /*** Four byte table, leaf: 8234fdxx - offset 0x07d04 ***/
+  /*** Four byte table, leaf: 8234fdxx - offset 0x07d78 ***/
 
   /* 30 */  0xe4b59c, 0xe4b59d, 0xe4b59e, 0xe4b59f,
   /* 34 */  0xe4b5a0, 0xe4b5a1, 0xe4b5a2, 0xe4b5a3,
   /* 38 */  0xe4b5a4, 0xe4b5a5,
 
-  /*** Four byte table, leaf: 8234fexx - offset 0x07d0e ***/
+  /*** Four byte table, leaf: 8234fexx - offset 0x07d82 ***/
 
   /* 30 */  0xe4b5a6, 0xe4b5a7, 0xe4b5a8, 0xe4b5a9,
   /* 34 */  0xe4b5aa, 0xe4b5ab, 0xe4b5ac, 0xe4b5ad,
   /* 38 */  0xe4b5ae, 0xe4b5af,
 
-  /*** Four byte table, leaf: 823581xx - offset 0x07d18 ***/
+  /*** Four byte table, leaf: 823581xx - offset 0x07d8c ***/
 
   /* 30 */  0xe4b5b0, 0xe4b5b1, 0xe4b5b2, 0xe4b5b3,
   /* 34 */  0xe4b5b4, 0xe4b5b5, 0xe4b5b6, 0xe4b5b7,
   /* 38 */  0xe4b5b8, 0xe4b5b9,
 
-  /*** Four byte table, leaf: 823582xx - offset 0x07d22 ***/
+  /*** Four byte table, leaf: 823582xx - offset 0x07d96 ***/
 
   /* 30 */  0xe4b5ba, 0xe4b5bb, 0xe4b5bc, 0xe4b5bd,
   /* 34 */  0xe4b5be, 0xe4b5bf, 0xe4b680, 0xe4b681,
   /* 38 */  0xe4b682, 0xe4b683,
 
-  /*** Four byte table, leaf: 823583xx - offset 0x07d2c ***/
+  /*** Four byte table, leaf: 823583xx - offset 0x07da0 ***/
 
   /* 30 */  0xe4b684, 0xe4b685, 0xe4b686, 0xe4b687,
   /* 34 */  0xe4b688, 0xe4b689, 0xe4b68a, 0xe4b68b,
   /* 38 */  0xe4b68c, 0xe4b68d,
 
-  /*** Four byte table, leaf: 823584xx - offset 0x07d36 ***/
+  /*** Four byte table, leaf: 823584xx - offset 0x07daa ***/
 
   /* 30 */  0xe4b68e, 0xe4b68f, 0xe4b690, 0xe4b691,
   /* 34 */  0xe4b692, 0xe4b693, 0xe4b694, 0xe4b695,
   /* 38 */  0xe4b696, 0xe4b697,
 
-  /*** Four byte table, leaf: 823585xx - offset 0x07d40 ***/
+  /*** Four byte table, leaf: 823585xx - offset 0x07db4 ***/
 
   /* 30 */  0xe4b698, 0xe4b699, 0xe4b69a, 0xe4b69b,
   /* 34 */  0xe4b69c, 0xe4b69d, 0xe4b69e, 0xe4b69f,
   /* 38 */  0xe4b6a0, 0xe4b6a1,
 
-  /*** Four byte table, leaf: 823586xx - offset 0x07d4a ***/
+  /*** Four byte table, leaf: 823586xx - offset 0x07dbe ***/
 
   /* 30 */  0xe4b6a2, 0xe4b6a3, 0xe4b6a4, 0xe4b6a5,
   /* 34 */  0xe4b6a6, 0xe4b6a7, 0xe4b6a8, 0xe4b6a9,
   /* 38 */  0xe4b6aa, 0xe4b6ab,
 
-  /*** Four byte table, leaf: 823587xx - offset 0x07d54 ***/
+  /*** Four byte table, leaf: 823587xx - offset 0x07dc8 ***/
 
   /* 30 */  0xe4b6ac, 0xe4b6ad, 0xe4b6af, 0xe4b6b0,
   /* 34 */  0xe4b6b1, 0xe4b6b2, 0xe4b6b3, 0xe4b6b4,
   /* 38 */  0xe4b6b5, 0xe4b6b6,
 
-  /*** Four byte table, leaf: 823588xx - offset 0x07d5e ***/
+  /*** Four byte table, leaf: 823588xx - offset 0x07dd2 ***/
 
   /* 30 */  0xe4b6b7, 0xe4b6b8, 0xe4b6b9, 0xe4b6ba,
   /* 34 */  0xe4b6bb, 0xe4b6bc, 0xe4b6bd, 0xe4b6be,
   /* 38 */  0xe4b6bf, 0xe4b780,
 
-  /*** Four byte table, leaf: 823589xx - offset 0x07d68 ***/
+  /*** Four byte table, leaf: 823589xx - offset 0x07ddc ***/
 
   /* 30 */  0xe4b781, 0xe4b782, 0xe4b783, 0xe4b784,
   /* 34 */  0xe4b785, 0xe4b786, 0xe4b787, 0xe4b788,
   /* 38 */  0xe4b789, 0xe4b78a,
 
-  /*** Four byte table, leaf: 82358axx - offset 0x07d72 ***/
+  /*** Four byte table, leaf: 82358axx - offset 0x07de6 ***/
 
   /* 30 */  0xe4b78b, 0xe4b78c, 0xe4b78d, 0xe4b78e,
   /* 34 */  0xe4b78f, 0xe4b790, 0xe4b791, 0xe4b792,
   /* 38 */  0xe4b793, 0xe4b794,
 
-  /*** Four byte table, leaf: 82358bxx - offset 0x07d7c ***/
+  /*** Four byte table, leaf: 82358bxx - offset 0x07df0 ***/
 
   /* 30 */  0xe4b795, 0xe4b796, 0xe4b797, 0xe4b798,
   /* 34 */  0xe4b799, 0xe4b79a, 0xe4b79b, 0xe4b79c,
   /* 38 */  0xe4b79d, 0xe4b79e,
 
-  /*** Four byte table, leaf: 82358cxx - offset 0x07d86 ***/
+  /*** Four byte table, leaf: 82358cxx - offset 0x07dfa ***/
 
   /* 30 */  0xe4b79f, 0xe4b7a0, 0xe4b7a1, 0xe4b7a2,
   /* 34 */  0xe4b7a3, 0xe4b7a4, 0xe4b7a5, 0xe4b7a6,
   /* 38 */  0xe4b7a7, 0xe4b7a8,
 
-  /*** Four byte table, leaf: 82358dxx - offset 0x07d90 ***/
+  /*** Four byte table, leaf: 82358dxx - offset 0x07e04 ***/
 
   /* 30 */  0xe4b7a9, 0xe4b7aa, 0xe4b7ab, 0xe4b7ac,
   /* 34 */  0xe4b7ad, 0xe4b7ae, 0xe4b7af, 0xe4b7b0,
   /* 38 */  0xe4b7b1, 0xe4b7b2,
 
-  /*** Four byte table, leaf: 82358exx - offset 0x07d9a ***/
+  /*** Four byte table, leaf: 82358exx - offset 0x07e0e ***/
 
   /* 30 */  0xe4b7b3, 0xe4b7b4, 0xe4b7b5, 0xe4b7b6,
   /* 34 */  0xe4b7b7, 0xe4b7b8, 0xe4b7b9, 0xe4b7ba,
   /* 38 */  0xe4b7bb, 0xe4b7bc,
 
-  /*** Four byte table, leaf: 82358fxx - offset 0x07da4 ***/
+  /*** Four byte table, leaf: 82358fxx - offset 0x07e18 ***/
 
   /* 30 */  0xe4b7bd, 0xe4b7be, 0xe4b7bf,
     /* 7 trailing zero values shared with next segment */
 
-  /*** Four byte table, leaf: 8336c7xx - offset 0x07da7 ***/
+  /*** Four byte table, leaf: 8336c7xx - offset 0x07e1b ***/
 
   /* 30 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 34 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 38 */  0x000000, 0xee9dac,
 
-  /*** Four byte table, leaf: 8336c8xx - offset 0x07db1 ***/
+  /*** Four byte table, leaf: 8336c8xx - offset 0x07e25 ***/
 
   /* 30 */  0xee9f88, 0xee9fa7, 0xee9fa8, 0xee9fa9,
   /* 34 */  0xee9faa, 0xee9fab, 0xee9fac, 0xee9fad,
   /* 38 */  0xee9fae, 0xee9faf,
 
-  /*** Four byte table, leaf: 8336c9xx - offset 0x07dbb ***/
+  /*** Four byte table, leaf: 8336c9xx - offset 0x07e2f ***/
 
   /* 30 */  0xee9fb0, 0xee9fb1, 0xee9fb2, 0xee9fb3,
   /* 34 */  0xeea095, 0xeea099, 0xeea09a, 0xeea09b,
   /* 38 */  0xeea09c, 0xeea09d,
 
-  /*** Four byte table, leaf: 8336caxx - offset 0x07dc5 ***/
+  /*** Four byte table, leaf: 8336caxx - offset 0x07e39 ***/
 
   /* 30 */  0xeea09f, 0xeea0a0, 0xeea0a1, 0xeea0a2,
   /* 34 */  0xeea0a3, 0xeea0a4, 0xeea0a5, 0xeea0a7,
   /* 38 */  0xeea0a8, 0xeea0a9,
 
-  /*** Four byte table, leaf: 8336cbxx - offset 0x07dcf ***/
+  /*** Four byte table, leaf: 8336cbxx - offset 0x07e43 ***/
 
   /* 30 */  0xeea0aa, 0xeea0ad, 0xeea0ae, 0xeea0af,
   /* 34 */  0xeea0b0, 0xeea0b3, 0xeea0b4, 0xeea0b5,
   /* 38 */  0xeea0b6, 0xeea0b7,
 
-  /*** Four byte table, leaf: 8336ccxx - offset 0x07dd9 ***/
+  /*** Four byte table, leaf: 8336ccxx - offset 0x07e4d ***/
 
   /* 30 */  0xeea0b8, 0xeea0b9, 0xeea0ba, 0xeea0bc,
   /* 34 */  0xeea0bd, 0xeea0be, 0xeea0bf, 0xeea180,
   /* 38 */  0xeea181, 0xeea182,
 
-  /*** Four byte table, leaf: 8336cdxx - offset 0x07de3 ***/
+  /*** Four byte table, leaf: 8336cdxx - offset 0x07e57 ***/
 
   /* 30 */  0xeea184, 0xeea185, 0xeea186, 0xeea187,
   /* 34 */  0xeea188, 0xeea189, 0xeea18a, 0xeea18b,
   /* 38 */  0xeea18c, 0xeea18d,
 
-  /*** Four byte table, leaf: 8336cexx - offset 0x07ded ***/
+  /*** Four byte table, leaf: 8336cexx - offset 0x07e61 ***/
 
   /* 30 */  0xeea18e, 0xeea18f, 0xeea190, 0xeea191,
   /* 34 */  0xeea192, 0xeea193, 0xeea196, 0xeea197,
   /* 38 */  0xeea198, 0xeea199,
 
-  /*** Four byte table, leaf: 8336cfxx - offset 0x07df7 ***/
+  /*** Four byte table, leaf: 8336cfxx - offset 0x07e6b ***/
 
   /* 30 */  0xeea19a, 0xeea19b, 0xeea19c, 0xeea19d,
   /* 34 */  0xeea19e, 0xeea19f, 0xeea1a0, 0xeea1a1,
   /* 38 */  0xeea1a2, 0xeea1a3,
 
-  /*** Four byte table, leaf: 843085xx - offset 0x07e01 ***/
+  /*** Four byte table, leaf: 843085xx - offset 0x07e75 ***/
 
   /* 30 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 34 */  0x000000, 0xefa4ad, 0xefa4ae, 0xefa4af,
   /* 38 */  0xefa4b0, 0xefa4b1,
 
-  /*** Four byte table, leaf: 843086xx - offset 0x07e0b ***/
+  /*** Four byte table, leaf: 843086xx - offset 0x07e7f ***/
 
   /* 30 */  0xefa4b2, 0xefa4b3, 0xefa4b4, 0xefa4b5,
   /* 34 */  0xefa4b6, 0xefa4b7, 0xefa4b8, 0xefa4b9,
   /* 38 */  0xefa4ba, 0xefa4bb,
 
-  /*** Four byte table, leaf: 843087xx - offset 0x07e15 ***/
+  /*** Four byte table, leaf: 843087xx - offset 0x07e89 ***/
 
   /* 30 */  0xefa4bc, 0xefa4bd, 0xefa4be, 0xefa4bf,
   /* 34 */  0xefa580, 0xefa581, 0xefa582, 0xefa583,
   /* 38 */  0xefa584, 0xefa585,
 
-  /*** Four byte table, leaf: 843088xx - offset 0x07e1f ***/
+  /*** Four byte table, leaf: 843088xx - offset 0x07e93 ***/
 
   /* 30 */  0xefa586, 0xefa587, 0xefa588, 0xefa589,
   /* 34 */  0xefa58a, 0xefa58b, 0xefa58c, 0xefa58d,
   /* 38 */  0xefa58e, 0xefa58f,
 
-  /*** Four byte table, leaf: 843089xx - offset 0x07e29 ***/
+  /*** Four byte table, leaf: 843089xx - offset 0x07e9d ***/
 
   /* 30 */  0xefa590, 0xefa591, 0xefa592, 0xefa593,
   /* 34 */  0xefa594, 0xefa595, 0xefa596, 0xefa597,
   /* 38 */  0xefa598, 0xefa599,
 
-  /*** Four byte table, leaf: 84308axx - offset 0x07e33 ***/
+  /*** Four byte table, leaf: 84308axx - offset 0x07ea7 ***/
 
   /* 30 */  0xefa59a, 0xefa59b, 0xefa59c, 0xefa59d,
   /* 34 */  0xefa59e, 0xefa59f, 0xefa5a0, 0xefa5a1,
   /* 38 */  0xefa5a2, 0xefa5a3,
 
-  /*** Four byte table, leaf: 84308bxx - offset 0x07e3d ***/
+  /*** Four byte table, leaf: 84308bxx - offset 0x07eb1 ***/
 
   /* 30 */  0xefa5a4, 0xefa5a5, 0xefa5a6, 0xefa5a7,
   /* 34 */  0xefa5a8, 0xefa5a9, 0xefa5aa, 0xefa5ab,
   /* 38 */  0xefa5ac, 0xefa5ad,
 
-  /*** Four byte table, leaf: 84308cxx - offset 0x07e47 ***/
+  /*** Four byte table, leaf: 84308cxx - offset 0x07ebb ***/
 
   /* 30 */  0xefa5ae, 0xefa5af, 0xefa5b0, 0xefa5b1,
   /* 34 */  0xefa5b2, 0xefa5b3, 0xefa5b4, 0xefa5b5,
   /* 38 */  0xefa5b6, 0xefa5b7,
 
-  /*** Four byte table, leaf: 84308dxx - offset 0x07e51 ***/
+  /*** Four byte table, leaf: 84308dxx - offset 0x07ec5 ***/
 
   /* 30 */  0xefa5b8, 0xefa5ba, 0xefa5bb, 0xefa5bc,
   /* 34 */  0xefa5bd, 0xefa5be, 0xefa5bf, 0xefa680,
   /* 38 */  0xefa681, 0xefa682,
 
-  /*** Four byte table, leaf: 84308exx - offset 0x07e5b ***/
+  /*** Four byte table, leaf: 84308exx - offset 0x07ecf ***/
 
   /* 30 */  0xefa683, 0xefa684, 0xefa685, 0xefa686,
   /* 34 */  0xefa687, 0xefa688, 0xefa689, 0xefa68a,
   /* 38 */  0xefa68b, 0xefa68c,
 
-  /*** Four byte table, leaf: 84308fxx - offset 0x07e65 ***/
+  /*** Four byte table, leaf: 84308fxx - offset 0x07ed9 ***/
 
   /* 30 */  0xefa68d, 0xefa68e, 0xefa68f, 0xefa690,
   /* 34 */  0xefa691, 0xefa692, 0xefa693, 0xefa694,
   /* 38 */  0xefa696, 0xefa697,
 
-  /*** Four byte table, leaf: 843090xx - offset 0x07e6f ***/
+  /*** Four byte table, leaf: 843090xx - offset 0x07ee3 ***/
 
   /* 30 */  0xefa698, 0xefa699, 0xefa69a, 0xefa69b,
   /* 34 */  0xefa69c, 0xefa69d, 0xefa69e, 0xefa69f,
   /* 38 */  0xefa6a0, 0xefa6a1,
 
-  /*** Four byte table, leaf: 843091xx - offset 0x07e79 ***/
+  /*** Four byte table, leaf: 843091xx - offset 0x07eed ***/
 
   /* 30 */  0xefa6a2, 0xefa6a3, 0xefa6a4, 0xefa6a5,
   /* 34 */  0xefa6a6, 0xefa6a7, 0xefa6a8, 0xefa6a9,
   /* 38 */  0xefa6aa, 0xefa6ab,
 
-  /*** Four byte table, leaf: 843092xx - offset 0x07e83 ***/
+  /*** Four byte table, leaf: 843092xx - offset 0x07ef7 ***/
 
   /* 30 */  0xefa6ac, 0xefa6ad, 0xefa6ae, 0xefa6af,
   /* 34 */  0xefa6b0, 0xefa6b1, 0xefa6b2, 0xefa6b3,
   /* 38 */  0xefa6b4, 0xefa6b5,
 
-  /*** Four byte table, leaf: 843093xx - offset 0x07e8d ***/
+  /*** Four byte table, leaf: 843093xx - offset 0x07f01 ***/
 
   /* 30 */  0xefa6b6, 0xefa6b7, 0xefa6b8, 0xefa6b9,
   /* 34 */  0xefa6ba, 0xefa6bb, 0xefa6bc, 0xefa6bd,
   /* 38 */  0xefa6be, 0xefa6bf,
 
-  /*** Four byte table, leaf: 843094xx - offset 0x07e97 ***/
+  /*** Four byte table, leaf: 843094xx - offset 0x07f0b ***/
 
   /* 30 */  0xefa780, 0xefa781, 0xefa782, 0xefa783,
   /* 34 */  0xefa784, 0xefa785, 0xefa786, 0xefa787,
   /* 38 */  0xefa788, 0xefa789,
 
-  /*** Four byte table, leaf: 843095xx - offset 0x07ea1 ***/
+  /*** Four byte table, leaf: 843095xx - offset 0x07f15 ***/
 
   /* 30 */  0xefa78a, 0xefa78b, 0xefa78c, 0xefa78d,
   /* 34 */  0xefa78e, 0xefa78f, 0xefa790, 0xefa791,
   /* 38 */  0xefa792, 0xefa793,
 
-  /*** Four byte table, leaf: 843096xx - offset 0x07eab ***/
+  /*** Four byte table, leaf: 843096xx - offset 0x07f1f ***/
 
   /* 30 */  0xefa794, 0xefa795, 0xefa796, 0xefa797,
   /* 34 */  0xefa798, 0xefa799, 0xefa79a, 0xefa79b,
   /* 38 */  0xefa79c, 0xefa79d,
 
-  /*** Four byte table, leaf: 843097xx - offset 0x07eb5 ***/
+  /*** Four byte table, leaf: 843097xx - offset 0x07f29 ***/
 
   /* 30 */  0xefa79e, 0xefa79f, 0xefa7a0, 0xefa7a1,
   /* 34 */  0xefa7a2, 0xefa7a3, 0xefa7a4, 0xefa7a5,
   /* 38 */  0xefa7a6, 0xefa7a8,
 
-  /*** Four byte table, leaf: 843098xx - offset 0x07ebf ***/
+  /*** Four byte table, leaf: 843098xx - offset 0x07f33 ***/
 
   /* 30 */  0xefa7a9, 0xefa7aa, 0xefa7ab, 0xefa7ac,
   /* 34 */  0xefa7ad, 0xefa7ae, 0xefa7af, 0xefa7b0,
   /* 38 */  0xefa7b2, 0xefa7b3,
 
-  /*** Four byte table, leaf: 843099xx - offset 0x07ec9 ***/
+  /*** Four byte table, leaf: 843099xx - offset 0x07f3d ***/
 
   /* 30 */  0xefa7b4, 0xefa7b5, 0xefa7b6, 0xefa7b7,
   /* 34 */  0xefa7b8, 0xefa7b9, 0xefa7ba, 0xefa7bb,
   /* 38 */  0xefa7bc, 0xefa7bd,
 
-  /*** Four byte table, leaf: 84309axx - offset 0x07ed3 ***/
+  /*** Four byte table, leaf: 84309axx - offset 0x07f47 ***/
 
   /* 30 */  0xefa7be, 0xefa7bf, 0xefa880, 0xefa881,
   /* 34 */  0xefa882, 0xefa883, 0xefa884, 0xefa885,
   /* 38 */  0xefa886, 0xefa887,
 
-  /*** Four byte table, leaf: 84309bxx - offset 0x07edd ***/
+  /*** Four byte table, leaf: 84309bxx - offset 0x07f51 ***/
 
   /* 30 */  0xefa888, 0xefa889, 0xefa88a, 0xefa88b,
   /* 34 */  0xefa890, 0xefa892, 0xefa895, 0xefa896,
   /* 38 */  0xefa897, 0xefa899,
 
-  /*** Four byte table, leaf: 84309cxx - offset 0x07ee7 ***/
+  /*** Four byte table, leaf: 84309cxx - offset 0x07f5b ***/
 
   /* 30 */  0xefa89a, 0xefa89b, 0xefa89c, 0xefa89d,
   /* 34 */  0xefa89e, 0xefa8a2, 0xefa8a5, 0xefa8a6,
     /* 2 trailing zero values shared with next segment */
 
-  /*** Four byte table, leaf: 843185xx - offset 0x07eef ***/
+  /*** Four byte table, leaf: 843185xx - offset 0x07f63 ***/
 
   /* 30 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 34 */  0x000000, 0x000000, 0x000000, 0x000000,
   /* 38 */  0xefb8b2, 0xefb985,
 
-  /*** Four byte table, leaf: 843186xx - offset 0x07ef9 ***/
+  /*** Four byte table, leaf: 843186xx - offset 0x07f6d ***/
 
   /* 30 */  0xefb986, 0xefb987, 0xefb988, 0xefb993,
   /* 34 */  0xefb998, 0xefb9a7, 0xefb9ac, 0xefb9ad,
   /* 38 */  0xefb9ae, 0xefb9af,
 
-  /*** Four byte table, leaf: 843187xx - offset 0x07f03 ***/
+  /*** Four byte table, leaf: 843187xx - offset 0x07f77 ***/
 
   /* 30 */  0xefb9b0, 0xefb9b1, 0xefb9b2, 0xefb9b3,
   /* 34 */  0xefb9b4, 0xefb9b5, 0xefb9b6, 0xefb9b7,
   /* 38 */  0xefb9b8, 0xefb9b9,
 
-  /*** Four byte table, leaf: 843188xx - offset 0x07f0d ***/
+  /*** Four byte table, leaf: 843188xx - offset 0x07f81 ***/
 
   /* 30 */  0xefb9ba, 0xefb9bb, 0xefb9bc, 0xefb9bd,
   /* 34 */  0xefb9be, 0xefb9bf, 0xefba80, 0xefba81,
   /* 38 */  0xefba82, 0xefba83,
 
-  /*** Four byte table, leaf: 843189xx - offset 0x07f17 ***/
+  /*** Four byte table, leaf: 843189xx - offset 0x07f8b ***/
 
   /* 30 */  0xefba84, 0xefba85, 0xefba86, 0xefba87,
   /* 34 */  0xefba88, 0xefba89, 0xefba8a, 0xefba8b,
   /* 38 */  0xefba8c, 0xefba8d,
 
-  /*** Four byte table, leaf: 84318axx - offset 0x07f21 ***/
+  /*** Four byte table, leaf: 84318axx - offset 0x07f95 ***/
 
   /* 30 */  0xefba8e, 0xefba8f, 0xefba90, 0xefba91,
   /* 34 */  0xefba92, 0xefba93, 0xefba94, 0xefba95,
   /* 38 */  0xefba96, 0xefba97,
 
-  /*** Four byte table, leaf: 84318bxx - offset 0x07f2b ***/
+  /*** Four byte table, leaf: 84318bxx - offset 0x07f9f ***/
 
   /* 30 */  0xefba98, 0xefba99, 0xefba9a, 0xefba9b,
   /* 34 */  0xefba9c, 0xefba9d, 0xefba9e, 0xefba9f,
   /* 38 */  0xefbaa0, 0xefbaa1,
 
-  /*** Four byte table, leaf: 84318cxx - offset 0x07f35 ***/
+  /*** Four byte table, leaf: 84318cxx - offset 0x07fa9 ***/
 
   /* 30 */  0xefbaa2, 0xefbaa3, 0xefbaa4, 0xefbaa5,
   /* 34 */  0xefbaa6, 0xefbaa7, 0xefbaa8, 0xefbaa9,
   /* 38 */  0xefbaaa, 0xefbaab,
 
-  /*** Four byte table, leaf: 84318dxx - offset 0x07f3f ***/
+  /*** Four byte table, leaf: 84318dxx - offset 0x07fb3 ***/
 
   /* 30 */  0xefbaac, 0xefbaad, 0xefbaae, 0xefbaaf,
   /* 34 */  0xefbab0, 0xefbab1, 0xefbab2, 0xefbab3,
   /* 38 */  0xefbab4, 0xefbab5,
 
-  /*** Four byte table, leaf: 84318exx - offset 0x07f49 ***/
+  /*** Four byte table, leaf: 84318exx - offset 0x07fbd ***/
 
   /* 30 */  0xefbab6, 0xefbab7, 0xefbab8, 0xefbab9,
   /* 34 */  0xefbaba, 0xefbabb, 0xefbabc, 0xefbabd,
   /* 38 */  0xefbabe, 0xefbabf,
 
-  /*** Four byte table, leaf: 84318fxx - offset 0x07f53 ***/
+  /*** Four byte table, leaf: 84318fxx - offset 0x07fc7 ***/
 
   /* 30 */  0xefbb80, 0xefbb81, 0xefbb82, 0xefbb83,
   /* 34 */  0xefbb84, 0xefbb85, 0xefbb86, 0xefbb87,
   /* 38 */  0xefbb88, 0xefbb89,
 
-  /*** Four byte table, leaf: 843190xx - offset 0x07f5d ***/
+  /*** Four byte table, leaf: 843190xx - offset 0x07fd1 ***/
 
   /* 30 */  0xefbb8a, 0xefbb8b, 0xefbb8c, 0xefbb8d,
   /* 34 */  0xefbb8e, 0xefbb8f, 0xefbb90, 0xefbb91,
   /* 38 */  0xefbb92, 0xefbb93,
 
-  /*** Four byte table, leaf: 843191xx - offset 0x07f67 ***/
+  /*** Four byte table, leaf: 843191xx - offset 0x07fdb ***/
 
   /* 30 */  0xefbb94, 0xefbb95, 0xefbb96, 0xefbb97,
   /* 34 */  0xefbb98, 0xefbb99, 0xefbb9a, 0xefbb9b,
   /* 38 */  0xefbb9c, 0xefbb9d,
 
-  /*** Four byte table, leaf: 843192xx - offset 0x07f71 ***/
+  /*** Four byte table, leaf: 843192xx - offset 0x07fe5 ***/
 
   /* 30 */  0xefbb9e, 0xefbb9f, 0xefbba0, 0xefbba1,
   /* 34 */  0xefbba2, 0xefbba3, 0xefbba4, 0xefbba5,
   /* 38 */  0xefbba6, 0xefbba7,
 
-  /*** Four byte table, leaf: 843193xx - offset 0x07f7b ***/
+  /*** Four byte table, leaf: 843193xx - offset 0x07fef ***/
 
   /* 30 */  0xefbba8, 0xefbba9, 0xefbbaa, 0xefbbab,
   /* 34 */  0xefbbac, 0xefbbad, 0xefbbae, 0xefbbaf,
   /* 38 */  0xefbbb0, 0xefbbb1,
 
-  /*** Four byte table, leaf: 843194xx - offset 0x07f85 ***/
+  /*** Four byte table, leaf: 843194xx - offset 0x07ff9 ***/
 
   /* 30 */  0xefbbb2, 0xefbbb3, 0xefbbb4, 0xefbbb5,
   /* 34 */  0xefbbb6, 0xefbbb7, 0xefbbb8, 0xefbbb9,
   /* 38 */  0xefbbba, 0xefbbbb,
 
-  /*** Four byte table, leaf: 843195xx - offset 0x07f8f ***/
+  /*** Four byte table, leaf: 843195xx - offset 0x08003 ***/
 
   /* 30 */  0xefbbbc, 0xefbbbd, 0xefbbbe, 0xefbbbf,
   /* 34 */  0xefbc80, 0xefbd9f, 0xefbda0, 0xefbda1,
   /* 38 */  0xefbda2, 0xefbda3,
 
-  /*** Four byte table, leaf: 843196xx - offset 0x07f99 ***/
+  /*** Four byte table, leaf: 843196xx - offset 0x0800d ***/
 
   /* 30 */  0xefbda4, 0xefbda5, 0xefbda6, 0xefbda7,
   /* 34 */  0xefbda8, 0xefbda9, 0xefbdaa, 0xefbdab,
   /* 38 */  0xefbdac, 0xefbdad,
 
-  /*** Four byte table, leaf: 843197xx - offset 0x07fa3 ***/
+  /*** Four byte table, leaf: 843197xx - offset 0x08017 ***/
 
   /* 30 */  0xefbdae, 0xefbdaf, 0xefbdb0, 0xefbdb1,
   /* 34 */  0xefbdb2, 0xefbdb3, 0xefbdb4, 0xefbdb5,
   /* 38 */  0xefbdb6, 0xefbdb7,
 
-  /*** Four byte table, leaf: 843198xx - offset 0x07fad ***/
+  /*** Four byte table, leaf: 843198xx - offset 0x08021 ***/
 
   /* 30 */  0xefbdb8, 0xefbdb9, 0xefbdba, 0xefbdbb,
   /* 34 */  0xefbdbc, 0xefbdbd, 0xefbdbe, 0xefbdbf,
   /* 38 */  0xefbe80, 0xefbe81,
 
-  /*** Four byte table, leaf: 843199xx - offset 0x07fb7 ***/
+  /*** Four byte table, leaf: 843199xx - offset 0x0802b ***/
 
   /* 30 */  0xefbe82, 0xefbe83, 0xefbe84, 0xefbe85,
   /* 34 */  0xefbe86, 0xefbe87, 0xefbe88, 0xefbe89,
   /* 38 */  0xefbe8a, 0xefbe8b,
 
-  /*** Four byte table, leaf: 84319axx - offset 0x07fc1 ***/
+  /*** Four byte table, leaf: 84319axx - offset 0x08035 ***/
 
   /* 30 */  0xefbe8c, 0xefbe8d, 0xefbe8e, 0xefbe8f,
   /* 34 */  0xefbe90, 0xefbe91, 0xefbe92, 0xefbe93,
   /* 38 */  0xefbe94, 0xefbe95,
 
-  /*** Four byte table, leaf: 84319bxx - offset 0x07fcb ***/
+  /*** Four byte table, leaf: 84319bxx - offset 0x0803f ***/
 
   /* 30 */  0xefbe96, 0xefbe97, 0xefbe98, 0xefbe99,
   /* 34 */  0xefbe9a, 0xefbe9b, 0xefbe9c, 0xefbe9d,
   /* 38 */  0xefbe9e, 0xefbe9f,
 
-  /*** Four byte table, leaf: 84319cxx - offset 0x07fd5 ***/
+  /*** Four byte table, leaf: 84319cxx - offset 0x08049 ***/
 
   /* 30 */  0xefbea0, 0xefbea1, 0xefbea2, 0xefbea3,
   /* 34 */  0xefbea4, 0xefbea5, 0xefbea6, 0xefbea7,
   /* 38 */  0xefbea8, 0xefbea9,
 
-  /*** Four byte table, leaf: 84319dxx - offset 0x07fdf ***/
+  /*** Four byte table, leaf: 84319dxx - offset 0x08053 ***/
 
   /* 30 */  0xefbeaa, 0xefbeab, 0xefbeac, 0xefbead,
   /* 34 */  0xefbeae, 0xefbeaf, 0xefbeb0, 0xefbeb1,
   /* 38 */  0xefbeb2, 0xefbeb3,
 
-  /*** Four byte table, leaf: 84319exx - offset 0x07fe9 ***/
+  /*** Four byte table, leaf: 84319exx - offset 0x0805d ***/
 
   /* 30 */  0xefbeb4, 0xefbeb5, 0xefbeb6, 0xefbeb7,
   /* 34 */  0xefbeb8, 0xefbeb9, 0xefbeba, 0xefbebb,
   /* 38 */  0xefbebc, 0xefbebd,
 
-  /*** Four byte table, leaf: 84319fxx - offset 0x07ff3 ***/
+  /*** Four byte table, leaf: 84319fxx - offset 0x08067 ***/
 
   /* 30 */  0xefbebe, 0xefbebf, 0xefbf80, 0xefbf81,
   /* 34 */  0xefbf82, 0xefbf83, 0xefbf84, 0xefbf85,
   /* 38 */  0xefbf86, 0xefbf87,
 
-  /*** Four byte table, leaf: 8431a0xx - offset 0x07ffd ***/
+  /*** Four byte table, leaf: 8431a0xx - offset 0x08071 ***/
 
   /* 30 */  0xefbf88, 0xefbf89, 0xefbf8a, 0xefbf8b,
   /* 34 */  0xefbf8c, 0xefbf8d, 0xefbf8e, 0xefbf8f,
   /* 38 */  0xefbf90, 0xefbf91,
 
-  /*** Four byte table, leaf: 8431a1xx - offset 0x08007 ***/
+  /*** Four byte table, leaf: 8431a1xx - offset 0x0807b ***/
 
   /* 30 */  0xefbf92, 0xefbf93, 0xefbf94, 0xefbf95,
   /* 34 */  0xefbf96, 0xefbf97, 0xefbf98, 0xefbf99,
   /* 38 */  0xefbf9a, 0xefbf9b,
 
-  /*** Four byte table, leaf: 8431a2xx - offset 0x08011 ***/
+  /*** Four byte table, leaf: 8431a2xx - offset 0x08085 ***/
 
   /* 30 */  0xefbf9c, 0xefbf9d, 0xefbf9e, 0xefbf9f,
   /* 34 */  0x000000, 0x000000, 0x000000, 0x000000,
diff --git a/src/backend/utils/mb/Unicode/utf8_to_gb18030.map b/src/backend/utils/mb/Unicode/utf8_to_gb18030.map
index 6c6b660bebe..0b76e72b583 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_gb18030.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_gb18030.map
@@ -1,7 +1,7 @@
 /* src/backend/utils/mb/Unicode/utf8_to_gb18030.map */
 /* This file is generated by src/backend/utils/mb/Unicode/UCS_to_GB18030.pl */
 
-static const uint32 gb18030_from_unicode_tree_table[31972];
+static const uint32 gb18030_from_unicode_tree_table[32106];
 
 static const pg_mb_radix_tree gb18030_from_unicode_tree =
 {
@@ -19,7 +19,7 @@ static const pg_mb_radix_tree gb18030_from_unicode_tree =
   0xbf, /* b2_2_upper */
 
   0x0450, /* offset of table for 3-byte inputs */
-  0xe2, /* b3_1_lower */
+  0xe1, /* b3_1_lower */
   0xef, /* b3_1_upper */
   0x80, /* b3_2_lower */
   0xbf, /* b3_2_upper */
@@ -37,7 +37,7 @@ static const pg_mb_radix_tree gb18030_from_unicode_tree =
   0x00  /* b4_4_upper */
 };
 
-static const uint32 gb18030_from_unicode_tree_table[31972] =
+static const uint32 gb18030_from_unicode_tree_table[32106] =
 {
   /*** Dummy map, for invalid values - offset 0x00000 ***/
 
@@ -371,20 +371,20 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
 
   /*** Three byte table, byte #1: xx - offset 0x00450 ***/
 
-  /* e2 */  0x0000045e, 0x0000049e, 0x000004dd, 0x0000051d,
-  /* e6 */  0x0000055d, 0x0000059d, 0x000005dd, 0x0000061d,
-  /* ea */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* ee */  0x0000065d, 0x0000067f,
+  /* e1 */  0x0000045f, 0x0000049f, 0x000004df, 0x0000051e,
+  /* e5 */  0x0000055e, 0x0000059e, 0x000005de, 0x0000061e,
+  /* e9 */  0x0000065e, 0x00000000, 0x00000000, 0x00000000,
+  /* ed */  0x00000000, 0x0000069e, 0x000006c0,
 
-  /*** Three byte table, byte #2: e2xx - offset 0x0045e ***/
+  /*** Three byte table, byte #2: e1xx - offset 0x0045f ***/
 
-  /* 80 */  0x000006bf, 0x000006ff, 0x0000073f, 0x0000077f,
-  /* 84 */  0x000007bf, 0x000007ff, 0x0000083f, 0x0000087f,
-  /* 88 */  0x000008bf, 0x000008ff, 0x0000093f, 0x0000097f,
-  /* 8c */  0x000009bf, 0x000009ff, 0x00000a3f, 0x00000a7f,
-  /* 90 */  0x00000abf, 0x00000aff, 0x00000b3f, 0x00000b7f,
-  /* 94 */  0x00000bbf, 0x00000bff, 0x00000c3f, 0x00000c7f,
-  /* 98 */  0x00000cbf, 0x00000cff, 0x00000000, 0x00000000,
+  /* 80 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 88 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 8c */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 90 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 94 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 98 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 9c */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* a0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* a4 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -392,157 +392,195 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* ac */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* b0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* b4 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* b8 */  0x00000000, 0x00000000, 0x00000d3e, 0x00000d7e,
-  /* bc */  0x00000dbe, 0x00000dfe, 0x00000e3e, 0x00000e7e,
-
-  /*** Three byte table, byte #2: e3xx - offset 0x0049e ***/
-
-  /* 80 */  0x00000ebe, 0x00000efe, 0x00000f3e, 0x00000f7e,
-  /* 84 */  0x00000fbe, 0x00000ffe, 0x0000103e, 0x0000107e,
-  /* 88 */  0x000010be, 0x000010fe, 0x0000113e, 0x0000117e,
-  /* 8c */  0x000011be, 0x000011fe, 0x0000123e, 0x0000127e,
-  /* 90 */  0x000012be, 0x000012fe, 0x0000133e, 0x0000137e,
-  /* 94 */  0x000013be, 0x000013fe, 0x0000143e, 0x0000147e,
-  /* 98 */  0x000014be, 0x00000000, 0x00000000, 0x00000000,
+  /* b8 */  0x00000700, 0x00000000, 0x00000000, 0x00000000,
+  /* bc */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+
+  /*** Three byte table, byte #2: e2xx - offset 0x0049f ***/
+
+  /* 80 */  0x00000740, 0x00000780, 0x000007c0, 0x00000800,
+  /* 84 */  0x00000840, 0x00000880, 0x000008c0, 0x00000900,
+  /* 88 */  0x00000940, 0x00000980, 0x000009c0, 0x00000a00,
+  /* 8c */  0x00000a40, 0x00000a80, 0x00000ac0, 0x00000b00,
+  /* 90 */  0x00000b40, 0x00000b80, 0x00000bc0, 0x00000c00,
+  /* 94 */  0x00000c40, 0x00000c80, 0x00000cc0, 0x00000d00,
+  /* 98 */  0x00000d40, 0x00000d80, 0x00000000, 0x00000000,
   /* 9c */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* a0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* a4 */  0x000014e6, 0x00001526, 0x00001566, 0x000015a6,
-  /* a8 */  0x000015e6, 0x00001626, 0x00001666, 0x000016a6,
-  /* ac */  0x000016e6, 0x00001726, 0x00001766, 0x000017a6,
-  /* b0 */  0x000017e6, 0x00001826, 0x00001866, 0x000018a6,
+  /* a4 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* a8 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* ac */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* b0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* b4 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* b8 */  0x00000000, 0x00000000, 0x00000dbf, 0x00000dff,
+  /* bc */  0x00000e3f, 0x00000e7f, 0x00000ebf, 0x00000eff,
+
+  /*** Three byte table, byte #2: e3xx - offset 0x004df ***/
+
+  /* 80 */  0x00000f3f, 0x00000f7f, 0x00000fbf, 0x00000fff,
+  /* 84 */  0x0000103f, 0x0000107f, 0x000010bf, 0x000010ff,
+  /* 88 */  0x0000113f, 0x0000117f, 0x000011bf, 0x000011ff,
+  /* 8c */  0x0000123f, 0x0000127f, 0x000012bf, 0x000012ff,
+  /* 90 */  0x0000133f, 0x0000137f, 0x000013bf, 0x000013ff,
+  /* 94 */  0x0000143f, 0x0000147f, 0x000014bf, 0x000014ff,
+  /* 98 */  0x0000153f, 0x00000000, 0x00000000, 0x00000000,
+  /* 9c */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* a0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* a4 */  0x00001567, 0x000015a7, 0x000015e7, 0x00001627,
+  /* a8 */  0x00001667, 0x000016a7, 0x000016e7, 0x00001727,
+  /* ac */  0x00001767, 0x000017a7, 0x000017e7, 0x00001827,
+  /* b0 */  0x00001867, 0x000018a7, 0x000018e7, 0x00001927,
   /* b4 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* b8 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* bc */  0x00000000, 0x00000000, 0x00000000,
     /* 1 trailing zero values shared with next segment */
 
-  /*** Three byte table, byte #2: e4xx - offset 0x004dd ***/
+  /*** Three byte table, byte #2: e4xx - offset 0x0051e ***/
 
-  /* 80 */  0x00000000, 0x000018d0, 0x00001910, 0x00001950,
-  /* 84 */  0x00001990, 0x000019d0, 0x00000000, 0x00000000,
+  /* 80 */  0x00000000, 0x00001951, 0x00001991, 0x000019d1,
+  /* 84 */  0x00001a11, 0x00001a51, 0x00000000, 0x00000000,
   /* 88 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* 8c */  0x000019f0, 0x00001a30, 0x00001a70, 0x00001ab0,
-  /* 90 */  0x00001af0, 0x00001b30, 0x00001b70, 0x00001bb0,
+  /* 8c */  0x00001a71, 0x00001ab1, 0x00001af1, 0x00001b31,
+  /* 90 */  0x00001b71, 0x00001bb1, 0x00001bf1, 0x00001c31,
   /* 94 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* 98 */  0x00000000, 0x00001be4, 0x00001c24, 0x00001c64,
-  /* 9c */  0x00001ca4, 0x00001ce4, 0x00001d24, 0x00000000,
+  /* 98 */  0x00000000, 0x00001c65, 0x00001ca5, 0x00001ce5,
+  /* 9c */  0x00001d25, 0x00001d65, 0x00001da5, 0x00000000,
   /* a0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* a4 */  0x00000000, 0x00001d5d, 0x00001d9d, 0x00000000,
+  /* a4 */  0x00000000, 0x00001dde, 0x00001e1e, 0x00000000,
   /* a8 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* ac */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* b0 */  0x00000000, 0x00001dd5, 0x00001e15, 0x00001e55,
-  /* b4 */  0x00001e95, 0x00001ed5, 0x00001f15, 0x00001f55,
-  /* b8 */  0x00001f95, 0x00001fd5, 0x00002015, 0x00002055,
-  /* bc */  0x00002095, 0x000020d5, 0x00002115, 0x00002155,
-
-  /*** Three byte table, byte #2: e5xx - offset 0x0051d ***/
-
-  /* 80 */  0x00002195, 0x000021d5, 0x00002215, 0x00002255,
-  /* 84 */  0x00002295, 0x000022d5, 0x00002315, 0x00002355,
-  /* 88 */  0x00002395, 0x000023d5, 0x00002415, 0x00002455,
-  /* 8c */  0x00002495, 0x000024d5, 0x00002515, 0x00002555,
-  /* 90 */  0x00002595, 0x000025d5, 0x00002615, 0x00002655,
-  /* 94 */  0x00002695, 0x000026d5, 0x00002715, 0x00002755,
-  /* 98 */  0x00002795, 0x000027d5, 0x00002815, 0x00002855,
-  /* 9c */  0x00002895, 0x000028d5, 0x00002915, 0x00002955,
-  /* a0 */  0x00002995, 0x000029d5, 0x00002a15, 0x00002a55,
-  /* a4 */  0x00002a95, 0x00002ad5, 0x00002b15, 0x00002b55,
-  /* a8 */  0x00002b95, 0x00002bd5, 0x00002c15, 0x00002c55,
-  /* ac */  0x00002c95, 0x00002cd5, 0x00002d15, 0x00002d55,
-  /* b0 */  0x00002d95, 0x00002dd5, 0x00002e15, 0x00002e55,
-  /* b4 */  0x00002e95, 0x00002ed5, 0x00002f15, 0x00002f55,
-  /* b8 */  0x00002f95, 0x00002fd5, 0x00003015, 0x00003055,
-  /* bc */  0x00003095, 0x000030d5, 0x00003115, 0x00003155,
-
-  /*** Three byte table, byte #2: e6xx - offset 0x0055d ***/
-
-  /* 80 */  0x00003195, 0x000031d5, 0x00003215, 0x00003255,
-  /* 84 */  0x00003295, 0x000032d5, 0x00003315, 0x00003355,
-  /* 88 */  0x00003395, 0x000033d5, 0x00003415, 0x00003455,
-  /* 8c */  0x00003495, 0x000034d5, 0x00003515, 0x00003555,
-  /* 90 */  0x00003595, 0x000035d5, 0x00003615, 0x00003655,
-  /* 94 */  0x00003695, 0x000036d5, 0x00003715, 0x00003755,
-  /* 98 */  0x00003795, 0x000037d5, 0x00003815, 0x00003855,
-  /* 9c */  0x00003895, 0x000038d5, 0x00003915, 0x00003955,
-  /* a0 */  0x00003995, 0x000039d5, 0x00003a15, 0x00003a55,
-  /* a4 */  0x00003a95, 0x00003ad5, 0x00003b15, 0x00003b55,
-  /* a8 */  0x00003b95, 0x00003bd5, 0x00003c15, 0x00003c55,
-  /* ac */  0x00003c95, 0x00003cd5, 0x00003d15, 0x00003d55,
-  /* b0 */  0x00003d95, 0x00003dd5, 0x00003e15, 0x00003e55,
-  /* b4 */  0x00003e95, 0x00003ed5, 0x00003f15, 0x00003f55,
-  /* b8 */  0x00003f95, 0x00003fd5, 0x00004015, 0x00004055,
-  /* bc */  0x00004095, 0x000040d5, 0x00004115, 0x00004155,
-
-  /*** Three byte table, byte #2: e7xx - offset 0x0059d ***/
-
-  /* 80 */  0x00004195, 0x000041d5, 0x00004215, 0x00004255,
-  /* 84 */  0x00004295, 0x000042d5, 0x00004315, 0x00004355,
-  /* 88 */  0x00004395, 0x000043d5, 0x00004415, 0x00004455,
-  /* 8c */  0x00004495, 0x000044d5, 0x00004515, 0x00004555,
-  /* 90 */  0x00004595, 0x000045d5, 0x00004615, 0x00004655,
-  /* 94 */  0x00004695, 0x000046d5, 0x00004715, 0x00004755,
-  /* 98 */  0x00004795, 0x000047d5, 0x00004815, 0x00004855,
-  /* 9c */  0x00004895, 0x000048d5, 0x00004915, 0x00004955,
-  /* a0 */  0x00004995, 0x000049d5, 0x00004a15, 0x00004a55,
-  /* a4 */  0x00004a95, 0x00004ad5, 0x00004b15, 0x00004b55,
-  /* a8 */  0x00004b95, 0x00004bd5, 0x00004c15, 0x00004c55,
-  /* ac */  0x00004c95, 0x00004cd5, 0x00004d15, 0x00004d55,
-  /* b0 */  0x00004d95, 0x00004dd5, 0x00004e15, 0x00004e55,
-  /* b4 */  0x00004e95, 0x00004ed5, 0x00004f15, 0x00004f55,
-  /* b8 */  0x00004f95, 0x00004fd5, 0x00005015, 0x00005055,
-  /* bc */  0x00005095, 0x000050d5, 0x00005115, 0x00005155,
-
-  /*** Three byte table, byte #2: e8xx - offset 0x005dd ***/
-
-  /* 80 */  0x00005195, 0x000051d5, 0x00005215, 0x00005255,
-  /* 84 */  0x00005295, 0x000052d5, 0x00005315, 0x00005355,
-  /* 88 */  0x00005395, 0x000053d5, 0x00005415, 0x00005455,
-  /* 8c */  0x00005495, 0x000054d5, 0x00005515, 0x00005555,
-  /* 90 */  0x00005595, 0x000055d5, 0x00005615, 0x00005655,
-  /* 94 */  0x00005695, 0x000056d5, 0x00005715, 0x00005755,
-  /* 98 */  0x00005795, 0x000057d5, 0x00005815, 0x00005855,
-  /* 9c */  0x00005895, 0x000058d5, 0x00005915, 0x00005955,
-  /* a0 */  0x00005995, 0x000059d5, 0x00005a15, 0x00005a55,
-  /* a4 */  0x00005a95, 0x00005ad5, 0x00005b15, 0x00005b55,
-  /* a8 */  0x00005b95, 0x00005bd5, 0x00005c15, 0x00005c55,
-  /* ac */  0x00005c95, 0x00005cd5, 0x00005d15, 0x00005d55,
-  /* b0 */  0x00005d95, 0x00005dd5, 0x00005e15, 0x00005e55,
-  /* b4 */  0x00005e95, 0x00005ed5, 0x00005f15, 0x00005f55,
-  /* b8 */  0x00005f95, 0x00005fd5, 0x00006015, 0x00006055,
-  /* bc */  0x00006095, 0x000060d5, 0x00006115, 0x00006155,
-
-  /*** Three byte table, byte #2: e9xx - offset 0x0061d ***/
-
-  /* 80 */  0x00006195, 0x000061d5, 0x00006215, 0x00006255,
-  /* 84 */  0x00006295, 0x000062d5, 0x00006315, 0x00006355,
-  /* 88 */  0x00006395, 0x000063d5, 0x00006415, 0x00006455,
-  /* 8c */  0x00006495, 0x000064d5, 0x00006515, 0x00006555,
-  /* 90 */  0x00006595, 0x000065d5, 0x00006615, 0x00006655,
-  /* 94 */  0x00006695, 0x000066d5, 0x00006715, 0x00006755,
-  /* 98 */  0x00006795, 0x000067d5, 0x00006815, 0x00006855,
-  /* 9c */  0x00006895, 0x000068d5, 0x00006915, 0x00006955,
-  /* a0 */  0x00006995, 0x000069d5, 0x00006a15, 0x00006a55,
-  /* a4 */  0x00006a95, 0x00006ad5, 0x00006b15, 0x00006b55,
-  /* a8 */  0x00006b95, 0x00006bd5, 0x00006c15, 0x00006c55,
-  /* ac */  0x00006c95, 0x00006cd5, 0x00006d15, 0x00006d55,
-  /* b0 */  0x00006d95, 0x00006dd5, 0x00006e15, 0x00006e55,
-  /* b4 */  0x00006e95, 0x00006ed5, 0x00006f15, 0x00006f55,
-  /* b8 */  0x00006f95, 0x00006fd5, 0x00007015, 0x00007055,
-  /* bc */  0x00007095, 0x000070d5, 0x00007115, 0x00000000,
-
-  /*** Three byte table, byte #2: eexx - offset 0x0065d ***/
-
-  /* 80 */  0x00007155, 0x00007195, 0x000071d5, 0x00007215,
-  /* 84 */  0x00007255, 0x00007295, 0x000072d5, 0x00007315,
-  /* 88 */  0x00007355, 0x00007395, 0x000073d5, 0x00007415,
-  /* 8c */  0x00007455, 0x00007495, 0x000074d5, 0x00007515,
-  /* 90 */  0x00007555, 0x00007595, 0x000075d5, 0x00007615,
-  /* 94 */  0x00007655, 0x00007695, 0x000076d5, 0x00007715,
-  /* 98 */  0x00007755, 0x00007795, 0x000077d5, 0x00007815,
-  /* 9c */  0x00007855, 0x00007895, 0x000078d5, 0x00007915,
-  /* a0 */  0x00007955, 0x00007995,
+  /* b0 */  0x00000000, 0x00001e56, 0x00001e96, 0x00001ed6,
+  /* b4 */  0x00001f16, 0x00001f56, 0x00001f96, 0x00001fd6,
+  /* b8 */  0x00002016, 0x00002056, 0x00002096, 0x000020d6,
+  /* bc */  0x00002116, 0x00002156, 0x00002196, 0x000021d6,
+
+  /*** Three byte table, byte #2: e5xx - offset 0x0055e ***/
+
+  /* 80 */  0x00002216, 0x00002256, 0x00002296, 0x000022d6,
+  /* 84 */  0x00002316, 0x00002356, 0x00002396, 0x000023d6,
+  /* 88 */  0x00002416, 0x00002456, 0x00002496, 0x000024d6,
+  /* 8c */  0x00002516, 0x00002556, 0x00002596, 0x000025d6,
+  /* 90 */  0x00002616, 0x00002656, 0x00002696, 0x000026d6,
+  /* 94 */  0x00002716, 0x00002756, 0x00002796, 0x000027d6,
+  /* 98 */  0x00002816, 0x00002856, 0x00002896, 0x000028d6,
+  /* 9c */  0x00002916, 0x00002956, 0x00002996, 0x000029d6,
+  /* a0 */  0x00002a16, 0x00002a56, 0x00002a96, 0x00002ad6,
+  /* a4 */  0x00002b16, 0x00002b56, 0x00002b96, 0x00002bd6,
+  /* a8 */  0x00002c16, 0x00002c56, 0x00002c96, 0x00002cd6,
+  /* ac */  0x00002d16, 0x00002d56, 0x00002d96, 0x00002dd6,
+  /* b0 */  0x00002e16, 0x00002e56, 0x00002e96, 0x00002ed6,
+  /* b4 */  0x00002f16, 0x00002f56, 0x00002f96, 0x00002fd6,
+  /* b8 */  0x00003016, 0x00003056, 0x00003096, 0x000030d6,
+  /* bc */  0x00003116, 0x00003156, 0x00003196, 0x000031d6,
+
+  /*** Three byte table, byte #2: e6xx - offset 0x0059e ***/
+
+  /* 80 */  0x00003216, 0x00003256, 0x00003296, 0x000032d6,
+  /* 84 */  0x00003316, 0x00003356, 0x00003396, 0x000033d6,
+  /* 88 */  0x00003416, 0x00003456, 0x00003496, 0x000034d6,
+  /* 8c */  0x00003516, 0x00003556, 0x00003596, 0x000035d6,
+  /* 90 */  0x00003616, 0x00003656, 0x00003696, 0x000036d6,
+  /* 94 */  0x00003716, 0x00003756, 0x00003796, 0x000037d6,
+  /* 98 */  0x00003816, 0x00003856, 0x00003896, 0x000038d6,
+  /* 9c */  0x00003916, 0x00003956, 0x00003996, 0x000039d6,
+  /* a0 */  0x00003a16, 0x00003a56, 0x00003a96, 0x00003ad6,
+  /* a4 */  0x00003b16, 0x00003b56, 0x00003b96, 0x00003bd6,
+  /* a8 */  0x00003c16, 0x00003c56, 0x00003c96, 0x00003cd6,
+  /* ac */  0x00003d16, 0x00003d56, 0x00003d96, 0x00003dd6,
+  /* b0 */  0x00003e16, 0x00003e56, 0x00003e96, 0x00003ed6,
+  /* b4 */  0x00003f16, 0x00003f56, 0x00003f96, 0x00003fd6,
+  /* b8 */  0x00004016, 0x00004056, 0x00004096, 0x000040d6,
+  /* bc */  0x00004116, 0x00004156, 0x00004196, 0x000041d6,
+
+  /*** Three byte table, byte #2: e7xx - offset 0x005de ***/
+
+  /* 80 */  0x00004216, 0x00004256, 0x00004296, 0x000042d6,
+  /* 84 */  0x00004316, 0x00004356, 0x00004396, 0x000043d6,
+  /* 88 */  0x00004416, 0x00004456, 0x00004496, 0x000044d6,
+  /* 8c */  0x00004516, 0x00004556, 0x00004596, 0x000045d6,
+  /* 90 */  0x00004616, 0x00004656, 0x00004696, 0x000046d6,
+  /* 94 */  0x00004716, 0x00004756, 0x00004796, 0x000047d6,
+  /* 98 */  0x00004816, 0x00004856, 0x00004896, 0x000048d6,
+  /* 9c */  0x00004916, 0x00004956, 0x00004996, 0x000049d6,
+  /* a0 */  0x00004a16, 0x00004a56, 0x00004a96, 0x00004ad6,
+  /* a4 */  0x00004b16, 0x00004b56, 0x00004b96, 0x00004bd6,
+  /* a8 */  0x00004c16, 0x00004c56, 0x00004c96, 0x00004cd6,
+  /* ac */  0x00004d16, 0x00004d56, 0x00004d96, 0x00004dd6,
+  /* b0 */  0x00004e16, 0x00004e56, 0x00004e96, 0x00004ed6,
+  /* b4 */  0x00004f16, 0x00004f56, 0x00004f96, 0x00004fd6,
+  /* b8 */  0x00005016, 0x00005056, 0x00005096, 0x000050d6,
+  /* bc */  0x00005116, 0x00005156, 0x00005196, 0x000051d6,
+
+  /*** Three byte table, byte #2: e8xx - offset 0x0061e ***/
+
+  /* 80 */  0x00005216, 0x00005256, 0x00005296, 0x000052d6,
+  /* 84 */  0x00005316, 0x00005356, 0x00005396, 0x000053d6,
+  /* 88 */  0x00005416, 0x00005456, 0x00005496, 0x000054d6,
+  /* 8c */  0x00005516, 0x00005556, 0x00005596, 0x000055d6,
+  /* 90 */  0x00005616, 0x00005656, 0x00005696, 0x000056d6,
+  /* 94 */  0x00005716, 0x00005756, 0x00005796, 0x000057d6,
+  /* 98 */  0x00005816, 0x00005856, 0x00005896, 0x000058d6,
+  /* 9c */  0x00005916, 0x00005956, 0x00005996, 0x000059d6,
+  /* a0 */  0x00005a16, 0x00005a56, 0x00005a96, 0x00005ad6,
+  /* a4 */  0x00005b16, 0x00005b56, 0x00005b96, 0x00005bd6,
+  /* a8 */  0x00005c16, 0x00005c56, 0x00005c96, 0x00005cd6,
+  /* ac */  0x00005d16, 0x00005d56, 0x00005d96, 0x00005dd6,
+  /* b0 */  0x00005e16, 0x00005e56, 0x00005e96, 0x00005ed6,
+  /* b4 */  0x00005f16, 0x00005f56, 0x00005f96, 0x00005fd6,
+  /* b8 */  0x00006016, 0x00006056, 0x00006096, 0x000060d6,
+  /* bc */  0x00006116, 0x00006156, 0x00006196, 0x000061d6,
+
+  /*** Three byte table, byte #2: e9xx - offset 0x0065e ***/
+
+  /* 80 */  0x00006216, 0x00006256, 0x00006296, 0x000062d6,
+  /* 84 */  0x00006316, 0x00006356, 0x00006396, 0x000063d6,
+  /* 88 */  0x00006416, 0x00006456, 0x00006496, 0x000064d6,
+  /* 8c */  0x00006516, 0x00006556, 0x00006596, 0x000065d6,
+  /* 90 */  0x00006616, 0x00006656, 0x00006696, 0x000066d6,
+  /* 94 */  0x00006716, 0x00006756, 0x00006796, 0x000067d6,
+  /* 98 */  0x00006816, 0x00006856, 0x00006896, 0x000068d6,
+  /* 9c */  0x00006916, 0x00006956, 0x00006996, 0x000069d6,
+  /* a0 */  0x00006a16, 0x00006a56, 0x00006a96, 0x00006ad6,
+  /* a4 */  0x00006b16, 0x00006b56, 0x00006b96, 0x00006bd6,
+  /* a8 */  0x00006c16, 0x00006c56, 0x00006c96, 0x00006cd6,
+  /* ac */  0x00006d16, 0x00006d56, 0x00006d96, 0x00006dd6,
+  /* b0 */  0x00006e16, 0x00006e56, 0x00006e96, 0x00006ed6,
+  /* b4 */  0x00006f16, 0x00006f56, 0x00006f96, 0x00006fd6,
+  /* b8 */  0x00007016, 0x00007056, 0x00007096, 0x000070d6,
+  /* bc */  0x00007116, 0x00007156, 0x00007196, 0x00000000,
+
+  /*** Three byte table, byte #2: eexx - offset 0x0069e ***/
+
+  /* 80 */  0x000071d6, 0x00007216, 0x00007256, 0x00007296,
+  /* 84 */  0x000072d6, 0x00007316, 0x00007356, 0x00007396,
+  /* 88 */  0x000073d6, 0x00007416, 0x00007456, 0x00007496,
+  /* 8c */  0x000074d6, 0x00007516, 0x00007556, 0x00007596,
+  /* 90 */  0x000075d6, 0x00007616, 0x00007656, 0x00007696,
+  /* 94 */  0x000076d6, 0x00007716, 0x00007756, 0x00007796,
+  /* 98 */  0x000077d6, 0x00007816, 0x00007856, 0x00007896,
+  /* 9c */  0x000078d6, 0x00007916, 0x00007956, 0x00007996,
+  /* a0 */  0x000079d6, 0x00007a16,
     /* 30 trailing zero values shared with next segment */
 
-  /*** Three byte table, byte #2: efxx - offset 0x0067f ***/
+  /*** Three byte table, byte #2: efxx - offset 0x006c0 ***/
+
+  /* 80 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 88 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 8c */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 90 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 94 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 98 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 9c */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* a0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* a4 */  0x00007a3a, 0x00007a7a, 0x00007aba, 0x00007afa,
+  /* a8 */  0x00007b3a, 0x00000000, 0x00000000, 0x00000000,
+  /* ac */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* b0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* b4 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* b8 */  0x00007b6a, 0x00007baa, 0x00007bea, 0x00007c2a,
+  /* bc */  0x00007c6a, 0x00007caa, 0x00007cea, 0x00007d2a,
+
+  /*** Three byte table, leaf: e1b8xx - offset 0x00700 ***/
 
   /* 80 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -553,15 +591,15 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* 98 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 9c */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* a0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* a4 */  0x000079ba, 0x000079fa, 0x00007a3a, 0x00007a7a,
-  /* a8 */  0x00007aba, 0x00000000, 0x00000000, 0x00000000,
+  /* a4 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* a8 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* ac */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* b0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* b4 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* b8 */  0x00007ae4, 0x00007b24, 0x00007b64, 0x00007ba4,
-  /* bc */  0x00007be4, 0x00007c24, 0x00007c64, 0x00007ca4,
+  /* b8 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* bc */  0x00000000, 0x00000000, 0x00000000, 0x0000a8bc,
 
-  /*** Three byte table, leaf: e280xx - offset 0x006bf ***/
+  /*** Three byte table, leaf: e280xx - offset 0x00740 ***/
 
   /* 80 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -580,7 +618,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136a737, 0x8136a738, 0x8136a739, 0x0000a1f9,
   /* bc */  0x8136a830, 0x8136a831, 0x8136a832, 0x8136a833,
 
-  /*** Three byte table, leaf: e281xx - offset 0x006ff ***/
+  /*** Three byte table, leaf: e281xx - offset 0x00780 ***/
 
   /* 80 */  0x8136a834, 0x8136a835, 0x8136a836, 0x8136a837,
   /* 84 */  0x8136a838, 0x8136a839, 0x8136a930, 0x8136a931,
@@ -599,7 +637,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136ae30, 0x8136ae31, 0x8136ae32, 0x8136ae33,
   /* bc */  0x8136ae34, 0x8136ae35, 0x8136ae36, 0x8136ae37,
 
-  /*** Three byte table, leaf: e282xx - offset 0x0073f ***/
+  /*** Three byte table, leaf: e282xx - offset 0x007c0 ***/
 
   /* 80 */  0x8136ae38, 0x8136ae39, 0x8136af30, 0x8136af31,
   /* 84 */  0x8136af32, 0x8136af33, 0x8136af34, 0x8136af35,
@@ -618,7 +656,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136b433, 0x8136b434, 0x8136b435, 0x8136b436,
   /* bc */  0x8136b437, 0x8136b438, 0x8136b439, 0x8136b530,
 
-  /*** Three byte table, leaf: e283xx - offset 0x0077f ***/
+  /*** Three byte table, leaf: e283xx - offset 0x00800 ***/
 
   /* 80 */  0x8136b531, 0x8136b532, 0x8136b533, 0x8136b534,
   /* 84 */  0x8136b535, 0x8136b536, 0x8136b537, 0x8136b538,
@@ -637,7 +675,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136ba37, 0x8136ba38, 0x8136ba39, 0x8136bb30,
   /* bc */  0x8136bb31, 0x8136bb32, 0x8136bb33, 0x8136bb34,
 
-  /*** Three byte table, leaf: e284xx - offset 0x007bf ***/
+  /*** Three byte table, leaf: e284xx - offset 0x00840 ***/
 
   /* 80 */  0x8136bb35, 0x8136bb36, 0x8136bb37, 0x0000a1e6,
   /* 84 */  0x8136bb38, 0x0000a847, 0x8136bb39, 0x8136bc30,
@@ -656,7 +694,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136c036, 0x8136c037, 0x8136c038, 0x8136c039,
   /* bc */  0x8136c130, 0x8136c131, 0x8136c132, 0x8136c133,
 
-  /*** Three byte table, leaf: e285xx - offset 0x007ff ***/
+  /*** Three byte table, leaf: e285xx - offset 0x00880 ***/
 
   /* 80 */  0x8136c134, 0x8136c135, 0x8136c136, 0x8136c137,
   /* 84 */  0x8136c138, 0x8136c139, 0x8136c230, 0x8136c231,
@@ -675,7 +713,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a2a9, 0x0000a2aa, 0x8136c530, 0x8136c531,
   /* bc */  0x8136c532, 0x8136c533, 0x8136c534, 0x8136c535,
 
-  /*** Three byte table, leaf: e286xx - offset 0x0083f ***/
+  /*** Three byte table, leaf: e286xx - offset 0x008c0 ***/
 
   /* 80 */  0x8136c536, 0x8136c537, 0x8136c538, 0x8136c539,
   /* 84 */  0x8136c630, 0x8136c631, 0x8136c632, 0x8136c633,
@@ -694,7 +732,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136ca34, 0x8136ca35, 0x8136ca36, 0x8136ca37,
   /* bc */  0x8136ca38, 0x8136ca39, 0x8136cb30, 0x8136cb31,
 
-  /*** Three byte table, leaf: e287xx - offset 0x0087f ***/
+  /*** Three byte table, leaf: e287xx - offset 0x00900 ***/
 
   /* 80 */  0x8136cb32, 0x8136cb33, 0x8136cb34, 0x8136cb35,
   /* 84 */  0x8136cb36, 0x8136cb37, 0x8136cb38, 0x8136cb39,
@@ -713,7 +751,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136d038, 0x8136d039, 0x8136d130, 0x8136d131,
   /* bc */  0x8136d132, 0x8136d133, 0x8136d134, 0x8136d135,
 
-  /*** Three byte table, leaf: e288xx - offset 0x008bf ***/
+  /*** Three byte table, leaf: e288xx - offset 0x00940 ***/
 
   /* 80 */  0x8136d136, 0x8136d137, 0x8136d138, 0x8136d139,
   /* 84 */  0x8136d230, 0x8136d231, 0x8136d232, 0x8136d233,
@@ -732,7 +770,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136d531, 0x8136d532, 0x8136d533, 0x8136d534,
   /* bc */  0x8136d535, 0x0000a1d7, 0x8136d536, 0x8136d537,
 
-  /*** Three byte table, leaf: e289xx - offset 0x008ff ***/
+  /*** Three byte table, leaf: e289xx - offset 0x00980 ***/
 
   /* 80 */  0x8136d538, 0x8136d539, 0x8136d630, 0x8136d631,
   /* 84 */  0x8136d632, 0x8136d633, 0x8136d634, 0x8136d635,
@@ -751,7 +789,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136da33, 0x8136da34, 0x8136da35, 0x8136da36,
   /* bc */  0x8136da37, 0x8136da38, 0x8136da39, 0x8136db30,
 
-  /*** Three byte table, leaf: e28axx - offset 0x0093f ***/
+  /*** Three byte table, leaf: e28axx - offset 0x009c0 ***/
 
   /* 80 */  0x8136db31, 0x8136db32, 0x8136db33, 0x8136db34,
   /* 84 */  0x8136db35, 0x8136db36, 0x8136db37, 0x8136db38,
@@ -770,7 +808,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136e034, 0x8136e035, 0x8136e036, 0x8136e037,
   /* bc */  0x8136e038, 0x8136e039, 0x8136e130, 0x0000a853,
 
-  /*** Three byte table, leaf: e28bxx - offset 0x0097f ***/
+  /*** Three byte table, leaf: e28bxx - offset 0x00a00 ***/
 
   /* 80 */  0x8136e131, 0x8136e132, 0x8136e133, 0x8136e134,
   /* 84 */  0x8136e135, 0x8136e136, 0x8136e137, 0x8136e138,
@@ -789,7 +827,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136e637, 0x8136e638, 0x8136e639, 0x8136e730,
   /* bc */  0x8136e731, 0x8136e732, 0x8136e733, 0x8136e734,
 
-  /*** Three byte table, leaf: e28cxx - offset 0x009bf ***/
+  /*** Three byte table, leaf: e28cxx - offset 0x00a40 ***/
 
   /* 80 */  0x8136e735, 0x8136e736, 0x8136e737, 0x8136e738,
   /* 84 */  0x8136e739, 0x8136e830, 0x8136e831, 0x8136e832,
@@ -808,7 +846,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136ed30, 0x8136ed31, 0x8136ed32, 0x8136ed33,
   /* bc */  0x8136ed34, 0x8136ed35, 0x8136ed36, 0x8136ed37,
 
-  /*** Three byte table, leaf: e28dxx - offset 0x009ff ***/
+  /*** Three byte table, leaf: e28dxx - offset 0x00a80 ***/
 
   /* 80 */  0x8136ed38, 0x8136ed39, 0x8136ee30, 0x8136ee31,
   /* 84 */  0x8136ee32, 0x8136ee33, 0x8136ee34, 0x8136ee35,
@@ -827,7 +865,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136f334, 0x8136f335, 0x8136f336, 0x8136f337,
   /* bc */  0x8136f338, 0x8136f339, 0x8136f430, 0x8136f431,
 
-  /*** Three byte table, leaf: e28exx - offset 0x00a3f ***/
+  /*** Three byte table, leaf: e28exx - offset 0x00ac0 ***/
 
   /* 80 */  0x8136f432, 0x8136f433, 0x8136f434, 0x8136f435,
   /* 84 */  0x8136f436, 0x8136f437, 0x8136f438, 0x8136f439,
@@ -846,7 +884,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8136f938, 0x8136f939, 0x8136fa30, 0x8136fa31,
   /* bc */  0x8136fa32, 0x8136fa33, 0x8136fa34, 0x8136fa35,
 
-  /*** Three byte table, leaf: e28fxx - offset 0x00a7f ***/
+  /*** Three byte table, leaf: e28fxx - offset 0x00b00 ***/
 
   /* 80 */  0x8136fa36, 0x8136fa37, 0x8136fa38, 0x8136fa39,
   /* 84 */  0x8136fb30, 0x8136fb31, 0x8136fb32, 0x8136fb33,
@@ -865,7 +903,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x81378232, 0x81378233, 0x81378234, 0x81378235,
   /* bc */  0x81378236, 0x81378237, 0x81378238, 0x81378239,
 
-  /*** Three byte table, leaf: e290xx - offset 0x00abf ***/
+  /*** Three byte table, leaf: e290xx - offset 0x00b40 ***/
 
   /* 80 */  0x81378330, 0x81378331, 0x81378332, 0x81378333,
   /* 84 */  0x81378334, 0x81378335, 0x81378336, 0x81378337,
@@ -884,7 +922,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x81378836, 0x81378837, 0x81378838, 0x81378839,
   /* bc */  0x81378930, 0x81378931, 0x81378932, 0x81378933,
 
-  /*** Three byte table, leaf: e291xx - offset 0x00aff ***/
+  /*** Three byte table, leaf: e291xx - offset 0x00b80 ***/
 
   /* 80 */  0x81378934, 0x81378935, 0x81378936, 0x81378937,
   /* 84 */  0x81378938, 0x81378939, 0x81378a30, 0x81378a31,
@@ -903,7 +941,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a2c9, 0x0000a2ca, 0x0000a2cb, 0x0000a2cc,
   /* bc */  0x0000a2cd, 0x0000a2ce, 0x0000a2cf, 0x0000a2d0,
 
-  /*** Three byte table, leaf: e292xx - offset 0x00b3f ***/
+  /*** Three byte table, leaf: e292xx - offset 0x00bc0 ***/
 
   /* 80 */  0x0000a2d1, 0x0000a2d2, 0x0000a2d3, 0x0000a2d4,
   /* 84 */  0x0000a2d5, 0x0000a2d6, 0x0000a2d7, 0x0000a2d8,
@@ -922,7 +960,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x81379034, 0x81379035, 0x81379036, 0x81379037,
   /* bc */  0x81379038, 0x81379039, 0x81379130, 0x81379131,
 
-  /*** Three byte table, leaf: e293xx - offset 0x00b7f ***/
+  /*** Three byte table, leaf: e293xx - offset 0x00c00 ***/
 
   /* 80 */  0x81379132, 0x81379133, 0x81379134, 0x81379135,
   /* 84 */  0x81379136, 0x81379137, 0x81379138, 0x81379139,
@@ -941,7 +979,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x81379638, 0x81379639, 0x81379730, 0x81379731,
   /* bc */  0x81379732, 0x81379733, 0x81379734, 0x81379735,
 
-  /*** Three byte table, leaf: e294xx - offset 0x00bbf ***/
+  /*** Three byte table, leaf: e294xx - offset 0x00c40 ***/
 
   /* 80 */  0x0000a9a4, 0x0000a9a5, 0x0000a9a6, 0x0000a9a7,
   /* 84 */  0x0000a9a8, 0x0000a9a9, 0x0000a9aa, 0x0000a9ab,
@@ -960,7 +998,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a9dc, 0x0000a9dd, 0x0000a9de, 0x0000a9df,
   /* bc */  0x0000a9e0, 0x0000a9e1, 0x0000a9e2, 0x0000a9e3,
 
-  /*** Three byte table, leaf: e295xx - offset 0x00bff ***/
+  /*** Three byte table, leaf: e295xx - offset 0x00c80 ***/
 
   /* 80 */  0x0000a9e4, 0x0000a9e5, 0x0000a9e6, 0x0000a9e7,
   /* 84 */  0x0000a9e8, 0x0000a9e9, 0x0000a9ea, 0x0000a9eb,
@@ -979,7 +1017,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x81379834, 0x81379835, 0x81379836, 0x81379837,
   /* bc */  0x81379838, 0x81379839, 0x81379930, 0x81379931,
 
-  /*** Three byte table, leaf: e296xx - offset 0x00c3f ***/
+  /*** Three byte table, leaf: e296xx - offset 0x00cc0 ***/
 
   /* 80 */  0x81379932, 0x0000a878, 0x0000a879, 0x0000a87a,
   /* 84 */  0x0000a87b, 0x0000a87c, 0x0000a87d, 0x0000a87e,
@@ -998,7 +1036,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x81379c36, 0x81379c37, 0x81379c38, 0x81379c39,
   /* bc */  0x0000a88b, 0x0000a88c, 0x81379d30, 0x81379d31,
 
-  /*** Three byte table, leaf: e297xx - offset 0x00c7f ***/
+  /*** Three byte table, leaf: e297xx - offset 0x00d00 ***/
 
   /* 80 */  0x81379d32, 0x81379d33, 0x81379d34, 0x81379d35,
   /* 84 */  0x81379d36, 0x81379d37, 0x0000a1f4, 0x0000a1f3,
@@ -1017,7 +1055,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8137a139, 0x8137a230, 0x8137a231, 0x8137a232,
   /* bc */  0x8137a233, 0x8137a234, 0x8137a235, 0x8137a236,
 
-  /*** Three byte table, leaf: e298xx - offset 0x00cbf ***/
+  /*** Three byte table, leaf: e298xx - offset 0x00d40 ***/
 
   /* 80 */  0x8137a237, 0x8137a238, 0x8137a239, 0x8137a330,
   /* 84 */  0x8137a331, 0x0000a1ef, 0x0000a1ee, 0x8137a332,
@@ -1036,7 +1074,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8137a830, 0x8137a831, 0x8137a832, 0x8137a833,
   /* bc */  0x8137a834, 0x8137a835, 0x8137a836, 0x8137a837,
 
-  /*** Three byte table, leaf: e299xx - offset 0x00cff ***/
+  /*** Three byte table, leaf: e299xx - offset 0x00d80 ***/
 
   /* 80 */  0x0000a1e2, 0x8137a838, 0x0000a1e1, 0x00000000,
   /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -1056,7 +1094,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* bc */  0x00000000, 0x00000000, 0x00000000,
     /* 1 trailing zero values shared with next segment */
 
-  /*** Three byte table, leaf: e2baxx - offset 0x00d3e ***/
+  /*** Three byte table, leaf: e2baxx - offset 0x00dbf ***/
 
   /* 80 */  0x00000000, 0x0000fe50, 0x8138fd39, 0x8138fe30,
   /* 84 */  0x0000fe54, 0x8138fe31, 0x8138fe32, 0x8138fe33,
@@ -1075,7 +1113,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x81398432, 0x81398433, 0x81398434, 0x0000fe79,
   /* bc */  0x81398435, 0x81398436, 0x81398437, 0x81398438,
 
-  /*** Three byte table, leaf: e2bbxx - offset 0x00d7e ***/
+  /*** Three byte table, leaf: e2bbxx - offset 0x00dff ***/
 
   /* 80 */  0x81398439, 0x81398530, 0x81398531, 0x81398532,
   /* 84 */  0x81398533, 0x81398534, 0x81398535, 0x81398536,
@@ -1094,7 +1132,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x81398a34, 0x81398a35, 0x81398a36, 0x81398a37,
   /* bc */  0x81398a38, 0x81398a39, 0x81398b30, 0x81398b31,
 
-  /*** Three byte table, leaf: e2bcxx - offset 0x00dbe ***/
+  /*** Three byte table, leaf: e2bcxx - offset 0x00e3f ***/
 
   /* 80 */  0x81398b32, 0x81398b33, 0x81398b34, 0x81398b35,
   /* 84 */  0x81398b36, 0x81398b37, 0x81398b38, 0x81398b39,
@@ -1113,7 +1151,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x81399038, 0x81399039, 0x81399130, 0x81399131,
   /* bc */  0x81399132, 0x81399133, 0x81399134, 0x81399135,
 
-  /*** Three byte table, leaf: e2bdxx - offset 0x00dfe ***/
+  /*** Three byte table, leaf: e2bdxx - offset 0x00e7f ***/
 
   /* 80 */  0x81399136, 0x81399137, 0x81399138, 0x81399139,
   /* 84 */  0x81399230, 0x81399231, 0x81399232, 0x81399233,
@@ -1132,7 +1170,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x81399732, 0x81399733, 0x81399734, 0x81399735,
   /* bc */  0x81399736, 0x81399737, 0x81399738, 0x81399739,
 
-  /*** Three byte table, leaf: e2bexx - offset 0x00e3e ***/
+  /*** Three byte table, leaf: e2bexx - offset 0x00ebf ***/
 
   /* 80 */  0x81399830, 0x81399831, 0x81399832, 0x81399833,
   /* 84 */  0x81399834, 0x81399835, 0x81399836, 0x81399837,
@@ -1151,7 +1189,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x81399d36, 0x81399d37, 0x81399d38, 0x81399d39,
   /* bc */  0x81399e30, 0x81399e31, 0x81399e32, 0x81399e33,
 
-  /*** Three byte table, leaf: e2bfxx - offset 0x00e7e ***/
+  /*** Three byte table, leaf: e2bfxx - offset 0x00eff ***/
 
   /* 80 */  0x81399e34, 0x81399e35, 0x81399e36, 0x81399e37,
   /* 84 */  0x81399e38, 0x81399e39, 0x81399f30, 0x81399f31,
@@ -1170,7 +1208,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a992, 0x0000a993, 0x0000a994, 0x0000a995,
   /* bc */  0x8139a332, 0x8139a333, 0x8139a334, 0x8139a335,
 
-  /*** Three byte table, leaf: e380xx - offset 0x00ebe ***/
+  /*** Three byte table, leaf: e380xx - offset 0x00f3f ***/
 
   /* 80 */  0x0000a1a1, 0x0000a1a2, 0x0000a1a3, 0x0000a1a8,
   /* 84 */  0x8139a336, 0x0000a1a9, 0x0000a965, 0x0000a996,
@@ -1189,7 +1227,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139a538, 0x8139a539, 0x8139a630, 0x8139a631,
   /* bc */  0x8139a632, 0x8139a633, 0x0000a989, 0x8139a634,
 
-  /*** Three byte table, leaf: e381xx - offset 0x00efe ***/
+  /*** Three byte table, leaf: e381xx - offset 0x00f7f ***/
 
   /* 80 */  0x8139a635, 0x0000a4a1, 0x0000a4a2, 0x0000a4a3,
   /* 84 */  0x0000a4a4, 0x0000a4a5, 0x0000a4a6, 0x0000a4a7,
@@ -1208,7 +1246,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a4d8, 0x0000a4d9, 0x0000a4da, 0x0000a4db,
   /* bc */  0x0000a4dc, 0x0000a4dd, 0x0000a4de, 0x0000a4df,
 
-  /*** Three byte table, leaf: e382xx - offset 0x00f3e ***/
+  /*** Three byte table, leaf: e382xx - offset 0x00fbf ***/
 
   /* 80 */  0x0000a4e0, 0x0000a4e1, 0x0000a4e2, 0x0000a4e3,
   /* 84 */  0x0000a4e4, 0x0000a4e5, 0x0000a4e6, 0x0000a4e7,
@@ -1227,7 +1265,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a5b8, 0x0000a5b9, 0x0000a5ba, 0x0000a5bb,
   /* bc */  0x0000a5bc, 0x0000a5bd, 0x0000a5be, 0x0000a5bf,
 
-  /*** Three byte table, leaf: e383xx - offset 0x00f7e ***/
+  /*** Three byte table, leaf: e383xx - offset 0x00fff ***/
 
   /* 80 */  0x0000a5c0, 0x0000a5c1, 0x0000a5c2, 0x0000a5c3,
   /* 84 */  0x0000a5c4, 0x0000a5c5, 0x0000a5c6, 0x0000a5c7,
@@ -1246,7 +1284,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139a736, 0x8139a737, 0x8139a738, 0x8139a739,
   /* bc */  0x0000a960, 0x0000a963, 0x0000a964, 0x8139a830,
 
-  /*** Three byte table, leaf: e384xx - offset 0x00fbe ***/
+  /*** Three byte table, leaf: e384xx - offset 0x0103f ***/
 
   /* 80 */  0x8139a831, 0x8139a832, 0x8139a833, 0x8139a834,
   /* 84 */  0x8139a835, 0x0000a8c5, 0x0000a8c6, 0x0000a8c7,
@@ -1265,7 +1303,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139aa30, 0x8139aa31, 0x8139aa32, 0x8139aa33,
   /* bc */  0x8139aa34, 0x8139aa35, 0x8139aa36, 0x8139aa37,
 
-  /*** Three byte table, leaf: e385xx - offset 0x00ffe ***/
+  /*** Three byte table, leaf: e385xx - offset 0x0107f ***/
 
   /* 80 */  0x8139aa38, 0x8139aa39, 0x8139ab30, 0x8139ab31,
   /* 84 */  0x8139ab32, 0x8139ab33, 0x8139ab34, 0x8139ab35,
@@ -1284,7 +1322,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139b034, 0x8139b035, 0x8139b036, 0x8139b037,
   /* bc */  0x8139b038, 0x8139b039, 0x8139b130, 0x8139b131,
 
-  /*** Three byte table, leaf: e386xx - offset 0x0103e ***/
+  /*** Three byte table, leaf: e386xx - offset 0x010bf ***/
 
   /* 80 */  0x8139b132, 0x8139b133, 0x8139b134, 0x8139b135,
   /* 84 */  0x8139b136, 0x8139b137, 0x8139b138, 0x8139b139,
@@ -1303,7 +1341,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139b638, 0x8139b639, 0x8139b730, 0x8139b731,
   /* bc */  0x8139b732, 0x8139b733, 0x8139b734, 0x8139b735,
 
-  /*** Three byte table, leaf: e387xx - offset 0x0107e ***/
+  /*** Three byte table, leaf: e387xx - offset 0x010ff ***/
 
   /* 80 */  0x8139b736, 0x8139b737, 0x8139b738, 0x8139b739,
   /* 84 */  0x8139b830, 0x8139b831, 0x8139b832, 0x8139b833,
@@ -1322,7 +1360,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139bd32, 0x8139bd33, 0x8139bd34, 0x8139bd35,
   /* bc */  0x8139bd36, 0x8139bd37, 0x8139bd38, 0x8139bd39,
 
-  /*** Three byte table, leaf: e388xx - offset 0x010be ***/
+  /*** Three byte table, leaf: e388xx - offset 0x0113f ***/
 
   /* 80 */  0x8139be30, 0x8139be31, 0x8139be32, 0x8139be33,
   /* 84 */  0x8139be34, 0x8139be35, 0x8139be36, 0x8139be37,
@@ -1341,7 +1379,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139c235, 0x8139c236, 0x8139c237, 0x8139c238,
   /* bc */  0x8139c239, 0x8139c330, 0x8139c331, 0x8139c332,
 
-  /*** Three byte table, leaf: e389xx - offset 0x010fe ***/
+  /*** Three byte table, leaf: e389xx - offset 0x0117f ***/
 
   /* 80 */  0x8139c333, 0x8139c334, 0x8139c335, 0x8139c336,
   /* 84 */  0x8139c337, 0x8139c338, 0x8139c339, 0x8139c430,
@@ -1360,7 +1398,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139c839, 0x8139c930, 0x8139c931, 0x8139c932,
   /* bc */  0x8139c933, 0x8139c934, 0x8139c935, 0x8139c936,
 
-  /*** Three byte table, leaf: e38axx - offset 0x0113e ***/
+  /*** Three byte table, leaf: e38axx - offset 0x011bf ***/
 
   /* 80 */  0x8139c937, 0x8139c938, 0x8139c939, 0x8139ca30,
   /* 84 */  0x8139ca31, 0x8139ca32, 0x8139ca33, 0x8139ca34,
@@ -1379,7 +1417,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139cf32, 0x8139cf33, 0x8139cf34, 0x8139cf35,
   /* bc */  0x8139cf36, 0x8139cf37, 0x8139cf38, 0x8139cf39,
 
-  /*** Three byte table, leaf: e38bxx - offset 0x0117e ***/
+  /*** Three byte table, leaf: e38bxx - offset 0x011ff ***/
 
   /* 80 */  0x8139d030, 0x8139d031, 0x8139d032, 0x8139d033,
   /* 84 */  0x8139d034, 0x8139d035, 0x8139d036, 0x8139d037,
@@ -1398,7 +1436,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139d536, 0x8139d537, 0x8139d538, 0x8139d539,
   /* bc */  0x8139d630, 0x8139d631, 0x8139d632, 0x8139d633,
 
-  /*** Three byte table, leaf: e38cxx - offset 0x011be ***/
+  /*** Three byte table, leaf: e38cxx - offset 0x0123f ***/
 
   /* 80 */  0x8139d634, 0x8139d635, 0x8139d636, 0x8139d637,
   /* 84 */  0x8139d638, 0x8139d639, 0x8139d730, 0x8139d731,
@@ -1417,7 +1455,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139dc30, 0x8139dc31, 0x8139dc32, 0x8139dc33,
   /* bc */  0x8139dc34, 0x8139dc35, 0x8139dc36, 0x8139dc37,
 
-  /*** Three byte table, leaf: e38dxx - offset 0x011fe ***/
+  /*** Three byte table, leaf: e38dxx - offset 0x0127f ***/
 
   /* 80 */  0x8139dc38, 0x8139dc39, 0x8139dd30, 0x8139dd31,
   /* 84 */  0x8139dd32, 0x8139dd33, 0x8139dd34, 0x8139dd35,
@@ -1436,7 +1474,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139e234, 0x8139e235, 0x8139e236, 0x8139e237,
   /* bc */  0x8139e238, 0x8139e239, 0x8139e330, 0x8139e331,
 
-  /*** Three byte table, leaf: e38exx - offset 0x0123e ***/
+  /*** Three byte table, leaf: e38exx - offset 0x012bf ***/
 
   /* 80 */  0x8139e332, 0x8139e333, 0x8139e334, 0x8139e335,
   /* 84 */  0x8139e336, 0x8139e337, 0x8139e338, 0x8139e339,
@@ -1455,7 +1493,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139e832, 0x8139e833, 0x8139e834, 0x8139e835,
   /* bc */  0x8139e836, 0x8139e837, 0x8139e838, 0x8139e839,
 
-  /*** Three byte table, leaf: e38fxx - offset 0x0127e ***/
+  /*** Three byte table, leaf: e38fxx - offset 0x012ff ***/
 
   /* 80 */  0x8139e930, 0x8139e931, 0x8139e932, 0x8139e933,
   /* 84 */  0x0000a950, 0x8139e934, 0x8139e935, 0x8139e936,
@@ -1474,7 +1512,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139ee31, 0x8139ee32, 0x8139ee33, 0x8139ee34,
   /* bc */  0x8139ee35, 0x8139ee36, 0x8139ee37, 0x8139ee38,
 
-  /*** Three byte table, leaf: e390xx - offset 0x012be ***/
+  /*** Three byte table, leaf: e390xx - offset 0x0133f ***/
 
   /* 80 */  0x8139ee39, 0x8139ef30, 0x8139ef31, 0x8139ef32,
   /* 84 */  0x8139ef33, 0x8139ef34, 0x8139ef35, 0x8139ef36,
@@ -1493,7 +1531,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139f435, 0x8139f436, 0x8139f437, 0x8139f438,
   /* bc */  0x8139f439, 0x8139f530, 0x8139f531, 0x8139f532,
 
-  /*** Three byte table, leaf: e391xx - offset 0x012fe ***/
+  /*** Three byte table, leaf: e391xx - offset 0x0137f ***/
 
   /* 80 */  0x8139f533, 0x8139f534, 0x8139f535, 0x8139f536,
   /* 84 */  0x8139f537, 0x8139f538, 0x8139f539, 0x0000fe56,
@@ -1512,7 +1550,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8139fa37, 0x8139fa38, 0x8139fa39, 0x8139fb30,
   /* bc */  0x8139fb31, 0x8139fb32, 0x8139fb33, 0x8139fb34,
 
-  /*** Three byte table, leaf: e392xx - offset 0x0133e ***/
+  /*** Three byte table, leaf: e392xx - offset 0x013bf ***/
 
   /* 80 */  0x8139fb35, 0x8139fb36, 0x8139fb37, 0x8139fb38,
   /* 84 */  0x8139fb39, 0x8139fc30, 0x8139fc31, 0x8139fc32,
@@ -1531,7 +1569,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82308331, 0x82308332, 0x82308333, 0x82308334,
   /* bc */  0x82308335, 0x82308336, 0x82308337, 0x82308338,
 
-  /*** Three byte table, leaf: e393xx - offset 0x0137e ***/
+  /*** Three byte table, leaf: e393xx - offset 0x013ff ***/
 
   /* 80 */  0x82308339, 0x82308430, 0x82308431, 0x82308432,
   /* 84 */  0x82308433, 0x82308434, 0x82308435, 0x82308436,
@@ -1550,7 +1588,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82308935, 0x82308936, 0x82308937, 0x82308938,
   /* bc */  0x82308939, 0x82308a30, 0x82308a31, 0x82308a32,
 
-  /*** Three byte table, leaf: e394xx - offset 0x013be ***/
+  /*** Three byte table, leaf: e394xx - offset 0x0143f ***/
 
   /* 80 */  0x82308a33, 0x82308a34, 0x82308a35, 0x82308a36,
   /* 84 */  0x82308a37, 0x82308a38, 0x82308a39, 0x82308b30,
@@ -1569,7 +1607,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82308f39, 0x82309030, 0x82309031, 0x82309032,
   /* bc */  0x82309033, 0x82309034, 0x82309035, 0x82309036,
 
-  /*** Three byte table, leaf: e395xx - offset 0x013fe ***/
+  /*** Three byte table, leaf: e395xx - offset 0x0147f ***/
 
   /* 80 */  0x82309037, 0x82309038, 0x82309039, 0x82309130,
   /* 84 */  0x82309131, 0x82309132, 0x82309133, 0x82309134,
@@ -1588,7 +1626,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82309633, 0x82309634, 0x82309635, 0x82309636,
   /* bc */  0x82309637, 0x82309638, 0x82309639, 0x82309730,
 
-  /*** Three byte table, leaf: e396xx - offset 0x0143e ***/
+  /*** Three byte table, leaf: e396xx - offset 0x014bf ***/
 
   /* 80 */  0x82309731, 0x82309732, 0x82309733, 0x82309734,
   /* 84 */  0x82309735, 0x82309736, 0x82309737, 0x82309738,
@@ -1607,7 +1645,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82309c36, 0x82309c37, 0x82309c38, 0x82309c39,
   /* bc */  0x82309d30, 0x82309d31, 0x82309d32, 0x82309d33,
 
-  /*** Three byte table, leaf: e397xx - offset 0x0147e ***/
+  /*** Three byte table, leaf: e397xx - offset 0x014ff ***/
 
   /* 80 */  0x82309d34, 0x82309d35, 0x82309d36, 0x82309d37,
   /* 84 */  0x82309d38, 0x82309d39, 0x82309e30, 0x82309e31,
@@ -1626,7 +1664,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8230a330, 0x8230a331, 0x8230a332, 0x8230a333,
   /* bc */  0x8230a334, 0x8230a335, 0x8230a336, 0x8230a337,
 
-  /*** Three byte table, leaf: e398xx - offset 0x014be ***/
+  /*** Three byte table, leaf: e398xx - offset 0x0153f ***/
 
   /* 80 */  0x8230a338, 0x8230a339, 0x8230a430, 0x8230a431,
   /* 84 */  0x8230a432, 0x8230a433, 0x8230a434, 0x8230a435,
@@ -1640,7 +1678,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* a4 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
     /* 24 trailing zero values shared with next segment */
 
-  /*** Three byte table, leaf: e3a4xx - offset 0x014e6 ***/
+  /*** Three byte table, leaf: e3a4xx - offset 0x01567 ***/
 
   /* 80 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -1659,7 +1697,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8230f539, 0x8230f630, 0x8230f631, 0x8230f632,
   /* bc */  0x8230f633, 0x8230f634, 0x8230f635, 0x8230f636,
 
-  /*** Three byte table, leaf: e3a5xx - offset 0x01526 ***/
+  /*** Three byte table, leaf: e3a5xx - offset 0x015a7 ***/
 
   /* 80 */  0x8230f637, 0x8230f638, 0x8230f639, 0x8230f730,
   /* 84 */  0x8230f731, 0x8230f732, 0x8230f733, 0x8230f734,
@@ -1678,7 +1716,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8230fc32, 0x8230fc33, 0x8230fc34, 0x8230fc35,
   /* bc */  0x8230fc36, 0x8230fc37, 0x8230fc38, 0x8230fc39,
 
-  /*** Three byte table, leaf: e3a6xx - offset 0x01566 ***/
+  /*** Three byte table, leaf: e3a6xx - offset 0x015e7 ***/
 
   /* 80 */  0x8230fd30, 0x8230fd31, 0x8230fd32, 0x8230fd33,
   /* 84 */  0x8230fd34, 0x8230fd35, 0x8230fd36, 0x8230fd37,
@@ -1697,7 +1735,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82318436, 0x82318437, 0x82318438, 0x82318439,
   /* bc */  0x82318530, 0x82318531, 0x82318532, 0x82318533,
 
-  /*** Three byte table, leaf: e3a7xx - offset 0x015a6 ***/
+  /*** Three byte table, leaf: e3a7xx - offset 0x01627 ***/
 
   /* 80 */  0x82318534, 0x82318535, 0x82318536, 0x82318537,
   /* 84 */  0x82318538, 0x82318539, 0x82318630, 0x82318631,
@@ -1716,7 +1754,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82318a37, 0x82318a38, 0x82318a39, 0x82318b30,
   /* bc */  0x82318b31, 0x82318b32, 0x82318b33, 0x82318b34,
 
-  /*** Three byte table, leaf: e3a8xx - offset 0x015e6 ***/
+  /*** Three byte table, leaf: e3a8xx - offset 0x01667 ***/
 
   /* 80 */  0x82318b35, 0x82318b36, 0x82318b37, 0x82318b38,
   /* 84 */  0x82318b39, 0x82318c30, 0x82318c31, 0x82318c32,
@@ -1735,7 +1773,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82319131, 0x82319132, 0x82319133, 0x82319134,
   /* bc */  0x82319135, 0x82319136, 0x82319137, 0x82319138,
 
-  /*** Three byte table, leaf: e3a9xx - offset 0x01626 ***/
+  /*** Three byte table, leaf: e3a9xx - offset 0x016a7 ***/
 
   /* 80 */  0x82319139, 0x82319230, 0x82319231, 0x82319232,
   /* 84 */  0x82319233, 0x82319234, 0x82319235, 0x82319236,
@@ -1754,7 +1792,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82319734, 0x82319735, 0x82319736, 0x82319737,
   /* bc */  0x82319738, 0x82319739, 0x82319830, 0x82319831,
 
-  /*** Three byte table, leaf: e3aaxx - offset 0x01666 ***/
+  /*** Three byte table, leaf: e3aaxx - offset 0x016e7 ***/
 
   /* 80 */  0x82319832, 0x82319833, 0x82319834, 0x82319835,
   /* 84 */  0x82319836, 0x82319837, 0x82319838, 0x82319839,
@@ -1773,7 +1811,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82319d38, 0x82319d39, 0x82319e30, 0x82319e31,
   /* bc */  0x82319e32, 0x82319e33, 0x82319e34, 0x82319e35,
 
-  /*** Three byte table, leaf: e3abxx - offset 0x016a6 ***/
+  /*** Three byte table, leaf: e3abxx - offset 0x01727 ***/
 
   /* 80 */  0x82319e36, 0x82319e37, 0x82319e38, 0x82319e39,
   /* 84 */  0x82319f30, 0x82319f31, 0x82319f32, 0x82319f33,
@@ -1792,7 +1830,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8231a432, 0x8231a433, 0x8231a434, 0x8231a435,
   /* bc */  0x8231a436, 0x8231a437, 0x8231a438, 0x8231a439,
 
-  /*** Three byte table, leaf: e3acxx - offset 0x016e6 ***/
+  /*** Three byte table, leaf: e3acxx - offset 0x01767 ***/
 
   /* 80 */  0x8231a530, 0x8231a531, 0x8231a532, 0x8231a533,
   /* 84 */  0x8231a534, 0x8231a535, 0x8231a536, 0x8231a537,
@@ -1811,7 +1849,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8231aa36, 0x8231aa37, 0x8231aa38, 0x8231aa39,
   /* bc */  0x8231ab30, 0x8231ab31, 0x8231ab32, 0x8231ab33,
 
-  /*** Three byte table, leaf: e3adxx - offset 0x01726 ***/
+  /*** Three byte table, leaf: e3adxx - offset 0x017a7 ***/
 
   /* 80 */  0x8231ab34, 0x8231ab35, 0x8231ab36, 0x8231ab37,
   /* 84 */  0x8231ab38, 0x8231ab39, 0x8231ac30, 0x8231ac31,
@@ -1830,7 +1868,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8231b039, 0x8231b130, 0x8231b131, 0x8231b132,
   /* bc */  0x8231b133, 0x8231b134, 0x8231b135, 0x8231b136,
 
-  /*** Three byte table, leaf: e3aexx - offset 0x01766 ***/
+  /*** Three byte table, leaf: e3aexx - offset 0x017e7 ***/
 
   /* 80 */  0x8231b137, 0x8231b138, 0x8231b139, 0x8231b230,
   /* 84 */  0x8231b231, 0x8231b232, 0x8231b233, 0x8231b234,
@@ -1849,7 +1887,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8231b733, 0x8231b734, 0x8231b735, 0x8231b736,
   /* bc */  0x8231b737, 0x8231b738, 0x8231b739, 0x8231b830,
 
-  /*** Three byte table, leaf: e3afxx - offset 0x017a6 ***/
+  /*** Three byte table, leaf: e3afxx - offset 0x01827 ***/
 
   /* 80 */  0x8231b831, 0x8231b832, 0x8231b833, 0x8231b834,
   /* 84 */  0x8231b835, 0x8231b836, 0x8231b837, 0x8231b838,
@@ -1868,7 +1906,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8231bd37, 0x8231bd38, 0x8231bd39, 0x8231be30,
   /* bc */  0x8231be31, 0x8231be32, 0x8231be33, 0x8231be34,
 
-  /*** Three byte table, leaf: e3b0xx - offset 0x017e6 ***/
+  /*** Three byte table, leaf: e3b0xx - offset 0x01867 ***/
 
   /* 80 */  0x8231be35, 0x8231be36, 0x8231be37, 0x8231be38,
   /* 84 */  0x8231be39, 0x8231bf30, 0x8231bf31, 0x8231bf32,
@@ -1887,7 +1925,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8231c431, 0x8231c432, 0x8231c433, 0x8231c434,
   /* bc */  0x8231c435, 0x8231c436, 0x8231c437, 0x8231c438,
 
-  /*** Three byte table, leaf: e3b1xx - offset 0x01826 ***/
+  /*** Three byte table, leaf: e3b1xx - offset 0x018a7 ***/
 
   /* 80 */  0x8231c439, 0x8231c530, 0x8231c531, 0x8231c532,
   /* 84 */  0x8231c533, 0x8231c534, 0x8231c535, 0x8231c536,
@@ -1906,7 +1944,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8231ca34, 0x8231ca35, 0x8231ca36, 0x8231ca37,
   /* bc */  0x8231ca38, 0x8231ca39, 0x8231cb30, 0x8231cb31,
 
-  /*** Three byte table, leaf: e3b2xx - offset 0x01866 ***/
+  /*** Three byte table, leaf: e3b2xx - offset 0x018e7 ***/
 
   /* 80 */  0x8231cb32, 0x8231cb33, 0x8231cb34, 0x8231cb35,
   /* 84 */  0x8231cb36, 0x8231cb37, 0x8231cb38, 0x8231cb39,
@@ -1925,7 +1963,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8231d038, 0x8231d039, 0x8231d130, 0x8231d131,
   /* bc */  0x8231d132, 0x8231d133, 0x8231d134, 0x8231d135,
 
-  /*** Three byte table, leaf: e3b3xx - offset 0x018a6 ***/
+  /*** Three byte table, leaf: e3b3xx - offset 0x01927 ***/
 
   /* 80 */  0x8231d136, 0x8231d137, 0x8231d138, 0x8231d139,
   /* 84 */  0x8231d230, 0x8231d231, 0x8231d232, 0x8231d233,
@@ -1940,7 +1978,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* a8 */  0x00000000, 0x00000000,
     /* 22 trailing zero values shared with next segment */
 
-  /*** Three byte table, leaf: e481xx - offset 0x018d0 ***/
+  /*** Three byte table, leaf: e481xx - offset 0x01951 ***/
 
   /* 80 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -1959,7 +1997,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8232b236, 0x8232b237, 0x8232b238, 0x8232b239,
   /* bc */  0x8232b330, 0x8232b331, 0x8232b332, 0x8232b333,
 
-  /*** Three byte table, leaf: e482xx - offset 0x01910 ***/
+  /*** Three byte table, leaf: e482xx - offset 0x01991 ***/
 
   /* 80 */  0x8232b334, 0x8232b335, 0x8232b336, 0x8232b337,
   /* 84 */  0x8232b338, 0x8232b339, 0x8232b430, 0x8232b431,
@@ -1978,7 +2016,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8232b930, 0x8232b931, 0x8232b932, 0x8232b933,
   /* bc */  0x8232b934, 0x8232b935, 0x8232b936, 0x8232b937,
 
-  /*** Three byte table, leaf: e483xx - offset 0x01950 ***/
+  /*** Three byte table, leaf: e483xx - offset 0x019d1 ***/
 
   /* 80 */  0x8232b938, 0x8232b939, 0x8232ba30, 0x8232ba31,
   /* 84 */  0x8232ba32, 0x8232ba33, 0x8232ba34, 0x8232ba35,
@@ -1997,7 +2035,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8232bf34, 0x8232bf35, 0x8232bf36, 0x8232bf37,
   /* bc */  0x8232bf38, 0x8232bf39, 0x8232c030, 0x8232c031,
 
-  /*** Three byte table, leaf: e484xx - offset 0x01990 ***/
+  /*** Three byte table, leaf: e484xx - offset 0x01a11 ***/
 
   /* 80 */  0x8232c032, 0x8232c033, 0x8232c034, 0x8232c035,
   /* 84 */  0x8232c036, 0x8232c037, 0x8232c038, 0x8232c039,
@@ -2016,7 +2054,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8232c538, 0x8232c539, 0x8232c630, 0x8232c631,
   /* bc */  0x8232c632, 0x8232c633, 0x8232c634, 0x8232c635,
 
-  /*** Three byte table, leaf: e485xx - offset 0x019d0 ***/
+  /*** Three byte table, leaf: e485xx - offset 0x01a51 ***/
 
   /* 80 */  0x8232c636, 0x8232c637, 0x8232c638, 0x8232c639,
   /* 84 */  0x8232c730, 0x8232c731, 0x8232c732, 0x8232c733,
@@ -2028,7 +2066,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* 9c */  0x8232c934, 0x8232c935, 0x8232c936, 0x0000fe70,
     /* 32 trailing zero values shared with next segment */
 
-  /*** Three byte table, leaf: e48cxx - offset 0x019f0 ***/
+  /*** Three byte table, leaf: e48cxx - offset 0x01a71 ***/
 
   /* 80 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -2047,7 +2085,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8232f838, 0x8232f839, 0x8232f930, 0x8232f931,
   /* bc */  0x8232f932, 0x8232f933, 0x8232f934, 0x8232f935,
 
-  /*** Three byte table, leaf: e48dxx - offset 0x01a30 ***/
+  /*** Three byte table, leaf: e48dxx - offset 0x01ab1 ***/
 
   /* 80 */  0x8232f936, 0x8232f937, 0x8232f938, 0x8232f939,
   /* 84 */  0x8232fa30, 0x8232fa31, 0x8232fa32, 0x8232fa33,
@@ -2066,7 +2104,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82338132, 0x82338133, 0x82338134, 0x82338135,
   /* bc */  0x82338136, 0x82338137, 0x82338138, 0x82338139,
 
-  /*** Three byte table, leaf: e48exx - offset 0x01a70 ***/
+  /*** Three byte table, leaf: e48exx - offset 0x01af1 ***/
 
   /* 80 */  0x82338230, 0x82338231, 0x82338232, 0x82338233,
   /* 84 */  0x82338234, 0x82338235, 0x82338236, 0x82338237,
@@ -2085,7 +2123,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82338734, 0x82338735, 0x82338736, 0x82338737,
   /* bc */  0x82338738, 0x82338739, 0x82338830, 0x82338831,
 
-  /*** Three byte table, leaf: e48fxx - offset 0x01ab0 ***/
+  /*** Three byte table, leaf: e48fxx - offset 0x01b31 ***/
 
   /* 80 */  0x82338832, 0x82338833, 0x82338834, 0x82338835,
   /* 84 */  0x82338836, 0x82338837, 0x82338838, 0x82338839,
@@ -2104,7 +2142,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82338d37, 0x82338d38, 0x82338d39, 0x82338e30,
   /* bc */  0x82338e31, 0x82338e32, 0x82338e33, 0x82338e34,
 
-  /*** Three byte table, leaf: e490xx - offset 0x01af0 ***/
+  /*** Three byte table, leaf: e490xx - offset 0x01b71 ***/
 
   /* 80 */  0x82338e35, 0x82338e36, 0x82338e37, 0x82338e38,
   /* 84 */  0x82338e39, 0x82338f30, 0x82338f31, 0x82338f32,
@@ -2123,7 +2161,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82339431, 0x82339432, 0x82339433, 0x82339434,
   /* bc */  0x82339435, 0x82339436, 0x82339437, 0x82339438,
 
-  /*** Three byte table, leaf: e491xx - offset 0x01b30 ***/
+  /*** Three byte table, leaf: e491xx - offset 0x01bb1 ***/
 
   /* 80 */  0x82339439, 0x82339530, 0x82339531, 0x82339532,
   /* 84 */  0x82339533, 0x82339534, 0x82339535, 0x82339536,
@@ -2142,7 +2180,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82339a35, 0x82339a36, 0x82339a37, 0x82339a38,
   /* bc */  0x82339a39, 0x82339b30, 0x82339b31, 0x82339b32,
 
-  /*** Three byte table, leaf: e492xx - offset 0x01b70 ***/
+  /*** Three byte table, leaf: e492xx - offset 0x01bf1 ***/
 
   /* 80 */  0x82339b33, 0x82339b34, 0x82339b35, 0x82339b36,
   /* 84 */  0x82339b37, 0x82339b38, 0x82339b39, 0x82339c30,
@@ -2161,7 +2199,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8233a039, 0x8233a130, 0x8233a131, 0x8233a132,
   /* bc */  0x8233a133, 0x8233a134, 0x8233a135, 0x8233a136,
 
-  /*** Three byte table, leaf: e493xx - offset 0x01bb0 ***/
+  /*** Three byte table, leaf: e493xx - offset 0x01c31 ***/
 
   /* 80 */  0x8233a137, 0x8233a138, 0x8233a139, 0x8233a230,
   /* 84 */  0x8233a231, 0x8233a232, 0x8233a233, 0x8233a234,
@@ -2178,7 +2216,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
     /* 12 trailing zero values shared with next segment */
 
-  /*** Three byte table, leaf: e499xx - offset 0x01be4 ***/
+  /*** Three byte table, leaf: e499xx - offset 0x01c65 ***/
 
   /* 80 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -2197,7 +2235,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8233cd34, 0x8233cd35, 0x8233cd36, 0x8233cd37,
   /* bc */  0x8233cd38, 0x8233cd39, 0x8233ce30, 0x8233ce31,
 
-  /*** Three byte table, leaf: e49axx - offset 0x01c24 ***/
+  /*** Three byte table, leaf: e49axx - offset 0x01ca5 ***/
 
   /* 80 */  0x8233ce32, 0x8233ce33, 0x8233ce34, 0x8233ce35,
   /* 84 */  0x8233ce36, 0x8233ce37, 0x8233ce38, 0x8233ce39,
@@ -2216,7 +2254,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8233d338, 0x8233d339, 0x8233d430, 0x8233d431,
   /* bc */  0x8233d432, 0x8233d433, 0x8233d434, 0x8233d435,
 
-  /*** Three byte table, leaf: e49bxx - offset 0x01c64 ***/
+  /*** Three byte table, leaf: e49bxx - offset 0x01ce5 ***/
 
   /* 80 */  0x8233d436, 0x8233d437, 0x8233d438, 0x8233d439,
   /* 84 */  0x8233d530, 0x8233d531, 0x8233d532, 0x8233d533,
@@ -2235,7 +2273,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8233da32, 0x8233da33, 0x8233da34, 0x8233da35,
   /* bc */  0x8233da36, 0x8233da37, 0x8233da38, 0x8233da39,
 
-  /*** Three byte table, leaf: e49cxx - offset 0x01ca4 ***/
+  /*** Three byte table, leaf: e49cxx - offset 0x01d25 ***/
 
   /* 80 */  0x8233db30, 0x8233db31, 0x8233db32, 0x8233db33,
   /* 84 */  0x8233db34, 0x8233db35, 0x8233db36, 0x8233db37,
@@ -2254,7 +2292,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8233e034, 0x8233e035, 0x8233e036, 0x8233e037,
   /* bc */  0x8233e038, 0x8233e039, 0x8233e130, 0x8233e131,
 
-  /*** Three byte table, leaf: e49dxx - offset 0x01ce4 ***/
+  /*** Three byte table, leaf: e49dxx - offset 0x01d65 ***/
 
   /* 80 */  0x8233e132, 0x8233e133, 0x8233e134, 0x8233e135,
   /* 84 */  0x8233e136, 0x8233e137, 0x8233e138, 0x8233e139,
@@ -2273,7 +2311,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8233e638, 0x8233e639, 0x8233e730, 0x8233e731,
   /* bc */  0x0000fe82, 0x8233e732, 0x8233e733, 0x8233e734,
 
-  /*** Three byte table, leaf: e49exx - offset 0x01d24 ***/
+  /*** Three byte table, leaf: e49exx - offset 0x01da5 ***/
 
   /* 80 */  0x8233e735, 0x8233e736, 0x8233e737, 0x8233e738,
   /* 84 */  0x8233e739, 0x8233e830, 0x8233e831, 0x8233e832,
@@ -2292,7 +2330,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00000000,
     /* 7 trailing zero values shared with next segment */
 
-  /*** Three byte table, leaf: e4a5xx - offset 0x01d5d ***/
+  /*** Three byte table, leaf: e4a5xx - offset 0x01dde ***/
 
   /* 80 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x0000fe85,
@@ -2311,7 +2349,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82349b37, 0x82349b38, 0x0000fe86, 0x82349b39,
   /* bc */  0x82349c30, 0x0000fe87, 0x82349c31, 0x82349c32,
 
-  /*** Three byte table, leaf: e4a6xx - offset 0x01d9d ***/
+  /*** Three byte table, leaf: e4a6xx - offset 0x01e1e ***/
 
   /* 80 */  0x82349c33, 0x82349c34, 0x0000fe88, 0x0000fe89,
   /* 84 */  0x82349c35, 0x0000fe8a, 0x0000fe8b, 0x82349c36,
@@ -2329,7 +2367,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b4 */  0x8234a039, 0x8234a130, 0x0000fe8f, 0x0000fe8e,
     /* 8 trailing zero values shared with next segment */
 
-  /*** Three byte table, leaf: e4b1xx - offset 0x01dd5 ***/
+  /*** Three byte table, leaf: e4b1xx - offset 0x01e56 ***/
 
   /* 80 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -2348,7 +2386,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8234e734, 0x8234e735, 0x8234e736, 0x8234e737,
   /* bc */  0x8234e738, 0x8234e739, 0x8234e830, 0x8234e831,
 
-  /*** Three byte table, leaf: e4b2xx - offset 0x01e15 ***/
+  /*** Three byte table, leaf: e4b2xx - offset 0x01e96 ***/
 
   /* 80 */  0x8234e832, 0x8234e833, 0x8234e834, 0x8234e835,
   /* 84 */  0x8234e836, 0x8234e837, 0x8234e838, 0x8234e839,
@@ -2367,7 +2405,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8234ed33, 0x8234ed34, 0x8234ed35, 0x8234ed36,
   /* bc */  0x8234ed37, 0x8234ed38, 0x8234ed39, 0x8234ee30,
 
-  /*** Three byte table, leaf: e4b3xx - offset 0x01e55 ***/
+  /*** Three byte table, leaf: e4b3xx - offset 0x01ed6 ***/
 
   /* 80 */  0x8234ee31, 0x8234ee32, 0x8234ee33, 0x8234ee34,
   /* 84 */  0x8234ee35, 0x8234ee36, 0x8234ee37, 0x8234ee38,
@@ -2386,7 +2424,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8234f337, 0x8234f338, 0x8234f339, 0x8234f430,
   /* bc */  0x8234f431, 0x8234f432, 0x8234f433, 0x8234f434,
 
-  /*** Three byte table, leaf: e4b4xx - offset 0x01e95 ***/
+  /*** Three byte table, leaf: e4b4xx - offset 0x01f16 ***/
 
   /* 80 */  0x8234f435, 0x8234f436, 0x8234f437, 0x8234f438,
   /* 84 */  0x8234f439, 0x8234f530, 0x8234f531, 0x8234f532,
@@ -2405,7 +2443,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x8234f934, 0x8234f935, 0x8234f936, 0x8234f937,
   /* bc */  0x8234f938, 0x8234f939, 0x8234fa30, 0x8234fa31,
 
-  /*** Three byte table, leaf: e4b5xx - offset 0x01ed5 ***/
+  /*** Three byte table, leaf: e4b5xx - offset 0x01f56 ***/
 
   /* 80 */  0x8234fa32, 0x8234fa33, 0x8234fa34, 0x8234fa35,
   /* 84 */  0x8234fa36, 0x8234fa37, 0x8234fa38, 0x8234fa39,
@@ -2424,7 +2462,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82358138, 0x82358139, 0x82358230, 0x82358231,
   /* bc */  0x82358232, 0x82358233, 0x82358234, 0x82358235,
 
-  /*** Three byte table, leaf: e4b6xx - offset 0x01f15 ***/
+  /*** Three byte table, leaf: e4b6xx - offset 0x01f96 ***/
 
   /* 80 */  0x82358236, 0x82358237, 0x82358238, 0x82358239,
   /* 84 */  0x82358330, 0x82358331, 0x82358332, 0x82358333,
@@ -2443,7 +2481,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82358831, 0x82358832, 0x82358833, 0x82358834,
   /* bc */  0x82358835, 0x82358836, 0x82358837, 0x82358838,
 
-  /*** Three byte table, leaf: e4b7xx - offset 0x01f55 ***/
+  /*** Three byte table, leaf: e4b7xx - offset 0x01fd6 ***/
 
   /* 80 */  0x82358839, 0x82358930, 0x82358931, 0x82358932,
   /* 84 */  0x82358933, 0x82358934, 0x82358935, 0x82358936,
@@ -2462,7 +2500,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x82358e35, 0x82358e36, 0x82358e37, 0x82358e38,
   /* bc */  0x82358e39, 0x82358f30, 0x82358f31, 0x82358f32,
 
-  /*** Three byte table, leaf: e4b8xx - offset 0x01f95 ***/
+  /*** Three byte table, leaf: e4b8xx - offset 0x02016 ***/
 
   /* 80 */  0x0000d2bb, 0x0000b6a1, 0x00008140, 0x0000c6df,
   /* 84 */  0x00008141, 0x00008142, 0x00008143, 0x0000cdf2,
@@ -2481,7 +2519,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cde8, 0x0000b5a4, 0x0000ceaa, 0x0000d6f7,
   /* bc */  0x00008153, 0x0000c0f6, 0x0000bed9, 0x0000d8af,
 
-  /*** Three byte table, leaf: e4b9xx - offset 0x01fd5 ***/
+  /*** Three byte table, leaf: e4b9xx - offset 0x02056 ***/
 
   /* 80 */  0x00008154, 0x00008155, 0x00008156, 0x0000c4cb,
   /* 84 */  0x00008157, 0x0000bec3, 0x00008158, 0x0000d8b1,
@@ -2500,7 +2538,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008170, 0x00008171, 0x00008172, 0x00008173,
   /* bc */  0x00008174, 0x00008175, 0x0000c7ac, 0x00008176,
 
-  /*** Three byte table, leaf: e4baxx - offset 0x02015 ***/
+  /*** Three byte table, leaf: e4baxx - offset 0x02096 ***/
 
   /* 80 */  0x00008177, 0x00008178, 0x00008179, 0x0000817a,
   /* 84 */  0x0000817b, 0x0000817c, 0x0000c1cb, 0x0000817d,
@@ -2519,7 +2557,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000818f, 0x00008190, 0x0000c8cb, 0x0000d8e9,
   /* bc */  0x00008191, 0x00008192, 0x00008193, 0x0000d2da,
 
-  /*** Three byte table, leaf: e4bbxx - offset 0x02055 ***/
+  /*** Three byte table, leaf: e4bbxx - offset 0x020d6 ***/
 
   /* 80 */  0x0000cab2, 0x0000c8ca, 0x0000d8ec, 0x0000d8ea,
   /* 84 */  0x0000d8c6, 0x0000bdf6, 0x0000c6cd, 0x0000b3f0,
@@ -2538,7 +2576,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000081a6, 0x000081a7, 0x000081a8, 0x0000c8ce,
   /* bc */  0x000081a9, 0x0000b7dd, 0x000081aa, 0x0000b7c2,
 
-  /*** Three byte table, leaf: e4bcxx - offset 0x02095 ***/
+  /*** Three byte table, leaf: e4bcxx - offset 0x02116 ***/
 
   /* 80 */  0x000081ab, 0x0000c6f3, 0x000081ac, 0x000081ad,
   /* 84 */  0x000081ae, 0x000081af, 0x000081b0, 0x000081b1,
@@ -2557,7 +2595,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c9ec, 0x000081c7, 0x0000cbc5, 0x000081c8,
   /* bc */  0x0000cbc6, 0x0000d9a4, 0x000081c9, 0x000081ca,
 
-  /*** Three byte table, leaf: e4bdxx - offset 0x020d5 ***/
+  /*** Three byte table, leaf: e4bdxx - offset 0x02156 ***/
 
   /* 80 */  0x000081cb, 0x000081cc, 0x000081cd, 0x0000b5e8,
   /* 84 */  0x000081ce, 0x000081cf, 0x0000b5ab, 0x000081d0,
@@ -2576,7 +2614,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000081e5, 0x000081e6, 0x000081e7, 0x0000d9ac,
   /* bc */  0x0000d9ae, 0x000081e8, 0x0000d9ab, 0x0000cab9,
 
-  /*** Three byte table, leaf: e4bexx - offset 0x02115 ***/
+  /*** Three byte table, leaf: e4bexx - offset 0x02196 ***/
 
   /* 80 */  0x000081e9, 0x000081ea, 0x000081eb, 0x0000d9a9,
   /* 84 */  0x0000d6b6, 0x000081ec, 0x000081ed, 0x000081ee,
@@ -2595,7 +2633,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000824a, 0x0000824b, 0x0000824c, 0x0000824d,
   /* bc */  0x0000824e, 0x0000824f, 0x00008250, 0x0000b1e3,
 
-  /*** Three byte table, leaf: e4bfxx - offset 0x02155 ***/
+  /*** Three byte table, leaf: e4bfxx - offset 0x021d6 ***/
 
   /* 80 */  0x00008251, 0x00008252, 0x00008253, 0x0000b4d9,
   /* 84 */  0x0000b6ed, 0x0000d9b4, 0x00008254, 0x00008255,
@@ -2614,7 +2652,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d9ba, 0x0000826f, 0x0000b0b3, 0x00008270,
   /* bc */  0x00008271, 0x00008272, 0x0000d9c2, 0x00008273,
 
-  /*** Three byte table, leaf: e580xx - offset 0x02195 ***/
+  /*** Three byte table, leaf: e580xx - offset 0x02216 ***/
 
   /* 80 */  0x00008274, 0x00008275, 0x00008276, 0x00008277,
   /* 84 */  0x00008278, 0x00008279, 0x0000827a, 0x0000827b,
@@ -2633,7 +2671,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000829a, 0x0000829b, 0x0000d5ae, 0x0000829c,
   /* bc */  0x0000d6b5, 0x0000829d, 0x0000c7e3, 0x0000829e,
 
-  /*** Three byte table, leaf: e581xx - offset 0x021d5 ***/
+  /*** Three byte table, leaf: e581xx - offset 0x02256 ***/
 
   /* 80 */  0x0000829f, 0x000082a0, 0x000082a1, 0x0000d9c8,
   /* 84 */  0x000082a2, 0x000082a3, 0x000082a4, 0x0000bcd9,
@@ -2652,7 +2690,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000082ca, 0x000082cb, 0x000082cc, 0x0000d9cd,
   /* bc */  0x000082cd, 0x000082ce, 0x0000d9c7, 0x0000b3a5,
 
-  /*** Three byte table, leaf: e582xx - offset 0x02215 ***/
+  /*** Three byte table, leaf: e582xx - offset 0x02296 ***/
 
   /* 80 */  0x0000bffe, 0x000082cf, 0x000082d0, 0x000082d1,
   /* 84 */  0x000082d2, 0x0000b8b5, 0x000082d3, 0x000082d4,
@@ -2671,7 +2709,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000082fc, 0x000082fd, 0x0000d9d1, 0x0000c9b5,
   /* bc */  0x000082fe, 0x00008340, 0x00008341, 0x00008342,
 
-  /*** Three byte table, leaf: e583xx - offset 0x02255 ***/
+  /*** Three byte table, leaf: e583xx - offset 0x022d6 ***/
 
   /* 80 */  0x00008343, 0x00008344, 0x00008345, 0x00008346,
   /* 84 */  0x00008347, 0x00008348, 0x00008349, 0x0000834a,
@@ -2690,7 +2728,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008371, 0x00008372, 0x00008373, 0x0000c6a7,
   /* bc */  0x00008374, 0x00008375, 0x00008376, 0x00008377,
 
-  /*** Three byte table, leaf: e584xx - offset 0x02295 ***/
+  /*** Three byte table, leaf: e584xx - offset 0x02316 ***/
 
   /* 80 */  0x00008378, 0x00008379, 0x0000837a, 0x0000837b,
   /* 84 */  0x0000837c, 0x0000837d, 0x0000d9d3, 0x0000d9d8,
@@ -2709,7 +2747,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000083ac, 0x000083ad, 0x000083ae, 0x000083af,
   /* bc */  0x000083b0, 0x000083b1, 0x000083b2, 0x0000b6f9,
 
-  /*** Three byte table, leaf: e585xx - offset 0x022d5 ***/
+  /*** Three byte table, leaf: e585xx - offset 0x02356 ***/
 
   /* 80 */  0x0000d8a3, 0x0000d4ca, 0x000083b3, 0x0000d4aa,
   /* 84 */  0x0000d0d6, 0x0000b3e4, 0x0000d5d7, 0x000083b4,
@@ -2728,7 +2766,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b5e4, 0x0000d7c8, 0x000083cd, 0x0000d1f8,
   /* bc */  0x0000bce6, 0x0000cade, 0x000083ce, 0x000083cf,
 
-  /*** Three byte table, leaf: e586xx - offset 0x02315 ***/
+  /*** Three byte table, leaf: e586xx - offset 0x02396 ***/
 
   /* 80 */  0x0000bcbd, 0x0000d9e6, 0x0000d8e7, 0x000083d0,
   /* 84 */  0x000083d1, 0x0000c4da, 0x000083d2, 0x000083d3,
@@ -2747,7 +2785,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000083eb, 0x000083ec, 0x000083ed, 0x0000b6b3,
   /* bc */  0x0000d9fe, 0x0000d9fd, 0x000083ee, 0x000083ef,
 
-  /*** Three byte table, leaf: e587xx - offset 0x02355 ***/
+  /*** Three byte table, leaf: e587xx - offset 0x023d6 ***/
 
   /* 80 */  0x0000bebb, 0x000083f0, 0x000083f1, 0x000083f2,
   /* 84 */  0x0000c6e0, 0x000083f3, 0x0000d7bc, 0x0000daa1,
@@ -2766,7 +2804,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cdb9, 0x0000b0bc, 0x0000b3f6, 0x0000bbf7,
   /* bc */  0x0000dbca, 0x0000baaf, 0x00008454, 0x0000d4e4,
 
-  /*** Three byte table, leaf: e588xx - offset 0x02395 ***/
+  /*** Three byte table, leaf: e588xx - offset 0x02416 ***/
 
   /* 80 */  0x0000b5b6, 0x0000b5f3, 0x0000d8d6, 0x0000c8d0,
   /* 84 */  0x00008455, 0x00008456, 0x0000b7d6, 0x0000c7d0,
@@ -2785,7 +2823,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c8af, 0x0000c9b2, 0x0000b4cc, 0x0000bfcc,
   /* bc */  0x0000846f, 0x0000b9f4, 0x00008470, 0x0000d8db,
 
-  /*** Three byte table, leaf: e589xx - offset 0x023d5 ***/
+  /*** Three byte table, leaf: e589xx - offset 0x02456 ***/
 
   /* 80 */  0x0000d8dc, 0x0000b6e7, 0x0000bcc1, 0x0000ccea,
   /* 84 */  0x00008471, 0x00008472, 0x00008473, 0x00008474,
@@ -2804,7 +2842,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008496, 0x00008497, 0x00008498, 0x00008499,
   /* bc */  0x0000849a, 0x0000d8e2, 0x0000849b, 0x0000bdcb,
 
-  /*** Three byte table, leaf: e58axx - offset 0x02415 ***/
+  /*** Three byte table, leaf: e58axx - offset 0x02496 ***/
 
   /* 80 */  0x0000849c, 0x0000d8e4, 0x0000d8e3, 0x0000849d,
   /* 84 */  0x0000849e, 0x0000849f, 0x000084a0, 0x000084a1,
@@ -2823,7 +2861,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000084be, 0x000084bf, 0x000084c0, 0x000084c1,
   /* bc */  0x000084c2, 0x000084c3, 0x0000dbc0, 0x0000cac6,
 
-  /*** Three byte table, leaf: e58bxx - offset 0x02455 ***/
+  /*** Three byte table, leaf: e58bxx - offset 0x024d6 ***/
 
   /* 80 */  0x000084c4, 0x000084c5, 0x000084c6, 0x0000b2aa,
   /* 84 */  0x000084c7, 0x000084c8, 0x000084c9, 0x0000d3c2,
@@ -2842,7 +2880,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000084f1, 0x0000d9e8, 0x0000c9d7, 0x000084f2,
   /* bc */  0x000084f3, 0x000084f4, 0x0000b9b4, 0x0000cef0,
 
-  /*** Three byte table, leaf: e58cxx - offset 0x02495 ***/
+  /*** Three byte table, leaf: e58cxx - offset 0x02516 ***/
 
   /* 80 */  0x0000d4c8, 0x000084f5, 0x000084f6, 0x000084f7,
   /* 84 */  0x000084f8, 0x0000b0fc, 0x0000b4d2, 0x000084f9,
@@ -2861,7 +2899,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000855b, 0x0000c6a5, 0x0000c7f8, 0x0000d2bd,
   /* bc */  0x0000855c, 0x0000855d, 0x0000d8d2, 0x0000c4e4,
 
-  /*** Three byte table, leaf: e58dxx - offset 0x024d5 ***/
+  /*** Three byte table, leaf: e58dxx - offset 0x02556 ***/
 
   /* 80 */  0x0000855e, 0x0000caae, 0x0000855f, 0x0000c7a7,
   /* 84 */  0x00008560, 0x0000d8a6, 0x00008561, 0x0000c9fd,
@@ -2880,7 +2918,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d0b6, 0x00008572, 0x0000dae1, 0x00008573,
   /* bc */  0x00008574, 0x00008575, 0x00008576, 0x0000c7e4,
 
-  /*** Three byte table, leaf: e58exx - offset 0x02515 ***/
+  /*** Three byte table, leaf: e58exx - offset 0x02596 ***/
 
   /* 80 */  0x00008577, 0x00008578, 0x0000b3a7, 0x00008579,
   /* 84 */  0x0000b6f2, 0x0000ccfc, 0x0000c0fa, 0x0000857a,
@@ -2899,7 +2937,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000859b, 0x0000859c, 0x0000859d, 0x0000c8a5,
   /* bc */  0x0000859e, 0x0000859f, 0x000085a0, 0x0000cfd8,
 
-  /*** Three byte table, leaf: e58fxx - offset 0x02555 ***/
+  /*** Three byte table, leaf: e58fxx - offset 0x025d6 ***/
 
   /* 80 */  0x000085a1, 0x0000c8fe, 0x0000b2ce, 0x000085a2,
   /* 84 */  0x000085a3, 0x000085a4, 0x000085a5, 0x000085a6,
@@ -2918,7 +2956,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cbbe, 0x0000ccbe, 0x000085b5, 0x0000dfb7,
   /* bc */  0x0000b5f0, 0x0000dfb4, 0x000085b6, 0x000085b7,
 
-  /*** Three byte table, leaf: e590xx - offset 0x02595 ***/
+  /*** Three byte table, leaf: e590xx - offset 0x02616 ***/
 
   /* 80 */  0x000085b8, 0x0000d3f5, 0x000085b9, 0x0000b3d4,
   /* 84 */  0x0000b8f7, 0x000085ba, 0x0000dfba, 0x000085bb,
@@ -2937,7 +2975,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cefc, 0x0000b4b5, 0x000085ca, 0x0000cec7,
   /* bc */  0x0000baf0, 0x000085cb, 0x0000cee1, 0x000085cc,
 
-  /*** Three byte table, leaf: e591xx - offset 0x025d5 ***/
+  /*** Three byte table, leaf: e591xx - offset 0x02656 ***/
 
   /* 80 */  0x0000d1bd, 0x000085cd, 0x000085ce, 0x0000dfc0,
   /* 84 */  0x000085cf, 0x000085d0, 0x0000b4f4, 0x000085d1,
@@ -2956,7 +2994,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c5de, 0x000085ea, 0x000085eb, 0x0000c9eb,
   /* bc */  0x0000baf4, 0x0000c3fc, 0x000085ec, 0x000085ed,
 
-  /*** Three byte table, leaf: e592xx - offset 0x02615 ***/
+  /*** Three byte table, leaf: e592xx - offset 0x02696 ***/
 
   /* 80 */  0x0000bed7, 0x000085ee, 0x0000dfc6, 0x000085ef,
   /* 84 */  0x0000dfcd, 0x000085f0, 0x0000c5d8, 0x000085f1,
@@ -2975,7 +3013,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cfcc, 0x00008648, 0x00008649, 0x0000dfdd,
   /* bc */  0x0000864a, 0x0000d1ca, 0x0000864b, 0x0000dfde,
 
-  /*** Three byte table, leaf: e593xx - offset 0x02655 ***/
+  /*** Three byte table, leaf: e593xx - offset 0x026d6 ***/
 
   /* 80 */  0x0000b0a7, 0x0000c6b7, 0x0000dfd3, 0x0000864c,
   /* 84 */  0x0000bae5, 0x0000864d, 0x0000b6df, 0x0000cddb,
@@ -2994,7 +3032,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008661, 0x00008662, 0x0000b2b8, 0x00008663,
   /* bc */  0x0000badf, 0x0000dfec, 0x00008664, 0x0000dbc1,
 
-  /*** Three byte table, leaf: e594xx - offset 0x02695 ***/
+  /*** Three byte table, leaf: e594xx - offset 0x02716 ***/
 
   /* 80 */  0x00008665, 0x0000d1e4, 0x00008666, 0x00008667,
   /* 84 */  0x00008668, 0x00008669, 0x0000cbf4, 0x0000b4bd,
@@ -3013,7 +3051,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008688, 0x00008689, 0x0000868a, 0x0000868b,
   /* bc */  0x0000dffe, 0x0000868c, 0x0000cdd9, 0x0000dffc,
 
-  /*** Three byte table, leaf: e595xx - offset 0x026d5 ***/
+  /*** Three byte table, leaf: e595xx - offset 0x02756 ***/
 
   /* 80 */  0x0000868d, 0x0000dffa, 0x0000868e, 0x0000bfd0,
   /* 84 */  0x0000d7c4, 0x0000868f, 0x0000c9cc, 0x00008690,
@@ -3032,7 +3070,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d0a5, 0x000086af, 0x000086b0, 0x0000e0b4,
   /* bc */  0x0000cce4, 0x000086b1, 0x0000e0b1, 0x000086b2,
 
-  /*** Three byte table, leaf: e596xx - offset 0x02715 ***/
+  /*** Three byte table, leaf: e596xx - offset 0x02796 ***/
 
   /* 80 */  0x0000bfa6, 0x0000e0af, 0x0000ceb9, 0x0000e0ab,
   /* 84 */  0x0000c9c6, 0x000086b3, 0x000086b4, 0x0000c0ae,
@@ -3051,7 +3089,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000086d4, 0x0000e0ad, 0x000086d5, 0x0000d3f7,
   /* bc */  0x000086d6, 0x0000e0b6, 0x0000e0b7, 0x000086d7,
 
-  /*** Three byte table, leaf: e597xx - offset 0x02755 ***/
+  /*** Three byte table, leaf: e597xx - offset 0x027d6 ***/
 
   /* 80 */  0x000086d8, 0x000086d9, 0x000086da, 0x000086db,
   /* 84 */  0x0000e0c4, 0x0000d0e1, 0x000086dc, 0x000086dd,
@@ -3070,7 +3108,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000086f5, 0x000086f6, 0x000086f7, 0x000086f8,
   /* bc */  0x000086f9, 0x0000cbd4, 0x0000e0d5, 0x000086fa,
 
-  /*** Three byte table, leaf: e598xx - offset 0x02795 ***/
+  /*** Three byte table, leaf: e598xx - offset 0x02816 ***/
 
   /* 80 */  0x0000e0d6, 0x0000e0d2, 0x000086fb, 0x000086fc,
   /* 84 */  0x000086fd, 0x000086fe, 0x00008740, 0x00008741,
@@ -3089,7 +3127,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008760, 0x0000e0da, 0x00008761, 0x0000cefb,
   /* bc */  0x00008762, 0x00008763, 0x00008764, 0x0000bad9,
 
-  /*** Three byte table, leaf: e599xx - offset 0x027d5 ***/
+  /*** Three byte table, leaf: e599xx - offset 0x02856 ***/
 
   /* 80 */  0x00008765, 0x00008766, 0x00008767, 0x00008768,
   /* 84 */  0x00008769, 0x0000876a, 0x0000876b, 0x0000876c,
@@ -3108,7 +3146,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000878d, 0x0000878e, 0x0000878f, 0x0000e0e7,
   /* bc */  0x0000e0e8, 0x00008790, 0x00008791, 0x00008792,
 
-  /*** Three byte table, leaf: e59axx - offset 0x02815 ***/
+  /*** Three byte table, leaf: e59axx - offset 0x02896 ***/
 
   /* 80 */  0x00008793, 0x00008794, 0x00008795, 0x00008796,
   /* 84 */  0x00008797, 0x0000e0e9, 0x0000e0e3, 0x00008798,
@@ -3127,7 +3165,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000087c3, 0x000087c4, 0x000087c5, 0x000087c6,
   /* bc */  0x0000bdc0, 0x000087c7, 0x000087c8, 0x000087c9,
 
-  /*** Three byte table, leaf: e59bxx - offset 0x02855 ***/
+  /*** Three byte table, leaf: e59bxx - offset 0x028d6 ***/
 
   /* 80 */  0x000087ca, 0x000087cb, 0x000087cc, 0x000087cd,
   /* 84 */  0x000087ce, 0x000087cf, 0x000087d0, 0x000087d1,
@@ -3146,7 +3184,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000087f0, 0x0000e0f2, 0x0000b9cc, 0x000087f1,
   /* bc */  0x000087f2, 0x0000b9fa, 0x0000cdbc, 0x0000e0f3,
 
-  /*** Three byte table, leaf: e59cxx - offset 0x02895 ***/
+  /*** Three byte table, leaf: e59cxx - offset 0x02916 ***/
 
   /* 80 */  0x000087f3, 0x000087f4, 0x000087f5, 0x0000c6d4,
   /* 84 */  0x0000e0f4, 0x000087f6, 0x0000d4b2, 0x000087f7,
@@ -3165,7 +3203,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000885a, 0x0000dbdb, 0x0000b3a1, 0x0000dbdf,
   /* bc */  0x0000885b, 0x0000885c, 0x0000bbf8, 0x0000885d,
 
-  /*** Three byte table, leaf: e59dxx - offset 0x028d5 ***/
+  /*** Three byte table, leaf: e59dxx - offset 0x02956 ***/
 
   /* 80 */  0x0000d6b7, 0x0000885e, 0x0000dbe0, 0x0000885f,
   /* 84 */  0x00008860, 0x00008861, 0x00008862, 0x0000bef9,
@@ -3184,7 +3222,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008878, 0x00008879, 0x0000887a, 0x0000dbe6,
   /* bc */  0x0000dbe5, 0x0000887b, 0x0000887c, 0x0000887d,
 
-  /*** Three byte table, leaf: e59exx - offset 0x02915 ***/
+  /*** Three byte table, leaf: e59exx - offset 0x02996 ***/
 
   /* 80 */  0x0000887e, 0x00008880, 0x0000b4b9, 0x0000c0ac,
   /* 84 */  0x0000c2a2, 0x0000dbe2, 0x0000dbe4, 0x00008881,
@@ -3203,7 +3241,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000dbf9, 0x000088a0, 0x000088a1, 0x000088a2,
   /* bc */  0x000088a3, 0x000088a4, 0x000088a5, 0x000088a6,
 
-  /*** Three byte table, leaf: e59fxx - offset 0x02955 ***/
+  /*** Three byte table, leaf: e59fxx - offset 0x029d6 ***/
 
   /* 80 */  0x000088a7, 0x000088a8, 0x0000b9a1, 0x0000b0a3,
   /* 84 */  0x000088a9, 0x000088aa, 0x000088ab, 0x000088ac,
@@ -3222,7 +3260,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000dbfc, 0x0000c5e0, 0x0000bbf9, 0x000088cd,
   /* bc */  0x000088ce, 0x0000dca3, 0x000088cf, 0x000088d0,
 
-  /*** Three byte table, leaf: e5a0xx - offset 0x02995 ***/
+  /*** Three byte table, leaf: e5a0xx - offset 0x02a16 ***/
 
   /* 80 */  0x0000dca5, 0x000088d1, 0x0000ccc3, 0x000088d2,
   /* 84 */  0x000088d3, 0x000088d4, 0x0000b6d1, 0x0000ddc0,
@@ -3241,7 +3279,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000088f9, 0x000088fa, 0x000088fb, 0x000088fc,
   /* bc */  0x000088fd, 0x000088fe, 0x00008940, 0x00008941,
 
-  /*** Three byte table, leaf: e5a1xx - offset 0x029d5 ***/
+  /*** Three byte table, leaf: e5a1xx - offset 0x02a56 ***/
 
   /* 80 */  0x00008942, 0x00008943, 0x00008944, 0x00008945,
   /* 84 */  0x0000dca8, 0x00008946, 0x00008947, 0x00008948,
@@ -3260,7 +3298,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008970, 0x00008971, 0x00008972, 0x00008973,
   /* bc */  0x00008974, 0x00008975, 0x0000dbd3, 0x00008976,
 
-  /*** Three byte table, leaf: e5a2xx - offset 0x02a15 ***/
+  /*** Three byte table, leaf: e5a2xx - offset 0x02a96 ***/
 
   /* 80 */  0x0000dcaf, 0x0000dcac, 0x00008977, 0x0000beb3,
   /* 84 */  0x00008978, 0x0000cafb, 0x00008979, 0x0000897a,
@@ -3279,7 +3317,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000089a3, 0x000089a4, 0x000089a5, 0x000089a6,
   /* bc */  0x0000dbd4, 0x000089a7, 0x000089a8, 0x000089a9,
 
-  /*** Three byte table, leaf: e5a3xx - offset 0x02a55 ***/
+  /*** Three byte table, leaf: e5a3xx - offset 0x02ad6 ***/
 
   /* 80 */  0x000089aa, 0x0000b1da, 0x000089ab, 0x000089ac,
   /* 84 */  0x000089ad, 0x0000dbd5, 0x000089ae, 0x000089af,
@@ -3298,7 +3336,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000089d7, 0x0000d2bc, 0x000089d8, 0x000089d9,
   /* bc */  0x000089da, 0x000089db, 0x000089dc, 0x000089dd,
 
-  /*** Three byte table, leaf: e5a4xx - offset 0x02a95 ***/
+  /*** Three byte table, leaf: e5a4xx - offset 0x02b16 ***/
 
   /* 80 */  0x000089de, 0x000089df, 0x0000e2ba, 0x000089e0,
   /* 84 */  0x0000b4a6, 0x000089e1, 0x000089e2, 0x0000b1b8,
@@ -3317,7 +3355,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bfe4, 0x0000bcd0, 0x0000b6e1, 0x000089fe,
   /* bc */  0x0000dec5, 0x00008a40, 0x00008a41, 0x00008a42,
 
-  /*** Three byte table, leaf: e5a5xx - offset 0x02ad5 ***/
+  /*** Three byte table, leaf: e5a5xx - offset 0x02b56 ***/
 
   /* 80 */  0x00008a43, 0x0000dec6, 0x0000dbbc, 0x00008a44,
   /* 84 */  0x0000d1d9, 0x00008a45, 0x00008a46, 0x0000c6e6,
@@ -3336,7 +3374,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bce9, 0x0000cbfd, 0x00008a65, 0x00008a66,
   /* bc */  0x00008a67, 0x0000bac3, 0x00008a68, 0x00008a69,
 
-  /*** Three byte table, leaf: e5a6xx - offset 0x02b15 ***/
+  /*** Three byte table, leaf: e5a6xx - offset 0x02b96 ***/
 
   /* 80 */  0x00008a6a, 0x0000e5f9, 0x0000c8e7, 0x0000e5fa,
   /* 84 */  0x0000cdfd, 0x00008a6b, 0x0000d7b1, 0x0000b8be,
@@ -3355,7 +3393,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008a8a, 0x0000c3c3, 0x00008a8b, 0x0000c6de,
   /* bc */  0x00008a8c, 0x00008a8d, 0x0000e6aa, 0x00008a8e,
 
-  /*** Three byte table, leaf: e5a7xx - offset 0x02b55 ***/
+  /*** Three byte table, leaf: e5a7xx - offset 0x02bd6 ***/
 
   /* 80 */  0x00008a8f, 0x00008a90, 0x00008a91, 0x00008a92,
   /* 84 */  0x00008a93, 0x00008a94, 0x0000c4b7, 0x00008a95,
@@ -3374,7 +3412,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008ab6, 0x0000e6b1, 0x00008ab7, 0x0000d2f6,
   /* bc */  0x00008ab8, 0x00008ab9, 0x00008aba, 0x0000d7cb,
 
-  /*** Three byte table, leaf: e5a8xx - offset 0x02b95 ***/
+  /*** Three byte table, leaf: e5a8xx - offset 0x02c16 ***/
 
   /* 80 */  0x00008abb, 0x0000cdfe, 0x00008abc, 0x0000cdde,
   /* 84 */  0x0000c2a6, 0x0000e6ab, 0x0000e6ac, 0x0000bdbf,
@@ -3393,7 +3431,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008add, 0x00008ade, 0x00008adf, 0x00008ae0,
   /* bc */  0x0000e6bd, 0x00008ae1, 0x00008ae2, 0x00008ae3,
 
-  /*** Three byte table, leaf: e5a9xx - offset 0x02bd5 ***/
+  /*** Three byte table, leaf: e5a9xx - offset 0x02c56 ***/
 
   /* 80 */  0x0000e6b9, 0x00008ae4, 0x00008ae5, 0x00008ae6,
   /* 84 */  0x00008ae7, 0x00008ae8, 0x0000c6c5, 0x00008ae9,
@@ -3412,7 +3450,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008b50, 0x00008b51, 0x0000e6c4, 0x00008b52,
   /* bc */  0x00008b53, 0x00008b54, 0x00008b55, 0x0000d0f6,
 
-  /*** Three byte table, leaf: e5aaxx - offset 0x02c15 ***/
+  /*** Three byte table, leaf: e5aaxx - offset 0x02c96 ***/
 
   /* 80 */  0x00008b56, 0x00008b57, 0x00008b58, 0x00008b59,
   /* 84 */  0x00008b5a, 0x00008b5b, 0x00008b5c, 0x00008b5d,
@@ -3431,7 +3469,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e6ca, 0x00008b88, 0x00008b89, 0x00008b8a,
   /* bc */  0x00008b8b, 0x00008b8c, 0x0000e6c5, 0x00008b8d,
 
-  /*** Three byte table, leaf: e5abxx - offset 0x02c55 ***/
+  /*** Three byte table, leaf: e5abxx - offset 0x02cd6 ***/
 
   /* 80 */  0x00008b8e, 0x0000bcde, 0x0000c9a9, 0x00008b8f,
   /* 84 */  0x00008b90, 0x00008b91, 0x00008b92, 0x00008b93,
@@ -3450,7 +3488,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008bb6, 0x00008bb7, 0x00008bb8, 0x00008bb9,
   /* bc */  0x00008bba, 0x00008bbb, 0x00008bbc, 0x00008bbd,
 
-  /*** Three byte table, leaf: e5acxx - offset 0x02c95 ***/
+  /*** Three byte table, leaf: e5acxx - offset 0x02d16 ***/
 
   /* 80 */  0x00008bbe, 0x00008bbf, 0x00008bc0, 0x00008bc1,
   /* 84 */  0x00008bc2, 0x00008bc3, 0x00008bc4, 0x00008bc5,
@@ -3469,7 +3507,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008bf0, 0x00008bf1, 0x00008bf2, 0x00008bf3,
   /* bc */  0x00008bf4, 0x00008bf5, 0x00008bf6, 0x00008bf7,
 
-  /*** Three byte table, leaf: e5adxx - offset 0x02cd5 ***/
+  /*** Three byte table, leaf: e5adxx - offset 0x02d56 ***/
 
   /* 80 */  0x0000e6d7, 0x00008bf8, 0x00008bf9, 0x00008bfa,
   /* 84 */  0x00008bfb, 0x00008bfc, 0x00008bfd, 0x00008bfe,
@@ -3488,7 +3526,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008c57, 0x00008c58, 0x0000c8e6, 0x00008c59,
   /* bc */  0x00008c5a, 0x0000c4f5, 0x00008c5b, 0x00008c5c,
 
-  /*** Three byte table, leaf: e5aexx - offset 0x02d15 ***/
+  /*** Three byte table, leaf: e5aexx - offset 0x02d96 ***/
 
   /* 80 */  0x0000e5b2, 0x0000c4fe, 0x00008c5d, 0x0000cbfc,
   /* 84 */  0x0000e5b3, 0x0000d5ac, 0x00008c5e, 0x0000d3ee,
@@ -3507,7 +3545,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e5b7, 0x0000c8dd, 0x00008c72, 0x00008c73,
   /* bc */  0x00008c74, 0x0000bfed, 0x0000b1f6, 0x0000cbde,
 
-  /*** Three byte table, leaf: e5afxx - offset 0x02d55 ***/
+  /*** Three byte table, leaf: e5afxx - offset 0x02dd6 ***/
 
   /* 80 */  0x00008c75, 0x00008c76, 0x0000bcc5, 0x00008c77,
   /* 84 */  0x0000bcc4, 0x0000d2fa, 0x0000c3dc, 0x0000bfdc,
@@ -3526,7 +3564,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b4e7, 0x0000b6d4, 0x0000cbc2, 0x0000d1b0,
   /* bc */  0x0000b5bc, 0x00008c9c, 0x00008c9d, 0x0000cad9,
 
-  /*** Three byte table, leaf: e5b0xx - offset 0x02d95 ***/
+  /*** Three byte table, leaf: e5b0xx - offset 0x02e16 ***/
 
   /* 80 */  0x00008c9e, 0x0000b7e2, 0x00008c9f, 0x00008ca0,
   /* 84 */  0x0000c9e4, 0x00008ca1, 0x0000bdab, 0x00008ca2,
@@ -3545,7 +3583,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000caac, 0x0000d2fc, 0x0000b3df, 0x0000e5ea,
   /* bc */  0x0000c4e1, 0x0000bea1, 0x0000ceb2, 0x0000c4f2,
 
-  /*** Three byte table, leaf: e5b1xx - offset 0x02dd5 ***/
+  /*** Three byte table, leaf: e5b1xx - offset 0x02e56 ***/
 
   /* 80 */  0x0000bed6, 0x0000c6a8, 0x0000b2e3, 0x00008cc1,
   /* 84 */  0x00008cc2, 0x0000bed3, 0x00008cc3, 0x00008cc4,
@@ -3564,7 +3602,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008ce2, 0x0000d2d9, 0x0000e1a8, 0x00008ce3,
   /* bc */  0x00008ce4, 0x00008ce5, 0x00008ce6, 0x0000d3ec,
 
-  /*** Three byte table, leaf: e5b2xx - offset 0x02e15 ***/
+  /*** Three byte table, leaf: e5b2xx - offset 0x02e96 ***/
 
   /* 80 */  0x00008ce7, 0x0000cbea, 0x0000c6f1, 0x00008ce8,
   /* 84 */  0x00008ce9, 0x00008cea, 0x00008ceb, 0x00008cec,
@@ -3583,7 +3621,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b0b6, 0x00008d47, 0x00008d48, 0x00008d49,
   /* bc */  0x00008d4a, 0x0000e1b4, 0x00008d4b, 0x0000bff9,
 
-  /*** Three byte table, leaf: e5b3xx - offset 0x02e55 ***/
+  /*** Three byte table, leaf: e5b3xx - offset 0x02ed6 ***/
 
   /* 80 */  0x00008d4c, 0x0000e1b9, 0x00008d4d, 0x00008d4e,
   /* 84 */  0x0000e1bb, 0x00008d4f, 0x00008d50, 0x00008d51,
@@ -3602,7 +3640,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008d77, 0x00008d78, 0x00008d79, 0x0000befe,
   /* bc */  0x00008d7a, 0x00008d7b, 0x00008d7c, 0x00008d7d,
 
-  /*** Three byte table, leaf: e5b4xx - offset 0x02e95 ***/
+  /*** Three byte table, leaf: e5b4xx - offset 0x02f16 ***/
 
   /* 80 */  0x00008d7e, 0x00008d80, 0x0000e1c0, 0x0000e1c1,
   /* 84 */  0x00008d81, 0x00008d82, 0x0000e1c7, 0x0000b3e7,
@@ -3621,7 +3659,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008da7, 0x00008da8, 0x00008da9, 0x00008daa,
   /* bc */  0x00008dab, 0x0000e1cc, 0x0000e1ca, 0x00008dac,
 
-  /*** Three byte table, leaf: e5b5xx - offset 0x02ed5 ***/
+  /*** Three byte table, leaf: e5b5xx - offset 0x02f56 ***/
 
   /* 80 */  0x00008dad, 0x00008dae, 0x00008daf, 0x00008db0,
   /* 84 */  0x00008db1, 0x00008db2, 0x00008db3, 0x0000effa,
@@ -3640,7 +3678,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008dd9, 0x00008dda, 0x00008ddb, 0x00008ddc,
   /* bc */  0x00008ddd, 0x00008dde, 0x00008ddf, 0x00008de0,
 
-  /*** Three byte table, leaf: e5b6xx - offset 0x02f15 ***/
+  /*** Three byte table, leaf: e5b6xx - offset 0x02f96 ***/
 
   /* 80 */  0x00008de1, 0x00008de2, 0x0000e1d6, 0x00008de3,
   /* 84 */  0x00008de4, 0x00008de5, 0x00008de6, 0x00008de7,
@@ -3659,7 +3697,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008e56, 0x00008e57, 0x00008e58, 0x00008e59,
   /* bc */  0x00008e5a, 0x00008e5b, 0x00008e5c, 0x00008e5d,
 
-  /*** Three byte table, leaf: e5b7xx - offset 0x02f55 ***/
+  /*** Three byte table, leaf: e5b7xx - offset 0x02fd6 ***/
 
   /* 80 */  0x00008e5e, 0x00008e5f, 0x00008e60, 0x00008e61,
   /* 84 */  0x00008e62, 0x0000e1db, 0x00008e63, 0x00008e64,
@@ -3678,7 +3716,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008e83, 0x00008e84, 0x00008e85, 0x00008e86,
   /* bc */  0x00008e87, 0x0000d9e3, 0x0000bded, 0x00008e88,
 
-  /*** Three byte table, leaf: e5b8xx - offset 0x02f95 ***/
+  /*** Three byte table, leaf: e5b8xx - offset 0x03016 ***/
 
   /* 80 */  0x00008e89, 0x0000b1d2, 0x0000cad0, 0x0000b2bc,
   /* 84 */  0x00008e8a, 0x0000cba7, 0x0000b7ab, 0x00008e8b,
@@ -3697,7 +3735,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b3a3, 0x00008ea8, 0x00008ea9, 0x0000e0fd,
   /* bc */  0x0000e0fe, 0x0000c3b1, 0x00008eaa, 0x00008eab,
 
-  /*** Three byte table, leaf: e5b9xx - offset 0x02fd5 ***/
+  /*** Three byte table, leaf: e5b9xx - offset 0x03056 ***/
 
   /* 80 */  0x00008eac, 0x00008ead, 0x0000c3dd, 0x00008eae,
   /* 84 */  0x0000e1a2, 0x0000b7f9, 0x00008eaf, 0x00008eb0,
@@ -3716,7 +3754,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d0d2, 0x00008ed6, 0x0000e7db, 0x0000bbc3,
   /* bc */  0x0000d3d7, 0x0000d3c4, 0x00008ed7, 0x0000b9e3,
 
-  /*** Three byte table, leaf: e5baxx - offset 0x03015 ***/
+  /*** Three byte table, leaf: e5baxx - offset 0x03096 ***/
 
   /* 80 */  0x0000e2cf, 0x00008ed8, 0x00008ed9, 0x00008eda,
   /* 84 */  0x0000d7af, 0x00008edb, 0x0000c7ec, 0x0000b1d3,
@@ -3735,7 +3773,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d3b9, 0x0000e2d5, 0x00008ef4, 0x00008ef5,
   /* bc */  0x00008ef6, 0x00008ef7, 0x0000e2d7, 0x00008ef8,
 
-  /*** Three byte table, leaf: e5bbxx - offset 0x03055 ***/
+  /*** Three byte table, leaf: e5bbxx - offset 0x030d6 ***/
 
   /* 80 */  0x00008ef9, 0x00008efa, 0x00008efb, 0x00008efc,
   /* 84 */  0x00008efd, 0x00008efe, 0x00008f40, 0x00008f41,
@@ -3754,7 +3792,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008f66, 0x00008f67, 0x0000bda8, 0x00008f68,
   /* bc */  0x00008f69, 0x00008f6a, 0x0000dec3, 0x0000d8a5,
 
-  /*** Three byte table, leaf: e5bcxx - offset 0x03095 ***/
+  /*** Three byte table, leaf: e5bcxx - offset 0x03116 ***/
 
   /* 80 */  0x0000bfaa, 0x0000dbcd, 0x0000d2ec, 0x0000c6fa,
   /* 84 */  0x0000c5aa, 0x00008f6b, 0x00008f6c, 0x00008f6d,
@@ -3773,7 +3811,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008f8b, 0x0000b5af, 0x0000c7bf, 0x00008f8c,
   /* bc */  0x0000e5f6, 0x00008f8d, 0x00008f8e, 0x00008f8f,
 
-  /*** Three byte table, leaf: e5bdxx - offset 0x030d5 ***/
+  /*** Three byte table, leaf: e5bdxx - offset 0x03156 ***/
 
   /* 80 */  0x0000ecb0, 0x00008f90, 0x00008f91, 0x00008f92,
   /* 84 */  0x00008f93, 0x00008f94, 0x00008f95, 0x00008f96,
@@ -3792,7 +3830,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008fb3, 0x0000d2db, 0x00008fb4, 0x0000b3b9,
   /* bc */  0x0000b1cb, 0x00008fb5, 0x00008fb6, 0x00008fb7,
 
-  /*** Three byte table, leaf: e5bexx - offset 0x03115 ***/
+  /*** Three byte table, leaf: e5bexx - offset 0x03196 ***/
 
   /* 80 */  0x0000cdf9, 0x0000d5f7, 0x0000e1de, 0x00008fb8,
   /* 84 */  0x0000beb6, 0x0000b4fd, 0x00008fb9, 0x0000e1df,
@@ -3811,7 +3849,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00008fd7, 0x00008fd8, 0x00008fd9, 0x00008fda,
   /* bc */  0x0000e1e8, 0x0000bbd5, 0x00008fdb, 0x00008fdc,
 
-  /*** Three byte table, leaf: e5bfxx - offset 0x03155 ***/
+  /*** Three byte table, leaf: e5bfxx - offset 0x031d6 ***/
 
   /* 80 */  0x00008fdd, 0x00008fde, 0x00008fdf, 0x0000d0c4,
   /* 84 */  0x0000e2e0, 0x0000b1d8, 0x0000d2e4, 0x00008fe0,
@@ -3830,7 +3868,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e2ee, 0x00008ffb, 0x00008ffc, 0x0000d0c3,
   /* bc */  0x00008ffd, 0x0000baf6, 0x0000e2e9, 0x0000b7de,
 
-  /*** Three byte table, leaf: e680xx - offset 0x03195 ***/
+  /*** Three byte table, leaf: e680xx - offset 0x03216 ***/
 
   /* 80 */  0x0000bbb3, 0x0000ccac, 0x0000cbcb, 0x0000e2e4,
   /* 84 */  0x0000e2e6, 0x0000e2ea, 0x0000e2eb, 0x00008ffe,
@@ -3849,7 +3887,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009059, 0x0000905a, 0x0000905b, 0x0000d7dc,
   /* bc */  0x0000eda1, 0x0000905c, 0x0000905d, 0x0000e2f8,
 
-  /*** Three byte table, leaf: e681xx - offset 0x031d5 ***/
+  /*** Three byte table, leaf: e681xx - offset 0x03256 ***/
 
   /* 80 */  0x0000905e, 0x0000eda5, 0x0000e2fe, 0x0000cad1,
   /* 84 */  0x0000905f, 0x00009060, 0x00009061, 0x00009062,
@@ -3868,7 +3906,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e2fa, 0x0000e2fb, 0x0000e2fd, 0x0000e2fc,
   /* bc */  0x0000c4d5, 0x0000e3a2, 0x0000907d, 0x0000d3c1,
 
-  /*** Three byte table, leaf: e682xx - offset 0x03215 ***/
+  /*** Three byte table, leaf: e682xx - offset 0x03296 ***/
 
   /* 80 */  0x0000907e, 0x00009080, 0x00009081, 0x0000e3a7,
   /* 84 */  0x0000c7c4, 0x00009082, 0x00009083, 0x00009084,
@@ -3887,7 +3925,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bcc2, 0x000090a0, 0x000090a1, 0x0000e3ac,
   /* bc */  0x0000b5bf, 0x000090a2, 0x000090a3, 0x000090a4,
 
-  /*** Three byte table, leaf: e683xx - offset 0x03255 ***/
+  /*** Three byte table, leaf: e683xx - offset 0x032d6 ***/
 
   /* 80 */  0x000090a5, 0x000090a6, 0x000090a7, 0x000090a8,
   /* 84 */  0x000090a9, 0x0000c7e9, 0x0000e3b0, 0x000090aa,
@@ -3906,7 +3944,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000090c4, 0x0000c8c7, 0x0000d0ca, 0x000090c5,
   /* bc */  0x000090c6, 0x000090c7, 0x000090c8, 0x000090c9,
 
-  /*** Three byte table, leaf: e684xx - offset 0x03295 ***/
+  /*** Three byte table, leaf: e684xx - offset 0x03316 ***/
 
   /* 80 */  0x0000e3b8, 0x0000b3ee, 0x000090ca, 0x000090cb,
   /* 84 */  0x000090cc, 0x000090cd, 0x0000eda9, 0x000090ce,
@@ -3925,7 +3963,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000090f1, 0x000090f2, 0x000090f3, 0x000090f4,
   /* bc */  0x000090f5, 0x000090f6, 0x000090f7, 0x0000d4b8,
 
-  /*** Three byte table, leaf: e685xx - offset 0x032d5 ***/
+  /*** Three byte table, leaf: e685xx - offset 0x03356 ***/
 
   /* 80 */  0x000090f8, 0x000090f9, 0x000090fa, 0x000090fb,
   /* 84 */  0x000090fc, 0x000090fd, 0x000090fe, 0x00009140,
@@ -3944,7 +3982,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009164, 0x00009165, 0x00009166, 0x00009167,
   /* bc */  0x00009168, 0x00009169, 0x0000916a, 0x0000916b,
 
-  /*** Three byte table, leaf: e686xx - offset 0x03315 ***/
+  /*** Three byte table, leaf: e686xx - offset 0x03396 ***/
 
   /* 80 */  0x0000916c, 0x0000916d, 0x0000916e, 0x0000916f,
   /* 84 */  0x00009170, 0x00009171, 0x00009172, 0x00009173,
@@ -3963,7 +4001,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000919c, 0x0000919d, 0x0000919e, 0x0000919f,
   /* bc */  0x000091a0, 0x000091a1, 0x0000bab6, 0x000091a2,
 
-  /*** Three byte table, leaf: e687xx - offset 0x03355 ***/
+  /*** Three byte table, leaf: e687xx - offset 0x033d6 ***/
 
   /* 80 */  0x000091a3, 0x000091a4, 0x0000b6ae, 0x000091a5,
   /* 84 */  0x000091a6, 0x000091a7, 0x000091a8, 0x000091a9,
@@ -3982,7 +4020,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000091d2, 0x000091d3, 0x000091d4, 0x000091d5,
   /* bc */  0x000091d6, 0x000091d7, 0x000091d8, 0x0000dcb2,
 
-  /*** Three byte table, leaf: e688xx - offset 0x03395 ***/
+  /*** Three byte table, leaf: e688xx - offset 0x03416 ***/
 
   /* 80 */  0x000091d9, 0x000091da, 0x000091db, 0x000091dc,
   /* 84 */  0x000091dd, 0x000091de, 0x0000edb0, 0x000091df,
@@ -4001,7 +4039,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000091f5, 0x000091f6, 0x000091f7, 0x000091f8,
   /* bc */  0x000091f9, 0x0000ece6, 0x0000ece5, 0x0000b7bf,
 
-  /*** Three byte table, leaf: e689xx - offset 0x033d5 ***/
+  /*** Three byte table, leaf: e689xx - offset 0x03456 ***/
 
   /* 80 */  0x0000cbf9, 0x0000b1e2, 0x000091fa, 0x0000ece7,
   /* 84 */  0x000091fb, 0x000091fc, 0x000091fd, 0x0000c9c8,
@@ -4020,7 +4058,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009256, 0x0000c5fa, 0x00009257, 0x00009258,
   /* bc */  0x0000b6f3, 0x00009259, 0x0000d5d2, 0x0000b3d0,
 
-  /*** Three byte table, leaf: e68axx - offset 0x03415 ***/
+  /*** Three byte table, leaf: e68axx - offset 0x03496 ***/
 
   /* 80 */  0x0000bcbc, 0x0000925a, 0x0000925b, 0x0000925c,
   /* 84 */  0x0000b3ad, 0x0000925d, 0x0000925e, 0x0000925f,
@@ -4039,7 +4077,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000927a, 0x0000c4a8, 0x0000927b, 0x0000ded3,
   /* bc */  0x0000d1ba, 0x0000b3e9, 0x0000927c, 0x0000c3f2,
 
-  /*** Three byte table, leaf: e68bxx - offset 0x03455 ***/
+  /*** Three byte table, leaf: e68bxx - offset 0x034d6 ***/
 
   /* 80 */  0x0000927d, 0x0000927e, 0x0000b7f7, 0x00009280,
   /* 84 */  0x0000d6f4, 0x0000b5a3, 0x0000b2f0, 0x0000c4b4,
@@ -4058,7 +4096,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000928f, 0x00009290, 0x00009291, 0x00009292,
   /* bc */  0x0000c6b4, 0x0000d7a7, 0x0000cab0, 0x0000c4c3,
 
-  /*** Three byte table, leaf: e68cxx - offset 0x03495 ***/
+  /*** Three byte table, leaf: e68cxx - offset 0x03516 ***/
 
   /* 80 */  0x00009293, 0x0000b3d6, 0x0000b9d2, 0x00009294,
   /* 84 */  0x00009295, 0x00009296, 0x00009297, 0x0000d6b8,
@@ -4077,7 +4115,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000092b3, 0x0000deda, 0x0000cda6, 0x000092b4,
   /* bc */  0x000092b5, 0x0000cdec, 0x000092b6, 0x000092b7,
 
-  /*** Three byte table, leaf: e68dxx - offset 0x034d5 ***/
+  /*** Three byte table, leaf: e68dxx - offset 0x03556 ***/
 
   /* 80 */  0x000092b8, 0x000092b9, 0x0000cee6, 0x0000dedc,
   /* 84 */  0x000092ba, 0x0000cdb1, 0x0000c0a6, 0x000092bb,
@@ -4096,7 +4134,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000092d8, 0x000092d9, 0x0000dee0, 0x0000c4ed,
   /* bc */  0x000092da, 0x000092db, 0x000092dc, 0x000092dd,
 
-  /*** Three byte table, leaf: e68exx - offset 0x03515 ***/
+  /*** Three byte table, leaf: e68exx - offset 0x03596 ***/
 
   /* 80 */  0x0000cfc6, 0x000092de, 0x0000b5e0, 0x000092df,
   /* 84 */  0x000092e0, 0x000092e1, 0x000092e2, 0x0000b6de,
@@ -4115,7 +4153,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b5a7, 0x000092fa, 0x0000b2f4, 0x000092fb,
   /* bc */  0x0000dee8, 0x000092fc, 0x0000def2, 0x000092fd,
 
-  /*** Three byte table, leaf: e68fxx - offset 0x03555 ***/
+  /*** Three byte table, leaf: e68fxx - offset 0x035d6 ***/
 
   /* 80 */  0x000092fe, 0x00009340, 0x00009341, 0x00009342,
   /* 84 */  0x0000deed, 0x00009343, 0x0000def1, 0x00009344,
@@ -4134,7 +4172,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000deea, 0x00009364, 0x00009365, 0x00009366,
   /* bc */  0x00009367, 0x0000c0bf, 0x00009368, 0x0000deec,
 
-  /*** Three byte table, leaf: e690xx - offset 0x03595 ***/
+  /*** Three byte table, leaf: e690xx - offset 0x03616 ***/
 
   /* 80 */  0x0000b2f3, 0x0000b8e9, 0x0000c2a7, 0x00009369,
   /* 84 */  0x0000936a, 0x0000bdc1, 0x0000936b, 0x0000936c,
@@ -4153,7 +4191,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000938e, 0x0000938f, 0x0000d0af, 0x00009390,
   /* bc */  0x00009391, 0x0000b2eb, 0x00009392, 0x0000eba1,
 
-  /*** Three byte table, leaf: e691xx - offset 0x035d5 ***/
+  /*** Three byte table, leaf: e691xx - offset 0x03656 ***/
 
   /* 80 */  0x00009393, 0x0000def4, 0x00009394, 0x00009395,
   /* 84 */  0x0000c9e3, 0x0000def3, 0x0000b0da, 0x0000d2a1,
@@ -4172,7 +4210,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c3fe, 0x0000c4a1, 0x0000dfa1, 0x000093bd,
   /* bc */  0x000093be, 0x000093bf, 0x000093c0, 0x000093c1,
 
-  /*** Three byte table, leaf: e692xx - offset 0x03615 ***/
+  /*** Three byte table, leaf: e692xx - offset 0x03696 ***/
 
   /* 80 */  0x000093c2, 0x000093c3, 0x0000c1cc, 0x000093c4,
   /* 84 */  0x0000defc, 0x0000beef, 0x000093c5, 0x0000c6b2,
@@ -4191,7 +4229,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000dfa3, 0x000093e8, 0x0000dfa5, 0x000093e9,
   /* bc */  0x0000bab3, 0x000093ea, 0x000093eb, 0x000093ec,
 
-  /*** Three byte table, leaf: e693xx - offset 0x03655 ***/
+  /*** Three byte table, leaf: e693xx - offset 0x036d6 ***/
 
   /* 80 */  0x0000dfa6, 0x000093ed, 0x0000c0de, 0x000093ee,
   /* 84 */  0x000093ef, 0x0000c9c3, 0x000093f0, 0x000093f1,
@@ -4210,7 +4248,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009459, 0x0000945a, 0x0000945b, 0x0000945c,
   /* bc */  0x0000945d, 0x0000945e, 0x0000945f, 0x00009460,
 
-  /*** Three byte table, leaf: e694xx - offset 0x03695 ***/
+  /*** Three byte table, leaf: e694xx - offset 0x03716 ***/
 
   /* 80 */  0x0000c5ca, 0x00009461, 0x00009462, 0x00009463,
   /* 84 */  0x00009464, 0x00009465, 0x00009466, 0x00009467,
@@ -4229,7 +4267,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d8fc, 0x0000b8c4, 0x0000948f, 0x0000b9a5,
   /* bc */  0x00009490, 0x00009491, 0x0000b7c5, 0x0000d5fe,
 
-  /*** Three byte table, leaf: e695xx - offset 0x036d5 ***/
+  /*** Three byte table, leaf: e695xx - offset 0x03756 ***/
 
   /* 80 */  0x00009492, 0x00009493, 0x00009494, 0x00009495,
   /* 84 */  0x00009496, 0x0000b9ca, 0x00009497, 0x00009498,
@@ -4248,7 +4286,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000094b5, 0x000094b6, 0x000094b7, 0x000094b8,
   /* bc */  0x000094b9, 0x000094ba, 0x000094bb, 0x000094bc,
 
-  /*** Three byte table, leaf: e696xx - offset 0x03715 ***/
+  /*** Three byte table, leaf: e696xx - offset 0x03796 ***/
 
   /* 80 */  0x000094bd, 0x000094be, 0x000094bf, 0x000094c0,
   /* 84 */  0x000094c1, 0x000094c2, 0x000094c3, 0x0000cec4,
@@ -4267,7 +4305,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000094e1, 0x0000b7bd, 0x000094e2, 0x000094e3,
   /* bc */  0x0000ecb6, 0x0000caa9, 0x000094e4, 0x000094e5,
 
-  /*** Three byte table, leaf: e697xx - offset 0x03755 ***/
+  /*** Three byte table, leaf: e697xx - offset 0x037d6 ***/
 
   /* 80 */  0x000094e6, 0x0000c5d4, 0x000094e7, 0x0000ecb9,
   /* 84 */  0x0000ecb8, 0x0000c2c3, 0x0000ecb7, 0x000094e8,
@@ -4286,7 +4324,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009544, 0x00009545, 0x0000cdfa, 0x00009546,
   /* bc */  0x00009547, 0x00009548, 0x00009549, 0x0000954a,
 
-  /*** Three byte table, leaf: e698xx - offset 0x03795 ***/
+  /*** Three byte table, leaf: e698xx - offset 0x03816 ***/
 
   /* 80 */  0x0000eac0, 0x0000954b, 0x0000b0ba, 0x0000eabe,
   /* 84 */  0x0000954c, 0x0000954d, 0x0000c0a5, 0x0000954e,
@@ -4305,7 +4343,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000956b, 0x0000956c, 0x0000956d, 0x0000956e,
   /* bc */  0x0000d6e7, 0x0000956f, 0x0000cfd4, 0x00009570,
 
-  /*** Three byte table, leaf: e699xx - offset 0x037d5 ***/
+  /*** Three byte table, leaf: e699xx - offset 0x03856 ***/
 
   /* 80 */  0x00009571, 0x0000eacb, 0x00009572, 0x0000bbce,
   /* 84 */  0x00009573, 0x00009574, 0x00009575, 0x00009576,
@@ -4324,7 +4362,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009593, 0x00009594, 0x0000d6c7, 0x00009595,
   /* bc */  0x00009596, 0x00009597, 0x0000c1c0, 0x00009598,
 
-  /*** Three byte table, leaf: e69axx - offset 0x03815 ***/
+  /*** Three byte table, leaf: e69axx - offset 0x03896 ***/
 
   /* 80 */  0x00009599, 0x0000959a, 0x0000d4dd, 0x0000959b,
   /* 84 */  0x0000ead1, 0x0000959c, 0x0000959d, 0x0000cfbe,
@@ -4343,7 +4381,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000095c5, 0x0000e5df, 0x000095c6, 0x000095c7,
   /* bc */  0x000095c8, 0x000095c9, 0x0000ead5, 0x000095ca,
 
-  /*** Three byte table, leaf: e69bxx - offset 0x03855 ***/
+  /*** Three byte table, leaf: e69bxx - offset 0x038d6 ***/
 
   /* 80 */  0x000095cb, 0x000095cc, 0x000095cd, 0x000095ce,
   /* 84 */  0x000095cf, 0x000095d0, 0x000095d1, 0x000095d2,
@@ -4362,7 +4400,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000095f8, 0x0000b2dc, 0x000095f9, 0x000095fa,
   /* bc */  0x0000c2fc, 0x000095fb, 0x0000d4f8, 0x0000cce6,
 
-  /*** Three byte table, leaf: e69cxx - offset 0x03895 ***/
+  /*** Three byte table, leaf: e69cxx - offset 0x03916 ***/
 
   /* 80 */  0x0000d7ee, 0x000095fc, 0x000095fd, 0x000095fe,
   /* 84 */  0x00009640, 0x00009641, 0x00009642, 0x00009643,
@@ -4381,7 +4419,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000965e, 0x0000965f, 0x0000bbfa, 0x00009660,
   /* bc */  0x00009661, 0x0000d0e0, 0x00009662, 0x00009663,
 
-  /*** Three byte table, leaf: e69dxx - offset 0x038d5 ***/
+  /*** Three byte table, leaf: e69dxx - offset 0x03956 ***/
 
   /* 80 */  0x0000c9b1, 0x00009664, 0x0000d4d3, 0x0000c8a8,
   /* 84 */  0x00009665, 0x00009666, 0x0000b8cb, 0x00009667,
@@ -4400,7 +4438,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009680, 0x00009681, 0x00009682, 0x00009683,
   /* bc */  0x0000e8cc, 0x00009684, 0x0000cbc9, 0x0000b0e5,
 
-  /*** Three byte table, leaf: e69exx - offset 0x03915 ***/
+  /*** Three byte table, leaf: e69exx - offset 0x03996 ***/
 
   /* 80 */  0x00009685, 0x0000bcab, 0x00009686, 0x00009687,
   /* 84 */  0x0000b9b9, 0x00009688, 0x00009689, 0x0000e8c1,
@@ -4419,7 +4457,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e8db, 0x000096a2, 0x000096a3, 0x000096a4,
   /* bc */  0x000096a5, 0x000096a6, 0x000096a7, 0x000096a8,
 
-  /*** Three byte table, leaf: e69fxx - offset 0x03955 ***/
+  /*** Three byte table, leaf: e69fxx - offset 0x039d6 ***/
 
   /* 80 */  0x000096a9, 0x0000e8de, 0x000096aa, 0x0000e8da,
   /* 84 */  0x0000b1fa, 0x000096ab, 0x000096ac, 0x000096ad,
@@ -4438,7 +4476,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000096c8, 0x000096c9, 0x000096ca, 0x000096cb,
   /* bc */  0x000096cc, 0x0000e8df, 0x000096cd, 0x0000cac1,
 
-  /*** Three byte table, leaf: e6a0xx - offset 0x03995 ***/
+  /*** Three byte table, leaf: e6a0xx - offset 0x03a16 ***/
 
   /* 80 */  0x0000e8d9, 0x000096ce, 0x000096cf, 0x000096d0,
   /* 84 */  0x000096d1, 0x0000d5a4, 0x000096d2, 0x0000b1ea,
@@ -4457,7 +4495,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bacb, 0x0000b8f9, 0x000096f1, 0x000096f2,
   /* bc */  0x0000b8f1, 0x0000d4d4, 0x0000e8ef, 0x000096f3,
 
-  /*** Three byte table, leaf: e6a1xx - offset 0x039d5 ***/
+  /*** Three byte table, leaf: e6a1xx - offset 0x03a56 ***/
 
   /* 80 */  0x0000e8ee, 0x0000e8ec, 0x0000b9f0, 0x0000ccd2,
   /* 84 */  0x0000e8e6, 0x0000cea6, 0x0000bff2, 0x000096f4,
@@ -4476,7 +4514,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000974e, 0x0000974f, 0x00009750, 0x00009751,
   /* bc */  0x00009752, 0x00009753, 0x00009754, 0x00009755,
 
-  /*** Three byte table, leaf: e6a2xx - offset 0x03a15 ***/
+  /*** Three byte table, leaf: e6a2xx - offset 0x03a96 ***/
 
   /* 80 */  0x00009756, 0x0000c1ba, 0x00009757, 0x0000e8e8,
   /* 84 */  0x00009758, 0x0000c3b7, 0x0000b0f0, 0x00009759,
@@ -4495,7 +4533,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000977e, 0x00009780, 0x00009781, 0x00009782,
   /* bc */  0x00009783, 0x00009784, 0x00009785, 0x00009786,
 
-  /*** Three byte table, leaf: e6a3xx - offset 0x03a55 ***/
+  /*** Three byte table, leaf: e6a3xx - offset 0x03ad6 ***/
 
   /* 80 */  0x0000bcec, 0x00009787, 0x0000e8f9, 0x00009788,
   /* 84 */  0x00009789, 0x0000978a, 0x0000978b, 0x0000978c,
@@ -4514,7 +4552,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000097b0, 0x0000e8fe, 0x0000b9d7, 0x000097b1,
   /* bc */  0x0000e8fb, 0x000097b2, 0x000097b3, 0x000097b4,
 
-  /*** Three byte table, leaf: e6a4xx - offset 0x03a95 ***/
+  /*** Three byte table, leaf: e6a4xx - offset 0x03b16 ***/
 
   /* 80 */  0x000097b5, 0x0000e9a4, 0x000097b6, 0x000097b7,
   /* 84 */  0x000097b8, 0x0000d2ce, 0x000097b9, 0x000097ba,
@@ -4533,7 +4571,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000097e0, 0x0000e9a9, 0x000097e1, 0x000097e2,
   /* bc */  0x000097e3, 0x0000b4aa, 0x000097e4, 0x0000b4bb,
 
-  /*** Three byte table, leaf: e6a5xx - offset 0x03ad5 ***/
+  /*** Three byte table, leaf: e6a5xx - offset 0x03b56 ***/
 
   /* 80 */  0x000097e5, 0x000097e6, 0x0000e9ab, 0x000097e7,
   /* 84 */  0x000097e8, 0x000097e9, 0x000097ea, 0x000097eb,
@@ -4552,7 +4590,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e9b1, 0x0000e9ba, 0x00009851, 0x00009852,
   /* bc */  0x0000c2a5, 0x00009853, 0x00009854, 0x00009855,
 
-  /*** Three byte table, leaf: e6a6xx - offset 0x03b15 ***/
+  /*** Three byte table, leaf: e6a6xx - offset 0x03b96 ***/
 
   /* 80 */  0x0000e9af, 0x00009856, 0x0000b8c5, 0x00009857,
   /* 84 */  0x0000e9ad, 0x00009858, 0x0000d3dc, 0x0000e9b4,
@@ -4571,7 +4609,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000987a, 0x0000987b, 0x0000987c, 0x0000e9bd,
   /* bc */  0x0000987d, 0x0000987e, 0x00009880, 0x00009881,
 
-  /*** Three byte table, leaf: e6a7xx - offset 0x03b55 ***/
+  /*** Three byte table, leaf: e6a7xx - offset 0x03bd6 ***/
 
   /* 80 */  0x00009882, 0x0000e9c2, 0x00009883, 0x00009884,
   /* 84 */  0x00009885, 0x00009886, 0x00009887, 0x00009888,
@@ -4590,7 +4628,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000098af, 0x000098b0, 0x000098b1, 0x000098b2,
   /* bc */  0x000098b3, 0x0000b2db, 0x000098b4, 0x0000e9c8,
 
-  /*** Three byte table, leaf: e6a8xx - offset 0x03b95 ***/
+  /*** Three byte table, leaf: e6a8xx - offset 0x03c16 ***/
 
   /* 80 */  0x000098b5, 0x000098b6, 0x000098b7, 0x000098b8,
   /* 84 */  0x000098b9, 0x000098ba, 0x000098bb, 0x000098bc,
@@ -4609,7 +4647,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000098e3, 0x000098e4, 0x000098e5, 0x000098e6,
   /* bc */  0x000098e7, 0x0000e9d7, 0x0000e9d0, 0x000098e8,
 
-  /*** Three byte table, leaf: e6a9xx - offset 0x03bd5 ***/
+  /*** Three byte table, leaf: e6a9xx - offset 0x03c56 ***/
 
   /* 80 */  0x000098e9, 0x000098ea, 0x000098eb, 0x000098ec,
   /* 84 */  0x0000e9cf, 0x000098ed, 0x000098ee, 0x0000c7c1,
@@ -4628,7 +4666,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009959, 0x0000e9d6, 0x0000995a, 0x0000995b,
   /* bc */  0x0000e9da, 0x0000995c, 0x0000995d, 0x0000995e,
 
-  /*** Three byte table, leaf: e6aaxx - offset 0x03c15 ***/
+  /*** Three byte table, leaf: e6aaxx - offset 0x03c96 ***/
 
   /* 80 */  0x0000ccb4, 0x0000995f, 0x00009960, 0x00009961,
   /* 84 */  0x0000cfad, 0x00009962, 0x00009963, 0x00009964,
@@ -4647,7 +4685,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000998e, 0x0000998f, 0x00009990, 0x00009991,
   /* bc */  0x00009992, 0x00009993, 0x00009994, 0x00009995,
 
-  /*** Three byte table, leaf: e6abxx - offset 0x03c55 ***/
+  /*** Three byte table, leaf: e6abxx - offset 0x03cd6 ***/
 
   /* 80 */  0x00009996, 0x00009997, 0x00009998, 0x00009999,
   /* 84 */  0x0000999a, 0x0000999b, 0x0000999c, 0x0000999d,
@@ -4666,7 +4704,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x000099ce, 0x000099cf, 0x000099d0, 0x000099d1,
   /* bc */  0x000099d2, 0x000099d3, 0x000099d4, 0x000099d5,
 
-  /*** Three byte table, leaf: e6acxx - offset 0x03c95 ***/
+  /*** Three byte table, leaf: e6acxx - offset 0x03d16 ***/
 
   /* 80 */  0x000099d6, 0x000099d7, 0x000099d8, 0x000099d9,
   /* 84 */  0x000099da, 0x000099db, 0x000099dc, 0x000099dd,
@@ -4685,7 +4723,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009a47, 0x0000eca5, 0x0000c6db, 0x00009a48,
   /* bc */  0x00009a49, 0x00009a4a, 0x0000bfee, 0x00009a4b,
 
-  /*** Three byte table, leaf: e6adxx - offset 0x03cd5 ***/
+  /*** Three byte table, leaf: e6adxx - offset 0x03d56 ***/
 
   /* 80 */  0x00009a4c, 0x00009a4d, 0x00009a4e, 0x0000eca6,
   /* 84 */  0x00009a4f, 0x00009a50, 0x0000eca7, 0x0000d0aa,
@@ -4704,7 +4742,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009a77, 0x0000b4f5, 0x00009a78, 0x0000cbc0,
   /* bc */  0x0000bcdf, 0x00009a79, 0x00009a7a, 0x00009a7b,
 
-  /*** Three byte table, leaf: e6aexx - offset 0x03d15 ***/
+  /*** Three byte table, leaf: e6aexx - offset 0x03d96 ***/
 
   /* 80 */  0x00009a7c, 0x0000e9e2, 0x0000e9e3, 0x0000d1ea,
   /* 84 */  0x0000e9e5, 0x00009a7d, 0x0000b4f9, 0x0000e9e4,
@@ -4723,7 +4761,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009aa0, 0x00009aa1, 0x00009aa2, 0x00009aa3,
   /* bc */  0x00009aa4, 0x00009aa5, 0x00009aa6, 0x0000b5ee,
 
-  /*** Three byte table, leaf: e6afxx - offset 0x03d55 ***/
+  /*** Three byte table, leaf: e6afxx - offset 0x03dd6 ***/
 
   /* 80 */  0x00009aa7, 0x0000bbd9, 0x0000ecb1, 0x00009aa8,
   /* 84 */  0x00009aa9, 0x0000d2e3, 0x00009aaa, 0x00009aab,
@@ -4742,7 +4780,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009acb, 0x0000eba8, 0x00009acc, 0x00009acd,
   /* bc */  0x00009ace, 0x0000eba6, 0x00009acf, 0x00009ad0,
 
-  /*** Three byte table, leaf: e6b0xx - offset 0x03d95 ***/
+  /*** Three byte table, leaf: e6b0xx - offset 0x03e16 ***/
 
   /* 80 */  0x00009ad1, 0x00009ad2, 0x00009ad3, 0x00009ad4,
   /* 84 */  0x00009ad5, 0x0000eba9, 0x0000ebab, 0x0000ebaa,
@@ -4761,7 +4799,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d3c0, 0x00009aeb, 0x00009aec, 0x00009aed,
   /* bc */  0x00009aee, 0x0000d9db, 0x00009aef, 0x00009af0,
 
-  /*** Three byte table, leaf: e6b1xx - offset 0x03dd5 ***/
+  /*** Three byte table, leaf: e6b1xx - offset 0x03e56 ***/
 
   /* 80 */  0x0000cda1, 0x0000d6ad, 0x0000c7f3, 0x00009af1,
   /* 84 */  0x00009af2, 0x00009af3, 0x0000d9e0, 0x0000bbe3,
@@ -4780,7 +4818,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009b50, 0x0000d0da, 0x00009b51, 0x00009b52,
   /* bc */  0x00009b53, 0x0000c6fb, 0x0000b7da, 0x00009b54,
 
-  /*** Three byte table, leaf: e6b2xx - offset 0x03e15 ***/
+  /*** Three byte table, leaf: e6b2xx - offset 0x03e96 ***/
 
   /* 80 */  0x00009b55, 0x0000c7df, 0x0000d2ca, 0x0000ced6,
   /* 84 */  0x00009b56, 0x0000e3e4, 0x0000e3ec, 0x00009b57,
@@ -4799,7 +4837,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b7d0, 0x0000d3cd, 0x00009b70, 0x0000d6ce,
   /* bc */  0x0000d5d3, 0x0000b9c1, 0x0000d5b4, 0x0000d1d8,
 
-  /*** Three byte table, leaf: e6b3xx - offset 0x03e55 ***/
+  /*** Three byte table, leaf: e6b3xx - offset 0x03ed6 ***/
 
   /* 80 */  0x00009b71, 0x00009b72, 0x00009b73, 0x00009b74,
   /* 84 */  0x0000d0b9, 0x0000c7f6, 0x00009b75, 0x00009b76,
@@ -4818,7 +4856,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e3f2, 0x00009b8d, 0x0000e3f8, 0x0000d0ba,
   /* bc */  0x0000c6c3, 0x0000d4f3, 0x0000e3fe, 0x00009b8e,
 
-  /*** Three byte table, leaf: e6b4xx - offset 0x03e95 ***/
+  /*** Three byte table, leaf: e6b4xx - offset 0x03f16 ***/
 
   /* 80 */  0x00009b8f, 0x0000bde0, 0x00009b90, 0x00009b91,
   /* 84 */  0x0000e4a7, 0x00009b92, 0x00009b93, 0x0000e4a6,
@@ -4837,7 +4875,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009bb2, 0x0000e4a1, 0x00009bb3, 0x0000bbee,
   /* bc */  0x0000cddd, 0x0000c7a2, 0x0000c5c9, 0x00009bb4,
 
-  /*** Three byte table, leaf: e6b5xx - offset 0x03ed5 ***/
+  /*** Three byte table, leaf: e6b5xx - offset 0x03f56 ***/
 
   /* 80 */  0x00009bb5, 0x0000c1f7, 0x00009bb6, 0x0000e4a4,
   /* 84 */  0x00009bb7, 0x0000c7b3, 0x0000bdac, 0x0000bdbd,
@@ -4856,7 +4894,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bdfe, 0x00009bd1, 0x00009bd2, 0x00009bd3,
   /* bc */  0x0000e4bc, 0x00009bd4, 0x00009bd5, 0x00009bd6,
 
-  /*** Three byte table, leaf: e6b6xx - offset 0x03f15 ***/
+  /*** Three byte table, leaf: e6b6xx - offset 0x03f96 ***/
 
   /* 80 */  0x00009bd7, 0x00009bd8, 0x0000cdbf, 0x00009bd9,
   /* 84 */  0x00009bda, 0x0000c4f9, 0x00009bdb, 0x00009bdc,
@@ -4875,7 +4913,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bad4, 0x00009bf3, 0x00009bf4, 0x00009bf5,
   /* bc */  0x00009bf6, 0x00009bf7, 0x00009bf8, 0x0000e4c3,
 
-  /*** Three byte table, leaf: e6b7xx - offset 0x03f55 ***/
+  /*** Three byte table, leaf: e6b7xx - offset 0x03fd6 ***/
 
   /* 80 */  0x0000b5ed, 0x00009bf9, 0x00009bfa, 0x00009bfb,
   /* 84 */  0x0000d7cd, 0x0000e4c0, 0x0000cffd, 0x0000e4bf,
@@ -4894,7 +4932,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009c5b, 0x0000d1cd, 0x00009c5c, 0x0000cced,
   /* bc */  0x0000edb5, 0x00009c5d, 0x00009c5e, 0x00009c5f,
 
-  /*** Three byte table, leaf: e6b8xx - offset 0x03f95 ***/
+  /*** Three byte table, leaf: e6b8xx - offset 0x04016 ***/
 
   /* 80 */  0x00009c60, 0x00009c61, 0x00009c62, 0x00009c63,
   /* 84 */  0x00009c64, 0x0000c7e5, 0x00009c65, 0x00009c66,
@@ -4913,7 +4951,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d3ce, 0x00009c82, 0x0000c3ec, 0x00009c83,
   /* bc */  0x00009c84, 0x00009c85, 0x00009c86, 0x00009c87,
 
-  /*** Three byte table, leaf: e6b9xx - offset 0x03fd5 ***/
+  /*** Three byte table, leaf: e6b9xx - offset 0x04056 ***/
 
   /* 80 */  0x00009c88, 0x00009c89, 0x00009c8a, 0x0000c5c8,
   /* 84 */  0x0000e4d8, 0x00009c8b, 0x00009c8c, 0x00009c8d,
@@ -4932,7 +4970,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009cb4, 0x00009cb5, 0x00009cb6, 0x00009cb7,
   /* bc */  0x00009cb8, 0x00009cb9, 0x0000cde5, 0x0000caaa,
 
-  /*** Three byte table, leaf: e6baxx - offset 0x04015 ***/
+  /*** Three byte table, leaf: e6baxx - offset 0x04096 ***/
 
   /* 80 */  0x00009cba, 0x00009cbb, 0x00009cbc, 0x0000c0a3,
   /* 84 */  0x00009cbd, 0x0000bda6, 0x0000e4d3, 0x00009cbe,
@@ -4951,7 +4989,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009cdf, 0x00009ce0, 0x0000c4e7, 0x0000e4e2,
   /* bc */  0x00009ce1, 0x0000e4e1, 0x00009ce2, 0x00009ce3,
 
-  /*** Three byte table, leaf: e6bbxx - offset 0x04055 ***/
+  /*** Three byte table, leaf: e6bbxx - offset 0x040d6 ***/
 
   /* 80 */  0x00009ce4, 0x0000b3fc, 0x0000e4e8, 0x00009ce5,
   /* 84 */  0x00009ce6, 0x00009ce7, 0x00009ce8, 0x0000b5e1,
@@ -4970,7 +5008,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009d47, 0x0000e4ef, 0x00009d48, 0x00009d49,
   /* bc */  0x00009d4a, 0x00009d4b, 0x00009d4c, 0x00009d4d,
 
-  /*** Three byte table, leaf: e6bcxx - offset 0x04095 ***/
+  /*** Three byte table, leaf: e6bcxx - offset 0x04116 ***/
 
   /* 80 */  0x00009d4e, 0x00009d4f, 0x0000c6af, 0x00009d50,
   /* 84 */  0x00009d51, 0x00009d52, 0x0000c6e1, 0x00009d53,
@@ -4989,7 +5027,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009d75, 0x00009d76, 0x00009d77, 0x00009d78,
   /* bc */  0x00009d79, 0x00009d7a, 0x0000d1fa, 0x00009d7b,
 
-  /*** Three byte table, leaf: e6bdxx - offset 0x040d5 ***/
+  /*** Three byte table, leaf: e6bdxx - offset 0x04156 ***/
 
   /* 80 */  0x00009d7c, 0x00009d7d, 0x00009d7e, 0x00009d80,
   /* 84 */  0x00009d81, 0x00009d82, 0x0000e4eb, 0x0000e4ec,
@@ -5008,7 +5046,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e4fa, 0x00009da8, 0x0000e4fd, 0x00009da9,
   /* bc */  0x0000e4fc, 0x00009daa, 0x00009dab, 0x00009dac,
 
-  /*** Three byte table, leaf: e6bexx - offset 0x04115 ***/
+  /*** Three byte table, leaf: e6bexx - offset 0x04196 ***/
 
   /* 80 */  0x00009dad, 0x00009dae, 0x00009daf, 0x00009db0,
   /* 84 */  0x0000b3ce, 0x00009db1, 0x00009db2, 0x00009db3,
@@ -5027,7 +5065,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009dda, 0x0000e5a3, 0x00009ddb, 0x00009ddc,
   /* bc */  0x00009ddd, 0x00009dde, 0x00009ddf, 0x00009de0,
 
-  /*** Three byte table, leaf: e6bfxx - offset 0x04155 ***/
+  /*** Three byte table, leaf: e6bfxx - offset 0x041d6 ***/
 
   /* 80 */  0x0000bca4, 0x00009de1, 0x0000e5a5, 0x00009de2,
   /* 84 */  0x00009de3, 0x00009de4, 0x00009de5, 0x00009de6,
@@ -5046,7 +5084,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009e50, 0x00009e51, 0x00009e52, 0x00009e53,
   /* bc */  0x00009e54, 0x00009e55, 0x00009e56, 0x00009e57,
 
-  /*** Three byte table, leaf: e780xx - offset 0x04195 ***/
+  /*** Three byte table, leaf: e780xx - offset 0x04216 ***/
 
   /* 80 */  0x00009e58, 0x00009e59, 0x00009e5a, 0x00009e5b,
   /* 84 */  0x00009e5c, 0x00009e5d, 0x00009e5e, 0x00009e5f,
@@ -5065,7 +5103,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009e8c, 0x0000e5ae, 0x00009e8d, 0x00009e8e,
   /* bc */  0x00009e8f, 0x00009e90, 0x00009e91, 0x00009e92,
 
-  /*** Three byte table, leaf: e781xx - offset 0x041d5 ***/
+  /*** Three byte table, leaf: e781xx - offset 0x04256 ***/
 
   /* 80 */  0x00009e93, 0x00009e94, 0x00009e95, 0x00009e96,
   /* 84 */  0x00009e97, 0x00009e98, 0x00009e99, 0x00009e9a,
@@ -5084,7 +5122,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bec4, 0x00009ec1, 0x00009ec2, 0x00009ec3,
   /* bc */  0x0000d7c6, 0x00009ec4, 0x0000d4d6, 0x0000b2d3,
 
-  /*** Three byte table, leaf: e782xx - offset 0x04215 ***/
+  /*** Three byte table, leaf: e782xx - offset 0x04296 ***/
 
   /* 80 */  0x0000ecbe, 0x00009ec5, 0x00009ec6, 0x00009ec7,
   /* 84 */  0x00009ec8, 0x0000eac1, 0x00009ec9, 0x00009eca,
@@ -5103,7 +5141,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d5a8, 0x0000b5e3, 0x00009ee9, 0x0000ecc2,
   /* bc */  0x0000c1b6, 0x0000b3e3, 0x00009eea, 0x00009eeb,
 
-  /*** Three byte table, leaf: e783xx - offset 0x04255 ***/
+  /*** Three byte table, leaf: e783xx - offset 0x042d6 ***/
 
   /* 80 */  0x0000ecc3, 0x0000cbb8, 0x0000c0c3, 0x0000ccfe,
   /* 84 */  0x00009eec, 0x00009eed, 0x00009eee, 0x00009eef,
@@ -5122,7 +5160,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009f51, 0x0000c5eb, 0x00009f52, 0x00009f53,
   /* bc */  0x00009f54, 0x0000b7e9, 0x00009f55, 0x00009f56,
 
-  /*** Three byte table, leaf: e784xx - offset 0x04295 ***/
+  /*** Three byte table, leaf: e784xx - offset 0x04316 ***/
 
   /* 80 */  0x00009f57, 0x00009f58, 0x00009f59, 0x00009f5a,
   /* 84 */  0x00009f5b, 0x00009f5c, 0x00009f5d, 0x00009f5e,
@@ -5141,7 +5179,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009f82, 0x00009f83, 0x00009f84, 0x00009f85,
   /* bc */  0x00009f86, 0x00009f87, 0x00009f88, 0x00009f89,
 
-  /*** Three byte table, leaf: e785xx - offset 0x042d5 ***/
+  /*** Three byte table, leaf: e785xx - offset 0x04356 ***/
 
   /* 80 */  0x00009f8a, 0x00009f8b, 0x00009f8c, 0x00009f8d,
   /* 84 */  0x00009f8e, 0x0000ecd1, 0x00009f8f, 0x00009f90,
@@ -5160,7 +5198,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ecd4, 0x00009fb5, 0x0000ecd5, 0x00009fb6,
   /* bc */  0x00009fb7, 0x0000c9bf, 0x00009fb8, 0x00009fb9,
 
-  /*** Three byte table, leaf: e786xx - offset 0x04315 ***/
+  /*** Three byte table, leaf: e786xx - offset 0x04396 ***/
 
   /* 80 */  0x00009fba, 0x00009fbb, 0x00009fbc, 0x00009fbd,
   /* 84 */  0x0000cfa8, 0x00009fbe, 0x00009fbf, 0x00009fc0,
@@ -5179,7 +5217,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x00009fe6, 0x0000ece4, 0x00009fe7, 0x00009fe8,
   /* bc */  0x00009fe9, 0x00009fea, 0x00009feb, 0x00009fec,
 
-  /*** Three byte table, leaf: e787xx - offset 0x04355 ***/
+  /*** Three byte table, leaf: e787xx - offset 0x043d6 ***/
 
   /* 80 */  0x00009fed, 0x00009fee, 0x00009fef, 0x0000c8bc,
   /* 84 */  0x00009ff0, 0x00009ff1, 0x00009ff2, 0x00009ff3,
@@ -5198,7 +5236,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a05e, 0x0000ecde, 0x0000a05f, 0x0000a060,
   /* bc */  0x0000a061, 0x0000a062, 0x0000a063, 0x0000a064,
 
-  /*** Three byte table, leaf: e788xx - offset 0x04395 ***/
+  /*** Three byte table, leaf: e788xx - offset 0x04416 ***/
 
   /* 80 */  0x0000a065, 0x0000a066, 0x0000a067, 0x0000a068,
   /* 84 */  0x0000a069, 0x0000a06a, 0x0000b1ac, 0x0000a06b,
@@ -5217,7 +5255,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b0d6, 0x0000b5f9, 0x0000a094, 0x0000d8b3,
   /* bc */  0x0000a095, 0x0000cbac, 0x0000a096, 0x0000e3dd,
 
-  /*** Three byte table, leaf: e789xx - offset 0x043d5 ***/
+  /*** Three byte table, leaf: e789xx - offset 0x04456 ***/
 
   /* 80 */  0x0000a097, 0x0000a098, 0x0000a099, 0x0000a09a,
   /* 84 */  0x0000a09b, 0x0000a09c, 0x0000a09d, 0x0000c6ac,
@@ -5236,7 +5274,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a0bc, 0x0000ccd8, 0x0000cefe, 0x0000a0bd,
   /* bc */  0x0000a0be, 0x0000a0bf, 0x0000eaf5, 0x0000eaf6,
 
-  /*** Three byte table, leaf: e78axx - offset 0x04415 ***/
+  /*** Three byte table, leaf: e78axx - offset 0x04496 ***/
 
   /* 80 */  0x0000cfac, 0x0000c0e7, 0x0000a0c0, 0x0000a0c1,
   /* 84 */  0x0000eaf7, 0x0000a0c2, 0x0000a0c3, 0x0000a0c4,
@@ -5255,7 +5293,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e1ef, 0x0000d3cc, 0x0000a0e8, 0x0000a0e9,
   /* bc */  0x0000a0ea, 0x0000a0eb, 0x0000a0ec, 0x0000a0ed,
 
-  /*** Three byte table, leaf: e78bxx - offset 0x04455 ***/
+  /*** Three byte table, leaf: e78bxx - offset 0x044d6 ***/
 
   /* 80 */  0x0000a0ee, 0x0000e1f1, 0x0000bff1, 0x0000e1f0,
   /* 84 */  0x0000b5d2, 0x0000a0ef, 0x0000a0f0, 0x0000a0f1,
@@ -5274,7 +5312,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c0ea, 0x0000aa4d, 0x0000e1fe, 0x0000e2a1,
   /* bc */  0x0000c0c7, 0x0000aa4e, 0x0000aa4f, 0x0000aa50,
 
-  /*** Three byte table, leaf: e78cxx - offset 0x04495 ***/
+  /*** Three byte table, leaf: e78cxx - offset 0x04516 ***/
 
   /* 80 */  0x0000aa51, 0x0000e1fb, 0x0000aa52, 0x0000e1fd,
   /* 84 */  0x0000aa53, 0x0000aa54, 0x0000aa55, 0x0000aa56,
@@ -5293,7 +5331,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e2ad, 0x0000e2aa, 0x0000aa72, 0x0000aa73,
   /* bc */  0x0000aa74, 0x0000aa75, 0x0000bbab, 0x0000d4b3,
 
-  /*** Three byte table, leaf: e78dxx - offset 0x044d5 ***/
+  /*** Three byte table, leaf: e78dxx - offset 0x04556 ***/
 
   /* 80 */  0x0000aa76, 0x0000aa77, 0x0000aa78, 0x0000aa79,
   /* 84 */  0x0000aa7a, 0x0000aa7b, 0x0000aa7c, 0x0000aa7d,
@@ -5312,7 +5350,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ab46, 0x0000ab47, 0x0000ab48, 0x0000ab49,
   /* bc */  0x0000ab4a, 0x0000ab4b, 0x0000e2b5, 0x0000ab4c,
 
-  /*** Three byte table, leaf: e78exx - offset 0x04515 ***/
+  /*** Three byte table, leaf: e78exx - offset 0x04596 ***/
 
   /* 80 */  0x0000ab4d, 0x0000ab4e, 0x0000ab4f, 0x0000ab50,
   /* 84 */  0x0000d0fe, 0x0000ab51, 0x0000ab52, 0x0000c2ca,
@@ -5331,7 +5369,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ab73, 0x0000ab74, 0x0000e7f4, 0x0000b2a3,
   /* bc */  0x0000ab75, 0x0000ab76, 0x0000ab77, 0x0000ab78,
 
-  /*** Three byte table, leaf: e78fxx - offset 0x04555 ***/
+  /*** Three byte table, leaf: e78fxx - offset 0x045d6 ***/
 
   /* 80 */  0x0000e7ea, 0x0000ab79, 0x0000e7e6, 0x0000ab7a,
   /* 84 */  0x0000ab7b, 0x0000ab7c, 0x0000ab7d, 0x0000ab7e,
@@ -5350,7 +5388,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ac40, 0x0000ac41, 0x0000ac42, 0x0000ac43,
   /* bc */  0x0000ac44, 0x0000ac45, 0x0000ac46, 0x0000ac47,
 
-  /*** Three byte table, leaf: e790xx - offset 0x04595 ***/
+  /*** Three byte table, leaf: e790xx - offset 0x04616 ***/
 
   /* 80 */  0x0000ac48, 0x0000ac49, 0x0000ac4a, 0x0000c7f2,
   /* 84 */  0x0000ac4b, 0x0000c0c5, 0x0000c0ed, 0x0000ac4c,
@@ -5369,7 +5407,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ac6b, 0x0000ac6c, 0x0000ac6d, 0x0000ac6e,
   /* bc */  0x0000c7ed, 0x0000ac6f, 0x0000ac70, 0x0000ac71,
 
-  /*** Three byte table, leaf: e791xx - offset 0x045d5 ***/
+  /*** Three byte table, leaf: e791xx - offset 0x04656 ***/
 
   /* 80 */  0x0000ac72, 0x0000e8a3, 0x0000ac73, 0x0000ac74,
   /* 84 */  0x0000ac75, 0x0000ac76, 0x0000ac77, 0x0000ac78,
@@ -5388,7 +5426,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ac9e, 0x0000ac9f, 0x0000aca0, 0x0000ad40,
   /* bc */  0x0000ad41, 0x0000ad42, 0x0000e8aa, 0x0000ad43,
 
-  /*** Three byte table, leaf: e792xx - offset 0x04615 ***/
+  /*** Three byte table, leaf: e792xx - offset 0x04696 ***/
 
   /* 80 */  0x0000e8ad, 0x0000e8ae, 0x0000ad44, 0x0000c1a7,
   /* 84 */  0x0000ad45, 0x0000ad46, 0x0000ad47, 0x0000e8af,
@@ -5407,7 +5445,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ad70, 0x0000ad71, 0x0000e8b7, 0x0000ad72,
   /* bc */  0x0000ad73, 0x0000ad74, 0x0000ad75, 0x0000ad76,
 
-  /*** Three byte table, leaf: e793xx - offset 0x04655 ***/
+  /*** Three byte table, leaf: e793xx - offset 0x046d6 ***/
 
   /* 80 */  0x0000ad77, 0x0000ad78, 0x0000ad79, 0x0000ad7a,
   /* 84 */  0x0000ad7b, 0x0000ad7c, 0x0000ad7d, 0x0000ad7e,
@@ -5426,7 +5464,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ae42, 0x0000ae43, 0x0000ae44, 0x0000ae45,
   /* bc */  0x0000ae46, 0x0000ae47, 0x0000ae48, 0x0000eab3,
 
-  /*** Three byte table, leaf: e794xx - offset 0x04695 ***/
+  /*** Three byte table, leaf: e794xx - offset 0x04716 ***/
 
   /* 80 */  0x0000ae49, 0x0000ae4a, 0x0000ae4b, 0x0000ae4c,
   /* 84 */  0x0000d5e7, 0x0000ae4d, 0x0000ae4e, 0x0000ae4f,
@@ -5445,7 +5483,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b5e9, 0x0000ae6a, 0x0000eeae, 0x0000bbad,
   /* bc */  0x0000ae6b, 0x0000ae6c, 0x0000e7de, 0x0000ae6d,
 
-  /*** Three byte table, leaf: e795xx - offset 0x046d5 ***/
+  /*** Three byte table, leaf: e795xx - offset 0x04756 ***/
 
   /* 80 */  0x0000eeaf, 0x0000ae6e, 0x0000ae6f, 0x0000ae70,
   /* 84 */  0x0000ae71, 0x0000b3a9, 0x0000ae72, 0x0000ae73,
@@ -5464,7 +5502,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bbfb, 0x0000eeb5, 0x0000ae96, 0x0000ae97,
   /* bc */  0x0000ae98, 0x0000ae99, 0x0000ae9a, 0x0000e7dc,
 
-  /*** Three byte table, leaf: e796xx - offset 0x04715 ***/
+  /*** Three byte table, leaf: e796xx - offset 0x04796 ***/
 
   /* 80 */  0x0000ae9b, 0x0000ae9c, 0x0000ae9d, 0x0000eeb6,
   /* 84 */  0x0000ae9e, 0x0000ae9f, 0x0000bdae, 0x0000aea0,
@@ -5483,7 +5521,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f0e3, 0x0000d5ee, 0x0000af56, 0x0000af57,
   /* bc */  0x0000ccdb, 0x0000bed2, 0x0000bcb2, 0x0000af58,
 
-  /*** Three byte table, leaf: e797xx - offset 0x04755 ***/
+  /*** Three byte table, leaf: e797xx - offset 0x047d6 ***/
 
   /* 80 */  0x0000af59, 0x0000af5a, 0x0000f0e8, 0x0000f0e7,
   /* 84 */  0x0000f0e4, 0x0000b2a1, 0x0000af5b, 0x0000d6a2,
@@ -5502,7 +5540,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000af76, 0x0000b1d4, 0x0000af77, 0x0000af78,
   /* bc */  0x0000f0f3, 0x0000af79, 0x0000af7a, 0x0000f0f4,
 
-  /*** Three byte table, leaf: e798xx - offset 0x04795 ***/
+  /*** Three byte table, leaf: e798xx - offset 0x04816 ***/
 
   /* 80 */  0x0000f0f6, 0x0000b4e1, 0x0000af7b, 0x0000f0f1,
   /* 84 */  0x0000af7c, 0x0000f0f7, 0x0000af7d, 0x0000af7e,
@@ -5521,7 +5559,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c8b3, 0x0000af9a, 0x0000af9b, 0x0000af9c,
   /* bc */  0x0000f1a2, 0x0000af9d, 0x0000f1ab, 0x0000f1a8,
 
-  /*** Three byte table, leaf: e799xx - offset 0x047d5 ***/
+  /*** Three byte table, leaf: e799xx - offset 0x04856 ***/
 
   /* 80 */  0x0000f1a5, 0x0000af9e, 0x0000af9f, 0x0000f1aa,
   /* 84 */  0x0000afa0, 0x0000b040, 0x0000b041, 0x0000b042,
@@ -5540,7 +5578,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b9ef, 0x0000b06a, 0x0000b06b, 0x0000b5c7,
   /* bc */  0x0000b06c, 0x0000b0d7, 0x0000b0d9, 0x0000b06d,
 
-  /*** Three byte table, leaf: e79axx - offset 0x04815 ***/
+  /*** Three byte table, leaf: e79axx - offset 0x04896 ***/
 
   /* 80 */  0x0000b06e, 0x0000b06f, 0x0000d4ed, 0x0000b070,
   /* 84 */  0x0000b5c4, 0x0000b071, 0x0000bdd4, 0x0000bbca,
@@ -5559,7 +5597,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b097, 0x0000b098, 0x0000b099, 0x0000b09a,
   /* bc */  0x0000b09b, 0x0000b09c, 0x0000b09d, 0x0000c3f3,
 
-  /*** Three byte table, leaf: e79bxx - offset 0x04855 ***/
+  /*** Three byte table, leaf: e79bxx - offset 0x048d6 ***/
 
   /* 80 */  0x0000b09e, 0x0000b09f, 0x0000d3db, 0x0000b0a0,
   /* 84 */  0x0000b140, 0x0000d6d1, 0x0000c5e8, 0x0000b141,
@@ -5578,7 +5616,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cfe0, 0x0000edef, 0x0000b15e, 0x0000b15f,
   /* bc */  0x0000c5ce, 0x0000b160, 0x0000b6dc, 0x0000b161,
 
-  /*** Three byte table, leaf: e79cxx - offset 0x04895 ***/
+  /*** Three byte table, leaf: e79cxx - offset 0x04916 ***/
 
   /* 80 */  0x0000b162, 0x0000caa1, 0x0000b163, 0x0000b164,
   /* 84 */  0x0000eded, 0x0000b165, 0x0000b166, 0x0000edf0,
@@ -5597,7 +5635,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000edf8, 0x0000b187, 0x0000ccf7, 0x0000b188,
   /* bc */  0x0000d1db, 0x0000b189, 0x0000b18a, 0x0000b18b,
 
-  /*** Three byte table, leaf: e79dxx - offset 0x048d5 ***/
+  /*** Three byte table, leaf: e79dxx - offset 0x04956 ***/
 
   /* 80 */  0x0000d7c5, 0x0000d5f6, 0x0000b18c, 0x0000edfc,
   /* 84 */  0x0000b18d, 0x0000b18e, 0x0000b18f, 0x0000edfb,
@@ -5616,7 +5654,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b253, 0x0000b6c3, 0x0000b254, 0x0000b255,
   /* bc */  0x0000b256, 0x0000eea5, 0x0000d8ba, 0x0000eea3,
 
-  /*** Three byte table, leaf: e79exx - offset 0x04915 ***/
+  /*** Three byte table, leaf: e79exx - offset 0x04996 ***/
 
   /* 80 */  0x0000eea6, 0x0000b257, 0x0000b258, 0x0000b259,
   /* 84 */  0x0000c3e9, 0x0000b3f2, 0x0000b25a, 0x0000b25b,
@@ -5635,7 +5673,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b27c, 0x0000b27d, 0x0000b27e, 0x0000d5b0,
   /* bc */  0x0000b280, 0x0000eead, 0x0000b281, 0x0000f6c4,
 
-  /*** Three byte table, leaf: e79fxx - offset 0x04955 ***/
+  /*** Three byte table, leaf: e79fxx - offset 0x049d6 ***/
 
   /* 80 */  0x0000b282, 0x0000b283, 0x0000b284, 0x0000b285,
   /* 84 */  0x0000b286, 0x0000b287, 0x0000b288, 0x0000b289,
@@ -5654,7 +5692,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000edb7, 0x0000b34a, 0x0000b34b, 0x0000b34c,
   /* bc */  0x0000b34d, 0x0000cef9, 0x0000b7af, 0x0000bff3,
 
-  /*** Three byte table, leaf: e7a0xx - offset 0x04995 ***/
+  /*** Three byte table, leaf: e7a0xx - offset 0x04a16 ***/
 
   /* 80 */  0x0000edb8, 0x0000c2eb, 0x0000c9b0, 0x0000b34e,
   /* 84 */  0x0000b34f, 0x0000b350, 0x0000b351, 0x0000b352,
@@ -5673,7 +5711,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d4d2, 0x0000edc1, 0x0000edc2, 0x0000edc3,
   /* bc */  0x0000edc5, 0x0000b36c, 0x0000c0f9, 0x0000b36d,
 
-  /*** Three byte table, leaf: e7a1xx - offset 0x049d5 ***/
+  /*** Three byte table, leaf: e7a1xx - offset 0x04a56 ***/
 
   /* 80 */  0x0000b4a1, 0x0000b36e, 0x0000b36f, 0x0000b370,
   /* 84 */  0x0000b371, 0x0000b9e8, 0x0000b372, 0x0000edd0,
@@ -5692,7 +5730,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b396, 0x0000b397, 0x0000b398, 0x0000b399,
   /* bc */  0x0000c5f0, 0x0000b39a, 0x0000b39b, 0x0000b39c,
 
-  /*** Three byte table, leaf: e7a2xx - offset 0x04a15 ***/
+  /*** Three byte table, leaf: e7a2xx - offset 0x04a96 ***/
 
   /* 80 */  0x0000b39d, 0x0000b39e, 0x0000b39f, 0x0000b3a0,
   /* 84 */  0x0000b440, 0x0000b441, 0x0000b442, 0x0000edd6,
@@ -5711,7 +5749,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b45e, 0x0000eddb, 0x0000b45f, 0x0000b460,
   /* bc */  0x0000b461, 0x0000b462, 0x0000c4eb, 0x0000b463,
 
-  /*** Three byte table, leaf: e7a3xx - offset 0x04a55 ***/
+  /*** Three byte table, leaf: e7a3xx - offset 0x04ad6 ***/
 
   /* 80 */  0x0000b464, 0x0000b4c5, 0x0000b465, 0x0000b466,
   /* 84 */  0x0000b467, 0x0000b0f5, 0x0000b468, 0x0000b469,
@@ -5730,7 +5768,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b48f, 0x0000b490, 0x0000bbc7, 0x0000b491,
   /* bc */  0x0000b492, 0x0000b493, 0x0000b494, 0x0000b495,
 
-  /*** Three byte table, leaf: e7a4xx - offset 0x04a95 ***/
+  /*** Three byte table, leaf: e7a4xx - offset 0x04b16 ***/
 
   /* 80 */  0x0000b496, 0x0000bdb8, 0x0000b497, 0x0000b498,
   /* 84 */  0x0000b499, 0x0000ede2, 0x0000b49a, 0x0000b49b,
@@ -5749,7 +5787,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b567, 0x0000b568, 0x0000cabe, 0x0000ecea,
   /* bc */  0x0000c0f1, 0x0000b569, 0x0000c9e7, 0x0000b56a,
 
-  /*** Three byte table, leaf: e7a5xx - offset 0x04ad5 ***/
+  /*** Three byte table, leaf: e7a5xx - offset 0x04b56 ***/
 
   /* 80 */  0x0000eceb, 0x0000c6ee, 0x0000b56b, 0x0000b56c,
   /* 84 */  0x0000b56d, 0x0000b56e, 0x0000ecec, 0x0000b56f,
@@ -5768,7 +5806,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bbf6, 0x0000b58e, 0x0000ecf7, 0x0000b58f,
   /* bc */  0x0000b590, 0x0000b591, 0x0000b592, 0x0000b593,
 
-  /*** Three byte table, leaf: e7a6xx - offset 0x04b15 ***/
+  /*** Three byte table, leaf: e7a6xx - offset 0x04b96 ***/
 
   /* 80 */  0x0000d9f7, 0x0000bdfb, 0x0000b594, 0x0000b595,
   /* 84 */  0x0000c2bb, 0x0000ecf8, 0x0000b596, 0x0000b597,
@@ -5787,7 +5825,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b662, 0x0000d3ed, 0x0000d8ae, 0x0000c0eb,
   /* bc */  0x0000b663, 0x0000c7dd, 0x0000bacc, 0x0000b664,
 
-  /*** Three byte table, leaf: e7a7xx - offset 0x04b55 ***/
+  /*** Three byte table, leaf: e7a7xx - offset 0x04bd6 ***/
 
   /* 80 */  0x0000d0e3, 0x0000cbbd, 0x0000b665, 0x0000cdba,
   /* 84 */  0x0000b666, 0x0000b667, 0x0000b8d1, 0x0000b668,
@@ -5806,7 +5844,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bdd5, 0x0000b689, 0x0000b68a, 0x0000d2c6,
   /* bc */  0x0000b68b, 0x0000bbe0, 0x0000b68c, 0x0000b68d,
 
-  /*** Three byte table, leaf: e7a8xx - offset 0x04b95 ***/
+  /*** Three byte table, leaf: e7a8xx - offset 0x04c16 ***/
 
   /* 80 */  0x0000cfa1, 0x0000b68e, 0x0000effc, 0x0000effb,
   /* 84 */  0x0000b68f, 0x0000b690, 0x0000eff9, 0x0000b691,
@@ -5825,7 +5863,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b756, 0x0000f0a1, 0x0000b757, 0x0000b5be,
   /* bc */  0x0000bcda, 0x0000bbfc, 0x0000b758, 0x0000b8e5,
 
-  /*** Three byte table, leaf: e7a9xx - offset 0x04bd5 ***/
+  /*** Three byte table, leaf: e7a9xx - offset 0x04c56 ***/
 
   /* 80 */  0x0000b759, 0x0000b75a, 0x0000b75b, 0x0000b75c,
   /* 84 */  0x0000b75d, 0x0000b75e, 0x0000c4c2, 0x0000b75f,
@@ -5844,7 +5882,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f1b6, 0x0000f1b7, 0x0000bfd5, 0x0000b78b,
   /* bc */  0x0000b78c, 0x0000b78d, 0x0000b78e, 0x0000b4a9,
 
-  /*** Three byte table, leaf: e7aaxx - offset 0x04c15 ***/
+  /*** Three byte table, leaf: e7aaxx - offset 0x04c96 ***/
 
   /* 80 */  0x0000f1b8, 0x0000cdbb, 0x0000b78f, 0x0000c7d4,
   /* 84 */  0x0000d5ad, 0x0000b790, 0x0000f1b9, 0x0000b791,
@@ -5863,7 +5901,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b84f, 0x0000b850, 0x0000b851, 0x0000b852,
   /* bc */  0x0000b853, 0x0000b854, 0x0000b855, 0x0000c1fe,
 
-  /*** Three byte table, leaf: e7abxx - offset 0x04c55 ***/
+  /*** Three byte table, leaf: e7abxx - offset 0x04cd6 ***/
 
   /* 80 */  0x0000b856, 0x0000b857, 0x0000b858, 0x0000b859,
   /* 84 */  0x0000b85a, 0x0000b85b, 0x0000b85c, 0x0000b85d,
@@ -5882,7 +5920,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b884, 0x0000d6f1, 0x0000f3c3, 0x0000b885,
   /* bc */  0x0000b886, 0x0000f3c4, 0x0000b887, 0x0000b8cd,
 
-  /*** Three byte table, leaf: e7acxx - offset 0x04c95 ***/
+  /*** Three byte table, leaf: e7acxx - offset 0x04d16 ***/
 
   /* 80 */  0x0000b888, 0x0000b889, 0x0000b88a, 0x0000f3c6,
   /* 84 */  0x0000f3c7, 0x0000b88b, 0x0000b0ca, 0x0000b88c,
@@ -5901,7 +5939,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f3cd, 0x0000b947, 0x0000bce3, 0x0000b948,
   /* bc */  0x0000c1fd, 0x0000b949, 0x0000f3d6, 0x0000b94a,
 
-  /*** Three byte table, leaf: e7adxx - offset 0x04cd5 ***/
+  /*** Three byte table, leaf: e7adxx - offset 0x04d56 ***/
 
   /* 80 */  0x0000b94b, 0x0000b94c, 0x0000b94d, 0x0000b94e,
   /* 84 */  0x0000b94f, 0x0000f3da, 0x0000b950, 0x0000f3cc,
@@ -5920,7 +5958,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b96d, 0x0000b3ef, 0x0000b96e, 0x0000f3e0,
   /* bc */  0x0000b96f, 0x0000b970, 0x0000c7a9, 0x0000b971,
 
-  /*** Three byte table, leaf: e7aexx - offset 0x04d15 ***/
+  /*** Three byte table, leaf: e7aexx - offset 0x04d96 ***/
 
   /* 80 */  0x0000bcf2, 0x0000b972, 0x0000b973, 0x0000b974,
   /* 84 */  0x0000b975, 0x0000f3eb, 0x0000b976, 0x0000b977,
@@ -5939,7 +5977,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f3e7, 0x0000b996, 0x0000b997, 0x0000b998,
   /* bc */  0x0000b999, 0x0000b99a, 0x0000b99b, 0x0000b99c,
 
-  /*** Three byte table, leaf: e7afxx - offset 0x04d55 ***/
+  /*** Three byte table, leaf: e7afxx - offset 0x04dd6 ***/
 
   /* 80 */  0x0000b99d, 0x0000f3f2, 0x0000b99e, 0x0000b99f,
   /* 84 */  0x0000b9a0, 0x0000ba40, 0x0000d7ad, 0x0000c6aa,
@@ -5958,7 +5996,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ba64, 0x0000ba65, 0x0000ba66, 0x0000ba67,
   /* bc */  0x0000f3fb, 0x0000ba68, 0x0000f3fa, 0x0000ba69,
 
-  /*** Three byte table, leaf: e7b0xx - offset 0x04d95 ***/
+  /*** Three byte table, leaf: e7b0xx - offset 0x04e16 ***/
 
   /* 80 */  0x0000ba6a, 0x0000ba6b, 0x0000ba6c, 0x0000ba6d,
   /* 84 */  0x0000ba6e, 0x0000ba6f, 0x0000ba70, 0x0000b4d8,
@@ -5977,7 +6015,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f4a4, 0x0000ba9a, 0x0000ba9b, 0x0000ba9c,
   /* bc */  0x0000ba9d, 0x0000ba9e, 0x0000ba9f, 0x0000b2be,
 
-  /*** Three byte table, leaf: e7b1xx - offset 0x04dd5 ***/
+  /*** Three byte table, leaf: e7b1xx - offset 0x04e56 ***/
 
   /* 80 */  0x0000f4a6, 0x0000f4a5, 0x0000baa0, 0x0000bb40,
   /* 84 */  0x0000bb41, 0x0000bb42, 0x0000bb43, 0x0000bb44,
@@ -5996,7 +6034,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bb72, 0x0000bb73, 0x0000bb74, 0x0000c0e0,
   /* bc */  0x0000f4cc, 0x0000d7d1, 0x0000bb75, 0x0000bb76,
 
-  /*** Three byte table, leaf: e7b2xx - offset 0x04e15 ***/
+  /*** Three byte table, leaf: e7b2xx - offset 0x04e96 ***/
 
   /* 80 */  0x0000bb77, 0x0000bb78, 0x0000bb79, 0x0000bb7a,
   /* 84 */  0x0000bb7b, 0x0000bb7c, 0x0000bb7d, 0x0000bb7e,
@@ -6015,7 +6053,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bb9e, 0x0000b4e2, 0x0000bb9f, 0x0000bba0,
   /* bc */  0x0000f4d4, 0x0000f4d5, 0x0000beab, 0x0000bc40,
 
-  /*** Three byte table, leaf: e7b3xx - offset 0x04e55 ***/
+  /*** Three byte table, leaf: e7b3xx - offset 0x04ed6 ***/
 
   /* 80 */  0x0000bc41, 0x0000f4d6, 0x0000bc42, 0x0000bc43,
   /* 84 */  0x0000bc44, 0x0000f4db, 0x0000bc45, 0x0000f4d7,
@@ -6034,7 +6072,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f4e9, 0x0000bc69, 0x0000bc6a, 0x0000cfb5,
   /* bc */  0x0000bc6b, 0x0000bc6c, 0x0000bc6d, 0x0000bc6e,
 
-  /*** Three byte table, leaf: e7b4xx - offset 0x04e95 ***/
+  /*** Three byte table, leaf: e7b4xx - offset 0x04f16 ***/
 
   /* 80 */  0x0000bc6f, 0x0000bc70, 0x0000bc71, 0x0000bc72,
   /* 84 */  0x0000bc73, 0x0000bc74, 0x0000bc75, 0x0000bc76,
@@ -6053,7 +6091,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bd41, 0x0000bd42, 0x0000bd43, 0x0000bd44,
   /* bc */  0x0000bd45, 0x0000bd46, 0x0000bd47, 0x0000bd48,
 
-  /*** Three byte table, leaf: e7b5xx - offset 0x04ed5 ***/
+  /*** Three byte table, leaf: e7b5xx - offset 0x04f56 ***/
 
   /* 80 */  0x0000bd49, 0x0000bd4a, 0x0000bd4b, 0x0000bd4c,
   /* 84 */  0x0000bd4d, 0x0000bd4e, 0x0000bd4f, 0x0000bd50,
@@ -6072,7 +6110,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bd80, 0x0000bd81, 0x0000bd82, 0x0000bd83,
   /* bc */  0x0000bd84, 0x0000bd85, 0x0000bd86, 0x0000bd87,
 
-  /*** Three byte table, leaf: e7b6xx - offset 0x04f15 ***/
+  /*** Three byte table, leaf: e7b6xx - offset 0x04f96 ***/
 
   /* 80 */  0x0000bd88, 0x0000bd89, 0x0000bd8a, 0x0000bd8b,
   /* 84 */  0x0000bd8c, 0x0000bd8d, 0x0000bd8e, 0x0000bd8f,
@@ -6091,7 +6129,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000be5d, 0x0000be5e, 0x0000be5f, 0x0000be60,
   /* bc */  0x0000be61, 0x0000be62, 0x0000be63, 0x0000be64,
 
-  /*** Three byte table, leaf: e7b7xx - offset 0x04f55 ***/
+  /*** Three byte table, leaf: e7b7xx - offset 0x04fd6 ***/
 
   /* 80 */  0x0000be65, 0x0000be66, 0x0000be67, 0x0000be68,
   /* 84 */  0x0000be69, 0x0000be6a, 0x0000be6b, 0x0000be6c,
@@ -6110,7 +6148,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000be9e, 0x0000be9f, 0x0000bea0, 0x0000bf40,
   /* bc */  0x0000bf41, 0x0000bf42, 0x0000bf43, 0x0000bf44,
 
-  /*** Three byte table, leaf: e7b8xx - offset 0x04f95 ***/
+  /*** Three byte table, leaf: e7b8xx - offset 0x05016 ***/
 
   /* 80 */  0x0000bf45, 0x0000bf46, 0x0000bf47, 0x0000bf48,
   /* 84 */  0x0000bf49, 0x0000bf4a, 0x0000bf4b, 0x0000bf4c,
@@ -6129,7 +6167,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bf7d, 0x0000bf7e, 0x0000bf80, 0x0000f7e3,
   /* bc */  0x0000bf81, 0x0000bf82, 0x0000bf83, 0x0000bf84,
 
-  /*** Three byte table, leaf: e7b9xx - offset 0x04fd5 ***/
+  /*** Three byte table, leaf: e7b9xx - offset 0x05056 ***/
 
   /* 80 */  0x0000bf85, 0x0000b7b1, 0x0000bf86, 0x0000bf87,
   /* 84 */  0x0000bf88, 0x0000bf89, 0x0000bf8a, 0x0000f4ed,
@@ -6148,7 +6186,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c05a, 0x0000c05b, 0x0000c05c, 0x0000c05d,
   /* bc */  0x0000c05e, 0x0000c05f, 0x0000c060, 0x0000c061,
 
-  /*** Three byte table, leaf: e7baxx - offset 0x05015 ***/
+  /*** Three byte table, leaf: e7baxx - offset 0x05096 ***/
 
   /* 80 */  0x0000c062, 0x0000c063, 0x0000d7eb, 0x0000c064,
   /* 84 */  0x0000c065, 0x0000c066, 0x0000c067, 0x0000c068,
@@ -6167,7 +6205,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d6bd, 0x0000cec6, 0x0000b7c4, 0x0000c082,
   /* bc */  0x0000c083, 0x0000c5a6, 0x0000e7a3, 0x0000cfdf,
 
-  /*** Three byte table, leaf: e7bbxx - offset 0x05055 ***/
+  /*** Three byte table, leaf: e7bbxx - offset 0x050d6 ***/
 
   /* 80 */  0x0000e7a4, 0x0000e7a5, 0x0000e7a6, 0x0000c1b7,
   /* 84 */  0x0000d7e9, 0x0000c9f0, 0x0000cfb8, 0x0000d6af,
@@ -6186,7 +6224,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b3f1, 0x0000c087, 0x0000e7b8, 0x0000e7b9,
   /* bc */  0x0000d7db, 0x0000d5c0, 0x0000e7ba, 0x0000c2cc,
 
-  /*** Three byte table, leaf: e7bcxx - offset 0x05095 ***/
+  /*** Three byte table, leaf: e7bcxx - offset 0x05116 ***/
 
   /* 80 */  0x0000d7ba, 0x0000e7bb, 0x0000e7bc, 0x0000e7bd,
   /* 84 */  0x0000bcea, 0x0000c3e5, 0x0000c0c2, 0x0000e7be,
@@ -6205,7 +6243,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b8d7, 0x0000c08c, 0x0000c8b1, 0x0000c08d,
   /* bc */  0x0000c08e, 0x0000c08f, 0x0000c090, 0x0000c091,
 
-  /*** Three byte table, leaf: e7bdxx - offset 0x050d5 ***/
+  /*** Three byte table, leaf: e7bdxx - offset 0x05156 ***/
 
   /* 80 */  0x0000c092, 0x0000c093, 0x0000f3bf, 0x0000c094,
   /* 84 */  0x0000f3c0, 0x0000f3c1, 0x0000c095, 0x0000c096,
@@ -6224,7 +6262,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c155, 0x0000eebe, 0x0000c156, 0x0000c157,
   /* bc */  0x0000c158, 0x0000c159, 0x0000eec0, 0x0000c15a,
 
-  /*** Three byte table, leaf: e7bexx - offset 0x05115 ***/
+  /*** Three byte table, leaf: e7bexx - offset 0x05196 ***/
 
   /* 80 */  0x0000c15b, 0x0000eebf, 0x0000c15c, 0x0000c15d,
   /* 84 */  0x0000c15e, 0x0000c15f, 0x0000c160, 0x0000c161,
@@ -6243,7 +6281,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d9fa, 0x0000b8fe, 0x0000c185, 0x0000c186,
   /* bc */  0x0000e5f1, 0x0000d3f0, 0x0000c187, 0x0000f4e0,
 
-  /*** Three byte table, leaf: e7bfxx - offset 0x05155 ***/
+  /*** Three byte table, leaf: e7bfxx - offset 0x051d6 ***/
 
   /* 80 */  0x0000c188, 0x0000cecc, 0x0000c189, 0x0000c18a,
   /* 84 */  0x0000c18b, 0x0000b3e1, 0x0000c18c, 0x0000c18d,
@@ -6262,7 +6300,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c24d, 0x0000c24e, 0x0000c24f, 0x0000b7ad,
   /* bc */  0x0000d2ed, 0x0000c250, 0x0000c251, 0x0000c252,
 
-  /*** Three byte table, leaf: e880xx - offset 0x05195 ***/
+  /*** Three byte table, leaf: e880xx - offset 0x05216 ***/
 
   /* 80 */  0x0000d2ab, 0x0000c0cf, 0x0000c253, 0x0000bfbc,
   /* 84 */  0x0000eba3, 0x0000d5df, 0x0000eac8, 0x0000c254,
@@ -6281,7 +6319,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cbca, 0x0000c26c, 0x0000c26d, 0x0000b3dc,
   /* bc */  0x0000c26e, 0x0000b5a2, 0x0000c26f, 0x0000b9a2,
 
-  /*** Three byte table, leaf: e881xx - offset 0x051d5 ***/
+  /*** Three byte table, leaf: e881xx - offset 0x05256 ***/
 
   /* 80 */  0x0000c270, 0x0000c271, 0x0000c4f4, 0x0000f1f5,
   /* 84 */  0x0000c272, 0x0000c273, 0x0000f1f6, 0x0000c274,
@@ -6300,7 +6338,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c29b, 0x0000c29c, 0x0000c29d, 0x0000c29e,
   /* bc */  0x0000c29f, 0x0000c2a0, 0x0000c340, 0x0000edb2,
 
-  /*** Three byte table, leaf: e882xx - offset 0x05215 ***/
+  /*** Three byte table, leaf: e882xx - offset 0x05296 ***/
 
   /* 80 */  0x0000edb1, 0x0000c341, 0x0000c342, 0x0000cbe0,
   /* 84 */  0x0000d2de, 0x0000c343, 0x0000cbc1, 0x0000d5d8,
@@ -6319,7 +6357,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c35a, 0x0000c35b, 0x0000b7ce, 0x0000c35c,
   /* bc */  0x0000ebc2, 0x0000ebc4, 0x0000c9f6, 0x0000d6d7,
 
-  /*** Three byte table, leaf: e883xx - offset 0x05255 ***/
+  /*** Three byte table, leaf: e883xx - offset 0x052d6 ***/
 
   /* 80 */  0x0000d5cd, 0x0000d0b2, 0x0000ebcf, 0x0000ceb8,
   /* 84 */  0x0000ebd0, 0x0000c35d, 0x0000b5a8, 0x0000c35e,
@@ -6338,7 +6376,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d0d8, 0x0000c373, 0x0000b0b7, 0x0000c374,
   /* bc */  0x0000ebdd, 0x0000c4dc, 0x0000c375, 0x0000c376,
 
-  /*** Three byte table, leaf: e884xx - offset 0x05295 ***/
+  /*** Three byte table, leaf: e884xx - offset 0x05316 ***/
 
   /* 80 */  0x0000c377, 0x0000c378, 0x0000d6ac, 0x0000c379,
   /* 84 */  0x0000c37a, 0x0000c37b, 0x0000b4e0, 0x0000c37c,
@@ -6357,7 +6395,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c1b3, 0x0000c39b, 0x0000c39c, 0x0000c39d,
   /* bc */  0x0000c39e, 0x0000c39f, 0x0000c6a2, 0x0000c3a0,
 
-  /*** Three byte table, leaf: e885xx - offset 0x052d5 ***/
+  /*** Three byte table, leaf: e885xx - offset 0x05356 ***/
 
   /* 80 */  0x0000c440, 0x0000c441, 0x0000c442, 0x0000c443,
   /* 84 */  0x0000c444, 0x0000c445, 0x0000ccf3, 0x0000c446,
@@ -6376,7 +6414,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c463, 0x0000b8b9, 0x0000cfd9, 0x0000c4e5,
   /* bc */  0x0000ebef, 0x0000ebf0, 0x0000ccda, 0x0000cdc8,
 
-  /*** Three byte table, leaf: e886xx - offset 0x05315 ***/
+  /*** Three byte table, leaf: e886xx - offset 0x05396 ***/
 
   /* 80 */  0x0000b0f2, 0x0000c464, 0x0000ebf6, 0x0000c465,
   /* 84 */  0x0000c466, 0x0000c467, 0x0000c468, 0x0000c469,
@@ -6395,7 +6433,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c48e, 0x0000c48f, 0x0000e2df, 0x0000ebfe,
   /* bc */  0x0000c490, 0x0000c491, 0x0000c492, 0x0000c493,
 
-  /*** Three byte table, leaf: e887xx - offset 0x05355 ***/
+  /*** Three byte table, leaf: e887xx - offset 0x053d6 ***/
 
   /* 80 */  0x0000cdce, 0x0000eca1, 0x0000b1db, 0x0000d3b7,
   /* 84 */  0x0000c494, 0x0000c495, 0x0000d2dc, 0x0000c496,
@@ -6414,7 +6452,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c55d, 0x0000c55e, 0x0000c55f, 0x0000d5e9,
   /* bc */  0x0000beca, 0x0000c560, 0x0000f4a7, 0x0000c561,
 
-  /*** Three byte table, leaf: e888xx - offset 0x05395 ***/
+  /*** Three byte table, leaf: e888xx - offset 0x05416 ***/
 
   /* 80 */  0x0000d2a8, 0x0000f4a8, 0x0000f4a9, 0x0000c562,
   /* 84 */  0x0000f4aa, 0x0000becb, 0x0000d3df, 0x0000c563,
@@ -6433,7 +6471,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f4b4, 0x0000b4ac, 0x0000c57b, 0x0000f4b5,
   /* bc */  0x0000c57c, 0x0000c57d, 0x0000f4b8, 0x0000c57e,
 
-  /*** Three byte table, leaf: e889xx - offset 0x053d5 ***/
+  /*** Three byte table, leaf: e889xx - offset 0x05456 ***/
 
   /* 80 */  0x0000c580, 0x0000c581, 0x0000c582, 0x0000c583,
   /* 84 */  0x0000f4b9, 0x0000c584, 0x0000c585, 0x0000cda7,
@@ -6452,7 +6490,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c648, 0x0000dcb3, 0x0000d2d5, 0x0000c649,
   /* bc */  0x0000c64a, 0x0000dcb4, 0x0000b0ac, 0x0000dcb5,
 
-  /*** Three byte table, leaf: e88axx - offset 0x05415 ***/
+  /*** Three byte table, leaf: e88axx - offset 0x05496 ***/
 
   /* 80 */  0x0000c64b, 0x0000c64c, 0x0000bdda, 0x0000c64d,
   /* 84 */  0x0000dcb9, 0x0000c64e, 0x0000c64f, 0x0000c650,
@@ -6471,7 +6509,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000dcbf, 0x0000c7db, 0x0000c662, 0x0000c663,
   /* bc */  0x0000c664, 0x0000d1bf, 0x0000dcc0, 0x0000c665,
 
-  /*** Three byte table, leaf: e88bxx - offset 0x05455 ***/
+  /*** Three byte table, leaf: e88bxx - offset 0x054d6 ***/
 
   /* 80 */  0x0000c666, 0x0000dcca, 0x0000c667, 0x0000c668,
   /* 84 */  0x0000dcd0, 0x0000c669, 0x0000c66a, 0x0000cead,
@@ -6490,7 +6528,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c67e, 0x0000c6bb, 0x0000c680, 0x0000dcde,
   /* bc */  0x0000c681, 0x0000c682, 0x0000c683, 0x0000c684,
 
-  /*** Three byte table, leaf: e88cxx - offset 0x05495 ***/
+  /*** Three byte table, leaf: e88cxx - offset 0x05516 ***/
 
   /* 80 */  0x0000c685, 0x0000d7c2, 0x0000c3af, 0x0000b7b6,
   /* 84 */  0x0000c7d1, 0x0000c3a9, 0x0000dce2, 0x0000dcd8,
@@ -6509,7 +6547,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c8d7, 0x0000c8e3, 0x0000dcfb, 0x0000c69f,
   /* bc */  0x0000dced, 0x0000c6a0, 0x0000c740, 0x0000c741,
 
-  /*** Three byte table, leaf: e88dxx - offset 0x054d5 ***/
+  /*** Three byte table, leaf: e88dxx - offset 0x05556 ***/
 
   /* 80 */  0x0000dcf7, 0x0000c742, 0x0000c743, 0x0000dcf5,
   /* 84 */  0x0000c744, 0x0000c745, 0x0000bea3, 0x0000dcf4,
@@ -6528,7 +6566,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000dda9, 0x0000c75b, 0x0000c75c, 0x0000ddb6,
   /* bc */  0x0000ddb1, 0x0000ddb4, 0x0000c75d, 0x0000c75e,
 
-  /*** Three byte table, leaf: e88exx - offset 0x05515 ***/
+  /*** Three byte table, leaf: e88exx - offset 0x05596 ***/
 
   /* 80 */  0x0000c75f, 0x0000c760, 0x0000c761, 0x0000c762,
   /* 84 */  0x0000c763, 0x0000ddb0, 0x0000c6ce, 0x0000c764,
@@ -6547,7 +6585,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ddb5, 0x0000d3a8, 0x0000ddba, 0x0000c782,
   /* bc */  0x0000ddbb, 0x0000c3a7, 0x0000c783, 0x0000c784,
 
-  /*** Three byte table, leaf: e88fxx - offset 0x05555 ***/
+  /*** Three byte table, leaf: e88fxx - offset 0x055d6 ***/
 
   /* 80 */  0x0000ddd2, 0x0000ddbc, 0x0000c785, 0x0000c786,
   /* 84 */  0x0000c787, 0x0000ddd1, 0x0000c788, 0x0000b9bd,
@@ -6566,7 +6604,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ddce, 0x0000ddcf, 0x0000c847, 0x0000c848,
   /* bc */  0x0000c849, 0x0000ddc4, 0x0000c84a, 0x0000c84b,
 
-  /*** Three byte table, leaf: e890xx - offset 0x05595 ***/
+  /*** Three byte table, leaf: e890xx - offset 0x05616 ***/
 
   /* 80 */  0x0000c84c, 0x0000ddbd, 0x0000c84d, 0x0000ddcd,
   /* 84 */  0x0000ccd1, 0x0000c84e, 0x0000ddc9, 0x0000c84f,
@@ -6585,7 +6623,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ddc7, 0x0000c871, 0x0000c872, 0x0000c873,
   /* bc */  0x0000dde0, 0x0000c2e4, 0x0000c874, 0x0000c875,
 
-  /*** Three byte table, leaf: e891xx - offset 0x055d5 ***/
+  /*** Three byte table, leaf: e891xx - offset 0x05656 ***/
 
   /* 80 */  0x0000c876, 0x0000c877, 0x0000c878, 0x0000c879,
   /* 84 */  0x0000c87a, 0x0000c87b, 0x0000dde1, 0x0000c87c,
@@ -6604,7 +6642,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000dddf, 0x0000c89e, 0x0000dddd, 0x0000c89f,
   /* bc */  0x0000c8a0, 0x0000c940, 0x0000c941, 0x0000c942,
 
-  /*** Three byte table, leaf: e892xx - offset 0x05615 ***/
+  /*** Three byte table, leaf: e892xx - offset 0x05696 ***/
 
   /* 80 */  0x0000c943, 0x0000c944, 0x0000b5d9, 0x0000c945,
   /* 84 */  0x0000c946, 0x0000c947, 0x0000c948, 0x0000dddb,
@@ -6623,7 +6661,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d5f4, 0x0000ddf3, 0x0000ddf0, 0x0000c96d,
   /* bc */  0x0000c96e, 0x0000ddec, 0x0000c96f, 0x0000ddef,
 
-  /*** Three byte table, leaf: e893xx - offset 0x05655 ***/
+  /*** Three byte table, leaf: e893xx - offset 0x056d6 ***/
 
   /* 80 */  0x0000c970, 0x0000dde8, 0x0000c971, 0x0000c972,
   /* 84 */  0x0000d0ee, 0x0000c973, 0x0000c974, 0x0000c975,
@@ -6642,7 +6680,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c998, 0x0000c999, 0x0000c99a, 0x0000c99b,
   /* bc */  0x0000dea4, 0x0000c99c, 0x0000c99d, 0x0000dea3,
 
-  /*** Three byte table, leaf: e894xx - offset 0x05695 ***/
+  /*** Three byte table, leaf: e894xx - offset 0x05716 ***/
 
   /* 80 */  0x0000c99e, 0x0000c99f, 0x0000c9a0, 0x0000ca40,
   /* 84 */  0x0000ca41, 0x0000ca42, 0x0000ca43, 0x0000ca44,
@@ -6661,7 +6699,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ddfa, 0x0000ddfc, 0x0000ddfe, 0x0000dea2,
   /* bc */  0x0000b0aa, 0x0000b1ce, 0x0000ca6b, 0x0000ca6c,
 
-  /*** Three byte table, leaf: e895xx - offset 0x056d5 ***/
+  /*** Three byte table, leaf: e895xx - offset 0x05756 ***/
 
   /* 80 */  0x0000ca6d, 0x0000ca6e, 0x0000ca6f, 0x0000deac,
   /* 84 */  0x0000ca70, 0x0000ca71, 0x0000ca72, 0x0000ca73,
@@ -6680,7 +6718,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ca9b, 0x0000deb3, 0x0000deaa, 0x0000deae,
   /* bc */  0x0000ca9c, 0x0000ca9d, 0x0000c0d9, 0x0000ca9e,
 
-  /*** Three byte table, leaf: e896xx - offset 0x05715 ***/
+  /*** Three byte table, leaf: e896xx - offset 0x05796 ***/
 
   /* 80 */  0x0000ca9f, 0x0000caa0, 0x0000cb40, 0x0000cb41,
   /* 84 */  0x0000b1a1, 0x0000deb6, 0x0000cb42, 0x0000deb1,
@@ -6699,7 +6737,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cb69, 0x0000deb7, 0x0000cb6a, 0x0000cb6b,
   /* bc */  0x0000cb6c, 0x0000cb6d, 0x0000cb6e, 0x0000cb6f,
 
-  /*** Three byte table, leaf: e897xx - offset 0x05755 ***/
+  /*** Three byte table, leaf: e897xx - offset 0x057d6 ***/
 
   /* 80 */  0x0000cb70, 0x0000debb, 0x0000cb71, 0x0000cb72,
   /* 84 */  0x0000cb73, 0x0000cb74, 0x0000cb75, 0x0000cb76,
@@ -6718,7 +6756,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cba0, 0x0000cc40, 0x0000cc41, 0x0000d4e5,
   /* bc */  0x0000cc42, 0x0000cc43, 0x0000cc44, 0x0000debd,
 
-  /*** Three byte table, leaf: e898xx - offset 0x05795 ***/
+  /*** Three byte table, leaf: e898xx - offset 0x05816 ***/
 
   /* 80 */  0x0000cc45, 0x0000cc46, 0x0000cc47, 0x0000cc48,
   /* 84 */  0x0000cc49, 0x0000debf, 0x0000cc4a, 0x0000cc4b,
@@ -6737,7 +6775,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d5ba, 0x0000cc78, 0x0000cc79, 0x0000cc7a,
   /* bc */  0x0000dec2, 0x0000cc7b, 0x0000cc7c, 0x0000cc7d,
 
-  /*** Three byte table, leaf: e899xx - offset 0x057d5 ***/
+  /*** Three byte table, leaf: e899xx - offset 0x05856 ***/
 
   /* 80 */  0x0000cc7e, 0x0000cc80, 0x0000cc81, 0x0000cc82,
   /* 84 */  0x0000cc83, 0x0000cc84, 0x0000cc85, 0x0000cc86,
@@ -6756,7 +6794,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cd49, 0x0000bae7, 0x0000f2b3, 0x0000f2b5,
   /* bc */  0x0000f2b4, 0x0000cbe4, 0x0000cfba, 0x0000f2b2,
 
-  /*** Three byte table, leaf: e89axx - offset 0x05815 ***/
+  /*** Three byte table, leaf: e89axx - offset 0x05896 ***/
 
   /* 80 */  0x0000cab4, 0x0000d2cf, 0x0000c2ec, 0x0000cd4a,
   /* 84 */  0x0000cd4b, 0x0000cd4c, 0x0000cd4d, 0x0000cd4e,
@@ -6775,7 +6813,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cd6a, 0x0000cd6b, 0x0000f2c5, 0x0000cd6c,
   /* bc */  0x0000cd6d, 0x0000cd6e, 0x0000cd6f, 0x0000cd70,
 
-  /*** Three byte table, leaf: e89bxx - offset 0x05855 ***/
+  /*** Three byte table, leaf: e89bxx - offset 0x058d6 ***/
 
   /* 80 */  0x0000d6fb, 0x0000cd71, 0x0000cd72, 0x0000cd73,
   /* 84 */  0x0000f2c1, 0x0000cd74, 0x0000c7f9, 0x0000c9df,
@@ -6794,7 +6832,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f2d9, 0x0000d3bc, 0x0000cd90, 0x0000cd91,
   /* bc */  0x0000cd92, 0x0000cd93, 0x0000b6ea, 0x0000cd94,
 
-  /*** Three byte table, leaf: e89cxx - offset 0x05895 ***/
+  /*** Three byte table, leaf: e89cxx - offset 0x05916 ***/
 
   /* 80 */  0x0000caf1, 0x0000cd95, 0x0000b7e4, 0x0000f2d7,
   /* 84 */  0x0000cd96, 0x0000cd97, 0x0000cd98, 0x0000f2d8,
@@ -6813,7 +6851,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ce53, 0x0000ce54, 0x0000ce55, 0x0000f2df,
   /* bc */  0x0000ce56, 0x0000ce57, 0x0000f2e4, 0x0000f2ea,
 
-  /*** Three byte table, leaf: e89dxx - offset 0x058d5 ***/
+  /*** Three byte table, leaf: e89dxx - offset 0x05956 ***/
 
   /* 80 */  0x0000ce58, 0x0000ce59, 0x0000ce5a, 0x0000ce5b,
   /* 84 */  0x0000ce5c, 0x0000ce5d, 0x0000ce5e, 0x0000d3ac,
@@ -6832,7 +6870,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ce81, 0x0000ce82, 0x0000ce83, 0x0000f2ef,
   /* bc */  0x0000f2f7, 0x0000f2ed, 0x0000f2ee, 0x0000ce84,
 
-  /*** Three byte table, leaf: e89exx - offset 0x05915 ***/
+  /*** Three byte table, leaf: e89exx - offset 0x05996 ***/
 
   /* 80 */  0x0000ce85, 0x0000ce86, 0x0000f2eb, 0x0000f3a6,
   /* 84 */  0x0000ce87, 0x0000f3a3, 0x0000ce88, 0x0000ce89,
@@ -6851,7 +6889,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cf4c, 0x0000cf4d, 0x0000c2dd, 0x0000cf4e,
   /* bc */  0x0000cf4f, 0x0000f3ae, 0x0000cf50, 0x0000cf51,
 
-  /*** Three byte table, leaf: e89fxx - offset 0x05955 ***/
+  /*** Three byte table, leaf: e89fxx - offset 0x059d6 ***/
 
   /* 80 */  0x0000f3b0, 0x0000cf52, 0x0000cf53, 0x0000cf54,
   /* 84 */  0x0000cf55, 0x0000cf56, 0x0000f3a1, 0x0000cf57,
@@ -6870,7 +6908,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cf7e, 0x0000d0b7, 0x0000cf80, 0x0000cf81,
   /* bc */  0x0000cf82, 0x0000cf83, 0x0000f3b8, 0x0000cf84,
 
-  /*** Three byte table, leaf: e8a0xx - offset 0x05995 ***/
+  /*** Three byte table, leaf: e8a0xx - offset 0x05a16 ***/
 
   /* 80 */  0x0000cf85, 0x0000cf86, 0x0000cf87, 0x0000d9f9,
   /* 84 */  0x0000cf88, 0x0000cf89, 0x0000cf8a, 0x0000cf8b,
@@ -6889,7 +6927,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d053, 0x0000f3bc, 0x0000d054, 0x0000d055,
   /* bc */  0x0000f3bd, 0x0000d056, 0x0000d057, 0x0000d058,
 
-  /*** Three byte table, leaf: e8a1xx - offset 0x059d5 ***/
+  /*** Three byte table, leaf: e8a1xx - offset 0x05a56 ***/
 
   /* 80 */  0x0000d1aa, 0x0000d059, 0x0000d05a, 0x0000d05b,
   /* 84 */  0x0000f4ac, 0x0000d0c6, 0x0000d05c, 0x0000d05d,
@@ -6908,7 +6946,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d07c, 0x0000d07d, 0x0000d07e, 0x0000d080,
   /* bc */  0x0000d081, 0x0000f1c5, 0x0000f4c0, 0x0000f1c6,
 
-  /*** Three byte table, leaf: e8a2xx - offset 0x05a15 ***/
+  /*** Three byte table, leaf: e8a2xx - offset 0x05a96 ***/
 
   /* 80 */  0x0000d082, 0x0000d4ac, 0x0000f1c7, 0x0000d083,
   /* 84 */  0x0000b0c0, 0x0000f4c1, 0x0000d084, 0x0000d085,
@@ -6927,7 +6965,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d149, 0x0000d14a, 0x0000d14b, 0x0000d14c,
   /* bc */  0x0000f1cb, 0x0000d14d, 0x0000d14e, 0x0000d14f,
 
-  /*** Three byte table, leaf: e8a3xx - offset 0x05a55 ***/
+  /*** Three byte table, leaf: e8a3xx - offset 0x05ad6 ***/
 
   /* 80 */  0x0000d150, 0x0000b2c3, 0x0000c1d1, 0x0000d151,
   /* 84 */  0x0000d152, 0x0000d7b0, 0x0000f1c9, 0x0000d153,
@@ -6946,7 +6984,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c2e3, 0x0000b9fc, 0x0000d173, 0x0000d174,
   /* bc */  0x0000f1d3, 0x0000d175, 0x0000f1d5, 0x0000d176,
 
-  /*** Three byte table, leaf: e8a4xx - offset 0x05a95 ***/
+  /*** Three byte table, leaf: e8a4xx - offset 0x05b16 ***/
 
   /* 80 */  0x0000d177, 0x0000d178, 0x0000b9d3, 0x0000d179,
   /* 84 */  0x0000d17a, 0x0000d17b, 0x0000d17c, 0x0000d17d,
@@ -6965,7 +7003,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d240, 0x0000d241, 0x0000d242, 0x0000d243,
   /* bc */  0x0000d244, 0x0000d245, 0x0000d246, 0x0000d247,
 
-  /*** Three byte table, leaf: e8a5xx - offset 0x05ad5 ***/
+  /*** Three byte table, leaf: e8a5xx - offset 0x05b56 ***/
 
   /* 80 */  0x0000d248, 0x0000f1df, 0x0000d249, 0x0000d24a,
   /* 84 */  0x0000cfe5, 0x0000d24b, 0x0000d24c, 0x0000d24d,
@@ -6984,7 +7022,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d27b, 0x0000d27c, 0x0000d27d, 0x0000f1e1,
   /* bc */  0x0000d27e, 0x0000d280, 0x0000d281, 0x0000cef7,
 
-  /*** Three byte table, leaf: e8a6xx - offset 0x05b15 ***/
+  /*** Three byte table, leaf: e8a6xx - offset 0x05b96 ***/
 
   /* 80 */  0x0000d282, 0x0000d2aa, 0x0000d283, 0x0000f1fb,
   /* 84 */  0x0000d284, 0x0000d285, 0x0000b8b2, 0x0000d286,
@@ -7003,7 +7041,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d356, 0x0000d357, 0x0000d358, 0x0000d359,
   /* bc */  0x0000d35a, 0x0000d35b, 0x0000d35c, 0x0000d35d,
 
-  /*** Three byte table, leaf: e8a7xx - offset 0x05b55 ***/
+  /*** Three byte table, leaf: e8a7xx - offset 0x05bd6 ***/
 
   /* 80 */  0x0000d35e, 0x0000bcfb, 0x0000b9db, 0x0000d35f,
   /* 84 */  0x0000b9e6, 0x0000c3d9, 0x0000cad3, 0x0000eae8,
@@ -7022,7 +7060,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d37c, 0x0000d37d, 0x0000d37e, 0x0000d380,
   /* bc */  0x0000d381, 0x0000d382, 0x0000d383, 0x0000d384,
 
-  /*** Three byte table, leaf: e8a8xx - offset 0x05b95 ***/
+  /*** Three byte table, leaf: e8a8xx - offset 0x05c16 ***/
 
   /* 80 */  0x0000d1d4, 0x0000d385, 0x0000d386, 0x0000d387,
   /* 84 */  0x0000d388, 0x0000d389, 0x0000d38a, 0x0000d9ea,
@@ -7041,7 +7079,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d45a, 0x0000d45b, 0x0000d45c, 0x0000d45d,
   /* bc */  0x0000d45e, 0x0000d45f, 0x0000f6a4, 0x0000d460,
 
-  /*** Three byte table, leaf: e8a9xx - offset 0x05bd5 ***/
+  /*** Three byte table, leaf: e8a9xx - offset 0x05c56 ***/
 
   /* 80 */  0x0000d461, 0x0000d462, 0x0000d463, 0x0000d464,
   /* 84 */  0x0000d465, 0x0000d466, 0x0000d467, 0x0000d468,
@@ -7060,7 +7098,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d499, 0x0000d5b2, 0x0000d49a, 0x0000d49b,
   /* bc */  0x0000d49c, 0x0000d49d, 0x0000d49e, 0x0000d49f,
 
-  /*** Three byte table, leaf: e8aaxx - offset 0x05c15 ***/
+  /*** Three byte table, leaf: e8aaxx - offset 0x05c96 ***/
 
   /* 80 */  0x0000d4a0, 0x0000d540, 0x0000d541, 0x0000d542,
   /* 84 */  0x0000d543, 0x0000d544, 0x0000d545, 0x0000d546,
@@ -7079,7 +7117,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d574, 0x0000d575, 0x0000d576, 0x0000d577,
   /* bc */  0x0000d578, 0x0000d579, 0x0000d57a, 0x0000d57b,
 
-  /*** Three byte table, leaf: e8abxx - offset 0x05c55 ***/
+  /*** Three byte table, leaf: e8abxx - offset 0x05cd6 ***/
 
   /* 80 */  0x0000d57c, 0x0000d57d, 0x0000d57e, 0x0000d580,
   /* 84 */  0x0000d581, 0x0000d582, 0x0000d583, 0x0000d584,
@@ -7098,7 +7136,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d654, 0x0000d655, 0x0000d656, 0x0000d657,
   /* bc */  0x0000d658, 0x0000d659, 0x0000d65a, 0x0000d65b,
 
-  /*** Three byte table, leaf: e8acxx - offset 0x05c95 ***/
+  /*** Three byte table, leaf: e8acxx - offset 0x05d16 ***/
 
   /* 80 */  0x0000d65c, 0x0000d65d, 0x0000d65e, 0x0000d65f,
   /* 84 */  0x0000d660, 0x0000d661, 0x0000d662, 0x0000e5c0,
@@ -7117,7 +7155,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d693, 0x0000d694, 0x0000d695, 0x0000d696,
   /* bc */  0x0000d697, 0x0000d698, 0x0000d699, 0x0000d69a,
 
-  /*** Three byte table, leaf: e8adxx - offset 0x05cd5 ***/
+  /*** Three byte table, leaf: e8adxx - offset 0x05d56 ***/
 
   /* 80 */  0x0000d69b, 0x0000d69c, 0x0000d69d, 0x0000d69e,
   /* 84 */  0x0000d69f, 0x0000d6a0, 0x0000d740, 0x0000d741,
@@ -7136,7 +7174,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d770, 0x0000d771, 0x0000d772, 0x0000d773,
   /* bc */  0x0000d774, 0x0000d775, 0x0000d776, 0x0000d777,
 
-  /*** Three byte table, leaf: e8aexx - offset 0x05d15 ***/
+  /*** Three byte table, leaf: e8aexx - offset 0x05d96 ***/
 
   /* 80 */  0x0000d778, 0x0000d779, 0x0000d77a, 0x0000d77b,
   /* 84 */  0x0000d77c, 0x0000d77d, 0x0000d77e, 0x0000d780,
@@ -7155,7 +7193,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d0ed, 0x0000b6ef, 0x0000c2db, 0x0000d79b,
   /* bc */  0x0000cbcf, 0x0000b7ed, 0x0000c9e8, 0x0000b7c3,
 
-  /*** Three byte table, leaf: e8afxx - offset 0x05d55 ***/
+  /*** Three byte table, leaf: e8afxx - offset 0x05dd6 ***/
 
   /* 80 */  0x0000bef7, 0x0000d6a4, 0x0000daac, 0x0000daad,
   /* 84 */  0x0000c6c0, 0x0000d7e7, 0x0000cab6, 0x0000d79c,
@@ -7174,7 +7212,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d6ee, 0x0000dac1, 0x0000c5b5, 0x0000b6c1,
   /* bc */  0x0000dac2, 0x0000b7cc, 0x0000bfce, 0x0000dac3,
 
-  /*** Three byte table, leaf: e8b0xx - offset 0x05d95 ***/
+  /*** Three byte table, leaf: e8b0xx - offset 0x05e16 ***/
 
   /* 80 */  0x0000dac4, 0x0000cbad, 0x0000dac5, 0x0000b5f7,
   /* 84 */  0x0000dac6, 0x0000c1c2, 0x0000d7bb, 0x0000dac7,
@@ -7193,7 +7231,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d840, 0x0000d841, 0x0000d842, 0x0000d843,
   /* bc */  0x0000d844, 0x0000d845, 0x0000d846, 0x0000d847,
 
-  /*** Three byte table, leaf: e8b1xx - offset 0x05dd5 ***/
+  /*** Three byte table, leaf: e8b1xx - offset 0x05e56 ***/
 
   /* 80 */  0x0000d848, 0x0000bbed, 0x0000d849, 0x0000d84a,
   /* 84 */  0x0000d84b, 0x0000d84c, 0x0000b6b9, 0x0000f4f8,
@@ -7212,7 +7250,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f5f4, 0x0000b1aa, 0x0000b2f2, 0x0000d874,
   /* bc */  0x0000d875, 0x0000d876, 0x0000d877, 0x0000d878,
 
-  /*** Three byte table, leaf: e8b2xx - offset 0x05e15 ***/
+  /*** Three byte table, leaf: e8b2xx - offset 0x05e96 ***/
 
   /* 80 */  0x0000d879, 0x0000d87a, 0x0000f5f5, 0x0000d87b,
   /* 84 */  0x0000d87c, 0x0000f5f7, 0x0000d87d, 0x0000d87e,
@@ -7231,7 +7269,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d94a, 0x0000d94b, 0x0000d94c, 0x0000d94d,
   /* bc */  0x0000d94e, 0x0000d94f, 0x0000d950, 0x0000d951,
 
-  /*** Three byte table, leaf: e8b3xx - offset 0x05e55 ***/
+  /*** Three byte table, leaf: e8b3xx - offset 0x05ed6 ***/
 
   /* 80 */  0x0000d952, 0x0000d953, 0x0000d954, 0x0000d955,
   /* 84 */  0x0000d956, 0x0000d957, 0x0000d958, 0x0000d959,
@@ -7250,7 +7288,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d98b, 0x0000d98c, 0x0000d98d, 0x0000d98e,
   /* bc */  0x0000d98f, 0x0000d990, 0x0000d991, 0x0000d992,
 
-  /*** Three byte table, leaf: e8b4xx - offset 0x05e95 ***/
+  /*** Three byte table, leaf: e8b4xx - offset 0x05f16 ***/
 
   /* 80 */  0x0000d993, 0x0000d994, 0x0000d995, 0x0000d996,
   /* 84 */  0x0000d997, 0x0000d998, 0x0000d999, 0x0000d99a,
@@ -7269,7 +7307,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000c3b3, 0x0000b7d1, 0x0000bad8, 0x0000eadd,
   /* bc */  0x0000d4f4, 0x0000eade, 0x0000bcd6, 0x0000bbdf,
 
-  /*** Three byte table, leaf: e8b5xx - offset 0x05ed5 ***/
+  /*** Three byte table, leaf: e8b5xx - offset 0x05f56 ***/
 
   /* 80 */  0x0000eadf, 0x0000c1de, 0x0000c2b8, 0x0000d4df,
   /* 84 */  0x0000d7ca, 0x0000eae0, 0x0000eae1, 0x0000eae4,
@@ -7288,7 +7326,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000da5d, 0x0000da5e, 0x0000da5f, 0x0000da60,
   /* bc */  0x0000da61, 0x0000da62, 0x0000da63, 0x0000da64,
 
-  /*** Three byte table, leaf: e8b6xx - offset 0x05f15 ***/
+  /*** Three byte table, leaf: e8b6xx - offset 0x05f96 ***/
 
   /* 80 */  0x0000da65, 0x0000b3c3, 0x0000da66, 0x0000da67,
   /* 84 */  0x0000f4f2, 0x0000b3ac, 0x0000da68, 0x0000da69,
@@ -7307,7 +7345,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f5bb, 0x0000da91, 0x0000f5c3, 0x0000da92,
   /* bc */  0x0000f5c2, 0x0000da93, 0x0000d6ba, 0x0000f5c1,
 
-  /*** Three byte table, leaf: e8b7xx - offset 0x05f55 ***/
+  /*** Three byte table, leaf: e8b7xx - offset 0x05fd6 ***/
 
   /* 80 */  0x0000da94, 0x0000da95, 0x0000da96, 0x0000d4be,
   /* 84 */  0x0000f5c4, 0x0000da97, 0x0000f5cc, 0x0000da98,
@@ -7326,7 +7364,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f5cf, 0x0000f5d1, 0x0000b6e5, 0x0000f5d2,
   /* bc */  0x0000db52, 0x0000f5d5, 0x0000db53, 0x0000db54,
 
-  /*** Three byte table, leaf: e8b8xx - offset 0x05f95 ***/
+  /*** Three byte table, leaf: e8b8xx - offset 0x06016 ***/
 
   /* 80 */  0x0000db55, 0x0000db56, 0x0000db57, 0x0000db58,
   /* 84 */  0x0000db59, 0x0000f5bd, 0x0000db5a, 0x0000db5b,
@@ -7345,7 +7383,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000db7b, 0x0000f5df, 0x0000f5dd, 0x0000db7c,
   /* bc */  0x0000db7d, 0x0000f5e1, 0x0000db7e, 0x0000db80,
 
-  /*** Three byte table, leaf: e8b9xx - offset 0x05fd5 ***/
+  /*** Three byte table, leaf: e8b9xx - offset 0x06056 ***/
 
   /* 80 */  0x0000f5de, 0x0000f5e4, 0x0000f5e5, 0x0000db81,
   /* 84 */  0x0000cce3, 0x0000db82, 0x0000db83, 0x0000e5bf,
@@ -7364,7 +7402,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000dc43, 0x0000dc44, 0x0000dc45, 0x0000dc46,
   /* bc */  0x0000f5eb, 0x0000dc47, 0x0000dc48, 0x0000b4da,
 
-  /*** Three byte table, leaf: e8baxx - offset 0x06015 ***/
+  /*** Three byte table, leaf: e8baxx - offset 0x06096 ***/
 
   /* 80 */  0x0000dc49, 0x0000d4ea, 0x0000dc4a, 0x0000dc4b,
   /* 84 */  0x0000dc4c, 0x0000f5ee, 0x0000dc4d, 0x0000b3f9,
@@ -7383,7 +7421,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000dc75, 0x0000dc76, 0x0000ccc9, 0x0000dc77,
   /* bc */  0x0000dc78, 0x0000dc79, 0x0000dc7a, 0x0000dc7b,
 
-  /*** Three byte table, leaf: e8bbxx - offset 0x06055 ***/
+  /*** Three byte table, leaf: e8bbxx - offset 0x060d6 ***/
 
   /* 80 */  0x0000dc7c, 0x0000dc7d, 0x0000dc7e, 0x0000dc80,
   /* 84 */  0x0000dc81, 0x0000dc82, 0x0000dc83, 0x0000dc84,
@@ -7402,7 +7440,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000dd53, 0x0000dd54, 0x0000dd55, 0x0000dd56,
   /* bc */  0x0000dd57, 0x0000dd58, 0x0000dd59, 0x0000dd5a,
 
-  /*** Three byte table, leaf: e8bcxx - offset 0x06095 ***/
+  /*** Three byte table, leaf: e8bcxx - offset 0x06116 ***/
 
   /* 80 */  0x0000dd5b, 0x0000dd5c, 0x0000dd5d, 0x0000dd5e,
   /* 84 */  0x0000dd5f, 0x0000dd60, 0x0000dd61, 0x0000dd62,
@@ -7421,7 +7459,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000dd94, 0x0000dd95, 0x0000dd96, 0x0000dd97,
   /* bc */  0x0000dd98, 0x0000dd99, 0x0000dd9a, 0x0000dd9b,
 
-  /*** Three byte table, leaf: e8bdxx - offset 0x060d5 ***/
+  /*** Three byte table, leaf: e8bdxx - offset 0x06156 ***/
 
   /* 80 */  0x0000dd9c, 0x0000dd9d, 0x0000dd9e, 0x0000dd9f,
   /* 84 */  0x0000dda0, 0x0000de40, 0x0000de41, 0x0000de42,
@@ -7440,7 +7478,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e9f4, 0x0000e9f6, 0x0000e9f7, 0x0000c7e1,
   /* bc */  0x0000e9f8, 0x0000d4d8, 0x0000e9f9, 0x0000bdce,
 
-  /*** Three byte table, leaf: e8bexx - offset 0x06115 ***/
+  /*** Three byte table, leaf: e8bexx - offset 0x06196 ***/
 
   /* 80 */  0x0000de62, 0x0000e9fa, 0x0000e9fb, 0x0000bdcf,
   /* 84 */  0x0000e9fc, 0x0000b8a8, 0x0000c1be, 0x0000e9fd,
@@ -7459,7 +7497,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000de77, 0x0000b1df, 0x0000de78, 0x0000de79,
   /* bc */  0x0000de7a, 0x0000c1c9, 0x0000b4ef, 0x0000de7b,
 
-  /*** Three byte table, leaf: e8bfxx - offset 0x06155 ***/
+  /*** Three byte table, leaf: e8bfxx - offset 0x061d6 ***/
 
   /* 80 */  0x0000de7c, 0x0000c7a8, 0x0000d3d8, 0x0000de7d,
   /* 84 */  0x0000c6f9, 0x0000d1b8, 0x0000de7e, 0x0000b9fd,
@@ -7478,7 +7516,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b1c5, 0x0000bca3, 0x0000de95, 0x0000de96,
   /* bc */  0x0000de97, 0x0000d7b7, 0x0000de98, 0x0000de99,
 
-  /*** Three byte table, leaf: e980xx - offset 0x06195 ***/
+  /*** Three byte table, leaf: e980xx - offset 0x06216 ***/
 
   /* 80 */  0x0000cdcb, 0x0000cbcd, 0x0000caca, 0x0000ccd3,
   /* 84 */  0x0000e5cc, 0x0000e5cb, 0x0000c4e6, 0x0000de9a,
@@ -7497,7 +7535,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d2dd, 0x0000df51, 0x0000df52, 0x0000c2df,
   /* bc */  0x0000b1c6, 0x0000df53, 0x0000d3e2, 0x0000df54,
 
-  /*** Three byte table, leaf: e981xx - offset 0x061d5 ***/
+  /*** Three byte table, leaf: e981xx - offset 0x06256 ***/
 
   /* 80 */  0x0000df55, 0x0000b6dd, 0x0000cbec, 0x0000df56,
   /* 84 */  0x0000e5d7, 0x0000df57, 0x0000df58, 0x0000d3f6,
@@ -7516,7 +7554,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000df78, 0x0000df79, 0x0000df7a, 0x0000df7b,
   /* bc */  0x0000df7c, 0x0000e5e1, 0x0000df7d, 0x0000b1dc,
 
-  /*** Three byte table, leaf: e982xx - offset 0x06215 ***/
+  /*** Three byte table, leaf: e982xx - offset 0x06296 ***/
 
   /* 80 */  0x0000d1fb, 0x0000df7e, 0x0000e5e2, 0x0000e5e4,
   /* 84 */  0x0000df80, 0x0000df81, 0x0000df82, 0x0000df83,
@@ -7535,7 +7573,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000dba1, 0x0000d7de, 0x0000dafe, 0x0000c1da,
   /* bc */  0x0000df9d, 0x0000df9e, 0x0000dba5, 0x0000df9f,
 
-  /*** Three byte table, leaf: e983xx - offset 0x06255 ***/
+  /*** Three byte table, leaf: e983xx - offset 0x062d6 ***/
 
   /* 80 */  0x0000dfa0, 0x0000d3f4, 0x0000e040, 0x0000e041,
   /* 84 */  0x0000dba7, 0x0000dba4, 0x0000e042, 0x0000dba8,
@@ -7554,7 +7592,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b5a6, 0x0000e060, 0x0000e061, 0x0000e062,
   /* bc */  0x0000e063, 0x0000b6bc, 0x0000dbb1, 0x0000e064,
 
-  /*** Three byte table, leaf: e984xx - offset 0x06295 ***/
+  /*** Three byte table, leaf: e984xx - offset 0x06316 ***/
 
   /* 80 */  0x0000e065, 0x0000e066, 0x0000b6f5, 0x0000e067,
   /* 84 */  0x0000dbb2, 0x0000e068, 0x0000e069, 0x0000e06a,
@@ -7573,7 +7611,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e096, 0x0000dbb8, 0x0000e097, 0x0000e098,
   /* bc */  0x0000e099, 0x0000e09a, 0x0000e09b, 0x0000e09c,
 
-  /*** Three byte table, leaf: e985xx - offset 0x062d5 ***/
+  /*** Three byte table, leaf: e985xx - offset 0x06356 ***/
 
   /* 80 */  0x0000e09d, 0x0000e09e, 0x0000e09f, 0x0000dbb9,
   /* 84 */  0x0000e0a0, 0x0000e140, 0x0000dbba, 0x0000e141,
@@ -7592,7 +7630,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000cbe1, 0x0000f5aa, 0x0000e154, 0x0000e155,
   /* bc */  0x0000e156, 0x0000f5a6, 0x0000f5a7, 0x0000c4f0,
 
-  /*** Three byte table, leaf: e986xx - offset 0x06315 ***/
+  /*** Three byte table, leaf: e986xx - offset 0x06396 ***/
 
   /* 80 */  0x0000e157, 0x0000e158, 0x0000e159, 0x0000e15a,
   /* 84 */  0x0000e15b, 0x0000f5ac, 0x0000e15c, 0x0000b4bc,
@@ -7611,7 +7649,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e17c, 0x0000e17d, 0x0000f5b8, 0x0000e17e,
   /* bc */  0x0000e180, 0x0000e181, 0x0000e182, 0x0000e183,
 
-  /*** Three byte table, leaf: e987xx - offset 0x06355 ***/
+  /*** Three byte table, leaf: e987xx - offset 0x063d6 ***/
 
   /* 80 */  0x0000e184, 0x0000e185, 0x0000e186, 0x0000e187,
   /* 84 */  0x0000e188, 0x0000e189, 0x0000e18a, 0x0000b2c9,
@@ -7630,7 +7668,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e252, 0x0000e253, 0x0000e254, 0x0000e255,
   /* bc */  0x0000e256, 0x0000e257, 0x0000e258, 0x0000e259,
 
-  /*** Three byte table, leaf: e988xx - offset 0x06395 ***/
+  /*** Three byte table, leaf: e988xx - offset 0x06416 ***/
 
   /* 80 */  0x0000e25a, 0x0000e25b, 0x0000e25c, 0x0000e25d,
   /* 84 */  0x0000e25e, 0x0000e25f, 0x0000e260, 0x0000e261,
@@ -7649,7 +7687,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e293, 0x0000e294, 0x0000e295, 0x0000e296,
   /* bc */  0x0000e297, 0x0000e298, 0x0000e299, 0x0000e29a,
 
-  /*** Three byte table, leaf: e989xx - offset 0x063d5 ***/
+  /*** Three byte table, leaf: e989xx - offset 0x06456 ***/
 
   /* 80 */  0x0000e29b, 0x0000e29c, 0x0000e29d, 0x0000e29e,
   /* 84 */  0x0000e29f, 0x0000e2a0, 0x0000e340, 0x0000e341,
@@ -7668,7 +7706,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e371, 0x0000e372, 0x0000e373, 0x0000e374,
   /* bc */  0x0000e375, 0x0000e376, 0x0000e377, 0x0000e378,
 
-  /*** Three byte table, leaf: e98axx - offset 0x06415 ***/
+  /*** Three byte table, leaf: e98axx - offset 0x06496 ***/
 
   /* 80 */  0x0000e379, 0x0000e37a, 0x0000e37b, 0x0000e37c,
   /* 84 */  0x0000e37d, 0x0000e37e, 0x0000e380, 0x0000e381,
@@ -7687,7 +7725,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e44f, 0x0000e450, 0x0000e451, 0x0000e452,
   /* bc */  0x0000e453, 0x0000e454, 0x0000e455, 0x0000e456,
 
-  /*** Three byte table, leaf: e98bxx - offset 0x06455 ***/
+  /*** Three byte table, leaf: e98bxx - offset 0x064d6 ***/
 
   /* 80 */  0x0000e457, 0x0000e458, 0x0000e459, 0x0000e45a,
   /* 84 */  0x0000e45b, 0x0000e45c, 0x0000e45d, 0x0000e45e,
@@ -7706,7 +7744,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e48f, 0x0000e490, 0x0000e491, 0x0000e492,
   /* bc */  0x0000e493, 0x0000e494, 0x0000e495, 0x0000e496,
 
-  /*** Three byte table, leaf: e98cxx - offset 0x06495 ***/
+  /*** Three byte table, leaf: e98cxx - offset 0x06516 ***/
 
   /* 80 */  0x0000e497, 0x0000e498, 0x0000e499, 0x0000e49a,
   /* 84 */  0x0000e49b, 0x0000e49c, 0x0000e49d, 0x0000e49e,
@@ -7725,7 +7763,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e56e, 0x0000e56f, 0x0000e570, 0x0000e571,
   /* bc */  0x0000e572, 0x0000e573, 0x0000f6c9, 0x0000e574,
 
-  /*** Three byte table, leaf: e98dxx - offset 0x064d5 ***/
+  /*** Three byte table, leaf: e98dxx - offset 0x06556 ***/
 
   /* 80 */  0x0000e575, 0x0000e576, 0x0000e577, 0x0000e578,
   /* 84 */  0x0000e579, 0x0000e57a, 0x0000e57b, 0x0000e57c,
@@ -7744,7 +7782,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e64c, 0x0000e64d, 0x0000e64e, 0x0000e64f,
   /* bc */  0x0000e650, 0x0000e651, 0x0000e652, 0x0000e653,
 
-  /*** Three byte table, leaf: e98exx - offset 0x06515 ***/
+  /*** Three byte table, leaf: e98exx - offset 0x06596 ***/
 
   /* 80 */  0x0000e654, 0x0000e655, 0x0000e656, 0x0000e657,
   /* 84 */  0x0000e658, 0x0000e659, 0x0000e65a, 0x0000e65b,
@@ -7763,7 +7801,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e68c, 0x0000e68d, 0x0000e68e, 0x0000e68f,
   /* bc */  0x0000e690, 0x0000e691, 0x0000e692, 0x0000e693,
 
-  /*** Three byte table, leaf: e98fxx - offset 0x06555 ***/
+  /*** Three byte table, leaf: e98fxx - offset 0x065d6 ***/
 
   /* 80 */  0x0000e694, 0x0000e695, 0x0000e696, 0x0000e697,
   /* 84 */  0x0000e698, 0x0000e699, 0x0000e69a, 0x0000e69b,
@@ -7782,7 +7820,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e769, 0x0000e76a, 0x0000e76b, 0x0000e76c,
   /* bc */  0x0000e76d, 0x0000e76e, 0x0000e76f, 0x0000e770,
 
-  /*** Three byte table, leaf: e990xx - offset 0x06595 ***/
+  /*** Three byte table, leaf: e990xx - offset 0x06616 ***/
 
   /* 80 */  0x0000e771, 0x0000e772, 0x0000e773, 0x0000e774,
   /* 84 */  0x0000e775, 0x0000e776, 0x0000e777, 0x0000e778,
@@ -7801,7 +7839,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e849, 0x0000e84a, 0x0000e84b, 0x0000e84c,
   /* bc */  0x0000e84d, 0x0000e84e, 0x0000f6cd, 0x0000e84f,
 
-  /*** Three byte table, leaf: e991xx - offset 0x065d5 ***/
+  /*** Three byte table, leaf: e991xx - offset 0x06656 ***/
 
   /* 80 */  0x0000e850, 0x0000e851, 0x0000e852, 0x0000e853,
   /* 84 */  0x0000e854, 0x0000e855, 0x0000e856, 0x0000e857,
@@ -7820,7 +7858,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e888, 0x0000e889, 0x0000e88a, 0x0000e88b,
   /* bc */  0x0000e88c, 0x0000e88d, 0x0000e88e, 0x0000e88f,
 
-  /*** Three byte table, leaf: e992xx - offset 0x06615 ***/
+  /*** Three byte table, leaf: e992xx - offset 0x06696 ***/
 
   /* 80 */  0x0000e890, 0x0000e891, 0x0000e892, 0x0000e893,
   /* 84 */  0x0000e894, 0x0000eec4, 0x0000eec5, 0x0000eec6,
@@ -7839,7 +7877,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000eedf, 0x0000eee0, 0x0000eee1, 0x0000d7ea,
   /* bc */  0x0000eee2, 0x0000eee3, 0x0000bcd8, 0x0000eee4,
 
-  /*** Three byte table, leaf: e993xx - offset 0x06655 ***/
+  /*** Three byte table, leaf: e993xx - offset 0x066d6 ***/
 
   /* 80 */  0x0000d3cb, 0x0000ccfa, 0x0000b2ac, 0x0000c1e5,
   /* 84 */  0x0000eee5, 0x0000c7a6, 0x0000c3ad, 0x0000e898,
@@ -7858,7 +7896,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d6fd, 0x0000efa9, 0x0000c6cc, 0x0000e89e,
   /* bc */  0x0000efaa, 0x0000efab, 0x0000c1b4, 0x0000efac,
 
-  /*** Three byte table, leaf: e994xx - offset 0x06695 ***/
+  /*** Three byte table, leaf: e994xx - offset 0x06716 ***/
 
   /* 80 */  0x0000cffa, 0x0000cbf8, 0x0000efae, 0x0000efad,
   /* 84 */  0x0000b3fa, 0x0000b9f8, 0x0000efaf, 0x0000efb0,
@@ -7877,7 +7915,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000efca, 0x0000c7c2, 0x0000eff1, 0x0000b6cd,
   /* bc */  0x0000efcb, 0x0000e942, 0x0000efcc, 0x0000efcd,
 
-  /*** Three byte table, leaf: e995xx - offset 0x066d5 ***/
+  /*** Three byte table, leaf: e995xx - offset 0x06756 ***/
 
   /* 80 */  0x0000b6c6, 0x0000c3be, 0x0000efce, 0x0000e943,
   /* 84 */  0x0000efd0, 0x0000efd1, 0x0000efd2, 0x0000d5f2,
@@ -7896,7 +7934,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e94d, 0x0000e94e, 0x0000e94f, 0x0000e950,
   /* bc */  0x0000e951, 0x0000e952, 0x0000e953, 0x0000b3a4,
 
-  /*** Three byte table, leaf: e996xx - offset 0x06715 ***/
+  /*** Three byte table, leaf: e996xx - offset 0x06796 ***/
 
   /* 80 */  0x0000e954, 0x0000e955, 0x0000e956, 0x0000e957,
   /* 84 */  0x0000e958, 0x0000e959, 0x0000e95a, 0x0000e95b,
@@ -7915,7 +7953,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e98d, 0x0000e98e, 0x0000e98f, 0x0000e990,
   /* bc */  0x0000e991, 0x0000e992, 0x0000e993, 0x0000e994,
 
-  /*** Three byte table, leaf: e997xx - offset 0x06755 ***/
+  /*** Three byte table, leaf: e997xx - offset 0x067d6 ***/
 
   /* 80 */  0x0000e995, 0x0000e996, 0x0000e997, 0x0000e998,
   /* 84 */  0x0000e999, 0x0000e99a, 0x0000e99b, 0x0000e99c,
@@ -7934,7 +7972,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000d5a2, 0x0000c4d6, 0x0000b9eb, 0x0000cec5,
   /* bc */  0x0000e3cb, 0x0000c3f6, 0x0000e3cc, 0x0000ea5d,
 
-  /*** Three byte table, leaf: e998xx - offset 0x06795 ***/
+  /*** Three byte table, leaf: e998xx - offset 0x06816 ***/
 
   /* 80 */  0x0000b7a7, 0x0000b8f3, 0x0000bad2, 0x0000e3cd,
   /* 84 */  0x0000e3ce, 0x0000d4c4, 0x0000e3cf, 0x0000ea5e,
@@ -7953,7 +7991,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ea71, 0x0000ea72, 0x0000ea73, 0x0000d7e8,
   /* bc */  0x0000dae8, 0x0000dae7, 0x0000ea74, 0x0000b0a2,
 
-  /*** Three byte table, leaf: e999xx - offset 0x067d5 ***/
+  /*** Three byte table, leaf: e999xx - offset 0x06856 ***/
 
   /* 80 */  0x0000cdd3, 0x0000ea75, 0x0000dae9, 0x0000ea76,
   /* 84 */  0x0000b8bd, 0x0000bcca, 0x0000c2bd, 0x0000c2a4,
@@ -7972,7 +8010,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ea91, 0x0000ea92, 0x0000ea93, 0x0000ea94,
   /* bc */  0x0000ea95, 0x0000ea96, 0x0000ea97, 0x0000ea98,
 
-  /*** Three byte table, leaf: e99axx - offset 0x06815 ***/
+  /*** Three byte table, leaf: e99axx - offset 0x06896 ***/
 
   /* 80 */  0x0000ea99, 0x0000ea9a, 0x0000ea9b, 0x0000ea9c,
   /* 84 */  0x0000ea9d, 0x0000d3e7, 0x0000c2a1, 0x0000ea9e,
@@ -7991,7 +8029,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000eb60, 0x0000f6bf, 0x0000eb61, 0x0000eb62,
   /* bc */  0x0000f6c0, 0x0000f6c1, 0x0000c4d1, 0x0000eb63,
 
-  /*** Three byte table, leaf: e99bxx - offset 0x06855 ***/
+  /*** Three byte table, leaf: e99bxx - offset 0x068d6 ***/
 
   /* 80 */  0x0000c8b8, 0x0000d1e3, 0x0000eb64, 0x0000eb65,
   /* 84 */  0x0000d0db, 0x0000d1c5, 0x0000bcaf, 0x0000b9cd,
@@ -8010,7 +8048,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000eb88, 0x0000b1a2, 0x0000eb89, 0x0000eb8a,
   /* bc */  0x0000eb8b, 0x0000eb8c, 0x0000ceed, 0x0000eb8d,
 
-  /*** Three byte table, leaf: e99cxx - offset 0x06895 ***/
+  /*** Three byte table, leaf: e99cxx - offset 0x06916 ***/
 
   /* 80 */  0x0000d0e8, 0x0000f6ab, 0x0000eb8e, 0x0000eb8f,
   /* 84 */  0x0000cff6, 0x0000eb90, 0x0000f6aa, 0x0000d5f0,
@@ -8029,7 +8067,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000b0d4, 0x0000c5f9, 0x0000ec53, 0x0000ec54,
   /* bc */  0x0000ec55, 0x0000ec56, 0x0000f6b2, 0x0000ec57,
 
-  /*** Three byte table, leaf: e99dxx - offset 0x068d5 ***/
+  /*** Three byte table, leaf: e99dxx - offset 0x06956 ***/
 
   /* 80 */  0x0000ec58, 0x0000ec59, 0x0000ec5a, 0x0000ec5b,
   /* 84 */  0x0000ec5c, 0x0000ec5d, 0x0000ec5e, 0x0000ec5f,
@@ -8048,7 +8086,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ec83, 0x0000ec84, 0x0000ec85, 0x0000ec86,
   /* bc */  0x0000f7b0, 0x0000ec87, 0x0000ec88, 0x0000ec89,
 
-  /*** Three byte table, leaf: e99exx - offset 0x06915 ***/
+  /*** Three byte table, leaf: e99exx - offset 0x06996 ***/
 
   /* 80 */  0x0000ec8a, 0x0000ec8b, 0x0000ec8c, 0x0000ec8d,
   /* 84 */  0x0000ec8e, 0x0000f7b1, 0x0000ec8f, 0x0000ec90,
@@ -8067,7 +8105,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ed53, 0x0000ed54, 0x0000ed55, 0x0000ed56,
   /* bc */  0x0000ed57, 0x0000ed58, 0x0000ed59, 0x0000ed5a,
 
-  /*** Three byte table, leaf: e99fxx - offset 0x06955 ***/
+  /*** Three byte table, leaf: e99fxx - offset 0x069d6 ***/
 
   /* 80 */  0x0000ed5b, 0x0000ed5c, 0x0000ed5d, 0x0000ed5e,
   /* 84 */  0x0000ed5f, 0x0000ed60, 0x0000ed61, 0x0000ed62,
@@ -8086,7 +8124,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ed8a, 0x0000ed8b, 0x0000ed8c, 0x0000ed8d,
   /* bc */  0x0000ed8e, 0x0000ed8f, 0x0000ed90, 0x0000ed91,
 
-  /*** Three byte table, leaf: e9a0xx - offset 0x06995 ***/
+  /*** Three byte table, leaf: e9a0xx - offset 0x06a16 ***/
 
   /* 80 */  0x0000ed92, 0x0000ed93, 0x0000ed94, 0x0000ed95,
   /* 84 */  0x0000ed96, 0x0000ed97, 0x0000ed98, 0x0000ed99,
@@ -8105,7 +8143,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ee69, 0x0000ee6a, 0x0000ee6b, 0x0000ee6c,
   /* bc */  0x0000ee6d, 0x0000ee6e, 0x0000ee6f, 0x0000ee70,
 
-  /*** Three byte table, leaf: e9a1xx - offset 0x069d5 ***/
+  /*** Three byte table, leaf: e9a1xx - offset 0x06a56 ***/
 
   /* 80 */  0x0000ee71, 0x0000ee72, 0x0000ee73, 0x0000ee74,
   /* 84 */  0x0000ee75, 0x0000ee76, 0x0000ee77, 0x0000ee78,
@@ -8124,7 +8162,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f1fc, 0x0000cfee, 0x0000cbb3, 0x0000d0eb,
   /* bc */  0x0000e7ef, 0x0000cde7, 0x0000b9cb, 0x0000b6d9,
 
-  /*** Three byte table, leaf: e9a2xx - offset 0x06a15 ***/
+  /*** Three byte table, leaf: e9a2xx - offset 0x06a96 ***/
 
   /* 80 */  0x0000f1fd, 0x0000b0e4, 0x0000cbcc, 0x0000f1fe,
   /* 84 */  0x0000d4a4, 0x0000c2ad, 0x0000c1ec, 0x0000c6c4,
@@ -8143,7 +8181,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ef5c, 0x0000ef5d, 0x0000ef5e, 0x0000ef5f,
   /* bc */  0x0000ef60, 0x0000ef61, 0x0000ef62, 0x0000ef63,
 
-  /*** Three byte table, leaf: e9a3xx - offset 0x06a55 ***/
+  /*** Three byte table, leaf: e9a3xx - offset 0x06ad6 ***/
 
   /* 80 */  0x0000ef64, 0x0000ef65, 0x0000ef66, 0x0000ef67,
   /* 84 */  0x0000ef68, 0x0000ef69, 0x0000ef6a, 0x0000ef6b,
@@ -8162,7 +8200,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000ef91, 0x0000ef92, 0x0000ef93, 0x0000ef94,
   /* bc */  0x0000ef95, 0x0000ef96, 0x0000ef97, 0x0000ef98,
 
-  /*** Three byte table, leaf: e9a4xx - offset 0x06a95 ***/
+  /*** Three byte table, leaf: e9a4xx - offset 0x06b16 ***/
 
   /* 80 */  0x0000ef99, 0x0000ef9a, 0x0000ef9b, 0x0000ef9c,
   /* 84 */  0x0000ef9d, 0x0000ef9e, 0x0000ef9f, 0x0000efa0,
@@ -8181,7 +8219,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f06d, 0x0000f06e, 0x0000f06f, 0x0000f070,
   /* bc */  0x0000f071, 0x0000f072, 0x0000f073, 0x0000f074,
 
-  /*** Three byte table, leaf: e9a5xx - offset 0x06ad5 ***/
+  /*** Three byte table, leaf: e9a5xx - offset 0x06b56 ***/
 
   /* 80 */  0x0000f075, 0x0000f076, 0x0000f077, 0x0000f078,
   /* 84 */  0x0000f079, 0x0000f07a, 0x0000f07b, 0x0000f07c,
@@ -8200,7 +8238,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f09a, 0x0000f09b, 0x0000bdc8, 0x0000f09c,
   /* bc */  0x0000b1fd, 0x0000e2c4, 0x0000f09d, 0x0000b6f6,
 
-  /*** Three byte table, leaf: e9a6xx - offset 0x06b15 ***/
+  /*** Three byte table, leaf: e9a6xx - offset 0x06b96 ***/
 
   /* 80 */  0x0000e2c5, 0x0000c4d9, 0x0000f09e, 0x0000f09f,
   /* 84 */  0x0000e2c6, 0x0000cfda, 0x0000b9dd, 0x0000e2c7,
@@ -8219,7 +8257,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f15e, 0x0000f15f, 0x0000f160, 0x0000f161,
   /* bc */  0x0000f162, 0x0000f163, 0x0000f164, 0x0000f165,
 
-  /*** Three byte table, leaf: e9a7xx - offset 0x06b55 ***/
+  /*** Three byte table, leaf: e9a7xx - offset 0x06bd6 ***/
 
   /* 80 */  0x0000f166, 0x0000f167, 0x0000f168, 0x0000f169,
   /* 84 */  0x0000f16a, 0x0000f16b, 0x0000f16c, 0x0000f16d,
@@ -8238,7 +8276,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f19f, 0x0000f1a0, 0x0000f240, 0x0000f241,
   /* bc */  0x0000f242, 0x0000f243, 0x0000f244, 0x0000f245,
 
-  /*** Three byte table, leaf: e9a8xx - offset 0x06b95 ***/
+  /*** Three byte table, leaf: e9a8xx - offset 0x06c16 ***/
 
   /* 80 */  0x0000f246, 0x0000f247, 0x0000f248, 0x0000f249,
   /* 84 */  0x0000f24a, 0x0000f24b, 0x0000f24c, 0x0000f24d,
@@ -8257,7 +8295,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f27e, 0x0000f280, 0x0000f281, 0x0000f282,
   /* bc */  0x0000f283, 0x0000f284, 0x0000f285, 0x0000f286,
 
-  /*** Three byte table, leaf: e9a9xx - offset 0x06bd5 ***/
+  /*** Three byte table, leaf: e9a9xx - offset 0x06c56 ***/
 
   /* 80 */  0x0000f287, 0x0000f288, 0x0000f289, 0x0000f28a,
   /* 84 */  0x0000f28b, 0x0000f28c, 0x0000f28d, 0x0000f28e,
@@ -8276,7 +8314,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000e6e2, 0x0000bed4, 0x0000e6e3, 0x0000d7a4,
   /* bc */  0x0000cdd5, 0x0000e6e5, 0x0000bcdd, 0x0000e6e4,
 
-  /*** Three byte table, leaf: e9aaxx - offset 0x06c15 ***/
+  /*** Three byte table, leaf: e9aaxx - offset 0x06c96 ***/
 
   /* 80 */  0x0000e6e6, 0x0000e6e7, 0x0000c2ee, 0x0000f353,
   /* 84 */  0x0000bdbe, 0x0000e6e8, 0x0000c2e6, 0x0000baa7,
@@ -8295,7 +8333,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000baa1, 0x0000f366, 0x0000f7bf, 0x0000f367,
   /* bc */  0x0000f7c0, 0x0000f368, 0x0000f369, 0x0000f36a,
 
-  /*** Three byte table, leaf: e9abxx - offset 0x06c55 ***/
+  /*** Three byte table, leaf: e9abxx - offset 0x06cd6 ***/
 
   /* 80 */  0x0000f7c2, 0x0000f7c1, 0x0000f7c4, 0x0000f36b,
   /* 84 */  0x0000f36c, 0x0000f7c3, 0x0000f36d, 0x0000f36e,
@@ -8314,7 +8352,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f395, 0x0000f7db, 0x0000f396, 0x0000f7d9,
   /* bc */  0x0000f397, 0x0000f398, 0x0000f399, 0x0000f39a,
 
-  /*** Three byte table, leaf: e9acxx - offset 0x06c95 ***/
+  /*** Three byte table, leaf: e9acxx - offset 0x06d16 ***/
 
   /* 80 */  0x0000f39b, 0x0000f39c, 0x0000f39d, 0x0000d7d7,
   /* 84 */  0x0000f39e, 0x0000f39f, 0x0000f3a0, 0x0000f440,
@@ -8333,7 +8371,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f46a, 0x0000f46b, 0x0000f46c, 0x0000e5f7,
   /* bc */  0x0000b9ed, 0x0000f46d, 0x0000f46e, 0x0000f46f,
 
-  /*** Three byte table, leaf: e9adxx - offset 0x06cd5 ***/
+  /*** Three byte table, leaf: e9adxx - offset 0x06d56 ***/
 
   /* 80 */  0x0000f470, 0x0000bffd, 0x0000bbea, 0x0000f7c9,
   /* 84 */  0x0000c6c7, 0x0000f7c8, 0x0000f471, 0x0000f7ca,
@@ -8352,7 +8390,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f49d, 0x0000f49e, 0x0000f49f, 0x0000f4a0,
   /* bc */  0x0000f540, 0x0000f541, 0x0000f542, 0x0000f543,
 
-  /*** Three byte table, leaf: e9aexx - offset 0x06d15 ***/
+  /*** Three byte table, leaf: e9aexx - offset 0x06d96 ***/
 
   /* 80 */  0x0000f544, 0x0000f545, 0x0000f546, 0x0000f547,
   /* 84 */  0x0000f548, 0x0000f549, 0x0000f54a, 0x0000f54b,
@@ -8371,7 +8409,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f57c, 0x0000f57d, 0x0000f57e, 0x0000f580,
   /* bc */  0x0000f581, 0x0000f582, 0x0000f583, 0x0000f584,
 
-  /*** Three byte table, leaf: e9afxx - offset 0x06d55 ***/
+  /*** Three byte table, leaf: e9afxx - offset 0x06dd6 ***/
 
   /* 80 */  0x0000f585, 0x0000f586, 0x0000f587, 0x0000f588,
   /* 84 */  0x0000f589, 0x0000f58a, 0x0000f58b, 0x0000f58c,
@@ -8390,7 +8428,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f65c, 0x0000f65d, 0x0000f65e, 0x0000f65f,
   /* bc */  0x0000f660, 0x0000f661, 0x0000f662, 0x0000f663,
 
-  /*** Three byte table, leaf: e9b0xx - offset 0x06d95 ***/
+  /*** Three byte table, leaf: e9b0xx - offset 0x06e16 ***/
 
   /* 80 */  0x0000f664, 0x0000f665, 0x0000f666, 0x0000f667,
   /* 84 */  0x0000f668, 0x0000f669, 0x0000f66a, 0x0000f66b,
@@ -8409,7 +8447,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f69d, 0x0000f69e, 0x0000f69f, 0x0000f6a0,
   /* bc */  0x0000f740, 0x0000f741, 0x0000f742, 0x0000f743,
 
-  /*** Three byte table, leaf: e9b1xx - offset 0x06dd5 ***/
+  /*** Three byte table, leaf: e9b1xx - offset 0x06e56 ***/
 
   /* 80 */  0x0000f744, 0x0000f745, 0x0000f746, 0x0000f747,
   /* 84 */  0x0000f748, 0x0000f749, 0x0000f74a, 0x0000f74b,
@@ -8428,7 +8466,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f77c, 0x0000f77d, 0x0000f77e, 0x0000f780,
   /* bc */  0x0000d3e3, 0x0000f781, 0x0000f782, 0x0000f6cf,
 
-  /*** Three byte table, leaf: e9b2xx - offset 0x06e15 ***/
+  /*** Three byte table, leaf: e9b2xx - offset 0x06e96 ***/
 
   /* 80 */  0x0000f783, 0x0000c2b3, 0x0000f6d0, 0x0000f784,
   /* 84 */  0x0000f785, 0x0000f6d1, 0x0000f6d2, 0x0000f6d3,
@@ -8447,7 +8485,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000bea8, 0x0000f793, 0x0000f6f5, 0x0000f6f6,
   /* bc */  0x0000f6f7, 0x0000f6f8, 0x0000f794, 0x0000f795,
 
-  /*** Three byte table, leaf: e9b3xx - offset 0x06e55 ***/
+  /*** Three byte table, leaf: e9b3xx - offset 0x06ed6 ***/
 
   /* 80 */  0x0000f796, 0x0000f797, 0x0000f798, 0x0000c8fa,
   /* 84 */  0x0000f6f9, 0x0000f6fa, 0x0000f6fb, 0x0000f6fc,
@@ -8466,7 +8504,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f855, 0x0000f856, 0x0000f857, 0x0000f858,
   /* bc */  0x0000f859, 0x0000f85a, 0x0000f85b, 0x0000f85c,
 
-  /*** Three byte table, leaf: e9b4xx - offset 0x06e95 ***/
+  /*** Three byte table, leaf: e9b4xx - offset 0x06f16 ***/
 
   /* 80 */  0x0000f85d, 0x0000f85e, 0x0000f85f, 0x0000f860,
   /* 84 */  0x0000f861, 0x0000f862, 0x0000f863, 0x0000f864,
@@ -8485,7 +8523,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f896, 0x0000f897, 0x0000f898, 0x0000f899,
   /* bc */  0x0000f89a, 0x0000f89b, 0x0000f89c, 0x0000f89d,
 
-  /*** Three byte table, leaf: e9b5xx - offset 0x06ed5 ***/
+  /*** Three byte table, leaf: e9b5xx - offset 0x06f56 ***/
 
   /* 80 */  0x0000f89e, 0x0000f89f, 0x0000f8a0, 0x0000f940,
   /* 84 */  0x0000f941, 0x0000f942, 0x0000f943, 0x0000f944,
@@ -8504,7 +8542,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f975, 0x0000f976, 0x0000f977, 0x0000f978,
   /* bc */  0x0000f979, 0x0000f97a, 0x0000f97b, 0x0000f97c,
 
-  /*** Three byte table, leaf: e9b6xx - offset 0x06f15 ***/
+  /*** Three byte table, leaf: e9b6xx - offset 0x06f96 ***/
 
   /* 80 */  0x0000f97d, 0x0000f97e, 0x0000f980, 0x0000f981,
   /* 84 */  0x0000f982, 0x0000f983, 0x0000f984, 0x0000f985,
@@ -8523,7 +8561,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000fa55, 0x0000fa56, 0x0000fa57, 0x0000fa58,
   /* bc */  0x0000fa59, 0x0000fa5a, 0x0000fa5b, 0x0000fa5c,
 
-  /*** Three byte table, leaf: e9b7xx - offset 0x06f55 ***/
+  /*** Three byte table, leaf: e9b7xx - offset 0x06fd6 ***/
 
   /* 80 */  0x0000fa5d, 0x0000fa5e, 0x0000fa5f, 0x0000fa60,
   /* 84 */  0x0000fa61, 0x0000fa62, 0x0000fa63, 0x0000fa64,
@@ -8542,7 +8580,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000fa96, 0x0000fa97, 0x0000fa98, 0x0000fa99,
   /* bc */  0x0000fa9a, 0x0000fa9b, 0x0000fa9c, 0x0000fa9d,
 
-  /*** Three byte table, leaf: e9b8xx - offset 0x06f95 ***/
+  /*** Three byte table, leaf: e9b8xx - offset 0x07016 ***/
 
   /* 80 */  0x0000fa9e, 0x0000fa9f, 0x0000faa0, 0x0000fb40,
   /* 84 */  0x0000fb41, 0x0000fb42, 0x0000fb43, 0x0000fb44,
@@ -8561,7 +8599,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f0b9, 0x0000f0bb, 0x0000f0bc, 0x0000fb61,
   /* bc */  0x0000fb62, 0x0000b8eb, 0x0000f0bd, 0x0000bae8,
 
-  /*** Three byte table, leaf: e9b9xx - offset 0x06fd5 ***/
+  /*** Three byte table, leaf: e9b9xx - offset 0x07056 ***/
 
   /* 80 */  0x0000fb63, 0x0000f0be, 0x0000f0bf, 0x0000bee9,
   /* 84 */  0x0000f0c0, 0x0000b6ec, 0x0000f0c1, 0x0000f0c2,
@@ -8580,7 +8618,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000fb78, 0x0000fb79, 0x0000fb7a, 0x0000fb7b,
   /* bc */  0x0000fb7c, 0x0000fb7d, 0x0000f5ba, 0x0000c2b9,
 
-  /*** Three byte table, leaf: e9baxx - offset 0x07015 ***/
+  /*** Three byte table, leaf: e9baxx - offset 0x07096 ***/
 
   /* 80 */  0x0000fb7e, 0x0000fb80, 0x0000f7e4, 0x0000fb81,
   /* 84 */  0x0000fb82, 0x0000fb83, 0x0000fb84, 0x0000f7e5,
@@ -8599,7 +8637,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f4ef, 0x0000fc4c, 0x0000fc4d, 0x0000c2e9,
   /* bc */  0x0000fc4e, 0x0000f7e1, 0x0000f7e2, 0x0000fc4f,
 
-  /*** Three byte table, leaf: e9bbxx - offset 0x07055 ***/
+  /*** Three byte table, leaf: e9bbxx - offset 0x070d6 ***/
 
   /* 80 */  0x0000fc50, 0x0000fc51, 0x0000fc52, 0x0000fc53,
   /* 84 */  0x0000bbc6, 0x0000fc54, 0x0000fc55, 0x0000fc56,
@@ -8618,7 +8656,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000fc75, 0x0000ede9, 0x0000fc76, 0x0000edea,
   /* bc */  0x0000edeb, 0x0000fc77, 0x0000f6bc, 0x0000fc78,
 
-  /*** Three byte table, leaf: e9bcxx - offset 0x07095 ***/
+  /*** Three byte table, leaf: e9bcxx - offset 0x07116 ***/
 
   /* 80 */  0x0000fc79, 0x0000fc7a, 0x0000fc7b, 0x0000fc7c,
   /* 84 */  0x0000fc7d, 0x0000fc7e, 0x0000fc80, 0x0000fc81,
@@ -8637,7 +8675,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000fd45, 0x0000f7fa, 0x0000fd46, 0x0000b1c7,
   /* bc */  0x0000fd47, 0x0000f7fc, 0x0000f7fd, 0x0000fd48,
 
-  /*** Three byte table, leaf: e9bdxx - offset 0x070d5 ***/
+  /*** Three byte table, leaf: e9bdxx - offset 0x07156 ***/
 
   /* 80 */  0x0000fd49, 0x0000fd4a, 0x0000fd4b, 0x0000fd4c,
   /* 84 */  0x0000f7fe, 0x0000fd4d, 0x0000fd4e, 0x0000fd4f,
@@ -8656,7 +8694,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000fd7e, 0x0000fd80, 0x0000fd81, 0x0000fd82,
   /* bc */  0x0000fd83, 0x0000fd84, 0x0000fd85, 0x0000b3dd,
 
-  /*** Three byte table, leaf: e9bexx - offset 0x07115 ***/
+  /*** Three byte table, leaf: e9bexx - offset 0x07196 ***/
 
   /* 80 */  0x0000f6b3, 0x0000fd86, 0x0000fd87, 0x0000f6b4,
   /* 84 */  0x0000c1e4, 0x0000f6b5, 0x0000f6b6, 0x0000f6b7,
@@ -8671,11 +8709,11 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* a8 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* ac */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* b0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* b4 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* b8 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* b4 */  0x0000fe59, 0x0000fe61, 0x0000fe66, 0x0000fe67,
+  /* b8 */  0x0000fe6d, 0x0000fe7e, 0x0000fe90, 0x0000fea0,
   /* bc */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
 
-  /*** Three byte table, leaf: ee80xx - offset 0x07155 ***/
+  /*** Three byte table, leaf: ee80xx - offset 0x071d6 ***/
 
   /* 80 */  0x0000aaa1, 0x0000aaa2, 0x0000aaa3, 0x0000aaa4,
   /* 84 */  0x0000aaa5, 0x0000aaa6, 0x0000aaa7, 0x0000aaa8,
@@ -8694,7 +8732,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000aad9, 0x0000aada, 0x0000aadb, 0x0000aadc,
   /* bc */  0x0000aadd, 0x0000aade, 0x0000aadf, 0x0000aae0,
 
-  /*** Three byte table, leaf: ee81xx - offset 0x07195 ***/
+  /*** Three byte table, leaf: ee81xx - offset 0x07216 ***/
 
   /* 80 */  0x0000aae1, 0x0000aae2, 0x0000aae3, 0x0000aae4,
   /* 84 */  0x0000aae5, 0x0000aae6, 0x0000aae7, 0x0000aae8,
@@ -8713,7 +8751,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000abbb, 0x0000abbc, 0x0000abbd, 0x0000abbe,
   /* bc */  0x0000abbf, 0x0000abc0, 0x0000abc1, 0x0000abc2,
 
-  /*** Three byte table, leaf: ee82xx - offset 0x071d5 ***/
+  /*** Three byte table, leaf: ee82xx - offset 0x07256 ***/
 
   /* 80 */  0x0000abc3, 0x0000abc4, 0x0000abc5, 0x0000abc6,
   /* 84 */  0x0000abc7, 0x0000abc8, 0x0000abc9, 0x0000abca,
@@ -8732,7 +8770,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000abfb, 0x0000abfc, 0x0000abfd, 0x0000abfe,
   /* bc */  0x0000aca1, 0x0000aca2, 0x0000aca3, 0x0000aca4,
 
-  /*** Three byte table, leaf: ee83xx - offset 0x07215 ***/
+  /*** Three byte table, leaf: ee83xx - offset 0x07296 ***/
 
   /* 80 */  0x0000aca5, 0x0000aca6, 0x0000aca7, 0x0000aca8,
   /* 84 */  0x0000aca9, 0x0000acaa, 0x0000acab, 0x0000acac,
@@ -8751,7 +8789,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000acdd, 0x0000acde, 0x0000acdf, 0x0000ace0,
   /* bc */  0x0000ace1, 0x0000ace2, 0x0000ace3, 0x0000ace4,
 
-  /*** Three byte table, leaf: ee84xx - offset 0x07255 ***/
+  /*** Three byte table, leaf: ee84xx - offset 0x072d6 ***/
 
   /* 80 */  0x0000ace5, 0x0000ace6, 0x0000ace7, 0x0000ace8,
   /* 84 */  0x0000ace9, 0x0000acea, 0x0000aceb, 0x0000acec,
@@ -8770,7 +8808,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000adbf, 0x0000adc0, 0x0000adc1, 0x0000adc2,
   /* bc */  0x0000adc3, 0x0000adc4, 0x0000adc5, 0x0000adc6,
 
-  /*** Three byte table, leaf: ee85xx - offset 0x07295 ***/
+  /*** Three byte table, leaf: ee85xx - offset 0x07316 ***/
 
   /* 80 */  0x0000adc7, 0x0000adc8, 0x0000adc9, 0x0000adca,
   /* 84 */  0x0000adcb, 0x0000adcc, 0x0000adcd, 0x0000adce,
@@ -8789,7 +8827,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000aea1, 0x0000aea2, 0x0000aea3, 0x0000aea4,
   /* bc */  0x0000aea5, 0x0000aea6, 0x0000aea7, 0x0000aea8,
 
-  /*** Three byte table, leaf: ee86xx - offset 0x072d5 ***/
+  /*** Three byte table, leaf: ee86xx - offset 0x07356 ***/
 
   /* 80 */  0x0000aea9, 0x0000aeaa, 0x0000aeab, 0x0000aeac,
   /* 84 */  0x0000aead, 0x0000aeae, 0x0000aeaf, 0x0000aeb0,
@@ -8808,7 +8846,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000aee1, 0x0000aee2, 0x0000aee3, 0x0000aee4,
   /* bc */  0x0000aee5, 0x0000aee6, 0x0000aee7, 0x0000aee8,
 
-  /*** Three byte table, leaf: ee87xx - offset 0x07315 ***/
+  /*** Three byte table, leaf: ee87xx - offset 0x07396 ***/
 
   /* 80 */  0x0000aee9, 0x0000aeea, 0x0000aeeb, 0x0000aeec,
   /* 84 */  0x0000aeed, 0x0000aeee, 0x0000aeef, 0x0000aef0,
@@ -8827,7 +8865,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000afc3, 0x0000afc4, 0x0000afc5, 0x0000afc6,
   /* bc */  0x0000afc7, 0x0000afc8, 0x0000afc9, 0x0000afca,
 
-  /*** Three byte table, leaf: ee88xx - offset 0x07355 ***/
+  /*** Three byte table, leaf: ee88xx - offset 0x073d6 ***/
 
   /* 80 */  0x0000afcb, 0x0000afcc, 0x0000afcd, 0x0000afce,
   /* 84 */  0x0000afcf, 0x0000afd0, 0x0000afd1, 0x0000afd2,
@@ -8846,7 +8884,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f8a5, 0x0000f8a6, 0x0000f8a7, 0x0000f8a8,
   /* bc */  0x0000f8a9, 0x0000f8aa, 0x0000f8ab, 0x0000f8ac,
 
-  /*** Three byte table, leaf: ee89xx - offset 0x07395 ***/
+  /*** Three byte table, leaf: ee89xx - offset 0x07416 ***/
 
   /* 80 */  0x0000f8ad, 0x0000f8ae, 0x0000f8af, 0x0000f8b0,
   /* 84 */  0x0000f8b1, 0x0000f8b2, 0x0000f8b3, 0x0000f8b4,
@@ -8865,7 +8903,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f8e5, 0x0000f8e6, 0x0000f8e7, 0x0000f8e8,
   /* bc */  0x0000f8e9, 0x0000f8ea, 0x0000f8eb, 0x0000f8ec,
 
-  /*** Three byte table, leaf: ee8axx - offset 0x073d5 ***/
+  /*** Three byte table, leaf: ee8axx - offset 0x07456 ***/
 
   /* 80 */  0x0000f8ed, 0x0000f8ee, 0x0000f8ef, 0x0000f8f0,
   /* 84 */  0x0000f8f1, 0x0000f8f2, 0x0000f8f3, 0x0000f8f4,
@@ -8884,7 +8922,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000f9c7, 0x0000f9c8, 0x0000f9c9, 0x0000f9ca,
   /* bc */  0x0000f9cb, 0x0000f9cc, 0x0000f9cd, 0x0000f9ce,
 
-  /*** Three byte table, leaf: ee8bxx - offset 0x07415 ***/
+  /*** Three byte table, leaf: ee8bxx - offset 0x07496 ***/
 
   /* 80 */  0x0000f9cf, 0x0000f9d0, 0x0000f9d1, 0x0000f9d2,
   /* 84 */  0x0000f9d3, 0x0000f9d4, 0x0000f9d5, 0x0000f9d6,
@@ -8903,7 +8941,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000faa9, 0x0000faaa, 0x0000faab, 0x0000faac,
   /* bc */  0x0000faad, 0x0000faae, 0x0000faaf, 0x0000fab0,
 
-  /*** Three byte table, leaf: ee8cxx - offset 0x07455 ***/
+  /*** Three byte table, leaf: ee8cxx - offset 0x074d6 ***/
 
   /* 80 */  0x0000fab1, 0x0000fab2, 0x0000fab3, 0x0000fab4,
   /* 84 */  0x0000fab5, 0x0000fab6, 0x0000fab7, 0x0000fab8,
@@ -8922,7 +8960,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000fae9, 0x0000faea, 0x0000faeb, 0x0000faec,
   /* bc */  0x0000faed, 0x0000faee, 0x0000faef, 0x0000faf0,
 
-  /*** Three byte table, leaf: ee8dxx - offset 0x07495 ***/
+  /*** Three byte table, leaf: ee8dxx - offset 0x07516 ***/
 
   /* 80 */  0x0000faf1, 0x0000faf2, 0x0000faf3, 0x0000faf4,
   /* 84 */  0x0000faf5, 0x0000faf6, 0x0000faf7, 0x0000faf8,
@@ -8941,7 +8979,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000fbcb, 0x0000fbcc, 0x0000fbcd, 0x0000fbce,
   /* bc */  0x0000fbcf, 0x0000fbd0, 0x0000fbd1, 0x0000fbd2,
 
-  /*** Three byte table, leaf: ee8exx - offset 0x074d5 ***/
+  /*** Three byte table, leaf: ee8exx - offset 0x07556 ***/
 
   /* 80 */  0x0000fbd3, 0x0000fbd4, 0x0000fbd5, 0x0000fbd6,
   /* 84 */  0x0000fbd7, 0x0000fbd8, 0x0000fbd9, 0x0000fbda,
@@ -8960,7 +8998,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000fcad, 0x0000fcae, 0x0000fcaf, 0x0000fcb0,
   /* bc */  0x0000fcb1, 0x0000fcb2, 0x0000fcb3, 0x0000fcb4,
 
-  /*** Three byte table, leaf: ee8fxx - offset 0x07515 ***/
+  /*** Three byte table, leaf: ee8fxx - offset 0x07596 ***/
 
   /* 80 */  0x0000fcb5, 0x0000fcb6, 0x0000fcb7, 0x0000fcb8,
   /* 84 */  0x0000fcb9, 0x0000fcba, 0x0000fcbb, 0x0000fcbc,
@@ -8979,7 +9017,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000fced, 0x0000fcee, 0x0000fcef, 0x0000fcf0,
   /* bc */  0x0000fcf1, 0x0000fcf2, 0x0000fcf3, 0x0000fcf4,
 
-  /*** Three byte table, leaf: ee90xx - offset 0x07555 ***/
+  /*** Three byte table, leaf: ee90xx - offset 0x075d6 ***/
 
   /* 80 */  0x0000fcf5, 0x0000fcf6, 0x0000fcf7, 0x0000fcf8,
   /* 84 */  0x0000fcf9, 0x0000fcfa, 0x0000fcfb, 0x0000fcfc,
@@ -8998,7 +9036,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000fdcf, 0x0000fdd0, 0x0000fdd1, 0x0000fdd2,
   /* bc */  0x0000fdd3, 0x0000fdd4, 0x0000fdd5, 0x0000fdd6,
 
-  /*** Three byte table, leaf: ee91xx - offset 0x07595 ***/
+  /*** Three byte table, leaf: ee91xx - offset 0x07616 ***/
 
   /* 80 */  0x0000fdd7, 0x0000fdd8, 0x0000fdd9, 0x0000fdda,
   /* 84 */  0x0000fddb, 0x0000fddc, 0x0000fddd, 0x0000fdde,
@@ -9017,7 +9055,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000feb1, 0x0000feb2, 0x0000feb3, 0x0000feb4,
   /* bc */  0x0000feb5, 0x0000feb6, 0x0000feb7, 0x0000feb8,
 
-  /*** Three byte table, leaf: ee92xx - offset 0x075d5 ***/
+  /*** Three byte table, leaf: ee92xx - offset 0x07656 ***/
 
   /* 80 */  0x0000feb9, 0x0000feba, 0x0000febb, 0x0000febc,
   /* 84 */  0x0000febd, 0x0000febe, 0x0000febf, 0x0000fec0,
@@ -9036,7 +9074,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000fef1, 0x0000fef2, 0x0000fef3, 0x0000fef4,
   /* bc */  0x0000fef5, 0x0000fef6, 0x0000fef7, 0x0000fef8,
 
-  /*** Three byte table, leaf: ee93xx - offset 0x07615 ***/
+  /*** Three byte table, leaf: ee93xx - offset 0x07696 ***/
 
   /* 80 */  0x0000fef9, 0x0000fefa, 0x0000fefb, 0x0000fefc,
   /* 84 */  0x0000fefd, 0x0000fefe, 0x0000a140, 0x0000a141,
@@ -9055,7 +9093,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a172, 0x0000a173, 0x0000a174, 0x0000a175,
   /* bc */  0x0000a176, 0x0000a177, 0x0000a178, 0x0000a179,
 
-  /*** Three byte table, leaf: ee94xx - offset 0x07655 ***/
+  /*** Three byte table, leaf: ee94xx - offset 0x076d6 ***/
 
   /* 80 */  0x0000a17a, 0x0000a17b, 0x0000a17c, 0x0000a17d,
   /* 84 */  0x0000a17e, 0x0000a180, 0x0000a181, 0x0000a182,
@@ -9074,7 +9112,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a252, 0x0000a253, 0x0000a254, 0x0000a255,
   /* bc */  0x0000a256, 0x0000a257, 0x0000a258, 0x0000a259,
 
-  /*** Three byte table, leaf: ee95xx - offset 0x07695 ***/
+  /*** Three byte table, leaf: ee95xx - offset 0x07716 ***/
 
   /* 80 */  0x0000a25a, 0x0000a25b, 0x0000a25c, 0x0000a25d,
   /* 84 */  0x0000a25e, 0x0000a25f, 0x0000a260, 0x0000a261,
@@ -9093,7 +9131,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a293, 0x0000a294, 0x0000a295, 0x0000a296,
   /* bc */  0x0000a297, 0x0000a298, 0x0000a299, 0x0000a29a,
 
-  /*** Three byte table, leaf: ee96xx - offset 0x076d5 ***/
+  /*** Three byte table, leaf: ee96xx - offset 0x07756 ***/
 
   /* 80 */  0x0000a29b, 0x0000a29c, 0x0000a29d, 0x0000a29e,
   /* 84 */  0x0000a29f, 0x0000a2a0, 0x0000a340, 0x0000a341,
@@ -9112,7 +9150,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a372, 0x0000a373, 0x0000a374, 0x0000a375,
   /* bc */  0x0000a376, 0x0000a377, 0x0000a378, 0x0000a379,
 
-  /*** Three byte table, leaf: ee97xx - offset 0x07715 ***/
+  /*** Three byte table, leaf: ee97xx - offset 0x07796 ***/
 
   /* 80 */  0x0000a37a, 0x0000a37b, 0x0000a37c, 0x0000a37d,
   /* 84 */  0x0000a37e, 0x0000a380, 0x0000a381, 0x0000a382,
@@ -9123,7 +9161,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* 98 */  0x0000a393, 0x0000a394, 0x0000a395, 0x0000a396,
   /* 9c */  0x0000a397, 0x0000a398, 0x0000a399, 0x0000a39a,
   /* a0 */  0x0000a39b, 0x0000a39c, 0x0000a39d, 0x0000a39e,
-  /* a4 */  0x0000a39f, 0x0000a3a0, 0x0000a440, 0x0000a441,
+  /* a4 */  0x0000a39f, 0x00000000, 0x0000a440, 0x0000a441,
   /* a8 */  0x0000a442, 0x0000a443, 0x0000a444, 0x0000a445,
   /* ac */  0x0000a446, 0x0000a447, 0x0000a448, 0x0000a449,
   /* b0 */  0x0000a44a, 0x0000a44b, 0x0000a44c, 0x0000a44d,
@@ -9131,7 +9169,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a452, 0x0000a453, 0x0000a454, 0x0000a455,
   /* bc */  0x0000a456, 0x0000a457, 0x0000a458, 0x0000a459,
 
-  /*** Three byte table, leaf: ee98xx - offset 0x07755 ***/
+  /*** Three byte table, leaf: ee98xx - offset 0x077d6 ***/
 
   /* 80 */  0x0000a45a, 0x0000a45b, 0x0000a45c, 0x0000a45d,
   /* 84 */  0x0000a45e, 0x0000a45f, 0x0000a460, 0x0000a461,
@@ -9150,7 +9188,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a493, 0x0000a494, 0x0000a495, 0x0000a496,
   /* bc */  0x0000a497, 0x0000a498, 0x0000a499, 0x0000a49a,
 
-  /*** Three byte table, leaf: ee99xx - offset 0x07795 ***/
+  /*** Three byte table, leaf: ee99xx - offset 0x07816 ***/
 
   /* 80 */  0x0000a49b, 0x0000a49c, 0x0000a49d, 0x0000a49e,
   /* 84 */  0x0000a49f, 0x0000a4a0, 0x0000a540, 0x0000a541,
@@ -9169,7 +9207,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a572, 0x0000a573, 0x0000a574, 0x0000a575,
   /* bc */  0x0000a576, 0x0000a577, 0x0000a578, 0x0000a579,
 
-  /*** Three byte table, leaf: ee9axx - offset 0x077d5 ***/
+  /*** Three byte table, leaf: ee9axx - offset 0x07856 ***/
 
   /* 80 */  0x0000a57a, 0x0000a57b, 0x0000a57c, 0x0000a57d,
   /* 84 */  0x0000a57e, 0x0000a580, 0x0000a581, 0x0000a582,
@@ -9188,7 +9226,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a652, 0x0000a653, 0x0000a654, 0x0000a655,
   /* bc */  0x0000a656, 0x0000a657, 0x0000a658, 0x0000a659,
 
-  /*** Three byte table, leaf: ee9bxx - offset 0x07815 ***/
+  /*** Three byte table, leaf: ee9bxx - offset 0x07896 ***/
 
   /* 80 */  0x0000a65a, 0x0000a65b, 0x0000a65c, 0x0000a65d,
   /* 84 */  0x0000a65e, 0x0000a65f, 0x0000a660, 0x0000a661,
@@ -9207,7 +9245,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a693, 0x0000a694, 0x0000a695, 0x0000a696,
   /* bc */  0x0000a697, 0x0000a698, 0x0000a699, 0x0000a69a,
 
-  /*** Three byte table, leaf: ee9cxx - offset 0x07855 ***/
+  /*** Three byte table, leaf: ee9cxx - offset 0x078d6 ***/
 
   /* 80 */  0x0000a69b, 0x0000a69c, 0x0000a69d, 0x0000a69e,
   /* 84 */  0x0000a69f, 0x0000a6a0, 0x0000a740, 0x0000a741,
@@ -9226,7 +9264,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a772, 0x0000a773, 0x0000a774, 0x0000a775,
   /* bc */  0x0000a776, 0x0000a777, 0x0000a778, 0x0000a779,
 
-  /*** Three byte table, leaf: ee9dxx - offset 0x07895 ***/
+  /*** Three byte table, leaf: ee9dxx - offset 0x07916 ***/
 
   /* 80 */  0x0000a77a, 0x0000a77b, 0x0000a77c, 0x0000a77d,
   /* 84 */  0x0000a77e, 0x0000a780, 0x0000a781, 0x0000a782,
@@ -9245,14 +9283,14 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a4fa, 0x0000a4fb, 0x0000a4fc, 0x0000a4fd,
   /* bc */  0x0000a4fe, 0x0000a5f7, 0x0000a5f8, 0x0000a5f9,
 
-  /*** Three byte table, leaf: ee9exx - offset 0x078d5 ***/
+  /*** Three byte table, leaf: ee9exx - offset 0x07956 ***/
 
   /* 80 */  0x0000a5fa, 0x0000a5fb, 0x0000a5fc, 0x0000a5fd,
   /* 84 */  0x0000a5fe, 0x0000a6b9, 0x0000a6ba, 0x0000a6bb,
   /* 88 */  0x0000a6bc, 0x0000a6bd, 0x0000a6be, 0x0000a6bf,
-  /* 8c */  0x0000a6c0, 0x0000a6d9, 0x0000a6da, 0x0000a6db,
-  /* 90 */  0x0000a6dc, 0x0000a6dd, 0x0000a6de, 0x0000a6df,
-  /* 94 */  0x0000a6ec, 0x0000a6ed, 0x0000a6f3, 0x0000a6f6,
+  /* 8c */  0x0000a6c0, 0x00000000, 0x00000000, 0x00000000,
+  /* 90 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 94 */  0x00000000, 0x00000000, 0x00000000, 0x0000a6f6,
   /* 98 */  0x0000a6f7, 0x0000a6f8, 0x0000a6f9, 0x0000a6fa,
   /* 9c */  0x0000a6fb, 0x0000a6fc, 0x0000a6fd, 0x0000a6fe,
   /* a0 */  0x0000a7c2, 0x0000a7c3, 0x0000a7c4, 0x0000a7c5,
@@ -9264,10 +9302,10 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a7fb, 0x0000a7fc, 0x0000a7fd, 0x0000a7fe,
   /* bc */  0x0000a896, 0x0000a897, 0x0000a898, 0x0000a899,
 
-  /*** Three byte table, leaf: ee9fxx - offset 0x07915 ***/
+  /*** Three byte table, leaf: ee9fxx - offset 0x07996 ***/
 
   /* 80 */  0x0000a89a, 0x0000a89b, 0x0000a89c, 0x0000a89d,
-  /* 84 */  0x0000a89e, 0x0000a89f, 0x0000a8a0, 0x0000a8bc,
+  /* 84 */  0x0000a89e, 0x0000a89f, 0x0000a8a0, 0x8135f437,
   /* 88 */  0x8336c830, 0x0000a8c1, 0x0000a8c2, 0x0000a8c3,
   /* 8c */  0x0000a8c4, 0x0000a8ea, 0x0000a8eb, 0x0000a8ec,
   /* 90 */  0x0000a8ed, 0x0000a8ee, 0x0000a8ef, 0x0000a8f0,
@@ -9283,7 +9321,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a99b, 0x0000a99c, 0x0000a99d, 0x0000a99e,
   /* bc */  0x0000a99f, 0x0000a9a0, 0x0000a9a1, 0x0000a9a2,
 
-  /*** Three byte table, leaf: eea0xx - offset 0x07955 ***/
+  /*** Three byte table, leaf: eea0xx - offset 0x079d6 ***/
 
   /* 80 */  0x0000a9a3, 0x0000a9f0, 0x0000a9f1, 0x0000a9f2,
   /* 84 */  0x0000a9f3, 0x0000a9f4, 0x0000a9f5, 0x0000a9f6,
@@ -9292,31 +9330,30 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* 90 */  0x0000d7fa, 0x0000d7fb, 0x0000d7fc, 0x0000d7fd,
   /* 94 */  0x0000d7fe, 0x8336c934, 0x0000fe51, 0x0000fe52,
   /* 98 */  0x0000fe53, 0x8336c935, 0x8336c936, 0x8336c937,
-  /* 9c */  0x8336c938, 0x8336c939, 0x0000fe59, 0x8336ca30,
+  /* 9c */  0x8336c938, 0x8336c939, 0x00000000, 0x8336ca30,
   /* a0 */  0x8336ca31, 0x8336ca32, 0x8336ca33, 0x8336ca34,
-  /* a4 */  0x8336ca35, 0x8336ca36, 0x0000fe61, 0x8336ca37,
-  /* a8 */  0x8336ca38, 0x8336ca39, 0x8336cb30, 0x0000fe66,
-  /* ac */  0x0000fe67, 0x8336cb31, 0x8336cb32, 0x8336cb33,
-  /* b0 */  0x8336cb34, 0x0000fe6c, 0x0000fe6d, 0x8336cb35,
+  /* a4 */  0x8336ca35, 0x8336ca36, 0x00000000, 0x8336ca37,
+  /* a8 */  0x8336ca38, 0x8336ca39, 0x8336cb30, 0x00000000,
+  /* ac */  0x00000000, 0x8336cb31, 0x8336cb32, 0x8336cb33,
+  /* b0 */  0x8336cb34, 0x0000fe6c, 0x00000000, 0x8336cb35,
   /* b4 */  0x8336cb36, 0x8336cb37, 0x8336cb38, 0x8336cb39,
   /* b8 */  0x8336cc30, 0x8336cc31, 0x8336cc32, 0x0000fe76,
   /* bc */  0x8336cc33, 0x8336cc34, 0x8336cc35, 0x8336cc36,
 
-  /*** Three byte table, leaf: eea1xx - offset 0x07995 ***/
+  /*** Three byte table, leaf: eea1xx - offset 0x07a16 ***/
 
-  /* 80 */  0x8336cc37, 0x8336cc38, 0x8336cc39, 0x0000fe7e,
+  /* 80 */  0x8336cc37, 0x8336cc38, 0x8336cc39, 0x00000000,
   /* 84 */  0x8336cd30, 0x8336cd31, 0x8336cd32, 0x8336cd33,
   /* 88 */  0x8336cd34, 0x8336cd35, 0x8336cd36, 0x8336cd37,
   /* 8c */  0x8336cd38, 0x8336cd39, 0x8336ce30, 0x8336ce31,
   /* 90 */  0x8336ce32, 0x8336ce33, 0x8336ce34, 0x8336ce35,
-  /* 94 */  0x0000fe90, 0x0000fe91, 0x8336ce36, 0x8336ce37,
+  /* 94 */  0x00000000, 0x0000fe91, 0x8336ce36, 0x8336ce37,
   /* 98 */  0x8336ce38, 0x8336ce39, 0x8336cf30, 0x8336cf31,
   /* 9c */  0x8336cf32, 0x8336cf33, 0x8336cf34, 0x8336cf35,
   /* a0 */  0x8336cf36, 0x8336cf37, 0x8336cf38, 0x8336cf39,
-  /* a4 */  0x0000fea0,
-    /* 27 trailing zero values shared with next segment */
+    /* 28 trailing zero values shared with next segment */
 
-  /*** Three byte table, leaf: efa4xx - offset 0x079ba ***/
+  /*** Three byte table, leaf: efa4xx - offset 0x07a3a ***/
 
   /* 80 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -9335,7 +9372,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x84308636, 0x84308637, 0x84308638, 0x84308639,
   /* bc */  0x84308730, 0x84308731, 0x84308732, 0x84308733,
 
-  /*** Three byte table, leaf: efa5xx - offset 0x079fa ***/
+  /*** Three byte table, leaf: efa5xx - offset 0x07a7a ***/
 
   /* 80 */  0x84308734, 0x84308735, 0x84308736, 0x84308737,
   /* 84 */  0x84308738, 0x84308739, 0x84308830, 0x84308831,
@@ -9354,7 +9391,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x84308d30, 0x0000fd9d, 0x84308d31, 0x84308d32,
   /* bc */  0x84308d33, 0x84308d34, 0x84308d35, 0x84308d36,
 
-  /*** Three byte table, leaf: efa6xx - offset 0x07a3a ***/
+  /*** Three byte table, leaf: efa6xx - offset 0x07aba ***/
 
   /* 80 */  0x84308d37, 0x84308d38, 0x84308d39, 0x84308e30,
   /* 84 */  0x84308e31, 0x84308e32, 0x84308e33, 0x84308e34,
@@ -9373,7 +9410,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x84309332, 0x84309333, 0x84309334, 0x84309335,
   /* bc */  0x84309336, 0x84309337, 0x84309338, 0x84309339,
 
-  /*** Three byte table, leaf: efa7xx - offset 0x07a7a ***/
+  /*** Three byte table, leaf: efa7xx - offset 0x07afa ***/
 
   /* 80 */  0x84309430, 0x84309431, 0x84309432, 0x84309433,
   /* 84 */  0x84309434, 0x84309435, 0x84309436, 0x84309437,
@@ -9392,7 +9429,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x84309934, 0x84309935, 0x84309936, 0x84309937,
   /* bc */  0x84309938, 0x84309939, 0x84309a30, 0x84309a31,
 
-  /*** Three byte table, leaf: efa8xx - offset 0x07aba ***/
+  /*** Three byte table, leaf: efa8xx - offset 0x07b3a ***/
 
   /* 80 */  0x84309a32, 0x84309a33, 0x84309a34, 0x84309a35,
   /* 84 */  0x84309a36, 0x84309a37, 0x84309a38, 0x84309a39,
@@ -9404,18 +9441,19 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* 9c */  0x84309c32, 0x84309c33, 0x84309c34, 0x0000fe48,
   /* a0 */  0x0000fe49, 0x0000fe4a, 0x84309c35, 0x0000fe4b,
   /* a4 */  0x0000fe4c, 0x84309c36, 0x84309c37, 0x0000fe4d,
-  /* a8 */  0x0000fe4e, 0x0000fe4f,
-    /* 22 trailing zero values shared with next segment */
+  /* a8 */  0x0000fe4e, 0x0000fe4f, 0x00000000, 0x00000000,
+  /* ac */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+    /* 16 trailing zero values shared with next segment */
 
-  /*** Three byte table, leaf: efb8xx - offset 0x07ae4 ***/
+  /*** Three byte table, leaf: efb8xx - offset 0x07b6a ***/
 
   /* 80 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 84 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 88 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* 8c */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* 90 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* 94 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
-  /* 98 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
+  /* 90 */  0x0000a6d9, 0x0000a6db, 0x0000a6da, 0x0000a6dc,
+  /* 94 */  0x0000a6dd, 0x0000a6de, 0x0000a6df, 0x0000a6ec,
+  /* 98 */  0x0000a6ed, 0x0000a6f3, 0x00000000, 0x00000000,
   /* 9c */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* a0 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
   /* a4 */  0x00000000, 0x00000000, 0x00000000, 0x00000000,
@@ -9426,7 +9464,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a6f1, 0x0000a6e2, 0x0000a6e3, 0x0000a6ee,
   /* bc */  0x0000a6ef, 0x0000a6e6, 0x0000a6e7, 0x0000a6e4,
 
-  /*** Three byte table, leaf: efb9xx - offset 0x07b24 ***/
+  /*** Three byte table, leaf: efb9xx - offset 0x07baa ***/
 
   /* 80 */  0x0000a6e5, 0x0000a6e8, 0x0000a6e9, 0x0000a6ea,
   /* 84 */  0x0000a6eb, 0x84318539, 0x84318630, 0x84318631,
@@ -9445,7 +9483,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x84318738, 0x84318739, 0x84318830, 0x84318831,
   /* bc */  0x84318832, 0x84318833, 0x84318834, 0x84318835,
 
-  /*** Three byte table, leaf: efbaxx - offset 0x07b64 ***/
+  /*** Three byte table, leaf: efbaxx - offset 0x07bea ***/
 
   /* 80 */  0x84318836, 0x84318837, 0x84318838, 0x84318839,
   /* 84 */  0x84318930, 0x84318931, 0x84318932, 0x84318933,
@@ -9464,7 +9502,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x84318e32, 0x84318e33, 0x84318e34, 0x84318e35,
   /* bc */  0x84318e36, 0x84318e37, 0x84318e38, 0x84318e39,
 
-  /*** Three byte table, leaf: efbbxx - offset 0x07ba4 ***/
+  /*** Three byte table, leaf: efbbxx - offset 0x07c2a ***/
 
   /* 80 */  0x84318f30, 0x84318f31, 0x84318f32, 0x84318f33,
   /* 84 */  0x84318f34, 0x84318f35, 0x84318f36, 0x84318f37,
@@ -9483,7 +9521,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x84319436, 0x84319437, 0x84319438, 0x84319439,
   /* bc */  0x84319530, 0x84319531, 0x84319532, 0x84319533,
 
-  /*** Three byte table, leaf: efbcxx - offset 0x07be4 ***/
+  /*** Three byte table, leaf: efbcxx - offset 0x07c6a ***/
 
   /* 80 */  0x84319534, 0x0000a3a1, 0x0000a3a2, 0x0000a3a3,
   /* 84 */  0x0000a1e7, 0x0000a3a5, 0x0000a3a6, 0x0000a3a7,
@@ -9502,7 +9540,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x0000a3d8, 0x0000a3d9, 0x0000a3da, 0x0000a3db,
   /* bc */  0x0000a3dc, 0x0000a3dd, 0x0000a3de, 0x0000a3df,
 
-  /*** Three byte table, leaf: efbdxx - offset 0x07c24 ***/
+  /*** Three byte table, leaf: efbdxx - offset 0x07caa ***/
 
   /* 80 */  0x0000a3e0, 0x0000a3e1, 0x0000a3e2, 0x0000a3e3,
   /* 84 */  0x0000a3e4, 0x0000a3e5, 0x0000a3e6, 0x0000a3e7,
@@ -9521,7 +9559,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x84319830, 0x84319831, 0x84319832, 0x84319833,
   /* bc */  0x84319834, 0x84319835, 0x84319836, 0x84319837,
 
-  /*** Three byte table, leaf: efbexx - offset 0x07c64 ***/
+  /*** Three byte table, leaf: efbexx - offset 0x07cea ***/
 
   /* 80 */  0x84319838, 0x84319839, 0x84319930, 0x84319931,
   /* 84 */  0x84319932, 0x84319933, 0x84319934, 0x84319935,
@@ -9540,7 +9578,7 @@ static const uint32 gb18030_from_unicode_tree_table[31972] =
   /* b8 */  0x84319e34, 0x84319e35, 0x84319e36, 0x84319e37,
   /* bc */  0x84319e38, 0x84319e39, 0x84319f30, 0x84319f31,
 
-  /*** Three byte table, leaf: efbfxx - offset 0x07ca4 ***/
+  /*** Three byte table, leaf: efbfxx - offset 0x07d2a ***/
 
   /* 80 */  0x84319f32, 0x84319f33, 0x84319f34, 0x84319f35,
   /* 84 */  0x84319f36, 0x84319f37, 0x84319f38, 0x84319f39,
diff --git a/src/test/regress/expected/conversion.out b/src/test/regress/expected/conversion.out
index 7dd1ef6161f..a9d009cb82e 100644
--- a/src/test/regress/expected/conversion.out
+++ b/src/test/regress/expected/conversion.out
@@ -506,6 +506,7 @@ insert into gb18030_inputs  values
   ('\x666f6fcff3',	'valid'),
   ('\x666f6f8431a530',	'valid, no translation to UTF-8'),
   ('\x666f6f84309c38',	'valid, translates to UTF-8 by mapping function'),
+  ('\xa6d9',  'valid, upgrades from 2000 to 2022'),
   ('\x666f6f84309c',	'incomplete char '),
   ('\x666f6f84309c0a',	'incomplete char, followed by newline '),
   ('\x666f6f84',		'incomplete char at end'),
@@ -521,12 +522,13 @@ select description, inbytes, (test_conv(inbytes::text::bytea, 'gb18030', 'gb1803
  valid                                          | \x666f6fcff3       | \x666f6fcff3     |              | 
  valid, no translation to UTF-8                 | \x666f6f8431a530   | \x666f6f8431a530 |              | 
  valid, translates to UTF-8 by mapping function | \x666f6f84309c38   | \x666f6f84309c38 |              | 
+ valid, upgrades from 2000 to 2022              | \xa6d9             | \xa6d9           |              | 
  incomplete char                                | \x666f6f84309c     | \x666f6f         | \x84309c     | invalid byte sequence for encoding "GB18030": 0x84 0x30 0x9c
  incomplete char, followed by newline           | \x666f6f84309c0a   | \x666f6f         | \x84309c0a   | invalid byte sequence for encoding "GB18030": 0x84 0x30 0x9c 0x0a
  incomplete char at end                         | \x666f6f84         | \x666f6f         | \x84         | invalid byte sequence for encoding "GB18030": 0x84
  invalid, NUL byte                              | \x666f6f84309c3800 | \x666f6f84309c38 | \x00         | invalid byte sequence for encoding "GB18030": 0x00
  invalid, NUL byte                              | \x666f6f84309c0038 | \x666f6f         | \x84309c0038 | invalid byte sequence for encoding "GB18030": 0x84 0x30 0x9c 0x00
-(9 rows)
+(10 rows)
 
 -- Test conversions from GB18030
 select description, inbytes, (test_conv(inbytes, 'gb18030', 'utf8')).* from gb18030_inputs;
@@ -536,12 +538,13 @@ select description, inbytes, (test_conv(inbytes, 'gb18030', 'utf8')).* from gb18
  valid                                          | \x666f6fcff3       | \x666f6fe8b1a1 |              | 
  valid, no translation to UTF-8                 | \x666f6f8431a530   | \x666f6f       | \x8431a530   | character with byte sequence 0x84 0x31 0xa5 0x30 in encoding "GB18030" has no equivalent in encoding "UTF8"
  valid, translates to UTF-8 by mapping function | \x666f6f84309c38   | \x666f6fefa8aa |              | 
+ valid, upgrades from 2000 to 2022              | \xa6d9             | \xefb890       |              | 
  incomplete char                                | \x666f6f84309c     | \x666f6f       | \x84309c     | invalid byte sequence for encoding "GB18030": 0x84 0x30 0x9c
  incomplete char, followed by newline           | \x666f6f84309c0a   | \x666f6f       | \x84309c0a   | invalid byte sequence for encoding "GB18030": 0x84 0x30 0x9c 0x0a
  incomplete char at end                         | \x666f6f84         | \x666f6f       | \x84         | invalid byte sequence for encoding "GB18030": 0x84
  invalid, NUL byte                              | \x666f6f84309c3800 | \x666f6fefa8aa | \x00         | invalid byte sequence for encoding "GB18030": 0x00
  invalid, NUL byte                              | \x666f6f84309c0038 | \x666f6f       | \x84309c0038 | invalid byte sequence for encoding "GB18030": 0x84 0x30 0x9c 0x00
-(9 rows)
+(10 rows)
 
 --
 -- ISO-8859-5
diff --git a/src/test/regress/sql/conversion.sql b/src/test/regress/sql/conversion.sql
index a80d62367a2..a8e958233e1 100644
--- a/src/test/regress/sql/conversion.sql
+++ b/src/test/regress/sql/conversion.sql
@@ -298,6 +298,7 @@ insert into gb18030_inputs  values
   ('\x666f6fcff3',	'valid'),
   ('\x666f6f8431a530',	'valid, no translation to UTF-8'),
   ('\x666f6f84309c38',	'valid, translates to UTF-8 by mapping function'),
+  ('\xa6d9',  'valid, upgrades from 2000 to 2022'),
   ('\x666f6f84309c',	'incomplete char '),
   ('\x666f6f84309c0a',	'incomplete char, followed by newline '),
   ('\x666f6f84',		'incomplete char at end'),
-- 
2.39.5 (Apple Git-154)

