architectural changes to tex2lyx

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

diff --git a/src/mathed/formulamacro.h b/src/mathed/formulamacro.h
index a9545decaa7e9492f023f5138bc15682a4623ead..2d7c0869818a0c6a970b3ba2e2282393a2483d07 100644 (file)
--- a/src/mathed/formulamacro.h
+++ b/src/mathed/formulamacro.h
@@ -29,13 +29,13 @@ public:
        ///
        InsetFormulaMacro();
        /// construct a macro hull from its name and the number of arguments
-       explicit InsetFormulaMacro(string const & name, int nargs);
+       explicit InsetFormulaMacro(string const & name, int nargs, string const & t);
        /// constructs a mocro from its LaTeX definition
        explicit InsetFormulaMacro(string const & s);
        ///
-       void dimension(BufferView *, LyXFont const &, Dimension &) const;
+       void metrics(MetricsInfo & mi, Dimension & dim) const;
        ///
-       void draw(BufferView *, LyXFont const &, int, float &) const;
+       void draw(PainterInfo & pi, int x, int y) const;
 
        ///
        void read(Buffer const *, LyXLex & lex);
@@ -52,11 +52,9 @@ public:
        int docbook(Buffer const *, std::ostream &, bool mixcont) const;
 
        ///
-       Inset * clone(Buffer const &) const;
+       virtual std::auto_ptr<InsetBase> clone() const;
        ///
-       //Inset * clone(Buffer const &, bool same_id) const;
-       ///
-       Inset::Code lyxCode() const;
+       InsetOld::Code lyxCode() const;
        ///
        MathAtom const & par() const;
        ///