X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathXArrow.cpp;h=55f2665dad72dc7abc04a55f1f1fc0fedc66bc28;hb=a68e5b777487b495feeefa53700834ecec6ec196;hp=b91c4ce21dbc43d7bec686e75b54afa323326ed1;hpb=94a9c127e325025016a5e9dcebaa8f9b3b31b544;p=lyx.git diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp index b91c4ce21d..55f2665dad 100644 --- a/src/mathed/InsetMathXArrow.cpp +++ b/src/mathed/InsetMathXArrow.cpp @@ -10,13 +10,20 @@ #include +#include "support/lassert.h" + #include "InsetMathXArrow.h" + #include "MathData.h" #include "MathStream.h" #include "MathStream.h" #include "MathSupport.h" #include "LaTeXFeatures.h" +#include "MetricsInfo.h" + + +#include using namespace std; @@ -36,7 +43,8 @@ Inset * InsetMathXArrow::clone() const void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const { - ScriptChanger dummy(mi.base); + Changer dummy2 = mi.base.changeEnsureMath(); + Changer dummy = mi.base.changeScript(); Dimension dim0; cell(0).metrics(mi, dim0); Dimension dim1; @@ -44,21 +52,20 @@ void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const dim.wid = max(dim0.width(), dim1.width()) + 10; dim.asc = dim0.height() + 10; dim.des = dim1.height(); - metricsMarkers(dim); } void InsetMathXArrow::draw(PainterInfo & pi, int x, int y) const { - ScriptChanger dummy(pi.base); + Changer dummy2 = pi.base.changeEnsureMath(); + Changer dummy = pi.base.changeScript(); Dimension const dim = dimension(*pi.base.bv); Dimension const & dim0 = cell(0).dimension(*pi.base.bv); // center the cells with the decoration cell(0).draw(pi, x + dim.width()/2 - dim0.width()/2, y - 10); Dimension const & dim1 = cell(1).dimension(*pi.base.bv); cell(1).draw(pi, x + dim.width()/2 - dim1.width()/2, y + dim1.height()); - mathed_draw_deco(pi, x + 1, y - 7, dim.wid - 2, 5, name_); - drawMarkers(pi, x, y); + mathed_draw_deco(pi, x, y - 7, dim.wid, 5, name_); } @@ -81,7 +88,7 @@ void InsetMathXArrow::normalize(NormalStream & os) const void InsetMathXArrow::mathmlize(MathStream & ms) const { char const * arrow; - + if (name_ == "xleftarrow") arrow = "←"; else if (name_ == "xrightarrow") @@ -112,6 +119,10 @@ void InsetMathXArrow::mathmlize(MathStream & ms) const arrow = "⇌"; else if (name_ == "xmapsto") arrow = "↦"; + else { + lyxerr << "mathmlize conversion for '" << name_ << "' not implemented" << endl; + LASSERT(false, arrow = "→"); + } ms << "" << arrow << cell(1) << cell(0) << ""; @@ -152,6 +163,10 @@ void InsetMathXArrow::htmlize(HtmlStream & os) const arrow = "⇌"; else if (name_ == "xmapsto") arrow = "↦"; + else { + lyxerr << "htmlize conversion for '" << name_ << "' not implemented" << endl; + LASSERT(false, arrow = "→"); + } os << MTag("span", "class='xarrow'") << MTag("span", "class='xatop'") << cell(0) << ETag("span") << MTag("span", "class='xabottom'") << arrow << ETag("span")