github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-01-13 15:37:38 +00:00
Code Issues Projects Releases Wiki Activity

FONT: eliminate hyphen INFILEPs for font lookup

Browse Source
This commit is contained in:
rmkaplan 2025-12-04 00:58:25 -08:00
parent ba8d9b4461
commit fb561889b7
2 changed files with 67 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
sources/FONT
View File

@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "29-Nov-2025 16:32:59" {WMEDLEY}<sources>FONT.;638 280293
(FILECREATED " 3-Dec-2025 23:42:55" {WMEDLEY}<sources>FONT.;640 281223
:EDIT-BY rmk
:CHANGES-TO (VARS FONTCOMS)
:CHANGES-TO (FNS \FINDFONTFILE)
:PREVIOUS-DATE "28-Nov-2025 14:28:16" {WMEDLEY}<sources>FONT.;637)
:PREVIOUS-DATE " 2-Dec-2025 16:01:58" {WMEDLEY}<sources>FONT.;639)
(PRETTYCOMPRINT FONTCOMS)
@ -1143,7 +1143,8 @@
(fetch (FONTDESCRIPTOR \SFHeight) of (FONTCREATE FONTSPEC])
(FONTPROP
[LAMBDA (FONT PROP) (* ; "Edited 2-Sep-2025 22:21 by rmk")
[LAMBDA (FONT PROP) (* ; "Edited 2-Dec-2025 16:01 by rmk")
(* ; "Edited 2-Sep-2025 22:21 by rmk")
(* ; "Edited 12-Aug-2025 21:10 by rmk")
(* ; "Edited 10-Aug-2025 13:28 by rmk")
(* ; "Edited 23-Jul-2025 17:01 by rmk")
@ -1178,6 +1179,9 @@
elseif (MEMB (fetch (FONTDESCRIPTOR FONTFAMILY) of FONT)
ALTOFONTFAMILIES)
then 'ALTOTEXT
elseif (MEMB (fetch (FONTDESCRIPTOR FONTFAMILY) of FONT)
MCCSFONTFAMILIES)
then 'MCCS
else (fetch (FONTDESCRIPTOR FONTFAMILY) of FONT])
(SPEC (create FONTSPEC
FSFAMILY _ (ffetch FONTFAMILY of FONT)
@ -1813,24 +1817,34 @@
(\FINDFONTFILE
[LAMBDA (FAMILY SIZE FACE ROTATION DEVICE CHARSET DIRLST EXTLST)
(* ; "Edited 3-Dec-2025 23:38 by rmk")
(* ; "Edited 9-Jun-2025 09:40 by rmk")
(* ; "Edited 15-May-2025 22:41 by rmk")
(* ; "Edited 14-Sep-96 10:53 by rmk:")
(* ; "Edited 6-Oct-89 11:18 by bvm")
(* ;; "This doesn't call FINDFILE because the hyphens separating the family from the face would get confused with the hyphen in TEDIT-STREAM file names.")
(CL:UNLESS DIRLST
(SETQ DIRLST (CONS NIL)))
(* ;; "Find any font file on any directory with any naming convention with any extension. Note that ROTATION and DEVICE are just place holders. DEVICE is irrelevant because DIRLST already incorporates the device information. The variable *OLD-FONT-EXTENSIONS* can be set to suppress using the old-style lookup. If set to a list of extensions, just those will be looked up with old-style conventions.")
(for EXT FONTFILE inside EXTLST
when (SETQ FONTFILE (FINDFILE (if (FMEMB EXT *OLD-FONT-EXTENSIONS*)
then (\FONTFILENAME.OLD FAMILY SIZE FACE EXT CHARSET)
else (\FONTFILENAME FAMILY SIZE FACE EXT CHARSET))
T DIRLST)) collect FONTFILE finally
(for EXT FONTFILE inside EXTLST join (SETQ FONTFILE (if (FMEMB EXT *OLD-FONT-EXTENSIONS*)
then (\FONTFILENAME.OLD FAMILY SIZE FACE
EXT CHARSET)
else (\FONTFILENAME FAMILY SIZE FACE EXT
CHARSET)))
(for DIR FOUND inside DIRLST
when (SETQ FOUND (INFILEP (PACKFILENAME.STRING
'DIRECTORY DIR 'BODY FONTFILE)
)) collect FOUND)
finally
(* ;;
 "Backward compatibility for devices that expect a single file")
(* ;; "Backward compatibility for devices that expect a single file")
(CL:UNLESS (CDR $$VAL)
(RETURN (CAR $$VAL)))])
(CL:UNLESS (CDR $$VAL)
(RETURN (CAR $$VAL)))])
(\FONTFILENAMES
[LAMBDA (FAMILY SIZE FACE DEVICE EXTENSIONS) (* ; "Edited 7-Oct-2025 12:21 by rmk")
@ -4583,44 +4597,44 @@
(ADDTOVAR LAMA FONTCOPY)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (12144 21857 (CHARWIDTH 12154 . 12939) (CHARWIDTHY 12941 . 14458) (STRINGWIDTH 14460 .
15553) (\CHARWIDTH.DISPLAY 15555 . 15968) (\STRINGWIDTH.DISPLAY 15970 . 16394) (\STRINGWIDTH.GENERIC
16396 . 21855)) (21858 28378 (DEFAULTFONT 21868 . 23153) (FONTCLASS 23155 . 25317) (FONTCLASSUNPARSE
25319 . 26218) (FONTCLASSCOMPONENT 26220 . 26808) (SETFONTCLASSCOMPONENT 26810 . 27252) (
GETFONTCLASSCOMPONENT 27254 . 28376)) (30091 47595 (FONTCREATE 30101 . 33346) (FONTCREATE1 33348 .
35963) (FONTCREATE.SLUGFD 35965 . 37447) (\FONT.CHECKARGS1 37449 . 41972) (\FONTCREATE1.NOFN 41974 .
42188) (FONTFILEP 42190 . 43078) (\READCHARSET 43080 . 47593)) (47596 54672 (\FONT.CHECKARGS 47606 .
54355) (\CHARSET.CHECK 54357 . 54670)) (54673 57933 (COERCEFONTSPEC 54683 . 57931)) (60003 61342 (
MAKEFONTSPEC 60013 . 61340)) (61343 69520 (COMPLETE.FONT 61353 . 63876) (COMPLETEFONTP 63878 . 64501)
(COMPLETE.CHARSET 64503 . 67188) (PRUNESLUGCSINFOS 67190 . 68115) (MONOSPACEFONTP 68117 . 69518)) (
69559 77480 (FONTASCENT 69569 . 69953) (FONTDESCENT 69955 . 70440) (FONTHEIGHT 70442 . 70844) (
FONTPROP 70846 . 76757) (\AVGCHARWIDTH 76759 . 77478)) (78137 79045 (FONTDEVICEPROP 78147 . 79043)) (
79091 79945 (EDITCHAR 79101 . 79943)) (79991 92181 (GETCHARBITMAP 80001 . 81125) (PUTCHARBITMAP 81127
. 83285) (\GETCHARBITMAP.CSINFO 83287 . 85303) (\PUTCHARBITMAP.CSINFO 85305 . 92179)) (92182 112662 (
MOVECHARBITMAP 92192 . 94086) (MOVEFONTCHARS 94088 . 98048) (\MOVEFONTCHAR 98050 . 102893) (
\MOVEFONTCHARS.SOURCEDATA 102895 . 109000) (\MAKESLUGCHAR 109002 . 111537) (SLUGCHARP.DISPLAY 111539
. 112660)) (113595 134168 (FONTFILES 113605 . 115438) (\FINDFONTFILE 115440 . 117157) (\FONTFILENAMES
117159 . 118154) (\FONTFILENAME 118156 . 122139) (\FONTFILENAME.OLD 122141 . 125090) (
\FONTFILENAME.NEW 125092 . 127349) (FONTSPECFROMFILENAME 127351 . 131887) (\FONTINFOFROMFILENAME.OLD
131889 . 134166)) (134435 170238 (FONTCOPY 134445 . 139508) (FONTP 139510 . 139809) (FONTUNPARSE
139811 . 141530) (SETFONTDESCRIPTOR 141532 . 142996) (\STREAMCHARWIDTH 142998 . 147162) (
\COERCECHARSET 147164 . 149759) (\BUILDSLUGCSINFO 149761 . 153384) (\FONTSYMBOL 153386 . 154036) (
\DEVICESYMBOL 154038 . 154907) (\FONTFACE 154909 . 162099) (\FONTFACE.COLOR 162101 . 169021) (
SETFONTCHARENCODING 169023 . 170236)) (170239 190538 (FONTSAVAILABLE 170249 . 175603) (FONTEXISTS?
175605 . 179583) (\SEARCHFONTFILES 179585 . 182670) (FLUSHFONTCACHE 182672 . 184895) (FLUSHFONTSINCORE
184897 . 185094) (FINDFONTFILES 185096 . 188310) (SORTFONTSPECS 188312 . 190536)) (190539 194148 (
MATCHFONTFACE 190549 . 191364) (MAKEFONTFACE 191366 . 192392) (FONTFACETOATOM 192394 . 194146)) (
194779 195271 (\UNITWIDTHSVECTOR 194789 . 195269)) (209865 211932 (FONTDESCRIPTOR.DEFPRINT 209875 .
211454) (FONTCLASS.DEFPRINT 211456 . 211930)) (215761 218551 (\CREATEKERNELEMENT 215771 . 216129) (
\FSETLEFTKERN 216131 . 216622) (\FGETLEFTKERN 216624 . 218549)) (218552 228188 (\CREATEFONT 218562 .
220001) (\CREATECHARSET 220003 . 223939) (\INSTALLCHARSETINFO 223941 . 227275) (
\INSTALLCHARSETINFO.CHARENCODING 227277 . 228186)) (228510 229874 (\FONTRESETCHARWIDTHS 228520 .
229872)) (230504 240551 (\CREATEDISPLAYFONT 230514 . 232363) (\CREATECHARSET.DISPLAY 232365 . 238074)
(\FONTEXISTS?.DISPLAY 238076 . 240549)) (240552 255417 (STRIKEFONT.FILEP 240562 . 241450) (
STRIKEFONT.GETCHARSET 241452 . 247044) (WRITESTRIKEFONTFILE 247046 . 251957) (STRIKECSINFO 251959 .
255415)) (255448 271765 (MAKEBOLD.CHARSET 255458 . 259107) (MAKEBOLD.CHAR 259109 . 260861) (
MAKEITALIC.CHARSET 260863 . 264536) (MAKEITALIC.CHAR 264538 . 266884) (\SFMAKEBOLD 266886 . 269110) (
\SFMAKEITALIC 269112 . 271763)) (271766 275915 (\SFMAKEROTATEDFONT 271776 . 273177) (\SFROTATECSINFO
273179 . 273816) (\SFROTATEFONTCHARACTERS 273818 . 274198) (\SFROTATECSINFOOFFSETS 274200 . 275913)) (
275916 277297 (\SFMAKECOLOR 275926 . 277295)))))
(FILEMAP (NIL (12148 21861 (CHARWIDTH 12158 . 12943) (CHARWIDTHY 12945 . 14462) (STRINGWIDTH 14464 .
15557) (\CHARWIDTH.DISPLAY 15559 . 15972) (\STRINGWIDTH.DISPLAY 15974 . 16398) (\STRINGWIDTH.GENERIC
16400 . 21859)) (21862 28382 (DEFAULTFONT 21872 . 23157) (FONTCLASS 23159 . 25321) (FONTCLASSUNPARSE
25323 . 26222) (FONTCLASSCOMPONENT 26224 . 26812) (SETFONTCLASSCOMPONENT 26814 . 27256) (
GETFONTCLASSCOMPONENT 27258 . 28380)) (30095 47599 (FONTCREATE 30105 . 33350) (FONTCREATE1 33352 .
35967) (FONTCREATE.SLUGFD 35969 . 37451) (\FONT.CHECKARGS1 37453 . 41976) (\FONTCREATE1.NOFN 41978 .
42192) (FONTFILEP 42194 . 43082) (\READCHARSET 43084 . 47597)) (47600 54676 (\FONT.CHECKARGS 47610 .
54359) (\CHARSET.CHECK 54361 . 54674)) (54677 57937 (COERCEFONTSPEC 54687 . 57935)) (60007 61346 (
MAKEFONTSPEC 60017 . 61344)) (61347 69524 (COMPLETE.FONT 61357 . 63880) (COMPLETEFONTP 63882 . 64505)
(COMPLETE.CHARSET 64507 . 67192) (PRUNESLUGCSINFOS 67194 . 68119) (MONOSPACEFONTP 68121 . 69522)) (
69563 77818 (FONTASCENT 69573 . 69957) (FONTDESCENT 69959 . 70444) (FONTHEIGHT 70446 . 70848) (
FONTPROP 70850 . 77095) (\AVGCHARWIDTH 77097 . 77816)) (78475 79383 (FONTDEVICEPROP 78485 . 79381)) (
79429 80283 (EDITCHAR 79439 . 80281)) (80329 92519 (GETCHARBITMAP 80339 . 81463) (PUTCHARBITMAP 81465
. 83623) (\GETCHARBITMAP.CSINFO 83625 . 85641) (\PUTCHARBITMAP.CSINFO 85643 . 92517)) (92520 113000 (
MOVECHARBITMAP 92530 . 94424) (MOVEFONTCHARS 94426 . 98386) (\MOVEFONTCHAR 98388 . 103231) (
\MOVEFONTCHARS.SOURCEDATA 103233 . 109338) (\MAKESLUGCHAR 109340 . 111875) (SLUGCHARP.DISPLAY 111877
. 112998)) (113933 135098 (FONTFILES 113943 . 115776) (\FINDFONTFILE 115778 . 118087) (\FONTFILENAMES
118089 . 119084) (\FONTFILENAME 119086 . 123069) (\FONTFILENAME.OLD 123071 . 126020) (
\FONTFILENAME.NEW 126022 . 128279) (FONTSPECFROMFILENAME 128281 . 132817) (\FONTINFOFROMFILENAME.OLD
132819 . 135096)) (135365 171168 (FONTCOPY 135375 . 140438) (FONTP 140440 . 140739) (FONTUNPARSE
140741 . 142460) (SETFONTDESCRIPTOR 142462 . 143926) (\STREAMCHARWIDTH 143928 . 148092) (
\COERCECHARSET 148094 . 150689) (\BUILDSLUGCSINFO 150691 . 154314) (\FONTSYMBOL 154316 . 154966) (
\DEVICESYMBOL 154968 . 155837) (\FONTFACE 155839 . 163029) (\FONTFACE.COLOR 163031 . 169951) (
SETFONTCHARENCODING 169953 . 171166)) (171169 191468 (FONTSAVAILABLE 171179 . 176533) (FONTEXISTS?
176535 . 180513) (\SEARCHFONTFILES 180515 . 183600) (FLUSHFONTCACHE 183602 . 185825) (FLUSHFONTSINCORE
185827 . 186024) (FINDFONTFILES 186026 . 189240) (SORTFONTSPECS 189242 . 191466)) (191469 195078 (
MATCHFONTFACE 191479 . 192294) (MAKEFONTFACE 192296 . 193322) (FONTFACETOATOM 193324 . 195076)) (
195709 196201 (\UNITWIDTHSVECTOR 195719 . 196199)) (210795 212862 (FONTDESCRIPTOR.DEFPRINT 210805 .
212384) (FONTCLASS.DEFPRINT 212386 . 212860)) (216691 219481 (\CREATEKERNELEMENT 216701 . 217059) (
\FSETLEFTKERN 217061 . 217552) (\FGETLEFTKERN 217554 . 219479)) (219482 229118 (\CREATEFONT 219492 .
220931) (\CREATECHARSET 220933 . 224869) (\INSTALLCHARSETINFO 224871 . 228205) (
\INSTALLCHARSETINFO.CHARENCODING 228207 . 229116)) (229440 230804 (\FONTRESETCHARWIDTHS 229450 .
230802)) (231434 241481 (\CREATEDISPLAYFONT 231444 . 233293) (\CREATECHARSET.DISPLAY 233295 . 239004)
(\FONTEXISTS?.DISPLAY 239006 . 241479)) (241482 256347 (STRIKEFONT.FILEP 241492 . 242380) (
STRIKEFONT.GETCHARSET 242382 . 247974) (WRITESTRIKEFONTFILE 247976 . 252887) (STRIKECSINFO 252889 .
256345)) (256378 272695 (MAKEBOLD.CHARSET 256388 . 260037) (MAKEBOLD.CHAR 260039 . 261791) (
MAKEITALIC.CHARSET 261793 . 265466) (MAKEITALIC.CHAR 265468 . 267814) (\SFMAKEBOLD 267816 . 270040) (
\SFMAKEITALIC 270042 . 272693)) (272696 276845 (\SFMAKEROTATEDFONT 272706 . 274107) (\SFROTATECSINFO
274109 . 274746) (\SFROTATEFONTCHARACTERS 274748 . 275128) (\SFROTATECSINFOOFFSETS 275130 . 276843)) (
276846 278227 (\SFMAKECOLOR 276856 . 278225)))))
STOP

BIN
sources/FONT.LCOM
View File

Binary file not shown.