[USE] Allow any non-numeric tail in symbol cluster

This commit is contained in:
David Corbett 2022-03-04 19:18:40 -05:00 committed by Behdad Esfahbod
parent 5b0a59812d
commit 6e059a46b7
3 changed files with 431 additions and 230 deletions

View File

@ -98,36 +98,54 @@ enum use_syllable_type_t {
#line 100 "hb-ot-shape-complex-use-machine.hh"
static const unsigned char _use_syllable_machine_trans_keys[] = {
0u, 51u, 41u, 42u, 42u, 42u, 11u, 48u, 11u, 48u, 1u, 1u, 22u, 48u, 23u, 48u,
0u, 51u, 11u, 48u, 11u, 48u, 1u, 1u, 22u, 48u, 23u, 48u, 24u, 47u, 25u, 47u,
26u, 47u, 45u, 46u, 46u, 46u, 24u, 48u, 24u, 48u, 24u, 48u, 1u, 1u, 24u, 48u,
23u, 48u, 23u, 48u, 23u, 48u, 22u, 48u, 22u, 48u, 22u, 48u, 11u, 48u, 1u, 48u,
11u, 48u, 41u, 42u, 42u, 42u, 11u, 48u, 11u, 48u, 1u, 1u, 22u, 48u, 23u, 48u,
24u, 47u, 25u, 47u, 26u, 47u, 45u, 46u, 46u, 46u, 24u, 48u, 24u, 48u, 24u, 48u,
1u, 1u, 24u, 48u, 23u, 48u, 23u, 48u, 23u, 48u, 22u, 48u, 22u, 48u, 22u, 48u,
11u, 48u, 1u, 48u, 13u, 13u, 4u, 4u, 11u, 48u, 11u, 48u, 1u, 1u, 22u, 48u,
23u, 48u, 24u, 47u, 25u, 47u, 26u, 47u, 45u, 46u, 46u, 46u, 24u, 48u, 24u, 48u,
24u, 48u, 1u, 1u, 24u, 48u, 23u, 48u, 23u, 48u, 23u, 48u, 22u, 48u, 22u, 48u,
22u, 48u, 11u, 48u, 1u, 48u, 4u, 4u, 13u, 13u, 1u, 48u, 11u, 48u, 41u, 42u,
42u, 42u, 1u, 5u, 50u, 52u, 49u, 52u, 49u, 51u, 0
22u, 48u, 11u, 48u, 1u, 48u, 11u, 48u, 11u, 48u, 1u, 1u, 22u, 48u, 23u, 48u,
24u, 47u, 25u, 47u, 26u, 47u, 45u, 46u, 46u, 46u, 24u, 48u, 24u, 48u, 24u, 48u,
1u, 1u, 24u, 48u, 23u, 48u, 23u, 48u, 23u, 48u, 22u, 48u, 22u, 48u, 22u, 48u,
11u, 48u, 1u, 48u, 4u, 4u, 13u, 13u, 1u, 48u, 11u, 48u, 41u, 42u, 42u, 42u,
1u, 5u, 50u, 52u, 49u, 52u, 49u, 51u, 0
};
static const char _use_syllable_machine_key_spans[] = {
52, 2, 1, 38, 38, 1, 27, 26,
52, 38, 38, 1, 27, 26, 24, 23,
22, 2, 1, 25, 25, 25, 1, 25,
26, 26, 26, 27, 27, 27, 38, 48,
38, 2, 1, 38, 38, 1, 27, 26,
24, 23, 22, 2, 1, 25, 25, 25,
1, 25, 26, 26, 26, 27, 27, 27,
38, 48, 1, 1, 38, 38, 1, 27,
26, 24, 23, 22, 2, 1, 25, 25,
25, 1, 25, 26, 26, 26, 27, 27,
27, 38, 48, 1, 1, 48, 38, 2,
1, 5, 3, 4, 3
27, 38, 48, 38, 38, 1, 27, 26,
24, 23, 22, 2, 1, 25, 25, 25,
1, 25, 26, 26, 26, 27, 27, 27,
38, 48, 1, 1, 48, 38, 2, 1,
5, 3, 4, 3
};
static const short _use_syllable_machine_index_offsets[] = {
0, 53, 56, 58, 97, 136, 138, 166,
193, 218, 242, 265, 268, 270, 296, 322,
348, 350, 376, 403, 430, 457, 485, 513,
541, 580, 629, 631, 633, 672, 711, 713,
741, 768, 793, 817, 840, 843, 845, 871,
897, 923, 925, 951, 978, 1005, 1032, 1060,
1088, 1116, 1155, 1204, 1206, 1208, 1257, 1296,
1299, 1301, 1307, 1311, 1316
0, 53, 92, 131, 133, 161, 188, 213,
237, 260, 263, 265, 291, 317, 343, 345,
371, 398, 425, 452, 480, 508, 536, 575,
624, 663, 666, 668, 707, 746, 748, 776,
803, 828, 852, 875, 878, 880, 906, 932,
958, 960, 986, 1013, 1040, 1067, 1095, 1123,
1151, 1190, 1239, 1241, 1243, 1282, 1321, 1323,
1351, 1378, 1403, 1427, 1450, 1453, 1455, 1481,
1507, 1533, 1535, 1561, 1588, 1615, 1642, 1670,
1698, 1726, 1765, 1814, 1853, 1892, 1894, 1922,
1949, 1974, 1998, 2021, 2024, 2026, 2052, 2078,
2104, 2106, 2132, 2159, 2186, 2213, 2241, 2269,
2297, 2336, 2385, 2387, 2389, 2438, 2477, 2480,
2482, 2488, 2492, 2497
};
static const char _use_syllable_machine_indicies[] = {
@ -137,178 +155,331 @@ static const char _use_syllable_machine_indicies[] = {
11, 12, 13, 14, 15, 9, 16, 17,
18, 19, 20, 21, 2, 22, 23, 24,
2, 25, 26, 27, 28, 29, 30, 31,
6, 32, 2, 33, 2, 0, 35, 34,
35, 34, 37, 38, 36, 36, 36, 36,
36, 36, 36, 36, 36, 39, 40, 41,
42, 43, 44, 45, 39, 46, 1, 47,
48, 49, 50, 36, 51, 52, 53, 36,
36, 36, 36, 54, 55, 56, 57, 38,
36, 37, 38, 36, 36, 36, 36, 36,
36, 36, 36, 36, 39, 40, 41, 42,
43, 44, 45, 39, 46, 47, 47, 48,
49, 50, 36, 51, 52, 53, 36, 36,
36, 36, 54, 55, 56, 57, 38, 36,
37, 58, 39, 40, 41, 42, 43, 36,
36, 36, 36, 36, 36, 48, 49, 50,
36, 51, 52, 53, 36, 36, 36, 36,
40, 55, 56, 57, 59, 36, 40, 41,
42, 43, 36, 36, 36, 36, 36, 36,
36, 36, 36, 36, 51, 52, 53, 36,
36, 36, 36, 36, 55, 56, 57, 59,
36, 41, 42, 43, 36, 36, 36, 36,
36, 36, 36, 36, 36, 36, 36, 36,
36, 36, 36, 36, 36, 36, 55, 56,
57, 36, 42, 43, 36, 36, 36, 36,
36, 36, 36, 36, 36, 36, 36, 36,
36, 36, 36, 36, 36, 36, 55, 56,
57, 36, 43, 36, 36, 36, 36, 36,
36, 36, 36, 36, 36, 36, 36, 36,
36, 36, 36, 36, 36, 55, 56, 57,
36, 55, 56, 36, 56, 36, 41, 42,
43, 36, 36, 36, 36, 36, 36, 36,
36, 36, 36, 51, 52, 53, 36, 36,
36, 36, 36, 55, 56, 57, 59, 36,
41, 42, 43, 36, 36, 36, 36, 36,
36, 36, 36, 36, 36, 36, 52, 53,
36, 36, 36, 36, 36, 55, 56, 57,
59, 36, 41, 42, 43, 36, 36, 36,
36, 36, 36, 36, 36, 36, 36, 36,
36, 53, 36, 36, 36, 36, 36, 55,
56, 57, 59, 36, 61, 60, 41, 42,
43, 36, 36, 36, 36, 36, 36, 36,
36, 36, 36, 36, 36, 36, 36, 36,
36, 36, 36, 55, 56, 57, 59, 36,
40, 41, 42, 43, 36, 36, 36, 36,
36, 36, 48, 49, 50, 36, 51, 52,
53, 36, 36, 36, 36, 40, 55, 56,
57, 59, 36, 40, 41, 42, 43, 36,
36, 36, 36, 36, 36, 36, 49, 50,
36, 51, 52, 53, 36, 36, 36, 36,
40, 55, 56, 57, 59, 36, 40, 41,
42, 43, 36, 36, 36, 36, 36, 36,
36, 36, 50, 36, 51, 52, 53, 36,
36, 36, 36, 40, 55, 56, 57, 59,
36, 39, 40, 41, 42, 43, 36, 45,
39, 36, 36, 36, 48, 49, 50, 36,
51, 52, 53, 36, 36, 36, 36, 40,
55, 56, 57, 59, 36, 39, 40, 41,
42, 43, 36, 36, 39, 36, 36, 36,
48, 49, 50, 36, 51, 52, 53, 36,
36, 36, 36, 40, 55, 56, 57, 59,
36, 39, 40, 41, 42, 43, 44, 45,
39, 36, 36, 36, 48, 49, 50, 36,
51, 52, 53, 36, 36, 36, 36, 40,
55, 56, 57, 59, 36, 37, 38, 36,
36, 36, 36, 36, 36, 36, 36, 36,
39, 40, 41, 42, 43, 44, 45, 39,
46, 36, 47, 48, 49, 50, 36, 51,
52, 53, 36, 36, 36, 36, 54, 55,
56, 57, 38, 36, 37, 58, 58, 58,
58, 58, 58, 58, 58, 58, 58, 58,
58, 58, 58, 58, 58, 58, 58, 58,
58, 58, 40, 41, 42, 43, 58, 58,
58, 58, 58, 58, 58, 58, 58, 58,
51, 52, 53, 58, 58, 58, 58, 58,
55, 56, 57, 59, 58, 63, 62, 3,
64, 37, 38, 36, 36, 36, 36, 36,
36, 36, 36, 36, 39, 40, 41, 42,
43, 44, 45, 39, 46, 1, 47, 48,
49, 50, 36, 51, 52, 53, 36, 0,
35, 36, 54, 55, 56, 57, 38, 36,
5, 6, 65, 65, 65, 65, 65, 65,
65, 65, 65, 9, 10, 11, 12, 13,
14, 15, 9, 16, 18, 18, 19, 20,
21, 65, 22, 23, 24, 65, 65, 65,
65, 28, 29, 30, 31, 6, 65, 5,
65, 9, 10, 11, 12, 13, 65, 65,
65, 65, 65, 65, 19, 20, 21, 65,
22, 23, 24, 65, 65, 65, 65, 10,
29, 30, 31, 66, 65, 10, 11, 12,
13, 65, 65, 65, 65, 65, 65, 65,
65, 65, 65, 22, 23, 24, 65, 65,
65, 65, 65, 29, 30, 31, 66, 65,
11, 12, 13, 65, 65, 65, 65, 65,
65, 65, 65, 65, 65, 65, 65, 65,
65, 65, 65, 65, 65, 29, 30, 31,
65, 12, 13, 65, 65, 65, 65, 65,
65, 65, 65, 65, 65, 65, 65, 65,
65, 65, 65, 65, 65, 29, 30, 31,
65, 13, 65, 65, 65, 65, 65, 65,
65, 65, 65, 65, 65, 65, 65, 65,
65, 65, 65, 65, 29, 30, 31, 65,
29, 30, 65, 30, 65, 11, 12, 13,
65, 65, 65, 65, 65, 65, 65, 65,
65, 65, 22, 23, 24, 65, 65, 65,
65, 65, 29, 30, 31, 66, 65, 11,
12, 13, 65, 65, 65, 65, 65, 65,
65, 65, 65, 65, 65, 23, 24, 65,
65, 65, 65, 65, 29, 30, 31, 66,
65, 11, 12, 13, 65, 65, 65, 65,
65, 65, 65, 65, 65, 65, 65, 65,
24, 65, 65, 65, 65, 65, 29, 30,
31, 66, 65, 67, 65, 11, 12, 13,
65, 65, 65, 65, 65, 65, 65, 65,
65, 65, 65, 65, 65, 65, 65, 65,
65, 65, 29, 30, 31, 66, 65, 10,
11, 12, 13, 65, 65, 65, 65, 65,
65, 19, 20, 21, 65, 22, 23, 24,
65, 65, 65, 65, 10, 29, 30, 31,
66, 65, 10, 11, 12, 13, 65, 65,
65, 65, 65, 65, 65, 20, 21, 65,
22, 23, 24, 65, 65, 65, 65, 10,
29, 30, 31, 66, 65, 10, 11, 12,
13, 65, 65, 65, 65, 65, 65, 65,
65, 21, 65, 22, 23, 24, 65, 65,
65, 65, 10, 29, 30, 31, 66, 65,
9, 10, 11, 12, 13, 65, 15, 9,
65, 65, 65, 19, 20, 21, 65, 22,
23, 24, 65, 65, 65, 65, 10, 29,
30, 31, 66, 65, 9, 10, 11, 12,
13, 65, 65, 9, 65, 65, 65, 19,
20, 21, 65, 22, 23, 24, 65, 65,
65, 65, 10, 29, 30, 31, 66, 65,
6, 32, 2, 33, 2, 35, 36, 34,
34, 34, 34, 34, 34, 34, 34, 34,
37, 38, 39, 40, 41, 42, 43, 37,
44, 45, 46, 47, 48, 49, 34, 50,
51, 52, 34, 53, 54, 34, 55, 56,
57, 58, 36, 34, 35, 36, 34, 34,
34, 34, 34, 34, 34, 34, 34, 37,
38, 39, 40, 41, 42, 43, 37, 44,
46, 46, 47, 48, 49, 34, 50, 51,
52, 34, 34, 34, 34, 55, 56, 57,
58, 36, 34, 35, 34, 37, 38, 39,
40, 41, 34, 34, 34, 34, 34, 34,
47, 48, 49, 34, 50, 51, 52, 34,
34, 34, 34, 38, 56, 57, 58, 59,
34, 38, 39, 40, 41, 34, 34, 34,
34, 34, 34, 34, 34, 34, 34, 50,
51, 52, 34, 34, 34, 34, 34, 56,
57, 58, 59, 34, 39, 40, 41, 34,
34, 34, 34, 34, 34, 34, 34, 34,
34, 34, 34, 34, 34, 34, 34, 34,
34, 56, 57, 58, 34, 40, 41, 34,
34, 34, 34, 34, 34, 34, 34, 34,
34, 34, 34, 34, 34, 34, 34, 34,
34, 56, 57, 58, 34, 41, 34, 34,
34, 34, 34, 34, 34, 34, 34, 34,
34, 34, 34, 34, 34, 34, 34, 34,
56, 57, 58, 34, 56, 57, 34, 57,
34, 39, 40, 41, 34, 34, 34, 34,
34, 34, 34, 34, 34, 34, 50, 51,
52, 34, 34, 34, 34, 34, 56, 57,
58, 59, 34, 39, 40, 41, 34, 34,
34, 34, 34, 34, 34, 34, 34, 34,
34, 51, 52, 34, 34, 34, 34, 34,
56, 57, 58, 59, 34, 39, 40, 41,
34, 34, 34, 34, 34, 34, 34, 34,
34, 34, 34, 34, 52, 34, 34, 34,
34, 34, 56, 57, 58, 59, 34, 60,
34, 39, 40, 41, 34, 34, 34, 34,
34, 34, 34, 34, 34, 34, 34, 34,
34, 34, 34, 34, 34, 34, 56, 57,
58, 59, 34, 38, 39, 40, 41, 34,
34, 34, 34, 34, 34, 47, 48, 49,
34, 50, 51, 52, 34, 34, 34, 34,
38, 56, 57, 58, 59, 34, 38, 39,
40, 41, 34, 34, 34, 34, 34, 34,
34, 48, 49, 34, 50, 51, 52, 34,
34, 34, 34, 38, 56, 57, 58, 59,
34, 38, 39, 40, 41, 34, 34, 34,
34, 34, 34, 34, 34, 49, 34, 50,
51, 52, 34, 34, 34, 34, 38, 56,
57, 58, 59, 34, 37, 38, 39, 40,
41, 34, 43, 37, 34, 34, 34, 47,
48, 49, 34, 50, 51, 52, 34, 34,
34, 34, 38, 56, 57, 58, 59, 34,
37, 38, 39, 40, 41, 34, 34, 37,
34, 34, 34, 47, 48, 49, 34, 50,
51, 52, 34, 34, 34, 34, 38, 56,
57, 58, 59, 34, 37, 38, 39, 40,
41, 42, 43, 37, 34, 34, 34, 47,
48, 49, 34, 50, 51, 52, 34, 34,
34, 34, 38, 56, 57, 58, 59, 34,
35, 36, 34, 34, 34, 34, 34, 34,
34, 34, 34, 37, 38, 39, 40, 41,
42, 43, 37, 44, 34, 46, 47, 48,
49, 34, 50, 51, 52, 34, 34, 34,
34, 55, 56, 57, 58, 36, 34, 35,
34, 34, 34, 34, 34, 34, 34, 34,
34, 34, 34, 34, 34, 34, 34, 34,
34, 34, 34, 34, 34, 38, 39, 40,
41, 34, 34, 34, 34, 34, 34, 34,
34, 34, 34, 50, 51, 52, 34, 34,
34, 34, 34, 56, 57, 58, 59, 34,
35, 36, 34, 34, 34, 34, 34, 34,
34, 34, 34, 37, 38, 39, 40, 41,
42, 43, 37, 44, 45, 46, 47, 48,
49, 34, 50, 51, 52, 34, 34, 34,
34, 55, 56, 57, 58, 36, 34, 53,
54, 34, 54, 34, 62, 63, 61, 61,
61, 61, 61, 61, 61, 61, 61, 64,
65, 66, 67, 68, 69, 70, 64, 71,
1, 72, 73, 74, 75, 61, 76, 77,
78, 61, 61, 61, 61, 79, 80, 81,
82, 63, 61, 62, 63, 61, 61, 61,
61, 61, 61, 61, 61, 61, 64, 65,
66, 67, 68, 69, 70, 64, 71, 72,
72, 73, 74, 75, 61, 76, 77, 78,
61, 61, 61, 61, 79, 80, 81, 82,
63, 61, 62, 83, 64, 65, 66, 67,
68, 61, 61, 61, 61, 61, 61, 73,
74, 75, 61, 76, 77, 78, 61, 61,
61, 61, 65, 80, 81, 82, 84, 61,
65, 66, 67, 68, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 76, 77,
78, 61, 61, 61, 61, 61, 80, 81,
82, 84, 61, 66, 67, 68, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61,
80, 81, 82, 61, 67, 68, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61,
80, 81, 82, 61, 68, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 80,
81, 82, 61, 80, 81, 61, 81, 61,
66, 67, 68, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 76, 77, 78,
61, 61, 61, 61, 61, 80, 81, 82,
84, 61, 66, 67, 68, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61,
77, 78, 61, 61, 61, 61, 61, 80,
81, 82, 84, 61, 66, 67, 68, 61,
61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 78, 61, 61, 61, 61,
61, 80, 81, 82, 84, 61, 86, 85,
66, 67, 68, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 80, 81, 82,
84, 61, 65, 66, 67, 68, 61, 61,
61, 61, 61, 61, 73, 74, 75, 61,
76, 77, 78, 61, 61, 61, 61, 65,
80, 81, 82, 84, 61, 65, 66, 67,
68, 61, 61, 61, 61, 61, 61, 61,
74, 75, 61, 76, 77, 78, 61, 61,
61, 61, 65, 80, 81, 82, 84, 61,
65, 66, 67, 68, 61, 61, 61, 61,
61, 61, 61, 61, 75, 61, 76, 77,
78, 61, 61, 61, 61, 65, 80, 81,
82, 84, 61, 64, 65, 66, 67, 68,
61, 70, 64, 61, 61, 61, 73, 74,
75, 61, 76, 77, 78, 61, 61, 61,
61, 65, 80, 81, 82, 84, 61, 64,
65, 66, 67, 68, 61, 61, 64, 61,
61, 61, 73, 74, 75, 61, 76, 77,
78, 61, 61, 61, 61, 65, 80, 81,
82, 84, 61, 64, 65, 66, 67, 68,
69, 70, 64, 61, 61, 61, 73, 74,
75, 61, 76, 77, 78, 61, 61, 61,
61, 65, 80, 81, 82, 84, 61, 62,
63, 61, 61, 61, 61, 61, 61, 61,
61, 61, 64, 65, 66, 67, 68, 69,
70, 64, 71, 61, 72, 73, 74, 75,
61, 76, 77, 78, 61, 61, 61, 61,
79, 80, 81, 82, 63, 61, 62, 83,
83, 83, 83, 83, 83, 83, 83, 83,
83, 83, 83, 83, 83, 83, 83, 83,
83, 83, 83, 83, 65, 66, 67, 68,
83, 83, 83, 83, 83, 83, 83, 83,
83, 83, 76, 77, 78, 83, 83, 83,
83, 83, 80, 81, 82, 84, 83, 88,
87, 3, 89, 90, 91, 61, 61, 61,
61, 61, 61, 61, 61, 61, 92, 93,
94, 95, 96, 97, 98, 92, 99, 100,
101, 102, 103, 104, 61, 105, 106, 107,
61, 53, 54, 61, 108, 109, 110, 82,
91, 61, 90, 91, 61, 61, 61, 61,
61, 61, 61, 61, 61, 92, 93, 94,
95, 96, 97, 98, 92, 99, 101, 101,
102, 103, 104, 61, 105, 106, 107, 61,
61, 61, 61, 108, 109, 110, 82, 91,
61, 90, 83, 92, 93, 94, 95, 96,
61, 61, 61, 61, 61, 61, 102, 103,
104, 61, 105, 106, 107, 61, 61, 61,
61, 93, 109, 110, 82, 111, 61, 93,
94, 95, 96, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 105, 106, 107,
61, 61, 61, 61, 61, 109, 110, 82,
111, 61, 94, 95, 96, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 109,
110, 82, 61, 95, 96, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 109,
110, 82, 61, 96, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 109, 110,
82, 61, 109, 110, 61, 110, 61, 94,
95, 96, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 105, 106, 107, 61,
61, 61, 61, 61, 109, 110, 82, 111,
61, 94, 95, 96, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 106,
107, 61, 61, 61, 61, 61, 109, 110,
82, 111, 61, 94, 95, 96, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 107, 61, 61, 61, 61, 61,
109, 110, 82, 111, 61, 112, 85, 94,
95, 96, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 61, 61, 61, 61,
61, 61, 61, 61, 109, 110, 82, 111,
61, 93, 94, 95, 96, 61, 61, 61,
61, 61, 61, 102, 103, 104, 61, 105,
106, 107, 61, 61, 61, 61, 93, 109,
110, 82, 111, 61, 93, 94, 95, 96,
61, 61, 61, 61, 61, 61, 61, 103,
104, 61, 105, 106, 107, 61, 61, 61,
61, 93, 109, 110, 82, 111, 61, 93,
94, 95, 96, 61, 61, 61, 61, 61,
61, 61, 61, 104, 61, 105, 106, 107,
61, 61, 61, 61, 93, 109, 110, 82,
111, 61, 92, 93, 94, 95, 96, 61,
98, 92, 61, 61, 61, 102, 103, 104,
61, 105, 106, 107, 61, 61, 61, 61,
93, 109, 110, 82, 111, 61, 92, 93,
94, 95, 96, 61, 61, 92, 61, 61,
61, 102, 103, 104, 61, 105, 106, 107,
61, 61, 61, 61, 93, 109, 110, 82,
111, 61, 92, 93, 94, 95, 96, 97,
98, 92, 61, 61, 61, 102, 103, 104,
61, 105, 106, 107, 61, 61, 61, 61,
93, 109, 110, 82, 111, 61, 90, 91,
61, 61, 61, 61, 61, 61, 61, 61,
61, 92, 93, 94, 95, 96, 97, 98,
92, 99, 61, 101, 102, 103, 104, 61,
105, 106, 107, 61, 61, 61, 61, 108,
109, 110, 82, 91, 61, 90, 83, 83,
83, 83, 83, 83, 83, 83, 83, 83,
83, 83, 83, 83, 83, 83, 83, 83,
83, 83, 83, 93, 94, 95, 96, 83,
83, 83, 83, 83, 83, 83, 83, 83,
83, 105, 106, 107, 83, 83, 83, 83,
83, 109, 110, 82, 111, 83, 90, 91,
61, 61, 61, 61, 61, 61, 61, 61,
61, 92, 93, 94, 95, 96, 97, 98,
92, 99, 100, 101, 102, 103, 104, 61,
105, 106, 107, 61, 61, 61, 61, 108,
109, 110, 82, 91, 61, 5, 6, 113,
113, 113, 113, 113, 113, 113, 113, 113,
9, 10, 11, 12, 13, 14, 15, 9,
65, 65, 65, 19, 20, 21, 65, 22,
23, 24, 65, 65, 65, 65, 10, 29,
30, 31, 66, 65, 5, 6, 65, 65,
65, 65, 65, 65, 65, 65, 65, 9,
10, 11, 12, 13, 14, 15, 9, 16,
65, 18, 19, 20, 21, 65, 22, 23,
24, 65, 65, 65, 65, 28, 29, 30,
31, 6, 65, 5, 65, 65, 65, 65,
65, 65, 65, 65, 65, 65, 65, 65,
65, 65, 65, 65, 65, 65, 65, 65,
65, 10, 11, 12, 13, 65, 65, 65,
65, 65, 65, 65, 65, 65, 65, 22,
23, 24, 65, 65, 65, 65, 65, 29,
30, 31, 66, 65, 68, 65, 7, 65,
1, 65, 65, 65, 1, 65, 65, 65,
65, 65, 5, 6, 7, 65, 65, 65,
65, 65, 65, 65, 65, 9, 10, 11,
12, 13, 14, 15, 9, 16, 17, 18,
19, 20, 21, 65, 22, 23, 24, 65,
25, 26, 65, 28, 29, 30, 31, 6,
65, 5, 6, 65, 65, 65, 65, 65,
65, 65, 65, 65, 9, 10, 11, 12,
13, 14, 15, 9, 16, 17, 18, 19,
20, 21, 65, 22, 23, 24, 65, 65,
65, 65, 28, 29, 30, 31, 6, 65,
25, 26, 65, 26, 65, 1, 69, 69,
69, 1, 69, 71, 70, 32, 70, 32,
71, 70, 71, 70, 32, 70, 33, 70,
0
16, 18, 18, 19, 20, 21, 113, 22,
23, 24, 113, 113, 113, 113, 28, 29,
30, 31, 6, 113, 5, 113, 9, 10,
11, 12, 13, 113, 113, 113, 113, 113,
113, 19, 20, 21, 113, 22, 23, 24,
113, 113, 113, 113, 10, 29, 30, 31,
114, 113, 10, 11, 12, 13, 113, 113,
113, 113, 113, 113, 113, 113, 113, 113,
22, 23, 24, 113, 113, 113, 113, 113,
29, 30, 31, 114, 113, 11, 12, 13,
113, 113, 113, 113, 113, 113, 113, 113,
113, 113, 113, 113, 113, 113, 113, 113,
113, 113, 29, 30, 31, 113, 12, 13,
113, 113, 113, 113, 113, 113, 113, 113,
113, 113, 113, 113, 113, 113, 113, 113,
113, 113, 29, 30, 31, 113, 13, 113,
113, 113, 113, 113, 113, 113, 113, 113,
113, 113, 113, 113, 113, 113, 113, 113,
113, 29, 30, 31, 113, 29, 30, 113,
30, 113, 11, 12, 13, 113, 113, 113,
113, 113, 113, 113, 113, 113, 113, 22,
23, 24, 113, 113, 113, 113, 113, 29,
30, 31, 114, 113, 11, 12, 13, 113,
113, 113, 113, 113, 113, 113, 113, 113,
113, 113, 23, 24, 113, 113, 113, 113,
113, 29, 30, 31, 114, 113, 11, 12,
13, 113, 113, 113, 113, 113, 113, 113,
113, 113, 113, 113, 113, 24, 113, 113,
113, 113, 113, 29, 30, 31, 114, 113,
115, 113, 11, 12, 13, 113, 113, 113,
113, 113, 113, 113, 113, 113, 113, 113,
113, 113, 113, 113, 113, 113, 113, 29,
30, 31, 114, 113, 10, 11, 12, 13,
113, 113, 113, 113, 113, 113, 19, 20,
21, 113, 22, 23, 24, 113, 113, 113,
113, 10, 29, 30, 31, 114, 113, 10,
11, 12, 13, 113, 113, 113, 113, 113,
113, 113, 20, 21, 113, 22, 23, 24,
113, 113, 113, 113, 10, 29, 30, 31,
114, 113, 10, 11, 12, 13, 113, 113,
113, 113, 113, 113, 113, 113, 21, 113,
22, 23, 24, 113, 113, 113, 113, 10,
29, 30, 31, 114, 113, 9, 10, 11,
12, 13, 113, 15, 9, 113, 113, 113,
19, 20, 21, 113, 22, 23, 24, 113,
113, 113, 113, 10, 29, 30, 31, 114,
113, 9, 10, 11, 12, 13, 113, 113,
9, 113, 113, 113, 19, 20, 21, 113,
22, 23, 24, 113, 113, 113, 113, 10,
29, 30, 31, 114, 113, 9, 10, 11,
12, 13, 14, 15, 9, 113, 113, 113,
19, 20, 21, 113, 22, 23, 24, 113,
113, 113, 113, 10, 29, 30, 31, 114,
113, 5, 6, 113, 113, 113, 113, 113,
113, 113, 113, 113, 9, 10, 11, 12,
13, 14, 15, 9, 16, 113, 18, 19,
20, 21, 113, 22, 23, 24, 113, 113,
113, 113, 28, 29, 30, 31, 6, 113,
5, 113, 113, 113, 113, 113, 113, 113,
113, 113, 113, 113, 113, 113, 113, 113,
113, 113, 113, 113, 113, 113, 10, 11,
12, 13, 113, 113, 113, 113, 113, 113,
113, 113, 113, 113, 22, 23, 24, 113,
113, 113, 113, 113, 29, 30, 31, 114,
113, 116, 113, 7, 113, 1, 113, 113,
113, 1, 113, 113, 113, 113, 113, 5,
6, 7, 113, 113, 113, 113, 113, 113,
113, 113, 9, 10, 11, 12, 13, 14,
15, 9, 16, 17, 18, 19, 20, 21,
113, 22, 23, 24, 113, 25, 26, 113,
28, 29, 30, 31, 6, 113, 5, 6,
113, 113, 113, 113, 113, 113, 113, 113,
113, 9, 10, 11, 12, 13, 14, 15,
9, 16, 17, 18, 19, 20, 21, 113,
22, 23, 24, 113, 113, 113, 113, 28,
29, 30, 31, 6, 113, 25, 26, 113,
26, 113, 1, 117, 117, 117, 1, 117,
119, 118, 32, 118, 32, 119, 118, 119,
118, 32, 118, 33, 118, 0
};
static const char _use_syllable_machine_trans_targs[] = {
1, 3, 0, 26, 28, 29, 30, 51,
53, 31, 32, 33, 34, 35, 46, 47,
48, 54, 49, 43, 44, 45, 38, 39,
40, 55, 56, 57, 50, 36, 37, 0,
58, 60, 0, 2, 0, 4, 5, 6,
7, 8, 9, 10, 21, 22, 23, 24,
18, 19, 20, 13, 14, 15, 25, 11,
12, 0, 0, 16, 0, 17, 0, 27,
0, 0, 41, 42, 52, 0, 0, 59
1, 27, 0, 50, 52, 76, 77, 98,
100, 78, 79, 80, 81, 82, 93, 94,
95, 101, 96, 90, 91, 92, 85, 86,
87, 102, 103, 104, 97, 83, 84, 0,
105, 107, 0, 2, 3, 4, 5, 6,
7, 8, 19, 20, 21, 24, 22, 16,
17, 18, 11, 12, 13, 25, 26, 23,
9, 10, 0, 14, 15, 0, 28, 29,
30, 31, 32, 33, 34, 45, 46, 47,
48, 42, 43, 44, 37, 38, 39, 49,
35, 36, 0, 0, 40, 0, 41, 0,
51, 0, 53, 54, 55, 56, 57, 58,
59, 70, 71, 72, 75, 73, 67, 68,
69, 62, 63, 64, 74, 60, 61, 65,
66, 0, 88, 89, 99, 0, 0, 106
};
static const char _use_syllable_machine_trans_actions[] = {
@ -316,11 +487,17 @@ static const char _use_syllable_machine_trans_actions[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 4,
0, 0, 5, 0, 6, 0, 0, 0,
0, 0, 5, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 7, 8, 0, 9, 0, 10, 0,
11, 12, 0, 0, 0, 13, 14, 0
0, 0, 6, 0, 0, 7, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 8, 9, 0, 10, 0, 11,
0, 12, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 13, 0, 0, 0, 14, 15, 0
};
static const char _use_syllable_machine_to_state_actions[] = {
@ -331,7 +508,13 @@ static const char _use_syllable_machine_to_state_actions[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0
};
static const char _use_syllable_machine_from_state_actions[] = {
@ -342,18 +525,30 @@ static const char _use_syllable_machine_from_state_actions[] = {
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0
};
static const short _use_syllable_machine_eof_trans[] = {
0, 35, 35, 37, 37, 59, 37, 37,
37, 37, 37, 37, 37, 37, 37, 37,
61, 37, 37, 37, 37, 37, 37, 37,
37, 59, 63, 65, 37, 66, 66, 66,
66, 66, 66, 66, 66, 66, 66, 66,
66, 66, 66, 66, 66, 66, 66, 66,
66, 66, 66, 66, 66, 66, 66, 66,
66, 70, 71, 71, 71
0, 35, 35, 35, 35, 35, 35, 35,
35, 35, 35, 35, 35, 35, 35, 35,
35, 35, 35, 35, 35, 35, 35, 35,
35, 35, 35, 62, 62, 84, 62, 62,
62, 62, 62, 62, 62, 62, 62, 62,
86, 62, 62, 62, 62, 62, 62, 62,
62, 84, 88, 90, 62, 62, 84, 62,
62, 62, 62, 62, 62, 62, 62, 62,
62, 86, 62, 62, 62, 62, 62, 62,
62, 62, 84, 62, 114, 114, 114, 114,
114, 114, 114, 114, 114, 114, 114, 114,
114, 114, 114, 114, 114, 114, 114, 114,
114, 114, 114, 114, 114, 114, 114, 114,
118, 119, 119, 119
};
static const int use_syllable_machine_start = 0;
@ -367,7 +562,7 @@ static const int use_syllable_machine_en_main = 0;
#line 180 "hb-ot-shape-complex-use-machine.rl"
#line 181 "hb-ot-shape-complex-use-machine.rl"
#define found_syllable(syllable_type) \
@ -452,7 +647,7 @@ find_syllables_use (hb_buffer_t *buffer)
unsigned int act HB_UNUSED;
int cs;
#line 456 "hb-ot-shape-complex-use-machine.hh"
#line 651 "hb-ot-shape-complex-use-machine.hh"
{
cs = use_syllable_machine_start;
ts = 0;
@ -460,12 +655,12 @@ find_syllables_use (hb_buffer_t *buffer)
act = 0;
}
#line 266 "hb-ot-shape-complex-use-machine.rl"
#line 267 "hb-ot-shape-complex-use-machine.rl"
unsigned int syllable_serial = 1;
#line 469 "hb-ot-shape-complex-use-machine.hh"
#line 664 "hb-ot-shape-complex-use-machine.hh"
{
int _slen;
int _trans;
@ -479,7 +674,7 @@ _resume:
#line 1 "NONE"
{ts = p;}
break;
#line 483 "hb-ot-shape-complex-use-machine.hh"
#line 678 "hb-ot-shape-complex-use-machine.hh"
}
_keys = _use_syllable_machine_trans_keys + (cs<<1);
@ -497,55 +692,59 @@ _eof_trans:
goto _again;
switch ( _use_syllable_machine_trans_actions[_trans] ) {
case 7:
#line 170 "hb-ot-shape-complex-use-machine.rl"
case 8:
#line 171 "hb-ot-shape-complex-use-machine.rl"
{te = p+1;{ found_syllable (use_standard_cluster); }}
break;
case 6:
#line 174 "hb-ot-shape-complex-use-machine.rl"
{te = p+1;{ found_syllable (use_symbol_cluster); }}
break;
case 4:
#line 175 "hb-ot-shape-complex-use-machine.rl"
#line 176 "hb-ot-shape-complex-use-machine.rl"
{te = p+1;{ found_syllable (use_broken_cluster); }}
break;
case 3:
#line 176 "hb-ot-shape-complex-use-machine.rl"
#line 177 "hb-ot-shape-complex-use-machine.rl"
{te = p+1;{ found_syllable (use_non_cluster); }}
break;
case 8:
#line 168 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_virama_terminated_cluster); }}
break;
case 9:
#line 169 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_sakot_terminated_cluster); }}
break;
case 6:
#line 170 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_standard_cluster); }}
break;
case 11:
#line 171 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_number_joiner_terminated_cluster); }}
{te = p;p--;{ found_syllable (use_virama_terminated_cluster); }}
break;
case 10:
#line 170 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_sakot_terminated_cluster); }}
break;
case 7:
#line 171 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_standard_cluster); }}
break;
case 12:
#line 172 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_number_joiner_terminated_cluster); }}
break;
case 11:
#line 173 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_numeral_cluster); }}
break;
case 5:
#line 173 "hb-ot-shape-complex-use-machine.rl"
#line 174 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_symbol_cluster); }}
break;
case 14:
#line 174 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_hieroglyph_cluster); }}
break;
case 12:
case 15:
#line 175 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_broken_cluster); }}
{te = p;p--;{ found_syllable (use_hieroglyph_cluster); }}
break;
case 13:
#line 176 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_broken_cluster); }}
break;
case 14:
#line 177 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_non_cluster); }}
break;
#line 549 "hb-ot-shape-complex-use-machine.hh"
#line 748 "hb-ot-shape-complex-use-machine.hh"
}
_again:
@ -554,7 +753,7 @@ _again:
#line 1 "NONE"
{ts = 0;}
break;
#line 558 "hb-ot-shape-complex-use-machine.hh"
#line 757 "hb-ot-shape-complex-use-machine.hh"
}
if ( ++p != pe )
@ -570,7 +769,7 @@ _again:
}
#line 271 "hb-ot-shape-complex-use-machine.rl"
#line 272 "hb-ot-shape-complex-use-machine.rl"
}

View File

@ -153,14 +153,15 @@ standard_cluster =
complex_syllable_start
complex_syllable_tail
;
tail = complex_syllable_tail | sakot_terminated_cluster_tail | symbol_cluster_tail | virama_terminated_cluster_tail;
broken_cluster =
R?
(complex_syllable_tail | number_joiner_terminated_cluster_tail | numeral_cluster_tail | symbol_cluster_tail | virama_terminated_cluster_tail | sakot_terminated_cluster_tail)
(tail | number_joiner_terminated_cluster_tail | numeral_cluster_tail)
;
number_joiner_terminated_cluster = N number_joiner_terminated_cluster_tail;
numeral_cluster = N numeral_cluster_tail?;
symbol_cluster = (O | GB) symbol_cluster_tail?;
symbol_cluster = (O | GB) tail?;
hieroglyph_cluster = SB+ | SB* G SE* (J SE* (G SE*)?)*;
other = any;

View File

@ -257,7 +257,6 @@ setup_topographical_masks (const hb_ot_shape_plan_t *plan,
use_syllable_type_t syllable_type = (use_syllable_type_t) (info[start].syllable() & 0x0F);
switch (syllable_type)
{
case use_symbol_cluster:
case use_hieroglyph_cluster:
case use_non_cluster:
/* These don't join. Nothing to do. */
@ -269,6 +268,7 @@ setup_topographical_masks (const hb_ot_shape_plan_t *plan,
case use_standard_cluster:
case use_number_joiner_terminated_cluster:
case use_numeral_cluster:
case use_symbol_cluster:
case use_broken_cluster:
bool join = last_form == JOINING_FORM_FINA || last_form == JOINING_FORM_ISOL;
@ -363,6 +363,7 @@ reorder_syllable_use (hb_buffer_t *buffer, unsigned int start, unsigned int end)
(FLAG (use_virama_terminated_cluster) |
FLAG (use_sakot_terminated_cluster) |
FLAG (use_standard_cluster) |
FLAG (use_symbol_cluster) |
FLAG (use_broken_cluster) |
0))))
return;