X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLaTeX.h;h=d3a375ae746a1615e4d1a7d7a7c4fdf1ac8fdae6;hb=eead5ba43d0ddf06544ad1b40063981d3788c635;hp=99e3a56e26a8c7eb7c105c0552007519c508bfe6;hpb=d7dbc63467b8ddc07aaca9fa3c73b2b2325a9c5f;p=lyx.git diff --git a/src/LaTeX.h b/src/LaTeX.h index 99e3a56e26..d3a375ae74 100644 --- a/src/LaTeX.h +++ b/src/LaTeX.h @@ -1,85 +1,41 @@ // -*- C++ -*- /* This file is part of * ====================================================== - * - * LyX, The Document Processor + * + * LyX, The Document Processor * Copyright 1995 Matthias Ettrich - * Copyright 1995-1996 The Lyx Team + * Copyright 1995-2001 The Lyx Team * - * This file is Copyright (C) 1996-1999 + * This file is Copyright 1996-2001 * Lars Gullik Bjønnes * - *====================================================== + * ====================================================== */ #ifndef LATEX_H #define LATEX_H -#ifdef __GNUG__ -#pragma interface -#endif - +#include "latexrunparams.h" #include "LString.h" #include "DepTable.h" +#include +#include -class LyXLex; -class MiniBuffer; +#include +#include /// class TeXErrors { -public: - /// - TeXErrors() { - errors = 0; - next_error = 0; - status = 0; - number_of_errors = 0; - } - /// - ~TeXErrors(); - /// - void scanError(LyXLex &); - /// - bool getFirstError(int *line, string *text); - /// - bool getNextError(int *line, string *text); - /// - void insertError(int line, string const &error_desc, - string const &error_text); - /// - void printErrors(); - /// - void printWarnings(); - /// - void printStatus(); - /// - int getStatus() { return status; } private: - /// - friend class LaTeX; - /// - int status; - /// - int number_of_errors; /// struct Error { /// - Error () { - next_error = 0; - error_in_line = 0; - } - /// - Error(int line, string const &desc, string const &text) { - next_error = 0; - error_in_line = line; - error_desc = desc; - error_text = text; - } - /// - ~Error() { - } + Error () : error_in_line(0) {} /// - Error *next_error; + Error(int line, string const & desc, string const & text) + : error_in_line(line), + error_desc(desc), + error_text(text) {} /// what line in the TeX file the error occured in int error_in_line; /// The kind of error @@ -87,57 +43,50 @@ private: /// The line/cmd that caused the error. string error_text; }; +public: + /// + typedef std::vector Errors; + /// + Errors::const_iterator begin() const { return errors.begin(); } + /// + Errors::const_iterator end() const { return errors.end(); } + /// + void insertError(int line, string const & error_desc, + string const & error_text); +private: + /// + Errors errors; +}; + + +class Aux_Info { +public: + /// + Aux_Info() {} + /// + string aux_file; + /// + std::set citations; /// - Error *errors; + std::set databases; /// - Error *next_error; + std::set styles; }; /// -class LaTeX { +bool operator==(Aux_Info const &, Aux_Info const &); +bool operator!=(Aux_Info const &, Aux_Info const &); + + +/// +class LaTeX : boost::noncopyable { public: - /** All the different files produced by TeX. - - This is the files mentioned on page 208-9 in Lamports book + - .ltx and .tex files. - */ - enum TEX_FILES { - /// - NO_FILES = 0, - /// used for table of contents et.al. - AUX = 1, - /// written by BibTeX - BBL = 2, - /// LaTeX's output - DVI = 4, - /// glossary (not supported by LyX so far) - GLO = 8, - ///index - IDX = 16, - /// written by makeindex - IND = 32, - /// list of figures - LOF = 64, - /// the LaTeX log file - LOG = 128, - /// list of tables - LOT = 256, - /// table of contents - TOC = 512, - /// latex files - LTX = 1024, - /// tex files - TEX = 2048, - /// list of algorithms - LOA = 4096 - }; - /** 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. - */ + This enum should be enlarged a bit so that one could + get more feedback from the LaTeX run. + */ enum log_status { /// NO_ERRORS = 0, @@ -168,72 +117,82 @@ public: /// TOO_MANY_ERRORS = 4096, /// + ERROR_RERUN = 8192, + /// ERRORS = TEX_ERROR + LATEX_ERROR, /// WARNINGS = TEX_WARNING + LATEX_WARNING + PACKAGE_WARNING }; - + + /// This signal emits an informative message + boost::signal1 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); - + cmd = the latex command, file = name of the (temporary) latex file, + path = name of the files original path. + */ + LaTeX(string const & cmd, LatexRunParams const &, + string const & file, string const & path); + /// runs LaTeX several times - int run(TeXErrors &, MiniBuffer *); + int run(TeXErrors &); /// int getNumErrors() { return num_errors;} + /// + int scanLogFile(TeXErrors &); + +private: /// use this for running LaTeX once - int operator() (); -protected: - /** The dependency file. - - We store the file dependencies in this file. - the depency file is on the format: - - */ + int startscript(); + + /// The dependency file. string depfile; /// - LaTeX() {} - + void deplog(DepTable & head); + /// - LaTeX(LaTeX const &) {} - + bool runMakeIndex(string const &); + /// - void deplog(DepTable & head); + std::vector const scanAuxFiles(string const &); /// - void deptex(DepTable & head); - + Aux_Info const scanAuxFile(string const &); + /// - int scanLogFile(TeXErrors &); + void scanAuxFile(string const &, Aux_Info &); /// - bool runMakeIndex(string const &); + void updateBibtexDependencies(DepTable &, + std::vector const &); + + /// + bool runBibTeX(std::vector const &); /// - bool runBibTeX(string const &); - + void deleteFilesOnError() const; + /// string cmd; /// string file; - + /// string path; - /// - TEX_FILES tex_files; - - /// - int file_count; - // used by scanLogFile + /// used by scanLogFile int num_errors; + + /// The name of the final output file. + string output_file; + + /// + LatexRunParams runparams; }; #endif