X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.cpp;h=e47f31189feddf44a1d922466ff7a3c663b60553;hb=eba2f0479eb5af6b61d9a82e89daea253d9b6bf6;hp=c0e61798a8fecda40ed999b9d0091ff0020f4841;hpb=4df02801a6e01356a3af033466864197d8e18f11;p=lyx.git diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp index c0e61798a8..e47f31189f 100644 --- a/src/insets/InsetCitation.cpp +++ b/src/insets/InsetCitation.cpp @@ -21,9 +21,11 @@ #include "DispatchResult.h" #include "FuncCode.h" #include "FuncRequest.h" +#include "FuncStatus.h" #include "LaTeXFeatures.h" #include "output_xhtml.h" #include "ParIterator.h" +#include "texstream.h" #include "TocBackend.h" #include "support/debug.h" @@ -33,6 +35,7 @@ #include "support/lstrings.h" #include +#include using namespace std; using namespace lyx::support; @@ -58,8 +61,8 @@ InsetCitation::~InsetCitation() ParamInfo const & InsetCitation::findInfo(string const & /* cmdName */) { - // standard cite does only take one argument if jurabib is - // not used, but jurabib extends this to two arguments, so + // 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()) { @@ -71,44 +74,11 @@ ParamInfo const & InsetCitation::findInfo(string const & /* cmdName */) } -namespace { - -vector const init_possible_cite_commands() -{ - char const * const possible[] = { - "cite", "nocite", "citet", "citep", "citealt", "citealp", - "citeauthor", "citeyear", "citeyearpar", - "citet*", "citep*", "citealt*", "citealp*", "citeauthor*", - "Citet", "Citep", "Citealt", "Citealp", "Citeauthor", - "Citet*", "Citep*", "Citealt*", "Citealp*", "Citeauthor*", - "fullcite", - "footcite", "footcitet", "footcitep", "footcitealt", - "footcitealp", "footciteauthor", "footciteyear", "footciteyearpar", - "citefield", "citetitle", "cite*" - }; - size_t const size_possible = sizeof(possible) / sizeof(possible[0]); - - return vector(possible, possible + size_possible); -} - - -vector const & possibleCiteCommands() +// We allow any command here, since we fall back to cite +// anyway if a command is not allowed by a style +bool InsetCitation::isCompatibleCommand(string const &) { - static vector const possible = init_possible_cite_commands(); - return possible; -} - - -} // anon namespace - - -// FIXME: use the citeCommands provided by the TextClass -// instead of possibleCiteCommands defined in this file. -bool InsetCitation::isCompatibleCommand(string const & cmd) -{ - vector const & possibles = possibleCiteCommands(); - vector::const_iterator const end = possibles.end(); - return find(possibles.begin(), end, cmd) != end; + return true; } @@ -122,6 +92,29 @@ void InsetCitation::doDispatch(Cursor & cur, FuncRequest & cmd) } +bool InsetCitation::getStatus(Cursor & cur, FuncRequest const & cmd, + FuncStatus & status) const +{ + switch (cmd.action()) { + // Handle the alias case + case LFUN_INSET_MODIFY: + if (cmd.getArg(0) == "changetype") { + string cmdname = getCmdName(); + string const alias = buffer().params().getCiteAlias(cmdname); + if (!alias.empty()) + cmdname = alias; + string const newtype = cmd.getArg(1); + status.setEnabled(isCompatibleCommand(newtype)); + status.setOnOff(newtype == cmdname); + } + status.setEnabled(true); + return true; + default: + return InsetCommand::getStatus(cur, cmd, status); + } +} + + bool InsetCitation::addKey(string const & key) { docstring const ukey = from_utf8(key); @@ -163,52 +156,57 @@ 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); - vector::const_iterator it = keys.begin(); - vector::const_iterator en = keys.end(); + if (keys.size() == 1) + return bi.getInfo(keys[0], buffer(), ci); + docstring tip; - for (; it != en; ++it) { - docstring const key_info = bi.getInfo(*it, buffer()); + tip += "
    "; + for (docstring const & key : keys) { + docstring const key_info = bi.getInfo(key, buffer(), ci); if (key_info.empty()) continue; - if (!tip.empty()) - tip += "\n"; - tip += wrap(key_info, -4); + tip += "
  1. " + key_info + "
    2. "; } + tip += "
