Skip to content

Rmk103 font and related code updates #2216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
b4edf55
Changes for MAKEINIT loadup sequence
rmkaplan Jul 16, 2025
2c9c6c9
Move MULTI-ALIST to library, improve macro names
rmkaplan Jul 16, 2025
a31007d
New FONT AFONT plus MEDLEYFONTFORMAT
rmkaplan Jul 16, 2025
d8649ee
Two Medleyformat fonts to verify MAKEINIT
rmkaplan Jul 16, 2025
ba5db47
Set up displayfont directories and extensions
rmkaplan Jul 16, 2025
386b7c5
Add KANJICHARSETP and CHINESECHARSETP
rmkaplan Jul 16, 2025
5e98e3b
Eliminate calls to \COERCEFONTDESC, add FONTEXISTS? Imagestream funct…
rmkaplan Jul 16, 2025
a56f74a
Move BITMAPHEIGHT earlier in loadup next to BITMAPWIDTH
rmkaplan Jul 16, 2025
d132c62
Fix DISPLAY IMAGESTREAMTYPES for \SEARCHFONTFILES and FONTEXISTS?
rmkaplan Jul 16, 2025
c23aa7b
Move CHARCODEP from FONT to LLREAD, next to CHARCODE.DECODE
rmkaplan Jul 16, 2025
bd20ebd
\READBINARYBITMAP early in loadup
rmkaplan Jul 16, 2025
c608e16
Also include LLDISPLAY.LCOM
rmkaplan Jul 16, 2025
f914679
First cleanup of NSDISPLAYSIZES
rmkaplan Jul 16, 2025
b8b2108
Documentation
rmkaplan Jul 16, 2025
f93cc9e
Remove mistaken MCCS references
rmkaplan Jul 17, 2025
51d2cc6
Upload MEDLEYFONTFORMAT
rmkaplan Jul 17, 2025
a4d401f
Take MCCS out of EXPORTFILES
rmkaplan Jul 17, 2025
2a7272a
FONT-DEBUG--internal file that also didn't get pushed
rmkaplan Jul 17, 2025
e7aa3e7
Remove non-existent font from cache, add bitmapsize function
rmkaplan Jul 18, 2025
08d74c0
Merge branch 'master' into rmk103--Font-and-related-code-updates
rmkaplan Jul 23, 2025
f6c0618
Added some charsetinfo size functions
rmkaplan Jul 23, 2025
31f5309
Merge branch 'master' into rmk103--Font-and-related-code-updates
rmkaplan Jul 27, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added docs/internal/FONTCODECHANGES.tedit
Binary file not shown.
Binary file added docs/internal/MEDLEYFONTFORMAT.TEDIT
Binary file not shown.
Binary file not shown.
Binary file not shown.
352 changes: 352 additions & 0 deletions internal/FONT-DEBUG

Large diffs are not rendered by default.

Binary file added internal/FONT-DEBUG.LCOM
Binary file not shown.
51 changes: 28 additions & 23 deletions internal/loadups/LOADUP-FULL
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)

(FILECREATED "23-Apr-2025 05:14:27" {DSK}<home>larry>il>medley>internal>loadups>LOADUP-FULL.;2 4662
(FILECREATED "13-Jul-2025 11:41:03" {WMEDLEY}<internal>loadups>LOADUP-FULL.;28 5184

:EDIT-BY "lmm"
:EDIT-BY rmk

:CHANGES-TO (FNS LOADFULLFONTS)

:PREVIOUS-DATE "31-Jul-2023 18:28:53" {DSK}<home>larry>il>medley>internal>loadups>LOADUP-FULL.;1
)
:PREVIOUS-DATE "30-Jun-2025 00:04:34" {WMEDLEY}<internal>loadups>LOADUP-FULL.;27)


