Fix math cursor positioning bug

[lyx.git] / src / mathed / ref_inset.C

diff --git a/src/mathed/ref_inset.C b/src/mathed/ref_inset.C
index f748a22476d59575c9a44c69ab7fb26c81c02a38..426ba90187b4ca2358da8bcac6e8200b6ae89b5d 100644 (file)
--- a/src/mathed/ref_inset.C
+++ b/src/mathed/ref_inset.C
@@ -1,17 +1,37 @@
+/**
+ * \file ref_inset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #include <config.h>
 
 #include "ref_inset.h"
-#include "math_cursor.h"
-#include "commandtags.h"
-#include "formulabase.h"
+
 #include "BufferView.h"
-#include "frontends/LyXView.h"
-#include "frontends/Painter.h"
-#include "frontends/Dialogs.h"
-#include "lyxfunc.h"
-#include "gettext.h"
 #include "LaTeXFeatures.h"
+#include "buffer.h"
+#include "cursor.h"
 #include "debug.h"
+#include "funcrequest.h"
+#include "gettext.h"
+#include "math_data.h"
+#include "math_factory.h"
+#include "math_support.h"
+#include "outputparams.h"
+#include "sgml.h"
+
+#include "frontends/LyXView.h"
+#include "frontends/Dialogs.h"
+
+using std::string;
+using std::auto_ptr;
+using std::endl;
+
 
 
 RefInset::RefInset()
@@ -24,9 +44,9 @@ RefInset::RefInset(string const & data)
 {}
 
 
-MathInset * RefInset::clone() const
+auto_ptr<InsetBase> RefInset::doClone() const
 {
-       return new RefInset(*this);
+       return auto_ptr<InsetBase>(new RefInset(*this));
 }
 
 
@@ -36,36 +56,52 @@ void RefInset::infoize(std::ostream & os) const
 }
 
 
-int RefInset::dispatch(string const & cmd, idx_type, pos_type)
+void RefInset::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
-       if (cmd == "mouse-3-release") {
-               lyxerr << "trying to goto ref" << cell(0) << "\n";
-               mathcursor->formula()->view()->owner()->getLyXFunc()->
-                       dispatch(LFUN_REF_GOTO, asString(cell(0)));
-               return 1; // dispatched
-       }
+       switch (cmd.action) {
+       case LFUN_INSET_MODIFY:
+               if (cmd.getArg(0) == "ref") {
+                       MathArray ar;
+                       if (createMathInset_fromDialogStr(cmd.argument, ar)) {
+                               *this = *ar[0].nucleus()->asRefInset();
+                               break;
+                       }
+               }
+               cur.undispatched();
+               break;
 
-       if (cmd == "mouse-1-release") {
-               lyxerr << "trying to open ref" << cell(0) << "\n";
-               // Eventually trigger dialog with button 3 not 1
-//             mathcursor->formula()->view()->owner()->getDialogs()
-//                     ->showRef(this);
-               return 1; // dispatched
-       }
+       case LFUN_MOUSE_RELEASE:
+               if (cmd.button() == mouse_button::button3) {
+                       lyxerr << "trying to goto ref '" << asString(cell(0)) << "'" << endl;
+                       cur.bv().dispatch(FuncRequest(LFUN_REF_GOTO, asString(cell(0))));
+                       break;
+               }
+               if (cmd.button() == mouse_button::button1) {
+                       // Eventually trigger dialog with button 3, not 1
+                       string const data = createDialogStr("ref");
+                       cur.bv().owner()->getDialogs().show("ref", data, this);
+                       break;
+               }
+               cur.undispatched();
+               break;
 
-       // eat other mouse commands
-       if (cmd.substr(0, 6) == "mouse-")       
-               return 1;
+       case LFUN_MOUSE_PRESS:
+       case LFUN_MOUSE_MOTION:
+               // eat other mouse commands
+               break;
 
-       return 0; // undispatched
+       default:
+               CommandInset::doDispatch(cur, cmd);
+               break;
+       }
 }
 
 
-string RefInset::screenLabel() const
+string const RefInset::screenLabel() const
 {
        string str;
        for (int i = 0; !types[i].latex_name.empty(); ++i)
-               if (name_ == types[i].latex_name) {
+               if (commandname() == types[i].latex_name) {
                        str = _(types[i].short_gui_name);
                        break;
                }
@@ -81,34 +117,38 @@ string RefInset::screenLabel() const
 
 void RefInset::validate(LaTeXFeatures & features) const
 {
-       if (name_ == "vref" || name_ == "vpageref")
+       if (commandname() == "vref" || commandname() == "vpageref")
                features.require("varioref");
-       else if (name_ == "prettyref")
+       else if (commandname() == "prettyref")
                features.require("prettyref");
 }
 
 
-int RefInset::ascii(std::ostream & os, int) const
+int RefInset::plaintext(std::ostream & os, OutputParams const &) const
 {
-       os << "[" << asString(cell(0)) << "]";
+       os << '[' << asString(cell(0)) << ']';
        return 0;
 }
 
 
-int RefInset::linuxdoc(std::ostream & os) const
+int RefInset::linuxdoc(std::ostream & os, OutputParams const &) const
 {
        os << "<ref id=\"" << asString(cell(0))
-          << "\" name=\"" << asString(cell(1)) << "\" >";
+          << "\" name=\"" << asString(cell(1)) << "\">";
        return 0;
 }
 
 
-int RefInset::docbook(std::ostream & os, bool) const
+int RefInset::docbook(Buffer const & buf, std::ostream & os, OutputParams const & runparams) const
 {
        if (cell(1).empty()) {
-               os << "<xref linkend=\"" << asString(cell(0)) << "\">";
+               os << "<xref linkend=\"" << sgml::cleanID(buf, runparams, asString(cell(0)));
+               if (runparams.flavor == OutputParams::XML)
+                       os << "\"/>";
+               else
+                       os << "\">";
        } else {
-               os << "<link linkend=\"" << asString(cell(0))
+               os << "<link linkend=\"" << sgml::cleanID(buf, runparams, asString(cell(0)))
                   << "\">" << asString(cell(1)) << "</link>";
        }
 
@@ -116,11 +156,14 @@ int RefInset::docbook(std::ostream & os, bool) const
 }
 
 
-RefInset::type_info RefInset::types[] = {
-       { "ref",        N_("Standard"),                 N_("Ref: ")},
-       { "pageref",    N_("Page Number"),              N_("Page: ")},
-       { "vpageref",   N_("Textual Page Number"),      N_("TextPage: ")},
-       { "vref",       N_("Standard+Textual Page"),    N_("Ref+Text: ")},
-       { "prettyref",  N_("PrettyRef"),                N_("PrettyRef: ")},
+
+
+RefInset::ref_type_info RefInset::types[] = {
+       { "ref",       N_("Standard"),              N_("Ref: ")},
+       { "eqref",     N_("Equation"),              N_("EqRef: ")},
+       { "pageref",   N_("Page Number"),           N_("Page: ")},
+       { "vpageref",  N_("Textual Page Number"),   N_("TextPage: ")},
+       { "vref",      N_("Standard+Textual Page"), N_("Ref+Text: ")},
+       { "prettyref", N_("PrettyRef"),             N_("PrettyRef: ")},
        { "", "", "" }
 };