bug 729626 - fix cluster formation in Indic, cherrypicked from harfbuzz-ng commit 461b9b6347e4f58589f5be82c40a2df61da2c715. r=behdad

This commit is contained in:
Jonathan Kew 2012-03-06 10:58:16 +00:00
parent eed57b3c71
commit ec5c09cdd3
2 changed files with 9 additions and 9 deletions

View File

@ -232,25 +232,25 @@ _resume:
#line 62 "hb-ot-shape-complex-indic-machine.rl"
{ found_consonant_syllable (map, buffer, mask_array, last, p); }
#line 67 "hb-ot-shape-complex-indic-machine.rl"
{ set_cluster (buffer, p, last); last = p; }
{ set_cluster (buffer, last, p); last = p; }
break;
case 3:
#line 63 "hb-ot-shape-complex-indic-machine.rl"
{ found_vowel_syllable (map, buffer, mask_array, last, p); }
#line 67 "hb-ot-shape-complex-indic-machine.rl"
{ set_cluster (buffer, p, last); last = p; }
{ set_cluster (buffer, last, p); last = p; }
break;
case 4:
#line 64 "hb-ot-shape-complex-indic-machine.rl"
{ found_standalone_cluster (map, buffer, mask_array, last, p); }
#line 67 "hb-ot-shape-complex-indic-machine.rl"
{ set_cluster (buffer, p, last); last = p; }
{ set_cluster (buffer, last, p); last = p; }
break;
case 1:
#line 65 "hb-ot-shape-complex-indic-machine.rl"
{ found_non_indic (map, buffer, mask_array, last, p); }
#line 67 "hb-ot-shape-complex-indic-machine.rl"
{ set_cluster (buffer, p, last); last = p; }
{ set_cluster (buffer, last, p); last = p; }
break;
#line 256 "hb-ot-shape-complex-indic-machine.hh"
}
@ -268,25 +268,25 @@ _again:
#line 62 "hb-ot-shape-complex-indic-machine.rl"
{ found_consonant_syllable (map, buffer, mask_array, last, p); }
#line 67 "hb-ot-shape-complex-indic-machine.rl"
{ set_cluster (buffer, p, last); last = p; }
{ set_cluster (buffer, last, p); last = p; }
break;
case 3:
#line 63 "hb-ot-shape-complex-indic-machine.rl"
{ found_vowel_syllable (map, buffer, mask_array, last, p); }
#line 67 "hb-ot-shape-complex-indic-machine.rl"
{ set_cluster (buffer, p, last); last = p; }
{ set_cluster (buffer, last, p); last = p; }
break;
case 4:
#line 64 "hb-ot-shape-complex-indic-machine.rl"
{ found_standalone_cluster (map, buffer, mask_array, last, p); }
#line 67 "hb-ot-shape-complex-indic-machine.rl"
{ set_cluster (buffer, p, last); last = p; }
{ set_cluster (buffer, last, p); last = p; }
break;
case 1:
#line 65 "hb-ot-shape-complex-indic-machine.rl"
{ found_non_indic (map, buffer, mask_array, last, p); }
#line 67 "hb-ot-shape-complex-indic-machine.rl"
{ set_cluster (buffer, p, last); last = p; }
{ set_cluster (buffer, last, p); last = p; }
break;
#line 292 "hb-ot-shape-complex-indic-machine.hh"
}

View File

@ -64,7 +64,7 @@ action found_vowel_syllable { found_vowel_syllable (map, buffer, mask_array, las
action found_standalone_cluster { found_standalone_cluster (map, buffer, mask_array, last, p); }
action found_non_indic { found_non_indic (map, buffer, mask_array, last, p); }
action next_syllable { set_cluster (buffer, p, last); last = p; }
action next_syllable { set_cluster (buffer, last, p); last = p; }
consonant_syllable = (c.N? (z.H|H.z?))* c.N? A? (H.z? | matra_group*)? syllable_tail %(found_consonant_syllable);
vowel_syllable = (Ra H)? V N? (z.H.c | ZWJ.c)? matra_group* syllable_tail %(found_vowel_syllable);