]> git.lyx.org Git - lyx.git/blobdiff - src/LaTeX.cpp
prepare Qt 5.6 builds
[lyx.git] / src / LaTeX.cpp
index 44ce5e72276cca6db4561a6aca9e3eb3fbe64f16..37c8703b0d125a0c597c143dc1859794d56301cf 100644 (file)
@@ -4,11 +4,11 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Alfredo Braunstein
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Jean-Marc Lasgouttes
  * \author Angus Leeming
  * \author Dekel Tsur
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
 
 #include "BufferList.h"
 #include "LaTeX.h"
-#include "gettext.h"
 #include "LyXRC.h"
-#include "debug.h"
 #include "DepTable.h"
 
-#include "support/filetools.h"
+#include "support/debug.h"
 #include "support/convert.h"
+#include "support/FileName.h"
+#include "support/filetools.h"
+#include "support/gettext.h"
 #include "support/lstrings.h"
-#include "support/lyxlib.h"
 #include "support/Systemcall.h"
 #include "support/os.h"
 
-#include <boost/filesystem/operations.hpp>
-#include <boost/filesystem/path.hpp>
-#include <boost/regex.hpp>
+#include "support/regex.h"
 
 #include <fstream>
+#include <stack>
 
 
-namespace lyx {
+using namespace std;
+using namespace lyx::support;
 
-using support::absolutePath;
-using support::bformat;
-using support::changeExtension;
-using support::contains;
-using support::FileName;
-using support::findtexfile;
-using support::getcwd;
-using support::makeAbsPath;
-using support::onlyFilename;
-using support::prefixIs;
-using support::quoteName;
-using support::removeExtension;
-using support::rtrim;
-using support::rsplit;
-using support::split;
-using support::subst;
-using support::suffixIs;
-using support::Systemcall;
-using support::unlink;
-using support::trim;
+namespace lyx {
 
 namespace os = support::os;
-namespace fs = boost::filesystem;
-
-using boost::regex;
-using boost::smatch;
-
-
-#ifndef CXX_GLOBAL_CSTD
-using std::sscanf;
-#endif
-
-using std::endl;
-using std::getline;
-using std::string;
-using std::ifstream;
-using std::set;
-using std::vector;
 
 // TODO: in no particular order
 // - get rid of the call to
@@ -84,9 +49,6 @@ using std::vector;
 //   different way.
 // - the makeindex style files should be taken care of with
 //   the dependency mechanism.
-// - makeindex commandline options should be supported
-// - somewhere support viewing of bibtex and makeindex log files.
-// - we should perhaps also scan the bibtex log file
 
 namespace {
 
@@ -102,23 +64,24 @@ docstring runMessage(unsigned int count)
  */
 
 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);
 }
 
 
-bool operator==(Aux_Info const & a, Aux_Info const & o)
+bool operator==(AuxInfo const & a, AuxInfo const & o)
 {
-       return a.aux_file == o.aux_file &&
-               a.citations == o.citations &&
-               a.databases == o.databases &&
-               a.styles == o.styles;
+       return a.aux_file == o.aux_file
+               && a.citations == o.citations
+               && a.databases == o.databases
+               && a.styles == o.styles;
 }
 
 
-bool operator!=(Aux_Info const & a, Aux_Info const & o)
+bool operator!=(AuxInfo const & a, AuxInfo const & o)
 {
        return !(a == o);
 }
@@ -129,52 +92,64 @@ bool operator!=(Aux_Info const & a, Aux_Info 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 const clean_start)
+       : cmd(latex), file(f), path(p), lpath(lp), runparams(rp), biber(false)
 {
        num_errors = 0;
        if (prefixIs(cmd, "pdf")) { // Do we use pdflatex ?
-               depfile = FileName(file.absFilename() + ".dep-pdf");
+               depfile = FileName(file.absFileName() + ".dep-pdf");
                output_file =
-                       FileName(changeExtension(file.absFilename(), ".pdf"));
+                       FileName(changeExtension(file.absFileName(), ".pdf"));
        } else {
-               depfile = FileName(file.absFilename() + ".dep");
+               depfile = FileName(file.absFileName() + ".dep");
                output_file =
-                       FileName(changeExtension(file.absFilename(), ".dvi"));
+                       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?
 
        // This will at least make latex do all the runs
-       unlink(depfile);
+       depfile.removeFile();
 
        // but the reason for the error might be in a generated file...
 
        // bibtex file
-       FileName const bbl(changeExtension(file.absFilename(), ".bbl"));
-       unlink(bbl);
+       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"));
-       unlink(ind);
+       FileName const ind(changeExtension(file.absFileName(), ".ind"));
+       ind.removeFile();
 
        // nomencl file
-       FileName const nls(changeExtension(file.absFilename(), ".nls"));
-       unlink(nls);
+       FileName const nls(changeExtension(file.absFileName(), ".nls"));
+       nls.removeFile();
 
        // nomencl file (old version of the package)
-       FileName const gls(changeExtension(file.absFilename(), ".gls"));
-       unlink(gls);
+       FileName const gls(changeExtension(file.absFileName(), ".gls"));
+       gls.removeFile();
 
        // Also remove the aux file
-       FileName const aux(changeExtension(file.absFilename(), ".aux"));
-       unlink(aux);
+       FileName const aux(changeExtension(file.absFileName(), ".aux"));
+       aux.removeFile();
+
+       // Remove the output file, which is often generated even if error
+       output_file.removeFile();
 }
 
 
@@ -182,10 +157,11 @@ int LaTeX::run(TeXErrors & terr)
        // We know that this function will only be run if the lyx buffer
        // has been changed. We also know that a newly written .tex file
        // is always different from the previous one because of the date
-       // in it. However it seems safe to run latex (at least) on time
+       // in it. However it seems safe to run latex (at least) one time
        // each time the .tex file changes.
 {
        int scanres = NO_ERRORS;
+       int bscanres = NO_ERRORS;
        unsigned int count = 0; // number of times run
        num_errors = 0; // just to make sure.
        unsigned int const MAX_RUN = 6;
@@ -193,11 +169,9 @@ int LaTeX::run(TeXErrors & terr)
        bool rerun = false; // rerun requested
 
        // The class LaTeX does not know the temp path.
-       theBufferList().updateIncludedTeXfiles(getcwd().absFilename(),
+       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
@@ -214,12 +188,12 @@ int LaTeX::run(TeXErrors & terr)
        //             remake the dependency file.
        //
 
-       bool had_depfile = fs::exists(depfile.toFilesystemEncoding());
+       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" << endl;
+               LYXERR(Debug::DEPEND, "Dependency file exists");
                // Read the dep file:
                had_depfile = head.read(depfile);
        }
@@ -229,52 +203,46 @@ int LaTeX::run(TeXErrors & terr)
                head.update();
                // Can't just check if anything has changed because it might
                // have aborted on error last time... in which cas we need
-               // to re-run latex and collect the error messages 
+               // to re-run latex and collect the error messages
                // (even if they are the same).
-               if (!fs::exists(output_file.toFilesystemEncoding())) {
-                       LYXERR(Debug::DEPEND)
-                               << "re-running LaTeX because output file doesn't exist."
-                               << endl;
+               if (!output_file.exists()) {
+                       LYXERR(Debug::DEPEND,
+                               "re-running LaTeX because output file doesn't exist.");
                } else if (!head.sumchange()) {
-                       LYXERR(Debug::DEPEND) << "return no_change" << endl;
+                       LYXERR(Debug::DEPEND, "return no_change");
                        return NO_CHANGE;
                } else {
-                       LYXERR(Debug::DEPEND)
-                               << "Dependency file has changed" << endl;
+                       LYXERR(Debug::DEPEND, "Dependency file has changed");
                }
 
                if (head.extchanged(".bib") || head.extchanged(".bst"))
                        run_bibtex = true;
        } else
-               LYXERR(Debug::DEPEND)
-                       << "Dependency file does not exist, or has wrong format"
-                       << endl;
+               LYXERR(Debug::DEPEND,
+                       "Dependency file does not exist, or has wrong format");
 
        /// We scan the aux file even when had_depfile = false,
        /// because we can run pdflatex on the file after running latex on it,
        /// in which case we will not need to run bibtex again.
-       vector<Aux_Info> bibtex_info_old;
+       vector<AuxInfo> bibtex_info_old;
        if (!run_bibtex)
                bibtex_info_old = scanAuxFiles(aux_file);
 
        ++count;
-       LYXERR(Debug::LATEX) << "Run #" << count << endl;
+       LYXERR(Debug::LATEX, "Run #" << count);
        message(runMessage(count));
 
-       startscript();
+       int exit_code = startscript();
+
        scanres = scanLogFile(terr);
        if (scanres & ERROR_RERUN) {
-               LYXERR(Debug::LATEX) << "Rerunning LaTeX" << endl;
-               startscript();
+               LYXERR(Debug::LATEX, "Rerunning LaTeX");
+               terr.clearErrors();
+               exit_code = startscript();
                scanres = scanLogFile(terr);
        }
 
-       if (scanres & ERRORS) {
-               deleteFilesOnError();
-               return scanres; // return on error
-       }
-
-       vector<Aux_Info> const bibtex_info = scanAuxFiles(aux_file);
+       vector<AuxInfo> const bibtex_info = scanAuxFiles(aux_file);
        if (!run_bibtex && bibtex_info_old != bibtex_info)
                run_bibtex = true;
 
@@ -282,7 +250,7 @@ int LaTeX::run(TeXErrors & terr)
        deplog(head); // reads the latex log
        head.update();
 
-       // 0.5
+       // 1
        // At this point we must run external programs if needed.
        // makeindex will be run if a .idx file changed or was generated.
        // And if there were undefined citations or changes in references
@@ -291,25 +259,35 @@ int LaTeX::run(TeXErrors & terr)
 
        // memoir (at least) writes an empty *idx file in the first place.
        // A second latex run is needed.
-       FileName const idxfile(changeExtension(file.absFilename(), ".idx"));
-       rerun = fs::exists(idxfile.toFilesystemEncoding()) &&
-               fs::is_empty(idxfile.toFilesystemEncoding());
+       FileName const idxfile(changeExtension(file.absFileName(), ".idx"));
+       rerun = idxfile.exists() && idxfile.isFileEmpty();
 
        // run makeindex
        if (head.haschanged(idxfile)) {
                // no checks for now
-               LYXERR(Debug::LATEX) << "Running MakeIndex." << endl;
-               message(_("Running MakeIndex."));
-               // onlyFilename() is needed for cygwin
-               rerun |= runMakeIndex(onlyFilename(idxfile.absFilename()),
+               LYXERR(Debug::LATEX, "Running MakeIndex.");
+               message(_("Running Index Processor."));
+               // onlyFileName() is needed for cygwin
+               rerun |= runMakeIndex(onlyFileName(idxfile.absFileName()),
                                runparams);
        }
-       FileName const nlofile(changeExtension(file.absFilename(), ".nlo"));
-       if (head.haschanged(nlofile))
-               rerun |= runMakeIndexNomencl(file, runparams, ".nlo", ".nls");
-       FileName const glofile(changeExtension(file.absFilename(), ".glo"));
+       FileName const nlofile(changeExtension(file.absFileName(), ".nlo"));
+       // If all nomencl entries are removed, nomencl writes an empty nlo file.
+       // DepTable::hasChanged() returns false in this case, since it does not
+       // distinguish empty files from non-existing files. This is why we need
+       // the extra checks here (to trigger a rerun). Cf. discussions in #8905.
+       // FIXME: Sort out the real problem in DepTable.
+       if (head.haschanged(nlofile) || (nlofile.exists() && nlofile.isFileEmpty()))
+               rerun |= runMakeIndexNomencl(file, ".nlo", ".nls");
+       FileName const glofile(changeExtension(file.absFileName(), ".glo"));
        if (head.haschanged(glofile))
-               rerun |= runMakeIndexNomencl(file, runparams, ".glo", ".gls");
+               rerun |= runMakeIndexNomencl(file, ".glo", ".gls");
+
+       // 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)
@@ -318,10 +296,13 @@ int LaTeX::run(TeXErrors & terr)
                // "\bibdata" and/or "\bibstyle". If one of those
                // tags is found -> run bibtex and set rerun = true;
                // no checks for now
-               LYXERR(Debug::LATEX) << "Running BibTeX." << endl;
+               LYXERR(Debug::LATEX, "Running BibTeX.");
                message(_("Running BibTeX."));
                updateBibtexDependencies(head, bibtex_info);
-               rerun |= runBibTeX(bibtex_info);
+               rerun |= runBibTeX(bibtex_info, runparams);
+               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
@@ -329,7 +310,7 @@ int LaTeX::run(TeXErrors & terr)
                updateBibtexDependencies(head, bibtex_info);
        }
 
-       // 1
+       // 2
        // we know on this point that latex has been run once (or we just
        // returned) and the question now is to decide if we need to run
        // it any more. This is done by asking if any of the files in the
@@ -339,35 +320,44 @@ int LaTeX::run(TeXErrors & terr)
        //             run latex once more and
        //             update the dependency structure
        //     -> if not changed:
-       //             we does nothing at this point
+       //             we do nothing at this point
        //
        if (rerun || head.sumchange()) {
                rerun = false;
                ++count;
-               LYXERR(Debug::DEPEND)
-                       << "Dep. file has changed or rerun requested"
-                       << endl;
-               LYXERR(Debug::LATEX)
-                       << "Run #" << count << endl;
+               LYXERR(Debug::DEPEND, "Dep. file has changed or rerun requested");
+               LYXERR(Debug::LATEX, "Run #" << count);
                message(runMessage(count));
                startscript();
                scanres = scanLogFile(terr);
-               if (scanres & ERRORS) {
-                       deleteFilesOnError();
-                       return scanres; // return on error
-               }
 
                // update the depedencies
                deplog(head); // reads the latex log
                head.update();
        } else {
-               LYXERR(Debug::DEPEND)
-                       << "Dep. file has NOT changed"
-                       << endl;
+               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) {
+               // 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;
+               // no checks for now
+               LYXERR(Debug::LATEX, "Running BibTeX.");
+               message(_("Running BibTeX."));
+               updateBibtexDependencies(head, bibtex_info);
+               rerun |= runBibTeX(bibtex_info, runparams);
+               FileName const blgfile(changeExtension(file.absFileName(), ".blg"));
+               if (blgfile.exists())
+                       bscanres = scanBlgFile(head, terr);
        }
 
-       // 1.5
-       // The inclusion of files generated by external programs like
+       // 4
+       // The inclusion of files generated by external programs such as
        // makeindex or bibtex might have done changes to pagenumbering,
        // etc. And because of this we must run the external programs
        // again to make sure everything is redone correctly.
@@ -377,20 +367,20 @@ int LaTeX::run(TeXErrors & terr)
        // run makeindex if the <file>.idx has changed or was generated.
        if (head.haschanged(idxfile)) {
                // no checks for now
-               LYXERR(Debug::LATEX) << "Running MakeIndex." << endl;
-               message(_("Running MakeIndex."));
-               // onlyFilename() is needed for cygwin
-               rerun = runMakeIndex(onlyFilename(changeExtension(
-                               file.absFilename(), ".idx")), runparams);
+               LYXERR(Debug::LATEX, "Running MakeIndex.");
+               message(_("Running Index Processor."));
+               // onlyFileName() is needed for cygwin
+               rerun = runMakeIndex(onlyFileName(changeExtension(
+                               file.absFileName(), ".idx")), runparams);
        }
 
        // I am not pretty sure if need this twice.
        if (head.haschanged(nlofile))
-               rerun |= runMakeIndexNomencl(file, runparams, ".nlo", ".nls");
+               rerun |= runMakeIndexNomencl(file, ".nlo", ".nls");
        if (head.haschanged(glofile))
-               rerun |= runMakeIndexNomencl(file, runparams, ".glo", ".gls");
+               rerun |= runMakeIndexNomencl(file, ".glo", ".gls");
 
-       // 2
+       // 5
        // we will only run latex more if the log file asks for it.
        // or if the sumchange() is true.
        //     -> rerun asked for:
@@ -406,14 +396,10 @@ int LaTeX::run(TeXErrors & terr)
                // MAX_RUNS are reached.
                rerun = false;
                ++count;
-               LYXERR(Debug::LATEX) << "Run #" << count << endl;
+               LYXERR(Debug::LATEX, "Run #" << count);
                message(runMessage(count));
                startscript();
                scanres = scanLogFile(terr);
-               if (scanres & ERRORS) {
-                       deleteFilesOnError();
-                       return scanres; // return on error
-               }
 
                // keep this updated
                head.update();
@@ -421,67 +407,91 @@ int LaTeX::run(TeXErrors & terr)
 
        // Write the dependencies to file.
        head.write(depfile);
-       LYXERR(Debug::LATEX) << "Done." << endl;
+
+       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
+
        return scanres;
 }
 
 
 int LaTeX::startscript()
 {
-       // onlyFilename() is needed for cygwin
+       // onlyFileName() is needed for cygwin
        string tmp = cmd + ' '
-                    + quoteName(onlyFilename(file.toFilesystemEncoding()))
+                    + quoteName(onlyFileName(file.toFilesystemEncoding()))
                     + " > " + os::nulldev();
        Systemcall one;
-       return one.startscript(Systemcall::Wait, tmp);
+       return one.startscript(Systemcall::Wait, tmp, path, lpath);
 }
 
 
 bool LaTeX::runMakeIndex(string const & f, OutputParams const & runparams,
-                         string const & params)
+                        string const & params)
 {
-       LYXERR(Debug::LATEX)
-               << "idx file has been made, running makeindex on file "
-               << f << endl;
-       string tmp = lyxrc.index_command + ' ';
+       string tmp = runparams.use_japanese ?
+               lyxrc.jindex_command : lyxrc.index_command;
        
+       if (!runparams.index_command.empty())
+               tmp = runparams.index_command;
+
+       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 = lyxrc.splitindex_command + " -m " + quoteName(tmp);
+               LYXERR(Debug::LATEX,
+               "Multiple indices. Using splitindex command: " << tmp);
+       }
+       tmp += ' ';
        tmp += quoteName(f);
        tmp += params;
        Systemcall one;
-       one.startscript(Systemcall::Wait, tmp);
+       one.startscript(Systemcall::Wait, tmp, path, lpath);
        return true;
 }
 
 
 bool LaTeX::runMakeIndexNomencl(FileName const & file,
-               OutputParams const & runparams,
                string const & nlo, string const & nls)
 {
-       LYXERR(Debug::LATEX) << "Running MakeIndex for nomencl." << endl;
+       LYXERR(Debug::LATEX, "Running MakeIndex for nomencl.");
        message(_("Running MakeIndex for nomencl."));
-       // onlyFilename() is needed for cygwin
-       string const nomenclstr = " -s nomencl.ist -o "
-               + onlyFilename(changeExtension(file.toFilesystemEncoding(), nls));
-       return runMakeIndex(
-                       onlyFilename(changeExtension(file.absFilename(), nlo)),
-                       runparams, nomenclstr);
+       string tmp = lyxrc.nomencl_command + ' ';
+       // onlyFileName() is needed for cygwin
+       tmp += quoteName(onlyFileName(changeExtension(file.absFileName(), nlo)));
+       tmp += " -o "
+               + onlyFileName(changeExtension(file.toFilesystemEncoding(), nls));
+       Systemcall one;
+       one.startscript(Systemcall::Wait, tmp, path, lpath);
+       return true;
 }
 
 
