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

[myanmar] Make medial_group match the OT spec 

Sometime between [July 2018] and [January 2019], the OpenType Myanmar
grammar changed: one asat is now allowed after a medial ya, before any
other medial consonant.

[July 2018]: http://web.archive.org/web/20180711011550/https://docs.microsoft.com/en-us/typography/script-development/myanmar
[January 2019]: http://web.archive.org/web/20190115044451/https://docs.microsoft.com/en-us/typography/script-development/myanmar

This also reverts commit 439b05867c, which
allowed an asat immediately after a medial ra.
This commit is contained in:
David Corbett 2019-06-01 20:54:46 -04:00 committed by Behdad Esfahbod
parent 209491fc37
commit 2e16593b70
2 changed files with 129 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

249
src/hb-ot-shape-complex-myanmar-machine.hh
View File

@ -36,31 +36,31 @@
static const unsigned char _myanmar_syllable_machine_trans_keys[] = { static const unsigned char _myanmar_syllable_machine_trans_keys[] = {
1u, 32u, 3u, 30u, 5u, 29u, 5u, 8u, 5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u, 1u, 32u, 3u, 30u, 5u, 29u, 5u, 8u, 5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u,
3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 1u, 16u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 1u, 16u, 3u, 29u, 3u, 29u, 3u, 29u,
3u, 29u, 3u, 29u, 3u, 30u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 5u, 29u, 3u, 29u, 3u, 29u, 3u, 30u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u,
5u, 8u, 5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u, 3u, 29u, 3u, 29u, 3u, 29u, 5u, 29u, 5u, 8u, 5u, 29u, 3u, 25u, 5u, 25u, 5u, 25u, 3u, 29u, 3u, 29u,
3u, 29u, 1u, 16u, 3u, 30u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 1u, 16u, 3u, 30u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u,
3u, 30u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 30u, 3u, 29u, 1u, 32u, 3u, 29u, 3u, 30u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 29u, 3u, 30u,
1u, 32u, 8u, 8u, 0 3u, 29u, 1u, 32u, 1u, 32u, 8u, 8u, 0
}; };
static const char _myanmar_syllable_machine_key_spans[] = { static const char _myanmar_syllable_machine_key_spans[] = {
32, 28, 25, 4, 25, 23, 21, 21, 32, 28, 25, 4, 25, 23, 21, 21,
27, 27, 27, 27, 16, 27, 27, 27, 27, 27, 27, 27, 16, 27, 27, 27,
27, 27, 28, 27, 27, 27, 27, 25, 27, 27, 28, 27, 27, 27, 27, 27,
4, 25, 23, 21, 21, 27, 27, 27, 25, 4, 25, 23, 21, 21, 27, 27,
27, 16, 28, 27, 27, 27, 27, 27, 27, 27, 16, 28, 27, 27, 27, 27,
28, 27, 27, 27, 27, 28, 27, 32, 27, 28, 27, 27, 27, 27, 27, 28,
32, 1 27, 32, 32, 1
}; };
static const short _myanmar_syllable_machine_index_offsets[] = { static const short _myanmar_syllable_machine_index_offsets[] = {
0, 33, 62, 88, 93, 119, 143, 165, 0, 33, 62, 88, 93, 119, 143, 165,
187, 215, 243, 271, 299, 316, 344, 372, 187, 215, 243, 271, 299, 316, 344, 372,
400, 428, 456, 485, 513, 541, 569, 597, 400, 428, 456, 485, 513, 541, 569, 597,
623, 628, 654, 678, 700, 722, 750, 778, 625, 651, 656, 682, 706, 728, 750, 778,
806, 834, 851, 880, 908, 936, 964, 992, 806, 834, 862, 879, 908, 936, 964, 992,
1020, 1049, 1077, 1105, 1133, 1161, 1190, 1218, 1020, 1048, 1077, 1105, 1133, 1161, 1189, 1217,
1251, 1284 1246, 1274, 1307, 1340
}; };
static const char _myanmar_syllable_machine_indicies[] = { static const char _myanmar_syllable_machine_indicies[] = {
@ -126,116 +126,123 @@ static const char _myanmar_syllable_machine_indicies[] = {
21, 21, 21, 21, 21, 21, 32, 33, 21, 21, 21, 21, 21, 21, 32, 33,
34, 35, 36, 43, 21, 22, 21, 24, 34, 35, 36, 43, 21, 22, 21, 24,
24, 21, 25, 21, 26, 21, 21, 21, 24, 21, 25, 21, 26, 21, 21, 21,
21, 21, 21, 21, 43, 21, 21, 28, 21, 21, 21, 21, 21, 21, 21, 28,
21, 30, 21, 32, 33, 34, 35, 36, 21, 30, 21, 32, 33, 34, 35, 36,
21, 22, 21, 24, 24, 21, 25, 21, 21, 22, 21, 24, 24, 21, 25, 21,
26, 21, 21, 21, 21, 21, 21, 21, 26, 21, 21, 21, 21, 21, 21, 21,
43, 21, 21, 28, 21, 21, 21, 32, 43, 21, 21, 28, 21, 21, 21, 32,
33, 34, 35, 36, 21, 22, 21, 24, 33, 34, 35, 36, 21, 22, 21, 24,
24, 21, 25, 21, 26, 21, 21, 21, 24, 21, 25, 21, 26, 21, 21, 21,
21, 21, 21, 21, 43, 21, 21, 28, 21, 21, 21, 21, 44, 21, 21, 28,
29, 30, 21, 32, 33, 34, 35, 36, 29, 30, 21, 32, 33, 34, 35, 36,
21, 22, 23, 24, 24, 21, 25, 21, 21, 22, 21, 24, 24, 21, 25, 21,
26, 21, 21, 21, 21, 21, 21, 21, 26, 21, 21, 21, 21, 21, 21, 21,
27, 21, 21, 28, 29, 30, 31, 32, 21, 21, 21, 28, 29, 30, 21, 32,
33, 34, 35, 36, 21, 45, 45, 44, 33, 34, 35, 36, 21, 22, 23, 24,
5, 44, 44, 44, 44, 44, 44, 44, 24, 21, 25, 21, 26, 21, 21, 21,
44, 44, 46, 44, 44, 44, 44, 44, 21, 21, 21, 21, 27, 21, 21, 28,
44, 14, 44, 44, 44, 18, 44, 45, 29, 30, 31, 32, 33, 34, 35, 36,
45, 44, 5, 44, 45, 45, 44, 5, 21, 46, 46, 45, 5, 45, 45, 45,
44, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 47, 45,
44, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 14, 45, 45,
14, 44, 44, 44, 18, 44, 47, 44, 45, 18, 45, 46, 46, 45, 5, 45,
45, 45, 44, 5, 44, 14, 44, 44, 46, 46, 45, 5, 45, 45, 45, 45,
44, 44, 44, 44, 44, 48, 44, 44, 45, 45, 45, 45, 45, 45, 45, 45,
44, 44, 44, 44, 14, 44, 45, 45, 45, 45, 45, 45, 14, 45, 45, 45,
44, 5, 44, 44, 44, 44, 44, 44, 18, 45, 48, 45, 46, 46, 45, 5,
44, 44, 44, 48, 44, 44, 44, 44, 45, 14, 45, 45, 45, 45, 45, 45,
44, 44, 14, 44, 45, 45, 44, 5, 45, 49, 45, 45, 45, 45, 45, 45,
44, 44, 44, 44, 44, 44, 44, 44, 14, 45, 46, 46, 45, 5, 45, 45,
44, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 49,
14, 44, 2, 44, 45, 45, 44, 5, 45, 45, 45, 45, 45, 45, 14, 45,
44, 6, 44, 44, 44, 44, 44, 44, 46, 46, 45, 5, 45, 45, 45, 45,
44, 49, 44, 44, 49, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 45,
14, 50, 44, 44, 18, 44, 2, 44, 45, 45, 45, 45, 14, 45, 2, 45,
45, 45, 44, 5, 44, 6, 44, 44, 46, 46, 45, 5, 45, 6, 45, 45,
44, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 50, 45, 45,
44, 44, 44, 44, 14, 44, 44, 44, 50, 45, 45, 45, 14, 51, 45, 45,
18, 44, 2, 44, 45, 45, 44, 5, 18, 45, 2, 45, 46, 46, 45, 5,
44, 6, 44, 44, 44, 44, 44, 44, 45, 6, 45, 45, 45, 45, 45, 45,
44, 49, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 45,
14, 50, 44, 44, 18, 44, 2, 44, 14, 45, 45, 45, 18, 45, 2, 45,
45, 45, 44, 5, 44, 6, 44, 44, 46, 46, 45, 5, 45, 6, 45, 45,
44, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 50, 45, 45,
44, 44, 44, 44, 14, 50, 44, 44, 45, 45, 45, 45, 14, 51, 45, 45,
18, 44, 51, 51, 44, 44, 44, 44, 18, 45, 2, 45, 46, 46, 45, 5,
44, 44, 44, 44, 44, 44, 44, 44, 45, 6, 45, 45, 45, 45, 45, 45,
44, 51, 44, 2, 3, 45, 45, 44, 45, 45, 45, 45, 45, 45, 45, 45,
5, 44, 6, 44, 44, 44, 44, 44, 14, 51, 45, 45, 18, 45, 52, 52,
44, 44, 8, 44, 44, 10, 11, 12, 45, 45, 45, 45, 45, 45, 45, 45,
13, 14, 15, 16, 17, 18, 19, 44, 45, 45, 45, 45, 45, 52, 45, 2,
2, 44, 45, 45, 44, 5, 44, 6, 3, 46, 46, 45, 5, 45, 6, 45,
44, 44, 44, 44, 44, 44, 44, 8, 45, 45, 45, 45, 45, 45, 8, 45,
44, 44, 10, 11, 12, 13, 14, 15, 45, 10, 11, 12, 13, 14, 15, 16,
16, 17, 18, 44, 2, 44, 45, 45, 17, 18, 19, 45, 2, 45, 46, 46,
44, 5, 44, 6, 44, 44, 44, 44, 45, 5, 45, 6, 45, 45, 45, 45,
44, 44, 44, 52, 44, 44, 44, 44, 45, 45, 45, 8, 45, 45, 10, 11,
44, 44, 14, 15, 16, 17, 18, 44, 12, 13, 14, 15, 16, 17, 18, 45,
2, 44, 45, 45, 44, 5, 44, 6, 2, 45, 46, 46, 45, 5, 45, 6,
44, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 53,
44, 44, 44, 44, 44, 44, 14, 15, 45, 45, 45, 45, 45, 45, 14, 15,
16, 17, 18, 44, 2, 44, 45, 45, 16, 17, 18, 45, 2, 45, 46, 46,
44, 5, 44, 6, 44, 44, 44, 44, 45, 5, 45, 6, 45, 45, 45, 45,
44, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 45,
44, 44, 14, 15, 16, 44, 18, 44, 45, 45, 14, 15, 16, 17, 18, 45,
2, 44, 45, 45, 44, 5, 44, 6, 2, 45, 46, 46, 45, 5, 45, 6,
44, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 45,
44, 44, 44, 44, 44, 44, 14, 44, 45, 45, 45, 45, 45, 45, 14, 15,
16, 44, 18, 44, 2, 44, 45, 45, 16, 45, 18, 45, 2, 45, 46, 46,
44, 5, 44, 6, 44, 44, 44, 44, 45, 5, 45, 6, 45, 45, 45, 45,
44, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 45,
44, 44, 14, 15, 16, 17, 18, 52, 45, 45, 14, 45, 16, 45, 18, 45,
44, 2, 44, 45, 45, 44, 5, 44, 2, 45, 46, 46, 45, 5, 45, 6,
6, 44, 44, 44, 44, 44, 44, 44, 45, 45, 45, 45, 45, 45, 45, 45,
52, 44, 44, 10, 44, 12, 44, 14, 45, 45, 45, 45, 45, 45, 14, 15,
15, 16, 17, 18, 44, 2, 44, 45, 16, 17, 18, 53, 45, 2, 45, 46,
45, 44, 5, 44, 6, 44, 44, 44, 46, 45, 5, 45, 6, 45, 45, 45,
44, 44, 44, 44, 52, 44, 44, 10, 45, 45, 45, 45, 45, 45, 45, 10,
44, 44, 44, 14, 15, 16, 17, 18, 45, 12, 45, 14, 15, 16, 17, 18,
44, 2, 44, 45, 45, 44, 5, 44, 45, 2, 45, 46, 46, 45, 5, 45,
6, 44, 44, 44, 44, 44, 44, 44, 6, 45, 45, 45, 45, 45, 45, 45,
52, 44, 44, 10, 11, 12, 44, 14, 53, 45, 45, 10, 45, 45, 45, 14,
15, 16, 17, 18, 44, 2, 3, 45, 15, 16, 17, 18, 45, 2, 45, 46,
45, 44, 5, 44, 6, 44, 44, 44, 46, 45, 5, 45, 6, 45, 45, 45,
44, 44, 44, 44, 8, 44, 44, 10, 45, 45, 45, 45, 54, 45, 45, 10,
11, 12, 45, 14, 15, 16, 17, 18,
45, 2, 45, 46, 46, 45, 5, 45,
6, 45, 45, 45, 45, 45, 45, 45,
45, 45, 45, 10, 11, 12, 45, 14,
15, 16, 17, 18, 45, 2, 3, 46,
46, 45, 5, 45, 6, 45, 45, 45,
45, 45, 45, 45, 8, 45, 45, 10,
11, 12, 13, 14, 15, 16, 17, 18, 11, 12, 13, 14, 15, 16, 17, 18,
44, 22, 23, 24, 24, 21, 25, 21, 45, 22, 23, 24, 24, 21, 25, 21,
26, 21, 21, 21, 21, 21, 21, 21, 26, 21, 21, 21, 21, 21, 21, 21,
53, 21, 21, 28, 29, 30, 31, 32, 55, 21, 21, 28, 29, 30, 31, 32,
33, 34, 35, 36, 37, 21, 22, 54, 33, 34, 35, 36, 37, 21, 22, 56,
24, 24, 21, 25, 21, 26, 21, 21, 24, 24, 21, 25, 21, 26, 21, 21,
21, 21, 21, 21, 21, 27, 21, 21, 21, 21, 21, 21, 21, 27, 21, 21,
28, 29, 30, 31, 32, 33, 34, 35, 28, 29, 30, 31, 32, 33, 34, 35,
36, 21, 1, 1, 2, 3, 45, 45, 36, 21, 1, 1, 2, 3, 46, 46,
44, 5, 44, 6, 1, 44, 44, 44, 45, 5, 45, 6, 1, 45, 45, 45,
44, 1, 44, 8, 44, 44, 10, 11, 45, 1, 45, 8, 45, 45, 10, 11,
12, 13, 14, 15, 16, 17, 18, 19, 12, 13, 14, 15, 16, 17, 18, 19,
44, 1, 44, 1, 1, 55, 55, 55, 45, 1, 45, 1, 1, 57, 57, 57,
55, 55, 55, 55, 55, 1, 55, 55, 57, 57, 57, 57, 57, 1, 57, 57,
55, 55, 1, 55, 55, 55, 55, 55, 57, 57, 1, 57, 57, 57, 57, 57,
55, 55, 55, 55, 55, 55, 55, 55, 57, 57, 57, 57, 57, 57, 57, 57,
55, 55, 1, 55, 56, 55, 0 57, 57, 1, 57, 58, 57, 0
}; };
static const char _myanmar_syllable_machine_trans_targs[] = { static const char _myanmar_syllable_machine_trans_targs[] = {
0, 1, 23, 33, 0, 24, 30, 45, 0, 1, 24, 34, 0, 25, 31, 47,
35, 48, 36, 41, 42, 43, 26, 38, 36, 50, 37, 42, 43, 44, 27, 39,
39, 40, 29, 44, 49, 0, 2, 12, 40, 41, 30, 46, 51, 0, 2, 12,
0, 3, 9, 13, 14, 19, 20, 21, 0, 3, 9, 13, 14, 19, 20, 21,
5, 16, 17, 18, 8, 22, 4, 6, 5, 16, 17, 18, 8, 23, 4, 6,
7, 10, 11, 15, 0, 0, 25, 27, 7, 10, 11, 15, 22, 0, 0, 26,
28, 31, 32, 34, 37, 46, 47, 0, 28, 29, 32, 33, 35, 38, 45, 48,
0 49, 0, 0
}; };
static const char _myanmar_syllable_machine_trans_actions[] = { static const char _myanmar_syllable_machine_trans_actions[] = {
@ -244,9 +251,9 @@ static const char _myanmar_syllable_machine_trans_actions[] = {
0, 0, 0, 0, 0, 5, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0,
6, 0, 0, 0, 0, 0, 0, 0, 6, 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, 7, 8, 0, 0, 0, 0, 0, 0, 0, 7, 8, 0,
0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0,
10 0, 9, 10
}; };
static const char _myanmar_syllable_machine_to_state_actions[] = { static const char _myanmar_syllable_machine_to_state_actions[] = {
@ -256,7 +263,7 @@ static const char _myanmar_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
}; };
static const char _myanmar_syllable_machine_from_state_actions[] = { static const char _myanmar_syllable_machine_from_state_actions[] = {
@ -266,17 +273,17 @@ static const char _myanmar_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
}; };
static const short _myanmar_syllable_machine_eof_trans[] = { static const short _myanmar_syllable_machine_eof_trans[] = {
0, 22, 22, 22, 22, 22, 22, 22, 0, 22, 22, 22, 22, 22, 22, 22,
22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22,
22, 22, 22, 22, 22, 22, 22, 45, 22, 22, 22, 22, 22, 22, 22, 22,
45, 45, 45, 45, 45, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 46,
45, 45, 45, 45, 45, 45, 45, 45, 46, 46, 46, 46, 46, 46, 46, 46,
45, 45, 45, 45, 45, 22, 22, 45, 46, 46, 46, 46, 46, 46, 46, 22,
56, 56 22, 46, 58, 58
}; };
static const int myanmar_syllable_machine_start = 0; static const int myanmar_syllable_machine_start = 0;
@ -309,7 +316,7 @@ find_syllables (hb_buffer_t *buffer)
int cs; int cs;
hb_glyph_info_t *info = buffer->info; hb_glyph_info_t *info = buffer->info;
#line 313 "hb-ot-shape-complex-myanmar-machine.hh" #line 320 "hb-ot-shape-complex-myanmar-machine.hh"
{ {
cs = myanmar_syllable_machine_start; cs = myanmar_syllable_machine_start;
ts = 0; ts = 0;
@ -325,7 +332,7 @@ find_syllables (hb_buffer_t *buffer)
unsigned int syllable_serial = 1; unsigned int syllable_serial = 1;
#line 329 "hb-ot-shape-complex-myanmar-machine.hh" #line 336 "hb-ot-shape-complex-myanmar-machine.hh"
{ {
int _slen; int _slen;
int _trans; int _trans;
@ -339,7 +346,7 @@ _resume:
#line 1 "NONE" #line 1 "NONE"
{ts = p;} {ts = p;}
break; break;
#line 343 "hb-ot-shape-complex-myanmar-machine.hh" #line 350 "hb-ot-shape-complex-myanmar-machine.hh"
} }
_keys = _myanmar_syllable_machine_trans_keys + (cs<<1); _keys = _myanmar_syllable_machine_trans_keys + (cs<<1);
@ -389,7 +396,7 @@ _eof_trans:
#line 90 "hb-ot-shape-complex-myanmar-machine.rl" #line 90 "hb-ot-shape-complex-myanmar-machine.rl"
{te = p;p--;{ found_syllable (non_myanmar_cluster); }} {te = p;p--;{ found_syllable (non_myanmar_cluster); }}
break; break;
#line 393 "hb-ot-shape-complex-myanmar-machine.hh" #line 400 "hb-ot-shape-complex-myanmar-machine.hh"
} }
_again: _again:
@ -398,7 +405,7 @@ _again:
#line 1 "NONE" #line 1 "NONE"
{ts = 0;} {ts = 0;}
break; break;
#line 402 "hb-ot-shape-complex-myanmar-machine.hh" #line 409 "hb-ot-shape-complex-myanmar-machine.hh"
} }
if ( ++p != pe ) if ( ++p != pe )

2
src/hb-ot-shape-complex-myanmar-machine.rl
View File

@ -69,7 +69,7 @@ k = (Ra As H); # Kinzi
c = C|Ra; # is_consonant c = C|Ra; # is_consonant
medial_group = MY? MR? MW? MH? As?; medial_group = MY? As? MR? ((MW MH? | MH) As?)?;
main_vowel_group = (VPre.VS?)* VAbv* VBlw* A* (DB As?)?; main_vowel_group = (VPre.VS?)* VAbv* VBlw* A* (DB As?)?;
post_vowel_group = VPst MH? As* VAbv* A* (DB As?)?; post_vowel_group = VPst MH? As* VAbv* A* (DB As?)?;
pwo_tone_group = PT A* DB? As?; pwo_tone_group = PT A* DB? As?;