X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathStackrel.cpp;h=a7cb00b3228c362e79ed07c2aa2418f55ce5a100;hb=b9b6c1278287dcff75d3da61ad269bf5c4ad130c;hp=c45ae2c78a53521f4827d6ee2d1cc75c0e487788;hpb=32871c1284f15265f652ff01c438e539a7c8181f;p=lyx.git

diff --git a/src/mathed/InsetMathStackrel.cpp b/src/mathed/InsetMathStackrel.cpp
index c45ae2c78a..a7cb00b322 100644
--- a/src/mathed/InsetMathStackrel.cpp
+++ b/src/mathed/InsetMathStackrel.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,56 +11,56 @@
 #include <config.h>
 
 #include "InsetMathStackrel.h"
+
+#include "LaTeXFeatures.h"
 #include "MathData.h"
 #include "MathStream.h"
 
+using namespace std;
 
 namespace lyx {
 
-
-using std::max;
-using std::auto_ptr;
-
-
-InsetMathStackrel::InsetMathStackrel()
+InsetMathStackrel::InsetMathStackrel(Buffer * buf) : InsetMathFracBase(buf)
 {}
 
 
-auto_ptr<Inset> InsetMathStackrel::doClone() const
+Inset * InsetMathStackrel::clone() const
 {
-	return auto_ptr<Inset>(new InsetMathStackrel(*this));
+	return new InsetMathStackrel(*this);
 }
 
 
-bool InsetMathStackrel::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathStackrel::metrics(MetricsInfo & mi, Dimension & dim) const
 {
-	cell(1).metrics(mi);
+	Dimension dim1;
+	cell(1).metrics(mi, dim1);
 	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();
+	Dimension dim0;
+	cell(0).metrics(mi, dim0);
+	dim.wid = max(dim0.width(), dim1.width()) + 4;
+	dim.asc = dim1.ascent() + dim0.height() + 4;
+	dim.des = dim1.descent();
 	metricsMarkers(dim);
-	if (dim_ == dim)
-		return false;
-	dim_ = dim;
-	return true;
 }
 
 
 void InsetMathStackrel::draw(PainterInfo & pi, int x, int y) const
 {
-	int m  = x + dim_.width() / 2;
-	int yo = y - cell(1).ascent() - cell(0).descent() - 1;
-	cell(1).draw(pi, m - cell(1).width() / 2, y);
+	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);
 	FracChanger dummy(pi.base);
-	cell(0).draw(pi, m - cell(0).width() / 2, yo);
+	cell(0).draw(pi, m - dim0.width() / 2, yo);
 	drawMarkers(pi, x, y);
 }
 
 
 void InsetMathStackrel::write(WriteStream & os) const
 {
+	MathEnsurer ensurer(os);
 	os << "\\stackrel{" << cell(0) << "}{" << cell(1) << '}';
 }
 
@@ -71,4 +71,33 @@ void InsetMathStackrel::normalize(NormalStream & os) const
 }
 
 
+void InsetMathStackrel::mathmlize(MathStream & ms) const
+{
+	ms << "<mover accent='false'>" << cell(1) << cell(0) << "</mover>";
+}
+
+
+void InsetMathStackrel::htmlize(HtmlStream & os) const
+{
+	// 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")
+		 << ETag("span");
+}
+
+
+void InsetMathStackrel::validate(LaTeXFeatures & features) const
+{
+	// from overset
+	if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		features.addPreambleSnippet("<style type=\"text/css\">\n"
+			"span.overset{display: inline-block; vertical-align: bottom; text-align:center;}\n"
+			"span.overset span {display: block;}\n"
+			"span.top{font-size: 66%;}\n"
+			"</style>");
+
+	InsetMathNest::validate(features);
+}
+
 } // namespace lyx