diff --git a/library/IMPORTFONTS.TEDIT b/library/IMPORTFONTS.TEDIT index 59b6c0480..cfe7fdd92 100644 Binary files a/library/IMPORTFONTS.TEDIT and b/library/IMPORTFONTS.TEDIT differ diff --git a/sources/FONT b/sources/FONT index 89c7010cd..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 " 5-May-2026 09:56:41" {MEDLEY}FONT.;797 260815 +(FILECREATED " 8-Jun-2026 12:10:14" {MEDLEY}FONT.;799 260541 :EDIT-BY rmk - :CHANGES-TO (FNS \CREATEDISPLAYFONT FONTSPEC.TO.FONTDESCRIPTOR) + :CHANGES-TO (VARS FONTCOMS) - :PREVIOUS-DATE " 4-May-2026 12:39:02" {MEDLEY}FONT.;796) + :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) @@ -2792,7 +2788,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 +2803,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 +2832,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") @@ -3073,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) @@ -4125,41 +4116,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 (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 a050e71a2..38a4a9b7d 100644 Binary files a/sources/FONT.LCOM and b/sources/FONT.LCOM differ diff --git a/sources/MCCSFONTS b/sources/MCCSFONTS index c95fe4afb..ea4765661 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 " 7-Jun-2026 11:23:02" {MEDLEY}MCCSFONTS.;149 52144 :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 " 4-Jun-2026 09:12:05" {MEDLEY}MCCSFONTS.;148) (PRETTYCOMPRINT MCCSFONTSCOMS) @@ -44,6 +43,10 @@ CYRILLICTOMCODE PALATINOTOMCODE TITANTOMCODE TITANLEGALTOMCODE)) [INITVARS [DISPLAYFONTCOERCIONS '(((HELVETICA (<= * 2)) (HELVETICA 4)) + (TIMESROMAN CLASSIC) + (HELVETICA MODERN) + (TERMINAL MODERN) + (GACHA TERMINAL) ((MODERN (<= 15 * 16)) (* 14)) ((MODERN (<= 17 * 21)) @@ -1179,6 +1182,10 @@ (RPAQ? DISPLAYFONTCOERCIONS '(((HELVETICA (<= * 2)) (HELVETICA 4)) + (TIMESROMAN CLASSIC) + (HELVETICA MODERN) + (TERMINAL MODERN) + (GACHA TERMINAL) ((MODERN (<= 15 * 16)) (* 14)) ((MODERN (<= 17 * 21)) @@ -1271,10 +1278,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 (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 ca8a2a6c4..6611986dd 100644 Binary files a/sources/MCCSFONTS.LCOM and b/sources/MCCSFONTS.LCOM differ 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 b3a80a81c..04dd400de 100644 Binary files a/sources/MEDLEYDIR.LCOM and b/sources/MEDLEYDIR.LCOM differ