Mercurial > emacs
changeset 103082:a9a213b44de2
nsfont.m (nsfont_open): remove unused variable shrink. Remove commented-out code.
| author | David Reitter <david.reitter@gmail.com> |
|---|---|
| date | Mon, 27 Apr 2009 21:21:31 +0000 |
| parents | 5a639dbfcbd6 |
| children | dcf1f34f1713 |
| files | src/nsfont.m |
| diffstat | 1 files changed, 2 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/nsfont.m Mon Apr 27 21:20:55 2009 +0000 +++ b/src/nsfont.m Mon Apr 27 21:21:31 2009 +0000 @@ -630,7 +630,7 @@ font->props[FONT_FILE_INDEX] = Qnil; { - double expand, shrink, hshrink; + double expand, hshrink; float full_height, min_height, hd; const char *fontName = [[nsfont fontName] UTF8String]; int len = strlen (fontName); @@ -660,21 +660,9 @@ hd = full_height - min_height; /* standard height, similar to Carbon. Emacs.app: was 0.5 by default. */ - expand = 0.0; - shrink = 1.0; + expand = 0.0; hshrink = 1.0; - /* - if (expand < 0.0) - { - shrink = 1 + expand; - hshrink = 1 + expand / 2.0; - expand = 0.0; - } - else - shrink = hshrink = 1.0; - */ - font_info->underpos = 2; /*[sfont underlinePosition] is often clipped out */ font_info->underwidth = [sfont underlineThickness]; font_info->size = font->pixel_size; @@ -691,7 +679,6 @@ font_info->max_bounds.lbearing = lrint (brect.origin.x); font_info->max_bounds.rbearing = lrint (brect.size.width - font_info->width); - /*font_info->width + (font_info->ital ? 0.2 * font_info->height : 0); */ #ifdef NS_IMPL_COCOA /* set up synthItal and the CG font */