From fd8f4ffcc6851ff9024957779be50411e87724d5 Mon Sep 17 00:00:00 2001
From: Simon Cozens <simon@simon-cozens.org>
Date: Fri, 18 Sep 2020 16:37:22 +0100
Subject: [PATCH] Trace reorder, not normalize

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

diff --git a/src/hb-ot-shape-normalize.cc b/src/hb-ot-shape-normalize.cc
index 9157c066f..3eabae1b4 100644
--- a/src/hb-ot-shape-normalize.cc
+++ b/src/hb-ot-shape-normalize.cc
@@ -373,7 +373,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
 
   /* Second round, reorder (inplace) */
 
-  if (!all_simple)
+  if (!all_simple && buffer->message(font, "start reorder"))
   {
     count = buffer->len;
     for (unsigned int i = 0; i < count; i++)
@@ -399,6 +399,7 @@ _hb_ot_shape_normalize (const hb_ot_shape_plan_t *plan,
 
       i = end;
     }
+    (void) buffer->message(font, "end reorder");
   }
   if (buffer->scratch_flags & HB_BUFFER_SCRATCH_FLAG_HAS_CGJ)
   {
diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc
index 3ea95ce2d..7d9055845 100644
--- a/src/hb-ot-shape.cc
+++ b/src/hb-ot-shape.cc
@@ -851,10 +851,7 @@ hb_ot_substitute_default (const hb_ot_shape_context_t *c)
 
   HB_BUFFER_ALLOCATE_VAR (buffer, glyph_index);
 
-  if (buffer->message(c->font, "start normalize")) {
-    _hb_ot_shape_normalize (c->plan, buffer, c->font);
-    buffer->message(c->font, "end normalize");
-  }
+  _hb_ot_shape_normalize (c->plan, buffer, c->font);
 
   hb_ot_shape_setup_masks (c);