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

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index a486179bfe..05ab42ed21 100644
--- 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"
@@ -26,7 +26,7 @@
 class MathMacroTemplate;
 
 // InsetFormulaMacro's only knows its name and asks the global
-// MathMacroTable if it needs to know more. 
+// MathMacroTable if it needs to know more.
 
 ///
 class InsetFormulaMacro: public InsetFormulaBase {
@@ -34,7 +34,7 @@ public:
 	///
 	InsetFormulaMacro();
 	/// construct a macro hull from its name and the number of arguments
-	explicit InsetFormulaMacro(string name, int na);
+	explicit InsetFormulaMacro(string const & name, int nargs);
 	/// constructs a mocro from its LaTeX definition
 	explicit InsetFormulaMacro(string const & s);
 	///
@@ -44,36 +44,32 @@ 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;
 	///
-	MathInset const * par() const;
+	MathAtom const & par() const;
 	///
-	void metrics() const;
+	MathAtom & par();
 private:
-	///
-	MathMacroTemplate const & tmacro() const;
 	/// prefix in inset
 	string prefix() const;
 };