anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 21:21:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix display of nicefrac solidus

Browse Source
This commit is contained in:
Guillaume Munch 2016-11-20 22:51:49 +01:00
parent fdd09d6f51
commit cf45810e43
1 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/mathed/InsetMathFrac.cpp
View File

@ -14,11 +14,13 @@
#include "InsetMathFrac.h" #include "InsetMathFrac.h"
#include "Cursor.h"
#include "LaTeXFeatures.h"
#include "MathData.h" #include "MathData.h"
#include "MathParser.h"
#include "MathStream.h" #include "MathStream.h"
#include "MathSupport.h" #include "MathSupport.h"
#include "Cursor.h"
#include "LaTeXFeatures.h"
#include "MetricsInfo.h" #include "MetricsInfo.h"
#include "TextPainter.h" #include "TextPainter.h"
@ -170,6 +172,13 @@ int dy_for_nicefrac(MetricsBase & mb)
return big_m - small_m; return big_m - small_m;
} }
// symbol for nicefrac solidus
latexkeys const * slash_symbol()
{
return in_word_set(from_ascii("slash"));
}
} // anon namespace } // anon namespace
@ -202,21 +211,32 @@ void InsetMathFrac::metrics(MetricsInfo & mi, Dimension & dim) const
case NICEFRAC: { case NICEFRAC: {
// \unitfrac, \unitfracthree, \nicefrac // \unitfrac, \unitfracthree, \nicefrac
dim.wid = 0; dim.wid = 0;
dim.asc = 0;
dim.des = 0;
int const dy = dy_for_nicefrac(mi.base); int const dy = dy_for_nicefrac(mi.base);
// is there an extra cell holding the value being given a dimension? // is there an extra cell holding the value being given a dimension?
// (this is \unitfracthree) // (this is \unitfracthree)
if (kind_ == UNITFRAC && nargs() == 3) { if (kind_ == UNITFRAC && nargs() == 3) {
cell(2).metrics(mi, dim2); cell(2).metrics(mi, dim2);
dim.wid += dim2.wid + 4; dim.wid += dim2.wid + 4;
dim.asc = dim2.asc;
dim.des = dim2.des;
} }
Changer dummy = (kind_ == UNITFRAC) ? mi.base.font.changeShape(UP_SHAPE) Changer dummy = (kind_ == UNITFRAC) ? mi.base.font.changeShape(UP_SHAPE)
: Changer(); : Changer();
Changer dummy2 = mi.base.changeScript(); Changer dummy2 = mi.base.changeScript();
if (latexkeys const * slash = slash_symbol()) {
Dimension dimslash;
mathedSymbolDim(mi.base, dimslash, slash);
dim.wid += dimslash.wid - mathed_mu(mi.base.font, 3.0);
dim.asc = max(dim.asc, dimslash.asc);
dim.des = max(dim.des, dimslash.des);
}
cell(0).metrics(mi, dim0); cell(0).metrics(mi, dim0);
cell(1).metrics(mi, dim1); cell(1).metrics(mi, dim1);
dim.wid += dim0.wid + dim1.wid + 5; dim.wid += dim0.wid + dim1.wid + 2;
dim.asc = max(max(dim2.asc, dim0.asc + dy), dim1.asc); dim.asc = max(max(dim.asc, dim0.asc + dy), dim1.asc);
dim.des = max(max(dim2.des, dim0.des - dy), dim1.des); dim.des = max(max(dim.des, dim0.des - dy), dim1.des);
} }
break; break;
@ -286,16 +306,18 @@ void InsetMathFrac::draw(PainterInfo & pi, int x, int y) const
Changer dummy = (kind_ == UNITFRAC) ? pi.base.font.changeShape(UP_SHAPE) Changer dummy = (kind_ == UNITFRAC) ? pi.base.font.changeShape(UP_SHAPE)
: Changer(); : Changer();
// nice fraction // nice fraction
// FIXME:
// * the solidus should be \kern-2mu/\kern-1mu.
Changer dummy2 = pi.base.changeScript(); Changer dummy2 = pi.base.changeScript();
cell(0).draw(pi, xx + 2, y - dy); cell(0).draw(pi, xx + 2, y - dy);
cell(1).draw(pi, xx + dim0.wid + 5, y); // reference LaTeX code from nicefrac.sty:
// Diag line: // \mkern-2mu/\mkern-1mu
pi.pain.line(xx + dim0.wid + 1, y + dim.des - 2, if (latexkeys const * slash = slash_symbol()) {
xx + dim0.wid + 6, y - dim.asc + 2, int mkern = mathed_mu(pi.base.font, 2.0);
pi.base.font.color(), pi.pain.line_solid, mathedSymbolDraw(pi, xx + 2 + dim0.wid - mkern, y, slash);
pi.base.solidLineThickness()); 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);
} }
break; break;