use File::Glob qw(:glob);
use Data::Dumper;
use IO::Pipe;
+use File::Find;
our $prefix="/usr/local";
our $package='xfonts-traditional';
our $sharedir="$prefix/share/$package";
-our @fontparentdirs=qw(/usr/share/fonts/X11 /usr/local/share/fonts/X11);
+our @fonttrees=qw(/usr/share/fonts/X11 /usr/local/share/fonts/X11);
our $donefile="$package.done";
our $logfile="$package.log";
our $fontprefix="trad--";
our %foundrymap;
our $verbose=0;
our $reportfh;
+our $foundryinfo;
sub reportloaded {
return unless $verbose;
print $reportfh @_,"\n" or die $!;
}
+sub statsummary () {
+ return join ' ', ((stat _)[1,7,9,10]);
+}
+
sub loadrules ($) {
my ($key) = @_;
our %cache;
return $modified;
}
-our (@options)=(
- 'R|rules-include=s@' => \@rulespath,
- 'share-dir=s' => \$sharedir,
- 'verbose|v+' => \$verbose,
- );
-
-sub define_mode ($$) {
- my ($optname,$f) = @_;
- push @options, $optname, sub {
- die "only one mode may be specified\n" if defined $mode;
- $mode=$f;
- };
-}
-
sub loadfoundries () {
+ $foundryinfo = '';
foreach my $path (@rulespath) {
+ if (!stat $path) {
+ die "$path $!" unless $!==&ENOENT;
+ next;
+ }
+ $foundryinfo .= statsummary().' '.$path."\0\n";
+
my $p = "$path/foundries";
my $f = new IO::File $p;
if (!$f) {
print $reportfh "foundries: none in $p\n" or die $! if $verbose;
next;
}
+ stat $f or die $!;
while (<$f>) {
s/^\s*//; s/\s+$//;
next if m/^\#/;
my ($usread,$uswrite);
my ($reader,$writer);
my @children;
- foreach my $proc (['zcat'], ['pcf2bdf'], [],
+ foreach my $proc (['gunzip'], ['pcf2bdf'], [],
['bdftopcf'],['',qw(gzip -1)]) {
my $isfinal = (@$proc && $proc->[0] eq '');
if (!$isfinal) {
die "$fontdir $!" unless $!==&ENOENT;
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;
+ }
+ if (!$olddone) {
$olddone = { };
+ $changed = 1;
}
- my $newdone = { };
+ my $newdone = { '' => $foundryinfo };
my $log = new IO::File "$fontdir/$logfile", "w"
or die "$fontdir/$logfile $!";
my %outfiles; # bitmask: 1 /*exists*/ | 2 /*wanted*/
- my $changed;
my $updated=0;
+ my $reported=0;
+ my $anypcfs=0;
- print $reportfh "processing $fontdir...\n" or die $!;
flush $reportfh or die $!;
while (my $dent = scalar readdir FD) {
if ($dent =~ m/^\Q$fontprefix\E.*\.new$/) {
next;
}
next unless $dent =~ m/^[^.\/].*\.pcf\.gz$/;
+ print $reportfh "processing $fontdir...\n" or die $!
+ unless $reported++;
if ($dent =~ m/^\Q$fontprefix/) {
$outfiles{$dent} |= 1;
next;
next;
}
die "$fontdir $dent" unless -f _;
- my $stats = join ' ', ((stat _)[1,7,9,10]);
+ $anypcfs++;
+
+ my $stats = statsummary();
my $tdone = $olddone->{$dent};
my $outdent = $fontprefix.$dent;
if (defined $tdone && $tdone eq $stats) {
or die "$fontdir $outdent $!";
$updated++;
$outfiles{$outdent} |= 3;
- $changed = 1;
}
$newdone->{$dent} = $stats;
+ $changed = 1;
}
my $affected=0;
foreach my $olddent (keys %outfiles) {
}
unlink "$fontdir/$olddent" or die "$fontdir $olddent $!";
$changed = 1;
+ $updated++;
}
- if (!%$newdone) {
+ if (!stat "$fontdir/fonts.dir") {
+ $!==&ENOENT or die "$fontdir $!";
+ } else {
+ $!=0; $?=0; system 'mkfontdir',$fontdir;
+ die "$fontdir $? $!" if $? or $!;
+ }
+ if (!$anypcfs) {
unlink "$fontdir/$logfile" or die "$fontdir $!";
unlink "$fontdir/$donefile" or $!==&ENOENT or die "$fontdir $!";
} elsif ($changed) {
- $!=0; $?=0; system 'mkfontdir',$fontdir;
- die "$fontdir $? $!" if $? or $!;
my $newdoneh = new IO::File "$fontdir/$donefile.new", 'w'
or die "$fontdir $!";
print $newdoneh Dumper($newdone) or die "$fontdir $!";
rename "$fontdir/$donefile.new","$fontdir/$donefile"
or die "$fontdir $!";
}
- printf " processed %s: %d pcfs, %d affected, %d updated.\n",
- $fontdir, (scalar keys %$newdone), $affected, $updated;
+ if ($reported || %$newdone || $affected || $updated) {
+ printf " processed %s: %d pcfs, %d affected, %d updated.\n",
+ $fontdir, (scalar keys %$newdone), $affected, $updated;
+ }
+}
+
+sub processfonttree ($) {
+ my ($tree) = @_;
+ find({ follow => 1,
+ dangling_symlinks => 0,
+ no_chdir => 1,
+ wanted => sub {
+ return unless -d _;
+ processfontdir($File::Find::name);
+ }},
+ $tree);
}
our $stdin = new IO::File '<&STDIN' or die $!;
our $stderr = new IO::File '>&STDERR' or die $!;
$reportfh = $stdout;
+our (@options)=(
+ 'R|rules-include=s@' => \@rulespath,
+ 'share-dir=s' => \$sharedir,
+ 'verbose|v+' => \$verbose,
+ );
+
+sub define_mode ($$) {
+ my ($optname,$f) = @_;
+ push @options, $optname, sub {
+ die "only one mode may be specified\n" if defined $mode;
+ $mode=$f;
+ };
+}
+
define_mode('bdf-filter', sub {
die "no arguments allowed with --bdf-filter\n" if @ARGV;
$reportfh = $stderr;
}
});
-define_mode('process-fontdir', sub {
+define_mode('process-fontdirs', sub {
die "need font dir(s)\n" unless @ARGV;
loadfoundries();
foreach my $d (@ARGV) {
}
});
+define_mode('process-fonttrees', sub {
+ die "need font tree(s)\n" unless @ARGV;
+ loadfoundries();
+ foreach my $d (@ARGV) {
+ processfonttree($d);
+ }
+});
+
+define_mode('update', sub {
+ die "no arguments allowed with --postinst\n" unless !@ARGV;
+ loadfoundries();
+ foreach my $d (@fonttrees) {
+ processfonttree($d);
+ }
+});
+
Getopt::Long::Configure(qw(bundling));
GetOptions(@options) or exit 127;
die "need a mode\n" unless $mode;
$mode->();
-
-# 70 zcat /usr/share/fonts/X11/misc/6x13.pcf.gz |pcf2bdf >in.bdf
-# 71 ./utility <in.bdf >out.bdf
-# 83 bdftopcf out.bdf >out.pcf
-# 84 gzip out.pcf
-# 85 cp out.pcf.gz /usr/share/fonts/X11/misc/
-# really mkfontdir /usr/share/fonts/X11/misc/
-# xset fp rehash
-# xfontsel