small up/down tweaking

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

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index c63419c6c5469681f2969898e465abe2bdb05028..291d3d5e0cd56585df02786ab5699edef6dda8bd 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -1,41 +1,40 @@
 // -*- C++ -*-
+
 /*
- *  File:        formula.h
- *  Purpose:     Declaration of formula inset
- *  Author:      Alejandro Aguilar Sierra <asierra@servidor.unam.mx> 
- *  Created:     January 1996
- *  Description: Allows the edition of math paragraphs inside Lyx. 
+ *  Main LyX Inset for defining math macros
  *
- *  Copyright: 1996, Alejandro Aguilar Sierra
+ *  \author Alejandro Aguilar Sierra
+ *  \author André Pönitz
  *
- *  Version: 0.4, Lyx project.
+ *  Full author contact details are available in file CREDITS
  *
- *   You are free to use and modify this code under the terms of
- *   the GNU General Public Licence version 2 or later.
+ *  You are free to use and modify this code under the terms of
+ *  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;
 
+// An InsetFormulaMacro 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();
-       ///
-       explicit
-       InsetFormulaMacro(string name, int na = 0, bool env = false);
-       ///
-       ~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);
        ///
        int ascent(BufferView *, LyXFont const &) const;
        ///
@@ -43,38 +42,34 @@ public:
        ///
        int width(BufferView *, LyXFont const &) 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 draw(BufferView *, LyXFont const &, int, float &, bool) const;
+
        ///
-       int Latex(Buffer const *, std::ostream & os, bool fragile,
-                 bool free_spc) const;
+       void read(Buffer const *, LyXLex & lex);
        ///
-       int Linuxdoc(Buffer const *, std::ostream & os) const;
+       void write(Buffer const *, std::ostream & os) const;
        ///
-       int DocBook(Buffer const *, std::ostream &) const;
+       int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       Inset * Clone(Buffer const &) const;
+       int latex(Buffer const *, std::ostream & os, bool fragile, bool free_spc) const;
        ///
-       Inset::Code LyxCode() const { return Inset::MATHMACRO_CODE; }
-       /// what appears in the minibuffer when opening
-       string const EditMessage() const;
+       int linuxdoc(Buffer const *, std::ostream & os) const;
        ///
-       void Edit(BufferView *, int x, int y, unsigned int button);
+       int docbook(Buffer const *, std::ostream &, bool mixcont) const;
+
        ///
-       void InsetUnlock(BufferView *);
+       Inset * clone(Buffer const &, bool same_id = false) const;
        ///
-       RESULT LocalDispatch(BufferView *, kb_action, string const &);
-
-private:
+       Inset::Code lyxCode() const;
        ///
-        bool opened;
+       MathAtom const & par() const;
        ///
-        string name;
+       MathAtom & par();
+private:
        ///
-        MathMacroTemplate * tmacro;
+       void read(std::istream & is);
+       /// prefix in inset
+       string prefix() const;
 };
 
 #endif