X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=a57cebc83bcc2ff5ac874e37f17efb361d1bbac2;hb=1e519d1115f41f71c253cb9e2fbb7803e9a583a9;hp=978e33f866f581c8d697b8b8d03174e8af089c67;hpb=a1aeea3f16cc786d8948f546bd98ffd976b9c162;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 978e33f866..a57cebc83b 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -18,8 +18,7 @@
 
 #include "support/docstring.h"
 #include "support/FileName.h"
-
-#include <boost/signal.hpp>
+#include "support/signals.h"
 
 #include <vector>
 #include <set>
@@ -64,6 +63,8 @@ public:
 	void insertError(int line, docstring const & error_desc,
 			 docstring const & error_text,
 			 std::string const & child_name = empty_string());
+	///
+	void clearErrors() { errors.clear(); }
 private:
 	///
 	Errors errors;
@@ -146,16 +147,23 @@ public:
 	};
 
 	/// This signal emits an informative message
-	boost::signal<void(docstring)> message;
+	signals2::signal<void(docstring)> message;
 
 
 	/**
 	   cmd = the latex command, file = name of the (temporary) latex file,
-	   path = name of the files original path.
+	   path = name of the files original path,
+	   clean_start = This forces a fresh run by deleting the files in the temp
+			 dir. We set this e.g. if there was an error on previous
+			 preview, which is good if the user installed a package
+			 or changed certain document settings (#9061).
 	*/
 	LaTeX(std::string const & cmd, OutputParams const &,
 	      support::FileName const & file,
-	      std::string const & path = empty_string());
+	      std::string const & path = empty_string(),
+	      std::string const & lpath = empty_string(),
+	      bool allow_cancellation = false,
+	      bool const clean_start = false);
 
 	/// runs LaTeX several times
 	int run(TeXErrors &);
@@ -180,16 +188,17 @@ private:
 	///
 	void deplog(DepTable & head);
 
-	///
-	bool runMakeIndex(std::string const &, OutputParams const &,
+	/// returns exit code
+	int runMakeIndex(std::string const &, OutputParams const &,
 			  std::string const & = std::string());
 
-	///
-	bool runMakeIndexNomencl(support::FileName const &, 
+	/// returns exit code
+	int runMakeIndexNomencl(support::FileName const &, 
 				 std::string const &, std::string const &);
 
 	///
-	std::vector<AuxInfo> const scanAuxFiles(support::FileName const &);
+	std::vector<AuxInfo> const scanAuxFiles(support::FileName const &,
+						bool const only_childbibs = false);
 
 	///
 	AuxInfo const scanAuxFile(support::FileName const &);
@@ -206,7 +215,7 @@ private:
 
 	///
 	bool runBibTeX(std::vector<AuxInfo> const &,
-		       OutputParams const &);
+		       OutputParams const &, int & exit_code);
 
 	///
 	void removeAuxiliaryFiles() const;
@@ -217,9 +226,12 @@ private:
 	///
 	support::FileName file;
 
-	///
+	/// The document directory path.
 	std::string path;
 
+	/// Extra path, possibly relative to the document directory path.
+	std::string lpath;
+
 	/// used by scanLogFile
 	int num_errors;
 
@@ -228,9 +240,13 @@ private:
 
 	///
 	OutputParams runparams;
-	
+
 	/// Do we use biber?
 	bool biber;
+	///
+	std::vector <std::string> children;
+	///
+	bool allow_cancel;
 };