X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=52c6e4d7495f5d68a9ccc9cc92d2c8a819f7b528;hb=f268743f8c014ef2dadd260fd1a3873cb1d2038b;hp=1aa710201f6fe0c87078a4d75bb331eefc3152fe;hpb=9ce32d63e5ff1dbf4c04e3d8263b2649ef3ac595;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 1aa710201f..52c6e4d749 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -1,30 +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>
-using std::vector;
+#include <set>
 
-class MiniBuffer;
+#include <boost/utility.hpp>
+#include <boost/signals/signal1.hpp>
 
 ///
 class TeXErrors {
@@ -47,7 +44,7 @@ private:
 	};
 public:
 	///
-	typedef vector<Error> Errors;
+	typedef std::vector<Error> Errors;
 	///
 	Errors::const_iterator begin() const { return errors.begin(); }
 	///
@@ -61,50 +58,34 @@ private:
 };
 
 
+class Aux_Info {
+public:
+	///
+	Aux_Info() {}
+	///
+	string aux_file;
+	///
+	std::set<string> citations;
+	///
+	std::set<string> databases;
+	///
+	std::set<string> styles;
+};
+
+
 ///
-class LaTeX {
+bool operator==(Aux_Info const &, Aux_Info const &);
+bool operator!=(Aux_Info const &, Aux_Info const &);
+
+
+///
+class LaTeX : boost::noncopyable {
 public:
-	/** All the different files produced by TeX.
-	    
-	    This is the files mentioned on page 208-9 in Lamports book +
-	    .ltx and .tex files.
-	*/
-	enum TEX_FILES {
-		///
-		NO_FILES = 0,
-		/// used for table of contents et.al.
-		AUX = 1,
-		/// written by BibTeX
-		BBL = 2,
-		/// LaTeX's output
-		DVI = 4,
-		/// glossary (not supported by LyX so far)
-		GLO = 8,
-		///index
-		IDX = 16,
-		/// written by makeindex
-		IND = 32,
-		/// list of figures
-		LOF = 64,
-		/// the LaTeX log file
-		LOG = 128,
-		/// list of tables
-		LOT = 256,
-		/// table of contents
-		TOC = 512,
-		/// latex files
-		LTX = 1024,
-		/// tex files
-		TEX = 2048,
-		/// list of algorithms
-		LOA = 4096
-	};
-	
 	/** 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.
-	  */
+	    This enum should be enlarged a bit so that one could
+	    get more feedback from the LaTeX run.
+	*/
 	enum log_status {
 		///
 		NO_ERRORS = 0,
@@ -135,69 +116,82 @@ 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);
+
 	/// runs LaTeX several times
-	int run(TeXErrors &, MiniBuffer *);
+	int run(TeXErrors &);
 
 	///
 	int getNumErrors() { return num_errors;}
 
+	///
+	int scanLogFile(TeXErrors &);
+
+private:
 	/// use this for running LaTeX once
-	int operator() ();
-protected:
+	int startscript();
+
 	/// The dependency file.
 	string depfile;
 
-	/// unavail
-	LaTeX(LaTeX const &);
-	/// unavail
-	LaTeX & operator= (LaTeX const &);
-	
 	///
 	void deplog(DepTable & head);
 
 	///
-	void deptex(DepTable & head);
-	
+	bool runMakeIndex(string const &);
+
 	///
-	int scanLogFile(TeXErrors &);
+	std::vector<Aux_Info> const scanAuxFiles(string const &);
 
 	///
-	bool runMakeIndex(string const &);
+	Aux_Info const scanAuxFile(string const &);
 
 	///
-	bool scanAux(DepTable &);
-	
+	void scanAuxFile(string const &, Aux_Info &);
+
 	///
-	bool runBibTeX(string const &, DepTable &);
-	
+	void updateBibtexDependencies(DepTable &,
+				      std::vector<Aux_Info> const &);
+
+	///
+	bool runBibTeX(std::vector<Aux_Info> const &);
+
+	///
+	void deleteFilesOnError() const;
+
 	///
 	string cmd;
 
 	///
 	string file;
-	
+
 	///
 	string path;
-	///
-	TEX_FILES tex_files;
-	
-	///
-	int file_count;
 
-	// used by scanLogFile
+	/// used by scanLogFile
 	int num_errors;
+
+	/// The name of the final output file.
+	string output_file;
+
+	///
+	LatexRunParams runparams;
 };
 
 #endif