From: Richard Kimberly Heck <rikiheck@lyx.org>
Date: Fri, 4 Jan 2019 00:12:58 +0000 (-0500)
Subject: Fix bug #11432.
X-Git-Tag: 2.3.3~67
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3c4c5aa994a1d67b077e1062d3e3f0dbf58c7054;p=features.git

Fix bug #11432.

Take account of Layout::free_spacing.

(cherry picked from commit 6135824f40c55e3a6156d477f7475473a8d5ee53)
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index 545ab0baee..a16437ddac 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3318,7 +3318,10 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 		} else {
 			char_type c = getUChar(buf.masterBuffer()->params(),
 					       runparams, i);
-			xs << c;
+			if (c == ' ' && (style.free_spacing || runparams.free_spacing))
+				xs << XHTMLStream::ESCAPE_NONE << "&nbsp;";
+			else
+				xs << c;
 		}
 		font_old = font.fontInfo();
 	}
diff --git a/status.23x b/status.23x
index 1ee2757d13..c767807c62 100644
--- a/status.23x
+++ b/status.23x
@@ -131,6 +131,10 @@ What's new
 * TEX2LYX
 
 
+* LYXHTML
+
+- Take account of 'free spacing' (bug 11432).
+
 
 * ADVANCED FIND AND REPLACE