make \newcommand{\bb}[1]{\mathbf{#1}} work for read/write/display.

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

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index 2ae57cb6eeaa5e898b02afe96e2ce20146e1b83e..19734215f2f2ecf9ece64f4e0b4f10ba5a675b6e 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -17,67 +17,63 @@
 #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 only knows its name and asks the global
+// MathMacroTable if it needs to know more. 
 
 ///
-class InsetFormulaMacro: public InsetFormula {
+class InsetFormulaMacro: public InsetFormulaBase {
 public:
        ///
        InsetFormulaMacro();
+       /// construct a macro hull from its name and the number of arguments
+       explicit InsetFormulaMacro(string name, int na);
+       /// constructs a mocro from its LaTeX definition
+       explicit InsetFormulaMacro(string const & s);
        ///
-       explicit
-       InsetFormulaMacro(string name, int na = 0, bool env = false);
-       ///
-       ~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(BufferView *,LyXFont const &, int, float &, bool) const;
+       void read(Buffer const *, LyXLex & lex);
        ///
-       void Read(Buffer const *, LyXLex & lex);
-        ///
-       void Write(Buffer const *, std::ostream & os) const;
+       void write(Buffer const *, std::ostream & os) const;
        ///
-       int Latex(Buffer const *, std::ostream & os, bool fragile,
-                 bool free_spc) const;
+       int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int Linuxdoc(Buffer const *, std::ostream & os) const;
+       int latex(Buffer const *, std::ostream & os, bool fragile, bool free_spc) const;
        ///
-       int DocBook(Buffer const *, std::ostream &) const;
+       int linuxdoc(Buffer const *, std::ostream & os) const;
        ///
-       Inset * Clone() const;
+       int docbook(Buffer const *, std::ostream &) const;
 
-       /// what appears in the minibuffer when opening
-       char const * EditMessage() 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 *, int, string const &);
-
-protected:
+       RESULT localDispatch(BufferView *, kb_action, string const &);
        ///
-       //void UpdateLocal();
-
-private:
+       MathInsetTypes getType() const;
        ///
-        bool opened;
+       MathAtom const & par() const;
        ///
-        string name;
-       ///
-        MathMacroTemplate * tmacro;
+       MathAtom & par();
+private:
+       /// prefix in inset
+       string prefix() const;
 };
 
 #endif