architectural changes to tex2lyx

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

diff --git a/src/mathed/math_macro.h b/src/mathed/math_macro.h
index 9a944f5fc524cbd824473e6bc7412d0bf594958a..f92d484a1be6ef1e97bfd30903532167e0e4183f 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,12 +17,9 @@
 #ifndef MATH_MACRO_H
 #define MATH_MACRO_H
 
-#ifdef __GNUG__
-#pragma interface
-#endif
 
 #include "math_nestinset.h"
-#include "math_metricsinfo.h"
+#include "metricsinfo.h"
 #include "math_macroarg.h"
 #include "LString.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,11 +39,11 @@ public:
        ///
        MathMacro(MathMacro const &);
        ///
-       void draw(MathPainterInfo & pi, int x, int y) const;
+       void draw(PainterInfo & pi, int x, int y) const;
        ///
-       void metrics(MathMetricsInfo & mi) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       MathInset * clone() const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
        void dump() const;
 
@@ -60,14 +59,18 @@ public:
        ///
        bool isMacro() const { return true; }
        ///
-       bool match(MathInset *) const { return false; }
+       bool match(MathAtom const &) const { return false; }
 
        ///
-       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 infoize2(std::ostream &) const;
 
 private:
        ///
@@ -86,7 +89,7 @@ private:
        ///
        mutable MathArray expanded_;
        ///
-       mutable MathMetricsInfo mi_;
+       mutable MetricsInfo mi_;
        ///
        mutable LyXFont font_;
 };