#include "frontends/Painter.h"
+#include "support/lassert.h"
+
using namespace std;
+
namespace lyx {
/////////////////////////////////////////////////////////////////////
}
+MathClass InsetMathFrac::mathClass() const
+{
+ // Generalized fractions are of inner class (see The TeXbook, p. 292)
+ // But stuff from the unit/nicefrac packages are not real fractions.
+ MathClass mc = MC_ORD;
+ switch (kind_) {
+ case ATOP:
+ case OVER:
+ case FRAC:
+ case DFRAC:
+ case TFRAC:
+ case CFRAC:
+ case CFRACLEFT:
+ case CFRACRIGHT:
+ mc = MC_INNER;
+ break;
+ case NICEFRAC:
+ case UNITFRAC:
+ case UNIT:
+ break;
+ }
+ return mc;
+}
+
+
void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
{
Dimension dim0, dim1, dim2;
- if (kind_ == UNIT || (kind_ == UNITFRAC && nargs() == 3)) {
- if (nargs() == 1) {
- ShapeChanger dummy2(mi.base.font, UP_SHAPE);
- cell(0).metrics(mi, dim0);
- dim.wid = dim0.width()+ 3;
- dim.asc = dim0.asc;
- dim.des = dim0.des;
- } else if (nargs() == 2) {
- cell(0).metrics(mi, dim0);
- ShapeChanger dummy2(mi.base.font, UP_SHAPE);
- cell(1).metrics(mi, dim1);
- dim.wid = dim0.width() + dim1.wid + 5;
- dim.asc = max(dim0.asc, dim1.asc);
- dim.des = max(dim0.des, dim1.des);
- } else {
+ switch (kind_) {
+ case UNIT: {
+ // \unitone, \unittwo
+ dim.wid = 0;
+ int unit_cell = 0;
+ // is there an extra cell holding the value being given a dimension?
+ // (this is \unittwo)
+ if (nargs() == 2) {
+ cell(0).metrics(mi, dim1);
+ dim.wid += dim1.wid + 4;
+ unit_cell = 1;
+ }
+ Changer dummy = mi.base.font.changeShape(UP_SHAPE);
+ cell(unit_cell).metrics(mi, dim0);
+ dim.wid += dim0.width() + 1;
+ dim.asc = max(dim0.asc, dim1.asc);
+ dim.des = max(dim0.des, dim1.des);
+ }
+ break;
+
+ case UNITFRAC:
+ case NICEFRAC: {
+ // \unitfrac, \unitfracthree, \nicefrac
+ dim.wid = 0;
+ // is there an extra cell holding the value being given a dimension?
+ // (this is \unitfracthree)
+ if (kind_ == UNITFRAC && nargs() == 3) {
cell(2).metrics(mi, dim2);
- ShapeChanger dummy2(mi.base.font, UP_SHAPE);
- FracChanger dummy(mi.base);
- cell(0).metrics(mi, dim0);
- cell(1).metrics(mi, dim1);
- dim.wid = dim0.width() + dim1.wid + dim2.wid + 10;
- dim.asc = max(dim2.asc, dim0.height() + 5);
- dim.des = max(dim2.des, dim1.height() - 5);
+ dim.wid += dim2.wid + 4;
}
- } else {
- // general cell metrics used for \frac
- FracChanger dummy(mi.base);
+ Changer dummy = (kind_ == UNITFRAC) ? mi.base.font.changeShape(UP_SHAPE)
+ : Changer();
+ Changer dummy2 = mi.base.changeScript();
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_ == 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_ == 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;
- }
+ dim.wid += dim0.wid + dim1.wid + 5;
+ dim.asc = max(dim2.asc, dim0.height() + 5);
+ dim.des = max(dim2.des, dim1.height() - 5);
+ }
+ break;
+
+ case FRAC:
+ case CFRAC:
+ case CFRACLEFT:
+ case CFRACRIGHT:
+ case DFRAC:
+ case TFRAC:
+ case OVER:
+ case ATOP: {
+ Changer dummy =
+ // \tfrac is always in text size
+ (kind_ == TFRAC) ? mi.base.font.changeStyle(LM_ST_SCRIPT) :
+ // \cfrac and \dfrac are always in display size
+ (kind_ == CFRAC
+ || kind_ == CFRACLEFT
+ || kind_ == CFRACRIGHT
+ || kind_ == DFRAC) ? mi.base.font.changeStyle(LM_ST_DISPLAY) :
+ // all others
+ mi.base.changeFrac();
+ 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);
+ } //switch (kind_)
+ metricsMarkers(mi, dim);
}
setPosCache(pi, x, y);
Dimension const dim = dimension(*pi.base.bv);
Dimension const dim0 = cell(0).dimension(*pi.base.bv);
- if (kind_ == UNIT || (kind_ == UNITFRAC && nargs() == 3)) {
- if (nargs() == 1) {
- ShapeChanger dummy2(pi.base.font, UP_SHAPE);
- cell(0).draw(pi, x + 1, y);
- } else if (nargs() == 2) {
+ switch (kind_) {
+ case UNIT: {
+ // \unitone, \unittwo
+ int xx = x;
+ int unit_cell = 0;
+ // is there an extra cell holding the value being given a dimension?
+ // (this is \unittwo)
+ if (nargs() == 2) {
cell(0).draw(pi, x + 1, y);
- ShapeChanger dummy2(pi.base.font, UP_SHAPE);
- cell(1).draw(pi, x + dim0.width() + 5, y);
- } else {
+ xx += dim0.wid + 4;
+ unit_cell = 1;
+ }
+ Changer dummy = pi.base.font.changeShape(UP_SHAPE);
+ cell(unit_cell).draw(pi, xx + 1, y);
+ }
+ break;
+
+ case UNITFRAC:
+ case NICEFRAC: {
+ // \unitfrac, \unitfracthree, \nicefrac
+ int xx = x;
+ // is there an extra cell holding the value being given a dimension?
+ // (this is \unitfracthree)
+ if (kind_ == UNITFRAC && nargs() == 3) {
cell(2).draw(pi, x + 1, y);
- ShapeChanger dummy2(pi.base.font, UP_SHAPE);
- FracChanger dummy(pi.base);
- Dimension const dim1 = cell(1).dimension(*pi.base.bv);
- Dimension const dim2 = cell(2).dimension(*pi.base.bv);
- int xx = x + dim2.wid + 5;
- cell(0).draw(pi, xx + 2,
- y - dim0.des - 5);
- cell(1).draw(pi, xx + dim0.width() + 5,
- y + dim1.asc / 2);
+ xx += cell(2).dimension(*pi.base.bv).wid + 4;
}
- } else {
- FracChanger dummy(pi.base);
+ Changer dummy = (kind_ == UNITFRAC) ? pi.base.font.changeShape(UP_SHAPE)
+ : Changer();
+ // nice fraction
+ // FIXME:
+ // * the solidus should be \kern-2mu/\kern-1mu.
+ // * the vertical offset of the first cell should be such that the
+ // top of M in the first cell matches the one of the
+ // surrounding text.
+ Changer dummy2 = pi.base.changeScript();
+ cell(0).draw(pi, xx + 2, y - dim0.des - 5);
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);
- cell(1).draw(pi, x + dim0.width() + 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_ == 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 {
- // \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);
- }
- }
- if (kind_ == NICEFRAC || kind_ == UNITFRAC) {
+ cell(1).draw(pi, xx + dim0.wid + 5, y + dim1.asc / 2);
// Diag line:
- 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);
+ pi.pain.line(xx + dim0.wid + 1, y + dim.des - 2,
+ xx + dim0.wid + 6, y - dim.asc + 2,
+ pi.base.font.color());
+ }
+ break;
+
+ case FRAC:
+ case CFRAC:
+ case CFRACLEFT:
+ case CFRACRIGHT:
+ case DFRAC:
+ case TFRAC:
+ case OVER:
+ case ATOP: {
+ Changer dummy =
+ // \tfrac is always in text size
+ (kind_ == TFRAC) ? pi.base.font.changeStyle(LM_ST_SCRIPT) :
+ // \cfrac and \dfrac are always in display size
+ (kind_ == CFRAC
+ || kind_ == CFRACLEFT
+ || kind_ == CFRACRIGHT
+ || kind_ == DFRAC) ? pi.base.font.changeStyle(LM_ST_DISPLAY) :
+ // all others
+ pi.base.changeFrac();
+ Dimension const dim1 = cell(1).dimension(*pi.base.bv);
+ int m = x + dim.wid / 2;
+ int xx =
+ // align left
+ (kind_ == CFRACLEFT) ? x + 2 :
+ // align right
+ (kind_ == CFRACRIGHT) ? x + dim.wid - dim0.wid - 2 :
+ // center
+ m - dim0.wid / 2;
+ // FIXME: vertical offset should be based on ex
+ //int dy = theFontMetrics(pi.base.font).ex() / 2;
+ cell(0).draw(pi, xx, y - dim0.des - 2 - 5);
+ // center
+ cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc + 2 - 5);
+ // horizontal line
+ if (kind_ != ATOP)
+ pi.pain.line(x + 1, y - 5,
+ x + dim.wid - 2, y - 5, pi.base.font.color());
}
- 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);
+ } //switch (kind_)
drawMarkers(pi, x, y);
}
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")
- << MTag("mrow") << cell(0) << ETag("mrow")
- << MTag("mrow") << cell(1) << ETag("mrow")
- << ETag("mfrac");
+ 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;
+
+ 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;
+
+ 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 InsetMathFrac::htmlize(HtmlStream & os) const
{
- os << MTag("span", "class='frac'")
- << MTag("span", "class='numer'") << cell(0) << ETag("span")
- << MTag("span", "class='denom'") << cell(1) << ETag("span")
- << ETag("span");
+ 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;
+
+ case NICEFRAC:
+ os << cell(0) << '/' << cell(1);
+ break;
+
+ case UNITFRAC:
+ if (nargs() == 3)
+ os << cell(2) << ' ';
+ os << cell(0) << '/' << cell(1);
+ break;
+
+ 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");
+ }
}
if (kind_ == NICEFRAC || kind_ == UNITFRAC || kind_ == UNIT)
features.require("units");
if (kind_ == CFRAC || kind_ == CFRACLEFT || kind_ == CFRACRIGHT
- || kind_ == DFRAC || kind_ == TFRAC)
+ || kind_ == DFRAC || kind_ == TFRAC)
features.require("amsmath");
if (features.runparams().math_flavor == OutputParams::MathAsHTML)
// CSS adapted from eLyXer
- features.addPreambleSnippet("<style type=\"text/css\">\n"
+ 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;}\n"
- "</style>");
+ "span.denom{display: block; border-top: thin solid #000040;}");
InsetMathNest::validate(features);
}
void InsetMathBinom::metrics(MetricsInfo & mi, Dimension & dim) const
{
Dimension dim0, 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);
- }
+ Changer dummy =
+ (kind_ == DBINOM) ? mi.base.font.changeStyle(LM_ST_DISPLAY) :
+ (kind_ == TBINOM) ? mi.base.font.changeStyle(LM_ST_SCRIPT) :
+ mi.base.changeFrac();
+ 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.wid, dim1.wid) + 2 * dw(dim.height()) + 4;
- metricsMarkers2(dim);
+ metricsMarkers2(mi, dim);
}
kind_ == BRACK ? from_ascii("]") : from_ascii(")");
int m = x + dim.width() / 2;
- // 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);
+ {
+ Changer dummy =
+ (kind_ == DBINOM) ? pi.base.font.changeStyle(LM_ST_DISPLAY) :
+ (kind_ == TBINOM) ? pi.base.font.changeStyle(LM_ST_SCRIPT) :
+ pi.base.changeFrac();
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);
}
if (kind_ == DBINOM || kind_ == TBINOM)
features.require("amsmath");
} else if (features.runparams().math_flavor == OutputParams::MathAsHTML)
- features.addPreambleSnippet("<style type=\"text/css\">\n"
+ 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;}\n"
- "</style>");
+ "span.binomdelim{font-size: 2em;}");
InsetMathNest::validate(features);
}
projects / lyx.git / blobdiff