Add In nsetOld * argument to updateInset to rebreak the correct par.

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

diff --git a/src/mathed/formulamacro.C b/src/mathed/formulamacro.C
index a04e1b09488243a430768fe4e483a6f221b1964e..39ab9325401bde56f23a94e7d151e9f8f2577d76 100644 (file)
--- a/src/mathed/formulamacro.C
+++ b/src/mathed/formulamacro.C
@@ -1,14 +1,12 @@
-/*
- *  File:        formulamacro.C
- *  Purpose:     Implementation of the formula macro LyX inset
- *  Author:      André Pönitz, based on ideas of Alejandro Aguilar Sierra
- *  Created:     March 2001
- *  Description: Allows the edition of math macros inside Lyx.
+/**
+ * \file formulamacro.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
- *  Copyright: 2001  The LyX Project
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
  *
- *   You are free to use and modify this code under the terms of
- *   the GNU General Public Licence version 2 or later.
+ * Full author contact details are available in file CREDITS.
  */
 
 #include <config.h>
@@ -36,7 +34,10 @@
 #include "lyxtext.h"
 #include "Lsstream.h"
 
+using namespace lyx::support;
+
 using std::ostream;
+using std::auto_ptr;
 
 extern MathCursor * mathcursor;
 
@@ -48,10 +49,11 @@ InsetFormulaMacro::InsetFormulaMacro()
 }
 
 
-InsetFormulaMacro::InsetFormulaMacro(string const & name, int nargs)
+InsetFormulaMacro::InsetFormulaMacro
+       (string const & name, int nargs, string const & type)
 {
        setInsetName(name);
-       MathMacroTable::create(MathAtom(new MathMacroTemplate(name, nargs)));
+       MathMacroTable::create(MathAtom(new MathMacroTemplate(name, nargs, type)));
 }
 
 
@@ -62,18 +64,12 @@ InsetFormulaMacro::InsetFormulaMacro(string const & s)
 }
 
 
-Inset * InsetFormulaMacro::clone(Buffer const &) const
+auto_ptr<InsetBase> InsetFormulaMacro::clone() const
 {
-       return new InsetFormulaMacro(*this);
+       return auto_ptr<InsetBase>(new InsetFormulaMacro(*this));
 }
 
 
-// Inset * InsetFormulaMacro::clone(Buffer const &, bool) const
-// {
-//     return new InsetFormulaMacro(*this);
-// }
-
-
 void InsetFormulaMacro::write(Buffer const *, ostream & os) const
 {
        os << "FormulaMacro ";
@@ -154,9 +150,9 @@ MathAtom & InsetFormulaMacro::par()
 }
 
 
-Inset::Code InsetFormulaMacro::lyxCode() const
+InsetOld::Code InsetFormulaMacro::lyxCode() const
 {
-       return Inset::MATHMACRO_CODE;
+       return InsetOld::MATHMACRO_CODE;
 }