]> git.lyx.org Git - lyx.git/blobdiff - src/LaTeX.cpp
Remove obsolete (and false) comment.
[lyx.git] / src / LaTeX.cpp
index f4d98155aad65f0bbcbbe0c628aa26f01e6e36f1..5333c7fbae84a0dd81348a9f787533a0f1aca853 100644 (file)
 
 #include <config.h>
 
+#include "Buffer.h"
 #include "BufferList.h"
+#include "BufferParams.h"
 #include "LaTeX.h"
 #include "LyXRC.h"
+#include "LyX.h"
 #include "DepTable.h"
+#include "Encoding.h"
 
 #include "support/debug.h"
 #include "support/convert.h"
 #include "support/Systemcall.h"
 #include "support/os.h"
 
-#include <boost/regex.hpp>
+#include "support/regex.h"
 
 #include <fstream>
+#include <stack>
 
-using boost::regex;
-using boost::smatch;
 
 using namespace std;
 using namespace lyx::support;
@@ -50,7 +53,6 @@ namespace os = support::os;
 //   different way.
 // - the makeindex style files should be taken care of with
 //   the dependency mechanism.
-// - we should perhaps also scan the bibtex log file
 
 namespace {
 
@@ -59,20 +61,30 @@ docstring runMessage(unsigned int count)
        return bformat(_("Waiting for LaTeX run number %1$d"), count);
 }
 
-} // anon namespace
+} // namespace
 
 /*
  * CLASS TEXERRORS
  */
 
 void TeXErrors::insertError(int line, docstring const & error_desc,
-                           docstring const & error_text)
+                           docstring const & error_text,
+                           string const & child_name)
 {
-       Error newerr(line, error_desc, error_text);
+       Error newerr(line, error_desc, error_text, child_name);
        errors.push_back(newerr);
 }
 
 
