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

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index 785ab997b2..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,73 +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);
+	int ascent(BufferView *, LyXFont const &) const;
 	///
-	~InsetFormulaMacro();
+	int descent(BufferView *, LyXFont const &) const;
 	///
-	int Ascent(LyXFont const &font) const;
+	int width(BufferView *, LyXFont const &) const;
 	///
-	int Descent(LyXFont const &font) const;
+	void draw(BufferView *, LyXFont const &, int, float &, bool) const;
+
 	///
-	int Width(LyXFont const &font) const;
+	void read(Buffer const *, LyXLex & lex);
 	///
-	void Draw(LyXFont font, LyXScreen &scr, int baseline, float &x);
+	void write(Buffer const *, std::ostream & os) const;
 	///
-	void Read(LyXLex &lex);
-        ///
-	void Write(FILE *file);
+	int ascii(Buffer const *, std::ostream &, int linelen) const;
 	///
-//	void Read(LyXLex &lex);
+	int latex(Buffer const *, std::ostream & os, bool fragile, bool free_spc) const;
 	///
-	int Latex(FILE *file, signed char fragile);
+	int linuxdoc(Buffer const *, std::ostream & os) const;
 	///
-	int Latex(string &file, signed char fragile);
+	int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+
 	///
-	int Linuxdoc(string &file);
+	Inset * clone(Buffer const &, bool same_id = false) const;
 	///
-	int DocBook(string &file);
+	Inset::Code lyxCode() const;
 	///
-	InsetFormulaMacro * Clone() const;
-
-	/// what appears in the minibuffer when opening
-	char const* EditMessage() {return "Math macro editor mode";}
+	MathInsetTypes getType() const;
 	///
-	void Edit(int x, int y);
+	MathAtom const & par() const;
 	///
-	void InsetUnlock();
-   
-	bool LocalDispatch(int, char const*);
-   
-protected:
-	void UpdateLocal();
+	MathAtom & par();
 private:
-        bool opened;
-        string name; 
-        class MathMacroTemplate* tmacro;
-
+	/// prefix in inset
+	string prefix() const;
 };
 
-
 #endif
-