X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathOverset.cpp;h=2db26cf4c00983248fcaef9fdfdbf3b03b3bcc0b;hb=21c92c8a129b5f3ff56de33bf2941a25967cffbb;hp=15727f90861eacda67bca36bb5d1ad6699d366c8;hpb=31059d1741933d95403e7f07ed033cae482f778b;p=lyx.git

diff --git a/src/mathed/InsetMathOverset.cpp b/src/mathed/InsetMathOverset.cpp
index 15727f9086..2db26cf4c0 100644
--- a/src/mathed/InsetMathOverset.cpp
+++ b/src/mathed/InsetMathOverset.cpp
@@ -3,7 +3,7 @@
  * This file is part of LyX, the document processor.
  * Licence details can be found in the file COPYING.
  *
- * \author André Pönitz
+ * \author André Pönitz
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -11,55 +11,69 @@
 #include <config.h>
 
 #include "InsetMathOverset.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 {
 
-using std::max;
-using std::auto_ptr;
+Inset * InsetMathOverset::clone() const
+{
+	return new InsetMathOverset(*this);
+}
 
 
-auto_ptr<InsetBase> InsetMathOverset::doClone() const
+void InsetMathOverset::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	return auto_ptr<InsetBase>(new InsetMathOverset(*this));
+	Changer dummy2 = mi.base.changeEnsureMath();
+	Dimension dim0;
+	cell(0).metrics(mi, dim0);
+	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;
 }
 
 
-bool InsetMathOverset::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathOverset::draw(PainterInfo & pi, int x, int y) const
 {
-	cell(1).metrics(mi);
-	FracChanger dummy(mi.base);
-	cell(0).metrics(mi);
-	dim.wid = max(cell(0).width(), cell(1).width()) + 4;
-	dim.asc = cell(1).ascent() + cell(0).height() + 4;
-	dim.des = cell(1).descent();
-	metricsMarkers(dim);
-	if (dim_ == dim)
-		return false;
-	dim_ = dim;
-	return true;
+	Changer dummy2 = pi.base.changeEnsureMath();
+	Dimension const dim = 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 - 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);
 }
 
 
-void InsetMathOverset::draw(PainterInfo & pi, int x, int y) const
+bool InsetMathOverset::idxUpDown(Cursor & cur, bool up) const
 {
-	int m  = x + width() / 2;
-	int yo = y - cell(1).ascent() + cell(0).descent() - 1;
-	cell(1).draw(pi, m - cell(1).width() / 2, y);
-	FracChanger dummy(pi.base);
-	cell(0).draw(pi, m - cell(0).width() / 2, yo);
-	drawMarkers(pi, x, y);
+	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;
 }
@@ -75,19 +90,46 @@ bool InsetMathOverset::idxLast(Cursor & cur) const
 
 void InsetMathOverset::write(WriteStream & os) const
 {
-	os << "\\overset{" << cell(0) << "}{" << cell(1) << '}';
+	MathEnsurer ensurer(os);
+	if (os.fragile())
+		os << "\\protect";
+	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 << "<" << 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");
 }
 
 
 void InsetMathOverset::validate(LaTeXFeatures & features) const
 {
-	features.require("amsmath");
+	if (features.runparams().isLaTeX())
+		features.require("amsmath");
+	else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		features.addCSSSnippet(
+			"span.overset{display: inline-block; vertical-align: bottom; text-align:center;}\n"
+			"span.overset span {display: block;}\n"
+			"span.top{font-size: 66%;}");
+
 	InsetMathNest::validate(features);
 }