Cocoa based Qt-4.6 needs to paint every character separately to match metrics computa...

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

diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp
index 8baf6c6e82948bb2f1eb41bc2f8e4e4eb67912b3..7b6cf6d98109d455bb50d92c4ecf7b3065f7e306 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,9 @@ 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++) {
-               if (!isalpha(prefix[i])) {
-                       LYXERR0("Prefix `" << prefix << "' contains non-letters.");
+               char_type const c = prefix[i];
+               if (!isAlphaASCII(c)) {
+                       LYXERR0("Prefix `" << prefix << "' is invalid for LaTeX.");
                        // restore the label
                        label = ref;
                        return defcmd;
@@ -134,26 +137,28 @@ 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 (cmd == "eqref" && buffer().params().use_refstyle) {
+               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;
+       }
 }
 
 
@@ -210,7 +215,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")
@@ -229,12 +234,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");
@@ -250,7 +263,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");
        }
@@ -270,7 +283,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))