diff --git a/library/PDFSTREAM b/library/PDFSTREAM
index bfb879d3..0940f416 100644
--- a/library/PDFSTREAM
+++ b/library/PDFSTREAM
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "26-Nov-2025 11:37:30" {WMEDLEY}<library>PDFSTREAM.;90 18708  
+(FILECREATED "12-Dec-2025 19:16:43" {WMEDLEY}<library>PDFSTREAM.;92 17210  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (VARS PDFSTREAMCOMS)
 
-      :PREVIOUS-DATE "27-Sep-2025 16:55:27" {WMEDLEY}<library>PDFSTREAM.;89)
+      :PREVIOUS-DATE "26-Nov-2025 11:37:30" {WMEDLEY}<library>PDFSTREAM.;90)
 
 
 (PRETTYCOMPRINT PDFSTREAMCOMS)
@@ -17,25 +17,9 @@
         (INITVARS (PDFFONTCOERCIONS POSTSCRIPTFONTCOERCIONS)
                (PDFCHARCOERCIONS POSTSCRIPTCHARCOERCIONS))
         [COMS                                                (* ; "Hook into hardcopy interface")
-              [ADDVARS [PRINTERTYPES ((PDF)
-                                      (CANPRINT (PDF))
-                                      (STATUS TRUE)
-                                      (PROPERTIES NILL)
-                                      (SEND POSTSCRIPTSEND)
-                                      (BITMAPSCALE POSTSCRIPT.BITMAPSCALE)
-                                      (BITMAPFILE (PDF.HARDCOPYW FILE BITMAP SCALEFACTOR REGION 
-                                                         ROTATION TITLE]
-                     [PRINTFILETYPES (PDF (TEST PDFFILEP)
-                                          (EXTENSION (PDF))
-                                          (CONVERSION (TEXT POSTSCRIPT.TEXT TEDIT TEDIT.TO.IMAGEFILE
-                                                            POSTSCRIPT PDF.POSTSCRIPT]
-                     (IMAGESTREAMTYPES (PDF (OPENSTREAM OPEN-PDF-STREAM)
-                                            (FONTCREATE POSTSCRIPT.FONTCREATE)
-                                            (FONTSAVAILABLE PDF.FONTSAVAILABLE)
-                                            (CREATECHARSET \CREATECHARSET.PSC)
-                                            (FONTEXISTS? POSTSCRIPT.FONTEXISTS?]
-              (ALISTS (DEFAULTFILETYPELIST PDF))
-              (VARS (DEFAULTPRINTERTYPE 'PDF))
+              (ALISTS (PRINTFILETYPES PDF)
+                     (IMAGESTREAMTYPES PDF)
+                     (DEFAULTFILETYPELIST PDF))
               (FNS PDFFILEP PDF.HARDCOPYW PDF.TEXT PDF.TEDIT PDF.FONTSAVAILABLE)
               (P (FONTPROFILE.ADDDEVICE 'PDF 'POSTSCRIPT]
         
@@ -68,18 +52,12 @@
 (* ; "Hook into hardcopy interface")
 
 
-(ADDTOVAR PRINTERTYPES ((PDF)
-                        (CANPRINT (PDF))
-                        (STATUS TRUE)
-                        (PROPERTIES NILL)
-                        (SEND POSTSCRIPTSEND)
-                        (BITMAPSCALE POSTSCRIPT.BITMAPSCALE)
-                        (BITMAPFILE (PDF.HARDCOPYW FILE BITMAP SCALEFACTOR REGION ROTATION TITLE))))
-
-(ADDTOVAR PRINTFILETYPES (PDF (TEST PDFFILEP)
-                              (EXTENSION (PDF))
-                              (CONVERSION (TEXT POSTSCRIPT.TEXT TEDIT TEDIT.TO.IMAGEFILE POSTSCRIPT 
-                                                PDF.POSTSCRIPT))))
+(ADDTOVAR PRINTFILETYPES
+          (PDF (TEST PDFFILEP)
+               (EXTENSION (PDF))
+               (CONVERSION (TEXT POSTSCRIPT.TEXT TEDIT TEDIT.TO.IMAGEFILE POSTSCRIPT PDF.POSTSCRIPT))
+               (BITMAPSCALE POSTSCRIPT.BITMAPSCALE)
+               (BITMAPFILE (PDF.HARDCOPYW FILE BITMAP SCALEFACTOR REGION ROTATION TITLE))))
 
 (ADDTOVAR IMAGESTREAMTYPES (PDF (OPENSTREAM OPEN-PDF-STREAM)
                                 (FONTCREATE POSTSCRIPT.FONTCREATE)
@@ -88,8 +66,6 @@
                                 (FONTEXISTS? POSTSCRIPT.FONTEXISTS?)))
 
 (ADDTOVAR DEFAULTFILETYPELIST (PDF . BINARY))
-
-(RPAQQ DEFAULTPRINTERTYPE PDF)
 (DEFINEQ
 
 (PDFFILEP
@@ -368,9 +344,9 @@
 
 (\PDFINIT)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3913 7493 (PDFFILEP 3923 . 5200) (PDF.HARDCOPYW 5202 . 5772) (PDF.TEXT 5774 . 6491) (
-PDF.TEDIT 6493 . 7069) (PDF.FONTSAVAILABLE 7071 . 7491)) (7933 17005 (OPEN-PDF-STREAM 7943 . 9093) (
-CLOSE-PDF-STREAM 9095 . 11443) (PS-TO-PDF 11445 . 17003)) (17006 17262 (PDF.POSTSCRIPT 17016 . 17260))
- (17263 18021 (SEE-PDF 17273 . 18019)) (18072 18356 (PDFCONVERTER 18082 . 18354)) (18357 18669 (
-\PDFINIT 18367 . 18667)))))
+  (FILEMAP (NIL (2415 5995 (PDFFILEP 2425 . 3702) (PDF.HARDCOPYW 3704 . 4274) (PDF.TEXT 4276 . 4993) (
+PDF.TEDIT 4995 . 5571) (PDF.FONTSAVAILABLE 5573 . 5993)) (6435 15507 (OPEN-PDF-STREAM 6445 . 7595) (
+CLOSE-PDF-STREAM 7597 . 9945) (PS-TO-PDF 9947 . 15505)) (15508 15764 (PDF.POSTSCRIPT 15518 . 15762)) (
+15765 16523 (SEE-PDF 15775 . 16521)) (16574 16858 (PDFCONVERTER 16584 . 16856)) (16859 17171 (\PDFINIT
+ 16869 . 17169)))))
 STOP
diff --git a/library/PDFSTREAM.LCOM b/library/PDFSTREAM.LCOM
index e2c2fc0a..3fe20de1 100644
Binary files a/library/PDFSTREAM.LCOM and b/library/PDFSTREAM.LCOM differ
diff --git a/library/POSTSCRIPTSTREAM b/library/POSTSCRIPTSTREAM
index 2f005435..f8c09b75 100644
--- a/library/POSTSCRIPTSTREAM
+++ b/library/POSTSCRIPTSTREAM
@@ -1,12 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "26-Nov-2025 14:33:44" {WMEDLEY}<library>POSTSCRIPTSTREAM.;57 260390 
+(FILECREATED "12-Dec-2025 19:38:31" {WMEDLEY}<library>POSTSCRIPTSTREAM.;60 258351 
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (VARS POSTSCRIPTSTREAMCOMS)
-
-      :PREVIOUS-DATE "13-Oct-2025 18:05:08" {WMEDLEY}<library>POSTSCRIPTSTREAM.;55)
+      :PREVIOUS-DATE "12-Dec-2025 19:16:22" {WMEDLEY}<library>POSTSCRIPTSTREAM.;59)
 
 
 (PRETTYCOMPRINT POSTSCRIPTSTREAMCOMS)
@@ -156,16 +154,7 @@
                                           (* (* 1]
                (POSTSCRIPTCHARCOERCIONS NIL)
                (\POSTSCRIPT.MAX.WILD.FONTSIZE 72))
-        [COMS (FNS POSTSCRIPTSEND)
-              (ADDVARS (PRINTERTYPES ((POSTSCRIPT)
-                                      (CANPRINT (POSTSCRIPT))
-                                      (STATUS TRUE)
-                                      (PROPERTIES NILL)
-                                      (SEND POSTSCRIPTSEND)
-                                      (BITMAPSCALE POSTSCRIPT.BITMAPSCALE)
-                                      (BITMAPFILE (POSTSCRIPT.HARDCOPYW FILE BITMAP SCALEFACTOR 
-                                                         REGION ROTATION TITLE]
-        [ADDVARS (POSTSCRIPT.FONT.ALIST (HELVETICA . HELVETICA)
+        (ADDVARS (POSTSCRIPT.FONT.ALIST (HELVETICA . HELVETICA)
                         (HELVETICAD . HELVETICA)
                         (TIMESROMAN . TIMES)
                         (TIMESROMAND . TIMES)
@@ -177,15 +166,9 @@
                         (TERMINAL . COURIER)
                         (LOGO . HELVETICA)
                         (OPTIMA . PALATINO)
-                        (TITAN . COURIER))
-               [PRINTFILETYPES (POSTSCRIPT (TEST POSTSCRIPTFILEP)
-                                      (EXTENSION (PS PSC PSF))
-                                      (CONVERSION (TEXT POSTSCRIPT.TEXT TEDIT TEDIT.TO.IMAGEFILE]
-               (IMAGESTREAMTYPES (POSTSCRIPT (OPENSTREAM OPENPOSTSCRIPTSTREAM)
-                                        (FONTCREATE POSTSCRIPT.FONTCREATE)
-                                        (FONTSAVAILABLE POSTSCRIPT.FONTSAVAILABLE)
-                                        (CREATECHARSET \CREATECHARSET.PSC)
-                                        (FONTEXISTS? POSTSCRIPT.FONTEXISTS?]
+                        (TITAN . COURIER)))
+        (ALISTS (PRINTFILETYPES POSTSCRIPT)
+               (IMAGESTREAMTYPES POSTSCRIPT))
         (INITVARS (POSTSCRIPT.PAGETYPE 'LETTER))
         
         (* ;; "NIL means initial clipping is same as paper size.  Don't know why the other regions were specified--rmk")
@@ -1433,7 +1416,8 @@
                           (CHARCODE !])])
 
 (MAKEEPSFILE
-  [LAMBDA (IMAGEOBJ FILENAME)                                (* ; "Edited 16-Sep-2025 00:29 by rmk")
+  [LAMBDA (IMAGEOBJ FILENAME)                                (* ; "Edited  7-Dec-2025 16:37 by rmk")
+                                                             (* ; "Edited 16-Sep-2025 00:29 by rmk")
                                                              (* ; "Edited  7-Apr-94 14:48 by rmk:")
 
     (* ;; "Puts IMAGEOBJ on a 1-page encapsulated postscript file.  The lower-left corner of the image box will be at 0,0 on the page.")
@@ -1442,7 +1426,7 @@
 
     (LET ([IMAGEBOX (APPLY* (IMAGEOBJPROP IMAGEOBJ 'IMAGEBOXFN)
                            IMAGEOBJ
-                           (OPENIMAGESTREAM `{NODIRCORE}SCRATCH 'POSTSCRIPT]
+                           (OPENIMAGESTREAM NIL 'POSTSCRIPT]
           STREAM)
          [SETQ STREAM (OPENIMAGESTREAM FILENAME 'POSTSCRIPT
                              `(BOUNDINGBOX (0 0 ,(FETCH XSIZE OF IMAGEBOX)
@@ -4339,27 +4323,6 @@
 (RPAQ? POSTSCRIPTCHARCOERCIONS NIL)
 
 (RPAQ? \POSTSCRIPT.MAX.WILD.FONTSIZE 72)
-(DEFINEQ
-
-(POSTSCRIPTSEND
-  [LAMBDA (HOST FILE PRINTOPTIONS)                           (* ; "Edited 20-Nov-95 11:29 by ")
-                                                             (* ; "Edited 20-Nov-95 11:26 by ")
-
-    (* ;; "This is the send function for generic POSTSCRIPT printers.  It branches on the architecture-specific function.  The theory is that the send method is really a property of the operating system, not a property of specific postscript printers.  These functions are contained in separate library files (or defined by user).")
-
-    (SELECTQ (MKATOM (UNIX-GETPARM "ARCH"))
-        (dos (DOSPRINT HOST FILE PRINTOPTIONS))
-        (UnixPrint HOST FILE PRINTOPTIONS])
-)
-
-(ADDTOVAR PRINTERTYPES ((POSTSCRIPT)
-                        (CANPRINT (POSTSCRIPT))
-                        (STATUS TRUE)
-                        (PROPERTIES NILL)
-                        (SEND POSTSCRIPTSEND)
-                        (BITMAPSCALE POSTSCRIPT.BITMAPSCALE)
-                        (BITMAPFILE (POSTSCRIPT.HARDCOPYW FILE BITMAP SCALEFACTOR REGION ROTATION 
-                                           TITLE))))
 
 (ADDTOVAR POSTSCRIPT.FONT.ALIST (HELVETICA . HELVETICA)
                                 (HELVETICAD . HELVETICA)
@@ -4375,9 +4338,12 @@
                                 (OPTIMA . PALATINO)
                                 (TITAN . COURIER))
 
-(ADDTOVAR PRINTFILETYPES (POSTSCRIPT (TEST POSTSCRIPTFILEP)
-                                (EXTENSION (PS PSC PSF))
-                                (CONVERSION (TEXT POSTSCRIPT.TEXT TEDIT TEDIT.TO.IMAGEFILE))))
+(ADDTOVAR PRINTFILETYPES
+          (POSTSCRIPT (TEST POSTSCRIPTFILEP)
+                 (EXTENSION (PS PSC PSF POSTSCRIPT))
+                 (CONVERSION (TEXT POSTSCRIPT.TEXT TEDIT TEDIT.TO.IMAGEFILE))
+                 (BITMAPSCALE POSTSCRIPT.BITMAPSCALE)
+                 (BITMAPFILE (POSTSCRIPT.HARDCOPYW FILE BITMAP SCALEFACTOR REGION ROTATION TITLE))))
 
 (ADDTOVAR IMAGESTREAMTYPES (POSTSCRIPT (OPENSTREAM OPENPOSTSCRIPTSTREAM)
                                   (FONTCREATE POSTSCRIPT.FONTCREATE)
@@ -4427,39 +4393,38 @@
 (ADDTOVAR LAMA POSTSCRIPT.PUTCOMMAND)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (23433 33641 (POSTSCRIPT.INIT 23443 . 30247) (POSTSCRIPT.PUTRGBCOLOR 30249 . 31271) (
-\PSC.COLOR.TO.RGB 31273 . 33639)) (34627 69945 (PSCFONT.READFONT 34637 . 36545) (PSCFONT.SPELLFILE 
-36547 . 37360) (PSCFONT.COERCEFILE 37362 . 38934) (PSCFONTFROMCACHE.SPELLFILE 38936 . 39921) (
-PSCFONTFROMCACHE.COERCEFILE 39923 . 41575) (PSCFONT.WRITEFONT 41577 . 42592) (READ-AFM-FILE 42594 . 
-48465) (CONVERT-AFM-FILES 48467 . 49679) (POSTSCRIPT.GETFONTID 49681 . 51076) (POSTSCRIPT.FONTCREATE 
-51078 . 63972) (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 63974 . 66371) (POSTSCRIPT.FONTSAVAILABLE 66373
- . 68556) (POSTSCRIPT.FONTEXISTS? 68558 . 69943)) (69946 79669 (OPENPOSTSCRIPTSTREAM 69956 . 79335) (
-CLOSEPOSTSCRIPTSTREAM 79337 . 79667)) (79714 86536 (POSTSCRIPT.HARDCOPYW 79724 . 82831) (
-POSTSCRIPT.TEDIT 82833 . 83285) (POSTSCRIPT.TEXT 83287 . 83874) (POSTSCRIPTFILEP 83876 . 85364) (
-MAKEEPSFILE 85366 . 86534)) (86537 130111 (POSTSCRIPT.BITMAPSCALE 86547 . 89003) (
-POSTSCRIPT.CLOSESTRING 89005 . 89558) (POSTSCRIPT.ENDPAGE 89560 . 90451) (POSTSCRIPT.OUTSTR 90453 . 
-91670) (POSTSCRIPT.PUTBITMAPBYTES 91672 . 100143) (POSTSCRIPT.PUTCOMMAND 100145 . 101134) (
-POSTSCRIPT.SET-FAKE-LANDSCAPE 101136 . 105656) (POSTSCRIPT.SHOWACCUM 105658 . 107813) (
-POSTSCRIPT.STARTPAGE 107815 . 110347) (\POSTSCRIPTTAB 110349 . 111146) (\PS.BOUTFIXP 111148 . 112428) 
-(\PS.SCALEHACK 112430 . 115073) (\PS.SCALEREGION 115075 . 115635) (\SCALEDBITBLT.PSC 115637 . 119947) 
-(\SETPOS.PSC 119949 . 120430) (\SETXFORM.PSC 120432 . 123016) (\STRINGWIDTH.PSC 123018 . 123491) (
-\SWITCHFONTS.PSC 123493 . 128985) (\TERPRI.PSC 128987 . 130109)) (130146 184002 (\BITBLT.PSC 130156 . 
-130708) (\BLTSHADE.PSC 130710 . 135371) (\CHARWIDTH.PSC 135373 . 135880) (\CREATECHARSET.PSC 135882 . 
-137238) (\DRAWARC.PSC 137240 . 139618) (\DRAWCIRCLE.PSC 139620 . 141871) (\DRAWCURVE.PSC 141873 . 
-145717) (\DRAWELLIPSE.PSC 145719 . 148083) (\DRAWLINE.PSC 148085 . 150825) (\DRAWPOINT.PSC 150827 . 
-151403) (\DRAWPOLYGON.PSC 151405 . 154534) (\DSPBOTTOMMARGIN.PSC 154536 . 155223) (
-\DSPCLIPPINGREGION.PSC 155225 . 156600) (\DSPCOLOR.PSC 156602 . 157533) (\DSPFONT.PSC 157535 . 161172)
- (\DSPLEFTMARGIN.PSC 161174 . 161860) (\DSPLINEFEED.PSC 161862 . 162452) (\DSPPUSHSTATE.PSC 162454 . 
-163914) (\DSPPOPSTATE.PSC 163916 . 167401) (\DSPRESET.PSC 167403 . 168068) (\DSPRIGHTMARGIN.PSC 168070
- . 168759) (\DSPROTATE.PSC 168761 . 169760) (\DSPSCALE.PSC 169762 . 170714) (\DSPSCALE2.PSC 170716 . 
-171556) (\DSPSPACEFACTOR.PSC 171558 . 172479) (\DSPTOPMARGIN.PSC 172481 . 173052) (\DSPTRANSLATE.PSC 
-173054 . 175085) (\DSPXPOSITION.PSC 175087 . 175651) (\DSPYPOSITION.PSC 175653 . 176244) (
-\FILLCIRCLE.PSC 176246 . 178471) (\FILLPOLYGON.PSC 178473 . 181710) (\FIXLINELENGTH.PSC 181712 . 
-183031) (\MOVETO.PSC 183033 . 183803) (\NEWPAGE.PSC 183805 . 184000)) (184058 206204 (
-\POSTSCRIPT.CHANGECHARSET 184068 . 184786) (\POSTSCRIPT.OUTCHARFN 184788 . 197058) (
-\POSTSCRIPT.PRINTSLUG 197060 . 198784) (\POSTSCRIPT.SPECIALOUTCHARFN 198786 . 201137) (\UPDATE.PSC 
-201139 . 202385) (\POSTSCRIPT.ACCENTFN 202387 . 203329) (\POSTSCRIPT.ACCENTPAIR 203331 . 206202)) (
-206302 207947 (\PSC.SPACEDISP 206312 . 206591) (\PSC.SPACEWID 206593 . 207212) (\PSC.SYMBOLS 207214 . 
-207945)) (208056 211047 (\POSTSCRIPT.NSHASH 208066 . 211045)) (256498 257204 (POSTSCRIPTSEND 256508 . 
-257202)))))
+  (FILEMAP (NIL (22293 32501 (POSTSCRIPT.INIT 22303 . 29107) (POSTSCRIPT.PUTRGBCOLOR 29109 . 30131) (
+\PSC.COLOR.TO.RGB 30133 . 32499)) (33487 68805 (PSCFONT.READFONT 33497 . 35405) (PSCFONT.SPELLFILE 
+35407 . 36220) (PSCFONT.COERCEFILE 36222 . 37794) (PSCFONTFROMCACHE.SPELLFILE 37796 . 38781) (
+PSCFONTFROMCACHE.COERCEFILE 38783 . 40435) (PSCFONT.WRITEFONT 40437 . 41452) (READ-AFM-FILE 41454 . 
+47325) (CONVERT-AFM-FILES 47327 . 48539) (POSTSCRIPT.GETFONTID 48541 . 49936) (POSTSCRIPT.FONTCREATE 
+49938 . 62832) (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 62834 . 65231) (POSTSCRIPT.FONTSAVAILABLE 65233
+ . 67416) (POSTSCRIPT.FONTEXISTS? 67418 . 68803)) (68806 78529 (OPENPOSTSCRIPTSTREAM 68816 . 78195) (
+CLOSEPOSTSCRIPTSTREAM 78197 . 78527)) (78574 85489 (POSTSCRIPT.HARDCOPYW 78584 . 81691) (
+POSTSCRIPT.TEDIT 81693 . 82145) (POSTSCRIPT.TEXT 82147 . 82734) (POSTSCRIPTFILEP 82736 . 84224) (
+MAKEEPSFILE 84226 . 85487)) (85490 129064 (POSTSCRIPT.BITMAPSCALE 85500 . 87956) (
+POSTSCRIPT.CLOSESTRING 87958 . 88511) (POSTSCRIPT.ENDPAGE 88513 . 89404) (POSTSCRIPT.OUTSTR 89406 . 
+90623) (POSTSCRIPT.PUTBITMAPBYTES 90625 . 99096) (POSTSCRIPT.PUTCOMMAND 99098 . 100087) (
+POSTSCRIPT.SET-FAKE-LANDSCAPE 100089 . 104609) (POSTSCRIPT.SHOWACCUM 104611 . 106766) (
+POSTSCRIPT.STARTPAGE 106768 . 109300) (\POSTSCRIPTTAB 109302 . 110099) (\PS.BOUTFIXP 110101 . 111381) 
+(\PS.SCALEHACK 111383 . 114026) (\PS.SCALEREGION 114028 . 114588) (\SCALEDBITBLT.PSC 114590 . 118900) 
+(\SETPOS.PSC 118902 . 119383) (\SETXFORM.PSC 119385 . 121969) (\STRINGWIDTH.PSC 121971 . 122444) (
+\SWITCHFONTS.PSC 122446 . 127938) (\TERPRI.PSC 127940 . 129062)) (129099 182955 (\BITBLT.PSC 129109 . 
+129661) (\BLTSHADE.PSC 129663 . 134324) (\CHARWIDTH.PSC 134326 . 134833) (\CREATECHARSET.PSC 134835 . 
+136191) (\DRAWARC.PSC 136193 . 138571) (\DRAWCIRCLE.PSC 138573 . 140824) (\DRAWCURVE.PSC 140826 . 
+144670) (\DRAWELLIPSE.PSC 144672 . 147036) (\DRAWLINE.PSC 147038 . 149778) (\DRAWPOINT.PSC 149780 . 
+150356) (\DRAWPOLYGON.PSC 150358 . 153487) (\DSPBOTTOMMARGIN.PSC 153489 . 154176) (
+\DSPCLIPPINGREGION.PSC 154178 . 155553) (\DSPCOLOR.PSC 155555 . 156486) (\DSPFONT.PSC 156488 . 160125)
+ (\DSPLEFTMARGIN.PSC 160127 . 160813) (\DSPLINEFEED.PSC 160815 . 161405) (\DSPPUSHSTATE.PSC 161407 . 
+162867) (\DSPPOPSTATE.PSC 162869 . 166354) (\DSPRESET.PSC 166356 . 167021) (\DSPRIGHTMARGIN.PSC 167023
+ . 167712) (\DSPROTATE.PSC 167714 . 168713) (\DSPSCALE.PSC 168715 . 169667) (\DSPSCALE2.PSC 169669 . 
+170509) (\DSPSPACEFACTOR.PSC 170511 . 171432) (\DSPTOPMARGIN.PSC 171434 . 172005) (\DSPTRANSLATE.PSC 
+172007 . 174038) (\DSPXPOSITION.PSC 174040 . 174604) (\DSPYPOSITION.PSC 174606 . 175197) (
+\FILLCIRCLE.PSC 175199 . 177424) (\FILLPOLYGON.PSC 177426 . 180663) (\FIXLINELENGTH.PSC 180665 . 
+181984) (\MOVETO.PSC 181986 . 182756) (\NEWPAGE.PSC 182758 . 182953)) (183011 205157 (
+\POSTSCRIPT.CHANGECHARSET 183021 . 183739) (\POSTSCRIPT.OUTCHARFN 183741 . 196011) (
+\POSTSCRIPT.PRINTSLUG 196013 . 197737) (\POSTSCRIPT.SPECIALOUTCHARFN 197739 . 200090) (\UPDATE.PSC 
+200092 . 201338) (\POSTSCRIPT.ACCENTFN 201340 . 202282) (\POSTSCRIPT.ACCENTPAIR 202284 . 205155)) (
+205255 206900 (\PSC.SPACEDISP 205265 . 205544) (\PSC.SPACEWID 205546 . 206165) (\PSC.SYMBOLS 206167 . 
+206898)) (207009 210000 (\POSTSCRIPT.NSHASH 207019 . 209998)))))
 STOP
diff --git a/library/POSTSCRIPTSTREAM.LCOM b/library/POSTSCRIPTSTREAM.LCOM
index 54529f31..66a4319d 100644
Binary files a/library/POSTSCRIPTSTREAM.LCOM and b/library/POSTSCRIPTSTREAM.LCOM differ
diff --git a/library/UNIXPRINT b/library/UNIXPRINT
index 14e51594..79336f1a 100644
--- a/library/UNIXPRINT
+++ b/library/UNIXPRINT
@@ -1,26 +1,22 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED " 5-Dec-2025 11:47:35" {WMEDLEY}<library>UNIXPRINT.;7 13933  
+(FILECREATED "12-Dec-2025 19:31:07" {WMEDLEY}<library>UNIXPRINT.;10 13362  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS UnixPrint)
-
-      :PREVIOUS-DATE " 5-Dec-2025 09:40:47" {WMEDLEY}<library>UNIXPRINT.;6)
+      :PREVIOUS-DATE "11-Dec-2025 23:19:04" {WMEDLEY}<library>UNIXPRINT.;9)
 
 
 (PRETTYCOMPRINT UNIXPRINTCOMS)
 
 (RPAQQ UNIXPRINTCOMS
        [(FILES UNIXUTILS)
-        (FNS InstallUnixPrinter UnixPrint UnixShellQuote UnixTempFile UnixPrintCommand)
+        (FNS UnixPrint UnixShellQuote UnixTempFile UnixPrintCommand)
+        (ALISTS (PRINTERTYPES (UNIX)))
         (INITVARS (UnixPrinterName NIL)
-               (UNIXPRINTSWITCHES " -r -s "))
-        (P 
-           (* ;; 
-           "(InstallUnixPrinter)  commented out because POSTSCRIPT indirects according to platform")
-
-           (PRIN1 "Please feel free to edit UnixPrintCommand." PROMPTWINDOW))
+               (UNIXPRINTSWITCHES " -r -s ")
+               (DEFAULTPRINTERTYPE 'UNIX))
+        (P (PRIN1 "Please feel free to edit UnixPrintCommand." PROMPTWINDOW))
         (PROP FILETYPE UNIXPRINT)
         (DECLARE%: DONTEVAL@COMPILE DOCOPY (FNS UnixPrintCommand))
         (DECLARE%: EVAL@COMPILE DOCOPY (FILES UNIXCOMM))
@@ -32,18 +28,6 @@
 (FILESLOAD UNIXUTILS)
 (DEFINEQ
 
-(InstallUnixPrinter
-  [LAMBDA (PrinterTypes)                                     (* ; "Edited  8-Feb-97 11:33 by rmk:")
-
-    (* ;; "Set up any printers in PrinterTypes (or just Postscript by default) so that they'll be printed using the unix LPR command.")
-
-    (DECLARE (GLOBALVARS PRINTERTYPES))
-    (for type inside (OR PrinterTypes '(POSTSCRIPT))
-       do (for x in PRINTERTYPES when (EQMEMB type (CAR x))
-             do (LET ((PRINTERTYPE type))
-                     (PUTASSOC 'SEND (LIST 'UnixPrint)
-                            (CDR x])
-
 (UnixPrint
   [LAMBDA (HOST FILE PRINTOPTIONS)                           (* ; "Edited  5-Dec-2025 11:46 by rmk")
                                                              (* ; "Edited 13-Sep-2025 20:28 by rmk")
@@ -235,13 +219,17 @@
            " " TMPNAME])
 )
 
+(ADDTOVAR PRINTERTYPES ((UNIX)
+                        (CANPRINT (PDF))
+                        (STATUS TRUE)
+                        (PROPERTIES NILL)
+                        (SEND UnixPrint)))
+
 (RPAQ? UnixPrinterName NIL)
 
 (RPAQ? UNIXPRINTSWITCHES " -r -s ")
 
-
-(* ;; "(InstallUnixPrinter)  commented out because POSTSCRIPT indirects according to platform")
-
+(RPAQ? DEFAULTPRINTERTYPE 'UNIX)
 
 (PRIN1 "Please feel free to edit UnixPrintCommand." PROMPTWINDOW)
 
@@ -305,7 +293,6 @@
 (ADDTOVAR LAMA )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1272 11589 (InstallUnixPrinter 1282 . 1874) (UnixPrint 1876 . 7248) (UnixShellQuote 
-7250 . 8679) (UnixTempFile 8681 . 9904) (UnixPrintCommand 9906 . 11587)) (11923 13616 (
-UnixPrintCommand 11933 . 13614)))))
+  (FILEMAP (NIL (1160 10883 (UnixPrint 1170 . 6542) (UnixShellQuote 6544 . 7973) (UnixTempFile 7975 . 
+9198) (UnixPrintCommand 9200 . 10881)) (11352 13045 (UnixPrintCommand 11362 . 13043)))))
 STOP
diff --git a/library/UNIXPRINT.DFASL b/library/UNIXPRINT.DFASL
index 5e97c072..5a7b7011 100644
Binary files a/library/UNIXPRINT.DFASL and b/library/UNIXPRINT.DFASL differ
diff --git a/sources/HARDCOPY b/sources/HARDCOPY
index b108f60a..74b0d8d3 100644
--- a/sources/HARDCOPY
+++ b/sources/HARDCOPY
@@ -1,13 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED " 7-Dec-2025 11:09:32" {WMEDLEY}<sources>HARDCOPY.;96 150536 
+(FILECREATED "13-Dec-2025 00:00:55" {WMEDLEY}<sources>HARDCOPY.;108 150942 
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS SEND.FILE.TO.PRINTER MakeMenuOfPrinters HARDCOPYIMAGEW.TOPRINTER 
-                       HARDCOPYREGION.TOPRINTER NewPrinter HARDCOPYW)
+      :CHANGES-TO (FNS HARDCOPYW HARDCOPYREGION.TOFILE PRINTER.BITMAPFILE PRINTER.BITMAPSCALE 
+                       PRINTERTYPE)
+                  (VARS HARDCOPYCOMS)
 
-      :PREVIOUS-DATE " 5-Dec-2025 17:24:03" {WMEDLEY}<sources>HARDCOPY.;93)
+      :PREVIOUS-DATE "11-Dec-2025 23:57:14" {WMEDLEY}<sources>HARDCOPY.;102)
 
 
 (PRETTYCOMPRINT HARDCOPYCOMS)
@@ -34,16 +35,13 @@
         (COMS                                                (* ; 
                                                              "Interface for PRINTERS and IMAGEFILES")
               (FNS DEFAULTPRINTER CONVERT.FILE.TO.TYPE.FOR.PRINTER CAN.PRINT.DIRECTLY EMPRESS 
-                   HARDCOPYW LISTFILES1 PRINTER.BITMAPFILE PRINTER.BITMAPSCALE PRINTER.SCRATCH.FILE 
-                   PRINTERPROP PRINTERSTATUS PRINTERTYPE PRINTERNAME PRINTFILETYPE PRINTERTYPEP 
-                   SEND.FILE.TO.PRINTER)
+                   HARDCOPYW LISTFILES1 PRINTER.SCRATCH.FILE PRINTERPROP PRINTERSTATUS PRINTERTYPE 
+                   PRINTERNAME PRINTFILETYPE PRINTERTYPEP SEND.FILE.TO.PRINTER)
               (FNS PRINTERDEVICE PRINTERDEVICE.OPENFN PRINTERDEVICE.CLOSEFN PRINTERDEVICEP 
                    PRINTERNAME)
               [DECLARE%: DONTEVAL@LOAD DOCOPY (P (PRINTERDEVICE 'LPT]
               (FNS PRINTERS)
               (INITVARS (DEFAULTPRINTINGHOST)
-                     (DEFAULTPRINTERTYPE 'PDF)
-                     (EMPRESS.SCRATCH)
                      (EMPRESS#SIDES T)
                      (PRINTFILETYPES NIL))
               (GLOBALVARS DEFAULTPRINTINGHOST DEFAULTPRINTERTYPE EMPRESS#SIDES PRINTERTYPES 
@@ -203,16 +201,14 @@
                     PRINTERCHOICE))])
 
 (HARDCOPYREGION.TOFILE
-  [LAMBDA NIL                                                (* ; "Edited 26-Aug-87 14:08 by Snow")
+  [LAMBDA NIL                                                (* ; "Edited 12-Dec-2025 23:55 by rmk")
+                                                             (* ; "Edited 26-Aug-87 14:08 by Snow")
     (LET ((FILE&TYPE (GetImageFile)))
-         (if FILE&TYPE
-             then (PROG (REGION)
-                        (SPAWN.MOUSE)
-                        (PROMPTPRINT "Select a region")
-                        (SETQ REGION (GETREGION))
-                        (CLRPROMPT)
-                        (HARDCOPYW REGION (CAR FILE&TYPE)
-                               NIL NIL NIL (CDR FILE&TYPE])
+         (CL:WHEN FILE&TYPE
+             (SPAWN.MOUSE)
+             (PROMPTPRINT "Select a bitmap region for " (CAR FILE&TYPE))
+             (HARDCOPYW (GETREGION)
+                    FILE&TYPE))])
 
 (HARDCOPYREGION.TOPRINTER
   [LAMBDA NIL                                                (* ; "Edited  6-Dec-2025 10:24 by rmk")
@@ -478,7 +474,8 @@
     (CAR (PRINTERS])
 
 (CONVERT.FILE.TO.TYPE.FOR.PRINTER
-  [LAMBDA (FILE FILETYPE PRINTERTYPE HEADING PRINTOPTIONS)   (* ; "Edited 29-Oct-2025 18:50 by rmk")
+  [LAMBDA (FILE PRINTERTYPE PRINTOPTIONS)                    (* ; "Edited 11-Dec-2025 23:52 by rmk")
+                                                             (* ; "Edited 29-Oct-2025 18:50 by rmk")
                                                              (* ; "Edited 24-Sep-2023 15:25 by rmk")
                                                              (* ; "Edited 14-Sep-2023 22:58 by rmk")
                                                              (* ; "Edited 29-Dec-88 15:39 by jds")
@@ -487,8 +484,6 @@
 
     (* ;; "FILETYPE")
 
-    (CL:WHEN HEADING
-        (push PRINTOPTIONS 'HEADING HEADING))
     (for CANPRINT IMAGEFILE in (PRINTERPROP PRINTERTYPE 'CANPRINT)
        when (SETQ IMAGEFILE (CONVERT.TO.IMAGEFILE FILE NIL CANPRINT PRINTOPTIONS T))
        do (RETURN IMAGEFILE])
@@ -511,7 +506,8 @@
                                            PRINTOPTIONS])
 
 (HARDCOPYW
-  [LAMBDA (WINDOW/BITMAP/REGION FILE HOST SCALEFACTOR ROTATION PRINTERTYPE HARDCOPYTITLE)
+  [LAMBDA (WINDOW/BITMAP/REGION IMAGEFILE HOST SCALEFACTOR ROTATION PRINTERTYPE HARDCOPYTITLE)
+                                                             (* ; "Edited 13-Dec-2025 00:00 by rmk")
                                                              (* ; "Edited  6-Dec-2025 10:33 by rmk")
                                                              (* ; "Edited 27-Sep-2025 07:42 by rmk")
                                                              (* ; "Edited 19-Sep-2025 17:59 by rmk")
@@ -522,11 +518,18 @@
 
     (* ;; "")
 
-    (* ;; "WINDOW/BITMAP/REGION can be a WINDOW, a REGION, a BITMAP, or NIL = select region.  If FILE supplied, output goes there.  If HOST supplied, it is printed.  If neither FILE nor HOST supplied, default is to print; if HARDCOPYTITLE is supplied it will be used as the document title of the hardcopy file created.  If it isn't, 'Window Image' is used.")
+    (* ;; "WINDOW/BITMAP/REGION can be a WINDOW, a REGION, a BITMAP, or NIL = select region.  If IMAGEFILE supplied, output goes there.  If HOST supplied, it is printed.  If neither FILE nor HOST supplied, default is to print; if HARDCOPYTITLE is supplied it will be used as the document title of the hardcopy file created.  If it isn't, 'Window Image' is used.")
 
-    (CL:WHEN (MEMB HOST '(NIL :DEFAULT))
-        (SETQ HOST (DEFAULTPRINTER)))
-    (PROG (PRINTHOST BITMAP SCREENREGION REGION BITMAPFILE)
+    (CL:UNLESS (OR HOST IMAGEFILE)
+           (SETQ HOST :DEFAULT))
+    (PROG (PRINTHOST BITMAP SCREENREGION REGION BITMAPFILE IMAGEFILETYPE)
+          (CL:WHEN (LISTP IMAGEFILE)
+              (SETQ IMAGEFILETYPE (CDR IMAGEFILE))
+              (SETQ IMAGEFILE (CAR IMAGEFILE)))
+          (CL:UNLESS HARDCOPYTITLE
+              (SETQ HARDCOPYTITLE (CL:IF (WINDOWP WINDOW/BITMAP/REGION)
+                                      "Window image"
+                                      "Screen image")))
           [SETQ BITMAP (if (WINDOWP WINDOW/BITMAP/REGION)
                            then (COPY.WINDOW.TO.BITMAP WINDOW/BITMAP/REGION)
                          elseif (BITMAPP WINDOW/BITMAP/REGION)
@@ -542,65 +545,54 @@
           (if PRINTERTYPE
               then (if PRINTHOST
                        then (CL:UNLESS (EQ PRINTERTYPE (PRINTERTYPE PRINTHOST))
-                                (ERROR PRINTHOST (CONCAT "not of printer type " PRINTERTYPE))
+                                (ERROR PRINTHOST (CONCAT "is not of printer type " PRINTERTYPE))
                                 (GO RETRY))
-                     elseif FILE
-                       then                                  (* ; 
-                                                          "don't need a PRINTHOST if you give a file")
-                     elseif [SETQ PRINTHOST (find HOST inside (PRINTERS)
-                                               suchthat (EQ PRINTERTYPE (PRINTERTYPE HOST]
-                     else (ERROR "Can't find a printing host in DEFAULTPRINTINGHOST that is of type "
-                                 PRINTERTYPE)
+                     elseif IMAGEFILE
+                       then 
+                            (* ;; 
+                            "don't need a PRINTHOST/PRINTERTYPE if you give a file without a host")
+
+                     elseif (SETQ PRINTHOST (for P in (PRINTERS) when (EQ PRINTERTYPE (PRINTERTYPE
+                                                                                       P))
+                                               do (RETURN P)))
+                     else (ERROR (CONCAT "Can't find a " PRINTERTYPE 
+                                        " printer in DEFAULTPRINTINGHOST"))
                           (GO RETRY))
-            elseif (SETQ PRINTERTYPE (PRINTERTYPE PRINTHOST))
-            elseif FILE
-              then (CL:UNLESS (SETQ PRINTERTYPE (IMAGEFILETYPE FILE T))
-                       (ERROR FILE "Can't tell what kind of print file to produce -- PRINTERTYPE, DEFAULTPRINTERTYPE, DEFAULTPRINTINGHOST all NIL"
-                              )
+            elseif IMAGEFILE
+              then (CL:UNLESS [OR IMAGEFILETYPE (SETQ IMAGEFILETYPE (OR (IMAGEFILETYPE.FROM.EXTENSION
+                                                                         IMAGEFILE)
+                                                                        (CAR (NLSETQ (IMAGEFILETYPE
+                                                                                      IMAGEFILE]
+                       (ERROR IMAGEFILE "does not designate an image file")
                        (GO RETRY))
-            else (ERROR "Can't tell where to send window image -- HOST NIL")
+            elseif (SETQ PRINTERTYPE (PRINTERTYPE PRINTHOST))
+            else (ERROR "Can't tell where to send a bitmap image")
                  (GO RETRY))
+          (CL:UNLESS IMAGEFILETYPE
+              [SETQ IMAGEFILETYPE (CAR (PRINTERPROP PRINTERTYPE 'CANPRINT])
           (CL:UNLESS SCALEFACTOR
               (SETQ SCALEFACTOR (if REGION
-                                    then (PRINTER.BITMAPSCALE (fetch (REGION WIDTH) of REGION)
+                                    then (IMAGETYPE.BITMAPSCALE (fetch (REGION WIDTH) of REGION)
                                                 (fetch (REGION HEIGHT) of REGION)
-                                                PRINTERTYPE PRINTHOST)
-                                  else (PRINTER.BITMAPSCALE (fetch (BITMAP BITMAPWIDTH) of BITMAP)
+                                                IMAGEFILETYPE)
+                                  else (IMAGETYPE.BITMAPSCALE (fetch (BITMAP BITMAPWIDTH)
+                                                                 of BITMAP)
                                               (fetch (BITMAP BITMAPHEIGHT) of BITMAP)
-                                              PRINTERTYPE PRINTHOST)))
+                                              IMAGEFILETYPE)))
               (CL:WHEN (LISTP SCALEFACTOR)
                   (SETQ ROTATION (CDR SCALEFACTOR))
                   (SETQ SCALEFACTOR (CAR SCALEFACTOR))))
-          (SETQ BITMAPFILE (PRINTER.BITMAPFILE (OR FILE (OPENSTREAM '{NODIRCORE} 'OUTPUT))
-                                  PRINTERTYPE BITMAP SCALEFACTOR REGION ROTATION (OR HARDCOPYTITLE 
-                                                                                     "Window Image"))
-           )
-          (CL:WHEN (OR HOST (NULL FILE))
-              [SEND.FILE.TO.PRINTER BITMAPFILE HOST '(DELETE %, (NULL FILE)
-                                                            DOCUMENT.NAME %, (OR HARDCOPYTITLE 
-                                                                                 "Window Image"])
-          (RETURN (AND FILE BITMAPFILE])
+          (SETQ BITMAPFILE (IMAGETYPE.BITMAPFILE (OR IMAGEFILE (OPENSTREAM '{NODIRCORE} 'OUTPUT))
+                                  IMAGEFILETYPE BITMAP SCALEFACTOR REGION ROTATION HARDCOPYTITLE))
+          (CL:WHEN (OR HOST (NULL IMAGEFILE))
+              (SEND.FILE.TO.PRINTER BITMAPFILE PRINTHOST '(DELETE %, (NULL IMAGEFILE)
+                                                                 DOCUMENT.NAME %, HARDCOPYTITLE)))
+          (RETURN (AND IMAGEFILE BITMAPFILE])
 
 (LISTFILES1
   [LAMBDA (FILE PRINTOPTIONS)                                (* ; "Edited 26-Aug-87 14:17 by Snow")
     (SEND.FILE.TO.PRINTER FILE NIL PRINTOPTIONS])
 
-(PRINTER.BITMAPFILE
-  [LAMBDA (FILE PRINTERTYPE BITMAP SCALEFACTOR REGION ROTATION TITLE)
-                                                             (* ; "Edited 26-Aug-87 14:19 by Snow")
-                                                             (* ; "convert a bitmap into a file")
-    (DECLARE (SPECVARS . T))
-    (EVAL (PRINTERPROP PRINTERTYPE 'BITMAPFILE])
-
-(PRINTER.BITMAPSCALE
-  [LAMBDA (WIDTH HEIGHT PRINTERTYPE HOST)                    (* ; "Edited 26-Aug-87 14:19 by Snow")
-                                                             (* ; 
-                                                          "could ask the host what size paper it has")
-    (PROG NIL
-          (RETURN (APPLY* (OR (PRINTERPROP PRINTERTYPE 'BITMAPSCALE)
-                              (RETURN 1))
-                         WIDTH HEIGHT HOST])
-
 (PRINTER.SCRATCH.FILE
   [LAMBDA (PRINTER IMAGETYPE)                                (* ; "Edited 19-Sep-2025 14:49 by rmk")
     (CONCAT "{" (OR (PRINTERDEVICEP PRINTER)
@@ -622,7 +614,8 @@
          (AND STATUSFN (APPLY* STATUSFN PRINTER])
 
 (PRINTERTYPE
-  [LAMBDA (HOST PREFERRED)                                   (* ; "Edited  5-Dec-2025 12:51 by rmk")
+  [LAMBDA (HOST PREFERRED)                                   (* ; "Edited 12-Dec-2025 22:37 by rmk")
+                                                             (* ; "Edited  5-Dec-2025 12:51 by rmk")
                                                              (* ; "Edited 19-Sep-2025 10:18 by rmk")
                                                              (* ; "Edited 27-Apr-98 16:16 by rmk:")
                                                            (* ; "Edited 15-Feb-91 14:14 by gadener")
@@ -630,7 +623,7 @@
     (* ;; "Attempt to deduce the printer type of HOST.")
 
     (SELECTQ HOST
-        ((NIL LPT) 
+        ((NIL LPT :DEFAULT) 
              (SETQ HOST (DEFAULTPRINTER)))
         NIL)
     (COND
@@ -703,7 +696,8 @@
            X])
 
 (SEND.FILE.TO.PRINTER
-  [LAMBDA (FILE HOST PRINTOPTIONS)                           (* ; "Edited  7-Dec-2025 11:08 by rmk")
+  [LAMBDA (FILE HOST PRINTOPTIONS)                           (* ; "Edited 11-Dec-2025 23:56 by rmk")
+                                                             (* ; "Edited  7-Dec-2025 11:08 by rmk")
                                                              (* ; "Edited  5-Dec-2025 14:41 by rmk")
                                                              (* ; "Edited 27-Sep-2025 07:43 by rmk")
                                                              (* ; "Edited 25-Sep-2025 21:34 by rmk")
@@ -755,11 +749,12 @@
              (CL:UNLESS (SETQ SENDFN (PRINTERPROP PRINTERTYPE 'SEND))
                  (ERROR (CONCAT "Don't know how to send to a " PRINTERTYPE " printer")
                         PRINTER))
-             [SETQ HEADING (SELECTQ (LISTGET PRINTOPTIONS 'HEADING)
-                               (T NIL)
-                               (NIL (CONCAT FILE "     " (GETFILEINFO FILE 'CREATIONDATE)))
-                               (LISTGET PRINTOPTIONS 'HEADING]
-                                                             (* (ADD.PROCESS (BQUOTE
+             [SETQ PRINTOPTIONS `(HEADING ,(SELECTQ (LISTGET PRINTOPTIONS 'HEADING)
+                                               (T NIL)
+                                               (NIL (CONCAT FILE "     " (GETFILEINFO FILE
+                                                                                'CREATIONDATE)))
+                                               (LISTGET PRINTOPTIONS 'HEADING))
+                                        ,@PRINTOPTIONS]      (* (ADD.PROCESS (BQUOTE
                                                              ((\, SENDFN) (QUOTE (\,
                                                              (CL:IF (LISTP PRINTHOST)
                                                              (CADR PRINTHOST) PRINTHOST)))
@@ -770,8 +765,9 @@
                                          PRINTER)
                              (CL:IF (CAN.PRINT.DIRECTLY PRINTERTYPE IMAGETYPE)
                                  FILE
-                                 (SETQ CONVERTED (CONVERT.TO.IMAGEFILE FILE NIL PRINTERTYPE)))
-                             `(HEADING ,HEADING ,@PRINTOPTIONS %#COPIES 1 DOCUMENTNAME ,FILE]
+                                 (SETQ CONVERTED (CONVERT.FILE.TO.TYPE.FOR.PRINTER FILE PRINTERTYPE 
+                                                        PRINTOPTIONS)))
+                             `(,@PRINTOPTIONS %#COPIES 1 DOCUMENT.NAME ,FILE]
                  (CL:WHEN (AND CONVERTED (LISTGET PRINTOPTIONS 'DELETE))
                         (DELFILE CONVERTED))
                  FILE)))])
@@ -921,10 +917,6 @@
 
 (RPAQ? DEFAULTPRINTINGHOST )
 
-(RPAQ? DEFAULTPRINTERTYPE 'PDF)
-
-(RPAQ? EMPRESS.SCRATCH )
-
 (RPAQ? EMPRESS#SIDES T)
 
 (RPAQ? PRINTFILETYPES NIL)
@@ -957,7 +949,8 @@
 (DEFINEQ
 
 (TEXTTOIMAGEFILE
-  [LAMBDA (FILE IMAGEFILE IMAGETYPE OPTIONS)                 (* ; "Edited 28-Sep-2025 11:52 by rmk")
+  [LAMBDA (FILE IMAGEFILE IMAGETYPE OPTIONS)                 (* ; "Edited  7-Dec-2025 16:36 by rmk")
+                                                             (* ; "Edited 28-Sep-2025 11:52 by rmk")
                                                              (* ; "Edited 18-Sep-2025 23:17 by rmk")
                                                              (* ; "Edited 17-Sep-2025 22:47 by rmk")
                                                              (* ; "Edited 26-Aug-87 14:23 by Snow")
@@ -967,8 +960,11 @@
                    `(PROGN (CLOSEF? OLDVALUE])
         (LET ((IMAGESTREAM (OPENIMAGESTREAM IMAGEFILE IMAGETYPE OPTIONS)))
              (COPY.TEXT.TO.IMAGE FILE IMAGESTREAM (LISTGET OPTIONS 'FONTS)
-                    (LISTGET OPTIONS 'TABS))
-             (CLOSEF? IMAGESTREAM)))])
+                    (LISTGET OPTIONS 'TABS))                 (* ; 
+                                                 "Don't lose if IMAGEFILE was already an imagestream")
+             (CL:IF (EQ IMAGEFILE IMAGESTREAM)
+                 IMAGESTREAM
+                 (CLOSEF? IMAGESTREAM))))])
 
 (COPY.TEXT.TO.IMAGE
   [LAMBDA (INFILE IMAGESTREAM FONTS TABS)                    (* ; "Edited 28-Sep-2025 11:46 by rmk")
@@ -2419,39 +2415,38 @@
 (ADDTOVAR LAMA )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (6508 14293 (HARDCOPY.SOMEHOW 6518 . 8754) (HARDCOPYIMAGEW 8756 . 9206) (
-HARDCOPYIMAGEW.TOFILE 9208 . 9500) (HARDCOPYIMAGEW.TOPRINTER 9502 . 11331) (HARDCOPYREGION.TOFILE 
-11333 . 11875) (HARDCOPYREGION.TOPRINTER 11877 . 13272) (COPY.WINDOW.TO.BITMAP 13274 . 14291)) (14365 
-26781 (MakeMenuOfPrinters 14375 . 15846) (PRINTERS.WHENSELECTEDFN 15848 . 17471) (MakeMenuOfImageTypes
- 17473 . 18292) (GetNewPrinterFromUser 18294 . 18736) (PopUpWindowAndGetAtom 18738 . 20189) (
-PopUpWindowAndGetList 20191 . 21761) (NewPrinter 21763 . 23258) (GetPrinterName 23260 . 23548) (
-GetImageFile 23550 . 26529) (FetchDefaultPrinter 26531 . 26779)) (26836 45074 (DEFAULTPRINTER 26846 . 
-27107) (CONVERT.FILE.TO.TYPE.FOR.PRINTER 27109 . 28086) (CAN.PRINT.DIRECTLY 28088 . 28521) (EMPRESS 
-28523 . 29098) (HARDCOPYW 29100 . 33989) (LISTFILES1 33991 . 34168) (PRINTER.BITMAPFILE 34170 . 34559)
- (PRINTER.BITMAPSCALE 34561 . 35045) (PRINTER.SCRATCH.FILE 35047 . 35358) (PRINTERPROP 35360 . 35610) 
-(PRINTERSTATUS 35612 . 35887) (PRINTERTYPE 35889 . 38524) (PRINTERNAME 38526 . 39612) (PRINTFILETYPE 
-39614 . 39876) (PRINTERTYPEP 39878 . 40103) (SEND.FILE.TO.PRINTER 40105 . 45072)) (45075 51634 (
-PRINTERDEVICE 45085 . 46062) (PRINTERDEVICE.OPENFN 46064 . 46784) (PRINTERDEVICE.CLOSEFN 46786 . 49871
-) (PRINTERDEVICEP 49873 . 50544) (PRINTERNAME 50546 . 51632)) (51696 53336 (PRINTERS 51706 . 53334)) (
-53631 54189 (SCALEREGION 53641 . 54187)) (54413 61476 (TEXTTOIMAGEFILE 54423 . 55282) (
-COPY.TEXT.TO.IMAGE 55284 . 61474)) (61538 63281 (\BLTSHADE.GENERICPRINTER 61548 . 63279)) (63348 
-100514 (MAKEHARDCOPYSTREAM 63358 . 65074) (UNMAKEHARDCOPYSTREAM 65076 . 66006) (HARDCOPYSTREAMTYPE 
-66008 . 66415) (\CHARWIDTH.HDCPYDISPLAY 66417 . 67237) (\DSPFONT.HDCPYDISPLAY 67239 . 70034) (
-\DSPRIGHTMARGIN.HDCPYDISPLAY 70036 . 70891) (\DSPXPOSITION.HDCPYDISPLAY 70893 . 71268) (
-\DSPYPOSITION.HDCPYDISPLAY 71270 . 71645) (\STRINGWIDTH.HDCPYDISPLAY 71647 . 72602) (
-\STRINGWIDTH.HCPYDISPLAYAUX 72604 . 77944) (\HDCPYBLTCHAR 77946 . 82843) (\HDCPYDISPLAY.FIX.XPOS 82845
- . 83602) (\HDCPYDISPLAY.FIX.YPOS 83604 . 84345) (\HDCPYDISPLAYINIT 84347 . 86037) (\HDCPYDSPPRINTCHAR
- 86039 . 91952) (\SLOWHDCPYBLTCHAR 91954 . 98570) (\CHANGECHARSET.HDCPYDISPLAY 98572 . 100512)) (
-100829 150380 (MAKEHARDCOPYMODESTREAM 100839 . 103560) (UNMAKEHARDCOPYMODESTREAM 103562 . 105152) (
-\HCPYDISPLAYIMAGEOPS 105154 . 107974) (\BLTSHADE.HCPYMODE 107976 . 108642) (\BITBLT.HCPYMODE 108644 . 
-109392) (\BRUSHCONVERT.HCPYMODE 109394 . 109943) (\CHANGECHARSET.HCPYMODE 109945 . 113207) (
-\DASHINGCONVERT.HCPYMODE 113209 . 113550) (\CHARWIDTH.HCPYMODE 113552 . 113989) (\DRAWLINE.HCPYMODE 
-113991 . 114520) (\DRAWCURVE.HCPYMODE 114522 . 115109) (\DRAWCIRCLE.HCPYMODE 115111 . 115596) (
-\DRAWELLIPSE.HCPYMODE 115598 . 116282) (\DSPFONT.HCPYMODE 116284 . 118968) (\DSPLEFTMARGIN.HCPYMODE 
-118970 . 119712) (\DSPLINEFEED.HCPYMODE 119714 . 120347) (\DSPRIGHTMARGIN.HCPYMODE 120349 . 121417) (
-\DSPSPACEFACTOR.HCPYMODE 121419 . 122194) (\DSPXPOSITION.HCPYMODE 122196 . 123214) (
-\DSPYPOSITION.HCPYMODE 123216 . 123866) (\MOVETO.HCPYMODE 123868 . 124082) (\FONTCREATE.HCPYMODE 
-124084 . 126041) (\CREATECHARSET.HCPYMODE 126043 . 127766) (\STRINGWIDTH.HCPYMODE 127768 . 128563) (
-\HCPYMODEBLTCHAR 128565 . 134315) (\HCPYMODEDSPPRINTCHAR 134317 . 140251) (\SLOWHCPYMODEBLTCHAR 140253
- . 146882) (\SFFixY.HCPYMODE 146884 . 150378)))))
+  (FILEMAP (NIL (6375 14105 (HARDCOPY.SOMEHOW 6385 . 8621) (HARDCOPYIMAGEW 8623 . 9073) (
+HARDCOPYIMAGEW.TOFILE 9075 . 9367) (HARDCOPYIMAGEW.TOPRINTER 9369 . 11198) (HARDCOPYREGION.TOFILE 
+11200 . 11687) (HARDCOPYREGION.TOPRINTER 11689 . 13084) (COPY.WINDOW.TO.BITMAP 13086 . 14103)) (14177 
+26593 (MakeMenuOfPrinters 14187 . 15658) (PRINTERS.WHENSELECTEDFN 15660 . 17283) (MakeMenuOfImageTypes
+ 17285 . 18104) (GetNewPrinterFromUser 18106 . 18548) (PopUpWindowAndGetAtom 18550 . 20001) (
+PopUpWindowAndGetList 20003 . 21573) (NewPrinter 21575 . 23070) (GetPrinterName 23072 . 23360) (
+GetImageFile 23362 . 26341) (FetchDefaultPrinter 26343 . 26591)) (26648 45224 (DEFAULTPRINTER 26658 . 
+26919) (CONVERT.FILE.TO.TYPE.FOR.PRINTER 26921 . 27936) (CAN.PRINT.DIRECTLY 27938 . 28371) (EMPRESS 
+28373 . 28948) (HARDCOPYW 28950 . 34578) (LISTFILES1 34580 . 34757) (PRINTER.SCRATCH.FILE 34759 . 
+35070) (PRINTERPROP 35072 . 35322) (PRINTERSTATUS 35324 . 35599) (PRINTERTYPE 35601 . 38354) (
+PRINTERNAME 38356 . 39442) (PRINTFILETYPE 39444 . 39706) (PRINTERTYPEP 39708 . 39933) (
+SEND.FILE.TO.PRINTER 39935 . 45222)) (45225 51784 (PRINTERDEVICE 45235 . 46212) (PRINTERDEVICE.OPENFN 
+46214 . 46934) (PRINTERDEVICE.CLOSEFN 46936 . 50021) (PRINTERDEVICEP 50023 . 50694) (PRINTERNAME 50696
+ . 51782)) (51846 53486 (PRINTERS 51856 . 53484)) (53714 54272 (SCALEREGION 53724 . 54270)) (54496 
+61882 (TEXTTOIMAGEFILE 54506 . 55688) (COPY.TEXT.TO.IMAGE 55690 . 61880)) (61944 63687 (
+\BLTSHADE.GENERICPRINTER 61954 . 63685)) (63754 100920 (MAKEHARDCOPYSTREAM 63764 . 65480) (
+UNMAKEHARDCOPYSTREAM 65482 . 66412) (HARDCOPYSTREAMTYPE 66414 . 66821) (\CHARWIDTH.HDCPYDISPLAY 66823
+ . 67643) (\DSPFONT.HDCPYDISPLAY 67645 . 70440) (\DSPRIGHTMARGIN.HDCPYDISPLAY 70442 . 71297) (
+\DSPXPOSITION.HDCPYDISPLAY 71299 . 71674) (\DSPYPOSITION.HDCPYDISPLAY 71676 . 72051) (
+\STRINGWIDTH.HDCPYDISPLAY 72053 . 73008) (\STRINGWIDTH.HCPYDISPLAYAUX 73010 . 78350) (\HDCPYBLTCHAR 
+78352 . 83249) (\HDCPYDISPLAY.FIX.XPOS 83251 . 84008) (\HDCPYDISPLAY.FIX.YPOS 84010 . 84751) (
+\HDCPYDISPLAYINIT 84753 . 86443) (\HDCPYDSPPRINTCHAR 86445 . 92358) (\SLOWHDCPYBLTCHAR 92360 . 98976) 
+(\CHANGECHARSET.HDCPYDISPLAY 98978 . 100918)) (101235 150786 (MAKEHARDCOPYMODESTREAM 101245 . 103966) 
+(UNMAKEHARDCOPYMODESTREAM 103968 . 105558) (\HCPYDISPLAYIMAGEOPS 105560 . 108380) (\BLTSHADE.HCPYMODE 
+108382 . 109048) (\BITBLT.HCPYMODE 109050 . 109798) (\BRUSHCONVERT.HCPYMODE 109800 . 110349) (
+\CHANGECHARSET.HCPYMODE 110351 . 113613) (\DASHINGCONVERT.HCPYMODE 113615 . 113956) (
+\CHARWIDTH.HCPYMODE 113958 . 114395) (\DRAWLINE.HCPYMODE 114397 . 114926) (\DRAWCURVE.HCPYMODE 114928
+ . 115515) (\DRAWCIRCLE.HCPYMODE 115517 . 116002) (\DRAWELLIPSE.HCPYMODE 116004 . 116688) (
+\DSPFONT.HCPYMODE 116690 . 119374) (\DSPLEFTMARGIN.HCPYMODE 119376 . 120118) (\DSPLINEFEED.HCPYMODE 
+120120 . 120753) (\DSPRIGHTMARGIN.HCPYMODE 120755 . 121823) (\DSPSPACEFACTOR.HCPYMODE 121825 . 122600)
+ (\DSPXPOSITION.HCPYMODE 122602 . 123620) (\DSPYPOSITION.HCPYMODE 123622 . 124272) (\MOVETO.HCPYMODE 
+124274 . 124488) (\FONTCREATE.HCPYMODE 124490 . 126447) (\CREATECHARSET.HCPYMODE 126449 . 128172) (
+\STRINGWIDTH.HCPYMODE 128174 . 128969) (\HCPYMODEBLTCHAR 128971 . 134721) (\HCPYMODEDSPPRINTCHAR 
+134723 . 140657) (\SLOWHCPYMODEBLTCHAR 140659 . 147288) (\SFFixY.HCPYMODE 147290 . 150784)))))
 STOP
diff --git a/sources/HARDCOPY.LCOM b/sources/HARDCOPY.LCOM
index d18dc0bb..7200bd74 100644
Binary files a/sources/HARDCOPY.LCOM and b/sources/HARDCOPY.LCOM differ
diff --git a/sources/IMAGEIO b/sources/IMAGEIO
index 343db57d..e53db353 100644
--- a/sources/IMAGEIO
+++ b/sources/IMAGEIO
@@ -1,13 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED " 2-Nov-2025 08:54:06" {WMEDLEY}<sources>IMAGEIO.;22 81248  
+(FILECREATED "12-Dec-2025 23:14:50" {WMEDLEY}<sources>IMAGEIO.;26 82764  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS CONVERT.TO.IMAGEFILE IMAGEFILEPROP)
-                  (VARS IMAGEIOCOMS)
+      :CHANGES-TO (VARS IMAGEIOCOMS)
+                  (FNS IMAGETYPE.BITMAPSCALE IMAGETYPE.BITMAPFILE)
 
-      :PREVIOUS-DATE "28-Sep-2025 11:49:34" {WMEDLEY}<sources>IMAGEIO.;20)
+      :PREVIOUS-DATE " 7-Dec-2025 16:27:20" {WMEDLEY}<sources>IMAGEIO.;25)
 
 
 (PRETTYCOMPRINT IMAGEIOCOMS)
@@ -17,6 +17,7 @@
         (FNS IMAGESTREAMP IMAGESTREAMTYPE IMAGESTREAMTYPEP IMAGEFILETYPE IMAGEFILEPROP)
         (FNS EXTENSIONS.FOR.IMAGEFILETYPE IMAGEFILETYPE.FROM.EXTENSION)
         (FNS CONVERT.TO.IMAGEFILE)
+        (FNS IMAGETYPE.BITMAPSCALE IMAGETYPE.BITMAPFILE)
         (INITVARS (IMAGESTREAMTYPES NIL))
         (FNS \GOOD.DASHLST)
         (FNS DRAWDASHEDLINE)
@@ -62,24 +63,32 @@
 (DEFINEQ
 
 (OPENIMAGESTREAM
-  [LAMBDA (IMAGEFILE IMAGETYPE OPTIONS)                      (* ; "Edited 25-Sep-2025 21:32 by rmk")
+  [LAMBDA (IMAGEFILE IMAGETYPE OPTIONS)                      (* ; "Edited  7-Dec-2025 13:47 by rmk")
+                                                             (* ; "Edited 25-Sep-2025 21:32 by rmk")
                                                              (* ; "Edited 19-Sep-2025 15:58 by rmk")
                                                              (* ; "Edited  1-Jun-93 12:32 by rmk:")
                                                              (* ; "Edited 11-Jan-91 16:05 by jds")
 
-    (* ;; "Opens IMAGEFILE as an IMAGETYPE imagestream")
+    (* ;; "Opens IMAGEFILE as an IMAGETYPE imagestream, returning IMAGEFILE is it is already an open stream of that type")
 
     (DECLARE (GLOBALVARS IMAGESTREAMTYPES))
-    (APPLY* (OR (CAR (GETMULTI IMAGESTREAMTYPES IMAGETYPE 'OPENSTREAM))
-                (ERROR "No open function for " IMAGETYPE " streams"))
-           (CL:IF (OR (EQ IMAGETYPE 'DISPLAY)
-                      (STREAMP (FULLNAME IMAGEFILE)))
-               IMAGEFILE
-               (PACKFILENAME 'BODY (\CONVERT-PATHNAME IMAGEFILE)
-                      'EXTENSION
-                      (OR (CAR (EXTENSIONS.FOR.IMAGEFILETYPE IMAGETYPE))
-                          IMAGETYPE)))
-           OPTIONS])
+    (CL:UNLESS IMAGEFILE
+        (SETQ IMAGEFILE (OPENSTREAM "{NODIRCORE}" 'OUTPUT)))
+    (if [AND (\GETSTREAM IMAGEFILE 'OUTPUT T)
+             (OR (EQ IMAGETYPE (IMAGESTREAMP IMAGEFILE))
+                 (AND (NULL IMAGETYPE)
+                      (IMAGESTREAMP IMAGEFILE]
+        then IMAGEFILE
+      else (APPLY* (OR (CAR (GETMULTI IMAGESTREAMTYPES IMAGETYPE 'OPENSTREAM))
+                       (ERROR "No open function for " IMAGETYPE " streams"))
+                  (CL:IF (OR (EQ IMAGETYPE 'DISPLAY)
+                             (STREAMP (FULLNAME IMAGEFILE)))
+                      IMAGEFILE
+                      (PACKFILENAME 'BODY (\CONVERT-PATHNAME IMAGEFILE)
+                             'EXTENSION
+                             (OR (CAR (EXTENSIONS.FOR.IMAGEFILETYPE IMAGETYPE))
+                                 IMAGETYPE)))
+                  OPTIONS])
 )
 (DEFINEQ
 
@@ -201,6 +210,24 @@
            else (ERROR (CONCAT "Can't convert " FILETYPE " file to " IMAGETYPE)
                        (FULLNAME FILE])
 )
+(DEFINEQ
+
+(IMAGETYPE.BITMAPSCALE
+  [LAMBDA (WIDTH HEIGHT IMAGETYPE)                           (* ; "Edited 12-Dec-2025 23:06 by rmk")
+                                                             (* ; "Edited 26-Aug-87 14:19 by Snow")
+    (LET [(FN (IMAGEFILEPROP IMAGETYPE 'BITMAPSCALE]
+         (CL:IF FN
+             (APPLY* FN WIDTH HEIGHT)
+             1)])
+
+(IMAGETYPE.BITMAPFILE
+  [LAMBDA (FILE IMAGETYPE BITMAP SCALEFACTOR REGION ROTATION TITLE)
+                                                             (* ; "Edited 12-Dec-2025 23:04 by rmk")
+                                                             (* ; "Edited 26-Aug-87 14:19 by Snow")
+                                                             (* ; "convert a bitmap into a file")
+    (DECLARE (SPECVARS . T))
+    (EVAL (IMAGEFILEPROP IMAGETYPE 'BITMAPFILE])
+)
 
 (RPAQ? IMAGESTREAMTYPES NIL)
 (DEFINEQ
@@ -1549,26 +1576,27 @@
 (ADDTOVAR LAMA IMAGESTREAMP)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3421 4499 (OPENIMAGESTREAM 3431 . 4497)) (4500 7676 (IMAGESTREAMP 4510 . 5342) (
-IMAGESTREAMTYPE 5344 . 5557) (IMAGESTREAMTYPEP 5559 . 6194) (IMAGEFILETYPE 6196 . 7307) (IMAGEFILEPROP
- 7309 . 7674)) (7677 8682 (EXTENSIONS.FOR.IMAGEFILETYPE 7687 . 8043) (IMAGEFILETYPE.FROM.EXTENSION 
-8045 . 8680)) (8683 11435 (CONVERT.TO.IMAGEFILE 8693 . 11433)) (11470 13585 (\GOOD.DASHLST 11480 . 
-13583)) (13586 15883 (DRAWDASHEDLINE 13596 . 15881)) (15884 23224 (DSPBACKCOLOR 15894 . 16266) (
-DSPBOTTOMMARGIN 16268 . 16653) (DSPCOLOR 16655 . 17019) (DSPCLIPPINGREGION 17021 . 17726) (DSPRESET 
-17728 . 18008) (DSPFONT 18010 . 18374) (DSPLEFTMARGIN 18376 . 18757) (DSPLINEFEED 18759 . 19059) (
-DSPOPERATION 19061 . 19438) (DSPRIGHTMARGIN 19440 . 19823) (DSPTOPMARGIN 19825 . 20204) (DSPSCALE 
-20206 . 20573) (DSPSPACEFACTOR 20575 . 20968) (DSPXPOSITION 20970 . 21275) (DSPYPOSITION 21277 . 21582
-) (DSPROTATE 21584 . 21879) (DSPPUSHSTATE 21881 . 22127) (DSPPOPSTATE 22129 . 22372) (DSPDEFAULTSTATE 
-22374 . 22626) (DSPSCALE2 22628 . 22919) (DSPTRANSLATE 22921 . 23222)) (23225 32026 (DSPNEWPAGE 23235
- . 23927) (DRAWBETWEEN 23929 . 24631) (DRAWCIRCLE 24633 . 25129) (DRAWARC 25131 . 25648) (DRAWCURVE 
-25650 . 26327) (DRAWELLIPSE 26329 . 27115) (DRAWLINE 27117 . 27507) (DRAWPOLYGON 27509 . 27964) (
-DRAWPOINT 27966 . 28385) (FILLPOLYGON 28387 . 28953) (DRAWTO 28955 . 29373) (FILLCIRCLE 29375 . 29598)
- (MOVETO 29600 . 29964) (RELDRAWTO 29966 . 30883) (BITMAPIMAGESIZE 30885 . 31056) (SCALEDBITBLT 31058
- . 32024)) (32027 39066 (\DRAWPOINT.GENERIC 32037 . 32384) (\DRAWPOLYGON.GENERIC 32386 . 34694) (
-\DRAWCIRCLE.GENERIC 34696 . 36354) (\DRAWELLIPSE.GENERIC 36356 . 39064)) (39067 44011 (\IMAGEIOINIT 
-39077 . 42357) (\NOIMAGE.DSPFONT 42359 . 43845) (\UNIMPIMAGEOP 43847 . 44009)) (44134 47258 (
-INSURE.BRUSH 44144 . 45518) (BRUSHP 45520 . 46310) (\POSSIBLECOLOR 46312 . 46863) (NEGSHADE 46865 . 
-47256)) (47814 48498 (DASHINGP 47824 . 48154) (INSURE.DASHING 48156 . 48496)) (59236 79782 (
-\DisplayEventFn 59246 . 59756) (\DISPLAYINIT 59758 . 65341) (\4DISPLAYINIT 65343 . 70044) (
-\8DISPLAYINIT 70046 . 74749) (\24DISPLAYINIT 74751 . 79523) (\DISPLAYSTREAMTYPEBPP 79525 . 79780)))))
+  (FILEMAP (NIL (3486 5127 (OPENIMAGESTREAM 3496 . 5125)) (5128 8304 (IMAGESTREAMP 5138 . 5970) (
+IMAGESTREAMTYPE 5972 . 6185) (IMAGESTREAMTYPEP 6187 . 6822) (IMAGEFILETYPE 6824 . 7935) (IMAGEFILEPROP
+ 7937 . 8302)) (8305 9310 (EXTENSIONS.FOR.IMAGEFILETYPE 8315 . 8671) (IMAGEFILETYPE.FROM.EXTENSION 
+8673 . 9308)) (9311 12063 (CONVERT.TO.IMAGEFILE 9321 . 12061)) (12064 12951 (IMAGETYPE.BITMAPSCALE 
+12074 . 12449) (IMAGETYPE.BITMAPFILE 12451 . 12949)) (12986 15101 (\GOOD.DASHLST 12996 . 15099)) (
+15102 17399 (DRAWDASHEDLINE 15112 . 17397)) (17400 24740 (DSPBACKCOLOR 17410 . 17782) (DSPBOTTOMMARGIN
+ 17784 . 18169) (DSPCOLOR 18171 . 18535) (DSPCLIPPINGREGION 18537 . 19242) (DSPRESET 19244 . 19524) (
+DSPFONT 19526 . 19890) (DSPLEFTMARGIN 19892 . 20273) (DSPLINEFEED 20275 . 20575) (DSPOPERATION 20577
+ . 20954) (DSPRIGHTMARGIN 20956 . 21339) (DSPTOPMARGIN 21341 . 21720) (DSPSCALE 21722 . 22089) (
+DSPSPACEFACTOR 22091 . 22484) (DSPXPOSITION 22486 . 22791) (DSPYPOSITION 22793 . 23098) (DSPROTATE 
+23100 . 23395) (DSPPUSHSTATE 23397 . 23643) (DSPPOPSTATE 23645 . 23888) (DSPDEFAULTSTATE 23890 . 24142
+) (DSPSCALE2 24144 . 24435) (DSPTRANSLATE 24437 . 24738)) (24741 33542 (DSPNEWPAGE 24751 . 25443) (
+DRAWBETWEEN 25445 . 26147) (DRAWCIRCLE 26149 . 26645) (DRAWARC 26647 . 27164) (DRAWCURVE 27166 . 27843
+) (DRAWELLIPSE 27845 . 28631) (DRAWLINE 28633 . 29023) (DRAWPOLYGON 29025 . 29480) (DRAWPOINT 29482 . 
+29901) (FILLPOLYGON 29903 . 30469) (DRAWTO 30471 . 30889) (FILLCIRCLE 30891 . 31114) (MOVETO 31116 . 
+31480) (RELDRAWTO 31482 . 32399) (BITMAPIMAGESIZE 32401 . 32572) (SCALEDBITBLT 32574 . 33540)) (33543 
+40582 (\DRAWPOINT.GENERIC 33553 . 33900) (\DRAWPOLYGON.GENERIC 33902 . 36210) (\DRAWCIRCLE.GENERIC 
+36212 . 37870) (\DRAWELLIPSE.GENERIC 37872 . 40580)) (40583 45527 (\IMAGEIOINIT 40593 . 43873) (
+\NOIMAGE.DSPFONT 43875 . 45361) (\UNIMPIMAGEOP 45363 . 45525)) (45650 48774 (INSURE.BRUSH 45660 . 
+47034) (BRUSHP 47036 . 47826) (\POSSIBLECOLOR 47828 . 48379) (NEGSHADE 48381 . 48772)) (49330 50014 (
+DASHINGP 49340 . 49670) (INSURE.DASHING 49672 . 50012)) (60752 81298 (\DisplayEventFn 60762 . 61272) (
+\DISPLAYINIT 61274 . 66857) (\4DISPLAYINIT 66859 . 71560) (\8DISPLAYINIT 71562 . 76265) (
+\24DISPLAYINIT 76267 . 81039) (\DISPLAYSTREAMTYPEBPP 81041 . 81296)))))
 STOP
diff --git a/sources/IMAGEIO.LCOM b/sources/IMAGEIO.LCOM
index c35aae97..47406c29 100644
Binary files a/sources/IMAGEIO.LCOM and b/sources/IMAGEIO.LCOM differ
diff --git a/sources/INTERPRESS b/sources/INTERPRESS
index 07dd554f..44c7dc3f 100644
--- a/sources/INTERPRESS
+++ b/sources/INTERPRESS
@@ -1,12 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "17-Sep-2025 23:16:50" {WMEDLEY}<sources>INTERPRESS.;99 216112 
+(FILECREATED "12-Dec-2025 19:34:04" {WMEDLEY}<sources>INTERPRESS.;103 215348 
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (VARS INTERPRESSCOMS)
-
-      :PREVIOUS-DATE "13-Sep-2025 23:25:38" {WMEDLEY}<sources>INTERPRESS.;98)
+      :PREVIOUS-DATE "12-Dec-2025 19:22:53" {WMEDLEY}<sources>INTERPRESS.;102)
 
 
 (PRETTYCOMPRINT INTERPRESSCOMS)
@@ -77,26 +75,19 @@
         
         (* ;; "HOSTNAMEP is NILL for DOCUPRINT instead of NSPRINTER.HOSTNAMEP, since that predicate merely tests for colon in the name.  DOCUPRINT printers are only recognized from their PRINTERTYPE property, which must be on their CANONICAL.HOSTNAME.  Preference is for INTERPRESS (CANPRINT ordering), for backward compatibility.  But printer can be put on DEFAULTPRINTINGHOST twice, with the type CONSed on to the name, to give the user dynamic selection.")
 
-        [ADDVARS [PRINTERTYPES ((DOCUPRINT)
+        [ADDVARS (PRINTERTYPES ((DOCUPRINT)
                                 (CANPRINT (INTERPRESS POSTSCRIPT))
                                 (HOSTNAMEP NILL)
                                 (STATUS NSPRINTER.STATUS)
                                 (PROPERTIES NSPRINTER.PROPERTIES)
-                                (SEND NSPRINT)
-                                (BITMAPSCALE INTERPRESS.BITMAPSCALE)
-                                (BITMAPFILE (INTERPRESSBITMAP FILE BITMAP SCALEFACTOR REGION ROTATION
-                                                   TITLE)))
+                                (SEND NSPRINT))
                         ((INTERPRESS 8044)
                          (CANPRINT (INTERPRESS))
                          (HOSTNAMEP NSPRINTER.HOSTNAMEP)
                          (STATUS NSPRINTER.STATUS)
                          (PROPERTIES NSPRINTER.PROPERTIES)
-                         (SEND NSPRINT)
-                         (BITMAPSCALE INTERPRESS.BITMAPSCALE)
-                         (BITMAPFILE (INTERPRESSBITMAP FILE BITMAP SCALEFACTOR REGION ROTATION TITLE]
-               (PRINTFILETYPES (INTERPRESS (TEST INTERPRESSFILEP)
-                                      (EXTENSION (IP IPR INTERPRESS))
-                                      (CONVERSION (TEXT TEXTTOIMAGEFILE TEDIT TEDIT.IMAGEFILE]
+                         (SEND NSPRINT]
+        (ALISTS (PRINTFILETYPES INTERPRESS))
         [ADDVARS (IMAGESTREAMTYPES (INTERPRESSDISPLAY (FONTCREATE \FONTCREATE.HCPYMODE)
                                           (CREATECHARSET \CREATECHARSET.HCPYMODE]
         (INITVARS (DEFAULT.INTERPRESS.BITMAP.ROTATION 90))
@@ -3510,21 +3501,20 @@
            (HOSTNAMEP NILL)
            (STATUS NSPRINTER.STATUS)
            (PROPERTIES NSPRINTER.PROPERTIES)
-           (SEND NSPRINT)
-           (BITMAPSCALE INTERPRESS.BITMAPSCALE)
-           (BITMAPFILE (INTERPRESSBITMAP FILE BITMAP SCALEFACTOR REGION ROTATION TITLE)))
+           (SEND NSPRINT))
           ((INTERPRESS 8044)
            (CANPRINT (INTERPRESS))
            (HOSTNAMEP NSPRINTER.HOSTNAMEP)
            (STATUS NSPRINTER.STATUS)
            (PROPERTIES NSPRINTER.PROPERTIES)
-           (SEND NSPRINT)
-           (BITMAPSCALE INTERPRESS.BITMAPSCALE)
-           (BITMAPFILE (INTERPRESSBITMAP FILE BITMAP SCALEFACTOR REGION ROTATION TITLE))))
+           (SEND NSPRINT)))
 
-(ADDTOVAR PRINTFILETYPES (INTERPRESS (TEST INTERPRESSFILEP)
-                                (EXTENSION (IP IPR INTERPRESS))
-                                (CONVERSION (TEXT TEXTTOIMAGEFILE TEDIT TEDIT.IMAGEFILE))))
+(ADDTOVAR PRINTFILETYPES
+          (INTERPRESS (TEST INTERPRESSFILEP)
+                 (EXTENSION (IP IPR INTERPRESS))
+                 (CONVERSION (TEXT TEXTTOIMAGEFILE TEDIT TEDIT.IMAGEFILE))
+                 (BITMAPSCALE INTERPRESS.BITMAPSCALE)
+                 (BITMAPFILE (INTERPRESSBITMAP FILE BITMAP SCALEFACTOR REGION ROTATION TITLE))))
 
 (ADDTOVAR IMAGESTREAMTYPES (INTERPRESSDISPLAY (FONTCREATE \FONTCREATE.HCPYMODE)
                                   (CREATECHARSET \CREATECHARSET.HCPYMODE)))
@@ -3838,44 +3828,44 @@
 (LOADDEF 'BRUSH 'RECORDS 'IMAGEIO)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (17212 22864 (APPENDBYTE.IP 17222 . 17358) (APPENDIDENTIFIER.IP 17360 . 17882) (
-APPENDINT.IP 17884 . 18335) (APPENDINTEGER.IP 18337 . 18909) (APPENDLARGEVECTOR.IP 18911 . 19876) (
-APPENDNUMBER.IP 19878 . 20347) (APPENDOP.IP 20349 . 20995) (APPENDRATIONAL.IP 20997 . 21490) (
-APPENDSEQUENCEDESCRIPTOR.IP 21492 . 22687) (BYTESININT.IP 22689 . 22862)) (22900 62707 (ARCTO.IP 22910
- . 24191) (BEGINMASTER.IP 24193 . 24466) (BEGINPAGE.IP 24468 . 24824) (BEGINPREAMBLE.IP 24826 . 25197)
- (CLIPRECTANGLE.IP 25199 . 25689) (CONCAT.IP 25691 . 25956) (CONCATT.IP 25958 . 26225) (ENDMASTER.IP 
-26227 . 26671) (ENDPAGE.IP 26673 . 27050) (ENDPREAMBLE.IP 27052 . 27851) (FGET.IP 27853 . 28156) (
-FILLRECTANGLE.IP 28158 . 30486) (FILLTRAJECTORY.IP 30488 . 31123) (FILLNGON.IP 31125 . 33402) (FSET.IP
- 33404 . 33707) (GETFRAMEVAR.IP 33709 . 34027) (INITIALIZEMASTER.IP 34029 . 34630) (INITIALIZECOLOR.IP
- 34632 . 35953) (ISET.IP 35955 . 36326) (GETCP.IP 36328 . 36637) (LINETO.IP 36639 . 37244) (
-MASKSTROKE.IP 37246 . 37519) (MOVETO.IP 37521 . 37858) (ROTATE.IP 37860 . 38162) (SCALE.IP 38164 . 
-38467) (SCALE2.IP 38469 . 38806) (SETCOLOR.IP 38808 . 41037) (SETRGB.IP 41039 . 42095) (SETCOLORLV.IP 
-42097 . 46710) (SETCOLOR16.IP 46712 . 49818) (SETFONT.IP 49820 . 50641) (SETSPACE.IP 50643 . 50955) (
-SETXREL.IP 50957 . 52141) (SETX.IP 52143 . 53660) (SETXY.IP 53662 . 54834) (SETXYREL.IP 54836 . 56142)
- (SETY.IP 56144 . 57453) (SETYREL.IP 57455 . 58355) (SHOW.IP 58357 . 61617) (TRAJECTORY.IP 61619 . 
-62017) (TRANS.IP 62019 . 62358) (TRANSLATE.IP 62360 . 62705)) (62738 68828 (\CHANGE-VISIBLE-REGION.IP 
-62748 . 66409) (\PAPERSIZE.IP 66411 . 67232) (HEADINGOP.IP 67234 . 68826)) (68829 173349 (
-DEFINEFONT.IP 68839 . 69813) (FONTNAME.IP 69815 . 70745) (INTERPRESS.BITMAPSCALE 70747 . 71540) (
-INTERPRESS.OUTCHARFN 71542 . 78049) (NEWLINE.IP 78051 . 78783) (NEWPAGE.IP 78785 . 83760) (NEWPAGE?.IP
- 83762 . 84241) (OPENIPSTREAM 84243 . 92594) (SETUPFONTS.IP 92596 . 93588) (SHOWBITMAP.IP 93590 . 
-98131) (\BITMAPSIZE.IP 98133 . 98910) (SHOWBITMAP1.IP 98912 . 103284) (SHOWSHADE.IP 103286 . 104239) (
-\BITBLT.IP 104241 . 108445) (\SCALEDBITBLT.IP 108447 . 112092) (\BLTSHADE.IP 112094 . 113552) (
-\CHARWIDTH.IP 113554 . 114004) (\CLOSEIPSTREAM 114006 . 114333) (\DRAWARC.IP 114335 . 114782) (
-\DRAWCURVE.IP 114784 . 117221) (\DRAWPOINT.IP 117223 . 118260) (\DSPCOLOR.IP 118262 . 119213) (
-ENSURE.RGB 119215 . 119879) (\IPCURVE2 119881 . 133135) (\CLIPCURVELINE.IP 133137 . 137835) (
-\DRAWLINE.IP 137837 . 141569) (\CLIPLINE 141571 . 146271) (\DSPBOTTOMMARGIN.IP 146273 . 146689) (
-\DSPFONT.IP 146691 . 151451) (\DSPLEFTMARGIN.IP 151453 . 151913) (\DSPLINEFEED.IP 151915 . 152582) (
-\DSPRIGHTMARGIN.IP 152584 . 153381) (\DSPSPACEFACTOR.IP 153383 . 154512) (\DSPTOPMARGIN.IP 154514 . 
-154950) (\DSPXPOSITION.IP 154952 . 155939) (\DSPROTATE.IP 155941 . 156119) (\PUSHSTATE.IP 156121 . 
-157013) (\POPSTATE.IP 157015 . 157650) (\DEFAULTSTATE.IP 157652 . 158004) (\DSPTRANSLATE.IP 158006 . 
-158187) (\DSPSCALE2.IP 158189 . 158364) (\DSPYPOSITION.IP 158366 . 158667) (FILLCIRCLE.IP 158669 . 
-159752) (\FILLPOLYGON.IP 159754 . 161085) (\DRAWPOLYGON.IP 161087 . 167217) (\FIXLINELENGTH.IP 167219
- . 168433) (\MOVETO.IP 168435 . 168799) (\SETBRUSH.IP 168801 . 170967) (\STRINGWIDTH.IP 170969 . 
-171372) (\DSPCLIPPINGREGION.IP 171374 . 172550) (\DSPOPERATION.IP 172552 . 173347)) (173350 175249 (
-INTERPRESSFILEP 173360 . 174793) (INTERPRESS.TEDIT 174795 . 175247)) (175440 176195 (IP-TOS 175450 . 
-175710) (POP-IP-STACK 175712 . 176007) (PUSH-IP-STACK 176009 . 176193)) (176256 177180 (
-\CHANGECHARSET.IP 176266 . 177178)) (177181 180797 (\INTERPRESSINIT 177191 . 180795)) (193881 196305 (
-INTERPRESSBITMAP 193891 . 196303)) (198730 201351 (\CREATEINTERPRESSFONT 198740 . 200468) (
-\CREATECHARSET.IP 200470 . 201349)) (201352 213525 (IPFONT.FILEP 201362 . 201546) (IPFONT.GETCHARSET 
-201548 . 211646) (\FACECODE 211648 . 212238) (\FAMILYCODE 212240 . 213523)))))
+  (FILEMAP (NIL (16593 22245 (APPENDBYTE.IP 16603 . 16739) (APPENDIDENTIFIER.IP 16741 . 17263) (
+APPENDINT.IP 17265 . 17716) (APPENDINTEGER.IP 17718 . 18290) (APPENDLARGEVECTOR.IP 18292 . 19257) (
+APPENDNUMBER.IP 19259 . 19728) (APPENDOP.IP 19730 . 20376) (APPENDRATIONAL.IP 20378 . 20871) (
+APPENDSEQUENCEDESCRIPTOR.IP 20873 . 22068) (BYTESININT.IP 22070 . 22243)) (22281 62088 (ARCTO.IP 22291
+ . 23572) (BEGINMASTER.IP 23574 . 23847) (BEGINPAGE.IP 23849 . 24205) (BEGINPREAMBLE.IP 24207 . 24578)
+ (CLIPRECTANGLE.IP 24580 . 25070) (CONCAT.IP 25072 . 25337) (CONCATT.IP 25339 . 25606) (ENDMASTER.IP 
+25608 . 26052) (ENDPAGE.IP 26054 . 26431) (ENDPREAMBLE.IP 26433 . 27232) (FGET.IP 27234 . 27537) (
+FILLRECTANGLE.IP 27539 . 29867) (FILLTRAJECTORY.IP 29869 . 30504) (FILLNGON.IP 30506 . 32783) (FSET.IP
+ 32785 . 33088) (GETFRAMEVAR.IP 33090 . 33408) (INITIALIZEMASTER.IP 33410 . 34011) (INITIALIZECOLOR.IP
+ 34013 . 35334) (ISET.IP 35336 . 35707) (GETCP.IP 35709 . 36018) (LINETO.IP 36020 . 36625) (
+MASKSTROKE.IP 36627 . 36900) (MOVETO.IP 36902 . 37239) (ROTATE.IP 37241 . 37543) (SCALE.IP 37545 . 
+37848) (SCALE2.IP 37850 . 38187) (SETCOLOR.IP 38189 . 40418) (SETRGB.IP 40420 . 41476) (SETCOLORLV.IP 
+41478 . 46091) (SETCOLOR16.IP 46093 . 49199) (SETFONT.IP 49201 . 50022) (SETSPACE.IP 50024 . 50336) (
+SETXREL.IP 50338 . 51522) (SETX.IP 51524 . 53041) (SETXY.IP 53043 . 54215) (SETXYREL.IP 54217 . 55523)
+ (SETY.IP 55525 . 56834) (SETYREL.IP 56836 . 57736) (SHOW.IP 57738 . 60998) (TRAJECTORY.IP 61000 . 
+61398) (TRANS.IP 61400 . 61739) (TRANSLATE.IP 61741 . 62086)) (62119 68209 (\CHANGE-VISIBLE-REGION.IP 
+62129 . 65790) (\PAPERSIZE.IP 65792 . 66613) (HEADINGOP.IP 66615 . 68207)) (68210 172730 (
+DEFINEFONT.IP 68220 . 69194) (FONTNAME.IP 69196 . 70126) (INTERPRESS.BITMAPSCALE 70128 . 70921) (
+INTERPRESS.OUTCHARFN 70923 . 77430) (NEWLINE.IP 77432 . 78164) (NEWPAGE.IP 78166 . 83141) (NEWPAGE?.IP
+ 83143 . 83622) (OPENIPSTREAM 83624 . 91975) (SETUPFONTS.IP 91977 . 92969) (SHOWBITMAP.IP 92971 . 
+97512) (\BITMAPSIZE.IP 97514 . 98291) (SHOWBITMAP1.IP 98293 . 102665) (SHOWSHADE.IP 102667 . 103620) (
+\BITBLT.IP 103622 . 107826) (\SCALEDBITBLT.IP 107828 . 111473) (\BLTSHADE.IP 111475 . 112933) (
+\CHARWIDTH.IP 112935 . 113385) (\CLOSEIPSTREAM 113387 . 113714) (\DRAWARC.IP 113716 . 114163) (
+\DRAWCURVE.IP 114165 . 116602) (\DRAWPOINT.IP 116604 . 117641) (\DSPCOLOR.IP 117643 . 118594) (
+ENSURE.RGB 118596 . 119260) (\IPCURVE2 119262 . 132516) (\CLIPCURVELINE.IP 132518 . 137216) (
+\DRAWLINE.IP 137218 . 140950) (\CLIPLINE 140952 . 145652) (\DSPBOTTOMMARGIN.IP 145654 . 146070) (
+\DSPFONT.IP 146072 . 150832) (\DSPLEFTMARGIN.IP 150834 . 151294) (\DSPLINEFEED.IP 151296 . 151963) (
+\DSPRIGHTMARGIN.IP 151965 . 152762) (\DSPSPACEFACTOR.IP 152764 . 153893) (\DSPTOPMARGIN.IP 153895 . 
+154331) (\DSPXPOSITION.IP 154333 . 155320) (\DSPROTATE.IP 155322 . 155500) (\PUSHSTATE.IP 155502 . 
+156394) (\POPSTATE.IP 156396 . 157031) (\DEFAULTSTATE.IP 157033 . 157385) (\DSPTRANSLATE.IP 157387 . 
+157568) (\DSPSCALE2.IP 157570 . 157745) (\DSPYPOSITION.IP 157747 . 158048) (FILLCIRCLE.IP 158050 . 
+159133) (\FILLPOLYGON.IP 159135 . 160466) (\DRAWPOLYGON.IP 160468 . 166598) (\FIXLINELENGTH.IP 166600
+ . 167814) (\MOVETO.IP 167816 . 168180) (\SETBRUSH.IP 168182 . 170348) (\STRINGWIDTH.IP 170350 . 
+170753) (\DSPCLIPPINGREGION.IP 170755 . 171931) (\DSPOPERATION.IP 171933 . 172728)) (172731 174630 (
+INTERPRESSFILEP 172741 . 174174) (INTERPRESS.TEDIT 174176 . 174628)) (174821 175576 (IP-TOS 174831 . 
+175091) (POP-IP-STACK 175093 . 175388) (PUSH-IP-STACK 175390 . 175574)) (175637 176561 (
+\CHANGECHARSET.IP 175647 . 176559)) (176562 180178 (\INTERPRESSINIT 176572 . 180176)) (193262 195686 (
+INTERPRESSBITMAP 193272 . 195684)) (197966 200587 (\CREATEINTERPRESSFONT 197976 . 199704) (
+\CREATECHARSET.IP 199706 . 200585)) (200588 212761 (IPFONT.FILEP 200598 . 200782) (IPFONT.GETCHARSET 
+200784 . 210882) (\FACECODE 210884 . 211474) (\FAMILYCODE 211476 . 212759)))))
 STOP
diff --git a/sources/INTERPRESS.LCOM b/sources/INTERPRESS.LCOM
index dbcdb033..8c5c6b53 100644
Binary files a/sources/INTERPRESS.LCOM and b/sources/INTERPRESS.LCOM differ
diff --git a/sources/NSPRINT b/sources/NSPRINT
index 03a8674f..c6d3a874 100644
--- a/sources/NSPRINT
+++ b/sources/NSPRINT
@@ -1,14 +1,13 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-(FILECREATED "28-Apr-92 17:29:44" |{PELE:MV:ENVOS}<LISPCORE>SOURCES>NSPRINT.;3| 30963  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (FNS \NSPRINT.INTERNAL)
+(FILECREATED "12-Dec-2025 19:35:12" {WMEDLEY}<sources>NSPRINT.;2 30422  
 
-      previous date%: "16-May-90 20:54:31" |{PELE:MV:ENVOS}<LISPCORE>SOURCES>NSPRINT.;2|)
+      :EDIT-BY rmk
 
+      :CHANGES-TO (VARS NSPRINTCOMS)
+
+      :PREVIOUS-DATE "28-Apr-92 17:29:44" {WMEDLEY}<sources>NSPRINT.;1)
 
-(* ; "
-Copyright (c) 1984, 1985, 1986, 1987, 1990, 1992 by Venue & Xerox Corporation.  All rights reserved.
-")
 
 (PRETTYCOMPRINT NSPRINTCOMS)
 
@@ -37,10 +36,7 @@ Copyright (c) 1984, 1985, 1986, 1987, 1990, 1992 by Venue & Xerox Corporation.
                                       (HOSTNAMEP FAX.HOSTNAMEP)
                                       (STATUS FAX.STATUS)
                                       (PROPERTIES FAX.PROPERTIES)
-                                      (SEND FAX.SEND.FILE)
-                                      (BITMAPSCALE INTERPRESS.BITMAPSCALE)
-                                      (BITMAPFILE (INTERPRESSBITMAP FILE BITMAP SCALEFACTOR REGION 
-                                                         ROTATION TITLE])
+                                      (SEND FAX.SEND.FILE])
 
 (COURIERPROGRAM PRINTING (4 3)
     TYPES
@@ -468,23 +464,19 @@ Alternatively, RETURN %"name@CorrectPhoneOrDestination%"")))))
 (GLOBALVARS DEFAULTFAXHOST FAXADDRESSES FAX.NO.WATCHER)
 )
 
-(ADDTOVAR PRINTERTYPES
-          ((FAX TELECOPIER)
-           (CANPRINT (INTERPRESS))
-           (HOSTNAMEP FAX.HOSTNAMEP)
-           (STATUS FAX.STATUS)
-           (PROPERTIES FAX.PROPERTIES)
-           (SEND FAX.SEND.FILE)
-           (BITMAPSCALE INTERPRESS.BITMAPSCALE)
-           (BITMAPFILE (INTERPRESSBITMAP FILE BITMAP SCALEFACTOR REGION ROTATION TITLE))))
-(PUTPROPS NSPRINT COPYRIGHT ("Venue & Xerox Corporation" 1984 1985 1986 1987 1990 1992))
+(ADDTOVAR PRINTERTYPES ((FAX TELECOPIER)
+                        (CANPRINT (INTERPRESS))
+                        (HOSTNAMEP FAX.HOSTNAMEP)
+                        (STATUS FAX.STATUS)
+                        (PROPERTIES FAX.PROPERTIES)
+                        (SEND FAX.SEND.FILE)))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (10281 25115 (GETNSPRINTER 10291 . 11044) (NSPRINT 11046 . 12594) (\NSPRINT.INTERNAL 
-12596 . 23038) (\NSPRINT.MEDIUM.CHECK 23040 . 23418) (\NSPRINT.UNSUPPORTED 23420 . 23725) (
-NSPRINTER.HOSTNAMEP 23727 . 23998) (NSPRINTER.STATUS 24000 . 24123) (NSPRINTER.PROPERTIES 24125 . 
-24257) (NSPRINTREQUEST.STATUS 24259 . 24421) (\NSPRINT.ENQUIRE 24423 . 24906) (\NSPRINT.COURIER.OPEN 
-24908 . 25113)) (25148 27735 (\NSPRINT.WATCHDOG 25158 . 26415) (\NSPRINT.WATCH.JOB 26417 . 26848) (
-\NSPRINT.FULL.REQUEST.STATUS 26850 . 27733)) (27871 30302 (FAX.SEND.FILE 27881 . 28273) (FAX.STATUS 
-28275 . 28513) (FAX.PROPERTIES 28515 . 28771) (FAX.HOSTNAMEP 28773 . 29066) (\FAX.PARSE.NAME 29068 . 
-30300)))))
+  (FILEMAP (NIL (9911 24745 (GETNSPRINTER 9921 . 10674) (NSPRINT 10676 . 12224) (\NSPRINT.INTERNAL 12226
+ . 22668) (\NSPRINT.MEDIUM.CHECK 22670 . 23048) (\NSPRINT.UNSUPPORTED 23050 . 23355) (
+NSPRINTER.HOSTNAMEP 23357 . 23628) (NSPRINTER.STATUS 23630 . 23753) (NSPRINTER.PROPERTIES 23755 . 
+23887) (NSPRINTREQUEST.STATUS 23889 . 24051) (\NSPRINT.ENQUIRE 24053 . 24536) (\NSPRINT.COURIER.OPEN 
+24538 . 24743)) (24778 27365 (\NSPRINT.WATCHDOG 24788 . 26045) (\NSPRINT.WATCH.JOB 26047 . 26478) (
+\NSPRINT.FULL.REQUEST.STATUS 26480 . 27363)) (27501 29932 (FAX.SEND.FILE 27511 . 27903) (FAX.STATUS 
+27905 . 28143) (FAX.PROPERTIES 28145 . 28401) (FAX.HOSTNAMEP 28403 . 28696) (\FAX.PARSE.NAME 28698 . 
+29930)))))
 STOP
diff --git a/sources/NSPRINT.LCOM b/sources/NSPRINT.LCOM
index 64606223..a3baf05c 100644
Binary files a/sources/NSPRINT.LCOM and b/sources/NSPRINT.LCOM differ
