[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs/src nsfont.m
From: |
David Reitter |
Subject: |
[Emacs-diffs] emacs/src nsfont.m |
Date: |
Mon, 27 Apr 2009 21:21:32 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Changes by: David Reitter <davidswelt> 09/04/27 21:21:32
Modified files:
src : nsfont.m
Log message:
nsfont.m (nsfont_open): remove unused variable shrink. Remove
commented-out code.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/src/nsfont.m?cvsroot=emacs&r1=1.21&r2=1.22
Patches:
Index: nsfont.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsfont.m,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- nsfont.m 13 Apr 2009 18:45:15 -0000 1.21
+++ nsfont.m 27 Apr 2009 21:21:31 -0000 1.22
@@ -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);
@@ -661,20 +661,8 @@
/* standard height, similar to Carbon. Emacs.app: was 0.5 by default. */
expand = 0.0;
- shrink = 1.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 */
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs/src nsfont.m,
David Reitter <=