-vector<Aux_Info> const
+vector<AuxInfo> const
 LaTeX::scanAuxFiles(FileName const & file)
 {
-       vector<Aux_Info> result;
+       vector<AuxInfo> result;
 
        result.push_back(scanAuxFile(file));
 
-       string const basename = removeExtension(file.absFilename());
+       string const basename = removeExtension(file.absFileName());
        for (int i = 1; i < 1000; ++i) {
                FileName const file2(basename
                        + '.' + convert<string>(i)
                        + ".aux");
-               if (!fs::exists(file2.toFilesystemEncoding()))
+               if (!file2.exists())
                        break;
                result.push_back(scanAuxFile(file2));
        }
@@ -489,18 +499,18 @@ LaTeX::scanAuxFiles(FileName const & file)
 }
 
 
-Aux_Info const LaTeX::scanAuxFile(FileName const & file)
+AuxInfo const LaTeX::scanAuxFile(FileName const & file)
 {
-       Aux_Info result;
+       AuxInfo result;
        result.aux_file = file;
        scanAuxFile(file, result);
        return result;
 }
 
 
-void LaTeX::scanAuxFile(FileName const & file, Aux_Info & aux_info)
+void LaTeX::scanAuxFile(FileName const & file, AuxInfo & aux_info)
 {
-       LYXERR(Debug::LATEX) << "Scanning aux file: " << file << endl;
+       LYXERR(Debug::LATEX, "Scanning aux file: " << file);
 
        ifstream ifs(file.toFilesystemEncoding().c_str());
        string token;
@@ -520,8 +530,7 @@ void LaTeX::scanAuxFile(FileName const & file, Aux_Info & aux_info)
                        while (!data.empty()) {
                                string citation;
                                data = split(data, citation, ',');
-                               LYXERR(Debug::LATEX) << "Citation: "
-                                                    << citation << endl;
+                               LYXERR(Debug::LATEX, "Citation: " << citation);
                                aux_info.citations.insert(citation);
                        }
                } else if (regex_match(token, sub, reg2)) {
@@ -532,8 +541,7 @@ void LaTeX::scanAuxFile(FileName const & file, Aux_Info & aux_info)
                                string database;
                                data = split(data, database, ',');
                                database = changeExtension(database, "bib");
-                               LYXERR(Debug::LATEX) << "BibTeX database: `"
-                                                    << database << '\'' << endl;
+                               LYXERR(Debug::LATEX, "BibTeX database: `" << database << '\'');
                                aux_info.databases.insert(database);
                        }
                } else if (regex_match(token, sub, reg3)) {
@@ -541,8 +549,7 @@ void LaTeX::scanAuxFile(FileName const & file, Aux_Info & aux_info)
                        // token is now the style file
                        // pass it to the helper
                        style = changeExtension(style, "bst");
-                       LYXERR(Debug::LATEX) << "BibTeX style: `"
-                                            << style << '\'' << endl;
+                       LYXERR(Debug::LATEX, "BibTeX style: `" << style << '\'');
                        aux_info.styles.insert(style);
                } else if (regex_match(token, sub, reg4)) {
                        string const file2 = sub.str(1);
@@ -553,15 +560,15 @@ void LaTeX::scanAuxFile(FileName const & file, Aux_Info & aux_info)
 
 
 void LaTeX::updateBibtexDependencies(DepTable & dep,
-                                    vector<Aux_Info> const & bibtex_info)
+                                    vector<AuxInfo> const & bibtex_info)
 {
        // Since a run of Bibtex mandates more latex runs it is ok to
        // remove all ".bib" and ".bst" files.
        dep.remove_files_with_extension(".bib");
        dep.remove_files_with_extension(".bst");
-       //string aux = OnlyFilename(ChangeExtension(file, ".aux"));
+       //string aux = OnlyFileName(ChangeExtension(file, ".aux"));
 
-       for (vector<Aux_Info>::const_iterator it = bibtex_info.begin();
+       for (vector<AuxInfo>::const_iterator it = bibtex_info.begin();
             it != bibtex_info.end(); ++it) {
                for (set<string>::const_iterator it2 = it->databases.begin();
                     it2 != it->databases.end(); ++it2) {
@@ -577,24 +584,37 @@ 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<Aux_Info> const & bibtex_info)
+bool LaTeX::runBibTeX(vector<AuxInfo> const & bibtex_info,
+                     OutputParams const & runparams)
 {
        bool result = false;
-       for (vector<Aux_Info>::const_iterator it = bibtex_info.begin();
+       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 = lyxrc.bibtex_command + " ";
-               // onlyFilename() is needed for cygwin
-               tmp += quoteName(onlyFilename(removeExtension(
-                               it->aux_file.absFilename())));
+               string tmp = runparams.use_japanese ?
+                       lyxrc.jbibtex_command : lyxrc.bibtex_command;
+
+               if (!runparams.bibtex_command.empty())
+                       tmp = runparams.bibtex_command;
+               tmp += " ";
+               // onlyFileName() is needed for cygwin
+               tmp += quoteName(onlyFileName(removeExtension(
+                               it->aux_file.absFileName())));
                Systemcall one;
-               one.startscript(Systemcall::Wait, tmp);
+               one.startscript(Systemcall::Wait, tmp, path, lpath);
        }
        // Return whether bibtex was run
        return result;
@@ -607,10 +627,19 @@ int LaTeX::scanLogFile(TeXErrors & terr)
        int line_count = 1;
        int retval = NO_ERRORS;
        string tmp =
-               onlyFilename(changeExtension(file.absFilename(), ".log"));
-       LYXERR(Debug::LATEX) << "Log file: " << tmp << endl;
+               onlyFileName(changeExtension(file.absFileName(), ".log"));
+       LYXERR(Debug::LATEX, "Log file: " << tmp);
        FileName const fn = FileName(makeAbsPath(tmp));
        ifstream ifs(fn.toFilesystemEncoding().c_str());
+       bool fle_style = false;
+       static regex const file_line_error(".+\\.\\D+:[0-9]+: (.+)");
+       static regex const child_file(".*([0-9]+[A-Za-z]*_.+\\.tex).*");
+       // 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;
 
        string token;
        while (getline(ifs, token)) {
@@ -620,26 +649,66 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                // \r's afterwards, since we need to remove them anyway.
                token = subst(token, '\0', '\r');
                token = subst(token, "\r", "");
+               smatch sub;
 
-               LYXERR(Debug::LATEX) << "Log line: " << token << endl;
+               LYXERR(Debug::LATEX, "Log line: " << token);
 
                if (token.empty())
                        continue;
 
+               // 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);
+                                       child.push(make_pair(name, pnest));
+                                       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")) {
                        // Here shall we handle different
                        // types of warnings
                        retval |= LATEX_WARNING;
-                       LYXERR(Debug::LATEX) << "LaTeX Warning." << endl;
+                       LYXERR(Debug::LATEX, "LaTeX Warning.");
                        if (contains(token, "Rerun to get cross-references")) {
                                retval |= RERUN;
-                               LYXERR(Debug::LATEX)
-                                       << "We should rerun." << endl;
+                               LYXERR(Debug::LATEX, "We should rerun.");
+                       // package clefval needs 2 latex runs before bibtex
+                       } else if (contains(token, "Value of")
+                                  && contains(token, "on page")
+                                  && contains(token, "undefined")) {
+                               retval |= ERROR_RERUN;
+                               LYXERR(Debug::LATEX, "Force rerun.");
+                       // package etaremune
+                       } else if (contains(token, "Etaremune labels have changed")) {
+                               retval |= ERROR_RERUN;
+                               LYXERR(Debug::LATEX, "Force rerun.");
                        } else if (contains(token, "Citation")
                                   && contains(token, "on page")
                                   && contains(token, "undefined")) {
                                retval |= UNDEF_CIT;
+                       } else if (contains(token, "Citation")
+                                  && contains(token, "on input line")
+                                  && contains(token, "undefined")) {
+                               retval |= UNDEF_CIT;
                        }
                } else if (prefixIs(token, "Package")) {
                        // Package warnings
@@ -653,44 +722,106 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                }
                        } 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")) {
                                // at least longtable.sty and bibtopic.sty
                                // might use this.
-                               LYXERR(Debug::LATEX)
-                                       << "We should rerun." << endl;
+                               LYXERR(Debug::LATEX, "We should rerun.");
+                               retval |= RERUN;
+                       }
+               } else if (prefixIs(token, "LETTRE WARNING:")) {
+                       if (contains(token, "veuillez recompiler")) {
+                               // lettre.cls
+                               LYXERR(Debug::LATEX, "We should rerun.");
                                retval |= RERUN;
                        }
                } else if (token[0] == '(') {
                        if (contains(token, "Rerun LaTeX") ||
                            contains(token, "Rerun to get")) {
                                // Used by natbib
-                               LYXERR(Debug::LATEX)
-                                       << "We should rerun." << endl;
+                               LYXERR(Debug::LATEX, "We should rerun.");
                                retval |= RERUN;
                        }
-               } else if (prefixIs(token, "! ")) {
-                       // Ok, we have something that looks like a TeX Error
-                       // but what do we really have.
+               } else if (prefixIs(token, "! ")
+                           || (fle_style
+                               && regex_match(token, sub, file_line_error)
+                               && !contains(token, "pdfTeX warning"))) {
+                          // Ok, we have something that looks like a TeX Error
+                          // but what do we really have.
 
                        // Just get the error description:
-                       string desc(token, 2);
+                       string desc;
+                       if (prefixIs(token, "! "))
+                               desc = string(token, 2);
+                       else if (fle_style)
+                               desc = sub.str();
                        if (contains(token, "LaTeX Error:"))
                                retval |= LATEX_ERROR;
+
+                       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, "! 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;
+                               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),
+                                                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"))
+                                       "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;
@@ -699,6 +830,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, "! ")
@@ -706,11 +838,10 @@ 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 << endl;
+                               LYXERR(Debug::LATEX, "line: " << line << '\n'
+                                       << "Desc: " << desc << '\n' << "Text: " << errstr);
                                if (line == last_line)
                                        ++line_count;
                                else {
@@ -728,7 +859,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;
                                }
                        }
