From 32ff7b76493351db320d12d98838ef5519ba1bc3 Mon Sep 17 00:00:00 2001
From: Larry Masinter <lmm@acm.org>
Date: Sun, 23 Oct 2022 23:35:50 -0700
Subject: [PATCH] DEFAULTPRINTINGHOST can have list members as per comments
 (#999)

---
 sources/HARDCOPY      |  96 ++++++++++++++++++++++--------------------
 sources/HARDCOPY.LCOM | Bin 47152 -> 47158 bytes
 2 files changed, 51 insertions(+), 45 deletions(-)

diff --git a/sources/HARDCOPY b/sources/HARDCOPY
index 56de76c7..f252f932 100644
--- a/sources/HARDCOPY
+++ b/sources/HARDCOPY
@@ -1,16 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "20-Jul-2022 17:14:14" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>HARDCOPY.;7
 103298 
+
(FILECREATED "18-Oct-2022 18:47:42" {DSK}<home>larry>ilisp>medley>sources>HARDCOPY.;2
 103854 
 
-      :CHANGES-TO (FNS COPY.TEXT.TO.IMAGE)
+      :CHANGES-TO (FNS HARDCOPYIMAGEW.TOPRINTER)
 
-      :PREVIOUS-DATE "19-Jul-2022 23:40:21" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>HARDCOPY.;6)
+      :PREVIOUS-DATE "20-Jul-2022 17:14:14" {DSK}<home>larry>ilisp>medley>sources>HARDCOPY.;1)
 
 
 (* ; "
-Copyright (c) 1984-1993, 1999, 2018, 2021 by Venue & Xerox Corporation.
+Copyright (c) 1984-1993, 1999, 2018, 2021-2022 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT HARDCOPYCOMS)
@@ -129,10 +127,18 @@ Copyright (c) 1984-1993, 1999, 2018, 2021 by Venue & Xerox Corporation.
                              (CDR FILE&TYPE])
 
 (HARDCOPYIMAGEW.TOPRINTER

-  [LAMBDA (W)                                                (* ; "Edited 22-Apr-98 16:19 by rmk:")

-                                                             (* ; "Edited 11-Jul-90 13:55 by jds")

+  [LAMBDA (W)
                                                (* ; "Edited 18-Oct-2022 18:45 by lmm")


+                                                             (* ; "Edited 22-Apr-98 16:19 by rmk:")


+                                                             (* ; "Edited 11-Jul-90 13:55 by jds")

     (LET ((PRINTERCHOICE (GetPrinterName
))
           PRINTERTYPE IMAGETYPE)
+         [COND
+            ((LISTP PRINTERCHOICE)                           (* ; 
+
                                            "Got back a list, which is (TYPE NAME).  Break it apart.")

+             (SETQ PRINTERTYPE (CAR PRINTERCHOICE))
+             (SETQ PRINTERCHOICE (CADR PRINTERCHOICE)))
+            (PRINTERCHOICE                                   (* ; "Got back just a name.")

+                   (SETQ PRINTERTYPE (PRINTERTYPE
 PRINTERCHOICE]
          (SETQ PRINTERTYPE (PRINTERTYPE
 PRINTERCHOICE))
          (COND
             (PRINTERCHOICE (HARDCOPY.SOMEHOW
 W (CONCAT "{LPT}" PRINTERCHOICE)
@@ -1075,42 +1081,42 @@ Copyright (c) 1984-1993, 1999, 2018, 2021 by Venue & Xerox Corporation.
 (ADDTOVAR LAMA
 )
 )
 (PUTPROPS HARDCOPY COPYRIGHT ("Venue & Xerox Corporation" 1984 1985 1986 1987 1988 1989 1990 1991 1992
- 1993 1999 2018 2021))
+ 1993 1999 2018 2021 2022))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (6199 10383 (HARDCOPY.SOMEHOW 6209 . 7567) (HARDCOPYIMAGEW 7569 . 7721) (
-HARDCOPYIMAGEW.TOFILE 7723 . 8031) (HARDCOPYIMAGEW.TOPRINTER 8033 . 8698) (HARDCOPYREGION.TOFILE 8700
- . 8998) (HARDCOPYREGION.TOPRINTER 9000 . 9622) (COPY.WINDOW.TO.BITMAP 9624 . 10381)) (10455 21005 (
-MakeMenuOfPrinters 10465 . 11690) (PRINTERS.WHENSELECTEDFN 11692 . 13434) (MakeMenuOfImageTypes 13436
- . 13954) (GetNewPrinterFromUser 13956 . 14384) (PopUpWindowAndGetAtom 14386 . 15771) (
-PopUpWindowAndGetList 15773 . 17339) (NewPrinter 17341 . 18289) (GetPrinterName 18291 . 18571) (
-GetImageFile 18573 . 20860) (FetchDefaultPrinter 20862 . 21003)) (21040 21578 (
-ExtensionForPrintFileType 21050 . 21243) (PRINTFILETYPE.FROM.EXTENSION 21245 . 21576)) (21633 38017 (
-DEFAULTPRINTER 21643 . 21803) (CAN.PRINT.DIRECTLY 21805 . 21961) (CONVERT.FILE.TO.TYPE.FOR.PRINTER 
-21963 . 23007) (EMPRESS 23009 . 23322) (HARDCOPYW 23324 . 26284) (LISTFILES1 26286 . 26459) (
-PRINTER.BITMAPFILE 26461 . 26708) (PRINTER.BITMAPSCALE 26710 . 26975) (PRINTER.SCRATCH.FILE 26977 . 
-27100) (PRINTERPROP 27102 . 27285) (PRINTERSTATUS 27287 . 27476) (PRINTERTYPE 27478 . 29787) (
-PRINTERNAME 29789 . 30091) (PRINTFILEPROP 30093 . 30284) (PRINTFILETYPE 30286 . 32230) (
-\EXPECTED.FILE.TYPE 32232 . 33014) (SEND.FILE.TO.PRINTER 33016 . 38015)) (38018 43000 (PRINTERDEVICE 
-38028 . 42998)) (43815 51573 (TEXTTOIMAGEFILE 43825 . 46015) (COPY.TEXT.TO.IMAGE 46017 . 51571)) (
-51574 52709 (\BLTSHADE.GENERICPRINTER 51584 . 52707)) (52837 71589 (MAKEHARDCOPYSTREAM 52847 . 53851) 
-(UNMAKEHARDCOPYSTREAM 53853 . 54537) (HARDCOPYSTREAMTYPE 54539 . 54818) (\CHARWIDTH.HDCPYDISPLAY 54820
- . 55251) (\DSPFONT.HDCPYDISPLAY 55253 . 56658) (\DSPRIGHTMARGIN.HDCPYDISPLAY 56660 . 57237) (
-\DSPXPOSITION.HDCPYDISPLAY 57239 . 57500) (\DSPYPOSITION.HDCPYDISPLAY 57502 . 57763) (
-\STRINGWIDTH.HDCPYDISPLAY 57765 . 58272) (\STRINGWIDTH.HCPYDISPLAYAUX 58274 . 60606) (\HDCPYBLTCHAR 
-60608 . 63143) (\HDCPYDISPLAY.FIX.XPOS 63145 . 63565) (\HDCPYDISPLAY.FIX.YPOS 63567 . 63987) (
-\HDCPYDISPLAYINIT 63989 . 64766) (\HDCPYDSPPRINTCHAR 64768 . 66928) (\SLOWHDCPYBLTCHAR 66930 . 70433) 
-(\CHANGECHARSET.HDCPYDISPLAY 70435 . 71587)) (71999 72140 (\MICASTOPTS 71999 . 72140)) (72311 102608 (
-MAKEHARDCOPYMODESTREAM 72321 . 74230) (UNMAKEHARDCOPYMODESTREAM 74232 . 75310) (\BLTSHADE.HCPYMODE 
-75312 . 75759) (\BITBLT.HCPYMODE 75761 . 76383) (\BRUSHCONVERT.HCPYMODE 76385 . 76622) (
-\CHANGECHARSET.HCPYMODE 76624 . 78391) (\DASHINGCONVERT.HCPYMODE 78393 . 78656) (\CHARWIDTH.HCPYMODE 
-78658 . 78945) (\DRAWLINE.HCPYMODE 78947 . 79259) (\DRAWCURVE.HCPYMODE 79261 . 79690) (
-\DRAWCIRCLE.HCPYMODE 79692 . 80087) (\DRAWELLIPSE.HCPYMODE 80089 . 80601) (\DSPFONT.HCPYMODE 80603 . 
-81759) (\DSPLEFTMARGIN.HCPYMODE 81761 . 82345) (\DSPLINEFEED.HCPYMODE 82347 . 82757) (
-\DSPRIGHTMARGIN.HCPYMODE 82759 . 83388) (\DSPSPACEFACTOR.HCPYMODE 83390 . 83911) (
-\DSPXPOSITION.HCPYMODE 83913 . 84494) (\DSPYPOSITION.HCPYMODE 84496 . 84901) (\MOVETO.HCPYMODE 84903
- . 85055) (\FONTCREATE.HCPYMODE.PRESS 85057 . 86069) (\CREATECHARSET.HCPYMODE.PRESS 86071 . 87042) (
-\FONTCREATE.HCPYMODE.INTERPRESS 87044 . 88078) (\CREATECHARSET.HCPYMODE.INTERPRESS 88080 . 89068) (
-\STRINGWIDTH.HCPYMODE 89070 . 89504) (\HCPYMODEBLTCHAR 89506 . 92475) (\HCPYMODEDISPLAYINIT 92477 . 
-95408) (\HCPYMODEDSPPRINTCHAR 95410 . 97591) (\SLOWHCPYMODEBLTCHAR 97593 . 101107) (\SFFixY.HCPYMODE 
-101109 . 102606)))))
+  (FILEMAP (NIL (6168 10934 (HARDCOPY.SOMEHOW 6178 . 7536) (HARDCOPYIMAGEW 7538 . 7690) (
+HARDCOPYIMAGEW.TOFILE 7692 . 8000) (HARDCOPYIMAGEW.TOPRINTER 8002 . 9249) (HARDCOPYREGION.TOFILE 9251
+ . 9549) (HARDCOPYREGION.TOPRINTER 9551 . 10173) (COPY.WINDOW.TO.BITMAP 10175 . 10932)) (11006 21556 (
+MakeMenuOfPrinters 11016 . 12241) (PRINTERS.WHENSELECTEDFN 12243 . 13985) (MakeMenuOfImageTypes 13987
+ . 14505) (GetNewPrinterFromUser 14507 . 14935) (PopUpWindowAndGetAtom 14937 . 16322) (
+PopUpWindowAndGetList 16324 . 17890) (NewPrinter 17892 . 18840) (GetPrinterName 18842 . 19122) (
+GetImageFile 19124 . 21411) (FetchDefaultPrinter 21413 . 21554)) (21591 22129 (
+ExtensionForPrintFileType 21601 . 21794) (PRINTFILETYPE.FROM.EXTENSION 21796 . 22127)) (22184 38568 (
+DEFAULTPRINTER 22194 . 22354) (CAN.PRINT.DIRECTLY 22356 . 22512) (CONVERT.FILE.TO.TYPE.FOR.PRINTER 
+22514 . 23558) (EMPRESS 23560 . 23873) (HARDCOPYW 23875 . 26835) (LISTFILES1 26837 . 27010) (
+PRINTER.BITMAPFILE 27012 . 27259) (PRINTER.BITMAPSCALE 27261 . 27526) (PRINTER.SCRATCH.FILE 27528 . 
+27651) (PRINTERPROP 27653 . 27836) (PRINTERSTATUS 27838 . 28027) (PRINTERTYPE 28029 . 30338) (
+PRINTERNAME 30340 . 30642) (PRINTFILEPROP 30644 . 30835) (PRINTFILETYPE 30837 . 32781) (
+\EXPECTED.FILE.TYPE 32783 . 33565) (SEND.FILE.TO.PRINTER 33567 . 38566)) (38569 43551 (PRINTERDEVICE 
+38579 . 43549)) (44366 52124 (TEXTTOIMAGEFILE 44376 . 46566) (COPY.TEXT.TO.IMAGE 46568 . 52122)) (
+52125 53260 (\BLTSHADE.GENERICPRINTER 52135 . 53258)) (53388 72140 (MAKEHARDCOPYSTREAM 53398 . 54402) 
+(UNMAKEHARDCOPYSTREAM 54404 . 55088) (HARDCOPYSTREAMTYPE 55090 . 55369) (\CHARWIDTH.HDCPYDISPLAY 55371
+ . 55802) (\DSPFONT.HDCPYDISPLAY 55804 . 57209) (\DSPRIGHTMARGIN.HDCPYDISPLAY 57211 . 57788) (
+\DSPXPOSITION.HDCPYDISPLAY 57790 . 58051) (\DSPYPOSITION.HDCPYDISPLAY 58053 . 58314) (
+\STRINGWIDTH.HDCPYDISPLAY 58316 . 58823) (\STRINGWIDTH.HCPYDISPLAYAUX 58825 . 61157) (\HDCPYBLTCHAR 
+61159 . 63694) (\HDCPYDISPLAY.FIX.XPOS 63696 . 64116) (\HDCPYDISPLAY.FIX.YPOS 64118 . 64538) (
+\HDCPYDISPLAYINIT 64540 . 65317) (\HDCPYDSPPRINTCHAR 65319 . 67479) (\SLOWHDCPYBLTCHAR 67481 . 70984) 
+(\CHANGECHARSET.HDCPYDISPLAY 70986 . 72138)) (72550 72691 (\MICASTOPTS 72550 . 72691)) (72862 103159 (
+MAKEHARDCOPYMODESTREAM 72872 . 74781) (UNMAKEHARDCOPYMODESTREAM 74783 . 75861) (\BLTSHADE.HCPYMODE 
+75863 . 76310) (\BITBLT.HCPYMODE 76312 . 76934) (\BRUSHCONVERT.HCPYMODE 76936 . 77173) (
+\CHANGECHARSET.HCPYMODE 77175 . 78942) (\DASHINGCONVERT.HCPYMODE 78944 . 79207) (\CHARWIDTH.HCPYMODE 
+79209 . 79496) (\DRAWLINE.HCPYMODE 79498 . 79810) (\DRAWCURVE.HCPYMODE 79812 . 80241) (
+\DRAWCIRCLE.HCPYMODE 80243 . 80638) (\DRAWELLIPSE.HCPYMODE 80640 . 81152) (\DSPFONT.HCPYMODE 81154 . 
+82310) (\DSPLEFTMARGIN.HCPYMODE 82312 . 82896) (\DSPLINEFEED.HCPYMODE 82898 . 83308) (
+\DSPRIGHTMARGIN.HCPYMODE 83310 . 83939) (\DSPSPACEFACTOR.HCPYMODE 83941 . 84462) (
+\DSPXPOSITION.HCPYMODE 84464 . 85045) (\DSPYPOSITION.HCPYMODE 85047 . 85452) (\MOVETO.HCPYMODE 85454
+ . 85606) (\FONTCREATE.HCPYMODE.PRESS 85608 . 86620) (\CREATECHARSET.HCPYMODE.PRESS 86622 . 87593) (
+\FONTCREATE.HCPYMODE.INTERPRESS 87595 . 88629) (\CREATECHARSET.HCPYMODE.INTERPRESS 88631 . 89619) (
+\STRINGWIDTH.HCPYMODE 89621 . 90055) (\HCPYMODEBLTCHAR 90057 . 93026) (\HCPYMODEDISPLAYINIT 93028 . 
+95959) (\HCPYMODEDSPPRINTCHAR 95961 . 98142) (\SLOWHCPYMODEBLTCHAR 98144 . 101658) (\SFFixY.HCPYMODE 
+101660 . 103157)))))
 STOP
diff --git a/sources/HARDCOPY.LCOM b/sources/HARDCOPY.LCOM
index 2307d0fa6f42a9c64d71acbccb607fbbff6723de..fa59fbbe6feefd39fadfdeb781be606d9a11ef7a 100644
GIT binary patch
delta 567
zcmdn+foa<ZrU~J;h8DX1$tAi*21Z5-hL%<)MnI&bprMqUpIeZblbWKCpQoUtQ0)@z
zU2Bt(pPOozlUP(#X_uLkSzKT@nV(6r-bj;6K?%heGb<BID+6;Sg(Q$EIqE42nLtC_
zLVbJ`kk#qw=_x6sB$faz!J^;LKuMEJ!_Cvj)j7!3F~rpcO_7C_i8;uv68Ib^1@x4G
zv4yFL0+*GuhohgnYp`yJzk-IFU-0AwOp*ec3RVF@u3?`3p~1Q?KuabYGRg~L^(Ld?
z<og0*lU)R|n2gOQZxBcZQKEwWKx%WE-~%QFZ)OGtMh*rb5L9IHNMWAFxYL7)F`^@7
z8Yf6_=j31!LpyUL1rNs{7ia%~NWEZxUsn(Ra0N4Cg@7PWzYy1;fFS<>1rrMeXMaCu
z#}EZ$BbY=;WPq!Jk?G{SVhVz$KzT<$unu7OD3};+ej=jIx>-X?SewbjbhEAN0X8NR
zv(5j#?U^?>1hDH(X5<l{EY-xf`9R%6b7`P&LqZ~*{e8g(z#Rh=2;Qv8#LhRFTS|7b
doxc;~<VJ4c&GWZ)G4d#Y(uSrcm!GE(7XSq$nY#c0

delta 605
zcma)2!D`e{6rH@$nG#Vc)ry7U^?`IkNt(PQlTOsJX_9eb(<DtYmH{`z%pgP4Nog%2
zB5qwO?+@H`JMd`N#V^o5aO=u`fi-oZRYbgtd*E{JIfrv}f+i>E?Pg45@zH)J5}6QC
z3{%lfO~p{d{d{|8lnn=vj{yV!(n;1{-P_+A?(Q|WdOKNf+|2TRFKccO2ifq2D(TJV
z`R>+e{8XeLxtp&I0q}3qbyL?&MJuGR9j-^7?~1Kr4KR!fgI34);XGfGBn*Szvm(G>
zbcl=vzIOI+$F7yS&L1R$PPnUgI_J~+|42J$fFi4;u?(i&wt|OlBBmkKT0sJI!<|V5
zFr(Og?1h~~bP7AbO5;~+L^U<pB+Ad0{@a(UvxS4|6}oa^mL6QcMOTeEdKWDrjnEAB
z&)^dZ3t+hX8C_m3mrC4JshH{8h~kQ}q^r=jV#f}nu9Sr9ZadrrO@k=*g4B(pIE;Wa
zzzzf3N<mTSy9!LJ#lZ@GP>KqHsO&>!;Ubj|=h>G_GmA)<*|+*}1?dVqzW<=i)(%%W
scDhoPuGOBj9XskeUK06M*9*K<;OXh)2Aj{n8tnbi8?Gt{eBk-~ch)Jag#Z8m