Skip to content

Commit 69a8149

Browse files
rmkaplanrmkaplan
committed
Revert "FONT: add MCCSFONTFAMILIES variable"
This reverts commit 408e925.
1 parent 5612024 commit 69a8149

File tree

2 files changed

+58
-64
lines changed

2 files changed

+58
-64
lines changed

‎sources/FONT‎

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

3-
(FILECREATED "11-Nov-2025 14:30:56" {WMEDLEY}<sources>FONT.;628 286775
3+
(FILECREATED " 7-Nov-2025 11:53:58" {WMEDLEY}<sources>FONT.;626 286841
44

55
:EDIT-BY rmk
66

77
:CHANGES-TO (VARS FONTCOMS)
8-
(FNS \READCHARSET)
8+
(FNS MAKEFONTFACE MAKEFONTSPEC FONTSAVAILABLE)
99

10-
:PREVIOUS-DATE " 9-Nov-2025 17:56:14" {WMEDLEY}<sources>FONT.;627)
10+
:PREVIOUS-DATE "20-Oct-2025 09:54:15" {WMEDLEY}<sources>FONT.;622)
1111

1212

1313
(PRETTYCOMPRINT FONTCOMS)
@@ -26,7 +26,6 @@
2626
GETFONTCLASSCOMPONENT)
2727
(MACROS \GETFONTCLASSCOMPONENT \SETFONTCLASSCOMPONENT))
2828
(VARS NSFONTFAMILIES ALTOFONTFAMILIES)
29-
(INITVARS MCCSFONTFAMILIES)
3029
(COMS
3130
(* ;; "Creation: ")
3231

@@ -507,8 +506,6 @@
507506
(RPAQQ ALTOFONTFAMILIES (TIMESROMAN TIMESROMAND HELVETICA HELVETICAD CLARITY BRAVOX TONTO CREAM
508507
OLDENGLISH))
509508

510-
(RPAQ? MCCSFONTFAMILIES NIL)
511-
512509

513510

514511
(* ;; "Creation: ")
@@ -825,8 +822,7 @@
825822
(CLOSEF? STRM))))])
826823

827824
(\READCHARSET
828-
[LAMBDA (FONTSPEC CHARSET FONT) (* ; "Edited 11-Nov-2025 14:30 by rmk")
829-
(* ; "Edited 2-Sep-2025 23:57 by rmk")
825+
[LAMBDA (FONTSPEC CHARSET FONT) (* ; "Edited 2-Sep-2025 23:57 by rmk")
830826
(* ; "Edited 28-Aug-2025 23:17 by rmk")
831827
(* ; "Edited 25-Aug-2025 12:03 by rmk")
832828
(* ; "Edited 16-Aug-2025 18:00 by rmk")
@@ -860,15 +856,17 @@
860856
(* ;; "The file didn't know its own encoding")
861857

862858
(SETQ FAMILY (fetch (FONTSPEC FSFAMILY) of FONTSPEC))
863-
(CHARSETPROP CSINFO 'CSCHARENCODING
864-
(if (OR (NEQ CHARSET 0)
865-
(MEMB FAMILY MCCSFONTFAMILIES))
866-
then 'MCCS
867-
elseif (MEMB FAMILY NSFONTFAMILIES)
868-
then 'XCCS$
869-
elseif (MEMB FAMILY ALTOFONTFAMILIES)
870-
then 'ALTOTEXT
871-
else FAMILY)))
859+
(CHARSETPROP CSINFO 'CSCHARENCODING (if (NEQ CHARSET 0)
860+
then 'MCCS
861+
elseif (MEMB FAMILY
862+
NSFONTFAMILIES
863+
)
864+
then 'XCCS$
865+
elseif (MEMB FAMILY
866+
ALTOFONTFAMILIES
867+
)
868+
then 'ALTOTEXT
869+
else FAMILY)))
872870

873871
(* ;; "Remember the file that this basic charset information came from, before any character coercions, for informational purposes. Path and version won't be valid if sysout moves, or if PSEUDOFILENAME's aren't aligned. Don't want files to be new atoms, for loadup.")
874872

