Fix external middle-mouse pasting with Qt5/X11.

[lyx.git] / src / LaTeX.h

diff --git a/src/LaTeX.h b/src/LaTeX.h
index 1e1522c6773d5438998f3f654dc8c52a40152297..6b71f0f8a72b0240d2b16cc872f74ff150f319df 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>
@@ -39,16 +38,20 @@ private:
                ///
                Error () : error_in_line(0) {}
                ///
-               Error(int line, docstring const & desc, docstring 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) {}
-               /// what line in the TeX file the error occured in
+                         error_text(text),
+                         child_name(fname) {}
+               /// what line in the TeX file the error occurred in
                int error_in_line;
                /// The kind of error
                docstring error_desc;
                /// The line/cmd that caused the error.
                docstring error_text;
+               /// The name of the child where error occurred, empty otherwise.
+               std::string child_name;
        };
 public:
        ///
@@ -59,7 +62,8 @@ public:
        Errors::const_iterator end() const { return errors.end(); }
        ///
        void insertError(int line, docstring const & error_desc,
-                        docstring const & error_text);
+                        docstring const & error_text,
+                        std::string const & child_name = empty_string());
 private:
        ///
        Errors errors;
@@ -93,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)
 
@@ -132,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
        };
@@ -146,7 +154,8 @@ public:
           path = name of the files original path.
        */
        LaTeX(std::string const & cmd, OutputParams const &,
-             support::FileName const & file);
+             support::FileName const & file,
+             std::string const & path = empty_string());
 
        /// runs LaTeX several times
        int run(TeXErrors &);
@@ -158,6 +167,10 @@ public:
        int scanLogFile(TeXErrors &);
 
 private:
+       /// noncopyable
+       LaTeX(LaTeX const &);
+       void operator=(LaTeX const &);
+
        /// use this for running LaTeX once
        int startscript();
 
@@ -186,15 +199,14 @@ private:
 
        ///
        void updateBibtexDependencies(DepTable &,
-                                     std::vector<AuxInfo> const &,
-                                     bool biber);
+                                     std::vector<AuxInfo> const &);
 
        ///
-       void scanBlgFile(DepTable & head);
+       int scanBlgFile(DepTable & head, TeXErrors & terr);
 
        ///
        bool runBibTeX(std::vector<AuxInfo> const &,
-                      OutputParams const &, bool biber);
+                      OutputParams const &);
 
        ///
        void deleteFilesOnError() const;
@@ -205,6 +217,9 @@ private:
        ///
        support::FileName file;
 
+       ///
+       std::string path;
+
        /// used by scanLogFile
        int num_errors;
 
@@ -213,6 +228,9 @@ private:
 
        ///
        OutputParams runparams;
+       
+       /// Do we use biber?
+       bool biber;
 };