commit c760707548aefafbfc8ff1498321acaf6c050717
Author: Richard Heck <[email protected]>
Date: Sat Jul 30 01:30:37 2016 -0400
Fix thinko from earlier commit.
We need to output the deferred material AFTER the paragraph is closed.
---
src/output_xhtml.cpp | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/output_xhtml.cpp b/src/output_xhtml.cpp
index da19911..ddcfb1d 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;
}