Also pay attention to OutputParams::free_spacing.

diff --git a/src/Paragraph.cpp b/src/Paragraph.cpp
index d1197e639e360981e31a4d3b03fdb2e976912d35..d7ef263c1531fde2dc45a06d1c8226ea32a3f872 100644 (file)
--- 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;