diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-05-09 23:53:43 -0400 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-05-10 00:07:56 -0400 |
| commit | 6772ae34e92f88145264949a7db48f5c9b60fdb1 (patch) | |
| tree | 1934fbf3d03c826d9e2911b26aee1436fc17449c /pango | |
| parent | b9af025b97e80e3c520eaf2a19fc35883d5f2f35 (diff) | |
| download | pango-6772ae34e92f88145264949a7db48f5c9b60fdb1.tar.gz | |
Fix a thinko
The commit message for d476d2a944500f8553 said
"word boundaries", but the code checked for line
breaks. That was wrong, since it also made hyphens
disappear at SHY, where we very much want them.
Update affected tests.
Diffstat (limited to 'pango')
| -rw-r--r-- | pango/pango-layout.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c index 2fe6c9dc..ca70ebe5 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -3511,6 +3511,8 @@ get_need_hyphen (PangoItem *item, } _pango_attr_list_get_iterator (&attrs, &iter); + prev_space = prev_hyphen = TRUE; + for (i = 0, p = text + item->offset; i < item->num_chars; i++, p = g_utf8_next_char (p)) { gunichar wc = g_utf8_get_char (p); @@ -3581,9 +3583,7 @@ get_need_hyphen (PangoItem *item, else hyphen = FALSE; - if (i == 0) - need_hyphen[i] = FALSE; - else if (prev_space || space) + if (prev_space || space) need_hyphen[i] = FALSE; else if (prev_hyphen || hyphen) need_hyphen[i] = FALSE; @@ -3594,6 +3594,8 @@ get_need_hyphen (PangoItem *item, prev_hyphen = hyphen; } + need_hyphen[item->num_chars - 1] = FALSE; + _pango_attr_iterator_destroy (&iter); _pango_attr_list_destroy (&attrs); } @@ -3606,7 +3608,7 @@ break_needs_hyphen (PangoLayout *layout, if (state->log_widths_offset + pos == 0) return FALSE; - if (layout->log_attrs[state->start_offset + pos].is_line_break) + if (layout->log_attrs[state->start_offset + pos].is_word_boundary) return FALSE; if (state->need_hyphen[state->log_widths_offset + pos - 1]) |