Commit 14a225f9 authored by Chong Yidong's avatar Chong Yidong
Browse files

* nsfont.m (nsfont_open): The system's value for the font descent

is negative, so round it down to avoid clipping.
parent f29fd869
2010-02-08 Francis Devereux <francis@devrx.org>
* nsfont.m (nsfont_open): The system's value for the font descent
is negative, so round it down to avoid clipping.
2010-02-06 Chong Yidong <cyd@stupidchicken.com> 2010-02-06 Chong Yidong <cyd@stupidchicken.com>
* charset.c (load_charset_map_from_file) * charset.c (load_charset_map_from_file)
......
...@@ -844,8 +844,10 @@ when setting family in ns_spec_to_descriptor(). */ ...@@ -844,8 +844,10 @@ when setting family in ns_spec_to_descriptor(). */
/* max bounds */ /* max bounds */
font_info->max_bounds.ascent = font_info->max_bounds.ascent =
lrint (hshrink * [sfont ascender] + expand * hd/2); lrint (hshrink * [sfont ascender] + expand * hd/2);
/* [sfont descender] is usually negative. Use floor to avoid
clipping descenders. */
font_info->max_bounds.descent = font_info->max_bounds.descent =
-lrint (hshrink* [sfont descender] - expand*hd/2); -lrint (floor(hshrink* [sfont descender] - expand*hd/2));
font_info->height = font_info->height =
font_info->max_bounds.ascent + font_info->max_bounds.descent; font_info->max_bounds.ascent + font_info->max_bounds.descent;
font_info->max_bounds.width = lrint (font_info->width); font_info->max_bounds.width = lrint (font_info->width);
...@@ -880,8 +882,8 @@ when setting family in ns_spec_to_descriptor(). */ ...@@ -880,8 +882,8 @@ when setting family in ns_spec_to_descriptor(). */
#endif #endif
/* set up metrics portion of font struct */ /* set up metrics portion of font struct */
font->ascent = [sfont ascender]; font->ascent = lrint([sfont ascender]);
font->descent = -[sfont descender]; font->descent = -lrint(floor([sfont descender]));
font->min_width = ns_char_width(sfont, '|'); font->min_width = ns_char_width(sfont, '|');
font->space_width = lrint (ns_char_width (sfont, ' ')); font->space_width = lrint (ns_char_width (sfont, ' '));
font->average_width = lrint (font_info->width); font->average_width = lrint (font_info->width);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment