X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathXArrow.cpp;h=55f2665dad72dc7abc04a55f1f1fc0fedc66bc28;hb=c7d29be153debac82e3d2e8865fcc849f0a5f40d;hp=dbd16ac31c53348a2e74c761fa462acc8eb130a7;hpb=f497296c30e6da2f97b16da8ad1c9e96feffb16b;p=lyx.git diff --git a/src/mathed/InsetMathXArrow.cpp b/src/mathed/InsetMathXArrow.cpp index dbd16ac31c..55f2665dad 100644 --- a/src/mathed/InsetMathXArrow.cpp +++ b/src/mathed/InsetMathXArrow.cpp @@ -3,69 +3,77 @@ * 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. */ #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" -namespace lyx { +#include -using std::string; -using std::auto_ptr; +using namespace std; +namespace lyx { -InsetMathXArrow::InsetMathXArrow(docstring const & name) - : InsetMathFracBase(), name_(name) + +InsetMathXArrow::InsetMathXArrow(Buffer * buf, docstring const & name) + : InsetMathFracBase(buf), name_(name) {} -auto_ptr InsetMathXArrow::doClone() const +Inset * InsetMathXArrow::clone() const { - return auto_ptr(new InsetMathXArrow(*this)); + return new InsetMathXArrow(*this); } -bool InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const +void InsetMathXArrow::metrics(MetricsInfo & mi, Dimension & dim) const { - ScriptChanger dummy(mi.base); - cell(0).metrics(mi); - cell(1).metrics(mi); - dim.wid = std::max(cell(0).width(), cell(1).width()) + 10; - dim.asc = cell(0).height() + 10; - dim.des = cell(1).height(); - metricsMarkers(dim); - if (dim_ == dim) - return false; - dim_ = dim; - return true; + Changer dummy2 = mi.base.changeEnsureMath(); + Changer dummy = mi.base.changeScript(); + Dimension dim0; + cell(0).metrics(mi, dim0); + Dimension dim1; + cell(1).metrics(mi, dim1); + dim.wid = max(dim0.width(), dim1.width()) + 10; + dim.asc = dim0.height() + 10; + dim.des = dim1.height(); } void InsetMathXArrow::draw(PainterInfo & pi, int x, int y) const { - ScriptChanger dummy(pi.base); - cell(0).draw(pi, x + 5, y - 10); - cell(1).draw(pi, x + 5, y + cell(1).height()); - mathed_draw_deco(pi, x + 1, y - 7, width() - 2, 5, name_); - drawMarkers(pi, x, y); + 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, y - 7, dim.wid, 5, name_); } void InsetMathXArrow::write(WriteStream & os) const { + MathEnsurer ensurer(os); os << '\\' << name_; - if (cell(1).size()) + if (!cell(1).empty()) os << '[' << cell(1) << ']'; os << '{' << cell(0) << '}'; } @@ -77,9 +85,107 @@ void InsetMathXArrow::normalize(NormalStream & os) const } +void InsetMathXArrow::mathmlize(MathStream & ms) const +{ + char const * arrow; + + if (name_ == "xleftarrow") + arrow = "←"; + else if (name_ == "xrightarrow") + arrow = "→"; + else if (name_ == "xhookleftarrow") + arrow = "↩"; + else if (name_ == "xhookrightarrow") + arrow = "↪"; + else if (name_ == "xLeftarrow") + arrow = "⇐"; + else if (name_ == "xRightarrow") + arrow = "⇒"; + else if (name_ == "xleftrightarrow") + arrow = "↔"; + else if (name_ == "xLeftrightarrow") + arrow = "⇔"; + else if (name_ == "xleftharpoondown") + arrow = "↽"; + else if (name_ == "xleftharpoonup") + arrow = "↼"; + else if (name_ == "xleftrightharpoons") + arrow = "⇋"; + else if (name_ == "xrightharpoondown") + arrow = "⇁"; + else if (name_ == "xrightharpoonup") + arrow = "⇀"; + else if (name_ == "xrightleftharpoons") + arrow = "⇌"; + else if (name_ == "xmapsto") + arrow = "↦"; + else { + lyxerr << "mathmlize conversion for '" << name_ << "' not implemented" << endl; + LASSERT(false, arrow = "→"); + } + ms << "" + << arrow << cell(1) << cell(0) + << ""; +} + + +void InsetMathXArrow::htmlize(HtmlStream & os) const +{ + char const * arrow; + + if (name_ == "xleftarrow") + arrow = "←"; + else if (name_ == "xrightarrow") + arrow = "→"; + else if (name_ == "xhookleftarrow") + arrow = "↩"; + else if (name_ == "xhookrightarrow") + arrow = "↪"; + else if (name_ == "xLeftarrow") + arrow = "⇐"; + else if (name_ == "xRightarrow") + arrow = "⇒"; + else if (name_ == "xleftrightarrow") + arrow = "↔"; + else if (name_ == "xLeftrightarrow") + arrow = "⇔"; + else if (name_ == "xleftharpoondown") + arrow = "↽"; + else if (name_ == "xleftharpoonup") + arrow = "↼"; + else if (name_ == "xleftrightharpoons") + arrow = "⇋"; + else if (name_ == "xrightharpoondown") + arrow = "⇁"; + else if (name_ == "xrightharpoonup") + arrow = "⇀"; + else if (name_ == "xrightleftharpoons") + 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") + << ETag("span"); +} + + void InsetMathXArrow::validate(LaTeXFeatures & features) const { - features.require("amsmath"); + if (name_ == "xleftarrow" || name_ == "xrightarrow") + features.require("amsmath"); + else + features.require("mathtools"); + if (features.runparams().math_flavor == OutputParams::MathAsHTML) + // CSS adapted from eLyXer + features.addCSSSnippet( + "span.xarrow{display: inline-block; vertical-align: middle; text-align:center;}\n" + "span.xatop{display: block;}\n" + "span.xabottom{display: block;}"); InsetMathNest::validate(features); }