@@ -1001,8 +999,7 @@
1001999
(DEFINEQ
10021000

10031001
(COERCEFONTSPEC
1004-
[LAMBDA (FONTSPEC COERCIONS) (* ; "Edited 9-Nov-2025 17:54 by rmk")
1005-
(* ; "Edited 5-Oct-2025 09:41 by rmk")
1002+
[LAMBDA (FONTSPEC COERCIONS) (* ; "Edited 5-Oct-2025 09:41 by rmk")
10061003
(* ; "Edited 28-Aug-2025 14:41 by rmk")
10071004
(* ; "Edited 25-Aug-2025 10:22 by rmk")
10081005
(* ; "Edited 17-Aug-2025 19:15 by rmk")
@@ -1016,14 +1013,11 @@
10161013

10171014
(* ;; "Doesn't make sense to coerce the device, DEVICE and also CHARSET are just carried along.")
10181015

1019-
(CL:WHEN (LITATOM COERCIONS)
1020-
[SETQ COERCIONS (FONTDEVICEPROP FONTSPEC (OR COERCIONS 'FONTCOERCIONS])
1021-
10221016
(* ;; "A NIL match component matches everything, and a NIL target component denotes the corresponding argument.")
10231017

10241018
(for C MATCH TARGET MFAMILY MSIZE MFACE MROTATION TFAMILY TSIZE TFACE TROTATION COERCED FAMILY
1025-
SIZE FACE ROTATION DEVICE in COERCIONS first (SPREADFONTSPEC FONTSPEC)
1026-
eachtime (SETQ MATCH (MKLIST (CAR C)))
1019+
SIZE FACE ROTATION DEVICE in (OR COERCIONS (FONTDEVICEPROP FONTSPEC 'FONTCOERCIONS))
1020+
first (SPREADFONTSPEC FONTSPEC) eachtime (SETQ MATCH (MKLIST (CAR C)))
10271021
when [AND (COERCEFONTSPEC.MATCH (pop MATCH)
10281022
FAMILY)
10291023
(COERCEFONTSPEC.MATCH (pop MATCH)
@@ -4673,44 +4667,44 @@
46734667
(ADDTOVAR LAMA FONTCOPY)
46744668
)
46754669
(DECLARE%: DONTCOPY
4676-
(FILEMAP (NIL (12241 21954 (CHARWIDTH 12251 . 13036) (CHARWIDTHY 13038 . 14555) (STRINGWIDTH 14557 .
4677-
15650) (\CHARWIDTH.DISPLAY 15652 . 16065) (\STRINGWIDTH.DISPLAY 16067 . 16491) (\STRINGWIDTH.GENERIC
4678-
16493 . 21952)) (21955 28475 (DEFAULTFONT 21965 . 23250) (FONTCLASS 23252 . 25414) (FONTCLASSUNPARSE
4679-
25416 . 26315) (FONTCLASSCOMPONENT 26317 . 26905) (SETFONTCLASSCOMPONENT 26907 . 27349) (
4680-
GETFONTCLASSCOMPONENT 27351 . 28473)) (30188 54284 (FONTCREATE 30198 . 33443) (FONTCREATE1 33445 .
4681-
36060) (FONTCREATE.SLUGFD 36062 . 37544) (\FONT.CHECKARGS 37546 . 44136) (\FONT.CHECKARGS1 44138 .
4682-
48661) (\FONTCREATE1.NOFN 48663 . 48877) (FONTFILEP 48879 . 49767) (\READCHARSET 49769 . 54282)) (
4683-
54285 61202 (\FONT.CHECKARGS 54295 . 60885) (\CHARSET.CHECK 60887 . 61200)) (61203 64463 (
4684-
COERCEFONTSPEC 61213 . 64461)) (66533 67872 (MAKEFONTSPEC 66543 . 67870)) (67873 76050 (COMPLETE.FONT
4685-
67883 . 70406) (COMPLETEFONTP 70408 . 71031) (COMPLETE.CHARSET 71033 . 73718) (PRUNESLUGCSINFOS 73720
4686-
. 74645) (MONOSPACEFONTP 74647 . 76048)) (76089 84010 (FONTASCENT 76099 . 76483) (FONTDESCENT 76485
4687-
. 76970) (FONTHEIGHT 76972 . 77374) (FONTPROP 77376 . 83287) (\AVGCHARWIDTH 83289 . 84008)) (84667
4688-
85575 (FONTDEVICEPROP 84677 . 85573)) (85621 86475 (EDITCHAR 85631 . 86473)) (86521 98711 (
4689-
GETCHARBITMAP 86531 . 87655) (PUTCHARBITMAP 87657 . 89815) (\GETCHARBITMAP.CSINFO 89817 . 91833) (
4690-
\PUTCHARBITMAP.CSINFO 91835 . 98709)) (98712 119192 (MOVECHARBITMAP 98722 . 100616) (MOVEFONTCHARS
4691-
100618 . 104578) (\MOVEFONTCHAR 104580 . 109423) (\MOVEFONTCHARS.SOURCEDATA 109425 . 115530) (
4692-
\MAKESLUGCHAR 115532 . 118067) (SLUGCHARP.DISPLAY 118069 . 119190)) (120125 140263 (FONTFILES 120135
4693-
. 121968) (\FINDFONTFILE 121970 . 123687) (\FONTFILENAMES 123689 . 124684) (\FONTFILENAME 124686 .
4694-
128669) (\FONTFILENAME.OLD 128671 . 131620) (\FONTFILENAME.NEW 131622 . 133879) (FONTSPECFROMFILENAME
4695-
133881 . 137982) (\FONTINFOFROMFILENAME.OLD 137984 . 140261)) (140530 176333 (FONTCOPY 140540 . 145603
4696-
) (FONTP 145605 . 145904) (FONTUNPARSE 145906 . 147625) (SETFONTDESCRIPTOR 147627 . 149091) (
4697-
\STREAMCHARWIDTH 149093 . 153257) (\COERCECHARSET 153259 . 155854) (\BUILDSLUGCSINFO 155856 . 159479)
4698-
(\FONTSYMBOL 159481 . 160131) (\DEVICESYMBOL 160133 . 161002) (\FONTFACE 161004 . 168194) (
4699-
\FONTFACE.COLOR 168196 . 175116) (SETFONTCHARENCODING 175118 . 176331)) (176334 197273 (FONTSAVAILABLE
4700-
176344 . 181587) (FONTEXISTS? 181589 . 185567) (\SEARCHFONTFILES 185569 . 188654) (FLUSHFONTSINCORE
4701-
188656 . 191829) (FINDFONTFILES 191831 . 195045) (SORTFONTSPECS 195047 . 197271)) (197274 200883 (
4702-
MATCHFONTFACE 197284 . 198099) (MAKEFONTFACE 198101 . 199127) (FONTFACETOATOM 199129 . 200881)) (
4703-
201261 201753 (\UNITWIDTHSVECTOR 201271 . 201751)) (216347 218414 (FONTDESCRIPTOR.DEFPRINT 216357 .
4704-
217936) (FONTCLASS.DEFPRINT 217938 . 218412)) (222243 225033 (\CREATEKERNELEMENT 222253 . 222611) (
4705-
\FSETLEFTKERN 222613 . 223104) (\FGETLEFTKERN 223106 . 225031)) (225034 234670 (\CREATEFONT 225044 .
4706-
226483) (\CREATECHARSET 226485 . 230421) (\INSTALLCHARSETINFO 230423 . 233757) (
4707-
\INSTALLCHARSETINFO.CHARENCODING 233759 . 234668)) (234992 236356 (\FONTRESETCHARWIDTHS 235002 .
4708-
236354)) (236986 247033 (\CREATEDISPLAYFONT 236996 . 238845) (\CREATECHARSET.DISPLAY 238847 . 244556)
4709-
(\FONTEXISTS?.DISPLAY 244558 . 247031)) (247034 261899 (STRIKEFONT.FILEP 247044 . 247932) (
4710-
STRIKEFONT.GETCHARSET 247934 . 253526) (WRITESTRIKEFONTFILE 253528 . 258439) (STRIKECSINFO 258441 .
4711-
261897)) (261930 278247 (MAKEBOLD.CHARSET 261940 . 265589) (MAKEBOLD.CHAR 265591 . 267343) (
4712-
MAKEITALIC.CHARSET 267345 . 271018) (MAKEITALIC.CHAR 271020 . 273366) (\SFMAKEBOLD 273368 . 275592) (
4713-
\SFMAKEITALIC 275594 . 278245)) (278248 282397 (\SFMAKEROTATEDFONT 278258 . 279659) (\SFROTATECSINFO
4714-
279661 . 280298) (\SFROTATEFONTCHARACTERS 280300 . 280680) (\SFROTATECSINFOOFFSETS 280682 . 282395)) (
4715-
282398 283779 (\SFMAKECOLOR 282408 . 283777)))))
4670+
(FILEMAP (NIL (12233 21946 (CHARWIDTH 12243 . 13028) (CHARWIDTHY 13030 . 14547) (STRINGWIDTH 14549 .
4671+
15642) (\CHARWIDTH.DISPLAY 15644 . 16057) (\STRINGWIDTH.DISPLAY 16059 . 16483) (\STRINGWIDTH.GENERIC
4672+
16485 . 21944)) (21947 28467 (DEFAULTFONT 21957 . 23242) (FONTCLASS 23244 . 25406) (FONTCLASSUNPARSE
4673+
25408 . 26307) (FONTCLASSCOMPONENT 26309 . 26897) (SETFONTCLASSCOMPONENT 26899 . 27341) (
4674+
GETFONTCLASSCOMPONENT 27343 . 28465)) (30146 54527 (FONTCREATE 30156 . 33401) (FONTCREATE1 33403 .
4675+
36018) (FONTCREATE.SLUGFD 36020 . 37502) (\FONT.CHECKARGS 37504 . 44094) (\FONT.CHECKARGS1 44096 .
4676+
48619) (\FONTCREATE1.NOFN 48621 . 48835) (FONTFILEP 48837 . 49725) (\READCHARSET 49727 . 54525)) (
4677+
54528 61445 (\FONT.CHECKARGS 54538 . 61128) (\CHARSET.CHECK 61130 . 61443)) (61446 64529 (
4678+
COERCEFONTSPEC 61456 . 64527)) (66599 67938 (MAKEFONTSPEC 66609 . 67936)) (67939 76116 (COMPLETE.FONT
4679+
67949 . 70472) (COMPLETEFONTP 70474 . 71097) (COMPLETE.CHARSET 71099 . 73784) (PRUNESLUGCSINFOS 73786
4680+
. 74711) (MONOSPACEFONTP 74713 . 76114)) (76155 84076 (FONTASCENT 76165 . 76549) (FONTDESCENT 76551
4681+
. 77036) (FONTHEIGHT 77038 . 77440) (FONTPROP 77442 . 83353) (\AVGCHARWIDTH 83355 . 84074)) (84733
4682+
85641 (FONTDEVICEPROP 84743 . 85639)) (85687 86541 (EDITCHAR 85697 . 86539)) (86587 98777 (
4683+
GETCHARBITMAP 86597 . 87721) (PUTCHARBITMAP 87723 . 89881) (\GETCHARBITMAP.CSINFO 89883 . 91899) (
4684+
\PUTCHARBITMAP.CSINFO 91901 . 98775)) (98778 119258 (MOVECHARBITMAP 98788 . 100682) (MOVEFONTCHARS
4685+
100684 . 104644) (\MOVEFONTCHAR 104646 . 109489) (\MOVEFONTCHARS.SOURCEDATA 109491 . 115596) (
4686+
\MAKESLUGCHAR 115598 . 118133) (SLUGCHARP.DISPLAY 118135 . 119256)) (120191 140329 (FONTFILES 120201
4687+
. 122034) (\FINDFONTFILE 122036 . 123753) (\FONTFILENAMES 123755 . 124750) (\FONTFILENAME 124752 .
4688+
128735) (\FONTFILENAME.OLD 128737 . 131686) (\FONTFILENAME.NEW 131688 . 133945) (FONTSPECFROMFILENAME
4689+
133947 . 138048) (\FONTINFOFROMFILENAME.OLD 138050 . 140327)) (140596 176399 (FONTCOPY 140606 . 145669
4690+
) (FONTP 145671 . 145970) (FONTUNPARSE 145972 . 147691) (SETFONTDESCRIPTOR 147693 . 149157) (
4691+
\STREAMCHARWIDTH 149159 . 153323) (\COERCECHARSET 153325 . 155920) (\BUILDSLUGCSINFO 155922 . 159545)
4692+
(\FONTSYMBOL 159547 . 160197) (\DEVICESYMBOL 160199 . 161068) (\FONTFACE 161070 . 168260) (
4693+
\FONTFACE.COLOR 168262 . 175182) (SETFONTCHARENCODING 175184 . 176397)) (176400 197339 (FONTSAVAILABLE
4694+
176410 . 181653) (FONTEXISTS? 181655 . 185633) (\SEARCHFONTFILES 185635 . 188720) (FLUSHFONTSINCORE
4695+
188722 . 191895) (FINDFONTFILES 191897 . 195111) (SORTFONTSPECS 195113 . 197337)) (197340 200949 (
4696+
MATCHFONTFACE 197350 . 198165) (MAKEFONTFACE 198167 . 199193) (FONTFACETOATOM 199195 . 200947)) (
4697+
201327 201819 (\UNITWIDTHSVECTOR 201337 . 201817)) (216413 218480 (FONTDESCRIPTOR.DEFPRINT 216423 .
4698+
218002) (FONTCLASS.DEFPRINT 218004 . 218478)) (222309 225099 (\CREATEKERNELEMENT 222319 . 222677) (
4699+
\FSETLEFTKERN 222679 . 223170) (\FGETLEFTKERN 223172 . 225097)) (225100 234736 (\CREATEFONT 225110 .
4700+
226549) (\CREATECHARSET 226551 . 230487) (\INSTALLCHARSETINFO 230489 . 233823) (
4701+
\INSTALLCHARSETINFO.CHARENCODING 233825 . 234734)) (235058 236422 (\FONTRESETCHARWIDTHS 235068 .
4702+
236420)) (237052 247099 (\CREATEDISPLAYFONT 237062 . 238911) (\CREATECHARSET.DISPLAY 238913 . 244622)
4703+
(\FONTEXISTS?.DISPLAY 244624 . 247097)) (247100 261965 (STRIKEFONT.FILEP 247110 . 247998) (
4704+
STRIKEFONT.GETCHARSET 248000 . 253592) (WRITESTRIKEFONTFILE 253594 . 258505) (STRIKECSINFO 258507 .
4705+
261963)) (261996 278313 (MAKEBOLD.CHARSET 262006 . 265655) (MAKEBOLD.CHAR 265657 . 267409) (
4706+
MAKEITALIC.CHARSET 267411 . 271084) (MAKEITALIC.CHAR 271086 . 273432) (\SFMAKEBOLD 273434 . 275658) (
4707+
\SFMAKEITALIC 275660 . 278311)) (278314 282463 (\SFMAKEROTATEDFONT 278324 . 279725) (\SFROTATECSINFO
4708+
279727 . 280364) (\SFROTATEFONTCHARACTERS 280366 . 280746) (\SFROTATECSINFOOFFSETS 280748 . 282461)) (
4709+
282464 283845 (\SFMAKECOLOR 282474 . 283843)))))
47164710
STOP

‎sources/FONT.LCOM‎

-51 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)