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

[khmer] Add trailing Coeng to syllable grammar 

Fixes https://github.com/harfbuzz/harfbuzz/issues/1541
This commit is contained in:
Behdad Esfahbod 2019-03-28 20:23:12 -07:00
parent 7360265e69
commit 5ab6de7a6f
4 changed files with 122 additions and 129 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

248
src/hb-ot-shape-complex-khmer-machine.hh
View File

@ -35,29 +35,27 @@
#line 36 "hb-ot-shape-complex-khmer-machine.hh" #line 36 "hb-ot-shape-complex-khmer-machine.hh"
static const unsigned char _khmer_syllable_machine_trans_keys[] = { static const unsigned char _khmer_syllable_machine_trans_keys[] = {
5u, 26u, 5u, 21u, 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u, 5u, 21u, 5u, 26u, 5u, 21u, 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u, 5u, 21u,
5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u, 5u, 21u, 5u, 21u, 5u, 26u, 5u, 21u, 1u, 16u, 5u, 21u, 5u, 26u,
5u, 26u, 5u, 21u, 5u, 26u, 5u, 21u, 5u, 26u, 1u, 16u, 1u, 29u, 5u, 29u, 5u, 21u, 5u, 26u, 5u, 21u, 5u, 26u, 1u, 29u, 5u, 29u, 5u, 29u, 5u, 29u,
5u, 29u, 5u, 29u, 22u, 22u, 5u, 22u, 5u, 29u, 5u, 29u, 5u, 29u, 5u, 26u, 22u, 22u, 5u, 22u, 5u, 29u, 5u, 29u, 5u, 29u, 1u, 16u, 5u, 26u, 5u, 29u,
5u, 29u, 5u, 29u, 22u, 22u, 5u, 22u, 5u, 29u, 5u, 29u, 1u, 16u, 5u, 29u, 5u, 29u, 22u, 22u, 5u, 22u, 5u, 29u, 5u, 29u, 1u, 16u, 5u, 29u, 5u, 29u,
5u, 29u, 0 0
}; };
static const char _khmer_syllable_machine_key_spans[] = { static const char _khmer_syllable_machine_key_spans[] = {
22, 17, 22, 17, 16, 17, 22, 17, 22, 17, 22, 17, 16, 17, 22, 17,
22, 17, 16, 17, 22, 17, 16, 17, 22, 17, 17, 22, 17, 16, 17, 22,
22, 17, 22, 17, 22, 16, 29, 25, 17, 22, 17, 22, 29, 25, 25, 25,
25, 25, 1, 18, 25, 25, 25, 22, 1, 18, 25, 25, 25, 16, 22, 25,
25, 25, 1, 18, 25, 25, 16, 25, 25, 1, 18, 25, 25, 16, 25, 25
25
}; };
static const short _khmer_syllable_machine_index_offsets[] = { static const short _khmer_syllable_machine_index_offsets[] = {
0, 23, 41, 64, 82, 99, 117, 140, 0, 23, 41, 64, 82, 99, 117, 140,
158, 181, 199, 216, 234, 257, 275, 292, 158, 181, 199, 217, 240, 258, 275, 293,
310, 333, 351, 374, 392, 415, 432, 462, 316, 334, 357, 375, 398, 428, 454, 480,
488, 514, 540, 542, 561, 587, 613, 639, 506, 508, 527, 553, 579, 605, 622, 645,
662, 688, 714, 716, 735, 761, 787, 804, 671, 697, 699, 718, 744, 770, 787, 813
830
}; };
static const char _khmer_syllable_machine_indicies[] = { static const char _khmer_syllable_machine_indicies[] = {
@ -85,142 +83,136 @@ static const char _khmer_syllable_machine_indicies[] = {
0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 12, 0,
0, 0, 0, 4, 0, 11, 11, 0, 0, 0, 0, 4, 0, 11, 11, 0,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0, 12, 0, 13, 0, 0, 0, 0, 0, 12, 0, 14,
13, 0, 0, 0, 0, 0, 0, 0, 14, 13, 13, 13, 13, 13, 13, 13,
0, 0, 0, 0, 0, 0, 13, 0, 13, 13, 13, 13, 13, 13, 13, 15,
15, 15, 14, 14, 14, 14, 14, 14, 13, 14, 14, 16, 16, 16, 16, 16,
14, 14, 14, 14, 14, 14, 14, 14, 16, 16, 16, 16, 16, 16, 16, 16,
16, 14, 15, 15, 17, 17, 17, 17, 16, 15, 16, 16, 16, 16, 17, 16,
17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 16, 16, 16, 16, 16, 16,
17, 17, 16, 17, 17, 17, 17, 18, 16, 16, 16, 16, 16, 16, 16, 16,
17, 19, 19, 17, 17, 17, 17, 17, 17, 16, 19, 19, 16, 16, 16, 16,
17, 17, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 16, 16, 16,
17, 18, 17, 20, 20, 17, 17, 17, 16, 19, 16, 20, 20, 16, 16, 16,
17, 17, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 16, 16, 16,
17, 17, 20, 17, 21, 21, 17, 17, 16, 16, 16, 21, 16, 22, 22, 16,
17, 17, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 16, 16, 16,
17, 17, 17, 17, 22, 17, 23, 23, 16, 16, 16, 16, 16, 23, 16, 16,
17, 17, 17, 17, 17, 17, 17, 17, 16, 16, 17, 16, 22, 22, 16, 16,
17, 17, 17, 17, 17, 17, 24, 17, 16, 16, 16, 16, 16, 16, 16, 16,
17, 17, 17, 18, 17, 23, 23, 17, 16, 16, 16, 16, 23, 16, 24, 24,
17, 17, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 16, 16, 16, 16,
17, 17, 17, 17, 17, 24, 17, 25, 16, 16, 16, 16, 16, 16, 25, 16,
25, 17, 17, 17, 17, 17, 17, 17, 16, 16, 16, 17, 16, 24, 24, 16,
17, 17, 17, 17, 17, 17, 17, 26, 16, 16, 16, 16, 16, 16, 16, 16,
17, 17, 17, 17, 18, 17, 25, 25, 16, 16, 16, 16, 16, 25, 16, 14,
17, 17, 17, 17, 17, 17, 17, 17, 14, 16, 16, 16, 16, 16, 16, 16,
17, 17, 17, 17, 17, 17, 26, 17, 16, 16, 16, 16, 16, 16, 26, 15,
15, 15, 17, 17, 17, 17, 17, 17, 16, 16, 16, 16, 17, 16, 28, 28,
17, 17, 17, 17, 17, 17, 17, 27, 27, 27, 29, 29, 27, 27, 27, 27,
16, 17, 17, 17, 17, 18, 17, 28, 2, 2, 27, 30, 27, 28, 27, 27,
28, 17, 17, 17, 17, 17, 17, 17, 27, 27, 15, 19, 27, 27, 27, 17,
17, 17, 17, 17, 17, 17, 28, 17, 23, 25, 21, 27, 32, 32, 31, 31,
13, 13, 29, 29, 30, 30, 29, 29, 31, 31, 31, 31, 31, 33, 31, 31,
29, 29, 2, 2, 29, 31, 29, 13, 31, 31, 31, 2, 3, 6, 31, 31,
29, 29, 29, 29, 16, 20, 29, 29, 31, 4, 10, 12, 8, 31, 34, 34,
29, 18, 24, 26, 22, 29, 33, 33, 31, 31, 31, 31, 31, 31, 31, 35,
32, 32, 32, 32, 32, 32, 32, 34, 31, 31, 31, 31, 31, 31, 3, 6,
32, 32, 32, 32, 32, 2, 3, 6, 31, 31, 31, 4, 10, 12, 8, 31,
32, 32, 32, 4, 10, 12, 8, 32, 5, 5, 31, 31, 31, 31, 31, 31,
35, 35, 32, 32, 32, 32, 32, 32, 31, 35, 31, 31, 31, 31, 31, 31,
32, 36, 32, 32, 32, 32, 32, 32, 4, 6, 31, 31, 31, 31, 31, 31,
3, 6, 32, 32, 32, 4, 10, 12, 8, 31, 6, 31, 7, 7, 31, 31,
8, 32, 5, 5, 32, 32, 32, 32, 31, 31, 31, 31, 31, 35, 31, 31,
32, 32, 32, 36, 32, 32, 32, 32, 31, 31, 31, 31, 8, 6, 31, 36,
32, 32, 4, 6, 32, 32, 32, 32, 36, 31, 31, 31, 31, 31, 31, 31,
32, 32, 8, 32, 6, 32, 7, 7, 35, 31, 31, 31, 31, 31, 31, 10,
32, 32, 32, 32, 32, 32, 32, 36, 6, 31, 31, 31, 4, 31, 31, 8,
32, 32, 32, 32, 32, 32, 8, 6, 31, 37, 37, 31, 31, 31, 31, 31,
32, 37, 37, 32, 32, 32, 32, 32, 31, 31, 35, 31, 31, 31, 31, 31,
32, 32, 36, 32, 32, 32, 32, 32, 31, 12, 6, 31, 31, 31, 4, 10,
32, 10, 6, 32, 32, 32, 4, 32, 31, 8, 31, 34, 34, 31, 31, 31,
32, 8, 32, 38, 38, 32, 32, 32, 31, 31, 31, 31, 33, 31, 31, 31,
32, 32, 32, 32, 36, 32, 32, 32, 31, 31, 31, 3, 6, 31, 31, 31,
32, 32, 32, 12, 6, 32, 32, 32, 4, 10, 12, 8, 31, 28, 28, 31,
4, 10, 32, 8, 32, 35, 35, 32, 31, 31, 31, 31, 31, 31, 31, 31,
32, 32, 32, 32, 32, 32, 34, 32, 31, 31, 31, 31, 28, 31, 14, 14,
32, 32, 32, 32, 32, 3, 6, 32, 38, 38, 38, 38, 38, 38, 38, 38,
32, 32, 4, 10, 12, 8, 32, 15, 38, 38, 38, 38, 38, 38, 15, 38,
15, 39, 39, 39, 39, 39, 39, 39, 38, 38, 38, 17, 38, 40, 40, 39,
39, 39, 39, 39, 39, 39, 39, 16, 39, 39, 39, 39, 39, 39, 41, 39,
39, 39, 39, 39, 18, 39, 41, 41, 39, 39, 39, 39, 39, 15, 19, 39,
40, 40, 40, 40, 40, 40, 40, 42, 39, 39, 17, 23, 25, 21, 39, 18,
40, 40, 40, 40, 40, 40, 16, 20, 18, 39, 39, 39, 39, 39, 39, 39,
40, 40, 40, 18, 24, 26, 22, 40, 41, 39, 39, 39, 39, 39, 39, 17,
19, 19, 40, 40, 40, 40, 40, 40, 19, 39, 39, 39, 39, 39, 39, 21,
40, 42, 40, 40, 40, 40, 40, 40, 39, 19, 39, 20, 20, 39, 39, 39,
18, 20, 40, 40, 40, 40, 40, 40, 39, 39, 39, 39, 41, 39, 39, 39,
22, 40, 20, 40, 21, 21, 40, 40, 39, 39, 39, 21, 19, 39, 42, 42,
40, 40, 40, 40, 40, 42, 40, 40, 39, 39, 39, 39, 39, 39, 39, 41,
40, 40, 40, 40, 22, 20, 40, 43, 39, 39, 39, 39, 39, 39, 23, 19,
43, 40, 40, 40, 40, 40, 40, 40, 39, 39, 39, 17, 39, 39, 21, 39,
42, 40, 40, 40, 40, 40, 40, 24, 43, 43, 39, 39, 39, 39, 39, 39,
20, 40, 40, 40, 18, 40, 40, 22, 39, 41, 39, 39, 39, 39, 39, 39,
40, 44, 44, 40, 40, 40, 40, 40, 25, 19, 39, 39, 39, 17, 23, 39,
40, 40, 42, 40, 40, 40, 40, 40, 21, 39, 44, 44, 39, 39, 39, 39,
40, 26, 20, 40, 40, 40, 18, 24,
40, 22, 40, 28, 28, 39, 39, 39,
39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39, 39,
39, 39, 28, 39, 45, 45, 40, 40, 39, 44, 39, 45, 45, 39, 39, 39,
40, 40, 40, 40, 40, 46, 40, 40, 39, 39, 39, 39, 30, 39, 39, 39,
40, 40, 40, 27, 16, 20, 40, 40, 39, 39, 26, 15, 19, 39, 39, 39,
40, 18, 24, 26, 22, 40, 41, 41, 17, 23, 25, 21, 39, 40, 40, 39,
40, 40, 40, 40, 40, 40, 40, 46, 39, 39, 39, 39, 39, 39, 30, 39,
40, 40, 40, 40, 40, 40, 16, 20, 39, 39, 39, 39, 39, 15, 19, 39,
40, 40, 40, 18, 24, 26, 22, 40, 39, 39, 17, 23, 25, 21, 39, 0
0
}; };
static const char _khmer_syllable_machine_trans_targs[] = { static const char _khmer_syllable_machine_trans_targs[] = {
22, 1, 30, 24, 25, 3, 26, 5, 20, 1, 28, 22, 23, 3, 24, 5,
27, 7, 28, 9, 29, 23, 22, 11, 25, 7, 26, 9, 27, 20, 10, 31,
32, 22, 33, 13, 34, 15, 35, 17, 20, 32, 12, 33, 14, 34, 16, 35,
36, 19, 37, 40, 39, 22, 31, 38, 18, 36, 39, 20, 21, 30, 37, 20,
22, 0, 10, 2, 4, 6, 8, 22, 0, 29, 2, 4, 6, 8, 20, 20,
22, 12, 14, 16, 18, 20, 21 11, 13, 15, 17, 38, 19
}; };
static const char _khmer_syllable_machine_trans_actions[] = { static const char _khmer_syllable_machine_trans_actions[] = {
1, 0, 2, 2, 2, 0, 0, 0, 1, 0, 2, 2, 2, 0, 0, 0,
2, 0, 2, 0, 2, 2, 3, 0, 2, 0, 2, 0, 2, 3, 0, 4,
4, 5, 2, 0, 0, 0, 2, 0, 5, 2, 0, 0, 0, 2, 0, 2,
2, 0, 2, 4, 4, 8, 9, 0, 0, 2, 4, 8, 2, 9, 0, 10,
10, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 11, 12,
12, 0, 0, 0, 0, 0, 0 0, 0, 0, 0, 4, 0
}; };
static const char _khmer_syllable_machine_to_state_actions[] = { static const char _khmer_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, 6, 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, 0, 0, 0, 0, 0, 0, 0, 0
0
}; };
static const char _khmer_syllable_machine_from_state_actions[] = { static const char _khmer_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, 7, 0, 0, 0, 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, 0
0
}; };
static const unsigned char _khmer_syllable_machine_eof_trans[] = { static const unsigned char _khmer_syllable_machine_eof_trans[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 15, 18, 18, 18, 18, 1, 1, 14, 17, 17, 17, 17, 17,
18, 18, 18, 18, 18, 18, 0, 33, 17, 17, 17, 17, 0, 32, 32, 32,
33, 33, 33, 33, 33, 33, 33, 40, 32, 32, 32, 32, 32, 32, 39, 40,
41, 41, 41, 41, 41, 41, 40, 41, 40, 40, 40, 40, 40, 40, 40, 40
41
}; };
static const int khmer_syllable_machine_start = 22; static const int khmer_syllable_machine_start = 20;
static const int khmer_syllable_machine_first_final = 22; static const int khmer_syllable_machine_first_final = 20;
static const int khmer_syllable_machine_error = -1; static const int khmer_syllable_machine_error = -1;
static const int khmer_syllable_machine_en_main = 22; static const int khmer_syllable_machine_en_main = 20;
#line 36 "hb-ot-shape-complex-khmer-machine.rl" #line 36 "hb-ot-shape-complex-khmer-machine.rl"
@ -246,7 +238,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 250 "hb-ot-shape-complex-khmer-machine.hh" #line 242 "hb-ot-shape-complex-khmer-machine.hh"
{ {
cs = khmer_syllable_machine_start; cs = khmer_syllable_machine_start;
ts = 0; ts = 0;
@ -262,7 +254,7 @@ find_syllables (hb_buffer_t *buffer)
unsigned int syllable_serial = 1; unsigned int syllable_serial = 1;
#line 266 "hb-ot-shape-complex-khmer-machine.hh" #line 258 "hb-ot-shape-complex-khmer-machine.hh"
{ {
int _slen; int _slen;
int _trans; int _trans;
@ -276,7 +268,7 @@ _resume:
#line 1 "NONE" #line 1 "NONE"
{ts = p;} {ts = p;}
break; break;
#line 280 "hb-ot-shape-complex-khmer-machine.hh" #line 272 "hb-ot-shape-complex-khmer-machine.hh"
} }
_keys = _khmer_syllable_machine_trans_keys + (cs<<1); _keys = _khmer_syllable_machine_trans_keys + (cs<<1);
@ -346,7 +338,7 @@ _eof_trans:
#line 76 "hb-ot-shape-complex-khmer-machine.rl" #line 76 "hb-ot-shape-complex-khmer-machine.rl"
{act = 3;} {act = 3;}
break; break;
#line 350 "hb-ot-shape-complex-khmer-machine.hh" #line 342 "hb-ot-shape-complex-khmer-machine.hh"
} }
_again: _again:
@ -355,7 +347,7 @@ _again:
#line 1 "NONE" #line 1 "NONE"
{ts = 0;} {ts = 0;}
break; break;
#line 359 "hb-ot-shape-complex-khmer-machine.hh" #line 351 "hb-ot-shape-complex-khmer-machine.hh"
} }
if ( ++p != pe ) if ( ++p != pe )

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

