chiark
/
gitweb
/
~ian
/
xfonts-traditional.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Normalise bdfs before all rule generation and on-system processing
[xfonts-traditional.git]
/
update-xfonts-traditional
diff --git
a/update-xfonts-traditional
b/update-xfonts-traditional
index 01ae14584e645a15533bace6d52ce8c20024c8be..494d637969ddcf53db31e94c9201ccc45d3518c0 100755
(executable)
--- a/
update-xfonts-traditional
+++ b/
update-xfonts-traditional
@@
-16,6
+16,7
@@
our @fonttrees=qw(/usr/share/fonts/X11 /usr/local/share/fonts/X11);
our $donefile="$package.done";
our $logfile="$package.log";
our $fontprefix="trad--";
our $donefile="$package.done";
our $logfile="$package.log";
our $fontprefix="trad--";
+our $bdfnorm="bdfnorm";
our @rulespath;
our $mode;
our %foundrymap;
our @rulespath;
our $mode;
our %foundrymap;
@@
-291,7
+292,7
@@
sub processpcfgz ($$$$) {
my $r;
process_filter(\$r, $input, $output, $inpcfgz, $logfh,
[
my $r;
process_filter(\$r, $input, $output, $inpcfgz, $logfh,
[
- ['gunzip'], ['pcf2bdf'],
+ ['gunzip'], ['pcf2bdf'],
[$bdfnorm],
[],
['bdftopcf'],['',qw(gzip -1 -n)]
],
[],
['bdftopcf'],['',qw(gzip -1 -n)]
],
@@
-548,6
+549,7
@@
Getopt::Long::Configure(qw(bundling));
GetOptions(@options) or exit 127;
push @rulespath, "$sharedir/rules";
GetOptions(@options) or exit 127;
push @rulespath, "$sharedir/rules";
+$bdfnorm = "$sharedir/$bdfnorm";
die "need a mode\n" unless $mode;
die "need a mode\n" unless $mode;