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

[Behdad Esfahbod]

 src/hb-ot-shape-normalize.cc |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 7f335390f3a498119319a0e6c3ce7656a3902066
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 24 09:56:18 2018 -0400

    Revert change that would decompose text if GPOS mark feature is available
    
    https://github.com/harfbuzz/harfbuzz/issues/653#issuecomment-423905920

diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc
index 90b76404..2f0cba18 100644
--- a/src/hb-ot-shape-normalize.cc
+++ b/src/hb-ot-shape-normalize.cc
@@ -297,7 +297,9 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
   if (mode == HB_OT_SHAPE_NORMALIZATION_MODE_AUTO)
   {
     if (plan->has_mark)
-      mode = HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED;
+      // https://github.com/harfbuzz/harfbuzz/issues/653#issuecomment-423905920
+      //mode = HB_OT_SHAPE_NORMALIZATION_MODE_DECOMPOSED;
+      mode = HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS;
     else
       mode = HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS;
   }
commit a6f4b2f7cd088aeb44e1aac672434641f4f9e484
Author: Behdad Esfahbod <behdad at behdad.org>
Date:   Mon Sep 24 09:54:37 2018 -0400

    Fix normalization
    
    https://github.com/harfbuzz/harfbuzz/commit/62d1e0852a5549a1b510ad46a4b89f12730bb708#commitcomment-30613091

diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc
index 487fd96a..90b76404 100644
--- a/src/hb-ot-shape-normalize.cc
+++ b/src/hb-ot-shape-normalize.cc
@@ -385,7 +385,6 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
 
   if (mode == HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS ||
       mode == HB_OT_SHAPE_NORMALIZATION_MODE_COMPOSED_DIACRITICS_NO_SHORT_CIRCUIT)
-    return;
   {
     /* As noted in the comment earlier, we don't try to combine
      * ccc=0 chars with their previous Starter. */