Rollup merge of #62641 - cuviper:unicode-12.1, r=matklad
Regenerate character tables for Unicode 12.1
This commit is contained in:
Mazdak Farrokhzad
GitHub
commit
21caaba2bc
4 changed files with 772 additions and 741 deletions
|
|
@ -111,17 +111,17 @@ def compress_normal(normal):
|
|||
return compressed
|
||||
|
||||
def print_singletons(uppers, lowers, uppersname, lowersname):
|
||||
print("const {}: &'static [(u8, u8)] = &[".format(uppersname))
|
||||
print("const {}: &[(u8, u8)] = &[".format(uppersname))
|
||||
for u, c in uppers:
|
||||
print(" ({:#04x}, {}),".format(u, c))
|
||||
print("];")
|
||||
print("const {}: &'static [u8] = &[".format(lowersname))
|
||||
print("const {}: &[u8] = &[".format(lowersname))
|
||||
for i in range(0, len(lowers), 8):
|
||||
print(" {}".format(" ".join("{:#04x},".format(l) for l in lowers[i:i+8])))
|
||||
print("];")
|
||||
|
||||
def print_normal(normal, normalname):
|
||||
print("const {}: &'static [u8] = &[".format(normalname))
|
||||
print("const {}: &[u8] = &[".format(normalname))
|
||||
for v in normal:
|
||||
print(" {}".format(" ".join("{:#04x},".format(i) for i in v)))
|
||||
print("];")
|
||||
|
|
|
|||
|
|
@ -82,7 +82,7 @@ const SINGLETONS0U: &[(u8, u8)] = &[
|
|||
(0x0b, 25),
|
||||
(0x0c, 20),
|
||||
(0x0d, 18),
|
||||
(0x0e, 22),
|
||||
(0x0e, 13),
|
||||
(0x0f, 4),
|
||||
(0x10, 3),
|
||||
(0x12, 18),
|
||||
|
|
@ -96,13 +96,14 @@ const SINGLETONS0U: &[(u8, u8)] = &[
|
|||
(0x1d, 1),
|
||||
(0x1f, 22),
|
||||
(0x20, 3),
|
||||
(0x2b, 6),
|
||||
(0x2b, 4),
|
||||
(0x2c, 2),
|
||||
(0x2d, 11),
|
||||
(0x2e, 1),
|
||||
(0x30, 3),
|
||||
(0x31, 2),
|
||||
(0x32, 2),
|
||||
(0x32, 1),
|
||||
(0xa7, 2),
|
||||
(0xa9, 2),
|
||||
(0xaa, 4),
|
||||
(0xab, 8),
|
||||
|
|
@ -130,27 +131,26 @@ const SINGLETONS0L: &[u8] = &[
|
|||
0xbb, 0xc5, 0xc9, 0xdf, 0xe4, 0xe5, 0xf0, 0x04,
|
||||
0x0d, 0x11, 0x45, 0x49, 0x64, 0x65, 0x80, 0x81,
|
||||
0x84, 0xb2, 0xbc, 0xbe, 0xbf, 0xd5, 0xd7, 0xf0,
|
||||
0xf1, 0x83, 0x85, 0x86, 0x89, 0x8b, 0x8c, 0x98,
|
||||
0xa0, 0xa4, 0xa6, 0xa8, 0xa9, 0xac, 0xba, 0xbe,
|
||||
0xbf, 0xc5, 0xc7, 0xce, 0xcf, 0xda, 0xdb, 0x48,
|
||||
0x98, 0xbd, 0xcd, 0xc6, 0xce, 0xcf, 0x49, 0x4e,
|
||||
0x4f, 0x57, 0x59, 0x5e, 0x5f, 0x89, 0x8e, 0x8f,
|
||||
0xb1, 0xb6, 0xb7, 0xbf, 0xc1, 0xc6, 0xc7, 0xd7,
|
||||
0x11, 0x16, 0x17, 0x5b, 0x5c, 0xf6, 0xf7, 0xfe,
|
||||
0xff, 0x80, 0x0d, 0x6d, 0x71, 0xde, 0xdf, 0x0e,
|
||||
0x0f, 0x1f, 0x6e, 0x6f, 0x1c, 0x1d, 0x5f, 0x7d,
|
||||
0x7e, 0xae, 0xaf, 0xbb, 0xbc, 0xfa, 0x16, 0x17,
|
||||
0x1e, 0x1f, 0x46, 0x47, 0x4e, 0x4f, 0x58, 0x5a,
|
||||
0x5c, 0x5e, 0x7e, 0x7f, 0xb5, 0xc5, 0xd4, 0xd5,
|
||||
0xdc, 0xf0, 0xf1, 0xf5, 0x72, 0x73, 0x8f, 0x74,
|
||||
0x75, 0x96, 0x97, 0xc9, 0xff, 0x2f, 0x5f, 0x26,
|
||||
0x2e, 0x2f, 0xa7, 0xaf, 0xb7, 0xbf, 0xc7, 0xcf,
|
||||
0xd7, 0xdf, 0x9a, 0x40, 0x97, 0x98, 0x30, 0x8f,
|
||||
0x1f, 0xff, 0xce, 0xff, 0x4e, 0x4f, 0x5a, 0x5b,
|
||||
0x07, 0x08, 0x0f, 0x10, 0x27, 0x2f, 0xee, 0xef,
|
||||
0x6e, 0x6f, 0x37, 0x3d, 0x3f, 0x42, 0x45, 0x90,
|
||||
0x91, 0xfe, 0xff, 0x53, 0x67, 0x75, 0xc8, 0xc9,
|
||||
0xd0, 0xd1, 0xd8, 0xd9, 0xe7, 0xfe, 0xff,
|
||||
0xf1, 0x83, 0x85, 0x8b, 0xa4, 0xa6, 0xbe, 0xbf,
|
||||
0xc5, 0xc7, 0xce, 0xcf, 0xda, 0xdb, 0x48, 0x98,
|
||||
0xbd, 0xcd, 0xc6, 0xce, 0xcf, 0x49, 0x4e, 0x4f,
|
||||
0x57, 0x59, 0x5e, 0x5f, 0x89, 0x8e, 0x8f, 0xb1,
|
||||
0xb6, 0xb7, 0xbf, 0xc1, 0xc6, 0xc7, 0xd7, 0x11,
|
||||
0x16, 0x17, 0x5b, 0x5c, 0xf6, 0xf7, 0xfe, 0xff,
|
||||
0x80, 0x0d, 0x6d, 0x71, 0xde, 0xdf, 0x0e, 0x0f,
|
||||
0x1f, 0x6e, 0x6f, 0x1c, 0x1d, 0x5f, 0x7d, 0x7e,
|
||||
0xae, 0xaf, 0xbb, 0xbc, 0xfa, 0x16, 0x17, 0x1e,
|
||||
0x1f, 0x46, 0x47, 0x4e, 0x4f, 0x58, 0x5a, 0x5c,
|
||||
0x5e, 0x7e, 0x7f, 0xb5, 0xc5, 0xd4, 0xd5, 0xdc,
|
||||
0xf0, 0xf1, 0xf5, 0x72, 0x73, 0x8f, 0x74, 0x75,
|
||||
0x96, 0x97, 0x2f, 0x5f, 0x26, 0x2e, 0x2f, 0xa7,
|
||||
0xaf, 0xb7, 0xbf, 0xc7, 0xcf, 0xd7, 0xdf, 0x9a,
|
||||
0x40, 0x97, 0x98, 0x30, 0x8f, 0x1f, 0xc0, 0xc1,
|
||||
0xce, 0xff, 0x4e, 0x4f, 0x5a, 0x5b, 0x07, 0x08,
|
||||
0x0f, 0x10, 0x27, 0x2f, 0xee, 0xef, 0x6e, 0x6f,
|
||||
0x37, 0x3d, 0x3f, 0x42, 0x45, 0x90, 0x91, 0xfe,
|
||||
0xff, 0x53, 0x67, 0x75, 0xc8, 0xc9, 0xd0, 0xd1,
|
||||
0xd8, 0xd9, 0xe7, 0xfe, 0xff,
|
||||
];
|
||||
const SINGLETONS1U: &[(u8, u8)] = &[
|
||||
(0x00, 6),
|
||||
|
|
@ -168,7 +168,7 @@ const SINGLETONS1U: &[(u8, u8)] = &[
|
|||
(0x14, 2),
|
||||
(0x15, 2),
|
||||
(0x17, 2),
|
||||
(0x1a, 2),
|
||||
(0x19, 4),
|
||||
(0x1c, 5),
|
||||
(0x1d, 8),
|
||||
(0x24, 1),
|
||||
|
|
@ -182,10 +182,12 @@ const SINGLETONS1U: &[(u8, u8)] = &[
|
|||
(0xd7, 2),
|
||||
(0xda, 1),
|
||||
(0xe0, 5),
|
||||
(0xe1, 2),
|
||||
(0xe8, 2),
|
||||
(0xee, 32),
|
||||
(0xf0, 4),
|
||||
(0xf9, 4),
|
||||
(0xf9, 6),
|
||||
(0xfa, 2),
|
||||
];
|
||||
const SINGLETONS1L: &[u8] = &[
|
||||
0x0c, 0x27, 0x3b, 0x3e, 0x4e, 0x4f, 0x8f, 0x9e,
|
||||
|
|
@ -195,19 +197,20 @@ const SINGLETONS1L: &[u8] = &[
|
|||
0x12, 0x87, 0x89, 0x8e, 0x9e, 0x04, 0x0d, 0x0e,
|
||||
0x11, 0x12, 0x29, 0x31, 0x34, 0x3a, 0x45, 0x46,
|
||||
0x49, 0x4a, 0x4e, 0x4f, 0x64, 0x65, 0x5a, 0x5c,
|
||||
0xb6, 0xb7, 0x1b, 0x1c, 0x84, 0x85, 0x09, 0x37,
|
||||
0x90, 0x91, 0xa8, 0x07, 0x0a, 0x3b, 0x3e, 0x66,
|
||||
0x69, 0x8f, 0x92, 0x6f, 0x5f, 0xee, 0xef, 0x5a,
|
||||
0x62, 0x9a, 0x9b, 0x27, 0x28, 0x55, 0x9d, 0xa0,
|
||||
0xa1, 0xa3, 0xa4, 0xa7, 0xa8, 0xad, 0xba, 0xbc,
|
||||
0xc4, 0x06, 0x0b, 0x0c, 0x15, 0x1d, 0x3a, 0x3f,
|
||||
0x45, 0x51, 0xa6, 0xa7, 0xcc, 0xcd, 0xa0, 0x07,
|
||||
0x19, 0x1a, 0x22, 0x25, 0xc5, 0xc6, 0x04, 0x20,
|
||||
0x23, 0x25, 0x26, 0x28, 0x33, 0x38, 0x3a, 0x48,
|
||||
0x4a, 0x4c, 0x50, 0x53, 0x55, 0x56, 0x58, 0x5a,
|
||||
0x5c, 0x5e, 0x60, 0x63, 0x65, 0x66, 0x6b, 0x73,
|
||||
0x78, 0x7d, 0x7f, 0x8a, 0xa4, 0xaa, 0xaf, 0xb0,
|
||||
0xc0, 0xd0, 0x3f, 0x71, 0x72, 0x7b,
|
||||
0xb6, 0xb7, 0x1b, 0x1c, 0xa8, 0xa9, 0xd8, 0xd9,
|
||||
0x09, 0x37, 0x90, 0x91, 0xa8, 0x07, 0x0a, 0x3b,
|
||||
0x3e, 0x66, 0x69, 0x8f, 0x92, 0x6f, 0x5f, 0xee,
|
||||
0xef, 0x5a, 0x62, 0x9a, 0x9b, 0x27, 0x28, 0x55,
|
||||
0x9d, 0xa0, 0xa1, 0xa3, 0xa4, 0xa7, 0xa8, 0xad,
|
||||
0xba, 0xbc, 0xc4, 0x06, 0x0b, 0x0c, 0x15, 0x1d,
|
||||
0x3a, 0x3f, 0x45, 0x51, 0xa6, 0xa7, 0xcc, 0xcd,
|
||||
0xa0, 0x07, 0x19, 0x1a, 0x22, 0x25, 0x3e, 0x3f,
|
||||
0xc5, 0xc6, 0x04, 0x20, 0x23, 0x25, 0x26, 0x28,
|
||||
0x33, 0x38, 0x3a, 0x48, 0x4a, 0x4c, 0x50, 0x53,
|
||||
0x55, 0x56, 0x58, 0x5a, 0x5c, 0x5e, 0x60, 0x63,
|
||||
0x65, 0x66, 0x6b, 0x73, 0x78, 0x7d, 0x7f, 0x8a,
|
||||
0xa4, 0xaa, 0xaf, 0xb0, 0xc0, 0xd0, 0x0c, 0x72,
|
||||
0xa3, 0xa4, 0xcb, 0xcc, 0x6e, 0x6f,
|
||||
];
|
||||
const NORMAL0: &[u8] = &[
|
||||
0x00, 0x20,
|
||||
|
|
@ -246,8 +249,8 @@ const NORMAL0: &[u8] = &[
|
|||
0x3a, 0x03,
|
||||
0x11, 0x07,
|
||||
0x06, 0x05,
|
||||
0x10, 0x08,
|
||||
0x56, 0x07,
|
||||
0x10, 0x07,
|
||||
0x57, 0x07,
|
||||
0x02, 0x07,
|
||||
0x15, 0x0d,
|
||||
0x50, 0x04,
|
||||
|
|
@ -258,8 +261,7 @@ const NORMAL0: &[u8] = &[
|
|||
0x0f, 0x0c,
|
||||
0x3a, 0x04,
|
||||
0x1d, 0x25,
|
||||
0x0d, 0x06,
|
||||
0x4c, 0x20,
|
||||
0x5f, 0x20,
|
||||
0x6d, 0x04,
|
||||
0x6a, 0x25,
|
||||
0x80, 0xc8, 0x05,
|
||||
|
|
@ -294,7 +296,7 @@ const NORMAL0: &[u8] = &[
|
|||
0x0f, 0x03,
|
||||
0x3c, 0x07,
|
||||
0x38, 0x08,
|
||||
0x2a, 0x06,
|
||||
0x2b, 0x05,
|
||||
0x82, 0xff, 0x11,
|
||||
0x18, 0x08,
|
||||
0x2f, 0x11,
|
||||
|
|
@ -309,7 +311,7 @@ const NORMAL0: &[u8] = &[
|
|||
0x3b, 0x07,
|
||||
0x02, 0x0e,
|
||||
0x18, 0x09,
|
||||
0x80, 0xaf, 0x31,
|
||||
0x80, 0xb0, 0x30,
|
||||
0x74, 0x0c,
|
||||
0x80, 0xd6, 0x1a,
|
||||
0x0c, 0x05,
|
||||
|
|
@ -322,7 +324,7 @@ const NORMAL0: &[u8] = &[
|
|||
0x37, 0x09,
|
||||
0x81, 0x5c, 0x14,
|
||||
0x80, 0xb8, 0x08,
|
||||
0x80, 0xba, 0x3d,
|
||||
0x80, 0xc7, 0x30,
|
||||
0x35, 0x04,
|
||||
0x0a, 0x06,
|
||||
0x38, 0x08,
|
||||
|
|
@ -335,7 +337,7 @@ const NORMAL0: &[u8] = &[
|
|||
0x80, 0x83, 0x18,
|
||||
0x1c, 0x0a,
|
||||
0x16, 0x09,
|
||||
0x46, 0x0a,
|
||||
0x48, 0x08,
|
||||
0x80, 0x8a, 0x06,
|
||||
0xab, 0xa4, 0x0c,
|
||||
0x17, 0x04,
|
||||
|
|
@ -405,7 +407,8 @@ const NORMAL1: &[u8] = &[
|
|||
0x0a, 0x81, 0x26,
|
||||
0x1f, 0x80, 0x81,
|
||||
0x28, 0x08,
|
||||
0x2a, 0x80, 0xa6,
|
||||
0x2a, 0x80, 0x86,
|
||||
0x17, 0x09,
|
||||
0x4e, 0x04,
|
||||
0x1e, 0x0f,
|
||||
0x43, 0x0e,
|
||||
|
|
@ -422,20 +425,21 @@ const NORMAL1: &[u8] = &[
|
|||
0x01, 0x05,
|
||||
0x10, 0x03,
|
||||
0x05, 0x80, 0x8b,
|
||||
0x5f, 0x21,
|
||||
0x60, 0x20,
|
||||
0x48, 0x08,
|
||||
0x0a, 0x80, 0xa6,
|
||||
0x5e, 0x22,
|
||||
0x45, 0x0b,
|
||||
0x0a, 0x06,
|
||||
0x0d, 0x13,
|
||||
0x38, 0x08,
|
||||
0x39, 0x07,
|
||||
0x0a, 0x36,
|
||||
0x2c, 0x04,
|
||||
0x10, 0x80, 0xc0,
|
||||
0x3c, 0x64,
|
||||
0x53, 0x0c,
|
||||
0x01, 0x81, 0x00,
|
||||
0x01, 0x80, 0xa0,
|
||||
0x45, 0x1b,
|
||||
0x48, 0x08,
|
||||
0x53, 0x1d,
|
||||
0x39, 0x81, 0x07,
|
||||
|
|
@ -447,8 +451,9 @@ const NORMAL1: &[u8] = &[
|
|||
0x0a, 0x06,
|
||||
0x39, 0x07,
|
||||
0x0a, 0x81, 0x36,
|
||||
0x19, 0x81, 0x07,
|
||||
0x83, 0x9a, 0x66,
|
||||
0x19, 0x80, 0xc7,
|
||||
0x32, 0x0d,
|
||||
0x83, 0x9b, 0x66,
|
||||
0x75, 0x0b,
|
||||
0x80, 0xc4, 0x8a, 0xbc,
|
||||
0x84, 0x2f, 0x8f, 0xd1,
|
||||
|
|
@ -461,13 +466,15 @@ const NORMAL1: &[u8] = &[
|
|||
0x28, 0x05,
|
||||
0x13, 0x82, 0xb0,
|
||||
0x5b, 0x65,
|
||||
0x45, 0x0b,
|
||||
0x2f, 0x10,
|
||||
0x4b, 0x04,
|
||||
0x39, 0x07,
|
||||
0x11, 0x40,
|
||||
0x02, 0x1e,
|
||||
0x97, 0xf2, 0x0e,
|
||||
0x04, 0x1c,
|
||||
0x97, 0xf8, 0x08,
|
||||
0x82, 0xf3, 0xa5, 0x0d,
|
||||
0x81, 0x1f, 0x51,
|
||||
0x81, 0x1f, 0x31,
|
||||
0x03, 0x11,
|
||||
0x04, 0x08,
|
||||
0x81, 0x8c, 0x89, 0x04,
|
||||
0x6b, 0x05,
|
||||
0x0d, 0x03,
|
||||
|
|
@ -483,12 +490,18 @@ const NORMAL1: &[u8] = &[
|
|||
0x81, 0x47, 0x03,
|
||||
0x85, 0x42, 0x0f,
|
||||
0x15, 0x85, 0x50,
|
||||
0x2b, 0x87, 0xd5,
|
||||
0x2b, 0x80, 0xd5,
|
||||
0x2d, 0x03,
|
||||
0x1a, 0x04,
|
||||
0x02, 0x81, 0x70,
|
||||
0x3a, 0x05,
|
||||
0x01, 0x85, 0x00,
|
||||
0x80, 0xd7, 0x29,
|
||||
0x4b, 0x05,
|
||||
0x4c, 0x04,
|
||||
0x0a, 0x04,
|
||||
0x02, 0x83, 0x11,
|
||||
0x44, 0x81, 0x4b,
|
||||
0x44, 0x4c,
|
||||
0x3d, 0x80, 0xc2,
|
||||
0x3c, 0x06,
|
||||
0x01, 0x04,
|
||||
0x55, 0x05,
|
||||
|
|
@ -498,28 +511,29 @@ const NORMAL1: &[u8] = &[
|
|||
0x64, 0x0c,
|
||||
0x56, 0x0a,
|
||||
0x0d, 0x03,
|
||||
0x5c, 0x04,
|
||||
0x5d, 0x03,
|
||||
0x3d, 0x39,
|
||||
0x1d, 0x0d,
|
||||
0x2c, 0x04,
|
||||
0x09, 0x07,
|
||||
0x02, 0x0e,
|
||||
0x06, 0x80, 0x9a,
|
||||
0x83, 0xd5, 0x0b,
|
||||
0x83, 0xd6, 0x0a,
|
||||
0x0d, 0x03,
|
||||
0x0a, 0x06,
|
||||
0x0b, 0x05,
|
||||
0x74, 0x0c,
|
||||
0x59, 0x27,
|
||||
0x59, 0x07,
|
||||
0x0c, 0x14,
|
||||
0x0c, 0x04,
|
||||
0x38, 0x08,
|
||||
0x0a, 0x06,
|
||||
0x28, 0x08,
|
||||
0x1e, 0x52,
|
||||
0x0c, 0x04,
|
||||
0x67, 0x03,
|
||||
0x29, 0x0d,
|
||||
0x0a, 0x06,
|
||||
0x77, 0x03,
|
||||
0x31, 0x03,
|
||||
0x80, 0xa6, 0x0c,
|
||||
0x14, 0x04,
|
||||
0x03, 0x05,
|
||||
0x03, 0x0d,
|
||||
0x30, 0x60,
|
||||
0x0e, 0x85, 0x92,
|
||||
0x06, 0x85, 0x6a,
|
||||
];
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -81,8 +81,8 @@ PREAMBLE = """\
|
|||
|
||||
#![allow(missing_docs, non_upper_case_globals, non_snake_case)]
|
||||
|
||||
use unicode::version::UnicodeVersion;
|
||||
use unicode::bool_trie::{{BoolTrie, SmallBoolTrie}};
|
||||
use crate::unicode::version::UnicodeVersion;
|
||||
use crate::unicode::bool_trie::{{BoolTrie, SmallBoolTrie}};
|
||||
""".format(year=datetime.datetime.now().year)
|
||||
|
||||
# Mapping taken from Table 12 from:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue