X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathSqrt.cpp;h=7416c332f17593a6af750a8c903af1588ee03545;hb=a68e5b777487b495feeefa53700834ecec6ec196;hp=e27475ed1484a0575e088870abf02e864deda0d5;hpb=32ee4c13cf3deb6dc7eb0b25e3dee2efd8d99967;p=lyx.git diff --git a/src/mathed/InsetMathSqrt.cpp b/src/mathed/InsetMathSqrt.cpp index e27475ed14..7416c332f1 100644 --- a/src/mathed/InsetMathSqrt.cpp +++ b/src/mathed/InsetMathSqrt.cpp @@ -12,10 +12,15 @@ #include "InsetMathSqrt.h" -#include "LaTeXFeatures.h" +#include "InsetMathRoot.h" #include "MathData.h" #include "MathStream.h" +#include "MathSupport.h" + +#include "LaTeXFeatures.h" +#include "MetricsInfo.h" #include "TextPainter.h" + #include "frontends/Painter.h" @@ -34,29 +39,13 @@ Inset * InsetMathSqrt::clone() const void InsetMathSqrt::metrics(MetricsInfo & mi, Dimension & dim) const { - cell(0).metrics(mi, dim); - dim.asc += 4; - dim.des += 2; - dim.wid += 12; - metricsMarkers(dim); + mathed_root_metrics(mi, cell(0), nullptr, dim); } void InsetMathSqrt::draw(PainterInfo & pi, int x, int y) const { - cell(0).draw(pi, x + 10, y); - Dimension const dim = dimension(*pi.base.bv); - int const a = dim.ascent(); - int const d = dim.descent(); - int xp[3]; - int yp[3]; - pi.pain.line(x + dim.width(), y - a + 1, - x + 8, y - a + 1, Color_math); - xp[0] = x + 8; yp[0] = y - a + 1; - xp[1] = x + 5; yp[1] = y + d - 1; - xp[2] = x; yp[2] = y + (d - a)/2; - pi.pain.lines(xp, yp, 3, Color_math); - drawMarkers(pi, x, y); + mathed_draw_root(pi, x, y, cell(0), nullptr, dimension(*pi.base.bv)); } @@ -118,8 +107,8 @@ void InsetMathSqrt::mathmlize(MathStream & os) const void InsetMathSqrt::htmlize(HtmlStream & os) const { os << MTag("span", "class='sqrt'") - << from_ascii("√") - << MTag("span", "class='sqrtof'") << cell(0) << ETag("span") + << from_ascii("√") + << MTag("span", "class='sqrtof'") << cell(0) << ETag("span") << ETag("span"); } @@ -127,9 +116,8 @@ void InsetMathSqrt::htmlize(HtmlStream & os) const void InsetMathSqrt::validate(LaTeXFeatures & features) const { if (features.runparams().math_flavor == OutputParams::MathAsHTML) - features.addPreambleSnippet(""); + features.addCSSSnippet("span.sqrtof{border-top: thin solid black;}"); + InsetMathNest::validate(features); } } // namespace lyx