* 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.
*/
#include "MetricsInfo.h"
#include "TextPainter.h"
+#include "support/lassert.h"
#include "frontends/Painter.h"
using namespace std;
/////////////////////////////////////////////////////////////////////
-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)
{}
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.asc = dim0.height() + 5;
dim.des = dim1.height() - 5;
} else {
- dim.wid = 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;
}
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);
+ 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) {
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);
+ y - dim.asc + 2, pi.base.font.color());
}
- 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);
+ x + dim.wid - 2, y - 5, pi.base.font.color());
drawMarkers(pi, x, y);
}
void InsetMathFrac::write(WriteStream & os) const
{
- bool brace = os.pendingBrace();
- os.pendingBrace(false);
- if (os.latex() && os.textMode()) {
- os << "\\ensuremath{";
- os.textMode(false);
- brace = true;
- }
-
+ 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:
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);
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;
}
-
- os.pendingBrace(brace);
}
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:
void InsetMathFrac::maple(MapleStream & os) const
{
+ if (nargs() != 2) {
+ // Someone who knows about maple should fix this.
+ LASSERT(false, return);
+ }
os << '(' << cell(0) << ")/(" << cell(1) << ')';
}
void InsetMathFrac::mathematica(MathematicaStream & os) const
{
+ if (nargs() != 2) {
+ // Someone who knows about mathematica should fix this.
+ LASSERT(false, return);
+ }
os << '(' << cell(0) << ")/(" << cell(1) << ')';
}
void InsetMathFrac::octave(OctaveStream & os) const
{
+ if (nargs() != 2) {
+ // Someone who knows about octave should fix this.
+ LASSERT(false, return);
+ }
os << '(' << cell(0) << ")/(" << cell(1) << ')';
}
void InsetMathFrac::mathmlize(MathStream & os) const
{
- os << MTag("mfrac") << cell(0) << cell(1) << ETag("mfrac");
-}
-
-
-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 = max(dim0.wid, dim1.wid) + 2;
- dim.asc = dim0.height() + 2 + 5;
- dim.des = dim1.height() + 2 - 5;
-}
-
-
-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
-//
-/////////////////////////////////////////////////////////////////////
+ switch (kind_) {
+ case ATOP:
+ os << MTag("mfrac", "linethickeness='0'")
+ << MTag("mrow") << cell(0) << ETag("mrow")
+ << MTag("mrow") << cell(1) << ETag("mrow")
+ << ETag("mfrac");
+ break;
+ // we do not presently distinguish these
+ case OVER:
+ case FRAC:
+ case DFRAC:
+ case TFRAC:
+ case CFRAC:
+ case CFRACLEFT:
+ case CFRACRIGHT:
+ os << MTag("mfrac")
+ << MTag("mrow") << cell(0) << ETag("mrow")
+ << MTag("mrow") << cell(1) << ETag("mrow")
+ << ETag("mfrac");
+ break;
-Inset * InsetMathTFrac::clone() const
-{
- return new InsetMathTFrac(*this);
-}
+ case NICEFRAC:
+ os << MTag("mfrac", "bevelled='true'")
+ << MTag("mrow") << cell(0) << ETag("mrow")
+ << MTag("mrow") << cell(1) << ETag("mrow")
+ << ETag("mfrac");
+ break;
+ case UNITFRAC:
+ if (nargs() == 3)
+ os << cell(2);
+ os << MTag("mfrac", "bevelled='true'")
+ << MTag("mrow") << cell(0) << ETag("mrow")
+ << MTag("mrow") << cell(1) << ETag("mrow")
+ << ETag("mfrac");
+ break;
-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 = max(dim0.width(), dim1.width()) + 2;
- dim.asc = dim0.height() + 2 + 5;
- dim.des = dim1.height() + 2 - 5;
+ case UNIT:
+ // FIXME This is not right, because we still output mi, etc,
+ // when we output the cell. So we need to prevent that somehow.
+ if (nargs() == 2)
+ os << cell(0)
+ << MTag("mstyle mathvariant='normal'")
+ << cell(1)
+ << ETag("mstyle");
+ else
+ os << MTag("mstyle mathvariant='normal'")
+ << cell(0)
+ << ETag("mstyle");
+ }
}
-void InsetMathTFrac::draw(PainterInfo & pi, int x, int y) const
+void InsetMathFrac::htmlize(HtmlStream & os) 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);
-}
+ switch (kind_) {
+ case ATOP:
+ os << MTag("span", "class='frac'")
+ << MTag("span", "class='numer'") << cell(0) << ETag("span")
+ << MTag("span", "class='numer'") << cell(1) << ETag("span")
+ << ETag("span");
+ break;
+ // we do not presently distinguish these
+ case OVER:
+ case FRAC:
+ case DFRAC:
+ case TFRAC:
+ case CFRAC:
+ case CFRACLEFT:
+ case CFRACRIGHT:
+ os << MTag("span", "class='frac'")
+ << MTag("span", "class='numer'") << cell(0) << ETag("span")
+ << MTag("span", "class='denom'") << cell(1) << ETag("span")
+ << ETag("span");
+ break;
-docstring InsetMathTFrac::name() const
-{
- return from_ascii("tfrac");
-}
+ case NICEFRAC:
+ os << cell(0) << '/' << cell(1);
+ break;
+ case UNITFRAC:
+ if (nargs() == 3)
+ os << cell(2) << ' ';
+ os << cell(0) << '/' << cell(1);
+ break;
-void InsetMathTFrac::mathmlize(MathStream & os) const
-{
- os << MTag("mtfrac") << cell(0) << cell(1) << ETag("mtfrac");
+ case UNIT:
+ // FIXME This is not right, because we still output i, etc,
+ // when we output the cell. So we need to prevent that somehow.
+ if (nargs() == 2)
+ os << cell(0)
+ << MTag("span")
+ << cell(1)
+ << ETag("span");
+ else
+ os << MTag("span")
+ << cell(0)
+ << ETag("span");
+ }
}
-void InsetMathTFrac::validate(LaTeXFeatures & features) const
+void InsetMathFrac::validate(LaTeXFeatures & features) const
{
- features.require("amsmath");
+ if (kind_ == NICEFRAC || kind_ == UNITFRAC || kind_ == UNIT)
+ features.require("units");
+ if (kind_ == CFRAC || kind_ == CFRACLEFT || kind_ == CFRACRIGHT
+ || kind_ == DFRAC || kind_ == TFRAC)
+ features.require("amsmath");
+ if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+ // CSS adapted from eLyXer
+ features.addCSSSnippet(
+ "span.frac{display: inline-block; vertical-align: middle; text-align:center;}\n"
+ "span.numer{display: block;}\n"
+ "span.denom{display: block; border-top: thin solid #000040;}");
InsetMathNest::validate(features);
}
/////////////////////////////////////////////////////////////////////
-InsetMathBinom::InsetMathBinom(Kind kind)
- : kind_(kind)
+InsetMathBinom::InsetMathBinom(Buffer * buf, Kind kind)
+ : InsetMathFracBase(buf), kind_(kind)
{}
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 = max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4;
+ dim.wid = max(dim0.wid, dim1.wid) + 2 * dw(dim.height()) + 4;
metricsMarkers2(dim);
}
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("(");
+ kind_ == BRACK ? from_ascii("[") : from_ascii("(");
docstring const ket = kind_ == BRACE ? from_ascii("}") :
- kind_ == BRACK ? from_ascii("]") : 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(), bra);
- mathed_draw_deco(pi, x + dim.width() - dw(dim.height()), y - dim.ascent(),
- dw(dim.height()), dim.height(), ket);
+ // 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);
}
void InsetMathBinom::write(WriteStream & os) const
{
- bool brace = os.pendingBrace();
- os.pendingBrace(false);
- if (os.latex() && os.textMode()) {
- os << "\\ensuremath{";
- os.textMode(false);
- brace = true;
- }
-
+ 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;
os << '{' << cell(0) << " \\brack " << cell(1) << '}';
break;
}
-
- os.pendingBrace(brace);
}
}
-void InsetMathBinom::validate(LaTeXFeatures & features) const
-{
- if (kind_ == BINOM)
- features.require("binom");
- InsetMathNest::validate(features);
-}
-
-
-/////////////////////////////////////////////////////////////////////
-//
-// InsetMathDBinom
-//
-/////////////////////////////////////////////////////////////////////
-
-Inset * InsetMathDBinom::clone() const
-{
- return new InsetMathDBinom(*this);
-}
-
-
-int InsetMathDBinom::dw(int height) const
-{
- int w = height / 5;
- if (w > 15)
- w = 15;
- if (w < 6)
- w = 6;
- return w;
-}
-
-
-void InsetMathDBinom::metrics(MetricsInfo & mi, Dimension & dim) const
-{
- Dimension dim0, dim1;
- cell(0).metrics(mi, dim0);
- cell(1).metrics(mi, dim1);
- dim.asc = dim0.height() + 4 + 5;
- dim.des = dim1.height() + 4 - 5;
- dim.wid = max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4;
- metricsMarkers2(dim);
-}
-
-
-void InsetMathDBinom::draw(PainterInfo & pi, int x, int y) const
+void InsetMathBinom::mathmlize(MathStream & os) 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.width() / 2;
- 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(")"));
- drawMarkers2(pi, x, y);
+ char ldelim = ' ';
+ char rdelim = ' ';
+ switch (kind_) {
+ case BINOM:
+ case TBINOM:
+ case DBINOM:
+ case CHOOSE:
+ ldelim = '(';
+ rdelim = ')';
+ break;
+ case BRACE:
+ ldelim = '{';
+ rdelim = '}';
+ break;
+ case BRACK:
+ ldelim = '[';
+ rdelim = ']';
+ break;
+ }
+ os << "<mo fence='true' stretchy='true' form='prefix'>" << ldelim << "</mo>"
+ << "<mfrac linethickness='0'>"
+ << cell(0) << cell(1)
+ << "</mfrac>"
+ << "<mo fence='true' stretchy='true' form='postfix'>" << rdelim << "</mo>";
}
-docstring InsetMathDBinom::name() const
+void InsetMathBinom::htmlize(HtmlStream & os) const
{
- return from_ascii("dbinom");
+ char ldelim = ' ';
+ char rdelim = ' ';
+ switch (kind_) {
+ case BINOM:
+ case TBINOM:
+ case DBINOM:
+ case CHOOSE:
+ ldelim = '(';
+ rdelim = ')';
+ break;
+ case BRACE:
+ ldelim = '{';
+ rdelim = '}';
+ break;
+ case BRACK:
+ ldelim = '[';
+ rdelim = ']';
+ break;
+ }
+ os << MTag("span", "class='binomdelim'") << ldelim << ETag("span") << '\n'
+ << MTag("span", "class='binom'") << '\n'
+ << MTag("span") << cell(0) << ETag("span") << '\n'
+ << MTag("span") << cell(1) << ETag("span") << '\n'
+ << ETag("span") << '\n'
+ << MTag("span", "class='binomdelim'") << rdelim << ETag("span") << '\n';
}
-void InsetMathDBinom::mathmlize(MathStream & os) const
-{
- os << MTag("mdbinom") << cell(0) << cell(1) << ETag("mdbinom");
-}
-void InsetMathDBinom::validate(LaTeXFeatures & features) const
+void InsetMathBinom::validate(LaTeXFeatures & features) const
{
- features.require("amsmath");
+ if (features.runparams().isLaTeX()) {
+ if (kind_ == BINOM)
+ features.require("binom");
+ if (kind_ == DBINOM || kind_ == TBINOM)
+ features.require("amsmath");
+ } else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
+ features.addCSSSnippet(
+ "span.binom{display: inline-block; vertical-align: bottom; text-align:center;}\n"
+ "span.binom span{display: block;}\n"
+ "span.binomdelim{font-size: 2em;}");
InsetMathNest::validate(features);
}
-/////////////////////////////////////////////////////////////////////
-//
-// InsetMathTBinom
-//
-/////////////////////////////////////////////////////////////////////
-
-Inset * InsetMathTBinom::clone() const
-{
- return new InsetMathTBinom(*this);
-}
-
-
-int InsetMathTBinom::dw(int height) const
-{
- int w = height / 5;
- if (w > 15)
- w = 15;
- if (w < 6)
- w = 6;
- return w;
-}
-
-
-void InsetMathTBinom::metrics(MetricsInfo & mi, Dimension & dim) const
-{
- StyleChanger dummy(mi.base, LM_ST_SCRIPT);
- Dimension dim0, dim1;
- cell(0).metrics(mi, dim0);
- cell(1).metrics(mi, dim1);
- dim.asc = dim0.height() + 4 + 5;
- dim.des = dim1.height() + 4 - 5;
- dim.wid = max(dim0.width(), dim1.wid) + 2 * dw(dim.height()) + 4;
- metricsMarkers2(dim);
-}
-
-
-void InsetMathTBinom::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.width() / 2;
- 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(")"));
- drawMarkers2(pi, x, y);
-}
-
-
-docstring InsetMathTBinom::name() const
-{
- return from_ascii("tbinom");
-}
-
-void InsetMathTBinom::mathmlize(MathStream & os) const
-{
- os << MTag("mtbinom") << cell(0) << cell(1) << ETag("mtbinom");
-}
-
-void InsetMathTBinom::validate(LaTeXFeatures & features) const
-{
- features.require("amsmath");
- InsetMathNest::validate(features);
-}
-
} // namespace lyx
projects / lyx.git / blobdiff