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

[Behdad Esfahbod]

 src/hb-ot-shape-complex-indic.cc                                            |    2 -
 src/hb-unicode-private.hh                                                   |    4 ++
 test/shaping/texts/in-tree/MANIFEST                                         |    3 +
 test/shaping/texts/in-tree/shaper-default/MANIFEST                          |    3 -
 test/shaping/texts/in-tree/shaper-default/script-hangul/MANIFEST            |    1 
 test/shaping/texts/in-tree/shaper-default/script-hangul/misc/MANIFEST       |    1 
 test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt       |    4 --
 test/shaping/texts/in-tree/shaper-default/script-hebrew/MANIFEST            |    1 
 test/shaping/texts/in-tree/shaper-default/script-hebrew/misc/MANIFEST       |    1 
 test/shaping/texts/in-tree/shaper-default/script-hebrew/misc/diacritics.txt |   16 ----------
 test/shaping/texts/in-tree/shaper-default/script-tibetan/MANIFEST           |    1 
 test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/MANIFEST      |    1 
 test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/misc.txt      |    1 
 test/shaping/texts/in-tree/shaper-hangul/script-hangul/MANIFEST             |    1 
 test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/MANIFEST        |    1 
 test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/misc.txt        |    4 ++
 test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/MANIFEST             |    1 
 test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/MANIFEST        |    1 
 test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/diacritics.txt  |   16 ++++++++++
 test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/MANIFEST           |    1 
 test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/MANIFEST      |    1 
 test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt      |    2 +
 22 files changed, 36 insertions(+), 31 deletions(-)

New commits:
commit 9c9411839bb89d0a1a83120af0982c60e0e393d9
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Apr 28 12:38:25 2014 -0700

    [tibetan] Reorder PADMA sign to occur after other below marks
    
    Based on suggestion from Andrew Glass.
    
    Test: U+0F40,0FC6,0F83

diff --git a/src/hb-unicode-private.hh b/src/hb-unicode-private.hh
index ba193e8..991130f 100644
--- a/src/hb-unicode-private.hh
+++ b/src/hb-unicode-private.hh
@@ -112,6 +112,10 @@ HB_UNICODE_FUNCS_IMPLEMENT_CALLBACKS_SIMPLE
      * Reorder SAKOT to ensure it comes after any tone marks. */
     if (unlikely (unicode == 0x1A60)) return 254;
 
+    /* XXX This hack belongs to the Tibetan shaper:
+     * Reorder PADMA to ensure it comes after any vowel marks. */
+    if (unlikely (unicode == 0x0FC6)) return 254;
+
     return _hb_modified_combining_class[combining_class (unicode)];
   }
 
commit 659cd3c5b470ff9724ce5e53fedd1fea3e7512c4
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Apr 28 12:43:42 2014 -0700

    [test] Add test case for Tibetan sign PADMA
    
    Currently fails.

diff --git a/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt b/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt
index 4c9af60..a5d4082 100644
--- a/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt
+++ b/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt
@@ -1 +1,2 @@
 སྟྲཱ
+ཀ࿆ྃ
commit ee703bc3ef740c300718fca7a12c050c322dce19
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Apr 28 12:43:18 2014 -0700

    Reshuffle test data

diff --git a/test/shaping/texts/in-tree/MANIFEST b/test/shaping/texts/in-tree/MANIFEST
index 5fd8eb9..f7a7a96 100644
--- a/test/shaping/texts/in-tree/MANIFEST
+++ b/test/shaping/texts/in-tree/MANIFEST
@@ -1,6 +1,9 @@
 shaper-arabic
 shaper-default
+shaper-hangul
+shaper-hebrew
 shaper-indic
 shaper-myanmar
 shaper-sea
 shaper-thai
+shaper-tibetan
diff --git a/test/shaping/texts/in-tree/shaper-default/MANIFEST b/test/shaping/texts/in-tree/shaper-default/MANIFEST
index 7682db4..d08deb7 100644
--- a/test/shaping/texts/in-tree/shaper-default/MANIFEST
+++ b/test/shaping/texts/in-tree/shaper-default/MANIFEST
@@ -1,8 +1,5 @@
 script-ethiopic
 script-han
