X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=e82af858d6fe23ec30b29c8122fb4a9fd7640e7f;hb=5170489b983c08c8be8d878996710eb0f6db2679;hp=ff74f9da40d7135874d1657411afb97cb8d6d336;hpb=f434f947dd82a4093c027408ff9698b27b2a77d3;p=lyx.git diff --git a/src/LaTeX.h b/src/LaTeX.h index ff74f9da40..e82af858d6 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; @@ -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 &); @@ -185,11 +191,15 @@ private: void scanAuxFile(support::FileName const &, AuxInfo &); /// - void updateBibtexDependencies(DepTable &, std::vector const &); + void updateBibtexDependencies(DepTable &, + std::vector const &); + + /// + void scanBlgFile(DepTable & head); /// bool runBibTeX(std::vector const &, - OutputParams const &, bool biber); + 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; };