X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.cpp;h=0335b9c771d9b21a3b8231803cdedebae657e232;hb=a6b07608d8e9de24383d3ebaec20b6b265ed9314;hp=366cbc60d7cddb7abd5783c2950c0094d8fd4b55;hpb=9f56f97d8eb192d00a07fec6b1300c96f0efa022;p=features.git diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp index 366cbc60d7..0335b9c771 100644 --- a/src/insets/InsetCitation.cpp +++ b/src/insets/InsetCitation.cpp @@ -42,9 +42,6 @@ using namespace lyx::support; namespace lyx { -ParamInfo InsetCitation::param_info_; - - InsetCitation::InsetCitation(Buffer * buf, InsetCommandParams const & p) : InsetCommand(buf, p) { @@ -62,8 +59,16 @@ InsetCitation::~InsetCitation() } +// May well be over-ridden when session settings are loaded +// in GuiCitation. Unfortunately, that will not happen until +// such a dialog is created. +bool InsetCitation::last_literal = true; + + ParamInfo const & InsetCitation::findInfo(string const & /* cmdName */) { + static ParamInfo param_info_; + // standard cite does only take one argument, but biblatex, jurabib // and natbib extend this to two arguments, so // we have to allow both here. InsetCitation takes care that @@ -152,7 +157,7 @@ void InsetCitation::doDispatch(Cursor & cur, FuncRequest & cmd) cmd = FuncRequest(LFUN_INSET_MODIFY, "changetype " + newcmdname); } } - // fall through + // fall through default: InsetCommand::doDispatch(cur, cmd); } @@ -253,8 +258,8 @@ docstring InsetCitation::toolTip(BufferView const & bv, int, int) const docstring tip; tip += "
    "; int count = 0; - for (docstring const & key : keys) { - docstring const key_info = bi.getInfo(key, buffer(), ci); + for (docstring const & kvar : keys) { + docstring const key_info = bi.getInfo(kvar, buffer(), ci); // limit to reasonable size. if (count > 9 && keys.size() > 11) { tip.push_back(0x2026);// HORIZONTAL ELLIPSIS @@ -317,22 +322,24 @@ inline docstring wrapCitation(docstring const & key, return content; // we have to do the escaping here, because we will ultimately // write this as a raw string, so as not to escape the tags. - return "" + - html::htmlize(content, XHTMLStream::ESCAPE_ALL) + ""; + return "" + + xml::xmlize(content, XMLStream::ESCAPE_ALL) + ""; } } // anonymous namespace -map InsetCitation::getQualifiedLists(docstring const p) const +vector> InsetCitation::getQualifiedLists(docstring const & p) const { vector ps = getVectorFromString(p, from_ascii("\t")); - std::map res; + QualifiedList res; for (docstring const & s: ps) { - docstring key; - docstring val = split(s, key, ' '); - res[key] = val; + docstring key = s; + docstring val; + if (contains(s, ' ')) + val = split(s, key, ' '); + res.push_back(make_pair(key, val)); } return res; } @@ -357,14 +364,33 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const if (!buf.isFullyLoaded()) return docstring(); + docstring const & key = getParam("key"); + BiblioInfo const & biblist = buf.masterBibInfo(); - if (biblist.empty()) + + // mark broken citations + setBroken(false); + + if (biblist.empty()) { + setBroken(true); return docstring(); + } - docstring const & key = getParam("key"); if (key.empty()) return _("No citations selected!"); + // check all citations + // we only really want the last 'false', to suppress trimming, but + // we need to give the other defaults, too, to set it. + vector keys = + getVectorFromString(key, from_ascii(","), false, false); + for (auto const & k : keys) { + if (biblist.find(k) == biblist.end()) { + setBroken(true); + break; + } + } + string cite_type = getCmdName(); bool const uppercase = isUpperCase(cite_type[0]); if (uppercase) @@ -384,18 +410,14 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const buffer().params().documentClass().addCiteMacro("!textafter", to_utf8(after)); */ docstring label; - // we only really want the last 'false', to suppress trimming, but - // we need to give the other defaults, too, to set it. - vector keys = - getVectorFromString(key, from_ascii(","), false, false); CitationStyle cs = getCitationStyle(buffer().masterParams(), cite_type, buffer().masterParams().citeStyles()); bool const qualified = cs.hasQualifiedList && (keys.size() > 1 || !getParam("pretextlist").empty() || !getParam("posttextlist").empty()); - map pres = getQualifiedLists(getParam("pretextlist")); - map posts = getQualifiedLists(getParam("posttextlist")); + QualifiedList pres = getQualifiedLists(getParam("pretextlist")); + QualifiedList posts = getQualifiedLists(getParam("posttextlist")); CiteItem ci; ci.textBefore = getParam("before"); @@ -425,8 +447,7 @@ docstring InsetCitation::basicLabel(bool for_xhtml) const do { // if there is no comma, then everything goes into key // and keys will be empty. - keys = trim(split(keys, key, ',')); - key = trim(key); + keys = split(keys, key, ','); if (!label.empty()) label += ", "; label += wrapCitation(key, key, for_xhtml); @@ -439,13 +460,25 @@ docstring InsetCitation::basicLabel(bool for_xhtml) const return '[' + label + ']'; } + +bool InsetCitation::forceLTR(OutputParams const & rp) const +{ + // We have to force LTR for numeric references + // [= bibliography, plain BibTeX, numeric natbib + // and biblatex]. Except for XeTeX/bidi. See #3005. + if (rp.useBidiPackage()) + return false; + return (buffer().masterParams().citeEngine() == "basic" + || buffer().masterParams().citeEngineType() == ENGINE_TYPE_NUMERICAL); +} + docstring InsetCitation::screenLabel() const { return cache.screen_label; } -void InsetCitation::updateBuffer(ParIterator const &, UpdateType) +void InsetCitation::updateBuffer(ParIterator const &, UpdateType, bool const /*deleted*/) { if (!cache.recalculate && buffer().citeLabelsValid()) return; @@ -454,8 +487,8 @@ void InsetCitation::updateBuffer(ParIterator const &, UpdateType) cache.recalculate = false; cache.generated_label = glabel; unsigned int const maxLabelChars = 45; - cache.screen_label = glabel.substr(0, maxLabelChars + 1); - support::truncateWithEllipsis(cache.screen_label, maxLabelChars); + cache.screen_label = glabel; + support::truncateWithEllipsis(cache.screen_label, maxLabelChars, true); } @@ -467,10 +500,17 @@ void InsetCitation::addToToc(DocIterator const & cpit, bool output_active, // from the document. It is used indirectly, via BiblioInfo::makeCitationLables, // by both XHTML and plaintext output. So, if we change what goes into the TOC, // then we will also need to change that routine. - docstring const tocitem = getParam("key"); + docstring tocitem; + if (isBroken()) + tocitem = _("BROKEN: "); + tocitem += getParam("key"); TocBuilder & b = backend.builder("citation"); b.pushItem(cpit, tocitem, output_active); b.pop(); + if (isBroken()) { + shared_ptr toc2 = backend.toc("brokenrefs"); + toc2->push_back(TocItem(cpit, 0, tocitem, output_active)); + } } @@ -514,14 +554,14 @@ int InsetCitation::docbook(odocstream & os, OutputParams const &) const } -docstring InsetCitation::xhtml(XHTMLStream & xs, OutputParams const &) const +docstring InsetCitation::xhtml(XMLStream & xs, OutputParams const &) const { string const & cmd = getCmdName(); if (cmd == "nocite") return docstring(); // have to output this raw, because generateLabel() will include tags - xs << XHTMLStream::ESCAPE_NONE << generateLabel(true); + xs << XMLStream::ESCAPE_NONE << generateLabel(true); return docstring(); } @@ -548,7 +588,10 @@ void InsetCitation::forOutliner(docstring & os, size_t const, bool const) const // engine, e.g. \cite[]{} for the basic engine. void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const { - BiblioInfo const & bi = buffer().masterBibInfo(); + // When this is a child compiled on its own, we use the childs + // own bibinfo, else the master's + BiblioInfo const & bi = runparams.is_child + ? buffer().masterBibInfo() : buffer().bibInfo(); docstring const key = getParam("key"); // "keyonly" command: output the plain key and stop. if (getCmdName() == "keyonly") { @@ -580,10 +623,11 @@ void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const if (qualified) os << "s"; + ParamInfo const & pinfo = findInfo(string()); docstring before = params().prepareCommand(runparams, getParam("before"), - param_info_["before"].handling()); + pinfo["before"].handling()); docstring after = params().prepareCommand(runparams, getParam("after"), - param_info_["after"].handling()); + pinfo["after"].handling()); if (!before.empty() && cs.textBefore) { if (qualified) os << '(' << protectArgument(before, '(', ')') @@ -603,13 +647,31 @@ void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const os << '{' << escape(cleanupWhitespace(key)) << '}'; else { if (qualified) { - map pres = getQualifiedLists(getParam("pretextlist")); - map posts = getQualifiedLists(getParam("posttextlist")); - for (docstring const & k: keys) { - docstring bef = params().prepareCommand(runparams, pres[k], - param_info_["pretextlist"].handling()); - docstring aft = params().prepareCommand(runparams, posts[k], - param_info_["posttextlist"].handling()); + QualifiedList pres = getQualifiedLists(getParam("pretextlist")); + QualifiedList posts = getQualifiedLists(getParam("posttextlist")); + for (docstring const & k : keys) { + docstring prenote; + QualifiedList::iterator it = pres.begin(); + for (; it != pres.end() ; ++it) { + if ((*it).first == k) { + prenote = (*it).second; + pres.erase(it); + break; + } + } + docstring bef = params().prepareCommand(runparams, prenote, + pinfo["pretextlist"].handling()); + docstring postnote; + QualifiedList::iterator pit = posts.begin(); + for (; pit != posts.end() ; ++pit) { + if ((*pit).first == k) { + postnote = (*pit).second; + posts.erase(pit); + break; + } + } + docstring aft = params().prepareCommand(runparams, postnote, + pinfo["posttextlist"].handling()); if (!bef.empty()) os << '[' << protectArgument(bef) << "][" << protectArgument(aft) << ']';