* InsetCollapsable:

[lyx.git] / src / insets / InsetRef.cpp

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index 5044365eb493fc5650ea65b7cbc41d1195f4c7e0..5fb240a95dab94312580d9aa168f5c89a15879fe 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -12,7 +12,7 @@
 #include "InsetRef.h"
 
 #include "Buffer.h"
-#include "LCursor.h"
+#include "Cursor.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "gettext.h"
@@ -21,6 +21,7 @@
 #include "OutputParams.h"
 #include "sgml.h"
 
+#include "support/docstream.h"
 #include "support/lstrings.h"
 
 
@@ -42,24 +43,41 @@ InsetRef::InsetRef(InsetRef const & ir)
 {}
 
 
-void InsetRef::doDispatch(LCursor & cur, FuncRequest & cmd)
+bool InsetRef::isCompatibleCommand(std::string const & s) {
+       //FIXME This is likely not the best way to handle this.
+       //But this stuff is hardcoded elsewhere already.
+       return s == "ref" 
+               || s == "pageref"
+               || s == "vref" 
+               || s == "vpageref"
+               || s == "prettyref"
+               || s == "eqref";
+}
+
+
+CommandInfo const * InsetRef::findInfo(std::string const & /* cmdName */)
+{
+       static const char * const paramnames[] = {"name", "reference", ""};
+       static const bool isoptional[] = {true, false};
+       static const CommandInfo info = {2, paramnames, isoptional};
+       return &info;
+}
+
+
+void InsetRef::doDispatch(Cursor & cur, FuncRequest & cmd)
 {
        switch (cmd.action) {
-       case LFUN_MOUSE_PRESS:
+       case LFUN_MOUSE_RELEASE:
                // Eventually trigger dialog with button 3 not 1
                if (cmd.button() == mouse_button::button3)
-                       lyx::dispatch(FuncRequest(LFUN_LABEL_GOTO, getParam("reference")));
-               else {
-                       InsetCommandMailer("ref", *this).showDialog(&cur.bv());
-                       cur.undispatched();
-               }
-               return;
-
-       case LFUN_MOUSE_RELEASE:
-               return;
+                       lyx::dispatch(FuncRequest(LFUN_LABEL_GOTO,
+                                                 getParam("reference")));
+               else
+                       InsetCommand::doDispatch(cur, cmd);
+               break;
 
        default:
-               return InsetCommand::doDispatch(cur, cmd);
+               InsetCommand::doDispatch(cur, cmd);
        }
 }
 
@@ -84,10 +102,11 @@ docstring const InsetRef::getScreenLabel(Buffer const &) const
 
 
 int InsetRef::latex(Buffer const &, odocstream & os,
-                    OutputParams const &) const
+                   OutputParams const &) const
 {
-       // Don't output p_["name"], this is only used in docbook
-       InsetCommandParams p(getCmdName());
+       // We don't want to output p_["name"], since that is only used 
+       // in docbook. So we construct new params, without it, and use that.
+       InsetCommandParams p(REF_CODE, getCmdName());
        p["reference"] = getParam("reference");
        os << escape(p.getCommand());
        return 0;
@@ -95,7 +114,7 @@ int InsetRef::latex(Buffer const &, odocstream & os,
 
 
 int InsetRef::plaintext(Buffer const &, odocstream & os,
-                        OutputParams const &) const
+                       OutputParams const &) const
 {
        docstring const str = getParam("reference");
        os << '[' << str << ']';
@@ -104,23 +123,23 @@ int InsetRef::plaintext(Buffer const &, odocstream & os,
 
 
 int InsetRef::docbook(Buffer const & buf, odocstream & os,
-                      OutputParams const & runparams) const
+                     OutputParams const & runparams) const
 {
        docstring const & name = getParam("name");
        if (name.empty()) {
                if (runparams.flavor == OutputParams::XML) {
-                       os << "<xref linkend=\"" 
-                          << sgml::cleanID(buf, runparams, getParam("reference")) 
+                       os << "<xref linkend=\""
+                          << sgml::cleanID(buf, runparams, getParam("reference"))
                           << "\" />";
                } else {
-                       os << "<xref linkend=\"" 
-                          << sgml::cleanID(buf, runparams, getParam("reference")) 
+                       os << "<xref linkend=\""
+                          << sgml::cleanID(buf, runparams, getParam("reference"))
                           << "\">";
                }
        } else {
-               os << "<link linkend=\"" 
+               os << "<link linkend=\""
                   << sgml::cleanID(buf, runparams, getParam("reference"))
-                  << "\">" 
+                  << "\">"
                   << getParam("name")
                   << "</link>";
        }