From: Richard Kimberly Heck <rikiheck@lyx.org>
Date: Fri, 4 Jan 2019 00:16:48 +0000 (-0500)
Subject: Also pay attention to OutputParams::free_spacing.
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=925d1fa0e5e9558695e821aeb0891d2cdf27694f;p=features.git

Also pay attention to OutputParams::free_spacing.
---

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index d1197e639e..d7ef263c15 100644
--- a/src/Paragraph.cpp
+++ b/src/Paragraph.cpp
@@ -3409,7 +3409,7 @@ docstring Paragraph::simpleLyXHTMLOnePar(Buffer const & buf,
 		} else {
 			char_type c = getUChar(buf.masterBuffer()->params(),
 					       runparams, i);
-			if (c == ' ' && style.free_spacing)
+			if (c == ' ' && (style.free_spacing || runparams.free_spacing))
 				xs << XHTMLStream::ESCAPE_NONE << "&nbsp;";
 			else
 				xs << c;