Update RELEASE-NOTES

[lyx.git] / src / LaTeX.cpp

diff --git a/src/LaTeX.cpp b/src/LaTeX.cpp
index b024f774f41d4957dc082069687d9463aebf8c35..22a3a97d465022849fc0568923f635344a4b57d0 100644 (file)
--- a/src/LaTeX.cpp
+++ b/src/LaTeX.cpp
@@ -49,7 +49,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 {
 
@@ -94,7 +93,7 @@ bool operator!=(AuxInfo const & a, AuxInfo const & o)
 
 LaTeX::LaTeX(string const & latex, OutputParams const & rp,
             FileName const & f, string const & p)
-       : cmd(latex), file(f), path(p), runparams(rp)
+       : cmd(latex), file(f), path(p), runparams(rp), biber(false)
 {
        num_errors = 0;
        if (prefixIs(cmd, "pdf")) { // Do we use pdflatex ?
@@ -184,7 +183,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");
@@ -292,13 +291,13 @@ int LaTeX::run(TeXErrors & terr)
                message(_("Running BibTeX."));
                updateBibtexDependencies(head, bibtex_info);
                rerun |= runBibTeX(bibtex_info, runparams);
-               if (biber) {
-                       // since biber writes no info to the aux file, we have
-                       // to parse the blg file (which only exists after biber
-                       // was first issued)
-                       FileName const blgfile(changeExtension(file.absFileName(), ".blg"));
-                       if (blgfile.exists())
-                               scanBlgFile(head);
+               FileName const blgfile(changeExtension(file.absFileName(), ".blg"));
+               if (blgfile.exists()) {
+                       int bscanres = scanBlgFile(head, terr);
+                       if (bscanres & ERRORS) {
+                               deleteFilesOnError();
+                               return bscanres; // return on error
+                       }
                }
        } else if (!had_depfile) {
                /// If we run pdflatex on the file after running latex on it,
@@ -352,6 +351,14 @@ int LaTeX::run(TeXErrors & terr)
                message(_("Running BibTeX."));
                updateBibtexDependencies(head, bibtex_info);
                rerun |= runBibTeX(bibtex_info, runparams);
+               FileName const blgfile(changeExtension(file.absFileName(), ".blg"));
+               if (blgfile.exists()) {
+                       int bscanres = scanBlgFile(head, terr);
+                       if (bscanres & ERRORS) {
+                               deleteFilesOnError();
+                               return bscanres; // return on error
+                       }
+               }
        }
 
        // 4
@@ -578,7 +585,8 @@ void LaTeX::updateBibtexDependencies(DepTable & dep,
        // biber writes nothing into the aux file.
        // Instead, we have to scan the blg file
        if (biber) {
-               scanBlgFile(dep);
+               TeXErrors terr;
+               scanBlgFile(dep, terr);
        }
 }
 
@@ -694,6 +702,10 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                   && 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
@@ -1229,7 +1241,7 @@ void LaTeX::deplog(DepTable & head)
 }
 
 
-void LaTeX::scanBlgFile(DepTable & dep)
+int LaTeX::scanBlgFile(DepTable & dep, TeXErrors & terr)
 {
        FileName const blg_file(changeExtension(file.absFileName(), "blg"));
        LYXERR(Debug::LATEX, "Scanning blg file: " << blg_file);
@@ -1237,7 +1249,15 @@ void LaTeX::scanBlgFile(DepTable & dep)
        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;
@@ -1251,7 +1271,42 @@ void LaTeX::scanBlgFile(DepTable & dep)
                                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;
 }