Baruch's graphic-inset patch.

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 5eea18b5ce38eadd692d96e998830b06ffd57a65..89325b2a2639c06de7530299cac5028e75f38700 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -1,19 +1,19 @@
 // -*- C++ -*-
 /* This file is part of
- * ======================================================
+ * ====================================================== 
  * 
  *           LyX, The Document Processor        
  *          Copyright 1995 Matthias Ettrich
- *           Copyright 1995-1996 The Lyx Team
+ *           Copyright 1995-2000 The Lyx Team
  *
- *           This file is Copyright (C) 1996-1999
+ *           This file is Copyright 1996-1999
  *           Lars Gullik Bjønnes
  *
- *======================================================
+ * ====================================================== 
  */
 
-#ifndef _LATEX_H
-#define _LATEX_H
+#ifndef LATEX_H
+#define LATEX_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -21,123 +21,53 @@
 
 #include "LString.h"
 #include "DepTable.h"
+#include <vector>
 
-class LyXLex;
 class MiniBuffer;
 
 ///
 class TeXErrors {
-public:
-       ///
-       TeXErrors() {
-               errors = NULL;
-               next_error = NULL;
-               status = 0;
-               number_of_errors = 0;
-       }
-       ///
-       ~TeXErrors(); 
-       ///
-       void scanError(LyXLex &);
-       ///
-       bool getFirstError(int *line, LString *text);
-       ///
-       bool getNextError(int *line, LString *text);
-       ///
-       void insertError(int line, LString const &error_desc,
-                        LString 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 = NULL;
-                       error_in_line = 0;
-               }
-               ///
-               Error(int line, LString const &desc, LString const &text) {
-                       next_error = NULL;
-                       error_in_line = line;
-                       error_desc = desc;
-                       error_text = text;
-               }
+               Error () : error_in_line(0) {}
                ///
-               ~Error() {
-               }
-               ///
-               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
-               LString error_desc;
+               string error_desc;
                /// The line/cmd that caused the error.
-               LString error_text;
+               string error_text;
        };
+public:
        ///
-       Error *errors;
+       typedef std::vector<Error> Errors;
        ///
-       Error *next_error;
+       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 LaTeX {
 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,
@@ -175,10 +105,10 @@ public:
        
 
        /**
-         cmd = the latex command, file = name of the (temporary) latex file,
-         path = name of the files original path.
-         */
-       LaTeX(LString const & cmd, LString const & file, LString const & path);
+          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);
        
        /// runs LaTeX several times
        int run(TeXErrors &, MiniBuffer *);
@@ -189,50 +119,42 @@ public:
        /// 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:
-         <file> <new checksum> <old checksum>
-       */
-       LString depfile;
+       /// The dependency file.
+       string depfile;
 
-       ///
-       LaTeX() {}
-       
-       ///
-       LaTeX(LaTeX const &) {}
+       /// unavail
+       LaTeX(LaTeX const &);
+       /// unavail
+       LaTeX & operator= (LaTeX const &);
        
        ///
        void deplog(DepTable & head);
 
-       ///
-       void deptex(DepTable & head);
-       
        ///
        int scanLogFile(TeXErrors &);
 
        ///
-       bool runMakeIndex(LString const &);
+       bool runMakeIndex(string const &);
 
        ///
-       bool runBibTeX(LString const &);
+       bool scanAux(DepTable &);
        
        ///
-       LString cmd;
+       bool runBibTeX(string const &, DepTable &);
 
        ///
-       LString file;
+       void deleteFilesOnError() const;
        
        ///
-       LString path;
+       string cmd;
+
        ///
-       TEX_FILES tex_files;
+       string file;
        
        ///
-       int file_count;
+       string path;
 
-       // used by scanLogFile
+       /// used by scanLogFile
        int num_errors;
 };