Do not step counters in deleted material.

[lyx.git] / src / Converter.h

diff --git a/src/Converter.h b/src/Converter.h
index 1ea73279b23892197f60d4e26e58045003cf0494..e144ca2fa46459764d6492e83b0b9ff1ec029c8e 100644 (file)
--- a/src/Converter.h
+++ b/src/Converter.h
@@ -79,6 +79,8 @@ public:
        std::string const result_file() const { return result_file_; }
        ///
        std::string const parselog() const { return parselog_; }
+       ///
+       std::string const hyperref_driver() const { return href_driver_; }
 
 private:
        ///
@@ -114,6 +116,8 @@ private:
        trivstring result_file_;
        /// Command to convert the program output to a LaTeX log file format
        trivstring parselog_;
+       /// The hyperref driver
+       trivstring href_driver_;
 };
 
 
@@ -138,7 +142,7 @@ public:
        //
        void erase(std::string const & from, std::string const & to);
        ///
-       FormatList const 
+       FormatList const
                getReachableTo(std::string const & target, bool clear_visited);
        ///
        FormatList const
@@ -159,6 +163,8 @@ public:
        ///
        OutputParams::FLAVOR getFlavor(Graph::EdgePath const & path,
                                       Buffer const * buffer = 0);
+       ///
+       std::string getHyperrefDriver(Graph::EdgePath const & path);
        /// Flags for converting files
        enum ConversionFlags {
                /// No special flags
@@ -193,8 +199,14 @@ public:
        /// able to execute arbitrary code, tagged with the 'needauth' option,
        /// authorization is: always denied if lyxrc.use_converter_needauth_forbidden
        /// is enabled; always allowed if the lyxrc.use_converter_needauth
-       /// is disabled; user is prompted otherwise
-       bool checkAuth(Converter const & conv, std::string const & doc_fname);
+       /// is disabled; user is prompted otherwise.
+       /// However, if use_shell_escape is true and a LaTeX backend is
+       /// going to be executed, both lyxrc.use_converter_needauth and
+       /// lyxrc.use_converter_needauth_forbidden are ignored, because in
+       /// this case the backend has to be executed and LyX will add the
+       /// -shell-escape option, so that user consent is always needed.
+       bool checkAuth(Converter const & conv, std::string const & doc_fname,
+                      bool use_shell_escape = false);
 
 private:
        ///