From 7ded1896e9a4cfc03ad100ee21ab182ba94b3962 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 29 Jul 2011 14:54:47 -0400 Subject: Revert "[HB] Fix cluster setting with recent HB change" This reverts commit 26475e516f2384efaefe3dd97bd99f2176291354. HarfBuzz reverted to setting clusters logically all the time again, so we don't need this change. --- modules/basic/basic-fc.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/modules/basic/basic-fc.c b/modules/basic/basic-fc.c index e1e7aa1c..42832470 100644 --- a/modules/basic/basic-fc.c +++ b/modules/basic/basic-fc.c @@ -293,14 +293,7 @@ basic_engine_shape (PangoEngineShape *engine G_GNUC_UNUSED, for (i = 0; i < num_glyphs; i++) { glyphs->glyphs[i].glyph = hb_glyph->codepoint; - if (i && glyphs->log_clusters[i-1] != hb_glyph->cluster) { - GUnicodeType t = g_unichar_type (g_utf8_get_char (text + hb_glyph->cluster)); - if ((1<log_clusters[i] = last_cluster; - else - glyphs->log_clusters[i] = hb_glyph->cluster; - } else - glyphs->log_clusters[i] = hb_glyph->cluster; + glyphs->log_clusters[i] = hb_glyph->cluster; glyphs->glyphs[i].attr.is_cluster_start = glyphs->log_clusters[i] != last_cluster; last_cluster = glyphs->log_clusters[i]; -- cgit v1.2.1