diff -ru efont-unicode-bdf-0.4.0-src/Makefile.in efont-unicode-bdf-0.4.0-src.new/Makefile.in --- efont-unicode-bdf-0.4.0-src/Makefile.in 2001-11-03 08:52:54.000000000 +0100 +++ efont-unicode-bdf-0.4.0-src.new/Makefile.in 2003-01-09 13:22:56.000000000 +0100 @@ -36,7 +36,8 @@ $(H10SOURCES) $(F10SOURCES) BDFFILES = h24.bdf b24.bdf h16.bdf b16.bdf h14.bdf b14.bdf h12.bdf b12.bdf \ - h10.bdf b10.bdf + h10.bdf b10.bdf \ + f10.bdf f12.bdf f14.bdf f16.bdf f24.bdf HEXFILES = $(BDFFILES:.bdf=.hex) PCFFILES = $(BDFFILES:.bdf=.pcf.gz) diff -ru efont-unicode-bdf-0.4.0-src/tools/hex2bdf.in efont-unicode-bdf-0.4.0-src.new/tools/hex2bdf.in --- efont-unicode-bdf-0.4.0-src/tools/hex2bdf.in 2001-11-03 08:52:58.000000000 +0100 +++ efont-unicode-bdf-0.4.0-src.new/tools/hex2bdf.in 2003-01-09 14:30:12.000000000 +0100 @@ -19,16 +19,37 @@ print "STARTFONT 2.1\n"; if ($pxlsz_x == $pxlsz_y) { - print "FONT -Efont-Biwidth-Medium-R-Normal--$pxlsz_y-$ptSz-75-75-P-$avgWdth-ISO10646-1\n"; + if ($ARGV =~ /^f/) { + $avgWdth = $avgWdth * 2; + print "FONT -Efont-Fixed-Medium-R-Normal--$pxlsz_y-$ptSz-75-75-C-$avgWdth-ISO10646-1\n"; + $family_name = "Fixed"; + } else { + print "FONT -Efont-Biwidth-Medium-R-Normal--$pxlsz_y-$ptSz-75-75-P-$avgWdth-ISO10646-1\n"; + $family_name = "Biwidth"; + } $default_char = 0x3000; # IDEOGRAPHIC SPACE } else { print "FONT -Efont-Fixed-Medium-R-Normal--$pxlsz_y-$ptSz-75-75-C-$avgWdth-ISO10646-1\n"; + $family_name = "Fixed"; $default_char = 0x0020; # SPACE } print "SIZE $pxlsz_y 75 75 FONTBOUNDINGBOX $pxlsz_x $pxlsz_y 0 -2 -STARTPROPERTIES 4 +STARTPROPERTIES 17 COPYRIGHT \"(c) Copyright 2000-2001 /efont/ The Electronic Font Open Laboratory.\" +FOUNDRY \"Efont\" +FAMILY_NAME \"$family_name\" +WEIGHT_NAME \"Medium\" +SLANT \"R\" +SETWIDTH_NAME \"Normal\" +ADD_STYLE_NAME \"\" +PIXEL_SIZE $pxlsz_y +POINT_SIZE $ptSz +RESOLUTION_X 75 +RESOLUTION_Y 75 +AVERAGE_WIDTH $avgWdth +CHARSET_REGISTRY \"ISO10646\" +CHARSET_ENCODING \"1\" FONT_ASCENT $ascent FONT_DESCENT 2 DEFAULT_CHAR $default_char