enable direct input of #1...#9; some whitespace changes

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

diff --git a/src/mathed/math_funcinset.h b/src/mathed/math_funcinset.h
index e054574781917ff5f83986812baa56d4567d68e1..98786403d30e4c979a8824f054d571c08bccd68a 100644 (file)
--- a/src/mathed/math_funcinset.h
+++ b/src/mathed/math_funcinset.h
@@ -2,7 +2,7 @@
 #ifndef MATH_FUNCINSET_H
 #define MATH_FUNCINSET_H
 
-#include "math_inset.h"
+#include "math_diminset.h"
 #include "math_defs.h"
 
 #ifdef __GNUG__
@@ -12,22 +12,39 @@
 /**
  Functions or LaTeX names for objects that I don't know how to draw.
  */
-class MathFuncInset : public MathInset {
+class MathFuncInset : public MathDimInset {
 public:
        ///
-       explicit MathFuncInset(string const & nm, MathInsetTypes ot = LM_OT_FUNC);
+       explicit MathFuncInset(string const & nm);
        ///
-       virtual MathInset * clone() const;
+       MathInset * clone() const;
        ///
-       void draw(Painter &, int, int);
+       void metrics(MathMetricsInfo const & st) const;
        ///
-       void write(std::ostream &, bool fragile) const;
+       void draw(Painter &, int x, int y) const;
        ///
-       void writeNormal(std::ostream &) const;
+       string const & name() const;
+       /// identifies FuncInsets
+       MathFuncInset * asFuncInset() { return this; }
        ///
-       void metrics(MathStyles st);
+       void setName(string const &);
+       ///
+       bool match(MathInset * p) const;
+
+       ///
+       void normalize(NormalStream &) const;
+       ///
+       void maplize(MapleStream &) const;
+       ///
+       void mathmlize(MathMLStream &) const;
+       ///
+       void octavize(OctaveStream &) const;
+       ///
+       void write(WriteStream &) const;
 private:
        ///
-       bool lims_;
+       string name_;
+       ///
+       mutable MathMetricsInfo mi_;
 };
 #endif