[84205] trunk/dports/aqua/emacs-app/files

[hum at macports.org]

Revision: 84205
          http://trac.macports.org/changeset/84205
Author:   hum at macports.org
Date:     2011-09-20 09:05:11 -0700 (Tue, 20 Sep 2011)
Log Message:
-----------
emacs-app: correct patch filename (patch-macemacsjp-jpfont.diff); see #31323.

Added Paths:
-----------
    trunk/dports/aqua/emacs-app/files/patch-macemacsjp-jpfont.diff

Removed Paths:
-------------
    trunk/dports/aqua/emacs-app/files/patch-macemacsjp-font.diff

Deleted: trunk/dports/aqua/emacs-app/files/patch-macemacsjp-font.diff
===================================================================
--- trunk/dports/aqua/emacs-app/files/patch-macemacsjp-font.diff	2011-09-20 15:45:32 UTC (rev 84204)
+++ trunk/dports/aqua/emacs-app/files/patch-macemacsjp-font.diff	2011-09-20 16:05:11 UTC (rev 84205)
@@ -1,30 +0,0 @@
-diff -pr ../emacs-23.3/src/nsfont.m src/nsfont.m
-*** ../emacs-23.3/src/nsfont.m	2011-01-09 02:45:14.000000000 +0900
---- src/nsfont.m	2011-03-21 17:11:01.000000000 +0900
-*************** nsfont_open (FRAME_PTR f, Lisp_Object fo
-*** 846,853 ****
-        lrint (hshrink * [sfont ascender] + expand * hd/2);
-      /* [sfont descender] is usually negative.  Use floor to avoid
-         clipping descenders. */
-!     font_info->max_bounds.descent =
-!       -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);
---- 846,861 ----
-        lrint (hshrink * [sfont ascender] + expand * hd/2);
-      /* [sfont descender] is usually negative.  Use floor to avoid
-         clipping descenders. */
-!     if ([sfont mostCompatibleStringEncoding] == 0x80000001) {
-!       /* If the font is Japanese (Mac OS) encoding, change descender to 2 times.
-!          Because most of Japanese font's decender, such as Hiragino, is 
-!          too short. */
-!       font_info->max_bounds.descent = 
-!         -lrint (floor(hshrink* [sfont descender] * 2 - expand*hd/2));
-!     } else {
-!       font_info->max_bounds.descent = 
-!         -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);

Copied: trunk/dports/aqua/emacs-app/files/patch-macemacsjp-jpfont.diff (from rev 84204, trunk/dports/aqua/emacs-app/files/patch-macemacsjp-font.diff)
===================================================================
--- trunk/dports/aqua/emacs-app/files/patch-macemacsjp-jpfont.diff	                        (rev 0)
+++ trunk/dports/aqua/emacs-app/files/patch-macemacsjp-jpfont.diff	2011-09-20 16:05:11 UTC (rev 84205)
@@ -0,0 +1,30 @@
+diff -pr ../emacs-23.3/src/nsfont.m src/nsfont.m
+*** ../emacs-23.3/src/nsfont.m	2011-01-09 02:45:14.000000000 +0900
+--- src/nsfont.m	2011-03-21 17:11:01.000000000 +0900
+*************** nsfont_open (FRAME_PTR f, Lisp_Object fo
+*** 846,853 ****
+        lrint (hshrink * [sfont ascender] + expand * hd/2);
+      /* [sfont descender] is usually negative.  Use floor to avoid
+         clipping descenders. */
+!     font_info->max_bounds.descent =
+!       -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);
+--- 846,861 ----
+        lrint (hshrink * [sfont ascender] + expand * hd/2);
+      /* [sfont descender] is usually negative.  Use floor to avoid
+         clipping descenders. */
+!     if ([sfont mostCompatibleStringEncoding] == 0x80000001) {
+!       /* If the font is Japanese (Mac OS) encoding, change descender to 2 times.
+!          Because most of Japanese font's decender, such as Hiragino, is 
+!          too short. */
+!       font_info->max_bounds.descent = 
+!         -lrint (floor(hshrink* [sfont descender] * 2 - expand*hd/2));
+!     } else {
+!       font_info->max_bounds.descent = 
+!         -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);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110920/25fb029a/attachment.html>