Per review comment from Ron Kaplan, moved constants DUMMYINDEX and MAXCHAR from EDITFONT to FONT.

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,10 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 1-Feb-2025 00:24:33" {DSK}<home>matt>Interlisp>medley>sources>FONT.;2
 191581 
+
(FILECREATED " 1-Feb-2025 12:28:10" {DSK}<home>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}<home>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