Revert "Fix a number of signedness warnings"

[lyx.git] / src / mathed / InsetMathOverset.cpp

diff --git a/src/mathed/InsetMathOverset.cpp b/src/mathed/InsetMathOverset.cpp
index b659a9eab4f2189dbf3c836a16deba1513e34239..2db26cf4c00983248fcaef9fdfdbf3b03b3bcc0b 100644 (file)
--- a/src/mathed/InsetMathOverset.cpp
+++ b/src/mathed/InsetMathOverset.cpp
@@ -36,7 +36,7 @@ void InsetMathOverset::metrics(MetricsInfo & mi, Dimension & dim) const
        Changer dummy2 = mi.base.changeEnsureMath();
        Dimension dim0;
        cell(0).metrics(mi, dim0);
-       Changer dummy = mi.base.changeFrac();
+       Changer dummy = mi.base.changeScript();
        Dimension dim1;
        cell(1).metrics(mi, dim1);
        dim.wid = max(dim1.width(), dim0.wid) + 4;
@@ -54,7 +54,7 @@ void InsetMathOverset::draw(PainterInfo & pi, int x, int y) const
        int m  = x + dim.wid / 2;
        int yo = y - dim0.asc - dim1.des - 1;
        cell(0).draw(pi, m - dim0.wid / 2, y);
-       Changer dummy = pi.base.changeFrac();
+       Changer dummy = pi.base.changeScript();
        cell(1).draw(pi, m - dim1.width() / 2, yo);
 }
 
@@ -70,6 +70,24 @@ bool InsetMathOverset::idxUpDown(Cursor & cur, bool up) const
 }
 
 
+bool InsetMathOverset::idxFirst(Cursor & cur) const
+{
+       LASSERT(&cur.inset() == this, return false);
+       cur.idx() = 0;
+       cur.pos() = 0;
+       return true;
+}
+
+
+bool InsetMathOverset::idxLast(Cursor & cur) const
+{
+       LASSERT(&cur.inset() == this, return false);
+       cur.idx() = 0;
+       cur.pos() = cur.lastpos();
+       return true;
+}
+
+
 void InsetMathOverset::write(WriteStream & os) const
 {
        MathEnsurer ensurer(os);
@@ -87,16 +105,18 @@ void InsetMathOverset::normalize(NormalStream & os) const
 
 void InsetMathOverset::mathmlize(MathStream & ms) const
 {
-       ms << "<mover accent='false'>" << cell(0) << cell(1) << "</mover>";
+       ms << "<" << from_ascii(ms.namespacedTag("mover")) << " accent='false'>"
+          << cell(0) << cell(1)
+          << "</" << from_ascii(ms.namespacedTag("mover")) << ">";
 }
 
 
 void InsetMathOverset::htmlize(HtmlStream & os) const
 {
        os << MTag("span", "class='overset'")
-                << MTag("span", "class='top'") << cell(1) << ETag("span")
-                << MTag("span") << cell(0) << ETag("span")
-                << ETag("span");
+          << MTag("span", "class='top'") << cell(1) << ETag("span")
+          << MTag("span") << cell(0) << ETag("span")
+          << ETag("span");
 }