X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=377ae51279aed80471a0f6e50b9e2907d63190b1;hb=d44b465efac83c795fd65b9a2fb15d49a561460e;hp=cdd1e15e9889b65283d60f7df15f834e5d2000fc;hpb=b17500c1c47d7bdd4508743c27fb72f0e57a5105;p=lyx.git diff --git a/src/LaTeX.h b/src/LaTeX.h index cdd1e15e98..377ae51279 100644 --- a/src/LaTeX.h +++ b/src/LaTeX.h @@ -1,51 +1,58 @@ // -*- C++ -*- -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The Lyx Team +/** + * \file LaTeX.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. * - * This file is Copyright 1996-1999 - * Lars Gullik Bjønnes + * \author Lars Gullik Bjønnes + * \author Angus Leeming + * \author Dekel Tsur * - * ====================================================== + * Full author contact details are available in file CREDITS. */ #ifndef LATEX_H #define LATEX_H -#ifdef __GNUG__ -#pragma interface -#endif +#include "OutputParams.h" + +#include "support/docstring.h" +#include "support/FileName.h" + +#include +#include -#include "LString.h" -#include "DepTable.h" #include #include -#include -class LyXFunc; +namespace lyx { + +class DepTable; /// class TeXErrors { private: /// - struct Error { + class Error { + public: /// Error () : error_in_line(0) {} /// - Error(int line, string const & desc, string 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 - string error_desc; + docstring error_desc; /// The line/cmd that caused the error. - string error_text; + docstring error_text; + /// The name of the child where error occurred, empty otherwise. + std::string child_name; }; public: /// @@ -55,52 +62,46 @@ public: /// Errors::const_iterator end() const { return errors.end(); } /// - void insertError(int line, string const & error_desc, - string const & error_text); + void insertError(int line, docstring const & error_desc, + docstring const & error_text, + std::string const & child_name = empty_string()); private: /// Errors errors; }; -class Aux_Info { + +class AuxInfo { public: /// - Aux_Info() {} + AuxInfo() {} /// - string aux_file; + support::FileName aux_file; /// - std::set citations; + std::set citations; /// - std::set databases; + std::set databases; /// - std::set styles; + std::set styles; }; /// -inline -bool operator==(Aux_Info const & a, Aux_Info const & o) -{ - return a.aux_file == o.aux_file && - a.citations == o.citations && - a.databases == o.databases && - a.styles == o.styles; -} +bool operator==(AuxInfo const &, AuxInfo const &); +bool operator!=(AuxInfo const &, AuxInfo const &); -/// -inline -bool operator!=(Aux_Info const & a, Aux_Info const & o) -{ - return !(a == o); -} - - -/// +/** + * 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) - + This enum should be enlarged a bit so that one could get more feedback from the LaTeX run. */ @@ -136,73 +137,98 @@ public: /// ERROR_RERUN = 8192, /// - ERRORS = TEX_ERROR + LATEX_ERROR, + BIBTEX_ERROR = 16384, + /// + ERRORS = TEX_ERROR + LATEX_ERROR + BIBTEX_ERROR, /// WARNINGS = TEX_WARNING + LATEX_WARNING + PACKAGE_WARNING }; - + + /// This signal emits an informative message + boost::signal message; + /** cmd = the latex command, file = name of the (temporary) latex file, path = name of the files original path. */ - LaTeX(string const & cmd, string const & file, string const & path); + LaTeX(std::string const & cmd, OutputParams const &, + support::FileName const & file, + std::string const & path = empty_string()); - /// - virtual ~LaTeX() {} - /// runs LaTeX several times - int run(TeXErrors &, LyXFunc *); + int run(TeXErrors &); /// int getNumErrors() { return num_errors;} - /// use this for running LaTeX once - int operator() (); - /// int scanLogFile(TeXErrors &); -protected: +private: + /// use this for running LaTeX once + int startscript(); + /// The dependency file. - string depfile; + support::FileName depfile; /// void deplog(DepTable & head); /// - bool runMakeIndex(string const &); + bool runMakeIndex(std::string const &, OutputParams const &, + std::string const & = std::string()); /// - std::vector const scanAuxFiles(string const &); + bool runMakeIndexNomencl(support::FileName const &, + std::string const &, std::string const &); /// - Aux_Info const scanAuxFile(string const &); + std::vector const scanAuxFiles(support::FileName const &); /// - void scanAuxFile(string const &, Aux_Info &); - + AuxInfo const scanAuxFile(support::FileName const &); + + /// + void scanAuxFile(support::FileName const &, AuxInfo &); + /// void updateBibtexDependencies(DepTable &, - std::vector const &); + std::vector const &); /// - bool runBibTeX(std::vector const &); + int scanBlgFile(DepTable & head, TeXErrors & terr); + + /// + bool runBibTeX(std::vector const &, + OutputParams const &); /// void deleteFilesOnError() const; - + /// - string cmd; + std::string cmd; /// - string file; - + support::FileName file; + /// - string path; + std::string path; /// used by scanLogFile int num_errors; + + /// The name of the final output file. + support::FileName output_file; + + /// + OutputParams runparams; + + /// Do we use biber? + bool biber; }; + +} // namespace lyx + #endif