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 3ae2f5ce1a6c21be6a6e2da436e8a0234c9553fa..19734215f2f2ecf9ece64f4e0b4f10ba5a675b6e 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -25,23 +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 InsetFormulaBase {
 public:
        ///
        InsetFormulaMacro();
-       ///
-       InsetFormulaMacro(InsetFormulaMacro const &);
-       ///
+       /// construct a macro hull from its name and the number of arguments
        explicit InsetFormulaMacro(string name, int na);
-       ///
-       ~InsetFormulaMacro();
-       ///
-       void operator=(InsetFormulaMacro const &);
+       /// constructs a mocro from its LaTeX definition
+       explicit InsetFormulaMacro(string const & s);
        ///
        int ascent(BufferView *, LyXFont const &) const;
        ///
@@ -49,20 +44,20 @@ 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(LyXLex & lex);
+       void read(Buffer const *, LyXLex & lex);
        ///
-       void write(std::ostream & os) const;
+       void write(Buffer const *, std::ostream & os) const;
        ///
-       int ascii(std::ostream &, int linelen) const;
+       int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int latex(std::ostream & os, bool fragile, bool free_spc) const;
+       int latex(Buffer const *, std::ostream & os, bool fragile, bool free_spc) const;
        ///
-       int linuxdoc(std::ostream & os) const;
+       int linuxdoc(Buffer const *, std::ostream & os) const;
        ///
-       int docBook(std::ostream &) const;
+       int docbook(Buffer const *, std::ostream &) const;
 
        ///
        Inset * clone(Buffer const &, bool same_id = false) const;
@@ -73,16 +68,12 @@ public:
        ///
        MathInsetTypes getType() const;
        ///
-       MathInset const * par() const;
+       MathAtom const & par() const;
        ///
-       void metrics() const;
+       MathAtom & par();
 private:
-       ///
-       MathMacroTemplate const & tmacro() const;
        /// prefix in inset
        string prefix() const;
-       ///
-       MathMacroTemplate const * tmacro_;
 };
 
 #endif