From ef0d25239b6fc7277242a9028fe9758b4292bf88 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Mon, 6 Apr 2026 10:01:00 -0700 Subject: [PATCH] MEDLEYFONTFORMAT and documentation now consistent --- docs/internal/MEDLEYFONTFORMAT.TEDIT | Bin 12761 -> 14437 bytes sources/MEDLEYFONTFORMAT | 58 ++++++++++++++------------- sources/MEDLEYFONTFORMAT.LCOM | Bin 22270 -> 22300 bytes 3 files changed, 30 insertions(+), 28 deletions(-) diff --git a/docs/internal/MEDLEYFONTFORMAT.TEDIT b/docs/internal/MEDLEYFONTFORMAT.TEDIT index 5862edc92ccb770e795434d838e21a394716c3cb..d95158bb6734f22265715abf836c4ed3a28a66cf 100644 GIT binary patch delta 2973 zcmaJ@&u<$=6pmA;B}v-|sVOa#@(3!mQ+NAQMJl}*XIl)89c)vj2ZScO<9M3Q&ayM> z;0nn?;sOW>X*qBK)C&?vlpB8mHv~6?!~ulF5pm$md*hvrlNKU5TEE?S?|a|--nahQ z`y=|4AFD>O2;fEqu3o-+`3;; z5gBSIB@t+ue?PBawYpw=wc75u-EsvFdqLuha1)yK2JleFf-At};PqL|Jk4WJTq{h# zG%&0lN)1D<@ubo$)Pia5=NPD>e~c?H7Lk^*1JK?5Z2ErTX=rs{b=$XF&F)&ewbp@V ztKM9xx7}JdJy~?-7|^ZGnp;a{F*;8D_*{w2kg})07T3~mW_}yND~ZlJq2?jxo{W9M zhMgnUF-Rr1`9buSBZDu82it6z_p^b-PPF6zlC8LD*%wM9MLZFzkInXCxqYxePR~{- zcW@vQFdyHJ^bmlBzDYBg9@rSR3X)Be3rVJ-IaZe)Z#4}RB!LM>Z;6t1sO(O49{SQ~^!|4+v{x0$t3_L3t3R*t!fcnG8ATIN_jV5_>o!lobmC$n^Odi&#h;zs^SC zeQ|)&3T)uCC+e8gEQ&ab30$8IFneF(`CO_BHij?|vBsKMgwb;N0%f8hk|IPg8?YQE zX`;m$jj@es+Y!1CD)IXJ66^>>u29re6~&ilj(K1fQT0V+$7ZriW-IZ4XW)HQn8HDk5f~_xYoY>dCrZ;0m`6ep8)ys& zc&E?9tgSu9Xt^=Z2rDvLV+ZQJiRJ8=8aTqrxRTE!9->4%REh#NkO;#k(mfds$wiRl z%xuVx2v{#6-XiXa9_q@3y7#lW1G&pD@dV&XN7-p785HcGW_sWJ6 z%KgkJD3RUq0VcX!#^&}c&zYS_Q-p)b;fWKklPq7 zl0o~1HVoKV569Z4GGxRX9MMfcd(O{vGWn9A)you{9-lcqia9y`z`7YT)h-&PWkAg0 zkC#WrLlXAwdc(!(AiX4S5&&A!z$gIk?pe5D9#;i@kHu)0sD#kCh>WqjNMc9Vs2vgt z>hgd%_9$Y$L&Y)$RMIbtC$|uH5{JsXtpslPcw;>l5*s*CBV%LGH1mu+>JmXXbEQ>x zrQzNq_zrc`tggDIEf~LxTJ3w_u6NyLr`~F&KO9{gVFA?d&|<_)lLl+}GQAPMl(9mK zjMRpk6$pf8T5eZ>?qNxKz2RtxKYS9*2IV&ZeE=Eli5PcR$1GInD!l3wO_VYtGcRVS z+qYJkh6gN2vR61!kiLK9)JU@})QF*FuTji+36bUfqSku(L=EViM?$~i-mTYMdVAAD z5sx+fQb3m#`0K#u1L2WB?MrWSztn1??<;AuWW*6dZ}KRJ5$ z(85@4dE(vQ7uHV~E~K~0*9yO+QTgSU2@SPaavfk(u<#%crLc zf2HN+>sPjHbZTmP>M(xk*uZVNID#L_GX6)8q<=1-ai$;G*gRcOL2V&vC$)9=8MyL*@S+;@v(2q8fA38LZE-ybn;`W9;OXp2% z)Thbzrj6J(7H!~^edL&p*eus=Ag}l0Basg=;+j&kbdL%fyhLsuap~5+$jl>=XHwyu z-FXcE3Jg56wzGQ^(#V8i>@iIuB=NC75MJVyZXxP`z|xH$_61p zr|1y8fw%sJh=mS8hdKq_x{2ow9XfRi3VWW}57Qc$;WxkM_k2HJO9$2q-nqgmFfkp2 ziNwV88~3SsCkdXAn+^wSi@D75xeFfm!D15f96VpS+y)_mL6O@IuN0K@p&%R{gM8UX z?GAUD1G*>FH(O9H>Ndp=mk{XwiJ~MAoZ|pX68tSjnLG}D^+Rae?3r6kX4g}>)yz6% za*L_#LS{9$md&i`R5(6@!Tl|iR!YLcjE?XyeTiG5fd9Tw5>x@xQ)2x%T++Y7nFk;W z@K;dbfmA+}T(u)?>l^(H=eD z`mNg4_Q~8^I+3U$^01))&Uc8%H{*~Pj@5>+D;$UBEu>A&U}^aZuu_TRzubh;Ic&>u z)Nai{Wzf24QLJsJHU@3`9qM>;J85AG4Zu0^w zJGC7{5H2Wgi|ue6-l;RG*Q;DJt`FK*+K!G4GkRp`!N^KS9WN+X|7;%^ht;JtHhf%V zz2~|NYR~{ zd>4*gn`+DD!P+p@Fu2?=yE1S+c^0ScPd|?)tA|~=7QNpStu9|&?lo`f{rIH$T7Qnu zn*I8EVnlnluIkybh`u{^rQ3)Z_?Y;fCD4L+O@B}H>Q_?{{c`NWUXf_BcMw3k@q+*{ zh7mH(;5SW>h*n|kNjfi`^6R0Bx@C&ZbCiP*pt0P-@7$xx898SosDRK*5?K!`bs zxZEJRvB{}yv)mgEK1_g=1OG738cfscc7thpU8;T@pEk|&G{S2C2HoG3Z`vY)^V8H+Y diff --git a/sources/MEDLEYFONTFORMAT b/sources/MEDLEYFONTFORMAT index 69fe6709..fa230dd1 100644 --- a/sources/MEDLEYFONTFORMAT +++ b/sources/MEDLEYFONTFORMAT @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10) -(FILECREATED " 4-Apr-2026 15:29:42" {WMEDLEY}MEDLEYFONTFORMAT.;301 63158 +(FILECREATED " 6-Apr-2026 09:45:18" {WMEDLEY}MEDLEYFONTFORMAT.;304 63514 :EDIT-BY rmk - :CHANGES-TO (FNS MEDLEYFONT.READ.FONT MEDLEYFONT.FILEVERSION) + :CHANGES-TO (FNS MEDLEYFONT.GETCHARSET MEDLEYFONT.FILENAME MEDLEYFONT.READ.FONT) - :PREVIOUS-DATE " 1-Apr-2026 10:05:10" {WMEDLEY}MEDLEYFONTFORMAT.;299) + :PREVIOUS-DATE " 4-Apr-2026 15:29:42" {WMEDLEY}MEDLEYFONTFORMAT.;301) (PRETTYCOMPRINT MEDLEYFONTFORMATCOMS) @@ -145,7 +145,8 @@ (FULLNAME STREAM]) (MEDLEYFONT.GETCHARSET - [LAMBDA (STREAM CHARSET FONT BASE) (* ; "Edited 30-Mar-2026 08:42 by rmk") + [LAMBDA (STREAM CHARSET FONT DIRECTORY) (* ; "Edited 6-Apr-2026 09:45 by rmk") + (* ; "Edited 30-Mar-2026 08:42 by rmk") (* ; "Edited 24-Mar-2026 00:04 by rmk") (* ; "Edited 21-Mar-2026 15:28 by rmk") (* ; "Edited 17-Mar-2026 11:42 by rmk") @@ -162,7 +163,7 @@ (RESETLST (CL:UNLESS (\GETSTREAM STREAM 'INPUT T) (CL:WHEN (type? FONTSPEC STREAM) - (SETQ STREAM (MEDLEYFONT.FILENAME STREAM BASE))) + (SETQ STREAM (MEDLEYFONT.FILENAME STREAM DIRECTORY))) [RESETSAVE (SETQ STREAM (OPENSTREAM STREAM 'INPUT)) `(PROGN (CLOSEF? OLDVALUE]) (MEDLEYFONT.FILEVERSION STREAM 1) @@ -312,7 +313,8 @@ (DEFINEQ (MEDLEYFONT.READ.FONT - [LAMBDA (FILE CHARSETNOS NOERROR) (* ; "Edited 4-Apr-2026 15:29 by rmk") + [LAMBDA (FILE CHARSETS NOERROR) (* ; "Edited 6-Apr-2026 09:07 by rmk") + (* ; "Edited 4-Apr-2026 15:29 by rmk") (* ; "Edited 31-Mar-2026 22:53 by rmk") (* ; "Edited 30-Mar-2026 12:08 by rmk") (* ; "Edited 26-Mar-2026 23:23 by rmk") @@ -332,9 +334,9 @@ (SETQ FILE (MEDLEYFONT.FILENAME FILE)) (if (NOT (INFILEP FILE)) then (CL:UNLESS NOERROR (ERROR "FILE NOT FOUND" FILE)) - elseif [OR (MEMB CHARSETNOS '(NIL ALL)) - (SETQ CHARSETNOS (SORT (CHARSET.DECODE (MKLIST CHARSETNOS) - NOERROR] + elseif [OR (MEMB CHARSETS '(NIL ALL)) + (SETQ CHARSETS (SORT (CHARSET.DECODE (MKLIST CHARSETS) + NOERROR] then (RESETLST (LET (STREAM FONT CSLOC MAXCHARSET) (* ;  "CL:OPEN-FILE doesn't exist in the init") @@ -345,12 +347,12 @@ (SETQ CSLOC (\FIXPIN STREAM)) (* ;  "CSLOC here so MEDLEYFONT.GETCHARSET can skip over the font stuff.") (SETQ FONT (MEDLEYFONT.READ.VERIFIEDFONT STREAM)) - (for CSNO from 0 to MAXCHARSET while CHARSETNOS - when (if (EQ CHARSETNOS 'ALL) - elseif (EQ CSNO (CAR CHARSETNOS)) - then (pop CHARSETNOS)) - do (\SETCHARSETINFO FONT CSNO (MEDLEYFONT.GETCHARSET.INTERNAL STREAM CSNO - FONT CSLOC))) + (for CSNO from 0 to MAXCHARSET while CHARSETS + when (if (EQ CHARSETS 'ALL) + elseif (EQ CSNO (CAR CHARSETS)) + then (pop CHARSETS)) do (\SETCHARSETINFO FONT CSNO + (MEDLEYFONT.GETCHARSET.INTERNAL + STREAM CSNO FONT CSLOC))) FONT))]) (MEDLEYFONT.READ.CHARSET @@ -876,7 +878,8 @@ (DEFINEQ (MEDLEYFONT.FILENAME - [LAMBDA (FILE DIRECTORY CHARSET) (* ; "Edited 1-Apr-2026 09:46 by rmk") + [LAMBDA (FILE DIRECTORY EXTENSION) (* ; "Edited 6-Apr-2026 09:31 by rmk") + (* ; "Edited 1-Apr-2026 09:46 by rmk") (* ; "Edited 30-Mar-2026 09:19 by rmk") (* ; "Edited 17-Mar-2026 10:15 by rmk") (* ; "Edited 2-Mar-2026 22:45 by rmk") @@ -886,13 +889,12 @@ (* ; "Edited 10-Jun-2025 11:02 by rmk") (* ; "Edited 19-May-2025 17:42 by rmk") - (* ;; "Defaults to components of BASEFILE, e.g. host/directory and extension, otherwise") + (* ;; "Defaults to components of DIRECTORY, e.g. host/directory otherwise uses FONTDIRECTORIES for defaults") (LET (FONTSPEC HOST DIR EXT) (if (type? FONTSPEC FILE) then (SETQ FONTSPEC FILE) - (SETQ FILE (\FONTFILENAME (\FONT.CHECKARGS FILE NIL NIL NIL NIL T) - NIL NIL NIL CHARSET)) + (SETQ FILE (\FONTFILENAME (\FONT.CHECKARGS FILE NIL NIL NIL NIL T))) else (SETQ FONTSPEC (FONTSPECFROMFILENAME FILE))) [if DIRECTORY then (SETQ HOST (FILENAMEFIELD DIRECTORY 'HOST)) @@ -900,7 +902,7 @@ else [SETQ DIR (CAR (MKLIST (FONTDEVICEPROP FONTSPEC 'FONTDIRECTORIES] (SETQ HOST (FILENAMEFIELD DIR 'HOST] (PACKFILENAME 'BODY FILE 'HOST HOST 'DIRECTORY DIR 'EXTENSION - (CAR (MKLIST (FONTDEVICEPROP FONTSPEC 'FONTEXTENSIONS]) + (OR EXTENSION (CAR (MKLIST (FONTDEVICEPROP FONTSPEC 'FONTEXTENSIONS]) ) (ADDTOVAR DISPLAYFONTEXTENSIONS MEDLEYDISPLAYFONT) @@ -951,12 +953,12 @@ ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (2204 19305 (MEDLEYFONT.WRITE.FONT 2214 . 8617) (MEDLEYFONT.GETCHARSET 8619 . 10553) ( -MEDLEYFONT.GETCHARSET.INTERNAL 10555 . 12292) (MEDLEYFONT.CHARSET? 12294 . 13172) ( -MEDLEYFONT.GETFILEPROP 13174 . 16238) (MEDLEYFONT.FILEP 16240 . 18668) (MEDLEYFONT.FILEVERSION 18670 - . 19303)) (19331 41011 (MEDLEYFONT.READ.FONT 19341 . 22654) (MEDLEYFONT.READ.CHARSET 22656 . 27703) ( -MEDLEYFONT.READ.ITEM 27705 . 33854) (MEDLEYFONT.PEEK.ITEM 33856 . 34718) (MEDLEYFONT.READ.FONTPROPS -34720 . 35185) (MEDLEYFONT.READ.VERIFIEDFONT 35187 . 41009)) (41037 60387 (MEDLEYFONT.WRITE.CHARSET -41047 . 45686) (MEDLEYFONT.WRITE.ITEM 45688 . 54741) (MEDLEYFONT.WRITE.FONTPROPS 54743 . 59512) ( -MEDLEYFONT.WRITE.HEADER 59514 . 60385)) (60388 62273 (MEDLEYFONT.FILENAME 60398 . 62271))))) + (FILEMAP (NIL (2223 19438 (MEDLEYFONT.WRITE.FONT 2233 . 8636) (MEDLEYFONT.GETCHARSET 8638 . 10686) ( +MEDLEYFONT.GETCHARSET.INTERNAL 10688 . 12425) (MEDLEYFONT.CHARSET? 12427 . 13305) ( +MEDLEYFONT.GETFILEPROP 13307 . 16371) (MEDLEYFONT.FILEP 16373 . 18801) (MEDLEYFONT.FILEVERSION 18803 + . 19436)) (19464 41280 (MEDLEYFONT.READ.FONT 19474 . 22923) (MEDLEYFONT.READ.CHARSET 22925 . 27972) ( +MEDLEYFONT.READ.ITEM 27974 . 34123) (MEDLEYFONT.PEEK.ITEM 34125 . 34987) (MEDLEYFONT.READ.FONTPROPS +34989 . 35454) (MEDLEYFONT.READ.VERIFIEDFONT 35456 . 41278)) (41306 60656 (MEDLEYFONT.WRITE.CHARSET +41316 . 45955) (MEDLEYFONT.WRITE.ITEM 45957 . 55010) (MEDLEYFONT.WRITE.FONTPROPS 55012 . 59781) ( +MEDLEYFONT.WRITE.HEADER 59783 . 60654)) (60657 62629 (MEDLEYFONT.FILENAME 60667 . 62627))))) STOP diff --git a/sources/MEDLEYFONTFORMAT.LCOM b/sources/MEDLEYFONTFORMAT.LCOM index be1d383cc83adcf924edc95ad59ea375d79fc1ad..533b852a25a53632ed7526371601cc54f83216d4 100644 GIT binary patch delta 838 zcmZuu&rcIU6y9Y4(_cVoNw6mPs03O`Yp468KN3w#yBiiucimZPQ8}P%6iA2~Js1xp z9E=AKHgh#G@h(YQo2Vfn@g%q6MK30J_QGFaon5dZVGc9zee-?uzW3($JNES!`>Gm{ zV)+M;V#!2OfO%+u`E|{9J7zO4B*T=B<9z)lP$KIP0m}_yHb!L-% z_MoK~rqyr5Uwqc;0ohsabk@H6d)V3CF?GK^yvwv=rgOhLc6c7=?VB!J>gRf9)%IMF znHyr?);k-RwfNitjh>K_H#BhrUmtMWygU6n^-c*_OzgS`HKhT^ni4)H0{_F5qkE&`%tMJt;{85ayyr%h5QLCU`Ou5Q=l{2(+Z2lSyn z3<{)(KNM`%#=f!5RrqwtC09+kj8&~nruES1$6kiv{5dXXagECs+sHWH8;C6FqvNBw z>V3w)6|!OlyS3$&D5hLFok8pIgq)%Ze(Oihv~Q z`F})Afu1j1{fhz;_@lNeYC+ZwO$U?^PpHz;Nlpqm2-f9-VrcV<`=|;?h`hWuxhz6= vDAWZHvl=!5@rNVq4gv#8W}utWj6beJsUsaiFryV0sk6i(l19yd@vHX_$s^*U delta 819 zcmZWl-)qxQ6i(W0x^CS%RM;ktW0Cz(TXWMSZ6b`O$qmicCNVdg9f&ZE=&XngAKb&3 zh=`AN_dy@_g`vXfmPWssPoi|jG_h#a6dNPJ8Q zCe51m3`yw$4w8U&EXygJs30y0vD)&HC@;%Y?LOEz8CmMyTTls}0Olio(=){0q@R0G z{nUPDD#6xo5!TP-Hy^HV zEfGJ$cCz=IRT5!;t_9b{5FM7zlGA;$FgV}UT;FoYtVdc*yTow-E0P_dmxp@8nx@Hq_@Xec?#-hr_RIFyko4!}hX;M1&