From c71684be75a6ffadf89529238aa842db894047b2 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Sat, 11 Apr 2026 10:29:24 -0700 Subject: [PATCH] \CREATEDISPLAYFONT reads all of the properties --- sources/FONT | 88 ++++++++++++++++++++++++---------------------- sources/FONT.LCOM | Bin 65846 -> 65717 bytes 2 files changed, 45 insertions(+), 43 deletions(-) diff --git a/sources/FONT b/sources/FONT index d5ff75d5..0ed9facd 100644 --- a/sources/FONT +++ b/sources/FONT @@ -1,13 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8) -(FILECREATED " 5-Apr-2026 11:55:11" {WMEDLEY}FONT.;779 256335 +(FILECREATED "11-Apr-2026 10:11:29" {WMEDLEY}FONT.;780 256466 :EDIT-BY rmk - :CHANGES-TO (FNS COMPLETE.FONT COMPLETE.CHARSET \CREATECHARSET.DISPLAY \SFROTATECSINFO - FAKEFACE.CHARSET \CREATEFONT FLUSHFONTCACHE) + :CHANGES-TO (FNS \CREATEDISPLAYFONT) - :PREVIOUS-DATE " 4-Apr-2026 18:04:16" {WMEDLEY}FONT.;771) + :PREVIOUS-DATE " 5-Apr-2026 11:55:11" {WMEDLEY}FONT.;779) (PRETTYCOMPRINT FONTCOMS) @@ -3733,7 +3732,8 @@ (DEFINEQ (\CREATEDISPLAYFONT - [LAMBDA (FONTSPEC) (* ; "Edited 29-Mar-2026 10:23 by rmk") + [LAMBDA (FONTSPEC) (* ; "Edited 11-Apr-2026 10:10 by rmk") + (* ; "Edited 29-Mar-2026 10:23 by rmk") (* ; "Edited 16-Mar-2026 12:39 by rmk") (* ; "Edited 28-Aug-2025 16:00 by rmk") (* ; "Edited 18-Aug-2025 11:32 by rmk") @@ -3746,9 +3746,11 @@ (* ; "Edited 22-May-2025 09:52 by rmk") (* ; "gbn: 25-Jan-86 18:02") + (* ;; "Eventually, this should be removed from IMAGESTREAMTYPES, since it is the default. Left here in case something else turns up.") + (* ;; "FONTEXISTS? has determined that there is at least one source file for this font, so the font exists in at least some character sets.") - (FONTSPEC.TO.FONTDESCRIPTOR FONTSPEC]) + (MEDLEYFONT.READ.FONT FONTSPEC NIL T]) (\CREATECHARSET.DISPLAY [LAMBDA (FONTSPEC FONT CHARSET) (* ; "Edited 5-Apr-2026 10:02 by rmk") @@ -4073,41 +4075,41 @@ (ADDTOVAR LAMA FONTCOPY FONTDEVICEPROP) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (6545 16212 (CHARWIDTH 6555 . 7344) (CHARWIDTHY 7346 . 8863) (STRINGWIDTH 8865 . 9902) ( -\CHARWIDTH.DISPLAY 9904 . 10319) (\STRINGWIDTH.DISPLAY 10321 . 10749) (\STRINGWIDTH.GENERIC 10751 . -16210)) (16213 22845 (DEFAULTFONT 16223 . 17508) (FONTCLASS 17510 . 19782) (FONTCLASSUNPARSE 19784 . -20685) (FONTCLASSCOMPONENT 20687 . 21275) (SETFONTCLASSCOMPONENT 21277 . 21719) (GETFONTCLASSCOMPONENT - 21721 . 22843)) (24293 43549 (FONTCREATE 24303 . 27548) (FONTCREATE1 27550 . 30209) ( -FONTCREATE.SLUGFD 30211 . 32775) (\FONT.CHECKARGS1 32777 . 37482) (\FONTCREATE1.NOFN 37484 . 37698) ( -FONTFILEP 37700 . 38588) (\READCHARSET 38590 . 43129) (FONTCHARSETS 43131 . 43547)) (43550 50626 ( -\FONT.CHECKARGS 43560 . 50309) (\CHARSET.CHECK 50311 . 50624)) (50627 56987 (COERCEFONTSPEC 50637 . -56298) (COERCEFONTSPEC.TARGETFACE 56300 . 56985)) (59182 62161 (MAKEFONTSPEC 59192 . 60529) ( -FONTSPEC.TO.FONTDESCRIPTOR 60531 . 62159)) (62162 71824 (COMPLETE.FONT 62172 . 64197) (COMPLETEFONTP -64199 . 64937) (COMPLETE.CHARSET 64939 . 69005) (PRUNESLUGCSINFOS 69007 . 70318) (MONOSPACEFONTP 70320 - . 71822)) (71863 81431 (FONTASCENT 71873 . 72257) (FONTDESCENT 72259 . 72744) (FONTHEIGHT 72746 . -73148) (FONTPROP 73150 . 80708) (\AVGCHARWIDTH 80710 . 81429)) (82154 84024 (FONTDEVICEPROP 82164 . -84022)) (84141 84995 (EDITCHAR 84151 . 84993)) (85041 97231 (GETCHARBITMAP 85051 . 86175) ( -PUTCHARBITMAP 86177 . 88335) (\GETCHARBITMAP.CSINFO 88337 . 90353) (\PUTCHARBITMAP.CSINFO 90355 . -97229)) (97232 119573 (MOVECHARBITMAP 97242 . 99136) (MOVEFONTCHARS 99138 . 104288) (\MOVEFONTCHAR -104290 . 109162) (\MOVEFONTCHARS.SOURCEDATA 109164 . 115919) (\MAKESLUGCHAR 115921 . 118456) ( -SLUGCHARP 118458 . 119571)) (120488 132337 (FONTFILES 120498 . 122331) (\FINDFONTFILE 122333 . 124310) - (\FONTFILENAMES 124312 . 124872) (\FONTFILENAME 124874 . 127785) (FONTSPECFROMFILENAME 127787 . -132335)) (132338 168671 (FONTCOPY 132348 . 137431) (FONTP 137433 . 137732) (FONTUNPARSE 137734 . -139457) (SETFONTDESCRIPTOR 139459 . 140923) (\STREAMCHARWIDTH 140925 . 144936) (\COERCECHARSET 144938 - . 148327) (\BUILDSLUGCSINFO 148329 . 152022) (\FONTSYMBOL 152024 . 152678) (\DEVICESYMBOL 152680 . -153464) (\FONTFACE 153466 . 160670) (\FONTFACE.COLOR 160672 . 167454) (SETFONTCHARENCODING 167456 . -168669)) (168672 189243 (FONTSAVAILABLE 168682 . 174046) (FONTEXISTS? 174048 . 177856) ( -\SEARCHFONTFILES 177858 . 181072) (FLUSHFONTCACHE 181074 . 183318) (FINDFONTFILES 183320 . 186536) ( -SORTFONTSPECS 186538 . 189241)) (189244 194782 (MATCHFONTFACE 189254 . 190329) (MAKEFONTFACE 190331 . -191365) (FONTFACETOATOM 191367 . 193617) (FONTFACE.STARS 193619 . 194780)) (195413 195905 ( -\UNITWIDTHSVECTOR 195423 . 195903)) (212709 214776 (FONTDESCRIPTOR.DEFPRINT 212719 . 214298) ( -FONTCLASS.DEFPRINT 214300 . 214774)) (218689 221479 (\CREATEKERNELEMENT 218699 . 219057) ( -\FSETLEFTKERN 219059 . 219550) (\FGETLEFTKERN 219552 . 221477)) (221480 232361 (\CREATEFONT 221490 . -224933) (\CREATECHARSET 224935 . 228112) (\INSTALLCHARSETINFO 228114 . 231448) ( -\INSTALLCHARSETINFO.CHARENCODING 231450 . 232359)) (232683 234051 (\FONTRESETCHARWIDTHS 232693 . -234049)) (234574 241940 (\CREATEDISPLAYFONT 234584 . 236099) (\CREATECHARSET.DISPLAY 236101 . 239525) -(\FONTEXISTS?.DISPLAY 239527 . 241938)) (241941 250211 (FAKEFACE.CHARSET 241951 . 245905) ( -MAKEBOLD.CHAR 245907 . 247760) (MAKEITALIC.CHAR 247762 . 250209)) (250242 254497 (\SFROTATECSINFO -250252 . 252394) (\SFROTATEFONTCHARACTERS 252396 . 252780) (\SFROTATECSINFOOFFSETS 252782 . 254495)) ( -254498 255672 (\SFMAKECOLOR 254508 . 255670))))) + (FILEMAP (NIL (6426 16093 (CHARWIDTH 6436 . 7225) (CHARWIDTHY 7227 . 8744) (STRINGWIDTH 8746 . 9783) ( +\CHARWIDTH.DISPLAY 9785 . 10200) (\STRINGWIDTH.DISPLAY 10202 . 10630) (\STRINGWIDTH.GENERIC 10632 . +16091)) (16094 22726 (DEFAULTFONT 16104 . 17389) (FONTCLASS 17391 . 19663) (FONTCLASSUNPARSE 19665 . +20566) (FONTCLASSCOMPONENT 20568 . 21156) (SETFONTCLASSCOMPONENT 21158 . 21600) (GETFONTCLASSCOMPONENT + 21602 . 22724)) (24174 43430 (FONTCREATE 24184 . 27429) (FONTCREATE1 27431 . 30090) ( +FONTCREATE.SLUGFD 30092 . 32656) (\FONT.CHECKARGS1 32658 . 37363) (\FONTCREATE1.NOFN 37365 . 37579) ( +FONTFILEP 37581 . 38469) (\READCHARSET 38471 . 43010) (FONTCHARSETS 43012 . 43428)) (43431 50507 ( +\FONT.CHECKARGS 43441 . 50190) (\CHARSET.CHECK 50192 . 50505)) (50508 56868 (COERCEFONTSPEC 50518 . +56179) (COERCEFONTSPEC.TARGETFACE 56181 . 56866)) (59063 62042 (MAKEFONTSPEC 59073 . 60410) ( +FONTSPEC.TO.FONTDESCRIPTOR 60412 . 62040)) (62043 71705 (COMPLETE.FONT 62053 . 64078) (COMPLETEFONTP +64080 . 64818) (COMPLETE.CHARSET 64820 . 68886) (PRUNESLUGCSINFOS 68888 . 70199) (MONOSPACEFONTP 70201 + . 71703)) (71744 81312 (FONTASCENT 71754 . 72138) (FONTDESCENT 72140 . 72625) (FONTHEIGHT 72627 . +73029) (FONTPROP 73031 . 80589) (\AVGCHARWIDTH 80591 . 81310)) (82035 83905 (FONTDEVICEPROP 82045 . +83903)) (84022 84876 (EDITCHAR 84032 . 84874)) (84922 97112 (GETCHARBITMAP 84932 . 86056) ( +PUTCHARBITMAP 86058 . 88216) (\GETCHARBITMAP.CSINFO 88218 . 90234) (\PUTCHARBITMAP.CSINFO 90236 . +97110)) (97113 119454 (MOVECHARBITMAP 97123 . 99017) (MOVEFONTCHARS 99019 . 104169) (\MOVEFONTCHAR +104171 . 109043) (\MOVEFONTCHARS.SOURCEDATA 109045 . 115800) (\MAKESLUGCHAR 115802 . 118337) ( +SLUGCHARP 118339 . 119452)) (120369 132218 (FONTFILES 120379 . 122212) (\FINDFONTFILE 122214 . 124191) + (\FONTFILENAMES 124193 . 124753) (\FONTFILENAME 124755 . 127666) (FONTSPECFROMFILENAME 127668 . +132216)) (132219 168552 (FONTCOPY 132229 . 137312) (FONTP 137314 . 137613) (FONTUNPARSE 137615 . +139338) (SETFONTDESCRIPTOR 139340 . 140804) (\STREAMCHARWIDTH 140806 . 144817) (\COERCECHARSET 144819 + . 148208) (\BUILDSLUGCSINFO 148210 . 151903) (\FONTSYMBOL 151905 . 152559) (\DEVICESYMBOL 152561 . +153345) (\FONTFACE 153347 . 160551) (\FONTFACE.COLOR 160553 . 167335) (SETFONTCHARENCODING 167337 . +168550)) (168553 189124 (FONTSAVAILABLE 168563 . 173927) (FONTEXISTS? 173929 . 177737) ( +\SEARCHFONTFILES 177739 . 180953) (FLUSHFONTCACHE 180955 . 183199) (FINDFONTFILES 183201 . 186417) ( +SORTFONTSPECS 186419 . 189122)) (189125 194663 (MATCHFONTFACE 189135 . 190210) (MAKEFONTFACE 190212 . +191246) (FONTFACETOATOM 191248 . 193498) (FONTFACE.STARS 193500 . 194661)) (195294 195786 ( +\UNITWIDTHSVECTOR 195304 . 195784)) (212590 214657 (FONTDESCRIPTOR.DEFPRINT 212600 . 214179) ( +FONTCLASS.DEFPRINT 214181 . 214655)) (218570 221360 (\CREATEKERNELEMENT 218580 . 218938) ( +\FSETLEFTKERN 218940 . 219431) (\FGETLEFTKERN 219433 . 221358)) (221361 232242 (\CREATEFONT 221371 . +224814) (\CREATECHARSET 224816 . 227993) (\INSTALLCHARSETINFO 227995 . 231329) ( +\INSTALLCHARSETINFO.CHARENCODING 231331 . 232240)) (232564 233932 (\FONTRESETCHARWIDTHS 232574 . +233930)) (234455 242071 (\CREATEDISPLAYFONT 234465 . 236230) (\CREATECHARSET.DISPLAY 236232 . 239656) +(\FONTEXISTS?.DISPLAY 239658 . 242069)) (242072 250342 (FAKEFACE.CHARSET 242082 . 246036) ( +MAKEBOLD.CHAR 246038 . 247891) (MAKEITALIC.CHAR 247893 . 250340)) (250373 254628 (\SFROTATECSINFO +250383 . 252525) (\SFROTATEFONTCHARACTERS 252527 . 252911) (\SFROTATECSINFOOFFSETS 252913 . 254626)) ( +254629 255803 (\SFMAKECOLOR 254639 . 255801))))) STOP diff --git a/sources/FONT.LCOM b/sources/FONT.LCOM index 739a5a7005a485c9c26951223bf1faf042396ed1..e219801d7c20c4de30368f7a4bec9b7c00f286ce 100644 GIT binary patch delta 1054 zcmZuw&ubGw6z+yvO+~3~(b^P!hJvjn%gpSLY=Q{W-AS^r+1>7JjDZ~dQMKMgJcu5O zf)`J%dywLP;B{#a5{$ix=-;6J1L8phPdbydX=%Hcee-7CeBXQDH(M`;H=hr$-J8U? zKp#FT5JXJCsEl!$l-8dvOj~FkM)Mf$?IKjxNmOuzc(B-DNo9yiW4- zqjMG4V|K)7%p7s(2*_kX$z?4B#4vT!OacYQ+dBm=4?Wtd1b&?SP$rTo1*Nl@t+VH# zA_#-SDzxFna(f<>wQMH&KD9mal5P$+CzE&Qzc^Z{2yGrmu3v4sPFz!~%x95ngJx;4 zgJIWb#90g)(xJWBa6N~6jjGLEzY+jJIC(#Pb5#ck;xKMUZWsp7l zV&-!<@I^x=fx$8@zx@O~T1)$SQ|ra7D7&MU=AIvq9p_x_OhoaSu$ zr*leK)qn?4Pdgqmn}cpy(C`JGh=e#a44Ll`(1`_{avn(0ii1#0Y&VOI-H?dFoh;EU z@M%=#K=57?4K5%xgm=&4(%=Sc4erIJ0e0XC@5XguGFKR`FI*S}AqcyAl*eFb$>$H3 zPZRJ1pMh>_GDv2+kSXcOrEV@$wB+xKj)f5!jqI9~Kt2h7ZBB@sD2%$+bHpu=3!flwfRVt_XGJ Tc&zubROw??5=pZ^3lskVu<9B- delta 1066 zcmZuwO=#3W6yB6#+eK;XLe(y`k5#mb?2^nR*`yWfG@0EEW|Nr7YAbuFQh%Tq5%p3* z>Zy3@I*30Dn1?R&g_pDi^Uu)UB7>G3I1~*<6J&HRd!rz zg_K0p=1mC?0Mc}fHSS9=Y5BFlr4cQbeJ_IE$*Pi&(Fk~R@5F@$D~En0(k9SjA)dX6^s#3lxWiki)P^T50pO>c;(4oWH6@ldvH0J7#YcscA=}1Mg z%I}OX&XgcgWK(8^P7wJaV9f+!i5-zSmj-~b4o;0!s2?!E$OJ)3Nez%;@V%dB`ZUDT zXHQQcr0vgAOcQKjMcs{(^6|Co-<719-y^B`!HXNx;7YvQZsyy|XE_XwnB#jwkFG)Q*izn-+LjnC1eC>JUw?vx`PcCj zf4?=Ep4}alN88ljx1LHfe0jTg^v~_YSi2RD-)tX~9*aKxu%(>^V!EK3D%3qe3aVj3 zg9HKfYy>J+ff2@hVZ141cc7;AAX2&ziNwwYq^aPMu)+W-dM~KRJy?}{brsX-h7}X_ zpl*nrbjA8cHDR&?ipWk(3_?Eu1A|Lg1e(qt?wrdQ;Q1Z}RX5uJ%Q}CzGtS@cO!OJ5 zfZ179tO%ndv|0$bj))gnO3E!NIzI4=$g-?}q8Xh5 zJD%l-B0*EY_uK_gWMP!>7tF(JXdL2>pYMJt3=fJ)Nf(EbfsLf5G(P+z8?WsZGXDT1 Clpp&5