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

[Behdad Esfahbod]

 src/hb-ot-shape-complex-arabic.cc                                              |    3 +++
 test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/MANIFEST        |    1 +
 test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/non-joining.txt |    8 ++++++++
 3 files changed, 12 insertions(+)

New commits:
commit 22a685836a59d1c02914761c02d3852810b83ec5
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Nov 5 15:20:10 2012 -0800

    Adjust Mongolian shaping
    
    For U+1880..U+1886 Uniscribe thinks they are non-joining.
    For U+1887 Uniscribe thinks it's joining, but looks wrong to me.
    For now, match Uniscribe.

diff --git a/src/hb-ot-shape-complex-arabic.cc b/src/hb-ot-shape-complex-arabic.cc
index bacee5d..0f504e6 100644
--- a/src/hb-ot-shape-complex-arabic.cc
+++ b/src/hb-ot-shape-complex-arabic.cc
@@ -67,6 +67,9 @@ static unsigned int get_joining_type (hb_codepoint_t u, hb_unicode_general_categ
   /* Mongolian joining data is not in ArabicJoining.txt yet. */
   if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x1800, 0x18AF)))
   {
+    if (unlikely (hb_in_range<hb_codepoint_t> (u, 0x1880, 0x1886)))
+      return JOINING_TYPE_U;
+
     /* All letters, SIBE SYLLABLE BOUNDARY MARKER, and NIRUGU are D */
     if ((FLAG(gen_cat) & (FLAG (HB_UNICODE_GENERAL_CATEGORY_OTHER_LETTER) |
 			  FLAG (HB_UNICODE_GENERAL_CATEGORY_MODIFIER_LETTER)))
commit e6b86c8519f894bf7fe18d5c143276521fcacece
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Nov 5 15:18:49 2012 -0800

    Add test for non-joining Mongolian letters
    
    For U+1880..U+1886 Uniscribe thinks they are non-joining.
    For U+1887 Uniscribe thinks it's joining, but looks wrong to me.

diff --git a/test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/MANIFEST
index e7eedf6..6088e7a 100644
--- a/test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/MANIFEST
+++ b/test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/MANIFEST
@@ -1,2 +1,3 @@
 misc.txt
+non-joining.txt
 poem.txt
diff --git a/test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/non-joining.txt b/test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/non-joining.txt
new file mode 100644
index 0000000..93e9dd6
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-arabic/script-mongolian/misc/non-joining.txt
@@ -0,0 +1,8 @@
+á ¡á¢€á ¡
+á ¡á¢á ¡
+á ¡á¢‚á ¡
+á ¡á¢ƒá ¡
+á ¡á¢„á ¡
+á ¡á¢…á ¡
+á ¡á¢†á ¡
+á ¡á¢‡á ¡