make naming a bit saner...

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

diff --git a/src/mathed/math_symbolinset.h b/src/mathed/math_symbolinset.h
index 0de6781ed307709d5d4c8a8af5e1312ae32b2aae..7aa6ac1a13582c71f8cc195d1a52d697f63d5d9b 100644 (file)
--- a/src/mathed/math_symbolinset.h
+++ b/src/mathed/math_symbolinset.h
@@ -2,6 +2,7 @@
 #ifndef MATH_SYMBOLINSET_H
 #define MATH_SYMBOLINSET_H
 
+
 #include "math_diminset.h"
 
 struct latexkeys;
@@ -20,9 +21,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,30 +35,33 @@ 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;
 
        ///
        void normalize(NormalStream &) const;
        ///
-       void maplize(MapleStream &) const;
+       void maple(MapleStream &) const;
+       ///
+       void maxima(MaximaStream &) const;
+       ///
+       void mathematica(MathematicaStream &) const;
        ///
        void mathmlize(MathMLStream &) const;
        ///
-       void octavize(OctaveStream &) const;
+       void octave(OctaveStream &) const;
        ///
        void write(WriteStream & os) const;
-
-private:
-       ///
-       MathTextCodes code() const;
        ///
-       MathTextCodes code2() const;
+       void infoize2(std::ostream & os) const;
 
+private:
        ///
        latexkeys const * sym_;
        ///
        mutable int h_;
        ///
-       mutable MathMetricsInfo mi_;
+       mutable bool scriptable_;
 };
 #endif