FileName const bbl(changeExtension(file.absFileName(), ".bbl"));
bbl.removeFile();
+ // biber file
+ FileName const bcf(changeExtension(file.absFileName(), ".bcf"));
+ bcf.removeFile();
+
// makeindex file
FileName const ind(changeExtension(file.absFileName(), ".ind"));
ind.removeFile();
LYXERR(Debug::DEPEND, "Dependency file has changed");
}
- if (head.extchanged(".bib") || head.extchanged(".bst"))
+ if (head.extchanged(".bib") || head.extchanged(".bst")
+ || head.extchanged(".bcf"))
run_bibtex = true;
} else
LYXERR(Debug::DEPEND,
if (head.haschanged(glofile))
rerun |= runMakeIndexNomencl(file, ".glo", ".gls");
+ // check if we're using biber instead of bibtex
+ // biber writes no info to the aux file, so we just check
+ // if a bcf file exists (and, above, if it was updated)
+ FileName const bcffile(changeExtension(file.absFileName(), ".bcf"));
+ bool const biber = bcffile.exists();
+
// run bibtex
// if (scanres & UNDEF_CIT || scanres & RERUN || run_bibtex)
if (scanres & UNDEF_CIT || run_bibtex) {
LYXERR(Debug::LATEX, "Running BibTeX.");
message(_("Running BibTeX."));
updateBibtexDependencies(head, bibtex_info);
- rerun |= runBibTeX(bibtex_info, runparams);
+ rerun |= runBibTeX(bibtex_info, runparams, biber);
} else if (!had_depfile) {
/// If we run pdflatex on the file after running latex on it,
/// then we do not need to run bibtex, but we do need to
LYXERR(Debug::LATEX, "Running BibTeX.");
message(_("Running BibTeX."));
updateBibtexDependencies(head, bibtex_info);
- rerun |= runBibTeX(bibtex_info, runparams);
+ rerun |= runBibTeX(bibtex_info, runparams, biber);
}
// 4
bool LaTeX::runBibTeX(vector<AuxInfo> const & bibtex_info,
- OutputParams const & runparams)
+ OutputParams const & runparams, bool biber)
{
bool result = false;
for (vector<AuxInfo>::const_iterator it = bibtex_info.begin();
it != bibtex_info.end(); ++it) {
- if (it->databases.empty())
+ if (!biber && it->databases.empty())
continue;
result = true;
&& contains(token, "undefined")) {
retval |= ERROR_RERUN;
LYXERR(Debug::LATEX, "Force rerun.");
+ // package etaremune
+ } else if (contains(token, "Etaremune labels have changed")) {
+ retval |= ERROR_RERUN;
+ LYXERR(Debug::LATEX, "Force rerun.");
} else if (contains(token, "Citation")
&& contains(token, "on page")
&& contains(token, "undefined")) {
string lastline;
while (ifs) {
// Ok, the scanning of files here is not sufficient.
- // Sometimes files are named by "File:Â xxx" only
+ // Sometimes files are named by "File:� xxx" only
// So I think we should use some regexps to find files instead.
// Note: all file names and paths might contains spaces.
bool found_file = false;
// However, ...
if (suffixIs(token, ")"))
// no line break for sure
- // pretend we've been succesfully searching
+ // pretend we've been successfully searching
found_file = true;
// (2) "No file file.ext"
} else if (regex_match(token, sub, reg2)) {
file.absFileName(), ".toc")), head);
else
// not found, but we won't check further
- // pretend we've been succesfully searching
+ // pretend we've been successfully searching
found_file = true;
// (8) "(file.ext"
// we have a closing bracket, so the content
// is not a file name.
// no need to investigate further
- // pretend we've been succesfully searching
+ // pretend we've been successfully searching
first = what[0].second;
found_file = true;
}