From 10c03b0b59c93a1c51802ddb69995b9591a0851a Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Mon, 2 Mar 2026 22:31:08 -0800 Subject: [PATCH] MEDLEYFONTFORMAT--prioritize filename --- sources/MEDLEYFONTFORMAT | 41 +++++++++++++++++++--------------- sources/MEDLEYFONTFORMAT.LCOM | Bin 21290 -> 21342 bytes 2 files changed, 23 insertions(+), 18 deletions(-) diff --git a/sources/MEDLEYFONTFORMAT b/sources/MEDLEYFONTFORMAT index 96f410e0..fa1e6c0c 100644 --- a/sources/MEDLEYFONTFORMAT +++ b/sources/MEDLEYFONTFORMAT @@ -1,12 +1,12 @@ -(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) +(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED "14-Feb-2026 00:39:34" {WMEDLEY}MEDLEYFONTFORMAT.;250 60733 +(FILECREATED " 2-Mar-2026 20:50:00" {WMEDLEY}MEDLEYFONTFORMAT.;251 61187 :EDIT-BY rmk - :CHANGES-TO (FNS MEDLEYFONT.GETCHARSET MEDLEYFONT.READ.CHARSET) + :CHANGES-TO (FNS MEDLEYFONT.READ.FONT MEDLEYFONT.READ.VERIFIEDFONT MEDLEYFONT.FILENAME) - :PREVIOUS-DATE "23-Jan-2026 15:10:16" {WMEDLEY}MEDLEYFONTFORMAT.;249) + :PREVIOUS-DATE "14-Feb-2026 00:39:34" {WMEDLEY}MEDLEYFONTFORMAT.;250) (PRETTYCOMPRINT MEDLEYFONTFORMATCOMS) @@ -280,14 +280,14 @@ (DEFINEQ (MEDLEYFONT.READ.FONT - [LAMBDA (FILE CHARSETNOS FONT) (* ; "Edited 20-Jan-2026 22:31 by rmk") + [LAMBDA (FILE CHARSETNOS FONT) (* ; "Edited 2-Mar-2026 20:40 by rmk") + (* ; "Edited 20-Jan-2026 22:31 by rmk") (* ; "Edited 31-Aug-2025 14:42 by rmk") (* ; "Edited 15-Jul-2025 20:20 by rmk") (* ; "Edited 9-Jul-2025 00:06 by rmk") (* ; "Edited 6-Jul-2025 11:45 by rmk") - (SETQ FONT (CL:IF FONT - (FONTCREATE FONT) - (create FONTDESCRIPTOR))) + (CL:WHEN FONT + (SETQ FONT (FONTCREATE FONT))) (SETQ FILE (MEDLEYFONT.FILENAME FILE FONT)) (SETQ CHARSETNOS (SORT (MKLIST CHARSETNOS))) (CL:WITH-OPEN-FILE (STREAM FILE :DIRECTION :INPUT) @@ -516,13 +516,16 @@ (bind PAIR until [EQ 'STOP (CAR (SETQ PAIR (MEDLEYFONT.READ.ITEM STREAM] collect PAIR]) (MEDLEYFONT.READ.VERIFIEDFONT - [LAMBDA (STREAM FONT) (* ; "Edited 20-Jan-2026 22:31 by rmk") + [LAMBDA (STREAM FONT) (* ; "Edited 2-Mar-2026 20:40 by rmk") + (* ; "Edited 20-Jan-2026 22:31 by rmk") (* ; "Edited 2-Sep-2025 23:52 by rmk") (* ; "Edited 12-Aug-2025 17:57 by rmk") (* ; "Edited 10-Jun-2025 20:57 by rmk") (* ; "Edited 21-May-2025 22:55 by rmk") (* ; "Edited 19-May-2025 17:42 by rmk") (* ; "Edited 16-May-2025 10:28 by rmk") + (CL:UNLESS FONT + (SETQ FONT (create FONTDESCRIPTOR))) (LET ((FONTPROPS (MEDLEYFONT.READ.FONTPROPS STREAM))) (for P VAL in FONTPROPS do (SETQ VAL (CADR P)) (SELECTQ (CAR P) @@ -847,7 +850,9 @@ (DEFINEQ (MEDLEYFONT.FILENAME - [LAMBDA (FILE FONT CHARSET EXTENSION DIRECTORY) (* ; "Edited 23-Jan-2026 15:10 by rmk") + [LAMBDA (FILE FONT CHARSET EXTENSION DIRECTORY) (* ; "Edited 2-Mar-2026 20:41 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") (* ; "Edited 7-Oct-2025 11:50 by rmk") (* ; "Edited 4-Sep-2025 08:48 by rmk") @@ -855,7 +860,7 @@ (* ; "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 (\FONT.CHECKARGS FONT NIL NIL NIL NIL T] + (LET [(FONTSPEC (AND FONT (FONTPROP FONT 'SPEC] (CL:UNLESS EXTENSION (* ;  "EXTENSION may be needed for DIRECTORY below") (SETQ EXTENSION (OR (FILENAMEFIELD FILE 'EXTENSION) @@ -924,11 +929,11 @@ ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2152 16901 (MEDLEYFONT.WRITE.FONT 2162 . 7217) (MEDLEYFONT.GETCHARSET 7219 . 11360) ( -MEDLEYFONT.CHARSET? 11362 . 12831) (MEDLEYFONT.GETFILEPROP 12833 . 14933) (MEDLEYFONT.FILEP 14935 . -16899)) (16927 39618 (MEDLEYFONT.READ.FONT 16937 . 21473) (MEDLEYFONT.READ.CHARSET 21475 . 27190) ( -MEDLEYFONT.READ.ITEM 27192 . 33341) (MEDLEYFONT.PEEK.ITEM 33343 . 34205) (MEDLEYFONT.READ.FONTPROPS -34207 . 34672) (MEDLEYFONT.READ.VERIFIEDFONT 34674 . 39616)) (39644 57481 (MEDLEYFONT.WRITE.CHARSET -39654 . 44216) (MEDLEYFONT.WRITE.ITEM 44218 . 53271) (MEDLEYFONT.WRITE.FONTPROPS 53273 . 56826) ( -MEDLEYFONT.WRITE.HEADER 56828 . 57479)) (57482 59848 (MEDLEYFONT.FILENAME 57492 . 59846))))) + (FILEMAP (NIL (2176 16925 (MEDLEYFONT.WRITE.FONT 2186 . 7241) (MEDLEYFONT.GETCHARSET 7243 . 11384) ( +MEDLEYFONT.CHARSET? 11386 . 12855) (MEDLEYFONT.GETFILEPROP 12857 . 14957) (MEDLEYFONT.FILEP 14959 . +16923)) (16951 39873 (MEDLEYFONT.READ.FONT 16961 . 21550) (MEDLEYFONT.READ.CHARSET 21552 . 27267) ( +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))))) STOP diff --git a/sources/MEDLEYFONTFORMAT.LCOM b/sources/MEDLEYFONTFORMAT.LCOM index 23ade3fcaf0de0b66ba1ff47c56279abe0f00223..a77c344c7468232d6d3d8eafcdf7a8357abc2d82 100644 GIT binary patch delta 2110 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 Q)%0Wkyj(l@+P^dUKZ7