diff -ur tools.orig/famtool.pl tools/famtool.pl
--- tools.orig/famtool.pl	Mon Oct  6 13:42:00 1997
+++ tools/famtool.pl	Tue May  5 03:55:05 1998
@@ -37,11 +41,11 @@
  close(SH); 
 $Inidir = getcwd();
 if (&IsWin32) {
-$ENV{TEXINPUTS}=".;$Inidir/finst;$dbfonts/afm//;";
+$ENV{TEXINPUTS}=".;$Inidir/finst;$dbfonts;";
 }
 else
 {
-$ENV{TEXINPUTS}=".:$Inidir/finst:$dbfonts/afm//:";
+$ENV{TEXINPUTS}=".:$Inidir/finst:$dbfonts:";
 }
 print "dbfonts is $dbfonts\ninput path is $ENV{TEXINPUTS}\n" if $opt_debug;
 $ENV{TFMFONTS}=".;";
@@ -141,8 +145,17 @@
    $Basefile=$_;
    s/8r/8a/;
    $Rawfile=$_;
+   print "** Trying $_.afm\n" if $opt_verbose;
    $AFMfile=`kpsewhich $_.afm`;
    chop $AFMfile ;
+   if ($AFMfile eq "")
+   {
+     # in case of ttf2afm, try 8r-encoded AFM files
+     s/8a/8r/;
+     print "** Trying $_.afm\n" if $opt_verbose;
+     $AFMfile=`kpsewhich $_.afm`;
+     chop $AFMfile ;
+   }
    if ($AFMfile ne "")
    {
     $FontName=&readAFMfile($AFMfile);
@@ -151,7 +164,7 @@
     if ($opt_download) { print MAP "<$Rawfile.pfb"; }
     print MAP "\n";
     &make_tfm($Basefile,$AFMfile,"-e$TeXBaseEncoding");
-    }
+   }
 }
 # 8x names
 print "** Making map entries for 8x *.pl files\n" if $opt_verbose;
@@ -182,6 +195,13 @@
  $Rawfile="$Up$Enc$Suf";
  $AFMfile=`kpsewhich $Rawfile.afm`;
  chop $AFMfile ;
+ if ($AFMfile eq "")
+   {
+     # in case of ttf2afm, try 8r-encoded AFM files
+     print "** Trying $basefile.afm\n" if $opt_verbose;
+     $AFMfile=`kpsewhich $Basefile.afm`;
+     chop $AFMfile ;
+   }
  $csargs="";
  if ($AFMfile ne "")
    {
@@ -295,34 +315,44 @@
          ($fontname) =  ($vpl =~ /FONTNAME\s+(\w+)/);
          $cs = 0;
 	 if (-r "$fontname.tfm")
-           {
+         {
             chop($cs = `cs -o "$fontname.tfm"`);
 	    print "Read $cs from $fontname.tfm\n" if $opt_verbose;
-	    }
+	 }
          elsif (-r "$fontname.pl") {
             $_=$fontname;
-            s/8r$/8a/;
+            s/8r/8a/;
+	    print "** Trying $_.afm\n" if $opt_verbose;
             $AFMfile=`kpsewhich $_.afm`;
             chop($AFMfile);
             if ($AFMfile eq "")
-	       { die "No AFM file found for font $_\n"; }
+	    {
+		# in case of ttf2afm, try 8r-encoded AFM files
+		s/8a/8r/;
+		print "** Trying $_.afm\n" if $opt_verbose;
+		$AFMfile=`kpsewhich $_.afm`;
+		chop($AFMfile);
+	    }
+	    if ($AFMfile eq "") 
+	    {   die "No AFM file found for font $_\n"; }
             else
 	    {
-              $cs= &make_tfm($fontname,$AFMfile,"");
-  	      print "Generated $cs from $fontname.pl\n" if $opt_verbose;
-	      die "[addchecksum] $fontname: invalid checksum" unless $cs != 0;
-	      }
-             }
-         else {
+		$cs= &make_tfm($fontname,$AFMfile,"");
+		print "Generated $cs from $fontname.pl\n" if $opt_verbose;
+		die "[addchecksum] $fontname: invalid checksum" unless $cs != 0;
+	    }
+         }
+         else 
+	 {
 # see it exists on the system
 	    $TFMfile=`kpsewhich $fontname.tfm`;
 	    chop($TFMfile);
             if ($TFMfile ne "") {
-              chop($cs = `cs -o "$TFMfile"`);
-	      print "Read $cs from $TFMfile\n" if $opt_verbose;
-             }
-	    else
-             { die "[addchecksum] No font for $fontname\n"; }
+		chop($cs = `cs -o "$TFMfile"`);
+		print "Read $cs from $TFMfile\n" if $opt_verbose;
+	    }
+	    else 
+	    { 	die "[addchecksum] No font for $fontname\n"; }
          }
          die "[addchecksum] cs: exit code ", ($? >>8) & 255, "\n" if $cs == 0 && $?;
          substr($vpl, $offset+1, 0) = " (FONTCHECKSUM O $cs) ";
