github.com/Interlisp.medley
1
0
Fork 0
mirror of synced 2026-04-19 01:37:23 +00:00
Code Issues Projects Releases Wiki Activity

Update fontfamily lists, missing translation functions, minor bug

Browse Source
This commit is contained in:
rmkaplan
2025-09-20 10:37:27 -07:00
parent a0c7fb37b6
commit 76f09ee3cd
7 changed files with 152 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

89
sources/FONT
View File

@@ -1,12 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "10-Sep-2025 23:28:04" {WMEDLEY}<sources>FONT.;602 281058
(FILECREATED "20-Sep-2025 09:39:57" {WMEDLEY}<sources>FONT.;603 281160
:EDIT-BY rmk
:CHANGES-TO (FNS \STRINGWIDTH.GENERIC)
:CHANGES-TO (VARS NSFONTFAMILIES ALTOFONTFAMILIES)
:PREVIOUS-DATE " 9-Sep-2025 23:55:03" {WMEDLEY}<sources>FONT.;600)
:PREVIOUS-DATE "10-Sep-2025 23:28:04" {WMEDLEY}<sources>FONT.;602)
(PRETTYCOMPRINT FONTCOMS)
@@ -492,9 +492,10 @@
DEVICE NEWFONT))))
)
(RPAQQ NSFONTFAMILIES (CLASSIC MODERN TERMINAL OPTIMA TITAN BOLDPS PCTERMINAL))
(RPAQQ NSFONTFAMILIES (CLASSIC MODERN TERMINAL OPTIMA TITAN BOLDPS PCTERMINAL PALATINO))
(RPAQQ ALTOFONTFAMILIES (TIMESROMAN TIMESROMAND HELVETICA))
(RPAQQ ALTOFONTFAMILIES (TIMESROMAN TIMESROMAND HELVETICA HELVETICAD CLARITY BRAVOX TONTO CREAM
OLDENGLISH))
@@ -4575,43 +4576,43 @@
(ADDTOVAR LAMA FONTCOPY)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (11678 21391 (CHARWIDTH 11688 . 12473) (CHARWIDTHY 12475 . 13992) (STRINGWIDTH 13994 .
15087) (\CHARWIDTH.DISPLAY 15089 . 15502) (\STRINGWIDTH.DISPLAY 15504 . 15928) (\STRINGWIDTH.GENERIC
15930 . 21389)) (21392 27912 (DEFAULTFONT 21402 . 22687) (FONTCLASS 22689 . 24851) (FONTCLASSUNPARSE
24853 . 25752) (FONTCLASSCOMPONENT 25754 . 26342) (SETFONTCLASSCOMPONENT 26344 . 26786) (
GETFONTCLASSCOMPONENT 26788 . 27910)) (29510 53778 (FONTCREATE 29520 . 32765) (FONTCREATE1 32767 .
35269) (FONTCREATE.SLUGFD 35271 . 36753) (\FONT.CHECKARGS 36755 . 43345) (\FONT.CHECKARGS1 43347 .
47870) (\FONTCREATE1.NOFN 47872 . 48086) (FONTFILEP 48088 . 48976) (\READCHARSET 48978 . 53776)) (
53779 60696 (\FONT.CHECKARGS 53789 . 60379) (\CHARSET.CHECK 60381 . 60694)) (60697 63603 (
COERCEFONTSPEC 60707 . 63601)) (65673 66463 (MAKEFONTSPEC 65683 . 66461)) (66464 73129 (COMPLETE.FONT
66474 . 68888) (COMPLETEFONTP 68890 . 69513) (COMPLETE.CHARSET 69515 . 72200) (PRUNESLUGCSINFOS 72202
. 73127)) (73168 81089 (FONTASCENT 73178 . 73562) (FONTDESCENT 73564 . 74049) (FONTHEIGHT 74051 .
74453) (FONTPROP 74455 . 80366) (\AVGCHARWIDTH 80368 . 81087)) (81746 82654 (FONTDEVICEPROP 81756 .
82652)) (82700 83554 (EDITCHAR 82710 . 83552)) (83600 95790 (GETCHARBITMAP 83610 . 84734) (
PUTCHARBITMAP 84736 . 86894) (\GETCHARBITMAP.CSINFO 86896 . 88912) (\PUTCHARBITMAP.CSINFO 88914 .
95788)) (95791 116172 (MOVECHARBITMAP 95801 . 97695) (MOVEFONTCHARS 97697 . 101657) (\MOVEFONTCHAR
101659 . 106403) (\MOVEFONTCHARS.SOURCEDATA 106405 . 112510) (\MAKESLUGCHAR 112512 . 115047) (
SLUGCHARP.DISPLAY 115049 . 116170)) (117106 137123 (FONTFILES 117116 . 118949) (\FINDFONTFILE 118951
. 120668) (\FONTFILENAMES 120670 . 121544) (\FONTFILENAME 121546 . 125529) (\FONTFILENAME.OLD 125531
. 128480) (\FONTFILENAME.NEW 128482 . 130739) (FONTSPECFROMFILENAME 130741 . 134842) (
\FONTINFOFROMFILENAME.OLD 134844 . 137121)) (137390 172537 (FONTCOPY 137400 . 142463) (FONTP 142465 .
142764) (FONTUNPARSE 142766 . 144485) (SETFONTDESCRIPTOR 144487 . 145951) (\STREAMCHARWIDTH 145953 .
150117) (\COERCECHARSET 150119 . 152058) (\BUILDSLUGCSINFO 152060 . 155683) (\FONTSYMBOL 155685 .
156335) (\DEVICESYMBOL 156337 . 157206) (\FONTFACE 157208 . 164398) (\FONTFACE.COLOR 164400 . 171320)
(SETFONTCHARENCODING 171322 . 172535)) (172538 191523 (FONTSAVAILABLE 172548 . 177294) (FONTEXISTS?
177296 . 181153) (\SEARCHFONTFILES 181155 . 184240) (FLUSHFONTSINCORE 184242 . 186079) (FINDFONTFILES
186081 . 189295) (SORTFONTSPECS 189297 . 191521)) (191524 194947 (MATCHFONTFACE 191534 . 192349) (
MAKEFONTFACE 192351 . 193191) (FONTFACETOATOM 193193 . 194945)) (195175 195667 (\UNITWIDTHSVECTOR
195185 . 195665)) (211267 213334 (FONTDESCRIPTOR.DEFPRINT 211277 . 212856) (FONTCLASS.DEFPRINT 212858
. 213332)) (217163 219845 (\CREATEKERNELEMENT 217173 . 217531) (\FSETLEFTKERN 217533 . 218024) (
\FGETLEFTKERN 218026 . 219843)) (219846 229268 (\CREATEFONT 219856 . 221187) (\CREATECHARSET 221189 .
225019) (\INSTALLCHARSETINFO 225021 . 228355) (\INSTALLCHARSETINFO.CHARENCODING 228357 . 229266)) (
229590 230954 (\FONTRESETCHARWIDTHS 229600 . 230952)) (231584 241498 (\CREATEDISPLAYFONT 231594 .
233443) (\CREATECHARSET.DISPLAY 233445 . 239021) (\FONTEXISTS?.DISPLAY 239023 . 241496)) (241499
256364 (STRIKEFONT.FILEP 241509 . 242397) (STRIKEFONT.GETCHARSET 242399 . 247991) (WRITESTRIKEFONTFILE
247993 . 252904) (STRIKECSINFO 252906 . 256362)) (256395 272712 (MAKEBOLD.CHARSET 256405 . 260054) (
MAKEBOLD.CHAR 260056 . 261808) (MAKEITALIC.CHARSET 261810 . 265483) (MAKEITALIC.CHAR 265485 . 267831)
(\SFMAKEBOLD 267833 . 270057) (\SFMAKEITALIC 270059 . 272710)) (272713 276862 (\SFMAKEROTATEDFONT
272723 . 274124) (\SFROTATECSINFO 274126 . 274763) (\SFROTATEFONTCHARACTERS 274765 . 275145) (
\SFROTATECSINFOOFFSETS 275147 . 276860)) (276863 278244 (\SFMAKECOLOR 276873 . 278242)))))
(FILEMAP (NIL (11690 21403 (CHARWIDTH 11700 . 12485) (CHARWIDTHY 12487 . 14004) (STRINGWIDTH 14006 .
15099) (\CHARWIDTH.DISPLAY 15101 . 15514) (\STRINGWIDTH.DISPLAY 15516 . 15940) (\STRINGWIDTH.GENERIC
15942 . 21401)) (21404 27924 (DEFAULTFONT 21414 . 22699) (FONTCLASS 22701 . 24863) (FONTCLASSUNPARSE
24865 . 25764) (FONTCLASSCOMPONENT 25766 . 26354) (SETFONTCLASSCOMPONENT 26356 . 26798) (
GETFONTCLASSCOMPONENT 26800 . 27922)) (29612 53880 (FONTCREATE 29622 . 32867) (FONTCREATE1 32869 .
35371) (FONTCREATE.SLUGFD 35373 . 36855) (\FONT.CHECKARGS 36857 . 43447) (\FONT.CHECKARGS1 43449 .
47972) (\FONTCREATE1.NOFN 47974 . 48188) (FONTFILEP 48190 . 49078) (\READCHARSET 49080 . 53878)) (
53881 60798 (\FONT.CHECKARGS 53891 . 60481) (\CHARSET.CHECK 60483 . 60796)) (60799 63705 (
COERCEFONTSPEC 60809 . 63703)) (65775 66565 (MAKEFONTSPEC 65785 . 66563)) (66566 73231 (COMPLETE.FONT
66576 . 68990) (COMPLETEFONTP 68992 . 69615) (COMPLETE.CHARSET 69617 . 72302) (PRUNESLUGCSINFOS 72304
. 73229)) (73270 81191 (FONTASCENT 73280 . 73664) (FONTDESCENT 73666 . 74151) (FONTHEIGHT 74153 .
74555) (FONTPROP 74557 . 80468) (\AVGCHARWIDTH 80470 . 81189)) (81848 82756 (FONTDEVICEPROP 81858 .
82754)) (82802 83656 (EDITCHAR 82812 . 83654)) (83702 95892 (GETCHARBITMAP 83712 . 84836) (
PUTCHARBITMAP 84838 . 86996) (\GETCHARBITMAP.CSINFO 86998 . 89014) (\PUTCHARBITMAP.CSINFO 89016 .
95890)) (95893 116274 (MOVECHARBITMAP 95903 . 97797) (MOVEFONTCHARS 97799 . 101759) (\MOVEFONTCHAR
101761 . 106505) (\MOVEFONTCHARS.SOURCEDATA 106507 . 112612) (\MAKESLUGCHAR 112614 . 115149) (
SLUGCHARP.DISPLAY 115151 . 116272)) (117208 137225 (FONTFILES 117218 . 119051) (\FINDFONTFILE 119053
. 120770) (\FONTFILENAMES 120772 . 121646) (\FONTFILENAME 121648 . 125631) (\FONTFILENAME.OLD 125633
. 128582) (\FONTFILENAME.NEW 128584 . 130841) (FONTSPECFROMFILENAME 130843 . 134944) (
\FONTINFOFROMFILENAME.OLD 134946 . 137223)) (137492 172639 (FONTCOPY 137502 . 142565) (FONTP 142567 .
142866) (FONTUNPARSE 142868 . 144587) (SETFONTDESCRIPTOR 144589 . 146053) (\STREAMCHARWIDTH 146055 .
150219) (\COERCECHARSET 150221 . 152160) (\BUILDSLUGCSINFO 152162 . 155785) (\FONTSYMBOL 155787 .
156437) (\DEVICESYMBOL 156439 . 157308) (\FONTFACE 157310 . 164500) (\FONTFACE.COLOR 164502 . 171422)
(SETFONTCHARENCODING 171424 . 172637)) (172640 191625 (FONTSAVAILABLE 172650 . 177396) (FONTEXISTS?
177398 . 181255) (\SEARCHFONTFILES 181257 . 184342) (FLUSHFONTSINCORE 184344 . 186181) (FINDFONTFILES
186183 . 189397) (SORTFONTSPECS 189399 . 191623)) (191626 195049 (MATCHFONTFACE 191636 . 192451) (
MAKEFONTFACE 192453 . 193293) (FONTFACETOATOM 193295 . 195047)) (195277 195769 (\UNITWIDTHSVECTOR
195287 . 195767)) (211369 213436 (FONTDESCRIPTOR.DEFPRINT 211379 . 212958) (FONTCLASS.DEFPRINT 212960
. 213434)) (217265 219947 (\CREATEKERNELEMENT 217275 . 217633) (\FSETLEFTKERN 217635 . 218126) (
\FGETLEFTKERN 218128 . 219945)) (219948 229370 (\CREATEFONT 219958 . 221289) (\CREATECHARSET 221291 .
225121) (\INSTALLCHARSETINFO 225123 . 228457) (\INSTALLCHARSETINFO.CHARENCODING 228459 . 229368)) (
229692 231056 (\FONTRESETCHARWIDTHS 229702 . 231054)) (231686 241600 (\CREATEDISPLAYFONT 231696 .
233545) (\CREATECHARSET.DISPLAY 233547 . 239123) (\FONTEXISTS?.DISPLAY 239125 . 241598)) (241601
256466 (STRIKEFONT.FILEP 241611 . 242499) (STRIKEFONT.GETCHARSET 242501 . 248093) (WRITESTRIKEFONTFILE
248095 . 253006) (STRIKECSINFO 253008 . 256464)) (256497 272814 (MAKEBOLD.CHARSET 256507 . 260156) (
MAKEBOLD.CHAR 260158 . 261910) (MAKEITALIC.CHARSET 261912 . 265585) (MAKEITALIC.CHAR 265587 . 267933)
(\SFMAKEBOLD 267935 . 270159) (\SFMAKEITALIC 270161 . 272812)) (272815 276964 (\SFMAKEROTATEDFONT
272825 . 274226) (\SFROTATECSINFO 274228 . 274865) (\SFROTATEFONTCHARACTERS 274867 . 275247) (
\SFROTATECSINFOOFFSETS 275249 . 276962)) (276965 278346 (\SFMAKECOLOR 276975 . 278344)))))
STOP

