Jean-Marc's fix for wrong descent

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

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index 17aeb7cbf999afa6bdc1782c9e29b3ce485dd881..ac9f3c497c6d1aa1675d112c7041a4f9db481cdd 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -1,5 +1,5 @@
 // -*- C++ -*-
-/*
+/**
  *  File:        math_macro.h
  *  Purpose:     Declaration of macro class for mathed
  *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
@@ -17,9 +17,6 @@
 #ifndef MATH_MACRO_H
 #define MATH_MACRO_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include "math_nestinset.h"
 #include "math_metricsinfo.h"
@@ -30,7 +27,9 @@ class MathMacroTemplate;
 
 
 /** This class contains the data for a macro
-    \author Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
+ *  \author Alejandro Aguilar Sierra
+ *
+ * Full author contact details are available in file CREDITS
     \version November 1996
  */
 class MathMacro : public MathNestInset {
@@ -40,9 +39,9 @@ public:
        ///
        MathMacro(MathMacro const &);
        ///
-       void draw(MathPainterInfo &, int x, int y) const;
+       void draw(MathPainterInfo & pi, int x, int y) const;
        ///
-       void metrics(MathMetricsInfo & st) const;
+       void metrics(MathMetricsInfo & mi) const;
        ///
        MathInset * clone() const;
        ///
@@ -60,18 +59,18 @@ public:
        ///
        bool isMacro() const { return true; }
        ///
-       bool match(MathInset *) const { return false; }
+       bool match(MathAtom const &) const { return false; }
 
        ///
-       void normalize(NormalStream &) const;
-       ///
-       void maplize(MapleStream &) const;
+       void maple(MapleStream &) const;
        ///
        void mathmlize(MathMLStream &) const;
        ///
-       void octavize(OctaveStream &) const;
+       void octave(OctaveStream &) const;
+       ///
+       void infoize(std::ostream &) const;
        ///
-       void write(WriteStream & os) const;
+       void infoize2(std::ostream &) const;
 
 private:
        ///
@@ -88,7 +87,7 @@ private:
        ///
        MathAtom & tmplate_;
        ///
-       mutable MathXArray expanded_;
+       mutable MathArray expanded_;
        ///
        mutable MathMetricsInfo mi_;
        ///