From 1beba945a23b144fab2de795085c96a6f2f7e86e Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Tue, 12 Oct 2021 16:10:12 -0700 Subject: [PATCH] PRINTFN DEXEC CMLEXEC: Cleanup PFCOPYBYTES interface Removed unused FLG argument in PFCOPYBYTES, tried to make sense of PFDEFAULT (in preparation for TEDIT-PF. CMLEXEC just to upgrade the filemap --- sources/CMLEXEC | 38 ++++++++++++++-------- sources/CMLEXEC.LCOM | Bin 47246 -> 47308 bytes sources/DEXEC | 49 ++++++++++++++++------------ sources/DEXEC.LCOM | Bin 4170 -> 4394 bytes sources/PRINTFN | 74 ++++++++++++++++++++----------------------- sources/PRINTFN.LCOM | Bin 5336 -> 5292 bytes 6 files changed, 87 insertions(+), 74 deletions(-) diff --git a/sources/CMLEXEC b/sources/CMLEXEC index 24de11b1..69fd45ed 100644 --- a/sources/CMLEXEC +++ b/sources/CMLEXEC @@ -1,13 +1,14 @@ -(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP") -(FILECREATED "21-Jan-93 11:16:01" {DSK}lde>lispcore>sources>CMLEXEC.;2 92477 +(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) - changes to%: (FUNCTIONS ADD-EXEC) +(FILECREATED " 8-Oct-2021 10:51:35"  +{DSK}kaplan>Local>medley3.5>git-medley>sources>CMLEXEC.;2 92464 - previous date%: "25-Jun-91 12:22:29" {DSK}lde>lispcore>sources>CMLEXEC.;1) + previous date%: "21-Jan-93 11:16:01" +{DSK}kaplan>Local>medley3.5>git-medley>sources>CMLEXEC.;1) (* ; " -Copyright (c) 1985, 1986, 1987, 1988, 1990, 1991, 1993 by Venue & Xerox Corporation. All rights reserved. +Copyright (c) 1985-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation. ") (PRETTYCOMPRINT CMLEXECCOMS) @@ -1748,13 +1749,24 @@ Copyright (c) 1985, 1986, 1987, 1988, 1990, 1991, 1993 by Venue & Xerox Corporat (ADDTOVAR LAMA ) ) -(PUTPROPS CMLEXEC COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1991 1993)) +(PUTPROPS CMLEXEC COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1991 1993 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (33304 34258 (COPY-CIRCLE 33314 . 34256)) (34336 37641 (EXEC-READ 34346 . 37507) (DIR -37509 . 37639)) (39903 67037 (DO-APPLY-EVENT 39913 . 40475) (DO-HISTORY-SEARCH 40477 . 41934) ( -EVAL-INPUT 41936 . 47365) (EVENTS-INPUT 47367 . 48745) (EXEC-PRIN1 48747 . 48923) (EXEC-VALUE-OF 48925 - . 49264) (GET-NEXT-HISTORY-EVENT 49266 . 50761) (HISTORY-ADD-TO-SPELLING-LISTS 50763 . 51751) ( -HISTORY-NTH 51753 . 52503) (PRINT-HISTORY 52505 . 53126) (FIND-HISTORY-EVENTS 53128 . 58189) ( -PRINT-EVENT 58191 . 62412) (PRINT-EVENT-PROMPT 62414 . 63618) (PROCESS-EXEC-ID 63620 . 64565) ( -SEARCH-FOR-EVENT-NUMBER 64567 . 65195) (\PICK.EVALQT 65197 . 65708) (LISPXREPRINT 65710 . 67035))))) + (FILEMAP (NIL (3978 4383 (XCL::EXEC-CLOSEFN 3978 . 4383)) (4385 4721 (XCL::EXEC-SHRINKFN 4385 . 4721)) + (4723 4963 (XCL::SETUP-EXEC-WINDOW 4723 . 4963)) (4965 5211 (XCL::EXEC-TITLE-FUNCTION 4965 . 5211)) ( +5213 8519 (FIX-FORM 5213 . 8519)) (8521 8641 (XCL::GET-PROCESS-PROFILE 8521 . 8641)) (8643 8924 ( +XCL::SAVE-CURRENT-EXEC-PROFILE 8643 . 8924)) (8926 9216 (XCL::SETF-GET-PROCESS-PROFILE 8926 . 9216)) ( +9218 9785 (XCL:SET-EXEC-TYPE 9218 . 9785)) (9787 9869 (XCL:SET-DEFAULT-EXEC-TYPE 9787 . 9869)) (9871 +10282 (XCL::ENTER-EXEC-FUNCTION 9871 . 10282)) (10357 16750 (DO-EVENT 10357 . 16750)) (16752 23543 ( +EXEC 16752 . 23543)) (23545 24886 (EXEC-EVAL 23545 . 24886)) (24888 25619 (PRINT-ALL-DOCUMENTATION +24888 . 25619)) (25621 26063 (PRINT-DOCUMENTATION 25621 . 26063)) (26146 27230 (ADD-EXEC 26146 . 27230 +)) (27232 30828 (EXEC-READ-LINE 27232 . 30828)) (30899 31385 (FIND-EXEC-COMMAND 30899 . 31385)) (31387 + 33285 (CIRCLAR-COPYER 31387 . 33285)) (33286 34240 (COPY-CIRCLE 33296 . 34238)) (34318 37623 ( +EXEC-READ 34328 . 37489) (DIR 37491 . 37621)) (39885 67019 (DO-APPLY-EVENT 39895 . 40457) ( +DO-HISTORY-SEARCH 40459 . 41916) (EVAL-INPUT 41918 . 47347) (EVENTS-INPUT 47349 . 48727) (EXEC-PRIN1 +48729 . 48905) (EXEC-VALUE-OF 48907 . 49246) (GET-NEXT-HISTORY-EVENT 49248 . 50743) ( +HISTORY-ADD-TO-SPELLING-LISTS 50745 . 51733) (HISTORY-NTH 51735 . 52485) (PRINT-HISTORY 52487 . 53108) + (FIND-HISTORY-EVENTS 53110 . 58171) (PRINT-EVENT 58173 . 62394) (PRINT-EVENT-PROMPT 62396 . 63600) ( +PROCESS-EXEC-ID 63602 . 64547) (SEARCH-FOR-EVENT-NUMBER 64549 . 65177) (\PICK.EVALQT 65179 . 65690) ( +LISPXREPRINT 65692 . 67017)) (68199 68298 (EXEC-PRINT 68199 . 68298)) (68300 68565 (EXEC-FORMAT 68300 + . 68565))))) STOP diff --git a/sources/CMLEXEC.LCOM b/sources/CMLEXEC.LCOM index d5cbe9ce1fcebb57398401789a52c25db24f8670..7e909f983f92d093bdc52c3c13e23db88ab30b67 100644 GIT binary patch delta 6316 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 delta 6195 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 diff --git a/sources/DEXEC b/sources/DEXEC index 0f6adc0f..de475422 100644 --- a/sources/DEXEC +++ b/sources/DEXEC @@ -1,14 +1,15 @@ -(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP") -(FILECREATED "13-Aug-2020 12:36:18" {DSK}kaplan>Local>medley3.5>lispcore>sources>DEXEC.;10 5477 +(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) - changes to%: (VARS DEXECCOMS) +(FILECREATED " 7-Oct-2021 14:29:56" {DSK}kaplan>Local>medley3.5>git-medley>sources>DEXEC.;4 5554 - previous date%: "13-Aug-2020 12:31:18" -{DSK}kaplan>Local>medley3.5>lispcore>sources>DEXEC.;9) + changes to%: (FNS SEE* COPYALLBYTES) + + previous date%: "13-Aug-2020 12:36:18" +{DSK}kaplan>Local>medley3.5>git-medley>sources>DEXEC.;1) (* ; " -Copyright (c) 1982, 1983, 1984, 1985, 1986, 1990, 2018, 2020 by Venue & Xerox Corporation. All rights reserved. +Copyright (c) 1982-1986, 1990, 2018, 2020-2021 by Venue & Xerox Corporation. The following program was created in 1982 but has not been published within the meaning of the copyright law, is furnished under license, and may not be used, copied and/or disclosed except in accordance @@ -20,7 +21,7 @@ with the terms of said license. (RPAQQ DEXECCOMS [ -(* ;;; "Has to come after ADISPLAY and CMLEXEC.") +(* ;;; "Has to come after ADISPLAY and CMLEXEC.") (COMMANDS "see" "see*" "ty" "type") (INITVARS (/LAST.CONNECTED.DIRECTORY LOGINHOST/DIR)) @@ -74,22 +75,24 @@ with the terms of said license. (CNDIR HOST/DIR]) (COPYALLBYTES - [LAMBDA (FROMFILE TOFILE BYTESIZE EXTERNALFORMAT) (* ; "Edited 11-Aug-2020 20:35 by rmk:") - (* bvm%: "29-Jan-86 19:50") + [LAMBDA (FROMFILE TOFILE BYTESIZE FORMAT) (* ; "Edited 7-Oct-2021 13:15 by rmk:") + (* bvm%: "29-Jan-86 19:50") + + (* ;; "RMK: Removed PFDEFAULT arg to PFCOPYBYTES. Probably should remove BYTESIZE test") + (RESETLST [PROG (INF OUTF PTR) [COND (FROMFILE [RESETSAVE NIL (LIST 'CLOSEF (SETQ INF (OPENSTREAM FROMFILE 'INPUT NIL - `((EXTERNALFORMAT ,EXTERNALFORMAT) - ) + `((EXTERNALFORMAT ,FORMAT)) BYTESIZE] (OR (EQ (GETFILEPTR INF) 0) (SETFILEPTR INF 0))) - (T (SETQ INF (INPUT] (* close the files only if I opened - them) + (T (SETQ INF (INPUT] (* close the files only if I opened + them) [COND ((NULL TOFILE) (SETQ OUTF (OUTPUT))) @@ -98,7 +101,7 @@ with the terms of said license. (COND ((AND (NULL BYTESIZE) (DISPLAYP OUTF)) - (PFCOPYBYTES INF OUTF NIL NIL PFDEFAULT)) + (PFCOPYBYTES INF OUTF)) (T (COPYBYTES INF OUTF])]) (SEE @@ -110,11 +113,14 @@ with the terms of said license. (CADDR LINE)))) (SEE* - [NLAMBDA LINE (* ; "Edited 1-May-2018 10:22 by rmk:") + [NLAMBDA LINE (* ; "Edited 7-Oct-2021 14:29 by rmk:") + + (* ;; "RMK: RESETVARS because **COMMENT**FLG is global") + (SETQ LINE (NLAMBDA.ARGS LINE)) - (LET ((**COMMENT**FLG NIL)) - (APPLY (FUNCTION SEE) - LINE]) + (RESETVARS (**COMMENT**FLG) + (APPLY (FUNCTION SEE) + LINE]) ) (RPAQ SAVINGCURSOR (CURSORCREATE (QUOTE #*(16 16)@@@@FDJ@HJJ@LJJ@BNJLJJD@LJD@@@@@@JDN@KEB@KE@@JMF@JMB@JEL@@@@@@@@ ) (QUOTE NIL) 0 15)) @@ -136,8 +142,9 @@ with the terms of said license. (ADDTOVAR LAMA ) ) -(PUTPROPS DEXEC COPYRIGHT ("Venue & Xerox Corporation" T 1982 1983 1984 1985 1986 1990 2018 2020)) +(PUTPROPS DEXEC COPYRIGHT ("Venue & Xerox Corporation" T 1982 1983 1984 1985 1986 1990 2018 2020 2021) +) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2246 4697 (/CNDIR 2256 . 2693) (COPYALLBYTES 2695 . 4211) (SEE 4213 . 4457) (SEE* 4459 - . 4695))))) + (FILEMAP (NIL (2230 4768 (/CNDIR 2240 . 2677) (COPYALLBYTES 2679 . 4203) (SEE 4205 . 4449) (SEE* 4451 + . 4766))))) STOP diff --git a/sources/DEXEC.LCOM b/sources/DEXEC.LCOM index cb009bfe0c9236627b5ba605e47ab9392c68b2ee..4c2bc1468de5f55dde2bafdf4ff7419649d9f302 100644 GIT binary patch delta 1321 zcmah}OHb5L6rM5;kIMj(C>2Cs(Dlg9)=S6Vkx1d6dB~S zs*I?aK^_FYxVgTyy5=v!<_0E_z~oNtF0Ymn>;B@JzcaeMdHYt;-yYTJRhmtnON%u~ zikeo`)DRDRHlK5tI>x%l6Iew&W7@Ldcjja=$;0A&3HkOb3UOqG7g09+Pj@iR_3Hl+ z2_%!rq@lPnzp?CZLus>D1;Maga4D4_n|Ee4%Nm>YXz-Fd-7u)i!xiVp4+fP*613MX zaU{4K#;OU=XbEfWLlR~_uD?)+i?@d^ zw^a+IYDG(>LfR|o4DQ7=EPEHTTFUvQooe=e{H6M(C_(5?^%E87($3aFV(v7Y{UzpG zgN2L!#(s=*jguH(H&Tp08jr`8Q@$1h1zPCSmsnmHW!!h#+T_a3X9RE}qOZI0l2RtOo{zC(UzA zO|x;dmbT1j#fO4N@c@W046doF1?p07+P-4ide}!CK{;`>#p)ooX)zdf685R?*)<^* z)=OE7YWB2~U^ZL{4BWTy<3m43B3y)9>0}<3S#Ux-p^ZV%9LJhPMj2s{G6Rx?-$ahu zo+KI8_@0*XxCLjAEtHE?eT<7~sBkGT za6LDJKLZa2@NLy(25d{qjp5o`VFPw6iO1s{ROTDlzpGH_ zNKA_9EcZV?oGJgw3wx`E^w~^?KzV6?WznufqjpjR{yH^G@Qk5!=Z*hFQ1B+=PGDj$ zuE_{-#(M7hiSx*dzj_uhXMvj-Uj=6N5qsS($Lh8XqLd}id)Wx#C&6S4T_AL(H;RQ@ zeW#pH{rh|H;A8KVP!|*JfXEIg+Chyw8+{a!pZiqOE^o9t#s78~b2j>o073F^{e>O! zMr(CXMPtsh;P~IFwu5Sr@PY%%r$ULc3^_OgI;Z zY8;!zP1dL?my9B{K!z;nGVVUTrdkp3y$e2MC`9QxQdj znasMT-B2{iyCuBiHsUBzH;JaGE*~DYFO}CJ0nsRqr^qxb8kN;ND0rme-;9P1`F#QZ zl;>r^HyZXWx(22^8|We_0M&JM4$`2hv^Xu%I5qMnwiVLd-SVyrOnP0>^3LylHoE#6 g8pC)i^q`w>haPtGW;lZR%kWW*pTc*7k%*`I50>y5i2wiq diff --git a/sources/PRINTFN b/sources/PRINTFN index 586b23dd..fd75026c 100644 --- a/sources/PRINTFN +++ b/sources/PRINTFN @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "28-Sep-2021 23:52:49"  -{DSK}kaplan>Local>medley3.5>git-medley>sources>PRINTFN.;24 13993 +(FILECREATED " 8-Oct-2021 00:20:48"  +{DSK}kaplan>Local>medley3.5>git-medley>sources>PRINTFN.;27 13457 - changes to%: (FNS PRINTFNDEF PFCOPYBYTES) + changes to%: (FNS PFCOPYBYTES) - previous date%: " 8-Aug-2021 15:15:00" -{DSK}kaplan>Local>medley3.5>git-medley>sources>PRINTFN.;17) + previous date%: " 7-Oct-2021 20:52:16" +{DSK}kaplan>Local>medley3.5>git-medley>sources>PRINTFN.;26) (* ; " @@ -18,7 +18,8 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation. (RPAQQ PRINTFNCOMS [(* * PRINTFN) (FNS PF PF* PMORE PRINTFN PRINTFNDEF FINDFNDEF PFCOPYBYTES DISPLAYP) - (INITVARS PFDEFAULT (LASTFNDEF)) + (INITVARS (PFDEFAULT 'PFCOPYBYTES) + (LASTFNDEF)) (DECLARE%: DONTCOPY (MACROS PFPRINCHAR PFOUTCHAR)) (P (MOVD? 'COPYBYTES 'PFCOPYBYTES)) (USERMACROS PF) @@ -112,36 +113,29 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation. (T (printout TOFILE FN " not found on " LOC "." T]) (PRINTFNDEF - [LAMBDA (SRCFIL DSTFIL START END TYPE) (* ; "Edited 28-Sep-2021 23:52 by rmk:") + [LAMBDA (SRCFIL DSTFIL START END TYPE) (* ; "Edited 7-Oct-2021 20:51 by rmk:") + + (* ;; "RMK: It wasn't clear what PFDEFAULT was doing, or why. I've assigned it a meaning here: the name of the function to call to print a function on a display stream. Initialized to PFCOPYBYTES") + (RESETLST - (PROG (TEM) - [COND - ((SETQ TEM (GETSTREAM DSTFIL 'OUTPUT T)) - (SETQ DSTFIL TEM)) - (T (RESETSAVE (SETQ DSTFIL (OPENSTREAM DSTFIL 'OUTPUT)) - '(PROGN (CLOSEF? OLDVALUE] - [COND - ((SETQ TEM (GETSTREAM SRCFIL 'INPUT T)) - (RESETSAVE NIL (LIST 'SETFILEPTR TEM (GETFILEPTR TEM))) - (SETQ SRCFIL TEM)) - (T (RESETSAVE (SETQ SRCFIL (OPENSTREAM SRCFIL 'INPUT)) - '(PROGN (CLOSEF? OLDVALUE] - (PRIN1 "{from " DSTFIL) - (PRIN2 (FULLNAME SRCFIL) - DSTFIL T) - (PRIN1 "} -" DSTFIL)) - - (* ;; "RMK: Originally the last test was (EQ TYPE 'MAC). I think this was a typo for MAP, since that argument is set to MAP in FINDFNDEF. If the typo is fixed, we would end up in the COPYBYTES clause, which we don't generally want. So changed it also to a NEQ.") - - (* ;; "PFDEFAULT is passed as the TYPE argument on the call from COPYALLBYTES, basically to force COPYBYTES and not do the format and font translations. It defaults to NIL, not COPYBYTES. I don't understand what this is trying to control. Note that the last argument of PFCOPYBYTES (PFDEFAULT here) is ignored.") - - (COND - ((OR (NOT (DISPLAYP DSTFIL)) - (EQ PFDEFAULT 'COPYBYTES) - (NEQ TYPE 'MAP)) - (COPYBYTES SRCFIL DSTFIL START END)) - (T (PFCOPYBYTES SRCFIL DSTFIL START END PFDEFAULT))) + (LET (TEM) + [COND + ((SETQ TEM (GETSTREAM DSTFIL 'OUTPUT T)) + (SETQ DSTFIL TEM)) + (T (RESETSAVE (SETQ DSTFIL (OPENSTREAM DSTFIL 'OUTPUT)) + '(PROGN (CLOSEF? OLDVALUE] + [COND + ((SETQ TEM (GETSTREAM SRCFIL 'INPUT T)) + (RESETSAVE NIL (LIST 'SETFILEPTR TEM (GETFILEPTR TEM))) + (SETQ SRCFIL TEM)) + (T (RESETSAVE (SETQ SRCFIL (OPENSTREAM SRCFIL 'INPUT)) + '(PROGN (CLOSEF? OLDVALUE] + (PRINTOUT DSTFIL "{from " .P2 (FULLNAME SRCFIL) + "}" T)) + (APPLY* (CL:IF (DISPLAYP DSTFIL) + PFDEFAULT + (FUNCTION COPYBYTES)) + SRCFIL DSTFIL START END) (TERPRI DSTFIL))]) (FINDFNDEF @@ -168,11 +162,11 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation. (T FULL]) (PFCOPYBYTES - [LAMBDA (SRCFIL DSTFIL START END FLG) (* ; "Edited 28-Sep-2021 23:35 by rmk:") + [LAMBDA (SRCFIL DSTFIL START END) (* ; "Edited 8-Oct-2021 00:17 by rmk:") (* ; "Edited 24-Mar-93 14:16 by rmk:") (* lmm "28-Sep-86 14:38") - (* ;; "RMK: What does FLG do? It isn't referenced. It seems to be passed as the value of PFDEFAULT from PRINTFNDEF, and that variable is initialized to NIL. Remove both, eventually?") + (* ;; "RMK: What does FLG do? It isn't referenced. It seems to be passed as the value of PFDEFAULT from PRINTFNDEF, and that variable is initialized to NIL. I'm removing it.") (* ;; " copy from SRCFIL to DSTFIL, paying attention to font changes. Other stuff about truncating lines gone away. Interprets all possible EOL conventions as EOL. Has to call \INCHAR-\INCCODE macros in order to keep track of character count--READDCODE doesn't do that.") @@ -241,7 +235,7 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation. (IMAGESTREAMTYPEP STRM 'TEXT]) ) -(RPAQ? PFDEFAULT NIL) +(RPAQ? PFDEFAULT 'PFCOPYBYTES) (RPAQ? LASTFNDEF ) (DECLARE%: DONTCOPY @@ -295,7 +289,7 @@ Copyright (c) 1986-1987, 1990, 1999, 2018, 2021 by Venue & Xerox Corporation. ) (PUTPROPS PRINTFN COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1990 1999 2018 2021)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1134 11871 (PF 1144 . 3839) (PF* 3841 . 4135) (PMORE 4137 . 4456) (PRINTFN 4458 . 5049) - (PRINTFNDEF 5051 . 6790) (FINDFNDEF 6792 . 7816) (PFCOPYBYTES 7818 . 11621) (DISPLAYP 11623 . 11869)) + (FILEMAP (NIL (1153 11326 (PF 1163 . 3858) (PF* 3860 . 4154) (PMORE 4156 . 4475) (PRINTFN 4477 . 5068) + (PRINTFNDEF 5070 . 6253) (FINDFNDEF 6255 . 7279) (PFCOPYBYTES 7281 . 11076) (DISPLAYP 11078 . 11324)) ))) STOP diff --git a/sources/PRINTFN.LCOM b/sources/PRINTFN.LCOM index 3fc6dc26ff190ba76229d33c0c26dcd8f34bfb2b..eda532140b02023bff2d66369c103d739a6e58f9 100644 GIT binary patch delta 688 zcmZuuJ#W)c6pf>_Y8^h3xRXI}YYE978a+RMMV3(I#B?Ano z3j-tQ!H+;$n+VLP8xv6)1fzFO|4@twi=q*%?&l_oI*Z$MafX{Jc#o2cnpW>GF)S?N#Mu zWp=urR%WN)av{x!3*pMSu&~I%8C}i&ipL^BazZG|yT^0Y%iOHaag^+Ihn3*^wZC+& zBx9rk^++s}08|Ts8zgb)^kPs=EhpxEdT%j delta 706 zcmZuu-)qxQ6i(_|)=VL$V?x1k42X-+(tDFMO>kh^B+?OUnxtyq=DM&If3$R)2%>uu zd=l&Z3&aN*_%JL!NAM5O$G!OIyMKZ=32uGZ<#Nx*Ip6o)bMN^gok;H=EaOHch{hFM z!w9f!sMt{S>Eqx~kwC=SSqhm#zdIDzP+dbhh$xs$wzki z*4e$D)4J#NoBhxZBp6Sk=fly#UV10(PlQIrJlM(JiByB`T5bBWnM2y_X6~rKBd~&y zb^s1w2>cc~SzO%+O+Taw73_{hV;#c2XG_5RW(y2^nP<8?3|+&e7vke3q_7nA(E1Z^hhQa(9jH+~dc&^#^ z0I6C!X9P%5iNHlSa80FRI&`z=hJYFh+%+jrtIu0#h`i;jJOc3*H~Yoy=kp3U?j2(C y>*Ui?bM~DN*y5=R!GcP5g{v$_-U#dDhagh)M`)1MQk5dNBwy&X-Pwmynf(Xt|D}ik