X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathOverset.cpp;h=b903662d944cb156b40740aab379ec230533c40c;hb=d85cf3218a14f5b7419dbc6b6796e65ff5dbfc74;hp=2157a623684729cb031b82ee306edf38bc29c700;hpb=f497296c30e6da2f97b16da8ad1c9e96feffb16b;p=lyx.git

diff --git a/src/mathed/InsetMathOverset.cpp b/src/mathed/InsetMathOverset.cpp
index 2157a62368..b903662d94 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,53 +11,55 @@
 #include <config.h>
 
 #include "InsetMathOverset.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 
-#include "cursor.h"
+#include "Cursor.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
+using namespace std;
 
 namespace lyx {
 
-using std::max;
-using std::auto_ptr;
-
-
-auto_ptr<InsetBase> InsetMathOverset::doClone() const
+Inset * InsetMathOverset::clone() const
 {
-	return auto_ptr<InsetBase>(new InsetMathOverset(*this));
+	return new InsetMathOverset(*this);
 }
 
 
-bool InsetMathOverset::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathOverset::metrics(MetricsInfo & mi, Dimension & dim) 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 = 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;
+	metricsMarkers(mi, dim);
 }
 
 
 void InsetMathOverset::draw(PainterInfo & pi, int x, int y) 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);
+	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.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);
 	drawMarkers(pi, x, y);
 }
 
 
-bool InsetMathOverset::idxFirst(LCursor & cur) const
+bool InsetMathOverset::idxFirst(Cursor & cur) const
 {
 	cur.idx() = 1;
 	cur.pos() = 0;
@@ -65,7 +67,7 @@ bool InsetMathOverset::idxFirst(LCursor & cur) const
 }
 
 
-bool InsetMathOverset::idxLast(LCursor & cur) const
+bool InsetMathOverset::idxLast(Cursor & cur) const
 {
 	cur.idx() = 1;
 	cur.pos() = cur.lastpos();
@@ -75,6 +77,9 @@ bool InsetMathOverset::idxLast(LCursor & cur) const
 
 void InsetMathOverset::write(WriteStream & os) const
 {
+	MathEnsurer ensurer(os);
+	if (os.fragile())
+		os << "\\protect";
 	os << "\\overset{" << cell(0) << "}{" << cell(1) << '}';
 }
 
@@ -85,9 +90,31 @@ void InsetMathOverset::normalize(NormalStream & os) const
 }
 
 
+void InsetMathOverset::mathmlize(MathStream & ms) const
+{
+	ms << "<mover accent='false'>" << cell(1) << cell(0) << "</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");
+}
+
+
 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);
 }