More 'standard conformant blurb' nonsense.

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 65f45b9458e0f9bba926dedea2ea739e2ba4a003..388fbf73108cffea899d4d6bd2f11adb21349f31 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -16,11 +16,10 @@
 #include "LaTeX.h"
 #include "bufferlist.h"
 #include "gettext.h"
-#include "lyxfunc.h"
 #include "debug.h"
-#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"
@@ -28,11 +27,12 @@
 #include "support/path.h"
 
 #include <boost/regex.hpp>
-#include "BoostFormat.h"
 
 #include <fstream>
 #include <cstdio>  // sscanf
 
+using namespace lyx::support;
+
 #ifndef CXX_GLOBAL_CSTD
 using std::sscanf;
 #endif
@@ -68,19 +68,13 @@ extern BufferList bufferlist;
 
 namespace {
 
-void showRunMessage(LyXFunc * lf, unsigned int count)
+string runMessage(unsigned int count)
 {
-       ostringstream str;
-#if USE_BOOST_FORMAT
-       str << boost::format(_("Waiting for LaTeX run number %1$d")) % count;
-#else
-       str << _("Waiting for LaTeX run number ") << count;
-#endif
-       lf->dispatch(FuncRequest(LFUN_MESSAGE, STRCONV(str.str())));
+       return bformat(_("Waiting for LaTeX run number %1$s"), tostr(count));
 }
 
-
 };
+
 /*
  * CLASS TEXERRORS
  */
@@ -92,12 +86,29 @@ 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
  */
 
-LaTeX::LaTeX(string const & latex, string const & f, string const & p)
-               : cmd(latex), file(f), path(p)
+LaTeX::LaTeX(string const & latex, LatexRunParams const & rp,
+            string const & f, string const & p)
+       : cmd(latex), file(f), path(p), runparams(rp)
 {
        num_errors = 0;
        depfile = file + ".dep";
@@ -117,7 +128,7 @@ void LaTeX::deleteFilesOnError() const
        // What files do we have to delete?
 
        // This will at least make latex do all the runs
-       lyx::unlink(depfile);
+       unlink(depfile);
 
        // but the reason for the error might be in a generated file...
 
@@ -125,19 +136,19 @@ void LaTeX::deleteFilesOnError() const
 
        // bibtex file
        string const bbl = ChangeExtension(ofname, ".bbl");
-       lyx::unlink(bbl);
+       unlink(bbl);
 
        // makeindex file
        string const ind = ChangeExtension(ofname, ".ind");
-       lyx::unlink(ind);
+       unlink(ind);
 
        // Also remove the aux file
        string const aux = ChangeExtension(ofname, ".aux");
-       lyx::unlink(aux);
+       unlink(aux);
 }
 
 
-int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
+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
@@ -152,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());
+       bufferlist.updateIncludedTeXfiles(getcwd(), runparams);
 
        // Never write the depfile if an error was encountered.
 
@@ -215,15 +226,13 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
 
        ++count;
        lyxerr[Debug::LATEX] << "Run #" << count << endl;
-       if (lfun) {
-               showRunMessage(lfun, count);
-       }
-
-       this->operator()();
+       message(runMessage(count));
+       
+       startscript();
        scanres = scanLogFile(terr);
        if (scanres & ERROR_RERUN) {
                lyxerr[Debug::LATEX] << "Rerunning LaTeX" << endl;
-               this->operator()();
+               startscript();
                scanres = scanLogFile(terr);
        }
 
@@ -251,10 +260,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
        if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) {
                // no checks for now
                lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
-               if (lfun) {
-                       lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running MakeIndex.")));
-               }
-
+               message(_("Running MakeIndex."));
                rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
        }
 
@@ -266,10 +272,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                // tags is found -> run bibtex and set rerun = true;
                // no checks for now
                lyxerr[Debug::LATEX] << "Running BibTeX." << endl;
-               if (lfun) {
-                       lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running BibTeX.")));
-               }
-
+               message(_("Running BibTeX."));
                updateBibtexDependencies(head, bibtex_info);
                rerun |= runBibTeX(bibtex_info);
        } else if (!had_depfile) {
@@ -298,11 +301,8 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                        << "Dep. file has changed or rerun requested" << endl;
                lyxerr[Debug::LATEX]
                        << "Run #" << count << endl;
-               if (lfun) {
-                       showRunMessage(lfun, count);
-               }
-
-               this->operator()();
+               message(runMessage(count));
+               startscript();
                scanres = scanLogFile(terr);
                if (scanres & ERRORS) {
                        deleteFilesOnError();
@@ -328,10 +328,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
        if (head.haschanged(OnlyFilename(ChangeExtension(file, ".idx")))) {
                // no checks for now
                lyxerr[Debug::LATEX] << "Running MakeIndex." << endl;
-               if (lfun) {
-                       lfun->dispatch(FuncRequest(LFUN_MESSAGE, _("Running MakeIndex.")));
-               }
-
+               message(_("Running MakeIndex."));
                rerun = runMakeIndex(OnlyFilename(ChangeExtension(file, ".idx")));
        }
 
@@ -352,11 +349,8 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
                rerun = false;
                ++count;
                lyxerr[Debug::LATEX] << "Run #" << count << endl;
-               if (lfun) {
-                       showRunMessage(lfun, count);
-               }
-
-               this->operator()();
+               message(runMessage(count));
+               startscript();
                scanres = scanLogFile(terr);
                if (scanres & ERRORS) {
                        deleteFilesOnError();
@@ -374,7 +368,7 @@ int LaTeX::run(TeXErrors & terr, LyXFunc * lfun)
 }
 
 
-int LaTeX::operator()()
+int LaTeX::startscript()
 {
 #ifndef __EMX__
        string tmp = cmd + ' ' + QuoteName(file) + " > /dev/null";