architectural changes to tex2lyx

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

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index 44682779540246bdf843a25e66b2456ccb07c346..2d7c0869818a0c6a970b3ba2e2282393a2483d07 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -1,50 +1,41 @@
 // -*- 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
 
 class MathMacroTemplate;
 
-// InsetFormulaMacro's only knows its name and asks the global
-// MathMacroTable if it needs to know more. 
+// An InsetFormulaMacro only knows its name and asks the global
+// MathMacroTable if it needs to know more.
 
 ///
-class InsetFormulaMacro: public InsetFormulaBase {
+class InsetFormulaMacro : public InsetFormulaBase {
 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, string const & t);
        /// constructs a mocro from its LaTeX definition
        explicit InsetFormulaMacro(string const & s);
        ///
-       int ascent(BufferView *, LyXFont const &) const;
-       ///
-       int descent(BufferView *, LyXFont const &) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       int width(BufferView *, LyXFont const &) const;
-       ///
-       void draw(BufferView *, LyXFont const &, int, float &, bool) const;
+       void draw(PainterInfo & pi, int x, int y) const;
 
        ///
        void read(Buffer const *, LyXLex & lex);
@@ -53,27 +44,24 @@ public:
        ///
        int ascii(Buffer const *, std::ostream &, int linelen) const;
        ///
-       int latex(Buffer const *, std::ostream & os, bool fragile, bool free_spc) const;
+       int latex(Buffer const *, std::ostream & os,
+                 LatexRunParams const &) const;
        ///
        int linuxdoc(Buffer const *, std::ostream & os) const;
        ///
-       int docbook(Buffer const *, 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 &);
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       MathInsetTypes getType() const;
+       InsetOld::Code lyxCode() const;
        ///
-       MathInset const * par() const;
+       MathAtom const & par() const;
        ///
-       void metrics() const;
+       MathAtom & par();
 private:
        ///
-       MathMacroTemplate const & tmacro() const;
+       void read(std::istream & is);
        /// prefix in inset
        string prefix() const;
 };