Fix unbound vars errors in WRITESTRIKEFONTFILE from earlier edit. (#2003)

Author: MattHeffron

lispusers/EDITFONT

@@ -1,18 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "12-Jul-2022 14:18:56" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>EDITFONT.;10
 28741  
+
(FILECREATED " 1-Feb-2025 12:28:41" {DSK}<home>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}<users>kaplan>local>medley3.5>working-medley>lispusers>EDITFONT.;5)
+      :CHANGES-TO (VARS EDITFONTCOMS)
 
+      :PREVIOUS-DATE "12-Jul-2022 14:18:56" {DSK}<home>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

lispusers/EDITFONT.LCOM

@@ -1,14 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "19-Dec-2024 15:25:17" {WMEDLEY}<sources>FONT.;26
 191458 
+
(FILECREATED " 1-Feb-2025 12:28:10" {DSK}<home>matt>Interlisp>medley>sources>FONT.;4
 191871 
 
-      :EDIT-BY rmk
+      :EDIT-BY "mth"
 
-      :CHANGES-TO (FNS \FGETLEFTKERN)
-                  (VARS FONTCOMS)
-                  (FUNCTIONS \CREATEKERNELEMENT)
+      :CHANGES-TO (VARS FONTCOMS)
+                  (FNS WRITESTRIKEFONTFILE)
 
-      :PREVIOUS-DATE "19-Dec-2024 11:52:01" {WMEDLEY}<sources>FONT.;18)
+      :PREVIOUS-DATE "19-Dec-2024 15:25:17" {DSK}<home>matt>Interlisp>medley>sources>FONT.;1)
 
 
 (PRETTYCOMPRINT FONTCOMS)
@@ -137,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)
@@ -2688,7 +2689,8 @@
 (DEFINEQ
 
 (WRITESTRIKEFONTFILE

-  [LAMBDA (FONT CHARSET FILE)
                                (* ; "Edited 12-Jul-2022 14:36 by rmk")

+  [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")

                                                              (* ; 
 
                                                           "Write strike FILE using info in FONT.  *")

@@ -3346,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)
@@ -3380,31 +3394,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 (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