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 a30b7b63e49039e06da8c54ee8f15b1aac9e3197..47747d36380c8a50df7bfea7cb480d9fcb6ae559 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -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)
 {}
 
 
@@ -69,26 +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
+{
+       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();
-       docstring const ref = getParam("reference");
        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(runparams);
+               os << p.getCommand(rp);
                return 0;
        } 
        
        // so we're doing a formatted reference.
-       if  (!buffer().params().use_refstyle) {
-               os << "\\prettyref{" << ref << '}';
-               return 0;
-       }
-       
-       os << "\\lyxref{" << ref << '}';
+       docstring const data = getEscapedLabel(rp);
+       docstring label;
+       docstring const fcmd = getFormattedCmd(data, label);
+       os << fcmd << '{' << label << '}';
        return 0;
 }
 
@@ -185,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");
        }
@@ -228,7 +266,13 @@ void InsetRef::validate(LaTeXFeatures & features) const
        else if (getCmdName() == "formatted") {
                if (buffer().params().use_refstyle) {
                        features.require("refstyle");
-                       //features.addPreambleSnippet("");
+                       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)