fix typo that put too many include paths for most people

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

diff --git a/src/mathed/math_sqrtinset.C b/src/mathed/math_sqrtinset.C
index 65337dc5c63284a8083be01a4f4e01568aeccaf6..ccece1e1190e8557a8f3504fda18aa6ca3fd129e 100644 (file)
--- a/src/mathed/math_sqrtinset.C
+++ b/src/mathed/math_sqrtinset.C
@@ -6,6 +6,7 @@
 #include "math_mathmlstream.h"
 #include "LColor.h"
 #include "Painter.h"
+#include "textpainter.h"
 
 
 MathSqrtInset::MathSqrtInset()
@@ -14,7 +15,7 @@ MathSqrtInset::MathSqrtInset()
 
 
 MathInset * MathSqrtInset::clone() const
-{   
+{
        return new MathSqrtInset(*this);
 }
 
@@ -29,8 +30,8 @@ void MathSqrtInset::metrics(MathMetricsInfo const & mi) const
 
 
 void MathSqrtInset::draw(Painter & pain, int x, int y) const
-{ 
-       xcell(0).draw(pain, x + 10, y); 
+{
+       xcell(0).draw(pain, x + 10, y);
        int const a = ascent_;
        int const d = descent_;
        int xp[4];
@@ -39,21 +40,37 @@ void MathSqrtInset::draw(Painter & pain, int x, int y) const
        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);
+       pain.lines(xp, yp, 4, LColor::math);
+}
+
+
+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;
+}
+
+
+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(), '\\');
 }
 
 
-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).writeNormal(os); 
-       os << "]";
+       os << "[sqrt " << cell(0) << ']';
 }
 
 
@@ -65,5 +82,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");
 }