Alfredo's second patch

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 69f46d63f281a95864a7cbec897f8488332f0533..59886c918c08b7f8f184080f8218c81be576d2f9 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -28,7 +28,7 @@
 #include "support/path.h"
 
 #include <boost/regex.hpp>
-#include "BoostFormat.h"
+#include "support/BoostFormat.h"
 
 #include <fstream>
 #include <cstdio>  // sscanf
@@ -92,6 +92,22 @@ void TeXErrors::insertError(int line, string const & error_desc,
        errors.push_back(newerr);
 }
 
+
+bool operator==(Aux_Info const & a, Aux_Info const & o)
+{
+       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)
+{
+       return !(a == o);
+}
+
+
 /*
  * CLASS LaTeX
  */
@@ -180,7 +196,10 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
        if (had_depfile) {
                lyxerr[Debug::DEPEND] << "Dependency file exists" << endl;
                // Read the dep file:
-               head.read(depfile);
+               had_depfile = head.read(depfile);
+       }
+
+       if (had_depfile) {
                // Update the checksums
                head.update();
                // Can't just check if anything has changed because it might have aborted
@@ -201,7 +220,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                        run_bibtex = true;
        } else
                lyxerr[Debug::DEPEND]
-                       << "Dependency file does not exist" << endl;
+                       << "Dependency file does not exist, or has wrong format" << endl;
 
        /// We scan the aux file even when had_depfile = false,
        /// because we can run pdflatex on the file after running latex on it,
@@ -216,11 +235,11 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                showRunMessage(lfun, count);
        }
 
-       this->operator()();
+       startscript();
        scanres = scanLogFile(terr);
        if (scanres & ERROR_RERUN) {
                lyxerr[Debug::LATEX] << "Rerunning LaTeX" << endl;
-               this->operator()();
+               startscript();
                scanres = scanLogFile(terr);
        }
 
@@ -299,7 +318,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                        showRunMessage(lfun, count);
                }
 
-               this->operator()();
+               startscript();
                scanres = scanLogFile(terr);
                if (scanres & ERRORS) {
                        deleteFilesOnError();
@@ -353,7 +372,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                        showRunMessage(lfun, count);
                }
 
-               this->operator()();
+               startscript();
                scanres = scanLogFile(terr);
                if (scanres & ERRORS) {
                        deleteFilesOnError();
@@ -371,7 +390,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
 }
 
 
-int LaTeX::operator()()
+int LaTeX::startscript()
 {
 #ifndef __EMX__
        string tmp = cmd + ' ' + QuoteName(file) + " > /dev/null";