walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[USE] Treat visible viramas like dependent vowels

This commit is contained in:
David Corbett 2022-03-13 15:01:11 -04:00 committed by Behdad Esfahbod
parent 1f79ba9407
commit 49fb8f9072
8 changed files with 491 additions and 433 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/gen-use-table.py
View File

@ -221,13 +221,7 @@ def is_CONS_SUB(U, UISC, UDI, UGC, AJT):
def is_CONS_WITH_STACKER(U, UISC, UDI, UGC, AJT): def is_CONS_WITH_STACKER(U, UISC, UDI, UGC, AJT):
return UISC == Consonant_With_Stacker return UISC == Consonant_With_Stacker
def is_HALANT(U, UISC, UDI, UGC, AJT): def is_HALANT(U, UISC, UDI, UGC, AJT):
return (UISC in [Virama, Invisible_Stacker] return UISC == Virama
and not is_HALANT_OR_VOWEL_MODIFIER(U, UISC, UDI, UGC, AJT)
and not is_SAKOT(U, UISC, UDI, UGC, AJT))
def is_HALANT_OR_VOWEL_MODIFIER(U, UISC, UDI, UGC, AJT):
# Split off of HALANT
# https://github.com/harfbuzz/harfbuzz/issues/1379
return U == 0x1134D
def is_HALANT_NUM(U, UISC, UDI, UGC, AJT): def is_HALANT_NUM(U, UISC, UDI, UGC, AJT):
return UISC == Number_Joiner return UISC == Number_Joiner
def is_HIEROGLYPH(U, UISC, UDI, UGC, AJT): def is_HIEROGLYPH(U, UISC, UDI, UGC, AJT):
@ -238,6 +232,11 @@ def is_HIEROGLYPH_SEGMENT_BEGIN(U, UISC, UDI, UGC, AJT):
return UISC == Hieroglyph_Segment_Begin return UISC == Hieroglyph_Segment_Begin
def is_HIEROGLYPH_SEGMENT_END(U, UISC, UDI, UGC, AJT): def is_HIEROGLYPH_SEGMENT_END(U, UISC, UDI, UGC, AJT):
return UISC == Hieroglyph_Segment_End return UISC == Hieroglyph_Segment_End
def is_INVISIBLE_STACKER(U, UISC, UDI, UGC, AJT):
# Split off of HALANT
return (UISC == Invisible_Stacker
and not is_SAKOT(U, UISC, UDI, UGC, AJT)
)
def is_ZWNJ(U, UISC, UDI, UGC, AJT): def is_ZWNJ(U, UISC, UDI, UGC, AJT):
return UISC == Non_Joiner return UISC == Non_Joiner
def is_OTHER(U, UISC, UDI, UGC, AJT): def is_OTHER(U, UISC, UDI, UGC, AJT):
@ -281,8 +280,8 @@ use_mapping = {
'SUB': is_CONS_SUB, 'SUB': is_CONS_SUB,
'CS': is_CONS_WITH_STACKER, 'CS': is_CONS_WITH_STACKER,
'H': is_HALANT, 'H': is_HALANT,
'HVM': is_HALANT_OR_VOWEL_MODIFIER,
'HN': is_HALANT_NUM, 'HN': is_HALANT_NUM,
'IS': is_INVISIBLE_STACKER,
'G': is_HIEROGLYPH, 'G': is_HIEROGLYPH,
'J': is_HIEROGLYPH_JOINER, 'J': is_HIEROGLYPH_JOINER,
'SB': is_HIEROGLYPH_SEGMENT_BEGIN, 'SB': is_HIEROGLYPH_SEGMENT_BEGIN,
@ -330,7 +329,7 @@ use_positions = {
'Blw': [Bottom], 'Blw': [Bottom],
}, },
'H': None, 'H': None,
'HVM': None, 'IS': None,
'B': None, 'B': None,
'FM': { 'FM': {
'Abv': [Top], 'Abv': [Top],

865
src/hb-ot-shape-complex-use-machine.hh
View File

@ -69,7 +69,7 @@ enum use_syllable_type_t {
#define use_syllable_machine_ex_GB 5u #define use_syllable_machine_ex_GB 5u
#define use_syllable_machine_ex_H 12u #define use_syllable_machine_ex_H 12u
#define use_syllable_machine_ex_HN 13u #define use_syllable_machine_ex_HN 13u
#define use_syllable_machine_ex_HVM 44u #define use_syllable_machine_ex_IS 44u
#define use_syllable_machine_ex_J 50u #define use_syllable_machine_ex_J 50u
#define use_syllable_machine_ex_MAbv 27u #define use_syllable_machine_ex_MAbv 27u
#define use_syllable_machine_ex_MBlw 28u #define use_syllable_machine_ex_MBlw 28u
@ -98,406 +98,443 @@ enum use_syllable_type_t {
#line 100 "hb-ot-shape-complex-use-machine.hh" #line 100 "hb-ot-shape-complex-use-machine.hh"
static const unsigned char _use_syllable_machine_trans_keys[] = { static const unsigned char _use_syllable_machine_trans_keys[] = {
0u, 51u, 11u, 48u, 11u, 48u, 1u, 1u, 22u, 48u, 23u, 48u, 24u, 47u, 25u, 47u, 0u, 51u, 11u, 48u, 11u, 48u, 1u, 48u, 23u, 48u, 24u, 47u, 25u, 47u, 26u, 47u,
26u, 47u, 45u, 46u, 46u, 46u, 24u, 48u, 24u, 48u, 24u, 48u, 1u, 1u, 24u, 48u, 45u, 46u, 46u, 46u, 24u, 48u, 24u, 48u, 24u, 48u, 1u, 1u, 24u, 48u, 22u, 48u,
23u, 48u, 23u, 48u, 23u, 48u, 22u, 48u, 22u, 48u, 22u, 48u, 11u, 48u, 1u, 48u, 23u, 48u, 23u, 48u, 23u, 48u, 12u, 48u, 12u, 48u, 12u, 48u, 12u, 48u, 11u, 48u,
11u, 48u, 41u, 42u, 42u, 42u, 11u, 48u, 11u, 48u, 1u, 1u, 22u, 48u, 23u, 48u, 1u, 1u, 11u, 48u, 41u, 42u, 42u, 42u, 11u, 48u, 11u, 48u, 1u, 48u, 23u, 48u,
24u, 47u, 25u, 47u, 26u, 47u, 45u, 46u, 46u, 46u, 24u, 48u, 24u, 48u, 24u, 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, 1u, 1u, 24u, 48u, 22u, 48u, 23u, 48u, 23u, 48u, 23u, 48u, 12u, 48u, 12u, 48u,
11u, 48u, 1u, 48u, 13u, 13u, 4u, 4u, 11u, 48u, 11u, 48u, 1u, 1u, 22u, 48u, 12u, 48u, 12u, 48u, 11u, 48u, 1u, 1u, 13u, 13u, 4u, 4u, 11u, 48u, 11u, 48u,
23u, 48u, 24u, 47u, 25u, 47u, 26u, 47u, 45u, 46u, 46u, 46u, 24u, 48u, 24u, 48u, 1u, 48u, 23u, 48u, 24u, 47u, 25u, 47u, 26u, 47u, 45u, 46u, 46u, 46u, 24u, 48u,
24u, 48u, 1u, 1u, 24u, 48u, 23u, 48u, 23u, 48u, 23u, 48u, 22u, 48u, 22u, 48u, 24u, 48u, 24u, 48u, 1u, 1u, 24u, 48u, 22u, 48u, 23u, 48u, 23u, 48u, 23u, 48u,
22u, 48u, 11u, 48u, 1u, 48u, 11u, 48u, 11u, 48u, 1u, 1u, 22u, 48u, 23u, 48u, 12u, 48u, 12u, 48u, 12u, 48u, 12u, 48u, 11u, 48u, 1u, 1u, 11u, 48u, 11u, 48u,
24u, 47u, 25u, 47u, 26u, 47u, 45u, 46u, 46u, 46u, 24u, 48u, 24u, 48u, 24u, 48u, 1u, 48u, 23u, 48u, 24u, 47u, 25u, 47u, 26u, 47u, 45u, 46u, 46u, 46u, 24u, 48u,
1u, 1u, 24u, 48u, 23u, 48u, 23u, 48u, 23u, 48u, 22u, 48u, 22u, 48u, 22u, 48u, 24u, 48u, 24u, 48u, 1u, 1u, 24u, 48u, 22u, 48u, 23u, 48u, 23u, 48u, 23u, 48u,
11u, 48u, 1u, 48u, 4u, 4u, 13u, 13u, 1u, 48u, 11u, 48u, 41u, 42u, 42u, 42u, 12u, 48u, 12u, 48u, 12u, 48u, 12u, 48u, 11u, 48u, 1u, 1u, 4u, 4u, 13u, 13u,
1u, 5u, 50u, 52u, 49u, 52u, 49u, 51u, 0 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[] = { static const char _use_syllable_machine_key_spans[] = {
52, 38, 38, 1, 27, 26, 24, 23, 52, 38, 38, 48, 26, 24, 23, 22,
22, 2, 1, 25, 25, 25, 1, 25, 2, 1, 25, 25, 25, 1, 25, 27,
26, 26, 26, 27, 27, 27, 38, 48, 26, 26, 26, 37, 37, 37, 37, 38,
38, 2, 1, 38, 38, 1, 27, 26, 1, 38, 2, 1, 38, 38, 48, 26,
24, 23, 22, 2, 1, 25, 25, 25, 24, 23, 22, 2, 1, 25, 25, 25,
1, 25, 26, 26, 26, 27, 27, 27, 1, 25, 27, 26, 26, 26, 37, 37,
38, 48, 1, 1, 38, 38, 1, 27, 37, 37, 38, 1, 1, 1, 38, 38,
26, 24, 23, 22, 2, 1, 25, 25, 48, 26, 24, 23, 22, 2, 1, 25,
25, 1, 25, 26, 26, 26, 27, 27, 25, 25, 1, 25, 27, 26, 26, 26,
27, 38, 48, 38, 38, 1, 27, 26, 37, 37, 37, 37, 38, 1, 38, 38,
24, 23, 22, 2, 1, 25, 25, 25, 48, 26, 24, 23, 22, 2, 1, 25,
1, 25, 26, 26, 26, 27, 27, 27, 25, 25, 1, 25, 27, 26, 26, 26,
38, 48, 1, 1, 48, 38, 2, 1, 37, 37, 37, 37, 38, 1, 1, 1,
5, 3, 4, 3 48, 38, 2, 1, 5, 3, 4, 3
}; };
static const short _use_syllable_machine_index_offsets[] = { static const short _use_syllable_machine_index_offsets[] = {
0, 53, 92, 131, 133, 161, 188, 213, 0, 53, 92, 131, 180, 207, 232, 256,
237, 260, 263, 265, 291, 317, 343, 345, 279, 282, 284, 310, 336, 362, 364, 390,
371, 398, 425, 452, 480, 508, 536, 575, 418, 445, 472, 499, 537, 575, 613, 651,
624, 663, 666, 668, 707, 746, 748, 776, 690, 692, 731, 734, 736, 775, 814, 863,
803, 828, 852, 875, 878, 880, 906, 932, 890, 915, 939, 962, 965, 967, 993, 1019,
958, 960, 986, 1013, 1040, 1067, 1095, 1123, 1045, 1047, 1073, 1101, 1128, 1155, 1182, 1220,
1151, 1190, 1239, 1241, 1243, 1282, 1321, 1323, 1258, 1296, 1334, 1373, 1375, 1377, 1379, 1418,
1351, 1378, 1403, 1427, 1450, 1453, 1455, 1481, 1457, 1506, 1533, 1558, 1582, 1605, 1608, 1610,
1507, 1533, 1535, 1561, 1588, 1615, 1642, 1670, 1636, 1662, 1688, 1690, 1716, 1744, 1771, 1798,
1698, 1726, 1765, 1814, 1853, 1892, 1894, 1922, 1825, 1863, 1901, 1939, 1977, 2016, 2018, 2057,
1949, 1974, 1998, 2021, 2024, 2026, 2052, 2078, 2096, 2145, 2172, 2197, 2221, 2244, 2247, 2249,
2104, 2106, 2132, 2159, 2186, 2213, 2241, 2269, 2275, 2301, 2327, 2329, 2355, 2383, 2410, 2437,
2297, 2336, 2385, 2387, 2389, 2438, 2477, 2480, 2464, 2502, 2540, 2578, 2616, 2655, 2657, 2659,
2482, 2488, 2492, 2497 2661, 2710, 2749, 2752, 2754, 2760, 2764, 2769
}; };
static const char _use_syllable_machine_indicies[] = { static const char _use_syllable_machine_indicies[] = {
0, 1, 2, 2, 3, 4, 2, 2, 0, 1, 2, 2, 3, 4, 2, 2,
2, 2, 2, 5, 6, 7, 2, 2, 2, 2, 2, 5, 6, 7, 2, 2,
2, 2, 8, 2, 2, 2, 9, 10, 2, 2, 8, 2, 2, 2, 9, 10,
11, 12, 13, 14, 15, 9, 16, 17, 11, 12, 13, 14, 15, 16, 17, 18,
18, 19, 20, 21, 2, 22, 23, 24, 19, 20, 21, 22, 2, 23, 24, 25,
2, 25, 26, 27, 28, 29, 30, 31, 2, 26, 27, 28, 29, 30, 31, 32,
6, 32, 2, 33, 2, 35, 36, 34, 29, 33, 2, 34, 2, 36, 37, 35,
34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35,
37, 38, 39, 40, 41, 42, 43, 37, 38, 39, 40, 41, 42, 43, 44, 45,
44, 45, 46, 47, 48, 49, 34, 50, 46, 47, 48, 49, 50, 51, 35, 52,
51, 52, 34, 53, 54, 34, 55, 56, 53, 54, 35, 55, 56, 35, 57, 58,
57, 58, 36, 34, 35, 36, 34, 34, 59, 60, 57, 35, 36, 37, 35, 35,
34, 34, 34, 34, 34, 34, 34, 37, 35, 35, 35, 35, 35, 35, 35, 38,
38, 39, 40, 41, 42, 43, 37, 44, 39, 40, 41, 42, 43, 44, 45, 46,
46, 46, 47, 48, 49, 34, 50, 51, 48, 48, 49, 50, 51, 35, 52, 53,
52, 34, 34, 34, 34, 55, 56, 57, 54, 35, 35, 35, 35, 57, 58, 59,
58, 36, 34, 35, 34, 37, 38, 39, 60, 57, 35, 36, 35, 35, 35, 35,
40, 41, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35,
47, 48, 49, 34, 50, 51, 52, 34, 35, 35, 35, 35, 35, 35, 35, 35,
34, 34, 34, 38, 56, 57, 58, 59, 35, 39, 40, 41, 42, 35, 35, 35,
34, 38, 39, 40, 41, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 52,
34, 34, 34, 34, 34, 34, 34, 50, 53, 54, 35, 35, 35, 35, 35, 58,
51, 52, 34, 34, 34, 34, 34, 56, 59, 60, 61, 35, 39, 40, 41, 42,
57, 58, 59, 34, 39, 40, 41, 34, 35, 35, 35, 35, 35, 35, 35, 35,
34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 52, 53, 54, 35, 35, 35,
34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 58, 59, 60, 61, 35, 40,
34, 56, 57, 58, 34, 40, 41, 34, 41, 42, 35, 35, 35, 35, 35, 35,
34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35,
34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 58, 59, 60, 35,
34, 56, 57, 58, 34, 41, 34, 34, 41, 42, 35, 35, 35, 35, 35, 35,
34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35,
34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 58, 59, 60, 35,
56, 57, 58, 34, 56, 57, 34, 57, 42, 35, 35, 35, 35, 35, 35, 35,
34, 39, 40, 41, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35,
34, 34, 34, 34, 34, 34, 50, 51, 35, 35, 35, 58, 59, 60, 35, 58,
52, 34, 34, 34, 34, 34, 56, 57, 59, 35, 59, 35, 40, 41, 42, 35,
58, 59, 34, 39, 40, 41, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35,
34, 34, 34, 34, 34, 34, 34, 34, 35, 52, 53, 54, 35, 35, 35, 35,
34, 51, 52, 34, 34, 34, 34, 34, 35, 58, 59, 60, 61, 35, 40, 41,
56, 57, 58, 59, 34, 39, 40, 41, 42, 35, 35, 35, 35, 35, 35, 35,
34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 53, 54, 35, 35,
34, 34, 34, 34, 52, 34, 34, 34, 35, 35, 35, 58, 59, 60, 61, 35,
34, 34, 56, 57, 58, 59, 34, 60, 40, 41, 42, 35, 35, 35, 35, 35,
34, 39, 40, 41, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 54,
34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 58, 59, 60,
34, 34, 34, 34, 34, 34, 56, 57, 61, 35, 62, 35, 40, 41, 42, 35,
58, 59, 34, 38, 39, 40, 41, 34, 35, 35, 35, 35, 35, 35, 35, 35,
34, 34, 34, 34, 34, 47, 48, 49, 35, 35, 35, 35, 35, 35, 35, 35,
34, 50, 51, 52, 34, 34, 34, 34, 35, 58, 59, 60, 61, 35, 38, 39,
38, 56, 57, 58, 59, 34, 38, 39, 40, 41, 42, 35, 35, 35, 35, 35,
40, 41, 34, 34, 34, 34, 34, 34, 35, 49, 50, 51, 35, 52, 53, 54,
34, 48, 49, 34, 50, 51, 52, 34, 35, 35, 35, 35, 35, 58, 59, 60,
34, 34, 34, 38, 56, 57, 58, 59, 61, 35, 39, 40, 41, 42, 35, 35,
34, 38, 39, 40, 41, 34, 34, 34, 35, 35, 35, 35, 49, 50, 51, 35,
34, 34, 34, 34, 34, 49, 34, 50, 52, 53, 54, 35, 35, 35, 35, 35,
51, 52, 34, 34, 34, 34, 38, 56, 58, 59, 60, 61, 35, 39, 40, 41,
57, 58, 59, 34, 37, 38, 39, 40, 42, 35, 35, 35, 35, 35, 35, 35,
41, 34, 43, 37, 34, 34, 34, 47, 50, 51, 35, 52, 53, 54, 35, 35,
48, 49, 34, 50, 51, 52, 34, 34, 35, 35, 35, 58, 59, 60, 61, 35,
34, 34, 38, 56, 57, 58, 59, 34, 39, 40, 41, 42, 35, 35, 35, 35,
37, 38, 39, 40, 41, 34, 34, 37, 35, 35, 35, 35, 51, 35, 52, 53,
34, 34, 34, 47, 48, 49, 34, 50, 54, 35, 35, 35, 35, 35, 58, 59,
51, 52, 34, 34, 34, 34, 38, 56, 60, 61, 35, 39, 35, 35, 35, 35,
57, 58, 59, 34, 37, 38, 39, 40, 35, 35, 35, 35, 35, 38, 39, 40,
41, 42, 43, 37, 34, 34, 34, 47, 41, 42, 35, 44, 45, 35, 35, 35,
48, 49, 34, 50, 51, 52, 34, 34, 49, 50, 51, 35, 52, 53, 54, 35,
34, 34, 38, 56, 57, 58, 59, 34, 35, 35, 35, 35, 58, 59, 60, 61,
35, 36, 34, 34, 34, 34, 34, 34, 35, 39, 35, 35, 35, 35, 35, 35,
34, 34, 34, 37, 38, 39, 40, 41, 35, 35, 35, 38, 39, 40, 41, 42,
42, 43, 37, 44, 34, 46, 47, 48, 35, 35, 45, 35, 35, 35, 49, 50,
49, 34, 50, 51, 52, 34, 34, 34, 51, 35, 52, 53, 54, 35, 35, 35,
34, 55, 56, 57, 58, 36, 34, 35, 35, 35, 58, 59, 60, 61, 35, 39,
34, 34, 34, 34, 34, 34, 34, 34, 35, 35, 35, 35, 35, 35, 35, 35,
34, 34, 34, 34, 34, 34, 34, 34, 35, 38, 39, 40, 41, 42, 35, 35,
34, 34, 34, 34, 34, 38, 39, 40, 35, 35, 35, 35, 49, 50, 51, 35,
41, 34, 34, 34, 34, 34, 34, 34, 52, 53, 54, 35, 35, 35, 35, 35,
34, 34, 34, 50, 51, 52, 34, 34, 58, 59, 60, 61, 35, 39, 35, 35,
34, 34, 34, 56, 57, 58, 59, 34, 35, 35, 35, 35, 35, 35, 35, 38,
35, 36, 34, 34, 34, 34, 34, 34, 39, 40, 41, 42, 43, 44, 45, 35,
34, 34, 34, 37, 38, 39, 40, 41, 35, 35, 49, 50, 51, 35, 52, 53,
42, 43, 37, 44, 45, 46, 47, 48, 54, 35, 35, 35, 35, 35, 58, 59,
49, 34, 50, 51, 52, 34, 34, 34, 60, 61, 35, 36, 37, 35, 35, 35,
34, 55, 56, 57, 58, 36, 34, 53, 35, 35, 35, 35, 35, 35, 38, 39,
54, 34, 54, 34, 62, 63, 61, 61, 40, 41, 42, 43, 44, 45, 46, 35,
61, 61, 61, 61, 61, 61, 61, 64, 48, 49, 50, 51, 35, 52, 53, 54,
65, 66, 67, 68, 69, 70, 64, 71, 35, 35, 35, 35, 57, 58, 59, 60,
1, 72, 73, 74, 75, 61, 76, 77, 57, 35, 36, 35, 36, 37, 35, 35,
78, 61, 61, 61, 61, 79, 80, 81, 35, 35, 35, 35, 35, 35, 35, 38,
82, 63, 61, 62, 63, 61, 61, 61, 39, 40, 41, 42, 43, 44, 45, 46,
61, 61, 61, 61, 61, 61, 64, 65, 47, 48, 49, 50, 51, 35, 52, 53,
66, 67, 68, 69, 70, 64, 71, 72, 54, 35, 35, 35, 35, 57, 58, 59,
72, 73, 74, 75, 61, 76, 77, 78, 60, 57, 35, 55, 56, 35, 56, 35,
61, 61, 61, 61, 79, 80, 81, 82, 64, 65, 63, 63, 63, 63, 63, 63,
63, 61, 62, 83, 64, 65, 66, 67, 63, 63, 63, 66, 67, 68, 69, 70,
68, 61, 61, 61, 61, 61, 61, 73, 71, 72, 73, 74, 1, 75, 76, 77,
74, 75, 61, 76, 77, 78, 61, 61, 78, 63, 79, 80, 81, 63, 63, 63,
61, 61, 65, 80, 81, 82, 84, 61, 63, 82, 83, 84, 85, 86, 63, 64,
65, 66, 67, 68, 61, 61, 61, 61, 65, 63, 63, 63, 63, 63, 63, 63,
61, 61, 61, 61, 61, 61, 76, 77, 63, 63, 66, 67, 68, 69, 70, 71,
78, 61, 61, 61, 61, 61, 80, 81, 72, 73, 74, 75, 75, 76, 77, 78,
82, 84, 61, 66, 67, 68, 61, 61, 63, 79, 80, 81, 63, 63, 63, 63,
61, 61, 61, 61, 61, 61, 61, 61, 82, 83, 84, 85, 86, 63, 64, 63,
61, 61, 61, 61, 61, 61, 61, 61, 63, 63, 63, 63, 63, 63, 63, 63,
80, 81, 82, 61, 67, 68, 61, 61, 63, 63, 63, 63, 63, 63, 63, 63,
61, 61, 61, 61, 61, 61, 61, 61, 63, 63, 63, 63, 67, 68, 69, 70,
61, 61, 61, 61, 61, 61, 61, 61, 63, 63, 63, 63, 63, 63, 63, 63,
80, 81, 82, 61, 68, 61, 61, 61, 63, 63, 79, 80, 81, 63, 63, 63,
61, 61, 61, 61, 61, 61, 61, 61, 63, 63, 83, 84, 85, 87, 63, 67,
61, 61, 61, 61, 61, 61, 61, 80, 68, 69, 70, 63, 63, 63, 63, 63,
81, 82, 61, 80, 81, 61, 81, 61, 63, 63, 63, 63, 63, 79, 80, 81,
66, 67, 68, 61, 61, 61, 61, 61, 63, 63, 63, 63, 63, 83, 84, 85,
61, 61, 61, 61, 61, 76, 77, 78, 87, 63, 68, 69, 70, 63, 63, 63,
61, 61, 61, 61, 61, 80, 81, 82, 63, 63, 63, 63, 63, 63, 63, 63,
84, 61, 66, 67, 68, 61, 61, 61, 63, 63, 63, 63, 63, 63, 63, 83,
61, 61, 61, 61, 61, 61, 61, 61, 84, 85, 63, 69, 70, 63, 63, 63,
77, 78, 61, 61, 61, 61, 61, 80, 63, 63, 63, 63, 63, 63, 63, 63,
81, 82, 84, 61, 66, 67, 68, 61, 63, 63, 63, 63, 63, 63, 63, 83,
61, 61, 61, 61, 61, 61, 61, 61, 84, 85, 63, 70, 63, 63, 63, 63,
61, 61, 61, 78, 61, 61, 61, 61, 63, 63, 63, 63, 63, 63, 63, 63,
61, 80, 81, 82, 84, 61, 86, 85, 63, 63, 63, 63, 63, 63, 83, 84,
66, 67, 68, 61, 61, 61, 61, 61, 85, 63, 83, 84, 63, 84, 63, 68,
61, 61, 61, 61, 61, 61, 61, 61, 69, 70, 63, 63, 63, 63, 63, 63,
61, 61, 61, 61, 61, 80, 81, 82, 63, 63, 63, 63, 79, 80, 81, 63,
84, 61, 65, 66, 67, 68, 61, 61, 63, 63, 63, 63, 83, 84, 85, 87,
61, 61, 61, 61, 73, 74, 75, 61, 63, 68, 69, 70, 63, 63, 63, 63,
76, 77, 78, 61, 61, 61, 61, 65, 63, 63, 63, 63, 63, 63, 63, 80,
80, 81, 82, 84, 61, 65, 66, 67, 81, 63, 63, 63, 63, 63, 83, 84,
68, 61, 61, 61, 61, 61, 61, 61, 85, 87, 63, 68, 69, 70, 63, 63,
74, 75, 61, 76, 77, 78, 61, 61, 63, 63, 63, 63, 63, 63, 63, 63,
61, 61, 65, 80, 81, 82, 84, 61, 63, 63, 81, 63, 63, 63, 63, 63,
65, 66, 67, 68, 61, 61, 61, 61, 83, 84, 85, 87, 63, 89, 88, 68,
61, 61, 61, 61, 75, 61, 76, 77, 69, 70, 63, 63, 63, 63, 63, 63,
78, 61, 61, 61, 61, 65, 80, 81, 63, 63, 63, 63, 63, 63, 63, 63,
82, 84, 61, 64, 65, 66, 67, 68, 63, 63, 63, 63, 83, 84, 85, 87,
61, 70, 64, 61, 61, 61, 73, 74, 63, 66, 67, 68, 69, 70, 63, 63,
75, 61, 76, 77, 78, 61, 61, 61, 63, 63, 63, 63, 76, 77, 78, 63,
61, 65, 80, 81, 82, 84, 61, 64, 79, 80, 81, 63, 63, 63, 63, 63,
65, 66, 67, 68, 61, 61, 64, 61, 83, 84, 85, 87, 63, 67, 68, 69,
61, 61, 73, 74, 75, 61, 76, 77, 70, 63, 63, 63, 63, 63, 63, 76,
78, 61, 61, 61, 61, 65, 80, 81, 77, 78, 63, 79, 80, 81, 63, 63,
82, 84, 61, 64, 65, 66, 67, 68, 63, 63, 63, 83, 84, 85, 87, 63,
69, 70, 64, 61, 61, 61, 73, 74, 67, 68, 69, 70, 63, 63, 63, 63,
75, 61, 76, 77, 78, 61, 61, 61, 63, 63, 63, 77, 78, 63, 79, 80,
61, 65, 80, 81, 82, 84, 61, 62, 81, 63, 63, 63, 63, 63, 83, 84,
63, 61, 61, 61, 61, 61, 61, 61, 85, 87, 63, 67, 68, 69, 70, 63,
61, 61, 64, 65, 66, 67, 68, 69, 63, 63, 63, 63, 63, 63, 63, 78,
70, 64, 71, 61, 72, 73, 74, 75, 63, 79, 80, 81, 63, 63, 63, 63,
61, 76, 77, 78, 61, 61, 61, 61, 63, 83, 84, 85, 87, 63, 67, 63,
79, 80, 81, 82, 63, 61, 62, 83, 63, 63, 63, 63, 63, 63, 63, 63,
83, 83, 83, 83, 83, 83, 83, 83, 66, 67, 68, 69, 70, 63, 72, 73,
83, 83, 83, 83, 83, 83, 83, 83, 63, 63, 63, 76, 77, 78, 63, 79,
83, 83, 83, 83, 65, 66, 67, 68, 80, 81, 63, 63, 63, 63, 63, 83,
83, 83, 83, 83, 83, 83, 83, 83, 84, 85, 87, 63, 67, 63, 63, 63,
83, 83, 76, 77, 78, 83, 83, 83, 63, 63, 63, 63, 63, 63, 66, 67,
83, 83, 80, 81, 82, 84, 83, 88, 68, 69, 70, 63, 63, 73, 63, 63,
87, 3, 89, 90, 91, 61, 61, 61, 63, 76, 77, 78, 63, 79, 80, 81,
61, 61, 61, 61, 61, 61, 92, 93, 63, 63, 63, 63, 63, 83, 84, 85,
94, 95, 96, 97, 98, 92, 99, 100, 87, 63, 67, 63, 63, 63, 63, 63,
101, 102, 103, 104, 61, 105, 106, 107, 63, 63, 63, 63, 66, 67, 68, 69,
61, 53, 54, 61, 108, 109, 110, 82, 70, 63, 63, 63, 63, 63, 63, 76,
91, 61, 90, 91, 61, 61, 61, 61, 77, 78, 63, 79, 80, 81, 63, 63,
61, 61, 61, 61, 61, 92, 93, 94, 63, 63, 63, 83, 84, 85, 87, 63,
95, 96, 97, 98, 92, 99, 101, 101, 67, 63, 63, 63, 63, 63, 63, 63,
102, 103, 104, 61, 105, 106, 107, 61, 63, 63, 66, 67, 68, 69, 70, 71,
61, 61, 61, 108, 109, 110, 82, 91, 72, 73, 63, 63, 63, 76, 77, 78,
61, 90, 83, 92, 93, 94, 95, 96, 63, 79, 80, 81, 63, 63, 63, 63,
61, 61, 61, 61, 61, 61, 102, 103, 63, 83, 84, 85, 87, 63, 64, 65,
104, 61, 105, 106, 107, 61, 61, 61, 63, 63, 63, 63, 63, 63, 63, 63,
61, 93, 109, 110, 82, 111, 61, 93, 63, 66, 67, 68, 69, 70, 71, 72,
94, 95, 96, 61, 61, 61, 61, 61, 73, 74, 63, 75, 76, 77, 78, 63,
61, 61, 61, 61, 61, 105, 106, 107, 79, 80, 81, 63, 63, 63, 63, 82,
61, 61, 61, 61, 61, 109, 110, 82, 83, 84, 85, 86, 63, 64, 90, 92,
111, 61, 94, 95, 96, 61, 61, 61, 91, 3, 93, 94, 95, 63, 63, 63,
61, 61, 61, 61, 61, 61, 61, 61, 63, 63, 63, 63, 63, 63, 96, 97,
61, 61, 61, 61, 61, 61, 61, 109, 98, 99, 100, 101, 102, 103, 104, 105,
110, 82, 61, 95, 96, 61, 61, 61, 106, 107, 108, 109, 63, 110, 111, 112,
61, 61, 61, 61, 61, 61, 61, 61, 63, 55, 56, 63, 113, 114, 115, 85,
61, 61, 61, 61, 61, 61, 61, 109, 116, 63, 94, 95, 63, 63, 63, 63,
110, 82, 61, 96, 61, 61, 61, 61, 63, 63, 63, 63, 63, 96, 97, 98,
61, 61, 61, 61, 61, 61, 61, 61, 99, 100, 101, 102, 103, 104, 106, 106,
61, 61, 61, 61, 61, 61, 109, 110, 107, 108, 109, 63, 110, 111, 112, 63,
82, 61, 109, 110, 61, 110, 61, 94, 63, 63, 63, 113, 114, 115, 85, 116,
95, 96, 61, 61, 61, 61, 61, 61, 63, 94, 63, 63, 63, 63, 63, 63,
61, 61, 61, 61, 105, 106, 107, 61, 63, 63, 63, 63, 63, 63, 63, 63,
61, 61, 61, 61, 109, 110, 82, 111, 63, 63, 63, 63, 63, 63, 63, 97,
61, 94, 95, 96, 61, 61, 61, 61, 98, 99, 100, 63, 63, 63, 63, 63,
61, 61, 61, 61, 61, 61, 61, 106, 63, 63, 63, 63, 63, 110, 111, 112,
107, 61, 61, 61, 61, 61, 109, 110, 63, 63, 63, 63, 63, 114, 115, 85,
82, 111, 61, 94, 95, 96, 61, 61, 117, 63, 97, 98, 99, 100, 63, 63,
61, 61, 61, 61, 61, 61, 61, 61, 63, 63, 63, 63, 63, 63, 63, 63,
61, 61, 107, 61, 61, 61, 61, 61, 110, 111, 112, 63, 63, 63, 63, 63,
109, 110, 82, 111, 61, 112, 85, 94, 114, 115, 85, 117, 63, 98, 99, 100,
95, 96, 61, 61, 61, 61, 61, 61, 63, 63, 63, 63, 63, 63, 63, 63,
61, 61, 61, 61, 61, 61, 61, 61, 63, 63, 63, 63, 63, 63, 63, 63,
61, 61, 61, 61, 109, 110, 82, 111, 63, 63, 114, 115, 85, 63, 99, 100,
61, 93, 94, 95, 96, 61, 61, 61, 63, 63, 63, 63, 63, 63, 63, 63,
61, 61, 61, 102, 103, 104, 61, 105, 63, 63, 63, 63, 63, 63, 63, 63,
106, 107, 61, 61, 61, 61, 93, 109, 63, 63, 114, 115, 85, 63, 100, 63,
110, 82, 111, 61, 93, 94, 95, 96, 63, 63, 63, 63, 63, 63, 63, 63,
61, 61, 61, 61, 61, 61, 61, 103, 63, 63, 63, 63, 63, 63, 63, 63,
104, 61, 105, 106, 107, 61, 61, 61, 63, 114, 115, 85, 63, 114, 115, 63,
61, 93, 109, 110, 82, 111, 61, 93, 115, 63, 98, 99, 100, 63, 63, 63,
94, 95, 96, 61, 61, 61, 61, 61, 63, 63, 63, 63, 63, 63, 63, 110,
61, 61, 61, 104, 61, 105, 106, 107, 111, 112, 63, 63, 63, 63, 63, 114,
61, 61, 61, 61, 93, 109, 110, 82, 115, 85, 117, 63, 98, 99, 100, 63,
111, 61, 92, 93, 94, 95, 96, 61, 63, 63, 63, 63, 63, 63, 63, 63,
98, 92, 61, 61, 61, 102, 103, 104, 63, 63, 111, 112, 63, 63, 63, 63,
61, 105, 106, 107, 61, 61, 61, 61, 63, 114, 115, 85, 117, 63, 98, 99,
93, 109, 110, 82, 111, 61, 92, 93, 100, 63, 63, 63, 63, 63, 63, 63,
94, 95, 96, 61, 61, 92, 61, 61, 63, 63, 63, 63, 63, 112, 63, 63,
61, 102, 103, 104, 61, 105, 106, 107, 63, 63, 63, 114, 115, 85, 117, 63,
61, 61, 61, 61, 93, 109, 110, 82, 118, 88, 98, 99, 100, 63, 63, 63,
111, 61, 92, 93, 94, 95, 96, 97, 63, 63, 63, 63, 63, 63, 63, 63,
98, 92, 61, 61, 61, 102, 103, 104, 63, 63, 63, 63, 63, 63, 63, 114,
61, 105, 106, 107, 61, 61, 61, 61, 115, 85, 117, 63, 96, 97, 98, 99,
93, 109, 110, 82, 111, 61, 90, 91, 100, 63, 63, 63, 63, 63, 63, 107,
61, 61, 61, 61, 61, 61, 61, 61, 108, 109, 63, 110, 111, 112, 63, 63,
61, 92, 93, 94, 95, 96, 97, 98, 63, 63, 63, 114, 115, 85, 117, 63,
92, 99, 61, 101, 102, 103, 104, 61, 97, 98, 99, 100, 63, 63, 63, 63,
105, 106, 107, 61, 61, 61, 61, 108, 63, 63, 107, 108, 109, 63, 110, 111,
109, 110, 82, 91, 61, 90, 83, 83, 112, 63, 63, 63, 63, 63, 114, 115,
83, 83, 83, 83, 83, 83, 83, 83, 85, 117, 63, 97, 98, 99, 100, 63,
83, 83, 83, 83, 83, 83, 83, 83, 63, 63, 63, 63, 63, 63, 108, 109,
83, 83, 83, 93, 94, 95, 96, 83, 63, 110, 111, 112, 63, 63, 63, 63,
83, 83, 83, 83, 83, 83, 83, 83, 63, 114, 115, 85, 117, 63, 97, 98,
83, 105, 106, 107, 83, 83, 83, 83, 99, 100, 63, 63, 63, 63, 63, 63,
83, 109, 110, 82, 111, 83, 90, 91, 63, 63, 109, 63, 110, 111, 112, 63,
61, 61, 61, 61, 61, 61, 61, 61, 63, 63, 63, 63, 114, 115, 85, 117,
61, 92, 93, 94, 95, 96, 97, 98, 63, 97, 63, 63, 63, 63, 63, 63,
92, 99, 100, 101, 102, 103, 104, 61, 63, 63, 63, 96, 97, 98, 99, 100,
105, 106, 107, 61, 61, 61, 61, 108, 63, 102, 103, 63, 63, 63, 107, 108,
109, 110, 82, 91, 61, 5, 6, 113, 109, 63, 110, 111, 112, 63, 63, 63,
113, 113, 113, 113, 113, 113, 113, 113, 63, 63, 114, 115, 85, 117, 63, 97,
9, 10, 11, 12, 13, 14, 15, 9, 63, 63, 63, 63, 63, 63, 63, 63,
16, 18, 18, 19, 20, 21, 113, 22, 63, 96, 97, 98, 99, 100, 63, 63,
23, 24, 113, 113, 113, 113, 28, 29, 103, 63, 63, 63, 107, 108, 109, 63,
30, 31, 6, 113, 5, 113, 9, 10, 110, 111, 112, 63, 63, 63, 63, 63,
11, 12, 13, 113, 113, 113, 113, 113, 114, 115, 85, 117, 63, 97, 63, 63,
113, 19, 20, 21, 113, 22, 23, 24, 63, 63, 63, 63, 63, 63, 63, 96,
113, 113, 113, 113, 10, 29, 30, 31, 97, 98, 99, 100, 63, 63, 63, 63,
114, 113, 10, 11, 12, 13, 113, 113, 63, 63, 107, 108, 109, 63, 110, 111,
113, 113, 113, 113, 113, 113, 113, 113, 112, 63, 63, 63, 63, 63, 114, 115,
22, 23, 24, 113, 113, 113, 113, 113, 85, 117, 63, 97, 63, 63, 63, 63,
29, 30, 31, 114, 113, 11, 12, 13, 63, 63, 63, 63, 63, 96, 97, 98,
113, 113, 113, 113, 113, 113, 113, 113, 99, 100, 101, 102, 103, 63, 63, 63,
113, 113, 113, 113, 113, 113, 113, 113, 107, 108, 109, 63, 110, 111, 112, 63,
113, 113, 29, 30, 31, 113, 12, 13, 63, 63, 63, 63, 114, 115, 85, 117,
113, 113, 113, 113, 113, 113, 113, 113, 63, 94, 95, 63, 63, 63, 63, 63,
113, 113, 113, 113, 113, 113, 113, 113, 63, 63, 63, 63, 96, 97, 98, 99,
113, 113, 29, 30, 31, 113, 13, 113, 100, 101, 102, 103, 104, 63, 106, 107,
113, 113, 113, 113, 113, 113, 113, 113, 108, 109, 63, 110, 111, 112, 63, 63,
113, 113, 113, 113, 113, 113, 113, 113, 63, 63, 113, 114, 115, 85, 116, 63,
113, 29, 30, 31, 113, 29, 30, 113, 94, 90, 94, 95, 63, 63, 63, 63,
30, 113, 11, 12, 13, 113, 113, 113, 63, 63, 63, 63, 63, 96, 97, 98,
113, 113, 113, 113, 113, 113, 113, 22, 99, 100, 101, 102, 103, 104, 105, 106,
23, 24, 113, 113, 113, 113, 113, 29, 107, 108, 109, 63, 110, 111, 112, 63,
30, 31, 114, 113, 11, 12, 13, 113, 63, 63, 63, 113, 114, 115, 85, 116,
113, 113, 113, 113, 113, 113, 113, 113, 63, 5, 6, 119, 119, 119, 119, 119,
113, 113, 23, 24, 113, 113, 113, 113, 119, 119, 119, 119, 9, 10, 11, 12,
113, 29, 30, 31, 114, 113, 11, 12, 13, 14, 15, 16, 17, 19, 19, 20,
13, 113, 113, 113, 113, 113, 113, 113, 21, 22, 119, 23, 24, 25, 119, 119,
113, 113, 113, 113, 113, 24, 113, 113, 119, 119, 29, 30, 31, 32, 29, 119,
113, 113, 113, 29, 30, 31, 114, 113, 5, 119, 119, 119, 119, 119, 119, 119,
115, 113, 11, 12, 13, 113, 113, 113, 119, 119, 119, 119, 119, 119, 119, 119,
113, 113, 113, 113, 113, 113, 113, 113, 119, 119, 119, 119, 119, 119, 10, 11,
113, 113, 113, 113, 113, 113, 113, 29, 12, 13, 119, 119, 119, 119, 119, 119,
30, 31, 114, 113, 10, 11, 12, 13, 119, 119, 119, 119, 23, 24, 25, 119,
113, 113, 113, 113, 113, 113, 19, 20, 119, 119, 119, 119, 30, 31, 32, 120,
21, 113, 22, 23, 24, 113, 113, 113, 119, 10, 11, 12, 13, 119, 119, 119,
113, 10, 29, 30, 31, 114, 113, 10, 119, 119, 119, 119, 119, 119, 119, 23,
11, 12, 13, 113, 113, 113, 113, 113, 24, 25, 119, 119, 119, 119, 119, 30,
113, 113, 20, 21, 113, 22, 23, 24, 31, 32, 120, 119, 11, 12, 13, 119,
113, 113, 113, 113, 10, 29, 30, 31, 119, 119, 119, 119, 119, 119, 119, 119,
114, 113, 10, 11, 12, 13, 113, 113, 119, 119, 119, 119, 119, 119, 119, 119,
113, 113, 113, 113, 113, 113, 21, 113, 119, 30, 31, 32, 119, 12, 13, 119,
22, 23, 24, 113, 113, 113, 113, 10, 119, 119, 119, 119, 119, 119, 119, 119,
29, 30, 31, 114, 113, 9, 10, 11, 119, 119, 119, 119, 119, 119, 119, 119,
12, 13, 113, 15, 9, 113, 113, 113, 119, 30, 31, 32, 119, 13, 119, 119,
19, 20, 21, 113, 22, 23, 24, 113, 119, 119, 119, 119, 119, 119, 119, 119,
113, 113, 113, 10, 29, 30, 31, 114, 119, 119, 119, 119, 119, 119, 119, 119,
113, 9, 10, 11, 12, 13, 113, 113, 30, 31, 32, 119, 30, 31, 119, 31,
9, 113, 113, 113, 19, 20, 21, 113, 119, 11, 12, 13, 119, 119, 119, 119,
22, 23, 24, 113, 113, 113, 113, 10, 119, 119, 119, 119, 119, 119, 23, 24,
29, 30, 31, 114, 113, 9, 10, 11, 25, 119, 119, 119, 119, 119, 30, 31,
12, 13, 14, 15, 9, 113, 113, 113, 32, 120, 119, 11, 12, 13, 119, 119,
19, 20, 21, 113, 22, 23, 24, 113, 119, 119, 119, 119, 119, 119, 119, 119,
113, 113, 113, 10, 29, 30, 31, 114, 119, 24, 25, 119, 119, 119, 119, 119,
113, 5, 6, 113, 113, 113, 113, 113, 30, 31, 32, 120, 119, 11, 12, 13,
113, 113, 113, 113, 9, 10, 11, 12, 119, 119, 119, 119, 119, 119, 119, 119,
13, 14, 15, 9, 16, 113, 18, 19, 119, 119, 119, 119, 25, 119, 119, 119,
20, 21, 113, 22, 23, 24, 113, 113, 119, 119, 30, 31, 32, 120, 119, 121,
113, 113, 28, 29, 30, 31, 6, 113, 119, 11, 12, 13, 119, 119, 119, 119,
5, 113, 113, 113, 113, 113, 113, 113, 119, 119, 119, 119, 119, 119, 119, 119,
113, 113, 113, 113, 113, 113, 113, 113, 119, 119, 119, 119, 119, 119, 30, 31,
113, 113, 113, 113, 113, 113, 10, 11, 32, 120, 119, 9, 10, 11, 12, 13,
12, 13, 113, 113, 113, 113, 113, 113, 119, 119, 119, 119, 119, 119, 20, 21,
113, 113, 113, 113, 22, 23, 24, 113, 22, 119, 23, 24, 25, 119, 119, 119,
113, 113, 113, 113, 29, 30, 31, 114, 119, 119, 30, 31, 32, 120, 119, 10,
113, 116, 113, 7, 113, 1, 113, 113, 11, 12, 13, 119, 119, 119, 119, 119,
113, 1, 113, 113, 113, 113, 113, 5, 119, 20, 21, 22, 119, 23, 24, 25,
6, 7, 113, 113, 113, 113, 113, 113, 119, 119, 119, 119, 119, 30, 31, 32,
113, 113, 9, 10, 11, 12, 13, 14, 120, 119, 10, 11, 12, 13, 119, 119,
15, 9, 16, 17, 18, 19, 20, 21, 119, 119, 119, 119, 119, 21, 22, 119,
113, 22, 23, 24, 113, 25, 26, 113, 23, 24, 25, 119, 119, 119, 119, 119,
28, 29, 30, 31, 6, 113, 5, 6, 30, 31, 32, 120, 119, 10, 11, 12,
113, 113, 113, 113, 113, 113, 113, 113, 13, 119, 119, 119, 119, 119, 119, 119,
113, 9, 10, 11, 12, 13, 14, 15, 119, 22, 119, 23, 24, 25, 119, 119,
9, 16, 17, 18, 19, 20, 21, 113, 119, 119, 119, 30, 31, 32, 120, 119,
22, 23, 24, 113, 113, 113, 113, 28, 10, 119, 119, 119, 119, 119, 119, 119,
29, 30, 31, 6, 113, 25, 26, 113, 119, 119, 9, 10, 11, 12, 13, 119,
26, 113, 1, 117, 117, 117, 1, 117, 15, 16, 119, 119, 119, 20, 21, 22,
119, 118, 32, 118, 32, 119, 118, 119, 119, 23, 24, 25, 119, 119, 119, 119,
118, 32, 118, 33, 118, 0 119, 30, 31, 32, 120, 119, 10, 119,
119, 119, 119, 119, 119, 119, 119, 119,
9, 10, 11, 12, 13, 119, 119, 16,
119, 119, 119, 20, 21, 22, 119, 23,
24, 25, 119, 119, 119, 119, 119, 30,
31, 32, 120, 119, 10, 119, 119, 119,
119, 119, 119, 119, 119, 119, 9, 10,
11, 12, 13, 119, 119, 119, 119, 119,
119, 20, 21, 22, 119, 23, 24, 25,
119, 119, 119, 119, 119, 30, 31, 32,
120, 119, 10, 119, 119, 119, 119, 119,
119, 119, 119, 119, 9, 10, 11, 12,
13, 14, 15, 16, 119, 119, 119, 20,
21, 22, 119, 23, 24, 25, 119, 119,
119, 119, 119, 30, 31, 32, 120, 119,
5, 6, 119, 119, 119, 119, 119, 119,
119, 119, 119, 9, 10, 11, 12, 13,
14, 15, 16, 17, 119, 19, 20, 21,
22, 119, 23, 24, 25, 119, 119, 119,
119, 29, 30, 31, 32, 29, 119, 5,
119, 122, 119, 7, 119, 1, 119, 119,
119, 1, 119, 119, 119, 119, 119, 5,
6, 7, 119, 119, 119, 119, 119, 119,
119, 119, 9, 10, 11, 12, 13, 14,
15, 16, 17, 18, 19, 20, 21, 22,
119, 23, 24, 25, 119, 26, 27, 119,
29, 30, 31, 32, 29, 119, 5, 6,
119, 119, 119, 119, 119, 119, 119, 119,
119, 9, 10, 11, 12, 13, 14, 15,
16, 17, 18, 19, 20, 21, 22, 119,
23, 24, 25, 119, 119, 119, 119, 29,
30, 31, 32, 29, 119, 26, 27, 119,
27, 119, 1, 123, 123, 123, 1, 123,
125, 124, 33, 124, 33, 125, 124, 125,
124, 33, 124, 34, 124, 0
}; };
static const char _use_syllable_machine_trans_targs[] = { static const char _use_syllable_machine_trans_targs[] = {
1, 27, 0, 50, 52, 76, 77, 98, 1, 28, 0, 52, 54, 79, 80, 102,
100, 78, 79, 80, 81, 82, 93, 94, 104, 92, 81, 82, 83, 84, 96, 97,
95, 101, 96, 90, 91, 92, 85, 86, 98, 99, 105, 100, 93, 94, 95, 87,
87, 102, 103, 104, 97, 83, 84, 0, 88, 89, 106, 107, 108, 101, 85, 86,
105, 107, 0, 2, 3, 4, 5, 6, 0, 109, 111, 0, 2, 3, 15, 4,
7, 8, 19, 20, 21, 24, 22, 16, 5, 6, 7, 19, 20, 21, 22, 25,
17, 18, 11, 12, 13, 25, 26, 23, 23, 16, 17, 18, 10, 11, 12, 26,
9, 10, 0, 14, 15, 0, 28, 29, 27, 24, 8, 9, 0, 13, 14, 0,
30, 31, 32, 33, 34, 45, 46, 47, 29, 30, 42, 31, 32, 33, 34, 46,
48, 42, 43, 44, 37, 38, 39, 49, 47, 48, 49, 50, 43, 44, 45, 37,
35, 36, 0, 0, 40, 0, 41, 0, 38, 39, 51, 35, 36, 0, 51, 40,
51, 0, 53, 54, 55, 56, 57, 58, 0, 41, 0, 0, 53, 0, 55, 56,
59, 70, 71, 72, 75, 73, 67, 68, 68, 57, 58, 59, 60, 72, 73, 74,
69, 62, 63, 64, 74, 60, 61, 65, 75, 78, 76, 69, 70, 71, 63, 64,
66, 0, 88, 89, 99, 0, 0, 106 65, 77, 61, 62, 77, 66, 67, 0,
90, 91, 103, 0, 0, 110
}; };
static const char _use_syllable_machine_trans_actions[] = { static const char _use_syllable_machine_trans_actions[] = {
0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 3, 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, 4, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 5, 0, 0, 0, 0, 0, 4, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 6, 0, 0, 7, 0, 0, 0, 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, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 8, 9, 0, 10, 0, 11, 0, 0, 8, 0, 0, 9, 10, 0,
0, 12, 0, 0, 0, 0, 0, 0, 11, 0, 12, 13, 0, 14, 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, 13, 0, 0, 0, 14, 15, 0 0, 8, 0, 0, 10, 0, 0, 15,
0, 0, 0, 16, 17, 0
}; };
static const char _use_syllable_machine_to_state_actions[] = { static const char _use_syllable_machine_to_state_actions[] = {
@ -514,7 +551,7 @@ 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
}; };
static const char _use_syllable_machine_from_state_actions[] = { static const char _use_syllable_machine_from_state_actions[] = {
@ -531,24 +568,24 @@ 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
}; };
static const short _use_syllable_machine_eof_trans[] = { static const short _use_syllable_machine_eof_trans[] = {
0, 35, 35, 35, 35, 35, 35, 35, 0, 36, 36, 36, 36, 36, 36, 36,
35, 35, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36, 36, 36, 36, 36,
35, 35, 35, 35, 35, 35, 35, 35, 36, 36, 36, 36, 36, 36, 36, 36,
35, 35, 35, 62, 62, 84, 62, 62, 36, 36, 36, 36, 64, 64, 64, 64,
62, 62, 62, 62, 62, 62, 62, 62, 64, 64, 64, 64, 64, 64, 64, 64,
86, 62, 62, 62, 62, 62, 62, 62, 89, 64, 64, 64, 64, 64, 64, 64,
62, 84, 88, 90, 62, 62, 84, 62, 64, 64, 64, 91, 92, 94, 64, 64,
62, 62, 62, 62, 62, 62, 62, 62, 64, 64, 64, 64, 64, 64, 64, 64,
62, 86, 62, 62, 62, 62, 62, 62, 64, 64, 89, 64, 64, 64, 64, 64,
62, 62, 84, 62, 114, 114, 114, 114, 64, 64, 64, 64, 64, 91, 64, 120,
114, 114, 114, 114, 114, 114, 114, 114, 120, 120, 120, 120, 120, 120, 120, 120,
114, 114, 114, 114, 114, 114, 114, 114, 120, 120, 120, 120, 120, 120, 120, 120,
114, 114, 114, 114, 114, 114, 114, 114, 120, 120, 120, 120, 120, 120, 120, 120,
118, 119, 119, 119 120, 120, 120, 120, 124, 125, 125, 125
}; };
static const int use_syllable_machine_start = 0; static const int use_syllable_machine_start = 0;
@ -647,7 +684,7 @@ find_syllables_use (hb_buffer_t *buffer)
unsigned int act HB_UNUSED; unsigned int act HB_UNUSED;
int cs; int cs;
#line 651 "hb-ot-shape-complex-use-machine.hh" #line 688 "hb-ot-shape-complex-use-machine.hh"
{ {
cs = use_syllable_machine_start; cs = use_syllable_machine_start;
ts = 0; ts = 0;
@ -660,7 +697,7 @@ find_syllables_use (hb_buffer_t *buffer)
unsigned int syllable_serial = 1; unsigned int syllable_serial = 1;
#line 664 "hb-ot-shape-complex-use-machine.hh" #line 701 "hb-ot-shape-complex-use-machine.hh"
{ {
int _slen; int _slen;
int _trans; int _trans;
@ -674,7 +711,7 @@ _resume:
#line 1 "NONE" #line 1 "NONE"
{ts = p;} {ts = p;}
break; break;
#line 678 "hb-ot-shape-complex-use-machine.hh" #line 715 "hb-ot-shape-complex-use-machine.hh"
} }
_keys = _use_syllable_machine_trans_keys + (cs<<1); _keys = _use_syllable_machine_trans_keys + (cs<<1);
@ -692,7 +729,7 @@ _eof_trans:
goto _again; goto _again;
switch ( _use_syllable_machine_trans_actions[_trans] ) { switch ( _use_syllable_machine_trans_actions[_trans] ) {
case 8: case 9:
#line 171 "hb-ot-shape-complex-use-machine.rl" #line 171 "hb-ot-shape-complex-use-machine.rl"
{te = p+1;{ found_syllable (use_standard_cluster); }} {te = p+1;{ found_syllable (use_standard_cluster); }}
break; break;
@ -708,11 +745,7 @@ _eof_trans:
#line 177 "hb-ot-shape-complex-use-machine.rl" #line 177 "hb-ot-shape-complex-use-machine.rl"
{te = p+1;{ found_syllable (use_non_cluster); }} {te = p+1;{ found_syllable (use_non_cluster); }}
break; break;
case 9: case 11:
#line 169 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_virama_terminated_cluster); }}
break;
case 10:
#line 170 "hb-ot-shape-complex-use-machine.rl" #line 170 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_sakot_terminated_cluster); }} {te = p;p--;{ found_syllable (use_sakot_terminated_cluster); }}
break; break;
@ -720,11 +753,11 @@ _eof_trans:
#line 171 "hb-ot-shape-complex-use-machine.rl" #line 171 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_standard_cluster); }} {te = p;p--;{ found_syllable (use_standard_cluster); }}
break; break;
case 12: case 14:
#line 172 "hb-ot-shape-complex-use-machine.rl" #line 172 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_number_joiner_terminated_cluster); }} {te = p;p--;{ found_syllable (use_number_joiner_terminated_cluster); }}
break; break;
case 11: case 13:
#line 173 "hb-ot-shape-complex-use-machine.rl" #line 173 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_numeral_cluster); }} {te = p;p--;{ found_syllable (use_numeral_cluster); }}
break; break;
@ -732,19 +765,43 @@ _eof_trans:
#line 174 "hb-ot-shape-complex-use-machine.rl" #line 174 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_symbol_cluster); }} {te = p;p--;{ found_syllable (use_symbol_cluster); }}
break; break;
case 15: case 17:
#line 175 "hb-ot-shape-complex-use-machine.rl" #line 175 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_hieroglyph_cluster); }} {te = p;p--;{ found_syllable (use_hieroglyph_cluster); }}
break; break;
case 13: case 15:
#line 176 "hb-ot-shape-complex-use-machine.rl" #line 176 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_broken_cluster); }} {te = p;p--;{ found_syllable (use_broken_cluster); }}
break; break;
case 14: case 16:
#line 177 "hb-ot-shape-complex-use-machine.rl" #line 177 "hb-ot-shape-complex-use-machine.rl"
{te = p;p--;{ found_syllable (use_non_cluster); }} {te = p;p--;{ found_syllable (use_non_cluster); }}
break; break;
#line 748 "hb-ot-shape-complex-use-machine.hh" case 12:
#line 1 "NONE"
{ switch( act ) {
case 1:
{{p = ((te))-1;} found_syllable (use_virama_terminated_cluster); }
break;
case 2:
{{p = ((te))-1;} found_syllable (use_sakot_terminated_cluster); }
break;
}
}
break;
case 8:
#line 1 "NONE"
{te = p+1;}
#line 169 "hb-ot-shape-complex-use-machine.rl"
{act = 1;}
break;
case 10:
#line 1 "NONE"
{te = p+1;}
#line 170 "hb-ot-shape-complex-use-machine.rl"
{act = 2;}
break;
#line 805 "hb-ot-shape-complex-use-machine.hh"
} }
_again: _again:
@ -753,7 +810,7 @@ _again:
#line 1 "NONE" #line 1 "NONE"
{ts = 0;} {ts = 0;}
break; break;
#line 757 "hb-ot-shape-complex-use-machine.hh" #line 814 "hb-ot-shape-complex-use-machine.hh"
} }
if ( ++p != pe ) if ( ++p != pe )

10
src/hb-ot-shape-complex-use-machine.rl
View File

@ -76,7 +76,7 @@ export ZWNJ = 14; # Zero width non-joiner
export WJ = 16; # Word joiner export WJ = 16; # Word joiner
export R = 18; # REPHA export R = 18; # REPHA
export CS = 43; # CONS_WITH_STACKER export CS = 43; # CONS_WITH_STACKER
export HVM = 44; # HALANT_OR_VOWEL_MODIFIER export IS = 44; # INVISIBLE_STACKER
export Sk = 48; # SAKOT export Sk = 48; # SAKOT
export G = 49; # HIEROGLYPH export G = 49; # HIEROGLYPH
export J = 50; # HIEROGLYPH_JOINER export J = 50; # HIEROGLYPH_JOINER
@ -107,12 +107,12 @@ export FMBlw = 46; # CONS_FINAL_MOD UIPC = Bottom
export FMPst = 47; # CONS_FINAL_MOD UIPC = Not_Applicable export FMPst = 47; # CONS_FINAL_MOD UIPC = Not_Applicable
h = H | HVM | Sk; h = H | IS | Sk;
consonant_modifiers = CMAbv* CMBlw* ((h B | SUB) CMAbv? CMBlw*)*; consonant_modifiers = CMAbv* CMBlw* ((h B | SUB) CMAbv? CMBlw*)*;
medial_consonants = MPre? MAbv? MBlw? MPst?; medial_consonants = MPre? MAbv? MBlw? MPst?;
dependent_vowels = VPre* VAbv* VBlw* VPst*; dependent_vowels = VPre* VAbv* VBlw* VPst* | H;
vowel_modifiers = HVM? VMPre* VMAbv* VMBlw* VMPst*; vowel_modifiers = VMPre* VMAbv* VMBlw* VMPst*;
final_consonants = FAbv* FBlw* FPst*; final_consonants = FAbv* FBlw* FPst*;
final_modifiers = FMAbv* FMBlw* | FMPst?; final_modifiers = FMAbv* FMBlw* | FMPst?;
@ -135,7 +135,7 @@ symbol_cluster_tail = SMAbv+ SMBlw* | SMBlw+;
virama_terminated_cluster_tail = virama_terminated_cluster_tail =
consonant_modifiers consonant_modifiers
h IS
; ;
virama_terminated_cluster = virama_terminated_cluster =
complex_syllable_start complex_syllable_start

28
src/hb-ot-shape-complex-use-table.hh
View File

@ -53,7 +53,7 @@
#define GB USE(GB) /* BASE_OTHER */ #define GB USE(GB) /* BASE_OTHER */
#define H USE(H) /* HALANT */ #define H USE(H) /* HALANT */
#define HN USE(HN) /* HALANT_NUM */ #define HN USE(HN) /* HALANT_NUM */
#define HVM USE(HVM) /* HALANT_OR_VOWEL_MODIFIER */ #define IS USE(IS) /* INVISIBLE_STACKER */
#define J USE(J) /* HIEROGLYPH_JOINER */ #define J USE(J) /* HIEROGLYPH_JOINER */
#define N USE(N) /* BASE_NUM */ #define N USE(N) /* BASE_NUM */
#define O USE(O) /* OTHER */ #define O USE(O) /* OTHER */
@ -278,7 +278,7 @@ static const uint8_t use_table[] = {
/* 1000 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 1000 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 1010 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 1010 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 1020 */ B, B, B, B, B, B, B, B, B, B, B, VPst, VPst, VAbv, VAbv, VBlw, /* 1020 */ B, B, B, B, B, B, B, B, B, B, B, VPst, VPst, VAbv, VAbv, VBlw,
/* 1030 */ VBlw, VPre, VAbv, VAbv, VAbv, VAbv, VMAbv, VMBlw, VMPst, H, VAbv, MPst, MPre, MBlw, MBlw, B, /* 1030 */ VBlw, VPre, VAbv, VAbv, VAbv, VAbv, VMAbv, VMBlw, VMPst, IS, VAbv, MPst, MPre, MBlw, MBlw, B,
/* 1040 */ B, B, B, B, B, B, B, B, B, B, O, GB, O, O, GB, O, /* 1040 */ B, B, B, B, B, B, B, B, B, B, O, GB, O, O, GB, O,
/* 1050 */ B, B, B, B, B, B, VPst, VPst, VBlw, VBlw, B, B, B, B, MBlw, MBlw, /* 1050 */ B, B, B, B, B, B, VPst, VPst, VBlw, VBlw, B, B, B, B, MBlw, MBlw,
/* 1060 */ MBlw, B, VPst, VMPst, VMPst, B, B, VPst, VPst, VMPst, VMPst, VMPst, VMPst, VMPst, B, B, /* 1060 */ MBlw, B, VPst, VMPst, VMPst, B, B, VPst, VPst, VMPst, VMPst, VMPst, VMPst, VMPst, B, B,
@ -316,7 +316,7 @@ static const uint8_t use_table[] = {
/* 17A0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 17A0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 17B0 */ B, B, B, B, CGJ, CGJ, VPst, VAbv, VAbv, VAbv, VAbv, VBlw, VBlw, VBlw, VPre, VPre, /* 17B0 */ B, B, B, B, CGJ, CGJ, VPst, VAbv, VAbv, VAbv, VAbv, VBlw, VBlw, VBlw, VPre, VPre,
/* 17C0 */ VPre, VPre, VPre, VPre, VPre, VPre, VMAbv, VMPst, VPst, VMAbv, VMAbv, FMAbv, FAbv, CMAbv, FMAbv, VMAbv, /* 17C0 */ VPre, VPre, VPre, VPre, VPre, VPre, VMAbv, VMPst, VPst, VMAbv, VMAbv, FMAbv, FAbv, CMAbv, FMAbv, VMAbv,
/* 17D0 */ FMAbv, VAbv, H, FMAbv, O, O, O, O, O, O, O, O, B, FMAbv, WJ, WJ, /* 17D0 */ FMAbv, VAbv, IS, FMAbv, O, O, O, O, O, O, O, O, B, FMAbv, WJ, WJ,
/* 17E0 */ B, B, B, B, B, B, B, B, B, B, WJ, WJ, WJ, WJ, WJ, WJ, /* 17E0 */ B, B, B, B, B, B, B, B, B, B, WJ, WJ, WJ, WJ, WJ, WJ,
/* 17F0 */ O, O, O, O, O, O, O, O, O, O, WJ, WJ, WJ, WJ, WJ, WJ, /* 17F0 */ O, O, O, O, O, O, O, O, O, O, WJ, WJ, WJ, WJ, WJ, WJ,
@ -396,7 +396,7 @@ static const uint8_t use_table[] = {
/* 1B80 */ VMAbv, FAbv, VMPst, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 1B80 */ VMAbv, FAbv, VMPst, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 1B90 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 1B90 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 1BA0 */ B, SUB, SUB, SUB, VAbv, VBlw, VPre, VPst, VAbv, VAbv, VPst, H, SUB, SUB, B, B, /* 1BA0 */ B, SUB, SUB, SUB, VAbv, VBlw, VPre, VPst, VAbv, VAbv, VPst, IS, SUB, SUB, B, B,
/* 1BB0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 1BB0 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* Batak */ /* Batak */
@ -555,7 +555,7 @@ static const uint8_t use_table[] = {
/* Meetei Mayek Extensions */ /* Meetei Mayek Extensions */
/* AAE0 */ B, B, B, B, B, B, B, B, B, B, B, VPre, VBlw, VAbv, VPre, VPst, /* AAE0 */ B, B, B, B, B, B, B, B, B, B, B, VPre, VBlw, VAbv, VPre, VPst,
/* AAF0 */ O, O, O, O, O, VMPst, H, WJ, /* AAF0 */ O, O, O, O, O, VMPst, IS, WJ,
#define use_offset_0xabc0u 4040 #define use_offset_0xabc0u 4040
@ -606,7 +606,7 @@ static const uint8_t use_table[] = {
/* 10A00 */ B, VBlw, VBlw, VBlw, WJ, VAbv, VBlw, WJ, WJ, WJ, WJ, WJ, VPst, VMBlw, VMBlw, VMAbv, /* 10A00 */ B, VBlw, VBlw, VBlw, WJ, VAbv, VBlw, WJ, WJ, WJ, WJ, WJ, VPst, VMBlw, VMBlw, VMAbv,
/* 10A10 */ B, B, B, B, WJ, B, B, B, WJ, B, B, B, B, B, B, B, /* 10A10 */ B, B, B, B, WJ, B, B, B, WJ, B, B, B, B, B, B, B,
/* 10A20 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 10A20 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 10A30 */ B, B, B, B, B, B, WJ, WJ, CMAbv, CMBlw, CMBlw, WJ, WJ, WJ, WJ, H, /* 10A30 */ B, B, B, B, B, B, WJ, WJ, CMAbv, CMBlw, CMBlw, WJ, WJ, WJ, WJ, IS,
/* 10A40 */ B, B, B, B, B, B, B, B, B, WJ, WJ, WJ, WJ, WJ, WJ, WJ, /* 10A40 */ B, B, B, B, B, B, B, B, B, WJ, WJ, WJ, WJ, WJ, WJ, WJ,
#define use_offset_0x10ac0u 4304 #define use_offset_0x10ac0u 4304
@ -699,7 +699,7 @@ static const uint8_t use_table[] = {
/* 11100 */ VMAbv, VMAbv, VMAbv, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 11100 */ VMAbv, VMAbv, VMAbv, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11110 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 11110 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11120 */ B, B, B, B, B, B, B, VBlw, VBlw, VBlw, VAbv, VAbv, VPre, VBlw, VAbv, VAbv, /* 11120 */ B, B, B, B, B, B, B, VBlw, VBlw, VBlw, VAbv, VAbv, VPre, VBlw, VAbv, VAbv,
/* 11130 */ VBlw, VAbv, VAbv, H, CMAbv, WJ, B, B, B, B, B, B, B, B, B, B, /* 11130 */ VBlw, VAbv, VAbv, IS, CMAbv, WJ, B, B, B, B, B, B, B, B, B, B,
/* 11140 */ O, O, O, O, B, VPst, VPst, B, WJ, WJ, WJ, WJ, WJ, WJ, WJ, WJ, /* 11140 */ O, O, O, O, B, VPst, VPst, B, WJ, WJ, WJ, WJ, WJ, WJ, WJ, WJ,
/* Mahajani */ /* Mahajani */
@ -752,7 +752,7 @@ static const uint8_t use_table[] = {
/* 11310 */ B, WJ, WJ, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 11310 */ B, WJ, WJ, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11320 */ B, B, B, B, B, B, B, B, B, WJ, B, B, B, B, B, B, /* 11320 */ B, B, B, B, B, B, B, B, B, WJ, B, B, B, B, B, B,
/* 11330 */ B, WJ, B, B, WJ, B, B, B, B, B, WJ, CMBlw, CMBlw, B, VPst, VPst, /* 11330 */ B, WJ, B, B, WJ, B, B, B, B, B, WJ, CMBlw, CMBlw, B, VPst, VPst,
/* 11340 */ VAbv, VPst, VPst, VPst, VPst, WJ, WJ, VPre, VPre, WJ, WJ, VPre, VPre, HVM, WJ, WJ, /* 11340 */ VAbv, VPst, VPst, VPst, VPst, WJ, WJ, VPre, VPre, WJ, WJ, VPre, VPre, H, WJ, WJ,
/* 11350 */ O, WJ, WJ, WJ, WJ, WJ, WJ, VPst, WJ, WJ, WJ, WJ, WJ, O, B, B, /* 11350 */ O, WJ, WJ, WJ, WJ, WJ, WJ, VPst, WJ, WJ, WJ, WJ, WJ, O, B, B,
/* 11360 */ B, B, VPst, VPst, WJ, WJ, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, WJ, WJ, WJ, /* 11360 */ B, B, VPst, VPst, WJ, WJ, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, WJ, WJ, WJ,
/* 11370 */ VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, WJ, WJ, WJ, /* 11370 */ VMAbv, VMAbv, VMAbv, VMAbv, VMAbv, WJ, WJ, WJ,
@ -842,7 +842,7 @@ static const uint8_t use_table[] = {
/* 11900 */ B, B, B, B, B, B, B, WJ, WJ, B, WJ, WJ, B, B, B, B, /* 11900 */ B, B, B, B, B, B, B, WJ, WJ, B, WJ, WJ, B, B, B, B,
/* 11910 */ B, B, B, B, WJ, B, B, WJ, B, B, B, B, B, B, B, B, /* 11910 */ B, B, B, B, WJ, B, B, WJ, B, B, B, B, B, B, B, B,
/* 11920 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 11920 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11930 */ VPst, VPst, VPst, VPst, VPst, VPre, WJ, VPre, VPre, WJ, WJ, VMAbv, VMAbv, VPst, H, R, /* 11930 */ VPst, VPst, VPst, VPst, VPst, VPre, WJ, VPre, VPre, WJ, WJ, VMAbv, VMAbv, VPst, IS, R,
/* 11940 */ MPst, R, MPst, CMBlw, O, O, O, WJ, WJ, WJ, WJ, WJ, WJ, WJ, WJ, WJ, /* 11940 */ MPst, R, MPst, CMBlw, O, O, O, WJ, WJ, WJ, WJ, WJ, WJ, WJ, WJ, WJ,
/* 11950 */ B, B, B, B, B, B, B, B, B, B, WJ, WJ, WJ, WJ, WJ, WJ, /* 11950 */ B, B, B, B, B, B, B, B, B, B, WJ, WJ, WJ, WJ, WJ, WJ,
@ -864,7 +864,7 @@ static const uint8_t use_table[] = {
/* 11A10 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 11A10 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11A20 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 11A20 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11A30 */ B, B, B, FMBlw, VBlw, VMAbv, VMAbv, VMAbv, VMAbv, VMPst, R, MBlw, MBlw, MBlw, MBlw, GB, /* 11A30 */ B, B, B, FMBlw, VBlw, VMAbv, VMAbv, VMAbv, VMAbv, VMPst, R, MBlw, MBlw, MBlw, MBlw, GB,
/* 11A40 */ O, O, O, O, O, GB, O, H, WJ, WJ, WJ, WJ, WJ, WJ, WJ, WJ, /* 11A40 */ O, O, O, O, O, GB, O, IS, WJ, WJ, WJ, WJ, WJ, WJ, WJ, WJ,
/* Soyombo */ /* Soyombo */
@ -872,7 +872,7 @@ static const uint8_t use_table[] = {
/* 11A60 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 11A60 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11A70 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 11A70 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11A80 */ B, B, B, B, R, R, R, R, R, R, FBlw, FBlw, FBlw, FBlw, FBlw, FBlw, /* 11A80 */ B, B, B, B, R, R, R, R, R, R, FBlw, FBlw, FBlw, FBlw, FBlw, FBlw,
/* 11A90 */ FBlw, FBlw, FBlw, FBlw, FBlw, FBlw, VMAbv, VMPst, CMAbv, H, O, O, O, B, O, O, /* 11A90 */ FBlw, FBlw, FBlw, FBlw, FBlw, FBlw, VMAbv, VMPst, CMAbv, IS, O, O, O, B, O, O,
#define use_offset_0x11c00u 6592 #define use_offset_0x11c00u 6592
@ -904,7 +904,7 @@ static const uint8_t use_table[] = {
/* 11D10 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 11D10 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11D20 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 11D20 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11D30 */ B, VAbv, VAbv, VAbv, VAbv, VAbv, VBlw, WJ, WJ, WJ, VAbv, WJ, VAbv, VAbv, WJ, VAbv, /* 11D30 */ B, VAbv, VAbv, VAbv, VAbv, VAbv, VBlw, WJ, WJ, WJ, VAbv, WJ, VAbv, VAbv, WJ, VAbv,
/* 11D40 */ VMAbv, VMAbv, CMBlw, VAbv, VBlw, H, R, MBlw, WJ, WJ, WJ, WJ, WJ, WJ, WJ, WJ, /* 11D40 */ VMAbv, VMAbv, CMBlw, VAbv, VBlw, IS, R, MBlw, WJ, WJ, WJ, WJ, WJ, WJ, WJ, WJ,
/* 11D50 */ B, B, B, B, B, B, B, B, B, B, WJ, WJ, WJ, WJ, WJ, WJ, /* 11D50 */ B, B, B, B, B, B, B, B, B, B, WJ, WJ, WJ, WJ, WJ, WJ,
/* Gunjala Gondi */ /* Gunjala Gondi */
@ -912,7 +912,7 @@ static const uint8_t use_table[] = {
/* 11D60 */ B, B, B, B, B, B, WJ, B, B, WJ, B, B, B, B, B, B, /* 11D60 */ B, B, B, B, B, B, WJ, B, B, WJ, B, B, B, B, B, B,
/* 11D70 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, /* 11D70 */ B, B, B, B, B, B, B, B, B, B, B, B, B, B, B, B,
/* 11D80 */ B, B, B, B, B, B, B, B, B, B, VPst, VPst, VPst, VPst, VPst, WJ, /* 11D80 */ B, B, B, B, B, B, B, B, B, B, VPst, VPst, VPst, VPst, VPst, WJ,
/* 11D90 */ VAbv, VAbv, WJ, VPst, VPst, VMAbv, VMPst, H, O, WJ, WJ, WJ, WJ, WJ, WJ, WJ, /* 11D90 */ VAbv, VAbv, WJ, VPst, VPst, VMAbv, VMPst, IS, O, WJ, WJ, WJ, WJ, WJ, WJ, WJ,
/* 11DA0 */ B, B, B, B, B, B, B, B, B, B, WJ, WJ, WJ, WJ, WJ, WJ, /* 11DA0 */ B, B, B, B, B, B, B, B, B, B, WJ, WJ, WJ, WJ, WJ, WJ,
#define use_offset_0x11ee0u 6952 #define use_offset_0x11ee0u 6952
@ -1531,7 +1531,7 @@ hb_use_get_category (hb_glyph_info_t info)
#undef GB #undef GB
#undef H #undef H
#undef HN #undef HN
#undef HVM #undef IS
#undef J #undef J
#undef N #undef N
#undef O #undef O

2
src/hb-ot-shape-complex-use.cc
View File

@ -350,7 +350,7 @@ record_pref_use (const hb_ot_shape_plan_t *plan HB_UNUSED,
static inline bool static inline bool
is_halant_use (const hb_glyph_info_t &info) is_halant_use (const hb_glyph_info_t &info)
{ {
return (info.use_category() == USE(H) || info.use_category() == USE(HVM)) && return (info.use_category() == USE(H) || info.use_category() == USE(IS)) &&
!_hb_glyph_info_ligated (&info); !_hb_glyph_info_ligated (&info);
} }

BIN
test/shape/data/in-house/fonts/23406a60ab081c4fb15e1596ea1cd4f27ae8443e.ttf Normal file
View File

Binary file not shown.

1
test/shape/data/in-house/tests/use-syllable.tests
View File

@ -3,6 +3,7 @@
../fonts/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf;;U+AA00,U+AA35,U+AA33;[a_cham=0+1121|laMedial_cham=0@-32,0+0|yaMedial_cham=0+542] ../fonts/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf;;U+AA00,U+AA35,U+AA33;[a_cham=0+1121|laMedial_cham=0@-32,0+0|yaMedial_cham=0+542]
../fonts/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf;;U+AA00,U+AA35,U+AA36;[a_cham=0+1121|laMedial_waMedial_cham=0@43,0+0] ../fonts/e68a88939e0f06e34d2bc911f09b70890289c8fd.ttf;;U+AA00,U+AA35,U+AA36;[a_cham=0+1121|laMedial_waMedial_cham=0@43,0+0]
../fonts/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf;--no-glyph-names;U+11320,U+20F0,U+11367;[3=0+502|1=0@33,0+0|4=0@300,8+0] ../fonts/074a5ae6b19de8f29772fdd5df2d3d833f81f5e6.ttf;--no-glyph-names;U+11320,U+20F0,U+11367;[3=0+502|1=0@33,0+0|4=0@300,8+0]
../fonts/23406a60ab081c4fb15e1596ea1cd4f27ae8443e.ttf;;U+A8AC,U+A8B4,U+A8C4;[uniA8AC=0+586|uniA8B4=0+316|uniA8C4=0+0]
../fonts/373e67bf41ca264e260a9716162b71a23549e885.ttf;--no-glyph-names;U+A8AC,U+A8B4,U+A8B5;[2=0+377|3=0+242|4=0+210] ../fonts/373e67bf41ca264e260a9716162b71a23549e885.ttf;--no-glyph-names;U+A8AC,U+A8B4,U+A8B5;[2=0+377|3=0+242|4=0+210]
../fonts/59a585a63b3df608fbeef00956c8c108deec7de6.ttf;--no-glyph-names;U+1BC7,U+1BEA,U+1BF3;[1=0+749|2=0+402|4=0+535|3=0+401] ../fonts/59a585a63b3df608fbeef00956c8c108deec7de6.ttf;--no-glyph-names;U+1BC7,U+1BEA,U+1BF3;[1=0+749|2=0+402|4=0+535|3=0+401]
../fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf;;U+11064,U+1107F,U+11052,U+11065,U+1107F,U+11053;[brm_num100.1=0+2224|brm_num1000.2=3+1834] ../fonts/1ed7e9064f008f62de6ff0207bb4dd29409597a5.ttf;;U+11064,U+1107F,U+11052,U+11065,U+1107F,U+11053;[brm_num100.1=0+2224|brm_num1000.2=3+1834]

1
test/shape/data/in-house/tests/use.tests
View File

@ -9,6 +9,7 @@
../fonts/2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf;;U+11124,U+11131,U+11134;[u11124=0+514|u11131=0+0|uni25CC=0+547|u11134=0+0] ../fonts/2a670df15b73a5dc75a5cc491bde5ac93c5077dc.ttf;;U+11124,U+11131,U+11134;[u11124=0+514|u11131=0+0|uni25CC=0+547|u11134=0+0]
../fonts/573d3a3177c9a8646e94c8a0d7b224334340946a.ttf;;U+11410,U+11442,U+11411,U+11440,U+11443,U+11410,U+11442,U+11411,U+11441,U+11443;[E_dv.alt=0+275|Ga.icd=0+367|Gha.diag=0@100,0+386|AA_dv.alt=0+208|Candrabindu=0@17,-8+0|E_dv.alt=5+275|Ga.icd=5+367|Gha.diag=5@100,0+386|AU_dv_part.alt=5+213|Candrabindu.sm=5@-52,179+0] ../fonts/573d3a3177c9a8646e94c8a0d7b224334340946a.ttf;;U+11410,U+11442,U+11411,U+11440,U+11443,U+11410,U+11442,U+11411,U+11441,U+11443;[E_dv.alt=0+275|Ga.icd=0+367|Gha.diag=0@100,0+386|AA_dv.alt=0+208|Candrabindu=0@17,-8+0|E_dv.alt=5+275|Ga.icd=5+367|Gha.diag=5@100,0+386|AU_dv_part.alt=5+213|Candrabindu.sm=5@-52,179+0]
../fonts/dcf774ca21062e7439f98658b18974ea8b956d0c.ttf;;U+11328,U+1134D,U+1CF4;[gid1=0+793|gid2=0+0|gid3=0+0] ../fonts/dcf774ca21062e7439f98658b18974ea8b956d0c.ttf;;U+11328,U+1134D,U+1CF4;[gid1=0+793|gid2=0+0|gid3=0+0]
../fonts/23406a60ab081c4fb15e1596ea1cd4f27ae8443e.ttf;;U+11328,U+1133F,U+1134D,U+1CF4;[u11328=0+586|u1133F=0+316|uni25CC=0+652|u1134D=0+0|uni1CF4=0+0]
../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf;;U+1C00,U+1C27,U+1C28,U+1C34,U+1C35;[uni1C35=0+500|uni1C34=0+500|uni1C28=0+500|uni1C27=0+500|uni1C00=0+500] ../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf;;U+1C00,U+1C27,U+1C28,U+1C34,U+1C35;[uni1C35=0+500|uni1C34=0+500|uni1C28=0+500|uni1C27=0+500|uni1C00=0+500]
../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf;;U+0D4E,U+0D15,U+0D4D,U+0D15,U+0D46;[uni0D15=0+500|uni0D4E=0+500|uni0D4D=0+500|uni0D46=3+500|uni0D15=3+500] ../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf;;U+0D4E,U+0D15,U+0D4D,U+0D15,U+0D46;[uni0D15=0+500|uni0D4E=0+500|uni0D4D=0+500|uni0D46=3+500|uni0D15=3+500]
../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf;;U+1102D,U+11046,U+11013,U+11046,U+11013,U+11046;[u11013=0+500|u11046_u11013=0+500|u1102D_u11046=0+500|u11046=0+500] ../fonts/4afb0e8b9a86bb9bd73a1247de4e33fbe3c1fd93.ttf;;U+1102D,U+11046,U+11013,U+11046,U+11013,U+11046;[u11013=0+500|u11046_u11013=0+500|u1102D_u11046=0+500|u11046=0+500]