From 402a861b95c05e2e3acf0ca38916391ffcee03f6 Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Sat, 1 Feb 2025 10:25:49 -0800 Subject: [PATCH 1/2] Fix unbound vars errors in WRITESTRIKEFONTFILE from earlier edit. --- sources/FONT | 73 +++++++++++++++++++++++----------------------- sources/FONT.LCOM | Bin 45306 -> 45222 bytes 2 files changed, 37 insertions(+), 36 deletions(-) diff --git a/sources/FONT b/sources/FONT index 4c9c1e43..ab67da74 100644 --- a/sources/FONT +++ b/sources/FONT @@ -1,14 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "19-Dec-2024 15:25:17" {WMEDLEY}FONT.;26 191458 +(FILECREATED " 1-Feb-2025 00:24:33" {DSK}matt>Interlisp>medley>sources>FONT.;2 191581 - :EDIT-BY rmk + :EDIT-BY "mth" - :CHANGES-TO (FNS \FGETLEFTKERN) - (VARS FONTCOMS) - (FUNCTIONS \CREATEKERNELEMENT) + :CHANGES-TO (FNS WRITESTRIKEFONTFILE) - :PREVIOUS-DATE "19-Dec-2024 11:52:01" {WMEDLEY}FONT.;18) + :PREVIOUS-DATE "19-Dec-2024 15:25:17" {DSK}matt>Interlisp>medley>sources>FONT.;1) (PRETTYCOMPRINT FONTCOMS) @@ -2688,7 +2686,8 @@ (DEFINEQ (WRITESTRIKEFONTFILE - [LAMBDA (FONT CHARSET FILE) (* ; "Edited 12-Jul-2022 14:36 by rmk") + [LAMBDA (FONT CHARSET FILE) (* ; "Edited 1-Feb-2025 00:24 by mth") + (* ; "Edited 12-Jul-2022 14:36 by rmk") (* kbr%: "21-Oct-85 15:08") (* ;  "Write strike FILE using info in FONT. *") @@ -2698,8 +2697,10 @@ (CL:UNLESS (AND (IGEQ CHARSET 0) (ILEQ CHARSET \MAXCHARSET)) (LISPERROR "ILLEGAL ARG" CHARSET)) - (LET (STREAM CSINFO FIRSTCHAR LASTCHAR WIDTHS MAXWIDTH LENGTH RASTERWIDTH DUMMYCHAR DUMMYOFFSET - PREVIOUSOFFSET OFFSETS) + (LET ((DUMMYINDEX 256) + (MAXCODE 255) + STREAM CSINFO FIRSTCHAR LASTCHAR WIDTHS MAXWIDTH LENGTH RASTERWIDTH DUMMYCHAR DUMMYOFFSET + PREVIOUSOFFSET OFFSETS) (SETQ CSINFO (\GETCHARSETINFO CHARSET FONT T)) (CL:UNLESS CSINFO (ERROR "Couldn't find charset " CHARSET)) (SETQ WIDTHS (fetch (CHARSETINFO WIDTHS) of CSINFO)) @@ -3380,31 +3381,31 @@ (ADDTOVAR LAMA FONTCOPY) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (8734 18253 (CHARWIDTH 8744 . 9529) (CHARWIDTHY 9531 . 10901) (STRINGWIDTH 10903 . 11996 -) (\CHARWIDTH.DISPLAY 11998 . 12411) (\STRINGWIDTH.DISPLAY 12413 . 12837) (\STRINGWIDTH.GENERIC 12839 - . 18251)) (18254 24636 (DEFAULTFONT 18264 . 20097) (FONTCLASS 20099 . 22261) (FONTCLASSUNPARSE 22263 - . 23162) (FONTCLASSCOMPONENT 23164 . 23673) (SETFONTCLASSCOMPONENT 23675 . 24634)) (25310 38042 ( -FONTCREATE 25320 . 34587) (\FONT.SYMBOLMEMB 34589 . 34819) (\FONT.SYMBOLASSOC 34821 . 35979) ( -\FONT.COMPARESYMBOL 35981 . 38040)) (38081 42705 (FONTASCENT 38091 . 38259) (FONTDESCENT 38261 . 38530 -) (FONTHEIGHT 38532 . 38718) (FONTPROP 38720 . 42163) (\AVGCHARWIDTH 42165 . 42703)) (42752 55391 ( -GETCHARBITMAP 42762 . 45652) (PUTCHARBITMAP 45654 . 53711) (MOVECHARBITMAP 53713 . 55389)) (55392 -139931 (FONTCOPY 55402 . 60710) (FONTSAVAILABLE 60712 . 65917) (FONTFILEFORMAT 65919 . 67543) (FONTP -67545 . 67844) (FONTUNPARSE 67846 . 70410) (SETFONTDESCRIPTOR 70412 . 72121) (CHARCODEP 72123 . 72484) - (EDITCHAR 72486 . 72915) (\STREAMCHARWIDTH 72917 . 77081) (\UNITWIDTHSVECTOR 77083 . 77446) ( -\CREATEDISPLAYFONT 77448 . 78201) (\CREATECHARSET.DISPLAY 78203 . 81119) (\CREATE-REAL-CHARSET.DISPLAY - 81121 . 88025) (\BUILDSLUGCSINFO 88027 . 89470) (\SEARCHDISPLAYFONTFILES 89472 . 91405) ( -\SEARCHFONTFILES 91407 . 94718) (\FINDFONTFILE 94720 . 95911) (\FONTSYMBOL 95913 . 96563) ( -\DEVICESYMBOL 96565 . 97434) (\FONTFACE 97436 . 104626) (\FONTFACE.COLOR 104628 . 111548) ( -\FONTFILENAME 111550 . 114965) (\FONTFILENAME.OLD 114967 . 117916) (\FONTFILENAME.NEW 117918 . 120175) - (\FONTINFOFROMFILENAME 120177 . 123291) (\FONTINFOFROMFILENAME.OLD 123293 . 125570) (\GETFONTDESC -125572 . 125963) (\COERCEFONTDESC 125965 . 131350) (\LOOKUPFONT 131352 . 132696) (\LOOKUPFONTSINCORE -132698 . 134771) (\READDISPLAYFONTFILE 134773 . 139929)) (140834 157558 (\READSTRIKEFONTFILE 140844 . -145046) (\SFMAKEBOLD 145048 . 147444) (\SFMAKEITALIC 147446 . 150349) (\SFMAKEROTATEDFONT 150351 . -151752) (\SFROTATECSINFO 151754 . 152391) (\SFROTATEFONTCHARACTERS 152393 . 152773) ( -\SFFIXOFFSETSAFTERROTATION 152775 . 154914) (\SFROTATECSINFOOFFSETS 154916 . 156185) (\SFMAKECOLOR -156187 . 157556)) (157559 164812 (WRITESTRIKEFONTFILE 157569 . 161352) (STRIKECSINFO 161354 . 164810)) - (164813 166652 (FONTDESCRIPTOR.DEFPRINT 164823 . 166174) (FONTCLASS.DEFPRINT 166176 . 166650)) ( -181848 182170 (\CREATEKERNELEMENT 181848 . 182170)) (182172 182300 (\FSETLEFTKERN 182172 . 182300)) ( -182426 183473 (\FGETLEFTKERN 182436 . 183471)) (183517 187027 (\CREATECHARSET 183527 . 185278) ( -\INSTALLCHARSETINFO 185280 . 187025)) (188182 189934 (\FONTRESETCHARWIDTHS 188192 . 189932))))) + (FILEMAP (NIL (8703 18222 (CHARWIDTH 8713 . 9498) (CHARWIDTHY 9500 . 10870) (STRINGWIDTH 10872 . 11965 +) (\CHARWIDTH.DISPLAY 11967 . 12380) (\STRINGWIDTH.DISPLAY 12382 . 12806) (\STRINGWIDTH.GENERIC 12808 + . 18220)) (18223 24605 (DEFAULTFONT 18233 . 20066) (FONTCLASS 20068 . 22230) (FONTCLASSUNPARSE 22232 + . 23131) (FONTCLASSCOMPONENT 23133 . 23642) (SETFONTCLASSCOMPONENT 23644 . 24603)) (25279 38011 ( +FONTCREATE 25289 . 34556) (\FONT.SYMBOLMEMB 34558 . 34788) (\FONT.SYMBOLASSOC 34790 . 35948) ( +\FONT.COMPARESYMBOL 35950 . 38009)) (38050 42674 (FONTASCENT 38060 . 38228) (FONTDESCENT 38230 . 38499 +) (FONTHEIGHT 38501 . 38687) (FONTPROP 38689 . 42132) (\AVGCHARWIDTH 42134 . 42672)) (42721 55360 ( +GETCHARBITMAP 42731 . 45621) (PUTCHARBITMAP 45623 . 53680) (MOVECHARBITMAP 53682 . 55358)) (55361 +139900 (FONTCOPY 55371 . 60679) (FONTSAVAILABLE 60681 . 65886) (FONTFILEFORMAT 65888 . 67512) (FONTP +67514 . 67813) (FONTUNPARSE 67815 . 70379) (SETFONTDESCRIPTOR 70381 . 72090) (CHARCODEP 72092 . 72453) + (EDITCHAR 72455 . 72884) (\STREAMCHARWIDTH 72886 . 77050) (\UNITWIDTHSVECTOR 77052 . 77415) ( +\CREATEDISPLAYFONT 77417 . 78170) (\CREATECHARSET.DISPLAY 78172 . 81088) (\CREATE-REAL-CHARSET.DISPLAY + 81090 . 87994) (\BUILDSLUGCSINFO 87996 . 89439) (\SEARCHDISPLAYFONTFILES 89441 . 91374) ( +\SEARCHFONTFILES 91376 . 94687) (\FINDFONTFILE 94689 . 95880) (\FONTSYMBOL 95882 . 96532) ( +\DEVICESYMBOL 96534 . 97403) (\FONTFACE 97405 . 104595) (\FONTFACE.COLOR 104597 . 111517) ( +\FONTFILENAME 111519 . 114934) (\FONTFILENAME.OLD 114936 . 117885) (\FONTFILENAME.NEW 117887 . 120144) + (\FONTINFOFROMFILENAME 120146 . 123260) (\FONTINFOFROMFILENAME.OLD 123262 . 125539) (\GETFONTDESC +125541 . 125932) (\COERCEFONTDESC 125934 . 131319) (\LOOKUPFONT 131321 . 132665) (\LOOKUPFONTSINCORE +132667 . 134740) (\READDISPLAYFONTFILE 134742 . 139898)) (140803 157527 (\READSTRIKEFONTFILE 140813 . +145015) (\SFMAKEBOLD 145017 . 147413) (\SFMAKEITALIC 147415 . 150318) (\SFMAKEROTATEDFONT 150320 . +151721) (\SFROTATECSINFO 151723 . 152360) (\SFROTATEFONTCHARACTERS 152362 . 152742) ( +\SFFIXOFFSETSAFTERROTATION 152744 . 154883) (\SFROTATECSINFOOFFSETS 154885 . 156154) (\SFMAKECOLOR +156156 . 157525)) (157528 164935 (WRITESTRIKEFONTFILE 157538 . 161475) (STRIKECSINFO 161477 . 164933)) + (164936 166775 (FONTDESCRIPTOR.DEFPRINT 164946 . 166297) (FONTCLASS.DEFPRINT 166299 . 166773)) ( +181971 182293 (\CREATEKERNELEMENT 181971 . 182293)) (182295 182423 (\FSETLEFTKERN 182295 . 182423)) ( +182549 183596 (\FGETLEFTKERN 182559 . 183594)) (183640 187150 (\CREATECHARSET 183650 . 185401) ( +\INSTALLCHARSETINFO 185403 . 187148)) (188305 190057 (\FONTRESETCHARWIDTHS 188315 . 190055))))) STOP diff --git a/sources/FONT.LCOM b/sources/FONT.LCOM index f9b2b95654e795fc97fc1a510b88cf50b229ce94..ee1e02be63e671052493849be5a6166b61e6226b 100644 GIT binary patch delta 1693 zcmb7E&yUkq5RQ`tiS*EIi*{91=-|_)D3RX}J3oq|IEl>~lGwzCDAFRdY(h8cW*4z3 z6woS{9(!o;ZbdnAXb-I_p_BtBin#Ph4^>Zks0xZwpuE7i3@h@+PX9)4tJ{H{ZIIz!)xEHHc5|oSE%w(3 zgQB%P=-%Aw?cON%yPd7>o#O7!CpR~`yG7G(c$p7r3X(F-r_Zl%Pa+c$Ss^mW6}#?O zH6v}}qa%-gOb%y(nM_88&iVio|6c$ur;;nev(hwl&!{4`|MF+A$G0R11IZILN1$L- zEiYYeBme$jQ-(riRd1X#+_Y!IirH|X)wDdr^_tcNL)0p`_z$J`3u=L?1(KB^`I=gh z@o&<@<4a%ygQ{Wbmuj8}oPyXl@wmUYbpA+Af0A(hmrGY9)z2(1A14~Dh4mx3rfYbR zBYt~%l_`L#R6V_1GaMi+2UcA_XV{L52Ledi(Ca`HG6Ng`vHbCoH)rx958~HPo*0_3 zcr4+(h~e+MkHqtscx=R;=?|Qe{)RX#I;CDOM>9KS*FdsdZh=26fF!7bu z^gqA#RQldGZ(lpZ!f>|J2Bu+eTu0CV#??^QP)`RKRsH9umxqk-&?6X4V5oDzJ3P`H z2cy}vn?SR9sMw8)?g2$%0*pvPd48@Oiv65z3{L1Fm}vPqxeWJyYQgV+S{hOf8Ys2M z#HolNGzPBZ181Rq({eoV770!VgynfOAS|a%&1|UYj2BZGw5&$eZUJL_jv&ory5Zpn zV|mJy3snU;;6gc?lNM6^>`ZNvJ+zg%Z2*GuMP-p}E(%3NW1?xm#+bJM;?9A@{r25d zoN43F?j9^1O+ozWdolm)=z4NnioN_PcJ=M8fBbJpAH?zR*U?@AZ^xJKKaz$VDmB|R zOwcgJTG_tjfu`ZMg_aUoDvA}}sY+z=Je}O}9E&WJFT`=N0YMawI!r9w$%#e6Y(1Q= ze3XRcB4@@UAj6ReU1&DKQ7ytzHA+JH^sQK{Ah8&yiA9P3`+h^m?wHsTP_dlJMnU*cDt~%trFu45zBhuQaL-uu0;-}5*3 z%m3UjU+Ei8@irYcJSD)!7c(hJ59MZ!#ko!(YX4Ii8hViS$)&=$6vEO!QQ>Ea%=t+S@TCgSBJfV$(yP}y+S zMB)i2IVU2&0rhn=ia}O{DaWWgJ>N>)08KZtxYAB|qAUEQ0qNJu>1VM{+Ez&oDi6wr z=%c@sFCTlj0j2NDO8RZ}<+(HFos*j-{H1?ZUr~&7;q>EGAXF{FV4_hh63}`2@#5Kz z23WM6m>o}qKr{+&*IW}p7z1G(;sjs2KvX_$rmJ8J$Lx8DtY`G^;@(5UjkTT`nSLUK zZM$*knFINTc@0WR>BJ`HQ~FsRx8IQGoIDoganHQDDZi`cBl0u9DbLm2v2tgrbMWT; z>TX5ejs5;O2y=_^-F&I8H?gol(8v-ppe_Tw#MSEBZa5GUm2eK%H5QGNcZ0RN%<~)?)}$>t(;Hc09dmHb{xtU0Mm?Y zirMr+VAKE{xqP%_rE+NkA9)6h=o!YC`M_|_W2;Q1x(*_Wf(WS2zzTfJOn_on#x?=N zxD;DE#RZ^jrb67695Fy+(qgIcK|EwC_(2A&;XY@h0*$aSupD9Jh6#q%FrNt@nV}ba zWQIBsTUmRjyclmm-}UXFk8{#z(=#yK@R++mo7yB7ic6j6LNydK8Uw}d9m~g*penX} z3W{L2in54K3n(HdlS2`VuwgG`S~i_z5Q;ec?8BRip2F2eSyM;nt{zsO0SB87cCXtV zU@79f)D7sG=dHjN4JhAzs+|6I{q?!N{_8KLS0C-S)AfVr%lP^9;99w_kIG-%Qic>P zFNlQ$%@(diC+H=(8(JZ$g~Sb--*L5&G;DF^q3NWMTDV7J6s^e%iBCK*zx Date: Sat, 1 Feb 2025 12:44:17 -0800 Subject: [PATCH 2/2] Per review comment from Ron Kaplan, moved constants DUMMYINDEX and MAXCHAR from EDITFONT to FONT. --- lispusers/EDITFONT | 38 ++++++------------- lispusers/EDITFONT.LCOM | Bin 10164 -> 9998 bytes sources/FONT | 81 +++++++++++++++++++++++----------------- sources/FONT.LCOM | Bin 45222 -> 45400 bytes 4 files changed, 59 insertions(+), 60 deletions(-) diff --git a/lispusers/EDITFONT b/lispusers/EDITFONT index bd6f8fc8..e44672fa 100644 --- a/lispusers/EDITFONT +++ b/lispusers/EDITFONT @@ -1,18 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "12-Jul-2022 14:18:56"  -{DSK}kaplan>Local>medley3.5>working-medley>lispusers>EDITFONT.;10 28741 +(FILECREATED " 1-Feb-2025 12:28:41" {DSK}matt>Interlisp>medley>lispusers>EDITFONT.;2 28339 - :CHANGES-TO (FNS READSTRIKEFONTFILE) - (VARS EDITFONTCOMS) + :EDIT-BY "mth" - :PREVIOUS-DATE "27-Jun-2022 10:59:12" -{DSK}kaplan>local>medley3.5>working-medley>lispusers>EDITFONT.;5) + :CHANGES-TO (VARS EDITFONTCOMS) + :PREVIOUS-DATE "12-Jul-2022 14:18:56" {DSK}matt>Interlisp>medley>lispusers>EDITFONT.;1) -(* ; " -Copyright (c) 1985-1986 by Xerox Corporation. -") (PRETTYCOMPRINT EDITFONTCOMS) @@ -26,9 +21,7 @@ Copyright (c) 1985-1986 by Xerox Corporation. COPYFONT READSTRIKEFONTFILE) (FNS BLANKFONTCREATE EDITFONT) (DECLARE%: EVAL@COMPILE DONTCOPY (CONSTANTS (BITSPERWORD 16) - (BYTESPERWORD 2) - (MAXCODE 255) - (DUMMYINDEX 256)) + (BYTESPERWORD 2)) (FILES (LOADCOMP) FONT)) (P (EF.INIT)))) @@ -527,15 +520,9 @@ Copyright (c) 1985-1986 by Xerox Corporation. (RPAQQ BYTESPERWORD 2) -(RPAQQ MAXCODE 255) - -(RPAQQ DUMMYINDEX 256) - (CONSTANTS (BITSPERWORD 16) - (BYTESPERWORD 2) - (MAXCODE 255) - (DUMMYINDEX 256)) + (BYTESPERWORD 2)) ) @@ -544,12 +531,11 @@ Copyright (c) 1985-1986 by Xerox Corporation. ) (EF.INIT) -(PUTPROPS EDITFONT COPYRIGHT ("Xerox Corporation" 1985 1986)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1567 26117 (EF.INIT 1577 . 2303) (EF.PROMPT 2305 . 2887) (EF.MESSAGE 2889 . 3101) ( -EF.CLOSEFN 3103 . 3630) (EF.CHARITEMS 3632 . 5853) (EF.BUTTONEVENTFN 5855 . 6267) (EF.WHENSELECTEDFN -6269 . 6673) (EF.EDITBM 6675 . 8073) (EF.MIDDLEBUTTONFN 8075 . 8320) (EF.CHANGESIZE 8322 . 9541) ( -EF.DELETE 9543 . 10308) (EF.ENTER 10310 . 11141) (EF.REPLACE 11143 . 12006) (EF.SAVE 12008 . 16681) ( -EF.BLANK 16683 . 22308) (COPYFONT 22310 . 24750) (READSTRIKEFONTFILE 24752 . 26115)) (26118 28332 ( -BLANKFONTCREATE 26128 . 26385) (EDITFONT 26387 . 28330))))) + (FILEMAP (NIL (1325 25875 (EF.INIT 1335 . 2061) (EF.PROMPT 2063 . 2645) (EF.MESSAGE 2647 . 2859) ( +EF.CLOSEFN 2861 . 3388) (EF.CHARITEMS 3390 . 5611) (EF.BUTTONEVENTFN 5613 . 6025) (EF.WHENSELECTEDFN +6027 . 6431) (EF.EDITBM 6433 . 7831) (EF.MIDDLEBUTTONFN 7833 . 8078) (EF.CHANGESIZE 8080 . 9299) ( +EF.DELETE 9301 . 10066) (EF.ENTER 10068 . 10899) (EF.REPLACE 10901 . 11764) (EF.SAVE 11766 . 16439) ( +EF.BLANK 16441 . 22066) (COPYFONT 22068 . 24508) (READSTRIKEFONTFILE 24510 . 25873)) (25876 28090 ( +BLANKFONTCREATE 25886 . 26143) (EDITFONT 26145 . 28088))))) STOP diff --git a/lispusers/EDITFONT.LCOM b/lispusers/EDITFONT.LCOM index 5ed21335cba515f194d1ec0ffdac87434adc1a2e..79b2680811f7a986ed4c70506278c15c708579b8 100644 GIT binary patch delta 319 zcmdnu-{&_WTtvZ8*DW#A0H$q)0}7ZmL~wVo8aeXI@EaQBG!Y zf!*YOM(KJZO$8-%O~zKnMoJ1vMXAa8xdoXysVNG{8Hsu6sl}>R3S4>lB^jA{=?a;7 z3QBIFK0XS_y7lz*loV1DOMqIim}+XIq{*e>=IP_=9OUX4;_9NHWPq$2=wKrYD-%N{ zg=&{z?^+vNj#f5OFtRW`cuP;DZMpQjHO06l(NNB{r; delta 579 zcmb7>T}y*-6vnAbFQc1o;vg;bLhU^ctz z={Sqxa0uZn%ZrK#j@ndQ&(S;TQm@T*Lxm^-T=NYBHhpNC#$gytO6@j(0Vgp+E7fx8 z=&4G1w54Gg;$Cq(52wG?y!d-hVCw>hK$P1}v!%L}X91y^E?_?@m6^!J>rUm06-p|} z8aX5K4H2>5fmR&X+~faq=il~rZ;lRu=r((@rKrI2JPCy2ce{PvRMcL%s4Zs4FK2}9 vd$wcQE_{6rWXtY5daLaLf%n2Zoq?R@S(*ovC{1ucjXJ*^HIl?k-M~Ho$PlYd diff --git a/sources/FONT b/sources/FONT index ab67da74..ebef461d 100644 --- a/sources/FONT +++ b/sources/FONT @@ -1,10 +1,11 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 1-Feb-2025 00:24:33" {DSK}matt>Interlisp>medley>sources>FONT.;2 191581 +(FILECREATED " 1-Feb-2025 12:28:10" {DSK}matt>Interlisp>medley>sources>FONT.;4 191871 :EDIT-BY "mth" - :CHANGES-TO (FNS WRITESTRIKEFONTFILE) + :CHANGES-TO (VARS FONTCOMS) + (FNS WRITESTRIKEFONTFILE) :PREVIOUS-DATE "19-Dec-2024 15:25:17" {DSK}matt>Interlisp>medley>sources>FONT.;1) @@ -135,6 +136,8 @@ {dsk}/usr/local/lde/fonts/display/publishing/ ] + (DECLARE%: EVAL@COMPILE DONTCOPY (CONSTANTS (MAXCODE 255) + (DUMMYINDEX 256))) (MACROS \FGETCHARIMAGEWIDTH \GETFONTDESC \SETCHARSETINFO) (LOCALVARS . T) (PROP FILETYPE FONT) @@ -2686,7 +2689,7 @@ (DEFINEQ (WRITESTRIKEFONTFILE - [LAMBDA (FONT CHARSET FILE) (* ; "Edited 1-Feb-2025 00:24 by mth") + [LAMBDA (FONT CHARSET FILE) (* ; "Edited 1-Feb-2025 12:27 by mth") (* ; "Edited 12-Jul-2022 14:36 by rmk") (* kbr%: "21-Oct-85 15:08") (* ; @@ -2697,10 +2700,8 @@ (CL:UNLESS (AND (IGEQ CHARSET 0) (ILEQ CHARSET \MAXCHARSET)) (LISPERROR "ILLEGAL ARG" CHARSET)) - (LET ((DUMMYINDEX 256) - (MAXCODE 255) - STREAM CSINFO FIRSTCHAR LASTCHAR WIDTHS MAXWIDTH LENGTH RASTERWIDTH DUMMYCHAR DUMMYOFFSET - PREVIOUSOFFSET OFFSETS) + (LET (STREAM CSINFO FIRSTCHAR LASTCHAR WIDTHS MAXWIDTH LENGTH RASTERWIDTH DUMMYCHAR DUMMYOFFSET + PREVIOUSOFFSET OFFSETS) (SETQ CSINFO (\GETCHARSETINFO CHARSET FONT T)) (CL:UNLESS CSINFO (ERROR "Couldn't find charset " CHARSET)) (SETQ WIDTHS (fetch (CHARSETINFO WIDTHS) of CSINFO)) @@ -3347,6 +3348,18 @@ (RPAQ? DISPLAYFONTDIRECTORIES '({DSK}/USR/LOCAL/LDE/FONTS/DISPLAY/PRESENTATION/ {dsk}/usr/local/lde/fonts/display/publishing/)) ) +(DECLARE%: EVAL@COMPILE DONTCOPY +(DECLARE%: EVAL@COMPILE + +(RPAQQ MAXCODE 255) + +(RPAQQ DUMMYINDEX 256) + + +(CONSTANTS (MAXCODE 255) + (DUMMYINDEX 256)) +) +) (DECLARE%: EVAL@COMPILE (PUTPROPS \FGETCHARIMAGEWIDTH MACRO (OPENLAMBDA (FONT CHARCODE) @@ -3381,31 +3394,31 @@ (ADDTOVAR LAMA FONTCOPY) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (8703 18222 (CHARWIDTH 8713 . 9498) (CHARWIDTHY 9500 . 10870) (STRINGWIDTH 10872 . 11965 -) (\CHARWIDTH.DISPLAY 11967 . 12380) (\STRINGWIDTH.DISPLAY 12382 . 12806) (\STRINGWIDTH.GENERIC 12808 - . 18220)) (18223 24605 (DEFAULTFONT 18233 . 20066) (FONTCLASS 20068 . 22230) (FONTCLASSUNPARSE 22232 - . 23131) (FONTCLASSCOMPONENT 23133 . 23642) (SETFONTCLASSCOMPONENT 23644 . 24603)) (25279 38011 ( -FONTCREATE 25289 . 34556) (\FONT.SYMBOLMEMB 34558 . 34788) (\FONT.SYMBOLASSOC 34790 . 35948) ( -\FONT.COMPARESYMBOL 35950 . 38009)) (38050 42674 (FONTASCENT 38060 . 38228) (FONTDESCENT 38230 . 38499 -) (FONTHEIGHT 38501 . 38687) (FONTPROP 38689 . 42132) (\AVGCHARWIDTH 42134 . 42672)) (42721 55360 ( -GETCHARBITMAP 42731 . 45621) (PUTCHARBITMAP 45623 . 53680) (MOVECHARBITMAP 53682 . 55358)) (55361 -139900 (FONTCOPY 55371 . 60679) (FONTSAVAILABLE 60681 . 65886) (FONTFILEFORMAT 65888 . 67512) (FONTP -67514 . 67813) (FONTUNPARSE 67815 . 70379) (SETFONTDESCRIPTOR 70381 . 72090) (CHARCODEP 72092 . 72453) - (EDITCHAR 72455 . 72884) (\STREAMCHARWIDTH 72886 . 77050) (\UNITWIDTHSVECTOR 77052 . 77415) ( -\CREATEDISPLAYFONT 77417 . 78170) (\CREATECHARSET.DISPLAY 78172 . 81088) (\CREATE-REAL-CHARSET.DISPLAY - 81090 . 87994) (\BUILDSLUGCSINFO 87996 . 89439) (\SEARCHDISPLAYFONTFILES 89441 . 91374) ( -\SEARCHFONTFILES 91376 . 94687) (\FINDFONTFILE 94689 . 95880) (\FONTSYMBOL 95882 . 96532) ( -\DEVICESYMBOL 96534 . 97403) (\FONTFACE 97405 . 104595) (\FONTFACE.COLOR 104597 . 111517) ( -\FONTFILENAME 111519 . 114934) (\FONTFILENAME.OLD 114936 . 117885) (\FONTFILENAME.NEW 117887 . 120144) - (\FONTINFOFROMFILENAME 120146 . 123260) (\FONTINFOFROMFILENAME.OLD 123262 . 125539) (\GETFONTDESC -125541 . 125932) (\COERCEFONTDESC 125934 . 131319) (\LOOKUPFONT 131321 . 132665) (\LOOKUPFONTSINCORE -132667 . 134740) (\READDISPLAYFONTFILE 134742 . 139898)) (140803 157527 (\READSTRIKEFONTFILE 140813 . -145015) (\SFMAKEBOLD 145017 . 147413) (\SFMAKEITALIC 147415 . 150318) (\SFMAKEROTATEDFONT 150320 . -151721) (\SFROTATECSINFO 151723 . 152360) (\SFROTATEFONTCHARACTERS 152362 . 152742) ( -\SFFIXOFFSETSAFTERROTATION 152744 . 154883) (\SFROTATECSINFOOFFSETS 154885 . 156154) (\SFMAKECOLOR -156156 . 157525)) (157528 164935 (WRITESTRIKEFONTFILE 157538 . 161475) (STRIKECSINFO 161477 . 164933)) - (164936 166775 (FONTDESCRIPTOR.DEFPRINT 164946 . 166297) (FONTCLASS.DEFPRINT 166299 . 166773)) ( -181971 182293 (\CREATEKERNELEMENT 181971 . 182293)) (182295 182423 (\FSETLEFTKERN 182295 . 182423)) ( -182549 183596 (\FGETLEFTKERN 182559 . 183594)) (183640 187150 (\CREATECHARSET 183650 . 185401) ( -\INSTALLCHARSETINFO 185403 . 187148)) (188305 190057 (\FONTRESETCHARWIDTHS 188315 . 190055))))) + (FILEMAP (NIL (8870 18389 (CHARWIDTH 8880 . 9665) (CHARWIDTHY 9667 . 11037) (STRINGWIDTH 11039 . 12132 +) (\CHARWIDTH.DISPLAY 12134 . 12547) (\STRINGWIDTH.DISPLAY 12549 . 12973) (\STRINGWIDTH.GENERIC 12975 + . 18387)) (18390 24772 (DEFAULTFONT 18400 . 20233) (FONTCLASS 20235 . 22397) (FONTCLASSUNPARSE 22399 + . 23298) (FONTCLASSCOMPONENT 23300 . 23809) (SETFONTCLASSCOMPONENT 23811 . 24770)) (25446 38178 ( +FONTCREATE 25456 . 34723) (\FONT.SYMBOLMEMB 34725 . 34955) (\FONT.SYMBOLASSOC 34957 . 36115) ( +\FONT.COMPARESYMBOL 36117 . 38176)) (38217 42841 (FONTASCENT 38227 . 38395) (FONTDESCENT 38397 . 38666 +) (FONTHEIGHT 38668 . 38854) (FONTPROP 38856 . 42299) (\AVGCHARWIDTH 42301 . 42839)) (42888 55527 ( +GETCHARBITMAP 42898 . 45788) (PUTCHARBITMAP 45790 . 53847) (MOVECHARBITMAP 53849 . 55525)) (55528 +140067 (FONTCOPY 55538 . 60846) (FONTSAVAILABLE 60848 . 66053) (FONTFILEFORMAT 66055 . 67679) (FONTP +67681 . 67980) (FONTUNPARSE 67982 . 70546) (SETFONTDESCRIPTOR 70548 . 72257) (CHARCODEP 72259 . 72620) + (EDITCHAR 72622 . 73051) (\STREAMCHARWIDTH 73053 . 77217) (\UNITWIDTHSVECTOR 77219 . 77582) ( +\CREATEDISPLAYFONT 77584 . 78337) (\CREATECHARSET.DISPLAY 78339 . 81255) (\CREATE-REAL-CHARSET.DISPLAY + 81257 . 88161) (\BUILDSLUGCSINFO 88163 . 89606) (\SEARCHDISPLAYFONTFILES 89608 . 91541) ( +\SEARCHFONTFILES 91543 . 94854) (\FINDFONTFILE 94856 . 96047) (\FONTSYMBOL 96049 . 96699) ( +\DEVICESYMBOL 96701 . 97570) (\FONTFACE 97572 . 104762) (\FONTFACE.COLOR 104764 . 111684) ( +\FONTFILENAME 111686 . 115101) (\FONTFILENAME.OLD 115103 . 118052) (\FONTFILENAME.NEW 118054 . 120311) + (\FONTINFOFROMFILENAME 120313 . 123427) (\FONTINFOFROMFILENAME.OLD 123429 . 125706) (\GETFONTDESC +125708 . 126099) (\COERCEFONTDESC 126101 . 131486) (\LOOKUPFONT 131488 . 132832) (\LOOKUPFONTSINCORE +132834 . 134907) (\READDISPLAYFONTFILE 134909 . 140065)) (140970 157694 (\READSTRIKEFONTFILE 140980 . +145182) (\SFMAKEBOLD 145184 . 147580) (\SFMAKEITALIC 147582 . 150485) (\SFMAKEROTATEDFONT 150487 . +151888) (\SFROTATECSINFO 151890 . 152527) (\SFROTATEFONTCHARACTERS 152529 . 152909) ( +\SFFIXOFFSETSAFTERROTATION 152911 . 155050) (\SFROTATECSINFOOFFSETS 155052 . 156321) (\SFMAKECOLOR +156323 . 157692)) (157695 165057 (WRITESTRIKEFONTFILE 157705 . 161597) (STRIKECSINFO 161599 . 165055)) + (165058 166897 (FONTDESCRIPTOR.DEFPRINT 165068 . 166419) (FONTCLASS.DEFPRINT 166421 . 166895)) ( +182093 182415 (\CREATEKERNELEMENT 182093 . 182415)) (182417 182545 (\FSETLEFTKERN 182417 . 182545)) ( +182671 183718 (\FGETLEFTKERN 182681 . 183716)) (183762 187272 (\CREATECHARSET 183772 . 185523) ( +\INSTALLCHARSETINFO 185525 . 187270)) (188427 190179 (\FONTRESETCHARWIDTHS 188437 . 190177))))) STOP diff --git a/sources/FONT.LCOM b/sources/FONT.LCOM index ee1e02be63e671052493849be5a6166b61e6226b..4f13ebbeed9682d7f0e5877b330bd9bdad7c37e0 100644 GIT binary patch delta 1147 zcmY*Y&1(}u6yHtJ+6dAZYzv~k9tz1p*qPZ)c8iBhcBk#yO?KJYeuP$tR?yOu2fvCC zK@bEFhVfW09z+z85(;|i!GFSo7rlA&=D~|IyGfJm;qAOPzkOf7-@f~q`~EBUYUd2X zi`ZU7sJlmXv-|1EAYcfjqe&BxgY2r<)vuger!j}6u$j1FgO_{H^{s;MF*l$wTUZ3P zPJ^1fiTr?pm!hH;l-#h%6WUBTl=2O_>4qKyY*}R}d25YE%WryYQwA#H$N8%wU%aU2 z#X@ma+$+xM`QD4-)WqpBXdiRBct3M}>KZ+oY-{one`jv!jwoEZFaro1u3|6*%dih$Z+g3RnTMHg^G-MY~6PmZ#C*+02WC>qZrc= zFX!hvMn+aZIWOl+Q=Zjsna1-p$M5#(Wv{FF8${ zD1ctOoo?y%aqUpwNsn(2bxZud-lx78lR-h;3D2eI(*R;Sumn$!@fRKeqsS^*H# z$ym(Ti-2GUB<1Q-Dv@)gz_7^_6xmshR2o1e&nYT%v26p3<1hwn6Obx(X#!YoCB=k9 z*2QwQBU%7V#wL`1Mn7XH!Kg}v^N4qd0nIQ=Y+{91RDp>|npja7`%xmxnzEl0Jrc(r z=#exr=?E7GNQD$L{ZvR+*!BvUm$8$yBF4qD#|OGCV85I*jo#}1R^>mkG$5Y< delta 990 zcmZWozi-n(6pkG#XjobWn(|A1-4e0*?rg`dkjTZpva5XNe7v9$R-o*M4)r%g zgg-6bR0{laak2lSIGbO91`u#rgRc8&BMj0Cx`E-Ot8* zepEY9?q=qz0|oK!<8J=yQ77S%MvIW-d=@|eEwWnnh+c!x@ru`pn z{QF+Li%kdw<+72EWdTVw=$f6~l@i2Wl*&_qZ@fLk)<@ezEOTsDjelf0i^%{