This patch does two closely related things.

[lyx.git] / src / Converter.h

diff --git a/src/Converter.h b/src/Converter.h
index 2849e877e4f873c89bd5fd17da5a89733ea01ed8..9a72d8c708c9c68602650083446671ee0cb88954 100644 (file)
--- a/src/Converter.h
+++ b/src/Converter.h
@@ -14,8 +14,10 @@
 
 #include "Graph.h"
 #include "OutputParams.h"
+#include "support/trivstring.h"
 
 #include <vector>
+#include <set>
 #include <string>
 
 
@@ -39,50 +41,86 @@ public:
        ///
        void readFlags();
        ///
-       std::string from;
+       std::string const from() const { return from_; }
        ///
-       std::string to;
+       std::string const to() const { return to_; }
        ///
-       std::string command;
+       std::string const command() const { return command_; }
        ///
-       std::string flags;
+       void setCommand(std::string const & command) { command_ = command; }
        ///
-       Format const * From;
+       std::string const flags() const { return flags_; }
        ///
-       Format const * To;
+       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_; }
+       ///
+       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 const parselog() const { return parselog_; }
+private:
+       ///
+       trivstring from_;
+       ///
+       trivstring to_;
+       ///
+       trivstring command_;
+       ///
+       trivstring flags_;
+       ///
+       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_;
        /// 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<int> EdgePath; // to be removed SOON
        ///
        typedef std::vector<Converter> 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 +132,27 @@ public:
        //
        void erase(std::string const & from, std::string const & to);
        ///
-       void sort();
-       ///
        std::vector<Format const *> 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);
+              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);
+
+       std::vector<std::string> loaders() const;
+       std::vector<std::string> 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 +164,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,12 +175,9 @@ 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();
 private:
@@ -151,7 +193,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,