X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCommand.cpp;h=dbbaed1253ed2f0cd6754bf49ce7c5b61bb60dc1;hb=dc8c4f3eab6e01f3767de765423fda5e4d6c5124;hp=08a932d2770197535f56d557cd5b061bee927f61;hpb=222b3580d21a8ce2d8c499db4de885e9b8a94d88;p=lyx.git

diff --git a/src/insets/InsetCommand.cpp b/src/insets/InsetCommand.cpp
index 08a932d277..dbbaed1253 100644
--- a/src/insets/InsetCommand.cpp
+++ b/src/insets/InsetCommand.cpp
@@ -29,6 +29,7 @@
 #include "insets/InsetExternal.h"
 #include "insets/InsetFloat.h"
 #include "insets/InsetGraphics.h"
+#include "insets/InsetIndex.h"
 #include "insets/InsetLine.h"
 #include "insets/InsetListings.h"
 #include "insets/InsetNote.h"
@@ -50,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)
@@ -64,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)
@@ -79,7 +94,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);
 }
 
@@ -99,13 +114,13 @@ void InsetCommand::draw(PainterInfo & pi, int x, int y) const
 }
 
 
-void InsetCommand::setParam(std::string const & name, docstring const & value)
+void InsetCommand::setParam(string const & name, docstring const & value)
 {
 	p_[name] = value;
 }
 
 
-docstring const & InsetCommand::getParam(std::string const & name) const
+docstring const & InsetCommand::getParam(string const & name) const
 {
 	return p_[name];
 }
@@ -118,15 +133,15 @@ void InsetCommand::setParams(InsetCommandParams const & p)
 }
 
 
-int InsetCommand::latex(odocstream & 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()) + "]";
@@ -146,7 +161,9 @@ void InsetCommand::doDispatch(Cursor & cur, FuncRequest & cmd)
 	switch (cmd.action()) {
 	case LFUN_INSET_MODIFY: {
 		if (cmd.getArg(0) == "changetype") {
+			cur.recordUndo();
 			p_.setCmdName(cmd.getArg(1));
+			cur.forceBufferUpdate();
 			initView();
 			break;
 		}
@@ -154,8 +171,10 @@ void InsetCommand::doDispatch(Cursor & cur, FuncRequest & cmd)
 		InsetCommand::string2params(to_utf8(cmd.argument()), p);
 		if (p.getCmdName().empty())
 			cur.noScreenUpdate();
-		else
+		else {
+			cur.recordUndo();
 			setParams(p);
+		}
 		// FIXME We might also want to check here if this one is in the TOC.
 		// But I think most of those are labeled.
 		if (isLabeled())
@@ -185,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::contextMenu(BufferView const &, int, int) const
+string InsetCommand::contextMenuName() const
 {
-	return from_ascii("context-") + from_ascii(insetName(p_.code()));
+	return "context-" + insetName(p_.code());
 }
 
 
@@ -261,7 +280,7 @@ bool decodeInsetParam(string const & name, string & data,
 	switch (code) {
 	case BIBITEM_CODE:
 	case BIBTEX_CODE:
-	case INDEX_CODE:
+	case INDEX_PRINT_CODE:
 	case LABEL_CODE:
 	case LINE_CODE:
 	case NOMENCL_CODE:
@@ -313,6 +332,11 @@ bool decodeInsetParam(string const & name, string & data,
 		data = InsetFloat::params2string(p);
 		break;
 	}
+	case INDEX_CODE: {
+		InsetIndexParams p;
+		data = InsetIndex::params2string(p);
+		break;
+	}
 	case LISTINGS_CODE: {
 		InsetListingsParams p;
 		data = InsetListings::params2string(p);
@@ -323,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);