avoid float-conversion warning and simplify size computation

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index e82af858d6fe23ec30b29c8122fb4a9fd7640e7f..08c9dfd372643d9025e249994eb5ff69c3a2c94b 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,11 @@ public:
                ///
                ERROR_RERUN = 8192,
                ///
-               ERRORS = TEX_ERROR + LATEX_ERROR,
+               BIBTEX_ERROR = 16384,
+               ///
+               NONZERO_ERROR = 32768, // the command exited with nonzero status
+               ///
+               ERRORS = TEX_ERROR + LATEX_ERROR + NONZERO_ERROR + BIBTEX_ERROR,
                ///
                WARNINGS = TEX_WARNING + LATEX_WARNING + PACKAGE_WARNING
        };
@@ -148,11 +151,17 @@ public:
 
        /**
           cmd = the latex command, file = name of the (temporary) latex file,
-          path = name of the files original path.
+          path = name of the files original path,
+          clean_start = This forces a fresh run by deleting the files in the temp
+                        dir. We set this e.g. if there was an error on previous
+                        preview, which is good if the user installed a package
+                        or changed certain document settings (#9061).
        */
        LaTeX(std::string const & cmd, OutputParams const &,
              support::FileName const & file,
-             std::string const & path = empty_string());
+             std::string const & path = empty_string(),
+             std::string const & lpath = empty_string(),
+             bool const clean_start = false);
 
        /// runs LaTeX several times
        int run(TeXErrors &);
@@ -164,6 +173,10 @@ public:
        int scanLogFile(TeXErrors &);
 
 private:
+       /// noncopyable
+       LaTeX(LaTeX const &);
+       void operator=(LaTeX const &);
+
        /// use this for running LaTeX once
        int startscript();
 
@@ -195,14 +208,14 @@ private:
                                      std::vector<AuxInfo> const &);
 
        ///
-       void scanBlgFile(DepTable & head);
+       int scanBlgFile(DepTable & head, TeXErrors & terr);
 
        ///
        bool runBibTeX(std::vector<AuxInfo> const &,
                       OutputParams const &);
 
        ///
-       void deleteFilesOnError() const;
+       void removeAuxiliaryFiles() const;
 
        ///
        std::string cmd;
@@ -210,9 +223,12 @@ private:
        ///
        support::FileName file;
 
-       ///
+       /// The document directory path.
        std::string path;
 
+       /// Extra path, possibly relative to the document directory path.
+       std::string lpath;
+
        /// used by scanLogFile
        int num_errors;