Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_deliminset.C b/src/mathed/math_deliminset.C
index 82b58813cf791246c3be72c52552ba34144cd908..1e179f8bed40c726f8f774682688f531f15dce09 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -1,15 +1,26 @@
-#include <config.h>
+/**
+ * \file math_deliminset.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_deliminset.h"
-#include "math_parser.h"
-#include "math_support.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
 #include "math_streamstr.h"
-#include "math_extern.h"
+#include "math_support.h"
 
 
+using std::string;
 using std::max;
+using std::auto_ptr;
 
 namespace {
 
@@ -53,9 +64,9 @@ MathDelimInset::MathDelimInset
 }
 
 
-MathInset * MathDelimInset::clone() const
+auto_ptr<InsetBase> MathDelimInset::doClone() const
 {
-       return new MathDelimInset(*this);
+       return auto_ptr<InsetBase>(new MathDelimInset(*this));
 }
 
 
@@ -73,18 +84,7 @@ void MathDelimInset::normalize(NormalStream & os) const
 }
 
 
-int MathDelimInset::dw() const
-{
-       int w = height() / 5;
-       if (w > 8)
-               w = 8;
-       if (w < 4)
-               w = 4;
-       return w;
-}
-
-
-void MathDelimInset::metrics(MetricsInfo & mi) const
+void MathDelimInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        cell(0).metrics(mi);
        Dimension t;
@@ -92,23 +92,30 @@ void MathDelimInset::metrics(MetricsInfo & mi) const
        int h0 = (t.asc + t.des) / 2;
        int a0 = max(cell(0).ascent(), t.asc)   - h0;
        int d0 = max(cell(0).descent(), t.des)  + h0;
+       dw_ = cell(0).height() / 5;
+       if (dw_ > 8)
+               dw_ = 8;
+       if (dw_ < 4)
+               dw_ = 4;
+       dim_.wid = cell(0).width() + 2 * dw_ + 8;
        dim_.asc = max(a0, d0) + h0;
        dim_.des = max(a0, d0) - h0;
-       dim_.wid = cell(0).width() + 2 * dw() + 8;
+       dim = dim_;
 }
 
 
 void MathDelimInset::draw(PainterInfo & pi, int x, int y) const
 {
-       int const w = dw();
-       int const b = y - ascent();
-       cell(0).draw(pi, x + w + 4, y);
-       mathed_draw_deco(pi, x + 4, b, w, height(), left_);
-       mathed_draw_deco(pi, x + width() - w - 4, b, w, height(), right_);
+       int const b = y - dim_.asc;
+       cell(0).draw(pi, x + dw_ + 4, y);
+       mathed_draw_deco(pi, x + 4, b, dw_, dim_.height(), left_);
+       mathed_draw_deco(pi, x + dim_.width() - dw_ - 4,
+               b, dw_, dim_.height(), right_);
+       setPosCache(pi, x, y);
 }
 
 
-bool MathDelimInset::isParanthesis() const
+bool MathDelimInset::isParenthesis() const
 {
        return left_ == "(" && right_ == ")";
 }