summaryrefslogtreecommitdiff
path: root/pango/pango-layout.c
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2021-05-09 00:37:13 +0000
committerMatthias Clasen <mclasen@redhat.com>2021-05-09 00:37:13 +0000
commit736b687b92f93b268fccdf727f1cfd259bd903ed (patch)
tree939c02f905665d7eb2ac8f2460d938c5826e1100 /pango/pango-layout.c
parent7a88d0c6601d5fef4a0850a83145b3b971b51e37 (diff)
parentd476d2a944500f8553a2c1d1054df37363f47460 (diff)
downloadpango-736b687b92f93b268fccdf727f1cfd259bd903ed.tar.gz
Merge branch 'word-break-hyphens' into 'master'
Don't insert hyphens at word breaks Closes #558 See merge request GNOME/pango!323
Diffstat (limited to 'pango/pango-layout.c')
-rw-r--r--pango/pango-layout.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index fa499ef3..e847e789 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -3611,6 +3611,9 @@ 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)
+ return FALSE;
+
if (state->need_hyphen[state->log_widths_offset + pos - 1])
return TRUE;