X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathUnderset.cpp;h=0da62f915535cb8a1ed5736b8de67b0a9aeaf994;hb=573500dd04f154f27318ac5ec469a337f97fe9f0;hp=8a2f4bf02b606973d49a621d9c931814cdda63fd;hpb=ed858d73e57ce7aa89e38c1bc4d799362edb0227;p=lyx.git
diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp
index 8a2f4bf02b..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 {
@@ -26,29 +27,30 @@ Inset * InsetMathUnderset::clone() const
}
-bool InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const
+void InsetMathUnderset::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 = std::max(cell(0).width(), cell(1).width()) + 4;
- dim.asc = cell(1).ascent();
- dim.des = cell(1).descent() + cell(0).height() + 4;
+ Dimension dim0;
+ cell(0).metrics(mi, dim0);
+ dim.wid = max(dim0.width(), dim1.width()) + 4;
+ dim.asc = dim1.ascent();
+ dim.des = dim1.descent() + dim0.height() + 4;
metricsMarkers(dim);
- if (dim_ == dim)
- return false;
- dim_ = dim;
- return true;
}
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);
+ 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.descent() + dim0.ascent() + 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);
}
@@ -75,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) << '}';
}
@@ -92,9 +95,32 @@ void InsetMathUnderset::normalize(NormalStream & os) const
}
+void InsetMathUnderset::mathmlize(MathStream & ms) const
+{
+ ms << "" << cell(1) << cell(0) << "";
+}
+
+
+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("");
+
InsetMathNest::validate(features);
}