Continue to improve GtkLengthEntry

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 92ee3ac0ce78b8dc2e26167052383621268954af..84b7748ef0f37d5f8d5a218b075f57469bb722ff 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -21,13 +21,13 @@
 #include "debug.h"
 #include "DepTable.h"
 #include "support/filetools.h"
-#include "support/FileInfo.h"
-#include "support/tostr.h"
+#include "support/convert.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/systemcall.h"
 #include "support/os.h"
 
+#include <boost/filesystem/operations.hpp>
 #include <boost/regex.hpp>
 
 #include <fstream>
@@ -36,7 +36,6 @@ using lyx::support::AbsolutePath;
 using lyx::support::bformat;
 using lyx::support::ChangeExtension;
 using lyx::support::contains;
-using lyx::support::FileInfo;
 using lyx::support::findtexfile;
 using lyx::support::getcwd;
 using lyx::support::OnlyFilename;
@@ -51,6 +50,7 @@ using lyx::support::unlink;
 using lyx::support::trim;
 
 namespace os = lyx::support::os;
+namespace fs = boost::filesystem;
 
 using boost::regex;
 using boost::smatch;
@@ -197,8 +197,7 @@ int LaTeX::run(TeXErrors & terr)
        //             remake the dependency file.
        //
 
-       FileInfo fi(depfile);
-       bool had_depfile = fi.exist();
+       bool had_depfile = fs::exists(depfile);
        bool run_bibtex = false;
        string aux_file = OnlyFilename(ChangeExtension(file, "aux"));
 
@@ -214,7 +213,7 @@ int LaTeX::run(TeXErrors & terr)
                // 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 (even if they are the same).
-               if (!FileInfo(output_file).exist()) {
+               if (!fs::exists(output_file)) {
                        lyxerr[Debug::DEPEND]
                                << "re-running LaTeX because output file doesn't exist." << endl;
                } else if (!head.sumchange()) {
@@ -412,10 +411,10 @@ LaTeX::scanAuxFiles(string const & file)
        result.push_back(scanAuxFile(file));
 
        for (int i = 1; i < 1000; ++i) {
-               string file2 = ChangeExtension(file, "") + '.' + convert<string>(i)
+               string const file2 = ChangeExtension(file, "")
+                       + '.' + convert<string>(i)
                        + ".aux";
-               FileInfo fi(file2);
-               if (!fi.exist())
+               if (!fs::exists(file2))
                        break;
                result.push_back(scanAuxFile(file2));
        }
@@ -546,7 +545,8 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                if (token.empty())
                        continue;
 
-               if (prefixIs(token, "LaTeX Warning:")) {
+               if (prefixIs(token, "LaTeX Warning:") ||
+                   prefixIs(token, "! pdfTeX warning")) {
                        // Here shall we handle different
                        // types of warnings
                        retval |= LATEX_WARNING;
@@ -688,7 +688,7 @@ void handleFoundFile(string const & ff, DepTable & head)
                // On initial insert we want to do the update at once
                // since this file can not be a file generated by
                // the latex run.
-               if (FileInfo(foundfile).exist())
+               if (fs::exists(foundfile))
                        head.insert(foundfile, true);
 
                return;
@@ -698,7 +698,7 @@ void handleFoundFile(string const & ff, DepTable & head)
 
        // (2) foundfile is in the tmpdir
        //     insert it into head
-       if (FileInfo(onlyfile).exist()) {
+       if (fs::exists(onlyfile)) {
                static regex unwanted("^.*\\.(aux|log|dvi|bbl|ind|glo)$");
                if (regex_match(onlyfile, unwanted)) {
                        lyxerr[Debug::DEPEND]