X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.h;h=f5f66ed810eddb1c9caf77c99bf25ef01c6c34bc;hb=9ee46b846e5e84ad40ceda4f4af94aeb86cd90a2;hp=2286e0460871759354c1cbc98abc19884915eefc;hpb=0705dae8a3a2bcdd6be55eb468547c1389e84d2c;p=lyx.git

diff --git a/src/converter.h b/src/converter.h
index 2286e04608..f5f66ed810 100644
--- a/src/converter.h
+++ b/src/converter.h
@@ -13,32 +13,34 @@
 #define CONVERTER_H
 
 #include "graph.h"
+#include "outputparams.h"
 
-#include "support/std_string.h"
 #include <vector>
+#include <string>
+
 
 class Buffer;
 class Format;
 class Formats;
-class LatexRunParams;
+class OutputParams;
 
 
 ///
 class Converter {
 public:
 	///
-	Converter(string const & f, string const & t, string const & c,
-		  string const & l);
+	Converter(std::string const & f, std::string const & t, std::string const & c,
+		  std::string const & l);
 	///
 	void readFlags();
 	///
-	string from;
+	std::string from;
 	///
-	string to;
+	std::string to;
 	///
-	string command;
+	std::string command;
 	///
-	string flags;
+	std::string flags;
 	///
 	Format const * From;
 	///
@@ -46,18 +48,20 @@ public:
 
 	/// The converter is latex or its derivatives
 	bool latex;
+	/// The converter is xml
+	bool xml;
 	/// Do we need to run the converter in the original directory?
 	bool original_dir;
 	/// This converter needs the .aux files
 	bool need_aux;
 	/// If the converter put the result in a directory, then result_dir
 	/// is the name of the directory
-	string result_dir;
+	std::string result_dir;
 	/// If the converter put the result in a directory, then result_file
 	/// is the name of the main file in that directory
-	string result_file;
+	std::string result_file;
 	/// Command to convert the program output to a LaTeX log file format
-	string parselog;
+	std::string parselog;
 };
 
 
@@ -75,44 +79,46 @@ public:
 		return converterlist_[i];
 	}
 	///
-	Converter const * getConverter(string const & from, string const & to);
+	Converter const * getConverter(std::string const & from,
+				       std::string const & to) const;
 	///
-	int getNumber(string const & from, string const & to);
+	int getNumber(std::string const & from, std::string const & to) const;
 	///
-	void add(string const & from, string const & to,
-		 string const & command, string const & flags);
+	void add(std::string const & from, std::string const & to,
+		 std::string const & command, std::string const & flags);
 	//
-	void erase(string const & from, string const & to);
+	void erase(std::string const & from, std::string const & to);
 	///
 	void sort();
 	///
 	std::vector<Format const *> const
-	getReachableTo(string const & target, bool clear_visited);
+	getReachableTo(std::string const & target, bool clear_visited);
 	///
 	std::vector<Format const *> const
-	getReachable(string const & from, bool only_viewable,
+	getReachable(std::string const & from, bool only_viewable,
 		     bool clear_visited);
+	/// Does a conversion path from format \p from to format \p to exist?
+	bool isReachable(std::string const & from, std::string const & to);
 	///
-	bool isReachable(string const & from, string const & to);
-	///
-	Graph::EdgePath const getPath(string const & from, string const & to);
+	Graph::EdgePath const getPath(std::string const & from, std::string const & to);
 	///
-	bool usePdflatex(Graph::EdgePath const & path);
+	OutputParams::FLAVOR getFlavor(Graph::EdgePath const & path);
 	///
 	bool convert(Buffer const * buffer,
-		     string const & from_file, string const & to_file_base,
-		     string const & from_format, string const & to_format,
-		     string & to_file);
+		     std::string const & from_file, std::string const & to_file_base,
+		     std::string const & from_format, std::string const & to_format,
+                     std::string & to_file, bool try_default = false);
 	///
 	bool convert(Buffer const * buffer,
-		     string const & from_file, string const & to_file_base,
-		     string const & from_format, string const & to_format);
+		     std::string const & from_file, std::string const & to_file_base,
+		     std::string const & from_format, std::string const & to_format,
+                     bool try_default = false);
 	///
 	void update(Formats const & formats);
 	///
 	void updateLast(Formats const & formats);
 	///
-	bool formatIsUsed(string const & format);
+	bool formatIsUsed(std::string const & format);
 	///
 	const_iterator begin() const {
 		return converterlist_.begin();
@@ -125,19 +131,22 @@ public:
 private:
 	///
 	std::vector<Format const *> const
-	Converters::intToFormat(std::vector<int> const & input);
+	intToFormat(std::vector<int> const & input);
 	///
-	bool scanLog(Buffer const & buffer, string const & command,
-		     string const & filename);
+	bool scanLog(Buffer const & buffer, std::string const & command,
+		     std::string const & filename);
 	///
-	bool runLaTeX(Buffer const & buffer, string const & command,
-		      LatexRunParams const &);
+	bool runLaTeX(Buffer const & buffer, std::string const & command,
+		      OutputParams const &);
 	///
 	ConverterList converterlist_;
 	///
-	string latex_command_;
-	///
-	bool move(string const & from, string const & to, bool copy);
+	std::string latex_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,
+		  std::string const & from, std::string const & to,
+		  bool copy);
 	///
 	Graph G_;
 };