X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=25756831c8713e0582bc6734802c84515b6aefbc;hb=0c7bd9a57f2a308bb9659200eda3b7e45f8d5d3c;hp=36558ee6d7e5dab44d92da8084b5ffa6bc67043b;hpb=f1cba8ff64b369792fd49f5ddf90e8126ab476ac;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 36558ee6d7..25756831c8 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -19,8 +19,7 @@
 #include "support/docstring.h"
 #include "support/FileName.h"
 
-#include <boost/noncopyable.hpp>
-#include <boost/signal.hpp>
+#include <boost/signals2.hpp>
 
 #include <vector>
 #include <set>
@@ -39,16 +38,20 @@ private:
 		///
 		Error () : error_in_line(0) {}
 		///
-		Error(int line, docstring const & desc, docstring const & text)
+		Error(int line, docstring const & desc, docstring const & text,
+		      std::string const & fname)
 			: error_in_line(line),
 			  error_desc(desc),
-			  error_text(text) {}
-		/// what line in the TeX file the error occured in
+			  error_text(text),
+			  child_name(fname) {}
+		/// what line in the TeX file the error occurred in
 		int error_in_line;
 		/// The kind of error
 		docstring error_desc;
 		/// The line/cmd that caused the error.
 		docstring error_text;
+		/// The name of the child where error occurred, empty otherwise.
+		std::string child_name;
 	};
 public:
 	///
@@ -59,17 +62,20 @@ public:
 	Errors::const_iterator end() const { return errors.end(); }
 	///
 	void insertError(int line, docstring const & error_desc,
-			 docstring const & error_text);
+			 docstring const & error_text,
+			 std::string const & child_name = empty_string());
+	///
+	void clearErrors() { errors.clear(); }
 private:
 	///
 	Errors errors;
 };
 
 
-class Aux_Info {
+class AuxInfo {
 public:
 	///
-	Aux_Info() {}
+	AuxInfo() {}
 	///
 	support::FileName aux_file;
 	///
@@ -82,8 +88,8 @@ public:
 
 
 ///
-bool operator==(Aux_Info const &, Aux_Info const &);
-bool operator!=(Aux_Info const &, Aux_Info const &);
+bool operator==(AuxInfo const &, AuxInfo const &);
+bool operator!=(AuxInfo const &, AuxInfo const &);
 
 
 /**
@@ -93,7 +99,7 @@ bool operator!=(Aux_Info const &, Aux_Info const &);
  * This is required by the LaTeX compiler, and we also make use of it by
  * various support::makeAbsPath() calls.
  */
-class LaTeX : boost::noncopyable {
+class LaTeX {
 public:
 	/** Return values from scanLogFile() and run() (to come)
 
@@ -132,21 +138,32 @@ public:
 		///
 		ERROR_RERUN = 8192,
 		///
-		ERRORS = TEX_ERROR + LATEX_ERROR,
+		BIBTEX_ERROR = 16384,
+		///
+		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;
+	boost::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);
+	      support::FileName const & file,
+	      std::string const & path = empty_string(),
+	      std::string const & lpath = empty_string(),
+	      bool const clean_start = false);
 
 	/// runs LaTeX several times
 	int run(TeXErrors &);
@@ -158,6 +175,10 @@ public:
 	int scanLogFile(TeXErrors &);
 
 private:
+	/// noncopyable
+	LaTeX(LaTeX const &);
+	void operator=(LaTeX const &);
+
 	/// use this for running LaTeX once
 	int startscript();
 
@@ -176,23 +197,27 @@ private:
 				 std::string const &, std::string const &);
 
 	///
-	std::vector<Aux_Info> const scanAuxFiles(support::FileName const &);
+	std::vector<AuxInfo> const scanAuxFiles(support::FileName const &);
 
 	///
-	Aux_Info const scanAuxFile(support::FileName const &);
+	AuxInfo const scanAuxFile(support::FileName const &);
 
 	///
-	void scanAuxFile(support::FileName const &, Aux_Info &);
+	void scanAuxFile(support::FileName const &, AuxInfo &);
 
 	///
 	void updateBibtexDependencies(DepTable &,
-				      std::vector<Aux_Info> const &);
+				      std::vector<AuxInfo> const &);
 
 	///
-	bool runBibTeX(std::vector<Aux_Info> const &);
+	int scanBlgFile(DepTable & head, TeXErrors & terr);
 
 	///
-	void deleteFilesOnError() const;
+	bool runBibTeX(std::vector<AuxInfo> const &,
+		       OutputParams const &);
+
+	///
+	void removeAuxiliaryFiles() const;
 
 	///
 	std::string cmd;
@@ -200,6 +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;
 
@@ -208,6 +239,9 @@ private:
 
 	///
 	OutputParams runparams;
+	
+	/// Do we use biber?
+	bool biber;
 };