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 f621172fe2b5ba28475212002d26c7250fbdf6c7..7edbebf3b4e8eaac03b9b11d05f0112bd89589ce 100644 (file)
--- 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 a5d56b5303c3447b0c6db2d2ed5481a34ac17709..3bb7c3c9965bb5f18c7fb45bc807fd929ecb06d4 100644 (file)
--- 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