From 7d21d630d6cf4d46977ce055166751b6f1e91cc9 Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Thu, 30 Apr 2026 17:01:43 -0700
Subject: [PATCH] FONTFILENAME take seven

---
 sources/MEDLEYFONTFORMAT      |  20 +++++++++++++-------
 sources/MEDLEYFONTFORMAT.LCOM | Bin 21898 -> 22168 bytes
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/sources/MEDLEYFONTFORMAT b/sources/MEDLEYFONTFORMAT
index e64d6b0b..3a2379c5 100644
--- a/sources/MEDLEYFONTFORMAT
+++ b/sources/MEDLEYFONTFORMAT
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-
(FILECREATED "29-Apr-2026 22:52:28" {MEDLEY}<sources>MEDLEYFONTFORMAT.;311
 64392  
+
(FILECREATED "30-Apr-2026 08:56:22" {MEDLEY}<sources>MEDLEYFONTFORMAT.;312
 64895  
 
       :EDIT-BY rmk
 
       :CHANGES-TO (FNS MEDLEYFONT.FILENAME)
 
-      :PREVIOUS-DATE "17-Apr-2026 09:32:49" {MEDLEY}<sources>MEDLEYFONTFORMAT.;310)
+      :PREVIOUS-DATE "29-Apr-2026 22:52:28" {MEDLEY}<sources>MEDLEYFONTFORMAT.;311)
 
 
 (PRETTYCOMPRINT MEDLEYFONTFORMATCOMS)
@@ -896,15 +896,21 @@
 (DEFINEQ
 
 (MEDLEYFONT.FILENAME

-  [LAMBDA (FILE DIRECTORY)
                                   (* ; "Edited 29-Apr-2026 22:52 by rmk")


+  [LAMBDA (FILE DIRECTORY)
                                   (* ; "Edited 30-Apr-2026 08:54 by rmk")


                                                              (* ; "Edited 15-Apr-2026 00:41 by rmk")


                                                              (* ; "Edited 23-Jan-2026 15:10 by rmk")


                                                              (* ; "Edited  7-Oct-2025 11:50 by rmk")


                                                              (* ; "Edited  4-Sep-2025 08:48 by rmk")


                                                              (* ; "Edited 10-Jun-2025 11:02 by rmk")

-    (CL:IF (type?
 FONTSPEC FILE)
-        (CAR (FONTFILES FILE NIL DIRECTORY))
-        (PACKFILENAME 'BODY FILE 'DIRECTORY DIRECTORY))])
+    (CL:WHEN DIRECTORY                                       (* ; "Keep the host/directory.")

+        (SETQ DIRECTORY (PACKFILENAME 'NAME NIL 'EXTENSION NIL 'VERSION NIL 'BODY DIRECTORY)))
+    (if
 (type?
 FONTSPEC FILE)
+        then
 (SETQ FILE (\FONT.CHECKARGS FILE NIL NIL NIL NIL T))
+             (CL:UNLESS DIRECTORY
+                 [SETQ DIRECTORY (CAR (MKLIST (FONTDEVICEPROP FILE 'FONTDIRECTORIES])
+             (PACKFILENAME 'DIRECTORY DIRECTORY 'BODY (\FONTFILENAME FILE))
+      else
                                                   (* ; "File name")

+           (PACKFILENAME 'BODY FILE 'DIRECTORY DIRECTORY])
 )
 
 (ADDTOVAR DISPLAYFONTEXTENSIONS
 MEDLEYDISPLAYFONT)
@@ -962,5 +968,5 @@ MEDLEYFONT.GETFILEPROP 13811 . 17390) (MEDLEYFONT.FILEP 17392 . 19820) (MEDLEYFO
 MEDLEYFONT.READ.ITEM 29489 . 35638) (MEDLEYFONT.PEEK.ITEM 35640 . 36502) (MEDLEYFONT.READ.FONTPROPS 
 36504 . 36969) (MEDLEYFONT.READ.VERIFIEDFONT 36971 . 43298)) (43326 62676 (MEDLEYFONT.WRITE.CHARSET 
 43336 . 47975) (MEDLEYFONT.WRITE.ITEM 47977 . 57030) (MEDLEYFONT.WRITE.FONTPROPS 57032 . 61801) (
-MEDLEYFONT.WRITE.HEADER 61803 . 62674)) (62677 63507 (MEDLEYFONT.FILENAME 62687 . 63505)))))
+MEDLEYFONT.WRITE.HEADER 61803 . 62674)) (62677 64010 (MEDLEYFONT.FILENAME 62687 . 64008)))))
 STOP
diff --git a/sources/MEDLEYFONTFORMAT.LCOM b/sources/MEDLEYFONTFORMAT.LCOM
index 171ca3ce12596094ccaa977a046ba6b9f77c2ef1..bfd06312614fa3ba7af8a7ccad64bd4cacbfbd04 100644
GIT binary patch
delta 519
zcmZutJxjw-6iuqAO<NEVss-U1hqgi`dC5zf;LvCCs-c?1Bvb__30M(C+@-sdA&VeR
zj^bk79Q+qf{s4c5Nm{7IF86Uh-Z|WR_rgBBviC>JlF%U6Hw`2p1%#%K6&<1IQe8!L
z;CQ5sMI`AG)@3pJSdSlzg}8rMh`x&~7yYd1Q;b;P>s+mE?Nh^}B%mhn)2iYYTb)Os
z$W0B$S1c`0R3aTC9W{C2qT6b`l&=g5xvE`%Vi+bz-ZsvYm+AeRq_mI<XSvT<b+`Lr
z7+#d-GKL|8l`!*jDGq0z!>Ctb6K6(}Y_{^LR!qktQxmZaE-^akCN?>sAj%q?wjDbd
zGf0G#FlpB^sOvc{hyos(wv7HBH9ExG^#LoBNfMgC$+<*Xf*r>^0Z~%Hv^;7Aj+Y=&
w85WEfi~67munAcB<C5j!UxY^)8g!}Wmo3Lm@_-%()b>-LLb}M{-Tj*V1zMSScmMzZ

delta 273
zcmbQSma%I!<AiV#BTHS!f+Afb10yp9BO@zQBP%0|iP`3ohMEdoO30E17FH%8`H8y~
zdE7jGT>Tt<T@^C(6ej+cwZ&9vY-M1mq{*cLQt2Gz>KNkcqJUx?%q}H`$qyLS*c8l6
zj4h2Ow=lYj7@8woWMFA!Y-D9(Ir%Q52D5=C*W|<?(ao|<+J3CA3=9lRlM4fE938oV
zOa?{)1`RV)1vh`c5Rje03PuJB0glezFsB0DVrrtGrC?~H;NltN>Kx)96scgL;N<TT
Kx%p7wH5LH;bwV@%