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 1a95390f977ecc0bf9c41a9ab8717fdea519cb2c..204ddaffe45738af5eefbf3c47fea846f47a77d3 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -6,7 +6,7 @@
  *  Created:     January 1996
  *  Description: Allows the edition of math paragraphs inside Lyx. 
  *
- *  Copyright: (c) 1996, Alejandro Aguilar Sierra
+ *  Copyright: 1996, Alejandro Aguilar Sierra
  *
  *  Version: 0.4, Lyx project.
  *
@@ -17,70 +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();
-       ///
-       InsetFormulaMacro(string name, int na= 0, bool env= false);
-       ///
-       ~InsetFormulaMacro();
+       explicit InsetFormulaMacro();
        ///
-       int Ascent(LyXFont const &font) const;
+       explicit InsetFormulaMacro(string name, int na);
        ///
-       int Descent(LyXFont const &font) const;
+       int ascent(BufferView *, LyXFont const &) const;
        ///
-       int Width(LyXFont const &font) const;
+       int descent(BufferView *, LyXFont const &) const;
        ///
-       void Draw(LyXFont font, LyXScreen &scr, int baseline, float &x);
+       int width(BufferView *, LyXFont const &) const;
        ///
-       void Read(LyXLex &lex);
-        ///
-       void Write(FILE *file);
+       void draw(BufferView *,LyXFont const &, int, float &, bool) const;
+
        ///
-//     void Read(LyXLex &lex);
+       void read(LyXLex & lex);
        ///
-       int Latex(FILE *file, signed char fragile);
+       void write(std::ostream & os) const;
        ///
-       int Latex(string &file, signed char fragile);
+       int ascii(std::ostream &, int linelen) const;
        ///
-       int Linuxdoc(string &file);
+       int latex(std::ostream & os, bool fragile, bool free_spc) const;
        ///
-       int DocBook(string &file);
+       int linuxdoc(std::ostream & os) const;
        ///
-       Inset* Clone();
+       int docBook(std::ostream &) const;
 
-       /// what appears in the minibuffer when opening
-       char const* EditMessage() {return "Math macro editor mode";}
        ///
-       void Edit(int x, int y);
+       Inset * clone(Buffer const &, bool same_id = false) const;
+       ///
+       Inset::Code lyxCode() const;
        ///
-       void InsetUnlock();
-   
-       bool LocalDispatch(int, char const*);
-   
-protected:
-       void UpdateLocal();
+       RESULT localDispatch(BufferView *, kb_action, string const &);
 private:
-        bool opened;
-        string name; 
-        class MathMacroTemplate* tmacro;
-
+       /// prefix in inset
+       string prefix() const;
+       ///
+       MathMacroTemplate * tmacro() const;
 };
 
-
 #endif
-