[pango: 4/4] Merge branch 'tailor-break' into 'master'



commit 8c7acb646dfbebd71db5a7310d2dc5dc7412dcfc
Merge: c5aeaba0 cc9b0912
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jul 16 23:10:20 2019 +0000

    Merge branch 'tailor-break' into 'master'
    
    Tailor break
    
    See merge request GNOME/pango!86

 docs/pango-sections.txt |  2 ++
 pango/break.c           | 76 ++++++++++++++++++++++++++++++---------------
 pango/pango-break.h     | 12 +++++---
 pango/pango-layout.c    | 82 ++++++++++++++++++++++++++++---------------------
 4 files changed, 108 insertions(+), 64 deletions(-)
---
diff --cc pango/pango-layout.c
index e0725adc,27d6bfe5..21897e29
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@@ -4241,11 -4251,16 +4251,13 @@@ pango_layout_check_lines (PangoLayout *
                                                 iter);
  
        if (no_break_attrs)
 -        {
 -          apply_no_break_attributes (state.items, no_break_attrs);
 -          pango_attr_list_unref (no_break_attrs);
 -        }
 +        apply_no_break_attributes (state.items, no_break_attrs);
  
-       get_items_log_attrs (start, state.items,
+       get_items_log_attrs (start,
+                            delimiter_index + delim_len,
+                            state.items,
                           layout->log_attrs + start_offset,
-                          delim_len);
+                            layout->n_chars + 1 - start_offset);
  
        state.base_dir = base_dir;
        state.line_of_par = 1;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]