X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=b76ec1fd428c79f05e76541b73f9e6c957233c64;hb=294e4884ee29585d311177406cd31499e6d81877;hp=f5d66a52b8cf459c74c20b2fbe96917688b29c52;hpb=bedebfc45a895e573557bf4bdfc2a6dc1af5fde7;p=lyx.git diff --git a/src/LaTeX.h b/src/LaTeX.h index f5d66a52b8..b76ec1fd42 100644 --- a/src/LaTeX.h +++ b/src/LaTeX.h @@ -18,8 +18,7 @@ #include "support/docstring.h" #include "support/FileName.h" - -#include +#include "support/signals.h" #include #include @@ -61,14 +60,26 @@ public: /// Errors::const_iterator end() const { return errors.end(); } /// + Errors::const_iterator begin_ref() const { return undef_ref.begin(); } + /// + Errors::const_iterator end_ref() const { return undef_ref.end(); } + /// void insertError(int line, docstring const & error_desc, docstring const & error_text, std::string const & child_name = empty_string()); /// void clearErrors() { errors.clear(); } + /// + void insertRef(int line, docstring const & error_desc, + docstring const & error_text, + std::string const & child_name = empty_string()); + /// + void clearRefs() { undef_ref.clear(); } private: /// Errors errors; + /// For missing Citation and references + Errors undef_ref; }; @@ -142,13 +153,17 @@ public: /// NONZERO_ERROR = 32768, // the command exited with nonzero status /// - ERRORS = TEX_ERROR + LATEX_ERROR + NONZERO_ERROR + BIBTEX_ERROR, + INDEX_ERROR = 65536, + /// + UNDEF_UNKNOWN_REF = 131072, + /// + ERRORS = TEX_ERROR + LATEX_ERROR + NONZERO_ERROR + BIBTEX_ERROR + INDEX_ERROR, /// WARNINGS = TEX_WARNING + LATEX_WARNING + PACKAGE_WARNING }; /// This signal emits an informative message - boost::signals2::signal message; + signals2::signal message; /** @@ -163,6 +178,7 @@ public: support::FileName const & file, std::string const & path = empty_string(), std::string const & lpath = empty_string(), + bool allow_cancellation = false, bool const clean_start = false); /// runs LaTeX several times @@ -188,12 +204,12 @@ private: /// void deplog(DepTable & head); - /// - bool runMakeIndex(std::string const &, OutputParams const &, + /// returns exit code + int runMakeIndex(std::string const &, OutputParams const &, std::string const & = std::string()); - /// - bool runMakeIndexNomencl(support::FileName const &, + /// returns exit code + int runMakeIndexNomencl(support::FileName const &, std::string const &, std::string const &); /// @@ -213,9 +229,12 @@ private: /// int scanBlgFile(DepTable & head, TeXErrors & terr); + /// + int scanIlgFile(TeXErrors & terr); + /// bool runBibTeX(std::vector const &, - OutputParams const &); + OutputParams const &, int & exit_code); /// void removeAuxiliaryFiles() const; @@ -240,12 +259,13 @@ private: /// OutputParams runparams; - + /// Do we use biber? bool biber; - /// std::vector children; + /// + bool allow_cancel; };