/////////////////////////////////////////////////////////////////////
-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;
/////////////////////////////////////////////////////////////////////
-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)
{}
bool InsetMathFrac::idxForward(Cursor & cur) const
{
InsetMath::idx_type target = 0;
- if (kind_ == UNIT || (kind_ == UNITFRAC && nargs() == 3)
- || (kind_ == CFRAC && nargs() == 3)) {
+ if (kind_ == UNIT || (kind_ == UNITFRAC && nargs() == 3)) {
if (nargs() == 3)
target = 0;
else if (nargs() == 2)
bool InsetMathFrac::idxBackward(Cursor & cur) const
{
InsetMath::idx_type target = 0;
- if (kind_ == UNIT || (kind_ == UNITFRAC && nargs() == 3)
- || (kind_ == CFRAC && nargs() == 3)) {
+ if (kind_ == UNIT || (kind_ == UNITFRAC && nargs() == 3)) {
if (nargs() == 3)
target = 2;
else if (nargs() == 2)
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;
dim.des = dim1.height() - 5;
- } else if (kind_ == CFRAC) {
- if (nargs() == 2) {
- // cfrac is always in display size
- StyleChanger dummy2(mi.base, LM_ST_DISPLAY);
- 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;
- } else {
- // cfrac is always in display size
- StyleChanger dummy2(mi.base, LM_ST_DISPLAY);
- // use text font for the optional argument
- FontSetChanger dummy3(mi.base, "textnormal");
- cell(2).metrics(mi, dim2);
- // return to math font
- FontSetChanger dummy4(mi.base, "mathnormal");
- cell(0).metrics(mi, dim0);
- cell(1).metrics(mi, dim1);
- dim.wid = 2 + max(dim0.wid, dim1.wid);
- dim.asc = dim0.height() + 2 + 5;
- dim.des = dim1.height() + 2 - 5;
- }
} else if (kind_ == UNITFRAC) {
ShapeChanger dummy2(mi.base.font, UP_SHAPE);
dim.wid = dim0.width() + dim1.wid + 5;
dim.asc = dim0.height() + 5;
dim.des = dim1.height() - 5;
- } else if (kind_ == DFRAC) {
- // dfrac is in always in display size
- StyleChanger dummy2(mi.base, LM_ST_DISPLAY);
- 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;
- } 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;
} else {
- // FRAC
+ 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;
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);
} 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);
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);
- } else if (kind_ == CFRAC) {
- if (nargs() == 2) {
- // cfrac is always in display size
- StyleChanger dummy2(pi.base, LM_ST_DISPLAY);
- 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);
- } else {
- // cfrac is always in display size
- StyleChanger dummy2(pi.base, LM_ST_DISPLAY);
- // use text font for the optional argument
- FontSetChanger dummy3(pi.base, "textnormal");
- Dimension const dim2 = cell(2).dimension(*pi.base.bv);
- int w = mathed_char_width(pi.base.font, '[');
- drawStrBlack(pi, x, y, from_ascii("["));
- x += w;
- cell(2).draw(pi, x + 1, y);
- x += dim2.wid;
- drawStrBlack(pi, x, y, from_ascii("]"));
- x += w;
- // return to math font
- FontSetChanger dummy4(pi.base, "mathnormal");
- 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);
- }
- } else if (kind_ == DFRAC) {
- // dfrac is in always in display size
- StyleChanger dummy2(pi.base, LM_ST_DISPLAY);
- //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, 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);
- 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);
} else {
- // FRAC
- cell(0).draw(pi, m - dim0.wid / 2, y - dim0.des - 2 - 5);
+ // \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);
}
}
xx + dim0.wid + 5,
y - dim.asc + 2, Color_math);
}
- if (kind_ == FRAC || kind_ == CFRAC || kind_ == DFRAC
+ 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);
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:
case TFRAC:
case NICEFRAC:
case CFRAC:
- if (nargs() == 2)
- InsetMathNest::write(os);
- else
- os << "\\cfrac[" << cell(2) << "]{" << cell(0) << "}{" << cell(1) << '}';
- break;
case UNITFRAC:
if (nargs() == 2)
InsetMathNest::write(os);
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;
}
}
case FRAC:
return from_ascii("frac");
case CFRAC:
+ case CFRACLEFT:
+ case CFRACRIGHT:
return from_ascii("cfrac");
case DFRAC:
return from_ascii("dfrac");
void InsetMathFrac::mathmlize(MathStream & os) const
{
- switch (kind_) {
- case FRAC:
- os << MTag("mfrac") << cell(0) << cell(1) << ETag("mfrac");
- break;
- case DFRAC:
- os << MTag("mdfrac") << cell(0) << cell(1) << ETag("mdfrac");
- break;
- case TFRAC:
- os << MTag("mtfrac") << cell(0) << cell(1) << ETag("mtfrac");
- break;
- }
+ os << MTag("mfrac")
+ << MTag("mrow") << cell(0) << ETag("mrow")
+ << MTag("mrow") << cell(1) << ETag("mrow")
+ << ETag("mfrac");
}
{
if (kind_ == NICEFRAC || kind_ == UNITFRAC || kind_ == UNIT)
features.require("units");
- if (kind_ == CFRAC || kind_ == DFRAC || kind_ == TFRAC)
+ if (kind_ == CFRAC || kind_ == CFRACLEFT || kind_ == CFRACRIGHT
+ || kind_ == DFRAC || kind_ == TFRAC)
features.require("amsmath");
InsetMathNest::validate(features);
}
/////////////////////////////////////////////////////////////////////
-InsetMathBinom::InsetMathBinom(Kind kind)
- : kind_(kind)
+InsetMathBinom::InsetMathBinom(Buffer * buf, Kind kind)
+ : InsetMathFracBase(buf), kind_(kind)
{}
case BINOM:
os << MTag("mbinom") << cell(0) << cell(1) << ETag("mbinom");
break;
- case DBINOM:
- os << MTag("mdbinom") << cell(0) << cell(1) << ETag("mdbinom");
- 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;
}
}
projects / lyx.git / blobdiff