Update Bidi character data tables to Unicode 4.1.0. Bug 288836, r=jshin, rs=roc, a=mkaply
authorsmontagu@smontagu.org
Thu, 28 Jun 2007 13:02:56 -0700
changeset 2930 964a04d8ff0eda90d2e382b019d8f9719f853327
parent 2929 734b2179304173597282645ca749b2a04cae46c2
child 2931 37fdaa589609ca6951a3cb4f5ae5fd25a2607d08
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)
reviewersjshin, roc, mkaply
bugs288836
milestone1.9a6pre
Update Bidi character data tables to Unicode 4.1.0. Bug 288836, r=jshin, rs=roc, a=mkaply
intl/unicharutil/util/bidicattable.h
intl/unicharutil/util/genbidicattable.pl
intl/unicharutil/util/gensymmtable.pl
intl/unicharutil/util/symmtable.h
--- a/intl/unicharutil/util/bidicattable.h
+++ b/intl/unicharutil/util/bidicattable.h
@@ -146,36 +146,36 @@ static PRUint8 gBidiCatIdx1[256] = {
      10,  /* U+0318 - U+031F : 0xAAAAAAAA */
      10,  /* U+0320 - U+0327 : 0xAAAAAAAA */
      10,  /* U+0328 - U+032F : 0xAAAAAAAA */
      10,  /* U+0330 - U+0337 : 0xAAAAAAAA */
      10,  /* U+0338 - U+033F : 0xAAAAAAAA */
      10,  /* U+0340 - U+0347 : 0xAAAAAAAA */
      10,  /* U+0348 - U+034F : 0xAAAAAAAA */
      10,  /* U+0350 - U+0357 : 0xAAAAAAAA */
-     34,  /* U+0358 - U+035F : 0xAAA11111 */
+     10,  /* U+0358 - U+035F : 0xAAAAAAAA */
      10,  /* U+0360 - U+0367 : 0xAAAAAAAA */
      10,  /* U+0368 - U+036F : 0xAAAAAAAA */
-     35,  /* U+0370 - U+0377 : 0x11991111 */
-     36,  /* U+0378 - U+037F : 0x19111111 */
-     37,  /* U+0380 - U+0387 : 0x91991111 */
+     34,  /* U+0370 - U+0377 : 0x11991111 */
+     35,  /* U+0378 - U+037F : 0x19111111 */
+     36,  /* U+0380 - U+0387 : 0x91991111 */
       1,  /* U+0388 - U+038F : 0x11111111 */
       1,  /* U+0390 - U+0397 : 0x11111111 */
       1,  /* U+0398 - U+039F : 0x11111111 */
       1,  /* U+03A0 - U+03A7 : 0x11111111 */
       1,  /* U+03A8 - U+03AF : 0x11111111 */
       1,  /* U+03B0 - U+03B7 : 0x11111111 */
       1,  /* U+03B8 - U+03BF : 0x11111111 */
       1,  /* U+03C0 - U+03C7 : 0x11111111 */
       1,  /* U+03C8 - U+03CF : 0x11111111 */
       1,  /* U+03D0 - U+03D7 : 0x11111111 */
       1,  /* U+03D8 - U+03DF : 0x11111111 */
       1,  /* U+03E0 - U+03E7 : 0x11111111 */
       1,  /* U+03E8 - U+03EF : 0x11111111 */
-     36,  /* U+03F0 - U+03F7 : 0x19111111 */
+     35,  /* U+03F0 - U+03F7 : 0x19111111 */
       1,  /* U+03F8 - U+03FF : 0x11111111 */
       1,  /* U+0400 - U+0407 : 0x11111111 */
       1,  /* U+0408 - U+040F : 0x11111111 */
       1,  /* U+0410 - U+0417 : 0x11111111 */
       1,  /* U+0418 - U+041F : 0x11111111 */
       1,  /* U+0420 - U+0427 : 0x11111111 */
       1,  /* U+0428 - U+042F : 0x11111111 */
       1,  /* U+0430 - U+0437 : 0x11111111 */
@@ -183,18 +183,18 @@ static PRUint8 gBidiCatIdx1[256] = {
       1,  /* U+0440 - U+0447 : 0x11111111 */
       1,  /* U+0448 - U+044F : 0x11111111 */
       1,  /* U+0450 - U+0457 : 0x11111111 */
       1,  /* U+0458 - U+045F : 0x11111111 */
       1,  /* U+0460 - U+0467 : 0x11111111 */
       1,  /* U+0468 - U+046F : 0x11111111 */
       1,  /* U+0470 - U+0477 : 0x11111111 */
       1,  /* U+0478 - U+047F : 0x11111111 */
-     38,  /* U+0480 - U+0487 : 0x1AAAA111 */
-     39,  /* U+0488 - U+048F : 0x111111AA */
+     37,  /* U+0480 - U+0487 : 0x1AAAA111 */
+     38,  /* U+0488 - U+048F : 0x111111AA */
       1,  /* U+0490 - U+0497 : 0x11111111 */
       1,  /* U+0498 - U+049F : 0x11111111 */
       1,  /* U+04A0 - U+04A7 : 0x11111111 */
       1,  /* U+04A8 - U+04AF : 0x11111111 */
       1,  /* U+04B0 - U+04B7 : 0x11111111 */
       1,  /* U+04B8 - U+04BF : 0x11111111 */
       1,  /* U+04C0 - U+04C7 : 0x11111111 */
       1,  /* U+04C8 - U+04CF : 0x11111111 */
@@ -216,334 +216,334 @@ static PRUint8 gBidiCatIdx1[256] = {
       1,  /* U+0548 - U+054F : 0x11111111 */
       1,  /* U+0550 - U+0557 : 0x11111111 */
       1,  /* U+0558 - U+055F : 0x11111111 */
       1,  /* U+0560 - U+0567 : 0x11111111 */
       1,  /* U+0568 - U+056F : 0x11111111 */
       1,  /* U+0570 - U+0577 : 0x11111111 */
       1,  /* U+0578 - U+057F : 0x11111111 */
       1,  /* U+0580 - U+0587 : 0x11111111 */
-     40,  /* U+0588 - U+058F : 0x11111911 */
-     41,  /* U+0590 - U+0597 : 0xAAAAAAA2 */
+     39,  /* U+0588 - U+058F : 0x11111911 */
+     40,  /* U+0590 - U+0597 : 0xAAAAAAA2 */
      10,  /* U+0598 - U+059F : 0xAAAAAAAA */
-     42,  /* U+05A0 - U+05A7 : 0xAAAAA2AA */
+     10,  /* U+05A0 - U+05A7 : 0xAAAAAAAA */
      10,  /* U+05A8 - U+05AF : 0xAAAAAAAA */
      10,  /* U+05B0 - U+05B7 : 0xAAAAAAAA */
-     43,  /* U+05B8 - U+05BF : 0xA2AAA2AA */
-     44,  /* U+05C0 - U+05C7 : 0x222A2AA2 */
+     41,  /* U+05B8 - U+05BF : 0xA2AAA2AA */
+     42,  /* U+05C0 - U+05C7 : 0xA2AA2AA2 */
       2,  /* U+05C8 - U+05CF : 0x22222222 */
       2,  /* U+05D0 - U+05D7 : 0x22222222 */
       2,  /* U+05D8 - U+05DF : 0x22222222 */
       2,  /* U+05E0 - U+05E7 : 0x22222222 */
       2,  /* U+05E8 - U+05EF : 0x22222222 */
       2,  /* U+05F0 - U+05F7 : 0x22222222 */
       2,  /* U+05F8 - U+05FF : 0x22222222 */
       3,  /* U+0600 - U+0607 : 0x33333333 */
-     45,  /* U+0608 - U+060F : 0x99383333 */
-     46,  /* U+0610 - U+0617 : 0x33AAAAAA */
+     43,  /* U+0608 - U+060F : 0x99383333 */
+     44,  /* U+0610 - U+0617 : 0x33AAAAAA */
       3,  /* U+0618 - U+061F : 0x33333333 */
       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 */
-     47,  /* U+0648 - U+064F : 0xAAAAA333 */
+     45,  /* U+0648 - U+064F : 0xAAAAA333 */
      10,  /* U+0650 - U+0657 : 0xAAAAAAAA */
-     48,  /* U+0658 - U+065F : 0x3333333A */
+     46,  /* U+0658 - U+065F : 0x3AAAAAAA */
       4,  /* U+0660 - U+0667 : 0x44444444 */
-     49,  /* U+0668 - U+066F : 0x33344744 */
+     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 : 0xAA3AAAAA */
-     52,  /* U+06E0 - U+06E7 : 0xA33AAAAA */
-     53,  /* U+06E8 - U+06EF : 0x33AAAA9A */
+     49,  /* U+06D0 - U+06D7 : 0xAA333333 */
+     50,  /* U+06D8 - U+06DF : 0xAA3AAAAA */
+     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 : 0xB3333333 */
+     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 */
-     57,  /* U+0748 - U+074F : 0x33333AAA */
+     56,  /* U+0748 - U+074F : 0x33333AAA */
       3,  /* U+0750 - U+0757 : 0x33333333 */
       3,  /* U+0758 - U+075F : 0x33333333 */
       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 */
      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 */
       2,  /* U+07E8 - U+07EF : 0x22222222 */
       2,  /* U+07F0 - U+07F7 : 0x22222222 */
       2,  /* U+07F8 - U+07FF : 0x22222222 */
 };
 
-static PRUint8 gBidiCatIdx2[544] = {
-     58,  /* U+0900 - U+0907 : 0x11111AA1 */
+static PRUint8 gBidiCatIdx2[548] = {
+     57,  /* U+0900 - U+0907 : 0x11111AA1 */
       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 */
-     59,  /* U+0938 - U+093F : 0x111A1111 */
-     60,  /* U+0940 - U+0947 : 0xAAAAAAA1 */
-     61,  /* U+0948 - U+094F : 0x11A1111A */
-     62,  /* U+0950 - U+0957 : 0x111AAAA1 */
+     58,  /* U+0938 - U+093F : 0x111A1111 */
+     59,  /* U+0940 - U+0947 : 0xAAAAAAA1 */
+     60,  /* U+0948 - U+094F : 0x11A1111A */
+     61,  /* U+0950 - U+0957 : 0x111AAAA1 */
       1,  /* U+0958 - U+095F : 0x11111111 */
-     63,  /* U+0960 - U+0967 : 0x1111AA11 */
+     62,  /* U+0960 - U+0967 : 0x1111AA11 */
       1,  /* U+0968 - U+096F : 0x11111111 */
       1,  /* U+0970 - U+0977 : 0x11111111 */
       1,  /* U+0978 - U+097F : 0x11111111 */
-     64,  /* U+0980 - U+0987 : 0x111111A1 */
+     63,  /* 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 */
-     59,  /* U+09B8 - U+09BF : 0x111A1111 */
-     62,  /* U+09C0 - U+09C7 : 0x111AAAA1 */
-     65,  /* U+09C8 - U+09CF : 0x11A11111 */
+     58,  /* U+09B8 - U+09BF : 0x111A1111 */
+     61,  /* U+09C0 - U+09C7 : 0x111AAAA1 */
+     64,  /* U+09C8 - U+09CF : 0x11A11111 */
       1,  /* U+09D0 - U+09D7 : 0x11111111 */
       1,  /* U+09D8 - U+09DF : 0x11111111 */
-     63,  /* U+09E0 - U+09E7 : 0x1111AA11 */
+     62,  /* U+09E0 - U+09E7 : 0x1111AA11 */
       1,  /* U+09E8 - U+09EF : 0x11111111 */
-     66,  /* U+09F0 - U+09F7 : 0x11117711 */
+     65,  /* U+09F0 - U+09F7 : 0x11117711 */
       1,  /* U+09F8 - U+09FF : 0x11111111 */
-     58,  /* U+0A00 - U+0A07 : 0x11111AA1 */
+     57,  /* 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 */
-     59,  /* U+0A38 - U+0A3F : 0x111A1111 */
-     67,  /* U+0A40 - U+0A47 : 0xA1111AA1 */
-     68,  /* U+0A48 - U+0A4F : 0x11AAA11A */
+     58,  /* U+0A38 - U+0A3F : 0x111A1111 */
+     66,  /* U+0A40 - U+0A47 : 0xA1111AA1 */
+     67,  /* U+0A48 - U+0A4F : 0x11AAA11A */
       1,  /* U+0A50 - U+0A57 : 0x11111111 */
       1,  /* U+0A58 - U+0A5F : 0x11111111 */
       1,  /* U+0A60 - U+0A67 : 0x11111111 */
       1,  /* U+0A68 - U+0A6F : 0x11111111 */
-     39,  /* U+0A70 - U+0A77 : 0x111111AA */
+     38,  /* U+0A70 - U+0A77 : 0x111111AA */
       1,  /* U+0A78 - U+0A7F : 0x11111111 */
-     58,  /* U+0A80 - U+0A87 : 0x11111AA1 */
+     57,  /* 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 */
-     59,  /* U+0AB8 - U+0ABF : 0x111A1111 */
-     69,  /* U+0AC0 - U+0AC7 : 0xA1AAAAA1 */
-     61,  /* U+0AC8 - U+0ACF : 0x11A1111A */
+     58,  /* U+0AB8 - U+0ABF : 0x111A1111 */
+     68,  /* U+0AC0 - U+0AC7 : 0xA1AAAAA1 */
+     60,  /* U+0AC8 - U+0ACF : 0x11A1111A */
       1,  /* U+0AD0 - U+0AD7 : 0x11111111 */
       1,  /* U+0AD8 - U+0ADF : 0x11111111 */
-     63,  /* U+0AE0 - U+0AE7 : 0x1111AA11 */
+     62,  /* U+0AE0 - U+0AE7 : 0x1111AA11 */
       1,  /* U+0AE8 - U+0AEF : 0x11111111 */
-     70,  /* U+0AF0 - U+0AF7 : 0x11111171 */
+     69,  /* U+0AF0 - U+0AF7 : 0x11111171 */
       1,  /* U+0AF8 - U+0AFF : 0x11111111 */
-     64,  /* U+0B00 - U+0B07 : 0x111111A1 */
+     63,  /* 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 */
-     71,  /* U+0B38 - U+0B3F : 0xA11A1111 */
-     72,  /* U+0B40 - U+0B47 : 0x1111AAA1 */
-     65,  /* U+0B48 - U+0B4F : 0x11A11111 */
-     73,  /* U+0B50 - U+0B57 : 0x1A111111 */
+     70,  /* U+0B38 - U+0B3F : 0xA11A1111 */
+     71,  /* U+0B40 - U+0B47 : 0x1111AAA1 */
+     64,  /* U+0B48 - U+0B4F : 0x11A11111 */
+     72,  /* U+0B50 - U+0B57 : 0x1A111111 */
       1,  /* U+0B58 - U+0B5F : 0x11111111 */
       1,  /* U+0B60 - U+0B67 : 0x11111111 */
       1,  /* U+0B68 - U+0B6F : 0x11111111 */
       1,  /* U+0B70 - U+0B77 : 0x11111111 */
       1,  /* U+0B78 - U+0B7F : 0x11111111 */
-     74,  /* U+0B80 - U+0B87 : 0x11111A11 */
+     73,  /* 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 */
       1,  /* U+0BA8 - U+0BAF : 0x11111111 */
       1,  /* U+0BB0 - U+0BB7 : 0x11111111 */
       1,  /* U+0BB8 - U+0BBF : 0x11111111 */
-     75,  /* U+0BC0 - U+0BC7 : 0x1111111A */
-     65,  /* U+0BC8 - U+0BCF : 0x11A11111 */
+     74,  /* U+0BC0 - U+0BC7 : 0x1111111A */
+     64,  /* U+0BC8 - U+0BCF : 0x11A11111 */
       1,  /* U+0BD0 - U+0BD7 : 0x11111111 */
       1,  /* U+0BD8 - U+0BDF : 0x11111111 */
       1,  /* U+0BE0 - U+0BE7 : 0x11111111 */
       1,  /* U+0BE8 - U+0BEF : 0x11111111 */
      22,  /* U+0BF0 - U+0BF7 : 0x99999111 */
-     76,  /* U+0BF8 - U+0BFF : 0x11111979 */
+     75,  /* U+0BF8 - U+0BFF : 0x11111979 */
       1,  /* U+0C00 - U+0C07 : 0x11111111 */
       1,  /* U+0C08 - U+0C0F : 0x11111111 */
       1,  /* U+0C10 - U+0C17 : 0x11111111 */
       1,  /* U+0C18 - U+0C1F : 0x11111111 */
       1,  /* U+0C20 - U+0C27 : 0x11111111 */
       1,  /* U+0C28 - U+0C2F : 0x11111111 */
       1,  /* U+0C30 - U+0C37 : 0x11111111 */
-     77,  /* U+0C38 - U+0C3F : 0xAA111111 */
-     78,  /* U+0C40 - U+0C47 : 0xAA11111A */
-     79,  /* U+0C48 - U+0C4F : 0x11AAAA1A */
-     80,  /* U+0C50 - U+0C57 : 0x1AA11111 */
+     76,  /* U+0C38 - U+0C3F : 0xAA111111 */
+     77,  /* U+0C40 - U+0C47 : 0xAA11111A */
+     78,  /* U+0C48 - U+0C4F : 0x11AAAA1A */
+     79,  /* U+0C50 - U+0C57 : 0x1AA11111 */
       1,  /* U+0C58 - U+0C5F : 0x11111111 */
       1,  /* U+0C60 - U+0C67 : 0x11111111 */
       1,  /* U+0C68 - U+0C6F : 0x11111111 */
       1,  /* U+0C70 - U+0C77 : 0x11111111 */
       1,  /* U+0C78 - U+0C7F : 0x11111111 */
       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 */
-     59,  /* U+0CB8 - U+0CBF : 0x111A1111 */
+     58,  /* U+0CB8 - U+0CBF : 0x111A1111 */
       1,  /* U+0CC0 - U+0CC7 : 0x11111111 */
-     81,  /* U+0CC8 - U+0CCF : 0x11AA1111 */
+     80,  /* U+0CC8 - U+0CCF : 0x11AA1111 */
       1,  /* U+0CD0 - U+0CD7 : 0x11111111 */
       1,  /* U+0CD8 - U+0CDF : 0x11111111 */
       1,  /* U+0CE0 - U+0CE7 : 0x11111111 */
       1,  /* U+0CE8 - U+0CEF : 0x11111111 */
       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 */
-     72,  /* U+0D40 - U+0D47 : 0x1111AAA1 */
-     65,  /* U+0D48 - U+0D4F : 0x11A11111 */
+     71,  /* U+0D40 - U+0D47 : 0x1111AAA1 */
+     64,  /* U+0D48 - U+0D4F : 0x11A11111 */
       1,  /* U+0D50 - U+0D57 : 0x11111111 */
       1,  /* U+0D58 - U+0D5F : 0x11111111 */
       1,  /* U+0D60 - U+0D67 : 0x11111111 */
       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 */
       1,  /* U+0DA8 - U+0DAF : 0x11111111 */
       1,  /* U+0DB0 - U+0DB7 : 0x11111111 */
       1,  /* U+0DB8 - U+0DBF : 0x11111111 */
       1,  /* U+0DC0 - U+0DC7 : 0x11111111 */
-     74,  /* U+0DC8 - U+0DCF : 0x11111A11 */
-     82,  /* U+0DD0 - U+0DD7 : 0x1A1AAA11 */
+     73,  /* U+0DC8 - U+0DCF : 0x11111A11 */
+     81,  /* U+0DD0 - U+0DD7 : 0x1A1AAA11 */
       1,  /* U+0DD8 - U+0DDF : 0x11111111 */
       1,  /* U+0DE0 - U+0DE7 : 0x11111111 */
       1,  /* U+0DE8 - U+0DEF : 0x11111111 */
       1,  /* U+0DF0 - U+0DF7 : 0x11111111 */
       1,  /* U+0DF8 - U+0DFF : 0x11111111 */
       1,  /* U+0E00 - U+0E07 : 0x11111111 */
       1,  /* U+0E08 - U+0E0F : 0x11111111 */
       1,  /* U+0E10 - U+0E17 : 0x11111111 */
       1,  /* U+0E18 - U+0E1F : 0x11111111 */
       1,  /* U+0E20 - U+0E27 : 0x11111111 */
       1,  /* U+0E28 - U+0E2F : 0x11111111 */
-     83,  /* U+0E30 - U+0E37 : 0xAAAA11A1 */
-     84,  /* U+0E38 - U+0E3F : 0x71111AAA */
-     85,  /* U+0E40 - U+0E47 : 0xA1111111 */
-     86,  /* U+0E48 - U+0E4F : 0x1AAAAAAA */
+     82,  /* U+0E30 - U+0E37 : 0xAAAA11A1 */
+     83,  /* U+0E38 - U+0E3F : 0x71111AAA */
+     84,  /* U+0E40 - U+0E47 : 0xA1111111 */
+     85,  /* U+0E48 - U+0E4F : 0x1AAAAAAA */
       1,  /* U+0E50 - U+0E57 : 0x11111111 */
       1,  /* U+0E58 - U+0E5F : 0x11111111 */
       1,  /* U+0E60 - U+0E67 : 0x11111111 */
       1,  /* U+0E68 - U+0E6F : 0x11111111 */
       1,  /* U+0E70 - U+0E77 : 0x11111111 */
       1,  /* U+0E78 - U+0E7F : 0x11111111 */
       1,  /* U+0E80 - U+0E87 : 0x11111111 */
       1,  /* U+0E88 - U+0E8F : 0x11111111 */
       1,  /* U+0E90 - U+0E97 : 0x11111111 */
       1,  /* U+0E98 - U+0E9F : 0x11111111 */
       1,  /* U+0EA0 - U+0EA7 : 0x11111111 */
       1,  /* U+0EA8 - U+0EAF : 0x11111111 */
-     83,  /* U+0EB0 - U+0EB7 : 0xAAAA11A1 */
-     87,  /* U+0EB8 - U+0EBF : 0x111AA1AA */
+     82,  /* U+0EB0 - U+0EB7 : 0xAAAA11A1 */
+     86,  /* U+0EB8 - U+0EBF : 0x111AA1AA */
       1,  /* U+0EC0 - U+0EC7 : 0x11111111 */
-     88,  /* U+0EC8 - U+0ECF : 0x11AAAAAA */
+     87,  /* U+0EC8 - U+0ECF : 0x11AAAAAA */
       1,  /* U+0ED0 - U+0ED7 : 0x11111111 */
       1,  /* U+0ED8 - U+0EDF : 0x11111111 */
       1,  /* U+0EE0 - U+0EE7 : 0x11111111 */
       1,  /* U+0EE8 - U+0EEF : 0x11111111 */
       1,  /* U+0EF0 - U+0EF7 : 0x11111111 */
       1,  /* U+0EF8 - U+0EFF : 0x11111111 */
       1,  /* U+0F00 - U+0F07 : 0x11111111 */
       1,  /* U+0F08 - U+0F0F : 0x11111111 */
       1,  /* U+0F10 - U+0F17 : 0x11111111 */
-     39,  /* U+0F18 - U+0F1F : 0x111111AA */
+     38,  /* U+0F18 - U+0F1F : 0x111111AA */
       1,  /* U+0F20 - U+0F27 : 0x11111111 */
       1,  /* U+0F28 - U+0F2F : 0x11111111 */
-     89,  /* U+0F30 - U+0F37 : 0xA1A11111 */
-     90,  /* U+0F38 - U+0F3F : 0x119999A1 */
+     88,  /* U+0F30 - U+0F37 : 0xA1A11111 */
+     89,  /* U+0F38 - U+0F3F : 0x119999A1 */
       1,  /* U+0F40 - U+0F47 : 0x11111111 */
       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 */
-     60,  /* U+0F70 - U+0F77 : 0xAAAAAAA1 */
-     86,  /* U+0F78 - U+0F7F : 0x1AAAAAAA */
-     91,  /* U+0F80 - U+0F87 : 0xAA1AAAAA */
+     59,  /* U+0F70 - U+0F77 : 0xAAAAAAA1 */
+     85,  /* U+0F78 - U+0F7F : 0x1AAAAAAA */
+     90,  /* U+0F80 - U+0F87 : 0xAA1AAAAA */
       1,  /* U+0F88 - U+0F8F : 0x11111111 */
      10,  /* U+0F90 - U+0F97 : 0xAAAAAAAA */
-     60,  /* U+0F98 - U+0F9F : 0xAAAAAAA1 */
+     59,  /* U+0F98 - U+0F9F : 0xAAAAAAA1 */
      10,  /* U+0FA0 - U+0FA7 : 0xAAAAAAAA */
      10,  /* U+0FA8 - U+0FAF : 0xAAAAAAAA */
      10,  /* U+0FB0 - U+0FB7 : 0xAAAAAAAA */
-     92,  /* U+0FB8 - U+0FBF : 0x111AAAAA */
-     73,  /* U+0FC0 - U+0FC7 : 0x1A111111 */
+     91,  /* U+0FB8 - U+0FBF : 0x111AAAAA */
+     72,  /* 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 */
-     34,  /* U+1028 - U+102F : 0xAAA11111 */
+     92,  /* U+1028 - U+102F : 0xAAA11111 */
      93,  /* U+1030 - U+1037 : 0xAA111A1A */
-     64,  /* U+1038 - U+103F : 0x111111A1 */
+     63,  /* U+1038 - U+103F : 0x111111A1 */
       1,  /* U+1040 - U+1047 : 0x11111111 */
       1,  /* U+1048 - U+104F : 0x11111111 */
       1,  /* U+1050 - U+1057 : 0x11111111 */
-     39,  /* U+1058 - U+105F : 0x111111AA */
+     38,  /* U+1058 - U+105F : 0x111111AA */
       1,  /* U+1060 - U+1067 : 0x11111111 */
       1,  /* U+1068 - U+106F : 0x11111111 */
       1,  /* U+1070 - U+1077 : 0x11111111 */
       1,  /* U+1078 - U+107F : 0x11111111 */
       1,  /* U+1080 - U+1087 : 0x11111111 */
       1,  /* U+1088 - U+108F : 0x11111111 */
       1,  /* U+1090 - U+1097 : 0x11111111 */
       1,  /* U+1098 - U+109F : 0x11111111 */
@@ -629,25 +629,25 @@ static PRUint8 gBidiCatIdx2[544] = {
       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 */
-      1,  /* U+1358 - U+135F : 0x11111111 */
+     84,  /* U+1358 - U+135F : 0xA1111111 */
       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 */
-      1,  /* U+1390 - U+1397 : 0x11111111 */
-      1,  /* U+1398 - U+139F : 0x11111111 */
+      9,  /* U+1390 - U+1397 : 0x99999999 */
+     94,  /* U+1398 - U+139F : 0x11111199 */
       1,  /* U+13A0 - U+13A7 : 0x11111111 */
       1,  /* U+13A8 - U+13AF : 0x11111111 */
       1,  /* U+13B0 - U+13B7 : 0x11111111 */
       1,  /* U+13B8 - U+13BF : 0x11111111 */
       1,  /* U+13C0 - U+13C7 : 0x11111111 */
       1,  /* U+13C8 - U+13CF : 0x11111111 */
       1,  /* U+13D0 - U+13D7 : 0x11111111 */
       1,  /* U+13D8 - U+13DF : 0x11111111 */
@@ -730,64 +730,64 @@ static PRUint8 gBidiCatIdx2[544] = {
       1,  /* U+1640 - U+1647 : 0x11111111 */
       1,  /* U+1648 - U+164F : 0x11111111 */
       1,  /* U+1650 - U+1657 : 0x11111111 */
       1,  /* U+1658 - U+165F : 0x11111111 */
       1,  /* U+1660 - U+1667 : 0x11111111 */
       1,  /* U+1668 - U+166F : 0x11111111 */
       1,  /* U+1670 - U+1677 : 0x11111111 */
       1,  /* U+1678 - U+167F : 0x11111111 */
-     94,  /* U+1680 - U+1687 : 0x1111111E */
+     95,  /* U+1680 - U+1687 : 0x1111111E */
       1,  /* U+1688 - U+168F : 0x11111111 */
       1,  /* U+1690 - U+1697 : 0x11111111 */
-     95,  /* U+1698 - U+169F : 0x11199111 */
+     96,  /* U+1698 - U+169F : 0x11199111 */
       1,  /* U+16A0 - U+16A7 : 0x11111111 */
       1,  /* U+16A8 - U+16AF : 0x11111111 */
       1,  /* U+16B0 - U+16B7 : 0x11111111 */
       1,  /* U+16B8 - U+16BF : 0x11111111 */
       1,  /* U+16C0 - U+16C7 : 0x11111111 */
       1,  /* U+16C8 - U+16CF : 0x11111111 */
       1,  /* U+16D0 - U+16D7 : 0x11111111 */
       1,  /* U+16D8 - U+16DF : 0x11111111 */
       1,  /* U+16E0 - U+16E7 : 0x11111111 */
       1,  /* U+16E8 - U+16EF : 0x11111111 */
       1,  /* U+16F0 - U+16F7 : 0x11111111 */
       1,  /* U+16F8 - U+16FF : 0x11111111 */
       1,  /* U+1700 - U+1707 : 0x11111111 */
       1,  /* U+1708 - U+170F : 0x11111111 */
-     96,  /* U+1710 - U+1717 : 0x111AAA11 */
+     97,  /* U+1710 - U+1717 : 0x111AAA11 */
       1,  /* U+1718 - U+171F : 0x11111111 */
       1,  /* U+1720 - U+1727 : 0x11111111 */
       1,  /* U+1728 - U+172F : 0x11111111 */
-     96,  /* U+1730 - U+1737 : 0x111AAA11 */
+     97,  /* U+1730 - U+1737 : 0x111AAA11 */
       1,  /* U+1738 - U+173F : 0x11111111 */
       1,  /* U+1740 - U+1747 : 0x11111111 */
       1,  /* U+1748 - U+174F : 0x11111111 */
-     63,  /* U+1750 - U+1757 : 0x1111AA11 */
+     62,  /* U+1750 - U+1757 : 0x1111AA11 */
       1,  /* U+1758 - U+175F : 0x11111111 */
       1,  /* U+1760 - U+1767 : 0x11111111 */
       1,  /* U+1768 - U+176F : 0x11111111 */
-     63,  /* U+1770 - U+1777 : 0x1111AA11 */
+     62,  /* 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 */
-     85,  /* U+17B0 - U+17B7 : 0xA1111111 */
-     88,  /* U+17B8 - U+17BF : 0x11AAAAAA */
-     73,  /* U+17C0 - U+17C7 : 0x1A111111 */
-     60,  /* U+17C8 - U+17CF : 0xAAAAAAA1 */
-     97,  /* U+17D0 - U+17D7 : 0x1111AAAA */
-     98,  /* U+17D8 - U+17DF : 0x11A17111 */
+     84,  /* U+17B0 - U+17B7 : 0xA1111111 */
+     87,  /* U+17B8 - U+17BF : 0x11AAAAAA */
+     72,  /* U+17C0 - U+17C7 : 0x1A111111 */
+     59,  /* U+17C8 - U+17CF : 0xAAAAAAA1 */
+     98,  /* U+17D0 - U+17D7 : 0x1111AAAA */
+     99,  /* U+17D8 - U+17DF : 0x11A17111 */
       1,  /* U+17E0 - U+17E7 : 0x11111111 */
       1,  /* U+17E8 - U+17EF : 0x11111111 */
       9,  /* U+17F0 - U+17F7 : 0x99999999 */
-     99,  /* U+17F8 - U+17FF : 0x11111199 */
+     94,  /* U+17F8 - U+17FF : 0x11111199 */
       9,  /* U+1800 - U+1807 : 0x99999999 */
     100,  /* U+1808 - U+180F : 0x1EAAA999 */
       1,  /* U+1810 - U+1817 : 0x11111111 */
       1,  /* U+1818 - U+181F : 0x11111111 */
       1,  /* U+1820 - U+1827 : 0x11111111 */
       1,  /* U+1828 - U+182F : 0x11111111 */
       1,  /* U+1830 - U+1837 : 0x11111111 */
       1,  /* U+1838 - U+183F : 0x11111111 */
@@ -799,35 +799,35 @@ static PRUint8 gBidiCatIdx2[544] = {
       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 */
-     64,  /* U+18A8 - U+18AF : 0x111111A1 */
+     63,  /* 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 */
       1,  /* U+18F0 - U+18F7 : 0x11111111 */
       1,  /* U+18F8 - U+18FF : 0x11111111 */
       1,  /* U+1900 - U+1907 : 0x11111111 */
       1,  /* U+1908 - U+190F : 0x11111111 */
       1,  /* U+1910 - U+1917 : 0x11111111 */
       1,  /* U+1918 - U+191F : 0x11111111 */
     101,  /* U+1920 - U+1927 : 0xA1111AAA */
-     97,  /* U+1928 - U+192F : 0x1111AAAA */
-     74,  /* U+1930 - U+1937 : 0x11111A11 */
-     72,  /* U+1938 - U+193F : 0x1111AAA1 */
+     98,  /* U+1928 - U+192F : 0x1111AAAA */
+     73,  /* U+1930 - U+1937 : 0x11111A11 */
+     71,  /* U+1938 - U+193F : 0x1111AAA1 */
     102,  /* U+1940 - U+1947 : 0x11991119 */
       1,  /* U+1948 - U+194F : 0x11111111 */
       1,  /* U+1950 - U+1957 : 0x11111111 */
       1,  /* U+1958 - U+195F : 0x11111111 */
       1,  /* U+1960 - U+1967 : 0x11111111 */
       1,  /* U+1968 - U+196F : 0x11111111 */
       1,  /* U+1970 - U+1977 : 0x11111111 */
       1,  /* U+1978 - U+197F : 0x11111111 */
@@ -837,24 +837,28 @@ static PRUint8 gBidiCatIdx2[544] = {
       1,  /* U+1998 - U+199F : 0x11111111 */
       1,  /* U+19A0 - U+19A7 : 0x11111111 */
       1,  /* U+19A8 - U+19AF : 0x11111111 */
       1,  /* U+19B0 - U+19B7 : 0x11111111 */
       1,  /* U+19B8 - U+19BF : 0x11111111 */
       1,  /* U+19C0 - U+19C7 : 0x11111111 */
       1,  /* U+19C8 - U+19CF : 0x11111111 */
       1,  /* U+19D0 - U+19D7 : 0x11111111 */
-      1,  /* U+19D8 - U+19DF : 0x11111111 */
+    103,  /* U+19D8 - U+19DF : 0x99111111 */
       9,  /* U+19E0 - U+19E7 : 0x99999999 */
       9,  /* U+19E8 - U+19EF : 0x99999999 */
       9,  /* U+19F0 - U+19F7 : 0x99999999 */
       9,  /* U+19F8 - U+19FF : 0x99999999 */
+      1,  /* U+1A00 - U+1A07 : 0x11111111 */
+      1,  /* U+1A08 - U+1A0F : 0x11111111 */
+     84,  /* U+1A10 - U+1A17 : 0xA1111111 */
+     74,  /* U+1A18 - U+1A1F : 0x1111111A */
 };
 
-static PRUint8 gBidiCatIdx3[480] = {
+static PRUint8 gBidiCatIdx3[540] = {
       1,  /* U+1D00 - U+1D07 : 0x11111111 */
       1,  /* U+1D08 - U+1D0F : 0x11111111 */
       1,  /* U+1D10 - U+1D17 : 0x11111111 */
       1,  /* U+1D18 - U+1D1F : 0x11111111 */
       1,  /* U+1D20 - U+1D27 : 0x11111111 */
       1,  /* U+1D28 - U+1D2F : 0x11111111 */
       1,  /* U+1D30 - U+1D37 : 0x11111111 */
       1,  /* U+1D38 - U+1D3F : 0x11111111 */
@@ -869,17 +873,17 @@ static PRUint8 gBidiCatIdx3[480] = {
       1,  /* U+1D80 - U+1D87 : 0x11111111 */
       1,  /* U+1D88 - U+1D8F : 0x11111111 */
       1,  /* U+1D90 - U+1D97 : 0x11111111 */
       1,  /* U+1D98 - U+1D9F : 0x11111111 */
       1,  /* U+1DA0 - U+1DA7 : 0x11111111 */
       1,  /* U+1DA8 - U+1DAF : 0x11111111 */
       1,  /* U+1DB0 - U+1DB7 : 0x11111111 */
       1,  /* U+1DB8 - U+1DBF : 0x11111111 */
-      1,  /* U+1DC0 - U+1DC7 : 0x11111111 */
+     98,  /* U+1DC0 - U+1DC7 : 0x1111AAAA */
       1,  /* U+1DC8 - U+1DCF : 0x11111111 */
       1,  /* U+1DD0 - U+1DD7 : 0x11111111 */
       1,  /* U+1DD8 - U+1DDF : 0x11111111 */
       1,  /* U+1DE0 - U+1DE7 : 0x11111111 */
       1,  /* U+1DE8 - U+1DEF : 0x11111111 */
       1,  /* U+1DF0 - U+1DF7 : 0x11111111 */
       1,  /* U+1DF8 - U+1DFF : 0x11111111 */
       1,  /* U+1E00 - U+1E07 : 0x11111111 */
@@ -932,67 +936,67 @@ static PRUint8 gBidiCatIdx3[480] = {
       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 */
-    103,  /* U+1FB8 - U+1FBF : 0x91911111 */
-     99,  /* U+1FC0 - U+1FC7 : 0x11111199 */
+    104,  /* U+1FB8 - U+1FBF : 0x91911111 */
+     94,  /* 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 */
-    104,  /* U+1FF8 - U+1FFF : 0x19911111 */
+    105,  /* U+1FF8 - U+1FFF : 0x19911111 */
      14,  /* U+2000 - U+2007 : 0xEEEEEEEE */
-    105,  /* U+2008 - U+200F : 0x21BBBEEE */
+    106,  /* U+2008 - U+200F : 0x21BBBEEE */
       9,  /* U+2010 - U+2017 : 0x99999999 */
       9,  /* U+2018 - U+201F : 0x99999999 */
       9,  /* U+2020 - U+2027 : 0x99999999 */
-    106,  /* U+2028 - U+202F : 0xEFFFFFCE */
-    107,  /* U+2030 - U+2037 : 0x99977777 */
+    107,  /* U+2028 - U+202F : 0x8FFFFFCE */
+    108,  /* U+2030 - U+2037 : 0x99977777 */
       9,  /* U+2038 - U+203F : 0x99999999 */
-    108,  /* U+2040 - U+2047 : 0x99989999 */
+    109,  /* U+2040 - U+2047 : 0x99989999 */
       9,  /* U+2048 - U+204F : 0x99999999 */
-    109,  /* U+2050 - U+2057 : 0x91199999 */
-    110,  /* U+2058 - U+205F : 0xE1111111 */
+      9,  /* U+2050 - U+2057 : 0x99999999 */
+    110,  /* U+2058 - U+205F : 0xE9999999 */
     111,  /* U+2060 - U+2067 : 0x1111BBBB */
     112,  /* U+2068 - U+206F : 0xBBBBBB11 */
     113,  /* U+2070 - U+2077 : 0x55551115 */
-    114,  /* U+2078 - U+207F : 0x19997755 */
+    114,  /* U+2078 - U+207F : 0x19996655 */
       5,  /* U+2080 - U+2087 : 0x55555555 */
-    114,  /* U+2088 - U+208F : 0x19997755 */
+    114,  /* 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 */
-    115,  /* U+20B0 - U+20B7 : 0x11111177 */
+    115,  /* U+20B0 - U+20B7 : 0x11777777 */
       1,  /* U+20B8 - U+20BF : 0x11111111 */
       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 */
-    116,  /* U+20E8 - U+20EF : 0x11111AAA */
+     98,  /* U+20E8 - U+20EF : 0x1111AAAA */
       1,  /* U+20F0 - U+20F7 : 0x11111111 */
       1,  /* U+20F8 - U+20FF : 0x11111111 */
-    117,  /* U+2100 - U+2107 : 0x19999199 */
-     99,  /* U+2108 - U+210F : 0x11111199 */
-    118,  /* U+2110 - U+2117 : 0x99191111 */
-    119,  /* U+2118 - U+211F : 0x99111119 */
-    120,  /* U+2120 - U+2127 : 0x91919999 */
-    121,  /* U+2128 - U+212F : 0x17111191 */
-     40,  /* U+2130 - U+2137 : 0x11111911 */
-    122,  /* U+2138 - U+213F : 0x11119911 */
-    123,  /* U+2140 - U+2147 : 0x11199999 */
-    122,  /* U+2148 - U+214F : 0x11119911 */
+    116,  /* U+2100 - U+2107 : 0x19999199 */
+     94,  /* U+2108 - U+210F : 0x11111199 */
+    117,  /* U+2110 - U+2117 : 0x99191111 */
+    118,  /* U+2118 - U+211F : 0x99111119 */
+    119,  /* U+2120 - U+2127 : 0x91919999 */
+    120,  /* U+2128 - U+212F : 0x17111191 */
+     39,  /* U+2130 - U+2137 : 0x11111911 */
+    121,  /* U+2138 - U+213F : 0x11119911 */
+    122,  /* U+2140 - U+2147 : 0x11199999 */
+    123,  /* U+2148 - U+214F : 0x11199911 */
      22,  /* U+2150 - U+2157 : 0x99999111 */
       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 */
       1,  /* U+2188 - U+218F : 0x11111111 */
@@ -1007,17 +1011,17 @@ static PRUint8 gBidiCatIdx3[480] = {
       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 */
-    124,  /* U+2210 - U+2217 : 0x99997799 */
+    124,  /* 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 */
@@ -1063,42 +1067,42 @@ static PRUint8 gBidiCatIdx3[480] = {
     126,  /* 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 */
-     21,  /* U+23D0 - U+23D7 : 0x11111119 */
-      1,  /* U+23D8 - U+23DF : 0x11111111 */
+      9,  /* U+23D0 - U+23D7 : 0x99999999 */
+    127,  /* U+23D8 - U+23DF : 0x11119999 */
       1,  /* U+23E0 - U+23E7 : 0x11111111 */
       1,  /* U+23E8 - U+23EF : 0x11111111 */
       1,  /* U+23F0 - U+23F7 : 0x11111111 */
       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 */
-    127,  /* U+2420 - U+2427 : 0x19999999 */
+    128,  /* 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 */
-    128,  /* U+2448 - U+244F : 0x11111999 */
+    129,  /* 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 */
-    129,  /* U+2498 - U+249F : 0x11115555 */
+    130,  /* 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 */
@@ -1136,75 +1140,75 @@ static PRUint8 gBidiCatIdx3[480] = {
       9,  /* U+25D8 - U+25DF : 0x99999999 */
       9,  /* U+25E0 - U+25E7 : 0x99999999 */
       9,  /* U+25E8 - U+25EF : 0x99999999 */
       9,  /* U+25F0 - U+25F7 : 0x99999999 */
       9,  /* U+25F8 - U+25FF : 0x99999999 */
       9,  /* U+2600 - U+2607 : 0x99999999 */
       9,  /* U+2608 - U+260F : 0x99999999 */
       9,  /* U+2610 - U+2617 : 0x99999999 */
-    130,  /* U+2618 - U+261F : 0x99999991 */
+      9,  /* U+2618 - U+261F : 0x99999999 */
       9,  /* U+2620 - U+2627 : 0x99999999 */
       9,  /* U+2628 - U+262F : 0x99999999 */
       9,  /* U+2630 - U+2637 : 0x99999999 */
       9,  /* U+2638 - U+263F : 0x99999999 */
       9,  /* U+2640 - U+2647 : 0x99999999 */
       9,  /* U+2648 - U+264F : 0x99999999 */
       9,  /* U+2650 - U+2657 : 0x99999999 */
       9,  /* U+2658 - U+265F : 0x99999999 */
       9,  /* U+2660 - U+2667 : 0x99999999 */
       9,  /* U+2668 - U+266F : 0x99999999 */
       9,  /* U+2670 - U+2677 : 0x99999999 */
-    125,  /* U+2678 - U+267F : 0x11999999 */
+      9,  /* U+2678 - U+267F : 0x99999999 */
       9,  /* U+2680 - U+2687 : 0x99999999 */
       9,  /* U+2688 - U+268F : 0x99999999 */
-     99,  /* U+2690 - U+2697 : 0x11111199 */
-      1,  /* U+2698 - U+269F : 0x11111111 */
-     99,  /* U+26A0 - U+26A7 : 0x11111199 */
-      1,  /* U+26A8 - U+26AF : 0x11111111 */
-      1,  /* U+26B0 - U+26B7 : 0x11111111 */
+      9,  /* U+2690 - U+2697 : 0x99999999 */
+    122,  /* U+2698 - U+269F : 0x11199999 */
+      9,  /* U+26A0 - U+26A7 : 0x99999999 */
+    131,  /* U+26A8 - U+26AF : 0x99919999 */
+     94,  /* U+26B0 - U+26B7 : 0x11111199 */
       1,  /* U+26B8 - U+26BF : 0x11111111 */
       1,  /* U+26C0 - U+26C7 : 0x11111111 */
       1,  /* U+26C8 - U+26CF : 0x11111111 */
       1,  /* U+26D0 - U+26D7 : 0x11111111 */
       1,  /* U+26D8 - U+26DF : 0x11111111 */
       1,  /* U+26E0 - U+26E7 : 0x11111111 */
       1,  /* U+26E8 - U+26EF : 0x11111111 */
       1,  /* U+26F0 - U+26F7 : 0x11111111 */
       1,  /* U+26F8 - U+26FF : 0x11111111 */
-    131,  /* U+2700 - U+2707 : 0x99199991 */
-    132,  /* U+2708 - U+270F : 0x99991199 */
+    132,  /* U+2700 - U+2707 : 0x99199991 */
+    133,  /* U+2708 - U+270F : 0x99991199 */
       9,  /* U+2710 - U+2717 : 0x99999999 */
       9,  /* U+2718 - U+271F : 0x99999999 */
       9,  /* U+2720 - U+2727 : 0x99999999 */
-    130,  /* U+2728 - U+272F : 0x99999991 */
+    134,  /* U+2728 - U+272F : 0x99999991 */
       9,  /* U+2730 - U+2737 : 0x99999999 */
       9,  /* U+2738 - U+273F : 0x99999999 */
       9,  /* U+2740 - U+2747 : 0x99999999 */
-    120,  /* U+2748 - U+274F : 0x91919999 */
-    133,  /* U+2750 - U+2757 : 0x19111999 */
-    127,  /* U+2758 - U+275F : 0x19999999 */
-    130,  /* U+2760 - U+2767 : 0x99999991 */
+    119,  /* U+2748 - U+274F : 0x91919999 */
+    135,  /* U+2750 - U+2757 : 0x19111999 */
+    128,  /* U+2758 - U+275F : 0x19999999 */
+    134,  /* U+2760 - U+2767 : 0x99999991 */
       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 */
-    123,  /* U+2790 - U+2797 : 0x11199999 */
+    122,  /* U+2790 - U+2797 : 0x11199999 */
       9,  /* U+2798 - U+279F : 0x99999999 */
       9,  /* U+27A0 - U+27A7 : 0x99999999 */
       9,  /* U+27A8 - U+27AF : 0x99999999 */
-    130,  /* U+27B0 - U+27B7 : 0x99999991 */
-    127,  /* U+27B8 - U+27BF : 0x19999999 */
-      1,  /* U+27C0 - U+27C7 : 0x11111111 */
+    134,  /* U+27B0 - U+27B7 : 0x99999991 */
+    128,  /* U+27B8 - U+27BF : 0x19999999 */
+    128,  /* U+27C0 - U+27C7 : 0x19999999 */
       1,  /* U+27C8 - U+27CF : 0x11111111 */
       9,  /* U+27D0 - U+27D7 : 0x99999999 */
       9,  /* U+27D8 - U+27DF : 0x99999999 */
       9,  /* U+27E0 - U+27E7 : 0x99999999 */
-    134,  /* U+27E8 - U+27EF : 0x11119999 */
+    127,  /* U+27E8 - U+27EF : 0x11119999 */
       9,  /* U+27F0 - U+27F7 : 0x99999999 */
       9,  /* U+27F8 - U+27FF : 0x99999999 */
       1,  /* U+2800 - U+2807 : 0x11111111 */
       1,  /* U+2808 - U+280F : 0x11111111 */
       1,  /* U+2810 - U+2817 : 0x11111111 */
       1,  /* U+2818 - U+281F : 0x11111111 */
       1,  /* U+2820 - U+2827 : 0x11111111 */
       1,  /* U+2828 - U+282F : 0x11111111 */
@@ -1294,18 +1298,18 @@ static PRUint8 gBidiCatIdx3[480] = {
       9,  /* U+2AC8 - U+2ACF : 0x99999999 */
       9,  /* U+2AD0 - U+2AD7 : 0x99999999 */
       9,  /* U+2AD8 - U+2ADF : 0x99999999 */
       9,  /* U+2AE0 - U+2AE7 : 0x99999999 */
       9,  /* U+2AE8 - U+2AEF : 0x99999999 */
       9,  /* U+2AF0 - U+2AF7 : 0x99999999 */
       9,  /* U+2AF8 - U+2AFF : 0x99999999 */
       9,  /* U+2B00 - U+2B07 : 0x99999999 */
-    125,  /* U+2B08 - U+2B0F : 0x11999999 */
-      1,  /* U+2B10 - U+2B17 : 0x11111111 */
+      9,  /* U+2B08 - U+2B0F : 0x99999999 */
+    127,  /* U+2B10 - U+2B17 : 0x11119999 */
       1,  /* U+2B18 - U+2B1F : 0x11111111 */
       1,  /* U+2B20 - U+2B27 : 0x11111111 */
       1,  /* U+2B28 - U+2B2F : 0x11111111 */
       1,  /* U+2B30 - U+2B37 : 0x11111111 */
       1,  /* U+2B38 - U+2B3F : 0x11111111 */
       1,  /* U+2B40 - U+2B47 : 0x11111111 */
       1,  /* U+2B48 - U+2B4F : 0x11111111 */
       1,  /* U+2B50 - U+2B57 : 0x11111111 */
@@ -1325,34 +1329,110 @@ static PRUint8 gBidiCatIdx3[480] = {
       1,  /* U+2BC0 - U+2BC7 : 0x11111111 */
       1,  /* U+2BC8 - U+2BCF : 0x11111111 */
       1,  /* U+2BD0 - U+2BD7 : 0x11111111 */
       1,  /* U+2BD8 - U+2BDF : 0x11111111 */
       1,  /* U+2BE0 - U+2BE7 : 0x11111111 */
       1,  /* U+2BE8 - U+2BEF : 0x11111111 */
       1,  /* U+2BF0 - U+2BF7 : 0x11111111 */
       1,  /* U+2BF8 - U+2BFF : 0x11111111 */
+      1,  /* U+2C00 - U+2C07 : 0x11111111 */
+      1,  /* U+2C08 - U+2C0F : 0x11111111 */
+      1,  /* U+2C10 - U+2C17 : 0x11111111 */
+      1,  /* U+2C18 - U+2C1F : 0x11111111 */
+      1,  /* U+2C20 - U+2C27 : 0x11111111 */
+      1,  /* U+2C28 - U+2C2F : 0x11111111 */
+      1,  /* U+2C30 - U+2C37 : 0x11111111 */
+      1,  /* U+2C38 - U+2C3F : 0x11111111 */
+      1,  /* U+2C40 - U+2C47 : 0x11111111 */
+      1,  /* U+2C48 - U+2C4F : 0x11111111 */
+      1,  /* U+2C50 - U+2C57 : 0x11111111 */
+      1,  /* U+2C58 - U+2C5F : 0x11111111 */
+      1,  /* U+2C60 - U+2C67 : 0x11111111 */
+      1,  /* U+2C68 - U+2C6F : 0x11111111 */
+      1,  /* U+2C70 - U+2C77 : 0x11111111 */
+      1,  /* U+2C78 - U+2C7F : 0x11111111 */
+      1,  /* U+2C80 - U+2C87 : 0x11111111 */
+      1,  /* U+2C88 - U+2C8F : 0x11111111 */
+      1,  /* U+2C90 - U+2C97 : 0x11111111 */
+      1,  /* U+2C98 - U+2C9F : 0x11111111 */
+      1,  /* U+2CA0 - U+2CA7 : 0x11111111 */
+      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 */
+    129,  /* U+2CE8 - U+2CEF : 0x11111999 */
+      1,  /* U+2CF0 - U+2CF7 : 0x11111111 */
+    134,  /* 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 */
+      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 */
+      1,  /* U+2DC0 - U+2DC7 : 0x11111111 */
+      1,  /* U+2DC8 - U+2DCF : 0x11111111 */
+      1,  /* U+2DD0 - U+2DD7 : 0x11111111 */
+      1,  /* U+2DD8 - U+2DDF : 0x11111111 */
 };
 
-static PRUint8 gBidiCatIdx4[176] = {
+static PRUint8 gBidiCatIdx4[192] = {
+      9,  /* U+2E00 - U+2E07 : 0x99999999 */
+      9,  /* U+2E08 - U+2E0F : 0x99999999 */
+      9,  /* U+2E10 - U+2E17 : 0x99999999 */
+     34,  /* U+2E18 - U+2E1F : 0x11991111 */
+      1,  /* U+2E20 - U+2E27 : 0x11111111 */
+      1,  /* U+2E28 - U+2E2F : 0x11111111 */
+      1,  /* U+2E30 - U+2E37 : 0x11111111 */
+      1,  /* U+2E38 - U+2E3F : 0x11111111 */
+      1,  /* U+2E40 - U+2E47 : 0x11111111 */
+      1,  /* U+2E48 - U+2E4F : 0x11111111 */
+      1,  /* U+2E50 - U+2E57 : 0x11111111 */
+      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 */
-    135,  /* U+2E98 - U+2E9F : 0x99999199 */
+    136,  /* 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 */
-    134,  /* U+2EF0 - U+2EF7 : 0x11119999 */
+    127,  /* 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 */
@@ -1375,49 +1455,49 @@ static PRUint8 gBidiCatIdx4[176] = {
       9,  /* U+2FB8 - U+2FBF : 0x99999999 */
       9,  /* U+2FC0 - U+2FC7 : 0x99999999 */
       9,  /* U+2FC8 - U+2FCF : 0x99999999 */
     125,  /* 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 */
-    134,  /* U+2FF8 - U+2FFF : 0x11119999 */
-    136,  /* U+3000 - U+3007 : 0x1119999E */
+    127,  /* U+2FF8 - U+2FFF : 0x11119999 */
+    137,  /* 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 */
-    137,  /* U+3028 - U+302F : 0xAAAAAA11 */
-    119,  /* U+3030 - U+3037 : 0x99111119 */
+    138,  /* U+3028 - U+302F : 0xAAAAAA11 */
+    118,  /* 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 */
-    138,  /* U+3098 - U+309F : 0x11199AA1 */
+    139,  /* 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 */
-    139,  /* U+30F8 - U+30FF : 0x11119111 */
+    140,  /* 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 */
@@ -1432,50 +1512,50 @@ static PRUint8 gBidiCatIdx4[176] = {
       1,  /* U+3180 - U+3187 : 0x11111111 */
       1,  /* U+3188 - U+318F : 0x11111111 */
       1,  /* U+3190 - U+3197 : 0x11111111 */
       1,  /* U+3198 - U+319F : 0x11111111 */
       1,  /* U+31A0 - U+31A7 : 0x11111111 */
       1,  /* U+31A8 - U+31AF : 0x11111111 */
       1,  /* U+31B0 - U+31B7 : 0x11111111 */
       1,  /* U+31B8 - U+31BF : 0x11111111 */
-      1,  /* U+31C0 - U+31C7 : 0x11111111 */
-      1,  /* U+31C8 - U+31CF : 0x11111111 */
+      9,  /* U+31C0 - U+31C7 : 0x99999999 */
+      9,  /* U+31C8 - U+31CF : 0x99999999 */
       1,  /* U+31D0 - U+31D7 : 0x11111111 */
       1,  /* U+31D8 - U+31DF : 0x11111111 */
       1,  /* U+31E0 - U+31E7 : 0x11111111 */
       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 */
-    104,  /* U+3218 - U+321F : 0x19911111 */
+    105,  /* 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 */
-     35,  /* U+3278 - U+327F : 0x11991111 */
+    141,  /* 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 */
-    130,  /* U+32B0 - U+32B7 : 0x99999991 */
+    134,  /* U+32B0 - U+32B7 : 0x99999991 */
       9,  /* U+32B8 - U+32BF : 0x99999999 */
       1,  /* U+32C0 - U+32C7 : 0x11111111 */
-    140,  /* U+32C8 - U+32CF : 0x99991111 */
+    142,  /* 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 */
@@ -1487,29 +1567,29 @@ static PRUint8 gBidiCatIdx4[176] = {
       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 */
-    128,  /* U+3378 - U+337F : 0x11111999 */
+    129,  /* 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 */
       1,  /* U+33C0 - U+33C7 : 0x11111111 */
       1,  /* U+33C8 - U+33CF : 0x11111111 */
       1,  /* U+33D0 - U+33D7 : 0x11111111 */
-    141,  /* U+33D8 - U+33DF : 0x99111111 */
+    103,  /* U+33D8 - U+33DF : 0x99111111 */
       1,  /* U+33E0 - U+33E7 : 0x11111111 */
       1,  /* U+33E8 - U+33EF : 0x11111111 */
       1,  /* U+33F0 - U+33F7 : 0x11111111 */
      29,  /* U+33F8 - U+33FF : 0x91111111 */
 };
 
 static PRUint8 gBidiCatIdx5[8] = {
       9,  /* U+4DC0 - U+4DC7 : 0x99999999 */
@@ -1670,27 +1750,68 @@ static PRUint8 gBidiCatIdx6[160] = {
       1,  /* U+A480 - U+A487 : 0x11111111 */
       1,  /* U+A488 - U+A48F : 0x11111111 */
       9,  /* U+A490 - U+A497 : 0x99999999 */
       9,  /* U+A498 - U+A49F : 0x99999999 */
       9,  /* U+A4A0 - U+A4A7 : 0x99999999 */
       9,  /* U+A4A8 - U+A4AF : 0x99999999 */
       9,  /* U+A4B0 - U+A4B7 : 0x99999999 */
       9,  /* U+A4B8 - U+A4BF : 0x99999999 */
-    127,  /* U+A4C0 - U+A4C7 : 0x19999999 */
+    128,  /* U+A4C0 - U+A4C7 : 0x19999999 */
       1,  /* U+A4C8 - U+A4CF : 0x11111111 */
       1,  /* U+A4D0 - U+A4D7 : 0x11111111 */
       1,  /* U+A4D8 - U+A4DF : 0x11111111 */
       1,  /* U+A4E0 - U+A4E7 : 0x11111111 */
       1,  /* U+A4E8 - U+A4EF : 0x11111111 */
       1,  /* U+A4F0 - U+A4F7 : 0x11111111 */
       1,  /* U+A4F8 - U+A4FF : 0x11111111 */
 };
 
-static PRUint8 gBidiCatIdx7[264] = {
+static PRUint8 gBidiCatIdx7[38] = {
+      9,  /* U+A700 - U+A707 : 0x99999999 */
+      9,  /* U+A708 - U+A70F : 0x99999999 */
+    128,  /* U+A710 - U+A717 : 0x19999999 */
+      1,  /* U+A718 - U+A71F : 0x11111111 */
+      1,  /* U+A720 - U+A727 : 0x11111111 */
+      1,  /* U+A728 - U+A72F : 0x11111111 */
+      1,  /* U+A730 - U+A737 : 0x11111111 */
+      1,  /* U+A738 - U+A73F : 0x11111111 */
+      1,  /* U+A740 - U+A747 : 0x11111111 */
+      1,  /* U+A748 - U+A74F : 0x11111111 */
+      1,  /* U+A750 - U+A757 : 0x11111111 */
+      1,  /* U+A758 - U+A75F : 0x11111111 */
+      1,  /* U+A760 - U+A767 : 0x11111111 */
+      1,  /* U+A768 - U+A76F : 0x11111111 */
+      1,  /* U+A770 - U+A777 : 0x11111111 */
+      1,  /* U+A778 - U+A77F : 0x11111111 */
+      1,  /* U+A780 - U+A787 : 0x11111111 */
+      1,  /* U+A788 - U+A78F : 0x11111111 */
+      1,  /* U+A790 - U+A797 : 0x11111111 */
+      1,  /* U+A798 - U+A79F : 0x11111111 */
+      1,  /* U+A7A0 - U+A7A7 : 0x11111111 */
+      1,  /* U+A7A8 - U+A7AF : 0x11111111 */
+      1,  /* U+A7B0 - U+A7B7 : 0x11111111 */
+      1,  /* U+A7B8 - U+A7BF : 0x11111111 */
+      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 */
+    143,  /* U+A800 - U+A807 : 0x1A111A11 */
+    144,  /* U+A808 - U+A80F : 0x1111A111 */
+      1,  /* U+A810 - U+A817 : 0x11111111 */
+      1,  /* U+A818 - U+A81F : 0x11111111 */
+     79,  /* U+A820 - U+A827 : 0x1AA11111 */
+    127,  /* U+A828 - U+A82F : 0x11119999 */
+};
+
+static PRUint8 gBidiCatIdx8[274] = {
       1,  /* U+F900 - U+F907 : 0x11111111 */
       1,  /* U+F908 - U+F90F : 0x11111111 */
       1,  /* U+F910 - U+F917 : 0x11111111 */
       1,  /* U+F918 - U+F91F : 0x11111111 */
       1,  /* U+F920 - U+F927 : 0x11111111 */
       1,  /* U+F928 - U+F92F : 0x11111111 */
       1,  /* U+F930 - U+F937 : 0x11111111 */
       1,  /* U+F938 - U+F93F : 0x11111111 */
@@ -1748,19 +1869,19 @@ static PRUint8 gBidiCatIdx7[264] = {
       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 */
-    142,  /* U+FB18 - U+FB1F : 0x2A211111 */
+    145,  /* U+FB18 - U+FB1F : 0x2A211111 */
       2,  /* U+FB20 - U+FB27 : 0x22222222 */
-    143,  /* U+FB28 - U+FB2F : 0x22222272 */
+    146,  /* 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 */
@@ -1816,17 +1937,17 @@ static PRUint8 gBidiCatIdx7[264] = {
       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 */
-    144,  /* U+FD38 - U+FD3F : 0x99333333 */
+    147,  /* 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 */
@@ -1840,31 +1961,31 @@ static PRUint8 gBidiCatIdx7[264] = {
       3,  /* U+FDB8 - U+FDBF : 0x33333333 */
       3,  /* U+FDC0 - U+FDC7 : 0x33333333 */
       3,  /* U+FDC8 - U+FDCF : 0x33333333 */
       1,  /* U+FDD0 - U+FDD7 : 0x11111111 */
       1,  /* U+FDD8 - U+FDDF : 0x11111111 */
       1,  /* U+FDE0 - U+FDE7 : 0x11111111 */
       1,  /* U+FDE8 - U+FDEF : 0x11111111 */
       3,  /* U+FDF0 - U+FDF7 : 0x33333333 */
-    145,  /* U+FDF8 - U+FDFF : 0x33933333 */
+    148,  /* U+FDF8 - U+FDFF : 0x33933333 */
      10,  /* U+FE00 - U+FE07 : 0xAAAAAAAA */
      10,  /* U+FE08 - U+FE0F : 0xAAAAAAAA */
-      1,  /* U+FE10 - U+FE17 : 0x11111111 */
-      1,  /* U+FE18 - U+FE1F : 0x11111111 */
-     97,  /* U+FE20 - U+FE27 : 0x1111AAAA */
+      9,  /* U+FE10 - U+FE17 : 0x99999999 */
+     94,  /* U+FE18 - U+FE1F : 0x11111199 */
+     98,  /* U+FE20 - U+FE27 : 0x1111AAAA */
       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 */
-    146,  /* U+FE50 - U+FE57 : 0x99891898 */
-    147,  /* U+FE58 - U+FE5F : 0x79999999 */
-    148,  /* U+FE60 - U+FE67 : 0x19997799 */
-    149,  /* U+FE68 - U+FE6F : 0x11119779 */
+    149,  /* U+FE50 - U+FE57 : 0x99891898 */
+    150,  /* U+FE58 - U+FE5F : 0x79999999 */
+    151,  /* U+FE60 - U+FE67 : 0x19996699 */
+    152,  /* 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 */
@@ -1872,19 +1993,19 @@ static PRUint8 gBidiCatIdx7[264] = {
       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 */
-    150,  /* U+FF00 - U+FF07 : 0x99777991 */
-    151,  /* U+FF08 - U+FF0F : 0x68787999 */
+     54,  /* U+FEF8 - U+FEFF : 0xB3333333 */
+    153,  /* 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 */
@@ -1901,20 +2022,20 @@ static PRUint8 gBidiCatIdx7[264] = {
       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 */
-    152,  /* U+FFE0 - U+FFE7 : 0x17799977 */
-    127,  /* U+FFE8 - U+FFEF : 0x19999999 */
+    154,  /* U+FFE0 - U+FFE7 : 0x17799977 */
+    128,  /* U+FFE8 - U+FFEF : 0x19999999 */
       1,  /* U+FFF0 - U+FFF7 : 0x11111111 */
-    153,  /* U+FFF8 - U+FFFF : 0x11999991 */
+    155,  /* 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 */
@@ -1937,27 +2058,37 @@ static PRUint8 gBidiCatIdx7[264] = {
       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 */
-    154,  /* U+10100 - U+10107 : 0x11111191 */
+    156,  /* 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 */
+    129,  /* U+10188 - U+1018F : 0x11111999 */
 };
 
-static PRUint8 gBidiCatIdx8[64] = {
+static PRUint8 gBidiCatIdx9[64] = {
       1,  /* U+10300 - U+10307 : 0x11111111 */
       1,  /* U+10308 - U+1030F : 0x11111111 */
       1,  /* U+10310 - U+10317 : 0x11111111 */
       1,  /* U+10318 - U+1031F : 0x11111111 */
       1,  /* U+10320 - U+10327 : 0x11111111 */
       1,  /* U+10328 - U+1032F : 0x11111111 */
       1,  /* U+10330 - U+10337 : 0x11111111 */
       1,  /* U+10338 - U+1033F : 0x11111111 */
@@ -1974,17 +2105,17 @@ static PRUint8 gBidiCatIdx8[64] = {
       1,  /* U+10390 - U+10397 : 0x11111111 */
       1,  /* U+10398 - U+1039F : 0x11111111 */
       1,  /* U+103A0 - U+103A7 : 0x11111111 */
       1,  /* U+103A8 - U+103AF : 0x11111111 */
       1,  /* U+103B0 - U+103B7 : 0x11111111 */
       1,  /* U+103B8 - U+103BF : 0x11111111 */
       1,  /* U+103C0 - U+103C7 : 0x11111111 */
       1,  /* U+103C8 - U+103CF : 0x11111111 */
-      1,  /* U+103D0 - U+103D7 : 0x11111111 */
+    155,  /* U+103D0 - U+103D7 : 0x11999991 */
       1,  /* U+103D8 - U+103DF : 0x11111111 */
       1,  /* U+103E0 - U+103E7 : 0x11111111 */
       1,  /* U+103E8 - U+103EF : 0x11111111 */
       1,  /* U+103F0 - U+103F7 : 0x11111111 */
       1,  /* U+103F8 - U+103FF : 0x11111111 */
       1,  /* U+10400 - U+10407 : 0x11111111 */
       1,  /* U+10408 - U+1040F : 0x11111111 */
       1,  /* U+10410 - U+10417 : 0x11111111 */
@@ -2014,28 +2145,43 @@ static PRUint8 gBidiCatIdx8[64] = {
       1,  /* U+104D0 - U+104D7 : 0x11111111 */
       1,  /* U+104D8 - U+104DF : 0x11111111 */
       1,  /* U+104E0 - U+104E7 : 0x11111111 */
       1,  /* U+104E8 - U+104EF : 0x11111111 */
       1,  /* U+104F0 - U+104F7 : 0x11111111 */
       1,  /* U+104F8 - U+104FF : 0x11111111 */
 };
 
-static PRUint8 gBidiCatIdx9[8] = {
+static PRUint8 gBidiCatIdx10[8] = {
       2,  /* U+10800 - U+10807 : 0x22222222 */
       2,  /* U+10808 - U+1080F : 0x22222222 */
       2,  /* U+10810 - U+10817 : 0x22222222 */
       2,  /* U+10818 - U+1081F : 0x22222222 */
       2,  /* U+10820 - U+10827 : 0x22222222 */
       2,  /* U+10828 - U+1082F : 0x22222222 */
       2,  /* U+10830 - U+10837 : 0x22222222 */
       2,  /* U+10838 - U+1083F : 0x22222222 */
 };
 
-static PRUint8 gBidiCatIdx10[64] = {
+static PRUint8 gBidiCatIdx11[12] = {
+    157,  /* U+10A00 - U+10A07 : 0x2AA2AAA2 */
+    158,  /* 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 */
+    159,  /* 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 */
+};
+
+static PRUint8 gBidiCatIdx12[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 */
@@ -2070,50 +2216,79 @@ static PRUint8 gBidiCatIdx10[64] = {
       1,  /* U+1D120 - U+1D127 : 0x11111111 */
       1,  /* U+1D128 - U+1D12F : 0x11111111 */
       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 */
-     85,  /* U+1D160 - U+1D167 : 0xA1111111 */
-     39,  /* U+1D168 - U+1D16F : 0x111111AA */
-    155,  /* U+1D170 - U+1D177 : 0xBBBBB111 */
-    156,  /* U+1D178 - U+1D17F : 0xAAAAABBB */
-    157,  /* U+1D180 - U+1D187 : 0xAAA11AAA */
-     97,  /* U+1D188 - U+1D18F : 0x1111AAAA */
+     84,  /* U+1D160 - U+1D167 : 0xA1111111 */
+     38,  /* U+1D168 - U+1D16F : 0x111111AA */
+    160,  /* U+1D170 - U+1D177 : 0xBBBBB111 */
+    161,  /* U+1D178 - U+1D17F : 0xAAAAABBB */
+    162,  /* U+1D180 - U+1D187 : 0xAAA11AAA */
+     98,  /* U+1D188 - U+1D18F : 0x1111AAAA */
       1,  /* U+1D190 - U+1D197 : 0x11111111 */
       1,  /* U+1D198 - U+1D19F : 0x11111111 */
       1,  /* U+1D1A0 - U+1D1A7 : 0x11111111 */
-    158,  /* U+1D1A8 - U+1D1AF : 0x11AAAA11 */
+    163,  /* U+1D1A8 - U+1D1AF : 0x11AAAA11 */
       1,  /* U+1D1B0 - U+1D1B7 : 0x11111111 */
       1,  /* U+1D1B8 - U+1D1BF : 0x11111111 */
       1,  /* U+1D1C0 - U+1D1C7 : 0x11111111 */
       1,  /* U+1D1C8 - U+1D1CF : 0x11111111 */
       1,  /* U+1D1D0 - U+1D1D7 : 0x11111111 */
       1,  /* U+1D1D8 - U+1D1DF : 0x11111111 */
       1,  /* U+1D1E0 - U+1D1E7 : 0x11111111 */
       1,  /* U+1D1E8 - U+1D1EF : 0x11111111 */
       1,  /* U+1D1F0 - U+1D1F7 : 0x11111111 */
       1,  /* U+1D1F8 - U+1D1FF : 0x11111111 */
-};
-
-static PRUint8 gBidiCatIdx11[160] = {
+      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 */
+    164,  /* 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 */
+      1,  /* U+1D288 - U+1D28F : 0x11111111 */
+      1,  /* U+1D290 - U+1D297 : 0x11111111 */
+      1,  /* U+1D298 - U+1D29F : 0x11111111 */
+      1,  /* U+1D2A0 - U+1D2A7 : 0x11111111 */
+      1,  /* U+1D2A8 - U+1D2AF : 0x11111111 */
+      1,  /* U+1D2B0 - U+1D2B7 : 0x11111111 */
+      1,  /* U+1D2B8 - U+1D2BF : 0x11111111 */
+      1,  /* U+1D2C0 - U+1D2C7 : 0x11111111 */
+      1,  /* U+1D2C8 - U+1D2CF : 0x11111111 */
+      1,  /* U+1D2D0 - U+1D2D7 : 0x11111111 */
+      1,  /* U+1D2D8 - U+1D2DF : 0x11111111 */
+      1,  /* U+1D2E0 - U+1D2E7 : 0x11111111 */
+      1,  /* U+1D2E8 - U+1D2EF : 0x11111111 */
+      1,  /* U+1D2F0 - U+1D2F7 : 0x11111111 */
+      1,  /* U+1D2F8 - U+1D2FF : 0x11111111 */
       9,  /* U+1D300 - U+1D307 : 0x99999999 */
       9,  /* U+1D308 - U+1D30F : 0x99999999 */
       9,  /* U+1D310 - U+1D317 : 0x99999999 */
       9,  /* U+1D318 - U+1D31F : 0x99999999 */
       9,  /* U+1D320 - U+1D327 : 0x99999999 */
       9,  /* U+1D328 - U+1D32F : 0x99999999 */
       9,  /* U+1D330 - U+1D337 : 0x99999999 */
       9,  /* U+1D338 - U+1D33F : 0x99999999 */
       9,  /* U+1D340 - U+1D347 : 0x99999999 */
       9,  /* U+1D348 - U+1D34F : 0x99999999 */
-    127,  /* U+1D350 - U+1D357 : 0x19999999 */
+    128,  /* U+1D350 - U+1D357 : 0x19999999 */
       1,  /* U+1D358 - U+1D35F : 0x11111111 */
       1,  /* U+1D360 - U+1D367 : 0x11111111 */
       1,  /* U+1D368 - U+1D36F : 0x11111111 */
       1,  /* U+1D370 - U+1D377 : 0x11111111 */
       1,  /* U+1D378 - U+1D37F : 0x11111111 */
       1,  /* U+1D380 - U+1D387 : 0x11111111 */
       1,  /* U+1D388 - U+1D38F : 0x11111111 */
       1,  /* U+1D390 - U+1D397 : 0x11111111 */
@@ -2246,26 +2421,26 @@ static PRUint8 gBidiCatIdx11[160] = {
       1,  /* U+1D788 - U+1D78F : 0x11111111 */
       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 */
       1,  /* U+1D7C0 - U+1D7C7 : 0x11111111 */
-    159,  /* U+1D7C8 - U+1D7CF : 0x55111111 */
+    165,  /* 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 gBidiCatIdx12[68] = {
+static PRUint8 gBidiCatIdx13[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 */
@@ -2326,18 +2501,18 @@ static PRUint8 gBidiCatIdx12[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 gBidiCatIdx13[64] = {
-    160,  /* U+E0000 - U+E0007 : 0x111111B1 */
+static PRUint8 gBidiCatIdx14[64] = {
+    166,  /* 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 */
@@ -2393,17 +2568,17 @@ static PRUint8 gBidiCatIdx13[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[161] = {
+static PRUint32 gBidiCatPat[167] = {
     0x00000000,  /* 0 */
     0x11111111,  /* 1 */
     0x22222222,  /* 2 */
     0x33333333,  /* 3 */
     0x44444444,  /* 4 */
     0x55555555,  /* 5 */
     0x66666666,  /* 6 */
     0x77777777,  /* 7 */
@@ -2428,222 +2603,233 @@ static PRUint32 gBidiCatPat[161] = {
     0x99B99199,  /* 26 */
     0x99195577,  /* 27 */
     0x99999159,  /* 28 */
     0x91111111,  /* 29 */
     0x11111991,  /* 30 */
     0x99999911,  /* 31 */
     0x99911111,  /* 32 */
     0x91999999,  /* 33 */
-    0xAAA11111,  /* 34 */
-    0x11991111,  /* 35 */
-    0x19111111,  /* 36 */
-    0x91991111,  /* 37 */
-    0x1AAAA111,  /* 38 */
-    0x111111AA,  /* 39 */
-    0x11111911,  /* 40 */
-    0xAAAAAAA2,  /* 41 */
-    0xAAAAA2AA,  /* 42 */
-    0xA2AAA2AA,  /* 43 */
-    0x222A2AA2,  /* 44 */
-    0x99383333,  /* 45 */
-    0x33AAAAAA,  /* 46 */
-    0xAAAAA333,  /* 47 */
+    0x11991111,  /* 34 */
+    0x19111111,  /* 35 */
+    0x91991111,  /* 36 */
+    0x1AAAA111,  /* 37 */
+    0x111111AA,  /* 38 */
+    0x11111911,  /* 39 */
+    0xAAAAAAA2,  /* 40 */
+    0xA2AAA2AA,  /* 41 */
+    0xA2AA2AA2,  /* 42 */
+    0x99383333,  /* 43 */
+    0x33AAAAAA,  /* 44 */
+    0xAAAAA333,  /* 45 */
+    0x3AAAAAAA,  /* 46 */
+    0x33344744,  /* 47 */
     0x3333333A,  /* 48 */
-    0x33344744,  /* 49 */
-    0xAA333333,  /* 50 */
-    0xAA3AAAAA,  /* 51 */
-    0xA33AAAAA,  /* 52 */
-    0x33AAAA9A,  /* 53 */
-    0x33333355,  /* 54 */
-    0xB3333333,  /* 55 */
-    0x333333A3,  /* 56 */
-    0x33333AAA,  /* 57 */
-    0x11111AA1,  /* 58 */
-    0x111A1111,  /* 59 */
-    0xAAAAAAA1,  /* 60 */
-    0x11A1111A,  /* 61 */
-    0x111AAAA1,  /* 62 */
-    0x1111AA11,  /* 63 */
-    0x111111A1,  /* 64 */
-    0x11A11111,  /* 65 */
-    0x11117711,  /* 66 */
-    0xA1111AA1,  /* 67 */
-    0x11AAA11A,  /* 68 */
-    0xA1AAAAA1,  /* 69 */
-    0x11111171,  /* 70 */
-    0xA11A1111,  /* 71 */
-    0x1111AAA1,  /* 72 */
-    0x1A111111,  /* 73 */
-    0x11111A11,  /* 74 */
-    0x1111111A,  /* 75 */
-    0x11111979,  /* 76 */
-    0xAA111111,  /* 77 */
-    0xAA11111A,  /* 78 */
-    0x11AAAA1A,  /* 79 */
-    0x1AA11111,  /* 80 */
-    0x11AA1111,  /* 81 */
-    0x1A1AAA11,  /* 82 */
-    0xAAAA11A1,  /* 83 */
-    0x71111AAA,  /* 84 */
-    0xA1111111,  /* 85 */
-    0x1AAAAAAA,  /* 86 */
-    0x111AA1AA,  /* 87 */
-    0x11AAAAAA,  /* 88 */
-    0xA1A11111,  /* 89 */
-    0x119999A1,  /* 90 */
-    0xAA1AAAAA,  /* 91 */
-    0x111AAAAA,  /* 92 */
+    0xAA333333,  /* 49 */
+    0xAA3AAAAA,  /* 50 */
+    0xA33AAAAA,  /* 51 */
+    0x33AAAA9A,  /* 52 */
+    0x33333355,  /* 53 */
+    0xB3333333,  /* 54 */
+    0x333333A3,  /* 55 */
+    0x33333AAA,  /* 56 */
+    0x11111AA1,  /* 57 */
+    0x111A1111,  /* 58 */
+    0xAAAAAAA1,  /* 59 */
+    0x11A1111A,  /* 60 */
+    0x111AAAA1,  /* 61 */
+    0x1111AA11,  /* 62 */
+    0x111111A1,  /* 63 */
+    0x11A11111,  /* 64 */
+    0x11117711,  /* 65 */
+    0xA1111AA1,  /* 66 */
+    0x11AAA11A,  /* 67 */
+    0xA1AAAAA1,  /* 68 */
+    0x11111171,  /* 69 */
+    0xA11A1111,  /* 70 */
+    0x1111AAA1,  /* 71 */
+    0x1A111111,  /* 72 */
+    0x11111A11,  /* 73 */
+    0x1111111A,  /* 74 */
+    0x11111979,  /* 75 */
+    0xAA111111,  /* 76 */
+    0xAA11111A,  /* 77 */
+    0x11AAAA1A,  /* 78 */
+    0x1AA11111,  /* 79 */
+    0x11AA1111,  /* 80 */
+    0x1A1AAA11,  /* 81 */
+    0xAAAA11A1,  /* 82 */
+    0x71111AAA,  /* 83 */
+    0xA1111111,  /* 84 */
+    0x1AAAAAAA,  /* 85 */
+    0x111AA1AA,  /* 86 */
+    0x11AAAAAA,  /* 87 */
+    0xA1A11111,  /* 88 */
+    0x119999A1,  /* 89 */
+    0xAA1AAAAA,  /* 90 */
+    0x111AAAAA,  /* 91 */
+    0xAAA11111,  /* 92 */
     0xAA111A1A,  /* 93 */
-    0x1111111E,  /* 94 */
-    0x11199111,  /* 95 */
-    0x111AAA11,  /* 96 */
-    0x1111AAAA,  /* 97 */
-    0x11A17111,  /* 98 */
-    0x11111199,  /* 99 */
+    0x11111199,  /* 94 */
+    0x1111111E,  /* 95 */
+    0x11199111,  /* 96 */
+    0x111AAA11,  /* 97 */
+    0x1111AAAA,  /* 98 */
+    0x11A17111,  /* 99 */
     0x1EAAA999,  /* 100 */
     0xA1111AAA,  /* 101 */
     0x11991119,  /* 102 */
-    0x91911111,  /* 103 */
-    0x19911111,  /* 104 */
-    0x21BBBEEE,  /* 105 */
-    0xEFFFFFCE,  /* 106 */
-    0x99977777,  /* 107 */
-    0x99989999,  /* 108 */
-    0x91199999,  /* 109 */
-    0xE1111111,  /* 110 */
+    0x99111111,  /* 103 */
+    0x91911111,  /* 104 */
+    0x19911111,  /* 105 */
+    0x21BBBEEE,  /* 106 */
+    0x8FFFFFCE,  /* 107 */
+    0x99977777,  /* 108 */
+    0x99989999,  /* 109 */
+    0xE9999999,  /* 110 */
     0x1111BBBB,  /* 111 */
     0xBBBBBB11,  /* 112 */
     0x55551115,  /* 113 */
-    0x19997755,  /* 114 */
-    0x11111177,  /* 115 */
-    0x11111AAA,  /* 116 */
-    0x19999199,  /* 117 */
-    0x99191111,  /* 118 */
-    0x99111119,  /* 119 */
-    0x91919999,  /* 120 */
-    0x17111191,  /* 121 */
-    0x11119911,  /* 122 */
-    0x11199999,  /* 123 */
-    0x99997799,  /* 124 */
+    0x19996655,  /* 114 */
+    0x11777777,  /* 115 */
+    0x19999199,  /* 116 */
+    0x99191111,  /* 117 */
+    0x99111119,  /* 118 */
+    0x91919999,  /* 119 */
+    0x17111191,  /* 120 */
+    0x11119911,  /* 121 */
+    0x11199999,  /* 122 */
+    0x11199911,  /* 123 */
+    0x99997699,  /* 124 */
     0x11999999,  /* 125 */
     0x99199999,  /* 126 */
-    0x19999999,  /* 127 */
-    0x11111999,  /* 128 */
-    0x11115555,  /* 129 */
-    0x99999991,  /* 130 */
-    0x99199991,  /* 131 */
-    0x99991199,  /* 132 */
-    0x19111999,  /* 133 */
-    0x11119999,  /* 134 */
-    0x99999199,  /* 135 */
-    0x1119999E,  /* 136 */
-    0xAAAAAA11,  /* 137 */
-    0x11199AA1,  /* 138 */
-    0x11119111,  /* 139 */
-    0x99991111,  /* 140 */
-    0x99111111,  /* 141 */
-    0x2A211111,  /* 142 */
-    0x22222272,  /* 143 */
-    0x99333333,  /* 144 */
-    0x33933333,  /* 145 */
-    0x99891898,  /* 146 */
-    0x79999999,  /* 147 */
-    0x19997799,  /* 148 */
-    0x11119779,  /* 149 */
-    0x99777991,  /* 150 */
-    0x68787999,  /* 151 */
-    0x17799977,  /* 152 */
-    0x11999991,  /* 153 */
-    0x11111191,  /* 154 */
-    0xBBBBB111,  /* 155 */
-    0xAAAAABBB,  /* 156 */
-    0xAAA11AAA,  /* 157 */
-    0x11AAAA11,  /* 158 */
-    0x55111111,  /* 159 */
-    0x111111B1,  /* 160 */
+    0x11119999,  /* 127 */
+    0x19999999,  /* 128 */
+    0x11111999,  /* 129 */
+    0x11115555,  /* 130 */
+    0x99919999,  /* 131 */
+    0x99199991,  /* 132 */
+    0x99991199,  /* 133 */
+    0x99999991,  /* 134 */
+    0x19111999,  /* 135 */
+    0x99999199,  /* 136 */
+    0x1119999E,  /* 137 */
+    0xAAAAAA11,  /* 138 */
+    0x11199AA1,  /* 139 */
+    0x11119111,  /* 140 */
+    0x19991111,  /* 141 */
+    0x99991111,  /* 142 */
+    0x1A111A11,  /* 143 */
+    0x1111A111,  /* 144 */
+    0x2A211111,  /* 145 */
+    0x22222262,  /* 146 */
+    0x99333333,  /* 147 */
+    0x33933333,  /* 148 */
+    0x99891898,  /* 149 */
+    0x79999999,  /* 150 */
+    0x19996699,  /* 151 */
+    0x11119779,  /* 152 */
+    0x99777991,  /* 153 */
+    0x17799977,  /* 154 */
+    0x11999991,  /* 155 */
+    0x11111191,  /* 156 */
+    0x2AA2AAA2,  /* 157 */
+    0xAAAA2222,  /* 158 */
+    0xA2222AAA,  /* 159 */
+    0xBBBBB111,  /* 160 */
+    0xAAAAABBB,  /* 161 */
+    0xAAA11AAA,  /* 162 */
+    0x11AAAA11,  /* 163 */
+    0x119AAA99,  /* 164 */
+    0x55111111,  /* 165 */
+    0x111111B1,  /* 166 */
 };
 
 static eBidiCategory GetBidiCat(PRUint32 u)
 {
     PRUint32 pat;
     PRUint16 patidx;
 
     /*  Handle blocks which use index table mapping */   
 
     /* Handle U+0000 to U+07FF */
     if (u<=((PRUint32)0x07FF)) {
         patidx = gBidiCatIdx1 [( u  >> 3 )];
     }
 
-    /* Handle U+0900 to U+19FF */
-    else if ((((PRUint32)0x0900)<=u)&&(u<=((PRUint32)0x19FF))) {
+    /* Handle U+0900 to U+1A1F */
+    else if ((((PRUint32)0x0900)<=u)&&(u<=((PRUint32)0x1A1F))) {
         patidx = gBidiCatIdx2 [( (u -(PRUint32) 0x0900) >> 3 )];
     }
 
-    /* Handle U+1D00 to U+2BFF */
-    else if ((((PRUint32)0x1D00)<=u)&&(u<=((PRUint32)0x2BFF))) {
+    /* Handle U+1D00 to U+2DDF */
+    else if ((((PRUint32)0x1D00)<=u)&&(u<=((PRUint32)0x2DDF))) {
         patidx = gBidiCatIdx3 [( (u -(PRUint32) 0x1D00) >> 3 )];
     }
 
-    /* Handle U+2E80 to U+33FF */
-    else if ((((PRUint32)0x2E80)<=u)&&(u<=((PRUint32)0x33FF))) {
-        patidx = gBidiCatIdx4 [( (u -(PRUint32) 0x2E80) >> 3 )];
+    /* Handle U+2E00 to U+33FF */
+    else if ((((PRUint32)0x2E00)<=u)&&(u<=((PRUint32)0x33FF))) {
+        patidx = gBidiCatIdx4 [( (u -(PRUint32) 0x2E00) >> 3 )];
     }
 
     /* Handle U+4DC0 to U+4DFF */
     else if ((((PRUint32)0x4DC0)<=u)&&(u<=((PRUint32)0x4DFF))) {
         patidx = gBidiCatIdx5 [( (u -(PRUint32) 0x4DC0) >> 3 )];
     }
 
     /* Handle U+A000 to U+A4FF */
     else if ((((PRUint32)0xA000)<=u)&&(u<=((PRUint32)0xA4FF))) {
         patidx = gBidiCatIdx6 [( (u -(PRUint32) 0xA000) >> 3 )];
     }
 
-    /* Handle U+F900 to U+1013F */
-    else if ((((PRUint32)0xF900)<=u)&&(u<=((PRUint32)0x1013F))) {
-        patidx = gBidiCatIdx7 [( (u -(PRUint32) 0xF900) >> 3 )];
+    /* Handle U+A700 to U+A82F */
+    else if ((((PRUint32)0xA700)<=u)&&(u<=((PRUint32)0xA82F))) {
+        patidx = gBidiCatIdx7 [( (u -(PRUint32) 0xA700) >> 3 )];
+    }
+
+    /* Handle U+F900 to U+1018F */
+    else if ((((PRUint32)0xF900)<=u)&&(u<=((PRUint32)0x1018F))) {
+        patidx = gBidiCatIdx8 [( (u -(PRUint32) 0xF900) >> 3 )];
     }
 
     /* Handle U+10300 to U+104FF */
     else if ((((PRUint32)0x10300)<=u)&&(u<=((PRUint32)0x104FF))) {
-        patidx = gBidiCatIdx8 [( (u -(PRUint32) 0x10300) >> 3 )];
+        patidx = gBidiCatIdx9 [( (u -(PRUint32) 0x10300) >> 3 )];
     }
 
     /* Handle U+10800 to U+1083F */
     else if ((((PRUint32)0x10800)<=u)&&(u<=((PRUint32)0x1083F))) {
-        patidx = gBidiCatIdx9 [( (u -(PRUint32) 0x10800) >> 3 )];
+        patidx = gBidiCatIdx10 [( (u -(PRUint32) 0x10800) >> 3 )];
     }
 
-    /* Handle U+1D000 to U+1D1FF */
-    else if ((((PRUint32)0x1D000)<=u)&&(u<=((PRUint32)0x1D1FF))) {
-        patidx = gBidiCatIdx10 [( (u -(PRUint32) 0x1D000) >> 3 )];
+    /* Handle U+10A00 to U+10A5F */
+    else if ((((PRUint32)0x10A00)<=u)&&(u<=((PRUint32)0x10A5F))) {
+        patidx = gBidiCatIdx11 [( (u -(PRUint32) 0x10A00) >> 3 )];
     }
 
-    /* Handle U+1D300 to U+1D7FF */
-    else if ((((PRUint32)0x1D300)<=u)&&(u<=((PRUint32)0x1D7FF))) {
-        patidx = gBidiCatIdx11 [( (u -(PRUint32) 0x1D300) >> 3 )];
+    /* Handle U+1D000 to U+1D7FF */
+    else if ((((PRUint32)0x1D000)<=u)&&(u<=((PRUint32)0x1D7FF))) {
+        patidx = gBidiCatIdx12 [( (u -(PRUint32) 0x1D000) >> 3 )];
     }
 
     /* Handle U+2F800 to U+2FA1F */
     else if ((((PRUint32)0x2F800)<=u)&&(u<=((PRUint32)0x2FA1F))) {
-        patidx = gBidiCatIdx12 [( (u -(PRUint32) 0x2F800) >> 3 )];
+        patidx = gBidiCatIdx13 [( (u -(PRUint32) 0x2F800) >> 3 )];
     }
 
     /* Handle U+E0000 to U+E01FF */
     else if ((((PRUint32)0xE0000)<=u)&&(u<=((PRUint32)0xE01FF))) {
-        patidx = gBidiCatIdx13 [( (u -(PRUint32) 0xE0000) >> 3 )];
+        patidx = gBidiCatIdx14 [( (u -(PRUint32) 0xE0000) >> 3 )];
     }
 
     else {
         return eBidiCat_L; /* UNDEFINE = L */
     }
 
     if (patidx < 0x10)
         return (eBidiCategory)patidx;
     else {
         pat = gBidiCatPat[patidx];
         return (eBidiCategory)((pat  >> ((u % 8) * 4)) & 0x0F);
     }
 }
 
-/* total data size = 2960 */
+/* total data size = 3156 */
--- a/intl/unicharutil/util/genbidicattable.pl
+++ b/intl/unicharutil/util/genbidicattable.pl
@@ -77,17 +77,17 @@
 open ( UNICODATA , "< UnicodeData-Latest.txt") 
    || die "cannot find UnicodeData-Latest.txt";
 
 ######################################################################
 #
 # Open the output file
 #
 ######################################################################
-open ( OUT , "> ../base/src/bidicattable.h") 
+open ( OUT , "> ../base/bidicattable.h") 
   || die "cannot open output ../base/src/bidicattable.h file";
 
 ######################################################################
 #
 # Generate license and header
 #
 ######################################################################
 $npl = <<END_OF_NPL;
@@ -189,26 +189,27 @@ while(<UNICODATA>) {
       }
    }
 }
 
 # XXX - How can this be made more flexible as new blocks are added to the UCDB?
 
 @range = (
   0x0000,   0x07ff, 
-  0x0900,   0x19ff,
-  0x1d00,   0x2bff,
-  0x2e80,   0x33ff,
+  0x0900,   0x1a1f,
+  0x1d00,   0x2ddf,
+  0x2e00,   0x33ff,
   0x4dc0,   0x4dff,
-  0xa000,   0xa4ff,	  
-  0xf900,  0x1013f,
+  0xa000,   0xa4ff,
+  0xa700,   0xa82f,
+  0xf900,  0x1018f,
   0x10300, 0x104ff,
   0x10800, 0x1083f,
-  0x1d000, 0x1d1ff,
-  0x1d300, 0x1d7ff,
+  0x10a00, 0x10a5f,
+  0x1d000, 0x1d7ff,
   0x2f800, 0x2fa1f,
   0xe0000, 0xe01ff  
 );
 
 
 $totaldata = 0;
 
 $tt=($#range+1) / 2;
--- a/intl/unicharutil/util/gensymmtable.pl
+++ b/intl/unicharutil/util/gensymmtable.pl
@@ -53,27 +53,32 @@ open ( UNICODATA , "< BidiMirroring.txt"
    || die "Cannot find BidiMirroring.txt.\
 The file should be avaiable here:\
 http://www.unicode.org/Public/UNIDATA/BidiMirroring.txt\n";
 
 while (<UNICODATA>) {
 	chop;
   if (/^($ucp); ($ucp) # (.+)/) {      # If the line looks like this pattern
                                        # (example: 0028; 0029 # LEFT PARENTHESIS)
-    @table[hex($1)]=hex($1) ^ hex($2); # Enter the character XOR its symmetric pair in the table
+    if (hex($1) > 0xFFFF) {
+      printf "ALERT! %X There are now symmetric characters outside the BMP\n", $1;
+    }
+    @table[hex($1)]=hex($2);           # Enter the symmetric pair in the table
     @isblock[hex(substr($1, 0, 2))]=1; # Remember this block
   }
 }
 close(UNICODATA);
 
 # Generate license and header
-open ( OUT , "> ../base/src/symmtable.h") 
+open ( OUT , "> ../base/symmtable.h") 
   || die "cannot open output ../base/src/symmtable.h file";
 $npl = <<END_OF_NPL;
-/* ***** BEGIN LICENSE BLOCK *****
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ *
+ * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
@@ -101,48 +106,72 @@ open ( OUT , "> ../base/src/symmtable.h"
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
  
 /* 
     DO NOT EDIT THIS DOCUMENT !!! THIS DOCUMENT IS GENERATED BY
-    mozilla/intl/unicharutil/tools/gensymmtable.pl
+    mozilla/layout/tools/gensymmtable.pl
  */
 END_OF_NPL
 print OUT $npl;
 
 # Generate data tables
+$indexed_blocks = 0;
+printf OUT "\n/* Indexes to symmtable by Unicode block */\n";
+printf OUT "const static PRUint8 symmtable_index[256] = {\n";
+print  OUT "/*       ";
+foreach $byte (0 .. 0xf) {
+  printf OUT "_%X ", $byte;
+}
+print OUT "*/\n";
+foreach $row (0 .. 0xf) {
+  printf OUT "/* %X_ */ ", $row;
+  foreach $byte (0 .. 0xf) {
+    if (@isblock[($row << 4) | ($byte)]) {
+      printf OUT " %d,", ++$indexed_blocks;
+    } else {
+      printf OUT " 0,";
+    }
+  }
+  print OUT "\n";
+}
+print OUT "};\n";
+
+printf OUT "const static PRUint16 symmtable[%d] [256] = {\n", ($indexed_blocks);
 foreach $block (0 .. 0xff) {
   if (@isblock[$block]) {
-    printf OUT "\n/* Block U%02X__ */\n", $block;
-    printf OUT "const static PRUint8 symmtable_%02X[256] = {\n", $block;
+    if ($block != 0) {
+      printf OUT ",\n"
+    }
+    printf OUT " {\n/* Block U%02X__ */\n", $block;
     print OUT "/*      ";
     foreach $byte (0 .. 0xf) {
-      printf OUT "   _%X ", $byte;
+      printf OUT "     _%X ", $byte;
     }
     print OUT "*/\n";
     foreach $row (0 .. 0xf) {
       printf OUT "/* %X_ */ ", $row;
       foreach $byte (0 .. 0xf) {
          $ix = ($block << 8) | ($row << 4) | ($byte);
-         printf OUT ("%#4x, ", @table[$ix]);
+         printf OUT ("%#6x", (@table[$ix]) ? @table[$ix] : $ix);
+	 if ((($row << 4) | $byte) < 0xff) {
+	   print OUT ", ";
+	 }
       }
       print OUT "\n";
     }
-    print OUT "};\n";
+    print OUT " }";
   }
 }
+print OUT "\n};\n";
 
 # Generate conversion method
 print OUT "\nstatic PRUint32 Mirrored(PRUint32 u)\n{\n";
-print OUT "  switch (u & 0xFFFFFF00) {\n";
-print OUT "    // XOR the character with the bitmap in the conversion table to give the symmetric equivalent\n";
-foreach $block (0 .. 0xff) {
-  if (1==@isblock[$block]) {
-    printf OUT "    case %#x:\n", $block * 256;
-    printf OUT "      u ^= symmtable_%02X[u & 0xff];\n", $block;
-    print  OUT "      break;\n";
-  }
-}
+print OUT "  if (u < 0x10000) {\n";
+print OUT "    PRUint8 index = symmtable_index[(u & 0xFFFFFF00) >> 8];\n";
+print OUT "    if (index) {\n";
+print OUT "      return symmtable[index - 1] [u & 0xFF];\n";
+print OUT "    }\n";
 print OUT "  }\n  return u;\n}\n";
 close(OUT);
--- a/intl/unicharutil/util/symmtable.h
+++ b/intl/unicharutil/util/symmtable.h
@@ -11,159 +11,266 @@
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
  * for the specific language governing rights and limitations under the
  * License.
  *
  * The Original Code is IBM code.
  *
  * The Initial Developer of the Original Code is
- * IBM. Portions created by IBM are Copyright (C) International Business Machines Corporation, 2000.  All Rights Reserved. /.
- * Portions created by the Initial Developer are Copyright (C) 2001
+ * International Business Machines Corporation.
+ * Portions created by the Initial Developer are Copyright (C) 2000
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s):
  *
  * Alternatively, the contents of this file may be used under the terms of
- * either of the GNU General Public License Version 2 or later (the "GPL"),
- * or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
+ 
 /* 
     DO NOT EDIT THIS DOCUMENT !!! THIS DOCUMENT IS GENERATED BY
-    mozilla/intl/unicharutil/tools/gensymmtable.pl
+    mozilla/layout/tools/gensymmtable.pl
  */
 
-/* Block U00__ */
-const static PRUint8 symmtable_00[256] = {
-/*         _0    _1    _2    _3    _4    _5    _6    _7    _8    _9    _A    _B    _C    _D    _E    _F */
-/* 0_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 1_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 2_ */    0,    0,    0,    0,    0,    0,    0,    0,  0x1,  0x1,    0,    0,    0,    0,    0,    0, 
-/* 3_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,  0x2,    0,  0x2,    0, 
-/* 4_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 5_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,  0x6,    0,  0x6,    0,    0, 
-/* 6_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 7_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,  0x6,    0,  0x6,    0,    0, 
-/* 8_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 9_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* A_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 0x10,    0,    0,    0,    0, 
-/* B_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 0x10,    0,    0,    0,    0, 
-/* C_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* D_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* E_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* F_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+/* Indexes to symmtable by Unicode block */
+const static PRUint8 symmtable_index[256] = {
+/*       _0 _1 _2 _3 _4 _5 _6 _7 _8 _9 _A _B _C _D _E _F */
+/* 0_ */  1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 1_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 2_ */  2, 0, 3, 4, 0, 0, 0, 5, 0, 6, 7, 0, 0, 0, 8, 0,
+/* 3_ */  9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 4_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 5_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 6_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 7_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 8_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* 9_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* A_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* B_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* C_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* D_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* E_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+/* F_ */  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10,
 };
-
+const static PRUint16 symmtable[10] [256] = {
+ {
+/* Block U00__ */
+/*           _0      _1      _2      _3      _4      _5      _6      _7      _8      _9      _A      _B      _C      _D      _E      _F */
+/* 0_ */      0,    0x1,    0x2,    0x3,    0x4,    0x5,    0x6,    0x7,    0x8,    0x9,    0xa,    0xb,    0xc,    0xd,    0xe,    0xf, 
+/* 1_ */   0x10,   0x11,   0x12,   0x13,   0x14,   0x15,   0x16,   0x17,   0x18,   0x19,   0x1a,   0x1b,   0x1c,   0x1d,   0x1e,   0x1f, 
+/* 2_ */   0x20,   0x21,   0x22,   0x23,   0x24,   0x25,   0x26,   0x27,   0x29,   0x28,   0x2a,   0x2b,   0x2c,   0x2d,   0x2e,   0x2f, 
+/* 3_ */   0x30,   0x31,   0x32,   0x33,   0x34,   0x35,   0x36,   0x37,   0x38,   0x39,   0x3a,   0x3b,   0x3e,   0x3d,   0x3c,   0x3f, 
+/* 4_ */   0x40,   0x41,   0x42,   0x43,   0x44,   0x45,   0x46,   0x47,   0x48,   0x49,   0x4a,   0x4b,   0x4c,   0x4d,   0x4e,   0x4f, 
+/* 5_ */   0x50,   0x51,   0x52,   0x53,   0x54,   0x55,   0x56,   0x57,   0x58,   0x59,   0x5a,   0x5d,   0x5c,   0x5b,   0x5e,   0x5f, 
+/* 6_ */   0x60,   0x61,   0x62,   0x63,   0x64,   0x65,   0x66,   0x67,   0x68,   0x69,   0x6a,   0x6b,   0x6c,   0x6d,   0x6e,   0x6f, 
+/* 7_ */   0x70,   0x71,   0x72,   0x73,   0x74,   0x75,   0x76,   0x77,   0x78,   0x79,   0x7a,   0x7d,   0x7c,   0x7b,   0x7e,   0x7f, 
+/* 8_ */   0x80,   0x81,   0x82,   0x83,   0x84,   0x85,   0x86,   0x87,   0x88,   0x89,   0x8a,   0x8b,   0x8c,   0x8d,   0x8e,   0x8f, 
+/* 9_ */   0x90,   0x91,   0x92,   0x93,   0x94,   0x95,   0x96,   0x97,   0x98,   0x99,   0x9a,   0x9b,   0x9c,   0x9d,   0x9e,   0x9f, 
+/* A_ */   0xa0,   0xa1,   0xa2,   0xa3,   0xa4,   0xa5,   0xa6,   0xa7,   0xa8,   0xa9,   0xaa,   0xbb,   0xac,   0xad,   0xae,   0xaf, 
+/* B_ */   0xb0,   0xb1,   0xb2,   0xb3,   0xb4,   0xb5,   0xb6,   0xb7,   0xb8,   0xb9,   0xba,   0xab,   0xbc,   0xbd,   0xbe,   0xbf, 
+/* C_ */   0xc0,   0xc1,   0xc2,   0xc3,   0xc4,   0xc5,   0xc6,   0xc7,   0xc8,   0xc9,   0xca,   0xcb,   0xcc,   0xcd,   0xce,   0xcf, 
+/* D_ */   0xd0,   0xd1,   0xd2,   0xd3,   0xd4,   0xd5,   0xd6,   0xd7,   0xd8,   0xd9,   0xda,   0xdb,   0xdc,   0xdd,   0xde,   0xdf, 
+/* E_ */   0xe0,   0xe1,   0xe2,   0xe3,   0xe4,   0xe5,   0xe6,   0xe7,   0xe8,   0xe9,   0xea,   0xeb,   0xec,   0xed,   0xee,   0xef, 
+/* F_ */   0xf0,   0xf1,   0xf2,   0xf3,   0xf4,   0xf5,   0xf6,   0xf7,   0xf8,   0xf9,   0xfa,   0xfb,   0xfc,   0xfd,   0xfe,   0xff
+ },
+ {
 /* Block U20__ */
-const static PRUint8 symmtable_20[256] = {
-/*         _0    _1    _2    _3    _4    _5    _6    _7    _8    _9    _A    _B    _C    _D    _E    _F */
-/* 0_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 1_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 2_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 3_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,  0x3,  0x3,    0,    0,    0,    0,    0, 
-/* 4_ */    0,    0,    0,    0,    0,  0x3,  0x3,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 5_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 6_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 7_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,  0x3,  0x3,    0, 
-/* 8_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,  0x3,  0x3,    0, 
-/* 9_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* A_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* B_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* C_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* D_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* E_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* F_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-};
-
+/*           _0      _1      _2      _3      _4      _5      _6      _7      _8      _9      _A      _B      _C      _D      _E      _F */
+/* 0_ */ 0x2000, 0x2001, 0x2002, 0x2003, 0x2004, 0x2005, 0x2006, 0x2007, 0x2008, 0x2009, 0x200a, 0x200b, 0x200c, 0x200d, 0x200e, 0x200f, 
+/* 1_ */ 0x2010, 0x2011, 0x2012, 0x2013, 0x2014, 0x2015, 0x2016, 0x2017, 0x2018, 0x2019, 0x201a, 0x201b, 0x201c, 0x201d, 0x201e, 0x201f, 
+/* 2_ */ 0x2020, 0x2021, 0x2022, 0x2023, 0x2024, 0x2025, 0x2026, 0x2027, 0x2028, 0x2029, 0x202a, 0x202b, 0x202c, 0x202d, 0x202e, 0x202f, 
+/* 3_ */ 0x2030, 0x2031, 0x2032, 0x2033, 0x2034, 0x2035, 0x2036, 0x2037, 0x2038, 0x203a, 0x2039, 0x203b, 0x203c, 0x203d, 0x203e, 0x203f, 
+/* 4_ */ 0x2040, 0x2041, 0x2042, 0x2043, 0x2044, 0x2046, 0x2045, 0x2047, 0x2048, 0x2049, 0x204a, 0x204b, 0x204c, 0x204d, 0x204e, 0x204f, 
+/* 5_ */ 0x2050, 0x2051, 0x2052, 0x2053, 0x2054, 0x2055, 0x2056, 0x2057, 0x2058, 0x2059, 0x205a, 0x205b, 0x205c, 0x205d, 0x205e, 0x205f, 
+/* 6_ */ 0x2060, 0x2061, 0x2062, 0x2063, 0x2064, 0x2065, 0x2066, 0x2067, 0x2068, 0x2069, 0x206a, 0x206b, 0x206c, 0x206d, 0x206e, 0x206f, 
+/* 7_ */ 0x2070, 0x2071, 0x2072, 0x2073, 0x2074, 0x2075, 0x2076, 0x2077, 0x2078, 0x2079, 0x207a, 0x207b, 0x207c, 0x207e, 0x207d, 0x207f, 
+/* 8_ */ 0x2080, 0x2081, 0x2082, 0x2083, 0x2084, 0x2085, 0x2086, 0x2087, 0x2088, 0x2089, 0x208a, 0x208b, 0x208c, 0x208e, 0x208d, 0x208f, 
+/* 9_ */ 0x2090, 0x2091, 0x2092, 0x2093, 0x2094, 0x2095, 0x2096, 0x2097, 0x2098, 0x2099, 0x209a, 0x209b, 0x209c, 0x209d, 0x209e, 0x209f, 
+/* A_ */ 0x20a0, 0x20a1, 0x20a2, 0x20a3, 0x20a4, 0x20a5, 0x20a6, 0x20a7, 0x20a8, 0x20a9, 0x20aa, 0x20ab, 0x20ac, 0x20ad, 0x20ae, 0x20af, 
+/* B_ */ 0x20b0, 0x20b1, 0x20b2, 0x20b3, 0x20b4, 0x20b5, 0x20b6, 0x20b7, 0x20b8, 0x20b9, 0x20ba, 0x20bb, 0x20bc, 0x20bd, 0x20be, 0x20bf, 
+/* C_ */ 0x20c0, 0x20c1, 0x20c2, 0x20c3, 0x20c4, 0x20c5, 0x20c6, 0x20c7, 0x20c8, 0x20c9, 0x20ca, 0x20cb, 0x20cc, 0x20cd, 0x20ce, 0x20cf, 
+/* D_ */ 0x20d0, 0x20d1, 0x20d2, 0x20d3, 0x20d4, 0x20d5, 0x20d6, 0x20d7, 0x20d8, 0x20d9, 0x20da, 0x20db, 0x20dc, 0x20dd, 0x20de, 0x20df, 
+/* E_ */ 0x20e0, 0x20e1, 0x20e2, 0x20e3, 0x20e4, 0x20e5, 0x20e6, 0x20e7, 0x20e8, 0x20e9, 0x20ea, 0x20eb, 0x20ec, 0x20ed, 0x20ee, 0x20ef, 
+/* F_ */ 0x20f0, 0x20f1, 0x20f2, 0x20f3, 0x20f4, 0x20f5, 0x20f6, 0x20f7, 0x20f8, 0x20f9, 0x20fa, 0x20fb, 0x20fc, 0x20fd, 0x20fe, 0x20ff
+ },
+ {
 /* Block U22__ */
-const static PRUint8 symmtable_22[256] = {
-/*         _0    _1    _2    _3    _4    _5    _6    _7    _8    _9    _A    _B    _C    _D    _E    _F */
-/* 0_ */    0,    0,    0,    0,    0,    0,    0,    0,  0x3,  0x5,  0x7,  0x3,  0x5,  0x7,    0,    0, 
-/* 1_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 2_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 3_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,  0x1,  0x1,    0,    0, 
-/* 4_ */    0,    0,    0, 0x8e,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 5_ */    0,    0,  0x1,  0x1,  0x1,  0x1,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 6_ */    0,    0,    0,    0,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,    0,    0,  0x1,  0x1, 
-/* 7_ */  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1, 
-/* 8_ */  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,    0,    0,    0, 0x1f, 
-/* 9_ */ 0x1f,  0x3,  0x3,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* A_ */    0,    0,  0x1,  0x1,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* B_ */  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* C_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,  0x3,  0x3,  0x7,  0x7, 0x8e,    0,    0, 
-/* D_ */  0x1,  0x1,    0,    0,    0,    0,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1, 
-/* E_ */  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,    0,    0, 
-/* F_ */  0x1,  0x1,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-};
-
+/*           _0      _1      _2      _3      _4      _5      _6      _7      _8      _9      _A      _B      _C      _D      _E      _F */
+/* 0_ */ 0x2200, 0x2201, 0x2202, 0x2203, 0x2204, 0x2205, 0x2206, 0x2207, 0x220b, 0x220c, 0x220d, 0x2208, 0x2209, 0x220a, 0x220e, 0x220f, 
+/* 1_ */ 0x2210, 0x2211, 0x2212, 0x2213, 0x2214, 0x29f5, 0x2216, 0x2217, 0x2218, 0x2219, 0x221a, 0x221b, 0x221c, 0x221d, 0x221e, 0x221f, 
+/* 2_ */ 0x2220, 0x2221, 0x2222, 0x2223, 0x2224, 0x2225, 0x2226, 0x2227, 0x2228, 0x2229, 0x222a, 0x222b, 0x222c, 0x222d, 0x222e, 0x222f, 
+/* 3_ */ 0x2230, 0x2231, 0x2232, 0x2233, 0x2234, 0x2235, 0x2236, 0x2237, 0x2238, 0x2239, 0x223a, 0x223b, 0x223d, 0x223c, 0x223e, 0x223f, 
+/* 4_ */ 0x2240, 0x2241, 0x2242, 0x22cd, 0x2244, 0x2245, 0x2246, 0x2247, 0x2248, 0x2249, 0x224a, 0x224b, 0x224c, 0x224d, 0x224e, 0x224f, 
+/* 5_ */ 0x2250, 0x2251, 0x2253, 0x2252, 0x2255, 0x2254, 0x2256, 0x2257, 0x2258, 0x2259, 0x225a, 0x225b, 0x225c, 0x225d, 0x225e, 0x225f, 
+/* 6_ */ 0x2260, 0x2261, 0x2262, 0x2263, 0x2265, 0x2264, 0x2267, 0x2266, 0x2269, 0x2268, 0x226b, 0x226a, 0x226c, 0x226d, 0x226f, 0x226e, 
+/* 7_ */ 0x2271, 0x2270, 0x2273, 0x2272, 0x2275, 0x2274, 0x2277, 0x2276, 0x2279, 0x2278, 0x227b, 0x227a, 0x227d, 0x227c, 0x227f, 0x227e, 
+/* 8_ */ 0x2281, 0x2280, 0x2283, 0x2282, 0x2285, 0x2284, 0x2287, 0x2286, 0x2289, 0x2288, 0x228b, 0x228a, 0x228c, 0x228d, 0x228e, 0x2290, 
+/* 9_ */ 0x228f, 0x2292, 0x2291, 0x2293, 0x2294, 0x2295, 0x2296, 0x2297, 0x29b8, 0x2299, 0x229a, 0x229b, 0x229c, 0x229d, 0x229e, 0x229f, 
+/* A_ */ 0x22a0, 0x22a1, 0x22a3, 0x22a2, 0x22a4, 0x22a5, 0x2ade, 0x22a7, 0x2ae4, 0x2ae3, 0x22aa, 0x2ae5, 0x22ac, 0x22ad, 0x22ae, 0x22af, 
+/* B_ */ 0x22b1, 0x22b0, 0x22b3, 0x22b2, 0x22b5, 0x22b4, 0x22b7, 0x22b6, 0x22b8, 0x22b9, 0x22ba, 0x22bb, 0x22bc, 0x22bd, 0x22be, 0x22bf, 
+/* C_ */ 0x22c0, 0x22c1, 0x22c2, 0x22c3, 0x22c4, 0x22c5, 0x22c6, 0x22c7, 0x22c8, 0x22ca, 0x22c9, 0x22cc, 0x22cb, 0x2243, 0x22ce, 0x22cf, 
+/* D_ */ 0x22d1, 0x22d0, 0x22d2, 0x22d3, 0x22d4, 0x22d5, 0x22d7, 0x22d6, 0x22d9, 0x22d8, 0x22db, 0x22da, 0x22dd, 0x22dc, 0x22df, 0x22de, 
+/* E_ */ 0x22e1, 0x22e0, 0x22e3, 0x22e2, 0x22e5, 0x22e4, 0x22e7, 0x22e6, 0x22e9, 0x22e8, 0x22eb, 0x22ea, 0x22ed, 0x22ec, 0x22ee, 0x22ef, 
+/* F_ */ 0x22f1, 0x22f0, 0x22fa, 0x22fb, 0x22fc, 0x22f5, 0x22fd, 0x22fe, 0x22f8, 0x22f9, 0x22f2, 0x22f3, 0x22f4, 0x22f6, 0x22f7, 0x22ff
+ },
+ {
 /* Block U23__ */
-const static PRUint8 symmtable_23[256] = {
-/*         _0    _1    _2    _3    _4    _5    _6    _7    _8    _9    _A    _B    _C    _D    _E    _F */
-/* 0_ */    0,    0,    0,    0,    0,    0,    0,    0,  0x1,  0x1,  0x1,  0x1,    0,    0,    0,    0, 
-/* 1_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 2_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,  0x3,  0x3,    0,    0,    0,    0,    0, 
-/* 3_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 4_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 5_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 6_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 7_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 8_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 9_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* A_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* B_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* C_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* D_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* E_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* F_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-};
-
+/*           _0      _1      _2      _3      _4      _5      _6      _7      _8      _9      _A      _B      _C      _D      _E      _F */
+/* 0_ */ 0x2300, 0x2301, 0x2302, 0x2303, 0x2304, 0x2305, 0x2306, 0x2307, 0x2309, 0x2308, 0x230b, 0x230a, 0x230c, 0x230d, 0x230e, 0x230f, 
+/* 1_ */ 0x2310, 0x2311, 0x2312, 0x2313, 0x2314, 0x2315, 0x2316, 0x2317, 0x2318, 0x2319, 0x231a, 0x231b, 0x231c, 0x231d, 0x231e, 0x231f, 
+/* 2_ */ 0x2320, 0x2321, 0x2322, 0x2323, 0x2324, 0x2325, 0x2326, 0x2327, 0x2328, 0x232a, 0x2329, 0x232b, 0x232c, 0x232d, 0x232e, 0x232f, 
+/* 3_ */ 0x2330, 0x2331, 0x2332, 0x2333, 0x2334, 0x2335, 0x2336, 0x2337, 0x2338, 0x2339, 0x233a, 0x233b, 0x233c, 0x233d, 0x233e, 0x233f, 
+/* 4_ */ 0x2340, 0x2341, 0x2342, 0x2343, 0x2344, 0x2345, 0x2346, 0x2347, 0x2348, 0x2349, 0x234a, 0x234b, 0x234c, 0x234d, 0x234e, 0x234f, 
+/* 5_ */ 0x2350, 0x2351, 0x2352, 0x2353, 0x2354, 0x2355, 0x2356, 0x2357, 0x2358, 0x2359, 0x235a, 0x235b, 0x235c, 0x235d, 0x235e, 0x235f, 
+/* 6_ */ 0x2360, 0x2361, 0x2362, 0x2363, 0x2364, 0x2365, 0x2366, 0x2367, 0x2368, 0x2369, 0x236a, 0x236b, 0x236c, 0x236d, 0x236e, 0x236f, 
+/* 7_ */ 0x2370, 0x2371, 0x2372, 0x2373, 0x2374, 0x2375, 0x2376, 0x2377, 0x2378, 0x2379, 0x237a, 0x237b, 0x237c, 0x237d, 0x237e, 0x237f, 
+/* 8_ */ 0x2380, 0x2381, 0x2382, 0x2383, 0x2384, 0x2385, 0x2386, 0x2387, 0x2388, 0x2389, 0x238a, 0x238b, 0x238c, 0x238d, 0x238e, 0x238f, 
+/* 9_ */ 0x2390, 0x2391, 0x2392, 0x2393, 0x2394, 0x2395, 0x2396, 0x2397, 0x2398, 0x2399, 0x239a, 0x239b, 0x239c, 0x239d, 0x239e, 0x239f, 
+/* A_ */ 0x23a0, 0x23a1, 0x23a2, 0x23a3, 0x23a4, 0x23a5, 0x23a6, 0x23a7, 0x23a8, 0x23a9, 0x23aa, 0x23ab, 0x23ac, 0x23ad, 0x23ae, 0x23af, 
+/* B_ */ 0x23b0, 0x23b1, 0x23b2, 0x23b3, 0x23b4, 0x23b5, 0x23b6, 0x23b7, 0x23b8, 0x23b9, 0x23ba, 0x23bb, 0x23bc, 0x23bd, 0x23be, 0x23bf, 
+/* C_ */ 0x23c0, 0x23c1, 0x23c2, 0x23c3, 0x23c4, 0x23c5, 0x23c6, 0x23c7, 0x23c8, 0x23c9, 0x23ca, 0x23cb, 0x23cc, 0x23cd, 0x23ce, 0x23cf, 
+/* D_ */ 0x23d0, 0x23d1, 0x23d2, 0x23d3, 0x23d4, 0x23d5, 0x23d6, 0x23d7, 0x23d8, 0x23d9, 0x23da, 0x23db, 0x23dc, 0x23dd, 0x23de, 0x23df, 
+/* E_ */ 0x23e0, 0x23e1, 0x23e2, 0x23e3, 0x23e4, 0x23e5, 0x23e6, 0x23e7, 0x23e8, 0x23e9, 0x23ea, 0x23eb, 0x23ec, 0x23ed, 0x23ee, 0x23ef, 
+/* F_ */ 0x23f0, 0x23f1, 0x23f2, 0x23f3, 0x23f4, 0x23f5, 0x23f6, 0x23f7, 0x23f8, 0x23f9, 0x23fa, 0x23fb, 0x23fc, 0x23fd, 0x23fe, 0x23ff
+ },
+ {
+/* Block U27__ */
+/*           _0      _1      _2      _3      _4      _5      _6      _7      _8      _9      _A      _B      _C      _D      _E      _F */
+/* 0_ */ 0x2700, 0x2701, 0x2702, 0x2703, 0x2704, 0x2705, 0x2706, 0x2707, 0x2708, 0x2709, 0x270a, 0x270b, 0x270c, 0x270d, 0x270e, 0x270f, 
+/* 1_ */ 0x2710, 0x2711, 0x2712, 0x2713, 0x2714, 0x2715, 0x2716, 0x2717, 0x2718, 0x2719, 0x271a, 0x271b, 0x271c, 0x271d, 0x271e, 0x271f, 
+/* 2_ */ 0x2720, 0x2721, 0x2722, 0x2723, 0x2724, 0x2725, 0x2726, 0x2727, 0x2728, 0x2729, 0x272a, 0x272b, 0x272c, 0x272d, 0x272e, 0x272f, 
+/* 3_ */ 0x2730, 0x2731, 0x2732, 0x2733, 0x2734, 0x2735, 0x2736, 0x2737, 0x2738, 0x2739, 0x273a, 0x273b, 0x273c, 0x273d, 0x273e, 0x273f, 
+/* 4_ */ 0x2740, 0x2741, 0x2742, 0x2743, 0x2744, 0x2745, 0x2746, 0x2747, 0x2748, 0x2749, 0x274a, 0x274b, 0x274c, 0x274d, 0x274e, 0x274f, 
+/* 5_ */ 0x2750, 0x2751, 0x2752, 0x2753, 0x2754, 0x2755, 0x2756, 0x2757, 0x2758, 0x2759, 0x275a, 0x275b, 0x275c, 0x275d, 0x275e, 0x275f, 
+/* 6_ */ 0x2760, 0x2761, 0x2762, 0x2763, 0x2764, 0x2765, 0x2766, 0x2767, 0x2769, 0x2768, 0x276b, 0x276a, 0x276d, 0x276c, 0x276f, 0x276e, 
+/* 7_ */ 0x2771, 0x2770, 0x2773, 0x2772, 0x2775, 0x2774, 0x2776, 0x2777, 0x2778, 0x2779, 0x277a, 0x277b, 0x277c, 0x277d, 0x277e, 0x277f, 
+/* 8_ */ 0x2780, 0x2781, 0x2782, 0x2783, 0x2784, 0x2785, 0x2786, 0x2787, 0x2788, 0x2789, 0x278a, 0x278b, 0x278c, 0x278d, 0x278e, 0x278f, 
+/* 9_ */ 0x2790, 0x2791, 0x2792, 0x2793, 0x2794, 0x2795, 0x2796, 0x2797, 0x2798, 0x2799, 0x279a, 0x279b, 0x279c, 0x279d, 0x279e, 0x279f, 
+/* A_ */ 0x27a0, 0x27a1, 0x27a2, 0x27a3, 0x27a4, 0x27a5, 0x27a6, 0x27a7, 0x27a8, 0x27a9, 0x27aa, 0x27ab, 0x27ac, 0x27ad, 0x27ae, 0x27af, 
+/* B_ */ 0x27b0, 0x27b1, 0x27b2, 0x27b3, 0x27b4, 0x27b5, 0x27b6, 0x27b7, 0x27b8, 0x27b9, 0x27ba, 0x27bb, 0x27bc, 0x27bd, 0x27be, 0x27bf, 
+/* C_ */ 0x27c0, 0x27c1, 0x27c2, 0x27c4, 0x27c3, 0x27c6, 0x27c5, 0x27c7, 0x27c8, 0x27c9, 0x27ca, 0x27cb, 0x27cc, 0x27cd, 0x27ce, 0x27cf, 
+/* D_ */ 0x27d0, 0x27d1, 0x27d2, 0x27d3, 0x27d4, 0x27d6, 0x27d5, 0x27d7, 0x27d8, 0x27d9, 0x27da, 0x27db, 0x27dc, 0x27de, 0x27dd, 0x27df, 
+/* E_ */ 0x27e0, 0x27e1, 0x27e3, 0x27e2, 0x27e5, 0x27e4, 0x27e7, 0x27e6, 0x27e9, 0x27e8, 0x27eb, 0x27ea, 0x27ec, 0x27ed, 0x27ee, 0x27ef, 
+/* F_ */ 0x27f0, 0x27f1, 0x27f2, 0x27f3, 0x27f4, 0x27f5, 0x27f6, 0x27f7, 0x27f8, 0x27f9, 0x27fa, 0x27fb, 0x27fc, 0x27fd, 0x27fe, 0x27ff
+ },
+ {
+/* Block U29__ */
+/*           _0      _1      _2      _3      _4      _5      _6      _7      _8      _9      _A      _B      _C      _D      _E      _F */
+/* 0_ */ 0x2900, 0x2901, 0x2902, 0x2903, 0x2904, 0x2905, 0x2906, 0x2907, 0x2908, 0x2909, 0x290a, 0x290b, 0x290c, 0x290d, 0x290e, 0x290f, 
+/* 1_ */ 0x2910, 0x2911, 0x2912, 0x2913, 0x2914, 0x2915, 0x2916, 0x2917, 0x2918, 0x2919, 0x291a, 0x291b, 0x291c, 0x291d, 0x291e, 0x291f, 
+/* 2_ */ 0x2920, 0x2921, 0x2922, 0x2923, 0x2924, 0x2925, 0x2926, 0x2927, 0x2928, 0x2929, 0x292a, 0x292b, 0x292c, 0x292d, 0x292e, 0x292f, 
+/* 3_ */ 0x2930, 0x2931, 0x2932, 0x2933, 0x2934, 0x2935, 0x2936, 0x2937, 0x2938, 0x2939, 0x293a, 0x293b, 0x293c, 0x293d, 0x293e, 0x293f, 
+/* 4_ */ 0x2940, 0x2941, 0x2942, 0x2943, 0x2944, 0x2945, 0x2946, 0x2947, 0x2948, 0x2949, 0x294a, 0x294b, 0x294c, 0x294d, 0x294e, 0x294f, 
+/* 5_ */ 0x2950, 0x2951, 0x2952, 0x2953, 0x2954, 0x2955, 0x2956, 0x2957, 0x2958, 0x2959, 0x295a, 0x295b, 0x295c, 0x295d, 0x295e, 0x295f, 
+/* 6_ */ 0x2960, 0x2961, 0x2962, 0x2963, 0x2964, 0x2965, 0x2966, 0x2967, 0x2968, 0x2969, 0x296a, 0x296b, 0x296c, 0x296d, 0x296e, 0x296f, 
+/* 7_ */ 0x2970, 0x2971, 0x2972, 0x2973, 0x2974, 0x2975, 0x2976, 0x2977, 0x2978, 0x2979, 0x297a, 0x297b, 0x297c, 0x297d, 0x297e, 0x297f, 
+/* 8_ */ 0x2980, 0x2981, 0x2982, 0x2984, 0x2983, 0x2986, 0x2985, 0x2988, 0x2987, 0x298a, 0x2989, 0x298c, 0x298b, 0x2990, 0x298f, 0x298e, 
+/* 9_ */ 0x298d, 0x2992, 0x2991, 0x2994, 0x2993, 0x2996, 0x2995, 0x2998, 0x2997, 0x2999, 0x299a, 0x299b, 0x299c, 0x299d, 0x299e, 0x299f, 
+/* A_ */ 0x29a0, 0x29a1, 0x29a2, 0x29a3, 0x29a4, 0x29a5, 0x29a6, 0x29a7, 0x29a8, 0x29a9, 0x29aa, 0x29ab, 0x29ac, 0x29ad, 0x29ae, 0x29af, 
+/* B_ */ 0x29b0, 0x29b1, 0x29b2, 0x29b3, 0x29b4, 0x29b5, 0x29b6, 0x29b7, 0x2298, 0x29b9, 0x29ba, 0x29bb, 0x29bc, 0x29bd, 0x29be, 0x29bf, 
+/* C_ */ 0x29c1, 0x29c0, 0x29c2, 0x29c3, 0x29c5, 0x29c4, 0x29c6, 0x29c7, 0x29c8, 0x29c9, 0x29ca, 0x29cb, 0x29cc, 0x29cd, 0x29ce, 0x29d0, 
+/* D_ */ 0x29cf, 0x29d2, 0x29d1, 0x29d3, 0x29d5, 0x29d4, 0x29d6, 0x29d7, 0x29d9, 0x29d8, 0x29db, 0x29da, 0x29dc, 0x29dd, 0x29de, 0x29df, 
+/* E_ */ 0x29e0, 0x29e1, 0x29e2, 0x29e3, 0x29e4, 0x29e5, 0x29e6, 0x29e7, 0x29e8, 0x29e9, 0x29ea, 0x29eb, 0x29ec, 0x29ed, 0x29ee, 0x29ef, 
+/* F_ */ 0x29f0, 0x29f1, 0x29f2, 0x29f3, 0x29f4, 0x2215, 0x29f6, 0x29f7, 0x29f9, 0x29f8, 0x29fa, 0x29fb, 0x29fd, 0x29fc, 0x29fe, 0x29ff
+ },
+ {
+/* Block U2A__ */
+/*           _0      _1      _2      _3      _4      _5      _6      _7      _8      _9      _A      _B      _C      _D      _E      _F */
+/* 0_ */ 0x2a00, 0x2a01, 0x2a02, 0x2a03, 0x2a04, 0x2a05, 0x2a06, 0x2a07, 0x2a08, 0x2a09, 0x2a0a, 0x2a0b, 0x2a0c, 0x2a0d, 0x2a0e, 0x2a0f, 
+/* 1_ */ 0x2a10, 0x2a11, 0x2a12, 0x2a13, 0x2a14, 0x2a15, 0x2a16, 0x2a17, 0x2a18, 0x2a19, 0x2a1a, 0x2a1b, 0x2a1c, 0x2a1d, 0x2a1e, 0x2a1f, 
+/* 2_ */ 0x2a20, 0x2a21, 0x2a22, 0x2a23, 0x2a24, 0x2a25, 0x2a26, 0x2a27, 0x2a28, 0x2a29, 0x2a2a, 0x2a2c, 0x2a2b, 0x2a2e, 0x2a2d, 0x2a2f, 
+/* 3_ */ 0x2a30, 0x2a31, 0x2a32, 0x2a33, 0x2a35, 0x2a34, 0x2a36, 0x2a37, 0x2a38, 0x2a39, 0x2a3a, 0x2a3b, 0x2a3d, 0x2a3c, 0x2a3e, 0x2a3f, 
+/* 4_ */ 0x2a40, 0x2a41, 0x2a42, 0x2a43, 0x2a44, 0x2a45, 0x2a46, 0x2a47, 0x2a48, 0x2a49, 0x2a4a, 0x2a4b, 0x2a4c, 0x2a4d, 0x2a4e, 0x2a4f, 
+/* 5_ */ 0x2a50, 0x2a51, 0x2a52, 0x2a53, 0x2a54, 0x2a55, 0x2a56, 0x2a57, 0x2a58, 0x2a59, 0x2a5a, 0x2a5b, 0x2a5c, 0x2a5d, 0x2a5e, 0x2a5f, 
+/* 6_ */ 0x2a60, 0x2a61, 0x2a62, 0x2a63, 0x2a65, 0x2a64, 0x2a66, 0x2a67, 0x2a68, 0x2a69, 0x2a6a, 0x2a6b, 0x2a6c, 0x2a6d, 0x2a6e, 0x2a6f, 
+/* 7_ */ 0x2a70, 0x2a71, 0x2a72, 0x2a73, 0x2a74, 0x2a75, 0x2a76, 0x2a77, 0x2a78, 0x2a7a, 0x2a79, 0x2a7b, 0x2a7c, 0x2a7e, 0x2a7d, 0x2a80, 
+/* 8_ */ 0x2a7f, 0x2a82, 0x2a81, 0x2a84, 0x2a83, 0x2a85, 0x2a86, 0x2a87, 0x2a88, 0x2a89, 0x2a8a, 0x2a8c, 0x2a8b, 0x2a8d, 0x2a8e, 0x2a8f, 
+/* 9_ */ 0x2a90, 0x2a92, 0x2a91, 0x2a94, 0x2a93, 0x2a96, 0x2a95, 0x2a98, 0x2a97, 0x2a9a, 0x2a99, 0x2a9c, 0x2a9b, 0x2a9d, 0x2a9e, 0x2a9f, 
+/* A_ */ 0x2aa0, 0x2aa2, 0x2aa1, 0x2aa3, 0x2aa4, 0x2aa5, 0x2aa7, 0x2aa6, 0x2aa9, 0x2aa8, 0x2aab, 0x2aaa, 0x2aad, 0x2aac, 0x2aae, 0x2ab0, 
+/* B_ */ 0x2aaf, 0x2ab1, 0x2ab2, 0x2ab4, 0x2ab3, 0x2ab5, 0x2ab6, 0x2ab7, 0x2ab8, 0x2ab9, 0x2aba, 0x2abc, 0x2abb, 0x2abe, 0x2abd, 0x2ac0, 
+/* C_ */ 0x2abf, 0x2ac2, 0x2ac1, 0x2ac4, 0x2ac3, 0x2ac6, 0x2ac5, 0x2ac7, 0x2ac8, 0x2ac9, 0x2aca, 0x2acb, 0x2acc, 0x2ace, 0x2acd, 0x2ad0, 
+/* D_ */ 0x2acf, 0x2ad2, 0x2ad1, 0x2ad4, 0x2ad3, 0x2ad6, 0x2ad5, 0x2ad7, 0x2ad8, 0x2ad9, 0x2ada, 0x2adb, 0x2adc, 0x2add, 0x22a6, 0x2adf, 
+/* E_ */ 0x2ae0, 0x2ae1, 0x2ae2, 0x22a9, 0x22a8, 0x22ab, 0x2ae6, 0x2ae7, 0x2ae8, 0x2ae9, 0x2aea, 0x2aeb, 0x2aed, 0x2aec, 0x2aee, 0x2aef, 
+/* F_ */ 0x2af0, 0x2af1, 0x2af2, 0x2af3, 0x2af4, 0x2af5, 0x2af6, 0x2af8, 0x2af7, 0x2afa, 0x2af9, 0x2afb, 0x2afc, 0x2afd, 0x2afe, 0x2aff
+ },
+ {
+/* Block U2E__ */
+/*           _0      _1      _2      _3      _4      _5      _6      _7      _8      _9      _A      _B      _C      _D      _E      _F */
+/* 0_ */ 0x2e00, 0x2e01, 0x2e03, 0x2e02, 0x2e05, 0x2e04, 0x2e06, 0x2e07, 0x2e08, 0x2e0a, 0x2e09, 0x2e0b, 0x2e0d, 0x2e0c, 0x2e0e, 0x2e0f, 
+/* 1_ */ 0x2e10, 0x2e11, 0x2e12, 0x2e13, 0x2e14, 0x2e15, 0x2e16, 0x2e17, 0x2e18, 0x2e19, 0x2e1a, 0x2e1b, 0x2e1d, 0x2e1c, 0x2e1e, 0x2e1f, 
+/* 2_ */ 0x2e20, 0x2e21, 0x2e22, 0x2e23, 0x2e24, 0x2e25, 0x2e26, 0x2e27, 0x2e28, 0x2e29, 0x2e2a, 0x2e2b, 0x2e2c, 0x2e2d, 0x2e2e, 0x2e2f, 
+/* 3_ */ 0x2e30, 0x2e31, 0x2e32, 0x2e33, 0x2e34, 0x2e35, 0x2e36, 0x2e37, 0x2e38, 0x2e39, 0x2e3a, 0x2e3b, 0x2e3c, 0x2e3d, 0x2e3e, 0x2e3f, 
+/* 4_ */ 0x2e40, 0x2e41, 0x2e42, 0x2e43, 0x2e44, 0x2e45, 0x2e46, 0x2e47, 0x2e48, 0x2e49, 0x2e4a, 0x2e4b, 0x2e4c, 0x2e4d, 0x2e4e, 0x2e4f, 
+/* 5_ */ 0x2e50, 0x2e51, 0x2e52, 0x2e53, 0x2e54, 0x2e55, 0x2e56, 0x2e57, 0x2e58, 0x2e59, 0x2e5a, 0x2e5b, 0x2e5c, 0x2e5d, 0x2e5e, 0x2e5f, 
+/* 6_ */ 0x2e60, 0x2e61, 0x2e62, 0x2e63, 0x2e64, 0x2e65, 0x2e66, 0x2e67, 0x2e68, 0x2e69, 0x2e6a, 0x2e6b, 0x2e6c, 0x2e6d, 0x2e6e, 0x2e6f, 
+/* 7_ */ 0x2e70, 0x2e71, 0x2e72, 0x2e73, 0x2e74, 0x2e75, 0x2e76, 0x2e77, 0x2e78, 0x2e79, 0x2e7a, 0x2e7b, 0x2e7c, 0x2e7d, 0x2e7e, 0x2e7f, 
+/* 8_ */ 0x2e80, 0x2e81, 0x2e82, 0x2e83, 0x2e84, 0x2e85, 0x2e86, 0x2e87, 0x2e88, 0x2e89, 0x2e8a, 0x2e8b, 0x2e8c, 0x2e8d, 0x2e8e, 0x2e8f, 
+/* 9_ */ 0x2e90, 0x2e91, 0x2e92, 0x2e93, 0x2e94, 0x2e95, 0x2e96, 0x2e97, 0x2e98, 0x2e99, 0x2e9a, 0x2e9b, 0x2e9c, 0x2e9d, 0x2e9e, 0x2e9f, 
+/* A_ */ 0x2ea0, 0x2ea1, 0x2ea2, 0x2ea3, 0x2ea4, 0x2ea5, 0x2ea6, 0x2ea7, 0x2ea8, 0x2ea9, 0x2eaa, 0x2eab, 0x2eac, 0x2ead, 0x2eae, 0x2eaf, 
+/* B_ */ 0x2eb0, 0x2eb1, 0x2eb2, 0x2eb3, 0x2eb4, 0x2eb5, 0x2eb6, 0x2eb7, 0x2eb8, 0x2eb9, 0x2eba, 0x2ebb, 0x2ebc, 0x2ebd, 0x2ebe, 0x2ebf, 
+/* C_ */ 0x2ec0, 0x2ec1, 0x2ec2, 0x2ec3, 0x2ec4, 0x2ec5, 0x2ec6, 0x2ec7, 0x2ec8, 0x2ec9, 0x2eca, 0x2ecb, 0x2ecc, 0x2ecd, 0x2ece, 0x2ecf, 
+/* D_ */ 0x2ed0, 0x2ed1, 0x2ed2, 0x2ed3, 0x2ed4, 0x2ed5, 0x2ed6, 0x2ed7, 0x2ed8, 0x2ed9, 0x2eda, 0x2edb, 0x2edc, 0x2edd, 0x2ede, 0x2edf, 
+/* E_ */ 0x2ee0, 0x2ee1, 0x2ee2, 0x2ee3, 0x2ee4, 0x2ee5, 0x2ee6, 0x2ee7, 0x2ee8, 0x2ee9, 0x2eea, 0x2eeb, 0x2eec, 0x2eed, 0x2eee, 0x2eef, 
+/* F_ */ 0x2ef0, 0x2ef1, 0x2ef2, 0x2ef3, 0x2ef4, 0x2ef5, 0x2ef6, 0x2ef7, 0x2ef8, 0x2ef9, 0x2efa, 0x2efb, 0x2efc, 0x2efd, 0x2efe, 0x2eff
+ },
+ {
 /* Block U30__ */
-const static PRUint8 symmtable_30[256] = {
-/*         _0    _1    _2    _3    _4    _5    _6    _7    _8    _9    _A    _B    _C    _D    _E    _F */
-/* 0_ */    0,    0,    0,    0,    0,    0,    0,    0,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1, 
-/* 1_ */  0x1,  0x1,    0,    0,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,  0x1,    0,    0,    0,    0, 
-/* 2_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 3_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 4_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 5_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 6_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 7_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 8_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* 9_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* A_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* B_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* C_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* D_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* E_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
-/* F_ */    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,    0, 
+/*           _0      _1      _2      _3      _4      _5      _6      _7      _8      _9      _A      _B      _C      _D      _E      _F */
+/* 0_ */ 0x3000, 0x3001, 0x3002, 0x3003, 0x3004, 0x3005, 0x3006, 0x3007, 0x3009, 0x3008, 0x300b, 0x300a, 0x300d, 0x300c, 0x300f, 0x300e, 
+/* 1_ */ 0x3011, 0x3010, 0x3012, 0x3013, 0x3015, 0x3014, 0x3017, 0x3016, 0x3019, 0x3018, 0x301b, 0x301a, 0x301c, 0x301d, 0x301e, 0x301f, 
+/* 2_ */ 0x3020, 0x3021, 0x3022, 0x3023, 0x3024, 0x3025, 0x3026, 0x3027, 0x3028, 0x3029, 0x302a, 0x302b, 0x302c, 0x302d, 0x302e, 0x302f, 
+/* 3_ */ 0x3030, 0x3031, 0x3032, 0x3033, 0x3034, 0x3035, 0x3036, 0x3037, 0x3038, 0x3039, 0x303a, 0x303b, 0x303c, 0x303d, 0x303e, 0x303f, 
+/* 4_ */ 0x3040, 0x3041, 0x3042, 0x3043, 0x3044, 0x3045, 0x3046, 0x3047, 0x3048, 0x3049, 0x304a, 0x304b, 0x304c, 0x304d, 0x304e, 0x304f, 
+/* 5_ */ 0x3050, 0x3051, 0x3052, 0x3053, 0x3054, 0x3055, 0x3056, 0x3057, 0x3058, 0x3059, 0x305a, 0x305b, 0x305c, 0x305d, 0x305e, 0x305f, 
+/* 6_ */ 0x3060, 0x3061, 0x3062, 0x3063, 0x3064, 0x3065, 0x3066, 0x3067, 0x3068, 0x3069, 0x306a, 0x306b, 0x306c, 0x306d, 0x306e, 0x306f, 
+/* 7_ */ 0x3070, 0x3071, 0x3072, 0x3073, 0x3074, 0x3075, 0x3076, 0x3077, 0x3078, 0x3079, 0x307a, 0x307b, 0x307c, 0x307d, 0x307e, 0x307f, 
+/* 8_ */ 0x3080, 0x3081, 0x3082, 0x3083, 0x3084, 0x3085, 0x3086, 0x3087, 0x3088, 0x3089, 0x308a, 0x308b, 0x308c, 0x308d, 0x308e, 0x308f, 
+/* 9_ */ 0x3090, 0x3091, 0x3092, 0x3093, 0x3094, 0x3095, 0x3096, 0x3097, 0x3098, 0x3099, 0x309a, 0x309b, 0x309c, 0x309d, 0x309e, 0x309f, 
+/* A_ */ 0x30a0, 0x30a1, 0x30a2, 0x30a3, 0x30a4, 0x30a5, 0x30a6, 0x30a7, 0x30a8, 0x30a9, 0x30aa, 0x30ab, 0x30ac, 0x30ad, 0x30ae, 0x30af, 
+/* B_ */ 0x30b0, 0x30b1, 0x30b2, 0x30b3, 0x30b4, 0x30b5, 0x30b6, 0x30b7, 0x30b8, 0x30b9, 0x30ba, 0x30bb, 0x30bc, 0x30bd, 0x30be, 0x30bf, 
+/* C_ */ 0x30c0, 0x30c1, 0x30c2, 0x30c3, 0x30c4, 0x30c5, 0x30c6, 0x30c7, 0x30c8, 0x30c9, 0x30ca, 0x30cb, 0x30cc, 0x30cd, 0x30ce, 0x30cf, 
+/* D_ */ 0x30d0, 0x30d1, 0x30d2, 0x30d3, 0x30d4, 0x30d5, 0x30d6, 0x30d7, 0x30d8, 0x30d9, 0x30da, 0x30db, 0x30dc, 0x30dd, 0x30de, 0x30df, 
+/* E_ */ 0x30e0, 0x30e1, 0x30e2, 0x30e3, 0x30e4, 0x30e5, 0x30e6, 0x30e7, 0x30e8, 0x30e9, 0x30ea, 0x30eb, 0x30ec, 0x30ed, 0x30ee, 0x30ef, 
+/* F_ */ 0x30f0, 0x30f1, 0x30f2, 0x30f3, 0x30f4, 0x30f5, 0x30f6, 0x30f7, 0x30f8, 0x30f9, 0x30fa, 0x30fb, 0x30fc, 0x30fd, 0x30fe, 0x30ff
+ },
+ {
+/* Block UFF__ */
+/*           _0      _1      _2      _3      _4      _5      _6      _7      _8      _9      _A      _B      _C      _D      _E      _F */
+/* 0_ */ 0xff00, 0xff01, 0xff02, 0xff03, 0xff04, 0xff05, 0xff06, 0xff07, 0xff09, 0xff08, 0xff0a, 0xff0b, 0xff0c, 0xff0d, 0xff0e, 0xff0f, 
+/* 1_ */ 0xff10, 0xff11, 0xff12, 0xff13, 0xff14, 0xff15, 0xff16, 0xff17, 0xff18, 0xff19, 0xff1a, 0xff1b, 0xff1e, 0xff1d, 0xff1c, 0xff1f, 
+/* 2_ */ 0xff20, 0xff21, 0xff22, 0xff23, 0xff24, 0xff25, 0xff26, 0xff27, 0xff28, 0xff29, 0xff2a, 0xff2b, 0xff2c, 0xff2d, 0xff2e, 0xff2f, 
+/* 3_ */ 0xff30, 0xff31, 0xff32, 0xff33, 0xff34, 0xff35, 0xff36, 0xff37, 0xff38, 0xff39, 0xff3a, 0xff3d, 0xff3c, 0xff3b, 0xff3e, 0xff3f, 
+/* 4_ */ 0xff40, 0xff41, 0xff42, 0xff43, 0xff44, 0xff45, 0xff46, 0xff47, 0xff48, 0xff49, 0xff4a, 0xff4b, 0xff4c, 0xff4d, 0xff4e, 0xff4f, 
+/* 5_ */ 0xff50, 0xff51, 0xff52, 0xff53, 0xff54, 0xff55, 0xff56, 0xff57, 0xff58, 0xff59, 0xff5a, 0xff5d, 0xff5c, 0xff5b, 0xff5e, 0xff60, 
+/* 6_ */ 0xff5f, 0xff61, 0xff63, 0xff62, 0xff64, 0xff65, 0xff66, 0xff67, 0xff68, 0xff69, 0xff6a, 0xff6b, 0xff6c, 0xff6d, 0xff6e, 0xff6f, 
+/* 7_ */ 0xff70, 0xff71, 0xff72, 0xff73, 0xff74, 0xff75, 0xff76, 0xff77, 0xff78, 0xff79, 0xff7a, 0xff7b, 0xff7c, 0xff7d, 0xff7e, 0xff7f, 
+/* 8_ */ 0xff80, 0xff81, 0xff82, 0xff83, 0xff84, 0xff85, 0xff86, 0xff87, 0xff88, 0xff89, 0xff8a, 0xff8b, 0xff8c, 0xff8d, 0xff8e, 0xff8f, 
+/* 9_ */ 0xff90, 0xff91, 0xff92, 0xff93, 0xff94, 0xff95, 0xff96, 0xff97, 0xff98, 0xff99, 0xff9a, 0xff9b, 0xff9c, 0xff9d, 0xff9e, 0xff9f, 
+/* A_ */ 0xffa0, 0xffa1, 0xffa2, 0xffa3, 0xffa4, 0xffa5, 0xffa6, 0xffa7, 0xffa8, 0xffa9, 0xffaa, 0xffab, 0xffac, 0xffad, 0xffae, 0xffaf, 
+/* B_ */ 0xffb0, 0xffb1, 0xffb2, 0xffb3, 0xffb4, 0xffb5, 0xffb6, 0xffb7, 0xffb8, 0xffb9, 0xffba, 0xffbb, 0xffbc, 0xffbd, 0xffbe, 0xffbf, 
+/* C_ */ 0xffc0, 0xffc1, 0xffc2, 0xffc3, 0xffc4, 0xffc5, 0xffc6, 0xffc7, 0xffc8, 0xffc9, 0xffca, 0xffcb, 0xffcc, 0xffcd, 0xffce, 0xffcf, 
+/* D_ */ 0xffd0, 0xffd1, 0xffd2, 0xffd3, 0xffd4, 0xffd5, 0xffd6, 0xffd7, 0xffd8, 0xffd9, 0xffda, 0xffdb, 0xffdc, 0xffdd, 0xffde, 0xffdf, 
+/* E_ */ 0xffe0, 0xffe1, 0xffe2, 0xffe3, 0xffe4, 0xffe5, 0xffe6, 0xffe7, 0xffe8, 0xffe9, 0xffea, 0xffeb, 0xffec, 0xffed, 0xffee, 0xffef, 
+/* F_ */ 0xfff0, 0xfff1, 0xfff2, 0xfff3, 0xfff4, 0xfff5, 0xfff6, 0xfff7, 0xfff8, 0xfff9, 0xfffa, 0xfffb, 0xfffc, 0xfffd, 0xfffe, 0xffff
+ }
 };
 
 static PRUint32 Mirrored(PRUint32 u)
 {
-  switch (u & 0xFFFFFF00) {
-    // XOR the character with the bitmap in the conversion table to give the symmetric equivalent
-    case 0:
-      u ^= symmtable_00[u & 0xff];
-      break;
-    case 0x2000:
-      u ^= symmtable_20[u & 0xff];
-      break;
-    case 0x2200:
-      u ^= symmtable_22[u & 0xff];
-      break;
-    case 0x2300:
-      u ^= symmtable_23[u & 0xff];
-      break;
-    case 0x3000:
-      u ^= symmtable_30[u & 0xff];
-      break;
+  if (u < 0x10000) {
+    PRUint8 index = symmtable_index[(u & 0xFFFFFF00) >> 8];
+    if (index) {
+      return symmtable[index - 1] [u & 0xFF];
+    }
   }
   return u;
 }