X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=569114d369899f6072ae02b0b5528178a0b6988c;hb=a900667ea1bb516ac562a6c45e4f3a1e4071b01b;hp=08c9dfd372643d9025e249994eb5ff69c3a2c94b;hpb=306b136cc005a1aeb9a6861ee0ac6fe2a2dd53e3;p=lyx.git diff --git a/src/LaTeX.h b/src/LaTeX.h index 08c9dfd372..569114d369 100644 --- a/src/LaTeX.h +++ b/src/LaTeX.h @@ -16,10 +16,9 @@ #include "OutputParams.h" -#include "support/docstring.h" +#include "support/strfwd.h" #include "support/FileName.h" - -#include +#include "support/signals.h" #include #include @@ -61,12 +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; }; @@ -140,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::signal message; + signal message; /** @@ -161,13 +178,14 @@ 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 int run(TeXErrors &); /// - int getNumErrors() { return num_errors;} + int getNumErrors() const { return num_errors;} /// int scanLogFile(TeXErrors &); @@ -186,16 +204,17 @@ 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 &); /// - std::vector const scanAuxFiles(support::FileName const &); + std::vector const scanAuxFiles(support::FileName const &, + bool const only_childbibs = false); /// AuxInfo const scanAuxFile(support::FileName const &); @@ -210,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; @@ -237,9 +259,13 @@ private: /// OutputParams runparams; - + /// Do we use biber? bool biber; + /// + std::vector children; + /// + bool allow_cancel; };