rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/math_macroarg.h b/src/mathed/math_macroarg.h
index f001f21b3b9d20563c674085e4717140cdac8ce4..26f76ed033929e88efdbb545698ddaec863c642d 100644 (file)
--- a/src/mathed/math_macroarg.h
+++ b/src/mathed/math_macroarg.h
@@ -4,12 +4,11 @@
 
 #include "math_nestinset.h"
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 /** A macro argument
-    \author Alejandro Aguilar Sierra
+ *  \author Alejandro Aguilar Sierra
+ *
+ * Full author contact details are available in file CREDITS
 */
 class MathMacroArgument : public MathNestInset {
 public:
@@ -18,17 +17,18 @@ public:
        ///
        MathInset * clone() const;
        ///
-       void metrics(MathMetricsInfo const & st) const;
-       ///
-       void draw(Painter &, int x, int y) const;
+       bool isActive() const { return false; }
        ///
-       void write(MathWriteInfo & os) const;
+       void metrics(MathMetricsInfo & st) const;
        ///
-       void writeNormal(NormalStream &) const;
+       void draw(MathPainterInfo &, int x, int y) const;
        ///
        void substitute(MathMacro const & macro);
+
        ///
-       bool isActive() const { return false; }
+       void normalize(NormalStream &) const;
+       ///
+       void write(WriteStream & os) const;
 
 private:
        /// A number between 1 and 9
@@ -37,8 +37,6 @@ private:
        char str_[3];
        ///
        bool expanded_;
-       ///
-       mutable MathMetricsInfo mi_;
 };
 
 #endif