X-Git-Url: http://git.shiar.net/unifont.git/blobdiff_plain/7c29a68c187ca8c0ef5cf975b874a91d0f227800..fc551ca87db118182bb4292bc08fc5fc03ea3f89:/src/hex2bdf

diff --git a/src/hex2bdf b/src/hex2bdf
index 7f600e3..5255120 100755
--- a/src/hex2bdf
+++ b/src/hex2bdf
@@ -32,7 +32,7 @@ $result = GetOptions (
              );
 
 if (not $font_name) {
-   $font_name = "unifont";
+   $font_name = "Unifont";
 }
 if (not $vpixels) {
    $vpixels  = 16;
@@ -44,10 +44,11 @@ if (not $version) {
 $point_size   = $vpixels;
 $point_size10 = 10 * $point_size;
 
-while (<>) { chomp; $glyph{$1} = $2 if /(....):(.+)/; }
+while (<>) { chomp; $glyph{$1} = $2 if /^([0-9a-fA-F]+):([0-9a-fA-F]+)/; }
 @chars = sort keys %glyph;
 $nchars = $#chars + 1;
 
+
 print "STARTFONT 2.1
 FONT -gnu-${font_name}-Medium-R-Normal-Sans-${vpixels}-${point_size10}-75-75-c-80-iso10646-1
 SIZE $point_size 75 75
@@ -70,15 +71,15 @@ SPACING \"C\"
 AVERAGE_WIDTH 80
 CHARSET_REGISTRY \"ISO10646\"
 CHARSET_ENCODING \"1\"
-FONT_ASCENT 14
-FONT_DESCENT 2
 UNDERLINE_POSITION -2
 UNDERLINE_THICKNESS 1
 CAP_HEIGHT 10
 X_HEIGHT 8
+FONT_ASCENT 14
+FONT_DESCENT 2
 DEFAULT_CHAR 65533
 ENDPROPERTIES
-CHARS $nchars\n";
+CHARS $nchars\n" or die ("Cannot print to stdout.\n");
 
 # TODO: $swidth needs to be modified to accomodate different widths better
 #       for glyphs with height different than 16 pixels.
@@ -100,7 +101,7 @@ SWIDTH $swidth 0
 DWIDTH $dwidth 0
 BBX $dwidth $vpixels 0 -2
 BITMAP $glyph
-ENDCHAR\n";
+ENDCHAR\n" or die ("Cannot print to stdout.\n");
 }
 
-print "ENDFONT\n";
+print "ENDFONT\n" or die ("Cannot print to stdout.\n");