Buffer param \cite_engine_type (authoryear|numerical).

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index f98f90e2c108b8cb44e8fe769db15456f25b26c3..e82af858d6fe23ec30b29c8122fb4a9fd7640e7f 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -4,7 +4,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
  * \author Angus Leeming
  * \author Dekel Tsur
  *
@@ -17,9 +17,9 @@
 #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>
@@ -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,17 +63,18 @@ 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;
 };
 
 
-class Aux_Info {
+class AuxInfo {
 public:
        ///
-       Aux_Info() {}
+       AuxInfo() {}
        ///
        support::FileName aux_file;
        ///
@@ -82,8 +87,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 &);
 
 
 /**
@@ -146,7 +151,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 &);
@@ -169,27 +175,31 @@ 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 &);
+       bool runMakeIndexNomencl(support::FileName const &, 
+                                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 &);
+       void scanBlgFile(DepTable & head);
+
+       ///
+       bool runBibTeX(std::vector<AuxInfo> const &,
+                      OutputParams const &);
 
        ///
        void deleteFilesOnError() const;
@@ -200,6 +210,9 @@ private:
        ///
        support::FileName file;
 
+       ///
+       std::string path;
+
        /// used by scanLogFile
        int num_errors;
 
@@ -208,6 +221,9 @@ private:
 
        ///
        OutputParams runparams;
+       
+       /// Do we use biber?
+       bool biber;
 };