From 58d2e9309952c139a4fa05ed44c22bb712fd6cd4 Mon Sep 17 00:00:00 2001
From: Behdad Esfahbod <behdad@behdad.org>
Date: Tue, 28 Jun 2022 15:38:58 -0600
Subject: [PATCH] [coretext] Fix up clusters only if needed

---
 src/hb-coretext.cc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/hb-coretext.cc b/src/hb-coretext.cc
index 37077334d..0178db66b 100644
--- a/src/hb-coretext.cc
+++ b/src/hb-coretext.cc
@@ -1142,7 +1142,8 @@ resize_and_retry:
      * This does *not* mean we'll form the same clusters as Uniscribe
      * or the native OT backend, only that the cluster indices will be
      * monotonic in the output buffer. */
-    if (count > 1 && (status_or & kCTRunStatusNonMonotonic))
+    if (count > 1 && (status_or & kCTRunStatusNonMonotonic) &&
+	buffer->cluster_level != HB_BUFFER_CLUSTER_LEVEL_CHARACTERS)
     {
       hb_glyph_info_t *info = buffer->info;
       if (HB_DIRECTION_IS_FORWARD (buffer->props.direction))