X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathUnderset.cpp;h=b8c5d14625dd81f097ac06196867f49c66b6efe7;hb=c8230ab0d0a919530c43c29395f4d9961498bf15;hp=a447cac7f7959eb37f10a377ff38deab2ef85c22;hpb=f29db33e695d6cd8dd3dd33c62832ec681df2675;p=lyx.git diff --git a/src/mathed/InsetMathUnderset.cpp b/src/mathed/InsetMathUnderset.cpp index a447cac7f7..b8c5d14625 100644 --- a/src/mathed/InsetMathUnderset.cpp +++ b/src/mathed/InsetMathUnderset.cpp @@ -11,11 +11,14 @@ #include #include "InsetMathUnderset.h" + #include "MathData.h" #include "MathStream.h" #include "Cursor.h" #include "LaTeXFeatures.h" +#include "MetricsInfo.h" + using namespace std; @@ -29,29 +32,29 @@ Inset * InsetMathUnderset::clone() const void InsetMathUnderset::metrics(MetricsInfo & mi, Dimension & dim) const { + Changer dummy2 = mi.base.changeEnsureMath(); Dimension dim1; cell(1).metrics(mi, dim1); - FracChanger dummy(mi.base); + Changer dummy = mi.base.changeFrac(); 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); } void InsetMathUnderset::draw(PainterInfo & pi, int x, int y) const { + Changer dummy2 = pi.base.changeEnsureMath(); 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); + Changer dummy = pi.base.changeFrac(); cell(0).draw(pi, m - dim0.width() / 2, yo); - drawMarkers(pi, x, y); } @@ -85,6 +88,8 @@ bool InsetMathUnderset::idxUpDown(Cursor & cur, bool up) const void InsetMathUnderset::write(WriteStream & os) const { MathEnsurer ensurer(os); + if (os.fragile()) + os << "\\protect"; os << "\\underset{" << cell(0) << "}{" << cell(1) << '}'; } @@ -101,9 +106,25 @@ void InsetMathUnderset::mathmlize(MathStream & ms) const } +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.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); }