Fix to bug 2362: Deleting superscript also deletes subscript.

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

diff --git a/src/mathed/math_sqrtinset.C b/src/mathed/math_sqrtinset.C
index 65337dc5c63284a8083be01a4f4e01568aeccaf6..4705ae78461cf74f8c202dc4f061c2f2a74d57ce 100644 (file)
--- a/src/mathed/math_sqrtinset.C
+++ b/src/mathed/math_sqrtinset.C
@@ -1,11 +1,23 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
+/**
+ * \file math_sqrtinset.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author André Pönitz
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
 
 #include "math_sqrtinset.h"
+#include "math_data.h"
 #include "math_mathmlstream.h"
+#include "textpainter.h"
 #include "LColor.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
+
+using std::auto_ptr;
 
 
 MathSqrtInset::MathSqrtInset()
@@ -13,51 +25,79 @@ MathSqrtInset::MathSqrtInset()
 {}
 
 
-MathInset * MathSqrtInset::clone() const
-{   
-       return new MathSqrtInset(*this);
+auto_ptr<InsetBase> MathSqrtInset::doClone() const
+{
+       return auto_ptr<InsetBase>(new MathSqrtInset(*this));
 }
 
 
-void MathSqrtInset::metrics(MathMetricsInfo const & mi) const
+void MathSqrtInset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       xcell(0).metrics(mi);
-       ascent_  = xcell(0).ascent()  + 4;
-       descent_ = xcell(0).descent() + 2;
-       width_   = xcell(0).width()   + 12;
+       cell(0).metrics(mi, dim);
+       dim.asc += 4;
+       dim.des += 2;
+       dim.wid += 12;
+       metricsMarkers(dim);
+       dim_ = dim;
 }
 
 
-void MathSqrtInset::draw(Painter & pain, int x, int y) const
-{ 
-       xcell(0).draw(pain, x + 10, y); 
-       int const a = ascent_;
-       int const d = descent_;
+void MathSqrtInset::draw(PainterInfo & pi, int x, int y) const
+{
+       cell(0).draw(pi, x + 10, y);
+       int const a = dim_.ascent();
+       int const d = dim_.descent();
        int xp[4];
        int yp[4];
-       xp[0] = x + width_; yp[0] = y - a + 1;
-       xp[1] = x + 8;      yp[1] = y - a + 1;
-       xp[2] = x + 5;      yp[2] = y + d - 1;
-       xp[3] = x;          yp[3] = y + (d - a)/2;
-       pain.lines(xp, yp, 4, LColor::mathline);
+       xp[0] = x + dim_.width(); yp[0] = y - a + 1;
+       xp[1] = x + 8;            yp[1] = y - a + 1;
+       xp[2] = x + 5;            yp[2] = y + d - 1;
+       xp[3] = x;                yp[3] = y + (d - a)/2;
+       pi.pain.lines(xp, yp, 4, LColor::math);
+       drawMarkers(pi, x, y);
+}
+
+
+void MathSqrtInset::metricsT(TextMetricsInfo const & mi, Dimension & dim) const
+{
+       cell(0).metricsT(mi, dim);
+       dim.asc += 1;
+       dim.wid += 2;
+}
+
+
+void MathSqrtInset::drawT(TextPainter & pain, int x, int y) const
+{
+       cell(0).drawT(pain, x + 2, y);
+       pain.horizontalLine(x + 2, y - cell(0).ascent(), cell(0).width(), '_');
+       pain.verticalLine  (x + 1, y - cell(0).ascent() + 1, cell(0).height());
+       pain.draw(x, y + cell(0).descent(), '\\');
 }
 
 
-void MathSqrtInset::write(MathWriteInfo & os) const
+void MathSqrtInset::write(WriteStream & os) const
 {
        os << "\\sqrt{" << cell(0) << '}';
 }
 
 
-void MathSqrtInset::writeNormal(NormalStream & os) const
+void MathSqrtInset::normalize(NormalStream & os) const
+{
+       os << "[sqrt " << cell(0) << ']';
+}
+
+void MathSqrtInset::maple(MapleStream & os) const
+{
+       os << "sqrt(" << cell(0) << ')';
+}
+
+void MathSqrtInset::mathematica(MathematicaStream & os) const
 {
-       os << "[sqrt ";
-       cell(0).writeNormal(os); 
-       os << "]";
+       os << "Sqrt[" << cell(0) << ']';
 }
 
 
-void MathSqrtInset::maplize(MapleStream & os) const
+void MathSqrtInset::octave(OctaveStream & os) const
 {
        os << "sqrt(" << cell(0) << ')';
 }
@@ -65,5 +105,5 @@ void MathSqrtInset::maplize(MapleStream & os) const
 
 void MathSqrtInset::mathmlize(MathMLStream & os) const
 {
-       os << "<msqrt>" << cell(0) << "</msqrt>";
+       os << MTag("msqrt") << cell(0) << ETag("msqrt");
 }