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

[Behdad Esfahbod]

 src/hb-ot-layout.cc                                                                      |    4 ++--
 test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/MANIFEST          |    1 +
 test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt |   10 ++++++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

New commits:
commit 559f70667891a3ceeffb36f40de38a4f85868945
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 16 22:43:17 2012 -0400

    Fix MarkAttachmentType matching
    
    Fixes issue reported by Khaled Hosny with his Hussaini Nastaleeq font
    and sequences like those added in the previous commit.

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 7b48fa6..10811d0 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -123,7 +123,7 @@ _hb_ot_layout_match_properties_mark (hb_face_t      *face,
    * "ignore marks of attachment type different than
    * the attachment type specified."
    */
-  if (lookup_props & LookupFlag::MarkAttachmentType && glyph_props & LookupFlag::MarkAttachmentType)
+  if (lookup_props & LookupFlag::MarkAttachmentType)
     return (lookup_props & LookupFlag::MarkAttachmentType) == (glyph_props & LookupFlag::MarkAttachmentType);
 
   return true;
commit 6de103547e4a7fb34c833861713ea373cd912261
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 16 22:46:06 2012 -0400

    [test/arabic] Add Arabic tests for mark skipping
    
    Expose a bug with Khaled's Hussaini Nastaleeq font.

diff --git a/test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/MANIFEST b/test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/MANIFEST
index df0e4b5..242b2a1 100644
--- a/test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/MANIFEST
+++ b/test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/MANIFEST
@@ -3,3 +3,4 @@ language-arabic.txt
 language-persian.txt
 language-urdu.txt
 ligature-diacritics.txt
+mark-skipping.txt
diff --git a/test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt b/test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt
new file mode 100644
index 0000000..038c921
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-arabic/script-arabic/misc/diacritics/mark-skipping.txt
@@ -0,0 +1,10 @@
+تختة
+تخنة
+تخئة
+تخثة
+تخٹة
+تختّة
+تخنّة
+تخئّة
+تخثّة
+تخٹّة
commit ad4494759fa8bfd2497800c24fa414075ed1aa61
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Jul 16 22:40:21 2012 -0400

    Minor

diff --git a/src/hb-ot-layout.cc b/src/hb-ot-layout.cc
index 7a613b2..7b48fa6 100644
--- a/src/hb-ot-layout.cc
+++ b/src/hb-ot-layout.cc
@@ -173,7 +173,7 @@ _hb_ot_layout_skip_mark (hb_face_t    *face,
   if (property_out)
     *property_out = property;
 
-  /* If it's a mark, skip it we don't accept it. */
+  /* If it's a mark, skip it if we don't accept it. */
   if (unlikely (property & HB_OT_LAYOUT_GLYPH_CLASS_MARK))
     return !_hb_ot_layout_match_properties (face, ginfo->codepoint, property, lookup_props);