From d5e61470fa8e5046c35a79988e00e012ae4fff0f Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 5 Aug 2014 14:19:01 -0400
Subject: [PATCH] [arabic] Fix fallback shaping regression

Was broken in 615d00ea252739da57edbd980ff27e573.

Fixes https://github.com/behdad/harfbuzz/pull/48

Micro-test added.
---
 src/hb-ot-shape-complex-arabic.cc                |   4 ++--
 test/shaping/Makefile.am                         |   1 +
 test/shaping/fonts/sha1sum/MANIFEST              |   1 +
 .../df768b9c257e0c9c35786c47cae15c46571d56be.ttf | Bin 0 -> 6332 bytes
 test/shaping/tests/MANIFEST                      |   1 +
 test/shaping/tests/arabic-fallback-shaping.tests |   1 +
 6 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 test/shaping/fonts/sha1sum/df768b9c257e0c9c35786c47cae15c46571d56be.ttf
 create mode 100644 test/shaping/tests/arabic-fallback-shaping.tests

diff --git a/src/hb-ot-shape-complex-arabic.cc b/src/hb-ot-shape-complex-arabic.cc
index 6cf1a7f59..ae9086412 100644
--- a/src/hb-ot-shape-complex-arabic.cc
+++ b/src/hb-ot-shape-complex-arabic.cc
@@ -223,8 +223,8 @@ data_create_arabic (const hb_ot_shape_plan_t *plan)
   for (unsigned int i = 0; i < ARABIC_NUM_FEATURES; i++) {
     arabic_plan->mask_array[i] = plan->map.get_1_mask (arabic_features[i]);
     arabic_plan->do_fallback = arabic_plan->do_fallback &&
-			       !FEATURE_IS_SYRIAC (arabic_features[i]) &&
-			       plan->map.needs_fallback (arabic_features[i]);
+			       (FEATURE_IS_SYRIAC (arabic_features[i]) ||
+			        plan->map.needs_fallback (arabic_features[i]));
   }
 
   return arabic_plan;
diff --git a/test/shaping/Makefile.am b/test/shaping/Makefile.am
index 9e825133a..e2dcc98ef 100644
--- a/test/shaping/Makefile.am
+++ b/test/shaping/Makefile.am
@@ -36,6 +36,7 @@ CLEANFILES += \
 	$(NULL)
 
 TESTS = \
+	tests/arabic-fallback-shaping.tests \
 	tests/arabic-feature-order.tests \
 	tests/context-matching.tests \
 	tests/hangul-jamo.tests \
diff --git a/test/shaping/fonts/sha1sum/MANIFEST b/test/shaping/fonts/sha1sum/MANIFEST
index a8ca117f1..c51639b61 100644
--- a/test/shaping/fonts/sha1sum/MANIFEST
+++ b/test/shaping/fonts/sha1sum/MANIFEST
@@ -12,6 +12,7 @@ a919b33197965846f21074b24e30250d67277bce.ttf
 bb29ce50df2bdba2d10726427c6b7609bf460e04.ttf
 bb9473d2403488714043bcfb946c9f78b86ad627.ttf
 d629e7fedc0b350222d7987345fe61613fa3929a.ttf
+df768b9c257e0c9c35786c47cae15c46571d56be.ttf
 e207635780b42f898d58654b65098763e340f5c7.ttf
 ef86fe710cfea877bbe0dbb6946a1f88d0661031.ttf
 f499fbc23865022234775c43503bba2e63978fe1.ttf
diff --git a/test/shaping/fonts/sha1sum/df768b9c257e0c9c35786c47cae15c46571d56be.ttf b/test/shaping/fonts/sha1sum/df768b9c257e0c9c35786c47cae15c46571d56be.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..c6d8b18e7f049a1b68eaecdaeb92bebbf3abc57d
GIT binary patch
literal 6332
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
Yb!p75E_G1^2k|%HHwh!?@xEH{{}5*Bh5!Hn

literal 0
HcmV?d00001

diff --git a/test/shaping/tests/MANIFEST b/test/shaping/tests/MANIFEST
index 363913334..3f2aed45e 100644
--- a/test/shaping/tests/MANIFEST
+++ b/test/shaping/tests/MANIFEST
@@ -1,3 +1,4 @@
+arabic-fallback-shaping.tests
 arabic-feature-order.tests
 context-matching.tests
 hangul-jamo.tests
diff --git a/test/shaping/tests/arabic-fallback-shaping.tests b/test/shaping/tests/arabic-fallback-shaping.tests
new file mode 100644
index 000000000..024044808
--- /dev/null
+++ b/test/shaping/tests/arabic-fallback-shaping.tests
@@ -0,0 +1 @@
+fonts/sha1sum/df768b9c257e0c9c35786c47cae15c46571d56be.ttf:U+0633,U+064F,U+0644,U+064E,U+0651,U+0627,U+0651,U+0650,U+0645,U+062A,U+06CC:[uni06CC.fina=10+1655|uni062A.medi=9+868|uni0645.init=8+1098|uni0650=2@208,0+0|uni0651=2@272,768+0|uni064E=2@944,1216+0|uni0651=2@1008,768+0|uni06440627.fina=2+1470|uni064F=0@576,-32+0|uni0633.init=0+1585]