oh well

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

diff --git a/src/mathed/formula.h b/src/mathed/formula.h
index 8c54a429242343591650b84bca8d502742ba4135..cefe8a8ed8467c3e1c0131e94b9faaeeaed87232 100644 (file)
--- a/src/mathed/formula.h
+++ b/src/mathed/formula.h
@@ -2,9 +2,9 @@
 /*
  *  File:        formula.h
  *  Purpose:     Declaration of formula inset
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx> 
+ *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
  *  Created:     January 1996
- *  Description: Allows the edition of math paragraphs inside Lyx. 
+ *  Description: Allows the edition of math paragraphs inside Lyx.
  *
  *  Copyright: 1996, Alejandro Aguilar Sierra
  *
@@ -14,17 +14,18 @@
  *   the GNU General Public Licence version 2 or later.
  */
 
-#ifndef INSET_FORMULA_H 
+#ifndef INSET_FORMULA_H
 #define INSET_FORMULA_H
 
 #ifdef __GNUG__
 #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 {
@@ -34,6 +35,8 @@ public:
        ///
        explicit InsetFormula(MathInsetTypes);
        ///
+       explicit InsetFormula(string const &);
+       ///
        int ascent(BufferView *, LyXFont const &) const;
        ///
        int descent(BufferView *, LyXFont const &) const;
@@ -41,36 +44,52 @@ public:
        int width(BufferView *, LyXFont const &) const;
        ///
        void draw(BufferView *, LyXFont const &, int, float &, bool) const;
+
        ///
-       void Write(Buffer const *, std::ostream &) const;
+       void write(Buffer const *, std::ostream &) const;
        ///
-       void Read(Buffer const *, LyXLex & lex);
+       void read(Buffer const *, LyXLex & lex);
        ///
-       int Latex(Buffer const *, std::ostream &,
-                 bool fragile, bool free_spc) const;
+       int latex(Buffer const *, std::ostream &, bool fragile, bool free_spc) const;
        ///
-       int Ascii(Buffer const *, std::ostream &, int linelen) const;
+       int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int Linuxdoc(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const *, std::ostream &) const;
        ///
-       int DocBook(Buffer const *, std::ostream &) const;
+       int docbook(Buffer const *, std::ostream &) const;
+
        ///
-       Inset * Clone(Buffer const &) const;
+       Inset * clone(Buffer const &, bool same_id = false) const;
        ///
-       void Validate(LaTeXFeatures & features) const;
+       void validate(LaTeXFeatures & features) const;
        ///
-       Inset::Code LyxCode() const;
+       Inset::Code lyxCode() const;
        ///
-       virtual RESULT LocalDispatch(BufferView *, kb_action, string const &);
+       bool insetAllowed(Inset::Code code) const;
+       ///
+       virtual RESULT localDispatch(BufferView *, kb_action, string const &);
        ///
        std::vector<string> const getLabelList() const;
        ///
-       void HandleExtern(string const & arg, BufferView * bv);
+       MathInsetTypes getType() const;
        ///
-       MathMatrixInset * 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;
+       ///
+       void handleExtern(string const & arg);
+
+       ///
+       MathAtom par_;
 };
 #endif