X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=d3a375ae746a1615e4d1a7d7a7c4fdf1ac8fdae6;hb=eead5ba43d0ddf06544ad1b40063981d3788c635;hp=40f90812d8fdcdbda8bc33f093f46a997e2883a7;hpb=99d1627a471b92f403598d03dfc861ddc3c11be0;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 40f90812d8..d3a375ae74 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -15,14 +15,14 @@
 #ifndef LATEX_H
 #define LATEX_H
 
+#include "latexrunparams.h"
 #include "LString.h"
 #include "DepTable.h"
 #include <vector>
 #include <set>
 
 #include <boost/utility.hpp>
-
-class LyXFunc;
+#include <boost/signals/signal1.hpp>
 
 ///
 class TeXErrors {
@@ -58,6 +58,7 @@ private:
 	Errors errors;
 };
 
+
 class Aux_Info {
 public:
 	///
@@ -74,22 +75,8 @@ public:
 
 
 ///
-inline
-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;
-}
-
-
-///
-inline
-bool operator!=(Aux_Info const & a, Aux_Info const & o)
-{
-	return !(a == o);
-}
+bool operator==(Aux_Info const &, Aux_Info const &);
+bool operator!=(Aux_Info const &, Aux_Info const &);
 
 
 ///
@@ -137,29 +124,30 @@ public:
 		WARNINGS = TEX_WARNING + LATEX_WARNING + PACKAGE_WARNING
 	};
 
+	/// This signal emits an informative message
+	boost::signal1<void, string> message;
+
 
 	/**
 	   cmd = the latex command, file = name of the (temporary) latex file,
 	   path = name of the files original path.
 	*/
-	LaTeX(string const & cmd, string const & file, string const & path);
-
-	///
-	virtual ~LaTeX() {}
+	LaTeX(string const & cmd, LatexRunParams const &,
+	      string const & file, string const & path);
 
 	/// runs LaTeX several times
-	int run(TeXErrors &, LyXFunc *);
+	int run(TeXErrors &);
 
 	///
 	int getNumErrors() { return num_errors;}
 
-	/// use this for running LaTeX once
-	int operator() ();
-
 	///
 	int scanLogFile(TeXErrors &);
 
-protected:
+private:
+	/// use this for running LaTeX once
+	int startscript();
+
 	/// The dependency file.
 	string depfile;
 
@@ -202,6 +190,9 @@ protected:
 
 	/// The name of the final output file.
 	string output_file;
+
+	///
+	LatexRunParams runparams;
 };
 
 #endif