From 87e8f2dc21bd6562edc5b78efc3437b6f18cea53 Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Fri, 5 Dec 2025 11:13:28 -0800 Subject: [PATCH 1/4] Display in column major order. Added alternative CharacterSets designations. Updated documentation. --- lispusers/FONTSAMPLER | 77 ++++++++++++++++++++++++++---------- lispusers/FONTSAMPLER.LCOM | Bin 5462 -> 7069 bytes lispusers/fontsampler.tedit | Bin 5306 -> 7038 bytes 3 files changed, 56 insertions(+), 21 deletions(-) diff --git a/lispusers/FONTSAMPLER b/lispusers/FONTSAMPLER index ca7925e9..4841901d 100644 --- a/lispusers/FONTSAMPLER +++ b/lispusers/FONTSAMPLER @@ -1,12 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 5-Feb-2025 17:03:38" {DSK}matt>Interlisp>medley>lispusers>FONTSAMPLER.;11 9743 +(FILECREATED " 5-Dec-2025 11:09:30" {DSK}matt>Interlisp>medley>lispusers>FONTSAMPLER.;6 12333 :EDIT-BY "mth" :CHANGES-TO (FNS FontSample FontTable) - :PREVIOUS-DATE " 3-Feb-2025 20:08:40" {DSK}matt>Interlisp>medley>lispusers>FONTSAMPLER.;10 + :PREVIOUS-DATE " 4-Dec-2025 23:56:07" {DSK}matt>Interlisp>medley>lispusers>FONTSAMPLER.;5 ) @@ -21,9 +21,10 @@ (FontSample [LAMBDA (Fonts CharacterSets Printer StreamType Hexadecimal) + (* ; "Edited 5-Dec-2025 11:06 by mth") (* ; "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] + (* ; "Edited 29-Apr-87 22:03") + (LET* [[TitleFont (FONTCREATE NIL 12 'MRR 0 (SETQ StreamType (OR StreamType (PRINTERTYPE Printer] (FontList (if (LISTP Fonts) else (CONS Fonts))) [Stream (OPENIMAGESTREAM Printer StreamType (LIST 'FONTS (CONS TitleFont FontList] @@ -31,20 +32,51 @@ (LastFont (CAR (LAST FontList))) [CharacterSets (if (LISTP CharacterSets) then CharacterSets + elseif (MEMB CharacterSets '(T :INCORE :ALL :INTERESTING)) + then CharacterSets else (LIST (OR CharacterSets 0] - (LastCharacterSet (CAR (LAST CharacterSets] + (AllCharacterSets (CONSTANT (for CS from 0 to 255 collect CS] (DSPRIGHTMARGIN (fetch (REGION WIDTH) of (DSPCLIPPINGREGION NIL Stream)) Stream) - (for Font in FontList do (for CharacterSet in CharacterSets - do (FontTable Font CharacterSet Stream (OR (NEQ Font LastFont) - (NEQ CharacterSet - LastCharacterSet - )) - TitleFont InchesToPrinterUnits Hexadecimal)) + (for Font in FontList do + (* ;; "Check for the special charset list builders") + + (LET (FontCharacterSets (SlugCharsetInfo (\GETCHARSETINFO Font + SLUGCHARSET))) + (SETQ FontCharacterSets + (SELECTQ CharacterSets + (:ALL + (* ;; "Forcibly install ALL CharacterSets.") + + (for CS in AllCharacterSets + when (\INSURECHARSETINFO Font CS) collect + CS)) + (:INTERESTING (for CS in *INTERESTING-CHARSETS* + when (\INSURECHARSETINFO Font CS) + collect CS)) + ((T :INCORE) + (for CS in AllCharacterSets + when (\GETCHARSETINFO Font CS) collect CS)) + CharacterSets)) + + (* ;; + "Exclude any CharacterSet known to reference the SlugCharsetInfo") + + (SETQ FontCharacterSets (for CS in FontCharacterSets + unless (EQ SlugCharsetInfo + (\GETCHARSETINFO Font + CS)) + collect CS)) + (for CharacterSet in FontCharacterSets + bind (LastCharacterSet _ (CAR (LAST FontCharacterSets))) + do (FontTable Font CharacterSet Stream + (OR (NEQ Font LastFont) + (NEQ CharacterSet LastCharacterSet)) + TitleFont InchesToPrinterUnits Hexadecimal))) finally (CLOSEF Stream]) (FontSampleFaked - [LAMBDA (FontAsList Printer StreamType) (* N.H.Briggs "27-Apr-87 18:12") + [LAMBDA (FontAsList Printer StreamType) (* N.H.Briggs "27-Apr-87 18:12") (LET* [[TitleFont (FONTCREATE NIL 12 'MRR 0 (OR StreamType (PRINTERTYPE Printer] (Font) [Stream (OPENIMAGESTREAM Printer StreamType (LIST 'FONTS (LIST TitleFont] @@ -53,14 +85,16 @@ (replace FONTFAMILY of Font with (CAR FontAsList)) (replace FONTSIZE of Font with (CADR FontAsList)) (replace FONTFACE of Font with (\FONTFACE (CADDR FontAsList))) - (FontTable Font '(0) Stream NIL TitleFont InchesToPrinterUnits) + (FontTable Font '(0) + Stream NIL TitleFont InchesToPrinterUnits) (CLOSEF Stream]) (FontTable [LAMBDA (Font CharacterSet Stream FormFeed TitleFont InchesToPrinterUnits Hexadecimal) + (* ; "Edited 5-Dec-2025 11:09 by mth") (* ; "Edited 5-Feb-2025 17:03 by mth") (* ; "Edited 3-Feb-2025 20:07 by mth") - (* edited%: "29-Apr-87 22:36") + (* ; "Edited 29-Apr-87 22:36") (LET* ((Family (FONTPROP Font 'FAMILY)) (Face (FONTPROP Font 'FACE)) @@ -119,10 +153,12 @@ (DSPSCALE NIL Stream) 'PAINT Stream) (CL:UNLESS UseDisplayFontBitmaps (DSPFONT Font Stream)) - (for YPosition from (TIMES 9 InchesToPrinterUnits) by (MINUS YCellSpacing) as YCounter - from 0 to 15 bind (CharacterCode _ 0) + (for XPosition from (TIMES 0.75 InchesToPrinterUnits) by XCellSpacing as XCounter from 0 + to 15 bind (CharacterCode _ 0) + [RangedCodesStreamType _ (MEMB (IMAGESTREAMTYPE Stream) + '(DISPLAY INTERPRESS] do - (for XPosition from (TIMES 0.75 InchesToPrinterUnits) by XCellSpacing as XCounter + (for YPosition from (TIMES 9 InchesToPrinterUnits) by (MINUS YCellSpacing) as YCounter from 0 to 15 do [LET ((CCode (IPLUS (ITIMES CharacterSet 256) CharacterCode))) @@ -137,8 +173,7 @@ RelativeDescent)) ImWidth ImHeight 'INPUT 'REPLACE)) else (if (AND (NEQ CharacterCode (CHARCODE FF)) - (if (MEMB (IMAGESTREAMTYPE Stream) - '(DISPLAY INTERPRESS)) + (if RangedCodesStreamType then (OR (AND (IGREATERP CharacterCode 31) (ILESSP CharacterCode 127)) (AND (IGREATERP CharacterCode 160) @@ -185,6 +220,6 @@ FONT) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (657 9580 (FontSample 667 . 2302) (FontSampleFaked 2304 . 3113) (FontTable 3115 . 9578)) -))) + (FILEMAP (NIL (655 12170 (FontSample 665 . 4700) (FontSampleFaked 4702 . 5524) (FontTable 5526 . 12168 +))))) STOP diff --git a/lispusers/FONTSAMPLER.LCOM b/lispusers/FONTSAMPLER.LCOM index 3f4909fdb18bd19e434ab56f54176f8ea4415fae..d6fe873ea10db682d2e6871625bdf96cc3e04d7c 100644 GIT binary patch delta 3570 zcmZWsO>A3P6^`w;)1<#nLMMts=8P4EBucDz?)&$YDlhg+@>=^{kNx^L40>cHo+NFW z3~dH9jD%SL3nV0ph1l@7Ku80dq#+9y$UC4bid04;U@=H6_}N72iVfwv&v6n;B**XF zd+s^+e&0FgyZ&hEhxT{g$d(#!&j?MJ#9Ywag04Nhdu_;?q#PMD$L9>piHE;0OdJm8 z^Z6VtFKsoJ|IgUe3TBH_pBgwc?t0JB!>>B0EMlSSt?#F<4jhXj^nz&>H2dKPucfd& zJvgYlR9s!Uzx4K2<9@xdMOD(B))&%)pA$M2>v(1J;9H~l&5f<&#t$&r3gMz=jNsrh+i?YkoZn!iAaQqF1Z?QGIHX($Pe! z=j7`8*_9sr-6`&!p6gXlZ=Gssna{qOJ?SlHb_bR>)mWeU_tU-1oz>xN>QplH>()0i zW6j5-8|j`Wk9)G&zHm8lwEyT%yOQ-T$V-{M({iYPr{`~}c(g4qJ|2~$pTKl?QeHfz z{3Qc&R9;NHXEXhhWbTO^8|-PzvHnMcax@-k%i+C#IkGw&5644oc_|%V+Wt_EjK{<6 z?Pn`JO}N>Aw05(a^l%229@#cQQ=FDdBT@@hK1y7PRcXTo&MB$uM4x7HhE=z_{#JtAE<=*?oy_agrw zXGkDlUl?kzVNkIw>;627!KG5YS_>8yql#Bs2to{LYN%Kas#RoP&0h#)NUlQ_zcNR* z(+Ooc%BWuS%08Jo$*La)6>k9O&F=DujdmQ4k(TqZ*#Q+2YbQmak&O`vZGn$Usn zi49e&jKa5x9by+zNMMm5U?U9dm4t=8kZ=fa=o;ya-2zPlp1Mi8MY@gpCo~1rron12 z20|KSm}FRF*km|lxMXT%GMPd_Vj9#mO)@PqZ89A)U9vQ?m@Gk-PL@Fyc5D&O2QV#{ zY>jLtTac}jZIEq}jRV;Va^U1>3J@To0TNB%157l4q5%~RuxP+V12Djz6XakAWLaUSz*Fcc_!NE$Kp?1cgn=Og zMD$a9V5d4cfMg)afD);t@P{GbWZ=mFlz}J%QU<0BP#LH)U}fOS0G5F)16q}$3~(9f zGT>$4%K(^xFau%+#te`dC^JxIz|6pz0WFwPFnC}P!C-i2x-6ln78FK#2e) z0+a|)B0z}%B?6QPP$EEy03`yH2v8zGi2x-6lnB$D>?1d)(?oRG0Fo*`Uhb2qhTX57 z_(LYu+p3*@cJ81-bQ)Nz*jsJ=toM6Ooq~He*Os?dA(KeA;ND_mZDmy{GEN)ZtFL{f zp`JBbSbzUrWdtya#m!|k3T$o{H{aWUh^sf7ZdW%StZl7rZm3t2YD*g{jb&y0puTm# zv2-tb|J`IA8svfcw|?Ar=EALGP6XZB{Z-#9sfz}cgL?JWVo;AJDf7-y>+feixRg3E zo5;xTdJn$){*_IgY<>Cc<&@U?<=JmG6CL(Hy0hF7?jxnnp1dH3<)vre-Rb%3`i1pg z*eH1&lca`ryp2@PpXA8L+0=j>lDWAvi6oRCU6bRp9W71`%8Av^c=pwov_uUdBk>9|mWf}z)m?igy|U>T~UJX7@QK6)bVNm)Dwx_va?ObpPK)Y>S#UP1G>x{gqV2QCpCE|nA1h1K1X3CA4+6NQ<0 zC>CYOhvHZ?cWo|+=E@P&$R<2iylO{<*lde^TGDiTH4ar|S_ z9o?=%tI-#_d(qKIN;U6hIS4U6$y9}J^k9Yb45&hb~I%kdMnew4kw z1ecw>KyxqoH-aKk1Rb$lji9;?ElTXlK+e?sYT3i20lOfqUdOEpeWU7uIouJDhn**c zI67c*zSg(^Qr#=*v(y7 delta 1953 zcmZWq&2Jk;6u0B1G^S1B*pxIx@UTkdM2$7G-)pGU^?L1Wv%9nGZoVoclVZ~(P2;K! z2dIQ^91uc;72H4^_ygKTkvLHKfK>H_gcPc(0*Nbdspu7{yj|N#N%yex=Dpv%dGp@y z&3q$2nEv8orrNwT!x2sdDwhaf64dQ0bEhbsf;@@>i~2 z+h{_mqNEEhsGzT|Twi%_t9jjTZh;F5L?9F-uvTtt9kPlL-W&LCVhR#>(}~33>c;WQ z3H;Xe-DBmUND9AAof}Uc(Hg1mcT?-D6Pe_o9UGFFF|^Avk@mtxh|+;__}Ah0rMbyH1gE~2j4sS34?53fZa3|!Y+jaVzglHU4Y6H5>oBv^7=H`cb+TASe? zqo+oepRsYUymKt`T5^;J%kfSte@?$!a#kx!_KTX%F!w|ZU6NrJIkhHenh`; zB9|W5*yP6X$2+AiS>oMemtipn=TDboxszp+S02_UI}Dt?I&@h6%3eKx`>CFd@oQZW z8((L`zwXt?J8S~&6Stq92tUs`SgYT2_u4!JhKIZWMU(+Yhk_!AQOO-+(bZ}OD7@4+ z@C0fVEkGSsr3WVaRzkp<(KX)ySrwpaT85+9M%6T|3djm-<}EAIfGkUWbGvUxnjP3h zwdY+HkYa4X2pGu7i9o1XTpvu*)DQBA7O&%?~_7vx8+9jgkW8xw09Q ztpEh{jH0c%F|6&I7ZE{Zs2PDit9e};@R7sr!FitU$HH?QR6K3bG93eWN+LtIH9743 zeGAt;anHi>;G3nAXZS`i?<|^51v^iHckBhrj9Q(e{K2K65ke^TpVH?ARr_bAaA3R&o(s#PnV5PGGuM-d^4uXPkC$ES@Rj{LhH~0 zq+x~>1*DS#g{rv(1e7U|kSB#|JDySr=S1jw5Ya>IN|Z#%V_bqtFfP2SENvMR5qG8G zV?aE1LyY93!W20%4IK6tDN4X8GN?rvN79{(0?v8hux*qg!I8xCX%1fkf=lr>#ogY{ W(9cZQ6kvmn=BvfI6j6F?8_=Pey!AzTY#U7yDr%;;OMS{l5I_ z^v7}|wG!Zgk}%>EI1nI1e1?#C0s=qbi5w}gYp`o|8r{B$hkC130~r&7QO$vEb@q(n z9!7$P3Ihho+#cAb3s)C>t}Sk)!0w#{efu@)(x=2j5Ak4 z)qsbS^HE^z`Hn}qU4g2O{7|?#QL1~AserWAksn2>V=>}>XslS- zCR*+K9&TFSthe1}qY-EErv4qIXLcdbHW+3RS*z7))xm)=g~`yU2H!$FEh5mmhl_1ZFTA`w)`yY z=kW{k^r_Wuvgh~B)<>poHU4+SFJ4FpE4cmfO#Vw3+M~fOw%F?Kb=hkd8lT8lHcO?& z={KwE`2NG{>!pS1&#PPM0(!2KH_FYPqXQvJbRa|z0U=ilL|+l|s6ZGiNa QpZ@vq57hZLmVEyBZ^^AKL;wH) delta 522 zcmexowo7xu0uHy-q@vQqqRNdc#F%&#oHG)O5|c|(i-J=p2QW!Z=3=&DRG7SrHGxS% zVY4(FE9+)0UL}rt5e7D2e;3yvKL#!a7!YP)b$4|3a6}TqP{zc-AjZHE;u_@Z>F4Of zzyZ_CfT5C+0Z9y@PMm?$!_~(l%r(T*8M{q95Ho=`ANT$a0W6&R_y`+(6l;S From bed9819009537d769b39543acaade00a06872f50 Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Fri, 5 Dec 2025 16:37:48 -0800 Subject: [PATCH 2/4] Correct documentation re: sample sheet in a window. --- lispusers/fontsampler.tedit | Bin 7038 -> 7106 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/lispusers/fontsampler.tedit b/lispusers/fontsampler.tedit index b141d3592ce4e1bf147f980c811c7c340739f38f..7d4bb12d4728749130526b0144de691011987b3e 100644 GIT binary patch delta 184 zcmexocF25#7k9mai)V0vk7J}lVzEL=Myf(^Nl|KIZb)T8s-8l4Mq){7S!$6&X0bv+ zVsUY53P@EzQD$BVP_R5RCr2SE6|Ac~GcP5-Tp=X0BqvotqckrkwYXTp&(lYtJR>tX zLm@r0EVWo6FCU^nQ%^x5Bm-zB5N&SdX5p9NVgLeWAeI0z7=f4_!~luJOkOH=p6h4_ M0|TEWLrK*x0BGShvH$=8 delta 107 zcmX?P{?BZK7q^kRi)V0vk7J}lVzEL=Myf(UQD$CAYLP->UW$UBrw>dxxTGjGF*l^L uAXRVk0d8J?8FmIBU Date: Mon, 8 Dec 2025 11:45:47 -0800 Subject: [PATCH 3/4] FONT: eliminate hyphen INFILEPs for font lookup (#2405) * FONT: eliminate hyphen INFILEPs for font lookup * SPREADFONTSPEC using FONTSPEC declaration --- sources/FONT | 137 +++++++++++++++++++++++++--------------------- sources/FONT.LCOM | Bin 69409 -> 69751 bytes 2 files changed, 76 insertions(+), 61 deletions(-) diff --git a/sources/FONT b/sources/FONT index fb086c1f..1abd8385 100644 --- a/sources/FONT +++ b/sources/FONT @@ -1,12 +1,13 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED "29-Nov-2025 16:32:59" {WMEDLEY}FONT.;638 280293 +(FILECREATED " 4-Dec-2025 09:46:06" {WMEDLEY}FONT.;644 281393 :EDIT-BY rmk - :CHANGES-TO (VARS FONTCOMS) + :CHANGES-TO (MACROS SPREADFONTSPEC) + (FNS \FINDFONTFILE) - :PREVIOUS-DATE "28-Nov-2025 14:28:16" {WMEDLEY}FONT.;637) + :PREVIOUS-DATE " 2-Dec-2025 16:01:58" {WMEDLEY}FONT.;639) (PRETTYCOMPRINT FONTCOMS) @@ -973,18 +974,18 @@ ) (DECLARE%: EVAL@COMPILE -(PUTPROPS SPREADFONTSPEC MACRO [(FONTSPEC) - (LET ((FS FONTSPEC)) +(PUTPROPS SPREADFONTSPEC MACRO [(FSPEC) + (LET ((FS FSPEC)) - (* ;; "Unwrap a FONTSPEC sequentially") + (* ;; "Unwrap a FONTSPEC ") (CL:WHEN (type? FONTDESCRIPTOR FS) (SETQ FS (FONTPROP FS 'SPEC))) - (SETQ FAMILY (pop FS)) - (SETQ SIZE (pop FS)) - (SETQ FACE (pop FS)) - (SETQ ROTATION (pop FS)) - (SETQ DEVICE (pop FS]) + (SETQ FAMILY (fetch (FONTSPEC FSFAMILY) of FS)) + (SETQ SIZE (fetch (FONTSPEC FSSIZE) of FS)) + (SETQ FACE (fetch (FONTSPEC FSFACE) of FS)) + (SETQ ROTATION (fetch (FONTSPEC FSROTATION) of FS)) + (SETQ DEVICE (fetch (FONTSPEC FSDEVICE) of FS FS]) ) (DEFINEQ @@ -1143,7 +1144,8 @@ (fetch (FONTDESCRIPTOR \SFHeight) of (FONTCREATE FONTSPEC]) (FONTPROP - [LAMBDA (FONT PROP) (* ; "Edited 2-Sep-2025 22:21 by rmk") + [LAMBDA (FONT PROP) (* ; "Edited 2-Dec-2025 16:01 by rmk") + (* ; "Edited 2-Sep-2025 22:21 by rmk") (* ; "Edited 12-Aug-2025 21:10 by rmk") (* ; "Edited 10-Aug-2025 13:28 by rmk") (* ; "Edited 23-Jul-2025 17:01 by rmk") @@ -1178,6 +1180,9 @@ elseif (MEMB (fetch (FONTDESCRIPTOR FONTFAMILY) of FONT) ALTOFONTFAMILIES) then 'ALTOTEXT + elseif (MEMB (fetch (FONTDESCRIPTOR FONTFAMILY) of FONT) + MCCSFONTFAMILIES) + then 'MCCS else (fetch (FONTDESCRIPTOR FONTFAMILY) of FONT]) (SPEC (create FONTSPEC FSFAMILY _ (ffetch FONTFAMILY of FONT) @@ -1813,24 +1818,34 @@ (\FINDFONTFILE [LAMBDA (FAMILY SIZE FACE ROTATION DEVICE CHARSET DIRLST EXTLST) + (* ; "Edited 3-Dec-2025 23:38 by rmk") (* ; "Edited 9-Jun-2025 09:40 by rmk") (* ; "Edited 15-May-2025 22:41 by rmk") (* ; "Edited 14-Sep-96 10:53 by rmk:") (* ; "Edited 6-Oct-89 11:18 by bvm") + (* ;; "This doesn't call FINDFILE because the hyphens separating the family from the face would get confused with the hyphen in TEDIT-STREAM file names.") + + (CL:UNLESS DIRLST + (SETQ DIRLST (CONS NIL))) + (* ;; "Find any font file on any directory with any naming convention with any extension. Note that ROTATION and DEVICE are just place holders. DEVICE is irrelevant because DIRLST already incorporates the device information. The variable *OLD-FONT-EXTENSIONS* can be set to suppress using the old-style lookup. If set to a list of extensions, just those will be looked up with old-style conventions.") - (for EXT FONTFILE inside EXTLST - when (SETQ FONTFILE (FINDFILE (if (FMEMB EXT *OLD-FONT-EXTENSIONS*) - then (\FONTFILENAME.OLD FAMILY SIZE FACE EXT CHARSET) - else (\FONTFILENAME FAMILY SIZE FACE EXT CHARSET)) - T DIRLST)) collect FONTFILE finally + (for EXT FONTFILE inside EXTLST join (SETQ FONTFILE (if (FMEMB EXT *OLD-FONT-EXTENSIONS*) + then (\FONTFILENAME.OLD FAMILY SIZE FACE + EXT CHARSET) + else (\FONTFILENAME FAMILY SIZE FACE EXT + CHARSET))) + (for DIR FOUND inside DIRLST + when (SETQ FOUND (INFILEP (PACKFILENAME.STRING + 'DIRECTORY DIR 'BODY FONTFILE) + )) collect FOUND) + finally - (* ;; - "Backward compatibility for devices that expect a single file") + (* ;; "Backward compatibility for devices that expect a single file") - (CL:UNLESS (CDR $$VAL) - (RETURN (CAR $$VAL)))]) + (CL:UNLESS (CDR $$VAL) + (RETURN (CAR $$VAL)))]) (\FONTFILENAMES [LAMBDA (FAMILY SIZE FACE DEVICE EXTENSIONS) (* ; "Edited 7-Oct-2025 12:21 by rmk") @@ -4583,44 +4598,44 @@ (ADDTOVAR LAMA FONTCOPY) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (12144 21857 (CHARWIDTH 12154 . 12939) (CHARWIDTHY 12941 . 14458) (STRINGWIDTH 14460 . -15553) (\CHARWIDTH.DISPLAY 15555 . 15968) (\STRINGWIDTH.DISPLAY 15970 . 16394) (\STRINGWIDTH.GENERIC -16396 . 21855)) (21858 28378 (DEFAULTFONT 21868 . 23153) (FONTCLASS 23155 . 25317) (FONTCLASSUNPARSE -25319 . 26218) (FONTCLASSCOMPONENT 26220 . 26808) (SETFONTCLASSCOMPONENT 26810 . 27252) ( -GETFONTCLASSCOMPONENT 27254 . 28376)) (30091 47595 (FONTCREATE 30101 . 33346) (FONTCREATE1 33348 . -35963) (FONTCREATE.SLUGFD 35965 . 37447) (\FONT.CHECKARGS1 37449 . 41972) (\FONTCREATE1.NOFN 41974 . -42188) (FONTFILEP 42190 . 43078) (\READCHARSET 43080 . 47593)) (47596 54672 (\FONT.CHECKARGS 47606 . -54355) (\CHARSET.CHECK 54357 . 54670)) (54673 57933 (COERCEFONTSPEC 54683 . 57931)) (60003 61342 ( -MAKEFONTSPEC 60013 . 61340)) (61343 69520 (COMPLETE.FONT 61353 . 63876) (COMPLETEFONTP 63878 . 64501) -(COMPLETE.CHARSET 64503 . 67188) (PRUNESLUGCSINFOS 67190 . 68115) (MONOSPACEFONTP 68117 . 69518)) ( -69559 77480 (FONTASCENT 69569 . 69953) (FONTDESCENT 69955 . 70440) (FONTHEIGHT 70442 . 70844) ( -FONTPROP 70846 . 76757) (\AVGCHARWIDTH 76759 . 77478)) (78137 79045 (FONTDEVICEPROP 78147 . 79043)) ( -79091 79945 (EDITCHAR 79101 . 79943)) (79991 92181 (GETCHARBITMAP 80001 . 81125) (PUTCHARBITMAP 81127 - . 83285) (\GETCHARBITMAP.CSINFO 83287 . 85303) (\PUTCHARBITMAP.CSINFO 85305 . 92179)) (92182 112662 ( -MOVECHARBITMAP 92192 . 94086) (MOVEFONTCHARS 94088 . 98048) (\MOVEFONTCHAR 98050 . 102893) ( -\MOVEFONTCHARS.SOURCEDATA 102895 . 109000) (\MAKESLUGCHAR 109002 . 111537) (SLUGCHARP.DISPLAY 111539 - . 112660)) (113595 134168 (FONTFILES 113605 . 115438) (\FINDFONTFILE 115440 . 117157) (\FONTFILENAMES - 117159 . 118154) (\FONTFILENAME 118156 . 122139) (\FONTFILENAME.OLD 122141 . 125090) ( -\FONTFILENAME.NEW 125092 . 127349) (FONTSPECFROMFILENAME 127351 . 131887) (\FONTINFOFROMFILENAME.OLD -131889 . 134166)) (134435 170238 (FONTCOPY 134445 . 139508) (FONTP 139510 . 139809) (FONTUNPARSE -139811 . 141530) (SETFONTDESCRIPTOR 141532 . 142996) (\STREAMCHARWIDTH 142998 . 147162) ( -\COERCECHARSET 147164 . 149759) (\BUILDSLUGCSINFO 149761 . 153384) (\FONTSYMBOL 153386 . 154036) ( -\DEVICESYMBOL 154038 . 154907) (\FONTFACE 154909 . 162099) (\FONTFACE.COLOR 162101 . 169021) ( -SETFONTCHARENCODING 169023 . 170236)) (170239 190538 (FONTSAVAILABLE 170249 . 175603) (FONTEXISTS? -175605 . 179583) (\SEARCHFONTFILES 179585 . 182670) (FLUSHFONTCACHE 182672 . 184895) (FLUSHFONTSINCORE - 184897 . 185094) (FINDFONTFILES 185096 . 188310) (SORTFONTSPECS 188312 . 190536)) (190539 194148 ( -MATCHFONTFACE 190549 . 191364) (MAKEFONTFACE 191366 . 192392) (FONTFACETOATOM 192394 . 194146)) ( -194779 195271 (\UNITWIDTHSVECTOR 194789 . 195269)) (209865 211932 (FONTDESCRIPTOR.DEFPRINT 209875 . -211454) (FONTCLASS.DEFPRINT 211456 . 211930)) (215761 218551 (\CREATEKERNELEMENT 215771 . 216129) ( -\FSETLEFTKERN 216131 . 216622) (\FGETLEFTKERN 216624 . 218549)) (218552 228188 (\CREATEFONT 218562 . -220001) (\CREATECHARSET 220003 . 223939) (\INSTALLCHARSETINFO 223941 . 227275) ( -\INSTALLCHARSETINFO.CHARENCODING 227277 . 228186)) (228510 229874 (\FONTRESETCHARWIDTHS 228520 . -229872)) (230504 240551 (\CREATEDISPLAYFONT 230514 . 232363) (\CREATECHARSET.DISPLAY 232365 . 238074) -(\FONTEXISTS?.DISPLAY 238076 . 240549)) (240552 255417 (STRIKEFONT.FILEP 240562 . 241450) ( -STRIKEFONT.GETCHARSET 241452 . 247044) (WRITESTRIKEFONTFILE 247046 . 251957) (STRIKECSINFO 251959 . -255415)) (255448 271765 (MAKEBOLD.CHARSET 255458 . 259107) (MAKEBOLD.CHAR 259109 . 260861) ( -MAKEITALIC.CHARSET 260863 . 264536) (MAKEITALIC.CHAR 264538 . 266884) (\SFMAKEBOLD 266886 . 269110) ( -\SFMAKEITALIC 269112 . 271763)) (271766 275915 (\SFMAKEROTATEDFONT 271776 . 273177) (\SFROTATECSINFO -273179 . 273816) (\SFROTATEFONTCHARACTERS 273818 . 274198) (\SFROTATECSINFOOFFSETS 274200 . 275913)) ( -275916 277297 (\SFMAKECOLOR 275926 . 277295))))) + (FILEMAP (NIL (12190 21903 (CHARWIDTH 12200 . 12985) (CHARWIDTHY 12987 . 14504) (STRINGWIDTH 14506 . +15599) (\CHARWIDTH.DISPLAY 15601 . 16014) (\STRINGWIDTH.DISPLAY 16016 . 16440) (\STRINGWIDTH.GENERIC +16442 . 21901)) (21904 28424 (DEFAULTFONT 21914 . 23199) (FONTCLASS 23201 . 25363) (FONTCLASSUNPARSE +25365 . 26264) (FONTCLASSCOMPONENT 26266 . 26854) (SETFONTCLASSCOMPONENT 26856 . 27298) ( +GETFONTCLASSCOMPONENT 27300 . 28422)) (30137 47641 (FONTCREATE 30147 . 33392) (FONTCREATE1 33394 . +36009) (FONTCREATE.SLUGFD 36011 . 37493) (\FONT.CHECKARGS1 37495 . 42018) (\FONTCREATE1.NOFN 42020 . +42234) (FONTFILEP 42236 . 43124) (\READCHARSET 43126 . 47639)) (47642 54718 (\FONT.CHECKARGS 47652 . +54401) (\CHARSET.CHECK 54403 . 54716)) (54719 57979 (COERCEFONTSPEC 54729 . 57977)) (60177 61516 ( +MAKEFONTSPEC 60187 . 61514)) (61517 69694 (COMPLETE.FONT 61527 . 64050) (COMPLETEFONTP 64052 . 64675) +(COMPLETE.CHARSET 64677 . 67362) (PRUNESLUGCSINFOS 67364 . 68289) (MONOSPACEFONTP 68291 . 69692)) ( +69733 77988 (FONTASCENT 69743 . 70127) (FONTDESCENT 70129 . 70614) (FONTHEIGHT 70616 . 71018) ( +FONTPROP 71020 . 77265) (\AVGCHARWIDTH 77267 . 77986)) (78645 79553 (FONTDEVICEPROP 78655 . 79551)) ( +79599 80453 (EDITCHAR 79609 . 80451)) (80499 92689 (GETCHARBITMAP 80509 . 81633) (PUTCHARBITMAP 81635 + . 83793) (\GETCHARBITMAP.CSINFO 83795 . 85811) (\PUTCHARBITMAP.CSINFO 85813 . 92687)) (92690 113170 ( +MOVECHARBITMAP 92700 . 94594) (MOVEFONTCHARS 94596 . 98556) (\MOVEFONTCHAR 98558 . 103401) ( +\MOVEFONTCHARS.SOURCEDATA 103403 . 109508) (\MAKESLUGCHAR 109510 . 112045) (SLUGCHARP.DISPLAY 112047 + . 113168)) (114103 135268 (FONTFILES 114113 . 115946) (\FINDFONTFILE 115948 . 118257) (\FONTFILENAMES + 118259 . 119254) (\FONTFILENAME 119256 . 123239) (\FONTFILENAME.OLD 123241 . 126190) ( +\FONTFILENAME.NEW 126192 . 128449) (FONTSPECFROMFILENAME 128451 . 132987) (\FONTINFOFROMFILENAME.OLD +132989 . 135266)) (135535 171338 (FONTCOPY 135545 . 140608) (FONTP 140610 . 140909) (FONTUNPARSE +140911 . 142630) (SETFONTDESCRIPTOR 142632 . 144096) (\STREAMCHARWIDTH 144098 . 148262) ( +\COERCECHARSET 148264 . 150859) (\BUILDSLUGCSINFO 150861 . 154484) (\FONTSYMBOL 154486 . 155136) ( +\DEVICESYMBOL 155138 . 156007) (\FONTFACE 156009 . 163199) (\FONTFACE.COLOR 163201 . 170121) ( +SETFONTCHARENCODING 170123 . 171336)) (171339 191638 (FONTSAVAILABLE 171349 . 176703) (FONTEXISTS? +176705 . 180683) (\SEARCHFONTFILES 180685 . 183770) (FLUSHFONTCACHE 183772 . 185995) (FLUSHFONTSINCORE + 185997 . 186194) (FINDFONTFILES 186196 . 189410) (SORTFONTSPECS 189412 . 191636)) (191639 195248 ( +MATCHFONTFACE 191649 . 192464) (MAKEFONTFACE 192466 . 193492) (FONTFACETOATOM 193494 . 195246)) ( +195879 196371 (\UNITWIDTHSVECTOR 195889 . 196369)) (210965 213032 (FONTDESCRIPTOR.DEFPRINT 210975 . +212554) (FONTCLASS.DEFPRINT 212556 . 213030)) (216861 219651 (\CREATEKERNELEMENT 216871 . 217229) ( +\FSETLEFTKERN 217231 . 217722) (\FGETLEFTKERN 217724 . 219649)) (219652 229288 (\CREATEFONT 219662 . +221101) (\CREATECHARSET 221103 . 225039) (\INSTALLCHARSETINFO 225041 . 228375) ( +\INSTALLCHARSETINFO.CHARENCODING 228377 . 229286)) (229610 230974 (\FONTRESETCHARWIDTHS 229620 . +230972)) (231604 241651 (\CREATEDISPLAYFONT 231614 . 233463) (\CREATECHARSET.DISPLAY 233465 . 239174) +(\FONTEXISTS?.DISPLAY 239176 . 241649)) (241652 256517 (STRIKEFONT.FILEP 241662 . 242550) ( +STRIKEFONT.GETCHARSET 242552 . 248144) (WRITESTRIKEFONTFILE 248146 . 253057) (STRIKECSINFO 253059 . +256515)) (256548 272865 (MAKEBOLD.CHARSET 256558 . 260207) (MAKEBOLD.CHAR 260209 . 261961) ( +MAKEITALIC.CHARSET 261963 . 265636) (MAKEITALIC.CHAR 265638 . 267984) (\SFMAKEBOLD 267986 . 270210) ( +\SFMAKEITALIC 270212 . 272863)) (272866 277015 (\SFMAKEROTATEDFONT 272876 . 274277) (\SFROTATECSINFO +274279 . 274916) (\SFROTATEFONTCHARACTERS 274918 . 275298) (\SFROTATECSINFOOFFSETS 275300 . 277013)) ( +277016 278397 (\SFMAKECOLOR 277026 . 278395))))) STOP diff --git a/sources/FONT.LCOM b/sources/FONT.LCOM index 767c19f914d1cfabd66278e912f339a480b448a4..eb207a1933e4ecd332194dad1a029cfc69b44248 100644 GIT binary patch delta 3645 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 delta 3190 zcmai0U2Ggz72er6j%$?4PMo;7u6Yl1+=X8?a+Ce}isRa)x@|>v8JX_#WDe-Bg^^wZh#?Ys zM0h}(v+5!AS9~uj`L%Eoib36;bNt!xa2ds*6ypxnh*6ZZSc;%GwuK|32cZHglqbn@BxIUBS-N*@Zg<(**fmSfjh)RZCjAf&90W;L;Y6%rsfthA5tuR+#;X+tQ1NnP z9dqpfO+>({S<|*3gdnLZgb|+BKq4BjH_CQcsyjjC*Floxj+>3Q#+#zBN|%C%zvM&q zBs5PRZ2BN1>-##^BOU8eTsO9Yk?e}3LCvlmv+JOVCe*AMo4pqXb_rC}gPnn@C}7W7 zE~rF|DT^{H0_9YoypVDeLyx(MF2`>W1s7ISsxpNtR>=k; zYjC2ylai;2m^>|MS}a3S34J#_l$9m=QAk!$wY=xJ@ZcnfE`f zbN$Fta*Oj-+k^atr_Y}`3iOj`dg=U==b;i#;%Ps6(IXH#kJ^xLQ#p~Fshe2$BP()z z6xYRFM$bpHGIHa-xgYH5orLVEJz2W-mCK_St6BVnfv;uo`^);!)OPQnkYU7Y=jk&` z`90O<)b{9xMc-Na?C^Lm}$!)x$h5x;AF*y>xPk(>%s}G6jIgabv z)0SJX>eC==Dz|@7_XChs1xkLf2(o0v3!;!@bzE~?R2y~S5i7R^u>h7uDW(&Qz^*hxbOS6m@*{g80)iTKpQ{=y;IB>q zQA8+opAwn>t?iZkvg1tyk;FtNi~ytY@hNdk_$eJ;9UHD?-@9HDaNOkM4L;ti(c`O6 zlw>$z1%d6A2}p{BvF&(e9^aVPG53jG6igAZ9?YH`IZdJeUIifF`DuDJ2xr3Ivbnht z4U<0f+>ckH-I+|^^u2>tPj#cuSY?;w5Vd;1!ne)svlQ7kK%i+K@g>3ooA*c7MBZ zb{^=TFTR>%hG7Y1v3AUNK|z4<3c^sZADP88Et_KF?N{=`Sd4myDP&Z&wQcPD$m|zB zrpD{}akRkcOtUJmIh)Kq$=utl(q~`)rJ&G>HwvHAleZm&zHWobU}L%@dqZqI^+qtv zf5*7n@BCq(K)2V%_k6iIC=Sj~(7&x6AD_wI#Mfs8HfNK$Cz*SjGjwtN^TGsuc75cY zfAIuRo}XyEy}nmi!9wZRc@<{K ziJ2j#$|87}EwChOIwl6pAEl^m+Htc4%uDb$`n|!>%$EHg^-TWtD03{s(&w^bQ zm;i;o11m(*q3qPr9)5i>j{bDVd^`Z`{Lo@v$%-(v(~H!i{<3{5Y7aO_JR{esHUEzj5LJM*%}K?LlBPAOSk`jXnu72 zKjV6Lr=%$@5V5$$kYV@KHU}YQdzU~)+K^!rmg0l=@5Dz^NE;vt<#Zt=CH@?jusA?a zhnLZ~s$NLCXT!31+DFof5e|lfUKSQ_(wvrq!9cM%h8!o=pNJIOLRr@a} Cv}rQ{ From 570f5e3bfc3df896858d5c25bf3382d7f9ebdb45 Mon Sep 17 00:00:00 2001 From: rmkaplan Date: Mon, 8 Dec 2025 22:22:42 -0800 Subject: [PATCH 4/4] Fixed glitch in SPREADFONTSPEC macro, for Masterscope --- sources/FONT | 87 +++++++++++++++++++++++----------------------- sources/FONT.LCOM | Bin 69751 -> 69724 bytes 2 files changed, 43 insertions(+), 44 deletions(-) diff --git a/sources/FONT b/sources/FONT index 1abd8385..ab26c93f 100644 --- a/sources/FONT +++ b/sources/FONT @@ -1,13 +1,12 @@ (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10) -(FILECREATED " 4-Dec-2025 09:46:06" {WMEDLEY}FONT.;644 281393 +(FILECREATED " 8-Dec-2025 22:19:01" {WMEDLEY}FONT.;645 281352 :EDIT-BY rmk :CHANGES-TO (MACROS SPREADFONTSPEC) - (FNS \FINDFONTFILE) - :PREVIOUS-DATE " 2-Dec-2025 16:01:58" {WMEDLEY}FONT.;639) + :PREVIOUS-DATE " 4-Dec-2025 09:46:06" {WMEDLEY}FONT.;644) (PRETTYCOMPRINT FONTCOMS) @@ -985,7 +984,7 @@ (SETQ SIZE (fetch (FONTSPEC FSSIZE) of FS)) (SETQ FACE (fetch (FONTSPEC FSFACE) of FS)) (SETQ ROTATION (fetch (FONTSPEC FSROTATION) of FS)) - (SETQ DEVICE (fetch (FONTSPEC FSDEVICE) of FS FS]) + (SETQ DEVICE (fetch (FONTSPEC FSDEVICE) of FS]) ) (DEFINEQ @@ -4598,44 +4597,44 @@ (ADDTOVAR LAMA FONTCOPY) ) (DECLARE%: DONTCOPY - (FILEMAP (NIL (12190 21903 (CHARWIDTH 12200 . 12985) (CHARWIDTHY 12987 . 14504) (STRINGWIDTH 14506 . -15599) (\CHARWIDTH.DISPLAY 15601 . 16014) (\STRINGWIDTH.DISPLAY 16016 . 16440) (\STRINGWIDTH.GENERIC -16442 . 21901)) (21904 28424 (DEFAULTFONT 21914 . 23199) (FONTCLASS 23201 . 25363) (FONTCLASSUNPARSE -25365 . 26264) (FONTCLASSCOMPONENT 26266 . 26854) (SETFONTCLASSCOMPONENT 26856 . 27298) ( -GETFONTCLASSCOMPONENT 27300 . 28422)) (30137 47641 (FONTCREATE 30147 . 33392) (FONTCREATE1 33394 . -36009) (FONTCREATE.SLUGFD 36011 . 37493) (\FONT.CHECKARGS1 37495 . 42018) (\FONTCREATE1.NOFN 42020 . -42234) (FONTFILEP 42236 . 43124) (\READCHARSET 43126 . 47639)) (47642 54718 (\FONT.CHECKARGS 47652 . -54401) (\CHARSET.CHECK 54403 . 54716)) (54719 57979 (COERCEFONTSPEC 54729 . 57977)) (60177 61516 ( -MAKEFONTSPEC 60187 . 61514)) (61517 69694 (COMPLETE.FONT 61527 . 64050) (COMPLETEFONTP 64052 . 64675) -(COMPLETE.CHARSET 64677 . 67362) (PRUNESLUGCSINFOS 67364 . 68289) (MONOSPACEFONTP 68291 . 69692)) ( -69733 77988 (FONTASCENT 69743 . 70127) (FONTDESCENT 70129 . 70614) (FONTHEIGHT 70616 . 71018) ( -FONTPROP 71020 . 77265) (\AVGCHARWIDTH 77267 . 77986)) (78645 79553 (FONTDEVICEPROP 78655 . 79551)) ( -79599 80453 (EDITCHAR 79609 . 80451)) (80499 92689 (GETCHARBITMAP 80509 . 81633) (PUTCHARBITMAP 81635 - . 83793) (\GETCHARBITMAP.CSINFO 83795 . 85811) (\PUTCHARBITMAP.CSINFO 85813 . 92687)) (92690 113170 ( -MOVECHARBITMAP 92700 . 94594) (MOVEFONTCHARS 94596 . 98556) (\MOVEFONTCHAR 98558 . 103401) ( -\MOVEFONTCHARS.SOURCEDATA 103403 . 109508) (\MAKESLUGCHAR 109510 . 112045) (SLUGCHARP.DISPLAY 112047 - . 113168)) (114103 135268 (FONTFILES 114113 . 115946) (\FINDFONTFILE 115948 . 118257) (\FONTFILENAMES - 118259 . 119254) (\FONTFILENAME 119256 . 123239) (\FONTFILENAME.OLD 123241 . 126190) ( -\FONTFILENAME.NEW 126192 . 128449) (FONTSPECFROMFILENAME 128451 . 132987) (\FONTINFOFROMFILENAME.OLD -132989 . 135266)) (135535 171338 (FONTCOPY 135545 . 140608) (FONTP 140610 . 140909) (FONTUNPARSE -140911 . 142630) (SETFONTDESCRIPTOR 142632 . 144096) (\STREAMCHARWIDTH 144098 . 148262) ( -\COERCECHARSET 148264 . 150859) (\BUILDSLUGCSINFO 150861 . 154484) (\FONTSYMBOL 154486 . 155136) ( -\DEVICESYMBOL 155138 . 156007) (\FONTFACE 156009 . 163199) (\FONTFACE.COLOR 163201 . 170121) ( -SETFONTCHARENCODING 170123 . 171336)) (171339 191638 (FONTSAVAILABLE 171349 . 176703) (FONTEXISTS? -176705 . 180683) (\SEARCHFONTFILES 180685 . 183770) (FLUSHFONTCACHE 183772 . 185995) (FLUSHFONTSINCORE - 185997 . 186194) (FINDFONTFILES 186196 . 189410) (SORTFONTSPECS 189412 . 191636)) (191639 195248 ( -MATCHFONTFACE 191649 . 192464) (MAKEFONTFACE 192466 . 193492) (FONTFACETOATOM 193494 . 195246)) ( -195879 196371 (\UNITWIDTHSVECTOR 195889 . 196369)) (210965 213032 (FONTDESCRIPTOR.DEFPRINT 210975 . -212554) (FONTCLASS.DEFPRINT 212556 . 213030)) (216861 219651 (\CREATEKERNELEMENT 216871 . 217229) ( -\FSETLEFTKERN 217231 . 217722) (\FGETLEFTKERN 217724 . 219649)) (219652 229288 (\CREATEFONT 219662 . -221101) (\CREATECHARSET 221103 . 225039) (\INSTALLCHARSETINFO 225041 . 228375) ( -\INSTALLCHARSETINFO.CHARENCODING 228377 . 229286)) (229610 230974 (\FONTRESETCHARWIDTHS 229620 . -230972)) (231604 241651 (\CREATEDISPLAYFONT 231614 . 233463) (\CREATECHARSET.DISPLAY 233465 . 239174) -(\FONTEXISTS?.DISPLAY 239176 . 241649)) (241652 256517 (STRIKEFONT.FILEP 241662 . 242550) ( -STRIKEFONT.GETCHARSET 242552 . 248144) (WRITESTRIKEFONTFILE 248146 . 253057) (STRIKECSINFO 253059 . -256515)) (256548 272865 (MAKEBOLD.CHARSET 256558 . 260207) (MAKEBOLD.CHAR 260209 . 261961) ( -MAKEITALIC.CHARSET 261963 . 265636) (MAKEITALIC.CHAR 265638 . 267984) (\SFMAKEBOLD 267986 . 270210) ( -\SFMAKEITALIC 270212 . 272863)) (272866 277015 (\SFMAKEROTATEDFONT 272876 . 274277) (\SFROTATECSINFO -274279 . 274916) (\SFROTATEFONTCHARACTERS 274918 . 275298) (\SFROTATECSINFOOFFSETS 275300 . 277013)) ( -277016 278397 (\SFMAKECOLOR 277026 . 278395))))) + (FILEMAP (NIL (12152 21865 (CHARWIDTH 12162 . 12947) (CHARWIDTHY 12949 . 14466) (STRINGWIDTH 14468 . +15561) (\CHARWIDTH.DISPLAY 15563 . 15976) (\STRINGWIDTH.DISPLAY 15978 . 16402) (\STRINGWIDTH.GENERIC +16404 . 21863)) (21866 28386 (DEFAULTFONT 21876 . 23161) (FONTCLASS 23163 . 25325) (FONTCLASSUNPARSE +25327 . 26226) (FONTCLASSCOMPONENT 26228 . 26816) (SETFONTCLASSCOMPONENT 26818 . 27260) ( +GETFONTCLASSCOMPONENT 27262 . 28384)) (30099 47603 (FONTCREATE 30109 . 33354) (FONTCREATE1 33356 . +35971) (FONTCREATE.SLUGFD 35973 . 37455) (\FONT.CHECKARGS1 37457 . 41980) (\FONTCREATE1.NOFN 41982 . +42196) (FONTFILEP 42198 . 43086) (\READCHARSET 43088 . 47601)) (47604 54680 (\FONT.CHECKARGS 47614 . +54363) (\CHARSET.CHECK 54365 . 54678)) (54681 57941 (COERCEFONTSPEC 54691 . 57939)) (60136 61475 ( +MAKEFONTSPEC 60146 . 61473)) (61476 69653 (COMPLETE.FONT 61486 . 64009) (COMPLETEFONTP 64011 . 64634) +(COMPLETE.CHARSET 64636 . 67321) (PRUNESLUGCSINFOS 67323 . 68248) (MONOSPACEFONTP 68250 . 69651)) ( +69692 77947 (FONTASCENT 69702 . 70086) (FONTDESCENT 70088 . 70573) (FONTHEIGHT 70575 . 70977) ( +FONTPROP 70979 . 77224) (\AVGCHARWIDTH 77226 . 77945)) (78604 79512 (FONTDEVICEPROP 78614 . 79510)) ( +79558 80412 (EDITCHAR 79568 . 80410)) (80458 92648 (GETCHARBITMAP 80468 . 81592) (PUTCHARBITMAP 81594 + . 83752) (\GETCHARBITMAP.CSINFO 83754 . 85770) (\PUTCHARBITMAP.CSINFO 85772 . 92646)) (92649 113129 ( +MOVECHARBITMAP 92659 . 94553) (MOVEFONTCHARS 94555 . 98515) (\MOVEFONTCHAR 98517 . 103360) ( +\MOVEFONTCHARS.SOURCEDATA 103362 . 109467) (\MAKESLUGCHAR 109469 . 112004) (SLUGCHARP.DISPLAY 112006 + . 113127)) (114062 135227 (FONTFILES 114072 . 115905) (\FINDFONTFILE 115907 . 118216) (\FONTFILENAMES + 118218 . 119213) (\FONTFILENAME 119215 . 123198) (\FONTFILENAME.OLD 123200 . 126149) ( +\FONTFILENAME.NEW 126151 . 128408) (FONTSPECFROMFILENAME 128410 . 132946) (\FONTINFOFROMFILENAME.OLD +132948 . 135225)) (135494 171297 (FONTCOPY 135504 . 140567) (FONTP 140569 . 140868) (FONTUNPARSE +140870 . 142589) (SETFONTDESCRIPTOR 142591 . 144055) (\STREAMCHARWIDTH 144057 . 148221) ( +\COERCECHARSET 148223 . 150818) (\BUILDSLUGCSINFO 150820 . 154443) (\FONTSYMBOL 154445 . 155095) ( +\DEVICESYMBOL 155097 . 155966) (\FONTFACE 155968 . 163158) (\FONTFACE.COLOR 163160 . 170080) ( +SETFONTCHARENCODING 170082 . 171295)) (171298 191597 (FONTSAVAILABLE 171308 . 176662) (FONTEXISTS? +176664 . 180642) (\SEARCHFONTFILES 180644 . 183729) (FLUSHFONTCACHE 183731 . 185954) (FLUSHFONTSINCORE + 185956 . 186153) (FINDFONTFILES 186155 . 189369) (SORTFONTSPECS 189371 . 191595)) (191598 195207 ( +MATCHFONTFACE 191608 . 192423) (MAKEFONTFACE 192425 . 193451) (FONTFACETOATOM 193453 . 195205)) ( +195838 196330 (\UNITWIDTHSVECTOR 195848 . 196328)) (210924 212991 (FONTDESCRIPTOR.DEFPRINT 210934 . +212513) (FONTCLASS.DEFPRINT 212515 . 212989)) (216820 219610 (\CREATEKERNELEMENT 216830 . 217188) ( +\FSETLEFTKERN 217190 . 217681) (\FGETLEFTKERN 217683 . 219608)) (219611 229247 (\CREATEFONT 219621 . +221060) (\CREATECHARSET 221062 . 224998) (\INSTALLCHARSETINFO 225000 . 228334) ( +\INSTALLCHARSETINFO.CHARENCODING 228336 . 229245)) (229569 230933 (\FONTRESETCHARWIDTHS 229579 . +230931)) (231563 241610 (\CREATEDISPLAYFONT 231573 . 233422) (\CREATECHARSET.DISPLAY 233424 . 239133) +(\FONTEXISTS?.DISPLAY 239135 . 241608)) (241611 256476 (STRIKEFONT.FILEP 241621 . 242509) ( +STRIKEFONT.GETCHARSET 242511 . 248103) (WRITESTRIKEFONTFILE 248105 . 253016) (STRIKECSINFO 253018 . +256474)) (256507 272824 (MAKEBOLD.CHARSET 256517 . 260166) (MAKEBOLD.CHAR 260168 . 261920) ( +MAKEITALIC.CHARSET 261922 . 265595) (MAKEITALIC.CHAR 265597 . 267943) (\SFMAKEBOLD 267945 . 270169) ( +\SFMAKEITALIC 270171 . 272822)) (272825 276974 (\SFMAKEROTATEDFONT 272835 . 274236) (\SFROTATECSINFO +274238 . 274875) (\SFROTATEFONTCHARACTERS 274877 . 275257) (\SFROTATECSINFOOFFSETS 275259 . 276972)) ( +276975 278356 (\SFMAKECOLOR 276985 . 278354))))) STOP diff --git a/sources/FONT.LCOM b/sources/FONT.LCOM index eb207a1933e4ecd332194dad1a029cfc69b44248..7cb640d7480d958c7df59956f5b5f07b2d4ed7f6 100644 GIT binary patch delta 335 zcmeyqfaT5tmI)EU7P>B}$+|`cMy3izMplNFRtAO>vvnj*H5Is&6igA4h89-F23E#~ z6E{c)B8%(k=_x6sB$lM6C}2@KNkc0#t;>#>p~_G8{k$SQr|c z8clX!H0HAk2yzYc^bZZzbpdLd%*JTE`6Q#AjF^I(f~kUwtD9q}Pl%hpUx=mx!+sW~ z$-Hu5tS*jQnL{V%$Yn5@SWdpEAS$K+G)*A}VzIM_V^FYbh=Qf@WJY-pHxmV*b6i3k zoqSva6b#Lb6g+($-Cg|yf)xx+O%;MefU>>{hDK%zAUj-KgPnss148_R6bucGk#ugJ NCtqc@Svo9c7XUXlRIdO4 delta 315 zcmcb!faUuFmI)D)TNp(r=4wfrXew|i85`*O<(KIi85o%=7#dg^m|Gc{P23=DjV!LG zr>CTll30?OqJTxcv8j?Kmxi0CkE?T#t7C|(%j8BzV|E223qxZ|w|vVM~P=h^5XRjzPh$Aqtk}lYhv0Xjmu!o#GPW z=;Y%XpkQcbrr_!8=%H^)$)5RgkZ Ox5-zTZT=e?zY74oa8on@