X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=52b8ff7a0a0ea5fe4a54a41a3689389099f60fe6;hb=f99d41a25a326865183879853b97ed3265499042;hp=717172ebecfae57276c37f81e065fa73bb5b6d84;hpb=3c0b752f1cad8eadb12356dfa2e854fc9577749e;p=lyx.git

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 717172ebec..52b8ff7a0a 100644
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -14,10 +14,10 @@
 #ifndef LATEX_H
 #define LATEX_H
 
-#include "outputparams.h"
+#include "OutputParams.h"
 
 #include "support/docstring.h"
-#include "support/filename.h"
+#include "support/FileName.h"
 
 #include <boost/utility.hpp>
 #include <boost/signal.hpp>
@@ -71,7 +71,7 @@ public:
 	///
 	Aux_Info() {}
 	///
-	std::string aux_file;
+	support::FileName aux_file;
 	///
 	std::set<std::string> citations;
 	///
@@ -86,7 +86,13 @@ bool operator==(Aux_Info const &, Aux_Info const &);
 bool operator!=(Aux_Info const &, Aux_Info const &);
 
 
-///
+/**
+ * Class to run the LaTeX compiler and needed auxiliary programs.
+ * The main .tex file must be in the current directory. The current directory
+ * must not change as long as an object of this class lives.
+ * This is required by the LaTeX compiler, and we also make use of it by
+ * various support::makeAbsPath() calls.
+ */
 class LaTeX : boost::noncopyable {
 public:
 	/** Return values from scanLogFile() and run() (to come)
@@ -140,7 +146,7 @@ public:
 	   path = name of the files original path.
 	*/
 	LaTeX(std::string const & cmd, OutputParams const &,
-	      std::string const & file);
+	      support::FileName const & file);
 
 	/// runs LaTeX several times
 	int run(TeXErrors &);
@@ -163,13 +169,17 @@ private:
 
 	///
 	bool runMakeIndex(std::string const &, OutputParams const &,
-	                  std::string const & = std::string());
+			  std::string const & = std::string());
+
+	///
+	bool runMakeIndexNomencl(support::FileName const &, OutputParams const &,
+				 std::string const &, std::string const &);
 
 	///
-	std::vector<Aux_Info> const scanAuxFiles(std::string const &);
+	std::vector<Aux_Info> const scanAuxFiles(support::FileName const &);
 
 	///
-	Aux_Info const scanAuxFile(std::string const &);
+	Aux_Info const scanAuxFile(support::FileName const &);
 
 	///
 	void scanAuxFile(support::FileName const &, Aux_Info &);
@@ -188,13 +198,13 @@ private:
 	std::string cmd;
 
 	///
-	std::string file;
+	support::FileName file;
 
 	/// used by scanLogFile
 	int num_errors;
 
 	/// The name of the final output file.
-	std::string output_file;
+	support::FileName output_file;
 
 	///
 	OutputParams runparams;