*/
LaTeX::LaTeX(string const & latex, OutputParams const & rp,
- FileName const & f)
- : cmd(latex), file(f), runparams(rp)
+ FileName const & f, string const & p)
+ : cmd(latex), file(f), path(p), runparams(rp), biber(false)
{
num_errors = 0;
if (prefixIs(cmd, "pdf")) { // Do we use pdflatex ?
// 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)
// 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
/// 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
// 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
+ quoteName(onlyFileName(file.toFilesystemEncoding()))
+ " > " + os::nulldev();
Systemcall one;
- return one.startscript(Systemcall::Wait, tmp);
+ return one.startscript(Systemcall::Wait, tmp, path);
}
tmp += quoteName(f);
tmp += params;
Systemcall one;
- one.startscript(Systemcall::Wait, tmp);
+ one.startscript(Systemcall::Wait, tmp, path);
return true;
}
tmp += " -o "
+ onlyFileName(changeExtension(file.toFilesystemEncoding(), nls));
Systemcall one;
- one.startscript(Systemcall::Wait, tmp);
+ one.startscript(Systemcall::Wait, tmp, path);
return true;
}
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.
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();
tmp += quoteName(onlyFileName(removeExtension(
it->aux_file.absFileName())));
Systemcall one;
- one.startscript(Systemcall::Wait, tmp);
+ one.startscript(Systemcall::Wait, tmp, path);
}
// Return whether bibtex was run
return result;
}
} 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")) {
if (contains(token, "LaTeX Error:"))
retval |= LATEX_ERROR;
- // bug 6445. At this point its not clear we finish with error.
if (prefixIs(token, "! File ended while scanning")){
- wait_for_error = desc;
- continue;
+ 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.");
+ } else {
+ // bug 6445. 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;
+ LYXERR(Debug::LATEX, "Force rerun.");
+ }
+
if (!wait_for_error.empty() && prefixIs(token, "! Emergency stop.")){
retval |= LATEX_ERROR;
string errstr;
}
-bool checkLineBreak(string const & ff, DepTable & head)
+bool completeFilename(string const & ff, DepTable & head)
{
+ // If we do not find a dot, we suspect
+ // a fragmental file name
if (!contains(ff, '.'))
return false;
return handleFoundFile(ff, head);
}
+
+int iterateLine(string const token, regex const reg, string const & closing,
+ int fragment_pos, DepTable & head)
+{
+ smatch what;
+ string::const_iterator first = token.begin();
+ string::const_iterator end = token.end();
+ bool fragment = false;
+ string last_match;
+
+ while (regex_search(first, end, what, reg)) {
+ // if we have a dot, try to handle as file
+ if (contains(what.str(1), '.')) {
+ first = what[0].second;
+ if (what.str(2) == closing) {
+ handleFoundFile(what.str(1), head);
+ // since we had a closing bracket,
+ // do not investigate further
+ fragment = false;
+ } else
+ // if we have no closing bracket,
+ // try to handle as file nevertheless
+ fragment = !handleFoundFile(
+ what.str(1) + what.str(2), head);
+ }
+ // if we do not have a dot, check if the line has
+ // a closing bracket (else, we suspect a line break)
+ else if (what.str(2) != closing) {
+ first = what[0].second;
+ fragment = true;
+ } else {
+ // we have a closing bracket, so the content
+ // is not a file name.
+ // no need to investigate further
+ first = what[0].second;
+ fragment = false;
+ }
+ last_match = what.str(1);
+ }
+
+ // We need to consider the result from previous line iterations:
+ // We might not find a fragment here, but another one might follow
+ // E.g.: (filename.ext) <filenam
+ // Vice versa, we consider the search completed if a real match
+ // follows a potential fragment from a previous iteration.
+ // E.g. <some text we considered a fragment (filename.ext)
+ // result = -1 means we did not find a fragment!
+ int result = -1;
+ int last_match_pos = -1;
+ if (!last_match.empty() && token.find(last_match) != string::npos)
+ last_match_pos = int(token.find(last_match));
+ if (fragment) {
+ if (last_match_pos > fragment_pos)
+ result = last_match_pos;
+ else
+ result = fragment_pos;
+ } else
+ if (last_match_pos < fragment_pos)
+ result = fragment_pos;
+
+ return result;
+}
+
} // anon namespace
// but instead only a line like this into the log:
// Writing index file sample.idx
static regex const reg4("Writing index file (.+).*");
- // files also can be enclosed in <...>
- static regex const reg5("<([^>]+)(.).*");
static regex const regoldnomencl("Writing glossary file (.+).*");
static regex const regnomencl("Writing nomenclature file (.+).*");
// If a toc should be created, MikTex does not write a line like
// This line is also written by tetex.
// This line is not present if no toc should be created.
static regex const miktexTocReg("\\\\tf@toc=\\\\write.*");
+ // file names can be enclosed in <...> (anywhere on the line)
+ static regex const reg5(".*<[^>]+.*");
+ // and also (...) anywhere on the line
static regex const reg6(".*\\([^)]+.*");
FileName const fn = makeAbsPath(logfile);
string lastline;
while (ifs) {
// Ok, the scanning of files here is not sufficient.
- // Sometimes files are named by "File:� xxx" only
- // So I think we should use some regexps to find files instead.
+ // Sometimes files are named by "File: xxx" only
+ // Therefore we use some regexps to find files instead.
// Note: all file names and paths might contains spaces.
- bool found_file = false;
+ // Also, file names might be broken across lines. Therefore
+ // we mark (potential) fragments and merge those lines.
+ bool fragment = false;
string token;
getline(ifs, token);
// MikTeX sometimes inserts \0 in the log file. They can't be
continue;
}
+ // FIXME UNICODE: We assume that the file names in the log
+ // file are in the file system encoding.
+ token = to_utf8(from_filesystem8bit(token));
+
// Sometimes, filenames are broken across lines.
// We care for that and save suspicious lines.
// Here we exclude some cases where we are sure
smatch sub;
- // FIXME UNICODE: We assume that the file names in the log
- // file are in the file system encoding.
- token = to_utf8(from_filesystem8bit(token));
-
// (1) "File: file.ext"
if (regex_match(token, sub, reg1)) {
- // check for dot
- found_file = checkLineBreak(sub.str(1), head);
+ // is this a fragmental file name?
+ fragment = !completeFilename(sub.str(1), head);
// However, ...
if (suffixIs(token, ")"))
- // no line break for sure
- // pretend we've been successfully searching
- found_file = true;
+ // no fragment for sure
+ fragment = false;
// (2) "No file file.ext"
} else if (regex_match(token, sub, reg2)) {
// file names must contains a dot, line ends with dot
if (contains(sub.str(1), '.') && sub.str(2) == ".")
- found_file = handleFoundFile(sub.str(1), head);
+ fragment = !handleFoundFile(sub.str(1), head);
else
// we suspect a line break
- found_file = false;
+ fragment = true;
// (3) "\openout<nr> = `file.ext'."
} else if (regex_match(token, sub, reg3)) {
// search for closing '. at the end of the line
if (sub.str(2) == "\'.")
- found_file = handleFoundFile(sub.str(1), head);
+ fragment = !handleFoundFile(sub.str(1), head);
else
- // probable line break
- found_file = false;
+ // potential fragment
+ fragment = true;
// (4) "Writing index file file.ext"
} else if (regex_match(token, sub, reg4))
- // check for dot
- found_file = checkLineBreak(sub.str(1), head);
- // (5) "<file.ext>"
- else if (regex_match(token, sub, reg5)) {
- // search for closing '>' and dot ('*.*>') at the eol
- if (contains(sub.str(1), '.') && sub.str(2) == ">")
- found_file = handleFoundFile(sub.str(1), head);
- else
- // probable line break
- found_file = false;
- // (6) "Writing nomenclature file file.ext"
- } else if (regex_match(token, sub, regnomencl) ||
+ // fragmential file name?
+ fragment = !completeFilename(sub.str(1), head);
+ // (5) "Writing nomenclature file file.ext"
+ else if (regex_match(token, sub, regnomencl) ||
regex_match(token, sub, regoldnomencl))
- // check for dot
- found_file = checkLineBreak(sub.str(1), head);
- // (7) "\tf@toc=\write<nr>" (for MikTeX)
+ // fragmental file name?
+ fragment= !completeFilename(sub.str(1), head);
+ // (6) "\tf@toc=\write<nr>" (for MikTeX)
else if (regex_match(token, sub, miktexTocReg))
- found_file = handleFoundFile(onlyFileName(changeExtension(
+ fragment = !handleFoundFile(onlyFileName(changeExtension(
file.absFileName(), ".toc")), head);
else
// not found, but we won't check further
- // pretend we've been successfully searching
- found_file = true;
+ fragment = false;
+
+ int fragment_pos = -1;
+ // (7) "<file.ext>"
+ // We can have several of these on one line
+ // (and in addition to those above)
+ if (regex_match(token, sub, reg5)) {
+ // search for strings in <...>
+ static regex reg5_1("<([^>]+)(.)");
+ fragment_pos = iterateLine(token, reg5_1, ">",
+ fragment_pos, head);
+ fragment = (fragment_pos != -1);
+ }
- // (8) "(file.ext"
- // note that we can have several of these on one line
+ // (8) "(file.ext)"
+ // We can have several of these on one line
// this must be queried separated, because of
// cases such as "File: file.ext (type eps)"
// where "File: file.ext" would be skipped
if (regex_match(token, sub, reg6)) {
// search for strings in (...)
static regex reg6_1("\\(([^()]+)(.)");
- smatch what;
- string::const_iterator first = token.begin();
- string::const_iterator end = token.end();
-
- while (regex_search(first, end, what, reg6_1)) {
- // if we have a dot, try to handle as file
- if (contains(what.str(1), '.')) {
- first = what[0].second;
- if (what.str(2) == ")") {
- handleFoundFile(what.str(1), head);
- // since we had a closing bracket,
- // do not investigate further
- found_file = true;
- } else
- // if we have no closing bracket,
- // try to handle as file nevertheless
- found_file = handleFoundFile(
- what.str(1) + what.str(2), head);
- }
- // if we do not have a dot, check if the line has
- // a closing bracket (else, we suspect a line break)
- else if (what.str(2) != ")") {
- first = what[0].second;
- found_file = false;
- } else {
- // we have a closing bracket, so the content
- // is not a file name.
- // no need to investigate further
- // pretend we've been successfully searching
- first = what[0].second;
- found_file = true;
- }
- }
+ fragment_pos = iterateLine(token, reg6_1, ")",
+ fragment_pos, head);
+ fragment = (fragment_pos != -1);
}
- if (!found_file)
- // probable linebreak:
+ if (fragment)
+ // probable linebreak within file name:
// save this line
lastline = token;
else
ifstream ifs(blg_file.toFilesystemEncoding().c_str());
string token;
- static regex const reg1(".*Found bibtex data file '([^']+).*");
+ static regex const reg1(".*Found (bibtex|BibTeX) data (file|source) '([^']+).*");
while (getline(ifs, token)) {
token = rtrim(token, "\r");
// in the aux file are in the file system encoding.
token = to_utf8(from_filesystem8bit(token));
if (regex_match(token, sub, reg1)) {
- string data = sub.str(1);
+ string data = sub.str(3);
if (!data.empty()) {
LYXERR(Debug::LATEX, "Found bib file: " << data);
handleFoundFile(data, dep);