diff --git a/src/include/unicode-ops.h b/src/include/unicode-ops.h index 96a8938c..f1c7a313 100644 --- a/src/include/unicode-ops.h +++ b/src/include/unicode-ops.h @@ -51,7 +51,7 @@ BOOL _unicode_is_emoji(Uchar32 ch); BOOL _unicode_is_emoji_presentation(Uchar32 ch); BOOL _unicode_is_emoji_modifier(Uchar32 ch); BOOL _unicode_is_emoji_modifier_base(Uchar32 ch); -BOOL _unicode_is_emoji_extended_pictographic(Uchar32 ch); +BOOL _unicode_is_extended_pictographic(Uchar32 ch); BOOL _unicode_is_emoji_text_default(Uchar32 ch); BOOL _unicode_is_emoji_emoji_default(Uchar32 ch); diff --git a/src/newgdi/glyph-unicode.c b/src/newgdi/glyph-unicode.c index c11770e2..05c94c38 100644 --- a/src/newgdi/glyph-unicode.c +++ b/src/newgdi/glyph-unicode.c @@ -893,7 +893,7 @@ void check_emoji_extended_pictographic(struct glyph_break_ctxt* gbctxt, Uchar32 uc) { gbctxt->is_extended_pictographic = - _unicode_is_emoji_extended_pictographic(uc); + _unicode_is_extended_pictographic(uc); } /* Types of Japanese characters */ @@ -922,7 +922,7 @@ static Uint16 check_grapheme_boundaries(struct glyph_break_ctxt* gbctxt, if (gbctxt->met_extended_pictographic) { if (gbt == GB_Extend) gbctxt->met_extended_pictographic = 1; - else if (_unicode_is_emoji_extended_pictographic(gbctxt->prev_uc) && + else if (_unicode_is_extended_pictographic(gbctxt->prev_uc) && gbt == GB_ZWJ) gbctxt->met_extended_pictographic = 1; else if (gbctxt->prev_gbt == GB_Extend && gbt == GB_ZWJ)