X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=a4fcecdf2d14f43efa416e8a25ac7e7d9c9ce6fa;hb=c6e1db7682dc8d58a68147b5eee1d004829ef6d2;hp=ff74f9da40d7135874d1657411afb97cb8d6d336;hpb=f434f947dd82a4093c027408ff9698b27b2a77d3;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index ff74f9da40..a4fcecdf2d 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -39,16 +39,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) {}
+			  error_text(text),
+			  child_name(fname) {}
 		/// what line in the TeX file the error occured 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,7 +63,8 @@ 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());
 private:
 	///
 	Errors errors;
@@ -132,6 +137,11 @@ public:
 		///
 		ERROR_RERUN = 8192,
 		///
+		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,
 		///
 		WARNINGS = TEX_WARNING + LATEX_WARNING + PACKAGE_WARNING
@@ -146,7 +156,8 @@ public:
 	   path = name of the files original path.
 	*/
 	LaTeX(std::string const & cmd, OutputParams const &,
-	      support::FileName const & file);
+	      support::FileName const & file,
+	      std::string const & path = empty_string());
 
 	/// runs LaTeX several times
 	int run(TeXErrors &);
@@ -185,11 +196,15 @@ private:
 	void scanAuxFile(support::FileName const &, AuxInfo &);
 
 	///
-	void updateBibtexDependencies(DepTable &, std::vector<AuxInfo> const &);
+	void updateBibtexDependencies(DepTable &,
+				      std::vector<AuxInfo> const &);
+
+	///
+	int scanBlgFile(DepTable & head, TeXErrors & terr);
 
 	///
 	bool runBibTeX(std::vector<AuxInfo> const &,
-		       OutputParams const &, bool biber);
+		       OutputParams const &);
 
 	///
 	void deleteFilesOnError() const;
@@ -200,6 +215,9 @@ private:
 	///
 	support::FileName file;
 
+	///
+	std::string path;
+
 	/// used by scanLogFile
 	int num_errors;
 
@@ -208,6 +226,9 @@ private:
 
 	///
 	OutputParams runparams;
+	
+	/// Do we use biber?
+	bool biber;
 };