Merge branch 'master' of git.lyx.org:lyx

[lyx.git] / src / insets / ExternalTemplate.h

diff --git a/src/insets/ExternalTemplate.h b/src/insets/ExternalTemplate.h
index 91f06a8e1966abb5afd04749a9ea93fc8c8fdc0f..4392870057d3969c20d8729edf336b205575d312 100644 (file)
--- a/src/insets/ExternalTemplate.h
+++ b/src/insets/ExternalTemplate.h
@@ -15,22 +15,35 @@
 
 #include "ExternalTransforms.h"
 
-#include <boost/utility.hpp>
+#include <boost/noncopyable.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;
@@ -51,14 +64,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 +83,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 +94,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;
        };
@@ -113,7 +129,7 @@ public:
        std::string const getPreambleDefByName(std::string const & name) const;
 private:
        TemplateManager();
-       void readTemplates(std::string const & path);
+       void readTemplates(support::FileName const & path);
        void dumpTemplates(std::ostream &) const;
        void dumpPreambleDefs(std::ostream &) const;