diff --git a/internal/library/MULTI-COMPILE b/internal/library/MULTI-COMPILE
index cf980f09..57ad5780 100644
--- a/internal/library/MULTI-COMPILE
+++ b/internal/library/MULTI-COMPILE
@@ -1,13 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
-(FILECREATED "16-Nov-94 16:28:04" |{DSK}<lispcore>internal>library>MULTI-COMPILE.;4| 37236  
+(FILECREATED "25-Sep-2021 21:28:08" 
+|{DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>MULTI-COMPILE.;2| 37172  
 
-      |changes| |to:|  (VARS MULTI-COMPILECOMS)
-                       (FNS FIND-UNCOMPILED-FILES)
-
-      |previous| |date:| " 9-Sep-94 13:03:19" |{DSK}<lispcore>internal>library>MULTI-COMPILE.;3|)
+      |previous| |date:| "16-Nov-94 16:28:04" 
+|{DSK}<Users>kaplan>Local>medley3.5>git-medley>internal>library>MULTI-COMPILE.;1|)
 
 
-; Copyright (c) 1988, 1990, 1991, 1992, 1993, 1994 by Venue & Xerox Corporation.  All rights reserved.
+; Copyright (c) 1988, 1990-1994, 2021 by Venue & Xerox Corporation.
 
 (PRETTYCOMPRINT MULTI-COMPILECOMS)
 
@@ -601,12 +600,12 @@
 
 (ADDTOVAR LAMA FIX-FILES)
 )
-(PUTPROPS MULTI-COMPILE COPYRIGHT ("Venue & Xerox Corporation" 1988 1990 1991 1992 1993 1994))
+(PUTPROPS MULTI-COMPILE COPYRIGHT ("Venue & Xerox Corporation" 1988 1990 1991 1992 1993 1994 2021))
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (7131 8389 (FIND-UNCOMPILED-FILES 7141 . 8387)) (8461 19787 (NEWERDCOMS? 8471 . 12445) (
-NEWERSOURCES? 12447 . 16359) (SETUP-FOR-RECOMPILE 16361 . 18749) (SMASH-OPCODES 18751 . 19269) (
-GET-DIRECTORY-LISTING 19271 . 19568) (GET-OPEN-FILES 19570 . 19785)) (31690 36610 (FIX-FILES 31700 . 
-34497) (FIX-FILE 34499 . 35090) (FIX-COPYRIGHT 35092 . 35319) (FIX-FILE-COPYRIGHT 35321 . 35481) (
-QUALIFY-FIELDS 35483 . 36022) (FIX-TEDIT 36024 . 36330) (FIX-DOCS 36332 . 36608)) (36735 36917 (CLFIX 
-36745 . 36915)))))
+  (FILEMAP (NIL (2676 6156 (BIGCOMP 2676 . 6156)) (6289 7061 (FIND-ALL-SOURCE-FILES 6289 . 7061)) (7062 
+8320 (FIND-UNCOMPILED-FILES 7072 . 8318)) (8392 19718 (NEWERDCOMS? 8402 . 12376) (NEWERSOURCES? 12378
+ . 16290) (SETUP-FOR-RECOMPILE 16292 . 18680) (SMASH-OPCODES 18682 . 19200) (GET-DIRECTORY-LISTING 
+19202 . 19499) (GET-OPEN-FILES 19501 . 19716)) (31621 36541 (FIX-FILES 31631 . 34428) (FIX-FILE 34430
+ . 35021) (FIX-COPYRIGHT 35023 . 35250) (FIX-FILE-COPYRIGHT 35252 . 35412) (QUALIFY-FIELDS 35414 . 
+35953) (FIX-TEDIT 35955 . 36261) (FIX-DOCS 36263 . 36539)) (36666 36848 (CLFIX 36676 . 36846)))))
 STOP
