Normalise bdfs before all rule generation and on-system processing

[xfonts-traditional.git] / mkrules

diff --git a/mkrules b/mkrules
index d16d6b4052f74f025f95fdfcffb5562ad565ac0a..de6424cfb4f39145ea10a115950902462b6b5c80 100755 (executable)
--- a/mkrules
+++ b/mkrules
@@ -36,16 +36,13 @@ while read keyword rest; do
                        in=$f/$pcf.pcf.gz
                        out=$f/$pcf.bdf
                        if [ -e $in ]; then
-                               zcat $in | pcf2bdf >$out
+                               zcat $in | pcf2bdf | ./bdfnorm >$out
                        elif [ -e "$out.direct" ]; then
-                               cp "$out.direct" "$out"
+                               ./bdfnorm <"$out.direct" >"$out"
                        elif [ -e "$f/$pcf.sfd" ]; then
                                ./ffconvert.pe "$f/$pcf"
-                               # 1. fontforge writes a silly filename
-                               # 2. our crappy machinery copes only
-                               #  with BDFs from pcf2bdf, not from
-                               #  fontforge
-                               bdftopcf <"$f/$pcf".BDF*.bdf |pcf2bdf >$out
+                               # fontforge writes a silly filename
+                               ./bdfnorm <"$f/$pcf".BDF*.bdf >$out
                        else
                                echo >&2 "cannot make $out!"
                                exit 1