X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.cpp;h=0a5da5b1192f63a04d4210e7f1489e64e35c461c;hb=3391fed36a574fb729f243888258d1b6d45b0251;hp=94a1592ee3c9abb579d9f4a0eed83c06b09668f7;hpb=18d6701a40514764ff08f4a90886f5d073a57c32;p=features.git diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp index 94a1592ee3..0a5da5b119 100644 --- a/src/insets/InsetCitation.cpp +++ b/src/insets/InsetCitation.cpp @@ -82,13 +82,69 @@ bool InsetCitation::isCompatibleCommand(string const &) } +CitationStyle InsetCitation::getCitationStyle(BufferParams const & bp, string const & input, + vector const & valid_styles) const +{ + CitationStyle cs = valid_styles[0]; + cs.forceUpperCase = false; + cs.hasStarredVersion = false; + + string normalized_input = input; + string::size_type const n = input.size() - 1; + if (isUpperCase(input[0])) + normalized_input[0] = lowercase(input[0]); + if (input[n] == '*') + normalized_input = normalized_input.substr(0, n); + + string const alias = bp.getCiteAlias(normalized_input); + if (!alias.empty()) + normalized_input = alias; + + vector::const_iterator it = valid_styles.begin(); + vector::const_iterator end = valid_styles.end(); + for (; it != end; ++it) { + CitationStyle this_cs = *it; + if (this_cs.name == normalized_input) { + cs = *it; + break; + } + } + + return cs; +} + + void InsetCitation::doDispatch(Cursor & cur, FuncRequest & cmd) { - if (cmd.action() == LFUN_INSET_MODIFY) { + switch (cmd.action()) { + case LFUN_INSET_MODIFY: { buffer().removeBiblioTempFiles(); cache.recalculate = true; + if (cmd.getArg(0) == "toggleparam") { + string cmdname = getCmdName(); + string const alias = + buffer().masterParams().getCiteAlias(cmdname); + if (!alias.empty()) + cmdname = alias; + string const par = cmd.getArg(1); + string newcmdname = cmdname; + if (par == "star") { + if (suffixIs(cmdname, "*")) + newcmdname = rtrim(cmdname, "*"); + else + newcmdname = cmdname + "*"; + } else if (par == "casing") { + if (isUpperCase(cmdname[0])) + newcmdname[0] = lowercase(cmdname[0]); + else + newcmdname[0] = uppercase(newcmdname[0]); + } + cmd = FuncRequest(LFUN_INSET_MODIFY, "changetype " + newcmdname); + } + } + default: + InsetCommand::doDispatch(cur, cmd); } - InsetCommand::doDispatch(cur, cmd); } @@ -100,14 +156,35 @@ bool InsetCitation::getStatus(Cursor & cur, FuncRequest const & cmd, case LFUN_INSET_MODIFY: if (cmd.getArg(0) == "changetype") { string cmdname = getCmdName(); - string const alias = buffer().params().getCiteAlias(cmdname); + string const alias = + buffer().masterParams().getCiteAlias(cmdname); if (!alias.empty()) cmdname = alias; + if (suffixIs(cmdname, "*")) + cmdname = rtrim(cmdname, "*"); string const newtype = cmd.getArg(1); status.setEnabled(isCompatibleCommand(newtype)); status.setOnOff(newtype == cmdname); } - status.setEnabled(true); + if (cmd.getArg(0) == "toggleparam") { + string cmdname = getCmdName(); + string const alias = + buffer().masterParams().getCiteAlias(cmdname); + if (!alias.empty()) + cmdname = alias; + vector citation_styles = + buffer().masterParams().citeStyles(); + CitationStyle cs = getCitationStyle(buffer().masterParams(), + cmdname, citation_styles); + if (cmd.getArg(1) == "star") { + status.setEnabled(cs.hasStarredVersion); + status.setOnOff(suffixIs(cmdname, "*")); + } + else if (cmd.getArg(1) == "casing") { + status.setEnabled(cs.forceUpperCase); + status.setOnOff(isUpperCase(cmdname[0])); + } + } return true; default: return InsetCommand::getStatus(cur, cmd, status); @@ -156,17 +233,29 @@ docstring InsetCitation::toolTip(BufferView const & bv, int, int) const if (key.empty()) return _("No citations selected!"); + CiteItem ci; + ci.richtext = true; vector keys = getVectorFromString(key); if (keys.size() == 1) - return bi.getInfo(keys[0], buffer(), true); + return bi.getInfo(keys[0], buffer(), ci); docstring tip; tip += "
    "; + int count = 0; for (docstring const & key : keys) { - docstring const key_info = bi.getInfo(key, buffer(), true); + docstring const key_info = bi.getInfo(key, buffer(), ci); + // limit to reasonable size. + if (count > 9 && keys.size() > 11) { + tip.push_back(0x2026);// HORIZONTAL ELLIPSIS + tip += "

    " + + bformat(_("+ %1$d more entries."), int(keys.size() - count)) + + "

    "; + break; + } if (key_info.empty()) continue; tip += "
  1. " + key_info + "
    2. "; + ++count; } tip += "
"; return tip; @@ -175,7 +264,6 @@ docstring InsetCitation::toolTip(BufferView const & bv, int, int) const namespace { - CitationStyle asValidLatexCommand(BufferParams const & bp, string const & input, vector const & valid_styles) { @@ -252,23 +340,19 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const if (key.empty()) return _("No citations selected!"); - // We don't currently use the full or forceUCase fields. string cite_type = getCmdName(); - if (isUpperCase(cite_type[0])) - // If we were going to use them, this would mean ForceUCase + bool const uppercase = isUpperCase(cite_type[0]); + if (uppercase) cite_type[0] = lowercase(cite_type[0]); - if (cite_type[cite_type.size() - 1] == '*') - // and this would mean FULL + bool const starred = (cite_type[cite_type.size() - 1] == '*'); + if (starred) 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; - docstring const & before = getParam("before"); - docstring const & after = getParam("after"); - // FIXME: allow to add cite macros /* buffer().params().documentClass().addCiteMacro("!textbefore", to_utf8(before)); @@ -276,7 +360,18 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const */ docstring label; vector keys = getVectorFromString(key); - label = biblist.getLabel(keys, buffer(), cite_type, for_xhtml, UINT_MAX, before, after); + CiteItem ci; + ci.textBefore = getParam("before"); + ci.textAfter = getParam("after"); + ci.forceUpperCase = uppercase; + ci.Starred = starred; + ci.max_size = UINT_MAX; + if (for_xhtml) { + ci.max_key_size = UINT_MAX; + ci.context = CiteItem::Export; + } + ci.richtext = for_xhtml; + label = biblist.getLabel(keys, buffer(), cite_type, ci); return label; } @@ -325,7 +420,7 @@ 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 @@ -333,8 +428,9 @@ void InsetCitation::addToToc(DocIterator const & cpit, bool output_active, // 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"); - shared_ptr toc = buffer().tocBackend().toc("citation"); - toc->push_back(TocItem(cpit, 0, tocitem, output_active)); + TocBuilder & b = backend.builder("citation"); + b.pushItem(cpit, tocitem, output_active); + b.pop(); } @@ -412,9 +508,19 @@ 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(); + if (getCmdName() == "keyonly") { + // Special command to only return the key + if (!bi.isBibtex(getParam("key"))) + // escape chars with bibitems + os << escape(cleanupWhitespace(getParam("key"))); + else + os << cleanupWhitespace(getParam("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));