From 76f09ee3cd8c9048091a02b0839cd356e78f9c3b Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Sat, 20 Sep 2025 10:37:27 -0700 Subject: [PATCH] Update fontfamily lists, missing translation functions, minor bug --- .../c0/CREAM12-MRR-C0.DISPLAYFONT | Bin 1930 -> 1928 bytes library/tedit/TEDIT-WINDOW | 115 +++++++++--------- library/tedit/TEDIT-WINDOW.LCOM | Bin 63144 -> 62759 bytes sources/FONT | 89 +++++++------- sources/FONT.LCOM | Bin 68727 -> 68767 bytes sources/MCCS | 97 +++++++-------- sources/MCCS.LCOM | Bin 21214 -> 21011 bytes 7 files changed, 152 insertions(+), 149 deletions(-) diff --git a/fonts/displayfonts/c0/CREAM12-MRR-C0.DISPLAYFONT b/fonts/displayfonts/c0/CREAM12-MRR-C0.DISPLAYFONT index b3692631e881247e1666838543eca6ed261b35c6..91165d7be0130e4de7d319710de5086f81617e4e 100644 GIT binary patch delta 277 zcmY+xJt%~690%~<_xsgTp43w(DU!*{pv%A@EEmIt#Y-7(Axe?y>J~i8OV@R!OX=z? zM2bN-D2qCS!gPaTBFk;hVseA>H~M^XK{oKW&DpX*m9igtp=W=a+!pJw?tkMp zGqz}}ma!cx*s*)=maXDG*t1pb%|0!%y8S?CL=5fdL@)XWGhipyMQhWk8Vkte+1HE(#wN4LsX qzO%-NU#tuAiv4}`3JtYX|BM0m9M>^Aux+LjZU+*S?50q8*q{~ zX4AG{E0(b>%h{<@a&D~bJlcy@?A^XBw3_{*4jy8NqaEGoK_7-Nf(gtZg+;6)jdg5e zA6XnBk272bxWfaU@rqAW5#onrJ)>-5E4$dsK_)rLS*EzeHDtedit>TEDIT-WINDOW.;863 229545 +(FILECREATED "18-Sep-2025 23:09:24"  +{DSK}kaplan>Local>medley3.5>working-medley>library>TEDIT>TEDIT-WINDOW.;864 229645 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.LIKELY.FILENAME) + :CHANGES-TO (FNS TEDIT.PROMPTCLEAR) - :PREVIOUS-DATE "26-Jul-2025 15:45:59" {WMEDLEY}tedit>TEDIT-WINDOW.;862) + :PREVIOUS-DATE "11-Aug-2025 21:22:37" +{DSK}kaplan>Local>medley3.5>working-medley>library>TEDIT>TEDIT-WINDOW.;863) (PRETTYCOMPRINT TEDIT-WINDOWCOMS) @@ -2055,34 +2057,33 @@ else (PROMPTPRINT MSG]) (TEDIT.PROMPTCLEAR - [LAMBDA (TEXTSTREAM FONT) (* ; "Edited 14-Mar-98 12:52 by rmk:") + [LAMBDA (TSTREAM FONT) (* ; "Edited 18-Sep-2025 23:08 by rmk") + (* ; "Edited 14-Mar-98 12:52 by rmk:") (* ; "Edited 14-Oct-87 15:35 by bvm:") - (* ;; "Clears the promptwindow attached to TEXTSTREAM and shrinks it back to a single line in font FONT (or TEDIT.PROMPT.FONT) if it has grown. TEXTSTREAM could actually be a stream on the promptwindow itself.") + (* ;; "Clears the promptwindow attached to TSTREAM and shrinks it back to a single line in font FONT (or TEDIT.PROMPT.FONT) if it has grown. [TSTREAM could actually be a stream on the promptwindow itself.--is that true, does this code need to deal with that?]") - (LET [MW (PW (IF (CAR (NLSETQ (GETPROMPTWINDOW (\TEDIT.MAINW TEXTSTREAM) - NIL NIL T))) - ELSEIF (WINDOWPROP (WFROMDS TEXTSTREAM) - 'TEDIT.PROMPTWINDOW) - THEN (WFROMDS TEXTSTREAM] - (CL:WHEN PW - (WINDOWPROP PW 'TEDIT.NLINES 1) - (CL:WHEN [AND (SETQ MW (WINDOWPROP PW 'MAINWINDOW)) - (SETQ MW (LISTP (WINDOWPROP MW 'PROMPTWINDOW] - (RPLACD MW 1)) - (LET [PROP [HEIGHT (HEIGHTIFWINDOW (FONTPROP (OR FONT TEDIT.PROMPT.FONT) - 'HEIGHT] - (REG (WINDOWPROP PW 'REGION] - (CL:UNLESS (EQ HEIGHT (FETCH HEIGHT OF REG)) - (WINDOWPROP PW 'MINSIZE (CONS 0 HEIGHT)) + (LET* [(MW (\TEDIT.MAINW TSTREAM)) + (PW (AND MW (WINDOWPROP (\TEDIT.MAINW TSTREAM) + 'TEDIT.PROMPTWINDOW] + (CL:WHEN PW + (WINDOWPROP PW 'TEDIT.NLINES 1) + (CL:WHEN [AND (SETQ MW (WINDOWPROP PW 'MAINWINDOW)) + (SETQ MW (LISTP (WINDOWPROP MW 'PROMPTWINDOW] + (RPLACD MW 1)) + (LET [PROP [HEIGHT (HEIGHTIFWINDOW (FONTPROP (OR FONT TEDIT.PROMPT.FONT) + 'HEIGHT] + (REG (WINDOWPROP PW 'REGION] + (CL:UNLESS (EQ HEIGHT (FETCH HEIGHT OF REG)) + (WINDOWPROP PW 'MINSIZE (CONS 0 HEIGHT)) - (* ;; + (* ;;  "Have to adjust the fixed size of the window before shaping, since SHAPEW obeys the minimum.") - (WINDOWPROP PW 'MAXSIZE (CONS 64000 HEIGHT)) - (SHAPEW PW (CREATE REGION USING REG HEIGHT _ HEIGHT))) - (CL:WHEN (OPENWP PW) - (CLEARW PW))))]) + (WINDOWPROP PW 'MAXSIZE (CONS 64000 HEIGHT)) + (SHAPEW PW (CREATE REGION USING REG HEIGHT _ HEIGHT))) + (CL:WHEN (OPENWP PW) + (CLEARW PW))))]) (TEDIT.PROMPTFLASH [LAMBDA (TSTREAM) (* ; "Edited 25-Apr-2025 17:58 by rmk") @@ -3621,36 +3622,36 @@ (RPAQ? TEDIT.TITLED.ICON.TEMPLATE (create TITLEDICON ICON _ TEDITICON MASK _ TEDITMASK TITLEREG _ TEDIT.ICON.TITLE.REGION)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (17102 17998 (TEDIT.DEFER.UPDATES 17112 . 17996)) (17999 43944 (\TEDIT.WINDOW.CREATE -18009 . 25339) (\TEDIT.WINDOW.GETREGION 25341 . 28831) (\TEDIT.WINDOW.SETUP 28833 . 33163) ( -\TEDIT.MINIMAL.WINDOW.SETUP 33165 . 40576) (\TEDIT.CLEARPANE 40578 . 41295) (\TEDIT.FILL.PANES 41297 - . 43942)) (43945 67646 (\TEDIT.CURSORMOVEDFN 43955 . 49565) (\TEDIT.CURSOROUTFN 49567 . 50255) ( -\TEDIT.ACTIVE.WINDOWP 50257 . 51327) (\TEDIT.EXPANDFN 51329 . 51892) (\TEDIT.MAINW 51894 . 53174) ( -\TEDIT.MAINSTREAM 53176 . 53510) (\TEDIT.PRIMARYPANE 53512 . 54282) (\TEDIT.PANELIST 54284 . 54780) ( -\TEDIT.NEWREGIONFN 54782 . 57298) (\TEDIT.SET.WINDOW.EXTENT 57300 . 62282) (\TEDIT.SHRINK.ICONCREATE -62284 . 65017) (\TEDIT.SHRINKFN 65019 . 65428) (\TEDIT.PANEREGION 65430 . 67644)) (67678 100724 ( -\TEDIT.BUTTONEVENTFN 67688 . 80661) (\TEDIT.BUTTONEVENTFN.DOOPERATION 80663 . 87926) ( -\TEDIT.BUTTONEVENTFN.GETOPERATION 87928 . 89770) (\TEDIT.BUTTONEVENTFN.CURSEL.INIT 89772 . 93442) ( -\TEDIT.BUTTONEVENTFN.INACTIVE 93444 . 95874) (\TEDIT.BUTTONEVENTFN.INTITLE 95876 . 97711) ( -\TEDIT.COPYINSERTFN 97713 . 98845) (\TEDIT.FOREIGN.COPY 98847 . 100722)) (100725 117967 ( -\TEDIT.PANE.SPLIT 100735 . 104683) (\TEDIT.SPLITW 104685 . 112423) (\TEDIT.UNSPLITW 112425 . 116624) ( -\TEDIT.LINKPANES 116626 . 117389) (\TEDIT.UNLINKPANE 117391 . 117965)) (119401 120292 (TEDITWINDOWP -119411 . 120290)) (120329 123432 (TEDIT.GETINPUT 120339 . 122782) (\TEDIT.MAKEFILENAME 122784 . 123430 -)) (123481 131108 (TEDIT.PROMPTWINDOW 123491 . 123805) (TEDIT.PROMPTPRINT 123807 . 126434) ( -TEDIT.PROMPTCLEAR 126436 . 128155) (TEDIT.PROMPTFLASH 128157 . 129415) (\TEDIT.PROMPT.PAGEFULLFN -129417 . 131106)) (131346 141924 (\TEDIT.FILENAME 131356 . 132128) (\TEDIT.DEFAULT.TITLE 132130 . -134509) (\TEDIT.WINDOW.TITLE 134511 . 136680) (\TEDIT.LIKELY.FILENAME 136682 . 139406) ( -\TEDIT.UPDATE.TITLE 139408 . 141922)) (141967 154451 (TEDIT.DEACTIVATE.WINDOW 141977 . 147550) ( -\TEDIT.RESHAPEFN 147552 . 149637) (\TEDIT.REPAINTFN 149639 . 149863) (\TEDIT.CLOSESPLITS 149865 . -152310) (\TEDIT.CLOSEPANE 152312 . 154449)) (154452 197251 (\TEDIT.SCROLLFN 154462 . 156693) ( -\TEDIT.SCROLLCH.TOP 156695 . 158806) (\TEDIT.SCROLLCH.BOTTOM 158808 . 163138) (\TEDIT.SCROLLUP 163140 - . 168866) (\TEDIT.TOPLINE.YTOP 168868 . 170537) (\TEDIT.SCROLLDOWN 170539 . 177578) ( -\TEDIT.SCROLL.CARET 177580 . 180418) (\TEDIT.VISIBLECARETP 180420 . 182714) (\TEDIT.VISIBLECHARP -182716 . 183807) (\TEDIT.BITMAPLINES 183809 . 187729) (\TEDIT.SETPANE.TOPLINE 187731 . 188343) ( -\TEDIT.SHIFTLINES 188345 . 197249)) (197252 208121 (\TEDIT.ONSCREEN? 197262 . 201813) ( -\TEDIT.ONSCREEN.REGION 201815 . 205466) (\TEDIT.AFTERMOVEFN 205468 . 206365) (OFFSCREENP 206367 . -208119)) (208163 210977 (\TEDIT.PROCIDLEFN 208173 . 209833) (\TEDIT.PROCENTRYFN 209835 . 210280) ( -\TEDIT.PROCEXITFN 210282 . 210975)) (211056 224281 (\TEDIT.DOWNCARET 211066 . 211859) ( -\TEDIT.FLASHCARET 211861 . 213972) (\TEDIT.UPCARET 213974 . 215078) (TEDIT.NORMALIZECARET 215080 . -218298) (\TEDIT.SETCARET 218300 . 223651) (\TEDIT.CARET 223653 . 224279))))) + (FILEMAP (NIL (17179 18075 (TEDIT.DEFER.UPDATES 17189 . 18073)) (18076 44021 (\TEDIT.WINDOW.CREATE +18086 . 25416) (\TEDIT.WINDOW.GETREGION 25418 . 28908) (\TEDIT.WINDOW.SETUP 28910 . 33240) ( +\TEDIT.MINIMAL.WINDOW.SETUP 33242 . 40653) (\TEDIT.CLEARPANE 40655 . 41372) (\TEDIT.FILL.PANES 41374 + . 44019)) (44022 67723 (\TEDIT.CURSORMOVEDFN 44032 . 49642) (\TEDIT.CURSOROUTFN 49644 . 50332) ( +\TEDIT.ACTIVE.WINDOWP 50334 . 51404) (\TEDIT.EXPANDFN 51406 . 51969) (\TEDIT.MAINW 51971 . 53251) ( +\TEDIT.MAINSTREAM 53253 . 53587) (\TEDIT.PRIMARYPANE 53589 . 54359) (\TEDIT.PANELIST 54361 . 54857) ( +\TEDIT.NEWREGIONFN 54859 . 57375) (\TEDIT.SET.WINDOW.EXTENT 57377 . 62359) (\TEDIT.SHRINK.ICONCREATE +62361 . 65094) (\TEDIT.SHRINKFN 65096 . 65505) (\TEDIT.PANEREGION 65507 . 67721)) (67755 100801 ( +\TEDIT.BUTTONEVENTFN 67765 . 80738) (\TEDIT.BUTTONEVENTFN.DOOPERATION 80740 . 88003) ( +\TEDIT.BUTTONEVENTFN.GETOPERATION 88005 . 89847) (\TEDIT.BUTTONEVENTFN.CURSEL.INIT 89849 . 93519) ( +\TEDIT.BUTTONEVENTFN.INACTIVE 93521 . 95951) (\TEDIT.BUTTONEVENTFN.INTITLE 95953 . 97788) ( +\TEDIT.COPYINSERTFN 97790 . 98922) (\TEDIT.FOREIGN.COPY 98924 . 100799)) (100802 118044 ( +\TEDIT.PANE.SPLIT 100812 . 104760) (\TEDIT.SPLITW 104762 . 112500) (\TEDIT.UNSPLITW 112502 . 116701) ( +\TEDIT.LINKPANES 116703 . 117466) (\TEDIT.UNLINKPANE 117468 . 118042)) (119478 120369 (TEDITWINDOWP +119488 . 120367)) (120406 123509 (TEDIT.GETINPUT 120416 . 122859) (\TEDIT.MAKEFILENAME 122861 . 123507 +)) (123558 131208 (TEDIT.PROMPTWINDOW 123568 . 123882) (TEDIT.PROMPTPRINT 123884 . 126511) ( +TEDIT.PROMPTCLEAR 126513 . 128255) (TEDIT.PROMPTFLASH 128257 . 129515) (\TEDIT.PROMPT.PAGEFULLFN +129517 . 131206)) (131446 142024 (\TEDIT.FILENAME 131456 . 132228) (\TEDIT.DEFAULT.TITLE 132230 . +134609) (\TEDIT.WINDOW.TITLE 134611 . 136780) (\TEDIT.LIKELY.FILENAME 136782 . 139506) ( +\TEDIT.UPDATE.TITLE 139508 . 142022)) (142067 154551 (TEDIT.DEACTIVATE.WINDOW 142077 . 147650) ( +\TEDIT.RESHAPEFN 147652 . 149737) (\TEDIT.REPAINTFN 149739 . 149963) (\TEDIT.CLOSESPLITS 149965 . +152410) (\TEDIT.CLOSEPANE 152412 . 154549)) (154552 197351 (\TEDIT.SCROLLFN 154562 . 156793) ( +\TEDIT.SCROLLCH.TOP 156795 . 158906) (\TEDIT.SCROLLCH.BOTTOM 158908 . 163238) (\TEDIT.SCROLLUP 163240 + . 168966) (\TEDIT.TOPLINE.YTOP 168968 . 170637) (\TEDIT.SCROLLDOWN 170639 . 177678) ( +\TEDIT.SCROLL.CARET 177680 . 180518) (\TEDIT.VISIBLECARETP 180520 . 182814) (\TEDIT.VISIBLECHARP +182816 . 183907) (\TEDIT.BITMAPLINES 183909 . 187829) (\TEDIT.SETPANE.TOPLINE 187831 . 188443) ( +\TEDIT.SHIFTLINES 188445 . 197349)) (197352 208221 (\TEDIT.ONSCREEN? 197362 . 201913) ( +\TEDIT.ONSCREEN.REGION 201915 . 205566) (\TEDIT.AFTERMOVEFN 205568 . 206465) (OFFSCREENP 206467 . +208219)) (208263 211077 (\TEDIT.PROCIDLEFN 208273 . 209933) (\TEDIT.PROCENTRYFN 209935 . 210380) ( +\TEDIT.PROCEXITFN 210382 . 211075)) (211156 224381 (\TEDIT.DOWNCARET 211166 . 211959) ( +\TEDIT.FLASHCARET 211961 . 214072) (\TEDIT.UPCARET 214074 . 215178) (TEDIT.NORMALIZECARET 215180 . +218398) (\TEDIT.SETCARET 218400 . 223751) (\TEDIT.CARET 223753 . 224379))))) STOP diff --git a/library/tedit/TEDIT-WINDOW.LCOM b/library/tedit/TEDIT-WINDOW.LCOM index f3846c1f48f41bc79e232da052ce56fa512feb99..014c34901785284e9769ce46a8887a5e125b326e 100644 GIT binary patch delta 1045 zcmbtTF>ljA6t-OoG+o-FqSEQ%DH&q<>^N~kiHI5}xh8Rp?cfM?AT&`Fk|t47QB?>< zVqsw@%ErLJ0wd6Nr2`B63|1s0W+tA`X(@%RC(G~MclW+~@7;Ire$2f6KC@pN>rtmU zh$^z8fug45WJ-yN5Ei%k+ko1J)lqXeN_XmmZoQW-^|$KX^men+ zZSJX(mfr0TJMCU88X)Oz`{A%Y+)KMgmb$?|>QOUW@uXXNJQjhFND@(J;q-8lQneJ3 zUw*niW-*dwSIU;VUNSN^v@wfZwNwH><|IUtBoP|*9n3NyJ6TW|mm-UiP&h|R#=31} zkP}4m-)hfSm%n&5N0mWIaV!G(a;5sh$tsDXF^DM^+cjh=8 zi#%62TnhY_4}=1gr;RrsxK|A7%=;K^apRNq+Uvrf%`>&5QRe8%1Ai0a{1Re@vj5l1 zi%XX_ih>~UKM&TB1jnO|RYrLnOnbk$Q=rHf1^fh_g$S!SSVqS_8{xRas{!po=f?5- z7hIU=31E`)P)bRtScd6g4-yJEg^XoP?(QxdN)oK98;F(ljmQKxsp(X0BS0akO&dsa zQ$*KU=K`rgf=u|)H9^yTGaE}F;bi~$%4B{tHzo<#3{+9hP}2kLuPI8FsBtJ~Y7V_` z08t2(@o3-IRXD3AiQQB@?%ypwlxZHCim^z`o*Kl+G{h`X({NChuzZ#y*oJ2w+}`Ot F`wjbv3-JH| delta 1350 zcmaJ>-)qxQ6i!prt%|I32o}^sKv*X&xi?MPMi~q3?G{ban51Tk1Alb5y3Lj9KoKeU z;;Ybi1z+@0+4kha9(+;%3tt6MUw!iArfaQE1MRsv=icv}@0{=E)tBV!ugPbNU6M04 zZ|A5?RiH$tR9A`;OiQ;m*4wSMj# z4K+}}H+9{yd=^~FT{f%+%Ytx96h)ymmlhM=xPZ?}vvq{q%&mjBqs4?UO-eA&0@thC zZV*oih#a*&Vq+Vo6JpP35p<{S*@lHL*%S}CI^Jq0#VCMWnfJ+tZ z5KRHx$SA#c>u{X%GH2pCYnCxTgCWxUv3{%~|HS}IAW*A20WM@1p<9L-Ok82CnyVN- z^JlOHM8*^+yU6?7xG0F}3E_IgF`Ue_Huz#HlTId0-ib+0|NC}wVKT9knd3h0N<}-j z$6`-9eZXqId@H=*q1D4t%o=W6dTtM2l1n=ejGaT*yU`|&_aViN#s5DZOizwE^`khE z#P_Ya80C(W;h4Me>)oHiz)?S%z|GN5OvJ~;3_iTP-57FvEVdJ?CwAXF6{e{|pkj5I z;e{wm1?nzyLKm;B2L6KKvJgl~1Gmv1Ganq$%71zaIDOOc8y?$}gHq@Z)vWEgP!Q2z z;(G)H6@wz;!EV^_na9D)#esL|{Hp{_gRqA3tNNgFEyg(pD237>PD`kQNS6qYa;;d% z)sSVGpejjG1KU{iyXI8}L?d7$3BIOuFONT.;602 281058 +(FILECREATED "20-Sep-2025 09:39:57" {WMEDLEY}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}FONT.;600) + :PREVIOUS-DATE "10-Sep-2025 23:28:04" {WMEDLEY}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 diff --git a/sources/FONT.LCOM b/sources/FONT.LCOM index 88e8a0e44ea33ba054c6a9e1ea091f347c7d2a41..e22513ac78b4711f4a77728a80da34476fbb95d2 100644 GIT binary patch delta 793 zcmZuvL2DC16n0H(+aOYDENIjA5fBZSFf*G?vQe!GjkM zdX=JaE_(9d#an9^@z~$sPw2%uF}*``-J$@4fl`e&XYYiMQ)Hf=X)p zNr@oh0rDHJ-|%XKM|ZBfMaUNZNg~|v@L+#o?QFbUE*D^H^V#+moWqj_LWN@Xc9RPh zB#deno&${-P2R~*yFls~SCLt97Q7x!6l5dSl#y=I4i}s$phC;Dfg&{Gg!Q=Ws#0jX zn@f(Hesg}_n1?2K5V9ui3O%eS!iB?$i)Jt1n+)mKOxIjl+{sjYFoWgXJYd&@2V;Rj z+Y&PkzH2@$wr^Fy$__PM6)Xl^CBQqh#bm4idmbolvmL<1JUyAa?4H4uPLJ`ge%^Y))iLpy zQ1@e|ir{>obm#v)17rNrQLT0>tkqF^*gIlKn0C7@~Bm2Yh5b9^}O_GciCA& zFodxU%_7BRq`)OL`1?%VH=hd&mbd;N+6%|ijyd|WG*vykil)|Q&CJ28%w2m94w?@M zD4C2Vu3{D_AhvBcvJ60w3lU9Pc5?MPD5{hU0N1R*(`yw$Acg%Xx?`8d0i&_VIFT_} zoS;gBM~t7|%wWG}Hq+cSGP0p)k8&~G(P%5?<$lh^9y%Qbj{=$4OvMEmi9Yz2(rSZx TZB!gG6(l^?GD%O;7aM;7-%{7f delta 741 zcmZuu&1(}u6wgZRNAO^=7PLuyEVURR>C8?xnT?{IZYIgXW_R7$#0Da$v>=G6peGSQ zJc%Do=b|UC9wni>!#n3s z8AZtH7?s4vy^?_p6R=fBX1!7yewe?ozg{kvby&agU}GH)!JAdRm^;^WTyBS)MZ6(5 zH8KeX#mJ;`MVmj`^aSMOurRw+gnAJ2p5u2#siCl-gY}Q!Aa&EMBO>!!UPJM=_UrUS z5i;9ZO@7b!rrYe(1B?@CdA${9I@+Qc!vt5nFY6 z0JvHOr^8y@4+LP-0uiZhM}7@w3mDh-LoEXuyve$5)bzb5b{6iQkl*mdc-i>fS9-J` z$20NDi_6;7qxg2J=h@3Gox&i2i+*R-ccFr4!r*wVGQZMgE)bK(^wk-S5J+HrE#jVV ze3c9#2=<;pj7q9A)fe>xF5-u;-|I;dJ5w1+M+-UY%M99$;@arx#HCcl&r$QHV)etZ zZV_->fT8%hp5g%mS>Um-rQBN;5KIW)22AnZwMxMDUA4uiqpUlCQ7SbE{QzndTqYtg zP5C@N`@~Saf#58(+liZG`D!kuV{d}>nByj~1Fn$+ZdCgJ;}}8+tGXIG&d~8}KUBXf eRq#Ex50kaplan>Local>medley3.5>working-medley>sources>MCCS.;137 51129 +(FILECREATED "20-Sep-2025 09:45:41" {WMEDLEY}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}kaplan>Local>medley3.5>working-medley>sources>MCCS.;136) + :PREVIOUS-DATE " 9-Sep-2025 22:45:13" {WMEDLEY}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 diff --git a/sources/MCCS.LCOM b/sources/MCCS.LCOM index c59ae01b85d5ba5ae2377917c6e7de5a1d9ed47d..3f8baaf22dd86356cf9935029abac8c64b54a329 100644 GIT binary patch delta 728 zcmcb&lyUMB#tGr|Mh3dUsRg=521cd|29{PPrdB3KN(vfE$@#ejnK`K`3i){oN($BC zzOF7lu93Ai#rdU0$*IM5zRu3Ude(-<7McoNN@#`{7+RScDk&rtrNT`~ttcoeR<%+9 zY4ddq2ypZa3RcL>Q>a&R3-$3)KsG>6Pftl9C9wo(H>Sx(Rt5%2np_%go<6S5L9UJ= zt}Y7b)`R>2v>uO}6-*6{4NVoSTwNw#U=$a0^9xqsLU!3?MJ8bbOGLmJ8G!=E&={Yg z=9_z&w(|=)D+DMQDnR@fpkScj<~KP^$Xu6)myvSun z01SK!I1i@6(9#qx2K0~xrWuB2$Yz)sD8vAx)z#0%NWs)tAp#i9p?)r|Zk~Rw2`-S( zFg8ahF)~L{0##uOOCD~1z$i8}HB!)00NMgFOhv)ORKd|F#6QF}A_V9j1$RfFr+}&y T%uOcOiG(s48*RQS!f6KpJJGy- delta 879 zcmbQdgz?@|#tGr|3YNOTsRg=521cd|Mn+a9rdEa~N(vfE$@#ejnK`K`3i){oN(x-n zF2UZlHlf9-Ma6d6i3K@{d3HYe$%#33xv42Rsg=fhrgr7|McJ8o>ADaRyW;%PqU6+K zJ6~t#U_EO?V{=WQIY^cnnpznfSeY6c15HmVN`>2(T2W9`tZJnY1JdZ}=j`n7;tJse zxVm~nxRd2MrCc+C4s#3j@lilFRZmY3XkJQU3DD(OtTQrJ(&W-`^Yn3b4svx2adny8 z%P8SR4c{r48X6i|P7Y+0X5^ZjFCklx&jXqYRslh-VV?e>!MZL$X8@gQjv5WdRtBJe zAwSqTVc~AJ`2gc~ejztMg#ZO31!o{>pb+5b85BIZQ_!4)iF4SK4h#h&3xpCw3oI&t>Bi91KtW5v6e6plU~Hz~=o8`};u;a6V5#8l e2=o+Ckpj>e8j~Z