some (yet unfinished) up/down work

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

diff --git a/src/mathed/ref_inset.C b/src/mathed/ref_inset.C
index 6350669d5e61fc88724ea50ad1c29d1eef79bcd8..47734214dafbf1e52238f8544d7aee0fe763d571 100644 (file)
--- a/src/mathed/ref_inset.C
+++ b/src/mathed/ref_inset.C
@@ -11,16 +11,19 @@
 #include <config.h>
 
 #include "ref_inset.h"
-#include "math_data.h"
-#include "math_factory.h"
 
 #include "BufferView.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"
@@ -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,44 +56,43 @@ void RefInset::infoize(std::ostream & os) const
 }
 
 
-void RefInset::priv_dispatch(LCursor & cur, FuncRequest const & cmd)
+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)) {
-                               *this = *ar[0].nucleus()->asRefInset(); 
-                               return;
+                               *this = *ar[0].nucleus()->asRefInset();
+                               break;
                        }
                }
-               cur.notdispatched();
-               return;
+               cur.undispatched();
+               break;
 
        case LFUN_MOUSE_RELEASE:
                if (cmd.button() == mouse_button::button3) {
-                       lyxerr << "trying to goto ref" << cell(0) << endl;
-                       cur.bv().dispatch(FuncRequest(LFUN_REF_GOTO, asString(cell(0))));
-                       return;
+                       lyxerr << "trying to goto ref '" << asString(cell(0)) << "'" << endl;
+                       cur.bv().dispatch(FuncRequest(LFUN_LABEL_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");
                        cur.bv().owner()->getDialogs().show("ref", data, this);
-                       return;
+                       break;
                }
-               cur.notdispatched();
-               return;
+               cur.undispatched();
+               break;
 
        case LFUN_MOUSE_PRESS:
        case LFUN_MOUSE_MOTION:
                // eat other mouse commands
-               return;
+               break;
 
        default:
-               CommandInset::priv_dispatch(cur, cmd);
-               return;
+               CommandInset::doDispatch(cur, cmd);
+               break;
        }
 }
 
@@ -132,17 +134,21 @@ int RefInset::plaintext(std::ostream & os, OutputParams 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, OutputParams 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>";
        }
 
@@ -150,8 +156,6 @@ int RefInset::docbook(std::ostream & os, OutputParams const &) const
 }
 
 
-
-
 RefInset::ref_type_info RefInset::types[] = {
        { "ref",       N_("Standard"),              N_("Ref: ")},
        { "eqref",     N_("Equation"),              N_("EqRef: ")},
@@ -161,3 +165,4 @@ RefInset::ref_type_info RefInset::types[] = {
        { "prettyref", N_("PrettyRef"),             N_("PrettyRef: ")},
        { "", "", "" }
 };
+