Fix output of floats, etc, inside environments.

[lyx.git] / src / output_xhtml.cpp

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index 585ee2cb34e5c5b7d387275b6fee9b56bae73709..e87fe23750232b3aaa7223a3c67064329d17ba73 100644 (file)
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -878,13 +878,14 @@ ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
                        runparams, text.outerFont(distance(begin, par)),
                        open_par, close_par);
 
-               if (!deferred.empty()) {
-                       xs << XHTMLStream::ESCAPE_NONE << deferred << html::CR();
-               }
                if (close_par) {
                        closeTag(xs, lay);
                        xs << html::CR();
                }
+
+               if (!deferred.empty()) {
+                       xs << XHTMLStream::ESCAPE_NONE << deferred << html::CR();
+               }
        }
        return pend;
 }
@@ -1010,8 +1011,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: