X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.h;h=c4c2a5ea315ef323bef41a5a9534062e61b75e9e;hb=410c716bf703dae98c2064d555b9e2b7678555ee;hp=e9ac7a47a9f94a63018af35d61ff5771d6c6e076;hpb=b31f0cfc4dc481e15df07d7ab12249c539333910;p=lyx.git

diff --git a/src/Format.h b/src/Format.h
index e9ac7a47a9..c4c2a5ea31 100644
--- a/src/Format.h
+++ b/src/Format.h
@@ -43,7 +43,7 @@ public:
 	///
 	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,
-	       int);
+	       std::string const & m, int);
 	///
 	bool dummy() const;
 	/// Is \p ext a valid filename extension for this format?
@@ -83,6 +83,10 @@ public:
 	///
 	void setEditor(std::string const & v) { editor_ = v; }
 	///
+	std::string const & mime() const { return mime_; }
+	///
+	void setMime(std::string const & m) { mime_ = m; }
+	///
 	bool documentFormat() const { return flags_ & document; }
 	///
 	bool vectorFormat() const { return flags_ & vector; }
@@ -92,6 +96,9 @@ public:
 	bool inExportMenu() const { return flags_ & export_menu; }
 	///
 	bool zippedNative() const { return flags_ & zipped_native; }
+	///
+	static bool formatSorter(Format const * lhs, Format const * rhs);
+
 private:
 	/// Internal name. Needs to be unique.
 	std::string name_;
@@ -111,6 +118,14 @@ private:
 	std::string viewer_;
 	/// Editor for this format. \sa viewer_.
 	std::string editor_;
+	/*!
+	 * Full MIME type, e.g. "text/x-tex".
+	 * Only types listed by the shared MIME database of freedesktop.org
+	 * should be added.
+	 * This field may be empty, but it must be unique across all formats
+	 * if it is set.
+	 */
+	std::string mime_;
 	///
 	int flags_;
 };
@@ -141,11 +156,17 @@ public:
 	std::string getFormatFromFile(support::FileName const & filename) const;
 	/// Finds a format from a file extension. Returns string() if not found.
 	std::string getFormatFromExtension(std::string const & ext) const;
+	/// Finds a format by pretty name. Returns string() if not found.
+	std::string getFormatFromPrettyName(std::string const & prettyname) const;
 	/** Returns true if the file referenced by \p filename is zipped and
 	 ** needs to be unzipped for being handled
 	 ** @note For natively zipped formats, such as dia/odg, this returns false.
 	 **/
 	bool isZippedFile(support::FileName const & filename) const;
+	/// check for zipped file format
+	static bool isZippedFileFormat(std::string const & format);
+	/// check for PostScript file format
+	static bool isPostScriptFileFormat(std::string const & format);
 	/// Set editor and/or viewer to "auto" for formats that can be
 	/// opened by the OS.
 	void setAutoOpen();
@@ -157,7 +178,7 @@ public:
 	void add(std::string const & name, std::string const & extensions,
 		 std::string const & prettyname, std::string const & shortcut,
 		 std::string const & viewer, std::string const & editor,
-		 int flags);
+		 std::string const & mime, int flags);
 	///
 	void erase(std::string const & name);
 	///
@@ -183,6 +204,8 @@ public:
 	///
 	const_iterator end() const { return formatlist.end(); }
 	///
+	bool empty() const { return formatlist.empty(); }
+	///
 	FormatList::size_type size() const { return formatlist.size(); }
 private:
 	///