X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathRef.cpp;h=ef08cbcd3d0610d95c8b9446e85b5959261822fe;hb=cdc847fd304019a19425a0d5d9d42a556a937097;hp=7aef781c47b88363f6d59a6e25058d8d831e8531;hpb=d5fc2425a9bae6482ef36a770eb404297b29433a;p=lyx.git

diff --git a/src/mathed/InsetMathRef.cpp b/src/mathed/InsetMathRef.cpp
index 7aef781c47..ef08cbcd3d 100644
--- a/src/mathed/InsetMathRef.cpp
+++ b/src/mathed/InsetMathRef.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -13,35 +13,37 @@
 #include "InsetMathRef.h"
 
 #include "BufferView.h"
-#include "LaTeXFeatures.h"
 #include "Buffer.h"
 #include "Cursor.h"
-#include "debug.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
+#include "LaTeXFeatures.h"
+#include "LyX.h"
 #include "MathData.h"
 #include "MathFactory.h"
 #include "MathSupport.h"
 #include "OutputParams.h"
+#include "ParIterator.h"
 #include "sgml.h"
 
 #include "insets/InsetCommand.h"
 
+#include "support/debug.h"
+#include "support/gettext.h"
 
-namespace lyx {
+#include <ostream>
 
-using std::string;
-using std::endl;
+using namespace std;
 
+namespace lyx {
 
-InsetMathRef::InsetMathRef()
-	: CommandInset(from_ascii("ref"))
+InsetMathRef::InsetMathRef(Buffer * buf)
+	: CommandInset(buf, from_ascii("ref"), false)
 {}
 
 
-InsetMathRef::InsetMathRef(docstring const & data)
-	: CommandInset(data)
+InsetMathRef::InsetMathRef(Buffer * buf, docstring const & data)
+	: CommandInset(buf, data, false)
 {}
 
 
@@ -59,11 +61,12 @@ void InsetMathRef::infoize(odocstream & os) const
 
 void InsetMathRef::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	case LFUN_INSET_MODIFY:
 		if (cmd.getArg(0) == "ref") {
 			MathData ar;
 			if (createInsetMath_fromDialogStr(cmd.argument(), ar)) {
+				cur.recordUndo();
 				*this = *ar[0].nucleus()->asRefInset();
 				break;
 			}
@@ -72,20 +75,21 @@ void InsetMathRef::doDispatch(Cursor & cur, FuncRequest & cmd)
 		break;
 
 	case LFUN_INSET_DIALOG_UPDATE: {
-		string const data = createDialogStr("ref");
+		string const data = createDialogStr();
 		cur.bv().updateDialog("ref", data);
 		break;
 	}
 
 	case LFUN_MOUSE_RELEASE:
 		if (cmd.button() == mouse_button::button3) {
-			lyxerr << "trying to goto ref '" << to_utf8(asString(cell(0))) << "'" << endl;
-			cur.bv().dispatch(FuncRequest(LFUN_LABEL_GOTO, asString(cell(0))));
+			LYXERR0("trying to goto ref '" << to_utf8(asString(cell(0))) << "'");
+			//FIXME: use DispatchResult argument
+			lyx::dispatch(FuncRequest(LFUN_LABEL_GOTO, asString(cell(0))));
 			break;
 		}
 		if (cmd.button() == mouse_button::button1) {
 			// Eventually trigger dialog with button 3, not 1
-			string const data = createDialogStr("ref");
+			string const data = createDialogStr();
 			cur.bv().showDialog("ref", data, this);
 			break;
 		}
@@ -107,14 +111,14 @@ void InsetMathRef::doDispatch(Cursor & cur, FuncRequest & cmd)
 bool InsetMathRef::getStatus(Cursor & cur, FuncRequest const & cmd,
 			 FuncStatus & status) const
 {
-	switch (cmd.action) {
+	switch (cmd.action()) {
 	// we handle these
 	case LFUN_INSET_MODIFY:
 	case LFUN_INSET_DIALOG_UPDATE:
 	case LFUN_MOUSE_RELEASE:
 	case LFUN_MOUSE_PRESS:
 	case LFUN_MOUSE_MOTION:
-		status.enabled(true);
+		status.setEnabled(true);
 		return true;
 	default:
 		return CommandInset::getStatus(cur, cmd, status);
@@ -147,22 +151,23 @@ void InsetMathRef::validate(LaTeXFeatures & features) const
 		features.require("varioref");
 	else if (commandname() == "prettyref")
 		features.require("prettyref");
+	else if (commandname() == "eqref")
+		features.require("amsmath");
 }
 
 
-int InsetMathRef::docbook(Buffer const & buf, odocstream & os,
-		      OutputParams const & runparams) const
+int InsetMathRef::docbook(odocstream & os, OutputParams const & runparams) const
 {
 	if (cell(1).empty()) {
 		os << "<xref linkend=\""
-		   << sgml::cleanID(buf, runparams, asString(cell(0)));
+		   << sgml::cleanID(buffer(), runparams, asString(cell(0)));
 		if (runparams.flavor == OutputParams::XML)
 			os << "\"/>";
 		else
 			os << "\">";
 	} else {
 		os << "<link linkend=\""
-		   << sgml::cleanID(buf, runparams, asString(cell(0)))
+		   << sgml::cleanID(buffer(), runparams, asString(cell(0)))
 		   << "\">"
 		   << asString(cell(1))
 		   << "</link>";
@@ -172,18 +177,52 @@ int InsetMathRef::docbook(Buffer const & buf, odocstream & os,
 }
 
 
-string const InsetMathRef::createDialogStr(string const & name) const
+void InsetMathRef::updateBuffer(ParIterator const & it, UpdateType /*utype*/)
+{
+	if (!buffer_) {
+		LYXERR0("InsetMathRef::updateBuffer: no buffer_!");
+		return;
+	}
+	// register this inset into the buffer reference cache.
+	buffer().addReference(getTarget(), this, it);
+}
+
+
+string const InsetMathRef::createDialogStr() const
 {
 	InsetCommandParams icp(REF_CODE, to_ascii(commandname()));
 	icp["reference"] = asString(cell(0));
 	if (!cell(1).empty())
 		icp["name"] = asString(cell(1));
-	return InsetCommandMailer::params2string(name, icp);
+	return InsetCommand::params2string(icp);
+}
+
+
+docstring const InsetMathRef::getTarget() const
+{
+	return asString(cell(0));
+}
+
+
+void InsetMathRef::changeTarget(docstring const & target)
+{
+	InsetCommandParams icp(REF_CODE, to_ascii(commandname()));
+	icp["reference"] = target;
+	if (!cell(1).empty())
+		icp["name"] = asString(cell(1));
+	MathData ar;
+	Buffer & buf = buffer();
+	if (createInsetMath_fromDialogStr(
+	    from_utf8(InsetCommand::params2string(icp)), ar)) {
+		*this = *ar[0].nucleus()->asRefInset();
+		// FIXME audit setBuffer calls
+		setBuffer(buf);
+	}
 }
 
 
 InsetMathRef::ref_type_info InsetMathRef::types[] = {
-	{ from_ascii("ref"),       from_ascii(N_("Standard[[mathref]]")),              from_ascii(N_("Ref: "))},
+	{ from_ascii("ref"),       from_ascii(N_("Standard[[mathref]]")),   from_ascii(N_("Ref: "))},
 	{ from_ascii("eqref"),     from_ascii(N_("Equation")),              from_ascii(N_("EqRef: "))},
 	{ from_ascii("pageref"),   from_ascii(N_("Page Number")),           from_ascii(N_("Page: "))},
 	{ from_ascii("vpageref"),  from_ascii(N_("Textual Page Number")),   from_ascii(N_("TextPage: "))},