X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=d32b126d2de4c04f40e82932fb4be62153838a69;hb=98c966c64594611e469313314abd1e59524adb4a;hp=84fad139a7af6d063ead3ebb5050d0b481263698;hpb=e7b0972c44522875f9b31bb1d62eec3f687a3978;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 84fad139a7..d32b126d2d 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -1,15 +1,15 @@
 // -*- C++ -*-
 /* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor 	 
+ * ======================================================
+ *
+ *           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
  *
- * ====================================================== 
+ * ======================================================
  */
 
 #ifndef LATEX_H
@@ -26,7 +26,7 @@
 
 #include <boost/utility.hpp>
 
-class MiniBuffer;
+class LyXFunc;
 
 ///
 class TeXErrors {
@@ -74,9 +74,6 @@ public:
 	std::set<string> databases;
 	///
 	std::set<string> styles;
-	///
-	friend
-	bool operator==(Aux_Info const & a, Aux_Info const & o);
 };
 
 
@@ -92,10 +89,18 @@ bool operator==(Aux_Info const & a, Aux_Info const & o)
 
 
 ///
-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)
-	    
+
 	    This enum should be enlarged a bit so that one could
 	    get more feedback from the LaTeX run.
 	*/
@@ -135,7 +140,7 @@ public:
 		///
 		WARNINGS = TEX_WARNING + LATEX_WARNING + PACKAGE_WARNING
 	};
-	
+
 
 	/**
 	   cmd = the latex command, file = name of the (temporary) latex file,
@@ -145,9 +150,9 @@ public:
 
 	///
 	virtual ~LaTeX() {}
-	
+
 	/// runs LaTeX several times
-	int run(TeXErrors &, MiniBuffer *);
+	int run(TeXErrors &, LyXFunc *);
 
 	///
 	int getNumErrors() { return num_errors;}
@@ -176,7 +181,7 @@ protected:
 
 	///
 	void scanAuxFile(string const &, Aux_Info &);
-	
+
 	///
 	void updateBibtexDependencies(DepTable &,
 				      std::vector<Aux_Info> const &);
@@ -186,18 +191,21 @@ 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;
 };
 
 #endif