github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-03-05 19:19:56 +00:00
Code Issues Projects Releases Wiki Activity

Remove outdated FONTDESCRIPTOR fields (#1910)

Browse Source
This commit is contained in:
rmkaplan
2024-12-23 22:52:36 -08:00
committed by GitHub
parent abdb128636
commit e1c594b28c
2 changed files with 103 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
sources/FONT
View File

@@ -1,17 +1,15 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "12-Jul-2022 15:09:31" {DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>FONT.;11 187571
(FILECREATED "14-Dec-2024 16:52:43" {WMEDLEY}<sources>FONT.;16 190016
:CHANGES-TO (FNS \INSTALLCHARSETINFO \CREATECHARSET WRITESTRIKEFONTFILE \READSTRIKEFONTFILE)
(VARS FONTCOMS)
:EDIT-BY rmk
:PREVIOUS-DATE "11-Jul-2022 23:05:20"
{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>FONT.;3)
:CHANGES-TO (VARS FONTCOMS)
(RECORDS FONTCLASS FONTDESCRIPTOR)
(FNS FONTCLASS.DEFPRINT)
:PREVIOUS-DATE "14-Dec-2024 09:13:44" {WMEDLEY}<sources>FONT.;15)
(* ; "
Copyright (c) 1981-1994, 1999, 2021 by Venue & Xerox Corporation.
")
(PRETTYCOMPRINT FONTCOMS)
@@ -81,6 +79,7 @@ Copyright (c) 1981-1994, 1999, 2021 by Venue & Xerox Corporation.
\SFROTATEFONTCHARACTERS \SFFIXOFFSETSAFTERROTATION \SFROTATECSINFOOFFSETS
\SFMAKECOLOR)
(FNS WRITESTRIKEFONTFILE STRIKECSINFO))
(FNS FONTDESCRIPTOR.DEFPRINT FONTCLASS.DEFPRINT)
(INITRECORDS FONTCLASS FONTDESCRIPTOR CHARSETINFO)
(SYSRECORDS FONTCLASS FONTDESCRIPTOR CHARSETINFO)
(INITVARS (\FONTSINCORE)
@@ -2814,6 +2813,48 @@ Copyright (c) 1981-1994, 1999, 2021 by Venue & Xerox Corporation.
CHARSETASCENT _ (fetch (CHARSETINFO CHARSETASCENT) of CSINFO)
CHARSETDESCENT _ (fetch (CHARSETINFO CHARSETDESCENT) of CSINFO])
)
(DEFINEQ
(FONTDESCRIPTOR.DEFPRINT
[LAMBDA (FONT STREAM) (* ; "Edited 14-Dec-2024 09:13 by rmk")
(LET ((LOC (LOC FONT))
(FACE (fetch (FONTDESCRIPTOR FONTFACE) of FONT)))
(* ;; "Could lowercase the family, but maybe too dangerous if a BREAK on L-CASE.")
(* ;; "Somehow flag the device too?")
(CONS (CONCAT "{" (fetch (FONTDESCRIPTOR FONTFAMILY) of FONT)
(fetch (FONTDESCRIPTOR FONTSIZE) of FONT)
"-"
(SELECTQ (fetch (FONTFACE WEIGHT) of FACE)
(MEDIUM 'M)
(BOLD 'B)
(fetch (FONTFACE WEIGHT) of FACE))
(SELECTQ (fetch (FONTFACE SLOPE) of FACE)
(ITALIC 'I)
(REGULAR 'R)
(fetch (FONTFACE SLOPE) of FACE))
(SELECTQ (fetch (FONTFACE EXPANSION) of FACE)
(REGULAR 'R)
(fetch (FONTFACE EXPANSION) of FACE))
"/"
(OCTALSTRING (CAR LOC))
","
(OCTALSTRING (CDR LOC))
"}"])
(FONTCLASS.DEFPRINT
[LAMBDA (FONTCLASS STREAM) (* ; "Edited 14-Dec-2024 16:51 by rmk")
(LET ((LOC (LOC FONTCLASS)))
(CONS (CONCAT "{" (OR (fetch (FONTCLASS FONTCLASSNAME) of FONTCLASS)
'FONTCLASS)
"/"
(OCTALSTRING (CAR LOC))
","
(OCTALSTRING (CDR LOC))
"}"])
)
(/DECLAREDATATYPE 'FONTCLASS '(BYTE POINTER POINTER POINTER POINTER POINTER)
'((FONTCLASS 0 (BITS . 7))
@@ -2824,6 +2865,8 @@ Copyright (c) 1981-1994, 1999, 2021 by Venue & Xerox Corporation.
(FONTCLASS 10 POINTER))
'12)
(DEFPRINT 'FONTCLASS (FUNCTION FONTCLASS.DEFPRINT))
(/DECLAREDATATYPE 'FONTDESCRIPTOR
'(POINTER POINTER POINTER POINTER WORD WORD WORD WORD SIGNEDWORD SIGNEDWORD SIGNEDWORD
SIGNEDWORD POINTER POINTER POINTER POINTER POINTER (BITS 8)
@@ -2852,6 +2895,8 @@ Copyright (c) 1981-1994, 1999, 2021 by Venue & Xerox Corporation.
(FONTDESCRIPTOR 32 POINTER))
'34)
(DEFPRINT 'FONTDESCRIPTOR (FUNCTION FONTDESCRIPTOR.DEFPRINT))
(/DECLAREDATATYPE 'CHARSETINFO '(POINTER POINTER POINTER POINTER POINTER WORD WORD POINTER)
'((CHARSETINFO 0 POINTER)
(CHARSETINFO 2 POINTER)
@@ -2875,12 +2920,12 @@ Copyright (c) 1981-1994, 1999, 2021 by Venue & Xerox Corporation.
(\SFDescent WORD)
(\SFHeight WORD)
(ROTATION WORD)
(FBBOX SIGNEDWORD)
(FBBOY SIGNEDWORD)
(FBBDX SIGNEDWORD)
(FBBDY SIGNEDWORD)
(\SFLKerns POINTER)
(\SFRWidths POINTER)
(NIL SIGNEDWORD)
(NIL SIGNEDWORD)
(NIL SIGNEDWORD)
(NIL SIGNEDWORD)
(NIL POINTER)
(NIL POINTER)
(FONTDEVICESPEC POINTER)
(OTHERDEVICEFONTPROPS POINTER)
(FONTSCALE POINTER)
@@ -2931,7 +2976,8 @@ Copyright (c) 1981-1994, 1999, 2021 by Venue & Xerox Corporation.
(* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE
(DATATYPE FONTCLASS ((PRETTYFONT# BYTE)
DISPLAYFD PRESSFD INTERPRESSFD OTHERFDS FONTCLASSNAME))
DISPLAYFD PRESSFD INTERPRESSFD OTHERFDS FONTCLASSNAME)
(INIT (DEFPRINT 'FONTCLASS (FUNCTION FONTCLASS.DEFPRINT))))
(DATATYPE FONTDESCRIPTOR ((FONTDEVICE POINTER)
(FONTFAMILY POINTER)
@@ -2941,12 +2987,15 @@ Copyright (c) 1981-1994, 1999, 2021 by Venue & Xerox Corporation.
(\SFDescent WORD)
(\SFHeight WORD)
(ROTATION WORD)
(FBBOX SIGNEDWORD)
(FBBOY SIGNEDWORD)
(FBBDX SIGNEDWORD)
(FBBDY SIGNEDWORD)
(\SFLKerns POINTER)
(\SFRWidths POINTER)
(NIL SIGNEDWORD)
(* ;; "Was FBBOX. The fields are NIL'ed out now because they became irrelevant when multiple charsets were introduced. They remain as a place-holder in the layout pending a recompile of all referring functions.")
(NIL SIGNEDWORD) (* ; "Was FBBOY")
(NIL SIGNEDWORD) (* ; "Was FBBDX")
(NIL SIGNEDWORD) (* ; "Was FBBDY")
(NIL POINTER) (* ; "Was \SFLKerns")
(NIL POINTER) (* ; "Was \SFRWidths")
(FONTDEVICESPEC POINTER) (* ;
 "Holds the spec by which the font is known to the printing device, if coercion has been done")
(OTHERDEVICEFONTPROPS POINTER) (* ;
@@ -2958,7 +3007,8 @@ Copyright (c) 1981-1994, 1999, 2021 by Venue & Xerox Corporation.
(FONTIMAGEWIDTHS POINTER) (* ; "This is the image width, as opposed to the advanced width; initial hack for accents, kerning. Fields is referenced by FONTCREATE.")
(FONTCHARSETVECTOR POINTER) (* ; "A 256-pointer block, with one pointer per 'character set' --each group of 256 character codes. Each pointer is either NIL if there's no info for that charset, or is a CHARSETINFO, containing widths, char bitmap, etc for the characters in that charset.")
(FONTEXTRAFIELD2 POINTER))
FONTCHARSETVECTOR _ (\CREATEFONTCHARSETVECTOR))
FONTCHARSETVECTOR _ (\CREATEFONTCHARSETVECTOR)
(INIT (DEFPRINT 'FONTDESCRIPTOR (FUNCTION FONTDESCRIPTOR.DEFPRINT))))
(RECORD FONTFACE (WEIGHT SLOPE EXPANSION)
[ACCESSFNS ((COLOR (CDDDR DATUM)
@@ -3010,6 +3060,8 @@ Copyright (c) 1981-1994, 1999, 2021 by Venue & Xerox Corporation.
(FONTCLASS 10 POINTER))
'12)
(DEFPRINT 'FONTCLASS (FUNCTION FONTCLASS.DEFPRINT))
(/DECLAREDATATYPE 'FONTDESCRIPTOR
'(POINTER POINTER POINTER POINTER WORD WORD WORD WORD SIGNEDWORD SIGNEDWORD SIGNEDWORD
SIGNEDWORD POINTER POINTER POINTER POINTER POINTER (BITS 8)
@@ -3038,6 +3090,8 @@ Copyright (c) 1981-1994, 1999, 2021 by Venue & Xerox Corporation.
(FONTDESCRIPTOR 32 POINTER))
'34)
(DEFPRINT 'FONTDESCRIPTOR (FUNCTION FONTDESCRIPTOR.DEFPRINT))
(/DECLAREDATATYPE 'CHARSETINFO '(POINTER POINTER POINTER POINTER POINTER WORD WORD POINTER)
'((CHARSETINFO 0 POINTER)
(CHARSETINFO 2 POINTER)
@@ -3304,33 +3358,32 @@ Copyright (c) 1981-1994, 1999, 2021 by Venue & Xerox Corporation.
(ADDTOVAR LAMA FONTCOPY)
)
(PUTPROPS FONT COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1989
1990 1991 1992 1993 1994 1999 2021))
(DECLARE%: DONTCOPY
(FILEMAP (NIL (8812 18331 (CHARWIDTH 8822 . 9607) (CHARWIDTHY 9609 . 10979) (STRINGWIDTH 10981 . 12074
) (\CHARWIDTH.DISPLAY 12076 . 12489) (\STRINGWIDTH.DISPLAY 12491 . 12915) (\STRINGWIDTH.GENERIC 12917
. 18329)) (18332 24714 (DEFAULTFONT 18342 . 20175) (FONTCLASS 20177 . 22339) (FONTCLASSUNPARSE 22341
. 23240) (FONTCLASSCOMPONENT 23242 . 23751) (SETFONTCLASSCOMPONENT 23753 . 24712)) (25388 38120 (
FONTCREATE 25398 . 34665) (\FONT.SYMBOLMEMB 34667 . 34897) (\FONT.SYMBOLASSOC 34899 . 36057) (
\FONT.COMPARESYMBOL 36059 . 38118)) (38159 42783 (FONTASCENT 38169 . 38337) (FONTDESCENT 38339 . 38608
) (FONTHEIGHT 38610 . 38796) (FONTPROP 38798 . 42241) (\AVGCHARWIDTH 42243 . 42781)) (42830 55469 (
GETCHARBITMAP 42840 . 45730) (PUTCHARBITMAP 45732 . 53789) (MOVECHARBITMAP 53791 . 55467)) (55470
140009 (FONTCOPY 55480 . 60788) (FONTSAVAILABLE 60790 . 65995) (FONTFILEFORMAT 65997 . 67621) (FONTP
67623 . 67922) (FONTUNPARSE 67924 . 70488) (SETFONTDESCRIPTOR 70490 . 72199) (CHARCODEP 72201 . 72562)
(EDITCHAR 72564 . 72993) (\STREAMCHARWIDTH 72995 . 77159) (\UNITWIDTHSVECTOR 77161 . 77524) (
\CREATEDISPLAYFONT 77526 . 78279) (\CREATECHARSET.DISPLAY 78281 . 81197) (\CREATE-REAL-CHARSET.DISPLAY
81199 . 88103) (\BUILDSLUGCSINFO 88105 . 89548) (\SEARCHDISPLAYFONTFILES 89550 . 91483) (
\SEARCHFONTFILES 91485 . 94796) (\FINDFONTFILE 94798 . 95989) (\FONTSYMBOL 95991 . 96641) (
\DEVICESYMBOL 96643 . 97512) (\FONTFACE 97514 . 104704) (\FONTFACE.COLOR 104706 . 111626) (
\FONTFILENAME 111628 . 115043) (\FONTFILENAME.OLD 115045 . 117994) (\FONTFILENAME.NEW 117996 . 120253)
(\FONTINFOFROMFILENAME 120255 . 123369) (\FONTINFOFROMFILENAME.OLD 123371 . 125648) (\GETFONTDESC
125650 . 126041) (\COERCEFONTDESC 126043 . 131428) (\LOOKUPFONT 131430 . 132774) (\LOOKUPFONTSINCORE
132776 . 134849) (\READDISPLAYFONTFILE 134851 . 140007)) (140912 157636 (\READSTRIKEFONTFILE 140922 .
145124) (\SFMAKEBOLD 145126 . 147522) (\SFMAKEITALIC 147524 . 150427) (\SFMAKEROTATEDFONT 150429 .
151830) (\SFROTATECSINFO 151832 . 152469) (\SFROTATEFONTCHARACTERS 152471 . 152851) (
\SFFIXOFFSETSAFTERROTATION 152853 . 154992) (\SFROTATECSINFOOFFSETS 154994 . 156263) (\SFMAKECOLOR
156265 . 157634)) (157637 164890 (WRITESTRIKEFONTFILE 157647 . 161430) (STRIKECSINFO 161432 . 164888))
(178935 179098 (\CREATEKERNELEMENT 178935 . 179098)) (179100 179228 (\FSETLEFTKERN 179100 . 179228))
(179230 179324 (\FGETLEFTKERN 179230 . 179324)) (179493 183003 (\CREATECHARSET 179503 . 181254) (
\INSTALLCHARSETINFO 181256 . 183001)) (184158 185910 (\FONTRESETCHARWIDTHS 184168 . 185908)))))
(FILEMAP (NIL (8729 18248 (CHARWIDTH 8739 . 9524) (CHARWIDTHY 9526 . 10896) (STRINGWIDTH 10898 . 11991
) (\CHARWIDTH.DISPLAY 11993 . 12406) (\STRINGWIDTH.DISPLAY 12408 . 12832) (\STRINGWIDTH.GENERIC 12834
. 18246)) (18249 24631 (DEFAULTFONT 18259 . 20092) (FONTCLASS 20094 . 22256) (FONTCLASSUNPARSE 22258
. 23157) (FONTCLASSCOMPONENT 23159 . 23668) (SETFONTCLASSCOMPONENT 23670 . 24629)) (25305 38037 (
FONTCREATE 25315 . 34582) (\FONT.SYMBOLMEMB 34584 . 34814) (\FONT.SYMBOLASSOC 34816 . 35974) (
\FONT.COMPARESYMBOL 35976 . 38035)) (38076 42700 (FONTASCENT 38086 . 38254) (FONTDESCENT 38256 . 38525
) (FONTHEIGHT 38527 . 38713) (FONTPROP 38715 . 42158) (\AVGCHARWIDTH 42160 . 42698)) (42747 55386 (
GETCHARBITMAP 42757 . 45647) (PUTCHARBITMAP 45649 . 53706) (MOVECHARBITMAP 53708 . 55384)) (55387
139926 (FONTCOPY 55397 . 60705) (FONTSAVAILABLE 60707 . 65912) (FONTFILEFORMAT 65914 . 67538) (FONTP
67540 . 67839) (FONTUNPARSE 67841 . 70405) (SETFONTDESCRIPTOR 70407 . 72116) (CHARCODEP 72118 . 72479)
(EDITCHAR 72481 . 72910) (\STREAMCHARWIDTH 72912 . 77076) (\UNITWIDTHSVECTOR 77078 . 77441) (
\CREATEDISPLAYFONT 77443 . 78196) (\CREATECHARSET.DISPLAY 78198 . 81114) (\CREATE-REAL-CHARSET.DISPLAY
81116 . 88020) (\BUILDSLUGCSINFO 88022 . 89465) (\SEARCHDISPLAYFONTFILES 89467 . 91400) (
\SEARCHFONTFILES 91402 . 94713) (\FINDFONTFILE 94715 . 95906) (\FONTSYMBOL 95908 . 96558) (
\DEVICESYMBOL 96560 . 97429) (\FONTFACE 97431 . 104621) (\FONTFACE.COLOR 104623 . 111543) (
\FONTFILENAME 111545 . 114960) (\FONTFILENAME.OLD 114962 . 117911) (\FONTFILENAME.NEW 117913 . 120170)
(\FONTINFOFROMFILENAME 120172 . 123286) (\FONTINFOFROMFILENAME.OLD 123288 . 125565) (\GETFONTDESC
125567 . 125958) (\COERCEFONTDESC 125960 . 131345) (\LOOKUPFONT 131347 . 132691) (\LOOKUPFONTSINCORE
132693 . 134766) (\READDISPLAYFONTFILE 134768 . 139924)) (140829 157553 (\READSTRIKEFONTFILE 140839 .
145041) (\SFMAKEBOLD 145043 . 147439) (\SFMAKEITALIC 147441 . 150344) (\SFMAKEROTATEDFONT 150346 .
151747) (\SFROTATECSINFO 151749 . 152386) (\SFROTATEFONTCHARACTERS 152388 . 152768) (
\SFFIXOFFSETSAFTERROTATION 152770 . 154909) (\SFROTATECSINFOOFFSETS 154911 . 156180) (\SFMAKECOLOR
156182 . 157551)) (157554 164807 (WRITESTRIKEFONTFILE 157564 . 161347) (STRIKECSINFO 161349 . 164805))
(164808 166647 (FONTDESCRIPTOR.DEFPRINT 164818 . 166169) (FONTCLASS.DEFPRINT 166171 . 166645)) (
181517 181680 (\CREATEKERNELEMENT 181517 . 181680)) (181682 181810 (\FSETLEFTKERN 181682 . 181810)) (
181812 181906 (\FGETLEFTKERN 181812 . 181906)) (182075 185585 (\CREATECHARSET 182085 . 183836) (
\INSTALLCHARSETINFO 183838 . 185583)) (186740 188492 (\FONTRESETCHARWIDTHS 186750 . 188490)))))
STOP

BIN
sources/FONT.LCOM
View File

Binary file not shown.