diff options
author | Matthias Clasen <mclasen@redhat.com> | 2021-11-08 13:47:52 +0000 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2021-11-08 13:47:52 +0000 |
commit | 78d4efd6af8fc37b93b1dafb7c3b7101b389a565 (patch) | |
tree | 857deeac1c70f10038c2e967d0238f1845964533 /pango/pango-layout.c | |
parent | 9d389e936707ebcf84fbc64d07b8aa17cdf2ef04 (diff) | |
parent | 1790dbf9da8a4249528833ead1af32d232861b64 (diff) | |
download | pango-78d4efd6af8fc37b93b1dafb7c3b7101b389a565.tar.gz |
Merge branch 'small-caps' into 'main'
Emulate Small Caps if not available from the font
See merge request GNOME/pango!497
Diffstat (limited to 'pango/pango-layout.c')
-rw-r--r-- | pango/pango-layout.c | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/pango/pango-layout.c b/pango/pango-layout.c index ba81adf6..9e8ce248 100644 --- a/pango/pango-layout.c +++ b/pango/pango-layout.c @@ -4534,13 +4534,14 @@ pango_layout_check_lines (PangoLayout *layout) g_assert (delim_len >= 0); state.attrs = itemize_attrs; - state.items = pango_itemize_with_base_dir (layout->context, - base_dir, - layout->text, - start - layout->text, - end - start, - itemize_attrs, - itemize_attrs ? &iter : NULL); + state.items = pango_itemize_with_font (layout->context, + base_dir, + layout->text, + start - layout->text, + end - start, + itemize_attrs, + itemize_attrs ? &iter : NULL, + NULL); apply_attributes_to_items (state.items, shape_attrs); @@ -4553,6 +4554,11 @@ pango_layout_check_lines (PangoLayout *layout) layout->log_attrs + start_offset, layout->n_chars + 1 - start_offset); + state.items = pango_itemize_post_process_items (layout->context, + layout->text, + layout->log_attrs + start_offset, + state.items); + state.base_dir = base_dir; state.line_of_par = 1; state.start_offset = start_offset; |