[HarfBuzz] harfbuzz-ng: Branch 'master' - 2 commits

[Behdad Esfahbod]

 src/hb-ot-shape-complex-indic-machine.rl |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9ceca3aeb14cc096f5f87660cf7351bc35073084
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Apr 16 21:05:51 2012 -0400

    Fix ragel regexp in vowel-based syllable
    
    As reported by datao zhang on the mailing list.

diff --git a/src/hb-ot-shape-complex-indic-machine.rl b/src/hb-ot-shape-complex-indic-machine.rl
index 417880b..6406c24 100644
--- a/src/hb-ot-shape-complex-indic-machine.rl
+++ b/src/hb-ot-shape-complex-indic-machine.rl
@@ -67,7 +67,7 @@ action found_non_indic { found_non_indic (map, buffer, mask_array, last, p); }
 action next_syllable { buffer->merge_clusters (last, p); last = p; }
 
 consonant_syllable =	(c.N? (H.z?|z.H))* 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);
+vowel_syllable =	(Ra H)? V N? (z?.H.c | ZWJ.c)? matra_group* syllable_tail %(found_vowel_syllable);
 standalone_cluster =	(Ra H)? NBSP N? (z? H c)? matra_group* syllable_tail %(found_standalone_cluster);
 non_indic = X %(found_non_indic);
 
commit b870afcd1b436614af95db6dc297e54c8f03f0cd
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Apr 16 21:05:11 2012 -0400

    Rewrite ragel expression to better match the one on MS spec
    
    https://www.microsoft.com/typography/otfntdev/devanot/shaping.aspx

diff --git a/src/hb-ot-shape-complex-indic-machine.rl b/src/hb-ot-shape-complex-indic-machine.rl
index 7af23c1..417880b 100644
--- a/src/hb-ot-shape-complex-indic-machine.rl
+++ b/src/hb-ot-shape-complex-indic-machine.rl
@@ -66,7 +66,7 @@ action found_non_indic { found_non_indic (map, buffer, mask_array, last, p); }
 
 action next_syllable { buffer->merge_clusters (last, p); last = p; }
 
-consonant_syllable =	(c.N? (z.H|H.z?))* c.N? A? (H.z? | matra_group*)? syllable_tail %(found_consonant_syllable);
+consonant_syllable =	(c.N? (H.z?|z.H))* 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);
 standalone_cluster =	(Ra H)? NBSP N? (z? H c)? matra_group* syllable_tail %(found_standalone_cluster);
 non_indic = X %(found_non_indic);