Pimpl MathMacro

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index e82af858d6fe23ec30b29c8122fb4a9fd7640e7f..7fa6798ff05cdbee0aad6a6dfdeb47f66c941aa7 100644 (file)
--- a/src/LaTeX.h
+++ b/src/LaTeX.h
@@ -19,7 +19,6 @@
 #include "support/docstring.h"
 #include "support/FileName.h"
 
-#include <boost/noncopyable.hpp>
 #include <boost/signal.hpp>
 
 #include <vector>
@@ -45,7 +44,7 @@ private:
                          error_desc(desc),
                          error_text(text),
                          child_name(fname) {}
-               /// what line in the TeX file the error occured in
+               /// what line in the TeX file the error occurred in
                int error_in_line;
                /// The kind of error
                docstring error_desc;
@@ -98,7 +97,7 @@ bool operator!=(AuxInfo const &, AuxInfo const &);
  * This is required by the LaTeX compiler, and we also make use of it by
  * various support::makeAbsPath() calls.
  */
-class LaTeX : boost::noncopyable {
+class LaTeX {
 public:
        /** Return values from scanLogFile() and run() (to come)
 
@@ -137,7 +136,14 @@ public:
                ///
                ERROR_RERUN = 8192,
                ///
-               ERRORS = TEX_ERROR + LATEX_ERROR,
+               BIBTEX_ERROR = 16384,
+               ///
+               NONZERO_ERROR = 32768, // the command exited with nonzero status
+               ///
+               //FIXME: BIBTEX_ERROR has been removed from ERRORS for now, since users were irritated
+               //       about those errors which prevented compilation of previously compiling documents.
+               //       Think about a "gentle" transfer to BibTeX error reporting.
+               ERRORS = TEX_ERROR + LATEX_ERROR + NONZERO_ERROR,
                ///
                WARNINGS = TEX_WARNING + LATEX_WARNING + PACKAGE_WARNING
        };
@@ -164,6 +170,10 @@ public:
        int scanLogFile(TeXErrors &);
 
 private:
+       /// noncopyable
+       LaTeX(LaTeX const &);
+       void operator=(LaTeX const &);
+
        /// use this for running LaTeX once
        int startscript();
 
@@ -195,7 +205,7 @@ private:
                                      std::vector<AuxInfo> const &);
 
        ///
-       void scanBlgFile(DepTable & head);
+       int scanBlgFile(DepTable & head, TeXErrors & terr);
 
        ///
        bool runBibTeX(std::vector<AuxInfo> const &,