X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fmath_symbolinset.h;h=ebda7fc20f2d4e9ab8d67aeb4c04f60cbdce1fd8;hb=57501b93064a6deed43e415beed45606054d86ad;hp=bb653b220f08bc581f215eb29e7fa99f520b4d0a;hpb=a86ed9bea2ec94892d65e2925b4570a2fe7a60bb;p=lyx.git

diff --git a/src/mathed/math_symbolinset.h b/src/mathed/math_symbolinset.h
index bb653b220f..ebda7fc20f 100644
--- a/src/mathed/math_symbolinset.h
+++ b/src/mathed/math_symbolinset.h
@@ -1,28 +1,42 @@
 // -*- C++ -*-
+/**
+ * \file math_symbolinset.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
 #ifndef MATH_SYMBOLINSET_H
 #define MATH_SYMBOLINSET_H
 
-#include "math_diminset.h"
+#include "math_inset.h"
 
 struct latexkeys;
 
-// "normal" symbols that don't take limits and don't grow in displayed
-// formulae
 
-class MathSymbolInset : public MathDimInset {
+/** "normal" symbols that don't take limits and don't grow in displayed
+ *  formulae.
+ */
+class MathSymbolInset : public MathInset {
 public:
 	///
-	explicit MathSymbolInset(latexkeys const *);
+	explicit MathSymbolInset(latexkeys const * l);
+	///
+	explicit MathSymbolInset(char const * name);
 	///
-	explicit MathSymbolInset(char const *);
+	explicit MathSymbolInset(std::string const & name);
 	///
-	explicit MathSymbolInset(string const &);
+	virtual std::auto_ptr<InsetBase> clone() const;
 	///
-	MathInset * clone() const;
+	void metrics(MetricsInfo & mi, Dimension & dim) const;
 	///
-	void metrics(MathMetricsInfo const & st) const;
+	void draw(PainterInfo &, int x, int y) const;
 	///
-	void draw(Painter &, int x, int y) const;
+	int width() const { return width_; }
+
 	///
 	bool isRelOp() const;
 	/// do we take scripts?
@@ -32,34 +46,35 @@ public:
 	/// identifies SymbolInset as such
 	MathSymbolInset const * asSymbolInset() const { return this; }
 	/// the LaTeX name of the symbol (without the backslash)
-	string name() const;
-	///
-	bool match(MathInset *) const;
+	std::string name() 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_;
+	/// cached width
+	mutable int width_;
 	///
-	mutable MathMetricsInfo mi_;
+	mutable bool scriptable_;
 };
 #endif