X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCommand.cpp;h=fcda3cd2b984175a7cf24169adffb322c2a74095;hb=815e6c9f2fefccf698f92fb07f9c6a5ba574f65d;hp=fd86d03989a9047c038479fb177df6469c2fa295;hpb=d866717ef7503a1373dd1cb3925e1ac97b079192;p=lyx.git

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index fd86d03989..fcda3cd2b9 100644
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -51,7 +51,7 @@ using namespace std;
 
 namespace lyx {
 
-// FIXME Would it now be possible to use the InsetCode in 
+// FIXME Would it now be possible to use the InsetCode in
 // place of the mailer name and recover that information?
 InsetCommand::InsetCommand(Buffer * buf, InsetCommandParams const & p)
 	: Inset(buf), p_(p)
@@ -65,6 +65,20 @@ InsetCommand::InsetCommand(InsetCommand const & rhs)
 {}
 
 
+InsetCommand & InsetCommand::operator=(InsetCommand const & rhs)
+{
+	if (&rhs == this)
+		return *this;
+
+	Inset::operator=(rhs);
+	p_ = rhs.p_;
+	mouse_hover_.clear();
+	button_ = RenderButton();
+
+	return *this;
+}
+
+
 InsetCommand::~InsetCommand()
 {
 	if (p_.code() != NO_CODE)
@@ -80,7 +94,7 @@ InsetCommand::~InsetCommand()
 
 void InsetCommand::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	button_.update(screenLabel(), editable() || hasSettings());
+	button_.update(screenLabel(), editable() || clickable(*mi.base.bv, 0, 0));
 	button_.metrics(mi, dim);
 }
 
@@ -126,7 +140,8 @@ void InsetCommand::latex(otexstream & os, OutputParams const & runparams_in) con
 }
 
 
-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()) + "]";
@@ -189,30 +204,30 @@ bool InsetCommand::getStatus(Cursor & cur, FuncRequest const & cmd,
 	case LFUN_ERT_INSERT:
 		status.setEnabled(false);
 		return true;
-	
+
 	// we handle these
 	case LFUN_INSET_MODIFY:
 		if (cmd.getArg(0) == "changetype") {
 			string const newtype = cmd.getArg(1);
 			status.setEnabled(p_.isCompatibleCommand(p_.code(), newtype));
 			status.setOnOff(newtype == p_.getCmdName());
-		} 
+		}
 		status.setEnabled(true);
 		return true;
-	
+
 	case LFUN_INSET_DIALOG_UPDATE:
 		status.setEnabled(true);
 		return true;
-	
+
 	default:
 		return Inset::getStatus(cur, cmd, status);
 	}
 }
 
 
-docstring InsetCommand::contextMenuName() const
+string InsetCommand::contextMenuName() const
 {
-	return from_ascii("context-") + from_ascii(insetName(p_.code()));
+	return "context-" + insetName(p_.code());
 }
 
 
@@ -332,6 +347,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);