+void TeXErrors::insertRef(int line, docstring const & error_desc,
+                           docstring const & error_text,
+                           string const & child_name)
+{
+       Error newerr(line, error_desc, error_text, child_name);
+       undef_ref.push_back(newerr);
+}
+
+
 bool operator==(AuxInfo const & a, AuxInfo const & o)
 {
        return a.aux_file == o.aux_file
@@ -93,11 +105,19 @@ bool operator!=(AuxInfo const & a, AuxInfo const & o)
  */
 
 LaTeX::LaTeX(string const & latex, OutputParams const & rp,
-            FileName const & f)
-       : cmd(latex), file(f), runparams(rp)
+            FileName const & f, string const & p, string const & lp, 
+            bool allow_cancellation, bool const clean_start)
+       : cmd(latex), file(f), path(p), lpath(lp), runparams(rp), biber(false),
+         allow_cancel(allow_cancellation)
 {
        num_errors = 0;
-       if (prefixIs(cmd, "pdf")) { // Do we use pdflatex ?
+       // lualatex can still produce a DVI with --output-format=dvi. However,
+       // we do not use that internally (we use the "dvilualatex" command) so
+       // it would only happen from a custom converter. Thus, it is better to
+       // guess that lualatex produces a PDF than to guess a DVI.
+       // FIXME we should base the extension on the output format, which we should
+       // get in a robust way, e.g. from the converter.
+       if (prefixIs(cmd, "pdf") || prefixIs(cmd, "lualatex") || prefixIs(cmd, "xelatex")) {
                depfile = FileName(file.absFileName() + ".dep-pdf");
                output_file =
                        FileName(changeExtension(file.absFileName(), ".pdf"));
@@ -106,12 +126,16 @@ LaTeX::LaTeX(string const & latex, OutputParams const & rp,
                output_file =
                        FileName(changeExtension(file.absFileName(), ".dvi"));
        }
+       if (clean_start)
+               removeAuxiliaryFiles();
 }
 
 
-void LaTeX::deleteFilesOnError() const
+void LaTeX::removeAuxiliaryFiles() const
 {
-       // currently just a dummy function.
+       // 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.
 
        // What files do we have to delete?
 
@@ -124,6 +148,10 @@ void LaTeX::deleteFilesOnError() const
        FileName const bbl(changeExtension(file.absFileName(), ".bbl"));
        bbl.removeFile();
 
+       // biber file
+       FileName const bcf(changeExtension(file.absFileName(), ".bcf"));
+       bcf.removeFile();
+
        // makeindex file
        FileName const ind(changeExtension(file.absFileName(), ".ind"));
        ind.removeFile();
@@ -136,9 +164,20 @@ void LaTeX::deleteFilesOnError() const
        FileName const gls(changeExtension(file.absFileName(), ".gls"));
        gls.removeFile();
 
+       // endnotes file
+       FileName const ent(changeExtension(file.absFileName(), ".ent"));
+       ent.removeFile();
+
        // Also remove the aux file
        FileName const aux(changeExtension(file.absFileName(), ".aux"));
        aux.removeFile();
+
+       // Also remove the .out file (e.g. hyperref bookmarks) (#9963)
+       FileName const out(changeExtension(file.absFileName(), ".out"));
+       out.removeFile();
+
+       // Remove the output file, which is often generated even if error
+       output_file.removeFile();
 }
 
 
@@ -150,6 +189,8 @@ int LaTeX::run(TeXErrors & terr)
        // each time the .tex file changes.
 {
        int scanres = NO_ERRORS;
+       int bscanres = NO_ERRORS;
+       int iscanres = NO_ERRORS;
        unsigned int count = 0; // number of times run
        num_errors = 0; // just to make sure.
        unsigned int const MAX_RUN = 6;
@@ -160,8 +201,6 @@ int LaTeX::run(TeXErrors & terr)
        theBufferList().updateIncludedTeXfiles(FileName::getcwd().absFileName(),
                runparams);
 
-       // Never write the depfile if an error was encountered.
-
        // 0
        // first check if the file dependencies exist:
        //     ->If it does exist
@@ -180,7 +219,7 @@ int LaTeX::run(TeXErrors & terr)
 
        bool had_depfile = depfile.exists();
        bool run_bibtex = false;
-       FileName const aux_file(changeExtension(file.absFileName(), "aux"));
+       FileName const aux_file(changeExtension(file.absFileName(), ".aux"));
 
        if (had_depfile) {
                LYXERR(Debug::DEPEND, "Dependency file exists");
@@ -189,6 +228,25 @@ int LaTeX::run(TeXErrors & terr)
        }
 
        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
@@ -216,26 +274,27 @@ int LaTeX::run(TeXErrors & terr)
        /// 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);
        message(runMessage(count));
 
-       startscript();
+       int exit_code = startscript();
+       if (exit_code == Systemcall::KILLED)
+               return Systemcall::KILLED;
+
        scanres = scanLogFile(terr);
        if (scanres & ERROR_RERUN) {
                LYXERR(Debug::LATEX, "Rerunning LaTeX");
-               startscript();
+               terr.clearErrors();
+               exit_code = startscript();
+               if (exit_code == Systemcall::KILLED)
+                       return Systemcall::KILLED;
                scanres = scanLogFile(terr);
        }
 
-       if (scanres & ERRORS) {
-               deleteFilesOnError();
-               return scanres; // return on error
-       }
-
-       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;
 
@@ -261,19 +320,52 @@ int LaTeX::run(TeXErrors & terr)
                LYXERR(Debug::LATEX, "Running MakeIndex.");
                message(_("Running Index Processor."));
                // onlyFileName() is needed for cygwin
-               rerun |= runMakeIndex(onlyFileName(idxfile.absFileName()),
-                               runparams);
+               int const ret = 
+                               runMakeIndex(onlyFileName(idxfile.absFileName()), runparams);
+               if (ret == Systemcall::KILLED)
+                       return Systemcall::KILLED;
+               FileName const ilgfile(changeExtension(file.absFileName(), ".ilg"));
+               if (ilgfile.exists())
+                       iscanres = scanIlgFile(terr);
+               rerun = true;
        }
+
        FileName const nlofile(changeExtension(file.absFileName(), ".nlo"));
-       if (head.haschanged(nlofile))
-               rerun |= runMakeIndexNomencl(file, ".nlo", ".nls");
+       // 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())) {
+               int const ret = runMakeIndexNomencl(file, ".nlo", ".nls");
+               if (ret == Systemcall::KILLED)
+                       return Systemcall::KILLED;
+               rerun = true;
+       }
+
        FileName const glofile(changeExtension(file.absFileName(), ".glo"));
-       if (head.haschanged(glofile))
-               rerun |= runMakeIndexNomencl(file, ".glo", ".gls");
+       if (head.haschanged(glofile)) {
+               int const ret = runMakeIndexNomencl(file, ".glo", ".gls");
+               if (ret)
+                       return ret;
+               rerun = true;
+       }
+
+
+       // check if we're using biber instead of bibtex
+       // 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"));
+       biber |= head.exist(bcffile);
 
        // 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;
@@ -281,7 +373,13 @@ int LaTeX::run(TeXErrors & terr)
                LYXERR(Debug::LATEX, "Running BibTeX.");
                message(_("Running BibTeX."));
                updateBibtexDependencies(head, bibtex_info);
-               rerun |= runBibTeX(bibtex_info, runparams);
+               int exit_code;
+               rerun |= runBibTeX(bibtex_info, runparams, exit_code);
+               if (exit_code == Systemcall::KILLED)
+                       return Systemcall::KILLED;
+               FileName const blgfile(changeExtension(file.absFileName(), ".blg"));
+               if (blgfile.exists())
+                       bscanres = scanBlgFile(head, terr);
        } else if (!had_depfile) {
                /// 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
@@ -307,12 +405,10 @@ int LaTeX::run(TeXErrors & terr)
                LYXERR(Debug::DEPEND, "Dep. file has changed or rerun requested");
                LYXERR(Debug::LATEX, "Run #" << count);
                message(runMessage(count));
-               startscript();
+               int exit_code = startscript();
+               if (exit_code == Systemcall::KILLED)
+                       return Systemcall::KILLED;
                scanres = scanLogFile(terr);
-               if (scanres & ERRORS) {
-                       deleteFilesOnError();
-                       return scanres; // return on error
-               }
 
                // update the depedencies
                deplog(head); // reads the latex log
@@ -320,12 +416,17 @@ int LaTeX::run(TeXErrors & terr)
        } else {
                LYXERR(Debug::DEPEND, "Dep. file has NOT changed");
        }
