fix pullArg when pressing <Delete> at the end of an cell

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

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index 6daeb3d9ff5b6b4487629c2001923cb1201fc214..204ddaffe45738af5eefbf3c47fea846f47a77d3 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -17,66 +17,58 @@
 #ifndef INSET_FORMULA_MACRO_H 
 #define INSET_FORMULA_MACRO_H
 
+#include "formulabase.h"
+
 #ifdef __GNUG__
 #pragma interface
 #endif
 
-#include "formula.h"
-
 class MathMacroTemplate;
 
+// InsetFormulaMacro's ParInset is the ParInset of the macro definition
+// which in turn is stored in the global MathMacroTable.
+// No copying/updating needed anymore...
 
 ///
-class InsetFormulaMacro: public InsetFormula {
+class InsetFormulaMacro: public InsetFormulaBase {
 public:
        ///
-       InsetFormulaMacro();
+       explicit InsetFormulaMacro();
        ///
-       explicit
-       InsetFormulaMacro(string name, int na = 0, bool env = false);
+       explicit InsetFormulaMacro(string name, int na);
        ///
-       ~InsetFormulaMacro();
+       int ascent(BufferView *, LyXFont const &) const;
        ///
-       int ascent(Painter &, LyXFont const &) const;
+       int descent(BufferView *, LyXFont const &) const;
        ///
-       int descent(Painter &, LyXFont const &) const;
+       int width(BufferView *, LyXFont const &) const;
        ///
-       int width(Painter &, LyXFont const &) const;
+       void draw(BufferView *,LyXFont const &, int, float &, bool) const;
+
        ///
-       void draw(Painter &, LyXFont const &, int baseline, float & x) const;
+       void read(LyXLex & lex);
        ///
-       void Read(LyXLex & lex);
-        ///
-       void Write(std::ostream & os) const;
+       void write(std::ostream & os) const;
        ///
-       int Latex(std::ostream & os, bool fragile, bool free_spc) const;
+       int ascii(std::ostream &, int linelen) const;
        ///
-       int Linuxdoc(std::ostream &) const;
+       int latex(std::ostream & os, bool fragile, bool free_spc) const;
        ///
-       int DocBook(std::ostream &) const;
+       int linuxdoc(std::ostream & os) const;
        ///
-       Inset * Clone() const;
+       int docBook(std::ostream &) const;
 
-       /// what appears in the minibuffer when opening
-       char const * EditMessage() const;
-       ///
-       void Edit(BufferView *, int x, int y, unsigned int button);
        ///
-       void InsetUnlock(BufferView *);
+       Inset * clone(Buffer const &, bool same_id = false) const;
        ///
-       RESULT LocalDispatch(BufferView *, int, string const &);
-
-protected:
+       Inset::Code lyxCode() const;
        ///
-       //void UpdateLocal();
-
+       RESULT localDispatch(BufferView *, kb_action, string const &);
 private:
+       /// prefix in inset
+       string prefix() const;
        ///
-        bool opened;
-       ///
-        string name;
-       ///
-        MathMacroTemplate * tmacro;
+       MathMacroTemplate * tmacro() const;
 };
 
 #endif