diff mbox series

[FFmpeg-devel,1/3] avcodec/on2avcdata: Deduplicate symbol tables

Message ID 20201018064004.667741-1-andreas.rheinhardt@gmail.com
State Accepted
Commit fba8890628ece8a4c7ca479ea86d4ec309557384
Headers show
Series [FFmpeg-devel,1/3] avcodec/on2avcdata: Deduplicate symbol tables
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished

Commit Message

Andreas Rheinhardt Oct. 18, 2020, 6:40 a.m. UTC
Saves about 10KB.

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
---
 libavcodec/on2avcdata.c | 921 ++--------------------------------------
 1 file changed, 36 insertions(+), 885 deletions(-)

Comments

Andreas Rheinhardt Oct. 21, 2020, 5:43 a.m. UTC | #1
Andreas Rheinhardt:
> Saves about 10KB.
> 
> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
> ---
>  libavcodec/on2avcdata.c | 921 ++--------------------------------------
>  1 file changed, 36 insertions(+), 885 deletions(-)
> 

Will apply this patchset (with the exception of 4/5) later today unless
there are objections.

- Andreas
diff mbox series

Patch

diff --git a/libavcodec/on2avcdata.c b/libavcodec/on2avcdata.c
index ec983572e6..0aa49cee78 100644
--- a/libavcodec/on2avcdata.c
+++ b/libavcodec/on2avcdata.c
@@ -158,8 +158,8 @@  const uint8_t ff_on2avc_scale_diff_bits[ON2AVC_SCALE_DIFFS] = {
     21,
 };
 
