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 89319115a72c6b06e4d069683ff3bca854ca91af..426ba90187b4ca2358da8bcac6e8200b6ae89b5d 100644 (file)
--- a/src/mathed/ref_inset.C
+++ b/src/mathed/ref_inset.C
@@ -11,26 +11,29 @@
 #include <config.h>
 
 #include "ref_inset.h"
-#include "math_data.h"
-#include "math_factory.h"
 
 #include "BufferView.h"
-#include "dispatchresult.h"
+#include "LaTeXFeatures.h"
+#include "buffer.h"
+#include "cursor.h"
 #include "debug.h"
 #include "funcrequest.h"
-#include "math_support.h"
 #include "gettext.h"
-#include "LaTeXFeatures.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()
        : CommandInset("ref")
 {}
@@ -41,7 +44,7 @@ RefInset::RefInset(string const & data)
 {}
 
 
-auto_ptr<InsetBase> RefInset::clone() const
+auto_ptr<InsetBase> RefInset::doClone() const
 {
        return auto_ptr<InsetBase>(new RefInset(*this));
 }
@@ -53,46 +56,44 @@ void RefInset::infoize(std::ostream & os) const
 }
 
 
-DispatchResult
-RefInset::priv_dispatch(FuncRequest const & cmd,
-                       idx_type & idx, pos_type & pos)
+void RefInset::doDispatch(LCursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
        case LFUN_INSET_MODIFY:
                if (cmd.getArg(0) == "ref") {
                        MathArray ar;
-                       if (!createMathInset_fromDialogStr(cmd.argument, ar))
-                               return DispatchResult(false);
-
-                       *this = *ar[0].nucleus()->asRefInset();
-
-                       return DispatchResult(true);
+                       if (createMathInset_fromDialogStr(cmd.argument, ar)) {
+                               *this = *ar[0].nucleus()->asRefInset();
+                               break;
+                       }
                }
+               cur.undispatched();
                break;
+
        case LFUN_MOUSE_RELEASE:
                if (cmd.button() == mouse_button::button3) {
-                       lyxerr << "trying to goto ref" << cell(0) << endl;
-                       cmd.view()->dispatch(FuncRequest(LFUN_REF_GOTO, asString(cell(0))));
-                       return DispatchResult(true);
+                       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
+                       // Eventually trigger dialog with button 3, not 1
                        string const data = createDialogStr("ref");
-                       cmd.view()->owner()->getDialogs().
-                               show("ref", data, this);
-                       return DispatchResult(true);
+                       cur.bv().owner()->getDialogs().show("ref", data, this);
+                       break;
                }
+               cur.undispatched();
                break;
+
        case LFUN_MOUSE_PRESS:
        case LFUN_MOUSE_MOTION:
                // eat other mouse commands
-               return DispatchResult(true);
+               break;
+
        default:
-               return CommandInset::priv_dispatch(cmd, idx, pos);
+               CommandInset::doDispatch(cur, cmd);
+               break;
        }
-       // not our business
-       return DispatchResult(false);
 }
 
 
@@ -123,27 +124,31 @@ void RefInset::validate(LaTeXFeatures & features) const
 }
 
 
-int RefInset::ascii(std::ostream & os, LatexRunParams const &) const
+int RefInset::plaintext(std::ostream & os, OutputParams const &) const
 {
        os << '[' << asString(cell(0)) << ']';
        return 0;
 }
 
 
-int RefInset::linuxdoc(std::ostream & os, LatexRunParams const &) 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, LatexRunParams const &) 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>";
        }