#include "BufferList.h"
#include "LaTeX.h"
#include "LyXRC.h"
+#include "LyX.h"
#include "DepTable.h"
#include "support/debug.h"
return bformat(_("Waiting for LaTeX run number %1$d"), count);
}
-} // anon namespace
+} // namespace
/*
* CLASS TEXERRORS
/// in which case we will not need to run bibtex again.
vector<AuxInfo> bibtex_info_old;
if (!run_bibtex)
- bibtex_info_old = scanAuxFiles(aux_file);
+ bibtex_info_old = scanAuxFiles(aux_file, runparams.only_childbibs);
++count;
LYXERR(Debug::LATEX, "Run #" << count);
scanres = scanLogFile(terr);
}
- vector<AuxInfo> const bibtex_info = scanAuxFiles(aux_file);
+ vector<AuxInfo> const bibtex_info = scanAuxFiles(aux_file, runparams.only_childbibs);
if (!run_bibtex && bibtex_info_old != bibtex_info)
run_bibtex = true;
} else {
LYXERR(Debug::DEPEND, "Dep. file has NOT changed");
}
-
+
// 3
// rerun bibtex?
// Complex bibliography packages such as Biblatex require
{
string tmp = runparams.use_japanese ?
lyxrc.jindex_command : lyxrc.index_command;
-
+
if (!runparams.index_command.empty())
tmp = runparams.index_command;
vector<AuxInfo> const
-LaTeX::scanAuxFiles(FileName const & file)
+LaTeX::scanAuxFiles(FileName const & file, bool const only_childbibs)
{
vector<AuxInfo> result;
+ // With chapterbib, we have to bibtex all children's aux files
+ // but _not_ the master's!
+ if (only_childbibs) {
+ for (string const &s: children) {
+ FileName fn =
+ makeAbsPath(s, file.onlyPath().realPath());
+ fn.changeExtension("aux");
+ if (fn.exists())
+ result.push_back(scanAuxFile(fn));
+ }
+ return result;
+ }
+
result.push_back(scanAuxFile(file));
+ // This is for bibtopic
string const basename = removeExtension(file.absFileName());
for (int i = 1; i < 1000; ++i) {
FileName const file2(basename
continue;
result = true;
- string tmp = runparams.use_japanese ?
- lyxrc.jbibtex_command : lyxrc.bibtex_command;
-
- if (!runparams.bibtex_command.empty())
- tmp = runparams.bibtex_command;
+ string tmp = runparams.bibtex_command;
tmp += " ";
// onlyFileName() is needed for cygwin
tmp += quoteName(onlyFileName(removeExtension(
onlyFileName(changeExtension(file.absFileName(), ".log"));
LYXERR(Debug::LATEX, "Log file: " << tmp);
FileName const fn = FileName(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)
+ // encoding of the TeX file (T1, TU etc.). See #10728.
ifstream ifs(fn.toFilesystemEncoding().c_str());
bool fle_style = false;
static regex const file_line_error(".+\\.\\D+:[0-9]+: (.+)");
string child_name;
int pnest = 0;
stack <pair<string, int> > child;
+ children.clear();
string token;
while (getline(ifs, token)) {
if (regex_match(substr, sub, child_file)) {
string const name = sub.str(1);
child.push(make_pair(name, pnest));
+ children.push_back(name);
i += len;
}
} else if (token[i] == ')') {
if (contains(token, "LaTeX Error:"))
retval |= LATEX_ERROR;
- if (prefixIs(token, "! File ended while scanning")){
+ if (prefixIs(token, "! File ended while scanning")) {
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;
}
}
+ if (prefixIs(token, "! Incomplete \\if")) {
+ // bug 10666. At this point its not clear we finish with error.
+ wait_for_error = desc;
+ continue;
+ }
+
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;
string errstr;
int count = 0;
errstr = wait_for_error;
+ wait_for_error.clear();
do {
if (!getline(ifs, tmp))
break;
} while (!contains(tmp, "(job aborted"));
terr.insertError(0,
- from_local8bit("Emergency stop"),
+ from_ascii("Emergency stop"),
from_local8bit(errstr),
child_name);
}
|| contains(token, "no pages of output")) {
// No output file (e.g. the DVI or PDF) was created
retval |= NO_OUTPUT;
+ } else if (contains(token, "Error 256 (driver return code)")) {
+ // This is a xdvipdfmx driver error reported by XeTeX.
+ // We have to check whether an output PDF file was created.
+ FileName pdffile = file;
+ pdffile.changeExtension("pdf");
+ if (!pdffile.exists())
+ // No output PDF file was created (see #10076)
+ retval |= NO_OUTPUT;
} else if (contains(token, "That makes 100 errors")) {
- // More than 100 errors were reprted
+ // More than 100 errors were reported
retval |= TOO_MANY_ERRORS;
} else if (prefixIs(token, "!pdfTeX error:")) {
// otherwise we dont catch e.g.:
// !pdfTeX error: pdflatex (file feyn10): Font feyn10 at 600 not found
retval |= ERRORS;
terr.insertError(0,
- from_local8bit("pdfTeX Error"),
+ from_ascii("pdfTeX Error"),
from_local8bit(token),
child_name);
- } else if (prefixIs(token, "Missing character: There is no ")
- && !contains(token, "nullfont")) {
+ } else if (!ignore_missing_glyphs
+ && prefixIs(token, "Missing character: There is no ")
+ && !contains(token, "nullfont")) {
// Warning about missing glyph in selected font
// may be dataloss (bug 9610)
// but can be ignored for 'nullfont' (bug 10394).
- retval |= LATEX_ERROR;
- terr.insertError(0,
- from_local8bit("Missing glyphs!"),
- from_local8bit(token),
- child_name);
+ // as well as for ZERO WIDTH NON-JOINER (0x200C) which is
+ // missing in many fonts and output for ligature break (bug 10727).
+ // Since this error only occurs with utf8 output, we can safely assume
+ // that the log file is utf8-encoded
+ docstring const utoken = from_utf8(token);
+ if (!contains(utoken, 0x200C)) {
+ retval |= LATEX_ERROR;
+ terr.insertError(0,
+ from_ascii("Missing glyphs!"),
+ utoken,
+ child_name);
+ }
+ } else if (!wait_for_error.empty()) {
+ // We collect information until we know we have an error.
+ wait_for_error += token + '\n';
}
}
}
return result;
}
-} // anon namespace
+} // namespace
void LaTeX::deplog(DepTable & head)
projects / lyx.git / blobdiff