From 8045613d1a3496d04fe7c554f527020752242247 Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Sat, 11 Sep 2021 09:22:04 -0700 Subject: [PATCH] Add COPYRIGHTFLG=PRESERVE meaning 'no new copyright dates, but keep previous' --- sources/PRETTY | 60 ++++++++++++++++++++++++-------------------- sources/PRETTY.LCOM | Bin 30455 -> 30486 bytes 2 files changed, 33 insertions(+), 27 deletions(-) diff --git a/sources/PRETTY b/sources/PRETTY index cd4f14a64..516845190 100644 --- a/sources/PRETTY +++ b/sources/PRETTY @@ -1,15 +1,14 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS) -(FILECREATED " 9-Jul-2021 14:12:19"  -{DSK}kaplan>Local>medley3.5>git-medley>sources>PRETTY.;19 64744 +(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(FILECREATED "11-Sep-2021 09:14:19" {DSK}larry>medley>sources>PRETTY.;5 65019 - changes to%: (FNS PRETTYDEF) + changes to%: (VARS PRETTYCOMS) + (FNS PRINTCOPYRIGHT) - previous date%: " 3-Jul-2021 15:24:17" -{DSK}kaplan>Local>medley3.5>git-medley>sources>PRETTY.;17) + previous date%: " 9-Jul-2021 14:12:19" {DSK}larry>medley>sources>PRETTY.;1) (* ; " -Copyright (c) 1984-1990, 1999, 2018, 2021 by Venue & Xerox Corporation. +Copyright (c) 1984-1990, 1999, 2018 by Venue & Xerox Corporation. The following program was created in 1984 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 @@ -24,7 +23,7 @@ with the terms of said license. PRETTYPRINT2 PRETTYPRINT3 PRINTDEF1 SUPERPRINTEQ SUPERPRINTGETPROP CHANGEFONT) (FNS READARRAY PRINTARRAY READARRAY-FROM-LIST PRINTARRAY-TO-LIST) (COMS (DECLARE%: DONTCOPY (MACROS CHANGFONT))) - (COMS (* ; "COPYRIGHT") + (COMS (* ; "COPYRIGHT") (FNS PRINTCOPYRIGHT PRINTCOPYRIGHT1 SAVECOPYRIGHT) (BLOCKS (NIL PRINTCOPYRIGHT PRINTCOPYRIGHT1 SAVECOPYRIGHT (LOCALVARS . T) (NOLINKFNS PRINTCOPYRIGHT1))) @@ -89,8 +88,8 @@ with the terms of said license. [DECLARE%: EVAL@COMPILE DOCOPY (P (CL:PROCLAIM '(CL:SPECIAL DEFAULTFONT LAMBDAFONT PRETTYCOMFONT COMMENTFONT **COMMENT**FLG PRETTYPRINTMACROS] - (DECLARE%: DOEVAL@COMPILE DONTCOPY (* ; - "IMPORT because FILEPKG has records EXPORTed but is not a member of EXPORTFILES") + (DECLARE%: DOEVAL@COMPILE DONTCOPY (* ; + "IMPORT because FILEPKG has records EXPORTed but is not a member of EXPORTFILES") (FILES (IMPORT) FILEPKG)) (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA PPT PP* PP) @@ -455,15 +454,18 @@ must replace the declare: by a nop addvars.") (SETQ PRTTYCOM (SUBPAIR (QUOTE (NL (DEFINEQ (PRINTCOPYRIGHT - [LAMBDA (FILENAME) (* ; "Edited 31-Aug-99 09:06 by rmk:") - (* ; "Edited 31-Aug-99 09:01 by rmk:") - (* edited%: " 1-Jan-85 20:16") + [LAMBDA (FILENAME) (* ; "Edited 11-Sep-2021 09:07 by larry") + (* ; "Edited 31-Aug-99 09:01 by rmk:") + (* edited%: " 1-Jan-85 20:16") -(* ;;; "CALLED BY PRETTYDEF TO PUT a copyright notice on a file. The globalvar COPYRIGHTOWNERS is used to determine the possible copyright owners when it is determined the file doesn't have a copyright yet and has never been asked if the programmer wanted one. The whole copyright mechanism can be turned off by setting COPYRIGHTFLG to NEVER -- originaly NIL. If the file is copyrighted, any year the file is editted the new year is tacked on to the list of copyright years. The copyright notice comes immediately after the FILECREATED expression * *") +(* ;;; "CALLED BY PRETTYDEF TO PUT a copyright notice on a file. The globalvar COPYRIGHTOWNERS is used to determine the possible copyright owners when it is determined the file doesn't have a copyright yet and has never been asked if the programmer wanted one. The whole copyright mechanism can be turned off by setting COPYRIGHTFLG to NEVER -- originaly NIL. If the file is copyrighted, any year the file is editted the new year is tacked on to the list of copyright years. The copyright notice comes immediately after the FILECREATED expression ") + + (* ;; + "9/10/2021 LMM: Add COPYRIGHTFLG value PRESERVE meaning no new copyright (or year) but retain old") (PROG [(OWNER (GETPROP FILENAME 'COPYRIGHT] (AND [OR OWNER - (AND COPYRIGHTFLG + (AND COPYRIGHTFLG (NEQ COPYRIGHTFLG 'PRESERVE) (SETQ OWNER (ASKUSER (if (EQ COPYRIGHTFLG 'DEFAULT) then 0 @@ -500,7 +502,11 @@ must replace the declare: by a nop addvars.") (SETQ PRTTYCOM (SUBPAIR (QUOTE (NL 'NONE) (PROG ((CURRENTYEAR (SUBATOM (DATE (DATEFORMAT YEAR.LONG NO.TIME)) -4 -1))) - (OR (MEMBER CURRENTYEAR (CDR OWNER)) + + (* ;; " see github Interlisp/medley issue #207 (lmm 9/11/2021)") + + (OR (EQ COPYRIGHTFLG 'PRESERVE) + (MEMBER CURRENTYEAR (CDR OWNER)) (NCONC1 OWNER CURRENTYEAR))) (PRINTCOPYRIGHT1 OWNER]) @@ -687,16 +693,16 @@ must replace the declare: by a nop addvars.") (SETQ PRTTYCOM (SUBPAIR (QUOTE (NL (ADDTOVAR LAMA ) ) (PUTPROPS PRETTY COPYRIGHT ("Venue & Xerox Corporation" T 1984 1985 1986 1987 1988 1989 1990 1999 2018 - 2021)) +)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (5950 48101 (PRETTYDEF 5960 . 21633) (PRETTYDEFCOMS 21635 . 22317) (PRETTYDEF0 22319 . -22510) (PRETTYDEF1 22512 . 24275) (PRINTDATE 24277 . 25513) (PRINTDATE1 25515 . 26720) (PRINTFNS 26722 - . 27291) (PRETTYCOM 27293 . 33634) (PRETTYVAR 33636 . 34674) (PRETTYVAR1 34676 . 36894) (PRETTYCOM1 -36896 . 37600) (ENDFILE 37602 . 37698) (MAKEDEFLIST 37700 . 38104) (PP 38106 . 38382) (PP* 38384 . -38697) (PPT 38699 . 39018) (PRETTYPRINT 39020 . 42172) (PRETTYPRINT1 42174 . 44060) (PRETTYPRINT2 -44062 . 45378) (PRETTYPRINT3 45380 . 46335) (PRINTDEF1 46337 . 47345) (SUPERPRINTEQ 47347 . 47441) ( -SUPERPRINTGETPROP 47443 . 47587) (CHANGEFONT 47589 . 48099)) (48102 53448 (READARRAY 48112 . 49038) ( -PRINTARRAY 49040 . 50780) (READARRAY-FROM-LIST 50782 . 51887) (PRINTARRAY-TO-LIST 51889 . 53446)) ( -53575 60788 (PRINTCOPYRIGHT 53585 . 57357) (PRINTCOPYRIGHT1 57359 . 60483) (SAVECOPYRIGHT 60485 . -60786))))) + (FILEMAP (NIL (5925 48076 (PRETTYDEF 5935 . 21608) (PRETTYDEFCOMS 21610 . 22292) (PRETTYDEF0 22294 . +22485) (PRETTYDEF1 22487 . 24250) (PRINTDATE 24252 . 25488) (PRINTDATE1 25490 . 26695) (PRINTFNS 26697 + . 27266) (PRETTYCOM 27268 . 33609) (PRETTYVAR 33611 . 34649) (PRETTYVAR1 34651 . 36869) (PRETTYCOM1 +36871 . 37575) (ENDFILE 37577 . 37673) (MAKEDEFLIST 37675 . 38079) (PP 38081 . 38357) (PP* 38359 . +38672) (PPT 38674 . 38993) (PRETTYPRINT 38995 . 42147) (PRETTYPRINT1 42149 . 44035) (PRETTYPRINT2 +44037 . 45353) (PRETTYPRINT3 45355 . 46310) (PRINTDEF1 46312 . 47320) (SUPERPRINTEQ 47322 . 47416) ( +SUPERPRINTGETPROP 47418 . 47562) (CHANGEFONT 47564 . 48074)) (48077 53423 (READARRAY 48087 . 49013) ( +PRINTARRAY 49015 . 50755) (READARRAY-FROM-LIST 50757 . 51862) (PRINTARRAY-TO-LIST 51864 . 53421)) ( +53550 61068 (PRINTCOPYRIGHT 53560 . 57637) (PRINTCOPYRIGHT1 57639 . 60763) (SAVECOPYRIGHT 60765 . +61066))))) STOP diff --git a/sources/PRETTY.LCOM b/sources/PRETTY.LCOM index 60cb1b6db76205e604d308e70235248f86bb4b8f..492fe9cd8a8cf19eb377ad90f56e27d778b3e8e0 100644 GIT binary patch delta 1998 zcma)7O>Em_7;ZYP45LkKsHIFRyfZ2!VlDnY+i4s^!A4Dk~B`!Eoqvh zElh}2LR|ULEOF$(E`X3wwQ)g1hznPC;jqhu#0eyRE(o~seooSsZW7Dk_2>8Jd7t;^ zbN>1@^x}F7uK_emb5k1)l$F{GUa${Q&gY?1SL+SI2Cya^GmJf+DgN#LTeRx zcr)dkc`H$GHNDwJxzo8i+w`gp@9J!~wb5Dfy0dv(bKTE<<(`cI~j+(oi*L0l`q=abjF1h%%&F%1NMSUPfznuEw3Y+edr`E2yvP6 z|6dhB3RuO~!<7M1Ss)7ZX~KF7nTF4)w!N5?nc)Eb)6D7m z@!<4L=1~?`e|#t`%HqCq35Ze@7R{t(CMk$w6mnW_PP0KI5;%o9)wOaU3NoZ{-GIhK zcrjma^R|@-8kIqH&TJJNbf@yn4hkhR!0=QTh$8JAaUOkbOc*GWvmO)k^HJ{DRt63Lh0aBW-77Q08dDowTi+dV?&A=*8^zIci?(xND;ZOvB`QXVB z9A9{n^WQu8REYCGIq1w$LUCs=q`X>rqp^OG2P#M$@Cieog(& z4>L0GY}=!XpBR}4aW~J8d|pJ%M@m(cjZy{W_odfRPM4QZUN6^BeqEmM$0`{-U8*di zyj`gs;~;#tVBx-m!@2wq43n)kFH z@uFxbc`V>NkL8%EG1+cg{!g`|c>1$8k21H+w6~TS$0K#d@mg2#Z`5Tx-3{JnSD5z3 z3iIPGGycs$-nq5?Z$~gRu{wp>9@He(+1srXDDSpP$GEs|**Uye z@r7j4VO0DxYtJ1TWcBZOqv-kmnxGC;56VCJEb_-4mv$K$Stp;>i#y&C?s|Ll$pMIN z;Ws{`nrRIS!JMbsn`ZfBCZPxW~+qIo$sOL0WO>6l5H8eBrX7(iRn{=~p zkrDl3=Qskq(V55&a%g7C$eJ4a(&*+6>0V~MOF1=ZTh2ax@W(W;`1d+vlLNF~TwpKe zwSh~2rnpLMAvU`)lwWk&>Wr;lVw!cf`ai5QO=5#B&_^4UBb;j&Gpe1^>|hv2HcMmN V9{fHyo6|d+wL`e&oS8Mae*vA*7_0yQ delta 1837 zcmb7ENo*Ts6s}7Xm6VA@5o94Qk3puks~FFCY-g<2FtKN1x8oUmW}Kx7;BD+U@fO>O zKrAg1Ck|E7FBJ)K;)D>Fs0eZ5$^i)>ap45zzyTx{38V^%Qr>STb`}mWhtF@`|IK^f zTm0Yp#c}s%$4#XM=M>#YNfw-2j>SyRm|IDza?Fq=OO68z;_T(^+AQzqIpBl{$45Ak z1vgu4)?3w@U4muCpx)seFs`WstZSPc@+nt^|JZB+r zpqIf2kL?Wq_uln88SON;$&Ze4N0{7ooOdM16DKDgI`Mbz1U{wrcO71mIr**s@^cmH zNUTpUpP|ObV#3k${C3;dq>cwE)c>mA?;T$y^#`2ScmdTXH7lm4SB&IB!r~yng<(yL z=~|43fIkc=IW;dEz>6Z7*?Gy*Q)v4kj=KVUXbzr9XRWlMr-2XpK{BsoP0AMdK@i*{ zpy6=cxUe`d{Q|^J_uZi&dHB>LPR7lL!=ULJ1`blM04Vi$l<`TID$ws;C959lBp#rX+aeIm)9>N#uz*<=r zLVjTBh6M$Z8+AIE+pmv)w1OcoUQ@gz%t}U!^XqUidPZ!<^p2Al&9!&5l>4XGd6>7UYjO;)27^? zY?>ldrub<&hd5PPLfooQ&o>pyywq7EH`Y(1_0Br|=H5D$Tc}d}yh?e#4J!TZ9{#aG zGcImY4ZE9bh~qU{OuM#<_+?E)bk-^Vdfj$2nkuDK54iD1^3aEI8)+%?>~LT>Tn|HX zjR|tUFp8gDXv|Ci;m)lEjkLdJ^lDTQCgG@2_tB#tSwjx2x5_Mw5O5v zUfVgb&yuycn$%=^3n&^gzG_eK`)7S|y$dHL#SGm%B3sU6lZ&c}m6NFsZEdJSXZ>zx z4)N;_6%^^dNIhM;)_-=XC$~*EWOrkpoZ5kL#xhnCk`b2;I(+hKE#vZfV|uUsUN0?? WIj({-KiDZV3|=Zchi_U^W&Qz&9QNP<