anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-03 08:28:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve drawing of math roots (\sqrt and \root)

Browse Source 
This is preliminary work to make roots look more like in TeX output:

* correct font size for root order

* set minimum size of the root from the max ascent descent of the
  font. This is what TeX does.

* fix drawing, and in particular horizontal size.

More needs to be done, in particular:

* handle zooming and dpi correctly by removing hardcoded pixel values.

* factor the code for the two types of roots in one.
This commit is contained in:
Jean-Marc Lasgouttes 2017-03-31 18:50:14 +02:00
parent da590925cd
commit 758de9577d
2 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/mathed/InsetMathRoot.cpp
View File

@ -15,6 +15,7 @@
#include "MathData.h" #include "MathData.h"
#include "MathStream.h" #include "MathStream.h"
#include "MathSupport.h"
#include "Cursor.h" #include "Cursor.h"
#include "LaTeXFeatures.h" #include "LaTeXFeatures.h"
@ -42,27 +43,44 @@ Inset * InsetMathRoot::clone() const
void InsetMathRoot::metrics(MetricsInfo & mi, Dimension & dim) const void InsetMathRoot::metrics(MetricsInfo & mi, Dimension & dim) const
{ {
Changer dummy = mi.base.changeEnsureMath(); Changer dummy = mi.base.changeEnsureMath();
cellsMetrics(mi); Dimension dim0;
Dimension const & dim0 = cell(0).dimension(*mi.base.bv); {
Dimension const & dim1 = cell(1).dimension(*mi.base.bv); Changer script = mi.base.font.changeStyle(LM_ST_SCRIPTSCRIPT);
dim.asc = max(dim0.ascent() + 5, dim1.ascent()) + 2; cell(0).metrics(mi, dim0);
dim.des = max(dim0.descent() - 5, dim1.descent()) + 2; // make sure that the dim is high enough for any character
dim.wid = dim0.width() + dim1.width() + 10; Dimension fontDim;
math_font_max_dim(mi.base.font, fontDim.asc, fontDim.des);
dim0 += fontDim;
}
Dimension dim1;
cell(1).metrics(mi, dim1);
// make sure that the dim is high enough for any character
Dimension fontDim;
math_font_max_dim(mi.base.font, fontDim.asc, fontDim.des);
dim1 += fontDim;
dim.asc = max(dim0.ascent() + 5, dim1.ascent()) + 1;
dim.des = max(dim0.descent() - 5, dim1.descent());
dim.wid = dim0.width() + dim1.width() + 4;
} }
void InsetMathRoot::draw(PainterInfo & pi, int x, int y) const void InsetMathRoot::draw(PainterInfo & pi, int x, int y) const
{ {
Changer dummy = pi.base.changeEnsureMath(); Changer dummy = pi.base.changeEnsureMath();
Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
int const w = dim0.width();
// the "exponent"
cell(0).draw(pi, x, y - 5 - dim0.descent());
// the "base"
cell(1).draw(pi, x + w + 8, y);
Dimension const dim = dimension(*pi.base.bv); Dimension const dim = dimension(*pi.base.bv);
int const a = dim.ascent(); int const a = dim.ascent();
int const d = dim.descent(); int const d = dim.descent();
Dimension const & dim0 = cell(0).dimension(*pi.base.bv);
int const w = dim0.width();
// the "exponent"
{
Changer script = pi.base.font.changeStyle(LM_ST_SCRIPTSCRIPT);
cell(0).draw(pi, x, y + (d - a)/2 - dim0.descent());
}
// the "base"
cell(1).draw(pi, x + w + 4, y);
int xp[4]; int xp[4];
int yp[4]; int yp[4];
pi.pain.line(x + dim.width(), y - a + 1, pi.pain.line(x + dim.width(), y - a + 1,

11
src/mathed/InsetMathSqrt.cpp
View File

@ -14,6 +14,7 @@
#include "MathData.h" #include "MathData.h"
#include "MathStream.h" #include "MathStream.h"
#include "MathSupport.h"
#include "LaTeXFeatures.h" #include "LaTeXFeatures.h"
#include "MetricsInfo.h" #include "MetricsInfo.h"
@ -39,9 +40,13 @@ void InsetMathSqrt::metrics(MetricsInfo & mi, Dimension & dim) const
{ {
Changer dummy = mi.base.changeEnsureMath(); Changer dummy = mi.base.changeEnsureMath();
cell(0).metrics(mi, dim); cell(0).metrics(mi, dim);
dim.asc += 4; // make sure that the dim is high enough for any character
dim.des += 2; Dimension fontDim;
dim.wid += 12; math_font_max_dim(mi.base.font, fontDim.asc, fontDim.des);
dim += fontDim;
// Some room for the decoration
dim.asc += 1;
dim.wid += 7;
} }