-       
+
        // 3
        // 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;
@@ -333,7 +434,13 @@ int LaTeX::run(TeXErrors & terr)
                LYXERR(Debug::LATEX, "Running BibTeX.");
                message(_("Running BibTeX."));
                updateBibtexDependencies(head, bibtex_info);
-               rerun |= runBibTeX(bibtex_info, runparams);
+               int exit_code;
+               rerun |= runBibTeX(bibtex_info, runparams, exit_code);
+               if (exit_code == Systemcall::KILLED)
+                       return Systemcall::KILLED;
+               FileName const blgfile(changeExtension(file.absFileName(), ".blg"));
+               if (blgfile.exists())
+                       bscanres = scanBlgFile(head, terr);
        }
 
        // 4
@@ -350,15 +457,21 @@ int LaTeX::run(TeXErrors & terr)
                LYXERR(Debug::LATEX, "Running MakeIndex.");
                message(_("Running Index Processor."));
                // onlyFileName() is needed for cygwin
-               rerun = runMakeIndex(onlyFileName(changeExtension(
+               int const ret = runMakeIndex(onlyFileName(changeExtension(
                                file.absFileName(), ".idx")), runparams);
+               if (ret == Systemcall::KILLED)
+                       return Systemcall::KILLED;
+               FileName const ilgfile(changeExtension(file.absFileName(), ".ilg"));
+               if (ilgfile.exists())
+                       iscanres = scanIlgFile(terr);
+               rerun = true;
        }
 
-       // I am not pretty sure if need this twice.
+       // MSVC complains that bool |= int is unsafe. Not sure why.
        if (head.haschanged(nlofile))
-               rerun |= runMakeIndexNomencl(file, ".nlo", ".nls");
+               rerun |= (runMakeIndexNomencl(file, ".nlo", ".nls") != 0);
        if (head.haschanged(glofile))
-               rerun |= runMakeIndexNomencl(file, ".glo", ".gls");
+               rerun |= (runMakeIndexNomencl(file, ".glo", ".gls") != 0);
 
        // 5
        // we will only run latex more if the log file asks for it.
@@ -380,10 +493,6 @@ int LaTeX::run(TeXErrors & terr)
                message(runMessage(count));
                startscript();
                scanres = scanLogFile(terr);
-               if (scanres & ERRORS) {
-                       deleteFilesOnError();
-                       return scanres; // return on error
-               }
 
                // keep this updated
                head.update();
@@ -391,7 +500,22 @@ int LaTeX::run(TeXErrors & terr)
 
        // Write the dependencies to file.
        head.write(depfile);
+
+       if (exit_code) {
+               // add flag here, just before return, instead of when exit_code
+               // is defined because scanres is sometimes overwritten above
+               // (e.g. rerun)
+               scanres |= NONZERO_ERROR;
+       }
+
        LYXERR(Debug::LATEX, "Done.");
+
+       if (bscanres & ERRORS)
+               return bscanres; // return on error
+
+       if (iscanres & ERRORS)
+               return iscanres; // return on error
+
        return scanres;
 }
 
@@ -403,25 +527,61 @@ int LaTeX::startscript()
                     + quoteName(onlyFileName(file.toFilesystemEncoding()))
                     + " > " + os::nulldev();
        Systemcall one;
-       return one.startscript(Systemcall::Wait, tmp);
+       Systemcall::Starttype const starttype = 
+               allow_cancel ? Systemcall::WaitLoop : Systemcall::Wait;
+       return one.startscript(starttype, tmp, path, lpath, true);
 }
 
 
