marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add System font for the Chinese codepages cp936 and cp950. Of course 

they don't contain any ideographs (and nor should they).
oldstable
Huw Davies 2005-08-19 09:57:47 +00:00 committed by Alexandre Julliard
parent ad3a5ed5e4
commit 84ae4d8bd1
3 changed files with 35 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fonts/.cvsignore
View File

@ -6,6 +6,7 @@ wine_courier-1250-96-13.fnt
wine_courier-1251-96-13.fnt
wine_courier-1252-96-13.fnt
wine_courier.ttf
wine_cvgasys.fon
wine_marlett.ttf
wine_sans_serif-1250-96-13.fnt
wine_sans_serif-1250-96-16.fnt
@ -19,9 +20,12 @@ wine_sans_serif.ttf
wine_sserife.fon
wine_sserifee.fon
wine_sserifer.fon
wine_svgasys.fon
wine_system-1250-96-16.fnt
wine_system-1251-96-16.fnt
wine_system-1252-96-16.fnt
wine_system-936-96-16.fnt
wine_system-950-96-16.fnt
wine_system.ttf
wine_vgasys.fon
wine_vgasyse.fon

30
fonts/Makefile.in
View File

@ -14,7 +14,9 @@ BITMAP_FONTS = \
wine_sserifer.fon \
wine_vgasys.fon \
wine_vgasyse.fon \
wine_vgasysr.fon
wine_vgasysr.fon \
wine_svgasys.fon \
wine_cvgasys.fon
TRUETYPE_FONTS = \
wine_marlett.ttf
@ -78,6 +80,21 @@ wine_system-1250-96-16.fnt: wine_system.ttf $(SFNT2FNT)
wine_system-1251-96-16.fnt: wine_system.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 1251 96 128 7
wine_system-936-96-16.fnt: wine_system.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 936 96 128 7
wine_system-950-96-16.fnt: wine_system.ttf $(SFNT2FNT)
$(LDPATH) $(SFNT2FNT) $< 16 950 96 128 7
wine_coure.fon: wine_courier-1252-96-13.fnt $(FNT2FON)
$(FNT2FON) wine_courier-1252-96-13.fnt $@
wine_couree.fon: wine_courier-1250-96-13.fnt $(FNT2FON)
$(FNT2FON) wine_courier-1250-96-13.fnt $@
wine_courer.fon: wine_courier-1251-96-13.fnt $(FNT2FON)
$(FNT2FON) wine_courier-1251-96-13.fnt $@
wine_sserife.fon: wine_sans_serif-1252-96-13.fnt wine_sans_serif-1252-96-16.fnt wine_sans_serif-1252-96-20.fnt $(FNT2FON)
$(FNT2FON) wine_sans_serif-1252-96-13.fnt wine_sans_serif-1252-96-16.fnt wine_sans_serif-1252-96-20.fnt $@
@ -96,14 +113,11 @@ wine_vgasyse.fon: wine_system-1250-96-16.fnt $(FNT2FON)
wine_vgasysr.fon: wine_system-1251-96-16.fnt $(FNT2FON)
$(FNT2FON) wine_system-1251-96-16.fnt $@
wine_coure.fon: wine_courier-1252-96-13.fnt $(FNT2FON)
$(FNT2FON) wine_courier-1252-96-13.fnt $@
wine_svgasys.fon: wine_system-936-96-16.fnt wine_system-1252-96-16.fnt $(FNT2FON)
$(FNT2FON) wine_system-936-96-16.fnt wine_system-1252-96-16.fnt $@
wine_couree.fon: wine_courier-1250-96-13.fnt $(FNT2FON)
$(FNT2FON) wine_courier-1250-96-13.fnt $@
wine_courer.fon: wine_courier-1251-96-13.fnt $(FNT2FON)
$(FNT2FON) wine_courier-1251-96-13.fnt $@
wine_cvgasys.fon: wine_system-950-96-16.fnt wine_system-1252-96-16.fnt $(FNT2FON)
$(FNT2FON) wine_system-950-96-16.fnt wine_system-1252-96-16.fnt $@
install:: $(FONTS)
$(MKINSTALLDIRS) $(fontdir)

13
tools/sfnt2fnt.c
View File

@ -134,9 +134,14 @@ static void fill_fontinfo(FT_Face face, int enc, FILE *fp, int dpi, unsigned cha
fprintf(stderr, "Can't find codepage %d\n", enc);
exit(1);
}
if(cptable->info.char_size != 1) {
fprintf(stderr, "Can't cope with double byte codepages\n");
exit(1);
/* for double byte charsets we actually want to use cp1252 */
cptable = wine_cp_get_table(1252);
if(!cptable) {
fprintf(stderr, "Can't find codepage 1252\n");
exit(1);
}
}
ppem = face->size->metrics.y_ppem;
@ -154,8 +159,8 @@ static void fill_fontinfo(FT_Face face, int enc, FILE *fp, int dpi, unsigned cha
}
il = ascent - (face->glyph->metrics.height >> 6);
/* Hack: Courier has no internal leading, so we do likewise */
if(!strcmp(face->family_name, "Wine Courier"))
/* Hack: Courier has no internal leading, nor do any Chinese fonts */
if(!strcmp(face->family_name, "Wine Courier") || enc == 936 || enc == 950)
il = 0;
first_char = FT_Get_First_Char(face, &gi);