-script-hangul
-script-hebrew
 script-hiragana
 script-linear-b
-script-tibetan
 script-tifinagh
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hangul/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-hangul/MANIFEST
deleted file mode 100644
index b8752e7..0000000
--- a/test/shaping/texts/in-tree/shaper-default/script-hangul/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-misc
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hangul/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-hangul/misc/MANIFEST
deleted file mode 100644
index 29cfb2f..0000000
--- a/test/shaping/texts/in-tree/shaper-default/script-hangul/misc/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-misc.txt
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt b/test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt
deleted file mode 100644
index 797b1c6..0000000
--- a/test/shaping/texts/in-tree/shaper-default/script-hangul/misc/misc.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-휴가 가-- (오--)
-휴가 가-- (오--)
-ᄒᆞᆫ
-á…Ÿá…¡á„«á… 
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hebrew/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-hebrew/MANIFEST
deleted file mode 100644
index b8752e7..0000000
--- a/test/shaping/texts/in-tree/shaper-default/script-hebrew/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-misc
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hebrew/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-hebrew/misc/MANIFEST
deleted file mode 100644
index 06ca481..0000000
--- a/test/shaping/texts/in-tree/shaper-default/script-hebrew/misc/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-diacritics.txt
diff --git a/test/shaping/texts/in-tree/shaper-default/script-hebrew/misc/diacritics.txt b/test/shaping/texts/in-tree/shaper-default/script-hebrew/misc/diacritics.txt
deleted file mode 100644
index f3cf91f..0000000
--- a/test/shaping/texts/in-tree/shaper-default/script-hebrew/misc/diacritics.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-קול דודי ×”× ×”Ö¾×–×” בא מדלג על־ההרים מקפץ על־הגבעות
-הֲבֵל הֲבָלִים אָמַר קֹהֶלֶת
-לְהַגִּיד בַּבֹּקֶר חַסְדֶּךָ ×•Ö¶×Ö±×ž×•Ö¼× Ö¸×ªÖ°×šÖ¸ בַּלֵּילוֹת
-יְרוּשָׁלִַם
-יְרוּשָׁלִָם
-יְרוּשָׁלְַמָה
-יְרוּשָׁלְָמָה
-× Ö°×‘Ö»Ö½×›Ö·×“Ö°× Ö¶××¦Ö¼Ö·Ö£×¨
-מִתָּ֑͏ַ֜חַת
-אֲ‍ֽ֭דַבְּרָה
-וֽ͏ַיְהִי־֯כֵֽן
-לׅׄוּלֵׅ֗ׄאׅׄ
-×Ö¸× Ö¼Ö¸Ö½×” ×Ö¸× Ö¸Ö¼Ö½×”
-תַעֲשֶׂ֦ה
-שֹֽׁטְרֵי֙
-אֲ‍ֽ֭
diff --git a/test/shaping/texts/in-tree/shaper-default/script-tibetan/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-tibetan/MANIFEST
deleted file mode 100644
index b8752e7..0000000
--- a/test/shaping/texts/in-tree/shaper-default/script-tibetan/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-misc
diff --git a/test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/MANIFEST
deleted file mode 100644
index 29cfb2f..0000000
--- a/test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/MANIFEST
+++ /dev/null
@@ -1 +0,0 @@
-misc.txt
diff --git a/test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/misc.txt b/test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/misc.txt
deleted file mode 100644
index 4c9af60..0000000
--- a/test/shaping/texts/in-tree/shaper-default/script-tibetan/misc/misc.txt
+++ /dev/null
@@ -1 +0,0 @@
-སྟྲཱ
diff --git a/test/shaping/texts/in-tree/shaper-hangul/script-hangul/MANIFEST b/test/shaping/texts/in-tree/shaper-hangul/script-hangul/MANIFEST
new file mode 100644
index 0000000..b8752e7
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-hangul/script-hangul/MANIFEST
@@ -0,0 +1 @@
+misc
diff --git a/test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/MANIFEST
new file mode 100644
index 0000000..29cfb2f
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/MANIFEST
@@ -0,0 +1 @@
+misc.txt
diff --git a/test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/misc.txt b/test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/misc.txt
new file mode 100644
index 0000000..797b1c6
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-hangul/script-hangul/misc/misc.txt
@@ -0,0 +1,4 @@
+휴가 가-- (오--)
+휴가 가-- (오--)
+ᄒᆞᆫ
+á…Ÿá…¡á„«á… 
diff --git a/test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/MANIFEST b/test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/MANIFEST
new file mode 100644
index 0000000..b8752e7
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/MANIFEST
@@ -0,0 +1 @@
+misc
diff --git a/test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/MANIFEST
new file mode 100644
index 0000000..06ca481
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/MANIFEST
@@ -0,0 +1 @@
+diacritics.txt
diff --git a/test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/diacritics.txt b/test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/diacritics.txt
new file mode 100644
index 0000000..f3cf91f
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-hebrew/script-hebrew/misc/diacritics.txt
@@ -0,0 +1,16 @@
+קול דודי ×”× ×”Ö¾×–×” בא מדלג על־ההרים מקפץ על־הגבעות
+הֲבֵל הֲבָלִים אָמַר קֹהֶלֶת
+לְהַגִּיד בַּבֹּקֶר חַסְדֶּךָ ×•Ö¶×Ö±×ž×•Ö¼× Ö¸×ªÖ°×šÖ¸ בַּלֵּילוֹת
+יְרוּשָׁלִַם
+יְרוּשָׁלִָם
+יְרוּשָׁלְַמָה
+יְרוּשָׁלְָמָה
+× Ö°×‘Ö»Ö½×›Ö·×“Ö°× Ö¶××¦Ö¼Ö·Ö£×¨
+מִתָּ֑͏ַ֜חַת
+אֲ‍ֽ֭דַבְּרָה
+וֽ͏ַיְהִי־֯כֵֽן
+לׅׄוּלֵׅ֗ׄאׅׄ
+×Ö¸× Ö¼Ö¸Ö½×” ×Ö¸× Ö¸Ö¼Ö½×”
+תַעֲשֶׂ֦ה
+שֹֽׁטְרֵי֙
+אֲ‍ֽ֭
diff --git a/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/MANIFEST b/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/MANIFEST
new file mode 100644
index 0000000..b8752e7
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/MANIFEST
@@ -0,0 +1 @@
+misc
diff --git a/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/MANIFEST b/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/MANIFEST
new file mode 100644
index 0000000..29cfb2f
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/MANIFEST
@@ -0,0 +1 @@
+misc.txt
diff --git a/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt b/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt
new file mode 100644
index 0000000..4c9af60
--- /dev/null
+++ b/test/shaping/texts/in-tree/shaper-tibetan/script-tibetan/misc/misc.txt
@@ -0,0 +1 @@
+སྟྲཱ
commit b082ef373cefb35dd98b5f2f0b677ccc7806f51e
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Fri Apr 25 11:48:10 2014 -0700

    Typo

diff --git a/src/hb-ot-shape-complex-indic.cc b/src/hb-ot-shape-complex-indic.cc
index ee63164..47ccf7e 100644
--- a/src/hb-ot-shape-complex-indic.cc
+++ b/src/hb-ot-shape-complex-indic.cc
@@ -802,7 +802,7 @@ initial_reordering_consonant_syllable (const hb_ot_shape_plan_t *plan,
       case BASE_POS_LAST_SINHALA:
       {
         /* Sinhala base positioning is slightly different from main Indic, in that:
-	 * 1. It's ZWJ behavior is different,
+	 * 1. Its ZWJ behavior is different,
 	 * 2. We don't need to look into the font for consonant positions.
 	 */