-bool LaTeX::runMakeIndex(string const & f, OutputParams const & runparams,
+int LaTeX::runMakeIndex(string const & f, OutputParams const & rp,
                         string const & params)
 {
-       string tmp = runparams.use_japanese ?
+       string tmp = rp.use_japanese ?
                lyxrc.jindex_command : lyxrc.index_command;
+
+       if (!rp.index_command.empty())
+               tmp = rp.index_command;
        
-       if (!runparams.index_command.empty())
-               tmp = runparams.index_command;
+       if (contains(tmp, "$$x")) {
+               // This adds appropriate [te]xindy options
+               // such as language and codepage (for the
+               // main document language/encoding) as well
+               // as input markup (latex or xelatex)
+               string xdyopts = rp.xindy_language;
+               if (!xdyopts.empty())
+                       xdyopts = "-L " + xdyopts;
+               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 += " ";
+                       // not really needed for texindy, but for xindy
+                       xdyopts += "-I latex";
+               }
+               tmp = subst(tmp, "$$x", xdyopts);
+       }
+
+       if (contains(tmp, "$$b")) {
+               // advise xindy to write a log file
+               tmp = subst(tmp, "$$b", removeExtension(f));
+       }
 
        LYXERR(Debug::LATEX,
                "idx file has been made, running index processor ("
                << tmp << ") on file " << f);
 
-       tmp = subst(tmp, "$$lang", runparams.document_language);
-       if (runparams.use_indices) {
+       tmp = subst(tmp, "$$lang", rp.document_language);
+       if (rp.use_indices) {
                tmp = lyxrc.splitindex_command + " -m " + quoteName(tmp);
                LYXERR(Debug::LATEX,
                "Multiple indices. Using splitindex command: " << tmp);
@@ -430,35 +590,51 @@ bool LaTeX::runMakeIndex(string const & f, OutputParams const & runparams,
        tmp += quoteName(f);
        tmp += params;
        Systemcall one;
-       one.startscript(Systemcall::Wait, tmp);
-       return true;
+       Systemcall::Starttype const starttype = 
+               allow_cancel ? Systemcall::WaitLoop : Systemcall::Wait;
+       return one.startscript(starttype, tmp, path, lpath, true);
 }
 
 
-bool LaTeX::runMakeIndexNomencl(FileName const & file,
+int LaTeX::runMakeIndexNomencl(FileName const & fname,
                string const & nlo, string const & nls)
 {
        LYXERR(Debug::LATEX, "Running MakeIndex for nomencl.");
        message(_("Running MakeIndex for nomencl."));
        string tmp = lyxrc.nomencl_command + ' ';
        // onlyFileName() is needed for cygwin
-       tmp += quoteName(onlyFileName(changeExtension(file.absFileName(), nlo)));
+       tmp += quoteName(onlyFileName(changeExtension(fname.absFileName(), nlo)));
        tmp += " -o "
-               + onlyFileName(changeExtension(file.toFilesystemEncoding(), nls));
+               + onlyFileName(changeExtension(fname.toFilesystemEncoding(), nls));
        Systemcall one;
-       one.startscript(Systemcall::Wait, tmp);
-       return true;
+       Systemcall::Starttype const starttype = 
+               allow_cancel ? Systemcall::WaitLoop : Systemcall::Wait;
+       return one.startscript(starttype, tmp, path, lpath, true);
 }
 
 
 vector<AuxInfo> const
-LaTeX::scanAuxFiles(FileName const & file)
+LaTeX::scanAuxFiles(FileName const & fname, bool const only_childbibs)
 {
        vector<AuxInfo> result;
 
-       result.push_back(scanAuxFile(file));
+       // 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, fname.onlyPath().realPath());
+                       fn.changeExtension("aux");
+                       if (fn.exists())
+                               result.push_back(scanAuxFile(fn));
+               }
+               return result;
+       }
+
+       result.push_back(scanAuxFile(fname));
 
-       string const basename = removeExtension(file.absFileName());
+       // This is for bibtopic
+       string const basename = removeExtension(fname.absFileName());
        for (int i = 1; i < 1000; ++i) {
                FileName const file2(basename
                        + '.' + convert<string>(i)
@@ -471,20 +647,20 @@ LaTeX::scanAuxFiles(FileName const & file)
 }
 
 
-AuxInfo const LaTeX::scanAuxFile(FileName const & file)
+AuxInfo const LaTeX::scanAuxFile(FileName const & fname)
 {
        AuxInfo result;
-       result.aux_file = file;
-       scanAuxFile(file, result);
+       result.aux_file = fname;
+       scanAuxFile(fname, result);
        return result;
 }
 
 
-void LaTeX::scanAuxFile(FileName const & file, AuxInfo & aux_info)
+void LaTeX::scanAuxFile(FileName const & fname, AuxInfo & aux_info)
 {
-       LYXERR(Debug::LATEX, "Scanning aux file: " << file);
+       LYXERR(Debug::LATEX, "Scanning aux file: " << fname);
 
-       ifstream ifs(file.toFilesystemEncoding().c_str());
+       ifstream ifs(fname.toFilesystemEncoding().c_str());
        string token;
        static regex const reg1("\\\\citation\\{([^}]+)\\}");
        static regex const reg2("\\\\bibdata\\{([^}]+)\\}");
@@ -556,36 +732,53 @@ void LaTeX::updateBibtexDependencies(DepTable & dep,
                                dep.insert(file, true);
                }
        }
+
+       // biber writes nothing into the aux file.
+       // Instead, we have to scan the blg file
+       if (biber) {
+               TeXErrors terr;
+               scanBlgFile(dep, terr);
+       }
 }
 
 
 bool LaTeX::runBibTeX(vector<AuxInfo> const & bibtex_info,
-                     OutputParams const & runparams)
+                     OutputParams const & rp, int & exit_code)
 {
        bool result = false;
+       exit_code = 0;
        for (vector<AuxInfo>::const_iterator it = bibtex_info.begin();
             it != bibtex_info.end(); ++it) {
-               if (it->databases.empty())
+               if (!biber && it->databases.empty())
                        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 = rp.bibtex_command;
                tmp += " ";
                // onlyFileName() is needed for cygwin
                tmp += quoteName(onlyFileName(removeExtension(
                                it->aux_file.absFileName())));
                Systemcall one;
-               one.startscript(Systemcall::Wait, tmp);
+               Systemcall::Starttype const starttype = 
+               allow_cancel ? Systemcall::WaitLoop : Systemcall::Wait;
+               exit_code = one.startscript(starttype, tmp, path, lpath, true);
+               if (exit_code) {
+                       return result;
+               }
        }
        // Return whether bibtex was run
        return result;
 }
 
 
+//helper func for scanLogFile; gets line number X from strings "... on input line X ..."
+//returns 0 if none is found
+int getLineNumber(const string &token){
+       string l = support::token(token, ' ', tokenPos(token,' ',"line") + 1);
+       return l.empty() ? 0 : convert<int>(l);
+}
+
+
 int LaTeX::scanLogFile(TeXErrors & terr)
 {
        int last_line = -1;
@@ -595,14 +788,26 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                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 file_line_error(".+\\.\\D+:[0-9]+: (.+)");
+       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;
+       string child_name;
+       int pnest = 0;
+       stack <pair<string, int> > child;
+       children.clear();
+
+       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
@@ -617,11 +822,54 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                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] == '(') {
+                               ++pnest;
+                               size_t j = token.find('(', i + 1);
+                               size_t len = j == string::npos
+                                               ? token.substr(i + 1).length()
+                                               : j - i - 1;
+                               string const substr = token.substr(i + 1, len);
+                               if (regex_match(substr, sub, child_file)) {
+                                       string const name = sub.str(1);
+                                       // Sometimes also masters have a name that matches
+                                       // (if their name starts with a number and _)
+                                       if (name != file.onlyFileName()) {
+                                               child.push(make_pair(name, pnest));
+                                               children.push_back(name);
+                                       }
+                                       i += len;
+                               }
+                       } else if (token[i] == ')') {
+                               if (!child.empty()
+                                   && child.top().second == pnest)
+                                       child.pop();
+                               --pnest;
+                       }
+               }
+               child_name = child.empty() ? empty_string() : child.top().first;
+
                if (contains(token, "file:line:error style messages enabled"))
                        fle_style = true;
 
