commit 84ae4d8bd19a24b015e85467fd65bc1b288d9803
author Huw Davies <huw@codeweavers.com> Fri Aug 19 09:57:47 2005 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Aug 19 09:57:47 2005 +0000
tree e0720bbd9161a763d7ad13a362f8088f93c96ee9
parent ad3a5ed5e41cbbd470c2fcde9ee8aa597769a613

Add System font for the Chinese codepages cp936 and cp950. Of course
they don't contain any ideographs (and nor should they).

tools/sfnt2fnt.c

diff --git a/tools/sfnt2fnt.c b/tools/sfnt2fnt.c
index 1a1953d..abc2d2d 100644
--- a/tools/sfnt2fnt.c
+++ b/tools/sfnt2fnt.c
@@ -134,9 +134,14 @@
         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 @@
     }
     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);