Author: spitz
Date: Fri Oct 7 15:48:59 2011
New Revision: 39817
URL: http://www.lyx.org/trac/changeset/39817
Log:
Fix biber execution om MikTeX.
Modified:
lyx-devel/branches/BRANCH_2_0_X/src/LaTeX.cpp
lyx-devel/branches/BRANCH_2_0_X/src/LaTeX.h
lyx-devel/branches/BRANCH_2_0_X/status.20x
Modified: lyx-devel/branches/BRANCH_2_0_X/src/LaTeX.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/LaTeX.cpp Fri Oct 7 10:21:31
2011 (r39816)
+++ lyx-devel/branches/BRANCH_2_0_X/src/LaTeX.cpp Fri Oct 7 15:48:59
2011 (r39817)
@@ -279,7 +279,7 @@
// biber writes no info to the aux file, so we just check
// if a bcf file exists (and if it was updated)
FileName const bcffile(changeExtension(file.absFileName(), ".bcf"));
- bool const biber = head.exist(bcffile);
+ biber |= head.exist(bcffile);
// run bibtex
// if (scanres & UNDEF_CIT || scanres & RERUN || run_bibtex)
@@ -290,8 +290,8 @@
// no checks for now
LYXERR(Debug::LATEX, "Running BibTeX.");
message(_("Running BibTeX."));
- updateBibtexDependencies(head, bibtex_info, biber);
- rerun |= runBibTeX(bibtex_info, runparams, biber);
+ updateBibtexDependencies(head, bibtex_info);
+ rerun |= runBibTeX(bibtex_info, runparams);
if (biber) {
// since biber writes no info to the aux file, we have
// to parse the blg file (which only exists after biber
@@ -304,7 +304,7 @@
/// 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
/// insert the .bib and .bst files into the .dep-pdf file.
- updateBibtexDependencies(head, bibtex_info, biber);
+ updateBibtexDependencies(head, bibtex_info);
}
// 2
@@ -350,8 +350,8 @@
// no checks for now
LYXERR(Debug::LATEX, "Running BibTeX.");
message(_("Running BibTeX."));
- updateBibtexDependencies(head, bibtex_info, biber);
- rerun |= runBibTeX(bibtex_info, runparams, biber);
+ updateBibtexDependencies(head, bibtex_info);
+ rerun |= runBibTeX(bibtex_info, runparams);
}
// 4
@@ -550,8 +550,7 @@
void LaTeX::updateBibtexDependencies(DepTable & dep,
- vector<AuxInfo> const & bibtex_info,
- bool biber)
+ vector<AuxInfo> const & bibtex_info)
{
// Since a run of Bibtex mandates more latex runs it is ok to
// remove all ".bib" and ".bst" files.
@@ -585,7 +584,7 @@
bool LaTeX::runBibTeX(vector<AuxInfo> const & bibtex_info,
- OutputParams const & runparams, bool biber)
+ OutputParams const & runparams)
{
bool result = false;
for (vector<AuxInfo>::const_iterator it = bibtex_info.begin();
@@ -708,6 +707,9 @@
}
} else if (contains(token, "run BibTeX")) {
retval |= UNDEF_CIT;
+ } else if (contains(token, "run Biber")) {
+ retval |= UNDEF_CIT;
+ biber = true;
} else if (contains(token, "Rerun LaTeX") ||
contains(token, "Please rerun LaTeX") ||
contains(token, "Rerun to get")) {
Modified: lyx-devel/branches/BRANCH_2_0_X/src/LaTeX.h
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/src/LaTeX.h Fri Oct 7 10:21:31 2011
(r39816)
+++ lyx-devel/branches/BRANCH_2_0_X/src/LaTeX.h Fri Oct 7 15:48:59 2011
(r39817)
@@ -192,15 +192,14 @@
///
void updateBibtexDependencies(DepTable &,
- std::vector<AuxInfo> const &,
- bool biber);
+ std::vector<AuxInfo> const &);
///
void scanBlgFile(DepTable & head);
///
bool runBibTeX(std::vector<AuxInfo> const &,
- OutputParams const &, bool biber);
+ OutputParams const &);
///
void deleteFilesOnError() const;
@@ -222,6 +221,9 @@
///
OutputParams runparams;
+
+ /// Do we use biber?
+ bool biber;
};
Modified: lyx-devel/branches/BRANCH_2_0_X/status.20x
==============================================================================
--- lyx-devel/branches/BRANCH_2_0_X/status.20x Fri Oct 7 10:21:31 2011
(r39816)
+++ lyx-devel/branches/BRANCH_2_0_X/status.20x Fri Oct 7 15:48:59 2011
(r39817)
@@ -69,6 +69,8 @@
* DOCUMENT INPUT/OUTPUT
+- Fix execution of biber with MikTeX.
+
- Fix output of multirow table cell borders (bug 7578).
- Fix ASCII export for branch inset (bug 7720).
