From 49741c86334d12fa08a5bfa2110ff3b9adcba1c7 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Thu, 21 Jul 2011 00:35:37 -0400 Subject: [PATCH] Include variation-selectors in cluster calculation --- src/hb-ot-shape.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/hb-ot-shape.cc b/src/hb-ot-shape.cc index a9a8a7a3d..2abcb9e4a 100644 --- a/src/hb-ot-shape.cc +++ b/src/hb-ot-shape.cc @@ -205,7 +205,8 @@ hb_form_clusters (hb_ot_shape_context_t *c) if (FLAG (c->buffer->info[i].general_category()) & (FLAG (HB_UNICODE_GENERAL_CATEGORY_SPACING_MARK) | FLAG (HB_UNICODE_GENERAL_CATEGORY_ENCLOSING_MARK) | - FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK))) + FLAG (HB_UNICODE_GENERAL_CATEGORY_NON_SPACING_MARK)) || + is_variation_selector (c->buffer->info[c->buffer->i].codepoint)) c->buffer->info[i].cluster = c->buffer->info[i - 1].cluster; }