@@ -748,41 +880,35 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                        } else if (contains(token, "That makes 100 errors")) {
                                // More than 100 errors were reprted
                                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_local8bit(token),
+                                                child_name);
+                       } else if (prefixIs(token, "Missing character: There is no ")) {
+                               // XeTeX/LuaTeX error about missing glyph in selected font
+                               // (bug 9610)
+                               retval |= LATEX_ERROR;
+                               terr.insertError(0,
+                                                from_local8bit("Missing glyphs!"),
+                                                from_local8bit(token),
+                                                child_name);
                        }
                }
        }
-       LYXERR(Debug::LATEX) << "Log line: " << token << endl;
+       LYXERR(Debug::LATEX, "Log line: " << token);
        return retval;
 }
 
 
 namespace {
 
-/**
- * Wrapper around fs::exists that can handle invalid file names.
- * In theory we could test with fs::native whether a filename is valid
- * before calling fs::exists, but in practice it is unusable: On windows it
- * does not allow spaces, and on unix it does not allow absolute file names.
- * This function has the disadvantage that it catches also other errors than
- * invalid names, but for dependency checking we can live with that.
- */
-bool exists(FileName const & possible_name) {
-       try {
-               return fs::exists(possible_name.toFilesystemEncoding());
-       }
-       catch (fs::filesystem_error const & fe) {
-               LYXERR(Debug::DEPEND) << "Got error `" << fe.what()
-                       << "' while checking whether file `" << possible_name
-                       << "' exists." << endl;
-               return false;
-       }
-}
-
-
 bool insertIfExists(FileName const & absname, DepTable & head)
 {
-       if (exists(absname) &&
-           !fs::is_directory(absname.toFilesystemEncoding())) {
+       if (absname.exists() && !absname.isDirectory()) {
                head.insert(absname, true);
                return true;
        }
@@ -795,7 +921,7 @@ bool handleFoundFile(string const & ff, DepTable & head)
        // convert from native os path to unix path
        string foundfile = os::internal_path(trim(ff));
 
-       LYXERR(Debug::DEPEND) << "Found file: " << foundfile << endl;
+       LYXERR(Debug::DEPEND, "Found file: " << foundfile);
 
        // Ok now we found a file.
        // Now we should make sure that this is a file that we can
@@ -806,13 +932,13 @@ bool handleFoundFile(string const & ff, DepTable & head)
        // (1) foundfile is an
        //     absolute path and should
        //     be inserted.
-       if (absolutePath(foundfile)) {
-               LYXERR(Debug::DEPEND) << "AbsolutePath file: "
-                                     << foundfile << endl;
+       FileName absname;
+       if (FileName::isAbsolute(foundfile)) {
+               LYXERR(Debug::DEPEND, "AbsolutePath file: " << foundfile);
                // On initial insert we want to do the update at once
                // since this file cannot be a file generated by
                // the latex run.
-               FileName absname(foundfile);
+               absname.set(foundfile);
                if (!insertIfExists(absname, head)) {
                        // check for spaces
                        string strippedfile = foundfile;
@@ -834,12 +960,12 @@ bool handleFoundFile(string const & ff, DepTable & head)
                }
        }
 
-       string onlyfile = onlyFilename(foundfile);
-       FileName absname(makeAbsPath(onlyfile));
+       string onlyfile = onlyFileName(foundfile);
+       absname = makeAbsPath(onlyfile);
 
        // check for spaces
        while (contains(foundfile, ' ')) {
-               if (exists(absname))
+               if (absname.exists())
                        // everything o.k.
                        break;
                else {
@@ -847,65 +973,117 @@ bool handleFoundFile(string const & ff, DepTable & head)
                        // marks; those have to be removed
                        string unquoted = subst(foundfile, "\"", "");
                        absname = makeAbsPath(unquoted);
-                       if (exists(absname))
+                       if (absname.exists())
                                break;
                        // strip off part after last space and try again
                        string strippedfile;
                        string const stripoff =
                                rsplit(foundfile, strippedfile, ' ');
                        foundfile = strippedfile;
-                       onlyfile = onlyFilename(strippedfile);
+                       onlyfile = onlyFileName(strippedfile);
                        absname = makeAbsPath(onlyfile);
                }
        }
 
        // (2) foundfile is in the tmpdir
        //     insert it into head
-       if (exists(absname) &&
-           !fs::is_directory(absname.toFilesystemEncoding())) {
+       if (absname.exists() && !absname.isDirectory()) {
                // FIXME: This regex contained glo, but glo is used by the old
                // version of nomencl.sty. Do we need to put it back?
-               static regex unwanted("^.*\\.(aux|log|dvi|bbl|ind)$");
+               static regex const unwanted("^.*\\.(aux|log|dvi|bbl|ind)$");
                if (regex_match(onlyfile, unwanted)) {
-                       LYXERR(Debug::DEPEND)
-                               << "We don't want "
-                               << onlyfile
-                               << " in the dep file"
-                               << endl;
+                       LYXERR(Debug::DEPEND, "We don't want " << onlyfile
+                               << " in the dep file");
                } else if (suffixIs(onlyfile, ".tex")) {
                        // This is a tex file generated by LyX
                        // and latex is not likely to change this
                        // during its runs.
-                       LYXERR(Debug::DEPEND)
-                               << "Tmpdir TeX file: "
-                               << onlyfile
-                               << endl;
+                       LYXERR(Debug::DEPEND, "Tmpdir TeX file: " << onlyfile);
                        head.insert(absname, true);
                } else {
-                       LYXERR(Debug::DEPEND)
-                               << "In tmpdir file:"
-                               << onlyfile
-                               << endl;
+                       LYXERR(Debug::DEPEND, "In tmpdir file:" << onlyfile);
                        head.insert(absname);
                }
                return true;
        } else {
-               LYXERR(Debug::DEPEND)
-                       << "Not a file or we are unable to find it."
-                       << endl;
+               LYXERR(Debug::DEPEND, "Not a file or we are unable to find it.");
                return false;
        }
 }
 
 
-bool checkLineBreak(string const & ff, DepTable & head)
+bool completeFilename(string const & ff, DepTable & head)
 {
-       if (contains(ff, '.'))
-               // if we have a dot, we let handleFoundFile decide
-               return handleFoundFile(ff, head);
-       else
-               // else, we suspect a line break
+       // If we do not find a dot, we suspect
+       // a fragmental file name
+       if (!contains(ff, '.'))
                return false;
+
+       // if we have a dot, we let handleFoundFile decide
+       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
@@ -918,38 +1096,41 @@ void LaTeX::deplog(DepTable & head)
        // entered into the dependency file.
 
        string const logfile =
-               onlyFilename(changeExtension(file.absFilename(), ".log"));
+               onlyFileName(changeExtension(file.absFileName(), ".log"));
 
-       static regex reg1("File: (.+).*");
-       static regex reg2("No file (.+)(.).*");
-       static regex reg3("\\\\openout[0-9]+.*=.*`(.+)(..).*");
+       static regex const reg1("File: (.+).*");
+       static regex const reg2("No file (.+)(.).*");
+       static regex const reg3("\\\\openout[0-9]+.*=.*`(.+)(..).*");
        // 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 reg4("Writing index file (.+).*");
-       // files also can be enclosed in <...>
-       static regex reg5("<([^>]+)(.).*");
-       static regex regoldnomencl("Writing glossary file (.+).*");
-       static regex regnomencl("Writing nomenclature file (.+).*");
+       static regex const reg4("Writing index file (.+).*");
+       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
        //    \openout# = `sample.toc'.
        // but only a line like this into the log:
        //    \tf@toc=\write#
        // This line is also written by tetex.
        // This line is not present if no toc should be created.
-       static regex miktexTocReg("\\\\tf@toc=\\\\write.*");
-       static regex reg6(".*\\([^)]+.*");
+       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));
+       FileName const fn = makeAbsPath(logfile);
        ifstream ifs(fn.toFilesystemEncoding().c_str());
        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
@@ -963,13 +1144,17 @@ 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 
+               // Here we exclude some cases where we are sure
                // that there is no continued filename
                if (!lastline.empty()) {
-                       static regex package_info("Package \\w+ Info: .*");
-                       static regex package_warning("Package \\w+ Warning: .*");
+                       static regex const package_info("Package \\w+ Info: .*");
+                       static regex const package_warning("Package \\w+ Warning: .*");
                        if (prefixIs(token, "File:") || prefixIs(token, "(Font)")
                            || prefixIs(token, "Package:")
                            || prefixIs(token, "Language:")
@@ -992,106 +1177,74 @@ 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;
+                               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) ||
-                          regex_match(token, sub, regoldnomencl))
-                       // check for dot
-                       found_file = checkLineBreak(sub.str(1), head);
-               // (7) "\tf@toc=\write<nr>" (for MikTeX)
+                       // 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))
+                       // 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(
-                                               file.absFilename(), ".toc")), head);
+                       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
@@ -1104,4 +1257,73 @@ 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 message;
+                       if ((prefixIs(token, "while executing---line")
+                            || prefixIs(token, "---line ")
+                            || prefixIs(token, "*Please notify the BibTeX"))
+                           && !prevtoken.empty()) {
+                               errstr = N_("BibTeX error: ") + prevtoken;
+                               message = prevtoken + '\n';
+                       }
+                       message += token;
+                       terr.insertError(0,
+                                        from_local8bit(errstr),
+                                        from_local8bit(message));
+               } else if (regex_match(prevtoken, sub, bibtexError3)) {
+                       retval |= BIBTEX_ERROR;
+                       string errstr = N_("BibTeX error: ") + prevtoken;
+                       string message = prevtoken + '\n' + token;
+                       terr.insertError(0,
+                                        from_local8bit(errstr),
+                                        from_local8bit(message));
+               } else if (regex_match(token, sub, biberError)) {
+                       retval |= BIBTEX_ERROR;
+                       string errstr = N_("Biber error: ") + sub.str(2);
+                       string message = token;
+                       terr.insertError(0,
+                                        from_local8bit(errstr),
+                                        from_local8bit(message));
+               }
+               prevtoken = token;
+       }
+       return retval;
+}
+
+
 } // namespace lyx