From 14dafea45faf420062ad48cdfc0e065428a267df Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Wed, 3 Jun 2026 23:32:15 -0700 Subject: [PATCH 1/7] Allow \SEARCHFONTFILES to take a list of fontspecs Fixes the HCFILES fails for postscript fonts --- sources/FONT | 127 ++++++++++++++++++++++++---------------------- sources/FONT.LCOM | Bin 66632 -> 66719 bytes 2 files changed, 65 insertions(+), 62 deletions(-) diff --git a/sources/FONT b/sources/FONT index 89c7010cd..daf79afb5 100644 --- a/sources/FONT +++ b/sources/FONT @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) -(FILECREATED " 5-May-2026 09:56:41" {MEDLEY}FONT.;797 260815 +(FILECREATED " 3-Jun-2026 19:52:29" {MEDLEY}FONT.;798 261125 :EDIT-BY rmk - :CHANGES-TO (FNS \CREATEDISPLAYFONT FONTSPEC.TO.FONTDESCRIPTOR) + :CHANGES-TO (FNS \SEARCHFONTFILES) - :PREVIOUS-DATE " 4-May-2026 12:39:02" {MEDLEY}FONT.;796) + :PREVIOUS-DATE " 5-May-2026 09:56:41" {MEDLEY}FONT.;797) (PRETTYCOMPRINT FONTCOMS) @@ -2792,7 +2792,8 @@ VAL]) (\SEARCHFONTFILES - [LAMBDA (FONTSPEC) (* ; "Edited 4-Mar-2026 00:14 by rmk") + [LAMBDA (FONTSPECS) (* ; "Edited 3-Jun-2026 19:52 by rmk") + (* ; "Edited 4-Mar-2026 00:14 by rmk") (* ; "Edited 28-Aug-2025 14:47 by rmk") (* ; "Edited 25-Aug-2025 10:23 by rmk") (* ; "Edited 23-Aug-2025 12:36 by rmk") @@ -2806,26 +2807,28 @@ (* ;; "Returns a list of the fonts that can be read in for a device. Rotation is ignored because it is assumed that all devices support 0 90 and 270. The caller must do any desired coercions.") - (LET (FAMILY SIZE FACE ROTATION DEVICE) - (SPREADFONTSPEC FONTSPEC) - (for FILEPATTERN FILEDIR FONTSFOUND (FILING.ENUMERATION.DEPTH ← 1) - in [\FONTFILENAMES FAMILY SIZE FACE DEVICE (MKLIST (FONTDEVICEPROP DEVICE - 'FONTEXTENSIONS] - do (SETQ FILEDIR (FILENAMEFIELD FILEPATTERN 'DIRECTORY)) - (SETQ FILEDIR (CL:IF FILEDIR - (CONCAT ">" FILEDIR ">") - "")) - (for DIR inside (FONTDEVICEPROP DEVICE 'FONTDIRECTORIES) - eachtime - - (* ;; "The file pattern might have an extending subdirectory (C41>) that might not exist, but DIRECTORYNAMEP makes sure that it does.") - - (SETQ DIR (CONCAT DIR ">" (OR FILEDIR ""))) when (DIRECTORYNAMEP DIR) - do (for FONTFILE THISFONT in (DIRECTORY DIR) eachtime (SETQ THISFONT - (FONTSPECFROMFILENAME - FONTFILE DEVICE)) - - (* ;; + (for FS FAMILY SIZE FACE ROTATION DEVICE in (CL:IF (type? FONTSPEC FONTSPECS) + (CONS FONTSPECS) + FONTSPECS) + join (SPREADFONTSPEC FONTSPEC) + (for FILEPATTERN FILEDIR FONTSFOUND (FILING.ENUMERATION.DEPTH ← 1) + in [\FONTFILENAMES FAMILY SIZE FACE DEVICE (MKLIST (FONTDEVICEPROP DEVICE + 'FONTEXTENSIONS] + do (SETQ FILEDIR (FILENAMEFIELD FILEPATTERN 'DIRECTORY)) + (SETQ FILEDIR (CL:IF FILEDIR + (CONCAT ">" FILEDIR ">") + "")) + (for DIR inside (FONTDEVICEPROP DEVICE 'FONTDIRECTORIES) + eachtime + + (* ;; "The file pattern might have an extending subdirectory (C41>) that might not exist, but DIRECTORYNAMEP makes sure that it does.") + + (SETQ DIR (CONCAT DIR ">" (OR FILEDIR ""))) when (DIRECTORYNAMEP DIR) + do (for FONTFILE THISFONT in (DIRECTORY DIR) eachtime (SETQ THISFONT + (FONTSPECFROMFILENAME + FONTFILE DEVICE)) + + (* ;;  "make sure the face, size, and family really match.") when (AND THISFONT (OR (EQ FAMILY '*) (EQ FAMILY (fetch (FONTSPEC FSFAMILY) of THISFONT))) @@ -2833,7 +2836,7 @@ (EQ SIZE (fetch (FONTSPEC FSSIZE) of THISFONT))) (MATCHFONTFACE FACE (fetch (FONTSPEC FSFACE) of THISFONT))) unless (MEMBER THISFONT FONTSFOUND) - do (push FONTSFOUND THISFONT))) finally (RETURN (DREVERSE FONTSFOUND]) + do (push FONTSFOUND THISFONT))) finally (RETURN (DREVERSE FONTSFOUND]) (FLUSHFONTCACHE [LAMBDA (CACHES FAMILY SIZE FACE ROTATION DEVICE) (* ; "Edited 15-Apr-2026 22:11 by rmk") @@ -4125,41 +4128,41 @@ (ADDTOVAR LAMA FONTCOPY FONTDEVICEPROP) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (6638 16305 (CHARWIDTH 6648 . 7437) (CHARWIDTHY 7439 . 8956) (STRINGWIDTH 8958 . 9995) ( -\CHARWIDTH.DISPLAY 9997 . 10412) (\STRINGWIDTH.DISPLAY 10414 . 10842) (\STRINGWIDTH.GENERIC 10844 . -16303)) (16306 22938 (DEFAULTFONT 16316 . 17601) (FONTCLASS 17603 . 19875) (FONTCLASSUNPARSE 19877 . -20778) (FONTCLASSCOMPONENT 20780 . 21368) (SETFONTCLASSCOMPONENT 21370 . 21812) (GETFONTCLASSCOMPONENT - 21814 . 22936)) (24386 44288 (FONTCREATE 24396 . 27641) (FONTCREATE1 27643 . 30302) ( -FONTCREATE.SLUGFD 30304 . 32868) (\FONT.CHECKARGS1 32870 . 37575) (\FONTCREATE1.NOFN 37577 . 37791) ( -FONTFILEP 37793 . 38681) (\READCHARSET 38683 . 43868) (FONTCHARSETS 43870 . 44286)) (44289 51365 ( -\FONT.CHECKARGS 44299 . 51048) (\CHARSET.CHECK 51050 . 51363)) (51366 57726 (COERCEFONTSPEC 51376 . -57037) (COERCEFONTSPEC.TARGETFACE 57039 . 57724)) (59921 63339 (MAKEFONTSPEC 59931 . 61584) ( -FONTSPEC.TO.FONTDESCRIPTOR 61586 . 63337)) (63340 73002 (COMPLETE.FONT 63350 . 65375) (COMPLETEFONTP -65377 . 66115) (COMPLETE.CHARSET 66117 . 70183) (PRUNESLUGCSINFOS 70185 . 71496) (MONOSPACEFONTP 71498 - . 73000)) (73041 82855 (FONTASCENT 73051 . 73435) (FONTDESCENT 73437 . 73922) (FONTHEIGHT 73924 . -74326) (FONTPROP 74328 . 82132) (\AVGCHARWIDTH 82134 . 82853)) (83603 85473 (FONTDEVICEPROP 83613 . -85471)) (85590 86444 (EDITCHAR 85600 . 86442)) (86490 98680 (GETCHARBITMAP 86500 . 87624) ( -PUTCHARBITMAP 87626 . 89784) (\GETCHARBITMAP.CSINFO 89786 . 91802) (\PUTCHARBITMAP.CSINFO 91804 . -98678)) (98681 121022 (MOVECHARBITMAP 98691 . 100585) (MOVEFONTCHARS 100587 . 105737) (\MOVEFONTCHAR -105739 . 110611) (\MOVEFONTCHARS.SOURCEDATA 110613 . 117368) (\MAKESLUGCHAR 117370 . 119905) ( -SLUGCHARP 119907 . 121020)) (121937 135191 (FONTFILES 121947 . 124986) (\FINDFONTFILE 124988 . 126965) - (\FONTFILENAMES 126967 . 127527) (\FONTFILENAME 127529 . 130639) (FONTSPECFROMFILENAME 130641 . -135189)) (135192 171525 (FONTCOPY 135202 . 140285) (FONTP 140287 . 140586) (FONTUNPARSE 140588 . -142311) (SETFONTDESCRIPTOR 142313 . 143777) (\STREAMCHARWIDTH 143779 . 147790) (\COERCECHARSET 147792 - . 151181) (\BUILDSLUGCSINFO 151183 . 154876) (\FONTSYMBOL 154878 . 155532) (\DEVICESYMBOL 155534 . -156318) (\FONTFACE 156320 . 163524) (\FONTFACE.COLOR 163526 . 170308) (SETFONTCHARENCODING 170310 . -171523)) (171526 192384 (FONTSAVAILABLE 171536 . 176900) (FONTEXISTS? 176902 . 180710) ( -\SEARCHFONTFILES 180712 . 183926) (FLUSHFONTCACHE 183928 . 186459) (FINDFONTFILES 186461 . 189677) ( -SORTFONTSPECS 189679 . 192382)) (192385 197923 (MATCHFONTFACE 192395 . 193470) (MAKEFONTFACE 193472 . -194506) (FONTFACETOATOM 194508 . 196758) (FONTFACE.STARS 196760 . 197921)) (198554 199046 ( -\UNITWIDTHSVECTOR 198564 . 199044)) (215967 218034 (FONTDESCRIPTOR.DEFPRINT 215977 . 217556) ( -FONTCLASS.DEFPRINT 217558 . 218032)) (221956 224746 (\CREATEKERNELEMENT 221966 . 222324) ( -\FSETLEFTKERN 222326 . 222817) (\FGETLEFTKERN 222819 . 224744)) (224747 235901 (\CREATEFONT 224757 . -228365) (\CREATECHARSET 228367 . 231652) (\INSTALLCHARSETINFO 231654 . 234988) ( -\INSTALLCHARSETINFO.CHARENCODING 234990 . 235899)) (236223 237591 (\FONTRESETCHARWIDTHS 236233 . -237589)) (238114 246273 (\CREATEDISPLAYFONT 238124 . 240332) (\CREATECHARSET.DISPLAY 240334 . 243858) -(\FONTEXISTS?.DISPLAY 243860 . 246271)) (246274 254652 (FAKEFACE.CHARSET 246284 . 250346) ( -MAKEBOLD.CHAR 250348 . 252201) (MAKEITALIC.CHAR 252203 . 254650)) (254683 258938 (\SFROTATECSINFO -254693 . 256835) (\SFROTATEFONTCHARACTERS 256837 . 257221) (\SFROTATECSINFOOFFSETS 257223 . 258936)) ( -258939 260113 (\SFMAKECOLOR 258949 . 260111))))) + (FILEMAP (NIL (6609 16276 (CHARWIDTH 6619 . 7408) (CHARWIDTHY 7410 . 8927) (STRINGWIDTH 8929 . 9966) ( +\CHARWIDTH.DISPLAY 9968 . 10383) (\STRINGWIDTH.DISPLAY 10385 . 10813) (\STRINGWIDTH.GENERIC 10815 . +16274)) (16277 22909 (DEFAULTFONT 16287 . 17572) (FONTCLASS 17574 . 19846) (FONTCLASSUNPARSE 19848 . +20749) (FONTCLASSCOMPONENT 20751 . 21339) (SETFONTCLASSCOMPONENT 21341 . 21783) (GETFONTCLASSCOMPONENT + 21785 . 22907)) (24357 44259 (FONTCREATE 24367 . 27612) (FONTCREATE1 27614 . 30273) ( +FONTCREATE.SLUGFD 30275 . 32839) (\FONT.CHECKARGS1 32841 . 37546) (\FONTCREATE1.NOFN 37548 . 37762) ( +FONTFILEP 37764 . 38652) (\READCHARSET 38654 . 43839) (FONTCHARSETS 43841 . 44257)) (44260 51336 ( +\FONT.CHECKARGS 44270 . 51019) (\CHARSET.CHECK 51021 . 51334)) (51337 57697 (COERCEFONTSPEC 51347 . +57008) (COERCEFONTSPEC.TARGETFACE 57010 . 57695)) (59892 63310 (MAKEFONTSPEC 59902 . 61555) ( +FONTSPEC.TO.FONTDESCRIPTOR 61557 . 63308)) (63311 72973 (COMPLETE.FONT 63321 . 65346) (COMPLETEFONTP +65348 . 66086) (COMPLETE.CHARSET 66088 . 70154) (PRUNESLUGCSINFOS 70156 . 71467) (MONOSPACEFONTP 71469 + . 72971)) (73012 82826 (FONTASCENT 73022 . 73406) (FONTDESCENT 73408 . 73893) (FONTHEIGHT 73895 . +74297) (FONTPROP 74299 . 82103) (\AVGCHARWIDTH 82105 . 82824)) (83574 85444 (FONTDEVICEPROP 83584 . +85442)) (85561 86415 (EDITCHAR 85571 . 86413)) (86461 98651 (GETCHARBITMAP 86471 . 87595) ( +PUTCHARBITMAP 87597 . 89755) (\GETCHARBITMAP.CSINFO 89757 . 91773) (\PUTCHARBITMAP.CSINFO 91775 . +98649)) (98652 120993 (MOVECHARBITMAP 98662 . 100556) (MOVEFONTCHARS 100558 . 105708) (\MOVEFONTCHAR +105710 . 110582) (\MOVEFONTCHARS.SOURCEDATA 110584 . 117339) (\MAKESLUGCHAR 117341 . 119876) ( +SLUGCHARP 119878 . 120991)) (121908 135162 (FONTFILES 121918 . 124957) (\FINDFONTFILE 124959 . 126936) + (\FONTFILENAMES 126938 . 127498) (\FONTFILENAME 127500 . 130610) (FONTSPECFROMFILENAME 130612 . +135160)) (135163 171496 (FONTCOPY 135173 . 140256) (FONTP 140258 . 140557) (FONTUNPARSE 140559 . +142282) (SETFONTDESCRIPTOR 142284 . 143748) (\STREAMCHARWIDTH 143750 . 147761) (\COERCECHARSET 147763 + . 151152) (\BUILDSLUGCSINFO 151154 . 154847) (\FONTSYMBOL 154849 . 155503) (\DEVICESYMBOL 155505 . +156289) (\FONTFACE 156291 . 163495) (\FONTFACE.COLOR 163497 . 170279) (SETFONTCHARENCODING 170281 . +171494)) (171497 192694 (FONTSAVAILABLE 171507 . 176871) (FONTEXISTS? 176873 . 180681) ( +\SEARCHFONTFILES 180683 . 184236) (FLUSHFONTCACHE 184238 . 186769) (FINDFONTFILES 186771 . 189987) ( +SORTFONTSPECS 189989 . 192692)) (192695 198233 (MATCHFONTFACE 192705 . 193780) (MAKEFONTFACE 193782 . +194816) (FONTFACETOATOM 194818 . 197068) (FONTFACE.STARS 197070 . 198231)) (198864 199356 ( +\UNITWIDTHSVECTOR 198874 . 199354)) (216277 218344 (FONTDESCRIPTOR.DEFPRINT 216287 . 217866) ( +FONTCLASS.DEFPRINT 217868 . 218342)) (222266 225056 (\CREATEKERNELEMENT 222276 . 222634) ( +\FSETLEFTKERN 222636 . 223127) (\FGETLEFTKERN 223129 . 225054)) (225057 236211 (\CREATEFONT 225067 . +228675) (\CREATECHARSET 228677 . 231962) (\INSTALLCHARSETINFO 231964 . 235298) ( +\INSTALLCHARSETINFO.CHARENCODING 235300 . 236209)) (236533 237901 (\FONTRESETCHARWIDTHS 236543 . +237899)) (238424 246583 (\CREATEDISPLAYFONT 238434 . 240642) (\CREATECHARSET.DISPLAY 240644 . 244168) +(\FONTEXISTS?.DISPLAY 244170 . 246581)) (246584 254962 (FAKEFACE.CHARSET 246594 . 250656) ( +MAKEBOLD.CHAR 250658 . 252511) (MAKEITALIC.CHAR 252513 . 254960)) (254993 259248 (\SFROTATECSINFO +255003 . 257145) (\SFROTATEFONTCHARACTERS 257147 . 257531) (\SFROTATECSINFOOFFSETS 257533 . 259246)) ( +259249 260423 (\SFMAKECOLOR 259259 . 260421))))) STOP diff --git a/sources/FONT.LCOM b/sources/FONT.LCOM index a050e71a218b055ebd2480540cbc1d7e240807d4..bad150f02c84e0fd9dee2ae455b3351188d01f2a 100644 GIT binary patch delta 919 zcmZuw-)qxQ6y8lIV-rX1x>2g)Ay4gev-hTLk|M4#xn=2^+>lhAFcyT!3WEBeFTT_V zAEr-^K8T{oK<1m2j6V2d1RTiz3I76L=6~Q#I_;44;ePj=?>j$k&&k2&`1|MMFE?hS zh34b?3#3GVlILF+Ji;E%zcOKmhPL!)+ajMWT zTU2+c)}{s*omB6|xd{bG6=TwCA@QO|HCJD5FuNUxdPS%?F1=~88{UG!v-Glv?EXZ* z_Pd;F04_r;^&F}f0X>{XW2hda!pi{)3jqqG`e6uBJrK|-^eVbn7trt5{MZ=dzr$X= zlYd%2yFIm>+BVbXt@G=_eoVZL>_jjX8|&zcEugQqAfRvj;IP+RX<5NWPxz7Ro?&yT z!7R&9#?nj@@OfES?Y|qANF07H%sz;DmP_Dte1Dc){aj>?N_G5fg=T#+}SgG0$vpiOAu}c3n zq33}X)RNYBh%z?`+kVq2Z&bP4>c9DQJ(~ry>9PAZzvr)3u|haDz9dOxu6yxLJ3N%|dpCBrBAtjtn|yL)^4XDP@&yH|uQhwU9-bk>*!!@z zy?FUt1fN@;<>}Zc!80?Fn<8hpV179NBnt8qHH&6PdLcr={J1`aOpbYSG{e(!kRFU; zdpsGW#@jnQNl^2o9AG{*p&DHfMnonBsZews{t#;W`@`5MJ~$wCvB{&MSra{uKh|7w zJiKXdNe!$z-m_g9{iSsmw-eA^H{=;%ec+kJATw^rg9B-W77Nf|jl0alw?MPpvTD)a zua+$al^ zPbRgQ560A}kf$Qg9<-S2+uZd52lJcE0!=-sWWMFuP23WxF=>FJpi&n=xs3+Zg|FpK MT(z+O_GsqTUr_$PHUIzs From 3745eb52bcbc0beaaa4822d951c01c0dffb32a5c Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Wed, 3 Jun 2026 23:33:16 -0700 Subject: [PATCH 2/7] =?UTF-8?q?Add=20TIMESROMAN=20=E2=86=92=20CLASSIC=20fo?= =?UTF-8?q?nt=20coercion,=20and=20HELVETICA6=E2=86=92=20HELVETICA7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Brute force fix to a few other HCFILES errors --- sources/MCCSFONTS | 25 +++++++++++++++---------- sources/MCCSFONTS.LCOM | Bin 22959 -> 23020 bytes 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/sources/MCCSFONTS b/sources/MCCSFONTS index c95fe4afb..56ec76b42 100644 --- a/sources/MCCSFONTS +++ b/sources/MCCSFONTS @@ -1,13 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) -(FILECREATED "17-Apr-2026 08:58:07" {MEDLEY}MCCSFONTS.;145 51826 +(FILECREATED " 3-Jun-2026 23:13:44" {MEDLEY}MCCSFONTS.;147 52041 :EDIT-BY rmk - :CHANGES-TO (VARS MATHTOMCCS SYMBOLTOMCCS SIGMATOMCCS) - (FNS MCCSMAPPAIRS) + :CHANGES-TO (VARS MCCSFONTSCOMS) - :PREVIOUS-DATE "15-Apr-2026 22:12:41" {WMEDLEY}MCCSFONTS.;134) + :PREVIOUS-DATE "17-Apr-2026 08:58:07" {MEDLEY}MCCSFONTS.;145) (PRETTYCOMPRINT MCCSFONTSCOMS) @@ -44,6 +43,9 @@ CYRILLICTOMCODE PALATINOTOMCODE TITANTOMCODE TITANLEGALTOMCODE)) [INITVARS [DISPLAYFONTCOERCIONS '(((HELVETICA (<= * 2)) (HELVETICA 4)) + ((HELVETICA 6) + (HELVETICA 7)) + (TIMESROMAN CLASSIC) ((MODERN (<= 15 * 16)) (* 14)) ((MODERN (<= 17 * 21)) @@ -1179,6 +1181,9 @@ (RPAQ? DISPLAYFONTCOERCIONS '(((HELVETICA (<= * 2)) (HELVETICA 4)) + ((HELVETICA 6) + (HELVETICA 7)) + (TIMESROMAN CLASSIC) ((MODERN (<= 15 * 16)) (* 14)) ((MODERN (<= 17 * 21)) @@ -1271,10 +1276,10 @@ (OLDENGLISH . OE) (SYMBOL . SY))) (DECLARE%: DONTCOPY - (FILEMAP (NIL (8333 9100 (DISPLAYENCODINGFN 8343 . 9098)) (9134 24123 (MCCSCODEMAPARRAY 9144 . 13712) -(MCCSMAPFN 13714 . 15081) (MCCSMAPPAIRS 15083 . 22184) (XCCS.CS0.UNDEFINED 22186 . 23319) ( -XCCSUNDEFINEDPAIRS 23321 . 24121)) (43112 49480 (GACHATOMCODE 43122 . 43767) (SYMBOLTOMCODE 43769 . -44437) (SIGMATOMCODE 44439 . 45105) (ATOMCODE 45107 . 45659) (MATHTOMCODE 45661 . 46334) (HIPPOTOMCODE - 46336 . 46893) (CYRILLICTOMCODE 46895 . 47349) (PALATINOTOMCODE 47351 . 48132) (TITANTOMCODE 48134 . -48800) (TITANLEGALTOMCODE 48802 . 49478))))) + (FILEMAP (NIL (8469 9236 (DISPLAYENCODINGFN 8479 . 9234)) (9270 24259 (MCCSCODEMAPARRAY 9280 . 13848) +(MCCSMAPFN 13850 . 15217) (MCCSMAPPAIRS 15219 . 22320) (XCCS.CS0.UNDEFINED 22322 . 23455) ( +XCCSUNDEFINEDPAIRS 23457 . 24257)) (43248 49616 (GACHATOMCODE 43258 . 43903) (SYMBOLTOMCODE 43905 . +44573) (SIGMATOMCODE 44575 . 45241) (ATOMCODE 45243 . 45795) (MATHTOMCODE 45797 . 46470) (HIPPOTOMCODE + 46472 . 47029) (CYRILLICTOMCODE 47031 . 47485) (PALATINOTOMCODE 47487 . 48268) (TITANTOMCODE 48270 . +48936) (TITANLEGALTOMCODE 48938 . 49614))))) STOP diff --git a/sources/MCCSFONTS.LCOM b/sources/MCCSFONTS.LCOM index ca8a2a6c4dc0899fa192b623741a1d474bb4044b..eca7a60eddc27a5b4bb13db24f8eb8e9f9854c97 100644 GIT binary patch delta 554 zcmZ{g!Asmg6voL~D-J9uNHN)69V6J}uxmEi-Pow$Y%*$Wl99|L>Y)dz?V$%LR1fVx zQI~gD@hnKmrFYL>JqUu})qg>7778n9Z@=$*%s1bA7lrarC`Vr>uv6bS+^^e~-NClw zH65?j>ix1**ThK2_F&kwJZHgc+r7*8>2tr)Xy|xv_u$Lk>kmHYCNfsTi25ldf(BTB z?Mqlv@Q91sw$*CFXGO32K3`>t;697FiM`E~<{`^?J&+kNr?|yX>F>MwbsFVVgg(I? z6B`5Nno^1|raWaaNw6Og&O;w+VtQCk3%(*#SkqITd`7$u3P>N5P!h9S&m zOD2N-tP2|&RuFvCTqx%V&b1k-uCzrMt(cOI^A-3}nUd72(D8m>Y=lWDa*|3y@R)Cn zk$`n6--){{>Ni7>RQVXmNg~!r8qmHc%|BI9?lSgKHvZ=r+ffM{uv?py@jq(`+;8{k zt`@=ij;5euZR)0N4fcL<1@yl&!1bgflfH`vEU2!eYcUTeYFpA`)`Yj3q~a_qzj*=* CDUmh+ delta 403 zcmZXOO-lk%6o$D9k{1F$LL4XbHk)P&M`v`@rXr?s!~r$Y>!^zsk+znIFe;)&+tAJ~ z+C;0`w3tn;{S$$-YFp4hs7srIcF%b^=Q;1YiymDx+Jie38K20UCJ`(sxuh}JPpWA( zM-)X@R&-4pPZrny=CUjcq_=a>@BKee(|S51NLVb{70YZ`2DOTCi}F6ADFrnLyGZaF zv8eI7@@hS_S-;Jbw$;)ia_vj8#d6qCzEww&{G5^(FB~* zlwU1KOtVBV#5ft=Xlf?=lZY73I0?*F7G60&!f@W&_KB4`Wt(JwTdl|pcSXZ8nM>GQ=PG&Tvc^Gmj=7M{!@4*rTVw>(q>&yEM6FzOs From 7ee6c72fa3f74eb28da4ab2cba75e41d87e34e61 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Thu, 4 Jun 2026 09:13:41 -0700 Subject: [PATCH 3/7] Better to do a family coercion for helvetica before a size conversion helvetica 6 --- sources/MCCSFONTS | 22 +++++++++++----------- sources/MCCSFONTS.LCOM | Bin 23020 -> 23032 bytes 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/sources/MCCSFONTS b/sources/MCCSFONTS index 56ec76b42..f2de49271 100644 --- a/sources/MCCSFONTS +++ b/sources/MCCSFONTS @@ -1,6 +1,6 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) -(FILECREATED " 3-Jun-2026 23:13:44" {MEDLEY}MCCSFONTS.;147 52041 +(FILECREATED " 4-Jun-2026 09:12:05" {MEDLEY}MCCSFONTS.;148 52051 :EDIT-BY rmk @@ -43,9 +43,9 @@ CYRILLICTOMCODE PALATINOTOMCODE TITANTOMCODE TITANLEGALTOMCODE)) [INITVARS [DISPLAYFONTCOERCIONS '(((HELVETICA (<= * 2)) (HELVETICA 4)) - ((HELVETICA 6) - (HELVETICA 7)) (TIMESROMAN CLASSIC) + (HELVETICA MODERN) + (GACHA TERMINAL) ((MODERN (<= 15 * 16)) (* 14)) ((MODERN (<= 17 * 21)) @@ -1181,9 +1181,9 @@ (RPAQ? DISPLAYFONTCOERCIONS '(((HELVETICA (<= * 2)) (HELVETICA 4)) - ((HELVETICA 6) - (HELVETICA 7)) (TIMESROMAN CLASSIC) + (HELVETICA MODERN) + (GACHA TERMINAL) ((MODERN (<= 15 * 16)) (* 14)) ((MODERN (<= 17 * 21)) @@ -1276,10 +1276,10 @@ (OLDENGLISH . OE) (SYMBOL . SY))) (DECLARE%: DONTCOPY - (FILEMAP (NIL (8469 9236 (DISPLAYENCODINGFN 8479 . 9234)) (9270 24259 (MCCSCODEMAPARRAY 9280 . 13848) -(MCCSMAPFN 13850 . 15217) (MCCSMAPPAIRS 15219 . 22320) (XCCS.CS0.UNDEFINED 22322 . 23455) ( -XCCSUNDEFINEDPAIRS 23457 . 24257)) (43248 49616 (GACHATOMCODE 43258 . 43903) (SYMBOLTOMCODE 43905 . -44573) (SIGMATOMCODE 44575 . 45241) (ATOMCODE 45243 . 45795) (MATHTOMCODE 45797 . 46470) (HIPPOTOMCODE - 46472 . 47029) (CYRILLICTOMCODE 47031 . 47485) (PALATINOTOMCODE 47487 . 48268) (TITANTOMCODE 48270 . -48936) (TITANLEGALTOMCODE 48938 . 49614))))) + (FILEMAP (NIL (8474 9241 (DISPLAYENCODINGFN 8484 . 9239)) (9275 24264 (MCCSCODEMAPARRAY 9285 . 13853) +(MCCSMAPFN 13855 . 15222) (MCCSMAPPAIRS 15224 . 22325) (XCCS.CS0.UNDEFINED 22327 . 23460) ( +XCCSUNDEFINEDPAIRS 23462 . 24262)) (43253 49621 (GACHATOMCODE 43263 . 43908) (SYMBOLTOMCODE 43910 . +44578) (SIGMATOMCODE 44580 . 45246) (ATOMCODE 45248 . 45800) (MATHTOMCODE 45802 . 46475) (HIPPOTOMCODE + 46477 . 47034) (CYRILLICTOMCODE 47036 . 47490) (PALATINOTOMCODE 47492 . 48273) (TITANTOMCODE 48275 . +48941) (TITANLEGALTOMCODE 48943 . 49619))))) STOP diff --git a/sources/MCCSFONTS.LCOM b/sources/MCCSFONTS.LCOM index eca7a60eddc27a5b4bb13db24f8eb8e9f9854c97..107639efddb37634c6f086db20d04807b10a5db9 100644 GIT binary patch delta 234 zcmaE}neoSF#tG@dCc0jwdAddhMrH~ImR5#FRtBaMs|=VdG$%2NO+18EezFat0-J?` zsgZ%{<|Ia4@yS!AH2B;dojn{CLR^D Date: Thu, 4 Jun 2026 14:16:08 -0700 Subject: [PATCH 4/7] IMPORTFONTS.TEDIT--fixed a typo and formatting error --- library/IMPORTFONTS.TEDIT | Bin 10124 -> 10125 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/library/IMPORTFONTS.TEDIT b/library/IMPORTFONTS.TEDIT index 59b6c0480f5c66b0b06dc59e81011addaf943e97..cfe7fdd92eb18efc73c6f64552b247eb6b09b378 100644 GIT binary patch delta 33 pcmeD2@Aco%z`>Zmxq(Ajicw_q5~aH=+^_Y+7#Jkd8Fp3e0sz6t3oifw delta 31 ncmeD6@A2Qzz_GcJLs^PZc=J-FyDZ#?G87mXB+?jmRqX-*ubK*( From 5be67558ed57040bd0dca0682b0655dfdaf77d7f Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Sun, 7 Jun 2026 11:27:16 -0700 Subject: [PATCH 5/7] Add a coercion for TERMINAL --- sources/MCCSFONTS | 18 ++++++++++-------- sources/MCCSFONTS.LCOM | Bin 23032 -> 23068 bytes 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/sources/MCCSFONTS b/sources/MCCSFONTS index f2de49271..ea4765661 100644 --- a/sources/MCCSFONTS +++ b/sources/MCCSFONTS @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) -(FILECREATED " 4-Jun-2026 09:12:05" {MEDLEY}MCCSFONTS.;148 52051 +(FILECREATED " 7-Jun-2026 11:23:02" {MEDLEY}MCCSFONTS.;149 52144 :EDIT-BY rmk :CHANGES-TO (VARS MCCSFONTSCOMS) - :PREVIOUS-DATE "17-Apr-2026 08:58:07" {MEDLEY}MCCSFONTS.;145) + :PREVIOUS-DATE " 4-Jun-2026 09:12:05" {MEDLEY}MCCSFONTS.;148) (PRETTYCOMPRINT MCCSFONTSCOMS) @@ -45,6 +45,7 @@ (HELVETICA 4)) (TIMESROMAN CLASSIC) (HELVETICA MODERN) + (TERMINAL MODERN) (GACHA TERMINAL) ((MODERN (<= 15 * 16)) (* 14)) @@ -1183,6 +1184,7 @@ (HELVETICA 4)) (TIMESROMAN CLASSIC) (HELVETICA MODERN) + (TERMINAL MODERN) (GACHA TERMINAL) ((MODERN (<= 15 * 16)) (* 14)) @@ -1276,10 +1278,10 @@ (OLDENGLISH . OE) (SYMBOL . SY))) (DECLARE%: DONTCOPY - (FILEMAP (NIL (8474 9241 (DISPLAYENCODINGFN 8484 . 9239)) (9275 24264 (MCCSCODEMAPARRAY 9285 . 13853) -(MCCSMAPFN 13855 . 15222) (MCCSMAPPAIRS 15224 . 22325) (XCCS.CS0.UNDEFINED 22327 . 23460) ( -XCCSUNDEFINEDPAIRS 23462 . 24262)) (43253 49621 (GACHATOMCODE 43263 . 43908) (SYMBOLTOMCODE 43910 . -44578) (SIGMATOMCODE 44580 . 45246) (ATOMCODE 45248 . 45800) (MATHTOMCODE 45802 . 46475) (HIPPOTOMCODE - 46477 . 47034) (CYRILLICTOMCODE 47036 . 47490) (PALATINOTOMCODE 47492 . 48273) (TITANTOMCODE 48275 . -48941) (TITANLEGALTOMCODE 48943 . 49619))))) + (FILEMAP (NIL (8540 9307 (DISPLAYENCODINGFN 8550 . 9305)) (9341 24330 (MCCSCODEMAPARRAY 9351 . 13919) +(MCCSMAPFN 13921 . 15288) (MCCSMAPPAIRS 15290 . 22391) (XCCS.CS0.UNDEFINED 22393 . 23526) ( +XCCSUNDEFINEDPAIRS 23528 . 24328)) (43319 49687 (GACHATOMCODE 43329 . 43974) (SYMBOLTOMCODE 43976 . +44644) (SIGMATOMCODE 44646 . 45312) (ATOMCODE 45314 . 45866) (MATHTOMCODE 45868 . 46541) (HIPPOTOMCODE + 46543 . 47100) (CYRILLICTOMCODE 47102 . 47556) (PALATINOTOMCODE 47558 . 48339) (TITANTOMCODE 48341 . +49007) (TITANLEGALTOMCODE 49009 . 49685))))) STOP diff --git a/sources/MCCSFONTS.LCOM b/sources/MCCSFONTS.LCOM index 107639efddb37634c6f086db20d04807b10a5db9..6611986dd16c209da91df8174b1621fb82ce502c 100644 GIT binary patch delta 299 zcmeydnQ_h*#tG@d=DJ>`dAddhMrI0zhE_(#Rt82Bs|+M9H5Is&6ikpLjjfE$tV|3h z9@bzqnfOM+0#nXHNs~*%&C|!#Imp#9#MMPXNdb%LlWiCk*ew-IjSNjpCMPpGOx9pD z-F$=bzS!ifFrmp2A+n5IlS@O4Cv!*|16g-Mj3(zv8uM`lIQlq-c>4J(09~drdA(!= zP;y16(PS$r6Cg`8%zN@W2~Lm^KweFl$7DHaNg(T9nCIk1X;~&Nh0P13cUVBJa0JTy pln9ypE<_N>ikI}C>>nxsWbKy>o4gIoS`aEW*+xoc^Uu)#%m61lRd4_R delta 300 zcmbQUh4IH`#tG?@moSP>tkILS&{W`3QZUl>D$Ub1GB7ezFf_0-wy-ians``)(P-iu z2_;N9OC?P%4L468SLYyC#}HSS$qO0H*%VBT3``9tCo?*T7@F%k78F5@GXR=pVP#-G z*@jVp(RA|-#`|KEPfEy6o*5#<$Tj(=M98F25F Date: Mon, 8 Jun 2026 12:14:07 -0700 Subject: [PATCH 6/7] Moved the font cache variables from MEDLEY-INIT-VARS to \SYSTEMCACHEVARS --- sources/FONT | 96 ++++++++++++++++++++-------------------------- sources/FONT.LCOM | Bin 66719 -> 66439 bytes 2 files changed, 42 insertions(+), 54 deletions(-) diff --git a/sources/FONT b/sources/FONT index daf79afb5..4a57be87d 100644 --- a/sources/FONT +++ b/sources/FONT @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) -(FILECREATED " 3-Jun-2026 19:52:29" {MEDLEY}FONT.;798 261125 +(FILECREATED " 8-Jun-2026 12:10:14" {MEDLEY}FONT.;799 260541 :EDIT-BY rmk - :CHANGES-TO (FNS \SEARCHFONTFILES) + :CHANGES-TO (VARS FONTCOMS) - :PREVIOUS-DATE " 5-May-2026 09:56:41" {MEDLEY}FONT.;797) + :PREVIOUS-DATE " 3-Jun-2026 19:52:29" {MEDLEY}FONT.;798) (PRETTYCOMPRINT FONTCOMS) @@ -54,11 +54,7 @@ (FNS FONTSAVAILABLE FONTEXISTS? \SEARCHFONTFILES FLUSHFONTCACHE FINDFONTFILES SORTFONTSPECS) (FNS MATCHFONTFACE MAKEFONTFACE FONTFACETOATOM FONTFACE.STARS) (INITVARS \FONTSINCORE \FONTEXISTS?-CACHE \FONTSAVAILABLEFILECACHE \DEFAULTDEVICEFONTS) - - (* ;; "The INITVARS value of MEDLEY-INIT-VARS in MEDLEY dalso includes these entries. That's because FONT is in the INIT, so these entries would be lost when MEDLEY-INIT-VARS is reinitialized when the Lisp loadup starts") - - (ADDVARS (MEDLEY-INIT-VARS (\FONTEXISTS?-CACHE NIL RESET) - (\FONTSAVAILABLEFILECACHE NIL RESET))) + (ADDVARS (\SYSTEMCACHEVARS \FONTEXISTS?-CACHE \FONTSAVAILABLEFILECACHE)) [COMS (GLOBALVARS \DEFAULTDEVICEFONTS \UNITWIDTHSVECTOR) (INITVARS \UNITWIDTHSVECTOR) (FNS \UNITWIDTHSVECTOR) @@ -3076,15 +3072,7 @@ (RPAQ? \DEFAULTDEVICEFONTS NIL) - - -(* ;; -"The INITVARS value of MEDLEY-INIT-VARS in MEDLEY dalso includes these entries. That's because FONT is in the INIT, so these entries would be lost when MEDLEY-INIT-VARS is reinitialized when the Lisp loadup starts" -) - - -(ADDTOVAR MEDLEY-INIT-VARS (\FONTEXISTS?-CACHE NIL RESET) - (\FONTSAVAILABLEFILECACHE NIL RESET)) +(ADDTOVAR \SYSTEMCACHEVARS \FONTEXISTS?-CACHE \FONTSAVAILABLEFILECACHE) (DECLARE%: DOEVAL@COMPILE DONTCOPY (GLOBALVARS \DEFAULTDEVICEFONTS \UNITWIDTHSVECTOR) @@ -4128,41 +4116,41 @@ (ADDTOVAR LAMA FONTCOPY FONTDEVICEPROP) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (6609 16276 (CHARWIDTH 6619 . 7408) (CHARWIDTHY 7410 . 8927) (STRINGWIDTH 8929 . 9966) ( -\CHARWIDTH.DISPLAY 9968 . 10383) (\STRINGWIDTH.DISPLAY 10385 . 10813) (\STRINGWIDTH.GENERIC 10815 . -16274)) (16277 22909 (DEFAULTFONT 16287 . 17572) (FONTCLASS 17574 . 19846) (FONTCLASSUNPARSE 19848 . -20749) (FONTCLASSCOMPONENT 20751 . 21339) (SETFONTCLASSCOMPONENT 21341 . 21783) (GETFONTCLASSCOMPONENT - 21785 . 22907)) (24357 44259 (FONTCREATE 24367 . 27612) (FONTCREATE1 27614 . 30273) ( -FONTCREATE.SLUGFD 30275 . 32839) (\FONT.CHECKARGS1 32841 . 37546) (\FONTCREATE1.NOFN 37548 . 37762) ( -FONTFILEP 37764 . 38652) (\READCHARSET 38654 . 43839) (FONTCHARSETS 43841 . 44257)) (44260 51336 ( -\FONT.CHECKARGS 44270 . 51019) (\CHARSET.CHECK 51021 . 51334)) (51337 57697 (COERCEFONTSPEC 51347 . -57008) (COERCEFONTSPEC.TARGETFACE 57010 . 57695)) (59892 63310 (MAKEFONTSPEC 59902 . 61555) ( -FONTSPEC.TO.FONTDESCRIPTOR 61557 . 63308)) (63311 72973 (COMPLETE.FONT 63321 . 65346) (COMPLETEFONTP -65348 . 66086) (COMPLETE.CHARSET 66088 . 70154) (PRUNESLUGCSINFOS 70156 . 71467) (MONOSPACEFONTP 71469 - . 72971)) (73012 82826 (FONTASCENT 73022 . 73406) (FONTDESCENT 73408 . 73893) (FONTHEIGHT 73895 . -74297) (FONTPROP 74299 . 82103) (\AVGCHARWIDTH 82105 . 82824)) (83574 85444 (FONTDEVICEPROP 83584 . -85442)) (85561 86415 (EDITCHAR 85571 . 86413)) (86461 98651 (GETCHARBITMAP 86471 . 87595) ( -PUTCHARBITMAP 87597 . 89755) (\GETCHARBITMAP.CSINFO 89757 . 91773) (\PUTCHARBITMAP.CSINFO 91775 . -98649)) (98652 120993 (MOVECHARBITMAP 98662 . 100556) (MOVEFONTCHARS 100558 . 105708) (\MOVEFONTCHAR -105710 . 110582) (\MOVEFONTCHARS.SOURCEDATA 110584 . 117339) (\MAKESLUGCHAR 117341 . 119876) ( -SLUGCHARP 119878 . 120991)) (121908 135162 (FONTFILES 121918 . 124957) (\FINDFONTFILE 124959 . 126936) - (\FONTFILENAMES 126938 . 127498) (\FONTFILENAME 127500 . 130610) (FONTSPECFROMFILENAME 130612 . -135160)) (135163 171496 (FONTCOPY 135173 . 140256) (FONTP 140258 . 140557) (FONTUNPARSE 140559 . -142282) (SETFONTDESCRIPTOR 142284 . 143748) (\STREAMCHARWIDTH 143750 . 147761) (\COERCECHARSET 147763 - . 151152) (\BUILDSLUGCSINFO 151154 . 154847) (\FONTSYMBOL 154849 . 155503) (\DEVICESYMBOL 155505 . -156289) (\FONTFACE 156291 . 163495) (\FONTFACE.COLOR 163497 . 170279) (SETFONTCHARENCODING 170281 . -171494)) (171497 192694 (FONTSAVAILABLE 171507 . 176871) (FONTEXISTS? 176873 . 180681) ( -\SEARCHFONTFILES 180683 . 184236) (FLUSHFONTCACHE 184238 . 186769) (FINDFONTFILES 186771 . 189987) ( -SORTFONTSPECS 189989 . 192692)) (192695 198233 (MATCHFONTFACE 192705 . 193780) (MAKEFONTFACE 193782 . -194816) (FONTFACETOATOM 194818 . 197068) (FONTFACE.STARS 197070 . 198231)) (198864 199356 ( -\UNITWIDTHSVECTOR 198874 . 199354)) (216277 218344 (FONTDESCRIPTOR.DEFPRINT 216287 . 217866) ( -FONTCLASS.DEFPRINT 217868 . 218342)) (222266 225056 (\CREATEKERNELEMENT 222276 . 222634) ( -\FSETLEFTKERN 222636 . 223127) (\FGETLEFTKERN 223129 . 225054)) (225057 236211 (\CREATEFONT 225067 . -228675) (\CREATECHARSET 228677 . 231962) (\INSTALLCHARSETINFO 231964 . 235298) ( -\INSTALLCHARSETINFO.CHARENCODING 235300 . 236209)) (236533 237901 (\FONTRESETCHARWIDTHS 236543 . -237899)) (238424 246583 (\CREATEDISPLAYFONT 238434 . 240642) (\CREATECHARSET.DISPLAY 240644 . 244168) -(\FONTEXISTS?.DISPLAY 244170 . 246581)) (246584 254962 (FAKEFACE.CHARSET 246594 . 250656) ( -MAKEBOLD.CHAR 250658 . 252511) (MAKEITALIC.CHAR 252513 . 254960)) (254993 259248 (\SFROTATECSINFO -255003 . 257145) (\SFROTATEFONTCHARACTERS 257147 . 257531) (\SFROTATECSINFOOFFSETS 257533 . 259246)) ( -259249 260423 (\SFMAKECOLOR 259259 . 260421))))) + (FILEMAP (NIL (6309 15976 (CHARWIDTH 6319 . 7108) (CHARWIDTHY 7110 . 8627) (STRINGWIDTH 8629 . 9666) ( +\CHARWIDTH.DISPLAY 9668 . 10083) (\STRINGWIDTH.DISPLAY 10085 . 10513) (\STRINGWIDTH.GENERIC 10515 . +15974)) (15977 22609 (DEFAULTFONT 15987 . 17272) (FONTCLASS 17274 . 19546) (FONTCLASSUNPARSE 19548 . +20449) (FONTCLASSCOMPONENT 20451 . 21039) (SETFONTCLASSCOMPONENT 21041 . 21483) (GETFONTCLASSCOMPONENT + 21485 . 22607)) (24057 43959 (FONTCREATE 24067 . 27312) (FONTCREATE1 27314 . 29973) ( +FONTCREATE.SLUGFD 29975 . 32539) (\FONT.CHECKARGS1 32541 . 37246) (\FONTCREATE1.NOFN 37248 . 37462) ( +FONTFILEP 37464 . 38352) (\READCHARSET 38354 . 43539) (FONTCHARSETS 43541 . 43957)) (43960 51036 ( +\FONT.CHECKARGS 43970 . 50719) (\CHARSET.CHECK 50721 . 51034)) (51037 57397 (COERCEFONTSPEC 51047 . +56708) (COERCEFONTSPEC.TARGETFACE 56710 . 57395)) (59592 63010 (MAKEFONTSPEC 59602 . 61255) ( +FONTSPEC.TO.FONTDESCRIPTOR 61257 . 63008)) (63011 72673 (COMPLETE.FONT 63021 . 65046) (COMPLETEFONTP +65048 . 65786) (COMPLETE.CHARSET 65788 . 69854) (PRUNESLUGCSINFOS 69856 . 71167) (MONOSPACEFONTP 71169 + . 72671)) (72712 82526 (FONTASCENT 72722 . 73106) (FONTDESCENT 73108 . 73593) (FONTHEIGHT 73595 . +73997) (FONTPROP 73999 . 81803) (\AVGCHARWIDTH 81805 . 82524)) (83274 85144 (FONTDEVICEPROP 83284 . +85142)) (85261 86115 (EDITCHAR 85271 . 86113)) (86161 98351 (GETCHARBITMAP 86171 . 87295) ( +PUTCHARBITMAP 87297 . 89455) (\GETCHARBITMAP.CSINFO 89457 . 91473) (\PUTCHARBITMAP.CSINFO 91475 . +98349)) (98352 120693 (MOVECHARBITMAP 98362 . 100256) (MOVEFONTCHARS 100258 . 105408) (\MOVEFONTCHAR +105410 . 110282) (\MOVEFONTCHARS.SOURCEDATA 110284 . 117039) (\MAKESLUGCHAR 117041 . 119576) ( +SLUGCHARP 119578 . 120691)) (121608 134862 (FONTFILES 121618 . 124657) (\FINDFONTFILE 124659 . 126636) + (\FONTFILENAMES 126638 . 127198) (\FONTFILENAME 127200 . 130310) (FONTSPECFROMFILENAME 130312 . +134860)) (134863 171196 (FONTCOPY 134873 . 139956) (FONTP 139958 . 140257) (FONTUNPARSE 140259 . +141982) (SETFONTDESCRIPTOR 141984 . 143448) (\STREAMCHARWIDTH 143450 . 147461) (\COERCECHARSET 147463 + . 150852) (\BUILDSLUGCSINFO 150854 . 154547) (\FONTSYMBOL 154549 . 155203) (\DEVICESYMBOL 155205 . +155989) (\FONTFACE 155991 . 163195) (\FONTFACE.COLOR 163197 . 169979) (SETFONTCHARENCODING 169981 . +171194)) (171197 192394 (FONTSAVAILABLE 171207 . 176571) (FONTEXISTS? 176573 . 180381) ( +\SEARCHFONTFILES 180383 . 183936) (FLUSHFONTCACHE 183938 . 186469) (FINDFONTFILES 186471 . 189687) ( +SORTFONTSPECS 189689 . 192392)) (192395 197933 (MATCHFONTFACE 192405 . 193480) (MAKEFONTFACE 193482 . +194516) (FONTFACETOATOM 194518 . 196768) (FONTFACE.STARS 196770 . 197931)) (198280 198772 ( +\UNITWIDTHSVECTOR 198290 . 198770)) (215693 217760 (FONTDESCRIPTOR.DEFPRINT 215703 . 217282) ( +FONTCLASS.DEFPRINT 217284 . 217758)) (221682 224472 (\CREATEKERNELEMENT 221692 . 222050) ( +\FSETLEFTKERN 222052 . 222543) (\FGETLEFTKERN 222545 . 224470)) (224473 235627 (\CREATEFONT 224483 . +228091) (\CREATECHARSET 228093 . 231378) (\INSTALLCHARSETINFO 231380 . 234714) ( +\INSTALLCHARSETINFO.CHARENCODING 234716 . 235625)) (235949 237317 (\FONTRESETCHARWIDTHS 235959 . +237315)) (237840 245999 (\CREATEDISPLAYFONT 237850 . 240058) (\CREATECHARSET.DISPLAY 240060 . 243584) +(\FONTEXISTS?.DISPLAY 243586 . 245997)) (246000 254378 (FAKEFACE.CHARSET 246010 . 250072) ( +MAKEBOLD.CHAR 250074 . 251927) (MAKEITALIC.CHAR 251929 . 254376)) (254409 258664 (\SFROTATECSINFO +254419 . 256561) (\SFROTATEFONTCHARACTERS 256563 . 256947) (\SFROTATECSINFOOFFSETS 256949 . 258662)) ( +258665 259839 (\SFMAKECOLOR 258675 . 259837))))) STOP diff --git a/sources/FONT.LCOM b/sources/FONT.LCOM index bad150f02c84e0fd9dee2ae455b3351188d01f2a..38a4a9b7da5b7a8cd31fa67756472945f1685fca 100644 GIT binary patch delta 461 zcmZvYze@sP7{@V=lK0dEtrRidgupBA(DMg+A#&Zlmsj2o?mdmbB~aX&YKeBKrQ})K zqJJUhh+2a7nq3+rXljb?tii$UdA{Ed&zJ9WbIuF~%vC>D;df7tcrhoIabA@2IVoQp zo^B?p9M0h4lvj`nWvQ4O-ly#;SrCK_?j9cZx-;=ghC^9RZxY2JvP)DCnw58v3RbaL z&XtOJFaoL7w(L-hG|O}q%b*;VY=^XUt3`R$y8`imIC=>57Lu~6PS9+J9#EGUimWt< zufRCSGaQGr&_~=DN#O=1w!#c&p`dHDD{4s#!C@EI1oEge~bQp94BUmRyQ@D?6jM!ue-GaAOBjuNBS Hw-^2wU`c-8 delta 810 zcmah{PiqrF6em!vnIx#R+LjV||w$YpKDW?@N6cGqGN zdb0?EmbnUk0}tlnr57)P2XB4^uO9pYI=ihj(1N$e@6UU`_h$C@XFj~1dABvUB0PwP zf>;xqP;W^MQ4(7RyEhkCD^LP)imOR0tDHVKEJ{;wwOTDf--~GfOnIwRL1j%hu;O6Z z#VUK15obYc*6U(}nVIFbW)VO=f@MePXtw1hT2cY2>);LDUMGUeZM=0uFufN?DQi4s zQ@UMe?=#DpJCn~DI=goR+HF83cR)e6baz8`2t4LN6Cojll<|kh7*8IA zBk+ftLENVyL<1U9pu=eF)36HQ4!r1k2v6yz7jq&B2!6=*i87sZ3%EbpoA$xZC=UAE z1i>hbU}r%8jhl`T!kGF)Kk~i6-{sd!Wl2}V54X9~>&M#=M&39IOQ-^6Syj{QkP!;f|1l6!(8D;*4$Zh(UccDa@Py0CQd1gLNbv90WV_9Z)iE`0!AS?n^JXCKdJ znSeSA$)++u25Szo$Ycr Date: Mon, 8 Jun 2026 12:16:28 -0700 Subject: [PATCH 7/7] Deleted the font cache vars from MEDLEY-INIT-VARS --- sources/MEDLEYDIR | 18 +++++++----------- sources/MEDLEYDIR.LCOM | Bin 6759 -> 6611 bytes 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/sources/MEDLEYDIR b/sources/MEDLEYDIR index 78e8cfa23..8de0fc304 100644 --- a/sources/MEDLEYDIR +++ b/sources/MEDLEYDIR @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "25-May-2026 10:56:39" {MEDLEY}MEDLEYDIR.;64 16063 +(FILECREATED " 8-Jun-2026 12:15:34" {MEDLEY}MEDLEYDIR.;65 15831 :EDIT-BY rmk - :CHANGES-TO (FNS MEDLEY-INIT-VARS) + :CHANGES-TO (VARS MEDLEYDIRCOMS) - :PREVIOUS-DATE "23-May-2026 22:51:27" {MEDLEY}MEDLEYDIR.;63) + :PREVIOUS-DATE "25-May-2026 10:56:39" {MEDLEY}MEDLEYDIR.;64) (PRETTYCOMPRINT MEDLEYDIRCOMS) @@ -32,9 +32,7 @@ (* ;; "The INITVARS prevents this from accumulating entries from other files that happen to have been loaded when this is worked on and saved. The loadup scripts set MEDLEY-INIT-VARS to NOBIND to make sure that these are the initial values (as opposed to whatever there was in the startup sysout.") - [INITVARS (MEDLEY-INIT-VARS '((\FONTEXISTS?-CACHE NIL RESET) - (\FONTSAVAILABLEFILECACHE NIL RESET) - [LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" + [INITVARS (MEDLEY-INIT-VARS '([LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" "internal" "greetfiles" "doctools"] @@ -262,9 +260,7 @@ (RPAQ? MEDLEY-INIT-VARS - '((\FONTEXISTS?-CACHE NIL RESET) - (\FONTSAVAILABLEFILECACHE NIL RESET) - [LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" "internal" "greetfiles" "doctools"] + '([LISPUSERSDIRECTORIES (MEDLEYDIR '("library" "lispusers" "internal" "greetfiles" "doctools"] [LISPSOURCEDIRECTORIES (MEDLEYDIR '("sources"] (LISPSOURCEDIRECTORY (CAR LISPSOURCEDIRECTORIES)) (IRM.HOST&DIR (MEDLEYDIR '"docs/dinfo")) @@ -289,6 +285,6 @@ (ADDTOVAR GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS \SAVE.MEDLEYDIR DIRECTORIES SYSOUTCOMMITS) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4215 13792 (MEDLEY-INIT-VARS 4225 . 8202) (MEDLEYDIR 8204 . 12592) (MEDLEYSUBSTDIR -12594 . 13572) (SET-SYSOUT-COMMIT 13574 . 13790))))) + (FILEMAP (NIL (4069 13646 (MEDLEY-INIT-VARS 4079 . 8056) (MEDLEYDIR 8058 . 12446) (MEDLEYSUBSTDIR +12448 . 13426) (SET-SYSOUT-COMMIT 13428 . 13644))))) STOP diff --git a/sources/MEDLEYDIR.LCOM b/sources/MEDLEYDIR.LCOM index b3a80a81c98d1ca8a4698324277ddff386fb49bd..04dd400de0a3b40afe4125813901d4fdeb811d68 100644 GIT binary patch delta 445 zcmaEEa@lx7xQK#@foYWMB)QWfyjw&E$h$46!=$M&SxgjUjI5OF<_V%Qj5M{c2LOU5dTjsz delta 621 zcmbu4&uY|A6vl~&l`E)o6I+WF55Y=8dxy-;OdPLZ$s~8og-lYCbabH5zatbKEmIeY zplf%v$BplxAQXIr?p%q_(2Y;v%4?}s(4D*Qob#QJ-}l8oZ0_E}J!A6Ch`nmMKy2=@ z-r94A6TUCFZ^Qa{xbbAPz4d6g3BzaG7$i+Ee|g!~ZyVw}jUgyk)z@>8eylX9^isGR9paScXR61wIHF>+sG1#-oQI zq9n}j%92$%INhuye-XGK77N)|`BKSZodq`cPe?cyt%l$?ao)IQ`1=RO;e~j)n`f20 zuga=iU{M$)5;B!SAxl}g;2fRHupg>4?4