system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-07-20 22:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fonts: Correct External leading for japanese small font and enable fontmetric test for the font.

Browse source
This commit is contained in:
Aric Stewart 2007-12-26 08:15:06 -06:00 committed by Alexandre Julliard
parent 1f90e88657
commit a8e62526f7
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
dlls/gdi32/tests/font.c
View file

@ -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 }

4
tools/sfnt2fnt.c
View file

@ -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;