@ -66,7 +66,7 @@ matra_group = VPre? xgroup VBlw? xgroup (joiner?.VAbv)? xgroup VPst?;
syllable_tail = xgroup matra_group xgroup (Coeng.c)? ygroup; syllable_tail = xgroup matra_group xgroup (Coeng.c)? ygroup;
broken_cluster = (Coeng.cn)* syllable_tail; broken_cluster = (Coeng.cn)* (Coeng | syllable_tail);
consonant_syllable = (cn|PLACEHOLDER|DOTTEDCIRCLE) broken_cluster; consonant_syllable = (cn|PLACEHOLDER|DOTTEDCIRCLE) broken_cluster;
other = any; other = any;

BIN
test/shaping/data/in-house/fonts/ad01ab2ea1cb1a4d3a2783e2675112ef11ae6404.ttf Normal file
View File

Binary file not shown.

1
test/shaping/data/in-house/tests/khmer-misc.tests
View File

@ -87,3 +87,4 @@
../fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf::U+17A0,U+17D2,U+1782,U+17D2,U+179F,U+17CA,U+17C0:[uni17C1=0+288|uni17A0=0+928|uni17D21782=0@20,-26+0|uni17D2179F.low=0+302|uni17CA=0@-4,30+0|uni17C0.right1.high=0+288] ../fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf::U+17A0,U+17D2,U+1782,U+17D2,U+179F,U+17CA,U+17C0:[uni17C1=0+288|uni17A0=0+928|uni17D21782=0@20,-26+0|uni17D2179F.low=0+302|uni17CA=0@-4,30+0|uni17C0.right1.high=0+288]
../fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf::U+17A0,U+17D2,U+179A,U+17D2,U+179C,U+1784,U+17D2,U+1780:[uni17D2179A=0+287|uni17A0=0+928|uni17D2179C=0@20,-26+0|uni1784=5+635|uni17D21780=5@0,-26+0] ../fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf::U+17A0,U+17D2,U+179A,U+17D2,U+179C,U+1784,U+17D2,U+1780:[uni17D2179A=0+287|uni17A0=0+928|uni17D2179C=0@20,-26+0|uni1784=5+635|uni17D21780=5@0,-26+0]
../fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf::U+17A0,U+17D2,U+179A,U+17D2,U+179C,U+17B6,U+17C6,U+1784:[uni17D2179A=0+287|uni17A017B6=0+1216|uni17D2179C=0@-268,-26+0|uni17C6=0@47,-29+0|uni1784=7+635] ../fonts/3998336402905b8be8301ef7f47cf7e050cbb1bd.ttf::U+17A0,U+17D2,U+179A,U+17D2,U+179C,U+17B6,U+17C6,U+1784:[uni17D2179A=0+287|uni17A017B6=0+1216|uni17D2179C=0@-268,-26+0|uni17C6=0@47,-29+0|uni1784=7+635]
../fonts/ad01ab2ea1cb1a4d3a2783e2675112ef11ae6404.ttf::U+17D2,U+17D2:[uni25CC=0+635|uni17D2=0+0|uni25CC=0+635|uni17D2=0+0]