summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2019-10-12 14:39:24 +0000
committerMatthias Clasen <mclasen@redhat.com>2019-10-12 14:39:24 +0000
commitd334ff1f89a51dde4ce96d7acac2c218be7d7ed5 (patch)
treef7f132f9626ad8742da78bad201fbadf9cd8f9a0
parent9c305c9e86d1db751f4d6d6659fe4a585f0d49b6 (diff)
parent268114b82b988515fc2e1a025ff398aadffcdb10 (diff)
downloadpango-d334ff1f89a51dde4ce96d7acac2c218be7d7ed5.tar.gz
Merge branch 'break-opt' into 'master'
break: Don't determine types more than once See merge request GNOME/pango!149
-rw-r--r--pango/break.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/pango/break.c b/pango/break.c
index 9fa1c47b..ca62a28f 100644
--- a/pango/break.c
+++ b/pango/break.c
@@ -858,11 +858,13 @@ pango_default_break (const gchar *text,
if (SB_type == SB_Other)
{
- if (g_unichar_islower(wc))
+ if (type == G_UNICODE_LOWERCASE_LETTER)
SB_type = SB_Lower;
- else if (g_unichar_isupper(wc))
+ else if (type == G_UNICODE_UPPERCASE_LETTER)
SB_type = SB_Upper;
- else if (g_unichar_isalpha(wc))
+ else if (type == G_UNICODE_TITLECASE_LETTER ||
+ type == G_UNICODE_MODIFIER_LETTER ||
+ type == G_UNICODE_OTHER_LETTER)
SB_type = SB_OLetter;
if (type == G_UNICODE_OPEN_PUNCTUATION ||