X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathUnderset.cpp;h=832631dfa3a8cdeb69f3c940428b80dd93398397;hb=38c2cde0d8695ac5287bae218c4a33a2acf18ef8;hp=87392bd4e0b07f5b6c1173b3c169186b1a2eb73f;hpb=32871c1284f15265f652ff01c438e539a7c8181f;p=lyx.git

diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp
index 87392bd4e0..832631dfa3 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.
  */
@@ -11,56 +11,58 @@
 #include <config.h>
 
 #include "InsetMathUnderset.h"
+
 #include "MathData.h"
 #include "MathStream.h"
 
 #include "Cursor.h"
 #include "LaTeXFeatures.h"
+#include "MetricsInfo.h"
 
+#include "support/lassert.h"
 
-namespace lyx {
-
-using std::max;
-using std::auto_ptr;
-
+using namespace std;
 
+namespace lyx {
 
-auto_ptr<Inset> InsetMathUnderset::doClone() const
+Inset * InsetMathUnderset::clone() const
 {
-	return auto_ptr<Inset>(new InsetMathUnderset(*this));
+	return new InsetMathUnderset(*this);
 }
 
 
-bool InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathUnderset::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();
-	dim.des = cell(1).descent() + cell(0).height() + 4;
-	metricsMarkers(dim);
-	if (dim_ == dim)
-		return false;
-	dim_ = dim;
-	return true;
+	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.width()) + 4;
+	dim.asc = dim0.ascent();
+	dim.des = dim0.descent() + dim1.height() + 4;
 }
 
 
 void InsetMathUnderset::draw(PainterInfo & pi, int x, int y) const
 {
-	int m  = x + width() / 2;
-	int yo = y + cell(1).descent() + cell(0).ascent() + 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);
+	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.descent() + dim1.ascent() + 1;
+	cell(0).draw(pi, m - dim0.width() / 2, y);
+	Changer dummy = pi.base.changeScript();
+	cell(1).draw(pi, m - dim1.width() / 2, yo);
 }
 
 
 bool InsetMathUnderset::idxFirst(Cursor & cur) const
 {
-	cur.idx() = 1;
+	LASSERT(&cur.inset() == this, return false);
+	cur.idx() = 0;
 	cur.pos() = 0;
 	return true;
 }
@@ -68,38 +70,53 @@ bool InsetMathUnderset::idxFirst(Cursor & cur) const
 
 bool InsetMathUnderset::idxLast(Cursor & cur) const
 {
-	cur.idx() = 1;
+	LASSERT(&cur.inset() == this, return false);
+	cur.idx() = 0;
 	cur.pos() = cur.lastpos();
 	return true;
 }
 
 
-bool InsetMathUnderset::idxUpDown(Cursor & cur, bool up) const
+void InsetMathUnderset::write(WriteStream & os) const
 {
-	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.x_target());
-	return true;
+	MathEnsurer ensurer(os);
+	if (os.fragile())
+		os << "\\protect";
+	os << "\\underset{" << cell(1) << "}{" << cell(0) << '}';
 }
 
 
-void InsetMathUnderset::write(WriteStream & os) const
+void InsetMathUnderset::normalize(NormalStream & os) const
 {
-	os << "\\underset{" << cell(0) << "}{" << cell(1) << '}';
+	os << "[underset " << cell(1) << ' ' << cell(0) << ']';
 }
 
 
-void InsetMathUnderset::normalize(NormalStream & os) const
+void InsetMathUnderset::mathmlize(MathStream & ms) const
+{
+	ms << "<munder accent='false'>" << cell(0) << cell(1) << "</munder>";
+}
+
+
+void InsetMathUnderset::htmlize(HtmlStream & os) const
 {
-	os << "[underset " << cell(0) << ' ' << cell(1) << ']';
+	os << MTag("span", "class='underset'")
+		 << MTag("span") << cell(1) << ETag("span")
+		 << MTag("span", "class='bottom'") << cell(0) << 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.addCSSSnippet(
+			"span.underset{display: inline-block; vertical-align: top; text-align:center;}\n"
+			"span.underset span {display: block;}\n"
+			"span.bottom{font-size: 66%;}");
+
 	InsetMathNest::validate(features);
 }