summaryrefslogtreecommitdiff
path: root/pango
diff options
context:
space:
mode:
authorPeng Wu <alexepico@gmail.com>2018-09-12 16:17:59 +0800
committerPeng Wu <alexepico@gmail.com>2018-11-20 10:00:59 +0800
commitad1dc6019e67556b5b3b4fb164c15a2c3289bbc9 (patch)
tree8e5c6c4274c05e33b70547259d4db75052d07cb4 /pango
parentf1d3992379134812d81930c526ff1021d36ea7a5 (diff)
downloadpango-ad1dc6019e67556b5b3b4fb164c15a2c3289bbc9.tar.gz
Update Line Break to Unicode 11
Diffstat (limited to 'pango')
-rw-r--r--pango/break.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/pango/break.c b/pango/break.c
index 136d5006..558df7e6 100644
--- a/pango/break.c
+++ b/pango/break.c
@@ -1039,7 +1039,7 @@ pango_default_break (const gchar *text,
/* Rule LB1:
assign a line breaking class to each code point of the input. */
- switch ((int) break_type)
+ switch (break_type)
{
case G_UNICODE_BREAK_AMBIGUOUS:
case G_UNICODE_BREAK_SURROGATE:
@@ -1072,6 +1072,7 @@ pango_default_break (const gchar *text,
break_type == G_UNICODE_BREAK_HANGUL_T_JAMO ||
break_type == G_UNICODE_BREAK_HANGUL_LV_SYLLABLE ||
break_type == G_UNICODE_BREAK_HANGUL_LVT_SYLLABLE ||
+ break_type == G_UNICODE_BREAK_EMOJI_MODIFIER ||
break_type == G_UNICODE_BREAK_REGIONAL_INDICATOR)
{
LineBreakType LB_type;
@@ -1375,10 +1376,7 @@ pango_default_break (const gchar *text,
if (row_break_type == G_UNICODE_BREAK_ZERO_WIDTH_SPACE)
break_op = BREAK_ALLOWED; /* Rule LB8 */
- if (prev_wc == 0x200D &&
- (break_type == G_UNICODE_BREAK_IDEOGRAPHIC ||
- break_type == G_UNICODE_BREAK_EMOJI_BASE ||
- break_type == G_UNICODE_BREAK_EMOJI_MODIFIER))
+ if (prev_wc == 0x200D)
break_op = BREAK_PROHIBITED; /* Rule LB8a */
if (break_type == G_UNICODE_BREAK_SPACE ||