Make lyx2lyx output the new external inset format.

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index d32b126d2de4c04f40e82932fb4be62153838a69..c4739b19072639910daf03711253b294a8c7b4ab 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -15,10 +15,7 @@
 #ifndef LATEX_H
 #define LATEX_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
+#include "latexrunparams.h"
 #include "LString.h"
 #include "DepTable.h"
 #include <vector>
@@ -62,6 +59,7 @@ private:
        Errors errors;
 };
 
+
 class Aux_Info {
 public:
        ///
@@ -78,22 +76,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 &);
 
 
 ///
@@ -146,10 +130,8 @@ public:
           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 *);
@@ -157,13 +139,13 @@ public:
        ///
        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;
 
@@ -206,6 +188,9 @@ protected:
 
        /// The name of the final output file.
        string output_file;
+
+       ///
+       LatexRunParams runparams;
 };
 
 #endif