The Gtk patch.

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index d32b126d2de4c04f40e82932fb4be62153838a69..52c6e4d7495f5d68a9ccc9cc92d2c8a819f7b528 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -1,32 +1,27 @@
 // -*- C++ -*-
-/* This file is part of
- * ======================================================
+/**
+ * \file LaTeX.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           LyX, The Document Processor
- *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2001 The Lyx Team
+ * \author Lars Gullik Bjønnes
+ * \author Angus Leeming
+ * \author Dekel Tsur
  *
- *           This file is Copyright 1996-2001
- *           Lars Gullik Bjønnes
- *
- * ======================================================
+ * Full author contact details are available in file CREDITS.
  */
 
 #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 +57,7 @@ private:
        Errors errors;
 };
 
+
 class Aux_Info {
 public:
        ///
@@ -78,22 +74,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 &);
 
 
 ///
@@ -141,29 +123,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;
 
@@ -206,6 +189,9 @@ protected:
 
        /// The name of the final output file.
        string output_file;
+
+       ///
+       LatexRunParams runparams;
 };
 
 #endif