X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FConverter.h;h=082b2d358a97ba821c2f25f5f3a8a4708e71a258;hb=b874bdfd402a94428c8f5fe7ef2180146069120a;hp=8f131bba363b802e9e916db9c8a17ea1cb6a2cf2;hpb=8995a8387a03361b6a7ff44b447a90a6187b1a14;p=lyx.git

diff --git a/src/Converter.h b/src/Converter.h
index 8f131bba36..082b2d358a 100644
--- a/src/Converter.h
+++ b/src/Converter.h
@@ -14,6 +14,7 @@
 
 #include "Graph.h"
 #include "OutputParams.h"
+#include "support/trivstring.h"
 
 #include <vector>
 #include <set>
@@ -28,7 +29,6 @@ class Buffer;
 class ErrorList;
 class Format;
 class Formats;
-class OutputParams;
 
 
 ///
@@ -40,34 +40,73 @@ 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
-	std::string latex_flavor;
+	trivstring latex_flavor_;
 	/// The converter is xml
-	bool xml;
+	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_;
 };
 
 
@@ -78,8 +117,6 @@ public:
 	typedef std::vector<Converter> ConverterList;
 	///
 	typedef ConverterList::const_iterator const_iterator;
-	///
-	typedef std::vector<std::string> FormatList;
 
 	///
 	Converter const & get(int i) const { return converterlist_[i]; }
@@ -155,15 +192,15 @@ private:
 	///
 	ConverterList converterlist_;
 	///
-	std::string latex_command_;
+	trivstring latex_command_;
 	///
-	std::string dvilualatex_command_;
+	trivstring dvilualatex_command_;
 	///
-	std::string lualatex_command_;
+	trivstring lualatex_command_;
 	///
-	std::string pdflatex_command_;
+	trivstring pdflatex_command_;
 	///
-	std::string xelatex_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,