From: Richard Heck <rgheck@lyx.org>
Date: Sun, 31 Jul 2016 07:18:32 +0000 (-0400)
Subject: Fix output of floats, etc, inside environments.
X-Git-Tag: 2.2.2~84
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ddb7c5884bb2c0282c97f119d77d1f2b98cdbff7;p=features.git

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 ddcfb1df0d..5a06b2f0a3 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 1233831ee8..8d1a40984a 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).