Revert "DocBook: make openParTag/closeTag use paragraphs instead of layouts."

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

diff --git a/src/mathed/InsetMathOverset.cpp b/src/mathed/InsetMathOverset.cpp
index cea8840926ae6ef7ccae44dedf55d2668920ebc5..2db26cf4c00983248fcaef9fdfdbf3b03b3bcc0b 100644 (file)
--- a/src/mathed/InsetMathOverset.cpp
+++ b/src/mathed/InsetMathOverset.cpp
@@ -19,6 +19,8 @@
 #include "LaTeXFeatures.h"
 #include "MetricsInfo.h"
 
+#include "support/lassert.h"
+
 using namespace std;
 
 namespace lyx {
@@ -32,14 +34,14 @@ Inset * InsetMathOverset::clone() const
 void InsetMathOverset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
        Changer dummy2 = mi.base.changeEnsureMath();
-       Dimension dim1;
-       cell(1).metrics(mi, dim1);
-       Changer dummy = mi.base.changeFrac();
        Dimension dim0;
        cell(0).metrics(mi, dim0);
-       dim.wid = max(dim0.width(), dim1.wid) + 4;
-       dim.asc = dim1.asc + dim0.height() + 4;
-       dim.des = dim1.des;
+       Changer dummy = mi.base.changeScript();
+       Dimension dim1;
+       cell(1).metrics(mi, dim1);
+       dim.wid = max(dim1.width(), dim0.wid) + 4;
+       dim.asc = dim0.asc + dim1.height() + 4;
+       dim.des = dim0.des;
 }
 
 
@@ -47,19 +49,31 @@ void InsetMathOverset::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.asc - dim0.des - 1;
-       cell(1).draw(pi, m - dim1.wid / 2, y);
-       Changer dummy = pi.base.changeFrac();
-       cell(0).draw(pi, m - dim0.width() / 2, yo);
+       int yo = y - dim0.asc - dim1.des - 1;
+       cell(0).draw(pi, m - dim0.wid / 2, y);
+       Changer dummy = pi.base.changeScript();
+       cell(1).draw(pi, m - dim1.width() / 2, yo);
+}
+
+
+bool InsetMathOverset::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;
 }
 
 
 bool InsetMathOverset::idxFirst(Cursor & cur) const
 {
-       cur.idx() = 1;
+       LASSERT(&cur.inset() == this, return false);
+       cur.idx() = 0;
        cur.pos() = 0;
        return true;
 }
@@ -67,7 +81,8 @@ bool InsetMathOverset::idxFirst(Cursor & cur) const
 
 bool InsetMathOverset::idxLast(Cursor & cur) const
 {
-       cur.idx() = 1;
+       LASSERT(&cur.inset() == this, return false);
+       cur.idx() = 0;
        cur.pos() = cur.lastpos();
        return true;
 }
@@ -78,28 +93,30 @@ void InsetMathOverset::write(WriteStream & os) const
        MathEnsurer ensurer(os);
        if (os.fragile())
                os << "\\protect";
-       os << "\\overset{" << cell(0) << "}{" << cell(1) << '}';
+       os << "\\overset{" << cell(1) << "}{" << cell(0) << '}';
 }
 
 
 void InsetMathOverset::normalize(NormalStream & os) const
 {
-       os << "[overset " << cell(0) << ' ' << cell(1) << ']';
+       os << "[overset " << cell(1) << ' ' << cell(0) << ']';
 }
 
 
 void InsetMathOverset::mathmlize(MathStream & ms) const
 {
-       ms << "<mover accent='false'>" << cell(1) << cell(0) << "</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(0) << ETag("span")
-                << MTag("span") << cell(1) << ETag("span")
-                << ETag("span");
+          << MTag("span", "class='top'") << cell(1) << ETag("span")
+          << MTag("span") << cell(0) << ETag("span")
+          << ETag("span");
 }