Update Unicode data files to version 6.0. Bug 606917, r=emk, a=bsmedberg
☠☠ backed out by dcfe02c94566 ☠ ☠
authorSimon Montagu <smontagu@smontagu.org>
Sun, 07 Nov 2010 11:56:26 +0200
changeset 57057 8cbe835425964fab8e13b0e789d13b2dcf38d433
parent 57056 1dad59de62c4b9b79657c1b2a596bb38dc0f20a1
child 57058 dcfe02c945662fa5e82cac5ddb25b1bdcfcb38bc
push id1
push userroot
push dateTue, 26 Apr 2011 22:38:44 +0000
treeherdermozilla-beta@bfdb6e623a36 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersemk, bsmedberg
bugs606917
milestone2.0b8pre
first release with
nightly linux32
8cbe83542596 / 4.0b8pre / 20101107015940 / files
nightly linux64
8cbe83542596 / 4.0b8pre / 20101107030815 / files
nightly mac
8cbe83542596 / 4.0b8pre / 20101107030911 / files
nightly win32
8cbe83542596 / 4.0b8pre / 20101107042528 / files
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
Update Unicode data files to version 6.0. Bug 606917, r=emk, a=bsmedberg
intl/unicharutil/src/casetable.h
intl/unicharutil/src/cattable.h
intl/unicharutil/tables/transliterate.properties
intl/unicharutil/tests/unit/test_bug_427350_1.js
intl/unicharutil/tools/gencattable.pl
intl/unicharutil/util/bidicattable.h
intl/unicharutil/util/genbidicattable.pl
layout/generic/punct_marks.x-ccmap
layout/reftests/text-transform/all-lower-ref.html
layout/reftests/text-transform/all-lower.html
layout/reftests/text-transform/all-title-ref.html
layout/reftests/text-transform/all-title.html
layout/reftests/text-transform/all-upper-ref.html
layout/reftests/text-transform/all-upper.html
--- a/intl/unicharutil/src/casetable.h
+++ b/intl/unicharutil/src/casetable.h
@@ -100,16 +100,17 @@ static const PRUint16 gToUpper[] =
        0x0252, ((0x00 << 8) | 0x00), 0x2a1e  ,
        0x0253, ((0x00 << 8) | 0x00), 0xff2e  ,
        0x0254, ((0x00 << 8) | 0x00), 0xff32  ,
        0x0256, ((0x01 << 8) | 0x01), 0xff33  ,
        0x0259, ((0x00 << 8) | 0x00), 0xff36  ,
        0x025b, ((0x00 << 8) | 0x00), 0xff35  ,
        0x0260, ((0x00 << 8) | 0x00), 0xff33  ,
        0x0263, ((0x00 << 8) | 0x00), 0xff31  ,
+       0x0265, ((0x00 << 8) | 0x00), 0xa528  ,
        0x0268, ((0x00 << 8) | 0x00), 0xff2f  ,
        0x0269, ((0x00 << 8) | 0x00), 0xff2d  ,
        0x026b, ((0x00 << 8) | 0x00), 0x29f7  ,
        0x026f, ((0x00 << 8) | 0x00), 0xff2d  ,
        0x0271, ((0x00 << 8) | 0x00), 0x29fd  ,
        0x0272, ((0x00 << 8) | 0x00), 0xff2b  ,
        0x0275, ((0x00 << 8) | 0x00), 0xff2a  ,
        0x027d, ((0x00 << 8) | 0x00), 0x29e7  ,
@@ -142,17 +143,17 @@ static const PRUint16 gToUpper[] =
        0x03f5, ((0x00 << 8) | 0x00), 0xffa0  ,
        0x03f8, ((0x03 << 8) | 0x03), 0xffff  ,
        0x0430, ((0x1f << 8) | 0x01), 0xffe0  ,
        0x0450, ((0x0f << 8) | 0x01), 0xffb0  ,
        0x0461, ((0x20 << 8) | 0x02), 0xffff  ,
        0x048b, ((0x34 << 8) | 0x02), 0xffff  ,
        0x04c2, ((0x0c << 8) | 0x02), 0xffff  ,
        0x04cf, ((0x00 << 8) | 0x00), 0xfff1  ,
-       0x04d1, ((0x54 << 8) | 0x02), 0xffff  ,
+       0x04d1, ((0x56 << 8) | 0x02), 0xffff  ,
        0x0561, ((0x25 << 8) | 0x01), 0xffd0  ,
        0x1d79, ((0x00 << 8) | 0x00), 0x8a04  ,
        0x1d7d, ((0x00 << 8) | 0x00), 0x0ee6  ,
        0x1e01, ((0x94 << 8) | 0x02), 0xffff  ,
        0x1e9b, ((0x00 << 8) | 0x00), 0xffc5  ,
        0x1ea1, ((0x5e << 8) | 0x02), 0xffff  ,
        0x1f00, ((0x07 << 8) | 0x01), 0x0008  ,
        0x1f10, ((0x05 << 8) | 0x01), 0x0008  ,
@@ -186,28 +187,28 @@ static const PRUint16 gToUpper[] =
        0x2c61, ((0x00 << 8) | 0x00), 0xffff  ,
        0x2c65, ((0x00 << 8) | 0x00), 0xd5d5  ,
        0x2c66, ((0x00 << 8) | 0x00), 0xd5d8  ,
        0x2c68, ((0x04 << 8) | 0x02), 0xffff  ,
        0x2c73, ((0x03 << 8) | 0x03), 0xffff  ,
        0x2c81, ((0x62 << 8) | 0x02), 0xffff  ,
        0x2cec, ((0x02 << 8) | 0x02), 0xffff  ,
        0x2d00, ((0x25 << 8) | 0x01), 0xe3a0  ,
-       0xa641, ((0x1e << 8) | 0x02), 0xffff  ,
-       0xa663, ((0x0a << 8) | 0x02), 0xffff  ,
+       0xa641, ((0x2c << 8) | 0x02), 0xffff  ,
        0xa681, ((0x16 << 8) | 0x02), 0xffff  ,
        0xa723, ((0x0c << 8) | 0x02), 0xffff  ,
        0xa733, ((0x3c << 8) | 0x02), 0xffff  ,
        0xa77a, ((0x02 << 8) | 0x02), 0xffff  ,
        0xa77f, ((0x08 << 8) | 0x02), 0xffff  ,
-       0xa78c, ((0x00 << 8) | 0x00), 0xffff  ,
+       0xa78c, ((0x05 << 8) | 0x05), 0xffff  ,
+       0xa7a1, ((0x08 << 8) | 0x02), 0xffff  ,
        0xff41, ((0x19 << 8) | 0x01), 0xffe0   
 };
 
-static const PRUint32 gToUpperItems = 149;
+static const PRUint32 gToUpperItems = 150;
 
 static const PRUint16 gToLower[] = 
 { /*   From    To             Every   Diff   */ 
        0x0041, ((0x19 << 8) | 0x01), 0x0020  ,
        0x00c0, ((0x16 << 8) | 0x01), 0x0020  ,
        0x00d8, ((0x06 << 8) | 0x01), 0x0020  ,
        0x0100, ((0x2e << 8) | 0x02), 0x0001  ,
        0x0130, ((0x00 << 8) | 0x00), 0xff39  ,
@@ -284,17 +285,17 @@ static const PRUint16 gToLower[] =
        0x03fa, ((0x00 << 8) | 0x00), 0x0001  ,
        0x03fd, ((0x02 << 8) | 0x01), 0xff7e  ,
        0x0400, ((0x0f << 8) | 0x01), 0x0050  ,
        0x0410, ((0x1f << 8) | 0x01), 0x0020  ,
        0x0460, ((0x20 << 8) | 0x02), 0x0001  ,
        0x048a, ((0x34 << 8) | 0x02), 0x0001  ,
        0x04c0, ((0x00 << 8) | 0x00), 0x000f  ,
        0x04c1, ((0x0c << 8) | 0x02), 0x0001  ,
-       0x04d0, ((0x54 << 8) | 0x02), 0x0001  ,
+       0x04d0, ((0x56 << 8) | 0x02), 0x0001  ,
        0x0531, ((0x25 << 8) | 0x01), 0x0030  ,
        0x10a0, ((0x25 << 8) | 0x01), 0x1c60  ,
        0x1e00, ((0x94 << 8) | 0x02), 0x0001  ,
        0x1e9e, ((0x00 << 8) | 0x00), 0xe241  ,
        0x1ea0, ((0x5e << 8) | 0x02), 0x0001  ,
        0x1f08, ((0x07 << 8) | 0x01), 0xfff8  ,
        0x1f18, ((0x05 << 8) | 0x01), 0xfff8  ,
        0x1f28, ((0x07 << 8) | 0x01), 0xfff8  ,
@@ -334,29 +335,31 @@ static const PRUint16 gToLower[] =
        0x2c6d, ((0x00 << 8) | 0x00), 0xd5e4  ,
        0x2c6e, ((0x00 << 8) | 0x00), 0xd603  ,
        0x2c6f, ((0x00 << 8) | 0x00), 0xd5e1  ,
        0x2c70, ((0x00 << 8) | 0x00), 0xd5e2  ,
        0x2c72, ((0x03 << 8) | 0x03), 0x0001  ,
        0x2c7e, ((0x01 << 8) | 0x01), 0xd5c1  ,
        0x2c80, ((0x62 << 8) | 0x02), 0x0001  ,
        0x2ceb, ((0x02 << 8) | 0x02), 0x0001  ,
-       0xa640, ((0x1e << 8) | 0x02), 0x0001  ,
-       0xa662, ((0x0a << 8) | 0x02), 0x0001  ,
+       0xa640, ((0x2c << 8) | 0x02), 0x0001  ,
        0xa680, ((0x16 << 8) | 0x02), 0x0001  ,
        0xa722, ((0x0c << 8) | 0x02), 0x0001  ,
        0xa732, ((0x3c << 8) | 0x02), 0x0001  ,
        0xa779, ((0x02 << 8) | 0x02), 0x0001  ,
        0xa77d, ((0x00 << 8) | 0x00), 0x75fc  ,
        0xa77e, ((0x08 << 8) | 0x02), 0x0001  ,
        0xa78b, ((0x00 << 8) | 0x00), 0x0001  ,
+       0xa78d, ((0x00 << 8) | 0x00), 0x5ad8  ,
+       0xa790, ((0x10 << 8) | 0x10), 0x0001  ,
+       0xa7a2, ((0x06 << 8) | 0x02), 0x0001  ,
        0xff21, ((0x19 << 8) | 0x01), 0x0020   
 };
 
-static const PRUint32 gToLowerItems = 143;
+static const PRUint32 gToLowerItems = 145;
 
 static const PRUint32 gCaseBlocks [8] = {
 0xE001003F,
 0x00003012,
 0x00000000,
 0x00000000,
 0x00000000,
 0x000000C0,
--- a/intl/unicharutil/src/cattable.h
+++ b/intl/unicharutil/src/cattable.h
@@ -200,396 +200,396 @@ static const PRUint8 gGenCatIdx1[928] = 
       6,  // U+0004E0 - U+0004E7 : 0x55555555
       6,  // U+0004E8 - U+0004EF : 0x55555555
       6,  // U+0004F0 - U+0004F7 : 0x55555555
       6,  // U+0004F8 - U+0004FF : 0x55555555
       6,  // U+000500 - U+000507 : 0x55555555
       6,  // U+000508 - U+00050F : 0x55555555
       6,  // U+000510 - U+000517 : 0x55555555
       6,  // U+000518 - U+00051F : 0x55555555
-     29,  // U+000520 - U+000527 : 0x00555555
-     30,  // U+000528 - U+00052F : 0x00000000
-     31,  // U+000530 - U+000537 : 0x55555550
+      6,  // U+000520 - U+000527 : 0x55555555
+     29,  // U+000528 - U+00052F : 0x00000000
+     30,  // U+000530 - U+000537 : 0x55555550
       6,  // U+000538 - U+00053F : 0x55555555
       6,  // U+000540 - U+000547 : 0x55555555
       6,  // U+000548 - U+00054F : 0x55555555
-     32,  // U+000550 - U+000557 : 0x05555555
-     33,  // U+000558 - U+00055F : 0x66666650
-     31,  // U+000560 - U+000567 : 0x55555550
+     31,  // U+000550 - U+000557 : 0x05555555
+     32,  // U+000558 - U+00055F : 0x66666650
+     30,  // U+000560 - U+000567 : 0x55555550
       6,  // U+000568 - U+00056F : 0x55555555
       6,  // U+000570 - U+000577 : 0x55555555
       6,  // U+000578 - U+00057F : 0x55555555
       6,  // U+000580 - U+000587 : 0x55555555
-     34,  // U+000588 - U+00058F : 0x00000660
-     35,  // U+000590 - U+000597 : 0x11111110
+     33,  // U+000588 - U+00058F : 0x00000660
+     34,  // U+000590 - U+000597 : 0x11111110
      20,  // U+000598 - U+00059F : 0x11111111
      20,  // U+0005A0 - U+0005A7 : 0x11111111
      20,  // U+0005A8 - U+0005AF : 0x11111111
      20,  // U+0005B0 - U+0005B7 : 0x11111111
-     36,  // U+0005B8 - U+0005BF : 0x16111111
-     37,  // U+0005C0 - U+0005C7 : 0x16116116
-     30,  // U+0005C8 - U+0005CF : 0x00000000
+     35,  // U+0005B8 - U+0005BF : 0x16111111
+     36,  // U+0005C0 - U+0005C7 : 0x16116116
+     29,  // U+0005C8 - U+0005CF : 0x00000000
       6,  // U+0005D0 - U+0005D7 : 0x55555555
       6,  // U+0005D8 - U+0005DF : 0x55555555
       6,  // U+0005E0 - U+0005E7 : 0x55555555
-     38,  // U+0005E8 - U+0005EF : 0x00000555
-     39,  // U+0005F0 - U+0005F7 : 0x00066555
-     30,  // U+0005F8 - U+0005FF : 0x00000000
-     40,  // U+000600 - U+000607 : 0x77004444
-     41,  // U+000608 - U+00060F : 0x77667667
+     37,  // U+0005E8 - U+0005EF : 0x00000555
+     38,  // U+0005F0 - U+0005F7 : 0x00066555
+     29,  // U+0005F8 - U+0005FF : 0x00000000
+     39,  // U+000600 - U+000607 : 0x77004444
+     40,  // U+000608 - U+00060F : 0x77667667
      20,  // U+000610 - U+000617 : 0x11111111
-     42,  // U+000618 - U+00061F : 0x66006111
-     31,  // U+000620 - U+000627 : 0x55555550
+     41,  // U+000618 - U+00061F : 0x66006111
+      6,  // U+000620 - U+000627 : 0x55555555
       6,  // U+000628 - U+00062F : 0x55555555
       6,  // U+000630 - U+000637 : 0x55555555
       6,  // U+000638 - U+00063F : 0x55555555
       6,  // U+000640 - U+000647 : 0x55555555
-     43,  // U+000648 - U+00064F : 0x11111555
+     42,  // U+000648 - U+00064F : 0x11111555
      20,  // U+000650 - U+000657 : 0x11111111
-     44,  // U+000658 - U+00065F : 0x01111111
+     20,  // U+000658 - U+00065F : 0x11111111
       3,  // U+000660 - U+000667 : 0x22222222
-     45,  // U+000668 - U+00066F : 0x55666622
-     46,  // U+000670 - U+000677 : 0x55555551
+     43,  // U+000668 - U+00066F : 0x55666622
+     44,  // U+000670 - U+000677 : 0x55555551
       6,  // U+000678 - U+00067F : 0x55555555
       6,  // U+000680 - U+000687 : 0x55555555
       6,  // U+000688 - U+00068F : 0x55555555
       6,  // U+000690 - U+000697 : 0x55555555
       6,  // U+000698 - U+00069F : 0x55555555
       6,  // U+0006A0 - U+0006A7 : 0x55555555
       6,  // U+0006A8 - U+0006AF : 0x55555555
       6,  // U+0006B0 - U+0006B7 : 0x55555555
       6,  // U+0006B8 - U+0006BF : 0x55555555
       6,  // U+0006C0 - U+0006C7 : 0x55555555
       6,  // U+0006C8 - U+0006CF : 0x55555555
-     47,  // U+0006D0 - U+0006D7 : 0x11565555
-     48,  // U+0006D8 - U+0006DF : 0x11411111
-     49,  // U+0006E0 - U+0006E7 : 0x15511111
-     50,  // U+0006E8 - U+0006EF : 0x55111171
+     45,  // U+0006D0 - U+0006D7 : 0x11565555
+     46,  // U+0006D8 - U+0006DF : 0x17411111
+     47,  // U+0006E0 - U+0006E7 : 0x15511111
+     48,  // U+0006E8 - U+0006EF : 0x55111171
       3,  // U+0006F0 - U+0006F7 : 0x22222222
-     51,  // U+0006F8 - U+0006FF : 0x57755522
-     52,  // U+000700 - U+000707 : 0x66666666
-     53,  // U+000708 - U+00070F : 0x40666666
-     54,  // U+000710 - U+000717 : 0x55555515
+     49,  // U+0006F8 - U+0006FF : 0x57755522
+     50,  // U+000700 - U+000707 : 0x66666666
+     51,  // U+000708 - U+00070F : 0x40666666
+     52,  // U+000710 - U+000717 : 0x55555515
       6,  // U+000718 - U+00071F : 0x55555555
       6,  // U+000720 - U+000727 : 0x55555555
       6,  // U+000728 - U+00072F : 0x55555555
      20,  // U+000730 - U+000737 : 0x11111111
      20,  // U+000738 - U+00073F : 0x11111111
      20,  // U+000740 - U+000747 : 0x11111111
-     55,  // U+000748 - U+00074F : 0x55500111
+     53,  // U+000748 - U+00074F : 0x55500111
       6,  // U+000750 - U+000757 : 0x55555555
       6,  // U+000758 - U+00075F : 0x55555555
       6,  // U+000760 - U+000767 : 0x55555555
       6,  // U+000768 - U+00076F : 0x55555555
       6,  // U+000770 - U+000777 : 0x55555555
       6,  // U+000778 - U+00077F : 0x55555555
       6,  // U+000780 - U+000787 : 0x55555555
       6,  // U+000788 - U+00078F : 0x55555555
       6,  // U+000790 - U+000797 : 0x55555555
       6,  // U+000798 - U+00079F : 0x55555555
-     56,  // U+0007A0 - U+0007A7 : 0x11555555
+     54,  // U+0007A0 - U+0007A7 : 0x11555555
      20,  // U+0007A8 - U+0007AF : 0x11111111
-     57,  // U+0007B0 - U+0007B7 : 0x00000051
-     30,  // U+0007B8 - U+0007BF : 0x00000000
+     55,  // U+0007B0 - U+0007B7 : 0x00000051
+     29,  // U+0007B8 - U+0007BF : 0x00000000
       3,  // U+0007C0 - U+0007C7 : 0x22222222
-     58,  // U+0007C8 - U+0007CF : 0x55555522
+     56,  // U+0007C8 - U+0007CF : 0x55555522
       6,  // U+0007D0 - U+0007D7 : 0x55555555
       6,  // U+0007D8 - U+0007DF : 0x55555555
       6,  // U+0007E0 - U+0007E7 : 0x55555555
-     43,  // U+0007E8 - U+0007EF : 0x11111555
-     59,  // U+0007F0 - U+0007F7 : 0x67551111
-     60,  // U+0007F8 - U+0007FF : 0x00000566
+     42,  // U+0007E8 - U+0007EF : 0x11111555
+     57,  // U+0007F0 - U+0007F7 : 0x67551111
+     58,  // U+0007F8 - U+0007FF : 0x00000566
       6,  // U+000800 - U+000807 : 0x55555555
       6,  // U+000808 - U+00080F : 0x55555555
-     56,  // U+000810 - U+000817 : 0x11555555
-     61,  // U+000818 - U+00081F : 0x11111511
-     62,  // U+000820 - U+000827 : 0x11151111
-     63,  // U+000828 - U+00082F : 0x00111115
-     52,  // U+000830 - U+000837 : 0x66666666
-     64,  // U+000838 - U+00083F : 0x06666666
-     30,  // U+000840 - U+000847 : 0x00000000
-     30,  // U+000848 - U+00084F : 0x00000000
-     30,  // U+000850 - U+000857 : 0x00000000
-     30,  // U+000858 - U+00085F : 0x00000000
-     30,  // U+000860 - U+000867 : 0x00000000
-     30,  // U+000868 - U+00086F : 0x00000000
-     30,  // U+000870 - U+000877 : 0x00000000
-     30,  // U+000878 - U+00087F : 0x00000000
-     30,  // U+000880 - U+000887 : 0x00000000
-     30,  // U+000888 - U+00088F : 0x00000000
-     30,  // U+000890 - U+000897 : 0x00000000
-     30,  // U+000898 - U+00089F : 0x00000000
-     30,  // U+0008A0 - U+0008A7 : 0x00000000
-     30,  // U+0008A8 - U+0008AF : 0x00000000
-     30,  // U+0008B0 - U+0008B7 : 0x00000000
-     30,  // U+0008B8 - U+0008BF : 0x00000000
-     30,  // U+0008C0 - U+0008C7 : 0x00000000
-     30,  // U+0008C8 - U+0008CF : 0x00000000
-     30,  // U+0008D0 - U+0008D7 : 0x00000000
-     30,  // U+0008D8 - U+0008DF : 0x00000000
-     30,  // U+0008E0 - U+0008E7 : 0x00000000
-     30,  // U+0008E8 - U+0008EF : 0x00000000
-     30,  // U+0008F0 - U+0008F7 : 0x00000000
-     30,  // U+0008F8 - U+0008FF : 0x00000000
-     65,  // U+000900 - U+000907 : 0x55551111
+     54,  // U+000810 - U+000817 : 0x11555555
+     59,  // U+000818 - U+00081F : 0x11111511
+     60,  // U+000820 - U+000827 : 0x11151111
+     61,  // U+000828 - U+00082F : 0x00111115
+     50,  // U+000830 - U+000837 : 0x66666666
+     62,  // U+000838 - U+00083F : 0x06666666
+      6,  // U+000840 - U+000847 : 0x55555555
+      6,  // U+000848 - U+00084F : 0x55555555
+      6,  // U+000850 - U+000857 : 0x55555555
+     63,  // U+000858 - U+00085F : 0x06001115
+     29,  // U+000860 - U+000867 : 0x00000000
+     29,  // U+000868 - U+00086F : 0x00000000
+     29,  // U+000870 - U+000877 : 0x00000000
+     29,  // U+000878 - U+00087F : 0x00000000
+     29,  // U+000880 - U+000887 : 0x00000000
+     29,  // U+000888 - U+00088F : 0x00000000
+     29,  // U+000890 - U+000897 : 0x00000000
+     29,  // U+000898 - U+00089F : 0x00000000
+     29,  // U+0008A0 - U+0008A7 : 0x00000000
+     29,  // U+0008A8 - U+0008AF : 0x00000000
+     29,  // U+0008B0 - U+0008B7 : 0x00000000
+     29,  // U+0008B8 - U+0008BF : 0x00000000
+     29,  // U+0008C0 - U+0008C7 : 0x00000000
+     29,  // U+0008C8 - U+0008CF : 0x00000000
+     29,  // U+0008D0 - U+0008D7 : 0x00000000
+     29,  // U+0008D8 - U+0008DF : 0x00000000
+     29,  // U+0008E0 - U+0008E7 : 0x00000000
+     29,  // U+0008E8 - U+0008EF : 0x00000000
+     29,  // U+0008F0 - U+0008F7 : 0x00000000
+     29,  // U+0008F8 - U+0008FF : 0x00000000
+     64,  // U+000900 - U+000907 : 0x55551111
       6,  // U+000908 - U+00090F : 0x55555555
       6,  // U+000910 - U+000917 : 0x55555555
       6,  // U+000918 - U+00091F : 0x55555555
       6,  // U+000920 - U+000927 : 0x55555555
       6,  // U+000928 - U+00092F : 0x55555555
       6,  // U+000930 - U+000937 : 0x55555555
-     66,  // U+000938 - U+00093F : 0x11510055
+     65,  // U+000938 - U+00093F : 0x11511155
      20,  // U+000940 - U+000947 : 0x11111111
-     44,  // U+000948 - U+00094F : 0x01111111
-     63,  // U+000950 - U+000957 : 0x00111115
+     20,  // U+000948 - U+00094F : 0x11111111
+     66,  // U+000950 - U+000957 : 0x11111115
       6,  // U+000958 - U+00095F : 0x55555555
      67,  // U+000960 - U+000967 : 0x22661155
       3,  // U+000968 - U+00096F : 0x22222222
-     68,  // U+000970 - U+000977 : 0x00000556
-     31,  // U+000978 - U+00097F : 0x55555550
-     69,  // U+000980 - U+000987 : 0x55501110
-     70,  // U+000988 - U+00098F : 0x50055555
-     71,  // U+000990 - U+000997 : 0x55555005
+      5,  // U+000970 - U+000977 : 0x55555556
+     30,  // U+000978 - U+00097F : 0x55555550
+     68,  // U+000980 - U+000987 : 0x55501110
+     69,  // U+000988 - U+00098F : 0x50055555
+     70,  // U+000990 - U+000997 : 0x55555005
       6,  // U+000998 - U+00099F : 0x55555555
       6,  // U+0009A0 - U+0009A7 : 0x55555555
-     72,  // U+0009A8 - U+0009AF : 0x55555505
-     73,  // U+0009B0 - U+0009B7 : 0x55000505
-     66,  // U+0009B8 - U+0009BF : 0x11510055
+     71,  // U+0009A8 - U+0009AF : 0x55555505
+     72,  // U+0009B0 - U+0009B7 : 0x55000505
+     73,  // U+0009B8 - U+0009BF : 0x11510055
      74,  // U+0009C0 - U+0009C7 : 0x10011111
      75,  // U+0009C8 - U+0009CF : 0x05111001
      76,  // U+0009D0 - U+0009D7 : 0x10000000
      77,  // U+0009D8 - U+0009DF : 0x50550000
      78,  // U+0009E0 - U+0009E7 : 0x22001155
       3,  // U+0009E8 - U+0009EF : 0x22222222
      79,  // U+0009F0 - U+0009F7 : 0x22227755
      80,  // U+0009F8 - U+0009FF : 0x00007722
-     69,  // U+000A00 - U+000A07 : 0x55501110
+     68,  // U+000A00 - U+000A07 : 0x55501110
      81,  // U+000A08 - U+000A0F : 0x50000555
-     71,  // U+000A10 - U+000A17 : 0x55555005
+     70,  // U+000A10 - U+000A17 : 0x55555005
       6,  // U+000A18 - U+000A1F : 0x55555555
       6,  // U+000A20 - U+000A27 : 0x55555555
-     72,  // U+000A28 - U+000A2F : 0x55555505
+     71,  // U+000A28 - U+000A2F : 0x55555505
      82,  // U+000A30 - U+000A37 : 0x05505505
      83,  // U+000A38 - U+000A3F : 0x11010055
      84,  // U+000A40 - U+000A47 : 0x10000111
      85,  // U+000A48 - U+000A4F : 0x00111001
      86,  // U+000A50 - U+000A57 : 0x00000010
      87,  // U+000A58 - U+000A5F : 0x05055550
      88,  // U+000A60 - U+000A67 : 0x22000000
       3,  // U+000A68 - U+000A6F : 0x22222222
      89,  // U+000A70 - U+000A77 : 0x00155511
-     30,  // U+000A78 - U+000A7F : 0x00000000
-     69,  // U+000A80 - U+000A87 : 0x55501110
+     29,  // U+000A78 - U+000A7F : 0x00000000
+     68,  // U+000A80 - U+000A87 : 0x55501110
      90,  // U+000A88 - U+000A8F : 0x50555555
      25,  // U+000A90 - U+000A97 : 0x55555055
       6,  // U+000A98 - U+000A9F : 0x55555555
       6,  // U+000AA0 - U+000AA7 : 0x55555555
-     72,  // U+000AA8 - U+000AAF : 0x55555505
+     71,  // U+000AA8 - U+000AAF : 0x55555505
      91,  // U+000AB0 - U+000AB7 : 0x55505505
-     66,  // U+000AB8 - U+000ABF : 0x11510055
+     73,  // U+000AB8 - U+000ABF : 0x11510055
      92,  // U+000AC0 - U+000AC7 : 0x10111111
      93,  // U+000AC8 - U+000ACF : 0x00111011
      94,  // U+000AD0 - U+000AD7 : 0x00000005
-     30,  // U+000AD8 - U+000ADF : 0x00000000
+     29,  // U+000AD8 - U+000ADF : 0x00000000
      78,  // U+000AE0 - U+000AE7 : 0x22001155
       3,  // U+000AE8 - U+000AEF : 0x22222222
      95,  // U+000AF0 - U+000AF7 : 0x00000070
-     30,  // U+000AF8 - U+000AFF : 0x00000000
-     69,  // U+000B00 - U+000B07 : 0x55501110
-     70,  // U+000B08 - U+000B0F : 0x50055555
-     71,  // U+000B10 - U+000B17 : 0x55555005
+     29,  // U+000AF8 - U+000AFF : 0x00000000
+     68,  // U+000B00 - U+000B07 : 0x55501110
+     69,  // U+000B08 - U+000B0F : 0x50055555
+     70,  // U+000B10 - U+000B17 : 0x55555005
       6,  // U+000B18 - U+000B1F : 0x55555555
       6,  // U+000B20 - U+000B27 : 0x55555555
-     72,  // U+000B28 - U+000B2F : 0x55555505
+     71,  // U+000B28 - U+000B2F : 0x55555505
      91,  // U+000B30 - U+000B37 : 0x55505505
-     66,  // U+000B38 - U+000B3F : 0x11510055
+     73,  // U+000B38 - U+000B3F : 0x11510055
      74,  // U+000B40 - U+000B47 : 0x10011111
      85,  // U+000B48 - U+000B4F : 0x00111001
      96,  // U+000B50 - U+000B57 : 0x11000000
      77,  // U+000B58 - U+000B5F : 0x50550000
      78,  // U+000B60 - U+000B67 : 0x22001155
       3,  // U+000B68 - U+000B6F : 0x22222222
-     97,  // U+000B70 - U+000B77 : 0x00000057
-     30,  // U+000B78 - U+000B7F : 0x00000000
+     97,  // U+000B70 - U+000B77 : 0x22222257
+     29,  // U+000B78 - U+000B7F : 0x00000000
      98,  // U+000B80 - U+000B87 : 0x55505100
      99,  // U+000B88 - U+000B8F : 0x55000555
     100,  // U+000B90 - U+000B97 : 0x00555505
     101,  // U+000B98 - U+000B9F : 0x55050550
     102,  // U+000BA0 - U+000BA7 : 0x00055000
      99,  // U+000BA8 - U+000BAF : 0x55000555
       6,  // U+000BB0 - U+000BB7 : 0x55555555
     103,  // U+000BB8 - U+000BBF : 0x11000055
     104,  // U+000BC0 - U+000BC7 : 0x11000111
     105,  // U+000BC8 - U+000BCF : 0x00111101
     106,  // U+000BD0 - U+000BD7 : 0x10000005
-     30,  // U+000BD8 - U+000BDF : 0x00000000
+     29,  // U+000BD8 - U+000BDF : 0x00000000
      88,  // U+000BE0 - U+000BE7 : 0x22000000
       3,  // U+000BE8 - U+000BEF : 0x22222222
     107,  // U+000BF0 - U+000BF7 : 0x77777222
     108,  // U+000BF8 - U+000BFF : 0x00000777
-     69,  // U+000C00 - U+000C07 : 0x55501110
+     68,  // U+000C00 - U+000C07 : 0x55501110
     109,  // U+000C08 - U+000C0F : 0x55055555
-     72,  // U+000C10 - U+000C17 : 0x55555505
+     71,  // U+000C10 - U+000C17 : 0x55555505
       6,  // U+000C18 - U+000C1F : 0x55555555
       6,  // U+000C20 - U+000C27 : 0x55555555
-     72,  // U+000C28 - U+000C2F : 0x55555505
+     71,  // U+000C28 - U+000C2F : 0x55555505
     110,  // U+000C30 - U+000C37 : 0x55505555
     111,  // U+000C38 - U+000C3F : 0x11500055
     112,  // U+000C40 - U+000C47 : 0x11011111
     105,  // U+000C48 - U+000C4F : 0x00111101
     113,  // U+000C50 - U+000C57 : 0x01100000
     114,  // U+000C58 - U+000C5F : 0x00000055
      78,  // U+000C60 - U+000C67 : 0x22001155
       3,  // U+000C68 - U+000C6F : 0x22222222
-     30,  // U+000C70 - U+000C77 : 0x00000000
+     29,  // U+000C70 - U+000C77 : 0x00000000
     115,  // U+000C78 - U+000C7F : 0x72222222
     116,  // U+000C80 - U+000C87 : 0x55501100
     109,  // U+000C88 - U+000C8F : 0x55055555
-     72,  // U+000C90 - U+000C97 : 0x55555505
+     71,  // U+000C90 - U+000C97 : 0x55555505
       6,  // U+000C98 - U+000C9F : 0x55555555
       6,  // U+000CA0 - U+000CA7 : 0x55555555
-     72,  // U+000CA8 - U+000CAF : 0x55555505
+     71,  // U+000CA8 - U+000CAF : 0x55555505
     110,  // U+000CB0 - U+000CB7 : 0x55505555
-     66,  // U+000CB8 - U+000CBF : 0x11510055
+     73,  // U+000CB8 - U+000CBF : 0x11510055
     112,  // U+000CC0 - U+000CC7 : 0x11011111
     105,  // U+000CC8 - U+000CCF : 0x00111101
     113,  // U+000CD0 - U+000CD7 : 0x01100000
     117,  // U+000CD8 - U+000CDF : 0x05000000
      78,  // U+000CE0 - U+000CE7 : 0x22001155
       3,  // U+000CE8 - U+000CEF : 0x22222222
-    118,  // U+000CF0 - U+000CF7 : 0x00000770
-     30,  // U+000CF8 - U+000CFF : 0x00000000
+    118,  // U+000CF0 - U+000CF7 : 0x00000550
+     29,  // U+000CF8 - U+000CFF : 0x00000000
     116,  // U+000D00 - U+000D07 : 0x55501100
     109,  // U+000D08 - U+000D0F : 0x55055555
-     72,  // U+000D10 - U+000D17 : 0x55555505
+     71,  // U+000D10 - U+000D17 : 0x55555505
       6,  // U+000D18 - U+000D1F : 0x55555555
       6,  // U+000D20 - U+000D27 : 0x55555555
-     72,  // U+000D28 - U+000D2F : 0x55555505
+      6,  // U+000D28 - U+000D2F : 0x55555555
       6,  // U+000D30 - U+000D37 : 0x55555555
-    111,  // U+000D38 - U+000D3F : 0x11500055
+    119,  // U+000D38 - U+000D3F : 0x11500555
     112,  // U+000D40 - U+000D47 : 0x11011111
-    105,  // U+000D48 - U+000D4F : 0x00111101
+    120,  // U+000D48 - U+000D4F : 0x05111101
      76,  // U+000D50 - U+000D57 : 0x10000000
-     30,  // U+000D58 - U+000D5F : 0x00000000
+     29,  // U+000D58 - U+000D5F : 0x00000000
      78,  // U+000D60 - U+000D67 : 0x22001155
       3,  // U+000D68 - U+000D6F : 0x22222222
-    119,  // U+000D70 - U+000D77 : 0x00222222
-    120,  // U+000D78 - U+000D7F : 0x55555570
+    121,  // U+000D70 - U+000D77 : 0x00222222
+    122,  // U+000D78 - U+000D7F : 0x55555570
     116,  // U+000D80 - U+000D87 : 0x55501100
       6,  // U+000D88 - U+000D8F : 0x55555555
-     32,  // U+000D90 - U+000D97 : 0x05555555
-    121,  // U+000D98 - U+000D9F : 0x55555500
+     31,  // U+000D90 - U+000D97 : 0x05555555
+    123,  // U+000D98 - U+000D9F : 0x55555500
       6,  // U+000DA0 - U+000DA7 : 0x55555555
       6,  // U+000DA8 - U+000DAF : 0x55555555
      25,  // U+000DB0 - U+000DB7 : 0x55555055
-    122,  // U+000DB8 - U+000DBF : 0x00505555
-     32,  // U+000DC0 - U+000DC7 : 0x05555555
-    123,  // U+000DC8 - U+000DCF : 0x10000100
-    124,  // U+000DD0 - U+000DD7 : 0x01011111
+    124,  // U+000DB8 - U+000DBF : 0x00505555
+     31,  // U+000DC0 - U+000DC7 : 0x05555555
+    125,  // U+000DC8 - U+000DCF : 0x10000100
+    126,  // U+000DD0 - U+000DD7 : 0x01011111
      20,  // U+000DD8 - U+000DDF : 0x11111111
-     30,  // U+000DE0 - U+000DE7 : 0x00000000
-     30,  // U+000DE8 - U+000DEF : 0x00000000
-    125,  // U+000DF0 - U+000DF7 : 0x00061100
-     30,  // U+000DF8 - U+000DFF : 0x00000000
-     31,  // U+000E00 - U+000E07 : 0x55555550
+     29,  // U+000DE0 - U+000DE7 : 0x00000000
+     29,  // U+000DE8 - U+000DEF : 0x00000000
+    127,  // U+000DF0 - U+000DF7 : 0x00061100
+     29,  // U+000DF8 - U+000DFF : 0x00000000
+     30,  // U+000E00 - U+000E07 : 0x55555550
       6,  // U+000E08 - U+000E0F : 0x55555555
       6,  // U+000E10 - U+000E17 : 0x55555555
       6,  // U+000E18 - U+000E1F : 0x55555555
       6,  // U+000E20 - U+000E27 : 0x55555555
       6,  // U+000E28 - U+000E2F : 0x55555555
-    126,  // U+000E30 - U+000E37 : 0x11115515
-    127,  // U+000E38 - U+000E3F : 0x70000111
-    128,  // U+000E40 - U+000E47 : 0x15555555
-    129,  // U+000E48 - U+000E4F : 0x61111111
+    128,  // U+000E30 - U+000E37 : 0x11115515
+    129,  // U+000E38 - U+000E3F : 0x70000111
+    130,  // U+000E40 - U+000E47 : 0x15555555
+    131,  // U+000E48 - U+000E4F : 0x61111111
       3,  // U+000E50 - U+000E57 : 0x22222222
-    130,  // U+000E58 - U+000E5F : 0x00006622
-     30,  // U+000E60 - U+000E67 : 0x00000000
-     30,  // U+000E68 - U+000E6F : 0x00000000
-     30,  // U+000E70 - U+000E77 : 0x00000000
-     30,  // U+000E78 - U+000E7F : 0x00000000
-    131,  // U+000E80 - U+000E87 : 0x50050550
-    132,  // U+000E88 - U+000E8F : 0x00500505
-    133,  // U+000E90 - U+000E97 : 0x55550000
-     31,  // U+000E98 - U+000E9F : 0x55555550
-    134,  // U+000EA0 - U+000EA7 : 0x50505550
-    135,  // U+000EA8 - U+000EAF : 0x55505500
-    126,  // U+000EB0 - U+000EB7 : 0x11115515
-    136,  // U+000EB8 - U+000EBF : 0x00511011
-    137,  // U+000EC0 - U+000EC7 : 0x05055555
-    138,  // U+000EC8 - U+000ECF : 0x00111111
+    132,  // U+000E58 - U+000E5F : 0x00006622
+     29,  // U+000E60 - U+000E67 : 0x00000000
+     29,  // U+000E68 - U+000E6F : 0x00000000
+     29,  // U+000E70 - U+000E77 : 0x00000000
+     29,  // U+000E78 - U+000E7F : 0x00000000
+    133,  // U+000E80 - U+000E87 : 0x50050550
+    134,  // U+000E88 - U+000E8F : 0x00500505
+    135,  // U+000E90 - U+000E97 : 0x55550000
+     30,  // U+000E98 - U+000E9F : 0x55555550
+    136,  // U+000EA0 - U+000EA7 : 0x50505550
+    137,  // U+000EA8 - U+000EAF : 0x55505500
+    128,  // U+000EB0 - U+000EB7 : 0x11115515
+    138,  // U+000EB8 - U+000EBF : 0x00511011
+    139,  // U+000EC0 - U+000EC7 : 0x05055555
+    140,  // U+000EC8 - U+000ECF : 0x00111111
       3,  // U+000ED0 - U+000ED7 : 0x22222222
-    139,  // U+000ED8 - U+000EDF : 0x00550022
-     30,  // U+000EE0 - U+000EE7 : 0x00000000
-     30,  // U+000EE8 - U+000EEF : 0x00000000
-     30,  // U+000EF0 - U+000EF7 : 0x00000000
-     30,  // U+000EF8 - U+000EFF : 0x00000000
-    140,  // U+000F00 - U+000F07 : 0x66667775
-     52,  // U+000F08 - U+000F0F : 0x66666666
-    141,  // U+000F10 - U+000F17 : 0x77777666
-    142,  // U+000F18 - U+000F1F : 0x77777711
+    141,  // U+000ED8 - U+000EDF : 0x00550022
+     29,  // U+000EE0 - U+000EE7 : 0x00000000
+     29,  // U+000EE8 - U+000EEF : 0x00000000
+     29,  // U+000EF0 - U+000EF7 : 0x00000000
+     29,  // U+000EF8 - U+000EFF : 0x00000000
+    142,  // U+000F00 - U+000F07 : 0x66667775
+     50,  // U+000F08 - U+000F0F : 0x66666666
+    143,  // U+000F10 - U+000F17 : 0x77777666
+    144,  // U+000F18 - U+000F1F : 0x77777711
       3,  // U+000F20 - U+000F27 : 0x22222222
       3,  // U+000F28 - U+000F2F : 0x22222222
-    143,  // U+000F30 - U+000F37 : 0x17172222
-    144,  // U+000F38 - U+000F3F : 0x11666617
+    145,  // U+000F30 - U+000F37 : 0x17172222
+    146,  // U+000F38 - U+000F3F : 0x11666617
       6,  // U+000F40 - U+000F47 : 0x55555555
-     31,  // U+000F48 - U+000F4F : 0x55555550
+     30,  // U+000F48 - U+000F4F : 0x55555550
       6,  // U+000F50 - U+000F57 : 0x55555555
       6,  // U+000F58 - U+000F5F : 0x55555555
       6,  // U+000F60 - U+000F67 : 0x55555555
-    145,  // U+000F68 - U+000F6F : 0x00055555
-     35,  // U+000F70 - U+000F77 : 0x11111110
+    147,  // U+000F68 - U+000F6F : 0x00055555
+     34,  // U+000F70 - U+000F77 : 0x11111110
      20,  // U+000F78 - U+000F7F : 0x11111111
-    146,  // U+000F80 - U+000F87 : 0x11611111
-    147,  // U+000F88 - U+000F8F : 0x00005555
+    148,  // U+000F80 - U+000F87 : 0x11611111
+    149,  // U+000F88 - U+000F8F : 0x11155555
      20,  // U+000F90 - U+000F97 : 0x11111111
-     35,  // U+000F98 - U+000F9F : 0x11111110
+     34,  // U+000F98 - U+000F9F : 0x11111110
      20,  // U+000FA0 - U+000FA7 : 0x11111111
      20,  // U+000FA8 - U+000FAF : 0x11111111
      20,  // U+000FB0 - U+000FB7 : 0x11111111
-    148,  // U+000FB8 - U+000FBF : 0x77011111
-    149,  // U+000FC0 - U+000FC7 : 0x71777777
-    150,  // U+000FC8 - U+000FCF : 0x77077777
-    151,  // U+000FD0 - U+000FD7 : 0x77766666
-    152,  // U+000FD8 - U+000FDF : 0x00000007
-     30,  // U+000FE0 - U+000FE7 : 0x00000000
-     30,  // U+000FE8 - U+000FEF : 0x00000000
-     30,  // U+000FF0 - U+000FF7 : 0x00000000
-     30,  // U+000FF8 - U+000FFF : 0x00000000
+    150,  // U+000FB8 - U+000FBF : 0x77011111
+    151,  // U+000FC0 - U+000FC7 : 0x71777777
+    152,  // U+000FC8 - U+000FCF : 0x77077777
+    153,  // U+000FD0 - U+000FD7 : 0x77766666
+    154,  // U+000FD8 - U+000FDF : 0x00000667
+     29,  // U+000FE0 - U+000FE7 : 0x00000000
+     29,  // U+000FE8 - U+000FEF : 0x00000000
+     29,  // U+000FF0 - U+000FF7 : 0x00000000
+     29,  // U+000FF8 - U+000FFF : 0x00000000
       6,  // U+001000 - U+001007 : 0x55555555
       6,  // U+001008 - U+00100F : 0x55555555
       6,  // U+001010 - U+001017 : 0x55555555
       6,  // U+001018 - U+00101F : 0x55555555
       6,  // U+001020 - U+001027 : 0x55555555
-     43,  // U+001028 - U+00102F : 0x11111555
+     42,  // U+001028 - U+00102F : 0x11111555
      20,  // U+001030 - U+001037 : 0x11111111
-    153,  // U+001038 - U+00103F : 0x51111111
+    155,  // U+001038 - U+00103F : 0x51111111
       3,  // U+001040 - U+001047 : 0x22222222
-    154,  // U+001048 - U+00104F : 0x66666622
-     56,  // U+001050 - U+001057 : 0x11555555
-    155,  // U+001058 - U+00105F : 0x11555511
-    156,  // U+001060 - U+001067 : 0x15511151
-    157,  // U+001068 - U+00106F : 0x55111111
-    158,  // U+001070 - U+001077 : 0x55511115
+    156,  // U+001048 - U+00104F : 0x66666622
+     54,  // U+001050 - U+001057 : 0x11555555
+    157,  // U+001058 - U+00105F : 0x11555511
+    158,  // U+001060 - U+001067 : 0x15511151
+    159,  // U+001068 - U+00106F : 0x55111111
+    160,  // U+001070 - U+001077 : 0x55511115
       6,  // U+001078 - U+00107F : 0x55555555
-    159,  // U+001080 - U+001087 : 0x11111155
-    160,  // U+001088 - U+00108F : 0x15111111
+    161,  // U+001080 - U+001087 : 0x11111155
+    162,  // U+001088 - U+00108F : 0x15111111
       3,  // U+001090 - U+001097 : 0x22222222
-    161,  // U+001098 - U+00109F : 0x77111122
+    163,  // U+001098 - U+00109F : 0x77111122
       6,  // U+0010A0 - U+0010A7 : 0x55555555
       6,  // U+0010A8 - U+0010AF : 0x55555555
       6,  // U+0010B0 - U+0010B7 : 0x55555555
       6,  // U+0010B8 - U+0010BF : 0x55555555
-     29,  // U+0010C0 - U+0010C7 : 0x00555555
-     30,  // U+0010C8 - U+0010CF : 0x00000000
+    164,  // U+0010C0 - U+0010C7 : 0x00555555
+     29,  // U+0010C8 - U+0010CF : 0x00000000
       6,  // U+0010D0 - U+0010D7 : 0x55555555
       6,  // U+0010D8 - U+0010DF : 0x55555555
       6,  // U+0010E0 - U+0010E7 : 0x55555555
       6,  // U+0010E8 - U+0010EF : 0x55555555
       6,  // U+0010F0 - U+0010F7 : 0x55555555
-    162,  // U+0010F8 - U+0010FF : 0x00056555
+    165,  // U+0010F8 - U+0010FF : 0x00056555
       6,  // U+001100 - U+001107 : 0x55555555
       6,  // U+001108 - U+00110F : 0x55555555
       6,  // U+001110 - U+001117 : 0x55555555
       6,  // U+001118 - U+00111F : 0x55555555
       6,  // U+001120 - U+001127 : 0x55555555
       6,  // U+001128 - U+00112F : 0x55555555
       6,  // U+001130 - U+001137 : 0x55555555
       6,  // U+001138 - U+00113F : 0x55555555
@@ -622,70 +622,70 @@ static const PRUint8 gGenCatIdx1[928] = 
       6,  // U+001210 - U+001217 : 0x55555555
       6,  // U+001218 - U+00121F : 0x55555555
       6,  // U+001220 - U+001227 : 0x55555555
       6,  // U+001228 - U+00122F : 0x55555555
       6,  // U+001230 - U+001237 : 0x55555555
       6,  // U+001238 - U+00123F : 0x55555555
       6,  // U+001240 - U+001247 : 0x55555555
     100,  // U+001248 - U+00124F : 0x00555505
-     32,  // U+001250 - U+001257 : 0x05555555
+     31,  // U+001250 - U+001257 : 0x05555555
     100,  // U+001258 - U+00125F : 0x00555505
       6,  // U+001260 - U+001267 : 0x55555555
       6,  // U+001268 - U+00126F : 0x55555555
       6,  // U+001270 - U+001277 : 0x55555555
       6,  // U+001278 - U+00127F : 0x55555555
       6,  // U+001280 - U+001287 : 0x55555555
     100,  // U+001288 - U+00128F : 0x00555505
       6,  // U+001290 - U+001297 : 0x55555555
       6,  // U+001298 - U+00129F : 0x55555555
       6,  // U+0012A0 - U+0012A7 : 0x55555555
       6,  // U+0012A8 - U+0012AF : 0x55555555
     100,  // U+0012B0 - U+0012B7 : 0x00555505
-     32,  // U+0012B8 - U+0012BF : 0x05555555
+     31,  // U+0012B8 - U+0012BF : 0x05555555
     100,  // U+0012C0 - U+0012C7 : 0x00555505
       6,  // U+0012C8 - U+0012CF : 0x55555555
-     32,  // U+0012D0 - U+0012D7 : 0x05555555
+     31,  // U+0012D0 - U+0012D7 : 0x05555555
       6,  // U+0012D8 - U+0012DF : 0x55555555
       6,  // U+0012E0 - U+0012E7 : 0x55555555
       6,  // U+0012E8 - U+0012EF : 0x55555555
       6,  // U+0012F0 - U+0012F7 : 0x55555555
       6,  // U+0012F8 - U+0012FF : 0x55555555
       6,  // U+001300 - U+001307 : 0x55555555
       6,  // U+001308 - U+00130F : 0x55555555
     100,  // U+001310 - U+001317 : 0x00555505
       6,  // U+001318 - U+00131F : 0x55555555
       6,  // U+001320 - U+001327 : 0x55555555
       6,  // U+001328 - U+00132F : 0x55555555
       6,  // U+001330 - U+001337 : 0x55555555
       6,  // U+001338 - U+00133F : 0x55555555
       6,  // U+001340 - U+001347 : 0x55555555
       6,  // U+001348 - U+00134F : 0x55555555
       6,  // U+001350 - U+001357 : 0x55555555
-    163,  // U+001358 - U+00135F : 0x10000555
-    164,  // U+001360 - U+001367 : 0x66666667
-    165,  // U+001368 - U+00136F : 0x22222226
+    166,  // U+001358 - U+00135F : 0x11100555
+    167,  // U+001360 - U+001367 : 0x66666667
+    168,  // U+001368 - U+00136F : 0x22222226
       3,  // U+001370 - U+001377 : 0x22222222
-    166,  // U+001378 - U+00137F : 0x00022222
+    169,  // U+001378 - U+00137F : 0x00022222
       6,  // U+001380 - U+001387 : 0x55555555
       6,  // U+001388 - U+00138F : 0x55555555
      17,  // U+001390 - U+001397 : 0x77777777
-    167,  // U+001398 - U+00139F : 0x00000077
+    170,  // U+001398 - U+00139F : 0x00000077
       6,  // U+0013A0 - U+0013A7 : 0x55555555
       6,  // U+0013A8 - U+0013AF : 0x55555555
       6,  // U+0013B0 - U+0013B7 : 0x55555555
       6,  // U+0013B8 - U+0013BF : 0x55555555
       6,  // U+0013C0 - U+0013C7 : 0x55555555
       6,  // U+0013C8 - U+0013CF : 0x55555555
       6,  // U+0013D0 - U+0013D7 : 0x55555555
       6,  // U+0013D8 - U+0013DF : 0x55555555
       6,  // U+0013E0 - U+0013E7 : 0x55555555
       6,  // U+0013E8 - U+0013EF : 0x55555555
-    145,  // U+0013F0 - U+0013F7 : 0x00055555
-     30,  // U+0013F8 - U+0013FF : 0x00000000
+    147,  // U+0013F0 - U+0013F7 : 0x00055555
+     29,  // U+0013F8 - U+0013FF : 0x00000000
       5,  // U+001400 - U+001407 : 0x55555556
       6,  // U+001408 - U+00140F : 0x55555555
       6,  // U+001410 - U+001417 : 0x55555555
       6,  // U+001418 - U+00141F : 0x55555555
       6,  // U+001420 - U+001427 : 0x55555555
       6,  // U+001428 - U+00142F : 0x55555555
       6,  // U+001430 - U+001437 : 0x55555555
       6,  // U+001438 - U+00143F : 0x55555555
@@ -753,227 +753,227 @@ static const PRUint8 gGenCatIdx1[928] = 
       6,  // U+001628 - U+00162F : 0x55555555
       6,  // U+001630 - U+001637 : 0x55555555
       6,  // U+001638 - U+00163F : 0x55555555
       6,  // U+001640 - U+001647 : 0x55555555
       6,  // U+001648 - U+00164F : 0x55555555
       6,  // U+001650 - U+001657 : 0x55555555
       6,  // U+001658 - U+00165F : 0x55555555
       6,  // U+001660 - U+001667 : 0x55555555
-    168,  // U+001668 - U+00166F : 0x56655555
+    171,  // U+001668 - U+00166F : 0x56655555
       6,  // U+001670 - U+001677 : 0x55555555
       6,  // U+001678 - U+00167F : 0x55555555
-    169,  // U+001680 - U+001687 : 0x55555553
+    172,  // U+001680 - U+001687 : 0x55555553
       6,  // U+001688 - U+00168F : 0x55555555
       6,  // U+001690 - U+001697 : 0x55555555
-     39,  // U+001698 - U+00169F : 0x00066555
+     38,  // U+001698 - U+00169F : 0x00066555
       6,  // U+0016A0 - U+0016A7 : 0x55555555
       6,  // U+0016A8 - U+0016AF : 0x55555555
       6,  // U+0016B0 - U+0016B7 : 0x55555555
       6,  // U+0016B8 - U+0016BF : 0x55555555
       6,  // U+0016C0 - U+0016C7 : 0x55555555
       6,  // U+0016C8 - U+0016CF : 0x55555555
       6,  // U+0016D0 - U+0016D7 : 0x55555555
       6,  // U+0016D8 - U+0016DF : 0x55555555
       6,  // U+0016E0 - U+0016E7 : 0x55555555
-    170,  // U+0016E8 - U+0016EF : 0x22666555
-    171,  // U+0016F0 - U+0016F7 : 0x00000002
-     30,  // U+0016F8 - U+0016FF : 0x00000000
+    173,  // U+0016E8 - U+0016EF : 0x22666555
+    174,  // U+0016F0 - U+0016F7 : 0x00000002
+     29,  // U+0016F8 - U+0016FF : 0x00000000
       6,  // U+001700 - U+001707 : 0x55555555
     109,  // U+001708 - U+00170F : 0x55055555
-    172,  // U+001710 - U+001717 : 0x00011155
-     30,  // U+001718 - U+00171F : 0x00000000
+    175,  // U+001710 - U+001717 : 0x00011155
+     29,  // U+001718 - U+00171F : 0x00000000
       6,  // U+001720 - U+001727 : 0x55555555
       6,  // U+001728 - U+00172F : 0x55555555
-    173,  // U+001730 - U+001737 : 0x06611155
-     30,  // U+001738 - U+00173F : 0x00000000
+    176,  // U+001730 - U+001737 : 0x06611155
+     29,  // U+001738 - U+00173F : 0x00000000
       6,  // U+001740 - U+001747 : 0x55555555
       6,  // U+001748 - U+00174F : 0x55555555
-    174,  // U+001750 - U+001757 : 0x00001155
-     30,  // U+001758 - U+00175F : 0x00000000
+    177,  // U+001750 - U+001757 : 0x00001155
+     29,  // U+001758 - U+00175F : 0x00000000
       6,  // U+001760 - U+001767 : 0x55555555
     109,  // U+001768 - U+00176F : 0x55055555
-    175,  // U+001770 - U+001777 : 0x00001105
-     30,  // U+001778 - U+00177F : 0x00000000
+    178,  // U+001770 - U+001777 : 0x00001105
+     29,  // U+001778 - U+00177F : 0x00000000
       6,  // U+001780 - U+001787 : 0x55555555
       6,  // U+001788 - U+00178F : 0x55555555
       6,  // U+001790 - U+001797 : 0x55555555
       6,  // U+001798 - U+00179F : 0x55555555
       6,  // U+0017A0 - U+0017A7 : 0x55555555
       6,  // U+0017A8 - U+0017AF : 0x55555555
-    176,  // U+0017B0 - U+0017B7 : 0x11445555
+    179,  // U+0017B0 - U+0017B7 : 0x11445555
      20,  // U+0017B8 - U+0017BF : 0x11111111
      20,  // U+0017C0 - U+0017C7 : 0x11111111
      20,  // U+0017C8 - U+0017CF : 0x11111111
-    177,  // U+0017D0 - U+0017D7 : 0x56661111
-    178,  // U+0017D8 - U+0017DF : 0x00157666
+    180,  // U+0017D0 - U+0017D7 : 0x56661111
+    181,  // U+0017D8 - U+0017DF : 0x00157666
       3,  // U+0017E0 - U+0017E7 : 0x22222222
-    179,  // U+0017E8 - U+0017EF : 0x00000022
+    182,  // U+0017E8 - U+0017EF : 0x00000022
       3,  // U+0017F0 - U+0017F7 : 0x22222222
-    179,  // U+0017F8 - U+0017FF : 0x00000022
-     52,  // U+001800 - U+001807 : 0x66666666
-    180,  // U+001808 - U+00180F : 0x03111666
+    182,  // U+0017F8 - U+0017FF : 0x00000022
+     50,  // U+001800 - U+001807 : 0x66666666
+    183,  // U+001808 - U+00180F : 0x03111666
       3,  // U+001810 - U+001817 : 0x22222222
-    179,  // U+001818 - U+00181F : 0x00000022
+    182,  // U+001818 - U+00181F : 0x00000022
       6,  // U+001820 - U+001827 : 0x55555555
       6,  // U+001828 - U+00182F : 0x55555555
       6,  // U+001830 - U+001837 : 0x55555555
       6,  // U+001838 - U+00183F : 0x55555555
       6,  // U+001840 - U+001847 : 0x55555555
       6,  // U+001848 - U+00184F : 0x55555555
       6,  // U+001850 - U+001857 : 0x55555555
       6,  // U+001858 - U+00185F : 0x55555555
       6,  // U+001860 - U+001867 : 0x55555555
       6,  // U+001868 - U+00186F : 0x55555555
       6,  // U+001870 - U+001877 : 0x55555555
-     30,  // U+001878 - U+00187F : 0x00000000
+     29,  // U+001878 - U+00187F : 0x00000000
       6,  // U+001880 - U+001887 : 0x55555555
       6,  // U+001888 - U+00188F : 0x55555555
       6,  // U+001890 - U+001897 : 0x55555555
       6,  // U+001898 - U+00189F : 0x55555555
       6,  // U+0018A0 - U+0018A7 : 0x55555555
-    181,  // U+0018A8 - U+0018AF : 0x00000515
+    184,  // U+0018A8 - U+0018AF : 0x00000515
       6,  // U+0018B0 - U+0018B7 : 0x55555555
       6,  // U+0018B8 - U+0018BF : 0x55555555
       6,  // U+0018C0 - U+0018C7 : 0x55555555
       6,  // U+0018C8 - U+0018CF : 0x55555555
       6,  // U+0018D0 - U+0018D7 : 0x55555555
       6,  // U+0018D8 - U+0018DF : 0x55555555
       6,  // U+0018E0 - U+0018E7 : 0x55555555
       6,  // U+0018E8 - U+0018EF : 0x55555555
-     29,  // U+0018F0 - U+0018F7 : 0x00555555
-     30,  // U+0018F8 - U+0018FF : 0x00000000
+    164,  // U+0018F0 - U+0018F7 : 0x00555555
+     29,  // U+0018F8 - U+0018FF : 0x00000000
       6,  // U+001900 - U+001907 : 0x55555555
       6,  // U+001908 - U+00190F : 0x55555555
       6,  // U+001910 - U+001917 : 0x55555555
-    145,  // U+001918 - U+00191F : 0x00055555
+    147,  // U+001918 - U+00191F : 0x00055555
      20,  // U+001920 - U+001927 : 0x11111111
-    182,  // U+001928 - U+00192F : 0x00001111
+    185,  // U+001928 - U+00192F : 0x00001111
      20,  // U+001930 - U+001937 : 0x11111111
-    182,  // U+001938 - U+00193F : 0x00001111
-    183,  // U+001940 - U+001947 : 0x22660007
+    185,  // U+001938 - U+00193F : 0x00001111
+    186,  // U+001940 - U+001947 : 0x22660007
       3,  // U+001948 - U+00194F : 0x22222222
       6,  // U+001950 - U+001957 : 0x55555555
       6,  // U+001958 - U+00195F : 0x55555555
       6,  // U+001960 - U+001967 : 0x55555555
-     29,  // U+001968 - U+00196F : 0x00555555
-    145,  // U+001970 - U+001977 : 0x00055555
-     30,  // U+001978 - U+00197F : 0x00000000
+    164,  // U+001968 - U+00196F : 0x00555555
+    147,  // U+001970 - U+001977 : 0x00055555
+     29,  // U+001978 - U+00197F : 0x00000000
       6,  // U+001980 - U+001987 : 0x55555555
       6,  // U+001988 - U+00198F : 0x55555555
       6,  // U+001990 - U+001997 : 0x55555555
       6,  // U+001998 - U+00199F : 0x55555555
       6,  // U+0019A0 - U+0019A7 : 0x55555555
-    147,  // U+0019A8 - U+0019AF : 0x00005555
+    187,  // U+0019A8 - U+0019AF : 0x00005555
      20,  // U+0019B0 - U+0019B7 : 0x11111111
      20,  // U+0019B8 - U+0019BF : 0x11111111
-     46,  // U+0019C0 - U+0019C7 : 0x55555551
-    184,  // U+0019C8 - U+0019CF : 0x00000011
+     44,  // U+0019C0 - U+0019C7 : 0x55555551
+    188,  // U+0019C8 - U+0019CF : 0x00000011
       3,  // U+0019D0 - U+0019D7 : 0x22222222
-    185,  // U+0019D8 - U+0019DF : 0x66000222
+    189,  // U+0019D8 - U+0019DF : 0x77000222
      17,  // U+0019E0 - U+0019E7 : 0x77777777
      17,  // U+0019E8 - U+0019EF : 0x77777777
      17,  // U+0019F0 - U+0019F7 : 0x77777777
      17,  // U+0019F8 - U+0019FF : 0x77777777
       6,  // U+001A00 - U+001A07 : 0x55555555
       6,  // U+001A08 - U+001A0F : 0x55555555
-    128,  // U+001A10 - U+001A17 : 0x15555555
-    186,  // U+001A18 - U+001A1F : 0x66001111
+    130,  // U+001A10 - U+001A17 : 0x15555555
+    190,  // U+001A18 - U+001A1F : 0x66001111
       6,  // U+001A20 - U+001A27 : 0x55555555
       6,  // U+001A28 - U+001A2F : 0x55555555
       6,  // U+001A30 - U+001A37 : 0x55555555
       6,  // U+001A38 - U+001A3F : 0x55555555
       6,  // U+001A40 - U+001A47 : 0x55555555
       6,  // U+001A48 - U+001A4F : 0x55555555
-    187,  // U+001A50 - U+001A57 : 0x11155555
-     44,  // U+001A58 - U+001A5F : 0x01111111
+    149,  // U+001A50 - U+001A57 : 0x11155555
+    191,  // U+001A58 - U+001A5F : 0x01111111
      20,  // U+001A60 - U+001A67 : 0x11111111
      20,  // U+001A68 - U+001A6F : 0x11111111
      20,  // U+001A70 - U+001A77 : 0x11111111
      74,  // U+001A78 - U+001A7F : 0x10011111
       3,  // U+001A80 - U+001A87 : 0x22222222
-    179,  // U+001A88 - U+001A8F : 0x00000022
+    182,  // U+001A88 - U+001A8F : 0x00000022
       3,  // U+001A90 - U+001A97 : 0x22222222
-    179,  // U+001A98 - U+001A9F : 0x00000022
-    188,  // U+001AA0 - U+001AA7 : 0x56666666
-    189,  // U+001AA8 - U+001AAF : 0x00666666
-     30,  // U+001AB0 - U+001AB7 : 0x00000000
-     30,  // U+001AB8 - U+001ABF : 0x00000000
-     30,  // U+001AC0 - U+001AC7 : 0x00000000
-     30,  // U+001AC8 - U+001ACF : 0x00000000
-     30,  // U+001AD0 - U+001AD7 : 0x00000000
-     30,  // U+001AD8 - U+001ADF : 0x00000000
-     30,  // U+001AE0 - U+001AE7 : 0x00000000
-     30,  // U+001AE8 - U+001AEF : 0x00000000
-     30,  // U+001AF0 - U+001AF7 : 0x00000000
-     30,  // U+001AF8 - U+001AFF : 0x00000000
-    190,  // U+001B00 - U+001B07 : 0x55511111
+    182,  // U+001A98 - U+001A9F : 0x00000022
+    192,  // U+001AA0 - U+001AA7 : 0x56666666
+    193,  // U+001AA8 - U+001AAF : 0x00666666
+     29,  // U+001AB0 - U+001AB7 : 0x00000000
+     29,  // U+001AB8 - U+001ABF : 0x00000000
+     29,  // U+001AC0 - U+001AC7 : 0x00000000
+     29,  // U+001AC8 - U+001ACF : 0x00000000
+     29,  // U+001AD0 - U+001AD7 : 0x00000000
+     29,  // U+001AD8 - U+001ADF : 0x00000000
+     29,  // U+001AE0 - U+001AE7 : 0x00000000
+     29,  // U+001AE8 - U+001AEF : 0x00000000
+     29,  // U+001AF0 - U+001AF7 : 0x00000000
+     29,  // U+001AF8 - U+001AFF : 0x00000000
+    194,  // U+001B00 - U+001B07 : 0x55511111
       6,  // U+001B08 - U+001B0F : 0x55555555
       6,  // U+001B10 - U+001B17 : 0x55555555
       6,  // U+001B18 - U+001B1F : 0x55555555
       6,  // U+001B20 - U+001B27 : 0x55555555
       6,  // U+001B28 - U+001B2F : 0x55555555
-    191,  // U+001B30 - U+001B37 : 0x11115555
+    195,  // U+001B30 - U+001B37 : 0x11115555
      20,  // U+001B38 - U+001B3F : 0x11111111
-    190,  // U+001B40 - U+001B47 : 0x55511111
-    147,  // U+001B48 - U+001B4F : 0x00005555
+    194,  // U+001B40 - U+001B47 : 0x55511111
+    187,  // U+001B48 - U+001B4F : 0x00005555
       3,  // U+001B50 - U+001B57 : 0x22222222
-    154,  // U+001B58 - U+001B5F : 0x66666622
-    192,  // U+001B60 - U+001B67 : 0x77777776
-    193,  // U+001B68 - U+001B6F : 0x11111777
-    194,  // U+001B70 - U+001B77 : 0x77771111
-    195,  // U+001B78 - U+001B7F : 0x00077777
-    196,  // U+001B80 - U+001B87 : 0x55555111
+    156,  // U+001B58 - U+001B5F : 0x66666622
+    196,  // U+001B60 - U+001B67 : 0x77777776
+    197,  // U+001B68 - U+001B6F : 0x11111777
+    198,  // U+001B70 - U+001B77 : 0x77771111
+    199,  // U+001B78 - U+001B7F : 0x00077777
+    200,  // U+001B80 - U+001B87 : 0x55555111
       6,  // U+001B88 - U+001B8F : 0x55555555
       6,  // U+001B90 - U+001B97 : 0x55555555
       6,  // U+001B98 - U+001B9F : 0x55555555
-    197,  // U+001BA0 - U+001BA7 : 0x11111115
-    198,  // U+001BA8 - U+001BAF : 0x55000111
+     66,  // U+001BA0 - U+001BA7 : 0x11111115
+    201,  // U+001BA8 - U+001BAF : 0x55000111
       3,  // U+001BB0 - U+001BB7 : 0x22222222
-    179,  // U+001BB8 - U+001BBF : 0x00000022
-     30,  // U+001BC0 - U+001BC7 : 0x00000000
-     30,  // U+001BC8 - U+001BCF : 0x00000000
-     30,  // U+001BD0 - U+001BD7 : 0x00000000
-     30,  // U+001BD8 - U+001BDF : 0x00000000
-     30,  // U+001BE0 - U+001BE7 : 0x00000000
-     30,  // U+001BE8 - U+001BEF : 0x00000000
-     30,  // U+001BF0 - U+001BF7 : 0x00000000
-     30,  // U+001BF8 - U+001BFF : 0x00000000
+    182,  // U+001BB8 - U+001BBF : 0x00000022
+      6,  // U+001BC0 - U+001BC7 : 0x55555555
+      6,  // U+001BC8 - U+001BCF : 0x55555555
+      6,  // U+001BD0 - U+001BD7 : 0x55555555
+      6,  // U+001BD8 - U+001BDF : 0x55555555
+     54,  // U+001BE0 - U+001BE7 : 0x11555555
+     20,  // U+001BE8 - U+001BEF : 0x11111111
+    185,  // U+001BF0 - U+001BF7 : 0x00001111
+    202,  // U+001BF8 - U+001BFF : 0x66660000
       6,  // U+001C00 - U+001C07 : 0x55555555
       6,  // U+001C08 - U+001C0F : 0x55555555
       6,  // U+001C10 - U+001C17 : 0x55555555
       6,  // U+001C18 - U+001C1F : 0x55555555
-    191,  // U+001C20 - U+001C27 : 0x11115555
+    195,  // U+001C20 - U+001C27 : 0x11115555
      20,  // U+001C28 - U+001C2F : 0x11111111
      20,  // U+001C30 - U+001C37 : 0x11111111
-    199,  // U+001C38 - U+001C3F : 0x66666000
+    203,  // U+001C38 - U+001C3F : 0x66666000
       3,  // U+001C40 - U+001C47 : 0x22222222
-    200,  // U+001C48 - U+001C4F : 0x55500022
+    204,  // U+001C48 - U+001C4F : 0x55500022
       3,  // U+001C50 - U+001C57 : 0x22222222
-     58,  // U+001C58 - U+001C5F : 0x55555522
+     56,  // U+001C58 - U+001C5F : 0x55555522
       6,  // U+001C60 - U+001C67 : 0x55555555
       6,  // U+001C68 - U+001C6F : 0x55555555
       6,  // U+001C70 - U+001C77 : 0x55555555
-    201,  // U+001C78 - U+001C7F : 0x66555555
-     30,  // U+001C80 - U+001C87 : 0x00000000
-     30,  // U+001C88 - U+001C8F : 0x00000000
-     30,  // U+001C90 - U+001C97 : 0x00000000
-     30,  // U+001C98 - U+001C9F : 0x00000000
-     30,  // U+001CA0 - U+001CA7 : 0x00000000
-     30,  // U+001CA8 - U+001CAF : 0x00000000
-     30,  // U+001CB0 - U+001CB7 : 0x00000000
-     30,  // U+001CB8 - U+001CBF : 0x00000000
-     30,  // U+001CC0 - U+001CC7 : 0x00000000
-     30,  // U+001CC8 - U+001CCF : 0x00000000
-    202,  // U+001CD0 - U+001CD7 : 0x11116111
+    205,  // U+001C78 - U+001C7F : 0x66555555
+     29,  // U+001C80 - U+001C87 : 0x00000000
+     29,  // U+001C88 - U+001C8F : 0x00000000
+     29,  // U+001C90 - U+001C97 : 0x00000000
+     29,  // U+001C98 - U+001C9F : 0x00000000
+     29,  // U+001CA0 - U+001CA7 : 0x00000000
+     29,  // U+001CA8 - U+001CAF : 0x00000000
+     29,  // U+001CB0 - U+001CB7 : 0x00000000
+     29,  // U+001CB8 - U+001CBF : 0x00000000
+     29,  // U+001CC0 - U+001CC7 : 0x00000000
+     29,  // U+001CC8 - U+001CCF : 0x00000000
+    206,  // U+001CD0 - U+001CD7 : 0x11116111
      20,  // U+001CD8 - U+001CDF : 0x11111111
      20,  // U+001CE0 - U+001CE7 : 0x11111111
-    203,  // U+001CE8 - U+001CEF : 0x55155551
-    204,  // U+001CF0 - U+001CF7 : 0x00000155
-     30,  // U+001CF8 - U+001CFF : 0x00000000
+    207,  // U+001CE8 - U+001CEF : 0x55155551
+    208,  // U+001CF0 - U+001CF7 : 0x00000155
+     29,  // U+001CF8 - U+001CFF : 0x00000000
 };
 
 static const PRUint8 gGenCatIdx2[736] = {
       0,  // U+001D00 - U+001D07 : 0x55555555
       0,  // U+001D08 - U+001D0F : 0x55555555
       0,  // U+001D10 - U+001D17 : 0x55555555
       0,  // U+001D18 - U+001D1F : 0x55555555
       0,  // U+001D20 - U+001D27 : 0x55555555
@@ -998,17 +998,17 @@ static const PRUint8 gGenCatIdx2[736] = 
       0,  // U+001DB8 - U+001DBF : 0x55555555
       1,  // U+001DC0 - U+001DC7 : 0x11111111
       1,  // U+001DC8 - U+001DCF : 0x11111111
       1,  // U+001DD0 - U+001DD7 : 0x11111111
       1,  // U+001DD8 - U+001DDF : 0x11111111
       2,  // U+001DE0 - U+001DE7 : 0x01111111
       3,  // U+001DE8 - U+001DEF : 0x00000000
       3,  // U+001DF0 - U+001DF7 : 0x00000000
-      4,  // U+001DF8 - U+001DFF : 0x11100000
+      4,  // U+001DF8 - U+001DFF : 0x11110000
       0,  // U+001E00 - U+001E07 : 0x55555555
       0,  // U+001E08 - U+001E0F : 0x55555555
       0,  // U+001E10 - U+001E17 : 0x55555555
       0,  // U+001E18 - U+001E1F : 0x55555555
       0,  // U+001E20 - U+001E27 : 0x55555555
       0,  // U+001E28 - U+001E2F : 0x55555555
       0,  // U+001E30 - U+001E37 : 0x55555555
       0,  // U+001E38 - U+001E3F : 0x55555555
@@ -1081,22 +1081,22 @@ static const PRUint8 gGenCatIdx2[736] = 
      20,  // U+002050 - U+002057 : 0x66666766
      21,  // U+002058 - U+00205F : 0x36666666
      22,  // U+002060 - U+002067 : 0x00044444
      23,  // U+002068 - U+00206F : 0x44444400
      24,  // U+002070 - U+002077 : 0x22220052
      25,  // U+002078 - U+00207F : 0x56677722
      26,  // U+002080 - U+002087 : 0x22222222
      27,  // U+002088 - U+00208F : 0x06677722
-     28,  // U+002090 - U+002097 : 0x00055555
-      3,  // U+002098 - U+00209F : 0x00000000
+      0,  // U+002090 - U+002097 : 0x55555555
+     28,  // U+002098 - U+00209F : 0x00055555
      29,  // U+0020A0 - U+0020A7 : 0x77777777
      29,  // U+0020A8 - U+0020AF : 0x77777777
      29,  // U+0020B0 - U+0020B7 : 0x77777777
-     30,  // U+0020B8 - U+0020BF : 0x00000007
+     30,  // U+0020B8 - U+0020BF : 0x00000077
       3,  // U+0020C0 - U+0020C7 : 0x00000000
       3,  // U+0020C8 - U+0020CF : 0x00000000
       1,  // U+0020D0 - U+0020D7 : 0x11111111
       1,  // U+0020D8 - U+0020DF : 0x11111111
       1,  // U+0020E0 - U+0020E7 : 0x11111111
       1,  // U+0020E8 - U+0020EF : 0x11111111
      31,  // U+0020F0 - U+0020F7 : 0x00000001
       3,  // U+0020F8 - U+0020FF : 0x00000000
@@ -1188,49 +1188,49 @@ static const PRUint8 gGenCatIdx2[736] = 
      29,  // U+0023A8 - U+0023AF : 0x77777777
      29,  // U+0023B0 - U+0023B7 : 0x77777777
      29,  // U+0023B8 - U+0023BF : 0x77777777
      29,  // U+0023C0 - U+0023C7 : 0x77777777
      29,  // U+0023C8 - U+0023CF : 0x77777777
      29,  // U+0023D0 - U+0023D7 : 0x77777777
      29,  // U+0023D8 - U+0023DF : 0x77777777
      29,  // U+0023E0 - U+0023E7 : 0x77777777
-     30,  // U+0023E8 - U+0023EF : 0x00000007
-      3,  // U+0023F0 - U+0023F7 : 0x00000000
+     29,  // U+0023E8 - U+0023EF : 0x77777777
+     44,  // U+0023F0 - U+0023F7 : 0x00007777
       3,  // U+0023F8 - U+0023FF : 0x00000000
      29,  // U+002400 - U+002407 : 0x77777777
      29,  // U+002408 - U+00240F : 0x77777777
      29,  // U+002410 - U+002417 : 0x77777777
      29,  // U+002418 - U+00241F : 0x77777777
-     44,  // U+002420 - U+002427 : 0x07777777
+     45,  // U+002420 - U+002427 : 0x07777777
       3,  // U+002428 - U+00242F : 0x00000000
       3,  // U+002430 - U+002437 : 0x00000000
       3,  // U+002438 - U+00243F : 0x00000000
      29,  // U+002440 - U+002447 : 0x77777777
-     45,  // U+002448 - U+00244F : 0x00000777
+     46,  // U+002448 - U+00244F : 0x00000777
       3,  // U+002450 - U+002457 : 0x00000000
       3,  // U+002458 - U+00245F : 0x00000000
      26,  // U+002460 - U+002467 : 0x22222222
      26,  // U+002468 - U+00246F : 0x22222222
      26,  // U+002470 - U+002477 : 0x22222222
      26,  // U+002478 - U+00247F : 0x22222222
      26,  // U+002480 - U+002487 : 0x22222222
      26,  // U+002488 - U+00248F : 0x22222222
      26,  // U+002490 - U+002497 : 0x22222222
-     46,  // U+002498 - U+00249F : 0x77772222
+     47,  // U+002498 - U+00249F : 0x77772222
      29,  // U+0024A0 - U+0024A7 : 0x77777777
      29,  // U+0024A8 - U+0024AF : 0x77777777
      29,  // U+0024B0 - U+0024B7 : 0x77777777
      29,  // U+0024B8 - U+0024BF : 0x77777777
      29,  // U+0024C0 - U+0024C7 : 0x77777777
      29,  // U+0024C8 - U+0024CF : 0x77777777
      29,  // U+0024D0 - U+0024D7 : 0x77777777
      29,  // U+0024D8 - U+0024DF : 0x77777777
      29,  // U+0024E0 - U+0024E7 : 0x77777777
-     47,  // U+0024E8 - U+0024EF : 0x22222277
+     48,  // U+0024E8 - U+0024EF : 0x22222277
      26,  // U+0024F0 - U+0024F7 : 0x22222222
      26,  // U+0024F8 - U+0024FF : 0x22222222
      29,  // U+002500 - U+002507 : 0x77777777
      29,  // U+002508 - U+00250F : 0x77777777
      29,  // U+002510 - U+002517 : 0x77777777
      29,  // U+002518 - U+00251F : 0x77777777
      29,  // U+002520 - U+002527 : 0x77777777
      29,  // U+002528 - U+00252F : 0x77777777
@@ -1280,52 +1280,52 @@ static const PRUint8 gGenCatIdx2[736] = 
      29,  // U+002688 - U+00268F : 0x77777777
      29,  // U+002690 - U+002697 : 0x77777777
      29,  // U+002698 - U+00269F : 0x77777777
      29,  // U+0026A0 - U+0026A7 : 0x77777777
      29,  // U+0026A8 - U+0026AF : 0x77777777
      29,  // U+0026B0 - U+0026B7 : 0x77777777
      29,  // U+0026B8 - U+0026BF : 0x77777777
      29,  // U+0026C0 - U+0026C7 : 0x77777777
-     48,  // U+0026C8 - U+0026CF : 0x70777777
+     29,  // U+0026C8 - U+0026CF : 0x77777777
      29,  // U+0026D0 - U+0026D7 : 0x77777777
      29,  // U+0026D8 - U+0026DF : 0x77777777
-     49,  // U+0026E0 - U+0026E7 : 0x00007077
+     29,  // U+0026E0 - U+0026E7 : 0x77777777
      29,  // U+0026E8 - U+0026EF : 0x77777777
      29,  // U+0026F0 - U+0026F7 : 0x77777777
      29,  // U+0026F8 - U+0026FF : 0x77777777
-     50,  // U+002700 - U+002707 : 0x77077770
-     51,  // U+002708 - U+00270F : 0x77770077
+     49,  // U+002700 - U+002707 : 0x77777770
+     29,  // U+002708 - U+00270F : 0x77777777
      29,  // U+002710 - U+002717 : 0x77777777
      29,  // U+002718 - U+00271F : 0x77777777
      29,  // U+002720 - U+002727 : 0x77777777
-     52,  // U+002728 - U+00272F : 0x77777770
+     29,  // U+002728 - U+00272F : 0x77777777
      29,  // U+002730 - U+002737 : 0x77777777
      29,  // U+002738 - U+00273F : 0x77777777
      29,  // U+002740 - U+002747 : 0x77777777
-     53,  // U+002748 - U+00274F : 0x70707777
-     54,  // U+002750 - U+002757 : 0x77000777
-     44,  // U+002758 - U+00275F : 0x07777777
-     52,  // U+002760 - U+002767 : 0x77777770
+     29,  // U+002748 - U+00274F : 0x77777777
+     29,  // U+002750 - U+002757 : 0x77777777
+     29,  // U+002758 - U+00275F : 0x77777777
+     29,  // U+002760 - U+002767 : 0x77777777
      17,  // U+002768 - U+00276F : 0x66666666
-     55,  // U+002770 - U+002777 : 0x22666666
+     50,  // U+002770 - U+002777 : 0x22666666
      26,  // U+002778 - U+00277F : 0x22222222
      26,  // U+002780 - U+002787 : 0x22222222
      26,  // U+002788 - U+00278F : 0x22222222
-     56,  // U+002790 - U+002797 : 0x00072222
+     47,  // U+002790 - U+002797 : 0x77772222
      29,  // U+002798 - U+00279F : 0x77777777
      29,  // U+0027A0 - U+0027A7 : 0x77777777
      29,  // U+0027A8 - U+0027AF : 0x77777777
-     52,  // U+0027B0 - U+0027B7 : 0x77777770
-     44,  // U+0027B8 - U+0027BF : 0x07777777
-     57,  // U+0027C0 - U+0027C7 : 0x76677777
-     58,  // U+0027C8 - U+0027CF : 0x00070777
+     29,  // U+0027B0 - U+0027B7 : 0x77777777
+     29,  // U+0027B8 - U+0027BF : 0x77777777
+     51,  // U+0027C0 - U+0027C7 : 0x76677777
+     52,  // U+0027C8 - U+0027CF : 0x77070777
      29,  // U+0027D0 - U+0027D7 : 0x77777777
      29,  // U+0027D8 - U+0027DF : 0x77777777
-     59,  // U+0027E0 - U+0027E7 : 0x66777777
+     53,  // U+0027E0 - U+0027E7 : 0x66777777
      17,  // U+0027E8 - U+0027EF : 0x66666666
      29,  // U+0027F0 - U+0027F7 : 0x77777777
      29,  // U+0027F8 - U+0027FF : 0x77777777
      29,  // U+002800 - U+002807 : 0x77777777
      29,  // U+002808 - U+00280F : 0x77777777
      29,  // U+002810 - U+002817 : 0x77777777
      29,  // U+002818 - U+00281F : 0x77777777
      29,  // U+002820 - U+002827 : 0x77777777
@@ -1367,32 +1367,32 @@ static const PRUint8 gGenCatIdx2[736] = 
      29,  // U+002940 - U+002947 : 0x77777777
      29,  // U+002948 - U+00294F : 0x77777777
      29,  // U+002950 - U+002957 : 0x77777777
      29,  // U+002958 - U+00295F : 0x77777777
      29,  // U+002960 - U+002967 : 0x77777777
      29,  // U+002968 - U+00296F : 0x77777777
      29,  // U+002970 - U+002977 : 0x77777777
      29,  // U+002978 - U+00297F : 0x77777777
-     60,  // U+002980 - U+002987 : 0x66666777
+     54,  // U+002980 - U+002987 : 0x66666777
      17,  // U+002988 - U+00298F : 0x66666666
      17,  // U+002990 - U+002997 : 0x66666666
-     61,  // U+002998 - U+00299F : 0x77777776
+     55,  // U+002998 - U+00299F : 0x77777776
      29,  // U+0029A0 - U+0029A7 : 0x77777777
      29,  // U+0029A8 - U+0029AF : 0x77777777
      29,  // U+0029B0 - U+0029B7 : 0x77777777
      29,  // U+0029B8 - U+0029BF : 0x77777777
      29,  // U+0029C0 - U+0029C7 : 0x77777777
      29,  // U+0029C8 - U+0029CF : 0x77777777
      29,  // U+0029D0 - U+0029D7 : 0x77777777
-     62,  // U+0029D8 - U+0029DF : 0x77776666
+     56,  // U+0029D8 - U+0029DF : 0x77776666
      29,  // U+0029E0 - U+0029E7 : 0x77777777
      29,  // U+0029E8 - U+0029EF : 0x77777777
      29,  // U+0029F0 - U+0029F7 : 0x77777777
-     63,  // U+0029F8 - U+0029FF : 0x77667777
+     57,  // U+0029F8 - U+0029FF : 0x77667777
      29,  // U+002A00 - U+002A07 : 0x77777777
      29,  // U+002A08 - U+002A0F : 0x77777777
      29,  // U+002A10 - U+002A17 : 0x77777777
      29,  // U+002A18 - U+002A1F : 0x77777777
      29,  // U+002A20 - U+002A27 : 0x77777777
      29,  // U+002A28 - U+002A2F : 0x77777777
      29,  // U+002A30 - U+002A37 : 0x77777777
      29,  // U+002A38 - U+002A3F : 0x77777777
@@ -1424,19 +1424,19 @@ static const PRUint8 gGenCatIdx2[736] = 
      29,  // U+002B08 - U+002B0F : 0x77777777
      29,  // U+002B10 - U+002B17 : 0x77777777
      29,  // U+002B18 - U+002B1F : 0x77777777
      29,  // U+002B20 - U+002B27 : 0x77777777
      29,  // U+002B28 - U+002B2F : 0x77777777
      29,  // U+002B30 - U+002B37 : 0x77777777
      29,  // U+002B38 - U+002B3F : 0x77777777
      29,  // U+002B40 - U+002B47 : 0x77777777
-     64,  // U+002B48 - U+002B4F : 0x00077777
+     58,  // U+002B48 - U+002B4F : 0x00077777
      29,  // U+002B50 - U+002B57 : 0x77777777
-     65,  // U+002B58 - U+002B5F : 0x00000077
+     30,  // U+002B58 - U+002B5F : 0x00000077
       3,  // U+002B60 - U+002B67 : 0x00000000
       3,  // U+002B68 - U+002B6F : 0x00000000
       3,  // U+002B70 - U+002B77 : 0x00000000
       3,  // U+002B78 - U+002B7F : 0x00000000
       3,  // U+002B80 - U+002B87 : 0x00000000
       3,  // U+002B88 - U+002B8F : 0x00000000
       3,  // U+002B90 - U+002B97 : 0x00000000
       3,  // U+002B98 - U+002B9F : 0x00000000
@@ -1452,23 +1452,23 @@ static const PRUint8 gGenCatIdx2[736] = 
       3,  // U+002BE8 - U+002BEF : 0x00000000
       3,  // U+002BF0 - U+002BF7 : 0x00000000
       3,  // U+002BF8 - U+002BFF : 0x00000000
       0,  // U+002C00 - U+002C07 : 0x55555555
       0,  // U+002C08 - U+002C0F : 0x55555555
       0,  // U+002C10 - U+002C17 : 0x55555555
       0,  // U+002C18 - U+002C1F : 0x55555555
       0,  // U+002C20 - U+002C27 : 0x55555555
-     66,  // U+002C28 - U+002C2F : 0x05555555
+     59,  // U+002C28 - U+002C2F : 0x05555555
       0,  // U+002C30 - U+002C37 : 0x55555555
       0,  // U+002C38 - U+002C3F : 0x55555555
       0,  // U+002C40 - U+002C47 : 0x55555555
       0,  // U+002C48 - U+002C4F : 0x55555555
       0,  // U+002C50 - U+002C57 : 0x55555555
-     66,  // U+002C58 - U+002C5F : 0x05555555
+     59,  // U+002C58 - U+002C5F : 0x05555555
       0,  // U+002C60 - U+002C67 : 0x55555555
       0,  // U+002C68 - U+002C6F : 0x55555555
       0,  // U+002C70 - U+002C77 : 0x55555555
       0,  // U+002C78 - U+002C7F : 0x55555555
       0,  // U+002C80 - U+002C87 : 0x55555555
       0,  // U+002C88 - U+002C8F : 0x55555555
       0,  // U+002C90 - U+002C97 : 0x55555555
       0,  // U+002C98 - U+002C9F : 0x55555555
@@ -1476,82 +1476,82 @@ static const PRUint8 gGenCatIdx2[736] = 
       0,  // U+002CA8 - U+002CAF : 0x55555555
       0,  // U+002CB0 - U+002CB7 : 0x55555555
       0,  // U+002CB8 - U+002CBF : 0x55555555
       0,  // U+002CC0 - U+002CC7 : 0x55555555
       0,  // U+002CC8 - U+002CCF : 0x55555555
       0,  // U+002CD0 - U+002CD7 : 0x55555555
       0,  // U+002CD8 - U+002CDF : 0x55555555
      10,  // U+002CE0 - U+002CE7 : 0x77755555
-     67,  // U+002CE8 - U+002CEF : 0x15555777
-     68,  // U+002CF0 - U+002CF7 : 0x00000011
-     69,  // U+002CF8 - U+002CFF : 0x66266660
+     60,  // U+002CE8 - U+002CEF : 0x15555777
+     61,  // U+002CF0 - U+002CF7 : 0x00000011
+     62,  // U+002CF8 - U+002CFF : 0x66266660
       0,  // U+002D00 - U+002D07 : 0x55555555
       0,  // U+002D08 - U+002D0F : 0x55555555
       0,  // U+002D10 - U+002D17 : 0x55555555
       0,  // U+002D18 - U+002D1F : 0x55555555
       5,  // U+002D20 - U+002D27 : 0x00555555
       3,  // U+002D28 - U+002D2F : 0x00000000
       0,  // U+002D30 - U+002D37 : 0x55555555
       0,  // U+002D38 - U+002D3F : 0x55555555
       0,  // U+002D40 - U+002D47 : 0x55555555
       0,  // U+002D48 - U+002D4F : 0x55555555
       0,  // U+002D50 - U+002D57 : 0x55555555
       0,  // U+002D58 - U+002D5F : 0x55555555
       5,  // U+002D60 - U+002D67 : 0x00555555
-     70,  // U+002D68 - U+002D6F : 0x50000000
-      3,  // U+002D70 - U+002D77 : 0x00000000
-      3,  // U+002D78 - U+002D7F : 0x00000000
+     63,  // U+002D68 - U+002D6F : 0x50000000
+     64,  // U+002D70 - U+002D77 : 0x00000006
+     65,  // U+002D78 - U+002D7F : 0x10000000
       0,  // U+002D80 - U+002D87 : 0x55555555
       0,  // U+002D88 - U+002D8F : 0x55555555
-     66,  // U+002D90 - U+002D97 : 0x05555555
+     59,  // U+002D90 - U+002D97 : 0x05555555
       3,  // U+002D98 - U+002D9F : 0x00000000
-     66,  // U+002DA0 - U+002DA7 : 0x05555555
-     66,  // U+002DA8 - U+002DAF : 0x05555555
-     66,  // U+002DB0 - U+002DB7 : 0x05555555
-     66,  // U+002DB8 - U+002DBF : 0x05555555
-     66,  // U+002DC0 - U+002DC7 : 0x05555555
-     66,  // U+002DC8 - U+002DCF : 0x05555555
-     66,  // U+002DD0 - U+002DD7 : 0x05555555
-     66,  // U+002DD8 - U+002DDF : 0x05555555
+     59,  // U+002DA0 - U+002DA7 : 0x05555555
+     59,  // U+002DA8 - U+002DAF : 0x05555555
+     59,  // U+002DB0 - U+002DB7 : 0x05555555
+     59,  // U+002DB8 - U+002DBF : 0x05555555
+     59,  // U+002DC0 - U+002DC7 : 0x05555555
+     59,  // U+002DC8 - U+002DCF : 0x05555555
+     59,  // U+002DD0 - U+002DD7 : 0x05555555
+     59,  // U+002DD8 - U+002DDF : 0x05555555
       1,  // U+002DE0 - U+002DE7 : 0x11111111
       1,  // U+002DE8 - U+002DEF : 0x11111111
       1,  // U+002DF0 - U+002DF7 : 0x11111111
       1,  // U+002DF8 - U+002DFF : 0x11111111
      17,  // U+002E00 - U+002E07 : 0x66666666
      17,  // U+002E08 - U+002E0F : 0x66666666
      17,  // U+002E10 - U+002E17 : 0x66666666
      17,  // U+002E18 - U+002E1F : 0x66666666
      17,  // U+002E20 - U+002E27 : 0x66666666
-     71,  // U+002E28 - U+002E2F : 0x56666666
-     72,  // U+002E30 - U+002E37 : 0x00000066
+     66,  // U+002E28 - U+002E2F : 0x56666666
+     67,  // U+002E30 - U+002E37 : 0x00000066
       3,  // U+002E38 - U+002E3F : 0x00000000
       3,  // U+002E40 - U+002E47 : 0x00000000
       3,  // U+002E48 - U+002E4F : 0x00000000
       3,  // U+002E50 - U+002E57 : 0x00000000
       3,  // U+002E58 - U+002E5F : 0x00000000
       3,  // U+002E60 - U+002E67 : 0x00000000
       3,  // U+002E68 - U+002E6F : 0x00000000
       3,  // U+002E70 - U+002E77 : 0x00000000
       3,  // U+002E78 - U+002E7F : 0x00000000
      29,  // U+002E80 - U+002E87 : 0x77777777
      29,  // U+002E88 - U+002E8F : 0x77777777
      29,  // U+002E90 - U+002E97 : 0x77777777
-     73,  // U+002E98 - U+002E9F : 0x77777077
+     68,  // U+002E98 - U+002E9F : 0x77777077
      29,  // U+002EA0 - U+002EA7 : 0x77777777
      29,  // U+002EA8 - U+002EAF : 0x77777777
      29,  // U+002EB0 - U+002EB7 : 0x77777777
      29,  // U+002EB8 - U+002EBF : 0x77777777
      29,  // U+002EC0 - U+002EC7 : 0x77777777
      29,  // U+002EC8 - U+002ECF : 0x77777777
      29,  // U+002ED0 - U+002ED7 : 0x77777777
      29,  // U+002ED8 - U+002EDF : 0x77777777
      29,  // U+002EE0 - U+002EE7 : 0x77777777
      29,  // U+002EE8 - U+002EEF : 0x77777777
-     74,  // U+002EF0 - U+002EF7 : 0x00007777
+     44,  // U+002EF0 - U+002EF7 : 0x00007777
       3,  // U+002EF8 - U+002EFF : 0x00000000
      29,  // U+002F00 - U+002F07 : 0x77777777
      29,  // U+002F08 - U+002F0F : 0x77777777
      29,  // U+002F10 - U+002F17 : 0x77777777
      29,  // U+002F18 - U+002F1F : 0x77777777
      29,  // U+002F20 - U+002F27 : 0x77777777
      29,  // U+002F28 - U+002F2F : 0x77777777
      29,  // U+002F30 - U+002F37 : 0x77777777
@@ -1569,118 +1569,118 @@ static const PRUint8 gGenCatIdx2[736] = 
      29,  // U+002F90 - U+002F97 : 0x77777777
      29,  // U+002F98 - U+002F9F : 0x77777777
      29,  // U+002FA0 - U+002FA7 : 0x77777777
      29,  // U+002FA8 - U+002FAF : 0x77777777
      29,  // U+002FB0 - U+002FB7 : 0x77777777
      29,  // U+002FB8 - U+002FBF : 0x77777777
      29,  // U+002FC0 - U+002FC7 : 0x77777777
      29,  // U+002FC8 - U+002FCF : 0x77777777
-     75,  // U+002FD0 - U+002FD7 : 0x00777777
+     69,  // U+002FD0 - U+002FD7 : 0x00777777
       3,  // U+002FD8 - U+002FDF : 0x00000000
       3,  // U+002FE0 - U+002FE7 : 0x00000000
       3,  // U+002FE8 - U+002FEF : 0x00000000
      29,  // U+002FF0 - U+002FF7 : 0x77777777
-     74,  // U+002FF8 - U+002FFF : 0x00007777
-     76,  // U+003000 - U+003007 : 0x25576663
+     44,  // U+002FF8 - U+002FFF : 0x00007777
+     70,  // U+003000 - U+003007 : 0x25576663
      17,  // U+003008 - U+00300F : 0x66666666
-     77,  // U+003010 - U+003017 : 0x66667766
+     71,  // U+003010 - U+003017 : 0x66667766
      17,  // U+003018 - U+00301F : 0x66666666
-     78,  // U+003020 - U+003027 : 0x22222227
-     79,  // U+003028 - U+00302F : 0x11111122
-     80,  // U+003030 - U+003037 : 0x77555556
-     81,  // U+003038 - U+00303F : 0x77655222
-     82,  // U+003040 - U+003047 : 0x55555550
+     72,  // U+003020 - U+003027 : 0x22222227
+     73,  // U+003028 - U+00302F : 0x11111122
+     74,  // U+003030 - U+003037 : 0x77555556
+     75,  // U+003038 - U+00303F : 0x77655222
+     76,  // U+003040 - U+003047 : 0x55555550
       0,  // U+003048 - U+00304F : 0x55555555
       0,  // U+003050 - U+003057 : 0x55555555
       0,  // U+003058 - U+00305F : 0x55555555
       0,  // U+003060 - U+003067 : 0x55555555
       0,  // U+003068 - U+00306F : 0x55555555
       0,  // U+003070 - U+003077 : 0x55555555
       0,  // U+003078 - U+00307F : 0x55555555
       0,  // U+003080 - U+003087 : 0x55555555
       0,  // U+003088 - U+00308F : 0x55555555
-     66,  // U+003090 - U+003097 : 0x05555555
-     83,  // U+003098 - U+00309F : 0x55577110
-     84,  // U+0030A0 - U+0030A7 : 0x55555556
+     59,  // U+003090 - U+003097 : 0x05555555
+     77,  // U+003098 - U+00309F : 0x55577110
+     78,  // U+0030A0 - U+0030A7 : 0x55555556
       0,  // U+0030A8 - U+0030AF : 0x55555555
       0,  // U+0030B0 - U+0030B7 : 0x55555555
       0,  // U+0030B8 - U+0030BF : 0x55555555
       0,  // U+0030C0 - U+0030C7 : 0x55555555
       0,  // U+0030C8 - U+0030CF : 0x55555555
       0,  // U+0030D0 - U+0030D7 : 0x55555555
       0,  // U+0030D8 - U+0030DF : 0x55555555
       0,  // U+0030E0 - U+0030E7 : 0x55555555
       0,  // U+0030E8 - U+0030EF : 0x55555555
       0,  // U+0030F0 - U+0030F7 : 0x55555555
-     85,  // U+0030F8 - U+0030FF : 0x55556555
-     86,  // U+003100 - U+003107 : 0x55500000
+     79,  // U+0030F8 - U+0030FF : 0x55556555
+     80,  // U+003100 - U+003107 : 0x55500000
       0,  // U+003108 - U+00310F : 0x55555555
       0,  // U+003110 - U+003117 : 0x55555555
       0,  // U+003118 - U+00311F : 0x55555555
       0,  // U+003120 - U+003127 : 0x55555555
       5,  // U+003128 - U+00312F : 0x00555555
-     82,  // U+003130 - U+003137 : 0x55555550
+     76,  // U+003130 - U+003137 : 0x55555550
       0,  // U+003138 - U+00313F : 0x55555555
       0,  // U+003140 - U+003147 : 0x55555555
       0,  // U+003148 - U+00314F : 0x55555555
       0,  // U+003150 - U+003157 : 0x55555555
       0,  // U+003158 - U+00315F : 0x55555555
       0,  // U+003160 - U+003167 : 0x55555555
       0,  // U+003168 - U+00316F : 0x55555555
       0,  // U+003170 - U+003177 : 0x55555555
       0,  // U+003178 - U+00317F : 0x55555555
       0,  // U+003180 - U+003187 : 0x55555555
-     66,  // U+003188 - U+00318F : 0x05555555
-     87,  // U+003190 - U+003197 : 0x77222277
+     59,  // U+003188 - U+00318F : 0x05555555
+     81,  // U+003190 - U+003197 : 0x77222277
      29,  // U+003198 - U+00319F : 0x77777777
       0,  // U+0031A0 - U+0031A7 : 0x55555555
       0,  // U+0031A8 - U+0031AF : 0x55555555
       0,  // U+0031B0 - U+0031B7 : 0x55555555
-      3,  // U+0031B8 - U+0031BF : 0x00000000
+     82,  // U+0031B8 - U+0031BF : 0x00000555
      29,  // U+0031C0 - U+0031C7 : 0x77777777
      29,  // U+0031C8 - U+0031CF : 0x77777777
      29,  // U+0031D0 - U+0031D7 : 0x77777777
      29,  // U+0031D8 - U+0031DF : 0x77777777
-     74,  // U+0031E0 - U+0031E7 : 0x00007777
+     44,  // U+0031E0 - U+0031E7 : 0x00007777
       3,  // U+0031E8 - U+0031EF : 0x00000000
       0,  // U+0031F0 - U+0031F7 : 0x55555555
       0,  // U+0031F8 - U+0031FF : 0x55555555
      29,  // U+003200 - U+003207 : 0x77777777
      29,  // U+003208 - U+00320F : 0x77777777
      29,  // U+003210 - U+003217 : 0x77777777
-     44,  // U+003218 - U+00321F : 0x07777777
+     45,  // U+003218 - U+00321F : 0x07777777
      26,  // U+003220 - U+003227 : 0x22222222
-     88,  // U+003228 - U+00322F : 0x77777722
+     83,  // U+003228 - U+00322F : 0x77777722
      29,  // U+003230 - U+003237 : 0x77777777
      29,  // U+003238 - U+00323F : 0x77777777
      29,  // U+003240 - U+003247 : 0x77777777
      29,  // U+003248 - U+00324F : 0x77777777
-     78,  // U+003250 - U+003257 : 0x22222227
+     72,  // U+003250 - U+003257 : 0x22222227
      26,  // U+003258 - U+00325F : 0x22222222
      29,  // U+003260 - U+003267 : 0x77777777
      29,  // U+003268 - U+00326F : 0x77777777
      29,  // U+003270 - U+003277 : 0x77777777
      29,  // U+003278 - U+00327F : 0x77777777
      26,  // U+003280 - U+003287 : 0x22222222
-     88,  // U+003288 - U+00328F : 0x77777722
+     83,  // U+003288 - U+00328F : 0x77777722
      29,  // U+003290 - U+003297 : 0x77777777
      29,  // U+003298 - U+00329F : 0x77777777
      29,  // U+0032A0 - U+0032A7 : 0x77777777
      29,  // U+0032A8 - U+0032AF : 0x77777777
-     78,  // U+0032B0 - U+0032B7 : 0x22222227
+     72,  // U+0032B0 - U+0032B7 : 0x22222227
      26,  // U+0032B8 - U+0032BF : 0x22222222
      29,  // U+0032C0 - U+0032C7 : 0x77777777
      29,  // U+0032C8 - U+0032CF : 0x77777777
      29,  // U+0032D0 - U+0032D7 : 0x77777777
      29,  // U+0032D8 - U+0032DF : 0x77777777
      29,  // U+0032E0 - U+0032E7 : 0x77777777
      29,  // U+0032E8 - U+0032EF : 0x77777777
      29,  // U+0032F0 - U+0032F7 : 0x77777777
-     44,  // U+0032F8 - U+0032FF : 0x07777777
+     45,  // U+0032F8 - U+0032FF : 0x07777777
      29,  // U+003300 - U+003307 : 0x77777777
      29,  // U+003308 - U+00330F : 0x77777777
      29,  // U+003310 - U+003317 : 0x77777777
      29,  // U+003318 - U+00331F : 0x77777777
      29,  // U+003320 - U+003327 : 0x77777777
      29,  // U+003328 - U+00332F : 0x77777777
      29,  // U+003330 - U+003337 : 0x77777777
      29,  // U+003338 - U+00333F : 0x77777777
@@ -1716,17 +1716,17 @@ static const PRUint8 gGenCatIdx3[8] = {
      29,  // U+004DD0 - U+004DD7 : 0x77777777
      29,  // U+004DD8 - U+004DDF : 0x77777777
      29,  // U+004DE0 - U+004DE7 : 0x77777777
      29,  // U+004DE8 - U+004DEF : 0x77777777
      29,  // U+004DF0 - U+004DF7 : 0x77777777
      29,  // U+004DF8 - U+004DFF : 0x77777777
 };
 
-static const PRUint8 gGenCatIdx4[352] = {
+static const PRUint8 gGenCatIdx4[384] = {
       0,  // U+00A000 - U+00A007 : 0x55555555
       0,  // U+00A008 - U+00A00F : 0x55555555
       0,  // U+00A010 - U+00A017 : 0x55555555
       0,  // U+00A018 - U+00A01F : 0x55555555
       0,  // U+00A020 - U+00A027 : 0x55555555
       0,  // U+00A028 - U+00A02F : 0x55555555
       0,  // U+00A030 - U+00A037 : 0x55555555
       0,  // U+00A038 - U+00A03F : 0x55555555
@@ -1869,24 +1869,24 @@ static const PRUint8 gGenCatIdx4[352] = 
       0,  // U+00A480 - U+00A487 : 0x55555555
      28,  // U+00A488 - U+00A48F : 0x00055555
      29,  // U+00A490 - U+00A497 : 0x77777777
      29,  // U+00A498 - U+00A49F : 0x77777777
      29,  // U+00A4A0 - U+00A4A7 : 0x77777777
      29,  // U+00A4A8 - U+00A4AF : 0x77777777
      29,  // U+00A4B0 - U+00A4B7 : 0x77777777
      29,  // U+00A4B8 - U+00A4BF : 0x77777777
-     44,  // U+00A4C0 - U+00A4C7 : 0x07777777
+     45,  // U+00A4C0 - U+00A4C7 : 0x07777777
       3,  // U+00A4C8 - U+00A4CF : 0x00000000
       0,  // U+00A4D0 - U+00A4D7 : 0x55555555
       0,  // U+00A4D8 - U+00A4DF : 0x55555555
       0,  // U+00A4E0 - U+00A4E7 : 0x55555555
       0,  // U+00A4E8 - U+00A4EF : 0x55555555
       0,  // U+00A4F0 - U+00A4F7 : 0x55555555
-     89,  // U+00A4F8 - U+00A4FF : 0x66555555
+     84,  // U+00A4F8 - U+00A4FF : 0x66555555
       0,  // U+00A500 - U+00A507 : 0x55555555
       0,  // U+00A508 - U+00A50F : 0x55555555
       0,  // U+00A510 - U+00A517 : 0x55555555
       0,  // U+00A518 - U+00A51F : 0x55555555
       0,  // U+00A520 - U+00A527 : 0x55555555
       0,  // U+00A528 - U+00A52F : 0x55555555
       0,  // U+00A530 - U+00A537 : 0x55555555
       0,  // U+00A538 - U+00A53F : 0x55555555
@@ -1910,202 +1910,223 @@ static const PRUint8 gGenCatIdx4[352] = 
       0,  // U+00A5C8 - U+00A5CF : 0x55555555
       0,  // U+00A5D0 - U+00A5D7 : 0x55555555
       0,  // U+00A5D8 - U+00A5DF : 0x55555555
       0,  // U+00A5E0 - U+00A5E7 : 0x55555555
       0,  // U+00A5E8 - U+00A5EF : 0x55555555
       0,  // U+00A5F0 - U+00A5F7 : 0x55555555
       0,  // U+00A5F8 - U+00A5FF : 0x55555555
       0,  // U+00A600 - U+00A607 : 0x55555555
-     90,  // U+00A608 - U+00A60F : 0x66655555
+     85,  // U+00A608 - U+00A60F : 0x66655555
       0,  // U+00A610 - U+00A617 : 0x55555555
       0,  // U+00A618 - U+00A61F : 0x55555555
      26,  // U+00A620 - U+00A627 : 0x22222222
-     91,  // U+00A628 - U+00A62F : 0x00005522
+     86,  // U+00A628 - U+00A62F : 0x00005522
       3,  // U+00A630 - U+00A637 : 0x00000000
       3,  // U+00A638 - U+00A63F : 0x00000000
       0,  // U+00A640 - U+00A647 : 0x55555555
       0,  // U+00A648 - U+00A64F : 0x55555555
       0,  // U+00A650 - U+00A657 : 0x55555555
       0,  // U+00A658 - U+00A65F : 0x55555555
-     92,  // U+00A660 - U+00A667 : 0x55555500
-     93,  // U+00A668 - U+00A66F : 0x15555555
-     94,  // U+00A670 - U+00A677 : 0x00006111
-     95,  // U+00A678 - U+00A67F : 0x56110000
+      0,  // U+00A660 - U+00A667 : 0x55555555
+     87,  // U+00A668 - U+00A66F : 0x15555555
+     88,  // U+00A670 - U+00A677 : 0x00006111
+     89,  // U+00A678 - U+00A67F : 0x56110000
       0,  // U+00A680 - U+00A687 : 0x55555555
       0,  // U+00A688 - U+00A68F : 0x55555555
       0,  // U+00A690 - U+00A697 : 0x55555555
       3,  // U+00A698 - U+00A69F : 0x00000000
       0,  // U+00A6A0 - U+00A6A7 : 0x55555555
       0,  // U+00A6A8 - U+00A6AF : 0x55555555
       0,  // U+00A6B0 - U+00A6B7 : 0x55555555
       0,  // U+00A6B8 - U+00A6BF : 0x55555555
       0,  // U+00A6C0 - U+00A6C7 : 0x55555555
       0,  // U+00A6C8 - U+00A6CF : 0x55555555
       0,  // U+00A6D0 - U+00A6D7 : 0x55555555
       0,  // U+00A6D8 - U+00A6DF : 0x55555555
-     96,  // U+00A6E0 - U+00A6E7 : 0x22555555
+     90,  // U+00A6E0 - U+00A6E7 : 0x22555555
      26,  // U+00A6E8 - U+00A6EF : 0x22222222
-     97,  // U+00A6F0 - U+00A6F7 : 0x66666611
+     91,  // U+00A6F0 - U+00A6F7 : 0x66666611
       3,  // U+00A6F8 - U+00A6FF : 0x00000000
      29,  // U+00A700 - U+00A707 : 0x77777777
      29,  // U+00A708 - U+00A70F : 0x77777777
-     98,  // U+00A710 - U+00A717 : 0x57777777
+     92,  // U+00A710 - U+00A717 : 0x57777777
       0,  // U+00A718 - U+00A71F : 0x55555555
      33,  // U+00A720 - U+00A727 : 0x55555577
       0,  // U+00A728 - U+00A72F : 0x55555555
       0,  // U+00A730 - U+00A737 : 0x55555555
       0,  // U+00A738 - U+00A73F : 0x55555555
       0,  // U+00A740 - U+00A747 : 0x55555555
       0,  // U+00A748 - U+00A74F : 0x55555555
       0,  // U+00A750 - U+00A757 : 0x55555555
       0,  // U+00A758 - U+00A75F : 0x55555555
       0,  // U+00A760 - U+00A767 : 0x55555555
       0,  // U+00A768 - U+00A76F : 0x55555555
       0,  // U+00A770 - U+00A777 : 0x55555555
       0,  // U+00A778 - U+00A77F : 0x55555555
       0,  // U+00A780 - U+00A787 : 0x55555555
-     99,  // U+00A788 - U+00A78F : 0x00055775
-      3,  // U+00A790 - U+00A797 : 0x00000000
+     93,  // U+00A788 - U+00A78F : 0x05555775
+     94,  // U+00A790 - U+00A797 : 0x00000055
       3,  // U+00A798 - U+00A79F : 0x00000000
-      3,  // U+00A7A0 - U+00A7A7 : 0x00000000
-      3,  // U+00A7A8 - U+00A7AF : 0x00000000
+      0,  // U+00A7A0 - U+00A7A7 : 0x55555555
+     94,  // U+00A7A8 - U+00A7AF : 0x00000055
       3,  // U+00A7B0 - U+00A7B7 : 0x00000000
       3,  // U+00A7B8 - U+00A7BF : 0x00000000
       3,  // U+00A7C0 - U+00A7C7 : 0x00000000
       3,  // U+00A7C8 - U+00A7CF : 0x00000000
       3,  // U+00A7D0 - U+00A7D7 : 0x00000000
       3,  // U+00A7D8 - U+00A7DF : 0x00000000
       3,  // U+00A7E0 - U+00A7E7 : 0x00000000
       3,  // U+00A7E8 - U+00A7EF : 0x00000000
       3,  // U+00A7F0 - U+00A7F7 : 0x00000000
-    100,  // U+00A7F8 - U+00A7FF : 0x55555000
-    101,  // U+00A800 - U+00A807 : 0x51555155
-    102,  // U+00A808 - U+00A80F : 0x55551555
+     95,  // U+00A7F8 - U+00A7FF : 0x55555500
+     96,  // U+00A800 - U+00A807 : 0x51555155
+     97,  // U+00A808 - U+00A80F : 0x55551555
       0,  // U+00A810 - U+00A817 : 0x55555555
       0,  // U+00A818 - U+00A81F : 0x55555555
-    103,  // U+00A820 - U+00A827 : 0x11111555
-     74,  // U+00A828 - U+00A82F : 0x00007777
-    104,  // U+00A830 - U+00A837 : 0x77222222
-     65,  // U+00A838 - U+00A83F : 0x00000077
+     98,  // U+00A820 - U+00A827 : 0x11111555
+     44,  // U+00A828 - U+00A82F : 0x00007777
+     99,  // U+00A830 - U+00A837 : 0x77222222
+     30,  // U+00A838 - U+00A83F : 0x00000077
       0,  // U+00A840 - U+00A847 : 0x55555555
       0,  // U+00A848 - U+00A84F : 0x55555555
       0,  // U+00A850 - U+00A857 : 0x55555555
       0,  // U+00A858 - U+00A85F : 0x55555555
       0,  // U+00A860 - U+00A867 : 0x55555555
       0,  // U+00A868 - U+00A86F : 0x55555555
-    105,  // U+00A870 - U+00A877 : 0x66665555
+    100,  // U+00A870 - U+00A877 : 0x66665555
       3,  // U+00A878 - U+00A87F : 0x00000000
-    106,  // U+00A880 - U+00A887 : 0x55555511
+    101,  // U+00A880 - U+00A887 : 0x55555511
       0,  // U+00A888 - U+00A88F : 0x55555555
       0,  // U+00A890 - U+00A897 : 0x55555555
       0,  // U+00A898 - U+00A89F : 0x55555555
       0,  // U+00A8A0 - U+00A8A7 : 0x55555555
       0,  // U+00A8A8 - U+00A8AF : 0x55555555
-    107,  // U+00A8B0 - U+00A8B7 : 0x11115555
+    102,  // U+00A8B0 - U+00A8B7 : 0x11115555
       1,  // U+00A8B8 - U+00A8BF : 0x11111111
-    108,  // U+00A8C0 - U+00A8C7 : 0x00011111
-    109,  // U+00A8C8 - U+00A8CF : 0x66000000
+    103,  // U+00A8C0 - U+00A8C7 : 0x00011111
+    104,  // U+00A8C8 - U+00A8CF : 0x66000000
      26,  // U+00A8D0 - U+00A8D7 : 0x22222222
      42,  // U+00A8D8 - U+00A8DF : 0x00000022
       1,  // U+00A8E0 - U+00A8E7 : 0x11111111
       1,  // U+00A8E8 - U+00A8EF : 0x11111111
-    106,  // U+00A8F0 - U+00A8F7 : 0x55555511
-    110,  // U+00A8F8 - U+00A8FF : 0x00005666
+    101,  // U+00A8F0 - U+00A8F7 : 0x55555511
+    105,  // U+00A8F8 - U+00A8FF : 0x00005666
      26,  // U+00A900 - U+00A907 : 0x22222222
-    111,  // U+00A908 - U+00A90F : 0x55555522
+    106,  // U+00A908 - U+00A90F : 0x55555522
       0,  // U+00A910 - U+00A917 : 0x55555555
       0,  // U+00A918 - U+00A91F : 0x55555555
-    112,  // U+00A920 - U+00A927 : 0x11555555
-    113,  // U+00A928 - U+00A92F : 0x66111111
+    107,  // U+00A920 - U+00A927 : 0x11555555
+    108,  // U+00A928 - U+00A92F : 0x66111111
       0,  // U+00A930 - U+00A937 : 0x55555555
       0,  // U+00A938 - U+00A93F : 0x55555555
-     93,  // U+00A940 - U+00A947 : 0x15555555
+     87,  // U+00A940 - U+00A947 : 0x15555555
       1,  // U+00A948 - U+00A94F : 0x11111111
-    114,  // U+00A950 - U+00A957 : 0x00001111
-    115,  // U+00A958 - U+00A95F : 0x60000000
+    109,  // U+00A950 - U+00A957 : 0x00001111
+    110,  // U+00A958 - U+00A95F : 0x60000000
       0,  // U+00A960 - U+00A967 : 0x55555555
       0,  // U+00A968 - U+00A96F : 0x55555555
       0,  // U+00A970 - U+00A977 : 0x55555555
      28,  // U+00A978 - U+00A97F : 0x00055555
-    116,  // U+00A980 - U+00A987 : 0x55551111
+    111,  // U+00A980 - U+00A987 : 0x55551111
       0,  // U+00A988 - U+00A98F : 0x55555555
       0,  // U+00A990 - U+00A997 : 0x55555555
       0,  // U+00A998 - U+00A99F : 0x55555555
       0,  // U+00A9A0 - U+00A9A7 : 0x55555555
       0,  // U+00A9A8 - U+00A9AF : 0x55555555
-    103,  // U+00A9B0 - U+00A9B7 : 0x11111555
+     98,  // U+00A9B0 - U+00A9B7 : 0x11111555
       1,  // U+00A9B8 - U+00A9BF : 0x11111111
-    117,  // U+00A9C0 - U+00A9C7 : 0x66666661
-    118,  // U+00A9C8 - U+00A9CF : 0x50666666
+    112,  // U+00A9C0 - U+00A9C7 : 0x66666661
+    113,  // U+00A9C8 - U+00A9CF : 0x50666666
      26,  // U+00A9D0 - U+00A9D7 : 0x22222222
-    119,  // U+00A9D8 - U+00A9DF : 0x66000022
+    114,  // U+00A9D8 - U+00A9DF : 0x66000022
       3,  // U+00A9E0 - U+00A9E7 : 0x00000000
       3,  // U+00A9E8 - U+00A9EF : 0x00000000
       3,  // U+00A9F0 - U+00A9F7 : 0x00000000
       3,  // U+00A9F8 - U+00A9FF : 0x00000000
       0,  // U+00AA00 - U+00AA07 : 0x55555555
       0,  // U+00AA08 - U+00AA0F : 0x55555555
       0,  // U+00AA10 - U+00AA17 : 0x55555555
       0,  // U+00AA18 - U+00AA1F : 0x55555555
       0,  // U+00AA20 - U+00AA27 : 0x55555555
-    120,  // U+00AA28 - U+00AA2F : 0x11111115
+    115,  // U+00AA28 - U+00AA2F : 0x11111115
       2,  // U+00AA30 - U+00AA37 : 0x01111111
       3,  // U+00AA38 - U+00AA3F : 0x00000000
-    102,  // U+00AA40 - U+00AA47 : 0x55551555
-    121,  // U+00AA48 - U+00AA4F : 0x00115555
+     97,  // U+00AA40 - U+00AA47 : 0x55551555
+    116,  // U+00AA48 - U+00AA4F : 0x00115555
      26,  // U+00AA50 - U+00AA57 : 0x22222222
-    122,  // U+00AA58 - U+00AA5F : 0x66660022
+    117,  // U+00AA58 - U+00AA5F : 0x66660022
       0,  // U+00AA60 - U+00AA67 : 0x55555555
       0,  // U+00AA68 - U+00AA6F : 0x55555555
-    123,  // U+00AA70 - U+00AA77 : 0x75555555
-    124,  // U+00AA78 - U+00AA7F : 0x00001577
+    118,  // U+00AA70 - U+00AA77 : 0x75555555
+    119,  // U+00AA78 - U+00AA7F : 0x00001577
       0,  // U+00AA80 - U+00AA87 : 0x55555555
       0,  // U+00AA88 - U+00AA8F : 0x55555555
       0,  // U+00AA90 - U+00AA97 : 0x55555555
       0,  // U+00AA98 - U+00AA9F : 0x55555555
       0,  // U+00AAA0 - U+00AAA7 : 0x55555555
       0,  // U+00AAA8 - U+00AAAF : 0x55555555
-    125,  // U+00AAB0 - U+00AAB7 : 0x15511151
-    126,  // U+00AAB8 - U+00AABF : 0x11555551
-    127,  // U+00AAC0 - U+00AAC7 : 0x00000515
+    120,  // U+00AAB0 - U+00AAB7 : 0x15511151
+    121,  // U+00AAB8 - U+00AABF : 0x11555551
+    122,  // U+00AAC0 - U+00AAC7 : 0x00000515
       3,  // U+00AAC8 - U+00AACF : 0x00000000
       3,  // U+00AAD0 - U+00AAD7 : 0x00000000
-    128,  // U+00AAD8 - U+00AADF : 0x66555000
+    123,  // U+00AAD8 - U+00AADF : 0x66555000
       3,  // U+00AAE0 - U+00AAE7 : 0x00000000
       3,  // U+00AAE8 - U+00AAEF : 0x00000000
       3,  // U+00AAF0 - U+00AAF7 : 0x00000000
       3,  // U+00AAF8 - U+00AAFF : 0x00000000
-};
-
-static const PRUint8 gGenCatIdx5[8] = {
+    124,  // U+00AB00 - U+00AB07 : 0x05555550
+    124,  // U+00AB08 - U+00AB0F : 0x05555550
+    124,  // U+00AB10 - U+00AB17 : 0x05555550
+      3,  // U+00AB18 - U+00AB1F : 0x00000000
+     59,  // U+00AB20 - U+00AB27 : 0x05555555
+     59,  // U+00AB28 - U+00AB2F : 0x05555555
+      3,  // U+00AB30 - U+00AB37 : 0x00000000
+      3,  // U+00AB38 - U+00AB3F : 0x00000000
+      3,  // U+00AB40 - U+00AB47 : 0x00000000
+      3,  // U+00AB48 - U+00AB4F : 0x00000000
+      3,  // U+00AB50 - U+00AB57 : 0x00000000
+      3,  // U+00AB58 - U+00AB5F : 0x00000000
+      3,  // U+00AB60 - U+00AB67 : 0x00000000
+      3,  // U+00AB68 - U+00AB6F : 0x00000000
+      3,  // U+00AB70 - U+00AB77 : 0x00000000
+      3,  // U+00AB78 - U+00AB7F : 0x00000000
+      3,  // U+00AB80 - U+00AB87 : 0x00000000
+      3,  // U+00AB88 - U+00AB8F : 0x00000000
+      3,  // U+00AB90 - U+00AB97 : 0x00000000
+      3,  // U+00AB98 - U+00AB9F : 0x00000000
+      3,  // U+00ABA0 - U+00ABA7 : 0x00000000
+      3,  // U+00ABA8 - U+00ABAF : 0x00000000
+      3,  // U+00ABB0 - U+00ABB7 : 0x00000000
+      3,  // U+00ABB8 - U+00ABBF : 0x00000000
       0,  // U+00ABC0 - U+00ABC7 : 0x55555555
       0,  // U+00ABC8 - U+00ABCF : 0x55555555
       0,  // U+00ABD0 - U+00ABD7 : 0x55555555
       0,  // U+00ABD8 - U+00ABDF : 0x55555555
-    103,  // U+00ABE0 - U+00ABE7 : 0x11111555
-    129,  // U+00ABE8 - U+00ABEF : 0x00116111
+     98,  // U+00ABE0 - U+00ABE7 : 0x11111555
+    125,  // U+00ABE8 - U+00ABEF : 0x00116111
      26,  // U+00ABF0 - U+00ABF7 : 0x22222222
      42,  // U+00ABF8 - U+00ABFF : 0x00000022
 };
 
-static const PRUint8 gGenCatIdx6[10] = {
+static const PRUint8 gGenCatIdx5[10] = {
       0,  // U+00D7B0 - U+00D7B7 : 0x55555555
       0,  // U+00D7B8 - U+00D7BF : 0x55555555
-     66,  // U+00D7C0 - U+00D7C7 : 0x05555555
-    100,  // U+00D7C8 - U+00D7CF : 0x55555000
+     59,  // U+00D7C0 - U+00D7C7 : 0x05555555
+    126,  // U+00D7C8 - U+00D7CF : 0x55555000
       0,  // U+00D7D0 - U+00D7D7 : 0x55555555
       0,  // U+00D7D8 - U+00D7DF : 0x55555555
       0,  // U+00D7E0 - U+00D7E7 : 0x55555555
       0,  // U+00D7E8 - U+00D7EF : 0x55555555
       0,  // U+00D7F0 - U+00D7F7 : 0x55555555
-    130,  // U+00D7F8 - U+00D7FF : 0x00005555
+    127,  // U+00D7F8 - U+00D7FF : 0x00005555
 };
 
-static const PRUint8 gGenCatIdx7[224] = {
+static const PRUint8 gGenCatIdx6[224] = {
       3,  // U+00F900 - U+00F907 : 0x00000000
       3,  // U+00F908 - U+00F90F : 0x00000000
       3,  // U+00F910 - U+00F917 : 0x00000000
       3,  // U+00F918 - U+00F91F : 0x00000000
       3,  // U+00F920 - U+00F927 : 0x00000000
       3,  // U+00F928 - U+00F92F : 0x00000000
       3,  // U+00F930 - U+00F937 : 0x00000000
       3,  // U+00F938 - U+00F93F : 0x00000000
@@ -2160,43 +2181,43 @@ static const PRUint8 gGenCatIdx7[224] = 
       3,  // U+00FAC0 - U+00FAC7 : 0x00000000
       3,  // U+00FAC8 - U+00FACF : 0x00000000
       3,  // U+00FAD0 - U+00FAD7 : 0x00000000
       3,  // U+00FAD8 - U+00FADF : 0x00000000
       3,  // U+00FAE0 - U+00FAE7 : 0x00000000
       3,  // U+00FAE8 - U+00FAEF : 0x00000000
       3,  // U+00FAF0 - U+00FAF7 : 0x00000000
       3,  // U+00FAF8 - U+00FAFF : 0x00000000
-     66,  // U+00FB00 - U+00FB07 : 0x05555555
+     59,  // U+00FB00 - U+00FB07 : 0x05555555
       3,  // U+00FB08 - U+00FB0F : 0x00000000
-    100,  // U+00FB10 - U+00FB17 : 0x55555000
-    131,  // U+00FB18 - U+00FB1F : 0x51500000
+    126,  // U+00FB10 - U+00FB17 : 0x55555000
+    128,  // U+00FB18 - U+00FB1F : 0x51500000
       0,  // U+00FB20 - U+00FB27 : 0x55555555
-    132,  // U+00FB28 - U+00FB2F : 0x55555575
-     66,  // U+00FB30 - U+00FB37 : 0x05555555
-    133,  // U+00FB38 - U+00FB3F : 0x05055555
-    134,  // U+00FB40 - U+00FB47 : 0x55055055
+    129,  // U+00FB28 - U+00FB2F : 0x55555575
+     59,  // U+00FB30 - U+00FB37 : 0x05555555
+    130,  // U+00FB38 - U+00FB3F : 0x05055555
+    131,  // U+00FB40 - U+00FB47 : 0x55055055
       0,  // U+00FB48 - U+00FB4F : 0x55555555
       0,  // U+00FB50 - U+00FB57 : 0x55555555
       0,  // U+00FB58 - U+00FB5F : 0x55555555
       0,  // U+00FB60 - U+00FB67 : 0x55555555
       0,  // U+00FB68 - U+00FB6F : 0x55555555
       0,  // U+00FB70 - U+00FB77 : 0x55555555
       0,  // U+00FB78 - U+00FB7F : 0x55555555
       0,  // U+00FB80 - U+00FB87 : 0x55555555
       0,  // U+00FB88 - U+00FB8F : 0x55555555
       0,  // U+00FB90 - U+00FB97 : 0x55555555
       0,  // U+00FB98 - U+00FB9F : 0x55555555
       0,  // U+00FBA0 - U+00FBA7 : 0x55555555
       0,  // U+00FBA8 - U+00FBAF : 0x55555555
-    135,  // U+00FBB0 - U+00FBB7 : 0x00000055
-      3,  // U+00FBB8 - U+00FBBF : 0x00000000
-      3,  // U+00FBC0 - U+00FBC7 : 0x00000000
+    132,  // U+00FBB0 - U+00FBB7 : 0x77777755
+     29,  // U+00FBB8 - U+00FBBF : 0x77777777
+     30,  // U+00FBC0 - U+00FBC7 : 0x00000077
       3,  // U+00FBC8 - U+00FBCF : 0x00000000
-    100,  // U+00FBD0 - U+00FBD7 : 0x55555000
+    126,  // U+00FBD0 - U+00FBD7 : 0x55555000
       0,  // U+00FBD8 - U+00FBDF : 0x55555555
       0,  // U+00FBE0 - U+00FBE7 : 0x55555555
       0,  // U+00FBE8 - U+00FBEF : 0x55555555
       0,  // U+00FBF0 - U+00FBF7 : 0x55555555
       0,  // U+00FBF8 - U+00FBFF : 0x55555555
       0,  // U+00FC00 - U+00FC07 : 0x55555555
       0,  // U+00FC08 - U+00FC0F : 0x55555555
       0,  // U+00FC10 - U+00FC17 : 0x55555555
@@ -2231,55 +2252,55 @@ static const PRUint8 gGenCatIdx7[224] = 
       0,  // U+00FCF8 - U+00FCFF : 0x55555555
       0,  // U+00FD00 - U+00FD07 : 0x55555555
       0,  // U+00FD08 - U+00FD0F : 0x55555555
       0,  // U+00FD10 - U+00FD17 : 0x55555555
       0,  // U+00FD18 - U+00FD1F : 0x55555555
       0,  // U+00FD20 - U+00FD27 : 0x55555555
       0,  // U+00FD28 - U+00FD2F : 0x55555555
       0,  // U+00FD30 - U+00FD37 : 0x55555555
-     89,  // U+00FD38 - U+00FD3F : 0x66555555
+     84,  // U+00FD38 - U+00FD3F : 0x66555555
       3,  // U+00FD40 - U+00FD47 : 0x00000000
       3,  // U+00FD48 - U+00FD4F : 0x00000000
       0,  // U+00FD50 - U+00FD57 : 0x55555555
       0,  // U+00FD58 - U+00FD5F : 0x55555555
       0,  // U+00FD60 - U+00FD67 : 0x55555555
       0,  // U+00FD68 - U+00FD6F : 0x55555555
       0,  // U+00FD70 - U+00FD77 : 0x55555555
       0,  // U+00FD78 - U+00FD7F : 0x55555555
       0,  // U+00FD80 - U+00FD87 : 0x55555555
       0,  // U+00FD88 - U+00FD8F : 0x55555555
-     92,  // U+00FD90 - U+00FD97 : 0x55555500
+     95,  // U+00FD90 - U+00FD97 : 0x55555500
       0,  // U+00FD98 - U+00FD9F : 0x55555555
       0,  // U+00FDA0 - U+00FDA7 : 0x55555555
       0,  // U+00FDA8 - U+00FDAF : 0x55555555
       0,  // U+00FDB0 - U+00FDB7 : 0x55555555
       0,  // U+00FDB8 - U+00FDBF : 0x55555555
       0,  // U+00FDC0 - U+00FDC7 : 0x55555555
       3,  // U+00FDC8 - U+00FDCF : 0x00000000
       3,  // U+00FDD0 - U+00FDD7 : 0x00000000
       3,  // U+00FDD8 - U+00FDDF : 0x00000000
       3,  // U+00FDE0 - U+00FDE7 : 0x00000000
       3,  // U+00FDE8 - U+00FDEF : 0x00000000
       0,  // U+00FDF0 - U+00FDF7 : 0x55555555
-    136,  // U+00FDF8 - U+00FDFF : 0x00775555
+    133,  // U+00FDF8 - U+00FDFF : 0x00775555
       1,  // U+00FE00 - U+00FE07 : 0x11111111
       1,  // U+00FE08 - U+00FE0F : 0x11111111
      17,  // U+00FE10 - U+00FE17 : 0x66666666
-     72,  // U+00FE18 - U+00FE1F : 0x00000066
+     67,  // U+00FE18 - U+00FE1F : 0x00000066
       2,  // U+00FE20 - U+00FE27 : 0x01111111
       3,  // U+00FE28 - U+00FE2F : 0x00000000
      17,  // U+00FE30 - U+00FE37 : 0x66666666
      17,  // U+00FE38 - U+00FE3F : 0x66666666
      17,  // U+00FE40 - U+00FE47 : 0x66666666
      17,  // U+00FE48 - U+00FE4F : 0x66666666
-    137,  // U+00FE50 - U+00FE57 : 0x66660666
+    134,  // U+00FE50 - U+00FE57 : 0x66660666
      17,  // U+00FE58 - U+00FE5F : 0x66666666
-    138,  // U+00FE60 - U+00FE67 : 0x07776766
-    139,  // U+00FE68 - U+00FE6F : 0x00006676
+    135,  // U+00FE60 - U+00FE67 : 0x07776766
+    136,  // U+00FE68 - U+00FE6F : 0x00006676
       7,  // U+00FE70 - U+00FE77 : 0x55055555
       0,  // U+00FE78 - U+00FE7F : 0x55555555
       0,  // U+00FE80 - U+00FE87 : 0x55555555
       0,  // U+00FE88 - U+00FE8F : 0x55555555
       0,  // U+00FE90 - U+00FE97 : 0x55555555
       0,  // U+00FE98 - U+00FE9F : 0x55555555
       0,  // U+00FEA0 - U+00FEA7 : 0x55555555
       0,  // U+00FEA8 - U+00FEAF : 0x55555555
@@ -2287,60 +2308,60 @@ static const PRUint8 gGenCatIdx7[224] = 
       0,  // U+00FEB8 - U+00FEBF : 0x55555555
       0,  // U+00FEC0 - U+00FEC7 : 0x55555555
       0,  // U+00FEC8 - U+00FECF : 0x55555555
       0,  // U+00FED0 - U+00FED7 : 0x55555555
       0,  // U+00FED8 - U+00FEDF : 0x55555555
       0,  // U+00FEE0 - U+00FEE7 : 0x55555555
       0,  // U+00FEE8 - U+00FEEF : 0x55555555
       0,  // U+00FEF0 - U+00FEF7 : 0x55555555
-    140,  // U+00FEF8 - U+00FEFF : 0x40055555
-    141,  // U+00FF00 - U+00FF07 : 0x66676660
-    142,  // U+00FF08 - U+00FF0F : 0x66667666
+    137,  // U+00FEF8 - U+00FEFF : 0x40055555
+    138,  // U+00FF00 - U+00FF07 : 0x66676660
+    139,  // U+00FF08 - U+00FF0F : 0x66667666
      26,  // U+00FF10 - U+00FF17 : 0x22222222
-    143,  // U+00FF18 - U+00FF1F : 0x67776622
-     84,  // U+00FF20 - U+00FF27 : 0x55555556
+    140,  // U+00FF18 - U+00FF1F : 0x67776622
+     78,  // U+00FF20 - U+00FF27 : 0x55555556
       0,  // U+00FF28 - U+00FF2F : 0x55555555
       0,  // U+00FF30 - U+00FF37 : 0x55555555
-    144,  // U+00FF38 - U+00FF3F : 0x67666555
-    145,  // U+00FF40 - U+00FF47 : 0x55555557
+    141,  // U+00FF38 - U+00FF3F : 0x67666555
+    142,  // U+00FF40 - U+00FF47 : 0x55555557
       0,  // U+00FF48 - U+00FF4F : 0x55555555
       0,  // U+00FF50 - U+00FF57 : 0x55555555
-    146,  // U+00FF58 - U+00FF5F : 0x67676555
-    147,  // U+00FF60 - U+00FF67 : 0x55666666
+    143,  // U+00FF58 - U+00FF5F : 0x67676555
+    144,  // U+00FF60 - U+00FF67 : 0x55666666
       0,  // U+00FF68 - U+00FF6F : 0x55555555
       0,  // U+00FF70 - U+00FF77 : 0x55555555
       0,  // U+00FF78 - U+00FF7F : 0x55555555
       0,  // U+00FF80 - U+00FF87 : 0x55555555
       0,  // U+00FF88 - U+00FF8F : 0x55555555
       0,  // U+00FF90 - U+00FF97 : 0x55555555
       0,  // U+00FF98 - U+00FF9F : 0x55555555
       0,  // U+00FFA0 - U+00FFA7 : 0x55555555
       0,  // U+00FFA8 - U+00FFAF : 0x55555555
       0,  // U+00FFB0 - U+00FFB7 : 0x55555555
-     66,  // U+00FFB8 - U+00FFBF : 0x05555555
-     92,  // U+00FFC0 - U+00FFC7 : 0x55555500
-     92,  // U+00FFC8 - U+00FFCF : 0x55555500
-     92,  // U+00FFD0 - U+00FFD7 : 0x55555500
-    148,  // U+00FFD8 - U+00FFDF : 0x00055500
-     44,  // U+00FFE0 - U+00FFE7 : 0x07777777
-     44,  // U+00FFE8 - U+00FFEF : 0x07777777
+     59,  // U+00FFB8 - U+00FFBF : 0x05555555
+     95,  // U+00FFC0 - U+00FFC7 : 0x55555500
+     95,  // U+00FFC8 - U+00FFCF : 0x55555500
+     95,  // U+00FFD0 - U+00FFD7 : 0x55555500
+    145,  // U+00FFD8 - U+00FFDF : 0x00055500
+     45,  // U+00FFE0 - U+00FFE7 : 0x07777777
+     45,  // U+00FFE8 - U+00FFEF : 0x07777777
       3,  // U+00FFF0 - U+00FFF7 : 0x00000000
-    149,  // U+00FFF8 - U+00FFFF : 0x00774440
+    146,  // U+00FFF8 - U+00FFFF : 0x00774440
 };
 
-static const PRUint8 gGenCatIdx8[150] = {
+static const PRUint8 gGenCatIdx7[150] = {
       0,  // U+010000 - U+010007 : 0x55555555
-    150,  // U+010008 - U+01000F : 0x55505555
+    147,  // U+010008 - U+01000F : 0x55505555
       0,  // U+010010 - U+010017 : 0x55555555
       0,  // U+010018 - U+01001F : 0x55555555
-     66,  // U+010020 - U+010027 : 0x05555555
+     59,  // U+010020 - U+010027 : 0x05555555
       0,  // U+010028 - U+01002F : 0x55555555
       0,  // U+010030 - U+010037 : 0x55555555
-    151,  // U+010038 - U+01003F : 0x50550555
+    148,  // U+010038 - U+01003F : 0x50550555
       0,  // U+010040 - U+010047 : 0x55555555
       5,  // U+010048 - U+01004F : 0x00555555
       0,  // U+010050 - U+010057 : 0x55555555
       5,  // U+010058 - U+01005F : 0x00555555
       3,  // U+010060 - U+010067 : 0x00000000
       3,  // U+010068 - U+01006F : 0x00000000
       3,  // U+010070 - U+010077 : 0x00000000
       3,  // U+010078 - U+01007F : 0x00000000
@@ -2354,49 +2375,49 @@ static const PRUint8 gGenCatIdx8[150] = 
       0,  // U+0100B8 - U+0100BF : 0x55555555
       0,  // U+0100C0 - U+0100C7 : 0x55555555
       0,  // U+0100C8 - U+0100CF : 0x55555555
       0,  // U+0100D0 - U+0100D7 : 0x55555555
       0,  // U+0100D8 - U+0100DF : 0x55555555
       0,  // U+0100E0 - U+0100E7 : 0x55555555
       0,  // U+0100E8 - U+0100EF : 0x55555555
       0,  // U+0100F0 - U+0100F7 : 0x55555555
-    152,  // U+0100F8 - U+0100FF : 0x00000555
-    153,  // U+010100 - U+010107 : 0x20000766
+     82,  // U+0100F8 - U+0100FF : 0x00000555
+    149,  // U+010100 - U+010107 : 0x20000766
      26,  // U+010108 - U+01010F : 0x22222222
      26,  // U+010110 - U+010117 : 0x22222222
      26,  // U+010118 - U+01011F : 0x22222222
      26,  // U+010120 - U+010127 : 0x22222222
      26,  // U+010128 - U+01012F : 0x22222222
-    154,  // U+010130 - U+010137 : 0x70002222
+    150,  // U+010130 - U+010137 : 0x70002222
      29,  // U+010138 - U+01013F : 0x77777777
      26,  // U+010140 - U+010147 : 0x22222222
      26,  // U+010148 - U+01014F : 0x22222222
      26,  // U+010150 - U+010157 : 0x22222222
      26,  // U+010158 - U+01015F : 0x22222222
      26,  // U+010160 - U+010167 : 0x22222222
      26,  // U+010168 - U+01016F : 0x22222222
      26,  // U+010170 - U+010177 : 0x22222222
-    155,  // U+010178 - U+01017F : 0x77777772
+    151,  // U+010178 - U+01017F : 0x77777772
      29,  // U+010180 - U+010187 : 0x77777777
-    156,  // U+010188 - U+01018F : 0x00000277
+    152,  // U+010188 - U+01018F : 0x00000277
      29,  // U+010190 - U+010197 : 0x77777777
-     74,  // U+010198 - U+01019F : 0x00007777
+     44,  // U+010198 - U+01019F : 0x00007777
       3,  // U+0101A0 - U+0101A7 : 0x00000000
       3,  // U+0101A8 - U+0101AF : 0x00000000
       3,  // U+0101B0 - U+0101B7 : 0x00000000
       3,  // U+0101B8 - U+0101BF : 0x00000000
       3,  // U+0101C0 - U+0101C7 : 0x00000000
       3,  // U+0101C8 - U+0101CF : 0x00000000
      29,  // U+0101D0 - U+0101D7 : 0x77777777
      29,  // U+0101D8 - U+0101DF : 0x77777777
      29,  // U+0101E0 - U+0101E7 : 0x77777777
      29,  // U+0101E8 - U+0101EF : 0x77777777
      29,  // U+0101F0 - U+0101F7 : 0x77777777
-    157,  // U+0101F8 - U+0101FF : 0x00177777
+    153,  // U+0101F8 - U+0101FF : 0x00177777
       3,  // U+010200 - U+010207 : 0x00000000
       3,  // U+010208 - U+01020F : 0x00000000
       3,  // U+010210 - U+010217 : 0x00000000
       3,  // U+010218 - U+01021F : 0x00000000
       3,  // U+010220 - U+010227 : 0x00000000
       3,  // U+010228 - U+01022F : 0x00000000
       3,  // U+010230 - U+010237 : 0x00000000
       3,  // U+010238 - U+01023F : 0x00000000
@@ -2413,49 +2434,49 @@ static const PRUint8 gGenCatIdx8[150] = 
       0,  // U+010290 - U+010297 : 0x55555555
      28,  // U+010298 - U+01029F : 0x00055555
       0,  // U+0102A0 - U+0102A7 : 0x55555555
       0,  // U+0102A8 - U+0102AF : 0x55555555
       0,  // U+0102B0 - U+0102B7 : 0x55555555
       0,  // U+0102B8 - U+0102BF : 0x55555555
       0,  // U+0102C0 - U+0102C7 : 0x55555555
       0,  // U+0102C8 - U+0102CF : 0x55555555
-    158,  // U+0102D0 - U+0102D7 : 0x00000005
+    154,  // U+0102D0 - U+0102D7 : 0x00000005
       3,  // U+0102D8 - U+0102DF : 0x00000000
       3,  // U+0102E0 - U+0102E7 : 0x00000000
       3,  // U+0102E8 - U+0102EF : 0x00000000
       3,  // U+0102F0 - U+0102F7 : 0x00000000
       3,  // U+0102F8 - U+0102FF : 0x00000000
       0,  // U+010300 - U+010307 : 0x55555555
       0,  // U+010308 - U+01030F : 0x55555555
       0,  // U+010310 - U+010317 : 0x55555555
-     66,  // U+010318 - U+01031F : 0x05555555
-    159,  // U+010320 - U+010327 : 0x00002222
+     59,  // U+010318 - U+01031F : 0x05555555
+    155,  // U+010320 - U+010327 : 0x00002222
       3,  // U+010328 - U+01032F : 0x00000000
       0,  // U+010330 - U+010337 : 0x55555555
       0,  // U+010338 - U+01033F : 0x55555555
-    160,  // U+010340 - U+010347 : 0x55555525
-    161,  // U+010348 - U+01034F : 0x00000255
+    156,  // U+010340 - U+010347 : 0x55555525
+    157,  // U+010348 - U+01034F : 0x00000255
       3,  // U+010350 - U+010357 : 0x00000000
       3,  // U+010358 - U+01035F : 0x00000000
       3,  // U+010360 - U+010367 : 0x00000000
       3,  // U+010368 - U+01036F : 0x00000000
       3,  // U+010370 - U+010377 : 0x00000000
       3,  // U+010378 - U+01037F : 0x00000000
       0,  // U+010380 - U+010387 : 0x55555555
       0,  // U+010388 - U+01038F : 0x55555555
       0,  // U+010390 - U+010397 : 0x55555555
-    162,  // U+010398 - U+01039F : 0x60555555
+    158,  // U+010398 - U+01039F : 0x60555555
       0,  // U+0103A0 - U+0103A7 : 0x55555555
       0,  // U+0103A8 - U+0103AF : 0x55555555
       0,  // U+0103B0 - U+0103B7 : 0x55555555
       0,  // U+0103B8 - U+0103BF : 0x55555555
-    130,  // U+0103C0 - U+0103C7 : 0x00005555
+    127,  // U+0103C0 - U+0103C7 : 0x00005555
       0,  // U+0103C8 - U+0103CF : 0x55555555
-    163,  // U+0103D0 - U+0103D7 : 0x00222226
+    159,  // U+0103D0 - U+0103D7 : 0x00222226
       3,  // U+0103D8 - U+0103DF : 0x00000000
       3,  // U+0103E0 - U+0103E7 : 0x00000000
       3,  // U+0103E8 - U+0103EF : 0x00000000
       3,  // U+0103F0 - U+0103F7 : 0x00000000
       3,  // U+0103F8 - U+0103FF : 0x00000000
       0,  // U+010400 - U+010407 : 0x55555555
       0,  // U+010408 - U+01040F : 0x55555555
       0,  // U+010410 - U+010417 : 0x55555555
@@ -2475,59 +2496,59 @@ static const PRUint8 gGenCatIdx8[150] = 
       0,  // U+010480 - U+010487 : 0x55555555
       0,  // U+010488 - U+01048F : 0x55555555
       0,  // U+010490 - U+010497 : 0x55555555
       5,  // U+010498 - U+01049F : 0x00555555
      26,  // U+0104A0 - U+0104A7 : 0x22222222
      42,  // U+0104A8 - U+0104AF : 0x00000022
 };
 
-static const PRUint8 gGenCatIdx9[12] = {
+static const PRUint8 gGenCatIdx8[12] = {
       5,  // U+010800 - U+010807 : 0x00555555
-    164,  // U+010808 - U+01080F : 0x55555505
+    160,  // U+010808 - U+01080F : 0x55555505
       0,  // U+010810 - U+010817 : 0x55555555
       0,  // U+010818 - U+01081F : 0x55555555
       0,  // U+010820 - U+010827 : 0x55555555
       0,  // U+010828 - U+01082F : 0x55555555
-    165,  // U+010830 - U+010837 : 0x50555555
-    166,  // U+010838 - U+01083F : 0x50050005
+    161,  // U+010830 - U+010837 : 0x50555555
+    162,  // U+010838 - U+01083F : 0x50050005
       0,  // U+010840 - U+010847 : 0x55555555
       0,  // U+010848 - U+01084F : 0x55555555
-    162,  // U+010850 - U+010857 : 0x60555555
+    158,  // U+010850 - U+010857 : 0x60555555
      26,  // U+010858 - U+01085F : 0x22222222
 };
 
-static const PRUint8 gGenCatIdx10[8] = {
+static const PRUint8 gGenCatIdx9[8] = {
       0,  // U+010900 - U+010907 : 0x55555555
       0,  // U+010908 - U+01090F : 0x55555555
-     96,  // U+010910 - U+010917 : 0x22555555
-    167,  // U+010918 - U+01091F : 0x60002222
+     90,  // U+010910 - U+010917 : 0x22555555
+    163,  // U+010918 - U+01091F : 0x60002222
       0,  // U+010920 - U+010927 : 0x55555555
       0,  // U+010928 - U+01092F : 0x55555555
       0,  // U+010930 - U+010937 : 0x55555555
-    168,  // U+010938 - U+01093F : 0x60000055
+    164,  // U+010938 - U+01093F : 0x60000055
 };
 
-static const PRUint8 gGenCatIdx11[74] = {
-    169,  // U+010A00 - U+010A07 : 0x01101115
-    170,  // U+010A08 - U+010A0F : 0x11110000
-    150,  // U+010A10 - U+010A17 : 0x55505555
-     82,  // U+010A18 - U+010A1F : 0x55555550
+static const PRUint8 gGenCatIdx10[74] = {
+    165,  // U+010A00 - U+010A07 : 0x01101115
+      4,  // U+010A08 - U+010A0F : 0x11110000
+    147,  // U+010A10 - U+010A17 : 0x55505555
+     76,  // U+010A18 - U+010A1F : 0x55555550
       0,  // U+010A20 - U+010A27 : 0x55555555
       0,  // U+010A28 - U+010A2F : 0x55555555
-    130,  // U+010A30 - U+010A37 : 0x00005555
-    171,  // U+010A38 - U+010A3F : 0x10000111
+    127,  // U+010A30 - U+010A37 : 0x00005555
+    166,  // U+010A38 - U+010A3F : 0x10000111
      26,  // U+010A40 - U+010A47 : 0x22222222
       3,  // U+010A48 - U+010A4F : 0x00000000
      17,  // U+010A50 - U+010A57 : 0x66666666
-    172,  // U+010A58 - U+010A5F : 0x00000006
+     64,  // U+010A58 - U+010A5F : 0x00000006
       0,  // U+010A60 - U+010A67 : 0x55555555
       0,  // U+010A68 - U+010A6F : 0x55555555
       0,  // U+010A70 - U+010A77 : 0x55555555
-    173,  // U+010A78 - U+010A7F : 0x62255555
+    167,  // U+010A78 - U+010A7F : 0x62255555
       3,  // U+010A80 - U+010A87 : 0x00000000
       3,  // U+010A88 - U+010A8F : 0x00000000
       3,  // U+010A90 - U+010A97 : 0x00000000
       3,  // U+010A98 - U+010A9F : 0x00000000
       3,  // U+010AA0 - U+010AA7 : 0x00000000
       3,  // U+010AA8 - U+010AAF : 0x00000000
       3,  // U+010AB0 - U+010AB7 : 0x00000000
       3,  // U+010AB8 - U+010ABF : 0x00000000
@@ -2541,24 +2562,24 @@ static const PRUint8 gGenCatIdx11[74] = 
       3,  // U+010AF8 - U+010AFF : 0x00000000
       0,  // U+010B00 - U+010B07 : 0x55555555
       0,  // U+010B08 - U+010B0F : 0x55555555
       0,  // U+010B10 - U+010B17 : 0x55555555
       0,  // U+010B18 - U+010B1F : 0x55555555
       0,  // U+010B20 - U+010B27 : 0x55555555
       0,  // U+010B28 - U+010B2F : 0x55555555
       5,  // U+010B30 - U+010B37 : 0x00555555
-    174,  // U+010B38 - U+010B3F : 0x66666660
+    168,  // U+010B38 - U+010B3F : 0x66666660
       0,  // U+010B40 - U+010B47 : 0x55555555
       0,  // U+010B48 - U+010B4F : 0x55555555
       5,  // U+010B50 - U+010B57 : 0x00555555
      26,  // U+010B58 - U+010B5F : 0x22222222
       0,  // U+010B60 - U+010B67 : 0x55555555
       0,  // U+010B68 - U+010B6F : 0x55555555
-    152,  // U+010B70 - U+010B77 : 0x00000555
+     82,  // U+010B70 - U+010B77 : 0x00000555
      26,  // U+010B78 - U+010B7F : 0x22222222
       3,  // U+010B80 - U+010B87 : 0x00000000
       3,  // U+010B88 - U+010B8F : 0x00000000
       3,  // U+010B90 - U+010B97 : 0x00000000
       3,  // U+010B98 - U+010B9F : 0x00000000
       3,  // U+010BA0 - U+010BA7 : 0x00000000
       3,  // U+010BA8 - U+010BAF : 0x00000000
       3,  // U+010BB0 - U+010BB7 : 0x00000000
@@ -2575,40 +2596,56 @@ static const PRUint8 gGenCatIdx11[74] = 
       0,  // U+010C08 - U+010C0F : 0x55555555
       0,  // U+010C10 - U+010C17 : 0x55555555
       0,  // U+010C18 - U+010C1F : 0x55555555
       0,  // U+010C20 - U+010C27 : 0x55555555
       0,  // U+010C28 - U+010C2F : 0x55555555
       0,  // U+010C30 - U+010C37 : 0x55555555
       0,  // U+010C38 - U+010C3F : 0x55555555
       0,  // U+010C40 - U+010C47 : 0x55555555
-    158,  // U+010C48 - U+010C4F : 0x00000005
+    154,  // U+010C48 - U+010C4F : 0x00000005
 };
 
-static const PRUint8 gGenCatIdx12[4] = {
+static const PRUint8 gGenCatIdx11[4] = {
      26,  // U+010E60 - U+010E67 : 0x22222222
      26,  // U+010E68 - U+010E6F : 0x22222222
      26,  // U+010E70 - U+010E77 : 0x22222222
-    175,  // U+010E78 - U+010E7F : 0x02222222
+    169,  // U+010E78 - U+010E7F : 0x02222222
 };
 
-static const PRUint8 gGenCatIdx13[10] = {
-    176,  // U+011080 - U+011087 : 0x55555111
+static const PRUint8 gGenCatIdx12[26] = {
+    170,  // U+011000 - U+011007 : 0x55555111
+      0,  // U+011008 - U+01100F : 0x55555555
+      0,  // U+011010 - U+011017 : 0x55555555
+      0,  // U+011018 - U+01101F : 0x55555555
+      0,  // U+011020 - U+011027 : 0x55555555
+      0,  // U+011028 - U+01102F : 0x55555555
+      0,  // U+011030 - U+011037 : 0x55555555
+      1,  // U+011038 - U+01103F : 0x11111111
+    171,  // U+011040 - U+011047 : 0x61111111
+    172,  // U+011048 - U+01104F : 0x00666666
+    173,  // U+011050 - U+011057 : 0x22222200
+     26,  // U+011058 - U+01105F : 0x22222222
+     26,  // U+011060 - U+011067 : 0x22222222
+     26,  // U+011068 - U+01106F : 0x22222222
+      3,  // U+011070 - U+011077 : 0x00000000
+      3,  // U+011078 - U+01107F : 0x00000000
+    170,  // U+011080 - U+011087 : 0x55555111
       0,  // U+011088 - U+01108F : 0x55555555
       0,  // U+011090 - U+011097 : 0x55555555
       0,  // U+011098 - U+01109F : 0x55555555
       0,  // U+0110A0 - U+0110A7 : 0x55555555
       0,  // U+0110A8 - U+0110AF : 0x55555555
       1,  // U+0110B0 - U+0110B7 : 0x11111111
-    177,  // U+0110B8 - U+0110BF : 0x66466111
-     72,  // U+0110C0 - U+0110C7 : 0x00000066
+    174,  // U+0110B8 - U+0110BF : 0x66466111
+     67,  // U+0110C0 - U+0110C7 : 0x00000066
       3,  // U+0110C8 - U+0110CF : 0x00000000
 };
 
-static const PRUint8 gGenCatIdx14[144] = {
+static const PRUint8 gGenCatIdx13[144] = {
       0,  // U+012000 - U+012007 : 0x55555555
       0,  // U+012008 - U+01200F : 0x55555555
       0,  // U+012010 - U+012017 : 0x55555555
       0,  // U+012018 - U+01201F : 0x55555555
       0,  // U+012020 - U+012027 : 0x55555555
       0,  // U+012028 - U+01202F : 0x55555555
       0,  // U+012030 - U+012037 : 0x55555555
       0,  // U+012038 - U+01203F : 0x55555555
@@ -2708,17 +2745,17 @@ static const PRUint8 gGenCatIdx14[144] =
       0,  // U+012328 - U+01232F : 0x55555555
       0,  // U+012330 - U+012337 : 0x55555555
       0,  // U+012338 - U+01233F : 0x55555555
       0,  // U+012340 - U+012347 : 0x55555555
       0,  // U+012348 - U+01234F : 0x55555555
       0,  // U+012350 - U+012357 : 0x55555555
       0,  // U+012358 - U+01235F : 0x55555555
       0,  // U+012360 - U+012367 : 0x55555555
-     66,  // U+012368 - U+01236F : 0x05555555
+     59,  // U+012368 - U+01236F : 0x05555555
       3,  // U+012370 - U+012377 : 0x00000000
       3,  // U+012378 - U+01237F : 0x00000000
       3,  // U+012380 - U+012387 : 0x00000000
       3,  // U+012388 - U+01238F : 0x00000000
       3,  // U+012390 - U+012397 : 0x00000000
       3,  // U+012398 - U+01239F : 0x00000000
       3,  // U+0123A0 - U+0123A7 : 0x00000000
       3,  // U+0123A8 - U+0123AF : 0x00000000
@@ -2739,23 +2776,23 @@ static const PRUint8 gGenCatIdx14[144] =
      26,  // U+012420 - U+012427 : 0x22222222
      26,  // U+012428 - U+01242F : 0x22222222
      26,  // U+012430 - U+012437 : 0x22222222
      26,  // U+012438 - U+01243F : 0x22222222
      26,  // U+012440 - U+012447 : 0x22222222
      26,  // U+012448 - U+01244F : 0x22222222
      26,  // U+012450 - U+012457 : 0x22222222
      26,  // U+012458 - U+01245F : 0x22222222
-    178,  // U+012460 - U+012467 : 0x00000222
+    175,  // U+012460 - U+012467 : 0x00000222
       3,  // U+012468 - U+01246F : 0x00000000
-    179,  // U+012470 - U+012477 : 0x00006666
+    176,  // U+012470 - U+012477 : 0x00006666
       3,  // U+012478 - U+01247F : 0x00000000
 };
 
-static const PRUint8 gGenCatIdx15[134] = {
+static const PRUint8 gGenCatIdx14[134] = {
       0,  // U+013000 - U+013007 : 0x55555555
       0,  // U+013008 - U+01300F : 0x55555555
       0,  // U+013010 - U+013017 : 0x55555555
       0,  // U+013018 - U+01301F : 0x55555555
       0,  // U+013020 - U+013027 : 0x55555555
       0,  // U+013028 - U+01302F : 0x55555555
       0,  // U+013030 - U+013037 : 0x55555555
       0,  // U+013038 - U+01303F : 0x55555555
@@ -2879,20 +2916,126 @@ static const PRUint8 gGenCatIdx15[134] =
       0,  // U+0133E8 - U+0133EF : 0x55555555
       0,  // U+0133F0 - U+0133F7 : 0x55555555
       0,  // U+0133F8 - U+0133FF : 0x55555555
       0,  // U+013400 - U+013407 : 0x55555555
       0,  // U+013408 - U+01340F : 0x55555555
       0,  // U+013410 - U+013417 : 0x55555555
       0,  // U+013418 - U+01341F : 0x55555555
       0,  // U+013420 - U+013427 : 0x55555555
-     66,  // U+013428 - U+01342F : 0x05555555
+     59,  // U+013428 - U+01342F : 0x05555555
 };
 
-static const PRUint8 gGenCatIdx16[256] = {
+static const PRUint8 gGenCatIdx15[96] = {
+      0,  // U+016800 - U+016807 : 0x55555555
+      0,  // U+016808 - U+01680F : 0x55555555
+      0,  // U+016810 - U+016817 : 0x55555555
+      0,  // U+016818 - U+01681F : 0x55555555
+      0,  // U+016820 - U+016827 : 0x55555555
+      0,  // U+016828 - U+01682F : 0x55555555
+      0,  // U+016830 - U+016837 : 0x55555555
+      0,  // U+016838 - U+01683F : 0x55555555
+      0,  // U+016840 - U+016847 : 0x55555555
+      0,  // U+016848 - U+01684F : 0x55555555
+      0,  // U+016850 - U+016857 : 0x55555555
+      0,  // U+016858 - U+01685F : 0x55555555
+      0,  // U+016860 - U+016867 : 0x55555555
+      0,  // U+016868 - U+01686F : 0x55555555
+      0,  // U+016870 - U+016877 : 0x55555555
+      0,  // U+016878 - U+01687F : 0x55555555
+      0,  // U+016880 - U+016887 : 0x55555555
+      0,  // U+016888 - U+01688F : 0x55555555
+      0,  // U+016890 - U+016897 : 0x55555555
+      0,  // U+016898 - U+01689F : 0x55555555
+      0,  // U+0168A0 - U+0168A7 : 0x55555555
+      0,  // U+0168A8 - U+0168AF : 0x55555555
+      0,  // U+0168B0 - U+0168B7 : 0x55555555
+      0,  // U+0168B8 - U+0168BF : 0x55555555
+      0,  // U+0168C0 - U+0168C7 : 0x55555555
+      0,  // U+0168C8 - U+0168CF : 0x55555555
+      0,  // U+0168D0 - U+0168D7 : 0x55555555
+      0,  // U+0168D8 - U+0168DF : 0x55555555
+      0,  // U+0168E0 - U+0168E7 : 0x55555555
+      0,  // U+0168E8 - U+0168EF : 0x55555555
+      0,  // U+0168F0 - U+0168F7 : 0x55555555
+      0,  // U+0168F8 - U+0168FF : 0x55555555
+      0,  // U+016900 - U+016907 : 0x55555555
+      0,  // U+016908 - U+01690F : 0x55555555
+      0,  // U+016910 - U+016917 : 0x55555555
+      0,  // U+016918 - U+01691F : 0x55555555
+      0,  // U+016920 - U+016927 : 0x55555555
+      0,  // U+016928 - U+01692F : 0x55555555
+      0,  // U+016930 - U+016937 : 0x55555555
+      0,  // U+016938 - U+01693F : 0x55555555
+      0,  // U+016940 - U+016947 : 0x55555555
+      0,  // U+016948 - U+01694F : 0x55555555
+      0,  // U+016950 - U+016957 : 0x55555555
+      0,  // U+016958 - U+01695F : 0x55555555
+      0,  // U+016960 - U+016967 : 0x55555555
+      0,  // U+016968 - U+01696F : 0x55555555
+      0,  // U+016970 - U+016977 : 0x55555555
+      0,  // U+016978 - U+01697F : 0x55555555
+      0,  // U+016980 - U+016987 : 0x55555555
+      0,  // U+016988 - U+01698F : 0x55555555
+      0,  // U+016990 - U+016997 : 0x55555555
+      0,  // U+016998 - U+01699F : 0x55555555
+      0,  // U+0169A0 - U+0169A7 : 0x55555555
+      0,  // U+0169A8 - U+0169AF : 0x55555555
+      0,  // U+0169B0 - U+0169B7 : 0x55555555
+      0,  // U+0169B8 - U+0169BF : 0x55555555
+      0,  // U+0169C0 - U+0169C7 : 0x55555555
+      0,  // U+0169C8 - U+0169CF : 0x55555555
+      0,  // U+0169D0 - U+0169D7 : 0x55555555
+      0,  // U+0169D8 - U+0169DF : 0x55555555
+      0,  // U+0169E0 - U+0169E7 : 0x55555555
+      0,  // U+0169E8 - U+0169EF : 0x55555555
+      0,  // U+0169F0 - U+0169F7 : 0x55555555
+      0,  // U+0169F8 - U+0169FF : 0x55555555
+      0,  // U+016A00 - U+016A07 : 0x55555555
+      0,  // U+016A08 - U+016A0F : 0x55555555
+      0,  // U+016A10 - U+016A17 : 0x55555555
+      0,  // U+016A18 - U+016A1F : 0x55555555
+      0,  // U+016A20 - U+016A27 : 0x55555555
+      0,  // U+016A28 - U+016A2F : 0x55555555
+      0,  // U+016A30 - U+016A37 : 0x55555555
+    154,  // U+016A38 - U+016A3F : 0x00000005
+      3,  // U+016A40 - U+016A47 : 0x00000000
+      3,  // U+016A48 - U+016A4F : 0x00000000
+      3,  // U+016A50 - U+016A57 : 0x00000000
+      3,  // U+016A58 - U+016A5F : 0x00000000
+      3,  // U+016A60 - U+016A67 : 0x00000000
+      3,  // U+016A68 - U+016A6F : 0x00000000
+      3,  // U+016A70 - U+016A77 : 0x00000000
+      3,  // U+016A78 - U+016A7F : 0x00000000
+      3,  // U+016A80 - U+016A87 : 0x00000000
+      3,  // U+016A88 - U+016A8F : 0x00000000
+      3,  // U+016A90 - U+016A97 : 0x00000000
+      3,  // U+016A98 - U+016A9F : 0x00000000
+      3,  // U+016AA0 - U+016AA7 : 0x00000000
+      3,  // U+016AA8 - U+016AAF : 0x00000000
+      3,  // U+016AB0 - U+016AB7 : 0x00000000
+      3,  // U+016AB8 - U+016ABF : 0x00000000
+      3,  // U+016AC0 - U+016AC7 : 0x00000000
+      3,  // U+016AC8 - U+016ACF : 0x00000000
+      3,  // U+016AD0 - U+016AD7 : 0x00000000
+      3,  // U+016AD8 - U+016ADF : 0x00000000
+      3,  // U+016AE0 - U+016AE7 : 0x00000000
+      3,  // U+016AE8 - U+016AEF : 0x00000000
+      3,  // U+016AF0 - U+016AF7 : 0x00000000
+      3,  // U+016AF8 - U+016AFF : 0x00000000
+};
+
+static const PRUint8 gGenCatIdx16[4] = {
+     94,  // U+01B000 - U+01B007 : 0x00000055
+      3,  // U+01B008 - U+01B00F : 0x00000000
+      3,  // U+01B010 - U+01B017 : 0x00000000
+      3,  // U+01B018 - U+01B01F : 0x00000000
+};
+
+static const PRUint8 gGenCatIdx17[256] = {
      29,  // U+01D000 - U+01D007 : 0x77777777
      29,  // U+01D008 - U+01D00F : 0x77777777
      29,  // U+01D010 - U+01D017 : 0x77777777
      29,  // U+01D018 - U+01D01F : 0x77777777
      29,  // U+01D020 - U+01D027 : 0x77777777
      29,  // U+01D028 - U+01D02F : 0x77777777
      29,  // U+01D030 - U+01D037 : 0x77777777
      29,  // U+01D038 - U+01D03F : 0x77777777
@@ -2913,59 +3056,59 @@ static const PRUint8 gGenCatIdx16[256] =
      29,  // U+01D0B0 - U+01D0B7 : 0x77777777
      29,  // U+01D0B8 - U+01D0BF : 0x77777777
      29,  // U+01D0C0 - U+01D0C7 : 0x77777777
      29,  // U+01D0C8 - U+01D0CF : 0x77777777
      29,  // U+01D0D0 - U+01D0D7 : 0x77777777
      29,  // U+01D0D8 - U+01D0DF : 0x77777777
      29,  // U+01D0E0 - U+01D0E7 : 0x77777777
      29,  // U+01D0E8 - U+01D0EF : 0x77777777
-     75,  // U+01D0F0 - U+01D0F7 : 0x00777777
+     69,  // U+01D0F0 - U+01D0F7 : 0x00777777
       3,  // U+01D0F8 - U+01D0FF : 0x00000000
      29,  // U+01D100 - U+01D107 : 0x77777777
      29,  // U+01D108 - U+01D10F : 0x77777777
      29,  // U+01D110 - U+01D117 : 0x77777777
      29,  // U+01D118 - U+01D11F : 0x77777777
-     44,  // U+01D120 - U+01D127 : 0x07777777
-     52,  // U+01D128 - U+01D12F : 0x77777770
+     45,  // U+01D120 - U+01D127 : 0x07777777
+     49,  // U+01D128 - U+01D12F : 0x77777770
      29,  // U+01D130 - U+01D137 : 0x77777777
      29,  // U+01D138 - U+01D13F : 0x77777777
      29,  // U+01D140 - U+01D147 : 0x77777777
      29,  // U+01D148 - U+01D14F : 0x77777777
      29,  // U+01D150 - U+01D157 : 0x77777777
      29,  // U+01D158 - U+01D15F : 0x77777777
-    180,  // U+01D160 - U+01D167 : 0x11177777
-    181,  // U+01D168 - U+01D16F : 0x11177711
-    182,  // U+01D170 - U+01D177 : 0x44444111
-    183,  // U+01D178 - U+01D17F : 0x11111444
-    184,  // U+01D180 - U+01D187 : 0x11177111
-    185,  // U+01D188 - U+01D18F : 0x77771111
+    177,  // U+01D160 - U+01D167 : 0x11177777
+    178,  // U+01D168 - U+01D16F : 0x11177711
+    179,  // U+01D170 - U+01D177 : 0x44444111
+    180,  // U+01D178 - U+01D17F : 0x11111444
+    181,  // U+01D180 - U+01D187 : 0x11177111
+    182,  // U+01D188 - U+01D18F : 0x77771111
      29,  // U+01D190 - U+01D197 : 0x77777777
      29,  // U+01D198 - U+01D19F : 0x77777777
      29,  // U+01D1A0 - U+01D1A7 : 0x77777777
-    186,  // U+01D1A8 - U+01D1AF : 0x77111177
+    183,  // U+01D1A8 - U+01D1AF : 0x77111177
      29,  // U+01D1B0 - U+01D1B7 : 0x77777777
      29,  // U+01D1B8 - U+01D1BF : 0x77777777
      29,  // U+01D1C0 - U+01D1C7 : 0x77777777
      29,  // U+01D1C8 - U+01D1CF : 0x77777777
      29,  // U+01D1D0 - U+01D1D7 : 0x77777777
-     75,  // U+01D1D8 - U+01D1DF : 0x00777777
+     69,  // U+01D1D8 - U+01D1DF : 0x00777777
       3,  // U+01D1E0 - U+01D1E7 : 0x00000000
       3,  // U+01D1E8 - U+01D1EF : 0x00000000
       3,  // U+01D1F0 - U+01D1F7 : 0x00000000
       3,  // U+01D1F8 - U+01D1FF : 0x00000000
      29,  // U+01D200 - U+01D207 : 0x77777777
      29,  // U+01D208 - U+01D20F : 0x77777777
      29,  // U+01D210 - U+01D217 : 0x77777777
      29,  // U+01D218 - U+01D21F : 0x77777777
      29,  // U+01D220 - U+01D227 : 0x77777777
      29,  // U+01D228 - U+01D22F : 0x77777777
      29,  // U+01D230 - U+01D237 : 0x77777777
      29,  // U+01D238 - U+01D23F : 0x77777777
-    187,  // U+01D240 - U+01D247 : 0x00711177
+    184,  // U+01D240 - U+01D247 : 0x00711177
       3,  // U+01D248 - U+01D24F : 0x00000000
       3,  // U+01D250 - U+01D257 : 0x00000000
       3,  // U+01D258 - U+01D25F : 0x00000000
       3,  // U+01D260 - U+01D267 : 0x00000000
       3,  // U+01D268 - U+01D26F : 0x00000000
       3,  // U+01D270 - U+01D277 : 0x00000000
       3,  // U+01D278 - U+01D27F : 0x00000000
       3,  // U+01D280 - U+01D287 : 0x00000000
@@ -2989,17 +3132,17 @@ static const PRUint8 gGenCatIdx16[256] =
      29,  // U+01D310 - U+01D317 : 0x77777777
      29,  // U+01D318 - U+01D31F : 0x77777777
      29,  // U+01D320 - U+01D327 : 0x77777777
      29,  // U+01D328 - U+01D32F : 0x77777777
      29,  // U+01D330 - U+01D337 : 0x77777777
      29,  // U+01D338 - U+01D33F : 0x77777777
      29,  // U+01D340 - U+01D347 : 0x77777777
      29,  // U+01D348 - U+01D34F : 0x77777777
-     44,  // U+01D350 - U+01D357 : 0x07777777
+     45,  // U+01D350 - U+01D357 : 0x07777777
       3,  // U+01D358 - U+01D35F : 0x00000000
      26,  // U+01D360 - U+01D367 : 0x22222222
      26,  // U+01D368 - U+01D36F : 0x22222222
      42,  // U+01D370 - U+01D377 : 0x00000022
       3,  // U+01D378 - U+01D37F : 0x00000000
       3,  // U+01D380 - U+01D387 : 0x00000000
       3,  // U+01D388 - U+01D38F : 0x00000000
       3,  // U+01D390 - U+01D397 : 0x00000000
@@ -3031,39 +3174,39 @@ static const PRUint8 gGenCatIdx16[256] =
       0,  // U+01D460 - U+01D467 : 0x55555555
       0,  // U+01D468 - U+01D46F : 0x55555555
       0,  // U+01D470 - U+01D477 : 0x55555555
       0,  // U+01D478 - U+01D47F : 0x55555555
       0,  // U+01D480 - U+01D487 : 0x55555555
       0,  // U+01D488 - U+01D48F : 0x55555555
       0,  // U+01D490 - U+01D497 : 0x55555555
       7,  // U+01D498 - U+01D49F : 0x55055555
-    188,  // U+01D4A0 - U+01D4A7 : 0x05500500
-    189,  // U+01D4A8 - U+01D4AF : 0x55055550
+    185,  // U+01D4A0 - U+01D4A7 : 0x05500500
+    186,  // U+01D4A8 - U+01D4AF : 0x55055550
       0,  // U+01D4B0 - U+01D4B7 : 0x55555555
-    190,  // U+01D4B8 - U+01D4BF : 0x55505055
-    150,  // U+01D4C0 - U+01D4C7 : 0x55505555
+    187,  // U+01D4B8 - U+01D4BF : 0x55505055
+    147,  // U+01D4C0 - U+01D4C7 : 0x55505555
       0,  // U+01D4C8 - U+01D4CF : 0x55555555
       0,  // U+01D4D0 - U+01D4D7 : 0x55555555
       0,  // U+01D4D8 - U+01D4DF : 0x55555555
       0,  // U+01D4E0 - U+01D4E7 : 0x55555555
       0,  // U+01D4E8 - U+01D4EF : 0x55555555
       0,  // U+01D4F0 - U+01D4F7 : 0x55555555
       0,  // U+01D4F8 - U+01D4FF : 0x55555555
-    165,  // U+01D500 - U+01D507 : 0x50555555
-    191,  // U+01D508 - U+01D50F : 0x55500555
+    161,  // U+01D500 - U+01D507 : 0x50555555
+    188,  // U+01D508 - U+01D50F : 0x55500555
       7,  // U+01D510 - U+01D517 : 0x55055555
       7,  // U+01D518 - U+01D51F : 0x55055555
       0,  // U+01D520 - U+01D527 : 0x55555555
       0,  // U+01D528 - U+01D52F : 0x55555555
       0,  // U+01D530 - U+01D537 : 0x55555555
-    192,  // U+01D538 - U+01D53F : 0x05555055
-    133,  // U+01D540 - U+01D547 : 0x05055555
-     92,  // U+01D548 - U+01D54F : 0x55555500
-    164,  // U+01D550 - U+01D557 : 0x55555505
+    189,  // U+01D538 - U+01D53F : 0x05555055
+    130,  // U+01D540 - U+01D547 : 0x05055555
+     95,  // U+01D548 - U+01D54F : 0x55555500
+    160,  // U+01D550 - U+01D557 : 0x55555505
       0,  // U+01D558 - U+01D55F : 0x55555555
       0,  // U+01D560 - U+01D567 : 0x55555555
       0,  // U+01D568 - U+01D56F : 0x55555555
       0,  // U+01D570 - U+01D577 : 0x55555555
       0,  // U+01D578 - U+01D57F : 0x55555555
       0,  // U+01D580 - U+01D587 : 0x55555555
       0,  // U+01D588 - U+01D58F : 0x55555555
       0,  // U+01D590 - U+01D597 : 0x55555555
@@ -3099,155 +3242,321 @@ static const PRUint8 gGenCatIdx16[256] =
       0,  // U+01D680 - U+01D687 : 0x55555555
       0,  // U+01D688 - U+01D68F : 0x55555555
       0,  // U+01D690 - U+01D697 : 0x55555555
       0,  // U+01D698 - U+01D69F : 0x55555555
       5,  // U+01D6A0 - U+01D6A7 : 0x00555555
       0,  // U+01D6A8 - U+01D6AF : 0x55555555
       0,  // U+01D6B0 - U+01D6B7 : 0x55555555
       0,  // U+01D6B8 - U+01D6BF : 0x55555555
-    132,  // U+01D6C0 - U+01D6C7 : 0x55555575
+    129,  // U+01D6C0 - U+01D6C7 : 0x55555575
       0,  // U+01D6C8 - U+01D6CF : 0x55555555
       0,  // U+01D6D0 - U+01D6D7 : 0x55555555
-    193,  // U+01D6D8 - U+01D6DF : 0x55557555
+    190,  // U+01D6D8 - U+01D6DF : 0x55557555
       0,  // U+01D6E0 - U+01D6E7 : 0x55555555
       0,  // U+01D6E8 - U+01D6EF : 0x55555555
       0,  // U+01D6F0 - U+01D6F7 : 0x55555555
-    193,  // U+01D6F8 - U+01D6FF : 0x55557555
+    190,  // U+01D6F8 - U+01D6FF : 0x55557555
       0,  // U+01D700 - U+01D707 : 0x55555555
       0,  // U+01D708 - U+01D70F : 0x55555555
-    194,  // U+01D710 - U+01D717 : 0x55755555
+    191,  // U+01D710 - U+01D717 : 0x55755555
       0,  // U+01D718 - U+01D71F : 0x55555555
       0,  // U+01D720 - U+01D727 : 0x55555555
       0,  // U+01D728 - U+01D72F : 0x55555555
-    194,  // U+01D730 - U+01D737 : 0x55755555
+    191,  // U+01D730 - U+01D737 : 0x55755555
       0,  // U+01D738 - U+01D73F : 0x55555555
       0,  // U+01D740 - U+01D747 : 0x55555555
-    123,  // U+01D748 - U+01D74F : 0x75555555
+    118,  // U+01D748 - U+01D74F : 0x75555555
       0,  // U+01D750 - U+01D757 : 0x55555555
       0,  // U+01D758 - U+01D75F : 0x55555555
       0,  // U+01D760 - U+01D767 : 0x55555555
-    123,  // U+01D768 - U+01D76F : 0x75555555
+    118,  // U+01D768 - U+01D76F : 0x75555555
       0,  // U+01D770 - U+01D777 : 0x55555555
       0,  // U+01D778 - U+01D77F : 0x55555555
       0,  // U+01D780 - U+01D787 : 0x55555555
-    132,  // U+01D788 - U+01D78F : 0x55555575
+    129,  // U+01D788 - U+01D78F : 0x55555575
       0,  // U+01D790 - U+01D797 : 0x55555555
       0,  // U+01D798 - U+01D79F : 0x55555555
       0,  // U+01D7A0 - U+01D7A7 : 0x55555555
-    132,  // U+01D7A8 - U+01D7AF : 0x55555575
+    129,  // U+01D7A8 - U+01D7AF : 0x55555575
       0,  // U+01D7B0 - U+01D7B7 : 0x55555555
       0,  // U+01D7B8 - U+01D7BF : 0x55555555
-    193,  // U+01D7C0 - U+01D7C7 : 0x55557555
-    195,  // U+01D7C8 - U+01D7CF : 0x22005555
+    190,  // U+01D7C0 - U+01D7C7 : 0x55557555
+    192,  // U+01D7C8 - U+01D7CF : 0x22005555
      26,  // U+01D7D0 - U+01D7D7 : 0x22222222
      26,  // U+01D7D8 - U+01D7DF : 0x22222222
      26,  // U+01D7E0 - U+01D7E7 : 0x22222222
      26,  // U+01D7E8 - U+01D7EF : 0x22222222
      26,  // U+01D7F0 - U+01D7F7 : 0x22222222
      26,  // U+01D7F8 - U+01D7FF : 0x22222222
 };
 
-static const PRUint8 gGenCatIdx17[74] = {
+static const PRUint8 gGenCatIdx18[240] = {
      29,  // U+01F000 - U+01F007 : 0x77777777
      29,  // U+01F008 - U+01F00F : 0x77777777
      29,  // U+01F010 - U+01F017 : 0x77777777
      29,  // U+01F018 - U+01F01F : 0x77777777
      29,  // U+01F020 - U+01F027 : 0x77777777
-     74,  // U+01F028 - U+01F02F : 0x00007777
+     44,  // U+01F028 - U+01F02F : 0x00007777
      29,  // U+01F030 - U+01F037 : 0x77777777
      29,  // U+01F038 - U+01F03F : 0x77777777
      29,  // U+01F040 - U+01F047 : 0x77777777
      29,  // U+01F048 - U+01F04F : 0x77777777
      29,  // U+01F050 - U+01F057 : 0x77777777
      29,  // U+01F058 - U+01F05F : 0x77777777
      29,  // U+01F060 - U+01F067 : 0x77777777
      29,  // U+01F068 - U+01F06F : 0x77777777
      29,  // U+01F070 - U+01F077 : 0x77777777
      29,  // U+01F078 - U+01F07F : 0x77777777
      29,  // U+01F080 - U+01F087 : 0x77777777
      29,  // U+01F088 - U+01F08F : 0x77777777
-     74,  // U+01F090 - U+01F097 : 0x00007777
+     44,  // U+01F090 - U+01F097 : 0x00007777
       3,  // U+01F098 - U+01F09F : 0x00000000
-      3,  // U+01F0A0 - U+01F0A7 : 0x00000000
-      3,  // U+01F0A8 - U+01F0AF : 0x00000000
-      3,  // U+01F0B0 - U+01F0B7 : 0x00000000
-      3,  // U+01F0B8 - U+01F0BF : 0x00000000
-      3,  // U+01F0C0 - U+01F0C7 : 0x00000000
-      3,  // U+01F0C8 - U+01F0CF : 0x00000000
-      3,  // U+01F0D0 - U+01F0D7 : 0x00000000
-      3,  // U+01F0D8 - U+01F0DF : 0x00000000
+     29,  // U+01F0A0 - U+01F0A7 : 0x77777777
+     45,  // U+01F0A8 - U+01F0AF : 0x07777777
+     49,  // U+01F0B0 - U+01F0B7 : 0x77777770
+     45,  // U+01F0B8 - U+01F0BF : 0x07777777
+     49,  // U+01F0C0 - U+01F0C7 : 0x77777770
+     29,  // U+01F0C8 - U+01F0CF : 0x77777777
+     49,  // U+01F0D0 - U+01F0D7 : 0x77777770
+     29,  // U+01F0D8 - U+01F0DF : 0x77777777
       3,  // U+01F0E0 - U+01F0E7 : 0x00000000
       3,  // U+01F0E8 - U+01F0EF : 0x00000000
       3,  // U+01F0F0 - U+01F0F7 : 0x00000000
       3,  // U+01F0F8 - U+01F0FF : 0x00000000
      26,  // U+01F100 - U+01F107 : 0x22222222
-    178,  // U+01F108 - U+01F10F : 0x00000222
+    175,  // U+01F108 - U+01F10F : 0x00000222
      29,  // U+01F110 - U+01F117 : 0x77777777
      29,  // U+01F118 - U+01F11F : 0x77777777
      29,  // U+01F120 - U+01F127 : 0x77777777
-     44,  // U+01F128 - U+01F12F : 0x07777777
-    196,  // U+01F130 - U+01F137 : 0x00000070
-    197,  // U+01F138 - U+01F13F : 0x70700000
-    198,  // U+01F140 - U+01F147 : 0x07000700
-    199,  // U+01F148 - U+01F14F : 0x07777700
-    200,  // U+01F150 - U+01F157 : 0x70000000
-    200,  // U+01F158 - U+01F15F : 0x70000000
-      3,  // U+01F160 - U+01F167 : 0x00000000
-      3,  // U+01F168 - U+01F16F : 0x00000000
-      3,  // U+01F170 - U+01F177 : 0x00000000
-    201,  // U+01F178 - U+01F17F : 0x70077070
-      3,  // U+01F180 - U+01F187 : 0x00000000
-    202,  // U+01F188 - U+01F18F : 0x00777700
-     30,  // U+01F190 - U+01F197 : 0x00000007
-      3,  // U+01F198 - U+01F19F : 0x00000000
+     45,  // U+01F128 - U+01F12F : 0x07777777
+     29,  // U+01F130 - U+01F137 : 0x77777777
+     29,  // U+01F138 - U+01F13F : 0x77777777
+     29,  // U+01F140 - U+01F147 : 0x77777777
+     29,  // U+01F148 - U+01F14F : 0x77777777
+     29,  // U+01F150 - U+01F157 : 0x77777777
+     29,  // U+01F158 - U+01F15F : 0x77777777
+     29,  // U+01F160 - U+01F167 : 0x77777777
+     30,  // U+01F168 - U+01F16F : 0x00000077
+     29,  // U+01F170 - U+01F177 : 0x77777777
+     29,  // U+01F178 - U+01F17F : 0x77777777
+     29,  // U+01F180 - U+01F187 : 0x77777777
+     29,  // U+01F188 - U+01F18F : 0x77777777
+     29,  // U+01F190 - U+01F197 : 0x77777777
+     46,  // U+01F198 - U+01F19F : 0x00000777
       3,  // U+01F1A0 - U+01F1A7 : 0x00000000
       3,  // U+01F1A8 - U+01F1AF : 0x00000000
       3,  // U+01F1B0 - U+01F1B7 : 0x00000000
       3,  // U+01F1B8 - U+01F1BF : 0x00000000
       3,  // U+01F1C0 - U+01F1C7 : 0x00000000
       3,  // U+01F1C8 - U+01F1CF : 0x00000000
       3,  // U+01F1D0 - U+01F1D7 : 0x00000000
       3,  // U+01F1D8 - U+01F1DF : 0x00000000
-      3,  // U+01F1E0 - U+01F1E7 : 0x00000000
-      3,  // U+01F1E8 - U+01F1EF : 0x00000000
-      3,  // U+01F1F0 - U+01F1F7 : 0x00000000
-      3,  // U+01F1F8 - U+01F1FF : 0x00000000
-     30,  // U+01F200 - U+01F207 : 0x00000007
+    193,  // U+01F1E0 - U+01F1E7 : 0x77000000
+     29,  // U+01F1E8 - U+01F1EF : 0x77777777
+     29,  // U+01F1F0 - U+01F1F7 : 0x77777777
+     29,  // U+01F1F8 - U+01F1FF : 0x77777777
+     46,  // U+01F200 - U+01F207 : 0x00000777
       3,  // U+01F208 - U+01F20F : 0x00000000
      29,  // U+01F210 - U+01F217 : 0x77777777
      29,  // U+01F218 - U+01F21F : 0x77777777
      29,  // U+01F220 - U+01F227 : 0x77777777
      29,  // U+01F228 - U+01F22F : 0x77777777
-     65,  // U+01F230 - U+01F237 : 0x00000077
-      3,  // U+01F238 - U+01F23F : 0x00000000
+     29,  // U+01F230 - U+01F237 : 0x77777777
+     46,  // U+01F238 - U+01F23F : 0x00000777
      29,  // U+01F240 - U+01F247 : 0x77777777
-     30,  // U+01F248 - U+01F24F : 0x00000007
+    194,  // U+01F248 - U+01F24F : 0x00000007
+     30,  // U+01F250 - U+01F257 : 0x00000077
+      3,  // U+01F258 - U+01F25F : 0x00000000
+      3,  // U+01F260 - U+01F267 : 0x00000000
+      3,  // U+01F268 - U+01F26F : 0x00000000
+      3,  // U+01F270 - U+01F277 : 0x00000000
+      3,  // U+01F278 - U+01F27F : 0x00000000
+      3,  // U+01F280 - U+01F287 : 0x00000000
+      3,  // U+01F288 - U+01F28F : 0x00000000
+      3,  // U+01F290 - U+01F297 : 0x00000000
+      3,  // U+01F298 - U+01F29F : 0x00000000
+      3,  // U+01F2A0 - U+01F2A7 : 0x00000000
+      3,  // U+01F2A8 - U+01F2AF : 0x00000000
+      3,  // U+01F2B0 - U+01F2B7 : 0x00000000
+      3,  // U+01F2B8 - U+01F2BF : 0x00000000
+      3,  // U+01F2C0 - U+01F2C7 : 0x00000000
+      3,  // U+01F2C8 - U+01F2CF : 0x00000000
+      3,  // U+01F2D0 - U+01F2D7 : 0x00000000
+      3,  // U+01F2D8 - U+01F2DF : 0x00000000
+      3,  // U+01F2E0 - U+01F2E7 : 0x00000000
+      3,  // U+01F2E8 - U+01F2EF : 0x00000000
+      3,  // U+01F2F0 - U+01F2F7 : 0x00000000
+      3,  // U+01F2F8 - U+01F2FF : 0x00000000
+     29,  // U+01F300 - U+01F307 : 0x77777777
+     29,  // U+01F308 - U+01F30F : 0x77777777
+     29,  // U+01F310 - U+01F317 : 0x77777777
+     29,  // U+01F318 - U+01F31F : 0x77777777
+    194,  // U+01F320 - U+01F327 : 0x00000007
+      3,  // U+01F328 - U+01F32F : 0x00000000
+    195,  // U+01F330 - U+01F337 : 0x70777777
+     29,  // U+01F338 - U+01F33F : 0x77777777
+     29,  // U+01F340 - U+01F347 : 0x77777777
+     29,  // U+01F348 - U+01F34F : 0x77777777
+     29,  // U+01F350 - U+01F357 : 0x77777777
+     29,  // U+01F358 - U+01F35F : 0x77777777
+     29,  // U+01F360 - U+01F367 : 0x77777777
+     29,  // U+01F368 - U+01F36F : 0x77777777
+     29,  // U+01F370 - U+01F377 : 0x77777777
+     58,  // U+01F378 - U+01F37F : 0x00077777
+     29,  // U+01F380 - U+01F387 : 0x77777777
+     29,  // U+01F388 - U+01F38F : 0x77777777
+     44,  // U+01F390 - U+01F397 : 0x00007777
+      3,  // U+01F398 - U+01F39F : 0x00000000
+     29,  // U+01F3A0 - U+01F3A7 : 0x77777777
+     29,  // U+01F3A8 - U+01F3AF : 0x77777777
+     29,  // U+01F3B0 - U+01F3B7 : 0x77777777
+     29,  // U+01F3B8 - U+01F3BF : 0x77777777
+    196,  // U+01F3C0 - U+01F3C7 : 0x77077777
+     46,  // U+01F3C8 - U+01F3CF : 0x00000777
+      3,  // U+01F3D0 - U+01F3D7 : 0x00000000
+      3,  // U+01F3D8 - U+01F3DF : 0x00000000
+     29,  // U+01F3E0 - U+01F3E7 : 0x77777777
+     29,  // U+01F3E8 - U+01F3EF : 0x77777777
+    194,  // U+01F3F0 - U+01F3F7 : 0x00000007
+      3,  // U+01F3F8 - U+01F3FF : 0x00000000
+     29,  // U+01F400 - U+01F407 : 0x77777777
+     29,  // U+01F408 - U+01F40F : 0x77777777
+     29,  // U+01F410 - U+01F417 : 0x77777777
+     29,  // U+01F418 - U+01F41F : 0x77777777
+     29,  // U+01F420 - U+01F427 : 0x77777777
+     29,  // U+01F428 - U+01F42F : 0x77777777
+     29,  // U+01F430 - U+01F437 : 0x77777777
+     45,  // U+01F438 - U+01F43F : 0x07777777
+    197,  // U+01F440 - U+01F447 : 0x77777707
+     29,  // U+01F448 - U+01F44F : 0x77777777
+     29,  // U+01F450 - U+01F457 : 0x77777777
+     29,  // U+01F458 - U+01F45F : 0x77777777
+     29,  // U+01F460 - U+01F467 : 0x77777777
+     29,  // U+01F468 - U+01F46F : 0x77777777
+     29,  // U+01F470 - U+01F477 : 0x77777777
+     29,  // U+01F478 - U+01F47F : 0x77777777
+     29,  // U+01F480 - U+01F487 : 0x77777777
+     29,  // U+01F488 - U+01F48F : 0x77777777
+     29,  // U+01F490 - U+01F497 : 0x77777777
+     29,  // U+01F498 - U+01F49F : 0x77777777
+     29,  // U+01F4A0 - U+01F4A7 : 0x77777777
+     29,  // U+01F4A8 - U+01F4AF : 0x77777777
+     29,  // U+01F4B0 - U+01F4B7 : 0x77777777
+     29,  // U+01F4B8 - U+01F4BF : 0x77777777
+     29,  // U+01F4C0 - U+01F4C7 : 0x77777777
+     29,  // U+01F4C8 - U+01F4CF : 0x77777777
+     29,  // U+01F4D0 - U+01F4D7 : 0x77777777
+     29,  // U+01F4D8 - U+01F4DF : 0x77777777
+     29,  // U+01F4E0 - U+01F4E7 : 0x77777777
+     29,  // U+01F4E8 - U+01F4EF : 0x77777777
+     29,  // U+01F4F0 - U+01F4F7 : 0x77777777
+    198,  // U+01F4F8 - U+01F4FF : 0x00077770
+     29,  // U+01F500 - U+01F507 : 0x77777777
+     29,  // U+01F508 - U+01F50F : 0x77777777
+     29,  // U+01F510 - U+01F517 : 0x77777777
+     29,  // U+01F518 - U+01F51F : 0x77777777
+     29,  // U+01F520 - U+01F527 : 0x77777777
+     29,  // U+01F528 - U+01F52F : 0x77777777
+     29,  // U+01F530 - U+01F537 : 0x77777777
+     69,  // U+01F538 - U+01F53F : 0x00777777
+      3,  // U+01F540 - U+01F547 : 0x00000000
+      3,  // U+01F548 - U+01F54F : 0x00000000
+     29,  // U+01F550 - U+01F557 : 0x77777777
+     29,  // U+01F558 - U+01F55F : 0x77777777
+     29,  // U+01F560 - U+01F567 : 0x77777777
+      3,  // U+01F568 - U+01F56F : 0x00000000
+      3,  // U+01F570 - U+01F577 : 0x00000000
+      3,  // U+01F578 - U+01F57F : 0x00000000
+      3,  // U+01F580 - U+01F587 : 0x00000000
+      3,  // U+01F588 - U+01F58F : 0x00000000
+      3,  // U+01F590 - U+01F597 : 0x00000000
+      3,  // U+01F598 - U+01F59F : 0x00000000
+      3,  // U+01F5A0 - U+01F5A7 : 0x00000000
+      3,  // U+01F5A8 - U+01F5AF : 0x00000000
+      3,  // U+01F5B0 - U+01F5B7 : 0x00000000
+      3,  // U+01F5B8 - U+01F5BF : 0x00000000
+      3,  // U+01F5C0 - U+01F5C7 : 0x00000000
+      3,  // U+01F5C8 - U+01F5CF : 0x00000000
+      3,  // U+01F5D0 - U+01F5D7 : 0x00000000
+      3,  // U+01F5D8 - U+01F5DF : 0x00000000
+      3,  // U+01F5E0 - U+01F5E7 : 0x00000000
+      3,  // U+01F5E8 - U+01F5EF : 0x00000000
+      3,  // U+01F5F0 - U+01F5F7 : 0x00000000
+    199,  // U+01F5F8 - U+01F5FF : 0x77777000
+     49,  // U+01F600 - U+01F607 : 0x77777770
+     29,  // U+01F608 - U+01F60F : 0x77777777
+    200,  // U+01F610 - U+01F617 : 0x07077707
+    201,  // U+01F618 - U+01F61F : 0x07770707
+     69,  // U+01F620 - U+01F627 : 0x00777777
+    202,  // U+01F628 - U+01F62F : 0x00707777
+    203,  // U+01F630 - U+01F637 : 0x77707777
+     29,  // U+01F638 - U+01F63F : 0x77777777
+    204,  // U+01F640 - U+01F647 : 0x77700007
+     29,  // U+01F648 - U+01F64F : 0x77777777
+      3,  // U+01F650 - U+01F657 : 0x00000000
+      3,  // U+01F658 - U+01F65F : 0x00000000
+      3,  // U+01F660 - U+01F667 : 0x00000000
+      3,  // U+01F668 - U+01F66F : 0x00000000
+      3,  // U+01F670 - U+01F677 : 0x00000000
+      3,  // U+01F678 - U+01F67F : 0x00000000
+     29,  // U+01F680 - U+01F687 : 0x77777777
+     29,  // U+01F688 - U+01F68F : 0x77777777
+     29,  // U+01F690 - U+01F697 : 0x77777777
+     29,  // U+01F698 - U+01F69F : 0x77777777
+     29,  // U+01F6A0 - U+01F6A7 : 0x77777777
+     29,  // U+01F6A8 - U+01F6AF : 0x77777777
+     29,  // U+01F6B0 - U+01F6B7 : 0x77777777
+     29,  // U+01F6B8 - U+01F6BF : 0x77777777
+     69,  // U+01F6C0 - U+01F6C7 : 0x00777777
+      3,  // U+01F6C8 - U+01F6CF : 0x00000000
+      3,  // U+01F6D0 - U+01F6D7 : 0x00000000
+      3,  // U+01F6D8 - U+01F6DF : 0x00000000
+      3,  // U+01F6E0 - U+01F6E7 : 0x00000000
+      3,  // U+01F6E8 - U+01F6EF : 0x00000000
+      3,  // U+01F6F0 - U+01F6F7 : 0x00000000
+      3,  // U+01F6F8 - U+01F6FF : 0x00000000
+     29,  // U+01F700 - U+01F707 : 0x77777777
+     29,  // U+01F708 - U+01F70F : 0x77777777
+     29,  // U+01F710 - U+01F717 : 0x77777777
+     29,  // U+01F718 - U+01F71F : 0x77777777
+     29,  // U+01F720 - U+01F727 : 0x77777777
+     29,  // U+01F728 - U+01F72F : 0x77777777
+     29,  // U+01F730 - U+01F737 : 0x77777777
+     29,  // U+01F738 - U+01F73F : 0x77777777
+     29,  // U+01F740 - U+01F747 : 0x77777777
+     29,  // U+01F748 - U+01F74F : 0x77777777
+     29,  // U+01F750 - U+01F757 : 0x77777777
+     29,  // U+01F758 - U+01F75F : 0x77777777
+     29,  // U+01F760 - U+01F767 : 0x77777777
+     29,  // U+01F768 - U+01F76F : 0x77777777
+     44,  // U+01F770 - U+01F777 : 0x00007777
+      3,  // U+01F778 - U+01F77F : 0x00000000
 };
 
-static const PRUint8 gGenCatIdx18[16] = {
-    203,  // U+0E0000 - U+0E0007 : 0x00000040
+static const PRUint8 gGenCatIdx19[16] = {
+    205,  // U+0E0000 - U+0E0007 : 0x00000040
       3,  // U+0E0008 - U+0E000F : 0x00000000
       3,  // U+0E0010 - U+0E0017 : 0x00000000
       3,  // U+0E0018 - U+0E001F : 0x00000000
-    204,  // U+0E0020 - U+0E0027 : 0x44444444
-    204,  // U+0E0028 - U+0E002F : 0x44444444
-    204,  // U+0E0030 - U+0E0037 : 0x44444444
-    204,  // U+0E0038 - U+0E003F : 0x44444444
-    204,  // U+0E0040 - U+0E0047 : 0x44444444
-    204,  // U+0E0048 - U+0E004F : 0x44444444
-    204,  // U+0E0050 - U+0E0057 : 0x44444444
-    204,  // U+0E0058 - U+0E005F : 0x44444444
-    204,  // U+0E0060 - U+0E0067 : 0x44444444
-    204,  // U+0E0068 - U+0E006F : 0x44444444
-    204,  // U+0E0070 - U+0E0077 : 0x44444444
-    204,  // U+0E0078 - U+0E007F : 0x44444444
+    206,  // U+0E0020 - U+0E0027 : 0x44444444
+    206,  // U+0E0028 - U+0E002F : 0x44444444
+    206,  // U+0E0030 - U+0E0037 : 0x44444444
+    206,  // U+0E0038 - U+0E003F : 0x44444444
+    206,  // U+0E0040 - U+0E0047 : 0x44444444
+    206,  // U+0E0048 - U+0E004F : 0x44444444
+    206,  // U+0E0050 - U+0E0057 : 0x44444444
+    206,  // U+0E0058 - U+0E005F : 0x44444444
+    206,  // U+0E0060 - U+0E0067 : 0x44444444
+    206,  // U+0E0068 - U+0E006F : 0x44444444
+    206,  // U+0E0070 - U+0E0077 : 0x44444444
+    206,  // U+0E0078 - U+0E007F : 0x44444444
 };
 
-static const PRUint8 gGenCatIdx19[30] = {
+static const PRUint8 gGenCatIdx20[30] = {
       1,  // U+0E0100 - U+0E0107 : 0x11111111
       1,  // U+0E0108 - U+0E010F : 0x11111111
       1,  // U+0E0110 - U+0E0117 : 0x11111111
       1,  // U+0E0118 - U+0E011F : 0x11111111
       1,  // U+0E0120 - U+0E0127 : 0x11111111
       1,  // U+0E0128 - U+0E012F : 0x11111111
       1,  // U+0E0130 - U+0E0137 : 0x11111111
       1,  // U+0E0138 - U+0E013F : 0x11111111
@@ -3300,61 +3609,61 @@ static const PRUint32 gGenCatPatPl0[] = 
     0x55755555,  // 21 
     0x06555500,  // 22 
     0x65770000,  // 23 
     0x55050555,  // 24 
     0x55555055,  // 25 
     0x57555555,  // 26 
     0x11111755,  // 27 
     0x55555511,  // 28 
-    0x00555555,  // 29 
-    0x00000000,  // 30 
-    0x55555550,  // 31 
-    0x05555555,  // 32 
-    0x66666650,  // 33 
-    0x00000660,  // 34 
-    0x11111110,  // 35 
-    0x16111111,  // 36 
-    0x16116116,  // 37 
-    0x00000555,  // 38 
-    0x00066555,  // 39 
-    0x77004444,  // 40 
-    0x77667667,  // 41 
-    0x66006111,  // 42 
-    0x11111555,  // 43 
-    0x01111111,  // 44 
-    0x55666622,  // 45 
-    0x55555551,  // 46 
-    0x11565555,  // 47 
-    0x11411111,  // 48 
-    0x15511111,  // 49 
-    0x55111171,  // 50 
-    0x57755522,  // 51 
-    0x66666666,  // 52 
-    0x40666666,  // 53 
-    0x55555515,  // 54 
-    0x55500111,  // 55 
-    0x11555555,  // 56 
-    0x00000051,  // 57 
-    0x55555522,  // 58 
-    0x67551111,  // 59 
-    0x00000566,  // 60 
-    0x11111511,  // 61 
-    0x11151111,  // 62 
-    0x00111115,  // 63 
-    0x06666666,  // 64 
-    0x55551111,  // 65 
-    0x11510055,  // 66 
+    0x00000000,  // 29 
+    0x55555550,  // 30 
+    0x05555555,  // 31 
+    0x66666650,  // 32 
+    0x00000660,  // 33 
+    0x11111110,  // 34 
+    0x16111111,  // 35 
+    0x16116116,  // 36 
+    0x00000555,  // 37 
+    0x00066555,  // 38 
+    0x77004444,  // 39 
+    0x77667667,  // 40 
+    0x66006111,  // 41 
+    0x11111555,  // 42 
+    0x55666622,  // 43 
+    0x55555551,  // 44 
+    0x11565555,  // 45 
+    0x17411111,  // 46 
+    0x15511111,  // 47 
+    0x55111171,  // 48 
+    0x57755522,  // 49 
+    0x66666666,  // 50 
+    0x40666666,  // 51 
+    0x55555515,  // 52 
+    0x55500111,  // 53 
+    0x11555555,  // 54 
+    0x00000051,  // 55 
+    0x55555522,  // 56 
+    0x67551111,  // 57 
+    0x00000566,  // 58 
+    0x11111511,  // 59 
+    0x11151111,  // 60 
+    0x00111115,  // 61 
+    0x06666666,  // 62 
+    0x06001115,  // 63 
+    0x55551111,  // 64 
+    0x11511155,  // 65 
+    0x11111115,  // 66 
     0x22661155,  // 67 
-    0x00000556,  // 68 
-    0x55501110,  // 69 
-    0x50055555,  // 70 
-    0x55555005,  // 71 
-    0x55555505,  // 72 
-    0x55000505,  // 73 
+    0x55501110,  // 68 
+    0x50055555,  // 69 
+    0x55555005,  // 70 
+    0x55555505,  // 71 
+    0x55000505,  // 72 
+    0x11510055,  // 73 
     0x10011111,  // 74 
     0x05111001,  // 75 
     0x10000000,  // 76 
     0x50550000,  // 77 
     0x22001155,  // 78 
     0x22227755,  // 79 
     0x00007722,  // 80 
     0x50000555,  // 81 
@@ -3368,17 +3677,17 @@ static const PRUint32 gGenCatPatPl0[] = 
     0x00155511,  // 89 
     0x50555555,  // 90 
     0x55505505,  // 91 
     0x10111111,  // 92 
     0x00111011,  // 93 
     0x00000005,  // 94 
     0x00000070,  // 95 
     0x11000000,  // 96 
-    0x00000057,  // 97 
+    0x22222257,  // 97 
     0x55505100,  // 98 
     0x55000555,  // 99 
     0x00555505,  // 100 
     0x55050550,  // 101 
     0x00055000,  // 102 
     0x11000055,  // 103 
     0x11000111,  // 104 
     0x00111101,  // 105 
@@ -3389,111 +3698,115 @@ static const PRUint32 gGenCatPatPl0[] = 
     0x55505555,  // 110 
     0x11500055,  // 111 
     0x11011111,  // 112 
     0x01100000,  // 113 
     0x00000055,  // 114 
     0x72222222,  // 115 
     0x55501100,  // 116 
     0x05000000,  // 117 
-    0x00000770,  // 118 
-    0x00222222,  // 119 
-    0x55555570,  // 120 
-    0x55555500,  // 121 
-    0x00505555,  // 122 
-    0x10000100,  // 123 
-    0x01011111,  // 124 
-    0x00061100,  // 125 
-    0x11115515,  // 126 
-    0x70000111,  // 127 
-    0x15555555,  // 128 
-    0x61111111,  // 129 
-    0x00006622,  // 130 
-    0x50050550,  // 131 
-    0x00500505,  // 132 
-    0x55550000,  // 133 
-    0x50505550,  // 134 
-    0x55505500,  // 135 
-    0x00511011,  // 136 
-    0x05055555,  // 137 
-    0x00111111,  // 138 
-    0x00550022,  // 139 
-    0x66667775,  // 140 
-    0x77777666,  // 141 
-    0x77777711,  // 142 
-    0x17172222,  // 143 
-    0x11666617,  // 144 
-    0x00055555,  // 145 
-    0x11611111,  // 146 
-    0x00005555,  // 147 
-    0x77011111,  // 148 
-    0x71777777,  // 149 
-    0x77077777,  // 150 
-    0x77766666,  // 151 
-    0x00000007,  // 152 
-    0x51111111,  // 153 
-    0x66666622,  // 154 
-    0x11555511,  // 155 
-    0x15511151,  // 156 
-    0x55111111,  // 157 
-    0x55511115,  // 158 
-    0x11111155,  // 159 
-    0x15111111,  // 160 
-    0x77111122,  // 161 
-    0x00056555,  // 162 
-    0x10000555,  // 163 
-    0x66666667,  // 164 
-    0x22222226,  // 165 
-    0x00022222,  // 166 
-    0x00000077,  // 167 
-    0x56655555,  // 168 
-    0x55555553,  // 169 
-    0x22666555,  // 170 
-    0x00000002,  // 171 
-    0x00011155,  // 172 
-    0x06611155,  // 173 
-    0x00001155,  // 174 
-    0x00001105,  // 175 
-    0x11445555,  // 176 
-    0x56661111,  // 177 
-    0x00157666,  // 178 
-    0x00000022,  // 179 
-    0x03111666,  // 180 
-    0x00000515,  // 181 
-    0x00001111,  // 182 
-    0x22660007,  // 183 
-    0x00000011,  // 184 
-    0x66000222,  // 185 
-    0x66001111,  // 186 
-    0x11155555,  // 187 
-    0x56666666,  // 188 
-    0x00666666,  // 189 
-    0x55511111,  // 190 
-    0x11115555,  // 191 
-    0x77777776,  // 192 
-    0x11111777,  // 193 
-    0x77771111,  // 194 
-    0x00077777,  // 195 
-    0x55555111,  // 196 
-    0x11111115,  // 197 
-    0x55000111,  // 198 
-    0x66666000,  // 199 
-    0x55500022,  // 200 
-    0x66555555,  // 201 
-    0x11116111,  // 202 
-    0x55155551,  // 203 
-    0x00000155,  // 204 
+    0x00000550,  // 118 
+    0x11500555,  // 119 
+    0x05111101,  // 120 
+    0x00222222,  // 121 
+    0x55555570,  // 122 
+    0x55555500,  // 123 
+    0x00505555,  // 124 
+    0x10000100,  // 125 
+    0x01011111,  // 126 
+    0x00061100,  // 127 
+    0x11115515,  // 128 
+    0x70000111,  // 129 
+    0x15555555,  // 130 
+    0x61111111,  // 131 
+    0x00006622,  // 132 
+    0x50050550,  // 133 
+    0x00500505,  // 134 
+    0x55550000,  // 135 
+    0x50505550,  // 136 
+    0x55505500,  // 137 
+    0x00511011,  // 138 
+    0x05055555,  // 139 
+    0x00111111,  // 140 
+    0x00550022,  // 141 
+    0x66667775,  // 142 
+    0x77777666,  // 143 
+    0x77777711,  // 144 
+    0x17172222,  // 145 
+    0x11666617,  // 146 
+    0x00055555,  // 147 
+    0x11611111,  // 148 
+    0x11155555,  // 149 
+    0x77011111,  // 150 
+    0x71777777,  // 151 
+    0x77077777,  // 152 
+    0x77766666,  // 153 
+    0x00000667,  // 154 
+    0x51111111,  // 155 
+    0x66666622,  // 156 
+    0x11555511,  // 157 
+    0x15511151,  // 158 
+    0x55111111,  // 159 
+    0x55511115,  // 160 
+    0x11111155,  // 161 
+    0x15111111,  // 162 
+    0x77111122,  // 163 
+    0x00555555,  // 164 
+    0x00056555,  // 165 
+    0x11100555,  // 166 
+    0x66666667,  // 167 
+    0x22222226,  // 168 
+    0x00022222,  // 169 
+    0x00000077,  // 170 
+    0x56655555,  // 171 
+    0x55555553,  // 172 
+    0x22666555,  // 173 
+    0x00000002,  // 174 
+    0x00011155,  // 175 
+    0x06611155,  // 176 
+    0x00001155,  // 177 
+    0x00001105,  // 178 
+    0x11445555,  // 179 
+    0x56661111,  // 180 
+    0x00157666,  // 181 
+    0x00000022,  // 182 
+    0x03111666,  // 183 
+    0x00000515,  // 184 
+    0x00001111,  // 185 
+    0x22660007,  // 186 
+    0x00005555,  // 187 
+    0x00000011,  // 188 
+    0x77000222,  // 189 
+    0x66001111,  // 190 
+    0x01111111,  // 191 
+    0x56666666,  // 192 
+    0x00666666,  // 193 
+    0x55511111,  // 194 
+    0x11115555,  // 195 
+    0x77777776,  // 196 
+    0x11111777,  // 197 
+    0x77771111,  // 198 
+    0x00077777,  // 199 
+    0x55555111,  // 200 
+    0x55000111,  // 201 
+    0x66660000,  // 202 
+    0x66666000,  // 203 
+    0x55500022,  // 204 
+    0x66555555,  // 205 
+    0x11116111,  // 206 
+    0x55155551,  // 207 
+    0x00000155,  // 208 
 }; 
 
 static const PRUint32 gGenCatPatPl1[] = {
     0x55555555,  // 0 
     0x11111111,  // 1 
     0x01111111,  // 2 
     0x00000000,  // 3 
-    0x11100000,  // 4 
+    0x11110000,  // 4 
     0x00555555,  // 5 
     0x50505050,  // 6 
     0x55055555,  // 7 
     0x75755555,  // 8 
     0x55055577,  // 9 
     0x77755555,  // 10 
     0x55005555,  // 11 
     0x77705555,  // 12 
@@ -3509,191 +3822,193 @@ static const PRUint32 gGenCatPatPl1[] = 
     0x00044444,  // 22 
     0x44444400,  // 23 
     0x22220052,  // 24 
     0x56677722,  // 25 
     0x22222222,  // 26 
     0x06677722,  // 27 
     0x00055555,  // 28 
     0x77777777,  // 29 
-    0x00000007,  // 30 
+    0x00000077,  // 30 
     0x00000001,  // 31 
     0x57777577,  // 32 
     0x55555577,  // 33 
     0x77575555,  // 34 
     0x77555557,  // 35 
     0x75757777,  // 36 
     0x57555575,  // 37 
     0x55557755,  // 38 
     0x55577777,  // 39 
     0x75777755,  // 40 
     0x22255222,  // 41 
     0x00000022,  // 42 
     0x77777667,  // 43 
-    0x07777777,  // 44 
-    0x00000777,  // 45 
-    0x77772222,  // 46 
-    0x22222277,  // 47 
-    0x70777777,  // 48 
-    0x00007077,  // 49 
-    0x77077770,  // 50 
-    0x77770077,  // 51 
-    0x77777770,  // 52 
-    0x70707777,  // 53 
-    0x77000777,  // 54 
-    0x22666666,  // 55 
-    0x00072222,  // 56 
-    0x76677777,  // 57 
-    0x00070777,  // 58 
-    0x66777777,  // 59 
-    0x66666777,  // 60 
-    0x77777776,  // 61 
-    0x77776666,  // 62 
-    0x77667777,  // 63 
-    0x00077777,  // 64 
-    0x00000077,  // 65 
-    0x05555555,  // 66 
-    0x15555777,  // 67 
-    0x00000011,  // 68 
-    0x66266660,  // 69 
-    0x50000000,  // 70 
-    0x56666666,  // 71 
-    0x00000066,  // 72 
-    0x77777077,  // 73 
-    0x00007777,  // 74 
-    0x00777777,  // 75 
-    0x25576663,  // 76 
-    0x66667766,  // 77 
-    0x22222227,  // 78 
-    0x11111122,  // 79 
-    0x77555556,  // 80 
-    0x77655222,  // 81 
-    0x55555550,  // 82 
-    0x55577110,  // 83 
-    0x55555556,  // 84 
-    0x55556555,  // 85 
-    0x55500000,  // 86 
-    0x77222277,  // 87 
-    0x77777722,  // 88 
-    0x66555555,  // 89 
-    0x66655555,  // 90 
-    0x00005522,  // 91 
-    0x55555500,  // 92 
-    0x15555555,  // 93 
-    0x00006111,  // 94 
-    0x56110000,  // 95 
-    0x22555555,  // 96 
-    0x66666611,  // 97 
-    0x57777777,  // 98 
-    0x00055775,  // 99 
-    0x55555000,  // 100 
-    0x51555155,  // 101 
-    0x55551555,  // 102 
-    0x11111555,  // 103 
-    0x77222222,  // 104 
-    0x66665555,  // 105 
-    0x55555511,  // 106 
-    0x11115555,  // 107 
-    0x00011111,  // 108 
-    0x66000000,  // 109 
-    0x00005666,  // 110 
-    0x55555522,  // 111 
-    0x11555555,  // 112 
-    0x66111111,  // 113 
-    0x00001111,  // 114 
-    0x60000000,  // 115 
-    0x55551111,  // 116 
-    0x66666661,  // 117 
-    0x50666666,  // 118 
-    0x66000022,  // 119 
-    0x11111115,  // 120 
-    0x00115555,  // 121 
-    0x66660022,  // 122 
-    0x75555555,  // 123 
-    0x00001577,  // 124 
-    0x15511151,  // 125 
-    0x11555551,  // 126 
-    0x00000515,  // 127 
-    0x66555000,  // 128 
-    0x00116111,  // 129 
-    0x00005555,  // 130 
-    0x51500000,  // 131 
-    0x55555575,  // 132 
-    0x05055555,  // 133 
-    0x55055055,  // 134 
-    0x00000055,  // 135 
-    0x00775555,  // 136 
-    0x66660666,  // 137 
-    0x07776766,  // 138 
-    0x00006676,  // 139 
-    0x40055555,  // 140 
-    0x66676660,  // 141 
-    0x66667666,  // 142 
-    0x67776622,  // 143 
-    0x67666555,  // 144 
-    0x55555557,  // 145 
-    0x67676555,  // 146 
-    0x55666666,  // 147 
-    0x00055500,  // 148 
-    0x00774440,  // 149 
-    0x55505555,  // 150 
-    0x50550555,  // 151 
-    0x00000555,  // 152 
-    0x20000766,  // 153 
-    0x70002222,  // 154 
-    0x77777772,  // 155 
-    0x00000277,  // 156 
-    0x00177777,  // 157 
-    0x00000005,  // 158 
-    0x00002222,  // 159 
-    0x55555525,  // 160 
-    0x00000255,  // 161 
-    0x60555555,  // 162 
-    0x00222226,  // 163 
-    0x55555505,  // 164 
-    0x50555555,  // 165 
-    0x50050005,  // 166 
-    0x60002222,  // 167 
-    0x60000055,  // 168 
-    0x01101115,  // 169 
-    0x11110000,  // 170 
-    0x10000111,  // 171 
-    0x00000006,  // 172 
-    0x62255555,  // 173 
-    0x66666660,  // 174 
-    0x02222222,  // 175 
-    0x55555111,  // 176 
-    0x66466111,  // 177 
-    0x00000222,  // 178 
-    0x00006666,  // 179 
-    0x11177777,  // 180 
-    0x11177711,  // 181 
-    0x44444111,  // 182 
-    0x11111444,  // 183 
-    0x11177111,  // 184 
-    0x77771111,  // 185 
-    0x77111177,  // 186 
-    0x00711177,  // 187 
-    0x05500500,  // 188 
-    0x55055550,  // 189 
-    0x55505055,  // 190 
-    0x55500555,  // 191 
-    0x05555055,  // 192 
-    0x55557555,  // 193 
-    0x55755555,  // 194 
-    0x22005555,  // 195 
-    0x00000070,  // 196 
-    0x70700000,  // 197 
-    0x07000700,  // 198 
-    0x07777700,  // 199 
-    0x70000000,  // 200 
-    0x70077070,  // 201 
-    0x00777700,  // 202 
-    0x00000040,  // 203 
-    0x44444444,  // 204 
+    0x00007777,  // 44 
+    0x07777777,  // 45 
+    0x00000777,  // 46 
+    0x77772222,  // 47 
+    0x22222277,  // 48 
+    0x77777770,  // 49 
+    0x22666666,  // 50 
+    0x76677777,  // 51 
+    0x77070777,  // 52 
+    0x66777777,  // 53 
+    0x66666777,  // 54 
+    0x77777776,  // 55 
+    0x77776666,  // 56 
+    0x77667777,  // 57 
+    0x00077777,  // 58 
+    0x05555555,  // 59 
+    0x15555777,  // 60 
+    0x00000011,  // 61 
+    0x66266660,  // 62 
+    0x50000000,  // 63 
+    0x00000006,  // 64 
+    0x10000000,  // 65 
+    0x56666666,  // 66 
+    0x00000066,  // 67 
+    0x77777077,  // 68 
+    0x00777777,  // 69 
+    0x25576663,  // 70 
+    0x66667766,  // 71 
+    0x22222227,  // 72 
+    0x11111122,  // 73 
+    0x77555556,  // 74 
+    0x77655222,  // 75 
+    0x55555550,  // 76 
+    0x55577110,  // 77 
+    0x55555556,  // 78 
+    0x55556555,  // 79 
+    0x55500000,  // 80 
+    0x77222277,  // 81 
+    0x00000555,  // 82 
+    0x77777722,  // 83 
+    0x66555555,  // 84 
+    0x66655555,  // 85 
+    0x00005522,  // 86 
+    0x15555555,  // 87 
+    0x00006111,  // 88 
+    0x56110000,  // 89 
+    0x22555555,  // 90 
+    0x66666611,  // 91 
+    0x57777777,  // 92 
+    0x05555775,  // 93 
+    0x00000055,  // 94 
+    0x55555500,  // 95 
+    0x51555155,  // 96 
+    0x55551555,  // 97 
+    0x11111555,  // 98 
+    0x77222222,  // 99 
+    0x66665555,  // 100 
+    0x55555511,  // 101 
+    0x11115555,  // 102 
+    0x00011111,  // 103 
+    0x66000000,  // 104 
+    0x00005666,  // 105 
+    0x55555522,  // 106 
+    0x11555555,  // 107 
+    0x66111111,  // 108 
+    0x00001111,  // 109 
+    0x60000000,  // 110 
+    0x55551111,  // 111 
+    0x66666661,  // 112 
+    0x50666666,  // 113 
+    0x66000022,  // 114 
+    0x11111115,  // 115 
+    0x00115555,  // 116 
+    0x66660022,  // 117 
+    0x75555555,  // 118 
+    0x00001577,  // 119 
+    0x15511151,  // 120 
+    0x11555551,  // 121 
+    0x00000515,  // 122 
+    0x66555000,  // 123 
+    0x05555550,  // 124 
+    0x00116111,  // 125 
+    0x55555000,  // 126 
+    0x00005555,  // 127 
+    0x51500000,  // 128 
+    0x55555575,  // 129 
+    0x05055555,  // 130 
+    0x55055055,  // 131 
+    0x77777755,  // 132 
+    0x00775555,  // 133 
+    0x66660666,  // 134 
+    0x07776766,  // 135 
+    0x00006676,  // 136 
+    0x40055555,  // 137 
+    0x66676660,  // 138 
+    0x66667666,  // 139 
+    0x67776622,  // 140 
+    0x67666555,  // 141 
+    0x55555557,  // 142 
+    0x67676555,  // 143 
+    0x55666666,  // 144 
+    0x00055500,  // 145 
+    0x00774440,  // 146 
+    0x55505555,  // 147 
+    0x50550555,  // 148 
+    0x20000766,  // 149 
+    0x70002222,  // 150 
+    0x77777772,  // 151 
+    0x00000277,  // 152 
+    0x00177777,  // 153 
+    0x00000005,  // 154 
+    0x00002222,  // 155 
+    0x55555525,  // 156 
+    0x00000255,  // 157 
+    0x60555555,  // 158 
+    0x00222226,  // 159 
+    0x55555505,  // 160 
+    0x50555555,  // 161 
+    0x50050005,  // 162 
+    0x60002222,  // 163 
+    0x60000055,  // 164 
+    0x01101115,  // 165 
+    0x10000111,  // 166 
+    0x62255555,  // 167 
+    0x66666660,  // 168 
+    0x02222222,  // 169 
+    0x55555111,  // 170 
+    0x61111111,  // 171 
+    0x00666666,  // 172 
+    0x22222200,  // 173 
+    0x66466111,  // 174 
+    0x00000222,  // 175 
+    0x00006666,  // 176 
+    0x11177777,  // 177 
+    0x11177711,  // 178 
+    0x44444111,  // 179 
+    0x11111444,  // 180 
+    0x11177111,  // 181 
+    0x77771111,  // 182 
+    0x77111177,  // 183 
+    0x00711177,  // 184 
+    0x05500500,  // 185 
+    0x55055550,  // 186 
+    0x55505055,  // 187 
+    0x55500555,  // 188 
+    0x05555055,  // 189 
+    0x55557555,  // 190 
+    0x55755555,  // 191 
+    0x22005555,  // 192 
+    0x77000000,  // 193 
+    0x00000007,  // 194 
+    0x70777777,  // 195 
+    0x77077777,  // 196 
+    0x77777707,  // 197 
+    0x00077770,  // 198 
+    0x77777000,  // 199 
+    0x07077707,  // 200 
+    0x07770707,  // 201 
+    0x00707777,  // 202 
+    0x77707777,  // 203 
+    0x77700007,  // 204 
+    0x00000040,  // 205 
+    0x44444444,  // 206 
 }; 
 
 static PRUint8 GetCat(PRUint32 u)
 {
     PRUint32 pat;
     //
     //  Handle block which use index table mapping    
     //
@@ -3710,109 +4025,115 @@ static PRUint8 GetCat(PRUint32 u)
     }
 
     // Handle U+004DC0 to U+004DFF
     if(0x004DC0 <= u && u <= 0x004DFF) {
         pat = gGenCatPatPl1[gGenCatIdx3 [( u - 0x004DC0 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
-    // Handle U+00A000 to U+00AAFF
-    if(0x00A000 <= u && u <= 0x00AAFF) {
+    // Handle U+00A000 to U+00ABFF
+    if(0x00A000 <= u && u <= 0x00ABFF) {
         pat = gGenCatPatPl1[gGenCatIdx4 [( u - 0x00A000 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
-    // Handle U+00ABC0 to U+00ABFF
-    if(0x00ABC0 <= u && u <= 0x00ABFF) {
-        pat = gGenCatPatPl1[gGenCatIdx5 [( u - 0x00ABC0 ) / 8]];
-        return (pat  >> ((u % 8) * 4)) & 0x0F;
-    }
-
     // Handle U+00D7B0 to U+00D7FF
     if(0x00D7B0 <= u && u <= 0x00D7FF) {
-        pat = gGenCatPatPl1[gGenCatIdx6 [( u - 0x00D7B0 ) / 8]];
+        pat = gGenCatPatPl1[gGenCatIdx5 [( u - 0x00D7B0 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+00F900 to U+00FFFF
     if(0x00F900 <= u && u <= 0x00FFFF) {
-        pat = gGenCatPatPl1[gGenCatIdx7 [( u - 0x00F900 ) / 8]];
+        pat = gGenCatPatPl1[gGenCatIdx6 [( u - 0x00F900 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+010000 to U+0104AF
     if(0x010000 <= u && u <= 0x0104AF) {
-        pat = gGenCatPatPl1[gGenCatIdx8 [( u - 0x010000 ) / 8]];
+        pat = gGenCatPatPl1[gGenCatIdx7 [( u - 0x010000 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+010800 to U+01085F
     if(0x010800 <= u && u <= 0x01085F) {
-        pat = gGenCatPatPl1[gGenCatIdx9 [( u - 0x010800 ) / 8]];
+        pat = gGenCatPatPl1[gGenCatIdx8 [( u - 0x010800 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+010900 to U+01093F
     if(0x010900 <= u && u <= 0x01093F) {
-        pat = gGenCatPatPl1[gGenCatIdx10 [( u - 0x010900 ) / 8]];
+        pat = gGenCatPatPl1[gGenCatIdx9 [( u - 0x010900 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+010A00 to U+010C4F
     if(0x010A00 <= u && u <= 0x010C4F) {
-        pat = gGenCatPatPl1[gGenCatIdx11 [( u - 0x010A00 ) / 8]];
+        pat = gGenCatPatPl1[gGenCatIdx10 [( u - 0x010A00 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+010E60 to U+010E7F
     if(0x010E60 <= u && u <= 0x010E7F) {
-        pat = gGenCatPatPl1[gGenCatIdx12 [( u - 0x010E60 ) / 8]];
+        pat = gGenCatPatPl1[gGenCatIdx11 [( u - 0x010E60 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
-    // Handle U+011080 to U+0110CF
-    if(0x011080 <= u && u <= 0x0110CF) {
-        pat = gGenCatPatPl1[gGenCatIdx13 [( u - 0x011080 ) / 8]];
+    // Handle U+011000 to U+0110CF
+    if(0x011000 <= u && u <= 0x0110CF) {
+        pat = gGenCatPatPl1[gGenCatIdx12 [( u - 0x011000 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+012000 to U+01247F
     if(0x012000 <= u && u <= 0x01247F) {
-        pat = gGenCatPatPl1[gGenCatIdx14 [( u - 0x012000 ) / 8]];
+        pat = gGenCatPatPl1[gGenCatIdx13 [( u - 0x012000 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+013000 to U+01342F
     if(0x013000 <= u && u <= 0x01342F) {
-        pat = gGenCatPatPl1[gGenCatIdx15 [( u - 0x013000 ) / 8]];
+        pat = gGenCatPatPl1[gGenCatIdx14 [( u - 0x013000 ) / 8]];
+        return (pat  >> ((u % 8) * 4)) & 0x0F;
+    }
+
+    // Handle U+016800 to U+016AFF
+    if(0x016800 <= u && u <= 0x016AFF) {
+        pat = gGenCatPatPl1[gGenCatIdx15 [( u - 0x016800 ) / 8]];
+        return (pat  >> ((u % 8) * 4)) & 0x0F;
+    }
+
+    // Handle U+01B000 to U+01B01F
+    if(0x01B000 <= u && u <= 0x01B01F) {
+        pat = gGenCatPatPl1[gGenCatIdx16 [( u - 0x01B000 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+01D000 to U+01D7FF
     if(0x01D000 <= u && u <= 0x01D7FF) {
-        pat = gGenCatPatPl1[gGenCatIdx16 [( u - 0x01D000 ) / 8]];
+        pat = gGenCatPatPl1[gGenCatIdx17 [( u - 0x01D000 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
-    // Handle U+01F000 to U+01F24F
-    if(0x01F000 <= u && u <= 0x01F24F) {
-        pat = gGenCatPatPl1[gGenCatIdx17 [( u - 0x01F000 ) / 8]];
+    // Handle U+01F000 to U+01F77F
+    if(0x01F000 <= u && u <= 0x01F77F) {
+        pat = gGenCatPatPl1[gGenCatIdx18 [( u - 0x01F000 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+0E0000 to U+0E007F
     if(0x0E0000 <= u && u <= 0x0E007F) {
-        pat = gGenCatPatPl1[gGenCatIdx18 [( u - 0x0E0000 ) / 8]];
+        pat = gGenCatPatPl1[gGenCatIdx19 [( u - 0x0E0000 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     // Handle U+0E0100 to U+0E01EF
     if(0x0E0100 <= u && u <= 0x0E01EF) {
-        pat = gGenCatPatPl1[gGenCatIdx19 [( u - 0x0E0100 ) / 8]];
+        pat = gGenCatPatPl1[gGenCatIdx20 [( u - 0x0E0100 ) / 8]];
         return (pat  >> ((u % 8) * 4)) & 0x0F;
     }
 
     //
     //  Handle blocks which share the same category 
     //
     // Handle CJK Ideograph Extension A block 
     if(0x3400 <= u && u <= 0x4DB5) 
@@ -3857,23 +4178,27 @@ static PRUint8 GetCat(PRUint32 u)
     // Handle CJK Ideograph Extension B block 
     if(0x20000 <= u && u <= 0x2A6D6) 
         return 5; 
 
     // Handle CJK Ideograph Extension C block 
     if(0x2A700 <= u && u <= 0x2B734) 
         return 5; 
 
+    // Handle CJK Ideograph Extension D block 
+    if(0x2B740 <= u && u <= 0x2B81D) 
+        return 5; 
+
     // Handle CJK Compatibility #4 block 
     if(0x2F800 <= u && u <= 0x2FA1D) 
         return 5; 
 
     // Handle Plane 15 Private Use block 
     if(0xF0000 <= u && u <= 0xFFFFD) 
         return 4; 
 
     // Handle Plane 16 Private Use block 
     if(0x100000 <= u && u <= 0x10FFFD) 
         return 4; 
 
     return 0; // UNDEFINE 
 }
-// total data size = 4818
+// total data size = 5148
--- a/intl/unicharutil/tables/transliterate.properties
+++ b/intl/unicharutil/tables/transliterate.properties
@@ -452,16 +452,22 @@ entity.2919=1
 entity.2920=2
 entity.2921=3
 entity.2922=4
 entity.2923=5
 entity.2924=6
 entity.2925=7
 entity.2926=8
 entity.2927=9
+entity.2930=[1/4]
+entity.2931=[1/2]
+entity.2932=[3/4]
+entity.2933=[1/16]
+entity.2934=[1/8]
+entity.2935=[3/16]
 entity.3046=0
 entity.3047=1
 entity.3048=2
 entity.3049=3
 entity.3050=4
 entity.3051=5
 entity.3052=6
 entity.3053=7
@@ -641,17 +647,17 @@ entity.6609=1
 entity.6610=2
 entity.6611=3
 entity.6612=4
 entity.6613=5
 entity.6614=6
 entity.6615=7
 entity.6616=8
 entity.6617=9
-entity.6618=1
+entity.6618=[1]
 entity.6784=0
 entity.6785=1
 entity.6786=2
 entity.6787=3
 entity.6788=4
 entity.6789=5
 entity.6790=6
 entity.6791=7
@@ -1034,16 +1040,24 @@ entity.8330=v(+)
 entity.8332=v(=)
 entity.8333=v(()
 entity.8334=v())
 entity.8336=v(a)
 entity.8337=v(e)
 entity.8338=v(o)
 entity.8339=v(x)
 entity.8340=schwa
+entity.8341=v(h)
+entity.8342=v(k)
+entity.8343=v(l)
+entity.8344=v(m)
+entity.8345=v(n)
+entity.8346=v(p)
+entity.8347=v(s)
+entity.8348=v(t)
 entity.8360=Rs
 entity.8448=a/c
 entity.8449=a/s
 entity.8450=C
 entity.8453=c/o
 entity.8454=c/u
 entity.8458=g
 entity.8459=H
@@ -1765,16 +1779,46 @@ entity.69238=[500]
 entity.69239=[600]
 entity.69240=[700]
 entity.69241=[800]
 entity.69242=[900]
 entity.69243=[1/2]
 entity.69244=[1/4]
 entity.69245=[1/3]
 entity.69246=[2/3]
+entity.69714=[1]
+entity.69715=[2]
+entity.69716=[3]
+entity.69717=[4]
+entity.69718=[5]
+entity.69719=[6]
+entity.69720=[7]
+entity.69721=[8]
+entity.69722=[9]
+entity.69723=[10]
+entity.69724=[20]
+entity.69725=[30]
+entity.69726=[40]
+entity.69727=[50]
+entity.69728=[60]
+entity.69729=[70]
+entity.69730=[80]
+entity.69731=[90]
+entity.69732=[100]
+entity.69733=[1000]
+entity.69734=0
+entity.69735=1
+entity.69736=2
+entity.69737=3
+entity.69738=4
+entity.69739=5
+entity.69740=6
+entity.69741=7
+entity.69742=8
+entity.69743=9
 entity.74752=[2]
 entity.74753=[3]
 entity.74754=[4]
 entity.74755=[5]
 entity.74756=[6]
 entity.74757=[7]
 entity.74758=[8]
 entity.74759=[9]
--- a/intl/unicharutil/tests/unit/test_bug_427350_1.js
+++ b/intl/unicharutil/tests/unit/test_bug_427350_1.js
@@ -1,9 +1,9 @@
-/* Tests transliteration of new characters in Unicode 5.1 and 5.2
+/* Tests transliteration of new characters in Unicode 5.1, 5.2, and 6.0
  */
 
 const inTeluguFractions = "\u0C78\u0C79\u0C7A\u0C7B\u0C7C\u0C7D\u0C7E";
 const inMalayalamNumbers = "\u0D70\u0D71\u0D72\u0D73\u0D74\u0D75";
 
 /* MYANMAR SHAN DIGIT ONE,
    SUNDANESE DIGIT TWO,
    LEPCHA DIGIT THREE,
@@ -11,23 +11,23 @@ const inMalayalamNumbers = "\u0D70\u0D71
    VAI DIGIT FIVE,
    SAURASHTRA DIGIT SIX
    KAYAH LI DIGIT SEVEN
    CHAM DIGIT EIGHT
    JAVANESE DIGIT NINE 
    MEETEI MAYEK DIGIT ZERO */
 const inDigits = "\u1091\u1BB2\u1C43\u1C54\uA625\uA8D6\uA907\uAA58\uA9D9\uABF0";
 const inRomanNumerals = "\u2185\u2186\u2187\u2188";
-const inSuperSubscripts = "\u2C7C\u2C7D";
+const inSuperSubscripts = "\u2C7C\u2C7D\u2095\u209C";
     
 const expectedTeluguFractions = "[0][1][2][3][1][2][3]";
 const expectedMalayalamNumbers = "[10][100][1000][1/4][1/2][3/4]";
 const expectedDigits = "1234567890";
 const expectedRomanNumerals = "[6][50][50000][100000]";
-const expectedSuperSubscripts = "v(j)^(V)";
+const expectedSuperSubscripts = "v(j)^(V)v(h)v(t)";
 
 const EntityAfterCharsetConv = 512;
 const transliterate = 8;
 
 const charset = "ISO-8859-1";
     
 function run_test() {
     var SaveAsCharset =
--- a/intl/unicharutil/tools/gencattable.pl
+++ b/intl/unicharutil/tools/gencattable.pl
@@ -223,30 +223,31 @@ while(<UNICODATA>) {
 # planes. If you change the value of $planeSplit, make sure that none of the
 # ranges below straddles the new value!
 $planeSplit = 0x1d00;
 
 @range = (
   0x0000, 0x1cff,
   0x1d00, 0x33ff,
   0x4dc0, 0x4dff,
-  0xa000, 0xaaff,
-  0xabc0, 0xabff,
+  0xa000, 0xabff,
   0xd7b0, 0xd7ff,
   0xf900, 0xffff,
   0x10000, 0x104af,
   0x10800, 0x1085f,
   0x10900, 0x1093f,
   0x10a00, 0x10c4f,
   0x10e60, 0x10e7f,
-  0x11080, 0x110cf,
+  0x11000, 0x110cf,
   0x12000, 0x1247f,
   0x13000, 0x1342f,
+  0x16800, 0x16aff,
+  0x1b000, 0x1b01f,
   0x1d000, 0x1d7ff,
-  0x1f000, 0x1f24f,
+  0x1f000, 0x1f77f,
   0xe0000, 0xe007f,
   0xe0100, 0xe01ef
 );
 
 
 $totaldata = 0;
 
 $tt=($#range+1) / 2;
--- a/intl/unicharutil/util/bidicattable.h
+++ b/intl/unicharutil/util/bidicattable.h
@@ -242,40 +242,40 @@ static PRUint8 gBidiCatIdx1[1664] = {
      45,  /* U+0618 - U+061F : 0x33333AAA */
       3,  /* U+0620 - U+0627 : 0x33333333 */
       3,  /* U+0628 - U+062F : 0x33333333 */
       3,  /* U+0630 - U+0637 : 0x33333333 */
       3,  /* U+0638 - U+063F : 0x33333333 */
       3,  /* U+0640 - U+0647 : 0x33333333 */
      46,  /* U+0648 - U+064F : 0xAAAAA333 */
      10,  /* U+0650 - U+0657 : 0xAAAAAAAA */
-     47,  /* U+0658 - U+065F : 0x3AAAAAAA */
+     10,  /* U+0658 - U+065F : 0xAAAAAAAA */
       4,  /* U+0660 - U+0667 : 0x44444444 */
-     48,  /* U+0668 - U+066F : 0x33344744 */
-     49,  /* U+0670 - U+0677 : 0x3333333A */
+     47,  /* U+0668 - U+066F : 0x33344744 */
+     48,  /* U+0670 - U+0677 : 0x3333333A */
       3,  /* U+0678 - U+067F : 0x33333333 */
       3,  /* U+0680 - U+0687 : 0x33333333 */
       3,  /* U+0688 - U+068F : 0x33333333 */
       3,  /* U+0690 - U+0697 : 0x33333333 */
       3,  /* U+0698 - U+069F : 0x33333333 */
       3,  /* U+06A0 - U+06A7 : 0x33333333 */
       3,  /* U+06A8 - U+06AF : 0x33333333 */
       3,  /* U+06B0 - U+06B7 : 0x33333333 */
       3,  /* U+06B8 - U+06BF : 0x33333333 */
       3,  /* U+06C0 - U+06C7 : 0x33333333 */
       3,  /* U+06C8 - U+06CF : 0x33333333 */
-     50,  /* U+06D0 - U+06D7 : 0xAA333333 */
-     51,  /* U+06D8 - U+06DF : 0xAA4AAAAA */
-     52,  /* U+06E0 - U+06E7 : 0xA33AAAAA */
-     53,  /* U+06E8 - U+06EF : 0x33AAAA9A */
+     49,  /* U+06D0 - U+06D7 : 0xAA333333 */
+     50,  /* U+06D8 - U+06DF : 0xA94AAAAA */
+     51,  /* U+06E0 - U+06E7 : 0xA33AAAAA */
+     52,  /* U+06E8 - U+06EF : 0x33AAAA9A */
       5,  /* U+06F0 - U+06F7 : 0x55555555 */
-     54,  /* U+06F8 - U+06FF : 0x33333355 */
+     53,  /* U+06F8 - U+06FF : 0x33333355 */
       3,  /* U+0700 - U+0707 : 0x33333333 */
-     55,  /* U+0708 - U+070F : 0xB3333333 */
-     56,  /* U+0710 - U+0717 : 0x333333A3 */
+     54,  /* U+0708 - U+070F : 0x43333333 */
+     55,  /* U+0710 - U+0717 : 0x333333A3 */
       3,  /* U+0718 - U+071F : 0x33333333 */
       3,  /* U+0720 - U+0727 : 0x33333333 */
       3,  /* U+0728 - U+072F : 0x33333333 */
      10,  /* U+0730 - U+0737 : 0xAAAAAAAA */
      10,  /* U+0738 - U+073F : 0xAAAAAAAA */
      10,  /* U+0740 - U+0747 : 0xAAAAAAAA */
      45,  /* U+0748 - U+074F : 0x33333AAA */
       3,  /* U+0750 - U+0757 : 0x33333333 */
@@ -283,40 +283,40 @@ static PRUint8 gBidiCatIdx1[1664] = {
       3,  /* U+0760 - U+0767 : 0x33333333 */
       3,  /* U+0768 - U+076F : 0x33333333 */
       3,  /* U+0770 - U+0777 : 0x33333333 */
       3,  /* U+0778 - U+077F : 0x33333333 */
       3,  /* U+0780 - U+0787 : 0x33333333 */
       3,  /* U+0788 - U+078F : 0x33333333 */
       3,  /* U+0790 - U+0797 : 0x33333333 */
       3,  /* U+0798 - U+079F : 0x33333333 */
-     50,  /* U+07A0 - U+07A7 : 0xAA333333 */
+     49,  /* U+07A0 - U+07A7 : 0xAA333333 */
      10,  /* U+07A8 - U+07AF : 0xAAAAAAAA */
-     49,  /* U+07B0 - U+07B7 : 0x3333333A */
+     48,  /* U+07B0 - U+07B7 : 0x3333333A */
       3,  /* U+07B8 - U+07BF : 0x33333333 */
       2,  /* U+07C0 - U+07C7 : 0x22222222 */
       2,  /* U+07C8 - U+07CF : 0x22222222 */
       2,  /* U+07D0 - U+07D7 : 0x22222222 */
       2,  /* U+07D8 - U+07DF : 0x22222222 */
       2,  /* U+07E0 - U+07E7 : 0x22222222 */
-     57,  /* U+07E8 - U+07EF : 0xAAAAA222 */
-     58,  /* U+07F0 - U+07F7 : 0x9922AAAA */
-     59,  /* U+07F8 - U+07FF : 0x22222299 */
+     56,  /* U+07E8 - U+07EF : 0xAAAAA222 */
+     57,  /* U+07F0 - U+07F7 : 0x9922AAAA */
+     58,  /* U+07F8 - U+07FF : 0x22222299 */
       2,  /* U+0800 - U+0807 : 0x22222222 */
       2,  /* U+0808 - U+080F : 0x22222222 */
-     60,  /* U+0810 - U+0817 : 0xAA222222 */
-     61,  /* U+0818 - U+081F : 0xAAAAA2AA */
-     62,  /* U+0820 - U+0827 : 0xAAA2AAAA */
-     63,  /* U+0828 - U+082F : 0x22AAAAA2 */
+     59,  /* U+0810 - U+0817 : 0xAA222222 */
+     60,  /* U+0818 - U+081F : 0xAAAAA2AA */
+     61,  /* U+0820 - U+0827 : 0xAAA2AAAA */
+     62,  /* U+0828 - U+082F : 0x22AAAAA2 */
       2,  /* U+0830 - U+0837 : 0x22222222 */
       2,  /* U+0838 - U+083F : 0x22222222 */
       2,  /* U+0840 - U+0847 : 0x22222222 */
       2,  /* U+0848 - U+084F : 0x22222222 */
       2,  /* U+0850 - U+0857 : 0x22222222 */
-      2,  /* U+0858 - U+085F : 0x22222222 */
+     63,  /* U+0858 - U+085F : 0x2222AAA2 */
       2,  /* U+0860 - U+0867 : 0x22222222 */
       2,  /* U+0868 - U+086F : 0x22222222 */
       2,  /* U+0870 - U+0877 : 0x22222222 */
       2,  /* U+0878 - U+087F : 0x22222222 */
       2,  /* U+0880 - U+0887 : 0x22222222 */
       2,  /* U+0888 - U+088F : 0x22222222 */
       2,  /* U+0890 - U+0897 : 0x22222222 */
       2,  /* U+0898 - U+089F : 0x22222222 */
@@ -334,86 +334,86 @@ static PRUint8 gBidiCatIdx1[1664] = {
       2,  /* U+08F8 - U+08FF : 0x22222222 */
      64,  /* U+0900 - U+0907 : 0x11111AAA */
       1,  /* U+0908 - U+090F : 0x11111111 */
       1,  /* U+0910 - U+0917 : 0x11111111 */
       1,  /* U+0918 - U+091F : 0x11111111 */
       1,  /* U+0920 - U+0927 : 0x11111111 */
       1,  /* U+0928 - U+092F : 0x11111111 */
       1,  /* U+0930 - U+0937 : 0x11111111 */
-     65,  /* U+0938 - U+093F : 0x111A1111 */
+     65,  /* U+0938 - U+093F : 0x111A1A11 */
      66,  /* U+0940 - U+0947 : 0xAAAAAAA1 */
      67,  /* U+0948 - U+094F : 0x11A1111A */
-     68,  /* U+0950 - U+0957 : 0x11AAAAA1 */
+     66,  /* U+0950 - U+0957 : 0xAAAAAAA1 */
       1,  /* U+0958 - U+095F : 0x11111111 */
-     69,  /* U+0960 - U+0967 : 0x1111AA11 */
+     68,  /* U+0960 - U+0967 : 0x1111AA11 */
       1,  /* U+0968 - U+096F : 0x11111111 */
       1,  /* U+0970 - U+0977 : 0x11111111 */
       1,  /* U+0978 - U+097F : 0x11111111 */
-     70,  /* U+0980 - U+0987 : 0x111111A1 */
+     69,  /* U+0980 - U+0987 : 0x111111A1 */
       1,  /* U+0988 - U+098F : 0x11111111 */
       1,  /* U+0990 - U+0997 : 0x11111111 */
       1,  /* U+0998 - U+099F : 0x11111111 */
       1,  /* U+09A0 - U+09A7 : 0x11111111 */
       1,  /* U+09A8 - U+09AF : 0x11111111 */
       1,  /* U+09B0 - U+09B7 : 0x11111111 */
-     65,  /* U+09B8 - U+09BF : 0x111A1111 */
+     70,  /* U+09B8 - U+09BF : 0x111A1111 */
      71,  /* U+09C0 - U+09C7 : 0x111AAAA1 */
      72,  /* U+09C8 - U+09CF : 0x11A11111 */
       1,  /* U+09D0 - U+09D7 : 0x11111111 */
       1,  /* U+09D8 - U+09DF : 0x11111111 */
-     69,  /* U+09E0 - U+09E7 : 0x1111AA11 */
+     68,  /* U+09E0 - U+09E7 : 0x1111AA11 */
       1,  /* U+09E8 - U+09EF : 0x11111111 */
      73,  /* U+09F0 - U+09F7 : 0x11117711 */
      74,  /* U+09F8 - U+09FF : 0x11117111 */
      75,  /* U+0A00 - U+0A07 : 0x11111AA1 */
       1,  /* U+0A08 - U+0A0F : 0x11111111 */
       1,  /* U+0A10 - U+0A17 : 0x11111111 */
       1,  /* U+0A18 - U+0A1F : 0x11111111 */
       1,  /* U+0A20 - U+0A27 : 0x11111111 */
       1,  /* U+0A28 - U+0A2F : 0x11111111 */
       1,  /* U+0A30 - U+0A37 : 0x11111111 */
-     65,  /* U+0A38 - U+0A3F : 0x111A1111 */
+     70,  /* U+0A38 - U+0A3F : 0x111A1111 */
      76,  /* U+0A40 - U+0A47 : 0xA1111AA1 */
      77,  /* U+0A48 - U+0A4F : 0x11AAA11A */
-     70,  /* U+0A50 - U+0A57 : 0x111111A1 */
+     69,  /* U+0A50 - U+0A57 : 0x111111A1 */
       1,  /* U+0A58 - U+0A5F : 0x11111111 */
       1,  /* U+0A60 - U+0A67 : 0x11111111 */
       1,  /* U+0A68 - U+0A6F : 0x11111111 */
      78,  /* U+0A70 - U+0A77 : 0x11A111AA */
       1,  /* U+0A78 - U+0A7F : 0x11111111 */
      75,  /* U+0A80 - U+0A87 : 0x11111AA1 */
       1,  /* U+0A88 - U+0A8F : 0x11111111 */
       1,  /* U+0A90 - U+0A97 : 0x11111111 */
       1,  /* U+0A98 - U+0A9F : 0x11111111 */
       1,  /* U+0AA0 - U+0AA7 : 0x11111111 */
       1,  /* U+0AA8 - U+0AAF : 0x11111111 */
       1,  /* U+0AB0 - U+0AB7 : 0x11111111 */
-     65,  /* U+0AB8 - U+0ABF : 0x111A1111 */
+     70,  /* U+0AB8 - U+0ABF : 0x111A1111 */
      79,  /* U+0AC0 - U+0AC7 : 0xA1AAAAA1 */
      67,  /* U+0AC8 - U+0ACF : 0x11A1111A */
       1,  /* U+0AD0 - U+0AD7 : 0x11111111 */
       1,  /* U+0AD8 - U+0ADF : 0x11111111 */
-     69,  /* U+0AE0 - U+0AE7 : 0x1111AA11 */
+     68,  /* U+0AE0 - U+0AE7 : 0x1111AA11 */
       1,  /* U+0AE8 - U+0AEF : 0x11111111 */
      80,  /* U+0AF0 - U+0AF7 : 0x11111171 */
       1,  /* U+0AF8 - U+0AFF : 0x11111111 */
-     70,  /* U+0B00 - U+0B07 : 0x111111A1 */
+     69,  /* U+0B00 - U+0B07 : 0x111111A1 */
       1,  /* U+0B08 - U+0B0F : 0x11111111 */
       1,  /* U+0B10 - U+0B17 : 0x11111111 */
       1,  /* U+0B18 - U+0B1F : 0x11111111 */
       1,  /* U+0B20 - U+0B27 : 0x11111111 */
       1,  /* U+0B28 - U+0B2F : 0x11111111 */
       1,  /* U+0B30 - U+0B37 : 0x11111111 */
      81,  /* U+0B38 - U+0B3F : 0xA11A1111 */
      71,  /* U+0B40 - U+0B47 : 0x111AAAA1 */
      72,  /* U+0B48 - U+0B4F : 0x11A11111 */
      82,  /* U+0B50 - U+0B57 : 0x1A111111 */
       1,  /* U+0B58 - U+0B5F : 0x11111111 */
-     69,  /* U+0B60 - U+0B67 : 0x1111AA11 */
+     68,  /* U+0B60 - U+0B67 : 0x1111AA11 */
       1,  /* U+0B68 - U+0B6F : 0x11111111 */
       1,  /* U+0B70 - U+0B77 : 0x11111111 */
       1,  /* U+0B78 - U+0B7F : 0x11111111 */
      83,  /* U+0B80 - U+0B87 : 0x11111A11 */
       1,  /* U+0B88 - U+0B8F : 0x11111111 */
       1,  /* U+0B90 - U+0B97 : 0x11111111 */
       1,  /* U+0B98 - U+0B9F : 0x11111111 */
       1,  /* U+0BA0 - U+0BA7 : 0x11111111 */
@@ -435,49 +435,49 @@ static PRUint8 gBidiCatIdx1[1664] = {
       1,  /* U+0C20 - U+0C27 : 0x11111111 */
       1,  /* U+0C28 - U+0C2F : 0x11111111 */
       1,  /* U+0C30 - U+0C37 : 0x11111111 */
      86,  /* U+0C38 - U+0C3F : 0xAA111111 */
      87,  /* U+0C40 - U+0C47 : 0xAA11111A */
      88,  /* U+0C48 - U+0C4F : 0x11AAAA1A */
      89,  /* U+0C50 - U+0C57 : 0x1AA11111 */
       1,  /* U+0C58 - U+0C5F : 0x11111111 */
-     69,  /* U+0C60 - U+0C67 : 0x1111AA11 */
+     68,  /* U+0C60 - U+0C67 : 0x1111AA11 */
       1,  /* U+0C68 - U+0C6F : 0x11111111 */
       1,  /* U+0C70 - U+0C77 : 0x11111111 */
      90,  /* U+0C78 - U+0C7F : 0x19999999 */
       1,  /* U+0C80 - U+0C87 : 0x11111111 */
       1,  /* U+0C88 - U+0C8F : 0x11111111 */
       1,  /* U+0C90 - U+0C97 : 0x11111111 */
       1,  /* U+0C98 - U+0C9F : 0x11111111 */
       1,  /* U+0CA0 - U+0CA7 : 0x11111111 */
       1,  /* U+0CA8 - U+0CAF : 0x11111111 */
       1,  /* U+0CB0 - U+0CB7 : 0x11111111 */
-     65,  /* U+0CB8 - U+0CBF : 0x111A1111 */
+     70,  /* U+0CB8 - U+0CBF : 0x111A1111 */
       1,  /* U+0CC0 - U+0CC7 : 0x11111111 */
      91,  /* U+0CC8 - U+0CCF : 0x11AA1111 */
       1,  /* U+0CD0 - U+0CD7 : 0x11111111 */
       1,  /* U+0CD8 - U+0CDF : 0x11111111 */
-     69,  /* U+0CE0 - U+0CE7 : 0x1111AA11 */
+     68,  /* U+0CE0 - U+0CE7 : 0x1111AA11 */
       1,  /* U+0CE8 - U+0CEF : 0x11111111 */
-     30,  /* U+0CF0 - U+0CF7 : 0x11111991 */
+      1,  /* U+0CF0 - U+0CF7 : 0x11111111 */
       1,  /* U+0CF8 - U+0CFF : 0x11111111 */
       1,  /* U+0D00 - U+0D07 : 0x11111111 */
       1,  /* U+0D08 - U+0D0F : 0x11111111 */
       1,  /* U+0D10 - U+0D17 : 0x11111111 */
       1,  /* U+0D18 - U+0D1F : 0x11111111 */
       1,  /* U+0D20 - U+0D27 : 0x11111111 */
       1,  /* U+0D28 - U+0D2F : 0x11111111 */
       1,  /* U+0D30 - U+0D37 : 0x11111111 */
       1,  /* U+0D38 - U+0D3F : 0x11111111 */
      71,  /* U+0D40 - U+0D47 : 0x111AAAA1 */
      72,  /* U+0D48 - U+0D4F : 0x11A11111 */
       1,  /* U+0D50 - U+0D57 : 0x11111111 */
       1,  /* U+0D58 - U+0D5F : 0x11111111 */
-     69,  /* U+0D60 - U+0D67 : 0x1111AA11 */
+     68,  /* U+0D60 - U+0D67 : 0x1111AA11 */
       1,  /* U+0D68 - U+0D6F : 0x11111111 */
       1,  /* U+0D70 - U+0D77 : 0x11111111 */
       1,  /* U+0D78 - U+0D7F : 0x11111111 */
       1,  /* U+0D80 - U+0D87 : 0x11111111 */
       1,  /* U+0D88 - U+0D8F : 0x11111111 */
       1,  /* U+0D90 - U+0D97 : 0x11111111 */
       1,  /* U+0D98 - U+0D9F : 0x11111111 */
       1,  /* U+0DA0 - U+0DA7 : 0x11111111 */
@@ -536,37 +536,37 @@ static PRUint8 gBidiCatIdx1[1664] = {
       1,  /* U+0F48 - U+0F4F : 0x11111111 */
       1,  /* U+0F50 - U+0F57 : 0x11111111 */
       1,  /* U+0F58 - U+0F5F : 0x11111111 */
       1,  /* U+0F60 - U+0F67 : 0x11111111 */
       1,  /* U+0F68 - U+0F6F : 0x11111111 */
      66,  /* U+0F70 - U+0F77 : 0xAAAAAAA1 */
      96,  /* U+0F78 - U+0F7F : 0x1AAAAAAA */
     101,  /* U+0F80 - U+0F87 : 0xAA1AAAAA */
-      1,  /* U+0F88 - U+0F8F : 0x11111111 */
+    102,  /* U+0F88 - U+0F8F : 0xAAA11111 */
      10,  /* U+0F90 - U+0F97 : 0xAAAAAAAA */
      66,  /* U+0F98 - U+0F9F : 0xAAAAAAA1 */
      10,  /* U+0FA0 - U+0FA7 : 0xAAAAAAAA */
      10,  /* U+0FA8 - U+0FAF : 0xAAAAAAAA */
      10,  /* U+0FB0 - U+0FB7 : 0xAAAAAAAA */
-    102,  /* U+0FB8 - U+0FBF : 0x111AAAAA */
+    103,  /* U+0FB8 - U+0FBF : 0x111AAAAA */
      82,  /* U+0FC0 - U+0FC7 : 0x1A111111 */
       1,  /* U+0FC8 - U+0FCF : 0x11111111 */
       1,  /* U+0FD0 - U+0FD7 : 0x11111111 */
       1,  /* U+0FD8 - U+0FDF : 0x11111111 */
       1,  /* U+0FE0 - U+0FE7 : 0x11111111 */
       1,  /* U+0FE8 - U+0FEF : 0x11111111 */
       1,  /* U+0FF0 - U+0FF7 : 0x11111111 */
       1,  /* U+0FF8 - U+0FFF : 0x11111111 */
       1,  /* U+1000 - U+1007 : 0x11111111 */
       1,  /* U+1008 - U+100F : 0x11111111 */
       1,  /* U+1010 - U+1017 : 0x11111111 */
       1,  /* U+1018 - U+101F : 0x11111111 */
       1,  /* U+1020 - U+1027 : 0x11111111 */
-    103,  /* U+1028 - U+102F : 0xAAA11111 */
+    102,  /* U+1028 - U+102F : 0xAAA11111 */
     104,  /* U+1030 - U+1037 : 0xAAAAAA1A */
     105,  /* U+1038 - U+103F : 0x1AA11AA1 */
       1,  /* U+1040 - U+1047 : 0x11111111 */
       1,  /* U+1048 - U+104F : 0x11111111 */
       1,  /* U+1050 - U+1057 : 0x11111111 */
     106,  /* U+1058 - U+105F : 0xAA1111AA */
      84,  /* U+1060 - U+1067 : 0x1111111A */
       1,  /* U+1068 - U+106F : 0x11111111 */
@@ -658,17 +658,17 @@ static PRUint8 gBidiCatIdx1[1664] = {
       1,  /* U+1318 - U+131F : 0x11111111 */
       1,  /* U+1320 - U+1327 : 0x11111111 */
       1,  /* U+1328 - U+132F : 0x11111111 */
       1,  /* U+1330 - U+1337 : 0x11111111 */
       1,  /* U+1338 - U+133F : 0x11111111 */
       1,  /* U+1340 - U+1347 : 0x11111111 */
       1,  /* U+1348 - U+134F : 0x11111111 */
       1,  /* U+1350 - U+1357 : 0x11111111 */
-     95,  /* U+1358 - U+135F : 0xA1111111 */
+    102,  /* U+1358 - U+135F : 0xAAA11111 */
       1,  /* U+1360 - U+1367 : 0x11111111 */
       1,  /* U+1368 - U+136F : 0x11111111 */
       1,  /* U+1370 - U+1377 : 0x11111111 */
       1,  /* U+1378 - U+137F : 0x11111111 */
       1,  /* U+1380 - U+1387 : 0x11111111 */
       1,  /* U+1388 - U+138F : 0x11111111 */
       9,  /* U+1390 - U+1397 : 0x99999999 */
     108,  /* U+1398 - U+139F : 0x11111199 */
@@ -785,21 +785,21 @@ static PRUint8 gBidiCatIdx1[1664] = {
     111,  /* U+1710 - U+1717 : 0x111AAA11 */
       1,  /* U+1718 - U+171F : 0x11111111 */
       1,  /* U+1720 - U+1727 : 0x11111111 */
       1,  /* U+1728 - U+172F : 0x11111111 */
     111,  /* U+1730 - U+1737 : 0x111AAA11 */
       1,  /* U+1738 - U+173F : 0x11111111 */
       1,  /* U+1740 - U+1747 : 0x11111111 */
       1,  /* U+1748 - U+174F : 0x11111111 */
-     69,  /* U+1750 - U+1757 : 0x1111AA11 */
+     68,  /* U+1750 - U+1757 : 0x1111AA11 */
       1,  /* U+1758 - U+175F : 0x11111111 */
       1,  /* U+1760 - U+1767 : 0x11111111 */
       1,  /* U+1768 - U+176F : 0x11111111 */
-     69,  /* U+1770 - U+1777 : 0x1111AA11 */
+     68,  /* U+1770 - U+1777 : 0x1111AA11 */
       1,  /* U+1778 - U+177F : 0x11111111 */
       1,  /* U+1780 - U+1787 : 0x11111111 */
       1,  /* U+1788 - U+178F : 0x11111111 */
       1,  /* U+1790 - U+1797 : 0x11111111 */
       1,  /* U+1798 - U+179F : 0x11111111 */
       1,  /* U+17A0 - U+17A7 : 0x11111111 */
       1,  /* U+17A8 - U+17AF : 0x11111111 */
      95,  /* U+17B0 - U+17B7 : 0xA1111111 */
@@ -828,17 +828,17 @@ static PRUint8 gBidiCatIdx1[1664] = {
       1,  /* U+1868 - U+186F : 0x11111111 */
       1,  /* U+1870 - U+1877 : 0x11111111 */
       1,  /* U+1878 - U+187F : 0x11111111 */
       1,  /* U+1880 - U+1887 : 0x11111111 */
       1,  /* U+1888 - U+188F : 0x11111111 */
       1,  /* U+1890 - U+1897 : 0x11111111 */
       1,  /* U+1898 - U+189F : 0x11111111 */
       1,  /* U+18A0 - U+18A7 : 0x11111111 */
-     70,  /* U+18A8 - U+18AF : 0x111111A1 */
+     69,  /* U+18A8 - U+18AF : 0x111111A1 */
       1,  /* U+18B0 - U+18B7 : 0x11111111 */
       1,  /* U+18B8 - U+18BF : 0x11111111 */
       1,  /* U+18C0 - U+18C7 : 0x11111111 */
       1,  /* U+18C8 - U+18CF : 0x11111111 */
       1,  /* U+18D0 - U+18D7 : 0x11111111 */
       1,  /* U+18D8 - U+18DF : 0x11111111 */
       1,  /* U+18E0 - U+18E7 : 0x11111111 */
       1,  /* U+18E8 - U+18EF : 0x11111111 */
@@ -884,17 +884,17 @@ static PRUint8 gBidiCatIdx1[1664] = {
       1,  /* U+1A28 - U+1A2F : 0x11111111 */
       1,  /* U+1A30 - U+1A37 : 0x11111111 */
       1,  /* U+1A38 - U+1A3F : 0x11111111 */
       1,  /* U+1A40 - U+1A47 : 0x11111111 */
       1,  /* U+1A48 - U+1A4F : 0x11111111 */
      82,  /* U+1A50 - U+1A57 : 0x1A111111 */
      96,  /* U+1A58 - U+1A5F : 0x1AAAAAAA */
     119,  /* U+1A60 - U+1A67 : 0xAAA11A1A */
-    102,  /* U+1A68 - U+1A6F : 0x111AAAAA */
+    103,  /* U+1A68 - U+1A6F : 0x111AAAAA */
      37,  /* U+1A70 - U+1A77 : 0xAAAAA111 */
     120,  /* U+1A78 - U+1A7F : 0xA11AAAAA */
       1,  /* U+1A80 - U+1A87 : 0x11111111 */
       1,  /* U+1A88 - U+1A8F : 0x11111111 */
       1,  /* U+1A90 - U+1A97 : 0x11111111 */
       1,  /* U+1A98 - U+1A9F : 0x11111111 */
       1,  /* U+1AA0 - U+1AA7 : 0x11111111 */
       1,  /* U+1AA8 - U+1AAF : 0x11111111 */
@@ -931,27 +931,27 @@ static PRUint8 gBidiCatIdx1[1664] = {
     123,  /* U+1BA0 - U+1BA7 : 0x11AAAA11 */
      38,  /* U+1BA8 - U+1BAF : 0x111111AA */
       1,  /* U+1BB0 - U+1BB7 : 0x11111111 */
       1,  /* U+1BB8 - U+1BBF : 0x11111111 */
       1,  /* U+1BC0 - U+1BC7 : 0x11111111 */
       1,  /* U+1BC8 - U+1BCF : 0x11111111 */
       1,  /* U+1BD0 - U+1BD7 : 0x11111111 */
       1,  /* U+1BD8 - U+1BDF : 0x11111111 */
-      1,  /* U+1BE0 - U+1BE7 : 0x11111111 */
-      1,  /* U+1BE8 - U+1BEF : 0x11111111 */
-      1,  /* U+1BF0 - U+1BF7 : 0x11111111 */
+     82,  /* U+1BE0 - U+1BE7 : 0x1A111111 */
+    124,  /* U+1BE8 - U+1BEF : 0xA1A111AA */
+     38,  /* U+1BF0 - U+1BF7 : 0x111111AA */
       1,  /* U+1BF8 - U+1BFF : 0x11111111 */
       1,  /* U+1C00 - U+1C07 : 0x11111111 */
       1,  /* U+1C08 - U+1C0F : 0x11111111 */
       1,  /* U+1C10 - U+1C17 : 0x11111111 */
       1,  /* U+1C18 - U+1C1F : 0x11111111 */
       1,  /* U+1C20 - U+1C27 : 0x11111111 */
-    124,  /* U+1C28 - U+1C2F : 0xAAAA1111 */
-    125,  /* U+1C30 - U+1C37 : 0xAA11AAAA */
+    125,  /* U+1C28 - U+1C2F : 0xAAAA1111 */
+    126,  /* U+1C30 - U+1C37 : 0xAA11AAAA */
       1,  /* U+1C38 - U+1C3F : 0x11111111 */
       1,  /* U+1C40 - U+1C47 : 0x11111111 */
       1,  /* U+1C48 - U+1C4F : 0x11111111 */
       1,  /* U+1C50 - U+1C57 : 0x11111111 */
       1,  /* U+1C58 - U+1C5F : 0x11111111 */
       1,  /* U+1C60 - U+1C67 : 0x11111111 */
       1,  /* U+1C68 - U+1C6F : 0x11111111 */
       1,  /* U+1C70 - U+1C77 : 0x11111111 */
@@ -961,17 +961,17 @@ static PRUint8 gBidiCatIdx1[1664] = {
       1,  /* U+1C90 - U+1C97 : 0x11111111 */
       1,  /* U+1C98 - U+1C9F : 0x11111111 */
       1,  /* U+1CA0 - U+1CA7 : 0x11111111 */
       1,  /* U+1CA8 - U+1CAF : 0x11111111 */
       1,  /* U+1CB0 - U+1CB7 : 0x11111111 */
       1,  /* U+1CB8 - U+1CBF : 0x11111111 */
       1,  /* U+1CC0 - U+1CC7 : 0x11111111 */
       1,  /* U+1CC8 - U+1CCF : 0x11111111 */
-    126,  /* U+1CD0 - U+1CD7 : 0xAAAA1AAA */
+    127,  /* U+1CD0 - U+1CD7 : 0xAAAA1AAA */
      10,  /* U+1CD8 - U+1CDF : 0xAAAAAAAA */
     104,  /* U+1CE0 - U+1CE7 : 0xAAAAAA1A */
      67,  /* U+1CE8 - U+1CEF : 0x11A1111A */
       1,  /* U+1CF0 - U+1CF7 : 0x11111111 */
       1,  /* U+1CF8 - U+1CFF : 0x11111111 */
       1,  /* U+1D00 - U+1D07 : 0x11111111 */
       1,  /* U+1D08 - U+1D0F : 0x11111111 */
       1,  /* U+1D10 - U+1D17 : 0x11111111 */
@@ -998,17 +998,17 @@ static PRUint8 gBidiCatIdx1[1664] = {
       1,  /* U+1DB8 - U+1DBF : 0x11111111 */
      10,  /* U+1DC0 - U+1DC7 : 0xAAAAAAAA */
      10,  /* U+1DC8 - U+1DCF : 0xAAAAAAAA */
      10,  /* U+1DD0 - U+1DD7 : 0xAAAAAAAA */
      10,  /* U+1DD8 - U+1DDF : 0xAAAAAAAA */
      96,  /* U+1DE0 - U+1DE7 : 0x1AAAAAAA */
       1,  /* U+1DE8 - U+1DEF : 0x11111111 */
       1,  /* U+1DF0 - U+1DF7 : 0x11111111 */
-    103,  /* U+1DF8 - U+1DFF : 0xAAA11111 */
+    125,  /* U+1DF8 - U+1DFF : 0xAAAA1111 */
       1,  /* U+1E00 - U+1E07 : 0x11111111 */
       1,  /* U+1E08 - U+1E0F : 0x11111111 */
       1,  /* U+1E10 - U+1E17 : 0x11111111 */
       1,  /* U+1E18 - U+1E1F : 0x11111111 */
       1,  /* U+1E20 - U+1E27 : 0x11111111 */
       1,  /* U+1E28 - U+1E2F : 0x11111111 */
       1,  /* U+1E30 - U+1E37 : 0x11111111 */
       1,  /* U+1E38 - U+1E3F : 0x11111111 */
@@ -1054,92 +1054,92 @@ static PRUint8 gBidiCatIdx1[1664] = {
       1,  /* U+1F78 - U+1F7F : 0x11111111 */
       1,  /* U+1F80 - U+1F87 : 0x11111111 */
       1,  /* U+1F88 - U+1F8F : 0x11111111 */
       1,  /* U+1F90 - U+1F97 : 0x11111111 */
       1,  /* U+1F98 - U+1F9F : 0x11111111 */
       1,  /* U+1FA0 - U+1FA7 : 0x11111111 */
       1,  /* U+1FA8 - U+1FAF : 0x11111111 */
       1,  /* U+1FB0 - U+1FB7 : 0x11111111 */
-    127,  /* U+1FB8 - U+1FBF : 0x91911111 */
+    128,  /* U+1FB8 - U+1FBF : 0x91911111 */
     108,  /* U+1FC0 - U+1FC7 : 0x11111199 */
      32,  /* U+1FC8 - U+1FCF : 0x99911111 */
       1,  /* U+1FD0 - U+1FD7 : 0x11111111 */
      32,  /* U+1FD8 - U+1FDF : 0x99911111 */
       1,  /* U+1FE0 - U+1FE7 : 0x11111111 */
      32,  /* U+1FE8 - U+1FEF : 0x99911111 */
       1,  /* U+1FF0 - U+1FF7 : 0x11111111 */
-    128,  /* U+1FF8 - U+1FFF : 0x19911111 */
+    129,  /* U+1FF8 - U+1FFF : 0x19911111 */
      14,  /* U+2000 - U+2007 : 0xEEEEEEEE */
-    129,  /* U+2008 - U+200F : 0x21BBBEEE */
+    130,  /* U+2008 - U+200F : 0x21BBBEEE */
       9,  /* U+2010 - U+2017 : 0x99999999 */
       9,  /* U+2018 - U+201F : 0x99999999 */
       9,  /* U+2020 - U+2027 : 0x99999999 */
-    130,  /* U+2028 - U+202F : 0x8FFFFFCE */
-    131,  /* U+2030 - U+2037 : 0x99977777 */
+    131,  /* U+2028 - U+202F : 0x8FFFFFCE */
+    132,  /* U+2030 - U+2037 : 0x99977777 */
       9,  /* U+2038 - U+203F : 0x99999999 */
-    132,  /* U+2040 - U+2047 : 0x99989999 */
+    133,  /* U+2040 - U+2047 : 0x99989999 */
       9,  /* U+2048 - U+204F : 0x99999999 */
       9,  /* U+2050 - U+2057 : 0x99999999 */
-    133,  /* U+2058 - U+205F : 0xE9999999 */
-    134,  /* U+2060 - U+2067 : 0x111BBBBB */
-    135,  /* U+2068 - U+206F : 0xBBBBBB11 */
-    136,  /* U+2070 - U+2077 : 0x55551115 */
-    137,  /* U+2078 - U+207F : 0x19996655 */
+    134,  /* U+2058 - U+205F : 0xE9999999 */
+    135,  /* U+2060 - U+2067 : 0x111BBBBB */
+    136,  /* U+2068 - U+206F : 0xBBBBBB11 */
+    137,  /* U+2070 - U+2077 : 0x55551115 */
+    138,  /* U+2078 - U+207F : 0x19996655 */
       5,  /* U+2080 - U+2087 : 0x55555555 */
-    137,  /* U+2088 - U+208F : 0x19996655 */
+    138,  /* U+2088 - U+208F : 0x19996655 */
       1,  /* U+2090 - U+2097 : 0x11111111 */
       1,  /* U+2098 - U+209F : 0x11111111 */
       7,  /* U+20A0 - U+20A7 : 0x77777777 */
       7,  /* U+20A8 - U+20AF : 0x77777777 */
       7,  /* U+20B0 - U+20B7 : 0x77777777 */
-    138,  /* U+20B8 - U+20BF : 0x11111117 */
+    139,  /* U+20B8 - U+20BF : 0x11111177 */
       1,  /* U+20C0 - U+20C7 : 0x11111111 */
       1,  /* U+20C8 - U+20CF : 0x11111111 */
      10,  /* U+20D0 - U+20D7 : 0xAAAAAAAA */
      10,  /* U+20D8 - U+20DF : 0xAAAAAAAA */
      10,  /* U+20E0 - U+20E7 : 0xAAAAAAAA */
      10,  /* U+20E8 - U+20EF : 0xAAAAAAAA */
      84,  /* U+20F0 - U+20F7 : 0x1111111A */
       1,  /* U+20F8 - U+20FF : 0x11111111 */
-    139,  /* U+2100 - U+2107 : 0x19999199 */
+    140,  /* U+2100 - U+2107 : 0x19999199 */
     108,  /* U+2108 - U+210F : 0x11111199 */
-    140,  /* U+2110 - U+2117 : 0x99191111 */
-    141,  /* U+2118 - U+211F : 0x99111119 */
-    142,  /* U+2120 - U+2127 : 0x91919999 */
-    143,  /* U+2128 - U+212F : 0x17111191 */
+    141,  /* U+2110 - U+2117 : 0x99191111 */
+    142,  /* U+2118 - U+211F : 0x99111119 */
+    143,  /* U+2120 - U+2127 : 0x91919999 */
+    144,  /* U+2128 - U+212F : 0x17111191 */
       1,  /* U+2130 - U+2137 : 0x11111111 */
-    144,  /* U+2138 - U+213F : 0x11119911 */
-    145,  /* U+2140 - U+2147 : 0x11199999 */
-    146,  /* U+2148 - U+214F : 0x11999911 */
+    145,  /* U+2138 - U+213F : 0x11119911 */
+    146,  /* U+2140 - U+2147 : 0x11199999 */
+    147,  /* U+2148 - U+214F : 0x11999911 */
       9,  /* U+2150 - U+2157 : 0x99999999 */
       9,  /* U+2158 - U+215F : 0x99999999 */
       1,  /* U+2160 - U+2167 : 0x11111111 */
       1,  /* U+2168 - U+216F : 0x11111111 */
       1,  /* U+2170 - U+2177 : 0x11111111 */
       1,  /* U+2178 - U+217F : 0x11111111 */
       1,  /* U+2180 - U+2187 : 0x11111111 */
-    147,  /* U+2188 - U+218F : 0x11111191 */
+    148,  /* U+2188 - U+218F : 0x11111191 */
       9,  /* U+2190 - U+2197 : 0x99999999 */
       9,  /* U+2198 - U+219F : 0x99999999 */
       9,  /* U+21A0 - U+21A7 : 0x99999999 */
       9,  /* U+21A8 - U+21AF : 0x99999999 */
       9,  /* U+21B0 - U+21B7 : 0x99999999 */
       9,  /* U+21B8 - U+21BF : 0x99999999 */
       9,  /* U+21C0 - U+21C7 : 0x99999999 */
       9,  /* U+21C8 - U+21CF : 0x99999999 */
       9,  /* U+21D0 - U+21D7 : 0x99999999 */
       9,  /* U+21D8 - U+21DF : 0x99999999 */
       9,  /* U+21E0 - U+21E7 : 0x99999999 */
       9,  /* U+21E8 - U+21EF : 0x99999999 */
       9,  /* U+21F0 - U+21F7 : 0x99999999 */
       9,  /* U+21F8 - U+21FF : 0x99999999 */
       9,  /* U+2200 - U+2207 : 0x99999999 */
       9,  /* U+2208 - U+220F : 0x99999999 */
-    148,  /* U+2210 - U+2217 : 0x99997699 */
+    149,  /* U+2210 - U+2217 : 0x99997699 */
       9,  /* U+2218 - U+221F : 0x99999999 */
       9,  /* U+2220 - U+2227 : 0x99999999 */
       9,  /* U+2228 - U+222F : 0x99999999 */
       9,  /* U+2230 - U+2237 : 0x99999999 */
       9,  /* U+2238 - U+223F : 0x99999999 */
       9,  /* U+2240 - U+2247 : 0x99999999 */
       9,  /* U+2248 - U+224F : 0x99999999 */
       9,  /* U+2250 - U+2257 : 0x99999999 */
@@ -1165,62 +1165,62 @@ static PRUint8 gBidiCatIdx1[1664] = {
       9,  /* U+22F0 - U+22F7 : 0x99999999 */
       9,  /* U+22F8 - U+22FF : 0x99999999 */
       9,  /* U+2300 - U+2307 : 0x99999999 */
       9,  /* U+2308 - U+230F : 0x99999999 */
       9,  /* U+2310 - U+2317 : 0x99999999 */
       9,  /* U+2318 - U+231F : 0x99999999 */
       9,  /* U+2320 - U+2327 : 0x99999999 */
       9,  /* U+2328 - U+232F : 0x99999999 */
-    149,  /* U+2330 - U+2337 : 0x11999999 */
+    150,  /* U+2330 - U+2337 : 0x11999999 */
       1,  /* U+2338 - U+233F : 0x11111111 */
       1,  /* U+2340 - U+2347 : 0x11111111 */
       1,  /* U+2348 - U+234F : 0x11111111 */
       1,  /* U+2350 - U+2357 : 0x11111111 */
       1,  /* U+2358 - U+235F : 0x11111111 */
       1,  /* U+2360 - U+2367 : 0x11111111 */
       1,  /* U+2368 - U+236F : 0x11111111 */
       1,  /* U+2370 - U+2377 : 0x11111111 */
      22,  /* U+2378 - U+237F : 0x99999111 */
       9,  /* U+2380 - U+2387 : 0x99999999 */
       9,  /* U+2388 - U+238F : 0x99999999 */
-    150,  /* U+2390 - U+2397 : 0x99199999 */
+    151,  /* U+2390 - U+2397 : 0x99199999 */
       9,  /* U+2398 - U+239F : 0x99999999 */
       9,  /* U+23A0 - U+23A7 : 0x99999999 */
       9,  /* U+23A8 - U+23AF : 0x99999999 */
       9,  /* U+23B0 - U+23B7 : 0x99999999 */
       9,  /* U+23B8 - U+23BF : 0x99999999 */
       9,  /* U+23C0 - U+23C7 : 0x99999999 */
       9,  /* U+23C8 - U+23CF : 0x99999999 */
       9,  /* U+23D0 - U+23D7 : 0x99999999 */
       9,  /* U+23D8 - U+23DF : 0x99999999 */
       9,  /* U+23E0 - U+23E7 : 0x99999999 */
-     21,  /* U+23E8 - U+23EF : 0x11111119 */
-      1,  /* U+23F0 - U+23F7 : 0x11111111 */
+      9,  /* U+23E8 - U+23EF : 0x99999999 */
+    152,  /* U+23F0 - U+23F7 : 0x11119999 */
       1,  /* U+23F8 - U+23FF : 0x11111111 */
       9,  /* U+2400 - U+2407 : 0x99999999 */
       9,  /* U+2408 - U+240F : 0x99999999 */
       9,  /* U+2410 - U+2417 : 0x99999999 */
       9,  /* U+2418 - U+241F : 0x99999999 */
      90,  /* U+2420 - U+2427 : 0x19999999 */
       1,  /* U+2428 - U+242F : 0x11111111 */
       1,  /* U+2430 - U+2437 : 0x11111111 */
       1,  /* U+2438 - U+243F : 0x11111111 */
       9,  /* U+2440 - U+2447 : 0x99999999 */
-    151,  /* U+2448 - U+244F : 0x11111999 */
+    153,  /* U+2448 - U+244F : 0x11111999 */
       1,  /* U+2450 - U+2457 : 0x11111111 */
       1,  /* U+2458 - U+245F : 0x11111111 */
       9,  /* U+2460 - U+2467 : 0x99999999 */
       9,  /* U+2468 - U+246F : 0x99999999 */
       9,  /* U+2470 - U+2477 : 0x99999999 */
       9,  /* U+2478 - U+247F : 0x99999999 */
       9,  /* U+2480 - U+2487 : 0x99999999 */
       5,  /* U+2488 - U+248F : 0x55555555 */
       5,  /* U+2490 - U+2497 : 0x55555555 */
-    152,  /* U+2498 - U+249F : 0x11115555 */
+    154,  /* U+2498 - U+249F : 0x11115555 */
       1,  /* U+24A0 - U+24A7 : 0x11111111 */
       1,  /* U+24A8 - U+24AF : 0x11111111 */
       1,  /* U+24B0 - U+24B7 : 0x11111111 */
       1,  /* U+24B8 - U+24BF : 0x11111111 */
       1,  /* U+24C0 - U+24C7 : 0x11111111 */
       1,  /* U+24C8 - U+24CF : 0x11111111 */
       1,  /* U+24D0 - U+24D7 : 0x11111111 */
       1,  /* U+24D8 - U+24DF : 0x11111111 */
@@ -1276,53 +1276,53 @@ static PRUint8 gBidiCatIdx1[1664] = {
       9,  /* U+2668 - U+266F : 0x99999999 */
       9,  /* U+2670 - U+2677 : 0x99999999 */
       9,  /* U+2678 - U+267F : 0x99999999 */
       9,  /* U+2680 - U+2687 : 0x99999999 */
       9,  /* U+2688 - U+268F : 0x99999999 */
       9,  /* U+2690 - U+2697 : 0x99999999 */
       9,  /* U+2698 - U+269F : 0x99999999 */
       9,  /* U+26A0 - U+26A7 : 0x99999999 */
-    153,  /* U+26A8 - U+26AF : 0x99919999 */
+    155,  /* U+26A8 - U+26AF : 0x99919999 */
       9,  /* U+26B0 - U+26B7 : 0x99999999 */
       9,  /* U+26B8 - U+26BF : 0x99999999 */
       9,  /* U+26C0 - U+26C7 : 0x99999999 */
-     33,  /* U+26C8 - U+26CF : 0x91999999 */
+      9,  /* U+26C8 - U+26CF : 0x99999999 */
       9,  /* U+26D0 - U+26D7 : 0x99999999 */
       9,  /* U+26D8 - U+26DF : 0x99999999 */
-    154,  /* U+26E0 - U+26E7 : 0x11119199 */
+      9,  /* U+26E0 - U+26E7 : 0x99999999 */
       9,  /* U+26E8 - U+26EF : 0x99999999 */
       9,  /* U+26F0 - U+26F7 : 0x99999999 */
       9,  /* U+26F8 - U+26FF : 0x99999999 */
-    155,  /* U+2700 - U+2707 : 0x99199991 */
-    156,  /* U+2708 - U+270F : 0x99991199 */
+    156,  /* U+2700 - U+2707 : 0x99999991 */
+      9,  /* U+2708 - U+270F : 0x99999999 */
       9,  /* U+2710 - U+2717 : 0x99999999 */
       9,  /* U+2718 - U+271F : 0x99999999 */
       9,  /* U+2720 - U+2727 : 0x99999999 */
-    157,  /* U+2728 - U+272F : 0x99999991 */
+      9,  /* U+2728 - U+272F : 0x99999999 */
       9,  /* U+2730 - U+2737 : 0x99999999 */
       9,  /* U+2738 - U+273F : 0x99999999 */
       9,  /* U+2740 - U+2747 : 0x99999999 */
-    142,  /* U+2748 - U+274F : 0x91919999 */
-    158,  /* U+2750 - U+2757 : 0x99111999 */
-     90,  /* U+2758 - U+275F : 0x19999999 */
-    157,  /* U+2760 - U+2767 : 0x99999991 */
+      9,  /* U+2748 - U+274F : 0x99999999 */
+      9,  /* U+2750 - U+2757 : 0x99999999 */
+      9,  /* U+2758 - U+275F : 0x99999999 */
+      9,  /* U+2760 - U+2767 : 0x99999999 */
       9,  /* U+2768 - U+276F : 0x99999999 */
       9,  /* U+2770 - U+2777 : 0x99999999 */
       9,  /* U+2778 - U+277F : 0x99999999 */
       9,  /* U+2780 - U+2787 : 0x99999999 */
       9,  /* U+2788 - U+278F : 0x99999999 */
-    145,  /* U+2790 - U+2797 : 0x11199999 */
+      9,  /* U+2790 - U+2797 : 0x99999999 */
       9,  /* U+2798 - U+279F : 0x99999999 */
       9,  /* U+27A0 - U+27A7 : 0x99999999 */
       9,  /* U+27A8 - U+27AF : 0x99999999 */
-    157,  /* U+27B0 - U+27B7 : 0x99999991 */
-     90,  /* U+27B8 - U+27BF : 0x19999999 */
+      9,  /* U+27B0 - U+27B7 : 0x99999999 */
+      9,  /* U+27B8 - U+27BF : 0x99999999 */
       9,  /* U+27C0 - U+27C7 : 0x99999999 */
-    159,  /* U+27C8 - U+27CF : 0x11191999 */
+    157,  /* U+27C8 - U+27CF : 0x99191999 */
       9,  /* U+27D0 - U+27D7 : 0x99999999 */
       9,  /* U+27D8 - U+27DF : 0x99999999 */
       9,  /* U+27E0 - U+27E7 : 0x99999999 */
       9,  /* U+27E8 - U+27EF : 0x99999999 */
       9,  /* U+27F0 - U+27F7 : 0x99999999 */
       9,  /* U+27F8 - U+27FF : 0x99999999 */
       1,  /* U+2800 - U+2807 : 0x11111111 */
       1,  /* U+2808 - U+280F : 0x11111111 */
@@ -1424,17 +1424,17 @@ static PRUint8 gBidiCatIdx1[1664] = {
       9,  /* U+2B08 - U+2B0F : 0x99999999 */
       9,  /* U+2B10 - U+2B17 : 0x99999999 */
       9,  /* U+2B18 - U+2B1F : 0x99999999 */
       9,  /* U+2B20 - U+2B27 : 0x99999999 */
       9,  /* U+2B28 - U+2B2F : 0x99999999 */
       9,  /* U+2B30 - U+2B37 : 0x99999999 */
       9,  /* U+2B38 - U+2B3F : 0x99999999 */
       9,  /* U+2B40 - U+2B47 : 0x99999999 */
-    145,  /* U+2B48 - U+2B4F : 0x11199999 */
+    146,  /* U+2B48 - U+2B4F : 0x11199999 */
       9,  /* U+2B50 - U+2B57 : 0x99999999 */
     108,  /* U+2B58 - U+2B5F : 0x11111199 */
       1,  /* U+2B60 - U+2B67 : 0x11111111 */
       1,  /* U+2B68 - U+2B6F : 0x11111111 */
       1,  /* U+2B70 - U+2B77 : 0x11111111 */
       1,  /* U+2B78 - U+2B7F : 0x11111111 */
       1,  /* U+2B80 - U+2B87 : 0x11111111 */
       1,  /* U+2B88 - U+2B8F : 0x11111111 */
@@ -1476,35 +1476,35 @@ static PRUint8 gBidiCatIdx1[1664] = {
       1,  /* U+2CA8 - U+2CAF : 0x11111111 */
       1,  /* U+2CB0 - U+2CB7 : 0x11111111 */
       1,  /* U+2CB8 - U+2CBF : 0x11111111 */
       1,  /* U+2CC0 - U+2CC7 : 0x11111111 */
       1,  /* U+2CC8 - U+2CCF : 0x11111111 */
       1,  /* U+2CD0 - U+2CD7 : 0x11111111 */
       1,  /* U+2CD8 - U+2CDF : 0x11111111 */
      32,  /* U+2CE0 - U+2CE7 : 0x99911111 */
-    160,  /* U+2CE8 - U+2CEF : 0xA1111999 */
+    158,  /* U+2CE8 - U+2CEF : 0xA1111999 */
      38,  /* U+2CF0 - U+2CF7 : 0x111111AA */
-    157,  /* U+2CF8 - U+2CFF : 0x99999991 */
+    156,  /* U+2CF8 - U+2CFF : 0x99999991 */
       1,  /* U+2D00 - U+2D07 : 0x11111111 */
       1,  /* U+2D08 - U+2D0F : 0x11111111 */
       1,  /* U+2D10 - U+2D17 : 0x11111111 */
       1,  /* U+2D18 - U+2D1F : 0x11111111 */
       1,  /* U+2D20 - U+2D27 : 0x11111111 */
       1,  /* U+2D28 - U+2D2F : 0x11111111 */
       1,  /* U+2D30 - U+2D37 : 0x11111111 */
       1,  /* U+2D38 - U+2D3F : 0x11111111 */
       1,  /* U+2D40 - U+2D47 : 0x11111111 */
       1,  /* U+2D48 - U+2D4F : 0x11111111 */
       1,  /* U+2D50 - U+2D57 : 0x11111111 */
       1,  /* U+2D58 - U+2D5F : 0x11111111 */
       1,  /* U+2D60 - U+2D67 : 0x11111111 */
       1,  /* U+2D68 - U+2D6F : 0x11111111 */
       1,  /* U+2D70 - U+2D77 : 0x11111111 */
-      1,  /* U+2D78 - U+2D7F : 0x11111111 */
+     95,  /* U+2D78 - U+2D7F : 0xA1111111 */
       1,  /* U+2D80 - U+2D87 : 0x11111111 */
       1,  /* U+2D88 - U+2D8F : 0x11111111 */
       1,  /* U+2D90 - U+2D97 : 0x11111111 */
       1,  /* U+2D98 - U+2D9F : 0x11111111 */
       1,  /* U+2DA0 - U+2DA7 : 0x11111111 */
       1,  /* U+2DA8 - U+2DAF : 0x11111111 */
       1,  /* U+2DB0 - U+2DB7 : 0x11111111 */
       1,  /* U+2DB8 - U+2DBF : 0x11111111 */
@@ -1530,28 +1530,28 @@ static PRUint8 gBidiCatIdx1[1664] = {
       1,  /* U+2E58 - U+2E5F : 0x11111111 */
       1,  /* U+2E60 - U+2E67 : 0x11111111 */
       1,  /* U+2E68 - U+2E6F : 0x11111111 */
       1,  /* U+2E70 - U+2E77 : 0x11111111 */
       1,  /* U+2E78 - U+2E7F : 0x11111111 */
       9,  /* U+2E80 - U+2E87 : 0x99999999 */
       9,  /* U+2E88 - U+2E8F : 0x99999999 */
       9,  /* U+2E90 - U+2E97 : 0x99999999 */
-    161,  /* U+2E98 - U+2E9F : 0x99999199 */
+    159,  /* U+2E98 - U+2E9F : 0x99999199 */
       9,  /* U+2EA0 - U+2EA7 : 0x99999999 */
       9,  /* U+2EA8 - U+2EAF : 0x99999999 */
       9,  /* U+2EB0 - U+2EB7 : 0x99999999 */
       9,  /* U+2EB8 - U+2EBF : 0x99999999 */
       9,  /* U+2EC0 - U+2EC7 : 0x99999999 */
       9,  /* U+2EC8 - U+2ECF : 0x99999999 */
       9,  /* U+2ED0 - U+2ED7 : 0x99999999 */
       9,  /* U+2ED8 - U+2EDF : 0x99999999 */
       9,  /* U+2EE0 - U+2EE7 : 0x99999999 */
       9,  /* U+2EE8 - U+2EEF : 0x99999999 */
-    162,  /* U+2EF0 - U+2EF7 : 0x11119999 */
+    152,  /* U+2EF0 - U+2EF7 : 0x11119999 */
       1,  /* U+2EF8 - U+2EFF : 0x11111111 */
       9,  /* U+2F00 - U+2F07 : 0x99999999 */
       9,  /* U+2F08 - U+2F0F : 0x99999999 */
       9,  /* U+2F10 - U+2F17 : 0x99999999 */
       9,  /* U+2F18 - U+2F1F : 0x99999999 */
       9,  /* U+2F20 - U+2F27 : 0x99999999 */
       9,  /* U+2F28 - U+2F2F : 0x99999999 */
       9,  /* U+2F30 - U+2F37 : 0x99999999 */
@@ -1569,54 +1569,54 @@ static PRUint8 gBidiCatIdx1[1664] = {
       9,  /* U+2F90 - U+2F97 : 0x99999999 */
       9,  /* U+2F98 - U+2F9F : 0x99999999 */
       9,  /* U+2FA0 - U+2FA7 : 0x99999999 */
       9,  /* U+2FA8 - U+2FAF : 0x99999999 */
       9,  /* U+2FB0 - U+2FB7 : 0x99999999 */
       9,  /* U+2FB8 - U+2FBF : 0x99999999 */
       9,  /* U+2FC0 - U+2FC7 : 0x99999999 */
       9,  /* U+2FC8 - U+2FCF : 0x99999999 */
-    149,  /* U+2FD0 - U+2FD7 : 0x11999999 */
+    150,  /* U+2FD0 - U+2FD7 : 0x11999999 */
       1,  /* U+2FD8 - U+2FDF : 0x11111111 */
       1,  /* U+2FE0 - U+2FE7 : 0x11111111 */
       1,  /* U+2FE8 - U+2FEF : 0x11111111 */
       9,  /* U+2FF0 - U+2FF7 : 0x99999999 */
-    162,  /* U+2FF8 - U+2FFF : 0x11119999 */
-    163,  /* U+3000 - U+3007 : 0x1119999E */
+    152,  /* U+2FF8 - U+2FFF : 0x11119999 */
+    160,  /* U+3000 - U+3007 : 0x1119999E */
       9,  /* U+3008 - U+300F : 0x99999999 */
       9,  /* U+3010 - U+3017 : 0x99999999 */
       9,  /* U+3018 - U+301F : 0x99999999 */
      21,  /* U+3020 - U+3027 : 0x11111119 */
-    164,  /* U+3028 - U+302F : 0xAAAAAA11 */
-    141,  /* U+3030 - U+3037 : 0x99111119 */
+    161,  /* U+3028 - U+302F : 0xAAAAAA11 */
+    142,  /* U+3030 - U+3037 : 0x99111119 */
      32,  /* U+3038 - U+303F : 0x99911111 */
       1,  /* U+3040 - U+3047 : 0x11111111 */
       1,  /* U+3048 - U+304F : 0x11111111 */
       1,  /* U+3050 - U+3057 : 0x11111111 */
       1,  /* U+3058 - U+305F : 0x11111111 */
       1,  /* U+3060 - U+3067 : 0x11111111 */
       1,  /* U+3068 - U+306F : 0x11111111 */
       1,  /* U+3070 - U+3077 : 0x11111111 */
       1,  /* U+3078 - U+307F : 0x11111111 */
       1,  /* U+3080 - U+3087 : 0x11111111 */
       1,  /* U+3088 - U+308F : 0x11111111 */
       1,  /* U+3090 - U+3097 : 0x11111111 */
-    165,  /* U+3098 - U+309F : 0x11199AA1 */
+    162,  /* U+3098 - U+309F : 0x11199AA1 */
      21,  /* U+30A0 - U+30A7 : 0x11111119 */
       1,  /* U+30A8 - U+30AF : 0x11111111 */
       1,  /* U+30B0 - U+30B7 : 0x11111111 */
       1,  /* U+30B8 - U+30BF : 0x11111111 */
       1,  /* U+30C0 - U+30C7 : 0x11111111 */
       1,  /* U+30C8 - U+30CF : 0x11111111 */
       1,  /* U+30D0 - U+30D7 : 0x11111111 */
       1,  /* U+30D8 - U+30DF : 0x11111111 */
       1,  /* U+30E0 - U+30E7 : 0x11111111 */
       1,  /* U+30E8 - U+30EF : 0x11111111 */
       1,  /* U+30F0 - U+30F7 : 0x11111111 */
-    166,  /* U+30F8 - U+30FF : 0x11119111 */
+    163,  /* U+30F8 - U+30FF : 0x11119111 */
       1,  /* U+3100 - U+3107 : 0x11111111 */
       1,  /* U+3108 - U+310F : 0x11111111 */
       1,  /* U+3110 - U+3117 : 0x11111111 */
       1,  /* U+3118 - U+311F : 0x11111111 */
       1,  /* U+3120 - U+3127 : 0x11111111 */
       1,  /* U+3128 - U+312F : 0x11111111 */
       1,  /* U+3130 - U+3137 : 0x11111111 */
       1,  /* U+3138 - U+313F : 0x11111111 */
@@ -1635,46 +1635,46 @@ static PRUint8 gBidiCatIdx1[1664] = {
       1,  /* U+31A0 - U+31A7 : 0x11111111 */
       1,  /* U+31A8 - U+31AF : 0x11111111 */
       1,  /* U+31B0 - U+31B7 : 0x11111111 */
       1,  /* U+31B8 - U+31BF : 0x11111111 */
       9,  /* U+31C0 - U+31C7 : 0x99999999 */
       9,  /* U+31C8 - U+31CF : 0x99999999 */
       9,  /* U+31D0 - U+31D7 : 0x99999999 */
       9,  /* U+31D8 - U+31DF : 0x99999999 */
-    162,  /* U+31E0 - U+31E7 : 0x11119999 */
+    152,  /* U+31E0 - U+31E7 : 0x11119999 */
       1,  /* U+31E8 - U+31EF : 0x11111111 */
       1,  /* U+31F0 - U+31F7 : 0x11111111 */
       1,  /* U+31F8 - U+31FF : 0x11111111 */
       1,  /* U+3200 - U+3207 : 0x11111111 */
       1,  /* U+3208 - U+320F : 0x11111111 */
       1,  /* U+3210 - U+3217 : 0x11111111 */
-    128,  /* U+3218 - U+321F : 0x19911111 */
+    129,  /* U+3218 - U+321F : 0x19911111 */
       1,  /* U+3220 - U+3227 : 0x11111111 */
       1,  /* U+3228 - U+322F : 0x11111111 */
       1,  /* U+3230 - U+3237 : 0x11111111 */
       1,  /* U+3238 - U+323F : 0x11111111 */
       1,  /* U+3240 - U+3247 : 0x11111111 */
       1,  /* U+3248 - U+324F : 0x11111111 */
       9,  /* U+3250 - U+3257 : 0x99999999 */
       9,  /* U+3258 - U+325F : 0x99999999 */
       1,  /* U+3260 - U+3267 : 0x11111111 */
       1,  /* U+3268 - U+326F : 0x11111111 */
       1,  /* U+3270 - U+3277 : 0x11111111 */
-    167,  /* U+3278 - U+327F : 0x19991111 */
+    164,  /* U+3278 - U+327F : 0x19991111 */
       1,  /* U+3280 - U+3287 : 0x11111111 */
       1,  /* U+3288 - U+328F : 0x11111111 */
       1,  /* U+3290 - U+3297 : 0x11111111 */
       1,  /* U+3298 - U+329F : 0x11111111 */
       1,  /* U+32A0 - U+32A7 : 0x11111111 */
       1,  /* U+32A8 - U+32AF : 0x11111111 */
-    157,  /* U+32B0 - U+32B7 : 0x99999991 */
+    156,  /* U+32B0 - U+32B7 : 0x99999991 */
       9,  /* U+32B8 - U+32BF : 0x99999999 */
       1,  /* U+32C0 - U+32C7 : 0x11111111 */
-    168,  /* U+32C8 - U+32CF : 0x99991111 */
+    165,  /* U+32C8 - U+32CF : 0x99991111 */
       1,  /* U+32D0 - U+32D7 : 0x11111111 */
       1,  /* U+32D8 - U+32DF : 0x11111111 */
       1,  /* U+32E0 - U+32E7 : 0x11111111 */
       1,  /* U+32E8 - U+32EF : 0x11111111 */
       1,  /* U+32F0 - U+32F7 : 0x11111111 */
       1,  /* U+32F8 - U+32FF : 0x11111111 */
       1,  /* U+3300 - U+3307 : 0x11111111 */
       1,  /* U+3308 - U+330F : 0x11111111 */
@@ -1686,17 +1686,17 @@ static PRUint8 gBidiCatIdx1[1664] = {
       1,  /* U+3338 - U+333F : 0x11111111 */
       1,  /* U+3340 - U+3347 : 0x11111111 */
       1,  /* U+3348 - U+334F : 0x11111111 */
       1,  /* U+3350 - U+3357 : 0x11111111 */
       1,  /* U+3358 - U+335F : 0x11111111 */
       1,  /* U+3360 - U+3367 : 0x11111111 */
       1,  /* U+3368 - U+336F : 0x11111111 */
      29,  /* U+3370 - U+3377 : 0x91111111 */
-    151,  /* U+3378 - U+337F : 0x11111999 */
+    153,  /* U+3378 - U+337F : 0x11111999 */
       1,  /* U+3380 - U+3387 : 0x11111111 */
       1,  /* U+3388 - U+338F : 0x11111111 */
       1,  /* U+3390 - U+3397 : 0x11111111 */
       1,  /* U+3398 - U+339F : 0x11111111 */
       1,  /* U+33A0 - U+33A7 : 0x11111111 */
       1,  /* U+33A8 - U+33AF : 0x11111111 */
       1,  /* U+33B0 - U+33B7 : 0x11111111 */
       1,  /* U+33B8 - U+33BF : 0x11111111 */
@@ -1923,18 +1923,18 @@ static PRUint8 gBidiCatIdx3[384] = {
       1,  /* U+A630 - U+A637 : 0x11111111 */
       1,  /* U+A638 - U+A63F : 0x11111111 */
       1,  /* U+A640 - U+A647 : 0x11111111 */
       1,  /* U+A648 - U+A64F : 0x11111111 */
       1,  /* U+A650 - U+A657 : 0x11111111 */
       1,  /* U+A658 - U+A65F : 0x11111111 */
       1,  /* U+A660 - U+A667 : 0x11111111 */
      95,  /* U+A668 - U+A66F : 0xA1111111 */
-    169,  /* U+A670 - U+A677 : 0x11119AAA */
-    170,  /* U+A678 - U+A67F : 0x99AA1111 */
+    166,  /* U+A670 - U+A677 : 0x11119AAA */
+    167,  /* U+A678 - U+A67F : 0x99AA1111 */
       1,  /* U+A680 - U+A687 : 0x11111111 */
       1,  /* U+A688 - U+A68F : 0x11111111 */
       1,  /* U+A690 - U+A697 : 0x11111111 */
       1,  /* U+A698 - U+A69F : 0x11111111 */
       1,  /* U+A6A0 - U+A6A7 : 0x11111111 */
       1,  /* U+A6A8 - U+A6AF : 0x11111111 */
       1,  /* U+A6B0 - U+A6B7 : 0x11111111 */
       1,  /* U+A6B8 - U+A6BF : 0x11111111 */
@@ -1973,41 +1973,41 @@ static PRUint8 gBidiCatIdx3[384] = {
       1,  /* U+A7C0 - U+A7C7 : 0x11111111 */
       1,  /* U+A7C8 - U+A7CF : 0x11111111 */
       1,  /* U+A7D0 - U+A7D7 : 0x11111111 */
       1,  /* U+A7D8 - U+A7DF : 0x11111111 */
       1,  /* U+A7E0 - U+A7E7 : 0x11111111 */
       1,  /* U+A7E8 - U+A7EF : 0x11111111 */
       1,  /* U+A7F0 - U+A7F7 : 0x11111111 */
       1,  /* U+A7F8 - U+A7FF : 0x11111111 */
-    171,  /* U+A800 - U+A807 : 0x1A111A11 */
-    172,  /* U+A808 - U+A80F : 0x1111A111 */
+    168,  /* U+A800 - U+A807 : 0x1A111A11 */
+    169,  /* U+A808 - U+A80F : 0x1111A111 */
       1,  /* U+A810 - U+A817 : 0x11111111 */
       1,  /* U+A818 - U+A81F : 0x11111111 */
      89,  /* U+A820 - U+A827 : 0x1AA11111 */
-    162,  /* U+A828 - U+A82F : 0x11119999 */
+    152,  /* U+A828 - U+A82F : 0x11119999 */
       1,  /* U+A830 - U+A837 : 0x11111111 */
-    173,  /* U+A838 - U+A83F : 0x11111177 */
+    139,  /* U+A838 - U+A83F : 0x11111177 */
       1,  /* U+A840 - U+A847 : 0x11111111 */
       1,  /* U+A848 - U+A84F : 0x11111111 */
       1,  /* U+A850 - U+A857 : 0x11111111 */
       1,  /* U+A858 - U+A85F : 0x11111111 */
       1,  /* U+A860 - U+A867 : 0x11111111 */
       1,  /* U+A868 - U+A86F : 0x11111111 */
-    168,  /* U+A870 - U+A877 : 0x99991111 */
+    165,  /* U+A870 - U+A877 : 0x99991111 */
       1,  /* U+A878 - U+A87F : 0x11111111 */
       1,  /* U+A880 - U+A887 : 0x11111111 */
       1,  /* U+A888 - U+A88F : 0x11111111 */
       1,  /* U+A890 - U+A897 : 0x11111111 */
       1,  /* U+A898 - U+A89F : 0x11111111 */
       1,  /* U+A8A0 - U+A8A7 : 0x11111111 */
       1,  /* U+A8A8 - U+A8AF : 0x11111111 */
       1,  /* U+A8B0 - U+A8B7 : 0x11111111 */
       1,  /* U+A8B8 - U+A8BF : 0x11111111 */
-     65,  /* U+A8C0 - U+A8C7 : 0x111A1111 */
+     70,  /* U+A8C0 - U+A8C7 : 0x111A1111 */
       1,  /* U+A8C8 - U+A8CF : 0x11111111 */
       1,  /* U+A8D0 - U+A8D7 : 0x11111111 */
       1,  /* U+A8D8 - U+A8DF : 0x11111111 */
      10,  /* U+A8E0 - U+A8E7 : 0xAAAAAAAA */
      10,  /* U+A8E8 - U+A8EF : 0xAAAAAAAA */
      38,  /* U+A8F0 - U+A8F7 : 0x111111AA */
       1,  /* U+A8F8 - U+A8FF : 0x11111111 */
       1,  /* U+A900 - U+A907 : 0x11111111 */
@@ -2027,51 +2027,51 @@ static PRUint8 gBidiCatIdx3[384] = {
       1,  /* U+A970 - U+A977 : 0x11111111 */
       1,  /* U+A978 - U+A97F : 0x11111111 */
      64,  /* U+A980 - U+A987 : 0x11111AAA */
       1,  /* U+A988 - U+A98F : 0x11111111 */
       1,  /* U+A990 - U+A997 : 0x11111111 */
       1,  /* U+A998 - U+A99F : 0x11111111 */
       1,  /* U+A9A0 - U+A9A7 : 0x11111111 */
       1,  /* U+A9A8 - U+A9AF : 0x11111111 */
-    174,  /* U+A9B0 - U+A9B7 : 0xAA11A111 */
-    175,  /* U+A9B8 - U+A9BF : 0x111A11AA */
+    170,  /* U+A9B0 - U+A9B7 : 0xAA11A111 */
+    171,  /* U+A9B8 - U+A9BF : 0x111A11AA */
       1,  /* U+A9C0 - U+A9C7 : 0x11111111 */
       1,  /* U+A9C8 - U+A9CF : 0x11111111 */
       1,  /* U+A9D0 - U+A9D7 : 0x11111111 */
       1,  /* U+A9D8 - U+A9DF : 0x11111111 */
       1,  /* U+A9E0 - U+A9E7 : 0x11111111 */
       1,  /* U+A9E8 - U+A9EF : 0x11111111 */
       1,  /* U+A9F0 - U+A9F7 : 0x11111111 */
       1,  /* U+A9F8 - U+A9FF : 0x11111111 */
       1,  /* U+AA00 - U+AA07 : 0x11111111 */
       1,  /* U+AA08 - U+AA0F : 0x11111111 */
       1,  /* U+AA10 - U+AA17 : 0x11111111 */
       1,  /* U+AA18 - U+AA1F : 0x11111111 */
       1,  /* U+AA20 - U+AA27 : 0x11111111 */
-    176,  /* U+AA28 - U+AA2F : 0x1AAAAAA1 */
+    172,  /* U+AA28 - U+AA2F : 0x1AAAAAA1 */
     105,  /* U+AA30 - U+AA37 : 0x1AA11AA1 */
       1,  /* U+AA38 - U+AA3F : 0x11111111 */
-    172,  /* U+AA40 - U+AA47 : 0x1111A111 */
-     65,  /* U+AA48 - U+AA4F : 0x111A1111 */
+    169,  /* U+AA40 - U+AA47 : 0x1111A111 */
+     70,  /* U+AA48 - U+AA4F : 0x111A1111 */
       1,  /* U+AA50 - U+AA57 : 0x11111111 */
       1,  /* U+AA58 - U+AA5F : 0x11111111 */
       1,  /* U+AA60 - U+AA67 : 0x11111111 */
       1,  /* U+AA68 - U+AA6F : 0x11111111 */
       1,  /* U+AA70 - U+AA77 : 0x11111111 */
       1,  /* U+AA78 - U+AA7F : 0x11111111 */
       1,  /* U+AA80 - U+AA87 : 0x11111111 */
       1,  /* U+AA88 - U+AA8F : 0x11111111 */
       1,  /* U+AA90 - U+AA97 : 0x11111111 */
       1,  /* U+AA98 - U+AA9F : 0x11111111 */
       1,  /* U+AAA0 - U+AAA7 : 0x11111111 */
       1,  /* U+AAA8 - U+AAAF : 0x11111111 */
-    177,  /* U+AAB0 - U+AAB7 : 0xA11AAA1A */
+    173,  /* U+AAB0 - U+AAB7 : 0xA11AAA1A */
      87,  /* U+AAB8 - U+AABF : 0xAA11111A */
-     70,  /* U+AAC0 - U+AAC7 : 0x111111A1 */
+     69,  /* U+AAC0 - U+AAC7 : 0x111111A1 */
       1,  /* U+AAC8 - U+AACF : 0x11111111 */
       1,  /* U+AAD0 - U+AAD7 : 0x11111111 */
       1,  /* U+AAD8 - U+AADF : 0x11111111 */
       1,  /* U+AAE0 - U+AAE7 : 0x11111111 */
       1,  /* U+AAE8 - U+AAEF : 0x11111111 */
       1,  /* U+AAF0 - U+AAF7 : 0x11111111 */
       1,  /* U+AAF8 - U+AAFF : 0x11111111 */
       1,  /* U+AB00 - U+AB07 : 0x11111111 */
@@ -2184,19 +2184,19 @@ static PRUint8 gBidiCatIdx5[276] = {
       1,  /* U+FAD8 - U+FADF : 0x11111111 */
       1,  /* U+FAE0 - U+FAE7 : 0x11111111 */
       1,  /* U+FAE8 - U+FAEF : 0x11111111 */
       1,  /* U+FAF0 - U+FAF7 : 0x11111111 */
       1,  /* U+FAF8 - U+FAFF : 0x11111111 */
       1,  /* U+FB00 - U+FB07 : 0x11111111 */
       1,  /* U+FB08 - U+FB0F : 0x11111111 */
       1,  /* U+FB10 - U+FB17 : 0x11111111 */
-    178,  /* U+FB18 - U+FB1F : 0x2A211111 */
+    174,  /* U+FB18 - U+FB1F : 0x2A211111 */
       2,  /* U+FB20 - U+FB27 : 0x22222222 */
-    179,  /* U+FB28 - U+FB2F : 0x22222262 */
+    175,  /* U+FB28 - U+FB2F : 0x22222262 */
       2,  /* U+FB30 - U+FB37 : 0x22222222 */
       2,  /* U+FB38 - U+FB3F : 0x22222222 */
       2,  /* U+FB40 - U+FB47 : 0x22222222 */
       2,  /* U+FB48 - U+FB4F : 0x22222222 */
       3,  /* U+FB50 - U+FB57 : 0x33333333 */
       3,  /* U+FB58 - U+FB5F : 0x33333333 */
       3,  /* U+FB60 - U+FB67 : 0x33333333 */
       3,  /* U+FB68 - U+FB6F : 0x33333333 */
@@ -2252,17 +2252,17 @@ static PRUint8 gBidiCatIdx5[276] = {
       3,  /* U+FCF8 - U+FCFF : 0x33333333 */
       3,  /* U+FD00 - U+FD07 : 0x33333333 */
       3,  /* U+FD08 - U+FD0F : 0x33333333 */
       3,  /* U+FD10 - U+FD17 : 0x33333333 */
       3,  /* U+FD18 - U+FD1F : 0x33333333 */
       3,  /* U+FD20 - U+FD27 : 0x33333333 */
       3,  /* U+FD28 - U+FD2F : 0x33333333 */
       3,  /* U+FD30 - U+FD37 : 0x33333333 */
-    180,  /* U+FD38 - U+FD3F : 0x99333333 */
+    176,  /* U+FD38 - U+FD3F : 0x99333333 */
       3,  /* U+FD40 - U+FD47 : 0x33333333 */
       3,  /* U+FD48 - U+FD4F : 0x33333333 */
       3,  /* U+FD50 - U+FD57 : 0x33333333 */
       3,  /* U+FD58 - U+FD5F : 0x33333333 */
       3,  /* U+FD60 - U+FD67 : 0x33333333 */
       3,  /* U+FD68 - U+FD6F : 0x33333333 */
       3,  /* U+FD70 - U+FD77 : 0x33333333 */
       3,  /* U+FD78 - U+FD7F : 0x33333333 */
@@ -2276,31 +2276,31 @@ static PRUint8 gBidiCatIdx5[276] = {
       3,  /* U+FDB8 - U+FDBF : 0x33333333 */
       3,  /* U+FDC0 - U+FDC7 : 0x33333333 */
       3,  /* U+FDC8 - U+FDCF : 0x33333333 */
       3,  /* U+FDD0 - U+FDD7 : 0x33333333 */
       3,  /* U+FDD8 - U+FDDF : 0x33333333 */
       3,  /* U+FDE0 - U+FDE7 : 0x33333333 */
       3,  /* U+FDE8 - U+FDEF : 0x33333333 */
       3,  /* U+FDF0 - U+FDF7 : 0x33333333 */
-    181,  /* U+FDF8 - U+FDFF : 0x33933333 */
+    177,  /* U+FDF8 - U+FDFF : 0x33933333 */
      10,  /* U+FE00 - U+FE07 : 0xAAAAAAAA */
      10,  /* U+FE08 - U+FE0F : 0xAAAAAAAA */
       9,  /* U+FE10 - U+FE17 : 0x99999999 */
     108,  /* U+FE18 - U+FE1F : 0x11111199 */
      96,  /* U+FE20 - U+FE27 : 0x1AAAAAAA */
       1,  /* U+FE28 - U+FE2F : 0x11111111 */
       9,  /* U+FE30 - U+FE37 : 0x99999999 */
       9,  /* U+FE38 - U+FE3F : 0x99999999 */
       9,  /* U+FE40 - U+FE47 : 0x99999999 */
       9,  /* U+FE48 - U+FE4F : 0x99999999 */
-    182,  /* U+FE50 - U+FE57 : 0x99891898 */
-    183,  /* U+FE58 - U+FE5F : 0x79999999 */
-    184,  /* U+FE60 - U+FE67 : 0x19996699 */
-    185,  /* U+FE68 - U+FE6F : 0x11119779 */
+    178,  /* U+FE50 - U+FE57 : 0x99891898 */
+    179,  /* U+FE58 - U+FE5F : 0x79999999 */
+    180,  /* U+FE60 - U+FE67 : 0x19996699 */
+    181,  /* U+FE68 - U+FE6F : 0x11119779 */
       3,  /* U+FE70 - U+FE77 : 0x33333333 */
       3,  /* U+FE78 - U+FE7F : 0x33333333 */
       3,  /* U+FE80 - U+FE87 : 0x33333333 */
       3,  /* U+FE88 - U+FE8F : 0x33333333 */
       3,  /* U+FE90 - U+FE97 : 0x33333333 */
       3,  /* U+FE98 - U+FE9F : 0x33333333 */
       3,  /* U+FEA0 - U+FEA7 : 0x33333333 */
       3,  /* U+FEA8 - U+FEAF : 0x33333333 */
@@ -2308,49 +2308,49 @@ static PRUint8 gBidiCatIdx5[276] = {
       3,  /* U+FEB8 - U+FEBF : 0x33333333 */
       3,  /* U+FEC0 - U+FEC7 : 0x33333333 */
       3,  /* U+FEC8 - U+FECF : 0x33333333 */
       3,  /* U+FED0 - U+FED7 : 0x33333333 */
       3,  /* U+FED8 - U+FEDF : 0x33333333 */
       3,  /* U+FEE0 - U+FEE7 : 0x33333333 */
       3,  /* U+FEE8 - U+FEEF : 0x33333333 */
       3,  /* U+FEF0 - U+FEF7 : 0x33333333 */
-     55,  /* U+FEF8 - U+FEFF : 0xB3333333 */
-    186,  /* U+FF00 - U+FF07 : 0x99777991 */
+    182,  /* U+FEF8 - U+FEFF : 0xB3333333 */
+    183,  /* U+FF00 - U+FF07 : 0x99777991 */
      19,  /* U+FF08 - U+FF0F : 0x88686999 */
       5,  /* U+FF10 - U+FF17 : 0x55555555 */
      20,  /* U+FF18 - U+FF1F : 0x99999855 */
      21,  /* U+FF20 - U+FF27 : 0x11111119 */
       1,  /* U+FF28 - U+FF2F : 0x11111111 */
       1,  /* U+FF30 - U+FF37 : 0x11111111 */
      22,  /* U+FF38 - U+FF3F : 0x99999111 */
      21,  /* U+FF40 - U+FF47 : 0x11111119 */
       1,  /* U+FF48 - U+FF4F : 0x11111111 */
       1,  /* U+FF50 - U+FF57 : 0x11111111 */
      22,  /* U+FF58 - U+FF5F : 0x99999111 */
-    149,  /* U+FF60 - U+FF67 : 0x11999999 */
+    150,  /* U+FF60 - U+FF67 : 0x11999999 */
       1,  /* U+FF68 - U+FF6F : 0x11111111 */
       1,  /* U+FF70 - U+FF77 : 0x11111111 */
       1,  /* U+FF78 - U+FF7F : 0x11111111 */
       1,  /* U+FF80 - U+FF87 : 0x11111111 */
       1,  /* U+FF88 - U+FF8F : 0x11111111 */
       1,  /* U+FF90 - U+FF97 : 0x11111111 */
       1,  /* U+FF98 - U+FF9F : 0x11111111 */
       1,  /* U+FFA0 - U+FFA7 : 0x11111111 */
       1,  /* U+FFA8 - U+FFAF : 0x11111111 */
       1,  /* U+FFB0 - U+FFB7 : 0x11111111 */
       1,  /* U+FFB8 - U+FFBF : 0x11111111 */
       1,  /* U+FFC0 - U+FFC7 : 0x11111111 */
       1,  /* U+FFC8 - U+FFCF : 0x11111111 */
       1,  /* U+FFD0 - U+FFD7 : 0x11111111 */
       1,  /* U+FFD8 - U+FFDF : 0x11111111 */
-    187,  /* U+FFE0 - U+FFE7 : 0x17799977 */
+    184,  /* U+FFE0 - U+FFE7 : 0x17799977 */
      90,  /* U+FFE8 - U+FFEF : 0x19999999 */
       1,  /* U+FFF0 - U+FFF7 : 0x11111111 */
-    188,  /* U+FFF8 - U+FFFF : 0x11999991 */
+    185,  /* U+FFF8 - U+FFFF : 0x11999991 */
       1,  /* U+10000 - U+10007 : 0x11111111 */
       1,  /* U+10008 - U+1000F : 0x11111111 */
       1,  /* U+10010 - U+10017 : 0x11111111 */
       1,  /* U+10018 - U+1001F : 0x11111111 */
       1,  /* U+10020 - U+10027 : 0x11111111 */
       1,  /* U+10028 - U+1002F : 0x11111111 */
       1,  /* U+10030 - U+10037 : 0x11111111 */
       1,  /* U+10038 - U+1003F : 0x11111111 */
@@ -2373,36 +2373,36 @@ static PRUint8 gBidiCatIdx5[276] = {
       1,  /* U+100C0 - U+100C7 : 0x11111111 */
       1,  /* U+100C8 - U+100CF : 0x11111111 */
       1,  /* U+100D0 - U+100D7 : 0x11111111 */
       1,  /* U+100D8 - U+100DF : 0x11111111 */
       1,  /* U+100E0 - U+100E7 : 0x11111111 */
       1,  /* U+100E8 - U+100EF : 0x11111111 */
       1,  /* U+100F0 - U+100F7 : 0x11111111 */
       1,  /* U+100F8 - U+100FF : 0x11111111 */
-    147,  /* U+10100 - U+10107 : 0x11111191 */
+    148,  /* U+10100 - U+10107 : 0x11111191 */
       1,  /* U+10108 - U+1010F : 0x11111111 */
       1,  /* U+10110 - U+10117 : 0x11111111 */
       1,  /* U+10118 - U+1011F : 0x11111111 */
       1,  /* U+10120 - U+10127 : 0x11111111 */
       1,  /* U+10128 - U+1012F : 0x11111111 */
       1,  /* U+10130 - U+10137 : 0x11111111 */
       1,  /* U+10138 - U+1013F : 0x11111111 */
       9,  /* U+10140 - U+10147 : 0x99999999 */
       9,  /* U+10148 - U+1014F : 0x99999999 */
       9,  /* U+10150 - U+10157 : 0x99999999 */
       9,  /* U+10158 - U+1015F : 0x99999999 */
       9,  /* U+10160 - U+10167 : 0x99999999 */
       9,  /* U+10168 - U+1016F : 0x99999999 */
       9,  /* U+10170 - U+10177 : 0x99999999 */
       9,  /* U+10178 - U+1017F : 0x99999999 */
       9,  /* U+10180 - U+10187 : 0x99999999 */
-    151,  /* U+10188 - U+1018F : 0x11111999 */
+    153,  /* U+10188 - U+1018F : 0x11111999 */
       9,  /* U+10190 - U+10197 : 0x99999999 */
-    162,  /* U+10198 - U+1019F : 0x11119999 */
+    152,  /* U+10198 - U+1019F : 0x11119999 */
 };
 
 static PRUint8 gBidiCatIdx6[6] = {
       1,  /* U+101D0 - U+101D7 : 0x11111111 */
       1,  /* U+101D8 - U+101DF : 0x11111111 */
       1,  /* U+101E0 - U+101E7 : 0x11111111 */
       1,  /* U+101E8 - U+101EF : 0x11111111 */
       1,  /* U+101F0 - U+101F7 : 0x11111111 */
@@ -2506,32 +2506,32 @@ static PRUint8 gBidiCatIdx8[12] = {
       2,  /* U+10850 - U+10857 : 0x22222222 */
       2,  /* U+10858 - U+1085F : 0x22222222 */
 };
 
 static PRUint8 gBidiCatIdx9[8] = {
       2,  /* U+10900 - U+10907 : 0x22222222 */
       2,  /* U+10908 - U+1090F : 0x22222222 */
       2,  /* U+10910 - U+10917 : 0x22222222 */
-    189,  /* U+10918 - U+1091F : 0x92222222 */
+    186,  /* U+10918 - U+1091F : 0x92222222 */
       2,  /* U+10920 - U+10927 : 0x22222222 */
       2,  /* U+10928 - U+1092F : 0x22222222 */
       2,  /* U+10930 - U+10937 : 0x22222222 */
       2,  /* U+10938 - U+1093F : 0x22222222 */
 };
 
 static PRUint8 gBidiCatIdx10[16] = {
-    190,  /* U+10A00 - U+10A07 : 0x2AA2AAA2 */
-    191,  /* U+10A08 - U+10A0F : 0xAAAA2222 */
+    187,  /* U+10A00 - U+10A07 : 0x2AA2AAA2 */
+    188,  /* U+10A08 - U+10A0F : 0xAAAA2222 */
       2,  /* U+10A10 - U+10A17 : 0x22222222 */
       2,  /* U+10A18 - U+10A1F : 0x22222222 */
       2,  /* U+10A20 - U+10A27 : 0x22222222 */
       2,  /* U+10A28 - U+10A2F : 0x22222222 */
       2,  /* U+10A30 - U+10A37 : 0x22222222 */
-    192,  /* U+10A38 - U+10A3F : 0xA2222AAA */
+    189,  /* U+10A38 - U+10A3F : 0xA2222AAA */
       2,  /* U+10A40 - U+10A47 : 0x22222222 */
       2,  /* U+10A48 - U+10A4F : 0x22222222 */
       2,  /* U+10A50 - U+10A57 : 0x22222222 */
       2,  /* U+10A58 - U+10A5F : 0x22222222 */
       2,  /* U+10A60 - U+10A67 : 0x22222222 */
       2,  /* U+10A68 - U+10A6F : 0x22222222 */
       2,  /* U+10A70 - U+10A77 : 0x22222222 */
       2,  /* U+10A78 - U+10A7F : 0x22222222 */
@@ -2540,17 +2540,17 @@ static PRUint8 gBidiCatIdx10[16] = {
 static PRUint8 gBidiCatIdx11[16] = {
       2,  /* U+10B00 - U+10B07 : 0x22222222 */
       2,  /* U+10B08 - U+10B0F : 0x22222222 */
       2,  /* U+10B10 - U+10B17 : 0x22222222 */
       2,  /* U+10B18 - U+10B1F : 0x22222222 */
       2,  /* U+10B20 - U+10B27 : 0x22222222 */
       2,  /* U+10B28 - U+10B2F : 0x22222222 */
       2,  /* U+10B30 - U+10B37 : 0x22222222 */
-    193,  /* U+10B38 - U+10B3F : 0x99999992 */
+    190,  /* U+10B38 - U+10B3F : 0x99999992 */
       2,  /* U+10B40 - U+10B47 : 0x22222222 */
       2,  /* U+10B48 - U+10B4F : 0x22222222 */
       2,  /* U+10B50 - U+10B57 : 0x22222222 */
       2,  /* U+10B58 - U+10B5F : 0x22222222 */
       2,  /* U+10B60 - U+10B67 : 0x22222222 */
       2,  /* U+10B68 - U+10B6F : 0x22222222 */
       2,  /* U+10B70 - U+10B77 : 0x22222222 */
       2,  /* U+10B78 - U+10B7F : 0x22222222 */
@@ -2568,27 +2568,43 @@ static PRUint8 gBidiCatIdx12[10] = {
       2,  /* U+10C40 - U+10C47 : 0x22222222 */
       2,  /* U+10C48 - U+10C4F : 0x22222222 */
 };
 
 static PRUint8 gBidiCatIdx13[4] = {
       4,  /* U+10E60 - U+10E67 : 0x44444444 */
       4,  /* U+10E68 - U+10E6F : 0x44444444 */
       4,  /* U+10E70 - U+10E77 : 0x44444444 */
-    194,  /* U+10E78 - U+10E7F : 0x24444444 */
+    191,  /* U+10E78 - U+10E7F : 0x24444444 */
 };
 
-static PRUint8 gBidiCatIdx14[10] = {
+static PRUint8 gBidiCatIdx14[26] = {
+     69,  /* U+11000 - U+11007 : 0x111111A1 */
+      1,  /* U+11008 - U+1100F : 0x11111111 */
+      1,  /* U+11010 - U+11017 : 0x11111111 */
+      1,  /* U+11018 - U+1101F : 0x11111111 */
+      1,  /* U+11020 - U+11027 : 0x11111111 */
+      1,  /* U+11028 - U+1102F : 0x11111111 */
+      1,  /* U+11030 - U+11037 : 0x11111111 */
+     10,  /* U+11038 - U+1103F : 0xAAAAAAAA */
+     96,  /* U+11040 - U+11047 : 0x1AAAAAAA */
+      1,  /* U+11048 - U+1104F : 0x11111111 */
+     31,  /* U+11050 - U+11057 : 0x99999911 */
+      9,  /* U+11058 - U+1105F : 0x99999999 */
+    150,  /* U+11060 - U+11067 : 0x11999999 */
+      1,  /* U+11068 - U+1106F : 0x11111111 */
+      1,  /* U+11070 - U+11077 : 0x11111111 */
+      1,  /* U+11078 - U+1107F : 0x11111111 */
      38,  /* U+11080 - U+11087 : 0x111111AA */
       1,  /* U+11088 - U+1108F : 0x11111111 */
       1,  /* U+11090 - U+11097 : 0x11111111 */
       1,  /* U+11098 - U+1109F : 0x11111111 */
       1,  /* U+110A0 - U+110A7 : 0x11111111 */
       1,  /* U+110A8 - U+110AF : 0x11111111 */
-    195,  /* U+110B0 - U+110B7 : 0x1AAAA111 */
+    192,  /* U+110B0 - U+110B7 : 0x1AAAA111 */
      75,  /* U+110B8 - U+110BF : 0x11111AA1 */
       1,  /* U+110C0 - U+110C7 : 0x11111111 */
       1,  /* U+110C8 - U+110CF : 0x11111111 */
 };
 
 static PRUint8 gBidiCatIdx15[144] = {
       1,  /* U+12000 - U+12007 : 0x11111111 */
       1,  /* U+12008 - U+1200F : 0x11111111 */
@@ -2868,17 +2884,97 @@ static PRUint8 gBidiCatIdx16[134] = {
       1,  /* U+13400 - U+13407 : 0x11111111 */
       1,  /* U+13408 - U+1340F : 0x11111111 */
       1,  /* U+13410 - U+13417 : 0x11111111 */
       1,  /* U+13418 - U+1341F : 0x11111111 */
       1,  /* U+13420 - U+13427 : 0x11111111 */
       1,  /* U+13428 - U+1342F : 0x11111111 */
 };
 
-static PRUint8 gBidiCatIdx17[256] = {
+static PRUint8 gBidiCatIdx17[72] = {
+      1,  /* U+16800 - U+16807 : 0x11111111 */
+      1,  /* U+16808 - U+1680F : 0x11111111 */
+      1,  /* U+16810 - U+16817 : 0x11111111 */
+      1,  /* U+16818 - U+1681F : 0x11111111 */
+      1,  /* U+16820 - U+16827 : 0x11111111 */
+      1,  /* U+16828 - U+1682F : 0x11111111 */
+      1,  /* U+16830 - U+16837 : 0x11111111 */
+      1,  /* U+16838 - U+1683F : 0x11111111 */
+      1,  /* U+16840 - U+16847 : 0x11111111 */
+      1,  /* U+16848 - U+1684F : 0x11111111 */
+      1,  /* U+16850 - U+16857 : 0x11111111 */
+      1,  /* U+16858 - U+1685F : 0x11111111 */
+      1,  /* U+16860 - U+16867 : 0x11111111 */
+      1,  /* U+16868 - U+1686F : 0x11111111 */
+      1,  /* U+16870 - U+16877 : 0x11111111 */
+      1,  /* U+16878 - U+1687F : 0x11111111 */
+      1,  /* U+16880 - U+16887 : 0x11111111 */
+      1,  /* U+16888 - U+1688F : 0x11111111 */
+      1,  /* U+16890 - U+16897 : 0x11111111 */
+      1,  /* U+16898 - U+1689F : 0x11111111 */
+      1,  /* U+168A0 - U+168A7 : 0x11111111 */
+      1,  /* U+168A8 - U+168AF : 0x11111111 */
+      1,  /* U+168B0 - U+168B7 : 0x11111111 */
+      1,  /* U+168B8 - U+168BF : 0x11111111 */
+      1,  /* U+168C0 - U+168C7 : 0x11111111 */
+      1,  /* U+168C8 - U+168CF : 0x11111111 */
+      1,  /* U+168D0 - U+168D7 : 0x11111111 */
+      1,  /* U+168D8 - U+168DF : 0x11111111 */
+      1,  /* U+168E0 - U+168E7 : 0x11111111 */
+      1,  /* U+168E8 - U+168EF : 0x11111111 */
+      1,  /* U+168F0 - U+168F7 : 0x11111111 */
+      1,  /* U+168F8 - U+168FF : 0x11111111 */
+      1,  /* U+16900 - U+16907 : 0x11111111 */
+      1,  /* U+16908 - U+1690F : 0x11111111 */
+      1,  /* U+16910 - U+16917 : 0x11111111 */
+      1,  /* U+16918 - U+1691F : 0x11111111 */
+      1,  /* U+16920 - U+16927 : 0x11111111 */
+      1,  /* U+16928 - U+1692F : 0x11111111 */
+      1,  /* U+16930 - U+16937 : 0x11111111 */
+      1,  /* U+16938 - U+1693F : 0x11111111 */
+      1,  /* U+16940 - U+16947 : 0x11111111 */
+      1,  /* U+16948 - U+1694F : 0x11111111 */
+      1,  /* U+16950 - U+16957 : 0x11111111 */
+      1,  /* U+16958 - U+1695F : 0x11111111 */
+      1,  /* U+16960 - U+16967 : 0x11111111 */
+      1,  /* U+16968 - U+1696F : 0x11111111 */
+      1,  /* U+16970 - U+16977 : 0x11111111 */
+      1,  /* U+16978 - U+1697F : 0x11111111 */
+      1,  /* U+16980 - U+16987 : 0x11111111 */
+      1,  /* U+16988 - U+1698F : 0x11111111 */
+      1,  /* U+16990 - U+16997 : 0x11111111 */
+      1,  /* U+16998 - U+1699F : 0x11111111 */
+      1,  /* U+169A0 - U+169A7 : 0x11111111 */
+      1,  /* U+169A8 - U+169AF : 0x11111111 */
+      1,  /* U+169B0 - U+169B7 : 0x11111111 */
+      1,  /* U+169B8 - U+169BF : 0x11111111 */
+      1,  /* U+169C0 - U+169C7 : 0x11111111 */
+      1,  /* U+169C8 - U+169CF : 0x11111111 */
+      1,  /* U+169D0 - U+169D7 : 0x11111111 */
+      1,  /* U+169D8 - U+169DF : 0x11111111 */
+      1,  /* U+169E0 - U+169E7 : 0x11111111 */
+      1,  /* U+169E8 - U+169EF : 0x11111111 */
+      1,  /* U+169F0 - U+169F7 : 0x11111111 */
+      1,  /* U+169F8 - U+169FF : 0x11111111 */
+      1,  /* U+16A00 - U+16A07 : 0x11111111 */
+      1,  /* U+16A08 - U+16A0F : 0x11111111 */
+      1,  /* U+16A10 - U+16A17 : 0x11111111 */
+      1,  /* U+16A18 - U+16A1F : 0x11111111 */
+      1,  /* U+16A20 - U+16A27 : 0x11111111 */
+      1,  /* U+16A28 - U+16A2F : 0x11111111 */
+      1,  /* U+16A30 - U+16A37 : 0x11111111 */
+      1,  /* U+16A38 - U+16A3F : 0x11111111 */
+};
+
+static PRUint8 gBidiCatIdx18[2] = {
+      1,  /* U+1B000 - U+1B007 : 0x11111111 */
+      1,  /* U+1B008 - U+1B00F : 0x11111111 */
+};
+
+static PRUint8 gBidiCatIdx19[256] = {
       1,  /* U+1D000 - U+1D007 : 0x11111111 */
       1,  /* U+1D008 - U+1D00F : 0x11111111 */
       1,  /* U+1D010 - U+1D017 : 0x11111111 */
       1,  /* U+1D018 - U+1D01F : 0x11111111 */
       1,  /* U+1D020 - U+1D027 : 0x11111111 */
       1,  /* U+1D028 - U+1D02F : 0x11111111 */
       1,  /* U+1D030 - U+1D037 : 0x11111111 */
       1,  /* U+1D038 - U+1D03F : 0x11111111 */
@@ -2915,19 +3011,19 @@ static PRUint8 gBidiCatIdx17[256] = {
       1,  /* U+1D130 - U+1D137 : 0x11111111 */
       1,  /* U+1D138 - U+1D13F : 0x11111111 */
       1,  /* U+1D140 - U+1D147 : 0x11111111 */
       1,  /* U+1D148 - U+1D14F : 0x11111111 */
       1,  /* U+1D150 - U+1D157 : 0x11111111 */
       1,  /* U+1D158 - U+1D15F : 0x11111111 */
      95,  /* U+1D160 - U+1D167 : 0xA1111111 */
      38,  /* U+1D168 - U+1D16F : 0x111111AA */
-    196,  /* U+1D170 - U+1D177 : 0xBBBBB111 */
-    197,  /* U+1D178 - U+1D17F : 0xAAAAABBB */
-    198,  /* U+1D180 - U+1D187 : 0xAAA11AAA */
+    193,  /* U+1D170 - U+1D177 : 0xBBBBB111 */
+    194,  /* U+1D178 - U+1D17F : 0xAAAAABBB */
+    195,  /* U+1D180 - U+1D187 : 0xAAA11AAA */
     112,  /* U+1D188 - U+1D18F : 0x1111AAAA */
       1,  /* U+1D190 - U+1D197 : 0x11111111 */
       1,  /* U+1D198 - U+1D19F : 0x11111111 */
       1,  /* U+1D1A0 - U+1D1A7 : 0x11111111 */
     123,  /* U+1D1A8 - U+1D1AF : 0x11AAAA11 */
       1,  /* U+1D1B0 - U+1D1B7 : 0x11111111 */
       1,  /* U+1D1B8 - U+1D1BF : 0x11111111 */
       1,  /* U+1D1C0 - U+1D1C7 : 0x11111111 */
@@ -2941,17 +3037,17 @@ static PRUint8 gBidiCatIdx17[256] = {
       9,  /* U+1D200 - U+1D207 : 0x99999999 */
       9,  /* U+1D208 - U+1D20F : 0x99999999 */
       9,  /* U+1D210 - U+1D217 : 0x99999999 */
       9,  /* U+1D218 - U+1D21F : 0x99999999 */
       9,  /* U+1D220 - U+1D227 : 0x99999999 */
       9,  /* U+1D228 - U+1D22F : 0x99999999 */
       9,  /* U+1D230 - U+1D237 : 0x99999999 */
       9,  /* U+1D238 - U+1D23F : 0x99999999 */
-    199,  /* U+1D240 - U+1D247 : 0x119AAA99 */
+    196,  /* U+1D240 - U+1D247 : 0x119AAA99 */
       1,  /* U+1D248 - U+1D24F : 0x11111111 */
       1,  /* U+1D250 - U+1D257 : 0x11111111 */
       1,  /* U+1D258 - U+1D25F : 0x11111111 */
       1,  /* U+1D260 - U+1D267 : 0x11111111 */
       1,  /* U+1D268 - U+1D26F : 0x11111111 */
       1,  /* U+1D270 - U+1D277 : 0x11111111 */
       1,  /* U+1D278 - U+1D27F : 0x11111111 */
       1,  /* U+1D280 - U+1D287 : 0x11111111 */
@@ -3088,90 +3184,90 @@ static PRUint8 gBidiCatIdx17[256] = {
       1,  /* U+1D698 - U+1D69F : 0x11111111 */
       1,  /* U+1D6A0 - U+1D6A7 : 0x11111111 */
       1,  /* U+1D6A8 - U+1D6AF : 0x11111111 */
       1,  /* U+1D6B0 - U+1D6B7 : 0x11111111 */
       1,  /* U+1D6B8 - U+1D6BF : 0x11111111 */
       1,  /* U+1D6C0 - U+1D6C7 : 0x11111111 */
       1,  /* U+1D6C8 - U+1D6CF : 0x11111111 */
       1,  /* U+1D6D0 - U+1D6D7 : 0x11111111 */
-    166,  /* U+1D6D8 - U+1D6DF : 0x11119111 */
+    163,  /* U+1D6D8 - U+1D6DF : 0x11119111 */
       1,  /* U+1D6E0 - U+1D6E7 : 0x11111111 */
       1,  /* U+1D6E8 - U+1D6EF : 0x11111111 */
       1,  /* U+1D6F0 - U+1D6F7 : 0x11111111 */
       1,  /* U+1D6F8 - U+1D6FF : 0x11111111 */
       1,  /* U+1D700 - U+1D707 : 0x11111111 */
       1,  /* U+1D708 - U+1D70F : 0x11111111 */
-    200,  /* U+1D710 - U+1D717 : 0x11911111 */
+    197,  /* U+1D710 - U+1D717 : 0x11911111 */
       1,  /* U+1D718 - U+1D71F : 0x11111111 */
       1,  /* U+1D720 - U+1D727 : 0x11111111 */
       1,  /* U+1D728 - U+1D72F : 0x11111111 */
       1,  /* U+1D730 - U+1D737 : 0x11111111 */
       1,  /* U+1D738 - U+1D73F : 0x11111111 */
       1,  /* U+1D740 - U+1D747 : 0x11111111 */
      29,  /* U+1D748 - U+1D74F : 0x91111111 */
       1,  /* U+1D750 - U+1D757 : 0x11111111 */
       1,  /* U+1D758 - U+1D75F : 0x11111111 */
       1,  /* U+1D760 - U+1D767 : 0x11111111 */
       1,  /* U+1D768 - U+1D76F : 0x11111111 */
       1,  /* U+1D770 - U+1D777 : 0x11111111 */
       1,  /* U+1D778 - U+1D77F : 0x11111111 */
       1,  /* U+1D780 - U+1D787 : 0x11111111 */
-    147,  /* U+1D788 - U+1D78F : 0x11111191 */
+    148,  /* U+1D788 - U+1D78F : 0x11111191 */
       1,  /* U+1D790 - U+1D797 : 0x11111111 */
       1,  /* U+1D798 - U+1D79F : 0x11111111 */
       1,  /* U+1D7A0 - U+1D7A7 : 0x11111111 */
       1,  /* U+1D7A8 - U+1D7AF : 0x11111111 */
       1,  /* U+1D7B0 - U+1D7B7 : 0x11111111 */
       1,  /* U+1D7B8 - U+1D7BF : 0x11111111 */
-    166,  /* U+1D7C0 - U+1D7C7 : 0x11119111 */
-    201,  /* U+1D7C8 - U+1D7CF : 0x55111111 */
+    163,  /* U+1D7C0 - U+1D7C7 : 0x11119111 */
+    198,  /* U+1D7C8 - U+1D7CF : 0x55111111 */
       5,  /* U+1D7D0 - U+1D7D7 : 0x55555555 */
       5,  /* U+1D7D8 - U+1D7DF : 0x55555555 */
       5,  /* U+1D7E0 - U+1D7E7 : 0x55555555 */
       5,  /* U+1D7E8 - U+1D7EF : 0x55555555 */
       5,  /* U+1D7F0 - U+1D7F7 : 0x55555555 */
       5,  /* U+1D7F8 - U+1D7FF : 0x55555555 */
 };
 
-static PRUint8 gBidiCatIdx18[74] = {
+static PRUint8 gBidiCatIdx20[240] = {
       9,  /* U+1F000 - U+1F007 : 0x99999999 */
       9,  /* U+1F008 - U+1F00F : 0x99999999 */
       9,  /* U+1F010 - U+1F017 : 0x99999999 */
       9,  /* U+1F018 - U+1F01F : 0x99999999 */
       9,  /* U+1F020 - U+1F027 : 0x99999999 */
-    162,  /* U+1F028 - U+1F02F : 0x11119999 */
+    152,  /* U+1F028 - U+1F02F : 0x11119999 */
       9,  /* U+1F030 - U+1F037 : 0x99999999 */
       9,  /* U+1F038 - U+1F03F : 0x99999999 */
       9,  /* U+1F040 - U+1F047 : 0x99999999 */
       9,  /* U+1F048 - U+1F04F : 0x99999999 */
       9,  /* U+1F050 - U+1F057 : 0x99999999 */
       9,  /* U+1F058 - U+1F05F : 0x99999999 */
       9,  /* U+1F060 - U+1F067 : 0x99999999 */
       9,  /* U+1F068 - U+1F06F : 0x99999999 */
       9,  /* U+1F070 - U+1F077 : 0x99999999 */
       9,  /* U+1F078 - U+1F07F : 0x99999999 */
       9,  /* U+1F080 - U+1F087 : 0x99999999 */
       9,  /* U+1F088 - U+1F08F : 0x99999999 */
-    162,  /* U+1F090 - U+1F097 : 0x11119999 */
+    152,  /* U+1F090 - U+1F097 : 0x11119999 */
       1,  /* U+1F098 - U+1F09F : 0x11111111 */
-      1,  /* U+1F0A0 - U+1F0A7 : 0x11111111 */
-      1,  /* U+1F0A8 - U+1F0AF : 0x11111111 */
-      1,  /* U+1F0B0 - U+1F0B7 : 0x11111111 */
-      1,  /* U+1F0B8 - U+1F0BF : 0x11111111 */
-      1,  /* U+1F0C0 - U+1F0C7 : 0x11111111 */
-      1,  /* U+1F0C8 - U+1F0CF : 0x11111111 */
-      1,  /* U+1F0D0 - U+1F0D7 : 0x11111111 */
-      1,  /* U+1F0D8 - U+1F0DF : 0x11111111 */
+      9,  /* U+1F0A0 - U+1F0A7 : 0x99999999 */
+     90,  /* U+1F0A8 - U+1F0AF : 0x19999999 */
+    156,  /* U+1F0B0 - U+1F0B7 : 0x99999991 */
+     90,  /* U+1F0B8 - U+1F0BF : 0x19999999 */
+    156,  /* U+1F0C0 - U+1F0C7 : 0x99999991 */
+      9,  /* U+1F0C8 - U+1F0CF : 0x99999999 */
+    156,  /* U+1F0D0 - U+1F0D7 : 0x99999991 */
+      9,  /* U+1F0D8 - U+1F0DF : 0x99999999 */
       1,  /* U+1F0E0 - U+1F0E7 : 0x11111111 */
       1,  /* U+1F0E8 - U+1F0EF : 0x11111111 */
       1,  /* U+1F0F0 - U+1F0F7 : 0x11111111 */
       1,  /* U+1F0F8 - U+1F0FF : 0x11111111 */
       5,  /* U+1F100 - U+1F107 : 0x55555555 */
-    202,  /* U+1F108 - U+1F10F : 0x11111555 */
+    199,  /* U+1F108 - U+1F10F : 0x11111555 */
       1,  /* U+1F110 - U+1F117 : 0x11111111 */
       1,  /* U+1F118 - U+1F11F : 0x11111111 */
       1,  /* U+1F120 - U+1F127 : 0x11111111 */
       1,  /* U+1F128 - U+1F12F : 0x11111111 */
       1,  /* U+1F130 - U+1F137 : 0x11111111 */
       1,  /* U+1F138 - U+1F13F : 0x11111111 */
       1,  /* U+1F140 - U+1F147 : 0x11111111 */
       1,  /* U+1F148 - U+1F14F : 0x11111111 */
@@ -3202,19 +3298,185 @@ static PRUint8 gBidiCatIdx18[74] = {
       1,  /* U+1F210 - U+1F217 : 0x11111111 */
       1,  /* U+1F218 - U+1F21F : 0x11111111 */
       1,  /* U+1F220 - U+1F227 : 0x11111111 */
       1,  /* U+1F228 - U+1F22F : 0x11111111 */
       1,  /* U+1F230 - U+1F237 : 0x11111111 */
       1,  /* U+1F238 - U+1F23F : 0x11111111 */
       1,  /* U+1F240 - U+1F247 : 0x11111111 */
       1,  /* U+1F248 - U+1F24F : 0x11111111 */
+      1,  /* U+1F250 - U+1F257 : 0x11111111 */
+      1,  /* U+1F258 - U+1F25F : 0x11111111 */
+      1,  /* U+1F260 - U+1F267 : 0x11111111 */
+      1,  /* U+1F268 - U+1F26F : 0x11111111 */
+      1,  /* U+1F270 - U+1F277 : 0x11111111 */
+      1,  /* U+1F278 - U+1F27F : 0x11111111 */
+      1,  /* U+1F280 - U+1F287 : 0x11111111 */
+      1,  /* U+1F288 - U+1F28F : 0x11111111 */
+      1,  /* U+1F290 - U+1F297 : 0x11111111 */
+      1,  /* U+1F298 - U+1F29F : 0x11111111 */
+      1,  /* U+1F2A0 - U+1F2A7 : 0x11111111 */
+      1,  /* U+1F2A8 - U+1F2AF : 0x11111111 */
+      1,  /* U+1F2B0 - U+1F2B7 : 0x11111111 */
+      1,  /* U+1F2B8 - U+1F2BF : 0x11111111 */
+      1,  /* U+1F2C0 - U+1F2C7 : 0x11111111 */
+      1,  /* U+1F2C8 - U+1F2CF : 0x11111111 */
+      1,  /* U+1F2D0 - U+1F2D7 : 0x11111111 */
+      1,  /* U+1F2D8 - U+1F2DF : 0x11111111 */
+      1,  /* U+1F2E0 - U+1F2E7 : 0x11111111 */
+      1,  /* U+1F2E8 - U+1F2EF : 0x11111111 */
+      1,  /* U+1F2F0 - U+1F2F7 : 0x11111111 */
+      1,  /* U+1F2F8 - U+1F2FF : 0x11111111 */
+      9,  /* U+1F300 - U+1F307 : 0x99999999 */
+      9,  /* U+1F308 - U+1F30F : 0x99999999 */
+      9,  /* U+1F310 - U+1F317 : 0x99999999 */
+      9,  /* U+1F318 - U+1F31F : 0x99999999 */
+     21,  /* U+1F320 - U+1F327 : 0x11111119 */
+      1,  /* U+1F328 - U+1F32F : 0x11111111 */
+     33,  /* U+1F330 - U+1F337 : 0x91999999 */
+      9,  /* U+1F338 - U+1F33F : 0x99999999 */
+      9,  /* U+1F340 - U+1F347 : 0x99999999 */
+      9,  /* U+1F348 - U+1F34F : 0x99999999 */
+      9,  /* U+1F350 - U+1F357 : 0x99999999 */
+      9,  /* U+1F358 - U+1F35F : 0x99999999 */
+      9,  /* U+1F360 - U+1F367 : 0x99999999 */
+      9,  /* U+1F368 - U+1F36F : 0x99999999 */
+      9,  /* U+1F370 - U+1F377 : 0x99999999 */
+    146,  /* U+1F378 - U+1F37F : 0x11199999 */
+      9,  /* U+1F380 - U+1F387 : 0x99999999 */
+      9,  /* U+1F388 - U+1F38F : 0x99999999 */
+    152,  /* U+1F390 - U+1F397 : 0x11119999 */
+      1,  /* U+1F398 - U+1F39F : 0x11111111 */
+      9,  /* U+1F3A0 - U+1F3A7 : 0x99999999 */
+      9,  /* U+1F3A8 - U+1F3AF : 0x99999999 */
+      9,  /* U+1F3B0 - U+1F3B7 : 0x99999999 */
+      9,  /* U+1F3B8 - U+1F3BF : 0x99999999 */
+    151,  /* U+1F3C0 - U+1F3C7 : 0x99199999 */
+    153,  /* U+1F3C8 - U+1F3CF : 0x11111999 */
+      1,  /* U+1F3D0 - U+1F3D7 : 0x11111111 */
+      1,  /* U+1F3D8 - U+1F3DF : 0x11111111 */
+      9,  /* U+1F3E0 - U+1F3E7 : 0x99999999 */
+      9,  /* U+1F3E8 - U+1F3EF : 0x99999999 */
+     21,  /* U+1F3F0 - U+1F3F7 : 0x11111119 */
+      1,  /* U+1F3F8 - U+1F3FF : 0x11111111 */
+      9,  /* U+1F400 - U+1F407 : 0x99999999 */
+      9,  /* U+1F408 - U+1F40F : 0x99999999 */
+      9,  /* U+1F410 - U+1F417 : 0x99999999 */
+      9,  /* U+1F418 - U+1F41F : 0x99999999 */
+      9,  /* U+1F420 - U+1F427 : 0x99999999 */
+      9,  /* U+1F428 - U+1F42F : 0x99999999 */
+      9,  /* U+1F430 - U+1F437 : 0x99999999 */
+     90,  /* U+1F438 - U+1F43F : 0x19999999 */
+    200,  /* U+1F440 - U+1F447 : 0x99999919 */
+      9,  /* U+1F448 - U+1F44F : 0x99999999 */
+      9,  /* U+1F450 - U+1F457 : 0x99999999 */
+      9,  /* U+1F458 - U+1F45F : 0x99999999 */
+      9,  /* U+1F460 - U+1F467 : 0x99999999 */
+      9,  /* U+1F468 - U+1F46F : 0x99999999 */
+      9,  /* U+1F470 - U+1F477 : 0x99999999 */
+      9,  /* U+1F478 - U+1F47F : 0x99999999 */
+      9,  /* U+1F480 - U+1F487 : 0x99999999 */
+    155,  /* U+1F488 - U+1F48F : 0x99919999 */
+      9,  /* U+1F490 - U+1F497 : 0x99999999 */
+      9,  /* U+1F498 - U+1F49F : 0x99999999 */
+      9,  /* U+1F4A0 - U+1F4A7 : 0x99999999 */
+      9,  /* U+1F4A8 - U+1F4AF : 0x99999999 */
+      9,  /* U+1F4B0 - U+1F4B7 : 0x99999999 */
+      9,  /* U+1F4B8 - U+1F4BF : 0x99999999 */
+      9,  /* U+1F4C0 - U+1F4C7 : 0x99999999 */
+      9,  /* U+1F4C8 - U+1F4CF : 0x99999999 */
+      9,  /* U+1F4D0 - U+1F4D7 : 0x99999999 */
+      9,  /* U+1F4D8 - U+1F4DF : 0x99999999 */
+      9,  /* U+1F4E0 - U+1F4E7 : 0x99999999 */
+      9,  /* U+1F4E8 - U+1F4EF : 0x99999999 */
+      9,  /* U+1F4F0 - U+1F4F7 : 0x99999999 */
+    201,  /* U+1F4F8 - U+1F4FF : 0x11199991 */
+      9,  /* U+1F500 - U+1F507 : 0x99999999 */
+      9,  /* U+1F508 - U+1F50F : 0x99999999 */
+      9,  /* U+1F510 - U+1F517 : 0x99999999 */
+      9,  /* U+1F518 - U+1F51F : 0x99999999 */
+    155,  /* U+1F520 - U+1F527 : 0x99919999 */
+      9,  /* U+1F528 - U+1F52F : 0x99999999 */
+      9,  /* U+1F530 - U+1F537 : 0x99999999 */
+    150,  /* U+1F538 - U+1F53F : 0x11999999 */
+      1,  /* U+1F540 - U+1F547 : 0x11111111 */
+      1,  /* U+1F548 - U+1F54F : 0x11111111 */
+      9,  /* U+1F550 - U+1F557 : 0x99999999 */
+      9,  /* U+1F558 - U+1F55F : 0x99999999 */
+      9,  /* U+1F560 - U+1F567 : 0x99999999 */
+      1,  /* U+1F568 - U+1F56F : 0x11111111 */
+      1,  /* U+1F570 - U+1F577 : 0x11111111 */
+      1,  /* U+1F578 - U+1F57F : 0x11111111 */
+      1,  /* U+1F580 - U+1F587 : 0x11111111 */
+      1,  /* U+1F588 - U+1F58F : 0x11111111 */
+      1,  /* U+1F590 - U+1F597 : 0x11111111 */
+      1,  /* U+1F598 - U+1F59F : 0x11111111 */
+      1,  /* U+1F5A0 - U+1F5A7 : 0x11111111 */
+      1,  /* U+1F5A8 - U+1F5AF : 0x11111111 */
+      1,  /* U+1F5B0 - U+1F5B7 : 0x11111111 */
+      1,  /* U+1F5B8 - U+1F5BF : 0x11111111 */
+      1,  /* U+1F5C0 - U+1F5C7 : 0x11111111 */
+      1,  /* U+1F5C8 - U+1F5CF : 0x11111111 */
+      1,  /* U+1F5D0 - U+1F5D7 : 0x11111111 */
+      1,  /* U+1F5D8 - U+1F5DF : 0x11111111 */
+      1,  /* U+1F5E0 - U+1F5E7 : 0x11111111 */
+      1,  /* U+1F5E8 - U+1F5EF : 0x11111111 */
+      1,  /* U+1F5F0 - U+1F5F7 : 0x11111111 */
+     22,  /* U+1F5F8 - U+1F5FF : 0x99999111 */
+    156,  /* U+1F600 - U+1F607 : 0x99999991 */
+      9,  /* U+1F608 - U+1F60F : 0x99999999 */
+    202,  /* U+1F610 - U+1F617 : 0x19199919 */
+    203,  /* U+1F618 - U+1F61F : 0x19991919 */
+    150,  /* U+1F620 - U+1F627 : 0x11999999 */
+    204,  /* U+1F628 - U+1F62F : 0x11919999 */
+    155,  /* U+1F630 - U+1F637 : 0x99919999 */
+      9,  /* U+1F638 - U+1F63F : 0x99999999 */
+    205,  /* U+1F640 - U+1F647 : 0x99911119 */
+      9,  /* U+1F648 - U+1F64F : 0x99999999 */
+      1,  /* U+1F650 - U+1F657 : 0x11111111 */
+      1,  /* U+1F658 - U+1F65F : 0x11111111 */
+      1,  /* U+1F660 - U+1F667 : 0x11111111 */
+      1,  /* U+1F668 - U+1F66F : 0x11111111 */
+      1,  /* U+1F670 - U+1F677 : 0x11111111 */
+      1,  /* U+1F678 - U+1F67F : 0x11111111 */
+      9,  /* U+1F680 - U+1F687 : 0x99999999 */
+      9,  /* U+1F688 - U+1F68F : 0x99999999 */
+      9,  /* U+1F690 - U+1F697 : 0x99999999 */
+      9,  /* U+1F698 - U+1F69F : 0x99999999 */
+      9,  /* U+1F6A0 - U+1F6A7 : 0x99999999 */
+      9,  /* U+1F6A8 - U+1F6AF : 0x99999999 */
+      9,  /* U+1F6B0 - U+1F6B7 : 0x99999999 */
+      9,  /* U+1F6B8 - U+1F6BF : 0x99999999 */
+    150,  /* U+1F6C0 - U+1F6C7 : 0x11999999 */
+      1,  /* U+1F6C8 - U+1F6CF : 0x11111111 */
+      1,  /* U+1F6D0 - U+1F6D7 : 0x11111111 */
+      1,  /* U+1F6D8 - U+1F6DF : 0x11111111 */
+      1,  /* U+1F6E0 - U+1F6E7 : 0x11111111 */
+      1,  /* U+1F6E8 - U+1F6EF : 0x11111111 */
+      1,  /* U+1F6F0 - U+1F6F7 : 0x11111111 */
+      1,  /* U+1F6F8 - U+1F6FF : 0x11111111 */
+      9,  /* U+1F700 - U+1F707 : 0x99999999 */
+      9,  /* U+1F708 - U+1F70F : 0x99999999 */
+      9,  /* U+1F710 - U+1F717 : 0x99999999 */
+      9,  /* U+1F718 - U+1F71F : 0x99999999 */
+      9,  /* U+1F720 - U+1F727 : 0x99999999 */
+      9,  /* U+1F728 - U+1F72F : 0x99999999 */
+      9,  /* U+1F730 - U+1F737 : 0x99999999 */
+      9,  /* U+1F738 - U+1F73F : 0x99999999 */
+      9,  /* U+1F740 - U+1F747 : 0x99999999 */
+      9,  /* U+1F748 - U+1F74F : 0x99999999 */
+      9,  /* U+1F750 - U+1F757 : 0x99999999 */
+      9,  /* U+1F758 - U+1F75F : 0x99999999 */
+      9,  /* U+1F760 - U+1F767 : 0x99999999 */
+      9,  /* U+1F768 - U+1F76F : 0x99999999 */
+    152,  /* U+1F770 - U+1F777 : 0x11119999 */
+      1,  /* U+1F778 - U+1F77F : 0x11111111 */
 };
 
-static PRUint8 gBidiCatIdx19[68] = {
+static PRUint8 gBidiCatIdx21[68] = {
       1,  /* U+2F800 - U+2F807 : 0x11111111 */
       1,  /* U+2F808 - U+2F80F : 0x11111111 */
       1,  /* U+2F810 - U+2F817 : 0x11111111 */
       1,  /* U+2F818 - U+2F81F : 0x11111111 */
       1,  /* U+2F820 - U+2F827 : 0x11111111 */
       1,  /* U+2F828 - U+2F82F : 0x11111111 */
       1,  /* U+2F830 - U+2F837 : 0x11111111 */
       1,  /* U+2F838 - U+2F83F : 0x11111111 */
@@ -3275,18 +3537,18 @@ static PRUint8 gBidiCatIdx19[68] = {
       1,  /* U+2F9F0 - U+2F9F7 : 0x11111111 */
       1,  /* U+2F9F8 - U+2F9FF : 0x11111111 */
       1,  /* U+2FA00 - U+2FA07 : 0x11111111 */
       1,  /* U+2FA08 - U+2FA0F : 0x11111111 */
       1,  /* U+2FA10 - U+2FA17 : 0x11111111 */
       1,  /* U+2FA18 - U+2FA1F : 0x11111111 */
 };
 
-static PRUint8 gBidiCatIdx20[64] = {
-    203,  /* U+E0000 - U+E0007 : 0x111111B1 */
+static PRUint8 gBidiCatIdx22[64] = {
+    206,  /* U+E0000 - U+E0007 : 0x111111B1 */
       1,  /* U+E0008 - U+E000F : 0x11111111 */
       1,  /* U+E0010 - U+E0017 : 0x11111111 */
       1,  /* U+E0018 - U+E001F : 0x11111111 */
      11,  /* U+E0020 - U+E0027 : 0xBBBBBBBB */
      11,  /* U+E0028 - U+E002F : 0xBBBBBBBB */
      11,  /* U+E0030 - U+E0037 : 0xBBBBBBBB */
      11,  /* U+E0038 - U+E003F : 0xBBBBBBBB */
      11,  /* U+E0040 - U+E0047 : 0xBBBBBBBB */
@@ -3342,17 +3604,17 @@ static PRUint8 gBidiCatIdx20[64] = {
      10,  /* U+E01D0 - U+E01D7 : 0xAAAAAAAA */
      10,  /* U+E01D8 - U+E01DF : 0xAAAAAAAA */
      10,  /* U+E01E0 - U+E01E7 : 0xAAAAAAAA */
      10,  /* U+E01E8 - U+E01EF : 0xAAAAAAAA */
       1,  /* U+E01F0 - U+E01F7 : 0x11111111 */
       1,  /* U+E01F8 - U+E01FF : 0x11111111 */
 };
 
-static PRUint32 gBidiCatPat[204] = {
+static PRUint32 gBidiCatPat[207] = {
     0x00000000,  /* 0 */
     0x11111111,  /* 1 */
     0x22222222,  /* 2 */
     0x33333333,  /* 3 */
     0x44444444,  /* 4 */
     0x55555555,  /* 5 */
     0x66666666,  /* 6 */
     0x77777777,  /* 7 */
@@ -3390,40 +3652,40 @@ static PRUint32 gBidiCatPat[204] = {
     0x11111911,  /* 39 */
     0xAAAAAAA2,  /* 40 */
     0xA2AAAAAA,  /* 41 */
     0xA2AA2AA2,  /* 42 */
     0x99334444,  /* 43 */
     0x99383773,  /* 44 */
     0x33333AAA,  /* 45 */
     0xAAAAA333,  /* 46 */
-    0x3AAAAAAA,  /* 47 */
-    0x33344744,  /* 48 */
-    0x3333333A,  /* 49 */
-    0xAA333333,  /* 50 */
-    0xAA4AAAAA,  /* 51 */
-    0xA33AAAAA,  /* 52 */
-    0x33AAAA9A,  /* 53 */
-    0x33333355,  /* 54 */
-    0xB3333333,  /* 55 */
-    0x333333A3,  /* 56 */
-    0xAAAAA222,  /* 57 */
-    0x9922AAAA,  /* 58 */
-    0x22222299,  /* 59 */
-    0xAA222222,  /* 60 */
-    0xAAAAA2AA,  /* 61 */
-    0xAAA2AAAA,  /* 62 */
-    0x22AAAAA2,  /* 63 */
+    0x33344744,  /* 47 */
+    0x3333333A,  /* 48 */
+    0xAA333333,  /* 49 */
+    0xA94AAAAA,  /* 50 */
+    0xA33AAAAA,  /* 51 */
+    0x33AAAA9A,  /* 52 */
+    0x33333355,  /* 53 */
+    0x43333333,  /* 54 */
+    0x333333A3,  /* 55 */
+    0xAAAAA222,  /* 56 */
+    0x9922AAAA,  /* 57 */
+    0x22222299,  /* 58 */
+    0xAA222222,  /* 59 */
+    0xAAAAA2AA,  /* 60 */
+    0xAAA2AAAA,  /* 61 */
+    0x22AAAAA2,  /* 62 */
+    0x2222AAA2,  /* 63 */
     0x11111AAA,  /* 64 */
-    0x111A1111,  /* 65 */
+    0x111A1A11,  /* 65 */
     0xAAAAAAA1,  /* 66 */
     0x11A1111A,  /* 67 */
-    0x11AAAAA1,  /* 68 */
-    0x1111AA11,  /* 69 */
-    0x111111A1,  /* 70 */
+    0x1111AA11,  /* 68 */
+    0x111111A1,  /* 69 */
+    0x111A1111,  /* 70 */
     0x111AAAA1,  /* 71 */
     0x11A11111,  /* 72 */
     0x11117711,  /* 73 */
     0x11117111,  /* 74 */
     0x11111AA1,  /* 75 */
     0xA1111AA1,  /* 76 */
     0x11AAA11A,  /* 77 */
     0x11A111AA,  /* 78 */
@@ -3445,18 +3707,18 @@ static PRUint32 gBidiCatPat[204] = {
     0x71111AAA,  /* 94 */
     0xA1111111,  /* 95 */
     0x1AAAAAAA,  /* 96 */
     0x111AA1AA,  /* 97 */
     0x11AAAAAA,  /* 98 */
     0xA1A11111,  /* 99 */
     0x119999A1,  /* 100 */
     0xAA1AAAAA,  /* 101 */
-    0x111AAAAA,  /* 102 */
-    0xAAA11111,  /* 103 */
+    0xAAA11111,  /* 102 */
+    0x111AAAAA,  /* 103 */
     0xAAAAAA1A,  /* 104 */
     0x1AA11AA1,  /* 105 */
     0xAA1111AA,  /* 106 */
     0x1AA11A11,  /* 107 */
     0x11111199,  /* 108 */
     0x1111111E,  /* 109 */
     0x11199111,  /* 110 */
     0x111AAA11,  /* 111 */
@@ -3467,96 +3729,99 @@ static PRUint32 gBidiCatPat[204] = {
     0x1111AAA1,  /* 116 */
     0x11991119,  /* 117 */
     0x99111111,  /* 118 */
     0xAAA11A1A,  /* 119 */
     0xA11AAAAA,  /* 120 */
     0xAA1A1111,  /* 121 */
     0x111A1AAA,  /* 122 */
     0x11AAAA11,  /* 123 */
-    0xAAAA1111,  /* 124 */
-    0xAA11AAAA,  /* 125 */
-    0xAAAA1AAA,  /* 126 */
-    0x91911111,  /* 127 */
-    0x19911111,  /* 128 */
-    0x21BBBEEE,  /* 129 */
-    0x8FFFFFCE,  /* 130 */
-    0x99977777,  /* 131 */
-    0x99989999,  /* 132 */
-    0xE9999999,  /* 133 */
-    0x111BBBBB,  /* 134 */
-    0xBBBBBB11,  /* 135 */
-    0x55551115,  /* 136 */
-    0x19996655,  /* 137 */
-    0x11111117,  /* 138 */
-    0x19999199,  /* 139 */
-    0x99191111,  /* 140 */
-    0x99111119,  /* 141 */
-    0x91919999,  /* 142 */
-    0x17111191,  /* 143 */
-    0x11119911,  /* 144 */
-    0x11199999,  /* 145 */
-    0x11999911,  /* 146 */
-    0x11111191,  /* 147 */
-    0x99997699,  /* 148 */
-    0x11999999,  /* 149 */
-    0x99199999,  /* 150 */
-    0x11111999,  /* 151 */
-    0x11115555,  /* 152 */
-    0x99919999,  /* 153 */
-    0x11119199,  /* 154 */
-    0x99199991,  /* 155 */
-    0x99991199,  /* 156 */
-    0x99999991,  /* 157 */
-    0x99111999,  /* 158 */
-    0x11191999,  /* 159 */
-    0xA1111999,  /* 160 */
-    0x99999199,  /* 161 */
-    0x11119999,  /* 162 */
-    0x1119999E,  /* 163 */
-    0xAAAAAA11,  /* 164 */
-    0x11199AA1,  /* 165 */
-    0x11119111,  /* 166 */
-    0x19991111,  /* 167 */
-    0x99991111,  /* 168 */
-    0x11119AAA,  /* 169 */
-    0x99AA1111,  /* 170 */
-    0x1A111A11,  /* 171 */
-    0x1111A111,  /* 172 */
-    0x11111177,  /* 173 */
-    0xAA11A111,  /* 174 */
-    0x111A11AA,  /* 175 */
-    0x1AAAAAA1,  /* 176 */
-    0xA11AAA1A,  /* 177 */
-    0x2A211111,  /* 178 */
-    0x22222262,  /* 179 */
-    0x99333333,  /* 180 */
-    0x33933333,  /* 181 */
-    0x99891898,  /* 182 */
-    0x79999999,  /* 183 */
-    0x19996699,  /* 184 */
-    0x11119779,  /* 185 */
-    0x99777991,  /* 186 */
-    0x17799977,  /* 187 */
-    0x11999991,  /* 188 */
-    0x92222222,  /* 189 */
-    0x2AA2AAA2,  /* 190 */
-    0xAAAA2222,  /* 191 */
-    0xA2222AAA,  /* 192 */
-    0x99999992,  /* 193 */
-    0x24444444,  /* 194 */
-    0x1AAAA111,  /* 195 */
-    0xBBBBB111,  /* 196 */
-    0xAAAAABBB,  /* 197 */
-    0xAAA11AAA,  /* 198 */
-    0x119AAA99,  /* 199 */
-    0x11911111,  /* 200 */
-    0x55111111,  /* 201 */
-    0x11111555,  /* 202 */
-    0x111111B1,  /* 203 */
+    0xA1A111AA,  /* 124 */
+    0xAAAA1111,  /* 125 */
+    0xAA11AAAA,  /* 126 */
+    0xAAAA1AAA,  /* 127 */
+    0x91911111,  /* 128 */
+    0x19911111,  /* 129 */
+    0x21BBBEEE,  /* 130 */
+    0x8FFFFFCE,  /* 131 */
+    0x99977777,  /* 132 */
+    0x99989999,  /* 133 */
+    0xE9999999,  /* 134 */
+    0x111BBBBB,  /* 135 */
+    0xBBBBBB11,  /* 136 */
+    0x55551115,  /* 137 */
+    0x19996655,  /* 138 */
+    0x11111177,  /* 139 */
+    0x19999199,  /* 140 */
+    0x99191111,  /* 141 */
+    0x99111119,  /* 142 */
+    0x91919999,  /* 143 */
+    0x17111191,  /* 144 */
+    0x11119911,  /* 145 */
+    0x11199999,  /* 146 */
+    0x11999911,  /* 147 */
+    0x11111191,  /* 148 */
+    0x99997699,  /* 149 */
+    0x11999999,  /* 150 */
+    0x99199999,  /* 151 */
+    0x11119999,  /* 152 */
+    0x11111999,  /* 153 */
+    0x11115555,  /* 154 */
+    0x99919999,  /* 155 */
+    0x99999991,  /* 156 */
+    0x99191999,  /* 157 */
+    0xA1111999,  /* 158 */
+    0x99999199,  /* 159 */
+    0x1119999E,  /* 160 */
+    0xAAAAAA11,  /* 161 */
+    0x11199AA1,  /* 162 */
+    0x11119111,  /* 163 */
+    0x19991111,  /* 164 */
+    0x99991111,  /* 165 */
+    0x11119AAA,  /* 166 */
+    0x99AA1111,  /* 167 */
+    0x1A111A11,  /* 168 */
+    0x1111A111,  /* 169 */
+    0xAA11A111,  /* 170 */
+    0x111A11AA,  /* 171 */
+    0x1AAAAAA1,  /* 172 */
+    0xA11AAA1A,  /* 173 */
+    0x2A211111,  /* 174 */
+    0x22222262,  /* 175 */
+    0x99333333,  /* 176 */
+    0x33933333,  /* 177 */
+    0x99891898,  /* 178 */
+    0x79999999,  /* 179 */
+    0x19996699,  /* 180 */
+    0x11119779,  /* 181 */
+    0xB3333333,  /* 182 */
+    0x99777991,  /* 183 */
+    0x17799977,  /* 184 */
+    0x11999991,  /* 185 */
+    0x92222222,  /* 186 */
+    0x2AA2AAA2,  /* 187 */
+    0xAAAA2222,  /* 188 */
+    0xA2222AAA,  /* 189 */
+    0x99999992,  /* 190 */
+    0x24444444,  /* 191 */
+    0x1AAAA111,  /* 192 */
+    0xBBBBB111,  /* 193 */
+    0xAAAAABBB,  /* 194 */
+    0xAAA11AAA,  /* 195 */
+    0x119AAA99,  /* 196 */
+    0x11911111,  /* 197 */
+    0x55111111,  /* 198 */
+    0x11111555,  /* 199 */
+    0x99999919,  /* 200 */
+    0x11199991,  /* 201 */
+    0x19199919,  /* 202 */
+    0x19991919,  /* 203 */
+    0x11919999,  /* 204 */
+    0x99911119,  /* 205 */
+    0x111111B1,  /* 206 */
 };
 
 static eBidiCategory GetBidiCat(PRUint32 u)
 {
     PRUint32 pat;
     PRUint16 patidx;
 
     /*  Handle blocks which use index table mapping */   
@@ -3621,49 +3886,59 @@ static eBidiCategory GetBidiCat(PRUint32
         patidx = gBidiCatIdx12 [( (u -(PRUint32) 0x10C00) >> 3 )];
     }
 
     /* Handle U+10E60 to U+10E7F */
     else if ((((PRUint32)0x10E60)<=u)&&(u<=((PRUint32)0x10E7F))) {
         patidx = gBidiCatIdx13 [( (u -(PRUint32) 0x10E60) >> 3 )];
     }
 
-    /* Handle U+11080 to U+110CF */
-    else if ((((PRUint32)0x11080)<=u)&&(u<=((PRUint32)0x110CF))) {
-        patidx = gBidiCatIdx14 [( (u -(PRUint32) 0x11080) >> 3 )];
+    /* Handle U+11000 to U+110CF */
+    else if ((((PRUint32)0x11000)<=u)&&(u<=((PRUint32)0x110CF))) {
+        patidx = gBidiCatIdx14 [( (u -(PRUint32) 0x11000) >> 3 )];
     }
 
     /* Handle U+12000 to U+1247F */
     else if ((((PRUint32)0x12000)<=u)&&(u<=((PRUint32)0x1247F))) {
         patidx = gBidiCatIdx15 [( (u -(PRUint32) 0x12000) >> 3 )];
     }
 
     /* Handle U+13000 to U+1342F */
     else if ((((PRUint32)0x13000)<=u)&&(u<=((PRUint32)0x1342F))) {
         patidx = gBidiCatIdx16 [( (u -(PRUint32) 0x13000) >> 3 )];
     }
 
+    /* Handle U+16800 to U+16A3F */
+    else if ((((PRUint32)0x16800)<=u)&&(u<=((PRUint32)0x16A3F))) {
+        patidx = gBidiCatIdx17 [( (u -(PRUint32) 0x16800) >> 3 )];
+    }
+
+    /* Handle U+1B000 to U+1B00F */
+    else if ((((PRUint32)0x1B000)<=u)&&(u<=((PRUint32)0x1B00F))) {
+        patidx = gBidiCatIdx18 [( (u -(PRUint32) 0x1B000) >> 3 )];
+    }
+
     /* Handle U+1D000 to U+1D7FF */
     else if ((((PRUint32)0x1D000)<=u)&&(u<=((PRUint32)0x1D7FF))) {
-        patidx = gBidiCatIdx17 [( (u -(PRUint32) 0x1D000) >> 3 )];
+        patidx = gBidiCatIdx19 [( (u -(PRUint32) 0x1D000) >> 3 )];
     }
 
-    /* Handle U+1F000 to U+1F24F */
-    else if ((((PRUint32)0x1F000)<=u)&&(u<=((PRUint32)0x1F24F))) {
-        patidx = gBidiCatIdx18 [( (u -(PRUint32) 0x1F000) >> 3 )];
+    /* Handle U+1F000 to U+1F77F */
+    else if ((((PRUint32)0x1F000)<=u)&&(u<=((PRUint32)0x1F77F))) {
+        patidx = gBidiCatIdx20 [( (u -(PRUint32) 0x1F000) >> 3 )];
     }
 
     /* Handle U+2F800 to U+2FA1F */
     else if ((((PRUint32)0x2F800)<=u)&&(u<=((PRUint32)0x2FA1F))) {
-        patidx = gBidiCatIdx19 [( (u -(PRUint32) 0x2F800) >> 3 )];
+        patidx = gBidiCatIdx21 [( (u -(PRUint32) 0x2F800) >> 3 )];
     }
 
     /* Handle U+E0000 to U+E01FF */
     else if ((((PRUint32)0xE0000)<=u)&&(u<=((PRUint32)0xE01FF))) {
-        patidx = gBidiCatIdx20 [( (u -(PRUint32) 0xE0000) >> 3 )];
+        patidx = gBidiCatIdx22 [( (u -(PRUint32) 0xE0000) >> 3 )];
     }
 
     else {
       /* defaults for unassigned characters
        * see http://www.unicode.org/Public/UNIDATA/extracted/DerivedBidiClass.txt
        * and http://www.unicode.org/Public/UNIDATA/Blocks.txt
        */
       if (((u >= 0x0590) && (u <= 0x05FF)) ||
@@ -3682,9 +3957,9 @@ static eBidiCategory GetBidiCat(PRUint32
     if (patidx < 0x10)
         return (eBidiCategory)patidx;
     else {
         pat = gBidiCatPat[patidx];
         return (eBidiCategory)((pat  >> ((u % 8) * 4)) & 0x0F);
     }
 }
 
-/* total data size = 4060 */
+/* total data size = 4328 */
--- a/intl/unicharutil/util/genbidicattable.pl
+++ b/intl/unicharutil/util/genbidicattable.pl
@@ -201,21 +201,23 @@ while(<UNICODATA>) {
   0x101d0, 0x101ff,
   0x10280, 0x104ff,
   0x10800, 0x1085f,
   0x10900, 0x1093f,
   0x10a00, 0x10a7f,
   0x10b00, 0x10b7f,
   0x10c00, 0x10c4f,
   0x10e60, 0x10e7f,
-  0x11080, 0x110cf,
+  0x11000, 0x110cf,
   0x12000, 0x1247f,
   0x13000, 0x1342f,
+  0x16800, 0x16a3f,
+  0x1b000, 0x1b00f,
   0x1d000, 0x1d7ff,
-  0x1f000, 0x1f24f,
+  0x1f000, 0x1f77f,
   0x2f800, 0x2fa1f,
   0xe0000, 0xe01ff  
 );
 
 
 $totaldata = 0;
 
 $tt=($#range+1) / 2;
--- a/layout/generic/punct_marks.x-ccmap
+++ b/layout/generic/punct_marks.x-ccmap
@@ -160,16 +160,17 @@
    0X000837 : SAMARITAN PUNCTUATION MELODIC QITSA
    0X000838 : SAMARITAN PUNCTUATION ZIQAA
    0X000839 : SAMARITAN PUNCTUATION QITSA
    0X00083A : SAMARITAN PUNCTUATION ZAEF
    0X00083B : SAMARITAN PUNCTUATION TURU
    0X00083C : SAMARITAN PUNCTUATION ARKAANU
    0X00083D : SAMARITAN PUNCTUATION SOF MASHFAAT
    0X00083E : SAMARITAN PUNCTUATION ANNAAU
+   0X00085E : MANDAIC PUNCTUATION
    0X000964 : DEVANAGARI DANDA
    0X000965 : DEVANAGARI DOUBLE DANDA
    0X000970 : DEVANAGARI ABBREVIATION SIGN
    0X000DF4 : SINHALA PUNCTUATION KUNDDALIYA
    0X000E4F : THAI CHARACTER FONGMAN
    0X000E5A : THAI CHARACTER ANGKHANKHU
    0X000E5B : THAI CHARACTER KHOMUT
    0X000F04 : TIBETAN MARK INITIAL YIG MGO MDUN MA
@@ -192,16 +193,18 @@
    0X000F3C : TIBETAN MARK ANG KHANG GYON
    0X000F3D : TIBETAN MARK ANG KHANG GYAS
    0X000F85 : TIBETAN MARK PALUTA
    0X000FD0 : TIBETAN MARK BSKA- SHOG GI MGO RGYAN
    0X000FD1 : TIBETAN MARK MNYAM YIG GI MGO RGYAN
    0X000FD2 : TIBETAN MARK NYIS TSHEG
    0X000FD3 : TIBETAN MARK INITIAL BRDA RNYING YIG MGO MDUN MA
    0X000FD4 : TIBETAN MARK CLOSING BRDA RNYING YIG MGO SGAB MA
+   0X000FD9 : TIBETAN MARK LEADING MCHAN RTAGS
+   0X000FDA : TIBETAN MARK TRAILING MCHAN RTAGS
    0X00104A : MYANMAR SIGN LITTLE SECTION
    0X00104B : MYANMAR SIGN SECTION
    0X00104C : MYANMAR SYMBOL LOCATIVE
    0X00104D : MYANMAR SYMBOL COMPLETED
    0X00104E : MYANMAR SYMBOL AFOREMENTIONED
    0X00104F : MYANMAR SYMBOL GENITIVE
    0X0010FB : GEORGIAN PARAGRAPH SEPARATOR
    0X001361 : ETHIOPIC WORDSPACE
@@ -234,18 +237,16 @@
    0X001804 : MONGOLIAN COLON
    0X001805 : MONGOLIAN FOUR DOTS
    0X001807 : MONGOLIAN SIBE SYLLABLE BOUNDARY MARKER
    0X001808 : MONGOLIAN MANCHU COMMA
    0X001809 : MONGOLIAN MANCHU FULL STOP
    0X00180A : MONGOLIAN NIRUGU
    0X001944 : LIMBU EXCLAMATION MARK
    0X001945 : LIMBU QUESTION MARK
-   0X0019DE : NEW TAI LUE SIGN LAE
-   0X0019DF : NEW TAI LUE SIGN LAEV
    0X001A1E : BUGINESE PALLAWA
    0X001A1F : BUGINESE END OF SECTION
    0X001AA0 : TAI THAM SIGN WIANG
    0X001AA1 : TAI THAM SIGN WIANGWAAK
    0X001AA2 : TAI THAM SIGN SAWAN
    0X001AA3 : TAI THAM SIGN KEOW
    0X001AA4 : TAI THAM SIGN HOY
    0X001AA5 : TAI THAM SIGN DOKMAI
@@ -258,16 +259,20 @@
    0X001AAD : TAI THAM SIGN CAANG
    0X001B5A : BALINESE PANTI
    0X001B5B : BALINESE PAMADA
    0X001B5C : BALINESE WINDU
    0X001B5D : BALINESE CARIK PAMUNGKAH
    0X001B5E : BALINESE CARIK SIKI
    0X001B5F : BALINESE CARIK PAREREN
    0X001B60 : BALINESE PAMENENG
+   0X001BFC : BATAK SYMBOL BINDU NA METEK
+   0X001BFD : BATAK SYMBOL BINDU PINARBORAS
+   0X001BFE : BATAK SYMBOL BINDU JUDUL
+   0X001BFF : BATAK SYMBOL BINDU PANGOLAT
    0X001C3B : LEPCHA PUNCTUATION TA-ROL
    0X001C3C : LEPCHA PUNCTUATION NYET THYOOM TA-ROL
    0X001C3D : LEPCHA PUNCTUATION CER-WA
    0X001C3E : LEPCHA PUNCTUATION TSHOOK CER-WA
    0X001C3F : LEPCHA PUNCTUATION TSHOOK
    0X001C7E : OL CHIKI PUNCTUATION MUCAAD
    0X001C7F : OL CHIKI PUNCTUATION DOUBLE MUCAAD
    0X001CD3 : VEDIC SIGN NIHSHVASA
@@ -392,16 +397,17 @@
    0X0029FC : LEFT-POINTING CURVED ANGLE BRACKET
    0X0029FD : RIGHT-POINTING CURVED ANGLE BRACKET
    0X002CF9 : COPTIC OLD NUBIAN FULL STOP
    0X002CFA : COPTIC OLD NUBIAN DIRECT QUESTION MARK
    0X002CFB : COPTIC OLD NUBIAN INDIRECT QUESTION MARK
    0X002CFC : COPTIC OLD NUBIAN VERSE DIVIDER
    0X002CFE : COPTIC FULL STOP
    0X002CFF : COPTIC MORPHOLOGICAL DIVIDER
+   0X002D70 : TIFINAGH SEPARATOR MARK
    0X002E00 : RIGHT ANGLE SUBSTITUTION MARKER
    0X002E01 : RIGHT ANGLE DOTTED SUBSTITUTION MARKER
    0X002E02 : LEFT SUBSTITUTION BRACKET
    0X002E03 : RIGHT SUBSTITUTION BRACKET
    0X002E04 : LEFT DOTTED SUBSTITUTION BRACKET
    0X002E05 : RIGHT DOTTED SUBSTITUTION BRACKET
    0X002E06 : RAISED INTERPOLATION MARKER
    0X002E07 : RAISED DOTTED INTERPOLATION MARKER
@@ -620,659 +626,676 @@
    0X010A7F : OLD SOUTH ARABIAN NUMERIC INDICATOR
    0X010B39 : AVESTAN ABBREVIATION MARK
    0X010B3A : TINY TWO DOTS OVER ONE DOT PUNCTUATION
    0X010B3B : SMALL TWO DOTS OVER ONE DOT PUNCTUATION
    0X010B3C : LARGE TWO DOTS OVER ONE DOT PUNCTUATION
    0X010B3D : LARGE ONE DOT OVER TWO DOTS PUNCTUATION
    0X010B3E : LARGE TWO RINGS OVER ONE RING PUNCTUATION
    0X010B3F : LARGE ONE RING OVER TWO RINGS PUNCTUATION
+   0X011047 : BRAHMI DANDA
+   0X011048 : BRAHMI DOUBLE DANDA
+   0X011049 : BRAHMI PUNCTUATION DOT
+   0X01104A : BRAHMI PUNCTUATION DOUBLE DOT
+   0X01104B : BRAHMI PUNCTUATION LINE
+   0X01104C : BRAHMI PUNCTUATION CRESCENT BAR
+   0X01104D : BRAHMI PUNCTUATION LOTUS
    0X0110BB : KAITHI ABBREVIATION SIGN
    0X0110BC : KAITHI ENUMERATION SIGN
    0X0110BE : KAITHI SECTION MARK
    0X0110BF : KAITHI DOUBLE SECTION MARK
    0X0110C0 : KAITHI DANDA
    0X0110C1 : KAITHI DOUBLE DANDA
    0X012470 : CUNEIFORM PUNCTUATION SIGN OLD ASSYRIAN WORD DIVIDER
    0X012471 : CUNEIFORM PUNCTUATION SIGN VERTICAL COLON
    0X012472 : CUNEIFORM PUNCTUATION SIGN DIAGONAL COLON
    0X012473 : CUNEIFORM PUNCTUATION SIGN DIAGONAL TRICOLON
 */
 
 #if (defined(IS_LITTLE_ENDIAN) && ALU_SIZE == 64)
 // Precompiled CCMap for Little Endian(64bit)
-#define gPuncCharsCCMapExt_SIZE 980
+#define gPuncCharsCCMapExt_SIZE 996
 #define gPuncCharsCCMapExt_INITIALIZER    \
-/* EXTFLG */ 0x0000,0x0000,0x0001,0x02C0,    \
-/* 000000 */ 0x0030,0x00E0,0x0180,0x01F0,0x0010,0x0010,0x0010,0x0010,    \
-             0x0010,0x0010,0x0210,0x0010,0x0010,0x0010,0x0010,0x0280,    \
+/* EXTFLG */ 0x0000,0x0000,0x0001,0x02D0,    \
+/* 000000 */ 0x0030,0x00E0,0x0180,0x0200,0x0010,0x0010,0x0010,0x0010,    \
+             0x0010,0x0010,0x0220,0x0010,0x0010,0x0010,0x0010,0x0290,    \
 /* 000010 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
 /* 000020 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000030 */ 0x0040,0x0020,0x0020,0x0050,0x0020,0x0060,0x0070,0x0080,    \
              0x0090,0x00A0,0x0020,0x0020,0x0020,0x00B0,0x00C0,0x00D0,    \
 /* 000040 */ 0x0000,0x0000,0xD7EE,0x8C00,0x0001,0x3800,0x0000,0x2800,    \
              0x0000,0x0000,0x0802,0x8880,0x0000,0x0000,0x0000,0x0000,    \
 /* 000050 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x4000,    \
              0x0080,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000060 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xFC00,0x0000,0x0000,    \
              0x0200,0x0000,0x0000,0x0000,0x0049,0x0000,0x0000,0x0018,    \
 /* 000070 */ 0x3600,0xC800,0x0000,0x0000,0x0000,0x0000,0x3C00,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0010,0x0000,0x0000,    \
 /* 000080 */ 0x3FFF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0380,    \
-/* 000090 */ 0x0000,0x0000,0x0000,0x7FFF,0x0000,0x0000,0x0000,0x0000,    \
+/* 000090 */ 0x0000,0x0000,0x0000,0x7FFF,0x0000,0x4000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000a0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0030,0x0001,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000b0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0010,    \
 /* 0000c0 */ 0x0000,0x0000,0x0000,0x0000,0x8000,0x0C00,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000d0 */ 0xFFF0,0x0007,0x0000,0x3C00,0x0000,0x0000,0x0000,0x0000,    \
-             0x0020,0x0000,0x0000,0x0000,0x0000,0x001F,0x0000,0x0000,    \
+             0x0020,0x0000,0x0000,0x0000,0x0000,0x061F,0x0000,0x0000,    \
 /* 0000e0 */ 0x00F0,0x0020,0x0020,0x0100,0x0020,0x0020,0x0110,0x0120,    \
              0x0130,0x0140,0x0150,0x0160,0x0170,0x0020,0x0020,0x0020,    \
 /* 0000f0 */ 0x0000,0x0000,0x0000,0x0000,0xFC00,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,    \
 /* 000100 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x01FE,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000110 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x6000,0x0000,    \
              0x0000,0x1800,0x0000,0x0000,0x0000,0x0000,0x3800,0x0000,    \
 /* 000120 */ 0x0000,0x0000,0x0000,0x0060,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0770,0x0000,0x0000,    \
 /* 000130 */ 0x07BF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000140 */ 0x0000,0x0000,0x0000,0x0000,0x0030,0x0000,0x0000,0x0000,    \
-             0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000150 */ 0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x3F7F,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000160 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xFC00,0x0001,0x0000,    \
-             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xF000,    \
 /* 000170 */ 0x0000,0x0000,0x0000,0xF800,0x0000,0x0000,0x0000,0xC000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0008,0x0000,0x0000,    \
 /* 000180 */ 0x0190,0x0020,0x0020,0x01A0,0x0020,0x0020,0x0020,0x01B0,    \
-             0x0020,0x01C0,0x0020,0x0020,0x01D0,0x0020,0x01E0,0x0020,    \
+             0x0020,0x01C0,0x0020,0x0020,0x01D0,0x01E0,0x01F0,0x0020,    \
 /* 000190 */ 0x0000,0xFFC0,0x00FF,0x7FFF,0xFFEE,0x7FEB,0x0000,0x6000,    \
              0x6000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0001a0 */ 0x0000,0x0000,0x0600,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0001b0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xFF00,0x003F,    \
              0x0000,0x0000,0x0000,0x0000,0x0060,0x0000,0xFFC0,0x0000,    \
 /* 0001c0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0xFFF8,0x01FF,0x0000,0x0000,0x0000,0x0F00,0x0000,0x3000,    \
 /* 0001d0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xDE00,    \
-/* 0001e0 */ 0xFFFF,0xFB7F,0x7FFF,0x0003,0x0000,0x0000,0x0000,0x0000,    \
+/* 0001e0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0001,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0001f0 */ 0xFFFF,0xFB7F,0x7FFF,0x0003,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0001f0 */ 0x0200,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 000200 */ 0x0210,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 000200 */ 0xFF0E,0xEFF3,0x0000,0x2000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000210 */ 0xFF0E,0xEFF3,0x0000,0x2000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,    \
-/* 000210 */ 0x0020,0x0020,0x0020,0x0020,0x0220,0x0020,0x0230,0x0020,    \
-             0x0240,0x0250,0x0260,0x0270,0x0020,0x0020,0x0020,0x0020,    \
-/* 000220 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000220 */ 0x0020,0x0020,0x0020,0x0020,0x0230,0x0020,0x0240,0x0020,    \
+             0x0250,0x0260,0x0270,0x0280,0x0020,0x0020,0x0020,0x0020,    \
+/* 000230 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,    \
-/* 000230 */ 0xE000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x4008,    \
+/* 000240 */ 0xE000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x4008,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00FC,    \
-/* 000240 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00F0,    \
+/* 000250 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00F0,    \
              0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0700,    \
-/* 000250 */ 0x0000,0x0000,0xC000,0x0000,0x0000,0x8000,0x0000,0x0000,    \
+/* 000260 */ 0x0000,0x0000,0xC000,0x0000,0x0000,0x8000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x3FFE,0xC000,0x0000,0x0000,    \
-/* 000260 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xF000,0x0000,0x0000,    \
+/* 000270 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xF000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,    \
-/* 000270 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000280 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,0x0000,    \
-/* 000280 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-             0x0020,0x0020,0x0020,0x0020,0x0020,0x0290,0x02A0,0x02B0,    \
-/* 000290 */ 0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000290 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+             0x0020,0x0020,0x0020,0x0020,0x0020,0x02A0,0x02B0,0x02C0,    \
+/* 0002a0 */ 0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002a0 */ 0x0000,0x03FF,0x0000,0xFFE1,0x1FFF,0xFEF7,0x0D03,0x0000,    \
+/* 0002b0 */ 0x0000,0x03FF,0x0000,0xFFE1,0x1FFF,0xFEF7,0x0D03,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002b0 */ 0xD7EE,0x8C00,0x0001,0x3800,0x0000,0xA800,0x003F,0x0000,    \
+/* 0002c0 */ 0xD7EE,0x8C00,0x0001,0x3800,0x0000,0xA800,0x003F,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002c0 */ 0x02F0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,    \
-             0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,    \
-/* 0002d0 */ 0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,    \
-             0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,    \
-/* 0002e0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0002d0 */ 0x0300,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,    \
+             0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,    \
+/* 0002e0 */ 0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,    \
+             0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,    \
+/* 0002f0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002f0 */ 0x0030,0x00A0,0x00C0,0x0010,0x0010,0x0010,0x0010,0x0010,    \
+/* 000300 */ 0x0030,0x00A0,0x00C0,0x0010,0x0010,0x0010,0x0010,0x0010,    \
              0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,    \
-/* 000300 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 000310 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 000310 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000320 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000320 */ 0x0020,0x0040,0x0020,0x0050,0x0020,0x0020,0x0020,0x0020,    \
+/* 000330 */ 0x0020,0x0040,0x0020,0x0050,0x0020,0x0020,0x0020,0x0020,    \
              0x0060,0x0070,0x0080,0x0090,0x0020,0x0020,0x0020,0x0020,    \
-/* 000330 */ 0x0003,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000340 */ 0x0003,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000340 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000350 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x8000,0x0000,0x0000,0x0000,0x0001,0x0000,0x0000,    \
-/* 000350 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0080,0x0000,0x0000,    \
+/* 000360 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0080,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000360 */ 0x0000,0x8000,0x0000,0x8000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000370 */ 0x0000,0x8000,0x0000,0x8000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000370 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x01FF,0x0000,0x8000,    \
+/* 000380 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x01FF,0x0000,0x8000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000380 */ 0x0000,0x0000,0x0000,0xFE00,0x0000,0x0000,0x0000,0x0000,    \
+/* 000390 */ 0x0000,0x0000,0x0000,0xFE00,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000390 */ 0x00B0,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 0003a0 */ 0x00B0,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 0003a0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0003b0 */ 0x0000,0x0000,0x0000,0x0000,0x3F80,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0xD800,0x0003,0x0000,0x0000,0x0000,    \
-/* 0003b0 */ 0x0020,0x0020,0x0020,0x0020,0x00D0,0x0020,0x0020,0x0020,    \
+/* 0003c0 */ 0x0020,0x0020,0x0020,0x0020,0x00D0,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 0003c0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x000F,    \
+/* 0003d0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x000F,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 #elif defined(IS_LITTLE_ENDIAN)
 // Precompiled CCMap for Little Endian(16/32bit) 
-#define gPuncCharsCCMapExt_SIZE 978
+#define gPuncCharsCCMapExt_SIZE 994
 #define gPuncCharsCCMapExt_INITIALIZER    \
-/* EXTFLG */ 0x0001,0x02C0,    \
-/* 000000 */ 0x0030,0x00E0,0x0180,0x01F0,0x0010,0x0010,0x0010,0x0010,    \
-             0x0010,0x0010,0x0210,0x0010,0x0010,0x0010,0x0010,0x0280,    \
+/* EXTFLG */ 0x0001,0x02D0,    \
+/* 000000 */ 0x0030,0x00E0,0x0180,0x0200,0x0010,0x0010,0x0010,0x0010,    \
+             0x0010,0x0010,0x0220,0x0010,0x0010,0x0010,0x0010,0x0290,    \
 /* 000010 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
 /* 000020 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000030 */ 0x0040,0x0020,0x0020,0x0050,0x0020,0x0060,0x0070,0x0080,    \
              0x0090,0x00A0,0x0020,0x0020,0x0020,0x00B0,0x00C0,0x00D0,    \
 /* 000040 */ 0x0000,0x0000,0xD7EE,0x8C00,0x0001,0x3800,0x0000,0x2800,    \
              0x0000,0x0000,0x0802,0x8880,0x0000,0x0000,0x0000,0x0000,    \
 /* 000050 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x4000,    \
              0x0080,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000060 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xFC00,0x0000,0x0000,    \
              0x0200,0x0000,0x0000,0x0000,0x0049,0x0000,0x0000,0x0018,    \
 /* 000070 */ 0x3600,0xC800,0x0000,0x0000,0x0000,0x0000,0x3C00,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0010,0x0000,0x0000,    \
 /* 000080 */ 0x3FFF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0380,    \
-/* 000090 */ 0x0000,0x0000,0x0000,0x7FFF,0x0000,0x0000,0x0000,0x0000,    \
+/* 000090 */ 0x0000,0x0000,0x0000,0x7FFF,0x0000,0x4000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000a0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0030,0x0001,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000b0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0010,    \
 /* 0000c0 */ 0x0000,0x0000,0x0000,0x0000,0x8000,0x0C00,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000d0 */ 0xFFF0,0x0007,0x0000,0x3C00,0x0000,0x0000,0x0000,0x0000,    \
-             0x0020,0x0000,0x0000,0x0000,0x0000,0x001F,0x0000,0x0000,    \
+             0x0020,0x0000,0x0000,0x0000,0x0000,0x061F,0x0000,0x0000,    \
 /* 0000e0 */ 0x00F0,0x0020,0x0020,0x0100,0x0020,0x0020,0x0110,0x0120,    \
              0x0130,0x0140,0x0150,0x0160,0x0170,0x0020,0x0020,0x0020,    \
 /* 0000f0 */ 0x0000,0x0000,0x0000,0x0000,0xFC00,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,    \
 /* 000100 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x01FE,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000110 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x6000,0x0000,    \
              0x0000,0x1800,0x0000,0x0000,0x0000,0x0000,0x3800,0x0000,    \
 /* 000120 */ 0x0000,0x0000,0x0000,0x0060,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0770,0x0000,0x0000,    \
 /* 000130 */ 0x07BF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000140 */ 0x0000,0x0000,0x0000,0x0000,0x0030,0x0000,0x0000,0x0000,    \
-             0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000150 */ 0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x3F7F,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000160 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xFC00,0x0001,0x0000,    \
-             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xF000,    \
 /* 000170 */ 0x0000,0x0000,0x0000,0xF800,0x0000,0x0000,0x0000,0xC000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0008,0x0000,0x0000,    \
 /* 000180 */ 0x0190,0x0020,0x0020,0x01A0,0x0020,0x0020,0x0020,0x01B0,    \
-             0x0020,0x01C0,0x0020,0x0020,0x01D0,0x0020,0x01E0,0x0020,    \
+             0x0020,0x01C0,0x0020,0x0020,0x01D0,0x01E0,0x01F0,0x0020,    \
 /* 000190 */ 0x0000,0xFFC0,0x00FF,0x7FFF,0xFFEE,0x7FEB,0x0000,0x6000,    \
              0x6000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0001a0 */ 0x0000,0x0000,0x0600,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0001b0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xFF00,0x003F,    \
              0x0000,0x0000,0x0000,0x0000,0x0060,0x0000,0xFFC0,0x0000,    \
 /* 0001c0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0xFFF8,0x01FF,0x0000,0x0000,0x0000,0x0F00,0x0000,0x3000,    \
 /* 0001d0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xDE00,    \
-/* 0001e0 */ 0xFFFF,0xFB7F,0x7FFF,0x0003,0x0000,0x0000,0x0000,0x0000,    \
+/* 0001e0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0001,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0001f0 */ 0xFFFF,0xFB7F,0x7FFF,0x0003,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0001f0 */ 0x0200,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 000200 */ 0x0210,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 000200 */ 0xFF0E,0xEFF3,0x0000,0x2000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000210 */ 0xFF0E,0xEFF3,0x0000,0x2000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,    \
-/* 000210 */ 0x0020,0x0020,0x0020,0x0020,0x0220,0x0020,0x0230,0x0020,    \
-             0x0240,0x0250,0x0260,0x0270,0x0020,0x0020,0x0020,0x0020,    \
-/* 000220 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000220 */ 0x0020,0x0020,0x0020,0x0020,0x0230,0x0020,0x0240,0x0020,    \
+             0x0250,0x0260,0x0270,0x0280,0x0020,0x0020,0x0020,0x0020,    \
+/* 000230 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,    \
-/* 000230 */ 0xE000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x4008,    \
+/* 000240 */ 0xE000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x4008,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00FC,    \
-/* 000240 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00F0,    \
+/* 000250 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00F0,    \
              0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0700,    \
-/* 000250 */ 0x0000,0x0000,0xC000,0x0000,0x0000,0x8000,0x0000,0x0000,    \
+/* 000260 */ 0x0000,0x0000,0xC000,0x0000,0x0000,0x8000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x3FFE,0xC000,0x0000,0x0000,    \
-/* 000260 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xF000,0x0000,0x0000,    \
+/* 000270 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xF000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,    \
-/* 000270 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000280 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,0x0000,    \
-/* 000280 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-             0x0020,0x0020,0x0020,0x0020,0x0020,0x0290,0x02A0,0x02B0,    \
-/* 000290 */ 0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000290 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+             0x0020,0x0020,0x0020,0x0020,0x0020,0x02A0,0x02B0,0x02C0,    \
+/* 0002a0 */ 0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002a0 */ 0x0000,0x03FF,0x0000,0xFFE1,0x1FFF,0xFEF7,0x0D03,0x0000,    \
+/* 0002b0 */ 0x0000,0x03FF,0x0000,0xFFE1,0x1FFF,0xFEF7,0x0D03,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002b0 */ 0xD7EE,0x8C00,0x0001,0x3800,0x0000,0xA800,0x003F,0x0000,    \
+/* 0002c0 */ 0xD7EE,0x8C00,0x0001,0x3800,0x0000,0xA800,0x003F,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002c0 */ 0x02F0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,    \
-             0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,    \
-/* 0002d0 */ 0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,    \
-             0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,    \
-/* 0002e0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0002d0 */ 0x0300,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,    \
+             0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,    \
+/* 0002e0 */ 0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,    \
+             0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,    \
+/* 0002f0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002f0 */ 0x0030,0x00A0,0x00C0,0x0010,0x0010,0x0010,0x0010,0x0010,    \
+/* 000300 */ 0x0030,0x00A0,0x00C0,0x0010,0x0010,0x0010,0x0010,0x0010,    \
              0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,    \
-/* 000300 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 000310 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 000310 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000320 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000320 */ 0x0020,0x0040,0x0020,0x0050,0x0020,0x0020,0x0020,0x0020,    \
+/* 000330 */ 0x0020,0x0040,0x0020,0x0050,0x0020,0x0020,0x0020,0x0020,    \
              0x0060,0x0070,0x0080,0x0090,0x0020,0x0020,0x0020,0x0020,    \
-/* 000330 */ 0x0003,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000340 */ 0x0003,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000340 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000350 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x8000,0x0000,0x0000,0x0000,0x0001,0x0000,0x0000,    \
-/* 000350 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0080,0x0000,0x0000,    \
+/* 000360 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0080,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000360 */ 0x0000,0x8000,0x0000,0x8000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000370 */ 0x0000,0x8000,0x0000,0x8000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000370 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x01FF,0x0000,0x8000,    \
+/* 000380 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x01FF,0x0000,0x8000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000380 */ 0x0000,0x0000,0x0000,0xFE00,0x0000,0x0000,0x0000,0x0000,    \
+/* 000390 */ 0x0000,0x0000,0x0000,0xFE00,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000390 */ 0x00B0,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 0003a0 */ 0x00B0,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 0003a0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0003b0 */ 0x0000,0x0000,0x0000,0x0000,0x3F80,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0xD800,0x0003,0x0000,0x0000,0x0000,    \
-/* 0003b0 */ 0x0020,0x0020,0x0020,0x0020,0x00D0,0x0020,0x0020,0x0020,    \
+/* 0003c0 */ 0x0020,0x0020,0x0020,0x0020,0x00D0,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 0003c0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x000F,    \
+/* 0003d0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x000F,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 #elif (ALU_SIZE == 16)
 // Precompiled CCMap for Big Endian(16bit)
-#define gPuncCharsCCMapExt_SIZE 978
+#define gPuncCharsCCMapExt_SIZE 994
 #define gPuncCharsCCMapExt_INITIALIZER    \
-/* EXTFLG */ 0x0001,0x02C0,    \
-/* 000000 */ 0x0030,0x00E0,0x0180,0x01F0,0x0010,0x0010,0x0010,0x0010,    \
-             0x0010,0x0010,0x0210,0x0010,0x0010,0x0010,0x0010,0x0280,    \
+/* EXTFLG */ 0x0001,0x02D0,    \
+/* 000000 */ 0x0030,0x00E0,0x0180,0x0200,0x0010,0x0010,0x0010,0x0010,    \
+             0x0010,0x0010,0x0220,0x0010,0x0010,0x0010,0x0010,0x0290,    \
 /* 000010 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
 /* 000020 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000030 */ 0x0040,0x0020,0x0020,0x0050,0x0020,0x0060,0x0070,0x0080,    \
              0x0090,0x00A0,0x0020,0x0020,0x0020,0x00B0,0x00C0,0x00D0,    \
 /* 000040 */ 0x0000,0x0000,0xD7EE,0x8C00,0x0001,0x3800,0x0000,0x2800,    \
              0x0000,0x0000,0x0802,0x8880,0x0000,0x0000,0x0000,0x0000,    \
 /* 000050 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x4000,    \
              0x0080,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000060 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xFC00,0x0000,0x0000,    \
              0x0200,0x0000,0x0000,0x0000,0x0049,0x0000,0x0000,0x0018,    \
 /* 000070 */ 0x3600,0xC800,0x0000,0x0000,0x0000,0x0000,0x3C00,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0010,0x0000,0x0000,    \
 /* 000080 */ 0x3FFF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0380,    \
-/* 000090 */ 0x0000,0x0000,0x0000,0x7FFF,0x0000,0x0000,0x0000,0x0000,    \
+/* 000090 */ 0x0000,0x0000,0x0000,0x7FFF,0x0000,0x4000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000a0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0030,0x0001,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000b0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0010,    \
 /* 0000c0 */ 0x0000,0x0000,0x0000,0x0000,0x8000,0x0C00,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000d0 */ 0xFFF0,0x0007,0x0000,0x3C00,0x0000,0x0000,0x0000,0x0000,    \
-             0x0020,0x0000,0x0000,0x0000,0x0000,0x001F,0x0000,0x0000,    \
+             0x0020,0x0000,0x0000,0x0000,0x0000,0x061F,0x0000,0x0000,    \
 /* 0000e0 */ 0x00F0,0x0020,0x0020,0x0100,0x0020,0x0020,0x0110,0x0120,    \
              0x0130,0x0140,0x0150,0x0160,0x0170,0x0020,0x0020,0x0020,    \
 /* 0000f0 */ 0x0000,0x0000,0x0000,0x0000,0xFC00,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,    \
 /* 000100 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x01FE,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000110 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x6000,0x0000,    \
              0x0000,0x1800,0x0000,0x0000,0x0000,0x0000,0x3800,0x0000,    \
 /* 000120 */ 0x0000,0x0000,0x0000,0x0060,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0770,0x0000,0x0000,    \
 /* 000130 */ 0x07BF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000140 */ 0x0000,0x0000,0x0000,0x0000,0x0030,0x0000,0x0000,0x0000,    \
-             0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000150 */ 0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x3F7F,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000160 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xFC00,0x0001,0x0000,    \
-             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xF000,    \
 /* 000170 */ 0x0000,0x0000,0x0000,0xF800,0x0000,0x0000,0x0000,0xC000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0008,0x0000,0x0000,    \
 /* 000180 */ 0x0190,0x0020,0x0020,0x01A0,0x0020,0x0020,0x0020,0x01B0,    \
-             0x0020,0x01C0,0x0020,0x0020,0x01D0,0x0020,0x01E0,0x0020,    \
+             0x0020,0x01C0,0x0020,0x0020,0x01D0,0x01E0,0x01F0,0x0020,    \
 /* 000190 */ 0x0000,0xFFC0,0x00FF,0x7FFF,0xFFEE,0x7FEB,0x0000,0x6000,    \
              0x6000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0001a0 */ 0x0000,0x0000,0x0600,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0001b0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xFF00,0x003F,    \
              0x0000,0x0000,0x0000,0x0000,0x0060,0x0000,0xFFC0,0x0000,    \
 /* 0001c0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0xFFF8,0x01FF,0x0000,0x0000,0x0000,0x0F00,0x0000,0x3000,    \
 /* 0001d0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xDE00,    \
-/* 0001e0 */ 0xFFFF,0xFB7F,0x7FFF,0x0003,0x0000,0x0000,0x0000,0x0000,    \
+/* 0001e0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0001,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0001f0 */ 0xFFFF,0xFB7F,0x7FFF,0x0003,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0001f0 */ 0x0200,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 000200 */ 0x0210,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 000200 */ 0xFF0E,0xEFF3,0x0000,0x2000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000210 */ 0xFF0E,0xEFF3,0x0000,0x2000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,    \
-/* 000210 */ 0x0020,0x0020,0x0020,0x0020,0x0220,0x0020,0x0230,0x0020,    \
-             0x0240,0x0250,0x0260,0x0270,0x0020,0x0020,0x0020,0x0020,    \
-/* 000220 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000220 */ 0x0020,0x0020,0x0020,0x0020,0x0230,0x0020,0x0240,0x0020,    \
+             0x0250,0x0260,0x0270,0x0280,0x0020,0x0020,0x0020,0x0020,    \
+/* 000230 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,    \
-/* 000230 */ 0xE000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x4008,    \
+/* 000240 */ 0xE000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x4008,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00FC,    \
-/* 000240 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00F0,    \
+/* 000250 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00F0,    \
              0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0700,    \
-/* 000250 */ 0x0000,0x0000,0xC000,0x0000,0x0000,0x8000,0x0000,0x0000,    \
+/* 000260 */ 0x0000,0x0000,0xC000,0x0000,0x0000,0x8000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x3FFE,0xC000,0x0000,0x0000,    \
-/* 000260 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xF000,0x0000,0x0000,    \
+/* 000270 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xF000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,    \
-/* 000270 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000280 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,0x0000,    \
-/* 000280 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-             0x0020,0x0020,0x0020,0x0020,0x0020,0x0290,0x02A0,0x02B0,    \
-/* 000290 */ 0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000290 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+             0x0020,0x0020,0x0020,0x0020,0x0020,0x02A0,0x02B0,0x02C0,    \
+/* 0002a0 */ 0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002a0 */ 0x0000,0x03FF,0x0000,0xFFE1,0x1FFF,0xFEF7,0x0D03,0x0000,    \
+/* 0002b0 */ 0x0000,0x03FF,0x0000,0xFFE1,0x1FFF,0xFEF7,0x0D03,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002b0 */ 0xD7EE,0x8C00,0x0001,0x3800,0x0000,0xA800,0x003F,0x0000,    \
+/* 0002c0 */ 0xD7EE,0x8C00,0x0001,0x3800,0x0000,0xA800,0x003F,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002c0 */ 0x0000,0x02F0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,    \
-             0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,    \
-/* 0002d0 */ 0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,    \
-             0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,    \
-/* 0002e0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0002d0 */ 0x0000,0x0300,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,    \
+             0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,    \
+/* 0002e0 */ 0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,    \
+             0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,    \
+/* 0002f0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002f0 */ 0x0030,0x00A0,0x00C0,0x0010,0x0010,0x0010,0x0010,0x0010,    \
+/* 000300 */ 0x0030,0x00A0,0x00C0,0x0010,0x0010,0x0010,0x0010,0x0010,    \
              0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,    \
-/* 000300 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 000310 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 000310 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000320 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000320 */ 0x0020,0x0040,0x0020,0x0050,0x0020,0x0020,0x0020,0x0020,    \
+/* 000330 */ 0x0020,0x0040,0x0020,0x0050,0x0020,0x0020,0x0020,0x0020,    \
              0x0060,0x0070,0x0080,0x0090,0x0020,0x0020,0x0020,0x0020,    \
-/* 000330 */ 0x0003,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000340 */ 0x0003,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000340 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000350 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x8000,0x0000,0x0000,0x0000,0x0001,0x0000,0x0000,    \
-/* 000350 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0080,0x0000,0x0000,    \
+/* 000360 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0080,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000360 */ 0x0000,0x8000,0x0000,0x8000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000370 */ 0x0000,0x8000,0x0000,0x8000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000370 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x01FF,0x0000,0x8000,    \
+/* 000380 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x01FF,0x0000,0x8000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000380 */ 0x0000,0x0000,0x0000,0xFE00,0x0000,0x0000,0x0000,0x0000,    \
+/* 000390 */ 0x0000,0x0000,0x0000,0xFE00,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000390 */ 0x00B0,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 0003a0 */ 0x00B0,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 0003a0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0003b0 */ 0x0000,0x0000,0x0000,0x0000,0x3F80,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0xD800,0x0003,0x0000,0x0000,0x0000,    \
-/* 0003b0 */ 0x0020,0x0020,0x0020,0x0020,0x00D0,0x0020,0x0020,0x0020,    \
+/* 0003c0 */ 0x0020,0x0020,0x0020,0x0020,0x00D0,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 0003c0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x000F,    \
+/* 0003d0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x000F,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 #elif (ALU_SIZE == 32)
 // Precompiled CCMap for  Big Endian(32bit)
-#define gPuncCharsCCMapExt_SIZE 978
+#define gPuncCharsCCMapExt_SIZE 994
 #define gPuncCharsCCMapExt_INITIALIZER    \
-/* EXTFLG */ 0x0001,0x02C0,    \
-/* 000000 */ 0x0030,0x00E0,0x0180,0x01F0,0x0010,0x0010,0x0010,0x0010,    \
-             0x0010,0x0010,0x0210,0x0010,0x0010,0x0010,0x0010,0x0280,    \
+/* EXTFLG */ 0x0001,0x02D0,    \
+/* 000000 */ 0x0030,0x00E0,0x0180,0x0200,0x0010,0x0010,0x0010,0x0010,    \
+             0x0010,0x0010,0x0220,0x0010,0x0010,0x0010,0x0010,0x0290,    \
 /* 000010 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
 /* 000020 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000030 */ 0x0040,0x0020,0x0020,0x0050,0x0020,0x0060,0x0070,0x0080,    \
              0x0090,0x00A0,0x0020,0x0020,0x0020,0x00B0,0x00C0,0x00D0,    \
 /* 000040 */ 0x0000,0x0000,0x8C00,0xD7EE,0x3800,0x0001,0x2800,0x0000,    \
              0x0000,0x0000,0x8880,0x0802,0x0000,0x0000,0x0000,0x0000,    \
 /* 000050 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x4000,0x0000,    \
              0x0000,0x0080,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000060 */ 0x0000,0x0000,0x0000,0x0000,0xFC00,0x0000,0x0000,0x0000,    \
              0x0000,0x0200,0x0000,0x0000,0x0000,0x0049,0x0018,0x0000,    \
 /* 000070 */ 0xC800,0x3600,0x0000,0x0000,0x0000,0x0000,0x0000,0x3C00,    \
              0x0000,0x0000,0x0000,0x0000,0x0010,0x0000,0x0000,0x0000,    \
 /* 000080 */ 0x0000,0x3FFF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0380,0x0000,    \
-/* 000090 */ 0x0000,0x0000,0x7FFF,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000090 */ 0x0000,0x0000,0x7FFF,0x0000,0x4000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000a0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0001,0x0030,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000b0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0010,0x0000,    \
 /* 0000c0 */ 0x0000,0x0000,0x0000,0x0000,0x0C00,0x8000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000d0 */ 0x0007,0xFFF0,0x3C00,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-             0x0000,0x0020,0x0000,0x0000,0x001F,0x0000,0x0000,0x0000,    \
+             0x0000,0x0020,0x0000,0x0000,0x061F,0x0000,0x0000,0x0000,    \
 /* 0000e0 */ 0x00F0,0x0020,0x0020,0x0100,0x0020,0x0020,0x0110,0x0120,    \
              0x0130,0x0140,0x0150,0x0160,0x0170,0x0020,0x0020,0x0020,    \
 /* 0000f0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0xFC00,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,0x0000,    \
 /* 000100 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x01FE,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000110 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x6000,    \
              0x1800,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x3800,    \
 /* 000120 */ 0x0000,0x0000,0x0060,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0770,0x0000,0x0000,0x0000,    \
 /* 000130 */ 0x0000,0x07BF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000140 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0030,0x0000,0x0000,    \
-             0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000150 */ 0xC000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x3F7F,0x0000,0x0000,0x0000,0x0000,    \
 /* 000160 */ 0x0000,0x0000,0x0000,0x0000,0xFC00,0x0000,0x0000,0x0001,    \
-             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xF000,0x0000,    \
 /* 000170 */ 0x0000,0x0000,0xF800,0x0000,0x0000,0x0000,0xC000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0008,0x0000,0x0000,0x0000,    \
 /* 000180 */ 0x0190,0x0020,0x0020,0x01A0,0x0020,0x0020,0x0020,0x01B0,    \
-             0x0020,0x01C0,0x0020,0x0020,0x01D0,0x0020,0x01E0,0x0020,    \
+             0x0020,0x01C0,0x0020,0x0020,0x01D0,0x01E0,0x01F0,0x0020,    \
 /* 000190 */ 0xFFC0,0x0000,0x7FFF,0x00FF,0x7FEB,0xFFEE,0x6000,0x0000,    \
              0x0000,0x6000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0001a0 */ 0x0000,0x0000,0x0000,0x0600,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0001b0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x003F,0xFF00,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0060,0x0000,0xFFC0,    \
 /* 0001c0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x01FF,0xFFF8,0x0000,0x0000,0x0F00,0x0000,0x3000,0x0000,    \
 /* 0001d0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xDE00,0x0000,    \
-/* 0001e0 */ 0xFB7F,0xFFFF,0x0003,0x7FFF,0x0000,0x0000,0x0000,0x0000,    \
+/* 0001e0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0001,0x0000,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0001f0 */ 0xFB7F,0xFFFF,0x0003,0x7FFF,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0001f0 */ 0x0200,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 000200 */ 0x0210,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 000200 */ 0xEFF3,0xFF0E,0x2000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000210 */ 0xEFF3,0xFF0E,0x2000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,0x0000,    \
-/* 000210 */ 0x0020,0x0020,0x0020,0x0020,0x0220,0x0020,0x0230,0x0020,    \
-             0x0240,0x0250,0x0260,0x0270,0x0020,0x0020,0x0020,0x0020,    \
-/* 000220 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000220 */ 0x0020,0x0020,0x0020,0x0020,0x0230,0x0020,0x0240,0x0020,    \
+             0x0250,0x0260,0x0270,0x0280,0x0020,0x0020,0x0020,0x0020,    \
+/* 000230 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,    \
-/* 000230 */ 0x0000,0xE000,0x0000,0x0000,0x0000,0x0000,0x4008,0x0000,    \
+/* 000240 */ 0x0000,0xE000,0x0000,0x0000,0x0000,0x0000,0x4008,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00FC,0x0000,    \
-/* 000240 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00F0,0x0000,    \
+/* 000250 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x00F0,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,0x0700,0x0000,    \
-/* 000250 */ 0x0000,0x0000,0x0000,0xC000,0x8000,0x0000,0x0000,0x0000,    \
+/* 000260 */ 0x0000,0x0000,0x0000,0xC000,0x8000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0xC000,0x3FFE,0x0000,0x0000,    \
-/* 000260 */ 0x0000,0x0000,0x0000,0x0000,0xF000,0x0000,0x0000,0x0000,    \
+/* 000270 */ 0x0000,0x0000,0x0000,0x0000,0xF000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,    \
-/* 000270 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000280 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,    \
-/* 000280 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-             0x0020,0x0020,0x0020,0x0020,0x0020,0x0290,0x02A0,0x02B0,    \
-/* 000290 */ 0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000290 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+             0x0020,0x0020,0x0020,0x0020,0x0020,0x02A0,0x02B0,0x02C0,    \
+/* 0002a0 */ 0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002a0 */ 0x03FF,0x0000,0xFFE1,0x0000,0xFEF7,0x1FFF,0x0000,0x0D03,    \
+/* 0002b0 */ 0x03FF,0x0000,0xFFE1,0x0000,0xFEF7,0x1FFF,0x0000,0x0D03,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002b0 */ 0x8C00,0xD7EE,0x3800,0x0001,0xA800,0x0000,0x0000,0x003F,    \
+/* 0002c0 */ 0x8C00,0xD7EE,0x3800,0x0001,0xA800,0x0000,0x0000,0x003F,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002c0 */ 0x0000,0x02F0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,    \
-             0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,    \
-/* 0002d0 */ 0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,    \
-             0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,    \
-/* 0002e0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0002d0 */ 0x0000,0x0300,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,    \
+             0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,    \
+/* 0002e0 */ 0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,    \
+             0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,    \
+/* 0002f0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002f0 */ 0x0030,0x00A0,0x00C0,0x0010,0x0010,0x0010,0x0010,0x0010,    \
+/* 000300 */ 0x0030,0x00A0,0x00C0,0x0010,0x0010,0x0010,0x0010,0x0010,    \
              0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,    \
-/* 000300 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 000310 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 000310 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000320 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000320 */ 0x0020,0x0040,0x0020,0x0050,0x0020,0x0020,0x0020,0x0020,    \
+/* 000330 */ 0x0020,0x0040,0x0020,0x0050,0x0020,0x0020,0x0020,0x0020,    \
              0x0060,0x0070,0x0080,0x0090,0x0020,0x0020,0x0020,0x0020,    \
-/* 000330 */ 0x0000,0x0003,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000340 */ 0x0000,0x0003,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000340 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000350 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x8000,0x0000,0x0000,0x0000,0x0001,0x0000,0x0000,0x0000,    \
-/* 000350 */ 0x0000,0x0000,0x0000,0x0000,0x0080,0x0000,0x0000,0x0000,    \
+/* 000360 */ 0x0000,0x0000,0x0000,0x0000,0x0080,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000360 */ 0x8000,0x0000,0x8000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000370 */ 0x8000,0x0000,0x8000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000370 */ 0x0000,0x0000,0x0000,0x0000,0x01FF,0x0000,0x8000,0x0000,    \
+/* 000380 */ 0x0000,0x0000,0x0000,0x0000,0x01FF,0x0000,0x8000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000380 */ 0x0000,0x0000,0xFE00,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000390 */ 0x0000,0x0000,0xFE00,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000390 */ 0x00B0,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 0003a0 */ 0x00B0,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 0003a0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0003b0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x3F80,0x0000,0x0000,    \
              0x0000,0x0000,0xD800,0x0000,0x0000,0x0003,0x0000,0x0000,    \
-/* 0003b0 */ 0x0020,0x0020,0x0020,0x0020,0x00D0,0x0020,0x0020,0x0020,    \
+/* 0003c0 */ 0x0020,0x0020,0x0020,0x0020,0x00D0,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 0003c0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x000F,0x0000,    \
+/* 0003d0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x000F,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 #elif (ALU_SIZE == 64)
 // Precompiled CCMap for Big Endian(64bit)
-#define gPuncCharsCCMapExt_SIZE 980
+#define gPuncCharsCCMapExt_SIZE 996
 #define gPuncCharsCCMapExt_INITIALIZER    \
-/* EXTFLG */ 0x0000,0x0000,0x0001,0x02C0,    \
-/* 000000 */ 0x0030,0x00E0,0x0180,0x01F0,0x0010,0x0010,0x0010,0x0010,    \
-             0x0010,0x0010,0x0210,0x0010,0x0010,0x0010,0x0010,0x0280,    \
+/* EXTFLG */ 0x0000,0x0000,0x0001,0x02D0,    \
+/* 000000 */ 0x0030,0x00E0,0x0180,0x0200,0x0010,0x0010,0x0010,0x0010,    \
+             0x0010,0x0010,0x0220,0x0010,0x0010,0x0010,0x0010,0x0290,    \
 /* 000010 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
 /* 000020 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000030 */ 0x0040,0x0020,0x0020,0x0050,0x0020,0x0060,0x0070,0x0080,    \
              0x0090,0x00A0,0x0020,0x0020,0x0020,0x00B0,0x00C0,0x00D0,    \
 /* 000040 */ 0x8C00,0xD7EE,0x0000,0x0000,0x2800,0x0000,0x3800,0x0001,    \
              0x8880,0x0802,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000050 */ 0x0000,0x0000,0x0000,0x0000,0x4000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0080,0x0000,0x0000,0x0000,0x0000,    \
 /* 000060 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xFC00,0x0000,    \
              0x0000,0x0000,0x0000,0x0200,0x0018,0x0000,0x0000,0x0049,    \
 /* 000070 */ 0x0000,0x0000,0xC800,0x3600,0x0000,0x3C00,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0010,0x0000,    \
 /* 000080 */ 0x0000,0x0000,0x0000,0x3FFF,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0380,0x0000,0x0000,0x0000,    \
-/* 000090 */ 0x7FFF,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000090 */ 0x7FFF,0x0000,0x0000,0x0000,0x0000,0x0000,0x4000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000a0 */ 0x0000,0x0000,0x0000,0x0000,0x0001,0x0030,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000b0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0010,0x0000,0x0000,0x0000,    \
 /* 0000c0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0C00,0x8000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0000d0 */ 0x3C00,0x0000,0x0007,0xFFF0,0x0000,0x0000,0x0000,0x0000,    \
-             0x0000,0x0000,0x0000,0x0020,0x0000,0x0000,0x001F,0x0000,    \
+             0x0000,0x0000,0x0000,0x0020,0x0000,0x0000,0x061F,0x0000,    \
 /* 0000e0 */ 0x00F0,0x0020,0x0020,0x0100,0x0020,0x0020,0x0110,0x0120,    \
              0x0130,0x0140,0x0150,0x0160,0x0170,0x0020,0x0020,0x0020,    \
 /* 0000f0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xFC00,    \
              0x0000,0x0000,0x0000,0x0000,0x0800,0x0000,0x0000,0x0000,    \
 /* 000100 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x01FE,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000110 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x6000,0x0000,0x0000,    \
              0x0000,0x0000,0x1800,0x0000,0x0000,0x3800,0x0000,0x0000,    \
 /* 000120 */ 0x0060,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0770,0x0000,    \
 /* 000130 */ 0x0000,0x0000,0x0000,0x07BF,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000140 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0030,    \
-             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000150 */ 0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x3F7F,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 000160 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0001,0xFC00,0x0000,    \
-             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+             0x0000,0x0000,0x0000,0x0000,0xF000,0x0000,0x0000,0x0000,    \
 /* 000170 */ 0xF800,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0008,0x0000,    \
 /* 000180 */ 0x0190,0x0020,0x0020,0x01A0,0x0020,0x0020,0x0020,0x01B0,    \
-             0x0020,0x01C0,0x0020,0x0020,0x01D0,0x0020,0x01E0,0x0020,    \
+             0x0020,0x01C0,0x0020,0x0020,0x01D0,0x01E0,0x01F0,0x0020,    \
 /* 000190 */ 0x7FFF,0x00FF,0xFFC0,0x0000,0x6000,0x0000,0x7FEB,0xFFEE,    \
              0x0000,0x0000,0x0000,0x6000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0001a0 */ 0x0000,0x0600,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
 /* 0001b0 */ 0x0000,0x0000,0x0000,0x0000,0x003F,0xFF00,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0xFFC0,0x0000,0x0060,    \
 /* 0001c0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x01FF,0xFFF8,0x3000,0x0000,0x0F00,0x0000,    \
 /* 0001d0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0xDE00,0x0000,0x0000,0x0000,    \
-/* 0001e0 */ 0x0003,0x7FFF,0xFB7F,0xFFFF,0x0000,0x0000,0x0000,0x0000,    \
+/* 0001e0 */ 0x0000,0x0000,0x0000,0x0000,0x0001,0x0000,0x0000,0x0000,    \
+             0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0001f0 */ 0x0003,0x7FFF,0xFB7F,0xFFFF,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0001f0 */ 0x0200,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 000200 */ 0x0210,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 000200 */ 0x2000,0x0000,0xEFF3,0xFF0E,0x0000,0x0000,0x0000,0x0000,    \
+/* 000210 */ 0x2000,0x0000,0xEFF3,0xFF0E,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0800,0x0000,0x0000,0x0000,    \
-/* 000210 */ 0x0020,0x0020,0x0020,0x0020,0x0220,0x0020,0x0230,0x0020,    \
-             0x0240,0x0250,0x0260,0x0270,0x0020,0x0020,0x0020,0x0020,    \
-/* 000220 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000220 */ 0x0020,0x0020,0x0020,0x0020,0x0230,0x0020,0x0240,0x0020,    \
+             0x0250,0x0260,0x0270,0x0280,0x0020,0x0020,0x0020,0x0020,    \
+/* 000230 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,0x0000,0x0000,    \
-/* 000230 */ 0x0000,0x0000,0x0000,0xE000,0x4008,0x0000,0x0000,0x0000,    \
+/* 000240 */ 0x0000,0x0000,0x0000,0xE000,0x4008,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x00FC,0x0000,0x0000,0x0000,    \
-/* 000240 */ 0x0000,0x0000,0x0000,0x0000,0x00F0,0x0000,0x0000,0x0000,    \
+/* 000250 */ 0x0000,0x0000,0x0000,0x0000,0x00F0,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0700,0x0000,0x0000,0xC000,    \
-/* 000250 */ 0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,0x8000,0x0000,    \
+/* 000260 */ 0x0000,0xC000,0x0000,0x0000,0x0000,0x0000,0x8000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,0x3FFE,    \
-/* 000260 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xF000,0x0000,    \
+/* 000270 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xF000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0xC000,0x0000,    \
-/* 000270 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000280 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0800,0x0000,0x0000,    \
-/* 000280 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-             0x0020,0x0020,0x0020,0x0020,0x0020,0x0290,0x02A0,0x02B0,    \
-/* 000290 */ 0xC000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000290 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+             0x0020,0x0020,0x0020,0x0020,0x0020,0x02A0,0x02B0,0x02C0,    \
+/* 0002a0 */ 0xC000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002a0 */ 0xFFE1,0x0000,0x03FF,0x0000,0x0000,0x0D03,0xFEF7,0x1FFF,    \
+/* 0002b0 */ 0xFFE1,0x0000,0x03FF,0x0000,0x0000,0x0D03,0xFEF7,0x1FFF,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002b0 */ 0x3800,0x0001,0x8C00,0xD7EE,0x0000,0x003F,0xA800,0x0000,    \
+/* 0002c0 */ 0x3800,0x0001,0x8C00,0xD7EE,0x0000,0x003F,0xA800,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002c0 */ 0x0000,0x02F0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,    \
-             0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,    \
-/* 0002d0 */ 0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,    \
-             0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,0x0000,0x02E0,    \
-/* 0002e0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0002d0 */ 0x0000,0x0300,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,    \
+             0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,    \
+/* 0002e0 */ 0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,    \
+             0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,0x0000,0x02F0,    \
+/* 0002f0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 0002f0 */ 0x0030,0x00A0,0x00C0,0x0010,0x0010,0x0010,0x0010,0x0010,    \
+/* 000300 */ 0x0030,0x00A0,0x00C0,0x0010,0x0010,0x0010,0x0010,0x0010,    \
              0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,0x0010,    \
-/* 000300 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 000310 */ 0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 000310 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000320 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000320 */ 0x0020,0x0040,0x0020,0x0050,0x0020,0x0020,0x0020,0x0020,    \
+/* 000330 */ 0x0020,0x0040,0x0020,0x0050,0x0020,0x0020,0x0020,0x0020,    \
              0x0060,0x0070,0x0080,0x0090,0x0020,0x0020,0x0020,0x0020,    \
-/* 000330 */ 0x0000,0x0000,0x0000,0x0003,0x0000,0x0000,0x0000,0x0000,    \
+/* 000340 */ 0x0000,0x0000,0x0000,0x0003,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000340 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000350 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x8000,0x0000,0x0000,0x0000,0x0001,0x0000,    \
-/* 000350 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0080,0x0000,    \
+/* 000360 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0080,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000360 */ 0x8000,0x0000,0x8000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000370 */ 0x8000,0x0000,0x8000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000370 */ 0x0000,0x0000,0x0000,0x0000,0x8000,0x0000,0x01FF,0x0000,    \
+/* 000380 */ 0x0000,0x0000,0x0000,0x0000,0x8000,0x0000,0x01FF,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000380 */ 0xFE00,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 000390 */ 0xFE00,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
-/* 000390 */ 0x00B0,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
+/* 0003a0 */ 0x00B0,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 0003a0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,    \
+/* 0003b0 */ 0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x3F80,    \
              0xD800,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0003,    \
-/* 0003b0 */ 0x0020,0x0020,0x0020,0x0020,0x00D0,0x0020,0x0020,0x0020,    \
+/* 0003c0 */ 0x0020,0x0020,0x0020,0x0020,0x00D0,0x0020,0x0020,0x0020,    \
              0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,0x0020,    \
-/* 0003c0 */ 0x0000,0x0000,0x0000,0x0000,0x000F,0x0000,0x0000,0x0000,    \
+/* 0003d0 */ 0x0000,0x0000,0x0000,0x0000,0x000F,0x0000,0x0000,0x0000,    \
              0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
 #else
 #error "We don't support this architecture."
 #endif
 
--- a/layout/reftests/text-transform/all-lower-ref.html
+++ b/layout/reftests/text-transform/all-lower-ref.html
@@ -425,16 +425,17 @@
 &#x0517;
 &#x0519;
 &#x051B;
 &#x051D;
 &#x051F;
 &#x0521;
 &#x0523;
 &#x0525;
+&#x0527;
 &#x0561;
 &#x0562;
 &#x0563;
 &#x0564;
 &#x0565;
 &#x0566;
 &#x0567;
 &#x0568;
@@ -898,16 +899,17 @@
 &#xA651;
 &#xA653;
 &#xA655;
 &#xA657;
 &#xA659;
 &#xA65B;
 &#xA65D;
 &#xA65F;
+&#xA661;
 &#xA663;
 &#xA665;
 &#xA667;
 &#xA669;
 &#xA66B;
 &#xA66D;
 &#xA681;
 &#xA683;
@@ -963,16 +965,23 @@
 &#xA77C;
 &#x1D79;
 &#xA77F;
 &#xA781;
 &#xA783;
 &#xA785;
 &#xA787;
 &#xA78C;
+&#x0265;
+&#xA791;
+&#xA7A1;
+&#xA7A3;
+&#xA7A5;
+&#xA7A7;
+&#xA7A9;
 &#xFF41;
 &#xFF42;
 &#xFF43;
 &#xFF44;
 &#xFF45;
 &#xFF46;
 &#xFF47;
 &#xFF48;
--- a/layout/reftests/text-transform/all-lower.html
+++ b/layout/reftests/text-transform/all-lower.html
@@ -428,16 +428,17 @@
 &#x0516;
 &#x0518;
 &#x051A;
 &#x051C;
 &#x051E;
 &#x0520;
 &#x0522;
 &#x0524;
+&#x0526;
 &#x0531;
 &#x0532;
 &#x0533;
 &#x0534;
 &#x0535;
 &#x0536;
 &#x0537;
 &#x0538;
@@ -901,16 +902,17 @@
 &#xA650;
 &#xA652;
 &#xA654;
 &#xA656;
 &#xA658;
 &#xA65A;
 &#xA65C;
 &#xA65E;
+&#xA660;
 &#xA662;
 &#xA664;
 &#xA666;
 &#xA668;
 &#xA66A;
 &#xA66C;
 &#xA680;
 &#xA682;
@@ -966,16 +968,23 @@
 &#xA77B;
 &#xA77D;
 &#xA77E;
 &#xA780;
 &#xA782;
 &#xA784;
 &#xA786;
 &#xA78B;
+&#xA78D;
+&#xA790;
+&#xA7A0;
+&#xA7A2;
+&#xA7A4;
+&#xA7A6;
+&#xA7A8;
 &#xFF21;
 &#xFF22;
 &#xFF23;
 &#xFF24;
 &#xFF25;
 &#xFF26;
 &#xFF27;
 &#xFF28;
--- a/layout/reftests/text-transform/all-title-ref.html
+++ b/layout/reftests/text-transform/all-title-ref.html
@@ -222,16 +222,17 @@
 &#x0181;x
 &#x0186;x
 &#x0189;x
 &#x018A;x
 &#x018F;x
 &#x0190;x
 &#x0193;x
 &#x0194;x
+&#xA78D;x
 &#x0197;x
 &#x0196;x
 &#x2C62;x
 &#x019C;x
 &#x2C6E;x
 &#x019D;x
 &#x019F;x
 &#x2C64;x
@@ -445,16 +446,17 @@
 &#x0516;x
 &#x0518;x
 &#x051A;x
 &#x051C;x
 &#x051E;x
 &#x0520;x
 &#x0522;x
 &#x0524;x
+&#x0526;x
 &#x0531;x
 &#x0532;x
 &#x0533;x
 &#x0534;x
 &#x0535;x
 &#x0536;x
 &#x0537;x
 &#x0538;x
@@ -911,16 +913,17 @@
 &#xA650;x
 &#xA652;x
 &#xA654;x
 &#xA656;x
 &#xA658;x
 &#xA65A;x
 &#xA65C;x
 &#xA65E;x
+&#xA660;x
 &#xA662;x
 &#xA664;x
 &#xA666;x
 &#xA668;x
 &#xA66A;x
 &#xA66C;x
 &#xA680;x
 &#xA682;x
@@ -975,16 +978,22 @@
 &#xA779;x
 &#xA77B;x
 &#xA77E;x
 &#xA780;x
 &#xA782;x
 &#xA784;x
 &#xA786;x
 &#xA78B;x
+&#xA790;x
+&#xA7A0;x
+&#xA7A2;x
+&#xA7A4;x
+&#xA7A6;x
+&#xA7A8;x
 &#xFF21;x
 &#xFF22;x
 &#xFF23;x
 &#xFF24;x
 &#xFF25;x
 &#xFF26;x
 &#xFF27;x
 &#xFF28;x
--- a/layout/reftests/text-transform/all-title.html
+++ b/layout/reftests/text-transform/all-title.html
@@ -225,16 +225,17 @@
 &#x0253;x
 &#x0254;x
 &#x0256;x
 &#x0257;x
 &#x0259;x
 &#x025B;x
 &#x0260;x
 &#x0263;x
+&#x0265;x
 &#x0268;x
 &#x0269;x
 &#x026B;x
 &#x026F;x
 &#x0271;x
 &#x0272;x
 &#x0275;x
 &#x027D;x
@@ -448,16 +449,17 @@
 &#x0517;x
 &#x0519;x
 &#x051B;x
 &#x051D;x
 &#x051F;x
 &#x0521;x
 &#x0523;x
 &#x0525;x
+&#x0527;x
 &#x0561;x
 &#x0562;x
 &#x0563;x
 &#x0564;x
 &#x0565;x
 &#x0566;x
 &#x0567;x
 &#x0568;x
@@ -914,16 +916,17 @@
 &#xA651;x
 &#xA653;x
 &#xA655;x
 &#xA657;x
 &#xA659;x
 &#xA65B;x
 &#xA65D;x
 &#xA65F;x
+&#xA661;x
 &#xA663;x
 &#xA665;x
 &#xA667;x
 &#xA669;x
 &#xA66B;x
 &#xA66D;x
 &#xA681;x
 &#xA683;x
@@ -978,16 +981,22 @@
 &#xA77A;x
 &#xA77C;x
 &#xA77F;x
 &#xA781;x
 &#xA783;x
 &#xA785;x
 &#xA787;x
 &#xA78C;x
+&#xA791;x
+&#xA7A1;x
+&#xA7A3;x
+&#xA7A5;x
+&#xA7A7;x
+&#xA7A9;x
 &#xFF41;x
 &#xFF42;x
 &#xFF43;x
 &#xFF44;x
 &#xFF45;x
 &#xFF46;x
 &#xFF47;x
 &#xFF48;x
--- a/layout/reftests/text-transform/all-upper-ref.html
+++ b/layout/reftests/text-transform/all-upper-ref.html
@@ -218,16 +218,17 @@
 &#x0181;
 &#x0186;
 &#x0189;
 &#x018A;
 &#x018F;
 &#x0190;
 &#x0193;
 &#x0194;
+&#xA78D;
 &#x0197;
 &#x0196;
 &#x2C62;
 &#x019C;
 &#x2C6E;
 &#x019D;
 &#x019F;
 &#x2C64;
@@ -441,16 +442,17 @@
 &#x0516;
 &#x0518;
 &#x051A;
 &#x051C;
 &#x051E;
 &#x0520;
 &#x0522;
 &#x0524;
+&#x0526;
 &#x0531;
 &#x0532;
 &#x0533;
 &#x0534;
 &#x0535;
 &#x0536;
 &#x0537;
 &#x0538;
@@ -907,16 +909,17 @@
 &#xA650;
 &#xA652;
 &#xA654;
 &#xA656;
 &#xA658;
 &#xA65A;
 &#xA65C;
 &#xA65E;
+&#xA660;
 &#xA662;
 &#xA664;
 &#xA666;
 &#xA668;
 &#xA66A;
 &#xA66C;
 &#xA680;
 &#xA682;
@@ -971,16 +974,22 @@
 &#xA779;
 &#xA77B;
 &#xA77E;
 &#xA780;
 &#xA782;
 &#xA784;
 &#xA786;
 &#xA78B;
+&#xA790;
+&#xA7A0;
+&#xA7A2;
+&#xA7A4;
+&#xA7A6;
+&#xA7A8;
 &#xFF21;
 &#xFF22;
 &#xFF23;
 &#xFF24;
 &#xFF25;
 &#xFF26;
 &#xFF27;
 &#xFF28;
--- a/layout/reftests/text-transform/all-upper.html
+++ b/layout/reftests/text-transform/all-upper.html
@@ -221,16 +221,17 @@
 &#x0253;
 &#x0254;
 &#x0256;
 &#x0257;
 &#x0259;
 &#x025B;
 &#x0260;
 &#x0263;
+&#x0265;
 &#x0268;
 &#x0269;
 &#x026B;
 &#x026F;
 &#x0271;
 &#x0272;
 &#x0275;
 &#x027D;
@@ -444,16 +445,17 @@
 &#x0517;
 &#x0519;
 &#x051B;
 &#x051D;
 &#x051F;
 &#x0521;
 &#x0523;
 &#x0525;
+&#x0527;
 &#x0561;
 &#x0562;
 &#x0563;
 &#x0564;
 &#x0565;
 &#x0566;
 &#x0567;
 &#x0568;
@@ -910,16 +912,17 @@
 &#xA651;
 &#xA653;
 &#xA655;
 &#xA657;
 &#xA659;
 &#xA65B;
 &#xA65D;
 &#xA65F;
+&#xA661;
 &#xA663;
 &#xA665;
 &#xA667;
 &#xA669;
 &#xA66B;
 &#xA66D;
 &#xA681;
 &#xA683;
@@ -974,16 +977,22 @@
 &#xA77A;
 &#xA77C;
 &#xA77F;
 &#xA781;
 &#xA783;
 &#xA785;
 &#xA787;
 &#xA78C;
+&#xA791;
+&#xA7A1;
+&#xA7A3;
+&#xA7A5;
+&#xA7A7;
+&#xA7A9;
 &#xFF41;
 &#xFF42;
 &#xFF43;
 &#xFF44;
 &#xFF45;
 &#xFF46;
 &#xFF47;
 &#xFF48;