// 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))
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);
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);
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<Buffer const *, BiblioInfo> CachedMap;
- static CachedMap cached_keys;
-
- // and cache the timestamp of the bibliography files.
- static map<FileName, time_t> bibfileStatus;
-
- BiblioInfo biblist;
-
- support::FileNameList const & bibfilesCache = buffer.getBibfilesCache();
- // compare the cached timestamps with the actual ones.
- bool changed = false;
- support::FileNameList::const_iterator ei = bibfilesCache.begin();
- support::FileNameList::const_iterator en = bibfilesCache.end();
- for (; ei != en; ++ ei) {
- time_t lastw = ei->lastModified();
- if (lastw != bibfileStatus[*ei]) {
- changed = true;
- bibfileStatus[*ei] = 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();
// 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 = ",";
// authors1/<before>; ... ;
// authors_last, <after>
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
// authors_last (<before> year, <after>)
} 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;
// authors_last <before> year, <after>)
} 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;
}
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)
}
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;
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);
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;
}
-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));
// 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));
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 << ']';
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
projects / lyx.git / blobdiff