Skip to content

Commit 402a861

Browse files
committed
Fix unbound vars errors in WRITESTRIKEFONTFILE from earlier edit.
1 parent d909001 commit 402a861

File tree

2 files changed

+37
-36
lines changed

2 files changed

+37
-36
lines changed

sources/FONT

Lines changed: 37 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
22

3-
(FILECREATED "19-Dec-2024 15:25:17" {WMEDLEY}<sources>FONT.;26 191458
3+
(FILECREATED " 1-Feb-2025 00:24:33" {DSK}<home>matt>Interlisp>medley>sources>FONT.;2 191581
44

5-
:EDIT-BY rmk
5+
:EDIT-BY "mth"
66

7-
:CHANGES-TO (FNS \FGETLEFTKERN)
8-
(VARS FONTCOMS)
9-
(FUNCTIONS \CREATEKERNELEMENT)
7+
:CHANGES-TO (FNS WRITESTRIKEFONTFILE)
108

11-
:PREVIOUS-DATE "19-Dec-2024 11:52:01" {WMEDLEY}<sources>FONT.;18)
9+
:PREVIOUS-DATE "19-Dec-2024 15:25:17" {DSK}<home>matt>Interlisp>medley>sources>FONT.;1)
1210

1311

1412
(PRETTYCOMPRINT FONTCOMS)
@@ -2688,7 +2686,8 @@
26882686
(DEFINEQ
26892687

26902688
(WRITESTRIKEFONTFILE
2691-
[LAMBDA (FONT CHARSET FILE) (* ; "Edited 12-Jul-2022 14:36 by rmk")
2689+
[LAMBDA (FONT CHARSET FILE) (* ; "Edited 1-Feb-2025 00:24 by mth")
2690+
(* ; "Edited 12-Jul-2022 14:36 by rmk")
26922691
(* kbr%: "21-Oct-85 15:08")
26932692
(* ;
26942693
 "Write strike FILE using info in FONT. *")
@@ -2698,8 +2697,10 @@
26982697
(CL:UNLESS (AND (IGEQ CHARSET 0)
26992698
(ILEQ CHARSET \MAXCHARSET))
27002699
(LISPERROR "ILLEGAL ARG" CHARSET))
2701-
(LET (STREAM CSINFO FIRSTCHAR LASTCHAR WIDTHS MAXWIDTH LENGTH RASTERWIDTH DUMMYCHAR DUMMYOFFSET
2702-
PREVIOUSOFFSET OFFSETS)
2700+
(LET ((DUMMYINDEX 256)
2701+
(MAXCODE 255)
2702+
STREAM CSINFO FIRSTCHAR LASTCHAR WIDTHS MAXWIDTH LENGTH RASTERWIDTH DUMMYCHAR DUMMYOFFSET
2703+
PREVIOUSOFFSET OFFSETS)
27032704
(SETQ CSINFO (\GETCHARSETINFO CHARSET FONT T))
27042705
(CL:UNLESS CSINFO (ERROR "Couldn't find charset " CHARSET))
27052706
(SETQ WIDTHS (fetch (CHARSETINFO WIDTHS) of CSINFO))
@@ -3380,31 +3381,31 @@
33803381
(ADDTOVAR LAMA FONTCOPY)
33813382
)
33823383
(DECLARE%: DONTCOPY
3383-
(FILEMAP (NIL (8734 18253 (CHARWIDTH 8744 . 9529) (CHARWIDTHY 9531 . 10901) (STRINGWIDTH 10903 . 11996
3384-
) (\CHARWIDTH.DISPLAY 11998 . 12411) (\STRINGWIDTH.DISPLAY 12413 . 12837) (\STRINGWIDTH.GENERIC 12839
3385-
. 18251)) (18254 24636 (DEFAULTFONT 18264 . 20097) (FONTCLASS 20099 . 22261) (FONTCLASSUNPARSE 22263
3386-
. 23162) (FONTCLASSCOMPONENT 23164 . 23673) (SETFONTCLASSCOMPONENT 23675 . 24634)) (25310 38042 (
3387-
FONTCREATE 25320 . 34587) (\FONT.SYMBOLMEMB 34589 . 34819) (\FONT.SYMBOLASSOC 34821 . 35979) (
3388-
\FONT.COMPARESYMBOL 35981 . 38040)) (38081 42705 (FONTASCENT 38091 . 38259) (FONTDESCENT 38261 . 38530
3389-
) (FONTHEIGHT 38532 . 38718) (FONTPROP 38720 . 42163) (\AVGCHARWIDTH 42165 . 42703)) (42752 55391 (
3390-
GETCHARBITMAP 42762 . 45652) (PUTCHARBITMAP 45654 . 53711) (MOVECHARBITMAP 53713 . 55389)) (55392
3391-
139931 (FONTCOPY 55402 . 60710) (FONTSAVAILABLE 60712 . 65917) (FONTFILEFORMAT 65919 . 67543) (FONTP
3392-
67545 . 67844) (FONTUNPARSE 67846 . 70410) (SETFONTDESCRIPTOR 70412 . 72121) (CHARCODEP 72123 . 72484)
3393-
(EDITCHAR 72486 . 72915) (\STREAMCHARWIDTH 72917 . 77081) (\UNITWIDTHSVECTOR 77083 . 77446) (
3394-
\CREATEDISPLAYFONT 77448 . 78201) (\CREATECHARSET.DISPLAY 78203 . 81119) (\CREATE-REAL-CHARSET.DISPLAY
3395-
81121 . 88025) (\BUILDSLUGCSINFO 88027 . 89470) (\SEARCHDISPLAYFONTFILES 89472 . 91405) (
3396-
\SEARCHFONTFILES 91407 . 94718) (\FINDFONTFILE 94720 . 95911) (\FONTSYMBOL 95913 . 96563) (
3397-
\DEVICESYMBOL 96565 . 97434) (\FONTFACE 97436 . 104626) (\FONTFACE.COLOR 104628 . 111548) (
3398-
\FONTFILENAME 111550 . 114965) (\FONTFILENAME.OLD 114967 . 117916) (\FONTFILENAME.NEW 117918 . 120175)
3399-
(\FONTINFOFROMFILENAME 120177 . 123291) (\FONTINFOFROMFILENAME.OLD 123293 . 125570) (\GETFONTDESC
3400-
125572 . 125963) (\COERCEFONTDESC 125965 . 131350) (\LOOKUPFONT 131352 . 132696) (\LOOKUPFONTSINCORE
3401-
132698 . 134771) (\READDISPLAYFONTFILE 134773 . 139929)) (140834 157558 (\READSTRIKEFONTFILE 140844 .
3402-
145046) (\SFMAKEBOLD 145048 . 147444) (\SFMAKEITALIC 147446 . 150349) (\SFMAKEROTATEDFONT 150351 .
3403-
151752) (\SFROTATECSINFO 151754 . 152391) (\SFROTATEFONTCHARACTERS 152393 . 152773) (
3404-
\SFFIXOFFSETSAFTERROTATION 152775 . 154914) (\SFROTATECSINFOOFFSETS 154916 . 156185) (\SFMAKECOLOR
3405-
156187 . 157556)) (157559 164812 (WRITESTRIKEFONTFILE 157569 . 161352) (STRIKECSINFO 161354 . 164810))
3406-
(164813 166652 (FONTDESCRIPTOR.DEFPRINT 164823 . 166174) (FONTCLASS.DEFPRINT 166176 . 166650)) (
3407-
181848 182170 (\CREATEKERNELEMENT 181848 . 182170)) (182172 182300 (\FSETLEFTKERN 182172 . 182300)) (
3408-
182426 183473 (\FGETLEFTKERN 182436 . 183471)) (183517 187027 (\CREATECHARSET 183527 . 185278) (
3409-
\INSTALLCHARSETINFO 185280 . 187025)) (188182 189934 (\FONTRESETCHARWIDTHS 188192 . 189932)))))
3384+
(FILEMAP (NIL (8703 18222 (CHARWIDTH 8713 . 9498) (CHARWIDTHY 9500 . 10870) (STRINGWIDTH 10872 . 11965
3385+
) (\CHARWIDTH.DISPLAY 11967 . 12380) (\STRINGWIDTH.DISPLAY 12382 . 12806) (\STRINGWIDTH.GENERIC 12808
3386+
. 18220)) (18223 24605 (DEFAULTFONT 18233 . 20066) (FONTCLASS 20068 . 22230) (FONTCLASSUNPARSE 22232
3387+
. 23131) (FONTCLASSCOMPONENT 23133 . 23642) (SETFONTCLASSCOMPONENT 23644 . 24603)) (25279 38011 (
3388+
FONTCREATE 25289 . 34556) (\FONT.SYMBOLMEMB 34558 . 34788) (\FONT.SYMBOLASSOC 34790 . 35948) (
3389+
\FONT.COMPARESYMBOL 35950 . 38009)) (38050 42674 (FONTASCENT 38060 . 38228) (FONTDESCENT 38230 . 38499
3390+
) (FONTHEIGHT 38501 . 38687) (FONTPROP 38689 . 42132) (\AVGCHARWIDTH 42134 . 42672)) (42721 55360 (
3391+
GETCHARBITMAP 42731 . 45621) (PUTCHARBITMAP 45623 . 53680) (MOVECHARBITMAP 53682 . 55358)) (55361
3392+
139900 (FONTCOPY 55371 . 60679) (FONTSAVAILABLE 60681 . 65886) (FONTFILEFORMAT 65888 . 67512) (FONTP
3393+
67514 . 67813) (FONTUNPARSE 67815 . 70379) (SETFONTDESCRIPTOR 70381 . 72090) (CHARCODEP 72092 . 72453)
3394+
(EDITCHAR 72455 . 72884) (\STREAMCHARWIDTH 72886 . 77050) (\UNITWIDTHSVECTOR 77052 . 77415) (
3395+
\CREATEDISPLAYFONT 77417 . 78170) (\CREATECHARSET.DISPLAY 78172 . 81088) (\CREATE-REAL-CHARSET.DISPLAY
3396+
81090 . 87994) (\BUILDSLUGCSINFO 87996 . 89439) (\SEARCHDISPLAYFONTFILES 89441 . 91374) (
3397+
\SEARCHFONTFILES 91376 . 94687) (\FINDFONTFILE 94689 . 95880) (\FONTSYMBOL 95882 . 96532) (
3398+
\DEVICESYMBOL 96534 . 97403) (\FONTFACE 97405 . 104595) (\FONTFACE.COLOR 104597 . 111517) (
3399+
\FONTFILENAME 111519 . 114934) (\FONTFILENAME.OLD 114936 . 117885) (\FONTFILENAME.NEW 117887 . 120144)
3400+
(\FONTINFOFROMFILENAME 120146 . 123260) (\FONTINFOFROMFILENAME.OLD 123262 . 125539) (\GETFONTDESC
3401+
125541 . 125932) (\COERCEFONTDESC 125934 . 131319) (\LOOKUPFONT 131321 . 132665) (\LOOKUPFONTSINCORE
3402+
132667 . 134740) (\READDISPLAYFONTFILE 134742 . 139898)) (140803 157527 (\READSTRIKEFONTFILE 140813 .
3403+
145015) (\SFMAKEBOLD 145017 . 147413) (\SFMAKEITALIC 147415 . 150318) (\SFMAKEROTATEDFONT 150320 .
3404+
151721) (\SFROTATECSINFO 151723 . 152360) (\SFROTATEFONTCHARACTERS 152362 . 152742) (
3405+
\SFFIXOFFSETSAFTERROTATION 152744 . 154883) (\SFROTATECSINFOOFFSETS 154885 . 156154) (\SFMAKECOLOR
3406+
156156 . 157525)) (157528 164935 (WRITESTRIKEFONTFILE 157538 . 161475) (STRIKECSINFO 161477 . 164933))
3407+
(164936 166775 (FONTDESCRIPTOR.DEFPRINT 164946 . 166297) (FONTCLASS.DEFPRINT 166299 . 166773)) (
3408+
181971 182293 (\CREATEKERNELEMENT 181971 . 182293)) (182295 182423 (\FSETLEFTKERN 182295 . 182423)) (
3409+
182549 183596 (\FGETLEFTKERN 182559 . 183594)) (183640 187150 (\CREATECHARSET 183650 . 185401) (
3410+
\INSTALLCHARSETINFO 185403 . 187148)) (188305 190057 (\FONTRESETCHARWIDTHS 188315 . 190055)))))
34103411
STOP

sources/FONT.LCOM

-84 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)