anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-23 10:18:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Factor code for math axis height

Browse Source
This commit is contained in:
Guillaume Munch 2016-12-20 00:15:59 +01:00
parent e02f287f8b
commit a44e7aa915
3 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/mathed/InsetMathFrac.cpp
View File

@ -154,14 +154,6 @@ MathClass InsetMathFrac::mathClass() const
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)
{
@ -249,7 +241,7 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
case TFRAC:
case OVER:
case ATOP: {
int const dy = dy_for_frac(mi.base);
int const dy = axis_height(mi.base);
Changer dummy =
// \tfrac is always in text size
(kind_ == TFRAC) ? mi.base.font.changeStyle(LM_ST_SCRIPT) :
@ -332,7 +324,7 @@ void InsetMathFrac::draw(PainterInfo & pi, int x, int y) const
case TFRAC:
case OVER:
case ATOP: {
int const dy = dy_for_frac(pi.base);
int const dy = axis_height(pi.base);
Changer dummy =
// \tfrac is always in text size
(kind_ == TFRAC) ? pi.base.font.changeStyle(LM_ST_SCRIPT) :
@ -658,7 +650,7 @@ 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) :
@ -678,7 +670,7 @@ 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);
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("(");

7
src/mathed/MathSupport.cpp
View File

@ -985,4 +985,11 @@ docstring asString(MathAtom const & at)
}
int axis_height(MetricsBase & mb)
{
Changer dummy = mb.changeFontSet("mathnormal");
return theFontMetrics(mb.font).ascent('-') - 1;
}
} // namespace lyx

3
src/mathed/MathSupport.h
View File

@ -81,6 +81,9 @@ docstring asString(MathAtom const &);
// converts string to single cell
void asArray(docstring const &, MathData &, Parse::flags f = Parse::NORMAL);
// simulate axis height (font dimension sigma 22)
int axis_height(MetricsBase & mb);
} // namespace lyx
#endif