-               if (prefixIs(token, "LaTeX Warning:") ||
-                   prefixIs(token, "! pdfTeX warning")) {
+               //Handles both "LaTeX Warning:" & "Package natbib Warning:"
+               //Various handlers for missing citations below won't catch the problem if citation
+               //key is long (>~25chars), because pdflatex splits output at line length 80.
+               //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 (!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")
+                   || prefixIs(ml_token, "LaTeX Warning:")
+                   || prefixIs(ml_token, "! pdfTeX warning")) {
                        // Here shall we handle different
                        // types of warnings
                        retval |= LATEX_WARNING;
@@ -635,24 +883,92 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                   && contains(token, "undefined")) {
                                retval |= ERROR_RERUN;
                                LYXERR(Debug::LATEX, "Force rerun.");
-                       } else if (contains(token, "Citation")
-                                  && contains(token, "on page")
+                       // package etaremune
+                       } else if (contains(token, "Etaremune labels have changed")) {
+                               retval |= ERROR_RERUN;
+                               LYXERR(Debug::LATEX, "Force rerun.");
+                       // package enotez
+                       } else if (contains(token, "Endnotes may have changed. Rerun")) {
+                               retval |= RERUN;
+                               LYXERR(Debug::LATEX, "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, "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."
+                       // 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;
+                       // 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;
                        }
+
                } else if (prefixIs(token, "Package")) {
                        // Package warnings
                        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;
+                                       //Unf only keys up to ~6 chars will make it due to line splits
+                                       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 (!runparams.includeall && 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")) {
                                // at least longtable.sty and bibtopic.sty
                                // might use this.
@@ -688,45 +1004,72 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                        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")){
+                       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;
+                                       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, "! 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;
+                                       LYXERR(Debug::LATEX, "Force rerun.");
+                       }
+
                        if (!wait_for_error.empty() && prefixIs(token, "! Emergency stop.")){
                                retval |= LATEX_ERROR;
                                string errstr;
                                int count = 0;
                                errstr = wait_for_error;
+                               wait_for_error.clear();
                                do {
                                        if (!getline(ifs, tmp))
                                                break;
+                                       tmp = rtrim(tmp, "\r");
                                        errstr += "\n" + tmp;
                                        if (++count > 5)
                                                break;
                                } while (!contains(tmp, "(job aborted"));
 
                                terr.insertError(0,
-                                                from_local8bit("Emergency stop"),
-                                                from_local8bit(errstr));
+                                                from_ascii("Emergency stop"),
+                                                from_local8bit(errstr),
+                                                child_name);
                        }
 
                        // get the next line
