X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathStackrel.cpp;h=5c0c2dcd4b0238999a2464b88902f5f1ee8f722c;hb=d9082639080b9de993742bd352f92e5183058cf5;hp=d43e466964171395f0344bd8a016e6b65ed3e0da;hpb=e2bc7ffae3eb387661064be8b9dc927742f9e7e8;p=lyx.git

diff --git a/src/mathed/InsetMathStackrel.cpp b/src/mathed/InsetMathStackrel.cpp
index d43e466964..5c0c2dcd4b 100644
--- a/src/mathed/InsetMathStackrel.cpp
+++ b/src/mathed/InsetMathStackrel.cpp
@@ -12,11 +12,15 @@
 
 #include "InsetMathStackrel.h"
 
-#include "Cursor.h"
-#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
 
+#include "Cursor.h"
+#include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
+
+#include "support/lassert.h"
+
 using namespace std;
 
 namespace lyx {
@@ -34,15 +38,17 @@ Inset * InsetMathStackrel::clone() const
 
 bool InsetMathStackrel::idxUpDown(Cursor & cur, bool up) const
 {
+	idx_type const npos = 1234; // impossible number
+	idx_type target = npos;
 	if (up) {
-		if (cur.idx() == 0)
-			return false;
+		idx_type const targets[] = { 1, npos, 0 };
+		target = targets[cur.idx()];
 	} else {
-		if (cur.idx() + 1 ==  nargs())
-			return false;
+		idx_type const targets[] = { 2, 0, npos };
+		target = targets[cur.idx()];
 	}
-	InsetMath::idx_type target = up ? cur.idx() - 1 : cur.idx() + 1;
-	if (cur.idx() == target)
+
+	if (target == npos || target == nargs())
 		return false;
 	cur.idx() = target;
 	cur.pos() = cell(target).x2pos(&cur.bv(), cur.x_target());
@@ -50,72 +56,101 @@ bool InsetMathStackrel::idxUpDown(Cursor & cur, bool up) const
 }
 
 
+bool InsetMathStackrel::idxFirst(Cursor & cur) const
+{
+	LASSERT(&cur.inset() == this, return false);
+	cur.idx() = 0;
+	cur.pos() = 0;
+	return true;
+}
+
+
+bool InsetMathStackrel::idxLast(Cursor & cur) const
+{
+	LASSERT(&cur.inset() == this, return false);
+	cur.idx() = 0;
+	cur.pos() = cur.lastpos();
+	return true;
+}
+
+
+MathClass InsetMathStackrel::mathClass() const
+{
+	// FIXME: update this when/if \stackbin is supported
+	return MC_REL;
+}
+
+
 void InsetMathStackrel::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);
+	Changer dummy = mi.base.changeScript();
+	Dimension dim1;
+	cell(1).metrics(mi, dim1);
 	if (nargs() > 2) {
 		Dimension dim2;
 		cell(2).metrics(mi, dim2);
-		dim.wid = max(max(dim0.width(), dim1.width()), dim2.width()) + 4;
-		dim.asc = dim1.ascent() + dim0.height() + 4;
-		dim.des = dim1.descent() + dim2.height() + dim2.descent() + 1;
+		dim.wid = max(max(dim1.width(), dim0.width()), dim2.width()) + 4;
+		dim.asc = dim0.ascent() + dim1.height() + 4;
+		dim.des = dim0.descent() + dim2.height() + dim2.descent() + 1;
 	} else {
-		dim.wid = max(dim0.width(), dim1.width()) + 4;
-		dim.asc = dim1.ascent() + dim0.height() + 4;
-		dim.des = dim1.descent();
+		dim.wid = max(dim1.width(), dim0.width()) + 4;
+		dim.asc = dim0.ascent() + dim1.height() + 4;
+		dim.des = dim0.descent();
 	}
-	metricsMarkers(dim);
 }
 
 
 void InsetMathStackrel::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);
 	int m  = x + dim.width() / 2;
-	int yo = y - dim1.ascent() - dim0.descent() - 1;
-	cell(1).draw(pi, m - dim1.width() / 2, y);
-	Changer dummy = pi.base.changeFrac();
-	cell(0).draw(pi, m - dim0.width() / 2, yo);
+	int yo = y - dim0.ascent() - dim1.descent() - 1;
+	cell(0).draw(pi, m - dim0.width() / 2, y);
+	Changer dummy = pi.base.changeScript();
+	cell(1).draw(pi, m - dim1.width() / 2, yo);
 	if (nargs() > 2) {
 		Dimension const & dim2 = cell(2).dimension(*pi.base.bv);
-		int y2 = y + dim1.descent() + dim2.ascent() + 1;
+		int y2 = y + dim0.descent() + dim2.ascent() + 1;
 		cell(2).draw(pi, m - dim2.width() / 2, y2);
 	}
-	drawMarkers(pi, x, y);
 }
 
 
-void InsetMathStackrel::write(WriteStream & os) const
+void InsetMathStackrel::write(TeXMathStream & os) const
 {
 	MathEnsurer ensurer(os);
 	os << "\\stackrel";
 	if (nargs() > 2)
 		os << '[' << cell(2) << ']';
-	os << '{' << cell(0) << "}{" << cell(1) << '}';
+	os << '{' << cell(1) << "}{" << cell(0) << '}';
 }
 
 
 void InsetMathStackrel::normalize(NormalStream & os) const
 {
-	os << "[stackrel " << cell(0) << ' ' << cell(1);
+	os << "[stackrel " << cell(1) << ' ' << cell(0);
 	if (nargs() > 2)
 		os << ' ' << cell(2);
 	os << ']';
 }
 
 
-void InsetMathStackrel::mathmlize(MathStream & ms) const
+void InsetMathStackrel::mathmlize(MathMLStream & ms) const
 {
 	if (nargs() > 2)
-		ms << "<munderover>" << cell(1) << cell(2) << cell(0) << "</munderover>";
+		ms << "<" << from_ascii(ms.namespacedTag("munderover")) << ">"
+		   << cell(0) << cell(2) << cell(1)
+		   << "</" << from_ascii(ms.namespacedTag("munderover")) << ">";
 	else
-		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")) << ">";
 }
 
 
@@ -123,14 +158,14 @@ void InsetMathStackrel::htmlize(HtmlStream & os) const
 {
 	if (nargs() > 2) {
 		os << MTag("span", "class='underoverset'")
-		   << MTag("span", "class='top'") << cell(0) << ETag("span")
-		   << MTag("span") << cell(1) << ETag("span")
+		   << MTag("span", "class='top'") << cell(1) << ETag("span")
+		   << MTag("span") << cell(0) << ETag("span")
 		   << MTag("span", "class='bottom'") << cell(2) << ETag("span");
 	} else {
 		// at the moment, this is exactly the same as overset
 		os << MTag("span", "class='overset'")
-		   << MTag("span", "class='top'") << cell(0) << ETag("span")
-		   << MTag("span") << cell(1) << ETag("span");
+		   << MTag("span", "class='top'") << cell(1) << ETag("span")
+		   << MTag("span") << cell(0) << ETag("span");
 	}
 	os << ETag("span");
 }