X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetVSpace.cpp;h=f621172fe2b5ba28475212002d26c7250fbdf6c7;hb=6f88e11da323c7159f80cf79d9f4486d3615e355;hp=b26bda6402ac548fa3a5253f97e2e35f5f0a7573;hpb=819a0172f7ed88d5fb58bd96cb508a7b2c39c21a;p=lyx.git

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index b26bda6402..f621172fe2 100644
--- 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,22 +49,22 @@ int const ADD_TO_VSPACE_WIDTH = 5;
 
 
 InsetVSpace::InsetVSpace(VSpace const & space)
-	: space_(space)
+	: Inset(0), space_(space)
 {}
 
 
-InsetVSpace::~InsetVSpace()
-{
-	hideDialogs("vspace", this);
-}
-
-
 void InsetVSpace::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 
 	case LFUN_INSET_MODIFY: {
-		InsetVSpace::string2params(to_utf8(cmd.argument()), space_);
+		cur.recordUndo();
+		string arg = to_utf8(cmd.argument());
+		if (arg == "vspace custom")
+			arg = (space_.kind() == VSpace::LENGTH)
+				? "vspace " + space_.length().asString()
+				: "vspace 1" + string(stringFromUnit(Length::defaultUnit()));
+		InsetVSpace::string2params(arg, space_);
 		break;
 	}
 
@@ -76,12 +78,17 @@ void InsetVSpace::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetVSpace::getStatus(Cursor & cur, FuncRequest const & cmd,
 	FuncStatus & status) const
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	// we handle these
 	case LFUN_INSET_MODIFY:
 		if (cmd.getArg(0) == "vspace") {
 			VSpace vspace;
-			InsetVSpace::string2params(to_utf8(cmd.argument()), vspace);
+			string arg = to_utf8(cmd.argument());
+			if (arg == "vspace custom")
+				arg = (space_.kind() == VSpace::LENGTH)
+				? "vspace " + space_.length().asString()
+				: "vspace 1" + string(stringFromUnit(Length::defaultUnit()));
+			InsetVSpace::string2params(arg, vspace);
 			status.setOnOff(vspace == space_);
 		} 
 		status.setEnabled(true);
@@ -93,17 +100,9 @@ bool InsetVSpace::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-bool InsetVSpace::showInsetDialog(BufferView * bv) const
-{
-	bv->showDialog("vspace", params2string(space()),
-		const_cast<InsetVSpace *>(this));
-	return true;
-}
-
-
 void InsetVSpace::read(Lexer & lex)
 {
-	LASSERT(lex.isOK(), /**/);
+	LASSERT(lex.isOK(), return);
 	string vsp;
 	lex >> vsp;
 	if (lex)
@@ -212,14 +211,14 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-int InsetVSpace::latex(odocstream & os, OutputParams const &) const
+void InsetVSpace::latex(otexstream & os, OutputParams const &) const
 {
 	os << from_ascii(space_.asLatexCommand(buffer().params())) << '\n';
-	return 1;
 }
 
 
-int InsetVSpace::plaintext(odocstream & os, OutputParams const &) const
+int InsetVSpace::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
 	os << "\n\n";
 	return PLAINTEXT_NEWLINE;
@@ -233,22 +232,20 @@ int InsetVSpace::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-int InsetVSpace::xhtml(odocstream & os, OutputParams const &) const
+docstring InsetVSpace::xhtml(XHTMLStream &, OutputParams const &) const
 {
-	string len = space_.asHTMLLength();
-	if (len.empty()) {
-		// we didn't understand it
-		os << "<br />\n";
-		return 0;
-	}
-	os << "<div style='height:" << from_ascii(len) << "'></div>\n";
-	return 1;
+	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();
 }
 
 
-docstring InsetVSpace::contextMenu(BufferView const &, int, int) const
+string InsetVSpace::contextMenuName() const
 {
-	return from_ascii("context-vspace");
+	return "context-vspace";
 }