* In the process of fixing the math background color bug, this commit transfer backgr...

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

diff --git a/src/insets/ExternalTemplate.h b/src/insets/ExternalTemplate.h
index 91f06a8e1966abb5afd04749a9ea93fc8c8fdc0f..314ca06e6e94dbcd69fc70b518a5c84f1400ebb4 100644 (file)
--- a/src/insets/ExternalTemplate.h
+++ b/src/insets/ExternalTemplate.h
@@ -17,12 +17,16 @@
 
 #include <boost/utility.hpp>
 
+namespace lyx {
+
+namespace support { class FileName; }
+
 class LyXLex;
 
-namespace lyx {
 namespace external {
 
-struct Template {
+class Template {
+public:
        /// We have to have default commands for safety reasons!
        Template();
        ///
@@ -30,7 +34,8 @@ struct Template {
        ///
        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;
@@ -55,7 +60,8 @@ struct Template {
        std::vector<TransformID> transformIds;
 
        /// This is the information needed to support a specific output format
-       struct Format {
+       class Format {
+       public:
                Format();
                ///
                void readFormat(LyXLex &);
@@ -67,7 +73,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 +84,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 +119,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;