-#define ON2AVC_CB1_CODES 41
-static const uint32_t on2avc_cb1_codes[ON2AVC_CB1_CODES] = {
+#define ON2AVC_CB1_2_CODES 41
+static const uint32_t on2avc_cb1_codes[ON2AVC_CB1_2_CODES] = {
     0x0000, 0x0022, 0x001C, 0x001B, 0x0024, 0x0030,
     0x0029, 0x0027, 0x0021, 0x002B, 0x002E, 0x0020,
     0x0026, 0x0033, 0x0031, 0x002C, 0x002A, 0x001E,
@@ -169,7 +169,7 @@  static const uint32_t on2avc_cb1_codes[ON2AVC_CB1_CODES] = {
     0x0023, 0x012F, 0x01F6, 0x01FE, 0x0095,
 };
 
-static const uint8_t on2avc_cb1_bits[ON2AVC_CB1_CODES] = {
+static const uint8_t on2avc_cb1_bits[ON2AVC_CB1_2_CODES] = {
     1,  6,  5,  5,  6,  6,
     6,  6,  6,  6,  6,  6,
     6,  6,  6,  6,  6,  5,
@@ -179,7 +179,7 @@  static const uint8_t on2avc_cb1_bits[ON2AVC_CB1_CODES] = {
     6,  9,  9,  9,  8,
 };
 
-static const uint16_t on2avc_cb1_syms[ON2AVC_CB1_CODES] = {
+static const uint16_t on2avc_cb1_2_syms[ON2AVC_CB1_2_CODES] = {
     0x0000, 0x0011, 0x001F, 0x00F1, 0x00FF, 0x0101,
     0x010F, 0x0110, 0x01F0, 0x0F01, 0x0F0F, 0x0F10,
     0x0FF0, 0x1001, 0x100F, 0x1010, 0x10F0, 0x1100,
@@ -189,8 +189,7 @@  static const uint16_t on2avc_cb1_syms[ON2AVC_CB1_CODES] = {
     0xFF00, 0xFF11, 0xFF1F, 0xFFF1, 0xFFFF,
 };
 
-#define ON2AVC_CB2_CODES 41
-static const uint32_t on2avc_cb2_codes[ON2AVC_CB2_CODES] = {
+static const uint32_t on2avc_cb2_codes[ON2AVC_CB1_2_CODES] = {
     0x0006, 0x0003, 0x001F, 0x001E, 0x0000, 0x0014,
     0x0009, 0x000E, 0x000D, 0x000C, 0x0015, 0x0008,
     0x0010, 0x000F, 0x0004, 0x0012, 0x0007, 0x0016,
@@ -200,7 +199,7 @@  static const uint32_t on2avc_cb2_codes[ON2AVC_CB2_CODES] = {
     0x0002, 0x0007, 0x005D, 0x005C, 0x0004,
 };
 
-static const uint8_t on2avc_cb2_bits[ON2AVC_CB2_CODES] = {
+static const uint8_t on2avc_cb2_bits[ON2AVC_CB1_2_CODES] = {
     3,  5,  5,  5,  5,  5,
     5,  5,  5,  5,  5,  5,
     5,  5,  5,  5,  5,  5,
@@ -210,18 +209,8 @@  static const uint8_t on2avc_cb2_bits[ON2AVC_CB2_CODES] = {
     5,  7,  7,  7,  7,
 };
 
-static const uint16_t on2avc_cb2_syms[ON2AVC_CB2_CODES] = {
-    0x0000, 0x0011, 0x001F, 0x00F1, 0x00FF, 0x0101,
-    0x010F, 0x0110, 0x01F0, 0x0F01, 0x0F0F, 0x0F10,
-    0x0FF0, 0x1001, 0x100F, 0x1010, 0x10F0, 0x1100,
-    0x1111, 0x111F, 0x11F1, 0x11FF, 0x1F00, 0x1F11,
-    0x1F1F, 0x1FF1, 0x1FFF, 0xF001, 0xF00F, 0xF010,
-    0xF0F0, 0xF100, 0xF111, 0xF11F, 0xF1F1, 0xF1FF,
-    0xFF00, 0xFF11, 0xFF1F, 0xFFF1, 0xFFFF,
-};
-
-#define ON2AVC_CB3_CODES 313
-static const uint32_t on2avc_cb3_codes[ON2AVC_CB3_CODES] = {
+#define ON2AVC_CB3_4_CODES 313
+static const uint32_t on2avc_cb3_codes[ON2AVC_CB3_4_CODES] = {
     0x00000, 0x00044, 0x00042, 0x00034, 0x0002E, 0x000CD,
     0x002DF, 0x0024A, 0x000CC, 0x0022E, 0x002D6, 0x00031,
     0x0003B, 0x00048, 0x00052, 0x00056, 0x001B8, 0x00160,
@@ -277,7 +266,7 @@  static const uint32_t on2avc_cb3_codes[ON2AVC_CB3_CODES] = {
     0x00115,
 };
 
-static const uint8_t on2avc_cb3_bits[ON2AVC_CB3_CODES] = {
+static const uint8_t on2avc_cb3_bits[ON2AVC_CB3_4_CODES] = {
      1,  7,  7,  6,  6,  8,
     10, 10,  8, 10, 10,  6,
      6,  7,  7,  7,  9,  9,
@@ -333,7 +322,7 @@  static const uint8_t on2avc_cb3_bits[ON2AVC_CB3_CODES] = {
      9,
 };
 
-static const uint16_t on2avc_cb3_syms[ON2AVC_CB3_CODES] = {
+static const uint16_t on2avc_cb3_4_syms[ON2AVC_CB3_4_CODES] = {
     0x0000, 0x0002, 0x000E, 0x0011, 0x001F, 0x0020,
     0x0022, 0x002E, 0x00E0, 0x00E2, 0x00EE, 0x00F1,
     0x00FF, 0x0101, 0x010F, 0x0110, 0x0112, 0x011E,
@@ -389,8 +378,7 @@  static const uint16_t on2avc_cb3_syms[ON2AVC_CB3_CODES] = {
     0xFFFF,
 };
 
-#define ON2AVC_CB4_CODES 313
-static const uint32_t on2avc_cb4_codes[ON2AVC_CB4_CODES] = {
+static const uint32_t on2avc_cb4_codes[ON2AVC_CB3_4_CODES] = {
     0x000A, 0x013B, 0x0127, 0x0004, 0x0015, 0x012C,
     0x065F, 0x08CD, 0x016A, 0x08E7, 0x06BA, 0x001B,
     0x001D, 0x0018, 0x000A, 0x0002, 0x00C0, 0x012B,
@@ -446,7 +434,7 @@  static const uint32_t on2avc_cb4_codes[ON2AVC_CB4_CODES] = {
     0x0026,
 };
 
-static const uint8_t on2avc_cb4_bits[ON2AVC_CB4_CODES] = {
+static const uint8_t on2avc_cb4_bits[ON2AVC_CB3_4_CODES] = {
      4,  9,  9,  6,  6,  9,
     11, 12,  9, 12, 11,  6,
      5,  6,  6,  6,  8,  9,
@@ -502,64 +490,8 @@  static const uint8_t on2avc_cb4_bits[ON2AVC_CB4_CODES] = {
      6,
 };
 
-static const uint16_t on2avc_cb4_syms[ON2AVC_CB4_CODES] = {
-    0x0000, 0x0002, 0x000E, 0x0011, 0x001F, 0x0020,
-    0x0022, 0x002E, 0x00E0, 0x00E2, 0x00EE, 0x00F1,
-    0x00FF, 0x0101, 0x010F, 0x0110, 0x0112, 0x011E,
-    0x0121, 0x012F, 0x01E1, 0x01EF, 0x01F0, 0x01F2,
-    0x01FE, 0x0200, 0x0202, 0x020E, 0x0211, 0x021F,
-    0x0220, 0x0222, 0x022E, 0x02E0, 0x02E2, 0x02EE,
-    0x02F1, 0x02FF, 0x0E00, 0x0E02, 0x0E0E, 0x0E11,
-    0x0E1F, 0x0E20, 0x0E22, 0x0E2E, 0x0EE0, 0x0EE2,
-    0x0EEE, 0x0EF1, 0x0EFF, 0x0F01, 0x0F0F, 0x0F10,
-    0x0F12, 0x0F1E, 0x0F21, 0x0F2F, 0x0FE1, 0x0FEF,
-    0x0FF0, 0x0FF2, 0x0FFE, 0x1001, 0x100F, 0x1010,
-    0x1012, 0x101E, 0x1021, 0x102F, 0x10E1, 0x10EF,
-    0x10F0, 0x10F2, 0x10FE, 0x1100, 0x1102, 0x110E,
-    0x1111, 0x111F, 0x1120, 0x1122, 0x112E, 0x11E0,
-    0x11E2, 0x11EE, 0x11F1, 0x11FF, 0x1201, 0x120F,
-    0x1210, 0x1212, 0x121E, 0x1221, 0x122F, 0x12E1,
-    0x12EF, 0x12F0, 0x12F2, 0x12FE, 0x1E01, 0x1E0F,
-    0x1E10, 0x1E12, 0x1E1E, 0x1E21, 0x1E2F, 0x1EE1,
-    0x1EEF, 0x1EF0, 0x1EF2, 0x1EFE, 0x1F00, 0x1F02,
-    0x1F0E, 0x1F11, 0x1F1F, 0x1F20, 0x1F22, 0x1F2E,
-    0x1FE0, 0x1FE2, 0x1FEE, 0x1FF1, 0x1FFF, 0x2000,
-    0x2002, 0x200E, 0x2011, 0x201F, 0x2020, 0x2022,
-    0x202E, 0x20E0, 0x20E2, 0x20EE, 0x20F1, 0x20FF,
-    0x2101, 0x210F, 0x2110, 0x2112, 0x211E, 0x2121,
-    0x212F, 0x21E1, 0x21EF, 0x21F0, 0x21F2, 0x21FE,
-    0x2200, 0x2202, 0x220E, 0x2211, 0x221F, 0x2220,
-    0x2222, 0x222E, 0x22E0, 0x22E2, 0x22EE, 0x22F1,
-    0x22FF, 0x2E00, 0x2E02, 0x2E0E, 0x2E11, 0x2E1F,
-    0x2E20, 0x2E22, 0x2E2E, 0x2EE0, 0x2EE2, 0x2EEE,
-    0x2EF1, 0x2EFF, 0x2F01, 0x2F0F, 0x2F10, 0x2F12,
-    0x2F1E, 0x2F21, 0x2F2F, 0x2FE1, 0x2FEF, 0x2FF0,
-    0x2FF2, 0x2FFE, 0xE000, 0xE002, 0xE00E, 0xE011,
-    0xE01F, 0xE020, 0xE022, 0xE02E, 0xE0E0, 0xE0E2,
-    0xE0EE, 0xE0F1, 0xE0FF, 0xE101, 0xE10F, 0xE110,
-    0xE112, 0xE11E, 0xE121, 0xE12F, 0xE1E1, 0xE1EF,
-    0xE1F0, 0xE1F2, 0xE1FE, 0xE200, 0xE202, 0xE20E,
-    0xE211, 0xE21F, 0xE220, 0xE222, 0xE22E, 0xE2E0,
-    0xE2E2, 0xE2EE, 0xE2F1, 0xE2FF, 0xEE00, 0xEE02,
-    0xEE0E, 0xEE11, 0xEE1F, 0xEE20, 0xEE22, 0xEE2E,
-    0xEEE0, 0xEEE2, 0xEEEE, 0xEEF1, 0xEEFF, 0xEF01,
-    0xEF0F, 0xEF10, 0xEF12, 0xEF1E, 0xEF21, 0xEF2F,
-    0xEFE1, 0xEFEF, 0xEFF0, 0xEFF2, 0xEFFE, 0xF001,
-    0xF00F, 0xF010, 0xF012, 0xF01E, 0xF021, 0xF02F,
-    0xF0E1, 0xF0EF, 0xF0F0, 0xF0F2, 0xF0FE, 0xF100,
-    0xF102, 0xF10E, 0xF111, 0xF11F, 0xF120, 0xF122,
-    0xF12E, 0xF1E0, 0xF1E2, 0xF1EE, 0xF1F1, 0xF1FF,
-    0xF201, 0xF20F, 0xF210, 0xF212, 0xF21E, 0xF221,
-    0xF22F, 0xF2E1, 0xF2EF, 0xF2F0, 0xF2F2, 0xF2FE,
-    0xFE01, 0xFE0F, 0xFE10, 0xFE12, 0xFE1E, 0xFE21,
-    0xFE2F, 0xFEE1, 0xFEEF, 0xFEF0, 0xFEF2, 0xFEFE,
-    0xFF00, 0xFF02, 0xFF0E, 0xFF11, 0xFF1F, 0xFF20,
-    0xFF22, 0xFF2E, 0xFFE0, 0xFFE2, 0xFFEE, 0xFFF1,
-    0xFFFF,
-};
-
-#define ON2AVC_CB5_CODES 1201
-static const uint32_t on2avc_cb5_codes[ON2AVC_CB5_CODES] = {
+#define ON2AVC_CB5_6_CODES 1201
+static const uint32_t on2avc_cb5_codes[ON2AVC_CB5_6_CODES] = {
     0x00000, 0x000D6, 0x000E2, 0x00044, 0x0009E, 0x0009A,
     0x0003A, 0x004E6, 0x00A29, 0x007FE, 0x0024A, 0x004EE,
     0x00496, 0x001EE, 0x001C8, 0x008FA, 0x0050F, 0x001EF,
@@ -763,7 +695,7 @@  static const uint32_t on2avc_cb5_codes[ON2AVC_CB5_CODES] = {
     0x0012C,
 };
 
-static const uint8_t on2avc_cb5_bits[ON2AVC_CB5_CODES] = {
+static const uint8_t on2avc_cb5_bits[ON2AVC_CB5_6_CODES] = {
      1,  8,  8,  7,  8,  8,
      6, 11, 12, 11, 10, 11,
     11,  9,  9, 12, 11,  9,
@@ -967,7 +899,7 @@  static const uint8_t on2avc_cb5_bits[ON2AVC_CB5_CODES] = {
      9,
 };
 
-static const uint16_t on2avc_cb5_syms[ON2AVC_CB5_CODES] = {
+static const uint16_t on2avc_cb5_6_syms[ON2AVC_CB5_6_CODES] = {
     0x0000, 0x0002, 0x000E, 0x0011, 0x0013, 0x001D,
     0x001F, 0x0020, 0x0022, 0x002E, 0x0031, 0x0033,
     0x003D, 0x003F, 0x00D1, 0x00D3, 0x00DD, 0x00DF,
@@ -1171,8 +1103,7 @@  static const uint16_t on2avc_cb5_syms[ON2AVC_CB5_CODES] = {
     0xFFFF,
 };
 
-#define ON2AVC_CB6_CODES 1201
-static const uint32_t on2avc_cb6_codes[ON2AVC_CB6_CODES] = {
+static const uint32_t on2avc_cb6_codes[ON2AVC_CB5_6_CODES] = {
     0x0018, 0x0088, 0x0082, 0x0024, 0x05B4, 0x08DF,
     0x0044, 0x0197, 0x01DE, 0x021F, 0x0D77, 0x0A72,
     0x7E77, 0x0B8B, 0x03F1, 0x0433, 0x073F, 0x1E5C,
@@ -1376,7 +1307,7 @@  static const uint32_t on2avc_cb6_codes[ON2AVC_CB6_CODES] = {
     0x003B,
 };
 
-static const uint8_t on2avc_cb6_bits[ON2AVC_CB6_CODES] = {
+static const uint8_t on2avc_cb6_bits[ON2AVC_CB5_6_CODES] = {
      7, 10, 10,  7, 12, 12,
      7, 10, 11, 11, 12, 15,
     17, 12, 13, 11, 15, 13,
@@ -1580,212 +1511,8 @@  static const uint8_t on2avc_cb6_bits[ON2AVC_CB6_CODES] = {
      7,
 };
 
-static const uint16_t on2avc_cb6_syms[ON2AVC_CB6_CODES] = {
-    0x0000, 0x0002, 0x000E, 0x0011, 0x0013, 0x001D,
-    0x001F, 0x0020, 0x0022, 0x002E, 0x0031, 0x0033,
-    0x003D, 0x003F, 0x00D1, 0x00D3, 0x00DD, 0x00DF,
-    0x00E0, 0x00E2, 0x00EE, 0x00F1, 0x00F3, 0x00FD,
-    0x00FF, 0x0101, 0x0103, 0x010D, 0x010F, 0x0110,
-    0x0112, 0x011E, 0x0121, 0x0123, 0x012D, 0x012F,
-    0x0130, 0x0132, 0x013E, 0x01D0, 0x01D2, 0x01DE,
-    0x01E1, 0x01E3, 0x01ED, 0x01EF, 0x01F0, 0x01F2,
-    0x01FE, 0x0200, 0x0202, 0x020E, 0x0211, 0x0213,
-    0x021D, 0x021F, 0x0220, 0x0222, 0x022E, 0x0231,
-    0x0233, 0x023D, 0x023F, 0x02D1, 0x02D3, 0x02DD,
-    0x02DF, 0x02E0, 0x02E2, 0x02EE, 0x02F1, 0x02F3,
-    0x02FD, 0x02FF, 0x0301, 0x0303, 0x030D, 0x030F,
-    0x0310, 0x0312, 0x031E, 0x0321, 0x0323, 0x032D,
-    0x032F, 0x0330, 0x0332, 0x033E, 0x03D0, 0x03D2,
-    0x03DE, 0x03E1, 0x03E3, 0x03ED, 0x03EF, 0x03F0,
-    0x03F2, 0x03FE, 0x0D01, 0x0D03, 0x0D0D, 0x0D0F,
-    0x0D10, 0x0D12, 0x0D1E, 0x0D21, 0x0D23, 0x0D2D,
-    0x0D2F, 0x0D30, 0x0D32, 0x0D3E, 0x0DD0, 0x0DD2,
-    0x0DDE, 0x0DE1, 0x0DE3, 0x0DED, 0x0DEF, 0x0DF0,
-    0x0DF2, 0x0DFE, 0x0E00, 0x0E02, 0x0E0E, 0x0E11,
-    0x0E13, 0x0E1D, 0x0E1F, 0x0E20, 0x0E22, 0x0E2E,
-    0x0E31, 0x0E33, 0x0E3D, 0x0E3F, 0x0ED1, 0x0ED3,
-    0x0EDD, 0x0EDF, 0x0EE0, 0x0EE2, 0x0EEE, 0x0EF1,
-    0x0EF3, 0x0EFD, 0x0EFF, 0x0F01, 0x0F03, 0x0F0D,
-    0x0F0F, 0x0F10, 0x0F12, 0x0F1E, 0x0F21, 0x0F23,
-    0x0F2D, 0x0F2F, 0x0F30, 0x0F32, 0x0F3E, 0x0FD0,
-    0x0FD2, 0x0FDE, 0x0FE1, 0x0FE3, 0x0FED, 0x0FEF,
-    0x0FF0, 0x0FF2, 0x0FFE, 0x1001, 0x1003, 0x100D,
-    0x100F, 0x1010, 0x1012, 0x101E, 0x1021, 0x1023,
-    0x102D, 0x102F, 0x1030, 0x1032, 0x103E, 0x10D0,
-    0x10D2, 0x10DE, 0x10E1, 0x10E3, 0x10ED, 0x10EF,
-    0x10F0, 0x10F2, 0x10FE, 0x1100, 0x1102, 0x110E,
-    0x1111, 0x1113, 0x111D, 0x111F, 0x1120, 0x1122,
-    0x112E, 0x1131, 0x1133, 0x113D, 0x113F, 0x11D1,
-    0x11D3, 0x11DD, 0x11DF, 0x11E0, 0x11E2, 0x11EE,
-    0x11F1, 0x11F3, 0x11FD, 0x11FF, 0x1201, 0x1203,
-    0x120D, 0x120F, 0x1210, 0x1212, 0x121E, 0x1221,
-    0x1223, 0x122D, 0x122F, 0x1230, 0x1232, 0x123E,
-    0x12D0, 0x12D2, 0x12DE, 0x12E1, 0x12E3, 0x12ED,
-    0x12EF, 0x12F0, 0x12F2, 0x12FE, 0x1300, 0x1302,
-    0x130E, 0x1311, 0x1313, 0x131D, 0x131F, 0x1320,
-    0x1322, 0x132E, 0x1331, 0x1333, 0x133D, 0x133F,
-    0x13D1, 0x13D3, 0x13DD, 0x13DF, 0x13E0, 0x13E2,
-    0x13EE, 0x13F1, 0x13F3, 0x13FD, 0x13FF, 0x1D00,
-    0x1D02, 0x1D0E, 0x1D11, 0x1D13, 0x1D1D, 0x1D1F,
-    0x1D20, 0x1D22, 0x1D2E, 0x1D31, 0x1D33, 0x1D3D,
-    0x1D3F, 0x1DD1, 0x1DD3, 0x1DDD, 0x1DDF, 0x1DE0,
-    0x1DE2, 0x1DEE, 0x1DF1, 0x1DF3, 0x1DFD, 0x1DFF,
-    0x1E01, 0x1E03, 0x1E0D, 0x1E0F, 0x1E10, 0x1E12,
-    0x1E1E, 0x1E21, 0x1E23, 0x1E2D, 0x1E2F, 0x1E30,
-    0x1E32, 0x1E3E, 0x1ED0, 0x1ED2, 0x1EDE, 0x1EE1,
-    0x1EE3, 0x1EED, 0x1EEF, 0x1EF0, 0x1EF2, 0x1EFE,
-    0x1F00, 0x1F02, 0x1F0E, 0x1F11, 0x1F13, 0x1F1D,
-    0x1F1F, 0x1F20, 0x1F22, 0x1F2E, 0x1F31, 0x1F33,
-    0x1F3D, 0x1F3F, 0x1FD1, 0x1FD3, 0x1FDD, 0x1FDF,
-    0x1FE0, 0x1FE2, 0x1FEE, 0x1FF1, 0x1FF3, 0x1FFD,
-    0x1FFF, 0x2000, 0x2002, 0x200E, 0x2011, 0x2013,
-    0x201D, 0x201F, 0x2020, 0x2022, 0x202E, 0x2031,
-    0x2033, 0x203D, 0x203F, 0x20D1, 0x20D3, 0x20DD,
-    0x20DF, 0x20E0, 0x20E2, 0x20EE, 0x20F1, 0x20F3,
-    0x20FD, 0x20FF, 0x2101, 0x2103, 0x210D, 0x210F,
-    0x2110, 0x2112, 0x211E, 0x2121, 0x2123, 0x212D,
-    0x212F, 0x2130, 0x2132, 0x213E, 0x21D0, 0x21D2,
-    0x21DE, 0x21E1, 0x21E3, 0x21ED, 0x21EF, 0x21F0,
-    0x21F2, 0x21FE, 0x2200, 0x2202, 0x220E, 0x2211,
-    0x2213, 0x221D, 0x221F, 0x2220, 0x2222, 0x222E,
-    0x2231, 0x2233, 0x223D, 0x223F, 0x22D1, 0x22D3,
-    0x22DD, 0x22DF, 0x22E0, 0x22E2, 0x22EE, 0x22F1,
-    0x22F3, 0x22FD, 0x22FF, 0x2301, 0x2303, 0x230D,
-    0x230F, 0x2310, 0x2312, 0x231E, 0x2321, 0x2323,
-    0x232D, 0x232F, 0x2330, 0x2332, 0x233E, 0x23D0,
-    0x23D2, 0x23DE, 0x23E1, 0x23E3, 0x23ED, 0x23EF,
-    0x23F0, 0x23F2, 0x23FE, 0x2D01, 0x2D03, 0x2D0D,
-    0x2D0F, 0x2D10, 0x2D12, 0x2D1E, 0x2D21, 0x2D23,
-    0x2D2D, 0x2D2F, 0x2D30, 0x2D32, 0x2D3E, 0x2DD0,
-    0x2DD2, 0x2DDE, 0x2DE1, 0x2DE3, 0x2DED, 0x2DEF,
-    0x2DF0, 0x2DF2, 0x2DFE, 0x2E00, 0x2E02, 0x2E0E,
-    0x2E11, 0x2E13, 0x2E1D, 0x2E1F, 0x2E20, 0x2E22,
-    0x2E2E, 0x2E31, 0x2E33, 0x2E3D, 0x2E3F, 0x2ED1,
-    0x2ED3, 0x2EDD, 0x2EDF, 0x2EE0, 0x2EE2, 0x2EEE,
-    0x2EF1, 0x2EF3, 0x2EFD, 0x2EFF, 0x2F01, 0x2F03,
-    0x2F0D, 0x2F0F, 0x2F10, 0x2F12, 0x2F1E, 0x2F21,
-    0x2F23, 0x2F2D, 0x2F2F, 0x2F30, 0x2F32, 0x2F3E,
-    0x2FD0, 0x2FD2, 0x2FDE, 0x2FE1, 0x2FE3, 0x2FED,
-    0x2FEF, 0x2FF0, 0x2FF2, 0x2FFE, 0x3001, 0x3003,
-    0x300D, 0x300F, 0x3010, 0x3012, 0x301E, 0x3021,
-    0x3023, 0x302D, 0x302F, 0x3030, 0x3032, 0x303E,
-    0x30D0, 0x30D2, 0x30DE, 0x30E1, 0x30E3, 0x30ED,
-    0x30EF, 0x30F0, 0x30F2, 0x30FE, 0x3100, 0x3102,
-    0x310E, 0x3111, 0x3113, 0x311D, 0x311F, 0x3120,
-    0x3122, 0x312E, 0x3131, 0x3133, 0x313D, 0x313F,
-    0x31D1, 0x31D3, 0x31DD, 0x31DF, 0x31E0, 0x31E2,
-    0x31EE, 0x31F1, 0x31F3, 0x31FD, 0x31FF, 0x3201,
-    0x3203, 0x320D, 0x320F, 0x3210, 0x3212, 0x321E,
-    0x3221, 0x3223, 0x322D, 0x322F, 0x3230, 0x3232,
-    0x323E, 0x32D0, 0x32D2, 0x32DE, 0x32E1, 0x32E3,
-    0x32ED, 0x32EF, 0x32F0, 0x32F2, 0x32FE, 0x3300,
-    0x3302, 0x330E, 0x3311, 0x3313, 0x331D, 0x331F,
-    0x3320, 0x3322, 0x332E, 0x3331, 0x3333, 0x333D,
-    0x333F, 0x33D1, 0x33D3, 0x33DD, 0x33DF, 0x33E0,
-    0x33E2, 0x33EE, 0x33F1, 0x33F3, 0x33FD, 0x33FF,
-    0x3D00, 0x3D02, 0x3D0E, 0x3D11, 0x3D13, 0x3D1D,
-    0x3D1F, 0x3D20, 0x3D22, 0x3D2E, 0x3D31, 0x3D33,
-    0x3D3D, 0x3D3F, 0x3DD1, 0x3DD3, 0x3DDD, 0x3DDF,
-    0x3DE0, 0x3DE2, 0x3DEE, 0x3DF1, 0x3DF3, 0x3DFD,
-    0x3DFF, 0x3E01, 0x3E03, 0x3E0D, 0x3E0F, 0x3E10,
-    0x3E12, 0x3E1E, 0x3E21, 0x3E23, 0x3E2D, 0x3E2F,
-    0x3E30, 0x3E32, 0x3E3E, 0x3ED0, 0x3ED2, 0x3EDE,
-    0x3EE1, 0x3EE3, 0x3EED, 0x3EEF, 0x3EF0, 0x3EF2,
-    0x3EFE, 0x3F00, 0x3F02, 0x3F0E, 0x3F11, 0x3F13,
-    0x3F1D, 0x3F1F, 0x3F20, 0x3F22, 0x3F2E, 0x3F31,
-    0x3F33, 0x3F3D, 0x3F3F, 0x3FD1, 0x3FD3, 0x3FDD,
-    0x3FDF, 0x3FE0, 0x3FE2, 0x3FEE, 0x3FF1, 0x3FF3,
-    0x3FFD, 0x3FFF, 0xD001, 0xD003, 0xD00D, 0xD00F,
-    0xD010, 0xD012, 0xD01E, 0xD021, 0xD023, 0xD02D,
-    0xD02F, 0xD030, 0xD032, 0xD03E, 0xD0D0, 0xD0D2,
-    0xD0DE, 0xD0E1, 0xD0E3, 0xD0ED, 0xD0EF, 0xD0F0,
-    0xD0F2, 0xD0FE, 0xD100, 0xD102, 0xD10E, 0xD111,
-    0xD113, 0xD11D, 0xD11F, 0xD120, 0xD122, 0xD12E,
-    0xD131, 0xD133, 0xD13D, 0xD13F, 0xD1D1, 0xD1D3,
-    0xD1DD, 0xD1DF, 0xD1E0, 0xD1E2, 0xD1EE, 0xD1F1,
-    0xD1F3, 0xD1FD, 0xD1FF, 0xD201, 0xD203, 0xD20D,
-    0xD20F, 0xD210, 0xD212, 0xD21E, 0xD221, 0xD223,
-    0xD22D, 0xD22F, 0xD230, 0xD232, 0xD23E, 0xD2D0,
-    0xD2D2, 0xD2DE, 0xD2E1, 0xD2E3, 0xD2ED, 0xD2EF,
-    0xD2F0, 0xD2F2, 0xD2FE, 0xD300, 0xD302, 0xD30E,
-    0xD311, 0xD313, 0xD31D, 0xD31F, 0xD320, 0xD322,
-    0xD32E, 0xD331, 0xD333, 0xD33D, 0xD33F, 0xD3D1,
-    0xD3D3, 0xD3DD, 0xD3DF, 0xD3E0, 0xD3E2, 0xD3EE,
-    0xD3F1, 0xD3F3, 0xD3FD, 0xD3FF, 0xDD00, 0xDD02,
-    0xDD0E, 0xDD11, 0xDD13, 0xDD1D, 0xDD1F, 0xDD20,
-    0xDD22, 0xDD2E, 0xDD31, 0xDD33, 0xDD3D, 0xDD3F,
-    0xDDD1, 0xDDD3, 0xDDDD, 0xDDDF, 0xDDE0, 0xDDE2,
-    0xDDEE, 0xDDF1, 0xDDF3, 0xDDFD, 0xDDFF, 0xDE01,
-    0xDE03, 0xDE0D, 0xDE0F, 0xDE10, 0xDE12, 0xDE1E,
-    0xDE21, 0xDE23, 0xDE2D, 0xDE2F, 0xDE30, 0xDE32,
-    0xDE3E, 0xDED0, 0xDED2, 0xDEDE, 0xDEE1, 0xDEE3,
-    0xDEED, 0xDEEF, 0xDEF0, 0xDEF2, 0xDEFE, 0xDF00,
-    0xDF02, 0xDF0E, 0xDF11, 0xDF13, 0xDF1D, 0xDF1F,
-    0xDF20, 0xDF22, 0xDF2E, 0xDF31, 0xDF33, 0xDF3D,
-    0xDF3F, 0xDFD1, 0xDFD3, 0xDFDD, 0xDFDF, 0xDFE0,
-    0xDFE2, 0xDFEE, 0xDFF1, 0xDFF3, 0xDFFD, 0xDFFF,
-    0xE000, 0xE002, 0xE00E, 0xE011, 0xE013, 0xE01D,
-    0xE01F, 0xE020, 0xE022, 0xE02E, 0xE031, 0xE033,
-    0xE03D, 0xE03F, 0xE0D1, 0xE0D3, 0xE0DD, 0xE0DF,
-    0xE0E0, 0xE0E2, 0xE0EE, 0xE0F1, 0xE0F3, 0xE0FD,
-    0xE0FF, 0xE101, 0xE103, 0xE10D, 0xE10F, 0xE110,
-    0xE112, 0xE11E, 0xE121, 0xE123, 0xE12D, 0xE12F,
-    0xE130, 0xE132, 0xE13E, 0xE1D0, 0xE1D2, 0xE1DE,
-    0xE1E1, 0xE1E3, 0xE1ED, 0xE1EF, 0xE1F0, 0xE1F2,
-    0xE1FE, 0xE200, 0xE202, 0xE20E, 0xE211, 0xE213,
-    0xE21D, 0xE21F, 0xE220, 0xE222, 0xE22E, 0xE231,
-    0xE233, 0xE23D, 0xE23F, 0xE2D1, 0xE2D3, 0xE2DD,
-    0xE2DF, 0xE2E0, 0xE2E2, 0xE2EE, 0xE2F1, 0xE2F3,
-    0xE2FD, 0xE2FF, 0xE301, 0xE303, 0xE30D, 0xE30F,
-    0xE310, 0xE312, 0xE31E, 0xE321, 0xE323, 0xE32D,
-    0xE32F, 0xE330, 0xE332, 0xE33E, 0xE3D0, 0xE3D2,
-    0xE3DE, 0xE3E1, 0xE3E3, 0xE3ED, 0xE3EF, 0xE3F0,
-    0xE3F2, 0xE3FE, 0xED01, 0xED03, 0xED0D, 0xED0F,
-    0xED10, 0xED12, 0xED1E, 0xED21, 0xED23, 0xED2D,
-    0xED2F, 0xED30, 0xED32, 0xED3E, 0xEDD0, 0xEDD2,
-    0xEDDE, 0xEDE1, 0xEDE3, 0xEDED, 0xEDEF, 0xEDF0,
-    0xEDF2, 0xEDFE, 0xEE00, 0xEE02, 0xEE0E, 0xEE11,
-    0xEE13, 0xEE1D, 0xEE1F, 0xEE20, 0xEE22, 0xEE2E,
-    0xEE31, 0xEE33, 0xEE3D, 0xEE3F, 0xEED1, 0xEED3,
-    0xEEDD, 0xEEDF, 0xEEE0, 0xEEE2, 0xEEEE, 0xEEF1,
-    0xEEF3, 0xEEFD, 0xEEFF, 0xEF01, 0xEF03, 0xEF0D,
-    0xEF0F, 0xEF10, 0xEF12, 0xEF1E, 0xEF21, 0xEF23,
-    0xEF2D, 0xEF2F, 0xEF30, 0xEF32, 0xEF3E, 0xEFD0,
-    0xEFD2, 0xEFDE, 0xEFE1, 0xEFE3, 0xEFED, 0xEFEF,
-    0xEFF0, 0xEFF2, 0xEFFE, 0xF001, 0xF003, 0xF00D,
-    0xF00F, 0xF010, 0xF012, 0xF01E, 0xF021, 0xF023,
-    0xF02D, 0xF02F, 0xF030, 0xF032, 0xF03E, 0xF0D0,
-    0xF0D2, 0xF0DE, 0xF0E1, 0xF0E3, 0xF0ED, 0xF0EF,
-    0xF0F0, 0xF0F2, 0xF0FE, 0xF100, 0xF102, 0xF10E,
-    0xF111, 0xF113, 0xF11D, 0xF11F, 0xF120, 0xF122,
-    0xF12E, 0xF131, 0xF133, 0xF13D, 0xF13F, 0xF1D1,
-    0xF1D3, 0xF1DD, 0xF1DF, 0xF1E0, 0xF1E2, 0xF1EE,
-    0xF1F1, 0xF1F3, 0xF1FD, 0xF1FF, 0xF201, 0xF203,
-    0xF20D, 0xF20F, 0xF210, 0xF212, 0xF21E, 0xF221,
-    0xF223, 0xF22D, 0xF22F, 0xF230, 0xF232, 0xF23E,
-    0xF2D0, 0xF2D2, 0xF2DE, 0xF2E1, 0xF2E3, 0xF2ED,
-    0xF2EF, 0xF2F0, 0xF2F2, 0xF2FE, 0xF300, 0xF302,
-    0xF30E, 0xF311, 0xF313, 0xF31D, 0xF31F, 0xF320,
-    0xF322, 0xF32E, 0xF331, 0xF333, 0xF33D, 0xF33F,
-    0xF3D1, 0xF3D3, 0xF3DD, 0xF3DF, 0xF3E0, 0xF3E2,
-    0xF3EE, 0xF3F1, 0xF3F3, 0xF3FD, 0xF3FF, 0xFD00,
-    0xFD02, 0xFD0E, 0xFD11, 0xFD13, 0xFD1D, 0xFD1F,
-    0xFD20, 0xFD22, 0xFD2E, 0xFD31, 0xFD33, 0xFD3D,
-    0xFD3F, 0xFDD1, 0xFDD3, 0xFDDD, 0xFDDF, 0xFDE0,
-    0xFDE2, 0xFDEE, 0xFDF1, 0xFDF3, 0xFDFD, 0xFDFF,
-    0xFE01, 0xFE03, 0xFE0D, 0xFE0F, 0xFE10, 0xFE12,
-    0xFE1E, 0xFE21, 0xFE23, 0xFE2D, 0xFE2F, 0xFE30,
-    0xFE32, 0xFE3E, 0xFED0, 0xFED2, 0xFEDE, 0xFEE1,
-    0xFEE3, 0xFEED, 0xFEEF, 0xFEF0, 0xFEF2, 0xFEFE,
-    0xFF00, 0xFF02, 0xFF0E, 0xFF11, 0xFF13, 0xFF1D,
-    0xFF1F, 0xFF20, 0xFF22, 0xFF2E, 0xFF31, 0xFF33,
-    0xFF3D, 0xFF3F, 0xFFD1, 0xFFD3, 0xFFDD, 0xFFDF,
-    0xFFE0, 0xFFE2, 0xFFEE, 0xFFF1, 0xFFF3, 0xFFFD,
-    0xFFFF,
-};
-
-#define ON2AVC_CB7_CODES 3281
-static const uint32_t on2avc_cb7_codes[ON2AVC_CB7_CODES] = {
+#define ON2AVC_CB7_8_CODES 3281
+static const uint32_t on2avc_cb7_codes[ON2AVC_CB7_8_CODES] = {
     0x00000, 0x000EA, 0x000E6, 0x000F4, 0x000F6, 0x00047,
     0x003E2, 0x004A7, 0x00044, 0x004D3, 0x0082A, 0x0026E,
     0x0020E, 0x008A5, 0x02603, 0x02895, 0x049B0, 0x02894,
@@ -2335,7 +2062,7 @@  static const uint32_t on2avc_cb7_codes[ON2AVC_CB7_CODES] = {
     0x00D2E, 0x001AC, 0x029F7, 0x03860, 0x00125,
 };
 
-static const uint8_t on2avc_cb7_bits[ON2AVC_CB7_CODES] = {
+static const uint8_t on2avc_cb7_bits[ON2AVC_CB7_8_CODES] = {
      1,  8,  8,  8,  8,  7,
     10, 11,  7, 11, 12, 10,
     10, 12, 14, 14, 15, 14,
@@ -2885,7 +2612,7 @@  static const uint8_t on2avc_cb7_bits[ON2AVC_CB7_CODES] = {
     12,  9, 14, 14,  9,
 };
 
-static const uint16_t on2avc_cb7_syms[ON2AVC_CB7_CODES] = {
+static const uint16_t on2avc_cb7_8_syms[ON2AVC_CB7_8_CODES] = {
     0x0000, 0x0002, 0x0004, 0x000C, 0x000E, 0x0011,
     0x0013, 0x001D, 0x001F, 0x0020, 0x0022, 0x0024,
     0x002C, 0x002E, 0x0031, 0x0033, 0x003D, 0x003F,
@@ -3435,8 +3162,7 @@  static const uint16_t on2avc_cb7_syms[ON2AVC_CB7_CODES] = {
     0xFFEE, 0xFFF1, 0xFFF3, 0xFFFD, 0xFFFF,
 };
 
-#define ON2AVC_CB8_CODES 3281
-static const uint32_t on2avc_cb8_codes[ON2AVC_CB8_CODES] = {
+static const uint32_t on2avc_cb8_codes[ON2AVC_CB7_8_CODES] = {
     0x028C, 0x05E6, 0xFAD9, 0x7DEF, 0x06CE, 0x004C,
     0x0178, 0x0A1D, 0x00AE, 0x046E, 0x03D5, 0x3F58,
     0x0EAA, 0x0233, 0x1A6A, 0x271F, 0x05CE, 0x0179,
@@ -3986,7 +3712,7 @@  static const uint32_t on2avc_cb8_codes[ON2AVC_CB8_CODES] = {
     0x00DF, 0x0042, 0x022E, 0x0710, 0x007E,
 };
 
-static const uint8_t on2avc_cb8_bits[ON2AVC_CB8_CODES] = {
+static const uint8_t on2avc_cb8_bits[ON2AVC_CB7_8_CODES] = {
     11, 11, 16, 15, 11,  9,
     13, 12,  9, 11, 11, 14,
     13, 12, 13, 14, 14, 13,
@@ -4536,558 +4262,8 @@  static const uint8_t on2avc_cb8_bits[ON2AVC_CB8_CODES] = {
     10,  9, 12, 11,  8,
 };
 
-static const uint16_t on2avc_cb8_syms[ON2AVC_CB8_CODES] = {
-    0x0000, 0x0002, 0x0004, 0x000C, 0x000E, 0x0011,
-    0x0013, 0x001D, 0x001F, 0x0020, 0x0022, 0x0024,
-    0x002C, 0x002E, 0x0031, 0x0033, 0x003D, 0x003F,
-    0x0040, 0x0042, 0x0044, 0x004C, 0x004E, 0x00C0,
-    0x00C2, 0x00C4, 0x00CC, 0x00CE, 0x00D1, 0x00D3,
-    0x00DD, 0x00DF, 0x00E0, 0x00E2, 0x00E4, 0x00EC,
-    0x00EE, 0x00F1, 0x00F3, 0x00FD, 0x00FF, 0x0101,
-    0x0103, 0x010D, 0x010F, 0x0110, 0x0112, 0x0114,
-    0x011C, 0x011E, 0x0121, 0x0123, 0x012D, 0x012F,
-    0x0130, 0x0132, 0x0134, 0x013C, 0x013E, 0x0141,
-    0x0143, 0x014D, 0x014F, 0x01C1, 0x01C3, 0x01CD,
-    0x01CF, 0x01D0, 0x01D2, 0x01D4, 0x01DC, 0x01DE,
-    0x01E1, 0x01E3, 0x01ED, 0x01EF, 0x01F0, 0x01F2,
-    0x01F4, 0x01FC, 0x01FE, 0x0200, 0x0202, 0x0204,
-    0x020C, 0x020E, 0x0211, 0x0213, 0x021D, 0x021F,
-    0x0220, 0x0222, 0x0224, 0x022C, 0x022E, 0x0231,
-    0x0233, 0x023D, 0x023F, 0x0240, 0x0242, 0x0244,
-    0x024C, 0x024E, 0x02C0, 0x02C2, 0x02C4, 0x02CC,
-    0x02CE, 0x02D1, 0x02D3, 0x02DD, 0x02DF, 0x02E0,
-    0x02E2, 0x02E4, 0x02EC, 0x02EE, 0x02F1, 0x02F3,
-    0x02FD, 0x02FF, 0x0301, 0x0303, 0x030D, 0x030F,
-    0x0310, 0x0312, 0x0314, 0x031C, 0x031E, 0x0321,
-    0x0323, 0x032D, 0x032F, 0x0330, 0x0332, 0x0334,
-    0x033C, 0x033E, 0x0341, 0x0343, 0x034D, 0x034F,
-    0x03C1, 0x03C3, 0x03CD, 0x03CF, 0x03D0, 0x03D2,
-    0x03D4, 0x03DC, 0x03DE, 0x03E1, 0x03E3, 0x03ED,
-    0x03EF, 0x03F0, 0x03F2, 0x03F4, 0x03FC, 0x03FE,
-    0x0400, 0x0402, 0x0404, 0x040C, 0x040E, 0x0411,
-    0x0413, 0x041D, 0x041F, 0x0420, 0x0422, 0x0424,
-    0x042C, 0x042E, 0x0431, 0x0433, 0x043D, 0x043F,
-    0x0440, 0x0442, 0x0444, 0x044C, 0x044E, 0x04C0,
-    0x04C2, 0x04C4, 0x04CC, 0x04CE, 0x04D1, 0x04D3,
-    0x04DD, 0x04DF, 0x04E0, 0x04E2, 0x04E4, 0x04EC,
-    0x04EE, 0x04F1, 0x04F3, 0x04FD, 0x04FF, 0x0C00,
-    0x0C02, 0x0C04, 0x0C0C, 0x0C0E, 0x0C11, 0x0C13,
-    0x0C1D, 0x0C1F, 0x0C20, 0x0C22, 0x0C24, 0x0C2C,
-    0x0C2E, 0x0C31, 0x0C33, 0x0C3D, 0x0C3F, 0x0C40,
-    0x0C42, 0x0C44, 0x0C4C, 0x0C4E, 0x0CC0, 0x0CC2,
-    0x0CC4, 0x0CCC, 0x0CCE, 0x0CD1, 0x0CD3, 0x0CDD,
-    0x0CDF, 0x0CE0, 0x0CE2, 0x0CE4, 0x0CEC, 0x0CEE,
-    0x0CF1, 0x0CF3, 0x0CFD, 0x0CFF, 0x0D01, 0x0D03,
-    0x0D0D, 0x0D0F, 0x0D10, 0x0D12, 0x0D14, 0x0D1C,
-    0x0D1E, 0x0D21, 0x0D23, 0x0D2D, 0x0D2F, 0x0D30,
-    0x0D32, 0x0D34, 0x0D3C, 0x0D3E, 0x0D41, 0x0D43,
-    0x0D4D, 0x0D4F, 0x0DC1, 0x0DC3, 0x0DCD, 0x0DCF,
-    0x0DD0, 0x0DD2, 0x0DD4, 0x0DDC, 0x0DDE, 0x0DE1,
-    0x0DE3, 0x0DED, 0x0DEF, 0x0DF0, 0x0DF2, 0x0DF4,
-    0x0DFC, 0x0DFE, 0x0E00, 0x0E02, 0x0E04, 0x0E0C,
-    0x0E0E, 0x0E11, 0x0E13, 0x0E1D, 0x0E1F, 0x0E20,
-    0x0E22, 0x0E24, 0x0E2C, 0x0E2E, 0x0E31, 0x0E33,
-    0x0E3D, 0x0E3F, 0x0E40, 0x0E42, 0x0E44, 0x0E4C,
-    0x0E4E, 0x0EC0, 0x0EC2, 0x0EC4, 0x0ECC, 0x0ECE,
-    0x0ED1, 0x0ED3, 0x0EDD, 0x0EDF, 0x0EE0, 0x0EE2,
-    0x0EE4, 0x0EEC, 0x0EEE, 0x0EF1, 0x0EF3, 0x0EFD,
-    0x0EFF, 0x0F01, 0x0F03, 0x0F0D, 0x0F0F, 0x0F10,
-    0x0F12, 0x0F14, 0x0F1C, 0x0F1E, 0x0F21, 0x0F23,
-    0x0F2D, 0x0F2F, 0x0F30, 0x0F32, 0x0F34, 0x0F3C,
-    0x0F3E, 0x0F41, 0x0F43, 0x0F4D, 0x0F4F, 0x0FC1,
-    0x0FC3, 0x0FCD, 0x0FCF, 0x0FD0, 0x0FD2, 0x0FD4,
-    0x0FDC, 0x0FDE, 0x0FE1, 0x0FE3, 0x0FED, 0x0FEF,
-    0x0FF0, 0x0FF2, 0x0FF4, 0x0FFC, 0x0FFE, 0x1001,
-    0x1003, 0x100D, 0x100F, 0x1010, 0x1012, 0x1014,
-    0x101C, 0x101E, 0x1021, 0x1023, 0x102D, 0x102F,
-    0x1030, 0x1032, 0x1034, 0x103C, 0x103E, 0x1041,
-    0x1043, 0x104D, 0x104F, 0x10C1, 0x10C3, 0x10CD,
-    0x10CF, 0x10D0, 0x10D2, 0x10D4, 0x10DC, 0x10DE,
-    0x10E1, 0x10E3, 0x10ED, 0x10EF, 0x10F0, 0x10F2,
-    0x10F4, 0x10FC, 0x10FE, 0x1100, 0x1102, 0x1104,
-    0x110C, 0x110E, 0x1111, 0x1113, 0x111D, 0x111F,
-    0x1120, 0x1122, 0x1124, 0x112C, 0x112E, 0x1131,
-    0x1133, 0x113D, 0x113F, 0x1140, 0x1142, 0x1144,
-    0x114C, 0x114E, 0x11C0, 0x11C2, 0x11C4, 0x11CC,
-    0x11CE, 0x11D1, 0x11D3, 0x11DD, 0x11DF, 0x11E0,
-    0x11E2, 0x11E4, 0x11EC, 0x11EE, 0x11F1, 0x11F3,
-    0x11FD, 0x11FF, 0x1201, 0x1203, 0x120D, 0x120F,
-    0x1210, 0x1212, 0x1214, 0x121C, 0x121E, 0x1221,
-    0x1223, 0x122D, 0x122F, 0x1230, 0x1232, 0x1234,
-    0x123C, 0x123E, 0x1241, 0x1243, 0x124D, 0x124F,
-    0x12C1, 0x12C3, 0x12CD, 0x12CF, 0x12D0, 0x12D2,
-    0x12D4, 0x12DC, 0x12DE, 0x12E1, 0x12E3, 0x12ED,
-    0x12EF, 0x12F0, 0x12F2, 0x12F4, 0x12FC, 0x12FE,
-    0x1300, 0x1302, 0x1304, 0x130C, 0x130E, 0x1311,
-    0x1313, 0x131D, 0x131F, 0x1320, 0x1322, 0x1324,
-    0x132C, 0x132E, 0x1331, 0x1333, 0x133D, 0x133F,
-    0x1340, 0x1342, 0x1344, 0x134C, 0x134E, 0x13C0,
-    0x13C2, 0x13C4, 0x13CC, 0x13CE, 0x13D1, 0x13D3,
-    0x13DD, 0x13DF, 0x13E0, 0x13E2, 0x13E4, 0x13EC,
-    0x13EE, 0x13F1, 0x13F3, 0x13FD, 0x13FF, 0x1401,
-    0x1403, 0x140D, 0x140F, 0x1410, 0x1412, 0x1414,
-    0x141C, 0x141E, 0x1421, 0x1423, 0x142D, 0x142F,
-    0x1430, 0x1432, 0x1434, 0x143C, 0x143E, 0x1441,
-    0x1443, 0x144D, 0x144F, 0x14C1, 0x14C3, 0x14CD,
-    0x14CF, 0x14D0, 0x14D2, 0x14D4, 0x14DC, 0x14DE,
-    0x14E1, 0x14E3, 0x14ED, 0x14EF, 0x14F0, 0x14F2,
-    0x14F4, 0x14FC, 0x14FE, 0x1C01, 0x1C03, 0x1C0D,
-    0x1C0F, 0x1C10, 0x1C12, 0x1C14, 0x1C1C, 0x1C1E,
-    0x1C21, 0x1C23, 0x1C2D, 0x1C2F, 0x1C30, 0x1C32,
-    0x1C34, 0x1C3C, 0x1C3E, 0x1C41, 0x1C43, 0x1C4D,
-    0x1C4F, 0x1CC1, 0x1CC3, 0x1CCD, 0x1CCF, 0x1CD0,
-    0x1CD2, 0x1CD4, 0x1CDC, 0x1CDE, 0x1CE1, 0x1CE3,
-    0x1CED, 0x1CEF, 0x1CF0, 0x1CF2, 0x1CF4, 0x1CFC,
-    0x1CFE, 0x1D00, 0x1D02, 0x1D04, 0x1D0C, 0x1D0E,
-    0x1D11, 0x1D13, 0x1D1D, 0x1D1F, 0x1D20, 0x1D22,
-    0x1D24, 0x1D2C, 0x1D2E, 0x1D31, 0x1D33, 0x1D3D,
-    0x1D3F, 0x1D40, 0x1D42, 0x1D44, 0x1D4C, 0x1D4E,
-    0x1DC0, 0x1DC2, 0x1DC4, 0x1DCC, 0x1DCE, 0x1DD1,
-    0x1DD3, 0x1DDD, 0x1DDF, 0x1DE0, 0x1DE2, 0x1DE4,
-    0x1DEC, 0x1DEE, 0x1DF1, 0x1DF3, 0x1DFD, 0x1DFF,
-    0x1E01, 0x1E03, 0x1E0D, 0x1E0F, 0x1E10, 0x1E12,
-    0x1E14, 0x1E1C, 0x1E1E, 0x1E21, 0x1E23, 0x1E2D,
-    0x1E2F, 0x1E30, 0x1E32, 0x1E34, 0x1E3C, 0x1E3E,
-    0x1E41, 0x1E43, 0x1E4D, 0x1E4F, 0x1EC1, 0x1EC3,
-    0x1ECD, 0x1ECF, 0x1ED0, 0x1ED2, 0x1ED4, 0x1EDC,
-    0x1EDE, 0x1EE1, 0x1EE3, 0x1EED, 0x1EEF, 0x1EF0,
-    0x1EF2, 0x1EF4, 0x1EFC, 0x1EFE, 0x1F00, 0x1F02,
-    0x1F04, 0x1F0C, 0x1F0E, 0x1F11, 0x1F13, 0x1F1D,
-    0x1F1F, 0x1F20, 0x1F22, 0x1F24, 0x1F2C, 0x1F2E,
-    0x1F31, 0x1F33, 0x1F3D, 0x1F3F, 0x1F40, 0x1F42,
-    0x1F44, 0x1F4C, 0x1F4E, 0x1FC0, 0x1FC2, 0x1FC4,
-    0x1FCC, 0x1FCE, 0x1FD1, 0x1FD3, 0x1FDD, 0x1FDF,
-    0x1FE0, 0x1FE2, 0x1FE4, 0x1FEC, 0x1FEE, 0x1FF1,
-    0x1FF3, 0x1FFD, 0x1FFF, 0x2000, 0x2002, 0x2004,
-    0x200C, 0x200E, 0x2011, 0x2013, 0x201D, 0x201F,
-    0x2020, 0x2022, 0x2024, 0x202C, 0x202E, 0x2031,
-    0x2033, 0x203D, 0x203F, 0x2040, 0x2042, 0x2044,
-    0x204C, 0x204E, 0x20C0, 0x20C2, 0x20C4, 0x20CC,
-    0x20CE, 0x20D1, 0x20D3, 0x20DD, 0x20DF, 0x20E0,
-    0x20E2, 0x20E4, 0x20EC, 0x20EE, 0x20F1, 0x20F3,
-    0x20FD, 0x20FF, 0x2101, 0x2103, 0x210D, 0x210F,
-    0x2110, 0x2112, 0x2114, 0x211C, 0x211E, 0x2121,
-    0x2123, 0x212D, 0x212F, 0x2130, 0x2132, 0x2134,
-    0x213C, 0x213E, 0x2141, 0x2143, 0x214D, 0x214F,
-    0x21C1, 0x21C3, 0x21CD, 0x21CF, 0x21D0, 0x21D2,
-    0x21D4, 0x21DC, 0x21DE, 0x21E1, 0x21E3, 0x21ED,
-    0x21EF, 0x21F0, 0x21F2, 0x21F4, 0x21FC, 0x21FE,
-    0x2200, 0x2202, 0x2204, 0x220C, 0x220E, 0x2211,
-    0x2213, 0x221D, 0x221F, 0x2220, 0x2222, 0x2224,
-    0x222C, 0x222E, 0x2231, 0x2233, 0x223D, 0x223F,
-    0x2240, 0x2242, 0x2244, 0x224C, 0x224E, 0x22C0,
-    0x22C2, 0x22C4, 0x22CC, 0x22CE, 0x22D1, 0x22D3,
-    0x22DD, 0x22DF, 0x22E0, 0x22E2, 0x22E4, 0x22EC,
-    0x22EE, 0x22F1, 0x22F3, 0x22FD, 0x22FF, 0x2301,
-    0x2303, 0x230D, 0x230F, 0x2310, 0x2312, 0x2314,
-    0x231C, 0x231E, 0x2321, 0x2323, 0x232D, 0x232F,
-    0x2330, 0x2332, 0x2334, 0x233C, 0x233E, 0x2341,
-    0x2343, 0x234D, 0x234F, 0x23C1, 0x23C3, 0x23CD,
-    0x23CF, 0x23D0, 0x23D2, 0x23D4, 0x23DC, 0x23DE,
-    0x23E1, 0x23E3, 0x23ED, 0x23EF, 0x23F0, 0x23F2,
-    0x23F4, 0x23FC, 0x23FE, 0x2400, 0x2402, 0x2404,
-    0x240C, 0x240E, 0x2411, 0x2413, 0x241D, 0x241F,
-    0x2420, 0x2422, 0x2424, 0x242C, 0x242E, 0x2431,
-    0x2433, 0x243D, 0x243F, 0x2440, 0x2442, 0x2444,
-    0x244C, 0x244E, 0x24C0, 0x24C2, 0x24C4, 0x24CC,
-    0x24CE, 0x24D1, 0x24D3, 0x24DD, 0x24DF, 0x24E0,
-    0x24E2, 0x24E4, 0x24EC, 0x24EE, 0x24F1, 0x24F3,
-    0x24FD, 0x24FF, 0x2C00, 0x2C02, 0x2C04, 0x2C0C,
-    0x2C0E, 0x2C11, 0x2C13, 0x2C1D, 0x2C1F, 0x2C20,
-    0x2C22, 0x2C24, 0x2C2C, 0x2C2E, 0x2C31, 0x2C33,
-    0x2C3D, 0x2C3F, 0x2C40, 0x2C42, 0x2C44, 0x2C4C,
-    0x2C4E, 0x2CC0, 0x2CC2, 0x2CC4, 0x2CCC, 0x2CCE,
-    0x2CD1, 0x2CD3, 0x2CDD, 0x2CDF, 0x2CE0, 0x2CE2,
-    0x2CE4, 0x2CEC, 0x2CEE, 0x2CF1, 0x2CF3, 0x2CFD,
-    0x2CFF, 0x2D01, 0x2D03, 0x2D0D, 0x2D0F, 0x2D10,
-    0x2D12, 0x2D14, 0x2D1C, 0x2D1E, 0x2D21, 0x2D23,
-    0x2D2D, 0x2D2F, 0x2D30, 0x2D32, 0x2D34, 0x2D3C,
-    0x2D3E, 0x2D41, 0x2D43, 0x2D4D, 0x2D4F, 0x2DC1,
-    0x2DC3, 0x2DCD, 0x2DCF, 0x2DD0, 0x2DD2, 0x2DD4,
-    0x2DDC, 0x2DDE, 0x2DE1, 0x2DE3, 0x2DED, 0x2DEF,
-    0x2DF0, 0x2DF2, 0x2DF4, 0x2DFC, 0x2DFE, 0x2E00,
-    0x2E02, 0x2E04, 0x2E0C, 0x2E0E, 0x2E11, 0x2E13,
-    0x2E1D, 0x2E1F, 0x2E20, 0x2E22, 0x2E24, 0x2E2C,
-    0x2E2E, 0x2E31, 0x2E33, 0x2E3D, 0x2E3F, 0x2E40,
-    0x2E42, 0x2E44, 0x2E4C, 0x2E4E, 0x2EC0, 0x2EC2,
-    0x2EC4, 0x2ECC, 0x2ECE, 0x2ED1, 0x2ED3, 0x2EDD,
-    0x2EDF, 0x2EE0, 0x2EE2, 0x2EE4, 0x2EEC, 0x2EEE,
-    0x2EF1, 0x2EF3, 0x2EFD, 0x2EFF, 0x2F01, 0x2F03,
-    0x2F0D, 0x2F0F, 0x2F10, 0x2F12, 0x2F14, 0x2F1C,
-    0x2F1E, 0x2F21, 0x2F23, 0x2F2D, 0x2F2F, 0x2F30,
-    0x2F32, 0x2F34, 0x2F3C, 0x2F3E, 0x2F41, 0x2F43,
-    0x2F4D, 0x2F4F, 0x2FC1, 0x2FC3, 0x2FCD, 0x2FCF,
-    0x2FD0, 0x2FD2, 0x2FD4, 0x2FDC, 0x2FDE, 0x2FE1,
-    0x2FE3, 0x2FED, 0x2FEF, 0x2FF0, 0x2FF2, 0x2FF4,
-    0x2FFC, 0x2FFE, 0x3001, 0x3003, 0x300D, 0x300F,
-    0x3010, 0x3012, 0x3014, 0x301C, 0x301E, 0x3021,
-    0x3023, 0x302D, 0x302F, 0x3030, 0x3032, 0x3034,
-    0x303C, 0x303E, 0x3041, 0x3043, 0x304D, 0x304F,
-    0x30C1, 0x30C3, 0x30CD, 0x30CF, 0x30D0, 0x30D2,
-    0x30D4, 0x30DC, 0x30DE, 0x30E1, 0x30E3, 0x30ED,
-    0x30EF, 0x30F0, 0x30F2, 0x30F4, 0x30FC, 0x30FE,
-    0x3100, 0x3102, 0x3104, 0x310C, 0x310E, 0x3111,
-    0x3113, 0x311D, 0x311F, 0x3120, 0x3122, 0x3124,
-    0x312C, 0x312E, 0x3131, 0x3133, 0x313D, 0x313F,
-    0x3140, 0x3142, 0x3144, 0x314C, 0x314E, 0x31C0,
-    0x31C2, 0x31C4, 0x31CC, 0x31CE, 0x31D1, 0x31D3,
-    0x31DD, 0x31DF, 0x31E0, 0x31E2, 0x31E4, 0x31EC,
-    0x31EE, 0x31F1, 0x31F3, 0x31FD, 0x31FF, 0x3201,
-    0x3203, 0x320D, 0x320F, 0x3210, 0x3212, 0x3214,
-    0x321C, 0x321E, 0x3221, 0x3223, 0x322D, 0x322F,
-    0x3230, 0x3232, 0x3234, 0x323C, 0x323E, 0x3241,
-    0x3243, 0x324D, 0x324F, 0x32C1, 0x32C3, 0x32CD,
-    0x32CF, 0x32D0, 0x32D2, 0x32D4, 0x32DC, 0x32DE,
-    0x32E1, 0x32E3, 0x32ED, 0x32EF, 0x32F0, 0x32F2,
-    0x32F4, 0x32FC, 0x32FE, 0x3300, 0x3302, 0x3304,
-    0x330C, 0x330E, 0x3311, 0x3313, 0x331D, 0x331F,
-    0x3320, 0x3322, 0x3324, 0x332C, 0x332E, 0x3331,
-    0x3333, 0x333D, 0x333F, 0x3340, 0x3342, 0x3344,
-    0x334C, 0x334E, 0x33C0, 0x33C2, 0x33C4, 0x33CC,
-    0x33CE, 0x33D1, 0x33D3, 0x33DD, 0x33DF, 0x33E0,
-    0x33E2, 0x33E4, 0x33EC, 0x33EE, 0x33F1, 0x33F3,
-    0x33FD, 0x33FF, 0x3401, 0x3403, 0x340D, 0x340F,
-    0x3410, 0x3412, 0x3414, 0x341C, 0x341E, 0x3421,
-    0x3423, 0x342D, 0x342F, 0x3430, 0x3432, 0x3434,
-    0x343C, 0x343E, 0x3441, 0x3443, 0x344D, 0x344F,
-    0x34C1, 0x34C3, 0x34CD, 0x34CF, 0x34D0, 0x34D2,
-    0x34D4, 0x34DC, 0x34DE, 0x34E1, 0x34E3, 0x34ED,
-    0x34EF, 0x34F0, 0x34F2, 0x34F4, 0x34FC, 0x34FE,
-    0x3C01, 0x3C03, 0x3C0D, 0x3C0F, 0x3C10, 0x3C12,
-    0x3C14, 0x3C1C, 0x3C1E, 0x3C21, 0x3C23, 0x3C2D,
-    0x3C2F, 0x3C30, 0x3C32, 0x3C34, 0x3C3C, 0x3C3E,
-    0x3C41, 0x3C43, 0x3C4D, 0x3C4F, 0x3CC1, 0x3CC3,
-    0x3CCD, 0x3CCF, 0x3CD0, 0x3CD2, 0x3CD4, 0x3CDC,
-    0x3CDE, 0x3CE1, 0x3CE3, 0x3CED, 0x3CEF, 0x3CF0,
-    0x3CF2, 0x3CF4, 0x3CFC, 0x3CFE, 0x3D00, 0x3D02,
-    0x3D04, 0x3D0C, 0x3D0E, 0x3D11, 0x3D13, 0x3D1D,
-    0x3D1F, 0x3D20, 0x3D22, 0x3D24, 0x3D2C, 0x3D2E,
-    0x3D31, 0x3D33, 0x3D3D, 0x3D3F, 0x3D40, 0x3D42,
-    0x3D44, 0x3D4C, 0x3D4E, 0x3DC0, 0x3DC2, 0x3DC4,
-    0x3DCC, 0x3DCE, 0x3DD1, 0x3DD3, 0x3DDD, 0x3DDF,
-    0x3DE0, 0x3DE2, 0x3DE4, 0x3DEC, 0x3DEE, 0x3DF1,
-    0x3DF3, 0x3DFD, 0x3DFF, 0x3E01, 0x3E03, 0x3E0D,
-    0x3E0F, 0x3E10, 0x3E12, 0x3E14, 0x3E1C, 0x3E1E,
-    0x3E21, 0x3E23, 0x3E2D, 0x3E2F, 0x3E30, 0x3E32,
-    0x3E34, 0x3E3C, 0x3E3E, 0x3E41, 0x3E43, 0x3E4D,
-    0x3E4F, 0x3EC1, 0x3EC3, 0x3ECD, 0x3ECF, 0x3ED0,
-    0x3ED2, 0x3ED4, 0x3EDC, 0x3EDE, 0x3EE1, 0x3EE3,
-    0x3EED, 0x3EEF, 0x3EF0, 0x3EF2, 0x3EF4, 0x3EFC,
-    0x3EFE, 0x3F00, 0x3F02, 0x3F04, 0x3F0C, 0x3F0E,
-    0x3F11, 0x3F13, 0x3F1D, 0x3F1F, 0x3F20, 0x3F22,
-    0x3F24, 0x3F2C, 0x3F2E, 0x3F31, 0x3F33, 0x3F3D,
-    0x3F3F, 0x3F40, 0x3F42, 0x3F44, 0x3F4C, 0x3F4E,
-    0x3FC0, 0x3FC2, 0x3FC4, 0x3FCC, 0x3FCE, 0x3FD1,
-    0x3FD3, 0x3FDD, 0x3FDF, 0x3FE0, 0x3FE2, 0x3FE4,
-    0x3FEC, 0x3FEE, 0x3FF1, 0x3FF3, 0x3FFD, 0x3FFF,
-    0x4000, 0x4002, 0x4004, 0x400C, 0x400E, 0x4011,
-    0x4013, 0x401D, 0x401F, 0x4020, 0x4022, 0x4024,
-    0x402C, 0x402E, 0x4031, 0x4033, 0x403D, 0x403F,
-    0x4040, 0x4042, 0x4044, 0x404C, 0x404E, 0x40C0,
-    0x40C2, 0x40C4, 0x40CC, 0x40CE, 0x40D1, 0x40D3,
-    0x40DD, 0x40DF, 0x40E0, 0x40E2, 0x40E4, 0x40EC,
-    0x40EE, 0x40F1, 0x40F3, 0x40FD, 0x40FF, 0x4101,
-    0x4103, 0x410D, 0x410F, 0x4110, 0x4112, 0x4114,
-    0x411C, 0x411E, 0x4121, 0x4123, 0x412D, 0x412F,
-    0x4130, 0x4132, 0x4134, 0x413C, 0x413E, 0x4141,
-    0x4143, 0x414D, 0x414F, 0x41C1, 0x41C3, 0x41CD,
-    0x41CF, 0x41D0, 0x41D2, 0x41D4, 0x41DC, 0x41DE,
-    0x41E1, 0x41E3, 0x41ED, 0x41EF, 0x41F0, 0x41F2,
-    0x41F4, 0x41FC, 0x41FE, 0x4200, 0x4202, 0x4204,
-    0x420C, 0x420E, 0x4211, 0x4213, 0x421D, 0x421F,
-    0x4220, 0x4222, 0x4224, 0x422C, 0x422E, 0x4231,
-    0x4233, 0x423D, 0x423F, 0x4240, 0x4242, 0x4244,
-    0x424C, 0x424E, 0x42C0, 0x42C2, 0x42C4, 0x42CC,
-    0x42CE, 0x42D1, 0x42D3, 0x42DD, 0x42DF, 0x42E0,
-    0x42E2, 0x42E4, 0x42EC, 0x42EE, 0x42F1, 0x42F3,
-    0x42FD, 0x42FF, 0x4301, 0x4303, 0x430D, 0x430F,
-    0x4310, 0x4312, 0x4314, 0x431C, 0x431E, 0x4321,
-    0x4323, 0x432D, 0x432F, 0x4330, 0x4332, 0x4334,
-    0x433C, 0x433E, 0x4341, 0x4343, 0x434D, 0x434F,
-    0x43C1, 0x43C3, 0x43CD, 0x43CF, 0x43D0, 0x43D2,
-    0x43D4, 0x43DC, 0x43DE, 0x43E1, 0x43E3, 0x43ED,
-    0x43EF, 0x43F0, 0x43F2, 0x43F4, 0x43FC, 0x43FE,
-    0x4400, 0x4402, 0x4404, 0x440C, 0x440E, 0x4411,
-    0x4413, 0x441D, 0x441F, 0x4420, 0x4422, 0x4424,
-    0x442C, 0x442E, 0x4431, 0x4433, 0x443D, 0x443F,
-    0x4440, 0x4442, 0x4444, 0x444C, 0x444E, 0x44C0,
-    0x44C2, 0x44C4, 0x44CC, 0x44CE, 0x44D1, 0x44D3,
-    0x44DD, 0x44DF, 0x44E0, 0x44E2, 0x44E4, 0x44EC,
-    0x44EE, 0x44F1, 0x44F3, 0x44FD, 0x44FF, 0x4C00,
-    0x4C02, 0x4C04, 0x4C0C, 0x4C0E, 0x4C11, 0x4C13,
-    0x4C1D, 0x4C1F, 0x4C20, 0x4C22, 0x4C24, 0x4C2C,
-    0x4C2E, 0x4C31, 0x4C33, 0x4C3D, 0x4C3F, 0x4C40,
-    0x4C42, 0x4C44, 0x4C4C, 0x4C4E, 0x4CC0, 0x4CC2,
-    0x4CC4, 0x4CCC, 0x4CCE, 0x4CD1, 0x4CD3, 0x4CDD,
-    0x4CDF, 0x4CE0, 0x4CE2, 0x4CE4, 0x4CEC, 0x4CEE,
-    0x4CF1, 0x4CF3, 0x4CFD, 0x4CFF, 0x4D01, 0x4D03,
-    0x4D0D, 0x4D0F, 0x4D10, 0x4D12, 0x4D14, 0x4D1C,
-    0x4D1E, 0x4D21, 0x4D23, 0x4D2D, 0x4D2F, 0x4D30,
-    0x4D32, 0x4D34, 0x4D3C, 0x4D3E, 0x4D41, 0x4D43,
-    0x4D4D, 0x4D4F, 0x4DC1, 0x4DC3, 0x4DCD, 0x4DCF,
-    0x4DD0, 0x4DD2, 0x4DD4, 0x4DDC, 0x4DDE, 0x4DE1,
-    0x4DE3, 0x4DED, 0x4DEF, 0x4DF0, 0x4DF2, 0x4DF4,
-    0x4DFC, 0x4DFE, 0x4E00, 0x4E02, 0x4E04, 0x4E0C,
-    0x4E0E, 0x4E11, 0x4E13, 0x4E1D, 0x4E1F, 0x4E20,
-    0x4E22, 0x4E24, 0x4E2C, 0x4E2E, 0x4E31, 0x4E33,
-    0x4E3D, 0x4E3F, 0x4E40, 0x4E42, 0x4E44, 0x4E4C,
-    0x4E4E, 0x4EC0, 0x4EC2, 0x4EC4, 0x4ECC, 0x4ECE,
-    0x4ED1, 0x4ED3, 0x4EDD, 0x4EDF, 0x4EE0, 0x4EE2,
-    0x4EE4, 0x4EEC, 0x4EEE, 0x4EF1, 0x4EF3, 0x4EFD,
-    0x4EFF, 0x4F01, 0x4F03, 0x4F0D, 0x4F0F, 0x4F10,
-    0x4F12, 0x4F14, 0x4F1C, 0x4F1E, 0x4F21, 0x4F23,
-    0x4F2D, 0x4F2F, 0x4F30, 0x4F32, 0x4F34, 0x4F3C,
-    0x4F3E, 0x4F41, 0x4F43, 0x4F4D, 0x4F4F, 0x4FC1,
-    0x4FC3, 0x4FCD, 0x4FCF, 0x4FD0, 0x4FD2, 0x4FD4,
-    0x4FDC, 0x4FDE, 0x4FE1, 0x4FE3, 0x4FED, 0x4FEF,
-    0x4FF0, 0x4FF2, 0x4FF4, 0x4FFC, 0x4FFE, 0xC000,
-    0xC002, 0xC004, 0xC00C, 0xC00E, 0xC011, 0xC013,
-    0xC01D, 0xC01F, 0xC020, 0xC022, 0xC024, 0xC02C,
-    0xC02E, 0xC031, 0xC033, 0xC03D, 0xC03F, 0xC040,
-    0xC042, 0xC044, 0xC04C, 0xC04E, 0xC0C0, 0xC0C2,
-    0xC0C4, 0xC0CC, 0xC0CE, 0xC0D1, 0xC0D3, 0xC0DD,
-    0xC0DF, 0xC0E0, 0xC0E2, 0xC0E4, 0xC0EC, 0xC0EE,
-    0xC0F1, 0xC0F3, 0xC0FD, 0xC0FF, 0xC101, 0xC103,
-    0xC10D, 0xC10F, 0xC110, 0xC112, 0xC114, 0xC11C,
-    0xC11E, 0xC121, 0xC123, 0xC12D, 0xC12F, 0xC130,
-    0xC132, 0xC134, 0xC13C, 0xC13E, 0xC141, 0xC143,
-    0xC14D, 0xC14F, 0xC1C1, 0xC1C3, 0xC1CD, 0xC1CF,
-    0xC1D0, 0xC1D2, 0xC1D4, 0xC1DC, 0xC1DE, 0xC1E1,
-    0xC1E3, 0xC1ED, 0xC1EF, 0xC1F0, 0xC1F2, 0xC1F4,
-    0xC1FC, 0xC1FE, 0xC200, 0xC202, 0xC204, 0xC20C,
-    0xC20E, 0xC211, 0xC213, 0xC21D, 0xC21F, 0xC220,
-    0xC222, 0xC224, 0xC22C, 0xC22E, 0xC231, 0xC233,
-    0xC23D, 0xC23F, 0xC240, 0xC242, 0xC244, 0xC24C,
-    0xC24E, 0xC2C0, 0xC2C2, 0xC2C4, 0xC2CC, 0xC2CE,
-    0xC2D1, 0xC2D3, 0xC2DD, 0xC2DF, 0xC2E0, 0xC2E2,
-    0xC2E4, 0xC2EC, 0xC2EE, 0xC2F1, 0xC2F3, 0xC2FD,
-    0xC2FF, 0xC301, 0xC303, 0xC30D, 0xC30F, 0xC310,
-    0xC312, 0xC314, 0xC31C, 0xC31E, 0xC321, 0xC323,
-    0xC32D, 0xC32F, 0xC330, 0xC332, 0xC334, 0xC33C,
-    0xC33E, 0xC341, 0xC343, 0xC34D, 0xC34F, 0xC3C1,
-    0xC3C3, 0xC3CD, 0xC3CF, 0xC3D0, 0xC3D2, 0xC3D4,
-    0xC3DC, 0xC3DE, 0xC3E1, 0xC3E3, 0xC3ED, 0xC3EF,
-    0xC3F0, 0xC3F2, 0xC3F4, 0xC3FC, 0xC3FE, 0xC400,
-    0xC402, 0xC404, 0xC40C, 0xC40E, 0xC411, 0xC413,
-    0xC41D, 0xC41F, 0xC420, 0xC422, 0xC424, 0xC42C,
-    0xC42E, 0xC431, 0xC433, 0xC43D, 0xC43F, 0xC440,
-    0xC442, 0xC444, 0xC44C, 0xC44E, 0xC4C0, 0xC4C2,
-    0xC4C4, 0xC4CC, 0xC4CE, 0xC4D1, 0xC4D3, 0xC4DD,
-    0xC4DF, 0xC4E0, 0xC4E2, 0xC4E4, 0xC4EC, 0xC4EE,
-    0xC4F1, 0xC4F3, 0xC4FD, 0xC4FF, 0xCC00, 0xCC02,
-    0xCC04, 0xCC0C, 0xCC0E, 0xCC11, 0xCC13, 0xCC1D,
-    0xCC1F, 0xCC20, 0xCC22, 0xCC24, 0xCC2C, 0xCC2E,
-    0xCC31, 0xCC33, 0xCC3D, 0xCC3F, 0xCC40, 0xCC42,
-    0xCC44, 0xCC4C, 0xCC4E, 0xCCC0, 0xCCC2, 0xCCC4,
-    0xCCCC, 0xCCCE, 0xCCD1, 0xCCD3, 0xCCDD, 0xCCDF,
-    0xCCE0, 0xCCE2, 0xCCE4, 0xCCEC, 0xCCEE, 0xCCF1,
-    0xCCF3, 0xCCFD, 0xCCFF, 0xCD01, 0xCD03, 0xCD0D,
-    0xCD0F, 0xCD10, 0xCD12, 0xCD14, 0xCD1C, 0xCD1E,
-    0xCD21, 0xCD23, 0xCD2D, 0xCD2F, 0xCD30, 0xCD32,
-    0xCD34, 0xCD3C, 0xCD3E, 0xCD41, 0xCD43, 0xCD4D,
-    0xCD4F, 0xCDC1, 0xCDC3, 0xCDCD, 0xCDCF, 0xCDD0,
-    0xCDD2, 0xCDD4, 0xCDDC, 0xCDDE, 0xCDE1, 0xCDE3,
-    0xCDED, 0xCDEF, 0xCDF0, 0xCDF2, 0xCDF4, 0xCDFC,
-    0xCDFE, 0xCE00, 0xCE02, 0xCE04, 0xCE0C, 0xCE0E,
-    0xCE11, 0xCE13, 0xCE1D, 0xCE1F, 0xCE20, 0xCE22,
-    0xCE24, 0xCE2C, 0xCE2E, 0xCE31, 0xCE33, 0xCE3D,
-    0xCE3F, 0xCE40, 0xCE42, 0xCE44, 0xCE4C, 0xCE4E,
-    0xCEC0, 0xCEC2, 0xCEC4, 0xCECC, 0xCECE, 0xCED1,
-    0xCED3, 0xCEDD, 0xCEDF, 0xCEE0, 0xCEE2, 0xCEE4,
-    0xCEEC, 0xCEEE, 0xCEF1, 0xCEF3, 0xCEFD, 0xCEFF,
-    0xCF01, 0xCF03, 0xCF0D, 0xCF0F, 0xCF10, 0xCF12,
-    0xCF14, 0xCF1C, 0xCF1E, 0xCF21, 0xCF23, 0xCF2D,
-    0xCF2F, 0xCF30, 0xCF32, 0xCF34, 0xCF3C, 0xCF3E,
-    0xCF41, 0xCF43, 0xCF4D, 0xCF4F, 0xCFC1, 0xCFC3,
-    0xCFCD, 0xCFCF, 0xCFD0, 0xCFD2, 0xCFD4, 0xCFDC,
-    0xCFDE, 0xCFE1, 0xCFE3, 0xCFED, 0xCFEF, 0xCFF0,
-    0xCFF2, 0xCFF4, 0xCFFC, 0xCFFE, 0xD001, 0xD003,
-    0xD00D, 0xD00F, 0xD010, 0xD012, 0xD014, 0xD01C,
-    0xD01E, 0xD021, 0xD023, 0xD02D, 0xD02F, 0xD030,
-    0xD032, 0xD034, 0xD03C, 0xD03E, 0xD041, 0xD043,
-    0xD04D, 0xD04F, 0xD0C1, 0xD0C3, 0xD0CD, 0xD0CF,
-    0xD0D0, 0xD0D2, 0xD0D4, 0xD0DC, 0xD0DE, 0xD0E1,
-    0xD0E3, 0xD0ED, 0xD0EF, 0xD0F0, 0xD0F2, 0xD0F4,
-    0xD0FC, 0xD0FE, 0xD100, 0xD102, 0xD104, 0xD10C,
-    0xD10E, 0xD111, 0xD113, 0xD11D, 0xD11F, 0xD120,
-    0xD122, 0xD124, 0xD12C, 0xD12E, 0xD131, 0xD133,
-    0xD13D, 0xD13F, 0xD140, 0xD142, 0xD144, 0xD14C,
-    0xD14E, 0xD1C0, 0xD1C2, 0xD1C4, 0xD1CC, 0xD1CE,
-    0xD1D1, 0xD1D3, 0xD1DD, 0xD1DF, 0xD1E0, 0xD1E2,
-    0xD1E4, 0xD1EC, 0xD1EE, 0xD1F1, 0xD1F3, 0xD1FD,
-    0xD1FF, 0xD201, 0xD203, 0xD20D, 0xD20F, 0xD210,
-    0xD212, 0xD214, 0xD21C, 0xD21E, 0xD221, 0xD223,
-    0xD22D, 0xD22F, 0xD230, 0xD232, 0xD234, 0xD23C,
-    0xD23E, 0xD241, 0xD243, 0xD24D, 0xD24F, 0xD2C1,
-    0xD2C3, 0xD2CD, 0xD2CF, 0xD2D0, 0xD2D2, 0xD2D4,
-    0xD2DC, 0xD2DE, 0xD2E1, 0xD2E3, 0xD2ED, 0xD2EF,
-    0xD2F0, 0xD2F2, 0xD2F4, 0xD2FC, 0xD2FE, 0xD300,
-    0xD302, 0xD304, 0xD30C, 0xD30E, 0xD311, 0xD313,
-    0xD31D, 0xD31F, 0xD320, 0xD322, 0xD324, 0xD32C,
-    0xD32E, 0xD331, 0xD333, 0xD33D, 0xD33F, 0xD340,
-    0xD342, 0xD344, 0xD34C, 0xD34E, 0xD3C0, 0xD3C2,
-    0xD3C4, 0xD3CC, 0xD3CE, 0xD3D1, 0xD3D3, 0xD3DD,
-    0xD3DF, 0xD3E0, 0xD3E2, 0xD3E4, 0xD3EC, 0xD3EE,
-    0xD3F1, 0xD3F3, 0xD3FD, 0xD3FF, 0xD401, 0xD403,
-    0xD40D, 0xD40F, 0xD410, 0xD412, 0xD414, 0xD41C,
-    0xD41E, 0xD421, 0xD423, 0xD42D, 0xD42F, 0xD430,
-    0xD432, 0xD434, 0xD43C, 0xD43E, 0xD441, 0xD443,
-    0xD44D, 0xD44F, 0xD4C1, 0xD4C3, 0xD4CD, 0xD4CF,
-    0xD4D0, 0xD4D2, 0xD4D4, 0xD4DC, 0xD4DE, 0xD4E1,
-    0xD4E3, 0xD4ED, 0xD4EF, 0xD4F0, 0xD4F2, 0xD4F4,
-    0xD4FC, 0xD4FE, 0xDC01, 0xDC03, 0xDC0D, 0xDC0F,
-    0xDC10, 0xDC12, 0xDC14, 0xDC1C, 0xDC1E, 0xDC21,
-    0xDC23, 0xDC2D, 0xDC2F, 0xDC30, 0xDC32, 0xDC34,
-    0xDC3C, 0xDC3E, 0xDC41, 0xDC43, 0xDC4D, 0xDC4F,
-    0xDCC1, 0xDCC3, 0xDCCD, 0xDCCF, 0xDCD0, 0xDCD2,
-    0xDCD4, 0xDCDC, 0xDCDE, 0xDCE1, 0xDCE3, 0xDCED,
-    0xDCEF, 0xDCF0, 0xDCF2, 0xDCF4, 0xDCFC, 0xDCFE,
-    0xDD00, 0xDD02, 0xDD04, 0xDD0C, 0xDD0E, 0xDD11,
-    0xDD13, 0xDD1D, 0xDD1F, 0xDD20, 0xDD22, 0xDD24,
-    0xDD2C, 0xDD2E, 0xDD31, 0xDD33, 0xDD3D, 0xDD3F,
-    0xDD40, 0xDD42, 0xDD44, 0xDD4C, 0xDD4E, 0xDDC0,
-    0xDDC2, 0xDDC4, 0xDDCC, 0xDDCE, 0xDDD1, 0xDDD3,
-    0xDDDD, 0xDDDF, 0xDDE0, 0xDDE2, 0xDDE4, 0xDDEC,
-    0xDDEE, 0xDDF1, 0xDDF3, 0xDDFD, 0xDDFF, 0xDE01,
-    0xDE03, 0xDE0D, 0xDE0F, 0xDE10, 0xDE12, 0xDE14,
-    0xDE1C, 0xDE1E, 0xDE21, 0xDE23, 0xDE2D, 0xDE2F,
-    0xDE30, 0xDE32, 0xDE34, 0xDE3C, 0xDE3E, 0xDE41,
-    0xDE43, 0xDE4D, 0xDE4F, 0xDEC1, 0xDEC3, 0xDECD,
-    0xDECF, 0xDED0, 0xDED2, 0xDED4, 0xDEDC, 0xDEDE,
-    0xDEE1, 0xDEE3, 0xDEED, 0xDEEF, 0xDEF0, 0xDEF2,
-    0xDEF4, 0xDEFC, 0xDEFE, 0xDF00, 0xDF02, 0xDF04,
-    0xDF0C, 0xDF0E, 0xDF11, 0xDF13, 0xDF1D, 0xDF1F,
-    0xDF20, 0xDF22, 0xDF24, 0xDF2C, 0xDF2E, 0xDF31,
-    0xDF33, 0xDF3D, 0xDF3F, 0xDF40, 0xDF42, 0xDF44,
-    0xDF4C, 0xDF4E, 0xDFC0, 0xDFC2, 0xDFC4, 0xDFCC,
-    0xDFCE, 0xDFD1, 0xDFD3, 0xDFDD, 0xDFDF, 0xDFE0,
-    0xDFE2, 0xDFE4, 0xDFEC, 0xDFEE, 0xDFF1, 0xDFF3,
-    0xDFFD, 0xDFFF, 0xE000, 0xE002, 0xE004, 0xE00C,
-    0xE00E, 0xE011, 0xE013, 0xE01D, 0xE01F, 0xE020,
-    0xE022, 0xE024, 0xE02C, 0xE02E, 0xE031, 0xE033,
-    0xE03D, 0xE03F, 0xE040, 0xE042, 0xE044, 0xE04C,
-    0xE04E, 0xE0C0, 0xE0C2, 0xE0C4, 0xE0CC, 0xE0CE,
-    0xE0D1, 0xE0D3, 0xE0DD, 0xE0DF, 0xE0E0, 0xE0E2,
-    0xE0E4, 0xE0EC, 0xE0EE, 0xE0F1, 0xE0F3, 0xE0FD,
-    0xE0FF, 0xE101, 0xE103, 0xE10D, 0xE10F, 0xE110,
-    0xE112, 0xE114, 0xE11C, 0xE11E, 0xE121, 0xE123,
-    0xE12D, 0xE12F, 0xE130, 0xE132, 0xE134, 0xE13C,
-    0xE13E, 0xE141, 0xE143, 0xE14D, 0xE14F, 0xE1C1,
-    0xE1C3, 0xE1CD, 0xE1CF, 0xE1D0, 0xE1D2, 0xE1D4,
-    0xE1DC, 0xE1DE, 0xE1E1, 0xE1E3, 0xE1ED, 0xE1EF,
-    0xE1F0, 0xE1F2, 0xE1F4, 0xE1FC, 0xE1FE, 0xE200,
-    0xE202, 0xE204, 0xE20C, 0xE20E, 0xE211, 0xE213,
-    0xE21D, 0xE21F, 0xE220, 0xE222, 0xE224, 0xE22C,
-    0xE22E, 0xE231, 0xE233, 0xE23D, 0xE23F, 0xE240,
-    0xE242, 0xE244, 0xE24C, 0xE24E, 0xE2C0, 0xE2C2,
-    0xE2C4, 0xE2CC, 0xE2CE, 0xE2D1, 0xE2D3, 0xE2DD,
-    0xE2DF, 0xE2E0, 0xE2E2, 0xE2E4, 0xE2EC, 0xE2EE,
-    0xE2F1, 0xE2F3, 0xE2FD, 0xE2FF, 0xE301, 0xE303,
-    0xE30D, 0xE30F, 0xE310, 0xE312, 0xE314, 0xE31C,
-    0xE31E, 0xE321, 0xE323, 0xE32D, 0xE32F, 0xE330,
-    0xE332, 0xE334, 0xE33C, 0xE33E, 0xE341, 0xE343,
-    0xE34D, 0xE34F, 0xE3C1, 0xE3C3, 0xE3CD, 0xE3CF,
-    0xE3D0, 0xE3D2, 0xE3D4, 0xE3DC, 0xE3DE, 0xE3E1,
-    0xE3E3, 0xE3ED, 0xE3EF, 0xE3F0, 0xE3F2, 0xE3F4,
-    0xE3FC, 0xE3FE, 0xE400, 0xE402, 0xE404, 0xE40C,
-    0xE40E, 0xE411, 0xE413, 0xE41D, 0xE41F, 0xE420,
-    0xE422, 0xE424, 0xE42C, 0xE42E, 0xE431, 0xE433,
-    0xE43D, 0xE43F, 0xE440, 0xE442, 0xE444, 0xE44C,
-    0xE44E, 0xE4C0, 0xE4C2, 0xE4C4, 0xE4CC, 0xE4CE,
-    0xE4D1, 0xE4D3, 0xE4DD, 0xE4DF, 0xE4E0, 0xE4E2,
-    0xE4E4, 0xE4EC, 0xE4EE, 0xE4F1, 0xE4F3, 0xE4FD,
-    0xE4FF, 0xEC00, 0xEC02, 0xEC04, 0xEC0C, 0xEC0E,
-    0xEC11, 0xEC13, 0xEC1D, 0xEC1F, 0xEC20, 0xEC22,
-    0xEC24, 0xEC2C, 0xEC2E, 0xEC31, 0xEC33, 0xEC3D,
-    0xEC3F, 0xEC40, 0xEC42, 0xEC44, 0xEC4C, 0xEC4E,
-    0xECC0, 0xECC2, 0xECC4, 0xECCC, 0xECCE, 0xECD1,
-    0xECD3, 0xECDD, 0xECDF, 0xECE0, 0xECE2, 0xECE4,
-    0xECEC, 0xECEE, 0xECF1, 0xECF3, 0xECFD, 0xECFF,
-    0xED01, 0xED03, 0xED0D, 0xED0F, 0xED10, 0xED12,
-    0xED14, 0xED1C, 0xED1E, 0xED21, 0xED23, 0xED2D,
-    0xED2F, 0xED30, 0xED32, 0xED34, 0xED3C, 0xED3E,
-    0xED41, 0xED43, 0xED4D, 0xED4F, 0xEDC1, 0xEDC3,
-    0xEDCD, 0xEDCF, 0xEDD0, 0xEDD2, 0xEDD4, 0xEDDC,
-    0xEDDE, 0xEDE1, 0xEDE3, 0xEDED, 0xEDEF, 0xEDF0,
-    0xEDF2, 0xEDF4, 0xEDFC, 0xEDFE, 0xEE00, 0xEE02,
-    0xEE04, 0xEE0C, 0xEE0E, 0xEE11, 0xEE13, 0xEE1D,
-    0xEE1F, 0xEE20, 0xEE22, 0xEE24, 0xEE2C, 0xEE2E,
-    0xEE31, 0xEE33, 0xEE3D, 0xEE3F, 0xEE40, 0xEE42,
-    0xEE44, 0xEE4C, 0xEE4E, 0xEEC0, 0xEEC2, 0xEEC4,
-    0xEECC, 0xEECE, 0xEED1, 0xEED3, 0xEEDD, 0xEEDF,
-    0xEEE0, 0xEEE2, 0xEEE4, 0xEEEC, 0xEEEE, 0xEEF1,
-    0xEEF3, 0xEEFD, 0xEEFF, 0xEF01, 0xEF03, 0xEF0D,
-    0xEF0F, 0xEF10, 0xEF12, 0xEF14, 0xEF1C, 0xEF1E,
-    0xEF21, 0xEF23, 0xEF2D, 0xEF2F, 0xEF30, 0xEF32,
-    0xEF34, 0xEF3C, 0xEF3E, 0xEF41, 0xEF43, 0xEF4D,
-    0xEF4F, 0xEFC1, 0xEFC3, 0xEFCD, 0xEFCF, 0xEFD0,
-    0xEFD2, 0xEFD4, 0xEFDC, 0xEFDE, 0xEFE1, 0xEFE3,
-    0xEFED, 0xEFEF, 0xEFF0, 0xEFF2, 0xEFF4, 0xEFFC,
-    0xEFFE, 0xF001, 0xF003, 0xF00D, 0xF00F, 0xF010,
-    0xF012, 0xF014, 0xF01C, 0xF01E, 0xF021, 0xF023,
-    0xF02D, 0xF02F, 0xF030, 0xF032, 0xF034, 0xF03C,
-    0xF03E, 0xF041, 0xF043, 0xF04D, 0xF04F, 0xF0C1,
-    0xF0C3, 0xF0CD, 0xF0CF, 0xF0D0, 0xF0D2, 0xF0D4,
-    0xF0DC, 0xF0DE, 0xF0E1, 0xF0E3, 0xF0ED, 0xF0EF,
-    0xF0F0, 0xF0F2, 0xF0F4, 0xF0FC, 0xF0FE, 0xF100,
-    0xF102, 0xF104, 0xF10C, 0xF10E, 0xF111, 0xF113,
-    0xF11D, 0xF11F, 0xF120, 0xF122, 0xF124, 0xF12C,
-    0xF12E, 0xF131, 0xF133, 0xF13D, 0xF13F, 0xF140,
-    0xF142, 0xF144, 0xF14C, 0xF14E, 0xF1C0, 0xF1C2,
-    0xF1C4, 0xF1CC, 0xF1CE, 0xF1D1, 0xF1D3, 0xF1DD,
-    0xF1DF, 0xF1E0, 0xF1E2, 0xF1E4, 0xF1EC, 0xF1EE,
-    0xF1F1, 0xF1F3, 0xF1FD, 0xF1FF, 0xF201, 0xF203,
-    0xF20D, 0xF20F, 0xF210, 0xF212, 0xF214, 0xF21C,
-    0xF21E, 0xF221, 0xF223, 0xF22D, 0xF22F, 0xF230,
-    0xF232, 0xF234, 0xF23C, 0xF23E, 0xF241, 0xF243,
-    0xF24D, 0xF24F, 0xF2C1, 0xF2C3, 0xF2CD, 0xF2CF,
-    0xF2D0, 0xF2D2, 0xF2D4, 0xF2DC, 0xF2DE, 0xF2E1,
-    0xF2E3, 0xF2ED, 0xF2EF, 0xF2F0, 0xF2F2, 0xF2F4,
-    0xF2FC, 0xF2FE, 0xF300, 0xF302, 0xF304, 0xF30C,
-    0xF30E, 0xF311, 0xF313, 0xF31D, 0xF31F, 0xF320,
-    0xF322, 0xF324, 0xF32C, 0xF32E, 0xF331, 0xF333,
-    0xF33D, 0xF33F, 0xF340, 0xF342, 0xF344, 0xF34C,
-    0xF34E, 0xF3C0, 0xF3C2, 0xF3C4, 0xF3CC, 0xF3CE,
-    0xF3D1, 0xF3D3, 0xF3DD, 0xF3DF, 0xF3E0, 0xF3E2,
-    0xF3E4, 0xF3EC, 0xF3EE, 0xF3F1, 0xF3F3, 0xF3FD,
-    0xF3FF, 0xF401, 0xF403, 0xF40D, 0xF40F, 0xF410,
-    0xF412, 0xF414, 0xF41C, 0xF41E, 0xF421, 0xF423,
-    0xF42D, 0xF42F, 0xF430, 0xF432, 0xF434, 0xF43C,
-    0xF43E, 0xF441, 0xF443, 0xF44D, 0xF44F, 0xF4C1,
-    0xF4C3, 0xF4CD, 0xF4CF, 0xF4D0, 0xF4D2, 0xF4D4,
-    0xF4DC, 0xF4DE, 0xF4E1, 0xF4E3, 0xF4ED, 0xF4EF,
-    0xF4F0, 0xF4F2, 0xF4F4, 0xF4FC, 0xF4FE, 0xFC01,
-    0xFC03, 0xFC0D, 0xFC0F, 0xFC10, 0xFC12, 0xFC14,
-    0xFC1C, 0xFC1E, 0xFC21, 0xFC23, 0xFC2D, 0xFC2F,
-    0xFC30, 0xFC32, 0xFC34, 0xFC3C, 0xFC3E, 0xFC41,
-    0xFC43, 0xFC4D, 0xFC4F, 0xFCC1, 0xFCC3, 0xFCCD,
-    0xFCCF, 0xFCD0, 0xFCD2, 0xFCD4, 0xFCDC, 0xFCDE,
-    0xFCE1, 0xFCE3, 0xFCED, 0xFCEF, 0xFCF0, 0xFCF2,
-    0xFCF4, 0xFCFC, 0xFCFE, 0xFD00, 0xFD02, 0xFD04,
-    0xFD0C, 0xFD0E, 0xFD11, 0xFD13, 0xFD1D, 0xFD1F,
-    0xFD20, 0xFD22, 0xFD24, 0xFD2C, 0xFD2E, 0xFD31,
-    0xFD33, 0xFD3D, 0xFD3F, 0xFD40, 0xFD42, 0xFD44,
-    0xFD4C, 0xFD4E, 0xFDC0, 0xFDC2, 0xFDC4, 0xFDCC,
-    0xFDCE, 0xFDD1, 0xFDD3, 0xFDDD, 0xFDDF, 0xFDE0,
-    0xFDE2, 0xFDE4, 0xFDEC, 0xFDEE, 0xFDF1, 0xFDF3,
-    0xFDFD, 0xFDFF, 0xFE01, 0xFE03, 0xFE0D, 0xFE0F,
-    0xFE10, 0xFE12, 0xFE14, 0xFE1C, 0xFE1E, 0xFE21,
-    0xFE23, 0xFE2D, 0xFE2F, 0xFE30, 0xFE32, 0xFE34,
-    0xFE3C, 0xFE3E, 0xFE41, 0xFE43, 0xFE4D, 0xFE4F,
-    0xFEC1, 0xFEC3, 0xFECD, 0xFECF, 0xFED0, 0xFED2,
-    0xFED4, 0xFEDC, 0xFEDE, 0xFEE1, 0xFEE3, 0xFEED,
-    0xFEEF, 0xFEF0, 0xFEF2, 0xFEF4, 0xFEFC, 0xFEFE,
-    0xFF00, 0xFF02, 0xFF04, 0xFF0C, 0xFF0E, 0xFF11,
-    0xFF13, 0xFF1D, 0xFF1F, 0xFF20, 0xFF22, 0xFF24,
-    0xFF2C, 0xFF2E, 0xFF31, 0xFF33, 0xFF3D, 0xFF3F,
-    0xFF40, 0xFF42, 0xFF44, 0xFF4C, 0xFF4E, 0xFFC0,
-    0xFFC2, 0xFFC4, 0xFFCC, 0xFFCE, 0xFFD1, 0xFFD3,
-    0xFFDD, 0xFFDF, 0xFFE0, 0xFFE2, 0xFFE4, 0xFFEC,
-    0xFFEE, 0xFFF1, 0xFFF3, 0xFFFD, 0xFFFF,
-};
-
-#define ON2AVC_CB9_CODES 121
-static const uint16_t on2avc_cb9_codes[ON2AVC_CB9_CODES] = {
+#define ON2AVC_CB9_10_CODES 121
+static const uint16_t on2avc_cb9_codes[ON2AVC_CB9_10_CODES] = {
     0x0000, 0x000F, 0x0098, 0x026E, 0x045C, 0x00A6,
     0x00AC, 0x045D, 0x027E, 0x009A, 0x0012, 0x000E,
     0x001A, 0x00DE, 0x022C, 0x053E, 0x00A2, 0x009E,
@@ -5111,7 +4287,7 @@  static const uint16_t on2avc_cb9_codes[ON2AVC_CB9_CODES] = {
     0x0019,
 };
 
-static const uint8_t on2avc_cb9_bits[ON2AVC_CB9_CODES] = {
+static const uint8_t on2avc_cb9_bits[ON2AVC_CB9_10_CODES] = {
      1,  4,  8, 10, 11,  8,
      8, 11, 10,  8,  5,  4,
      5,  8, 10, 11,  8,  8,
@@ -5135,7 +4311,7 @@  static const uint8_t on2avc_cb9_bits[ON2AVC_CB9_CODES] = {
      5,
 };
 
-static const uint16_t on2avc_cb9_syms[ON2AVC_CB9_CODES] = {
+static const uint16_t on2avc_cb9_10_syms[ON2AVC_CB9_10_CODES] = {
     0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005,
     0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF, 0x0100,
     0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x01FB,
@@ -5159,8 +4335,7 @@  static const uint16_t on2avc_cb9_syms[ON2AVC_CB9_CODES] = {
     0xFFFF,
 };
 
-#define ON2AVC_CB10_CODES 121
-static const uint16_t on2avc_cb10_codes[ON2AVC_CB10_CODES] = {
+static const uint16_t on2avc_cb10_codes[ON2AVC_CB9_10_CODES] = {
     0x002E, 0x001A, 0x003C, 0x001F, 0x006E, 0x002E,
     0x00AE, 0x006F, 0x002A, 0x003E, 0x0014, 0x0016,
     0x0002, 0x000E, 0x004E, 0x00F7, 0x0042, 0x0027,
@@ -5184,7 +4359,7 @@  static const uint16_t on2avc_cb10_codes[ON2AVC_CB10_CODES] = {
     0x000C,
 };
 
-static const uint8_t on2avc_cb10_bits[ON2AVC_CB10_CODES] = {
+static const uint8_t on2avc_cb10_bits[ON2AVC_CB9_10_CODES] = {
     6,  5,  6,  8,  9,  8,
     8,  9,  8,  6,  5,  5,
     5,  6,  7,  8,  7,  7,
@@ -5208,30 +4383,6 @@  static const uint8_t on2avc_cb10_bits[ON2AVC_CB10_CODES] = {
     5,
 };
 
-static const uint16_t on2avc_cb10_syms[ON2AVC_CB10_CODES] = {
-    0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005,
-    0x00FB, 0x00FC, 0x00FD, 0x00FE, 0x00FF, 0x0100,
-    0x0101, 0x0102, 0x0103, 0x0104, 0x0105, 0x01FB,
-    0x01FC, 0x01FD, 0x01FE, 0x01FF, 0x0200, 0x0201,
-    0x0202, 0x0203, 0x0204, 0x0205, 0x02FB, 0x02FC,
-    0x02FD, 0x02FE, 0x02FF, 0x0300, 0x0301, 0x0302,
-    0x0303, 0x0304, 0x0305, 0x03FB, 0x03FC, 0x03FD,
-    0x03FE, 0x03FF, 0x0400, 0x0401, 0x0402, 0x0403,
-    0x0404, 0x0405, 0x04FB, 0x04FC, 0x04FD, 0x04FE,
-    0x04FF, 0x0500, 0x0501, 0x0502, 0x0503, 0x0504,
-    0x0505, 0x05FB, 0x05FC, 0x05FD, 0x05FE, 0x05FF,
-    0xFB00, 0xFB01, 0xFB02, 0xFB03, 0xFB04, 0xFB05,
-    0xFBFB, 0xFBFC, 0xFBFD, 0xFBFE, 0xFBFF, 0xFC00,
-    0xFC01, 0xFC02, 0xFC03, 0xFC04, 0xFC05, 0xFCFB,
-    0xFCFC, 0xFCFD, 0xFCFE, 0xFCFF, 0xFD00, 0xFD01,
-    0xFD02, 0xFD03, 0xFD04, 0xFD05, 0xFDFB, 0xFDFC,
-    0xFDFD, 0xFDFE, 0xFDFF, 0xFE00, 0xFE01, 0xFE02,
-    0xFE03, 0xFE04, 0xFE05, 0xFEFB, 0xFEFC, 0xFEFD,
-    0xFEFE, 0xFEFF, 0xFF00, 0xFF01, 0xFF02, 0xFF03,
-    0xFF04, 0xFF05, 0xFFFB, 0xFFFC, 0xFFFD, 0xFFFE,
-    0xFFFF,
-};
-
 #define ON2AVC_CB11_CODES 225
 static const uint16_t on2avc_cb11_codes[ON2AVC_CB11_CODES] = {
     0x0000, 0x000E, 0x0056, 0x00CD, 0x0173, 0x0232,
@@ -6856,13 +6007,13 @@  const uint8_t * const ff_on2avc_quad_cb_bits[] = {
 };
 
 const uint16_t * const ff_on2avc_quad_cb_syms[] = {
-    on2avc_cb1_syms, on2avc_cb2_syms, on2avc_cb3_syms, on2avc_cb4_syms,
-    on2avc_cb5_syms, on2avc_cb6_syms, on2avc_cb7_syms, on2avc_cb8_syms
+    on2avc_cb1_2_syms, on2avc_cb1_2_syms, on2avc_cb3_4_syms, on2avc_cb3_4_syms,
+    on2avc_cb5_6_syms, on2avc_cb5_6_syms, on2avc_cb7_8_syms, on2avc_cb7_8_syms
 };
 
 const int ff_on2avc_quad_cb_elems[] = {
-    ON2AVC_CB1_CODES, ON2AVC_CB2_CODES, ON2AVC_CB3_CODES, ON2AVC_CB4_CODES,
-    ON2AVC_CB5_CODES, ON2AVC_CB6_CODES, ON2AVC_CB7_CODES, ON2AVC_CB8_CODES,
+    ON2AVC_CB1_2_CODES, ON2AVC_CB1_2_CODES, ON2AVC_CB3_4_CODES, ON2AVC_CB3_4_CODES,
+    ON2AVC_CB5_6_CODES, ON2AVC_CB5_6_CODES, ON2AVC_CB7_8_CODES, ON2AVC_CB7_8_CODES,
 };
 
 const uint16_t * const ff_on2avc_pair_cb_codes[] = {
@@ -6876,12 +6027,12 @@  const uint8_t * const ff_on2avc_pair_cb_bits[] = {
 };
 
 const uint16_t * const ff_on2avc_pair_cb_syms[] = {
-    on2avc_cb9_syms,  on2avc_cb10_syms, on2avc_cb11_syms, on2avc_cb12_syms,
+    on2avc_cb9_10_syms, on2avc_cb9_10_syms, on2avc_cb11_syms, on2avc_cb12_syms,
     on2avc_cb13_syms, on2avc_cb14_syms, on2avc_cb15_syms
 };
 
 const int ff_on2avc_pair_cb_elems[] = {
-    ON2AVC_CB9_CODES,  ON2AVC_CB10_CODES, ON2AVC_CB11_CODES, ON2AVC_CB12_CODES,
+    ON2AVC_CB9_10_CODES, ON2AVC_CB9_10_CODES, ON2AVC_CB11_CODES, ON2AVC_CB12_CODES,
     ON2AVC_CB13_CODES, ON2AVC_CB14_CODES, ON2AVC_CB15_CODES,
 };