X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.cpp;h=ba45f691a37cbe0cef69fdab1313ca90e6e2c02a;hb=d6a93143ec2146210d79f58cac42f9608da86100;hp=768eb35e8b036eeed4c5a1545da8a09886811707;hpb=7f97ace83b723b5176aaa70518bdec07fb8e4357;p=lyx.git diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp index 768eb35e8b..ba45f691a3 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) { @@ -55,20 +52,38 @@ InsetCitation::InsetCitation(Buffer * buf, InsetCommandParams const & p) InsetCitation::~InsetCitation() { if (isBufferLoaded()) - buffer().removeBiblioTempFiles(); + /* We do not use buffer() because Coverity believes that this + * may throw an exception. Actually this code path is not + * taken when buffer_ == 0 */ + buffer_->removeBiblioTempFiles(); } +// 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 // LaTeX output is nevertheless correct. if (param_info_.empty()) { - param_info_.add("after", ParamInfo::LATEX_OPTIONAL); - param_info_.add("before", ParamInfo::LATEX_OPTIONAL); + param_info_.add("after", ParamInfo::LATEX_OPTIONAL, + ParamInfo::HANDLING_LATEXIFY); + param_info_.add("before", ParamInfo::LATEX_OPTIONAL, + ParamInfo::HANDLING_LATEXIFY); param_info_.add("key", ParamInfo::LATEX_REQUIRED); + param_info_.add("pretextlist", ParamInfo::LATEX_OPTIONAL, + ParamInfo::HANDLING_LATEXIFY); + param_info_.add("posttextlist", ParamInfo::LATEX_OPTIONAL, + ParamInfo::HANDLING_LATEXIFY); + param_info_.add("literal", ParamInfo::LYX_INTERNAL); } return param_info_; } @@ -123,7 +138,7 @@ void InsetCitation::doDispatch(Cursor & cur, FuncRequest & cmd) if (cmd.getArg(0) == "toggleparam") { string cmdname = getCmdName(); string const alias = - buffer().params().getCiteAlias(cmdname); + buffer().masterParams().getCiteAlias(cmdname); if (!alias.empty()) cmdname = alias; string const par = cmd.getArg(1); @@ -142,6 +157,7 @@ void InsetCitation::doDispatch(Cursor & cur, FuncRequest & cmd) cmd = FuncRequest(LFUN_INSET_MODIFY, "changetype " + newcmdname); } } + // fall through default: InsetCommand::doDispatch(cur, cmd); } @@ -157,7 +173,7 @@ bool InsetCitation::getStatus(Cursor & cur, FuncRequest const & cmd, if (cmd.getArg(0) == "changetype") { string cmdname = getCmdName(); string const alias = - buffer().params().getCiteAlias(cmdname); + buffer().masterParams().getCiteAlias(cmdname); if (!alias.empty()) cmdname = alias; if (suffixIs(cmdname, "*")) @@ -169,12 +185,12 @@ bool InsetCitation::getStatus(Cursor & cur, FuncRequest const & cmd, if (cmd.getArg(0) == "toggleparam") { string cmdname = getCmdName(); string const alias = - buffer().params().getCiteAlias(cmdname); + buffer().masterParams().getCiteAlias(cmdname); if (!alias.empty()) cmdname = alias; vector citation_styles = - buffer().params().citeStyles(); - CitationStyle cs = getCitationStyle(buffer().params(), + buffer().masterParams().citeStyles(); + CitationStyle cs = getCitationStyle(buffer().masterParams(), cmdname, citation_styles); if (cmd.getArg(1) == "star") { status.setEnabled(cs.hasStarredVersion); @@ -242,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 @@ -312,6 +328,20 @@ inline docstring wrapCitation(docstring const & key, } // anonymous namespace + +map InsetCitation::getQualifiedLists(docstring const p) const +{ + vector ps = + getVectorFromString(p, from_ascii("\t")); + std::map res; + for (docstring const & s: ps) { + docstring key; + docstring val = split(s, key, ' '); + res[key] = val; + } + return res; +} + docstring InsetCitation::generateLabel(bool for_xhtml) const { docstring label; @@ -349,7 +379,7 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const cite_type = cite_type.substr(0, cite_type.size() - 1); // handle alias - string const alias = buf.params().getCiteAlias(cite_type); + string const alias = buf.masterParams().getCiteAlias(cite_type); if (!alias.empty()) cite_type = alias; @@ -359,13 +389,28 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const buffer().params().documentClass().addCiteMacro("!textafter", to_utf8(after)); */ docstring label; - vector keys = getVectorFromString(key); + // 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")); + CiteItem ci; ci.textBefore = getParam("before"); ci.textAfter = getParam("after"); ci.forceUpperCase = uppercase; ci.Starred = starred; ci.max_size = UINT_MAX; + ci.isQualified = qualified; + ci.pretexts = pres; + ci.posttexts = posts; if (for_xhtml) { ci.max_key_size = UINT_MAX; ci.context = CiteItem::Export; @@ -385,8 +430,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); @@ -420,15 +464,15 @@ void InsetCitation::updateBuffer(ParIterator const &, UpdateType) void InsetCitation::addToToc(DocIterator const & cpit, bool output_active, - UpdateType) const + UpdateType, TocBackend & backend) const { // NOTE - // BiblioInfo::collectCitedEntries() uses the TOC to collect the citations + // BiblioInfo::collectCitedEntries() uses the TOC to collect the citations // 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"); - TocBuilder & b = buffer().tocBackend().builder("citation"); + TocBuilder & b = backend.builder("citation"); b.pushItem(cpit, tocitem, output_active); b.pop(); } @@ -508,29 +552,82 @@ 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 { - vector citation_styles = buffer().params().citeStyles(); - CitationStyle cs = asValidLatexCommand(buffer().params(), getCmdName(), citation_styles); - 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") { + // Special command to only return the key + if (!bi.isBibtex(getParam("key"))) + // escape chars with bibitems + os << escape(cleanupWhitespace(key)); + else + os << cleanupWhitespace(key); + return; + } + vector citation_styles = buffer().masterParams().citeStyles(); + CitationStyle cs = asValidLatexCommand(buffer().masterParams(), + getCmdName(), citation_styles); // FIXME UNICODE docstring const cite_str = from_utf8(citationStyleToString(cs, true)); + // check if we have to do a qualified list + vector keys = getVectorFromString(cleanupWhitespace(key)); + bool const qualified = cs.hasQualifiedList + && (!getParam("pretextlist").empty() + || !getParam("posttextlist").empty()); + if (runparams.inulemcmd > 0) os << "\\mbox{"; os << "\\" << cite_str; - docstring const & before = getParam("before"); - docstring const & after = getParam("after"); - if (!before.empty() && cs.textBefore) - os << '[' << before << "][" << after << ']'; - else if (!after.empty() && cs.textAfter) - os << '[' << after << ']'; + if (qualified) + os << "s"; + + ParamInfo const & pinfo = findInfo(string()); + docstring before = params().prepareCommand(runparams, getParam("before"), + pinfo["before"].handling()); + docstring after = params().prepareCommand(runparams, getParam("after"), + pinfo["after"].handling()); + if (!before.empty() && cs.textBefore) { + if (qualified) + os << '(' << protectArgument(before, '(', ')') + << ")(" << protectArgument(after, '(', ')') << ')'; + else + os << '[' << protectArgument(before) << "][" + << protectArgument(after) << ']'; + } else if (!after.empty() && cs.textAfter) { + if (qualified) + os << '(' << protectArgument(after, '(', ')') << ')'; + else + os << '[' << protectArgument(after) << ']'; + } - if (!bi.isBibtex(getParam("key"))) + if (!bi.isBibtex(key)) // escape chars with bibitems - os << '{' << escape(cleanupWhitespace(getParam("key"))) << '}'; - else - os << '{' << cleanupWhitespace(getParam("key")) << '}'; + 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], + pinfo["pretextlist"].handling()); + docstring aft = params().prepareCommand(runparams, posts[k], + pinfo["posttextlist"].handling()); + if (!bef.empty()) + os << '[' << protectArgument(bef) + << "][" << protectArgument(aft) << ']'; + else if (!aft.empty()) + os << '[' << protectArgument(aft) << ']'; + os << '{' << k << '}'; + } + } else + os << '{' << cleanupWhitespace(key) << '}'; + } if (runparams.inulemcmd) os << "}";