[LyX/2.2.x] Fix output of floats, etc, inside environments.

[Richard Heck]

commit ddb7c5884bb2c0282c97f119d77d1f2b98cdbff7
Author: Richard Heck <rgh...@lyx.org>
Date:   Sun Jul 31 03:18:32 2016 -0400

    Fix output of floats, etc, inside environments.
    
    Fixes bug #9094.
    
    (cherry picked from commit 98feadd61eb80ec330cd1884f2321952313ea4b1)
---
 src/output_xhtml.cpp |    3 ++-
 status.22x           |    2 ++
 2 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index ddcfb1d..5a06b2f 100644
--- 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 1233831..8d1a409 100644
--- 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).