fonts: Add Japanese FixedSys font.

fonts/.gitignore

@@ -9,6 +9,7 @@
 /cvgasys.fon
 /hvgasys.fon
 /jsmalle.fon
+/jvgafix.fon
 /jvgasys.fon
 /smae1255.fon
 /smae1256.fon

fonts/Makefile.in

@@ -12,6 +12,7 @@ BITMAP_FONTS  = \
 	cvgasys.fon \
 	hvgasys.fon \
 	jsmalle.fon \
+	jvgafix.fon \
 	jvgasys.fon \
 	smalle.fon \
 	smallee.fon \
@@ -91,6 +92,9 @@ coue1257.fon: courier.ttf
 vgafix.fon: fixedsys.ttf
 	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys.ttf 15,1252,8
 
+jvgafix.fon: fixedsys_jp.ttf
+	$(LDPATH) $(SFNT2FNT) -o $@ -d 128 $(srcdir)/fixedsys_jp.ttf 18,932,8
+
 sserife.fon: ms_sans_serif.ttf
 	$(LDPATH) $(SFNT2FNT) -o $@ -d 129 $(srcdir)/ms_sans_serif.ttf 13,1252,5 16,1252,7 20,1252,8
 

tools/sfnt2fnt.c

@@ -432,8 +432,8 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc,
     else if (!strcmp(face->family_name, "Fixedsys"))
         il = 3;
 
-    /* Japanese system fonts have an external leading (not small font) */
-    if (enc == 932 && ppem > 11)
+    /* Japanese System font has an external leading */
+    if (!strcmp(face->family_name, "System") && enc == 932)
         el = 2;
     else
         el = 0;
@@ -529,7 +529,7 @@ static struct fontinfo *fill_fontinfo( const char *face_name, int ppem, int enc,
     }
 
     info->hdr.fi.dfAvgWidth = avg_width;
-    info->hdr.fi.dfMaxWidth = max_width;
+    info->hdr.fi.dfMaxWidth = (enc == 932) ? avg_width * 2 : max_width;
     info->hdr.fi.dfDefaultChar = def_char - info->hdr.fi.dfFirstChar;
     info->hdr.fi.dfBreakChar = ' ' - info->hdr.fi.dfFirstChar;
     info->hdr.fi.dfWidthBytes = (width_bytes + 1) & ~1;