fix #1073

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

diff --git a/src/mathed/math_symbolinset.h b/src/mathed/math_symbolinset.h
index 823fdf65718c15e142627d24b21e052a43d41292..a26f54d03074d6791f635d264b9decc7ea44e3b6 100644 (file)
--- a/src/mathed/math_symbolinset.h
+++ b/src/mathed/math_symbolinset.h
@@ -2,33 +2,66 @@
 #ifndef MATH_SYMBOLINSET_H
 #define MATH_SYMBOLINSET_H
 
-#include "math_inset.h"
+
+#include "math_diminset.h"
 
 struct latexkeys;
 
-/// big operators
-class MathSymbolInset : public MathInset {
+// "normal" symbols that don't take limits and don't grow in displayed
+// formulae
+
+class MathSymbolInset : public MathDimInset {
 public:
        ///
        explicit MathSymbolInset(latexkeys const *);
        ///
+       explicit MathSymbolInset(char const *);
+       ///
+       explicit MathSymbolInset(string const &);
+       ///
        MathInset * clone() const;
        ///
-       void write(std::ostream &, bool fragile) const;
+       void metrics(MetricsInfo & st) const;
        ///
-       void writeNormal(std::ostream &) const;
+       void draw(PainterInfo &, int x, int y) const;
+       ///
+       bool isRelOp() const;
+       /// do we take scripts?
+       bool isScriptable() const;
+       /// do we take \limits or \nolimits?
+       bool takesLimits() const;
+       /// identifies SymbolInset as such
+       MathSymbolInset const * asSymbolInset() const { return this; }
+       /// the LaTeX name of the symbol (without the backslash)
+       string name() const;
+       ///
+       bool match(MathAtom const &) const;
+       /// request "external features"
+       void validate(LaTeXFeatures & features) const;
+
        ///
-       void metrics(MathStyles st);
+       void normalize(NormalStream &) const;
        ///
-       void draw(Painter &, int, int);
+       void maple(MapleStream &) const;
        ///
-       bool isScriptable() const { return true; }
+       void maxima(MaximaStream &) const;
+       ///
+       void mathematica(MathematicaStream &) const;
+       ///
+       void mathmlize(MathMLStream &) const;
+       ///
+       void octave(OctaveStream &) const;
+       ///
+       void write(WriteStream & os) const;
+       ///
+       void infoize2(std::ostream & os) const;
+
 private:
        ///
        latexkeys const * sym_;
        ///
-       string ssym_;
+       mutable int h_;
        ///
-       MathTextCodes code_;
+       mutable bool scriptable_;
 };
 #endif