Remove obsolete (and false) comment.

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

diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp
index 3f4d0c49c41841e9ea97c73531fe7988d1a0cd69..832631dfa3a8cdeb69f3c940428b80dd93398397 100644 (file)
--- a/src/mathed/InsetMathUnderset.cpp
+++ b/src/mathed/InsetMathUnderset.cpp
@@ -11,11 +11,15 @@
 #include <config.h>
 
 #include "InsetMathUnderset.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 
 #include "Cursor.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
+#include "support/lassert.h"
 
 using namespace std;
 
@@ -29,35 +33,36 @@ Inset * InsetMathUnderset::clone() const
 
 void InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-       Dimension dim1;
-       cell(1).metrics(mi, dim1);
-       Changer dummy = mi.base.changeFrac();
+       Changer dummy2 = mi.base.changeEnsureMath();
        Dimension dim0;
        cell(0).metrics(mi, dim0);
-       dim.wid = max(dim0.width(), dim1.width()) + 4;
-       dim.asc = dim1.ascent();
-       dim.des = dim1.descent() + dim0.height() + 4;
-       metricsMarkers(dim);
+       Changer dummy = mi.base.changeScript();
+       Dimension dim1;
+       cell(1).metrics(mi, dim1);
+       dim.wid = max(dim1.width(), dim0.width()) + 4;
+       dim.asc = dim0.ascent();
+       dim.des = dim0.descent() + dim1.height() + 4;
 }
 
 
 void InsetMathUnderset::draw(PainterInfo & pi, int x, int y) const
 {
+       Changer dummy2 = pi.base.changeEnsureMath();
        Dimension const dim = dimension(*pi.base.bv);
-       Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        Dimension const & dim1 = cell(1).dimension(*pi.base.bv);
+       Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
        int m  = x + dim.wid / 2;
-       int yo = y + dim1.descent() + dim0.ascent() + 1;
-       cell(1).draw(pi, m - dim1.width() / 2, y);
-       Changer dummy = pi.base.changeFrac();
-       cell(0).draw(pi, m - dim0.width() / 2, yo);
-       drawMarkers(pi, x, y);
+       int yo = y + dim0.descent() + dim1.ascent() + 1;
+       cell(0).draw(pi, m - dim0.width() / 2, y);
+       Changer dummy = pi.base.changeScript();
+       cell(1).draw(pi, m - dim1.width() / 2, yo);
 }
 
 
 bool InsetMathUnderset::idxFirst(Cursor & cur) const
 {
-       cur.idx() = 1;
+       LASSERT(&cur.inset() == this, return false);
+       cur.idx() = 0;
        cur.pos() = 0;
        return true;
 }
@@ -65,49 +70,39 @@ bool InsetMathUnderset::idxFirst(Cursor & cur) const
 
 bool InsetMathUnderset::idxLast(Cursor & cur) const
 {
-       cur.idx() = 1;
+       LASSERT(&cur.inset() == this, return false);
+       cur.idx() = 0;
        cur.pos() = cur.lastpos();
        return true;
 }
 
 
-bool InsetMathUnderset::idxUpDown(Cursor & cur, bool up) const
-{
-       idx_type target = up; // up ? 1 : 0, since upper cell has idx 1
-       if (cur.idx() == target)
-               return false;
-       cur.idx() = target;
-       cur.pos() = cur.cell().x2pos(&cur.bv(), cur.x_target());
-       return true;
-}
-
-
 void InsetMathUnderset::write(WriteStream & os) const
 {
        MathEnsurer ensurer(os);
        if (os.fragile())
                os << "\\protect";
-       os << "\\underset{" << cell(0) << "}{" << cell(1) << '}';
+       os << "\\underset{" << cell(1) << "}{" << cell(0) << '}';
 }
 
 
 void InsetMathUnderset::normalize(NormalStream & os) const
 {
-       os << "[underset " << cell(0) << ' ' << cell(1) << ']';
+       os << "[underset " << cell(1) << ' ' << cell(0) << ']';
 }
 
 
 void InsetMathUnderset::mathmlize(MathStream & ms) const
 {
-       ms << "<munder accent='false'>" << cell(1) << cell(0) << "</munder>";
+       ms << "<munder accent='false'>" << cell(0) << cell(1) << "</munder>";
 }
 
 
 void InsetMathUnderset::htmlize(HtmlStream & os) const
 {
        os << MTag("span", "class='underset'")
-                << MTag("span") << cell(0) << ETag("span")
-                << MTag("span", "class='bottom'") << cell(1) << ETag("span")
+                << MTag("span") << cell(1) << ETag("span")
+                << MTag("span", "class='bottom'") << cell(0) << ETag("span")
                 << ETag("span");
 }