Merge branch 'master' of git.lyx.org:lyx

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

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index aa0bcb573eb382d7210b1a6aadba920a6dec0624..bae4992f66f156cb22cf9126ec652698adf30bca 100644 (file)
--- a/src/insets/InsetRef.cpp
+++ b/src/insets/InsetRef.cpp
@@ -28,6 +28,7 @@
 #include "support/docstream.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
+#include "support/textutils.h"
 
 using namespace lyx::support;
 using namespace std;
@@ -81,7 +82,8 @@ ParamInfo const & InsetRef::findInfo(string const & /* cmdName */)
 // the command: \pfxcmd{suffix}.
 // 
 // for prettyref, we return "\prettyref" and put ref into label
-// and pfx into prefix. this is because prettyref 
+// and pfx into prefix. this is because prettyref uses the whole
+// label, thus: \prettyref{pfx:suffix}.
 //
 docstring InsetRef::getFormattedCmd(docstring const & ref, 
        docstring & label, docstring & prefix) const
@@ -114,8 +116,8 @@ docstring InsetRef::getFormattedCmd(docstring const & ref,
        // make sure the prefix is legal for a latex command
        int const len = prefix.size();
        for (int i = 0; i < len; i++) {
-               char_type c = prefix[i];
-               if (c >= 0x80 || !isalpha(prefix[i])) {
+               char_type const c = prefix[i];
+               if (!isAlphaASCII(c)) {
                        LYXERR0("Prefix `" << prefix << "' is invalid for LaTeX.");
                        // restore the label
                        label = ref;
@@ -135,26 +137,38 @@ docstring InsetRef::getEscapedLabel(OutputParams const & rp) const
 }
 
 
-int InsetRef::latex(odocstream & os, OutputParams const & rp) const
+void InsetRef::latex(otexstream & os, OutputParams const & rp) const
 {
        string const cmd = getCmdName();
-       if (cmd != "formatted") {
+       docstring const data = getEscapedLabel(rp);
+
+       if (rp.inulemcmd)
+               os << "\\mbox{";
+
+       if (cmd == "eqref" && buffer().params().use_refstyle) {
+               // we advertise this as printing "(n)", so we'll do that, at least
+               // for refstyle, since refstlye's own \eqref prints, by default,
+               // "equation n". if one wants \eqref, one can get it by using a
+               // formatted label in this case.
+               os << '(' << from_ascii("\\ref{") << data << from_ascii("})");
+       } 
+       else if (cmd == "formatted") {
+               docstring label;
+               docstring prefix;
+               docstring const fcmd = getFormattedCmd(data, label, prefix);
+               os << fcmd << '{' << label << '}';
+       }
+       else {
                // 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 prefix;
-       docstring const fcmd = getFormattedCmd(data, label, prefix);
-       os << fcmd << '{' << label << '}';
-       return 0;
+       }
+
+       if (rp.inulemcmd)
+               os << "}";
 }
 
 
@@ -211,7 +225,7 @@ docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const &) const
                        display_string = _("elsewhere");
                else if (cmd == "eqref")
                        display_string = bformat(from_ascii("equation (%1$s)"), value);
-               else if (cmd == "prettyref" 
+               else if (cmd == "formatted"
                         // we don't really have the ability to handle these 
                         // properly in XHTML output
                         || cmd == "nameref")
@@ -230,12 +244,20 @@ docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const &) const
 }
 
 
-void InsetRef::tocString(odocstream & os) const
+void InsetRef::toString(odocstream & os) const
 {
        plaintext(os, OutputParams(0));
 }
 
 
+void InsetRef::forToc(docstring & os, size_t) const
+{
+       // There's no need for details in the TOC, and a long label
+       // will just get in the way.
+       os += '#';
+}
+
+
 void InsetRef::updateBuffer(ParIterator const & it, UpdateType)
 {
        docstring const & ref = getParam("reference");
@@ -251,7 +273,7 @@ void InsetRef::updateBuffer(ParIterator const & it, UpdateType)
        }
        label += ref;
        
-       if (!buffer().isLatex() && !getParam("name").empty()) {
+       if (!buffer().params().isLatex() && !getParam("name").empty()) {
                label += "||";
                label += getParam("name");
        }
@@ -271,7 +293,7 @@ void InsetRef::updateBuffer(ParIterator const & it, UpdateType)
 }
 
 
-void InsetRef::addToToc(DocIterator const & cpit)
+void InsetRef::addToToc(DocIterator const & cpit) const
 {
        docstring const & label = getParam("reference");
        if (buffer().insetLabel(label))
@@ -290,13 +312,13 @@ void InsetRef::validate(LaTeXFeatures & features) const
        string const cmd = getCmdName();
        if (cmd == "vref" || cmd == "vpageref")
                features.require("varioref");
-       else if (getCmdName() == "formatted") {
+       else if (cmd == "formatted") {
                docstring const data = getEscapedLabel(features.runparams());
                docstring label;
                docstring prefix;
+               string const fcmd = to_utf8(getFormattedCmd(data, label, prefix));
                if (buffer().params().use_refstyle) {
                        features.require("refstyle");
-                       string const fcmd = to_utf8(getFormattedCmd(data, label, prefix));
                        if (!prefix.empty()) {
                                string lcmd = "\\AtBeginDocument{\\providecommand" + 
                                                fcmd + "[1]{\\ref{" + to_utf8(prefix) + ":#1}}}";
@@ -310,8 +332,8 @@ void InsetRef::validate(LaTeXFeatures & features) const
                        if (prefix == "chap")
                                features.addPreambleSnippet("\\let\\pr@chap=\\pr@cha");
                }
-       } else if (getCmdName() == "eqref" && !buffer().params().use_refstyle)
-               // refstyle defines its own version
+       } else if (cmd == "eqref" && !buffer().params().use_refstyle)
+               // with refstyle, we simply output "(\ref{label})"
                features.require("amsmath");
        else if (cmd == "nameref")
                features.require("nameref");