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

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 0a11a27ffb..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-1996 The Lyx Team
+ *           Copyright 1995-2001 The Lyx Team
  *
- *           This file is Copyright (C) 1996-1999
+ *           This file is Copyright 1996-2001
  *           Lars Gullik Bjønnes
  *
- * ====================================================== 
+ * ======================================================
  */
 
 #ifndef LATEX_H
@@ -22,9 +22,11 @@
 #include "LString.h"
 #include "DepTable.h"
 #include <vector>
-using std::vector;
+#include <set>
+
+#include <boost/utility.hpp>
 
-class MiniBuffer;
+class LyXFunc;
 
 ///
 class TeXErrors {
@@ -47,7 +49,7 @@ private:
 	};
 public:
 	///
-	typedef vector<Error> Errors;
+	typedef std::vector<Error> Errors;
 	///
 	Errors::const_iterator begin() const { return errors.begin(); }
 	///
@@ -60,51 +62,48 @@ 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 {
+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:
-	/** 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 +134,78 @@ 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,
 	   path = name of the files original path.
 	*/
 	LaTeX(string const & cmd, string const & file, string const & path);
-	
+
+	///
+	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;
 
-	/// 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 &);
+
+	///
+	void updateBibtexDependencies(DepTable &,
+				      std::vector<Aux_Info> const &);
+
+	///
+	bool runBibTeX(std::vector<Aux_Info> const &);
+
 	///
-	bool runBibTeX(string const &, DepTable &);
-	
+	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;
 };
 
 #endif