Revert "XHTML: remove DOCTYPE, as the document is then understood as HTML4/XHTML1...

[lyx.git] / src / mathed / MacroTable.h

diff --git a/src/mathed/MacroTable.h b/src/mathed/MacroTable.h
index bc445d43974fef7f7314160a5a8f1f43ad2d4dd3..acc4004109d8e4e9e85398554977b48bd0915e4e 100644 (file)
--- a/src/mathed/MacroTable.h
+++ b/src/mathed/MacroTable.h
@@ -25,7 +25,7 @@ namespace lyx {
 
 class Buffer;
 class MathData;
-class MathMacroTemplate;
+class InsetMathMacroTemplate;
 class Paragraph;
 class latexkeys;
 
@@ -39,11 +39,11 @@ enum MacroType {
 class MacroData {
 public:
        /// Constructor to make STL containers happy
-       MacroData(Buffer * buf = 0);
+       explicit MacroData(Buffer * buf = 0);
        /// Create lazy MacroData which only queries the macro template when needed
        MacroData(Buffer * buf, DocIterator const & pos);
        /// Create non-lazy MacroData which directly queries the macro template
-       MacroData(Buffer * buf, MathMacroTemplate const & macro);
+       MacroData(Buffer * buf, InsetMathMacroTemplate const & macro);
 
        ///
        docstring const & definition() const { updateData(); return definition_; }
@@ -60,10 +60,12 @@ public:
        ///
        std::vector<docstring> const & defaults() const;
        ///
-       std::string const requires() const;
+       std::string const required() const;
        ///
        bool hidden() const;
        ///
+       docstring const htmlname() const;
+       ///
        docstring const xmlname() const;
        ///
        char const * MathMLtype() const;
@@ -106,7 +108,7 @@ public:
 
 private:
        ///
-       void queryData(MathMacroTemplate const & macro) const;
+       void queryData(InsetMathMacroTemplate const & macro) const;
        ///
        void updateData() const;
        ///