summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-10-12 14:36:29 +0000
committerMatthias Clasen <mclasen@redhat.com>2019-10-12 14:36:29 +0000
commit9c305c9e86d1db751f4d6d6659fe4a585f0d49b6 (patch)
treec39ebd70ae554aef2720e6b2d00c27695ab80c3b
parent050ebae3a0340e37187319273b5ab443cbe1f0fd (diff)
parent539d6ec04e4c42f9d59f76681003a11359e3ea9f (diff)
downloadpango-9c305c9e86d1db751f4d6d6659fe4a585f0d49b6.tar.gz
Merge branch 'hyphen-cluster' into 'master'
Fixes harfbuzz codepoint cluster for hyphens. Closes #429 See merge request GNOME/pango!148
-rw-r--r--pango/pangofc-shape.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c
index 5799e373..9fe193f6 100644
--- a/pango/pangofc-shape.c
+++ b/pango/pangofc-shape.c
@@ -376,9 +376,9 @@ pango_hb_shape (PangoFont *font,
hb_codepoint_t glyph;
if (hb_font_get_nominal_glyph (hb_font, 0x2010, &glyph))
- hb_buffer_add (hb_buffer, 0x2010, item_length - last_char_len);
+ hb_buffer_add (hb_buffer, 0x2010, item_offset + item_length - last_char_len);
else if (hb_font_get_nominal_glyph (hb_font, '-', &glyph))
- hb_buffer_add (hb_buffer, '-', item_length - last_char_len);
+ hb_buffer_add (hb_buffer, '-', item_offset + item_length - last_char_len);
}
pango_font_get_features (font, features, G_N_ELEMENTS (features), &num_features);