Aric Stewart : fonts: Correct External leading for japanese small font and enable fontmetric test for the font .
Alexandre Julliard
julliard at winehq.org
Thu Dec 27 08:31:31 CST 2007
Module: wine
Branch: master
Commit: a8e62526f7ba17f5f4c3c1d8c4fb7a24ec87a99b
URL: http://source.winehq.org/git/wine.git/?a=commit;h=a8e62526f7ba17f5f4c3c1d8c4fb7a24ec87a99b
Author: Aric Stewart <aric at codeweavers.com>
Date: Wed Dec 26 08:15:06 2007 -0600
fonts: Correct External leading for japanese small font and enable fontmetric test for the font.
---
dlls/gdi32/tests/font.c | 3 +--
tools/sfnt2fnt.c | 4 ++--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c
index 0893b87..d38ec8d 100644
--- a/dlls/gdi32/tests/font.c
+++ b/dlls/gdi32/tests/font.c
@@ -347,8 +347,7 @@ static void test_bitmap_font_metrics(void)
{ "Small Fonts", FW_NORMAL, 10, 8, 2, 2, 0, 5, 8, CP1251_BIT },
{ "Small Fonts", FW_NORMAL, 10, 8, 2, 0, 0, 6, 12, CP932_BIT },
{ "Small Fonts", FW_NORMAL, 11, 9, 2, 2, 0, 5, 9, CP1252_BIT | CP1250_BIT | CP1251_BIT },
-/* No proper small font for Japanese yet */
-/* { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, CP932_BIT }, */
+ { "Small Fonts", FW_NORMAL, 11, 9, 2, 0, 0, 7, 14, CP932_BIT },
{ "Fixedsys", FW_NORMAL, 15, 12, 3, 3, 0, 8, 8, CP1252_BIT | CP1250_BIT },
{ "Fixedsys", FW_NORMAL, 16, 12, 4, 3, 0, 8, 8, CP1251_BIT },
{ "FixedSys", FW_NORMAL, 18, 16, 2, 0, 0, 8, 16, CP932_BIT }
diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c
index 8868c66..0a32598 100644
--- a/tools/sfnt2fnt.c
+++ b/tools/sfnt2fnt.c
@@ -312,8 +312,8 @@ static void fill_fontinfo(FT_Face face, int enc, FILE *fp, int dpi, unsigned cha
/* Hack: Courier has no internal leading, nor do any Chinese or Japanese fonts */
if(!strcmp(face->family_name, "Courier") || enc == 936 || enc == 950 || enc == 932)
il = 0;
- /* Japanese fonts have an external leading */
- if(enc == 932)
+ /* Japanese system fonts have an external leading (not small font) */
+ if (enc == 932 && ppem > 11)
el = 2;
else
el = 0;
More information about the wine-cvs
mailing list