X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=52c6e4d7495f5d68a9ccc9cc92d2c8a819f7b528;hb=f268743f8c014ef2dadd260fd1a3873cb1d2038b;hp=652369cae507d1f50ad767c7d38983bcb3109b25;hpb=6e3c8a7e3240a56ffdf5af26a18b6d1cab1387ff;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 652369cae5..52c6e4d749 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -1,31 +1,27 @@
 // -*- C++ -*-
-/* This file is part of
- * ====================================================== 
- * 
- *           LyX, The Document Processor 	 
- *	     Copyright 1995 Matthias Ettrich
- *           Copyright 1995-2000 The Lyx Team
+/**
+ * \file LaTeX.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *           This file is Copyright 1996-1999
- *           Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
+ * \author Angus Leeming
+ * \author Dekel Tsur
  *
- * ====================================================== 
+ * 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 MiniBuffer;
+#include <boost/signals/signal1.hpp>
 
 ///
 class TeXErrors {
@@ -62,11 +58,31 @@ private:
 };
 
 
+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 {
+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.
 	*/
@@ -100,34 +116,37 @@ public:
 		///
 		TOO_MANY_ERRORS = 4096,
 		///
+		ERROR_RERUN = 8192,
+		///
 		ERRORS = TEX_ERROR + LATEX_ERROR,
 		///
 		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 &, MiniBuffer *);
+	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;
 
@@ -138,30 +157,41 @@ protected:
 	bool runMakeIndex(string const &);
 
 	///
-	bool scanAux(DepTable &);
+	std::vector<Aux_Info> const scanAuxFiles(string const &);
+
 	///
-	std::vector<string> const
-	scanAuxFiles(string const &, DepTable &, bool);
+	Aux_Info const scanAuxFile(string const &);
+
 	///
-	bool scanAuxFile(string const &, DepTable &, bool);
-	
+	void scanAuxFile(string const &, Aux_Info &);
+
+	///
+	void updateBibtexDependencies(DepTable &,
+				      std::vector<Aux_Info> const &);
+
 	///
-	bool runBibTeX(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;
+
+	///
+	LatexRunParams runparams;
 };
 
 #endif