our $reportfh;
our $foundryinfo;
our %props;
+our $tolerate_bad_fonts=1;
+our $always_reprocess;
our $wanted_parallel;
sub reportloaded {
while (<$f>) {
s/^\s*//; s/\s+$//;
next if m/^\#/;
- m/^(\w+)\s+(\w+)$/ or die;
+ m/^([.0-9A-Za-z]+)\s+([.0-9A-Za-z]+)$/ or die;
my $k = lc $1;
next if exists $foundrymap{$k};
$foundrymap{$k}=$2;
return !$st || $ch->{SigOK}{($st & ~128)};
};
+ if ($tolerate_bad_fonts &&
+ $r eq 'no bdf data' &&
+ $st_isok->($ch{'gunzip'}) &&
+ ($ch{'pcf2bdf'}{St} & ~128) == 6)
+ {
+ $r = "pcf2bdf failed ($ch{'pcf2bdf'}{St})";
+ print STDERR "warning: $r: skipping $inpcfgz\n";
+ $ch{'pcf2bdf'}{SigOK}{6} = 1;
+ }
foreach my $ch (@children) {
if (!$st_isok->($ch)) {
die "update-xfonts-traditional:".
return;
}
my $changed = 0;
- my $olddone = do "$fontdir/$donefile";
- if (!$olddone) {
- die "$fontdir $! $@ " unless $!==&ENOENT;
- } elsif ($olddone->{''} ne $foundryinfo) {
- our $repro_reported;
- print $reportfh "reprocessing fonts (rules updated)\n" or die $!
- unless $repro_reported++;
- $olddone = undef;
+ my $olddone;
+ if (!$always_reprocess) {
+ $olddone = do "$fontdir/$donefile";
+ if (!$olddone) {
+ die "$fontdir $! $@ " unless $!==&ENOENT;
+ } elsif ($olddone->{''} ne $foundryinfo) {
+ our $repro_reported;
+ print $reportfh "reprocessing fonts (rules updated)\n" or die $!
+ unless $repro_reported++;
+ $olddone = undef;
+ }
}
if (!$olddone) {
$olddone = { };
'share-dir=s' => \$sharedir,
'verbose|v+' => \$verbose,
'j|parallel=i' => \$wanted_parallel,
+ 'always-reprocess!' => \$always_reprocess,
+ 'tolerate-bad-fonts!' => \$tolerate_bad_fonts,
);
sub define_mode ($$) {