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 b8d4c8b927da19bb485a71c2d5ad86364b7dd91e..d4b7adf986cd0dca92b9ab8669874e06b1b6e796 100644 (file)
--- a/src/mathed/math_macroarg.C
+++ b/src/mathed/math_macroarg.C
@@ -1,76 +1,67 @@
-#include <config.h>
+/**
+ * \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.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#include <config.h>
 
 #include "math_macroarg.h"
-#include "mathed/support.h"
+#include "math_macro.h"
+#include "math_mathmlstream.h"
+#include "math_support.h"
 #include "debug.h"
 
-
-MathMacroArgument::MathMacroArgument()
-       : expnd_mode_(false), number_(1)
-{
-       SetType(LM_OT_MACRO_ARG);
-}
+using std::endl;
+using std::auto_ptr;
+using std::size_t;
 
 
-MathMacroArgument::MathMacroArgument(int n)
-       : expnd_mode_(false), number_(n)
+MathMacroArgument::MathMacroArgument(size_t n)
+       : number_(n)
 {
-       SetType(LM_OT_MACRO_ARG);
+       if (n < 1 || n > 9) {
+               lyxerr << "MathMacroArgument::MathMacroArgument: wrong Argument id: "
+                       << n << endl;
+       }
+       str_[0] = '#';
+       str_[1] = static_cast<unsigned char>('0' + n);
+       str_[2] = '\0';
 }
 
 
-MathedInset * MathMacroArgument::Clone()
+auto_ptr<InsetBase> MathMacroArgument::doClone() const
 {
-       return this;
+       return auto_ptr<InsetBase>(new MathMacroArgument(*this));
 }
 
 
-void MathMacroArgument::setExpand(bool e)
+void MathMacroArgument::write(WriteStream & os) const
 {
-       expnd_mode_ = e;
+       os << str_;
 }
 
 
-bool MathMacroArgument::getExpand() const
+void MathMacroArgument::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       return expnd_mode_;
+       mathed_string_dim(mi.base.font, str_, dim_);
+       dim = dim_;
 }
 
 
-void MathMacroArgument::draw(Painter & pain, int x, int baseline)
+void MathMacroArgument::draw(PainterInfo & pi, int x, int y) const
 {
-       if (expnd_mode_) {
-               MathParInset::draw(pain, x, baseline);
-       } else {
-               std::ostringstream ost;
-               ost << '#' << number_;
-               drawStr(pain, LM_TC_TEX, size(), x, baseline, ost.str().c_str());
-       }
-}
-
-void MathMacroArgument::Metrics()
-{
-       if (expnd_mode_) {
-               MathParInset::Metrics();
-       } else {
-               std::ostringstream ost;
-               ost << '#' << number_;
-               width = mathed_string_width(LM_TC_TEX, size(), ost.str().c_str());
-               mathed_string_height(LM_TC_TEX, size(), ost.str().c_str(),
-                                    ascent, descent);
-       }
+       drawStrRed(pi, x, y, str_);
+       setPosCache(pi, x, y);
 }
 
 
-void MathMacroArgument::Write(ostream & os, bool fragile)
+void MathMacroArgument::normalize(NormalStream & os) const
 {
-       if (expnd_mode_) {
-               MathParInset::Write(os, fragile);
-       } else {
-               os << '#' << number_ << ' ';
-       }
+       os << "[macroarg " << str_ << "] ";
 }