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 df4be793fec25c3f8488f0597095dc07aa254865..d4b7adf986cd0dca92b9ab8669874e06b1b6e796 100644 (file)
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -1,78 +1,67 @@
-#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"
-#include "math_defs.h"
-#include "mathed/support.h"
+#include "math_mathmlstream.h"
+#include "math_support.h"
 #include "debug.h"
 
+using std::endl;
+using std::auto_ptr;
+using std::size_t;
 
 
-MathMacroArgument::MathMacroArgument(int n)
+MathMacroArgument::MathMacroArgument(size_t n)
        : number_(n)
 {
        if (n < 1 || n > 9) {
                lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
-                       << n << std::endl;
+                       << n << endl;
        }
        str_[0] = '#';
-       str_[1] = '0' + n;
+       str_[1] = static_cast<unsigned char>('0' + n);
        str_[2] = '\0';
 }
 
 
-MathInset * MathMacroArgument::clone() const
+auto_ptr<InsetBase> MathMacroArgument::doClone() const
 {
-       return new MathMacroArgument(*this);
+       return auto_ptr<InsetBase>(new MathMacroArgument(*this));
 }
 
 
-void MathMacroArgument::draw(Painter & pain, int x, int y) const
+void MathMacroArgument::write(WriteStream & os) const
 {
-       drawStr(pain, LM_TC_TEX, size(), x, y, str_);
+       os << str_;
 }
 
 
-int MathMacroArgument::ascent() const
+void MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       return mathed_char_ascent(LM_TC_TEX, size(), 'I');
+       mathed_string_dim(mi.base.font, str_, dim_);
+       dim = dim_;
 }
 
 
-int MathMacroArgument::descent() const
+void MathMacroArgument::draw(PainterInfo & pi, int x, int y) const
 {
-       return mathed_char_descent(LM_TC_TEX, size(), 'I');
+       drawStrRed(pi, x, y, str_);
+       setPosCache(pi, x, y);
 }
 
 
-int MathMacroArgument::width() const
+void MathMacroArgument::normalize(NormalStream & os) const
 {
-       return mathed_string_width(LM_TC_TEX, size(), str_);
+       os << "[macroarg " << str_ << "] ";
 }
-
-
-void MathMacroArgument::write(std::ostream & os, bool /*fragile*/) const
-{
-       os << '#' << number_ << ' ';
-}
-
-
-void MathMacroArgument::metrics(MathStyles st) const
-{
-       size_ = st;
-}
-
-
-void MathMacroArgument::writeNormal(std::ostream & os) const
-{
-       os << "[macroarg " << number_ << "] ";
-}
-
-
-void MathMacroArgument::substitute(MathArray & array, MathMacro const & m) const
-{
-       array.push_back(m.cell(number_ - 1));
-}
-