enable direct input of #1...#9; some whitespace changes

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

diff --git a/src/mathed/math_sqrtinset.C b/src/mathed/math_sqrtinset.C
index 956fbb28b9fcd35669414fca47ef31771fca0b18..684049e769febd9e9c1be11c85c3717befba8101 100644 (file)
--- a/src/mathed/math_sqrtinset.C
+++ b/src/mathed/math_sqrtinset.C
@@ -3,9 +3,9 @@
 #endif
 
 #include "math_sqrtinset.h"
+#include "math_mathmlstream.h"
 #include "LColor.h"
 #include "Painter.h"
-#include "support/LOstream.h"
 
 
 MathSqrtInset::MathSqrtInset()
@@ -19,10 +19,9 @@ MathInset * MathSqrtInset::clone() const
 }
 
 
-void MathSqrtInset::metrics(MathStyles st) const
+void MathSqrtInset::metrics(MathMetricsInfo const & mi) const
 {
-       xcell(0).metrics(st);
-       size_    = st;
+       xcell(0).metrics(mi);
        ascent_  = xcell(0).ascent()  + 4;
        descent_ = xcell(0).descent() + 2;
        width_   = xcell(0).width()   + 12;
@@ -31,8 +30,6 @@ void MathSqrtInset::metrics(MathStyles st) const
 
 void MathSqrtInset::draw(Painter & pain, int x, int y) const
 { 
-       xo(x);
-       yo(y);
        xcell(0).draw(pain, x + 10, y); 
        int const a = ascent_;
        int const d = descent_;
@@ -42,21 +39,29 @@ 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::write(std::ostream & os, bool fragile) const
+void MathSqrtInset::write(WriteStream & os) const
 {
-       os << "\\sqrt{";
-       cell(0).write(os, fragile); 
-       os << '}';
+       os << "\\sqrt{" << cell(0) << '}';
 }
 
 
-void MathSqrtInset::writeNormal(std::ostream & os) const
+void MathSqrtInset::normalize(NormalStream & os) const
 {
-       os << "[sqrt ";
-       cell(0).writeNormal(os); 
-       os << "] ";
+       os << "[sqrt " << cell(0) << ']';
+}
+
+
+void MathSqrtInset::maplize(MapleStream & os) const
+{
+       os << "sqrt(" << cell(0) << ')';
+}
+
+
+void MathSqrtInset::mathmlize(MathMLStream & os) const
+{
+       os << MTag("msqrt") << cell(0) << ETag("msqrt");
 }