prevent crash when inserting minipage in table cell,

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 151098528eda2f1e2fadc6b75983257aec924bca..d3a375ae746a1615e4d1a7d7a7c4fdf1ac8fdae6 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -1,32 +1,28 @@
 // -*- C++ -*-
 /* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor        
+ * ======================================================
+ *
+ *           LyX, The Document Processor
  *          Copyright 1995 Matthias Ettrich
  *           Copyright 1995-2001 The Lyx Team
  *
  *           This file is Copyright 1996-2001
  *           Lars Gullik Bjønnes
  *
- * ====================================================== 
+ * ======================================================
  */
 
 #ifndef LATEX_H
 #define LATEX_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
-
+#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 {
@@ -62,6 +58,7 @@ private:
        Errors errors;
 };
 
+
 class Aux_Info {
 public:
        ///
@@ -78,29 +75,15 @@ 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 &);
 
 
 ///
 class LaTeX : boost::noncopyable {
 public:
        /** Return values from scanLogFile() and run() (to come)
-           
+
            This enum should be enlarged a bit so that one could
            get more feedback from the LaTeX run.
        */
@@ -140,30 +123,31 @@ 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);
+       LaTeX(string const & cmd, LatexRunParams const &,
+             string const & file, string const & path);
 
-       ///
-       virtual ~LaTeX() {}
-       
        /// 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;
 
@@ -181,7 +165,7 @@ protected:
 
        ///
        void scanAuxFile(string const &, Aux_Info &);
-       
+
        ///
        void updateBibtexDependencies(DepTable &,
                                      std::vector<Aux_Info> const &);
@@ -191,18 +175,24 @@ protected:
 
        ///
        void deleteFilesOnError() const;
-       
+
        ///
        string cmd;
 
        ///
        string file;
-       
+
        ///
        string path;
 
        /// used by scanLogFile
        int num_errors;
+
+       /// The name of the final output file.
+       string output_file;
+
+       ///
+       LatexRunParams runparams;
 };
 
 #endif