X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FLaTeX.h;h=44920c362a5c7493132be00164caa2912c6bd211;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=615d974f2cd0e54ca4d3525bb0d1989cdf559802;hpb=36c3495a3aea43e7dcda53eafadcc6592073b17e;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 615d974f2c..44920c362a 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;
@@ -138,25 +139,30 @@ public:
 		///
 		BIBTEX_ERROR = 16384,
 		///
-		//FIXME: BIBTEX_ERROR has been removed from ERRORS for now, since users were irritated
-		//       about those errors which prevented compilation of previously compiling documents.
-		//       Think about a "gentle" transfer to BibTeX error reporting.
-		ERRORS = TEX_ERROR + LATEX_ERROR,
+		NONZERO_ERROR = 32768, // the command exited with nonzero status
+		///
+		ERRORS = TEX_ERROR + LATEX_ERROR + NONZERO_ERROR + BIBTEX_ERROR,
 		///
 		WARNINGS = TEX_WARNING + LATEX_WARNING + PACKAGE_WARNING
 	};
 
 	/// 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 const clean_start = false);
 
 	/// runs LaTeX several times
 	int run(TeXErrors &);
@@ -190,7 +196,8 @@ private:
 				 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 &);
@@ -210,7 +217,7 @@ private:
 		       OutputParams const &);
 
 	///
-	void deleteFilesOnError() const;
+	void removeAuxiliaryFiles() const;
 
 	///
 	std::string cmd;
@@ -218,9 +225,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;
 
@@ -232,6 +242,9 @@ private:
 	
 	/// Do we use biber?
 	bool biber;
+
+	///
+	std::vector <std::string> children;
 };