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 8aa623e240d3010fbb63361dd06051f84453ee2e..19734215f2f2ecf9ece64f4e0b4f10ba5a675b6e 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,74 +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);
        ///
-       InsetFormulaMacro(string name, int na = 0, bool env = false);
-       ///
-       ~InsetFormulaMacro();
-       ///
-       int ascent(Painter &, LyXFont const &) const;
+       int ascent(BufferView *, LyXFont const &) const;
        ///
-       int descent(Painter &, LyXFont const &) const;
+       int descent(BufferView *, LyXFont const &) const;
        ///
-       int width(Painter &, LyXFont const &) const;
+       int width(BufferView *, LyXFont const &) const;
        ///
-       void draw(Painter &, LyXFont const &, int baseline, float & x) const;
-       ///
-       void Read(LyXLex & lex);
-        ///
-       void Write(ostream & os) const;
+       void draw(BufferView *, LyXFont const &, int, float &, bool) const;
+
        ///
-       int Latex(ostream & os, signed char fragile) const;
-#ifndef USE_OSTREAM_ONLY
+       void read(Buffer const *, LyXLex & lex);
        ///
-       int Latex(string & file, signed char fragile) const;
+       void write(Buffer const *, std::ostream & os) const;
        ///
-       int Linuxdoc(string & file) const;
+       int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int DocBook(string & file) const;
-#else
+       int latex(Buffer const *, std::ostream & os, bool fragile, bool free_spc) const;
        ///
-       int Linuxdoc(ostream &) const;
+       int linuxdoc(Buffer const *, std::ostream & os) const;
        ///
-       int DocBook(ostream &) const;
-#endif
-       ///
-       Inset * Clone() const;
+       int docbook(Buffer const *, std::ostream &) const;
 
-       /// what appears in the minibuffer when opening
-       const char * EditMessage() const {return _("Math macro editor mode");}
-       ///
-       void Edit(BufferView *, int x, int y, unsigned int button);
        ///
-       void InsetUnlock(BufferView *);
+       Inset * clone(Buffer const &, bool same_id = false) const;
        ///
-       RESULT LocalDispatch(BufferView *, int, string const &);
-
-protected:
+       Inset::Code lyxCode() const;
        ///
-       //void UpdateLocal();
-
-private:
+       RESULT localDispatch(BufferView *, kb_action, string const &);
        ///
-        bool opened;
+       MathInsetTypes getType() const;
        ///
-        string name;
+       MathAtom const & par() const;
        ///
-        MathMacroTemplate * tmacro;
+       MathAtom & par();
+private:
+       /// prefix in inset
+       string prefix() const;
 };
 
 #endif