X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.h;h=05ab42ed21a6ecadeb8b4cbed0baa089f72a0c3b;hb=cd19a0b33bcc87b46c3567928d85a4c724f49db5;hp=d2ce795473ec8e64d7effa404d8acd0596599d42;hpb=cfdd73ea94c3cc0058459d67b1c62fabd31fbeb1;p=lyx.git

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index d2ce795473..05ab42ed21 100644
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -2,11 +2,11 @@
 /*
  *  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: (c) 1996, Alejandro Aguilar Sierra
+ *  Copyright: 1996, Alejandro Aguilar Sierra
  *
  *  Version: 0.4, Lyx project.
  *
@@ -14,79 +14,64 @@
  *   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"
+
 #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 const & name, int nargs);
+	/// constructs a mocro from its LaTeX definition
+	explicit InsetFormulaMacro(string const & s);
 	///
-	InsetFormulaMacro(string name, int na = 0, bool env = false);
-	///
-	~InsetFormulaMacro();
-#ifdef USE_PAINTER
-	///
-	int ascent(Painter &, LyXFont const &) const;
-	///
-	int descent(Painter &, LyXFont const &) const;
-	///
-	int width(Painter &, LyXFont const &) const;
-	///
-	void draw(Painter &, LyXFont const &, int baseline, float & x) const;
-#else
+	int ascent(BufferView *, LyXFont const &) const;
 	///
-	int Ascent(LyXFont const & font) const;
+	int descent(BufferView *, LyXFont const &) const;
 	///
-	int Descent(LyXFont const & font) const;
+	int width(BufferView *, LyXFont const &) const;
 	///
-	int Width(LyXFont const & font) const;
-	///
-	void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
-#endif
+	void draw(BufferView *, LyXFont const &, int, float &, bool) const;
+
 	///
-	void Read(LyXLex & lex);
-        ///
-	void Write(ostream & os);
+	void read(Buffer const *, LyXLex & lex);
 	///
-	int Latex(ostream & os, signed char fragile);
+	void write(Buffer const *, std::ostream & os) const;
 	///
-	int Latex(string & file, signed char fragile);
+	int ascii(Buffer const *, std::ostream &, int linelen) const;
 	///
-	int Linuxdoc(string & file);
+	int latex(Buffer const *, std::ostream & os, bool fragile, bool free_spc) const;
 	///
-	int DocBook(string & file);
+	int linuxdoc(Buffer const *, std::ostream & os) const;
 	///
-	Inset * Clone() const;
+	int docbook(Buffer const *, std::ostream &, bool mixcont) const;
 
-	/// what appears in the minibuffer when opening
-	char const * EditMessage() const {return _("Math macro editor mode");}
 	///
-	void Edit(int x, int y);
+	Inset * clone(Buffer const &, bool same_id = false) const;
 	///
-	void InsetUnlock();
+	Inset::Code lyxCode() const;
 	///
-	bool LocalDispatch(int, char const *);
-protected:
+	MathInsetTypes getType() const;
 	///
-	void UpdateLocal();
-private:
+	MathAtom const & par() const;
 	///
-        bool opened;
-	///
-        string name;
-	///
-        MathMacroTemplate * tmacro;
+	MathAtom & par();
+private:
+	/// prefix in inset
+	string prefix() const;
 };
 
 #endif