Re: Line height too small with Monaco font on Mac OS X

[David Reitter <david.reitter@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 628 bytes --]

Francis,

On Feb 8, 2010, at 6:10 AM, Francis Devereux wrote:

> Could someone have a look at the patch I added to http://debbugs.gnu.org/cgi/bugreport.cgi?bug=3975 and apply it if it looks OK?

This looks good to me.  It doesn't affect other font sizes (at least not Monaco 13).  Thanks for fixing this problem.

I've reformatted it a little for coding style - see attached.

Could someone with a bzr setup commit this by any chance?



2010-02-08  Francis Devereux <francis@devrx.org>

	* nsfont.m (nsfont_open): Round descender dimension 
	towards greater height as to not cause clipping
	(Bug #3975).



[-- Attachment #1.2: lineheight.patch --]
[-- Type: application/octet-stream, Size: 1383 bytes --]

diff --git a/src/nsfont.m b/src/nsfont.m
index d5107f3..6b258ce 100644
--- a/src/nsfont.m
+++ b/src/nsfont.m
@@ -844,8 +844,11 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
     /* max bounds */
     font_info->max_bounds.ascent =
       lrint (hshrink * [sfont ascender] + expand * hd/2);
+    /* [sfont descender] is usually negative, so we use floor to round
+       towards the integer with the greater magnitude so that we don't
+       clip any descenders. */
     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->max_bounds.ascent + font_info->max_bounds.descent;
     font_info->max_bounds.width = lrint (font_info->width);
@@ -878,10 +881,9 @@ nsfont_open (FRAME_PTR f, Lisp_Object font_entity, int pixel_size)
       font_info->cgfont = CGFontCreateWithPlatformFont ((void*)&atsFont);
     }
 #endif
-
     /* set up metrics portion of font struct */
-    font->ascent = [sfont ascender];
-    font->descent = -[sfont descender];
+    font->ascent = lrint ([sfont ascender]);
+    font->descent = -lrint (floor([sfont descender])); 
     font->min_width = ns_char_width(sfont, '|');
     font->space_width = lrint (ns_char_width (sfont, ' '));
     font->average_width = lrint (font_info->width);

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 203 bytes --]