X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetRef.cpp;h=bd6b2ecfec204952e81dd455d152a3bd4bad227a;hb=d044d6afa7192b2119784e1415e71dad644bc335;hp=73ee8cbbcb8c4cadd3ad3f0d04fc5cd4d1c76990;hpb=96dfec471f7fd62e5239af3ad347d655295153cc;p=lyx.git diff --git a/src/insets/InsetRef.cpp b/src/insets/InsetRef.cpp index 73ee8cbbcb..bd6b2ecfec 100644 --- a/src/insets/InsetRef.cpp +++ b/src/insets/InsetRef.cpp @@ -16,6 +16,7 @@ #include "Cursor.h" #include "DispatchResult.h" #include "InsetLabel.h" +#include "Language.h" #include "LaTeXFeatures.h" #include "LyX.h" #include "OutputParams.h" @@ -28,6 +29,7 @@ #include "support/docstream.h" #include "support/gettext.h" #include "support/lstrings.h" +#include "support/textutils.h" using namespace lyx::support; using namespace std; @@ -70,21 +72,38 @@ ParamInfo const & InsetRef::findInfo(string const & /* cmdName */) } -// for refstyle, given pfx:suffix, we want to return "\\pfxcmd" -// and put "suffix" into label. -// otherwise, we put the reference into label. -docstring InsetRef::getFormattedCmd( - docstring const & ref, docstring & label) const +// the ref argument is the label name we are referencing. +// we expect ref to be in the form: pfx:suffix. +// +// if it isn't, then we can't produce a formatted reference, +// so we return "\ref" and put ref into label. +// +// for refstyle, we return "\pfxcmd", and put suffix into +// label and pfx into prefix. this is because refstyle expects +// the command: \pfxcmd{suffix}. +// +// for prettyref, we return "\prettyref" and put ref into label +// 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 { static docstring const defcmd = from_ascii("\\ref"); static docstring const prtcmd = from_ascii("\\prettyref"); - docstring prefix; label = split(ref, prefix, ':'); // we have to have xxx:xxxxx... + if (label.empty()) { + LYXERR0("Label `" << ref << "' contains no prefix."); + label = ref; + prefix = from_ascii(""); + return defcmd; + } + if (prefix.empty()) { - LYXERR0("Label `" << label << "' contains no prefix."); + // we have ":xxxx" label = ref; return defcmd; } @@ -98,8 +117,9 @@ docstring InsetRef::getFormattedCmd( // 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; @@ -118,29 +138,43 @@ 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") { + string const & cmd = getCmdName(); + docstring const & data = getEscapedLabel(rp); + + if (rp.inulemcmd > 0) + 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 const fcmd = getFormattedCmd(data, label); - os << fcmd << '{' << label << '}'; - return 0; + } + + if (rp.inulemcmd > 0) + os << "}"; } -int InsetRef::plaintext(odocstream & os, OutputParams const &) const +int InsetRef::plaintext(odocstringstream & os, + OutputParams const &, size_t) const { docstring const str = getParam("reference"); os << '[' << str << ']'; @@ -173,7 +207,7 @@ int InsetRef::docbook(odocstream & os, OutputParams const & runparams) const } -docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const &) const +docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const & op) const { docstring const & ref = getParam("reference"); InsetLabel const * il = buffer().insetLabel(ref); @@ -189,14 +223,20 @@ docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const &) const // normally, would be "ref on page #", but we have no pages display_string = value; else if (cmd == "pageref" || cmd == "vpageref") - // normally would be "on page #", but we have no pages - display_string = _("elsewhere"); + // normally would be "on page #", but we have no pages. + display_string = translateIfPossible(from_ascii("elsewhere"), + op.local_font->language()->lang()); else if (cmd == "eqref") - display_string = bformat(from_ascii("equation (%1$s)"), value); - else if (cmd == "prettyref" - // we don't really have the ability to handle these - // properly in XHTML output - || cmd == "nameref") + display_string = '(' + value + ')'; + else if (cmd == "formatted") + display_string = il->prettyCounter(); + else if (cmd == "nameref") + // FIXME We don't really have the ability to handle these + // properly in XHTML output yet (bug #8599). + // It might not be that hard to do. We have the InsetLabel, + // and we can presumably find its paragraph using the TOC. + // But the label might be referencing a section, yet not be + // in that section. So this is not trivial. display_string = il->prettyCounter(); } else display_string = ref; @@ -212,9 +252,19 @@ docstring InsetRef::xhtml(XHTMLStream & xs, OutputParams const &) const } -void InsetRef::tocString(odocstream & os) const +void InsetRef::toString(odocstream & os) const +{ + odocstringstream ods; + plaintext(ods, OutputParams(0)); + os << ods.str(); +} + + +void InsetRef::forOutliner(docstring & os, size_t) const { - plaintext(os, OutputParams(0)); + // There's no need for details in the TOC, and a long label + // will just get in the way. + os += '#'; } @@ -222,7 +272,7 @@ void InsetRef::updateBuffer(ParIterator const & it, UpdateType) { docstring const & ref = getParam("reference"); // register this inset into the buffer reference cache. - buffer().references(ref).push_back(make_pair(this, it)); + buffer().addReference(ref, this, it); docstring label; for (int i = 0; !types[i].latex_name.empty(); ++i) { @@ -233,7 +283,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"); } @@ -253,7 +303,7 @@ void InsetRef::updateBuffer(ParIterator const & it, UpdateType) } -void InsetRef::addToToc(DocIterator const & cpit) +void InsetRef::addToToc(DocIterator const & cpit, bool output_active) const { docstring const & label = getParam("reference"); if (buffer().insetLabel(label)) @@ -263,7 +313,7 @@ void InsetRef::addToToc(DocIterator const & cpit) // It seems that this reference does not point to any valid label. screen_label_ = _("BROKEN: ") + screen_label_; Toc & toc = buffer().tocBackend().toc("label"); - toc.push_back(TocItem(cpit, 0, screen_label_)); + toc.push_back(TocItem(cpit, 0, screen_label_, output_active)); } @@ -272,27 +322,36 @@ 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"); - docstring const data = getEscapedLabel(features.runparams()); - docstring label; - string const fcmd = to_utf8(getFormattedCmd(data, label)); - if (fcmd != "\\ref") { - string lcmd = "\\AtBeginDocument{\\providecommand" + fcmd + "[1]{\\ref{#1}}}"; + if (prefix == "cha") + features.addPreambleSnippet("\\let\\charef=\\chapref"); + else if (!prefix.empty()) { + string lcmd = "\\AtBeginDocument{\\providecommand" + + fcmd + "[1]{\\ref{" + to_utf8(prefix) + ":#1}}}"; features.addPreambleSnippet(lcmd); } - } else + } else { features.require("prettyref"); - } else if (getCmdName() == "eqref" && !buffer().params().use_refstyle) - // refstyle defines its own version + // prettyref uses "cha" for chapters, so we provide a kind of + // translation. + if (prefix == "chap") + features.addPreambleSnippet("\\let\\pr@chap=\\pr@cha"); + } + } 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"); } -InsetRef::type_info InsetRef::types[] = { +InsetRef::type_info const InsetRef::types[] = { { "ref", N_("Standard"), N_("Ref: ")}, { "eqref", N_("Equation"), N_("EqRef: ")}, { "pageref", N_("Page Number"), N_("Page: ")}, @@ -319,4 +378,9 @@ string const & InsetRef::getName(int type) } +docstring InsetRef::getTOCString() const +{ + return tooltip_.empty() ? screen_label_ : tooltip_; +} + } // namespace lyx