MEDLEYFONTFORMAT and documentation now consistent
This commit is contained in:
Binary file not shown.
@@ -1,12 +1,12 @@
|
||||
(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
|
||||
|
||||
(FILECREATED " 4-Apr-2026 15:29:42" {WMEDLEY}<sources>MEDLEYFONTFORMAT.;301 63158
|
||||
(FILECREATED " 6-Apr-2026 09:45:18" {WMEDLEY}<sources>MEDLEYFONTFORMAT.;304 63514
|
||||
|
||||
:EDIT-BY rmk
|
||||
|
||||
:CHANGES-TO (FNS MEDLEYFONT.READ.FONT MEDLEYFONT.FILEVERSION)
|
||||
:CHANGES-TO (FNS MEDLEYFONT.GETCHARSET MEDLEYFONT.FILENAME MEDLEYFONT.READ.FONT)
|
||||
|
||||
:PREVIOUS-DATE " 1-Apr-2026 10:05:10" {WMEDLEY}<sources>MEDLEYFONTFORMAT.;299)
|
||||
:PREVIOUS-DATE " 4-Apr-2026 15:29:42" {WMEDLEY}<sources>MEDLEYFONTFORMAT.;301)
|
||||
|
||||
|
||||
(PRETTYCOMPRINT MEDLEYFONTFORMATCOMS)
|
||||
@@ -145,7 +145,8 @@
|
||||
(FULLNAME STREAM])
|
||||
|
||||
(MEDLEYFONT.GETCHARSET
|
||||
[LAMBDA (STREAM CHARSET FONT BASE) (* ; "Edited 30-Mar-2026 08:42 by rmk")
|
||||
[LAMBDA (STREAM CHARSET FONT DIRECTORY) (* ; "Edited 6-Apr-2026 09:45 by rmk")
|
||||
(* ; "Edited 30-Mar-2026 08:42 by rmk")
|
||||
(* ; "Edited 24-Mar-2026 00:04 by rmk")
|
||||
(* ; "Edited 21-Mar-2026 15:28 by rmk")
|
||||
(* ; "Edited 17-Mar-2026 11:42 by rmk")
|
||||
@@ -162,7 +163,7 @@
|
||||
(RESETLST
|
||||
(CL:UNLESS (\GETSTREAM STREAM 'INPUT T)
|
||||
(CL:WHEN (type? FONTSPEC STREAM)
|
||||
(SETQ STREAM (MEDLEYFONT.FILENAME STREAM BASE)))
|
||||
(SETQ STREAM (MEDLEYFONT.FILENAME STREAM DIRECTORY)))
|
||||
[RESETSAVE (SETQ STREAM (OPENSTREAM STREAM 'INPUT))
|
||||
`(PROGN (CLOSEF? OLDVALUE])
|
||||
(MEDLEYFONT.FILEVERSION STREAM 1)
|
||||
@@ -312,7 +313,8 @@
|
||||
(DEFINEQ
|
||||
|
||||
(MEDLEYFONT.READ.FONT
|
||||
[LAMBDA (FILE CHARSETNOS NOERROR) (* ; "Edited 4-Apr-2026 15:29 by rmk")
|
||||
[LAMBDA (FILE CHARSETS NOERROR) (* ; "Edited 6-Apr-2026 09:07 by rmk")
|
||||
(* ; "Edited 4-Apr-2026 15:29 by rmk")
|
||||
(* ; "Edited 31-Mar-2026 22:53 by rmk")
|
||||
(* ; "Edited 30-Mar-2026 12:08 by rmk")
|
||||
(* ; "Edited 26-Mar-2026 23:23 by rmk")
|
||||
@@ -332,9 +334,9 @@
|
||||
(SETQ FILE (MEDLEYFONT.FILENAME FILE))
|
||||
(if (NOT (INFILEP FILE))
|
||||
then (CL:UNLESS NOERROR (ERROR "FILE NOT FOUND" FILE))
|
||||
elseif [OR (MEMB CHARSETNOS '(NIL ALL))
|
||||
(SETQ CHARSETNOS (SORT (CHARSET.DECODE (MKLIST CHARSETNOS)
|
||||
NOERROR]
|
||||
elseif [OR (MEMB CHARSETS '(NIL ALL))
|
||||
(SETQ CHARSETS (SORT (CHARSET.DECODE (MKLIST CHARSETS)
|
||||
NOERROR]
|
||||
then (RESETLST
|
||||
(LET (STREAM FONT CSLOC MAXCHARSET) (* ;
|
||||
"CL:OPEN-FILE doesn't exist in the init")
|
||||
@@ -345,12 +347,12 @@
|
||||
(SETQ CSLOC (\FIXPIN STREAM)) (* ;
|
||||
"CSLOC here so MEDLEYFONT.GETCHARSET can skip over the font stuff.")
|
||||
(SETQ FONT (MEDLEYFONT.READ.VERIFIEDFONT STREAM))
|
||||
(for CSNO from 0 to MAXCHARSET while CHARSETNOS
|
||||
when (if (EQ CHARSETNOS 'ALL)
|
||||
elseif (EQ CSNO (CAR CHARSETNOS))
|
||||
then (pop CHARSETNOS))
|
||||
do (\SETCHARSETINFO FONT CSNO (MEDLEYFONT.GETCHARSET.INTERNAL STREAM CSNO
|
||||
FONT CSLOC)))
|
||||
(for CSNO from 0 to MAXCHARSET while CHARSETS
|
||||
when (if (EQ CHARSETS 'ALL)
|
||||
elseif (EQ CSNO (CAR CHARSETS))
|
||||
then (pop CHARSETS)) do (\SETCHARSETINFO FONT CSNO
|
||||
(MEDLEYFONT.GETCHARSET.INTERNAL
|
||||
STREAM CSNO FONT CSLOC)))
|
||||
FONT))])
|
||||
|
||||
(MEDLEYFONT.READ.CHARSET
|
||||
@@ -876,7 +878,8 @@
|
||||
(DEFINEQ
|
||||
|
||||
(MEDLEYFONT.FILENAME
|
||||
[LAMBDA (FILE DIRECTORY CHARSET) (* ; "Edited 1-Apr-2026 09:46 by rmk")
|
||||
[LAMBDA (FILE DIRECTORY EXTENSION) (* ; "Edited 6-Apr-2026 09:31 by rmk")
|
||||
(* ; "Edited 1-Apr-2026 09:46 by rmk")
|
||||
(* ; "Edited 30-Mar-2026 09:19 by rmk")
|
||||
(* ; "Edited 17-Mar-2026 10:15 by rmk")
|
||||
(* ; "Edited 2-Mar-2026 22:45 by rmk")
|
||||
@@ -886,13 +889,12 @@
|
||||
(* ; "Edited 10-Jun-2025 11:02 by rmk")
|
||||
(* ; "Edited 19-May-2025 17:42 by rmk")
|
||||
|
||||
(* ;; "Defaults to components of BASEFILE, e.g. host/directory and extension, otherwise")
|
||||
(* ;; "Defaults to components of DIRECTORY, e.g. host/directory otherwise uses FONTDIRECTORIES for defaults")
|
||||
|
||||
(LET (FONTSPEC HOST DIR EXT)
|
||||
(if (type? FONTSPEC FILE)
|
||||
then (SETQ FONTSPEC FILE)
|
||||
(SETQ FILE (\FONTFILENAME (\FONT.CHECKARGS FILE NIL NIL NIL NIL T)
|
||||
NIL NIL NIL CHARSET))
|
||||
(SETQ FILE (\FONTFILENAME (\FONT.CHECKARGS FILE NIL NIL NIL NIL T)))
|
||||
else (SETQ FONTSPEC (FONTSPECFROMFILENAME FILE)))
|
||||
[if DIRECTORY
|
||||
then (SETQ HOST (FILENAMEFIELD DIRECTORY 'HOST))
|
||||
@@ -900,7 +902,7 @@
|
||||
else [SETQ DIR (CAR (MKLIST (FONTDEVICEPROP FONTSPEC 'FONTDIRECTORIES]
|
||||
(SETQ HOST (FILENAMEFIELD DIR 'HOST]
|
||||
(PACKFILENAME 'BODY FILE 'HOST HOST 'DIRECTORY DIR 'EXTENSION
|
||||
(CAR (MKLIST (FONTDEVICEPROP FONTSPEC 'FONTEXTENSIONS])
|
||||
(OR EXTENSION (CAR (MKLIST (FONTDEVICEPROP FONTSPEC 'FONTEXTENSIONS])
|
||||
)
|
||||
|
||||
(ADDTOVAR DISPLAYFONTEXTENSIONS MEDLEYDISPLAYFONT)
|
||||
@@ -951,12 +953,12 @@
|
||||
)
|
||||
)
|
||||
(DECLARE%: DONTCOPY
|
||||
(FILEMAP (NIL (2204 19305 (MEDLEYFONT.WRITE.FONT 2214 . 8617) (MEDLEYFONT.GETCHARSET 8619 . 10553) (
|
||||
MEDLEYFONT.GETCHARSET.INTERNAL 10555 . 12292) (MEDLEYFONT.CHARSET? 12294 . 13172) (
|
||||
MEDLEYFONT.GETFILEPROP 13174 . 16238) (MEDLEYFONT.FILEP 16240 . 18668) (MEDLEYFONT.FILEVERSION 18670
|
||||
. 19303)) (19331 41011 (MEDLEYFONT.READ.FONT 19341 . 22654) (MEDLEYFONT.READ.CHARSET 22656 . 27703) (
|
||||
MEDLEYFONT.READ.ITEM 27705 . 33854) (MEDLEYFONT.PEEK.ITEM 33856 . 34718) (MEDLEYFONT.READ.FONTPROPS
|
||||
34720 . 35185) (MEDLEYFONT.READ.VERIFIEDFONT 35187 . 41009)) (41037 60387 (MEDLEYFONT.WRITE.CHARSET
|
||||
41047 . 45686) (MEDLEYFONT.WRITE.ITEM 45688 . 54741) (MEDLEYFONT.WRITE.FONTPROPS 54743 . 59512) (
|
||||
MEDLEYFONT.WRITE.HEADER 59514 . 60385)) (60388 62273 (MEDLEYFONT.FILENAME 60398 . 62271)))))
|
||||
(FILEMAP (NIL (2223 19438 (MEDLEYFONT.WRITE.FONT 2233 . 8636) (MEDLEYFONT.GETCHARSET 8638 . 10686) (
|
||||
MEDLEYFONT.GETCHARSET.INTERNAL 10688 . 12425) (MEDLEYFONT.CHARSET? 12427 . 13305) (
|
||||
MEDLEYFONT.GETFILEPROP 13307 . 16371) (MEDLEYFONT.FILEP 16373 . 18801) (MEDLEYFONT.FILEVERSION 18803
|
||||
. 19436)) (19464 41280 (MEDLEYFONT.READ.FONT 19474 . 22923) (MEDLEYFONT.READ.CHARSET 22925 . 27972) (
|
||||
MEDLEYFONT.READ.ITEM 27974 . 34123) (MEDLEYFONT.PEEK.ITEM 34125 . 34987) (MEDLEYFONT.READ.FONTPROPS
|
||||
34989 . 35454) (MEDLEYFONT.READ.VERIFIEDFONT 35456 . 41278)) (41306 60656 (MEDLEYFONT.WRITE.CHARSET
|
||||
41316 . 45955) (MEDLEYFONT.WRITE.ITEM 45957 . 55010) (MEDLEYFONT.WRITE.FONTPROPS 55012 . 59781) (
|
||||
MEDLEYFONT.WRITE.HEADER 59783 . 60654)) (60657 62629 (MEDLEYFONT.FILENAME 60667 . 62627)))))
|
||||
STOP
|
||||
|
||||
Binary file not shown.
Reference in New Issue
Block a user