Fix output of floats, etc, inside environments.

Fixes bug #9094.

(cherry picked from commit 98feadd61eb80ec330cd1884f2321952313ea4b1)

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index ddcfb1df0d27a90dbbe0b44ce585b3ee057c8456..5a06b2f0a3b8c18fad06a4b28275c2730d1d5015 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -1008,8 +1008,9 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
                                if (labelfirst)
                                        openItemTag(xs, style, par->params());
 
-                               par->simpleLyXHTMLOnePar(buf, xs, runparams,
+                               docstring deferred = par->simpleLyXHTMLOnePar(buf, xs, runparams,
                                        text.outerFont(distance(begin, par)), true, true, sep);
+                               xs << XHTMLStream::ESCAPE_NONE << deferred;
                                ++par;
 
                                // We may not want to close the tag yet, in particular:

diff --git a/status.22x b/status.22x
index 1233831ee89301bcb8bc19e2ece2935ea8fdc779..8d1a40984a53ab383e9835718a9d70a0f551576d 100644 (file)
--- a/status.22x
+++ b/status.22x
@@ -95,6 +95,8 @@ What's new
 
 - Fix display of listings (bug 8362).
 
+- Fix output of floats, etc, inside environments (bug 9094).
+
 - Add "dir='auto'" to body tag, which should help a lot with export of
   RTL languages (bug 8279, partly).