X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathOverset.cpp;h=cf7d6d3feb28669036a297976a08c16f981b8a5f;hb=573500dd04f154f27318ac5ec469a337f97fe9f0;hp=3cbf7a28c4914cb4d91afb70483993e0711a3827;hpb=237c132c1e6fc720b87f2fea6deb18a8395cbe0a;p=lyx.git
diff --git a/src/mathed/InsetMathOverset.cpp b/src/mathed/InsetMathOverset.cpp
index 3cbf7a28c4..cf7d6d3feb 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.
*/
@@ -17,6 +17,7 @@
#include "Cursor.h"
#include "LaTeXFeatures.h"
+using namespace std;
namespace lyx {
@@ -28,24 +29,28 @@ Inset * InsetMathOverset::clone() const
void InsetMathOverset::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() + cell(0).height() + 4;
- dim.des = cell(1).descent();
+ 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(dim);
- dim_ = dim;
}
void InsetMathOverset::draw(PainterInfo & pi, int x, int y) const
{
- int m = x + dim_.wid / 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.wid / 2;
+ int yo = y - dim1.asc - dim0.des - 1;
+ cell(1).draw(pi, m - dim1.wid / 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);
}
@@ -68,6 +73,7 @@ bool InsetMathOverset::idxLast(Cursor & cur) const
void InsetMathOverset::write(WriteStream & os) const
{
+ MathEnsurer ensurer(os);
os << "\\overset{" << cell(0) << "}{" << cell(1) << '}';
}
@@ -78,9 +84,32 @@ void InsetMathOverset::normalize(NormalStream & os) const
}
+void InsetMathOverset::mathmlize(MathStream & ms) const
+{
+ ms << "" << cell(1) << cell(0) << "";
+}
+
+
+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.addPreambleSnippet("");
+
InsetMathNest::validate(features);
}