clewis@ecicrl.UUCP (Chris Lewis) (08/30/90)
This is official patch 02 for Psroff 2.0.
Please apply it by:
cd <psroff source directory>
patch -N -p < <this file>
./defs.h Patch level 2
./audit.S Numerous fixes and enhancements.
*** /tmp/PATCHold/./defs.h Wed Aug 29 15:20:10 1990
--- ./defs.h Wed Aug 29 15:20:12 1990
***************
*** 1,4 ****
! /* Copyright 1988, 1989 15:15:01 Chris Lewis
All Rights Reserved
Permission to copy and further distribute is freely given provided
--- 1,4 ----
! /* Copyright 1988, 1989 15:04:07 Chris Lewis
All Rights Reserved
Permission to copy and further distribute is freely given provided
***************
*** 6,18 ****
sold for profit.
Project: Generic Troff drivers
! Module: defs.h 2.2 90/08/10 15:15:01
Author: Chris Lewis
Specs: Main header file - contains some customization
*/
/* Official Release and Patch level: */
! #define T2VERSION "@(#)PSROFF Copyright 90/08/10 Chris Lewis - R2 P1"
#ifndef LIBDIR
/* Don't touch this */
--- 6,18 ----
sold for profit.
Project: Generic Troff drivers
! Module: defs.h 2.3 90/08/29 15:04:07
Author: Chris Lewis
Specs: Main header file - contains some customization
*/
/* Official Release and Patch level: */
! #define T2VERSION "@(#)PSROFF Copyright 90/08/29 Chris Lewis - R2 P2"
#ifndef LIBDIR
/* Don't touch this */
*** /tmp/PATCHold/./audit.S Wed Aug 29 15:20:20 1990
--- ./audit.S Wed Aug 29 15:20:22 1990
***************
*** 1,5 ****
%%STARTSHELL%%
! # Psroff checking script 2.2 90/08/07
chkinst=false
for i
do
--- 1,5 ----
%%STARTSHELL%%
! # Psroff checking script 2.4 90/08/29
chkinst=false
for i
do
***************
*** 81,90 ****
--- 81,112 ----
break
fi
done
+ if [ -z "$troff" ]
+ then
+ echo "ERROR: Can't find troff!"
+ exit 1
+ fi
fi
eval `grep '^trofftype=' $psrofflib`
echo "INFO: Your trofftype setting in $psrofflib is trofftype='$trofftype'"
+
+ if [ ! -r $FONTDIR/ftR -o ! -r $FONTDIR/ftI -o ! -r $FONTDIR/ftB -o \
+ ! -r $FONTDIR/ftS ]
+ then
+ cat <<!
+ WARNING: Missing one of the $FONTDIR/ft[RIBS] files.
+ I was hoping that FONTDIR was pointing at the place where
+ your version of troff keeps its width tables (by default
+ /usr/lib/font). Since this is not true, I will not be able
+ to tell with complete accuracy whether your trofftype setting
+ works. Therefore, take any ERROR messages about trofftype with
+ a grain of salt. You could always copy widths/widthps/ft[RIBS]
+ (after make widths) into $FONTDIR, but, I NEED a ftR from
+ your ORIGINAL troff distribution to test HEADERSIZE properly.
+ !
+ fi
+
if [ -n "$FONTDIR" ]
then
arglist="-F$FONTDIR/./ftXX"
***************
*** 92,98 ****
for i in $arglist -T. ''
do
echo "INFO: Testing '$i' trofftype setting"
! $troff -t < /dev/null $i > /dev/null
rc=$?
if [ $rc = 0 ]
then
--- 114,120 ----
for i in $arglist -T. ''
do
echo "INFO: Testing '$i' trofftype setting"
! $troff -t $i < /dev/null > /dev/null
rc=$?
if [ $rc = 0 ]
then
***************
*** 210,216 ****
fi
Topts="`sed -e '/^[a-zA-Z]/!d' -e '/^troff/d' \
! -e '/^trofftype/d' -e 's/[ ].*//' $psrofflib`"
echo "INFO: Commencing psrofflib ($psrofflib) checking"
if $chkinst
then
--- 232,238 ----
fi
Topts="`sed -e '/^[a-zA-Z]/!d' -e '/^troff/d' \
! -e '/^trofftype/d' -e 's/[ ].*//' $psrofflib | sort -u`"
echo "INFO: Commencing psrofflib ($psrofflib) checking"
if $chkinst
then
***************
*** 235,245 ****
t2arg="<not set>"
lparg="<not set>"
ptr="<not set>"
! line=`sed -n -e '/^troff/p' \
! -e "/^$type[ ]/{
! s/^$type[ ]*\(.*\)$/F='T' \1/p
! q
! }" $psrofflib`
eval "$line"
echo "INFO: psroff -T$type settings:"
echo " troff $troff"
--- 257,277 ----
t2arg="<not set>"
lparg="<not set>"
ptr="<not set>"
! # If your system has no awk (or a busted one), you may have to
! # comment out the "line=`awk ... $psrofflib" lines, and uncomment
! # the sed script. If you do, you won't be able to continue
! # psrofflib lines, so you'll have to "join" the entries in psrofflib
! # (remembering to delete the name fields in the continuation lines).
! line=`awk '
! $1 ~ /^#/ {next}
! $0 ~ /^troff/ { print $0 }
! $1 == "'$type'" {
! seen=1
! print "F='T'" substr($0, length($1) + 1)
! next
! }
! { if (seen) exit(0) }
! ' $psrofflib`
eval "$line"
echo "INFO: psroff -T$type settings:"
echo " troff $troff"
***************
*** 293,299 ****
echo $printertype >> PRINTERLIST
done
! if [ -z "$printerlist" ]
then
printerlist=`sort -u PRINTERLIST`
fi
--- 325,331 ----
echo $printertype >> PRINTERLIST
done
! if [ -z "$printerlist" -a -s PRINTERLIST ]
then
printerlist=`sort -u PRINTERLIST`
fi
***************
*** 360,373 ****
}
}
for (name in catfonts) {
! if (name && !fonts[name])
! printf(" FONT %s: do not use: %s/%s/ft%s exists, but"
name, fontdir, printertype, name)
! printf(" no %s.fonts\n", printertype)
}
}'
if [ -n "$LJF" -a -d "$LJF" -a "$printertype" = lj ]
then
sed -e '/^[A-Za-z][A-Za-z]*/!d' $libbase/$printertype.fonts |
while read troffname english sequence flags
do
--- 392,408 ----
}
}
for (name in catfonts) {
! if (name && !fonts[name]) {
! printf(" FONT %s: do not use: %s/%s/ft%s exists, but", \
name, fontdir, printertype, name)
! printf(" not in %s.fonts\n", printertype)
! }
}
}'
if [ -n "$LJF" -a -d "$LJF" -a "$printertype" = lj ]
then
+ echo "I'm checking $printertype.fonts file for missing font"
+ echo "files, please have patience"
sed -e '/^[A-Za-z][A-Za-z]*/!d' $libbase/$printertype.fonts |
while read troffname english sequence flags
do
--
Chris Lewis, Phone: (416)-294-9253
UUCP: uunet!utai!lsuc!ecicrl!clewis
Moderator of the Ferret Mailing List (ferret-request@eci386)
Psroff mailing list (psroff-request@eci386)