-                       string tmp;
                        int count = 0;
                        do {
                                if (!getline(ifs, tmp))
                                        break;
-                               if (++count > 10)
+                               tmp = rtrim(tmp, "\r");
+                               // 15 is somewhat arbitrarily chosen, based on practice.
+                               // We used 10 for 14 years and increased it to 15 when we
+                               // saw one case.
+                               if (++count > 15)
                                        break;
                        } while (!prefixIs(tmp, "l."));
                        if (prefixIs(tmp, "l.")) {
                                // we have a latex error
                                retval |=  TEX_ERROR;
                                if (contains(desc,
-                                   "Package babel Error: You haven't defined the language") ||
-                                   contains(desc,
-                                   "Package babel Error: You haven't loaded the option"))
+                                       "Package babel Error: You haven't defined the language")
+                                   || contains(desc,
+                                       "Package babel Error: You haven't loaded the option")
+                                   || contains(desc,
+                                       "Package babel Error: Unknown language"))
                                        retval |= ERROR_RERUN;
                                // get the line number:
                                int line = 0;
@@ -735,6 +1078,7 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                string errstr(tmp, tmp.find(' '));
                                errstr += '\n';
                                getline(ifs, tmp);
+                               tmp = rtrim(tmp, "\r");
                                while (!contains(errstr, "l.")
                                       && !tmp.empty()
                                       && !prefixIs(tmp, "! ")
@@ -742,6 +1086,7 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                        errstr += tmp;
                                        errstr += "\n";
                                        getline(ifs, tmp);
+                                       tmp = rtrim(tmp, "\r");
                                }
                                LYXERR(Debug::LATEX, "line: " << line << '\n'
                                        << "Desc: " << desc << '\n' << "Text: " << errstr);
