diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-11-28 15:54:46 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-11-28 15:54:46 +0000 |
| commit | 5c292b15d4049c8692b85663431d5a2fd37c8604 (patch) | |
| tree | 3f1808885d3147a73f034e5b04a9be1e348f8b0e /pango/shape.c | |
| parent | 3fdbd3fe01842e683a26a1e1c9c9eb04099f27f1 (diff) | |
| parent | 6f775850ae51d7b0db3a5ef9d6c824979a4b38c1 (diff) | |
| download | pango-5c292b15d4049c8692b85663431d5a2fd37c8604.tar.gz | |
Merge branch 'matthiasc/for-main' into 'main'
Never show variation selectors
See merge request GNOME/pango!526
Diffstat (limited to 'pango/shape.c')
| -rw-r--r-- | pango/shape.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pango/shape.c b/pango/shape.c index caefeae4..45c979f2 100644 --- a/pango/shape.c +++ b/pango/shape.c @@ -111,9 +111,12 @@ pango_hb_font_get_nominal_glyph (hb_font_t *font, } if ((context->show_flags & PANGO_SHOW_IGNORABLES) != 0 && - pango_get_ignorable (unicode)) + pango_is_default_ignorable (unicode)) { - *glyph = PANGO_GET_UNKNOWN_GLYPH (unicode); + if (pango_get_ignorable (unicode)) + *glyph = PANGO_GET_UNKNOWN_GLYPH (unicode); + else + *glyph = PANGO_GLYPH_EMPTY; return TRUE; } |