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 56a156f9676ab72e939e534297aae85537965dce..1e179f8bed40c726f8f774682688f531f15dce09 100644 (file)
--- a/src/mathed/math_deliminset.C
+++ b/src/mathed/math_deliminset.C
@@ -1,18 +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.
+ */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
+#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 {
 
@@ -36,7 +44,7 @@ string convertDelimToLatexName(string const & name)
                return name;
        if (name == "|")
                return name;
-       return "\\" + name + " ";
+       return '\\' + name + ' ';
 }
 
 }
@@ -56,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));
 }
 
 
@@ -76,42 +84,38 @@ void MathDelimInset::normalize(NormalStream & os) const
 }
 
 
-int MathDelimInset::dw() const
+void MathDelimInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       int w = height() / 5;
-       if (w > 8)
-               w = 8;
-       if (w < 4)
-               w = 4;
-       return w;
-}
-
-
-void MathDelimInset::metrics(MathMetricsInfo & mi) const
-{
-       xcell(0).metrics(mi);
+       cell(0).metrics(mi);
        Dimension t;
        mathed_char_dim(mi.base.font, 'I', t);
-       int h0 = (t.a + t.d) / 2;
-       int a0 = max(xcell(0).ascent(), t.a)   - h0;
-       int d0 = max(xcell(0).descent(), t.d)  + h0;
-       dim_.a = max(a0, d0) + h0;
-       dim_.d = max(a0, d0) - h0;
-       dim_.w = xcell(0).width() + 2 * dw() + 8;
-}
-
-
-void MathDelimInset::draw(MathPainterInfo & pi, int x, int y) 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 = dim_;
+}
+
+
+void MathDelimInset::draw(PainterInfo & pi, int x, int y) const
 {
-       int const w = dw();
-       int const b = y - ascent();
-       xcell(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_ == ")";
 }
@@ -129,28 +133,35 @@ bool MathDelimInset::isAbs() const
 }
 
 
-void MathDelimInset::maplize(MapleStream & os) const
+void MathDelimInset::maple(MapleStream & os) const
 {
        if (isAbs()) {
-               bool mat =
-                       cell(0).size() == 1 && cell(0).begin()->nucleus()
-                                       && cell(0).begin()->nucleus()->asMatrixInset();
-               if (mat)
-                       os << "linalg[det](" << cell(0) << ")";
+               if (cell(0).size() == 1 && cell(0).front()->asMatrixInset())
+                       os << "linalg[det](" << cell(0) << ')';
                else
-                       os << "abs(" << cell(0) << ")";
+                       os << "abs(" << cell(0) << ')';
        }
        else
                os << left_ << cell(0) << right_;
 }
 
-void MathDelimInset::mathematicize(MathematicaStream & os) const
+void MathDelimInset::maxima(MaximaStream & os) const
 {
        if (isAbs()) {
-               bool mat =
-                       cell(0).size() == 1 && cell(0).begin()->nucleus()
-                                       && cell(0).begin()->nucleus()->asMatrixInset();
-               if (mat)
+               if (cell(0).size() == 1 && cell(0).front()->asMatrixInset())
+                       os << "determinant(" << cell(0) << ')';
+               else
+                       os << "abs(" << cell(0) << ')';
+       }
+       else
+               os << left_ << cell(0) << right_;
+}
+
+
+void MathDelimInset::mathematica(MathematicaStream & os) const
+{
+       if (isAbs()) {
+               if (cell(0).size() == 1 && cell(0).front()->asMatrixInset())
                        os << "Det" << cell(0) << ']';
                else
                        os << "Abs[" << cell(0) << ']';
@@ -160,7 +171,6 @@ void MathDelimInset::mathematicize(MathematicaStream & os) const
 }
 
 
-
 void MathDelimInset::mathmlize(MathMLStream & os) const
 {
        os << "<fenced open=\"" << left_ << "\" close=\""
@@ -168,10 +178,10 @@ void MathDelimInset::mathmlize(MathMLStream & os) const
 }
 
 
-void MathDelimInset::octavize(OctaveStream & os) const
+void MathDelimInset::octave(OctaveStream & os) const
 {
        if (isAbs())
-               os << "det(" << cell(0) << ")";
+               os << "det(" << cell(0) << ')';
        else
                os << left_ << cell(0) << right_;
 }