X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FExternalTemplate.h;h=e5b6755059700b009b756ea12edea6b70cc19a47;hb=9762ba5d388e8a81a6e58c464b635ca4cf48cbfa;hp=91f06a8e1966abb5afd04749a9ea93fc8c8fdc0f;hpb=fa29d7ee984e9240554f093862fe53239f776582;p=lyx.git

diff --git a/src/insets/ExternalTemplate.h b/src/insets/ExternalTemplate.h
index 91f06a8e19..e5b6755059 100644
--- a/src/insets/ExternalTemplate.h
+++ b/src/insets/ExternalTemplate.h
@@ -15,22 +15,33 @@
 
 #include "ExternalTransforms.h"
 
-#include <boost/utility.hpp>
-
-class LyXLex;
+#include <vector>
 
 namespace lyx {
+
+namespace support { class FileName; }
+
+class Lexer;
+
+enum PreviewMode {
+	PREVIEW_OFF = 0,
+	PREVIEW_GRAPHICS,
+	PREVIEW_INSTANT
+};
+
 namespace external {
 
-struct Template {
+class Template {
+public:
 	/// We have to have default commands for safety reasons!
 	Template();
 	///
-	void readTemplate(LyXLex &);
+	void readTemplate(Lexer &);
 	///
 	void dumpFormats(std::ostream &) const;
 
-	struct Option {
+	class Option {
+	public:
 		Option(std::string const & name_, std::string const & opt_)
 			: name(name_), option(opt_) {}
 		std::string name;
@@ -42,7 +53,7 @@ struct Template {
 	/// What will the button in the GUI say?
 	std::string guiName;
 	/// A short help text
-	std::string helpText;
+	docstring helpText;
 	/** The format of the input file. Can be "*", in which case we try and
 	 *   ascertain the format from the contents of the file.
 	 */
@@ -51,14 +62,17 @@ struct Template {
 	std::string fileRegExp;
 	/// Should we do automatic production of the output?
 	bool automaticProduction;
+	/// How should we preview the data in LyX?
+	PreviewMode preview_mode;
 	/// A collection of transforms that we can use to transform the data.
 	std::vector<TransformID> transformIds;
 
 	/// This is the information needed to support a specific output format
-	struct Format {
+	class Format {
+	public:
 		Format();
 		///
-		void readFormat(LyXLex &);
+		void readFormat(Lexer &);
 
 		/// The text that should be inserted into the exported file
 		std::string product;
@@ -67,7 +81,7 @@ struct Template {
 		/// The format of this file.
 		std::string updateFormat;
 		/// What features does this external inset require?
-		std::string requirement;
+		std::vector<std::string> requirements;
 		/// A collection of preamble snippets identified by name.
 		std::vector<std::string> preambleNames;
 		/// A list of options to the basic command.
@@ -78,7 +92,7 @@ struct Template {
 		std::map<TransformID, TransformStore> option_transformers;
 
 		typedef std::map<std::string,
-		                 std::vector<std::string> > FileMap;
+				 std::vector<std::string> > FileMap;
 		/// Referenced files for some formats
 		FileMap referencedFiles;
 	};
@@ -91,14 +105,14 @@ struct Template {
 /**
  *  A singleton class that manages the external inset templates
  */
-class TemplateManager : boost::noncopyable {
+class TemplateManager {
 public:
 	/// Map from the LyX name of the template to the template structure
 	typedef std::map<std::string, Template> Templates;
 	/** Map from the LyX name of the preamble definition to the preamble
 	 *  definition itself.
 	 */
-	typedef std::map<std::string, std::string> PreambleDefs;
+	typedef std::map<std::string, docstring> PreambleDefs;
 
 	static TemplateManager & get();
 
@@ -110,10 +124,14 @@ public:
 	/** return the preamble definition by LyX name.
 	 *  If it isn't found, return an empty std::string.
 	 */
-	std::string const getPreambleDefByName(std::string const & name) const;
+	docstring getPreambleDefByName(std::string const & name) const;
+	/// noncopyable
+	TemplateManager(TemplateManager const &) = delete;
+	void operator=(TemplateManager const &) = delete;
 private:
 	TemplateManager();
-	void readTemplates(std::string const & path);
+
+	void readTemplates(support::FileName const & path);
 	void dumpTemplates(std::ostream &) const;
 	void dumpPreambleDefs(std::ostream &) const;