further code uglification to make Jean-Marc's compiler happy

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

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index 4293c3cf610ec6126a9bd3be61c2b8c83c75e66b..44682779540246bdf843a25e66b2456ccb07c346 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.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();
-       ///
+       InsetFormulaMacro();
+       /// construct a macro hull from its name and the number of arguments
        explicit InsetFormulaMacro(string name, int na);
+       /// constructs a mocro from its LaTeX definition
+       explicit InsetFormulaMacro(string const & s);
        ///
        int ascent(BufferView *, LyXFont const &) const;
        ///
@@ -43,31 +44,38 @@ 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(Buffer const *, LyXLex & lex);
+       ///
+       void write(Buffer const *, std::ostream & os) const;
        ///
-       void Read(Buffer const *, LyXLex & lex);
+       int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       void Write(Buffer const *, std::ostream & os) const;
+       int latex(Buffer const *, std::ostream & os, bool fragile, bool free_spc) const;
        ///
-       int Ascii(Buffer const *, std::ostream &, int linelen) const;
+       int linuxdoc(Buffer const *, std::ostream & os) const;
        ///
-       int Latex(Buffer const *, std::ostream & os, bool fragile,
-                 bool free_spc) const;
+       int docbook(Buffer const *, std::ostream &) const;
+
+       ///
+       Inset * clone(Buffer const &, bool same_id = false) const;
        ///
-       int Linuxdoc(Buffer const *, std::ostream & os) const;
+       Inset::Code lyxCode() const;
        ///
-       int DocBook(Buffer const *, std::ostream &) const;
+       RESULT localDispatch(BufferView *, kb_action, string const &);
        ///
-       Inset * Clone(Buffer const &) const;
+       MathInsetTypes getType() const;
        ///
-       Inset::Code LyxCode() const;
+       MathInset const * par() const;
        ///
-       RESULT LocalDispatch(BufferView *, kb_action, string const &);
+       void metrics() const;
 private:
+       ///
+       MathMacroTemplate const & tmacro() const;
        /// prefix in inset
        string prefix() const;
-       ///
-       MathMacroTemplate * tmacro() const;
 };
 
 #endif