fix message ("none") return value s from processbdf and hence processpcfgz

diff --git a/debian/changelog b/debian/changelog
index 1b62af7697663ef76ce235d1515cf28f5b5f7a30..44d29138f1072c6fa93a3c51b6b230152c6e0e3b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 xfonts-traditional (1.3) unstable; urgency=low
 
   * Process multiple fonts in parallel.
 xfonts-traditional (1.3) unstable; urgency=low
 
   * Process multiple fonts in parallel.

+  * General improvements to handling of errors and unprocessed fonts.

 
  --
 
 
  --
 

diff --git a/update-xfonts-traditional b/update-xfonts-traditional
index 8e04e603196197b4a964a174784d4a7f68c82c95..619e2faca737ba00378e20d854de4a11d050a679 100755 (executable)
--- 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);
            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 $!
            $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;
        }
        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};
            $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;
            $_ = "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};
            $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;
            $_ = "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;
        }
            $state='startchar';
            $w=undef;
        }