"; return tip; } namespace { - -CitationStyle asValidLatexCommand(string const & input, vector const valid_styles) +CitationStyle asValidLatexCommand(BufferParams const & bp, string const & input, + vector const & valid_styles) { CitationStyle cs = valid_styles[0]; cs.forceUpperCase = false; - cs.fullAuthorList = false; - if (!InsetCitation::isCompatibleCommand(input)) - return cs; + cs.hasStarredVersion = false; string normalized_input = input; string::size_type const n = input.size() - 1; - if (input[0] == 'C') - normalized_input[0] = 'c'; + 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.cmd == normalized_input) { + if (this_cs.name == normalized_input) { cs = *it; break; } } - cs.forceUpperCase &= input[0] == 'C'; - cs.fullAuthorList &= input[n] == '*'; + cs.forceUpperCase &= input[0] == uppercase(input[0]); + cs.hasStarredVersion &= input[n] == '*'; return cs; } @@ -255,17 +253,18 @@ 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 (cite_type[0] == 'C') - // If we were going to use them, this would mean ForceUCase - cite_type = string(1, 'c') + cite_type.substr(1); - if (cite_type[cite_type.size() - 1] == '*') - // and this would mean FULL + bool const uppercase = isUpperCase(cite_type[0]); + if (uppercase) + cite_type[0] = lowercase(cite_type[0]); + bool const starred = (cite_type[cite_type.size() - 1] == '*'); + if (starred) cite_type = cite_type.substr(0, cite_type.size() - 1); - docstring const & before = getParam("before"); - docstring const & after = getParam("after"); + // handle alias + string const alias = buf.params().getCiteAlias(cite_type); + if (!alias.empty()) + cite_type = alias; // FIXME: allow to add cite macros /* @@ -273,8 +272,19 @@ docstring InsetCitation::complexLabel(bool for_xhtml) const buffer().params().documentClass().addCiteMacro("!textafter", to_utf8(after)); */ docstring label; - vector const keys = getVectorFromString(key); - label = biblist.getLabel(keys, buffer(), cite_type, for_xhtml, before, after); + vector keys = getVectorFromString(key); + 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; } @@ -312,33 +322,27 @@ void InsetCitation::updateBuffer(ParIterator const &, UpdateType) { if (!cache.recalculate && buffer().citeLabelsValid()) return; - // The label may have changed, so we have to re-create it. docstring const glabel = generateLabel(); - - unsigned int const maxLabelChars = 45; - - docstring label = glabel; - if (label.size() > maxLabelChars) { - label.erase(maxLabelChars - 3); - label += "..."; - } - cache.recalculate = false; cache.generated_label = glabel; - cache.screen_label = label; + unsigned int const maxLabelChars = 45; + cache.screen_label = glabel.substr(0, maxLabelChars + 1); + support::truncateWithEllipsis(cache.screen_label, maxLabelChars); } -void InsetCitation::addToToc(DocIterator const & cpit, bool output_active) const +void InsetCitation::addToToc(DocIterator const & cpit, bool output_active, + UpdateType) const { // NOTE - // XHTML output uses the TOC to collect the citations - // from the document. So if this gets changed, then we - // will need to change how the citations are collected. + // 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"); - Toc & toc = buffer().tocBackend().toc("citation"); - toc.push_back(TocItem(cpit, 0, tocitem, output_active)); + shared_ptr toc = buffer().tocBackend().toc("citation"); + toc->push_back(TocItem(cpit, 0, tocitem, output_active)); } @@ -403,7 +407,7 @@ void InsetCitation::toString(odocstream & os) const } -void InsetCitation::forToc(docstring & os, size_t) const +void InsetCitation::forOutliner(docstring & os, size_t const, bool const) const { os += screenLabel(); } @@ -417,12 +421,12 @@ void InsetCitation::forToc(docstring & os, size_t) const void InsetCitation::latex(otexstream & os, OutputParams const & runparams) const { vector citation_styles = buffer().params().citeStyles(); - CitationStyle cs = asValidLatexCommand(getCmdName(), citation_styles); + CitationStyle cs = asValidLatexCommand(buffer().params(), getCmdName(), citation_styles); BiblioInfo const & bi = buffer().masterBibInfo(); // FIXME UNICODE - docstring const cite_str = from_utf8(citationStyleToString(cs)); + docstring const cite_str = from_utf8(citationStyleToString(cs, true)); - if (runparams.inulemcmd) + if (runparams.inulemcmd > 0) os << "\\mbox{"; os << "\\" << cite_str;