Account for old versions of Pygments

[lyx.git] / src / Converter.h

diff --git a/src/Converter.h b/src/Converter.h
index 9a72d8c708c9c68602650083446671ee0cb88954..1ea73279b23892197f60d4e26e58045003cf0494 100644 (file)
--- a/src/Converter.h
+++ b/src/Converter.h
@@ -29,7 +29,8 @@ class Buffer;
 class ErrorList;
 class Format;
 class Formats;
-class OutputParams;
+
+typedef std::vector<Format const *> FormatList;
 
 
 ///
@@ -68,6 +69,8 @@ public:
        bool xml() const { return xml_; }
        ///
        bool need_aux() const { return need_aux_; }
+       /// Return whether or not the needauth option is set for this converter
+       bool need_auth() const { return need_auth_; }
        ///
        bool nice() const { return nice_; }
        ///
@@ -76,6 +79,7 @@ public:
        std::string const result_file() const { return result_file_; }
        ///
        std::string const parselog() const { return parselog_; }
+
 private:
        ///
        trivstring from_;
@@ -100,6 +104,8 @@ private:
        bool need_aux_;
        /// we need a "nice" file from the backend, c.f. OutputParams.nice.
        bool nice_;
+       /// Use of this converter needs explicit user authorization
+       bool need_auth_;
        /// If the converter put the result in a directory, then result_dir
        /// is the name of the directory
        trivstring result_dir_;
@@ -132,16 +138,16 @@ public:
        //
        void erase(std::string const & from, std::string const & to);
        ///
-       std::vector<Format const *> const
-       getReachableTo(std::string const & target, bool clear_visited);
+       FormatList const 
+               getReachableTo(std::string const & target, bool clear_visited);
        ///
-       std::vector<Format const *> const
-       getReachable(std::string const & from, bool only_viewable,
-              bool clear_visited,
-              std::set<std::string> const & excludes = std::set<std::string>());
+       FormatList const
+               getReachable(std::string const & from, bool only_viewable,
+                   bool clear_visited,
+                   std::set<std::string> const & excludes = std::set<std::string>());
 
-       std::vector<Format const *> importableFormats();
-       std::vector<Format const *> exportableFormats(bool only_viewable);
+       FormatList importableFormats();
+       FormatList exportableFormats(bool only_viewable);
 
        std::vector<std::string> loaders() const;
        std::vector<std::string> savers() const;
@@ -180,9 +186,19 @@ public:
        const_iterator end() const { return converterlist_.end(); }
        ///
        void buildGraph();
+
+       /// Check whether converter conv is authorized to be run for elements
+       /// within document doc_fname.
+       /// The check succeeds for safe converters, whilst for those potentially
+       /// 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);
+
 private:
        ///
-       std::vector<Format const *> const
+       FormatList const
        intToFormat(std::vector<int> const & input);
        ///
        bool scanLog(Buffer const & buffer, std::string const & command,