X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_symbolinset.h;h=7aa6ac1a13582c71f8cc195d1a52d697f63d5d9b;hb=c9e78a825bd659ddb7b4b55a6adfa7f0a1a98dd6;hp=e16cf8930cb9e7db632d78cade77ce5290347f9c;hpb=c446acbd866d608963435f0b5d82506bc476f212;p=lyx.git

diff --git a/src/mathed/math_symbolinset.h b/src/mathed/math_symbolinset.h
index e16cf8930c..7aa6ac1a13 100644
--- 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,34 +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;
 	///
-	void infoize(std::ostream & os) const;
+	void infoize2(std::ostream & os) const;
 
 private:
-	///
-	MathTextCodes code() const;
-	///
-	MathTextCodes code2() const;
-
 	///
 	latexkeys const * sym_;
 	///
 	mutable int h_;
 	///
-	mutable MathMetricsInfo mi_;
+	mutable bool scriptable_;
 };
 #endif