diff --git a/library/POSTSCRIPTSTREAM b/library/POSTSCRIPTSTREAM
index c715c964..39b40a82 100644
--- a/library/POSTSCRIPTSTREAM
+++ b/library/POSTSCRIPTSTREAM
@@ -1,13 +1,12 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-(FILECREATED "12-Feb-2026 12:19:03" {DSK}<home>matt>Interlisp>medley>library>POSTSCRIPTSTREAM.;6 258522 
+(FILECREATED "26-Apr-2026 11:39:26" {MEDLEY}<library>POSTSCRIPTSTREAM.;71 258340 
 
-      :EDIT-BY "mth"
+      :EDIT-BY rmk
 
-      :CHANGES-TO (FNS PSCFONT.READFONT)
+      :CHANGES-TO (VARS POSTSCRIPTSTREAMCOMS)
 
-      :PREVIOUS-DATE "27-Jan-2026 17:57:49" 
-{DSK}<home>matt>Interlisp>medley>library>POSTSCRIPTSTREAM.;5)
+      :PREVIOUS-DATE "17-Mar-2026 20:19:19" {MEDLEY}<library>POSTSCRIPTSTREAM.;67)
 
 
 (PRETTYCOMPRINT POSTSCRIPTSTREAMCOMS)
@@ -136,10 +135,7 @@
                (POSTSCRIPT.TEXTFILE.LANDSCAPE NIL)
                (POSTSCRIPT.DEFAULT.PAGEREGION '(4800 4800 52800 70800))
                (POSTSCRIPT.TEXTURE.SCALE 4)
-               [POSTSCRIPTFONTDIRECTORIES (LIST (COND ((EQ (MACHINETYPE)
-                                                           'MAIKO)
-                                                       "{dsk}/USR/LOCAL/LDE/FONTS/POSTSCRIPT/")
-                                                      (T "{DSK}<LISPFILES>POSTSCRIPT>"]
+               (POSTSCRIPTFONTDIRECTORIES (LIST "{MEDLEY}/fonts/postscriptfonts"))
                (POSTSCRIPTFONTEXTENSIONS '(PSCFONT PF PSC))
                [POSTSCRIPTFONTCOERCIONS '((HELVETICA (HELVETICA 1))
                                           (HELVETICAD (HELVETICA 1))
@@ -878,7 +874,8 @@
          FONTID])
 
 (POSTSCRIPT.FONTCREATE
-  [LAMBDA (FONTSPEC)                                         (* ; "Edited 13-Oct-2025 18:04 by rmk")
+  [LAMBDA (FONTSPEC)                                         (* ; "Edited 17-Mar-2026 16:29 by rmk")
+                                                             (* ; "Edited 13-Oct-2025 18:04 by rmk")
                                                              (* ; "Edited  7-Sep-2025 23:44 by rmk")
                                                              (* ; "Edited 30-Aug-2025 23:24 by rmk")
                                                              (* ; "Edited 21-Aug-2025 18:21 by rmk")
@@ -998,10 +995,12 @@
 
                         (COND
                            ((AND TMP (NEQ FAMILY (CAR TMP)))
-                            (replace FONTDEVICESPEC of FD with (LIST (CAR TMP)
-                                                                     SIZE
-                                                                     (COPY FACE)
-                                                                     0 DEVICE]
+                            (replace FONTDEVICESPEC of FD with (create FONTSPEC
+                                                                      FSFAMILY _ (CAR TMP)
+                                                                      FSSIZE _ SIZE
+                                                                      FSFACE _ (COPY FACE)
+                                                                      FSROTATION _ 0
+                                                                      FSDEVICE _ DEVICE]
                    [LET ((SYMWIDTHS (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 'SYMBOL FD ROTATION DEVICE)
                                 )
                          (DINGWIDTHS (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 'ZAPFDINGBATS FD ROTATION
@@ -4298,10 +4297,7 @@
 
 (RPAQ? POSTSCRIPT.TEXTURE.SCALE 4)
 
-(RPAQ? POSTSCRIPTFONTDIRECTORIES (LIST (COND ((EQ (MACHINETYPE)
-                                                  'MAIKO)
-                                              "{dsk}/USR/LOCAL/LDE/FONTS/POSTSCRIPT/")
-                                             (T "{DSK}<LISPFILES>POSTSCRIPT>"))))
+(RPAQ? POSTSCRIPTFONTDIRECTORIES (LIST "{MEDLEY}/fonts/postscriptfonts"))
 
 (RPAQ? POSTSCRIPTFONTEXTENSIONS '(PSCFONT PF PSC))
 
@@ -4393,37 +4389,37 @@
 (ADDTOVAR LAMA POSTSCRIPT.PUTCOMMAND)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (22366 32685 (POSTSCRIPT.INIT 22376 . 29291) (POSTSCRIPT.PUTRGBCOLOR 29293 . 30315) (
-\PSC.COLOR.TO.RGB 30317 . 32683)) (33671 69196 (PSCFONT.READFONT 33681 . 35692) (PSCFONT.SPELLFILE 
-35694 . 36507) (PSCFONT.COERCEFILE 36509 . 38081) (PSCFONTFROMCACHE.SPELLFILE 38083 . 39068) (
-PSCFONTFROMCACHE.COERCEFILE 39070 . 40722) (PSCFONT.WRITEFONT 40724 . 41739) (READ-AFM-FILE 41741 . 
-47612) (CONVERT-AFM-FILES 47614 . 48826) (POSTSCRIPT.GETFONTID 48828 . 50223) (POSTSCRIPT.FONTCREATE 
-50225 . 63119) (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 63121 . 65518) (POSTSCRIPT.FONTSAVAILABLE 65520
- . 67807) (POSTSCRIPT.FONTEXISTS? 67809 . 69194)) (69197 79106 (OPENPOSTSCRIPTSTREAM 69207 . 78772) (
-CLOSEPOSTSCRIPTSTREAM 78774 . 79104)) (79151 85477 (POSTSCRIPT.HARDCOPYW 79161 . 82268) (
-POSTSCRIPT.TEDIT 82270 . 82722) (POSTSCRIPTFILEP 82724 . 84212) (MAKEEPSFILE 84214 . 85475)) (85478 
-129222 (POSTSCRIPT.BITMAPSCALE 85488 . 87944) (POSTSCRIPT.CLOSESTRING 87946 . 88499) (
-POSTSCRIPT.ENDPAGE 88501 . 89392) (POSTSCRIPT.OUTSTR 89394 . 90611) (POSTSCRIPT.PUTBITMAPBYTES 90613
- . 99084) (POSTSCRIPT.PUTCOMMAND 99086 . 100075) (POSTSCRIPT.SET-FAKE-LANDSCAPE 100077 . 104597) (
-POSTSCRIPT.SHOWACCUM 104599 . 106754) (POSTSCRIPT.STARTPAGE 106756 . 109458) (\POSTSCRIPTTAB 109460 . 
-110257) (\PS.BOUTFIXP 110259 . 111539) (\PS.SCALEHACK 111541 . 114184) (\PS.SCALEREGION 114186 . 
-114746) (\SCALEDBITBLT.PSC 114748 . 119058) (\SETPOS.PSC 119060 . 119541) (\SETXFORM.PSC 119543 . 
-122127) (\STRINGWIDTH.PSC 122129 . 122602) (\SWITCHFONTS.PSC 122604 . 128096) (\TERPRI.PSC 128098 . 
-129220)) (129257 183113 (\BITBLT.PSC 129267 . 129819) (\BLTSHADE.PSC 129821 . 134482) (\CHARWIDTH.PSC 
-134484 . 134991) (\CREATECHARSET.PSC 134993 . 136349) (\DRAWARC.PSC 136351 . 138729) (\DRAWCIRCLE.PSC 
-138731 . 140982) (\DRAWCURVE.PSC 140984 . 144828) (\DRAWELLIPSE.PSC 144830 . 147194) (\DRAWLINE.PSC 
-147196 . 149936) (\DRAWPOINT.PSC 149938 . 150514) (\DRAWPOLYGON.PSC 150516 . 153645) (
-\DSPBOTTOMMARGIN.PSC 153647 . 154334) (\DSPCLIPPINGREGION.PSC 154336 . 155711) (\DSPCOLOR.PSC 155713
- . 156644) (\DSPFONT.PSC 156646 . 160283) (\DSPLEFTMARGIN.PSC 160285 . 160971) (\DSPLINEFEED.PSC 
-160973 . 161563) (\DSPPUSHSTATE.PSC 161565 . 163025) (\DSPPOPSTATE.PSC 163027 . 166512) (\DSPRESET.PSC
- 166514 . 167179) (\DSPRIGHTMARGIN.PSC 167181 . 167870) (\DSPROTATE.PSC 167872 . 168871) (
-\DSPSCALE.PSC 168873 . 169825) (\DSPSCALE2.PSC 169827 . 170667) (\DSPSPACEFACTOR.PSC 170669 . 171590) 
-(\DSPTOPMARGIN.PSC 171592 . 172163) (\DSPTRANSLATE.PSC 172165 . 174196) (\DSPXPOSITION.PSC 174198 . 
-174762) (\DSPYPOSITION.PSC 174764 . 175355) (\FILLCIRCLE.PSC 175357 . 177582) (\FILLPOLYGON.PSC 177584
- . 180821) (\FIXLINELENGTH.PSC 180823 . 182142) (\MOVETO.PSC 182144 . 182914) (\NEWPAGE.PSC 182916 . 
-183111)) (183169 205315 (\POSTSCRIPT.CHANGECHARSET 183179 . 183897) (\POSTSCRIPT.OUTCHARFN 183899 . 
-196169) (\POSTSCRIPT.PRINTSLUG 196171 . 197895) (\POSTSCRIPT.SPECIALOUTCHARFN 197897 . 200248) (
-\UPDATE.PSC 200250 . 201496) (\POSTSCRIPT.ACCENTFN 201498 . 202440) (\POSTSCRIPT.ACCENTPAIR 202442 . 
-205313)) (205413 207058 (\PSC.SPACEDISP 205423 . 205702) (\PSC.SPACEWID 205704 . 206323) (\PSC.SYMBOLS
- 206325 . 207056)) (207167 210158 (\POSTSCRIPT.NSHASH 207177 . 210156)))))
+  (FILEMAP (NIL (22081 32400 (POSTSCRIPT.INIT 22091 . 29006) (POSTSCRIPT.PUTRGBCOLOR 29008 . 30030) (
+\PSC.COLOR.TO.RGB 30032 . 32398)) (33386 69231 (PSCFONT.READFONT 33396 . 35407) (PSCFONT.SPELLFILE 
+35409 . 36222) (PSCFONT.COERCEFILE 36224 . 37796) (PSCFONTFROMCACHE.SPELLFILE 37798 . 38783) (
+PSCFONTFROMCACHE.COERCEFILE 38785 . 40437) (PSCFONT.WRITEFONT 40439 . 41454) (READ-AFM-FILE 41456 . 
+47327) (CONVERT-AFM-FILES 47329 . 48541) (POSTSCRIPT.GETFONTID 48543 . 49938) (POSTSCRIPT.FONTCREATE 
+49940 . 63154) (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 63156 . 65553) (POSTSCRIPT.FONTSAVAILABLE 65555
+ . 67842) (POSTSCRIPT.FONTEXISTS? 67844 . 69229)) (69232 79141 (OPENPOSTSCRIPTSTREAM 69242 . 78807) (
+CLOSEPOSTSCRIPTSTREAM 78809 . 79139)) (79186 85512 (POSTSCRIPT.HARDCOPYW 79196 . 82303) (
+POSTSCRIPT.TEDIT 82305 . 82757) (POSTSCRIPTFILEP 82759 . 84247) (MAKEEPSFILE 84249 . 85510)) (85513 
+129257 (POSTSCRIPT.BITMAPSCALE 85523 . 87979) (POSTSCRIPT.CLOSESTRING 87981 . 88534) (
+POSTSCRIPT.ENDPAGE 88536 . 89427) (POSTSCRIPT.OUTSTR 89429 . 90646) (POSTSCRIPT.PUTBITMAPBYTES 90648
+ . 99119) (POSTSCRIPT.PUTCOMMAND 99121 . 100110) (POSTSCRIPT.SET-FAKE-LANDSCAPE 100112 . 104632) (
+POSTSCRIPT.SHOWACCUM 104634 . 106789) (POSTSCRIPT.STARTPAGE 106791 . 109493) (\POSTSCRIPTTAB 109495 . 
+110292) (\PS.BOUTFIXP 110294 . 111574) (\PS.SCALEHACK 111576 . 114219) (\PS.SCALEREGION 114221 . 
+114781) (\SCALEDBITBLT.PSC 114783 . 119093) (\SETPOS.PSC 119095 . 119576) (\SETXFORM.PSC 119578 . 
+122162) (\STRINGWIDTH.PSC 122164 . 122637) (\SWITCHFONTS.PSC 122639 . 128131) (\TERPRI.PSC 128133 . 
+129255)) (129292 183148 (\BITBLT.PSC 129302 . 129854) (\BLTSHADE.PSC 129856 . 134517) (\CHARWIDTH.PSC 
+134519 . 135026) (\CREATECHARSET.PSC 135028 . 136384) (\DRAWARC.PSC 136386 . 138764) (\DRAWCIRCLE.PSC 
+138766 . 141017) (\DRAWCURVE.PSC 141019 . 144863) (\DRAWELLIPSE.PSC 144865 . 147229) (\DRAWLINE.PSC 
+147231 . 149971) (\DRAWPOINT.PSC 149973 . 150549) (\DRAWPOLYGON.PSC 150551 . 153680) (
+\DSPBOTTOMMARGIN.PSC 153682 . 154369) (\DSPCLIPPINGREGION.PSC 154371 . 155746) (\DSPCOLOR.PSC 155748
+ . 156679) (\DSPFONT.PSC 156681 . 160318) (\DSPLEFTMARGIN.PSC 160320 . 161006) (\DSPLINEFEED.PSC 
+161008 . 161598) (\DSPPUSHSTATE.PSC 161600 . 163060) (\DSPPOPSTATE.PSC 163062 . 166547) (\DSPRESET.PSC
+ 166549 . 167214) (\DSPRIGHTMARGIN.PSC 167216 . 167905) (\DSPROTATE.PSC 167907 . 168906) (
+\DSPSCALE.PSC 168908 . 169860) (\DSPSCALE2.PSC 169862 . 170702) (\DSPSPACEFACTOR.PSC 170704 . 171625) 
+(\DSPTOPMARGIN.PSC 171627 . 172198) (\DSPTRANSLATE.PSC 172200 . 174231) (\DSPXPOSITION.PSC 174233 . 
+174797) (\DSPYPOSITION.PSC 174799 . 175390) (\FILLCIRCLE.PSC 175392 . 177617) (\FILLPOLYGON.PSC 177619
+ . 180856) (\FIXLINELENGTH.PSC 180858 . 182177) (\MOVETO.PSC 182179 . 182949) (\NEWPAGE.PSC 182951 . 
+183146)) (183204 205350 (\POSTSCRIPT.CHANGECHARSET 183214 . 183932) (\POSTSCRIPT.OUTCHARFN 183934 . 
+196204) (\POSTSCRIPT.PRINTSLUG 196206 . 197930) (\POSTSCRIPT.SPECIALOUTCHARFN 197932 . 200283) (
+\UPDATE.PSC 200285 . 201531) (\POSTSCRIPT.ACCENTFN 201533 . 202475) (\POSTSCRIPT.ACCENTPAIR 202477 . 
+205348)) (205448 207093 (\PSC.SPACEDISP 205458 . 205737) (\PSC.SPACEWID 205739 . 206358) (\PSC.SYMBOLS
+ 206360 . 207091)) (207202 210193 (\POSTSCRIPT.NSHASH 207212 . 210191)))))
 STOP
diff --git a/library/POSTSCRIPTSTREAM.LCOM b/library/POSTSCRIPTSTREAM.LCOM
index 1778b1df..fd5b03f9 100644
Binary files a/library/POSTSCRIPTSTREAM.LCOM and b/library/POSTSCRIPTSTREAM.LCOM differ
diff --git a/library/UNICODE-TABLES b/library/UNICODE-TABLES
index 166adc52..1f275912 100644
--- a/library/UNICODE-TABLES
+++ b/library/UNICODE-TABLES
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10 :FORMAT :UTF-8)
 
-(FILECREATED "31-Mar-2026 09:01:05" {WMEDLEY}<library>UNICODE-TABLES.;22 44782  
+(FILECREATED "26-Apr-2026 10:44:13" {MEDLEY}<library>UNICODE-TABLES.;23 44829  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (VARS XCCS-CHARSETS)
+      :CHANGES-TO (VARS UNICODE-TABLESCOMS)
 
-      :PREVIOUS-DATE "22-Feb-2026 10:44:33" {WMEDLEY}<library>UNICODE-TABLES.;20)
+      :PREVIOUS-DATE "31-Mar-2026 09:01:05" {MEDLEY}<library>UNICODE-TABLES.;22)
 
 
 (PRETTYCOMPRINT UNICODE-TABLESCOMS)
@@ -16,7 +16,7 @@
         (* ;; "This is code for reading/writing the XCCS-to-UNICODE mapping tables.  It runs offline, when UNICODE-UTF8 is modified.  ")
 
         (COMS                                                (* ; "Read Unicode mapping files")
-              (INITVARS (UNICODEDIRECTORIES NIL))
+              [INITVARS (UNICODEDIRECTORIES '({MEDLEY}/unicode/xerox/]
               (GLOBALVARS UNICODEDIRECTORIES)
               (VARS XCCS-CHARSETS)
               (FNS READ-UNICODE-MAPPING-FILENAMES READ-UNICODE-MAPPING))
@@ -56,7 +56,7 @@
 (* ; "Read Unicode mapping files")
 
 
-(RPAQ? UNICODEDIRECTORIES NIL)
+(RPAQ? UNICODEDIRECTORIES '({MEDLEY}/unicode/xerox/))
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS UNICODEDIRECTORIES)
@@ -792,12 +792,12 @@
        UNICODE-EXPORTS)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3929 12651 (READ-UNICODE-MAPPING-FILENAMES 3939 . 8408) (READ-UNICODE-MAPPING 8410 . 
-12649)) (12718 19526 (MAKE-UNICODE-TRANSLATION-TABLES 12728 . 15488) (GET-MCCS-UNICODE-MAPPING 15490
- . 16510) (INVERT-UNICODE-MAPPING 16512 . 18305) (XCCSTOMCCS-MAPPING 18307 . 19524)) (19527 26150 (
-ALL-UNICODE-MAPPINGS 19537 . 24813) (XCCSJAPANESECHARSETS 24815 . 26148)) (26195 36957 (
-WRITE-UNICODE-MAPPING 26205 . 29949) (WRITE-UNICODE-INCLUDED 29951 . 34263) (
-WRITE-UNICODE-MAPPING-HEADER 34265 . 35513) (WRITE-UNICODE-MAPPING-FILENAME 35515 . 36955)) (36958 
-37634 (XCCS-UTF8-AFTER-OPEN 36968 . 37632)) (40159 42248 (UTF8HEXSTRING 40169 . 42246)) (42275 44317 (
-SHOWCHARS 42285 . 44315)))))
+  (FILEMAP (NIL (3976 12698 (READ-UNICODE-MAPPING-FILENAMES 3986 . 8455) (READ-UNICODE-MAPPING 8457 . 
+12696)) (12765 19573 (MAKE-UNICODE-TRANSLATION-TABLES 12775 . 15535) (GET-MCCS-UNICODE-MAPPING 15537
+ . 16557) (INVERT-UNICODE-MAPPING 16559 . 18352) (XCCSTOMCCS-MAPPING 18354 . 19571)) (19574 26197 (
+ALL-UNICODE-MAPPINGS 19584 . 24860) (XCCSJAPANESECHARSETS 24862 . 26195)) (26242 37004 (
+WRITE-UNICODE-MAPPING 26252 . 29996) (WRITE-UNICODE-INCLUDED 29998 . 34310) (
+WRITE-UNICODE-MAPPING-HEADER 34312 . 35560) (WRITE-UNICODE-MAPPING-FILENAME 35562 . 37002)) (37005 
+37681 (XCCS-UTF8-AFTER-OPEN 37015 . 37679)) (40206 42295 (UTF8HEXSTRING 40216 . 42293)) (42322 44364 (
+SHOWCHARS 42332 . 44362)))))
 STOP
diff --git a/library/UNICODE-TABLES.LCOM b/library/UNICODE-TABLES.LCOM
index 6819f919..26c0cfeb 100644
Binary files a/library/UNICODE-TABLES.LCOM and b/library/UNICODE-TABLES.LCOM differ
diff --git a/sources/INTERPRESS b/sources/INTERPRESS
index f2097c89..d3f976cb 100644
--- a/sources/INTERPRESS
+++ b/sources/INTERPRESS
@@ -1,10 +1,12 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-(FILECREATED "19-Jan-2026 17:21:17" {WMEDLEY}<sources>INTERPRESS.;105 215365 
+(FILECREATED "26-Apr-2026 11:31:17" {WMEDLEY}<sources>INTERPRESS.;111 215607 
 
       :EDIT-BY rmk
 
-      :PREVIOUS-DATE "24-Dec-2025 11:24:31" {WMEDLEY}<sources>INTERPRESS.;104)
+      :CHANGES-TO (VARS INTERPRESSCOMS)
+
+      :PREVIOUS-DATE "18-Mar-2026 09:45:13" {MEDLEY}<sources>INTERPRESS.;107)
 
 
 (PRETTYCOMPRINT INTERPRESSCOMS)
@@ -95,7 +97,8 @@
         (ADDVARS (INTERPRESSFONTEXTENSIONS MEDLEYINTERPRESSFONT WD))
         [COMS                                                (* ; 
                                                          "Interpress fonts; but see MEDLEY-INIT-VARS")
-              [INITVARS (INTERPRESSFONTDIRECTORIES '(fonts>medleyinterpressfonts> fonts>ipfonts>))
+              [INITVARS (INTERPRESSFONTDIRECTORIES (LIST "{MEDLEY}<fonts>medleyinterpressfonts>" 
+                                                         "{MEDLEY}<fonts>ipfonts>"))
                      (INTERPRESSPRINTWHEELFAMILIES '(BOLDPS ELITE LETTERGOTHIC MASTER PICA PSBOLD 
                                                            SCIENTIFIC SPOKESMAN TITAN TREND TRENDPS 
                                                            TROJAN VINTAGE))
@@ -3529,7 +3532,8 @@
 (* ; "Interpress fonts; but see MEDLEY-INIT-VARS")
 
 
-(RPAQ? INTERPRESSFONTDIRECTORIES '(fonts>medleyinterpressfonts> fonts>ipfonts>))
+(RPAQ? INTERPRESSFONTDIRECTORIES (LIST "{MEDLEY}<fonts>medleyinterpressfonts>" 
+                                       "{MEDLEY}<fonts>ipfonts>"))
 
 (RPAQ? INTERPRESSPRINTWHEELFAMILIES '(BOLDPS ELITE LETTERGOTHIC MASTER PICA PSBOLD SCIENTIFIC 
                                             SPOKESMAN TITAN TREND TRENDPS TROJAN VINTAGE))
@@ -3562,15 +3566,15 @@
            FONTTOMCCSFN _ (MCCSMAPFN FONTSPEC])
 
 (\CREATECHARSET.IP
-  [LAMBDA (FONTSPEC FONT CHARSET)                            (* ; "Edited  7-Sep-2025 23:23 by rmk")
+  [LAMBDA (FONTSPEC FONT CHARSET)                            (* ; "Edited 17-Mar-2026 08:58 by rmk")
+                                                             (* ; "Edited  7-Sep-2025 23:23 by rmk")
                                                              (* ; "Edited 30-Aug-2025 14:24 by rmk")
                                                              (* ; "Edited 28-Aug-2025 23:24 by rmk")
                                                              (* ; "Edited 26-Aug-2025 23:43 by rmk")
                                                              (* ; "Edited 16-Aug-2025 17:46 by rmk")
                                                              (* ; "Edited  5-Aug-2025 22:33 by rmk")
                                                              (* ; "Edited 23-Jul-2025 13:22 by rmk")
-    (OR (\READCHARSET FONTSPEC CHARSET FONT)
-        (CADR (\COERCECHARSET FONTSPEC CHARSET])
+    (\READCHARSET FONTSPEC CHARSET])
 )
 (DEFINEQ
 
@@ -3827,44 +3831,44 @@
 (LOADDEF 'BRUSH 'RECORDS 'IMAGEIO)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (16593 22245 (APPENDBYTE.IP 16603 . 16739) (APPENDIDENTIFIER.IP 16741 . 17263) (
-APPENDINT.IP 17265 . 17716) (APPENDINTEGER.IP 17718 . 18290) (APPENDLARGEVECTOR.IP 18292 . 19257) (
-APPENDNUMBER.IP 19259 . 19728) (APPENDOP.IP 19730 . 20376) (APPENDRATIONAL.IP 20378 . 20871) (
-APPENDSEQUENCEDESCRIPTOR.IP 20873 . 22068) (BYTESININT.IP 22070 . 22243)) (22281 62088 (ARCTO.IP 22291
- . 23572) (BEGINMASTER.IP 23574 . 23847) (BEGINPAGE.IP 23849 . 24205) (BEGINPREAMBLE.IP 24207 . 24578)
- (CLIPRECTANGLE.IP 24580 . 25070) (CONCAT.IP 25072 . 25337) (CONCATT.IP 25339 . 25606) (ENDMASTER.IP 
-25608 . 26052) (ENDPAGE.IP 26054 . 26431) (ENDPREAMBLE.IP 26433 . 27232) (FGET.IP 27234 . 27537) (
-FILLRECTANGLE.IP 27539 . 29867) (FILLTRAJECTORY.IP 29869 . 30504) (FILLNGON.IP 30506 . 32783) (FSET.IP
- 32785 . 33088) (GETFRAMEVAR.IP 33090 . 33408) (INITIALIZEMASTER.IP 33410 . 34011) (INITIALIZECOLOR.IP
- 34013 . 35334) (ISET.IP 35336 . 35707) (GETCP.IP 35709 . 36018) (LINETO.IP 36020 . 36625) (
-MASKSTROKE.IP 36627 . 36900) (MOVETO.IP 36902 . 37239) (ROTATE.IP 37241 . 37543) (SCALE.IP 37545 . 
-37848) (SCALE2.IP 37850 . 38187) (SETCOLOR.IP 38189 . 40418) (SETRGB.IP 40420 . 41476) (SETCOLORLV.IP 
-41478 . 46091) (SETCOLOR16.IP 46093 . 49199) (SETFONT.IP 49201 . 50022) (SETSPACE.IP 50024 . 50336) (
-SETXREL.IP 50338 . 51522) (SETX.IP 51524 . 53041) (SETXY.IP 53043 . 54215) (SETXYREL.IP 54217 . 55523)
- (SETY.IP 55525 . 56834) (SETYREL.IP 56836 . 57736) (SHOW.IP 57738 . 60998) (TRAJECTORY.IP 61000 . 
-61398) (TRANS.IP 61400 . 61739) (TRANSLATE.IP 61741 . 62086)) (62119 68209 (\CHANGE-VISIBLE-REGION.IP 
-62129 . 65790) (\PAPERSIZE.IP 65792 . 66613) (HEADINGOP.IP 66615 . 68207)) (68210 172730 (
-DEFINEFONT.IP 68220 . 69194) (FONTNAME.IP 69196 . 70126) (INTERPRESS.BITMAPSCALE 70128 . 70921) (
-INTERPRESS.OUTCHARFN 70923 . 77430) (NEWLINE.IP 77432 . 78164) (NEWPAGE.IP 78166 . 83141) (NEWPAGE?.IP
- 83143 . 83622) (OPENIPSTREAM 83624 . 91975) (SETUPFONTS.IP 91977 . 92969) (SHOWBITMAP.IP 92971 . 
-97512) (\BITMAPSIZE.IP 97514 . 98291) (SHOWBITMAP1.IP 98293 . 102665) (SHOWSHADE.IP 102667 . 103620) (
-\BITBLT.IP 103622 . 107826) (\SCALEDBITBLT.IP 107828 . 111473) (\BLTSHADE.IP 111475 . 112933) (
-\CHARWIDTH.IP 112935 . 113385) (\CLOSEIPSTREAM 113387 . 113714) (\DRAWARC.IP 113716 . 114163) (
-\DRAWCURVE.IP 114165 . 116602) (\DRAWPOINT.IP 116604 . 117641) (\DSPCOLOR.IP 117643 . 118594) (
-ENSURE.RGB 118596 . 119260) (\IPCURVE2 119262 . 132516) (\CLIPCURVELINE.IP 132518 . 137216) (
-\DRAWLINE.IP 137218 . 140950) (\CLIPLINE 140952 . 145652) (\DSPBOTTOMMARGIN.IP 145654 . 146070) (
-\DSPFONT.IP 146072 . 150832) (\DSPLEFTMARGIN.IP 150834 . 151294) (\DSPLINEFEED.IP 151296 . 151963) (
-\DSPRIGHTMARGIN.IP 151965 . 152762) (\DSPSPACEFACTOR.IP 152764 . 153893) (\DSPTOPMARGIN.IP 153895 . 
-154331) (\DSPXPOSITION.IP 154333 . 155320) (\DSPROTATE.IP 155322 . 155500) (\PUSHSTATE.IP 155502 . 
-156394) (\POPSTATE.IP 156396 . 157031) (\DEFAULTSTATE.IP 157033 . 157385) (\DSPTRANSLATE.IP 157387 . 
-157568) (\DSPSCALE2.IP 157570 . 157745) (\DSPYPOSITION.IP 157747 . 158048) (FILLCIRCLE.IP 158050 . 
-159133) (\FILLPOLYGON.IP 159135 . 160466) (\DRAWPOLYGON.IP 160468 . 166598) (\FIXLINELENGTH.IP 166600
- . 167814) (\MOVETO.IP 167816 . 168180) (\SETBRUSH.IP 168182 . 170348) (\STRINGWIDTH.IP 170350 . 
-170753) (\DSPCLIPPINGREGION.IP 170755 . 171931) (\DSPOPERATION.IP 171933 . 172728)) (172731 174630 (
-INTERPRESSFILEP 172741 . 174174) (INTERPRESS.TEDIT 174176 . 174628)) (174821 175576 (IP-TOS 174831 . 
-175091) (POP-IP-STACK 175093 . 175388) (PUSH-IP-STACK 175390 . 175574)) (175637 176561 (
-\CHANGECHARSET.IP 175647 . 176559)) (176562 180178 (\INTERPRESSINIT 176572 . 180176)) (193262 195686 (
-INTERPRESSBITMAP 193272 . 195684)) (197983 200604 (\CREATEINTERPRESSFONT 197993 . 199721) (
-\CREATECHARSET.IP 199723 . 200602)) (200605 212778 (IPFONT.FILEP 200615 . 200799) (IPFONT.GETCHARSET 
-200801 . 210899) (\FACECODE 210901 . 211491) (\FAMILYCODE 211493 . 212776)))))
+  (FILEMAP (NIL (16717 22369 (APPENDBYTE.IP 16727 . 16863) (APPENDIDENTIFIER.IP 16865 . 17387) (
+APPENDINT.IP 17389 . 17840) (APPENDINTEGER.IP 17842 . 18414) (APPENDLARGEVECTOR.IP 18416 . 19381) (
+APPENDNUMBER.IP 19383 . 19852) (APPENDOP.IP 19854 . 20500) (APPENDRATIONAL.IP 20502 . 20995) (
+APPENDSEQUENCEDESCRIPTOR.IP 20997 . 22192) (BYTESININT.IP 22194 . 22367)) (22405 62212 (ARCTO.IP 22415
+ . 23696) (BEGINMASTER.IP 23698 . 23971) (BEGINPAGE.IP 23973 . 24329) (BEGINPREAMBLE.IP 24331 . 24702)
+ (CLIPRECTANGLE.IP 24704 . 25194) (CONCAT.IP 25196 . 25461) (CONCATT.IP 25463 . 25730) (ENDMASTER.IP 
+25732 . 26176) (ENDPAGE.IP 26178 . 26555) (ENDPREAMBLE.IP 26557 . 27356) (FGET.IP 27358 . 27661) (
+FILLRECTANGLE.IP 27663 . 29991) (FILLTRAJECTORY.IP 29993 . 30628) (FILLNGON.IP 30630 . 32907) (FSET.IP
+ 32909 . 33212) (GETFRAMEVAR.IP 33214 . 33532) (INITIALIZEMASTER.IP 33534 . 34135) (INITIALIZECOLOR.IP
+ 34137 . 35458) (ISET.IP 35460 . 35831) (GETCP.IP 35833 . 36142) (LINETO.IP 36144 . 36749) (
+MASKSTROKE.IP 36751 . 37024) (MOVETO.IP 37026 . 37363) (ROTATE.IP 37365 . 37667) (SCALE.IP 37669 . 
+37972) (SCALE2.IP 37974 . 38311) (SETCOLOR.IP 38313 . 40542) (SETRGB.IP 40544 . 41600) (SETCOLORLV.IP 
+41602 . 46215) (SETCOLOR16.IP 46217 . 49323) (SETFONT.IP 49325 . 50146) (SETSPACE.IP 50148 . 50460) (
+SETXREL.IP 50462 . 51646) (SETX.IP 51648 . 53165) (SETXY.IP 53167 . 54339) (SETXYREL.IP 54341 . 55647)
+ (SETY.IP 55649 . 56958) (SETYREL.IP 56960 . 57860) (SHOW.IP 57862 . 61122) (TRAJECTORY.IP 61124 . 
+61522) (TRANS.IP 61524 . 61863) (TRANSLATE.IP 61865 . 62210)) (62243 68333 (\CHANGE-VISIBLE-REGION.IP 
+62253 . 65914) (\PAPERSIZE.IP 65916 . 66737) (HEADINGOP.IP 66739 . 68331)) (68334 172854 (
+DEFINEFONT.IP 68344 . 69318) (FONTNAME.IP 69320 . 70250) (INTERPRESS.BITMAPSCALE 70252 . 71045) (
+INTERPRESS.OUTCHARFN 71047 . 77554) (NEWLINE.IP 77556 . 78288) (NEWPAGE.IP 78290 . 83265) (NEWPAGE?.IP
+ 83267 . 83746) (OPENIPSTREAM 83748 . 92099) (SETUPFONTS.IP 92101 . 93093) (SHOWBITMAP.IP 93095 . 
+97636) (\BITMAPSIZE.IP 97638 . 98415) (SHOWBITMAP1.IP 98417 . 102789) (SHOWSHADE.IP 102791 . 103744) (
+\BITBLT.IP 103746 . 107950) (\SCALEDBITBLT.IP 107952 . 111597) (\BLTSHADE.IP 111599 . 113057) (
+\CHARWIDTH.IP 113059 . 113509) (\CLOSEIPSTREAM 113511 . 113838) (\DRAWARC.IP 113840 . 114287) (
+\DRAWCURVE.IP 114289 . 116726) (\DRAWPOINT.IP 116728 . 117765) (\DSPCOLOR.IP 117767 . 118718) (
+ENSURE.RGB 118720 . 119384) (\IPCURVE2 119386 . 132640) (\CLIPCURVELINE.IP 132642 . 137340) (
+\DRAWLINE.IP 137342 . 141074) (\CLIPLINE 141076 . 145776) (\DSPBOTTOMMARGIN.IP 145778 . 146194) (
+\DSPFONT.IP 146196 . 150956) (\DSPLEFTMARGIN.IP 150958 . 151418) (\DSPLINEFEED.IP 151420 . 152087) (
+\DSPRIGHTMARGIN.IP 152089 . 152886) (\DSPSPACEFACTOR.IP 152888 . 154017) (\DSPTOPMARGIN.IP 154019 . 
+154455) (\DSPXPOSITION.IP 154457 . 155444) (\DSPROTATE.IP 155446 . 155624) (\PUSHSTATE.IP 155626 . 
+156518) (\POPSTATE.IP 156520 . 157155) (\DEFAULTSTATE.IP 157157 . 157509) (\DSPTRANSLATE.IP 157511 . 
+157692) (\DSPSCALE2.IP 157694 . 157869) (\DSPYPOSITION.IP 157871 . 158172) (FILLCIRCLE.IP 158174 . 
+159257) (\FILLPOLYGON.IP 159259 . 160590) (\DRAWPOLYGON.IP 160592 . 166722) (\FIXLINELENGTH.IP 166724
+ . 167938) (\MOVETO.IP 167940 . 168304) (\SETBRUSH.IP 168306 . 170472) (\STRINGWIDTH.IP 170474 . 
+170877) (\DSPCLIPPINGREGION.IP 170879 . 172055) (\DSPOPERATION.IP 172057 . 172852)) (172855 174754 (
+INTERPRESSFILEP 172865 . 174298) (INTERPRESS.TEDIT 174300 . 174752)) (174945 175700 (IP-TOS 174955 . 
+175215) (POP-IP-STACK 175217 . 175512) (PUSH-IP-STACK 175514 . 175698)) (175761 176685 (
+\CHANGECHARSET.IP 175771 . 176683)) (176686 180302 (\INTERPRESSINIT 176696 . 180300)) (193386 195810 (
+INTERPRESSBITMAP 193396 . 195808)) (198173 200846 (\CREATEINTERPRESSFONT 198183 . 199911) (
+\CREATECHARSET.IP 199913 . 200844)) (200847 213020 (IPFONT.FILEP 200857 . 201041) (IPFONT.GETCHARSET 
+201043 . 211141) (\FACECODE 211143 . 211733) (\FAMILYCODE 211735 . 213018)))))
 STOP
diff --git a/sources/INTERPRESS.LCOM b/sources/INTERPRESS.LCOM
index 19d50a01..64fcee5b 100644
Binary files a/sources/INTERPRESS.LCOM and b/sources/INTERPRESS.LCOM differ
diff --git a/sources/MEDLEYDIR b/sources/MEDLEYDIR
index c5450bc3..e9a4422e 100644
--- a/sources/MEDLEYDIR
+++ b/sources/MEDLEYDIR
@@ -1,13 +1,12 @@
 (DEFINE-FILE-INFO :PACKAGE "INTERLISP" :READTABLE "INTERLISP" :BASE 10)
 
-(FILECREATED "16-Apr-2026 11:06:53" {WMEDLEY}<sources>MEDLEYDIR.;53 17488  
+(FILECREATED "26-Apr-2026 12:07:45" {GMEDLEY}<sources>MEDLEYDIR.;3 15758  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS MEDLEYDIR)
-                  (VARS MEDLEYDIRCOMS)
+      :CHANGES-TO (VARS MEDLEYDIRCOMS)
 
-      :PREVIOUS-DATE "15-Apr-2026 17:27:14" {WMEDLEY}<sources>MEDLEYDIR.;51)
+      :PREVIOUS-DATE "26-Apr-2026 11:39:05" {GMEDLEY}<sources>MEDLEYDIR.;2)
 
 
 (PRETTYCOMPRINT MEDLEYDIRCOMS)
@@ -16,14 +15,16 @@
        [
         (* ;; "set up initialization for file paths relative to where Medley is installed. This assumes that the environment variable MEDLEYDIR is set (usually by the ./run-medley script) to the (unix path) and all of the other directories variables are set relative to that (by MEDLEY-INIT-VARS)")
 
-        (P (MOVD? 'EVQ 'PSEUDOHOST))
-                                                             (* ; "For loadup")
+        
+        (* ;; "PSEUDOHOSTS comes before MEDLEYDIR in the loadup.")
+
         (FNS MEDLEY-INIT-VARS MEDLEYDIR MEDLEYSUBSTDIR SET-SYSOUT-COMMIT)
         [INITVARS (MEDLEYDIR (MEDLEYDIR))
                (\SAVE.MEDLEYDIR)
                (SYSOUTCOMMITS (OR (AND (BOUNDP 'SYSOUTCOMMITS)
                                        SYSOUTCOMMITS)
                                   (LIST (LIST 'MEDLEY NIL]
+        (P (PSEUDOHOST 'MEDLEY MEDLEYDIR))
         (ADDVARS (AROUNDEXITFNS MEDLEY-INIT-VARS))
         
         (* ;; "**WARNING**  The EVALed expressions get run early in the lodup.")
@@ -43,32 +44,19 @@
                                       (IRM.DINFOGRAPH)
                                       (DIRECTORIES (APPEND LISPUSERSDIRECTORIES LISPSOURCEDIRECTORIES
                                                           ))
-                                      (LOGINHOST/DIR (LET [(LHD (DIRECTORYNAME (OR (UNIX-GETENV
-                                                                                    "LOGINDIR")
-                                                                                   (UNIX-GETENV
-                                                                                    "HOME"]
-                                                          (AND (GETD 'PSEUDOHOSTS)
-                                                               (TARGETHOST 'LI)
-                                                               (PSEUDOHOST 'LI LHD))
-                                                          LHD)
+                                      (LOGINHOST/DIR (PSEUDOHOST 'LI (OR (UNIX-GETENV "LOGINDIR")
+                                                                         (UNIX-GETENV "HOME")))
                                              RESET)
                                       (USERGREETFILES [LIST (CONS LOGINHOST/DIR '("INIT" COM))
                                                             (CONS LOGINHOST/DIR '("INIT"]
                                              RESET)
-                                      (DISPLAYFONTDIRECTORIES (MEDLEYDIR '("fonts/medleydisplayfonts"
-                                                                           )
-                                                                     NIL NIL T))
-                                      (POSTSCRIPTFONTDIRECTORIES (MEDLEYDIR '("fonts/postscriptfonts"
-                                                                              )
-                                                                        NIL NIL T))
-                                      (INTERPRESSFONTDIRECTORIES (MEDLEYDIR '("fonts/ipfonts")
-                                                                        NIL NIL T))
-                                      (UNICODEDIRECTORIES (MEDLEYDIR '("unicode/xerox")
-                                                                 NIL NIL T))
                                       (XCL::*WHERE-IS-CASH-FILES* (MEDLEYDIR '("loadups")
                                                                          "whereis.hash" NIL T))
                                       (LOADUPSDIRECTORIES (MEDLEYDIR '("loadups")
-                                                                 NIL NIL T]
+                                                                 NIL NIL T))
+                                      (DISPLAYFONTDIRECTORIES (LIST 
+                                                                 "{MEDLEY}/fonts/medleydisplayfonts/"
+                                                                    ]
         (DECLARE%: EVAL@COMPILE DOCOPY (ADDVARS (GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS 
                                                        \SAVE.MEDLEYDIR DIRECTORIES SYSOUTCOMMITS])
 
@@ -79,11 +67,9 @@
 )
 
 
-(MOVD? 'EVQ 'PSEUDOHOST)
 
 
-
-(* ; "For loadup")
+(* ;; "PSEUDOHOSTS comes before MEDLEYDIR in the loadup.")
 
 (DEFINEQ
 
@@ -253,6 +239,8 @@
                               SYSOUTCOMMITS)
                          (LIST (LIST 'MEDLEY NIL))))
 
+(PSEUDOHOST 'MEDLEY MEDLEYDIR)
+
 (ADDTOVAR AROUNDEXITFNS MEDLEY-INIT-VARS)
 
 
@@ -276,33 +264,22 @@
          (IRM.HOST&DIR (MEDLEYDIR '"docs/dinfo"))
          (IRM.DINFOGRAPH)
          (DIRECTORIES (APPEND LISPUSERSDIRECTORIES LISPSOURCEDIRECTORIES))
-         (LOGINHOST/DIR (LET [(LHD (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR")
-                                                      (UNIX-GETENV "HOME"]
-                             (AND (GETD 'PSEUDOHOSTS)
-                                  (TARGETHOST 'LI)
-                                  (PSEUDOHOST 'LI LHD))
-                             LHD)
+         (LOGINHOST/DIR (PSEUDOHOST 'LI (OR (UNIX-GETENV "LOGINDIR")
+                                            (UNIX-GETENV "HOME")))
                 RESET)
          (USERGREETFILES [LIST (CONS LOGINHOST/DIR '("INIT" COM))
                                (CONS LOGINHOST/DIR '("INIT"]
                 RESET)
-         (DISPLAYFONTDIRECTORIES (MEDLEYDIR '("fonts/medleydisplayfonts")
-                                        NIL NIL T))
-         (POSTSCRIPTFONTDIRECTORIES (MEDLEYDIR '("fonts/postscriptfonts")
-                                           NIL NIL T))
-         (INTERPRESSFONTDIRECTORIES (MEDLEYDIR '("fonts/ipfonts")
-                                           NIL NIL T))
-         (UNICODEDIRECTORIES (MEDLEYDIR '("unicode/xerox")
-                                    NIL NIL T))
          (XCL::*WHERE-IS-CASH-FILES* (MEDLEYDIR '("loadups")
                                             "whereis.hash" NIL T))
          (LOADUPSDIRECTORIES (MEDLEYDIR '("loadups")
-                                    NIL NIL T))))
+                                    NIL NIL T))
+         (DISPLAYFONTDIRECTORIES (LIST "{MEDLEY}/fonts/medleydisplayfonts/"))))
 (DECLARE%: EVAL@COMPILE DOCOPY 
 
 (ADDTOVAR GLOBALVARS MEDLEYDIR MEDLEY-INIT-VARS \SAVE.MEDLEYDIR DIRECTORIES SYSOUTCOMMITS)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (5529 14760 (MEDLEY-INIT-VARS 5539 . 9170) (MEDLEYDIR 9172 . 13560) (MEDLEYSUBSTDIR 
-13562 . 14540) (SET-SYSOUT-COMMIT 14542 . 14758)))))
+  (FILEMAP (NIL (4385 13616 (MEDLEY-INIT-VARS 4395 . 8026) (MEDLEYDIR 8028 . 12416) (MEDLEYSUBSTDIR 
+12418 . 13396) (SET-SYSOUT-COMMIT 13398 . 13614)))))
 STOP
diff --git a/sources/MEDLEYDIR.LCOM b/sources/MEDLEYDIR.LCOM
index f7cfaf91..e9334e2b 100644
Binary files a/sources/MEDLEYDIR.LCOM and b/sources/MEDLEYDIR.LCOM differ
