\SEARCHFONTFILES shouldn't return a NIL entry for a non-font file (like Mac .DS_Store)

2026-03-10 21:03:22 +00:00 · 2026-03-04 00:19:49 -08:00
parent fe57f79496
commit d324300cf6
2 changed files with 46 additions and 48 deletions
--- a/sources/FONT
+++ b/sources/FONT
@@ -1,15 +1,12 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8)

-(FILECREATED " 2-Mar-2026 13:14:53" {WMEDLEY}<sources>FONT.;685 279368 
+(FILECREATED " 4-Mar-2026 00:16:13" {WMEDLEY}<sources>FONT.;686 279360 

      :EDIT-BY rmk

-      :CHANGES-TO (FNS FONTDEVICEPROP MOVEFONTCHARS)
-                  (VARS FONTCOMS)
-                  (PROPS (FONTDEVICEPROP ARGNAMES))
-                  (RECORDS FONTSPEC)
+      :CHANGES-TO (FNS \SEARCHFONTFILES)

-      :PREVIOUS-DATE "26-Feb-2026 17:01:47" {WMEDLEY}<sources>FONT.;677)
+      :PREVIOUS-DATE " 2-Mar-2026 13:14:53" {WMEDLEY}<sources>FONT.;685)


 (PRETTYCOMPRINT FONTCOMS)
