diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-12-08 12:15:55 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-12-08 12:15:55 +0000 |
| commit | ea2fa51616df5a23cd97f2cc8460a608722666c9 (patch) | |
| tree | dd1071f8b313d4e7aaec48e7bb8cc657109c0ed1 | |
| parent | 8b46f5db285c6c661a2a7c28c5b354426a8d5c61 (diff) | |
| parent | 73a3c19e3db38c23260e282f7fb219c854baf086 (diff) | |
| download | pango-ea2fa51616df5a23cd97f2cc8460a608722666c9.tar.gz | |
Merge branch 'fix-break-latin' into 'main'
Fix break-latin.c
Closes #636
See merge request GNOME/pango!536
| -rw-r--r-- | pango/break-latin.c | 40 |
1 files changed, 19 insertions, 21 deletions
diff --git a/pango/break-latin.c b/pango/break-latin.c index 608bff94..69ad5110 100644 --- a/pango/break-latin.c +++ b/pango/break-latin.c @@ -25,37 +25,35 @@ static void break_latin (const char *text, - int len, - const PangoAnalysis *analysis G_GNUC_UNUSED, - PangoLogAttr *attrs, - int attrs_len G_GNUC_UNUSED) + int length, + const PangoAnalysis *analysis, + PangoLogAttr *attrs, + int attrs_len G_GNUC_UNUSED) { + int i; + const char *p, *next; + gunichar wc, prev_wc; - if (analysis && analysis->language && - g_ascii_strncasecmp (pango_language_to_string (analysis->language), "ca-", 3) != 0) - return; + if (!analysis || !analysis->language || + g_ascii_strncasecmp (pango_language_to_string (analysis->language), "ca-", 3) != 0) + return; - const gchar *next; - gunichar wc; - gunichar prev_wc = 0; - - next = text; - for (int i = 0; i < len; i++) + for (p = text, i = 0, prev_wc = 0; + p < text + length; + p = next, i++, prev_wc = wc) { - wc = g_utf8_get_char (next); - next = g_utf8_next_char (next); + wc = g_utf8_get_char (p); + next = g_utf8_next_char (p); - /* Catalan middle dot does not break words */ - if (wc == 0x00b7) + /* Catalan middle dot does not break words */ + if (wc == 0x00b7) { - gunichar middle_next = g_utf8_get_char (next); - if (g_unichar_tolower (middle_next) == 'l' && g_unichar_tolower (prev_wc) == 'l') + gunichar middle_next = g_utf8_get_char (next); + if (g_unichar_tolower (middle_next) == 'l' && g_unichar_tolower (prev_wc) == 'l') { attrs[i].is_word_end = FALSE; attrs[i+1].is_word_start = FALSE; } } - prev_wc = wc; } } - |