From b747e0fca23514c49c16ae0f634a222772a5eed2 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Thu, 9 Oct 2025 21:22:47 -0700 Subject: [PATCH] Add title tag --- lispusers/EDITFONT | 59 ++++++++++++++++++++++++---------------- lispusers/EDITFONT.LCOM | Bin 9707 -> 10081 bytes 2 files changed, 36 insertions(+), 23 deletions(-) diff --git a/lispusers/EDITFONT b/lispusers/EDITFONT index e3872aad..517fc5c3 100644 --- a/lispusers/EDITFONT +++ b/lispusers/EDITFONT @@ -1,12 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 4-Sep-2025 10:30:31" {WMEDLEY}EDITFONT.;35 25299 +(FILECREATED " 7-Oct-2025 14:56:00" {WMEDLEY}EDITFONT.;40 26223 :EDIT-BY rmk - :CHANGES-TO (FNS EDITFONT) + :CHANGES-TO (RECORDS CHARITEM) + (FNS EDITFONT) - :PREVIOUS-DATE " 2-Sep-2025 23:03:37" {WMEDLEY}EDITFONT.;34) + :PREVIOUS-DATE " 6-Oct-2025 15:58:41" {WMEDLEY}EDITFONT.;39) (PRETTYCOMPRINT EDITFONTCOMS) @@ -80,7 +81,8 @@ (WINDOWPROP WINDOW 'MENU NIL]) (EF.CHARITEMS - [LAMBDA (FONT CHARSET) (* ; "Edited 29-Aug-2025 11:34 by rmk") + [LAMBDA (FONT CHARSET ROWMAJOR) (* ; "Edited 5-Oct-2025 14:42 by rmk") + (* ; "Edited 29-Aug-2025 11:34 by rmk") (* ; "Edited 27-Aug-2025 22:50 by rmk") (* ; "Edited 4-Aug-2025 00:14 by rmk") (* ; "Edited 25-Jul-2025 10:06 by rmk") @@ -88,14 +90,20 @@ (* ;; "Get CHARITEMS for CHARSET in FONT. Sort them in column-major order to build an array that corresponds to the tables in Unicode and XCCS.") - (for ROW from 0 to 15 join (for COL CODE from 0 to 15 - collect (SETQ CODE (LOGOR (LLSH CHARSET 8) - (IPLUS (TIMES COL 16) - ROW))) - (create CHARITEM - BITMAP _ (GETCHARBITMAP CODE FONT) - CHARCODE _ CODE - SLUGCHARP _ (SLUGCHARP.DISPLAY CODE FONT]) + (if ROWMAJOR + then (for C8 from 0 to \MAXTHINCHAR as C from (LLSH CHARSET 8) + collect (create CHARITEM + BITMAP _ (GETCHARBITMAP C FONT) + CHARCODE _ C8 + SLUGCHARP _ (SLUGCHARP.DISPLAY C FONT))) + else (for ROW from 0 to 15 join (for COL CODE from 0 to 15 + collect (SETQ CODE (LOGOR (LLSH CHARSET 8) + (IPLUS (TIMES COL 16) + ROW))) + (create CHARITEM + BITMAP _ (GETCHARBITMAP CODE FONT) + CHARCODE _ CODE + SLUGCHARP _ (SLUGCHARP.DISPLAY CODE FONT]) (EF.BUTTONEVENTFN [LAMBDA (WINDOW) (* kbr%: "16-Oct-85 22:19") @@ -421,7 +429,9 @@ (RETURN FONT]) (EDITFONT - [LAMBDA (FONT CHARSET) (* ; "Edited 4-Sep-2025 09:27 by rmk") + [LAMBDA (FONT CHARSET ROWMAJOR NCOLUMNS TITLETAG) (* ; "Edited 7-Oct-2025 14:55 by rmk") + (* ; "Edited 5-Oct-2025 15:06 by rmk") + (* ; "Edited 4-Sep-2025 09:27 by rmk") (* ; "Edited 29-Aug-2025 22:34 by rmk") (* ; "Edited 17-Aug-2025 12:03 by rmk") (* ; "Edited 3-Aug-2025 23:25 by rmk") @@ -433,11 +443,11 @@ (SETQ CHARSET (OR (CHARSET.DECODE CHARSET) 0)) (LET (CHARITEMS MENU TITLE HEIGHT WIDTH REGION POS WINDOW) - (SETQ CHARITEMS (EF.CHARITEMS FONT CHARSET)) + (SETQ CHARITEMS (EF.CHARITEMS FONT CHARSET ROWMAJOR)) (SETQ MENU (create MENU MENUFONT _ FONT CENTERFLG _ T - MENUCOLUMNS _ 16 + MENUCOLUMNS _ (OR NCOLUMNS 16) ITEMS _ CHARITEMS WHENSELECTEDFN _ (FUNCTION EF.WHENSELECTEDFN))) (SETQ TITLE (PACK* (FONTPROP FONT 'FAMILY) @@ -446,7 +456,10 @@ " " (FONTFACETOATOM (FONTPROP FONT 'FACE)) " " - (OCTALSTRING CHARSET))) + (OCTALSTRING CHARSET) + (CL:IF TITLETAG + (CONCAT " " TITLETAG) + ""))) (PUTMENUPROP MENU 'EDITFONTTITLE TITLE) (SETQ HEIGHT (HEIGHTIFWINDOW (fetch (MENU IMAGEHEIGHT) of MENU) T)) @@ -466,7 +479,7 @@ YCOORD _ 0)) (WINDOWPROP WINDOW 'BUTTONEVENTFN (FUNCTION EF.BUTTONEVENTFN)) (MODERNWINDOW WINDOW) - WINDOW]) + FONT]) ) (DECLARE%: EVAL@COMPILE DONTCOPY (DECLARE%: EVAL@COMPILE @@ -481,10 +494,10 @@ (EF.INIT) (DECLARE%: DONTCOPY - (FILEMAP (NIL (1110 16314 (EF.INIT 1120 . 1754) (EF.PROMPT 1756 . 2338) (EF.MESSAGE 2340 . 2552) ( -EF.CLOSEFN 2554 . 3081) (EF.CHARITEMS 3083 . 4405) (EF.BUTTONEVENTFN 4407 . 4819) (EF.WHENSELECTEDFN -4821 . 5225) (EF.EDITBM 5227 . 6721) (EF.MIDDLEBUTTONFN 6723 . 6968) (EF.CHANGESIZE 6970 . 8299) ( -EF.DELETE 8301 . 9482) (EF.ENTER 9484 . 10425) (EF.REPLACE 10427 . 11400) (EF.SAVE 11402 . 15606) ( -COPYFONT 15608 . 15883) (READSTRIKEFONTFILE 15885 . 16312)) (16315 25111 (BLANKCHARSETCREATE 16325 . -22410) (EDITFONT 22412 . 25109))))) + (FILEMAP (NIL (1147 16865 (EF.INIT 1157 . 1791) (EF.PROMPT 1793 . 2375) (EF.MESSAGE 2377 . 2589) ( +EF.CLOSEFN 2591 . 3118) (EF.CHARITEMS 3120 . 4956) (EF.BUTTONEVENTFN 4958 . 5370) (EF.WHENSELECTEDFN +5372 . 5776) (EF.EDITBM 5778 . 7272) (EF.MIDDLEBUTTONFN 7274 . 7519) (EF.CHANGESIZE 7521 . 8850) ( +EF.DELETE 8852 . 10033) (EF.ENTER 10035 . 10976) (EF.REPLACE 10978 . 11951) (EF.SAVE 11953 . 16157) ( +COPYFONT 16159 . 16434) (READSTRIKEFONTFILE 16436 . 16863)) (16866 26035 (BLANKCHARSETCREATE 16876 . +22961) (EDITFONT 22963 . 26033))))) STOP diff --git a/lispusers/EDITFONT.LCOM b/lispusers/EDITFONT.LCOM index 71354b58fc234eeb09560ba1dd0f1e66499a9b84..ce03d863fb44c97b05397bb5096c7b0793263b09 100644 GIT binary patch delta 1548 zcmZuxPj4GV6t|N`w1FDO4I%i_Cs(SHNJ(~P|Jdsu@OpP_Z@jy+-5oaxDm5*JhBycb z^;pRlJ^+zVh(kFdP7xsopvX7+1)_>;ByQZu2Y@%bOKaNfVc(y5^X512_vZc8Jqy0x zxmI20A3s{B3e|yVb={~d%HdFXPg7Q5z5>&$w65uOdic}Y?J4iZ#zqAO_aA*SxG-Eb zDy#D=E!Sgq#4N!a_>*9C`_`H0y( za$-PdEXE_3c1{D^T%5U z|Lj|53+kNPIX~TkVf+=FY)5}v1Og{(n0Zg@W-G1a+;8r2dN@6_LnDo>Es$;-YfT)`im1@ z8lLt`N5AvsoBgH9(cgTrl%VJrCc*IZ-q90YDCSm(Zgk*oVDrGHKnR7{>$T;@!VSlb zL(kd;qNvbjLOPqS@U0M3azPkXkJm0geHW`)g>5%*lJXf4@)!%KL&VxH4^Y)`)e#-k zROm3b-4Uo#5U%hf0R(&&^iWY=a2#WWwKPCjZ8TIsz+TTs;$I`>_Uo+V`*`uW#udrI zgPfJfliB?TGYj8cX;{rSrGMum`M*ABEEXq&&lcaB*e90`ihVTrn1V7_LZvi*2=Bk+ zeEWqAb&_I!mFQP5kH3doqkDsVFynP48RZWLTUoUS4`p~KIfWMzqcLq*iQ)3X{-8YV zPa-o%0=a>7sah3$?9?d8O043e3420XBfcF*9LtI?$a0*dj4CpkEoZCLG+*`9kfk)m ze=${T`{cQ91J$WyzsYxyNmob?sg`l*wlWk{HK935nj94v#O*$}M6yWH%n;;00n5s8oPdO&o>cbZ2(6`A{&M-AQ(u-I+BzF|D+Ilr3soL8SM1 z@@&mt;Xx?WUPSHDnyQvyWmu2UD{oeZx`+ocEd-K`Cn4Sw(ALX!$ z3xL#$CSSC*u3pdzGcYm*16egnRkW>Fv)2cr`Fwr~!n>QR;gRKfVQOY1Tc<9uTErB@ zhW~p0nb@04z_eBXT)^crRESMQuC@q|AFe~ia!l4BK~8YUj`W@;CdTkT%2=zYT16{H z4U(F^^Cj{Ac-Mt20tsscM1Tr)&cw_ND9a}lCAo2C?d)ihIzP7N)ANy28+MyNc1q^H zyOI7xKYzWQu8t`3;pwn%+|Oh(w^Ms;H^o!;Gq>Kl>mQf4Kk(G$ciTU`(YW?CUH`ba z{Zh%6bXZ~+EzT?qdKm(@-H3Sjd7B2lYc7JW?tB}5bKX6gV&dwsq*#?a6=g*+<8$}e z+Dh{5lcA~^k6O4BB`3n_czQ2f4%Ay4&QOkPW#9_sy?ywY6`6JFA7 zM(i`;e2l#n-iyG_$>_^syEG!1Wqm*9!_rDtLl``6lNRexX7dhcssVmm z^gX}Dedyw{3Z`v)gtY;e)I(`(lnzGgZ|cZ0An2*MAZ0#&jTtbXMm9b9cl}Q z)(==W5YG}Ygg?|n%J)c&) zDgsi^*V;mGMs5%$>hiv20}e%s`rkFj29BFZ38`_A3gQKTiUve#iZmdoaOL%NStw}% z!UhENrZkY$i0M&x5#)ceN!`S4H@>DrTw6{qN;SDHN!;@V$T^Z)#~~~rQq@w@vO?2) Y`_p5ig`$-A6d=v$pIF^Fcgaou26n&^{Qv*}