@@ -2752,7 +2749,8 @@
                       NIL])

 (\SEARCHFONTFILES
-  [LAMBDA (FONTSPEC)                                         (* ; "Edited 28-Aug-2025 14:47 by rmk")
+  [LAMBDA (FONTSPEC)                                         (* ; "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")
                                                             (* ; "Edited 21-Jul-2025 08:57 by rmk")
@@ -2786,8 +2784,8 @@

                                                                     (* ;; 
                                                 "make sure the face, size, and family really match.")
- when (AND (OR (EQ FAMILY '*)
-               (EQ FAMILY (fetch (FONTSPEC FSFAMILY) of THISFONT)))
+ when (AND THISFONT (OR (EQ FAMILY '*)
+                        (EQ FAMILY (fetch (FONTSPEC FSFAMILY) of THISFONT)))
           (OR (EQ SIZE '*)
               (EQ SIZE (fetch (FONTSPEC FSSIZE) of THISFONT)))
           (MATCHFONTFACE FACE (fetch (FONTSPEC FSFACE) of THISFONT))) unless (MEMBER THISFONT 
@@ -4519,43 +4517,43 @@
 (ADDTOVAR LAMA FONTCOPY FONTDEVICEPROP)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (11711 21378 (CHARWIDTH 11721 . 12510) (CHARWIDTHY 12512 . 14029) (STRINGWIDTH 14031 . 
-15068) (\CHARWIDTH.DISPLAY 15070 . 15485) (\STRINGWIDTH.DISPLAY 15487 . 15915) (\STRINGWIDTH.GENERIC 
-15917 . 21376)) (21379 28011 (DEFAULTFONT 21389 . 22674) (FONTCLASS 22676 . 24948) (FONTCLASSUNPARSE 
-24950 . 25851) (FONTCLASSCOMPONENT 25853 . 26441) (SETFONTCLASSCOMPONENT 26443 . 26885) (
-GETFONTCLASSCOMPONENT 26887 . 28009)) (29724 47764 (FONTCREATE 29734 . 32979) (FONTCREATE1 32981 . 
-35596) (FONTCREATE.SLUGFD 35598 . 37102) (\FONT.CHECKARGS1 37104 . 41809) (\FONTCREATE1.NOFN 41811 . 
-42025) (FONTFILEP 42027 . 42915) (\READCHARSET 42917 . 47762)) (47765 54841 (\FONT.CHECKARGS 47775 . 
-54524) (\CHARSET.CHECK 54526 . 54839)) (54842 61453 (COERCEFONTSPEC 54852 . 60764) (
-COERCEFONTSPEC.TARGETFACE 60766 . 61451)) (63648 64997 (MAKEFONTSPEC 63658 . 64995)) (64998 73175 (
-COMPLETE.FONT 65008 . 67531) (COMPLETEFONTP 67533 . 68156) (COMPLETE.CHARSET 68158 . 70843) (
-PRUNESLUGCSINFOS 70845 . 71770) (MONOSPACEFONTP 71772 . 73173)) (73214 81672 (FONTASCENT 73224 . 73608
-) (FONTDESCENT 73610 . 74095) (FONTHEIGHT 74097 . 74499) (FONTPROP 74501 . 80949) (\AVGCHARWIDTH 80951
- . 81670)) (82329 83762 (FONTDEVICEPROP 82339 . 83760)) (83879 84733 (EDITCHAR 83889 . 84731)) (84779 
-96969 (GETCHARBITMAP 84789 . 85913) (PUTCHARBITMAP 85915 . 88073) (\GETCHARBITMAP.CSINFO 88075 . 90091
-) (\PUTCHARBITMAP.CSINFO 90093 . 96967)) (96970 118609 (MOVECHARBITMAP 96980 . 98874) (MOVEFONTCHARS 
-98876 . 103981) (\MOVEFONTCHAR 103983 . 108830) (\MOVEFONTCHARS.SOURCEDATA 108832 . 114947) (
-\MAKESLUGCHAR 114949 . 117484) (SLUGCHARP.DISPLAY 117486 . 118607)) (119267 131116 (FONTFILES 119277
- . 121110) (\FINDFONTFILE 121112 . 123089) (\FONTFILENAMES 123091 . 123651) (\FONTFILENAME 123653 . 
-126564) (FONTSPECFROMFILENAME 126566 . 131114)) (131117 167366 (FONTCOPY 131127 . 136210) (FONTP 
-136212 . 136511) (FONTUNPARSE 136513 . 138236) (SETFONTDESCRIPTOR 138238 . 139702) (\STREAMCHARWIDTH 
-139704 . 143715) (\COERCECHARSET 143717 . 147084) (\BUILDSLUGCSINFO 147086 . 150717) (\FONTSYMBOL 
-150719 . 151373) (\DEVICESYMBOL 151375 . 152159) (\FONTFACE 152161 . 159365) (\FONTFACE.COLOR 159367
- . 166149) (SETFONTCHARENCODING 166151 . 167364)) (167367 187044 (FONTSAVAILABLE 167377 . 172741) (
-FONTEXISTS? 172743 . 176284) (\SEARCHFONTFILES 176286 . 179373) (FLUSHFONTCACHE 179375 . 181598) (
-FINDFONTFILES 181600 . 184816) (SORTFONTSPECS 184818 . 187042)) (187045 191160 (MATCHFONTFACE 187055
- . 187870) (MAKEFONTFACE 187872 . 188906) (FONTFACETOATOM 188908 . 191158)) (191791 192283 (
-\UNITWIDTHSVECTOR 191801 . 192281)) (207037 209104 (FONTDESCRIPTOR.DEFPRINT 207047 . 208626) (
-FONTCLASS.DEFPRINT 208628 . 209102)) (212933 215723 (\CREATEKERNELEMENT 212943 . 213301) (
-\FSETLEFTKERN 213303 . 213794) (\FGETLEFTKERN 213796 . 215721)) (215724 227390 (\CREATEFONT 215734 . 
-218630) (\CREATECHARSET 218632 . 223141) (\INSTALLCHARSETINFO 223143 . 226477) (
-\INSTALLCHARSETINFO.CHARENCODING 226479 . 227388)) (227712 229080 (\FONTRESETCHARWIDTHS 227722 . 
-229078)) (229710 239787 (\CREATEDISPLAYFONT 229720 . 231587) (\CREATECHARSET.DISPLAY 231589 . 237304) 
-(\FONTEXISTS?.DISPLAY 237306 . 239785)) (239788 254793 (STRIKEFONT.FILEP 239798 . 240686) (
-STRIKEFONT.GETCHARSET 240688 . 246282) (WRITESTRIKEFONTFILE 246284 . 251197) (STRIKECSINFO 251199 . 
-254791)) (254824 271157 (MAKEBOLD.CHARSET 254834 . 258489) (MAKEBOLD.CHAR 258491 . 260243) (
-MAKEITALIC.CHARSET 260245 . 263924) (MAKEITALIC.CHAR 263926 . 266272) (\SFMAKEBOLD 266274 . 268500) (
-\SFMAKEITALIC 268502 . 271155)) (271158 275182 (\SFMAKEROTATEDFONT 271168 . 272402) (\SFROTATECSINFO 
-272404 . 273079) (\SFROTATEFONTCHARACTERS 273081 . 273465) (\SFROTATECSINFOOFFSETS 273467 . 275180)) (
-275183 276357 (\SFMAKECOLOR 275193 . 276355)))))
+  (FILEMAP (NIL (11576 21243 (CHARWIDTH 11586 . 12375) (CHARWIDTHY 12377 . 13894) (STRINGWIDTH 13896 . 
+14933) (\CHARWIDTH.DISPLAY 14935 . 15350) (\STRINGWIDTH.DISPLAY 15352 . 15780) (\STRINGWIDTH.GENERIC 
+15782 . 21241)) (21244 27876 (DEFAULTFONT 21254 . 22539) (FONTCLASS 22541 . 24813) (FONTCLASSUNPARSE 
+24815 . 25716) (FONTCLASSCOMPONENT 25718 . 26306) (SETFONTCLASSCOMPONENT 26308 . 26750) (
+GETFONTCLASSCOMPONENT 26752 . 27874)) (29589 47629 (FONTCREATE 29599 . 32844) (FONTCREATE1 32846 . 
+35461) (FONTCREATE.SLUGFD 35463 . 36967) (\FONT.CHECKARGS1 36969 . 41674) (\FONTCREATE1.NOFN 41676 . 
+41890) (FONTFILEP 41892 . 42780) (\READCHARSET 42782 . 47627)) (47630 54706 (\FONT.CHECKARGS 47640 . 
+54389) (\CHARSET.CHECK 54391 . 54704)) (54707 61318 (COERCEFONTSPEC 54717 . 60629) (
+COERCEFONTSPEC.TARGETFACE 60631 . 61316)) (63513 64862 (MAKEFONTSPEC 63523 . 64860)) (64863 73040 (
+COMPLETE.FONT 64873 . 67396) (COMPLETEFONTP 67398 . 68021) (COMPLETE.CHARSET 68023 . 70708) (
+PRUNESLUGCSINFOS 70710 . 71635) (MONOSPACEFONTP 71637 . 73038)) (73079 81537 (FONTASCENT 73089 . 73473
+) (FONTDESCENT 73475 . 73960) (FONTHEIGHT 73962 . 74364) (FONTPROP 74366 . 80814) (\AVGCHARWIDTH 80816
+ . 81535)) (82194 83627 (FONTDEVICEPROP 82204 . 83625)) (83744 84598 (EDITCHAR 83754 . 84596)) (84644 
+96834 (GETCHARBITMAP 84654 . 85778) (PUTCHARBITMAP 85780 . 87938) (\GETCHARBITMAP.CSINFO 87940 . 89956
+) (\PUTCHARBITMAP.CSINFO 89958 . 96832)) (96835 118474 (MOVECHARBITMAP 96845 . 98739) (MOVEFONTCHARS 
+98741 . 103846) (\MOVEFONTCHAR 103848 . 108695) (\MOVEFONTCHARS.SOURCEDATA 108697 . 114812) (
+\MAKESLUGCHAR 114814 . 117349) (SLUGCHARP.DISPLAY 117351 . 118472)) (119132 130981 (FONTFILES 119142
+ . 120975) (\FINDFONTFILE 120977 . 122954) (\FONTFILENAMES 122956 . 123516) (\FONTFILENAME 123518 . 
+126429) (FONTSPECFROMFILENAME 126431 . 130979)) (130982 167231 (FONTCOPY 130992 . 136075) (FONTP 
+136077 . 136376) (FONTUNPARSE 136378 . 138101) (SETFONTDESCRIPTOR 138103 . 139567) (\STREAMCHARWIDTH 
+139569 . 143580) (\COERCECHARSET 143582 . 146949) (\BUILDSLUGCSINFO 146951 . 150582) (\FONTSYMBOL 
+150584 . 151238) (\DEVICESYMBOL 151240 . 152024) (\FONTFACE 152026 . 159230) (\FONTFACE.COLOR 159232
+ . 166014) (SETFONTCHARENCODING 166016 . 167229)) (167232 187036 (FONTSAVAILABLE 167242 . 172606) (
+FONTEXISTS? 172608 . 176149) (\SEARCHFONTFILES 176151 . 179365) (FLUSHFONTCACHE 179367 . 181590) (
+FINDFONTFILES 181592 . 184808) (SORTFONTSPECS 184810 . 187034)) (187037 191152 (MATCHFONTFACE 187047
+ . 187862) (MAKEFONTFACE 187864 . 188898) (FONTFACETOATOM 188900 . 191150)) (191783 192275 (
+\UNITWIDTHSVECTOR 191793 . 192273)) (207029 209096 (FONTDESCRIPTOR.DEFPRINT 207039 . 208618) (
+FONTCLASS.DEFPRINT 208620 . 209094)) (212925 215715 (\CREATEKERNELEMENT 212935 . 213293) (
+\FSETLEFTKERN 213295 . 213786) (\FGETLEFTKERN 213788 . 215713)) (215716 227382 (\CREATEFONT 215726 . 
+218622) (\CREATECHARSET 218624 . 223133) (\INSTALLCHARSETINFO 223135 . 226469) (
+\INSTALLCHARSETINFO.CHARENCODING 226471 . 227380)) (227704 229072 (\FONTRESETCHARWIDTHS 227714 . 
+229070)) (229702 239779 (\CREATEDISPLAYFONT 229712 . 231579) (\CREATECHARSET.DISPLAY 231581 . 237296) 
+(\FONTEXISTS?.DISPLAY 237298 . 239777)) (239780 254785 (STRIKEFONT.FILEP 239790 . 240678) (
+STRIKEFONT.GETCHARSET 240680 . 246274) (WRITESTRIKEFONTFILE 246276 . 251189) (STRIKECSINFO 251191 . 
+254783)) (254816 271149 (MAKEBOLD.CHARSET 254826 . 258481) (MAKEBOLD.CHAR 258483 . 260235) (
+MAKEITALIC.CHARSET 260237 . 263916) (MAKEITALIC.CHAR 263918 . 266264) (\SFMAKEBOLD 266266 . 268492) (
+\SFMAKEITALIC 268494 . 271147)) (271150 275174 (\SFMAKEROTATEDFONT 271160 . 272394) (\SFROTATECSINFO 
+272396 . 273071) (\SFROTATEFONTCHARACTERS 273073 . 273457) (\SFROTATECSINFOOFFSETS 273459 . 275172)) (
+275175 276349 (\SFMAKECOLOR 275185 . 276347)))))
 STOP
--- a/sources/FONT.LCOM
+++ b/sources/FONT.LCOM