InsetTabular.cpp: fix #6585 also for wrapped floats - thanks Vincent

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

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index 85100e809918be6e8ebfa41229d2356de81dd2f1..47747d36380c8a50df7bfea7cb480d9fcb6ae559 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -12,9 +12,9 @@
 #include "InsetRef.h"
 
 #include "Buffer.h"
+#include "BufferParams.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
-#include "FuncRequest.h"
 #include "InsetLabel.h"
 #include "LaTeXFeatures.h"
 #include "LyX.h"
@@ -24,6 +24,7 @@
 #include "sgml.h"
 #include "TocBackend.h"
 
+#include "support/debug.h"
 #include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -35,12 +36,12 @@ namespace lyx {
 
 
 InsetRef::InsetRef(Buffer * buf, InsetCommandParams const & p)
-       : InsetCommand(buf, p, "ref"), isLatex(buf->isLatex())
+       : InsetCommand(buf, p)
 {}
 
 
 InsetRef::InsetRef(InsetRef const & ir)
-       : InsetCommand(ir), isLatex(ir.isLatex)
+       : InsetCommand(ir)
 {}
 
 
@@ -51,10 +52,9 @@ bool InsetRef::isCompatibleCommand(string const & s) {
                || s == "pageref"
                || s == "vref" 
                || s == "vpageref"
-               || s == "prettyref"
+               || s == "formatted"
                || s == "eqref"
-               || s == "nameref"
-               || s == "Nameref";
+               || s == "nameref";
 }
 
 
@@ -70,13 +70,63 @@ ParamInfo const & InsetRef::findInfo(string const & /* cmdName */)
 }
 
 
-int InsetRef::latex(odocstream & os, OutputParams const & runparams) const
+// for refstyle, given pfx:suffix, we want to return "\\pfxcmd"
+// and put "suffix" into label
+docstring InsetRef::getFormattedCmd(
+               docstring const & ref, docstring & label) const
 {
-       // 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 << p.getCommand(runparams);
+       static docstring const defcmd = from_ascii("\\ref");
+       if (!buffer().params().use_refstyle) 
+               return from_ascii("\\prettyref");
+
+       docstring prefix;
+       label = split(ref, prefix, ':');
+       if (prefix.empty()) {
+               LYXERR0("Label `" << label << "' contains no prefix.");
+               return defcmd;
+       }
+       
+       // make sure the prefix is legal for a latex command
+       int const len = prefix.size();
+       for (int i = 0; i < len; i++) {
+               if (!isalpha(prefix[i])) {
+                       LYXERR0("Prefix `" << prefix << "' contains non-letters.");
+                       // restore the label
+                       label = ref;
+                       return defcmd;
+               }
+       }
+       return from_ascii("\\") + prefix + from_ascii("ref");
+}
+
+
+docstring InsetRef::getEscapedLabel(OutputParams const & rp) const
+{
+       InsetCommandParams const & p = params();
+       ParamInfo const & pi = p.info();
+       ParamInfo::ParamData const & pd = pi["reference"];
+       return p.prepareCommand(rp, getParam("reference"), pd.handling());              
+}
+
+
+int InsetRef::latex(odocstream & os, OutputParams const & rp) const
+{
+       string const cmd = getCmdName();
+       if (cmd != "formatted") {
+               // 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, cmd);
+               docstring const ref = getParam("reference");
+               p["reference"] = ref;
+               os << p.getCommand(rp);
+               return 0;
+       } 
+       
+       // so we're doing a formatted reference.
+       docstring const data = getEscapedLabel(rp);
+       docstring label;
+       docstring const fcmd = getFormattedCmd(data, label);
+       os << fcmd << '{' << label << '}';
        return 0;
 }
 
@@ -137,7 +187,7 @@ docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const &) const
                else if (cmd == "prettyref" 
                         // we don't really have the ability to handle these 
                         // properly in XHTML output
-                        || cmd == "nameref" || cmd == "Nameref")
+                        || cmd == "nameref")
                        display_string = il->prettyCounter();
        } else 
                        display_string = ref;
@@ -173,8 +223,8 @@ void InsetRef::updateBuffer(ParIterator const & it, UpdateType)
                }
        }
        label += ref;
-
-       if (!isLatex && !getParam("name").empty()) {
+       
+       if (!buffer().isLatex() && !getParam("name").empty()) {
                label += "||";
                label += getParam("name");
        }
@@ -213,11 +263,22 @@ void InsetRef::validate(LaTeXFeatures & features) const
        string const cmd = getCmdName();
        if (cmd == "vref" || cmd == "vpageref")
                features.require("varioref");
-       else if (cmd == "prettyref")
-               features.require("prettyref");
-       else if (cmd == "eqref")
+       else if (getCmdName() == "formatted") {
+               if (buffer().params().use_refstyle) {
+                       features.require("refstyle");
+                       docstring const data = getEscapedLabel(features.runparams());
+                       docstring label;
+                       string const fcmd = to_utf8(getFormattedCmd(data, label));
+                       if (fcmd != "\\ref") {
+                               string lcmd = "\\providecommand" + fcmd + "[1]{\\ref{#1}}";
+                               features.addPreambleSnippet(lcmd);
+                       }
+               } else
+                       features.require("prettyref");
+       } else if (getCmdName() == "eqref" && !buffer().params().use_refstyle)
+               // refstyle defines its own version
                features.require("amsmath");
-       else if (cmd == "nameref" || cmd == "Nameref")
+       else if (cmd == "nameref")
                features.require("nameref");
 }
 
@@ -228,9 +289,8 @@ InsetRef::type_info InsetRef::types[] = {
        { "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_("FrmtRef: ")},
+       { "formatted", N_("Formatted"),             N_("Format: ")},
        { "nameref",   N_("Reference to Name"),     N_("NameRef:")},
-       { "Nameref",   N_("Name+Textual Page"),     N_("NamePgRef:")},
        { "", "", "" }
 };