#include <config.h>
-#include "BufferList.h"
#include "LaTeX.h"
+
+#include "Buffer.h"
+#include "BufferList.h"
+#include "BufferParams.h"
#include "LyXRC.h"
#include "LyX.h"
#include "DepTable.h"
#include "Encoding.h"
+#include "Language.h"
#include "support/debug.h"
+#include "support/docstring.h"
#include "support/convert.h"
#include "support/FileName.h"
#include "support/filetools.h"
#include "support/Systemcall.h"
#include "support/os.h"
-#include "support/regex.h"
-
#include <fstream>
+#include <regex>
#include <stack>
void LaTeX::removeAuxiliaryFiles() const
{
+ LYXERR(Debug::LATEX, "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.
}
if (had_depfile) {
+ if (runparams.includeall) {
+ // On an "includeall" call (whose purpose is to set up/maintain counters and references
+ // for includeonly), we remove the master from the dependency list since
+ // (1) it will be checked anyway on the subsequent includeonly run
+ // (2) the master is always changed (due to the \includeonly line), and this alone would
+ // trigger a complete, expensive run each time
+ head.remove_file(file);
+ // Also remove all children which are included
+ Buffer const * buf = theBufferList().getBufferFromTmp(file.absFileName());
+ if (buf && buf->params().maintain_unincluded_children == BufferParams::CM_Mostly) {
+ for (auto const & incfile : buf->params().getIncludedChildren()) {
+ string const incm =
+ DocFileName(changeExtension(makeAbsPath(incfile, path)
+ .absFileName(), ".tex")).mangledFileName();
+ FileName inc = makeAbsPath(incm, file.onlyPath().realPath());
+ head.remove_file(inc);
+ }
+ }
+ }
// Update the checksums
head.update();
// Can't just check if anything has changed because it might
message(runMessage(count));
int exit_code = startscript();
- if (exit_code == Systemcall::KILLED)
- return Systemcall::KILLED;
+ if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT)
+ return exit_code;
scanres = scanLogFile(terr);
if (scanres & ERROR_RERUN) {
LYXERR(Debug::LATEX, "Rerunning LaTeX");
terr.clearErrors();
exit_code = startscript();
- if (exit_code == Systemcall::KILLED)
- return Systemcall::KILLED;
+ if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT)
+ return exit_code;
scanres = scanLogFile(terr);
}
// onlyFileName() is needed for cygwin
int const ret =
runMakeIndex(onlyFileName(idxfile.absFileName()), runparams);
- if (ret == Systemcall::KILLED)
- return Systemcall::KILLED;
+ if (ret == Systemcall::KILLED || ret == Systemcall::TIMEOUT)
+ return ret;
FileName const ilgfile(changeExtension(file.absFileName(), ".ilg"));
if (ilgfile.exists())
iscanres = scanIlgFile(terr);
// FIXME: Sort out the real problem in DepTable.
if (head.haschanged(nlofile) || (nlofile.exists() && nlofile.isFileEmpty())) {
int const ret = runMakeIndexNomencl(file, ".nlo", ".nls");
- if (ret == Systemcall::KILLED)
- return Systemcall::KILLED;
+ if (ret == Systemcall::KILLED || ret == Systemcall::TIMEOUT)
+ return ret;
rerun = true;
}
// run bibtex
// if (scanres & UNDEF_CIT || scanres & RERUN || run_bibtex)
- if (scanres & UNDEF_CIT || run_bibtex) {
+ // We do not run bibtex/biber on an "includeall" call (whose purpose is
+ // to set up/maintain counters and references for includeonly) since
+ // (1) bibliographic references will be updated on the subsequent includeonly run
+ // (2) this would trigger a complete run each time (as references in non-included
+ // children are removed on subsequent includeonly runs)
+ if (!runparams.includeall && (scanres & UNDEF_CIT || run_bibtex)) {
// Here we must scan the .aux file and look for
// "\bibdata" and/or "\bibstyle". If one of those
// tags is found -> run bibtex and set rerun = true;
updateBibtexDependencies(head, bibtex_info);
int exit_code;
rerun |= runBibTeX(bibtex_info, runparams, exit_code);
- if (exit_code == Systemcall::KILLED)
- return Systemcall::KILLED;
+ if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT)
+ return exit_code;
FileName const blgfile(changeExtension(file.absFileName(), ".blg"));
if (blgfile.exists())
bscanres = scanBlgFile(head, terr);
LYXERR(Debug::LATEX, "Run #" << count);
message(runMessage(count));
int exit_code = startscript();
- if (exit_code == Systemcall::KILLED)
- return Systemcall::KILLED;
+ if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT)
+ return exit_code;
scanres = scanLogFile(terr);
// update the depedencies
// rerun bibtex?
// Complex bibliography packages such as Biblatex require
// an additional bibtex cycle sometimes.
- if (scanres & UNDEF_CIT) {
+ // We do not run bibtex/biber on an "includeall" call (whose purpose is
+ // to set up/maintain counters and references for includeonly) since
+ // (1) bibliographic references will be updated on the subsequent includeonly run
+ // (2) this would trigger a complete run each time (as references in non-included
+ // children are removed on subsequent includeonly runs)
+ if (!runparams.includeall && scanres & UNDEF_CIT) {
// Here we must scan the .aux file and look for
// "\bibdata" and/or "\bibstyle". If one of those
// tags is found -> run bibtex and set rerun = true;
updateBibtexDependencies(head, bibtex_info);
int exit_code;
rerun |= runBibTeX(bibtex_info, runparams, exit_code);
- if (exit_code == Systemcall::KILLED)
- return Systemcall::KILLED;
+ if (exit_code == Systemcall::KILLED || exit_code == Systemcall::TIMEOUT)
+ return exit_code;
FileName const blgfile(changeExtension(file.absFileName(), ".blg"));
if (blgfile.exists())
bscanres = scanBlgFile(head, terr);
// onlyFileName() is needed for cygwin
int const ret = runMakeIndex(onlyFileName(changeExtension(
file.absFileName(), ".idx")), runparams);
- if (ret == Systemcall::KILLED)
- return Systemcall::KILLED;
+ if (ret == Systemcall::KILLED || ret == Systemcall::TIMEOUT)
+ return ret;
FileName const ilgfile(changeExtension(file.absFileName(), ".ilg"));
if (ilgfile.exists())
iscanres = scanIlgFile(terr);
if (!rp.index_command.empty())
tmp = rp.index_command;
+
+ Language const * doc_lang = languages.getLanguage(rp.document_language);
if (contains(tmp, "$$x")) {
// This adds appropriate [te]xindy options
// such as language and codepage (for the
- // main document language/encoding)
- string xdyopts = rp.xindy_language;
+ // main document language/encoding) as well
+ // as input markup (latex or xelatex)
+ string xdyopts = doc_lang ? doc_lang->xindy() : string();
if (!xdyopts.empty())
xdyopts = "-L " + xdyopts;
- if (rp.encoding->iconvName() == "UTF-8") {
+ if (rp.isFullUnicode() && rp.encoding->package() == Encoding::none) {
+ if (!xdyopts.empty())
+ xdyopts += " ";
+ // xelatex includes lualatex
+ xdyopts += "-I xelatex";
+ }
+ else if (rp.encoding->iconvName() == "UTF-8") {
+ if (!xdyopts.empty())
+ xdyopts += " ";
+ // -I not really needed for texindy, but for xindy
+ xdyopts += "-C utf8 -I latex";
+ }
+ else {
if (!xdyopts.empty())
xdyopts += " ";
- xdyopts += "-C utf8";
+ // not really needed for texindy, but for xindy
+ xdyopts += "-I latex";
}
tmp = subst(tmp, "$$x", xdyopts);
}
"idx file has been made, running index processor ("
<< tmp << ") on file " << f);
- tmp = subst(tmp, "$$lang", rp.document_language);
+ if (doc_lang) {
+ tmp = subst(tmp, "$$lang", doc_lang->babel());
+ tmp = subst(tmp, "$$lcode", doc_lang->code());
+ }
if (rp.use_indices) {
tmp = lyxrc.splitindex_command + " -m " + quoteName(tmp);
LYXERR(Debug::LATEX,
bool fle_style = false;
static regex const file_line_error(".+\\.\\D+:[0-9]+: (.+)");
static regex const child_file("[^0-9]*([0-9]+[A-Za-z]*_.+\\.tex).*");
+ static regex const undef_ref(".*Reference `(\\w+)\\' on page.*");
// Flag for 'File ended while scanning' message.
// We need to wait for subsequent processing.
string wait_for_error;
terr.clearRefs();
string token;
+ string ml_token;
while (getline(ifs, token)) {
// MikTeX sometimes inserts \0 in the log file. They can't be
// removed directly with the existing string utility
if (token.empty())
continue;
+ if (!ml_token.empty())
+ ml_token += token;
+
// Track child documents
for (size_t i = 0; i < token.length(); ++i) {
if (token[i] == '(') {
//TODO: TL 2020 engines will contain new commandline switch --cnf-line which we
//can use to set max_print_line variable for appropriate length and detect all
//errors correctly.
- if (contains(token, "There were undefined citations.") ||
- prefixIs(token, "Package biblatex Warning: The following entry could not be found"))
+ if (!runparams.includeall && (contains(token, "There were undefined citations.") ||
+ prefixIs(token, "Package biblatex Warning: The following entry could not be found")))
retval |= UNDEF_CIT;
- if (prefixIs(token, "LaTeX Warning:") ||
- prefixIs(token, "! pdfTeX warning")) {
+ if (prefixIs(token, "LaTeX Warning:")
+ || prefixIs(token, "! pdfTeX warning")
+ || prefixIs(ml_token, "LaTeX Warning:")
+ || prefixIs(ml_token, "! pdfTeX warning")) {
// Here shall we handle different
// types of warnings
retval |= LATEX_WARNING;
retval |= RERUN;
LYXERR(Debug::LATEX, "We should rerun.");
//"Citation `cit' on page X undefined on input line X."
- } else if (contains(token, "Citation")
+ } else if (!runparams.includeall && contains(token, "Citation")
//&& contains(token, "on input line") //often split to newline
&& contains(token, "undefined")) {
retval |= UNDEF_CIT;
terr.insertRef(getLineNumber(token), from_ascii("Citation undefined"),
from_utf8(token), child_name);
//"Reference `X' on page Y undefined on input line Z."
- } else if (contains(token, "Reference")
- //&& contains(token, "on input line")) //often split to new line
+ // This warning might be broken accross multiple lines with long labels.
+ // Thus we check that
+ } else if (contains(token, "Reference `") && !contains(token, "on input line")) {
+ // Rest of warning in next line(s)
+ // Save to ml_token
+ ml_token = token;
+ } else if (!ml_token.empty() && contains(ml_token, "Reference `")
+ && !contains(ml_token, "on input line")) {
+ // not finished yet. Continue with next line.
+ continue;
+ } else if (!ml_token.empty() && contains(ml_token, "Reference `")
+ && contains(ml_token, "on input line")) {
+ // We have collected the whole warning now.
+ if (!contains(ml_token, "undefined")) {
+ // Not the warning we are looking for
+ ml_token.clear();
+ continue;
+ }
+ if (regex_match(ml_token, sub, undef_ref)) {
+ string const ref = sub.str(1);
+ Buffer const * buf = theBufferList().getBufferFromTmp(file.absFileName());
+ if (!buf || !buf->masterBuffer()->activeLabel(from_utf8(ref))) {
+ terr.insertRef(getLineNumber(ml_token), from_ascii("Reference undefined"),
+ from_utf8(ml_token), child_name);
+ retval |= UNDEF_UNKNOWN_REF;
+ }
+ }
+ ml_token.clear();
+ retval |= UNDEF_REF;
+ } else if (contains(token, "Reference `")
+ && contains(token, "on input line")
&& contains(token, "undefined")) {
+ if (regex_match(token, sub, undef_ref)) {
+ string const ref = sub.str(1);
+ Buffer const * buf = theBufferList().getBufferFromTmp(file.absFileName());
+ if (!buf || !buf->masterBuffer()->activeLabel(from_utf8(ref))) {
+ terr.insertRef(getLineNumber(token), from_ascii("Reference undefined"),
+ from_utf8(token), child_name);
+ retval |= UNDEF_UNKNOWN_REF;
+ }
+ }
retval |= UNDEF_REF;
- terr.insertRef(getLineNumber(token), from_ascii("Reference undefined"),
- from_utf8(token), child_name);
-
- //If label is too long pdlaftex log line splitting will make the above fail
- //so we catch at least this generic statement occuring for both CIT & REF.
- } else if (contains(token, "There were undefined references.")) {
+ // In case the above checks fail we catch at least this generic statement
+ // occuring for both CIT & REF.
+ } else if (!runparams.includeall && contains(token, "There were undefined references.")) {
if (!(retval & UNDEF_CIT)) //if not handled already
- retval |= UNDEF_REF;
+ retval |= UNDEF_REF;
}
} else if (prefixIs(token, "Package")) {
retval |= PACKAGE_WARNING;
if (contains(token, "natbib Warning:")) {
// Natbib warnings
- if (contains(token, "Citation")
+ if (!runparams.includeall
+ && contains(token, "Citation")
&& contains(token, "on page")
&& contains(token, "undefined")) {
retval |= UNDEF_CIT;
terr.insertRef(getLineNumber(token), from_ascii("Citation undefined"),
from_utf8(token), child_name);
}
- } else if (contains(token, "run BibTeX")) {
+ } else if (!runparams.includeall && contains(token, "run BibTeX")) {
retval |= UNDEF_CIT;
- } else if (contains(token, "run Biber")) {
+ } else if (!runparams.includeall && contains(token, "run Biber")) {
retval |= UNDEF_CIT;
biber = true;
} else if (contains(token, "Rerun LaTeX") ||
// get the next line
int count = 0;
+ // We also collect intermediate lines
+ // This is needed for errors in preamble
+ string intermediate;
do {
if (!getline(ifs, tmp))
break;
tmp = rtrim(tmp, "\r");
+ if (!prefixIs(tmp, "l."))
+ intermediate += tmp;
// 15 is somewhat arbitrarily chosen, based on practice.
// We used 10 for 14 years and increased it to 15 when we
// saw one case.
sscanf(tmp.c_str(), "l.%d", &line);
// get the rest of the message:
string errstr(tmp, tmp.find(' '));
+ bool preamble_error = false;
+ if (suffixIs(errstr, "\\begin{document}")) {
+ // this is an error in preamble
+ // the real error is in the
+ // intermediate lines
+ errstr = intermediate;
+ tmp = intermediate;
+ preamble_error = true;
+ }
errstr += '\n';
getline(ifs, tmp);
tmp = rtrim(tmp, "\r");
getline(ifs, tmp);
tmp = rtrim(tmp, "\r");
}
+ 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);
if (line == last_line)
retval |= TEX_WARNING;
} else if (prefixIs(token, "Underfull ")) {
retval |= TEX_WARNING;
- } else if (contains(token, "Rerun to get citations")) {
+ } else if (!runparams.includeall && contains(token, "Rerun to get citations")) {
// Natbib seems to use this.
retval |= UNDEF_CIT;
} else if (contains(token, "No pages of output")
} else if (regex_match(token, sub, biberError)) {
retval |= BIBTEX_ERROR;
string errstr = N_("Biber error: ") + sub.str(2);
- string msg = token;
terr.insertError(0,
from_local8bit(errstr),
- from_local8bit(msg));
+ from_local8bit(token));
}
prevtoken = token;
}
string prevtoken;
while (getline(ifs, token)) {
token = rtrim(token, "\r");
- smatch sub;
if (prefixIs(token, "!! "))
prevtoken = token;
else if (!prevtoken.empty()) {
} else if (prefixIs(token, "ERROR: ")) {
retval |= BIBTEX_ERROR;
string errstr = N_("Xindy error: ") + token.substr(6);
- string msg = token;
terr.insertError(0,
from_local8bit(errstr),
- from_local8bit(msg));
+ from_local8bit(token));
}
}
return retval;
projects / lyx.git / blobdiff