X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=c7d51e92a6e86529d5a2d3ce428772dcb254ddd1;hb=2486c96b8d9086471299bf207b85b1ce848246aa;hp=0fa5d78206d8a222a544a76bdb2a103e8feacf24;hpb=9a3176581dc3e9aee62d908faf8d48ddb43d4cc3;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 0fa5d78206..c7d51e92a6 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -1,51 +1,48 @@
 // -*- 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 "outputparams.h"
+
+#include <boost/utility.hpp>
+#include <boost/signal.hpp>
 
-#include "LString.h"
-#include "DepTable.h"
 #include <vector>
 #include <set>
 
-#include <boost/utility.hpp>
-
-class MiniBuffer;
+class DepTable;
 
 ///
 class TeXErrors {
 private:
 	///
-	struct Error {
+	class Error {
+	public:
 		///
 		Error () : error_in_line(0) {}
 		///
-		Error(int line, string const & desc, string const & text)
+		Error(int line, std::string const & desc, std::string const & text)
 			: error_in_line(line),
 			  error_desc(desc),
 			  error_text(text) {}
 		/// what line in the TeX file the error occured in
 		int error_in_line;
 		/// The kind of error
-		string error_desc;
+		std::string error_desc;
 		/// The line/cmd that caused the error.
-		string error_text;
+		std::string error_text;
 	};
 public:
 	///
@@ -55,52 +52,39 @@ public:
 	///
 	Errors::const_iterator end() const { return errors.end(); }
 	///
-	void insertError(int line, string const & error_desc,
-			 string const & error_text);
+	void insertError(int line, std::string const & error_desc,
+			 std::string const & error_text);
 private:
 	///
 	Errors errors;
 };
 
+
 class Aux_Info {
 public:
 	///
 	Aux_Info() {}
 	///
-	string aux_file;
+	std::string aux_file;
 	///
-	std::set<string> citations;
+	std::set<std::string> citations;
 	///
-	std::set<string> databases;
+	std::set<std::string> databases;
 	///
-	std::set<string> styles;
+	std::set<std::string> styles;
 };
 
 
 ///
-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;
-}
+bool operator==(Aux_Info const &, Aux_Info const &);
+bool operator!=(Aux_Info const &, Aux_Info const &);
 
 
 ///
-inline
-bool operator!=(Aux_Info const & a, Aux_Info const & o)
-{
-	return !(a == o);
-}
-
-
-///
-class LaTeX : public noncopyable {
+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.
 	*/
@@ -140,48 +124,49 @@ public:
 		///
 		WARNINGS = TEX_WARNING + LATEX_WARNING + PACKAGE_WARNING
 	};
-	
+
+	/// This signal emits an informative message
+	boost::signal<void(std::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(std::string const & cmd, OutputParams const &,
+	      std::string const & file, std::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;
+	std::string depfile;
 
 	///
 	void deplog(DepTable & head);
 
 	///
-	bool runMakeIndex(string const &);
+	bool runMakeIndex(std::string const &, OutputParams const &);
 
 	///
-	std::vector<Aux_Info> const scanAuxFiles(string const &);
+	std::vector<Aux_Info> const scanAuxFiles(std::string const &);
 
 	///
-	Aux_Info const scanAuxFile(string const &);
+	Aux_Info const scanAuxFile(std::string const &);
 
 	///
-	void scanAuxFile(string const &, Aux_Info &);
-	
+	void scanAuxFile(std::string const &, Aux_Info &);
+
 	///
 	void updateBibtexDependencies(DepTable &,
 				      std::vector<Aux_Info> const &);
@@ -191,18 +176,24 @@ protected:
 
 	///
 	void deleteFilesOnError() const;
-	
+
 	///
-	string cmd;
+	std::string cmd;
 
 	///
-	string file;
-	
+	std::string file;
+
 	///
-	string path;
+	std::string path;
 
 	/// used by scanLogFile
 	int num_errors;
+
+	/// The name of the final output file.
+	std::string output_file;
+
+	///
+	OutputParams runparams;
 };
 
 #endif