Fix fuer #209

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 74e1317074f2df2a5cf603b081fd28d50beceb5a..937870a70368e8b90d6fe4fad7284b7ba2fc0a20 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -4,9 +4,9 @@
  * 
  *           LyX, The Document Processor        
  *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The Lyx Team
+ *           Copyright 1995-2001 The Lyx Team
  *
- *           This file is Copyright 1996-1999
+ *           This file is Copyright 1996-2001
  *           Lars Gullik Bjønnes
  *
  * ====================================================== 
@@ -26,7 +26,7 @@
 
 #include <boost/utility.hpp>
 
-class MiniBuffer;
+class LyXFunc;
 
 ///
 class TeXErrors {
@@ -74,17 +74,30 @@ public:
        std::set<string> databases;
        ///
        std::set<string> styles;
-       ///
-       operator==(Aux_Info const & o) const {
-               return aux_file == o.aux_file &&
-                       citations == o.citations &&
-                       databases == o.databases &&
-                       styles == o.styles;
-       }
 };
 
+
+///
+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;
+}
+
+
 ///
-class LaTeX : public noncopyable {
+inline
+bool operator!=(Aux_Info const & a, Aux_Info const & o)
+{
+       return !(a == o);
+}
+
+
+///
+class LaTeX : boost::noncopyable {
 public:
        /** Return values from scanLogFile() and run() (to come)
            
@@ -139,7 +152,7 @@ public:
        virtual ~LaTeX() {}
        
        /// runs LaTeX several times
-       int run(TeXErrors &, MiniBuffer *);
+       int run(TeXErrors &, LyXFunc *);
 
        ///
        int getNumErrors() { return num_errors;}
@@ -170,10 +183,11 @@ protected:
        void scanAuxFile(string const &, Aux_Info &);
        
        ///
-       void updateBibtexDependencies(DepTable &, vector<Aux_Info> const &);
+       void updateBibtexDependencies(DepTable &,
+                                     std::vector<Aux_Info> const &);
 
        ///
-       bool runBibTeX(vector<Aux_Info> const &);
+       bool runBibTeX(std::vector<Aux_Info> const &);
 
        ///
        void deleteFilesOnError() const;
@@ -189,6 +203,9 @@ protected:
 
        /// used by scanLogFile
        int num_errors;
+       
+       /// The name of the final output file.
+       string output_file;
 };
 
 #endif