X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathUnderset.cpp;h=0da62f915535cb8a1ed5736b8de67b0a9aeaf994;hb=573500dd04f154f27318ac5ec469a337f97fe9f0;hp=7fd57abee36492cd206e283cb4fc225bc2adab79;hpb=f319fdbc2a4c8305d60f176566b818240066cfa9;p=lyx.git

diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp
index 7fd57abee3..0da62f9155 100644
--- a/src/mathed/InsetMathUnderset.cpp
+++ b/src/mathed/InsetMathUnderset.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.
  */
@@ -17,6 +17,7 @@
 #include "Cursor.h"
 #include "LaTeXFeatures.h"
 
+using namespace std;
 
 namespace lyx {
 
@@ -33,12 +34,10 @@ void InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
 	FracChanger dummy(mi.base);
 	Dimension dim0;
 	cell(0).metrics(mi, dim0);
-	dim.wid = std::max(dim0.width(), dim1.width()) + 4;
+	dim.wid = max(dim0.width(), dim1.width()) + 4;
 	dim.asc = dim1.ascent();
 	dim.des = dim1.descent() + dim0.height() + 4;
 	metricsMarkers(dim);
-	// Cache the inset dimension. 
-	setDimCache(mi, dim);
 }
 
 
@@ -78,13 +77,14 @@ bool InsetMathUnderset::idxUpDown(Cursor & cur, bool up) const
 	if (cur.idx() == target)
 		return false;
 	cur.idx() = target;
-	cur.pos() = cur.cell().x2pos(cur.x_target());
+	cur.pos() = cur.cell().x2pos(&cur.bv(), cur.x_target());
 	return true;
 }
 
 
 void InsetMathUnderset::write(WriteStream & os) const
 {
+	MathEnsurer ensurer(os);
 	os << "\\underset{" << cell(0) << "}{" << cell(1) << '}';
 }
 
@@ -95,9 +95,32 @@ void InsetMathUnderset::normalize(NormalStream & os) const
 }
 
 
+void InsetMathUnderset::mathmlize(MathStream & ms) const
+{
+	ms << "<munder accent='false'>" << cell(1) << cell(0) << "</munder>";
+}
+
+
+void InsetMathUnderset::htmlize(HtmlStream & os) const
+{
+	os << MTag("span", "class='underset'")
+		 << MTag("span") << cell(0) << ETag("span")
+		 << MTag("span", "class='bottom'") << cell(1) << ETag("span")
+		 << ETag("span");
+}
+
+
 void InsetMathUnderset::validate(LaTeXFeatures & features) const
 {
-	features.require("amsmath");
+	if (features.runparams().isLaTeX())
+		features.require("amsmath");
+	else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+		features.addPreambleSnippet("<style type=\"text/css\">\n"
+			"span.underset{display: inline-block; vertical-align: top; text-align:center;}\n"
+			"span.underset span {display: block;}\n"
+			"span.bottom{font-size: 66%;}\n"
+			"</style>");
+
 	InsetMathNest::validate(features);
 }