Skip to content

Commit 30872f6

Browse files
authored
READ-BDF Fix incorrect detection of Italic font slope from BDF font metadata. (#2132)
Fix incorrect detection of Italic font slope from BDF font metadata.
1 parent 40e3edc commit 30872f6

File tree

2 files changed

+17
-16
lines changed

2 files changed

+17
-16
lines changed

lispusers/READ-BDF

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ BITMAPHEIGHT BITMAPWIDTH BLACKSHADE BLTSHADE BOLD CONDENSED CHARSETINFO DISPLAY
55
FONTPROP INPUT ITALIC LIGHT LRSH MEDIUM REGULAR TCONC UTOXCODE UTOXCODE? WRITESTRIKEFONTFILE))
66
READTABLE "XCL" BASE 10)
77

8-
(IL:FILECREATED "25-Apr-2025 10:10:08" IL:|{DSK}<home>matt>Interlisp>medley>lispusers>READ-BDF.;57| 47436
8+
(IL:FILECREATED "30-Apr-2025 13:20:10" IL:|{DSK}<home>matt>Interlisp>medley>lispusers>READ-BDF.;61| 47500
99

1010
:EDIT-BY "mth"
1111

12-
:CHANGES-TO (IL:FUNCTIONS WRITE-BDF-TO-DISPLAYFONT-FILES READ-BDF BDF-TO-CHARSETINFO READ-GLYPH
13-
GET-FAMILY-FACE-SIZE-FROM-NAME SPLIT-FONT-NAME)
12+
:CHANGES-TO (IL:FUNCTIONS GET-FAMILY-FACE-SIZE-FROM-NAME)
1413

15-
:PREVIOUS-DATE "23-Apr-2025 17:55:25" IL:|{DSK}<home>matt>Interlisp>medley>lispusers>READ-BDF.;54|
14+
:PREVIOUS-DATE "25-Apr-2025 10:10:08" IL:|{DSK}<home>matt>Interlisp>medley>lispusers>READ-BDF.;60|
1615
)
1716

1817

@@ -282,10 +281,11 @@ FONTPROP INPUT ITALIC LIGHT LRSH MEDIUM REGULAR TCONC UTOXCODE UTOXCODE? WRITEST
282281
:TEST
283282
#'EQL)))))))))
284283

285-
(DEFUN GET-FAMILY-FACE-SIZE-FROM-NAME (BDFONT) (IL:* IL:\; "Edited 23-Apr-2025 16:20 by mth")
284+
(DEFUN GET-FAMILY-FACE-SIZE-FROM-NAME (BDFONT) (IL:* IL:\; "Edited 30-Apr-2025 13:18 by mth")
285+
(IL:* IL:\; "Edited 23-Apr-2025 16:20 by mth")
286286
(IL:* IL:\; "Edited 5-Feb-2025 12:56 by mth")
287287
(UNLESS (TYPEP BDFONT 'BDF-FONT)
288-
(ERROR "Not a BDF-FONT: ~S~%" BDFONT))
288+
(ERROR "Not a BDF-FONT: ~S~%" BDFONT))
289289
(DESTRUCTURING-BIND (FOUNDRY FAMILY WEIGHT SLANT EXPANSION ADD_STYLE_NAME
290290
PIXEL-SIZE POINT-SIZE)
291291
(SPLIT-FONT-NAME (BF-NAME BDFONT)) (IL:* IL:\; "Parse as XLFD format")
@@ -300,10 +300,11 @@ FONTPROP INPUT ITALIC LIGHT LRSH MEDIUM REGULAR TCONC UTOXCODE UTOXCODE? WRITEST
300300
(#\D . BOLD)
301301
(#\L . LIGHT)))))
302302
'MEDIUM)) (IL:* IL:\; "DemiBold => BOLD")
303-
(SETQ SLANT (OR (AND SLANT (CDR (ASSOC (STRING-UPCASE SLANT)
304-
'(("R" . REGULAR)
305-
("I" . ITALIC)
306-
("O" . ITALIC)))))
303+
(SETQ SLANT (OR (AND SLANT (CDR (ASSOC (CHAR-UPCASE (ELT SLANT 0))
304+
'((REGULAR)
305+
(#\R . REGULAR)
306+
(#\I . ITALIC)
307+
(#\O . ITALIC)))))
307308
'REGULAR)) (IL:* IL:\; "Oblique => ITALIC")
308309
(IL:* IL:\; "Ignore others")
309310
(SETQ EXPANSION (OR (AND EXPANSION (CDR (ASSOC (CHAR-UPCASE (ELT EXPANSION 0))
@@ -822,10 +823,10 @@ FONTPROP INPUT ITALIC LIGHT LRSH MEDIUM REGULAR TCONC UTOXCODE UTOXCODE? WRITEST
822823

823824
(IL:PUTPROPS IL:READ-BDF IL:DATABASE IL:NO)
824825
(IL:DECLARE\: IL:DONTCOPY
825-
(IL:FILEMAP (NIL (2427 10386 (BDF-TO-CHARSETINFO 2427 . 10386)) (10388 16258 (BDF-TO-FONTDESCRIPTOR
826-
10388 . 16258)) (16260 19623 (GET-FAMILY-FACE-SIZE-FROM-NAME 16260 . 19623)) (19625 26436 (
827-
GLYPHS-BY-CHARSET 19625 . 26436)) (26438 27863 (PACKFILENAME.STRING 26438 . 27863)) (27865 34669 (
828-
READ-BDF 27865 . 34669)) (34671 34994 (READ-DELIMITED-LIST-FROM-STRING 34671 . 34994)) (34996 41484 (
829-
READ-GLYPH 34996 . 41484)) (41486 42227 (SPLIT-FONT-NAME 41486 . 42227)) (42229 46011 (
830-
WRITE-BDF-TO-DISPLAYFONT-FILES 42229 . 46011)))))
826+
(IL:FILEMAP (NIL (2316 10275 (BDF-TO-CHARSETINFO 2316 . 10275)) (10277 16147 (BDF-TO-FONTDESCRIPTOR
827+
10277 . 16147)) (16149 19687 (GET-FAMILY-FACE-SIZE-FROM-NAME 16149 . 19687)) (19689 26500 (
828+
GLYPHS-BY-CHARSET 19689 . 26500)) (26502 27927 (PACKFILENAME.STRING 26502 . 27927)) (27929 34733 (
829+
READ-BDF 27929 . 34733)) (34735 35058 (READ-DELIMITED-LIST-FROM-STRING 34735 . 35058)) (35060 41548 (
830+
READ-GLYPH 35060 . 41548)) (41550 42291 (SPLIT-FONT-NAME 41550 . 42291)) (42293 46075 (
831+
WRITE-BDF-TO-DISPLAYFONT-FILES 42293 . 46075)))))
831832
IL:STOP

lispusers/READ-BDF.DFASL

49 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)