From: Richard Heck <rgheck@lyx.org>
Date: Sat, 30 Jul 2016 05:30:37 +0000 (-0400)
Subject: Fix thinko from earlier commit.
X-Git-Tag: 2.2.2~103
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=c760707548aefafbfc8ff1498321acaf6c050717;p=features.git

Fix thinko from earlier commit.

We need to output the deferred material AFTER the paragraph is closed.
---

diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index da199111c9..ddcfb1df0d 100644
--- a/src/output_xhtml.cpp
+++ b/src/output_xhtml.cpp
@@ -875,13 +875,14 @@ ParagraphList::const_iterator makeParagraphs(Buffer const & buf,
 			runparams, text.outerFont(distance(begin, par)),
 			opened, needclose);
 
-		if (!deferred.empty()) {
+        if (needclose) {
+            closeTag(xs, lay);
+            xs << html::CR();
+        }
+
+        if (!deferred.empty()) {
 			xs << XHTMLStream::ESCAPE_NONE << deferred << html::CR();
 		}
-		if (needclose) {
-			closeTag(xs, lay);
-			xs << html::CR();
-		}
 	}
 	return pend;
 }