enable direct input of #1...#9; some whitespace changes

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

diff --git a/src/mathed/math_macrotemplate.h b/src/mathed/math_macrotemplate.h
index c1cc9eb94c2da964762055ae13d8a7773ff11b1d..bab64d1500d92590de82ab93ad511a3c85ad8b5e 100644 (file)
--- a/src/mathed/math_macrotemplate.h
+++ b/src/mathed/math_macrotemplate.h
@@ -2,7 +2,8 @@
 #ifndef MATH_MACROTEMPLATE_H
 #define MATH_MACROTEMPLATE_H
 
-#include "math_inset.h"
+#include "math_nestinset.h"
+#include "LString.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -15,7 +16,7 @@ class MathMacro;
  */
 //class MathMacroTemplate : public MathInset, boost::noncopyable 
 
-class MathMacroTemplate : public MathInset {
+class MathMacroTemplate : public MathNestInset {
 public:
        ///
        MathMacroTemplate();
@@ -24,20 +25,24 @@ public:
        ///
        MathInset * clone() const;
        ///
-       void Write(std::ostream &, bool fragile) const;
+       void write(WriteStream & os) const;
        /// Number of arguments
        int numargs() const;
        ///
        void numargs(int);
        ///
-       void draw(Painter &, int, int);
+       string const & name() const;
        ///
-       void Metrics(MathStyles st);
+       void draw(Painter &, int x, int y) const;
+       ///
+       void metrics(MathMetricsInfo const & st) const;
+       /// identifies macro templates
+       MathMacroTemplate * asMacroTemplate() { return this; }
 private:
        ///
        int numargs_;
-       /// unimplemented
-       void operator=(MathMacroTemplate const &);
+       ///
+       string name_;
 };
 
 #endif