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

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

diff --git a/src/mathed/formula.h b/src/mathed/formula.h
index bceefc0f334ea8b67298a3b2e9385015724b019d..dd2ec650ca9681c51f167c00d8175b281d59fb5d 100644 (file)
--- a/src/mathed/formula.h
+++ b/src/mathed/formula.h
@@ -21,10 +21,11 @@
 #pragma interface
 #endif
 
-#include "mathed/formulabase.h"
+#include "formulabase.h"
 #include "math_defs.h"
+#include "math_atom.h"
 
-class MathMatrixInset;
+class MathHullInset;
 
 ///
 class InsetFormula : public InsetFormulaBase {
@@ -32,16 +33,10 @@ public:
        ///
        InsetFormula();
        ///
-       InsetFormula(InsetFormula const &);
-       ///
        explicit InsetFormula(MathInsetTypes);
        ///
        explicit InsetFormula(string const &);
        ///
-       ~InsetFormula();
-       ///
-       void operator=(InsetFormula const &);
-       ///
        int ascent(BufferView *, LyXFont const &) const;
        ///
        int descent(BufferView *, LyXFont const &) const;
@@ -49,8 +44,6 @@ public:
        int width(BufferView *, LyXFont const &) const;
        ///
        void draw(BufferView *, LyXFont const &, int, float &, bool) const;
-       ///
-       void metrics() const;
 
        ///
        void write(Buffer const *, std::ostream &) const;
@@ -78,19 +71,25 @@ public:
        ///
        std::vector<string> const getLabelList() const;
        ///
-       void handleExtern(string const & arg, BufferView * bv);
+       MathInsetTypes getType() const;
        ///
-       MathInset const * par() const;
+       MathAtom const & par() const { return par_; }
        ///
+       MathAtom & par() { return par_; }
+
+private:
+       /// Is this a displayed environment?
        bool display() const;
-       ///
+       /// available in AMS only?
        bool ams() const;
+       /// access to hull
+       MathHullInset * hull();
+       /// access to hull
+       MathHullInset const * hull() const;
        ///
-       MathInsetTypes getType() const;
-private:
-       /// Safe setting of contents
-       void par(MathMatrixInset *);
+       void handleExtern(string const & arg);
+
        ///
-       MathMatrixInset * par_;
+       MathAtom par_;
 };
 #endif