Update.

2001-06-06  Ulrich Drepper  <drepper@redhat.com>

	* timezone/zic.c: Update from tzcode2001c.
	* timezone/private.h: Likewise.
	* timezone/africa: Update from tzdata2001c.
	* timezone/asia: Likewise.
	* timezone/europe: Likewise.
	* timezone/northamerica: Likewise.
	* timezone/southamerica: Likewise.
	* timezone/zone.tab: Likewise.

8 files changed, 39301 insertions, 11170 deletions

diff --git a/iconvdata/EUC-TW.irreversible b/iconvdata/EUC-TW.irreversible
new file mode 100644
index 0000000000..f722717730
--- /dev/null
+++ b/iconvdata/EUC-TW.irreversible
@@ -0,0 +1,3 @@
+0x8EA3A1B8	0x5344
+0x8EA5A1C8	0x233B3
+0x8EA5EFBA	0x2A0CC
diff --git a/iconvdata/Makefile b/iconvdata/Makefile
index 3db17d647e..ce1a87930c 100644
--- a/iconvdata/Makefile
+++ b/iconvdata/Makefile
@@ -100,6 +100,7 @@ distribute := gconv-modules extra-module.mk gap.awk gaptab.awk		    \
 	      tst-table-charmap.sh tst-table-from.c tst-table-to.c	    \
 	      EUC-JP.irreversible ISIRI-3342.irreversible SJIS.irreversible \
 	      EUC-KR.irreversible BIG5HKSCS.irreversible BIG5.irreversible  \
+	      CP1255.irreversible CP1258.irreversible EUC-TW.irreversible   \
 	      8bit-generic.c 8bit-gap.c					    \
 	      ansi_x3.110.c asmo_449.c big5.c cp737.c cp737.h		    \
 	      cp775.c cp775.h ibm874.c cns11643.c cns11643.h		    \
diff --git a/iconvdata/cns11643.c b/iconvdata/cns11643.c
index bd1994f1d9..c5a8695156 100644
--- a/iconvdata/cns11643.c
+++ b/iconvdata/cns11643.c
@@ -1,5 +1,5 @@
-/* Mapping tables for CNS 11643, plane 2 handling.
-   Copyright (C) 1998 Free Software Foundation, Inc.
+/* Mapping tables for CNS 11643, planes 2 to 7 handling.
+   Copyright (C) 1998, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998.
 
@@ -20,12 +20,29 @@
 
 #include <stdint.h>
 
-/* The following table contains no whole and is therefore compact.  Nice
+/* To generate a Unicode 3.1 CNS11643.TXT, take from
+   http://www.unicode.org/Public/Mappings/EASTASIA/OTHER/CNS11643.TXT
+   the planes 1+2
+
+     grep -v '^#' CNS11643.TXT | grep '^0x[12]' | sed -e 's/[ 	]*#.*$//'
+
+   and merge with the extracted table
+
+     grep '^U.*kIRG_TSource	' UNIHAN.TXT | sed -e 's,^U+\([0-9A-F][0-9A-F][0-9A-F][0-9A-F][0-9A-F]*\)	kIRG_TSource	\(.\)-\(....\)$,0x\2\3	0x\1,' | sort
+
+   using a "cat ... ... | sort | uniq" command.
+   The following duplicates must be treated by hand:
+       U+5344 = plane 1, 0x243F = plane 3, 0x2138
+       U+6729 = plane 5, 0x2148      U+233B3 = plane 5, 0x2148
+       U+9D8D = plane 5, 0x6F3A      U+2A0CC = plane 5, 0x6F3A
+ */
+
+/* The following table contains no hole and is therefore compact.  Nice
    work compared with the chaos of other character sets (or plane 1).
 
    The table can be generated using
 
-   egrep '^0x2' .../mappings/eastasia/other/cns11643.txt |
+   egrep '^0x2' CNS11643.TXT |
    awk '{print $1, $2}' | perl tab.pl
 
    where tab.pl is:
@@ -1961,12 +1978,12 @@ const uint16_t __cns11643l2_to_ucs4_tab[] =
   [0x1de0] = 0x9f49, [0x1de1] = 0x9f98,
 };
 
-/* The following table contains lots of small holes.  It does not pay off
-   to use an extra index table.
+/* The following table contains no hole and is therefore compact.  Nice
+   work compared with the chaos of other character sets (or plane 1).
 
    The table can be generated using
 
-   egrep '^0xE' .../mappings/eastasia/other/cns11643.txt |
+   egrep '^0x3' CNS11643.TXT |
    awk '{print $1, $2}' | perl tab.pl
 
    where tab.pl is:
@@ -1976,7 +1993,7 @@ const uint16_t __cns11643l2_to_ucs4_tab[] =
    while (<>) {
      local($cns, $ucs4, %rest) = split;
      local($u)=hex($ucs4);
-     local($c)=hex($cns)-0xE2121;
+     local($c)=hex($cns)-0x32121;
      printf ("\n ") if ($n % 4 eq 0);
      ++$n;
      printf (" [0x%04x] = 0x%04x,",
@@ -1985,1067 +2002,22642 @@ const uint16_t __cns11643l2_to_ucs4_tab[] =
    printf ("\n");
    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 */
