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

diff --git a/src/converter.h b/src/converter.h
index a244198e8b..f5f66ed810 100644
--- a/src/converter.h
+++ b/src/converter.h
@@ -13,6 +13,7 @@
 #define CONVERTER_H
 
 #include "graph.h"
+#include "outputparams.h"
 
 #include <vector>
 #include <string>
@@ -21,7 +22,7 @@
 class Buffer;
 class Format;
 class Formats;
-class LatexRunParams;
+class OutputParams;
 
 
 ///
@@ -47,6 +48,8 @@ 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
@@ -76,9 +79,10 @@ public:
 		return converterlist_[i];
 	}
 	///
-	Converter const * getConverter(std::string const & from, std::string const & to);
+	Converter const * getConverter(std::string const & from,
+				       std::string const & to) const;
 	///
-	int getNumber(std::string const & from, std::string const & to);
+	int getNumber(std::string const & from, std::string const & to) const;
 	///
 	void add(std::string const & from, std::string const & to,
 		 std::string const & command, std::string const & flags);
@@ -93,21 +97,22 @@ public:
 	std::vector<Format const *> const
 	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);
 	///
 	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,
 		     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);
+                     std::string & to_file, bool try_default = false);
 	///
 	bool convert(Buffer const * buffer,
 		     std::string const & from_file, std::string const & to_file_base,
-		     std::string const & from_format, std::string const & to_format);
+		     std::string const & from_format, std::string const & to_format,
+                     bool try_default = false);
 	///
 	void update(Formats const & formats);
 	///
@@ -132,13 +137,16 @@ private:
 		     std::string const & filename);
 	///
 	bool runLaTeX(Buffer const & buffer, std::string const & command,
-		      LatexRunParams const &);
+		      OutputParams const &);
 	///
 	ConverterList converterlist_;
 	///
 	std::string latex_command_;
-	///
-	bool move(std::string const & from, std::string const & to, bool copy);
+	/// 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_;
 };