X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Finsets%2Finsetref.C;h=490d5e58090dd593c703c67336cbfda8328fb5d8;hb=357a3741c0655e174ad48ded68cca90b09a158e6;hp=42f57792f0d1e3286297ae71979565a30e9f9e68;hpb=f69a5ed0d7577eba4ff6e206ef6ae86c9d3fe7f7;p=lyx.git

diff --git a/src/insets/insetref.C b/src/insets/insetref.C
index 42f57792f0..490d5e5809 100644
--- a/src/insets/insetref.C
+++ b/src/insets/insetref.C
@@ -5,64 +5,73 @@
  *
  * \author José Matos
  *
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
  */
 #include <config.h>
 
-
 #include "insetref.h"
+
 #include "buffer.h"
+#include "cursor.h"
+#include "BufferView.h"
+#include "dispatchresult.h"
 #include "funcrequest.h"
-#include "debug.h"
 #include "gettext.h"
 #include "LaTeXFeatures.h"
+
 #include "frontends/LyXView.h"
-#include "frontends/Dialogs.h"
-#include "BufferView.h"
+
 #include "support/lstrings.h"
 
+
+using lyx::support::escape;
+
+using std::string;
 using std::ostream;
 
-InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf, bool)
-	: InsetCommand(p), isLatex(buf.isLatex())
+
+InsetRef::InsetRef(InsetCommandParams const & p, Buffer const & buf)
+	: InsetCommand(p, "ref"), isLatex(buf.isLatex())
 {}
 
 
-InsetRef::~InsetRef()
-{
-	InsetCommandMailer mailer("ref", *this);
-	mailer.hideDialog();
-}
+InsetRef::InsetRef(InsetRef const & ir)
+	: InsetCommand(ir), isLatex(ir.isLatex)
+{}
 
 
-void InsetRef::edit(BufferView * bv, int, int, mouse_button::state button)
+void InsetRef::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
 {
-	// FuncRequestually trigger dialog with button 3 not 1
-	if (button == mouse_button::button3)
-		bv->owner()->dispatch(FuncRequest(LFUN_REF_GOTO, getContents()));
-	else if (button == mouse_button::button1) {
-		InsetCommandMailer mailer("ref", *this);
-		mailer.showDialog(bv);
+	switch (cmd.action) {
+	case LFUN_MOUSE_PRESS:
+		// Eventually trigger dialog with button 3 not 1
+		if (cmd.button() == mouse_button::button3)
+			cur.bv().owner()->dispatch(FuncRequest(LFUN_REF_GOTO, getContents()));
+		else
+			InsetCommandMailer("ref", *this).showDialog(&cur.bv());
+		return;
+
+	case LFUN_MOUSE_RELEASE:
+		return;
+
+	default:
+		return InsetCommand::priv_dispatch(cur, cmd);
 	}
 }
 
 
-void InsetRef::edit(BufferView *, bool)
-{}
-
-
-string const InsetRef::getScreenLabel(Buffer const *) const
+string const InsetRef::getScreenLabel(Buffer const &) const
 {
 	string temp;
-	for (int i = 0; !types[i].latex_name.empty(); ++ i)
+	for (int i = 0; !types[i].latex_name.empty(); ++i) {
 		if (getCmdName() == types[i].latex_name) {
 			temp = _(types[i].short_gui_name);
 			break;
 		}
+	}
 	temp += getContents();
 
-	if (!isLatex
-	   && !getOptions().empty()) {
+	if (!isLatex && !getOptions().empty()) {
 		temp += "||";
 		temp += getOptions();
 	}
@@ -70,8 +79,8 @@ string const InsetRef::getScreenLabel(Buffer const *) const
 }
 
 
-int InsetRef::latex(Buffer const *, ostream & os,
-		    bool /*fragile*/, bool /*fs*/) const
+int InsetRef::latex(Buffer const &, ostream & os,
+		    OutputParams const &) const
 {
 	if (getOptions().empty())
 		os << escape(getCommand());
@@ -83,14 +92,16 @@ int InsetRef::latex(Buffer const *, ostream & os,
 }
 
 
-int InsetRef::ascii(Buffer const *, ostream & os, int) const
+int InsetRef::plaintext(Buffer const &, ostream & os,
+		    OutputParams const &) const
 {
 	os << '[' << getContents() << ']';
 	return 0;
 }
 
 
-int InsetRef::linuxdoc(Buffer const *, ostream & os) const
+int InsetRef::linuxdoc(Buffer const &, ostream & os,
+		       OutputParams const &) const
 {
 	os << "<ref id=\"" << getContents()
 	   << "\" name=\"" << getOptions() << "\" >";
@@ -98,7 +109,8 @@ int InsetRef::linuxdoc(Buffer const *, ostream & os) const
 }
 
 
-int InsetRef::docbook(Buffer const *, ostream & os, bool) const
+int InsetRef::docbook(Buffer const &, ostream & os,
+		      OutputParams const &) const
 {
 	if (getOptions().empty()) {
 		os << "<xref linkend=\"" << getContents() << "\">";
@@ -117,6 +129,8 @@ void InsetRef::validate(LaTeXFeatures & features) const
 		features.require("varioref");
 	else if (getCmdName() == "prettyref")
 		features.require("prettyref");
+	else if (getCmdName() == "eqref")
+		features.require("amsmath");
 }