summaryrefslogtreecommitdiff
path: root/update-xfonts-traditional
diff options
context:
space:
mode:
authorIan Jackson <ijackson@chiark.greenend.org.uk>2012-01-25 20:56:25 +0000
committerIan Jackson <ijackson@chiark.greenend.org.uk>2012-01-25 20:57:15 +0000
commit1bbbeaf42afa4e7af424db60b2385fde0fb8ff48 (patch)
treeb524cfd18c59dcd5333f598ace2cc7eea6d44ec1 /update-xfonts-traditional
parent56fdbbe357c1f7f22e330692fe95f6e0b5b7e2f4 (diff)
fix message ("none") return value s from processbdf and hence processpcfgz
Diffstat (limited to 'update-xfonts-traditional')
-rwxr-xr-xupdate-xfonts-traditional12
1 files changed, 6 insertions, 6 deletions
diff --git a/update-xfonts-traditional b/update-xfonts-traditional
index 8e04e60..619e2fa 100755
--- a/update-xfonts-traditional
+++ b/update-xfonts-traditional
@@ -66,7 +66,7 @@ sub processbdf ($$$$) {
local ($_) = $glyph;
my $key= sprintf "%s,%d,%d,%d,%d", $foundry,$w,$h,$xo,$yo;
my $rules= loadrules($key);
- return (0,'no rules') if !$rules;
+ return 'no rules' if !$rules;
$rules->();
$modified += ($_ ne $glyph);
print $outbdf $_,"\n" or die $!
@@ -82,22 +82,22 @@ sub processbdf ($$$$) {
}
if ($state eq 'idle' && m/^FOUNDRY\s+/) {
die if defined $foundry;
- return (0,'foundry syntax') unless m/^FOUNDRY\s+\"(\w+)\"\s+/;
+ return 'foundry syntax' unless m/^FOUNDRY\s+\"(\w+)\"\s+/;
$foundry = $foundrymap{lc $1};
- return (0,'no foundry') unless defined $foundry;
+ return 'no foundry' unless defined $foundry;
$_ = "FOUNDRY \"$foundry\"\n";
}
if ($state eq 'idle' && m/^FONT\s+/) {
die if defined $font;
- return (0,'simple font name') unless m/^(FONT\s+)\-(\w+)\-/;
+ return 'simple font name' unless m/^(FONT\s+)\-(\w+)\-/;
$font = $foundrymap{lc $2};
- return (0,'no foundry') unless defined $font;
+ return 'no foundry' unless defined $font;
$_ = "FONT -$font-$'";
}
if ($state eq 'idle' && m/^STARTCHAR\s/) {
die unless defined $foundry;
die unless defined $font;
- return (0,'foundry != font') unless $foundry eq $font;
+ return 'foundry != font' unless $foundry eq $font;
$state='startchar';
$w=undef;
}