Mirrors_UI_SDK/MiniGUI
1
0
Fork 0
mirror of https://github.com/VincentWei/MiniGUI.git synced 2026-09-24 00:54:18 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update LB8a rule to conform Unicode 12.0.0

Browse Source
This commit is contained in:
Vincent Wei
2019-03-08 11:52:36 +08:00
parent e7b05090cd
commit e6df345736
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/newgdi/glyph-unicode.c
+11 -7
View File
@@ -2397,13 +2397,16 @@ int GUIAPI GetUCharsAndBreaks(LOGFONT* logfont, const char* mstr, int mstr_len,
goto next_glyph;
}
// LB8a Do not break between a zero width joiner and an ideograph,
// LB8a Do not break after a zero width joiner.
// This changed since Unicode 11.0.0. Before 11.0.0, the rule is:
// Do not break between a zero width joiner and an ideograph,
// emoji base or emoji modifier.
if (bt == UCHAR_BREAK_ZERO_WIDTH_JOINER
&& is_next_glyph_id_eb_em(&gbctxt,
mstr, mstr_len, &next_uc) > 0) {
//if (bt == UCHAR_BREAK_ZERO_WIDTH_JOINER
// && is_next_glyph_id_eb_em(&gbctxt,
// mstr, mstr_len, &next_uc) > 0) {
if (bt == UCHAR_BREAK_ZERO_WIDTH_JOINER) {
_DBG_PRINTF ("LB8a Do not break between a zero width joiner and ID, EB, EM\n");
_DBG_PRINTF ("LB8a Do not break after a zero width joiner\n");
gbctxt.curr_od = LB8a;
gbctxt_change_lbo_last(&gbctxt, BOV_LB_NOTALLOWED);
}
@@ -2415,7 +2418,7 @@ int GUIAPI GetUCharsAndBreaks(LOGFONT* logfont, const char* mstr, int mstr_len,
// Treat ZWJ as if it were CM.
// CM/ZWJ should have the same break class as
// its base character.
if (bt != UCHAR_BREAK_MANDATORY
else if (bt != UCHAR_BREAK_MANDATORY
&& bt != UCHAR_BREAK_CARRIAGE_RETURN
&& bt != UCHAR_BREAK_LINE_FEED
&& bt != UCHAR_BREAK_NEXT_LINE
@@ -2431,6 +2434,7 @@ int GUIAPI GetUCharsAndBreaks(LOGFONT* logfont, const char* mstr, int mstr_len,
// LB10 Treat any remaining combining mark or ZWJ as AL.
if ((bt == UCHAR_BREAK_COMBINING_MARK
|| bt == UCHAR_BREAK_ZERO_WIDTH_JOINER)) {
_DBG_PRINTF ("LB10.a Treat any remaining combining mark or ZWJ as AL\n");
bt = UCHAR_BREAK_ALPHABETIC;
}
@@ -2447,7 +2451,7 @@ int GUIAPI GetUCharsAndBreaks(LOGFONT* logfont, const char* mstr, int mstr_len,
// LB10 Treat any remaining combining mark or ZWJ as AL.
else if ((bt == UCHAR_BREAK_COMBINING_MARK
|| bt == UCHAR_BREAK_ZERO_WIDTH_JOINER)) {
_DBG_PRINTF ("LB10 Treat any remaining combining mark or ZWJ as AL\n");
_DBG_PRINTF ("LB10.b Treat any remaining combining mark or ZWJ as AL\n");
bt = UCHAR_BREAK_ALPHABETIC;
}
#if 0