rename commandtags.h to lfuns.h and renumber/cleanup. Rebuild the tree !

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

diff --git a/src/mathed/math_sqrtinset.C b/src/mathed/math_sqrtinset.C
index 3470a41d06241ae3110f1d8d3e3b411cd21a0203..960ccc2ab6afb246847885ddcbb1249d07c8d5ed 100644 (file)
--- a/src/mathed/math_sqrtinset.C
+++ b/src/mathed/math_sqrtinset.C
@@ -1,11 +1,8 @@
-#ifdef __GNUG__
-#pragma implementation
-#endif
 
 #include "math_sqrtinset.h"
 #include "math_mathmlstream.h"
 #include "LColor.h"
-#include "Painter.h"
+#include "frontends/Painter.h"
 #include "textpainter.h"
 
 
@@ -20,45 +17,47 @@ MathInset * MathSqrtInset::clone() const
 }
 
 
-void MathSqrtInset::metrics(MathMetricsInfo const & mi) const
+void MathSqrtInset::metrics(MathMetricsInfo & mi) 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_.a = cell(0).ascent()  + 4;
+       dim_.d = cell(0).descent() + 2;
+       dim_.w = cell(0).width()   + 12;
+       metricsMarkers();
 }
 
 
-void MathSqrtInset::draw(Painter & pain, int x, int y) const
+void MathSqrtInset::draw(MathPainterInfo & pi, int x, int y) const
 {
-       xcell(0).draw(pain, x + 10, y);
-       int const a = ascent_;
-       int const d = descent_;
+       cell(0).draw(pi, x + 10, y);
+       int const a = ascent();
+       int const d = 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::math);
+       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;
+       pi.pain.lines(xp, yp, 4, LColor::math);
+       drawMarkers(pi, x, y);
 }
 
 
 void MathSqrtInset::metricsT(TextMetricsInfo const & mi) const
 {
-       xcell(0).metricsT(mi);
-       ascent_  = xcell(0).ascent()  + 1;
-       descent_ = xcell(0).descent();
-       width_   = xcell(0).width()   + 2;
+       cell(0).metricsT(mi);
+       dim_.a = cell(0).ascent()  + 1;
+       dim_.d = cell(0).descent();
+       dim_.w = cell(0).width()   + 2;
 }
 
 
 void MathSqrtInset::drawT(TextPainter & pain, int x, int y) const
 {
-       xcell(0).drawT(pain, x + 2, y);
-       pain.horizontalLine(x + 2, y - xcell(0).ascent(), xcell(0).width(), '_');
-       pain.verticalLine  (x + 1, y - xcell(0).ascent() + 1, xcell(0).height());
-       pain.draw(x, y + xcell(0).descent(), '\\');
+       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(), '\\');
 }
 
 
@@ -73,14 +72,18 @@ void MathSqrtInset::normalize(NormalStream & os) const
        os << "[sqrt " << cell(0) << ']';
 }
 
-
-void MathSqrtInset::maplize(MapleStream & os) const
+void MathSqrtInset::maple(MapleStream & os) const
 {
        os << "sqrt(" << cell(0) << ')';
 }
 
+void MathSqrtInset::mathematica(MathematicaStream & os) const
+{
+       os << "Sqrt[" << cell(0) << ']';
+}
+
 
-void MathSqrtInset::octavize(OctaveStream & os) const
+void MathSqrtInset::octave(OctaveStream & os) const
 {
        os << "sqrt(" << cell(0) << ')';
 }