Fix reading of math macros

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

diff --git a/src/mathed/math_symbolinset.h b/src/mathed/math_symbolinset.h
index e16cf8930cb9e7db632d78cade77ce5290347f9c..8f59fbcfe2f66b3194c445f21a251aa07a2dab08 100644 (file)
--- a/src/mathed/math_symbolinset.h
+++ b/src/mathed/math_symbolinset.h
@@ -2,6 +2,10 @@
 #ifndef MATH_SYMBOLINSET_H
 #define MATH_SYMBOLINSET_H
 
+#ifdef __GNUG__
+#pragma interface
+#endif
+
 #include "math_diminset.h"
 
 struct latexkeys;
@@ -20,9 +24,9 @@ public:
        ///
        MathInset * clone() const;
        ///
-       void metrics(MathMetricsInfo const & st) const;
+       void metrics(MathMetricsInfo & st) const;
        ///
-       void draw(Painter &, int x, int y) const;
+       void draw(MathPainterInfo &, int x, int y) const;
        ///
        bool isRelOp() const;
        /// do we take scripts?
@@ -34,7 +38,7 @@ public:
        /// the LaTeX name of the symbol (without the backslash)
        string name() const;
        ///
-       bool match(MathInset *) const;
+       bool match(MathAtom const &) const;
        /// request "external features"
        void validate(LaTeXFeatures & features) const;
 
@@ -43,6 +47,10 @@ public:
        ///
        void maplize(MapleStream &) const;
        ///
+       void maximize(MaximaStream &) const;
+       ///
+       void mathematicize(MathematicaStream &) const;
+       ///
        void mathmlize(MathMLStream &) const;
        ///
        void octavize(OctaveStream &) const;
@@ -52,16 +60,11 @@ public:
        void infoize(std::ostream & os) const;
 
 private:
-       ///
-       MathTextCodes code() const;
-       ///
-       MathTextCodes code2() const;
-
        ///
        latexkeys const * sym_;
        ///
        mutable int h_;
        ///
-       mutable MathMetricsInfo mi_;
+       mutable bool scriptable_;
 };
 #endif