X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCommand.cpp;h=3cc8f703c7b29d36f1b033f0f768bb8b626f4517;hb=d044d6afa7192b2119784e1415e71dad644bc335;hp=05fe55deb43d6b9fa6d132f794168aa24ad6647b;hpb=1ef605f6254ef3f3b8cec5440a2e67e6f23a707b;p=lyx.git

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index 05fe55deb4..3cc8f703c7 100644
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -80,7 +80,7 @@ InsetCommand::~InsetCommand()
 
 void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	button_.update(screenLabel(), editable() || hasSettings());
+	button_.update(screenLabel(), editable() || clickable(0, 0));
 	button_.metrics(mi, dim);
 }
 
@@ -119,15 +119,15 @@ void InsetCommand::setParams(InsetCommandParams const & p)
 }
 
 
-int InsetCommand::latex(otexstream & os, OutputParams const & runparams_in) const
+void InsetCommand::latex(otexstream & os, OutputParams const & runparams_in) const
 {
 	OutputParams runparams = runparams_in;
 	os << getCommand(runparams);
-	return 0;
 }
 
 
-int InsetCommand::plaintext(odocstream & os, OutputParams const &) const
+int InsetCommand::plaintext(odocstringstream & os,
+        OutputParams const &, size_t) const
 {
 	docstring const str = "[" + buffer().B_("LaTeX Command: ")
 		+ from_utf8(getCmdName()) + "]";
@@ -197,7 +197,7 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
 			string const newtype = cmd.getArg(1);
 			status.setEnabled(p_.isCompatibleCommand(p_.code(), newtype));
 			status.setOnOff(newtype == p_.getCmdName());
-		} 
+		}
 		status.setEnabled(true);
 		return true;
 	
@@ -211,9 +211,9 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-docstring InsetCommand::contextMenuName() const
+string InsetCommand::contextMenuName() const
 {
-	return from_ascii("context-") + from_ascii(insetName(p_.code()));
+	return "context-" + insetName(p_.code());
 }
 
 
@@ -333,6 +333,11 @@ bool decodeInsetParam(string const & name, string & data,
 		data = InsetGraphics::params2string(p, buffer);
 		break;
 	}
+	case MATH_SPACE_CODE: {
+	    InsetSpaceParams p(true);
+		data = InsetSpace::params2string(p);
+		break;
+	}
 	case NOTE_CODE: {
 		InsetNoteParams p;
 		data = InsetNote::params2string(p);