#include "DepTable.h"
#include "Encoding.h"
#include "Language.h"
+#include "LaTeXFeatures.h"
#include "support/debug.h"
#include "support/docstring.h"
void LaTeX::removeAuxiliaryFiles() const
{
- LYXERR(Debug::LATEX, "Removing auxiliary files");
+ LYXERR(Debug::OUTFILE, "Removing auxiliary files");
// Note that we do not always call this function when there is an error.
// For example, if there is an error but an output file is produced we
// still would like to output (export/view) the file.
ind.removeFile();
// nomencl file
- FileName const nls(changeExtension(file.absFileName(), ".nls"));
- nls.removeFile();
-
- // nomencl file (old version of the package)
- FileName const gls(changeExtension(file.absFileName(), ".gls"));
- gls.removeFile();
+ if (LaTeXFeatures::isAvailableAtLeastFrom("nomencl", 2005, 3, 31)) {
+ FileName const nls(changeExtension(file.absFileName(), ".nls"));
+ nls.removeFile();
+ } else if (LaTeXFeatures::isAvailable("nomencl")) {
+ // nomencl file (old version of the package up to v. 4.0)
+ FileName const gls(changeExtension(file.absFileName(), ".gls"));
+ gls.removeFile();
+ }
// endnotes file
FileName const ent(changeExtension(file.absFileName(), ".ent"));
bibtex_info_old = scanAuxFiles(aux_file, runparams.only_childbibs);
++count;
- LYXERR(Debug::LATEX, "Run #" << count);
+ LYXERR(Debug::OUTFILE, "Run #" << count);
message(runMessage(count));
int exit_code = startscript();
scanres = scanLogFile(terr);
if (scanres & ERROR_RERUN) {
- LYXERR(Debug::LATEX, "Rerunning LaTeX");
+ LYXERR(Debug::OUTFILE, "Rerunning LaTeX");
terr.clearErrors();
exit_code = startscript();
if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT)
deplog(head); // reads the latex log
head.update();
+ // Record here (after the first LaTeX run) whether nomencl aux files exist
+ // and have changed.
+ // The programs itself are then launched later after the pagination has settled.
+ FileName const nlofile(changeExtension(file.absFileName(), ".nlo"));
+ // If all nomencl entries are removed, nomencl writes an empty nlo file.
+ // DepTable::hasChanged() returns false in this case, since it does not
+ // distinguish empty files from non-existing files. This is why we need
+ // the extra checks here (to trigger a rerun). Cf. discussions in #8905.
+ // FIXME: Sort out the real problem in DepTable.
+ bool const run_nomencl = head.haschanged(nlofile) || (nlofile.exists() && nlofile.isFileEmpty());
+ bool run_nomencl_glo = false;
+ if (!LaTeXFeatures::isAvailableAtLeastFrom("nomencl", 2005, 3, 31)) {
+ // nomencl package up to v4.0
+ FileName const glofile(changeExtension(file.absFileName(), ".glo"));
+ run_nomencl_glo = head.haschanged(glofile);
+ }
+
// 1
// At this point we must run the bibliography processor if needed.
// First, check if we're using biber instead of bibtex --
// "\bibdata" and/or "\bibstyle". If one of those
// tags is found -> run bibtex and set rerun = true;
// no checks for now
- LYXERR(Debug::LATEX, "Running Bibliography Processor.");
+ LYXERR(Debug::OUTFILE, "Running Bibliography Processor.");
message(_("Running Bibliography Processor."));
updateBibtexDependencies(head, bibtex_info);
int exit_code;
rerun = false;
++count;
LYXERR(Debug::DEPEND, "Dep. file has changed or rerun requested");
- LYXERR(Debug::LATEX, "Run #" << count);
+ LYXERR(Debug::OUTFILE, "Run #" << count);
message(runMessage(count));
int exit_code = startscript();
if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT)
// "\bibdata" and/or "\bibstyle". If one of those
// tags is found -> run bibtex and set rerun = true;
// no checks for now
- LYXERR(Debug::LATEX, "Re-Running Bibliography Processor.");
+ LYXERR(Debug::OUTFILE, "Re-Running Bibliography Processor.");
message(_("Re-Running Bibliography Processor."));
updateBibtexDependencies(head, bibtex_info);
int exit_code;
// After the bibliography was processed, we need more passes of LaTeX
// in order to resolve the citations. We need to do this before the index
// is being generated (since we need the correct pagination, see #2696).
+ // With bibliography environment, another LaTeX run might be needed
+ // as well to resolve citations.
// Also, memoir (at least) writes an empty *idx file in the first place.
// A further latex run is needed in that case as well.
FileName const idxfile(changeExtension(file.absFileName(), ".idx"));
- if (run_bibtex || (idxfile.exists() && idxfile.isFileEmpty())) {
- while ((head.sumchange() || rerun || (scanres & RERUN))
+ if (run_bibtex || (scanres & UNDEF_CIT) || (idxfile.exists() && idxfile.isFileEmpty())) {
+ while ((head.sumchange() || rerun || (scanres & RERUN) || (scanres & UNDEF_CIT))
&& count < MAX_RUN) {
// Yes rerun until message goes away, or until
// MAX_RUNS are reached.
rerun = false;
++count;
- LYXERR(Debug::LATEX, "Run #" << count);
+ LYXERR(Debug::OUTFILE, "Run #" << count);
message(runMessage(count));
startscript();
scanres = scanLogFile(terr);
// Now that we have final pagination, run the index and nomencl processors
if (idxfile.exists()) {
// no checks for now
- LYXERR(Debug::LATEX, "Running Index Processor.");
+ LYXERR(Debug::OUTFILE, "Running Index Processor.");
message(_("Running Index Processor."));
// onlyFileName() is needed for cygwin
int const ret =
iscanres = scanIlgFile(terr);
rerun = true;
}
- FileName const nlofile(changeExtension(file.absFileName(), ".nlo"));
- // If all nomencl entries are removed, nomencl writes an empty nlo file.
- // DepTable::hasChanged() returns false in this case, since it does not
- // distinguish empty files from non-existing files. This is why we need
- // the extra checks here (to trigger a rerun). Cf. discussions in #8905.
- // FIXME: Sort out the real problem in DepTable.
- if (head.haschanged(nlofile) || (nlofile.exists() && nlofile.isFileEmpty())) {
+ if (run_nomencl) {
int const ret = runMakeIndexNomencl(file, ".nlo", ".nls");
if (ret == Systemcall::KILLED || ret == Systemcall::TIMEOUT)
return ret;
rerun = true;
}
- FileName const glofile(changeExtension(file.absFileName(), ".glo"));
- if (head.haschanged(glofile)) {
+ if (run_nomencl_glo) {
int const ret = runMakeIndexNomencl(file, ".glo", ".gls");
if (ret)
return ret;
// MAX_RUNS are reached.
rerun = false;
++count;
- LYXERR(Debug::LATEX, "Run #" << count);
+ LYXERR(Debug::OUTFILE, "Run #" << count);
message(runMessage(count));
startscript();
scanres = scanLogFile(terr);
scanres |= NONZERO_ERROR;
}
- LYXERR(Debug::LATEX, "Done.");
+ LYXERR(Debug::OUTFILE, "Done.");
if (bscanres & ERRORS)
return bscanres; // return on error
tmp = subst(tmp, "$$b", removeExtension(f));
}
- LYXERR(Debug::LATEX,
+ LYXERR(Debug::OUTFILE,
"idx file has been made, running index processor ("
<< tmp << ") on file " << f);
}
if (rp.use_indices) {
tmp = lyxrc.splitindex_command + " -m " + quoteName(tmp);
- LYXERR(Debug::LATEX,
+ LYXERR(Debug::OUTFILE,
"Multiple indices. Using splitindex command: " << tmp);
}
tmp += ' ';
int LaTeX::runMakeIndexNomencl(FileName const & fname,
string const & nlo, string const & nls)
{
- LYXERR(Debug::LATEX, "Running Nomenclature Processor.");
+ LYXERR(Debug::OUTFILE, "Running Nomenclature Processor.");
message(_("Running Nomenclature Processor."));
string tmp = lyxrc.nomencl_command + ' ';
// onlyFileName() is needed for cygwin
void LaTeX::scanAuxFile(FileName const & fname, AuxInfo & aux_info)
{
- LYXERR(Debug::LATEX, "Scanning aux file: " << fname);
+ LYXERR(Debug::OUTFILE, "Scanning aux file: " << fname);
ifstream ifs(fname.toFilesystemEncoding().c_str());
string token;
while (!data.empty()) {
string citation;
data = split(data, citation, ',');
- LYXERR(Debug::LATEX, "Citation: " << citation);
+ LYXERR(Debug::OUTFILE, "Citation: " << citation);
aux_info.citations.insert(citation);
}
} else if (regex_match(token, sub, reg2)) {
string database;
data = split(data, database, ',');
database = changeExtension(database, "bib");
- LYXERR(Debug::LATEX, "BibTeX database: `" << database << '\'');
+ LYXERR(Debug::OUTFILE, "BibTeX database: `" << database << '\'');
aux_info.databases.insert(database);
}
} else if (regex_match(token, sub, reg3)) {
// token is now the style file
// pass it to the helper
style = changeExtension(style, "bst");
- LYXERR(Debug::LATEX, "BibTeX style: `" << style << '\'');
+ LYXERR(Debug::OUTFILE, "BibTeX style: `" << style << '\'');
aux_info.styles.insert(style);
} else if (regex_match(token, sub, reg4)) {
string const file2 = sub.str(1);
int retval = NO_ERRORS;
string tmp =
onlyFileName(changeExtension(file.absFileName(), ".log"));
- LYXERR(Debug::LATEX, "Log file: " << tmp);
+ LYXERR(Debug::OUTFILE, "Log file: " << tmp);
FileName const fn = makeAbsPath(tmp);
// FIXME we should use an ifdocstream here and a docstring for token
// below. The encoding of the log file depends on the _output_ (font)
token = subst(token, "\r", "");
smatch sub;
- LYXERR(Debug::LATEX, "Log line: " << token);
+ LYXERR(Debug::OUTFILE, "Log line: " << token);
if (token.empty())
continue;
// Here shall we handle different
// types of warnings
retval |= LATEX_WARNING;
- LYXERR(Debug::LATEX, "LaTeX Warning.");
+ LYXERR(Debug::OUTFILE, "LaTeX Warning.");
if (contains(token, "Rerun to get cross-references")) {
retval |= RERUN;
- LYXERR(Debug::LATEX, "We should rerun.");
+ LYXERR(Debug::OUTFILE, "We should rerun.");
// package clefval needs 2 latex runs before bibtex
} else if (contains(token, "Value of")
&& contains(token, "on page")
&& contains(token, "undefined")) {
retval |= ERROR_RERUN;
- LYXERR(Debug::LATEX, "Force rerun.");
+ LYXERR(Debug::OUTFILE, "Force rerun.");
// package etaremune
} else if (contains(token, "Etaremune labels have changed")) {
retval |= ERROR_RERUN;
- LYXERR(Debug::LATEX, "Force rerun.");
+ LYXERR(Debug::OUTFILE, "Force rerun.");
// package enotez
} else if (contains(token, "Endnotes may have changed. Rerun")) {
retval |= RERUN;
- LYXERR(Debug::LATEX, "We should rerun.");
+ LYXERR(Debug::OUTFILE, "We should rerun.");
//"Citation `cit' on page X undefined on input line X."
} else if (!runparams.includeall && contains(token, "Citation")
//&& contains(token, "on input line") //often split to newline
contains(token, "Rerun to get")) {
// at least longtable.sty and bibtopic.sty
// might use this.
- LYXERR(Debug::LATEX, "We should rerun.");
+ LYXERR(Debug::OUTFILE, "We should rerun.");
retval |= RERUN;
}
} else if (prefixIs(token, "LETTRE WARNING:")) {
if (contains(token, "veuillez recompiler")) {
// lettre.cls
- LYXERR(Debug::LATEX, "We should rerun.");
+ LYXERR(Debug::OUTFILE, "We should rerun.");
retval |= RERUN;
}
} else if (token[0] == '(') {
if (contains(token, "Rerun LaTeX") ||
contains(token, "Rerun to get")) {
// Used by natbib
- LYXERR(Debug::LATEX, "We should rerun.");
+ LYXERR(Debug::OUTFILE, "We should rerun.");
retval |= RERUN;
}
} else if (prefixIs(token, "! ")
if (prefixIs(token, "! File ended while scanning use of \\Hy@setref@link.")){
// bug 7344. We must rerun LaTeX if hyperref has been toggled.
retval |= ERROR_RERUN;
- LYXERR(Debug::LATEX, "Force rerun.");
+ LYXERR(Debug::OUTFILE, "Force rerun.");
} else {
// bug 6445. At this point its not clear we finish with error.
wait_for_error = desc;
if (prefixIs(token, "! Paragraph ended before \\Hy@setref@link was complete.")){
// bug 7344. We must rerun LaTeX if hyperref has been toggled.
retval |= ERROR_RERUN;
- LYXERR(Debug::LATEX, "Force rerun.");
+ LYXERR(Debug::OUTFILE, "Force rerun.");
}
if (!wait_for_error.empty() && prefixIs(token, "! Emergency stop.")){
if (preamble_error)
// Add a note that the error is to be found in preamble
errstr += "\n" + to_utf8(_("(NOTE: The erroneous command is in the preamble)"));
- LYXERR(Debug::LATEX, "line: " << line << '\n'
- << "Desc: " << desc << '\n' << "Text: " << errstr);
+ LYXERR(Debug::OUTFILE, "line: " << line << '\n'
+ << "Desc: " << desc << '\n' << "Text: " << errstr);
if (line == last_line)
++line_count;
else {
}
}
}
- LYXERR(Debug::LATEX, "Log line: " << token);
+ LYXERR(Debug::OUTFILE, "Log line: " << token);
return retval;
}
int LaTeX::scanBlgFile(DepTable & dep, TeXErrors & terr)
{
FileName const blg_file(changeExtension(file.absFileName(), "blg"));
- LYXERR(Debug::LATEX, "Scanning blg file: " << blg_file);
+ LYXERR(Debug::OUTFILE, "Scanning blg file: " << blg_file);
ifstream ifs(blg_file.toFilesystemEncoding().c_str());
string token;
if (regex_match(token, sub, reg1)) {
string data = sub.str(3);
if (!data.empty()) {
- LYXERR(Debug::LATEX, "Found bib file: " << data);
+ LYXERR(Debug::OUTFILE, "Found bib file: " << data);
handleFoundFile(data, dep);
}
}
int LaTeX::scanIlgFile(TeXErrors & terr)
{
FileName const ilg_file(changeExtension(file.absFileName(), "ilg"));
- LYXERR(Debug::LATEX, "Scanning ilg file: " << ilg_file);
+ LYXERR(Debug::OUTFILE, "Scanning ilg file: " << ilg_file);
ifstream ifs(ilg_file.toFilesystemEncoding().c_str());
string token;
projects / lyx.git / blobdiff