diff -ur tools.orig/makefile tools/makefile
--- tools.orig/makefile	Mon Oct  6 13:27:00 1997
+++ tools/makefile	Wed May  6 00:03:37 1998
@@ -21,7 +21,9 @@
 #   with rewrite of make-fam in Perl. removed some of the functionality
 #   which Piet had carefully added
 #
-#
+# hacked UV / May 1998
+#   added targets for Lucida and Monotype TrueType fonts in Solaris 2.6
+
 OPTIONS=
 #OPTIONS="-debug "
 SHELL=/bin/sh
@@ -42,6 +44,7 @@
 BHOUT=../cooked/bh
 URWOUT=../stdcooked/urw
 IBMOUT=../cooked/ibm
+SUNOUT=../cooked/sun
 
 ADOBEOUTX=../cooked/xadobe
 MONOOUTX=../cooked/xmono
@@ -50,31 +53,57 @@
 URWOUTX=../cooked/xurw
 
 
-STANDARD=adobe-avantgar \
+STANDARD= \
+	adobe-avantgar \
 	adobe-bookman \
 	adobe-courier \
 	adobe-helvetic \
-	adobe-times \
-	adobe-palatino \
 	adobe-ncntrsbk \
+	adobe-palatino \
+	adobe-times \
 	adobe-zapfchan \
 	adobe-mathptm
 
-USTANDARD=urw-avantgar \
+SPECIAL= \
+	adobe-symbol \
+	adobe-zapfding 
+
+USTANDARD= \
+	urw-avantgar \
 	urw-bookman \
 	urw-courier \
 	urw-helvetic \
-	urw-times \
-	urw-palatino \
 	urw-ncntrsbk \
+	urw-palatino \
+	urw-times \
 	urw-zapfchan 
 
-SPECIAL=adobe-symbol \
-	adobe-zapfding 
-
-USPECIAL=urw-symbol \
+USPECIAL= \
+	urw-symbol \
 	urw-zapfding 
 
+LUCIDA=	\
+	bh-lucidabright \
+	bh-lucidamaths
+
+SUNLUCIDA= \
+	sun-lucidabright
+
+SUNTRUETYPE=\
+	sun-mono-avantgar \
+	sun-mono-bembo \
+	sun-mono-bookman \
+	sun-mono-courier \
+	sun-mono-gillsans \
+	sun-mono-helvetic \
+	sun-mono-ncntrsbk \
+	sun-mono-palatino \
+	sun-mono-rockwell \
+	sun-mono-symbol \
+	sun-mono-times \
+	sun-mono-zapfchan 
+
+
 ADOBEOTHER = \
 	adobe-univers \
 	adobe-garamond \
@@ -91,10 +120,6 @@
 	adobe-sabon \
 	adobe-stone
 
-LUCIDA=	\
-	bh-lucidabright \
-	bh-lucidamaths
-
 MISC2 = \
 	bit-charter
 
@@ -218,10 +243,10 @@
 
 uspecial: $(USPECIAL)
 
-other: $(ADOBEOTHER)
-
 lucida: $(LUCIDA)
 
+other: $(ADOBEOTHER)
+
 monotype: $(MONOTYPE)
 
 monofunny: $(MONOFUNNY)
@@ -230,6 +255,8 @@
 
 ibm: $(IBM)
 
+sun: $(SUNTRUETYPE) $(SUNLUCIDA)
+
 ##################################################################
 test:
 	$(MAKEFAM) -outdir $(ADOBEOUT) -download pbv 
