X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetCitation.cpp;h=859ceba81f4e050b65cb2c9f4c3b78dd3888c0c4;hb=0c68af937aabad17f06085f80c142065a773b216;hp=260bd41bf23aef70e81c2d1524ca8bdff70c2d61;hpb=0cb39e6f8b5f48a2da892f0f515e8ccfd7aa5921;p=lyx.git diff --git a/src/insets/InsetCitation.cpp b/src/insets/InsetCitation.cpp index 260bd41bf2..859ceba81f 100644 --- a/src/insets/InsetCitation.cpp +++ b/src/insets/InsetCitation.cpp @@ -17,7 +17,6 @@ #include "buffer_funcs.h" #include "BufferParams.h" #include "DispatchResult.h" -#include "EmbeddedFiles.h" #include "FuncRequest.h" #include "LaTeXFeatures.h" #include "ParIterator.h" @@ -25,6 +24,7 @@ #include "support/debug.h" #include "support/docstream.h" +#include "support/FileNameList.h" #include "support/gettext.h" #include "support/lstrings.h" @@ -64,28 +64,28 @@ vector const & possibleCiteCommands() // FIXME See the header for the issue. -string defaultCiteCommand(biblio::CiteEngine engine) +string defaultCiteCommand(CiteEngine engine) { string str; switch (engine) { - case biblio::ENGINE_BASIC: + case ENGINE_BASIC: str = "cite"; break; - case biblio::ENGINE_NATBIB_AUTHORYEAR: + case ENGINE_NATBIB_AUTHORYEAR: str = "citet"; break; - case biblio::ENGINE_NATBIB_NUMERICAL: + case ENGINE_NATBIB_NUMERICAL: str = "citep"; break; - case biblio::ENGINE_JURABIB: + case ENGINE_JURABIB: str = "cite"; break; } return str; } - -string asValidLatexCommand(string const & input, biblio::CiteEngine const engine) + +string asValidLatexCommand(string const & input, CiteEngine const engine) { string const default_str = defaultCiteCommand(engine); if (!InsetCitation::isCompatibleCommand(input)) @@ -93,14 +93,17 @@ string asValidLatexCommand(string const & input, biblio::CiteEngine const engine string output; switch (engine) { - case biblio::ENGINE_BASIC: - output = input; + case ENGINE_BASIC: + if (input == "nocite") + output = input; + else + output = default_str; break; - case biblio::ENGINE_NATBIB_AUTHORYEAR: - case biblio::ENGINE_NATBIB_NUMERICAL: - if (input == "cite" || input == "citefield" || - input == "citetitle" || input == "cite*") + case ENGINE_NATBIB_AUTHORYEAR: + case ENGINE_NATBIB_NUMERICAL: + if (input == "cite" || input == "citefield" + || input == "citetitle" || input == "cite*") output = default_str; else if (prefixIs(input, "foot")) output = input.substr(4); @@ -108,7 +111,7 @@ string asValidLatexCommand(string const & input, biblio::CiteEngine const engine output = input; break; - case biblio::ENGINE_JURABIB: { + case ENGINE_JURABIB: { // Jurabib does not support the 'uppercase' natbib style. if (input[0] == 'C') output = string(1, 'c') + input.substr(1); @@ -131,43 +134,13 @@ string asValidLatexCommand(string const & input, biblio::CiteEngine const engine docstring complexLabel(Buffer const & buffer, string const & citeType, docstring const & keyList, docstring const & before, docstring const & after, - biblio::CiteEngine engine) + CiteEngine engine) { // Only start the process off after the buffer is loaded from file. if (!buffer.isFullyLoaded()) return docstring(); - // Cache the labels - typedef map CachedMap; - static CachedMap cached_keys; - - // and cache the timestamp of the bibliography files. - static map bibfileStatus; - - BiblioInfo biblist; - - EmbeddedFileList const & bibfilesCache = buffer.getBibfilesCache(); - // compare the cached timestamps with the actual ones. - bool changed = false; - for (EmbeddedFileList::const_iterator it = bibfilesCache.begin(); - it != bibfilesCache.end(); ++ it) { - FileName const f = *it; - time_t lastw = f.lastModified(); - if (lastw != bibfileStatus[f]) { - changed = true; - bibfileStatus[f] = lastw; - } - } - - // build the list only if the bibfiles have been changed - if (cached_keys[&buffer].empty() || bibfileStatus.empty() || changed) { - biblist.fillWithBibKeys(&buffer); - cached_keys[&buffer] = biblist; - } else { - // use the cached keys - biblist = cached_keys[&buffer]; - } - + BiblioInfo const & biblist = buffer.masterBibInfo(); if (biblist.empty()) return docstring(); @@ -222,7 +195,7 @@ docstring complexLabel(Buffer const & buffer, // One day, these might be tunable (as they are in BibTeX). char op, cp; // opening and closing parenthesis. char * sep; // punctuation mark separating citation entries. - if (engine == biblio::ENGINE_BASIC) { + if (engine == ENGINE_BASIC) { op = '['; cp = ']'; sep = ","; @@ -252,9 +225,9 @@ docstring complexLabel(Buffer const & buffer, // authors1/; ... ; // authors_last, if (cite_type == "cite") { - if (engine == biblio::ENGINE_BASIC) { + if (engine == ENGINE_BASIC) { label += *it + sep_str; - } else if (engine == biblio::ENGINE_JURABIB) { + } else if (engine == ENGINE_JURABIB) { if (it == keys.begin()) label += author + before_str + sep_str; else @@ -269,25 +242,25 @@ docstring complexLabel(Buffer const & buffer, // authors_last ( year, ) } else if (cite_type == "citet") { switch (engine) { - case biblio::ENGINE_NATBIB_AUTHORYEAR: + case ENGINE_NATBIB_AUTHORYEAR: label += author + op_str + before_str + year + cp + sep_str; break; - case biblio::ENGINE_NATBIB_NUMERICAL: + case ENGINE_NATBIB_NUMERICAL: label += author + op_str + before_str + '#' + *it + cp + sep_str; break; - case biblio::ENGINE_JURABIB: + case ENGINE_JURABIB: label += before_str + author + op_str + year + cp + sep_str; break; - case biblio::ENGINE_BASIC: + case ENGINE_BASIC: break; } // author, year; author, year; ... } else if (cite_type == "citep" || cite_type == "citealp") { - if (engine == biblio::ENGINE_NATBIB_NUMERICAL) { + if (engine == ENGINE_NATBIB_NUMERICAL) { label += *it + sep_str; } else { label += author + ", " + year + sep_str; @@ -297,18 +270,18 @@ docstring complexLabel(Buffer const & buffer, // authors_last year, ) } else if (cite_type == "citealt") { switch (engine) { - case biblio::ENGINE_NATBIB_AUTHORYEAR: + case ENGINE_NATBIB_AUTHORYEAR: label += author + ' ' + before_str + year + sep_str; break; - case biblio::ENGINE_NATBIB_NUMERICAL: + case ENGINE_NATBIB_NUMERICAL: label += author + ' ' + before_str + '#' + *it + sep_str; break; - case biblio::ENGINE_JURABIB: + case ENGINE_JURABIB: label += before_str + author + ' ' + year + sep_str; break; - case biblio::ENGINE_BASIC: + case ENGINE_BASIC: break; } @@ -330,7 +303,7 @@ docstring complexLabel(Buffer const & buffer, label.insert(label.size() - 1, after_str); } else { bool const add = - !(engine == biblio::ENGINE_NATBIB_NUMERICAL && + !(engine == ENGINE_NATBIB_NUMERICAL && (cite_type == "citeauthor" || cite_type == "citeyear")); if (add) @@ -345,7 +318,7 @@ docstring complexLabel(Buffer const & buffer, } if (cite_type == "citep" || cite_type == "citeyearpar" || - (cite_type == "cite" && engine == biblio::ENGINE_BASIC) ) + (cite_type == "cite" && engine == ENGINE_BASIC) ) label = op + label + cp; return label; @@ -415,7 +388,7 @@ docstring InsetCitation::generateLabel() const docstring const after = getParam("after"); docstring label; - biblio::CiteEngine const engine = buffer().params().citeEngine(); + CiteEngine const engine = buffer().params().citeEngine(); label = complexLabel(buffer(), getCmdName(), getParam("key"), before, after, engine); @@ -435,7 +408,7 @@ docstring InsetCitation::screenLabel() const void InsetCitation::updateLabels(ParIterator const &) { - biblio::CiteEngine const engine = buffer().params().citeEngine(); + CiteEngine const engine = buffer().params().citeEngine(); if (cache.params == params() && cache.engine == engine) return; @@ -457,7 +430,7 @@ void InsetCitation::updateLabels(ParIterator const &) } -void InsetCitation::addToToc(ParConstIterator const & cpit) const +void InsetCitation::addToToc(DocIterator const & cpit) { Toc & toc = buffer().tocBackend().toc("citation"); toc.push_back(TocItem(cpit, 0, cache.screen_label)); @@ -510,7 +483,7 @@ void InsetCitation::textString(odocstream & os) const // should revert to \cite[]{} int InsetCitation::latex(odocstream & os, OutputParams const &) const { - biblio::CiteEngine cite_engine = buffer().params().citeEngine(); + CiteEngine cite_engine = buffer().params().citeEngine(); // FIXME UNICODE docstring const cite_str = from_utf8( asValidLatexCommand(getCmdName(), cite_engine)); @@ -519,7 +492,7 @@ int InsetCitation::latex(odocstream & os, OutputParams const &) const docstring const & before = getParam("before"); docstring const & after = getParam("after"); - if (!before.empty() && cite_engine != biblio::ENGINE_BASIC) + if (!before.empty() && cite_engine != ENGINE_BASIC) os << '[' << before << "][" << after << ']'; else if (!after.empty()) os << '[' << after << ']'; @@ -533,17 +506,23 @@ int InsetCitation::latex(odocstream & os, OutputParams const &) const void InsetCitation::validate(LaTeXFeatures & features) const { switch (features.bufferParams().citeEngine()) { - case biblio::ENGINE_BASIC: + case ENGINE_BASIC: break; - case biblio::ENGINE_NATBIB_AUTHORYEAR: - case biblio::ENGINE_NATBIB_NUMERICAL: + case ENGINE_NATBIB_AUTHORYEAR: + case ENGINE_NATBIB_NUMERICAL: features.require("natbib"); break; - case biblio::ENGINE_JURABIB: + case ENGINE_JURABIB: features.require("jurabib"); break; } } +docstring InsetCitation::contextMenu(BufferView const &, int, int) const +{ + return from_ascii("context-citation"); +} + + } // namespace lyx