[pango/visible-things: 12/12] layout: Don't zero the width of visible space

[Matthias Clasen <matthiasc src gnome org>]

commit ccdc4d81a6d4ee6d21c1471556b62900a856b8c1
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jul 8 15:27:22 2019 -0400

    layout: Don't zero the width of visible space
    
    Don't zero out a line separator at the end of line
    if we are showing space or ignorables. And if we
    zero out whitespace at the end of the line, make
    sure we don't draw anything there by setting the
    glyph to EMPTY.
    
    Without this, we are getting the [LS] hex box
    rendered on top of the last character in a line,
    when the line separator ends up being visible.

 pango/pango-layout.c | 5 +++++
 1 file changed, 5 insertions(+)
---
diff --git a/pango/pango-layout.c b/pango/pango-layout.c
index 9f041670..16df3071 100644
--- a/pango/pango-layout.c
+++ b/pango/pango-layout.c
@@ -5332,6 +5332,10 @@ zero_line_final_space (PangoLayoutLine *line,
   PangoGlyphString *glyphs = run->glyphs;
   int glyph = item->analysis.level % 2 ? 0 : glyphs->num_glyphs - 1;
 
+  if ((glyphs->glyphs[glyph].glyph == PANGO_GET_UNKNOWN_GLYPH (0x2028)) &&
+      (layout->shape_flags & (PANGO_SHAPE_SHOW_IGNORABLES | PANGO_SHAPE_SHOW_SPACE)))
+    return; /* this space is visible */
+
   /* if the final char of line forms a cluster, and it's
    * a whitespace char, zero its glyph's width as it's been wrapped
    */
@@ -5346,6 +5350,7 @@ zero_line_final_space (PangoLayoutLine *line,
 
   state->remaining_width += glyphs->glyphs[glyph].geometry.width;
   glyphs->glyphs[glyph].geometry.width = 0;
+  glyphs->glyphs[glyph].glyph = PANGO_GLYPH_EMPTY;
 }
 
 /* When doing shaping, we add the letter spacing value for a