getting rid of more superfluous lyx::support:: statements.

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index a7c130193905fbe137c9611c031b62888091183f..25e83e8703c32b8e50700f5459cb91f2a860cdbb 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -14,12 +14,12 @@
 #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/noncopyable.hpp>
 #include <boost/signal.hpp>
 
 #include <vector>
@@ -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, std::string const & path);
+             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());
 
        ///
-       std::vector<Aux_Info> const scanAuxFiles(std::string const &);
+       bool runMakeIndexNomencl(support::FileName const &, OutputParams const &,
+                                std::string const &, std::string const &);
 
        ///
-       Aux_Info const scanAuxFile(std::string const &);
+       std::vector<Aux_Info> const scanAuxFiles(support::FileName const &);
+
+       ///
+       Aux_Info const scanAuxFile(support::FileName const &);
 
        ///
        void scanAuxFile(support::FileName const &, Aux_Info &);
@@ -188,16 +198,13 @@ private:
        std::string cmd;
 
        ///
-       std::string file;
-
-       ///
-       std::string path;
+       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;