@@ -762,7 +1107,8 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                        // assume here it can be wrong.
                                        terr.insertError(line,
                                                         from_local8bit(desc),
-                                                        from_local8bit(errstr));
+                                                        from_local8bit(errstr),
+                                                        child_name);
                                        ++num_errors;
                                }
                        }
@@ -773,22 +1119,53 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                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")) {
-                               // A dvi file was not created
+                       } else if (contains(token, "No pages of output")
+                               || 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:")){
+                       } 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_ascii("pdfTeX Error"),
+                                                from_local8bit(token),
+                                                child_name);
+                       } 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).
+                               // 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_local8bit("pdfTeX Error"),
-                                                        from_local8bit(token));
+                                                        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';
                        }
                }
        }
@@ -844,8 +1221,7 @@ bool handleFoundFile(string const & ff, DepTable & head)
                                        return true;
                                // strip off part after last space and try again
                                string tmp = strippedfile;
-                               string const stripoff =
-                                       rsplit(tmp, strippedfile, ' ');
+                               rsplit(tmp, strippedfile, ' ');
                                absname.set(strippedfile);
                                if (insertIfExists(absname, head))
                                        return true;
@@ -870,8 +1246,7 @@ bool handleFoundFile(string const & ff, DepTable & head)
                                break;
                        // strip off part after last space and try again
                        string strippedfile;
-                       string const stripoff =
-                               rsplit(foundfile, strippedfile, ' ');
+                       rsplit(foundfile, strippedfile, ' ');
                        foundfile = strippedfile;
                        onlyfile = onlyFileName(strippedfile);
                        absname = makeAbsPath(onlyfile);
@@ -905,8 +1280,10 @@ bool handleFoundFile(string const & ff, DepTable & head)
 }
 
 
-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;
 
@@ -914,7 +1291,79 @@ bool checkLineBreak(string const & ff, DepTable & head)
        return handleFoundFile(ff, head);
 }
 
-} // anon namespace
+
+int iterateLine(string const & token, regex const & reg, string const & opening,
+               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 (what.str(2) == opening) {
+                               // if we have another opening bracket,
+                               // we might have a nested file chain
+                               // as is (file.ext (subfile.ext))
+                               fragment = !handleFoundFile(rtrim(what.str(1)), head);
+                               // decrease first position by one in order to
+                               // consider the opening delimiter on next iteration
+                               if (first > token.begin())
+                                       --first;
+                       } 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;
+}
+
+} // namespace
 
 
 void LaTeX::deplog(DepTable & head)
@@ -928,16 +1377,16 @@ void LaTeX::deplog(DepTable & head)
 
        static regex const reg1("File: (.+).*");
        static regex const reg2("No file (.+)(.).*");
-       static regex const reg3("\\\\openout[0-9]+.*=.*`(.+)(..).*");
+       static regex const reg3a("\\\\openout[0-9]+.*=.*`(.+)(..).*");
+       // LuaTeX has a slightly different output
+       static regex const reg3b("\\\\openout[0-9]+.*=\\s*(.+)");
        // If an index should be created, MikTex does not write a line like
        //    \openout# = 'sample.idx'.
        // 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 (.+).*");
+       static regex const regnomencl(".*Writing nomenclature file (.+).*");
        // If a toc should be created, MikTex does not write a line like
        //    \openout# = `sample.toc'.
        // but only a line like this into the log:
@@ -945,6 +1394,9 @@ void LaTeX::deplog(DepTable & head)
        // 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);
@@ -952,10 +1404,12 @@ void LaTeX::deplog(DepTable & head)
        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
@@ -969,6 +1423,10 @@ void LaTeX::deplog(DepTable & head)
                        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
@@ -998,106 +1456,82 @@ void LaTeX::deplog(DepTable & head)
 
                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 succesfully 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;