BIN
sources/FONT.LCOM
View File

Binary file not shown.

97
sources/MCCS
View File

@@ -1,14 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED " 9-Sep-2025 22:45:13" 
{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>MCCS.;137 51129
(FILECREATED "20-Sep-2025 09:45:41" {WMEDLEY}<sources>MCCS.;138 51315
:EDIT-BY rmk
:CHANGES-TO (FNS \MCCS.24BITENCODING.ERROR \MCCSINCCODE \MCCSPEEKCCODE)
:CHANGES-TO (FNS MCCSMAPPAIRS)
:PREVIOUS-DATE " 7-Sep-2025 22:43:03"
{DSK}<Users>kaplan>Local>medley3.5>working-medley>sources>MCCS.;136)
:PREVIOUS-DATE " 9-Sep-2025 22:45:13" {WMEDLEY}<sources>MCCS.;137)
(PRETTYCOMPRINT MCCSCOMS)
@@ -1240,45 +1238,48 @@
NIL])
(MCCSMAPPAIRS
[LAMBDA (FROMENCODING NONIDENTITY) (* ; "Edited 6-Sep-2025 16:43 by rmk")
[LAMBDA (FROMENCODING NONIDENTITY) (* ; "Edited 20-Sep-2025 09:45 by rmk")
(* ; "Edited 6-Sep-2025 16:43 by rmk")
(* ; "Edited 31-Aug-2025 16:16 by rmk")
(* ;; "Returns the pairs for MOVEFONTCHARS to use to move charset-0 glyphs into their MCCS positions. For example, the Leftarrow and Lowline glyphs switch positions in an XCCS$ font.")
(* ;; "Returns the pairs for MOVEFONTCHARS to use to move charset-0 glyphs into their MCCS positions. For example, the Leftarrow and Lowline glyphs switch positions in an XCCS$ font. Returns NIL (= nothing to do) if there is no function.")
(LET (PAIRS)
[SETQ PAIRS (SELECTQ FROMENCODING
(GACHA (* ; "ctrl and upper are slugged")
[APPEND (XCCSUNDEFINEDPAIRS)
'(((Uparrow TERMINAL)
Circumflex)
(^X Lowline])
(ALTOTEXT (APPEND (XCCSUNDEFINEDPAIRS)
ALTOTEXT2MCCS))
(XCCS$ '((Uparrow Circumflex)
(Leftarrow Lowline)
(Lowline Leftarrow)
(Circumflex Uparrow)))
(for C M (FN _ (MCCSMAPFN FROMENCODING)) from 0 to \MAXTHINCHAR
when (SETQ M (APPLY* FN C NONIDENTITY)) collect (LIST C M]
(LET ((FN (MCCSMAPFN FROMENCODING))
PAIRS)
(CL:WHEN FN
[SETQ PAIRS (SELECTQ FROMENCODING
(GACHA (* ; "ctrl and upper are slugged")
[APPEND (XCCSUNDEFINEDPAIRS)
'(((Uparrow TERMINAL)
Circumflex)
(^X Lowline])
(ALTOTEXT (APPEND (XCCSUNDEFINEDPAIRS)
ALTOTEXT2MCCS))
(XCCS$ '((Uparrow Circumflex)
(Leftarrow Lowline)
(Lowline Leftarrow)
(Circumflex Uparrow)))
(for C M from 0 to \MAXTHINCHAR when (SETQ M (APPLY* FN C NONIDENTITY))
collect (LIST C M]
(* ;; "Weed out interspersed comments")
(* ;; "Weed out interspersed comments")
(for P in PAIRS when (LISTP P) unless (EQ '* (CAR P))
collect (LIST (if (LISTP (CAR P))
then
(* ;;
 "Allows for the (Uparrow TERMINAL) case above, for MOVEFONTCHARS")
[for P in PAIRS when (LISTP P) unless (EQ '* (CAR P))
collect (LIST (if (LISTP (CAR P))
then
(* ;;
 "Allows for the (Uparrow TERMINAL) case above, for MOVEFONTCHARS")
(CONS (CL:IF (CHARCODEP (CAAR P))
(CAAR P)
(CHARCODE.DECODE (CAAR P)))
(CDAR P))
elseif (CHARCODEP (CAR P))
then (CAR P)
else (CHARCODE.DECODE (CAR P)))
(CL:IF (CHARCODEP (CADR P))
(CADR P)
(CHARCODE.DECODE (CADR P)))])
(CONS (CL:IF (CHARCODEP (CAAR P))
(CAAR P)
(CHARCODE.DECODE (CAAR P)))
(CDAR P))
elseif (CHARCODEP (CAR P))
then (CAR P)
else (CHARCODE.DECODE (CAR P)))
(CL:IF (CHARCODEP (CADR P))
(CADR P)
(CHARCODE.DECODE (CADR P)))])])
(XCCSUNDEFINEDPAIRS
[LAMBDA NIL (* ; "Edited 2-Sep-2025 13:14 by rmk")
@@ -1366,14 +1367,14 @@
CCODE])
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (2914 14485 (\MCCSINCCODE 2924 . 6012) (\MCCSPEEKCCODE 6014 . 8901) (\MCCSOUTCHAR 8903
. 11002) (\MCCSBACKCCODE 11004 . 12548) (\MCCSFORMATBYTESTREAM 12550 . 13280) (\MCCSCHARSETFN 13282
. 14483)) (14486 15368 (\CREATE.MCCS.EXTERNALFORMAT 14496 . 15366)) (15369 16346 (
\MCCS.24BITENCODING.ERROR 15379 . 16344)) (17722 20360 (MTOXCODE 17732 . 18529) (XTOMCODE 18531 .
19188) (XTOMSTRING 19190 . 19775) (MTOXSTRING 19777 . 20358)) (20361 22021 (MTOX$CODE 20371 . 21103) (
X$TOMCODE 21105 . 22019)) (22022 22662 (KANJICHARSETP 22032 . 22288) (CHINESECHARSETP 22290 . 22660))
(40783 42657 (MCCSCODEMAPARRAY 40793 . 42655)) (43186 47041 (MCCSMAPFN 43196 . 44408) (MCCSMAPPAIRS
44410 . 46733) (XCCSUNDEFINEDPAIRS 46735 . 47039)) (47117 51106 (GACHATOMCODE 47127 . 47639) (
SYMBOLTOMCODE 47641 . 48289) (SIGMATOMCODE 48291 . 48937) (ATOMCODE 48939 . 49471) (MATHTOMCODE 49473
. 50129) (HIPPOTOMCODE 50131 . 50668) (CYRILLICTOMCODE 50670 . 51104)))))
(FILEMAP (NIL (2791 14362 (\MCCSINCCODE 2801 . 5889) (\MCCSPEEKCCODE 5891 . 8778) (\MCCSOUTCHAR 8780
. 10879) (\MCCSBACKCCODE 10881 . 12425) (\MCCSFORMATBYTESTREAM 12427 . 13157) (\MCCSCHARSETFN 13159
. 14360)) (14363 15245 (\CREATE.MCCS.EXTERNALFORMAT 14373 . 15243)) (15246 16223 (
\MCCS.24BITENCODING.ERROR 15256 . 16221)) (17599 20237 (MTOXCODE 17609 . 18406) (XTOMCODE 18408 .
19065) (XTOMSTRING 19067 . 19652) (MTOXSTRING 19654 . 20235)) (20238 21898 (MTOX$CODE 20248 . 20980) (
X$TOMCODE 20982 . 21896)) (21899 22539 (KANJICHARSETP 21909 . 22165) (CHINESECHARSETP 22167 . 22537))
(40660 42534 (MCCSCODEMAPARRAY 40670 . 42532)) (43063 47227 (MCCSMAPFN 43073 . 44285) (MCCSMAPPAIRS
44287 . 46919) (XCCSUNDEFINEDPAIRS 46921 . 47225)) (47303 51292 (GACHATOMCODE 47313 . 47825) (
SYMBOLTOMCODE 47827 . 48475) (SIGMATOMCODE 48477 . 49123) (ATOMCODE 49125 . 49657) (MATHTOMCODE 49659
. 50315) (HIPPOTOMCODE 50317 . 50854) (CYRILLICTOMCODE 50856 . 51290)))))
STOP

BIN
sources/MCCS.LCOM
View File

Binary file not shown.