From fe57f79496bbbeba70a3bd606e25b1aa98a117f5 Mon Sep 17 00:00:00 2001
From: rmkaplan <ron.kaplan@post.harvard.edu>
Date: Mon, 2 Mar 2026 23:02:21 -0800
Subject: [PATCH] Better type check on fontspec

---
 sources/MEDLEYFONTFORMAT      |  12 +++++++-----
 sources/MEDLEYFONTFORMAT.LCOM | Bin 21342 -> 21337 bytes
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/sources/MEDLEYFONTFORMAT b/sources/MEDLEYFONTFORMAT
index fa1e6c0c..7ad51bb6 100644
--- a/sources/MEDLEYFONTFORMAT
+++ b/sources/MEDLEYFONTFORMAT
@@ -1,10 +1,10 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-
(FILECREATED " 2-Mar-2026 20:50:00" {WMEDLEY}<sources>MEDLEYFONTFORMAT.;251
 61187  
+
(FILECREATED " 2-Mar-2026 22:52:59" {WMEDLEY}<sources>MEDLEYFONTFORMAT.;252
 61298  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS MEDLEYFONT.READ.FONT MEDLEYFONT.READ.VERIFIEDFONT MEDLEYFONT.FILENAME)
+      :CHANGES-TO (FNS MEDLEYFONT.FILENAME MEDLEYFONT.READ.FONT MEDLEYFONT.READ.VERIFIEDFONT)
 
       :PREVIOUS-DATE "14-Feb-2026 00:39:34" {WMEDLEY}<sources>MEDLEYFONTFORMAT.;250)
 
@@ -850,7 +850,7 @@
 (DEFINEQ
 
 (MEDLEYFONT.FILENAME

-  [LAMBDA (FILE FONT CHARSET EXTENSION DIRECTORY)
            (* ; "Edited  2-Mar-2026 20:41 by rmk")


+  [LAMBDA (FILE FONT CHARSET EXTENSION DIRECTORY)
            (* ; "Edited  2-Mar-2026 22:45 by rmk")


                                                              (* ; "Edited  1-Mar-2026 01:07 by rmk")


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


                                                              (* ; "Edited 20-Jan-2026 17:39 by rmk")


@@ -860,7 +860,9 @@
                                                              (* ; "Edited 25-May-2025 21:25 by rmk")


                                                              (* ; "Edited 19-May-2025 17:42 by rmk")


                                                              (* ; "Edited 16-May-2025 14:09 by rmk")

-    (LET [(FONTSPEC (AND FONT (FONTPROP FONT 'SPEC]
+    (LET [(FONTSPEC (if
 (type?
 FONTSPEC FONT)
+                        then
 (\FONT.CHECKARGS FONT)
+                      else
 (FONTPROP FONT 'SPEC]
          (CL:UNLESS EXTENSION                                (* ; 
 
                                                        "EXTENSION may be needed for DIRECTORY below")

              (SETQ EXTENSION (OR (FILENAMEFIELD FILE 'EXTENSION)
@@ -935,5 +937,5 @@ MEDLEYFONT.CHARSET? 11386 . 12855) (MEDLEYFONT.GETFILEPROP 12857 . 14957) (MEDLE
 MEDLEYFONT.READ.ITEM 27269 . 33418) (MEDLEYFONT.PEEK.ITEM 33420 . 34282) (MEDLEYFONT.READ.FONTPROPS 
 34284 . 34749) (MEDLEYFONT.READ.VERIFIEDFONT 34751 . 39871)) (39899 57736 (MEDLEYFONT.WRITE.CHARSET 
 39909 . 44471) (MEDLEYFONT.WRITE.ITEM 44473 . 53526) (MEDLEYFONT.WRITE.FONTPROPS 53528 . 57081) (
-MEDLEYFONT.WRITE.HEADER 57083 . 57734)) (57737 60302 (MEDLEYFONT.FILENAME 57747 . 60300)))))
+MEDLEYFONT.WRITE.HEADER 57083 . 57734)) (57737 60413 (MEDLEYFONT.FILENAME 57747 . 60411)))))
 STOP
diff --git a/sources/MEDLEYFONTFORMAT.LCOM b/sources/MEDLEYFONTFORMAT.LCOM
index a77c344c7468232d6d3d8eafcdf7a8357abc2d82..528f74f79aa12f9625b2a420d5252e4e1d6f3e3f 100644
GIT binary patch
delta 455
zcmZ9Iu};G<5QggjDs*B(VnL@&tq`Sln#AdZaoiG`+L4n=RAP)+kYFf#cP6SxOt2u-
zfepGa!Xq%U@C-Zxu24|L$;+MZ`~SQ9nxW4by2-1g<C+&t&nY6)$Dr6m4OA-v<di=}
z)2deqc$fsVctE@B-6$544aD?=%&XS(@y<J{RMuF&^0I|;=ivK}<rZ?_cB5kAniX&H
z(<Ep?!g#+#n`x#a*#k@+;Bki~iI5>+&xa%x!%&rdrbK`%$yo;2B@pj%mI}aa3<D9y
zViZOiu+xST=td$oLfD0&Tr!-9KS$hx)2@<PNdTp#gHJ(dtu(m!pWwp5Fo{+P5b`U~
z<VS+{neL^HS{?fY#7QP(8Yv0pRA43(JX3mPvR1s51|A%$a0G2{i7-H#2yT?jo<7)P
i+brpUeRg?qHQu+u+{s={V1w@z_j22E>HJmBR(}A19d*tC

delta 405
zcmZ8dJxjw-6zvnG+PUZ?95Pize6MM~y2a!bBgsohBDCOUD@Y*~T67ZsLc^QfO9!2#
zi<`f}!NJAR-{I>J5x0BJJs+3*xg=jpG9T7y*PvZW%dt&Zxp3q?cH}GB-#|moNwfTh
ztP{ObNtd+h3?^f?C2z=Kr7qu_s}J&Ww*5?MwJmq}C>P<=hH1+r+U=VRUf6Y$gbN?6
zV<5@+xgYm}kPA2BilXph;kh}OP7xk?Zl+k~AmV<=2Y!$$)JA3K1w8cO=<+Svd$4U>
z^kR`$OPFRAW|-h<8mDMG|Geuk<w?>wIcT()LBabu7g-PsFls?Haxah50UY}eusS%2
z{Q=sYU;U|og)HHo%2C%F(54!g5@=VGVm3Y2)UTke%QP74NwFA?Zm%y#C?+$Ei^*M~
LK{r<`vE2LtYv^s2