@@ -255,7 +282,7 @@
 	$(AFMTOTFM) pbkdc -outdir $(STDOUT)/bookman
 
 adobe-courier:
-	$(MAKEFAM)  -outdir $(STDOUT) -tt pcr 
+	$(MAKEFAM) -outdir $(STDOUT) -tt pcr 
 	$(AFMTOTFM) pcrr -outdir $(STDOUT)/courier
 	$(AFMTOTFM) pcrro -outdir $(STDOUT)/courier
 	$(AFMTOTFM) pcrb -outdir $(STDOUT)/courier
@@ -315,7 +342,6 @@
 	$(AFMTOTFM) pplrc -outdir $(STDOUT)/palatino
 	$(AFMTOTFM) pplbc -outdir $(STDOUT)/palatino
 
-
 adobe-mathptm: 
 	perl makemptm.pl $(OPTIONS) -outdir $(STDOUT);
 
@@ -335,16 +361,130 @@
 	${AFM2TFM} psyr.afm >> $(STDOUT)/times/dvips/ptm.map
 	mv psyr*tfm $(STDOUT)/times/tfm
 
-adobe-symbol: psyr.afm
-	$(MAKEONE) -outdir $(STDOUT) psyr 
-
 adobe-zapfchan:
-	$(MAKEFAM)  -outdir $(STDOUT) -nosty pzc 
+	$(MAKEFAM) -outdir $(STDOUT) -nosty pzc 
 	$(AFMTOTFM) pzcmi -outdir $(STDOUT)/zapfchan
 
+adobe-symbol:
+	$(MAKEONE) -outdir $(STDOUT) psyr 
+
 adobe-zapfding:
 	$(MAKEONE) -outdir $(STDOUT) pzdr 
 
