Geof Piroux's patch for Mathematica support

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

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index 4616faaab5b7474d42b9159d28d3fac003441f84..05ab42ed21a6ecadeb8b4cbed0baa089f72a0c3b 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -2,9 +2,9 @@
 /*
  *  File:        formula.h
  *  Purpose:     Declaration of formula inset
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx> 
+ *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx>
  *  Created:     January 1996
- *  Description: Allows the edition of math paragraphs inside Lyx. 
+ *  Description: Allows the edition of math paragraphs inside Lyx.
  *
  *  Copyright: 1996, Alejandro Aguilar Sierra
  *
@@ -14,7 +14,7 @@
  *   the GNU General Public Licence version 2 or later.
  */
 
-#ifndef INSET_FORMULA_MACRO_H 
+#ifndef INSET_FORMULA_MACRO_H
 #define INSET_FORMULA_MACRO_H
 
 #include "formulabase.h"
@@ -25,17 +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:
        ///
-       explicit InsetFormulaMacro();
-       ///
-       explicit InsetFormulaMacro(string name, int na);
+       InsetFormulaMacro();
+       /// construct a macro hull from its name and the number of arguments
+       explicit InsetFormulaMacro(string const & name, int nargs);
+       /// constructs a mocro from its LaTeX definition
+       explicit InsetFormulaMacro(string const & s);
        ///
        int ascent(BufferView *, LyXFont const &) const;
        ///
@@ -43,34 +44,34 @@ 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 &, bool mixcont) const;
 
        ///
        Inset * clone(Buffer const &, bool same_id = false) const;
        ///
        Inset::Code lyxCode() const;
        ///
-       RESULT localDispatch(BufferView *, kb_action, string const &);
-       ///
        MathInsetTypes getType() const;
+       ///
+       MathAtom const & par() const;
+       ///
+       MathAtom & par();
 private:
        /// prefix in inset
        string prefix() const;
-       ///
-       MathMacroTemplate * tmacro() const;
 };
 
 #endif