{
// 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;
+ idx_type target = nargs() > 1 ? !up : 0;
if (cur.idx() == target)
return false;
cur.idx() = target;
/////////////////////////////////////////////////////////////////////
-InsetMathFrac::InsetMathFrac(Buffer * buf, Kind kind, InsetMath::idx_type ncells)
+InsetMathFrac::InsetMathFrac(Buffer * buf, Kind kind, idx_type ncells)
: InsetMathFracBase(buf, ncells), kind_(kind)
{}
InsetMathFrac * InsetMathFrac::asFracInset()
{
- return kind_ == ATOP ? 0 : this;
+ return kind_ == ATOP ? nullptr : this;
}
InsetMathFrac const * InsetMathFrac::asFracInset() const
{
- return kind_ == ATOP ? 0 : this;
+ return kind_ == ATOP ? nullptr : this;
}
bool InsetMathFrac::idxForward(Cursor & cur) const
{
- InsetMath::idx_type target = 0;
+ idx_type target = 0;
if (kind_ == UNIT || (kind_ == UNITFRAC && nargs() == 3)) {
if (nargs() == 3)
target = 0;
bool InsetMathFrac::idxBackward(Cursor & cur) const
{
- InsetMath::idx_type target = 0;
+ idx_type target = 0;
if (kind_ == UNIT || (kind_ == UNITFRAC && nargs() == 3)) {
if (nargs() == 3)
target = 2;
case CFRAC:
case CFRACLEFT:
case CFRACRIGHT:
+ case AASTEX_CASE:
mc = MC_INNER;
break;
case NICEFRAC:
namespace {
-// align frac to minus character
-int dy_for_frac(MetricsBase & mb)
-{
- Changer dummy = mb.changeFontSet("mathnormal");
- return theFontMetrics(mb.font).ascent('-') - 1;
-}
-
-
// align the top of M in the cell with the top of M in the surrounding font
int dy_for_nicefrac(MetricsBase & mb)
{
return in_word_set(from_ascii("slash"));
}
-} // anon namespace
-
+} // namespace
void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
{
Dimension dim0, dim1, dim2;
+ Changer dummy3 = mi.base.changeEnsureMath();
switch (kind_) {
case UNIT: {
dim.des = dim2.des;
}
Changer dummy = (kind_ == UNITFRAC) ? mi.base.font.changeShape(UP_SHAPE)
- : Changer();
+ : noChange();
Changer dummy2 = mi.base.changeScript();
if (latexkeys const * slash = slash_symbol()) {
Dimension dimslash;
case DFRAC:
case TFRAC:
case OVER:
- case ATOP: {
- int const dy = dy_for_frac(mi.base);
+ case ATOP:
+ case AASTEX_CASE: {
+ int const dy = axis_height(mi.base);
Changer dummy =
// \tfrac is always in text size
- (kind_ == TFRAC) ? mi.base.font.changeStyle(LM_ST_SCRIPT) :
+ (kind_ == TFRAC) ? mi.base.font.changeStyle(SCRIPT_STYLE) :
// \cfrac and \dfrac are always in display size
(kind_ == CFRAC
|| kind_ == CFRACLEFT
|| kind_ == CFRACRIGHT
- || kind_ == DFRAC) ? mi.base.font.changeStyle(LM_ST_DISPLAY) :
+ || kind_ == DFRAC
+ || kind_ == AASTEX_CASE) ? mi.base.font.changeStyle(DISPLAY_STYLE) :
// all others
mi.base.changeFrac();
+ Changer dummy2 = mi.base.changeEnsureMath();
cell(0).metrics(mi, dim0);
cell(1).metrics(mi, dim1);
dim.wid = max(dim0.wid, dim1.wid) + 2;
dim.asc = dim0.height() + dy/2 + dy;
- dim.des = max(0, dim1.height() + dy/2 - dy);
+ int const t = mi.base.solidLineThickness();
+ dim.des = max(0, dim1.height() + dy/2 - dy + t);
}
} //switch (kind_)
- metricsMarkers(mi, dim);
}
void InsetMathFrac::draw(PainterInfo & pi, int x, int y) const
{
- setPosCache(pi, x, y);
+ Changer dummy3 = pi.base.changeEnsureMath();
Dimension const dim = dimension(*pi.base.bv);
Dimension const dim0 = cell(0).dimension(*pi.base.bv);
switch (kind_) {
// 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);
+ cell(0).draw(pi, x, y);
xx += dim0.wid + 4;
unit_cell = 1;
}
Changer dummy = pi.base.font.changeShape(UP_SHAPE);
- cell(unit_cell).draw(pi, xx + 1, y);
+ cell(unit_cell).draw(pi, xx, y);
}
break;
// 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);
+ cell(2).draw(pi, x, y);
xx += cell(2).dimension(*pi.base.bv).wid + 4;
}
Changer dummy = (kind_ == UNITFRAC) ? pi.base.font.changeShape(UP_SHAPE)
- : Changer();
+ : noChange();
// nice fraction
Changer dummy2 = pi.base.changeScript();
- cell(0).draw(pi, xx + 2, y - dy);
+ cell(0).draw(pi, xx + 1, y - dy);
// reference LaTeX code from nicefrac.sty:
// \mkern-2mu/\mkern-1mu
if (latexkeys const * slash = slash_symbol()) {
int mkern = mathed_mu(pi.base.font, 2.0);
- mathedSymbolDraw(pi, xx + 2 + dim0.wid - mkern, y, slash);
+ mathedSymbolDraw(pi, xx + 1 + dim0.wid - mkern, y, slash);
Dimension dimslash;
mathedSymbolDim(pi.base, dimslash, slash);
xx += dimslash.wid - mathed_mu(pi.base.font, 3.0);
}
- cell(1).draw(pi, xx + 2 + dim0.wid, y);
+ cell(1).draw(pi, xx + 1 + dim0.wid, y);
}
break;
case DFRAC:
case TFRAC:
case OVER:
- case ATOP: {
- int const dy = dy_for_frac(pi.base);
+ case ATOP:
+ case AASTEX_CASE: {
+ int const dy = axis_height(pi.base);
Changer dummy =
// \tfrac is always in text size
- (kind_ == TFRAC) ? pi.base.font.changeStyle(LM_ST_SCRIPT) :
+ (kind_ == TFRAC) ? pi.base.font.changeStyle(SCRIPT_STYLE) :
// \cfrac and \dfrac are always in display size
(kind_ == CFRAC
|| kind_ == CFRACLEFT
|| kind_ == CFRACRIGHT
- || kind_ == DFRAC) ? pi.base.font.changeStyle(LM_ST_DISPLAY) :
+ || kind_ == DFRAC
+ || kind_ == AASTEX_CASE) ? pi.base.font.changeStyle(DISPLAY_STYLE) :
// all others
pi.base.changeFrac();
Dimension const dim1 = cell(1).dimension(*pi.base.bv);
- int m = x + dim.wid / 2;
- int xx =
+ int const m = x + dim.wid / 2;
+ int const xx =
// align left
- (kind_ == CFRACLEFT) ? x + 2 :
+ (kind_ == CFRACLEFT) ? x + 1 :
// align right
(kind_ == CFRACRIGHT) ? x + dim.wid - dim0.wid - 2 :
// center
m - dim0.wid / 2;
+ int const t = pi.base.solidLineThickness();
// take dy/2 for the spacing around the horizontal line. This is
// arbitrary. In LaTeX it is more complicated to ensure that displayed
// fractions line up next to each other.
+ // For more accurate implementation refer to the TeXbook, Appendix G,
+ // rules 15a-e.
cell(0).draw(pi, xx, y - dim0.des - dy/2 - dy);
// center
- cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc + dy/2 - dy);
+ cell(1).draw(pi, m - dim1.wid / 2, y + dim1.asc + dy/2 - dy + t);
// horizontal line
if (kind_ != ATOP)
- pi.pain.line(x + 1, y - dy,
- x + dim.wid - 2, y - dy,
- pi.base.font.color(), pi.pain.line_solid,
- pi.base.solidLineThickness());
+ pi.pain.line(x, y - dy, x + dim.wid, y - dy,
+ pi.base.font.color(), pi.pain.line_solid, t);
}
} //switch (kind_)
- drawMarkers(pi, x, y);
}
}
-void InsetMathFrac::write(WriteStream & os) const
+void InsetMathFrac::write(TeXMathStream & os) const
{
MathEnsurer ensurer(os);
switch (kind_) {
case CFRACRIGHT:
os << "\\cfrac[r]{" << cell(0) << "}{" << cell(1) << '}';
break;
+ case AASTEX_CASE:
+ os << "\\case{" << cell(0) << "}{" << cell(1) << '}';
+ break;
}
}
return from_ascii("unit");
case ATOP:
return from_ascii("atop");
+ case AASTEX_CASE:
+ return from_ascii("case");
+ default:
+ return docstring();
}
- // shut up stupid compiler
- return docstring();
}
}
-void InsetMathFrac::mathmlize(MathStream & os) const
+void InsetMathFrac::mathmlize(MathMLStream & ms) const
{
switch (kind_) {
case ATOP:
- os << MTag("mfrac", "linethickeness='0'")
+ ms << MTag("mfrac", "linethickness='0'")
<< MTag("mrow") << cell(0) << ETag("mrow")
- << MTag("mrow") << cell(1) << ETag("mrow")
- << ETag("mfrac");
+ << MTag("mrow") << cell(1) << ETag("mrow")
+ << ETag("mfrac");
break;
// we do not presently distinguish these
case CFRAC:
case CFRACLEFT:
case CFRACRIGHT:
- os << MTag("mfrac")
- << MTag("mrow") << cell(0) << ETag("mrow")
- << MTag("mrow") << cell(1) << ETag("mrow")
- << ETag("mfrac");
+ case AASTEX_CASE:
+ ms << MTag("mfrac")
+ << cell(0)
+ << cell(1)
+ << ETag("mfrac");
break;
case NICEFRAC:
- os << MTag("mfrac", "bevelled='true'")
- << MTag("mrow") << cell(0) << ETag("mrow")
- << MTag("mrow") << cell(1) << ETag("mrow")
- << ETag("mfrac");
+ ms << MTag("mfrac", "bevelled='true'")
+ << cell(0)
+ << cell(1)
+ << 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");
+ ms << cell(2);
+ ms << MTag("mfrac", "bevelled='true'")
+ << cell(0)
+ << cell(1)
+ << 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)
+ ms << cell(0)
<< MTag("mstyle mathvariant='normal'")
<< cell(1)
<< ETag("mstyle");
else
- os << MTag("mstyle mathvariant='normal'")
+ ms << MTag("mstyle mathvariant='normal'")
<< cell(0)
<< ETag("mstyle");
}
case CFRAC:
case CFRACLEFT:
case CFRACRIGHT:
+ case AASTEX_CASE:
os << MTag("span", "class='frac'")
<< MTag("span", "class='numer'") << cell(0) << ETag("span")
<< MTag("span", "class='denom'") << cell(1) << ETag("span")
// 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)
+ os << cell(0)
+ << MTag("span")
+ << cell(1)
<< ETag("span");
else
- os << MTag("span")
+ os << MTag("span")
<< cell(0)
<< ETag("span");
}
if (kind_ == CFRAC || kind_ == CFRACLEFT || kind_ == CFRACRIGHT
|| kind_ == DFRAC || kind_ == TFRAC)
features.require("amsmath");
+ if (kind_ == AASTEX_CASE)
+ features.require("aastex_case");
+
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);
}
void InsetMathBinom::metrics(MetricsInfo & mi, Dimension & dim) const
{
+ Changer dummy2 = mi.base.changeEnsureMath();
Dimension dim0, dim1;
- int const dy = dy_for_frac(mi.base);
+ int const dy = axis_height(mi.base);
Changer dummy =
- (kind_ == DBINOM) ? mi.base.font.changeStyle(LM_ST_DISPLAY) :
- (kind_ == TBINOM) ? mi.base.font.changeStyle(LM_ST_SCRIPT) :
+ (kind_ == DBINOM) ? mi.base.font.changeStyle(DISPLAY_STYLE) :
+ (kind_ == TBINOM) ? mi.base.font.changeStyle(SCRIPT_STYLE) :
mi.base.changeFrac();
cell(0).metrics(mi, dim0);
cell(1).metrics(mi, dim1);
dim.asc = dim0.height() + 1 + dy/2 + dy;
dim.des = max(0, dim1.height() + 1 + dy/2 - dy);
dim.wid = max(dim0.wid, dim1.wid) + 2 * dw(dim.height()) + 4;
- metricsMarkers2(mi, dim);
}
void InsetMathBinom::draw(PainterInfo & pi, int x, int y) const
{
+ Changer dummy2 = pi.base.changeEnsureMath();
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 const dy = dy_for_frac(pi.base);
+ int const dy = axis_height(pi.base);
// define the binom brackets
docstring const bra = kind_ == BRACE ? from_ascii("{") :
kind_ == BRACK ? from_ascii("[") : from_ascii("(");
int m = x + dim.width() / 2;
{
Changer dummy =
- (kind_ == DBINOM) ? pi.base.font.changeStyle(LM_ST_DISPLAY) :
- (kind_ == TBINOM) ? pi.base.font.changeStyle(LM_ST_SCRIPT) :
+ (kind_ == DBINOM) ? pi.base.font.changeStyle(DISPLAY_STYLE) :
+ (kind_ == TBINOM) ? pi.base.font.changeStyle(SCRIPT_STYLE) :
pi.base.changeFrac();
// take dy both for the vertical alignment and for the spacing between
// cells
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
+void InsetMathBinom::write(TeXMathStream & os) const
{
MathEnsurer ensurer(os);
switch (kind_) {
}
-void InsetMathBinom::mathmlize(MathStream & os) const
+void InsetMathBinom::mathmlize(MathMLStream & ms) const
{
char ldelim = ' ';
char rdelim = ' ';
rdelim = ']';
break;
}
- os << "<mo fence='true' stretchy='true' form='prefix'>" << ldelim << "</mo>"
- << "<mfrac linethickness='0'>"
+ ms << "<" << from_ascii(ms.namespacedTag("mo")) << " fence='true' stretchy='true' form='prefix'>"
+ << ldelim
+ << "</" << from_ascii(ms.namespacedTag("mo")) << ">"
+ << "<" << from_ascii(ms.namespacedTag("mfrac")) << " linethickness='0'>"
<< cell(0) << cell(1)
- << "</mfrac>"
- << "<mo fence='true' stretchy='true' form='postfix'>" << rdelim << "</mo>";
+ << "</" << from_ascii(ms.namespacedTag("mfrac")) << ">"
+ << "<" << from_ascii(ms.namespacedTag("mo")) << " fence='true' stretchy='true' form='postfix'>"
+ << rdelim
+ << "</" << from_ascii(ms.namespacedTag("mo")) << ">";
}
projects / lyx.git / blobdiff