X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fmathed%2FInsetMathFrac.cpp;h=11d24469db1c09b752105035e8a1951186a2fcbb;hb=48b09463dd23e64fab605553a91542198e8361e4;hp=adf078643258b39d1c183ef99e13d982d929779c;hpb=5ddc612b735317d5b22553a63aad7879503e3950;p=lyx.git diff --git a/src/mathed/InsetMathFrac.cpp b/src/mathed/InsetMathFrac.cpp index adf0786432..11d24469db 100644 --- a/src/mathed/InsetMathFrac.cpp +++ b/src/mathed/InsetMathFrac.cpp @@ -4,7 +4,8 @@ * Licence details can be found in the file COPYING. * * \author Alejandro Aguilar Sierra - * \author André Pönitz + * \author André Pönitz + * \author Uwe Stöhr * * Full author contact details are available in file CREDITS. */ @@ -18,10 +19,12 @@ #include "MathData.h" #include "MathStream.h" #include "MathSupport.h" +#include "MetricsInfo.h" #include "TextPainter.h" #include "frontends/Painter.h" +using namespace std; namespace lyx { @@ -32,18 +35,20 @@ namespace lyx { ///////////////////////////////////////////////////////////////////// -InsetMathFracBase::InsetMathFracBase(idx_type ncells) - : InsetMathNest(ncells) +InsetMathFracBase::InsetMathFracBase(Buffer * buf, idx_type ncells) + : InsetMathNest(buf, ncells) {} bool InsetMathFracBase::idxUpDown(Cursor & cur, bool up) const { - InsetMath::idx_type target = !up; // up ? 0 : 1, since upper cell has idx 0 + // If we only have one cell, target = 0, otherwise + // target = up ? 0 : 1, since upper cell has idx 0 + InsetMath::idx_type target = nargs() > 1 ? !up : 0; if (cur.idx() == target) return false; cur.idx() = target; - cur.pos() = cell(target).x2pos(cur.x_target()); + cur.pos() = cell(target).x2pos(&cur.bv(), cur.x_target()); return true; } @@ -56,8 +61,8 @@ bool InsetMathFracBase::idxUpDown(Cursor & cur, bool up) const ///////////////////////////////////////////////////////////////////// -InsetMathFrac::InsetMathFrac(Kind kind, InsetMath::idx_type ncells) - : InsetMathFracBase(ncells), kind_(kind) +InsetMathFrac::InsetMathFrac(Buffer * buf, Kind kind, InsetMath::idx_type ncells) + : InsetMathFracBase(buf, ncells), kind_(kind) {} @@ -79,7 +84,7 @@ InsetMathFrac const * InsetMathFrac::asFracInset() const } -bool InsetMathFrac::idxRight(Cursor & cur) const +bool InsetMathFrac::idxForward(Cursor & cur) const { InsetMath::idx_type target = 0; if (kind_ == UNIT || (kind_ == UNITFRAC && nargs() == 3)) { @@ -92,12 +97,12 @@ bool InsetMathFrac::idxRight(Cursor & cur) const if (cur.idx() == target) return false; cur.idx() = target; - cur.pos() = cell(target).x2pos(cur.x_target()); + cur.pos() = cell(target).x2pos(&cur.bv(), cur.x_target()); return true; } -bool InsetMathFrac::idxLeft(Cursor & cur) const +bool InsetMathFrac::idxBackward(Cursor & cur) const { InsetMath::idx_type target = 0; if (kind_ == UNIT || (kind_ == UNITFRAC && nargs() == 3)) { @@ -110,7 +115,7 @@ bool InsetMathFrac::idxLeft(Cursor & cur) const if (cur.idx() == target) return false; cur.idx() = target; - cur.pos() = cell(target).x2pos(cur.x_target()); + cur.pos() = cell(target).x2pos(&cur.bv(), cur.x_target()); return true; } @@ -131,8 +136,8 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const ShapeChanger dummy2(mi.base.font, UP_SHAPE); cell(1).metrics(mi, dim1); dim.wid = dim0.width() + dim1.wid + 5; - dim.asc = std::max(dim0.asc, dim1.asc); - dim.des = std::max(dim0.des, dim1.des); + dim.asc = max(dim0.asc, dim1.asc); + dim.des = max(dim0.des, dim1.des); } else { cell(2).metrics(mi, dim2); ShapeChanger dummy2(mi.base.font, UP_SHAPE); @@ -140,16 +145,17 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const cell(0).metrics(mi, dim0); cell(1).metrics(mi, dim1); dim.wid = dim0.width() + dim1.wid + dim2.wid + 10; - dim.asc = std::max(dim2.asc, dim0.height() + 5); - dim.des = std::max(dim2.des, dim1.height() - 5); + dim.asc = max(dim2.asc, dim0.height() + 5); + dim.des = max(dim2.des, dim1.height() - 5); } } else { + // general cell metrics used for \frac FracChanger dummy(mi.base); cell(0).metrics(mi, dim0); cell(1).metrics(mi, dim1); if (nargs() == 3) cell(2).metrics(mi, dim2); - + // metrics for special fraction types if (kind_ == NICEFRAC) { dim.wid = dim0.width() + dim1.wid + 5; dim.asc = dim0.height() + 5; @@ -160,14 +166,24 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const dim.asc = dim0.height() + 5; dim.des = dim1.height() - 5; } else { - dim.wid = std::max(dim0.width(), dim1.wid) + 2; + if (kind_ == CFRAC || kind_ == CFRACLEFT + || kind_ == CFRACRIGHT || kind_ == DFRAC) { + // \cfrac and \dfrac are always in display size + StyleChanger dummy2(mi.base, LM_ST_DISPLAY); + cell(0).metrics(mi, dim0); + cell(1).metrics(mi, dim1); + } else if (kind_ == TFRAC) { + // tfrac is in always in text size + StyleChanger dummy2(mi.base, LM_ST_SCRIPT); + cell(0).metrics(mi, dim0); + cell(1).metrics(mi, dim1); + } + dim.wid = max(dim0.wid, dim1.wid) + 2; dim.asc = dim0.height() + 2 + 5; dim.des = dim1.height() + 2 - 5; } } metricsMarkers(dim); - // Cache the inset dimension. - setDimCache(mi, dim); } @@ -176,7 +192,6 @@ void InsetMathFrac::draw(PainterInfo & pi, int x, int y) const setPosCache(pi, x, y); Dimension const dim = dimension(*pi.base.bv); Dimension const dim0 = cell(0).dimension(*pi.base.bv); - int m = x + dim.wid / 2; if (kind_ == UNIT || (kind_ == UNITFRAC && nargs() == 3)) { if (nargs() == 1) { ShapeChanger dummy2(pi.base.font, UP_SHAPE); @@ -200,6 +215,7 @@ void InsetMathFrac::draw(PainterInfo & pi, int x, int y) const } else { FracChanger dummy(pi.base); Dimension const dim1 = cell(1).dimension(*pi.base.bv); + int m = x + dim.wid / 2; if (kind_ == NICEFRAC) { cell(0).draw(pi, x + 2, y - dim0.des - 5); @@ -207,16 +223,27 @@ void InsetMathFrac::draw(PainterInfo & pi, int x, int y) const y + dim1.asc / 2); } else if (kind_ == UNITFRAC) { ShapeChanger dummy2(pi.base.font, UP_SHAPE); - cell(0).draw(pi, x + 2, - y - dim0.des - 5); - cell(1).draw(pi, x + dim0.width() + 5, - y + dim1.asc / 2); + cell(0).draw(pi, x + 2, y - dim0.des - 5); + cell(1).draw(pi, x + dim0.width() + 5, y + dim1.asc / 2); + } else if (kind_ == FRAC || kind_ == ATOP || kind_ == OVER) { + cell(0).draw(pi, m - dim0.wid / 2, y - dim0.des - 2 - 5); + cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc + 2 - 5); + } else if (kind_ == TFRAC) { + // tfrac is in always in text size + StyleChanger dummy2(pi.base, LM_ST_SCRIPT); + cell(0).draw(pi, m - dim0.wid / 2, y - dim0.des - 2 - 5); + cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc + 2 - 5); } else { - // Classical fraction - cell(0).draw(pi, m - dim0.width() / 2, + // \cfrac and \dfrac are always in display size + StyleChanger dummy2(pi.base, LM_ST_DISPLAY); + if (kind_ == CFRAC || kind_ == DFRAC) + cell(0).draw(pi, m - dim0.wid / 2, y - dim0.des - 2 - 5); + else if (kind_ == CFRACLEFT) + cell(0).draw(pi, x + 2, y - dim0.des - 2 - 5); + else if (kind_ == CFRACRIGHT) + cell(0).draw(pi, x + dim.wid - dim0.wid - 2, y - dim0.des - 2 - 5); - cell(1).draw(pi, m - dim1.wid / 2, - y + dim1.asc + 2 - 5); + cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc + 2 - 5); } } if (kind_ == NICEFRAC || kind_ == UNITFRAC) { @@ -224,13 +251,14 @@ void InsetMathFrac::draw(PainterInfo & pi, int x, int y) const int xx = x; if (nargs() == 3) xx += cell(2).dimension(*pi.base.bv).wid + 5; - pi.pain.line(xx + dim0.wid, y + dim.des - 2, xx + dim0.wid + 5, y - dim.asc + 2, Color_math); } - if (kind_ == FRAC || kind_ == OVER) + if (kind_ == FRAC || kind_ == CFRAC || kind_ == CFRACLEFT + || kind_ == CFRACRIGHT || kind_ == DFRAC + || kind_ == TFRAC || kind_ == OVER) pi.pain.line(x + 1, y - 5, x + dim.wid - 2, y - 5, Color_math); drawMarkers(pi, x, y); @@ -242,13 +270,13 @@ void InsetMathFrac::metricsT(TextMetricsInfo const & mi, Dimension & dim) const Dimension dim0, dim1; cell(0).metricsT(mi, dim0); cell(1).metricsT(mi, dim1); - dim.wid = std::max(dim0.width(), dim1.wid); + dim.wid = max(dim0.width(), dim1.wid); dim.asc = dim0.height() + 1; dim.des = dim1.height(); } -void InsetMathFrac::drawT(TextPainter & pain, int x, int y) const +void InsetMathFrac::drawT(TextPainter & /*pain*/, int /*x*/, int /*y*/) const { // FIXME: BROKEN! /* @@ -265,8 +293,11 @@ void InsetMathFrac::drawT(TextPainter & pain, int x, int y) const void InsetMathFrac::write(WriteStream & os) const { + MathEnsurer ensurer(os); switch (kind_) { case ATOP: + // \\atop is only for compatibility, \\binom is the + // LaTeX2e successor os << '{' << cell(0) << "\\atop " << cell(1) << '}'; break; case OVER: @@ -274,7 +305,10 @@ void InsetMathFrac::write(WriteStream & os) const os << "\\frac{" << cell(0) << "}{" << cell(1) << '}'; break; case FRAC: + case DFRAC: + case TFRAC: case NICEFRAC: + case CFRAC: case UNITFRAC: if (nargs() == 2) InsetMathNest::write(os); @@ -287,6 +321,12 @@ void InsetMathFrac::write(WriteStream & os) const else os << "\\unit{" << cell(0) << '}'; break; + case CFRACLEFT: + os << "\\cfrac[l]{" << cell(0) << "}{" << cell(1) << '}'; + break; + case CFRACRIGHT: + os << "\\cfrac[r]{" << cell(0) << "}{" << cell(1) << '}'; + break; } } @@ -296,6 +336,14 @@ docstring InsetMathFrac::name() const switch (kind_) { case FRAC: return from_ascii("frac"); + case CFRAC: + case CFRACLEFT: + case CFRACRIGHT: + return from_ascii("cfrac"); + case DFRAC: + return from_ascii("dfrac"); + case TFRAC: + return from_ascii("tfrac"); case OVER: return from_ascii("over"); case NICEFRAC: @@ -338,7 +386,10 @@ void InsetMathFrac::octave(OctaveStream & os) const void InsetMathFrac::mathmlize(MathStream & os) const { - os << MTag("mfrac") << cell(0) << cell(1) << ETag("mfrac"); + os << MTag("mfrac") + << MTag("mrow") << cell(0) << ETag("mrow") + << MTag("mrow") << cell(1) << ETag("mrow") + << ETag("mfrac"); } @@ -346,125 +397,9 @@ void InsetMathFrac::validate(LaTeXFeatures & features) const { if (kind_ == NICEFRAC || kind_ == UNITFRAC || kind_ == UNIT) features.require("units"); - InsetMathNest::validate(features); -} - - -///////////////////////////////////////////////////////////////////// -// -// InsetMathDFrac -// -///////////////////////////////////////////////////////////////////// - - -Inset * InsetMathDFrac::clone() const -{ - return new InsetMathDFrac(*this); -} - - -void InsetMathDFrac::metrics(MetricsInfo & mi, Dimension & dim) const -{ - Dimension dim0, dim1; - cell(0).metrics(mi, dim0); - cell(1).metrics(mi, dim1); - dim.wid = std::max(dim0.wid, dim1.wid) + 2; - dim.asc = dim0.height() + 2 + 5; - dim.des = dim1.height() + 2 - 5; - // Cache the inset dimension. - setDimCache(mi, dim); -} - - -void InsetMathDFrac::draw(PainterInfo & pi, int x, int y) const -{ - 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; - cell(0).draw(pi, m - dim0.wid / 2, y - dim0.des - 2 - 5); - cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc + 2 - 5); - pi.pain.line(x + 1, y - 5, x + dim.wid - 2, y - 5, Color_math); - setPosCache(pi, x, y); -} - - -docstring InsetMathDFrac::name() const -{ - return from_ascii("dfrac"); -} - - -void InsetMathDFrac::mathmlize(MathStream & os) const -{ - os << MTag("mdfrac") << cell(0) << cell(1) << ETag("mdfrac"); -} - - -void InsetMathDFrac::validate(LaTeXFeatures & features) const -{ - features.require("amsmath"); - InsetMathNest::validate(features); -} - - -///////////////////////////////////////////////////////////////////// -// -// InsetMathTFrac -// -///////////////////////////////////////////////////////////////////// - - -Inset * InsetMathTFrac::clone() const -{ - return new InsetMathTFrac(*this); -} - - -void InsetMathTFrac::metrics(MetricsInfo & mi, Dimension & dim) const -{ - StyleChanger dummy(mi.base, LM_ST_SCRIPT); - Dimension dim0; - cell(0).metrics(mi, dim0); - Dimension dim1; - cell(1).metrics(mi, dim1); - dim.wid = std::max(dim0.width(), dim1.width()) + 2; - dim.asc = dim0.height() + 2 + 5; - dim.des = dim1.height() + 2 - 5; - // Cache the inset dimension. - setDimCache(mi, dim); -} - - -void InsetMathTFrac::draw(PainterInfo & pi, int x, int y) const -{ - StyleChanger dummy(pi.base, LM_ST_SCRIPT); - 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; - cell(0).draw(pi, m - dim0.width() / 2, y - dim0.descent() - 2 - 5); - cell(1).draw(pi, m - dim1.width() / 2, y + dim1.ascent() + 2 - 5); - pi.pain.line(x + 1, y - 5, x + dim.wid - 2, y - 5, Color_math); - setPosCache(pi, x, y); -} - - -docstring InsetMathTFrac::name() const -{ - return from_ascii("tfrac"); -} - - -void InsetMathTFrac::mathmlize(MathStream & os) const -{ - os << MTag("mtfrac") << cell(0) << cell(1) << ETag("mtfrac"); -} - - -void InsetMathTFrac::validate(LaTeXFeatures & features) const -{ - features.require("amsmath"); + if (kind_ == CFRAC || kind_ == CFRACLEFT || kind_ == CFRACRIGHT + || kind_ == DFRAC || kind_ == TFRAC) + features.require("amsmath"); InsetMathNest::validate(features); } @@ -476,8 +411,8 @@ void InsetMathTFrac::validate(LaTeXFeatures & features) const ///////////////////////////////////////////////////////////////////// -InsetMathBinom::InsetMathBinom(bool choose) - : choose_(choose) +InsetMathBinom::InsetMathBinom(Buffer * buf, Kind kind) + : InsetMathFracBase(buf), kind_(kind) {} @@ -500,16 +435,27 @@ int InsetMathBinom::dw(int height) const void InsetMathBinom::metrics(MetricsInfo & mi, Dimension & dim) const { - FracChanger dummy(mi.base); Dimension dim0, dim1; - cell(0).metrics(mi, dim0); - cell(1).metrics(mi, dim1); + + // FIXME: for an unknown reason the cells must be set directly + // after the StyleChanger and cannot be set after the if case + if (kind_ == DBINOM) { + StyleChanger dummy(mi.base, LM_ST_DISPLAY); + cell(0).metrics(mi, dim0); + cell(1).metrics(mi, dim1); + } else if (kind_ == TBINOM) { + StyleChanger dummy(mi.base, LM_ST_SCRIPT); + cell(0).metrics(mi, dim0); + cell(1).metrics(mi, dim1); + } else { + FracChanger dummy(mi.base); + cell(0).metrics(mi, dim0); + cell(1).metrics(mi, dim1); + } dim.asc = dim0.height() + 4 + 5; dim.des = dim1.height() + 4 - 5; - dim.wid = std::max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4; + dim.wid = max(dim0.wid, dim1.wid) + 2 * dw(dim.height()) + 4; metricsMarkers2(dim); - // Cache the inset dimension. - setDimCache(mi, dim); } @@ -518,29 +464,66 @@ void InsetMathBinom::draw(PainterInfo & pi, int x, int y) const 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); + // define the binom brackets + docstring const bra = kind_ == BRACE ? from_ascii("{") : + kind_ == BRACK ? from_ascii("[") : from_ascii("("); + docstring const ket = kind_ == BRACE ? from_ascii("}") : + kind_ == BRACK ? from_ascii("]") : from_ascii(")"); + int m = x + dim.width() / 2; - FracChanger dummy(pi.base); - cell(0).draw(pi, m - dim0.width() / 2, y - dim0.des - 3 - 5); - cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc + 3 - 5); - mathed_draw_deco(pi, x, y - dim.ascent(), dw(dim.height()), dim.height(), from_ascii("(")); - mathed_draw_deco(pi, x + dim.width() - dw(dim.height()), y - dim.ascent(), - dw(dim.height()), dim.height(), from_ascii(")")); + // FIXME: for an unknown reason the cells must be drawn directly + // after the StyleChanger and cannot be drawn after the if case + if (kind_ == DBINOM) { + StyleChanger dummy(pi.base, LM_ST_DISPLAY); + cell(0).draw(pi, m - dim0.wid / 2, y - dim0.des - 3 - 5); + cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc + 3 - 5); + } else if (kind_ == TBINOM) { + StyleChanger dummy(pi.base, LM_ST_SCRIPT); + cell(0).draw(pi, m - dim0.wid / 2, y - dim0.des - 3 - 5); + cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc + 3 - 5); + } else { + FracChanger dummy2(pi.base); + cell(0).draw(pi, m - dim0.wid / 2, y - dim0.des - 3 - 5); + cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc + 3 - 5); + } + // draw the brackets and the marker + mathed_draw_deco(pi, x, y - dim.ascent(), dw(dim.height()), + dim.height(), bra); + mathed_draw_deco(pi, x + dim.width() - dw(dim.height()), + y - dim.ascent(), dw(dim.height()), dim.height(), ket); drawMarkers2(pi, x, y); } bool InsetMathBinom::extraBraces() const { - return choose_; + return kind_ == CHOOSE || kind_ == BRACE || kind_ == BRACK; } void InsetMathBinom::write(WriteStream & os) const { - if (choose_) - os << '{' << cell(0) << " \\choose " << cell(1) << '}'; - else + MathEnsurer ensurer(os); + switch (kind_) { + case BINOM: os << "\\binom{" << cell(0) << "}{" << cell(1) << '}'; + break; + case DBINOM: + os << "\\dbinom{" << cell(0) << "}{" << cell(1) << '}'; + break; + case TBINOM: + os << "\\tbinom{" << cell(0) << "}{" << cell(1) << '}'; + break; + case CHOOSE: + os << '{' << cell(0) << " \\choose " << cell(1) << '}'; + break; + case BRACE: + os << '{' << cell(0) << " \\brace " << cell(1) << '}'; + break; + case BRACK: + os << '{' << cell(0) << " \\brack " << cell(1) << '}'; + break; + } } @@ -549,4 +532,32 @@ void InsetMathBinom::normalize(NormalStream & os) const os << "[binom " << cell(0) << ' ' << cell(1) << ']'; } + +void InsetMathBinom::mathmlize(MathStream & os) const +{ + switch (kind_) { + case BINOM: + os << MTag("mbinom") << cell(0) << cell(1) << ETag("mbinom"); + break; + case TBINOM: + os << MTag("mtbinom") << cell(0) << cell(1) << ETag("mtbinom"); + break; + case DBINOM: + default: + os << MTag("mdbinom") << cell(0) << cell(1) << ETag("mdbinom"); + break; + } +} + + +void InsetMathBinom::validate(LaTeXFeatures & features) const +{ + if (kind_ == BINOM) + features.require("binom"); + if (kind_ == DBINOM || kind_ == TBINOM) + features.require("amsmath"); + InsetMathNest::validate(features); +} + + } // namespace lyx