From 024e83d17eb9dfc7c2384d82b4ecc011770d2efe Mon Sep 17 00:00:00 2001 From: Larry Masinter Date: Sun, 27 Oct 2024 17:51:01 -0700 Subject: [PATCH] fix #1861 typo in Interpress \IPC macro for constants (#1865) fix typo in INTERPRESS \IPC macro --- sources/INTERPRESS | 93 ++++++++++++++++++++-------------------- sources/INTERPRESS.LCOM | Bin 61237 -> 61290 bytes 2 files changed, 47 insertions(+), 46 deletions(-) diff --git a/sources/INTERPRESS b/sources/INTERPRESS index 87802cb50..189391654 100644 --- a/sources/INTERPRESS +++ b/sources/INTERPRESS @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "13-Nov-2023 11:15:45" {WMEDLEY}INTERPRESS.;18 220543 +(FILECREATED "27-Oct-2024 12:09:17" {DSK}larry>il>medley>sources>INTERPRESS.;3 220681 - :EDIT-BY rmk + :EDIT-BY "lmm" - :CHANGES-TO (VARS INTERPRESSCOMS) + :CHANGES-TO (FUNCTIONS \IPC) - :PREVIOUS-DATE "11-Nov-2023 10:38:10" {WMEDLEY}INTERPRESS.;17) + :PREVIOUS-DATE "13-Nov-2023 11:15:45" {DSK}larry>il>medley>sources>INTERPRESS.;1) (PRETTYCOMPRINT INTERPRESSCOMS) @@ -380,8 +380,9 @@ (DEFMACRO \IPC (X) - (DECLARE (SPECIAL X)) (* ; "Edited 2-May-2023 08:33 by lmm") - [OR (AND (BOUNDP '\IPCONSTANDS) + (DECLARE (SPECIAL X)) (* ; "Edited 27-Oct-2024 11:57 by lmm") + (* ; "Edited 2-May-2023 08:33 by lmm") + [OR (AND (BOUNDP '\IPCONSTANTS) (LISTP \IPCONSTANTS)) (SETQ \IPCONSTANTS (FOR X IN IPCONSTANTS JOIN (FOR Y IN (EVAL X) COLLECT (CONS (CAR Y) @@ -3908,44 +3909,44 @@ (LOADDEF 'BRUSH 'RECORDS 'IMAGEIO) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (15420 16164 (\IPC 15420 . 16164)) (16397 22049 (APPENDBYTE.IP 16407 . 16543) ( -APPENDIDENTIFIER.IP 16545 . 17067) (APPENDINT.IP 17069 . 17520) (APPENDINTEGER.IP 17522 . 18094) ( -APPENDLARGEVECTOR.IP 18096 . 19061) (APPENDNUMBER.IP 19063 . 19532) (APPENDOP.IP 19534 . 20180) ( -APPENDRATIONAL.IP 20182 . 20675) (APPENDSEQUENCEDESCRIPTOR.IP 20677 . 21872) (BYTESININT.IP 21874 . -22047)) (22085 61892 (ARCTO.IP 22095 . 23376) (BEGINMASTER.IP 23378 . 23651) (BEGINPAGE.IP 23653 . -24009) (BEGINPREAMBLE.IP 24011 . 24382) (CLIPRECTANGLE.IP 24384 . 24874) (CONCAT.IP 24876 . 25141) ( -CONCATT.IP 25143 . 25410) (ENDMASTER.IP 25412 . 25856) (ENDPAGE.IP 25858 . 26235) (ENDPREAMBLE.IP -26237 . 27036) (FGET.IP 27038 . 27341) (FILLRECTANGLE.IP 27343 . 29671) (FILLTRAJECTORY.IP 29673 . -30308) (FILLNGON.IP 30310 . 32587) (FSET.IP 32589 . 32892) (GETFRAMEVAR.IP 32894 . 33212) ( -INITIALIZEMASTER.IP 33214 . 33815) (INITIALIZECOLOR.IP 33817 . 35138) (ISET.IP 35140 . 35511) ( -GETCP.IP 35513 . 35822) (LINETO.IP 35824 . 36429) (MASKSTROKE.IP 36431 . 36704) (MOVETO.IP 36706 . -37043) (ROTATE.IP 37045 . 37347) (SCALE.IP 37349 . 37652) (SCALE2.IP 37654 . 37991) (SETCOLOR.IP 37993 - . 40222) (SETRGB.IP 40224 . 41280) (SETCOLORLV.IP 41282 . 45895) (SETCOLOR16.IP 45897 . 49003) ( -SETFONT.IP 49005 . 49826) (SETSPACE.IP 49828 . 50140) (SETXREL.IP 50142 . 51326) (SETX.IP 51328 . -52845) (SETXY.IP 52847 . 54019) (SETXYREL.IP 54021 . 55327) (SETY.IP 55329 . 56638) (SETYREL.IP 56640 - . 57540) (SHOW.IP 57542 . 60802) (TRAJECTORY.IP 60804 . 61202) (TRANS.IP 61204 . 61543) (TRANSLATE.IP - 61545 . 61890)) (61923 68013 (\CHANGE-VISIBLE-REGION.IP 61933 . 65594) (\PAPERSIZE.IP 65596 . 66417) -(HEADINGOP.IP 66419 . 68011)) (68014 173024 (DEFINEFONT.IP 68024 . 68998) (FONTNAME.IP 69000 . 69930) -(INTERPRESS.BITMAPSCALE 69932 . 70741) (INTERPRESS.OUTCHARFN 70743 . 76915) (INTERPRESSFILEP 76917 . -78251) (MAKEINTERPRESS 78253 . 78437) (NEWLINE.IP 78439 . 79171) (NEWPAGE.IP 79173 . 84148) ( -NEWPAGE?.IP 84150 . 84629) (OPENIPSTREAM 84631 . 92982) (SETUPFONTS.IP 92984 . 93976) (SHOWBITMAP.IP -93978 . 98519) (\BITMAPSIZE.IP 98521 . 99298) (SHOWBITMAP1.IP 99300 . 103672) (SHOWSHADE.IP 103674 . -104627) (\BITBLT.IP 104629 . 108833) (\SCALEDBITBLT.IP 108835 . 112480) (\BLTSHADE.IP 112482 . 113940) - (\CHARWIDTH.IP 113942 . 114392) (\CLOSEIPSTREAM 114394 . 114721) (\DRAWARC.IP 114723 . 115170) ( -\DRAWCURVE.IP 115172 . 117609) (\DRAWPOINT.IP 117611 . 118648) (\DSPCOLOR.IP 118650 . 119601) ( -ENSURE.RGB 119603 . 120267) (\IPCURVE2 120269 . 133523) (\CLIPCURVELINE.IP 133525 . 138223) ( -\DRAWLINE.IP 138225 . 141957) (\CLIPLINE 141959 . 146659) (\DSPBOTTOMMARGIN.IP 146661 . 147077) ( -\DSPFONT.IP 147079 . 151126) (\DSPLEFTMARGIN.IP 151128 . 151588) (\DSPLINEFEED.IP 151590 . 152257) ( -\DSPRIGHTMARGIN.IP 152259 . 153056) (\DSPSPACEFACTOR.IP 153058 . 154187) (\DSPTOPMARGIN.IP 154189 . -154625) (\DSPXPOSITION.IP 154627 . 155614) (\DSPROTATE.IP 155616 . 155794) (\PUSHSTATE.IP 155796 . -156688) (\POPSTATE.IP 156690 . 157325) (\DEFAULTSTATE.IP 157327 . 157679) (\DSPTRANSLATE.IP 157681 . -157862) (\DSPSCALE2.IP 157864 . 158039) (\DSPYPOSITION.IP 158041 . 158342) (FILLCIRCLE.IP 158344 . -159427) (\FILLPOLYGON.IP 159429 . 160760) (\DRAWPOLYGON.IP 160762 . 166892) (\FIXLINELENGTH.IP 166894 - . 168108) (\MOVETO.IP 168110 . 168474) (\SETBRUSH.IP 168476 . 170642) (\STRINGWIDTH.IP 170644 . -171047) (\DSPCLIPPINGREGION.IP 171049 . 172225) (\DSPOPERATION.IP 172227 . 173022)) (173215 173970 ( -IP-TOS 173225 . 173485) (POP-IP-STACK 173487 . 173782) (PUSH-IP-STACK 173784 . 173968)) (174031 186595 - (\CREATECHARSET.IP 174041 . 185832) (\CHANGECHARSET.IP 185834 . 186593)) (186596 191322 ( -\INTERPRESSINIT 186606 . 191320)) (191323 191881 (SCALEREGION 191333 . 191879)) (204809 207233 ( -INTERPRESSBITMAP 204819 . 207231)) (209441 216097 (NSMAP 209451 . 210033) (\COERCEASCIITONSFONT 210035 - . 213889) (\CREATEINTERPRESSFONT 213891 . 215756) (\SEARCHINTERPRESSFONTS 215758 . 216095))))) + (FILEMAP (NIL (15449 16302 (\IPC 15449 . 16302)) (16535 22187 (APPENDBYTE.IP 16545 . 16681) ( +APPENDIDENTIFIER.IP 16683 . 17205) (APPENDINT.IP 17207 . 17658) (APPENDINTEGER.IP 17660 . 18232) ( +APPENDLARGEVECTOR.IP 18234 . 19199) (APPENDNUMBER.IP 19201 . 19670) (APPENDOP.IP 19672 . 20318) ( +APPENDRATIONAL.IP 20320 . 20813) (APPENDSEQUENCEDESCRIPTOR.IP 20815 . 22010) (BYTESININT.IP 22012 . +22185)) (22223 62030 (ARCTO.IP 22233 . 23514) (BEGINMASTER.IP 23516 . 23789) (BEGINPAGE.IP 23791 . +24147) (BEGINPREAMBLE.IP 24149 . 24520) (CLIPRECTANGLE.IP 24522 . 25012) (CONCAT.IP 25014 . 25279) ( +CONCATT.IP 25281 . 25548) (ENDMASTER.IP 25550 . 25994) (ENDPAGE.IP 25996 . 26373) (ENDPREAMBLE.IP +26375 . 27174) (FGET.IP 27176 . 27479) (FILLRECTANGLE.IP 27481 . 29809) (FILLTRAJECTORY.IP 29811 . +30446) (FILLNGON.IP 30448 . 32725) (FSET.IP 32727 . 33030) (GETFRAMEVAR.IP 33032 . 33350) ( +INITIALIZEMASTER.IP 33352 . 33953) (INITIALIZECOLOR.IP 33955 . 35276) (ISET.IP 35278 . 35649) ( +GETCP.IP 35651 . 35960) (LINETO.IP 35962 . 36567) (MASKSTROKE.IP 36569 . 36842) (MOVETO.IP 36844 . +37181) (ROTATE.IP 37183 . 37485) (SCALE.IP 37487 . 37790) (SCALE2.IP 37792 . 38129) (SETCOLOR.IP 38131 + . 40360) (SETRGB.IP 40362 . 41418) (SETCOLORLV.IP 41420 . 46033) (SETCOLOR16.IP 46035 . 49141) ( +SETFONT.IP 49143 . 49964) (SETSPACE.IP 49966 . 50278) (SETXREL.IP 50280 . 51464) (SETX.IP 51466 . +52983) (SETXY.IP 52985 . 54157) (SETXYREL.IP 54159 . 55465) (SETY.IP 55467 . 56776) (SETYREL.IP 56778 + . 57678) (SHOW.IP 57680 . 60940) (TRAJECTORY.IP 60942 . 61340) (TRANS.IP 61342 . 61681) (TRANSLATE.IP + 61683 . 62028)) (62061 68151 (\CHANGE-VISIBLE-REGION.IP 62071 . 65732) (\PAPERSIZE.IP 65734 . 66555) +(HEADINGOP.IP 66557 . 68149)) (68152 173162 (DEFINEFONT.IP 68162 . 69136) (FONTNAME.IP 69138 . 70068) +(INTERPRESS.BITMAPSCALE 70070 . 70879) (INTERPRESS.OUTCHARFN 70881 . 77053) (INTERPRESSFILEP 77055 . +78389) (MAKEINTERPRESS 78391 . 78575) (NEWLINE.IP 78577 . 79309) (NEWPAGE.IP 79311 . 84286) ( +NEWPAGE?.IP 84288 . 84767) (OPENIPSTREAM 84769 . 93120) (SETUPFONTS.IP 93122 . 94114) (SHOWBITMAP.IP +94116 . 98657) (\BITMAPSIZE.IP 98659 . 99436) (SHOWBITMAP1.IP 99438 . 103810) (SHOWSHADE.IP 103812 . +104765) (\BITBLT.IP 104767 . 108971) (\SCALEDBITBLT.IP 108973 . 112618) (\BLTSHADE.IP 112620 . 114078) + (\CHARWIDTH.IP 114080 . 114530) (\CLOSEIPSTREAM 114532 . 114859) (\DRAWARC.IP 114861 . 115308) ( +\DRAWCURVE.IP 115310 . 117747) (\DRAWPOINT.IP 117749 . 118786) (\DSPCOLOR.IP 118788 . 119739) ( +ENSURE.RGB 119741 . 120405) (\IPCURVE2 120407 . 133661) (\CLIPCURVELINE.IP 133663 . 138361) ( +\DRAWLINE.IP 138363 . 142095) (\CLIPLINE 142097 . 146797) (\DSPBOTTOMMARGIN.IP 146799 . 147215) ( +\DSPFONT.IP 147217 . 151264) (\DSPLEFTMARGIN.IP 151266 . 151726) (\DSPLINEFEED.IP 151728 . 152395) ( +\DSPRIGHTMARGIN.IP 152397 . 153194) (\DSPSPACEFACTOR.IP 153196 . 154325) (\DSPTOPMARGIN.IP 154327 . +154763) (\DSPXPOSITION.IP 154765 . 155752) (\DSPROTATE.IP 155754 . 155932) (\PUSHSTATE.IP 155934 . +156826) (\POPSTATE.IP 156828 . 157463) (\DEFAULTSTATE.IP 157465 . 157817) (\DSPTRANSLATE.IP 157819 . +158000) (\DSPSCALE2.IP 158002 . 158177) (\DSPYPOSITION.IP 158179 . 158480) (FILLCIRCLE.IP 158482 . +159565) (\FILLPOLYGON.IP 159567 . 160898) (\DRAWPOLYGON.IP 160900 . 167030) (\FIXLINELENGTH.IP 167032 + . 168246) (\MOVETO.IP 168248 . 168612) (\SETBRUSH.IP 168614 . 170780) (\STRINGWIDTH.IP 170782 . +171185) (\DSPCLIPPINGREGION.IP 171187 . 172363) (\DSPOPERATION.IP 172365 . 173160)) (173353 174108 ( +IP-TOS 173363 . 173623) (POP-IP-STACK 173625 . 173920) (PUSH-IP-STACK 173922 . 174106)) (174169 186733 + (\CREATECHARSET.IP 174179 . 185970) (\CHANGECHARSET.IP 185972 . 186731)) (186734 191460 ( +\INTERPRESSINIT 186744 . 191458)) (191461 192019 (SCALEREGION 191471 . 192017)) (204947 207371 ( +INTERPRESSBITMAP 204957 . 207369)) (209579 216235 (NSMAP 209589 . 210171) (\COERCEASCIITONSFONT 210173 + . 214027) (\CREATEINTERPRESSFONT 214029 . 215894) (\SEARCHINTERPRESSFONTS 215896 . 216233))))) STOP diff --git a/sources/INTERPRESS.LCOM b/sources/INTERPRESS.LCOM index 1931746042e019a2dc94222d1be8a775a7f615da..7f63eac0cf9713d6a826ffcc7906e898e97c7331 100644 GIT binary patch delta 603 zcmdmbkNMR-<_Y2TM&`Qy$tAi*21X_dhDKHfmR6?5N(vfE$@#ejnK`K`3i){oN($93 z!QQnt8Tq-Xb~%YfMU{4$Id-|JDLJW?cE$OnMaikfcAkDAu0a7ouED{2*2bC&TuMe} zy1}Uh5R(lotW1oo3{903l0XLMsHZ4o0?l;`t@rU!Kvt-yr>CTll2`(?7@GkWN}606 zZk|4_&Oxq@A+9b!MHuckG$+Bm^-u>Z7#SIuSr{rDVf1^YS%D43X7Kv=-wF)=e&h;a;d_Vf(#4-Rn*QZO+!h6@1QZek4NdIos< zI=Z|12Lx|UIFiN8WNfkd%yBQq&HFCQWZGPDV=cQZ&~G6jk>sll2G zRzP2cdHRP2>$(8#0=mZ#DTEBHj4gm(1BQq^{va{mJa^}E$<41A*D5nwY@VU2%g1QB z`Izzhw8<`)^*3*wwSjSR@nzY~sdN5vGd|dyykZI?qsQd;D+7Ja4Hf)?eH{Z7Oiaxo zETG>_%*_;H9D|)bJwyD1LmYz?Ow5en0)D{?CMH0xXMm@#qr0nr0FZBNqTuK0