diff options
| author | Peng Wu <pwu@redhat.com> | 2020-02-21 15:34:59 +0800 |
|---|---|---|
| committer | Marco Trevisan (Treviño) <mail@3v1n0.net> | 2021-05-05 15:43:48 +0200 |
| commit | 98b5cb1c808aee9e375ebb7454f98976e03677cc (patch) | |
| tree | 68b84db52f1b0ca68ff54d18f356fe478472f6da | |
| parent | f288eaafcccddde2f91606ca8f0785d9fd1b691b (diff) | |
| download | pango-98b5cb1c808aee9e375ebb7454f98976e03677cc.tar.gz | |
Update Line Breaking to Unicode 13
(cherry-picked from commit 23b6d06e)
| -rw-r--r-- | pango/break.c | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/pango/break.c b/pango/break.c index 00dc3db7..5aa9d41e 100644 --- a/pango/break.c +++ b/pango/break.c @@ -1081,10 +1081,12 @@ pango_default_break (const gchar *text, if ((prev_break_type == G_UNICODE_BREAK_ALPHABETIC || prev_break_type == G_UNICODE_BREAK_HEBREW_LETTER || prev_break_type == G_UNICODE_BREAK_NUMERIC) && - break_type == G_UNICODE_BREAK_OPEN_PUNCTUATION) + break_type == G_UNICODE_BREAK_OPEN_PUNCTUATION && + !_pango_is_EastAsianWide (wc)) break_op = BREAK_PROHIBITED; if (prev_break_type == G_UNICODE_BREAK_CLOSE_PARANTHESIS && + !_pango_is_EastAsianWide (prev_wc)&& (break_type == G_UNICODE_BREAK_ALPHABETIC || break_type == G_UNICODE_BREAK_HEBREW_LETTER || break_type == G_UNICODE_BREAK_NUMERIC)) @@ -1226,25 +1228,7 @@ pango_default_break (const gchar *text, /* Rule LB22 */ if (break_type == G_UNICODE_BREAK_INSEPARABLE) - { - if (prev_break_type == G_UNICODE_BREAK_ALPHABETIC || - prev_break_type == G_UNICODE_BREAK_HEBREW_LETTER) - break_op = BREAK_PROHIBITED; - - if (prev_break_type == G_UNICODE_BREAK_EXCLAMATION) - break_op = BREAK_PROHIBITED; - - if (prev_break_type == G_UNICODE_BREAK_IDEOGRAPHIC || - prev_break_type == G_UNICODE_BREAK_EMOJI_BASE || - prev_break_type == G_UNICODE_BREAK_EMOJI_MODIFIER) - break_op = BREAK_PROHIBITED; - - if (prev_break_type == G_UNICODE_BREAK_INSEPARABLE) - break_op = BREAK_PROHIBITED; - - if (prev_break_type == G_UNICODE_BREAK_NUMERIC) - break_op = BREAK_PROHIBITED; - } + break_op = BREAK_PROHIBITED; if (break_type == G_UNICODE_BREAK_AFTER || break_type == G_UNICODE_BREAK_HYPHEN || |