From db33a50af342c481f2eb2e4c4a59a14d1bd595d3 Mon Sep 17 00:00:00 2001 From: rmkaplan <69548581+rmkaplan@users.noreply.github.com> Date: Wed, 25 Dec 2024 12:57:08 -0800 Subject: [PATCH] Tedit - a few rough edges (#1937) Little odds and ends --- library/tedit/TEDIT-BUTTONS | 98 ++++++++++++++-------------- library/tedit/TEDIT-BUTTONS.LCOM | Bin 34396 -> 34417 bytes library/tedit/TEDIT-FILE | 60 ++++++++--------- library/tedit/TEDIT-FILE.LCOM | Bin 39139 -> 39135 bytes library/tedit/TEDIT-MENU | 59 ++++++++--------- library/tedit/TEDIT-MENU.LCOM | Bin 47015 -> 46963 bytes library/tedit/TEDIT-PAGE | 75 +++++++++++----------- library/tedit/TEDIT-PAGE.LCOM | Bin 25662 -> 25658 bytes library/tedit/TEDIT-SCREEN | 99 +++++++++++++--------------- library/tedit/TEDIT-SCREEN.LCOM | Bin 31362 -> 31331 bytes sources/FONT | 107 ++++++++++++++++++------------- sources/FONT.LCOM | Bin 44999 -> 45306 bytes 12 files changed, 257 insertions(+), 241 deletions(-) diff --git a/library/tedit/TEDIT-BUTTONS b/library/tedit/TEDIT-BUTTONS index 81699340..4fd49f1b 100644 --- a/library/tedit/TEDIT-BUTTONS +++ b/library/tedit/TEDIT-BUTTONS @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "20-Dec-2024 22:19:48" {WMEDLEY}tedit>TEDIT-BUTTONS.;198 119318 +(FILECREATED "22-Dec-2024 22:47:22" {WMEDLEY}TEDIT>TEDIT-BUTTONS.;200 119344 :EDIT-BY rmk - :CHANGES-TO (FNS MB.NWAY.CREATE) + :CHANGES-TO (FNS MB.3STATE.BUTTONEVENTINFN) - :PREVIOUS-DATE "18-Dec-2024 14:02:17" {WMEDLEY}tedit>TEDIT-BUTTONS.;197) + :PREVIOUS-DATE "20-Dec-2024 22:19:48" {WMEDLEY}TEDIT>TEDIT-BUTTONS.;198) (PRETTYCOMPRINT TEDIT-BUTTONSCOMS) @@ -732,6 +732,7 @@ (MB.3STATE.BUTTONEVENTINFN [LAMBDA (OBJ MENUDS SEL RELX RELY MENUWINDOW MENUTSTREAM BUTTON) + (* ; "Edited 22-Dec-2024 22:45 by rmk") (* ; "Edited 7-Dec-2024 13:11 by rmk") (* ; "Edited 5-Dec-2024 21:53 by rmk") (* ; "Edited 18-Oct-2024 12:00 by rmk") @@ -750,33 +751,32 @@ (* ;; "This brings up the display for the next state, tracks the mouse until either it leaves the object or the buttons come up. If the mouse leaves, the original highlighting is restored. Otherwise the state of the obj is advanced to its next state. Either way, we report that the %"selection%" didn't succeed.") - (if (EQ 'DON'T (MB.BUTTONEVENTINFN OBJ MENUDS SEL RELX RELY MENUWINDOW MENUTSTREAM BUTTON)) - then 'DON'T - else (LET [(NEXTSTATE (SELECTQ (IMAGEOBJPROP OBJ 'STATE) - (ON 'OFF) - (OFF 'NEUTRAL) - (NEUTRAL 'ON) - (\TEDIT.THELP "ILLEGAL 3STATE" (IMAGEOBJPROP OBJ 'STATE] - (RESETLST + (CL:UNLESS (EQ 'DON'T (MB.BUTTONEVENTINFN OBJ MENUDS SEL RELX RELY MENUWINDOW MENUTSTREAM BUTTON) + ) + (LET [(NEXTSTATE (SELECTQ (IMAGEOBJPROP OBJ 'STATE) + (ON 'OFF) + (OFF 'NEUTRAL) + (NEUTRAL 'ON) + (\TEDIT.THELP "ILLEGAL 3STATE" (IMAGEOBJPROP OBJ 'STATE] + (RESETLST - (* ;; - "In case of an error or interrupt, make the display consistent with the state") + (* ;; "In case of an error or interrupt, make the display consistent with the state") - [RESETSAVE NIL `(PROGN (CL:WHEN RESETSTATE - (MB.3STATE.SHOWSELFN ,OBJ ,MENUDS (IMAGEOBJPROP - ,OBJ - 'STATE)))] - (MB.3STATE.SHOWSELFN OBJ MENUDS NEXTSTATE) - [if (EQ 'DON'T (MB.TRACK.UNTIL OBJ MENUDS)) - then (* ; "Mouse moved out of object") - (MB.3STATE.SHOWSELFN OBJ MENUDS (IMAGEOBJPROP OBJ 'STATE)) - else (* ; "Buttons came up: do it") - (IMAGEOBJPROP OBJ 'STATE NEXTSTATE) - (CL:WHEN (SETQ STATECHANGEFN (IMAGEOBJPROP OBJ 'STATECHANGEFN)) - (APPLY* STATECHANGEFN OBJ NEXTSTATE (fetch (TEXTWINDOW WTEXTSTREAM) - of MENUDS)))]) - (TEDIT.BACKTOMAIN MENUTSTREAM) - NIL]) + [RESETSAVE NIL `(PROGN (CL:WHEN RESETSTATE + (MB.3STATE.SHOWSELFN ,OBJ ,MENUDS (IMAGEOBJPROP + ,OBJ + 'STATE)))] + (MB.3STATE.SHOWSELFN OBJ MENUDS NEXTSTATE) + [if (EQ 'DON'T (MB.TRACK.UNTIL OBJ MENUDS)) + then (* ; "Mouse moved out of object") + (MB.3STATE.SHOWSELFN OBJ MENUDS (IMAGEOBJPROP OBJ 'STATE)) + else (* ; "Buttons came up: do it") + (IMAGEOBJPROP OBJ 'STATE NEXTSTATE) + (CL:WHEN (SETQ STATECHANGEFN (IMAGEOBJPROP OBJ 'STATECHANGEFN)) + (APPLY* STATECHANGEFN OBJ NEXTSTATE (fetch (TEXTWINDOW WTEXTSTREAM) + of MENUDS)))]) + (TEDIT.BACKTOMAIN MENUTSTREAM))) + 'DON'T]) ) (DECLARE%: DOEVAL@COMPILE DONTCOPY @@ -1917,25 +1917,25 @@ (MB.FIELD.INIT) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (3448 19023 (MB.ADD 3458 . 9047) (MB.DELETE 9049 . 9423) (MB.GET 9425 . 16088) ( -MB.GET.MBARG 16090 . 17759) (TEDITMENU.STREAM 17761 . 18428) (TEDIT.BACKTOMAIN 18430 . 19021)) (19067 -36833 (MB.BUTTONEVENTINFN 19077 . 20286) (MB.DISPLAYFN 20288 . 22347) (MB.SETIMAGE 22349 . 23517) ( -MB.SIZEFN 23519 . 25067) (MB.WHENOPERATEDONFN 25069 . 27018) (MB.COPYFN 27020 . 27478) (MB.GETFN 27480 - . 28441) (MB.PUTFN 28443 . 29543) (MB.SHOWSELFN 29545 . 31054) (MB.CREATE 31056 . 34041) ( -MB.CHANGENAME 34043 . 34525) (MB.INIT 34527 . 35836) (MB.TRACK.UNTIL 35838 . 36533) (MB.DON'T 36535 . -36831)) (37058 46874 (MB.3STATE.CREATE 37068 . 37932) (MB.3STATE.DISPLAYFN 37934 . 38920) ( -MB.3STATE.SHOWSELFN 38922 . 41233) (MB.3STATE.INIT 41235 . 42487) (MB.3STATE.SETSTATEFN 42489 . 43147) - (MB.3STATE.BUTTONEVENTINFN 43149 . 46872)) (47099 76218 (MB.NWAY.CREATE 47109 . 52619) ( -MB.NWAY.DISPLAYFN 52621 . 53484) (MB.NWAY.WHENOPERATEDONFN 53486 . 55676) (MB.NWAY.SIZEFN 55678 . -59614) (MB.NWAY.SELECT 59616 . 62426) (MB.NWAY.BUTTONEVENTINFN 62428 . 65640) (MB.NWAY.NEWMENUBUTTON -65642 . 66354) (MB.NWAY.COPYFN 66356 . 67323) (MB.NWAY.INIT 67325 . 68659) (MB.NWAY.ARRANGEBUTTONS -68661 . 70632) (MB.NWAY.ADDITEM 70634 . 74396) (MB.NWAY.FINDSUBOBJ 74398 . 74912) (MB.NWAY.SETSTATEFN -74914 . 76216)) (76365 88093 (MB.TOGGLE.CREATE 76375 . 77370) (MB.TOGGLE.DISPLAYFN 77372 . 78855) ( -MB.TOGGLE.INIT 78857 . 80497) (MB.SET.TOGGLE 80499 . 81700) (MB.TOGGLE.SETSTATEFN 81702 . 82542) ( -MB.TOGGLE.BUTTONEVENTINFN 82544 . 86748) (MB.TOGGLE.WHENOPERATEDONFN 86750 . 88091)) (88244 119170 ( -MB.FIELD.CREATE 88254 . 92989) (MB.FIELD.DISPLAYFN 92991 . 93782) (MB.FIELD.IMAGEBOXFN 93784 . 95266) -(MB.FIELD.PREFIXCREATE 95268 . 98820) (MB.FIELD.SUFFIXCREATE 98822 . 100482) (MB.FIELD.INIT 100484 . -102093) (MB.FIELD.WHENOPERATEDONFN 102095 . 103366) (MB.FIELD.GETSTATEFN 103368 . 107302) ( -MB.FIELD.SETSTATEFN 107304 . 111999) (MB.FIELD.BUTTONEVENTINFN 112001 . 114306) (MB.FIELD.SIZEFN -114308 . 114548) (MB.FIELD.INSURETYPE 114550 . 119168))))) + (FILEMAP (NIL (3459 19034 (MB.ADD 3469 . 9058) (MB.DELETE 9060 . 9434) (MB.GET 9436 . 16099) ( +MB.GET.MBARG 16101 . 17770) (TEDITMENU.STREAM 17772 . 18439) (TEDIT.BACKTOMAIN 18441 . 19032)) (19078 +36844 (MB.BUTTONEVENTINFN 19088 . 20297) (MB.DISPLAYFN 20299 . 22358) (MB.SETIMAGE 22360 . 23528) ( +MB.SIZEFN 23530 . 25078) (MB.WHENOPERATEDONFN 25080 . 27029) (MB.COPYFN 27031 . 27489) (MB.GETFN 27491 + . 28452) (MB.PUTFN 28454 . 29554) (MB.SHOWSELFN 29556 . 31065) (MB.CREATE 31067 . 34052) ( +MB.CHANGENAME 34054 . 34536) (MB.INIT 34538 . 35847) (MB.TRACK.UNTIL 35849 . 36544) (MB.DON'T 36546 . +36842)) (37069 46900 (MB.3STATE.CREATE 37079 . 37943) (MB.3STATE.DISPLAYFN 37945 . 38931) ( +MB.3STATE.SHOWSELFN 38933 . 41244) (MB.3STATE.INIT 41246 . 42498) (MB.3STATE.SETSTATEFN 42500 . 43158) + (MB.3STATE.BUTTONEVENTINFN 43160 . 46898)) (47125 76244 (MB.NWAY.CREATE 47135 . 52645) ( +MB.NWAY.DISPLAYFN 52647 . 53510) (MB.NWAY.WHENOPERATEDONFN 53512 . 55702) (MB.NWAY.SIZEFN 55704 . +59640) (MB.NWAY.SELECT 59642 . 62452) (MB.NWAY.BUTTONEVENTINFN 62454 . 65666) (MB.NWAY.NEWMENUBUTTON +65668 . 66380) (MB.NWAY.COPYFN 66382 . 67349) (MB.NWAY.INIT 67351 . 68685) (MB.NWAY.ARRANGEBUTTONS +68687 . 70658) (MB.NWAY.ADDITEM 70660 . 74422) (MB.NWAY.FINDSUBOBJ 74424 . 74938) (MB.NWAY.SETSTATEFN +74940 . 76242)) (76391 88119 (MB.TOGGLE.CREATE 76401 . 77396) (MB.TOGGLE.DISPLAYFN 77398 . 78881) ( +MB.TOGGLE.INIT 78883 . 80523) (MB.SET.TOGGLE 80525 . 81726) (MB.TOGGLE.SETSTATEFN 81728 . 82568) ( +MB.TOGGLE.BUTTONEVENTINFN 82570 . 86774) (MB.TOGGLE.WHENOPERATEDONFN 86776 . 88117)) (88270 119196 ( +MB.FIELD.CREATE 88280 . 93015) (MB.FIELD.DISPLAYFN 93017 . 93808) (MB.FIELD.IMAGEBOXFN 93810 . 95292) +(MB.FIELD.PREFIXCREATE 95294 . 98846) (MB.FIELD.SUFFIXCREATE 98848 . 100508) (MB.FIELD.INIT 100510 . +102119) (MB.FIELD.WHENOPERATEDONFN 102121 . 103392) (MB.FIELD.GETSTATEFN 103394 . 107328) ( +MB.FIELD.SETSTATEFN 107330 . 112025) (MB.FIELD.BUTTONEVENTINFN 112027 . 114332) (MB.FIELD.SIZEFN +114334 . 114574) (MB.FIELD.INSURETYPE 114576 . 119194))))) STOP diff --git a/library/tedit/TEDIT-BUTTONS.LCOM b/library/tedit/TEDIT-BUTTONS.LCOM index da0fe0ff0e1cd79eb31c6e15b047fd31ff9d2196..c3a24ffbb1b3c2577c2ede574158f4a44dde2e03 100644 GIT binary patch delta 566 zcma)3Jxjwt7`DZ!2nvFTi!V`VtEA>WYLZigw7F_DO-gd9AGoN9h}NNqAR=x~9jsXe ze?)gj$Nm8EKZrQGc(E#q4&HG0ay*}RkFE4`D}A*#j8%JgN5vYZfH9*w!?=AgIU~63 zh=uoEEk#23URapJnwE!*g1>PPW|%P2z8i~gr$z=~{|J;y9sfhCdE(mFI72asXqCCiI1 zQ-evaFb}L2@Vetip=wK8>8kxGj!Z@k1v3A%MW)etN!?GUulwWf#%Q{85h7R$~)c6F_G}!FX z#S(XGU>3otT8rE-E!P6S286`jLbgE(*uIxdnE02nsX-``rn(Nk2f79xk3?X(FiXD1 fViEjG1*n9`gO~{t8y`eu_T=S%fk8W4Gq3eGlVFw! delta 520 zcmZvYzfQtX7{!H6CZiL&e7QP+rlt3`we6J<3%!kvr6u$h{6kDYNF*8uLQISyz5s)y z58y+v8z*NUz?X0)CW6F(vD+EGbI$KOpTp$GF!^+{AqiIJQXmphfDnoes_3KZom{`u z?)D3uSq>M9A?LmqhzHovvyeh$$%AF8s8kufY(9E*^HeNVnaLS+Zvok%>%#J_D2fQ$ z&1rOOh^nA$Dq}k?n}=BNr|Fjt!9%^wESH@Q@;BX9ui3jV%xJgbZ~TKTKBl?+y7 z_?b~Gnx$jzmrch5EE5PEN~tedit>TEDIT-FILE.;591 159329 +(FILECREATED "23-Dec-2024 23:02:54" {WMEDLEY}TEDIT>TEDIT-FILE.;592 159471 :EDIT-BY rmk - :CHANGES-TO (FNS TEDITFROMSHELLSCRIPT) + :CHANGES-TO (FNS TEDIT.PUT TEDIT.PUT.STREAM) - :PREVIOUS-DATE "15-Dec-2024 11:47:29" {WMEDLEY}tedit>TEDIT-FILE.;590) + :PREVIOUS-DATE "16-Dec-2024 11:25:16" {WMEDLEY}TEDIT>TEDIT-FILE.;591) (PRETTYCOMPRINT TEDIT-FILECOMS) @@ -389,7 +389,8 @@ (TEDIT.INCLUDE TSTREAM INFILE START END SAFE T]) (TEDIT.PUT - [LAMBDA (TSTREAM FILE FORCENEW UNFORMATTED? FORMAT) (* ; "Edited 11-Aug-2024 12:30 by rmk") + [LAMBDA (TSTREAM FILE FORCENEW UNFORMATTED? FORMAT) (* ; "Edited 23-Dec-2024 23:02 by rmk") + (* ; "Edited 11-Aug-2024 12:30 by rmk") (* ; "Edited 29-Jun-2024 10:31 by rmk") (* ; "Edited 26-Jun-2024 15:46 by rmk") (* ; "Edited 29-Apr-2024 10:12 by rmk") @@ -507,7 +508,8 @@ (* ;; "") - (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT PUTSTRING "done")) + (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT PUTSTRING "done") + T) (* ;; "") @@ -2509,28 +2511,28 @@ (RPAQ? *TEDIT-FILE-READTABLE* (COPYREADTABLE \ORIGREADTABLE)) (DECLARE%: DONTCOPY - (FILEMAP (NIL (5010 33799 (TEDIT.GET 5020 . 11029) (TEDIT.FORMATTEDFILEP 11031 . 12347) ( -TEDIT.FILEDATE 12349 . 13520) (TEDIT.INCLUDE 13522 . 21433) (TEDIT.RAW.INCLUDE 21435 . 22243) ( -TEDIT.PUT 22245 . 29964) (TEDIT.PUT.STREAM 29966 . 33797)) (33800 52997 (\TEDIT.GET.FOREIGN.FILE 33810 - . 36995) (\TEDIT.GET.UNFORMATTED.FILE 36997 . 40871) (\TEDIT.GET.FORMATTED.FILE 40873 . 43694) ( -\TEDIT.FORMATTEDSTREAMP 43696 . 46596) (\ARBIN 46598 . 47318) (\ATMIN 47320 . 47857) (\DWIN 47859 . -48238) (\STRINGIN 48240 . 48948) (\TEDIT.GET.TRAILER 48950 . 51466) (\TEDIT.CACHEFILE 51468 . 52995)) -(53163 66713 (\TEDIT.GET.PIECES3 53173 . 63475) (\TEDIT.GET.IDATE3 63477 . 64872) ( -\TEDIT.MAKE.STRINGPIECE 64874 . 66711)) (66714 79089 (\TEDIT.GET.UNFORMATTED.FILE.XCCS 66724 . 72840) -(\TEDIT.INTERPRET.XCCS.SHIFTS 72842 . 79087)) (79111 85133 (\TEDIT.GET.UNFORMATTED.FILE.UTF8 79121 . -85131)) (85156 93847 (\TEDIT.GET.CHARLOOKS.LIST 85166 . 85897) (\TEDIT.GET.SINGLE.CHARLOOKS 85899 . -90659) (\TEDIT.GET.CHARLOOKS 90661 . 91991) (\TEDIT.GET.PARALOOKS.INDEX 91993 . 92537) ( -\TEDIT.GET.CHARLOOKS.INDEX 92539 . 93845)) (93848 101016 (\TEDIT.GET.PARALOOKS.LIST 93858 . 94480) ( -\TEDIT.GET.SINGLE.PARALOOKS 94482 . 101014)) (101017 104607 (\TEDIT.GET.OBJECT 101027 . 104605)) ( -104669 136931 (\TEDIT.PUT.PCTB 104679 . 114329) (\TEDIT.PUT.PCTB.PIECEDATA 114331 . 117529) ( -\TEDIT.PUT.TRAILER 117531 . 118298) (\TEDIT.PUT.PCTB.MERGEABLE 118300 . 121734) ( -\TEDIT.PUT.UTF8.SPLITPIECES 121736 . 126823) (\TEDIT.PUT.PCTB.NEXTNEW 126825 . 131092) ( -\TEDIT.INSERT.NEWPIECES 131094 . 134529) (\TEDIT.PUTRESET 134531 . 134773) (\ARBOUT 134775 . 135499) ( -\ATMOUT 135501 . 136106) (\DWOUT 136108 . 136387) (\STRINGOUT 136389 . 136929)) (136932 148915 ( -\TEDIT.PUT.CHARLOOKS.LIST 136942 . 138614) (\TEDIT.PUT.SINGLE.CHARLOOKS 138616 . 144259) ( -\TEDIT.PUT.CHARLOOKS 144261 . 145486) (\TEDIT.PUT.CHARLOOKS1 145488 . 146539) (\TEDIT.PUT.OBJECT -146541 . 148913)) (148916 156410 (\TEDIT.PUT.PARALOOKS.LIST 148926 . 149828) ( -\TEDIT.PUT.SINGLE.PARALOOKS 149830 . 155269) (\TEDIT.PUT.PARALOOKS 155271 . 156408)) (156505 159099 ( -TEDITFROMLISPSOURCE 156515 . 158348) (SHELLSCRIPTP 158350 . 158579) (TEDITFROMSHELLSCRIPT 158581 . -159097))))) + (FILEMAP (NIL (5016 33941 (TEDIT.GET 5026 . 11035) (TEDIT.FORMATTEDFILEP 11037 . 12353) ( +TEDIT.FILEDATE 12355 . 13526) (TEDIT.INCLUDE 13528 . 21439) (TEDIT.RAW.INCLUDE 21441 . 22249) ( +TEDIT.PUT 22251 . 30106) (TEDIT.PUT.STREAM 30108 . 33939)) (33942 53139 (\TEDIT.GET.FOREIGN.FILE 33952 + . 37137) (\TEDIT.GET.UNFORMATTED.FILE 37139 . 41013) (\TEDIT.GET.FORMATTED.FILE 41015 . 43836) ( +\TEDIT.FORMATTEDSTREAMP 43838 . 46738) (\ARBIN 46740 . 47460) (\ATMIN 47462 . 47999) (\DWIN 48001 . +48380) (\STRINGIN 48382 . 49090) (\TEDIT.GET.TRAILER 49092 . 51608) (\TEDIT.CACHEFILE 51610 . 53137)) +(53305 66855 (\TEDIT.GET.PIECES3 53315 . 63617) (\TEDIT.GET.IDATE3 63619 . 65014) ( +\TEDIT.MAKE.STRINGPIECE 65016 . 66853)) (66856 79231 (\TEDIT.GET.UNFORMATTED.FILE.XCCS 66866 . 72982) +(\TEDIT.INTERPRET.XCCS.SHIFTS 72984 . 79229)) (79253 85275 (\TEDIT.GET.UNFORMATTED.FILE.UTF8 79263 . +85273)) (85298 93989 (\TEDIT.GET.CHARLOOKS.LIST 85308 . 86039) (\TEDIT.GET.SINGLE.CHARLOOKS 86041 . +90801) (\TEDIT.GET.CHARLOOKS 90803 . 92133) (\TEDIT.GET.PARALOOKS.INDEX 92135 . 92679) ( +\TEDIT.GET.CHARLOOKS.INDEX 92681 . 93987)) (93990 101158 (\TEDIT.GET.PARALOOKS.LIST 94000 . 94622) ( +\TEDIT.GET.SINGLE.PARALOOKS 94624 . 101156)) (101159 104749 (\TEDIT.GET.OBJECT 101169 . 104747)) ( +104811 137073 (\TEDIT.PUT.PCTB 104821 . 114471) (\TEDIT.PUT.PCTB.PIECEDATA 114473 . 117671) ( +\TEDIT.PUT.TRAILER 117673 . 118440) (\TEDIT.PUT.PCTB.MERGEABLE 118442 . 121876) ( +\TEDIT.PUT.UTF8.SPLITPIECES 121878 . 126965) (\TEDIT.PUT.PCTB.NEXTNEW 126967 . 131234) ( +\TEDIT.INSERT.NEWPIECES 131236 . 134671) (\TEDIT.PUTRESET 134673 . 134915) (\ARBOUT 134917 . 135641) ( +\ATMOUT 135643 . 136248) (\DWOUT 136250 . 136529) (\STRINGOUT 136531 . 137071)) (137074 149057 ( +\TEDIT.PUT.CHARLOOKS.LIST 137084 . 138756) (\TEDIT.PUT.SINGLE.CHARLOOKS 138758 . 144401) ( +\TEDIT.PUT.CHARLOOKS 144403 . 145628) (\TEDIT.PUT.CHARLOOKS1 145630 . 146681) (\TEDIT.PUT.OBJECT +146683 . 149055)) (149058 156552 (\TEDIT.PUT.PARALOOKS.LIST 149068 . 149970) ( +\TEDIT.PUT.SINGLE.PARALOOKS 149972 . 155411) (\TEDIT.PUT.PARALOOKS 155413 . 156550)) (156647 159241 ( +TEDITFROMLISPSOURCE 156657 . 158490) (SHELLSCRIPTP 158492 . 158721) (TEDITFROMSHELLSCRIPT 158723 . +159239))))) STOP diff --git a/library/tedit/TEDIT-FILE.LCOM b/library/tedit/TEDIT-FILE.LCOM index d780e5fb6c7c6c885e967239eef4029d10cf7ea8..4ca8de4315cf292bb90570f15aba9df413e7b37b 100644 GIT binary patch delta 384 zcmaF7k?HsmZ!V21X_dM#feKMpmXK6SGxxLtI@vL+rq$uA8TitDd!~ zrIDrrmy(eYLW7}^6;O|{<-|SG^?CuJAqts!3QBIFK0XS_s`T{qloV1DOHxy?YBw=e z(&W+r+2I`I>Ik$^K?$3qloYDNeO+CATqA33ax#;O5{oJ!&V!JG2v;f?np&Ee8%{1_ zRGr*3QJl{zAjmb$(?2v=*9B<&WF1Bc4KBQ9!HqK9{EabDjIm{NghUpTekL~q5QIyl zgQyR)J-~DZSkO~|LBq_%Kq166A|xQlKS06E&~kF1u<&MPX=f%r6QH8}DZ3uL1v5j7&2OZ_nD~r=V!i=BK({NH8JTVlknOJq0ROvTYybcN diff --git a/library/tedit/TEDIT-MENU b/library/tedit/TEDIT-MENU index 98276efa..1b80aa98 100644 --- a/library/tedit/TEDIT-MENU +++ b/library/tedit/TEDIT-MENU @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "22-Dec-2024 00:24:03" {WMEDLEY}TEDIT>TEDIT-MENU.;425 169589 +(FILECREATED "24-Dec-2024 21:29:07" {WMEDLEY}TEDIT>TEDIT-MENU.;426 169660 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.OTHER.STATECHANGEFN \TEDIT.OTHER.SELECTFN \TEDIT.CHARMENU.SPEC) + :CHANGES-TO (FNS \TEDIT.CHANGE.PAGELOOKS) - :PREVIOUS-DATE "20-Dec-2024 22:07:54" {WMEDLEY}TEDIT>TEDIT-MENU.;424) + :PREVIOUS-DATE "22-Dec-2024 00:24:03" {WMEDLEY}TEDIT>TEDIT-MENU.;425) (PRETTYCOMPRINT TEDIT-MENUCOMS) @@ -2478,7 +2478,8 @@ (TEDIT.BACKTOMAIN MENUSTREAM]) (\TEDIT.CHANGE.PAGELOOKS - [LAMBDA (MAINTEXTSTREAM PAGELOOKS) (* ; "Edited 20-Oct-2024 17:17 by rmk") + [LAMBDA (MAINTEXTSTREAM PAGELOOKS) (* ; "Edited 24-Dec-2024 21:28 by rmk") + (* ; "Edited 20-Oct-2024 17:17 by rmk") (* ; "Edited 30-Aug-2024 23:43 by rmk") (* ; "Edited 15-Aug-2024 14:48 by rmk") (* ; "Edited 12-Aug-2024 23:34 by rmk") @@ -2487,7 +2488,7 @@ (PAGEID (LISTGET PAGELOOKS 'PAGEID)) [PAGENOS (STRING.EQUAL 'Yes (LISTGET PAGELOOKS 'PAGENOS] PAGEPROPS) - (CL:UNLESS PAGEID + (CL:WHEN (EQ 'OFF PAGEID) (TEDIT.PROMPTPRINT MAINTEXTSTREAM "Please specify a page type" T T) (RETURN)) (for PLTAIL on PAGELOOKS by (CDDR PLTAIL) do (SELECTQ (CADR PLTAIL) @@ -2657,28 +2658,28 @@ (ADDTOVAR LAMA ) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (5405 51363 (DRAWMARGINSCALE 5415 . 8874) (MARGINBAR 8876 . 16001) (MARGINBAR.CREATE -16003 . 19422) (MB.MARGINBAR.BUTTONEVENTINFN 19424 . 27092) (MB.MARGINBAR.SELFN.TABS 27094 . 32457) ( -MB.MARGINBAR.SELFN.TABS.KIND 32459 . 33394) (MARGINBAR.GETSTATEFN 33396 . 37274) (MARGINBAR.SETSTATEFN - 37276 . 37486) (MARGINBAR.NEUTRALIZE 37488 . 37901) (MARGINBAR.LOOKS 37903 . 41009) ( -MB.MARGINBAR.SIZEFN 41011 . 41614) (MB.MARGINBAR.DISPLAYFN 41616 . 44677) (MDESCALE 44679 . 45219) ( -MSCALE 45221 . 45551) (MB.MARGINBAR.SHOWTAB 45553 . 47876) (MB.MARGINBAR.TABTRACK 47878 . 49263) ( -MARGINBAR.INIT 49265 . 50335) (\TEDIT.FMTSPECTOMARBAR 50337 . 51361)) (52257 58474 (\TEDIT.MENU.START -52267 . 57898) (\TEDIT.MENU.BUTTONEVENTFN 57900 . 58472)) (58793 66497 (\TEDIT.MENU.CREATE 58803 . -60614) (\TEDIT.MENU.PARSE 60616 . 64305) (\TEDIT.MENU.NEUTRALIZE 64307 . 66160) ( -\TEDITMENU.RECORD.UNFORMATTED 66162 . 66495)) (66562 87931 (\TEDIT.DEFAULTMENU.CREATE 66572 . 73587) ( -\TEDIT.EXPANDED.MENU 73589 . 74880) (\TEDIT.DEFAULTMENU.FN 74882 . 78026) (\TEDIT.DEFAULTMENU.ACTIONFN - 78028 . 87372) (TEDIT.MENUSTREAM 87374 . 87929)) (87993 105320 (\TEDIT.PARAMENU.CREATE 88003 . 96405) - (\TEDIT.APPLY.PARALOOKS 96407 . 97295) (\TEDIT.SHOW.PARALOOKS 97297 . 100080) ( -\TEDIT.EXPANDEDPARA.MENU 100082 . 100856) (\TEDIT.PARAMENU.FILLIN 100858 . 105318)) (105382 132271 ( -\TEDIT.CHARMENU.CREATE 105392 . 108238) (\TEDIT.CHARMENU.SPEC 108240 . 114395) (\TEDIT.CHARMENU.PARSE -114397 . 117565) (\TEDIT.CHARMENU.FILLIN 117567 . 121743) (\TEDIT.SHOW.CHARLOOKS 121745 . 124852) ( -\TEDIT.EXPANDEDCHAR.MENU 124854 . 125778) (\TEDIT.APPLY.CHARLOOKS 125780 . 126777) ( -\TEDIT.OFFSETTYPE.STATEFN 126779 . 128742) (\TEDIT.OTHER.STATECHANGEFN 128744 . 130144) ( -\TEDIT.OTHER.SELECTFN 130146 . 132269)) (132333 163343 (\TEDIT.PAGEMENU.CREATE 132343 . 144389) ( -\TEDIT.SHOW.PAGELOOKS 144391 . 146186) (\TEDIT.PAGEMENU.FILLIN 146188 . 147738) ( -\TEDIT.PAGEREGION.UNPARSE 147740 . 156930) (\TEDIT.APPLY.PAGELOOKS 156932 . 158695) ( -\TEDIT.CHANGE.PAGELOOKS 158697 . 162499) (\TEDIT.PAGEMENU.CHARLOOKS.STATEFN 162501 . 163341)) (163344 -169147 (\TEDIT.PAGEMENU.CREATE.HEADINGS 163354 . 166166) (\TEDIT.PAGEMENU.HEADINGS.SETSTATEFN 166168 - . 167593) (\TEDIT.PAGEMENU.HEADINGS.STATEFN 167595 . 169145))))) + (FILEMAP (NIL (5359 51317 (DRAWMARGINSCALE 5369 . 8828) (MARGINBAR 8830 . 15955) (MARGINBAR.CREATE +15957 . 19376) (MB.MARGINBAR.BUTTONEVENTINFN 19378 . 27046) (MB.MARGINBAR.SELFN.TABS 27048 . 32411) ( +MB.MARGINBAR.SELFN.TABS.KIND 32413 . 33348) (MARGINBAR.GETSTATEFN 33350 . 37228) (MARGINBAR.SETSTATEFN + 37230 . 37440) (MARGINBAR.NEUTRALIZE 37442 . 37855) (MARGINBAR.LOOKS 37857 . 40963) ( +MB.MARGINBAR.SIZEFN 40965 . 41568) (MB.MARGINBAR.DISPLAYFN 41570 . 44631) (MDESCALE 44633 . 45173) ( +MSCALE 45175 . 45505) (MB.MARGINBAR.SHOWTAB 45507 . 47830) (MB.MARGINBAR.TABTRACK 47832 . 49217) ( +MARGINBAR.INIT 49219 . 50289) (\TEDIT.FMTSPECTOMARBAR 50291 . 51315)) (52211 58428 (\TEDIT.MENU.START +52221 . 57852) (\TEDIT.MENU.BUTTONEVENTFN 57854 . 58426)) (58747 66451 (\TEDIT.MENU.CREATE 58757 . +60568) (\TEDIT.MENU.PARSE 60570 . 64259) (\TEDIT.MENU.NEUTRALIZE 64261 . 66114) ( +\TEDITMENU.RECORD.UNFORMATTED 66116 . 66449)) (66516 87885 (\TEDIT.DEFAULTMENU.CREATE 66526 . 73541) ( +\TEDIT.EXPANDED.MENU 73543 . 74834) (\TEDIT.DEFAULTMENU.FN 74836 . 77980) (\TEDIT.DEFAULTMENU.ACTIONFN + 77982 . 87326) (TEDIT.MENUSTREAM 87328 . 87883)) (87947 105274 (\TEDIT.PARAMENU.CREATE 87957 . 96359) + (\TEDIT.APPLY.PARALOOKS 96361 . 97249) (\TEDIT.SHOW.PARALOOKS 97251 . 100034) ( +\TEDIT.EXPANDEDPARA.MENU 100036 . 100810) (\TEDIT.PARAMENU.FILLIN 100812 . 105272)) (105336 132225 ( +\TEDIT.CHARMENU.CREATE 105346 . 108192) (\TEDIT.CHARMENU.SPEC 108194 . 114349) (\TEDIT.CHARMENU.PARSE +114351 . 117519) (\TEDIT.CHARMENU.FILLIN 117521 . 121697) (\TEDIT.SHOW.CHARLOOKS 121699 . 124806) ( +\TEDIT.EXPANDEDCHAR.MENU 124808 . 125732) (\TEDIT.APPLY.CHARLOOKS 125734 . 126731) ( +\TEDIT.OFFSETTYPE.STATEFN 126733 . 128696) (\TEDIT.OTHER.STATECHANGEFN 128698 . 130098) ( +\TEDIT.OTHER.SELECTFN 130100 . 132223)) (132287 163414 (\TEDIT.PAGEMENU.CREATE 132297 . 144343) ( +\TEDIT.SHOW.PAGELOOKS 144345 . 146140) (\TEDIT.PAGEMENU.FILLIN 146142 . 147692) ( +\TEDIT.PAGEREGION.UNPARSE 147694 . 156884) (\TEDIT.APPLY.PAGELOOKS 156886 . 158649) ( +\TEDIT.CHANGE.PAGELOOKS 158651 . 162570) (\TEDIT.PAGEMENU.CHARLOOKS.STATEFN 162572 . 163412)) (163415 +169218 (\TEDIT.PAGEMENU.CREATE.HEADINGS 163425 . 166237) (\TEDIT.PAGEMENU.HEADINGS.SETSTATEFN 166239 + . 167664) (\TEDIT.PAGEMENU.HEADINGS.STATEFN 167666 . 169216))))) STOP diff --git a/library/tedit/TEDIT-MENU.LCOM b/library/tedit/TEDIT-MENU.LCOM index 5cc28f1196a09131bc1fc5d699ff801bbea9920a..4f1ae7a58672354d8135dbbf7ab07e35ca187b09 100644 GIT binary patch delta 879 zcmZvaKX21O7{+lHPzOM&iiEnn4H7g%qx)lDY!9G|eNGM>pL;&H0VYH%R3R}TghWv$ z5DZ8}-m0o76LXan@fr9UEP%wo%DHXQ4E1n+pXc6J_uNnS^>^d%ug2%$vbz!QKHVUQ zxIl17f)I7a&;6UM1xrmr&Nnd$2@Pp5{sz^@VZ8DA)B=) zvU1QB`XP{@&OXyaARPjU8l_U@sxU?j4G`v8t9G3RoU40QVkivPMrNa4o#_@3)F62de}T7ZB>=uuIA07#`{&&&y7scno(9PlV}6GvK;Y@QlYM&0*(}J)M?W2IpIJ zI-Nz>y8n243odHyFRrwfQ(;?Z&TQN2*tt4+v2@7;>_=W0RZpCo)$iTQ`ahRWqr?L? z%eMkurTMy$WwDyrrY(Cjnhixr7X@9dpR=^ZDp_|Fv@k!RdI4 z^?54wkQtz%TirWY2uZW0s}Lv=vjV8^!ho|x6t_! ztd%SQiZImJGbwKuKqA*>?b|Oh>~XybB&@SHdIZGxA(i7yNF@tn_{ae9B5T!-=2L?L z)2t_AATEJDOz0jE>YY|ipMu!1C#OW7N+5)S%Wg#g2QTEDIT>TEDIT-PAGE.;198 121611 +(FILECREATED "24-Dec-2024 21:32:34" {WMEDLEY}TEDIT>TEDIT-PAGE.;200 121366 :EDIT-BY rmk - :CHANGES-TO (VARS TEDIT-PAGECOMS) - (FNS \TEDIT.FORMATPAGE \TEDIT.HARDCOPY.PAGEHEADINGS \TEDIT.FORMATTEXTBOX - \TEDIT.HARDCOPY-COLUMN-END) + :CHANGES-TO (FNS TEDIT.SINGLE.PAGEFORMAT) - :PREVIOUS-DATE "11-Dec-2024 20:59:29" {WMEDLEY}TEDIT>TEDIT-PAGE.;196) + :PREVIOUS-DATE "11-Dec-2024 22:39:52" {WMEDLEY}TEDIT>TEDIT-PAGE.;198) (PRETTYCOMPRINT TEDIT-PAGECOMS) @@ -309,7 +307,8 @@ (TEDIT.SINGLE.PAGEFORMAT [LAMBDA (PAGE#S? PX PY PFONT PQUAD LEFT RIGHT TOP BOTTOM COLS COLWIDTH INTERCOL HEADINGS UNITS - PAGEPROPS PAPERSIZE) (* ; "Edited 15-Aug-2024 23:01 by rmk") + PAGEPROPS PAPERSIZE) (* ; "Edited 24-Dec-2024 21:20 by rmk") + (* ; "Edited 15-Aug-2024 23:01 by rmk") (* ; "Edited 6-Aug-2024 12:06 by rmk") (* ; "Edited 13-Nov-2023 08:59 by rmk") (* ; "Edited 10-Aug-2023 08:14 by rmk") @@ -385,29 +384,29 @@ FORMATINFO ,(LISTGET PAGEPROPS 'FOLIOINFO]) (CL:WHEN HEADINGS - [SETQ HEADINGREGIONS (for HDG LEFT in HEADINGS - collect + [SETQ HEADINGREGIONS + (for HDG LEFT in HEADINGS when (CAR HDG) + collect - (* ;; "Run thru the list of headings, building a box for each. By default, a heading will have the same width right margin as the left margin that was specified.") + (* ;; "Run thru the list of headings, building a box for each. By default, a heading will have the same width right margin as the left margin that was specified.") - (SETQ LEFT (SCALEPAGEXUNITS (CADR HDG) - SCALEFACTOR PAPERSIZE LANDSCAPE?)) - (create PAGEREGION - REGIONFILLMETHOD _ 'HEADING - REGIONSPEC _ (create REGION - LEFT _ LEFT - BOTTOM _ (SCALEPAGEYUNITS - (CADDR HDG) - SCALEFACTOR - PAPERSIZE LANDSCAPE? - ) - WIDTH _ - (IMAX (IDIFFERENCE PAPERWIDTH - LEFT) - PTSPERINCH) - HEIGHT _ (IQUOTIENT PTSPERINCH - 2)) - REGIONLOCALINFO _ (LIST 'HEADINGTYPE (CAR HDG] + (if (AND (NUMBERP (CADR HDG)) + (NUMBERP (CADDR HDG))) + then (SETQ LEFT (SCALEPAGEXUNITS (CADR HDG) + SCALEFACTOR PAPERSIZE LANDSCAPE?)) + (create PAGEREGION + REGIONFILLMETHOD _ 'HEADING + REGIONSPEC _ (create REGION + LEFT _ LEFT + BOTTOM _ (SCALEPAGEYUNITS (CADDR HDG) + SCALEFACTOR PAPERSIZE + LANDSCAPE?) + WIDTH _ (IMAX (IDIFFERENCE PAPERWIDTH + LEFT) + PTSPERINCH) + HEIGHT _ (IQUOTIENT PTSPERINCH 2)) + REGIONLOCALINFO _ (LIST 'HEADINGTYPE (CAR HDG))) + else (ERROR (CONCAT "Invalid X/Y position for heading-type " (CAR HDG] (SETQ SUBREGIONS (APPEND SUBREGIONS HEADINGREGIONS))) [COND [(OR (NULL COLS) @@ -1896,15 +1895,15 @@ (RETURN (DREMOVE NIL $$VAL]) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (11936 15548 (\TEDIT.PARSE.PAGEFRAMES 11946 . 13725) (\TEDIT.PUT.PAGEFRAMES 13727 . -14551) (\TEDIT.UNPARSE.PAGEFRAMES 14553 . 15546)) (15611 36874 (TEDIT.SINGLE.PAGEFORMAT 15621 . 25860) - (TEDIT.COMPOUND.PAGEFORMAT 25862 . 26841) (TEDIT.PAGEFORMAT 26843 . 34132) (TEDIT.GET.PAGEFORMAT -34134 . 36872)) (37161 47663 (TEDIT.FORMAT.HARDCOPY 37171 . 47661)) (47750 99231 (\TEDIT.FORMATBOX -47760 . 60863) (\TEDIT.FORMATHEADING 60865 . 65387) (\TEDIT.FORMATPAGE 65389 . 73919) ( -\TEDIT.FORMATTEXTBOX 73921 . 89845) (\TEDIT.FORMATFOLIO 89847 . 95201) (\TEDIT.FORMAT.FOUNDBOX? 95203 - . 97242) (\TEDIT.SKIP.SPECIALCOND 97244 . 99229)) (99311 101841 (\TEDIT.HARDCOPY.PAGEHEADINGS 99321 - . 101839)) (101950 109679 (\TEDIT.HARDCOPY-COLUMN-END 101960 . 109677)) (109724 114665 ( -SCALEPAGEUNITS 109734 . 110875) (SCALEPAGEXUNITS 110877 . 111647) (SCALEPAGEYUNITS 111649 . 112420) ( -\TEDIT.PAPERHEIGHT 112422 . 113357) (\TEDIT.PAPERWIDTH 113359 . 114663)) (115081 118649 (ROMANNUMERALS - 115091 . 118647)) (118685 121588 (\TEDIT.FORMAT.FOOTNOTE 118695 . 121586))))) + (FILEMAP (NIL (11801 15413 (\TEDIT.PARSE.PAGEFRAMES 11811 . 13590) (\TEDIT.PUT.PAGEFRAMES 13592 . +14416) (\TEDIT.UNPARSE.PAGEFRAMES 14418 . 15411)) (15476 36629 (TEDIT.SINGLE.PAGEFORMAT 15486 . 25615) + (TEDIT.COMPOUND.PAGEFORMAT 25617 . 26596) (TEDIT.PAGEFORMAT 26598 . 33887) (TEDIT.GET.PAGEFORMAT +33889 . 36627)) (36916 47418 (TEDIT.FORMAT.HARDCOPY 36926 . 47416)) (47505 98986 (\TEDIT.FORMATBOX +47515 . 60618) (\TEDIT.FORMATHEADING 60620 . 65142) (\TEDIT.FORMATPAGE 65144 . 73674) ( +\TEDIT.FORMATTEXTBOX 73676 . 89600) (\TEDIT.FORMATFOLIO 89602 . 94956) (\TEDIT.FORMAT.FOUNDBOX? 94958 + . 96997) (\TEDIT.SKIP.SPECIALCOND 96999 . 98984)) (99066 101596 (\TEDIT.HARDCOPY.PAGEHEADINGS 99076 + . 101594)) (101705 109434 (\TEDIT.HARDCOPY-COLUMN-END 101715 . 109432)) (109479 114420 ( +SCALEPAGEUNITS 109489 . 110630) (SCALEPAGEXUNITS 110632 . 111402) (SCALEPAGEYUNITS 111404 . 112175) ( +\TEDIT.PAPERHEIGHT 112177 . 113112) (\TEDIT.PAPERWIDTH 113114 . 114418)) (114836 118404 (ROMANNUMERALS + 114846 . 118402)) (118440 121343 (\TEDIT.FORMAT.FOOTNOTE 118450 . 121341))))) STOP diff --git a/library/tedit/TEDIT-PAGE.LCOM b/library/tedit/TEDIT-PAGE.LCOM index d6d38872330165c885b34aa0200c79229396cfc4..bf34aa2db04b1fa51a6cfd9fa4b6103a4f91948f 100644 GIT binary patch delta 607 zcmZvX&2G~`6oor(k*Eu5pyfwVB`%f-R3gSR z=#qUGRPzQbS+$M2VL`SPV!di9qe5v-;-FIp?1FdWOE7p^q;XiJC9PTX~`o z6$rK{v8a0ZM#n@^mO+#VIe*5)BGjU$1e^VMtNXT>?8I$|-}m~v4=mt6H}9?`9gxba z)hb-{$+9d#yERC~mj$Ytv@AXL4^?pVp1XyTZi*uoL3pDwU)I~&!bV8nbO z@{j*iS(uCJ+`aZa)C^enip(n#z*wbFc0)fUtp6j$q~Q2IONWZ8oudL{lO2FrAW$pX zRcFPnIE_`$4QgPj#;|_fMN7H?*h6;fb1}W(V&&=OSLotPCj$LxSO3+ww zz|_hAJD8d_77b_ST_h9=oMj&8u|f$*ZfCExle7WCCk^OzcauTV?ZB&UAGYIGJL$a6 f5B7U8@cm3~K?JPnKngNdbv6AiriI~2=AiZ$x8i`3s(mEp!rGI8o?6hSn z)Q#W+xUk$+-=T<*ok(5UgYP+hMh->M zZh&DS+Tn29W|TR=&_nbXwP0&J+&&l`?(PkDVEFcMe01Ma&jt(XfLG=2zQ#IhaSZ>m z&1Tbroy|8I_@Ad^HH>;Eie->VzmTE&O6E`AEj`gG02#W7;K?v5?5BMgk6we}1uK5i zmAPG{P+#}695kixtA1Ao>GQk+^-hvcLJ>m^1~qm1cvhW}MT2@=cuZJe=pWN4+=iik z^ZBwm^?927EWgi$H^`;BX;KoaN9LkBGGD4+=G@G2+Iz6E{!RTcfB4AZRT890z;sWF z(205(AYFDQiX+G@OEVB$Kpyz9yw28NOQIqN!JN{%6_Fa_aJ|lCH%b%j)MC0wuh5Ed zMeV!ygrKk@{V+YTmF9WvP KM)|4oA^!_N1Av|Y diff --git a/library/tedit/TEDIT-SCREEN b/library/tedit/TEDIT-SCREEN index 08bf8109..81d34840 100644 --- a/library/tedit/TEDIT-SCREEN +++ b/library/tedit/TEDIT-SCREEN @@ -1,13 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "13-Dec-2024 23:51:30" {WMEDLEY}tedit>TEDIT-SCREEN.;839 186344 +(FILECREATED "24-Dec-2024 22:16:22" {WMEDLEY}tedit>TEDIT-SCREEN.;845 185725 :EDIT-BY rmk - :CHANGES-TO (FNS \TEDIT.FORMATLINE \TEDIT.DISPLAYLINE \TEDIT.FORMATLINE.UPDATELOOKS) - (RECORDS LINEDESCRIPTOR) + :CHANGES-TO (FNS \TEDIT.FORMATLINE) - :PREVIOUS-DATE "13-Dec-2024 15:41:40" {WMEDLEY}tedit>TEDIT-SCREEN.;835) + :PREVIOUS-DATE "19-Dec-2024 11:51:04" {WMEDLEY}TEDIT>TEDIT-SCREEN.;840) (PRETTYCOMPRINT TEDIT-SCREENCOMS) @@ -688,6 +687,8 @@ (\TEDIT.FORMATLINE [LAMBDA (TSTREAM CH#1 LINE REGION IMAGESTREAM FORMATTINGSTATE) + (* ; "Edited 24-Dec-2024 22:15 by rmk") + (* ; "Edited 23-Dec-2024 19:47 by rmk") (* ; "Edited 13-Dec-2024 23:46 by rmk") (* ; "Edited 12-Dec-2024 15:20 by rmk") (* ; "Edited 9-Dec-2024 21:05 by rmk") @@ -698,20 +699,10 @@ (* ; "Edited 2-Sep-2024 16:06 by rmk") (* ; "Edited 27-Aug-2024 18:29 by rmk") (* ; "Edited 4-Aug-2024 18:07 by rmk") - (* ; "Edited 29-Jul-2024 23:30 by rmk") - (* ; "Edited 28-Jun-2024 21:51 by rmk") - (* ; "Edited 25-Jun-2024 15:43 by rmk") - (* ; "Edited 13-Jun-2024 17:26 by rmk") (* ; "Edited 21-May-2024 14:45 by rmk") - (* ; "Edited 10-May-2024 12:11 by rmk") (* ; "Edited 17-Mar-2024 00:27 by rmk") - (* ; "Edited 15-Mar-2024 19:43 by rmk") - (* ; "Edited 14-Mar-2024 12:53 by rmk") - (* ; "Edited 2-Mar-2024 07:39 by rmk") (* ; "Edited 5-Feb-2024 09:35 by rmk") - (* ; "Edited 26-Jan-2024 11:01 by rmk") (* ; "Edited 3-Dec-2023 16:48 by rmk") - (* ; "Edited 27-Nov-2023 23:05 by rmk") (* ; "Edited 28-Oct-2023 13:14 by rmk") (* ; "Edited 24-Jul-2023 23:13 by rmk") (* ; "Edited 23-Oct-2022 09:11 by rmk") @@ -822,16 +813,6 @@ (* ;; "We have the true starting piece and CH#1") - [if (REGIONP REGION) - then (SETQ WMARGIN (ffetch (REGION LEFT) of REGION)) - (* ; - "Presumably hardcopy in different page regions.") - (SETQ WIDTH (ffetch (REGION WIDTH) of REGION)) - else (SETQ WMARGIN \TEDIT.LINEREGION.WIDTH) (* ; - "A little more display margin on both sides") - (SETQ WIDTH (IDIFFERENCE (FGETTOBJ TEXTOBJ WRIGHT) - (UNFOLD WMARGIN 2] - (* ;; "") (SETQ LINETYPE (if (NOT (DISPLAYSTREAMP IMAGESTREAM)) @@ -846,6 +827,25 @@ (SETQ FMTSPEC (FGETLD LINE LFMTSPEC)) (SETQ SCALE (FGETPARA FMTSPEC FMTHARDCOPYSCALE)) + [if (REGIONP REGION) + then (SETQ WMARGIN (ffetch (REGION LEFT) of REGION)) + (* ; + "Presumably hardcopy in different page regions.") + (SETQ WIDTH (ffetch (REGION WIDTH) of REGION)) + else (SETQ WMARGIN \TEDIT.LINEREGION.WIDTH) (* ; + "A little more display margin on both sides") + (SETQ WIDTH (IDIFFERENCE (FGETTOBJ TEXTOBJ WRIGHT) + (UNFOLD WMARGIN 2] + (SETQ RIGHTMARGIN (if (ZEROP (FGETPARA FMTSPEC RIGHTMAR)) + then + (* ;; "RIGHTMAR = 0 => follow the window/region's width") + + (CL:IF (EQ LINETYPE 'HARDCOPYDISPLAY) + (ITIMES SCALE WIDTH) + WIDTH) + else (FGETPARA FMTSPEC RIGHTMAR))) + + (* ;; "Account for first-line indentation from the true left margin (LEFTMAR)") (* ;; "This line starts a paragraph if it starts the document or it is at the beginning of a piece just after a last-paragraph piece. This assumes that only visible pieces matter; otherwise, use PREVPIECE.") @@ -853,18 +853,9 @@ (AND (IEQP CH#1 START-OF-PIECE) (OR (NOT (\PREV.VISIBLE.PIECE PC)) (PPARALAST (\PREV.VISIBLE.PIECE PC] - - (* ;; "Account for first-line indentation from the true left margin (LEFTMAR)") - (SETQ LX1 (CL:IF 1STLN (FGETPARA FMTSPEC 1STLEFTMAR) (FGETPARA FMTSPEC LEFTMAR))) - (SETQ RIGHTMARGIN (if (ZEROP (FGETPARA FMTSPEC RIGHTMAR)) - then - (* ;; "RIGHTMAR = 0 => follow the window/region's width") - - WIDTH - else (FGETPARA FMTSPEC RIGHTMAR))) (SETQ WIDTH (IDIFFERENCE RIGHTMARGIN LX1)) (* ;; "") @@ -1717,7 +1708,8 @@ LINE]) (\TEDIT.FORMATLINE.UPDATELOOKS - [LAMBDA (TSTREAM PC) (* ; "Edited 13-Dec-2024 17:09 by rmk") + [LAMBDA (TSTREAM PC) (* ; "Edited 19-Dec-2024 11:50 by rmk") + (* ; "Edited 13-Dec-2024 17:09 by rmk") (* ; "Edited 4-Aug-2024 15:09 by rmk") (* ; "Edited 28-Jul-2024 20:52 by rmk") (* ; "Edited 9-May-2024 10:28 by rmk") @@ -1779,8 +1771,9 @@ (CL:WHEN (EQ LINETYPE 'HARDCOPYDISPLAY) (* ; "Switch widths to hardcopy") (SETQ FONT (FONTCOPY FONT 'DEVICE IMAGESTREAM)))] - (SETQ HASKERN NIL) (* ; - "Set to T if FONT contains left-kern information") + (SETQ HASKERN (FFETCH (FONTDESCRIPTOR FONTHASLEFTKERNS) of FONT)) + (* ; + "T if FONT contains left-kern information") (SETQ UNBREAKABLE (FGETCLOOKS PLOOKS CLUNBREAKABLE)) (PUSHCHAR CHARSLOT NIL PLOOKS)) else @@ -2861,21 +2854,21 @@ (\TEDIT.LINE.TALLP LINE PHEIGHT))))]) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (28071 30287 (\TEDIT.LINEDESCRIPTOR.DEFPRINT 28081 . 30285)) (37692 118979 ( -\TEDIT.FORMATLINE 37702 . 73174) (\TEDIT.FORMATLINE.SETUP.PARA 73176 . 77999) ( -\TEDIT.FORMATLINE.HORIZONTAL 78001 . 82397) (\TEDIT.FORMATLINE.VERTICAL 82399 . 84616) ( -\TEDIT.FORMATLINE.JUSTIFY 84618 . 90639) (\TEDIT.FORMATLINE.TABS 90641 . 98441) (\TEDIT.SCALE.TABS -98443 . 99234) (\TEDIT.FORMATLINE.PURGE.SPACES 99236 . 100663) (\TEDIT.FORMATLINE.FLUSH.SOFTHYPHEN -100665 . 101566) (\TEDIT.FORMATLINE.EMPTY 101568 . 106254) (\TEDIT.FORMATLINE.UPDATELOOKS 106256 . -112173) (\TEDIT.FORMATLINE.LASTLEGAL 112175 . 115715) (\TEDIT.LINES.ABOVE 115717 . 118977)) (119096 -121011 (\TLVALIDATE 119106 . 121009)) (121205 142369 (\TEDIT.DISPLAYLINE 121215 . 134662) ( -\TEDIT.DISPLAYLINE.TABS 134664 . 137287) (\TEDIT.LINECACHE 137289 . 138017) (\TEDIT.CREATE.LINECACHE -138019 . 138855) (\TEDIT.BLTCHAR 138857 . 141484) (\TEDIT.DIACRITIC.SHIFT 141486 . 142367)) (142984 -186321 (\TEDIT.BACKFORMAT 142994 . 145548) (\TEDIT.PREVIOUS.LINEBREAK 145550 . 148273) ( -\TEDIT.UPDATE.LINES 148275 . 152720) (\TEDIT.PANE.CREATELINES 152722 . 155714) ( -\TEDIT.SUFFIXLINE.CREATE 155716 . 157091) (\TEDIT.LINES.BELOW 157093 . 161455) (\TEDIT.MEASURED.LINES -161457 . 163229) (\TEDIT.VALID.LINES 163231 . 171874) (\TEDIT.LASTVALIDLINE 171876 . 176698) ( -\TEDIT.NEXTVALIDLINE 176700 . 178002) (\TEDIT.CLEARPANE.BELOW.LINE 178004 . 180110) (\TEDIT.INSERTLINE - 180112 . 181498) (\TEDIT.LINE.BOTTOM 181500 . 184496) (\TEDIT.SHOW.AT.BOTTOMP 184498 . 185608) ( -\TEDIT.SHOW.AT.TOPP 185610 . 186319))))) + (FILEMAP (NIL (27979 30195 (\TEDIT.LINEDESCRIPTOR.DEFPRINT 27989 . 30193)) (37600 118360 ( +\TEDIT.FORMATLINE 37610 . 72350) (\TEDIT.FORMATLINE.SETUP.PARA 72352 . 77175) ( +\TEDIT.FORMATLINE.HORIZONTAL 77177 . 81573) (\TEDIT.FORMATLINE.VERTICAL 81575 . 83792) ( +\TEDIT.FORMATLINE.JUSTIFY 83794 . 89815) (\TEDIT.FORMATLINE.TABS 89817 . 97617) (\TEDIT.SCALE.TABS +97619 . 98410) (\TEDIT.FORMATLINE.PURGE.SPACES 98412 . 99839) (\TEDIT.FORMATLINE.FLUSH.SOFTHYPHEN +99841 . 100742) (\TEDIT.FORMATLINE.EMPTY 100744 . 105430) (\TEDIT.FORMATLINE.UPDATELOOKS 105432 . +111554) (\TEDIT.FORMATLINE.LASTLEGAL 111556 . 115096) (\TEDIT.LINES.ABOVE 115098 . 118358)) (118477 +120392 (\TLVALIDATE 118487 . 120390)) (120586 141750 (\TEDIT.DISPLAYLINE 120596 . 134043) ( +\TEDIT.DISPLAYLINE.TABS 134045 . 136668) (\TEDIT.LINECACHE 136670 . 137398) (\TEDIT.CREATE.LINECACHE +137400 . 138236) (\TEDIT.BLTCHAR 138238 . 140865) (\TEDIT.DIACRITIC.SHIFT 140867 . 141748)) (142365 +185702 (\TEDIT.BACKFORMAT 142375 . 144929) (\TEDIT.PREVIOUS.LINEBREAK 144931 . 147654) ( +\TEDIT.UPDATE.LINES 147656 . 152101) (\TEDIT.PANE.CREATELINES 152103 . 155095) ( +\TEDIT.SUFFIXLINE.CREATE 155097 . 156472) (\TEDIT.LINES.BELOW 156474 . 160836) (\TEDIT.MEASURED.LINES +160838 . 162610) (\TEDIT.VALID.LINES 162612 . 171255) (\TEDIT.LASTVALIDLINE 171257 . 176079) ( +\TEDIT.NEXTVALIDLINE 176081 . 177383) (\TEDIT.CLEARPANE.BELOW.LINE 177385 . 179491) (\TEDIT.INSERTLINE + 179493 . 180879) (\TEDIT.LINE.BOTTOM 180881 . 183877) (\TEDIT.SHOW.AT.BOTTOMP 183879 . 184989) ( +\TEDIT.SHOW.AT.TOPP 184991 . 185700))))) STOP diff --git a/library/tedit/TEDIT-SCREEN.LCOM b/library/tedit/TEDIT-SCREEN.LCOM index 9feea6bef8edfb14892efc3e8d9bb72f43b6dc51..f85afb113eddc09cc247ca942f7c40eaeb82e811 100644 GIT binary patch delta 1787 zcmZuxOKcNI7|t4pVuuz-cF04Jj!i%bRh*s2KE{oJjlE75Y|m=FCJBvH(tz3o`hd1l z3q>GW^-LHEsX{`6TcsZ27=+YAAIDUc+Cwk2m1xDOhf1kb4jd}=UpodT#s}~G|9mt5 zS^uj1n2}6Wru%01g`3xUm+6aoK2zj=PNruo2<;&j;zqa@e zO64ns0vve;NT<^&bZY*C)2E($l4+@t=y2XC*jdlEd^?9y&kcTYB*HX=P0b*h{9M8Q z2+FvgecTb1@@NhYq7>%OqGFuUa7JY*6umfIv~vY}_R{#-#W&8+pa1v}L~;Da|7aP) z+NJcXCR0bE^2$epwf95WPUW1u|H5PW(~d*(s~!7}iqu;8b$4mKmKJX3wtLCCJ!GAE zu(W>fLrdi0d-v_`m?4Hwt?plWInn{Y)!)Uyo55oJhCpJ^uPZ-`Ju5%Tp~wYgNPZnT zuAG$J(X{fVJQ6*y>xM{(_a0QYU+YxvRF#AB)99_pUkzX9BYCiEXeSoq;xlofE4Z=d zcYV>>Gql!mQ=GiF?P~Rjw^)5r5+|!q4%b56dqW{;Q8M1Q3+reuf5P^Ji-=*E^3Qnu z`dC+(7&;Et@=`o{$WS@Ti;|xe?kplYYdNB~p4W(p=IV`0XQzDOW)Wcqmj5LB!h}&B z?n_x3M-7DQiK6Sfo>THc3%Y^k8suiDEU#>X51SBYtB+!ddxpY9)q?brAr;HpC*qN` zZ%veec|$H&;_|z9yTVxK1P~~UHOe4`fe_~nn;9D1aUi6r@Y#Pk2%UFkJcJ2>GV3c$ zDRPR|q%9_nLY^+dSZ$(I18<;ID0dTz^R|pR4VpD+`vp7iAG5s@GIiQ)QeJpPd8@Kr zK1{rXO~z5tE>0kWYg_9!47Sy!bNNR+xlMy&lJVUG)Z|Zjq^gNLd(sgl;52|GW|{HfY>&ec>Tua+&N+j2rD6P>ZHzWol$&iqDPi);SU)31gNtUqL~pNwK>u6$lArX?hcqf5 z_U~0#?Z5ucqx>2J$u;^OQoqS*l#wEd79xg ztC{bjJQbDK-X7f_2xY>`HF>4`k^H1*T#BBVL2K*&=EK7kOXT2t;Jy&kMe_O=AIiUb z-W?e`>bmM~KK#7W@r!W7orj&bD;-r4pcB{STajgDTmBT8Rx0vwWHNDA#Ko=ql`~&P zI^efgc`_qLDo-wjmA#5GA=T*J$b&i~{JZ=uI&tQrctw2l-F|oPSK{{$Nihf48tB7dy6jM9>jAL?QJ(Kr^n?Zzej^v%m!7jpxDnE#$455sodI+v3 z7G2-)@&t!(5*2pXeeg<$=L4QB_>`feo(9tMLmVU4xsk zPHZ%AW>EQKd@RIGc=}Q&r3}84>)po@ z21bp6D)}%Ui%>+SAjd26fFuzPDsU>9h4d(}~uCXoilmFrz`gYT#_%v!Ne3*O3bq%iC7gDb54Hc*{dZ zcYtFTgL~hagWRYZswWD;>LRD_u&LALv!*qlIfE!NP=8ogCTlW`Ib}^`Y)}+P+6go@ zDugh`Dw-2Z#q69|fes@^jnhO?)kY%%C09fy4Be}?S43Pl(85y5cXAHwKn~^d^G+$q zCgK!yKRpn9qL4u+cnTo|`96t>s;n&t=#Z8~!d|GV!*Y3eJw$c+{cs`* zdXr!Z)0D*HarxPH@BY8T@gZeZ_K|EnVjZ1bnLQJ%u%n?P2D?uQ%PlfK`R$Ez>_z~W z2YQ3gM(keC#`$VFb}zCqQZ1jWt;vt&0l6IdCND2g8b64)zNo$~{~<44`m{Xi{JJq( zowYV=rmR>;lCuAq7-ATwRvFXf9=)hA`7<4yugy@SyL8;14CwfiWD)wT5utds-B_?n NCDx0y{Rf$s=ve>& diff --git a/sources/FONT b/sources/FONT index 6bf6e950..4c9c1e43 100644 --- a/sources/FONT +++ b/sources/FONT @@ -1,14 +1,14 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "14-Dec-2024 16:52:43" {WMEDLEY}FONT.;16 190016 +(FILECREATED "19-Dec-2024 15:25:17" {WMEDLEY}FONT.;26 191458 :EDIT-BY rmk - :CHANGES-TO (VARS FONTCOMS) - (RECORDS FONTCLASS FONTDESCRIPTOR) - (FNS FONTCLASS.DEFPRINT) + :CHANGES-TO (FNS \FGETLEFTKERN) + (VARS FONTCOMS) + (FUNCTIONS \CREATEKERNELEMENT) - :PREVIOUS-DATE "14-Dec-2024 09:13:44" {WMEDLEY}FONT.;15) + :PREVIOUS-DATE "19-Dec-2024 11:52:01" {WMEDLEY}FONT.;18) (PRETTYCOMPRINT FONTCOMS) @@ -94,8 +94,9 @@ (MACROS FONTASCENT FONTDESCENT FONTHEIGHT \FGETOFFSET \FSETOFFSET \FGETWIDTH \FSETWIDTH \FGETCHARWIDTH \FSETCHARWIDTH \FGETIMAGEWIDTH \FSETIMAGEWIDTH \GETCHARSETINFO \CREATECSINFOELEMENT \CREATEFONTCHARSETVECTOR) - (FUNCTIONS \CREATEKERNELEMENT \FSETLEFTKERN \FGETLEFTKERN) + (FUNCTIONS \CREATEKERNELEMENT \FSETLEFTKERN) (CONSTANTS (\MAXNSCHAR 65535] + (FNS \FGETLEFTKERN) (COMS (* ; "NS Character specific code") (FNS \CREATECHARSET \INSTALLCHARSETINFO) (GLOBALVARS DISPLAYFONTCOERCIONS MISSINGDISPLAYFONTCOERCIONS @@ -2870,7 +2871,7 @@ (/DECLAREDATATYPE 'FONTDESCRIPTOR '(POINTER POINTER POINTER POINTER WORD WORD WORD WORD SIGNEDWORD SIGNEDWORD SIGNEDWORD SIGNEDWORD POINTER POINTER POINTER POINTER POINTER (BITS 8) - WORD POINTER POINTER POINTER) + WORD POINTER POINTER FLAG POINTER) '((FONTDESCRIPTOR 0 POINTER) (FONTDESCRIPTOR 2 POINTER) (FONTDESCRIPTOR 4 POINTER) @@ -2892,6 +2893,7 @@ (FONTDESCRIPTOR 27 (BITS . 15)) (FONTDESCRIPTOR 28 POINTER) (FONTDESCRIPTOR 30 POINTER) + (FONTDESCRIPTOR 30 (FLAGBITS . 0)) (FONTDESCRIPTOR 32 POINTER)) '34) @@ -2933,6 +2935,7 @@ (FONTAVGCHARWIDTH WORD) (FONTIMAGEWIDTHS POINTER) (FONTCHARSETVECTOR POINTER) + (FONTHASLEFTKERNS FLAG) (FONTEXTRAFIELD2 POINTER))) (DATATYPE CHARSETINFO (WIDTHS OFFSETS IMAGEWIDTHS CHARSETBITMAP YWIDTHS (CHARSETASCENT WORD) @@ -3006,6 +3009,8 @@  "Set in FONTCREATE, used to fix up the linelength when DSPFONT is called") (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.") + (FONTHASLEFTKERNS FLAG) (* ; + "T if at least one character set has an entry for left kerns") (FONTEXTRAFIELD2 POINTER)) FONTCHARSETVECTOR _ (\CREATEFONTCHARSETVECTOR) (INIT (DEFPRINT 'FONTDESCRIPTOR (FUNCTION FONTDESCRIPTOR.DEFPRINT)))) @@ -3065,7 +3070,7 @@ (/DECLAREDATATYPE 'FONTDESCRIPTOR '(POINTER POINTER POINTER POINTER WORD WORD WORD WORD SIGNEDWORD SIGNEDWORD SIGNEDWORD SIGNEDWORD POINTER POINTER POINTER POINTER POINTER (BITS 8) - WORD POINTER POINTER POINTER) + WORD POINTER POINTER FLAG POINTER) '((FONTDESCRIPTOR 0 POINTER) (FONTDESCRIPTOR 2 POINTER) (FONTDESCRIPTOR 4 POINTER) @@ -3087,6 +3092,7 @@ (FONTDESCRIPTOR 27 (BITS . 15)) (FONTDESCRIPTOR 28 POINTER) (FONTDESCRIPTOR 30 POINTER) + (FONTDESCRIPTOR 30 (FLAGBITS . 0)) (FONTDESCRIPTOR 32 POINTER)) '34) @@ -3164,18 +3170,16 @@ T))) ) -(DEFMACRO \CREATEKERNELEMENT () - `(CL:MAKE-ARRAY (IPLUS \MAXTHINCHAR 3) - :ELEMENT-TYPE - '(SIGNED-BYTE 16) - :INITIAL-ELEMENT 0)) +(DEFMACRO \CREATEKERNELEMENT () (* ; "Edited 19-Dec-2024 12:20 by rmk") + `(PROGN (HELP "THIS IS BOGUS, SEE \FGETLEFTKERN") + (CL:MAKE-ARRAY (IPLUS \MAXTHINCHAR 3) + :ELEMENT-TYPE + '(SIGNED-BYTE 16) + :INITIAL-ELEMENT 0))) (DEFMACRO \FSETLEFTKERN (LEFTKERNBLOCK INDEX KERNVALUE) `(CL:SETF (CL:AREF ,LEFTKERNBLOCK ,INDEX) ,KERNVALUE)) - -(DEFMACRO \FGETLEFTKERN (LEFTKERNBLOCK CHAR8CODE) - `(CL:AREF ,LEFTKERNBLOCK ,CHAR8CODE)) (DECLARE%: EVAL@COMPILE (RPAQQ \MAXNSCHAR 65535) @@ -3187,6 +3191,23 @@ (* "END EXPORTED DEFINITIONS") ) +(DEFINEQ + +(\FGETLEFTKERN + [LAMBDA (FONT PREVCHARCODE CHARCODE) (* ; "Edited 19-Dec-2024 15:25 by rmk") + + (* ;; "Returns the kern information for CHARCODE in FONT, given that it is an immediate successor of PREVCHARCODE. Returns 0 if no PREVCHARCODE/CHARCODE kerning is specified. For now, assume that the kerning information is sparse for characters within a character set, stored as a 2-level alist. ") + + (* ;; "If the kerning information for a character is already a FIXP, then it is an offset no matter what the preceding character might be. This appears to be the way at least AC font files are set up.") + + (OR [AND (fetch (FONTDESCRIPTOR FONTHASLEFTKERNS) of FONT) + (LET [(CHARKERNS (CDR (FASSOC (\GETCHARSETINFO (\CHARSET CHARCODE) + FONT T) + (\CHAR8CODE CHARCODE] + (OR (FIXP CHARKERNS) + (CDR (FASSOC PREVCHARCODE CHARKERNS] + 0]) +) @@ -3359,31 +3380,31 @@ (ADDTOVAR LAMA FONTCOPY) ) (DECLARE%: DONTCOPY - (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))))) + (FILEMAP (NIL (8734 18253 (CHARWIDTH 8744 . 9529) (CHARWIDTHY 9531 . 10901) (STRINGWIDTH 10903 . 11996 +) (\CHARWIDTH.DISPLAY 11998 . 12411) (\STRINGWIDTH.DISPLAY 12413 . 12837) (\STRINGWIDTH.GENERIC 12839 + . 18251)) (18254 24636 (DEFAULTFONT 18264 . 20097) (FONTCLASS 20099 . 22261) (FONTCLASSUNPARSE 22263 + . 23162) (FONTCLASSCOMPONENT 23164 . 23673) (SETFONTCLASSCOMPONENT 23675 . 24634)) (25310 38042 ( +FONTCREATE 25320 . 34587) (\FONT.SYMBOLMEMB 34589 . 34819) (\FONT.SYMBOLASSOC 34821 . 35979) ( +\FONT.COMPARESYMBOL 35981 . 38040)) (38081 42705 (FONTASCENT 38091 . 38259) (FONTDESCENT 38261 . 38530 +) (FONTHEIGHT 38532 . 38718) (FONTPROP 38720 . 42163) (\AVGCHARWIDTH 42165 . 42703)) (42752 55391 ( +GETCHARBITMAP 42762 . 45652) (PUTCHARBITMAP 45654 . 53711) (MOVECHARBITMAP 53713 . 55389)) (55392 +139931 (FONTCOPY 55402 . 60710) (FONTSAVAILABLE 60712 . 65917) (FONTFILEFORMAT 65919 . 67543) (FONTP +67545 . 67844) (FONTUNPARSE 67846 . 70410) (SETFONTDESCRIPTOR 70412 . 72121) (CHARCODEP 72123 . 72484) + (EDITCHAR 72486 . 72915) (\STREAMCHARWIDTH 72917 . 77081) (\UNITWIDTHSVECTOR 77083 . 77446) ( +\CREATEDISPLAYFONT 77448 . 78201) (\CREATECHARSET.DISPLAY 78203 . 81119) (\CREATE-REAL-CHARSET.DISPLAY + 81121 . 88025) (\BUILDSLUGCSINFO 88027 . 89470) (\SEARCHDISPLAYFONTFILES 89472 . 91405) ( +\SEARCHFONTFILES 91407 . 94718) (\FINDFONTFILE 94720 . 95911) (\FONTSYMBOL 95913 . 96563) ( +\DEVICESYMBOL 96565 . 97434) (\FONTFACE 97436 . 104626) (\FONTFACE.COLOR 104628 . 111548) ( +\FONTFILENAME 111550 . 114965) (\FONTFILENAME.OLD 114967 . 117916) (\FONTFILENAME.NEW 117918 . 120175) + (\FONTINFOFROMFILENAME 120177 . 123291) (\FONTINFOFROMFILENAME.OLD 123293 . 125570) (\GETFONTDESC +125572 . 125963) (\COERCEFONTDESC 125965 . 131350) (\LOOKUPFONT 131352 . 132696) (\LOOKUPFONTSINCORE +132698 . 134771) (\READDISPLAYFONTFILE 134773 . 139929)) (140834 157558 (\READSTRIKEFONTFILE 140844 . +145046) (\SFMAKEBOLD 145048 . 147444) (\SFMAKEITALIC 147446 . 150349) (\SFMAKEROTATEDFONT 150351 . +151752) (\SFROTATECSINFO 151754 . 152391) (\SFROTATEFONTCHARACTERS 152393 . 152773) ( +\SFFIXOFFSETSAFTERROTATION 152775 . 154914) (\SFROTATECSINFOOFFSETS 154916 . 156185) (\SFMAKECOLOR +156187 . 157556)) (157559 164812 (WRITESTRIKEFONTFILE 157569 . 161352) (STRIKECSINFO 161354 . 164810)) + (164813 166652 (FONTDESCRIPTOR.DEFPRINT 164823 . 166174) (FONTCLASS.DEFPRINT 166176 . 166650)) ( +181848 182170 (\CREATEKERNELEMENT 181848 . 182170)) (182172 182300 (\FSETLEFTKERN 182172 . 182300)) ( +182426 183473 (\FGETLEFTKERN 182436 . 183471)) (183517 187027 (\CREATECHARSET 183527 . 185278) ( +\INSTALLCHARSETINFO 185280 . 187025)) (188182 189934 (\FONTRESETCHARWIDTHS 188192 . 189932))))) STOP diff --git a/sources/FONT.LCOM b/sources/FONT.LCOM index ffa1ed4b6b386f5172b07a706846b061f73e6818..f9b2b95654e795fc97fc1a510b88cf50b229ce94 100644 GIT binary patch delta 1660 zcmZWp-EZ4e6t`XIR#$D3R!!GU?M}N2C50CI+D@DdK^)s@Je=6FP1{HX1=fje1&Ig7 z$Iu8*JU6;LZU{leL$^|G9)copL?pm!1h`%%n3(~n3cfgAF3Lb?FaoV;n=Xhl0;{4envUy(C@J6v zJgFBBZ|FZ?jQ!p-G=E_ zdCFa$P6PW5$1r^fU<+#@OrP8>+-A>*+s|*a3Vv{WE@CWV$^{AKqG}~kjjn{x3?xEfSbZcSRRz=Y91oBxf$mgwEdWF? z2yGk^1ra2>SOz5ZltZ3o$00Qqvxi~F!h1$T5}-;5qhVw+O(Ld17Nsx@ZE4SP1A0ob z+iyH6r|vbLloR&1*$CRMTauE6Wvgm9%Y-AfH`^Qu*EncWKpA;I7o<>Q+BJY=vhC20 z2y_SggLXgy!Mn?qNU+;0OH|RGE0NODaV3%nt41P{B5Hz~Yx;Qo{p+lXk6%r5ve1&Q z>SvxP+1g_3%8jqNm;fm%6s^FA1rTuJ)6v%KXMgw2mo(f@R7QwEMMkk{fCFT_&$p bLgB;#GUGcVhrGF{WezALs@6|mK0f|Gd>*V- delta 1381 zcmZuxPly|36wgeuwoSK9vS|}`b>;2WL$bPIzWJ9-1j+3D*-l9^)0uSF=!(>C)v|~l zq}3J)h)0F4uY#3UR9dudSSWE1UMy13qxIrNOA&92px{C94^%QF9yG-!Bf>Ht%LX@bC1e2RNGv!we0ByG3ZGTcT` zgaWROLydmzW&n}9t_MNMv~16Jnyn&KJ>Ob#+*854NqrzWf?d$6OsdNA`lTtJDZTsL zzt*o*l4;Zibe0EIbt5>QJ`b4grEskl9U5TETP@tf2>yp=ja-XDU;9x;v+EURVt zzU$ldMS|lromPakfL`|~);1DxC?xS-a13AFknw6)!(TR@z@O5GsYJdz$I~R4OckF= zyZBKiP0lYf0{%?jzfw7bi5a~Ab{=2b+)t6y69V4a6vm3wCyC!p6!4FUGWq8YO<^s2 z6qmAe>b;lU=5t_!1Vn~@s@@9ODMIXXp2xRxC&nuJRy@Fax#u_qOZof};(4Vn#?CZQ zVc5)4{1)PSyXt`cM2L?flq77gI8%pc_mR}o74fQ1)3>(u^9XrOy z;@;gDeY!7&&jaD(Oze*Sp;yxnhKICQI~N&S(+le_r)%eup*KqYbNwVmqjNe|P|Jka zwS2=0M>DO!0ENMdNqQSr&~7Zabs)IIIf*a{f4nd$)403qLaV5#U^;Tp>GRs>(*sFV@Y|VuM`CjSjp&|$L_9~h`$w@NL$q}u zmNhWkrlGe$Bx0hRu!$&ZBjbpq=ddtL+bI|(GgTX*%L?8vCh(OvY8_F9CQ(iM4YC+k z2ss8>(4tNu_rBw`!YBdUT@Xo=2MZ!q)LpaO=XB^TNs(aLX`1dbNRm7PP}HbhXK#gR zJYg4$sD#N87Eva1M?z6l_H0((vxSk{0F3AxjK#{8K`9mrGuQ?a#&+@Un;&p8wl5ZW zN$tIJ(Kv>eukXY3wejAA>(}_+$DeG+@zWdO|H0OcdT!?i>49O9w#%+>hF7(hzj=c1 J#lQG_|G(DdZ|492