From c56ae1af186cc2553295d6a6dcf242bbd687712f Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Mon, 27 Apr 2026 23:21:18 -0700 Subject: [PATCH] Include DISPLAYFONTDIRECTORIES for now --- sources/MEDLEYDIR | 36 ++++++++++++++++-------------------- sources/MEDLEYDIR.LCOM | Bin 6994 -> 6665 bytes 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/sources/MEDLEYDIR b/sources/MEDLEYDIR index 17a9ad86..c5ab914b 100644 --- a/sources/MEDLEYDIR +++ b/sources/MEDLEYDIR @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "26-Apr-2026 13:55:08" {MEDLEY}MEDLEYDIR.;6 16425 +(FILECREATED "26-Apr-2026 20:46:52" {WMEDLEY}MEDLEYDIR.;61 15717 :EDIT-BY rmk :CHANGES-TO (VARS MEDLEYDIRCOMS) - :PREVIOUS-DATE "26-Apr-2026 13:44:54" {MEDLEY}MEDLEYDIR.;5) + :PREVIOUS-DATE "26-Apr-2026 14:56:00" {WMEDLEY}MEDLEYDIR.;60) (PRETTYCOMPRINT MEDLEYDIRCOMS) @@ -15,22 +15,22 @@ [ (* ;; "set up initialization for file paths relative to where Medley is installed. This assumes that the environment variable MEDLEYDIR is set (usually by the ./run-medley script) to the (unix path) and all of the other directories variables are set relative to that (by MEDLEY-INIT-VARS)") - - (* ;; "PSEUDOHOSTS comes before MEDLEYDIR in the loadup.") - (FNS MEDLEY-INIT-VARS MEDLEYDIR MEDLEYSUBSTDIR SET-SYSOUT-COMMIT) [INITVARS (MEDLEYDIR (MEDLEYDIR)) (\SAVE.MEDLEYDIR) (SYSOUTCOMMITS (OR (AND (BOUNDP 'SYSOUTCOMMITS) SYSOUTCOMMITS) (LIST (LIST 'MEDLEY NIL] + + (* ;; "PSEUDOHOSTS comes before MEDLEYDIR in the loadup.") + (P (PSEUDOHOST 'MEDLEY MEDLEYDIR)) (ADDVARS (AROUNDEXITFNS MEDLEY-INIT-VARS)) (* ;; "**WARNING** The EVALed expressions get run early in the lodup.") - (* ;; "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. But the FONT cache variables have to be specified here, because FONT is in the INIT and the resetting to NOBIND would wipe out these entries even if they were already correct in the init sysout.") + (* ;; "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) @@ -58,10 +58,7 @@ (XCL::*WHERE-IS-CASH-FILES* (MEDLEYDIR '("loadups") "whereis.hash" NIL T)) (LOADUPSDIRECTORIES (MEDLEYDIR '("loadups") - NIL NIL T)) - (DISPLAYFONTDIRECTORIES (LIST - "{MEDLEY}/fonts/medleydisplayfonts/" - ] + NIL NIL T] (DECLARE%: EVAL@COMPILE DOCOPY (ADDVARS (GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS \SAVE.MEDLEYDIR DIRECTORIES SYSOUTCOMMITS]) @@ -71,11 +68,6 @@ "set up initialization for file paths relative to where Medley is installed. This assumes that the environment variable MEDLEYDIR is set (usually by the ./run-medley script) to the (unix path) and all of the other directories variables are set relative to that (by MEDLEY-INIT-VARS)" ) - - - -(* ;; "PSEUDOHOSTS comes before MEDLEYDIR in the loadup.") - (DEFINEQ (MEDLEY-INIT-VARS @@ -244,6 +236,11 @@ SYSOUTCOMMITS) (LIST (LIST 'MEDLEY NIL)))) + + +(* ;; "PSEUDOHOSTS comes before MEDLEYDIR in the loadup.") + + (PSEUDOHOST 'MEDLEY MEDLEYDIR) (ADDTOVAR AROUNDEXITFNS MEDLEY-INIT-VARS) @@ -256,7 +253,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. But the FONT cache variables have to be specified here, because FONT is in the INIT and the resetting to NOBIND would wipe out these entries even if they were already correct in the init sysout." +"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." ) @@ -282,13 +279,12 @@ (XCL::*WHERE-IS-CASH-FILES* (MEDLEYDIR '("loadups") "whereis.hash" NIL T)) (LOADUPSDIRECTORIES (MEDLEYDIR '("loadups") - NIL NIL T)) - (DISPLAYFONTDIRECTORIES (LIST "{MEDLEY}/fonts/medleydisplayfonts/")))) + NIL NIL T)))) (DECLARE%: EVAL@COMPILE DOCOPY (ADDTOVAR GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS \SAVE.MEDLEYDIR DIRECTORIES SYSOUTCOMMITS) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (4716 13947 (MEDLEY-INIT-VARS 4726 . 8357) (MEDLEYDIR 8359 . 12747) (MEDLEYSUBSTDIR -12749 . 13727) (SET-SYSOUT-COMMIT 13729 . 13945))))) + (FILEMAP (NIL (4215 13446 (MEDLEY-INIT-VARS 4225 . 7856) (MEDLEYDIR 7858 . 12246) (MEDLEYSUBSTDIR +12248 . 13226) (SET-SYSOUT-COMMIT 13228 . 13444))))) STOP diff --git a/sources/MEDLEYDIR.LCOM b/sources/MEDLEYDIR.LCOM index b838ece5a1efd660116f35f7811c2a602a9e67fc..6c08ba810aa69229dcc14c081fe53d719af0940a 100644 GIT binary patch delta 265 zcmca))@d>!S;ok~%EZjd)JRD|Ln%2ww;(eoHANvmPeDncI(%ZCjHIEa0+*7JnXY3& zk*<+}k(q*_iIu6Dm9hE6O}++TrirPNCYOerr;n?1kgH>etBV4PdV~dF1KAA~3{A}q z%_j#iO0#l>IR*t!E@0H<2AgDH0JW9TVDn+dCZ5R+eDaeQ@VPK@O@6|sG`UU8S&S<% z)IY>k!PnKr$2C$@!Ozo269^_d@!1IkC};!(yN0^>d-w;3C}?m^ek&%ixr=`x+ z$BUHi5UR;3SiKjv|J)6gC;;iTJqTNj3QCJ(bj#2i=dNHZzY8C3GG*flJ8a(*TI_Ax zVPD!JS3laly_c_o$b}=<>AOQ2e6KIB9!SR^wb<{i`^$@sPr`eE?vw%@BRmWI2$DGA zau!!4KFP3#aXdqy1)Lz%B_?Dhm1cv@fjNDU-kV?5uBAkNeEr@|U3CHb2b z!wb6OD|h%?NAj8^Ui%y|&RS%q=BfTXA@Oz6KHk`ua= zZ=GK`