1
0
mirror of synced 2026-01-12 00:42:56 +00:00

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.
This commit is contained in:
Matt Heffron 2025-05-01 06:45:29 -07:00 committed by GitHub
parent 40e3edc291
commit 30872f62e7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 17 additions and 16 deletions

View File

@ -5,14 +5,13 @@ 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 "25-Apr-2025 10:10:08" IL:|{DSK}<home>matt>Interlisp>medley>lispusers>READ-BDF.;57| 47436
(IL:FILECREATED "30-Apr-2025 13:20:10" IL:|{DSK}<home>matt>Interlisp>medley>lispusers>READ-BDF.;61| 47500
:EDIT-BY "mth"
:CHANGES-TO (IL:FUNCTIONS WRITE-BDF-TO-DISPLAYFONT-FILES READ-BDF BDF-TO-CHARSETINFO READ-GLYPH
GET-FAMILY-FACE-SIZE-FROM-NAME SPLIT-FONT-NAME)
:CHANGES-TO (IL:FUNCTIONS GET-FAMILY-FACE-SIZE-FROM-NAME)
:PREVIOUS-DATE "23-Apr-2025 17:55:25" IL:|{DSK}<home>matt>Interlisp>medley>lispusers>READ-BDF.;54|
:PREVIOUS-DATE "25-Apr-2025 10:10:08" IL:|{DSK}<home>matt>Interlisp>medley>lispusers>READ-BDF.;60|
)
@ -282,10 +281,11 @@ FONTPROP INPUT ITALIC LIGHT LRSH MEDIUM REGULAR TCONC UTOXCODE UTOXCODE? WRITEST
:TEST
#'EQL)))))))))
(DEFUN GET-FAMILY-FACE-SIZE-FROM-NAME (BDFONT) (IL:* IL:\; "Edited 23-Apr-2025 16:20 by mth")
(DEFUN GET-FAMILY-FACE-SIZE-FROM-NAME (BDFONT) (IL:* IL:\; "Edited 30-Apr-2025 13:18 by mth")
(IL:* IL:\; "Edited 23-Apr-2025 16:20 by mth")
(IL:* IL:\; "Edited 5-Feb-2025 12:56 by mth")
(UNLESS (TYPEP BDFONT 'BDF-FONT)
(ERROR "Not a BDF-FONT: ~S~%" BDFONT))
(ERROR "Not a BDF-FONT: ~S~%" BDFONT))
(DESTRUCTURING-BIND (FOUNDRY FAMILY WEIGHT SLANT EXPANSION ADD_STYLE_NAME
PIXEL-SIZE POINT-SIZE)
(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
(#\D . BOLD)
(#\L . LIGHT)))))
'MEDIUM)) (IL:* IL:\; "DemiBold => BOLD")
(SETQ SLANT (OR (AND SLANT (CDR (ASSOC (STRING-UPCASE SLANT)
'(("R" . REGULAR)
("I" . ITALIC)
("O" . ITALIC)))))
(SETQ SLANT (OR (AND SLANT (CDR (ASSOC (CHAR-UPCASE (ELT SLANT 0))
'((REGULAR)
(#\R . REGULAR)
(#\I . ITALIC)
(#\O . ITALIC)))))
'REGULAR)) (IL:* IL:\; "Oblique => ITALIC")
(IL:* IL:\; "Ignore others")
(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
(IL:PUTPROPS IL:READ-BDF IL:DATABASE IL:NO)
(IL:DECLARE\: IL:DONTCOPY
(IL:FILEMAP (NIL (2427 10386 (BDF-TO-CHARSETINFO 2427 . 10386)) (10388 16258 (BDF-TO-FONTDESCRIPTOR
10388 . 16258)) (16260 19623 (GET-FAMILY-FACE-SIZE-FROM-NAME 16260 . 19623)) (19625 26436 (
GLYPHS-BY-CHARSET 19625 . 26436)) (26438 27863 (PACKFILENAME.STRING 26438 . 27863)) (27865 34669 (
READ-BDF 27865 . 34669)) (34671 34994 (READ-DELIMITED-LIST-FROM-STRING 34671 . 34994)) (34996 41484 (
READ-GLYPH 34996 . 41484)) (41486 42227 (SPLIT-FONT-NAME 41486 . 42227)) (42229 46011 (
WRITE-BDF-TO-DISPLAYFONT-FILES 42229 . 46011)))))
(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:STOP

Binary file not shown.