Restore XHTML output for InsetListings.

[lyx.git] / src / insets / InsetVSpace.cpp

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index 8812024683117640af259200011be8c1b1944a12..b499b0bcc9c6d79f0981e5e01a0f704f85005409 100644 (file)
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -23,9 +23,11 @@
 #include "Lexer.h"
 #include "MetricsInfo.h"
 #include "OutputParams.h"
+#include "output_xhtml.h"
 #include "Text.h"
 
 #include "support/debug.h"
+#include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lassert.h"
 
@@ -47,7 +49,7 @@ int const ADD_TO_VSPACE_WIDTH = 5;
 
 
 InsetVSpace::InsetVSpace(VSpace const & space)
-       : space_(space)
+       : Inset(0), space_(space)
 {}
 
 
@@ -66,12 +68,6 @@ void InsetVSpace::doDispatch(Cursor & cur, FuncRequest & cmd)
                break;
        }
 
-       case LFUN_MOUSE_RELEASE:
-               if (!cur.selection() && cmd.button() == mouse_button::button1)
-                       cur.bv().showDialog("vspace", params2string(space()), 
-                               const_cast<InsetVSpace *>(this));
-               break;
-
        default:
                Inset::doDispatch(cur, cmd);
                break;
@@ -92,16 +88,18 @@ bool InsetVSpace::getStatus(Cursor & cur, FuncRequest const & cmd,
                } 
                status.setEnabled(true);
                return true;
+       
        default:
                return Inset::getStatus(cur, cmd, status);
        }
 }
 
 
-void InsetVSpace::edit(Cursor & cur, bool, EntryDirection)
+bool InsetVSpace::showInsetDialog(BufferView * bv) const
 {
-       cur.bv().showDialog("vspace", params2string(space()), 
+       bv->showDialog("vspace", params2string(space()),
                const_cast<InsetVSpace *>(this));
+       return true;
 }
 
 
@@ -237,6 +235,17 @@ int InsetVSpace::docbook(odocstream & os, OutputParams const &) const
 }
 
 
+docstring InsetVSpace::xhtml(XHTMLStream &, OutputParams const &) const
+{
+       odocstringstream ods;
+       XHTMLStream xds(ods);
+       string const len = space_.asHTMLLength();
+       string const attr = "style='height:" + (len.empty() ? "1em" : len) + "'";
+       xds << StartTag("div", attr, true) << EndTag("div");
+       return ods.str();
+}
+
+
 docstring InsetVSpace::contextMenu(BufferView const &, int, int) const
 {
        return from_ascii("context-vspace");