(PRETTYCOMPRINT LOADUP-FULLCOMS)
Expand All @@ -17,32 +16,37 @@
(DEFINEQ

(LOADFULLFONTS
[LAMBDA NIL (* ; "Edited 23-Apr-2025 05:13 by lmm")
[LAMBDA NIL (* ; "Edited 13-Jul-2025 11:40 by rmk")
(* ; "Edited 30-Jun-2025 00:04 by rmk")
(* ; "Edited 20-Jun-2025 11:16 by rmk")
(* ; "Edited 16-Jun-2025 15:34 by rmk")
(* ; "Edited 23-Apr-2025 05:13 by lmm")
(* ; "Edited 13-Feb-2021 22:51 by larry")

(* ;; " Don't do Interpress. Do character set 0 and the symbol character sets 41Q, 42Q, 356Q, 357Q and extended and accented Latin 43Q and 361Q")

(PRINTOUT T "Loading FULL fonts..." T)
(SETQ DISPLAYFONTEXTENSIONS '(DISPLAYFONT STRIKE))
(SETQ *POSTSCRIPT-FILE-TYPE* 'TEXT)
(RESETVARS ((MISSINGDISPLAYFONTCOERCIONS NIL)
(MISSINGCHARSETDISPLAYFONTCOERCIONS NIL)) (* ;
 "Don't let the font loader substitute just because a server went catatonic on us")
(for FAMILY in '(CLASSIC MODERN TERMINAL)
do (PRINTOUT T " Loading " FAMILY " ")
[for SIZE in '(8 10 12)
do (PRINTOUT T SIZE " ")
(for FACE in '(MRR BRR MIR)
do (for CSET in '(0 33 34 35 238 239 241)
do (NLSETQ (FONTCREATE FAMILY SIZE FACE NIL 'DISPLAY NIL CSET]
(PRINTOUT T T))
(PRINTOUT T " Loading postscript fonts" T)
(for F in (FILDIR (CONCAT (CAR POSTSCRIPTFONTDIRECTORIES)
">c0>*.PSCFONT")) do (PSCFONT.READFONT F))
(PRINTOUT T "FULL fonts loaded" T])

(* ;; "Previous code reset the coercion variables to NIL, which would have resulted in glyph-incomplete charsets. With Medley-formatted fonts, the completions have already been installed in the files and there is no need to deal with those variables.")

(for FAMILY in '(CLASSIC MODERN TERMINAL)
do (PRINTOUT T " Loading " FAMILY " ")
[for SIZE in '(8 10 12)
do (PRINTOUT T SIZE " ")
(for FACE in '(MRR BRR MIR)
do (FONTCREATE FAMILY SIZE FACE 0 'DISPLAY NIL 0)
(for CSET in '(33 34 35 238 239 241)
do (NLSETQ (FONTCREATE FAMILY SIZE FACE 0 'DISPLAY NIL CSET]
(PRINTOUT T T))
(PRINTOUT T " Loading postscript fonts" T)
(for F in (FILDIR (CONCAT (CAR POSTSCRIPTFONTDIRECTORIES)
">c0>*.PSCFONT")) do (PSCFONT.READFONT F))
(PRINTOUT T "FULL fonts loaded" T])

(LOADUP-FULL
[LAMBDA (DRIBBLEFILE) (* ; "Edited 18-Jan-2023 16:22 by FGH")
[LAMBDA (DRIBBLEFILE) (* ; "Edited 21-Jun-2025 23:33 by rmk")
(* ; "Edited 18-Jan-2023 16:22 by FGH")
(* ; "Edited 12-Aug-2022 11:17 by lmm")
(* ; "Edited 14-Jul-2022 12:32 by rmk")
(* ; "Edited 12-Jul-2022 21:57 by rmk")
Expand All @@ -67,6 +71,7 @@
" while connected to "
(DIRECTORYNAME T)
T T)
(LOADUP '(MULTI-ALIST)) (* ; "For FONTSAVAILABLE lookup")
(LOADUP '(POSTSCRIPTSTREAM)) (* ; " to get PSCFONT.READFONT")
(LOADFULLFONTS)
(LISTPUT IDLE.PROFILE 'TIMEOUT 0)
Expand All @@ -89,5 +94,5 @@

(FIXMETA)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (493 4624 (LOADFULLFONTS 503 . 2059) (LOADUP-FULL 2061 . 4374) (FIXMETA 4376 . 4622)))))
(FILEMAP (NIL (458 5146 (LOADFULLFONTS 468 . 2373) (LOADUP-FULL 2375 . 4896) (FIXMETA 4898 . 5144)))))
STOP
Binary file modified internal/loadups/LOADUP-FULL.LCOM
Binary file not shown.
29 changes: 18 additions & 11 deletions internal/loadups/LOADUP-LISP
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)

(FILECREATED "21-Mar-2024 10:56:13" |{DSK}<home>larry>il>medley>internal>loadups>LOADUP-LISP.;4| 5586
(FILECREATED "15-Jun-2025 14:39:57" |{WMEDLEY}<internal>loadups>LOADUP-LISP.;20| 6425

:EDIT-BY "lmm"
:EDIT-BY |rmk|

:CHANGES-TO (FNS LOADUP-LISP)

:PREVIOUS-DATE "14-Mar-2024 12:16:33"
|{DSK}<home>larry>il>medley>internal>loadups>LOADUP-LISP.;3|)
:PREVIOUS-DATE "24-May-2025 10:20:14" |{WMEDLEY}<internal>loadups>LOADUP-LISP.;14|)


(PRETTYCOMPRINT LOADUP-LISPCOMS)
Expand All @@ -20,7 +19,12 @@
(DEFINEQ

(LOADUP-LISP
(LAMBDA (DRIBBLEFILE) (* \; "Edited 21-Mar-2024 10:55 by lmm")
(LAMBDA (DRIBBLEFILE) (* \; "Edited 15-Jun-2025 14:39 by rmk")
(* \; "Edited 24-May-2025 10:20 by rmk")
(* \; "Edited 21-May-2025 09:25 by rmk")
(* \; "Edited 5-May-2025 21:25 by rmk")
(* \; "Edited 2-May-2025 22:12 by rmk")
(* \; "Edited 21-Mar-2024 10:55 by lmm")
(* \; "Edited 14-Mar-2024 12:16 by lmm")
(* \; "Edited 26-Feb-2023 12:17 by lmm")
(* \; "Edited 13-Jul-2022 14:09 by rmk")
Expand Down Expand Up @@ -61,8 +65,8 @@

(LOADUP '(STACKFNS CMLMVS MACROS MACROAUX UNWINDMACROS))
(LOADUP '(COMMON XCLC-RUNTIME CMLTYPES CL-ERROR))
(LOADUP '(AFONT EDIT WEDIT PRETTY DSPRINTDEF NEWPRINTDEF FONTPROFILE SPELLFILE PRINTFN LOADFNS
DMISC DIRECTORY SPELLFILE FILEPKG RESOURCE))
(LOADUP '(AFONT EDIT WEDIT PRETTY DSPRINTDEF NEWPRINTDEF SPELLFILE PRINTFN LOADFNS DMISC
DIRECTORY SPELLFILE FILEPKG RESOURCE))

(* |;;| "needed for makesys")

Expand All @@ -79,9 +83,12 @@
CMLENVIRONMENT CMLLOAD CMLFLOAT CMLTIME CMLRAND CMLMODULES))
(LOADUP '(PROFILE CMLEXEC EXEC-COMMANDS DEBUGGER IL-ERROR-STUFF DEBUGEDIT))
(LOADUP '(ADDARITH))
(LOADUP '(UNICODE CMLPATHNAME HPRINT AARITH ADISPLAY HLDISPLAY MENU WINDOWOBJ WINDOWSCROLL WINDOW
WINDOWICON PAINTW ATTACHEDWINDOW XXGEOM XXFILL DEXEC INSPECT DESCRIBE
CMLARRAYINSPECTOR EDITINTERFACE TTYIN))

(* |;;| "Before the MEDLEYFONT implementation, FONTPROFILE came after NEWPRINTDEF above, but the loadup failed for undiagnosed reasons. After moving it around, it appears that it must come before MENU, because it creates thw WINDOWTITLEFONT, but after HLDISPLAY. Not yet known what the HLDISPLAY dependency is. ")

(LOADUP '(UNICODE CMLPATHNAME HPRINT AARITH ADISPLAY HLDISPLAY FONTPROFILE MENU WINDOWOBJ
WINDOWSCROLL WINDOW WINDOWICON PAINTW ATTACHEDWINDOW XXGEOM XXFILL DEXEC INSPECT
DESCRIBE CMLARRAYINSPECTOR EDITINTERFACE TTYIN))
(LOADUP '(BREAK-AND-TRACE))
(LOADUP '(FASDUMP XCL-COMPILER ADVISE))

Expand Down Expand Up @@ -131,5 +138,5 @@
(GLOBALVARS MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR SYSTEMINITVARS USERRECLST)
)
(DECLARE\: DONTCOPY
(FILEMAP (NIL (673 5380 (LOADUP-LISP 683 . 5378)))))
(FILEMAP (NIL (640 6219 (LOADUP-LISP 650 . 6217)))))
STOP
Binary file modified internal/loadups/LOADUP-LISP.LCOM
Binary file not shown.
Loading