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 8eab7cc3d210a21904a0edaa891314dc29fbc85e..204ddaffe45738af5eefbf3c47fea846f47a77d3 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -17,25 +17,25 @@
 #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(string name, int na = 0);
+       explicit InsetFormulaMacro();
        ///
-       ~InsetFormulaMacro();
+       explicit InsetFormulaMacro(string name, int na);
        ///
        int ascent(BufferView *, LyXFont const &) const;
        ///
@@ -44,43 +44,31 @@ public:
        int width(BufferView *, LyXFont const &) const;
        ///
        void draw(BufferView *,LyXFont const &, int, float &, bool) const;
+
        ///
-       void Read(Buffer const *, LyXLex & lex);
-        ///
-       void Write(Buffer const *, std::ostream & os) const;
+       void read(LyXLex & lex);
        ///
-       int Latex(Buffer const *, std::ostream & os, bool fragile,
-                 bool free_spc) const;
+       void write(std::ostream & os) const;
        ///
-       int Linuxdoc(Buffer const *, std::ostream & os) const;
+       int ascii(std::ostream &, int linelen) const;
        ///
-       int DocBook(Buffer const *, std::ostream &) const;
+       int latex(std::ostream & os, bool fragile, bool free_spc) const;
        ///
-       Inset * Clone(Buffer const &) const;
+       int linuxdoc(std::ostream & os) const;
        ///
-       Inset::Code LyxCode() const;
-       /// what appears in the minibuffer when opening
-       string const EditMessage() const;
+       int docBook(std::ostream &) const;
+
        ///
-       void Edit(BufferView *, int x, int y, unsigned int button);
+       Inset * clone(Buffer const &, bool same_id = false) const;
        ///
-       void InsetUnlock(BufferView *);
+       Inset::Code lyxCode() const;
        ///
-       RESULT LocalDispatch(BufferView *, kb_action, string const &);
-
+       RESULT localDispatch(BufferView *, kb_action, string const &);
 private:
+       /// prefix in inset
+       string prefix() const;
        ///
-        bool opened_;
-       ///
-        string name_;
-       ///
-        MathMacroTemplate * tmacro_;
+       MathMacroTemplate * tmacro() const;
 };
 
-
-inline
-Inset::Code InsetFormulaMacro::LyxCode() const
-{
-       return Inset::MATHMACRO_CODE;
-}
 #endif