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

[Behdad Esfahbod]

 src/hb-ot-shape-complex-myanmar-machine.rl                             |    2 +-
 test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/misc.txt |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 439b05867c0856a81fa8f9bea3a7465b4b4bdd91
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed May 14 16:44:39 2014 -0600

    [myanmar] Allow MedialYa+Asat in the grammar
    
    The grammar in the OT spec, and the existing Windows implementation
    seem to be confused around where to allow Asat around the medial
    consonants.
    
    The previous grammar for medial group was allowing an Asat after
    the medial group only if there was a medial Wa or Ha, but not if
    there was only a medial Ya.  This doesn't make sense to me and
    sounds reversed, as both medial Wa and Ha are below marks while
    Asat is an above mark.  An Asat can come before the medial group
    already (in fact, multiple ones can.  Why?!).  The medial Ya
    however is a spacing mark and according to Roozbeh it's valid
    to want an Asat on the medial Ya instead of the base, so it looks
    to me like we want to allow an Asat after the medial group if
    there *was* a Ya but not if there wasn't any.  Not wanting to
    produce dotted-circle where Windows is not, this commit changes
    the grammar to allow one Asat after the medial group no matter
    what comes in the group.
    
    Test: U+1002,103A,103B vs U+1002,103B,103A

diff --git a/src/hb-ot-shape-complex-myanmar-machine.rl b/src/hb-ot-shape-complex-myanmar-machine.rl
index 58ca8c8..8036e7c 100644
--- a/src/hb-ot-shape-complex-myanmar-machine.rl
+++ b/src/hb-ot-shape-complex-myanmar-machine.rl
@@ -68,7 +68,7 @@ k = (Ra As H);			# Kinzi
 
 c = C|Ra;			# is_consonant
 
-medial_group = MY? MR? ((MW MH? | MH) As?)?;
+medial_group = MY? MR? MW? MH? As?;
 main_vowel_group = VPre* VAbv* VBlw* A* (DB As?)?;
 post_vowel_group = VPst MH? As* VAbv* A* (DB As?)?;
 pwo_tone_group = PT A* DB? As?;
commit 0a017ce169d791c9aea56671fe5837961e0a3c09
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Wed May 14 16:44:16 2014 -0600

    Add tests for Myanmar Asat+MedialYa and MedialYa+Asat sequences
    
    One of them currently produces dotted-circle.  Fix and detailed
    message coming.

diff --git a/test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/misc.txt b/test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/misc.txt
index bc55599..9dc6332 100644
--- a/test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/misc.txt
+++ b/test/shaping/texts/in-tree/shaper-myanmar/script-myanmar/misc/misc.txt
@@ -3,3 +3,5 @@
 င်္၎
 နၣ်
 နၢၣ်
+ဂ်ျ
+ဂျ်