X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FConverter.h;h=1ea73279b23892197f60d4e26e58045003cf0494;hb=28be7d552f62cc02fa86d7f79201d089bfb2d7b5;hp=2849e877e4f873c89bd5fd17da5a89733ea01ed8;hpb=f630be890494c849981e4fb52ea4740506e92bed;p=lyx.git diff --git a/src/Converter.h b/src/Converter.h index 2849e877e4..1ea73279b2 100644 --- a/src/Converter.h +++ b/src/Converter.h @@ -14,8 +14,10 @@ #include "Graph.h" #include "OutputParams.h" +#include "support/trivstring.h" #include +#include #include @@ -27,7 +29,8 @@ class Buffer; class ErrorList; class Format; class Formats; -class OutputParams; + +typedef std::vector FormatList; /// @@ -39,50 +42,91 @@ public: /// void readFlags(); /// - std::string from; + std::string const from() const { return from_; } + /// + std::string const to() const { return to_; } + /// + std::string const command() const { return command_; } + /// + void setCommand(std::string const & command) { command_ = command; } + /// + std::string const flags() const { return flags_; } + /// + void setFlags(std::string const & flags) { flags_ = flags; } + /// + Format const * From() const { return From_; } + /// + void setFrom(Format const * From) { From_ = From; } + /// + void setTo(Format const * To) { To_ = To; } + /// + Format const * To() const { return To_; } + /// + bool latex() const { return latex_; } + /// + std::string const latex_flavor() const { return latex_flavor_; } + /// + 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_; } + /// + std::string const result_dir() const { return result_dir_; } + /// + std::string const result_file() const { return result_file_; } /// - std::string to; + std::string const parselog() const { return parselog_; } + +private: + /// + trivstring from_; /// - std::string command; + trivstring to_; /// - std::string flags; + trivstring command_; /// - Format const * From; + trivstring flags_; /// - Format const * To; + Format const * From_; + /// + Format const * To_; /// The converter is latex or its derivatives - bool latex; + bool latex_; + /// The latex derivate + trivstring latex_flavor_; /// The converter is xml - bool xml; - /// Do we need to run the converter in the original directory? - bool original_dir; + bool xml_; /// This converter needs the .aux files - bool need_aux; + 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 - std::string result_dir; + trivstring result_dir_; /// If the converter put the result in a directory, then result_file /// is the name of the main file in that directory - std::string result_file; + trivstring result_file_; /// Command to convert the program output to a LaTeX log file format - std::string parselog; + trivstring parselog_; }; /// class Converters { public: - /// - typedef std::vector EdgePath; // to be removed SOON /// typedef std::vector ConverterList; /// typedef ConverterList::const_iterator const_iterator; + /// - Converter const & get(int i) const { - return converterlist_[i]; - } + Converter const & get(int i) const { return converterlist_[i]; } /// Converter const * getConverter(std::string const & from, std::string const & to) const; @@ -94,20 +138,27 @@ public: // void erase(std::string const & from, std::string const & to); /// - void sort(); - /// - std::vector const - getReachableTo(std::string const & target, bool clear_visited); + FormatList const + getReachableTo(std::string const & target, bool clear_visited); /// - std::vector const - getReachable(std::string const & from, bool only_viewable, - bool clear_visited); + FormatList const + getReachable(std::string const & from, bool only_viewable, + bool clear_visited, + std::set const & excludes = std::set()); + + FormatList importableFormats(); + FormatList exportableFormats(bool only_viewable); + + std::vector loaders() const; + std::vector savers() const; + /// Does a conversion path from format \p from to format \p to exist? bool isReachable(std::string const & from, std::string const & to); /// - Graph::EdgePath const getPath(std::string const & from, std::string const & to); + Graph::EdgePath getPath(std::string const & from, std::string const & to); /// - OutputParams::FLAVOR getFlavor(Graph::EdgePath const & path); + OutputParams::FLAVOR getFlavor(Graph::EdgePath const & path, + Buffer const * buffer = 0); /// Flags for converting files enum ConversionFlags { /// No special flags @@ -119,10 +170,10 @@ public: }; /// bool convert(Buffer const * buffer, - support::FileName const & from_file, support::FileName const & to_file, - support::FileName const & orig_from, - std::string const & from_format, std::string const & to_format, - ErrorList & errorList, int conversionflags = none); + support::FileName const & from_file, support::FileName const & to_file, + support::FileName const & orig_from, + std::string const & from_format, std::string const & to_format, + ErrorList & errorList, int conversionflags = none); /// void update(Formats const & formats); /// @@ -130,17 +181,24 @@ public: /// bool formatIsUsed(std::string const & format); /// - const_iterator begin() const { - return converterlist_.begin(); - } - const_iterator end() const { - return converterlist_.end(); - } + const_iterator begin() const { return converterlist_.begin(); } + /// + 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 const + FormatList const intToFormat(std::vector const & input); /// bool scanLog(Buffer const & buffer, std::string const & command, @@ -151,7 +209,15 @@ private: /// ConverterList converterlist_; /// - std::string latex_command_; + trivstring latex_command_; + /// + trivstring dvilualatex_command_; + /// + trivstring lualatex_command_; + /// + trivstring pdflatex_command_; + /// + trivstring xelatex_command_; /// If \p from = /path/file.ext and \p to = /path2/file2.ext2 then /// this method moves each /path/file*.ext file to /path2/file2*.ext2 bool move(std::string const & fmt,