anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-28 20:45:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Improve display of ellipsis special char

Browse Source 
Follow the TeXbook and use a half space as separation.
This commit is contained in:
Jean-Marc Lasgouttes 2023-03-15 10:48:31 +01:00
parent 8e190c09f2
commit a2378c1182
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/insets/InsetSpecialChar.cpp
View File

@ -191,8 +191,7 @@ void drawLogo(PainterInfo & pi, int & x, int const y, InsetSpecialChar::Kind kin
void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
{ {
frontend::FontMetrics const & fm = frontend::FontMetrics const & fm = theFontMetrics(mi.base.font);
theFontMetrics(mi.base.font);
dim.asc = fm.maxAscent(); dim.asc = fm.maxAscent();
dim.des = 0; dim.des = 0;
dim.wid = 0; dim.wid = 0;
@ -211,7 +210,9 @@ void InsetSpecialChar::metrics(MetricsInfo & mi, Dimension & dim) const
s = from_ascii("."); s = from_ascii(".");
break; break;
case LDOTS: case LDOTS:
s = from_ascii(". . ."); // see comment in draw().
dim.wid = 3 * fm.width(char_type('.'))
+ 3 * fm.width(char_type(' ')) / 2;
break; break;
case MENU_SEPARATOR: case MENU_SEPARATOR:
// ▹ U+25B9 WHITE RIGHT-POINTING SMALL TRIANGLE // ▹ U+25B9 WHITE RIGHT-POINTING SMALL TRIANGLE
@ -285,15 +286,20 @@ void InsetSpecialChar::draw(PainterInfo & pi, int x, int y) const
case LDOTS: case LDOTS:
{ {
font.setColor(Color_special); font.setColor(Color_special);
string ell = ". . . "; /* \textellipsis uses a \fontdimen3 is spacing. The TeXbook
docstring dell(ell.begin(), ell.end()); * tells us that \fontdimen3 is the interword stretch, and
pi.pain.text(x, y, dell, font); * that this is usually half a space.
*/
frontend::FontMetrics const & fm = theFontMetrics(font);
int wid1 = fm.width(char_type('.')) + fm.width(char_type(' ')) / 2;
pi.pain.text(x, y, char_type('.'), font);
pi.pain.text(x + wid1, y, char_type('.'), font);
pi.pain.text(x + 2 * wid1, y, char_type('.'), font);
break; break;
} }
case MENU_SEPARATOR: case MENU_SEPARATOR:
{ {
frontend::FontMetrics const & fm = frontend::FontMetrics const & fm = theFontMetrics(font);
theFontMetrics(font);
// There is a \thinspace on each side of the triangle // There is a \thinspace on each side of the triangle
x += fm.em() / 6; x += fm.em() / 6;