X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FFormat.h;h=13bde5ff1f3ecdbb58a3b76b2f2bd6e6147ede8a;hb=9c375cb606d7950f8f6bd31e7a841399dc7bbfb2;hp=21721fa8e6c10cfcfb1a480b5aaf1c11bbfb06f6;hpb=b4f97b61cf0b257e31bcf512668ad458523d7f5a;p=lyx.git

diff --git a/src/Format.h b/src/Format.h
index 21721fa8e6..13bde5ff1f 100644
--- a/src/Format.h
+++ b/src/Format.h
@@ -13,12 +13,11 @@
 #define FORMAT_H
 
 #include "support/docstring.h"
+#include "support/trivstring.h"
 
 #include "OutputParams.h"
 
 #include <vector>
-#include <map>
-#include <ctime>
 
 namespace lyx {
 
@@ -45,7 +44,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?
@@ -56,35 +55,39 @@ public:
 	/// Name fo the parent format
 	std::string const parentFormat() const;
 	///
-	std::string const & name() const { return name_; }
+	std::string const name() const { return name_; }
 	///
 	void setName(std::string const & v) { name_ = v; }
 	///
-	std::string const & extension() const
+	std::string const extension() const
 	{
 		return extension_list_.empty() ? empty_string() : extension_list_[0];
 	}
 	///
-	std::string const & extensions() const { return extensions_; }
+	std::string const extensions() const;
 	///
 	void setExtensions(std::string const & v);
 	///
-	std::string const & prettyname() const { return prettyname_; }
+	std::string const prettyname() const { return prettyname_; }
 	///
 	void setPrettyname(std::string const & v) { prettyname_ = v; }
 	///
-	std::string const & shortcut() const { return shortcut_; }
+	std::string const shortcut() const { return shortcut_; }
 	///
 	void setShortcut(std::string const & v) { shortcut_ = v; }
 	///
-	std::string const & viewer() const { return viewer_; }
+	std::string const viewer() const { return viewer_; }
 	///
 	void setViewer(std::string const & v) { viewer_ = v; }
 	///
-	std::string const & editor() const { return editor_; }
+	std::string const editor() const { return editor_; }
 	///
 	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; }
@@ -94,17 +97,18 @@ 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_;
+	trivstring name_;
 	/// Filename extensions, the first one being the default
-	mutable std::vector<std::string> extension_list_;
-	/// All filename extensions
-	std::string extensions_;
+	std::vector<std::string> extension_list_;
 	/// Name presented to the user. Needs to be unique.
-	std::string prettyname_;
+	trivstring prettyname_;
 	/// Keyboard shortcut for the View and Export menu.
-	std::string shortcut_;
+	trivstring shortcut_;
 	/*!
 	 * Viewer for this format. Needs to be in the PATH or an absolute
 	 * filename.
@@ -112,9 +116,17 @@ private:
 	 * If it is \c auto the default viewer of the OS for this format is
 	 * used.
 	 */
-	std::string viewer_;
+	trivstring viewer_;
 	/// Editor for this format. \sa viewer_.
-	std::string editor_;
+	trivstring 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.
+	 */
+	trivstring mime_;
 	///
 	int flags_;
 };
@@ -150,6 +162,10 @@ public:
 	 ** @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();
@@ -161,7 +177,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);
 	///
@@ -187,18 +203,12 @@ public:
 	///
 	const_iterator end() const { return formatlist.end(); }
 	///
+	bool empty() const { return formatlist.empty(); }
+	///
 	FormatList::size_type size() const { return formatlist.size(); }
 private:
 	///
 	FormatList formatlist;
-	/// Used to store last timestamp of file and whether it is (was) zipped
-	struct ZippedInfo {
-		bool zipped; std::time_t timestamp;
-		ZippedInfo(bool zipped, std::time_t timestamp)
-		: zipped(zipped), timestamp(timestamp) { }
-	};
-	///
-	mutable std::map<std::string, ZippedInfo> zipped_;
 };
 
 ///