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 ece763538a0550c80cc0a312da6eb87ef978e57b..19734215f2f2ecf9ece64f4e0b4f10ba5a675b6e 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -17,7 +17,7 @@
 #ifndef INSET_FORMULA_MACRO_H 
 #define INSET_FORMULA_MACRO_H
 
-#include "formula.h"
+#include "formulabase.h"
 
 #ifdef __GNUG__
 #pragma interface
@@ -25,18 +25,18 @@
 
 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...
+// 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();
-       ///
-       explicit
-       InsetFormulaMacro(string name, int na);
+       /// 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);
        ///
        int ascent(BufferView *, LyXFont const &) const;
        ///
@@ -44,35 +44,36 @@ public:
        ///
        int width(BufferView *, 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 write(Buffer const *, std::ostream & os) const;
        ///
-       void Read(Buffer const *, LyXLex & lex);
+       int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       void Write(Buffer const *, std::ostream & os) const;
+       int latex(Buffer const *, std::ostream & os, bool fragile, bool free_spc) const;
        ///
-       int Latex(Buffer const *, std::ostream & os, bool fragile,
-                 bool free_spc) const;
+       int linuxdoc(Buffer const *, std::ostream & os) const;
        ///
-       int Linuxdoc(Buffer const *, std::ostream & os) const;
+       int docbook(Buffer const *, std::ostream &) const;
+
+       ///
+       Inset * clone(Buffer const &, bool same_id = false) const;
        ///
-       int DocBook(Buffer const *, std::ostream &) const;
+       Inset::Code lyxCode() const;
        ///
-       Inset * Clone(Buffer const &) const;
+       RESULT localDispatch(BufferView *, kb_action, string const &);
        ///
-       Inset::Code LyxCode() const;
-       /// what appears in the minibuffer when opening
-       string const EditMessage() const;
+       MathInsetTypes getType() const;
        ///
-       RESULT LocalDispatch(BufferView *, kb_action, string const &);
+       MathAtom const & par() const;
+       ///
+       MathAtom & par();
 private:
        /// prefix in inset
        string prefix() const;
-       ///
-       MathMacroTemplate * tmacro() const;
 };
 
-inline Inset::Code InsetFormulaMacro::LyxCode() const
-{
-       return Inset::MATHMACRO_CODE;
-}
 #endif