"Inter-word Space"

[lyx.git] / src / LaTeX.C

diff --git a/src/LaTeX.C b/src/LaTeX.C
index 59886c918c08b7f8f184080f8218c81be576d2f9..53cf4e9241b19993ac8c5b8257ca291aaf4f16fa 100644 (file)
--- a/src/LaTeX.C
+++ b/src/LaTeX.C
@@ -21,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"
@@ -28,7 +29,6 @@
 #include "support/path.h"
 
 #include <boost/regex.hpp>
-#include "support/BoostFormat.h"
 
 #include <fstream>
 #include <cstdio>  // sscanf
@@ -70,13 +70,8 @@ namespace {
 
 void showRunMessage(LyXFunc * lf, 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())));
+       string str = bformat(_("Waiting for LaTeX run number %1$s"), tostr(count));
+       lf->dispatch(FuncRequest(LFUN_MESSAGE, str));
 }
 
 
@@ -112,8 +107,9 @@ bool operator!=(Aux_Info const & a, Aux_Info const & 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";
@@ -168,7 +164,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(lyx::getcwd(), runparams);
 
        // Never write the depfile if an error was encountered.