diff options
Diffstat (limited to 'dist/troff')
| -rw-r--r-- | dist/troff/afm2troff.c | 8 | ||||
| -rwxr-xr-x | dist/troff/tfont | 9 |
2 files changed, 13 insertions, 4 deletions
diff --git a/dist/troff/afm2troff.c b/dist/troff/afm2troff.c index da185230..0bebb989 100644 --- a/dist/troff/afm2troff.c +++ b/dist/troff/afm2troff.c @@ -51,7 +51,9 @@ run(char *name, int fd) char *p, *q, *f[100]; int nf, code, wid, ad; Biobuf b; + Fmt fmt; + fmtstrinit(&fmt); Binit(&b, fd, OREAD); while((p = Brdline(&b, '\n')) != nil){ p[Blinelen(&b)-1] = 0; @@ -84,10 +86,14 @@ run(char *name, int fd) ad |= 1; if(atoi(f[nf-2]) > 600) ad |= 2; + if(nf >= 7 && strcmp(f[5], "N") == 0 && strcmp(f[6], "space") == 0) + code = ' '; if(code == ' ') Bprint(&bout, "spacewidth %d\ncharset\n", wid); else - Bprint(&bout, "%C\t%d\t%d\t%d %04x\n", code, wid, ad, code, code); + fmtprint(&fmt, "%C\t%d\t%d\t%d %04x\n", + code, wid, ad, code, code); } } + Bprint(&bout, "%s", fmtstrflush(&fmt)); } diff --git a/dist/troff/tfont b/dist/troff/tfont index ea99641c..6e8f6619 100755 --- a/dist/troff/tfont +++ b/dist/troff/tfont @@ -15,8 +15,11 @@ for(font){ font=`{9 basename $font .ttf} if not if(~ $font *.sfd) font=`{9 basename $font .sfd} - fontforge -c 'Open($1); Generate($2, "", -1, 72, "map.sfd")' \ - $f0 $font^%s.pfb map.sfd + echo ' + Open("'$f0'") + Generate("'$font^%s.pfb'", "", -1, 72, "map.sfd") + ' >fontforge.in + fontforge -script fontforge.in { echo name $font echo fontname $font @@ -25,7 +28,7 @@ for(font){ for(h in $hex){ if(test -f $font$h.pfb){ pfb2pfa $font$h.pfb $font$h.pfa - mv $font$h.pfa /usr/local/plan9/postscript/font/dejavu/$font$h + mv $font$h.pfa /usr/local/plan9/postscript/font/$font$h afm2troff -h -o 0x$h^00 $font$h.afm >>$font.troff echo 0x$h^00 0x$h^FF $font$h >>$font.tpost } |