X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetVSpace.cpp;h=f621172fe2b5ba28475212002d26c7250fbdf6c7;hb=e30db1e44474ee379bedb0d1c752297541156497;hp=b352fec43b26f22c5396ed8c94548c4d7e42d6be;hpb=fb25ff1819413f7997138aa4a356e2746ed7a66f;p=lyx.git

diff --git a/src/insets/InsetVSpace.cpp b/src/insets/InsetVSpace.cpp
index b352fec43b..f621172fe2 100644
--- a/src/insets/InsetVSpace.cpp
+++ b/src/insets/InsetVSpace.cpp
@@ -4,7 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author various
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -14,17 +14,24 @@
 #include "InsetVSpace.h"
 
 #include "Buffer.h"
+#include "BufferView.h"
 #include "Cursor.h"
 #include "Dimension.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "support/gettext.h"
 #include "Lexer.h"
-#include "Text.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"
+
+#include "frontends/Application.h"
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
 
@@ -42,30 +49,25 @@ int const ADD_TO_VSPACE_WIDTH = 5;
 
 
 InsetVSpace::InsetVSpace(VSpace const & space)
-	: space_(space)
+	: Inset(0), space_(space)
 {}
 
 
-InsetVSpace::~InsetVSpace()
-{
-	InsetVSpaceMailer(*this).hideDialog();
-}
-
-
 void InsetVSpace::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 
 	case LFUN_INSET_MODIFY: {
-		InsetVSpaceMailer::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;
 	}
 
-	case LFUN_MOUSE_RELEASE:
-		if (!cur.selection() && cmd.button() == mouse_button::button1)
-			InsetVSpaceMailer(*this).showDialog(&cur.bv());
-		break;
-
 	default:
 		Inset::doDispatch(cur, cmd);
 		break;
@@ -76,41 +78,36 @@ 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;
-			InsetVSpaceMailer::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_);
-		} else
-			status.enabled(true);
+		} 
+		status.setEnabled(true);
 		return true;
+	
 	default:
 		return Inset::getStatus(cur, cmd, status);
 	}
 }
 
 
-void InsetVSpace::edit(Cursor & cur, bool, EntryDirection)
-{
-	InsetVSpaceMailer(*this).showDialog(&cur.bv());
-}
-
-
 void InsetVSpace::read(Lexer & lex)
 {
-	BOOST_ASSERT(lex.isOK());
+	LASSERT(lex.isOK(), return);
 	string vsp;
 	lex >> vsp;
 	if (lex)
 		space_ = VSpace(vsp);
-
-	string end_token;
-	lex >> end_token;
-	if (end_token != "\\end_inset")
-		lex.printError("Missing \\end_inset at this point. "
-			       "Read: `$$Token'");
+	lex >> "\\end_inset";
 }
 
 
@@ -128,13 +125,13 @@ docstring const InsetVSpace::label() const
 
 
 namespace {
-int const arrow_size = 4;
+int const vspace_arrow_size = 4;
 }
 
 
 void InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	int height = 3 * arrow_size;
+	int height = 3 * vspace_arrow_size;
 	if (space_.length().len().value() >= 0.0)
 		height = max(height, space_.inPixels(*mi.base.bv));
 
@@ -151,7 +148,7 @@ void InsetVSpace::metrics(MetricsInfo & mi, Dimension & dim) const
 
 	dim.asc = height / 2 + (a - d) / 2; // align cursor with the
 	dim.des = height - dim.asc;         // label text
-	dim.wid = ADD_TO_VSPACE_WIDTH + 2 * arrow_size + 5 + w;
+	dim.wid = ADD_TO_VSPACE_WIDTH + 2 * vspace_arrow_size + 5 + w;
 	// Cache the inset dimension. 
 	setDimCache(mi, dim);
 }
@@ -176,14 +173,14 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
 		// adding or removing space
 		bool const added = space_.kind() != VSpace::LENGTH ||
 				   space_.length().len().value() >= 0.0;
-		ty1 = added ? (start + arrow_size) : start;
-		ty2 = added ? start : (start + arrow_size);
-		by1 = added ? (end - arrow_size) : end;
-		by2 = added ? end : (end - arrow_size);
+		ty1 = added ? (start + vspace_arrow_size) : start;
+		ty2 = added ? start : (start + vspace_arrow_size);
+		by1 = added ? (end - vspace_arrow_size) : end;
+		by2 = added ? end : (end - vspace_arrow_size);
 	}
 
-	int const midx = x + arrow_size;
-	int const rightx = midx + arrow_size;
+	int const midx = x + vspace_arrow_size;
+	int const rightx = midx + vspace_arrow_size;
 
 	// first the string
 	int w = 0;
@@ -197,7 +194,7 @@ void InsetVSpace::draw(PainterInfo & pi, int x, int y) const
 	docstring const lab = label();
 	theFontMetrics(font).rectText(lab, w, a, d);
 
-	pi.pain.rectText(x + 2 * arrow_size + 5,
+	pi.pain.rectText(x + 2 * vspace_arrow_size + 5,
 			 start + (end - start) / 2 + (a - d) / 2,
 			 lab, font, Color_none, Color_none);
 
@@ -214,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;
@@ -235,52 +232,41 @@ int InsetVSpace::docbook(odocstream & os, OutputParams const &) const
 }
 
 
-docstring InsetVSpace::contextMenu(BufferView const &, int, int) const
+docstring InsetVSpace::xhtml(XHTMLStream &, OutputParams const &) const
 {
-	return from_ascii("context-vspace");
+	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();
 }
 
 
-string const InsetVSpaceMailer::name_ = "vspace";
-
-
-InsetVSpaceMailer::InsetVSpaceMailer(InsetVSpace & inset)
-	: inset_(inset)
-{}
-
-
-string const InsetVSpaceMailer::inset2string(Buffer const &) const
+string InsetVSpace::contextMenuName() const
 {
-	return params2string(inset_.space());
+	return "context-vspace";
 }
 
 
-void InsetVSpaceMailer::string2params(string const & in, VSpace & vspace)
+void InsetVSpace::string2params(string const & in, VSpace & vspace)
 {
 	vspace = VSpace();
 	if (in.empty())
 		return;
 
 	istringstream data(in);
-	Lexer lex(0,0);
+	Lexer lex;
 	lex.setStream(data);
-
-	string name;
-	lex >> name;
-	if (!lex || name != name_)
-		return print_mailer_error("InsetVSpaceMailer", in, 1, name_);
-
-	string vsp;
-	lex >> vsp;
-	if (lex)
-		vspace = VSpace(vsp);
+	lex.setContext("InsetVSpace::string2params");
+	lex >> "vspace" >> vspace;
 }
 
 
-string const InsetVSpaceMailer::params2string(VSpace const & vspace)
+string InsetVSpace::params2string(VSpace const & vspace)
 {
 	ostringstream data;
-	data << name_ << ' ' << vspace.asLyXCommand();
+	data << "vspace" << ' ' << vspace.asLyXCommand();
 	return data.str();
 }