rename _unicode_is_emoji_extended_pictographic to _unicode_is_extended_pictographic

This commit is contained in:
Vincent Wei
2019-03-07 17:46:35 +08:00
parent 5887668b17
commit d1ef9e2598
2 changed files with 3 additions and 3 deletions

View File

@@ -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);

View File

@@ -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)