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 f32f30896bf082cb2030267c84e7c36a30db2291..f92d484a1be6ef1e97bfd30903532167e0e4183f 100644 (file)
--- a/src/mathed/math_macro.h
+++ b/src/mathed/math_macro.h
@@ -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"
 
@@ -42,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;
 
@@ -65,11 +62,15 @@ public:
        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:
        ///
@@ -88,7 +89,7 @@ private:
        ///
        mutable MathArray expanded_;
        ///
-       mutable MathMetricsInfo mi_;
+       mutable MetricsInfo mi_;
        ///
        mutable LyXFont font_;
 };