+##
+
+adobe-utopia:
+	$(MAKEFAM)  -outdir $(ADOBEOUT) -download -nosty put 
+
+bit-charter:
+	$(MAKEFAM)  -outdir $(BITOUT) -nosty -download bch 
+
+##
+
+sun-lucidabright:
+	$(MAKEFAM)  -outdir $(SUNOUT) -download -lucida slh 
+	$(MAKEFAM)  -outdir $(SUNOUT) -download -lucida -sans sls 
+	$(MAKEFAM)  -outdir $(SUNOUT) -download -lucida -tt slst
+
+bh-lucidabright:
+	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida hlh 
+	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida -sans hls 
+	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida -tt -narrow 850 hlct
+	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida -tt -narrow 850 hlst
+	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida hlx 
+	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida hlcf 
+	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida hlcn 
+	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida hlcw 
+	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida hlce 
+
+bh-lucidamaths:	
+	-mkdir -p $(BHOUT)/lumath/tfm
+	-mkdir -p $(BHOUT)/lumath/dvips
+	$(CP) lucmath/*.tfm $(BHOUT)/lumath/tfm
+	echo 'hlcdim LucidaNewMath-DemiItalic <hlcdim.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
+	echo 'hlcdima LucidaNewMath-AltDemiItalic <hlcdima.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
+	echo 'hlcrim LucidaNewMath-Italic <hlcrim.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
+	echo 'hlcrima LucidaNewMath-AltItalic <hlcrima.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
+	echo 'hlcdy LucidaNewMath-Symbol-Demi <hlcdy.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
+	echo 'hlcra LucidaNewMath-Arrows <hlcra.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
+	echo 'hlcda LucidaNewMath-Arrows-Demi <hlcda.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
+	echo 'hlcrv LucidaNewMath-Extension <hlcrv.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
+	echo 'hlcry LucidaNewMath-Symbol <hlcry.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
+	echo 'hlcdm LucidaNewMath-Demibold <hlcdm.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
+	echo 'hlcrm LucidaNewMath-Roman <hlcrm.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
+
+##
+
+urw-avantgar:
+	$(MAKEFAM) -download -outdir $(URWOUT) -nosty -sans uag 
+
+urw-bookman:
+	$(MAKEFAM) -download -outdir $(URWOUT) -nosty ubk 
+
+urw-courier:
+	$(MAKEFAM) -download -outdir $(URWOUT) -nosty -tt ucr 
+
+urw-helvetic:
+	$(MAKEFAM) -download -outdir $(URWOUT) -nosty -sans uhv 
+
+urw-ncntrsbk:
+	$(MAKEFAM) -download -outdir $(URWOUT) -nosty unc 
+
+urw-palatino:
+	$(MAKEFAM) -download -outdir $(URWOUT) -nosty upl 
+
+urw-times:
+	$(MAKEFAM) -download -outdir $(URWOUT) -nosty utm 
+
+urw-zapfchan:
+	$(MAKEFAM) -download -outdir $(URWOUT) -nosty uzc 
+
+urw-symbol:
+	$(MAKEONE) -download -outdir $(URWOUT) usyr 
+
+urw-zapfding:
+	$(MAKEONE) -download -outdir $(URWOUT) uzdr 
+
+##
+
+sun-mono-avantgar:
+	$(MAKEFAM) -outdir $(MONOOUT) -nosty -sans mag
+
+sun-mono-bembo:
+	$(MAKEFAM) -outdir $(MONOOUT) -nosty mbb
+
+sun-mono-bookman:
+	$(MAKEFAM) -outdir $(MONOOUT) -nosty mbk
+
+sun-mono-courier:
+	$(MAKEFAM) -outdir $(MONOOUT) -nosty -tt mcr
+
+sun-mono-gillsans:
+	$(MAKEFAM) -outdir $(MONOOUT) -nosty -sans mgs
+
+sun-mono-hevetica:
+	$(MAKEFAM) -outdir $(MONOOUT) -nosty -sans mhv 
+
+sun-mono-ncntrsbk:
+	$(MAKEFAM) -outdir $(MONOOUT) -nosty mnc 
+
+sun-mono-palatino:
+	$(MAKEFAM) -outdir $(MONOOUT) -nosty mpl 
+
+sun-mono-rockwell:
+	$(MAKEFAM) -outdir $(MONOOUT) -nosty mrw
+
+sun-mono-times:
+	$(MAKEFAM) -outdir $(MONOOUT) -nosty mtm 
+
+sun-mono-zapfchan:
+	$(MAKEFAM) -outdir $(MONOOUT) -nosty mzc
+
+sun-mono-symbol:
+	$(MAKEONE) -outdir $(MONOOUT) msyr 
+
+##
+
 adobe-agaramon:
 	$(MAKEFAM)  -outdir $(ADOBEOUT) -download -nosty pad 
 	$(MAKEFAM)  -outdir $(ADOBEOUTX) -download -expert x pad 
@@ -372,7 +512,7 @@
 
 adobe-bembo:
 	$(MAKEFAM)  -outdir $(ADOBEOUT) -download -nosty pbb 
-	$(MAKEFAM)  -outdir $(ADOBEOUTX) -expert x -download pbb 
+	$(MAKEFAM)  -outdir $(ADOBEOUTX) -download -expert x pbb 
 
 adobe-gillsans:
 	$(MAKEFAM)  -outdir $(ADOBEOUT) -sans -download pgs 
@@ -390,12 +530,6 @@
 adobe-optima:
 	$(MAKEFAM)  -outdir $(ADOBEOUT) -sans -download pop 
 
-adobe-utopia:
-	$(MAKEFAM)  -outdir $(ADOBEOUT) -download -nosty put 
-
-bit-charter:
-	$(MAKEFAM)  -outdir $(BITOUT) -nosty -download bch 
-
 adobe-plantin:
 	$(MAKEFAM)  -outdir $(ADOBEOUT) -download mpi 
 	$(MAKEFAM)  -outdir $(ADOBEOUTX) -download -expert x mpi 
@@ -403,62 +537,7 @@
 adobe-univers:
 	$(MAKEFAM)  -outdir $(ADOBEOUT) -sans -download pun 
 
-#
-bh-lucidabright:
-	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida hlh 
-	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida -sans hls 
-	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida -tt -narrow 850 hlct
-	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida -tt -narrow 850  hlst
-	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida hlx 
-	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida hlcf 
-	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida hlcn 
-	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida hlcw 
-	$(MAKEFAM)  -outdir $(BHOUT) -download -lucida hlce 
-
-
-bh-lucidamaths:	
-	-mkdir -p $(BHOUT)/lumath/tfm
-	-mkdir -p $(BHOUT)/lumath/dvips
-	$(CP) lucmath/*.tfm $(BHOUT)/lumath/tfm
-	echo 'hlcdim LucidaNewMath-DemiItalic <hlcdim.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
-	echo 'hlcdima LucidaNewMath-AltDemiItalic <hlcdima.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
-	echo 'hlcrim LucidaNewMath-Italic <hlcrim.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
-	echo 'hlcrima LucidaNewMath-AltItalic <hlcrima.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
-	echo 'hlcdy LucidaNewMath-Symbol-Demi <hlcdy.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
-	echo 'hlcra LucidaNewMath-Arrows <hlcra.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
-	echo 'hlcda LucidaNewMath-Arrows-Demi <hlcda.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
-	echo 'hlcrv LucidaNewMath-Extension <hlcrv.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
-	echo 'hlcry LucidaNewMath-Symbol <hlcry.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
-	echo 'hlcdm LucidaNewMath-Demibold <hlcdm.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
-	echo 'hlcrm LucidaNewMath-Roman <hlcrm.pfb' >> $(BHOUT)/lumath/dvips/hlcm.map
-
-urw:
-	$(MAKEFAM) -outdir $(URWOUT)  -download uaq 
-	$(MAKEFAM) -outdir $(URWOUT)  -download ugq 
-	$(MAKEFAM) -outdir $(URWOUT)  -download unm 
-	$(MAKEFAM) -outdir $(URWOUT)  -download -sans unms 
-	$(AFMTOTFM) unmr -outdir $(URWOUT)/nimbus
-	-rm *.vpl
-	-grep Extend map >> $(URWOUT)/nimbus/dvips/unm.map
-	-grep Slant map >> $(URWOUT)/nimbus/dvips/unm.map
-	sort $(URWOUT)/nimbus/dvips/unm.map | uniq > map
-	$(MV) map $(URWOUT)/nimbus/dvips/unm.map 
-	$(AFMTOTFM) unmrs -outdir $(URWOUT)/nimbus
-	-rm *.vpl
-	-grep Extend map >> $(URWOUT)/nimbus/dvips/unms.map
-	-grep Slant map >> $(URWOUT)/nimbus/dvips/unms.map
-	sort $(URWOUT)/nimbus/dvips/unms.map | uniq > map
-	$(MV) map $(URWOUT)/nimbus/dvips/unms.map 
-	$(AFMTOTFM) uaqrrc -outdir $(URWOUT)/antiqua
-	-rm *.vpl
-	-grep Extend map >> $(URWOUT)/antiqua/dvips/uaq.map
-	-grep Slant map >> $(URWOUT)/antiqua/dvips/uaq.map
-	sort $(URWOUT)/antiqua/dvips/uaq.map | uniq > map
-	$(MV) map $(URWOUT)/antiqua/dvips/uaq.map 
-	$(AFMTOTFM) ugqb -outdir $(URWOUT)/grotesq
-	-rm *.vpl
-	sort $(URWOUT)/grotesq/dvips/ugq.map | uniq > map
-	$(MV) map $(URWOUT)/grotesq/dvips/ugq.map 
+##
 
 mono-amasis:
 	$(MAKEFAM)  -outdir $(MONOOUT) -download ma2 
@@ -470,8 +549,8 @@
 	$(MAKEFAM)  -outdir $(MONOOUT) -download mah 
 
 mono-basker:
-	$(MAKEFAM)  -outdir $(MONOOUTX) -download -expert x mbv 
 	$(MAKEFAM)  -outdir $(MONOOUT) -download mbv 
+	$(MAKEFAM)  -outdir $(MONOOUTX) -download -expert x mbv 
 
 mono-bembo:
 	$(MAKEFAM)  -outdir $(MONOOUT) -download mbb 
@@ -659,7 +738,7 @@
 	$(MAKEFAM)  -outdir $(MONOOUT) -download msm 
 
 mono-symbol:
-	$(MAKEONE) -outdir $(MONOOUT) -download msyr 
+	$(MAKEONE)  -outdir $(MONOOUT) -download msyr 
 
 mono-twentyc:
 	$(MAKEFAM)  -outdir $(MONOOUT) -download mtw 
@@ -677,7 +756,7 @@
 	$(MAKEFAM)  -outdir $(MONOOUT) -download mzc 
 
 mono-zapfding:
-	$(MAKEONE) -outdir $(MONOOUT) -download mzdr 
+	$(MAKEONE)  -outdir $(MONOOUT) -download mzdr 
 
 mono-mercursc:
 	$(MAKEFAM)  -outdir $(MONOOUT) -download mme 
@@ -728,7 +807,6 @@
 mono-swing:
 	$(MAKEFAM)  -outdir $(MONOOUT) -download msw 
 
-
 mono-timesnew:
 	$(MAKEFAM)  -outdir $(MONOOUTX) -download -expert x mnt 
 	$(MAKEFAM)  -outdir $(MONOOUT) -download mnt 
@@ -745,38 +823,42 @@
 	$(MAKEFAM)  -outdir $(MONOOUT) -download mzt 
 	$(MAKEFAM)  -outdir $(MONOOUTX) -download -expert x mzt 
 
-urw-avantgar:
-	$(MAKEFAM) -download -outdir $(URWOUT) -sans -nosty uag 
-
-urw-bookman:
-	$(MAKEFAM) -download -outdir $(URWOUT) -nosty ubk 
-
-urw-courier:
-	$(MAKEFAM)  -download -outdir $(URWOUT) -nosty -tt ucr 
-
-urw-helvetic:
-	$(MAKEFAM) -download -outdir $(URWOUT) -sans -nosty uhv 
-
-urw-ncntrsbk:
-	$(MAKEFAM) -download -outdir $(URWOUT) -nosty unc 
+##
 
-urw-palatino:
-	$(MAKEFAM) -download -outdir $(URWOUT) -nosty upl 
-
-urw-times:
-	$(MAKEFAM) -download -outdir $(URWOUT) -nosty utm 
-
-urw-symbol:
-	$(MAKEONE) -download -outdir $(URWOUT) usyr 
+ibm-timesnew:
+	$(MAKEFAM)  -outdir $(IBMOUT) -download -nosty nnt 
 
-urw-zapfchan:
-	$(MAKEFAM)  -download -outdir $(URWOUT) -nosty uzc 
+##
 
-urw-zapfding:
-	$(MAKEONE) -download -outdir $(URWOUT) uzdr 
+urw:
+	$(MAKEFAM) -outdir $(URWOUT)  -download uaq 
+	$(MAKEFAM) -outdir $(URWOUT)  -download ugq 
+	$(MAKEFAM) -outdir $(URWOUT)  -download unm 
+	$(MAKEFAM) -outdir $(URWOUT)  -download -sans unms 
+	$(AFMTOTFM) unmr -outdir $(URWOUT)/nimbus
+	-rm *.vpl
+	-grep Extend map >> $(URWOUT)/nimbus/dvips/unm.map
+	-grep Slant map >> $(URWOUT)/nimbus/dvips/unm.map
+	sort $(URWOUT)/nimbus/dvips/unm.map | uniq > map
+	$(MV) map $(URWOUT)/nimbus/dvips/unm.map 
+	$(AFMTOTFM) unmrs -outdir $(URWOUT)/nimbus
+	-rm *.vpl
+	-grep Extend map >> $(URWOUT)/nimbus/dvips/unms.map
+	-grep Slant map >> $(URWOUT)/nimbus/dvips/unms.map
+	sort $(URWOUT)/nimbus/dvips/unms.map | uniq > map
+	$(MV) map $(URWOUT)/nimbus/dvips/unms.map 
+	$(AFMTOTFM) uaqrrc -outdir $(URWOUT)/antiqua
+	-rm *.vpl
+	-grep Extend map >> $(URWOUT)/antiqua/dvips/uaq.map
+	-grep Slant map >> $(URWOUT)/antiqua/dvips/uaq.map
+	sort $(URWOUT)/antiqua/dvips/uaq.map | uniq > map
+	$(MV) map $(URWOUT)/antiqua/dvips/uaq.map 
+	$(AFMTOTFM) ugqb -outdir $(URWOUT)/grotesq
+	-rm *.vpl
+	sort $(URWOUT)/grotesq/dvips/ugq.map | uniq > map
+	$(MV) map $(URWOUT)/grotesq/dvips/ugq.map 
 
-ibm-timesnew:
-	$(MAKEFAM)  -outdir $(IBMOUT) -download -nosty nnt 
+##
 
 clean:
 	rm *.done