non-templated tostr in separate files

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index a4d8ab4f50841e452b77b7fe174ca8cecda6c2df..8908812d6fe5cf683a7300190fa033b79c6dfa6f 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -13,10 +13,6 @@
 
 #include <config.h>
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include "LaTeX.h"
 #include "bufferlist.h"
 #include "gettext.h"
@@ -25,6 +21,7 @@
 #include "funcrequest.h"
 #include "support/filetools.h"
 #include "support/FileInfo.h"
+#include "support/tostr.h"
 #include "support/lstrings.h"
 #include "support/lyxlib.h"
 #include "support/systemcall.h"
@@ -69,6 +66,16 @@ using boost::cmatch;
 
 extern BufferList bufferlist;
 
+namespace {
+
+void showRunMessage(LyXFunc * lf, unsigned int count)
+{
+       string str = bformat(_("Waiting for LaTeX run number %1$s"), tostr(count));
+       lf->dispatch(FuncRequest(LFUN_MESSAGE, str));
+}
+
+
+};
 /*
  * CLASS TEXERRORS
  */
@@ -80,6 +87,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
  */
@@ -140,7 +163,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
        bool rerun = false; // rerun requested
 
        // The class LaTeX does not know the temp path.
-       bufferlist.updateIncludedTeXfiles(lyx::getcwd()); //GetCWD());
+       bufferlist.updateIncludedTeXfiles(lyx::getcwd());
 
        // Never write the depfile if an error was encountered.
 
@@ -168,7 +191,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
@@ -189,7 +215,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,
@@ -201,16 +227,14 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
        ++count;
        lyxerr[Debug::LATEX] << "Run #" << count << endl;
        if (lfun) {
-               ostringstream str;
-               str << _("LaTeX run number") << ' ' << count;
-               lfun->dispatch(FuncRequest(LFUN_MESSAGE, STRCONV(str.str())));
+               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);
        }
 
@@ -286,13 +310,10 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                lyxerr[Debug::LATEX]
                        << "Run #" << count << endl;
                if (lfun) {
-                       ostringstream str;
-                       str << _("LaTeX run number") << ' ' << count;
-                       // check lyxstring string stream and gcc 3.1 before fixing
-                       lfun->dispatch(FuncRequest(LFUN_MESSAGE, STRCONV(str.str())));
+                       showRunMessage(lfun, count);
                }
 
-               this->operator()();
+               startscript();
                scanres = scanLogFile(terr);
                if (scanres & ERRORS) {
                        deleteFilesOnError();
@@ -343,12 +364,10 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                ++count;
                lyxerr[Debug::LATEX] << "Run #" << count << endl;
                if (lfun) {
-                       ostringstream str;
-                       str << _("LaTeX run number") << ' ' << count;
-                       lfun->dispatch(FuncRequest(LFUN_MESSAGE, STRCONV(str.str())));
+                       showRunMessage(lfun, count);
                }
 
-               this->operator()();
+               startscript();
                scanres = scanLogFile(terr);
                if (scanres & ERRORS) {
                        deleteFilesOnError();
@@ -366,7 +385,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
 }
 
 
-int LaTeX::operator()()
+int LaTeX::startscript()
 {
 #ifndef __EMX__
        string tmp = cmd + ' ' + QuoteName(file) + " > /dev/null";
@@ -404,7 +423,7 @@ LaTeX::scanAuxFiles(string const & file)
        result.push_back(scanAuxFile(file));
 
        for (int i = 1; i < 1000; ++i) {
-               string file2 = ChangeExtension(file, "") + "." + tostr(i)
+               string file2 = ChangeExtension(file, "") + '.' + tostr(i)
                        + ".aux";
                FileInfo fi(file2);
                if (!fi.exist())
@@ -459,8 +478,8 @@ void LaTeX::scanAuxFile(string 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 << '\'' << endl;
                                aux_info.databases.insert(database);
                        }
                } else if (regex_match(STRCONV(token), sub, reg3)) {
@@ -468,8 +487,8 @@ void LaTeX::scanAuxFile(string 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 << '\'' << endl;
                        aux_info.styles.insert(style);
                } else if (regex_match(STRCONV(token), sub, reg4)) {
                        string const file2 = STRCONV(sub.str(1));
@@ -576,7 +595,7 @@ int LaTeX::scanLogFile(TeXErrors & terr)
                                        << "We should rerun." << endl;
                                retval |= RERUN;
                        }
-               } else if (prefixIs(token, "(")) {
+               } else if (token[0] == '(') {
                        if (contains(token, "Rerun LaTeX") ||
                            contains(token, "Rerun to get")) {
                                // Used by natbib