Fix bug #953: Paint text decorations for spaces

(cherry picked from commit c671703f05)

src/rowpainter.cpp

@@ -360,6 +360,14 @@ void RowPainter::paintChars(pos_type & vpos, FontInfo const & font,
 }
 
 
+void RowPainter::paintSeparator(double orig_x, double width,
+	FontInfo const & font)
+{
+	pi_.pain.textDecoration(font, int(orig_x), yo_, int(width));
+	x_ += width;
+}
+
+
 void RowPainter::paintForeignMark(double orig_x, Language const * lang,
 		int desc)
 {
@@ -922,9 +930,10 @@ void RowPainter::paintText()
 		if (par_.isSeparator(pos)) {
 			Font const orig_font = text_metrics_.displayFont(pit_, pos);
 			double const orig_x = x_;
-			x_ += width_pos;
+			double separator_width = width_pos;
 			if (pos >= body_pos)
-				x_ += row_.separator;
+				separator_width += row_.separator;
+			paintSeparator(orig_x, separator_width, orig_font.fontInfo());
 			paintForeignMark(orig_x, orig_font.language());
 			++vpos;
 

src/rowpainter.h

@@ -58,6 +58,7 @@ public:
 	void paintSelection();
 
 private:
+	void paintSeparator(double orig_x, double width, FontInfo const & font);
 	void paintForeignMark(double orig_x, Language const * lang, int desc = 0);
 	void paintMisspelledMark(double orig_x, bool changed);
 	void paintHebrewComposeChar(pos_type & vpos, FontInfo const & font);

status.20x

@@ -170,6 +170,8 @@ What's new
 - Fix display of special characters like '\#', '{..}' and of auto-
   completion in math insets with a special font, e.g. mathcal (bug 5167).
 
+- Fix the painting of underbar and strikeout which span spaces (bug 953).
+
 
 * DOCUMENTATION AND LOCALIZATION