Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C
index eb290c7a3e15af548838c7c96cb1634b00f042c2..d4b7adf986cd0dca92b9ab8669874e06b1b6e796 100644 (file)
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -1,6 +1,15 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+/**
+ * \file math_macroarg.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Alejandro Aguilar Sierra
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
 
 #include "math_macroarg.h"
 #include "math_macro.h"
@@ -8,12 +17,13 @@
 #include "math_support.h"
 #include "debug.h"
 
-
 using std::endl;
+using std::auto_ptr;
+using std::size_t;
 
 
-MathMacroArgument::MathMacroArgument(int n)
-       : MathNestInset(1), number_(n), expanded_(false)
+MathMacroArgument::MathMacroArgument(size_t n)
+       : number_(n)
 {
        if (n < 1 || n > 9) {
                lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
@@ -25,9 +35,9 @@ MathMacroArgument::MathMacroArgument(int n)
 }
 
 
-MathInset * MathMacroArgument::clone() const
+auto_ptr<InsetBase> MathMacroArgument::doClone() const
 {
-       return new MathMacroArgument(*this);
+       return auto_ptr<InsetBase>(new MathMacroArgument(*this));
 }
 
 
@@ -37,21 +47,17 @@ void MathMacroArgument::write(WriteStream & os) const
 }
 
 
-void MathMacroArgument::metrics(MathMetricsInfo & mi) const
+void MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       if (expanded_)
-               dim_ = xcell(0).metrics(mi);
-       else
-               mathed_string_dim(mi.base.font, str_, dim_);
+       mathed_string_dim(mi.base.font, str_, dim_);
+       dim = dim_;
 }
 
 
-void MathMacroArgument::draw(MathPainterInfo & pi, int x, int y) const
+void MathMacroArgument::draw(PainterInfo & pi, int x, int y) const
 {
-       if (expanded_)
-               xcell(0).draw(pi, x, y);
-       else
-               drawStrRed(pi, x, y, str_);
+       drawStrRed(pi, x, y, str_);
+       setPosCache(pi, x, y);
 }
 
 
@@ -59,10 +65,3 @@ void MathMacroArgument::normalize(NormalStream & os) const
 {
        os << "[macroarg " << str_ << "] ";
 }
-
-
-void MathMacroArgument::substitute(MathMacro const & m)
-{
-       cell(0) = m.cell(number_ - 1);
-       expanded_ = true;
-}