reduce changes: no separate MAKEFILE-NEW but fix so it will not copy from previous version if you do MAKEFILE(something NEW).

A few fixes to UNICODE that I stumbled across.

README.md

@@ -1,45 +1,43 @@
 # Medley 
 
-This repository is for the Lisp environment of [Medley Interlisp](https://Interlisp.org).
+This repository is for the Lisp environment of [Medley](https://interlisp.org).
 
-See the [Documentation links](https://github.com/Interlisp/medley/wiki/Documentation) for an overview and pointers to documentation.
-In particular [Running](https://github.com/Interlisp/medley/wiki/Running) explains other methods of getting Medley Interlisp.
+[Install and Run](https://interlisp.org/software/install-and-run) covers ways to install and start up Medley on Linux systems, MacOS, and Windows (with or without WSL).
 
-[Interlisp/maiko](https://github.com/Interlisp/maiko), is the repo for the implementation (in C) of the Medley virtual machine.
+[Using Medley](https://interlisp.org/software/using-medley/) has an overview and pointers to documentation.
 
-## Using releases
+[Interlisp/maiko](https://github.com/Interlisp/maiko), is the repo for the implementation (in C) of the Medley virtual machine. 
 
-There currently are separate releases of medley and maiko; get the latest version of each.
+## Releases
 
-### Getting releases
+While there are installers for popular platforms, this section may be useful in some circumstances.
 
-Get the Maiko release [here](https://github.com/Interlisp/maiko/releases). You'll need the .tgz file corresponding to your operating system and processor (for Windows with WSL or Intel Linux, use `linux.x86_64`; for Macs use `darwin.x86_64` for Intel and `darwin.aarch64` for M1.)
+### Getting releases 
 
-Or, build your own maiko (the binaries `lde` `ldex` and `ldeinit`) We can build for other OS arch pairs depending on what is available for GitHub actions.
+Get the Maiko release [here](https://github.com/Interlisp/maiko/releases). You'll need the .tgz file corresponding to your operating system and processor. For Windows with WSL or Intel Linux, use `linux.x86_64`; for Macs use `darwin.x86_64` for Intel and `darwin.aarch64` for Mac silicon. Windows without WSL uses `cygwin` instead.
 
-The medley release comes in two parts, found [here](https://github.com/Interlisp/medley/releases)
-1. The "loadups" (download `medley-`YYMMDD`-loadups.tgz`)
-2. The "runtime" (download `medley-`YYMMDD`-runtime.tgz`)
+Or, build your own maiko (the binaries `lde`, `ldex` OR `ldesdl`, and `ldeinit`).
+You can also build for other architectures
 
-You don't need the "runtime" if you've cloned this (medley) repo, but you'll still need the "loadups" release.
+The medley release image and sources come in two parts, found [here](https://github.com/Interlisp/medley/releases)
+1. The "loadups" (download `medley-`_YYMMDD-XXXXX_`-loadups.tgz`)
+2. The "runtime" (download `medley-`_YYMMDD-XXXXX_`-runtime.tgz`)
 
-If you happen to have the 'gh' GitHub command line installed you can download both using
-```
-   gh release download -R Interlisp/medley -p "*"
-```
-but otherwise just click on the link(s) below to the parts you need.
+where _YYMMDD_ is the date and _XXXXX_ is the GitHub commit ID.
+
+The "runtime" isn't needed if you've cloned the (medley) repo--you have all the files. The "runtime" has extra fonts, unicode tables, and source code that aren't part of the loadups but may be called on.
 
 ### Unpacking releases
 
 From a shell/terminal window:
 
-1. Choose where you want to install medley and maiko.
-Unpack the medley loadups file
+1. Choose a directory _parent_ where you want to install medley and maiko. 
+2. Unpack the medley loadups file
 
-*  `cd ` ~parent~
-*  `tar xvzf medley-`YYMMDD`-loadups.tgz`
+* `cd ` _parent_
+* `tar xvzf medley-`_YYMMDD-XXXXX_`-loadups.tgz`
 
-2. Unpack the medley runtime OR clone the Medley repo
+3. Unpack the medley runtime OR clone the Medley repo
    (the "medley runtime" is just a subset of the whole repo)
    
 * `tar xvzf medley-`YYMMDD`-runtime.tgz` 
@@ -49,25 +47,27 @@ Unpack the medley loadups file
    git clone https://github.com/Interlisp/medley
    ```
    
-3. Unpack the maiko file for your operating system and CPU type, e.g.,
+4. Unpack the maiko file for your operating system and CPU type, e.g.,
 
    ```
    tar xvzf maiko-210823.linux.x86_64.tgz
    ```
 
-3. This should leave you with two directories, `medley` and `maiko`.
+5. This should leave you with two directories, `medley` and `maiko`.
 
 ### Setting up X
 
-Medley Interlisp currently needs an X-Server to manage its display. Most Linux desktops have one. Windows 11 with WSL includes an X-Server. For Windows 10 with WSL2, there are a number of open-source X servers; for example vcxsrv.
+In many configurations, Medley uses an X-Server to manage its display. Most Linux desktops have one. Windows 11 with WSL includes an X-Server. For Windows 10 with WSL2, there are a number of open-source X servers; for example vcxsrv.
 
 Mac users should get [XQuartz from XQuartz.org](https://xquartz.org/releases).
 
 Medley manages the display entirely, doesn't use X fonts and manages it's own window system.
 
-If you have a high-resolution display, note that much of the graphics was designed for a low-resolution display, so an X-server that does "pixel doublilng" is best. (E.g., Raspberry Pi does pixel doubling on 4K displays.) It also presumes you have a 3-button mouse; the scroll-wheel on some mice act as one with some difficulty.) XQuartz Preferences/Input has "Emulate three button mouse" option.
+If you have a high-resolution display, note that much of the graphics was designed for a low-resolution display, so an X-server that does "pixel doubling" is best. (E.g., Raspberry Pi does pixel doubling on 4K displays.)
 
-### Running Medley Interlisp
+Medley presumes you have a 3-button mouse; the scroll-wheel on some mice acts as one, with some difficulty. Go into XQuartz Preferences/Input and check "Emulate three button mouse" option.
+
+### Running Medley Interlisp (obsolete)
 
 The `run-medley` script in this repo sets up some convenient defaults. Running Medley can be done by typing:
 ```
@@ -112,7 +112,8 @@ you can continue right where you left off.
 File Names and Extensions: Most Interlisp source file names are
 UPPERCASE and Interlisp didn't use file extensions for its source
 files. A .TEDIT or .TXT file is probably documentation
-for the package of same name, at least in the library, lispusers.
+for the package of the same name, at least in the library and lispusers
+directories.
 
 The current repo has both Lisp sources and compiled .LCOM and .DFASL
 files.
@@ -121,9 +122,8 @@ Each directory should have a README.md, but briefly
 
 * BUILDING.md -- instructions on how to make your own loadups
 * clos -- early implementation of Common Lisp Object System
-* CLTL2 -- files submitted to bring Medley up to the conformance to "Common Lisp, the Language" 2nd edition. Not enough to conform to the ANSII standard lisp.
-* Dockerfile -- used when building Docker containers with Medley
-* docs -- Documentation files (in TEdit format PDFs or online help; look [here](https://github.com/Interlisp/medley/Documentation)
+* CLTL2 -- files submitted to bring Medley up to the conformance to "Common Lisp, the Language" 2nd edition. Not enough to conform to the ANSI standard lisp.
+* docs -- Documentation files (in TEdit format, PDFs, or online help; look [here](https://github.com/Interlisp/medley/Documentation))
 * fonts -- raster fonts (or font widths) in various resolutions for display, postscript, interpress, press formats
 * greetfiles -- various configuration setups
 * internal -- These _were_ internal to Venue
@@ -133,11 +133,6 @@ Each directory should have a README.md, but briefly
 * obsolete  -- files we should remove from the repo
 * rooms -- implementation of ROOMS window/desktop manager
 * run-medley -- script to enhance the options of running medley
-* scripts  -- some scripts for fixing up things
+* scripts  -- some scripts for fixing up things, building and running medley
 * sources   -- sources for Interlisp and Common Lisp implementations
 * unicode  -- data files for support of XCCS to and from Unicode mappings
-
-plus
-   Dockerfile, and scripts for building and running medley
-   tmp directory for use during build processes
-

internal/MEDLEY-UTILS

@@ -1,20 +1,22 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED " 3-Aug-2023 18:40:12" |{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;6|
 10695  
+
(FILECREATED "16-Nov-2023 21:59:19" |{DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;2|
 18962  
 
-      :EDIT-BY "frank"
+      :EDIT-BY "lmm"
 
-      :CHANGES-TO (FNS MAKE-FULLER-DB MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH)
+      :CHANGES-TO (VARS OKLIBRARY OKLISPUSERS)
 
-      :PREVIOUS-DATE " 1-Aug-2023 22:43:13" 
-|{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;5|)
+      :PREVIOUS-DATE " 4-Nov-2023 15:23:16" |{DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;1|)
 
 
 (PRETTYCOMPRINT MEDLEY-UTILSCOMS)
 
 (RPAQQ MEDLEY-UTILSCOMS
 ((FNS GATHER-INFO MAKE-FULLER-DB MEDLEY-FIX-LINKS MEDLEY-FIX-DATES)
                          (VARS MEDLEY-FIX-DIRS OKSOURCES OKLIBRARY OKLISPUSERS OKINTERNAL)
-                         (FNS MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH)))
+                         (FNS MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH)
+                         (FNS BADFILE HCFILES PRETTYFILES)
+                         (INITVARS (HCFILES)
+                                (BADFILES))))
 (DEFINEQ
 
 (GATHER-INFO

@@ -137,12 +139,15 @@
        (POSTSCRIPTSTREAM CHATTERMINAL DMCHAT CHAT PRESS READNUMBER EDITBITMAP IMAGEOBJ TEDIT HRULE 
               TABLEBROWSER FILEBROWSER GRAPHER SPY WHERE-IS COPYFILES MSANALYZE MSPARSE MSCOMMON 
               MASTERSCOPE UNIXCOMM UNIXPRINT UNICODE HASH CLIPBOARD UNIXCHAT VT100KP VTCHAT SKETCH 
-              SKETCHBMELT SCALEBITMAP SKETCHOBJ SKETCHEDIT SKETCHELEMENTS SKETCHOPS MATMULT SAMEDIR))
+              SKETCHBMELT SCALEBITMAP SKETCHOBJ SKETCHEDIT SKETCHELEMENTS SKETCHOPS MATMULT SAMEDIR 
+              REMOTEVMEM ETHERRECORDS UNIXUTILS CHATDECLS BROWSER))
 
-(RPAQQ OKLISPUSERS
 (THINFILES ISO8859IO DINFO HELPSYS MODERNIZE WHEELSCROLL PRETTYFILEINDEX WHO-LINE
-                          BACKGROUND-YIELD OBJECTWINDOW REGIONMANAGER COMPARETEXT EXAMINEDEFS 
-                          COMPARESOURCES COMPAREDIRECTORIES PSEUDOHOSTS DATEFORMAT-EDITOR DOC-OBJECTS
-                          EQUATIONS BICLOCK FILEWATCH LIFE IDLEHAX GITFNS TMAX IMTOOLS))
+(RPAQQ OKLISPUSERS

+       (THINFILES ISO8859IO DINFO HELPSYS MODERNIZE WHEELSCROLL PRETTYFILEINDEX WHO-LINE 
+              BACKGROUND-YIELD OBJECTWINDOW REGIONMANAGER COMPARETEXT EXAMINEDEFS COMPARESOURCES 
+              COMPAREDIRECTORIES PSEUDOHOSTS DATEFORMAT-EDITOR DOC-OBJECTS EQUATIONS BICLOCK 
+              FILEWATCH LIFE IDLEHAX GITFNS TMAX IMTOOLS EQUATIONFORMS UNBOXEDOPS TILED-SEDIT 
+              IDLEDEMO WDWHACKS BUTTONS PICK PAGEHOLD UNIXYCD))
 
 (RPAQQ OKINTERNAL
 (MEDLEY-UTILS))
 (DEFINEQ
@@ -176,8 +181,167 @@
          (RENAMEFILE HASHFILE (OR WHEREISFILE "whereis.hash"))
          (DRIBBLE))))
 )
+(DEFINEQ
+
+(BADFILE

+  (LAMBDA NIL
                                               (* \; "Edited 20-Oct-2022 15:40 by lmm")


+                                                          (* \; "Edited 22-Jun-2022 09:40 by larry")

+    (|pushnew|
 BADFILES *FILE*)
+    (LET ((STR (OPENSTREAM "BADFILES.TXT" 'APPEND)))
+         (SETFILEPTR STR -1)
+         (PRINT *FILE* STR)
+         (CLOSEF STR))
+    (RETFROM (OR (STKPOS 'PRETTYFILES)
+                 'HCFILES))))
+
+(HCFILES

+  (LAMBDA (*FILE* DEST REDOFLG TOPDIRLEN)
+    (DECLARE
 (SPECVARS *FILE*)
+           (GLOBALVARS BADFILE))
                            (* \; "Edited  4-Nov-2023 11:14 by lmm")


+                                                            (* \; "Edited 20-Oct-2022 16:11 by lmm")


+                                                            (* \; "Edited  9-Aug-2022 20:44 by lmm")

+    (|if|
 (NULL *FILE*)
+        |then|
 (SETQ *FILE* MEDLEYDIR))
+    (COND
+       ((LISTP *FILE*)
+        (FOR
 X IN
 *FILE* DO
 (HCFILES
 X DEST REDOFLG TOPDIRLEN)))
+       ((DIRECTORYNAMEP *FILE*)
+
+        (* |;;| "canonicalize")

+
+        (SETQ *FILE* (DIRECTORYNAME *FILE*))
+        (OR TOPDIRLEN (SETQ TOPDIRLEN (CL:LENGTH (FILENAMEFIELD.STRING *FILE* 'DIRECTORY))))
+        (CL:UNLESS DEST
+            (|ShellCommand| (CONCAT "mkdir -p " (UNIX-GETENV "MEDLEYDIR")
+                                   "/tmp/psfiles/"))
+            (SETQ DEST (MEDLEYDIR "tmp/psfiles" NIL T T)))
+
+        (* |;;| "first deal with files in this directory")

+
+        (|for|
 EXT |in|
 '("TED*" "SKETCH")
+           |do|
 (|for|
 X |in|
 (DIRECTORY (CONCAT *FILE* "*." EXT ";*"))
+                   |do|
 (HCFILES
 X DEST REDOFLG TOPDIRLEN)))
+
+        (* |;;| " then deal with subdirs ")

+
+        (|for|
 X |in|
 (DIRECTORY (CONCAT *FILE* "*"))
+           |when|
 (|for|
 SKIP |in|
 '(">." ">dinfo>") |always|
 (NOT (STRPOS SKIP (L-CASE X))))
+           |when|
 (DIRECTORYNAMEP X) |do|
 (HCFILES
 X DEST REDOFLG TOPDIRLEN)))
+       ((SETQ *FILE* (INFILEP *FILE*))
+        (LET* ((TF (UNPACKFILENAME.STRING *FILE*))
+               (NAME (LISTGET TF 'NAME))
+               (DIR (LISTGET TF 'DIRECTORY))
+               (PSFILE (PACKFILENAME.STRING
+                        'EXTENSION
+                        (|if|
 (EQ REDOFLG 'IP)
+                            |then|
 "IP"
+                          |else|
 "PS")
+                        'NAME
+                        (|if|
 (EQ DEST T)
+                            |then|
                           (* \; "with the tedit file")

+                                  NAME
+                          |else|
 (CONCAT (PACK (SUBST '- '> (UNPACK (SUBSTRING DIR (IPLUS 2 TOPDIRLEN
+                                                                                          )
+                                                                           -1))))
+                                        "-" NAME))
+                        'HOST
+                        (LISTGET TF 'HOST)
+                        'DIRECTORY
+                        (|if|
 (EQ DEST T)
+                            |then|
 DIR
+                          |else|
 DEST)))
+               (TEXTSTREAM))
+              (|if|
 (AND (NOT REDOFLG)
+                         (INFILEP PSFILE))
+                  |then|
                                     (* \; " do nothing")

+                        (PRINTOUT T PSFILE " already there" T)
+                |elseif|
 (EQ REDOFLG 'TEST)
+                  |then|
 (PRINTOUT T *FILE* "-> " PSFILE T)
+                        (CLOSEF (OPENTEXTSTREAM *FILE*))
+                |elseif|
 (MEMBER *FILE* BADFILES)
+                  |then|
 (PRINTOUT T "Skipping " *FILE* " on BADFILES")
+                |else|
 (PRINTOUT T "Converting " *FILE* " to " PSFILE "...")
+                      (TEDIT.FORMAT.HARDCOPY (SETQ TEXTSTREAM (OPENTEXTSTREAM *FILE*))
+                             PSFILE T NIL NIL NIL (|if|
 (EQ REDOFLG 'IP)
+                                                      |then|
 'INTERPRESS
+                                                    |else|
 'POSTSCRIPT))
+                      (|printout| T " DONE" T)
+                      (CLOSEF? TEXTSTREAM))))
+       (T (PRINTOUT T "no such file " T)))))
+
+(PRETTYFILES

+  (LAMBDA (*FILE* DEST REDOFLG TOPDIRLEN)
+    (DECLARE
 (SPECVARS *FILE*)
+           (GLOBALVARS BADFILES))
                           (* \; "Edited 20-Oct-2022 16:12 by lmm")


+                                                            (* \; "Edited  9-Aug-2022 20:44 by lmm")

+    (|if|
 (NULL *FILE*)
+        |then|
 (SETQ *FILE* MEDLEYDIR))
+    (COND
+       ((DIRECTORYNAMEP *FILE*)
+
+        (* |;;| "canonicalize")

+
+        (SETQ *FILE* (DIRECTORYNAME *FILE*))
+        (OR TOPDIRLEN (SETQ TOPDIRLEN (CL:LENGTH (FILENAMEFIELD.STRING *FILE* 'DIRECTORY))))
+        (CL:UNLESS DEST
+            (|ShellCommand| (CONCAT "mkdir -p " (UNIX-GETENV "MEDLEYDIR")
+                                   "/tmp/psfiles/"))
+            (SETQ DEST (MEDLEYDIR "tmp/psfiles" NIL T T)))
+
+        (* |;;| "first deal with files in this directory; ignore files with extensions for now\"*.LISP\" \"*.ILISP\"")

+
+        (|for|
 PAT |in|
 '("*.;") |do|
 (|for|
 X |in|
 (DIRECTORY (CONCAT *FILE* PAT))
+                                         WHEN
 (NOT (DIRECTORYNAMEP X)) WHEN
 (INFILEP X)
+                                         WHEN
 (CAR (OR (NLSETQ (LISPSOURCEFILEP X))
+                                                       (PROGN (PRINTOUT T "LISPSOURCEFILEP error" X)
+                                                              NIL)))
+                                         |do|
 (PRETTYFILES
 X DEST REDOFLG TOPDIRLEN)))
+
+        (* |;;| " then deal with subdirs ")

+
+        (|for|
 X |in|
 (DIRECTORY (CONCAT *FILE* "*"))
+           |when|
 (|for|
 SKIP IN
 '("clos" "cltl2" "rooms>" ".>")
+                     |always|
 (NOT (STRPOS SKIP (L-CASE X)))) |when|
 (DIRECTORYNAMEP X)
+           |do|
 (PRETTYFILES
 X DEST REDOFLG TOPDIRLEN)))
+       ((AND (SETQ *FILE* (INFILEP *FILE*))
+             (LISPSOURCEFILEP *FILE*))
+        (LET* ((TF (UNPACKFILENAME.STRING *FILE*))
+               (NAME (LISTGET TF 'NAME))
+               (DIR (LISTGET TF 'DIRECTORY))
+               (PSFILE (PACKFILENAME.STRING
+                        'EXTENSION "ps" 'NAME
+                        (|if|
 (EQ DEST T)
+                            |then|
                           (* \; "with the source file")

+                                  (CONCAT NAME ".pfi")
+                          |else|
 (CONCAT (PACK (SUBST '- '> (UNPACK (SUBSTRING DIR (IPLUS 2 TOPDIRLEN
+                                                                                          )
+                                                                           -1))))
+                                        "-" NAME))
+                        'HOST
+                        (LISTGET TF 'HOST)
+                        'DIRECTORY
+                        (|if|
 (EQ DEST T)
+                            |then|
 DIR
+                          |else|
 DEST))))
+              (|if|
 (AND (NOT REDOFLG)
+                         (INFILEP PSFILE))
+                  |then|
                                     (* \; " do nothing")

+                        (PRINTOUT T PSFILE " already there" T)
+                |elseif|
 (MEMBER *FILE* BADFILES)
+                  |then|
 (PRINTOUT T "Skipping " *FILE* " on BADFILES")
+                |else|
 (PRINTOUT T "Converting " *FILE* " to " PSFILE "...")
+                      (CL:WITH-OPEN-STREAM (STR (OPENPOSTSCRIPTSTREAM PSFILE))
+                             (PRETTYFILEINDEX *FILE* NIL STR))
+                      (|printout| T " DONE" T))))
+       (T (PRINTOUT T "no such file " T)))))
+)
+
+(RPAQ? HCFILES
 )
+
+(RPAQ? BADFILES
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (679 7642 (GATHER-INFO 689 . 6217) (MAKE-FULLER-DB 6219 . 6997) (MEDLEY-FIX-LINKS 6999
- . 7396) (MEDLEY-FIX-DATES 7398 . 7640)) (8681 10672 (MAKE-EXPORTS-ALL 8691 . 9752) (MAKE-WHEREIS-HASH
- 9754 . 10670)))))
+  (FILEMAP (NIL (781 7744 (GATHER-INFO 791 . 6319) (MAKE-FULLER-DB 6321 . 7099) (MEDLEY-FIX-LINKS 7101
+ . 7498) (MEDLEY-FIX-DATES 7500 . 7742)) (8923 10914 (MAKE-EXPORTS-ALL 8933 . 9994) (MAKE-WHEREIS-HASH
+ 9996 . 10912)) (10915 18894 (BADFILE 10925 . 11393) (HCFILES 11395 . 15280) (PRETTYFILES 15282 . 
+18892)))))
 STOP

library/FILEBROWSER

@@ -1,12 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED "19-Jul-2023 09:30:47" |{WMEDLEY}<library>FILEBROWSER.;25|
 265978 
+
(FILECREATED " 4-Nov-2023 23:55:27" |{WMEDLEY}<library>FILEBROWSER.;27|
 266102 
 
       :EDIT-BY |rmk|
 
       :CHANGES-TO (VARS FILEBROWSERCOMS)
+                  (FNS FB.EDITCOMMAND.ONEFILE)
 
-      :PREVIOUS-DATE "18-Jul-2023 22:19:30" |{WMEDLEY}<library>FILEBROWSER.;24|)
+      :PREVIOUS-DATE " 4-Nov-2023 23:50:29" |{WMEDLEY}<library>FILEBROWSER.;26|)
 
 
 (PRETTYCOMPRINT FILEBROWSERCOMS)
@@ -41,7 +42,8 @@
                      (FB.OVERFLOW.MAXABSOLUTE 30)
                      (FB.OVERFLOW.MAXFRAC 0.06)
                      (FB.DEFAULT.EDITOR 'TEDIT)
-                     (FB.DEFAULT.INFO '(SIZE CREATIONDATE AUTHOR)))
+                     (FB.DEFAULT.INFO '(SIZE CREATIONDATE AUTHOR))
+                     (FB.SEE.METHODS))
               (APPENDVARS (FONTVARS (FB.ICONFONT LITTLEFONT)
                                  (FB.BROWSERFONT DEFAULTFONT)
                                  (FB.PROMPTFONT LITTLEFONT)
@@ -295,6 +297,8 @@ DOCOPY
 
 (RPAQ? FB.DEFAULT.INFO
 '(SIZE CREATIONDATE AUTHOR))
 
+(RPAQ? FB.SEE.METHODS
 )
+
 (APPENDTOVAR FONTVARS
 (FB.ICONFONT LITTLEFONT)
                       (FB.BROWSERFONT DEFAULTFONT)
                       (FB.PROMPTFONT LITTLEFONT)
@@ -1697,10 +1701,9 @@ Your deletions are thus ignored.")))
                ELSE
 (FB.FASTSEECOMMAND
 BROWSER KEY ITEM MENU)))))
 
 (FB.EDITCOMMAND.ONEFILE

-  (LAMBDA (BROWSER FILE OPTION ITEM MENU)                    (* \; 
-
                                                           "Edited 19-Sep-2021 18:07 by rmk:")

-                                                             (* \; 
-
                                                           "Edited 27-Feb-2021 20:07 by rmk:")

+  (LAMBDA (BROWSER FILE OPTION ITEM MENU)
                   (* \; "Edited  4-Nov-2023 23:55 by rmk")


+                                                           (* \; "Edited 19-Sep-2021 18:07 by rmk:")


+                                                           (* \; "Edited 27-Feb-2021 20:07 by rmk:")


                                                              (* \; "Edited  1-Feb-88 19:00 by bvm:")

 
     (* |;;| "Called when we know that FILE is a file, not a directory, and that TEDIT exists.  If OPTION is READONLY, we don't want to edit, just view.  .")

@@ -1717,25 +1720,26 @@ Your deletions are thus ignored.")))
     (* |;;| "The particular item may be a subitem of the EDIT or SEE menu item, in which case we want to unshade that too.  Seems a little bruteforce")

 
     (CL:UNLESS (MEMBER ITEM (FETCH
 (MENU ITEMS) OF
 MENU))
-        (FOR
 I IN
 (FETCH
 (MENU ITEMS) OF
 MENU)
-           WHEN
 (MEMBER ITEM (CDR (SASSOC 'SUBITEMS I))) DO
 (SHADEITEM I MENU 
-                                                                           FB.ITEMUNSELECTEDSHADE)
-                                                                   (PUTMENUPROP MENU 'ITEMSHADE
-                                                                          (CONS I 
-                                                                               FB.ITEMUNSELECTEDSHADE
-                                                                                ))))
+        (FOR
 I IN
 (FETCH
 (MENU ITEMS) OF
 MENU) WHEN
 (MEMBER ITEM (CDR (SASSOC 'SUBITEMS I)))
+           DO
 (SHADEITEM I MENU FB.ITEMUNSELECTEDSHADE)
+              (PUTMENUPROP MENU 'ITEMSHADE (CONS I FB.ITEMUNSELECTEDSHADE))))
     (CL:MULTIPLE-VALUE-BIND (IGNORE CONDITION)
            (IGNORE-ERRORS (SELECTQ OPTION
-                              (READONLY (TEDIT-SEE FILE))
+                              (READONLY (|for|
 SM |in|
 FB.SEE.METHODS
+                                           |when|
 (APPLY* (CAR SM)
+                                                         FILE)
+                                           |do|
 (RETURN (APPLY* (CADR SM)
+                                                               FILE))
+                                           |finally|
 (RETURN (TEDIT-SEE FILE))))
                               (LISP                          (* \; 
-
"Original code allowed OPTION=NIL in thie branch, but NIL should have been coerced to TEDIT above.")

+
  "Original code allowed OPTION=NIL in thie branch, but NIL should have been coerced to TEDIT above.")

 
                                     (* |;;| "Asks to load prop and edits the coms, presumably with SEDIT.  We really don't want to use a text editor on a source file.")

 
                                     (IF
 (LISPSOURCEFILEP FILE)
                                         THEN
 (FB.EDITLISPFILE
 FILE BROWSER)
                                       ELSE
 (FB.PROMPTW.FORMAT
 BROWSER 
-                                                      "Failed because not a Lisp source file")))
+                                                  "Failed because not a Lisp source file")))
                               (PROGN 
                                      (* |;;| "Might just be a call to TEDIT (if OPTION = TEDIT)")

 
@@ -4246,51 +4250,51 @@ then click Recompute"))))
 (ADDTOVAR LAMA
 FB.PROMPTW.FORMAT FB.PROMPTWPRINT)
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (31814 54695 (FB 31824 . 32959) (FB.COPYBINARYCOMMAND 32961 . 33307) (FB.COPYTEXTCOMMAND
- 33309 . 33651) (FILEBROWSER 33653 . 46759) (FB.TABLEBROWSER 46761 . 46978) (FB.SELECTEDFILES 46980 . 
-47617) (FB.FETCHFILENAME 47619 . 48011) (FB.DIRECTORYP 48013 . 48407) (FB.PROMPTWPRINT 48409 . 49455) 
-(FB.PROMPTW.FORMAT 49457 . 50194) (FB.PROMPTFORINPUT 50196 . 52448) (FB.YES-OR-NO-P 52450 . 53484) (
-FB.ALLOW.ABORT 53486 . 54340) (\\FB.HARDCOPY.TOFILE.EXTENSION 54342 . 54693)) (54719 55672 (FB.STARTUP
- 54729 . 55244) (FB.MAKERIGIDWINDOW 55246 . 55670)) (55673 61156 (FB.PRINTFN 55683 . 60836) (FB.COPYFN
- 60838 . 61154)) (61206 67546 (FB.MENU.WHENSELECTEDFN 61216 . 61574) (FB.COMMANDSELECTEDFN 61576 . 
-63115) (FB.SUBITEMP 63117 . 63718) (FB.MAKE.BROWSER.BUSY 63720 . 64524) (FB.FINISH.COMMAND 64526 . 
-66557) (FB.HANDLE.ABORT.BUTTON 66559 . 67544)) (67547 73063 (FB.DELETECOMMAND 67557 . 67838) (
-FB.DELVERCOMMAND 67840 . 71033) (FB.IS.NOT.SUBDIRECTORY.ITEM 71035 . 71216) (FB.DELVER.FILES 71218 . 
-72307) (FB.DELETE.FILE 72309 . 73061)) (73064 74389 (FB.UNDELETECOMMAND 73074 . 73359) (
-FB.UNDELETEALLCOMMAND 73361 . 73640) (FB.UNDELETE.FILE 73642 . 74387)) (74390 98571 (FB.COPYCOMMAND 
-74400 . 74669) (FB.RENAMECOMMAND 74671 . 74946) (FB.COPY/RENAME.COMMAND 74948 . 75871) (
-FB.COPY/RENAME.ONE 75873 . 78195) (FB.COPY/RENAME.MANY 78197 . 84417) (FB.MERGE.DIRECTORIES 84419 . 
-84837) (FB.GREATEST.PREFIX 84839 . 86195) (FB.MAYBE.INSERT.FILE 86197 . 93637) (FB.GET.NEW.FILE.SPEC 
-93639 . 97470) (FB.CANONICAL.DIRECTORY 97472 . 98569)) (98572 106356 (FB.HARDCOPYCOMMAND 98582 . 99712
-) (FB.HARDCOPY.TOFILE 99714 . 106354)) (106357 116556 (FB.EDITCOMMAND 106367 . 107234) (
-FB.EDITCOMMAND.ONEFILE 107236 . 110640) (FB.EDITLISPFILE 110642 . 111747) (FB.BROWSECOMMAND 111749 . 
-116554)) (116557 128478 (FB.FASTSEECOMMAND 116567 . 120017) (FB.FASTSEE.ONEFILE 120019 . 123176) (
-FB.SEEFULLFN 123178 . 127309) (FB.SEEBUTTONFN 127311 . 128476)) (128479 130225 (FB.LOADCOMMAND 128489
- . 128996) (FB.COMPILECOMMAND 128998 . 129536) (FB.OPERATE.ON.FILES 129538 . 130223)) (130226 178411 (
-FB.UPDATECOMMAND 130236 . 130461) (FB.FIX-DIRECTORY-DATES 130463 . 131486) (FB.MAYBE.EXPUNGE 131488 . 
-132549) (FB.UPDATEBROWSERITEMS 132551 . 145766) (FB.DATE 145768 . 146409) (FB.ADJUST.DATE.WIDTH 146411
- . 149379) (FB.SET.BROWSER.TITLE 149381 . 150383) (FB.MAYBE.WIDEN.NAMES 150385 . 152504) (
-FB.SET.DEFAULT.NAME.WIDTH 152506 . 153870) (FB.CREATE.FILEBUCKET 153872 . 161092) (
-FB.CHECK.NAME.LENGTH 161094 . 163515) (FB.ADD.FILEGROUP 163517 . 165044) (FB.INSERT.DIRECTORY 165046
- . 165284) (FB.MAKE.SUBDIRECTORY.ITEM 165286 . 166695) (FB.ADD.FILE 166697 . 167310) (FB.INSERT.FILE 
-167312 . 170724) (FB.ANALYZE.PATTERN 170726 . 175990) (FB.CANONICALIZE.PATTERN 175992 . 177304) (
-FB.GETALLFILEINFO 177306 . 178409)) (178412 186571 (FB.SORT.VERSIONS 178422 . 181193) (
-FB.DECREASING.VERSION 181195 . 181864) (FB.INCREASING.VERSION 181866 . 182487) (
-FB.NAMES.DECREASING.VERSION 182489 . 183524) (FB.NAMES.INCREASING.VERSION 183526 . 184523) (
-FB.DECREASING.NUMERIC.ATTR 184525 . 185205) (FB.INCREASING.NUMERIC.ATTR 185207 . 185881) (
-FB.ALPHABETIC.ATTR 185883 . 186569)) (186572 196414 (FB.SORTCOMMAND 186582 . 193412) (
-FB.INSERT.SUBDIRECTORIES 193414 . 194211) (FB.GET.SORT.MENU 194213 . 196412)) (196415 212636 (
-FB.EXPUNGECOMMAND 196425 . 199010) (FB.NEWPATTERNCOMMAND 199012 . 199410) (FB.NEWINFOCOMMAND 199412 . 
-202244) (FB.DEPTHCOMMAND 202246 . 204021) (FB.SHAPECOMMAND 204023 . 207365) (FB.REMOVE.FILE 207367 . 
-209188) (FB.COUNT.FILE.CHANGE 209190 . 210635) (FB.SETNEWPATTERN 210637 . 211807) (FB.GET.NEWPATTERN 
-211809 . 212393) (FB.OPTIONSCOMMAND 212395 . 212634)) (212671 213724 (FB.GETWINDOW 212681 . 213722)) (
-213725 214737 (FB.INFOMENU.SHADEINITIALSELECTIONS 213735 . 214382) (FB.INFO.ITEM.NAMED 214384 . 214735
-)) (214738 224270 (FB.MAKECOUNTERWINDOW 214748 . 216276) (FB.COUNTERW.REDISPLAYFN 216278 . 216865) (
-FB.UPDATE.COUNTERS 216867 . 218939) (FB.DISPLAY.COUNTERS 218941 . 224001) (FB.COUNTER.STRING 224003 . 
-224268)) (224271 228980 (FB.MAKEHEADINGWINDOW 224281 . 225895) (FB.HEADINGW.REDISPLAYFN 225897 . 
-226163) (FB.HEADINGW.RESHAPEFN 226165 . 226541) (FB.HEADINGW.DISPLAY 226543 . 228978)) (228981 233164 
-(FB.ICONFN 228991 . 229338) (FB.INFOMENU.WHENSELECTEDFN 229340 . 230070) (FB.CLOSEFN 230072 . 231275) 
-(FB.EXPUNGE?.MENU 231277 . 231689) (FB.AFTERCLOSEFN 231691 . 232052) (FB.CLOSE&EXPUNGE 232054 . 233162
-)) (233165 245223 (FB.HARDCOPY.DIRECTORY 233175 . 243532) (FB.HARDCOPY.PRINT.TITLE 243534 . 243860) (
-FB.HARDCOPY.MAXWIDTH 243862 . 245221)))))
+  (FILEMAP (NIL (31928 54809 (FB 31938 . 33073) (FB.COPYBINARYCOMMAND 33075 . 33421) (FB.COPYTEXTCOMMAND
+ 33423 . 33765) (FILEBROWSER 33767 . 46873) (FB.TABLEBROWSER 46875 . 47092) (FB.SELECTEDFILES 47094 . 
+47731) (FB.FETCHFILENAME 47733 . 48125) (FB.DIRECTORYP 48127 . 48521) (FB.PROMPTWPRINT 48523 . 49569) 
+(FB.PROMPTW.FORMAT 49571 . 50308) (FB.PROMPTFORINPUT 50310 . 52562) (FB.YES-OR-NO-P 52564 . 53598) (
+FB.ALLOW.ABORT 53600 . 54454) (\\FB.HARDCOPY.TOFILE.EXTENSION 54456 . 54807)) (54833 55786 (FB.STARTUP
+ 54843 . 55358) (FB.MAKERIGIDWINDOW 55360 . 55784)) (55787 61270 (FB.PRINTFN 55797 . 60950) (FB.COPYFN
+ 60952 . 61268)) (61320 67660 (FB.MENU.WHENSELECTEDFN 61330 . 61688) (FB.COMMANDSELECTEDFN 61690 . 
+63229) (FB.SUBITEMP 63231 . 63832) (FB.MAKE.BROWSER.BUSY 63834 . 64638) (FB.FINISH.COMMAND 64640 . 
+66671) (FB.HANDLE.ABORT.BUTTON 66673 . 67658)) (67661 73177 (FB.DELETECOMMAND 67671 . 67952) (
+FB.DELVERCOMMAND 67954 . 71147) (FB.IS.NOT.SUBDIRECTORY.ITEM 71149 . 71330) (FB.DELVER.FILES 71332 . 
+72421) (FB.DELETE.FILE 72423 . 73175)) (73178 74503 (FB.UNDELETECOMMAND 73188 . 73473) (
+FB.UNDELETEALLCOMMAND 73475 . 73754) (FB.UNDELETE.FILE 73756 . 74501)) (74504 98685 (FB.COPYCOMMAND 
+74514 . 74783) (FB.RENAMECOMMAND 74785 . 75060) (FB.COPY/RENAME.COMMAND 75062 . 75985) (
+FB.COPY/RENAME.ONE 75987 . 78309) (FB.COPY/RENAME.MANY 78311 . 84531) (FB.MERGE.DIRECTORIES 84533 . 
+84951) (FB.GREATEST.PREFIX 84953 . 86309) (FB.MAYBE.INSERT.FILE 86311 . 93751) (FB.GET.NEW.FILE.SPEC 
+93753 . 97584) (FB.CANONICAL.DIRECTORY 97586 . 98683)) (98686 106470 (FB.HARDCOPYCOMMAND 98696 . 99826
+) (FB.HARDCOPY.TOFILE 99828 . 106468)) (106471 116680 (FB.EDITCOMMAND 106481 . 107348) (
+FB.EDITCOMMAND.ONEFILE 107350 . 110764) (FB.EDITLISPFILE 110766 . 111871) (FB.BROWSECOMMAND 111873 . 
+116678)) (116681 128602 (FB.FASTSEECOMMAND 116691 . 120141) (FB.FASTSEE.ONEFILE 120143 . 123300) (
+FB.SEEFULLFN 123302 . 127433) (FB.SEEBUTTONFN 127435 . 128600)) (128603 130349 (FB.LOADCOMMAND 128613
+ . 129120) (FB.COMPILECOMMAND 129122 . 129660) (FB.OPERATE.ON.FILES 129662 . 130347)) (130350 178535 (
+FB.UPDATECOMMAND 130360 . 130585) (FB.FIX-DIRECTORY-DATES 130587 . 131610) (FB.MAYBE.EXPUNGE 131612 . 
+132673) (FB.UPDATEBROWSERITEMS 132675 . 145890) (FB.DATE 145892 . 146533) (FB.ADJUST.DATE.WIDTH 146535
+ . 149503) (FB.SET.BROWSER.TITLE 149505 . 150507) (FB.MAYBE.WIDEN.NAMES 150509 . 152628) (
+FB.SET.DEFAULT.NAME.WIDTH 152630 . 153994) (FB.CREATE.FILEBUCKET 153996 . 161216) (
+FB.CHECK.NAME.LENGTH 161218 . 163639) (FB.ADD.FILEGROUP 163641 . 165168) (FB.INSERT.DIRECTORY 165170
+ . 165408) (FB.MAKE.SUBDIRECTORY.ITEM 165410 . 166819) (FB.ADD.FILE 166821 . 167434) (FB.INSERT.FILE 
+167436 . 170848) (FB.ANALYZE.PATTERN 170850 . 176114) (FB.CANONICALIZE.PATTERN 176116 . 177428) (
+FB.GETALLFILEINFO 177430 . 178533)) (178536 186695 (FB.SORT.VERSIONS 178546 . 181317) (
+FB.DECREASING.VERSION 181319 . 181988) (FB.INCREASING.VERSION 181990 . 182611) (
+FB.NAMES.DECREASING.VERSION 182613 . 183648) (FB.NAMES.INCREASING.VERSION 183650 . 184647) (
+FB.DECREASING.NUMERIC.ATTR 184649 . 185329) (FB.INCREASING.NUMERIC.ATTR 185331 . 186005) (
+FB.ALPHABETIC.ATTR 186007 . 186693)) (186696 196538 (FB.SORTCOMMAND 186706 . 193536) (
+FB.INSERT.SUBDIRECTORIES 193538 . 194335) (FB.GET.SORT.MENU 194337 . 196536)) (196539 212760 (
+FB.EXPUNGECOMMAND 196549 . 199134) (FB.NEWPATTERNCOMMAND 199136 . 199534) (FB.NEWINFOCOMMAND 199536 . 
+202368) (FB.DEPTHCOMMAND 202370 . 204145) (FB.SHAPECOMMAND 204147 . 207489) (FB.REMOVE.FILE 207491 . 
+209312) (FB.COUNT.FILE.CHANGE 209314 . 210759) (FB.SETNEWPATTERN 210761 . 211931) (FB.GET.NEWPATTERN 
+211933 . 212517) (FB.OPTIONSCOMMAND 212519 . 212758)) (212795 213848 (FB.GETWINDOW 212805 . 213846)) (
+213849 214861 (FB.INFOMENU.SHADEINITIALSELECTIONS 213859 . 214506) (FB.INFO.ITEM.NAMED 214508 . 214859
+)) (214862 224394 (FB.MAKECOUNTERWINDOW 214872 . 216400) (FB.COUNTERW.REDISPLAYFN 216402 . 216989) (
+FB.UPDATE.COUNTERS 216991 . 219063) (FB.DISPLAY.COUNTERS 219065 . 224125) (FB.COUNTER.STRING 224127 . 
+224392)) (224395 229104 (FB.MAKEHEADINGWINDOW 224405 . 226019) (FB.HEADINGW.REDISPLAYFN 226021 . 
+226287) (FB.HEADINGW.RESHAPEFN 226289 . 226665) (FB.HEADINGW.DISPLAY 226667 . 229102)) (229105 233288 
+(FB.ICONFN 229115 . 229462) (FB.INFOMENU.WHENSELECTEDFN 229464 . 230194) (FB.CLOSEFN 230196 . 231399) 
+(FB.EXPUNGE?.MENU 231401 . 231813) (FB.AFTERCLOSEFN 231815 . 232176) (FB.CLOSE&EXPUNGE 232178 . 233286
+)) (233289 245347 (FB.HARDCOPY.DIRECTORY 233299 . 243656) (FB.HARDCOPY.PRINT.TITLE 243658 . 243984) (
+FB.HARDCOPY.MAXWIDTH 243986 . 245345)))))
 STOP

library/HRULE

@@ -1,16 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "25-Jul-2022 15:09:26" {DSK}<Users>kaplan>Local>medley3.5>working-medley>library>HRULE.;4
 23801  
+
(FILECREATED "26-Nov-2023 09:46:44" {WMEDLEY}<library>HRULE.;5
 23918  
 
-      :CHANGES-TO (VARS HRULECOMS)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "25-Jul-2022 15:07:00" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>HRULE.;3)
+      :CHANGES-TO (FNS HRULE.CREATE VRULE.CREATE CROPMARK.CREATE)
 
+      :PREVIOUS-DATE "25-Jul-2022 15:09:26" {WMEDLEY}<library>HRULE.;4)
 
-(* ; "
-Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation.
-")
 
 (PRETTYCOMPRINT HRULECOMS)
 
@@ -90,30 +87,27 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation.
 (DEFINEQ
 
 (HRULE.CREATE

-  [LAMBDA (WIDTH)
                                        (* jds "11-Sep-85 16:36")

+  [LAMBDA (WIDTH)
                                            (* ; "Edited 26-Nov-2023 09:45 by rmk")

+                                                             (* jds "11-Sep-85 16:36")

 
-         (* * Create a Horizontal-Rule image object.
-
       WIDTH may be NIL to default, a number, for a single rule with its width in 
-
       points (and fractions thereof)%, or a list of alternating black and white 
-
       widths. E.g., to get a hairline over 1pt white over 3pt rule, specify
-
       (0.5 1 3))

+(* ;;; "Create a Horizontal-Rule image object.  WIDTH may be NIL to default, a number, for a single rule with its width in points (and fractions thereof), or a list of alternating black and white widths.  E.g., to get a hairline over 1pt white over 3pt rule, specify (0.5 1 3)")

 
     (PROG ((HRULE (IMAGEOBJCREATE NIL HRULE.IMAGEFNS)))
           (COND
-             ((NOT WIDTH)                                    (* USe the default width)

+             ((NOT WIDTH)                                    (* ; "USe the default width")

               (IMAGEOBJPROP HRULE 'RULE.WIDTH HRULE.DEFAULT.WIDTH)
               (RETURN HRULE))
              ((NUMBERP WIDTH)
               (IMAGEOBJPROP HRULE 'RULE.WIDTH WIDTH)
               (RETURN HRULE))
              ((AND (LISTP WIDTH)
-                   (EVERY WIDTH (FUNCTION NUMBERP)))         (* It's a list of numbers.
-
                                                           Add (QUOTE em) up)

+                   (EVERY WIDTH (FUNCTION NUMBERP)))         (* ; 
+
                                                         "It's a list of numbers.  Add (QUOTE em) up")

               (IMAGEOBJPROP HRULE 'RULE.WIDTH WIDTH)
               (RETURN HRULE))
-             (T                                              (* Something was specified, and 
-
                                                           there was a non-number in it...)

-                (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT "Non-numeric widths not desirable: " WIDTH)
+             (T                                              (* ; 
+
                                       "Something was specified, and there was a non-number in it...")

+                (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT "HRULE with non-numeric width: " WIDTH)
                        T])
 
 (HRULE.DISPLAYFN

@@ -233,8 +227,9 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation.
 (DEFINEQ
 
 (VRULE.CREATE

-  [LAMBDA (WIDTH HEIGHT DASHING)
              (* ; 
-
                                                "Edited  8-Oct-92 16:46 by sybalsky:mv:envos")

+  [LAMBDA (WIDTH HEIGHT DASHING)
                             (* ; "Edited 26-Nov-2023 09:45 by rmk")

+                                                             (* ; 
+
                                                        "Edited  8-Oct-92 16:46 by sybalsky:mv:envos")

 
     (* ;; "Create a Vertical-Rule image object.  HEIGHT may be NIL to default, a number, for a single rule with its width in points (and fractions thereof), or a list of alternating black and white widths.  E.g., to get a hairline over 1pt white over 3pt rule, specify (0.5 1 3)")

 
@@ -246,7 +241,7 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation.
               (IMAGEOBJPROP VRULE 'RULE.WIDTH WIDTH))
              ((AND (LISTP WIDTH)
                    (EVERY WIDTH (FUNCTION NUMBERP)))         (* ; 
-
                                                           "It's a list of numbers.  Add 'em up")

+
                                                             "It's a list of numbers.  Add 'em up")

               (IMAGEOBJPROP VRULE 'RULE.WIDTH WIDTH)))
           (COND
              ((NOT HEIGHT)                                   (* ; "Use the default width")

@@ -257,12 +252,12 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation.
               (RETURN VRULE))
              ((AND (LISTP HEIGHT)
                    (EVERY HEIGHT (FUNCTION NUMBERP)))        (* ; 
-
                                                           "It's a list of numbers.  Add 'em up")

+
                                                             "It's a list of numbers.  Add 'em up")

               (IMAGEOBJPROP VRULE 'RULE.HEIGHT HEIGHT)
               (RETURN VRULE))
              (T                                              (* ; 
-
                                     "Something was specified, and there was a non-number in it...")

-                (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT "Non-numeric widths not desirable: " HEIGHT)
+
                                       "Something was specified, and there was a non-number in it...")

+                (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT "VRULE with non-numeric height: " HEIGHT)
                        T)))
           (IMAGEOBJPROP VRULE 'RULE.DASHING DASHING])
 
@@ -392,7 +387,8 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation.
 (DEFINEQ
 
 (CROPMARK.CREATE

-  [LAMBDA (WIDTH HEIGHT)
                                 (* ; "Edited  5-Jun-91 14:56 by jds")

+  [LAMBDA (WIDTH HEIGHT)
                                     (* ; "Edited 26-Nov-2023 09:46 by rmk")


+                                                             (* ; "Edited  5-Jun-91 14:56 by jds")

 
     (* ;; "Create a CROPMARK, that prints crop-marks for a page that is WIDTH points wide and HEIGHT points high.")

 
@@ -406,12 +402,12 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation.
               (RETURN CROPMARK))
              ((AND (LISTP HEIGHT)
                    (EVERY HEIGHT (FUNCTION NUMBERP)))        (* ; 
-
                                                           "It's a list of numbers.  Add 'em up")

+
                                                             "It's a list of numbers.  Add 'em up")

               (IMAGEOBJPROP CROPMARK 'PAGE.SIZE (LIST WIDTH HEIGHT))
               (RETURN CROPMARK))
              (T                                              (* ; 
-
                                     "Something was specified, and there was a non-number in it...")

-                (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT "Non-numeric widths not desirable: " HEIGHT)
+
                                       "Something was specified, and there was a non-number in it...")

+                (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT "CROPMARK with non-numeric height: " HEIGHT)
                        T])
 
 (CROPMARK.DISPLAYFN

@@ -508,14 +504,13 @@ Copyright (c) 1985, 1990-1992 by Venue & Xerox Corporation.
              (FUNCTION NILL)
              (FUNCTION CROPMARK.WHENOPERATEDONFN)
              (FUNCTION NILL)))
-(PUTPROPS HRULE COPYRIGHT ("Venue & Xerox Corporation" 1985 1990 1991 1992))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4512 10691 (HRULE.CREATE 4522 . 5944) (HRULE.DISPLAYFN 5946 . 8515) (HRULE.GETFN 8517
- . 8837) (HRULE.IMAGEBOXFN 8839 . 9641) (HRULE.PUTFN 9643 . 10021) (HRULE.COPYFN 10023 . 10487) (
-HRULE.WHENOPERATEDONFN 10489 . 10689)) (11583 17788 (VRULE.CREATE 11593 . 13592) (VRULE.DISPLAYFN 
-13594 . 15788) (VRULE.GETFN 15790 . 16011) (VRULE.GETFN2 16013 . 16349) (VRULE.IMAGEBOXFN 16351 . 
-16779) (VRULE.PUTFN 16781 . 17179) (VRULE.COPYFN 17181 . 17584) (VRULE.WHENOPERATEDONFN 17586 . 17786)
-) (18427 23077 (CROPMARK.CREATE 18437 . 19704) (CROPMARK.DISPLAYFN 19706 . 21206) (CROPMARK.GETFN 
-21208 . 21502) (CROPMARK.IMAGEBOXFN 21504 . 22205) (CROPMARK.PUTFN 22207 . 22485) (CROPMARK.COPYFN 
-22487 . 22870) (CROPMARK.WHENOPERATEDONFN 22872 . 23075)))))
+  (FILEMAP (NIL (4411 10637 (HRULE.CREATE 4421 . 5890) (HRULE.DISPLAYFN 5892 . 8461) (HRULE.GETFN 8463
+ . 8783) (HRULE.IMAGEBOXFN 8785 . 9587) (HRULE.PUTFN 9589 . 9967) (HRULE.COPYFN 9969 . 10433) (
+HRULE.WHENOPERATEDONFN 10435 . 10635)) (11529 17865 (VRULE.CREATE 11539 . 13669) (VRULE.DISPLAYFN 
+13671 . 15865) (VRULE.GETFN 15867 . 16088) (VRULE.GETFN2 16090 . 16426) (VRULE.IMAGEBOXFN 16428 . 
+16856) (VRULE.PUTFN 16858 . 17256) (VRULE.COPYFN 17258 . 17661) (VRULE.WHENOPERATEDONFN 17663 . 17863)
+) (18504 23271 (CROPMARK.CREATE 18514 . 19898) (CROPMARK.DISPLAYFN 19900 . 21400) (CROPMARK.GETFN 
+21402 . 21696) (CROPMARK.IMAGEBOXFN 21698 . 22399) (CROPMARK.PUTFN 22401 . 22679) (CROPMARK.COPYFN 
+22681 . 23064) (CROPMARK.WHENOPERATEDONFN 23066 . 23269)))))
 STOP

library/PDFSTREAM

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 9-Oct-2023 00:42:25" {DSK}<home>frank>il>medley>gmedley>library>PDFSTREAM.;2
 14029  
+
(FILECREATED "11-Nov-2023 11:24:42" {WMEDLEY}<library>PDFSTREAM.;56
 14033  
 
-      :CHANGES-TO (FNS SEE-PDF OPEN-PDF-STREAM PS-TO-PDF PDFCONVERTER)
-                  (VARS PDFSTREAMCOMS)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE " 1-Oct-2023 20:53:05" {DSK}<home>frank>il>medley>gmedley>library>PDFSTREAM.;1
-)
+      :CHANGES-TO (VARS PDFSTREAMCOMS)
+
+      :PREVIOUS-DATE " 9-Oct-2023 00:42:25" {WMEDLEY}<library>PDFSTREAM.;55)
 
 
 (PRETTYCOMPRINT PDFSTREAMCOMS)
@@ -45,6 +45,7 @@
         (GLOBALVARS PDFCONVERTER PDF-CONVERTER-TEMPLATES)
         (FNS OPEN-PDF-STREAM CLOSE-PDF-STREAM PS-TO-PDF)
         (FNS SEE-PDF)
+        (ADDVARS (FB.SEE.METHODS (PDFFILEP SEE-PDF)))
         (FNS PDFCONVERTER)))
 
 (FILESLOAD (SYSLOAD)
@@ -268,6 +269,8 @@
 
     (ShellOpen (PACKFILENAME 'BODY PDFFILE 'EXTENSION 'PDF])
 )
+
+(ADDTOVAR FB.SEE.METHODS
 (PDFFILEP SEE-PDF))
 (DEFINEQ
 
 (PDFCONVERTER

@@ -277,8 +280,8 @@
                                    thereis
 (ShellWhich (CAR TEMPLATE])
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3208 5822 (PDFFILEP 3218 . 4132) (PDF.HARDCOPYW 4134 . 4732) (PDF.TEXT 4734 . 5451) (
-PDF.TEDIT 5453 . 5820)) (6262 13322 (OPEN-PDF-STREAM 6272 . 8408) (CLOSE-PDF-STREAM 8410 . 9697) (
-PS-TO-PDF 9699 . 13320)) (13323 13721 (SEE-PDF 13333 . 13719)) (13722 14006 (PDFCONVERTER 13732 . 
-14004)))))
+  (FILEMAP (NIL (3162 5776 (PDFFILEP 3172 . 4086) (PDF.HARDCOPYW 4088 . 4686) (PDF.TEXT 4688 . 5405) (
+PDF.TEDIT 5407 . 5774)) (6216 13276 (OPEN-PDF-STREAM 6226 . 8362) (CLOSE-PDF-STREAM 8364 . 9651) (
+PS-TO-PDF 9653 . 13274)) (13277 13675 (SEE-PDF 13287 . 13673)) (13726 14010 (PDFCONVERTER 13736 . 
+14008)))))
 STOP

library/UNICODE

@@ -1,18 +1,20 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "19-Jul-2023 09:26:13" {WMEDLEY}<library>UNICODE.;199
 65282  
+
(FILECREATED "26-Jan-2024 14:19:50" {LIB}UNICODE.;4
 72688  
 
-      :EDIT-BY rmk
+      :EDIT-BY "mth"
 
-      :CHANGES-TO (VARS UNICODECOMS)
+      :CHANGES-TO (FNS MAKE-UNICODE-FORMATS MAKE-UNICODE-TRANSLATION-TABLES SHOWCHARS 
+                       READ-UNICODE-MAPPING-FILENAMES)
+                  (VARS UNICODECOMS)
 
-      :PREVIOUS-DATE "19-Jul-2022 15:36:40" {WMEDLEY}<library>UNICODE.;198)
+      :PREVIOUS-DATE " 8-Jan-2024 10:58:06" {LIB}UNICODE.;1)
 
 
 (PRETTYCOMPRINT UNICODECOMS)
 
 (RPAQQ UNICODECOMS

-       [(COMS 
+       ((COMS 
               (* ;; "External formats")

 
               (FNS UTF8.OUTCHARFN UTF8.INCCODEFN UTF8.PEEKCCODEFN \UTF8.BACKCCODEFN)
@@ -23,7 +25,7 @@
               (ADDVARS (*DEFAULT-EXTERNALFORMATS* (UNIX :UTF-8)))
               (FNS UNICODE.UNMAPPED)
               (FNS XCCS-UTF8-AFTER-OPEN)
-              (DECLARE%: EVAL@COMPILE DONTCOPY (MACROS UNICODE.TRANSLATE))
+              (DECLARE%: EVAL@COMPILE DONTCOPY (MACROS UNICODE.TRANSLATE \UTF8.GETBASEBYTE))
               (FNS XTOUCODE UTOXCODE))
         (COMS 
               (* ;; "Unicode mapping files")

@@ -45,8 +47,10 @@
               (* ;; "Set up translation tables for UTF8 and UTFBE external formats")

 
               (FNS MAKE-UNICODE-TRANSLATION-TABLES)
-              [INITVARS (DEFAULT-XCCS-CHARSETS '(LATIN SYMBOLS1 SYMBOLS2 EXTENDED-LATIN FORMS 
-                                                       SYMBOLS3 SYMBOLS4 ACCENTED-LATIN GREEK]
+              [INITVARS (DEFAULT-XCCS-CHARSETS '(LATIN JAPANESE-SYMBOLS1 JAPANESE-SYMBOLS2 
+                                                       EXTENDED-LATIN FORMS SYMBOLS1 SYMBOLS2 
+                                                       ACCENTED-LATIN1 GREEK))
+                     (DEFAULT-XCCS-JAPANESE-CHARSETS '(HIRAGANA KATAKANA JIS]
               [DECLARE%: DONTEVAL@LOAD DOCOPY (P (MAKE-UNICODE-TRANSLATION-TABLES (
                                                                                  READ-UNICODE-MAPPING
                                                                                    
@@ -55,9 +59,11 @@
                                                         '*XCCSTOUNICODE*
                                                         '*UNICODETOXCCS*]
               (GLOBALVARS *XCCSTOUNICODE* *UNICODETOXCCS*))
-        (FNS HEXSTRING UTF8HEXSTRING NUTF8CODEBYTES NUTF8STRINGBYTES XTOUSTRING XCCSSTRING)
+        (FNS UTF-8.VALIDATE HEXSTRING UTF8HEXSTRING NUTF8CODEBYTES NUTF8STRINGBYTES XTOUSTRING 
+             XCCSSTRING)
+        (FNS \UTF8.FETCHCODE)
         (FNS SHOWCHARS)
-        (DECLARE%: EVAL@COMPILE DONTCOPY (FILES (FROM LOADUPS)
+        [DECLARE%: EVAL@COMPILE DONTCOPY (FILES (FROM LOADUPS)
                                                 EXPORTS.ALL)
                
                (* ;; "These control the layout of the translation tables.  Since many of the upper panels are sparse, doing it per-panel (128) seems more space-efficient, and residual alists can be shorter")

@@ -66,7 +72,9 @@
                       (MAX-ALIST-LENGTH 10)
                       (N-TRANSLATION-SEGMENTS (IQUOTIENT 65536 TRANSLATION-SEGMENT-SIZE))
                       (TRANSLATION-SHIFT (INTEGERLENGTH (SUB1 TRANSLATION-SEGMENT-SIZE)))
-                      (TRANSLATION-MASK (SUB1 TRANSLATION-SEGMENT-SIZE])
+                      (TRANSLATION-MASK (SUB1 TRANSLATION-SEGMENT-SIZE]
+        (PROP (FILETYPE)
+              UNICODE)))
 
 
 
@@ -402,7 +410,8 @@
 (DEFINEQ
 
 (MAKE-UNICODE-FORMATS

-  [LAMBDA (EXTERNALEOL)
                                      (* ; "Edited 19-Jul-2022 15:36 by rmk")


+  [LAMBDA (EXTERNALEOL)
                                      (* ; "Edited  8-Dec-2023 15:19 by rmk")


+                                                             (* ; "Edited 19-Jul-2022 15:36 by rmk")


                                                             (* ; "Edited  6-Aug-2021 16:08 by rmk:")

 
     (* ;; "RAW formats do not do XCCS/Unicode translation, just deal with the byte encoding.")

@@ -413,7 +422,7 @@
            (FUNCTION UTF8.PEEKCCODEFN)
            (FUNCTION \UTF8.BACKCCODEFN)
            (FUNCTION UTF8.OUTCHARFN)
-           NIL EXTERNALEOL)
+           NIL EXTERNALEOL NIL NIL NIL (FUNCTION NILL))
     (MAKE-EXTERNALFORMAT :UTF-8-RAW [FUNCTION (LAMBDA (STREAM COUNTP)
                                                 (UTF8.INCCODEFN
 STREAM COUNTP T]
            [FUNCTION (LAMBDA (STREAM NOERROR)
@@ -422,12 +431,12 @@
                        (\UTF8.BACKCCODEFN
 STREAM COUNTP T]
            [FUNCTION (LAMBDA (STREAM CHARCODE)
                        (UTF8.OUTCHARFN
 STREAM CHARCODE T]
-           NIL EXTERNALEOL)
+           NIL EXTERNALEOL NIL NIL NIL (FUNCTION NILL))
     (MAKE-EXTERNALFORMAT :UTF-16BE (FUNCTION UTF16BE.INCCODEFN)
            (FUNCTION UTF16BE.PEEKCCODEFN)
            (FUNCTION \UTF16BE.BACKCCODEFN)
            (FUNCTION UTF16BE.OUTCHARFN)
-           NIL EXTERNALEOL)
+           NIL EXTERNALEOL NIL NIL NIL (FUNCTION NILL))
     (MAKE-EXTERNALFORMAT :UTF-16BE-RAW [FUNCTION (LAMBDA (STREAM COUNTP)
                                                    (UTF16BE.INCCODEFN
 STREAM COUNTP T]
            [FUNCTION (LAMBDA (STREAM NOERROR)
@@ -436,7 +445,7 @@
                        (\UTF16BE.BACKCCODEFN
 STREAM COUNTP T]
            [FUNCTION (LAMBDA (STREAM CHARCODE)
                        (UTF16BE.OUTCHARFN
 STREAM CHARCODE T]
-           NIL EXTERNALEOL])
+           NIL EXTERNALEOL NIL NIL NIL (FUNCTION NILL])
 )
 
 (MAKE-UNICODE-FORMATS
 EXTERNALEOL)
@@ -469,15 +478,17 @@
 (DEFINEQ
 
 (XCCS-UTF8-AFTER-OPEN

-  [LAMBDA (STREAM ACCESS PARAMETERS)
                    (* ; "Edited 13-Aug-2020 11:54 by rmk:")

+  [LAMBDA (STREAM ACCESS PARAMETERS)
                         (* ; "Edited  3-Jan-2024 10:27 by rmk")


+                                                            (* ; "Edited 13-Aug-2020 11:54 by rmk:")

 
-    (* ;; "If added to STREAM-AFTER-OPEN-FNS, causes mapping files to be opened as UTF8.")

+    (* ;; 
+
    "If added to STREAM-AFTER-OPEN-FNS, causes mapping files to be opened as UTF-8. For development")

 
     (CL:WHEN (AND (STRPOS "XCCS-" (U-CASE (FULLNAME STREAM)))
                   [EQ 'TXT (U-CASE (FILENAMEFIELD (FULLNAME STREAM)
                                           'EXTENSION]
                   (NOT (ASSOC 'EXTERNALFORMAT PARAMETERS)))
-        (STREAMPROP STREAM 'EXTERNALFORMAT :UTF8))])
+        (STREAMPROP STREAM 'EXTERNALFORMAT :UTF-8))])
 )
 (DECLARE%: EVAL@COMPILE DONTCOPY 
 (DECLARE%: EVAL@COMPILE 
@@ -492,6 +503,15 @@
                                                  CODE))
                                             [(AND X (CL:SVREF X (LOGAND CODE TRANSLATION-MASK]
                                             (T (UNICODE.UNMAPPED
 CODE TRANSLATION-TABLE])
+
+(PUTPROPS \UTF8.GETBASEBYTE
 MACRO
 ((BASE OFFSET ERROR?)      (* ; 
+
                        "Fetches the OFFSET'th byte from BASE, checking for UTF-8 validity if ERROR?")

+                                   (IF
 ERROR?
+                                       THEN
 (LET ((BYTE (\GETBASEBYTE BASE OFFSET)))
+                                                 (CL:WHEN (ILESSP BYTE 128)
+                                                        (ERROR "INVALID UTF8 BYTE" BYTE))
+                                                 BYTE)
+                                     ELSE
 (\GETBASEBYTE BASE OFFSET))))
 )
 )
 (DEFINEQ
@@ -512,24 +532,43 @@
 (DEFINEQ
 
 (READ-UNICODE-MAPPING-FILENAMES

-  [LAMBDA (FILESPEC)
                                  (* ; "Edited  5-Aug-2020 15:59 by kaplan")


+  [LAMBDA (FILESPEC DIRS)
                                    (* ; "Edited 26-Jan-2024 14:02 by mth")


+                                                             (* ; "Edited  5-Jan-2024 17:24 by rmk")


+                                                          (* ; "Edited  5-Aug-2020 15:59 by kaplan")


                                                             (* ; "Edited  4-Aug-2020 17:31 by rmk:")

-    (FOR
 F X CSI INSIDE
 FILESPEC
-       COLLECT
 (IF
 (FINDFILE (PACKFILENAME 'BODY F 'EXTENSION 'TXT)
-                                  T UNICODEDIRECTORIES)
-                     ELSEIF
 [SETQ CSI (OR (SASSOC F XCCS-SET-NAMES)
-                                              (FIND
 N IN
 XCCS-SET-NAMES
-                                                 SUCHTHAT
 (EQ F (CADR N]
-                       THEN
 (FINDFILE (PACKFILENAME 'BODY (CONCAT 'XCCS- (CAR CSI)
-                                                                     '=
-                                                                     (CADR CSI))
-                                                 'EXTENSION
-                                                 'TXT)
-                                       T UNICODEDIRECTORIES)
-                     ELSE
 F])
+    (DECLARE
 (USEDFREE UNICODEDIRECTORIES XCCS-SET-NAMES))
+    (CL:UNLESS DIRS (SETQ DIRS UNICODEDIRECTORIES))
+    (FOR
 F X CSI INSIDE
 FILESPEC JOIN
 
+                                      (* ;; 
+
            "Last case hopes to pick up tables that are gruped together in a subdirectory (e.g. JIS)")

+
+                                      (OR (MKLIST (FINDFILE (PACKFILENAME 'BODY F 'EXTENSION
+                                                                   'TXT)
+                                                         T DIRS))
+                                          (for
 D inside
 DIRS
+                                             when
 (SETQ D (FILDIR (PACKFILENAME 'NAME
+                                                                         (CONCAT "XCCS-*=" F)
+                                                                         'EXTENSION
+                                                                         'TXT
+                                                                         'BODY D)))
+                                             do
 (RETURN D))
+                                          (AND [SETQ CSI (OR (SASSOC F XCCS-SET-NAMES)
+                                                             (FIND
 N IN
 XCCS-SET-NAMES
+                                                                SUCHTHAT
 (EQ F (CADR N]
+                                               (MKLIST (FINDFILE (PACKFILENAME 'BODY
+                                                                        (CONCAT 'XCCS- (CAR CSI)
+                                                                               '=
+                                                                               (CADR CSI))
+                                                                        'EXTENSION
+                                                                        'TXT)
+                                                              T DIRS)))
+                                          (for
 D inside
 DIRS
+                                             when
 (DIRECTORYNAMEP (SETQ D (CONCAT D ">" F ">")))
+                                             join
 (FILDIR (CONCAT D ">*.TXT;*"])
 
 (READ-UNICODE-MAPPING

-  [LAMBDA (FILESPEC NOPRINT NOERROR)
                    (* ; "Edited  3-Jul-2021 13:37 by rmk:")

+  [LAMBDA (FILESPEC NOPRINT NOERROR)
                         (* ; "Edited  5-Jan-2024 12:26 by rmk")


+                                                            (* ; "Edited  3-Jul-2021 13:37 by rmk:")

 
     (* ;; "Combines the char-mapping tables from FILES coded in the Uncode-CDROM format.  Comments prefixed by # and")

 
@@ -539,8 +578,7 @@
 
     (* ;; "                                            0xXXXX  ... 0xYYYY")

 
-    (* ;; 
-
  "               Column 3:  (after #) Character name in some mapping files, utf-8 character")

+    (* ;; "               Column 3:  (after #) Character name in some mapping files, utf-8 character")

 
     (* ;; "                                     for XCCS mapping files")

 
@@ -548,37 +586,34 @@
 
     (* ;; "Result is a list of (fromcode tocode1 ... tocoden) integer lists (almost always with only a single tocode")

 
-    (FOR
 FILE [SEPBITTABLE _ (MAKEBITTABLE (CHARCODE (TAB SPACE] IN
 (
-
                                                                     READ-UNICODE-MAPPING-FILENAMES

-                                                                             FILESPEC)
+    (FOR
 FILE [SEPBITTABLE _ (MAKEBITTABLE (CHARCODE (TAB SPACE] IN
 (READ-UNICODE-MAPPING-FILENAMES

+                                                                     FILESPEC)
        JOIN
 (CL:WITH-OPEN-FILE (STREAM FILE :DIRECTION :INPUT :EXTERNAL-FORMAT :UTF-8-RAW)
-                       (BIND
 LINE START FIRST
 (CL:UNLESS 
-                                                          (FILEPOS "Name:" STREAM NIL NIL NIL T)
-                                                          (ERROR "NOT A UNICODE MAPPING FILE"
-                                                                 (FULLNAME STREAM)))
-                                                  (SETQ LINE (CL:READ-LINE STREAM NIL NIL))
-                                                  (CL:UNLESS NOPRINT
-                                                      (PRINTOUT T T "Unicode mapping:  "
-                                                             (CL:STRING-TRIM " " LINE)
-                                                             T)) WHILE
 (SETQ LINE
-                                                                            (CL:READ-LINE STREAM NIL
-                                                                                   NIL))
-                          WHEN
 (SETQ START (STRPOSL SEPBITTABLE LINE 1 T))
-                          UNLESS
 (EQ (CHARCODE %#)
-                                         (NTHCHARCODE LINE START))
-                          COLLECT
 (BIND
 END WHILE
 [SETQ END (OR (STRPOSL SEPBITTABLE LINE
-                                                                                   START)
-                                                                            (ADD1 (NCHARS LINE]
-                                         COLLECT
 [CHARCODE.DECODE (SUBSTRING LINE START
-                                                                             (SUB1 END)
-                                                                             (CONSTANT (CONCAT]
-                                         REPEATWHILE
 (AND (SETQ START (STRPOSL SEPBITTABLE LINE 
-                                                                                 END T))
-                                                              (NEQ (CHARCODE %#)
-                                                                   (NTHCHARCODE LINE START])
+                   (BIND
 LINE NAME CHARSET START
+                      FIRST
 (CL:UNLESS (FILEPOS "Name:" STREAM NIL NIL NIL T)
+                                (ERROR "NOT A UNICODE MAPPING FILE" (FULLNAME STREAM)))
+                            (SETQ NAME (CL:STRING-TRIM " " (CL:READ-LINE STREAM NIL NIL)))
+                            (SETQ CHARSET (CL:IF (FILEPOS "XCCS charset:" STREAM NIL NIL NIL T)
+                                              (CL:STRING-TRIM " " (CL:READ-LINE STREAM NIL NIL))
+                                              ""))
+                            (CL:UNLESS NOPRINT               (* ; "Strip off XCCS in front of name")

+                                (PRINTOUT T T CHARSET " " [SUBSTRING NAME (CONSTANT
+                                                                           (ADD1 (NCHARS "XCCS"]
+                                       T)) WHILE
 (SETQ LINE (CL:READ-LINE STREAM NIL NIL))
+                      WHEN
 (SETQ START (STRPOSL SEPBITTABLE LINE 1 T))
+                      UNLESS
 (EQ (CHARCODE %#)
+                                 (NTHCHARCODE LINE START))
+                      COLLECT
 (BIND
 END WHILE
 [SETQ END (OR (STRPOSL SEPBITTABLE LINE START)
+                                                            (ADD1 (NCHARS LINE]
+                                 COLLECT
 [CHARCODE.DECODE (SUBSTRING LINE START (SUB1 END)
+                                                                 (CONSTANT (CONCAT]
+                                 REPEATWHILE
 (AND (SETQ START (STRPOSL SEPBITTABLE LINE END T))
+                                                  (NEQ (CHARCODE %#)
+                                                       (NTHCHARCODE LINE START])
 
 (WRITE-UNICODE-MAPPING

-  [LAMBDA (MAPPING INCLUDECHARSETS FILE EMPTYOK)
        (* ; "Edited 16-Aug-2020 16:56 by rmk:")

+  [LAMBDA (MAPPING INCLUDECHARSETS FILE EMPTYOK)
             (* ; "Edited  4-Jan-2024 22:44 by rmk")


+                                                            (* ; "Edited 16-Aug-2020 16:56 by rmk:")

 
     (* ;; "Writes a symbol unicode mapping file.  Mapping is a list of (XCCS-code Unicode) pairs, which may contain codes in multiple character sets.")

 
@@ -587,21 +622,18 @@
     (* ;; "The output lines are of the form x0XXX<tab>x0UUUU<tab>#  Unicode-char")

 
     (* ;; 
-
  "If INCLUDECHARSETS=T then the mappings are split up into separate per-character set files.")

+
    "If INCLUDECHARSETS=T then the mappings are split up into separate per-character set files.")

 
     (* ;; "Otherwise, all and only mappings included in thos charsets are included in a single output file--an implicit subset.")

 
     (IF
 (AND (EQ INCLUDECHARSETS T)
-                 (NULL FILE))
+             (NULL FILE))
         THEN
 (IF
 MAPPING
-                     THEN
 (FOR
 CSI F IN
 XCCS-SET-NAMES WHEN
 (SETQ F
-                                                                             (WRITE-UNICODE-MAPPING

-                                                                              MAPPING
-                                                                              (CAR CSI)
-                                                                              NIL T)) COLLECT

-                                                                                      F)
-                   ELSE
 (PRINTOUT T "THERE ARE NO MAPPINGS" T)
-                         NIL)
+                 THEN
 (FOR
 CSI F IN
 XCCS-SET-NAMES WHEN
 (SETQ F (WRITE-UNICODE-MAPPING
 MAPPING
+                                                                       (CAR CSI)
+                                                                       NIL T)) COLLECT
 F)
+               ELSE
 (PRINTOUT T "THERE ARE NO MAPPINGS" T)
+                    NIL)
       ELSE

       (LET
        (IMAPPING CSETINFO RANGES)
@@ -609,47 +641,45 @@
               (WRITE-UNICODE-INCLUDED
 MAPPING INCLUDECHARSETS))
        (IF
 IMAPPING
            THEN
 (CL:WITH-OPEN-FILE
-                     (STREAM (WRITE-UNICODE-MAPPING-FILENAME
 FILE CSETINFO RANGES)
-                            :DIRECTION :OUTPUT :IF-EXISTS :NEW-VERSION :EXTERNAL-FORMAT :UTF8-RAW)
-                     (WRITE-UNICODE-MAPPING-HEADER
 STREAM CSETINFO RANGES)
-                     (SORT IMAPPING T)
-                     (FOR
 M CSET LEFTC FIRSTRIGHTC CSI IN
 IMAPPING
-                        DO
 (SETQ LEFTC (CAR M))
-                              (SETQ FIRSTRIGHTC (CADR M))
-                              (CL:UNLESS (EQ CSET (LRSH LEFTC 8))
-                                  (SETQ CSET (LRSH LEFTC 8))
-                                  (SETQ CSI (ASSOC CSET CSETINFO))
-                                  (PRINTOUT STREAM T "#  " .P2 (CADR CSI)
-                                         " "
-                                         (CADDR CSI)
-                                         T))
-                              (PRINTOUT STREAM "0x" (HEXSTRING
 LEFTC 4)
-                                     %#
-                                     (FOR
 RIGHTC IN
 (CDR M)
-                                        DO
 (PRINTOUT NIL "	" "0x" (HEXSTRING
 RIGHTC 4)))
-                                     "	#  "
-                                     (SELECTC FIRSTRIGHTC
-                                         (UNDEFINEDCODE 
-                                                        (* ;; "FFFF")

+                 (STREAM (WRITE-UNICODE-MAPPING-FILENAME
 FILE CSETINFO RANGES)
+                        :DIRECTION :OUTPUT :IF-EXISTS :NEW-VERSION :EXTERNAL-FORMAT :UTF-8-RAW)
+                 (WRITE-UNICODE-MAPPING-HEADER
 STREAM CSETINFO RANGES)
+                 (SORT IMAPPING T)
+                 (FOR
 M CSET LEFTC FIRSTRIGHTC CSI IN
 IMAPPING
+                    DO
 (SETQ LEFTC (CAR M))
+                       (SETQ FIRSTRIGHTC (CADR M))
+                       (CL:UNLESS (EQ CSET (LRSH LEFTC 8))
+                           (SETQ CSET (LRSH LEFTC 8))
+                           (SETQ CSI (ASSOC CSET CSETINFO))
+                           (PRINTOUT STREAM T "#  " .P2 (CADR CSI)
+                                  " "
+                                  (CADDR CSI)
+                                  T))
+                       (PRINTOUT STREAM "0x" (HEXSTRING
 LEFTC 4)
+                              %#
+                              (FOR
 RIGHTC IN
 (CDR M) DO
 (PRINTOUT NIL "	" "0x" (HEXSTRING
 RIGHTC 4)))
+                              "	#  "
+                              (SELECTC FIRSTRIGHTC
+                                  (UNDEFINEDCODE 
+                                                 (* ;; "FFFF")

 
-                                                        "UNDEFINED")
-                                         (MISSINGCODE 
-                                                      (* ;; "FFFE")

+                                                 "UNDEFINED")
+                                  (MISSINGCODE 
+                                               (* ;; "FFFE")

 
-                                                      "MISSING")
-                                         (IF
 (ILESSP FIRSTRIGHTC 32)
-                                             THEN
        (* ; "Control chars")

-                                                   [CONCAT "^" (CHARACTER (IPLUS FIRSTRIGHTC
-                                                                                 (CHARCODE @]
-                                           ELSE
 (CHARACTER FIRSTRIGHTC)))
-                                     T))
-                     (FULLNAME STREAM))
+                                               "MISSING")
+                                  (IF
 (ILESSP FIRSTRIGHTC 32)
+                                      THEN
                   (* ; "Control chars")

+                                           [CONCAT "^" (CHARACTER (IPLUS FIRSTRIGHTC (CHARCODE @]
+                                    ELSE
 (CHARACTER FIRSTRIGHTC)))
+                              T))
+                 (FULLNAME STREAM))
          ELSEIF
 (NOT EMPTYOK)
            THEN
 (PRINTOUT T "THERE ARE NO MAPPINGS")
-                 (CL:WHEN INCLUDECHARSETS
-                     (PRINTOUT T " FOR " .PPVTL (MKLIST INCLUDECHARSETS)
-                            T))
-                 NIL])
+                (CL:WHEN INCLUDECHARSETS
+                    (PRINTOUT T " FOR " .PPVTL (MKLIST INCLUDECHARSETS)
+                           T))
+                NIL])
 
 (WRITE-UNICODE-INCLUDED

   [LAMBDA (MAPPING INCLUDECHARSETS)
                     (* ; "Edited  4-Aug-2020 17:47 by rmk:")

@@ -724,28 +754,28 @@
          (CL:VALUES IMAPPING CSETINFO RANGES])
 
 (WRITE-UNICODE-MAPPING-HEADER

-  [LAMBDA (STREAM CSETINFO RANGES)
                      (* ; "Edited  4-Aug-2020 17:38 by rmk:")

+  [LAMBDA (STREAM CSETINFO RANGES)
                           (* ; "Edited  5-Jan-2024 13:24 by rmk")


+                                                            (* ; "Edited  4-Aug-2020 17:38 by rmk:")

 
     (* ;; "Writes the standard per-file header information")

 
     (FOR
 LINE IN
 UNICODE-MAPPING-HEADER
        DO
 (PRINTOUT STREAM "#" 2)
-             (SELECTQ LINE
-                 (XCCSCHARACTERSETS 
-                      (PRINTOUT STREAM "        XCCS charset")
-                      (IF
 (CDR CSETINFO)
-                          THEN
 (PRINTOUT STREAM "s:" -4)
-                                (FOR
 R IN
 RANGES DO
 (PRINTOUT STREAM R " "))
-                                (TERPRI STREAM)
-                        ELSE
                             (* ; "Singleton")

-                              (PRINTOUT STREAM ": " -4 (CADAR CSETINFO)
-                                     " "
-                                     (CADDAR CSETINFO)))
-                      (TERPRI STREAM))
-                 (DATE (PRINTOUT STREAM "        Date:" -13 (DATE (DATEFORMAT NO.TIME 
-                                                                         NO.LEADING.SPACES))
-                              T))
-                 (PRINTOUT STREAM LINE T)))
+          (SELECTQ LINE
+              (XCCSCHARACTERSETS 
+                   (PRINTOUT STREAM "        XCCS charset")
+                   (IF
 (CDR CSETINFO)
+                       THEN
 (PRINTOUT STREAM "s:" -4)
+                            (FOR
 R IN
 RANGES DO
 (PRINTOUT STREAM R " "))
+                     ELSE
                                    (* ; "Singleton")

+                          (PRINTOUT STREAM ": " -4 (CADAR CSETINFO)
+                                 " "
+                                 (CADDAR CSETINFO)))
+                   (TERPRI STREAM))
+              (DATE (PRINTOUT STREAM "        Date:" -13 (DATE (DATEFORMAT NO.TIME NO.LEADING.SPACES)
+                                                               )
+                           T))
+              (PRINTOUT STREAM LINE T)))
     (TERPRI STREAM])
 
 (WRITE-UNICODE-MAPPING-FILENAME

@@ -774,24 +804,28 @@
 
 (RPAQQ XCCS-SET-NAMES

        (("0" LATIN)
-        ("41" SYMBOLS1)
-        ("42" SYMBOLS2)
+        ("41" JAPANESE-SYMBOLS1)
+        ("42" JAPANESE-SYMBOLS2)
         ("43" EXTENDED-LATIN)
         ("44" HIRAGANA)
         ("45" KATAKANA)
         ("46" GREEK)
         ("47" CYRILLIC)
         ("50" FORMS)
-        ("60-172" JIS)
+        ("60-166" JIS)
         ("340" ARABIC)
         ("341" HEBREW)
         ("342" IPA)
         ("343" HANGUL)
         ("344" GEORGIAN-ARMENIAN)
-        ("356" SYMBOLS3)
-        ("357" SYMBOLS4)
+        ("345" DEVANAGRI)
+        ("346" BENGALI)
+        ("347" GURMUKHI)
+        ("350" THAI-LAO)
+        ("356" SYMBOLS2)
+        ("357" SYMBOLS1)
         ("360" LIGATURES)
-        ("361" ACCENTED-LATIN)
+        ("361" ACCENTED-LATIN1)
         ("365" MORE-ARABIC)
         ("375" GRAPHIC-VARIANTS)))
 
@@ -813,22 +847,21 @@
 )
 
 (RPAQQ UNICODE-MAPPING-HEADER

-       ("" "        Name:             XCCS (XC-3-1-1-0) to Unicode" "        Unicode version:  3.0" 
+       ("" "        Name:             XCCS (Version 2.0) to Unicode" "        Unicode version:  3.0"
            XCCSCHARACTERSETS "        Table version:    0.1" "        Table format:     Format A" 
            DATE "        Author:           Ron Kaplan <Ron.Kaplan@post.harvard.edu>" "" 
            "This file contains mappings from the Xerox Character Code Standard (version" 
-           "XC1-3-3-0, 1987) into Unicode 3.0. standard codes.  That is the version of" 
-           "XCCS corresponding to the fonts in the Medley system." "" 
+           "2.0, 1990) into Unicode 3.0. standard codes.  That is an extension of the" 
+           "version of XCCS corresponding to the fonts in the Medley system." "" 
            "The format of this file conforms to the format of the other Unicode-supplied" 
            "mapping files:" "   Three white-space (tab or spaces) separated columns:" 
            "     Column 1 is the XCCS code (as hex 0xXXXX)" 
            "     Column 2 is the corresponding Unicode (as hex 0xXXXX)" 
            "     Column 3 (after #) is a comment column. For convenience, it contains the" 
-           "        Unicode character itself (since the Unicode character names" 
-           "        are not available)" 
+           "        Unicode character itself and the Unicode character names when available." 
            "Unicode FFFF is used for undefined XCCS codes (Column 3 = UNDEFINED" 
            "Unicode FFFE is used for XCCS codes that have not yet been filled in." 
-           "(Column 3 = MISSING)" "" "This file is encoded in UTF8, so that the Unicode characters" 
+           "(Column 3 = MISSING)" "" "This file is encoded in UTF-8, so that the Unicode characters"
            "are properly displayed in Column 3 and can be edited by standard" 
            "Unicode-enabled editors (e.g. Mac Textedit)." "" 
            "This file can also be read by the function" 
@@ -850,7 +883,7 @@
 (DEFINEQ
 
 (MAKE-UNICODE-TRANSLATION-TABLES

-  [LAMBDA (MAPPING LTORVAR RTOLVAR)
                     (* ; "Edited 21-Aug-2021 13:12 by rmk:")


+  [LAMBDA (MAPPING LTORVAR RTOLVAR)
                         (* ; "Edited 21-Aug-2021 13:12 by rmk:")


                                                             (* ; "Edited 17-Aug-2020 08:46 by rmk:")

 
     (* ;; "MAPPING is the list of numeric code correspondence pairs constructed by applying READ-UNICODE-MAPPING to a Unicode mapping file.")

@@ -876,7 +909,7 @@
     (* ;; "")

 
     (* ;; 
-
  "An unmapped XCCS character is assigned a code in the %"private use%" code blocks 0xE000-F8FF")

+
    "An unmapped XCCS character is assigned a code in the %"private use%" code blocks 0xE000-F8FF")

 
     (* ;; "")

 
@@ -892,75 +925,67 @@
          (* ;; "The left-to-right direction (into Unicode).    We start by distributing the mappings into alists in arrays indexed by the higher-order (charaset set byte).  The second loop converts long alists into arrays.")

 
          [FOR
 M LEFTC RBASE RCODES IN
 MAPPING EACHTIME
 (SETQ RCODES (CDR M))
-                                                            (SETQ RBASE (CAR RCODES))
+                                                    (SETQ RBASE (CAR RCODES))
             UNLESS
 (IGEQ RBASE MISSINGCODE) DO
 (SETQ LEFTC (CAR M)) 
 
-                                                      (* ;; 
-
                                                    "(CDR RCODES) contains combiners on the base")

+                                               (* ;; "(CDR RCODES) contains combiners on the base")

 
-                                                      (CL:PUSH (CONS (LOGAND LEFTC TRANSLATION-MASK)
-                                                                     (CL:IF (CDR RCODES)
-                                                                         RCODES
-                                                                         RBASE))
-                                                             (CL:SVREF LTORARRAY (LRSH LEFTC 
-                                                                                    TRANSLATION-SHIFT
-                                                                                       ]
+                                               (CL:PUSH (CONS (LOGAND LEFTC TRANSLATION-MASK)
+                                                              (CL:IF (CDR RCODES)
+                                                                  RCODES
+                                                                  RBASE))
+                                                      (CL:SVREF LTORARRAY (LRSH LEFTC 
+                                                                                TRANSLATION-SHIFT]
          (FOR
 I CSA FROM
 0 TO
 (SUB1 N-TRANSLATION-SEGMENTS)
             WHEN
 (IGREATERP (LENGTH (CL:SVREF LTORARRAY I))
-                            MAX-ALIST-LENGTH)
-            DO
 
+                        MAX-ALIST-LENGTH) DO
 
+                                             (* ;; "Leave it alone if the alist is short")

 
-                  (* ;; "Leave it alone if the alist is short")

-
-                  (SETQ CSA (CL:MAKE-ARRAY TRANSLATION-SEGMENT-SIZE :INITIAL-ELEMENT NIL))
-                  (FOR
 P IN
 (CL:SVREF LTORARRAY I)
-                     DO
 (CL:SETF (CL:SVREF CSA (LOGAND (CAR P)
-                                                          TRANSLATION-MASK))
-                                   (CDR P)))
-                  (CL:SETF (CL:SVREF LTORARRAY I)
-                         CSA))
+                                             (SETQ CSA (CL:MAKE-ARRAY TRANSLATION-SEGMENT-SIZE 
+                                                              :INITIAL-ELEMENT NIL))
+                                             (FOR
 P IN
 (CL:SVREF LTORARRAY I)
+                                                DO
 (CL:SETF (CL:SVREF CSA (LOGAND (CAR P)
+                                                                                 TRANSLATION-MASK))
+                                                          (CDR P)))
+                                             (CL:SETF (CL:SVREF LTORARRAY I)
+                                                    CSA))
 
          (* ;; "")

 
          (* ;; "Now the right-to-left direction (from Unicode). Here we have to detect and compensate for ambiguity.")

 
          (FOR
 M LEFTC RBASE RCOMBINERS PREV IN
 MAPPING EACHTIME
 (SETQ RBASE (CADR M))
-                                                                     (SETQ RCOMBINERS (CDDR M))
+                                                             (SETQ RCOMBINERS (CDDR M))
             UNLESS
 (OR (IGEQ RBASE MISSINGCODE)
-                           RCOMBINERS) DO
 
+                       RCOMBINERS) DO
 
+                                      (* ;; 
+
                                      "Have we already seen an explicit mapping from right to left?")

 
-                                             (* ;; 
-
                                     "Have we already seen an explicit mapping from right to left?")

-
-                                             (SETQ LEFTC (CAR M))
-                                             [SETQ PREV (ASSOC (LOGAND RBASE TRANSLATION-MASK)
-                                                               (CL:SVREF RTOLARRAY (LRSH RBASE 
-                                                                                    TRANSLATION-SHIFT
-                                                                                         ]
-                                             (IF
 (NULL PREV)
-                                                 THEN
 (CL:PUSH (CONS (LOGAND RBASE 
-                                                                                TRANSLATION-MASK)
-                                                                         LEFTC)
-                                                                 (CL:SVREF RTOLARRAY (LRSH RBASE 
-                                                                                    TRANSLATION-SHIFT
-                                                                                           )))
-                                               ELSEIF
 (IGREATERP (CDR PREV)
-                                                                 LEFTC)
-                                                 THEN
 (RPLACD PREV LEFTC)))
+                                      (SETQ LEFTC (CAR M))
+                                      [SETQ PREV (ASSOC (LOGAND RBASE TRANSLATION-MASK)
+                                                        (CL:SVREF RTOLARRAY (LRSH RBASE 
+                                                                                  TRANSLATION-SHIFT]
+                                      (IF
 (NULL PREV)
+                                          THEN
 (CL:PUSH (CONS (LOGAND RBASE TRANSLATION-MASK)
+                                                              LEFTC)
+                                                      (CL:SVREF RTOLARRAY (LRSH RBASE 
+                                                                                TRANSLATION-SHIFT)))
+                                        ELSEIF
 (IGREATERP (CDR PREV)
+                                                      LEFTC)
+                                          THEN
 (RPLACD PREV LEFTC)))
          (FOR
 I CSA FROM
 0 TO
 (SUB1 N-TRANSLATION-SEGMENTS)
             WHEN
 (IGREATERP (LENGTH (CL:SVREF RTOLARRAY I))
-                            MAX-ALIST-LENGTH)
-            DO
 
+                        MAX-ALIST-LENGTH) DO
 
+                                             (* ;; "Long list, make an array")

 
-                  (* ;; "Long list, make an array")

-
-                  (SETQ CSA (CL:MAKE-ARRAY TRANSLATION-SEGMENT-SIZE :INITIAL-ELEMENT NIL))
-                  (FOR
 P IN
 (CL:SVREF RTOLARRAY I)
-                     DO
 (CL:SETF (CL:SVREF CSA (LOGAND (CAR P)
-                                                          TRANSLATION-MASK))
-                                   (CDR P)))
-                  (CL:SETF (CL:SVREF RTOLARRAY I)
-                         CSA))
+                                             (SETQ CSA (CL:MAKE-ARRAY TRANSLATION-SEGMENT-SIZE 
+                                                              :INITIAL-ELEMENT NIL))
+                                             (FOR
 P IN
 (CL:SVREF RTOLARRAY I)
+                                                DO
 (CL:SETF (CL:SVREF CSA (LOGAND (CAR P)
+                                                                                 TRANSLATION-MASK))
+                                                          (CDR P)))
+                                             (CL:SETF (CL:SVREF RTOLARRAY I)
+                                                    CSA))
 
          (* ;; "")

 
@@ -991,8 +1016,10 @@
          (LIST LTORARRAY RTOLARRAY])
 )
 
-(RPAQ? DEFAULT-XCCS-CHARSETS
 '(LATIN SYMBOLS1 SYMBOLS2 EXTENDED-LATIN FORMS SYMBOLS3 SYMBOLS4 
-                                     ACCENTED-LATIN GREEK))
+(RPAQ? DEFAULT-XCCS-CHARSETS
 '(LATIN JAPANESE-SYMBOLS1 JAPANESE-SYMBOLS2 EXTENDED-LATIN FORMS 
+                                     SYMBOLS1 SYMBOLS2 ACCENTED-LATIN1 GREEK))
+
+(RPAQ? DEFAULT-XCCS-JAPANESE-CHARSETS
 '(HIRAGANA KATAKANA JIS))
 (DECLARE%: DONTEVAL@LOAD DOCOPY 
 
 (MAKE-UNICODE-TRANSLATION-TABLES
 (READ-UNICODE-MAPPING
 DEFAULT-XCCS-CHARSETS T)
@@ -1005,6 +1032,63 @@
 )
 (DEFINEQ
 
+(UTF-8.VALIDATE

+  [LAMBDA (STREAM BYTE1)
                                     (* ; "Edited 28-Dec-2023 11:57 by rmk")


+                                                            (* ; "Edited  6-Aug-2021 16:02 by rmk:")


+                                                            (* ; "Edited  6-Aug-2020 17:13 by rmk:")

+
+    (* ;; "Returns the codesize if the bytes starting at STREAM's current position form a valid UTF-8 sequence.")

+
+    (* ;; "If BYTE1 is provided, it is interpreted as the just-read header byte with the stream is positioned just after it.")

+
+    (* ;; "Test for smallp because the stream's End-of-file operation may suppress the error--otherwise an error will happen if the streams runs out of necessary bytes.")

+
+    (* ;; "For valid sequences, returns the same value as NUTF8CODEBYTES, but this reads/validates the rest of the bytes. On a non-NILreturn the  stream is positioned before the header byte of the next putative code. The stream position is uncertain on a NIL return.")

+
+    (* ;; "")

+
+    (CL:UNLESS BYTE1
+        (SETQ BYTE1 (\BIN STREAM)))
+    (PROG (BYTE2 BYTE3 BYTE4)
+
+     (* ;; "Distinguish on the header byte BYTE1.")

+
+          (CL:WHEN (SMALLP BYTE1)
+              (IF
 (ILESSP BYTE1 128)
+                  THEN
 (RETURN 1)
+                ELSEIF
 (IGEQ BYTE1 (LLSH 15 4))
+                  THEN
                                       (* ; "4 bytes")

+                       (SETQ BYTE2 (\BIN STREAM))
+                       (CL:WHEN (OR (NOT (SMALLP BYTE2))
+                                    (ILESSP BYTE2 128))
+                              (RETURN))
+                       (SETQ BYTE3 (\BIN STREAM))
+                       (CL:WHEN (OR (NOT (SMALLP BYTE3))
+                                    (ILESSP BYTE3 128))
+                              (RETURN))
+                       (SETQ BYTE4 (\BIN STREAM))
+                       (CL:WHEN (OR (NOT (SMALLP BYTE4))
+                                    (ILESSP BYTE4 128))
+                              (RETURN))
+                       (RETURN 4)
+                ELSEIF
 (IGEQ BYTE1 (LLSH 7 5))
+                  THEN
                                       (* ; "3 bytes")

+                       (SETQ BYTE2 (\BIN STREAM))
+                       (CL:WHEN (OR (NOT (SMALLP BYTE2))
+                                    (ILESSP BYTE2 128))
+                              (RETURN))
+                       (SETQ BYTE3 (\BIN STREAM))
+                       (CL:WHEN (OR (NOT (SMALLP BYTE3))
+                                    (ILESSP BYTE3 128))
+                              (RETURN))
+                       (RETURN 3)
+                ELSE
                                         (* ; " 2 bytes")

+                     (SETQ BYTE2 (\BIN STREAM))
+                     (CL:WHEN (OR (NOT (SMALLP BYTE2))
+                                  (ILESSP BYTE2 128))
+                            (RETURN NIL))
+                     (RETURN 2)))])
+
 (HEXSTRING

   [LAMBDA (N WIDTH)
                                     (* ; "Edited 23-Jul-2020 08:28 by rmk:")


                                                              (* ; "Edited 20-Dec-93 17:51 by rmk:")

@@ -1068,23 +1152,24 @@
                      ELSE
 (ERROR "CHARCODE too big for UTF8" CHARCODE])
 
 (NUTF8CODEBYTES

-  [LAMBDA (N)
                                                (* ; "Edited 28-Jun-2022 00:02 by rmk")


+  [LAMBDA (BYTE)
                                             (* ; "Edited  8-Jan-2024 10:57 by rmk")


+                                                             (* ; "Edited 28-Jun-2022 00:02 by rmk")


                                                             (* ; "Edited 10-Aug-2020 12:35 by rmk:")

 
-    (* ;; "Returns the number of bytes needed to encode N in UTF8, ")

+    (* ;; "Returns the number of bytes needed to encode in UTF8 a number headed by BYTE. ")

 
-    (IF
 (ILESSP N 128)
+    (IF
 (ILESSP BYTE 128)
         THEN
 1
-      ELSEIF
 (ILESSP N 2048)
+      ELSEIF
 (ILESSP BYTE 2048)
         THEN
                                                 (* ; "x800")

              2
-      ELSEIF
 (ILESSP N 65536)
+      ELSEIF
 (ILESSP BYTE 65536)
         THEN
                                                 (* ; "x10000")

              3
-      ELSEIF
 (ILESSP N 2097152)
+      ELSEIF
 (ILESSP BYTE 2097152)
         THEN
                                                 (* ; "x200000")

              4
-      ELSE
 (SHOULDNT])
+      ELSE
 (ERROR "INVALID UTF-8 HEADER BYTE"])
 
 (NUTF8STRINGBYTES

   [LAMBDA (STRING RAWFLG)
                               (* ; "Edited 10-Aug-2020 09:06 by rmk:")

@@ -1160,15 +1245,54 @@
 )
 (DEFINEQ
 
+(\UTF8.FETCHCODE

+  [LAMBDA (CODESIZE BUFFER BYTEOFFSET)
                       (* ; "Edited 28-Dec-2023 13:32 by rmk")


+                                                            (* ; "Edited  6-Aug-2021 16:02 by rmk:")


+                                                            (* ; "Edited  6-Aug-2020 17:13 by rmk:")

+
+    (* ;; "Decodes a UTF8 byte sequence of size CODESIZE in BUFFER starting at BYTEOFFSET.")

+
+    (* ;; "The validity of the thesize, buffer, and offset are guaranteed by the caller.")

+
+    (LET ((BYTE1 (\GETBASEBYTE BUFFER BYTEOFFSET))
+          BYTE2 BYTE3 BYTE4)
+         (SELECTQ CODESIZE
+             (2 (SETQ BYTE2 (\UTF8.GETBASEBYTE BUFFER (IPLUS 1 BYTEOFFSET)))
+                (LOGOR (LLSH (LOADBYTE BYTE1 0 5)
+                             6)
+                       (LOADBYTE BYTE2 0 6)))
+             (3 (SETQ BYTE2 (\UTF8.GETBASEBYTE BUFFER (IPLUS 1 BYTEOFFSET)))
+                (SETQ BYTE3 (\UTF8.GETBASEBYTE BUFFER (IPLUS 2 BYTEOFFSET)))
+                (LOGOR (LLSH (LOADBYTE BYTE1 0 4)
+                             12)
+                       (LLSH (LOADBYTE BYTE2 0 6)
+                             6)
+                       (LOADBYTE BYTE3 0 6)))
+             (4 (SETQ BYTE2 (\UTF8.GETBASEBYTE BUFFER (IPLUS 1 BYTEOFFSET)))
+                (SETQ BYTE3 (\UTF8.GETBASEBYTE BUFFER (IPLUS 2 BYTEOFFSET)))
+                (SETQ BYTE4 (\UTF8.GETBASEBYTE BUFFER (IPLUS 3 BYTEOFFSET)))
+                (LOGOR (LLSH (LOADBYTE BYTE1 0 3)
+                             18)
+                       (LLSH (LOADBYTE BYTE2 0 6)
+                             12)
+                       (LLSH (LOADBYTE BYTE3 0 6)
+                             6)
+                       (LOADBYTE BYTE4 0 6)))
+             (1 BYTE1)
+             (SHOULDNT])
+)
+(DEFINEQ
+
 (SHOWCHARS

-  [LAMBDA (FROMCHAR TOCHAR FONT)
                        (* ; "Edited  1-Aug-2020 09:27 by rmk:")

+  [LAMBDA (FROMCHAR TOCHAR FONT)
                             (* ; "Edited 26-Jan-2024 14:18 by mth")


+                                                            (* ; "Edited  1-Aug-2020 09:27 by rmk:")

     (RESETFORM (DSPFONT (OR FONT '(CLASSIC 12))
                       T)
            (CL:WHEN (AND (SMALLP FROMCHAR)
                          (NOT TOCHAR))
 
                (* ;; 
-
    "If a small number, assume it's an octal (in decimal) character set, no need for string quotes")

+
      "If a small number, assume it's an octal (in decimal) character set, no need for string quotes")

 
                (SETQ TOCHAR (CONCAT FROMCHAR "," 376))
                (SETQ FROMCHAR (CONCAT FROMCHAR "," 41)))
@@ -1178,16 +1302,16 @@
                (SETQ TOCHAR (CL:IF TOCHAR
                                 (CHARCODE.DECODE TOCHAR)
                                 FROMCHAR)))
-           (FOR
 C FROM
 FROMCHAR TO
 TOCHAR UNLESS
 (AND (IGEQ (LOGAND C 255)
-                                                                            127)
-                                                                      (ILEQ (LOGAND C 255)
-                                                                            (PLUS 128 33)))
-              DO
 (PRINTOUT T .P2 (CONCAT (OCTALSTRING (LRSH CODE 8))
-                                            ","
-                                            (OCTALSTRING (LOGAND CODE 255)))
-                            10
-                            (CHARACTER C)
-                            T])
+           (for
 C from
 FROMCHAR to
 TOCHAR unless
 (AND (IGEQ (LOGAND C 255)
+                                                            127)
+                                                      (ILEQ (LOGAND C 255)
+                                                            (PLUS 128 33)))
+              do
 (PRINTOUT T .P2 (CONCAT (OCTALSTRING (LRSH C 8))
+                                        ","
+                                        (OCTALSTRING (LOGAND C 255)))
+                        10
+                        (CHARACTER C)
+                        T])
 )
 (DECLARE%: EVAL@COMPILE DONTCOPY 
 
@@ -1214,16 +1338,19 @@
        (TRANSLATION-MASK (SUB1 TRANSLATION-SEGMENT-SIZE)))
 )
 )
+
+(PUTPROPS UNICODE
 FILETYPE
 :TCOMPL)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3717 17808 (UTF8.OUTCHARFN 3727 . 6558) (UTF8.INCCODEFN 6560 . 12050) (UTF8.PEEKCCODEFN
- 12052 . 16826) (\UTF8.BACKCCODEFN 16828 . 17806)) (17809 21590 (UTF16BE.OUTCHARFN 17819 . 18643) (
-UTF16BE.INCCODEFN 18645 . 19544) (UTF16BE.PEEKCCODEFN 19546 . 20617) (\UTF16BE.BACKCCODEFN 20619 . 
-21588)) (21620 23681 (MAKE-UNICODE-FORMATS 21630 . 23679)) (23778 25084 (UNICODE.UNMAPPED 23788 . 
-25082)) (25085 25621 (XCCS-UTF8-AFTER-OPEN 25095 . 25619)) (26454 26803 (XTOUCODE 26464 . 26632) (
-UTOXCODE 26634 . 26801)) (26843 42965 (READ-UNICODE-MAPPING-FILENAMES 26853 . 27954) (
-READ-UNICODE-MAPPING 27956 . 31254) (WRITE-UNICODE-MAPPING 31256 . 35473) (WRITE-UNICODE-INCLUDED 
-35475 . 40197) (WRITE-UNICODE-MAPPING-HEADER 40199 . 41431) (WRITE-UNICODE-MAPPING-FILENAME 41433 . 
-42963)) (46178 54657 (MAKE-UNICODE-TRANSLATION-TABLES 46188 . 54655)) (55074 63100 (HEXSTRING 55084 . 
-56245) (UTF8HEXSTRING 56247 . 58452) (NUTF8CODEBYTES 58454 . 59239) (NUTF8STRINGBYTES 59241 . 59722) (
-XTOUSTRING 59724 . 62735) (XCCSSTRING 62737 . 63098)) (63101 64570 (SHOWCHARS 63111 . 64568)))))
+  (FILEMAP (NIL (4111 18202 (UTF8.OUTCHARFN 4121 . 6952) (UTF8.INCCODEFN 6954 . 12444) (UTF8.PEEKCCODEFN
+ 12446 . 17220) (\UTF8.BACKCCODEFN 17222 . 18200)) (18203 21984 (UTF16BE.OUTCHARFN 18213 . 19037) (
+UTF16BE.INCCODEFN 19039 . 19938) (UTF16BE.PEEKCCODEFN 19940 . 21011) (\UTF16BE.BACKCCODEFN 21013 . 
+21982)) (22014 24295 (MAKE-UNICODE-FORMATS 22024 . 24293)) (24392 25698 (UNICODE.UNMAPPED 24402 . 
+25696)) (25699 26375 (XCCS-UTF8-AFTER-OPEN 25709 . 26373)) (27831 28180 (XTOUCODE 27841 . 28009) (
+UTOXCODE 28011 . 28178)) (28220 45174 (READ-UNICODE-MAPPING-FILENAMES 28230 . 30936) (
+READ-UNICODE-MAPPING 30938 . 33914) (WRITE-UNICODE-MAPPING 33916 . 37666) (WRITE-UNICODE-INCLUDED 
+37668 . 42390) (WRITE-UNICODE-MAPPING-HEADER 42392 . 43640) (WRITE-UNICODE-MAPPING-FILENAME 43642 . 
+45172)) (48488 56912 (MAKE-UNICODE-TRANSLATION-TABLES 48498 . 56910)) (57417 68615 (UTF-8.VALIDATE 
+57427 . 60429) (HEXSTRING 60431 . 61592) (UTF8HEXSTRING 61594 . 63799) (NUTF8CODEBYTES 63801 . 64754) 
+(NUTF8STRINGBYTES 64756 . 65237) (XTOUSTRING 65239 . 68250) (XCCSSTRING 68252 . 68613)) (68616 70420 (
+\UTF8.FETCHCODE 68626 . 70418)) (70421 71931 (SHOWCHARS 70431 . 71929)))))
 STOP

library/UNICODE.TXT

@@ -1,98 +0,0 @@
-This file describes the UNICODE Lisp Library package.
-
-Contributed by Ron Kaplan, August 2020.
-
-The UNICODE library package defines external file formats that enable Medley to read and write files where 16 bit character codes are represented as UTF8 byte sequences or big-endian UTF16 byte-pairs.  It also provides for character codes to be converted (on reading) from Unicode codes to equivalent codes in the Medley-internal Xerox Character Code Standard (XCCS) and (on writing) from XCCS codes to equivalent Unicode codes.
-
-Four external formats are defined when the package is loaded:
-
-  :UTF8	        codes are represented as UTF8 byte sequences and XCCS/Unicode character
-  				conversion takes place.
-
-  :UTF16BE      codes are represented as 2-byte pairs, with the high order by appearing
-			    first in the file, and characters are converted.
-			    
-The two other external formats translate byte sequences into codes, but do not translate the codes.  These allow Medley to see and process characters in their native encoding.
-
-  :UTF8-RAW     codes are represented as UTF8 byte sequences, but character conversion
-			    does not take place.
-
-  :UTF16BE-RAW  codes are represented as big-ending 2-byte pairs but there is no
-                conversion.
-
-These formats all define the end-of-line convention (mostly for writing) for the external files according to the variable EXTERNALEOL (LF, CR, CRLF), with LF the default.
-
-The external format can be specified as a parameter when a stream is opened:
-
-    (OPENSTREAM 'foo.txt 'INPUT 'OLD '((EXTERNALFORMAT :UTF8)))
-
-    (CL:OPEN 'foo.txt :DIRECTION :INPUT :EXTERNAL-FORMAT :UTF8)
-  
-The function STREAMPROP obtains or changes the external format of an open stream:
-
-	(STREAMPROP stream 'EXTERNALFORMAT)  -> :XCCS
-	
-	(STREAMPROP stream 'EXTERNALFORMAT :UTF8) -> :XCCS
-	
-In the latter case, the stream's format is changed to :UTF8 and the previous value is returned, in this example it is Medley's historical default format :XCCS.
-
-Entries can be placed on the variable *DEFAULT-EXTERNALFORMATS* to change the external format that is set by default when a file is opened on a particular device.  Loading UNICODE executes
-
-	(PUSH *DEFAULT-EXTERNALFORMATS* '(UNIX :UTF8))
-
-so that all files opened (by OPENSTREAM, CL:OPEN, etc.) on the UNIX file device will be initialized with :UTF8.  Note that the UNIX and DSK file devices reference the same files (although some caution is needed because {UNIX} does not simulate Medley versioning), but the device name in a file name ({UNIX}/Users/... vs. {DSK}/Users/...) selects one or the other. The default setting above applies only to files specified with {UNIX}; a separate default entry for DSK must be established to change its default from :XCCS. 
-
-The user can also specify the external format on a per-stream basis by putting a function on the list STREAM-AFTER-OPEN-FNS. After OPENSTREAM opens a stream and just before it is returned to the calling function, the functions on that list are applied in order to arguments STREAM, ACCESS, PARAMETERS. They can examine and/or change the properties of the stream, in particular, by calling STREAMPROP to change the external format from its device default.
-
-The XCCS/Unicode mapping tables are defined by the code-mapping files for particular XCCS character sets.  These are typically located in the Library sister directory
-
-	../Unicode/Xerox/
-	
-and the variable UNICODEDIRECTORIES is initialized with a globally valid reference to that path.  The global reference is constructed by prepending the value of the Unix environment-variable "MEDLEYDIR" to the suffix /Unicode/Xerox/.  MEDLEYDIR should be set by the Medley start-up shell script (e.g. /Users/kaplan/local/medley3.5/lispcore/)
-
-The mapping files have conventional names of the form XCCS-<charsetnum>=<charsetname>.TXT, for example, XCCS-0=LATIN.TXT, XCCS-357=SYMBOLS4.TXT.  The translations used by the external formats are read from these files by the function
-
-	(READ-UNICODE-MAPPING FILESPEC NOPRINT NOERROR) 
-	
-where FILESPEC can be a list of files, charset octal strings ("0" "357"), or XCCS charset names (LATIN EXTENDED-LATIN). Reading will be silent if NOPRINT, and the process will not abort if an error occurs and NOERROR.  The value is a flat list of the mappings for all the character sets, with elements of the form (XCCC-code Unicode-code). 
-
-When UNICODE is loaded the mappings for the character sets specified in the variable DEFAULT-XCCS-CHARSETS are installed.  This is initialized to
-
-    (LATIN SYMBOLS1 SYMBOLS2 EXTENDED-LATIN FORMS SYMBOLS3 SYMBOLS4 ACCENTED-LATIN GREEK)
-    
-but DEFAULT-XCCS-CHARSETS can be set to a different collection before UNICODE is loaded.
-
-The internal translation tables used by the external formats are constructed from a list of correspondence pairs by the function
-
-	(MAKE-UNICODE-TRANSLATION-TABLES MAPPING [FROM-XCCS-VAR][TO-XCCS-VAR])
-	
-This returns a list of two arrays (XCCS-to-Unicode Unicode-to-XCCS)containing the relevant translation information organized for rapid access.  If the optional from/to-variables arguments are provide, they are the names of variables whose top-level values will be set to these arrays, for convenience. For the external formats defined above, these variables are *XCCSTOUNICODE* and *UNICODETOXCCS*.
-
-The macro
-
-	(UNICODE.TRANSLATE CODE TRANSLATION-TABLE)
-	
-is used by the external formats to perform the mappings described by the translation-tables.
-
-The following utilities are provided for lower-level manipulation of codes and strings 
-
-	(XTOUCODE XCCSCODE) -> corresponding Unicode
-	(UTOXCODE UNICODE) -> corresponding XCCS code
-	(NUTF8CODEBYTES N) -> number of bytes in the UTF8 representation of N
-	(NUTF8STRINGBYTES STRING RAWFLG) -> number of UTF8 bytes in the UTF8
-	      representation of STRING, translating XCCS to Unicode unless RAWFLG.
-	(XTOUSTRING XCCSSTRING RAWFLG) -> The string of bytes in the UTF8 representation
-	      of the characters in XCCSSTRING (= the bytes in its UTF8 file encoding)
-	(HEXSTRING N WIDTH) -> the hex string for N, padded to WIDTH
-	
-
-The UNICODE file also contains a function for writing a mapping file given a list of mapping pairs. The function
-
-     (WRITE-TRANSLATION-TABLE MAPPING [INCLUDEDCHARSETS] [FILE])
-     
-produces one or more mapping files for the mapping-pairs in mapping.  If the optional FILE argument is provided, then a single file with that name will be produced and contain all the mappings for all the character sets in MAPPING.  If FILE and INCLUDEDCHARSETS are not provided, then all of the mappings will again go to a single file with a composite name XCCS-csn1,csn2,csn3.TXT.  Each cs may be a single charset number, or a range of adjacent charset numbers.  For example, if the mappings contain entries for characters in charset LATIN, SYMBOLS1, SYMBOLS2, and SYMBOLS3, the file name will be XCCS-0,41-43.TXT.
- 
-If INCLUDEDCHARSETS is provided, it specifies possibly a subset of the mappings in MAPPING for which files should be produced.  This provides an implicit subsetting capability.
-
-Finally, if FILE is not provided and INCLUDEDCHARSETS is T, then a separate file will be produced for each of the character sets, essentially a way of splitting a collection of character-set mappings into separate canonically named files (e.g. XCCS-357=SYMBOLS4.TXT). 
-

library/sketch/SKETCH

@@ -1,15 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 4-Aug-2022 09:58:03" {DSK}<home>larry>medley>library>SKETCH.;2
 491064 
+
(FILECREATED " 5-Dec-2023 00:44:13" {WMEDLEY}<library>sketch>SKETCH.;5
 491114 
 
-      :CHANGES-TO (FNS SKETCH.COMMANDMENU.ITEMS)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE " 1-Feb-2022 09:17:12" {DSK}<home>larry>medley>library>SKETCH.;1)
+      :CHANGES-TO (VARS SKETCHCOMS)
 
+      :PREVIOUS-DATE "19-Oct-2023 23:55:27" {WMEDLEY}<library>sketch>SKETCH.;4)
 
-(* ; "
-Copyright (c) 1984-1988, 1990, 1992-1993 by Venue & Xerox Corporation.
-")
 
 (PRETTYCOMPRINT SKETCHCOMS)
 
@@ -24,7 +22,7 @@ Copyright (c) 1984-1988, 1990, 1992-1993 by Venue & Xerox Corporation.
 
                         [MAP.PROCESSES (FUNCTION (LAMBDA (PROC PROCNAME PROCFORM)
                                                         (AND (EQ (CAR PROCFORM)
-                                                                 '\TEDIT2)
+                                                                 '\TEDIT1)
                                                              (SETQ TEDITFLG T]
                         (COND ((AND (BOUNDP 'ALL.SKETCHES)
                                     (OR SKETCHFLG NOTECARDSFLG TEDITFLG))
@@ -244,10 +242,12 @@ To abort loading the new version of Sketch, type '^'."]
                            "Reads a file name and opens a sketch window onto the sketch it contains."
                                                               ]
         (VARS (BackgroundMenu))
-        (FILES SKETCHOPS SKETCHELEMENTS SKETCHEDIT SKETCHOBJ SKETCHBMELT)
+        (FILES SKETCH-OPS SKETCH-ELEMENTS SKETCH-EDIT SKETCH-OBJ SKETCH-BMELT)
         (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY (FILES (LOADCOMP)
-                                                                SKETCHOPS SKETCHELEMENTS SKETCHOBJ 
-                                                                SKETCHEDIT))
+                                                                SKETCH-OPS SKETCH-ELEMENTS SKETCH-OBJ
+                                                                SKETCH-EDIT))
+        (DECLARE%: EVAL@COMPILE DONTCOPY (FILES (FROM LOADUPS)
+                                                EXPORTS.ALL))
                                                              (* ; 
 
              "recompute the sketch element types because loading SKETCH clobbers the previous ones.")

         (P (INIT.BITMAP.ELEMENT)
@@ -263,10 +263,10 @@ To abort loading the new version of Sketch, type '^'."]
         [COMS                                                (* ; 
 
                     "to correct for a bug in the file package that marks LOADCOMPed file as changed")

               (P (UNMARKASCHANGED 'SKETCH 'FILE)
-                 (UNMARKASCHANGED 'SKETCHELEMENTS 'FILE)
-                 (UNMARKASCHANGED 'SKETCHOPS 'FILE)
-                 (UNMARKASCHANGED 'SKETCHEDIT 'FILE)
-                 (UNMARKASCHANGED 'SKETCHOBJ 'FILE]
+                 (UNMARKASCHANGED 'SKETCH-ELEMENTS 'FILE)
+                 (UNMARKASCHANGED 'SKETCH-OPS 'FILE)
+                 (UNMARKASCHANGED 'SKETCH-EDIT 'FILE)
+                 (UNMARKASCHANGED 'SKETCH-OBJ 'FILE]
         (COMS                                                (* ; 
 
                                                  "add sketch as option to file browser edit command")

               (FNS SK.ADD.EDIT.COMMAND.TO.FILE.BROWSER)
@@ -286,7 +286,7 @@ To abort loading the new version of Sketch, type '^'."]
 
       [MAP.PROCESSES (FUNCTION (LAMBDA (PROC PROCNAME PROCFORM)
                                  (AND (EQ (CAR PROCFORM)
-                                          '\TEDIT2)
+                                          '\TEDIT1)
                                       (SETQ TEDITFLG T]
       (COND
          ((AND (BOUNDP 'ALL.SKETCHES)
@@ -8594,11 +8594,16 @@ Otherwise, type '^'.")
 
 (RPAQQ BackgroundMenu
 NIL)
 
-(FILESLOAD SKETCHOPS SKETCHELEMENTS SKETCHEDIT SKETCHOBJ SKETCHBMELT)
+(FILESLOAD SKETCH-OPS SKETCH-ELEMENTS SKETCH-EDIT SKETCH-OBJ SKETCH-BMELT)
 (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY 
 
 (FILESLOAD (LOADCOMP)
-       SKETCHOPS SKETCHELEMENTS SKETCHOBJ SKETCHEDIT)
+       SKETCH-OPS SKETCH-ELEMENTS SKETCH-OBJ SKETCH-EDIT)
+)
+(DECLARE%: EVAL@COMPILE DONTCOPY 
+
+(FILESLOAD (FROM
 LOADUPS)
+       EXPORTS.ALL)
 )
 
 
@@ -8723,13 +8728,13 @@ Otherwise, type '^'.")
 
 (UNMARKASCHANGED 'SKETCH 'FILE)
 
-(UNMARKASCHANGED 'SKETCHELEMENTS 'FILE)
+(UNMARKASCHANGED 'SKETCH-ELEMENTS 'FILE)
 
-(UNMARKASCHANGED 'SKETCHOPS 'FILE)
+(UNMARKASCHANGED 'SKETCH-OPS 'FILE)
 
-(UNMARKASCHANGED 'SKETCHEDIT 'FILE)
+(UNMARKASCHANGED 'SKETCH-EDIT 'FILE)
 
-(UNMARKASCHANGED 'SKETCHOBJ 'FILE)
+(UNMARKASCHANGED 'SKETCH-OBJ 'FILE)
 
 
 
@@ -8762,151 +8767,150 @@ Otherwise, type '^'.")
 
 (ADDTOVAR LAMA
 SK.UNIONREGIONS SKETCH.CREATE)
 )
-(PUTPROPS SKETCH COPYRIGHT ("Venue & Xerox Corporation" 1984 1985 1986 1987 1988 1990 1992 1993))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (22128 85491 (SKETCH 22138 . 24243) (SKETCH.FROM.A.FILE 24245 . 24560) (SKETCHW.CREATE 
-24562 . 29136) (SKETCH.RESET 29138 . 30660) (SKETCHW.FIG.CHANGED 30662 . 31002) (SK.WINDOW.TITLE 31004
- . 31391) (EDITSLIDE 31393 . 31799) (EDITSKETCH 31801 . 32125) (SK.PUT.ON.FILE 32127 . 33579) (
-SK.OUTPUT.FILE.NAME 33581 . 33955) (SKETCH.PUT 33957 . 36855) (SK.GET.FROM.FILE 36857 . 37750) (
-SK.INCLUDE.FILE 37752 . 40260) (SK.GET.IMAGEOBJ.FROM.FILE 40262 . 42465) (SKETCH.GET 42467 . 42774) (
-ADD.SKETCH.TO.VIEWER 42776 . 45362) (FILENAMELESSVERSION 45364 . 45640) (SK.ADD.ELEMENTS.TO.SKETCH 
-45642 . 46156) (SKETCH.SET.A.DEFAULT 46158 . 53316) (SK.POPUP.SELECTIONFN 53318 . 53860) (
-GETSKETCHWREGION 53862 . 54068) (SK.ADD.ELEMENT 54070 . 55649) (SK.ADD.PRIORITY.ELEMENT.TO.SKETCH 
-55651 . 57045) (SK.ELTS.BY.PRIORITY 57047 . 57343) (SK.ORDER.ELEMENTS 57345 . 57612) (
-SK.ADD.PRIORITY.LOCAL.ELEMENT.TO.SKETCH 57614 . 59108) (SK.ADD.ELEMENTS 59110 . 59634) (
-SK.CHECK.WHENADDEDFN 59636 . 60366) (SK.APPLY.MENU.COMMAND 60368 . 61166) (SK.DELETE.ELEMENT1 61168 . 
-62746) (SK.MARK.DIRTY 62748 . 63414) (SK.MARK.UNDIRTY 63416 . 63747) (SK.MENU.AND.RETURN.FIELD 63749
- . 64414) (SKETCH.SET.BRUSH.SHAPE 64416 . 65001) (SKETCH.SET.BRUSH.SIZE 65003 . 65509) (
-SKETCHW.CLOSEFN 65511 . 67302) (SK.CONFIRM.DESTRUCTION 67304 . 68303) (SKETCHW.OUTFN 68305 . 68569) (
-SKETCHW.REOPENFN 68571 . 68983) (MAKE.LOCAL.SKETCH 68985 . 69715) (MAP.SKETCHSPEC.INTO.VIEWER 69717 . 
-70927) (SKETCHW.REPAINTFN 70929 . 71757) (SKETCHW.REPAINTFN1 71759 . 72698) (SK.DRAWFIGURE.IF 72700 . 
-73222) (SKETCHW.SCROLLFN 73224 . 77417) (SKETCHW.RESHAPEFN 77419 . 79677) (SK.UPDATE.EVENT.SELECTION 
-79679 . 81734) (LIGHTGRAYWINDOW 81736 . 81899) (SK.ADD.SPACES 81901 . 82647) (SK.SKETCH.MENU 82649 . 
-82971) (SK.CHECK.IMAGEOBJ.WHENDELETEDFN 82973 . 83825) (SK.APPLY.IMAGEOBJ.WHENDELETEDFN 83827 . 84787)
- (SK.RETURN.TTY 84789 . 85157) (SK.TAKE.TTY 85159 . 85489)) (85545 108873 (SKETCH.COMMANDMENU 85555 . 
-85892) (SKETCH.COMMANDMENU.ITEMS 85894 . 105977) (CREATE.SKETCHW.COMMANDMENU 105979 . 106399) (
-SKETCHW.SELECTIONFN 106401 . 107504) (SKETCH.MONITORLOCK 107506 . 107977) (SK.EVAL.AS.PROCESS 107979
- . 108592) (SK.EVAL.WITH.LOCK 108594 . 108871)) (108874 116678 (SK.FIX.MENU 108884 . 109978) (
-SK.SET.UP.MENUS 109980 . 112281) (SK.INSURE.HAS.MENU 112283 . 112945) (SK.CREATE.STANDARD.MENU 112947
- . 113392) (SK.ADD.ITEM.TO.MENU 113394 . 114069) (SK.GET.VIEWER.POPUP.MENU 114071 . 116272) (
-SK.CLEAR.POPUP.MENU 116274 . 116676)) (116734 125556 (SKETCH.CREATE 116744 . 117530) (GETSKETCHPROP 
-117532 . 120589) (PUTSKETCHPROP 120591 . 124523) (CREATE.DEFAULT.SKETCH.CONTEXT 124525 . 125554)) (
-125722 148618 (SK.COPY.BUTTONEVENTFN 125732 . 136960) (SK.BUTTONEVENT.MARK 136962 . 137345) (
-SK.BUILD.IMAGEOBJ 137347 . 147262) (SK.BUTTONEVENT.OVERP 147264 . 147887) (SK.BUTTONEVENT.SAME.KEYS 
-147889 . 148616)) (148897 174712 (SK.SEL.AND.CHANGE 148907 . 149199) (SK.CHECK.WHENCHANGEDFN 149201 . 
-149907) (SK.CHECK.PRECHANGEFN 149909 . 150510) (SK.CHANGE.ELT 150512 . 150704) (SK.CHANGE.THING 150706
- . 151957) (SKETCH.CHANGE.ELEMENTS 151959 . 153142) (SK.APPLY.SINGLE.CHANGEFN 153144 . 153717) (
-SK.DO.CHANGESPECS 153719 . 155378) (SK.VIEWER.FROM.SKETCH.ARG 155380 . 155822) (SK.DO.CHANGESPEC1 
-155824 . 157699) (SK.CHANGEFN 157701 . 158281) (SK.READCHANGEFN 158283 . 158742) (SK.DEFAULT.CHANGEFN 
-158744 . 161216) (CHANGEABLEFIELDITEMS 161218 . 161865) (SK.APPLY.CHANGE.COMMAND 161867 . 162484) (
-SK.DO.AND.RECORD.CHANGES 162486 . 163883) (SK.APPLY.CHANGE.COMMAND1 163885 . 165373) (
-SK.ELEMENTS.CHANGEFN 165375 . 167699) (READ.POINT.TO.ADD 167701 . 168645) (GLOBAL.KNOT.FROM.LOCAL 
-168647 . 169107) (SK.ADD.KNOT.TO.ELEMENT 169109 . 170053) (SK.GROUP.CHANGEFN 170055 . 171267) (
-SK.GROUP.CHANGEFN1 171269 . 174710)) (174879 188612 (ADD.ELEMENT.TO.SKETCH 174889 . 176595) (
-ADD.SKETCH.VIEWER 176597 . 177265) (REMOVE.SKETCH.VIEWER 177267 . 177880) (ALL.SKETCH.VIEWERS 177882
- . 178122) (SKETCH.ALL.VIEWERS 178124 . 178384) (VIEWER.BUCKET 178386 . 178537) (ELT.INSIDE.REGION? 
-178539 . 178866) (ELT.INSIDE.SKWP 178868 . 179159) (SCALE.FROM.SKW 179161 . 179411) (
-SK.ADDELT.TO.WINDOW 179413 . 180273) (SK.CALC.REGION.VIEWED 180275 . 180653) (SK.DRAWFIGURE 180655 . 
-181944) (SK.DRAWFIGURE1 181946 . 182330) (SK.LOCAL.FROM.GLOBAL 182332 . 183567) (SKETCH.REGION.VIEWED 
-183569 . 186256) (SKETCH.VIEW.FROM.NAME 186258 . 186688) (SK.UPDATE.REGION.VIEWED 186690 . 187082) (
-SKETCH.ADD.AND.DISPLAY 187084 . 187492) (SKETCH.ADD.AND.DISPLAY1 187494 . 187932) (SK.ADD.ITEM 187934
- . 188266) (SKETCHW.ADD.INSTANCE 188268 . 188610)) (188653 201841 (SK.SEL.AND.DELETE 188663 . 189051) 
-(SK.ERASE.AND.DELETE.ITEM 189053 . 189472) (REMOVE.ELEMENT.FROM.SKETCH 189474 . 190585) (
-SK.DELETE.ELEMENT 190587 . 191145) (SK.DELETE.ELEMENT2 191147 . 191808) (SK.DELETE.KNOT 191810 . 
-192101) (SK.SEL.AND.DELETE.KNOT 192103 . 193228) (SK.DELETE.ELEMENT.KNOT 193230 . 196437) (
-SK.CHECK.WHENDELETEDFN 196439 . 197219) (SK.CHECK.PREEDITFN 197221 . 197705) (
-SK.CHECK.END.INITIAL.EDIT 197707 . 198241) (SK.CHECK.WHENPOINTDELETEDFN 198243 . 199039) (SK.ERASE.ELT
- 199041 . 199377) (SK.DELETE.ELT 199379 . 199754) (SK.DELETE.ITEM 199756 . 200164) (DELFROMTCONC 
-200166 . 201839)) (201880 215714 (SK.COPY.ELT 201890 . 202260) (SK.SEL.AND.COPY 202262 . 202645) (
-SK.COPY.ELEMENTS 202647 . 208275) (SK.ADD.COPY.OF.ELEMENTS 208277 . 210044) (
-SK.GLOBAL.FROM.LOCAL.ELEMENTS 210046 . 210286) (SK.COPY.ITEM 210288 . 211085) (SK.INSERT.SKETCH 211087
- . 215712)) (215754 245775 (SK.MOVE.ELT 215764 . 216039) (SK.MOVE.ELT.OR.PT 216041 . 216354) (
-SK.APPLY.DEFAULT.MOVE 216356 . 216790) (SK.SEL.AND.MOVE 216792 . 217339) (SK.MOVE.ELEMENTS 217341 . 
-228213) (SKETCH.MOVE.ELEMENTS 228215 . 230146) (SKETCH.COPY.ELEMENTS 230148 . 232195) (
-\SKETCH.COPY.ELEMENT 232197 . 232922) (SK.TRANSLATE.ELEMENT 232924 . 233407) (SK.COPY.GLOBAL.ELEMENT 
-233409 . 233620) (SK.MAKE.ELEMENT.MOVE.ARG 233622 . 234242) (SK.MAKE.ELEMENTS.MOVE.ARG 234244 . 234766
-) (SK.MAKE.POINTS.AND.ELEMENTS.MOVE.ARG 234768 . 235837) (SK.SHOW.FIG.FROM.INFO 235839 . 236207) (
-SK.MOVE.THING 236209 . 237115) (UPDATE.ELEMENT.IN.SKETCH 237117 . 239172) (SK.UPDATE.ELEMENT 239174 . 
-240733) (SK.UPDATE.ELEMENTS 240735 . 241454) (SK.UPDATE.ELEMENT1 241456 . 245356) (
-SK.MOVE.ELEMENT.POINT 245358 . 245773)) (245838 268127 (SK.MOVE.POINTS 245848 . 246135) (
-SK.SEL.AND.MOVE.POINTS 246137 . 246442) (SK.DO.MOVE.ELEMENT.POINTS 246444 . 255101) (
-SK.MOVE.ITEM.POINTS 255103 . 256774) (SK.TRANSLATEPTSFN 256776 . 257160) (SK.TRANSLATE.POINTS 257162
- . 258063) (SK.SELECT.MULTIPLE.POINTS 258065 . 263705) (SK.CONTROL.POINTS.IN.REGION 263707 . 265128) (
-SK.ADD.PT.SELECTION 265130 . 265594) (SK.REMOVE.PT.SELECTION 265596 . 266213) (SK.ADD.POINT 266215 . 
-266838) (SK.ELTS.CONTAINING.PTS 266840 . 267465) (SK.HOTSPOTS.NOT.ON.LIST 267467 . 268125)) (268285 
-271081 (SK.SET.MOVE.MODE 268295 . 268966) (SK.SET.MOVE.MODE.POINTS 268968 . 269307) (
-SK.SET.MOVE.MODE.ELEMENTS 269309 . 269653) (SK.SET.MOVE.MODE.COMBINED 269655 . 270005) (READMOVEMODE 
-270007 . 271079)) (271082 289837 (SK.ALIGN.POINTS 271092 . 271382) (SK.SEL.AND.ALIGN.POINTS 271384 . 
-271693) (SK.ALIGN.POINTS.LEFT 271695 . 271998) (SK.ALIGN.POINTS.RIGHT 272000 . 272305) (
-SK.ALIGN.POINTS.TOP 272307 . 272608) (SK.ALIGN.POINTS.BOTTOM 272610 . 272917) (
-SK.EVEN.SPACE.POINTS.IN.X 272919 . 273239) (SK.EVEN.SPACE.POINTS.IN.Y 273241 . 273561) (
-SK.DO.ALIGN.POINTS 273563 . 284185) (SK.NTH.CONTROL.POINT 284187 . 284648) (
-SK.GET.SELECTED.ELEMENT.STRUCTURE 284650 . 285316) (SK.CORRESPONDING.CONTROL.PT 285318 . 285872) (
-SK.CONTROL.POINT.NUMBER 285874 . 286244) (SK.DO.ALIGN.SETVALUE 286246 . 289835)) (289901 303333 (
-SKETCH.CREATE.GROUP 289911 . 290400) (SK.CREATE.GROUP1 290402 . 290949) (SK.UPDATE.GROUP.AFTER.CHANGE 
-290951 . 291740) (SK.GROUP.ELTS 291742 . 292023) (SK.SEL.AND.GROUP 292025 . 292411) (SK.GROUP.ELEMENTS
- 292413 . 294062) (SK.UNGROUP.ELT 294064 . 294348) (SK.SEL.AND.UNGROUP 294350 . 296019) (
-SK.UNGROUP.ELEMENT 296021 . 296957) (SK.GLOBAL.REGION.OF.LOCAL.ELEMENTS 296959 . 297881) (
-SK.LOCAL.REGION.OF.LOCAL.ELEMENTS 297883 . 298894) (SK.GLOBAL.REGION.OF.GLOBAL.ELEMENTS 298896 . 
-300236) (SK.UNIONREGIONS 300238 . 302604) (SKETCH.REGION.OF.SKETCH 302606 . 303022) (SK.FLASHREGION 
-303024 . 303331)) (303334 316805 (INIT.GROUP.ELEMENT 303344 . 304216) (GROUP.DRAWFN 304218 . 304668) (
-GROUP.EXPANDFN 304670 . 306233) (GROUP.INSIDEFN 306235 . 306644) (GROUP.REGIONFN 306646 . 307041) (
-GROUP.GLOBALREGIONFN 307043 . 307361) (GROUP.TRANSLATEFN 307363 . 309395) (GROUP.TRANSFORMFN 309397 . 
-312877) (GROUP.READCHANGEFN 312879 . 316803)) (316806 317814 (REGION.CENTER 316816 . 317417) (
-REMOVE.LAST 317419 . 317812)) (317867 322974 (SK.MOVE.GROUP.CONTROL.PT 317877 . 318168) (
-SK.SEL.AND.MOVE.CONTROL.PT 318170 . 319574) (SK.MOVE.GROUP.ELEMENT.CONTROL.POINT 319576 . 321649) (
-SK.READ.NEW.GROUP.CONTROL.PT 321651 . 322972)) (323233 327857 (SK.DO.GROUP 323243 . 324695) (
-SK.CHECK.WHENGROUPEDFN 324697 . 325407) (SK.DO.UNGROUP 325409 . 326614) (SK.CHECK.WHENUNGROUPEDFN 
-326616 . 327203) (SK.GROUP.UNDO 327205 . 327528) (SK.UNGROUP.UNDO 327530 . 327855)) (328098 333020 (
-SK.FREEZE.ELTS 328108 . 328392) (SK.SEL.AND.FREEZE 328394 . 328784) (SK.FREEZE.ELEMENTS 328786 . 
-329337) (SK.UNFREEZE.ELT 329339 . 329628) (SK.SEL.AND.UNFREEZE 329630 . 331166) (SK.UNFREEZE.ELEMENTS 
-331168 . 331727) (SK.FREEZE.UNDO 331729 . 331974) (SK.UNFREEZE.UNDO 331976 . 332223) (SK.DO.FREEZE 
-332225 . 332618) (SK.DO.UNFREEZE 332620 . 333018)) (333250 343060 (SKETCH.ELEMENTS.OF.SKETCH 333260 . 
-334095) (SKETCH.LIST.OF.ELEMENTS 334097 . 334815) (SKETCH.ADD.ELEMENT 334817 . 335892) (
-SKETCH.DELETE.ELEMENT 335894 . 337626) (DELFROMGROUPELT 337628 . 338428) (SKETCH.ELEMENT.TYPE 338430
- . 338779) (SKETCH.ELEMENT.CHANGED 338781 . 340349) (SK.ELEMENT.CHANGED1 340351 . 341002) (
-SK.UPDATE.GLOBAL.IMAGE.OBJECT.ELEMENT 341004 . 343058)) (343114 347726 (INSURE.SKETCH 343124 . 345739)
- (LOCALSPECS.FROM.VIEWER 345741 . 346101) (SK.LOCAL.ELT.FROM.GLOBALPART 346103 . 346571) (
-SKETCH.FROM.VIEWER 346573 . 346807) (INSPECT.SKETCH 346809 . 347134) (ELT.INSIDE.SKETCHWP 347136 . 
-347409) (SK.INSIDE.REGION 347411 . 347724)) (347727 352057 (MAPSKETCHSPECS 347737 . 348358) (
-MAPCOLLECTSKETCHSPECS 348360 . 349109) (MAPSKETCHSPECSUNTIL 349111 . 349919) (MAPGLOBALSKETCHSPECS 
-349921 . 350622) (MAPGLOBALSKETCHELEMENTS 350624 . 352055)) (352119 378011 (SK.ADD.SELECTION 352129 . 
-352869) (SK.COPY.INSERTFN 352871 . 356502) (SCREENELEMENTP 356504 . 356977) (SK.ITEM.REGION 356979 . 
-357466) (SK.ELEMENT.GLOBAL.REGION 357468 . 357996) (SK.LOCAL.ITEMS.IN.REGION 357998 . 359977) (
-SK.REGIONFN 359979 . 360301) (SK.GLOBAL.REGIONFN 360303 . 360661) (SK.REMOVE.SELECTION 360663 . 361391
-) (SK.SELECT.MULTIPLE.ITEMS 361393 . 371835) (SKETCH.GET.ELEMENTS 371837 . 373260) (SK.PUT.MARKS.UP 
-373262 . 373601) (SK.TAKE.MARKS.DOWN 373603 . 373942) (SK.TRANSLATE.GLOBALPART 373944 . 376071) (
-SK.TRANSLATE.ITEM 376073 . 377000) (SK.TRANSLATEFN 377002 . 377198) (TRANSLATE.SKETCH 377200 . 378009)
-) (378277 381184 (SK.INPUT.SCALE 378287 . 379134) (SK.UPDATE.SKETCHCONTEXT 379136 . 379733) (
-SK.SET.INPUT.SCALE 379735 . 380384) (SK.SET.INPUT.SCALE.CURRENT 380386 . 380677) (
-SK.SET.INPUT.SCALE.VALUE 380679 . 381182)) (381235 383147 (SK.SET.FEEDBACK.MODE 381245 . 382551) (
-SK.SET.FEEDBACK.POINT 382553 . 382721) (SK.SET.FEEDBACK.VERBOSE 382723 . 382892) (
-SK.SET.FEEDBACK.ALWAYS 382894 . 383145)) (383298 384575 (SKETCH.TITLE 383308 . 383571) (
-SK.SHRINK.ICONCREATE 383573 . 384573)) (390265 393079 (READBRUSHSHAPE 390275 . 390734) (READ.FUNCTION 
-390736 . 391251) (READBRUSHSIZE 391253 . 391711) (READANGLE 391713 . 392205) (READARCDIRECTION 392207
- . 393077)) (393080 403491 (SK.CHANGE.DASHING 393090 . 397038) (READ.AND.SAVE.NEW.DASHING 397040 . 
-398808) (READ.NEW.DASHING 398810 . 400550) (READ.DASHING.CHANGE 400552 . 402027) (SK.CACHE.DASHING 
-402029 . 403031) (SK.DASHING.LABEL 403033 . 403489)) (403492 407197 (READ.FILLING.CHANGE 403502 . 
-405483) (SK.CACHE.FILLING 405485 . 406203) (READ.AND.SAVE.NEW.FILLING 406205 . 406803) (
-SK.FILLING.LABEL 406805 . 407195)) (407581 443834 (SK.GETGLOBALPOSITION 407591 . 407896) (
-SKETCH.TRACK.ELEMENTS 407898 . 411418) (SK.PICKOUT.WHOLE.MOVE.ELEMENTS 411420 . 411979) (
-MAP.SKETCH.ELEMENTS.INTO.VIEWER 411981 . 412373) (MAP.GLOBAL.POSITION.INTO.VIEWER 412375 . 412755) (
-SKETCH.TO.VIEWER.POSITION 412757 . 413116) (SKETCH.TRACK.IMAGE 413118 . 413972) (SK.TRACK.IMAGE1 
-413974 . 415386) (MAP.VIEWER.XY.INTO.GLOBAL 415388 . 416382) (SK.SET.POSITION 416384 . 416720) (
-MAP.VIEWER.PT.INTO.GLOBAL 416722 . 417828) (VIEWER.TO.SKETCH.POSITION 417830 . 418465) (
-SK.INSURE.SCALE 418467 . 418727) (SKETCH.TO.VIEWER.REGION 418729 . 419535) (VIEWER.TO.SKETCH.REGION 
-419537 . 419875) (SK.READ.POINT.WITH.FEEDBACK 419877 . 430880) (SKETCH.GET.POSITION 430882 . 432762) (
-\CLOBBER.POSITION 432764 . 433212) (NEAREST.HOT.SPOT 433214 . 434742) (GETWREGION 434744 . 435505) (
-GET.BITMAP.POSITION 435507 . 436291) (SK.TRACK.BITMAP1 436293 . 443832)) (444403 475289 (
-SK.BRING.UP.POSITION.PAD 444413 . 450273) (SK.PAD.READER.POSITION 450275 . 451924) (
-SK.POSITION.READER.REPAINTFN 451926 . 453710) (SK.POSITION.PAD.FROM.VIEWER 453712 . 455054) (
-SK.INIT.POSITION.NUMBER.PAD.MENU 455056 . 455406) (SK.READ.POSITION.PAD.HANDLER 455408 . 461140) (
-DISPLAY.POSITION.READER.TOTAL 461142 . 463440) (POSITION.PAD.READER.HANDLER 463442 . 471485) (
-POSITIONPAD.HELDFN 471487 . 472971) (\POSITION.PAD.ADD.DIGIT.MENU 472973 . 474552) (
-\POSITION.READER.NUMBERPAD 474554 . 475287)) (476915 479593 (SK.DRAWFN 476925 . 477291) (
-SK.TRANSFORMFN 477293 . 477674) (SK.EXPANDFN 477676 . 477953) (SK.INPUT 477955 . 478336) (SK.INSIDEFN 
-478338 . 478978) (SK.UPDATEFN 478980 . 479591)) (485165 489110 (SK.CHECK.SKETCH.VERSION 485175 . 
-486415) (SK.INSURE.RECORD.LENGTH 486417 . 487900) (SK.INSURE.HAS.LENGTH 487902 . 488640) (
-SK.RECORD.LENGTH 488642 . 488816) (SK.SET.RECORD.LENGTHS 488818 . 489108)) (489851 490738 (
-SK.ADD.EDIT.COMMAND.TO.FILE.BROWSER 489861 . 490736)))))
+  (FILEMAP (NIL (22176 85539 (SKETCH 22186 . 24291) (SKETCH.FROM.A.FILE 24293 . 24608) (SKETCHW.CREATE 
+24610 . 29184) (SKETCH.RESET 29186 . 30708) (SKETCHW.FIG.CHANGED 30710 . 31050) (SK.WINDOW.TITLE 31052
+ . 31439) (EDITSLIDE 31441 . 31847) (EDITSKETCH 31849 . 32173) (SK.PUT.ON.FILE 32175 . 33627) (
+SK.OUTPUT.FILE.NAME 33629 . 34003) (SKETCH.PUT 34005 . 36903) (SK.GET.FROM.FILE 36905 . 37798) (
+SK.INCLUDE.FILE 37800 . 40308) (SK.GET.IMAGEOBJ.FROM.FILE 40310 . 42513) (SKETCH.GET 42515 . 42822) (
+ADD.SKETCH.TO.VIEWER 42824 . 45410) (FILENAMELESSVERSION 45412 . 45688) (SK.ADD.ELEMENTS.TO.SKETCH 
+45690 . 46204) (SKETCH.SET.A.DEFAULT 46206 . 53364) (SK.POPUP.SELECTIONFN 53366 . 53908) (
+GETSKETCHWREGION 53910 . 54116) (SK.ADD.ELEMENT 54118 . 55697) (SK.ADD.PRIORITY.ELEMENT.TO.SKETCH 
+55699 . 57093) (SK.ELTS.BY.PRIORITY 57095 . 57391) (SK.ORDER.ELEMENTS 57393 . 57660) (
+SK.ADD.PRIORITY.LOCAL.ELEMENT.TO.SKETCH 57662 . 59156) (SK.ADD.ELEMENTS 59158 . 59682) (
+SK.CHECK.WHENADDEDFN 59684 . 60414) (SK.APPLY.MENU.COMMAND 60416 . 61214) (SK.DELETE.ELEMENT1 61216 . 
+62794) (SK.MARK.DIRTY 62796 . 63462) (SK.MARK.UNDIRTY 63464 . 63795) (SK.MENU.AND.RETURN.FIELD 63797
+ . 64462) (SKETCH.SET.BRUSH.SHAPE 64464 . 65049) (SKETCH.SET.BRUSH.SIZE 65051 . 65557) (
+SKETCHW.CLOSEFN 65559 . 67350) (SK.CONFIRM.DESTRUCTION 67352 . 68351) (SKETCHW.OUTFN 68353 . 68617) (
+SKETCHW.REOPENFN 68619 . 69031) (MAKE.LOCAL.SKETCH 69033 . 69763) (MAP.SKETCHSPEC.INTO.VIEWER 69765 . 
+70975) (SKETCHW.REPAINTFN 70977 . 71805) (SKETCHW.REPAINTFN1 71807 . 72746) (SK.DRAWFIGURE.IF 72748 . 
+73270) (SKETCHW.SCROLLFN 73272 . 77465) (SKETCHW.RESHAPEFN 77467 . 79725) (SK.UPDATE.EVENT.SELECTION 
+79727 . 81782) (LIGHTGRAYWINDOW 81784 . 81947) (SK.ADD.SPACES 81949 . 82695) (SK.SKETCH.MENU 82697 . 
+83019) (SK.CHECK.IMAGEOBJ.WHENDELETEDFN 83021 . 83873) (SK.APPLY.IMAGEOBJ.WHENDELETEDFN 83875 . 84835)
+ (SK.RETURN.TTY 84837 . 85205) (SK.TAKE.TTY 85207 . 85537)) (85593 108921 (SKETCH.COMMANDMENU 85603 . 
+85940) (SKETCH.COMMANDMENU.ITEMS 85942 . 106025) (CREATE.SKETCHW.COMMANDMENU 106027 . 106447) (
+SKETCHW.SELECTIONFN 106449 . 107552) (SKETCH.MONITORLOCK 107554 . 108025) (SK.EVAL.AS.PROCESS 108027
+ . 108640) (SK.EVAL.WITH.LOCK 108642 . 108919)) (108922 116726 (SK.FIX.MENU 108932 . 110026) (
+SK.SET.UP.MENUS 110028 . 112329) (SK.INSURE.HAS.MENU 112331 . 112993) (SK.CREATE.STANDARD.MENU 112995
+ . 113440) (SK.ADD.ITEM.TO.MENU 113442 . 114117) (SK.GET.VIEWER.POPUP.MENU 114119 . 116320) (
+SK.CLEAR.POPUP.MENU 116322 . 116724)) (116782 125604 (SKETCH.CREATE 116792 . 117578) (GETSKETCHPROP 
+117580 . 120637) (PUTSKETCHPROP 120639 . 124571) (CREATE.DEFAULT.SKETCH.CONTEXT 124573 . 125602)) (
+125770 148666 (SK.COPY.BUTTONEVENTFN 125780 . 137008) (SK.BUTTONEVENT.MARK 137010 . 137393) (
+SK.BUILD.IMAGEOBJ 137395 . 147310) (SK.BUTTONEVENT.OVERP 147312 . 147935) (SK.BUTTONEVENT.SAME.KEYS 
+147937 . 148664)) (148945 174760 (SK.SEL.AND.CHANGE 148955 . 149247) (SK.CHECK.WHENCHANGEDFN 149249 . 
+149955) (SK.CHECK.PRECHANGEFN 149957 . 150558) (SK.CHANGE.ELT 150560 . 150752) (SK.CHANGE.THING 150754
+ . 152005) (SKETCH.CHANGE.ELEMENTS 152007 . 153190) (SK.APPLY.SINGLE.CHANGEFN 153192 . 153765) (
+SK.DO.CHANGESPECS 153767 . 155426) (SK.VIEWER.FROM.SKETCH.ARG 155428 . 155870) (SK.DO.CHANGESPEC1 
+155872 . 157747) (SK.CHANGEFN 157749 . 158329) (SK.READCHANGEFN 158331 . 158790) (SK.DEFAULT.CHANGEFN 
+158792 . 161264) (CHANGEABLEFIELDITEMS 161266 . 161913) (SK.APPLY.CHANGE.COMMAND 161915 . 162532) (
+SK.DO.AND.RECORD.CHANGES 162534 . 163931) (SK.APPLY.CHANGE.COMMAND1 163933 . 165421) (
+SK.ELEMENTS.CHANGEFN 165423 . 167747) (READ.POINT.TO.ADD 167749 . 168693) (GLOBAL.KNOT.FROM.LOCAL 
+168695 . 169155) (SK.ADD.KNOT.TO.ELEMENT 169157 . 170101) (SK.GROUP.CHANGEFN 170103 . 171315) (
+SK.GROUP.CHANGEFN1 171317 . 174758)) (174927 188660 (ADD.ELEMENT.TO.SKETCH 174937 . 176643) (
+ADD.SKETCH.VIEWER 176645 . 177313) (REMOVE.SKETCH.VIEWER 177315 . 177928) (ALL.SKETCH.VIEWERS 177930
+ . 178170) (SKETCH.ALL.VIEWERS 178172 . 178432) (VIEWER.BUCKET 178434 . 178585) (ELT.INSIDE.REGION? 
+178587 . 178914) (ELT.INSIDE.SKWP 178916 . 179207) (SCALE.FROM.SKW 179209 . 179459) (
+SK.ADDELT.TO.WINDOW 179461 . 180321) (SK.CALC.REGION.VIEWED 180323 . 180701) (SK.DRAWFIGURE 180703 . 
+181992) (SK.DRAWFIGURE1 181994 . 182378) (SK.LOCAL.FROM.GLOBAL 182380 . 183615) (SKETCH.REGION.VIEWED 
+183617 . 186304) (SKETCH.VIEW.FROM.NAME 186306 . 186736) (SK.UPDATE.REGION.VIEWED 186738 . 187130) (
+SKETCH.ADD.AND.DISPLAY 187132 . 187540) (SKETCH.ADD.AND.DISPLAY1 187542 . 187980) (SK.ADD.ITEM 187982
+ . 188314) (SKETCHW.ADD.INSTANCE 188316 . 188658)) (188701 201889 (SK.SEL.AND.DELETE 188711 . 189099) 
+(SK.ERASE.AND.DELETE.ITEM 189101 . 189520) (REMOVE.ELEMENT.FROM.SKETCH 189522 . 190633) (
+SK.DELETE.ELEMENT 190635 . 191193) (SK.DELETE.ELEMENT2 191195 . 191856) (SK.DELETE.KNOT 191858 . 
+192149) (SK.SEL.AND.DELETE.KNOT 192151 . 193276) (SK.DELETE.ELEMENT.KNOT 193278 . 196485) (
+SK.CHECK.WHENDELETEDFN 196487 . 197267) (SK.CHECK.PREEDITFN 197269 . 197753) (
+SK.CHECK.END.INITIAL.EDIT 197755 . 198289) (SK.CHECK.WHENPOINTDELETEDFN 198291 . 199087) (SK.ERASE.ELT
+ 199089 . 199425) (SK.DELETE.ELT 199427 . 199802) (SK.DELETE.ITEM 199804 . 200212) (DELFROMTCONC 
+200214 . 201887)) (201928 215762 (SK.COPY.ELT 201938 . 202308) (SK.SEL.AND.COPY 202310 . 202693) (
+SK.COPY.ELEMENTS 202695 . 208323) (SK.ADD.COPY.OF.ELEMENTS 208325 . 210092) (
+SK.GLOBAL.FROM.LOCAL.ELEMENTS 210094 . 210334) (SK.COPY.ITEM 210336 . 211133) (SK.INSERT.SKETCH 211135
+ . 215760)) (215802 245823 (SK.MOVE.ELT 215812 . 216087) (SK.MOVE.ELT.OR.PT 216089 . 216402) (
+SK.APPLY.DEFAULT.MOVE 216404 . 216838) (SK.SEL.AND.MOVE 216840 . 217387) (SK.MOVE.ELEMENTS 217389 . 
+228261) (SKETCH.MOVE.ELEMENTS 228263 . 230194) (SKETCH.COPY.ELEMENTS 230196 . 232243) (
+\SKETCH.COPY.ELEMENT 232245 . 232970) (SK.TRANSLATE.ELEMENT 232972 . 233455) (SK.COPY.GLOBAL.ELEMENT 
+233457 . 233668) (SK.MAKE.ELEMENT.MOVE.ARG 233670 . 234290) (SK.MAKE.ELEMENTS.MOVE.ARG 234292 . 234814
+) (SK.MAKE.POINTS.AND.ELEMENTS.MOVE.ARG 234816 . 235885) (SK.SHOW.FIG.FROM.INFO 235887 . 236255) (
+SK.MOVE.THING 236257 . 237163) (UPDATE.ELEMENT.IN.SKETCH 237165 . 239220) (SK.UPDATE.ELEMENT 239222 . 
+240781) (SK.UPDATE.ELEMENTS 240783 . 241502) (SK.UPDATE.ELEMENT1 241504 . 245404) (
+SK.MOVE.ELEMENT.POINT 245406 . 245821)) (245886 268175 (SK.MOVE.POINTS 245896 . 246183) (
+SK.SEL.AND.MOVE.POINTS 246185 . 246490) (SK.DO.MOVE.ELEMENT.POINTS 246492 . 255149) (
+SK.MOVE.ITEM.POINTS 255151 . 256822) (SK.TRANSLATEPTSFN 256824 . 257208) (SK.TRANSLATE.POINTS 257210
+ . 258111) (SK.SELECT.MULTIPLE.POINTS 258113 . 263753) (SK.CONTROL.POINTS.IN.REGION 263755 . 265176) (
+SK.ADD.PT.SELECTION 265178 . 265642) (SK.REMOVE.PT.SELECTION 265644 . 266261) (SK.ADD.POINT 266263 . 
+266886) (SK.ELTS.CONTAINING.PTS 266888 . 267513) (SK.HOTSPOTS.NOT.ON.LIST 267515 . 268173)) (268333 
+271129 (SK.SET.MOVE.MODE 268343 . 269014) (SK.SET.MOVE.MODE.POINTS 269016 . 269355) (
+SK.SET.MOVE.MODE.ELEMENTS 269357 . 269701) (SK.SET.MOVE.MODE.COMBINED 269703 . 270053) (READMOVEMODE 
+270055 . 271127)) (271130 289885 (SK.ALIGN.POINTS 271140 . 271430) (SK.SEL.AND.ALIGN.POINTS 271432 . 
+271741) (SK.ALIGN.POINTS.LEFT 271743 . 272046) (SK.ALIGN.POINTS.RIGHT 272048 . 272353) (
+SK.ALIGN.POINTS.TOP 272355 . 272656) (SK.ALIGN.POINTS.BOTTOM 272658 . 272965) (
+SK.EVEN.SPACE.POINTS.IN.X 272967 . 273287) (SK.EVEN.SPACE.POINTS.IN.Y 273289 . 273609) (
+SK.DO.ALIGN.POINTS 273611 . 284233) (SK.NTH.CONTROL.POINT 284235 . 284696) (
+SK.GET.SELECTED.ELEMENT.STRUCTURE 284698 . 285364) (SK.CORRESPONDING.CONTROL.PT 285366 . 285920) (
+SK.CONTROL.POINT.NUMBER 285922 . 286292) (SK.DO.ALIGN.SETVALUE 286294 . 289883)) (289949 303381 (
+SKETCH.CREATE.GROUP 289959 . 290448) (SK.CREATE.GROUP1 290450 . 290997) (SK.UPDATE.GROUP.AFTER.CHANGE 
+290999 . 291788) (SK.GROUP.ELTS 291790 . 292071) (SK.SEL.AND.GROUP 292073 . 292459) (SK.GROUP.ELEMENTS
+ 292461 . 294110) (SK.UNGROUP.ELT 294112 . 294396) (SK.SEL.AND.UNGROUP 294398 . 296067) (
+SK.UNGROUP.ELEMENT 296069 . 297005) (SK.GLOBAL.REGION.OF.LOCAL.ELEMENTS 297007 . 297929) (
+SK.LOCAL.REGION.OF.LOCAL.ELEMENTS 297931 . 298942) (SK.GLOBAL.REGION.OF.GLOBAL.ELEMENTS 298944 . 
+300284) (SK.UNIONREGIONS 300286 . 302652) (SKETCH.REGION.OF.SKETCH 302654 . 303070) (SK.FLASHREGION 
+303072 . 303379)) (303382 316853 (INIT.GROUP.ELEMENT 303392 . 304264) (GROUP.DRAWFN 304266 . 304716) (
+GROUP.EXPANDFN 304718 . 306281) (GROUP.INSIDEFN 306283 . 306692) (GROUP.REGIONFN 306694 . 307089) (
+GROUP.GLOBALREGIONFN 307091 . 307409) (GROUP.TRANSLATEFN 307411 . 309443) (GROUP.TRANSFORMFN 309445 . 
+312925) (GROUP.READCHANGEFN 312927 . 316851)) (316854 317862 (REGION.CENTER 316864 . 317465) (
+REMOVE.LAST 317467 . 317860)) (317915 323022 (SK.MOVE.GROUP.CONTROL.PT 317925 . 318216) (
+SK.SEL.AND.MOVE.CONTROL.PT 318218 . 319622) (SK.MOVE.GROUP.ELEMENT.CONTROL.POINT 319624 . 321697) (
+SK.READ.NEW.GROUP.CONTROL.PT 321699 . 323020)) (323281 327905 (SK.DO.GROUP 323291 . 324743) (
+SK.CHECK.WHENGROUPEDFN 324745 . 325455) (SK.DO.UNGROUP 325457 . 326662) (SK.CHECK.WHENUNGROUPEDFN 
+326664 . 327251) (SK.GROUP.UNDO 327253 . 327576) (SK.UNGROUP.UNDO 327578 . 327903)) (328146 333068 (
+SK.FREEZE.ELTS 328156 . 328440) (SK.SEL.AND.FREEZE 328442 . 328832) (SK.FREEZE.ELEMENTS 328834 . 
+329385) (SK.UNFREEZE.ELT 329387 . 329676) (SK.SEL.AND.UNFREEZE 329678 . 331214) (SK.UNFREEZE.ELEMENTS 
+331216 . 331775) (SK.FREEZE.UNDO 331777 . 332022) (SK.UNFREEZE.UNDO 332024 . 332271) (SK.DO.FREEZE 
+332273 . 332666) (SK.DO.UNFREEZE 332668 . 333066)) (333298 343108 (SKETCH.ELEMENTS.OF.SKETCH 333308 . 
+334143) (SKETCH.LIST.OF.ELEMENTS 334145 . 334863) (SKETCH.ADD.ELEMENT 334865 . 335940) (
+SKETCH.DELETE.ELEMENT 335942 . 337674) (DELFROMGROUPELT 337676 . 338476) (SKETCH.ELEMENT.TYPE 338478
+ . 338827) (SKETCH.ELEMENT.CHANGED 338829 . 340397) (SK.ELEMENT.CHANGED1 340399 . 341050) (
+SK.UPDATE.GLOBAL.IMAGE.OBJECT.ELEMENT 341052 . 343106)) (343162 347774 (INSURE.SKETCH 343172 . 345787)
+ (LOCALSPECS.FROM.VIEWER 345789 . 346149) (SK.LOCAL.ELT.FROM.GLOBALPART 346151 . 346619) (
+SKETCH.FROM.VIEWER 346621 . 346855) (INSPECT.SKETCH 346857 . 347182) (ELT.INSIDE.SKETCHWP 347184 . 
+347457) (SK.INSIDE.REGION 347459 . 347772)) (347775 352105 (MAPSKETCHSPECS 347785 . 348406) (
+MAPCOLLECTSKETCHSPECS 348408 . 349157) (MAPSKETCHSPECSUNTIL 349159 . 349967) (MAPGLOBALSKETCHSPECS 
+349969 . 350670) (MAPGLOBALSKETCHELEMENTS 350672 . 352103)) (352167 378059 (SK.ADD.SELECTION 352177 . 
+352917) (SK.COPY.INSERTFN 352919 . 356550) (SCREENELEMENTP 356552 . 357025) (SK.ITEM.REGION 357027 . 
+357514) (SK.ELEMENT.GLOBAL.REGION 357516 . 358044) (SK.LOCAL.ITEMS.IN.REGION 358046 . 360025) (
+SK.REGIONFN 360027 . 360349) (SK.GLOBAL.REGIONFN 360351 . 360709) (SK.REMOVE.SELECTION 360711 . 361439
+) (SK.SELECT.MULTIPLE.ITEMS 361441 . 371883) (SKETCH.GET.ELEMENTS 371885 . 373308) (SK.PUT.MARKS.UP 
+373310 . 373649) (SK.TAKE.MARKS.DOWN 373651 . 373990) (SK.TRANSLATE.GLOBALPART 373992 . 376119) (
+SK.TRANSLATE.ITEM 376121 . 377048) (SK.TRANSLATEFN 377050 . 377246) (TRANSLATE.SKETCH 377248 . 378057)
+) (378325 381232 (SK.INPUT.SCALE 378335 . 379182) (SK.UPDATE.SKETCHCONTEXT 379184 . 379781) (
+SK.SET.INPUT.SCALE 379783 . 380432) (SK.SET.INPUT.SCALE.CURRENT 380434 . 380725) (
+SK.SET.INPUT.SCALE.VALUE 380727 . 381230)) (381283 383195 (SK.SET.FEEDBACK.MODE 381293 . 382599) (
+SK.SET.FEEDBACK.POINT 382601 . 382769) (SK.SET.FEEDBACK.VERBOSE 382771 . 382940) (
+SK.SET.FEEDBACK.ALWAYS 382942 . 383193)) (383346 384623 (SKETCH.TITLE 383356 . 383619) (
+SK.SHRINK.ICONCREATE 383621 . 384621)) (390313 393127 (READBRUSHSHAPE 390323 . 390782) (READ.FUNCTION 
+390784 . 391299) (READBRUSHSIZE 391301 . 391759) (READANGLE 391761 . 392253) (READARCDIRECTION 392255
+ . 393125)) (393128 403539 (SK.CHANGE.DASHING 393138 . 397086) (READ.AND.SAVE.NEW.DASHING 397088 . 
+398856) (READ.NEW.DASHING 398858 . 400598) (READ.DASHING.CHANGE 400600 . 402075) (SK.CACHE.DASHING 
+402077 . 403079) (SK.DASHING.LABEL 403081 . 403537)) (403540 407245 (READ.FILLING.CHANGE 403550 . 
+405531) (SK.CACHE.FILLING 405533 . 406251) (READ.AND.SAVE.NEW.FILLING 406253 . 406851) (
+SK.FILLING.LABEL 406853 . 407243)) (407629 443882 (SK.GETGLOBALPOSITION 407639 . 407944) (
+SKETCH.TRACK.ELEMENTS 407946 . 411466) (SK.PICKOUT.WHOLE.MOVE.ELEMENTS 411468 . 412027) (
+MAP.SKETCH.ELEMENTS.INTO.VIEWER 412029 . 412421) (MAP.GLOBAL.POSITION.INTO.VIEWER 412423 . 412803) (
+SKETCH.TO.VIEWER.POSITION 412805 . 413164) (SKETCH.TRACK.IMAGE 413166 . 414020) (SK.TRACK.IMAGE1 
+414022 . 415434) (MAP.VIEWER.XY.INTO.GLOBAL 415436 . 416430) (SK.SET.POSITION 416432 . 416768) (
+MAP.VIEWER.PT.INTO.GLOBAL 416770 . 417876) (VIEWER.TO.SKETCH.POSITION 417878 . 418513) (
+SK.INSURE.SCALE 418515 . 418775) (SKETCH.TO.VIEWER.REGION 418777 . 419583) (VIEWER.TO.SKETCH.REGION 
+419585 . 419923) (SK.READ.POINT.WITH.FEEDBACK 419925 . 430928) (SKETCH.GET.POSITION 430930 . 432810) (
+\CLOBBER.POSITION 432812 . 433260) (NEAREST.HOT.SPOT 433262 . 434790) (GETWREGION 434792 . 435553) (
+GET.BITMAP.POSITION 435555 . 436339) (SK.TRACK.BITMAP1 436341 . 443880)) (444451 475337 (
+SK.BRING.UP.POSITION.PAD 444461 . 450321) (SK.PAD.READER.POSITION 450323 . 451972) (
+SK.POSITION.READER.REPAINTFN 451974 . 453758) (SK.POSITION.PAD.FROM.VIEWER 453760 . 455102) (
+SK.INIT.POSITION.NUMBER.PAD.MENU 455104 . 455454) (SK.READ.POSITION.PAD.HANDLER 455456 . 461188) (
+DISPLAY.POSITION.READER.TOTAL 461190 . 463488) (POSITION.PAD.READER.HANDLER 463490 . 471533) (
+POSITIONPAD.HELDFN 471535 . 473019) (\POSITION.PAD.ADD.DIGIT.MENU 473021 . 474600) (
+\POSITION.READER.NUMBERPAD 474602 . 475335)) (476963 479641 (SK.DRAWFN 476973 . 477339) (
+SK.TRANSFORMFN 477341 . 477722) (SK.EXPANDFN 477724 . 478001) (SK.INPUT 478003 . 478384) (SK.INSIDEFN 
+478386 . 479026) (SK.UPDATEFN 479028 . 479639)) (485309 489254 (SK.CHECK.SKETCH.VERSION 485319 . 
+486559) (SK.INSURE.RECORD.LENGTH 486561 . 488044) (SK.INSURE.HAS.LENGTH 488046 . 488784) (
+SK.RECORD.LENGTH 488786 . 488960) (SK.SET.RECORD.LENGTHS 488962 . 489252)) (489999 490886 (
+SK.ADD.EDIT.COMMAND.TO.FILE.BROWSER 490009 . 490884)))))
 STOP

library/sketch/SKETCH-BMELT

@@ -1,18 +1,15 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-
(FILECREATED "24-Mar-92 14:07:17" |{PELE:MV:ENVOS}<LISPCORE>LIBRARY>SKETCHBMELT.;3|
 47688  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (FNS BITMAPELT.DRAWFN)
+
(FILECREATED " 5-Dec-2023 00:11:01" {WMEDLEY}<library>sketch>SKETCH-BMELT.;1
 47396  
 
-      previous date%: "12-Jun-90 14:45:06" |{PELE:MV:ENVOS}<LISPCORE>LIBRARY>SKETCHBMELT.;2|)
+      :EDIT-BY rmk
+
+      :PREVIOUS-DATE "24-Mar-92 14:07:17" {WMEDLEY}<library>sketch>SKETCHBMELT.;1)
 
 
-(* ; "
-Copyright (c) 1985, 1986, 1988, 1990, 1992 by Venue & Xerox Corporation.  All rights reserved.
-")
+(PRETTYCOMPRINT SKETCH-BMELTCOMS)
 
-(PRETTYCOMPRINT SKETCHBMELTCOMS)
-
-(RPAQQ SKETCHBMELTCOMS

+(RPAQQ SKETCH-BMELTCOMS

        ((* BITMAP element done to allow zooming of bitmaps that is not possible with image object 
            bitmaps.)
         (FNS SKETCH.CREATE.BITMAP INIT.BITMAP.ELEMENT BITMAPELT.CHANGEFN BITMAPELT.DRAWFN DSPVIEWPORT
@@ -731,30 +728,28 @@ It can then be edited without effecting the original.")) (AND (fetch
 (BITMAP
 (TYPERECORD BITMAPELT
 (SKBITMAP SKBITMAPREGION SKBITMAPSCALE SKBITMAPCACHE))
 
 (RECORD LOCALBITMAPELT
 ((LOCALBITMAPPOSITION)
-                            LOCALHOTREGION LOCALBITMAP LOCALBITMAPREGION 
+                        LOCALHOTREGION LOCALBITMAP LOCALBITMAPREGION 
                                                              (* coordinates of entire region 
-
                                                           covered by the bitmap in local 
-
                                                           coordinates.)

-                            LOCALSCALE SOURCEFORIMAGE        (* pair of the scale and cached 
-
                                                           image from which LOCALBITMAP was 
-
                                                           generated.)

-                            LOCALIMAGEREGION
+
                                                             covered by the bitmap in local 
+
                                                             coordinates.)

+                        LOCALSCALE SOURCEFORIMAGE            (* pair of the scale and cached image 
+
                                                             from which LOCALBITMAP was generated.)

+                        LOCALIMAGEREGION
 
          (* region in local coordinates of the area covered by LOCALBITMAP.
-
       This may be a subregion of LOCALBITMAPREGION)

+
         This may be a subregion of LOCALBITMAPREGION)

 
-                            ))
+                        ))
 )
 )
 
 (FILESLOAD SCALEBITMAP)
-(PUTPROPS SKETCHBMELT COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1988 1990 1992))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1205 46541 (SKETCH.CREATE.BITMAP 1215 . 2049) (INIT.BITMAP.ELEMENT 2051 . 3052) (
-BITMAPELT.CHANGEFN 3054 . 16483) (BITMAPELT.DRAWFN 16485 . 23256) (DSPVIEWPORT 23258 . 24304) (
-SK.COMPUTE.LOCAL.SCALED.BITMAP 24306 . 26938) (BITMAPELT.EXPANDFN 26940 . 30787) (BITMAPELT.INSIDEFN 
-30789 . 31391) (BITMAPELT.TRANSLATEFN 31393 . 32695) (BITMAPELT.REGIONFN 32697 . 33153) (
-BITMAPELT.GLOBALREGIONFN 33155 . 33534) (BITMAPELT.READCHANGEFN 33536 . 37579) (BITMAPELT.TRANSFORMFN 
-37581 . 39105) (SK.BITMAP.CREATE 39107 . 40848) (BITMAP.SET.SCALES 40850 . 42359) (BITMAPELT.INPUTFN 
-42361 . 43333) (BITMAPELT.CHOOSE.BITMAP 43335 . 46539)))))
+  (FILEMAP (NIL (1069 46405 (SKETCH.CREATE.BITMAP 1079 . 1913) (INIT.BITMAP.ELEMENT 1915 . 2916) (
+BITMAPELT.CHANGEFN 2918 . 16347) (BITMAPELT.DRAWFN 16349 . 23120) (DSPVIEWPORT 23122 . 24168) (
+SK.COMPUTE.LOCAL.SCALED.BITMAP 24170 . 26802) (BITMAPELT.EXPANDFN 26804 . 30651) (BITMAPELT.INSIDEFN 
+30653 . 31255) (BITMAPELT.TRANSLATEFN 31257 . 32559) (BITMAPELT.REGIONFN 32561 . 33017) (
+BITMAPELT.GLOBALREGIONFN 33019 . 33398) (BITMAPELT.READCHANGEFN 33400 . 37443) (BITMAPELT.TRANSFORMFN 
+37445 . 38969) (SK.BITMAP.CREATE 38971 . 40712) (BITMAP.SET.SCALES 40714 . 42223) (BITMAPELT.INPUTFN 
+42225 . 43197) (BITMAPELT.CHOOSE.BITMAP 43199 . 46403)))))
 STOP

library/sketch/SKETCH-EDIT

@@ -1,18 +1,17 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED "21-Aug-2021 20:50:04" {DSK}<home>larry>medley>library>SKETCHEDIT.;2
 108762 
 
-      changes to%:  (FNS SHOW.FEEDBACK.BOX)
+
(FILECREATED " 5-Dec-2023 00:12:04" {WMEDLEY}<library>sketch>SKETCH-EDIT.;1
 108598 
 
-      previous date%: "14-Mar-2021 20:37:50" {DSK}<home>larry>medley>library>SKETCHEDIT.;1)
+      :EDIT-BY rmk
+
+      :CHANGES-TO (RECORDS TEXTELTSELECTION)
+
+      :PREVIOUS-DATE "21-Aug-2021 20:50:04" {WMEDLEY}<library>sketch>SKETCHEDIT.;1)
 
 
-(* ; "
-Copyright (c) 1983-1987, 1990, 2021 by Venue & Xerox Corporation.
-")
+(PRETTYCOMPRINT SKETCH-EDITCOMS)
 
-(PRETTYCOMPRINT SKETCHEDITCOMS)
-
-(RPAQQ SKETCHEDITCOMS

+(RPAQQ SKETCH-EDITCOMS

        ((COMS (* selection functions)
               (FNS BUTLAST CHAR.BEGIN CLOSEST.CHAR CLOSEST.LINE FLASHW HILITE.LINE HILITE.TEXT 
                    IN.TEXT.EXTEND INIMAGEOBJ INTEXT NEW.TEXT.EXTEND NEW.TEXT.SELECTIONP NTHCHARWIDTH
@@ -1953,28 +1952,27 @@ Copyright (c) 1983-1987, 1990, 2021 by Venue & Xerox Corporation.
            XCOORD _ (LASTMOUSEX WIN)
            YCOORD _ (LASTMOUSEY WIN])
 )
-(PUTPROPS SKETCHEDIT COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1990 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2492 39600 (BUTLAST 2502 . 2850) (CHAR.BEGIN 2852 . 4777) (CLOSEST.CHAR 4779 . 9002) (
-CLOSEST.LINE 9004 . 9566) (FLASHW 9568 . 9725) (HILITE.LINE 9727 . 10546) (HILITE.TEXT 10548 . 12196) 
-(IN.TEXT.EXTEND 12198 . 15471) (INIMAGEOBJ 15473 . 15978) (INTEXT 15980 . 16477) (NEW.TEXT.EXTEND 
-16479 . 18698) (NEW.TEXT.SELECTIONP 18700 . 18880) (NTHCHARWIDTH 18882 . 19139) (NTHLOCALREGION 19141
- . 19379) (ONCHAR 19381 . 19776) (SHOW.EXTENDED.SELECTION.FEEDBACK 19778 . 20713) (SHOW.FEEDBACK 20715
- . 21205) (SHOW.FEEDBACK.BOX 21207 . 22261) (SELECTION.POSITION 22263 . 23055) (SKED.CLEAR.SELECTION 
-23057 . 23580) (SKETCH.CLEANUP 23582 . 25496) (SK.ENTER.EDIT.CHANGE 25498 . 27043) (
-SKED.REMOVE.OTHER.SELECTIONS 27045 . 27472) (SKED.EXTEND.SELECTION 27474 . 28939) (SKED.MOVE.SELECTION
- 28941 . 34102) (CREATE.TEXT.SELECTION 34104 . 34620) (SKED.SELECTION.FEEDBACK 34622 . 36278) (
-SKED.SET.EXTENDSELECTION 36280 . 36597) (SKED.SET.SELECTION 36599 . 36999) (LINE.BEGIN 37001 . 37555) 
-(SELECTION.GREATERP 37557 . 38352) (SK.WORD.BREAK.CLASS 38354 . 39194) (SK.GETSYNTAX 39196 . 39598)) (
-40442 86176 (WB.EDITOR 40452 . 41777) (SK.TTYENTRYFN 41779 . 42057) (SK.TTYEXITFN 42059 . 42328) (
-SKED.INSERT 42330 . 42758) (\SKED.INSERT 42760 . 63882) (FIRST.N.ELEMENTS 63884 . 64151) (
-SKED.CREATE.NEW.TEXTBOX 64153 . 70682) (SKED.CHARACTERPOSITION 70684 . 71471) (SKED.LINE.AND.CHAR# 
-71473 . 73104) (\SKED.DELETE.WORD.FROM.STRING 73106 . 74145) (\SKED.INSERT.CHARS.TO.STR 74147 . 82558)
- (JOINCHARS 82560 . 82947) (STRINGFROMCHARACTERS 82949 . 83274) (GETALLCHARS 83276 . 83617) (
-CLEANUP.EDIT 83619 . 84071) (SKED.NEW.TEXTELT 84073 . 86174)) (86211 107219 (
-MAP.SCREEN.POSITION.ONTO.GRID 86221 . 87670) (NEAREST.ON.GRID 87672 . 88216) (SK.MIDDLE.TITLEFN 88218
- . 90161) (WB.BUTTON.HANDLER 90163 . 97985) (WB.ADD.NEW.POINT 97987 . 101316) (WB.DRAWLINE 101318 . 
-105552) (WB.RUBBERBAND.POSITION 105554 . 106471) (SK.RUBBERBAND.FEEDBACKFN 106473 . 106977) (
-RESET.LINE.BEING.INPUT 106979 . 107217)) (107401 108642 (NEAREST.EXISTING.POSITION 107411 . 107613) (
-WB.NEARPT 107615 . 108500) (LASTMOUSEPOSITION 108502 . 108640)))))
+  (FILEMAP (NIL (2425 39533 (BUTLAST 2435 . 2783) (CHAR.BEGIN 2785 . 4710) (CLOSEST.CHAR 4712 . 8935) (
+CLOSEST.LINE 8937 . 9499) (FLASHW 9501 . 9658) (HILITE.LINE 9660 . 10479) (HILITE.TEXT 10481 . 12129) 
+(IN.TEXT.EXTEND 12131 . 15404) (INIMAGEOBJ 15406 . 15911) (INTEXT 15913 . 16410) (NEW.TEXT.EXTEND 
+16412 . 18631) (NEW.TEXT.SELECTIONP 18633 . 18813) (NTHCHARWIDTH 18815 . 19072) (NTHLOCALREGION 19074
+ . 19312) (ONCHAR 19314 . 19709) (SHOW.EXTENDED.SELECTION.FEEDBACK 19711 . 20646) (SHOW.FEEDBACK 20648
+ . 21138) (SHOW.FEEDBACK.BOX 21140 . 22194) (SELECTION.POSITION 22196 . 22988) (SKED.CLEAR.SELECTION 
+22990 . 23513) (SKETCH.CLEANUP 23515 . 25429) (SK.ENTER.EDIT.CHANGE 25431 . 26976) (
+SKED.REMOVE.OTHER.SELECTIONS 26978 . 27405) (SKED.EXTEND.SELECTION 27407 . 28872) (SKED.MOVE.SELECTION
+ 28874 . 34035) (CREATE.TEXT.SELECTION 34037 . 34553) (SKED.SELECTION.FEEDBACK 34555 . 36211) (
+SKED.SET.EXTENDSELECTION 36213 . 36530) (SKED.SET.SELECTION 36532 . 36932) (LINE.BEGIN 36934 . 37488) 
+(SELECTION.GREATERP 37490 . 38285) (SK.WORD.BREAK.CLASS 38287 . 39127) (SK.GETSYNTAX 39129 . 39531)) (
+40375 86109 (WB.EDITOR 40385 . 41710) (SK.TTYENTRYFN 41712 . 41990) (SK.TTYEXITFN 41992 . 42261) (
+SKED.INSERT 42263 . 42691) (\SKED.INSERT 42693 . 63815) (FIRST.N.ELEMENTS 63817 . 64084) (
+SKED.CREATE.NEW.TEXTBOX 64086 . 70615) (SKED.CHARACTERPOSITION 70617 . 71404) (SKED.LINE.AND.CHAR# 
+71406 . 73037) (\SKED.DELETE.WORD.FROM.STRING 73039 . 74078) (\SKED.INSERT.CHARS.TO.STR 74080 . 82491)
+ (JOINCHARS 82493 . 82880) (STRINGFROMCHARACTERS 82882 . 83207) (GETALLCHARS 83209 . 83550) (
+CLEANUP.EDIT 83552 . 84004) (SKED.NEW.TEXTELT 84006 . 86107)) (86144 107152 (
+MAP.SCREEN.POSITION.ONTO.GRID 86154 . 87603) (NEAREST.ON.GRID 87605 . 88149) (SK.MIDDLE.TITLEFN 88151
+ . 90094) (WB.BUTTON.HANDLER 90096 . 97918) (WB.ADD.NEW.POINT 97920 . 101249) (WB.DRAWLINE 101251 . 
+105485) (WB.RUBBERBAND.POSITION 105487 . 106404) (SK.RUBBERBAND.FEEDBACKFN 106406 . 106910) (
+RESET.LINE.BEING.INPUT 106912 . 107150)) (107334 108575 (NEAREST.EXISTING.POSITION 107344 . 107546) (
+WB.NEARPT 107548 . 108433) (LASTMOUSEPOSITION 108435 . 108573)))))
 STOP

library/sketch/SKETCH-ELEMENTS

@@ -1,19 +1,19 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 4-Aug-2022 09:57:43" {DSK}<home>larry>medley>library>SKETCHELEMENTS.;2
 554099 
+
(FILECREATED " 5-Dec-2023 00:16:52" {WMEDLEY}<library>sketch>SKETCH-ELEMENTS.;1
 554138 
 
-      :CHANGES-TO (FNS CREATE.SKETCH.ELEMENT.TYPE)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "21-Aug-2021 20:49:42" {DSK}<home>larry>medley>library>SKETCHELEMENTS.;1)
+      :CHANGES-TO (RECORDS LOCALCIRCLE CIRCLE LOCALELLIPSE ELLIPSE KNOTELT LOCALCURVE OPENCURVE 
+                         CLOSEDCURVE LOCALCLOSEDCURVE LOCALCLOSEDWIRE LOCALWIRE WIRE CLOSEDWIRE TEXT
+                         LOCALTEXT LOCALTEXTBOX TEXTBOX BOX LOCALBOX ARC LOCALARC)
+
+      :PREVIOUS-DATE " 4-Aug-2022 09:57:43" {WMEDLEY}<library>sketch>SKETCHELEMENTS.;2)
 
 
-(* ; "
-Copyright (c) 1985-1987, 1990-1993, 2000, 2021 by Venue & Xerox Corporation.
-")
+(PRETTYCOMPRINT SKETCH-ELEMENTSCOMS)
 
-(PRETTYCOMPRINT SKETCHELEMENTSCOMS)
-
-(RPAQQ SKETCHELEMENTSCOMS

+(RPAQQ SKETCH-ELEMENTSCOMS

        (                                                     (* ; 
 
                            "contains the functions need to implement the sketch basic element types")

         (FNS INIT.SKETCH.ELEMENTS CREATE.SKETCH.ELEMENT.TYPE SKETCH.ELEMENT.TYPEP 
@@ -9279,140 +9279,138 @@ No more font sizes found.")))
     (CREATEPOSITION (fetch
 (REGION RIGHT) of
 REGION)
            (fetch
 (REGION TOP) of
 REGION])
 )
-(PUTPROPS SKETCHELEMENTS COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1990 1991 1992 1993 
-2000 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (14359 24769 (INIT.SKETCH.ELEMENTS 14369 . 21932) (CREATE.SKETCH.ELEMENT.TYPE 21934 . 
-23456) (SKETCH.ELEMENT.TYPEP 23458 . 23846) (SKETCH.ELEMENT.NAMEP 23848 . 24111) (
-\CURSOR.IN.MIDDLE.MENU 24113 . 24767)) (24810 25487 (SKETCHINCOLORP 24820 . 25140) (READ.COLOR.CHANGE 
-25142 . 25485)) (25996 28775 (SK.CREATE.DEFAULT.FILLING 26006 . 26307) (SKFILLINGP 26309 . 26942) (
-SK.INSURE.FILLING 26944 . 28372) (SK.INSURE.COLOR 28374 . 28773)) (28776 34386 (SK.TRANSLATE.MODE 
-28786 . 29568) (SK.CHANGE.FILLING.MODE 29570 . 33153) (READ.FILLING.MODE 33155 . 34384)) (34387 65061 
-(SKETCH.CREATE.CIRCLE 34397 . 35209) (CIRCLE.EXPANDFN 35211 . 38583) (CIRCLE.DRAWFN 38585 . 41586) (
-\CIRCLE.DRAWFN1 41588 . 44183) (CIRCLE.INPUTFN 44185 . 46034) (SK.UPDATE.CIRCLE.AFTER.CHANGE 46036 . 
-46395) (SK.READ.CIRCLE.POINT 46397 . 46868) (SK.SHOW.CIRCLE 46870 . 47516) (CIRCLE.INSIDEFN 47518 . 
-47783) (CIRCLE.REGIONFN 47785 . 49466) (CIRCLE.GLOBALREGIONFN 49468 . 50986) (CIRCLE.TRANSLATE 50988
- . 52849) (CIRCLE.READCHANGEFN 52851 . 57467) (CIRCLE.TRANSFORMFN 57469 . 59322) (CIRCLE.TRANSLATEPTS 
-59324 . 60938) (SK.CIRCLE.CREATE 60940 . 61783) (SET.CIRCLE.SCALE 61785 . 62551) (SK.BRUSH.READCHANGE 
-62553 . 65059)) (65062 65791 (SK.INSURE.BRUSH 65072 . 65466) (SK.INSURE.DASHING 65468 . 65789)) (67005
- 96499 (SKETCH.CREATE.ELLIPSE 67015 . 67614) (ELLIPSE.EXPANDFN 67616 . 71228) (ELLIPSE.DRAWFN 71230 . 
-75407) (ELLIPSE.INPUTFN 75409 . 77849) (SK.READ.ELLIPSE.MAJOR.PT 77851 . 78430) (
-SK.SHOW.ELLIPSE.MAJOR.RADIUS 78432 . 79187) (SK.READ.ELLIPSE.MINOR.PT 79189 . 79882) (
-SK.SHOW.ELLIPSE.MINOR.RADIUS 79884 . 80716) (ELLIPSE.INSIDEFN 80718 . 80988) (ELLIPSE.CREATE 80990 . 
-82365) (SK.UPDATE.ELLIPSE.AFTER.CHANGE 82367 . 82735) (ELLIPSE.REGIONFN 82737 . 84937) (
-ELLIPSE.GLOBALREGIONFN 84939 . 86752) (ELLIPSE.TRANSLATEFN 86754 . 89300) (ELLIPSE.TRANSFORMFN 89302
- . 90579) (ELLIPSE.TRANSLATEPTS 90581 . 92622) (MARK.SPOT 92624 . 93875) (DISTANCEBETWEEN 93877 . 
-94472) (SK.DISTANCE.TO 94474 . 94859) (SQUARE 94861 . 94903) (COMPUTE.ELLIPSE.ORIENTATION 94905 . 
-95624) (SK.COMPUTE.ELLIPSE.MINOR.RADIUS.PT 95626 . 96497)) (97612 138668 (SKETCH.CREATE.OPEN.CURVE 
-97622 . 98175) (OPENCURVE.INPUTFN 98177 . 99045) (SK.CURVE.CREATE 99047 . 100792) (MAXXEXTENT 100794
- . 101653) (MAXYEXTENT 101655 . 102515) (KNOT.SET.SCALE.FIELD 102517 . 103319) (OPENCURVE.DRAWFN 
-103321 . 104452) (OPENCURVE.EXPANDFN 104454 . 107769) (OPENCURVE.READCHANGEFN 107771 . 110973) (
-OPENCURVE.TRANSFORMFN 110975 . 113473) (OPENCURVE.TRANSLATEFN 113475 . 113897) (
-OPENCURVE.TRANSLATEPTSFN 113899 . 115280) (SKETCH.CREATE.CLOSED.CURVE 115282 . 115788) (
-CLOSEDCURVE.DRAWFN 115790 . 116574) (CLOSEDCURVE.EXPANDFN 116576 . 119689) (CLOSEDCURVE.REGIONFN 
-119691 . 120488) (CLOSEDCURVE.GLOBALREGIONFN 120490 . 121923) (READ.LIST.OF.POINTS 121925 . 123904) (
-CLOSEDCURVE.INPUTFN 123906 . 124551) (CLOSEDCURVE.READCHANGEFN 124553 . 127448) (
-CLOSEDCURVE.TRANSFORMFN 127450 . 129250) (CLOSEDCURVE.TRANSLATEPTSFN 129252 . 130597) (INVISIBLEPARTP 
-130599 . 130952) (SHOWSKETCHPOINT 130954 . 131259) (SHOWSKETCHXY 131261 . 131779) (KNOTS.REGIONFN 
-131781 . 132682) (OPENWIRE.GLOBALREGIONFN 132684 . 133548) (CURVE.REGIONFN 133550 . 134491) (
-OPENCURVE.GLOBALREGIONFN 134493 . 135900) (KNOTS.TRANSLATEFN 135902 . 136945) (REGION.CONTAINING.PTS 
-136947 . 138666)) (138669 160945 (CHANGE.ELTS.BRUSH.SIZE 138679 . 139289) (CHANGE.ELTS.BRUSH 139291 . 
-139808) (CHANGE.ELTS.BRUSH.SHAPE 139810 . 140211) (SK.CHANGE.BRUSH.SHAPE 140213 . 143725) (
-SK.CHANGE.BRUSH.COLOR 143727 . 148173) (SK.CHANGE.BRUSH.SIZE 148175 . 153133) (SK.CHANGE.ANGLE 153135
- . 156115) (SK.CHANGE.ARC.DIRECTION 156117 . 158496) (SK.SET.DEFAULT.BRUSH.SIZE 158498 . 159197) (
-READSIZECHANGE 159199 . 160943)) (160946 162565 (SK.CHANGE.ELEMENT.KNOTS 160956 . 162563)) (162566 
-163213 (SK.INSURE.POINT.LIST 162576 . 163029) (SK.INSURE.POSITION 163031 . 163211)) (164581 196904 (
-SKETCH.CREATE.WIRE 164591 . 165081) (CLOSEDWIRE.EXPANDFN 165083 . 167771) (KNOTS.INSIDEFN 167773 . 
-168494) (OPEN.WIRE.DRAWFN 168496 . 169088) (WIRE.EXPANDFN 169090 . 172337) (
-SK.UPDATE.WIRE.ELT.AFTER.CHANGE 172339 . 172860) (OPENWIRE.READCHANGEFN 172862 . 175355) (
-OPENWIRE.TRANSFORMFN 175357 . 177480) (OPENWIRE.TRANSLATEFN 177482 . 177906) (OPENWIRE.TRANSLATEPTSFN 
-177908 . 179187) (WIRE.INPUTFN 179189 . 180820) (SK.READ.WIRE.POINTS 180822 . 181353) (
-SK.READ.POINTS.WITH.FEEDBACK 181355 . 184122) (OPENWIRE.FEEDBACKFN 184124 . 184878) (
-CLOSEDWIRE.FEEDBACKFN 184880 . 186236) (CLOSEDWIRE.REGIONFN 186238 . 187223) (
-CLOSEDWIRE.GLOBALREGIONFN 187225 . 188277) (SK.WIRE.CREATE 188279 . 190042) (WIRE.ADD.POINT.TO.END 
-190044 . 190960) (READ.ARROW.CHANGE 190962 . 196438) (CHANGE.ELTS.ARROWHEADS 196440 . 196902)) (196905
- 207911 (SKETCH.CREATE.CLOSED.WIRE 196915 . 197476) (CLOSED.WIRE.INPUTFN 197478 . 197833) (
-CLOSED.WIRE.DRAWFN 197835 . 199880) (CLOSEDWIRE.READCHANGEFN 199882 . 204787) (CLOSEDWIRE.TRANSFORMFN 
-204789 . 206583) (CLOSEDWIRE.TRANSLATEPTSFN 206585 . 207909)) (207912 260618 (SK.EXPAND.ARROWHEADS 
-207922 . 208272) (SK.COMPUTE.ARC.ARROWHEAD.POINTS 208274 . 209655) (ARC.ARROWHEAD.POINTS 209657 . 
-210880) (SET.ARC.ARROWHEAD.POINTS 210882 . 211863) (SET.OPENCURVE.ARROWHEAD.POINTS 211865 . 212766) (
-SK.COMPUTE.CURVE.ARROWHEAD.POINTS 212768 . 214038) (SET.WIRE.ARROWHEAD.POINTS 214040 . 214793) (
-SK.COMPUTE.WIRE.ARROWHEAD.POINTS 214795 . 216060) (SK.EXPAND.ARROWHEAD 216062 . 217245) (CHANGED.ARROW
- 217247 . 220419) (SK.CHANGE.ARROWHEAD 220421 . 220874) (SK.CHANGE.ARROWHEAD1 220876 . 226131) (
-SK.CREATE.ARROWHEAD 226133 . 226653) (SK.ARROWHEAD.CREATE 226655 . 228229) (SK.ARROWHEAD.END.TEST 
-228231 . 229155) (READ.ARROWHEAD.END 229157 . 231182) (ARROW.HEAD.POSITIONS 231184 . 233024) (
-ARROWHEAD.POINTS.LIST 233026 . 236998) (CURVE.ARROWHEAD.POINTS 237000 . 237863) (LEFT.MOST.IS.BEGINP 
-237865 . 238746) (WIRE.ARROWHEAD.POINTS 238748 . 240274) (DRAWARROWHEADS 240276 . 242646) (
-\SK.DRAW.TRIANGLE.ARROWHEAD 242648 . 244308) (\SK.ENDPT.OF.ARROW 244310 . 246567) (
-\SK.ADJUST.FOR.ARROWHEADS 246569 . 249074) (SK.SET.ARROWHEAD.LENGTH 249076 . 250220) (
-SK.SET.ARROWHEAD.ANGLE 250222 . 251318) (SK.SET.ARROWHEAD.TYPE 251320 . 254609) (SK.SET.LINE.ARROWHEAD
- 254611 . 257024) (SK.UPDATE.ARROWHEAD.FORMAT 257026 . 259136) (SK.SET.LINE.LENGTH.MODE 259138 . 
-260616)) (260619 262420 (SK.INSURE.ARROWHEADS 260629 . 261811) (SK.ARROWHEADP 261813 . 262418)) (
-265217 327543 (SKETCH.CREATE.TEXT 265227 . 265741) (TEXT.CHANGEFN 265743 . 266135) (TEXT.READCHANGEFN 
-266137 . 274208) (\SK.READ.FONT.SIZE1 274210 . 276106) (SK.TEXT.ELT.WITH.SAME.FIELDS 276108 . 277748) 
-(SK.READFONTFAMILY 277750 . 279296) (CLOSE.PROMPT.WINDOW 279298 . 279722) (TEXT.DRAWFN 279724 . 280445
-) (TEXT.DRAWFN1 280447 . 283949) (TEXT.INSIDEFN 283951 . 284340) (TEXT.EXPANDFN 284342 . 286467) (
-SK.TEXT.LINE.REGIONS 286469 . 288343) (TEXT.UPDATE.GLOBAL.REGIONS 288345 . 289577) (REL.MOVE.REGION 
-289579 . 290116) (LTEXT.LINE.REGIONS 290118 . 293536) (TEXT.INPUTFN 293538 . 294048) (READ.TEXT 294050
- . 294798) (TEXT.POSITION.AND.CREATE 294800 . 297111) (CREATE.TEXT.ELEMENT 297113 . 297931) (
-SK.UPDATE.TEXT.AFTER.CHANGE 297933 . 298335) (SK.TEXT.FROM.TEXTBOX 298337 . 302143) (
-TEXT.SET.GLOBAL.REGIONS 302145 . 303438) (TEXT.REGIONFN 303440 . 304210) (TEXT.GLOBALREGIONFN 304212
- . 304900) (TEXT.TRANSLATEFN 304902 . 306217) (TEXT.TRANSFORMFN 306219 . 307342) (TEXT.TRANSLATEPTSFN 
-307344 . 307861) (TEXT.UPDATEFN 307863 . 312519) (SK.CHANGE.TEXT 312521 . 325609) (TEXT.SET.SCALES 
-325611 . 326579) (BREAK.AT.CARRIAGE.RETURNS 326581 . 327541)) (327544 346068 (ADD.KNOWN.SKETCH.FONT 
-327554 . 328545) (SK.PICK.FONT 328547 . 334079) (SK.CHOOSE.TEXT.FONT 334081 . 338029) (SK.NEXTSIZEFONT
- 338031 . 339298) (SK.DECREASING.FONT.LIST 339300 . 341173) (SK.GUESS.FONTSAVAILABLE 341175 . 346066))
- (346487 360630 (SK.SET.FONT 346497 . 348064) (SK.SET.TEXT.FONT 348066 . 349068) (SK.SET.TEXT.SIZE 
-349070 . 349757) (SK.SET.TEXT.HORIZ.ALIGN 349759 . 351333) (SK.READFONTSIZE 351335 . 353565) (
-SK.COLLECT.FONT.SIZES 353567 . 356485) (SK.SET.TEXT.VERT.ALIGN 356487 . 358529) (SK.SET.TEXT.LOOKS 
-358531 . 359988) (SK.SET.DEFAULT.TEXT.FACE 359990 . 360628)) (360631 361217 (CREATE.SKETCH.TERMTABLE 
-360641 . 361215)) (361218 362984 (SK.FONT.LIST 361228 . 361554) (SK.INSURE.FONT 361556 . 362078) (
-SK.INSURE.STYLE 362080 . 362598) (SK.INSURE.TEXT 362600 . 362982)) (363554 420847 (
-SKETCH.CREATE.TEXTBOX 363564 . 365206) (SK.COMPUTE.TEXTBOX.REGION.FOR.STRING 365208 . 367285) (
-SK.BREAK.INTO.LINES 367287 . 378473) (SK.BRUSH.SIZE 378475 . 378856) (SK.TEXTBOX.CREATE 378858 . 
-379655) (SK.TEXTBOX.CREATE1 379657 . 380721) (SK.UPDATE.TEXTBOX.AFTER.CHANGE 380723 . 381263) (
-SK.TEXTBOX.POSITION.IN.BOX 381265 . 383176) (TEXTBOX.CHANGEFN 383178 . 383652) (TEXTBOX.DRAWFN 383654
- . 385690) (SK.TEXTURE.AROUND.REGIONS 385692 . 391765) (ALL.EMPTY.REGIONS 391767 . 392257) (
-TEXTBOX.EXPANDFN 392259 . 399415) (TEXTBOX.INPUTFN 399417 . 401030) (TEXTBOX.INSIDEFN 401032 . 401445)
- (TEXTBOX.REGIONFN 401447 . 402301) (TEXTBOX.GLOBALREGIONFN 402303 . 402631) (
-TEXTBOX.SET.GLOBAL.REGIONS 402633 . 403964) (TEXTBOX.TRANSLATEFN 403966 . 405807) (
-TEXTBOX.TRANSLATEPTSFN 405809 . 408592) (TEXTBOX.TRANSFORMFN 408594 . 410262) (TEXTBOX.UPDATEFN 410264
- . 412157) (TEXTBOX.READCHANGEFN 412159 . 417048) (SK.TEXTBOX.TEXT.POSITION 417050 . 417471) (
-SK.TEXTBOX.FROM.TEXT 417473 . 420078) (ADD.EOLS 420080 . 420845)) (421376 424877 (
-SK.SET.TEXTBOX.VERT.ALIGN 421386 . 423266) (SK.SET.TEXTBOX.HORIZ.ALIGN 423268 . 424875)) (425260 
-469735 (SKETCH.CREATE.BOX 425270 . 425753) (SK.BOX.DRAWFN 425755 . 426914) (BOX.DRAWFN1 426916 . 
-429755) (KNOTS.OF.REGION 429757 . 430991) (SK.DRAWAREABOX 430993 . 437594) (SK.DRAWBOX 437596 . 438785
-) (SK.BOX.EXPANDFN 438787 . 442535) (SK.BOX.GETREGIONFN 442537 . 443723) (BOX.SET.SCALES 443725 . 
-444965) (SK.BOX.INPUTFN 444967 . 446900) (SK.BOX.CREATE 446902 . 447603) (SK.UPDATE.BOX.AFTER.CHANGE 
-447605 . 448116) (SK.BOX.INSIDEFN 448118 . 448508) (SK.BOX.REGIONFN 448510 . 449223) (
-SK.BOX.GLOBALREGIONFN 449225 . 449963) (SK.BOX.READCHANGEFN 449965 . 453686) (SK.CHANGE.FILLING 453688
- . 457636) (SK.CHANGE.FILLING.COLOR 457638 . 461294) (SK.BOX.TRANSLATEFN 461296 . 462475) (
-SK.BOX.TRANSFORMFN 462477 . 463422) (SK.BOX.TRANSLATEPTSFN 463424 . 465792) (UNSCALE.REGION.TO.GRID 
-465794 . 466719) (INCREASEREGION 466721 . 467312) (INSUREREGIONSIZE 467314 . 468485) (EXPANDREGION 
-468487 . 469367) (REGION.FROM.COORDINATES 469369 . 469733)) (470271 496626 (SKETCH.CREATE.ARC 470281
- . 471090) (ARC.DRAWFN 471092 . 472819) (ARC.EXPANDFN 472821 . 475154) (ARC.INPUTFN 475156 . 479374) (
-SK.INVERT.CIRCLE 479376 . 480236) (SK.READ.ARC.ANGLE.POINT 480238 . 480745) (SK.SHOW.ARC 480747 . 
-481357) (ARC.CREATE 481359 . 482714) (SK.UPDATE.ARC.AFTER.CHANGE 482716 . 483056) (ARC.MOVEFN 483058
- . 484641) (ARC.TRANSLATEPTS 484643 . 486528) (ARC.INSIDEFN 486530 . 486780) (ARC.REGIONFN 486782 . 
-487918) (ARC.GLOBALREGIONFN 487920 . 489642) (ARC.TRANSLATE 489644 . 490626) (ARC.TRANSFORMFN 490628
- . 493578) (ARC.READCHANGEFN 493580 . 496624)) (496627 505706 (SK.COMPUTE.ARC.ANGLE.PT 496637 . 497563
-) (SK.COMPUTE.ARC.ANGLE.PT.FROM.ANGLE 497565 . 498558) (SK.COMPUTE.ARC.PTS 498560 . 502132) (
-SK.SET.ARC.DIRECTION 502134 . 502708) (SK.SET.ARC.DIRECTION.CW 502710 . 502884) (
-SK.SET.ARC.DIRECTION.CCW 502886 . 503159) (SK.COMPUTE.SLOPE.OF.LINE 503161 . 503653) (
-SK.CREATE.ARC.USING 503655 . 504892) (SET.ARC.SCALES 504894 . 505704)) (505707 506152 (
-SK.INSURE.DIRECTION 505717 . 506150)) (507523 553382 (GETSKETCHELEMENTPROP 507533 . 508841) (
-\SK.GET.ARC.ANGLEPT 508843 . 509404) (\GETSKETCHELEMENTPROP1 509406 . 509660) (\SK.GET.BRUSH 509662 . 
-510586) (\SK.GET.FILLING 510588 . 511686) (\SK.GET.ARROWHEADS 511688 . 512467) (\SK.GET.FONT 512469 . 
-512949) (\SK.GET.JUSTIFICATION 512951 . 513475) (\SK.GET.DIRECTION 513477 . 513954) (\SK.GET.DASHING 
-513956 . 514975) (PUTSKETCHELEMENTPROP 514977 . 517246) (\SK.PUT.FILLING 517248 . 518518) (
-ADDSKETCHELEMENTPROP 518520 . 519325) (REMOVESKETCHELEMENTPROP 519327 . 520116) (\SK.PUT.FONT 520118
- . 520932) (\SK.PUT.JUSTIFICATION 520934 . 521945) (\SK.PUT.DIRECTION 521947 . 522554) (
-\SK.PUT.DASHING 522556 . 523891) (\SK.PUT.BRUSH 523893 . 525812) (\SK.PUT.ARROWHEADS 525814 . 527780) 
-(SK.COPY.ELEMENT.PROPERTY.LIST 527782 . 528358) (SKETCH.UPDATE 528360 . 529090) (SKETCH.UPDATE1 529092
- . 530380) (\SKELT.GET.SCALE 530382 . 531370) (\SKELT.PUT.SCALE 531372 . 532679) (\SKELT.PUT.DATA 
-532681 . 534478) (SK.REPLACE.TEXT.IN.ELEMENT 534480 . 535433) (\SKELT.GET.DATA 535435 . 536502) (
-\SK.GET.1STCONTROLPT 536504 . 538016) (\SK.PUT.1STCONTROLPT 538018 . 543491) (\SK.GET.2NDCONTROLPT 
-543493 . 544408) (\SK.PUT.2NDCONTROLPT 544410 . 548598) (\SK.GET.3RDCONTROLPT 548600 . 549478) (
-\SK.PUT.3RDCONTROLPT 549480 . 553380)) (553383 553964 (LOWERLEFTCORNER 553393 . 553639) (
-UPPERRIGHTCORNER 553641 . 553962)))))
+  (FILEMAP (NIL (14510 24920 (INIT.SKETCH.ELEMENTS 14520 . 22083) (CREATE.SKETCH.ELEMENT.TYPE 22085 . 
+23607) (SKETCH.ELEMENT.TYPEP 23609 . 23997) (SKETCH.ELEMENT.NAMEP 23999 . 24262) (
+\CURSOR.IN.MIDDLE.MENU 24264 . 24918)) (24961 25638 (SKETCHINCOLORP 24971 . 25291) (READ.COLOR.CHANGE 
+25293 . 25636)) (26147 28926 (SK.CREATE.DEFAULT.FILLING 26157 . 26458) (SKFILLINGP 26460 . 27093) (
+SK.INSURE.FILLING 27095 . 28523) (SK.INSURE.COLOR 28525 . 28924)) (28927 34537 (SK.TRANSLATE.MODE 
+28937 . 29719) (SK.CHANGE.FILLING.MODE 29721 . 33304) (READ.FILLING.MODE 33306 . 34535)) (34538 65212 
+(SKETCH.CREATE.CIRCLE 34548 . 35360) (CIRCLE.EXPANDFN 35362 . 38734) (CIRCLE.DRAWFN 38736 . 41737) (
+\CIRCLE.DRAWFN1 41739 . 44334) (CIRCLE.INPUTFN 44336 . 46185) (SK.UPDATE.CIRCLE.AFTER.CHANGE 46187 . 
+46546) (SK.READ.CIRCLE.POINT 46548 . 47019) (SK.SHOW.CIRCLE 47021 . 47667) (CIRCLE.INSIDEFN 47669 . 
+47934) (CIRCLE.REGIONFN 47936 . 49617) (CIRCLE.GLOBALREGIONFN 49619 . 51137) (CIRCLE.TRANSLATE 51139
+ . 53000) (CIRCLE.READCHANGEFN 53002 . 57618) (CIRCLE.TRANSFORMFN 57620 . 59473) (CIRCLE.TRANSLATEPTS 
+59475 . 61089) (SK.CIRCLE.CREATE 61091 . 61934) (SET.CIRCLE.SCALE 61936 . 62702) (SK.BRUSH.READCHANGE 
+62704 . 65210)) (65213 65942 (SK.INSURE.BRUSH 65223 . 65617) (SK.INSURE.DASHING 65619 . 65940)) (67156
+ 96650 (SKETCH.CREATE.ELLIPSE 67166 . 67765) (ELLIPSE.EXPANDFN 67767 . 71379) (ELLIPSE.DRAWFN 71381 . 
+75558) (ELLIPSE.INPUTFN 75560 . 78000) (SK.READ.ELLIPSE.MAJOR.PT 78002 . 78581) (
+SK.SHOW.ELLIPSE.MAJOR.RADIUS 78583 . 79338) (SK.READ.ELLIPSE.MINOR.PT 79340 . 80033) (
+SK.SHOW.ELLIPSE.MINOR.RADIUS 80035 . 80867) (ELLIPSE.INSIDEFN 80869 . 81139) (ELLIPSE.CREATE 81141 . 
+82516) (SK.UPDATE.ELLIPSE.AFTER.CHANGE 82518 . 82886) (ELLIPSE.REGIONFN 82888 . 85088) (
+ELLIPSE.GLOBALREGIONFN 85090 . 86903) (ELLIPSE.TRANSLATEFN 86905 . 89451) (ELLIPSE.TRANSFORMFN 89453
+ . 90730) (ELLIPSE.TRANSLATEPTS 90732 . 92773) (MARK.SPOT 92775 . 94026) (DISTANCEBETWEEN 94028 . 
+94623) (SK.DISTANCE.TO 94625 . 95010) (SQUARE 95012 . 95054) (COMPUTE.ELLIPSE.ORIENTATION 95056 . 
+95775) (SK.COMPUTE.ELLIPSE.MINOR.RADIUS.PT 95777 . 96648)) (97763 138819 (SKETCH.CREATE.OPEN.CURVE 
+97773 . 98326) (OPENCURVE.INPUTFN 98328 . 99196) (SK.CURVE.CREATE 99198 . 100943) (MAXXEXTENT 100945
+ . 101804) (MAXYEXTENT 101806 . 102666) (KNOT.SET.SCALE.FIELD 102668 . 103470) (OPENCURVE.DRAWFN 
+103472 . 104603) (OPENCURVE.EXPANDFN 104605 . 107920) (OPENCURVE.READCHANGEFN 107922 . 111124) (
+OPENCURVE.TRANSFORMFN 111126 . 113624) (OPENCURVE.TRANSLATEFN 113626 . 114048) (
+OPENCURVE.TRANSLATEPTSFN 114050 . 115431) (SKETCH.CREATE.CLOSED.CURVE 115433 . 115939) (
+CLOSEDCURVE.DRAWFN 115941 . 116725) (CLOSEDCURVE.EXPANDFN 116727 . 119840) (CLOSEDCURVE.REGIONFN 
+119842 . 120639) (CLOSEDCURVE.GLOBALREGIONFN 120641 . 122074) (READ.LIST.OF.POINTS 122076 . 124055) (
+CLOSEDCURVE.INPUTFN 124057 . 124702) (CLOSEDCURVE.READCHANGEFN 124704 . 127599) (
+CLOSEDCURVE.TRANSFORMFN 127601 . 129401) (CLOSEDCURVE.TRANSLATEPTSFN 129403 . 130748) (INVISIBLEPARTP 
+130750 . 131103) (SHOWSKETCHPOINT 131105 . 131410) (SHOWSKETCHXY 131412 . 131930) (KNOTS.REGIONFN 
+131932 . 132833) (OPENWIRE.GLOBALREGIONFN 132835 . 133699) (CURVE.REGIONFN 133701 . 134642) (
+OPENCURVE.GLOBALREGIONFN 134644 . 136051) (KNOTS.TRANSLATEFN 136053 . 137096) (REGION.CONTAINING.PTS 
+137098 . 138817)) (138820 161096 (CHANGE.ELTS.BRUSH.SIZE 138830 . 139440) (CHANGE.ELTS.BRUSH 139442 . 
+139959) (CHANGE.ELTS.BRUSH.SHAPE 139961 . 140362) (SK.CHANGE.BRUSH.SHAPE 140364 . 143876) (
+SK.CHANGE.BRUSH.COLOR 143878 . 148324) (SK.CHANGE.BRUSH.SIZE 148326 . 153284) (SK.CHANGE.ANGLE 153286
+ . 156266) (SK.CHANGE.ARC.DIRECTION 156268 . 158647) (SK.SET.DEFAULT.BRUSH.SIZE 158649 . 159348) (
+READSIZECHANGE 159350 . 161094)) (161097 162716 (SK.CHANGE.ELEMENT.KNOTS 161107 . 162714)) (162717 
+163364 (SK.INSURE.POINT.LIST 162727 . 163180) (SK.INSURE.POSITION 163182 . 163362)) (164732 197055 (
+SKETCH.CREATE.WIRE 164742 . 165232) (CLOSEDWIRE.EXPANDFN 165234 . 167922) (KNOTS.INSIDEFN 167924 . 
+168645) (OPEN.WIRE.DRAWFN 168647 . 169239) (WIRE.EXPANDFN 169241 . 172488) (
+SK.UPDATE.WIRE.ELT.AFTER.CHANGE 172490 . 173011) (OPENWIRE.READCHANGEFN 173013 . 175506) (
+OPENWIRE.TRANSFORMFN 175508 . 177631) (OPENWIRE.TRANSLATEFN 177633 . 178057) (OPENWIRE.TRANSLATEPTSFN 
+178059 . 179338) (WIRE.INPUTFN 179340 . 180971) (SK.READ.WIRE.POINTS 180973 . 181504) (
+SK.READ.POINTS.WITH.FEEDBACK 181506 . 184273) (OPENWIRE.FEEDBACKFN 184275 . 185029) (
+CLOSEDWIRE.FEEDBACKFN 185031 . 186387) (CLOSEDWIRE.REGIONFN 186389 . 187374) (
+CLOSEDWIRE.GLOBALREGIONFN 187376 . 188428) (SK.WIRE.CREATE 188430 . 190193) (WIRE.ADD.POINT.TO.END 
+190195 . 191111) (READ.ARROW.CHANGE 191113 . 196589) (CHANGE.ELTS.ARROWHEADS 196591 . 197053)) (197056
+ 208062 (SKETCH.CREATE.CLOSED.WIRE 197066 . 197627) (CLOSED.WIRE.INPUTFN 197629 . 197984) (
+CLOSED.WIRE.DRAWFN 197986 . 200031) (CLOSEDWIRE.READCHANGEFN 200033 . 204938) (CLOSEDWIRE.TRANSFORMFN 
+204940 . 206734) (CLOSEDWIRE.TRANSLATEPTSFN 206736 . 208060)) (208063 260769 (SK.EXPAND.ARROWHEADS 
+208073 . 208423) (SK.COMPUTE.ARC.ARROWHEAD.POINTS 208425 . 209806) (ARC.ARROWHEAD.POINTS 209808 . 
+211031) (SET.ARC.ARROWHEAD.POINTS 211033 . 212014) (SET.OPENCURVE.ARROWHEAD.POINTS 212016 . 212917) (
+SK.COMPUTE.CURVE.ARROWHEAD.POINTS 212919 . 214189) (SET.WIRE.ARROWHEAD.POINTS 214191 . 214944) (
+SK.COMPUTE.WIRE.ARROWHEAD.POINTS 214946 . 216211) (SK.EXPAND.ARROWHEAD 216213 . 217396) (CHANGED.ARROW
+ 217398 . 220570) (SK.CHANGE.ARROWHEAD 220572 . 221025) (SK.CHANGE.ARROWHEAD1 221027 . 226282) (
+SK.CREATE.ARROWHEAD 226284 . 226804) (SK.ARROWHEAD.CREATE 226806 . 228380) (SK.ARROWHEAD.END.TEST 
+228382 . 229306) (READ.ARROWHEAD.END 229308 . 231333) (ARROW.HEAD.POSITIONS 231335 . 233175) (
+ARROWHEAD.POINTS.LIST 233177 . 237149) (CURVE.ARROWHEAD.POINTS 237151 . 238014) (LEFT.MOST.IS.BEGINP 
+238016 . 238897) (WIRE.ARROWHEAD.POINTS 238899 . 240425) (DRAWARROWHEADS 240427 . 242797) (
+\SK.DRAW.TRIANGLE.ARROWHEAD 242799 . 244459) (\SK.ENDPT.OF.ARROW 244461 . 246718) (
+\SK.ADJUST.FOR.ARROWHEADS 246720 . 249225) (SK.SET.ARROWHEAD.LENGTH 249227 . 250371) (
+SK.SET.ARROWHEAD.ANGLE 250373 . 251469) (SK.SET.ARROWHEAD.TYPE 251471 . 254760) (SK.SET.LINE.ARROWHEAD
+ 254762 . 257175) (SK.UPDATE.ARROWHEAD.FORMAT 257177 . 259287) (SK.SET.LINE.LENGTH.MODE 259289 . 
+260767)) (260770 262571 (SK.INSURE.ARROWHEADS 260780 . 261962) (SK.ARROWHEADP 261964 . 262569)) (
+265368 327694 (SKETCH.CREATE.TEXT 265378 . 265892) (TEXT.CHANGEFN 265894 . 266286) (TEXT.READCHANGEFN 
+266288 . 274359) (\SK.READ.FONT.SIZE1 274361 . 276257) (SK.TEXT.ELT.WITH.SAME.FIELDS 276259 . 277899) 
+(SK.READFONTFAMILY 277901 . 279447) (CLOSE.PROMPT.WINDOW 279449 . 279873) (TEXT.DRAWFN 279875 . 280596
+) (TEXT.DRAWFN1 280598 . 284100) (TEXT.INSIDEFN 284102 . 284491) (TEXT.EXPANDFN 284493 . 286618) (
+SK.TEXT.LINE.REGIONS 286620 . 288494) (TEXT.UPDATE.GLOBAL.REGIONS 288496 . 289728) (REL.MOVE.REGION 
+289730 . 290267) (LTEXT.LINE.REGIONS 290269 . 293687) (TEXT.INPUTFN 293689 . 294199) (READ.TEXT 294201
+ . 294949) (TEXT.POSITION.AND.CREATE 294951 . 297262) (CREATE.TEXT.ELEMENT 297264 . 298082) (
+SK.UPDATE.TEXT.AFTER.CHANGE 298084 . 298486) (SK.TEXT.FROM.TEXTBOX 298488 . 302294) (
+TEXT.SET.GLOBAL.REGIONS 302296 . 303589) (TEXT.REGIONFN 303591 . 304361) (TEXT.GLOBALREGIONFN 304363
+ . 305051) (TEXT.TRANSLATEFN 305053 . 306368) (TEXT.TRANSFORMFN 306370 . 307493) (TEXT.TRANSLATEPTSFN 
+307495 . 308012) (TEXT.UPDATEFN 308014 . 312670) (SK.CHANGE.TEXT 312672 . 325760) (TEXT.SET.SCALES 
+325762 . 326730) (BREAK.AT.CARRIAGE.RETURNS 326732 . 327692)) (327695 346219 (ADD.KNOWN.SKETCH.FONT 
+327705 . 328696) (SK.PICK.FONT 328698 . 334230) (SK.CHOOSE.TEXT.FONT 334232 . 338180) (SK.NEXTSIZEFONT
+ 338182 . 339449) (SK.DECREASING.FONT.LIST 339451 . 341324) (SK.GUESS.FONTSAVAILABLE 341326 . 346217))
+ (346638 360781 (SK.SET.FONT 346648 . 348215) (SK.SET.TEXT.FONT 348217 . 349219) (SK.SET.TEXT.SIZE 
+349221 . 349908) (SK.SET.TEXT.HORIZ.ALIGN 349910 . 351484) (SK.READFONTSIZE 351486 . 353716) (
+SK.COLLECT.FONT.SIZES 353718 . 356636) (SK.SET.TEXT.VERT.ALIGN 356638 . 358680) (SK.SET.TEXT.LOOKS 
+358682 . 360139) (SK.SET.DEFAULT.TEXT.FACE 360141 . 360779)) (360782 361368 (CREATE.SKETCH.TERMTABLE 
+360792 . 361366)) (361369 363135 (SK.FONT.LIST 361379 . 361705) (SK.INSURE.FONT 361707 . 362229) (
+SK.INSURE.STYLE 362231 . 362749) (SK.INSURE.TEXT 362751 . 363133)) (363705 420998 (
+SKETCH.CREATE.TEXTBOX 363715 . 365357) (SK.COMPUTE.TEXTBOX.REGION.FOR.STRING 365359 . 367436) (
+SK.BREAK.INTO.LINES 367438 . 378624) (SK.BRUSH.SIZE 378626 . 379007) (SK.TEXTBOX.CREATE 379009 . 
+379806) (SK.TEXTBOX.CREATE1 379808 . 380872) (SK.UPDATE.TEXTBOX.AFTER.CHANGE 380874 . 381414) (
+SK.TEXTBOX.POSITION.IN.BOX 381416 . 383327) (TEXTBOX.CHANGEFN 383329 . 383803) (TEXTBOX.DRAWFN 383805
+ . 385841) (SK.TEXTURE.AROUND.REGIONS 385843 . 391916) (ALL.EMPTY.REGIONS 391918 . 392408) (
+TEXTBOX.EXPANDFN 392410 . 399566) (TEXTBOX.INPUTFN 399568 . 401181) (TEXTBOX.INSIDEFN 401183 . 401596)
+ (TEXTBOX.REGIONFN 401598 . 402452) (TEXTBOX.GLOBALREGIONFN 402454 . 402782) (
+TEXTBOX.SET.GLOBAL.REGIONS 402784 . 404115) (TEXTBOX.TRANSLATEFN 404117 . 405958) (
+TEXTBOX.TRANSLATEPTSFN 405960 . 408743) (TEXTBOX.TRANSFORMFN 408745 . 410413) (TEXTBOX.UPDATEFN 410415
+ . 412308) (TEXTBOX.READCHANGEFN 412310 . 417199) (SK.TEXTBOX.TEXT.POSITION 417201 . 417622) (
+SK.TEXTBOX.FROM.TEXT 417624 . 420229) (ADD.EOLS 420231 . 420996)) (421527 425028 (
+SK.SET.TEXTBOX.VERT.ALIGN 421537 . 423417) (SK.SET.TEXTBOX.HORIZ.ALIGN 423419 . 425026)) (425411 
+469886 (SKETCH.CREATE.BOX 425421 . 425904) (SK.BOX.DRAWFN 425906 . 427065) (BOX.DRAWFN1 427067 . 
+429906) (KNOTS.OF.REGION 429908 . 431142) (SK.DRAWAREABOX 431144 . 437745) (SK.DRAWBOX 437747 . 438936
+) (SK.BOX.EXPANDFN 438938 . 442686) (SK.BOX.GETREGIONFN 442688 . 443874) (BOX.SET.SCALES 443876 . 
+445116) (SK.BOX.INPUTFN 445118 . 447051) (SK.BOX.CREATE 447053 . 447754) (SK.UPDATE.BOX.AFTER.CHANGE 
+447756 . 448267) (SK.BOX.INSIDEFN 448269 . 448659) (SK.BOX.REGIONFN 448661 . 449374) (
+SK.BOX.GLOBALREGIONFN 449376 . 450114) (SK.BOX.READCHANGEFN 450116 . 453837) (SK.CHANGE.FILLING 453839
+ . 457787) (SK.CHANGE.FILLING.COLOR 457789 . 461445) (SK.BOX.TRANSLATEFN 461447 . 462626) (
+SK.BOX.TRANSFORMFN 462628 . 463573) (SK.BOX.TRANSLATEPTSFN 463575 . 465943) (UNSCALE.REGION.TO.GRID 
+465945 . 466870) (INCREASEREGION 466872 . 467463) (INSUREREGIONSIZE 467465 . 468636) (EXPANDREGION 
+468638 . 469518) (REGION.FROM.COORDINATES 469520 . 469884)) (470422 496777 (SKETCH.CREATE.ARC 470432
+ . 471241) (ARC.DRAWFN 471243 . 472970) (ARC.EXPANDFN 472972 . 475305) (ARC.INPUTFN 475307 . 479525) (
+SK.INVERT.CIRCLE 479527 . 480387) (SK.READ.ARC.ANGLE.POINT 480389 . 480896) (SK.SHOW.ARC 480898 . 
+481508) (ARC.CREATE 481510 . 482865) (SK.UPDATE.ARC.AFTER.CHANGE 482867 . 483207) (ARC.MOVEFN 483209
+ . 484792) (ARC.TRANSLATEPTS 484794 . 486679) (ARC.INSIDEFN 486681 . 486931) (ARC.REGIONFN 486933 . 
+488069) (ARC.GLOBALREGIONFN 488071 . 489793) (ARC.TRANSLATE 489795 . 490777) (ARC.TRANSFORMFN 490779
+ . 493729) (ARC.READCHANGEFN 493731 . 496775)) (496778 505857 (SK.COMPUTE.ARC.ANGLE.PT 496788 . 497714
+) (SK.COMPUTE.ARC.ANGLE.PT.FROM.ANGLE 497716 . 498709) (SK.COMPUTE.ARC.PTS 498711 . 502283) (
+SK.SET.ARC.DIRECTION 502285 . 502859) (SK.SET.ARC.DIRECTION.CW 502861 . 503035) (
+SK.SET.ARC.DIRECTION.CCW 503037 . 503310) (SK.COMPUTE.SLOPE.OF.LINE 503312 . 503804) (
+SK.CREATE.ARC.USING 503806 . 505043) (SET.ARC.SCALES 505045 . 505855)) (505858 506303 (
+SK.INSURE.DIRECTION 505868 . 506301)) (507674 553533 (GETSKETCHELEMENTPROP 507684 . 508992) (
+\SK.GET.ARC.ANGLEPT 508994 . 509555) (\GETSKETCHELEMENTPROP1 509557 . 509811) (\SK.GET.BRUSH 509813 . 
+510737) (\SK.GET.FILLING 510739 . 511837) (\SK.GET.ARROWHEADS 511839 . 512618) (\SK.GET.FONT 512620 . 
+513100) (\SK.GET.JUSTIFICATION 513102 . 513626) (\SK.GET.DIRECTION 513628 . 514105) (\SK.GET.DASHING 
+514107 . 515126) (PUTSKETCHELEMENTPROP 515128 . 517397) (\SK.PUT.FILLING 517399 . 518669) (
+ADDSKETCHELEMENTPROP 518671 . 519476) (REMOVESKETCHELEMENTPROP 519478 . 520267) (\SK.PUT.FONT 520269
+ . 521083) (\SK.PUT.JUSTIFICATION 521085 . 522096) (\SK.PUT.DIRECTION 522098 . 522705) (
+\SK.PUT.DASHING 522707 . 524042) (\SK.PUT.BRUSH 524044 . 525963) (\SK.PUT.ARROWHEADS 525965 . 527931) 
+(SK.COPY.ELEMENT.PROPERTY.LIST 527933 . 528509) (SKETCH.UPDATE 528511 . 529241) (SKETCH.UPDATE1 529243
+ . 530531) (\SKELT.GET.SCALE 530533 . 531521) (\SKELT.PUT.SCALE 531523 . 532830) (\SKELT.PUT.DATA 
+532832 . 534629) (SK.REPLACE.TEXT.IN.ELEMENT 534631 . 535584) (\SKELT.GET.DATA 535586 . 536653) (
+\SK.GET.1STCONTROLPT 536655 . 538167) (\SK.PUT.1STCONTROLPT 538169 . 543642) (\SK.GET.2NDCONTROLPT 
+543644 . 544559) (\SK.PUT.2NDCONTROLPT 544561 . 548749) (\SK.GET.3RDCONTROLPT 548751 . 549629) (
+\SK.PUT.3RDCONTROLPT 549631 . 553531)) (553534 554115 (LOWERLEFTCORNER 553544 . 553790) (
+UPPERRIGHTCORNER 553792 . 554113)))))
 STOP

library/sketch/SKETCH-OBJ

@@ -1,19 +1,17 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "15-Jul-2022 14:33:25" {DSK}<home>larry>winhome>DROPBOX>TEDIT-VERSIONS>SKETCHOBJ.;1
 55347  
+
(FILECREATED " 5-Dec-2023 00:15:05" {WMEDLEY}<library>sketch>SKETCH-OBJ.;1
 55189  
 
-      :CHANGES-TO (FNS SKETCH.DISPLAYFN)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "20-Jan-93 14:48:59" {DSK}<home>larry>medley>library>SKETCHOBJ.;1)
+      :CHANGES-TO (RECORDS SKETCHIMAGEOBJ SKETCHDOCUMENTINFO)
+
+      :PREVIOUS-DATE "15-Jul-2022 14:33:25" {WMEDLEY}<library>sketch>SKETCHOBJ.;2)
 
 
-(* ; "
-Copyright (c) 1984-1988, 1990, 1993 by Venue & Xerox Corporation.
-")
+(PRETTYCOMPRINT SKETCH-OBJCOMS)
 
-(PRETTYCOMPRINT SKETCHOBJCOMS)
-
-(RPAQQ SKETCHOBJCOMS
 
+(RPAQQ SKETCH-OBJCOMS

        [[COMS (* the stuff to support sketch images in documents.)
               (FNS MAKE.IMAGE.OBJECT.OF.SKETCH SK.ELEMENT.FROM.IMAGEOBJ SKETCHIMAGEOBJ.FROM.VIEWER 
                    SKETCH.IMAGEOBJ SKETCH.DISPLAYFN SKETCH.BITMAP.IMAGE SKIO.IMAGEBOXFN SKIO.GETFN.2
@@ -961,23 +959,22 @@ Copyright (c) 1984-1988, 1990, 1993 by Venue & Xerox Corporation.
        '24)
 
 (CREATE.SKIMAGEOBJ.TYPE
)
-(PUTPROPS SKETCHOBJ COPYRIGHT ("Venue & Xerox Corporation" 1984 1985 1986 1987 1988 1990 1993))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2084 31471 (MAKE.IMAGE.OBJECT.OF.SKETCH 2094 . 3258) (SK.ELEMENT.FROM.IMAGEOBJ 3260 . 
-3559) (SKETCHIMAGEOBJ.FROM.VIEWER 3561 . 3973) (SKETCH.IMAGEOBJ 3975 . 4811) (SKETCH.DISPLAYFN 4813 . 
-8445) (SKETCH.BITMAP.IMAGE 8447 . 10118) (SKIO.IMAGEBOXFN 10120 . 12125) (SKIO.GETFN.2 12127 . 13596) 
-(SKIO.UPDATE.FROM.OLD.FORM 13598 . 14282) (SKIO.GETFN 14284 . 14802) (SKIO.PUTFN 14804 . 15801) (
-SKIO.COPYFN 15803 . 16505) (SKIO.BUTTONEVENTINFN 16507 . 21564) (TRANSLATE.REGION 21566 . 22095) (
-UPDATE.IMAGE.IN.DOCUMENT 22097 . 24616) (SK.COPY.IMAGEOBJ 24618 . 26289) (COPY.IMAGE.OBJECT 26291 . 
-26828) (\CREATE.SKETCH.IMAGEFNS 26830 . 27967) (\SKIO.IN.TOO.SMALL.TEDITP 27969 . 28661) (
-SKETCH.VIEWER.GRID 28663 . 29960) (SKETCH.VIEWER.SCALE 29962 . 31469)) (31834 39824 (
-SKETCH.IMAGE.OBJECT.ELEMENT 31844 . 32257) (SKETCH.IMAGEOBJ.OF.ELEMENT 32259 . 32585) (
-SKETCH.SCALE.OF.ELEMENT 32587 . 33015) (SKETCH.POSITION.OF.ELEMENT 33017 . 33664) (
-CREATE.SKIMAGEOBJ.TYPE 33666 . 34591) (IMAGEBOXSIZE 34593 . 34944) (SK.UPDATE.IMAGEOBJECT.AFTER.CHANGE
- 34946 . 37073) (SKETCH.CREATE.IMAGE.OBJECT 37075 . 37797) (SKETCH.CREATE.IMAGE.OBJECT1 37799 . 39822)
-) (39825 54230 (SK.IMAGEOBJ.DRAWFN 39835 . 41507) (SK.IMAGEOBJ.REGIONFN 41509 . 41934) (
-SK.IMAGEOBJ.GLOBALREGIONFN 41936 . 42337) (SK.IMAGEOBJ.TRANSLATEFN 42339 . 44622) (
-SK.IMAGEOBJ.EXPANDFN 44624 . 46810) (SK.IMAGEOBJ.INSIDEFN 46812 . 47346) (SK.IMAGEOBJ.MOVEFN 47348 . 
-49579) (SK.IMAGEOBJ.CHANGEFN 49581 . 52656) (SK.IMAGEOBJ.READCHANGEFN 52658 . 52887) (
-SK.IMAGEOBJ.TRANSFORMFN 52889 . 54228)))))
+  (FILEMAP (NIL (2022 31409 (MAKE.IMAGE.OBJECT.OF.SKETCH 2032 . 3196) (SK.ELEMENT.FROM.IMAGEOBJ 3198 . 
+3497) (SKETCHIMAGEOBJ.FROM.VIEWER 3499 . 3911) (SKETCH.IMAGEOBJ 3913 . 4749) (SKETCH.DISPLAYFN 4751 . 
+8383) (SKETCH.BITMAP.IMAGE 8385 . 10056) (SKIO.IMAGEBOXFN 10058 . 12063) (SKIO.GETFN.2 12065 . 13534) 
+(SKIO.UPDATE.FROM.OLD.FORM 13536 . 14220) (SKIO.GETFN 14222 . 14740) (SKIO.PUTFN 14742 . 15739) (
+SKIO.COPYFN 15741 . 16443) (SKIO.BUTTONEVENTINFN 16445 . 21502) (TRANSLATE.REGION 21504 . 22033) (
+UPDATE.IMAGE.IN.DOCUMENT 22035 . 24554) (SK.COPY.IMAGEOBJ 24556 . 26227) (COPY.IMAGE.OBJECT 26229 . 
+26766) (\CREATE.SKETCH.IMAGEFNS 26768 . 27905) (\SKIO.IN.TOO.SMALL.TEDITP 27907 . 28599) (
+SKETCH.VIEWER.GRID 28601 . 29898) (SKETCH.VIEWER.SCALE 29900 . 31407)) (31772 39762 (
+SKETCH.IMAGE.OBJECT.ELEMENT 31782 . 32195) (SKETCH.IMAGEOBJ.OF.ELEMENT 32197 . 32523) (
+SKETCH.SCALE.OF.ELEMENT 32525 . 32953) (SKETCH.POSITION.OF.ELEMENT 32955 . 33602) (
+CREATE.SKIMAGEOBJ.TYPE 33604 . 34529) (IMAGEBOXSIZE 34531 . 34882) (SK.UPDATE.IMAGEOBJECT.AFTER.CHANGE
+ 34884 . 37011) (SKETCH.CREATE.IMAGE.OBJECT 37013 . 37735) (SKETCH.CREATE.IMAGE.OBJECT1 37737 . 39760)
+) (39763 54168 (SK.IMAGEOBJ.DRAWFN 39773 . 41445) (SK.IMAGEOBJ.REGIONFN 41447 . 41872) (
+SK.IMAGEOBJ.GLOBALREGIONFN 41874 . 42275) (SK.IMAGEOBJ.TRANSLATEFN 42277 . 44560) (
+SK.IMAGEOBJ.EXPANDFN 44562 . 46748) (SK.IMAGEOBJ.INSIDEFN 46750 . 47284) (SK.IMAGEOBJ.MOVEFN 47286 . 
+49517) (SK.IMAGEOBJ.CHANGEFN 49519 . 52594) (SK.IMAGEOBJ.READCHANGEFN 52596 . 52825) (
+SK.IMAGEOBJ.TRANSFORMFN 52827 . 54166)))))
 STOP

library/sketch/SKETCH-OPS

@@ -1,15 +1,17 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 3-May-2023 21:06:28" {DSK}<home>larry>il>medley>library>SKETCHOPS.;7
 221663 
+
(FILECREATED " 5-Dec-2023 00:08:46" {WMEDLEY}<library>sketch>SKETCH-OPS.;1
 221752 
 
-      :EDIT-BY "lmm"
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE " 2-May-2023 15:53:16" {DSK}<home>larry>il>medley>library>SKETCHOPS.;2)
+      :CHANGES-TO (RECORDS AFFINETRANSFORMATION SKHISTEVENT SKEVENTTYPE SKETCHVIEW)
+
+      :PREVIOUS-DATE " 3-May-2023 21:06:28" {WMEDLEY}<library>sketch>SKETCHOPS.;2)
 
 
-(PRETTYCOMPRINT SKETCHOPSCOMS)
+(PRETTYCOMPRINT SKETCH-OPSCOMS)
 
-(RPAQQ SKETCHOPSCOMS
 
+(RPAQQ SKETCH-OPSCOMS

        [                                                     (* ; 
 
                                                             "functions that used to be on SKETCH")

         (COMS 
@@ -3128,17 +3130,17 @@ If you meant this, you should use the TWO PT TRANSFORM.")
 (GLOBALVARS SKETCH.#.UNDO.ITEMS)
 )
 
-(PUTPROPS ADD EVENTFNS
 (SK.ADD.UNDO SK.TYPE.OF.FIRST.ARG SK.DELETE.UNDO))
+(PUTPROPS ADD
 EVENTFNS
 (SK.ADD.UNDO SK.TYPE.OF.FIRST.ARG SK.DELETE.UNDO))
 
-(PUTPROPS DELETE EVENTFNS
 (SK.DELETE.UNDO SK.TYPE.OF.FIRST.ARG SK.ADD.UNDO))
+(PUTPROPS DELETE
 EVENTFNS
 (SK.DELETE.UNDO SK.TYPE.OF.FIRST.ARG SK.ADD.UNDO))
 
-(PUTPROPS CHANGE EVENTFNS
 (SK.CHANGE.UNDO SK.TYPE.OF.FIRST.ARG SK.CHANGE.REDO))
+(PUTPROPS CHANGE
 EVENTFNS
 (SK.CHANGE.UNDO SK.TYPE.OF.FIRST.ARG SK.CHANGE.REDO))
 
-(PUTPROPS UNDO EVENTFNS
 (SK.UNDO.UNDO SK.UNDO.MENULABEL SHOULDNT))
+(PUTPROPS UNDO
 EVENTFNS
 (SK.UNDO.UNDO SK.UNDO.MENULABEL SHOULDNT))
 
-(PUTPROPS MOVE EVENTFNS
 (SK.MOVE.UNDO SK.TYPE.OF.FIRST.ARG SK.MOVE.REDO))
+(PUTPROPS MOVE
 EVENTFNS
 (SK.MOVE.UNDO SK.TYPE.OF.FIRST.ARG SK.MOVE.REDO))
 
-(PUTPROPS COPY EVENTFNS
 (SK.ADD.UNDO SK.TYPE.OF.FIRST.ARG SK.DELETE.UNDO))
+(PUTPROPS COPY
 EVENTFNS
 (SK.ADD.UNDO SK.TYPE.OF.FIRST.ARG SK.DELETE.UNDO))
 
 
 
@@ -4103,85 +4105,85 @@ It can be either larger or smaller than the present window size.")
 (ADDTOVAR LAMA
 STATUSPRINT)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (9788 14089 (SK.FONTNAMELIST 9798 . 10020) (SCALE.REGION.OUT 10022 . 11003) (
-SK.SCALE.POSITION.INTO.VIEWER 11005 . 11761) (SK.SCALE.POSITION.INTO.VIEWER.EXACT 11763 . 12305) (
-SK.MAKE.POSITION.INTEGER 12307 . 12975) (SCALE.POSITION.INTO.SKETCHW 12977 . 13369) (UNSCALE 13371 . 
-13499) (UNSCALE.REGION 13501 . 14087)) (14125 17823 (STATUSPRINT 14135 . 15497) (CLEARPROMPTWINDOW 
-15499 . 15906) (CLOSEPROMPTWINDOW 15908 . 16405) (MYGETPROMPTWINDOW 16407 . 17106) (PROMPT.GETINPUT 
-17108 . 17821)) (17881 28912 (SK.SEND.TO.BOTTOM 17891 . 18230) (SK.BRING.TO.TOP 18232 . 18600) (
-SK.SWITCH.PRIORITIES 18602 . 18928) (SK.SEL.AND.CHANGE.PRIORITY 18930 . 19498) (
-SK.SEL.AND.SWITCH.PRIORITIES 19500 . 21267) (SK.SORT.ELTS.BY.PRIORITY 21269 . 21990) (
-SK.SORT.GELTS.BY.PRIORITY 21992 . 22571) (SORT.CHANGESPECS.BY.NEW.PRIORITY 22573 . 23261) (
-SORT.CHANGESPECS.BY.OLD.PRIORITY 23263 . 23951) (SK.SEND.ELEMENTS.TO.BOTTOM 23953 . 25624) (
-SK.BRING.ELEMENTS.TO.TOP 25626 . 27310) (SK.COPY.GLOBAL.ELEMENT.AND.PROPERTY.LIST 27312 . 28910)) (
-28913 31769 (SK.ELEMENT.PRIORITY 28923 . 29251) (SK.SET.ELEMENT.PRIORITY 29253 . 30197) (
-SK.POP.NEXT.PRIORITY 30199 . 30542) (SK.PRIORITY.CELL 30544 . 30749) (SK.HIGH.PRIORITY 30751 . 31254) 
-(SK.LOW.PRIORITY 31256 . 31767)) (31832 38635 (DRAW.LOCAL.SKETCH 31842 . 32844) (SET.PRIORITYIMPORTANT
- 32846 . 33414) (SK.FIGUREIMAGE 33416 . 38633)) (38679 57353 (SKETCHW.HARDCOPYFN 38689 . 45894) (
-SK.LIST.IMAGE 45896 . 57003) (SK.HARDCOPYIMAGEW 57005 . 57351)) (57354 59311 (
-SK.DO.HARDCOPYIMAGEW.TOFILE 57364 . 58038) (SK.HARDCOPYIMAGEW.TOFILE 58040 . 58402) (
-SK.HARDCOPYIMAGEW.TOPRINTER 58404 . 58766) (SK.LIST.IMAGE.ON.FILE 58768 . 59309)) (59312 67236 (
-\SK.LIST.PAGE.IMAGE 59322 . 61754) (SK.GetImageFile 61756 . 62686) (SK.PRINTER.FILE.CANDIDATE.NAME 
-62688 . 63607) (SK.SET.HARDCOPY.MODE 63609 . 64994) (SK.UNSET.HARDCOPY.MODE 64996 . 65414) (
-SK.UPDATE.AFTER.HARDCOPY 65416 . 66124) (DEFAULTPRINTINGIMAGETYPE 66126 . 66716) (
-SK.SWITCH.REGION.X.AND.Y 66718 . 67234)) (67474 80371 (SK.SEL.AND.TRANSFORM 67484 . 67834) (
-SK.TRANSFORM.ELEMENTS 67836 . 69091) (SK.TRANSFORM.ITEM 69093 . 69894) (SK.TRANSFORM.ELEMENT 69896 . 
-70354) (SK.TRANSFORM.POINT 70356 . 70706) (SK.TRANSFORM.POINT.LIST 70708 . 70929) (SK.TRANSFORM.REGION
- 70931 . 73117) (SK.PUT.ELTS.ON.GRID 73119 . 73597) (SK.TRANSFORM.GLOBAL.ELEMENTS 73599 . 74101) (
-GLOBALELEMENTP 74103 . 74394) (SKETCH.LIST.OF.ELEMENTSP 74396 . 74700) (SK.TRANSFORM.SCALE.FACTOR 
-74702 . 76395) (SK.TRANSFORM.BRUSH 76397 . 76864) (SK.TRANSFORM.ARROWHEADS 76866 . 78457) (SCALE.BRUSH
- 78459 . 80369)) (80372 100564 (TWO.PT.TRANSFORMATION.INPUTFN 80382 . 83155) (SK.TWO.PT.TRANSFORM.ELTS
- 83157 . 83562) (SK.SEL.AND.TWO.PT.TRANSFORM 83564 . 84155) (SK.APPLY.AFFINE.TRANSFORM 84157 . 85276) 
-(SK.COMPUTE.TWO.PT.TRANSFORMATION 85278 . 89616) (SK.COMPUTE.SLOPE 89618 . 90383) (
-SK.THREE.PT.TRANSFORM.ELTS 90385 . 90796) (SK.COMPUTE.THREE.PT.TRANSFORMATION 90798 . 95335) (
-SK.SEL.AND.THREE.PT.TRANSFORM 95337 . 95934) (THREE.PT.TRANSFORMATION.INPUTFN 95936 . 100562)) (100565
- 104592 (SK.COPY.AND.TWO.PT.TRANSFORM.ELTS 100575 . 100994) (SK.SEL.COPY.AND.TWO.PT.TRANSFORM 100996
- . 101617) (SK.COPY.AND.THREE.PT.TRANSFORM.ELTS 101619 . 102048) (SK.SEL.COPY.AND.THREE.PT.TRANSFORM 
-102050 . 102674) (SK.COPY.AND.TRANSFORM.ELEMENTS 102676 . 103720) (SK.COPY.AND.TRANSFORM.ITEM 103722
- . 104590)) (106720 109915 (SK.SHOWMARKS 106730 . 107630) (MARKPOINT 107632 . 108352) (SK.MARKHOTSPOTS
- 108354 . 109429) (SK.MARK.SELECTION 109431 . 109913)) (110444 117222 (SK.SELECT.ITEM 110454 . 113114)
- (IN.SKETCH.ELT? 113116 . 115502) (SK.MARK.HOTSPOT 115504 . 115986) (SK.MARK.POSITION 115988 . 116425)
- (SK.SELECT.ELT 116427 . 116854) (SK.DESELECT.ELT 116856 . 117220)) (117365 130179 (SK.HOTSPOT.CACHE 
-117375 . 117719) (SK.HOTSPOT.CACHE.FOR.OPERATION 117721 . 119076) (SK.BUILD.CACHE 119078 . 119901) (
-SK.ELEMENT.PROTECTED? 119903 . 120496) (SK.HAS.SOME.HOTSPOTS 120498 . 120952) (SK.SET.HOTSPOT.CACHE 
-120954 . 121309) (SK.CREATE.HOTSPOT.CACHE 121311 . 121761) (SK.ELTS.FROM.HOTSPOT 121763 . 122603) (
-SK.ADD.HOTSPOTS.TO.CACHE 122605 . 123006) (SK.ADD.HOTSPOTS.TO.CACHE1 123008 . 123554) (
-SK.ADD.HOTSPOT.TO.CACHE 123556 . 125432) (SK.REMOVE.HOTSPOTS.FROM.CACHE 125434 . 125837) (
-SK.REMOVE.HOTSPOTS.FROM.CACHE1 125839 . 126357) (SK.REMOVE.HOTSPOT.FROM.CACHE 126359 . 126922) (
-SK.REMOVE.VALUE.FROM.CACHE.BUCKET 126924 . 127893) (SK.FIND.CACHE.BUCKET 127895 . 128484) (
-SK.ADD.VALUE.TO.CACHE.BUCKET 128486 . 130177)) (130207 149650 (SK.SET.GRID 130217 . 130638) (
-SK.DISPLAY.GRID 130640 . 131189) (SK.DISPLAY.GRID.POINTS 131191 . 131387) (SK.REMOVE.GRID.POINTS 
-131389 . 132192) (SK.TAKE.DOWN.GRID 132194 . 132505) (SK.SHOW.GRID 132507 . 136121) (SK.GRIDFACTOR 
-136123 . 136644) (SK.TURN.GRID.ON 136646 . 136974) (SK.TURN.GRID.OFF 136976 . 137334) (
-SK.MAKE.GRID.LARGER 137336 . 138068) (SK.MAKE.GRID.SMALLER 138070 . 138823) (SK.CHANGE.GRID 138825 . 
-139273) (GRID.FACTOR1 139275 . 139632) (LEASTPOWEROF2GT 139634 . 140408) (GREATESTPOWEROF2LT 140410 . 
-141025) (SK.DEFAULT.GRIDFACTOR 141027 . 141580) (SK.PUT.ON.GRID 141582 . 142140) (MAP.WINDOW.ONTO.GRID
- 142142 . 142576) (MAP.SCREEN.ONTO.GRID 142578 . 143066) (MAP.GLOBAL.PT.ONTO.GRID 143068 . 143450) (
-MAP.GLOBAL.REGION.ONTO.GRID 143452 . 145169) (MAP.WINDOW.POINT.ONTO.GLOBAL.GRID 145171 . 145714) (
-MAP.WINDOW.ONTO.GLOBAL.GRID 145716 . 146101) (SK.UPDATE.GRIDFACTOR 146103 . 146739) (
-SK.MAP.FROM.WINDOW.TO.GLOBAL.GRID 146741 . 147279) (SK.MAP.INPUT.PT.TO.GLOBAL 147281 . 148498) (
-SK.MAP.FROM.WINDOW.TO.NEAREST.GRID 148500 . 149648)) (149790 158213 (SK.ADD.HISTEVENT 149800 . 150935)
- (SK.SEL.AND.UNDO 150937 . 153851) (SK.UNDO.LAST 153853 . 155930) (SK.UNDO.NAME 155932 . 156436) (
-SKEVENTTYPEFNS 156438 . 156788) (SK.TYPE.OF.FIRST.ARG 156790 . 158211)) (158214 158900 (SK.DELETE.UNDO
- 158224 . 158653) (SK.ADD.UNDO 158655 . 158898)) (158901 165683 (SK.CHANGE.UNDO 158911 . 160894) (
-SK.ELT.IN.SKETCH? 160896 . 161150) (SK.CHANGE.REDO 161152 . 163020) (SK.MOVE.UNDO 163022 . 164415) (
-SK.MOVE.REDO 164417 . 165681)) (165684 167783 (SK.UNDO.UNDO 165694 . 166960) (SK.UNDO.MENULABEL 166962
- . 167357) (SK.LABEL.FROM.TYPE 167359 . 167781)) (168609 176451 (SHOW.GLOBAL.COORDS 168619 . 169168) (
-LOCATOR.CLOSEFN 169170 . 169455) (SKETCHW.FROM.LOCATOR 169457 . 169865) (SKETCHW.UPDATE.LOCATORS 
-169867 . 170453) (LOCATOR.UPDATE 170455 . 171213) (UPDATE.GLOBAL.LOCATOR 171215 . 172016) (
-UPDATE.GLOBALCOORD.LOCATOR 172018 . 172595) (ADD.GLOBAL.DISPLAY 172597 . 173514) (
-ADD.GLOBAL.GRIDDED.DISPLAY 173516 . 173775) (CREATE.GLOBAL.DISPLAYER 173777 . 174854) (
-UPDATE.GLOBAL.GRIDDED.COORD.LOCATOR 174856 . 176449)) (176658 189145 (DISPLAYREADCOLORHLSLEVELS 176668
- . 177504) (DISPLAYREADCOLORLEVEL 177506 . 178541) (DRAWREADCOLORBOX 178543 . 179532) (
-READ.CHANGE.COLOR 179534 . 179751) (READCOLOR1 179753 . 182667) (READCOLORCOMMANDMENUSELECTEDFN 182669
- . 183036) (READCOLOR2 183038 . 189143)) (189146 190605 (CREATE.CNS.MENU 189156 . 190603)) (190882 
-193592 (SK.ABSWXOFFSET 190892 . 191186) (SK.ABSWYOFFSET 191188 . 191482) (
-SK.UNSCALE.POSITION.FROM.VIEWER 191484 . 192053) (SK.SCALE.REGION 192055 . 193590)) (193631 208629 (
-VIEWER.SCALE 193641 . 193950) (SKETCH.ZOOM 193952 . 194987) (SAME.ASPECT.RATIO 194989 . 196353) (
-SKETCH.DO.ZOOM 196355 . 197560) (SKETCH.NEW.VIEW 197562 . 198077) (ZOOM.UPDATE.ELT 198079 . 198972) (
-SK.UPDATE.AFTER.SCALE.CHANGE 198974 . 200843) (SKETCH.AUTOZOOM 200845 . 205265) (
-SKETCH.GLOBAL.REGION.ZOOM 205267 . 208627)) (209266 221178 (SKETCH.HOME 209276 . 209803) (SK.FRAME.IT 
-209805 . 210397) (SK.FRAME.WINDOW.TO.SKETCH 210399 . 214245) (SK.MOVE.TO.VIEW 214247 . 215661) (
-SK.NAME.CURRENT.VIEW 215663 . 216773) (SKETCH.ADD.VIEW 216775 . 217868) (SK.RESTORE.VIEW 217870 . 
-219746) (SK.FORGET.VIEW 219748 . 221176)))))
+  (FILEMAP (NIL (9853 14154 (SK.FONTNAMELIST 9863 . 10085) (SCALE.REGION.OUT 10087 . 11068) (
+SK.SCALE.POSITION.INTO.VIEWER 11070 . 11826) (SK.SCALE.POSITION.INTO.VIEWER.EXACT 11828 . 12370) (
+SK.MAKE.POSITION.INTEGER 12372 . 13040) (SCALE.POSITION.INTO.SKETCHW 13042 . 13434) (UNSCALE 13436 . 
+13564) (UNSCALE.REGION 13566 . 14152)) (14190 17888 (STATUSPRINT 14200 . 15562) (CLEARPROMPTWINDOW 
+15564 . 15971) (CLOSEPROMPTWINDOW 15973 . 16470) (MYGETPROMPTWINDOW 16472 . 17171) (PROMPT.GETINPUT 
+17173 . 17886)) (17946 28977 (SK.SEND.TO.BOTTOM 17956 . 18295) (SK.BRING.TO.TOP 18297 . 18665) (
+SK.SWITCH.PRIORITIES 18667 . 18993) (SK.SEL.AND.CHANGE.PRIORITY 18995 . 19563) (
+SK.SEL.AND.SWITCH.PRIORITIES 19565 . 21332) (SK.SORT.ELTS.BY.PRIORITY 21334 . 22055) (
+SK.SORT.GELTS.BY.PRIORITY 22057 . 22636) (SORT.CHANGESPECS.BY.NEW.PRIORITY 22638 . 23326) (
+SORT.CHANGESPECS.BY.OLD.PRIORITY 23328 . 24016) (SK.SEND.ELEMENTS.TO.BOTTOM 24018 . 25689) (
+SK.BRING.ELEMENTS.TO.TOP 25691 . 27375) (SK.COPY.GLOBAL.ELEMENT.AND.PROPERTY.LIST 27377 . 28975)) (
+28978 31834 (SK.ELEMENT.PRIORITY 28988 . 29316) (SK.SET.ELEMENT.PRIORITY 29318 . 30262) (
+SK.POP.NEXT.PRIORITY 30264 . 30607) (SK.PRIORITY.CELL 30609 . 30814) (SK.HIGH.PRIORITY 30816 . 31319) 
+(SK.LOW.PRIORITY 31321 . 31832)) (31897 38700 (DRAW.LOCAL.SKETCH 31907 . 32909) (SET.PRIORITYIMPORTANT
+ 32911 . 33479) (SK.FIGUREIMAGE 33481 . 38698)) (38744 57418 (SKETCHW.HARDCOPYFN 38754 . 45959) (
+SK.LIST.IMAGE 45961 . 57068) (SK.HARDCOPYIMAGEW 57070 . 57416)) (57419 59376 (
+SK.DO.HARDCOPYIMAGEW.TOFILE 57429 . 58103) (SK.HARDCOPYIMAGEW.TOFILE 58105 . 58467) (
+SK.HARDCOPYIMAGEW.TOPRINTER 58469 . 58831) (SK.LIST.IMAGE.ON.FILE 58833 . 59374)) (59377 67301 (
+\SK.LIST.PAGE.IMAGE 59387 . 61819) (SK.GetImageFile 61821 . 62751) (SK.PRINTER.FILE.CANDIDATE.NAME 
+62753 . 63672) (SK.SET.HARDCOPY.MODE 63674 . 65059) (SK.UNSET.HARDCOPY.MODE 65061 . 65479) (
+SK.UPDATE.AFTER.HARDCOPY 65481 . 66189) (DEFAULTPRINTINGIMAGETYPE 66191 . 66781) (
+SK.SWITCH.REGION.X.AND.Y 66783 . 67299)) (67539 80436 (SK.SEL.AND.TRANSFORM 67549 . 67899) (
+SK.TRANSFORM.ELEMENTS 67901 . 69156) (SK.TRANSFORM.ITEM 69158 . 69959) (SK.TRANSFORM.ELEMENT 69961 . 
+70419) (SK.TRANSFORM.POINT 70421 . 70771) (SK.TRANSFORM.POINT.LIST 70773 . 70994) (SK.TRANSFORM.REGION
+ 70996 . 73182) (SK.PUT.ELTS.ON.GRID 73184 . 73662) (SK.TRANSFORM.GLOBAL.ELEMENTS 73664 . 74166) (
+GLOBALELEMENTP 74168 . 74459) (SKETCH.LIST.OF.ELEMENTSP 74461 . 74765) (SK.TRANSFORM.SCALE.FACTOR 
+74767 . 76460) (SK.TRANSFORM.BRUSH 76462 . 76929) (SK.TRANSFORM.ARROWHEADS 76931 . 78522) (SCALE.BRUSH
+ 78524 . 80434)) (80437 100629 (TWO.PT.TRANSFORMATION.INPUTFN 80447 . 83220) (SK.TWO.PT.TRANSFORM.ELTS
+ 83222 . 83627) (SK.SEL.AND.TWO.PT.TRANSFORM 83629 . 84220) (SK.APPLY.AFFINE.TRANSFORM 84222 . 85341) 
+(SK.COMPUTE.TWO.PT.TRANSFORMATION 85343 . 89681) (SK.COMPUTE.SLOPE 89683 . 90448) (
+SK.THREE.PT.TRANSFORM.ELTS 90450 . 90861) (SK.COMPUTE.THREE.PT.TRANSFORMATION 90863 . 95400) (
+SK.SEL.AND.THREE.PT.TRANSFORM 95402 . 95999) (THREE.PT.TRANSFORMATION.INPUTFN 96001 . 100627)) (100630
+ 104657 (SK.COPY.AND.TWO.PT.TRANSFORM.ELTS 100640 . 101059) (SK.SEL.COPY.AND.TWO.PT.TRANSFORM 101061
+ . 101682) (SK.COPY.AND.THREE.PT.TRANSFORM.ELTS 101684 . 102113) (SK.SEL.COPY.AND.THREE.PT.TRANSFORM 
+102115 . 102739) (SK.COPY.AND.TRANSFORM.ELEMENTS 102741 . 103785) (SK.COPY.AND.TRANSFORM.ITEM 103787
+ . 104655)) (106785 109980 (SK.SHOWMARKS 106795 . 107695) (MARKPOINT 107697 . 108417) (SK.MARKHOTSPOTS
+ 108419 . 109494) (SK.MARK.SELECTION 109496 . 109978)) (110509 117287 (SK.SELECT.ITEM 110519 . 113179)
+ (IN.SKETCH.ELT? 113181 . 115567) (SK.MARK.HOTSPOT 115569 . 116051) (SK.MARK.POSITION 116053 . 116490)
+ (SK.SELECT.ELT 116492 . 116919) (SK.DESELECT.ELT 116921 . 117285)) (117430 130244 (SK.HOTSPOT.CACHE 
+117440 . 117784) (SK.HOTSPOT.CACHE.FOR.OPERATION 117786 . 119141) (SK.BUILD.CACHE 119143 . 119966) (
+SK.ELEMENT.PROTECTED? 119968 . 120561) (SK.HAS.SOME.HOTSPOTS 120563 . 121017) (SK.SET.HOTSPOT.CACHE 
+121019 . 121374) (SK.CREATE.HOTSPOT.CACHE 121376 . 121826) (SK.ELTS.FROM.HOTSPOT 121828 . 122668) (
+SK.ADD.HOTSPOTS.TO.CACHE 122670 . 123071) (SK.ADD.HOTSPOTS.TO.CACHE1 123073 . 123619) (
+SK.ADD.HOTSPOT.TO.CACHE 123621 . 125497) (SK.REMOVE.HOTSPOTS.FROM.CACHE 125499 . 125902) (
+SK.REMOVE.HOTSPOTS.FROM.CACHE1 125904 . 126422) (SK.REMOVE.HOTSPOT.FROM.CACHE 126424 . 126987) (
+SK.REMOVE.VALUE.FROM.CACHE.BUCKET 126989 . 127958) (SK.FIND.CACHE.BUCKET 127960 . 128549) (
+SK.ADD.VALUE.TO.CACHE.BUCKET 128551 . 130242)) (130272 149715 (SK.SET.GRID 130282 . 130703) (
+SK.DISPLAY.GRID 130705 . 131254) (SK.DISPLAY.GRID.POINTS 131256 . 131452) (SK.REMOVE.GRID.POINTS 
+131454 . 132257) (SK.TAKE.DOWN.GRID 132259 . 132570) (SK.SHOW.GRID 132572 . 136186) (SK.GRIDFACTOR 
+136188 . 136709) (SK.TURN.GRID.ON 136711 . 137039) (SK.TURN.GRID.OFF 137041 . 137399) (
+SK.MAKE.GRID.LARGER 137401 . 138133) (SK.MAKE.GRID.SMALLER 138135 . 138888) (SK.CHANGE.GRID 138890 . 
+139338) (GRID.FACTOR1 139340 . 139697) (LEASTPOWEROF2GT 139699 . 140473) (GREATESTPOWEROF2LT 140475 . 
+141090) (SK.DEFAULT.GRIDFACTOR 141092 . 141645) (SK.PUT.ON.GRID 141647 . 142205) (MAP.WINDOW.ONTO.GRID
+ 142207 . 142641) (MAP.SCREEN.ONTO.GRID 142643 . 143131) (MAP.GLOBAL.PT.ONTO.GRID 143133 . 143515) (
+MAP.GLOBAL.REGION.ONTO.GRID 143517 . 145234) (MAP.WINDOW.POINT.ONTO.GLOBAL.GRID 145236 . 145779) (
+MAP.WINDOW.ONTO.GLOBAL.GRID 145781 . 146166) (SK.UPDATE.GRIDFACTOR 146168 . 146804) (
+SK.MAP.FROM.WINDOW.TO.GLOBAL.GRID 146806 . 147344) (SK.MAP.INPUT.PT.TO.GLOBAL 147346 . 148563) (
+SK.MAP.FROM.WINDOW.TO.NEAREST.GRID 148565 . 149713)) (149855 158278 (SK.ADD.HISTEVENT 149865 . 151000)
+ (SK.SEL.AND.UNDO 151002 . 153916) (SK.UNDO.LAST 153918 . 155995) (SK.UNDO.NAME 155997 . 156501) (
+SKEVENTTYPEFNS 156503 . 156853) (SK.TYPE.OF.FIRST.ARG 156855 . 158276)) (158279 158965 (SK.DELETE.UNDO
+ 158289 . 158718) (SK.ADD.UNDO 158720 . 158963)) (158966 165748 (SK.CHANGE.UNDO 158976 . 160959) (
+SK.ELT.IN.SKETCH? 160961 . 161215) (SK.CHANGE.REDO 161217 . 163085) (SK.MOVE.UNDO 163087 . 164480) (
+SK.MOVE.REDO 164482 . 165746)) (165749 167848 (SK.UNDO.UNDO 165759 . 167025) (SK.UNDO.MENULABEL 167027
+ . 167422) (SK.LABEL.FROM.TYPE 167424 . 167846)) (168698 176540 (SHOW.GLOBAL.COORDS 168708 . 169257) (
+LOCATOR.CLOSEFN 169259 . 169544) (SKETCHW.FROM.LOCATOR 169546 . 169954) (SKETCHW.UPDATE.LOCATORS 
+169956 . 170542) (LOCATOR.UPDATE 170544 . 171302) (UPDATE.GLOBAL.LOCATOR 171304 . 172105) (
+UPDATE.GLOBALCOORD.LOCATOR 172107 . 172684) (ADD.GLOBAL.DISPLAY 172686 . 173603) (
+ADD.GLOBAL.GRIDDED.DISPLAY 173605 . 173864) (CREATE.GLOBAL.DISPLAYER 173866 . 174943) (
+UPDATE.GLOBAL.GRIDDED.COORD.LOCATOR 174945 . 176538)) (176747 189234 (DISPLAYREADCOLORHLSLEVELS 176757
+ . 177593) (DISPLAYREADCOLORLEVEL 177595 . 178630) (DRAWREADCOLORBOX 178632 . 179621) (
+READ.CHANGE.COLOR 179623 . 179840) (READCOLOR1 179842 . 182756) (READCOLORCOMMANDMENUSELECTEDFN 182758
+ . 183125) (READCOLOR2 183127 . 189232)) (189235 190694 (CREATE.CNS.MENU 189245 . 190692)) (190971 
+193681 (SK.ABSWXOFFSET 190981 . 191275) (SK.ABSWYOFFSET 191277 . 191571) (
+SK.UNSCALE.POSITION.FROM.VIEWER 191573 . 192142) (SK.SCALE.REGION 192144 . 193679)) (193720 208718 (
+VIEWER.SCALE 193730 . 194039) (SKETCH.ZOOM 194041 . 195076) (SAME.ASPECT.RATIO 195078 . 196442) (
+SKETCH.DO.ZOOM 196444 . 197649) (SKETCH.NEW.VIEW 197651 . 198166) (ZOOM.UPDATE.ELT 198168 . 199061) (
+SK.UPDATE.AFTER.SCALE.CHANGE 199063 . 200932) (SKETCH.AUTOZOOM 200934 . 205354) (
+SKETCH.GLOBAL.REGION.ZOOM 205356 . 208716)) (209355 221267 (SKETCH.HOME 209365 . 209892) (SK.FRAME.IT 
+209894 . 210486) (SK.FRAME.WINDOW.TO.SKETCH 210488 . 214334) (SK.MOVE.TO.VIEW 214336 . 215750) (
+SK.NAME.CURRENT.VIEW 215752 . 216862) (SKETCH.ADD.VIEW 216864 . 217957) (SK.RESTORE.VIEW 217959 . 
+219835) (SK.FORGET.VIEW 219837 . 221265)))))
 STOP

library/sketch/SKETCH-STREAM

@@ -1,25 +1,24 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-
(FILECREATED "12-Jun-90 15:21:13" {DSK}<usr>local>lde>lispcore>library>SKETCHSTREAM.;2
 34014  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (VARS SKETCHSTREAMCOMS)
+
(FILECREATED " 5-Dec-2023 00:44:59" {WMEDLEY}<library>sketch>SKETCH-STREAM.;1
 33784  
 
-      previous date%: "17-Aug-88 12:36:19" {DSK}<usr>local>lde>lispcore>library>SKETCHSTREAM.;1)
+      :EDIT-BY rmk
+
+      :CHANGES-TO (FNS OPENSKETCHSTREAM)
+
+      :PREVIOUS-DATE "12-Jun-90 15:21:13" {WMEDLEY}<library>sketch>SKETCHSTREAM.;1)
 
 
-(* ; "
-Copyright (c) 1984, 1985, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights reserved.
-")
+(PRETTYCOMPRINT SKETCH-STREAMCOMS)
 
-(PRETTYCOMPRINT SKETCHSTREAMCOMS)
-
-(RPAQQ SKETCHSTREAMCOMS

+(RPAQQ SKETCH-STREAMCOMS

        [
-        (* ;; "contains the functions needed to support sketch streams.  Sketch streams allow a user program to print, draw, etc.  to a stream and builds a sketch of the result.")

+        (* ;; "contains the functions needed to support sketch streams.  Sketch streams allow a user program to print, draw, etc.  to a stream and builds a sketch of the result.")

 
         (FNS OPENSKETCHSTREAM \SKETCHSTREAM.POSITION.CHANGED \SKETCHSTREAMINIT \SK.SET.FONT 
              \SKSTRM.WINDOW.FROM.STREAM ZOOM.SKETCH.STREAM)
-                                                             (* ; 
-
                                                     "fns to support stream operations on sketches")

+                                                             (* ; 
+
                                                       "fns to support stream operations on sketches")

         (FNS \DSPFONT.SKETCH \DSPLEFTMARGIN.SKETCH \DSPRIGHTMARGIN.SKETCH \DSPLINEFEED.SKETCH 
              \DSPXPOSITION.SKETCH \DSPYPOSITION.SKETCH \DRAWCURVE.SKETCH \DRAWCIRCLE.SKETCH 
              \FILLCIRCLE.SKETCH \FILLPOLYGON.SKETCH \DRAWELLIPSE.SKETCH \DRAWARC.SKETCH 
@@ -40,20 +39,20 @@ Copyright (c) 1984, 1985, 1987, 1988, 1990 by Venue & Xerox Corporation.  All ri
 (DEFINEQ
 
 (OPENSKETCHSTREAM

-  [LAMBDA (TITLE OPTIONS)
                                    (* rrb "20-Dec-84 12:12")

-          
-          (* opens a stream onto a window that will keep a sketch of what is displayed 
-
          there.)

-          
-          (* changes default alignment to left baseline and default font to the default 
-
          font of display device.)

+  [LAMBDA (TITLE OPTIONS)                                    (* rrb "20-Dec-84 12:12")

+
+         (* opens a stream onto a window that will keep a sketch of what is displayed 
+
         there.)

+
+         (* changes default alignment to left baseline and default font to the default 
+
         font of display device.)

 
     (PROG ((SKW (SKETCHW.CREATE NIL (LISTGET OPTIONS 'SKETCHREGION)
                        (LISTGET OPTIONS 'REGION)
                        TITLE)))
-          
-          (* changes default alignment to left baseline and default font to the default 
-
          font of display device.)

+
+         (* changes default alignment to left baseline and default font to the default 
+
         font of display device.)

 
           (SK.SET.TEXT.HORIZ.ALIGN SKW 'LEFT)
           [SK.SET.FONT SKW (FONTNAMELIST (DEFAULTFONT 'DISPLAY]
@@ -565,7 +564,7 @@ Copyright (c) 1984, 1985, 1987, 1988, 1990 by Venue & Xerox Corporation.  All ri
 )
 
 (ADDTOVAR IMAGESTREAMTYPES
 (SKETCH (OPENSTREAM OPENSKETCHSTREAM)
-                                      (FONTCREATE \CREATEDISPLAYFONT)))
+                                  (FONTCREATE \CREATEDISPLAYFONT)))
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS SketchFDEV)
@@ -574,18 +573,17 @@ Copyright (c) 1984, 1985, 1987, 1988, 1990 by Venue & Xerox Corporation.  All ri
 
 (\SKETCHSTREAMINIT
)
 )
-(PUTPROPS SKETCHSTREAM COPYRIGHT ("Venue & Xerox Corporation" 1984 1985 1987 1988 1990))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1917 9341 (OPENSKETCHSTREAM 1927 . 3074) (\SKETCHSTREAM.POSITION.CHANGED 3076 . 3368) (
-\SKETCHSTREAMINIT 3370 . 7936) (\SK.SET.FONT 7938 . 8436) (\SKSTRM.WINDOW.FROM.STREAM 8438 . 8697) (
-ZOOM.SKETCH.STREAM 8699 . 9339)) (9403 33638 (\DSPFONT.SKETCH 9413 . 10185) (\DSPLEFTMARGIN.SKETCH 
-10187 . 10581) (\DSPRIGHTMARGIN.SKETCH 10583 . 10980) (\DSPLINEFEED.SKETCH 10982 . 11370) (
-\DSPXPOSITION.SKETCH 11372 . 11917) (\DSPYPOSITION.SKETCH 11919 . 12464) (\DRAWCURVE.SKETCH 12466 . 
-12999) (\DRAWCIRCLE.SKETCH 13001 . 14207) (\FILLCIRCLE.SKETCH 14209 . 15621) (\FILLPOLYGON.SKETCH 
-15623 . 16733) (\DRAWELLIPSE.SKETCH 16735 . 18829) (\DRAWARC.SKETCH 18831 . 20892) (\DRAWLINE.SKETCH 
-20894 . 22004) (\BOUT.SKETCH 22006 . 22975) (\DSPCOLOR.SKETCH 22977 . 23336) (\DSPBACKCOLOR.SKETCH 
-23338 . 23716) (\DSPOPERATION.SKETCH 23718 . 24093) (\STRINGWIDTH.SKETCH 24095 . 24738) (
-\BLTSHADE.1BITSKETCH 24740 . 25669) (\NEWPAGE.SKETCH 25671 . 26151) (\CHARWIDTH.SKETCH 26153 . 26792) 
-(\BITBLT.1BITSKETCH 26794 . 28415) (\DSPCLIPPINGREGION.SKETCH 28417 . 28944) (\DSPRESET.SKETCH 28946
- . 30515) (\DSPSCALE.SKETCH 30517 . 33121) (\DRAWPOLYGON.SKETCH 33123 . 33636)))))
+  (FILEMAP (NIL (1820 9204 (OPENSKETCHSTREAM 1830 . 2937) (\SKETCHSTREAM.POSITION.CHANGED 2939 . 3231) (
+\SKETCHSTREAMINIT 3233 . 7799) (\SK.SET.FONT 7801 . 8299) (\SKSTRM.WINDOW.FROM.STREAM 8301 . 8560) (
+ZOOM.SKETCH.STREAM 8562 . 9202)) (9266 33501 (\DSPFONT.SKETCH 9276 . 10048) (\DSPLEFTMARGIN.SKETCH 
+10050 . 10444) (\DSPRIGHTMARGIN.SKETCH 10446 . 10843) (\DSPLINEFEED.SKETCH 10845 . 11233) (
+\DSPXPOSITION.SKETCH 11235 . 11780) (\DSPYPOSITION.SKETCH 11782 . 12327) (\DRAWCURVE.SKETCH 12329 . 
+12862) (\DRAWCIRCLE.SKETCH 12864 . 14070) (\FILLCIRCLE.SKETCH 14072 . 15484) (\FILLPOLYGON.SKETCH 
+15486 . 16596) (\DRAWELLIPSE.SKETCH 16598 . 18692) (\DRAWARC.SKETCH 18694 . 20755) (\DRAWLINE.SKETCH 
+20757 . 21867) (\BOUT.SKETCH 21869 . 22838) (\DSPCOLOR.SKETCH 22840 . 23199) (\DSPBACKCOLOR.SKETCH 
+23201 . 23579) (\DSPOPERATION.SKETCH 23581 . 23956) (\STRINGWIDTH.SKETCH 23958 . 24601) (
+\BLTSHADE.1BITSKETCH 24603 . 25532) (\NEWPAGE.SKETCH 25534 . 26014) (\CHARWIDTH.SKETCH 26016 . 26655) 
+(\BITBLT.1BITSKETCH 26657 . 28278) (\DSPCLIPPINGREGION.SKETCH 28280 . 28807) (\DSPRESET.SKETCH 28809
+ . 30378) (\DSPSCALE.SKETCH 30380 . 32984) (\DRAWPOLYGON.SKETCH 32986 . 33499)))))
 STOP

lispusers/COURIERIMAGESTREAM

@@ -1,19 +1,18 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-
(FILECREATED "20-Jul-88 10:15:36" |{MCS:MCS:STANFORD}<LANE>COURIERIMAGESTREAM.;7|
 49756  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (VARS COURIERIMAGESTREAMCOMS)
-                    (FNS \BITBLT.COURIER \SCALEDBITBLT.COURIER \COURIER.OPENIMAGESTREAM)
+
(FILECREATED " 8-Dec-2023 21:36:09" {WMEDLEY}<lispusers>COURIERIMAGESTREAM.;2
 49263  
 
-      previous date%: "16-Sep-87 17:41:23" |{MCS:MCS:STANFORD}<LANE>COURIERIMAGESTREAM.;5|)
+      :EDIT-BY rmk
 
+      :CHANGES-TO (FNS \INITCOURIERIMAGESTREAM)
+                  (VARS COURIERIMAGESTREAMCOMS)
+
+      :PREVIOUS-DATE "20-Jul-88 10:15:36" {WMEDLEY}<lispusers>COURIERIMAGESTREAM.;1)
 
-(* "
-Copyright (c) 1985, 1986, 1987, 1988 by Xerox Corporation & Stanford University.  All rights reserved.
-")
 
 (PRETTYCOMPRINT COURIERIMAGESTREAMCOMS)
 
-(RPAQQ COURIERIMAGESTREAMCOMS
 
+(RPAQQ COURIERIMAGESTREAMCOMS

        ((* * ImageOp Functions)
         (FNS \BACKCOLOR.COURIER \BITBLT.COURIER \BLTSHADE.COURIER \BOTTOMMARGIN.COURIER 
              \CHARSET.COURIER \CHARWIDTH.COURIER \CHARWIDTHY.COURIER \CLIPPINGREGION.COURIER 
@@ -28,16 +27,16 @@ Copyright (c) 1985, 1986, 1987, 1988 by Xerox Corporation & Stanford University.
              \YPOSITION.COURIER \OUTCHAR.COURIER)
         (* * Courier Server Functions)
         (FNS \COURIER.BACKCOLOR \COURIER.BITBLT \COURIER.BLTSHADE \COURIER.BOTTOMMARGIN 
-             \COURIER.CHARSET \COURIER.CHARWIDTH \COURIER.CHARWIDTHY \COURIER.CLIPPINGREGION 
-             \COURIER.CLOSEIMAGESTREAM \COURIER.COLOR \COURIER.DEFAULTSTATE \COURIER.DRAWARC 
-             \COURIER.DRAWCIRCLE \COURIER.DRAWCURVE \COURIER.DRAWELLIPSE \COURIER.DRAWLINE 
-             \COURIER.DRAWPOINT \COURIER.DRAWPOLYGON \COURIER.FILLCIRCLE \COURIER.FILLPOLYGON 
-             \COURIER.FONT \COURIER.FONTTYPE \COURIER.LEFTMARGIN \COURIER.LINEFEED \COURIER.MOVETO 
-             \COURIER.NEWPAGE \COURIER.OPERATION \COURIER.OPENIMAGESTREAM \COURIER.OUTCHAR 
-             \COURIER.POPSTATE \COURIER.PUSHSTATE \COURIER.RESET \COURIER.RIGHTMARGIN \COURIER.ROTATE
-             \COURIER.SCALE \COURIER.SCALEDBITBLT \COURIER.SCALE2 \COURIER.SPACEFACTOR 
-             \COURIER.STRINGWIDTH \COURIER.TERPRI \COURIER.TOPMARGIN \COURIER.TRANSLATE 
-             \COURIER.XPOSITION \COURIER.YPOSITION)
+             \COURIER.CHARWIDTH \COURIER.CHARWIDTHY \COURIER.CLIPPINGREGION \COURIER.CLOSEIMAGESTREAM
+             \COURIER.COLOR \COURIER.DEFAULTSTATE \COURIER.DRAWARC \COURIER.DRAWCIRCLE 
+             \COURIER.DRAWCURVE \COURIER.DRAWELLIPSE \COURIER.DRAWLINE \COURIER.DRAWPOINT 
+             \COURIER.DRAWPOLYGON \COURIER.FILLCIRCLE \COURIER.FILLPOLYGON \COURIER.FONT 
+             \COURIER.FONTTYPE \COURIER.LEFTMARGIN \COURIER.LINEFEED \COURIER.MOVETO \COURIER.NEWPAGE
+             \COURIER.OPERATION \COURIER.OPENIMAGESTREAM \COURIER.OUTCHAR \COURIER.POPSTATE 
+             \COURIER.PUSHSTATE \COURIER.RESET \COURIER.RIGHTMARGIN \COURIER.ROTATE \COURIER.SCALE 
+             \COURIER.SCALEDBITBLT \COURIER.SCALE2 \COURIER.SPACEFACTOR \COURIER.STRINGWIDTH 
+             \COURIER.TERPRI \COURIER.TOPMARGIN \COURIER.TRANSLATE \COURIER.XPOSITION 
+             \COURIER.YPOSITION)
         (* * etc.)
         (FNS \INITCOURIERIMAGESTREAM READSTREAMHANDLE WRITESTREAMHANDLE)
         (INITVARS \COURIERIMAGEOPS \NULLFDEV IMAGESTREAMALST)
@@ -398,11 +397,6 @@ Copyright (c) 1985, 1986, 1987, 1988 by Xerox Corporation & Stanford University.
                                                              (* ; "Edited 24-Mar-87 20:54 by cdl")

     `(RETURN ,(IMAGEOP 'IMBOTTOMMARGIN IMAGESTREAM IMAGESTREAM YPOSITION])
 
-(\COURIER.CHARSET

-  [LAMBDA (COURIERSTREAM PROGRAM PROCEDURE IMAGESTREAM CHARACTERSET)

-                                                             (* ; "Edited 24-Mar-87 20:54 by cdl")

-    `(RETURN ,(IMAGEOP 'IMCHARSET IMAGESTREAM IMAGESTREAM CHARACTERSET])
-
 (\COURIER.CHARWIDTH

   [LAMBDA (COURIERSTREAM PROGRAM PROCEDURE IMAGESTREAM CHARCODE)

                                                              (* ; "Edited 24-Mar-87 20:55 by cdl")

@@ -658,7 +652,8 @@ Copyright (c) 1985, 1986, 1987, 1988 by Xerox Corporation & Stanford University.
 (DEFINEQ
 
 (\INITCOURIERIMAGESTREAM

-  [LAMBDA NIL
                                            (* ; "Edited  3-Sep-87 09:59 by cdl")

+  [LAMBDA NIL
                                                (* ; "Edited  8-Dec-2023 21:35 by rmk")


+                                                             (* ; "Edited  3-Sep-87 09:59 by cdl")

     (SETQ \COURIERIMAGEOPS (create
 IMAGEOPS
                                   IMAGETYPE _ 'COURIER
                                   IMCLOSEFN _ (FUNCTION \CLOSEFN.COURIER)
@@ -694,7 +689,6 @@ Copyright (c) 1985, 1986, 1987, 1988 by Xerox Corporation & Stanford University.
                                   IMCLIPPINGREGION _ (FUNCTION \CLIPPINGREGION.COURIER)
                                   IMOPERATION _ (FUNCTION \OPERATION.COURIER)
                                   IMSPACEFACTOR _ (FUNCTION \SPACEFACTOR.COURIER)
-                                  IMCHARSET _ (FUNCTION \CHARSET.COURIER)
                                   IMROTATE _ (FUNCTION \ROTATE.COURIER)
                                   IMDRAWARC _ (FUNCTION \DRAWARC.COURIER)
                                   IMTRANSLATE _ (FUNCTION \TRANSLATE.COURIER)
@@ -722,7 +716,7 @@ Copyright (c) 1985, 1986, 1987, 1988 by Xerox Corporation & Stanford University.
 
 (RPAQ? IMAGESTREAMALST
 NIL)
 
-(PUTPROPS STREAMHANDLE COURIERDEF
 (READSTREAMHANDLE WRITESTREAMHANDLE))
+(PUTPROPS STREAMHANDLE
 COURIERDEF
 (READSTREAMHANDLE WRITESTREAMHANDLE))
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS \COURIERIMAGEOPS \NULLFDEV IMAGESTREAMALST)
@@ -731,7 +725,7 @@ Copyright (c) 1985, 1986, 1987, 1988 by Xerox Corporation & Stanford University.
 (DECLARE%: EVAL@COMPILE
 
 (RECORD COURIERIMAGEDATA
 (CIS.COURIERSTREAM CIS.IMAGESTREAM CIS.FONT CIS.LOCALFONTS?)
-                             CIS.LOCALFONTS? _ T)
+                         CIS.LOCALFONTS? _ T)
 )
 )
 
@@ -973,40 +967,38 @@ Copyright (c) 1985, 1986, 1987, 1988 by Xerox Corporation & Stanford University.
 (\INITCOURIERIMAGESTREAM
)
 
 (COURIER.START.SERVER)
-(PUTPROPS COURIERIMAGESTREAM COPYRIGHT ("Xerox Corporation & Stanford University" 1985 1986 1987 1988)
-)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3228 21422 (\BACKCOLOR.COURIER 3238 . 3509) (\BITBLT.COURIER 3511 . 4553) (
-\BLTSHADE.COURIER 4555 . 5235) (\BOTTOMMARGIN.COURIER 5237 . 5518) (\CHARSET.COURIER 5520 . 5794) (
-\CHARWIDTH.COURIER 5796 . 6200) (\CHARWIDTHY.COURIER 6202 . 6609) (\CLIPPINGREGION.COURIER 6611 . 6893
-) (\CLOSEFN.COURIER 6895 . 7154) (\COLOR.COURIER 7156 . 7419) (\COURIERIMAGESTREAM.BOUT 7421 . 7695) (
-\DEFAULTSTATE.COURIER 7697 . 7980) (\DRAWARC.COURIER 7982 . 8399) (\DRAWCIRCLE.COURIER 8401 . 8724) (
-\DRAWCURVE.COURIER 8726 . 9036) (\DRAWELLIPSE.COURIER 9038 . 9496) (\DRAWLINE.COURIER 9498 . 9887) (
-\DRAWPOINT.COURIER 9889 . 10205) (\DRAWPOLYGON.COURIER 10207 . 10523) (\FILLCIRCLE.COURIER 10525 . 
-10842) (\FILLPOLYGON.COURIER 10844 . 11128) (\FONT.COURIER 11130 . 11537) (\LEFTMARGIN.COURIER 11539
- . 11816) (\LINEFEED.COURIER 11818 . 12088) (\MOVETO.COURIER 12090 . 12353) (\NEWPAGE.COURIER 12355 . 
-12616) (\OPENIMAGESTREAM.COURIER 12618 . 15192) (\OPERATION.COURIER 15194 . 15469) (\POPSTATE.COURIER 
-15471 . 15746) (\PUSHSTATE.COURIER 15748 . 16025) (\RESET.COURIER 16027 . 16360) (\RIGHTMARGIN.COURIER
- 16362 . 16641) (\ROTATE.COURIER 16643 . 16923) (\SCALE.COURIER 16925 . 17188) (\SCALEDBITBLT.COURIER 
-17190 . 18470) (\SCALE2.COURIER 18472 . 18747) (\SPACEFACTOR.COURIER 18749 . 19025) (
-\STRINGWIDTH.COURIER 19027 . 19433) (\TERPRI.COURIER 19435 . 19770) (\TOPMARGIN.COURIER 19772 . 20047)
- (\TRANSLATE.COURIER 20049 . 20330) (\XPOSITION.COURIER 20332 . 20607) (\YPOSITION.COURIER 20609 . 
-20884) (\OUTCHAR.COURIER 20886 . 21420)) (21460 35552 (\COURIER.BACKCOLOR 21470 . 21730) (
-\COURIER.BITBLT 21732 . 22252) (\COURIER.BLTSHADE 22254 . 22649) (\COURIER.BOTTOMMARGIN 22651 . 22925)
- (\COURIER.CHARSET 22927 . 23197) (\COURIER.CHARWIDTH 23199 . 23465) (\COURIER.CHARWIDTHY 23467 . 
-23735) (\COURIER.CLIPPINGREGION 23737 . 24009) (\COURIER.CLOSEIMAGESTREAM 24011 . 24630) (
-\COURIER.COLOR 24632 . 24884) (\COURIER.DEFAULTSTATE 24886 . 25132) (\COURIER.DRAWARC 25134 . 25508) (
-\COURIER.DRAWCIRCLE 25510 . 25850) (\COURIER.DRAWCURVE 25852 . 26194) (\COURIER.DRAWELLIPSE 26196 . 
-26666) (\COURIER.DRAWLINE 26668 . 27034) (\COURIER.DRAWPOINT 27036 . 27376) (\COURIER.DRAWPOLYGON 
-27378 . 27726) (\COURIER.FILLCIRCLE 27728 . 28056) (\COURIER.FILLPOLYGON 28058 . 28380) (\COURIER.FONT
- 28382 . 28630) (\COURIER.FONTTYPE 28632 . 28865) (\COURIER.LEFTMARGIN 28867 . 29137) (
-\COURIER.LINEFEED 29139 . 29399) (\COURIER.MOVETO 29401 . 29691) (\COURIER.NEWPAGE 29693 . 29917) (
-\COURIER.OPERATION 29919 . 30187) (\COURIER.OPENIMAGESTREAM 30189 . 31050) (\COURIER.OUTCHAR 31052 . 
-31332) (\COURIER.POPSTATE 31334 . 31572) (\COURIER.PUSHSTATE 31574 . 31814) (\COURIER.RESET 31816 . 
-32036) (\COURIER.RIGHTMARGIN 32038 . 32310) (\COURIER.ROTATE 32312 . 32578) (\COURIER.SCALE 32580 . 
-32832) (\COURIER.SCALEDBITBLT 32834 . 33366) (\COURIER.SCALE2 33368 . 33670) (\COURIER.SPACEFACTOR 
-33672 . 33938) (\COURIER.STRINGWIDTH 33940 . 34206) (\COURIER.TERPRI 34208 . 34430) (
-\COURIER.TOPMARGIN 34432 . 34700) (\COURIER.TRANSLATE 34702 . 35010) (\COURIER.XPOSITION 35012 . 35280
-) (\COURIER.YPOSITION 35282 . 35550)) (35570 39599 (\INITCOURIERIMAGESTREAM 35580 . 39043) (
-READSTREAMHANDLE 39045 . 39428) (WRITESTREAMHANDLE 39430 . 39597)))))
+  (FILEMAP (NIL (3073 21267 (\BACKCOLOR.COURIER 3083 . 3354) (\BITBLT.COURIER 3356 . 4398) (
+\BLTSHADE.COURIER 4400 . 5080) (\BOTTOMMARGIN.COURIER 5082 . 5363) (\CHARSET.COURIER 5365 . 5639) (
+\CHARWIDTH.COURIER 5641 . 6045) (\CHARWIDTHY.COURIER 6047 . 6454) (\CLIPPINGREGION.COURIER 6456 . 6738
+) (\CLOSEFN.COURIER 6740 . 6999) (\COLOR.COURIER 7001 . 7264) (\COURIERIMAGESTREAM.BOUT 7266 . 7540) (
+\DEFAULTSTATE.COURIER 7542 . 7825) (\DRAWARC.COURIER 7827 . 8244) (\DRAWCIRCLE.COURIER 8246 . 8569) (
+\DRAWCURVE.COURIER 8571 . 8881) (\DRAWELLIPSE.COURIER 8883 . 9341) (\DRAWLINE.COURIER 9343 . 9732) (
+\DRAWPOINT.COURIER 9734 . 10050) (\DRAWPOLYGON.COURIER 10052 . 10368) (\FILLCIRCLE.COURIER 10370 . 
+10687) (\FILLPOLYGON.COURIER 10689 . 10973) (\FONT.COURIER 10975 . 11382) (\LEFTMARGIN.COURIER 11384
+ . 11661) (\LINEFEED.COURIER 11663 . 11933) (\MOVETO.COURIER 11935 . 12198) (\NEWPAGE.COURIER 12200 . 
+12461) (\OPENIMAGESTREAM.COURIER 12463 . 15037) (\OPERATION.COURIER 15039 . 15314) (\POPSTATE.COURIER 
+15316 . 15591) (\PUSHSTATE.COURIER 15593 . 15870) (\RESET.COURIER 15872 . 16205) (\RIGHTMARGIN.COURIER
+ 16207 . 16486) (\ROTATE.COURIER 16488 . 16768) (\SCALE.COURIER 16770 . 17033) (\SCALEDBITBLT.COURIER 
+17035 . 18315) (\SCALE2.COURIER 18317 . 18592) (\SPACEFACTOR.COURIER 18594 . 18870) (
+\STRINGWIDTH.COURIER 18872 . 19278) (\TERPRI.COURIER 19280 . 19615) (\TOPMARGIN.COURIER 19617 . 19892)
+ (\TRANSLATE.COURIER 19894 . 20175) (\XPOSITION.COURIER 20177 . 20452) (\YPOSITION.COURIER 20454 . 
+20729) (\OUTCHAR.COURIER 20731 . 21265)) (21305 35125 (\COURIER.BACKCOLOR 21315 . 21575) (
+\COURIER.BITBLT 21577 . 22097) (\COURIER.BLTSHADE 22099 . 22494) (\COURIER.BOTTOMMARGIN 22496 . 22770)
+ (\COURIER.CHARWIDTH 22772 . 23038) (\COURIER.CHARWIDTHY 23040 . 23308) (\COURIER.CLIPPINGREGION 23310
+ . 23582) (\COURIER.CLOSEIMAGESTREAM 23584 . 24203) (\COURIER.COLOR 24205 . 24457) (
+\COURIER.DEFAULTSTATE 24459 . 24705) (\COURIER.DRAWARC 24707 . 25081) (\COURIER.DRAWCIRCLE 25083 . 
+25423) (\COURIER.DRAWCURVE 25425 . 25767) (\COURIER.DRAWELLIPSE 25769 . 26239) (\COURIER.DRAWLINE 
+26241 . 26607) (\COURIER.DRAWPOINT 26609 . 26949) (\COURIER.DRAWPOLYGON 26951 . 27299) (
+\COURIER.FILLCIRCLE 27301 . 27629) (\COURIER.FILLPOLYGON 27631 . 27953) (\COURIER.FONT 27955 . 28203) 
+(\COURIER.FONTTYPE 28205 . 28438) (\COURIER.LEFTMARGIN 28440 . 28710) (\COURIER.LINEFEED 28712 . 28972
+) (\COURIER.MOVETO 28974 . 29264) (\COURIER.NEWPAGE 29266 . 29490) (\COURIER.OPERATION 29492 . 29760) 
+(\COURIER.OPENIMAGESTREAM 29762 . 30623) (\COURIER.OUTCHAR 30625 . 30905) (\COURIER.POPSTATE 30907 . 
+31145) (\COURIER.PUSHSTATE 31147 . 31387) (\COURIER.RESET 31389 . 31609) (\COURIER.RIGHTMARGIN 31611
+ . 31883) (\COURIER.ROTATE 31885 . 32151) (\COURIER.SCALE 32153 . 32405) (\COURIER.SCALEDBITBLT 32407
+ . 32939) (\COURIER.SCALE2 32941 . 33243) (\COURIER.SPACEFACTOR 33245 . 33511) (\COURIER.STRINGWIDTH 
+33513 . 33779) (\COURIER.TERPRI 33781 . 34003) (\COURIER.TOPMARGIN 34005 . 34273) (\COURIER.TRANSLATE 
+34275 . 34583) (\COURIER.XPOSITION 34585 . 34853) (\COURIER.YPOSITION 34855 . 35123)) (35143 39211 (
+\INITCOURIERIMAGESTREAM 35153 . 38655) (READSTREAMHANDLE 38657 . 39040) (WRITESTREAMHANDLE 39042 . 
+39209)))))
 STOP

lispusers/DSPSCALE

@@ -1,54 +1,32 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED "19-Jul-88 13:36:39" |{MCS:MCS:STANFORD}<LANE>DSPSCALE.;10|
 55021  
 
-      changes to%:  (FNS \TRANSLATE.SCALED CHARWIDTH! CHARWIDTHY! FONTPROP! STRINGWIDTH! 
-                         INITSCALEDIMAGESTREAM \FILLPOLYGON.SCALED DSPSCALE.DASHING 
-                         OPENIMAGESTREAM.SCALED \BACKCOLOR.SCALED \BITBLT.SCALED \BLTSHADE.SCALED 
-                         \BOTTOMMARGIN.SCALED \BOUT.SCALED \CHARSET.SCALED \CHARWIDTH.SCALED 
-                         \CHARWIDTHY.SCALED \CLIPPINGREGION.SCALED \CLOSEFN.SCALED \COLOR.SCALED 
-                         \DEFAULTSTATE.SCALED \DRAWARC.SCALED \DRAWCIRCLE.SCALED \DRAWCURVE.SCALED 
-                         \DRAWELLIPSE.SCALED \DRAWLINE.SCALED \DRAWPOINT.SCALED \DRAWPOLYGON.SCALED 
-                         \FILLCIRCLE.SCALED \FONT.SCALED \LEFTMARGIN.SCALED \LINEFEED.SCALED 
-                         \MOVETO.SCALED \NEWPAGE.SCALED \OPERATION.SCALED \POPSTATE.SCALED 
-                         \PUSHSTATE.SCALED \RESET.SCALED \RIGHTMARGIN.SCALED \ROTATE.SCALED 
-                         \SCALE.SCALED \SCALEDBITBLT.SCALED \SPACEFACTOR.SCALED \STRINGWIDTH.SCALED 
-                         \TERPRI.SCALED \TOPMARGIN.SCALED \XPOSITION.SCALED \YPOSITION.SCALED 
-                         \OUTCHAR.SCALED CENTERPRINTINREGION! CURSORPOSITION! BITBLT! BITMAPBIT! 
-                         BLTSHADE! DSPBACKUP! DSPBOTTOMMARGIN! DSPCLIPPINGREGION! DRAWBETWEEN! 
-                         DRAWARC! DRAWCIRCLE! DRAWCURVE! DRAWELLIPSE! DRAWLINE! DRAWPOINT! 
-                         DRAWPOLYGON! DRAWTO! FILLCIRCLE! FILLPOLYGON! DSPLEFTMARGIN! DSPLINEFEED! 
-                         GETPOSITION! MOVETO! MOVETOUPPERLEFT! DSPRIGHTMARGIN! DSPSCALE! RELDRAWTO! 
-                         RELMOVETO! SCALEDBITBLT! STRINGREGION! DSPSPACEFACTOR! DSPTRANSLATE! 
-                         DSPTOPMARGIN! DSPUNITS! DSPXOFFSET! DSPXPOSITION! DSPYOFFSET! DSPYPOSITION!
-                         DSPSCALE.BRUSH DSPSCALE.POINTS DSPSCALE.REGION DSPSCALE.NUMBER 
-                         DSPSCALE.POSITION DSPSCALE.XPOSITION DSPSCALE.YPOSITION DSPSCALE.WIDTH 
-                         DSPUNSCALE.REGION DSPUNSCALE.POSITION DSPUNSCALE.NUMBER DSPUNSCALE.CHARACTER
-                         )
-                    (VARS DSPSCALECOMS)
+
(FILECREATED " 8-Dec-2023 21:32:41" {WMEDLEY}<lispusers>DSPSCALE.;3
 52572  
 
-      previous date%: "19-Jul-88 10:00:47" |{MCS:MCS:STANFORD}<LANE>DSPSCALE.;6|)
+      :EDIT-BY rmk
 
+      :CHANGES-TO (FNS INITSCALEDIMAGESTREAM \CHARSET.SCALED)
+                  (VARS DSPSCALECOMS)
+                  (RECORDS SCALEDIMAGEDATA CONVERT)
+                  (MACROS DSPUNSCALE.XPOSITION DSPUNSCALE.YPOSITION)
+
+      :PREVIOUS-DATE "19-Jul-88 13:36:39" {WMEDLEY}<lispusers>DSPSCALE.;1)
 
-(* "
-Copyright (c) 1985, 1986, 1987, 1988 by Stanford University.  All rights reserved.
-")
 
 (PRETTYCOMPRINT DSPSCALECOMS)
 
-(RPAQQ DSPSCALECOMS
 
+(RPAQQ DSPSCALECOMS

        ((LOCALVARS . T)
         (* * SCALED ImageStream ImageOp Functions)
         (FNS INITSCALEDIMAGESTREAM OPENIMAGESTREAM.SCALED)
         (FNS \BACKCOLOR.SCALED \BITBLT.SCALED \BLTSHADE.SCALED \BOTTOMMARGIN.SCALED \BOUT.SCALED 
-             \CHARSET.SCALED \CHARWIDTH.SCALED \CHARWIDTHY.SCALED \CLIPPINGREGION.SCALED 
-             \CLOSEFN.SCALED \COLOR.SCALED \DEFAULTSTATE.SCALED \DRAWARC.SCALED \DRAWCIRCLE.SCALED 
-             \DRAWCURVE.SCALED \DRAWELLIPSE.SCALED \DRAWLINE.SCALED \DRAWPOINT.SCALED 
-             \DRAWPOLYGON.SCALED \FILLCIRCLE.SCALED \FILLPOLYGON.SCALED \FONT.SCALED 
-             \LEFTMARGIN.SCALED \LINEFEED.SCALED \MOVETO.SCALED \NEWPAGE.SCALED \OPERATION.SCALED 
-             \POPSTATE.SCALED \PUSHSTATE.SCALED \RESET.SCALED \RIGHTMARGIN.SCALED \ROTATE.SCALED 
-             \SCALE.SCALED \SCALEDBITBLT.SCALED \SPACEFACTOR.SCALED \STRINGWIDTH.SCALED 
-             \TERPRI.SCALED \TOPMARGIN.SCALED \TRANSLATE.SCALED \XPOSITION.SCALED \YPOSITION.SCALED 
-             \OUTCHAR.SCALED)
+             \CHARWIDTH.SCALED \CHARWIDTHY.SCALED \CLIPPINGREGION.SCALED \CLOSEFN.SCALED 
+             \COLOR.SCALED \DEFAULTSTATE.SCALED \DRAWARC.SCALED \DRAWCIRCLE.SCALED \DRAWCURVE.SCALED
+             \DRAWELLIPSE.SCALED \DRAWLINE.SCALED \DRAWPOINT.SCALED \DRAWPOLYGON.SCALED 
+             \FILLCIRCLE.SCALED \FILLPOLYGON.SCALED \FONT.SCALED \LEFTMARGIN.SCALED \LINEFEED.SCALED
+             \MOVETO.SCALED \NEWPAGE.SCALED \OPERATION.SCALED \POPSTATE.SCALED \PUSHSTATE.SCALED 
+             \RESET.SCALED \RIGHTMARGIN.SCALED \ROTATE.SCALED \SCALE.SCALED \SCALEDBITBLT.SCALED 
+             \SPACEFACTOR.SCALED \STRINGWIDTH.SCALED \TERPRI.SCALED \TOPMARGIN.SCALED 
+             \TRANSLATE.SCALED \XPOSITION.SCALED \YPOSITION.SCALED \OUTCHAR.SCALED)
         (* * Self Scaling DSP* Functions)
         (FNS CENTERPRINTINREGION! CHARWIDTH! CHARWIDTHY! CURSORPOSITION! BITBLT! BITMAPBIT! BLTSHADE!
              DSPBACKUP! DSPBOTTOMMARGIN! DSPCLIPPINGREGION! DRAWBETWEEN! DRAWARC! DRAWCIRCLE! 
@@ -86,11 +64,11 @@ Copyright (c) 1985, 1986, 1987, 1988 by Stanford University.  All rights reserve
 (DEFINEQ
 
 (INITSCALEDIMAGESTREAM

-  [LAMBDA NIL
                                            (* ; "Edited 19-Jul-88 10:59 by cdl")

+  [LAMBDA NIL
                                                (* ; "Edited 19-Jul-88 10:59 by cdl")

     (DECLARE
 (GLOBALVARS \DISPLAYIMAGEOPS))
     [if
 (NULL \NULLFDEV)
         then
 (SETQ \NULLFDEV (create
 FDEV
-                                        CLOSEFILE _ (FUNCTION NILL]
+                                    CLOSEFILE _ (FUNCTION NILL]
     (SETQ \SCALEDIMAGEOPS (create
 IMAGEOPS
                                  IMAGETYPE _ 'SCALED
                                  IMCLOSEFN _ (FUNCTION \CLOSEFN.SCALED)
@@ -126,7 +104,6 @@ Copyright (c) 1985, 1986, 1987, 1988 by Stanford University.  All rights reserve
                                  IMDRAWPOLYGON _ (FUNCTION \DRAWPOLYGON.SCALED)
                                  IMFILLPOLYGON _ (FUNCTION \FILLPOLYGON.SCALED)
                                  IMSCALEDBITBLT _ (FUNCTION \SCALEDBITBLT.SCALED)
-                                 IMCHARSET _ (FUNCTION \CHARSET.SCALED)
                                  IMROTATE _ (FUNCTION \ROTATE.SCALED)
                                  IMDRAWARC _ (FUNCTION \DRAWARC.SCALED)
                                  IMTRANSLATE _ (FUNCTION \TRANSLATE.SCALED)
@@ -208,11 +185,6 @@ Copyright (c) 1985, 1986, 1987, 1988 by Stanford University.  All rights reserve
     (with
 SCALEDIMAGEDATA (with
 STREAM STREAM IMAGEDATA)
            (BOUT IMAGESTREAM BYTE])
 
-(\CHARSET.SCALED

-  [LAMBDA (STREAM CHARACTERSET)
                          (* cdl "26-Jan-87 08:49")

-    (with
 SCALEDIMAGEDATA (with
 STREAM STREAM IMAGEDATA)
-           (IMAGEOP 'IMCHARSET IMAGESTREAM IMAGESTREAM CHARACTERSET])
-
 (\CHARWIDTH.SCALED

   [LAMBDA (STREAM CHARCODE)
                              (* cdl "26-Jan-87 09:50")

     (with
 SCALEDIMAGEDATA (with
 STREAM STREAM IMAGEDATA)
@@ -975,11 +947,11 @@ Copyright (c) 1985, 1986, 1987, 1988 by Stanford University.  All rights reserve
 )
 (DECLARE%: EVAL@COMPILE 
 
-[PUTPROPS DSPUNSCALE.XPOSITION MACRO ((VALUE STREAM)
-                                      (DSPUNSCALE.NUMBER
 VALUE STREAM 'X]
+(PUTPROPS DSPUNSCALE.XPOSITION
 MACRO
 ((VALUE STREAM)
+                                      (DSPUNSCALE.NUMBER
 VALUE STREAM 'X)))
 
-[PUTPROPS DSPUNSCALE.YPOSITION MACRO ((VALUE STREAM)
-                                      (DSPUNSCALE.NUMBER
 VALUE STREAM 'Y]
+(PUTPROPS DSPUNSCALE.YPOSITION
 MACRO
 ((VALUE STREAM)
+                                      (DSPUNSCALE.NUMBER
 VALUE STREAM 'Y)))
 )
 (* * etc.)

 
@@ -1022,39 +994,38 @@ Copyright (c) 1985, 1986, 1987, 1988 by Stanford University.  All rights reserve
 (MOVD? 'DSPUNITS! 'DSPUNITS)
 
 (INITSCALEDIMAGESTREAM
)
-(PUTPROPS DSPSCALE COPYRIGHT ("Stanford University" 1985 1986 1987 1988))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (5589 11142 (INITSCALEDIMAGESTREAM 5599 . 9099) (OPENIMAGESTREAM.SCALED 9101 . 11140)) (
-11143 28693 (\BACKCOLOR.SCALED 11153 . 11396) (\BITBLT.SCALED 11398 . 12265) (\BLTSHADE.SCALED 12267
- . 13022) (\BOTTOMMARGIN.SCALED 13024 . 13479) (\BOUT.SCALED 13481 . 13690) (\CHARSET.SCALED 13692 . 
-13938) (\CHARWIDTH.SCALED 13940 . 14287) (\CHARWIDTHY.SCALED 14289 . 14638) (\CLIPPINGREGION.SCALED 
-14640 . 15093) (\CLOSEFN.SCALED 15095 . 15356) (\COLOR.SCALED 15358 . 15593) (\DEFAULTSTATE.SCALED 
-15595 . 15850) (\DRAWARC.SCALED 15852 . 16481) (\DRAWCIRCLE.SCALED 16483 . 17072) (\DRAWCURVE.SCALED 
-17074 . 17493) (\DRAWELLIPSE.SCALED 17495 . 18291) (\DRAWLINE.SCALED 18293 . 18940) (\DRAWPOINT.SCALED
- 18942 . 19372) (\DRAWPOLYGON.SCALED 19374 . 19797) (\FILLCIRCLE.SCALED 19799 . 20297) (
-\FILLPOLYGON.SCALED 20299 . 20639) (\FONT.SCALED 20641 . 20873) (\LEFTMARGIN.SCALED 20875 . 21326) (
-\LINEFEED.SCALED 21328 . 21769) (\MOVETO.SCALED 21771 . 22097) (\NEWPAGE.SCALED 22099 . 22332) (
-\OPERATION.SCALED 22334 . 22581) (\POPSTATE.SCALED 22583 . 22830) (\PUSHSTATE.SCALED 22832 . 23081) (
-\RESET.SCALED 23083 . 23333) (\RIGHTMARGIN.SCALED 23335 . 23788) (\ROTATE.SCALED 23790 . 24042) (
-\SCALE.SCALED 24044 . 24367) (\SCALEDBITBLT.SCALED 24369 . 25278) (\SPACEFACTOR.SCALED 25280 . 25727) 
-(\STRINGWIDTH.SCALED 25729 . 26084) (\TERPRI.SCALED 26086 . 26338) (\TOPMARGIN.SCALED 26340 . 26789) (
-\TRANSLATE.SCALED 26791 . 27161) (\XPOSITION.SCALED 27163 . 27612) (\YPOSITION.SCALED 27614 . 28063) (
-\OUTCHAR.SCALED 28065 . 28691)) (28734 43771 (CENTERPRINTINREGION! 28744 . 29003) (CHARWIDTH! 29005 . 
-29238) (CHARWIDTHY! 29240 . 29475) (CURSORPOSITION! 29477 . 29921) (BITBLT! 29923 . 30533) (BITMAPBIT!
- 30535 . 30764) (BLTSHADE! 30766 . 31298) (DSPBACKUP! 31300 . 31536) (DSPBOTTOMMARGIN! 31538 . 31871) 
-(DSPCLIPPINGREGION! 31873 . 32206) (DRAWBETWEEN! 32208 . 32591) (DRAWARC! 32593 . 33074) (DRAWCIRCLE! 
-33076 . 33451) (DRAWCURVE! 33453 . 33741) (DRAWELLIPSE! 33743 . 34305) (DRAWLINE! 34307 . 34782) (
-DRAWPOINT! 34784 . 35071) (DRAWPOLYGON! 35073 . 35366) (DRAWTO! 35368 . 35680) (FILLCIRCLE! 35682 . 
-35971) (FILLPOLYGON! 35973 . 36161) (FONTPROP! 36163 . 36501) (DSPLEFTMARGIN! 36503 . 36830) (
-DSPLINEFEED! 36832 . 37147) (GETPOSITION! 37149 . 37334) (MOVETO! 37336 . 37550) (MOVETOUPPERLEFT! 
-37552 . 37785) (DSPRIGHTMARGIN! 37787 . 38117) (DSPSCALE! 38119 . 38915) (RELDRAWTO! 38917 . 39231) (
-RELMOVETO! 39233 . 39449) (SCALEDBITBLT! 39451 . 40089) (STRINGREGION! 40091 . 40316) (STRINGWIDTH! 
-40318 . 40560) (DSPSPACEFACTOR! 40562 . 40886) (DSPTRANSLATE! 40888 . 41389) (DSPTOPMARGIN! 41391 . 
-41715) (DSPUNITS! 41717 . 42443) (DSPXOFFSET! 42445 . 42780) (DSPXPOSITION! 42782 . 43106) (
-DSPYOFFSET! 43108 . 43443) (DSPYPOSITION! 43445 . 43769)) (43812 53676 (DSPSCALE.BRUSH 43822 . 44648) 
-(DSPSCALE.DASHING 44650 . 45198) (DSPSCALE.POINTS 45200 . 46255) (DSPSCALE.REGION 46257 . 46955) (
-DSPSCALE.NUMBER 46957 . 47912) (DSPSCALE.POSITION 47914 . 48339) (DSPSCALE.XPOSITION 48341 . 48862) (
-DSPSCALE.YPOSITION 48864 . 49385) (DSPSCALE.WIDTH 49387 . 49607) (DSPUNSCALE.REGION 49609 . 50309) (
-DSPUNSCALE.POSITION 50311 . 50734) (DSPUNSCALE.NUMBER 50736 . 52070) (DSPUNSCALE.CHARACTER 52072 . 
-53674)))))
+  (FILEMAP (NIL (3514 8995 (INITSCALEDIMAGESTREAM 3524 . 6952) (OPENIMAGESTREAM.SCALED 6954 . 8993)) (
+8996 26298 (\BACKCOLOR.SCALED 9006 . 9249) (\BITBLT.SCALED 9251 . 10118) (\BLTSHADE.SCALED 10120 . 
+10875) (\BOTTOMMARGIN.SCALED 10877 . 11332) (\BOUT.SCALED 11334 . 11543) (\CHARWIDTH.SCALED 11545 . 
+11892) (\CHARWIDTHY.SCALED 11894 . 12243) (\CLIPPINGREGION.SCALED 12245 . 12698) (\CLOSEFN.SCALED 
+12700 . 12961) (\COLOR.SCALED 12963 . 13198) (\DEFAULTSTATE.SCALED 13200 . 13455) (\DRAWARC.SCALED 
+13457 . 14086) (\DRAWCIRCLE.SCALED 14088 . 14677) (\DRAWCURVE.SCALED 14679 . 15098) (
+\DRAWELLIPSE.SCALED 15100 . 15896) (\DRAWLINE.SCALED 15898 . 16545) (\DRAWPOINT.SCALED 16547 . 16977) 
+(\DRAWPOLYGON.SCALED 16979 . 17402) (\FILLCIRCLE.SCALED 17404 . 17902) (\FILLPOLYGON.SCALED 17904 . 
+18244) (\FONT.SCALED 18246 . 18478) (\LEFTMARGIN.SCALED 18480 . 18931) (\LINEFEED.SCALED 18933 . 19374
+) (\MOVETO.SCALED 19376 . 19702) (\NEWPAGE.SCALED 19704 . 19937) (\OPERATION.SCALED 19939 . 20186) (
+\POPSTATE.SCALED 20188 . 20435) (\PUSHSTATE.SCALED 20437 . 20686) (\RESET.SCALED 20688 . 20938) (
+\RIGHTMARGIN.SCALED 20940 . 21393) (\ROTATE.SCALED 21395 . 21647) (\SCALE.SCALED 21649 . 21972) (
+\SCALEDBITBLT.SCALED 21974 . 22883) (\SPACEFACTOR.SCALED 22885 . 23332) (\STRINGWIDTH.SCALED 23334 . 
+23689) (\TERPRI.SCALED 23691 . 23943) (\TOPMARGIN.SCALED 23945 . 24394) (\TRANSLATE.SCALED 24396 . 
+24766) (\XPOSITION.SCALED 24768 . 25217) (\YPOSITION.SCALED 25219 . 25668) (\OUTCHAR.SCALED 25670 . 
+26296)) (26339 41376 (CENTERPRINTINREGION! 26349 . 26608) (CHARWIDTH! 26610 . 26843) (CHARWIDTHY! 
+26845 . 27080) (CURSORPOSITION! 27082 . 27526) (BITBLT! 27528 . 28138) (BITMAPBIT! 28140 . 28369) (
+BLTSHADE! 28371 . 28903) (DSPBACKUP! 28905 . 29141) (DSPBOTTOMMARGIN! 29143 . 29476) (
+DSPCLIPPINGREGION! 29478 . 29811) (DRAWBETWEEN! 29813 . 30196) (DRAWARC! 30198 . 30679) (DRAWCIRCLE! 
+30681 . 31056) (DRAWCURVE! 31058 . 31346) (DRAWELLIPSE! 31348 . 31910) (DRAWLINE! 31912 . 32387) (
+DRAWPOINT! 32389 . 32676) (DRAWPOLYGON! 32678 . 32971) (DRAWTO! 32973 . 33285) (FILLCIRCLE! 33287 . 
+33576) (FILLPOLYGON! 33578 . 33766) (FONTPROP! 33768 . 34106) (DSPLEFTMARGIN! 34108 . 34435) (
+DSPLINEFEED! 34437 . 34752) (GETPOSITION! 34754 . 34939) (MOVETO! 34941 . 35155) (MOVETOUPPERLEFT! 
+35157 . 35390) (DSPRIGHTMARGIN! 35392 . 35722) (DSPSCALE! 35724 . 36520) (RELDRAWTO! 36522 . 36836) (
+RELMOVETO! 36838 . 37054) (SCALEDBITBLT! 37056 . 37694) (STRINGREGION! 37696 . 37921) (STRINGWIDTH! 
+37923 . 38165) (DSPSPACEFACTOR! 38167 . 38491) (DSPTRANSLATE! 38493 . 38994) (DSPTOPMARGIN! 38996 . 
+39320) (DSPUNITS! 39322 . 40048) (DSPXOFFSET! 40050 . 40385) (DSPXPOSITION! 40387 . 40711) (
+DSPYOFFSET! 40713 . 41048) (DSPYPOSITION! 41050 . 41374)) (41417 51281 (DSPSCALE.BRUSH 41427 . 42253) 
+(DSPSCALE.DASHING 42255 . 42803) (DSPSCALE.POINTS 42805 . 43860) (DSPSCALE.REGION 43862 . 44560) (
+DSPSCALE.NUMBER 44562 . 45517) (DSPSCALE.POSITION 45519 . 45944) (DSPSCALE.XPOSITION 45946 . 46467) (
+DSPSCALE.YPOSITION 46469 . 46990) (DSPSCALE.WIDTH 46992 . 47212) (DSPUNSCALE.REGION 47214 . 47914) (
+DSPUNSCALE.POSITION 47916 . 48339) (DSPUNSCALE.NUMBER 48341 . 49675) (DSPUNSCALE.CHARACTER 49677 . 
+51279)))))
 STOP

lispusers/GITFNS.TEDIT

@@ -1,9 +1,19 @@
-Medley	GITFNS
2
-
4
-
1
-
GITFNS
1
-
4
-
By Ron Kaplan
This document was last edited in February  2023.

GITFNS provides a Medley-oriented interface for comparing the files in two different branches of a git repository.  This makes it easier to understand what functions or other definitions have changed in a Lisp source file, or what text has changed in a Tedit file.  This may be particularly helpful in evaluating the changes in a pull request.
+Medley	GITFNS
+2
+
+4
+
+1
+
+GITFNS
+1
+
+4
+
+By Ron Kaplan
+This document was last edited in February  2023.
+
+GITFNS provides a Medley-oriented interface for comparing the files in two different branches of a git repository.  This makes it easier to understand what functions or other definitions have changed in a Lisp source file, or what text has changed in a Tedit file.  This may be particularly helpful in evaluating the changes in a pull request.
 Separately, GITFNS also provides tools and conventions for bridging between git's file-oriented style of development and version control and Medley's residential development style with its own version control conventions.  GITFNS allows for intelligent comparisons between Lisp source files, Tedit files, and text files in a local git clone and a local Medley-style working directory, and for migrating files to and from the git clone and the working directory.
 
 Git projects:  Connecting git clones to GITFNS capabilities 
@@ -41,29 +51,37 @@ GIT-MAKE-PROJECT will also create a pseudohost {Wprojectname} for the user's wor
 GIT-INIT creates the default set of projects when GITFNS is loaded, as specified in the variable GIT-DEFAULT-PROJECTS, initially containing MEDLEY NOTECARDS LOOPS TEST. GIT-INIT is added to AROUNDEXITFNS so that new pseudohost bindings for the default projects will be created if the sysout or makesys is started on a new machine.
 
 GIT-DEFAULT-PROJECTS     	[Variable]
-Determines the projects that are created (or recreated) by GIT-INIT. This is initialized for the MEDLEY NOTECARDS LOOPS TEST projects, with CLONEPATH=NIL
GITFNS also defines two directory-connecting commands for conveniently connecting to the git and working pseudohosts of a project:
+Determines the projects that are created (or recreated) by GIT-INIT. This is initialized for the MEDLEY NOTECARDS LOOPS TEST projects, with CLONEPATH=NIL
+GITFNS also defines two directory-connecting commands for conveniently connecting to the git and working pseudohosts of a project:
 cdg (projectname) (subdir)    	[Command]
 cdw (projectname) (subdir)    	[Command]
 For example, cdg notecards library  connects to {NOTECARDS}/library/.
 
 Comparing directories and files in different git branches
 In its simplest application, GITFNS is just an off-to-the-side add-on to whatever work practices the user has developed with respect to a locally installed git project.  Its only advantage is to allow for more interpretable git-branch comparisons, especially for pull-request approval. These comparisons are provided by the prc ("pull request compare") Medley executive command:
-prc  (branch)   (DRAFT)  (projectname)	[Command]
This compares the files in branch against the files in the main branch of the project (origin/master or origin/main).  Thus, suppose that a pull request has been issued on github for a particular branch, say branch rmk15 of the default project.  Then
   prc rmk15 
+prc  (branch)   (DRAFT)  (projectname)	[Command]
+This compares the files in branch against the files in the main branch of the project (origin/master or origin/main).  Thus, suppose that a pull request has been issued on github for a particular branch, say branch rmk15 of the default project.  Then
+   prc rmk15 
 brings up a lispusers/COMPAREDIRECTORIES browser for the files that currently differ between origin/rmk15 and origin/master. If the selected files are Lisp source files, the Compare item on the file browser menu will show the differences in a lispusers/COMPARESOURCES browser. The differences for other file types will be shown in a lispusers/COMPARETEXT browser.
 If branch is not specified and the shell command gh is available, then a menu of open pull-request branches will be provided.  If gh is not available, the menu will offer all known branches.  If the optional DRAFT is provided, then the menu will include draft PR's as well as open ones.
 If one PR, say rmk15, contains all the commits of another (rmk14), then the menu will indicate this by
      rmk15 > rmk14
-Note that the prc comparison is  read-only: any comments, approvals, or merges of the branch must be specified using the normal Medley-external git interfaces and commands.
prc is the special case of the more general bbc command ("branch-branch compare") for comparing the files in any two branches:
-bbc  branch1   branch2  (project)	[Command]
This compares the files in branch1 and branch2, for example
+Note that the prc comparison is  read-only: any comments, approvals, or merges of the branch must be specified using the normal Medley-external git interfaces and commands.
+prc is the special case of the more general bbc command ("branch-branch compare") for comparing the files in any two branches:
+bbc  branch1   branch2  (project)	[Command]
+This compares the files in branch1 and branch2, for example
      bbc rmk15 lmm12   (local)
 This will compare the files in origin/rmk15 and origin/lmm12 in the GIT-DEFAULT project.  branch1 defaults to the origin files of the currently checked out branch, the second defaults to origin/master.  If local is non-NIL, then a branch that has neither local/ or origin/ prepended will default to local (e.g. local/rmk15) instead of origin/.  Local refers to the files that are currently in the clone directory, which may not be the same as the origin files, depending on the push/pull status.  
 Either of the branches can be specified with an atom LOCAL, REMOTE, or ORIGIN, in which case bbc will offer menus listing the currently existing branches of that type.
-NOTE: Branch comparison makes use of a git command that has a limit (diff.renameLimit) on the number of files that it can successfully compare.  A message will be printed if that limit is exceeded, asking whether a larger value for that limit should be applied globally.
The command cob ("check out branch") checks out a specified branch:
+NOTE: Branch comparison makes use of a git command that has a limit (diff.renameLimit) on the number of files that it can successfully compare.  A message will be printed if that limit is exceeded, asking whether a larger value for that limit should be applied globally.
+The command cob ("check out branch") checks out a specified branch:
 cob  branch  (next-title-string) (project)	[Command]
 This checks out branch of project and then executes git pull.  The branch parameter may also be a local branch, T (= the current working branch), or NEW/NEXT (= the next working branch).  The current working branch is the branch named <initials>nnn, e.g. rmk15.  The initials are the value of INITIALS as used for SEDIT time stamps, and nnn is the largest of the integers of all of the branches beginning with those initials.
 If branch is NEW or NEXT, then a new initialed branch is created and becomes the user's current branch.  Its number  is one greater than the largest number of previous initialed branches. If next-title-string is provided, then that string will be appended to the name of the branch, after the initials and next number, and two hyphens.  Spaces in next-title-string will also be replaced by hyphens, according to git conventions.
-If branch is not provided, a menu of locally available branches pops up.
The currently checked out branch is obtained by the b? command:
-b?  (project)	[Command]
+If branch is not provided, a menu of locally available branches pops up.
+The currently checked out branch is obtained by the b? command:
+b?  (project)	[Command]
+
 Correlating git source control with separate Medley development
 It is generally unsafe to do Medley development by operating with files in a local clone repository.  Medley provides a residential development environment that integrates tightly with the local file system.  It is important to have consistent access to the source files of the currently running system, especially for files whose contents have been only partially loaded. A git pull or a branch switch that introduces new versions of some files or removes old files altogether can lead to unpredictable disconnects that are hard to recover from.  This is true also because development can go on in the same Medley memory image for days if not weeks, so it is important to have explicit control of any file version changes.
 GITFNS mitigates the danger by conventions that separate the files in the git clone from the files in the working Medley development directory.  The location of the Medley development source tree for a project is given by the WORKINGPATH argument to GIT-MAKE-PROJECT.  If WORKINGPATH is T or NIL and there exists a directory >working-projectname> as a sister to the clone, then that is taken to be the WORKINGPATH and thus the prefix for a pseudohost {Wprojectname}.
@@ -76,13 +94,12 @@ In addition to the commands for comparing and viewing files, the menu for this b
 If the master/main branch is the current branch then the menu has no commands to change the clone directory. The browser will show those files that have been updated from a recent merge, and they can individually be copied from the git branch to realign the two source trees with incremented Medley version numbers.  If the comparison is with a different branch, say the user's current staging branch, copying files from the working Medley to the git clone or deleting git files will set git up for future commits.  
 Note that the menu item for deleting Medley files will cause all versions to be removed, not just the latest one, to avoid the possibility that an earlier one is revealed. Deletion for Medley files is also accomplished by renaming to a {Wprojectname}<deleted> subdirectory so that they can be recovered if a deletion is in error. Files in the git-clone are removed from the file system immediately, since git provides its own recovery mechanism for those files.
 GITFNS does not (yet?) include functions for commits, pushes, or merge for updating the remote repository. Those have to be done outside of Medley through the usual github interfaces, as guided by the information provided by the comparisons.
-(LIST ((PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC) STARTINGPAGE# 1) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL))) (PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC)) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL))) (PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC)) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL)))))1
$4
È
$

È
4
È
$

È
1
È
$4
È

$

È
4
È
$

È
4
È

$

È
4
È

$

È
4
È

$

È
4
È


$

È
1
È$1ŠŠ
8$1ŠŠ
8$J
È$

È
PAGEHEADINGRUNNINGHEAD1
È
$	TERMINAL_Q(DEFAULTFONT 1 (TERMINAL 12) (TERMINAL 8) (TERMINAL 8) (POSTSCRIPT (TERMINAL 8)))MODERN
+(LIST ((PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC) STARTINGPAGE# 1) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL))) (PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC)) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL))) (PAGE NIL (PAPERSIZE Letter FOLIOINFO (ARABIC)) (0 0 612 792) ((FOLIO NIL (PARALOOKS (QUAD CENTERED) CHARLOOKS (SUPERSCRIPT 0 INVISIBLE OFF SELECTPOINT OFF PROTECTED OFF SIZE 10 FAMILY MODERN OVERLINE OFF STRIKEOUT OFF UNDERLINE OFF EXPANSION REGULAR SLOPE REGULAR WEIGHT MEDIUM INVERTED OFF USERINFO NIL STYLE NIL) FORMATINFO (ARABIC)) (174 36 288 36) NIL) (HEADING NIL (HEADINGTYPE RUNNINGHEAD) (84 744 528 36) NIL) (TEXT NIL NIL (84 96 456 600) NIL)))))1
$4
È
$

È
4
È
$

È
1
È
$4
È

$

È
4
È
$

È
4
È

$

È
4
È

$

È
4
È


$

È
4
È

$

È
1
È$1ŠŠ
8$1ŠŠ
8$J
È$

È
PAGEHEADINGRUNNINGHEAD
+TIMESROMAN$rd(DEFAULTFONT 1 (TERMINAL 12) (TERMINAL 8) (TERMINAL 8) (PDF (TERMINAL 8)) (POSTSCRIPT (TERMINAL 8)))MODERN
 TERMINAL
-MODERNMODERN
-MODERN
-TIMESROMAN$MODERN
-
HRULE.GETFN

HRULE.GETFN

HRULE.GETFN



HRULE.GETFN

HRULE.GETFN
1

RÍé
;¹@
-,




"
	


	&

	



\







+TERMINALMODERNMODERN
+MODERN

HRULE.GETFN

HRULE.GETFN

HRULE.GETFN



HRULE.GETFN

HRULE.GETFN
1

RÍé
;¹
+@	,

"		&

\




 X
-


p

	
6,



	


)

	
)
	

+

	



	

5	

			

@&	

I7
o
E	.8>I
 
Y

€
$
;



}(
)



9


!
0

4



c

	

5

vB	

1OLJ''œ)
2+






Z
!
œ5H
55>

$N
!

M
§‹A@4
-
@Ôâ


k6.	R		<9

	

'Y"(?“

F
<00>ìËò1R
þzº
+
p
	
6,

	
)	)	
+
	


	
5	
			
@&	

I7
o
E	.8>I
 
Y

€
$
;



}(
)


9

!0
4

c
	
5
vB	
1OLJ''œ)2+



Z
!
œ5H
55>
$N
!
M
§‹A@4
+
@Ôâ

k6.	R		<9
	
'Y"(?“
F<00>ìËòDATE:gK(1R
þzº

lispusers/NSDISPLAYSIZES

@@ -1,15 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED "14-Sep-96 09:32:32" {DSK}<project>medley2.0>lispusers>NSDISPLAYSIZES.;13
 8499   
 
-      changes to%:  (FNS NSDISPLAYSIZE PURGENSFONTS)
-                    (VARS NSDISPLAYSIZESCOMS)
+
(FILECREATED "26-Dec-2023 21:17:15" {WMEDLEY}<lispusers>NSDISPLAYSIZES.;3
 8449   
 
-      previous date%: "16-Nov-95 10:10:26" {DSK}<project>medley2.0>lispusers>NSDISPLAYSIZES.;9)
+      :EDIT-BY rmk
 
+      :CHANGES-TO (FNS NSDISPLAYSIZE)
+
+      :PREVIOUS-DATE "24-Dec-2023 13:50:41" {WMEDLEY}<lispusers>NSDISPLAYSIZES.;2)
 
-(* ; "
-Copyright (c) 1985, 1986, 1987, 1988, 1993, 1995, 1996 by Xerox Corporation.  All rights reserved.
-")
 
 (PRETTYCOMPRINT NSDISPLAYSIZESCOMS)
 
@@ -17,8 +15,8 @@ Copyright (c) 1985, 1986, 1987, 1988, 1993, 1995, 1996 by Xerox Corporation.  Al
        [(FNS NSDISPLAYSIZE NS\FONTFILENAME NS\FONTFILENAME.OLD PURGENSFONTS)
         (ADDVARS (NSFONTFAMILIES CLASSIC MODERN TERMINAL OPTIMA TITAN))
         (INITVARS (*SMALLSCREEN* (ILESSP SCREENWIDTH 700)))
-        [COMS                                                (* ; 
-
                       "VirtualKeyboard font needs adjusting so that real Classic 12 still appears")

+        [COMS                                                (* ; 
+
                         "VirtualKeyboard font needs adjusting so that real Classic 12 still appears")

               (FNS VKBD.FIX.FONT)
               (DECLARE%: EVAL@COMPILE DONTCOPY (P (OR (RECLOOK 'KEYBOARDCONFIGURATION)
                                                       (LOADDEF 'KEYBOARDCONFIGURATION 'RECORDS
@@ -32,31 +30,33 @@ Copyright (c) 1985, 1986, 1987, 1988, 1993, 1995, 1996 by Xerox Corporation.  Al
 (DEFINEQ
 
 (NSDISPLAYSIZE

-  [LAMBDA (FAMILY SIZE FACE EXTENSION)
                   (* ; "Edited 14-Sep-96 09:32 by rmk:")

-                                                             (* ; "Edited 16-Nov-95 10:08 by ")

-                                                             (* ; 
-
                                                           "Edited  5-Mar-93 18:12 by kaplan")

-                                                             (* ; "Edited 15-Jan-87 15:22 by bvm:")

+  [LAMBDA (FAMILY SIZE FACE EXTENSION)
                       (* ; "Edited 26-Dec-2023 21:15 by rmk")


+                                                             (* ; "Edited 24-Dec-2023 13:49 by rmk")


+                                                             (* ; "Edited 14-Sep-96 09:32 by rmk:")

+                                                             (* ; "Edited 16-Nov-95 10:08 by ")

+                                                             (* ; "Edited  5-Mar-93 18:12 by kaplan")

+                                                             (* ; "Edited 15-Jan-87 15:22 by bvm:")

 
-    (* ;; "Returns size that we would prefer to see the font of requested family, size, face, extension.  Used to make bigger ns display fonts than you would get by default.  Don't do it for small screens, as on DOS and laptops.")

+    (* ;; "Returns size that we would prefer to see the font of requested family, size, face, extension.  Used to make bigger ns display fonts than you would get by default.  Don't do it for small screens, as on DOS and laptops.")

 
     (DECLARE
 (GLOBALVARS DISPLAYFONTEXTENSIONS NSFONTFAMILIES))
     (OR (AND (CL:MEMBER EXTENSION DISPLAYFONTEXTENSIONS :TEST 'STRING-EQUAL)
              (COND
                 (*SMALLSCREEN* (CL:UNLESS (CL:MEMBER FAMILY NSFONTFAMILIES :TEST 'STRING-EQUAL)
-                                                             (* ; 
-
                                                           " Small screen, shrink non-NS fonts ")

+                                                             (* ; 
+
                                                             " Small screen, shrink non-NS fonts ")

                                    (SELECTQ SIZE
                                        (12 10)
                                        (10 8)
                                        (8 6)
                                        NIL)))
                 ((CL:MEMBER FAMILY NSFONTFAMILIES :TEST 'STRING-EQUAL)
-                                                             (* ; "Large screen, enlarge  NS fonts")

+                                                             (* ; "Large screen, enlarge  NS fonts")

                  (AND (SELECTQ SIZE
                           (12 (COND
-                                 ((STRING-EQUAL FAMILY 'TERMINAL)
-                                                             (* ; "Until Terminal 14 exists")

+                                 ((CL:MEMBER FAMILY '(TERMINAL TITAN)
+                                         :TEST
+                                         'STRING-EQUAL)      (* ; "Until these exist in size 14")

                                   12)
                                  (T 14)))
                           (10 12)
@@ -64,8 +64,8 @@ Copyright (c) 1985, 1986, 1987, 1988, 1993, 1995, 1996 by Xerox Corporation.  Al
                           (6 8)
                           NIL)))
                 ((AND NIL (CL:MEMBER EXTENSION INTERPRESSFONTEXTENSIONS :TEST 'STRING-EQUAL)
-                      (STRING-EQUAL FAMILY 'SYMBOL))         (* ; 
-
                          "Fake NS size on Interpress printing, even tho display fonts don't exist")

+                      (STRING-EQUAL FAMILY 'SYMBOL))         (* ; 
+
                            "Fake NS size on Interpress printing, even tho display fonts don't exist")

                  10)))
         SIZE])
 
@@ -159,9 +159,8 @@ Copyright (c) 1985, 1986, 1987, 1988, 1993, 1995, 1996 by Xerox Corporation.  Al
 
 (VKBD.FIX.FONT
)
 )
-(PUTPROPS NSDISPLAYSIZES COPYRIGHT ("Xerox Corporation" 1985 1986 1987 1988 1993 1995 1996))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1696 6738 (NSDISPLAYSIZE 1706 . 4036) (NS\FONTFILENAME 4038 . 4279) (
-NS\FONTFILENAME.OLD 4281 . 4530) (PURGENSFONTS 4532 . 6736)) (6950 7988 (VKBD.FIX.FONT 6960 . 7986))))
+  (FILEMAP (NIL (1522 6781 (NSDISPLAYSIZE 1532 . 4079) (NS\FONTFILENAME 4081 . 4322) (
+NS\FONTFILENAME.OLD 4324 . 4573) (PURGENSFONTS 4575 . 6779)) (6993 8031 (VKBD.FIX.FONT 7003 . 8029))))
 )
 STOP

lispusers/PSEUDOHOSTS

@@ -1,13 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "22-Sep-2023 15:29:50" {WMEDLEY}<lispusers>PSEUDOHOSTS.;158
 26638  
+
(FILECREATED " 2-Nov-2023 10:53:30" {WMEDLEY}<lispusers>PSEUDOHOSTS.;160
 26843  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS PSEUDOHOST SLASHIT CONTRACT.PH)
-                  (VARS PSEUDOHOSTSCOMS)
+      :CHANGES-TO (FNS PSEUDOHOST)
 
-      :PREVIOUS-DATE "26-Jul-2023 12:34:37" {WMEDLEY}<lispusers>PSEUDOHOSTS.;155)
+      :PREVIOUS-DATE " 1-Oct-2023 20:16:43" {WMEDLEY}<lispusers>PSEUDOHOSTS.;159)
 
 
 (PRETTYCOMPRINT PSEUDOHOSTSCOMS)
@@ -41,6 +40,8 @@
 (PSEUDOHOST

   [LAMBDA (HOST PREFIX)
 
+    (* ;; "Edited  2-Nov-2023 10:53 by rmk")

+
     (* ;; "Edited 22-Sep-2023 15:29 by rmk")

 
     (* ;; "Edited 25-Jun-2022 17:00 by rmk")

@@ -59,7 +60,8 @@
         (SETQ HOST (SUBSTRING HOST 1 -2)))
     (SETQ HOST (U-CASE (MKATOM HOST)))
     [if
 PREFIX
-        then
 (CL:WHEN (PSEUDOHOSTP
 HOST)                     (* ; 
+        then
 (SETQ PREFIX (TRUEFILENAME
 PREFIX))
+             (CL:WHEN (PSEUDOHOSTP
 HOST)                     (* ; 
 
                                                       "Redefining: first clear out the previous one")

                  (PSEUDOHOST
 HOST NIL))
              [LET (TARGETHOST
 TARGETDEVICE PREFIXHOST)
@@ -154,14 +156,16 @@
         (FETCH
 (FDEV DEVICENAME) OF
 (FETCH
 (PHDEVICE TARGETDEV) OF
 (\GETDEVICEFROMNAME HOST))))])
 
 (TRUEFILENAME

-  [LAMBDA (FILE)
                                             (* ; "Edited 26-Jul-2023 07:53 by rmk")


+  [LAMBDA (FILE)
                                             (* ; "Edited  1-Oct-2023 20:16 by rmk")


+                                                             (* ; "Edited 26-Jul-2023 07:53 by rmk")


                                                              (* ; "Edited 26-Jan-2022 23:33 by rmk")


                                                              (* ; "Edited 25-Jan-2022 08:47 by rmk")

     (if
 (LISTP FILE)
         then
 (for
 F in
 FILE collect
 (TRUEFILENAME
 F))
       else
 (LET (FILENAME DEVICE)
                 (IF
 (STREAMP FILE)
-                    THEN
 (SETQ FILENAME (FETCH
 (STREAM FULLFILENAME) OF
 FILE))
+                    THEN
 (SETQ FILENAME (OR (FETCH
 (STREAM FULLFILENAME) OF
 FILE)
+                                            FILE))
                          (SETQ DEVICE (FETCH
 (STREAM DEVICE) OF
 FILE))
                   ELSE
 (SETQ FILENAME (\ADD.CONNECTED.DIR FILE))
                        (SETQ DEVICE (\GETDEVICEFROMNAME FILENAME)))
@@ -511,12 +515,12 @@
        EXPORTS.ALL)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1315 9921 (PSEUDOHOST 1325 . 6930) (PSEUDOHOSTP 6932 . 7445) (PSEUDOHOSTS 7447 . 7808) 
-(TARGETHOST 7810 . 8084) (TRUEFILENAME 8086 . 9048) (PSEUDOFILENAME 9050 . 9919)) (9949 15964 (
-EXPAND.PH 9959 . 11212) (CONTRACT.PH 11214 . 13925) (UNSLASHIT 13927 . 15673) (GETHOSTINFO.PH 15675 . 
-15962)) (15965 23985 (OPENFILE.PH 15975 . 17048) (GETFILENAME.PH 17050 . 17339) (DIRECTORYNAMEP.PH 
-17341 . 17965) (CLOSEFILE.PH 17967 . 18434) (REOPENFILE.PH 18436 . 19001) (DELETEFILE.PH 19003 . 19287
-) (OPENP.PH 19289 . 19584) (UNREGISTERFILE.PH 19586 . 20128) (REGISTERFILE.PH 20130 . 20664) (
-GENERATEFILES.PH 20666 . 21710) (GETFILEINFO.PH 21712 . 22014) (SETFILEINFO.PH 22016 . 22215) (
-NEXTFILEFN.PH 22217 . 22763) (FILEINFOFN.PH 22765 . 23040) (RENAMEFILE.PH 23042 . 23983)))))
+  (FILEMAP (NIL (1254 10126 (PSEUDOHOST 1264 . 6972) (PSEUDOHOSTP 6974 . 7487) (PSEUDOHOSTS 7489 . 7850)
+ (TARGETHOST 7852 . 8126) (TRUEFILENAME 8128 . 9253) (PSEUDOFILENAME 9255 . 10124)) (10154 16169 (
+EXPAND.PH 10164 . 11417) (CONTRACT.PH 11419 . 14130) (UNSLASHIT 14132 . 15878) (GETHOSTINFO.PH 15880
+ . 16167)) (16170 24190 (OPENFILE.PH 16180 . 17253) (GETFILENAME.PH 17255 . 17544) (DIRECTORYNAMEP.PH 
+17546 . 18170) (CLOSEFILE.PH 18172 . 18639) (REOPENFILE.PH 18641 . 19206) (DELETEFILE.PH 19208 . 19492
+) (OPENP.PH 19494 . 19789) (UNREGISTERFILE.PH 19791 . 20333) (REGISTERFILE.PH 20335 . 20869) (
+GENERATEFILES.PH 20871 . 21915) (GETFILEINFO.PH 21917 . 22219) (SETFILEINFO.PH 22221 . 22420) (
+NEXTFILEFN.PH 22422 . 22968) (FILEINFOFN.PH 22970 . 23245) (RENAMEFILE.PH 23247 . 24188)))))
 STOP

lispusers/comparetext

@@ -1,18 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "18-Oct-2023 17:45:46" {WMEDLEY}<lispusers>COMPARETEXT.;131
 48661  
+
(FILECREATED "14-Jan-2024 13:20:30" {WMEDLEY}<lispusers>COMPARETEXT.;133
 48539  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS IMCOMPARE.COLLECT.HASH.CHUNKS IMCOMPARE.HASH)
+      :CHANGES-TO (FNS IMCOMPARE.COLLECT.HASH.CHUNKS)
 
-      :PREVIOUS-DATE " 2-Nov-2022 10:08:52" {WMEDLEY}<lispusers>COMPARETEXT.;130)
+      :PREVIOUS-DATE "14-Jan-2024 13:11:44" {WMEDLEY}<lispusers>COMPARETEXT.;132)
 
 
-(* ; "
-Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
-")
-
 (PRETTYCOMPRINT COMPARETEXTCOMS)
 
 (RPAQQ COMPARETEXTCOMS

@@ -295,7 +291,8 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
                 TITLE TEXTWIDTH TEXTHEIGHT])
 
 (IMCOMPARE.COLLECT.HASH.CHUNKS

-  [LAMBDA (CHUNK HASH.TYPE)
                                  (* ; "Edited 18-Oct-2023 17:45 by rmk")


+  [LAMBDA (CHUNK HASH.TYPE)
                                  (* ; "Edited 14-Jan-2024 13:20 by rmk")


+                                                             (* ; "Edited 18-Oct-2023 17:45 by rmk")


                                                              (* ; "Edited 20-Jan-2022 23:09 by rmk")


                                                              (* ; "Edited 24-Dec-2021 22:30 by rmk")


                                                              (* ; "Edited 13-Dec-2021 16:32 by rmk")


@@ -304,19 +301,19 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
 
 (* ;;; "Returns a list of the chunks inside CHUNK as hashed of type HASH.TYPE.  Presumably CHUNK is is higher on the ranking PARA > LINE >.  WORD.  The initial CHUNK covers the whole file, middle-mouse refinement-chunks cover only subsections.")

 
-    (* ;; "It is overkill to open raw text streams as TEDIT stream.  So we open, test for TEDIT and if so, close and reoopen.  TEDIT may not yet honor external formats other than XCCS for rawtext files.")

+    (* ;; "It is overkill to open raw text streams as TEDIT stream.  So we open, test for TEDIT and if so, close and reoopen.  ")

 
     (RESETLST
         (BIND
 (FILENAME _ (fetch
 (IMCOMPARE.CHUNK FILENAME) of
 CHUNK))
               STREAM ENDPOS FIRST
 [RESETSAVE [SETQ STREAM (OPENSTREAM FILENAME 'INPUT 'OLD
                                                                  '((ENDOFSTREAMOP NILL]
                                          '(PROGN (CLOSEF? OLDVALUE]
-                                  (CL:WHEN (\TEDIT.FORMATTEDP1 STREAM)
+                                  (CL:WHEN (TEDIT.FORMATTEDFILEP STREAM)
                                                              (* ; 
 
                                               "The OBJECTCHAR is produced in place of image objects")

                                       [RESETSAVE [SETQ STREAM
                                                   (OPENTEXTSTREAM STREAM NIL NIL NIL
-                                                         `(OBJECTBYTE ,(CHARCODE NULL]
+                                                         `(OBJECTBYTE ,(CHARCODE *
]
                                              '(PROGN (CLOSEF? OLDVALUE])
                                   (SETFILEINFO STREAM 'EOL 'ANY)
                                   (CL:UNLESS (fetch
 (IMCOMPARE.CHUNK CHUNKLENGTH) of
 CHUNK)
@@ -782,14 +779,13 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
 (FILESLOAD (LOADCOMP)
        GRAPHER)
 )
-(PUTPROPS COMPARETEXT COPYRIGHT ("Xerox Corporation" 1984 1985 1993 1998))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1318 40954 (COMPARETEXT 1328 . 2968) (COMPARETEXT.WINDOW 2970 . 6768) (
-COMPARETEXT.TSTREAM 6770 . 9991) (COMPARETEXT.SETSEL 9993 . 10898) (CHUNKNODELABEL 10900 . 12021) (
-IMCOMPARE.BOXNODE 12023 . 12999) (IMCOMPARE.CHUNKS 13001 . 17609) (IMCOMPARE.COLLECT.HASH.CHUNKS 17611
- . 20723) (IMCOMPARE.DISPLAYGRAPH 20725 . 28804) (IMCOMPARE.HASH 28806 . 33164) (
-IMCOMPARE.MERGE.CONNECTED.CHUNKS 33166 . 36662) (IMCOMPARE.MERGE.UNCONNECTED.CHUNKS 36664 . 38619) (
-IMCOMPARE.SHOW.DIST 38621 . 39067) (IMCOMPARE.UPDATE.SYMBOL.TABLE 39069 . 40952)) (40955 47439 (
-IMCOMPARE.LEFTBUTTONFN 40965 . 43869) (IMCOMPARE.MIDDLEBUTTONFN 43871 . 46987) (IMCOMPARE.COPYBUTTONFN
- 46989 . 47437)) (47492 48183 (TAIL1 47502 . 47856) (TAIL2 47858 . 48181)))))
+  (FILEMAP (NIL (1234 40907 (COMPARETEXT 1244 . 2884) (COMPARETEXT.WINDOW 2886 . 6684) (
+COMPARETEXT.TSTREAM 6686 . 9907) (COMPARETEXT.SETSEL 9909 . 10814) (CHUNKNODELABEL 10816 . 11937) (
+IMCOMPARE.BOXNODE 11939 . 12915) (IMCOMPARE.CHUNKS 12917 . 17525) (IMCOMPARE.COLLECT.HASH.CHUNKS 17527
+ . 20676) (IMCOMPARE.DISPLAYGRAPH 20678 . 28757) (IMCOMPARE.HASH 28759 . 33117) (
+IMCOMPARE.MERGE.CONNECTED.CHUNKS 33119 . 36615) (IMCOMPARE.MERGE.UNCONNECTED.CHUNKS 36617 . 38572) (
+IMCOMPARE.SHOW.DIST 38574 . 39020) (IMCOMPARE.UPDATE.SYMBOL.TABLE 39022 . 40905)) (40908 47392 (
+IMCOMPARE.LEFTBUTTONFN 40918 . 43822) (IMCOMPARE.MIDDLEBUTTONFN 43824 . 46940) (IMCOMPARE.COPYBUTTONFN
+ 46942 . 47390)) (47445 48136 (TAIL1 47455 . 47809) (TAIL2 47811 . 48134)))))
 STOP

scripts/cpv

@@ -3,13 +3,6 @@
 # cpv file dest
 # could extend with -r or copying multiple files
 
-ln_or_cp () {
-    f=$(df $(dirname $1) | tail -1 | awk '{ print $1 }')
-    d=$(df $(dirname $2) | tail -1 | awk '{ print $1 }')
-    if [ "$f" != "$d" ]; then cmd="cp -p"; else cmd="ln"; fi
-    echo $cmd
-}
-
 file="$1"
 dest="$2"
 
@@ -31,7 +24,7 @@ fi
 
 # if no such file $dest then just copy
 if [ ! -f "$dest" ]; then
-    $(ln_or_cp $file $dest) $file $dest
+    cp $file $dest
     echo "Added $(basename $dest) to $(dirname $dest)"
     exit 0
 fi
@@ -64,8 +57,12 @@ else
 fi
 
 # make new version and link it
+ln $file $dest.~$new~ >/dev/null 2>&1
+if [ $? -ne 0 ]
+then
+    cp -p $file $dest.~$new~
+fi
 
-$(ln_or_cp $file $dest.~new~) $file $dest.~$new~
 echo "Added $(basename $dest.~$new~) to $(dirname $dest.~$new~)"
 rm -f $dest
 ln $dest.~$new~ $dest

scripts/loadup-apps-from-full.sh

@@ -23,6 +23,14 @@ if [ ! -e ${NOTECARDSDIR} ]; then
     fi
 fi
 
+if [ -z "${NOTECARDSDIR}" ]; then
+    echo "Error: Cannot find the Notecards directory"
+    echo "It should be located at ${MEDLEYDIR}/../notecards or"
+    echo "${MEDLEYDIR}/../../notecards.  But its not."
+    echo "Exiting"
+    exit 1
+fi
+
 cat >"${cmfile}" <<"EOF"
 "
 

sources/CLSTREAMS

@@ -1,34 +1,15 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED "20-Jul-2022 00:03:06" 
-|{DSK}<users>kaplan>local>medley3.5>working-medley>sources>CLSTREAMS.;41|
 67657  
+
(FILECREATED " 8-Dec-2023 15:46:10" |{WMEDLEY}<sources>CLSTREAMS.;43|
 66631  
 
-      :CHANGES-TO (SETFS FILE-STREAM-POSITION)
-                  (VARS CLSTREAMSCOMS)
-                  (FUNCTIONS OPEN CL:CLOSE CL:STREAM-EXTERNAL-FORMAT CL:STREAM-ELEMENT-TYPE 
-                         CL:INPUT-STREAM-P CL:OUTPUT-STREAM-P XCL:OPEN-STREAM-P FILE-STREAM-POSITION
-                         CL:MAKE-SYNONYM-STREAM XCL:SYNONYM-STREAM-P XCL:SYNONYM-STREAM-SYMBOL 
-                         XCL:FOLLOW-SYNONYM-STREAMS CL:MAKE-BROADCAST-STREAM XCL:BROADCAST-STREAM-P 
-                         XCL:BROADCAST-STREAM-STREAMS CL:MAKE-CONCATENATED-STREAM 
-                         XCL:CONCATENATED-STREAM-P XCL:CONCATENATED-STREAM-STREAMS 
-                         CL:MAKE-TWO-WAY-STREAM XCL:TWO-WAY-STREAM-P XCL:TWO-WAY-STREAM-OUTPUT-STREAM
-                         XCL:TWO-WAY-STREAM-INPUT-STREAM CL:MAKE-ECHO-STREAM XCL:ECHO-STREAM-P 
-                         XCL:ECHO-STREAM-INPUT-STREAM XCL:ECHO-STREAM-OUTPUT-STREAM 
-                         CL:MAKE-STRING-INPUT-STREAM MAKE-CONCATENATED-STRING-INPUT-STREAM 
-                         %MAKE-INITIAL-STRING-STREAM-CONTENTS CL:WITH-OPEN-STREAM 
-                         CL:WITH-INPUT-FROM-STRING CL:WITH-OUTPUT-TO-STRING CL:WITH-OPEN-FILE 
-                         CL:MAKE-STRING-OUTPUT-STREAM MAKE-FILL-POINTER-OUTPUT-STREAM 
-                         CL:GET-OUTPUT-STREAM-STRING \\STRING-STREAM-OUTCHARFN 
-                         \\ADJUSTABLE-STRING-STREAM-OUTCHARFN %NEW-FILE PREDICT-NAME INTERLISP-ACCESS
-                         %BROADCAST-STREAM-DEVICE-CHARSETFN %CONCATENATED-STREAM-DEVICE-CHARSETFN 
-                         %SYNONYM-STREAM-DEVICE-GET-INDIRECT-STREAM)
-                  (FNS %TWO-WAY-STREAM-PEEKCCODEFN)
+      :EDIT-BY |rmk|
 
-      :PREVIOUS-DATE "19-Jul-2022 22:58:32" 
-|{DSK}<users>kaplan>local>medley3.5>working-medley>sources>CLSTREAMS.;40|)
+      :CHANGES-TO (FUNCTIONS %BROADCAST-STREAM-DEVICE-CHARSETFN %CONCATENATED-STREAM-DEVICE-CHARSETFN
+                         )
+                  (FNS %SYNONYM-STREAM-DEVICE-CHARSETFN %TWO-WAY-STREAM-DEVICE-CHARSETFN)
 
+      :PREVIOUS-DATE "20-Jul-2022 00:03:06" |{WMEDLEY}<sources>CLSTREAMS.;41|)
 
-; Copyright (c) 1985-1988, 1990-1991 by Venue & Xerox Corporation.
 
 (PRETTYCOMPRINT CLSTREAMSCOMS)
 
@@ -717,11 +698,12 @@
 )
 )
 
-(CL:DEFUN %BROADCAST-STREAM-DEVICE-CHARSETFN
 (STREAM NEWVALUE)
+(CL:DEFUN %BROADCAST-STREAM-DEVICE-CHARSETFN
 (STREAM NEWVALUE DONTMARKFILE)

+                                                            (* \; "Edited  8-Dec-2023 15:43 by rmk")

 
    (* |;;| "charset function for broadcast streams.  Not clear what the value should be, so we arbitrarily return the value of the last stream.")

 
-   (FOR
 S IN
 (FETCH
 (STREAM F1) OF
 STREAM) DO
 (SETQ $$VAL (ACCESS-CHARSET S NEWVALUE))))
+   (FOR
 S IN
 (FETCH
 (STREAM F1) OF
 STREAM) DO
 (SETQ $$VAL (ACCESS-CHARSET S NEWVALUE DONTMARKFILE))))
 (DEFINEQ
 
 (%BROADCAST-STREAM-OUTCHARFN

@@ -811,14 +793,15 @@
                                                                    (\\EOF.ACTION STREAM))))
 )
 
-(CL:DEFUN %CONCATENATED-STREAM-DEVICE-CHARSETFN
 (STREAM NEWVALUE)
+(CL:DEFUN %CONCATENATED-STREAM-DEVICE-CHARSETFN
 (STREAM NEWVALUE DONTMARKFILE)

+                                                            (* \; "Edited  8-Dec-2023 15:46 by rmk")

 
    (* |;;| "the charset method for concatenated stream devices")

 
    (LET ((STREAMS (FETCH
 (STREAM F1) OF
 STREAM)))
         (IF
 STREAMS
             THEN
 (ACCESS-CHARSET (CAR STREAMS)
-                        NEWVALUE)
+                        NEWVALUE DONTMARKFILE)
           ELSE
 0)))
 (DEFINEQ
 
@@ -881,9 +864,14 @@
 (lambda (stream attribute value device) (* |hdj| "19-Mar-86 17:17") (* |;;;| "The SETFILEINFO method for the synonym-stream device.") (setfileinfo (%synonym-stream-device-get-stream stream) attribute value))
 )
 
-(%synonym-stream-device-charsetfn

-(lambda (stream newvalue) (* \; "Edited 11-Sep-87 16:01 by bvm:") (* |;;| "The charset method for the synonym-stream device.") (access-charset (%synonym-stream-device-get-stream stream) newvalue))
-)
+(%SYNONYM-STREAM-DEVICE-CHARSETFN

+  (LAMBDA (STREAM NEWVALUE DONTMARKFILE)
                    (* \; "Edited  8-Dec-2023 15:40 by rmk")


+                                                             (* \; "Edited 11-Sep-87 16:01 by bvm:")

+
+    (* |;;| "The charset method for the synonym-stream device.")

+
+    (ACCESS-CHARSET (%SYNONYM-STREAM-DEVICE-GET-STREAM
 STREAM)
+           NEWVALUE DONTMARKFILE)))
 
 (%SYNONYM-STREAM-DEVICE-CLOSEFILE

   (LAMBDA (STREAM)
                                       (* \; "Edited 18-Dec-87 12:17 by sye")

@@ -1095,9 +1083,14 @@
 (lambda (|stream| |noErrorFlg?|) (* |smL| "14-Aug-85 16:46") (* |;;;| "The PEEKBIN method for the two-way-stream device") (\\peekbin (|fetch| f1 |of| |stream|) |noErrorFlg?|))
 )
 
-(%two-way-stream-device-charsetfn

-(lambda (stream newvalue) (* \; "Edited 11-Sep-87 16:00 by bvm:") (* |;;| "The charset method for two-way streams.  Unclear what this is supposed to mean--let's apply it only to the input side (in which case newvalue is senseless)") (access-charset (|fetch| (stream f1) |of| stream) newvalue))
-)
+(%TWO-WAY-STREAM-DEVICE-CHARSETFN

+  (LAMBDA (STREAM NEWVALUE DONTMARKFILE)
                    (* \; "Edited  8-Dec-2023 15:41 by rmk")


+                                                             (* \; "Edited 11-Sep-87 16:00 by bvm:")

+
+    (* |;;| "The charset method for two-way streams.  Unclear what this is supposed to mean--let's apply it only to the input side (in which case newvalue is senseless)")

+
+    (ACCESS-CHARSET (|fetch|
 (STREAM F1) |of|
 STREAM)
+           NEWVALUE DONTMARKFILE)))
 )
 
 
@@ -1367,58 +1360,57 @@
 )
 
 (PUTPROPS CLSTREAMS
 FILETYPE
 CL:COMPILE-FILE)
-(PUTPROPS CLSTREAMS COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1991))
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (7779 16754 (OPEN 7779 . 16754)) (16756 17682 (CL:CLOSE 16756 . 17682)) (17684 17762 (
-CL:STREAM-EXTERNAL-FORMAT 17684 . 17762)) (17764 17831 (CL:STREAM-ELEMENT-TYPE 17764 . 17831)) (17833 
-18067 (CL:INPUT-STREAM-P 17833 . 18067)) (18069 18305 (CL:OUTPUT-STREAM-P 18069 . 18305)) (18307 18444
- (XCL:OPEN-STREAM-P 18307 . 18444)) (18446 18513 (FILE-STREAM-POSITION 18446 . 18513)) (18565 20069 (
-CL:MAKE-SYNONYM-STREAM 18565 . 20069)) (20071 20160 (XCL:SYNONYM-STREAM-P 20071 . 20160)) (20162 20300
- (XCL:SYNONYM-STREAM-SYMBOL 20162 . 20300)) (20302 20580 (XCL:FOLLOW-SYNONYM-STREAMS 20302 . 20580)) (
-20582 21067 (CL:MAKE-BROADCAST-STREAM 20582 . 21067)) (21069 21212 (XCL:BROADCAST-STREAM-P 21069 . 
-21212)) (21214 21429 (XCL:BROADCAST-STREAM-STREAMS 21214 . 21429)) (21431 22015 (
-CL:MAKE-CONCATENATED-STREAM 21431 . 22015)) (22017 22116 (XCL:CONCATENATED-STREAM-P 22017 . 22116)) (
-22118 22331 (XCL:CONCATENATED-STREAM-STREAMS 22118 . 22331)) (22333 24074 (CL:MAKE-TWO-WAY-STREAM 
-22333 . 24074)) (24076 24213 (XCL:TWO-WAY-STREAM-P 24076 . 24213)) (24215 24360 (
-XCL:TWO-WAY-STREAM-OUTPUT-STREAM 24215 . 24360)) (24362 24506 (XCL:TWO-WAY-STREAM-INPUT-STREAM 24362
- . 24506)) (24508 26055 (CL:MAKE-ECHO-STREAM 24508 . 26055)) (26057 26186 (XCL:ECHO-STREAM-P 26057 . 
-26186)) (26188 26326 (XCL:ECHO-STREAM-INPUT-STREAM 26188 . 26326)) (26328 26467 (
-XCL:ECHO-STREAM-OUTPUT-STREAM 26328 . 26467)) (26469 27196 (CL:MAKE-STRING-INPUT-STREAM 26469 . 27196)
-) (27198 27691 (MAKE-CONCATENATED-STRING-INPUT-STREAM 27198 . 27691)) (27693 27853 (
-%MAKE-INITIAL-STRING-STREAM-CONTENTS 27693 . 27853)) (27855 28285 (CL:WITH-OPEN-STREAM 27855 . 28285))
- (28287 29516 (CL:WITH-INPUT-FROM-STRING 28287 . 29516)) (29518 30020 (CL:WITH-OUTPUT-TO-STRING 29518
- . 30020)) (30022 30676 (CL:WITH-OPEN-FILE 30022 . 30676)) (30900 32426 (
-MAKE-FILL-POINTER-OUTPUT-STREAM 30900 . 32426)) (32428 33149 (CL:GET-OUTPUT-STREAM-STRING 32428 . 
-33149)) (33151 33630 (\\STRING-STREAM-OUTCHARFN 33151 . 33630)) (33632 35487 (
-\\ADJUSTABLE-STRING-STREAM-OUTCHARFN 33632 . 35487)) (35516 35598 (%NEW-FILE 35516 . 35598)) (35600 
-35745 (PREDICT-NAME 35600 . 35745)) (35781 35932 (INTERLISP-ACCESS 35781 . 35932)) (36021 36756 (
-%BROADCAST-STREAM-DEVICE-BOUT 36031 . 36254) (%BROADCAST-STREAM-DEVICE-CLOSEFILE 36256 . 36495) (
-%BROADCAST-STREAM-DEVICE-FORCEOUTPUT 36497 . 36754)) (36758 37085 (%BROADCAST-STREAM-DEVICE-CHARSETFN 
-36758 . 37085)) (37086 37881 (%BROADCAST-STREAM-OUTCHARFN 37096 . 37879)) (37920 39979 (
-%CONCATENATED-STREAM-DEVICE-BIN 37930 . 38335) (%CONCATENATED-STREAM-DEVICE-CLOSEFILE 38337 . 38650) (
-%CONCATENATED-STREAM-DEVICE-EOFP 38652 . 39016) (%CONCATENATED-STREAM-DEVICE-PEEKBIN 39018 . 39493) (
-%CONCATENATED-STREAM-DEVICE-BACKFILEPTR 39495 . 39977)) (39980 42610 (%CONCATENATED-STREAM-INCCODEFN 
-39990 . 40860) (%CONCATENATED-STREAM-PEEKCCODEFN 40862 . 41734) (%CONCATENATED-STREAM-BACKCCODEFN 
-41736 . 42608)) (42612 42943 (%CONCATENATED-STREAM-DEVICE-CHARSETFN 42612 . 42943)) (42944 43475 (
-%ECHO-STREAM-DEVICE-BIN 42954 . 43161) (%ECHO-STREAM-INCCODEFN 43163 . 43473)) (43510 43735 (
-%SYNONYM-STREAM-DEVICE-GET-INDIRECT-STREAM 43510 . 43735)) (43736 46372 (%SYNONYM-STREAM-DEVICE-BIN 
-43746 . 43934) (%SYNONYM-STREAM-DEVICE-BOUT 43936 . 44137) (%SYNONYM-STREAM-DEVICE-EOFP 44139 . 44330)
- (%SYNONYM-STREAM-DEVICE-FORCEOUTPUT 44332 . 44570) (%SYNONYM-STREAM-DEVICE-GETFILEINFO 44572 . 44809)
- (%SYNONYM-STREAM-DEVICE-PEEKBIN 44811 . 45034) (%SYNONYM-STREAM-DEVICE-READP 45036 . 45147) (
-%SYNONYM-STREAM-DEVICE-BACKFILEPTR 45149 . 45295) (%SYNONYM-STREAM-DEVICE-SETFILEINFO 45297 . 45546) (
-%SYNONYM-STREAM-DEVICE-CHARSETFN 45548 . 45784) (%SYNONYM-STREAM-DEVICE-CLOSEFILE 45786 . 46370)) (
-46400 46639 (%SYNONYM-STREAM-DEVICE-GET-STREAM 46410 . 46637)) (46683 49626 (%SYNONYM-STREAM-OUTCHARFN
- 46693 . 47639) (%SYNONYM-STREAM-INCCODEFN 47641 . 48170) (%SYNONYM-STREAM-PEEKCCODEFN 48172 . 48979) 
-(%SYNONYM-STREAM-BACKCCODEFN 48981 . 49624)) (49660 51663 (%TWO-WAY-STREAM-BACKCCODEFN 49670 . 50071) 
-(%TWO-WAY-STREAM-INCCODEFN 50073 . 50468) (%TWO-WAY-STREAM-OUTCHARFN 50470 . 51162) (
-%TWO-WAY-STREAM-PEEKCCODEFN 51164 . 51661)) (51664 55989 (%TWO-WAY-STREAM-DEVICE-BIN 51674 . 51847) (
-%TWO-WAY-STREAM-DEVICE-INPUTSTREAM 51849 . 52040) (%TWO-WAY-STREAM-DEVICE-BOUT 52042 . 52214) (
-%TWO-WAY-STREAM-DEVICE-OUTPUTSTREAM 52216 . 52406) (%TWO-WAY-STREAM-DEVICE-OUTCHARFN 52408 . 53270) (
-%TWO-WAY-STREAM-DEVICE-CLOSEFILE 53272 . 54695) (%TWO-WAY-STREAM-DEVICE-EOFP 54697 . 54873) (
-%TWO-WAY-STREAM-DEVICE-READP 54875 . 55068) (%TWO-WAY-STREAM-DEVICE-BACKFILEPTR 55070 . 55206) (
-%TWO-WAY-STREAM-DEVICE-FORCEOUTPUT 55208 . 55437) (%TWO-WAY-STREAM-DEVICE-PEEKBIN 55439 . 55652) (
-%TWO-WAY-STREAM-DEVICE-CHARSETFN 55654 . 55987)) (56029 56254 (%FILL-POINTER-STREAM-DEVICE-CLOSEFILE 
-56029 . 56254)) (56256 56375 (%FILL-POINTER-STREAM-DEVICE-GETFILEPTR 56256 . 56375)) (56813 57356 (
-%INITIALIZE-STANDARD-STREAMS 56813 . 57356)) (57357 67383 (%INITIALIZE-CLSTREAM-TYPES 57367 . 67381)))
+  (FILEMAP (NIL (6184 15159 (OPEN 6184 . 15159)) (15161 16087 (CL:CLOSE 15161 . 16087)) (16089 16167 (
+CL:STREAM-EXTERNAL-FORMAT 16089 . 16167)) (16169 16236 (CL:STREAM-ELEMENT-TYPE 16169 . 16236)) (16238 
+16472 (CL:INPUT-STREAM-P 16238 . 16472)) (16474 16710 (CL:OUTPUT-STREAM-P 16474 . 16710)) (16712 16849
+ (XCL:OPEN-STREAM-P 16712 . 16849)) (16851 16918 (FILE-STREAM-POSITION 16851 . 16918)) (16970 18474 (
+CL:MAKE-SYNONYM-STREAM 16970 . 18474)) (18476 18565 (XCL:SYNONYM-STREAM-P 18476 . 18565)) (18567 18705
+ (XCL:SYNONYM-STREAM-SYMBOL 18567 . 18705)) (18707 18985 (XCL:FOLLOW-SYNONYM-STREAMS 18707 . 18985)) (
+18987 19472 (CL:MAKE-BROADCAST-STREAM 18987 . 19472)) (19474 19617 (XCL:BROADCAST-STREAM-P 19474 . 
+19617)) (19619 19834 (XCL:BROADCAST-STREAM-STREAMS 19619 . 19834)) (19836 20420 (
+CL:MAKE-CONCATENATED-STREAM 19836 . 20420)) (20422 20521 (XCL:CONCATENATED-STREAM-P 20422 . 20521)) (
+20523 20736 (XCL:CONCATENATED-STREAM-STREAMS 20523 . 20736)) (20738 22479 (CL:MAKE-TWO-WAY-STREAM 
+20738 . 22479)) (22481 22618 (XCL:TWO-WAY-STREAM-P 22481 . 22618)) (22620 22765 (
+XCL:TWO-WAY-STREAM-OUTPUT-STREAM 22620 . 22765)) (22767 22911 (XCL:TWO-WAY-STREAM-INPUT-STREAM 22767
+ . 22911)) (22913 24460 (CL:MAKE-ECHO-STREAM 22913 . 24460)) (24462 24591 (XCL:ECHO-STREAM-P 24462 . 
+24591)) (24593 24731 (XCL:ECHO-STREAM-INPUT-STREAM 24593 . 24731)) (24733 24872 (
+XCL:ECHO-STREAM-OUTPUT-STREAM 24733 . 24872)) (24874 25601 (CL:MAKE-STRING-INPUT-STREAM 24874 . 25601)
+) (25603 26096 (MAKE-CONCATENATED-STRING-INPUT-STREAM 25603 . 26096)) (26098 26258 (
+%MAKE-INITIAL-STRING-STREAM-CONTENTS 26098 . 26258)) (26260 26690 (CL:WITH-OPEN-STREAM 26260 . 26690))
+ (26692 27921 (CL:WITH-INPUT-FROM-STRING 26692 . 27921)) (27923 28425 (CL:WITH-OUTPUT-TO-STRING 27923
+ . 28425)) (28427 29081 (CL:WITH-OPEN-FILE 28427 . 29081)) (29305 30831 (
+MAKE-FILL-POINTER-OUTPUT-STREAM 29305 . 30831)) (30833 31554 (CL:GET-OUTPUT-STREAM-STRING 30833 . 
+31554)) (31556 32035 (\\STRING-STREAM-OUTCHARFN 31556 . 32035)) (32037 33892 (
+\\ADJUSTABLE-STRING-STREAM-OUTCHARFN 32037 . 33892)) (33921 34003 (%NEW-FILE 33921 . 34003)) (34005 
+34150 (PREDICT-NAME 34005 . 34150)) (34186 34337 (INTERLISP-ACCESS 34186 . 34337)) (34426 35161 (
+%BROADCAST-STREAM-DEVICE-BOUT 34436 . 34659) (%BROADCAST-STREAM-DEVICE-CLOSEFILE 34661 . 34900) (
+%BROADCAST-STREAM-DEVICE-FORCEOUTPUT 34902 . 35159)) (35163 35625 (%BROADCAST-STREAM-DEVICE-CHARSETFN 
+35163 . 35625)) (35626 36421 (%BROADCAST-STREAM-OUTCHARFN 35636 . 36419)) (36460 38519 (
+%CONCATENATED-STREAM-DEVICE-BIN 36470 . 36875) (%CONCATENATED-STREAM-DEVICE-CLOSEFILE 36877 . 37190) (
+%CONCATENATED-STREAM-DEVICE-EOFP 37192 . 37556) (%CONCATENATED-STREAM-DEVICE-PEEKBIN 37558 . 38033) (
+%CONCATENATED-STREAM-DEVICE-BACKFILEPTR 38035 . 38517)) (38520 41150 (%CONCATENATED-STREAM-INCCODEFN 
+38530 . 39400) (%CONCATENATED-STREAM-PEEKCCODEFN 39402 . 40274) (%CONCATENATED-STREAM-BACKCCODEFN 
+40276 . 41148)) (41152 41618 (%CONCATENATED-STREAM-DEVICE-CHARSETFN 41152 . 41618)) (41619 42150 (
+%ECHO-STREAM-DEVICE-BIN 41629 . 41836) (%ECHO-STREAM-INCCODEFN 41838 . 42148)) (42185 42410 (
+%SYNONYM-STREAM-DEVICE-GET-INDIRECT-STREAM 42185 . 42410)) (42411 45240 (%SYNONYM-STREAM-DEVICE-BIN 
+42421 . 42609) (%SYNONYM-STREAM-DEVICE-BOUT 42611 . 42812) (%SYNONYM-STREAM-DEVICE-EOFP 42814 . 43005)
+ (%SYNONYM-STREAM-DEVICE-FORCEOUTPUT 43007 . 43245) (%SYNONYM-STREAM-DEVICE-GETFILEINFO 43247 . 43484)
+ (%SYNONYM-STREAM-DEVICE-PEEKBIN 43486 . 43709) (%SYNONYM-STREAM-DEVICE-READP 43711 . 43822) (
+%SYNONYM-STREAM-DEVICE-BACKFILEPTR 43824 . 43970) (%SYNONYM-STREAM-DEVICE-SETFILEINFO 43972 . 44221) (
+%SYNONYM-STREAM-DEVICE-CHARSETFN 44223 . 44652) (%SYNONYM-STREAM-DEVICE-CLOSEFILE 44654 . 45238)) (
+45268 45507 (%SYNONYM-STREAM-DEVICE-GET-STREAM 45278 . 45505)) (45551 48494 (%SYNONYM-STREAM-OUTCHARFN
+ 45561 . 46507) (%SYNONYM-STREAM-INCCODEFN 46509 . 47038) (%SYNONYM-STREAM-PEEKCCODEFN 47040 . 47847) 
+(%SYNONYM-STREAM-BACKCCODEFN 47849 . 48492)) (48528 50531 (%TWO-WAY-STREAM-BACKCCODEFN 48538 . 48939) 
+(%TWO-WAY-STREAM-INCCODEFN 48941 . 49336) (%TWO-WAY-STREAM-OUTCHARFN 49338 . 50030) (
+%TWO-WAY-STREAM-PEEKCCODEFN 50032 . 50529)) (50532 55054 (%TWO-WAY-STREAM-DEVICE-BIN 50542 . 50715) (
+%TWO-WAY-STREAM-DEVICE-INPUTSTREAM 50717 . 50908) (%TWO-WAY-STREAM-DEVICE-BOUT 50910 . 51082) (
+%TWO-WAY-STREAM-DEVICE-OUTPUTSTREAM 51084 . 51274) (%TWO-WAY-STREAM-DEVICE-OUTCHARFN 51276 . 52138) (
+%TWO-WAY-STREAM-DEVICE-CLOSEFILE 52140 . 53563) (%TWO-WAY-STREAM-DEVICE-EOFP 53565 . 53741) (
+%TWO-WAY-STREAM-DEVICE-READP 53743 . 53936) (%TWO-WAY-STREAM-DEVICE-BACKFILEPTR 53938 . 54074) (
+%TWO-WAY-STREAM-DEVICE-FORCEOUTPUT 54076 . 54305) (%TWO-WAY-STREAM-DEVICE-PEEKBIN 54307 . 54520) (
+%TWO-WAY-STREAM-DEVICE-CHARSETFN 54522 . 55052)) (55094 55319 (%FILL-POINTER-STREAM-DEVICE-CLOSEFILE 
+55094 . 55319)) (55321 55440 (%FILL-POINTER-STREAM-DEVICE-GETFILEPTR 55321 . 55440)) (55878 56421 (
+%INITIALIZE-STANDARD-STREAMS 55878 . 56421)) (56422 66448 (%INITIALIZE-CLSTREAM-TYPES 56432 . 66446)))
 ))
 STOP

sources/EXTERNALFORMAT

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "10-Oct-2022 18:10:56" 
-{DSK}<cygdrive>c>Users>Larry>home>MEDLEY>SOURCES>EXTERNALFORMAT.;76
 37395  
+
(FILECREATED "12-Jan-2024 10:59:18" {DSK}<home>larry>il>medley>sources>EXTERNALFORMAT.;3
 38380  
 
-      :CHANGES-TO (FNS SYSTEM-EXTERNALFORMAT)
+      :EDIT-BY "lmm"
 
-      :PREVIOUS-DATE "24-Jul-2022 14:56:07" 
-{DSK}<cygdrive>c>Users>Larry>home>MEDLEY>SOURCES>EXTERNALFORMAT.;75)
+      :CHANGES-TO (FNS \BACKCCODE)
+
+      :PREVIOUS-DATE " 8-Dec-2023 22:02:21" {DSK}<home>larry>il>medley>sources>EXTERNALFORMAT.;1)
 
 
 (PRETTYCOMPRINT EXTERNALFORMATCOMS)
@@ -68,12 +68,14 @@
 
      "Extra fields for use of particular formats.  Possibly to hold standardized translation tables")

                           (EF2 POINTER)
                           (FORMATBYTESTRINGFN POINTER)       (* ; "Translates an internal string into a string containing the bytes that represent that string in this format")

+                          (FORMATCHARSETFN POINTER)          (* ; 
+
                                                             "If present, apply by \GENERIC.CHARSET")

                           ))
 )
 
-(/DECLAREDATATYPE 'EXTERNALFORMAT '(FLAG (BITS 2)
-                                         FLAG POINTER POINTER POINTER POINTER POINTER POINTER POINTER
-                                         POINTER POINTER)
+(/DECLAREDATATYPE 'EXTERNALFORMAT
+       '(FLAG (BITS 2)
+              FLAG POINTER POINTER POINTER POINTER POINTER POINTER POINTER POINTER POINTER POINTER)
        '((EXTERNALFORMAT 0 (FLAGBITS . 0))
          (EXTERNALFORMAT 0 (BITS . 17))
          (EXTERNALFORMAT 0 (FLAGBITS . 48))
@@ -85,16 +87,17 @@
          (EXTERNALFORMAT 10 POINTER)
          (EXTERNALFORMAT 12 POINTER)
          (EXTERNALFORMAT 14 POINTER)
-         (EXTERNALFORMAT 16 POINTER))
-       '18)
+         (EXTERNALFORMAT 16 POINTER)
+         (EXTERNALFORMAT 18 POINTER))
+       '20)
 
 (* "END EXPORTED DEFINITIONS")
 
 )
 
-(/DECLAREDATATYPE 'EXTERNALFORMAT '(FLAG (BITS 2)
-                                         FLAG POINTER POINTER POINTER POINTER POINTER POINTER POINTER
-                                         POINTER POINTER)
+(/DECLAREDATATYPE 'EXTERNALFORMAT
+       '(FLAG (BITS 2)
+              FLAG POINTER POINTER POINTER POINTER POINTER POINTER POINTER POINTER POINTER POINTER)
        '((EXTERNALFORMAT 0 (FLAGBITS . 0))
          (EXTERNALFORMAT 0 (BITS . 17))
          (EXTERNALFORMAT 0 (FLAGBITS . 48))
@@ -106,8 +109,9 @@
          (EXTERNALFORMAT 10 POINTER)
          (EXTERNALFORMAT 12 POINTER)
          (EXTERNALFORMAT 14 POINTER)
-         (EXTERNALFORMAT 16 POINTER))
-       '18)
+         (EXTERNALFORMAT 16 POINTER)
+         (EXTERNALFORMAT 18 POINTER))
+       '20)
 (ADDTOVAR SYSTEMRECLST
 
 (DATATYPE EXTERNALFORMAT
 ((EOLVALID FLAG)
@@ -121,7 +125,8 @@
                           (FORMATBYTESTREAMFN POINTER)
                           (EF1 POINTER)
                           (EF2 POINTER)
-                          (FORMATBYTESTRINGFN POINTER)))
+                          (FORMATBYTESTRINGFN POINTER)
+                          (FORMATCHARSETFN POINTER)))
 )
 (DEFINEQ
 
@@ -184,7 +189,8 @@
 
 (MAKE-EXTERNALFORMAT

   [LAMBDA (NAME INCCODEFN PEEKCCODEFN BACKCCODEFN OUTCHARFN FORMATBYTESTREAMFN EOL UNSTABLE 
-                FORMATBYTESTRINGFN DEFAULT)
                  (* ; "Edited  3-Jul-2022 00:35 by rmk")


+                FORMATBYTESTRINGFN DEFAULT FORMATCHARSETFN)
  (* ; "Edited  8-Dec-2023 22:02 by rmk")


+                                                             (* ; "Edited  3-Jul-2022 00:35 by rmk")


                                                             (* ; "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.  Fills in missing functions from DEFAULT if given.  If DEFAULT is T, use *DEFAULT-EXTERNALFORMAT*.")

@@ -224,7 +230,8 @@
                                     EOLVALID _ EOL
                                     EOL _ (OR EOL LF.EOLC)
                                     UNSTABLE _ UNSTABLE
-                                    FORMATBYTESTRINGFN _ FORMATBYTESTRINGFN])
+                                    FORMATBYTESTRINGFN _ FORMATBYTESTRINGFN
+                                    FORMATCHARSETFN _ (OR FORMATCHARSETFN (FUNCTION NILL])
 
 (\EXTERNALFORMAT.DEFPRINT

   [LAMBDA (EXTERNALFORMAT STREAM)
                            (* ; "Edited  2-Jul-2022 11:40 by rmk")


@@ -356,7 +363,8 @@
                   STREAM])
 
 (\BACKCCODE

-  [LAMBDA (STREAM BYTECOUNTVAR BYTECOUNTVAL)
                 (* ; "Edited 19-Jul-2022 15:55 by rmk")


+  [LAMBDA (STREAM BYTECOUNTVAR BYTECOUNTVAL)
                 (* ; "Edited 12-Jan-2024 10:58 by lmm")


+                                                             (* ; "Edited 19-Jul-2022 15:55 by rmk")


                                                              (* ; "Edited 30-Jun-2022 10:00 by rmk")


                                                             (* ; "Edited 14-Aug-2021 00:26 by rmk:")

 
@@ -372,7 +380,7 @@
                                                 *BYTECOUNTER*))
                        (CL:WHEN CODE
                            (OR (FIXP CODE)
-                               (CLFUNCALL (ffetch
 (STREAM PEEKCCODEFN) of
 STREAM)
+                               (CL:FUNCALL (ffetch
 (STREAM PEEKCCODEFN) of
 STREAM)
                                       STREAM)))]
            ELSEIF
 (SETQ CODE (CL:FUNCALL (ffetch
 (STREAM BACKCCODEFN) of
 STREAM)
                                     STREAM))
@@ -519,9 +527,11 @@
                        FSTRING])
 
 (\CHECKEOLC.CRLF

-  [LAMBDA (STREAM PEEKBINFLG COUNTP)
                    (* ; "Edited  6-Aug-2021 23:30 by rmk:")

+  [LAMBDA (STREAM PEEKBINFLG COUNTP EOLC)
                    (* ; "Edited  6-Dec-2023 23:39 by rmk")


+                                                             (* ; "Edited 17-Oct-2023 11:56 by rmk")


+                                                            (* ; "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")

+    (* ;; "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.")

 
@@ -530,8 +540,7 @@
          [SETQ CH (COND
                      [PEEKBINFLG 
 
-                            (* ;; 
-
                          "T from PEEKC.  In this case, must leave the fileptr where it was.")

+                            (* ;; "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")

 
@@ -545,17 +554,20 @@
                                         (PROG1 (\PEEKCCODE
 STREAM T 'NOEOLC)
 
                                             (* ;; 
-
                          "This has to be a call to \PEEKCODE that doesn't itself to the checkeolc")

+
                            "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.")

+
            "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]
+                               (T (SELECTC EOLC
+                                      ((LIST ANY.EOLC 'ANY) 
+                                           (CHARCODE EOL))
+                                      (CHARCODE CR]
                      ((EQ (CHARCODE LF)
                           (\PEEKCCODE
 STREAM T 'NOEOLC))
 
@@ -563,12 +575,15 @@
 
                       (IF
 COUNTP
                           THEN
 (LET (NUMLFBYTES)
-                                        (DECLARE
 (SPECVARS NUMLFBYTES))
-                                        (\INCCODE
 STREAM 'NUMLFBYTES 0)
-                                        (ADD
 *BYTECOUNTER* NUMLFBYTES))
+                                    (DECLARE
 (SPECVARS NUMLFBYTES))
+                                    (\INCCODE
 STREAM 'NUMLFBYTES 0)
+                                    (ADD
 *BYTECOUNTER* NUMLFBYTES))
                         ELSE
 (\INCCODE
 STREAM))
                       (CHARCODE EOL))
-                     (T (CHARCODE CR]
+                     (T (SELECTC EOLC
+                            ((LIST ANY.EOLC 'ANY) 
+                                 (CHARCODE EOL))
+                            (CHARCODE CR]
          CH])
 )
 (DECLARE%: DOEVAL@COMPILE DONTCOPY 
@@ -581,10 +596,10 @@
                                                (CHARCODE EOL))
                                           (CHARCODE LF)))
                                   (CR (SELECTC (OR EOLC (FFETCH
 (STREAM EOLCONVENTION) OF
 STRM))
-                                          ((LIST CR.EOLC 'ANY) 
+                                          ((LIST CR.EOLC 'CR) 
                                                (CHARCODE EOL))
                                           ((LIST ANY.EOLC CRLF.EOLC 'CRLF 'ANY) 
-                                               (\CHECKEOLC.CRLF
 STRM PEEKBINFLG COUNTP))
+                                               (\CHECKEOLC.CRLF
 STRM PEEKBINFLG COUNTP EOLC))
                                           (CHARCODE CR)))
                                   CH)))
 )
@@ -712,13 +727,13 @@
 (\CREATE.THROUGH.EXTERNALFORMAT
)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (6559 13194 (\EXTERNALFORMAT 6569 . 10347) (MAKE-EXTERNALFORMAT 10349 . 12721) (
-\EXTERNALFORMAT.DEFPRINT 12723 . 13192)) (13195 16236 (\INSTALL.EXTERNALFORMAT 13205 . 14654) (
-\REMOVE.EXTERNALFORMAT 14656 . 15487) (FIND-FORMAT 15489 . 16234)) (16237 16649 (SYSTEM-EXTERNALFORMAT
- 16247 . 16647)) (16998 31818 (\OUTCHAR 17008 . 18225) (\INCCODE 18227 . 19380) (\BACKCCODE 19382 . 
-20951) (\BACKCCODE.EOLC 20953 . 23143) (\PEEKCCODE 23145 . 23470) (\PEEKCCODE.EOLC 23472 . 23851) (
-\INCCODE.EOLC 23853 . 25652) (\FORMATBYTESTREAM 25654 . 27789) (\FORMATBYTESTRING 27791 . 29250) (
-\CHECKEOLC.CRLF 29252 . 31816)) (33096 35332 (\NULLDEVICE 33106 . 35008) (\NULL.OPENFILE 35010 . 35330
-)) (35472 37299 (\CREATE.THROUGH.EXTERNALFORMAT 35482 . 36268) (\THROUGHIN 36270 . 36690) (
-\THROUGHBACKCCODE 36692 . 36959) (\THROUGHOUTCHARFN 36961 . 37297)))))
+  (FILEMAP (NIL (6735 13568 (\EXTERNALFORMAT 6745 . 10523) (MAKE-EXTERNALFORMAT 10525 . 13095) (
+\EXTERNALFORMAT.DEFPRINT 13097 . 13566)) (13569 16610 (\INSTALL.EXTERNALFORMAT 13579 . 15028) (
+\REMOVE.EXTERNALFORMAT 15030 . 15861) (FIND-FORMAT 15863 . 16608)) (16611 17023 (SYSTEM-EXTERNALFORMAT
+ 16621 . 17021)) (17372 32799 (\OUTCHAR 17382 . 18599) (\INCCODE 18601 . 19754) (\BACKCCODE 19756 . 
+21435) (\BACKCCODE.EOLC 21437 . 23627) (\PEEKCCODE 23629 . 23954) (\PEEKCCODE.EOLC 23956 . 24335) (
+\INCCODE.EOLC 24337 . 26136) (\FORMATBYTESTREAM 26138 . 28273) (\FORMATBYTESTRING 28275 . 29734) (
+\CHECKEOLC.CRLF 29736 . 32797)) (34081 36317 (\NULLDEVICE 34091 . 35993) (\NULL.OPENFILE 35995 . 36315
+)) (36457 38284 (\CREATE.THROUGH.EXTERNALFORMAT 36467 . 37253) (\THROUGHIN 37255 . 37675) (
+\THROUGHBACKCCODE 37677 . 37944) (\THROUGHOUTCHARFN 37946 . 38282)))))
 STOP

sources/FILEIO

@@ -1,15 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "11-Oct-2022 11:34:00" {DSK}<home>larry>medley>sources>FILEIO.;2
 161841 
+
(FILECREATED " 8-Dec-2023 15:17:12" {WMEDLEY}<sources>FILEIO.;124
 163555 
 
-      :CHANGES-TO (FNS \PRINT-REVALIDATION-RESULT)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "10-Oct-2022 15:58:01" {DSK}<home>larry>medley>sources>FILEIO.;1)
+      :CHANGES-TO (FNS \GENERIC.CHARSET CHARSET ACCESS-CHARSET)
 
+      :PREVIOUS-DATE " 7-Dec-2023 23:54:02" {WMEDLEY}<sources>FILEIO.;121)
 
-(* ; "
-Copyright (c) 1981-1993, 1999, 2020-2022 by Venue & Xerox Corporation.
-")
 
 (PRETTYCOMPRINT FILEIOCOMS)
 
@@ -580,18 +578,21 @@ Copyright (c) 1981-1993, 1999, 2020-2022 by Venue & Xerox Corporation.
        (T (\ILLEGAL.ARG NIL])
 
 (GETSTREAMPROP

-  [LAMBDA (STREAM PROP)
                                      (* ; "Edited  5-Jul-2022 23:57 by rmk")


+  [LAMBDA (STREAM PROP)
                                      (* ; "Edited 25-Aug-2023 08:45 by rmk")


+                                                             (* ; "Edited  5-Jul-2022 23:57 by rmk")


                                                             (* ; "Edited 29-Jun-2021 17:06 by rmk:")

                                                              (* rda%: "22-Aug-84 16:17")

     (SELECTQ PROP
         ((FORMAT EXTERNALFORMAT :EXTERNAL-FORMAT) 
              (\EXTERNALFORMAT STREAM))
         (ENDOFSTREAMOP (FETCH
 (STREAM ENDOFSTREAMOP) OF
 STREAM))
+        (LINELENGTH (LINELENGTH NIL STREAM))
         (LISTGET (fetch
 (STREAM OTHERPROPS) of
 STREAM)
                PROP])
 
 (PUTSTREAMPROP

-  [LAMBDA (STREAM PROP VALUE)
                                (* ; "Edited  5-Jul-2022 23:56 by rmk")


+  [LAMBDA (STREAM PROP VALUE)
                                (* ; "Edited 25-Aug-2023 08:45 by rmk")


+                                                             (* ; "Edited  5-Jul-2022 23:56 by rmk")


                                                             (* ; "Edited 29-Jun-2021 17:06 by rmk:")

                                                              (* rda%: "22-Aug-84 16:11")

     (SELECTQ PROP
@@ -605,6 +606,7 @@ Copyright (c) 1981-1993, 1999, 2020-2022 by Venue & Xerox Corporation.
                         (AND VALUE (\EXTERNALFORMAT STREAM VALUE)))])
         (ENDOFSTREAMOP (PROG1 (fetch
 (STREAM ENDOFSTREAMOP) of
 STREAM)
                            (replace
 (STREAM ENDOFSTREAMOP) of
 STREAM with
 VALUE)))
+        (LINELENGTH (LINELENGTH VALUE STREAM))
         (PROG ((OLDDATA (fetch
 OTHERPROPS of
 STREAM))
                OLDVALUE)
               (RETURN (PROG1 (COND
@@ -1444,7 +1446,8 @@ Copyright (c) 1981-1993, 1999, 2020-2022 by Venue & Xerox Corporation.
                 (GO RETRY])
 
 (\DO.PARAMS.AT.OPEN

-  [LAMBDA (STREAM ACCESS PARAMETERS)
                         (* ; "Edited  6-Jul-2022 00:00 by rmk")


+  [LAMBDA (STREAM ACCESS PARAMETERS)
                         (* ; "Edited 25-Aug-2023 08:43 by rmk")


+                                                             (* ; "Edited  6-Jul-2022 00:00 by rmk")


                                                              (* ; "Edited 19-Dec-2021 09:30 by rmk")


                                                              (* ; "Edited 14-Dec-2021 16:10 by rmk")


                                                              (* ; "Edited 13-Dec-2021 15:20 by rmk")


@@ -1453,6 +1456,8 @@ Copyright (c) 1981-1993, 1999, 2020-2022 by Venue & Xerox Corporation.
 
     (* ;; "Does generic parameters when a file/stream is open.  Called by \OPENFILE and OPENSTREAM")

 
+    (* ;; "RMK: August 2023:  Added PUTSTREAMPROP as last resort.")

+
     (* ;; "RMK  July 2020:  Make sure that \EXTERNALFORMAT is always called, so that it can implement per-device defaults.")

 
     (* ;; 
@@ -1475,7 +1480,7 @@ Copyright (c) 1981-1993, 1999, 2020-2022 by Venue & Xerox Corporation.
                                          (CONVHANKAKU (CONVHANKAKU STREAM VAL))
                                          ((EOL EOLCONVENTION EOLC) 
                                               (SETFILEINFO
 STREAM 'EOL VAL))
-                                         NIL))
+                                         (PUTSTREAMPROP
 STREAM ATTR VAL)))
     (FOR
 FN IN
 STREAM-AFTER-OPEN-FNS DO
 (APPLY* FN STREAM ACCESS PARAMETERS])
 
 (\RENAMEFILE

@@ -2374,37 +2379,36 @@ update the map")

                      STREAM])
 
 (CHARSET

-  [LAMBDA (STREAM NEWVALUE)
                              (* ; "Edited 11-Sep-87 16:22 by bvm:")

+  [LAMBDA (STREAM NEWVALUE DONTMARKFILE)
                     (* ; "Edited  8-Dec-2023 15:04 by rmk")


+                                                             (* ; "Edited 11-Sep-87 16:22 by bvm:")

 
-    (* ;; "Public access to a stream's CHARSET.  If NEWVALUE is given, changes the charset (which for output streams can write a charset shift).  We invoke the stream's device's get/set charset method on the stream, and also invoke the IMCHARSET image operation (which is where file streams get to write a charset shift).")

-
-    (* ;; "If CHARACTERSET is either 255 or T, set the stream so that it's non run-coded, i.e., you read 2 bytes for each character read.")

+    (* ;; "Public access to a stream's CHARSET.  If NEWVALUE is given, changes the charset (which for output streams can write a charset shift, depending on the external format, unless DONTMARKFILE).  ACCESS-CHARSET recurses through  any commonlisp meta-streams, eventually reaches \GENERIC.CHARSET, which then applies the format's FORMATCHARSETFN.  ")

 
     (SETQ STREAM (\GETSTREAM STREAM))
     (COND
-       ((EQ NEWVALUE NSCHARSETSHIFT)                         (* ; "Coerce 255 to T for uniformity")

+       ((EQ NEWVALUE NSCHARSETSHIFT)                         (* ; "Coerce 255 to T for uniformity")

         (SETQ NEWVALUE T))
        ([NOT (OR (EQ NEWVALUE NIL)
                  (EQ NEWVALUE T)
                  (AND (>= NEWVALUE 0)
                       (< NEWVALUE \MAXCHARSET]
         (\ILLEGAL.ARG NEWVALUE)))
-    (LET [(OLDVAL (ACCESS-CHARSET
 STREAM (if
 (EQ NEWVALUE T)
-                                                 then
 NSCHARSETSHIFT
-                                               else
 NEWVALUE]
-                                                             (* ; "First modify the stream's slot")

+    (LET ((OLDVAL (ACCESS-CHARSET
 STREAM (if
 (EQ NEWVALUE T)
+                                             then
 NSCHARSETSHIFT
+                                           else
 NEWVALUE)
+                         DONTMARKFILE)))                     (* ; "First modify the stream's slot")

          (if
 (EQ OLDVAL NSCHARSETSHIFT)
              then
 (SETQ OLDVAL T))
-         (if
 (AND NEWVALUE (NEQ OLDVAL NEWVALUE))
-             then
                                        (* ; 
-
                                          "Now invoke the imageop if anything interesting happened")

-                   (IMAGEOP 'IMCHARSET STREAM STREAM NEWVALUE))
          OLDVAL])
 
 (ACCESS-CHARSET

-  [LAMBDA (STREAM NEWVALUE)
                              (* ; "Edited 11-Sep-87 15:46 by bvm:")

+  [LAMBDA (STREAM NEWVALUE DONTMARKFILE)
                     (* ; "Edited  8-Dec-2023 15:05 by rmk")


+                                                             (* ; "Edited 11-Sep-87 15:46 by bvm:")

+
+    (* ;; "Unless DONTMARKSTREAM, if STREAM is open for output, the external format function may modify the backing file as well as the stream, e.g. put in XCCS shifting bytes.")

+
     (FDEVOP 'CHARSETFN (fetch
 (STREAM DEVICE) of
 STREAM)
-           STREAM NEWVALUE])
+           STREAM NEWVALUE DONTMARKFILE])
 
 (GETEOFPTR

   [LAMBDA (FILE)
                                         (* rmk%: "21-OCT-83 11:19")

@@ -2664,12 +2668,29 @@ update the map")

                                      (\BACKCCODE.EOLC STRM)))])])
 
 (\GENERIC.CHARSET

-  [LAMBDA (STREAM NEWVALUE)
                              (* ; "Edited 11-Sep-87 16:20 by bvm:")

+  [LAMBDA (STREAM NEWVALUE DONTMARKSTREAM)
                   (* ; "Edited  8-Dec-2023 15:17 by rmk")


+                                                             (* ; "Edited 11-Sep-87 16:20 by bvm:")

 
-(* ;;; "sets or returns the current numeric character set for this stream.  This never writes anything on a stream, it just tells the stream what to think.")

+(* ;;; "sets or returns the current numeric character set for this stream.  This applies the stream's FORMATCHARSETFN if it has one, and (if MARKSTREAM) that may change an output backing stream in some way (e.g. write XCCS charset shift bytes).  Otherwise, this just sets the charset stream parameter to influence subsequent reading and writing behavior.  Charset doesn't exist in some formats (e.g. UTF-8), the format function would be a noop in that case.")

 
-    (PROG1 (ffetch
 (STREAM CHARSET) of
 (\DTEST STREAM 'STREAM))
-        (AND NEWVALUE (freplace
 (STREAM CHARSET) of
 STREAM with
 NEWVALUE)))])
+    (\DTEST STREAM 'STREAM)
+    (LET ((EFORMAT (ffetch
 (STREAM EXTERNALFORMAT) of
 STREAM))
+          OLDVALUE)
+         (if
 (AND EFORMAT (fetch
 (EXTERNALFORMAT FORMATCHARSETFN) of
 EFORMAT))
+             then
 (APPLY* (fetch
 (EXTERNALFORMAT FORMATCHARSETFN) of
 EFORMAT)
+                         STREAM NEWVALUE DONTMARKSTREAM)
+           else
 (SETQ OLDVALUE (ffetch
 (STREAM CHARSET) of
 STREAM))
+                (CL:WHEN NEWVALUE
+                    (freplace
 (STREAM CHARSET) of
 STREAM with
 NEWVALUE)
+                    (CL:UNLESS (OR DONTMARKSTREAM (EQ NEWVALUE OLDVALUE)
+                                   (NOT (\IOMODEP STREAM 'OUTPUT T)))
+                        (\BOUT
 STREAM NSCHARSETSHIFT)
+                        (if
 (OR (EQ CHARSET T)
+                                (EQ CHARSET NSCHARSETSHIFT))
+                            then
 (\BOUT
 STREAM NSCHARSETSHIFT)
+                                 (\BOUT
 STREAM 0)
+                          else
 (\BOUT
 STREAM CHARSET))))
+                OLDVALUE])
 )
 (DEFINEQ
 
@@ -2708,11 +2729,12 @@ update the map")

                                          (T PATHNAME?))))
 )
 
-(DEFOPTIMIZER ACCESS-CHARSET
 (STREAM &OPTIONAL NEWVALUE)
+(DEFOPTIMIZER ACCESS-CHARSET
 (STREAM &OPTIONAL NEWVALUE MARKSTREAM)
                              `((OPENLAMBDA (STRM)
                                  (FDEVOP 'CHARSETFN (fetch
 (STREAM DEVICE) of
 STRM)
                                         STRM
-                                        ,NEWVALUE))
+                                        ,NEWVALUE
+                                        ,MARKSTREAM))
                                ,STREAM))
 
 (* "END EXPORTED DEFINITIONS")
@@ -3092,42 +3114,40 @@ update the map")

 
 (ADDTOVAR LAMA
 \IS.NOT.RANDACCESSP \ILLEGAL.DEVICEOP STREAMPROP)
 )
-(PUTPROPS FILEIO COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1989 
-1990 1991 1992 1993 1999 2020 2021 2022))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (27805 31611 (STREAMPROP 27815 . 28249) (GETSTREAMPROP 28251 . 28846) (PUTSTREAMPROP 
-28848 . 31459) (STREAMP 31461 . 31609)) (31654 35033 (\DEFPRINT.BY.NAME 31664 . 32816) (
-\STREAM.DEFPRINT 32818 . 34726) (\FDEV.DEFPRINT 34728 . 35031)) (35291 40332 (\GETACCESS 35301 . 35755
-) (\SETACCESS 35757 . 40330)) (60558 66527 (\DEFINEDEVICE 60568 . 62884) (\GETDEVICEFROMNAME 62886 . 
-63359) (\GETDEVICEFROMHOSTNAME 63361 . 64405) (\REMOVEDEVICE 64407 . 65530) (\REMOVEDEVICE.NAMES 65532
- . 66525)) (66567 91885 (\CLOSEFILE 66577 . 67402) (\DELETEFILE 67404 . 67698) (\DEVICEEVENT 67700 . 
-69470) (\GENERATEFILES 69472 . 70419) (\GENERATENEXTFILE 70421 . 71072) (\GENERATEFILEINFO 71074 . 
-71535) (\GETFILENAME 71537 . 71926) (\GENERIC.OUTFILEP 71928 . 72398) (\OPENFILE 72400 . 74978) (
-\DO.PARAMS.AT.OPEN 74980 . 77295) (\RENAMEFILE 77297 . 77721) (\REVALIDATEFILE 77723 . 80325) (
-\PAGED.REVALIDATEFILELST 80327 . 81885) (\PAGED.REVALIDATEFILES 81887 . 83606) (\PAGED.REVALIDATEFILE 
-83608 . 85891) (\BUFFERED.REVALIDATEFILE 85893 . 88179) (\BUFFERED.REVALIDATEFILELST 88181 . 89365) (
-\PRINT-REVALIDATION-RESULT 89367 . 90209) (\TRUNCATEFILE 90211 . 90602) (\FILE-CONFLICT 90604 . 91883)
-) (91921 96584 (\GENERATENOFILES 91931 . 94027) (\NULLFILEGENERATOR 94029 . 94273) (\NOFILESNEXTFILEFN
- 94275 . 96266) (\NOFILESINFOFN 96268 . 96582)) (96703 98611 (\FILE.NOT.OPEN 96713 . 97226) (
-\FILE.WONT.OPEN 97228 . 97556) (\ILLEGAL.DEVICEOP 97558 . 97840) (\IS.NOT.RANDACCESSP 97842 . 98288) (
-\STREAM.NOT.OPEN 98290 . 98609)) (98746 101044 (\FDEVINSTANCE 98756 . 101042)) (102246 109620 (CNDIR 
-102256 . 103561) (DIRECTORYNAME 103563 . 107746) (DIRECTORYNAMEP 107748 . 108364) (HOSTNAMEP 108366 . 
-109173) (\ADD.CONNECTED.DIR 109175 . 109618)) (109665 137938 (\BACKFILEPTR 109675 . 109863) (
-\BACKPEEKBIN 109865 . 110226) (\BACKBIN 110228 . 110579) (BIN 110581 . 110798) (\BIN 110800 . 111077) 
-(\BINS 111079 . 111365) (BOUT 111367 . 111729) (\BOUT 111731 . 112046) (\BOUTS 112048 . 112359) (
-COPYBYTES 112361 . 115693) (COPYCHARS 115695 . 119361) (COPYFILE 119363 . 120427) (\COPYOPENFILE 
-120429 . 123628) (\INFER.FILE.TYPE 123630 . 124584) (EOFP 124586 . 124883) (FORCEOUTPUT 124885 . 
-125132) (\FLUSH.OPEN.STREAMS 125134 . 125490) (CHARSET 125492 . 127156) (ACCESS-CHARSET 127158 . 
-127375) (GETEOFPTR 127377 . 127627) (GETFILEINFO 127629 . 130822) (\TYPE.FROM.FILETYPE 130824 . 131294
-) (\FILETYPE.FROM.TYPE 131296 . 131475) (GETFILEPTR 131477 . 131729) (SETFILEINFO 131731 . 135837) (
-SETFILEPTR 135839 . 137558) (BOUT16 137560 . 137745) (BIN16 137747 . 137936)) (138041 143357 (
-\GENERIC.BINS 138051 . 138331) (\GENERIC.BOUTS 138333 . 138598) (\GENERIC.RENAMEFILE 138600 . 140431) 
-(\GENERIC.OPENP 140433 . 141748) (\GENERIC.READP 141750 . 142902) (\GENERIC.CHARSET 142904 . 143355)) 
-(143358 143697 (\MAP-OPEN-STREAMS 143368 . 143695)) (145489 147569 (\EOF.ACTION 145499 . 145750) (
-\EOSERROR 145752 . 145945) (\GETEOFPTR 145947 . 146129) (\INCFILEPTR 146131 . 146481) (\PEEKBIN 146483
- . 146674) (\SETCLOSEDFILELENGTH 146676 . 147010) (\SETEOFPTR 147012 . 147200) (\SETFILEPTR 147202 . 
-147567)) (147570 148112 (\FIXPOUT 147580 . 147880) (\FIXPIN 147882 . 148110)) (148113 148679 (\BOUTEOL
- 148123 . 148677)) (151575 161439 (\BUFFERED.BIN 151585 . 152437) (\BUFFERED.PEEKBIN 152439 . 153221) 
-(\BUFFERED.BOUT 153223 . 154083) (\BUFFERED.BINS 154085 . 157770) (\BUFFERED.BOUTS 157772 . 159573) (
-\BUFFERED.COPYBYTES 159575 . 161437)))))
+  (FILEMAP (NIL (27732 31848 (STREAMPROP 27742 . 28176) (GETSTREAMPROP 28178 . 28927) (PUTSTREAMPROP 
+28929 . 31696) (STREAMP 31698 . 31846)) (31891 35270 (\DEFPRINT.BY.NAME 31901 . 33053) (
+\STREAM.DEFPRINT 33055 . 34963) (\FDEV.DEFPRINT 34965 . 35268)) (35528 40569 (\GETACCESS 35538 . 35992
+) (\SETACCESS 35994 . 40567)) (60795 66764 (\DEFINEDEVICE 60805 . 63121) (\GETDEVICEFROMNAME 63123 . 
+63596) (\GETDEVICEFROMHOSTNAME 63598 . 64642) (\REMOVEDEVICE 64644 . 65767) (\REMOVEDEVICE.NAMES 65769
+ . 66762)) (66804 92336 (\CLOSEFILE 66814 . 67639) (\DELETEFILE 67641 . 67935) (\DEVICEEVENT 67937 . 
+69707) (\GENERATEFILES 69709 . 70656) (\GENERATENEXTFILE 70658 . 71309) (\GENERATEFILEINFO 71311 . 
+71772) (\GETFILENAME 71774 . 72163) (\GENERIC.OUTFILEP 72165 . 72635) (\OPENFILE 72637 . 75215) (
+\DO.PARAMS.AT.OPEN 75217 . 77746) (\RENAMEFILE 77748 . 78172) (\REVALIDATEFILE 78174 . 80776) (
+\PAGED.REVALIDATEFILELST 80778 . 82336) (\PAGED.REVALIDATEFILES 82338 . 84057) (\PAGED.REVALIDATEFILE 
+84059 . 86342) (\BUFFERED.REVALIDATEFILE 86344 . 88630) (\BUFFERED.REVALIDATEFILELST 88632 . 89816) (
+\PRINT-REVALIDATION-RESULT 89818 . 90660) (\TRUNCATEFILE 90662 . 91053) (\FILE-CONFLICT 91055 . 92334)
+) (92372 97035 (\GENERATENOFILES 92382 . 94478) (\NULLFILEGENERATOR 94480 . 94724) (\NOFILESNEXTFILEFN
+ 94726 . 96717) (\NOFILESINFOFN 96719 . 97033)) (97154 99062 (\FILE.NOT.OPEN 97164 . 97677) (
+\FILE.WONT.OPEN 97679 . 98007) (\ILLEGAL.DEVICEOP 98009 . 98291) (\IS.NOT.RANDACCESSP 98293 . 98739) (
+\STREAM.NOT.OPEN 98741 . 99060)) (99197 101495 (\FDEVINSTANCE 99207 . 101493)) (102697 110071 (CNDIR 
+102707 . 104012) (DIRECTORYNAME 104014 . 108197) (DIRECTORYNAMEP 108199 . 108815) (HOSTNAMEP 108817 . 
+109624) (\ADD.CONNECTED.DIR 109626 . 110069)) (110116 138395 (\BACKFILEPTR 110126 . 110314) (
+\BACKPEEKBIN 110316 . 110677) (\BACKBIN 110679 . 111030) (BIN 111032 . 111249) (\BIN 111251 . 111528) 
+(\BINS 111530 . 111816) (BOUT 111818 . 112180) (\BOUT 112182 . 112497) (\BOUTS 112499 . 112810) (
+COPYBYTES 112812 . 116144) (COPYCHARS 116146 . 119812) (COPYFILE 119814 . 120878) (\COPYOPENFILE 
+120880 . 124079) (\INFER.FILE.TYPE 124081 . 125035) (EOFP 125037 . 125334) (FORCEOUTPUT 125336 . 
+125583) (\FLUSH.OPEN.STREAMS 125585 . 125941) (CHARSET 125943 . 127302) (ACCESS-CHARSET 127304 . 
+127832) (GETEOFPTR 127834 . 128084) (GETFILEINFO 128086 . 131279) (\TYPE.FROM.FILETYPE 131281 . 131751
+) (\FILETYPE.FROM.TYPE 131753 . 131932) (GETFILEPTR 131934 . 132186) (SETFILEINFO 132188 . 136294) (
+SETFILEPTR 136296 . 138015) (BOUT16 138017 . 138202) (BIN16 138204 . 138393)) (138498 145152 (
+\GENERIC.BINS 138508 . 138788) (\GENERIC.BOUTS 138790 . 139055) (\GENERIC.RENAMEFILE 139057 . 140888) 
+(\GENERIC.OPENP 140890 . 142205) (\GENERIC.READP 142207 . 143359) (\GENERIC.CHARSET 143361 . 145150)) 
+(145153 145492 (\MAP-OPEN-STREAMS 145163 . 145490)) (147347 149427 (\EOF.ACTION 147357 . 147608) (
+\EOSERROR 147610 . 147803) (\GETEOFPTR 147805 . 147987) (\INCFILEPTR 147989 . 148339) (\PEEKBIN 148341
+ . 148532) (\SETCLOSEDFILELENGTH 148534 . 148868) (\SETEOFPTR 148870 . 149058) (\SETFILEPTR 149060 . 
+149425)) (149428 149970 (\FIXPOUT 149438 . 149738) (\FIXPIN 149740 . 149968)) (149971 150537 (\BOUTEOL
+ 149981 . 150535)) (153433 163297 (\BUFFERED.BIN 153443 . 154295) (\BUFFERED.PEEKBIN 154297 . 155079) 
+(\BUFFERED.BOUT 155081 . 155941) (\BUFFERED.BINS 155943 . 159628) (\BUFFERED.BOUTS 159630 . 161431) (
+\BUFFERED.COPYBYTES 161433 . 163295)))))
 STOP

sources/FILEPKG

@@ -1,18 +1,15 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "18-Jul-2023 23:40:13" {WMEDLEY}<sources>FILEPKG.;50
 274539 
+
(FILECREATED "18-Apr-2024 12:53:26" {DSK}<home>larry>il>medley>sources>FILEPKG.;53
 273166 
 
-      :EDIT-BY rmk
+      :EDIT-BY "lmm"
 
-      :CHANGES-TO (FNS GATHEREXPORTS)
+      :CHANGES-TO (VARS FILEPKGCOMS)
+                  (FNS MAKEFILE)
 
-      :PREVIOUS-DATE "13-Jul-2023 14:56:21" {WMEDLEY}<sources>FILEPKG.;48)
+      :PREVIOUS-DATE "18-Apr-2024 12:33:38" {DSK}<home>larry>il>medley>sources>FILEPKG.;52)
 
 
-(* ; "
-Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation.
-")
-
 (PRETTYCOMPRINT FILEPKGCOMS)
 
 (RPAQQ FILEPKGCOMS

@@ -400,13 +397,13 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation.
        (T (COMPILEFILES0
 FILES])
 
 (COMPILEFILES0

-  [LAMBDA (FILES OPTIONS)                                    (* rmk%: "19-FEB-83 21:59")

-    (for
 X OPTS (RCFLG _ T) on
 (OR FILES NOTCOMPILEDFILES) first
 (SETQ OPTS
-                                                                  (SELECTQ (CAR (LISTP OPTIONS))
-                                                                      (C (SETQ RCFLG NIL)
-                                                                         (CDR OPTIONS))
-                                                                      (RC (CDR OPTIONS))
-                                                                      OPTIONS))
+  [LAMBDA (FILES OPTIONS)
                                    (* ; "Edited 30-Jan-2024 15:03 by lmm")

+                                                             (* rmk%: "19-FEB-83 21:59")

+    (for
 X OPTS RCFLG on
 (OR FILES NOTCOMPILEDFILES) first
 (SETQ OPTS (SELECTQ (CAR (LISTP OPTIONS))
+                                                                          (C (SETQ RCFLG NIL)
+                                                                             (CDR OPTIONS))
+                                                                          (RC (CDR OPTIONS))
+                                                                          OPTIONS))
        do
 (MAKEFILE1
 (OR (MISSPELLED? (CAR X)
                                 70 FILELST NIL X)
                          (CAR X))
@@ -437,7 +434,8 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation.
           (RETURN FILE])
 
 (MAKEFILE

-  [LAMBDA (FILE OPTIONS REPRINTFNS SOURCEFILE)
              (* ; "Edited 10-Oct-2021 20:36 by rmk:")


+  [LAMBDA (FILE OPTIONS REPRINTFNS SOURCEFILE)
               (* ; "Edited 30-Jan-2024 12:50 by lmm")


+                                                            (* ; "Edited 10-Oct-2021 20:36 by rmk:")


                                                             (* ; "Edited 29-Jun-2021 17:24 by rmk:")

 
     (* ;; "OPTIONS: FAST means dump with PRETTYFLG set to NIL;  LIST means list the FILE;  RC means RECOMPILE, C means COMPILEL;  --- for C AND RC assume ST unless next option is F.")

@@ -462,35 +460,14 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation.
           (SETQ CHANGES (fetch
 TOBEDUMPED of
 FILEPROP))
           (SETQ FILEDATES (LISTP (fetch
 FILEDATES of
 ROOTNAME)))
           (SETQ FILETYPE (GETPROP ROOTNAME 'FILETYPE))
-      LP0 (if
 (AND (NULL (fetch
 LOADTYPE of
 FILEPROP))
+          (if
 (AND (NULL (fetch
 LOADTYPE of
 FILEPROP))
                    (NULL FILEDATES))
               then
                                           (* ; 
 
                     "File has never been loaded and never dumped i.e. user just set up COMS in core")

-            elseif
 [OR (EQMEMB 'NEW OPTIONS)
+            elseif
 [OR (MEMB 'NEW OPTIONS)
                        (AND (NULL MAKEFILEREMAKEFLG)
                             (NOT (MEMB 'REMAKE OPTIONS]
-              then
 (COND
-                      ((AND (fetch
 LOADTYPE of
 FILEPROP)
-                            (NEQ T (fetch
 LOADTYPE of
 FILEPROP)))
-                       (LISPXPRIN2 FILE T T)
-                       (LISPXPRIN1 (SELECTQ (fetch
 LOADTYPE of
 FILEPROP)
-                                       (LOADCOMP "the file was loaded for compilation purposes only")
-                                       ((compiled Compiled COMPILED) 
-                                            " -- only the compiled file has been loaded
-")
-                                       ((loadfns LOADFNS) 
-                                            " -- only some of its symbolics have been loaded
-")
-                                       (SHOULDNT))
-                              T)
-                       (COND
-                          ((NEQ (ASKUSER DWIMWAIT 'Y "Go ahead and MAKEFILE anyway? ")
-                                'Y)                          (* ; 
-
              "E.g. user loads a .com file and then resets the COMS or defines the functons by hand.")

-                           (GO OUT)))
-                       (/replace
 LOADTYPE of
 FILEPROP with
 NIL)))
-                   (SETQ SOURCEFILE NIL)
-                   (SETQ REPRINTFNS NIL)
+              then
 (RETURN (MAKEFILE-NEW
 FILE OPTIONS))
             elseif
 SOURCEFILE
               then
                                           (* ; "source file given")

             elseif
 [AND FILEDATES (OR [AND (SETQ SOURCEFILE (FINDFILE ROOTNAME T))
@@ -519,11 +496,7 @@ Copyright (c) 1982-1993, 1995, 2018, 2022 by Venue & Xerox Corporation.
                  (LISPXPRIN2 FILE T T)
                  (LISPXPRIN1 '", so it will have to be written anew
 " T)
-                 (SETQ SOURCEFILE NIL)
-                 (SETQ REPRINTFNS NIL)
-                 (push
 OPTIONS 'NEW)
-                 (SETQ CHANGES (fetch
 FILECHANGES of
 ROOTNAME))
-                 (GO LP0))
+                 (RETURN (MAKEFILE-NEW
 FILE OPTIONS)))
           (COND
              ((AND SOURCEFILE (SETQ Z (SELECTQ (fetch
 LOADTYPE of
 FILEPROP)
                                           (LOADCOMP          (* ; 
@@ -4858,49 +4831,47 @@ compiling " T)
 
 (ADDTOVAR LAMA
 FILEPKGTYPE FILEPKGCOM FILEPKGCHANGES)
 )
-(PUTPROPS FILEPKG COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1989 1990 
-1991 1992 1993 1995 2018 2022))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (18975 20648 (SEARCHPRETTYTYPELST 18985 . 19954) (PRETTYDEFMACROS 19956 . 20392) (
-FILEPKGCOMPROPS 20394 . 20646)) (21461 55753 (CLEANUP 21471 . 22861) (COMPILEFILES 22863 . 23139) (
-COMPILEFILES0 23141 . 23954) (CONTINUEDIT 23956 . 25333) (MAKEFILE 25335 . 37061) (FILECHANGES 37063
- . 39827) (FILEPKG.MERGECHANGES 39829 . 40464) (FILEPKG.CHANGEDFNS 40466 . 40778) (MAKEFILE1 40780 . 
-44992) (COMPILE-FILE? 44994 . 46581) (MAKEFILES 46583 . 48111) (ADDFILE 48113 . 50656) (ADDFILE0 50658
- . 54782) (LISTFILES 54784 . 55751)) (56425 90011 (FILEPKGCHANGES 56435 . 57614) (GETFILEPKGTYPE 57616
- . 60566) (MARKASCHANGED 60568 . 62199) (FILECOMS 62201 . 62585) (WHEREIS 62587 . 64116) (
-SMASHFILECOMS 64118 . 64346) (FILEFNSLST 64348 . 64514) (FILECOMSLST 64516 . 65002) (UPDATEFILES 65004
- . 69502) (INFILECOMS? 69504 . 71347) (INFILECOMTAIL 71349 . 72467) (INFILECOMS 72469 . 72630) (
-INFILECOM 72632 . 82650) (INFILECOMSVALS 82652 . 82959) (INFILECOMSVAL 82961 . 83969) (INFILECOMSPROP 
-83971 . 84764) (IFCPROPS 84766 . 85846) (IFCEXPRTYPE 85848 . 86464) (IFCPROPSCAN 86466 . 87427) (
-IFCDECLARE 87429 . 88688) (INFILEPAIRS 88690 . 88989) (INFILECOMSMACRO 88991 . 90009)) (90046 120732 (
-FILES? 90056 . 92167) (FILES?1 92169 . 92871) (FILES?PRINTLST 92873 . 93655) (ADDTOFILES? 93657 . 
-104200) (ADDTOFILE 104202 . 105118) (WHATIS 105120 . 107096) (ADDTOCOMS 107098 . 108636) (ADDTOCOM 
-108638 . 115125) (ADDTOCOM1 115127 . 116298) (ADDNEWCOM 116300 . 117350) (MAKENEWCOM 117352 . 119199) 
-(DEFAULTMAKENEWCOM 119201 . 120730)) (120802 123619 (MERGEINSERT 120812 . 123155) (MERGEINSERT1 123157
- . 123617)) (123773 125134 (ADDTOFILEKEYLST 123783 . 125132)) (125251 136052 (DELFROMFILES 125261 . 
-126091) (DELFROMCOMS 126093 . 127772) (DELFROMCOM 127774 . 133539) (DELFROMCOM1 133541 . 134340) (
-REMOVEITEM 134342 . 135218) (MOVETOFILE 135220 . 136050)) (136266 138637 (SAVEPUT 136276 . 138635)) (
-138762 147005 (UNMARKASCHANGED 138772 . 140256) (PREEDITFN 140258 . 142739) (POSTEDITPROPS 142741 . 
-145035) (POSTEDITALISTS 145037 . 147003)) (147150 166620 (ALISTS.GETDEF 147160 . 147539) (
-ALISTS.WHENCHANGED 147541 . 148187) (CLEARCLISPARRAY 148189 . 149367) (EXPRESSIONS.WHENCHANGED 149369
- . 149747) (MAKEALISTCOMS 149749 . 150764) (MAKEFILESCOMS 150766 . 152096) (MAKELISPXMACROSCOMS 152098
- . 154116) (MAKEPROPSCOMS 154118 . 154744) (MAKEUSERMACROSCOMS 154746 . 156563) (PROPS.WHENCHANGED 
-156565 . 157186) (FILEGETDEF.LISPXMACROS 157188 . 158487) (FILEGETDEF.ALISTS 158489 . 159080) (
-FILEGETDEF.RECORDS 159082 . 160009) (FILEGETDEF.PROPS 160011 . 160806) (FILEGETDEF.MACROS 160808 . 
-161690) (FILEGETDEF.VARS 161692 . 162295) (FILEGETDEF.FNS 162297 . 163537) (FILEPKGCOMS.PUTDEF 163539
- . 165481) (FILES.PUTDEF 165483 . 166351) (VARS.PUTDEF 166353 . 166496) (FILES.WHENCHANGED 166498 . 
-166618)) (168642 175873 (RENAME 168652 . 170097) (CHANGECALLERS 170099 . 175871)) (175874 223783 (
-SHOWDEF 175884 . 177081) (COPYDEF 177083 . 179831) (GETDEF 179833 . 182376) (GETDEFCOM 182378 . 183344
-) (GETDEFCOM0 183346 . 184539) (GETDEFCURRENT 184541 . 190853) (GETDEFERR 190855 . 192125) (
-GETDEFFROMFILE 192127 . 196356) (GETDEFSAVED 196358 . 197446) (PUTDEF 197448 . 198155) (EDITDEF 198157
- . 199140) (DEFAULT.EDITDEF 199142 . 201980) (EDITDEF.FILES 201982 . 202187) (LOADDEF 202189 . 202365)
- (DWIMDEF 202367 . 203221) (DELDEF 203223 . 206117) (DELFROMLIST 206119 . 206623) (HASDEF 206625 . 
-212862) (GETFILEDEF 212864 . 213376) (SAVEDEF 213378 . 215066) (UNSAVEDEF 215068 . 215964) (
-COMPAREDEFS 215966 . 219772) (COMPARE 219774 . 220478) (TYPESOF 220480 . 223781)) (223933 232181 (
-FILEPKGCOM 223943 . 228719) (FILEPKGTYPE 228721 . 232179)) (244214 261689 (FINDCALLERS 244224 . 244854
-) (EDITCALLERS 244856 . 255573) (EDITFROMFILE 255575 . 261004) (FINDATS 261006 . 261278) (LOOKIN 
-261280 . 261687)) (261690 263361 (SEPRCASE 261700 . 263359)) (263878 268881 (IMPORTFILE 263888 . 
-264858) (IMPORTEVAL 264860 . 265746) (IMPORTFILESCAN 265748 . 266161) (CHECKIMPORTS 266163 . 267419) (
-GATHEREXPORTS 267421 . 268289) (\DUMPEXPORTS 268291 . 268879)) (269219 271289 (CLEARFILEPKG 269229 . 
-271287)))))
+  (FILEMAP (NIL (18960 20633 (SEARCHPRETTYTYPELST 18970 . 19939) (PRETTYDEFMACROS 19941 . 20377) (
+FILEPKGCOMPROPS 20379 . 20631)) (21446 54515 (CLEANUP 21456 . 22846) (COMPILEFILES 22848 . 23124) (
+COMPILEFILES0 23126 . 23992) (CONTINUEDIT 23994 . 25371) (MAKEFILE 25373 . 35823) (FILECHANGES 35825
+ . 38589) (FILEPKG.MERGECHANGES 38591 . 39226) (FILEPKG.CHANGEDFNS 39228 . 39540) (MAKEFILE1 39542 . 
+43754) (COMPILE-FILE? 43756 . 45343) (MAKEFILES 45345 . 46873) (ADDFILE 46875 . 49418) (ADDFILE0 49420
+ . 53544) (LISTFILES 53546 . 54513)) (55187 88773 (FILEPKGCHANGES 55197 . 56376) (GETFILEPKGTYPE 56378
+ . 59328) (MARKASCHANGED 59330 . 60961) (FILECOMS 60963 . 61347) (WHEREIS 61349 . 62878) (
+SMASHFILECOMS 62880 . 63108) (FILEFNSLST 63110 . 63276) (FILECOMSLST 63278 . 63764) (UPDATEFILES 63766
+ . 68264) (INFILECOMS? 68266 . 70109) (INFILECOMTAIL 70111 . 71229) (INFILECOMS 71231 . 71392) (
+INFILECOM 71394 . 81412) (INFILECOMSVALS 81414 . 81721) (INFILECOMSVAL 81723 . 82731) (INFILECOMSPROP 
+82733 . 83526) (IFCPROPS 83528 . 84608) (IFCEXPRTYPE 84610 . 85226) (IFCPROPSCAN 85228 . 86189) (
+IFCDECLARE 86191 . 87450) (INFILEPAIRS 87452 . 87751) (INFILECOMSMACRO 87753 . 88771)) (88808 119494 (
+FILES? 88818 . 90929) (FILES?1 90931 . 91633) (FILES?PRINTLST 91635 . 92417) (ADDTOFILES? 92419 . 
+102962) (ADDTOFILE 102964 . 103880) (WHATIS 103882 . 105858) (ADDTOCOMS 105860 . 107398) (ADDTOCOM 
+107400 . 113887) (ADDTOCOM1 113889 . 115060) (ADDNEWCOM 115062 . 116112) (MAKENEWCOM 116114 . 117961) 
+(DEFAULTMAKENEWCOM 117963 . 119492)) (119564 122381 (MERGEINSERT 119574 . 121917) (MERGEINSERT1 121919
+ . 122379)) (122535 123896 (ADDTOFILEKEYLST 122545 . 123894)) (124013 134814 (DELFROMFILES 124023 . 
+124853) (DELFROMCOMS 124855 . 126534) (DELFROMCOM 126536 . 132301) (DELFROMCOM1 132303 . 133102) (
+REMOVEITEM 133104 . 133980) (MOVETOFILE 133982 . 134812)) (135028 137399 (SAVEPUT 135038 . 137397)) (
+137524 145767 (UNMARKASCHANGED 137534 . 139018) (PREEDITFN 139020 . 141501) (POSTEDITPROPS 141503 . 
+143797) (POSTEDITALISTS 143799 . 145765)) (145912 165382 (ALISTS.GETDEF 145922 . 146301) (
+ALISTS.WHENCHANGED 146303 . 146949) (CLEARCLISPARRAY 146951 . 148129) (EXPRESSIONS.WHENCHANGED 148131
+ . 148509) (MAKEALISTCOMS 148511 . 149526) (MAKEFILESCOMS 149528 . 150858) (MAKELISPXMACROSCOMS 150860
+ . 152878) (MAKEPROPSCOMS 152880 . 153506) (MAKEUSERMACROSCOMS 153508 . 155325) (PROPS.WHENCHANGED 
+155327 . 155948) (FILEGETDEF.LISPXMACROS 155950 . 157249) (FILEGETDEF.ALISTS 157251 . 157842) (
+FILEGETDEF.RECORDS 157844 . 158771) (FILEGETDEF.PROPS 158773 . 159568) (FILEGETDEF.MACROS 159570 . 
+160452) (FILEGETDEF.VARS 160454 . 161057) (FILEGETDEF.FNS 161059 . 162299) (FILEPKGCOMS.PUTDEF 162301
+ . 164243) (FILES.PUTDEF 164245 . 165113) (VARS.PUTDEF 165115 . 165258) (FILES.WHENCHANGED 165260 . 
+165380)) (167404 174635 (RENAME 167414 . 168859) (CHANGECALLERS 168861 . 174633)) (174636 222545 (
+SHOWDEF 174646 . 175843) (COPYDEF 175845 . 178593) (GETDEF 178595 . 181138) (GETDEFCOM 181140 . 182106
+) (GETDEFCOM0 182108 . 183301) (GETDEFCURRENT 183303 . 189615) (GETDEFERR 189617 . 190887) (
+GETDEFFROMFILE 190889 . 195118) (GETDEFSAVED 195120 . 196208) (PUTDEF 196210 . 196917) (EDITDEF 196919
+ . 197902) (DEFAULT.EDITDEF 197904 . 200742) (EDITDEF.FILES 200744 . 200949) (LOADDEF 200951 . 201127)
+ (DWIMDEF 201129 . 201983) (DELDEF 201985 . 204879) (DELFROMLIST 204881 . 205385) (HASDEF 205387 . 
+211624) (GETFILEDEF 211626 . 212138) (SAVEDEF 212140 . 213828) (UNSAVEDEF 213830 . 214726) (
+COMPAREDEFS 214728 . 218534) (COMPARE 218536 . 219240) (TYPESOF 219242 . 222543)) (222695 230943 (
+FILEPKGCOM 222705 . 227481) (FILEPKGTYPE 227483 . 230941)) (242976 260451 (FINDCALLERS 242986 . 243616
+) (EDITCALLERS 243618 . 254335) (EDITFROMFILE 254337 . 259766) (FINDATS 259768 . 260040) (LOOKIN 
+260042 . 260449)) (260452 262123 (SEPRCASE 260462 . 262121)) (262640 267643 (IMPORTFILE 262650 . 
+263620) (IMPORTEVAL 263622 . 264508) (IMPORTFILESCAN 264510 . 264923) (CHECKIMPORTS 264925 . 266181) (
+GATHEREXPORTS 266183 . 267051) (\DUMPEXPORTS 267053 . 267641)) (267981 270051 (CLEARFILEPKG 267991 . 
+270049)))))
 STOP

sources/IMAGEIO

@@ -1,16 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "30-Oct-2021 19:09:48" {DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>IMAGEIO.;7
 80279  
+
(FILECREATED " 8-Dec-2023 21:42:20" {WMEDLEY}<sources>IMAGEIO.;8
 79284  
 
-      changes to%:  (FNS \NOIMAGE.DSPFONT)
+      :EDIT-BY rmk
 
-      previous date%: "25-Sep-2021 20:58:07" 
-{DSK}<Users>kaplan>Local>medley3.5>my-medley>sources>IMAGEIO.;5)
+      :CHANGES-TO (FNS \IMAGEIOINIT)
+                  (RECORDS IMAGEOPS)
 
+      :PREVIOUS-DATE "30-Oct-2021 19:09:48" {WMEDLEY}<sources>IMAGEIO.;7)
 
-(* ; "
-Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
-")
 
 (PRETTYCOMPRINT IMAGEIOCOMS)
 
@@ -701,9 +699,10 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
 (DEFINEQ
 
 (\IMAGEIOINIT

-  [LAMBDA NIL
                                            (* rrb "17-Sep-86 15:09")

-    (DECLARE
 (GLOBALVARS \NOIMAGEOPS))                   (* ; 
-
              "most of the functions are filled with NILL from the record declaration for IMAGEOPS")

+  [LAMBDA NIL
                                                (* ; "Edited  8-Dec-2023 21:38 by rmk")

+                                                             (* rrb "17-Sep-86 15:09")

+    (DECLARE
 (GLOBALVARS \NOIMAGEOPS))                       (* ; 
+
                "most of the functions are filled with NILL from the record declaration for IMAGEOPS")

     (SETQ \NOIMAGEOPS (create
 IMAGEOPS
                              IMAGETYPE _ NIL
                              IMXPOSITION _ [FUNCTION (LAMBDA (STREAM POS)
@@ -719,8 +718,8 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
                                                                    (DIFFERENCE \#DISPLAYLINES 
                                                                           \CURRENTDISPLAYLINE))
                                                            [COND
-                                                              (N (\UNIMPIMAGEOP
 STREAM
-                                                                        'DSPYPOSITION])]
+                                                              (N (\UNIMPIMAGEOP
 STREAM 'DSPYPOSITION])
+                                                       ]
                              IMFONT _ (FUNCTION \NOIMAGE.DSPFONT)
                              IMLEFTMARGIN _ (FUNCTION ZERO)
                              IMRIGHTMARGIN _ [FUNCTION (LAMBDA (STREAM N)
@@ -739,18 +738,6 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
                              IMSTRINGWIDTH _ [FUNCTION (LAMBDA (STREAM STR RDTBL)
                                                          (NCHARS STR RDTBL RDTBL]
                              IMCHARWIDTH _ [FUNCTION (LAMBDA NIL 1]
-                             IMCHARSET _ [FUNCTION (LAMBDA (STREAM CHARSET)
-
-                                 (* ;; "If we had another illegal character set value, then we could simply fix it so that the character set didn't match anything, which would cause the character set shift to be put out on the next character")

-
-                                                     (COND
-                                                        ((\IOMODEP STREAM 'OUTPUT T)
-                                                         (\BOUT STREAM NSCHARSETSHIFT)
-                                                         (COND
-                                                            ((EQ CHARSET T)
-                                                             (\BOUT STREAM NSCHARSETSHIFT)
-                                                             (\BOUT STREAM 0))
-                                                            (T (\BOUT STREAM CHARSET]
                              IMDRAWPOLYGON _ (FUNCTION NILL)
                              IMDRAWPOINT _ (FUNCTION NILL])
 
@@ -948,8 +935,9 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
                  IMNEWPAGE IMMOVETO IMSCALE IMTERPRI IMTOPMARGIN IMBOTTOMMARGIN IMSPACEFACTOR 
                  IMFONTCREATE IMOPERATION IMCOLOR IMSTRINGWIDTH IMCHARWIDTH IMCHARWIDTHY IMBACKCOLOR
                  IMBITMAPSIZE IMCLIPPINGREGION IMRESET IMDRAWPOLYGON IMFILLPOLYGON IMSCALEDBITBLT 
-                 IMWRITEPIXEL IMCHARSET IMROTATE IMDRAWARC IMTRANSLATE IMSCALE2 IMPUSHSTATE 
-                 IMPOPSTATE IMDEFAULTSTATE IMDRAWPOINT IMBLTCHAR IMXOFFSET IMYOFFSET)
+                 IMWRITEPIXEL (NIL POINTER                   (* ; "Was IMCHARSET")
)
+                 IMROTATE IMDRAWARC IMTRANSLATE IMSCALE2 IMPUSHSTATE IMPOPSTATE IMDEFAULTSTATE 
+                 IMDRAWPOINT IMBLTCHAR IMXOFFSET IMYOFFSET)
           IMCLOSEFN _ (FUNCTION NILL)
           IMTERPRI _ [FUNCTION (LAMBDA (STREAM)
                                  (\OUTCHAR STREAM (CHARCODE EOL]
@@ -980,7 +968,6 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
                                                            (BITMAPHEIGHT BITMAP))))
                                          (\ILLEGAL.ARG DIMENSION]
           IMWRITEPIXEL _ (FUNCTION NILL)
-          IMCHARSET _ (FUNCTION NILL)
           IMXPOSITION _ (FUNCTION NILL)
           IMYPOSITION _ (FUNCTION NILL)
           IMFONT _ (FUNCTION NILL)
@@ -1143,8 +1130,9 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
                  IMNEWPAGE IMMOVETO IMSCALE IMTERPRI IMTOPMARGIN IMBOTTOMMARGIN IMSPACEFACTOR 
                  IMFONTCREATE IMOPERATION IMCOLOR IMSTRINGWIDTH IMCHARWIDTH IMCHARWIDTHY IMBACKCOLOR
                  IMBITMAPSIZE IMCLIPPINGREGION IMRESET IMDRAWPOLYGON IMFILLPOLYGON IMSCALEDBITBLT 
-                 IMWRITEPIXEL IMCHARSET IMROTATE IMDRAWARC IMTRANSLATE IMSCALE2 IMPUSHSTATE 
-                 IMPOPSTATE IMDEFAULTSTATE IMDRAWPOINT IMBLTCHAR IMXOFFSET IMYOFFSET))
+                 IMWRITEPIXEL (NIL POINTER                   (* ; "Was IMCHARSET")
)
+                 IMROTATE IMDRAWARC IMTRANSLATE IMSCALE2 IMPUSHSTATE IMPOPSTATE IMDEFAULTSTATE 
+                 IMDRAWPOINT IMBLTCHAR IMXOFFSET IMYOFFSET))
 )
 (DECLARE%: DONTEVAL@LOAD DOCOPY 
 
@@ -1516,27 +1504,25 @@ Copyright (c) 1983-1991, 1993-1994, 1999, 2021 by Venue & Xerox Corporation.
 
 (ADDTOVAR LAMA
 IMAGESTREAMP)
 )
-(PUTPROPS IMAGEIO COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 1991 
-1993 1994 1999 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3343 12100 (IMAGESTREAMP 3353 . 4185) (IMAGESTREAMTYPE 4187 . 4400) (IMAGESTREAMTYPEP 
-4402 . 5037) (OPENIMAGESTREAM 5039 . 9993) (\GOOD.DASHLST 9995 . 12098)) (12135 14432 (DRAWDASHEDLINE 
-12145 . 14430)) (14433 21773 (DSPBACKCOLOR 14443 . 14815) (DSPBOTTOMMARGIN 14817 . 15202) (DSPCOLOR 
-15204 . 15568) (DSPCLIPPINGREGION 15570 . 16275) (DSPRESET 16277 . 16557) (DSPFONT 16559 . 16923) (
-DSPLEFTMARGIN 16925 . 17306) (DSPLINEFEED 17308 . 17608) (DSPOPERATION 17610 . 17987) (DSPRIGHTMARGIN 
-17989 . 18372) (DSPTOPMARGIN 18374 . 18753) (DSPSCALE 18755 . 19122) (DSPSPACEFACTOR 19124 . 19517) (
-DSPXPOSITION 19519 . 19824) (DSPYPOSITION 19826 . 20131) (DSPROTATE 20133 . 20428) (DSPPUSHSTATE 20430
- . 20676) (DSPPOPSTATE 20678 . 20921) (DSPDEFAULTSTATE 20923 . 21175) (DSPSCALE2 21177 . 21468) (
-DSPTRANSLATE 21470 . 21771)) (21774 30575 (DSPNEWPAGE 21784 . 22476) (DRAWBETWEEN 22478 . 23180) (
-DRAWCIRCLE 23182 . 23678) (DRAWARC 23680 . 24197) (DRAWCURVE 24199 . 24876) (DRAWELLIPSE 24878 . 25664
-) (DRAWLINE 25666 . 26056) (DRAWPOLYGON 26058 . 26513) (DRAWPOINT 26515 . 26934) (FILLPOLYGON 26936 . 
-27502) (DRAWTO 27504 . 27922) (FILLCIRCLE 27924 . 28147) (MOVETO 28149 . 28513) (RELDRAWTO 28515 . 
-29432) (BITMAPIMAGESIZE 29434 . 29605) (SCALEDBITBLT 29607 . 30573)) (30576 37615 (\DRAWPOINT.GENERIC 
-30586 . 30933) (\DRAWPOLYGON.GENERIC 30935 . 33243) (\DRAWCIRCLE.GENERIC 33245 . 34903) (
-\DRAWELLIPSE.GENERIC 34905 . 37613)) (37616 43413 (\IMAGEIOINIT 37626 . 41759) (\NOIMAGE.DSPFONT 41761
- . 43247) (\UNIMPIMAGEOP 43249 . 43411)) (43536 46660 (INSURE.BRUSH 43546 . 44920) (BRUSHP 44922 . 
-45712) (\POSSIBLECOLOR 45714 . 46265) (NEGSHADE 46267 . 46658)) (47216 47900 (DASHINGP 47226 . 47556) 
-(INSURE.DASHING 47558 . 47898)) (58546 79092 (\DisplayEventFn 58556 . 59066) (\DISPLAYINIT 59068 . 
-64651) (\4DISPLAYINIT 64653 . 69354) (\8DISPLAYINIT 69356 . 74059) (\24DISPLAYINIT 74061 . 78833) (
-\DISPLAYSTREAMTYPEBPP 78835 . 79090)))))
+  (FILEMAP (NIL (3234 11991 (IMAGESTREAMP 3244 . 4076) (IMAGESTREAMTYPE 4078 . 4291) (IMAGESTREAMTYPEP 
+4293 . 4928) (OPENIMAGESTREAM 4930 . 9884) (\GOOD.DASHLST 9886 . 11989)) (12026 14323 (DRAWDASHEDLINE 
+12036 . 14321)) (14324 21664 (DSPBACKCOLOR 14334 . 14706) (DSPBOTTOMMARGIN 14708 . 15093) (DSPCOLOR 
+15095 . 15459) (DSPCLIPPINGREGION 15461 . 16166) (DSPRESET 16168 . 16448) (DSPFONT 16450 . 16814) (
+DSPLEFTMARGIN 16816 . 17197) (DSPLINEFEED 17199 . 17499) (DSPOPERATION 17501 . 17878) (DSPRIGHTMARGIN 
+17880 . 18263) (DSPTOPMARGIN 18265 . 18644) (DSPSCALE 18646 . 19013) (DSPSPACEFACTOR 19015 . 19408) (
+DSPXPOSITION 19410 . 19715) (DSPYPOSITION 19717 . 20022) (DSPROTATE 20024 . 20319) (DSPPUSHSTATE 20321
+ . 20567) (DSPPOPSTATE 20569 . 20812) (DSPDEFAULTSTATE 20814 . 21066) (DSPSCALE2 21068 . 21359) (
+DSPTRANSLATE 21361 . 21662)) (21665 30466 (DSPNEWPAGE 21675 . 22367) (DRAWBETWEEN 22369 . 23071) (
+DRAWCIRCLE 23073 . 23569) (DRAWARC 23571 . 24088) (DRAWCURVE 24090 . 24767) (DRAWELLIPSE 24769 . 25555
+) (DRAWLINE 25557 . 25947) (DRAWPOLYGON 25949 . 26404) (DRAWPOINT 26406 . 26825) (FILLPOLYGON 26827 . 
+27393) (DRAWTO 27395 . 27813) (FILLCIRCLE 27815 . 28038) (MOVETO 28040 . 28404) (RELDRAWTO 28406 . 
+29323) (BITMAPIMAGESIZE 29325 . 29496) (SCALEDBITBLT 29498 . 30464)) (30467 37506 (\DRAWPOINT.GENERIC 
+30477 . 30824) (\DRAWPOLYGON.GENERIC 30826 . 33134) (\DRAWCIRCLE.GENERIC 33136 . 34794) (
+\DRAWELLIPSE.GENERIC 34796 . 37504)) (37507 42451 (\IMAGEIOINIT 37517 . 40797) (\NOIMAGE.DSPFONT 40799
+ . 42285) (\UNIMPIMAGEOP 42287 . 42449)) (42574 45698 (INSURE.BRUSH 42584 . 43958) (BRUSHP 43960 . 
+44750) (\POSSIBLECOLOR 44752 . 45303) (NEGSHADE 45305 . 45696)) (46254 46938 (DASHINGP 46264 . 46594) 
+(INSURE.DASHING 46596 . 46936)) (57676 78222 (\DisplayEventFn 57686 . 58196) (\DISPLAYINIT 58198 . 
+63781) (\4DISPLAYINIT 63783 . 68484) (\8DISPLAYINIT 68486 . 73189) (\24DISPLAYINIT 73191 . 77963) (
+\DISPLAYSTREAMTYPEBPP 77965 . 78220)))))
 STOP

sources/INTERPRESS

@@ -1,34 +1,18 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 2-May-2023 15:50:03" {DSK}<home>larry>il>medley>sources>INTERPRESS.;8
 221759 
+
(FILECREATED "13-Nov-2023 11:15:45" {WMEDLEY}<sources>INTERPRESS.;18
 220543 
 
-      :EDIT-BY "lmm"
+      :EDIT-BY rmk
 
-      :CHANGES-TO (MACROS APPENDOP.IP APPENDINTEGER.IPMACRO)
-                  (FNS INTERPRESSBITMAP SETSPACE.IP TRANS.IP TRANSLATE.IP APPENDIDENTIFIER.IP 
-                       APPENDINTEGER.IP APPENDLARGEVECTOR.IP APPENDNUMBER.IP APPENDOP.IP 
-                       APPENDRATIONAL.IP APPENDSEQUENCEDESCRIPTOR.IP ARCTO.IP BEGINMASTER.IP 
-                       BEGINPAGE.IP BEGINPREAMBLE.IP CLIPRECTANGLE.IP CONCAT.IP CONCATT.IP 
-                       ENDMASTER.IP ENDPAGE.IP ENDPREAMBLE.IP FGET.IP FILLRECTANGLE.IP 
-                       FILLTRAJECTORY.IP FILLNGON.IP FSET.IP INITIALIZEMASTER.IP INITIALIZECOLOR.IP 
-                       ISET.IP GETCP.IP LINETO.IP MASKSTROKE.IP MOVETO.IP ROTATE.IP SCALE.IP 
-                       SCALE2.IP SETCOLOR.IP SETRGB.IP SETCOLORLV.IP SETCOLOR16.IP SETFONT.IP 
-                       SETXREL.IP SETX.IP SETXY.IP SETXYREL.IP SETY.IP SETYREL.IP SHOW.IP 
-                       HEADINGOP.IP DEFINEFONT.IP INTERPRESS.BITMAPSCALE INTERPRESSFILEP NEWPAGE.IP 
-                       OPENIPSTREAM SHOWBITMAP.IP SHOWBITMAP1.IP SHOWSHADE.IP \BLTSHADE.IP 
-                       \DRAWCURVE.IP \IPCURVE2 \DRAWLINE.IP \DSPFONT.IP \DSPSPACEFACTOR.IP 
-                       \PUSHSTATE.IP \POPSTATE.IP \DEFAULTSTATE.IP \FILLPOLYGON.IP \DRAWPOLYGON.IP 
-                       \SETBRUSH.IP \INTERPRESSINIT)
-                  (VARS INTERPRESSCOMS IPCONSTANTS IPVALUES)
-                  (FUNCTIONS \IPC)
+      :CHANGES-TO (VARS INTERPRESSCOMS)
 
-      :PREVIOUS-DATE "27-Jun-2021 23:50:51" {DSK}<home>larry>il>medley>sources>INTERPRESS.;1)
+      :PREVIOUS-DATE "11-Nov-2023 10:38:10" {WMEDLEY}<sources>INTERPRESS.;17)
 
 
 (PRETTYCOMPRINT INTERPRESSCOMS)
 
 (RPAQQ INTERPRESSCOMS

-       ((COMS                                                (* ; "Literal interface")

+       [(COMS                                                (* ; "Literal interface")

               [INITVARS (CHARACTERCODEVERSION 'XC1-1-1)
                      (INTERPRESSVERSION "2.1")
                      (PRINTSERVICE 10.0)
@@ -126,23 +110,24 @@
               (FNS NSMAP \COERCEASCIITONSFONT \CREATEINTERPRESSFONT \SEARCHINTERPRESSFONTS)
               (DECLARE%: EVAL@COMPILE DONTCOPY (CONSTANTS (noInfoCode 32768)))
               (INITVARS (ASCIITONSTRANSLATIONS))
-                                                             (* ; 
-
                                                   "Catch the GACHA10 and any BI coercions to MODERN")

+              
+              (* ;; "These are in priority order:  if an early one doesn't find a font for a family, the later ones are tried (essentially going to MODERN as the default).")

+
               (ADDVARS (ASCIITONSTRANSLATIONS (TIMESROMAN NIL CLASSIC)
                               (GACHA NIL TERMINAL)
-                              (HELVETICA)
-                              (CLASSIC)
-                              (GACHA)
-                              (TIMESROMAN)
+                              (HELVETICA NIL MODERN)
+                              (CLASSIC NIL MODERN)
+                              (GACHA NIL MODERN)
+                              (TIMESROMAN NIL MODERN)
                               (LOGO NIL LOGOTYPES)
                               (HIPPO HIPPOTONSARRAY CLASSIC)
                               (CYRILLIC CYRILLICTONSARRAY CLASSIC)
-                              (SYMBOL \SYMBOLTONSARRAY MODERN)))
-              (UGLYVARS \SYMBOLTONSARRAY HIPPOTONSARRAY CYRILLICTONSARRAY))
+                              (SYMBOL \SYMBOLTONSARRAY MODERN)
+                              (MATH \MATHTONSARRAY CLASSIC)))
+              (UGLYVARS \SYMBOLTONSARRAY HIPPOTONSARRAY CYRILLICTONSARRAY \MATHTONSARRAY))
         (DECLARE%: DONTEVAL@LOAD DOCOPY (P (\INTERPRESSINIT)))
-        [DECLARE%: EVAL@COMPILE DONTCOPY (P (LOADDEF 'SYSTEMBRUSH 'RESOURCES 'IMAGEIO)
-                                            (LOADDEF 'BRUSH 'RECORDS 'IMAGEIO]
-        (FUNCTIONS \IPC)))
+        (DECLARE%: EVAL@COMPILE DONTCOPY (P (LOADDEF 'SYSTEMBRUSH 'RESOURCES 'IMAGEIO)
+                                            (LOADDEF 'BRUSH 'RECORDS 'IMAGEIO])
 
 
 
@@ -3858,49 +3843,59 @@
 
 
 
-(* ; "Catch the GACHA10 and any BI coercions to MODERN")

+(* ;; 
+"These are in priority order:  if an early one doesn't find a font for a family, the later ones are tried (essentially going to MODERN as the default)."
+)

 
 
 (ADDTOVAR ASCIITONSTRANSLATIONS

           (TIMESROMAN NIL CLASSIC)
           (GACHA NIL TERMINAL)
-          (HELVETICA)
-          (CLASSIC)
-          (GACHA)
-          (TIMESROMAN)
+          (HELVETICA NIL MODERN)
+          (CLASSIC NIL MODERN)
+          (GACHA NIL MODERN)
+          (TIMESROMAN NIL MODERN)
           (LOGO NIL LOGOTYPES)
           (HIPPO HIPPOTONSARRAY CLASSIC)
           (CYRILLIC CYRILLICTONSARRAY CLASSIC)
-          (SYMBOL \SYMBOLTONSARRAY MODERN))
+          (SYMBOL \SYMBOLTONSARRAY MODERN)
+          (MATH \MATHTONSARRAY CLASSIC))
 
-(READVARS-FROM-STRINGS '(\SYMBOLTONSARRAY HIPPOTONSARRAY CYRILLICTONSARRAY)
-       "({Y256 SMALLPOSP 0 0 0 180 42 0 61287 177 61309 61282 61283 61284 61285 0 184 0 0 61296 61298 61273 
+(READVARS-FROM-STRINGS '(\SYMBOLTONSARRAY HIPPOTONSARRAY CYRILLICTONSARRAY \MATHTONSARRAY)
+       "({Y256 SMALLPOSP 0 0 0 180 8546 0 8574 177 61309 61282 61283 61284 61285 0 184 0 0 61296 61298 61273 
 61272 8549 8550 0 0 61054 61305 61275 61274 8546 61299 0 0 0 174 173 175 61266 61250 61251 61303 61261
- 61263 0 0 61262 {R4 0} 8551 61258 61259 61281 0 61292 172 61365 61364 61290 61351 {R5 0} 65 66 67 68 
-69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 61271 61270 0 61366 61367 61238 
-61239 61362 61363 61360 61361 123 125 61234 61235 61052 8514 61243 61242 8740 8742 61308 35 0 61301 {R
-4 0} 167 61232 61233 182 64 211 163 164 {R128 0} }  {Y256 SMALLPOSP 0 0 1 2 3 4 5 6 7 8 9 10 11 12 13 
-14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 164 37 38 39 40 41 42 43 44 8510 46 
-47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 9793 9794 9809 9797 9798 9818 9796 9802 9804 
-9728 9805 9806 9807 9808 9810 9811 9803 9813 9814 9816 9817 9728 9821 9819 9820 9801 91 92 93 173 172 
-185 9825 9826 9841 9829 9830 9850 9828 9834 9836 9847 9837 9838 9839 9840 9842 9843 9835 9845 9846 
-9848 9849 9728 9853 9851 9852 9833 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139
- 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 61220 61221 157 158 159 160 161 162 163 
-164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 61286 184 185 186 187 188 
-189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 
-214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 
-239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 }  {Y256 SMALLPOSP 0 0 1 2 3 4 5 6
- 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 10023 37 38 39 40
- 41 10041 43 44 8510 46 47 48 49 10095 51 10071 53 10088 55 10089 57 58 59 171 61 187 63 10047 10017 
-10018 10046 10021 10022 10038 10020 10049 10026 10027 10028 10029 10030 10031 10032 10033 10039 10034 
-10035 10036 10037 10019 10024 10045 10048 10025 10090 9984 10091 10044 10092 9984 10065 10066 10110 
-10069 10070 10086 10068 10097 10074 10075 10076 10077 10078 10079 10080 10081 10087 10082 10083 10084 
-10085 10067 10072 10093 10096 10073 10042 9984 10043 10040 9984 128 129 130 131 132 133 134 135 136 
-137 138 139 140 141 142 10094 144 145 146 147 148 149 150 151 152 153 154 61220 61221 157 158 159 160 
-161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 61286 184 185 
-186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 
-211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 
-236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 })
+ 61263 0 0 61262 {R4 0} 8551 61258 61259 61281 0 61292 172 61365 61364 61290 61351 0 0 0 47 0 65 66 67
+ 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 61271 61270 0 61366 61367 61238 
+61239 61362 61363 61360 61361 123 125 61234 61235 61052 8514 61243 61242 8740 8742 61308 8546 0 61301 
+{R4 0} 167 61232 61233 182 64 211 163 36 {R128 0} }  {Y256 SMALLPOSP 0 0 1 2 3 4 5 6 7 8 9 10 11 12 13
+ 60973 61229 16 17 18 61221 20 21 61220 23 60973 61228 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
+ 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 9793 9794 9809 9797 9798 9818 
+9796 9802 9804 74 9805 9806 9807 9808 9810 9811 9803 9813 9814 9816 9817 86 9821 9819 9820 9801 91 92 
+93 173 172 96 9825 9826 9841 9829 9830 9850 9828 9834 9836 106 9837 9838 9839 9840 9842 9843 9835 9845
+ 9846 9848 9849 118 9853 9851 9852 9833 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 
+138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 61220 61221 157 158 159 160 161 
+162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 61286 184 185 186 
+187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 
+212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 
+237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 }  {Y256 SMALLPOSP 0 0 1 2
+ 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 10023 37 
+38 39 40 41 10041 43 44 8510 46 47 48 49 10095 51 10071 53 10088 55 10089 57 58 59 171 61 187 63 10047
+ 10017 10018 10046 10021 10022 10038 10020 10049 10026 10027 10028 10029 10030 10031 10032 10033 10039
+ 10034 10035 10036 10037 10019 10024 10045 10048 10025 10090 9984 10091 10044 10092 9984 10065 10066 
+10110 10069 10070 10086 10068 10097 10074 10075 10076 10077 10078 10079 10080 10081 10087 10082 10083 
+10084 10085 10067 10072 10093 10096 10073 10042 9984 10043 10040 9984 128 129 130 131 132 133 134 135 
+136 137 138 139 140 141 142 10094 144 145 146 147 148 149 150 151 152 153 154 61220 61221 157 158 159 
+160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 61286 184 
+185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 
+210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 
+235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 }  {Y256 SMALLPOSP
+ 0 0 61307 61234 61235 0 163 61301 61302 0 0 0 182 0 0 0 61286 0 0 0 61306 0 0 61295 {R9 0} 32 61232 
+61287 8551 162 184 61366 61299 194 61308 199 177 61260 61309 8552 61285 61287 8738 8740 8574 61282 
+61283 61284 61292 8570 199 167 0 8549 8546 8550 191 61248 61365 61258 61356 61369 61364 61233 61275 
+61279 61273 61274 61278 61272 61629 61259 61281 61297 61265 61358 61305 61296 61271 61367 61298 180 
+61626 61368 0 0 0 175 174 0 61351 61267 211 61370 61303 61266 61263 61288 61360 61361 61362 61363 
+61256 61290 61287 61238 61240 210 61246 61244 61247 61245 61250 61251 61270 61239 188 189 190 61264 {R
+129 0} })
 ")
 (DECLARE%: DONTEVAL@LOAD DOCOPY 
 
@@ -3912,57 +3907,45 @@
 
 (LOADDEF 'BRUSH 'RECORDS 'IMAGEIO)
 )
-
-(DEFMACRO \IPC
 (X)
-   (DECLARE
 (SPECIAL X))
                                     (* ; "Edited  2-May-2023 08:33 by lmm")

-   [OR (AND (BOUNDP '\IPCONSTANDS)
-            (LISTP \IPCONSTANTS))
-       (SETQ \IPCONSTANTS (FOR
 X IN
 IPCONSTANTS JOIN
 (FOR
 Y IN
 (EVAL X)
-                                                        COLLECT
 (CONS (CAR Y)
-                                                                      (CADR Y]
-   (FOR
 I FROM
 1 TO
 10 DO
 (IF
 (EQUAL X (SETQ X (SUBLIS \IPCONSTANTS X)))
-                              THEN
 (RETURN (LIST 'CONSTANT X))) FINALLY
 (ERROR "too many \IPC levels"
-                                                                               X)))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (16740 17484 (\IPC 16740 . 17484)) (17717 23369 (APPENDBYTE.IP 17727 . 17863) (
-APPENDIDENTIFIER.IP 17865 . 18387) (APPENDINT.IP 18389 . 18840) (APPENDINTEGER.IP 18842 . 19414) (
-APPENDLARGEVECTOR.IP 19416 . 20381) (APPENDNUMBER.IP 20383 . 20852) (APPENDOP.IP 20854 . 21500) (
-APPENDRATIONAL.IP 21502 . 21995) (APPENDSEQUENCEDESCRIPTOR.IP 21997 . 23192) (BYTESININT.IP 23194 . 
-23367)) (23405 63212 (ARCTO.IP 23415 . 24696) (BEGINMASTER.IP 24698 . 24971) (BEGINPAGE.IP 24973 . 
-25329) (BEGINPREAMBLE.IP 25331 . 25702) (CLIPRECTANGLE.IP 25704 . 26194) (CONCAT.IP 26196 . 26461) (
-CONCATT.IP 26463 . 26730) (ENDMASTER.IP 26732 . 27176) (ENDPAGE.IP 27178 . 27555) (ENDPREAMBLE.IP 
-27557 . 28356) (FGET.IP 28358 . 28661) (FILLRECTANGLE.IP 28663 . 30991) (FILLTRAJECTORY.IP 30993 . 
-31628) (FILLNGON.IP 31630 . 33907) (FSET.IP 33909 . 34212) (GETFRAMEVAR.IP 34214 . 34532) (
-INITIALIZEMASTER.IP 34534 . 35135) (INITIALIZECOLOR.IP 35137 . 36458) (ISET.IP 36460 . 36831) (
-GETCP.IP 36833 . 37142) (LINETO.IP 37144 . 37749) (MASKSTROKE.IP 37751 . 38024) (MOVETO.IP 38026 . 
-38363) (ROTATE.IP 38365 . 38667) (SCALE.IP 38669 . 38972) (SCALE2.IP 38974 . 39311) (SETCOLOR.IP 39313
- . 41542) (SETRGB.IP 41544 . 42600) (SETCOLORLV.IP 42602 . 47215) (SETCOLOR16.IP 47217 . 50323) (
-SETFONT.IP 50325 . 51146) (SETSPACE.IP 51148 . 51460) (SETXREL.IP 51462 . 52646) (SETX.IP 52648 . 
-54165) (SETXY.IP 54167 . 55339) (SETXYREL.IP 55341 . 56647) (SETY.IP 56649 . 57958) (SETYREL.IP 57960
- . 58860) (SHOW.IP 58862 . 62122) (TRAJECTORY.IP 62124 . 62522) (TRANS.IP 62524 . 62863) (TRANSLATE.IP
- 62865 . 63210)) (63243 69333 (\CHANGE-VISIBLE-REGION.IP 63253 . 66914) (\PAPERSIZE.IP 66916 . 67737) 
-(HEADINGOP.IP 67739 . 69331)) (69334 174344 (DEFINEFONT.IP 69344 . 70318) (FONTNAME.IP 70320 . 71250) 
-(INTERPRESS.BITMAPSCALE 71252 . 72061) (INTERPRESS.OUTCHARFN 72063 . 78235) (INTERPRESSFILEP 78237 . 
-79571) (MAKEINTERPRESS 79573 . 79757) (NEWLINE.IP 79759 . 80491) (NEWPAGE.IP 80493 . 85468) (
-NEWPAGE?.IP 85470 . 85949) (OPENIPSTREAM 85951 . 94302) (SETUPFONTS.IP 94304 . 95296) (SHOWBITMAP.IP 
-95298 . 99839) (\BITMAPSIZE.IP 99841 . 100618) (SHOWBITMAP1.IP 100620 . 104992) (SHOWSHADE.IP 104994
- . 105947) (\BITBLT.IP 105949 . 110153) (\SCALEDBITBLT.IP 110155 . 113800) (\BLTSHADE.IP 113802 . 
-115260) (\CHARWIDTH.IP 115262 . 115712) (\CLOSEIPSTREAM 115714 . 116041) (\DRAWARC.IP 116043 . 116490)
- (\DRAWCURVE.IP 116492 . 118929) (\DRAWPOINT.IP 118931 . 119968) (\DSPCOLOR.IP 119970 . 120921) (
-ENSURE.RGB 120923 . 121587) (\IPCURVE2 121589 . 134843) (\CLIPCURVELINE.IP 134845 . 139543) (
-\DRAWLINE.IP 139545 . 143277) (\CLIPLINE 143279 . 147979) (\DSPBOTTOMMARGIN.IP 147981 . 148397) (
-\DSPFONT.IP 148399 . 152446) (\DSPLEFTMARGIN.IP 152448 . 152908) (\DSPLINEFEED.IP 152910 . 153577) (
-\DSPRIGHTMARGIN.IP 153579 . 154376) (\DSPSPACEFACTOR.IP 154378 . 155507) (\DSPTOPMARGIN.IP 155509 . 
-155945) (\DSPXPOSITION.IP 155947 . 156934) (\DSPROTATE.IP 156936 . 157114) (\PUSHSTATE.IP 157116 . 
-158008) (\POPSTATE.IP 158010 . 158645) (\DEFAULTSTATE.IP 158647 . 158999) (\DSPTRANSLATE.IP 159001 . 
-159182) (\DSPSCALE2.IP 159184 . 159359) (\DSPYPOSITION.IP 159361 . 159662) (FILLCIRCLE.IP 159664 . 
-160747) (\FILLPOLYGON.IP 160749 . 162080) (\DRAWPOLYGON.IP 162082 . 168212) (\FIXLINELENGTH.IP 168214
- . 169428) (\MOVETO.IP 169430 . 169794) (\SETBRUSH.IP 169796 . 171962) (\STRINGWIDTH.IP 171964 . 
-172367) (\DSPCLIPPINGREGION.IP 172369 . 173545) (\DSPOPERATION.IP 173547 . 174342)) (174535 175290 (
-IP-TOS 174545 . 174805) (POP-IP-STACK 174807 . 175102) (PUSH-IP-STACK 175104 . 175288)) (175351 187915
- (\CREATECHARSET.IP 175361 . 187152) (\CHANGECHARSET.IP 187154 . 187913)) (187916 192642 (
-\INTERPRESSINIT 187926 . 192640)) (192643 193201 (SCALEREGION 192653 . 193199)) (206129 208553 (
-INTERPRESSBITMAP 206139 . 208551)) (210761 217417 (NSMAP 210771 . 211353) (\COERCEASCIITONSFONT 211355
- . 215209) (\CREATEINTERPRESSFONT 215211 . 217076) (\SEARCHINTERPRESSFONTS 217078 . 217415)) (220992 
-221736 (\IPC 220992 . 221736)))))
+  (FILEMAP (NIL (15420 16164 (\IPC 15420 . 16164)) (16397 22049 (APPENDBYTE.IP 16407 . 16543) (
+APPENDIDENTIFIER.IP 16545 . 17067) (APPENDINT.IP 17069 . 17520) (APPENDINTEGER.IP 17522 . 18094) (
+APPENDLARGEVECTOR.IP 18096 . 19061) (APPENDNUMBER.IP 19063 . 19532) (APPENDOP.IP 19534 . 20180) (
+APPENDRATIONAL.IP 20182 . 20675) (APPENDSEQUENCEDESCRIPTOR.IP 20677 . 21872) (BYTESININT.IP 21874 . 
+22047)) (22085 61892 (ARCTO.IP 22095 . 23376) (BEGINMASTER.IP 23378 . 23651) (BEGINPAGE.IP 23653 . 
+24009) (BEGINPREAMBLE.IP 24011 . 24382) (CLIPRECTANGLE.IP 24384 . 24874) (CONCAT.IP 24876 . 25141) (
+CONCATT.IP 25143 . 25410) (ENDMASTER.IP 25412 . 25856) (ENDPAGE.IP 25858 . 26235) (ENDPREAMBLE.IP 
+26237 . 27036) (FGET.IP 27038 . 27341) (FILLRECTANGLE.IP 27343 . 29671) (FILLTRAJECTORY.IP 29673 . 
+30308) (FILLNGON.IP 30310 . 32587) (FSET.IP 32589 . 32892) (GETFRAMEVAR.IP 32894 . 33212) (
+INITIALIZEMASTER.IP 33214 . 33815) (INITIALIZECOLOR.IP 33817 . 35138) (ISET.IP 35140 . 35511) (
+GETCP.IP 35513 . 35822) (LINETO.IP 35824 . 36429) (MASKSTROKE.IP 36431 . 36704) (MOVETO.IP 36706 . 
+37043) (ROTATE.IP 37045 . 37347) (SCALE.IP 37349 . 37652) (SCALE2.IP 37654 . 37991) (SETCOLOR.IP 37993
+ . 40222) (SETRGB.IP 40224 . 41280) (SETCOLORLV.IP 41282 . 45895) (SETCOLOR16.IP 45897 . 49003) (
+SETFONT.IP 49005 . 49826) (SETSPACE.IP 49828 . 50140) (SETXREL.IP 50142 . 51326) (SETX.IP 51328 . 
+52845) (SETXY.IP 52847 . 54019) (SETXYREL.IP 54021 . 55327) (SETY.IP 55329 . 56638) (SETYREL.IP 56640
+ . 57540) (SHOW.IP 57542 . 60802) (TRAJECTORY.IP 60804 . 61202) (TRANS.IP 61204 . 61543) (TRANSLATE.IP
+ 61545 . 61890)) (61923 68013 (\CHANGE-VISIBLE-REGION.IP 61933 . 65594) (\PAPERSIZE.IP 65596 . 66417) 
+(HEADINGOP.IP 66419 . 68011)) (68014 173024 (DEFINEFONT.IP 68024 . 68998) (FONTNAME.IP 69000 . 69930) 
+(INTERPRESS.BITMAPSCALE 69932 . 70741) (INTERPRESS.OUTCHARFN 70743 . 76915) (INTERPRESSFILEP 76917 . 
+78251) (MAKEINTERPRESS 78253 . 78437) (NEWLINE.IP 78439 . 79171) (NEWPAGE.IP 79173 . 84148) (
+NEWPAGE?.IP 84150 . 84629) (OPENIPSTREAM 84631 . 92982) (SETUPFONTS.IP 92984 . 93976) (SHOWBITMAP.IP 
+93978 . 98519) (\BITMAPSIZE.IP 98521 . 99298) (SHOWBITMAP1.IP 99300 . 103672) (SHOWSHADE.IP 103674 . 
+104627) (\BITBLT.IP 104629 . 108833) (\SCALEDBITBLT.IP 108835 . 112480) (\BLTSHADE.IP 112482 . 113940)
+ (\CHARWIDTH.IP 113942 . 114392) (\CLOSEIPSTREAM 114394 . 114721) (\DRAWARC.IP 114723 . 115170) (
+\DRAWCURVE.IP 115172 . 117609) (\DRAWPOINT.IP 117611 . 118648) (\DSPCOLOR.IP 118650 . 119601) (
+ENSURE.RGB 119603 . 120267) (\IPCURVE2 120269 . 133523) (\CLIPCURVELINE.IP 133525 . 138223) (
+\DRAWLINE.IP 138225 . 141957) (\CLIPLINE 141959 . 146659) (\DSPBOTTOMMARGIN.IP 146661 . 147077) (
+\DSPFONT.IP 147079 . 151126) (\DSPLEFTMARGIN.IP 151128 . 151588) (\DSPLINEFEED.IP 151590 . 152257) (
+\DSPRIGHTMARGIN.IP 152259 . 153056) (\DSPSPACEFACTOR.IP 153058 . 154187) (\DSPTOPMARGIN.IP 154189 . 
+154625) (\DSPXPOSITION.IP 154627 . 155614) (\DSPROTATE.IP 155616 . 155794) (\PUSHSTATE.IP 155796 . 
+156688) (\POPSTATE.IP 156690 . 157325) (\DEFAULTSTATE.IP 157327 . 157679) (\DSPTRANSLATE.IP 157681 . 
+157862) (\DSPSCALE2.IP 157864 . 158039) (\DSPYPOSITION.IP 158041 . 158342) (FILLCIRCLE.IP 158344 . 
+159427) (\FILLPOLYGON.IP 159429 . 160760) (\DRAWPOLYGON.IP 160762 . 166892) (\FIXLINELENGTH.IP 166894
+ . 168108) (\MOVETO.IP 168110 . 168474) (\SETBRUSH.IP 168476 . 170642) (\STRINGWIDTH.IP 170644 . 
+171047) (\DSPCLIPPINGREGION.IP 171049 . 172225) (\DSPOPERATION.IP 172227 . 173022)) (173215 173970 (
+IP-TOS 173225 . 173485) (POP-IP-STACK 173487 . 173782) (PUSH-IP-STACK 173784 . 173968)) (174031 186595
+ (\CREATECHARSET.IP 174041 . 185832) (\CHANGECHARSET.IP 185834 . 186593)) (186596 191322 (
+\INTERPRESSINIT 186606 . 191320)) (191323 191881 (SCALEREGION 191333 . 191879)) (204809 207233 (
+INTERPRESSBITMAP 204819 . 207231)) (209441 216097 (NSMAP 209451 . 210033) (\COERCEASCIITONSFONT 210035
+ . 213889) (\CREATEINTERPRESSFONT 213891 . 215756) (\SEARCHINTERPRESSFONTS 215758 . 216095)))))
 STOP

sources/LLKEY

@@ -1,18 +1,20 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED "27-Aug-2021 16:18:18" {DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLKEY.;9
 199890 
 
-      previous date%: "24-Aug-2021 16:54:52" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>LLKEY.;7)
+
(FILECREATED " 3-Jan-2024 16:10:17" {MEDLEY}<SOURCES>LLKEY.;4
 199503 
 
+      :EDIT-BY "mth"
+
+      :CHANGES-TO (FNS \DECODETRANSITION SHIFTDOWNP)
+                  (VARS LLKEYCOMS)
+                  (RECORDS KEYBOARDEVENT)
+
+      :PREVIOUS-DATE " 3-Jan-2024 12:32:52" {MEDLEY}<SOURCES>LLKEY.;3)
 
-(* ; "
-Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Corporation.
-")
 
 (PRETTYCOMPRINT LLKEYCOMS)
 
 (RPAQQ LLKEYCOMS

-       [(COMS                                                (* ; "Access to keyboard")

+       [(COMS                                                (* ; "Access to keyboard")

               (FNS BKSYSCHARCODE \CLEARSYSBUF \GETKEY \NSYSBUFCHARS \SAVESYSBUF \SYSBUFP \GETSYSBUF 
                    \PUTSYSBUF \PEEKSYSBUF)
               (INITVARS (\LONGSYSBUF))
@@ -20,10 +22,10 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
               (DECLARE%: DONTCOPY (RESOURCES \KEYBOARDWAITBOX))
               (DECLARE%: DONTCOPY (CONSTANTS (\SYSBUFSIZE 200))
                      (MACROS \GETREALSYSBUF)))
-        [DECLARE%: DOCOPY DONTEVAL@LOAD (COMS                (* ; 
-
                                          "Here because it must be done in init before PROC loaded")

+        [DECLARE%: DOCOPY DONTEVAL@LOAD (COMS                (* ; 
+
                                            "Here because it must be done in init before PROC loaded")

                                               (P (MOVD? 'NILL 'CARET]
-        (COMS                                                (* ; "Key handler")

+        (COMS                                                (* ; "Key handler")

               (FNS \KEYBOARDINIT \KEYBOARDEVENTFN \ALLOCLOCKED \SETIOPOINTERS \KEYBOARDOFF 
                    \KEYBOARDON \KEYHANDLER \KEYHANDLER1 \RESETKEYBOARD \DOMOUSECHORDING 
                    \DOTRANSITIONS \DECODETRANSITION MOUSECHORDWAIT \TRACKCURSOR)
@@ -32,7 +34,8 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                      (\SUN.JLEKEYBOARD 2)
                      (\TOSHIBA.JIS 7))
               (INITVARS (\MOUSECHORDTICKS)
-                     (\MOUSECHORDMILLISECONDS 50))
+                     (\MOUSECHORDMILLISECONDS 50)
+                     (SHIFTXORLOCKFLG NIL))
               (DECLARE%: DONTEVAL@LOAD DOCOPY (P (\KEYBOARDINIT)))
               [DECLARE%: DONTCOPY (MACROS .NOTELASTUSERACTION)
                      (CONSTANTS ALLUP \CTRLMASK \METABIT)
@@ -44,8 +47,8 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                      (EXPORT (RECORDS KEYACTION)
                             (CONSTANTS \NKEYS))
                      (RECORDS RING)
-                     (COMS                                   (* ; 
-
                                          "can get rid of shiftstate after clients have been fixed")

+                     (COMS                                   (* ; 
+
                                            "can get rid of shiftstate after clients have been fixed")

                            (RECORDS SHIFTSTATE)
                            (GLOBALVARS \SHIFTSTATE \MOUSETIMERTEMP))
                      (CONSTANTS NRINGINDEXWORDS)
@@ -53,7 +56,7 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                             (\SYSBUFFER.LAST (IPLUS \SYSBUFFER.FIRST (SUB1 \SYSBUFSIZE]
               (DECLARE%: EVAL@COMPILE (VARS \KEYNAMES))
               
-              (* ;; "\maikokeyactions does not contain keyactions of the form %"2,50%" because it breaks the loadup process on the sun.")

+              (* ;; "\maikokeyactions does not contain keyactions of the form %"2,50%" because it breaks the loadup process on the sun.")

 
               (VARS \ORIGKEYACTIONS \DLIONKEYACTIONS \DLIONOSDKEYACTIONS \DORADOKEYACTIONS 
                     \DOVEKEYACTIONS \DOVEOSDKEYACTIONS \MAIKOKEYACTIONS \MAIKOKEYACTIONST4 
@@ -67,33 +70,33 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                      \MOUSECHORDTICKS \KEYBOARDEVENTQUEUE \KEYBUFFERING \CURRENTKEYACTION 
                      \COMMANDKEYACTION \DEFAULTKEYACTION \TIMER.INTERRUPT.PENDING \ORIGKEYACTIONS 
                      \KEYBOARD.META \MOUSECHORDMILLISECONDS \DORADOKEYACTIONS \DLIONKEYACTIONS 
-                     \DLIONOSDKEYACTIONS \DOVEKEYACTIONS \DOVEOSDKEYACTIONS))
-        (COMS                                                (* ; "Key interpretation")

+                     \DLIONOSDKEYACTIONS \DOVEKEYACTIONS \DOVEOSDKEYACTIONS SHIFTXORLOCKFLG))
+        (COMS                                                (* ; "Key interpretation")

               (FNS KEYACTION KEYACTIONTABLE KEYBOARDTYPE RESETKEYACTION 
                    \KEYBOARD.MACHINE-SPECIFIC-KEYACTIONS \KEYACTION1 KEYDOWNP KEYNUMBERP 
                    \KEYNAMETONUMBER \KEYNUMBERTONAME MODIFY.KEYACTIONS METASHIFT SHIFTDOWNP)
-                                                             (* ; 
-
                                                    "To support office style 1108 & 1186 keyboards")

+                                                             (* ; 
+
                                                      "To support office style 1108 & 1186 keyboards")

               (FNS SETUP.OFFICE.KEYBOARD)
               (OPTIMIZERS)
               (MACROS \TEMPCOPYTIMER)
-                                                             (* ; 
-
                  "Don't copy this optimizer since it expands out to \getbasebit, but do exportit.")

+                                                             (* ; 
+
                    "Don't copy this optimizer since it expands out to \getbasebit, but do exportit.")

               (DECLARE%: DONTCOPY (EXPORT (OPTIMIZERS KEYDOWNP)))
               (EXPORT (MACROS XKEYDOWNP KEYDOWNP1 \NEWKEYDOWNP)))
-        (COMS                                                (* ; "A raw keyboard device/stream")

+        (COMS                                                (* ; "A raw keyboard device/stream")

               (FNS \INIT.KEYBOARD.STREAM)
               (DECLARE%: DONTEVAL@LOAD DOCOPY (P (\INIT.KEYBOARD.STREAM)))
               (EXPORT (GLOBALVARS \KEYBOARD.DEVICE \KEYBOARD.STREAM)))
-        (COMS                                                (* ; "Hook for a periodic interrupt")

+        (COMS                                                (* ; "Hook for a periodic interrupt")

               (FNS \DOBUFFEREDTRANSITIONS \TIMER.INTERRUPTFRAME \PERIODIC.INTERRUPTFRAME)
               (INITVARS (\KEYBUFFERING)
                      (\PERIODIC.INTERRUPT)
                      (\TIMER.INTERRUPT.PENDING)
                      (\PERIODIC.INTERRUPT.FREQUENCY 77)))
         (LOCALVARS . T)
-        [COMS                                                (* ; 
-
                                                           "cursor and mouse related functions.")

+        [COMS                                                (* ; 
+
                                                             "cursor and mouse related functions.")

               (FNS \HARDCURSORUP \HARDCURSORPOSITION \HARDCURSORDOWN)
               (FNS CURSOR.INIT \CURSORDESTINATION \SOFTCURSORUP \SOFTCURSORUPCURRENT 
                    \SOFTCURSORPOSITION \SOFTCURSORDOWN CURSORPROP GETCURSORPROP PUTCURSORPROP 
@@ -147,7 +150,7 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                                                                                   \KEYBOARDEVENT.SIZE
                                                                                    383]
         (COMS (FNS MACHINETYPE SETMAINTPANEL)
-                                                             (* ; "DLion beeper")

+                                                             (* ; "DLion beeper")

               (FNS BEEPON BEEPOFF))
         (EXPORT (GLOBALVARS \EM.MOUSEX \EM.MOUSEY \EM.CURSORX \EM.CURSORY \EM.UTILIN \EM.REALUTILIN 
                        \EM.KBDAD0 \EM.KBDAD1 \EM.KBDAD2 \EM.KBDAD3 \EM.KBDAD4 \EM.KBDAD5 
@@ -155,8 +158,8 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                        \DEFAULTKEYACTION \COMMANDKEYACTION \CURRENTKEYACTION \PERIODIC.INTERRUPT 
                        \PERIODIC.INTERRUPT.FREQUENCY))
         (FNS WITHOUT-INTERRUPTS)
-        (COMS                                                (* ; 
-
                                                         "Compile locked fns together for locality")

+        (COMS                                                (* ; 
+
                                                           "Compile locked fns together for locality")

               (BLOCKS (NIL FLIPCURSORBAR \KEYHANDLER \KEYHANDLER1 \TRACKCURSOR 
                            \PERIODIC.INTERRUPTFRAME \TIMER.INTERRUPTFRAME \DOBUFFEREDTRANSITIONS 
                            \DOTRANSITIONS \DECODETRANSITION \EVENTKEYS \HARDCURSORUP \DOMOUSECHORDING
@@ -382,9 +385,9 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                                       (AND [EQ (fetch
 (RING WRITE) of
 \SYSBUFFER)
                                                (replace
 (RING READ) of
 \SYSBUFFER
                                                   with
 (COND
-                                                              ((EQ \SYSBUFFER.LAST R)
-                                                               \SYSBUFFER.FIRST)
-                                                              (T (ADD1 R]
+                                                          ((EQ \SYSBUFFER.LAST R)
+                                                           \SYSBUFFER.FIRST)
+                                                          (T (ADD1 R]
                                            (replace
 (RING READ) of
 \SYSBUFFER with
 0)))])
 )
 )
@@ -851,7 +854,8 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
     T])
 
 (\DECODETRANSITION

-  [LAMBDA (KEYNUMBER DOWNFLG)                                (* ; "Edited 19-Nov-87 16:29 by Snow")

+  [LAMBDA (KEYNUMBER DOWNFLG)
                                (* ; "Edited  3-Jan-2024 16:04 by mth")


+                                                             (* ; "Edited 19-Nov-87 16:29 by Snow")

 
     (* ;; "KEYNUMBER is the key number in the hardware keyboard layout, DOWNFLG is T if the key just went down.  PENDINGINTERRUPT, bound in \KEYHANDLER, is set to the decoded character if it is an interrupt.")

 
@@ -861,14 +865,18 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
            ASCIICODE SHIFTED)
           (SELECTC (TRANSITIONFLAGS \CURRENTKEYACTION TI)
               (IGNORE.TF (RETURN))
-              (LOCKSHIFT.TF                                  (* ; 
-
                                           "Take shift action if either Shift or Caps Lock is down")

-                            (IF
 (fetch
 (KEYBOARDEVENT SHIFTORLOCK) of
 KEYSTATE)
-                                THEN
 (SETQ SHIFTED T)))
-              (NOLOCKSHIFT.TF                                (* ; 
-
                                                        "Take shift action only when Shift is down")

-                   (IF
 (fetch
 (KEYBOARDEVENT SHIFT) of
 KEYSTATE)
-                       THEN
 (SETQ SHIFTED T)))
+              (LOCKSHIFT.TF 
+                            (* ;; "Take shift action if either Shift or Caps Lock is down. ")

+
+                            (* ;; "If SHIFTXORLOCKFLG, but not both!")

+
+                            (IF
 SHIFTXORLOCKFLG
+                                THEN
 (SETQ SHIFTED (fetch
 (KEYBOARDEVENT SHIFTXORLOCK) of
 KEYSTATE))
+                              ELSE
 (SETQ SHIFTED (fetch
 (KEYBOARDEVENT SHIFTORLOCK) of
 KEYSTATE))))
+              (NOLOCKSHIFT.TF 
+                              (* ;; "Take shift action only when Shift is down")

+
+                   (SETQ SHIFTED (fetch
 (KEYBOARDEVENT SHIFT) of
 KEYSTATE)))
               (EVENT.TF (RETURN))
               (1SHIFTUP.TF (replace
 (KEYBOARDEVENT 1SHIFT) of
 KEYSTATE with
 NIL)
                            (RETURN))
@@ -907,8 +915,9 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                    (replace
 (KEYBOARDEVENT USERMODE1) of
 KEYSTATE with
 T)
                    (RETURN))
               (USERMODE1TOGGLE.TF 
-                   (replace
 (KEYBOARDEVENT USERMODE1) of
 KEYSTATE
-                      with
 (NOT (fetch
 (KEYBOARDEVENT USERMODE1) of
 KEYSTATE)))
+                   (replace
 (KEYBOARDEVENT USERMODE1) of
 KEYSTATE with
 (NOT (fetch
 (KEYBOARDEVENT
+                                                                                    USERMODE1)
+                                                                               of
 KEYSTATE)))
                    (RETURN))
               (USERMODE2UP.TF 
                    (replace
 (KEYBOARDEVENT USERMODE2) of
 KEYSTATE with
 NIL)
@@ -917,8 +926,9 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                    (replace
 (KEYBOARDEVENT USERMODE2) of
 KEYSTATE with
 T)
                    (RETURN))
               (USERMODE2TOGGLE.TF 
-                   (replace
 (KEYBOARDEVENT USERMODE2) of
 KEYSTATE
-                      with
 (NOT (fetch
 (KEYBOARDEVENT USERMODE2) of
 KEYSTATE)))
+                   (replace
 (KEYBOARDEVENT USERMODE2) of
 KEYSTATE with
 (NOT (fetch
 (KEYBOARDEVENT
+                                                                                    USERMODE2)
+                                                                               of
 KEYSTATE)))
                    (RETURN))
               (USERMODE3UP.TF 
                    (replace
 (KEYBOARDEVENT USERMODE3) of
 KEYSTATE with
 NIL)
@@ -927,13 +937,14 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                    (replace
 (KEYBOARDEVENT USERMODE3) of
 KEYSTATE with
 T)
                    (RETURN))
               (USERMODE3TOGGLE.TF 
-                   (replace
 (KEYBOARDEVENT USERMODE3) of
 KEYSTATE
-                      with
 (NOT (fetch
 (KEYBOARDEVENT USERMODE3) of
 KEYSTATE)))
+                   (replace
 (KEYBOARDEVENT USERMODE3) of
 KEYSTATE with
 (NOT (fetch
 (KEYBOARDEVENT
+                                                                                    USERMODE3)
+                                                                               of
 KEYSTATE)))
                    (RETURN))
               (SHOULDNT))
 
      (* ;; 
-
   "Only the LOCKSHIFT and NOLOCKSHIFT cases make it to here, having set SHIFTED if appropriate.")

+
     "Only the LOCKSHIFT and NOLOCKSHIFT cases make it to here, having set SHIFTED if appropriate.")

 
           [SETQ ASCIICODE (COND
                              (SHIFTED (TRANSITIONSHIFTCODE \CURRENTKEYACTION TI))
@@ -944,12 +955,11 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                   (fetch
 (KEYBOARDEVENT FONT) of
 KEYSTATE))
               [IF
 (IGREATERP ASCIICODE 127)
                   THEN
 
+                       (* ;; "Non-ascii interpretation--what is cntrl/meta supposed to mean?  Try using the original interpretation.  This way we can type ^E or Meta-D even if Russian keyboard is set, but doesn't mess up simple ascii remappings, such as bs->del.")

 
-                        (* ;; "Non-ascii interpretation--what is cntrl/meta supposed to mean?  Try using the original interpretation.  This way we can type ^E or Meta-D even if Russian keyboard is set, but doesn't mess up simple ascii remappings, such as bs->del.")

-
-                        (SETQ ASCIICODE (COND
-                                           (SHIFTED (TRANSITIONSHIFTCODE \COMMANDKEYACTION TI))
-                                           (T (TRANSITIONCODE \COMMANDKEYACTION TI]
+                       (SETQ ASCIICODE (COND
+                                          (SHIFTED (TRANSITIONSHIFTCODE \COMMANDKEYACTION TI))
+                                          (T (TRANSITIONCODE \COMMANDKEYACTION TI]
               [COND
                  ((fetch
 (KEYBOARDEVENT CTRL) of
 KEYSTATE)
                   (SETQ ASCIICODE (LOGAND ASCIICODE \CTRLMASK]
@@ -1069,6 +1079,8 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 (RPAQ? \MOUSECHORDTICKS
 )
 
 (RPAQ? \MOUSECHORDMILLISECONDS
 50)
+
+(RPAQ? SHIFTXORLOCKFLG
 NIL)
 (DECLARE%: DONTEVAL@LOAD DOCOPY 
 
 (\KEYBOARDINIT
)
@@ -1076,9 +1088,9 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 (DECLARE%: DONTCOPY 
 (DECLARE%: EVAL@COMPILE 
 
-(PUTPROPS .NOTELASTUSERACTION
 MACRO
 (NIL (\BLT \LASTUSERACTION (LOCF (fetch
 SECONDSTMP
-                                                                                of
 \MISCSTATS))
-                                                       WORDSPERCELL)))
+(PUTPROPS .NOTELASTUSERACTION
 MACRO
 (NIL (\BLT \LASTUSERACTION (LOCF (fetch
 SECONDSTMP of
 \MISCSTATS)
+                                                                     )
+                                               WORDSPERCELL)))
 )
 
 (DECLARE%: EVAL@COMPILE 
@@ -1095,10 +1107,10 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 
 
 (RPAQQ DLMOUSEBITS
 ((\MOUSE.LEFTBIT 4)
-                        (\MOUSE.RIGHTBIT 2)
-                        (\MOUSE.MIDDLEBIT 1)
-                        (\MOUSE.ALLBITS 7)
-                        (\MOUSE.LRBIT 6)))
+                    (\MOUSE.RIGHTBIT 2)
+                    (\MOUSE.MIDDLEBIT 1)
+                    (\MOUSE.ALLBITS 7)
+                    (\MOUSE.LRBIT 6)))
 (DECLARE%: EVAL@COMPILE 
 
 (RPAQQ \MOUSE.LEFTBIT
 4)
@@ -1121,11 +1133,11 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 
 
 (RPAQQ DLMOUSESTATES
 ((\DLMOUSE.UP 0)
-                          (\DLMOUSE.WAITING 1)
-                          (\DLMOUSE.NORMAL 2)
-                          (\DLMOUSE.MIDDLE 3)
-                          (\DLMOUSE.MIDDLE&LEFT 4)
-                          (\DLMOUSE.MIDDLE&RIGHT 5)))
+                      (\DLMOUSE.WAITING 1)
+                      (\DLMOUSE.NORMAL 2)
+                      (\DLMOUSE.MIDDLE 3)
+                      (\DLMOUSE.MIDDLE&LEFT 4)
+                      (\DLMOUSE.MIDDLE&RIGHT 5)))
 (DECLARE%: EVAL@COMPILE 
 
 (RPAQQ \DLMOUSE.UP
 0)
@@ -1231,97 +1243,95 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS \TRANSINDEX
 MACRO
 ((KEYNUMBER DOWNFLG)
-                                     (COND
-                                        (DOWNFLG (IPLUS \NKEYS KEYNUMBER))
-                                        (T KEYNUMBER))))
+                             (COND
+                                (DOWNFLG (IPLUS \NKEYS KEYNUMBER))
+                                (T KEYNUMBER))))
 
 (PUTPROPS ARMEDCODE
 MACRO
 ((TABLE CHAR)
-                                   (\GETBASEBIT (fetch
 (KEYACTION
 ARMED)
-                                                       TABLE)
-                                          CHAR)))
+                           (\GETBASEBIT (fetch
 (KEYACTION
 ARMED)
+                                               TABLE)
+                                  CHAR)))
 
 (PUTPROPS TRANSITIONALTGRCODE
 MACRO
 ((TABLE CHAR)
-                                             (\GETBASE (fetch
 (KEYACTION
 ALTGRAPHCODES)
-                                                          of
 TABLE)
-                                                    CHAR)))
+                                     (\GETBASE (fetch
 (KEYACTION
 ALTGRAPHCODES) of
 TABLE)
+                                            CHAR)))
 
 (PUTPROPS TRANSITIONSHIFTCODE
 MACRO
 ((TABLE CHAR)
-                                             (\GETBASE (fetch
 (KEYACTION
 SHIFTCODES)
-                                                              TABLE)
-                                                    CHAR)))
+                                     (\GETBASE (fetch
 (KEYACTION
 SHIFTCODES)
+                                                      TABLE)
+                                            CHAR)))
 
 (PUTPROPS TRANSITIONCODE
 MACRO
 ((TABLE CHAR)
-                                        (\GETBASE (fetch
 (KEYACTION
 CODES)
-                                                         TABLE)
-                                               CHAR)))
+                                (\GETBASE (fetch
 (KEYACTION
 CODES)
+                                                 TABLE)
+                                       CHAR)))
 
 (PUTPROPS TRANSITIONFLAGS
 MACRO
 ((TABLE CHAR)
-                                         (\GETBASEBYTE (fetch
 (KEYACTION
 FLAGS)
-                                                              TABLE)
-                                                CHAR)))
+                                 (\GETBASEBYTE (fetch
 (KEYACTION
 FLAGS)
+                                                      TABLE)
+                                        CHAR)))
 
 (PUTPROPS TRANSITIONDEADLIST
 MACRO
 ((TABLE CHAR SHIFTED)
-                                            (\GETBASEPTR (fetch
 (KEYACTION
 DEADKEYLIST)
-                                                            of
 TABLE)
-                                                   (LLSH (COND
-                                                            (SHIFTED (IPLUS CHAR \NKEYS \NKEYS))
-                                                            (T CHAR))
-                                                         1))))
+                                    (\GETBASEPTR (fetch
 (KEYACTION
 DEADKEYLIST) of
 TABLE)
+                                           (LLSH (COND
+                                                    (SHIFTED (IPLUS CHAR \NKEYS \NKEYS))
+                                                    (T CHAR))
+                                                 1))))
 
-(PUTPROPS CHECKFORDEADKEY
 MACRO

-          [(KEYCODE TABLE CHAR SHIFTED)
-           (LET ((CODE KEYCODE))
-                (COND
-                   [(IEQP CODE 65535)
-                    `(DEADKEY ,(\GETBASEPTR (fetch
 (KEYACTION
 DEADKEYLIST) of
 TABLE)
-                                      (LLSH (COND
-                                               (SHIFTED (IPLUS CHAR \NKEYS \NKEYS))
-                                               (T CHAR))
-                                            1]
-                   (T CODE])
+(PUTPROPS CHECKFORDEADKEY
 MACRO
 [(KEYCODE TABLE CHAR SHIFTED)
+                                 (LET ((CODE KEYCODE))
+                                      (COND
+                                         [(IEQP CODE 65535)
+                                          `(DEADKEY ,(\GETBASEPTR (fetch
 (KEYACTION
 DEADKEYLIST)
+                                                                     of
 TABLE)
+                                                            (LLSH (COND
+                                                                     (SHIFTED (IPLUS CHAR \NKEYS 
+                                                                                     \NKEYS))
+                                                                     (T CHAR))
+                                                                  1]
+                                         (T CODE])
 )
 
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE
 
 (BLOCKRECORD KEYACTION
 (
-                            (* ;; "KEYACTION Table:  For interpreting keystrokes.  Stored as a 8-cell block of untyped pointer hunk storage.")

+                        (* ;; "KEYACTION Table:  For interpreting keystrokes.  Stored as a 8-cell block of untyped pointer hunk storage.")

 
-                            FLAGS                            (* ; "Flag byte per key# (one for down-transtion, 1 for up-.) to describe whether lockshifting occrrs, you ignore the transition, etc.")

-                            CODES                            (* ; 
-
                     "Table of character codes generated by each key when no shift key is pressed.")

-                            SHIFTCODES                       (* ; 
-
                    "Table of character codes generated by each key when the shift key is pressed.")

-                            ARMED                            (* ; "Not sure...")

-                            INTERRUPTLIST                    (* ; "List of armed interrupts?")

-                            ALTGRAPHCODES                    (* ; 
-
                                "Table of codes to be generated when the ALT-GRAPH key is pressed.")

-                            DEADKEYLIST                      (* ; "Block of dead-key handlers, with the nominal up-transition fields filled by the shifted-case tables.  Each %"table%" is an ALIST of orignal code => accented code.  no entry means punt the accent..")

-                            )
-                           FLAGS _ (\ALLOCBLOCK (FOLDHI (IPLUS \NKEYS \NKEYS)
-                                                       BYTESPERCELL))
-                           CODES _ (\ALLOCBLOCK (FOLDHI (PLUS \NKEYS \NKEYS)
-                                                       WORDSPERCELL))
-                           SHIFTCODES _ (\ALLOCBLOCK (FOLDHI (PLUS \NKEYS \NKEYS)
-                                                            WORDSPERCELL))
-                           ARMED _ (\ALLOCBLOCK (FOLDHI (ADD1 \MAXTHINCHAR)
-                                                       BITSPERCELL))
-                           ALTGRAPHCODES _ (\ALLOCBLOCK (FOLDHI (PLUS \NKEYS \NKEYS)
-                                                               WORDSPERCELL))
-                           DEADKEYLIST _ (\ALLOCBLOCK (PLUS \NKEYS \NKEYS \NKEYS \NKEYS)
-                                                T)
-                           (CREATE
 (\ALLOCBLOCK 7 PTRBLOCK.GCT))
-                           [TYPE?
 (AND (\BLOCKDATAP DATUM)
-                                           (IGEQ (\#BLOCKDATACELLS DATUM)
-                                                 5)
-                                           (OR (NULL (FETCH
 (KEYACTION INTERRUPTLIST)
-                                                        OF
 DATUM))
-                                               (LISTP (FETCH
 INTERRUPTLIST OF
 DATUM)))
-                                           (\BLOCKDATAP (FETCH
 (KEYACTION FLAGS)
-                                                               DATUM))
-                                           (\BLOCKDATAP (FETCH
 (KEYACTION CODES)
-                                                               DATUM))
-                                           (\BLOCKDATAP (FETCH
 (KEYACTION ARMED)
-                                                               DATUM])
+                        FLAGS                                (* ; "Flag byte per key# (one for down-transtion, 1 for up-.) to describe whether lockshifting occrrs, you ignore the transition, etc.")

+                        CODES                                (* ; 
+
                       "Table of character codes generated by each key when no shift key is pressed.")

+                        SHIFTCODES                           (* ; 
+
                      "Table of character codes generated by each key when the shift key is pressed.")

+                        ARMED                                (* ; "Not sure...")

+                        INTERRUPTLIST                        (* ; "List of armed interrupts?")

+                        ALTGRAPHCODES                        (* ; 
+
                                  "Table of codes to be generated when the ALT-GRAPH key is pressed.")

+                        DEADKEYLIST                          (* ; "Block of dead-key handlers, with the nominal up-transition fields filled by the shifted-case tables.  Each %"table%" is an ALIST of orignal code => accented code.  no entry means punt the accent..")

+                        )
+                       FLAGS _ (\ALLOCBLOCK (FOLDHI (IPLUS \NKEYS \NKEYS)
+                                                   BYTESPERCELL))
+                       CODES _ (\ALLOCBLOCK (FOLDHI (PLUS \NKEYS \NKEYS)
+                                                   WORDSPERCELL))
+                       SHIFTCODES _ (\ALLOCBLOCK (FOLDHI (PLUS \NKEYS \NKEYS)
+                                                        WORDSPERCELL))
+                       ARMED _ (\ALLOCBLOCK (FOLDHI (ADD1 \MAXTHINCHAR)
+                                                   BITSPERCELL))
+                       ALTGRAPHCODES _ (\ALLOCBLOCK (FOLDHI (PLUS \NKEYS \NKEYS)
+                                                           WORDSPERCELL))
+                       DEADKEYLIST _ (\ALLOCBLOCK (PLUS \NKEYS \NKEYS \NKEYS \NKEYS)
+                                            T)
+                       (CREATE
 (\ALLOCBLOCK 7 PTRBLOCK.GCT))
+                       [TYPE?
 (AND (\BLOCKDATAP DATUM)
+                                   (IGEQ (\#BLOCKDATACELLS DATUM)
+                                         5)
+                                   (OR (NULL (FETCH
 (KEYACTION INTERRUPTLIST) OF
 DATUM))
+                                       (LISTP (FETCH
 INTERRUPTLIST OF
 DATUM)))
+                                   (\BLOCKDATAP (FETCH
 (KEYACTION FLAGS)
+                                                       DATUM))
+                                   (\BLOCKDATAP (FETCH
 (KEYACTION CODES)
+                                                       DATUM))
+                                   (\BLOCKDATAP (FETCH
 (KEYACTION ARMED)
+                                                       DATUM])
 )
 (DECLARE%: EVAL@COMPILE 
 
@@ -1337,7 +1347,7 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 (DECLARE%: EVAL@COMPILE
 
 (BLOCKRECORD RING
 ((READ WORD)
-                       (WRITE WORD)))
+                   (WRITE WORD)))
 )
 
 
@@ -1348,88 +1358,77 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 (DECLARE%: EVAL@COMPILE
 
 (ACCESSFNS SHIFTSTATE
 [[DUMMYSHIFT (NOT (EQ 0 (LOGAND (\GETBASEBYTE DATUM 0)
-                                                         (LOGOR 1 2]
-                           [DUMMY1SHIFT [NOT (EQ 0 (LOGAND 1 (\GETBASEBYTE DATUM 0]
-                                  (\PUTBASEBYTE DATUM 0 (COND
-                                                           (NEWVALUE (LOGOR 1 (\GETBASEBYTE DATUM 0))
-                                                                  )
-                                                           (T (LOGAND (\GETBASEBYTE DATUM 0)
-                                                                     (LOGXOR \CHARMASK 1]
-                           [DUMMY2SHIFT [NOT (EQ 0 (LOGAND 2 (\GETBASEBYTE DATUM 0]
-                                  (\PUTBASEBYTE DATUM 0 (COND
-                                                           (NEWVALUE (LOGOR 2 (\GETBASEBYTE DATUM 0))
-                                                                  )
-                                                           (T (LOGAND (\GETBASEBYTE DATUM 0)
-                                                                     (LOGXOR \CHARMASK 2]
-                           [DUMMYLOCK [NOT (EQ 0 (LOGAND 4 (\GETBASEBYTE DATUM 0]
-                                  (\PUTBASEBYTE DATUM 0 (COND
-                                                           (NEWVALUE (LOGOR 4 (\GETBASEBYTE DATUM 0))
-                                                                  )
-                                                           (T (LOGAND (\GETBASEBYTE DATUM 0)
-                                                                     (LOGXOR \CHARMASK 4]
-                           [DUMMYSHIFTORLOCK (NOT (EQ 0 (\GETBASEBYTE DATUM 0)))
-                                  (\PUTBASEBYTE DATUM 0 (COND
-                                                           (NEWVALUE (HELP 
-                                                                         " Can't turn on SHIFTORLOCK"
-                                                                           ))
-                                                           (T 0]
-                           [DUMMYCTRL (NOT (EQ 0 (\GETBASEBYTE DATUM 1)))
-                                  (\PUTBASEBYTE DATUM 1 (COND
-                                                           (NEWVALUE 1)
-                                                           (T 0]
-                           [DUMMYMETA (NOT (EQ 0 (\GETBASEBYTE DATUM 2)))
-                                  (\PUTBASEBYTE DATUM 2 (COND
-                                                           (NEWVALUE 1)
-                                                           (T 0]
-                           [DUMMYFONT (NEQ 0 (LOGAND (LLSH 1 3)
+                                                     (LOGOR 1 2]
+                       [DUMMY1SHIFT [NOT (EQ 0 (LOGAND 1 (\GETBASEBYTE DATUM 0]
+                              (\PUTBASEBYTE DATUM 0 (COND
+                                                       (NEWVALUE (LOGOR 1 (\GETBASEBYTE DATUM 0)))
+                                                       (T (LOGAND (\GETBASEBYTE DATUM 0)
+                                                                 (LOGXOR \CHARMASK 1]
+                       [DUMMY2SHIFT [NOT (EQ 0 (LOGAND 2 (\GETBASEBYTE DATUM 0]
+                              (\PUTBASEBYTE DATUM 0 (COND
+                                                       (NEWVALUE (LOGOR 2 (\GETBASEBYTE DATUM 0)))
+                                                       (T (LOGAND (\GETBASEBYTE DATUM 0)
+                                                                 (LOGXOR \CHARMASK 2]
+                       [DUMMYLOCK [NOT (EQ 0 (LOGAND 4 (\GETBASEBYTE DATUM 0]
+                              (\PUTBASEBYTE DATUM 0 (COND
+                                                       (NEWVALUE (LOGOR 4 (\GETBASEBYTE DATUM 0)))
+                                                       (T (LOGAND (\GETBASEBYTE DATUM 0)
+                                                                 (LOGXOR \CHARMASK 4]
+                       [DUMMYSHIFTORLOCK (NOT (EQ 0 (\GETBASEBYTE DATUM 0)))
+                              (\PUTBASEBYTE DATUM 0 (COND
+                                                       (NEWVALUE (HELP " Can't turn on SHIFTORLOCK"))
+                                                       (T 0]
+                       [DUMMYCTRL (NOT (EQ 0 (\GETBASEBYTE DATUM 1)))
+                              (\PUTBASEBYTE DATUM 1 (COND
+                                                       (NEWVALUE 1)
+                                                       (T 0]
+                       [DUMMYMETA (NOT (EQ 0 (\GETBASEBYTE DATUM 2)))
+                              (\PUTBASEBYTE DATUM 2 (COND
+                                                       (NEWVALUE 1)
+                                                       (T 0]
+                       [DUMMYFONT (NEQ 0 (LOGAND (LLSH 1 3)
+                                                (\GETBASEBYTE DATUM 3)))
+                              (\PUTBASEBYTE DATUM 3 (COND
+                                                       (NEWVALUE (LOGOR (LLSH 1 3)
+                                                                        (\GETBASEBYTE DATUM 3)))
+                                                       (T (LOGAND (\GETBASEBYTE DATUM 3)
+                                                                 (LOGXOR \CHARMASK (LLSH 1 3]
+                       [DUMMYUSERMODE1 (NEQ 0 (LOGAND (LLSH 1 0)
+                                                     (\GETBASEBYTE DATUM 3)))
+                              (\PUTBASEBYTE DATUM 3 (COND
+                                                       (NEWVALUE (LOGOR (LLSH 1 0)
+                                                                        (\GETBASEBYTE DATUM 3)))
+                                                       (T (LOGAND (\GETBASEBYTE DATUM 3)
+                                                                 (LOGXOR \CHARMASK (LLSH 1 0]
+                       [DUMMYUSERMODE2 (NEQ 0 (LOGAND (LLSH 1 1)
+                                                     (\GETBASEBYTE DATUM 3)))
+                              (\PUTBASEBYTE DATUM 3 (COND
+                                                       (NEWVALUE (LOGOR (LLSH 1 1)
+                                                                        (\GETBASEBYTE DATUM 3)))
+                                                       (T (LOGAND (\GETBASEBYTE DATUM 3)
+                                                                 (LOGXOR \CHARMASK (LLSH 1 1]
+                       [DUMMYUSERMODE3 (NEQ 0 (LOGAND (LLSH 1 2)
+                                                     (\GETBASEBYTE DATUM 3)))
+                              (\PUTBASEBYTE DATUM 3 (COND
+                                                       (NEWVALUE (LOGOR (LLSH 1 2)
+                                                                        (\GETBASEBYTE DATUM 3)))
+                                                       (T (LOGAND (\GETBASEBYTE DATUM 3)
+                                                                 (LOGXOR \CHARMASK (LLSH 1 2]
+                       [DUMMYALTGRAPH (NEQ 0 (LOGAND (LLSH 1 4)
                                                     (\GETBASEBYTE DATUM 3)))
-                                  (\PUTBASEBYTE DATUM 3 (COND
-                                                           (NEWVALUE (LOGOR (LLSH 1 3)
-                                                                            (\GETBASEBYTE DATUM 3)))
-                                                           (T (LOGAND (\GETBASEBYTE DATUM 3)
-                                                                     (LOGXOR \CHARMASK
-                                                                            (LLSH 1 3]
-                           [DUMMYUSERMODE1 (NEQ 0 (LOGAND (LLSH 1 0)
-                                                         (\GETBASEBYTE DATUM 3)))
-                                  (\PUTBASEBYTE DATUM 3 (COND
-                                                           (NEWVALUE (LOGOR (LLSH 1 0)
-                                                                            (\GETBASEBYTE DATUM 3)))
-                                                           (T (LOGAND (\GETBASEBYTE DATUM 3)
-                                                                     (LOGXOR \CHARMASK
-                                                                            (LLSH 1 0]
-                           [DUMMYUSERMODE2 (NEQ 0 (LOGAND (LLSH 1 1)
-                                                         (\GETBASEBYTE DATUM 3)))
-                                  (\PUTBASEBYTE DATUM 3 (COND
-                                                           (NEWVALUE (LOGOR (LLSH 1 1)
-                                                                            (\GETBASEBYTE DATUM 3)))
-                                                           (T (LOGAND (\GETBASEBYTE DATUM 3)
-                                                                     (LOGXOR \CHARMASK
-                                                                            (LLSH 1 1]
-                           [DUMMYUSERMODE3 (NEQ 0 (LOGAND (LLSH 1 2)
-                                                         (\GETBASEBYTE DATUM 3)))
-                                  (\PUTBASEBYTE DATUM 3 (COND
-                                                           (NEWVALUE (LOGOR (LLSH 1 2)
-                                                                            (\GETBASEBYTE DATUM 3)))
-                                                           (T (LOGAND (\GETBASEBYTE DATUM 3)
-                                                                     (LOGXOR \CHARMASK
-                                                                            (LLSH 1 2]
-                           [DUMMYALTGRAPH (NEQ 0 (LOGAND (LLSH 1 4)
-                                                        (\GETBASEBYTE DATUM 3)))
-                                  (\PUTBASEBYTE DATUM 3 (COND
-                                                           (NEWVALUE (LOGOR (LLSH 1 4)
-                                                                            (\GETBASEBYTE DATUM 3)))
-                                                           (T (LOGAND (\GETBASEBYTE DATUM 3)
-                                                                     (LOGXOR \CHARMASK
-                                                                            (LLSH 1 4]
-                           (DUMMYDEADKEYPENDING (NEQ 0 (LOGAND (LLSH 1 5)
-                                                              (\GETBASEBYTE DATUM 3)))
-                                  (\PUTBASEBYTE DATUM 3 (COND
-                                                           (NEWVALUE (LOGOR (LLSH 1 5)
-                                                                            (\GETBASEBYTE DATUM 3)))
-                                                           (T (LOGAND (\GETBASEBYTE DATUM 3)
-                                                                     (LOGXOR \CHARMASK
-                                                                            (LLSH 1 5]
-                          (CREATE
 (\ALLOCBLOCK (FOLDHI 3 BYTESPERCELL))))
+                              (\PUTBASEBYTE DATUM 3 (COND
+                                                       (NEWVALUE (LOGOR (LLSH 1 4)
+                                                                        (\GETBASEBYTE DATUM 3)))
+                                                       (T (LOGAND (\GETBASEBYTE DATUM 3)
+                                                                 (LOGXOR \CHARMASK (LLSH 1 4]
+                       (DUMMYDEADKEYPENDING (NEQ 0 (LOGAND (LLSH 1 5)
+                                                          (\GETBASEBYTE DATUM 3)))
+                              (\PUTBASEBYTE DATUM 3 (COND
+                                                       (NEWVALUE (LOGOR (LLSH 1 5)
+                                                                        (\GETBASEBYTE DATUM 3)))
+                                                       (T (LOGAND (\GETBASEBYTE DATUM 3)
+                                                                 (LOGXOR \CHARMASK (LLSH 1 5]
+                      (CREATE
 (\ALLOCBLOCK (FOLDHI 3 BYTESPERCELL))))
 )
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
@@ -1737,8 +1736,8 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
         (47 ("Function,^R" "Function,62" NOLOCKSHIFT))))
 
 (RPAQQ \DOVEOSDKEYACTIONS
 ((56 LOCKDOWN . LOCKUP)
-                               (36 CTRLDOWN . CTRLUP)
-                               (CAPSLOCK ("Function,^E" "Function,%%" NOLOCKSHIFT))))
+                           (36 CTRLDOWN . CTRLUP)
+                           (CAPSLOCK ("Function,^E" "Function,%%" NOLOCKSHIFT))))
 
 (RPAQQ \MAIKOKEYACTIONS

        ((61 ("^E" "Bell" NOLOCKSHIFT))
@@ -1965,7 +1964,8 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 (GLOBALVARS \SYSBUFFER \LONGSYSBUF \INTERRUPTSTATE \MODIFIED.KEYACTIONS \MOUSECHORDTICKS 
        \KEYBOARDEVENTQUEUE \KEYBUFFERING \CURRENTKEYACTION \COMMANDKEYACTION \DEFAULTKEYACTION 
        \TIMER.INTERRUPT.PENDING \ORIGKEYACTIONS \KEYBOARD.META \MOUSECHORDMILLISECONDS 
-       \DORADOKEYACTIONS \DLIONKEYACTIONS \DLIONOSDKEYACTIONS \DOVEKEYACTIONS \DOVEOSDKEYACTIONS)
+       \DORADOKEYACTIONS \DLIONKEYACTIONS \DLIONOSDKEYACTIONS \DOVEKEYACTIONS \DOVEOSDKEYACTIONS 
+       SHIFTXORLOCKFLG)
 )
 
 
@@ -2356,9 +2356,9 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                      (T OLDSETTING])
 
 (SHIFTDOWNP

-  [LAMBDA (SHIFT)
                                        (* lmm "18-Apr-85 01:07")

-                                                             (* Tells whether a given shift is 
-
                                                           down)

+  [LAMBDA (SHIFT)
                                            (* ; "Edited  3-Jan-2024 00:09 by mth")

+                                                             (* lmm "18-Apr-85 01:07")

+                                                             (* Tells whether a given shift is down)

     (SELECTQ SHIFT
         (LOCK (fetch
 (KEYBOARDEVENT LOCK) of
 \LASTKEYSTATE))
         (META (fetch
 (KEYBOARDEVENT META) of
 \LASTKEYSTATE))
@@ -2369,6 +2369,9 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
         (SHIFTORLOCK (OR (fetch
 (KEYBOARDEVENT 1SHIFT) of
 \LASTKEYSTATE)
                          (fetch
 (KEYBOARDEVENT 2SHIFT) of
 \LASTKEYSTATE)
                          (fetch
 (KEYBOARDEVENT LOCK) of
 \LASTKEYSTATE)))
+        (SHIFTXORLOCK (NEQ (NULL (OR (fetch
 (KEYBOARDEVENT 1SHIFT) of
 \LASTKEYSTATE)
+                                     (fetch
 (KEYBOARDEVENT 2SHIFT) of
 \LASTKEYSTATE)))
+                           (NULL (fetch
 (KEYBOARDEVENT LOCK) of
 \LASTKEYSTATE))))
         (CTRL (fetch
 (KEYBOARDEVENT CTRL) of
 \LASTKEYSTATE))
         (FONT (fetch
 (KEYBOARDEVENT FONT) of
 \LASTKEYSTATE))
         (USERMODE1 (fetch
 (KEYBOARDEVENT USERMODE1) of
 \LASTKEYSTATE))
@@ -2393,9 +2396,9 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS \TEMPCOPYTIMER
 MACRO
 ((X)
-                                        (PROGN (\BLT \MOUSETIMERTEMP (LOCF X)
-                                                     WORDSPERCELL)
-                                               \MOUSETIMERTEMP)))
+                                (PROGN (\BLT \MOUSETIMERTEMP (LOCF X)
+                                             WORDSPERCELL)
+                                       \MOUSETIMERTEMP)))
 )
 
 
@@ -2405,7 +2408,7 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 (DECLARE%: DONTCOPY 
 (* "FOLLOWING DEFINITIONS EXPORTED")
 (DEFOPTIMIZER KEYDOWNP
 (KEYNAME)
-                           `(\NEWKEYDOWNP (\KEYNAMETONUMBER
 ,KEYNAME)))
+                       `(\NEWKEYDOWNP (\KEYNAMETONUMBER
 ,KEYNAME)))
 
 (* "END EXPORTED DEFINITIONS")
 
@@ -2413,35 +2416,35 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS XKEYDOWNP
 MACRO
 ((KEYNAME)
-                                   (KEYDOWNP1 (\KEYNAMETONUMBER
 KEYNAME))))
+                           (KEYDOWNP1 (\KEYNAMETONUMBER
 KEYNAME))))
 
-(PUTPROPS KEYDOWNP1
 MACRO

-          [OPENLAMBDA (KEYNUMBER)
-            (DECLARE
 (GLOBALVARS \EM.KBDAD0 \EM.KBDAD1 \EM.KBDAD2 \EM.KBDAD3 \EM.UTILIN 
-                                \EM.KBDAD4 \EM.KBDAD5))
-            (PROG NIL
-                  (RETURN (EQ 0 (LOGAND (LRSH (LLSH 1 15)
-                                              (PROGN         (* (IMOD KEYNUMBER BITSPERWORD) -
-
                                                           GETD cause IMOD and BITSPERWORD not 
-
                                                           exported to user)

-                                                     (LOGAND KEYNUMBER 15)))
-                                       (\GETBASE (SELECTQ (PROGN 
-                                                             (* (FOLDLO KEYNUMBER BITSPERWORD) 
-
                                                           GETD follows since FOLDLO and 
-
                                                           BITSPERWORD not exported to user)

-                                                                 (LRSH KEYNUMBER 4))
-                                                     (0 \EM.KBDAD0)
-                                                     (1 \EM.KBDAD1)
-                                                     (2 \EM.KBDAD2)
-                                                     (3 \EM.KBDAD3)
-                                                     (4 \EM.UTILIN)
-                                                     (5 (OR \EM.KBDAD4 (RETURN)))
-                                                     (6 (OR \EM.KBDAD5 (RETURN)))
-                                                     (RETURN))
-                                              0])
+(PUTPROPS KEYDOWNP1
 MACRO
 [OPENLAMBDA (KEYNUMBER)
+                            (DECLARE
 (GLOBALVARS \EM.KBDAD0 \EM.KBDAD1 \EM.KBDAD2 \EM.KBDAD3 
+                                            \EM.UTILIN \EM.KBDAD4 \EM.KBDAD5))
+                            (PROG NIL
+                                  (RETURN (EQ 0 (LOGAND (LRSH (LLSH 1 15)
+                                                              (PROGN 
+                                                             (* (IMOD KEYNUMBER BITSPERWORD) -
+
                                                             GETD cause IMOD and BITSPERWORD not 
+
                                                             exported to user)

+                                                                     (LOGAND KEYNUMBER 15)))
+                                                       (\GETBASE (SELECTQ (PROGN 
+                                                             (* (FOLDLO KEYNUMBER BITSPERWORD) GETD 
+
                                                             follows since FOLDLO and BITSPERWORD 
+
                                                             not exported to user)

+                                                                                 (LRSH KEYNUMBER 4))
+                                                                     (0 \EM.KBDAD0)
+                                                                     (1 \EM.KBDAD1)
+                                                                     (2 \EM.KBDAD2)
+                                                                     (3 \EM.KBDAD3)
+                                                                     (4 \EM.UTILIN)
+                                                                     (5 (OR \EM.KBDAD4 (RETURN)))
+                                                                     (6 (OR \EM.KBDAD5 (RETURN)))
+                                                                     (RETURN))
+                                                              0])
 
 (PUTPROPS \NEWKEYDOWNP
 MACRO
 ((KEYNUMBER)
-                                      (EQ 0 (\GETBASEBIT \LASTKEYSTATE KEYNUMBER))))
+                              (EQ 0 (\GETBASEBIT \LASTKEYSTATE KEYNUMBER))))
 )
 
 (* "END EXPORTED DEFINITIONS")
@@ -3683,34 +3686,29 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS \SETMOUSEXY
 MACRO
 [(XPOS YPOS)
-                                     (PROGN (SELECTC \MACHINETYPE
-                                                (\DAYBREAK (\DoveMisc.SetMousePosition XPOS YPOS))
-                                                (\MAIKO (SUBRCALL SETMOUSEXY XPOS YPOS))
-                                                (\DANDELION (do
 (PROGN (replace
 (IOPAGE
-                                                                                         NEWMOUSEX)
-                                                                              of
 \IOPAGE
-                                                                              with
 XPOS)
-                                                                           (replace
 (IOPAGE
-                                                                                         NEWMOUSEY)
-                                                                              of
 \IOPAGE
-                                                                              with
 YPOS))
-                                                               repeatuntil

-                                                               (ILESSP (fetch
 (IOPAGE 
+                             (PROGN (SELECTC \MACHINETYPE
+                                        (\DAYBREAK (\DoveMisc.SetMousePosition XPOS YPOS))
+                                        (\MAIKO (SUBRCALL SETMOUSEXY XPOS YPOS))
+                                        (\DANDELION (do
 (PROGN (replace
 (IOPAGE NEWMOUSEX)
+                                                                  of
 \IOPAGE with
 XPOS)
+                                                               (replace
 (IOPAGE NEWMOUSEY)
+                                                                  of
 \IOPAGE with
 YPOS))
+                                                       repeatuntil
 (ILESSP (fetch
 (IOPAGE 
                                                                                         NEWMOUSESTATE
                                                                                          )
-                                                                          of
 \IOPAGE)
-                                                                      32768))
-                                                             (* ; 
-
                                                   "smash position until mouse says it is not busy")

-                                                            (replace
 (IOPAGE NEWMOUSEX)
-                                                               of
 \IOPAGE with
 XPOS)
-                                                            (replace
 (IOPAGE NEWMOUSEY)
-                                                               of
 \IOPAGE with
 YPOS)
-                                                            (replace
 (IOPAGE NEWMOUSESTATE)
-                                                               of
 \IOPAGE with
 32768))
-                                                NIL)
-                                            (PROGN (\PUTBASE \EM.MOUSEX 0 XPOS)
-                                                   (\PUTBASE \EM.MOUSEY 0 YPOS])
+                                                                              of
 \IOPAGE)
+                                                                          32768))
+                                                             (* ; 
+
                                                     "smash position until mouse says it is not busy")

+                                                    (replace
 (IOPAGE NEWMOUSEX) of
 \IOPAGE
+                                                       with
 XPOS)
+                                                    (replace
 (IOPAGE NEWMOUSEY) of
 \IOPAGE
+                                                       with
 YPOS)
+                                                    (replace
 (IOPAGE NEWMOUSESTATE) of
 \IOPAGE
+                                                       with
 32768))
+                                        NIL)
+                                    (PROGN (\PUTBASE \EM.MOUSEX 0 XPOS)
+                                           (\PUTBASE \EM.MOUSEY 0 YPOS])
 )
 
 (* "END EXPORTED DEFINITIONS")
@@ -3719,12 +3717,11 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS \XMOUSECOORD
 MACRO
 (NIL (IPLUS \CURSORHOTSPOTX (SIGNED (\GETBASE \EM.CURSORX 0)
-                                                                        BITSPERWORD))))
+                                                                BITSPERWORD))))
 
 (PUTPROPS \YMOUSECOORD
 MACRO
 [NIL (IDIFFERENCE (SUB1 \CURSORDESTHEIGHT)
-                                                 (IPLUS \CURSORHOTSPOTY (SIGNED (\GETBASE \EM.CURSORY
-                                                                                       0)
-                                                                               BITSPERWORD])
+                                         (IPLUS \CURSORHOTSPOTY (SIGNED (\GETBASE \EM.CURSORY 0)
+                                                                       BITSPERWORD])
 )
 )
 (DECLARE%: DONTEVAL@LOAD DOCOPY 
@@ -3759,12 +3756,12 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
               (USERMODE2 FLAG)
               (USERMODE3 FLAG)
               (ALTGRAPH FLAG)
-              (DEADKEYPENDING FLAG)                          (* ; "T if the last key was a dead (accent) key, and we should generate an accented character if possible.")

+              (DEADKEYPENDING FLAG)                          (* ; "T if the last key was a dead (accent) key, and we should generate an accented character if possible.")

               (NIL BITS 2)
               (MOUSEX WORD)
               (MOUSEY WORD)
-              (DEADKEY-ALIST XPOINTER)                       (* ; 
-
                                    "The ALIST describing accents possible from teh last dead key.")

+              (DEADKEY-ALIST XPOINTER)                       (* ; 
+
                                      "The ALIST describing accents possible from teh last dead key.")

               )
              (CREATE
 (\ALLOCBLOCK (FOLDHI \KEYBOARDEVENT.SIZE WORDSPERCELL)))
              W0 _ ALLUP W1 _ ALLUP W2 _ ALLUP W3 _ ALLUP W4 _ ALLUP W5 _ ALLUP WU _ ALLUP MOUSESTATE
@@ -3773,12 +3770,16 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
                                                                        DATUM)
                                                                 (fetch
 (KEYBOARDEVENT 2SHIFT)
                                                                        DATUM)))
-                                                     (SHIFTORLOCK (OR (fetch
 (KEYBOARDEVENT
-                                                                                  SHIFT)
+                                                     (SHIFTORLOCK (OR (fetch
 (KEYBOARDEVENT SHIFT)
                                                                              DATUM)
-                                                                      (fetch
 (KEYBOARDEVENT
-                                                                                  LOCK)
-                                                                             DATUM]
+                                                                      (fetch
 (KEYBOARDEVENT LOCK)
+                                                                             DATUM)))
+                                                     (SHIFTXORLOCK (NEQ (NULL (fetch
 (KEYBOARDEVENT
+                                                                                      SHIFT)
+                                                                                     DATUM))
+                                                                        (NULL (fetch
 (KEYBOARDEVENT
+                                                                                      LOCK)
+                                                                                     DATUM]
              LOCK _ (XKEYDOWNP 'LOCK)
              TIME _ 0 DEADKEYPENDING _ NIL)
 )
@@ -3919,36 +3920,34 @@ Copyright (c) 1982-1990, 1992, 1999, 1920, 2000, 2018, 2021 by Venue & Xerox Cor
 
 (ADDTOVAR LAMA
 CURSORPROP METASHIFT MOUSECHORDWAIT)
 )
-(PUTPROPS LLKEY COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1989 1990 
-1992 1999 1920 2000 2018 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (14696 22012 (BKSYSCHARCODE 14706 . 15055) (\CLEARSYSBUF 15057 . 15615) (\GETKEY 15617
- . 16792) (\NSYSBUFCHARS 16794 . 17536) (\SAVESYSBUF 17538 . 19147) (\SYSBUFP 19149 . 19453) (
-\GETSYSBUF 19455 . 19635) (\PUTSYSBUF 19637 . 20850) (\PEEKSYSBUF 20852 . 22010)) (23309 60143 (
-\KEYBOARDINIT 23319 . 25039) (\KEYBOARDEVENTFN 25041 . 29741) (\ALLOCLOCKED 29743 . 30333) (
-\SETIOPOINTERS 30335 . 34871) (\KEYBOARDOFF 34873 . 35287) (\KEYBOARDON 35289 . 35668) (\KEYHANDLER 
-35670 . 35801) (\KEYHANDLER1 35803 . 43249) (\RESETKEYBOARD 43251 . 44899) (\DOMOUSECHORDING 44901 . 
-48721) (\DOTRANSITIONS 48723 . 49400) (\DECODETRANSITION 49402 . 56091) (MOUSECHORDWAIT 56093 . 56757)
- (\TRACKCURSOR 56759 . 60141)) (95847 117397 (KEYACTION 95857 . 96710) (KEYACTIONTABLE 96712 . 97894) 
-(KEYBOARDTYPE 97896 . 98998) (RESETKEYACTION 99000 . 100759) (\KEYBOARD.MACHINE-SPECIFIC-KEYACTIONS 
-100761 . 102663) (\KEYACTION1 102665 . 112781) (KEYDOWNP 112783 . 113118) (KEYNUMBERP 113120 . 113318)
- (\KEYNAMETONUMBER 113320 . 114014) (\KEYNUMBERTONAME 114016 . 114206) (MODIFY.KEYACTIONS 114208 . 
-115069) (METASHIFT 115071 . 116015) (SHIFTDOWNP 116017 . 117395)) (117460 117756 (
-SETUP.OFFICE.KEYBOARD 117470 . 117754)) (120459 122171 (\INIT.KEYBOARD.STREAM 120469 . 122169)) (
-122436 138813 (\DOBUFFEREDTRANSITIONS 122446 . 137876) (\TIMER.INTERRUPTFRAME 137878 . 138603) (
-\PERIODIC.INTERRUPTFRAME 138605 . 138811)) (139067 143144 (\HARDCURSORUP 139077 . 140959) (
-\HARDCURSORPOSITION 140961 . 142997) (\HARDCURSORDOWN 142999 . 143142)) (143145 167205 (CURSOR.INIT 
-143155 . 146855) (\CURSORDESTINATION 146857 . 149175) (\SOFTCURSORUP 149177 . 154431) (
-\SOFTCURSORUPCURRENT 154433 . 161469) (\SOFTCURSORPOSITION 161471 . 162236) (\SOFTCURSORDOWN 162238 . 
-162946) (CURSORPROP 162948 . 163290) (GETCURSORPROP 163292 . 163480) (PUTCURSORPROP 163482 . 164637) (
-\CURSORBITSPERPIXEL 164639 . 166755) (\CURSORIMAGEPROPNAME 166757 . 166981) (\CURSORMASKPROPNAME 
-166983 . 167203)) (167206 185156 (CURSORCREATE 167216 . 169891) (CURSOR 169893 . 171705) (
-\CURSOR-VALID-P 171707 . 172794) (\CURSORUP 172796 . 174511) (\CURSORPOSITION 174513 . 177041) (
-\CURSORDOWN 177043 . 177276) (ADJUSTCURSORPOSITION 177278 . 177856) (CURSORPOSITION 177858 . 179400) (
-CURSORSCREEN 179402 . 180058) (CURSOREXIT 180060 . 181451) (FLIPCURSOR 181453 . 182579) (FLIPCURSORBAR
- 182581 . 183561) (LASTMOUSEX 183563 . 183817) (LASTMOUSEY 183819 . 184073) (CREATEPOSITION 184075 . 
-184281) (POSITIONP 184283 . 184567) (CURSORHOTSPOT 184569 . 185154)) (186394 187942 (GETMOUSESTATE 
-186404 . 187063) (\EVENTKEYS 187065 . 187940)) (194369 195165 (MACHINETYPE 194379 . 194779) (
-SETMAINTPANEL 194781 . 195163)) (195195 196334 (BEEPON 195205 . 195858) (BEEPOFF 195860 . 196332)) (
-196785 197048 (WITHOUT-INTERRUPTS 196795 . 197046)))))
+  (FILEMAP (NIL (14744 22060 (BKSYSCHARCODE 14754 . 15103) (\CLEARSYSBUF 15105 . 15663) (\GETKEY 15665
+ . 16840) (\NSYSBUFCHARS 16842 . 17584) (\SAVESYSBUF 17586 . 19195) (\SYSBUFP 19197 . 19501) (
+\GETSYSBUF 19503 . 19683) (\PUTSYSBUF 19685 . 20898) (\PEEKSYSBUF 20900 . 22058)) (23345 60763 (
+\KEYBOARDINIT 23355 . 25075) (\KEYBOARDEVENTFN 25077 . 29777) (\ALLOCLOCKED 29779 . 30369) (
+\SETIOPOINTERS 30371 . 34907) (\KEYBOARDOFF 34909 . 35323) (\KEYBOARDON 35325 . 35704) (\KEYHANDLER 
+35706 . 35837) (\KEYHANDLER1 35839 . 43285) (\RESETKEYBOARD 43287 . 44935) (\DOMOUSECHORDING 44937 . 
+48757) (\DOTRANSITIONS 48759 . 49436) (\DECODETRANSITION 49438 . 56711) (MOUSECHORDWAIT 56713 . 57377)
+ (\TRACKCURSOR 57379 . 60761)) (95222 117095 (KEYACTION 95232 . 96085) (KEYACTIONTABLE 96087 . 97269) 
+(KEYBOARDTYPE 97271 . 98373) (RESETKEYACTION 98375 . 100134) (\KEYBOARD.MACHINE-SPECIFIC-KEYACTIONS 
+100136 . 102038) (\KEYACTION1 102040 . 112156) (KEYDOWNP 112158 . 112493) (KEYNUMBERP 112495 . 112693)
+ (\KEYNAMETONUMBER 112695 . 113389) (\KEYNUMBERTONAME 113391 . 113581) (MODIFY.KEYACTIONS 113583 . 
+114444) (METASHIFT 114446 . 115390) (SHIFTDOWNP 115392 . 117093)) (117158 117454 (
+SETUP.OFFICE.KEYBOARD 117168 . 117452)) (120433 122145 (\INIT.KEYBOARD.STREAM 120443 . 122143)) (
+122410 138787 (\DOBUFFEREDTRANSITIONS 122420 . 137850) (\TIMER.INTERRUPTFRAME 137852 . 138577) (
+\PERIODIC.INTERRUPTFRAME 138579 . 138785)) (139041 143118 (\HARDCURSORUP 139051 . 140933) (
+\HARDCURSORPOSITION 140935 . 142971) (\HARDCURSORDOWN 142973 . 143116)) (143119 167179 (CURSOR.INIT 
+143129 . 146829) (\CURSORDESTINATION 146831 . 149149) (\SOFTCURSORUP 149151 . 154405) (
+\SOFTCURSORUPCURRENT 154407 . 161443) (\SOFTCURSORPOSITION 161445 . 162210) (\SOFTCURSORDOWN 162212 . 
+162920) (CURSORPROP 162922 . 163264) (GETCURSORPROP 163266 . 163454) (PUTCURSORPROP 163456 . 164611) (
+\CURSORBITSPERPIXEL 164613 . 166729) (\CURSORIMAGEPROPNAME 166731 . 166955) (\CURSORMASKPROPNAME 
+166957 . 167177)) (167180 185130 (CURSORCREATE 167190 . 169865) (CURSOR 169867 . 171679) (
+\CURSOR-VALID-P 171681 . 172768) (\CURSORUP 172770 . 174485) (\CURSORPOSITION 174487 . 177015) (
+\CURSORDOWN 177017 . 177250) (ADJUSTCURSORPOSITION 177252 . 177830) (CURSORPOSITION 177832 . 179374) (
+CURSORSCREEN 179376 . 180032) (CURSOREXIT 180034 . 181425) (FLIPCURSOR 181427 . 182553) (FLIPCURSORBAR
+ 182555 . 183535) (LASTMOUSEX 183537 . 183791) (LASTMOUSEY 183793 . 184047) (CREATEPOSITION 184049 . 
+184255) (POSITIONP 184257 . 184541) (CURSORHOTSPOT 184543 . 185128)) (186368 187916 (GETMOUSESTATE 
+186378 . 187037) (\EVENTKEYS 187039 . 187914)) (194115 194911 (MACHINETYPE 194125 . 194525) (
+SETMAINTPANEL 194527 . 194909)) (194941 196080 (BEEPON 194951 . 195604) (BEEPOFF 195606 . 196078)) (
+196531 196794 (WITHOUT-INTERRUPTS 196541 . 196792)))))
 STOP

sources/LLSYMBOL

@@ -1,13 +1,11 @@
-(DEFINE-FILE-INFO READTABLE "XCL" PACKAGE "LISP")
-
(IL:FILECREATED "11-Jun-90 17:56:50" IL:|{PELE:MV:ENVOS}<LISPCORE>SOURCES>LLSYMBOL.;5|
 9443   
+(DEFINE-FILE-INFO PACKAGE "LISP" READTABLE "XCL" BASE 10)
 
-      IL:|changes| IL:|to:|  (IL:VARS IL:LLSYMBOLCOMS)
+
(IL:FILECREATED "31-Oct-2023 16:16:39" IL:|{WMEDLEY}<sources>LLSYMBOL.;2|
 9255   
 
-      IL:|previous| IL:|date:| " 4-Jun-90 15:10:38" IL:|{PELE:MV:ENVOS}<LISPCORE>SOURCES>LLSYMBOL.;4|
-)
+      :EDIT-BY IL:|rmk|
 
+      :PREVIOUS-DATE "11-Jun-90 17:56:50" IL:|{WMEDLEY}<sources>LLSYMBOL.;1|)
 
-; Copyright (c) 1986, 1987, 1990 by Venue & Xerox Corporation.  All rights reserved.
 
 (IL:PRETTYCOMPRINT IL:LLSYMBOLCOMS)
 
@@ -86,7 +84,7 @@
 
    (IL:* IL:|;;| "Look on the property list of SYMBOL for the specified INDICATOR. If this is found, return the associated value, else return DEFAULT.")

 
-   (GETF (IL:GETPROPLIST SYMBOL)
+   (GETF
 (IL:GETPROPLIST SYMBOL)
          INDICATOR DEFAULT))
 
 (DEFUN GETF
 (PLACE INDICATOR &OPTIONAL (DEFAULT NIL))
@@ -129,7 +127,7 @@
 
    (IL:* IL:|;;| "Has lots of special knowledge of prop list names")

 
-   (SETF (SYMBOL-FUNCTION SYMBOL)
+   (SETF (SYMBOL-FUNCTION
 SYMBOL)
          NIL)
    (SETF (MACRO-FUNCTION SYMBOL)
          NIL)
@@ -145,10 +143,10 @@
    (COND
       (DEF)                                                  (IL:* IL:\; "GETD returned non-NIL")

       ((SETQ DEF (MACRO-FUNCTION SYMBOL))                    (IL:* IL:\; 
-
                                        "Return something representing the macro's implementation.")

+
                                          "Return something representing the macro's implementation.")

        (CONS ':MACRO DEF))
       ((SETQ DEF (SPECIAL-FORM-P SYMBOL))                    (IL:* IL:\; 
-
                                 "Return something representing the special-form's implementation.")

+
                                   "Return something representing the special-form's implementation.")

        (CONS ':SPECIAL-FORM DEF))
       (T (ERROR 'XCL:UNDEFINED-FUNCTION :NAME SYMBOL))))
 
@@ -167,7 +165,7 @@
        (CASE (CAR DEFINITION)
            (:MACRO (SETF (MACRO-FUNCTION SYMBOL)
                          (CDR DEFINITION)))
-           (:SPECIAL-FORM (SETF (GET SYMBOL 'IL:SPECIAL-FORM)
+           (:SPECIAL-FORM (SETF (GET
 SYMBOL 'IL:SPECIAL-FORM)
                                 (CDR DEFINITION)))
            (T (IL:PUTD SYMBOL DEFINITION T))))
 
@@ -211,13 +209,13 @@
        (SETQ *GENSYM-COUNTER* (1+ *GENSYM-COUNTER*))))
 
 (DEFUN GENTEMP
 (&OPTIONAL (PREFIX "T")
-                          (PACKAGE *PACKAGE*))
+                      (PACKAGE *PACKAGE*))
 
    (IL:* IL:|;;| "*gentemp-counter* holds a good guess for the suffix  ")

 
    (LET ((COUNTER *GENTEMP-COUNTER*)
          NAMESTRING)                                         (IL:* IL:\; 
-
     "Use IL:MKSTRING rather than princ-to-string, since princ-to-string occurs late in the loadup")

+
       "Use IL:MKSTRING rather than princ-to-string, since princ-to-string occurs late in the loadup")

         (LOOP (SETQ NAMESTRING (CONCATENATE 'STRING PREFIX (IL:MKSTRING COUNTER)))
               (WHEN (NULL (FIND-SYMBOL NAMESTRING PACKAGE))
                   (SETQ *GENTEMP-COUNTER* (1+ COUNTER))
@@ -225,21 +223,21 @@
               (SETQ COUNTER (1+ COUNTER)))))
 
 (DEFUN COPY-SYMBOL
 (SYM &OPTIONAL COPY-PROPS)
-   (LET ((NEW-SYM (MAKE-SYMBOL (SYMBOL-NAME SYM))))
+   (LET ((NEW-SYM (MAKE-SYMBOL (SYMBOL-NAME
 SYM))))
         (WHEN COPY-PROPS
             (IF (BOUNDP SYM)
-                (SETF (SYMBOL-VALUE NEW-SYM)
-                      (SYMBOL-VALUE SYM)))
-            (IF (FBOUNDP SYM)
-                (SETF (SYMBOL-FUNCTION NEW-SYM)
-                      (SYMBOL-FUNCTION SYM)))
+                (SETF (SYMBOL-VALUE
 NEW-SYM)
+                      (SYMBOL-VALUE
 SYM)))
+            (IF (FBOUNDP
 SYM)
+                (SETF (SYMBOL-FUNCTION
 NEW-SYM)
+                      (SYMBOL-FUNCTION
 SYM)))
             (SETF (SYMBOL-PLIST NEW-SYM)
                   (COPY-LIST (SYMBOL-PLIST SYM))))
         NEW-SYM))
 
 (DEFUN IL:MAKE-KEYWORD
 (SYMBOL)
    (DECLARE
 (SPECIAL IL:*KEYWORD-PACKAGE*))
-   (VALUES (INTERN (SYMBOL-NAME SYMBOL)
+   (VALUES (INTERN (SYMBOL-NAME
 SYMBOL)
                   IL:*KEYWORD-PACKAGE*)))
 
 (DEFUN KEYWORDP
 (OBJECT)
@@ -250,7 +248,11 @@
 (IL:PUTPROPS IL:LLSYMBOL
 IL:FILETYPE
 COMPILE-FILE)
 
 (IL:PUTPROPS IL:LLSYMBOL
 IL:MAKEFILE-ENVIRONMENT
 (:READTABLE "XCL" :PACKAGE "LISP"))
-(IL:PUTPROPS IL:LLSYMBOL IL:COPYRIGHT ("Venue & Xerox Corporation" 1986 1987 1990))
 (IL:DECLARE\: IL:DONTCOPY
-  (IL:FILEMAP (NIL)))
+  (IL:FILEMAP (NIL (1606 1904 (MAKUNBOUND 1606 . 1904)) (1906 2423 (SYMBOL-NAME 1906 . 2423)) (2425 2741
+ (SYMBOL-VALUE 2425 . 2741)) (2743 3025 (GET 2743 . 3025)) (3027 3534 (GETF 3027 . 3534)) (3536 3958 (
+GET-PROPERTIES 3536 . 3958)) (4065 4214 (FBOUNDP 4065 . 4214)) (4216 4527 (FMAKUNBOUND 4216 . 4527)) (
+4529 5514 (SYMBOL-FUNCTION 4529 . 5514)) (5516 7128 (IL:SETF-SYMBOL-FUNCTION 5516 . 7128)) (7268 7582 
+(GENSYM 7268 . 7582)) (7584 8271 (GENTEMP 7584 . 8271)) (8273 8774 (COPY-SYMBOL 8273 . 8774)) (8776 
+8945 (IL:MAKE-KEYWORD 8776 . 8945)) (8947 9072 (KEYWORDP 8947 . 9072)))))
 IL:STOP

sources/MACHINEINDEPENDENT

@@ -1,20 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "20-Jul-2022 19:55:30" {DSK}<home>larry>medley>sources>MACHINEINDEPENDENT.;4
 117970 
+
(FILECREATED "18-Jan-2024 10:40:56" {WMEDLEY}<sources>MACHINEINDEPENDENT.;38
 117576 
 
-      :CHANGES-TO (VARS MACHINEINDEPENDENTCOMS)
-                  (FNS UNSAFE.TO.MODIFY)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "20-Jul-2022 15:26:15" {DSK}<home>larry>medley>sources>MACHINEINDEPENDENT.;3)
+      :CHANGES-TO (FNS LISPSOURCEFILEP)
 
+      :PREVIOUS-DATE "20-Jul-2022 19:55:30" {WMEDLEY}<sources>MACHINEINDEPENDENT.;36)
 
-(* ; "
-Copyright (c) 1983-1991, 2021-2022 by Venue & Xerox Corporation.
-The following program was created in 1983 but has not been published
-within the meaning of the copyright law, is furnished under license,
-and may not be used, copied and/or disclosed except in accordance
-with the terms of said license.
-")
 
 (PRETTYCOMPRINT MACHINEINDEPENDENTCOMS)
 
@@ -1665,6 +1658,8 @@ WRITEFILE OF ")
 (LISPSOURCEFILEP

   [LAMBDA (FILE)
 
+    (* ;; "Edited 18-Jan-2024 10:40 by rmk")

+
     (* ;; "Edited 22-May-2022 09:49 by rmk: If FILE is a stream but not open for input, open it")

 
     (* ;; "Edited  9-Jul-2021 22:12 by rmk:")

@@ -1676,16 +1671,17 @@ WRITEFILE OF ")
                         (GETSTREAM FILE 'INPUT T))
             [RESETSAVE NIL (LIST 'CLOSEF (SETQ FILE (OPENSTREAM FILE 'INPUT])
         (CL:WHEN (RANDACCESSP FILE)
-            (LET ((HERE (GETFILEPTR FILE)))
-                 (CL:MULTIPLE-VALUE-BIND (ENV MAP)
-                        [\PARSE-FILE-HEADER
 FILE (FUNCTION (LAMBDA (STREAM)
+            (LET ((HERE (GETFILEPTR FILE))
+                  ENV MAP)
+                 [NLSETQ (CL:MULTIPLE-VALUE-SETQ (ENV MAP)
+                                (\PARSE-FILE-HEADER
 FILE (FUNCTION (LAMBDA (STREAM)
                                                              (* ; 
 
                                                 "Pointed now right after the FILECREATED expression")

-                                                             (CAR (NLSETQ (SKREAD STREAM)
-                                                                         (SKREAD STREAM)
-                                                                         (FIXP (READ STREAM]
-                        (SETFILEPTR FILE HERE)
-                        (CL:VALUES ENV MAP)))))])
+                                                                     (CAR (NLSETQ (SKREAD STREAM)
+                                                                                 (SKREAD STREAM)
+                                                                                 (FIXP (READ STREAM]
+                 (SETFILEPTR FILE HERE)
+                 (CL:VALUES ENV MAP))))])
 
 (LISPFILETYPE

   [LAMBDA (FILE)
                                             (* ; "Edited 22-May-2022 13:18 by rmk")

@@ -2466,26 +2462,24 @@ This has little hope of working any more.")

 
 (LOCALVARS . T)
 )
-(PUTPROPS MACHINEINDEPENDENT COPYRIGHT ("Venue & Xerox Corporation" T 1983 1984 1985 1986 1987 1988 
-1989 1990 1991 2021 2022))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (12904 26329 (LOAD? 12914 . 14765) (FILESLOAD 14767 . 15056) (DOFILESLOAD 15058 . 22684)
- (FINDFILE-WITH-EXTENSIONS 22686 . 25885) (READ-FILECREATED 25887 . 26327)) (26446 31767 (DMPHASH 
-26456 . 28050) (HASHOVERFLOW 28052 . 31765)) (32523 64631 (BKBUFS 32533 . 33652) (CHANGENAME 33654 . 
-33915) (CHNGNM 33917 . 35765) (CLBUFS 35767 . 37040) (DEFINE 37042 . 37766) (FNS.PUTDEF 37768 . 41183)
- (EQMEMB 41185 . 41367) (EQUALN 41369 . 42198) (FNCHECK 42200 . 44207) (FNTYP1 44209 . 44306) (LCSKIP 
-44308 . 45152) (MAPRINT 45154 . 46100) (MKLIST 46102 . 46252) (NAMEFIELD 46254 . 47779) (NLIST 47781
- . 48116) (PRINTBELLS 48118 . 48244) (PROMPTCHAR 48246 . 50136) (RAISEP 50138 . 50399) (READFILE 50401
- . 52745) (READLINE 52747 . 58187) (REMPROPLIST 58189 . 59077) (RESETBUFS 59079 . 59529) (TAB 59531 . 
-60127) (UNSAVED1 60129 . 61234) (WRITEFILE 61236 . 62978) (CLOSE-AND-MAYBE-DELETE 62980 . 63324) (
-UNSAFE.TO.MODIFY 63326 . 64629)) (66986 69930 (FILEDATE 66996 . 69928)) (70160 97262 (FILEMAP 70170 . 
-70640) (\PARSE-FILE-HEADER 70642 . 74457) (GET-ENVIRONMENT-AND-FILEMAP 74459 . 76686) (
-LOOKUP-ENVIRONMENT-AND-FILEMAP 76688 . 78879) (GET-FILEMAP-FROM-FILECREATED 78881 . 79705) (
-\FILEMAP-HASHOVERFLOW 79707 . 84371) (FLUSHFILEMAPS 84373 . 84996) (LISPSOURCEFILEP 84998 . 86289) (
-LISPFILETYPE 86291 . 89540) (GETFILEMAP 89542 . 89961) (PUTFILEMAP 89963 . 92154) (UPDATEFILEMAP 92156
- . 97260)) (97928 101514 (LVLPRINT 97938 . 98111) (LVLPRIN1 98113 . 98295) (LVLPRIN2 98297 . 98529) (
-LVLPRIN 98531 . 99545) (LVLPRIN0 99547 . 101512)) (101548 106465 (FLUSHRIGHT 101558 . 102373) (
-PRINTPARA 102375 . 103473) (PRINTPARA1 103475 . 106463)) (106501 108786 (SUBLIS 106511 . 107119) (
-SUBPAIR 107121 . 108349) (DSUBLIS 108351 . 108784)) (108809 109409 (CONSTANTOK 108819 . 109407)) (
-111162 111867 (NLAMBDA.ARGS 111172 . 111865)))))
+  (FILEMAP (NIL (12537 25962 (LOAD? 12547 . 14398) (FILESLOAD 14400 . 14689) (DOFILESLOAD 14691 . 22317)
+ (FINDFILE-WITH-EXTENSIONS 22319 . 25518) (READ-FILECREATED 25520 . 25960)) (26079 31400 (DMPHASH 
+26089 . 27683) (HASHOVERFLOW 27685 . 31398)) (32156 64264 (BKBUFS 32166 . 33285) (CHANGENAME 33287 . 
+33548) (CHNGNM 33550 . 35398) (CLBUFS 35400 . 36673) (DEFINE 36675 . 37399) (FNS.PUTDEF 37401 . 40816)
+ (EQMEMB 40818 . 41000) (EQUALN 41002 . 41831) (FNCHECK 41833 . 43840) (FNTYP1 43842 . 43939) (LCSKIP 
+43941 . 44785) (MAPRINT 44787 . 45733) (MKLIST 45735 . 45885) (NAMEFIELD 45887 . 47412) (NLIST 47414
+ . 47749) (PRINTBELLS 47751 . 47877) (PROMPTCHAR 47879 . 49769) (RAISEP 49771 . 50032) (READFILE 50034
+ . 52378) (READLINE 52380 . 57820) (REMPROPLIST 57822 . 58710) (RESETBUFS 58712 . 59162) (TAB 59164 . 
+59760) (UNSAVED1 59762 . 60867) (WRITEFILE 60869 . 62611) (CLOSE-AND-MAYBE-DELETE 62613 . 62957) (
+UNSAFE.TO.MODIFY 62959 . 64262)) (66619 69563 (FILEDATE 66629 . 69561)) (69793 96996 (FILEMAP 69803 . 
+70273) (\PARSE-FILE-HEADER 70275 . 74090) (GET-ENVIRONMENT-AND-FILEMAP 74092 . 76319) (
+LOOKUP-ENVIRONMENT-AND-FILEMAP 76321 . 78512) (GET-FILEMAP-FROM-FILECREATED 78514 . 79338) (
+\FILEMAP-HASHOVERFLOW 79340 . 84004) (FLUSHFILEMAPS 84006 . 84629) (LISPSOURCEFILEP 84631 . 86023) (
+LISPFILETYPE 86025 . 89274) (GETFILEMAP 89276 . 89695) (PUTFILEMAP 89697 . 91888) (UPDATEFILEMAP 91890
+ . 96994)) (97662 101248 (LVLPRINT 97672 . 97845) (LVLPRIN1 97847 . 98029) (LVLPRIN2 98031 . 98263) (
+LVLPRIN 98265 . 99279) (LVLPRIN0 99281 . 101246)) (101282 106199 (FLUSHRIGHT 101292 . 102107) (
+PRINTPARA 102109 . 103207) (PRINTPARA1 103209 . 106197)) (106235 108520 (SUBLIS 106245 . 106853) (
+SUBPAIR 106855 . 108083) (DSUBLIS 108085 . 108518)) (108543 109143 (CONSTANTOK 108553 . 109141)) (
+110896 111601 (NLAMBDA.ARGS 110906 . 111599)))))
 STOP