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

diff --git a/src/LaTeX.h b/src/LaTeX.h
index fcd013b8dd..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
@@ -22,10 +22,11 @@
 #include "LString.h"
 #include "DepTable.h"
 #include <vector>
+#include <set>
 
 #include <boost/utility.hpp>
 
-class MiniBuffer;
+class LyXFunc;
 
 ///
 class TeXErrors {
@@ -61,12 +62,45 @@ private:
 	Errors errors;
 };
 
+class Aux_Info {
+public:
+	///
+	Aux_Info() {}
+	///
+	string aux_file;
+	///
+	std::set<string> citations;
+	///
+	std::set<string> databases;
+	///
+	std::set<string> styles;
+};
+
 
 ///
-class LaTeX : public noncopyable {
+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);
+}
+
+
+///
+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.
 	*/
@@ -100,11 +134,13 @@ public:
 		///
 		TOO_MANY_ERRORS = 4096,
 		///
+		ERROR_RERUN = 8192,
+		///
 		ERRORS = TEX_ERROR + LATEX_ERROR,
 		///
 		WARNINGS = TEX_WARNING + LATEX_WARNING + PACKAGE_WARNING
 	};
-	
+
 
 	/**
 	   cmd = the latex command, file = name of the (temporary) latex file,
@@ -114,15 +150,19 @@ public:
 
 	///
 	virtual ~LaTeX() {}
-	
+
 	/// runs LaTeX several times
-	int run(TeXErrors &, MiniBuffer *);
+	int run(TeXErrors &, LyXFunc *);
 
 	///
 	int getNumErrors() { return num_errors;}
 
 	/// use this for running LaTeX once
 	int operator() ();
+
+	///
+	int scanLogFile(TeXErrors &);
+
 protected:
 	/// The dependency file.
 	string depfile;
@@ -131,31 +171,41 @@ protected:
 	void deplog(DepTable & head);
 
 	///
-	int scanLogFile(TeXErrors &);
+	bool runMakeIndex(string const &);
 
 	///
-	bool runMakeIndex(string const &);
+	std::vector<Aux_Info> const scanAuxFiles(string const &);
 
 	///
-	bool scanAux(DepTable &);
-	
+	Aux_Info const scanAuxFile(string const &);
+
+	///
+	void scanAuxFile(string const &, Aux_Info &);
+
+	///
+	void updateBibtexDependencies(DepTable &,
+				      std::vector<Aux_Info> const &);
+
 	///
-	bool runBibTeX(string const &, DepTable &);
+	bool runBibTeX(std::vector<Aux_Info> const &);
 
 	///
 	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