-               // (3) "\openout<nr> = `file.ext'."
-               } else if (regex_match(token, sub, reg3)) {
+                               fragment = true;
+               // (3)(a) "\openout<nr> = `file.ext'."
+               } else if (regex_match(token, sub, reg3a)) {
                        // 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
+                               // potential fragment
+                               fragment = true;
+               // (3)(b) "\openout<nr> = file.ext" (LuaTeX)
+               } else if (regex_match(token, sub, reg3b)) {
+                       // file names must contains a dot
+                       if (contains(sub.str(1), '.'))
+                               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 succesfully 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 const 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 succesfully searching
-                                       first = what[0].second;
-                                       found_file = true;
-                               }
-                       }
+                       static regex const reg6_1("\\(([^()]+)(.)");
+                       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
@@ -1110,4 +1544,111 @@ void LaTeX::deplog(DepTable & head)
 }
 
 
+int LaTeX::scanBlgFile(DepTable & dep, TeXErrors & terr)
+{
+       FileName const blg_file(changeExtension(file.absFileName(), "blg"));
+       LYXERR(Debug::LATEX, "Scanning blg file: " << blg_file);
+
+       ifstream ifs(blg_file.toFilesystemEncoding().c_str());
+       string token;
+       static regex const reg1(".*Found (bibtex|BibTeX) data (file|source) '([^']+).*");
+       static regex const bibtexError("^(.*---line [0-9]+ of file).*$");
+       static regex const bibtexError2("^(.*---while reading file).*$");
+       static regex const bibtexError3("(A bad cross reference---).*");
+       static regex const bibtexError4("(Sorry---you've exceeded BibTeX's).*");
+       static regex const bibtexError5("\\*Please notify the BibTeX maintainer\\*");
+       static regex const biberError("^.*> (FATAL|ERROR) - (.*)$");
+       int retval = NO_ERRORS;
+
+       string prevtoken;
+       while (getline(ifs, token)) {
+               token = rtrim(token, "\r");
+               smatch sub;
+               // FIXME UNICODE: We assume that citation keys and filenames
+               // 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(3);
+                       if (!data.empty()) {
+                               LYXERR(Debug::LATEX, "Found bib file: " << data);
+                               handleFoundFile(data, dep);
+                       }
+               }
+               else if (regex_match(token, sub, bibtexError)
+                        || regex_match(token, sub, bibtexError2)
+                        || regex_match(token, sub, bibtexError4)
+                        || regex_match(token, sub, bibtexError5)) {
+                       retval |= BIBTEX_ERROR;
+                       string errstr = N_("BibTeX error: ") + token;
+                       string msg;
+                       if ((prefixIs(token, "while executing---line")
+                            || prefixIs(token, "---line ")
+                            || prefixIs(token, "*Please notify the BibTeX"))
+                           && !prevtoken.empty()) {
+                               errstr = N_("BibTeX error: ") + prevtoken;
+                               msg = prevtoken + '\n';
+                       }
+                       msg += token;
+                       terr.insertError(0,
+                                        from_local8bit(errstr),
+                                        from_local8bit(msg));
+               } else if (regex_match(prevtoken, sub, bibtexError3)) {
+                       retval |= BIBTEX_ERROR;
+                       string errstr = N_("BibTeX error: ") + prevtoken;
+                       string msg = prevtoken + '\n' + token;
+                       terr.insertError(0,
+                                        from_local8bit(errstr),
+                                        from_local8bit(msg));
+               } 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));
+               }
+               prevtoken = token;
+       }
+       return retval;
+}
+
+
+int LaTeX::scanIlgFile(TeXErrors & terr)
+{
+       FileName const ilg_file(changeExtension(file.absFileName(), "ilg"));
+       LYXERR(Debug::LATEX, "Scanning ilg file: " << ilg_file);
+
+       ifstream ifs(ilg_file.toFilesystemEncoding().c_str());
+       string token;
+       int retval = NO_ERRORS;
+
+       string prevtoken;
+       while (getline(ifs, token)) {
+               token = rtrim(token, "\r");
+               smatch sub;
+               if (prefixIs(token, "!! "))
+                       prevtoken = token;
+               else if (!prevtoken.empty()) {
+                       retval |= INDEX_ERROR;
+                       string errstr = N_("Makeindex error: ") + prevtoken;
+                       string msg = prevtoken + '\n';
+                       msg += token;
+                       terr.insertError(0,
+                                        from_local8bit(errstr),
+                                        from_local8bit(msg));
+                       prevtoken.clear();
+               } 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));
+               }
+       }
+       return retval;
+}
+
+
+
 } // namespace lyx