diff --git a/sources/BOOTSTRAP b/sources/BOOTSTRAP
index 35c66e41..c81fa655 100644
--- a/sources/BOOTSTRAP
+++ b/sources/BOOTSTRAP
@@ -1,11 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "17-Aug-2021 00:08:39" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BOOTSTRAP.;58 47657  
+(FILECREATED "27-Sep-2021 10:25:31" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BOOTSTRAP.;60 47698  
 
-      changes to%:  (FNS \DO-DEFINE-FILE-INFO PRINT-READER-ENVIRONMENT)
+      changes to%:  (FNS PRINT-READER-ENVIRONMENT READ-READER-ENVIRONMENT)
 
-      previous date%: "15-Aug-2021 21:21:35" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BOOTSTRAP.;57)
+      previous date%: "17-Aug-2021 00:08:39" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>BOOTSTRAP.;58)
 
 
 (* ; "
@@ -15,14 +15,14 @@ Copyright (c) 1983-1990, 1992, 2021 by Venue & Xerox Corporation.
 (PRETTYCOMPRINT BOOTSTRAPCOMS)
 
 (RPAQQ BOOTSTRAPCOMS
-       [(COMS                                                (* ; "Some basic fns.  Note that several are redefined later.  E.g., RPAQQ et al real definitions are on UNDO")
+       [(COMS                                                (* ; "Some basic fns.  Note that several are redefined later.  E.g., RPAQQ et al real definitions are on UNDO")
               (FNS GETPROP SETATOMVAL RPAQQ RPAQ RPAQ? MOVD MOVD? SELECTQ SELECTQ1 NCONC1 PUTPROP 
                    PROPNAMES ADDPROP REMPROP MEMB CLOSEF?))
-        (COMS                                                (* ; 
-                                          "Need these in order to load even compiled files SYSLOAD")
+        (COMS                                                (* ; 
+                                          "Need these in order to load even compiled files SYSLOAD")
               (FNS LOAD \LOAD-STREAM FILECREATED FILECREATED1 PRETTYCOMPRINT BOOTSTRAP-NAMEFIELD 
                    PUTPROPS DECLARE%: DECLARE%:1 ROOTFILENAME))
-        [COMS                                                (* ; "For DEFINE-FILE-INFO")
+        [COMS                                                (* ; "For DEFINE-FILE-INFO")
               (FNS DEFINE-FILE-INFO \DO-DEFINE-FILE-INFO PRINT-READER-ENVIRONMENT 
                    READ-READER-ENVIRONMENT MAKE-DEFINE-FILE-INFO-ENV)
               (INITVARS (*DEFINE-FILE-INFO-ENV* (MAKE-DEFINE-FILE-INFO-ENV]
@@ -76,7 +76,7 @@ Copyright (c) 1983-1990, 1992, 2021 by Venue & Xerox Corporation.
                                            (AND (CCODEP 'BOOTSTRAP-NAMEFIELD)
                                                 (PUTD 'BOOTSTRAP-NAMEFIELD]
                (P (RADIX 10)))
-        (DECLARE%: DOEVAL@COMPILE DONTCOPY                   (* ; "eventually imported from FASL")
+        (DECLARE%: DOEVAL@COMPILE DONTCOPY                   (* ; "eventually imported from FASL")
                (CONSTANTS FASL:SIGNATURE))
         (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
                (ADDVARS (NLAMA DEFINE-FILE-INFO DECLARE%: PUTPROPS FILECREATED SELECTQ)
@@ -784,9 +784,9 @@ Copyright (c) 1983-1990, 1992, 2021 by Venue & Xerox Corporation.
                 REREADTABLEFORM _ READTABLEFORM])
 
 (PRINT-READER-ENVIRONMENT
-  [LAMBDA (ENV STREAM)                                  (* ; "Edited 16-Aug-2021 23:51 by rmk:")
+  [LAMBDA (ENV STREAM)                                  (* ; "Edited 27-Sep-2021 10:24 by rmk:")
 
-(* ;;; "If ENV is not the old default interlisp reader environment, writes a DEFINE-FILE-INFO expression on STREAM that will produce this environment when the file is loaded.")
+(* ;;; "If ENV is not the old default interlisp reader environment, writes a DEFINE-FILE-INFO expression on STREAM that will produce this environment when the file is loaded.")
 
     (CL:UNLESS (EQUAL-READER-ENVIRONMENT ENV *OLD-INTERLISP-READ-ENVIRONMENT*)
         (LET ((*PACKAGE* *INTERLISP-PACKAGE*)
@@ -807,14 +807,15 @@ Copyright (c) 1983-1990, 1992, 2021 by Venue & Xerox Corporation.
                             ,@(CL:UNLESS (EQ :XCCS (FETCH REFORMAT OF ENV))
                                   `(:FORMAT ,(FETCH REFORMAT OF ENV)))]
                     STREAM
-                    (FETCH (READER-ENVIRONMENT REREADTABLE) OF *DEFINE-FILE-INFO-ENV*))))])
+                    (FETCH (READER-ENVIRONMENT REREADTABLE) OF *DEFINE-FILE-INFO-ENV*))
+             (TERPRI STREAM)))])
 
 (READ-READER-ENVIRONMENT
-  [LAMBDA (STREAM DEFAULTENV RETURNFORM)                (* ; "Edited 30-Jul-2021 09:58 by rmk:")
+  [LAMBDA (STREAM DEFAULTENV RETURNFORM)                (* ; "Edited 26-Sep-2021 23:31 by rmk:")
 
-    (* ;; "Starting environment is the old interlisp file, just for the seprchar scans.")
+    (* ;; "Starting environment is the old interlisp file, just for the seprchar scans.")
 
-    (* ;; "RETURNFORM=T means return the DEFINE-FILE-INFO as a second value, for READFILE")
+    (* ;; "RETURNFORM=T means return the DEFINE-FILE-INFO as a second value, for READFILE")
 
     (CL:UNLESS DEFAULTENV (SETQ DEFAULTENV *OLD-INTERLISP-READ-ENVIRONMENT*))
     (LET ((START (GETFILEPTR STREAM))
@@ -825,32 +826,32 @@ Copyright (c) 1983-1990, 1992, 2021 by Venue & Xerox Corporation.
                               )))
          (DECLARE (SPECVARS *READTABLE*))
          (SELCHARQ (SKIPSEPRCODES STREAM)
-              (";"                                           (* ; "Assume it's a common lisp file")
+              (";"                                           (* ; "Assume it's a common lisp file")
                    (\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT REFORMAT) OF 
                                                                        *COMMON-LISP-READ-ENVIRONMENT*
                                                   ))
                    *COMMON-LISP-READ-ENVIRONMENT*)
               ("(" (\EXTERNALFORMAT STREAM (FETCH (READER-ENVIRONMENT REFORMAT) OF 
                                                                                *DEFINE-FILE-INFO-ENV*
-                                                  ))         (* ; 
-                                                           "Should we reset the format if we fail?")
+                                                  ))         (* ; 
+                                                           "Should we reset the format if we fail?")
                    (READCCODE STREAM)
                    (WITH-READER-ENVIRONMENT *DEFINE-FILE-INFO-ENV*
-                       (IF (EQ 'DEFINE-FILE-INFO (RATOM STREAM))
+                       (IF (STREQUAL "DEFINE-FILE-INFO" (RSTRING STREAM))
                            THEN 
 
-                                 (* ;; 
-      "After the \DO-DEFINE-FILE-INFO, we have the new environment and we have set the new format.")
+                                 (* ;; 
+      "After the \DO-DEFINE-FILE-INFO, we have the new environment and we have set the new format.")
 
                                  [SETQ ENV (\DO-DEFINE-FILE-INFO STREAM (SETQ ARGS
                                                                              (CL:READ-DELIMITED-LIST
                                                                               (CHARCODE ")")
                                                                               STREAM]
-                         ELSE                            (* ; "Hope we are RANDACCESSP")
+                         ELSE                            (* ; "Hope we are RANDACCESSP")
                                (SETFILEPTR STREAM START))
 
-                       (* ;; 
-                 "If we didn't see ARGS, then we didn't see a DEFINE-FILE-INFO, no form to return.")
+                       (* ;; 
+                 "If we didn't see ARGS, then we didn't see a DEFINE-FILE-INFO, no form to return.")
 
                        (CL:IF (AND RETURNFORM ARGS)
                            (CL:VALUES ENV (CONS 'DEFINE-FILE-INFO ARGS))
@@ -981,13 +982,13 @@ Copyright (c) 1983-1990, 1992, 2021 by Venue & Xerox Corporation.
 (PUTPROPS BOOTSTRAP COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 
 1992 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4748 14420 (GETPROP 4758 . 5330) (SETATOMVAL 5332 . 5461) (RPAQQ 5463 . 5516) (RPAQ 
-5518 . 5830) (RPAQ? 5832 . 6202) (MOVD 6204 . 8068) (MOVD? 8070 . 8500) (SELECTQ 8502 . 8689) (
-SELECTQ1 8691 . 9033) (NCONC1 9035 . 9231) (PUTPROP 9233 . 10717) (PROPNAMES 10719 . 10910) (ADDPROP 
-10912 . 12975) (REMPROP 12977 . 13831) (MEMB 13833 . 14092) (CLOSEF? 14094 . 14418)) (14493 35057 (
-LOAD 14503 . 15672) (\LOAD-STREAM 15674 . 28748) (FILECREATED 28750 . 30168) (FILECREATED1 30170 . 
-31278) (PRETTYCOMPRINT 31280 . 31765) (BOOTSTRAP-NAMEFIELD 31767 . 32727) (PUTPROPS 32729 . 33097) (
-DECLARE%: 33099 . 33231) (DECLARE%:1 33233 . 34105) (ROOTFILENAME 34107 . 35055)) (35095 45489 (
-DEFINE-FILE-INFO 35105 . 35540) (\DO-DEFINE-FILE-INFO 35542 . 39888) (PRINT-READER-ENVIRONMENT 39890
- . 41443) (READ-READER-ENVIRONMENT 41445 . 44211) (MAKE-DEFINE-FILE-INFO-ENV 44213 . 45487)))))
+  (FILEMAP (NIL (4751 14423 (GETPROP 4761 . 5333) (SETATOMVAL 5335 . 5464) (RPAQQ 5466 . 5519) (RPAQ 
+5521 . 5833) (RPAQ? 5835 . 6205) (MOVD 6207 . 8071) (MOVD? 8073 . 8503) (SELECTQ 8505 . 8692) (
+SELECTQ1 8694 . 9036) (NCONC1 9038 . 9234) (PUTPROP 9236 . 10720) (PROPNAMES 10722 . 10913) (ADDPROP 
+10915 . 12978) (REMPROP 12980 . 13834) (MEMB 13836 . 14095) (CLOSEF? 14097 . 14421)) (14496 35060 (
+LOAD 14506 . 15675) (\LOAD-STREAM 15677 . 28751) (FILECREATED 28753 . 30171) (FILECREATED1 30173 . 
+31281) (PRETTYCOMPRINT 31283 . 31768) (BOOTSTRAP-NAMEFIELD 31770 . 32730) (PUTPROPS 32732 . 33100) (
+DECLARE%: 33102 . 33234) (DECLARE%:1 33236 . 34108) (ROOTFILENAME 34110 . 35058)) (35098 45530 (
+DEFINE-FILE-INFO 35108 . 35543) (\DO-DEFINE-FILE-INFO 35545 . 39891) (PRINT-READER-ENVIRONMENT 39893
+ . 41475) (READ-READER-ENVIRONMENT 41477 . 44252) (MAKE-DEFINE-FILE-INFO-ENV 44254 . 45528)))))
 STOP
diff --git a/sources/BOOTSTRAP.LCOM b/sources/BOOTSTRAP.LCOM
index e93e61bb..a431b0c7 100644
Binary files a/sources/BOOTSTRAP.LCOM and b/sources/BOOTSTRAP.LCOM differ
diff --git a/sources/EXTERNALFORMAT b/sources/EXTERNALFORMAT
new file mode 100644
index 00000000..f1b7402f
--- /dev/null
+++ b/sources/EXTERNALFORMAT
@@ -0,0 +1,604 @@
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(FILECREATED "19-Sep-2021 08:59:42" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>EXTERNALFORMAT.;16 31868  
+
+      changes to%:  (VARS EXTERNALFORMATCOMS)
+
+      previous date%: "11-Sep-2021 09:44:04" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>EXTERNALFORMAT.;15)
+
+
+(PRETTYCOMPRINT EXTERNALFORMATCOMS)
+
+(RPAQQ EXTERNALFORMATCOMS
+       [(COMS                                                (* ; 
+                          "EXTERNALFORMAT declaration and related functions (originally on FILEIO)")
+              (DECLARE%: DOEVAL@COMPILE DONTCOPY (EXPORT (RECORDS EXTERNALFORMAT)))
+              (INITRECORDS EXTERNALFORMAT)
+              (SYSRECORDS EXTERNALFORMAT)
+              (FNS \EXTERNALFORMAT MAKE-EXTERNALFORMAT)
+              (FNS \INSTALL.EXTERNALFORMAT \REMOVE.EXTERNALFORMAT FIND-FORMAT)
+              (GLOBALVARS *EXTERNALFORMATS* *DEFAULT-EXTERNALFORMATS* *DEFAULT-EXTERNALFORMAT*)
+              (INITVARS (*EXTERNALFORMATS* NIL)
+                     [*DEFAULT-EXTERNALFORMATS* '((DSK :XCCS]
+                     (*DEFAULT-EXTERNALFORMAT* :XCCS)))
+        [COMS 
+              (* ;; "Generic functions not compiled open (originally on LLREAD)")
+
+              (FNS \OUTCHAR \INCCODE \BACKCCODE \BACKCCODE.EOLC \PEEKCCODE \PEEKCCODE.NOEOLC 
+                   \INCCODE.EOLC \FORMATBYTESTREAM \CHECKEOLC.CRLF)
+              (DECLARE%: DOEVAL@COMPILE DONTCOPY (EXPORT (MACROS \CHECKEOLC]
+        (COMS 
+              (* ;; "Also from FILEIO, but not clear that this is or ever has been used.")
+
+              (FNS \CREATE.THROUGH.EXTERNALFORMAT \THROUGHIN \THROUGHBACKCCODE \THROUGHOUTCHARFN)
+              (DECLARE%: DONTEVAL@LOAD DOCOPY (P (\CREATE.THROUGH.EXTERNALFORMAT])
+
+
+
+(* ; "EXTERNALFORMAT declaration and related functions (originally on FILEIO)")
+
+(DECLARE%: DOEVAL@COMPILE DONTCOPY 
+(* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE
+
+(DATATYPE EXTERNALFORMAT ((EOLVALID FLAG)                (* ; "If true, the value of EOL field will replace the EOLCONVENTION field of the resulted stream. (Can't test EOL because it is always something)")
+                              (EOL BITS 2)
+                              (UNSTABLE FLAG)                (* ; "T if (like XCCS runcodes) the byte encoding of a given character can change by other signals in the file, NIL if every charactercode has a single byte encoding (like UTF-8). ")
+                              (INCCODEFN POINTER)            (* ; 
+                       "Called with STREAM and 2 optional arguments, BYTECOUNTVAR and BYTECOUNTVAL")
+                              (PEEKCCODEFN POINTER)          (* ; 
+                                          "Called with three arguments -- STREAM, NOERROR, and EOL")
+                              (BACKCCODEFN POINTER)          (* ; 
+                                    "Called with STREAM and optional BYTECOUNTVAR and BYTECOUNTVAL")
+                              (OUTCHARFN POINTER)            (* ; 
+                                                 "Called with two arguments -- STREAM and CHARCODE")
+                              (NAME POINTER)                 (* ; 
+                                 "keyword name of this format, provided to \INSTALL.EXTERNALFORMAT")
+                              (FORMATBYTESTREAMFN POINTER)   (* ; "Function to copy the format state of a given stream to an IO stream that allows formatted byte sequences to be examined")
+                              (EF1 POINTER)                  (* ; 
+    "Extra fields for use of particular formats.  Possibly to hold standardized translation tables")
+                              (EF2 POINTER)))
+)
+
+(/DECLAREDATATYPE 'EXTERNALFORMAT '(FLAG (BITS 2)
+                                         FLAG POINTER POINTER POINTER POINTER POINTER POINTER POINTER
+                                         POINTER)
+       '((EXTERNALFORMAT 0 (FLAGBITS . 0))
+         (EXTERNALFORMAT 0 (BITS . 17))
+         (EXTERNALFORMAT 0 (FLAGBITS . 48))
+         (EXTERNALFORMAT 0 POINTER)
+         (EXTERNALFORMAT 2 POINTER)
+         (EXTERNALFORMAT 4 POINTER)
+         (EXTERNALFORMAT 6 POINTER)
+         (EXTERNALFORMAT 8 POINTER)
+         (EXTERNALFORMAT 10 POINTER)
+         (EXTERNALFORMAT 12 POINTER)
+         (EXTERNALFORMAT 14 POINTER))
+       '16)
+
+(* "END EXPORTED DEFINITIONS")
+
+)
+
+(/DECLAREDATATYPE 'EXTERNALFORMAT '(FLAG (BITS 2)
+                                         FLAG POINTER POINTER POINTER POINTER POINTER POINTER POINTER
+                                         POINTER)
+       '((EXTERNALFORMAT 0 (FLAGBITS . 0))
+         (EXTERNALFORMAT 0 (BITS . 17))
+         (EXTERNALFORMAT 0 (FLAGBITS . 48))
+         (EXTERNALFORMAT 0 POINTER)
+         (EXTERNALFORMAT 2 POINTER)
+         (EXTERNALFORMAT 4 POINTER)
+         (EXTERNALFORMAT 6 POINTER)
+         (EXTERNALFORMAT 8 POINTER)
+         (EXTERNALFORMAT 10 POINTER)
+         (EXTERNALFORMAT 12 POINTER)
+         (EXTERNALFORMAT 14 POINTER))
+       '16)
+(ADDTOVAR SYSTEMRECLST
+
+(DATATYPE EXTERNALFORMAT ((EOLVALID FLAG)
+                              (EOL BITS 2)
+                              (UNSTABLE FLAG)
+                              (INCCODEFN POINTER)
+                              (PEEKCCODEFN POINTER)
+                              (BACKCCODEFN POINTER)
+                              (OUTCHARFN POINTER)
+                              (NAME POINTER)
+                              (FORMATBYTESTREAMFN POINTER)
+                              (EF1 POINTER)
+                              (EF2 POINTER)))
+)
+(DEFINEQ
+
+(\EXTERNALFORMAT
+  [LAMBDA (STREAM NEWFORMAT/NAME)                       (* ; "Edited 10-Sep-2021 20:44 by rmk:")
+                                                             (* ; "Edited 26-Feb-91 13:20 by nm")
+
+(* ;;; ";;; RMK July 2020:  Added interface for per-device default external format.  \DO.PARAMS.AT.OPEN will make that call even if it is not specified from the open. STREAMPROP is fixed to call \EXTERNALFORMAT to set the property EXTERNALFORMAT, to export a user-level way of manipulating this.")
+
+(* ;;; "")
+
+(* ;;; "If NEWFORMAT/NAME is nil, just returns the current external format name of STREAM.  If NEWFORMAT/NAME is supplied and it is or names an external format, then the external format of STREAM is set to that format.")
+
+(* ;;; "")
+
+(* ;;; ":DEFAULT means the default external format for STREAM's filedevice")
+
+(* ;;; "The all-device default is in *DEFAULT-EXTERNALFORMAT* or the DEFAULTEXTERNALFORMAT field of the file device.  The list currently has priority since that makes it easier for a user without EXPORTS.ALL to systematically override. That may or may not be a useful capability.  ")
+
+    (\DTEST STREAM 'STREAM)
+    (SETQ SAVEDNAME (fetch DEVICENAME of (fetch DEVICE of STREAM)))
+    (SETQ SAVEDDEFAULTFORMATNAME (fetch (FDEV DEFAULTEXTERNALFORMAT) of (fetch DEVICE
+                                                                                   of STREAM)))
+    (SETQ FOUNDFORMAT (FIND-FORMAT SAVEDDEFAULTFORMATNAME T))
+    (CL:WHEN NEWFORMAT/NAME
+        (CL:WHEN (type? READER-ENVIRONMENT NEWFORMAT/NAME)
+            (SETQ NEWFORMAT/NAME (fetch (READER-ENVIRONMENT REFORMAT) of NEWFORMAT/NAME)))
+        [LET (EXTFORMAT)
+             [COND
+                ((type? EXTERNALFORMAT NEWFORMAT/NAME)
+                 (SETQ EXTFORMAT NEWFORMAT/NAME))
+                (T (CL:WHEN (EQ NEWFORMAT/NAME :DEFAULT)
+                       (SETQ NEWFORMAT/NAME (OR (CADR (ASSOC (fetch DEVICENAME
+                                                                of (fetch DEVICE of
+                                                                                         STREAM))
+                                                             *DEFAULT-EXTERNALFORMATS*))
+                                                (fetch (FDEV DEFAULTEXTERNALFORMAT)
+                                                   of (fetch DEVICE of STREAM))
+                                                *DEFAULT-EXTERNALFORMAT*)))
+                   (SETQ EXTFORMAT (FIND-FORMAT NEWFORMAT/NAME))
+                   (CL:UNLESS EXTFORMAT (ERROR NEWFORMAT/NAME 
+                                               "is not a registered external format name"))
+                   (CL:UNLESS (type? EXTERNALFORMAT EXTFORMAT)
+                          (ERROR "INVALID EXTERNALFORMAT " EXTFORMAT]
+             (UNINTERRUPTABLY
+                 (freplace (STREAM EXTERNALFORMAT) of STREAM with EXTFORMAT)
+                 (CL:WHEN (ffetch (EXTERNALFORMAT EOLVALID) of EXTFORMAT)
+                     (freplace (STREAM EOLCONVENTION) of STREAM with (ffetch
+                                                                                  (EXTERNALFORMAT
+                                                                                   EOL) of 
+                                                                                            EXTFORMAT
+                                                                                  )))
+                 (freplace (STREAM OUTCHARFN) of STREAM with (ffetch (EXTERNALFORMAT
+                                                                                      OUTCHARFN)
+                                                                            of EXTFORMAT))
+                 (freplace (STREAM INCCODEFN) of STREAM with (ffetch (EXTERNALFORMAT
+                                                                                      INCCODEFN)
+                                                                            of EXTFORMAT))
+                 (freplace (STREAM PEEKCCODEFN) of STREAM with (ffetch (
+                                                                                       EXTERNALFORMAT
+                                                                                        PEEKCCODEFN)
+                                                                              of EXTFORMAT))
+                 (freplace (STREAM BACKCCODEFN) of STREAM with (ffetch (
+                                                                                       EXTERNALFORMAT
+                                                                                        BACKCCODEFN)
+                                                                              of EXTFORMAT)))])
+    (ffetch (EXTERNALFORMAT NAME) of (fetch (STREAM EXTERNALFORMAT) of STREAM])
+
+(MAKE-EXTERNALFORMAT
+  [LAMBDA (NAME INCCODEFN PEEKCCODEFN BACKCCODEFN OUTCHARFN FORMATBYTESTREAMFN EOL UNSTABLE)
+                                                            (* ; "Edited 10-Sep-2021 19:47 by rmk:")
+
+    (* ;; "Compiled creator for EXTERNALFORMAT so that declaration (EXPORTS.ALL) is not needed.  If EOL is not specified, then EOLVALID is also NIL")
+
+    (SETQ EOL (SELECTC EOL
+                  ((LIST 'LF LF.EOLC) 
+                       LF.EOLC)
+                  ((LIST 'CR CR.EOLC) 
+                       CR.EOLC)
+                  ((LIST 'CRLF CRLF.EOLC) 
+                       CRLF.EOLC)
+                  (NIL)
+                  (SHOULDNT)))
+    (\INSTALL.EXTERNALFORMAT (CREATE EXTERNALFORMAT
+                                        NAME _ NAME
+                                        INCCODEFN _ INCCODEFN
+                                        PEEKCCODEFN _ PEEKCCODEFN
+                                        BACKCCODEFN _ BACKCCODEFN
+                                        OUTCHARFN _ OUTCHARFN
+                                        FORMATBYTESTREAMFN _ FORMATBYTESTREAMFN
+                                        EOLVALID _ EOL
+                                        EOL _ (OR EOL LF.EOLC)
+                                        UNSTABLE _ UNSTABLE])
+)
+(DEFINEQ
+
+(\INSTALL.EXTERNALFORMAT
+  [LAMBDA (EXTFORMAT/NAME EXTERNALFORMAT)               (* ; "Edited  5-Aug-2021 14:22 by rmk:")
+
+(* ;;; "Register an instance of the datatype EXTERNALFORMAT.")
+
+(* ;;; "For backward compatibility, the first argument can be a NAME with the second argument being the format.  If so, the NAME must match the name inside the format")
+
+    (LET (NAME)
+         (IF EXTERNALFORMAT
+             THEN 
+
+                   (* ;; "Backwards compatibility")
+
+                   (SETQ NAME (MKATOM EXTFORMAT/NAME))
+                   (IF (EQ NAME (FETCH (EXTERNALFORMAT NAME) OF EXTERNALFORMAT))
+                     ELSEIF (FETCH (EXTERNALFORMAT NAME) OF EXTERNALFORMAT)
+                       THEN (ERROR "Mismatch of specified name and name of the external format")
+                     ELSE (REPLACE (EXTERNALFORMAT NAME) OF EXTERNALFORMAT WITH
+                                                                                       NAME))
+           ELSE (SETQ EXTERNALFORMAT EXTFORMAT/NAME)
+                 (SETQ NAME (FETCH (EXTERNALFORMAT NAME) OF EXTERNALFORMAT)))
+         (IF (type? EXTERNALFORMAT EXTERNALFORMAT)
+             THEN (\REMOVE.EXTERNALFORMAT NAME)
+                   (push *EXTERNALFORMATS* EXTERNALFORMAT)
+           ELSE (ERROR "INVALID EXTERNALFORMAT " EXTERNALFORMAT))
+         EXTERNALFORMAT])
+
+(\REMOVE.EXTERNALFORMAT
+  [LAMBDA (NAME/EXTFORMAT)                              (* ; "Edited  5-May-2021 15:42 by rmk:")
+
+(* ;;; "Deregisters external format EXTERNALFORMAT .")
+
+    (SETQ NAME/EXTFORMAT (IF (TYPE? EXTERNALFORMAT NAME/EXTFORMAT)
+                             THEN (FETCH (EXTERNALFORMAT NAME) OF NAME/EXTFORMAT)
+                           ELSE (MKATOM NAME/EXTFORMAT)))
+    (SETQ *EXTERNALFORMATS* (DREMOVE (FIND EF IN *EXTERNALFORMATS*
+                                        SUCHTHAT (EQ NAME/EXTFORMAT (FETCH (EXTERNALFORMAT
+                                                                                    NAME)
+                                                                           OF EF)))
+                                   *EXTERNALFORMATS*])
+
+(FIND-FORMAT
+  [LAMBDA (NAME NOERROR)                                (* ; "Edited  7-Aug-2021 09:29 by rmk:")
+    (IF (TYPE? EXTERNALFORMAT NAME)
+        THEN NAME
+      ELSE (SETQ NAME (MKATOM NAME))                     (* ; 
+     "The EQMEMB allows for synonyms, the first of which should be canonical.  E.g. (:UTF-8 :UTF8)")
+            (OR (FIND EF IN *EXTERNALFORMATS* SUCHTHAT (EQ NAME (FETCH (
+                                                                                       EXTERNALFORMAT
+                                                                                        NAME)
+                                                                               OF EF)))
+                (CL:UNLESS NOERROR (ERROR NAME "is not an external format"])
+)
+(DECLARE%: DOEVAL@COMPILE DONTCOPY
+
+(GLOBALVARS *EXTERNALFORMATS* *DEFAULT-EXTERNALFORMATS* *DEFAULT-EXTERNALFORMAT*)
+)
+
+(RPAQ? *EXTERNALFORMATS* NIL)
+
+(RPAQ? *DEFAULT-EXTERNALFORMATS* '((DSK :XCCS)))
+
+(RPAQ? *DEFAULT-EXTERNALFORMAT* :XCCS)
+
+
+
+(* ;; "Generic functions not compiled open (originally on LLREAD)")
+
+(DEFINEQ
+
+(\OUTCHAR
+  [LAMBDA (STREAM CODE)                                 (* ; "Edited 10-Aug-2021 10:29 by rmk:")
+
+    (* ;; "We can't do the EOL stuff here because we don't know whether BOUTs are legit.")
+
+    (* ;; "Maybe the implementation function does something else, like move the X and Y positions.  At best we could convert the EOL into either CR or LF, or into a CR-LF sequence that we pass by two calls to the lower implementation function.")
+
+    (* ;; "")
+
+    (* ;; "This would make CHARPOSITION generic:")
+                                                             (* (FREPLACE (STREAM CHARPOSITION) 
+                                                           OF STREAM WITH (CL:IF
+                                                           (EQ CODE (CHARCODE EOL)) 0
+                                                           (IPLUS16 1 (FFETCH
+                                                           (STREAM CHARPOSITION) OF STREAM)))))
+    (CL:FUNCALL (OR (ffetch (STREAM OUTCHARFN) of STREAM)
+                    \DEFAULTOUTCHAR)
+           STREAM CODE)
+    CODE])
+
+(\INCCODE
+  [LAMBDA (STREAM BYTECOUNTVAR BYTECOUNTVAL)            (* ; "Edited  7-Aug-2021 00:11 by rmk:")
+
+    (* ;; "Calling functions pass the name of the BYTECOUNTVAR, or NIL. If non-NIL, implementing functions are required to SETQ *BYTECOUNTER* to the number of bytes read (positive) or backed up (negative).")
+
+    (* ;; "Caller must bind BYTECOUNTVAR as a SPECVAR.  BYTECOUNTVAL can be passed as the current value of BYTECOUNTVAR, to save a call to \EVALV1.")
+
+    (IF BYTECOUNTVAR
+        THEN [LET ((*BYTECOUNTER* 0))
+                      (DECLARE (SPECVARS *BYTECOUNTER*))
+                      (PROG1 (CL:FUNCALL (OR (ffetch (STREAM INCCODEFN) of STREAM)
+                                             \DEFAULTINCCODE)
+                                    STREAM
+                                    '*BYTECOUNTER*)
+                          (SET BYTECOUNTVAR (IDIFFERENCE (OR BYTECOUNTVAL (\EVALV1 BYTECOUNTVAR))
+                                                   *BYTECOUNTER*)))]
+      ELSE (CL:FUNCALL (OR (ffetch (STREAM INCCODEFN) of STREAM)
+                               \DEFAULTINCCODE)
+                      STREAM])
+
+(\BACKCCODE
+  [LAMBDA (STREAM BYTECOUNTVAR BYTECOUNTVAL)            (* ; "Edited 14-Aug-2021 00:26 by rmk:")
+
+    (* ;; 
+"Format function returns T if the backup succeed, NIL otherwise (e.g at the beginning of the file)")
+
+    (IF BYTECOUNTVAR
+        THEN [LET ((*BYTECOUNTER* 0))
+                      (DECLARE (SPECVARS *BYTECOUNTER*))
+                      (PROG1 (CL:FUNCALL (OR (ffetch (STREAM BACKCCODEFN) of STREAM)
+                                             \DEFAULTBACKCCODE)
+                                    STREAM T)
+                          (SET BYTECOUNTVAR (IPLUS (OR BYTECOUNTVAL (\EVALV1 BYTECOUNTVAR))
+                                                   *BYTECOUNTER*)))]
+      ELSE (CL:FUNCALL (OR (ffetch (STREAM BACKCCODEFN) of STREAM)
+                               \DEFAULTBACKCCODE)
+                      STREAM])
+
+(\BACKCCODE.EOLC
+  [LAMBDA (STREAM BYTECOUNTVAR BYTECOUNTVAL)            (* ; "Edited 14-Aug-2021 00:27 by rmk:")
+
+    (* ;; "If the EOLCONVENTION is CRLF, and the first backup is over an LF encoding, this looks to see whether the preceding bytes encode a CR and if so, backs up over those.")
+
+    (* ;; "Within this we operate at the external-format implementation level.")
+
+    (* ;; "Counting is unusual in general (mostly just COPYCHARS and PFCOPYBYTES) , and counting while backing up is even rarer.  So for simplicity here we just count by looking at the byte pointer.")
+
+    (LET [(STARTPOS (CL:WHEN BYTECOUNTVAR (\GETFILEPTR STREAM]
+
+         (* ;; "In almost all cases, we just execute the first backup")
+
+         (PROG1 (CL:WHEN (CL:FUNCALL (OR (ffetch (STREAM BACKCCODEFN) of STREAM)
+                                         \DEFAULTBACKCCODE)
+                                STREAM)
+                    (IF (AND (EQ CRLF.EOLC (FETCH (STREAM EOLCONVENTION) OF STREAM))
+                                 (EQ (CHARCODE LF)
+                                     (CL:FUNCALL (OR (ffetch (STREAM PEEKCCODEFN) of STREAM)
+                                                     \DEFAULTPEEKCCODE)
+                                            STREAM)))
+                        THEN 
+
+                              (* ;; 
+                    "We just backed over an LF in a CRLF file.  If we go one more, do we get a CR?")
+
+                              (CL:WHEN (CL:FUNCALL (OR (ffetch (STREAM BACKCCODEFN) of STREAM
+                                                              )
+                                                       \DEFAULTBACKCCODE)
+                                              STREAM)
+                                  (CL:UNLESS (EQ (CHARCODE CR)
+                                                 (CL:FUNCALL (OR (ffetch (STREAM PEEKCCODEFN)
+                                                                    of STREAM)
+                                                                 \DEFAULTPEEKCCODE)
+                                                        STREAM))
+
+                                      (* ;; "Not a preceding CR, reread it.")
+
+                                      (CL:FUNCALL (OR (ffetch (STREAM INCCODEFN) of STREAM)
+                                                      \DEFAULTINCCODE)
+                                             STREAM))
+                                  T)
+                      ELSE T))
+             (CL:WHEN BYTECOUNTVAR
+                 [SET BYTECOUNTVAR (IPLUS (OR BYTECOUNTVAL (\EVALV1 BYTECOUNTVAR))
+                                          (IDIFFERENCE STARTPOS (\GETFILEPTR STREAM]))])
+
+(\PEEKCCODE
+  [LAMBDA (STREAM NOERROR EOL)                          (* ; "Edited 14-Jun-2021 12:40 by rmk:")
+    (\CHECKEOLC (CL:FUNCALL (OR (ffetch (STREAM PEEKCCODEFN) of STREAM)
+                                \DEFAULTPEEKCCODE)
+                       STREAM NOERROR)
+           EOL STREAM T])
+
+(\PEEKCCODE.NOEOLC
+  [LAMBDA (STREAM NOERROR)                              (* ; "Edited 27-Jun-2021 23:26 by rmk:")
+    (CL:FUNCALL (OR (ffetch (STREAM PEEKCCODEFN) of STREAM)
+                    \DEFAULTPEEKCCODE)
+           STREAM NOERROR])
+
+(\INCCODE.EOLC
+  [LAMBDA (STREAM EOLC BYTECOUNTVAR BYTECOUNTVAL)       (* ; "Edited  8-Aug-2021 14:52 by rmk:")
+
+    (* ;; 
+  "EOL conversion around essentially a copy of \INCCODE but avoids the extra function call.")
+
+    (* ;; " EOLC of NIL means all patterns go to EOL")
+
+    (IF BYTECOUNTVAR
+        THEN [LET (*BYTECOUNTER* CODE)
+                      (DECLARE (SPECVARS *BYTECOUNTER*))
+
+                      (* ;; "The INCCODEFN first sets *BYTECOUNTER*")
+
+                      (CL:UNLESS BYTECOUNTVAL
+                          (SETQ BYTECOUNTVAL (\EVALV1 BYTECOUNTVAR)))
+                      (SETQ CODE (CL:FUNCALL (OR (ffetch (STREAM INCCODEFN) of STREAM)
+                                                 \DEFAULTINCCODE)
+                                        STREAM T))
+
+                      (* ;; "Update according to the number of first-char (CR or LF) bytes")
+
+                      (SETQ BYTECOUNTVAL (IDIFFERENCE BYTECOUNTVAL *BYTECOUNTER*))
+                      (SETQ *BYTECOUNTER* 0)
+
+                      (* ;; 
+                    "*BYTECOUNTER* will now be reset to the number of LF-after-CR bytes, if any")
+
+                      (PROG1 (\CHECKEOLC CODE (OR EOLC (FFETCH (STREAM EOLCONVENTION)
+                                                          OF STREAM))
+                                    STREAM NIL T)
+
+                          (* ;; "Post the results")
+
+                          (SET BYTECOUNTVAR (IDIFFERENCE BYTECOUNTVAL *BYTECOUNTER*)))]
+      ELSE (\CHECKEOLC (CL:FUNCALL (OR (ffetch (STREAM INCCODEFN) of STREAM)
+                                           \DEFAULTINCCODE)
+                                  STREAM)
+                      (OR EOLC (FFETCH (STREAM EOLCONVENTION) OF STREAM))
+                      STREAM])
+
+(\FORMATBYTESTREAM
+  [LAMBDA (STREAM BYTESTREAM)                           (* ; "Edited 24-Jun-2021 17:26 by rmk:")
+
+    (* ;; "Create or modify a stream that will simulate the current character input/output byte sequences of  STREAM.  The set up here does what is common to all formats:  an IO stream starting with STREAM external format and EOL.")
+
+    (* ;; "If the format has its own FORMATBYTESTREAMFN function, that is applied to copy any other state.  (Currently that function is a property of the format, not carried over into a stream field that can be changed dynamically.)")
+
+    (CL:UNLESS (AND (STREAMP BYTESTREAM)
+                    (\IOMODEP STREAM 'BOTH))
+        (SETQ BYTESTREAM (OPENSTREAM '{NODIRCORE} 'BOTH)))
+    (LET ((FORMAT (FETCH (STREAM EXTERNALFORMAT) OF STREAM))
+          (EOLC (FETCH (STREAM EOLCONVENTION) OF STREAM)))
+         (\EXTERNALFORMAT BYTESTREAM FORMAT)
+         (CL:WHEN (EQ EOLC ANY.EOLC)
+             (SETQ EOLC (OR (FETCH (EXTERNALFORMAT EOL) OF FORMAT)
+                            LF.EOLC)))
+         (REPLACE (STREAM EOLCONVENTION) OF BYTESTREAM WITH EOLC)
+         (SETFILEPTR BYTESTREAM 0)
+         (SETFILEINFO BYTESTREAM 'ENDOFSTREAMOP (FUNCTION NILL))
+         (CL:WHEN (FETCH (EXTERNALFORMAT FORMATBYTESTREAMFN) OF FORMAT)
+             (APPLY* (FETCH (EXTERNALFORMAT FORMATBYTESTREAMFN) OF FORMAT)
+                    STREAM BYTESTREAM))
+         BYTESTREAM])
+
+(\CHECKEOLC.CRLF
+  [LAMBDA (STREAM PEEKBINFLG COUNTP)                    (* ; "Edited  6-Aug-2021 23:30 by rmk:")
+
+    (* ;; "This is called only when a CR has been read and EOLC is either any or CRLF. This returns EOL if the next code is an LF")
+
+    (* ;; "If COUNTP, that sets *BYTECOUNTER* freely with the number of LF bytes.")
+
+    (DECLARE (USEDFREE *BYTECOUNTER*))
+    (LET (CH)
+         [SETQ CH (COND
+                     [PEEKBINFLG 
+
+                            (* ;; 
+                          "T from PEEKC.  In this case, must leave the fileptr where it was.")
+
+                            (* ;; "The CR itself hasn't been read, just peeked.  So here we have to read it, then peek at the next character to see if it is an LF, and then back out the CR")
+
+                            (COND
+                               ([EQ (CHARCODE LF)
+                                    (UNINTERRUPTABLY
+                                        
+                                        (* ;; " Since we are going to \BACKCCODE back the peeked character, we don't need to update the counter variable")
+
+                                        (\INCCODE STREAM)
+                                        (PROG1 (\PEEKCCODE STREAM T 'NOEOLC)
+
+                                            (* ;; 
+                          "This has to be a call to \PEEKCODE that doesn't itself to the checkeolc")
+
+                                            (* ;; 
+          "LF must be the next char after the CR.  We back up over the CR that \INCCODE just read.")
+
+                                            (\BACKCCODE STREAM)))]
+
+                                (* ;; "Got the CRLF, it's an EOL")
+
+                                (CHARCODE EOL))
+                               (T (CHARCODE CR]
+                     ((EQ (CHARCODE LF)
+                          (\PEEKCCODE STREAM T 'NOEOLC))
+
+                      (* ;; "Since we aren't peeking, the CR has actually been read, and we are entitled to read the LF that we just peeked at.")
+
+                      (IF COUNTP
+                          THEN (LET (NUMLFBYTES)
+                                        (DECLARE (SPECVARS NUMLFBYTES))
+                                        (\INCCODE STREAM 'NUMLFBYTES 0)
+                                        (ADD *BYTECOUNTER* NUMLFBYTES))
+                        ELSE (\INCCODE STREAM))
+                      (CHARCODE EOL))
+                     (T (CHARCODE CR]
+         CH])
+)
+(DECLARE%: DOEVAL@COMPILE DONTCOPY 
+(* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE 
+
+(PUTPROPS \CHECKEOLC MACRO [OPENLAMBDA (CH EOLC STRM PEEKBINFLG COUNTP)
+                                     (COND
+                                        ((EQ EOLC 'NOEOLC)
+                                         CH)
+                                        (T (SELCHARQ CH
+                                                (LF (SELECTC (OR EOLC (FFETCH (STREAM 
+                                                                                        EOLCONVENTION
+                                                                                         )
+                                                                         OF STRM))
+                                                        ((LIST LF.EOLC ANY.EOLC) 
+                                                             (CHARCODE EOL))
+                                                        (CHARCODE LF)))
+                                                (CR (SELECTC (OR EOLC (FFETCH (STREAM 
+                                                                                        EOLCONVENTION
+                                                                                         )
+                                                                         OF STRM))
+                                                        (CR.EOLC (CHARCODE EOL))
+                                                        ((LIST ANY.EOLC CRLF.EOLC) 
+                                                             (\CHECKEOLC.CRLF STRM PEEKBINFLG 
+                                                                    COUNTP))
+                                                        (CHARCODE CR)))
+                                                CH])
+)
+
+(* "END EXPORTED DEFINITIONS")
+
+)
+
+
+
+(* ;; "Also from FILEIO, but not clear that this is or ever has been used.")
+
+(DEFINEQ
+
+(\CREATE.THROUGH.EXTERNALFORMAT
+  [LAMBDA NIL                                           (* ; "Edited 23-Jun-2021 13:34 by rmk:")
+
+(* ;;; "Create an instance of EXTERNALFORMAT datatype and install it with :THROUGH as its name.  EOL is adjusted to CR so as not to do any eol conversion on this stream.")
+
+    (\INSTALL.EXTERNALFORMAT (create EXTERNALFORMAT
+                                        NAME _ :THROUGH
+                                        INCCODEFN _ (FUNCTION \THROUGHIN)
+                                        PEEKCCODEFN _ (FUNCTION \PEEKBIN)
+                                        BACKCCODEFN _ (FUNCTION \THROUGHBACKCCODE)
+                                        OUTCHARFN _ (FUNCTION \THROUGHOUTCHARFN)
+                                        EOL _ CR.EOLC])
+
+(\THROUGHIN
+  [LAMBDA (STREAM COUNTP)                               (* ; "Edited  6-Aug-2021 16:13 by rmk:")
+
+(* ;;; "Read in a single byte from STREAM and returns it without any character conversion, just through as if.")
+
+(* ;;; "If COUNTP is non-NIL,  the byte counter is always set to 1.")
+
+    (DECLARE (USEDFREE *BYTECOUNTER*))
+    (CL:WHEN COUNTP (SETQ *BYTECOUNTER* 1))
+    (\BIN STREAM])
+
+(\THROUGHBACKCCODE
+  [LAMBDA (STREAM COUNTP)                               (* ; "Edited  6-Aug-2021 16:14 by rmk:")
+    (DECLARE (USEDFREE *BYTECOUNTER*))
+    (CL:WHEN (\BACKFILEPTR STREAM)
+        (CL:WHEN COUNTP (SETQ *BYTECOUNTER* -1))
+        T)])
+
+(\THROUGHOUTCHARFN
+  [LAMBDA (OUTSTREAM CHARCODE)                           (* ; "Edited 26-Feb-91 13:44 by nm")
+
+(* ;;; "Encoder for THROUGH format.")
+
+    (COND
+       ((> CHARCODE 255)
+        (\BOUT OUTSTREAM (\CHARSET CHARCODE))
+        (\BOUT OUTSTREAM (\CHAR8CODE CHARCODE)))
+       (T (\BOUT OUTSTREAM CHARCODE])
+)
+(DECLARE%: DONTEVAL@LOAD DOCOPY 
+
+(\CREATE.THROUGH.EXTERNALFORMAT)
+)
+(DECLARE%: DONTCOPY
+  (FILEMAP (NIL (5657 12044 (\EXTERNALFORMAT 5667 . 10729) (MAKE-EXTERNALFORMAT 10731 . 12042)) (12045 
+15158 (\INSTALL.EXTERNALFORMAT 12055 . 13504) (\REMOVE.EXTERNALFORMAT 13506 . 14337) (FIND-FORMAT 
+14339 . 15156)) (15488 27986 (\OUTCHAR 15498 . 16634) (\INCCODE 16636 . 17822) (\BACKCCODE 17824 . 
+18718) (\BACKCCODE.EOLC 18720 . 21483) (\PEEKCCODE 21485 . 21801) (\PEEKCCODE.NOEOLC 21803 . 22065) (
+\INCCODE.EOLC 22067 . 23926) (\FORMATBYTESTREAM 23928 . 25418) (\CHECKEOLC.CRLF 25420 . 27984)) (29929
+ 31772 (\CREATE.THROUGH.EXTERNALFORMAT 29939 . 30741) (\THROUGHIN 30743 . 31163) (\THROUGHBACKCCODE 
+31165 . 31432) (\THROUGHOUTCHARFN 31434 . 31770)))))
+STOP
diff --git a/sources/EXTERNALFORMAT.LCOM b/sources/EXTERNALFORMAT.LCOM
new file mode 100644
index 00000000..4526a760
Binary files /dev/null and b/sources/EXTERNALFORMAT.LCOM differ
diff --git a/sources/FILEIO b/sources/FILEIO
index 9169d9ab..0ff8a793 100644
--- a/sources/FILEIO
+++ b/sources/FILEIO
@@ -1,11 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED " 6-Sep-2021 15:54:14" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEIO.;92 178421 
+(FILECREATED "25-Sep-2021 21:02:29" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEIO.;99 162362 
 
-      changes to%:  (RECORDS FDEV)
+      changes to%:  (VARS FILEIOCOMS)
+                    (RECORDS FDEV)
 
-      previous date%: "13-Aug-2021 18:39:18" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEIO.;91)
+      previous date%: "25-Sep-2021 17:25:04" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILEIO.;98)
 
 
 (* ; "
@@ -51,20 +52,6 @@ Copyright (c) 1981-1993, 1999, 2020-2021 by Venue & Xerox Corporation.
                                          (RECORDS FDEV FILEGENOBJ)))
               (INITRECORDS FDEV)
               (SYSRECORDS FDEV))
-        [COMS                                                (* ; 
-                                                 "EXTERNALFORMAT declaration and related functions")
-              (DECLARE%: DOEVAL@COMPILE DONTCOPY (EXPORT (RECORDS EXTERNALFORMAT)))
-              (FNS MAKE-EXTERNALFORMAT)
-              (INITRECORDS EXTERNALFORMAT)
-              (SYSRECORDS EXTERNALFORMAT)
-              (FNS \INSTALL.EXTERNALFORMAT \REMOVE.EXTERNALFORMAT FIND-FORMAT \EXTERNALFORMAT)
-              (INITVARS [*DEFAULT-EXTERNALFORMATS* '((DSK :XCCS]
-                     (*EXTERNALFORMATS* NIL))
-              (GLOBALVARS *EXTERNALFORMATS* *DEFAULT-EXTERNALFORMATS* *DEFAULT-EXTERNALFORMAT*)
-              (EXPORT (INITVARS (*DEFAULT-EXTERNALFORMAT* :XCCS)))
-              (COMS (FNS \CREATE.THROUGH.EXTERNALFORMAT \THROUGHIN \THROUGHBACKCCODE 
-                         \THROUGHOUTCHARFN)
-                    (DECLARE%: DONTEVAL@LOAD DOCOPY (P (\CREATE.THROUGH.EXTERNALFORMAT]
         (COMS                                                (* ; "Device operations")
               (FNS \DEFINEDEVICE \GETDEVICEFROMNAME \GETDEVICEFROMHOSTNAME \REMOVEDEVICE 
                    \REMOVEDEVICE.NAMES)
@@ -573,9 +560,9 @@ Copyright (c) 1981-1993, 1999, 2020-2021 by Venue & Xerox Corporation.
 (DEFINEQ
 
 (STREAMPROP
-  [LAMBDA X                                              (* rda%: "22-Aug-84 14:24")
+  [LAMBDA X                                              (* rda%: "22-Aug-84 14:24")
 
-    (* ;; "general top level entry for both fetching and setting stream properties.")
+    (* ;; "general top level entry for both fetching and setting stream properties.")
 
     (COND
        ((IGREATERP X 2)
@@ -588,24 +575,24 @@ Copyright (c) 1981-1993, 1999, 2020-2021 by Venue & Xerox Corporation.
        (T (\ILLEGAL.ARG NIL])
 
 (GETSTREAMPROP
-  [LAMBDA (STREAM PROP)                                 (* ; "Edited 29-Jun-2021 17:06 by rmk:")
-                                                             (* rda%: "22-Aug-84 16:17")
+  [LAMBDA (STREAM PROP)                                 (* ; "Edited 29-Jun-2021 17:06 by rmk:")
+                                                             (* rda%: "22-Aug-84 16:17")
     (SELECTQ PROP
         ((FORMAT EXTERNALFORMAT) 
-             (\EXTERNALFORMAT STREAM))
+             (\EXTERNALFORMAT STREAM))
         (ENDOFSTREAMOP (FETCH (STREAM ENDOFSTREAMOP) OF STREAM))
         (LISTGET (fetch (STREAM OTHERPROPS) of STREAM)
                PROP])
 
 (PUTSTREAMPROP
-  [LAMBDA (STREAM PROP VALUE)                           (* ; "Edited 29-Jun-2021 17:06 by rmk:")
-                                                             (* rda%: "22-Aug-84 16:11")
+  [LAMBDA (STREAM PROP VALUE)                           (* ; "Edited 29-Jun-2021 17:06 by rmk:")
+                                                             (* rda%: "22-Aug-84 16:11")
     (SELECTQ PROP
         ((FORMAT EXTERNALFORMAT) 
-                                 (* ;; "Return the old name (=VALUE), not the format datum.  Better design: the format should have it's name, and not have name as a separate property.")
+                                 (* ;; "Return the old name (=VALUE), not the format datum.  Better design: the format should have it's name, and not have name as a separate property.")
 
-             (PROG1 (\EXTERNALFORMAT STREAM NIL)
-                 (AND VALUE (\EXTERNALFORMAT STREAM VALUE))))
+             (PROG1 (\EXTERNALFORMAT STREAM NIL)
+                 (AND VALUE (\EXTERNALFORMAT STREAM VALUE))))
         (ENDOFSTREAMOP (PROG1 (fetch (STREAM ENDOFSTREAMOP) of STREAM)
                            (replace (STREAM ENDOFSTREAMOP) of STREAM with VALUE)))
         (PROG ((OLDDATA (fetch OTHERPROPS of STREAM))
@@ -614,7 +601,7 @@ Copyright (c) 1981-1993, 1999, 2020-2021 by Venue & Xerox Corporation.
                                 (OLDDATA (SETQ OLDVALUE (LISTGET OLDDATA PROP))
                                        [COND
                                           (VALUE (LISTPUT OLDDATA PROP VALUE))
-                                          (OLDVALUE          (* ; "Remove the property")
+                                          (OLDVALUE          (* ; "Remove the property")
                                                  (COND
                                                     ((EQ (CAR OLDDATA)
                                                          PROP)
@@ -629,7 +616,7 @@ Copyright (c) 1981-1993, 1999, 2020-2021 by Venue & Xerox Corporation.
                                        OLDVALUE)
                                 (VALUE (replace OTHERPROPS of STREAM with (LIST PROP 
                                                                                             VALUE))
-                                                             (* ; "know old value is NIL")
+                                                             (* ; "know old value is NIL")
                                        NIL])
 
 (STREAMP
@@ -957,8 +944,7 @@ Copyright (c) 1981-1993, 1999, 2020-2021 by Venue & Xerox Corporation.
                    OPENP _ (FUNCTION NILL)
                    UNREGISTERFILE _ (FUNCTION NILL)
                    CHARSETFN _ (FUNCTION \GENERIC.CHARSET)
-                   BREAKCONNECTION _ (FUNCTION NILL)
-                   DEFAULTEXTERNALFORMAT _ *DEFAULT-EXTERNALFORMAT*)
+                   BREAKCONNECTION _ (FUNCTION NILL))
 
 (RECORD FILEGENOBJ (NEXTFILEFN FILEINFOFN . GENFILESTATE))
 )
@@ -1182,288 +1168,6 @@ Copyright (c) 1981-1993, 1999, 2020-2021 by Venue & Xerox Corporation.
 
 
 
-(* ; "EXTERNALFORMAT declaration and related functions")
-
-(DECLARE%: DOEVAL@COMPILE DONTCOPY 
-(* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE
-
-(DATATYPE EXTERNALFORMAT ((EOLVALID FLAG)                (* ; "If true, the value of EOL field will replace the EOLCONVENTION field of the resulted stream. (Can't test EOL because it is always something)")
-                              (EOL BITS 2)
-                              (NIL BITS 1)
-                              (INCCODEFN POINTER)            (* ; 
-                       "Called with STREAM and 2 optional arguments, BYTECOUNTVAR and BYTECOUNTVAL")
-                              (PEEKCCODEFN POINTER)          (* ; 
-                                          "Called with three arguments -- STREAM, NOERROR, and EOL")
-                              (BACKCCODEFN POINTER)          (* ; 
-                                    "Called with STREAM and optional BYTECOUNTVAR and BYTECOUNTVAL")
-                              (OUTCHARFN POINTER)            (* ; 
-                                                 "Called with two arguments -- STREAM and CHARCODE")
-                              (NAME POINTER)                 (* ; 
-                                 "keyword name of this format, provided to \INSTALL.EXTERNALFORMAT")
-                              (FORMATBYTESTREAMFN POINTER)   (* ; "Function to copy the format state of a given stream to an IO stream that allows formatted byte sequences to be examined")
-                              (EF1 POINTER)                  (* ; 
-    "Extra fields for use of particular formats.  Possibly to hold standardized translation tables")
-                              (EF2 POINTER)))
-)
-
-(/DECLAREDATATYPE 'EXTERNALFORMAT '(FLAG (BITS 2)
-                                         (BITS 1)
-                                         POINTER POINTER POINTER POINTER POINTER POINTER POINTER 
-                                         POINTER)
-       '((EXTERNALFORMAT 0 (FLAGBITS . 0))
-         (EXTERNALFORMAT 0 (BITS . 17))
-         (EXTERNALFORMAT 0 (BITS . 48))
-         (EXTERNALFORMAT 0 POINTER)
-         (EXTERNALFORMAT 2 POINTER)
-         (EXTERNALFORMAT 4 POINTER)
-         (EXTERNALFORMAT 6 POINTER)
-         (EXTERNALFORMAT 8 POINTER)
-         (EXTERNALFORMAT 10 POINTER)
-         (EXTERNALFORMAT 12 POINTER)
-         (EXTERNALFORMAT 14 POINTER))
-       '16)
-
-(* "END EXPORTED DEFINITIONS")
-
-)
-(DEFINEQ
-
-(MAKE-EXTERNALFORMAT
-  [LAMBDA (NAME INCCODEFN PEEKCCODEFN BACKCCODEFN OUTCHARFN FORMATBYTESTREAMFN EOL)
-                                                            (* ; "Edited  1-Aug-2021 23:13 by rmk:")
-
-    (* ;; "Compiled creator for EXTERNALFORMAT so that declaration (EXPORTS.ALL) is not needed.  If EOL is not specified, then EOLVALID is also NIL")
-
-    (SETQ EOL (SELECTC EOL
-                  ((LIST 'LF LF.EOLC) 
-                       LF.EOLC)
-                  ((LIST 'CR CR.EOLC) 
-                       CR.EOLC)
-                  ((LIST 'CRLF CRLF.EOLC) 
-                       CRLF.EOLC)
-                  (NIL)
-                  (SHOULDNT)))
-    (\INSTALL.EXTERNALFORMAT (CREATE EXTERNALFORMAT
-                                        NAME _ NAME
-                                        INCCODEFN _ INCCODEFN
-                                        PEEKCCODEFN _ PEEKCCODEFN
-                                        BACKCCODEFN _ BACKCCODEFN
-                                        OUTCHARFN _ OUTCHARFN
-                                        FORMATBYTESTREAMFN _ FORMATBYTESTREAMFN
-                                        EOLVALID _ EOL
-                                        EOL _ (OR EOL LF.EOLC])
-)
-
-(/DECLAREDATATYPE 'EXTERNALFORMAT '(FLAG (BITS 2)
-                                         (BITS 1)
-                                         POINTER POINTER POINTER POINTER POINTER POINTER POINTER 
-                                         POINTER)
-       '((EXTERNALFORMAT 0 (FLAGBITS . 0))
-         (EXTERNALFORMAT 0 (BITS . 17))
-         (EXTERNALFORMAT 0 (BITS . 48))
-         (EXTERNALFORMAT 0 POINTER)
-         (EXTERNALFORMAT 2 POINTER)
-         (EXTERNALFORMAT 4 POINTER)
-         (EXTERNALFORMAT 6 POINTER)
-         (EXTERNALFORMAT 8 POINTER)
-         (EXTERNALFORMAT 10 POINTER)
-         (EXTERNALFORMAT 12 POINTER)
-         (EXTERNALFORMAT 14 POINTER))
-       '16)
-(ADDTOVAR SYSTEMRECLST
-
-(DATATYPE EXTERNALFORMAT ((EOLVALID FLAG)
-                              (EOL BITS 2)
-                              (NIL BITS 1)
-                              (INCCODEFN POINTER)
-                              (PEEKCCODEFN POINTER)
-                              (BACKCCODEFN POINTER)
-                              (OUTCHARFN POINTER)
-                              (NAME POINTER)
-                              (FORMATBYTESTREAMFN POINTER)
-                              (EF1 POINTER)
-                              (EF2 POINTER)))
-)
-(DEFINEQ
-
-(\INSTALL.EXTERNALFORMAT
-  [LAMBDA (EXTFORMAT/NAME EXTERNALFORMAT)               (* ; "Edited  5-Aug-2021 14:22 by rmk:")
-
-(* ;;; "Register an instance of the datatype EXTERNALFORMAT.")
-
-(* ;;; "For backward compatibility, the first argument can be a NAME with the second argument being the format.  If so, the NAME must match the name inside the format")
-
-    (LET (NAME)
-         (IF EXTERNALFORMAT
-             THEN 
-
-                   (* ;; "Backwards compatibility")
-
-                   (SETQ NAME (MKATOM EXTFORMAT/NAME))
-                   (IF (EQ NAME (FETCH (EXTERNALFORMAT NAME) OF EXTERNALFORMAT))
-                     ELSEIF (FETCH (EXTERNALFORMAT NAME) OF EXTERNALFORMAT)
-                       THEN (ERROR "Mismatch of specified name and name of the external format")
-                     ELSE (REPLACE (EXTERNALFORMAT NAME) OF EXTERNALFORMAT WITH
-                                                                                       NAME))
-           ELSE (SETQ EXTERNALFORMAT EXTFORMAT/NAME)
-                 (SETQ NAME (FETCH (EXTERNALFORMAT NAME) OF EXTERNALFORMAT)))
-         (IF (type? EXTERNALFORMAT EXTERNALFORMAT)
-             THEN (\REMOVE.EXTERNALFORMAT NAME)
-                   (push *EXTERNALFORMATS* EXTERNALFORMAT)
-           ELSE (ERROR "INVALID EXTERNALFORMAT " EXTERNALFORMAT))
-         EXTERNALFORMAT])
-
-(\REMOVE.EXTERNALFORMAT
-  [LAMBDA (NAME/EXTFORMAT)                              (* ; "Edited  5-May-2021 15:42 by rmk:")
-
-(* ;;; "Deregisters external format EXTERNALFORMAT .")
-
-    (SETQ NAME/EXTFORMAT (IF (TYPE? EXTERNALFORMAT NAME/EXTFORMAT)
-                             THEN (FETCH (EXTERNALFORMAT NAME) OF NAME/EXTFORMAT)
-                           ELSE (MKATOM NAME/EXTFORMAT)))
-    (SETQ *EXTERNALFORMATS* (DREMOVE (FIND EF IN *EXTERNALFORMATS*
-                                        SUCHTHAT (EQ NAME/EXTFORMAT (FETCH (EXTERNALFORMAT
-                                                                                    NAME)
-                                                                           OF EF)))
-                                   *EXTERNALFORMATS*])
-
-(FIND-FORMAT
-  [LAMBDA (NAME NOERROR)                                (* ; "Edited  7-Aug-2021 09:29 by rmk:")
-    (IF (TYPE? EXTERNALFORMAT NAME)
-        THEN NAME
-      ELSE (SETQ NAME (MKATOM NAME))                     (* ; 
-     "The EQMEMB allows for synonyms, the first of which should be canonical.  E.g. (:UTF-8 :UTF8)")
-            (OR (FIND EF IN *EXTERNALFORMATS* SUCHTHAT (EQ NAME (FETCH (
-                                                                                       EXTERNALFORMAT
-                                                                                        NAME)
-                                                                               OF EF)))
-                (CL:UNLESS NOERROR (ERROR NAME "is not an external format"])
-
-(\EXTERNALFORMAT
-  [LAMBDA (STREAM NEWFORMAT/NAME)                       (* ; "Edited  8-Aug-2021 14:30 by rmk:")
-                                                             (* ; "Edited 26-Feb-91 13:20 by nm")
-
-(* ;;; ";;; RMK July 2020:  Added interface for per-device default external format.  \DO.PARAMS.AT.OPEN will make that call even if it is not specified from the open. STREAMPROP is fixed to call \EXTERNALFORMAT to set the property EXTERNALFORMAT, to export a user-level way of manipulating this.")
-
-(* ;;; "")
-
-(* ;;; "If NEWFORMAT/NAME is nil, just returns the current external format name of STREAM.  If NEWFORMAT/NAME is supplied and it is or names an external format, then the external format of STREAM is set to that format.")
-
-(* ;;; "")
-
-(* ;;; ":DEFAULT means the default external format for STREAM's filedevice")
-
-(* ;;; "The all-device default is in *DEFAULT-EXTERNALFORMAT* or the DEFAULTEXTERNALFORMAT field of the file device.  The list currently has priority since that makes it easier for a user without EXPORTS.ALL to systematically override. That may or may not be a useful capability.  ")
-
-    (\DTEST STREAM 'STREAM)
-    (CL:WHEN NEWFORMAT/NAME
-        (CL:WHEN (type? READER-ENVIRONMENT NEWFORMAT/NAME)
-            (SETQ NEWFORMAT/NAME (fetch (READER-ENVIRONMENT REFORMAT) of NEWFORMAT/NAME)))
-        [LET (EXTFORMAT)
-             [COND
-                ((type? EXTERNALFORMAT NEWFORMAT/NAME)
-                 (SETQ EXTFORMAT NEWFORMAT/NAME))
-                (T (CL:WHEN (EQ NEWFORMAT/NAME :DEFAULT)
-                       (SETQ NEWFORMAT/NAME (OR (CADR (ASSOC (fetch DEVICENAME
-                                                                of (fetch DEVICE of
-                                                                                         STREAM))
-                                                             *DEFAULT-EXTERNALFORMATS*))
-                                                (fetch (FDEV DEFAULTEXTERNALFORMAT)
-                                                   of (fetch DEVICE of STREAM))
-                                                *DEFAULT-EXTERNALFORMAT*)))
-                   (SETQ EXTFORMAT (FIND-FORMAT NEWFORMAT/NAME))
-                   (CL:UNLESS EXTFORMAT (ERROR NEWFORMAT/NAME 
-                                               "is not a registered external format name"))
-                   (CL:UNLESS (type? EXTERNALFORMAT EXTFORMAT)
-                          (ERROR "INVALID EXTERNALFORMAT " EXTFORMAT]
-             (UNINTERRUPTABLY
-                 (freplace (STREAM EXTERNALFORMAT) of STREAM with EXTFORMAT)
-                 (CL:WHEN (ffetch (EXTERNALFORMAT EOLVALID) of EXTFORMAT)
-                     (freplace (STREAM EOLCONVENTION) of STREAM with (ffetch
-                                                                                  (EXTERNALFORMAT
-                                                                                   EOL) of 
-                                                                                            EXTFORMAT
-                                                                                  )))
-                 (freplace (STREAM OUTCHARFN) of STREAM with (ffetch (EXTERNALFORMAT
-                                                                                      OUTCHARFN)
-                                                                            of EXTFORMAT))
-                 (freplace (STREAM INCCODEFN) of STREAM with (ffetch (EXTERNALFORMAT
-                                                                                      INCCODEFN)
-                                                                            of EXTFORMAT))
-                 (freplace (STREAM PEEKCCODEFN) of STREAM with (ffetch (
-                                                                                       EXTERNALFORMAT
-                                                                                        PEEKCCODEFN)
-                                                                              of EXTFORMAT))
-                 (freplace (STREAM BACKCCODEFN) of STREAM with (ffetch (
-                                                                                       EXTERNALFORMAT
-                                                                                        BACKCCODEFN)
-                                                                              of EXTFORMAT)))])
-    (ffetch (EXTERNALFORMAT NAME) of (fetch (STREAM EXTERNALFORMAT) of STREAM])
-)
-
-(RPAQ? *DEFAULT-EXTERNALFORMATS* '((DSK :XCCS)))
-
-(RPAQ? *EXTERNALFORMATS* NIL)
-(DECLARE%: DOEVAL@COMPILE DONTCOPY
-
-(GLOBALVARS *EXTERNALFORMATS* *DEFAULT-EXTERNALFORMATS* *DEFAULT-EXTERNALFORMAT*)
-)
-(* "FOLLOWING DEFINITIONS EXPORTED")
-(RPAQ? *DEFAULT-EXTERNALFORMAT* :XCCS)
-
-(* "END EXPORTED DEFINITIONS")
-
-(DEFINEQ
-
-(\CREATE.THROUGH.EXTERNALFORMAT
-  [LAMBDA NIL                                           (* ; "Edited 23-Jun-2021 13:34 by rmk:")
-
-(* ;;; "Create an instance of EXTERNALFORMAT datatype and install it with :THROUGH as its name.  EOL is adjusted to CR so as not to do any eol conversion on this stream.")
-
-    (\INSTALL.EXTERNALFORMAT (create EXTERNALFORMAT
-                                        NAME _ :THROUGH
-                                        INCCODEFN _ (FUNCTION \THROUGHIN)
-                                        PEEKCCODEFN _ (FUNCTION \PEEKBIN)
-                                        BACKCCODEFN _ (FUNCTION \THROUGHBACKCCODE)
-                                        OUTCHARFN _ (FUNCTION \THROUGHOUTCHARFN)
-                                        EOL _ CR.EOLC])
-
-(\THROUGHIN
-  [LAMBDA (STREAM COUNTP)                               (* ; "Edited  6-Aug-2021 16:13 by rmk:")
-
-(* ;;; "Read in a single byte from STREAM and returns it without any character conversion, just through as if.")
-
-(* ;;; "If COUNTP is non-NIL,  the byte counter is always set to 1.")
-
-    (DECLARE (USEDFREE *BYTECOUNTER*))
-    (CL:WHEN COUNTP (SETQ *BYTECOUNTER* 1))
-    (\BIN STREAM])
-
-(\THROUGHBACKCCODE
-  [LAMBDA (STREAM COUNTP)                               (* ; "Edited  6-Aug-2021 16:14 by rmk:")
-    (DECLARE (USEDFREE *BYTECOUNTER*))
-    (CL:WHEN (\BACKFILEPTR STREAM)
-        (CL:WHEN COUNTP (SETQ *BYTECOUNTER* -1))
-        T)])
-
-(\THROUGHOUTCHARFN
-  [LAMBDA (OUTSTREAM CHARCODE)                           (* ; "Edited 26-Feb-91 13:44 by nm")
-
-(* ;;; "Encoder for THROUGH format.")
-
-    (COND
-       ((> CHARCODE 255)
-        (\BOUT OUTSTREAM (\CHARSET CHARCODE))
-        (\BOUT OUTSTREAM (\CHAR8CODE CHARCODE)))
-       (T (\BOUT OUTSTREAM CHARCODE])
-)
-(DECLARE%: DONTEVAL@LOAD DOCOPY 
-
-(\CREATE.THROUGH.EXTERNALFORMAT)
-)
-
-
-
 (* ; "Device operations")
 
 (DEFINEQ
@@ -3396,44 +3100,40 @@ update the map")
 (PUTPROPS FILEIO COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1989 
 1990 1991 1992 1993 1999 2020 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (28396 31886 (STREAMPROP 28406 . 28840) (GETSTREAMPROP 28842 . 29315) (PUTSTREAMPROP 
-29317 . 31734) (STREAMP 31736 . 31884)) (31929 34448 (\DEFPRINT.BY.NAME 31939 . 33091) (
-\STREAM.DEFPRINT 33093 . 34141) (\FDEV.DEFPRINT 34143 . 34446)) (34706 39747 (\GETACCESS 34716 . 35170
-) (\SETACCESS 35172 . 39745)) (63132 64385 (MAKE-EXTERNALFORMAT 63142 . 64383)) (65618 73447 (
-\INSTALL.EXTERNALFORMAT 65628 . 67077) (\REMOVE.EXTERNALFORMAT 67079 . 67910) (FIND-FORMAT 67912 . 
-68729) (\EXTERNALFORMAT 68731 . 73445)) (73770 75633 (\CREATE.THROUGH.EXTERNALFORMAT 73780 . 74582) (
-\THROUGHIN 74584 . 75008) (\THROUGHBACKCCODE 75010 . 75281) (\THROUGHOUTCHARFN 75283 . 75631)) (75741 
-81710 (\DEFINEDEVICE 75751 . 78067) (\GETDEVICEFROMNAME 78069 . 78542) (\GETDEVICEFROMHOSTNAME 78544
- . 79588) (\REMOVEDEVICE 79590 . 80713) (\REMOVEDEVICE.NAMES 80715 . 81708)) (81750 106410 (\CLOSEFILE
- 81760 . 82585) (\DELETEFILE 82587 . 82881) (\DEVICEEVENT 82883 . 84653) (\GENERATEFILES 84655 . 85133
-) (\GENERATENEXTFILE 85135 . 85786) (\GENERATEFILEINFO 85788 . 86249) (\GETFILENAME 86251 . 86640) (
-\GENERIC.OUTFILEP 86642 . 87112) (\OPENFILE 87114 . 89692) (\DO.PARAMS.AT.OPEN 89694 . 92247) (
-\RENAMEFILE 92249 . 92673) (\REVALIDATEFILE 92675 . 95277) (\PAGED.REVALIDATEFILELST 95279 . 96837) (
-\PAGED.REVALIDATEFILES 96839 . 98558) (\PAGED.REVALIDATEFILE 98560 . 100843) (\BUFFERED.REVALIDATEFILE
- 100845 . 103131) (\BUFFERED.REVALIDATEFILELST 103133 . 104317) (\PRINT-REVALIDATION-RESULT 104319 . 
-104734) (\TRUNCATEFILE 104736 . 105127) (\FILE-CONFLICT 105129 . 106408)) (106446 111109 (
-\GENERATENOFILES 106456 . 108552) (\NULLFILEGENERATOR 108554 . 108798) (\NOFILESNEXTFILEFN 108800 . 
-110791) (\NOFILESINFOFN 110793 . 111107)) (111228 113136 (\FILE.NOT.OPEN 111238 . 111751) (
-\FILE.WONT.OPEN 111753 . 112081) (\ILLEGAL.DEVICEOP 112083 . 112365) (\IS.NOT.RANDACCESSP 112367 . 
-112813) (\STREAM.NOT.OPEN 112815 . 113134)) (113271 115569 (\FDEVINSTANCE 113281 . 115567)) (117119 
-124493 (CNDIR 117129 . 118434) (DIRECTORYNAME 118436 . 122619) (DIRECTORYNAMEP 122621 . 123237) (
-HOSTNAMEP 123239 . 124046) (\ADD.CONNECTED.DIR 124048 . 124491)) (124538 151925 (\BACKFILEPTR 124548
- . 124736) (\BACKPEEKBIN 124738 . 125099) (\BACKBIN 125101 . 125452) (BIN 125454 . 125671) (\BIN 
-125673 . 125950) (\BINS 125952 . 126238) (BOUT 126240 . 126602) (\BOUT 126604 . 126919) (\BOUTS 126921
- . 127232) (COPYBYTES 127234 . 130566) (COPYCHARS 130568 . 134234) (COPYFILE 134236 . 135033) (
-\COPYOPENFILE 135035 . 138108) (\INFER.FILE.TYPE 138110 . 139064) (EOFP 139066 . 139363) (FORCEOUTPUT 
-139365 . 139612) (\FLUSH.OPEN.STREAMS 139614 . 139970) (CHARSET 139972 . 141636) (ACCESS-CHARSET 
-141638 . 141855) (GETEOFPTR 141857 . 142107) (GETFILEINFO 142109 . 145302) (\TYPE.FROM.FILETYPE 145304
- . 145774) (\FILETYPE.FROM.TYPE 145776 . 145955) (GETFILEPTR 145957 . 146209) (SETFILEINFO 146211 . 
-149824) (SETFILEPTR 149826 . 151545) (BOUT16 151547 . 151732) (BIN16 151734 . 151923)) (152028 157233 
-(\GENERIC.BINS 152038 . 152318) (\GENERIC.BOUTS 152320 . 152585) (\GENERIC.RENAMEFILE 152587 . 154418)
- (\GENERIC.OPENP 154420 . 155735) (\GENERIC.READP 155737 . 156778) (\GENERIC.CHARSET 156780 . 157231))
- (157234 157573 (\MAP-OPEN-STREAMS 157244 . 157571)) (159443 161523 (\EOF.ACTION 159453 . 159704) (
-\EOSERROR 159706 . 159899) (\GETEOFPTR 159901 . 160083) (\INCFILEPTR 160085 . 160435) (\PEEKBIN 160437
- . 160628) (\SETCLOSEDFILELENGTH 160630 . 160964) (\SETEOFPTR 160966 . 161154) (\SETFILEPTR 161156 . 
-161521)) (161524 162066 (\FIXPOUT 161534 . 161834) (\FIXPIN 161836 . 162064)) (162067 162633 (\BOUTEOL
- 162077 . 162631)) (165725 175589 (\BUFFERED.BIN 165735 . 166587) (\BUFFERED.PEEKBIN 166589 . 167371) 
-(\BUFFERED.BOUT 167373 . 168233) (\BUFFERED.BINS 168235 . 171920) (\BUFFERED.BOUTS 171922 . 173723) (
-\BUFFERED.COPYBYTES 173725 . 175587)) (175618 177970 (\NULLDEVICE 175628 . 177646) (\NULL.OPENFILE 
-177648 . 177968)))))
+  (FILEMAP (NIL (27462 30940 (STREAMPROP 27472 . 27906) (GETSTREAMPROP 27908 . 28377) (PUTSTREAMPROP 
+28379 . 30788) (STREAMP 30790 . 30938)) (30983 33502 (\DEFPRINT.BY.NAME 30993 . 32145) (
+\STREAM.DEFPRINT 32147 . 33195) (\FDEV.DEFPRINT 33197 . 33500)) (33760 38801 (\GETACCESS 33770 . 34224
+) (\SETACCESS 34226 . 38799)) (59682 65651 (\DEFINEDEVICE 59692 . 62008) (\GETDEVICEFROMNAME 62010 . 
+62483) (\GETDEVICEFROMHOSTNAME 62485 . 63529) (\REMOVEDEVICE 63531 . 64654) (\REMOVEDEVICE.NAMES 64656
+ . 65649)) (65691 90351 (\CLOSEFILE 65701 . 66526) (\DELETEFILE 66528 . 66822) (\DEVICEEVENT 66824 . 
+68594) (\GENERATEFILES 68596 . 69074) (\GENERATENEXTFILE 69076 . 69727) (\GENERATEFILEINFO 69729 . 
+70190) (\GETFILENAME 70192 . 70581) (\GENERIC.OUTFILEP 70583 . 71053) (\OPENFILE 71055 . 73633) (
+\DO.PARAMS.AT.OPEN 73635 . 76188) (\RENAMEFILE 76190 . 76614) (\REVALIDATEFILE 76616 . 79218) (
+\PAGED.REVALIDATEFILELST 79220 . 80778) (\PAGED.REVALIDATEFILES 80780 . 82499) (\PAGED.REVALIDATEFILE 
+82501 . 84784) (\BUFFERED.REVALIDATEFILE 84786 . 87072) (\BUFFERED.REVALIDATEFILELST 87074 . 88258) (
+\PRINT-REVALIDATION-RESULT 88260 . 88675) (\TRUNCATEFILE 88677 . 89068) (\FILE-CONFLICT 89070 . 90349)
+) (90387 95050 (\GENERATENOFILES 90397 . 92493) (\NULLFILEGENERATOR 92495 . 92739) (\NOFILESNEXTFILEFN
+ 92741 . 94732) (\NOFILESINFOFN 94734 . 95048)) (95169 97077 (\FILE.NOT.OPEN 95179 . 95692) (
+\FILE.WONT.OPEN 95694 . 96022) (\ILLEGAL.DEVICEOP 96024 . 96306) (\IS.NOT.RANDACCESSP 96308 . 96754) (
+\STREAM.NOT.OPEN 96756 . 97075)) (97212 99510 (\FDEVINSTANCE 97222 . 99508)) (101060 108434 (CNDIR 
+101070 . 102375) (DIRECTORYNAME 102377 . 106560) (DIRECTORYNAMEP 106562 . 107178) (HOSTNAMEP 107180 . 
+107987) (\ADD.CONNECTED.DIR 107989 . 108432)) (108479 135866 (\BACKFILEPTR 108489 . 108677) (
+\BACKPEEKBIN 108679 . 109040) (\BACKBIN 109042 . 109393) (BIN 109395 . 109612) (\BIN 109614 . 109891) 
+(\BINS 109893 . 110179) (BOUT 110181 . 110543) (\BOUT 110545 . 110860) (\BOUTS 110862 . 111173) (
+COPYBYTES 111175 . 114507) (COPYCHARS 114509 . 118175) (COPYFILE 118177 . 118974) (\COPYOPENFILE 
+118976 . 122049) (\INFER.FILE.TYPE 122051 . 123005) (EOFP 123007 . 123304) (FORCEOUTPUT 123306 . 
+123553) (\FLUSH.OPEN.STREAMS 123555 . 123911) (CHARSET 123913 . 125577) (ACCESS-CHARSET 125579 . 
+125796) (GETEOFPTR 125798 . 126048) (GETFILEINFO 126050 . 129243) (\TYPE.FROM.FILETYPE 129245 . 129715
+) (\FILETYPE.FROM.TYPE 129717 . 129896) (GETFILEPTR 129898 . 130150) (SETFILEINFO 130152 . 133765) (
+SETFILEPTR 133767 . 135486) (BOUT16 135488 . 135673) (BIN16 135675 . 135864)) (135969 141174 (
+\GENERIC.BINS 135979 . 136259) (\GENERIC.BOUTS 136261 . 136526) (\GENERIC.RENAMEFILE 136528 . 138359) 
+(\GENERIC.OPENP 138361 . 139676) (\GENERIC.READP 139678 . 140719) (\GENERIC.CHARSET 140721 . 141172)) 
+(141175 141514 (\MAP-OPEN-STREAMS 141185 . 141512)) (143384 145464 (\EOF.ACTION 143394 . 143645) (
+\EOSERROR 143647 . 143840) (\GETEOFPTR 143842 . 144024) (\INCFILEPTR 144026 . 144376) (\PEEKBIN 144378
+ . 144569) (\SETCLOSEDFILELENGTH 144571 . 144905) (\SETEOFPTR 144907 . 145095) (\SETFILEPTR 145097 . 
+145462)) (145465 146007 (\FIXPOUT 145475 . 145775) (\FIXPIN 145777 . 146005)) (146008 146574 (\BOUTEOL
+ 146018 . 146572)) (149666 159530 (\BUFFERED.BIN 149676 . 150528) (\BUFFERED.PEEKBIN 150530 . 151312) 
+(\BUFFERED.BOUT 151314 . 152174) (\BUFFERED.BINS 152176 . 155861) (\BUFFERED.BOUTS 155863 . 157664) (
+\BUFFERED.COPYBYTES 157666 . 159528)) (159559 161911 (\NULLDEVICE 159569 . 161587) (\NULL.OPENFILE 
+161589 . 161909)))))
 STOP
diff --git a/sources/FILEIO.LCOM b/sources/FILEIO.LCOM
index b2af608b..053ba1b6 100644
Binary files a/sources/FILEIO.LCOM and b/sources/FILEIO.LCOM differ
diff --git a/sources/FILESETS b/sources/FILESETS
index 35480331..42828dca 100644
--- a/sources/FILESETS
+++ b/sources/FILESETS
@@ -1,11 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "25-Jun-2021 10:21:40" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;6 6395   
+(FILECREATED "11-Sep-2021 00:01:52" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;10 6469   
 
-      changes to%:  (VARS 0LISPSET)
+      changes to%:  (VARS MAKEINITTYPES 0LISPSET EXPORTFILES)
 
-      previous date%: "19-Jun-2021 12:13:31" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;5)
+      previous date%: "10-Sep-2021 19:53:14" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>FILESETS.;8)
 
 
 (* ; "
@@ -17,13 +17,13 @@ Copyright (c) 1981-1990, 1998, 2021 by Xerox Corporation.
 (RPAQQ FILESETSCOMS
        (
 
-(* ;;; "contains all of the lists of files which are used in various ways")
+(* ;;; "contains all of the lists of files which are used in various ways")
 
         
-        (* ;; "I took out the EXPORT of the filesets because it led to inconsistency when one had loaded ABC.  -- Pavel")
+        (* ;; "I took out the EXPORT of the filesets because it led to inconsistency when one had loaded ABC.  -- Pavel")
 
         
-        (* ;; "The file with the default EXTERNALFORMAT should come right after FILEIO, and particularly before ATERM.")
+        (* ;; "The file with the default EXTERNALFORMAT should come right after FILEIO, and particularly before ATERM.")
 
         (VARS * FILESETS)
         (VARS EXPORTFILES)
@@ -51,10 +51,10 @@ Copyright (c) 1981-1990, 1998, 2021 by Xerox Corporation.
 
 (RPAQQ FILESETS (0LISPSET 1LISPSET 2LISPSET 3LISPSET))
 
-(RPAQQ 0LISPSET (PACKAGE-CONVERSION-TABLE LLFAULT LLSUBRS LLBFS LLNEW FILEIO IMAGEIO LLBASIC LLGC
-                           LLARRAYELT LLINTERP LLMVS DEFSTRUCT-RUN-TIME SETF-RUNTIME CMLSEQBASICS 
-                           LLARITH LLFLOAT LLBIGNUM LLREAD XCCS LLCHAR LLSTK LLDATATYPE IOCHAR LLKEY
-                           LLTIMER))
+(RPAQQ 0LISPSET (PACKAGE-CONVERSION-TABLE LLFAULT LLSUBRS LLBFS LLNEW FILEIO EXTERNALFORMAT 
+                           IMAGEIO LLBASIC LLGC LLARRAYELT LLINTERP LLMVS DEFSTRUCT-RUN-TIME 
+                           SETF-RUNTIME CMLSEQBASICS LLARITH LLFLOAT LLBIGNUM LLREAD XCCS LLCHAR 
+                           LLSTK LLDATATYPE IOCHAR LLKEY LLTIMER))
 
 (RPAQQ 1LISPSET
        (ASTACK DTDECLARE ATBL LLCODE ACODE COREIO AOFD ADIR PMAP VANILLADISK ATERM APRINT ABASIC 
@@ -69,17 +69,17 @@ Copyright (c) 1981-1990, 1998, 2021 by Xerox Corporation.
 
 (RPAQQ EXPORTFILES
        (MODARITH LLPARAMS LLCODE AERROR AOFD APRINT ATERM LLARRAYELT LLDATATYPE LLNEW LLBASIC LLCHAR
-              LLSTK PMAP LLGC ATBL FILEIO LLARITH LLFLOAT FONT LLKEY LLDISPLAY ADISPLAY AINTERRUPT 
-              RENAMEMACROS HLDISPLAY WINDOW MACROAUX ADDARITH LLFAULT LLTIMER IMAGEIO PROC XCCS 
-              LLREAD PASSWORDS INTERPRESS HARDCOPY CMLARRAY LLSUBRS))
+              LLSTK PMAP LLGC ATBL FILEIO EXTERNALFORMAT LLARITH LLFLOAT FONT LLKEY LLDISPLAY 
+              ADISPLAY AINTERRUPT RENAMEMACROS HLDISPLAY WINDOW MACROAUX ADDARITH LLFAULT LLTIMER 
+              IMAGEIO PROC XCCS LLREAD PASSWORDS INTERPRESS HARDCOPY CMLARRAY LLSUBRS))
 
 (RPAQQ MAKEINITFILES (MAKEINIT MEM I-NEW))
 
 (RPAQQ MAKEINITTYPES
        ((NIL INIT (0 1)
              2LISPSET 1600)
-        (SMALLINIT SMALLINIT (LLFAULT LLSUBRS LLNEW FILEIO LLBASIC LLGC LLINTERP LLARITH LLREAD 
-                                    LLCHAR TINYPATCH))
+        (SMALLINIT SMALLINIT (LLFAULT LLSUBRS LLNEW FILEIO EXTERNALFORMAT LLBASIC LLGC LLINTERP 
+                                    LLARITH LLREAD LLCHAR TINYPATCH))
         (MACROTEST MACROTEST ((MACROTEST)
                               0 1)
                2LISPSET)
@@ -114,7 +114,7 @@ Copyright (c) 1981-1990, 1998, 2021 by Xerox Corporation.
            (COMSNAME . RDCOMS)
            (EXTRACOMS 
 
-                  (* ;; "YOU MUST REMAKE THIS FILE using (DORENAME 'R) (after CONNing to library) whenever the SYSOUT layout changes in LLPARAMS (e.g., if MDSTypeTable moves)")
+                  (* ;; "YOU MUST REMAKE THIS FILE using (DORENAME 'R) (after CONNing to library) whenever the SYSOUT layout changes in LLPARAMS (e.g., if MDSTypeTable moves)")
 
                   (FILES VMEM)
                   (VARS RDVALS RDPTRS)
diff --git a/sources/IMAGEIO b/sources/IMAGEIO
index ea111516..bb3fd43c 100644
--- a/sources/IMAGEIO
+++ b/sources/IMAGEIO
@@ -1,11 +1,12 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
-(FILECREATED " 2-Aug-2021 19:41:35" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IMAGEIO.;4 79616  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+(FILECREATED "25-Sep-2021 20:58:07" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IMAGEIO.;4 79783  
 
-      changes to%:  (FNS \DISPLAYINIT)
+      changes to%:  (VARS IMAGEIOCOMS)
+                    (FNS \DISPLAYINIT \4DISPLAYINIT \8DISPLAYINIT \24DISPLAYINIT)
 
-      previous date%: "28-Jun-99 16:33:59" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IMAGEIO.;1)
+      previous date%: " 2-Aug-2021 19:41:35" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>IMAGEIO.;2)
 
 
 (* ; "
@@ -27,7 +28,7 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
         (FNS \DRAWPOINT.GENERIC \DRAWPOLYGON.GENERIC \DRAWCIRCLE.GENERIC \DRAWELLIPSE.GENERIC)
         (FNS \IMAGEIOINIT \NOIMAGE.DSPFONT \UNIMPIMAGEOP)
         [COMS 
-              (* ;; "stuff to support the checking and defaulting of arguments in the device independent drawing functions.")
+              (* ;; "stuff to support the checking and defaulting of arguments in the device independent drawing functions.")
 
               (FNS INSURE.BRUSH BRUSHP \POSSIBLECOLOR NEGSHADE)
               (DECLARE%: DONTCOPY EVAL@COMPILE (RESOURCES SYSTEMBRUSH))
@@ -42,7 +43,7 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
         (SYSRECORDS IMAGEOPS)
         (DECLARE%: DONTEVAL@LOAD DOCOPY (P (\IMAGEIOINIT)))
         [COMS 
-              (* ;; "Implementation of display stream resident `files.' Done here cause it might matter that the display device get defined early so that its event fn will be evaluated as the last thing before logout")
+              (* ;; "Implementation of display stream resident `files.' Done here cause it might matter that the display device get defined early so that its event fn will be evaluated as the last thing before logout")
 
               (INITVARS (\COLORDISPLAYSTREAMTYPES '(4DISPLAY 8DISPLAY 24DISPLAY))
                      (\DISPLAYSTREAMTYPES (CONS 'DISPLAY \COLORDISPLAYSTREAMTYPES)))
@@ -1170,11 +1171,11 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
         NIL])
 
 (\DISPLAYINIT
-  [LAMBDA NIL                                           (* ; "Edited  2-Aug-2021 19:41 by rmk:")
+  [LAMBDA NIL                                           (* ; "Edited 25-Sep-2021 20:57 by rmk:")
 
-    (* ;; "Initializes global variables for the Display device")
+    (* ;; "Initializes global variables for the Display device")
 
-    (* ;; "Display Streams are referred to only by themselves so they do not need directory operations.  Most of the fields in the DisplayDevice are empty to avoid something bad happening.")
+    (* ;; "Display Streams are referred to only by themselves so they do not need directory operations.  Most of the fields in the DisplayDevice are empty to avoid something bad happening.")
 
     (DECLARE (GLOBALVARS DisplayFDEV \DISPLAYIMAGEOPS \DisplayDeviceMethods \DisplayDeviceData))
     (SETQ \DisplayDeviceMethods (create WSOPS))
@@ -1186,6 +1187,8 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
                               BOTTOM _ 0
                               WIDTH _ 1024
                               HEIGHT _ 808)))
+    (MAKE-EXTERNALFORMAT :DISPLAY NIL NIL NIL (FUNCTION \DSPPRINTCHAR)
+           NIL CR.EOLC)
     (SETQ \DISPLAYIMAGEOPS (create IMAGEOPS
                                   IMAGETYPE _ 'DISPLAY
                                   IMFONT _ (FUNCTION \DSPFONT.DISPLAY)
@@ -1252,13 +1255,11 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
                              WINDOWOPS _ \DisplayDeviceMethods
                              WINDOWDATA _ \DisplayDeviceData
                              DEVICEINFO _ (create DISPLAYSTATE)
-                             DEFAULTEXTERNALFORMAT _ (MAKE-EXTERNALFORMAT :DISPLAY NIL NIL NIL
-                                                            (FUNCTION \DSPPRINTCHAR)
-                                                            NIL CR.EOLC)))
+                             DEFAULTEXTERNALFORMAT _ :DISPLAY))
     (\DEFINEDEVICE 'LFDISPLAY DisplayFDEV])
 
 (\4DISPLAYINIT
-  [LAMBDA NIL                                         (* ; "Edited 22-Apr-94 15:17 by sybalsky")
+  [LAMBDA NIL                                           (* ; "Edited 25-Sep-2021 18:42 by rmk:")
     (DECLARE (GLOBALVARS \4DISPLAYIMAGEOPS \4DISPLAYFDEV))
     (SETQ \4DISPLAYIMAGEOPS (create IMAGEOPS
                                    IMAGETYPE _ '4DISPLAY
@@ -1322,11 +1323,12 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
                                BLOCKIN _ (FUNCTION \ILLEGAL.DEVICEOP)
                                BLOCKOUT _ (FUNCTION \NONPAGEDBOUTS)
                                DEVICEINFO _ (create DISPLAYSTATE)
-                               WINDOWOPS _ NIL))
+                               WINDOWOPS _ NIL
+                               DEFAULTEXTERNALFORMAT _ :DISPLAY))
     (\DEFINEDEVICE NIL \4DISPLAYFDEV])
 
 (\8DISPLAYINIT
-  [LAMBDA NIL                                         (* ; "Edited 22-Apr-94 15:18 by sybalsky")
+  [LAMBDA NIL                                           (* ; "Edited 25-Sep-2021 18:43 by rmk:")
     (DECLARE (GLOBALVARS \8DISPLAYIMAGEOPS \8DISPLAYFDEV))
     (SETQ \8DISPLAYIMAGEOPS (create IMAGEOPS
                                    IMAGETYPE _ '8DISPLAY
@@ -1390,11 +1392,12 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
                                BLOCKIN _ (FUNCTION \ILLEGAL.DEVICEOP)
                                BLOCKOUT _ (FUNCTION \NONPAGEDBOUTS)
                                DEVICEINFO _ (create DISPLAYSTATE)
-                               WINDOWOPS _ NIL))
+                               WINDOWOPS _ NIL
+                               DEFAULTEXTERNALFORMAT _ :DISPLAY))
     (\DEFINEDEVICE NIL \8DISPLAYFDEV])
 
 (\24DISPLAYINIT
-  [LAMBDA NIL                                         (* ; "Edited 22-Apr-94 15:18 by sybalsky")
+  [LAMBDA NIL                                           (* ; "Edited 25-Sep-2021 18:44 by rmk:")
     (DECLARE (GLOBALVARS \24DISPLAYIMAGEOPS \24DISPLAYFDEV))
     (SETQ \24DISPLAYIMAGEOPS (create IMAGEOPS
                                     IMAGETYPE _ '24DISPLAY
@@ -1458,7 +1461,8 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
                                 BLOCKIN _ (FUNCTION \ILLEGAL.DEVICEOP)
                                 BLOCKOUT _ (FUNCTION \NONPAGEDBOUTS)
                                 DEVICEINFO _ (create DISPLAYSTATE)
-                                WINDOWOPS _ NIL))
+                                WINDOWOPS _ NIL
+                                DEFAULTEXTERNALFORMAT _ :DISPLAY))
     (\DEFINEDEVICE NIL \24DISPLAYFDEV])
 
 (\DISPLAYSTREAMTYPEBPP
@@ -1509,24 +1513,24 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
 (PUTPROPS IMAGEIO COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 1991 
 1993 1994 1999 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3353 12110 (IMAGESTREAMP 3363 . 4195) (IMAGESTREAMTYPE 4197 . 4410) (IMAGESTREAMTYPEP 
-4412 . 5047) (OPENIMAGESTREAM 5049 . 10003) (\GOOD.DASHLST 10005 . 12108)) (12145 14442 (
-DRAWDASHEDLINE 12155 . 14440)) (14443 21783 (DSPBACKCOLOR 14453 . 14825) (DSPBOTTOMMARGIN 14827 . 
-15212) (DSPCOLOR 15214 . 15578) (DSPCLIPPINGREGION 15580 . 16285) (DSPRESET 16287 . 16567) (DSPFONT 
-16569 . 16933) (DSPLEFTMARGIN 16935 . 17316) (DSPLINEFEED 17318 . 17618) (DSPOPERATION 17620 . 17997) 
-(DSPRIGHTMARGIN 17999 . 18382) (DSPTOPMARGIN 18384 . 18763) (DSPSCALE 18765 . 19132) (DSPSPACEFACTOR 
-19134 . 19527) (DSPXPOSITION 19529 . 19834) (DSPYPOSITION 19836 . 20141) (DSPROTATE 20143 . 20438) (
-DSPPUSHSTATE 20440 . 20686) (DSPPOPSTATE 20688 . 20931) (DSPDEFAULTSTATE 20933 . 21185) (DSPSCALE2 
-21187 . 21478) (DSPTRANSLATE 21480 . 21781)) (21784 30585 (DSPNEWPAGE 21794 . 22486) (DRAWBETWEEN 
-22488 . 23190) (DRAWCIRCLE 23192 . 23688) (DRAWARC 23690 . 24207) (DRAWCURVE 24209 . 24886) (
-DRAWELLIPSE 24888 . 25674) (DRAWLINE 25676 . 26066) (DRAWPOLYGON 26068 . 26523) (DRAWPOINT 26525 . 
-26944) (FILLPOLYGON 26946 . 27512) (DRAWTO 27514 . 27932) (FILLCIRCLE 27934 . 28157) (MOVETO 28159 . 
-28523) (RELDRAWTO 28525 . 29442) (BITMAPIMAGESIZE 29444 . 29615) (SCALEDBITBLT 29617 . 30583)) (30586 
-37625 (\DRAWPOINT.GENERIC 30596 . 30943) (\DRAWPOLYGON.GENERIC 30945 . 33253) (\DRAWCIRCLE.GENERIC 
-33255 . 34913) (\DRAWELLIPSE.GENERIC 34915 . 37623)) (37626 43012 (\IMAGEIOINIT 37636 . 41769) (
-\NOIMAGE.DSPFONT 41771 . 42846) (\UNIMPIMAGEOP 42848 . 43010)) (43135 46259 (INSURE.BRUSH 43145 . 
-44519) (BRUSHP 44521 . 45311) (\POSSIBLECOLOR 45313 . 45864) (NEGSHADE 45866 . 46257)) (46815 47499 (
-DASHINGP 46825 . 47155) (INSURE.DASHING 47157 . 47497)) (57980 78429 (\DisplayEventFn 57990 . 58500) (
-\DISPLAYINIT 58502 . 64181) (\4DISPLAYINIT 64183 . 68820) (\8DISPLAYINIT 68822 . 73461) (
-\24DISPLAYINIT 73463 . 78170) (\DISPLAYSTREAMTYPEBPP 78172 . 78427)))))
+  (FILEMAP (NIL (3423 12180 (IMAGESTREAMP 3433 . 4265) (IMAGESTREAMTYPE 4267 . 4480) (IMAGESTREAMTYPEP 
+4482 . 5117) (OPENIMAGESTREAM 5119 . 10073) (\GOOD.DASHLST 10075 . 12178)) (12215 14512 (
+DRAWDASHEDLINE 12225 . 14510)) (14513 21853 (DSPBACKCOLOR 14523 . 14895) (DSPBOTTOMMARGIN 14897 . 
+15282) (DSPCOLOR 15284 . 15648) (DSPCLIPPINGREGION 15650 . 16355) (DSPRESET 16357 . 16637) (DSPFONT 
+16639 . 17003) (DSPLEFTMARGIN 17005 . 17386) (DSPLINEFEED 17388 . 17688) (DSPOPERATION 17690 . 18067) 
+(DSPRIGHTMARGIN 18069 . 18452) (DSPTOPMARGIN 18454 . 18833) (DSPSCALE 18835 . 19202) (DSPSPACEFACTOR 
+19204 . 19597) (DSPXPOSITION 19599 . 19904) (DSPYPOSITION 19906 . 20211) (DSPROTATE 20213 . 20508) (
+DSPPUSHSTATE 20510 . 20756) (DSPPOPSTATE 20758 . 21001) (DSPDEFAULTSTATE 21003 . 21255) (DSPSCALE2 
+21257 . 21548) (DSPTRANSLATE 21550 . 21851)) (21854 30655 (DSPNEWPAGE 21864 . 22556) (DRAWBETWEEN 
+22558 . 23260) (DRAWCIRCLE 23262 . 23758) (DRAWARC 23760 . 24277) (DRAWCURVE 24279 . 24956) (
+DRAWELLIPSE 24958 . 25744) (DRAWLINE 25746 . 26136) (DRAWPOLYGON 26138 . 26593) (DRAWPOINT 26595 . 
+27014) (FILLPOLYGON 27016 . 27582) (DRAWTO 27584 . 28002) (FILLCIRCLE 28004 . 28227) (MOVETO 28229 . 
+28593) (RELDRAWTO 28595 . 29512) (BITMAPIMAGESIZE 29514 . 29685) (SCALEDBITBLT 29687 . 30653)) (30656 
+37695 (\DRAWPOINT.GENERIC 30666 . 31013) (\DRAWPOLYGON.GENERIC 31015 . 33323) (\DRAWCIRCLE.GENERIC 
+33325 . 34983) (\DRAWELLIPSE.GENERIC 34985 . 37693)) (37696 43082 (\IMAGEIOINIT 37706 . 41839) (
+\NOIMAGE.DSPFONT 41841 . 42916) (\UNIMPIMAGEOP 42918 . 43080)) (43205 46329 (INSURE.BRUSH 43215 . 
+44589) (BRUSHP 44591 . 45381) (\POSSIBLECOLOR 45383 . 45934) (NEGSHADE 45936 . 46327)) (46885 47569 (
+DASHINGP 46895 . 47225) (INSURE.DASHING 47227 . 47567)) (58050 78596 (\DisplayEventFn 58060 . 58570) (
+\DISPLAYINIT 58572 . 64155) (\4DISPLAYINIT 64157 . 68858) (\8DISPLAYINIT 68860 . 73563) (
+\24DISPLAYINIT 73565 . 78337) (\DISPLAYSTREAMTYPEBPP 78339 . 78594)))))
 STOP
diff --git a/sources/IMAGEIO.LCOM b/sources/IMAGEIO.LCOM
index 943aa0ba..7d6574b9 100644
Binary files a/sources/IMAGEIO.LCOM and b/sources/IMAGEIO.LCOM differ
diff --git a/sources/LLREAD b/sources/LLREAD
index 32e8b723..56adef25 100644
--- a/sources/LLREAD
+++ b/sources/LLREAD
@@ -1,11 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "24-Aug-2021 10:04:18" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLREAD.;103 105490 
+(FILECREATED "10-Sep-2021 19:41:58" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLREAD.;101 90912  
 
-      changes to%:  (FNS CHARCODE.DECODE)
+      changes to%:  (VARS LLREADCOMS)
 
-      previous date%: "24-Aug-2021 08:32:13" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLREAD.;101)
+      previous date%: "24-Aug-2021 10:04:18" 
+{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLREAD.;100)
 
 
 (* ; "
@@ -15,25 +15,25 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
 (PRETTYCOMPRINT LLREADCOMS)
 
 (RPAQQ LLREADCOMS
-       [(COMS                                                (* ; "Reader entrypoints")
+       [(COMS                                                (* ; "Reader entrypoints")
               (FNS LASTC PEEKC PEEKCCODE RATOM READ READC READCCODE READP SETREADMACROFLG 
                    SKIPSEPRCODES SKIPSEPRS SKREAD))
-        (COMS                                                (* ; "CommonLisp read entry points")
+        (COMS                                                (* ; "CommonLisp read entry points")
               (FNS CL:READ CL:READ-PRESERVING-WHITESPACE CL:READ-DELIMITED-LIST CL:PARSE-INTEGER)
               (GLOBALVARS CMLRDTBL))
-        (COMS                                                (* ; "reading strings")
+        (COMS                                                (* ; "reading strings")
               (FNS RSTRING READ-EXTENDED-TOKEN \RSTRING2))
-        [COMS                                                (* ; "Core of the reader")
+        [COMS                                                (* ; "Core of the reader")
               (FNS \TOP-LEVEL-READ \SUBREAD \SUBREADCONCAT \ORIG-READ.SYMBOL \ORIG-INVALID.SYMBOL 
                    \APPLYREADMACRO INREADMACROP)
               (DECLARE%: DONTEVAL@LOAD DOCOPY (P (MOVD? '\ORIG-READ.SYMBOL '\READ.SYMBOL)
                                                  (MOVD? '\ORIG-INVALID.SYMBOL '\INVALID.SYMBOL]
-        (COMS                                                (* ; "Read macro for '")
+        (COMS                                                (* ; "Read macro for '")
               (FNS READQUOTE))
-        (COMS                                                (* ; "# macro")
+        (COMS                                                (* ; "# macro")
               (FNS READVBAR READHASHMACRO DEFMACRO-LAMBDA-LIST-KEYWORD-P DIGITBASEP READNUMBERINBASE
                    ESTIMATE-DIMENSIONALITY SKIP.HASH.COMMENT CMLREAD.FEATURE.PARSER))
-        (COMS                                                (* ; "Reading characters with #\")
+        (COMS                                                (* ; "Reading characters with #\")
               (FNS CHARACTER.READ CHARCODE.DECODE)
               (FNS HEXNUM? OCTALNUM?)
               (VARS CHARACTERNAMES CHARACTERSETNAMES))
@@ -41,19 +41,13 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
                (MACROS .CALL.SUBREAD. FIXDOT RBCONTEXT PROPRB \RDCONC)
                (SPECVARS *READ-NEWLINE-SUPPRESS* \RefillBufferFn)
                (GLOBALVARS *KEYWORD-PACKAGE* *INTERLISP-PACKAGE*))
-        (COMS 
-              (* ;; "Generic functions not compiled open")
-
-              (FNS \OUTCHAR \INCCODE \BACKCCODE \BACKCCODE.EOLC \PEEKCCODE \PEEKCCODE.NOEOLC 
-                   \INCCODE.EOLC \FORMATBYTESTREAM \CHECKEOLC.CRLF)
-              (MACROS \CHECKEOLC))
         (COMS (INITVARS (*REPLACE-NO-FONT-CODE* T)
                      (*DEFAULT-NOT-CONVERTED-FAT-CODE* 8739))
               (GLOBALVARS *REPLACE-NO-FONT-CODE* *DEFAULT-NOT-CONVERTED-FAT-CODE*))
         (INITVARS (*READ-NEWLINE-SUPPRESS*)
                (\RefillBufferFn (FUNCTION \READCREFILL)))
-                                                             (* ; 
-  "Top level val of \RefillBufferFn means act like READC--we must be doing a raw BIN (or PEEKBIN?)")
+                                                             (* ; 
+  "Top level val of \RefillBufferFn means act like READC--we must be doing a raw BIN (or PEEKBIN?)")
         (LOCALVARS . T)
         (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS
                (ADDVARS (NLAMA)
@@ -1604,8 +1598,8 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
                                                       EOF-SUPPRESS EOF-VALUE CHAR PRESERVE-WHITESPACE
                                                       ))))
 
-(PUTPROPS FIXDOT MACRO [NIL (PROGN                   (* ; 
-                                                      "Fix a non-first dot followed by a singleton")
+(PUTPROPS FIXDOT MACRO [NIL (PROGN                   (* ; 
+                                                      "Fix a non-first dot followed by a singleton")
                                            (AND DOTLOC (CDDR DOTLOC)
                                                 (NULL (CDDDR DOTLOC))
                                                 (RPLACD DOTLOC (CADDR DOTLOC])
@@ -1617,21 +1611,21 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
                                       \RBFLG]
                                     NIL)))
 
-(PUTPROPS PROPRB MACRO [(X . Y)                      (* ; 
-                                                           "Propagates the right-bracket flag")
+(PUTPROPS PROPRB MACRO [(X . Y)                      (* ; 
+                                                           "Propagates the right-bracket flag")
                                 (AND (RBCONTEXT X . Y)
                                      (OR (EQ READTYPE NOPROPRB.RT)
                                          (SETQ \RBFLG T])
 
 (PUTPROPS \RDCONC MACRO [(ELT . TOPFORMS)
 
-                                 (* ;; "Add ELT to the accumulating list to be returned by \SUBREAD.  If at top level and no list accumulated, then run TOPFORMS")
+                                 (* ;; "Add ELT to the accumulating list to be returned by \SUBREAD.  If at top level and no list accumulated, then run TOPFORMS")
 
                                  (COND
                                     [LST (RPLACD END (SETQ END (CONS ELT]
                                     (TOPLEVELP . TOPFORMS)
-                                    ((NOT *READ-SUPPRESS*)   (* ; 
-                                  "Don't bother consing the result if it's going to be thrown away")
+                                    ((NOT *READ-SUPPRESS*)   (* ; 
+                                  "Don't bother consing the result if it's going to be thrown away")
                                      (SETQ END (SETQ LST (CONS ELT])
 )
 
@@ -1646,274 +1640,6 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
 )
 )
 
-
-
-(* ;; "Generic functions not compiled open")
-
-(DEFINEQ
-
-(\OUTCHAR
-  [LAMBDA (STREAM CODE)                                 (* ; "Edited 10-Aug-2021 10:29 by rmk:")
-
-    (* ;; "We can't do the EOL stuff here because we don't know whether BOUTs are legit.")
-
-    (* ;; "Maybe the implementation function does something else, like move the X and Y positions.  At best we could convert the EOL into either CR or LF, or into a CR-LF sequence that we pass by two calls to the lower implementation function.")
-
-    (* ;; "")
-
-    (* ;; "This would make CHARPOSITION generic:")
-                                                             (* (FREPLACE (STREAM CHARPOSITION) 
-                                                           OF STREAM WITH (CL:IF
-                                                           (EQ CODE (CHARCODE EOL)) 0
-                                                           (IPLUS16 1 (FFETCH
-                                                           (STREAM CHARPOSITION) OF STREAM)))))
-    (CL:FUNCALL (OR (ffetch (STREAM OUTCHARFN) of STREAM)
-                    \DEFAULTOUTCHAR)
-           STREAM CODE)
-    CODE])
-
-(\INCCODE
-  [LAMBDA (STREAM BYTECOUNTVAR BYTECOUNTVAL)            (* ; "Edited  7-Aug-2021 00:11 by rmk:")
-
-    (* ;; "Calling functions pass the name of the BYTECOUNTVAR, or NIL. If non-NIL, implementing functions are required to SETQ *BYTECOUNTER* to the number of bytes read (positive) or backed up (negative).")
-
-    (* ;; "Caller must bind BYTECOUNTVAR as a SPECVAR.  BYTECOUNTVAL can be passed as the current value of BYTECOUNTVAR, to save a call to \EVALV1.")
-
-    (IF BYTECOUNTVAR
-        THEN [LET ((*BYTECOUNTER* 0))
-                      (DECLARE (SPECVARS *BYTECOUNTER*))
-                      (PROG1 (CL:FUNCALL (OR (ffetch (STREAM INCCODEFN) of STREAM)
-                                             \DEFAULTINCCODE)
-                                    STREAM
-                                    '*BYTECOUNTER*)
-                          (SET BYTECOUNTVAR (IDIFFERENCE (OR BYTECOUNTVAL (\EVALV1 BYTECOUNTVAR))
-                                                   *BYTECOUNTER*)))]
-      ELSE (CL:FUNCALL (OR (ffetch (STREAM INCCODEFN) of STREAM)
-                               \DEFAULTINCCODE)
-                      STREAM])
-
-(\BACKCCODE
-  [LAMBDA (STREAM BYTECOUNTVAR BYTECOUNTVAL)            (* ; "Edited 14-Aug-2021 00:26 by rmk:")
-
-    (* ;; 
-"Format function returns T if the backup succeed, NIL otherwise (e.g at the beginning of the file)")
-
-    (IF BYTECOUNTVAR
-        THEN [LET ((*BYTECOUNTER* 0))
-                      (DECLARE (SPECVARS *BYTECOUNTER*))
-                      (PROG1 (CL:FUNCALL (OR (ffetch (STREAM BACKCCODEFN) of STREAM)
-                                             \DEFAULTBACKCCODE)
-                                    STREAM T)
-                          (SET BYTECOUNTVAR (IPLUS (OR BYTECOUNTVAL (\EVALV1 BYTECOUNTVAR))
-                                                   *BYTECOUNTER*)))]
-      ELSE (CL:FUNCALL (OR (ffetch (STREAM BACKCCODEFN) of STREAM)
-                               \DEFAULTBACKCCODE)
-                      STREAM])
-
-(\BACKCCODE.EOLC
-  [LAMBDA (STREAM BYTECOUNTVAR BYTECOUNTVAL)            (* ; "Edited 14-Aug-2021 00:27 by rmk:")
-
-    (* ;; "If the EOLCONVENTION is CRLF, and the first backup is over an LF encoding, this looks to see whether the preceding bytes encode a CR and if so, backs up over those.")
-
-    (* ;; "Within this we operate at the external-format implementation level.")
-
-    (* ;; "Counting is unusual in general (mostly just COPYCHARS and PFCOPYBYTES) , and counting while backing up is even rarer.  So for simplicity here we just count by looking at the byte pointer.")
-
-    (LET [(STARTPOS (CL:WHEN BYTECOUNTVAR (\GETFILEPTR STREAM]
-
-         (* ;; "In almost all cases, we just execute the first backup")
-
-         (PROG1 (CL:WHEN (CL:FUNCALL (OR (ffetch (STREAM BACKCCODEFN) of STREAM)
-                                         \DEFAULTBACKCCODE)
-                                STREAM)
-                    (IF (AND (EQ CRLF.EOLC (FETCH (STREAM EOLCONVENTION) OF STREAM))
-                                 (EQ (CHARCODE LF)
-                                     (CL:FUNCALL (OR (ffetch (STREAM PEEKCCODEFN) of STREAM)
-                                                     \DEFAULTPEEKCCODE)
-                                            STREAM)))
-                        THEN 
-
-                              (* ;; 
-                    "We just backed over an LF in a CRLF file.  If we go one more, do we get a CR?")
-
-                              (CL:WHEN (CL:FUNCALL (OR (ffetch (STREAM BACKCCODEFN) of STREAM
-                                                              )
-                                                       \DEFAULTBACKCCODE)
-                                              STREAM)
-                                  (CL:UNLESS (EQ (CHARCODE CR)
-                                                 (CL:FUNCALL (OR (ffetch (STREAM PEEKCCODEFN)
-                                                                    of STREAM)
-                                                                 \DEFAULTPEEKCCODE)
-                                                        STREAM))
-
-                                      (* ;; "Not a preceding CR, reread it.")
-
-                                      (CL:FUNCALL (OR (ffetch (STREAM INCCODEFN) of STREAM)
-                                                      \DEFAULTINCCODE)
-                                             STREAM))
-                                  T)
-                      ELSE T))
-             (CL:WHEN BYTECOUNTVAR
-                 [SET BYTECOUNTVAR (IPLUS (OR BYTECOUNTVAL (\EVALV1 BYTECOUNTVAR))
-                                          (IDIFFERENCE STARTPOS (\GETFILEPTR STREAM]))])
-
-(\PEEKCCODE
-  [LAMBDA (STREAM NOERROR EOL)                          (* ; "Edited 14-Jun-2021 12:40 by rmk:")
-    (\CHECKEOLC (CL:FUNCALL (OR (ffetch (STREAM PEEKCCODEFN) of STREAM)
-                                \DEFAULTPEEKCCODE)
-                       STREAM NOERROR)
-           EOL STREAM T])
-
-(\PEEKCCODE.NOEOLC
-  [LAMBDA (STREAM NOERROR)                              (* ; "Edited 27-Jun-2021 23:26 by rmk:")
-    (CL:FUNCALL (OR (ffetch (STREAM PEEKCCODEFN) of STREAM)
-                    \DEFAULTPEEKCCODE)
-           STREAM NOERROR])
-
-(\INCCODE.EOLC
-  [LAMBDA (STREAM EOLC BYTECOUNTVAR BYTECOUNTVAL)       (* ; "Edited  8-Aug-2021 14:52 by rmk:")
-
-    (* ;; 
-  "EOL conversion around essentially a copy of \INCCODE but avoids the extra function call.")
-
-    (* ;; " EOLC of NIL means all patterns go to EOL")
-
-    (IF BYTECOUNTVAR
-        THEN [LET (*BYTECOUNTER* CODE)
-                      (DECLARE (SPECVARS *BYTECOUNTER*))
-
-                      (* ;; "The INCCODEFN first sets *BYTECOUNTER*")
-
-                      (CL:UNLESS BYTECOUNTVAL
-                          (SETQ BYTECOUNTVAL (\EVALV1 BYTECOUNTVAR)))
-                      (SETQ CODE (CL:FUNCALL (OR (ffetch (STREAM INCCODEFN) of STREAM)
-                                                 \DEFAULTINCCODE)
-                                        STREAM T))
-
-                      (* ;; "Update according to the number of first-char (CR or LF) bytes")
-
-                      (SETQ BYTECOUNTVAL (IDIFFERENCE BYTECOUNTVAL *BYTECOUNTER*))
-                      (SETQ *BYTECOUNTER* 0)
-
-                      (* ;; 
-                    "*BYTECOUNTER* will now be reset to the number of LF-after-CR bytes, if any")
-
-                      (PROG1 (\CHECKEOLC CODE (OR EOLC (FFETCH (STREAM EOLCONVENTION)
-                                                          OF STREAM))
-                                    STREAM NIL T)
-
-                          (* ;; "Post the results")
-
-                          (SET BYTECOUNTVAR (IDIFFERENCE BYTECOUNTVAL *BYTECOUNTER*)))]
-      ELSE (\CHECKEOLC (CL:FUNCALL (OR (ffetch (STREAM INCCODEFN) of STREAM)
-                                           \DEFAULTINCCODE)
-                                  STREAM)
-                      (OR EOLC (FFETCH (STREAM EOLCONVENTION) OF STREAM))
-                      STREAM])
-
-(\FORMATBYTESTREAM
-  [LAMBDA (STREAM BYTESTREAM)                           (* ; "Edited 24-Jun-2021 17:26 by rmk:")
-
-    (* ;; "Create or modify a stream that will simulate the current character input/output byte sequences of  STREAM.  The set up here does what is common to all formats:  an IO stream starting with STREAM external format and EOL.")
-
-    (* ;; "If the format has its own FORMATBYTESTREAMFN function, that is applied to copy any other state.  (Currently that function is a property of the format, not carried over into a stream field that can be changed dynamically.)")
-
-    (CL:UNLESS (AND (STREAMP BYTESTREAM)
-                    (\IOMODEP STREAM 'BOTH))
-        (SETQ BYTESTREAM (OPENSTREAM '{NODIRCORE} 'BOTH)))
-    (LET ((FORMAT (FETCH (STREAM EXTERNALFORMAT) OF STREAM))
-          (EOLC (FETCH (STREAM EOLCONVENTION) OF STREAM)))
-         (\EXTERNALFORMAT BYTESTREAM FORMAT)
-         (CL:WHEN (EQ EOLC ANY.EOLC)
-             (SETQ EOLC (OR (FETCH (EXTERNALFORMAT EOL) OF FORMAT)
-                            LF.EOLC)))
-         (REPLACE (STREAM EOLCONVENTION) OF BYTESTREAM WITH EOLC)
-         (SETFILEPTR BYTESTREAM 0)
-         (SETFILEINFO BYTESTREAM 'ENDOFSTREAMOP (FUNCTION NILL))
-         (CL:WHEN (FETCH (EXTERNALFORMAT FORMATBYTESTREAMFN) OF FORMAT)
-             (APPLY* (FETCH (EXTERNALFORMAT FORMATBYTESTREAMFN) OF FORMAT)
-                    STREAM BYTESTREAM))
-         BYTESTREAM])
-
-(\CHECKEOLC.CRLF
-  [LAMBDA (STREAM PEEKBINFLG COUNTP)                    (* ; "Edited  6-Aug-2021 23:30 by rmk:")
-
-    (* ;; "This is called only when a CR has been read and EOLC is either any or CRLF. This returns EOL if the next code is an LF")
-
-    (* ;; "If COUNTP, that sets *BYTECOUNTER* freely with the number of LF bytes.")
-
-    (DECLARE (USEDFREE *BYTECOUNTER*))
-    (LET (CH)
-         [SETQ CH (COND
-                     [PEEKBINFLG 
-
-                            (* ;; 
-                          "T from PEEKC.  In this case, must leave the fileptr where it was.")
-
-                            (* ;; "The CR itself hasn't been read, just peeked.  So here we have to read it, then peek at the next character to see if it is an LF, and then back out the CR")
-
-                            (COND
-                               ([EQ (CHARCODE LF)
-                                    (UNINTERRUPTABLY
-                                        
-                                        (* ;; " Since we are going to \BACKCCODE back the peeked character, we don't need to update the counter variable")
-
-                                        (\INCCODE STREAM)
-                                        (PROG1 (\PEEKCCODE STREAM T 'NOEOLC)
-
-                                            (* ;; 
-                          "This has to be a call to \PEEKCODE that doesn't itself to the checkeolc")
-
-                                            (* ;; 
-          "LF must be the next char after the CR.  We back up over the CR that \INCCODE just read.")
-
-                                            (\BACKCCODE STREAM)))]
-
-                                (* ;; "Got the CRLF, it's an EOL")
-
-                                (CHARCODE EOL))
-                               (T (CHARCODE CR]
-                     ((EQ (CHARCODE LF)
-                          (\PEEKCCODE STREAM T 'NOEOLC))
-
-                      (* ;; "Since we aren't peeking, the CR has actually been read, and we are entitled to read the LF that we just peeked at.")
-
-                      (IF COUNTP
-                          THEN (LET (NUMLFBYTES)
-                                        (DECLARE (SPECVARS NUMLFBYTES))
-                                        (\INCCODE STREAM 'NUMLFBYTES 0)
-                                        (ADD *BYTECOUNTER* NUMLFBYTES))
-                        ELSE (\INCCODE STREAM))
-                      (CHARCODE EOL))
-                     (T (CHARCODE CR]
-         CH])
-)
-(DECLARE%: EVAL@COMPILE 
-
-(PUTPROPS \CHECKEOLC MACRO [OPENLAMBDA (CH EOLC STRM PEEKBINFLG COUNTP)
-                                     (COND
-                                        ((EQ EOLC 'NOEOLC)
-                                         CH)
-                                        (T (SELCHARQ CH
-                                                (LF (SELECTC (OR EOLC (FFETCH (STREAM 
-                                                                                        EOLCONVENTION
-                                                                                         )
-                                                                         OF STRM))
-                                                        ((LIST LF.EOLC ANY.EOLC) 
-                                                             (CHARCODE EOL))
-                                                        (CHARCODE LF)))
-                                                (CR (SELECTC (OR EOLC (FFETCH (STREAM 
-                                                                                        EOLCONVENTION
-                                                                                         )
-                                                                         OF STRM))
-                                                        (CR.EOLC (CHARCODE EOL))
-                                                        ((LIST ANY.EOLC CRLF.EOLC) 
-                                                             (\CHECKEOLC.CRLF STRM PEEKBINFLG 
-                                                                    COUNTP))
-                                                        (CHARCODE CR)))
-                                                CH])
-)
-
 (RPAQ? *REPLACE-NO-FONT-CODE* T)
 
 (RPAQ? *DEFAULT-NOT-CONVERTED-FAT-CODE* 8739)
@@ -1946,20 +1672,17 @@ Copyright (c) 1981-1988, 1990-1991, 1993, 2021 by Venue & Xerox Corporation.
 (PUTPROPS LLREAD COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1990 
 1991 1993 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3516 11745 (LASTC 3526 . 3832) (PEEKC 3834 . 4222) (PEEKCCODE 4224 . 4517) (RATOM 4519
- . 5600) (READ 5602 . 6162) (READC 6164 . 6805) (READCCODE 6807 . 7566) (READP 7568 . 8120) (
-SETREADMACROFLG 8122 . 8421) (SKIPSEPRCODES 8423 . 9406) (SKIPSEPRS 9408 . 9794) (SKREAD 9796 . 11743)
-) (11791 20400 (CL:READ 11801 . 12350) (CL:READ-PRESERVING-WHITESPACE 12352 . 13074) (
-CL:READ-DELIMITED-LIST 13076 . 13991) (CL:PARSE-INTEGER 13993 . 20398)) (20493 32970 (RSTRING 20503 . 
-21235) (READ-EXTENDED-TOKEN 21237 . 25109) (\RSTRING2 25111 . 32968)) (33006 64146 (\TOP-LEVEL-READ 
-33016 . 34999) (\SUBREAD 35001 . 60562) (\SUBREADCONCAT 60564 . 61187) (\ORIG-READ.SYMBOL 61189 . 
-62257) (\ORIG-INVALID.SYMBOL 62259 . 63158) (\APPLYREADMACRO 63160 . 63576) (INREADMACROP 63578 . 
-64144)) (64305 64480 (READQUOTE 64315 . 64478)) (64505 76409 (READVBAR 64515 . 65846) (READHASHMACRO 
-65848 . 71658) (DEFMACRO-LAMBDA-LIST-KEYWORD-P 71660 . 71880) (DIGITBASEP 71882 . 72616) (
-READNUMBERINBASE 72618 . 74504) (ESTIMATE-DIMENSIONALITY 74506 . 74831) (SKIP.HASH.COMMENT 74833 . 
-75801) (CMLREAD.FEATURE.PARSER 75803 . 76407)) (76453 82797 (CHARACTER.READ 76463 . 77717) (
-CHARCODE.DECODE 77719 . 82795)) (82798 85968 (HEXNUM? 82808 . 85151) (OCTALNUM? 85153 . 85966)) (90440
- 102934 (\OUTCHAR 90450 . 91586) (\INCCODE 91588 . 92774) (\BACKCCODE 92776 . 93670) (\BACKCCODE.EOLC 
-93672 . 96435) (\PEEKCCODE 96437 . 96753) (\PEEKCCODE.NOEOLC 96755 . 97017) (\INCCODE.EOLC 97019 . 
-98878) (\FORMATBYTESTREAM 98880 . 100366) (\CHECKEOLC.CRLF 100368 . 102932)))))
+  (FILEMAP (NIL (3236 11465 (LASTC 3246 . 3552) (PEEKC 3554 . 3942) (PEEKCCODE 3944 . 4237) (RATOM 4239
+ . 5320) (READ 5322 . 5882) (READC 5884 . 6525) (READCCODE 6527 . 7286) (READP 7288 . 7840) (
+SETREADMACROFLG 7842 . 8141) (SKIPSEPRCODES 8143 . 9126) (SKIPSEPRS 9128 . 9514) (SKREAD 9516 . 11463)
+) (11511 20120 (CL:READ 11521 . 12070) (CL:READ-PRESERVING-WHITESPACE 12072 . 12794) (
+CL:READ-DELIMITED-LIST 12796 . 13711) (CL:PARSE-INTEGER 13713 . 20118)) (20213 32690 (RSTRING 20223 . 
+20955) (READ-EXTENDED-TOKEN 20957 . 24829) (\RSTRING2 24831 . 32688)) (32726 63866 (\TOP-LEVEL-READ 
+32736 . 34719) (\SUBREAD 34721 . 60282) (\SUBREADCONCAT 60284 . 60907) (\ORIG-READ.SYMBOL 60909 . 
+61977) (\ORIG-INVALID.SYMBOL 61979 . 62878) (\APPLYREADMACRO 62880 . 63296) (INREADMACROP 63298 . 
+63864)) (64025 64200 (READQUOTE 64035 . 64198)) (64225 76129 (READVBAR 64235 . 65566) (READHASHMACRO 
+65568 . 71378) (DEFMACRO-LAMBDA-LIST-KEYWORD-P 71380 . 71600) (DIGITBASEP 71602 . 72336) (
+READNUMBERINBASE 72338 . 74224) (ESTIMATE-DIMENSIONALITY 74226 . 74551) (SKIP.HASH.COMMENT 74553 . 
+75521) (CMLREAD.FEATURE.PARSER 75523 . 76127)) (76173 82517 (CHARACTER.READ 76183 . 77437) (
+CHARCODE.DECODE 77439 . 82515)) (82518 85688 (HEXNUM? 82528 . 84871) (OCTALNUM? 84873 . 85686)))))
 STOP
diff --git a/sources/LLREAD.LCOM b/sources/LLREAD.LCOM
index 10fbf4f7..4f248e27 100644
Binary files a/sources/LLREAD.LCOM and b/sources/LLREAD.LCOM differ
