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 545ab0baee24f6796670443b2e3108989c166cf7..a16437ddace37d2012aee38e35c9083af110a3f2 100644 (file)
--- 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 1ee2757d133419b7ddd7a5b7152b180c74f6e43a..c767807c62ea79181f823b26088e111753d91e9d 100644 (file)
--- 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