-const uint16_t __cns11643l14_to_ucs4_tab[] =
+const uint32_t __cns11643l3_to_ucs4_tab[] =
 {
   [0x0000] = 0x4e28, [0x0001] = 0x4e36, [0x0002] = 0x4e3f, [0x0003] = 0x4e85,
   [0x0004] = 0x4e05, [0x0005] = 0x4e04, [0x0006] = 0x5182, [0x0007] = 0x5196,
   [0x0008] = 0x5338, [0x0009] = 0x5369, [0x000a] = 0x53b6, [0x000b] = 0x4e2a,
   [0x000c] = 0x4e87, [0x000d] = 0x4e49, [0x000e] = 0x51e2, [0x000f] = 0x4e46,
   [0x0010] = 0x4e8f, [0x0011] = 0x4ebc, [0x0012] = 0x4ebe, [0x0013] = 0x5166,
-  [0x0014] = 0x51e3, [0x0015] = 0x5204, [0x0016] = 0x529c, [0x0018] = 0x5902,
-  [0x0019] = 0x590a, [0x001a] = 0x5b80, [0x001b] = 0x5ddb, [0x001c] = 0x5e7a,
-  [0x001d] = 0x5e7f, [0x001e] = 0x5ef4, [0x001f] = 0x5f50, [0x0020] = 0x5f51,
-  [0x0021] = 0x5f61, [0x0022] = 0x961d, [0x0024] = 0x4e63, [0x0025] = 0x4e62,
-  [0x0026] = 0x4ea3, [0x0027] = 0x5185, [0x0028] = 0x4ec5, [0x0029] = 0x4ecf,
-  [0x002a] = 0x4ece, [0x002b] = 0x4ecc, [0x002c] = 0x5184, [0x002d] = 0x5186,
-  [0x0030] = 0x51e4, [0x0031] = 0x5205, [0x0032] = 0x529e, [0x0033] = 0x529d,
-  [0x0034] = 0x52fd, [0x0035] = 0x5300, [0x0036] = 0x533a, [0x0038] = 0x5346,
-  [0x0039] = 0x535d, [0x003a] = 0x5386, [0x003b] = 0x53b7, [0x003d] = 0x53cc,
-  [0x003f] = 0x53ce, [0x0040] = 0x5721, [0x0042] = 0x5e00, [0x0043] = 0x5f0c,
-  [0x0044] = 0x6237, [0x0045] = 0x6238, [0x0046] = 0x6534, [0x0047] = 0x6535,
-  [0x0048] = 0x65e0, [0x004a] = 0x738d, [0x004b] = 0x4e97, [0x004c] = 0x4ee0,
-  [0x004f] = 0x4ee7, [0x0051] = 0x4ee6, [0x0056] = 0x56d8, [0x0057] = 0x518b,
-  [0x0058] = 0x518c, [0x0059] = 0x5199, [0x005a] = 0x51e5, [0x005c] = 0x520b,
-  [0x005f] = 0x5304, [0x0060] = 0x5303, [0x0061] = 0x5307, [0x0063] = 0x531e,
-  [0x0064] = 0x535f, [0x0065] = 0x536d, [0x0066] = 0x5389, [0x0067] = 0x53ba,
-  [0x0068] = 0x53d0, [0x006a] = 0x53f6, [0x006b] = 0x53f7, [0x006c] = 0x53f9,
-  [0x006e] = 0x53f4, [0x0071] = 0x5724, [0x0072] = 0x5904, [0x0073] = 0x5918,
-  [0x0074] = 0x5932, [0x0075] = 0x5930, [0x0076] = 0x5934, [0x0078] = 0x5975,
-  [0x007a] = 0x5b82, [0x007b] = 0x5bf9, [0x007c] = 0x5c14, [0x0084] = 0x5e81,
-  [0x0085] = 0x5e83, [0x0086] = 0x5f0d, [0x0087] = 0x5f52, [0x0089] = 0x5fca,
-  [0x008a] = 0x5fc7, [0x008b] = 0x6239, [0x008d] = 0x624f, [0x008e] = 0x65e7,
-  [0x008f] = 0x672f, [0x0090] = 0x6b7a, [0x0091] = 0x6c39, [0x0094] = 0x6c37,
-  [0x0095] = 0x6c44, [0x0096] = 0x6c45, [0x0097] = 0x738c, [0x0098] = 0x7592,
-  [0x0099] = 0x7676, [0x009a] = 0x9093, [0x009b] = 0x9092, [0x009e] = 0x4e21,
+  [0x0014] = 0x51e3, [0x0015] = 0x5204, [0x0016] = 0x529c, [0x0017] = 0x5344,
+  [0x0018] = 0x5902, [0x0019] = 0x590a, [0x001a] = 0x5b80, [0x001b] = 0x5ddb,
+  [0x001c] = 0x5e7a, [0x001d] = 0x5e7f, [0x001e] = 0x5ef4, [0x001f] = 0x5f50,
+  [0x0020] = 0x5f51, [0x0021] = 0x5f61, [0x0022] = 0x961d, [0x0023] = 0x2000b,
+  [0x0024] = 0x4e63, [0x0025] = 0x4e62, [0x0026] = 0x4ea3, [0x0027] = 0x5185,
+  [0x0028] = 0x4ec5, [0x0029] = 0x4ecf, [0x002a] = 0x4ece, [0x002b] = 0x4ecc,
+  [0x002c] = 0x5184, [0x002d] = 0x5186, [0x002f] = 0x34c5, [0x0030] = 0x51e4,
+  [0x0031] = 0x5205, [0x0032] = 0x529e, [0x0033] = 0x529d, [0x0034] = 0x52fd,
+  [0x0035] = 0x5300, [0x0036] = 0x533a, [0x0037] = 0x3539, [0x0038] = 0x5346,
+  [0x0039] = 0x535d, [0x003a] = 0x5386, [0x003b] = 0x53b7, [0x003c] = 0x3555,
+  [0x003d] = 0x53cc, [0x003e] = 0x355b, [0x003f] = 0x53ce, [0x0040] = 0x5721,
+  [0x0041] = 0x37a2, [0x0042] = 0x5e00, [0x0043] = 0x5f0c, [0x0044] = 0x6237,
+  [0x0045] = 0x6238, [0x0046] = 0x6534, [0x0047] = 0x6535, [0x0048] = 0x65e0,
+  [0x0049] = 0x3e26, [0x004a] = 0x738d, [0x004b] = 0x4e97, [0x004c] = 0x4ee0,
+  [0x004d] = 0x3432, [0x004e] = 0x201a9, [0x004f] = 0x4ee7, [0x0050] = 0x3433,
+  [0x0051] = 0x4ee6, [0x0052] = 0x3434, [0x0053] = 0x36a2, [0x0054] = 0x3431,
+  [0x0055] = 0x34b0, [0x0056] = 0x56d8, [0x0057] = 0x518b, [0x0058] = 0x518c,
+  [0x0059] = 0x5199, [0x005a] = 0x51e5, [0x005c] = 0x520b, [0x005d] = 0x34dc,
+  [0x005e] = 0x361e, [0x005f] = 0x5304, [0x0060] = 0x5303, [0x0061] = 0x5307,
+  [0x0063] = 0x531e, [0x0064] = 0x535f, [0x0065] = 0x536d, [0x0066] = 0x5389,
+  [0x0067] = 0x53ba, [0x0068] = 0x53d0, [0x0069] = 0x3565, [0x006a] = 0x53f6,
+  [0x006b] = 0x53f7, [0x006c] = 0x53f9, [0x006d] = 0x3564, [0x006e] = 0x53f4,
+  [0x006f] = 0x361d, [0x0070] = 0x3626, [0x0071] = 0x5724, [0x0072] = 0x5904,
+  [0x0073] = 0x5918, [0x0074] = 0x5932, [0x0075] = 0x5930, [0x0076] = 0x5934,
+  [0x0077] = 0x368e, [0x0078] = 0x5975, [0x0079] = 0x374a, [0x007a] = 0x5b82,
+  [0x007b] = 0x5bf9, [0x007c] = 0x5c14, [0x007d] = 0x378b, [0x007e] = 0x37a6,
+  [0x007f] = 0x37a4, [0x0080] = 0x37a5, [0x0081] = 0x37a7, [0x0082] = 0x382f,
+  [0x0083] = 0x3832, [0x0084] = 0x5e81, [0x0085] = 0x5e83, [0x0086] = 0x5f0d,
+  [0x0087] = 0x5f52, [0x0088] = 0x38d4, [0x0089] = 0x5fca, [0x008a] = 0x5fc7,
+  [0x008b] = 0x6239, [0x008c] = 0x39c5, [0x008d] = 0x624f, [0x008e] = 0x65e7,
+  [0x008f] = 0x672f, [0x0090] = 0x6b7a, [0x0091] = 0x6c39, [0x0092] = 0x3cba,
+  [0x0093] = 0x3cb9, [0x0094] = 0x6c37, [0x0095] = 0x6c44, [0x0096] = 0x6c45,
+  [0x0097] = 0x738c, [0x0098] = 0x7592, [0x0099] = 0x7676, [0x009a] = 0x9093,
+  [0x009b] = 0x9092, [0x009c] = 0x48b3, [0x009d] = 0x49ba, [0x009e] = 0x4e21,
   [0x009f] = 0x4e20, [0x00a0] = 0x4e22, [0x00a1] = 0x4e68, [0x00a2] = 0x4e89,
-  [0x00a3] = 0x4e98, [0x00a4] = 0x4ef9, [0x00a5] = 0x4eef, [0x00a8] = 0x4ef8,
-  [0x00a9] = 0x4f06, [0x00aa] = 0x4f03, [0x00ab] = 0x4efc, [0x00ac] = 0x4eee,
-  [0x00ad] = 0x4f16, [0x00af] = 0x4f28, [0x00b0] = 0x4f1c, [0x00b1] = 0x4f07,
-  [0x00b2] = 0x4f1a, [0x00b3] = 0x4efa, [0x00b4] = 0x4f17, [0x00b5] = 0x514a,
+  [0x00a3] = 0x4e98, [0x00a4] = 0x4ef9, [0x00a5] = 0x4eef, [0x00a6] = 0x343b,
+  [0x00a7] = 0x343c, [0x00a8] = 0x4ef8, [0x00a9] = 0x4f06, [0x00aa] = 0x4f03,
+  [0x00ab] = 0x4efc, [0x00ac] = 0x4eee, [0x00ad] = 0x4f16, [0x00ae] = 0x3439,
+  [0x00af] = 0x4f28, [0x00b0] = 0x4f1c, [0x00b1] = 0x4f07, [0x00b2] = 0x4f1a,
+  [0x00b3] = 0x4efa, [0x00b4] = 0x4f17, [0x00b5] = 0x514a, [0x00b6] = 0x34b2,
   [0x00b7] = 0x5172, [0x00b9] = 0x51b4, [0x00ba] = 0x51b3, [0x00bb] = 0x51b2,
-  [0x00bd] = 0x51e8, [0x00bf] = 0x5214, [0x00c0] = 0x520f, [0x00c1] = 0x5215,
-  [0x00c2] = 0x5218, [0x00c3] = 0x52a8, [0x00c5] = 0x534b, [0x00c6] = 0x534f,
-  [0x00c8] = 0x5350, [0x00ca] = 0x538b, [0x00cc] = 0x53be, [0x00ce] = 0x53d2,
-  [0x00cf] = 0x5416, [0x00d0] = 0x53ff, [0x00d2] = 0x5400, [0x00d4] = 0x5405,
-  [0x00d5] = 0x5413, [0x00d6] = 0x5415, [0x00d9] = 0x56e3, [0x00da] = 0x5735,
-  [0x00db] = 0x5736, [0x00dc] = 0x5731, [0x00dd] = 0x5732, [0x00de] = 0x58ee,
-  [0x00df] = 0x5905, [0x00e0] = 0x4e54, [0x00e2] = 0x5936, [0x00e6] = 0x597a,
-  [0x00e8] = 0x5986, [0x00eb] = 0x5b86, [0x00ec] = 0x5f53, [0x00ed] = 0x5c18,
-  [0x00ef] = 0x5c3d, [0x00f0] = 0x5c78, [0x00f5] = 0x5c80, [0x00f7] = 0x5e08,
-  [0x00fc] = 0x5ef5, [0x00fd] = 0x5f0e, [0x0101] = 0x5fd3, [0x0102] = 0x5fda,
-  [0x0104] = 0x5fdb, [0x0106] = 0x620f, [0x0107] = 0x625d, [0x0108] = 0x625f,
-  [0x0109] = 0x6267, [0x010a] = 0x6257, [0x010b] = 0x9f50, [0x010d] = 0x65eb,
-  [0x010e] = 0x65ea, [0x0110] = 0x6737, [0x0112] = 0x6732, [0x0113] = 0x6736,
-  [0x0114] = 0x6b22, [0x0115] = 0x6bce, [0x0117] = 0x6c58, [0x0118] = 0x6c51,
-  [0x0119] = 0x6c77, [0x011a] = 0x6c3c, [0x011c] = 0x6c5a, [0x011e] = 0x6c53,
-  [0x011f] = 0x706f, [0x0120] = 0x7072, [0x0121] = 0x706e, [0x0124] = 0x7073,
-  [0x0125] = 0x72b1, [0x0126] = 0x72b2, [0x0128] = 0x738f, [0x012c] = 0x793c,
-  [0x012e] = 0x808d, [0x012f] = 0x808e, [0x0131] = 0x827b, [0x0133] = 0x8d71,
-  [0x0134] = 0x8fb9, [0x0135] = 0x9096, [0x0136] = 0x909a, [0x0138] = 0x4e24,
-  [0x0139] = 0x4e71, [0x013b] = 0x4e9c, [0x013c] = 0x4f45, [0x013d] = 0x4f4a,
-  [0x013e] = 0x4f39, [0x013f] = 0x4f37, [0x0141] = 0x4f32, [0x0142] = 0x4f42,
-  [0x0144] = 0x4f44, [0x0145] = 0x4f4b, [0x0147] = 0x4f40, [0x0148] = 0x4f35,
-  [0x0149] = 0x4f31, [0x014a] = 0x5151, [0x014c] = 0x5150, [0x014d] = 0x514e,
-  [0x0150] = 0x519d, [0x0152] = 0x51b5, [0x0153] = 0x51b8, [0x0154] = 0x51ec,
+  [0x00bc] = 0x34c7, [0x00bd] = 0x51e8, [0x00be] = 0x342b, [0x00bf] = 0x5214,
+  [0x00c0] = 0x520f, [0x00c1] = 0x5215, [0x00c2] = 0x5218, [0x00c3] = 0x52a8,
+  [0x00c5] = 0x534b, [0x00c6] = 0x534f, [0x00c7] = 0x353b, [0x00c8] = 0x5350,
+  [0x00c9] = 0x3544, [0x00ca] = 0x538b, [0x00cb] = 0x3542, [0x00cc] = 0x53be,
+  [0x00cd] = 0x355c, [0x00ce] = 0x53d2, [0x00cf] = 0x5416, [0x00d0] = 0x53ff,
+  [0x00d1] = 0x3567, [0x00d2] = 0x5400, [0x00d3] = 0x3566, [0x00d4] = 0x5405,
+  [0x00d5] = 0x5413, [0x00d6] = 0x5415, [0x00d8] = 0x361f, [0x00d9] = 0x56e3,
+  [0x00da] = 0x5735, [0x00db] = 0x5736, [0x00dc] = 0x5731, [0x00dd] = 0x5732,
+  [0x00de] = 0x58ee, [0x00df] = 0x5905, [0x00e0] = 0x4e54, [0x00e1] = 0x368f,
+  [0x00e2] = 0x5936, [0x00e3] = 0x3690, [0x00e4] = 0x36a8, [0x00e5] = 0x36a4,
+  [0x00e6] = 0x597a, [0x00e7] = 0x36a3, [0x00e8] = 0x5986, [0x00e9] = 0x373d,
+  [0x00ea] = 0x374c, [0x00eb] = 0x5b86, [0x00ec] = 0x5f53, [0x00ed] = 0x5c18,
+  [0x00ee] = 0x378c, [0x00ef] = 0x5c3d, [0x00f0] = 0x5c78, [0x00f1] = 0x37a8,
+  [0x00f2] = 0x37ad, [0x00f3] = 0x37af, [0x00f4] = 0x21d46, [0x00f5] = 0x5c80,
+  [0x00f6] = 0x3829, [0x00f7] = 0x5e08, [0x00f8] = 0x3836, [0x00f9] = 0x3871,
+  [0x00fa] = 0x3870, [0x00fb] = 0x386f, [0x00fc] = 0x5ef5, [0x00fd] = 0x5f0e,
+  [0x00fe] = 0x38a9, [0x00ff] = 0x38aa, [0x0100] = 0x38fb, [0x0101] = 0x5fd3,
+  [0x0102] = 0x5fda, [0x0103] = 0x38fc, [0x0104] = 0x5fdb, [0x0105] = 0x39ae,
+  [0x0106] = 0x620f, [0x0107] = 0x625d, [0x0108] = 0x625f, [0x0109] = 0x6267,
+  [0x010a] = 0x6257, [0x010b] = 0x9f50, [0x010c] = 0x3ac3, [0x010d] = 0x65eb,
+  [0x010e] = 0x65ea, [0x010f] = 0x3b30, [0x0110] = 0x6737, [0x0111] = 0x3b41,
+  [0x0112] = 0x6732, [0x0113] = 0x6736, [0x0114] = 0x6b22, [0x0115] = 0x6bce,
+  [0x0116] = 0x3c8c, [0x0117] = 0x6c58, [0x0118] = 0x6c51, [0x0119] = 0x6c77,
+  [0x011a] = 0x6c3c, [0x011b] = 0x3cbb, [0x011c] = 0x6c5a, [0x011d] = 0x23c86,
+  [0x011e] = 0x6c53, [0x011f] = 0x706f, [0x0120] = 0x7072, [0x0121] = 0x706e,
+  [0x0123] = 0x3da1, [0x0124] = 0x7073, [0x0125] = 0x72b1, [0x0126] = 0x72b2,
+  [0x0127] = 0x3ea8, [0x0128] = 0x738f, [0x0129] = 0x3eaa, [0x012a] = 0x3eab,
+  [0x012b] = 0x4096, [0x012c] = 0x793c, [0x012d] = 0x41c2, [0x012e] = 0x808d,
+  [0x012f] = 0x808e, [0x0130] = 0x4493, [0x0131] = 0x827b, [0x0132] = 0x4494,
+  [0x0133] = 0x8d71, [0x0134] = 0x8fb9, [0x0135] = 0x9096, [0x0136] = 0x909a,
+  [0x0137] = 0x49bb, [0x0138] = 0x4e24, [0x0139] = 0x4e71, [0x013b] = 0x4e9c,
+  [0x013c] = 0x4f45, [0x013d] = 0x4f4a, [0x013e] = 0x4f39, [0x013f] = 0x4f37,
+  [0x0140] = 0x3443, [0x0141] = 0x4f32, [0x0142] = 0x4f42, [0x0143] = 0x3442,
+  [0x0144] = 0x4f44, [0x0145] = 0x4f4b, [0x0146] = 0x3444, [0x0147] = 0x4f40,
+  [0x0148] = 0x4f35, [0x0149] = 0x4f31, [0x014a] = 0x5151, [0x014c] = 0x5150,
+  [0x014d] = 0x514e, [0x014e] = 0x34b3, [0x014f] = 0x34b7, [0x0150] = 0x519d,
+  [0x0151] = 0x34c8, [0x0152] = 0x51b5, [0x0153] = 0x51b8, [0x0154] = 0x51ec,
   [0x0155] = 0x5223, [0x0156] = 0x5227, [0x0157] = 0x5226, [0x0158] = 0x521f,
   [0x0159] = 0x522b, [0x015a] = 0x5220, [0x015b] = 0x52b4, [0x015c] = 0x52b3,
-  [0x015e] = 0x5325, [0x015f] = 0x533b, [0x0160] = 0x5374, [0x0166] = 0x544d,
-  [0x0169] = 0x543a, [0x016c] = 0x5444, [0x016d] = 0x544c, [0x016e] = 0x5423,
-  [0x016f] = 0x541a, [0x0170] = 0x5432, [0x0171] = 0x544b, [0x0172] = 0x5421,
-  [0x0174] = 0x5434, [0x0175] = 0x5449, [0x0176] = 0x5450, [0x0177] = 0x5422,
-  [0x0178] = 0x543f, [0x0179] = 0x5451, [0x017a] = 0x545a, [0x017b] = 0x542f,
+  [0x015d] = 0x3518, [0x015e] = 0x5325, [0x015f] = 0x533b, [0x0160] = 0x5374,
+  [0x0161] = 0x3547, [0x0162] = 0x3546, [0x0163] = 0x3545, [0x0164] = 0x356b,
+  [0x0165] = 0x3569, [0x0166] = 0x544d, [0x0167] = 0x3572, [0x0168] = 0x3571,
+  [0x0169] = 0x543a, [0x016a] = 0x356c, [0x016b] = 0x356f, [0x016c] = 0x5444,
+  [0x016d] = 0x544c, [0x016e] = 0x5423, [0x016f] = 0x541a, [0x0170] = 0x5432,
+  [0x0171] = 0x544b, [0x0172] = 0x5421, [0x0173] = 0x3573, [0x0174] = 0x5434,
+  [0x0175] = 0x5449, [0x0176] = 0x5450, [0x0177] = 0x5422, [0x0178] = 0x543f,
+  [0x0179] = 0x5451, [0x017a] = 0x545a, [0x017b] = 0x542f, [0x017c] = 0x3576,
   [0x017d] = 0x56e9, [0x017e] = 0x56f2, [0x017f] = 0x56f3, [0x0180] = 0x56ef,
   [0x0181] = 0x56ed, [0x0182] = 0x56ec, [0x0183] = 0x56e6, [0x0184] = 0x5748,
-  [0x0186] = 0x5744, [0x0187] = 0x573f, [0x0188] = 0x573c, [0x0189] = 0x5753,
-  [0x018a] = 0x5756, [0x018c] = 0x575f, [0x018d] = 0x5743, [0x018e] = 0x5758,
-  [0x018f] = 0x5757, [0x0193] = 0x5746, [0x0195] = 0x573d, [0x0197] = 0x5742,
-  [0x0198] = 0x5754, [0x0199] = 0x5755, [0x019a] = 0x58f1, [0x019b] = 0x58f2,
-  [0x019c] = 0x58f0, [0x019d] = 0x590b, [0x019e] = 0x9ea6, [0x019f] = 0x56f1,
-  [0x01a0] = 0x593d, [0x01a2] = 0x5994, [0x01a3] = 0x598c, [0x01a5] = 0x599c,
-  [0x01a8] = 0x599f, [0x01aa] = 0x599b, [0x01ac] = 0x5989, [0x01ad] = 0x599a,
-  [0x01af] = 0x6588, [0x01b1] = 0x5b8d, [0x01b3] = 0x5bfe, [0x01b4] = 0x5bff,
-  [0x01b5] = 0x5bfd, [0x01b6] = 0x5c2b, [0x01b8] = 0x5c84, [0x01b9] = 0x5c8e,
-  [0x01ba] = 0x5c9c, [0x01bd] = 0x5c85, [0x01be] = 0x5df5, [0x01bf] = 0x5e09,
-  [0x01c2] = 0x5e0b, [0x01c4] = 0x5e92, [0x01c5] = 0x5e90, [0x01c6] = 0x5f03,
-  [0x01c8] = 0x5f1e, [0x01c9] = 0x5f63, [0x01cb] = 0x5fe7, [0x01cc] = 0x5ffe,
-  [0x01cd] = 0x5fe6, [0x01ce] = 0x5fdc, [0x01cf] = 0x5fce, [0x01d1] = 0x5ffc,
-  [0x01d2] = 0x5fdf, [0x01d3] = 0x5fec, [0x01d4] = 0x5ff6, [0x01d6] = 0x5ff2,
-  [0x01d7] = 0x5ff0, [0x01d8] = 0x5ff9, [0x01da] = 0x6213, [0x01dd] = 0x623b,
-  [0x01de] = 0x623c, [0x01df] = 0x6282, [0x01e3] = 0x6278, [0x01e4] = 0x628b,
+  [0x0185] = 0x3627, [0x0186] = 0x5744, [0x0187] = 0x573f, [0x0188] = 0x573c,
+  [0x0189] = 0x5753, [0x018a] = 0x5756, [0x018b] = 0x3630, [0x018c] = 0x575f,
+  [0x018d] = 0x5743, [0x018e] = 0x5758, [0x018f] = 0x5757, [0x0190] = 0x3629,
+  [0x0191] = 0x362a, [0x0192] = 0x362f, [0x0193] = 0x5746, [0x0194] = 0x362c,
+  [0x0195] = 0x573d, [0x0196] = 0x362d, [0x0197] = 0x5742, [0x0198] = 0x5754,
+  [0x0199] = 0x5755, [0x019a] = 0x58f1, [0x019b] = 0x58f2, [0x019c] = 0x58f0,
+  [0x019d] = 0x590b, [0x019e] = 0x9ea6, [0x019f] = 0x56f1, [0x01a0] = 0x593d,
+  [0x01a1] = 0x3693, [0x01a2] = 0x5994, [0x01a3] = 0x598c, [0x01a4] = 0x36ad,
+  [0x01a5] = 0x599c, [0x01a6] = 0x36ac, [0x01a7] = 0x36ab, [0x01a8] = 0x599f,
+  [0x01a9] = 0x36a9, [0x01aa] = 0x599b, [0x01ab] = 0x36ae, [0x01ac] = 0x5989,
+  [0x01ad] = 0x599a, [0x01ae] = 0x36aa, [0x01af] = 0x6588, [0x01b0] = 0x374e,
+  [0x01b1] = 0x5b8d, [0x01b2] = 0x3750, [0x01b3] = 0x5bfe, [0x01b4] = 0x5bff,
+  [0x01b5] = 0x5bfd, [0x01b6] = 0x5c2b, [0x01b7] = 0x37b2, [0x01b8] = 0x5c84,
+  [0x01b9] = 0x5c8e, [0x01ba] = 0x5c9c, [0x01bb] = 0x37b5, [0x01bc] = 0x37b6,
+  [0x01bd] = 0x5c85, [0x01be] = 0x5df5, [0x01bf] = 0x5e09, [0x01c0] = 0x3839,
+  [0x01c1] = 0x383b, [0x01c2] = 0x5e0b, [0x01c3] = 0x3872, [0x01c4] = 0x5e92,
+  [0x01c5] = 0x5e90, [0x01c6] = 0x5f03, [0x01c7] = 0x38ac, [0x01c8] = 0x5f1e,
+  [0x01c9] = 0x5f63, [0x01ca] = 0x3908, [0x01cb] = 0x5fe7, [0x01cc] = 0x5ffe,
+  [0x01cd] = 0x5fe6, [0x01ce] = 0x5fdc, [0x01cf] = 0x5fce, [0x01d0] = 0x3903,
+  [0x01d1] = 0x5ffc, [0x01d2] = 0x5fdf, [0x01d3] = 0x5fec, [0x01d4] = 0x5ff6,
+  [0x01d5] = 0x225d7, [0x01d6] = 0x5ff2, [0x01d7] = 0x5ff0, [0x01d8] = 0x5ff9,
+  [0x01d9] = 0x390b, [0x01da] = 0x6213, [0x01db] = 0x39af, [0x01dd] = 0x623b,
+  [0x01de] = 0x623c, [0x01df] = 0x6282, [0x01e0] = 0x39ce, [0x01e1] = 0x39cb,
+  [0x01e2] = 0x39cc, [0x01e3] = 0x6278, [0x01e4] = 0x628b, [0x01e5] = 0x39cd,
   [0x01e6] = 0x629e, [0x01e7] = 0x62a5, [0x01e8] = 0x629b, [0x01e9] = 0x629c,
   [0x01ea] = 0x6299, [0x01eb] = 0x628d, [0x01ec] = 0x6285, [0x01ed] = 0x629d,
-  [0x01ee] = 0x6275, [0x01f2] = 0x65f6, [0x01f6] = 0x66f5, [0x01f7] = 0x675b,
-  [0x01f9] = 0x6754, [0x01fa] = 0x6752, [0x01fc] = 0x6758, [0x01fd] = 0x6744,
-  [0x01fe] = 0x674a, [0x01ff] = 0x6761, [0x0201] = 0x6c7f, [0x0202] = 0x6c91,
-  [0x0203] = 0x6c9e, [0x0205] = 0x6c6e, [0x0206] = 0x6c7c, [0x0207] = 0x6c9f,
-  [0x0208] = 0x6c75, [0x020a] = 0x6c56, [0x020b] = 0x6ca2, [0x020c] = 0x6c79,
-  [0x020e] = 0x6ca1, [0x0210] = 0x6caa, [0x0211] = 0x6ca0, [0x0213] = 0x7079,
-  [0x0214] = 0x7077, [0x0215] = 0x707e, [0x0217] = 0x7075, [0x0218] = 0x707b,
-  [0x0219] = 0x7264, [0x021b] = 0x72bb, [0x021c] = 0x72bc, [0x021d] = 0x72c7,
-  [0x021e] = 0x72b9, [0x021f] = 0x72be, [0x0220] = 0x72b6, [0x0223] = 0x7398,
-  [0x0228] = 0x7593, [0x0229] = 0x7680, [0x022b] = 0x7683, [0x022c] = 0x76c0,
-  [0x022d] = 0x76c1, [0x0230] = 0x77f4, [0x0231] = 0x77f5, [0x0233] = 0x7acc,
-  [0x0234] = 0x7acd, [0x0235] = 0x7cfa, [0x0236] = 0x809f, [0x0237] = 0x8091,
-  [0x0238] = 0x8097, [0x0239] = 0x8094, [0x023b] = 0x8286, [0x023c] = 0x828c,
-  [0x023e] = 0x8295, [0x0240] = 0x866c, [0x0242] = 0x8fb5, [0x0243] = 0x8fbe,
-  [0x0244] = 0x8fc7, [0x0246] = 0x8fc1, [0x0247] = 0x90a9, [0x0248] = 0x90a4,
-  [0x024c] = 0x90a8, [0x024d] = 0x9627, [0x024e] = 0x9626, [0x024f] = 0x962b,
-  [0x0250] = 0x9633, [0x0251] = 0x9634, [0x0252] = 0x9629, [0x0253] = 0x4e3d,
-  [0x0255] = 0x4e9d, [0x0256] = 0x4f93, [0x0257] = 0x4f8a, [0x025a] = 0x4f6d,
+  [0x01ee] = 0x6275, [0x01ef] = 0x3a80, [0x01f0] = 0x3aaf, [0x01f1] = 0x3ad3,
+  [0x01f2] = 0x65f6, [0x01f3] = 0x3ad5, [0x01f4] = 0x3ad4, [0x01f5] = 0x3ad7,
+  [0x01f6] = 0x66f5, [0x01f7] = 0x675b, [0x01f8] = 0x3b42, [0x01f9] = 0x6754,
+  [0x01fa] = 0x6752, [0x01fb] = 0x3b44, [0x01fc] = 0x6758, [0x01fd] = 0x6744,
+  [0x01fe] = 0x674a, [0x01ff] = 0x6761, [0x0200] = 0x3cc6, [0x0201] = 0x6c7f,
+  [0x0202] = 0x6c91, [0x0203] = 0x6c9e, [0x0204] = 0x3cc0, [0x0205] = 0x6c6e,
+  [0x0206] = 0x6c7c, [0x0207] = 0x6c9f, [0x0208] = 0x6c75, [0x0209] = 0x3cbe,
+  [0x020a] = 0x6c56, [0x020b] = 0x6ca2, [0x020c] = 0x6c79, [0x020d] = 0x3cca,
+  [0x020e] = 0x6ca1, [0x020f] = 0x3cc4, [0x0210] = 0x6caa, [0x0211] = 0x6ca0,
+  [0x0212] = 0x3cc2, [0x0213] = 0x7079, [0x0214] = 0x7077, [0x0215] = 0x707e,
+  [0x0216] = 0x3da4, [0x0217] = 0x7075, [0x0218] = 0x707b, [0x0219] = 0x7264,
+  [0x021a] = 0x3e29, [0x021b] = 0x72bb, [0x021c] = 0x72bc, [0x021d] = 0x72c7,
+  [0x021e] = 0x72b9, [0x021f] = 0x72be, [0x0220] = 0x72b6, [0x0221] = 0x3e60,
+  [0x0222] = 0x3e5e, [0x0223] = 0x7398, [0x0224] = 0x3ead, [0x0225] = 0x3eae,
+  [0x0226] = 0x3eac, [0x0227] = 0x3f57, [0x0228] = 0x7593, [0x0229] = 0x7680,
+  [0x022a] = 0x3fdd, [0x022b] = 0x7683, [0x022c] = 0x76c0, [0x022d] = 0x76c1,
+  [0x022e] = 0x400e, [0x022f] = 0x4097, [0x0230] = 0x77f4, [0x0231] = 0x77f5,
+  [0x0232] = 0x4127, [0x0233] = 0x7acc, [0x0234] = 0x7acd, [0x0235] = 0x7cfa,
+  [0x0236] = 0x809f, [0x0237] = 0x8091, [0x0238] = 0x8097, [0x0239] = 0x8094,
+  [0x023a] = 0x4495, [0x023b] = 0x8286, [0x023c] = 0x828c, [0x023e] = 0x8295,
+  [0x023f] = 0x4498, [0x0240] = 0x866c, [0x0241] = 0x459d, [0x0242] = 0x8fb5,
+  [0x0243] = 0x8fbe, [0x0244] = 0x8fc7, [0x0245] = 0x488a, [0x0246] = 0x8fc1,
+  [0x0247] = 0x90a9, [0x0248] = 0x90a4, [0x0249] = 0x48b5, [0x024a] = 0x48b6,
+  [0x024b] = 0x48b7, [0x024c] = 0x90a8, [0x024d] = 0x9627, [0x024e] = 0x9626,
+  [0x024f] = 0x962b, [0x0250] = 0x9633, [0x0251] = 0x9634, [0x0252] = 0x9629,
+  [0x0253] = 0x4e3d, [0x0254] = 0x3428, [0x0255] = 0x4e9d, [0x0256] = 0x4f93,
+  [0x0257] = 0x4f8a, [0x0258] = 0x344d, [0x0259] = 0x3449, [0x025a] = 0x4f6d,
   [0x025b] = 0x4f8e, [0x025c] = 0x4fa0, [0x025d] = 0x4fa2, [0x025e] = 0x4fa1,
-  [0x025f] = 0x4f9f, [0x0260] = 0x4fa3, [0x0262] = 0x4f72, [0x0264] = 0x4f8c,
-  [0x0265] = 0x5156, [0x0268] = 0x5190, [0x026c] = 0x51ed, [0x026d] = 0x51fe,
-  [0x026e] = 0x522f, [0x0270] = 0x523c, [0x0271] = 0x5234, [0x0272] = 0x5239,
-  [0x0273] = 0x52b9, [0x0274] = 0x52b5, [0x0275] = 0x52bf, [0x0276] = 0x5355,
-  [0x0278] = 0x5376, [0x0279] = 0x537a, [0x027a] = 0x5393, [0x027c] = 0x53c1,
-  [0x027d] = 0x53c2, [0x027e] = 0x53d5, [0x027f] = 0x5485, [0x0281] = 0x545f,
-  [0x0282] = 0x5493, [0x0283] = 0x5489, [0x0284] = 0x5479, [0x0285] = 0x9efe,
-  [0x0286] = 0x548f, [0x0287] = 0x5469, [0x0288] = 0x546d, [0x028a] = 0x5494,
-  [0x028b] = 0x546a, [0x028c] = 0x548a, [0x028e] = 0x56fd, [0x028f] = 0x56fb,
-  [0x0290] = 0x56f8, [0x0292] = 0x56fc, [0x0293] = 0x56f6, [0x0294] = 0x5765,
-  [0x0295] = 0x5781, [0x0296] = 0x5763, [0x0297] = 0x5767, [0x0299] = 0x576e,
-  [0x029a] = 0x5778, [0x029b] = 0x577f, [0x029e] = 0x58f3, [0x029f] = 0x594b,
-  [0x02a0] = 0x594c, [0x02a4] = 0x59ad, [0x02a6] = 0x59c4, [0x02a8] = 0x59c2,
-  [0x02a9] = 0x59b0, [0x02ae] = 0x59bf, [0x02b0] = 0x59c9, [0x02b1] = 0x59b8,
-  [0x02b2] = 0x59ac, [0x02b6] = 0x59b7, [0x02b7] = 0x59d7, [0x02b9] = 0x5b60,
-  [0x02bb] = 0x5b96, [0x02bc] = 0x5b9e, [0x02bd] = 0x5b94, [0x02be] = 0x5b9f,
-  [0x02bf] = 0x5b9d, [0x02c1] = 0x5c00, [0x02c2] = 0x5c19, [0x02c5] = 0x5c49,
-  [0x02c6] = 0x5c4a, [0x02c8] = 0x5cbb, [0x02c9] = 0x5cc1, [0x02cd] = 0x5cb9,
-  [0x02ce] = 0x5c9e, [0x02cf] = 0x5cb4, [0x02d0] = 0x5cba, [0x02d1] = 0x5df6,
-  [0x02d2] = 0x5e13, [0x02d3] = 0x5e12, [0x02d4] = 0x5e77, [0x02d6] = 0x5e98,
-  [0x02d8] = 0x5e99, [0x02d9] = 0x5e9d, [0x02da] = 0x5ef8, [0x02dc] = 0x5ef9,
-  [0x02de] = 0x5f06, [0x02df] = 0x5f21, [0x02e1] = 0x5f25, [0x02e2] = 0x5f55,
-  [0x02e6] = 0x5f84, [0x02e7] = 0x5f83, [0x02e8] = 0x6030, [0x02e9] = 0x6007,
-  [0x02eb] = 0x6036, [0x02ef] = 0x5fe9, [0x02f0] = 0x603d, [0x02f1] = 0x6008,
-  [0x02f4] = 0x62ba, [0x02f5] = 0x62b2, [0x02f7] = 0x62b7, [0x02f8] = 0x62e4,
-  [0x02f9] = 0x62a7, [0x02fd] = 0x62d5, [0x02fe] = 0x62e1, [0x02ff] = 0x62dd,
-  [0x0300] = 0x62a6, [0x0301] = 0x62c1, [0x0302] = 0x62c5, [0x0303] = 0x62c0,
-  [0x0304] = 0x62df, [0x0305] = 0x62e0, [0x0306] = 0x62de, [0x0308] = 0x6589,
-  [0x030a] = 0x65a6, [0x030b] = 0x65ba, [0x030d] = 0x65ff, [0x030f] = 0x6617,
-  [0x0310] = 0x6618, [0x0311] = 0x6601, [0x0312] = 0x65fe, [0x0314] = 0x670c,
-  [0x0316] = 0x676b, [0x0317] = 0x6796, [0x0318] = 0x6782, [0x0319] = 0x678a,
-  [0x031b] = 0x67a3, [0x031d] = 0x67a2, [0x031e] = 0x678f, [0x0320] = 0x67f9,
+  [0x025f] = 0x4f9f, [0x0260] = 0x4fa3, [0x0261] = 0x20209, [0x0262] = 0x4f72,
+  [0x0263] = 0x3451, [0x0264] = 0x4f8c, [0x0265] = 0x5156, [0x0268] = 0x5190,
+  [0x0269] = 0x34cb, [0x026a] = 0x34ca, [0x026b] = 0x34cc, [0x026c] = 0x51ed,
+  [0x026d] = 0x51fe, [0x026e] = 0x522f, [0x026f] = 0x206ec, [0x0270] = 0x523c,
+  [0x0271] = 0x5234, [0x0272] = 0x5239, [0x0273] = 0x52b9, [0x0274] = 0x52b5,
+  [0x0275] = 0x52bf, [0x0276] = 0x5355, [0x0277] = 0x353d, [0x0278] = 0x5376,
+  [0x0279] = 0x537a, [0x027a] = 0x5393, [0x027b] = 0x3548, [0x027c] = 0x53c1,
+  [0x027d] = 0x53c2, [0x027e] = 0x53d5, [0x027f] = 0x5485, [0x0280] = 0x3578,
+  [0x0281] = 0x545f, [0x0282] = 0x5493, [0x0283] = 0x5489, [0x0284] = 0x5479,
+  [0x0285] = 0x9efe, [0x0286] = 0x548f, [0x0287] = 0x5469, [0x0288] = 0x546d,
+  [0x0289] = 0x357a, [0x028a] = 0x5494, [0x028b] = 0x546a, [0x028c] = 0x548a,
+  [0x028d] = 0x3577, [0x028e] = 0x56fd, [0x028f] = 0x56fb, [0x0290] = 0x56f8,
+  [0x0291] = 0x3621, [0x0292] = 0x56fc, [0x0293] = 0x56f6, [0x0294] = 0x5765,
+  [0x0295] = 0x5781, [0x0296] = 0x5763, [0x0297] = 0x5767, [0x0298] = 0x3631,
+  [0x0299] = 0x576e, [0x029a] = 0x5778, [0x029b] = 0x577f, [0x029c] = 0x3633,
+  [0x029d] = 0x3634, [0x029e] = 0x58f3, [0x029f] = 0x594b, [0x02a0] = 0x594c,
+  [0x02a1] = 0x36c1, [0x02a2] = 0x36b0, [0x02a3] = 0x36b4, [0x02a4] = 0x59ad,
+  [0x02a5] = 0x36b8, [0x02a6] = 0x59c4, [0x02a7] = 0x36bc, [0x02a8] = 0x59c2,
+  [0x02a9] = 0x59b0, [0x02aa] = 0x36bf, [0x02ab] = 0x36b5, [0x02ac] = 0x36b1,
+  [0x02ad] = 0x36bd, [0x02ae] = 0x59bf, [0x02af] = 0x36bb, [0x02b0] = 0x59c9,
+  [0x02b1] = 0x59b8, [0x02b2] = 0x59ac, [0x02b3] = 0x36b3, [0x02b4] = 0x36b6,
+  [0x02b5] = 0x36ba, [0x02b6] = 0x59b7, [0x02b7] = 0x59d7, [0x02b8] = 0x36b7,