From: Richard Heck <rgheck@lyx.org>
Date: Thu, 30 Jun 2016 01:57:35 +0000 (-0400)
Subject: Don't be so cute with VSpace: We just output it inline now for
X-Git-Tag: 2.2.1~79
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=98ba7cf49d0ab361c546ddf9b8ced259219f124a;p=features.git

Don't be so cute with VSpace: We just output it inline now for
XHTML.

Fixes bug #8154.

(cherry picked from commit 8ea3d1f130513eaf54e6a9ad49619059cd0052b9)
---

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index f621172fe2..7edbebf3b4 100644
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -232,14 +232,12 @@ int InsetVSpace::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-docstring InsetVSpace::xhtml(XHTMLStream &, OutputParams const &) const
+docstring InsetVSpace::xhtml(XHTMLStream & os, OutputParams const &) const
 {
-	odocstringstream ods;
-	XHTMLStream xds(ods);
 	string const len = space_.asHTMLLength();
 	string const attr = "style='height:" + (len.empty() ? "1em" : len) + "'";
-	xds << html::StartTag("div", attr, true) << html::EndTag("div");
-	return ods.str();
+	os << html::StartTag("div", attr, true) << html::EndTag("div");
+	return docstring();
 }
 
 
diff --git a/status.22x b/status.22x
index a5d56b5303..3bb7c3c996 100644
--- a/status.22x
+++ b/status.22x
@@ -169,6 +169,8 @@ What's new
 
 - Fix output of math sizes (bug 10129).
 
+- Fix output of vertical space in the middle of a paragraph (bug 8154).
+
 
 * TEX2LYX