X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2Fformulamacro.h;h=486b16ae068fa7a5ae20dc1987547b89158dce8c;hb=8dccec5c46a1689fe3ea37144252e952771e1e1c;hp=4e06ef80f972a31703d279ad699882d65b228880;hpb=0eccdd1c3613e5170deb77b22174dd0afde833e9;p=lyx.git

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index 4e06ef80f9..486b16ae06 100644
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -14,8 +14,8 @@
  *   the GNU General Public Licence version 2 or later.
  */
 
-#ifndef _INSET_FORMULA_MACRO_H 
-#define _INSET_FORMULA_MACRO_H
+#ifndef INSET_FORMULA_MACRO_H 
+#define INSET_FORMULA_MACRO_H
 
 #ifdef __GNUG__
 #pragma interface
@@ -23,9 +23,6 @@
 
 #include "formula.h"
 
-
-
-
 class MathMacroTemplate;
 
 
@@ -35,52 +32,50 @@ public:
 	///
 	InsetFormulaMacro();
 	///
-	InsetFormulaMacro(string name, int na=0, bool env=false);
+	InsetFormulaMacro(string name, int na = 0, bool env = false);
 	///
 	~InsetFormulaMacro();
 	///
-	int Ascent(LyXFont const &font) const;
+	int Ascent(LyXFont const & font) const;
 	///
-	int Descent(LyXFont const &font) const;
+	int Descent(LyXFont const & font) const;
 	///
-	int Width(LyXFont const &font) const;
+	int Width(LyXFont const & font) const;
 	///
-	void Draw(LyXFont font, LyXScreen &scr, int baseline, float &x);
+	void Draw(LyXFont font, LyXScreen & scr, int baseline, float & x);
 	///
-	void Read(LyXLex &lex);
+	void Read(LyXLex & lex);
         ///
-	void Write(FILE *file);
+	void Write(ostream & os);
 	///
-//	void Read(LyXLex &lex);
+	int Latex(ostream & os, signed char fragile);
 	///
-	int Latex(FILE *file, signed char fragile);
+	int Latex(string & file, signed char fragile);
 	///
-	int Latex(string &file, signed char fragile);
+	int Linuxdoc(string & file);
 	///
-	int Linuxdoc(string &file);
+	int DocBook(string & file);
 	///
-	int DocBook(string &file);
-	///
-	Inset* Clone();
+	Inset * Clone() const;
 
 	/// what appears in the minibuffer when opening
-	char const* EditMessage() {return "Math macro editor mode";}
+	char const * EditMessage() const {return _("Math macro editor mode");}
 	///
 	void Edit(int x, int y);
 	///
 	void InsetUnlock();
-   
-	bool LocalDispatch(int, char const*);
-   
+	///
+	bool LocalDispatch(int, char const *);
 protected:
+	///
 	void UpdateLocal();
 private:
+	///
         bool opened;
-        string name; 
-        class MathMacroTemplate* tmacro;
-
+	///
+        string name;
+	///
+        MathMacroTemplate * tmacro;
 };
 
-
 #endif
-