From 736ac51a8cd737d27752c52ca8525854133be3a9 Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Fri, 21 Feb 2025 16:05:41 -0800 Subject: [PATCH] FONTSAMPLER - Enable option to use HEX vs OCTAL on page info (#2018) * Enable optional to use HEX vs OCTAL for charset number (in page title) and grid row/column titles. * Fix typos in documentation. --- lispusers/FONTSAMPLER | 42 +++++++++++++++++++++++++----------- lispusers/FONTSAMPLER.LCOM | Bin 5211 -> 5462 bytes lispusers/fontsampler.tedit | Bin 4921 -> 5306 bytes 3 files changed, 29 insertions(+), 13 deletions(-) diff --git a/lispusers/FONTSAMPLER b/lispusers/FONTSAMPLER index f3563427..ca7925e9 100644 --- a/lispusers/FONTSAMPLER +++ b/lispusers/FONTSAMPLER @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 3-Feb-2025 20:08:40" {DSK}matt>Interlisp>medley>lispusers>FONTSAMPLER.;10 8777 +(FILECREATED " 5-Feb-2025 17:03:38" {DSK}matt>Interlisp>medley>lispusers>FONTSAMPLER.;11 9743 :EDIT-BY "mth" - :CHANGES-TO (FNS FontTable) + :CHANGES-TO (FNS FontSample FontTable) - :PREVIOUS-DATE " 3-Feb-2025 13:06:38" {DSK}matt>Interlisp>medley>lispusers>FONTSAMPLER.;7 + :PREVIOUS-DATE " 3-Feb-2025 20:08:40" {DSK}matt>Interlisp>medley>lispusers>FONTSAMPLER.;10 ) @@ -20,7 +20,9 @@ (DEFINEQ (FontSample - [LAMBDA (Fonts CharacterSets Printer StreamType) (* edited%: "29-Apr-87 22:03") + [LAMBDA (Fonts CharacterSets Printer StreamType Hexadecimal) + (* ; "Edited 5-Feb-2025 17:02 by mth") + (* edited%: "29-Apr-87 22:03") (LET* [[TitleFont (FONTCREATE NIL 12 'MRR 0 (OR StreamType (PRINTERTYPE Printer] (FontList (if (LISTP Fonts) else (CONS Fonts))) @@ -38,7 +40,7 @@ (NEQ CharacterSet LastCharacterSet )) - TitleFont InchesToPrinterUnits)) + TitleFont InchesToPrinterUnits Hexadecimal)) finally (CLOSEF Stream]) (FontSampleFaked @@ -55,7 +57,8 @@ (CLOSEF Stream]) (FontTable - [LAMBDA (Font CharacterSet Stream FormFeed TitleFont InchesToPrinterUnits) + [LAMBDA (Font CharacterSet Stream FormFeed TitleFont InchesToPrinterUnits Hexadecimal) + (* ; "Edited 5-Feb-2025 17:03 by mth") (* ; "Edited 3-Feb-2025 20:07 by mth") (* edited%: "29-Apr-87 22:36") (LET* @@ -76,16 +79,22 @@ (YCellSpacing (TIMES 0.5 InchesToPrinterUnits))) (printout T Title .I0.8 CharacterSet "Q" T) (RESETLST - (RESETSAVE (RADIX 8)) + (RESETSAVE (RADIX (if Hexadecimal + then 16 + else 8))) (MOVETO (FTIMES 0.75 InchesToPrinterUnits) (FTIMES 10 InchesToPrinterUnits) Stream) (DSPFONT TitleFont Stream) - (printout Stream Title .I0.8 CharacterSet) + (if Hexadecimal + then (printout Stream Title .I0.16 CharacterSet) + else (printout Stream Title .I0.8 CharacterSet)) (DSPYPOSITION (PLUS (DSPYPOSITION NIL Stream) (TIMES -0.4 (FONTHEIGHT TitleFont))) Stream) - (printout Stream "8") + (printout Stream (if Hexadecimal + then "16" + else "8")) (for XPosition from (TIMES 0.75 InchesToPrinterUnits) by XCellSpacing as Counter from 0 to 15 bind (YPosition _ (TIMES 9.5 InchesToPrinterUnits)) do (MOVETO XPosition YPosition Stream) @@ -93,7 +102,10 @@ (for YPosition from (TIMES 9 InchesToPrinterUnits) by (MINUS YCellSpacing) as Counter from 0 to 240 by 16 bind (XPosition _ (TIMES 0.25 InchesToPrinterUnits)) do (MOVETO XPosition YPosition Stream) - (PRIN1 Counter Stream))) + (PRINTNUM (if Hexadecimal + then '(FIX 2 16 T) + else '(FIX 3 8)) + Counter Stream))) (DRAWLINE (TIMES 0.25 InchesToPrinterUnits) (TIMES 9.3 InchesToPrinterUnits) (TIMES 8.0 InchesToPrinterUnits) @@ -139,11 +151,15 @@ (FTIMES 0.75 InchesToPrinterUnits) Stream) (DSPFONT TitleFont Stream) - (printout Stream Title .I0.8 CharacterSet) + (if Hexadecimal + then (printout Stream Title .I0.16 CharacterSet) + else (printout Stream Title .I0.8 CharacterSet)) (DSPYPOSITION (PLUS (DSPYPOSITION NIL Stream) (TIMES -0.4 (FONTHEIGHT TitleFont))) Stream) - (printout Stream "8") + (printout Stream (if Hexadecimal + then "16" + else "8")) [if (EQ (FILENAMEFIELD (FULLNAME Stream) 'HOST) 'LPT) @@ -169,6 +185,6 @@ FONT) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (645 8614 (FontSample 655 . 2106) (FontSampleFaked 2108 . 2917) (FontTable 2919 . 8612)) + (FILEMAP (NIL (657 9580 (FontSample 667 . 2302) (FontSampleFaked 2304 . 3113) (FontTable 3115 . 9578)) ))) STOP diff --git a/lispusers/FONTSAMPLER.LCOM b/lispusers/FONTSAMPLER.LCOM index 251ae93558ed604f2114978b74a1b6222c23d746..3f4909fdb18bd19e434ab56f54176f8ea4415fae 100644 GIT binary patch delta 1441 zcmZWpO>7%g5cWEx{)v)0PL)O`sRl~{JCN|+{=E0rm5|(cw>7nQjlJzALV%pas$Dio z4?Q3*1_^FZ5msa7l9kA-MJwi38$*#H_t`c$uGb2B;P1v>?FJZw&GnY&HSRRGJA1eCAYF_^@^W4nuC z&S9<{1`Ze(&IJTNC6A9rTwnA(ANe!!+b<*%M> z&s2xZ?u9V3A7c&S>TMUE96h$Y)Y01yer~5CIhk>&)ytM+-Kc`Bs!+9W8jcNAAK(e*Ki z=ct%0?Bi7j9F;&&B0L;2Fw}S;5vC(UAQ8qya-b2WilHu0BuqJ_5`QyoN=g5Idcl8` Terqa;jdBm>E=&IbCtX>D delta 1171 zcmZWoL2nyH6!zL}Y8+v#Bs9S^=xM3iBqC;Zc6VmhJ-PO7*<$Zn-ff*83Q8NR4q6fp zk$NbqPh3%>sSro_0jO0iZbiL-1Sc+`7uq5?QuROdjdz_kuq(~X``(*3Z@%x%_zqmwJK?h^q8(dqbgxX+Ob!yd3vH$z>#dz~tGJx$J(7j9THoP8ItJQSa z+T0s#{eQb%Cq!Q@t$2RhZT8$o?6%}HZE63uGebad&gHk-8Tp&`e$g=NgsH=Bozu89 z^54sU^8EP2QZ9E)zE}8KJ1u`GR2Scz$>BGjFZ}p4EayKh-~TzcVsLBxSK+II5&8A{ zTF;H#*b94|Xbn6t42ZY)l7Y9ov!_f7SDJ$)iN4spzP)op-aYZ*XcclVip89ELuF2i zZ>VWltq!aGh3fT%U1j#?{!L0a^eeLy^JKq*bs=8O7LU@fQ(3?;gH!b6q~>2sj}MN( zX^KSNEH33AEX#Yv#bXcjVMXp2mq)*ZE$3}p4 zQnP^BfSs}dC$KkGfwHk)YHRZL?C`k1sO4tH&u5eT!pG+)+^3W`&QBDPUzShF@5=W^ zrhwS(AuAwEn%!9-Pgs56_PdP>E(jzmrA;6i7h2epz#TKgxR`o57T8{IHX?L02UG_K zjgIU2Zo35>sZkF>A!rzxdvxeWnqK)$MXC~tQ##dzDb9}MWCD?CPR2#HhcSLsB4)Aw z0A{LF9L%6-40*d+`9?d-EJ({!@$O~6=>l^cXm?{^*d-r@5iV>lt8?SGD8skAwYxLG zrz{AOPv(}J9A(izK%7&7<1W5^;D(aU22OY?A>(u+Awv#Q4NY1~RYVbGJny{&6t7BZ e3@9daY8+>x?2;VMU!4UkQ^((?rSZE9=d_o4_Y!*m diff --git a/lispusers/fontsampler.tedit b/lispusers/fontsampler.tedit index 367db6690f38ce65e959cf6d0e84005306168557..d23d0de04bccea31143fd1eb39cd13f70514748c 100644 GIT binary patch delta 1678 zcmbVM-%ry}6uy`Jf~zu7@kb)&#u#KeCM=?c2jen2HUk}uF2NWdN?Ta9Yqje{3CR*) zG$xvm#y`Z680FO$_02c`2>%B>=Z;&4A`foq?YZCi&bRNJ+wRloPG)>rsa2N;N>x=` zD$Fm;DK(a7>^ftUjP-)B1#oM8^dT#_<}{zzgMgQ<)m7hf`B?dA%Ew#y&uYZedez_D6cuDd2UU$LAP zU-f*x=G!Lsz4ewz7#?=r;_J5K@D&S-8|dpq*BF1=%5l#KbSKBcTk+9hA%Qv61@xKAbv960?P3IV_}k$kV4sPLbq%bp}R9 zx|1f9kO&K}rn6xueIb0GKHC`p(F6)35m*G~NW?U{JJKhBKG+>8*XnahZdTDsDiQ@- zEI`5u{RgRYfK-s7;QF+@fl1N^;6gpv+y(fJX$_Q{kbAPxtYD-uDz&=DyV6Niku)0jde zs%lE)7zPM8dXWx7^oE3l4J55gM0A3P7@=?uePN>?Bt^8Xtf+26(YCclHH zDEQG`dH+J(MGyln+^OJS5d0ag>b*A^J0>dn;LY53?z!ilH}B2h(z{f8r&zIfBI|b9 zsjh8pZx$;uE9J7387ciBE)hIVr&guYY#ms2_rc@6M!Re6-aqJCje4uws9SE^THEim zcCBn~(aKy~$;ndLsn~^D-YMB-dHnu)Ql6XutV0dTkOv1!U}IDTsqTua>V^>&vj0ka z3J9q*J(YOqcC2o*VQsnfMyG9Mvin_iOFzWyKzHyNGgh(Sw(&&Z;!CKF&+FlQNS1A< zSe5Eo_;XYOjo`v&sp_chsoDO^$ZOFL%f9Fv@~t?>X&pjvg(C40BYXul0OiK!VhesW zpeZwU*7TTB%;`Zf#xxPt0zqP8^${G26)=8-k+3#WEYJdb^Wff(;<*_OA}|fcmR%@T z$`BrAL4AuS)x0^MI5PwSa7t2Xb4h)VPpf-o@&au{Cr$(>x&+=DnFd{bHP5HSX(5cn zC^_VEB?Q1wAI!vmP;>vJO6u%{z6@X+eWDGgDTRaGdsKGR^SAjU6;BZ^l7P1xQd=Ac zxSXim#!r1QPMsw~MD0;P{Fp~cQ9y_EQ-y;dB2$#|>uz`egH&|cL+I34hEw$5qan@= zr3k@^{R!IhAim~=G{+IKlh3u-nn5=niwIISNRY_1V%;qz3~^{o;>r zF(H51!}3Jc#QC@$h5V8|*5!LJ>`lMZ2L3$68zDC-q}Dj`GGUONK<;?Rs3`mtoWsEn DSGay6