procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make average width computation on ftcr more permissive (Bug#43058)

Browse source 
* src/ftcrfont.c (ftcrfont_open): Use only non-zero width glyphs for
computing average width.
This commit is contained in:
YAMAMOTO Mitsuharu 2022-09-26 09:57:23 +09:00
parent 76b7a59367
commit 9ed03040d5
1 changed files with 14 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/ftcrfont.c
View file

@ -233,6 +233,7 @@ ftcrfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
cairo_glyph_t stack_glyph;
font->min_width = font->max_width = 0;
font->average_width = font->space_width = 0;
int n = 0;
for (char c = 32; c < 127; c++)
{
cairo_glyph_t *glyphs = &stack_glyph;
@ -252,17 +253,20 @@ ftcrfont_open (struct frame *f, Lisp_Object entity, int pixel_size)
stack_glyph.index = 0;
}
int this_width = ftcrfont_glyph_extents (font, stack_glyph.index, NULL);
if (this_width > 0
&& (! font->min_width
|| font->min_width > this_width))
font->min_width = this_width;
if (this_width > font->max_width)
font->max_width = this_width;
if (c == 32)
font->space_width = this_width;
font->average_width += this_width;
if (this_width > 0)
{
if (! font->min_width || font->min_width > this_width)
font->min_width = this_width;
if (this_width > font->max_width)
font->max_width = this_width;
if (c == 32)
font->space_width = this_width;
font->average_width += this_width;
n++;
}
}
font->average_width /= 95;
if (n)
font->average_width /= n;
cairo_scaled_font_extents (ftcrfont_info->cr_scaled_font, &extents);
font->ascent = lround (extents.ascent);