From ea087f7a4e6cd92e3ddf2344491f796aada6512a Mon Sep 17 00:00:00 2001 From: Matt Heffron Date: Fri, 8 Aug 2025 22:18:44 -0700 Subject: [PATCH] Verbose mode implemented incorrectly --- lispusers/READ-BDF | 34 ++++++++++++++++++---------------- lispusers/READ-BDF.DFASL | Bin 20898 -> 20923 bytes 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/lispusers/READ-BDF b/lispusers/READ-BDF index 229d59d0..ebc2174c 100644 --- a/lispusers/READ-BDF +++ b/lispusers/READ-BDF @@ -5,13 +5,14 @@ BITMAPHEIGHT BITMAPWIDTH BLACKSHADE BLTSHADE BOLD CONDENSED CHARSETINFO DISPLAY FONTPROP INPUT ITALIC LIGHT LRSH MEDIUM REGULAR TCONC UTOXCODE UTOXCODE? WRITESTRIKEFONTFILE)) READTABLE "XCL" BASE 10) -(IL:FILECREATED "30-Apr-2025 13:20:10" IL:|{DSK}matt>Interlisp>medley>lispusers>READ-BDF.;61| 47500 +(IL:FILECREATED " 7-Aug-2025 18:06:58" IL:|{DSK}matt>Interlisp>medley>lispusers>READ-BDF.;2| 47764 :EDIT-BY "mth" - :CHANGES-TO (IL:FUNCTIONS GET-FAMILY-FACE-SIZE-FROM-NAME) + :CHANGES-TO (IL:FUNCTIONS READ-BDF WRITE-BDF-TO-DISPLAYFONT-FILES BDF-TO-CHARSETINFO READ-GLYPH + GET-FAMILY-FACE-SIZE-FROM-NAME SPLIT-FONT-NAME) - :PREVIOUS-DATE "25-Apr-2025 10:10:08" IL:|{DSK}matt>Interlisp>medley>lispusers>READ-BDF.;60| + :PREVIOUS-DATE "30-Apr-2025 13:20:10" IL:|{DSK}matt>Interlisp>medley>lispusers>READ-BDF.;1| ) @@ -488,7 +489,8 @@ FONTPROP INPUT ITALIC LIGHT LRSH MEDIUM REGULAR TCONC UTOXCODE UTOXCODE? WRITEST X)) Y)))) -(DEFUN READ-BDF (PATH &OPTIONAL VERBOSE) (IL:* IL:\; "Edited 24-Apr-2025 00:44 by mth") +(DEFUN READ-BDF (PATH &OPTIONAL VERBOSE) (IL:* IL:\; "Edited 30-Apr-2025 13:37 by mth") + (IL:* IL:\; "Edited 24-Apr-2025 00:44 by mth") (IL:* IL:\; "Edited 17-Apr-2025 15:10 by mth") (IL:* IL:\; "Edited 12-Jul-2024 23:02 by mth") (LET @@ -603,15 +605,15 @@ FONTPROP INPUT ITALIC LIGHT LRSH MEDIUM REGULAR TCONC UTOXCODE UTOXCODE? WRITEST (SETF (BF-SLUG FONT) GL)))))) (ENDFONT (SETQ FONT-COMPLETE T)))))))) - (WHEN VERBOSE - (DESTRUCTURING-BIND (FAMILY (WEIGHT SLANT EXPANSION) - SIZE) - (GET-FAMILY-FACE-SIZE-FROM-NAME FONT) + (DESTRUCTURING-BIND (FAMILY (WEIGHT SLANT EXPANSION) + SIZE) + (GET-FAMILY-FACE-SIZE-FROM-NAME FONT) + (WHEN VERBOSE (FORMAT *STANDARD-OUTPUT* "Name: ~A~%Family: ~A~%Size: ~A~%Weight: ~A~%Slant: ~A~%Expansion: ~A~%" (BF-NAME FONT) - FAMILY SIZE WEIGHT SLANT EXPANSION))) - FONT))) + FAMILY SIZE WEIGHT SLANT EXPANSION)) + (VALUES FONT FAMILY WEIGHT SLANT EXPANSION SIZE))))) (DEFUN READ-DELIMITED-LIST-FROM-STRING (INPUT-STRING &OPTIONAL (DELIMIT #\])) (IL:* IL:\; "Edited 20-Aug-2024 16:46 by mth") @@ -823,10 +825,10 @@ FONTPROP INPUT ITALIC LIGHT LRSH MEDIUM REGULAR TCONC UTOXCODE UTOXCODE? WRITEST (IL:PUTPROPS IL:READ-BDF IL:DATABASE IL:NO) (IL:DECLARE\: IL:DONTCOPY - (IL:FILEMAP (NIL (2316 10275 (BDF-TO-CHARSETINFO 2316 . 10275)) (10277 16147 (BDF-TO-FONTDESCRIPTOR -10277 . 16147)) (16149 19687 (GET-FAMILY-FACE-SIZE-FROM-NAME 16149 . 19687)) (19689 26500 ( -GLYPHS-BY-CHARSET 19689 . 26500)) (26502 27927 (PACKFILENAME.STRING 26502 . 27927)) (27929 34733 ( -READ-BDF 27929 . 34733)) (34735 35058 (READ-DELIMITED-LIST-FROM-STRING 34735 . 35058)) (35060 41548 ( -READ-GLYPH 35060 . 41548)) (41550 42291 (SPLIT-FONT-NAME 41550 . 42291)) (42293 46075 ( -WRITE-BDF-TO-DISPLAYFONT-FILES 42293 . 46075))))) + (IL:FILEMAP (NIL (2425 10384 (BDF-TO-CHARSETINFO 2425 . 10384)) (10386 16256 (BDF-TO-FONTDESCRIPTOR +10386 . 16256)) (16258 19796 (GET-FAMILY-FACE-SIZE-FROM-NAME 16258 . 19796)) (19798 26609 ( +GLYPHS-BY-CHARSET 19798 . 26609)) (26611 28036 (PACKFILENAME.STRING 26611 . 28036)) (28038 34997 ( +READ-BDF 28038 . 34997)) (34999 35322 (READ-DELIMITED-LIST-FROM-STRING 34999 . 35322)) (35324 41812 ( +READ-GLYPH 35324 . 41812)) (41814 42555 (SPLIT-FONT-NAME 41814 . 42555)) (42557 46339 ( +WRITE-BDF-TO-DISPLAYFONT-FILES 42557 . 46339))))) IL:STOP diff --git a/lispusers/READ-BDF.DFASL b/lispusers/READ-BDF.DFASL index 1974ed35938ba59ce1aee8f097126b0f96dea634..3c3b384320b0b40c450b420b825eeb204cd0a3f6 100644 GIT binary patch delta 483 zcmZ3qm~r=F#tAWTMqI)9rA5i93Tc@+sS3$Osfi`2DGCbax{jskx<&>@rV54@Rt9EP zrWRaoj=?^t%0eskfU|oSIk|KTTfl z<{$hSWbPcW_!JPc7or5j>;N;r)Pku`F(8WJPZ*f@!39DYK_~?X#Rs7_d%E9ZV*I>W P#p^3G2;1Hk~^M9Zio11@-uOpayaB{WPUhWxFd)Q-q!$4{#+gVHVfApLQ zRLjuk45Ao6PR_7aW&F6g&svL_n=3fL$J5zW*U-{*^AWqxOpG5U?{LhLf(aWL7&A+Q zb-m#MQ=d26IyJEX%{buZ&-iJwfV-&eXOP()VA(IV5F27Z6vLk|Fz>w!gffCq3J{79 ZLTyfRzs1D(X|t`@S7ye~n~nWCm;oW%hK2wD