X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fformat.h;h=07feb88d6c19ab48921c9347c5930c01090babcd;hb=5e3b997b852fc96eef2387934b600262d3037745;hp=c4ca8f4095cadee0bfeb191bc9fdb0aa22458d1a;hpb=0be0fcfd5907d448cd51addf83ed7032719a0692;p=lyx.git

diff --git a/src/format.h b/src/format.h
index c4ca8f4095..07feb88d6c 100644
--- a/src/format.h
+++ b/src/format.h
@@ -12,58 +12,62 @@
 #ifndef FORMAT_H
 #define FORMAT_H
 
-
-#include "LString.h"
-
 #include <vector>
+#include <string>
 
 class Buffer;
 
 class Format {
 public:
 	///
-	Format(string const & n, string const & e, string const & p,
-	       string const & s, string const & v);
+	Format(std::string const & n, std::string const & e, std::string const & p,
+	       std::string const & s, std::string const & v, std::string const & ed);
 	///
 	bool dummy() const;
 	///
 	bool isChildFormat() const;
 	///
-	string const parentFormat() const;
+	std::string const parentFormat() const;
 	///
-	string const & name() const {
+	std::string const & name() const {
 		return name_;
 	}
 	///
-	string const & extension() const {
+	std::string const & extension() const {
 		return extension_;
 	}
 	///
-	string const & prettyname() const {
+	std::string const & prettyname() const {
 		return prettyname_;
 	}
 	///
-	string const & shortcut() const {
+	std::string const & shortcut() const {
 		return shortcut_;
 	}
 	///
-	string const & viewer() const {
+	std::string const & viewer() const {
 		return viewer_;
 	}
 	///
-	void setViewer(string const & v) {
+	void setViewer(std::string const & v) {
 		viewer_ = v;
 	}
+	///
+	std::string const & editor() const {
+		return editor_;
+	}
 private:
-	string name_;
+	std::string name_;
 	///
-	string extension_;
+	std::string extension_;
 	///
-	string prettyname_;
+	std::string prettyname_;
 	///
-	string shortcut_;
+	std::string shortcut_;
 	///
-	string viewer_;
+	std::string viewer_;
+	///
+	std::string editor_;
 };
 
 
@@ -80,28 +84,39 @@ public:
 	Format const & get(FormatList::size_type i) const {
 		return formatlist[i];
 	}
+	/// \returns format named \p name if it exists, otherwise 0
+	Format const * getFormat(std::string const & name) const;
+	/*!
+	 * Get the format of \p filename from file contents or, if this
+	 * fails, from file extension.
+	 * \returns file format if it could be found, otherwise an empty
+	 * string.
+	 */
+	std::string getFormatFromFile(std::string const & filename) const;
 	///
-	Format const * getFormat(string const & name) const;
-	///
-	int getNumber(string const & name) const;
+	int getNumber(std::string const & name) const;
 	///
-	void add(string const & name);
+	void add(std::string const & name);
 	///
-	void add(string const & name, string const & extension,
-		 string const & prettyname, string const & shortcut);
+	void add(std::string const & name, std::string const & extension,
+		 std::string const & prettyname, std::string const & shortcut,
+		 std::string const & viewer, std::string const & editor);
 	///
-	void erase(string const & name);
+	void erase(std::string const & name);
 	///
 	void sort();
 	///
-	void setViewer(string const & name, string const & command);
+	void setViewer(std::string const & name, std::string const & command);
+	///
+	bool view(Buffer const & buffer, std::string const & filename,
+		  std::string const & format_name) const;
 	///
-	bool view(Buffer const * buffer, string const & filename,
-		  string const & format_name) const;
+	bool edit(Buffer const & buffer, std::string const & filename,
+		  std::string const & format_name) const;
 	///
-	string const prettyName(string const & name) const;
+	std::string const prettyName(std::string const & name) const;
 	///
-	string const extension(string const & name) const;
+	std::string const extension(std::string const & name) const;
 	///
 	const_iterator begin() const {
 		return formatlist.begin();