X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fconverter.h;h=9cec2c122b132ddf1734532f4267eea9952ed688;hb=35204f8f33d7400a5fefeffea533fb4cb4097211;hp=3945dd5c3b1a7864a37a6fb706faaf2452a887aa;hpb=b14ad898bf84b5ebffb8e1af41079f65554d4dc5;p=lyx.git

diff --git a/src/converter.h b/src/converter.h
index 3945dd5c3b..9cec2c122b 100644
--- a/src/converter.h
+++ b/src/converter.h
@@ -19,7 +19,11 @@
 #include <string>
 
 
+namespace lyx {
+
+
 class Buffer;
+class ErrorList;
 class Format;
 class Formats;
 class OutputParams;
@@ -97,21 +101,27 @@ 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);
 	///
 	OutputParams::FLAVOR getFlavor(Graph::EdgePath const & path);
+	/// Flags for converting files
+	enum ConversionFlags {
+		/// No special flags
+		none = 0,
+		/// Use the default converter if no converter is defined
+		try_default = 1 << 0,
+		/// Get the converted file from cache if possible
+		try_cache = 1 << 1
+	};
 	///
 	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);
-	///
-	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_file, std::string const & to_file,
+	             std::string const & orig_from,
+	             std::string const & from_format, std::string const & to_format,
+	             ErrorList & errorList, int conversionflags = none);
 	///
 	void update(Formats const & formats);
 	///
@@ -133,16 +143,19 @@ private:
 	intToFormat(std::vector<int> const & input);
 	///
 	bool scanLog(Buffer const & buffer, std::string const & command,
-		     std::string const & filename);
+		     std::string const & filename, ErrorList & errorList);
 	///
 	bool runLaTeX(Buffer const & buffer, std::string const & command,
-		      OutputParams const &);
+		      OutputParams const &, ErrorList & errorList);
 	///
 	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_;
 };
@@ -151,4 +164,7 @@ extern Converters converters;
 
 extern Converters system_converters;
 
+
+} // namespace lyx
+
 #endif //CONVERTER_H