First checkin of evolving new linux installer code

* update medley README to match new build instructions

* Remove NUL character

* Fix grammatical and typographic errors reported by Matt

* Fixed a few typos, some punctuation, a bit of wording, and removed the Docker references (Docker related files aren't in the repo anymore).

* A few more fixes

---------

Co-authored-by: Nick Briggs <nicholas.h.briggs@gmail.com>
Co-authored-by: Matt Heffron <heffron@alumni.caltech.edu>

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.
+[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).
-In particular [Running](https://github.com/Interlisp/medley/wiki/Running) explains other methods of getting Medley Interlisp.
 
-[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)
+Or, build your own maiko (the binaries `lde`, `ldex` OR `ldesdl`, and `ldeinit`).
-1. The "loadups" (download `medley-`YYMMDD`-loadups.tgz`)
+You can also build for other architectures
-2. The "runtime" (download `medley-`YYMMDD`-runtime.tgz`)
 
-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
+where _YYMMDD_ is the date and _XXXXX_ is the GitHub commit ID.
-```
+
-   gh release download -R Interlisp/medley -p "*"
+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.
-```
-but otherwise just click on the link(s) below to the parts you need.
 
 ### Unpacking releases
 
 From a shell/terminal window:
 
-1. Choose where you want to install medley and maiko.
+1. Choose a directory _parent_ where you want to install medley and maiko. 
-Unpack the medley loadups file
+2. Unpack the medley loadups file
 
-*  `cd ` ~parent~
+* `cd ` _parent_
-*  `tar xvzf medley-`YYMMDD`-loadups.tgz`
+* `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.
+* 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.
-* 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))
-* 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
-

installers/linux/linux_installer.sh

@@ -0,0 +1,89 @@
+#! /bin/sh
+
+get_distro () {
+
+  
+  # try various methods, in order of preference, to detect distro
+  # store result in variable '$distro'
+  #
+  distro=$(lsb_release -i -s 2>/dev/null)
+  #
+  if test -z "${distro}" -a -e /etc/os-release
+  then
+    distro=$(awk -F= '$1 == "ID" {print $2}' /etc/os-release)
+  fi
+  #
+  if test -z "${distro}" -a -e /etc/lib/os-release
+  then
+    distro=$(awk -F= '$1 == "ID" {print $2}' /etc/lib/os-release)
+  fi
+  #
+  if test -z "${distro}" -a -e /etc/lsb-release
+  then
+    distro=$(awk -F= '$1 == "DISTRIB_ID" {print $2}' /etc/lib/lsb-release)
+  fi
+  #
+  if test -z "${distro}" -a -e /etc/debian_version
+  then
+    distro="debian"
+  fi
+  #
+  ls /etc/*-release >/dev/null
+  if test $? -eq 0 -a -z "${distro}"
+  then
+    distro=$(cat /etc/*-release | awk -F= '$1 == "ID" {print $2}' | tail -n 1)
+  fi
+  #
+  if test -z "${distro}"
+  then
+    distro="unknown"
+  fi
+
+  # convert to lowercase
+  distro=$(printf '%s\n' "${distro}" | LC_ALL=C tr '[:upper:]' '[:lower:]')
+
+  echo ${distro}
+
+}
+
+is_pkg_installed_cmd () {
+  distro="$1"
+  if test -z ${distro};
+  then
+    distro="$(get_distro)"
+  fi
+  case "${distro}" in
+
+    alpine)
+      cmd="apk info"
+      ;;
+
+    arch | endeavouros | manjaro)
+      cmd="pacman -Q"
+      ;;
+    debian | mint | mxlinux | popos | raspian | ubuntu | zorinos)
+      cmd="dpkg -l"
+      ;;
+
+    centos | fedora)
+      cmd="rpm -qa"
+      ;;
+
+    opensuse)
+      cmd="zypper search -is"
+      ;;
+
+    *)
+      echo "Warning: do not know which package manager to use for distro: ${distro}"
+      ;;
+
+  esac
+
+  echo "${cmd}"
+}
+
+distro=$(get_distro)
+echo "Distro is ${distro}"
+is_installed=$(is_pkg_installed_cmd "${distro}")
+echo "is_installed cmd is: ${is_installed}"
+

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" 
+      :PREVIOUS-DATE " 4-Nov-2023 15:23:16" |{DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;1|)
-|{DSK}<home>frank>il>medley>gmedley>internal>MEDLEY-UTILS.;5|)
 
 
 (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
+(RPAQQ OKLISPUSERS

-                          BACKGROUND-YIELD OBJECTWINDOW REGIONMANAGER COMPARETEXT EXAMINEDEFS 
+       (THINFILES ISO8859IO DINFO HELPSYS MODERNIZE WHEELSCROLL PRETTYFILEINDEX WHO-LINE 
-                          COMPARESOURCES COMPAREDIRECTORIES PSEUDOHOSTS DATEFORMAT-EDITOR DOC-OBJECTS
+              BACKGROUND-YIELD OBJECTWINDOW REGIONMANAGER COMPARETEXT EXAMINEDEFS COMPARESOURCES 
-                          EQUATIONS BICLOCK FILEWATCH LIFE IDLEHAX GITFNS TMAX IMTOOLS))
+              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
+  (FILEMAP (NIL (781 7744 (GATHER-INFO 791 . 6319) (MAKE-FULLER-DB 6321 . 7099) (MEDLEY-FIX-LINKS 7101
- . 7396) (MEDLEY-FIX-DATES 7398 . 7640)) (8681 10672 (MAKE-EXPORTS-ALL 8691 . 9752) (MAKE-WHEREIS-HASH
+ . 7498) (MEDLEY-FIX-DATES 7500 . 7742)) (8923 10914 (MAKE-EXPORTS-ALL 8933 . 9994) (MAKE-WHEREIS-HASH
- 9754 . 10670)))))
+ 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)                    (* \; 
+  (LAMBDA (BROWSER FILE OPTION ITEM MENU)
                   (* \; "Edited  4-Nov-2023 23:55 by rmk")


-
                                                           "Edited 19-Sep-2021 18:07 by rmk:")

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


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

library/PDFSTREAM

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 1-Oct-2023 20:53:05" {WMEDLEY}<library>PDFSTREAM.;54
 13917  
+
(FILECREATED "11-Nov-2023 11:24:42" {WMEDLEY}<library>PDFSTREAM.;56
 14033  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS SEE-PDF)
+      :CHANGES-TO (VARS PDFSTREAMCOMS)
 
-      :PREVIOUS-DATE " 1-Oct-2023 15:29:33" {WMEDLEY}<library>PDFSTREAM.;53)
+      :PREVIOUS-DATE " 9-Oct-2023 00:42:25" {WMEDLEY}<library>PDFSTREAM.;55)
 
 
 (PRETTYCOMPRINT PDFSTREAMCOMS)
@@ -39,12 +39,14 @@
         
         (* ;; "Implementation of PDF streams")

 
-        (INITVARS (PDFCONVERTER 'ps2pdf))
+        (INITVARS (PDFCONVERTER NIL))
                                                              (* ; "Mac with ghostscript?")

         (ALISTS (PDF-CONVERTER-TEMPLATES ps2pdf pstopdf))
         (GLOBALVARS PDFCONVERTER PDF-CONVERTER-TEMPLATES)
         (FNS OPEN-PDF-STREAM CLOSE-PDF-STREAM PS-TO-PDF)
-        (FNS SEE-PDF)))
+        (FNS SEE-PDF)
+        (ADDVARS (FB.SEE.METHODS (PDFFILEP SEE-PDF)))
+        (FNS PDFCONVERTER)))
 
 (FILESLOAD (SYSLOAD)
        POSTSCRIPTSTREAM)
@@ -132,7 +134,7 @@
 (* ;; "Implementation of PDF streams")

 
 
-(RPAQ? PDFCONVERTER
 'ps2pdf)
+(RPAQ? PDFCONVERTER
 NIL)
 
 
 
@@ -166,9 +168,9 @@
              (* ;; "If FILE is on the LPT device, we could just ssume that it can be printed directly, no point in converting.  But then we would alo have to lie and give it a PDF extension so it thinks that we are heading to a PDF printer.")

 
              (OPENPOSTSCRIPTSTREAM FILE OPTIONS)
-      else
 (CL:UNLESS (OR (ASSOC (OR PDFCONVERTER (MKATOM (UNIX-GETENV "MEDLEY-PDFCONVERTER")))
+      else
 (CL:UNLESS (ASSOC (PDFCONVERTER
)
-                                 PDF-CONVERTER-TEMPLATES))
+                             PDF-CONVERTER-TEMPLATES)
-                  (ERROR "POSTSCRIPT-to-PDF converter is not specified"))
+                  (ERROR "A specified POSTSCRIPT-to-PDF converter cannot be found"))
            (SETQ FILE (OR (AND (NEQ FILE T)
                                (OUTFILEP FILE))
                           (ERROR "PDF target file not found" FILE)))
@@ -216,6 +218,9 @@
     (SETQ PSFILE (FULLNAME (TRUEFILENAME PSFILE)))
     (CL:UNLESS (INFILEP PSFILE)
            (ERROR "NO PS FILE TO CONVERT"))
+    (CL:UNLESS (ASSOC (PDFCONVERTER
)
+                      PDF-CONVERTER-TEMPLATES)
+           (ERROR "A specified POSTSCRIPT-to-PDF converter cannot be found"))
     (SETQ PDFFILE (if
 PDFFILE
                       then
 (TRUEFILENAME PDFFILE)
                     else
 (PACKFILENAME 'EXTENSION 'pdf 'BODY PSFILE)))
@@ -237,10 +242,7 @@
                                                               (ERRORFILE \, (SLASHIT (TRUEFILENAME
                                                                                       ERRORFILE)
                                                                                    NIL T)))
-                                                            (ASSOC (OR PDFCONVERTER
+                                                            (ASSOC (PDFCONVERTER
)
-                                                                       (MKATOM (UNIX-GETENV 
-                                                                                "MEDLEY-PDFCONVERTER"
-                                                                                      )))
                                                                    PDF-CONVERTER-TEMPLATES]
 
          (* ;; "Now use Medley names")

@@ -263,14 +265,23 @@
   [LAMBDA (PDFFILE)
                                          (* ; "Edited  1-Oct-2023 20:47 by rmk")


                                                              (* ; "Edited 26-Sep-2023 16:52 by rmk")

 
-    (* ;; "Good for Mac, not sure about Windows etc.")

+    (* ;; "Use the ShellOpener for this machine to open the PDF file outside of Medley")

 
-    (ShellCommand (CONCAT "open -a Preview " (UNIX-FILE-NAME (PACKFILENAME 'BODY PDFFILE 'EXTENSION
+    (ShellOpen (PACKFILENAME 'BODY PDFFILE 'EXTENSION 'PDF])
-                                                                    'PDF)
+)
-                                                    'INPUT])
+
+(ADDTOVAR FB.SEE.METHODS
 (PDFFILEP SEE-PDF))
+(DEFINEQ
+
+(PDFCONVERTER

+  [LAMBDA NIL
+    (SETQ PDFCONVERTER (OR PDFCONVERTER (MKATOM (UNIX-GETENV "MEDLEY-PDFCONVERTER"))
+                           (CAR (for
 TEMPLATE in
 PDF-CONVERTER-TEMPLATES
+                                   thereis
 (ShellWhich (CAR TEMPLATE])
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3078 5692 (PDFFILEP 3088 . 4002) (PDF.HARDCOPYW 4004 . 4602) (PDF.TEXT 4604 . 5321) (
+  (FILEMAP (NIL (3162 5776 (PDFFILEP 3172 . 4086) (PDF.HARDCOPYW 4088 . 4686) (PDF.TEXT 4688 . 5405) (
-PDF.TEDIT 5323 . 5690)) (6136 13355 (OPEN-PDF-STREAM 6146 . 8324) (CLOSE-PDF-STREAM 8326 . 9613) (
+PDF.TEDIT 5407 . 5774)) (6216 13276 (OPEN-PDF-STREAM 6226 . 8362) (CLOSE-PDF-STREAM 8364 . 9651) (
-PS-TO-PDF 9615 . 13353)) (13356 13894 (SEE-PDF 13366 . 13892)))))
+PS-TO-PDF 9653 . 13274)) (13277 13675 (SEE-PDF 13287 . 13673)) (13726 14010 (PDFCONVERTER 13736 . 
+14008)))))
 STOP

library/UNIXUTILS

@@ -1,11 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 8-Oct-2023 15:06:52" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;15
 14696  
+
(FILECREATED "13-Nov-2023 12:57:10" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;26
 16663  
 
-      :CHANGES-TO (FNS ShellOpen UNIX-FILE-NAME ShellBrowser ShellBrowse ShellOpener)
+      :CHANGES-TO (FNS ShellBrowser)
-                  (VARS UNIXUTILSCOMS)
 
-      :PREVIOUS-DATE " 8-Oct-2023 02:35:47" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;14
+      :PREVIOUS-DATE "11-Nov-2023 09:06:39" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;25
 )
 
 
@@ -19,6 +18,8 @@
         (INITVARS (ShellBrowser)
                (ShellOpener))
         (FUNCTIONS ShellCommand ShellWhich)
+        (ADDVARS (MEDLEY-INIT-VARS (ShellBrowser)
+                        (ShellOpener)))
         (FNS ShellBrowser ShellBrowse ShellOpener ShellOpen PROCESS-COMMAND SLASHIT UNIX-FILE-NAME)
         (PROPS (UNIXUTILS FILETYPE))))
 (DECLARE%: EVAL@COMPILE DONTCOPY 
@@ -54,6 +55,9 @@
               NIL)
              (T (SETFILEPTR S 0)
                 (RSTRING S])
+
+(ADDTOVAR MEDLEY-INIT-VARS
 (ShellBrowser)
+                           (ShellOpener))
 (DEFINEQ
 
 (ShellBrowser

@@ -76,7 +80,7 @@
                                       then
 
                                            (* ;; " Systems with git installed")

 
-                                           CMDPATH
+                                           (CONCAT CMDPATH " web--browse")
                                     elseif
 (SETQ CMDPATH (ShellWhich
 "lynx"))
                                       then
 
                                            (* ;; " Systems with lynx installed")

@@ -155,6 +159,7 @@
 
     (* ;; " Returns T is all goes well; returns an error string if all does not go well")

 
+    (RANDSET T)
     (SETQ FilenameOrURL (MKSTRING FilenameOrURL))
     (if
 (OR (EQ (STRPOS "http://" (L-CASE FilenameOrURL))
                 1)
@@ -172,13 +177,42 @@
                                   T)
                     else
 (CONCAT "Unable to find a browser to open: " FilenameOrURL)))
       else

-      (LET ((OPENER (ShellOpener
))
+      (LET*
-            (UNIXFILE (UNIX-FILE-NAME
 FilenameOrURL 'INPUT T)))
+       ((OPENER (ShellOpener
))
-           (if
 (NOT UNIXFILE)
+        (FULLNAME (FULLNAME FilenameOrURL)))
-               then
 (CONCAT "File not found: " FilenameOrURL)
+       (if
 (NOT FULLNAME)
-             elseif
 (NOT (STREQUAL OPENER "true"))
+           then
 (CONCAT "File not found: " FilenameOrURL)
-               then
 (CL:WITH-OPEN-STREAM
+         elseif
 (STREQUAL OPENER "true")
-                     (SHELLSTREAM (OPENSTREAM (CONCAT "{CORE}SHELLOUT" (RAND))
+           then
 (CONCAT "Unable to find a file opener to open: " FilenameOrURL)
+         else
 (LET* ((VERSION.SPECIFIED (FILENAMEFIELD FilenameOrURL 'VERSION))
+                     (UNPACKED (UNPACKFILENAME.STRING FULLNAME))
+                     (NEWNAME (CONCAT (LISTGET UNPACKED 'NAME)
+                                     "~"
+                                     (LISTGET UNPACKED 'VERSION)
+                                     "~"))
+                     (EXTENSION (LISTGET UNPACKED 'EXTENSION))
+                     [UNVERSIONED (LET (FN (UNPACKED (COPY UNPACKED)))
+                                       (LISTPUT UNPACKED 'VERSION NIL)
+                                       (LISTPUT UNPACKED 'HOST NIL)
+                                       (SETQ FN (PACKFILENAME.STRING UNPACKED))
+                                       (if
 (STREQUAL (SUBSTRING FN -1)
+                                                  ".")
+                                           then
 (SETQ FN (SUBSTRING UNIXFILE 1 -2)))
+                                       (SETQ FN (SLASHIT
 FN]
+                     (UNVERSIONED.EXISTS (INFILEP (CONCAT "{UNIX}" UNVERSIONED)))
+                     (TMPDIR (CONCAT "/tmp/" (RAND 1000 9999)))
+                     (TARGETFILE.LISP (PACKFILENAME.STRING 'HOST "{UNIX}" 'DIRECTORY TMPDIR
+                                             'NAME NEWNAME 'EXTENSION EXTENSION))
+                     (TARGETFILE.UNIX (SLASHIT
 (PACKFILENAME.STRING 'HOST NIL 'DIRECTORY TMPDIR
+                                                      'NAME NEWNAME 'EXTENSION EXTENSION)))
+                     (UNIXFILE NIL))
+                    (DECLARE
 (SPECVARS UNIXFILE))
+                    (if
 (OR VERSION.SPECIFIED (NOT UNVERSIONED.EXISTS))
+                        then
 (COPYFILE FULLNAME TARGETFILE.LISP)
+                             (SETQ UNIXFILE TARGETFILE.UNIX)
+                      else
 (SETQ UNIXFILE UNVERSIONED))
+                    (CL:WITH-OPEN-STREAM
+                     (SHELLSTREAM (OPENSTREAM (CONCAT "{CORE}SHELLOUT" (RAND 1000 9999))
                                          'BOTH))
                      (ShellCommand
 (CONCAT OPENER " '" UNIXFILE "'" 
                                           " >>/tmp/ShellOpener-warnings-$$.txt")
@@ -197,8 +231,7 @@
                                                 (CL:LOOP (PRINTCCODE (READCCODE SHELLSTREAM)
                                                                 STRINGSTREAM))
                                                 OUT))
-                                  OUTSTRING)))
+                                  OUTSTRING])
-             else
 (CONCAT "Unable to find a file opener to open: " FilenameOrURL])
 
 (PROCESS-COMMAND

   [LAMBDA (CMD)
                                              (* ; "Edited 17-Jul-2022 08:17 by rmk")

@@ -221,8 +254,8 @@
 
     (LET [LASTDIRPOS SLASHED (DIRPOS (ADD1 (OR (STRPOS "}" X)
                                                0]
-         [SETQ SLASHED (CONCATCODES (FOR
 I C FROM
 DIRPOS WHILE
 (SETQ C (NTHCHARCODE X I))
+         [SETQ SLASHED (CONCATCODES (for
 I C from
 DIRPOS while
 (SETQ C (NTHCHARCODE X I))
-                                       COLLECT
 (SELCHARQ C
+                                       collect
 (SELCHARQ C
                                                     ((< >) 
                                                          (SETQ LASTDIRPOS I)
                                                          (CHARCODE /))
@@ -285,7 +318,7 @@
 
 (PUTPROPS UNIXUTILS
 FILETYPE
 CL:COMPILE-FILE)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1144 1517 (ShellCommand 1144 . 1517)) (1519 1916 (ShellWhich 1519 . 1916)) (1917 14618 
+  (FILEMAP (NIL (1146 1519 (ShellCommand 1146 . 1519)) (1521 1918 (ShellWhich 1521 . 1918)) (2008 16585 
-(ShellBrowser 1927 . 3675) (ShellBrowse 3677 . 4362) (ShellOpener 4364 . 6052) (ShellOpen 6054 . 9357)
+(ShellBrowser 2018 . 3790) (ShellBrowse 3792 . 4477) (ShellOpener 4479 . 6167) (ShellOpen 6169 . 11324
- (PROCESS-COMMAND 9359 . 9972) (SLASHIT 9974 . 12016) (UNIX-FILE-NAME 12018 . 14616)))))
+) (PROCESS-COMMAND 11326 . 11939) (SLASHIT 11941 . 13983) (UNIX-FILE-NAME 13985 . 16583)))))
 STOP

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

-
-(RPAQQ SKETCHBMELTCOMS

        ((* 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 
+
                                                             covered by the bitmap in local 
-
                                                           coordinates.)

+
                                                             coordinates.)

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

-
                                                           generated.)

+                        LOCALIMAGEREGION
-                            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) (
+  (FILEMAP (NIL (1069 46405 (SKETCH.CREATE.BITMAP 1079 . 1913) (INIT.BITMAP.ELEMENT 1915 . 2916) (
-BITMAPELT.CHANGEFN 3054 . 16483) (BITMAPELT.DRAWFN 16485 . 23256) (DSPVIEWPORT 23258 . 24304) (
+BITMAPELT.CHANGEFN 2918 . 16347) (BITMAPELT.DRAWFN 16349 . 23120) (DSPVIEWPORT 23122 . 24168) (
-SK.COMPUTE.LOCAL.SCALED.BITMAP 24306 . 26938) (BITMAPELT.EXPANDFN 26940 . 30787) (BITMAPELT.INSIDEFN 
+SK.COMPUTE.LOCAL.SCALED.BITMAP 24170 . 26802) (BITMAPELT.EXPANDFN 26804 . 30651) (BITMAPELT.INSIDEFN 
-30789 . 31391) (BITMAPELT.TRANSLATEFN 31393 . 32695) (BITMAPELT.REGIONFN 32697 . 33153) (
+30653 . 31255) (BITMAPELT.TRANSLATEFN 31257 . 32559) (BITMAPELT.REGIONFN 32561 . 33017) (
-BITMAPELT.GLOBALREGIONFN 33155 . 33534) (BITMAPELT.READCHANGEFN 33536 . 37579) (BITMAPELT.TRANSFORMFN 
+BITMAPELT.GLOBALREGIONFN 33019 . 33398) (BITMAPELT.READCHANGEFN 33400 . 37443) (BITMAPELT.TRANSFORMFN 
-37581 . 39105) (SK.BITMAP.CREATE 39107 . 40848) (BITMAP.SET.SCALES 40850 . 42359) (BITMAPELT.INPUTFN 
+37445 . 38969) (SK.BITMAP.CREATE 38971 . 40712) (BITMAP.SET.SCALES 40714 . 42223) (BITMAPELT.INPUTFN 
-42361 . 43333) (BITMAPELT.CHOOSE.BITMAP 43335 . 46539)))))
+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)
 
 
-(* ; "
+(PRETTYCOMPRINT SKETCH-EDITCOMS)
-Copyright (c) 1983-1987, 1990, 2021 by Venue & Xerox Corporation.
-")
 
-(PRETTYCOMPRINT SKETCHEDITCOMS)
+(RPAQQ SKETCH-EDITCOMS

-
-(RPAQQ SKETCHEDITCOMS

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

-
-(RPAQQ SKETCHELEMENTSCOMS

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

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

library/sketch/SKETCH-STREAM

@@ -1,25 +1,24 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED "12-Jun-90 15:21:13" {DSK}<usr>local>lde>lispcore>library>SKETCHSTREAM.;2
 34014  
 
-      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)
 
 
-(* ; "
+(PRETTYCOMPRINT SKETCH-STREAMCOMS)
-Copyright (c) 1984, 1985, 1987, 1988, 1990 by Venue & Xerox Corporation.  All rights reserved.
-")
 
-(PRETTYCOMPRINT SKETCHSTREAMCOMS)
+(RPAQQ SKETCH-STREAMCOMS

-
-(RPAQQ SKETCHSTREAMCOMS

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

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

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

+
         there.)

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

+
         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 
+         (* changes default alignment to left baseline and default font to the default 
-
          font of display device.)

+
         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) (
+  (FILEMAP (NIL (1820 9204 (OPENSKETCHSTREAM 1830 . 2937) (\SKETCHSTREAM.POSITION.CHANGED 2939 . 3231) (
-\SKETCHSTREAMINIT 3370 . 7936) (\SK.SET.FONT 7938 . 8436) (\SKSTRM.WINDOW.FROM.STREAM 8438 . 8697) (
+\SKETCHSTREAMINIT 3233 . 7799) (\SK.SET.FONT 7801 . 8299) (\SKSTRM.WINDOW.FROM.STREAM 8301 . 8560) (
-ZOOM.SKETCH.STREAM 8699 . 9339)) (9403 33638 (\DSPFONT.SKETCH 9413 . 10185) (\DSPLEFTMARGIN.SKETCH 
+ZOOM.SKETCH.STREAM 8562 . 9202)) (9266 33501 (\DSPFONT.SKETCH 9276 . 10048) (\DSPLEFTMARGIN.SKETCH 
-10187 . 10581) (\DSPRIGHTMARGIN.SKETCH 10583 . 10980) (\DSPLINEFEED.SKETCH 10982 . 11370) (
+10050 . 10444) (\DSPRIGHTMARGIN.SKETCH 10446 . 10843) (\DSPLINEFEED.SKETCH 10845 . 11233) (
-\DSPXPOSITION.SKETCH 11372 . 11917) (\DSPYPOSITION.SKETCH 11919 . 12464) (\DRAWCURVE.SKETCH 12466 . 
+\DSPXPOSITION.SKETCH 11235 . 11780) (\DSPYPOSITION.SKETCH 11782 . 12327) (\DRAWCURVE.SKETCH 12329 . 
-12999) (\DRAWCIRCLE.SKETCH 13001 . 14207) (\FILLCIRCLE.SKETCH 14209 . 15621) (\FILLPOLYGON.SKETCH 
+12862) (\DRAWCIRCLE.SKETCH 12864 . 14070) (\FILLCIRCLE.SKETCH 14072 . 15484) (\FILLPOLYGON.SKETCH 
-15623 . 16733) (\DRAWELLIPSE.SKETCH 16735 . 18829) (\DRAWARC.SKETCH 18831 . 20892) (\DRAWLINE.SKETCH 
+15486 . 16596) (\DRAWELLIPSE.SKETCH 16598 . 18692) (\DRAWARC.SKETCH 18694 . 20755) (\DRAWLINE.SKETCH 
-20894 . 22004) (\BOUT.SKETCH 22006 . 22975) (\DSPCOLOR.SKETCH 22977 . 23336) (\DSPBACKCOLOR.SKETCH 
+20757 . 21867) (\BOUT.SKETCH 21869 . 22838) (\DSPCOLOR.SKETCH 22840 . 23199) (\DSPBACKCOLOR.SKETCH 
-23338 . 23716) (\DSPOPERATION.SKETCH 23718 . 24093) (\STRINGWIDTH.SKETCH 24095 . 24738) (
+23201 . 23579) (\DSPOPERATION.SKETCH 23581 . 23956) (\STRINGWIDTH.SKETCH 23958 . 24601) (
-\BLTSHADE.1BITSKETCH 24740 . 25669) (\NEWPAGE.SKETCH 25671 . 26151) (\CHARWIDTH.SKETCH 26153 . 26792) 
+\BLTSHADE.1BITSKETCH 24603 . 25532) (\NEWPAGE.SKETCH 25534 . 26014) (\CHARWIDTH.SKETCH 26016 . 26655) 
-(\BITBLT.1BITSKETCH 26794 . 28415) (\DSPCLIPPINGREGION.SKETCH 28417 . 28944) (\DSPRESET.SKETCH 28946
+(\BITBLT.1BITSKETCH 26657 . 28278) (\DSPCLIPPINGREGION.SKETCH 28280 . 28807) (\DSPRESET.SKETCH 28809
- . 30515) (\DSPSCALE.SKETCH 30517 . 33121) (\DRAWPOLYGON.SKETCH 33123 . 33636)))))
+ . 30378) (\DSPSCALE.SKETCH 30380 . 32984) (\DRAWPOLYGON.SKETCH 32986 . 33499)))))
 STOP

lispusers/COMPAREDIRECTORIES

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 3-Oct-2022 12:03:37" 
+
(FILECREATED "29-Sep-2023 17:25:57" {WMEDLEY}<lispusers>COMPAREDIRECTORIES.;257
 130870 
-{DSK}<users>kaplan>local>medley3.5>working-medley>lispusers>COMPAREDIRECTORIES.;252
 128695 
 
-      :CHANGES-TO (FNS CDFILES)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "14-Aug-2022 12:13:45" 
+      :CHANGES-TO (FNS COMPAREDIRECTORIES COMPAREDIRECTORIES.INFOS)
-{DSK}<users>kaplan>local>medley3.5>working-medley>lispusers>COMPAREDIRECTORIES.;250)
+
+      :PREVIOUS-DATE "28-Sep-2023 23:20:57" {WMEDLEY}<lispusers>COMPAREDIRECTORIES.;256)
 
 
 (* ; "
@@ -16,7 +16,7 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
 (PRETTYCOMPRINT COMPAREDIRECTORIESCOMS)
 
 (RPAQQ COMPAREDIRECTORIESCOMS

-       (
+       [
         (* ;; "Compare the contents of two directories.")

 
         (FNS COMPAREDIRECTORIES COMPAREDIRECTORIES.INFOS COMPAREDIRECTORIES.CANDIDATES 
@@ -25,7 +25,7 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
         (FNS CDFILES CDFILES.MATCH CDFILES.PATS)
         (FNS CDPRINT CDPRINT.HEADER CDPRINT.LINE CDPRINT.MAXWIDTHS CDPRINT.COLHEADERS CDPRINT.COLUMNS
              CDTEDIT)
-        (FNS CDMAP CDENTRY CDSUBSET CDMERGE CDMERGE.COMMON)
+        (FNS CDMAP CDENTRY CDSUBSET CDMERGE CDMERGE.COMMON CD.SORT)
         (FNS BINCOMP EOLTYPE EOLTYPE.SHOW)
         (RECORDS CDMAXNCHARS CDVALUE CDENTRY CDINFO)
         
@@ -56,7 +56,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
                    CDBROWSER-COPY CDBROWSER-DELETE-FILE CD-SWAPDIRS)
               (VARS CDTABLEBROWSER.MENUITEMS)
               (FILES (SYSLOAD)
-                     COMPARESOURCES COMPARETEXT))))
+                     COMPARESOURCES COMPARETEXT)
+              (P (MOVD? 'NILL 'TEDIT.FILEDATE])
 
 
 
@@ -66,7 +67,9 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
 
 (COMPAREDIRECTORIES

   [LAMBDA (DIR1 DIR2 SELECT INCLUDEDFILES EXCLUDEDFILES USEDIRECTORYDATE OUTPUTFILE ALLVERSIONS 
-                FIXDIRECTORYDATES)
                           (* ; "Edited 29-Mar-2022 11:50 by rmk")


+                FIXDIRECTORYDATES)
                           (* ; "Edited 29-Sep-2023 17:25 by rmk")


+                                                             (* ; "Edited  5-Apr-2023 10:12 by rmk")


+                                                             (* ; "Edited 29-Mar-2022 11:50 by rmk")


                                                              (* ; "Edited 23-Feb-2022 21:10 by rmk")


                                                              (* ; "Edited  4-Jan-2022 12:09 by rmk")


                                                             (* ; "Edited 31-Oct-2021 11:01 by rmk:")


@@ -120,7 +123,7 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
           (CDPRINT.HEADER
 DIR1 DIR2 SELECT DATE T)
           (PRINTOUT T " ... ")
           (SETQ INFOS1 (COMPAREDIRECTORIES.INFOS
 DIR1 INCLUDEDFILES EXCLUDEDFILES ALLVERSIONS DEPTH1
-                              USEDIRECTORYDATE))
+                              USEDIRECTORYDATE (MEMB 'AUTHOR SELECT)))
           (SETQ INFOS2 (COMPAREDIRECTORIES.INFOS
 DIR2 INCLUDEDFILES EXCLUDEDFILES ALLVERSIONS DEPTH2
                               USEDIRECTORYDATE))
 
@@ -138,7 +141,7 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
 
           (SETQ CDENTRIES (SORT (CDENTRIES.SELECT
 (COMPAREDIRECTORIES.CANDIDATES
 INFOS1 INFOS2)
                                        SELECT)
-                                T))
+                                (FUNCTION CD.SORT)))
           (PRINTOUT T (LENGTH CDENTRIES)
                  " entries" T)
           (REPLACE
 CDENTRIES OF
 CDVALUE WITH
 CDENTRIES)
@@ -148,7 +151,9 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
           (RETURN (CDPRINT
 CDVALUE OUTPUTFILE NIL (MEMB 'AUTHOR SELECT])
 
 (COMPAREDIRECTORIES.INFOS

-  [LAMBDA (DIR INCLUDEDFILES EXCLUDEDFILES ALLVERSIONS DEPTH USEDIRECTORYDATE)
+  [LAMBDA (DIR INCLUDEDFILES EXCLUDEDFILES ALLVERSIONS DEPTH USEDIRECTORYDATE INCLUDEAUTHOR)
+
+    (* ;; "Edited 29-Sep-2023 17:25 by rmk")

 
     (* ;; "Edited 22-May-2022 14:17 by rmk")

 
@@ -176,7 +181,7 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
                                                         ELSE
 (SETFILEINFO STREAM 'CREATIONDATE LDATE)
                                                              LDATE)))
                                  LENGTH _ (GETFILEINFO STREAM 'LENGTH)
-                                 AUTHOR _ (GETFILEINFO STREAM 'AUTHOR)
+                                 AUTHOR _ (AND INCLUDEAUTHOR (GETFILEINFO STREAM 'AUTHOR))
                                  TYPE _ TYPE
                                  EOL _ (EOLTYPE
 STREAM)))
                     (CLOSEF? STREAM))
@@ -322,7 +327,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
                                             CDE])
 
 (COMPAREDIRECTORIES.INFOS.TYPE

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


+  [LAMBDA (FILE)
                                             (* ; "Edited 28-Sep-2023 23:09 by rmk")


+                                                             (* ; "Edited 22-May-2022 14:27 by rmk")


                                                              (* ; "Edited 25-Apr-2022 09:02 by rmk")


                                                              (* ; "Edited  4-Jan-2022 13:10 by rmk")


                                                              (* ; "Edited 12-Dec-2021 22:50 by rmk")

@@ -330,9 +336,11 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
          (CL:MULTIPLE-VALUE-SETQ (TYPE DATE)
                 (LISPFILETYPE FILE))
          (CL:UNLESS TYPE
-             (SETQ TYPE (IF
 (PRINTFILETYPE FILE)
+             (SETQ TYPE (IF
 (SETQ DATE (TEDIT.FILEDATE FILE))
-                          ELSEIF
 (MEMB (FILENAMEFIELD FILE 'EXTENSION)
+                            THEN
 'TEDIT
-                                       '(TXT TEXT SH MD C))
+                          ELSEIF
 (PRINTFILETYPE FILE)
+                          ELSE
 (MEMB (FILENAMEFIELD FILE 'EXTENSION)
+                                     '(TXT TEXT SH MD C))
                             THEN
 'TEXT
                           ELSE
 'OTHER)))
          (CL:VALUES TYPE DATE])
@@ -388,7 +396,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
 (DEFINEQ
 
 (CDFILES

-  [LAMBDA (DIR INCLUDEDFILES EXCLUDEDFILES ALLVERSIONS DEPTH)
(* ; "Edited  3-Oct-2022 12:03 by rmk")


+  [LAMBDA (DIR INCLUDEDFILES EXCLUDEDFILES ALLVERSIONS DEPTH)
(* ; "Edited 17-Jun-2023 23:04 by rmk")


+                                                             (* ; "Edited  3-Oct-2022 12:03 by rmk")


                                                              (* ; "Edited 25-Apr-2022 08:42 by rmk")


                                                              (* ; "Edited  5-Mar-2022 15:05 by rmk")


                                                             (* ; "Edited 16-Oct-2020 13:42 by rmk:")

@@ -457,7 +466,7 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
 
          (* ;; "We enumerate all the files, checking to see that")

 
-         (FOR
 FULLNAME NAME EXT SUBDIR UNPACK THISDEPTH (STARTPOS _ (ADD1 (NCHARS DIR)))
+         (FOR
 FULLNAME NAME EXT SUBDIR UNPACK THISDEPTH (STARTPOS _ (IPLUS 2 (NCHARS DIR)))
             IN
 (DIRECTORY ENUMPAT `(DEPTH ,DEPTH COLLECT)
                       NIL
                       (CL:IF ALLVERSIONS
@@ -509,7 +518,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
                                          (ILEQ THISDEPTH (CADDDR P])
 
 (CDFILES.PATS

-  [LAMBDA (PATTERNS)                                         (* ; "Edited 23-Dec-2021 17:02 by rmk")

+  [LAMBDA (PATTERNS)
                                         (* ; "Edited 17-Jun-2023 23:36 by rmk")


+                                                             (* ; "Edited 23-Dec-2021 17:02 by rmk")

 
     (* ;; "Returns (NAME EXT SUBDIR DEPTH) items where NAME or EXT may be the wildcard *, SD is the subdirectory (if any) and DEPTH is the number of / or > in the subdirectory")

 
@@ -519,38 +529,47 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
 
          (* * NIL 1)

 )
-      ELSE
 (FOR
 P N E SD D UNPACK INSIDE
 PATTERNS
+      ELSE
 (FOR
 P N E SD DEPTH UNPACK INSIDE
 PATTERNS
-              JOIN
 (SETQ UNPACK (UNPACKFILENAME P))
+              JOIN
 (SETQ UNPACK (UNPACKFILENAME.STRING P))   (* ; 
-                   (SETQ SD (LISTGET UNPACK 'SUBDIRECTORY)) 
+
                                              "String so we can tell the difference between x and x.")

+                   [SETQ SD (MKATOM (LISTGET UNPACK 'SUBDIRECTORY] 
 
                    (* ;; "Count the subdirectory depth")

 
-                   [SETQ D (IF
 (EQ SD '*)
+                   [SETQ DEPTH (IF
 (EQ SD '*)
-                               THEN
 MAX.SMALLP
+                                   THEN
 MAX.SMALLP
-                             ELSE
 (FOR
 I (CNT _ 1) FROM
 1 DO
 (SELCHARQ (NTHCHARCODE SD I)
+                                 ELSE
 (FOR
 I (CNT _ 1) FROM
 1 DO
 (SELCHARQ (NTHCHARCODE SD I)
-                                                                  ((/ >) 
+                                                                      ((/ >) 
-                                                                       (ADD
 CNT 1))
+                                                                           (ADD
 CNT 1))
-                                                                  (NIL (RETURN CNT))
+                                                                      (NIL (RETURN CNT))
-                                                                  NIL]
+                                                                      NIL]
                    (SETQ N (LISTGET UNPACK 'NAME))
+                   (SETQ N (if
 (NULL N)
+                               then
 '*
+                             elseif
 (NEQ 0 (NCHARS N))
+                               then
 (MKATOM N)))
                    (SETQ E (LISTGET UNPACK 'EXTENSION))
-                   (IF
 [OR (AND (STRING.EQUAL N 'COM)
+                   (SETQ E (if
 (NULL E)
+                               then
 '*
+                             elseif
 (NEQ 0 (NCHARS E))
+                               then
 (MKATOM E)))
+                   (if
 [OR (AND (STRING.EQUAL N 'COM)
                                 (NULL E))
                            (AND (STRING.EQUAL E 'COM)
                                 (MEMB N '                    (* NIL)
]
-                       THEN
 (FOR
 CE IN
 *COMPILED-EXTENSIONS* COLLECT
 (LIST '* CE SD D))
+                       THEN
 (FOR
 CE IN
 *COMPILED-EXTENSIONS* COLLECT
 (LIST '* CE SD DEPTH))
                      ELSE
 (CONS (IF
 N
-                                    THEN
 (LIST N E SD D)
+                                    THEN
 (LIST N E SD DEPTH)
                                   ELSEIF
 E
                                     THEN
 
 
                                  (* ;; "This is the case .XXX, which presumably identifies a dotted file.  If this is supposed to be all files with extension XXX, it shoud be specified as *.XXX, the case above.  So we move .E into the N field.")

 
                                          (LIST (PACK* '%. E)
-                                               NIL SD D)
+                                               NIL SD DEPTH)
                                   ELSE
 `
 
-         (* * (\, SD) (\, D))

+         (* * (\, SD) (\, DEPTH))

 ])
 )
 (DEFINEQ
@@ -881,7 +900,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
                                               WHEN
 (APPLY* FN CDE) COLLECT
 CDE])
 
 (CDMERGE

-  [LAMBDA (CDVALUES)
                                         (* ; "Edited 24-Jan-2022 17:01 by rmk")

+  [LAMBDA (CDVALUES)
                                         (* ; "Edited  5-Apr-2023 10:10 by rmk")


+                                                             (* ; "Edited 24-Jan-2022 17:01 by rmk")

 
     (* ;; "This merges a collection of CDVALUES on different directories into a single CDVALUE with the union of the CDENTRIES, provided that they have the same selection criteria.  The merged directories will be the minimal common prefix of all of the entries on each side, and the residual of the directory will be packed onto all the names.")

 
@@ -919,8 +939,8 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
 
                  "Merge the CDENTRIES with matchnames pulled back so that subdirectories show up")

 
                   (SETQ MERGEDENTRIES
-                   (SORT [FOR
 CDV NC1 _ (ADD1 (NCHARS DIR1))
+                   (SORT [FOR
 CDV (NC1 _ (ADD1 (NCHARS DIR1)))
-                              NC2 _ (ADD1 (NCHARS DIR2)) IN
 (CDR CDS)
+                              (NC2 _ (ADD1 (NCHARS DIR2))) IN
 (CDR CDS)
                             JOIN
 (FOR
 CDE IN
 (FETCH
 CDENTRIES OF
 CDV)
                                     COLLECT
 (CREATE
 CDENTRY
                                                USING
 CDE MATCHNAME _
@@ -933,7 +953,7 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
                                                                           OF
 (FETCH
 INFO2
                                                                                 OF
 CDE))
                                                                    NC2]
-                         T))
+                         (FUNCTION CD.SORT)))
                   (CD.UPDATEWIDTHS
 (CREATE
 CDVALUE
                                           CDDIR1 _ DIR1
                                           CDDIR2 _ DIR2
@@ -962,6 +982,19 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
                                  (L-CASECODE CY] DO
 (RETURN (CL:IF (EQ I 1)
                                                                 ""
                                                                 (SUBSTRING DIRX 1 LASTDIRPOS))])
+
+(CD.SORT

+  [LAMBDA (ENTRY1 ENTRY2)
                                    (* ; "Edited  5-Apr-2023 10:15 by rmk")

+
+    (* ;; "Groups same file with different extensions together.  FOO and FOO.LCOM together, even if FOO-FUM exists (hyphen comes before period).")

+
+    (LET ((M1 (FETCH
 MATCHNAME OF
 ENTRY1))
+          (M2 (FETCH
 MATCHNAME OF
 ENTRY2))
+          ORDER)
+         (CL:IF [EQ 'EQUAL (SETQ ORDER (ALPHORDER (PACKFILENAME 'EXTENSION NIL 'BODY M1)
+                                              (PACKFILENAME 'EXTENSION NIL 'BODY M2]
+             (ALPHORDER M1 M2)
+             ORDER)])
 )
 (DEFINEQ
 
@@ -2154,28 +2187,30 @@ Copyright (c) 1985-1988, 1990, 1994, 1998, 2018, 2020-2021 by Venue & Xerox Corp
 
 (FILESLOAD (SYSLOAD)
        COMPARESOURCES COMPARETEXT)
+
+(MOVD? 'NILL 'TEDIT.FILEDATE)
 (PUTPROPS COMPAREDIRECTORIES COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1994 1998
  2018 2020 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2624 22181 (COMPAREDIRECTORIES 2634 . 7467) (COMPAREDIRECTORIES.INFOS 7469 . 10343) (
+  (FILEMAP (NIL (2651 22769 (COMPAREDIRECTORIES 2661 . 7751) (COMPAREDIRECTORIES.INFOS 7753 . 10711) (
-COMPAREDIRECTORIES.CANDIDATES 10345 . 13730) (CDENTRIES.SELECT 13732 . 18507) (
+COMPAREDIRECTORIES.CANDIDATES 10713 . 14098) (CDENTRIES.SELECT 14100 . 18875) (
-COMPAREDIRECTORIES.INFOS.TYPE 18509 . 19415) (MATCHNAME 19417 . 20097) (CD.INSURECDVALUE 20099 . 21713
+COMPAREDIRECTORIES.INFOS.TYPE 18877 . 20003) (MATCHNAME 20005 . 20685) (CD.INSURECDVALUE 20687 . 22301
-) (CD.UPDATEWIDTHS 21715 . 22179)) (22182 32000 (CDFILES 22192 . 28094) (CDFILES.MATCH 28096 . 29721) 
+) (CD.UPDATEWIDTHS 22303 . 22767)) (22770 33392 (CDFILES 22780 . 28794) (CDFILES.MATCH 28796 . 30421) 
-(CDFILES.PATS 29723 . 31998)) (32001 49822 (CDPRINT 32011 . 34528) (CDPRINT.HEADER 34530 . 35427) (
+(CDFILES.PATS 30423 . 33390)) (33393 51214 (CDPRINT 33403 . 35920) (CDPRINT.HEADER 35922 . 36819) (
-CDPRINT.LINE 35429 . 38661) (CDPRINT.MAXWIDTHS 38663 . 42778) (CDPRINT.COLHEADERS 42780 . 44065) (
+CDPRINT.LINE 36821 . 40053) (CDPRINT.MAXWIDTHS 40055 . 44170) (CDPRINT.COLHEADERS 44172 . 45457) (
-CDPRINT.COLUMNS 44067 . 49187) (CDTEDIT 49189 . 49820)) (49823 58192 (CDMAP 49833 . 51265) (CDENTRY 
+CDPRINT.COLUMNS 45459 . 50579) (CDTEDIT 50581 . 51212)) (51215 60336 (CDMAP 51225 . 52657) (CDENTRY 
-51267 . 51576) (CDSUBSET 51578 . 53017) (CDMERGE 53019 . 56873) (CDMERGE.COMMON 56875 . 58190)) (58193
+52659 . 52968) (CDSUBSET 52970 . 54409) (CDMERGE 54411 . 58395) (CDMERGE.COMMON 58397 . 59712) (
- 65731 (BINCOMP 58203 . 62492) (EOLTYPE 62494 . 65056) (EOLTYPE.SHOW 65058 . 65729)) (66259 78786 (
+CD.SORT 59714 . 60334)) (60337 67875 (BINCOMP 60347 . 64636) (EOLTYPE 64638 . 67200) (EOLTYPE.SHOW 
-FIND-UNCOMPILED-FILES 66269 . 69912) (FIND-UNSOURCED-FILES 69914 . 72298) (FIND-SOURCE-FILES 72300 . 
+67202 . 67873)) (68403 80930 (FIND-UNCOMPILED-FILES 68413 . 72056) (FIND-UNSOURCED-FILES 72058 . 74442
-74038) (FIND-COMPILED-FILES 74040 . 75917) (FIND-UNLOADED-FILES 75919 . 76772) (FIND-LOADED-FILES 
+) (FIND-SOURCE-FILES 74444 . 76182) (FIND-COMPILED-FILES 76184 . 78061) (FIND-UNLOADED-FILES 78063 . 
-76774 . 77202) (FIND-MULTICOMPILED-FILES 77204 . 78784)) (78787 87218 (CREATED-AS 78797 . 83594) (
+78916) (FIND-LOADED-FILES 78918 . 79346) (FIND-MULTICOMPILED-FILES 79348 . 80928)) (80931 89362 (
-SOURCE-FOR-COMPILED-P 83596 . 86523) (COMPILE-SOURCE-DATE-DIFF 86525 . 87216)) (87219 97525 (
+CREATED-AS 80941 . 85738) (SOURCE-FOR-COMPILED-P 85740 . 88667) (COMPILE-SOURCE-DATE-DIFF 88669 . 
-FIX-DIRECTORY-DATES 87229 . 90222) (FIX-EQUIV-DATES 90224 . 91749) (COPY-COMPARED-FILES 91751 . 93572)
+89360)) (89363 99669 (FIX-DIRECTORY-DATES 89373 . 92366) (FIX-EQUIV-DATES 92368 . 93893) (
- (COPY-MISSING-FILES 93574 . 95731) (COMPILED-ON-SAME-SOURCE 95733 . 97523)) (97719 105557 (CDBROWSER 
+COPY-COMPARED-FILES 93895 . 95716) (COPY-MISSING-FILES 95718 . 97875) (COMPILED-ON-SAME-SOURCE 97877
-97729 . 101656) (CDBROWSER.STRINGS 101658 . 105555)) (105719 107455 (CD.TABLEITEM 105729 . 105949) (
+ . 99667)) (99863 107701 (CDBROWSER 99873 . 103800) (CDBROWSER.STRINGS 103802 . 107699)) (107863 
-CD.TABLEITEM.PRINTFN 105951 . 106150) (CD.TABLEITEM.COPYFN 106152 . 107210) (
+109599 (CD.TABLEITEM 107873 . 108093) (CD.TABLEITEM.PRINTFN 108095 . 108294) (CD.TABLEITEM.COPYFN 
-CDTABLEBROWSER.HEADING.REPAINTFN 107212 . 107453)) (107456 128111 (CDTABLEBROWSER.WHENSELECTEDFN 
+108296 . 109354) (CDTABLEBROWSER.HEADING.REPAINTFN 109356 . 109597)) (109600 130255 (
-107466 . 107934) (CD.COMMANDSELECTEDFN 107936 . 113037) (CD-MENUFN 113039 . 117350) (CD-COMPARE-FILES 
+CDTABLEBROWSER.WHENSELECTEDFN 109610 . 110078) (CD.COMMANDSELECTEDFN 110080 . 115181) (CD-MENUFN 
-117352 . 120704) (CDBROWSER-COPY 120706 . 124375) (CDBROWSER-DELETE-FILE 124377 . 127590) (CD-SWAPDIRS
+115183 . 119494) (CD-COMPARE-FILES 119496 . 122848) (CDBROWSER-COPY 122850 . 126519) (
- 127592 . 128109)))))
+CDBROWSER-DELETE-FILE 126521 . 129734) (CD-SWAPDIRS 129736 . 130253)))))
 STOP

lispusers/COMPARESOURCES

@@ -1,13 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "22-May-2022 18:46:01" 
+
(FILECREATED "17-Jun-2023 15:22:40" {WMEDLEY}<lispusers>COMPARESOURCES.;131
 39663  
-{DSK}<users>kaplan>local>medley3.5>working-medley>lispusers>COMPARESOURCES.;128
 39655  
 
-      :CHANGES-TO (FNS COMPARESOURCES CSBROWSER \CS.EXAMINE)
+      :EDIT-BY rmk
-                  (VARS COMPARESOURCESCOMS)
 
-      :PREVIOUS-DATE "12-May-2022 10:17:13" 
+      :CHANGES-TO (FNS CSBROWSER \CS.COMPARE.MASTERS)
-{DSK}<users>kaplan>local>medley3.5>working-medley>lispusers>COMPARESOURCES.;123)
+
+      :PREVIOUS-DATE "22-May-2022 18:46:01" {WMEDLEY}<lispusers>COMPARESOURCES.;128)
 
 
 (* ; "
@@ -141,25 +140,26 @@ Copyright (c) 1985-1988, 2018, 2020-2021 by Xerox Corporation.
                       'SAME])
 
 (\CS.COMPARE.MASTERS

-  [LAMBDA (BODYX BODYY DW?)
                                  (* ; "Edited 25-Feb-2022 18:02 by rmk")


+  [LAMBDA (BODY1 BODY2 DW?)
                                  (* ; "Edited 17-Jun-2023 15:19 by rmk")


+                                                             (* ; "Edited 25-Feb-2022 18:02 by rmk")


                                                              (* ; "Edited 18-Jan-2022 22:00 by rmk")


                                                              (* ; "Edited 19-Dec-2021 21:05 by rmk")


                                                             (* ; "Edited  5-Sep-2020 19:01 by rmk:")


                                                              (* ; "Edited 15-Apr-88 14:41 by bvm")

     (DECLARE
 (USEDFREE DIFFERENCES COMPARESTREAM))
-    (LET (YTHING XTHING PRED DIFS TMP)
+    (LET (THING2 THING1 PRED DIFS TMP)
-         (SETQ BODYX (CL:REMOVE-IF (FUNCTION EDITDATE?)
+         (SETQ BODY1 (CL:REMOVE-IF (FUNCTION EDITDATE?)
-                            BODYX))                          (* ; 
+                            BODY1))                          (* ; 
 
                                                             "We don't care about editdate comments")

-         (SETQ BODYY (CL:REMOVE-IF (FUNCTION EDITDATE?)
+         (SETQ BODY2 (CL:REMOVE-IF (FUNCTION EDITDATE?)
-                            BODYY))
+                            BODY2))
-         (SETQ BODYX (\CS.FIXFNS
 BODYX))
+         (SETQ BODY1 (\CS.FIXFNS
 BODY1))
-         (SETQ BODYY (\CS.FIXFNS
 BODYY))
+         (SETQ BODY2 (\CS.FIXFNS
 BODY2))
-         (CL:WHEN (AND (SETQ XTHING (ASSOC 'DEFINE-FILE-INFO BODYX))
+         (CL:WHEN (AND (SETQ THING1 (ASSOC 'DEFINE-FILE-INFO BODY1))
-                       (SETQ YTHING (ASSOC 'DEFINE-FILE-INFO BODYY))
+                       (SETQ THING2 (ASSOC 'DEFINE-FILE-INFO BODY2))
-                       (\CS.COMPARE.DEFINE-FILE-INFO
 XTHING YTHING))
+                       (\CS.COMPARE.DEFINE-FILE-INFO
 THING1 THING2))
-             (SETQ BODYX (REMOVE XTHING BODYX))
+             (SETQ BODY1 (REMOVE THING1 BODY1))
-             (SETQ BODYY (REMOVE YTHING BODYY)))
+             (SETQ BODY2 (REMOVE THING2 BODY2)))
 
          (* ;; "These are for commonlispy definers")

 
@@ -168,18 +168,18 @@ Copyright (c) 1985-1988, 2018, 2020-2021 by Xerox Corporation.
             do
 
                (* ;; "handle definer based things")

 
-               (for
 DEFFER in
 DEFFERS WHEN
 [AND (SETQ XTHING (for
 X in
 BODYX collect
 X
+               (for
 DEFFER in
 DEFFERS WHEN
 [AND (SETQ THING1 (for
 X in
 BODY1 collect
 X
                                                                 when
 (EQ (CAR X)
                                                                          DEFFER)))
-                                                (SETQ YTHING (for
 X in
 BODYY collect
 X
+                                                (SETQ THING2 (for
 X in
 BODY2 collect
 X
                                                                 when
 (EQ (CAR X)
                                                                          DEFFER]
                   do
 
                      (* ;; "Take out all of the THINGS we are about to do.  ")

 
-                     (SETQ BODYX (CL:SET-DIFFERENCE BODYX XTHING :TEST (FUNCTION EQUALALL)))
+                     (SETQ BODY1 (CL:SET-DIFFERENCE BODY1 THING1 :TEST (FUNCTION EQUALALL)))
-                     (SETQ BODYY (CL:SET-DIFFERENCE BODYY YTHING :TEST (FUNCTION EQUALALL)))
+                     (SETQ BODY2 (CL:SET-DIFFERENCE BODY2 THING2 :TEST (FUNCTION EQUALALL)))
-                     (CL:WHEN (SETQ DIFS (\CS.COMPARE.TYPES
 XTHING YTHING
+                     (CL:WHEN (SETQ DIFS (\CS.COMPARE.TYPES
 THING1 THING2
                                                 (CONCAT (OR (CL:DOCUMENTATION TYPE 'DEFINE-TYPES)
                                                             TYPE)
                                                        " defined by " DEFFER)
@@ -194,11 +194,11 @@ Copyright (c) 1985-1988, 2018, 2020-2021 by Xerox Corporation.
          (* ;; "These are for other filepkage types, as registered in COMPARESOURCETYPES")

 
          [for
 TYPE in
 COMPARESOURCETYPES EACHTIME
 (SETQ PRED (fetch
 (CSTYPE PREDFN) of
 TYPE))
-            WHEN
 [AND (SETQ XTHING (for
 X in
 BODYX collect
 X when
 (CL:FUNCALL PRED X)))
+            WHEN
 [AND (SETQ THING1 (for
 X in
 BODY1 collect
 X when
 (CL:FUNCALL PRED X)))
-                      (SETQ YTHING (for
 X in
 BODYY collect
 X when
 (CL:FUNCALL PRED X]
+                      (SETQ THING2 (for
 X in
 BODY2 collect
 X when
 (CL:FUNCALL PRED X]
-            do
 (SETQ BODYX (CL:SET-DIFFERENCE BODYX XTHING :TEST (FUNCTION EQUALALL)))
+            do
 (SETQ BODY1 (CL:SET-DIFFERENCE BODY1 THING1 :TEST (FUNCTION EQUALALL)))
-               (SETQ BODYY (CL:SET-DIFFERENCE BODYY YTHING :TEST (FUNCTION EQUALALL)))
+               (SETQ BODY2 (CL:SET-DIFFERENCE BODY2 THING2 :TEST (FUNCTION EQUALALL)))
-               (CL:WHEN [SETQ DIFS (\CS.COMPARE.TYPES
 XTHING YTHING (OR (fetch
 (CSTYPE TITLE)
+               (CL:WHEN [SETQ DIFS (\CS.COMPARE.TYPES
 THING1 THING2 (OR (fetch
 (CSTYPE TITLE)
                                                                            of
 TYPE)
                                                                         (MKSTRING (fetch
 (CSTYPE
                                                                                           FPKGTYPE)
@@ -211,23 +211,23 @@ Copyright (c) 1985-1988, 2018, 2020-2021 by Xerox Corporation.
                       ((SETQ TMP (ASSOC TYPE DIFFERENCES))
                        (NCONC TMP DIFS))
                       (T (push
 DIFFERENCES (CONS TYPE DIFS])]
-         (SETQ BODYY (CL:SET-DIFFERENCE BODYY (PROG1 BODYX
+         (SETQ BODY2 (CL:SET-DIFFERENCE BODY2 (PROG1 BODY1
-                                                  (SETQ BODYX (CL:SET-DIFFERENCE
+                                                  (SETQ BODY1 (CL:SET-DIFFERENCE
-                                                               BODYX BODYY :TEST
+                                                               BODY1 BODY2 :TEST
                                                                (FUNCTION EQUALALL))))
                             :TEST
                             (FUNCTION EQUALALL)))
          (COND
-            ((OR BODYX BODYY)
+            ((OR BODY1 BODY2)
              (printout CONTEXTSTREAM T "---Expressions:" T)
              (LET ((COMMENTX 0)
                    (COMMENTY 0))                             (* ; "Remove comments")

-                  [SETQ BODYX (for
 X in
 BODYX collect
 X unless
 (COND
+                  [SETQ BODY1 (for
 X in
 BODY1 collect
 X unless
 (COND
                                                                   ((EQ (CAR X)
                                                                        COMMENTFLG)
                                                                    (add
 COMMENTX 1)
                                                                    T]
-                  [SETQ BODYY (for
 Y in
 BODYY collect
 Y unless
 (COND
+                  [SETQ BODY2 (for
 Y in
 BODY2 collect
 Y unless
 (COND
                                                                   ((EQ (CAR Y)
                                                                        COMMENTFLG)
                                                                    (add
 COMMENTY 1)
@@ -238,14 +238,14 @@ Copyright (c) 1985-1988, 2018, 2020-2021 by Xerox Corporation.
                       (printout CONTEXTSTREAM .I1 COMMENTX " comments -> " .I1 COMMENTY " comments."
                              T T)))
                   [COND
-                     [BODYX (COND
+                     [BODY1 (COND
-                               (BODYY (COMPARELISTS BODYX BODYY COMPARESTREAM)
+                               (BODY2 (COMPARELISTS BODY1 BODY2 COMPARESTREAM)
-                                      (\CS.EXAMINE
 BODYX BODYY NIL 'Expression))
+                                      (\CS.EXAMINE
 BODY1 BODY2 NIL 'Expression))
                                (T (printout COMPARESTREAM "These are not on File 2:" T)
-                                  (FOR
 X IN
 BODYX DO
 (LVLPRINT X COMPARESTREAM 2 3)
+                                  (FOR
 X IN
 BODY1 DO
 (LVLPRINT X COMPARESTREAM 2 3)
                                                      (\CS.EXAMINE
 X NIL T NIL 'Expression]
-                     (BODYY (printout COMPARESTREAM "These are not on File 1:" T)
+                     (BODY2 (printout COMPARESTREAM "These are not on File 1:" T)
-                            (FOR
 Y IN
 BODYY DO
 (LVLPRINT Y COMPARESTREAM 2 3)
+                            (FOR
 Y IN
 BODY2 DO
 (LVLPRINT Y COMPARESTREAM 2 3)
                                                (\CS.EXAMINE
 NIL Y T NIL 'Expression]
                   (OR (ASSOC 'Other DIFFERENCES)
                       (push
 DIFFERENCES (LIST 'Other '--])
@@ -622,7 +622,9 @@ Copyright (c) 1985-1988, 2018, 2020-2021 by Xerox Corporation.
 (DEFINEQ
 
 (CSBROWSER

-  [LAMBDA (FILEX FILEY DW? LABEL1 LABEL2 REGION IGNORECOMMENTS TITLE)
+  [LAMBDA (FILE1 FILE2 DW? LABEL1 LABEL2 REGION IGNORECOMMENTS TITLE)
+
+    (* ;; "Edited 17-Jun-2023 15:21 by rmk")

 
     (* ;; "Edited 22-May-2022 18:42 by rmk")

 
@@ -637,28 +639,29 @@ Copyright (c) 1985-1988, 2018, 2020-2021 by Xerox Corporation.
     (* ;; "Don't use the INFILEP value, because that might screw with capitalization that the caller prefers.  If the file can be found that way, then lower functions will find it.")

 
     (DECLARE
 (SPECVARS LABEL1 LABEL2))
-    (SETQ FILEX (OR (STREAMP FILEX)
+    (SETQ FILE1 (OR (STREAMP FILE1)
-                    (INFILEP FILEX)
+                    (INFILEP FILE1)
-                    (FINDFILE FILEX NIL DIRECTORIES)
+                    (FINDFILE FILE1 NIL DIRECTORIES)
-                    (ERROR "FILE NOT FOUND" FILEX)))
+                    (ERROR "FILE NOT FOUND" FILE1)))
-    (SETQ FILEY (OR (STREAMP FILEY)
+    (SETQ FILE2 (OR (STREAMP FILE2)
-                    (INFILEP FILEY)
+                    (INFILEP FILE2)
-                    (FINDFILE FILEY NIL DIRECTORIES)
+                    (FINDFILE FILE2 NIL DIRECTORIES)
-                    (ERROR "FILE NOT FOUND" FILEY)))
+                    (ERROR "FILE NOT FOUND" FILE2)))
-    (CL:UNLESS (LISPSOURCEFILEP FILEX)
+    (CL:UNLESS (LISPSOURCEFILEP FILE1)
-           (ERROR FILEX " is not a Medley source file"))
+           (ERROR FILE1 " is not a Medley source file"))
-    (CL:UNLESS (LISPSOURCEFILEP FILEY)
+    (CL:UNLESS LABEL1
-           (ERROR FILEX " is not a Medley source file"))
+        (SETQ LABEL1 (PACKFILENAME 'HOST NIL 'DIRECTORY NIL 'BODY FILE1)))
+    (CL:UNLESS LABEL2
+        (SETQ LABEL2 (PACKFILENAME 'HOST NIL 'DIRECTORY NIL 'BODY FILE2)))
+    (CL:UNLESS (LISPSOURCEFILEP FILE2)
+           (ERROR FILE1 " is not a Medley source file"))
     (CL:UNLESS TITLE
-        [SETQ TITLE (CONCAT "COMPARESOURCES of " (OR LABEL1 (PACKFILENAME 'HOST NIL 'DIRECTORY NIL
+        (SETQ TITLE (CONCAT "COMPARESOURCES of " LABEL1 " and " LABEL2)))
-                                                                   'BODY FILEX))
-                           " and "
-                           (OR LABEL2 (PACKFILENAME 'HOST NIL 'DIRECTORY NIL 'BODY FILEY])
     (LET [(WINDOW (OBJ.CREATEW 'VERTICAL REGION TITLE NIL T (FONTPROP DEFAULTFONT 'HEIGHT]
          (WINDOWPROP WINDOW 'UNDERSCONTRUCTION T)
          (GETPROMPTWINDOW WINDOW T)
          (WINDOWPROP WINDOW 'UNDERSCONTRUCTION NIL)
-         (COMPARESOURCES
 FILEX FILEY '(T 2WINDOWS)
+         (COMPARESOURCES
 FILE1 FILE2 '(T 2WINDOWS)
                 DW? WINDOW IGNORECOMMENTS LABEL1 LABEL2)
          (OPENW WINDOW)
          WINDOW])
@@ -679,16 +682,16 @@ Copyright (c) 1985-1988, 2018, 2020-2021 by Xerox Corporation.
 )
 (PUTPROPS COMPARESOURCES COPYRIGHT ("Xerox Corporation" 1985 1986 1987 1988 2018 2020 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1864 25616 (COMPARESOURCES 1874 . 8001) (\CS.COMPARE.MASTERS 8003 . 15415) (
+  (FILEMAP (NIL (1751 25612 (COMPARESOURCES 1761 . 7888) (\CS.COMPARE.MASTERS 7890 . 15411) (
-\CS.COMPARE.TYPES 15417 . 18683) (\CS.EXAMINE 18685 . 21863) (\CS.FIXFNS 21865 . 23367) (
+\CS.COMPARE.TYPES 15413 . 18679) (\CS.EXAMINE 18681 . 21859) (\CS.FIXFNS 21861 . 23363) (
-\CS.SORT.DECLARES 23369 . 23712) (\CS.SORT.DECLARE1 23714 . 25134) (\CS.FILTER.GARBAGE 25136 . 25614))
+\CS.SORT.DECLARES 23365 . 23708) (\CS.SORT.DECLARE1 23710 . 25130) (\CS.FILTER.GARBAGE 25132 . 25610))
- (25617 30153 (\CS.ISFNFORM 25627 . 25895) (\CS.COMPARE.FNS 25897 . 26139) (\CS.FNSID 26141 . 26285) (
+ (25613 30149 (\CS.ISFNFORM 25623 . 25891) (\CS.COMPARE.FNS 25893 . 26135) (\CS.FNSID 26137 . 26281) (
-\CS.ISVARFORM 26287 . 26392) (\CS.COMPARE.VARS 26394 . 27056) (\CS.ISMACROFORM 27058 . 27196) (
+\CS.ISVARFORM 26283 . 26388) (\CS.COMPARE.VARS 26390 . 27052) (\CS.ISMACROFORM 27054 . 27192) (
-\CS.ISRECFORM 27198 . 27526) (\CS.REC.NAME 27528 . 27847) (\CS.ISCOURIERFORM 27849 . 27949) (
+\CS.ISRECFORM 27194 . 27522) (\CS.REC.NAME 27524 . 27843) (\CS.ISCOURIERFORM 27845 . 27945) (
-\CS.ISTEMPLATEFORM 27951 . 28049) (\CS.COMPARE.TEMPLATES 28051 . 28416) (\CS.ISPROPFORM 28418 . 28573)
+\CS.ISTEMPLATEFORM 27947 . 28045) (\CS.COMPARE.TEMPLATES 28047 . 28412) (\CS.ISPROPFORM 28414 . 28569)
- (\CS.PROP.NAME 28575 . 28720) (\CS.COMPARE.PROPS 28722 . 28879) (\CS.ISADDVARFORM 28881 . 28974) (
+ (\CS.PROP.NAME 28571 . 28716) (\CS.COMPARE.PROPS 28718 . 28875) (\CS.ISADDVARFORM 28877 . 28970) (
-\CS.COMPARE.ADDVARS 28976 . 29141) (\CS.ISFPKGCOMFORM 29143 . 29350) (\CS.COMPARE.FPKGCOMS 29352 . 
+\CS.COMPARE.ADDVARS 28972 . 29137) (\CS.ISFPKGCOMFORM 29139 . 29346) (\CS.COMPARE.FPKGCOMS 29348 . 
-29559) (\CS.COMPARE.DEFINE-FILE-INFO 29561 . 30151)) (30154 36218 (CSOBJ.CREATE 30164 . 30577) (
+29555) (\CS.COMPARE.DEFINE-FILE-INFO 29557 . 30147)) (30150 36214 (CSOBJ.CREATE 30160 . 30573) (
-CSOBJ.DISPLAYFN 30579 . 31332) (CSOBJ.IMAGEBOXFN 31334 . 33495) (CSOBJ.BUTTONEVENTINFN 33497 . 35968) 
+CSOBJ.DISPLAYFN 30575 . 31328) (CSOBJ.IMAGEBOXFN 31330 . 33491) (CSOBJ.BUTTONEVENTINFN 33493 . 35964) 
-(CSOBJ.COPYBUTTONEVENTINFN 35970 . 36216)) (37099 39228 (CSBROWSER 37109 . 39226)))))
+(CSOBJ.COPYBUTTONEVENTINFN 35966 . 36212)) (37095 39236 (CSBROWSER 37105 . 39234)))))
 STOP

lispusers/EXAMINEDEFS

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 9-Jul-2022 11:05:08" 
+
(FILECREATED "13-Oct-2023 11:18:04" {WMEDLEY}<lispusers>EXAMINEDEFS.;48
 14244  
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>EXAMINEDEFS.;40
 12957  
 
-      :CHANGES-TO (FNS EXAMINEDEFS)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "24-Jun-2022 18:52:03" 
+      :CHANGES-TO (FNS EXAMINEDEFS TEDITDEF)
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>EXAMINEDEFS.;39)
+
+      :PREVIOUS-DATE "19-Jul-2023 13:59:26" {WMEDLEY}<lispusers>EXAMINEDEFS.;44)
 
 
 (PRETTYCOMPRINT EXAMINEDEFSCOMS)
@@ -19,49 +19,66 @@
 (DEFINEQ
 
 (EXAMINEDEFS

-  [LAMBDA (NAME TYPE SOURCE1 SOURCE2 TITLE1 TITLE2 REGION)
   (* ; "Edited  9-Jul-2022 11:04 by rmk")


+  [LAMBDA (NAME TYPE SOURCE1 SOURCE2 TITLE1 TITLE2 REGION)
   (* ; "Edited 13-Oct-2023 11:11 by rmk")


-                                                             (* ; "Edited 24-Jun-2022 18:51 by rmk")


+                                                             (* ; "Edited 18-May-2023 22:35 by rmk")


-                                                             (* ; "Edited 23-Jun-2022 17:58 by rmk")


+                                                             (* ; "Edited 21-Apr-2023 14:42 by rmk")

-                                                             (* ; "Edited 25-Feb-2022 15:01 by rmk")

 
-    (* ;; "This provides for side-by-side examination of separate but presumably related expressions.  The (LISTP) expressions can be provided directly as SOURCE1 and SOURCE2 or, if NAME is given the copies of the definitions of NAME as TYPE on the two sources are examined.")

+    (* ;; "This provides for side-by-side examination of separate but presumably related expressions.  The (LISTP) expressions can be provided directly as the definitions SOURCE1 and SOURCE2 or, if NAME is given the copies of the definitions of NAME as TYPE on the two sources are examined.  If both SOURCE1 and SOURCE2 are NIL, then SOURCE1 is the existing file defintions, NIL is the existing  in-memory definition")

 
     (* ;; "")

 
-    (* ;; "Examination is in side-by-side attached SEDIT windows if SEDIT is the EDITMODE.  You can use SEDIT operations to zoom in on the location of any changes, deleting common stuff for example.  But you are always working on a copy, so that changes are safe and ephemeral.  This is an examination, not an edit.")

+    (if
 NAME
-
+        then
 (CL:UNLESS [OR SOURCE1 SOURCE2 (SETQ SOURCE2 (CAR (WHEREIS NAME
-    (CL:UNLESS NAME
+                                                                      (OR TYPE '(FNS FUNCTIONS))
-        (CL:UNLESS (LISTP SOURCE1)
+                                                                      T]
-               (ERROR SOURCE1 " cannot be examined"))
+                 (ERROR (CONCAT "Can't find " NAME " definitions to examine")))
-        (CL:UNLESS (LISTP SOURCE2)
+      else
 (CL:UNLESS (LISTP SOURCE1)
-               (ERROR SOURCE2 " cannot be examined")))
+                  (ERROR SOURCE1 " cannot be examined"))
-    (CL:UNLESS TYPE
+           (CL:UNLESS (LISTP SOURCE2)
-        (SETQ TYPE 'FNS))
+                  (ERROR SOURCE2 " cannot be examined")))
 
     (* ;; "TITLE1 and TITLE2 are optional strings that will be used to construct the titles of the SEDIT windows. We would like to know where GETDEF got the definition so we can use that, but there isn't an interface that provides that information (extended WHEREIS?)")

 
-    (LET (DEF1 DEF2)
+    (* ;; "")

-         (SETQ DEF1 (IF
 (LISTP SOURCE1)
-                        THEN
 
-                             (* ;; "Copy to simulate READONLY")

 
-                             (SETQ DEF1 (COPY SOURCE1))
+    (* ;; "If SOURCE1 and SOURCE2 are both NIL, SOURCE1 defaults to the current (in memory) definition, SOURCE2 defaults to the definition on the current file.")

-                      ELSEIF
 (GETDEF NAME TYPE SOURCE1)
+
-                      ELSE
 (ERROR NAME " not found on " SOURCE1)))
+    (LET (DEF1 DEF2)
-         (SETQ DEF2 (IF
 (LISTP SOURCE2)
+         (if
 (SETQ DEF1 (LISTP SOURCE1))
-                        THEN
 (COPY SOURCE2)
+           elseif
 TYPE
-                      ELSEIF
 (GETDEF NAME TYPE SOURCE2)
+             then
 (NEQ (SETQ DEF1 (GETDEF NAME TYPE SOURCE1 'NOERROR))
-                      ELSE
 (ERROR NAME " not found on " SOURCE2)))
+                       (FILEPKGTYPE TYPE 'NULLDEF))
+           elseif
 (NEQ (SETQ DEF1 (GETDEF NAME (SETQ TYPE 'FNS)
+                                         SOURCE1
+                                         'NOERROR))
+                       (FILEPKGTYPE TYPE 'NULLDEF))
+           elseif
 (NEQ (SETQ DEF1 (GETDEF NAME (SETQ TYPE 'FUNCTIONS)
+                                         SOURCE1
+                                         'NOERROR))
+                       (FILEPKGTYPE TYPE 'NULLDEF))
+           else
 (ERROR NAME (CONCAT "not found on " SOURCE1)))
+         (if
 (SETQ DEF2 (LISTP SOURCE2))
+           elseif
 (NEQ (SETQ DEF2 (GETDEF NAME TYPE SOURCE2 'NOERROR))
+                       (FILEPKGTYPE TYPE 'NULLDEF))
+           else
 (ERROR NAME (CONCAT "not found on " SOURCE2)))
          (CL:UNLESS TITLE1
-             (SETQ TITLE1 (CL:IF (AND SOURCE1 (ILEQ (COUNT
 SOURCE1)
+             (SETQ TITLE1 (OR (AND (OR (LISTP SOURCE1)
-                                                    5))
+                                       (NULL SOURCE1))
-                              SOURCE1
+                                   'Current)
-                              "File 1")))
+                              (AND (MEMB (U-CASE SOURCE1)
+                                         '(PROP SAVED))
+                                   'Saved)
+                              (FINDFILE SOURCE1)
+                              SOURCE1)))
          (CL:UNLESS TITLE2
-             (SETQ TITLE2 (CL:IF (AND SOURCE2 (ILEQ (COUNT
 SOURCE2)
+             (SETQ TITLE2 (OR (AND (OR (LISTP SOURCE2)
-                                                    5))
+                                       (NULL SOURCE2))
-                              SOURCE2
+                                   'Current)
-                              "File 2")))
+                              (AND (MEMB (U-CASE SOURCE2)
+                                         '(PROP SAVED))
+                                   'Saved)
+                              (FINDFILE SOURCE2)
+                              SOURCE2)))
          (SELECTQ (EDITMODE)
              (SEDIT:SEDIT 
                           (* ;; 
@@ -80,7 +97,9 @@
 
     "Crude suggestions for height, width, position.  Suggest shorter window for  smaller structures")

 
                           (SELECTQ EXAMINEWITH
-                              (SEDIT (CL:UNLESS (REGIONP REGION)
+                              (SEDIT (SETQ DEF1 (COPY DEF1)) (* ; "Copy to simulate read-only")

+                                     (SETQ DEF2 (COPY DEF2))
+                                     (CL:UNLESS (REGIONP REGION)
                                          (SETQ REGION (GETREGION)))
                                      [LET (R1 R2 HALFWIDTH W1 W2)
                                           (SETQ HALFWIDTH (IQUOTIENT (FETCH
 (REGION WIDTH)
@@ -139,15 +158,14 @@
                                                                    (CONCAT "Compare sources of " NAME
                                                                           " as " TYPE)
                                                                    TEXTWIDTH TEXTHEIGHT))
-                                                        (WINDOWPROP CTWINDOW 'EXAMINEDEFS
+                                                        (WINDOWPROP CTWINDOW 'EXAMINEDEFS KEY))])
-                                                               (LIST NAME TYPE SOURCE1 SOURCE2 TITLE1
-                                                                     TITLE2)))])
                               (SHOULDNT)))
              (PROGN (EDITE DEF1)
                     (EDITE DEF2])
 
 (EXAMINEFILES

-  [LAMBDA (FILE1 FILE2 TITLE1 TITLE2 REGION)
                 (* ; "Edited  1-Feb-2022 23:15 by rmk")


+  [LAMBDA (FILE1 FILE2 TITLE1 TITLE2 REGION)
                 (* ; "Edited 19-Jul-2023 13:48 by rmk")


+                                                             (* ; "Edited  1-Feb-2022 23:15 by rmk")


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


                                                              (* ; "Edited  2-Jan-2022 23:15 by rmk")


                                                              (* ; "Edited 30-Dec-2021 21:49 by rmk")

@@ -156,23 +174,26 @@
 
     (CL:UNLESS REGION
         (SETQ REGION (GETREGION)))
-    (LIST (AND FILE1 (TEDIT-SEE FILE1 (RELCREATEREGION `(,REGION 0.5 -1)
+    (LIST (AND (INFILEP FILE1)
-                                             REGION
+               (TEDIT-SEE FILE1 (RELCREATEREGION `(,REGION 0.5 -1)
-                                             'RIGHT
+                                       REGION
-                                             'TOP
+                                       'RIGHT
-                                             `(,REGION 0.5)
+                                       'TOP
-                                             (FETCH
 (REGION TOP) OF
 REGION))
+                                       `(,REGION 0.5)
-                            NIL TITLE1))
+                                       (FETCH
 (REGION TOP) OF
 REGION))
-          (AND FILE2 (TEDIT-SEE FILE2 (RELCREATEREGION `(,REGION 0.5 1)
+                      NIL TITLE1))
-                                             REGION
+          (AND (INFILEP FILE2)
-                                             'LEFT
+               (TEDIT-SEE FILE2 (RELCREATEREGION `(,REGION 0.5 1)
-                                             'TOP
+                                       REGION
-                                             `(,REGION 0.5)
+                                       'LEFT
-                                             (FETCH
 (REGION TOP) OF
 REGION))
+                                       'TOP
-                            NIL TITLE2])
+                                       `(,REGION 0.5)
+                                       (FETCH
 (REGION TOP) OF
 REGION))
+                      NIL TITLE2])
 
 (TEDITDEF

-  [LAMBDA (NAME DEF TYPE READERENVIRONMENT WIDTH)
            (* ; "Edited 23-Jun-2022 17:27 by rmk")


+  [LAMBDA (NAME DEF TYPE READERENVIRONMENT WIDTH)
            (* ; "Edited 13-Oct-2023 00:23 by rmk")


+                                                             (* ; "Edited 23-Jun-2022 17:27 by rmk")


                                                              (* ; "Edited 28-Jan-2022 23:36 by rmk")


                                                              (* ; "Edited 12-Jan-2022 17:27 by rmk")

     (LET ((TSTREAM (OPENTEXTSTREAM)))
@@ -182,11 +203,14 @@
                                                  TSTREAM))
                     TSTREAM))
          (SELECTQ (CAR DEF)
+             ([LAMBDA NLAMBDA OPENLAMBDA] 
+                  (PRINTOUT TSTREAM .FONT BOLDFONT .P2 NAME T .FONT DEFAULTFONT 2)
+                  (PRINTDEF DEF 2 T NIL NIL TSTREAM))
              (DEFINEQ (SETQ DEF (CADR DEF))
                       (PRINTOUT TSTREAM .FONT BOLDFONT .P2 NAME T .FONT DEFAULTFONT 2)
                       (PRINTDEF (CADR DEF)
                              2 T NIL NIL TSTREAM))
-             ((DEFMACRO DEFUN)                               (* ; "Has args after name")

+             ((DEFMACRO DEFUN DEFMACRO CL:DEFUN)             (* ; "Has args after name")

                   (PRINTOUT TSTREAM "(" .P2 (CAR DEF)
                          " " .FONT BOLDFONT .P2 (CADR DEF)
                          .FONT DEFAULTFONT " " .P2 (CADDR DEF)
@@ -216,6 +240,6 @@
 (FILESLOAD (SYSLOAD)
        COMPARETEXT)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (671 12815 (EXAMINEDEFS 681 . 9537) (EXAMINEFILES 9539 . 10934) (TEDITDEF 10936 . 12813)
+  (FILEMAP (NIL (618 14102 (EXAMINEDEFS 628 . 10448) (EXAMINEFILES 10450 . 11932) (TEDITDEF 11934 . 
-))))
+14100)))))
 STOP

lispusers/HELPSYS

@@ -1,12 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "16-Jun-2023 14:38:33" {DSK}<home>larry>il>medley>lispusers>HELPSYS.;11
 87625  
+
(FILECREATED "11-Nov-2023 09:31:38" {DSK}<home>larry>il>medley>lispusers>HELPSYS.;2
 87772  
 
       :EDIT-BY "lmm"
 
       :CHANGES-TO (VARS HELPSYSCOMS)
+                  (FNS CLHS.LOOKUP)
 
-      :PREVIOUS-DATE "13-Jan-2023 10:46:39" {DSK}<home>larry>il>medley>lispusers>HELPSYS.;10)
+      :PREVIOUS-DATE "16-Jun-2023 14:38:33" {DSK}<home>larry>il>medley>lispusers>HELPSYS.;1)
 
 
 (PRETTYCOMPRINT HELPSYSCOMS)
@@ -28,7 +29,7 @@
 
         (COMS (FNS CLHS.INDEX CLHS.LOOKUP CLHS.OPENER REPO.LOOKUP)
               (VARS CLHS.INDEX)
-              [INITVARS (CLHS.ROOT.URL "http://clhs.lisp.se/")
+              [INITVARS (CLHS.ROOT.URL "https://interlisp.org/clhs/")
                      (CLHS.INDEX)
                      (CLHS.OPENER)
                      (HELPSYS.REPO.TYPES '(FNS FUNCTIONS VARS VARIABLES]
@@ -94,8 +95,7 @@
        DINFO HASH)
 )
 
-(DEFCOMMAND "man"
 (ENTRY)
+(DEFCOMMAND "man" (ENTRY) "Lookup ENTRY in the IRM."
-   "Lookup ENTRY in the IRM."
    (GENERIC.MAN.LOOKUP
 ENTRY))
 (DEFINEQ
 
@@ -266,9 +266,10 @@
                                   else
 (LIST (SUBSTRING LINE POSLINK (CL:1- POSENDLINK])
 
 (CLHS.LOOKUP

-  [LAMBDA (ENTRY PHASES)
                                     (* ; "Edited 12-Oct-2022 18:32 by FGH")


+  [LAMBDA (ENTRY PHASES)
                                     (* ; "Edited 11-Nov-2023 09:11 by lmm")


+                                                             (* ; "Edited 12-Oct-2022 18:32 by FGH")


                                                            (* ; "Edited 24-Aug-2022 17:08 by larry")

-    (LET [(OPENER (CLHS.OPENER
))
+    (LET [(OPENER (ShellBrowser))
           (URL NIL)
           POS
           (ENTRY (L-CASE (MKSTRING ENTRY]
@@ -1329,7 +1330,7 @@
         ("yes-or-no-p" "f_y_or_n.htm" "yes-or-no-p")
         ("zerop" "f_zerop.htm" "zerop")))
 
-(RPAQ? CLHS.ROOT.URL
 "http://clhs.lisp.se/")
+(RPAQ? CLHS.ROOT.URL
 "https://interlisp.org/clhs/")
 
 (RPAQ? CLHS.INDEX
 )
 
@@ -1700,14 +1701,14 @@
 
 (PUTPROPS HELPSYS
 FILETYPE
 :FAKE-COMPILE-FILE)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4609 10342 (HELPSYS 4619 . 6460) (IRM.LOOKUP 6462 . 8100) (GENERIC.MAN.LOOKUP 8102 . 
+  (FILEMAP (NIL (4643 10376 (HELPSYS 4653 . 6494) (IRM.LOOKUP 6496 . 8134) (GENERIC.MAN.LOOKUP 8136 . 
-9771) (IRM.SMART.LOOKUP 9773 . 9929) (IRM.RESET 9931 . 10340)) (10599 17546 (CLHS.INDEX 10609 . 13307)
+9805) (IRM.SMART.LOOKUP 9807 . 9963) (IRM.RESET 9965 . 10374)) (10633 17686 (CLHS.INDEX 10643 . 13341)
- (CLHS.LOOKUP 13309 . 15209) (CLHS.OPENER 15211 . 16534) (REPO.LOOKUP 16536 . 17544)) (70634 72152 (
+ (CLHS.LOOKUP 13343 . 15349) (CLHS.OPENER 15351 . 16674) (REPO.LOOKUP 16676 . 17684)) (70781 72299 (
-IRM.GET.DINFOGRAPH 70644 . 71519) (IRM.DISPLAY.REF 71521 . 72150)) (72154 72516 (IRM.LOAD-GRAPH 72154
+IRM.GET.DINFOGRAPH 70791 . 71666) (IRM.DISPLAY.REF 71668 . 72297)) (72301 72663 (IRM.LOAD-GRAPH 72301
- . 72516)) (72841 78345 (IRM.DISPLAY.CREF 72851 . 74565) (IRM.CREF.BOX 74567 . 75394) (IRM.PUT.CREF 
+ . 72663)) (72988 78492 (IRM.DISPLAY.CREF 72998 . 74712) (IRM.CREF.BOX 74714 . 75541) (IRM.PUT.CREF 
-75396 . 75621) (IRM.GET.CREF 75623 . 75994) (IRM.CREF.BUTTONEVENTFN 75996 . 78343)) (78900 87206 (
+75543 . 75768) (IRM.GET.CREF 75770 . 76141) (IRM.CREF.BUTTONEVENTFN 76143 . 78490)) (79047 87353 (
-\IRM.GET.REF 78910 . 80241) (\IRM.SMART.REF 80243 . 82170) (\IRM.CHOOSE.REF 82172 . 83423) (
+\IRM.GET.REF 79057 . 80388) (\IRM.SMART.REF 80390 . 82317) (\IRM.CHOOSE.REF 82319 . 83570) (
-\IRM.WILD.REF 83425 . 84680) (\IRM.WILDCARD 84682 . 85048) (\IRM.WILD.MATCH 85050 . 86280) (
+\IRM.WILD.REF 83572 . 84827) (\IRM.WILDCARD 84829 . 85195) (\IRM.WILD.MATCH 85197 . 86427) (
-\IRM.GET.HASHFILE 86282 . 86745) (\IRM.GET.KEYWORDS 86747 . 87204)) (87343 87499 (\IRM.AROUND-EXIT 
+\IRM.GET.HASHFILE 86429 . 86892) (\IRM.GET.KEYWORDS 86894 . 87351)) (87490 87646 (\IRM.AROUND-EXIT 
-87343 . 87499)))))
+87490 . 87646)))))
 STOP

lispusers/MODERNIZE

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 7-Oct-2022 21:45:29" 
+
(FILECREATED "29-Oct-2023 10:56:48" {WMEDLEY}<lispusers>MODERNIZE.;48
 30909  
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>MODERNIZE.;43
 30755  
 
-      :CHANGES-TO (FNS MODERNWINDOW)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE " 5-Mar-2022 23:20:21" 
+      :CHANGES-TO (FNS NEARESTCORNER)
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>MODERNIZE.;40)
+
+      :PREVIOUS-DATE "29-Jul-2023 10:48:55" {WMEDLEY}<lispusers>MODERNIZE.;47)
 
 
 (PRETTYCOMPRINT MODERNIZECOMS)
@@ -30,7 +30,7 @@
               
               (* ;; "Add some Meta commands")

 
-              (FNS TEDIT.MODERNIZE \MODERNIZED.TEDIT.BUTTONEVENTFN TEDIT.SELECTALL)
+              (FNS TEDIT.MODERNIZE \MODERNIZED.TEDIT.BUTTONEVENTFN)
               (DECLARE%: DONTEVAL@LOAD DOCOPY (P 
                                                  (* ;; "Tedit")

 
@@ -325,21 +325,47 @@
                       (IGREATERP LASTMOUSEX (IPLUS LEFT (TIMES WIDTH (DIFFERENCE 1 TITLEPROPORTION])
 
 (NEARESTCORNER

-  [LAMBDA (REGION)
                                      (* ; "Edited 14-Feb-2021 21:46 by rmk:")

+  [LAMBDA (REGION)
                                           (* ; "Edited 29-Oct-2023 10:56 by rmk")


+                                                             (* ; "Edited 29-Jul-2023 10:32 by rmk")


+                                                            (* ; "Edited 14-Feb-2021 21:46 by rmk:")

 
-    (* ;; 
+    (* ;; "Moves the cursor to the corner of REGION that is closest to the current LASTMOUSEX and LASTMOUSEY, provided that that corner is on-screen.")

-
"Moves the cursor to the corner of REGION that is closest to the current LASTMOUSEX AND LASTMOUSEY")

 
-    (\CURSORPOSITION (CL:IF (ILESSP (IDIFFERENCE LASTMOUSEX (FETCH
 LEFT OF
 REGION))
+    (LET ((LEFT (FETCH
 (REGION LEFT) OF
 REGION))
-                                   (IDIFFERENCE (FETCH
 RIGHT OF
 REGION)
+          (RIGHT (FETCH
 (REGION RIGHT) OF
 REGION))
-                                          LASTMOUSEX))
+          (TOP (FETCH
 (REGION TOP) OF
 REGION))
-                         (FETCH
 LEFT OF
 REGION)
+          (BOTTOM (FETCH
 (REGION BOTTOM) OF
 REGION))
-                         (FETCH
 RIGHT OF
 REGION))
+          X Y)
-           (CL:IF (ILESSP (IDIFFERENCE LASTMOUSEY (FETCH
 BOTTOM OF
 REGION))
+
-                         (IDIFFERENCE (FETCH
 TOP OF
 REGION)
+         (* ;; "If the nearest corner is offscreen, pick the other one.")

-                                LASTMOUSEY))
+
-               (FETCH
 BOTTOM OF
 REGION)
+         (SETQ X (if
 (OR (ILESSP LEFT 0)
-               (FETCH
 TOP OF
 REGION))])
+                         (IGEQ LEFT SCREENWIDTH))
+                     then
 
+                          (* ;; "LEFT is offscreen")

+
+                          RIGHT
+                   elseif
 (ILESSP (IDIFFERENCE LASTMOUSEX LEFT)
+                                 (IDIFFERENCE RIGHT LASTMOUSEX))
+                     then
 
+                          (* ;; "Closer to LEFT")

+
+                          LEFT
+                   else
 RIGHT))
+         (SETQ Y (if
 (OR (ILESSP TOP 0)
+                         (IGEQ TOP SCREENHEIGHT))
+                     then
 
+                          (* ;; "TOP is offscreen")

+
+                          BOTTOM
+                   elseif
 (ILESSP (IDIFFERENCE LASTMOUSEY BOTTOM)
+                                 (IDIFFERENCE TOP LASTMOUSEY))
+                     then
 
+                          (* ;; "Closer to BOTTOM")

+
+                          BOTTOM
+                   else
 TOP))
+         (\CURSORPOSITION X Y])
 
 (INCORNER.REGION

   [LAMBDA (CORNERREGION TOPMARGIN)
                      (* ; "Edited 13-Oct-2021 15:04 by rmk:")

@@ -470,50 +496,25 @@
 (DEFINEQ
 
 (TEDIT.MODERNIZE

-  [LAMBDA NIL
                                           (* ; "Edited 11-Oct-2021 15:02 by rmk:")

+  [LAMBDA NIL
                                                (* ; "Edited 14-Jun-2023 16:56 by rmk")


+                                                            (* ; "Edited 11-Oct-2021 15:02 by rmk:")

     (MODERNWINDOW.SETUP
 (FUNCTION \TEDIT.BUTTONEVENTFN)
-           (FUNCTION \MODERNIZED.TEDIT.BUTTONEVENTFN))
+           (FUNCTION \MODERNIZED.TEDIT.BUTTONEVENTFN])
-    (CL:WHEN (GETD '\TEDIT.BUTTONEVENTFN)
-
-        (* ;; "All")

-
-        (TEDIT.SETFUNCTION (CHARCODE "Meta,a")
-               (FUNCTION TEDIT.SELECTALL)
-               TEDIT.READTABLE)
-        (TEDIT.SETFUNCTION (CHARCODE "Meta,A")
-               (FUNCTION TEDIT.SELECTALL)
-               TEDIT.READTABLE)
-
-        (* ;; "Quit")

-
-        (TEDIT.SETFUNCTION (CHARCODE "Meta,q")
-               (FUNCTION TEDIT.QUIT)
-               TEDIT.READTABLE)
-        (TEDIT.SETFUNCTION (CHARCODE "Meta,Q")
-               (FUNCTION TEDIT.QUIT)
-               TEDIT.READTABLE))])
 
 (\MODERNIZED.TEDIT.BUTTONEVENTFN

-  [LAMBDA (W STREAM)
                                    (* ; "Edited 13-Oct-2021 21:43 by rmk:")

+  [LAMBDA (W STREAM)
                                         (* ; "Edited 29-Jul-2023 10:48 by rmk")


+                                                            (* ; "Edited 13-Oct-2021 21:43 by rmk:")

 
     (* ;; "If a TEDIT window has been split, we have to make sure that movement happens only for clicks at the top of the main window and at the bottom of the bottom-most split window.  Clicks near the split lines must be ignored.  Essentially, the %"region%" of the Tedit window is the union of the regions of all of its split-panes.")

 
-    (* ;; "We pass the pain that received the click, because that's what the original \TEDIT.BUTTONEVENTFN needs to see, if we decide not to shape or move.")

+    (* ;; "We pass the pane that received the click, because that's what the original \TEDIT.BUTTONEVENTFN needs to see, if we decide not to shape or move.")

 
     (MODERNWINDOW.BUTTONEVENTFN
 W (FUNCTION MODERN-ORIG-\TEDIT.BUTTONEVENTFN)
            NIL NIL [APPLY (FUNCTION UNIONREGIONS)
-                          (bind
 PANE _ (CENTRALWINDOW W) collect
 (WINDOWPROP PANE
+                          (bind
 PANE _ (CENTRALWINDOW W) collect
 (WINDOWPROP PANE 'REGION)
-                                                                                'REGION)
                              repeatwhile
 (SETQ PANE (WINDOWPROP PANE 'TEDIT-NEXT-PANE-DOWN]
            (WINDOWPROP (CENTRALWINDOW W)
                   'TITLE])
-
-(TEDIT.SELECTALL

-  [LAMBDA (STREAM TEXTOBJ SEL)
                          (* ; "Edited  3-May-2020 17:29 by rmk:")

-    (LET [(TEXTSTREAM (TEXTSTREAM (TTY.PROCESS]
-         (CL:WHEN TEXTSTREAM
-             (TEDIT.SETSEL TEXTSTREAM 0 (ADD1 (fetch
 TEXTLEN of
 (TEXTOBJ TEXTSTREAM)))
-                    'LEFT))])
 )
 (DECLARE%: DONTEVAL@LOAD DOCOPY 
 
@@ -614,12 +615,11 @@
 (ADDTOVAR LAMA
 MODERN-ADD-EXEC)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (5125 11487 (MODERNWINDOW 5135 . 6675) (MODERNWINDOW.SETUP 6677 . 9626) (UNMODERNWINDOW 
+  (FILEMAP (NIL (5048 11410 (MODERNWINDOW 5058 . 6598) (MODERNWINDOW.SETUP 6600 . 9549) (UNMODERNWINDOW 
-9628 . 10022) (MODERNWINDOW.UNSETUP 10024 . 10836) (\MODERNIZED.FREEMENU.BUTTONEVENTFN 10838 . 11485))
+9551 . 9945) (MODERNWINDOW.UNSETUP 9947 . 10759) (\MODERNIZED.FREEMENU.BUTTONEVENTFN 10761 . 11408)) (
- (11552 21714 (MODERNWINDOW.BUTTONEVENTFN 11562 . 18589) (NEARTOP 18591 . 19519) (NEARESTCORNER 19521
+11475 22625 (MODERNWINDOW.BUTTONEVENTFN 11485 . 18512) (NEARTOP 18514 . 19442) (NEARESTCORNER 19444 . 
- . 20400) (INCORNER.REGION 20402 . 21712)) (21772 24244 (MODERN-ADD-EXEC 21782 . 22213) (MODERN-SNAPW 
+21311) (INCORNER.REGION 21313 . 22623)) (22683 25155 (MODERN-ADD-EXEC 22693 . 23124) (MODERN-SNAPW 
-22215 . 22758) (TOTOPW.MODERNIZE 22760 . 23188) (MODERN-MENUBUTTONFN 23190 . 24242)) (24245 26674 (
+23126 . 23669) (TOTOPW.MODERNIZE 23671 . 24099) (MODERN-MENUBUTTONFN 24101 . 25153)) (25156 27585 (
-\MODERNIZED.FREEMENU.BUTTONEVENTFN 24255 . 24902) (MODERNIZED.TB.BUTTONEVENTFN 24904 . 26672)) (26715 
+\MODERNIZED.FREEMENU.BUTTONEVENTFN 25166 . 25813) (MODERNIZED.TB.BUTTONEVENTFN 25815 . 27583)) (27626 
-28994 (TEDIT.MODERNIZE 26725 . 27539) (\MODERNIZED.TEDIT.BUTTONEVENTFN 27541 . 28663) (TEDIT.SELECTALL
+29148 (TEDIT.MODERNIZE 27636 . 27989) (\MODERNIZED.TEDIT.BUTTONEVENTFN 27991 . 29146)))))
- 28665 . 28992)))))
 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)
+      :CHANGES-TO (FNS PSEUDOHOST)
-                  (VARS PSEUDOHOSTSCOMS)
 
-      :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) 
+  (FILEMAP (NIL (1254 10126 (PSEUDOHOST 1264 . 6972) (PSEUDOHOSTP 6974 . 7487) (PSEUDOHOSTS 7489 . 7850)
-(TARGETHOST 7810 . 8084) (TRUEFILENAME 8086 . 9048) (PSEUDOFILENAME 9050 . 9919)) (9949 15964 (
+ (TARGETHOST 7852 . 8126) (TRUEFILENAME 8128 . 9253) (PSEUDOFILENAME 9255 . 10124)) (10154 16169 (
-EXPAND.PH 9959 . 11212) (CONTRACT.PH 11214 . 13925) (UNSLASHIT 13927 . 15673) (GETHOSTINFO.PH 15675 . 
+EXPAND.PH 10164 . 11417) (CONTRACT.PH 11419 . 14130) (UNSLASHIT 14132 . 15878) (GETHOSTINFO.PH 15880
-15962)) (15965 23985 (OPENFILE.PH 15975 . 17048) (GETFILENAME.PH 17050 . 17339) (DIRECTORYNAMEP.PH 
+ . 16167)) (16170 24190 (OPENFILE.PH 16180 . 17253) (GETFILENAME.PH 17255 . 17544) (DIRECTORYNAMEP.PH 
-17341 . 17965) (CLOSEFILE.PH 17967 . 18434) (REOPENFILE.PH 18436 . 19001) (DELETEFILE.PH 19003 . 19287
+17546 . 18170) (CLOSEFILE.PH 18172 . 18639) (REOPENFILE.PH 18641 . 19206) (DELETEFILE.PH 19208 . 19492
-) (OPENP.PH 19289 . 19584) (UNREGISTERFILE.PH 19586 . 20128) (REGISTERFILE.PH 20130 . 20664) (
+) (OPENP.PH 19494 . 19789) (UNREGISTERFILE.PH 19791 . 20333) (REGISTERFILE.PH 20335 . 20869) (
-GENERATEFILES.PH 20666 . 21710) (GETFILEINFO.PH 21712 . 22014) (SETFILEINFO.PH 22016 . 22215) (
+GENERATEFILES.PH 20871 . 21915) (GETFILEINFO.PH 21917 . 22219) (SETFILEINFO.PH 22221 . 22420) (
-NEXTFILEFN.PH 22217 . 22763) (FILEINFOFN.PH 22765 . 23040) (RENAMEFILE.PH 23042 . 23983)))))
+NEXTFILEFN.PH 22422 . 22968) (FILEINFOFN.PH 22970 . 23245) (RENAMEFILE.PH 23247 . 24188)))))
 STOP

lispusers/REGIONMANAGER

@@ -1,10 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "10-Oct-2023 22:19:05" {WMEDLEY}<lispusers>REGIONMANAGER.;129
 40525  
+
(FILECREATED " 2-Nov-2023 23:48:28" {WMEDLEY}<lispusers>REGIONMANAGER.;133
 41064  
 
       :EDIT-BY rmk
 
-      :PREVIOUS-DATE "10-Oct-2023 22:17:47" {MEDLEY}<lispusers>REGIONMANAGER.;9)
+      :CHANGES-TO (FNS RM-CREATEW)
+
+      :PREVIOUS-DATE "10-Oct-2023 22:19:05" {WMEDLEY}<lispusers>REGIONMANAGER.;129)
 
 
 (PRETTYCOMPRINT REGIONMANAGERCOMS)
@@ -138,7 +140,8 @@
 (DEFINEQ
 
 (RM-CREATEW

-  [LAMBDA (REGION TITLE BORDERSIZE NOOPENFLG PROPS)
          (* ; "Edited 24-Sep-2023 20:38 by rmk")


+  [LAMBDA (REGION TITLE BORDERSIZE NOOPENFLG PROPS)
          (* ; "Edited  2-Nov-2023 23:48 by rmk")


+                                                             (* ; "Edited 24-Sep-2023 20:38 by rmk")


                                                              (* ; "Edited 14-Sep-2023 22:23 by rmk")


                                                              (* ; "Edited  1-Jan-2022 23:12 by rmk")


                                                              (* ; "Edited 29-Dec-2021 19:25 by rmk")

@@ -147,16 +150,22 @@
 
     (* ;; "We have to bracket the original window creation because the we have to mark that the window uses that region, to put it back in the pool when the window is closed.")

 
-    (LET [WINDOW (REGION-TYPE
 (if
 (AND (LITATOM REGION)
+    (* ;; "NOTE: putting the region as the REGION--TYPE property may only be needed for old TEDIT compatibility")

-                                       REGION)
-                                  then
 (PROG1 REGION (SETQ REGION NIL))
-                                else
 (LISTGET PROPS 'REGION-TYPE]
 
-         (* ;; "We have REGION-TYPE, but maybe also a region that already has a source. Maybe we should make sure that the source is of that type?")

+    (LET [WINDOW REGION-TYPE (RTPROP (LISTGET PROPS 'REGION-TYPE]
+         (SETQ REGION-TYPE (if
 (AND (LITATOM REGION)
+                                    REGION)
+                               then
 (PROG1 REGION (SETQ REGION NIL))
+                             elseif
 (LITATOM RTPROP)
+                               then
 RTPROP))
+         (CL:UNLESS (OR (REGIONP REGION)
+                        (SCREENREGIONP REGION))
+             (SETQ REGION (OR (REGIONP RTPROP)
+                              (SCREENREGIONP RTPROP))))
 
-         (* ;; "Note: REGION can also be a screenregion, that falls through.")

+         (* ;; "We have REGION-TYPE, but maybe also a region that already has a source. Maybe we should make sure that the source is of that type? REGION can also be a screenregion, that falls through.")

 
-         (CL:WHEN REGION-TYPE
+         (CL:WHEN (AND REGION-TYPE (NULL REGION))
              (SETQ REGION (GRAB-TYPED-REGION
 REGION-TYPE)))
          (SETQ WINDOW (CREATEW.ORIG REGION TITLE BORDERSIZE NOOPENFLG PROPS))
          (CL:WHEN REGION-TYPE (REGISTER-TYPED-REGION
 REGION REGION-TYPE WINDOW))
@@ -721,11 +730,11 @@
 )
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1573 6691 (SET-TYPED-REGIONS 1583 . 3758) (GRAB-TYPED-REGION 3760 . 4786) (
+  (FILEMAP (NIL (1612 6730 (SET-TYPED-REGIONS 1622 . 3797) (GRAB-TYPED-REGION 3799 . 4825) (
-REGISTER-TYPED-REGION 4788 . 6085) (REGION-TYPE 6087 . 6689)) (6692 14098 (RM-CREATEW 6702 . 8325) (
+REGISTER-TYPED-REGION 4827 . 6124) (REGION-TYPE 6126 . 6728)) (6731 14637 (RM-CREATEW 6741 . 8864) (
-RM-CLOSEW 8327 . 11345) (RM-GETREGION 11347 . 13496) (CLOSE-TYPED-W 13498 . 14096)) (14741 22220 (
+RM-CLOSEW 8866 . 11884) (RM-GETREGION 11886 . 14035) (CLOSE-TYPED-W 14037 . 14635)) (15280 22759 (
-RELCREATEREGION 14751 . 19374) (RELGETREGION 19376 . 21983) (RELCREATEPOSITION 21985 . 22218)) (22221 
+RELCREATEREGION 15290 . 19913) (RELGETREGION 19915 . 22522) (RELCREATEPOSITION 22524 . 22757)) (22760 
-29025 (\RELCREATEREGION.REF 22231 . 25982) (\RELCREATEREGION.SIZE 25984 . 29023)) (29078 38420 (
+29564 (\RELCREATEREGION.REF 22770 . 26521) (\RELCREATEREGION.SIZE 26523 . 29562)) (29617 38959 (
-RM-ATTACHWINDOW 29088 . 38418)) (38421 40155 (CLOSEWITH 38431 . 38958) (CLOSEWITH.DOIT 38960 . 39240) 
+RM-ATTACHWINDOW 29627 . 38957)) (38960 40694 (CLOSEWITH 38970 . 39497) (CLOSEWITH.DOIT 39499 . 39779) 
-(MOVEWITH 39242 . 39765) (MOVEWITH.DOIT 39767 . 40153)))))
+(MOVEWITH 39781 . 40304) (MOVEWITH.DOIT 40306 . 40692)))))
 STOP

lispusers/REGIONMANAGER.TEDIT

@@ -32,9 +32,9 @@ Relative regions
 Two functions are provided to make it easy to create regions relative and oriented with respect to a specified reference point. These may be useful for constructing an application that includes a constellation of windows arranged in a particular relative way.
 (RELCREATEREGION WIDTH HEIGHT CORNERX CORNERY REFX REFY ONSCREEN)	[Function]
 RELCREATEREGION creates a region of dimensions WIDTH and HEIGHT. One of its corners is identified by CORNERX and CORNERY and that corner will be aligned with a reference screen-point determined by REFX and REFY. If ONSCREEN, the WIDTH or HEIGHT will be adjusted with respect to that alignment so that the resulting region is entirely within the screen.
-WIDTH and HEIGHT can be given as absolute (natural) numbers) or specified relative to the WIDTH and HEIGHT of another region or of the screen. The possibilities are interpreted as follows:
+WIDTH and HEIGHT can be given as absolute (natural) numbers or specified relative to the WIDTH and HEIGHT of another region or of the screen. The possibilities are interpreted as follows:
 natural number:  the number of screen points
-list of the form (anchor fraction adjustment), where anchor is a region, window, or an atom SCREEN or TTY. The corres-ponding dimension of the anchor is mutiplied by fraction and adjustment is added to the result. For example,  specifying  (<window> .5 -1) results in a WIDTH that is one point smaller than half the width of window's region.   Fraction and  adjustment default to 1 and 0 respectively.
+list of the form (anchor fraction adjustment), where anchor is a region, window, or an atom SCREEN or TTY. The corresponding dimension of the anchor is mutiplied by fraction and adjustment is added to the result. For example,  specifying  (<window> .5 -1) results in a WIDTH that is one point smaller than half the width of window's region.   Fraction and  adjustment default to 1 and 0 respectively.
 region/window/SCREEN/TTY: equivalent to (region/window/SCREEN/TTY 1 0).
 CORNERX can be LEFT, RIGHT, or NIL=LEFT, CORNERY can be BOTTOM, TOP, or NIL=BOTTOM.  If LEFT/TOP are specified, for example, the region will be displayed down and to the right of the reference point.  If RIGHT/BOTTOM, then up and to the left.
 The reference-point arguments REFX and REFY are interpreted as follows:
@@ -55,7 +55,7 @@ Each of these applications is constructed by anticipating the subregions that th
 An alternative approach is to construct the central window first, giving it the entire constellation region, and then to have ATTACHWINDOW reshape that window to accomodate the satellite windows as they are attached in sequence. This leads to the same final configuration, but there is no need for separate calculations to pre-adjust the region of the central window.
 REGIONMANAGER provides an overlay veneer for ATTACHWINDOW that implements this strategy. If the new argument TAKEFROMCENTRAL is true, then the region of the WINDOWTOATTACH will be substracted from the region of the existing central window according to the EDGE parameter of the attachment. 
 (ATTACHWINDOW WINDOWTOATTACH MAINWINDOW EDGE POSITIONONEDGE WINDOWCOMACTION TAKEFROMCENTRAL)	[Function]
-This behavior is also triggered if the UNDERCONSTRUCTION property of the central window is true. Thus, a constellation can be set up by creating all of the satellites and the central window, marking the central window as under construction, and then doing the sequence of attachments. The property can be reset to NIL when the construction is complete, so the central window does not shrink if other other attachments (e.g. expanded menus) by later user actions.
+This behavior is also triggered if the UNDERCONSTRUCTION property of the central window is true. Thus, a constellation can be set up by creating all of the satellites and the central window, marking the central window as under construction, and then doing the sequence of attachments. The property can be reset to NIL when the construction is complete, so the central window does not shrink if other windows are attached (e.g. expanded menus) by later user actions.
 
 A somewhat weaker form of a constellation is a collection of windows that are not attached around a central window but stand in a parent-child relationship at least with respect to closing and moving.  A parent  windows spawns children that respond independently to ordinary window commands (move, shape, close). But the children close when the parent closes, and the children move when the parent moves so that they continue to appear in the same relative positions.  These primitives allow the construction of a tree of windows that are dependent in this way.
 (CLOSEWITH CHILDREN PARENT	[Function]
@@ -73,9 +73,9 @@ If NEWPOS is the new position of PARENT, moves each of the move-children so that
 TIMESROMAN$


HRULE.GETFN



HRULE.GETFN


HRULE.GETFN


HRULE.GETFN

HRULE.GETFN

 
D


È


	„
	•
	‘
}


/


	¯

[

	
<01>
C
×
<00>

T

	Û



Á
1	


 


-


;
	3

o
)

Ä

ž

 
’



	
4


n

	©

o
2
V
@
1


%
!








A
 

&

M




m

J

S
-
f
=


+


;
	3

o
)

Ä

ž

 
’



	
4


n

	©

o
2
V
@
1


%
!








A
 

&

M




m

I

S
-
f
<


 3

E


 "


 

 












l







/
3

-t


2





C
	
ƒ






"




O


=

	,

	l



¬
)9




™

¤
Ç



S
~
æ
-
4
!
U

h'

—

2
&µ
$"

&



(


)

M





DATE:fï1¶2È
˜zº
+t


2





C
	
ƒ






"




O


=

	,

	l



¬
)9




™

¤
Ç



S
~
æ
-
4
!
U

h'

š

2
&µ
$"

&



(


)

M





DATE:fû+Ë2É
˜zº

lispusers/comparetext

@@ -1,13 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "23-Jun-2022 22:50:45" 
+
(FILECREATED "18-Oct-2023 17:45:46" {WMEDLEY}<lispusers>COMPARETEXT.;131
 48661  
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>COMPARETEXT.;124
 48226  
 
-      :CHANGES-TO (FNS IMCOMPARE.LEFTBUTTONFN COMPARETEXT.TEXTOBJ COMPARETEXT IMCOMPARE.CHUNKS 
+      :EDIT-BY rmk
-                       IMCOMPARE.DISPLAYGRAPH COMPARETEXT.WINDOW)
 
-      :PREVIOUS-DATE "20-May-2022 16:35:56" 
+      :CHANGES-TO (FNS IMCOMPARE.COLLECT.HASH.CHUNKS IMCOMPARE.HASH)
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>lispusers>COMPARETEXT.;118)
+
+      :PREVIOUS-DATE " 2-Nov-2022 10:08:52" {WMEDLEY}<lispusers>COMPARETEXT.;130)
 
 
 (* ; "
@@ -17,7 +16,7 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
 (PRETTYCOMPRINT COMPARETEXTCOMS)
 
 (RPAQQ COMPARETEXTCOMS

-       ((FNS COMPARETEXT COMPARETEXT.WINDOW COMPARETEXT.TEXTOBJ COMPARETEXT.SETSEL CHUNKNODELABEL 
+       ((FNS COMPARETEXT COMPARETEXT.WINDOW COMPARETEXT.TSTREAM COMPARETEXT.SETSEL CHUNKNODELABEL 
              IMCOMPARE.BOXNODE IMCOMPARE.CHUNKS IMCOMPARE.COLLECT.HASH.CHUNKS IMCOMPARE.DISPLAYGRAPH
              IMCOMPARE.HASH IMCOMPARE.MERGE.CONNECTED.CHUNKS IMCOMPARE.MERGE.UNCONNECTED.CHUNKS 
              IMCOMPARE.SHOW.DIST IMCOMPARE.UPDATE.SYMBOL.TABLE)
@@ -119,23 +118,25 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
          (GETPROMPTWINDOW WINDOW)
          WINDOW])
 
-(COMPARETEXT.TEXTOBJ

+(COMPARETEXT.TSTREAM

-  [LAMBDA (NODE WINDOW INCOL1)
                               (* ; "Edited 23-Jun-2022 17:20 by rmk")


+  [LAMBDA (NODE WINDOW INCOL1)
                               (* ; "Edited  2-Nov-2022 00:11 by rmk")


+                                                             (* ; "Edited 23-Jun-2022 17:20 by rmk")


                                                              (* ; "Edited 18-Feb-2022 17:05 by rmk")


                                                              (* ; "Edited 30-Jan-2022 09:03 by rmk")


                                                              (* ; "Edited 28-Jan-2022 22:37 by rmk")

 
-    (* ;; "Returns the text object for the chunk column in the graphwindow WINDOW, on the left if INCOL1.  If the windows are automatic, they are lined up under the middle of WINDOW.")

+    (* ;; "Returns the text stream for the chunk column in the graphwindow WINDOW, on the left if INCOL1.  If the windows are automatic, they are lined up under the middle of WINDOW.")

 
     (DECLARE
 (USEDFREE COMPARETEXT.AUTOTEDIT))
-    (LET (TEXTOBJ TSTREAM TWINDOW REGION REGIONARGS TEXTWIDTH TEXTHEIGHT (GRAPH (WINDOWPROP
+    (LET [TWINDOW REGION REGIONARGS TEXTWIDTH TEXTHEIGHT (GRAPH (WINDOWPROP WINDOW 'GRAPH))
-                                                                                 WINDOW
+                (NODEID (FETCH
 (GRAPHNODE NODEID) OF
 NODE))
-                                                                                 'GRAPH))
+                (TSTREAM (WINDOWPROP WINDOW (CL:IF INCOL1
-                (NODEID (FETCH
 (GRAPHNODE NODEID) OF
 NODE)))
+                                                'COL1TSTREAM
-         (CL:UNLESS [AND [SETQ TEXTOBJ (WINDOWPROP WINDOW (CL:IF INCOL1
+                                                'COL2TSTREAM)]
-                                                              'COL1TEXTOBJ
+         (CL:UNLESS (AND TSTREAM (OPENWP (WFROMDS TSTREAM)))
-                                                              'COL2TEXTOBJ)]
+
-                         (OPENWP (WFROMDS (TEXTSTREAM TEXTOBJ]
+             (* ;; "First time, we have the graph but we don't yet have the TEDIT stream and window")

+
              (SETQ TEXTWIDTH (OR (GRAPHERPROP GRAPH 'TEXTWIDTH)
                                  700))
              (SETQ TEXTHEIGHT (OR (GRAPHERPROP GRAPH 'TEXTHEIGHT)
@@ -152,39 +153,40 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
              (SETQ REGION (CL:IF COMPARETEXT.AUTOTEDIT
                               (RELCREATEREGION REGIONARGS)
                               (RELGETREGION REGIONARGS)))
+
+             (* ;; "If the CAR is a FIXP, this is a chunk node.  Otherwise, it is one of the two file-name column headers.")

+
              [SETQ TSTREAM (TEXTSTREAM (TEDIT (CL:IF (FIXP (CAR NODEID))
                                                   (FETCH
 (IMCOMPARE.CHUNK FILENAME) of
 NODEID)
                                                   NODEID)
                                               REGION NIL `(READONLY T LEAVETTY T]
              (SETQ TWINDOW (WFROMDS TSTREAM))
-             (SETQ TEXTOBJ (TEXTOBJ TSTREAM))
              (WINDOWPROP WINDOW (CL:IF INCOL1
-                                    'COL1TEXTOBJ
+                                    'COL1TSTREAM
-                                    'COL2TEXTOBJ)
+                                    'COL2TSTREAM)
-                    TEXTOBJ)
+                    TSTREAM)
              [WINDOWPROP TWINDOW 'TITLE (CL:IF INCOL1
                                             (CADR (GRAPHERPROP GRAPH 'FILELABELS))
                                             (CADDR (GRAPHERPROP GRAPH 'FILELABELS)))]
              (MOVEWITH TWINDOW WINDOW)
              (CLOSEWITH TWINDOW WINDOW))
-         TEXTOBJ])
+         TSTREAM])
 
 (COMPARETEXT.SETSEL

-  [LAMBDA (TEXTOBJ NODE)                                     (* ; "Edited 25-Dec-2021 10:52 by rmk")

+  [LAMBDA (TSTREAM NODE)
                                     (* ; "Edited  2-Nov-2022 10:07 by rmk")


-
+                                                             (* ; "Edited 25-Dec-2021 10:52 by rmk")

-    (* ;; "25 so that we normalize with a little bit of context")

-
     (LET* ((CHUNK (FETCH
 (GRAPHNODE NODEID) OF
 NODE))
            (FILEPTR (fetch
 (IMCOMPARE.CHUNK FILEPTR) of
 CHUNK)))
-          (TEDIT.SETSEL TEXTOBJ (IMAX 1 (IDIFFERENCE FILEPTR 25))
+
+          (* ;; "The first selection just makes sure that at least 25 characters before the chunk will be on the screen.  The second causes only the characters of the actual chunk to be underlined and shown.  ")

+
+          (TEDIT.SETSEL TSTREAM (IMAX 1 (IDIFFERENCE FILEPTR 25))
                  0
                  'LEFT)
-          (TEDIT.NORMALIZECARET TEXTOBJ)
+          (TEDIT.NORMALIZECARET TSTREAM)
-          (TEDIT.SETSEL TEXTOBJ FILEPTR (fetch
 (IMCOMPARE.CHUNK CHUNKLENGTH) of
 CHUNK)
+          (TEDIT.SETSEL TSTREAM FILEPTR (fetch
 (IMCOMPARE.CHUNK CHUNKLENGTH) of
 CHUNK)
                  'LEFT)
-          (TEDIT.NORMALIZECARET TEXTOBJ)
+          (TEDIT.NORMALIZECARET TSTREAM])
-          (AND NIL (TTY.PROCESS (WINDOWPROP (CAR (fetch
 (TEXTOBJ \WINDOW) of
 TEXTOBJ))
-                                       'PROCESS])
 
 (CHUNKNODELABEL

   [LAMBDA (CHUNK MIN.LENGTH EXTENDER)                        (* ; "Edited 25-Dec-2021 11:56 by rmk")

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

-  [LAMBDA (CHUNK HASH.TYPE)
                                  (* ; "Edited 20-Jan-2022 23:09 by rmk")


+  [LAMBDA (CHUNK HASH.TYPE)
                                  (* ; "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")


                                                              (* ; "Edited 23-Dec-98 16:54 by rmk:")

@@ -305,7 +308,8 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
 
     (RESETLST
         (BIND
 (FILENAME _ (fetch
 (IMCOMPARE.CHUNK FILENAME) of
 CHUNK))
-              STREAM ENDPOS FIRST
 [RESETSAVE (SETQ STREAM (OPENSTREAM FILENAME 'INPUT 'OLD))
+              STREAM ENDPOS FIRST
 [RESETSAVE [SETQ STREAM (OPENSTREAM FILENAME 'INPUT 'OLD
+                                                                 '((ENDOFSTREAMOP NILL]
                                          '(PROGN (CLOSEF? OLDVALUE]
                                   (CL:WHEN (\TEDIT.FORMATTEDP1 STREAM)
                                                              (* ; 
@@ -457,9 +461,10 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
                 T NIL])
 
 (IMCOMPARE.HASH

-  [LAMBDA (STREAM HASH.TYPE ENDPOS)                          (* ; "Edited 19-Dec-2021 09:07 by rmk")

+  [LAMBDA (STREAM HASH.TYPE ENDPOS)
                          (* ; "Edited 18-Oct-2023 17:44 by rmk")


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

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


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

+                                                             (* ; "Edited 15-Dec-2021 15:58 by rmk")


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


                                                              (* ; "Edited 23-Dec-98 16:58 by rmk:")

 
     (* ;; "IMCOMPARE.HASH automatically stops before reading char number EOF.PTR.")

@@ -483,7 +488,8 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
 
                                                   "Paragraph chunks end with two consecutive EOL's.")

                        (BIND
 EOLSEEN WHILE
 (IGREATERP NBYTES 0)
                           DO
 (SELCHARQ (SETQ C (\INCCODE.EOLC STREAM NIL 'NBYTES NBYTES))
-                                  (EOL (CL:WHEN EOLSEEN (RETURN))
+                                  ((EOL NIL) 
+                                       (CL:WHEN EOLSEEN (RETURN))
                                        (SETQ EOLSEEN T)      (* ; "Skip the NIL SETQ below")

                                        (GO $$ITERATE))
                                   ((SPACE TAB))
@@ -635,6 +641,8 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
 (IMCOMPARE.LEFTBUTTONFN

   [LAMBDA (NODE WINDOW)
 
+    (* ;; "Edited  1-Nov-2022 22:29 by rmk")

+
     (* ;; "Edited 23-Jun-2022 22:50 by rmk: Turn off previous selection before turning on new one")

 
     (* ;; "Edited 25-Dec-2021 23:29 by rmk")

@@ -647,14 +655,14 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
         (LET ([INCOL1 (EQ (GRAPHERPROP (WINDOWPROP WINDOW 'GRAPH)
                                  'COL1X)
                           (FETCH
 (POSITION XCOORD) OF
 (FETCH
 (GRAPHNODE NODEPOSITION) OF
 NODE]
-              TEXTOBJ)
+              TSTREAM)
 
              (* ;; "Turn off any previous selection")

 
-             (CL:WHEN (SETQ TEXTOBJ (WINDOWPROP WINDOW 'COL1TEXTOBJ))
+             (CL:WHEN (SETQ TSTREAM (WINDOWPROP WINDOW 'COL1TSTREAM))
-                 (TEDIT.SHOWSEL (TEXTSTREAM TEXTOBJ)))
+                    (TEDIT.SHOWSEL TSTREAM))
-             (CL:WHEN (SETQ TEXTOBJ (WINDOWPROP WINDOW 'COL2TEXTOBJ))
+             (CL:WHEN (SETQ TSTREAM (WINDOWPROP WINDOW 'COL2TSTREAM))
-                 (TEDIT.SHOWSEL (TEXTSTREAM TEXTOBJ)))
+                    (TEDIT.SHOWSEL TSTREAM))
              (IF
 (FIXP (CAR (fetch
 (GRAPHNODE NODEID) of
 NODE)))
                  THEN
 (IMCOMPARE.BOXNODE
 WINDOW NODE (FOR
 N (YPOS _ (FETCH
 YCOORD
                                                                        OF
 (FETCH
 NODEPOSITION
@@ -669,17 +677,17 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
                                                            (* ;; 
 
                                   "We won't match the other label node because it has a unique ypos")

 
-                                                           (COMPARETEXT.SETSEL
 (COMPARETEXT.TEXTOBJ

+                                                           (COMPARETEXT.SETSEL
 (COMPARETEXT.TSTREAM

                                                                                 N WINDOW (NOT INCOL1)
                                                                                 )
                                                                   N)
                                                            (RETURN N)))
-                      (COMPARETEXT.SETSEL
 (COMPARETEXT.TEXTOBJ
 NODE WINDOW INCOL1)
+                      (COMPARETEXT.SETSEL
 (COMPARETEXT.TSTREAM
 NODE WINDOW INCOL1)
                              NODE)
                ELSE
 
                     (* ;; "The column header, set up the file window with no selection.")

 
-                    (COMPARETEXT.TEXTOBJ
 NODE WINDOW INCOL1))))])
+                    (COMPARETEXT.TSTREAM
 NODE WINDOW INCOL1))))])
 
 (IMCOMPARE.MIDDLEBUTTONFN

   [LAMBDA (NODE WINDOW)                                      (* ; "Edited 27-Dec-2021 11:59 by rmk")

@@ -776,12 +784,12 @@ Copyright (c) 1984-1985, 1993, 1998 by Xerox Corporation.
 )
 (PUTPROPS COMPARETEXT COPYRIGHT ("Xerox Corporation" 1984 1985 1993 1998))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1473 40549 (COMPARETEXT 1483 . 3123) (COMPARETEXT.WINDOW 3125 . 6923) (
+  (FILEMAP (NIL (1318 40954 (COMPARETEXT 1328 . 2968) (COMPARETEXT.WINDOW 2970 . 6768) (
-COMPARETEXT.TEXTOBJ 6925 . 10067) (COMPARETEXT.SETSEL 10069 . 10859) (CHUNKNODELABEL 10861 . 11982) (
+COMPARETEXT.TSTREAM 6770 . 9991) (COMPARETEXT.SETSEL 9993 . 10898) (CHUNKNODELABEL 10900 . 12021) (
-IMCOMPARE.BOXNODE 11984 . 12960) (IMCOMPARE.CHUNKS 12962 . 17570) (IMCOMPARE.COLLECT.HASH.CHUNKS 17572
+IMCOMPARE.BOXNODE 12023 . 12999) (IMCOMPARE.CHUNKS 13001 . 17609) (IMCOMPARE.COLLECT.HASH.CHUNKS 17611
- . 20489) (IMCOMPARE.DISPLAYGRAPH 20491 . 28570) (IMCOMPARE.HASH 28572 . 32759) (
+ . 20723) (IMCOMPARE.DISPLAYGRAPH 20725 . 28804) (IMCOMPARE.HASH 28806 . 33164) (
-IMCOMPARE.MERGE.CONNECTED.CHUNKS 32761 . 36257) (IMCOMPARE.MERGE.UNCONNECTED.CHUNKS 36259 . 38214) (
+IMCOMPARE.MERGE.CONNECTED.CHUNKS 33166 . 36662) (IMCOMPARE.MERGE.UNCONNECTED.CHUNKS 36664 . 38619) (
-IMCOMPARE.SHOW.DIST 38216 . 38662) (IMCOMPARE.UPDATE.SYMBOL.TABLE 38664 . 40547)) (40550 47004 (
+IMCOMPARE.SHOW.DIST 38621 . 39067) (IMCOMPARE.UPDATE.SYMBOL.TABLE 39069 . 40952)) (40955 47439 (
-IMCOMPARE.LEFTBUTTONFN 40560 . 43434) (IMCOMPARE.MIDDLEBUTTONFN 43436 . 46552) (IMCOMPARE.COPYBUTTONFN
+IMCOMPARE.LEFTBUTTONFN 40965 . 43869) (IMCOMPARE.MIDDLEBUTTONFN 43871 . 46987) (IMCOMPARE.COPYBUTTONFN
- 46554 . 47002)) (47057 47748 (TAIL1 47067 . 47421) (TAIL2 47423 . 47746)))))
+ 46989 . 47437)) (47492 48183 (TAIL1 47502 . 47856) (TAIL2 47858 . 48181)))))
 STOP

run-medley

@@ -163,6 +163,10 @@ if [ -z "$geometry" ] ; then
     screensize="-sc 1440x900"
 fi
 
+if [ -z "${LDEKBDTYPE}" ]; then
+    export LDEKBDTYPE="X"
+fi
+
 if ! command -v "$prog" > /dev/null 2>&1; then
     # if lde is already on path, don't reset it
     # otherwise check for MAIKODIR

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/ADIR

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "14-Sep-2023 23:20:17" {WMEDLEY}<sources>ADIR.;30
 67297  
+
(FILECREATED "13-Nov-2023 20:28:57" {WMEDLEY}<sources>ADIR.;31
 67473  
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS \COPYSYS)
+      :CHANGES-TO (FNS UNPACKFILENAME.STRING)
 
-      :PREVIOUS-DATE "14-Sep-2023 22:56:19" {WMEDLEY}<sources>ADIR.;29)
+      :PREVIOUS-DATE "14-Sep-2023 23:20:17" {WMEDLEY}<sources>ADIR.;30)
 
 
 (PRETTYCOMPRINT ADIRCOMS)
@@ -317,7 +317,8 @@
 (DEFINEQ
 
 (UNPACKFILENAME.STRING

-  [LAMBDA (FILE ONEFIELDFLG DIRFLG OSTYPE PACKFLG CLFLG)
     (* ; "Edited 28-Apr-2022 11:40 by rmk")


+  [LAMBDA (FILE ONEFIELDFLG DIRFLG OSTYPE PACKFLG CLFLG)
     (* ; "Edited 13-Nov-2023 20:28 by rmk")


+                                                             (* ; "Edited 28-Apr-2022 11:40 by rmk")


                                                              (* ; "Edited 24-Apr-2022 14:11 by rmk")

 
     (* ;; "")

@@ -514,7 +515,8 @@
                           (CL:UNLESS (EQ NAMESTART $$OFFSET) (* ; 
 
                                                            "Allow  . in first NAME position :  .git")

                               (SETQ NAMEEND (SUB1 $$OFFSET))
-                              (SETQ EXTENSIONSTART $$OFFSET)))
+                              (SETQ EXTENSIONSTART $$OFFSET)
+                              (SETQ EXTENSIONEND NIL)))
                       (; (CL:WHEN VERSIONSTART               (* ; "What about x;1;2")

 
                              (* ;; "This gives old behavior is NAME=x, VERSION=1;2")

@@ -1250,14 +1252,14 @@
 (ADDTOVAR LAMA
 PACKFILENAME.STRING PACKFILENAME)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3106 15763 (DELFILE 3116 . 3277) (FULLNAME 3279 . 3646) (INFILE 3648 . 3907) (INFILEP 
+  (FILEMAP (NIL (3119 15776 (DELFILE 3129 . 3290) (FULLNAME 3292 . 3659) (INFILE 3661 . 3920) (INFILEP 
-3909 . 4044) (IOFILE 4046 . 4297) (OPENFILE 4299 . 4602) (OPENSTREAM 4604 . 8944) (OUTFILE 8946 . 9208
+3922 . 4057) (IOFILE 4059 . 4310) (OPENFILE 4312 . 4615) (OPENSTREAM 4617 . 8957) (OUTFILE 8959 . 9221
-) (OUTFILEP 9210 . 9346) (RENAMEFILE 9348 . 9654) (SIMPLE.FINDFILE 9656 . 10066) (VMEMSIZE 10068 . 
+) (OUTFILEP 9223 . 9359) (RENAMEFILE 9361 . 9667) (SIMPLE.FINDFILE 9669 . 10079) (VMEMSIZE 10081 . 
-10235) (\COPYSYS 10237 . 14482) (\FLUSHVM 14484 . 15556) (\LOGOUT0 15558 . 15761)) (16221 38126 (
+10248) (\COPYSYS 10250 . 14495) (\FLUSHVM 14497 . 15569) (\LOGOUT0 15571 . 15774)) (16234 38302 (
-UNPACKFILENAME.STRING 16231 . 35505) (\UPF.DIRECTORY 35507 . 38124)) (39654 42326 (UNPACKFILENAME 
+UNPACKFILENAME.STRING 16244 . 35681) (\UPF.DIRECTORY 35683 . 38300)) (39830 42502 (UNPACKFILENAME 
-39664 . 39850) (LASTCHPOS 39852 . 40546) (FILENAMEFIELD 40548 . 41033) (FILENAMEFIELD.STRING 41035 . 
+39840 . 40026) (LASTCHPOS 40028 . 40722) (FILENAMEFIELD 40724 . 41209) (FILENAMEFIELD.STRING 41211 . 
-41614) (PACKFILENAME 41616 . 41959) (PACKFILENAME.STRING 41961 . 42324)) (56796 57709 (
+41790) (PACKFILENAME 41792 . 42135) (PACKFILENAME.STRING 42137 . 42500)) (56972 57885 (
-FILEDIRCASEARRAY 56806 . 57707)) (57876 65056 (LOGOUT 57886 . 58803) (MAKESYS 58805 . 60434) (SYSOUT 
+FILEDIRCASEARRAY 56982 . 57883)) (58052 65232 (LOGOUT 58062 . 58979) (MAKESYS 58981 . 60610) (SYSOUT 
-60436 . 61988) (SAVEVM 61990 . 62790) (HERALD 62792 . 62952) (INTERPRET.REM.CM 62954 . 64679) (
+60612 . 62164) (SAVEVM 62166 . 62966) (HERALD 62968 . 63128) (INTERPRET.REM.CM 63130 . 64855) (
-\USEREVENT 64681 . 65054)) (65238 66965 (USERNAME 65248 . 66204) (SETUSERNAME 66206 . 66963)))))
+\USEREVENT 64857 . 65230)) (65414 67141 (USERNAME 65424 . 66380) (SETUSERNAME 66382 . 67139)))))
 STOP

sources/ADISPLAY

@@ -1,18 +1,15 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 1-Mar-2023 07:49:03" {DSK}<home>larry>il>medley>sources>ADISPLAY.;2
 245335 
+
(FILECREATED " 2-Nov-2023 23:35:15" {WMEDLEY}<sources>ADISPLAY.;12
 245350 
 
-      :EDIT-BY "lmm"
+      :EDIT-BY rmk
 
-      :CHANGES-TO (FNS \DRAWLINE.DISPLAY)
+      :CHANGES-TO (VARS ADISPLAYCOMS)
+                  (FNS SCREENREGIONP)
 
-      :PREVIOUS-DATE "28-Feb-2023 06:37:11" {DSK}<home>larry>il>medley>sources>ADISPLAY.;1)
+      :PREVIOUS-DATE " 1-Mar-2023 07:49:03" {WMEDLEY}<sources>ADISPLAY.;11)
 
 
-(* ; "
-Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation.
-")
-
 (PRETTYCOMPRINT ADISPLAYCOMS)
 
 (RPAQQ ADISPLAYCOMS

@@ -23,6 +20,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
         (COMS                                                (* ; "Interlisp-D dependent stuff.")

               (EXPORT (RECORDS REGION BITMAP BITMAPWORD POSITION CURSOR MOUSEEVENT SCREENREGION 
                              SCREENPOSITION))
+              (FNS SCREENREGIONP)
               (SYSRECORDS PILOTBBT \DISPLAYDATA)
               (CONSTANTS (BITSPERINTEGER 32))
               (FNS \BBTCURVEPT)
@@ -207,6 +205,13 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 
 (* "END EXPORTED DEFINITIONS")
 
+(DEFINEQ
+
+(SCREENREGIONP

+  [LAMBDA (X)
                                                (* ; "Edited  2-Nov-2023 23:34 by rmk")

+    (CL:WHEN (type?
 SCREENREGION X)
+           X])
+)
 (ADDTOVAR SYSTEMRECLST
 
 (DATATYPE PILOTBBT
 ((PBTDESTLO WORD)
@@ -4431,43 +4436,41 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 
 (ADDTOVAR LAMA
 UNIONREGIONS INTERSECTREGIONS)
 )
-(PUTPROPS ADISPLAY COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 1991
- 1993 1994 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (12060 19421 (\BBTCURVEPT 12070 . 19419)) (19422 29238 (CREATETEXTUREFROMBITMAP 19432 . 
+  (FILEMAP (NIL (10558 10752 (SCREENREGIONP 10568 . 10750)) (12196 19557 (\BBTCURVEPT 12206 . 19555)) (
-21362) (PRINTBITMAP 21364 . 22715) (PRINT-BITMAPS-NICELY 22717 . 26568) (PRINTCURSOR 26570 . 27603) (
+19558 29374 (CREATETEXTUREFROMBITMAP 19568 . 21498) (PRINTBITMAP 21500 . 22851) (PRINT-BITMAPS-NICELY 
-\WRITEBITMAP 27605 . 29236)) (29281 31829 (\GETINTEGERPART 29291 . 30836) (\CONVERTTOFRACTION 30838 . 
+22853 . 26704) (PRINTCURSOR 26706 . 27739) (\WRITEBITMAP 27741 . 29372)) (29417 31965 (\GETINTEGERPART
-31827)) (31966 32838 (CURSORP 31976 . 32195) (CURSORBITMAP 32197 . 32243) (CreateCursorBitMap 32245 . 
+ 29427 . 30972) (\CONVERTTOFRACTION 30974 . 31963)) (32102 32974 (CURSORP 32112 . 32331) (CURSORBITMAP
-32836)) (37200 46243 (CARET 37210 . 38970) (\CARET.CREATE 38972 . 39150) (\CARET.DOWN 39152 . 40504) (
+ 32333 . 32379) (CreateCursorBitMap 32381 . 32972)) (37336 46379 (CARET 37346 . 39106) (\CARET.CREATE 
-\CARET.FLASH? 40506 . 42320) (\CARET.SHOW 42322 . 42891) (CARETRATE 42893 . 43551) (\CARET.FLASH.AGAIN
+39108 . 39286) (\CARET.DOWN 39288 . 40640) (\CARET.FLASH? 40642 . 42456) (\CARET.SHOW 42458 . 43027) (
- 43553 . 44719) (\CARET.FLASH.MULTIPLE 44721 . 45244) (\CARET.FLASH 45246 . 46241)) (46244 51316 (
+CARETRATE 43029 . 43687) (\CARET.FLASH.AGAIN 43689 . 44855) (\CARET.FLASH.MULTIPLE 44857 . 45380) (
-\MEDW.CARET.SHOW 46254 . 51314)) (51680 53515 (\AREAVISIBLE? 51690 . 52614) (\REGIONOVERLAPAREAP 52616
+\CARET.FLASH 45382 . 46377)) (46380 51452 (\MEDW.CARET.SHOW 46390 . 51450)) (51816 53651 (
- . 53161) (\AREAINREGIONP 53163 . 53513)) (53564 66040 (CREATEREGION 53574 . 53910) (REGIONP 53912 . 
+\AREAVISIBLE? 51826 . 52750) (\REGIONOVERLAPAREAP 52752 . 53297) (\AREAINREGIONP 53299 . 53649)) (
-54058) (INTERSECTREGIONS 54060 . 56830) (UNIONREGIONS 56832 . 58983) (REGIONSINTERSECTP 58985 . 59593)
+53700 66176 (CREATEREGION 53710 . 54046) (REGIONP 54048 . 54194) (INTERSECTREGIONS 54196 . 56966) (
- (SUBREGIONP 59595 . 60240) (EXTENDREGION 60242 . 62399) (EXTENDREGIONBOTTOM 62401 . 63043) (
+UNIONREGIONS 56968 . 59119) (REGIONSINTERSECTP 59121 . 59729) (SUBREGIONP 59731 . 60376) (EXTENDREGION
-EXTENDREGIONLEFT 63045 . 63664) (EXTENDREGIONRIGHT 63666 . 64219) (EXTENDREGIONTOP 64221 . 64762) (
+ 60378 . 62535) (EXTENDREGIONBOTTOM 62537 . 63179) (EXTENDREGIONLEFT 63181 . 63800) (EXTENDREGIONRIGHT
-INSIDEP 64764 . 65532) (STRINGREGION 65534 . 66038)) (66285 71559 (\BRUSHBITMAP 66295 . 68012) (
+ 63802 . 64355) (EXTENDREGIONTOP 64357 . 64898) (INSIDEP 64900 . 65668) (STRINGREGION 65670 . 66174)) 
-\GETBRUSH 68014 . 68325) (\GETBRUSHBBT 68327 . 70355) (\InitCurveBrushes 70357 . 71423) (
+(66421 71695 (\BRUSHBITMAP 66431 . 68148) (\GETBRUSH 68150 . 68461) (\GETBRUSHBBT 68463 . 70491) (
-\BrushFromWidth 71425 . 71557)) (71560 74627 (\MAKEBRUSH.DIAGONAL 71570 . 71850) (
+\InitCurveBrushes 70493 . 71559) (\BrushFromWidth 71561 . 71693)) (71696 74763 (\MAKEBRUSH.DIAGONAL 
-\MAKEBRUSH.HORIZONTAL 71852 . 72246) (\MAKEBRUSH.VERTICAL 72248 . 72560) (\MAKEBRUSH.SQUARE 72562 . 
+71706 . 71986) (\MAKEBRUSH.HORIZONTAL 71988 . 72382) (\MAKEBRUSH.VERTICAL 72384 . 72696) (
-72839) (\MAKEBRUSH.ROUND 72841 . 74625)) (74628 75793 (INSTALLBRUSH 74638 . 75791)) (76194 87596 (
+\MAKEBRUSH.SQUARE 72698 . 72975) (\MAKEBRUSH.ROUND 72977 . 74761)) (74764 75929 (INSTALLBRUSH 74774 . 
-\DRAWLINE.DISPLAY 76204 . 86311) (RELMOVETO 86313 . 86700) (MOVETOUPPERLEFT 86702 . 87594)) (87597 
+75927)) (76330 87732 (\DRAWLINE.DISPLAY 76340 . 86447) (RELMOVETO 86449 . 86836) (MOVETOUPPERLEFT 
-111082 (\CLIPANDDRAWLINE 87607 . 94053) (\CLIPANDDRAWLINE1 94055 . 105803) (\CLIPCODE 105805 . 107179)
+86838 . 87730)) (87733 111218 (\CLIPANDDRAWLINE 87743 . 94189) (\CLIPANDDRAWLINE1 94191 . 105939) (
- (\LEASTPTAT 107181 . 107779) (\GREATESTPTAT 107781 . 108409) (\DRAWLINE1 108411 . 109527) (
+\CLIPCODE 105941 . 107315) (\LEASTPTAT 107317 . 107915) (\GREATESTPTAT 107917 . 108545) (\DRAWLINE1 
-\DRAWLINE.UFN 109529 . 111080)) (115612 161659 (\DRAWCIRCLE.DISPLAY 115622 . 124435) (\DRAWARC.DISPLAY
+108547 . 109663) (\DRAWLINE.UFN 109665 . 111216)) (115748 161795 (\DRAWCIRCLE.DISPLAY 115758 . 124571)
- 124437 . 124727) (\DRAWARC.GENERIC 124729 . 125482) (\COMPUTE.ARC.POINTS 125484 . 127749) (
+ (\DRAWARC.DISPLAY 124573 . 124863) (\DRAWARC.GENERIC 124865 . 125618) (\COMPUTE.ARC.POINTS 125620 . 
-\DRAWELLIPSE.DISPLAY 127751 . 143420) (\DRAWCURVE.DISPLAY 143422 . 145711) (\DRAWPOINT.DISPLAY 145713
+127885) (\DRAWELLIPSE.DISPLAY 127887 . 143556) (\DRAWCURVE.DISPLAY 143558 . 145847) (
- . 146909) (\DRAWPOLYGON.DISPLAY 146911 . 150439) (\LINEWITHBRUSH 150441 . 161657)) (161660 193352 (
+\DRAWPOINT.DISPLAY 145849 . 147045) (\DRAWPOLYGON.DISPLAY 147047 . 150575) (\LINEWITHBRUSH 150577 . 
-LOADPOLY 161670 . 162230) (PARAMETRICSPLINE 162232 . 172429) (\CURVE 172431 . 178033) (\CURVE2 178035
+161793)) (161796 193488 (LOADPOLY 161806 . 162366) (PARAMETRICSPLINE 162368 . 172565) (\CURVE 172567
- . 189366) (\CURVEEND 189368 . 189850) (\CURVESLOPE 189852 . 192335) (\CURVESTART 192337 . 192661) (
+ . 178169) (\CURVE2 178171 . 189502) (\CURVEEND 189504 . 189986) (\CURVESLOPE 189988 . 192471) (
-\FDIFS/FROM/DERIVS 192663 . 193350)) (205881 220217 (\FILLCIRCLE.DISPLAY 205891 . 216639) (\LINEBLT 
+\CURVESTART 192473 . 192797) (\FDIFS/FROM/DERIVS 192799 . 193486)) (206017 220353 (\FILLCIRCLE.DISPLAY
-216641 . 220215)) (220261 222261 (SCREENBITMAP 220271 . 220748) (BITMAPP 220750 . 220984) (
+ 206027 . 216775) (\LINEBLT 216777 . 220351)) (220397 222397 (SCREENBITMAP 220407 . 220884) (BITMAPP 
-BITMAPHEIGHT 220986 . 221362) (BITSPERPIXEL 221364 . 222259)) (222902 223895 (DSPFILL 222912 . 223595)
+220886 . 221120) (BITMAPHEIGHT 221122 . 221498) (BITSPERPIXEL 221500 . 222395)) (223038 224031 (
- (INVERTW 223597 . 223893)) (223896 227539 (\DSPCOLOR.DISPLAY 223906 . 225203) (\DSPBACKCOLOR.DISPLAY 
+DSPFILL 223048 . 223731) (INVERTW 223733 . 224029)) (224032 227675 (\DSPCOLOR.DISPLAY 224042 . 225339)
-225205 . 226584) (DSPEOLFN 226586 . 227537)) (227972 232626 (DSPCLEOL 227982 . 228858) (DSPRUBOUTCHAR 
+ (\DSPBACKCOLOR.DISPLAY 225341 . 226720) (DSPEOLFN 226722 . 227673)) (228108 232762 (DSPCLEOL 228118
-228860 . 229292) (\DSPMOVELR 229294 . 232624)) (232756 233874 (\CURSOR.DEFPRINT 232766 . 233872)) (
+ . 228994) (DSPRUBOUTCHAR 228996 . 229428) (\DSPMOVELR 229430 . 232760)) (232892 234010 (
-234286 242860 (TEXTUREOFCOLOR 234296 . 235558) (\PRIMARYTEXTURE 235560 . 236142) (\LEVELTEXTURE 236144
+\CURSOR.DEFPRINT 232902 . 234008)) (234422 242996 (TEXTUREOFCOLOR 234432 . 235694) (\PRIMARYTEXTURE 
- . 236645) (INSURE.B&W.TEXTURE 236647 . 238042) (INSURE.RGB.COLOR 238044 . 239472) (\LOOKUPCOLORNAME 
+235696 . 236278) (\LEVELTEXTURE 236280 . 236781) (INSURE.B&W.TEXTURE 236783 . 238178) (
-239474 . 239744) (RGBP 239746 . 240511) (HLSP 240513 . 240888) (HLSTORGB 240890 . 242030) (\HLSVALUEFN
+INSURE.RGB.COLOR 238180 . 239608) (\LOOKUPCOLORNAME 239610 . 239880) (RGBP 239882 . 240647) (HLSP 
- 242032 . 242858)))))
+240649 . 241024) (HLSTORGB 241026 . 242166) (\HLSVALUEFN 242168 . 242994)))))
 STOP

sources/EXTERNALFORMAT

@@ -1,12 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "10-Oct-2022 18:10:56" 
+
(FILECREATED " 6-Dec-2023 23:57:52" {WMEDLEY}<sources>EXTERNALFORMAT.;82
 37884  
-{DSK}<cygdrive>c>Users>Larry>home>MEDLEY>SOURCES>EXTERNALFORMAT.;76
 37395  
 
-      :CHANGES-TO (FNS SYSTEM-EXTERNALFORMAT)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "24-Jul-2022 14:56:07" 
+      :CHANGES-TO (MACROS \CHECKEOLC)
-{DSK}<cygdrive>c>Users>Larry>home>MEDLEY>SOURCES>EXTERNALFORMAT.;75)
+                  (FNS \CHECKEOLC.CRLF)
+
+      :PREVIOUS-DATE "23-Oct-2023 17:07:12" {WMEDLEY}<sources>EXTERNALFORMAT.;79)
 
 
 (PRETTYCOMPRINT EXTERNALFORMATCOMS)
@@ -519,9 +520,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 +533,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 +547,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 +568,15 @@
 
                       (IF
 COUNTP
                           THEN
 (LET (NUMLFBYTES)
-                                        (DECLARE
 (SPECVARS NUMLFBYTES))
+                                    (DECLARE
 (SPECVARS NUMLFBYTES))
-                                        (\INCCODE
 STREAM 'NUMLFBYTES 0)
+                                    (\INCCODE
 STREAM 'NUMLFBYTES 0)
-                                        (ADD
 *BYTECOUNTER* NUMLFBYTES))
+                                    (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 +589,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 +720,13 @@
 (\CREATE.THROUGH.EXTERNALFORMAT
)
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (6559 13194 (\EXTERNALFORMAT 6569 . 10347) (MAKE-EXTERNALFORMAT 10349 . 12721) (
+  (FILEMAP (NIL (6547 13182 (\EXTERNALFORMAT 6557 . 10335) (MAKE-EXTERNALFORMAT 10337 . 12709) (
-\EXTERNALFORMAT.DEFPRINT 12723 . 13192)) (13195 16236 (\INSTALL.EXTERNALFORMAT 13205 . 14654) (
+\EXTERNALFORMAT.DEFPRINT 12711 . 13180)) (13183 16224 (\INSTALL.EXTERNALFORMAT 13193 . 14642) (
-\REMOVE.EXTERNALFORMAT 14656 . 15487) (FIND-FORMAT 15489 . 16234)) (16237 16649 (SYSTEM-EXTERNALFORMAT
+\REMOVE.EXTERNALFORMAT 14644 . 15475) (FIND-FORMAT 15477 . 16222)) (16225 16637 (SYSTEM-EXTERNALFORMAT
- 16247 . 16647)) (16998 31818 (\OUTCHAR 17008 . 18225) (\INCCODE 18227 . 19380) (\BACKCCODE 19382 . 
+ 16235 . 16635)) (16986 32303 (\OUTCHAR 16996 . 18213) (\INCCODE 18215 . 19368) (\BACKCCODE 19370 . 
-20951) (\BACKCCODE.EOLC 20953 . 23143) (\PEEKCCODE 23145 . 23470) (\PEEKCCODE.EOLC 23472 . 23851) (
+20939) (\BACKCCODE.EOLC 20941 . 23131) (\PEEKCCODE 23133 . 23458) (\PEEKCCODE.EOLC 23460 . 23839) (
-\INCCODE.EOLC 23853 . 25652) (\FORMATBYTESTREAM 25654 . 27789) (\FORMATBYTESTRING 27791 . 29250) (
+\INCCODE.EOLC 23841 . 25640) (\FORMATBYTESTREAM 25642 . 27777) (\FORMATBYTESTRING 27779 . 29238) (
-\CHECKEOLC.CRLF 29252 . 31816)) (33096 35332 (\NULLDEVICE 33106 . 35008) (\NULL.OPENFILE 35010 . 35330
+\CHECKEOLC.CRLF 29240 . 32301)) (33585 35821 (\NULLDEVICE 33595 . 35497) (\NULL.OPENFILE 35499 . 35819
-)) (35472 37299 (\CREATE.THROUGH.EXTERNALFORMAT 35482 . 36268) (\THROUGHIN 36270 . 36690) (
+)) (35961 37788 (\CREATE.THROUGH.EXTERNALFORMAT 35971 . 36757) (\THROUGHIN 36759 . 37179) (
-\THROUGHBACKCCODE 36692 . 36959) (\THROUGHOUTCHARFN 36961 . 37297)))))
+\THROUGHBACKCCODE 37181 . 37448) (\THROUGHOUTCHARFN 37450 . 37786)))))
 STOP

sources/FILEIO

@@ -1,10 +1,12 @@
 (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 "25-Aug-2023 08:47:31" {WMEDLEY}<sources>FILEIO.;119
 162381 
 
-      :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 \DO.PARAMS.AT.OPEN PUTSTREAMPROP GETSTREAMPROP)
+
+      :PREVIOUS-DATE "11-Oct-2022 11:34:00" {WMEDLEY}<sources>FILEIO.;118)
 
 
 (* ; "
@@ -580,18 +582,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 +610,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 +1450,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 +1460,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 +1484,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

@@ -3095,39 +3104,39 @@ update the map")

 (PUTPROPS FILEIO COPYRIGHT ("Venue & Xerox Corporation" 1981 1982 1983 1984 1985 1986 1987 1988 1989 
 1990 1991 1992 1993 1999 2020 2021 2022))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (27805 31611 (STREAMPROP 27815 . 28249) (GETSTREAMPROP 28251 . 28846) (PUTSTREAMPROP 
+  (FILEMAP (NIL (27821 31937 (STREAMPROP 27831 . 28265) (GETSTREAMPROP 28267 . 29016) (PUTSTREAMPROP 
-28848 . 31459) (STREAMP 31461 . 31609)) (31654 35033 (\DEFPRINT.BY.NAME 31664 . 32816) (
+29018 . 31785) (STREAMP 31787 . 31935)) (31980 35359 (\DEFPRINT.BY.NAME 31990 . 33142) (
-\STREAM.DEFPRINT 32818 . 34726) (\FDEV.DEFPRINT 34728 . 35031)) (35291 40332 (\GETACCESS 35301 . 35755
+\STREAM.DEFPRINT 33144 . 35052) (\FDEV.DEFPRINT 35054 . 35357)) (35617 40658 (\GETACCESS 35627 . 36081
-) (\SETACCESS 35757 . 40330)) (60558 66527 (\DEFINEDEVICE 60568 . 62884) (\GETDEVICEFROMNAME 62886 . 
+) (\SETACCESS 36083 . 40656)) (60884 66853 (\DEFINEDEVICE 60894 . 63210) (\GETDEVICEFROMNAME 63212 . 
-63359) (\GETDEVICEFROMHOSTNAME 63361 . 64405) (\REMOVEDEVICE 64407 . 65530) (\REMOVEDEVICE.NAMES 65532
+63685) (\GETDEVICEFROMHOSTNAME 63687 . 64731) (\REMOVEDEVICE 64733 . 65856) (\REMOVEDEVICE.NAMES 65858
- . 66525)) (66567 91885 (\CLOSEFILE 66577 . 67402) (\DELETEFILE 67404 . 67698) (\DEVICEEVENT 67700 . 
+ . 66851)) (66893 92425 (\CLOSEFILE 66903 . 67728) (\DELETEFILE 67730 . 68024) (\DEVICEEVENT 68026 . 
-69470) (\GENERATEFILES 69472 . 70419) (\GENERATENEXTFILE 70421 . 71072) (\GENERATEFILEINFO 71074 . 
+69796) (\GENERATEFILES 69798 . 70745) (\GENERATENEXTFILE 70747 . 71398) (\GENERATEFILEINFO 71400 . 
-71535) (\GETFILENAME 71537 . 71926) (\GENERIC.OUTFILEP 71928 . 72398) (\OPENFILE 72400 . 74978) (
+71861) (\GETFILENAME 71863 . 72252) (\GENERIC.OUTFILEP 72254 . 72724) (\OPENFILE 72726 . 75304) (
-\DO.PARAMS.AT.OPEN 74980 . 77295) (\RENAMEFILE 77297 . 77721) (\REVALIDATEFILE 77723 . 80325) (
+\DO.PARAMS.AT.OPEN 75306 . 77835) (\RENAMEFILE 77837 . 78261) (\REVALIDATEFILE 78263 . 80865) (
-\PAGED.REVALIDATEFILELST 80327 . 81885) (\PAGED.REVALIDATEFILES 81887 . 83606) (\PAGED.REVALIDATEFILE 
+\PAGED.REVALIDATEFILELST 80867 . 82425) (\PAGED.REVALIDATEFILES 82427 . 84146) (\PAGED.REVALIDATEFILE 
-83608 . 85891) (\BUFFERED.REVALIDATEFILE 85893 . 88179) (\BUFFERED.REVALIDATEFILELST 88181 . 89365) (
+84148 . 86431) (\BUFFERED.REVALIDATEFILE 86433 . 88719) (\BUFFERED.REVALIDATEFILELST 88721 . 89905) (
-\PRINT-REVALIDATION-RESULT 89367 . 90209) (\TRUNCATEFILE 90211 . 90602) (\FILE-CONFLICT 90604 . 91883)
+\PRINT-REVALIDATION-RESULT 89907 . 90749) (\TRUNCATEFILE 90751 . 91142) (\FILE-CONFLICT 91144 . 92423)
-) (91921 96584 (\GENERATENOFILES 91931 . 94027) (\NULLFILEGENERATOR 94029 . 94273) (\NOFILESNEXTFILEFN
+) (92461 97124 (\GENERATENOFILES 92471 . 94567) (\NULLFILEGENERATOR 94569 . 94813) (\NOFILESNEXTFILEFN
- 94275 . 96266) (\NOFILESINFOFN 96268 . 96582)) (96703 98611 (\FILE.NOT.OPEN 96713 . 97226) (
+ 94815 . 96806) (\NOFILESINFOFN 96808 . 97122)) (97243 99151 (\FILE.NOT.OPEN 97253 . 97766) (
-\FILE.WONT.OPEN 97228 . 97556) (\ILLEGAL.DEVICEOP 97558 . 97840) (\IS.NOT.RANDACCESSP 97842 . 98288) (
+\FILE.WONT.OPEN 97768 . 98096) (\ILLEGAL.DEVICEOP 98098 . 98380) (\IS.NOT.RANDACCESSP 98382 . 98828) (
-\STREAM.NOT.OPEN 98290 . 98609)) (98746 101044 (\FDEVINSTANCE 98756 . 101042)) (102246 109620 (CNDIR 
+\STREAM.NOT.OPEN 98830 . 99149)) (99286 101584 (\FDEVINSTANCE 99296 . 101582)) (102786 110160 (CNDIR 
-102256 . 103561) (DIRECTORYNAME 103563 . 107746) (DIRECTORYNAMEP 107748 . 108364) (HOSTNAMEP 108366 . 
+102796 . 104101) (DIRECTORYNAME 104103 . 108286) (DIRECTORYNAMEP 108288 . 108904) (HOSTNAMEP 108906 . 
-109173) (\ADD.CONNECTED.DIR 109175 . 109618)) (109665 137938 (\BACKFILEPTR 109675 . 109863) (
+109713) (\ADD.CONNECTED.DIR 109715 . 110158)) (110205 138478 (\BACKFILEPTR 110215 . 110403) (
-\BACKPEEKBIN 109865 . 110226) (\BACKBIN 110228 . 110579) (BIN 110581 . 110798) (\BIN 110800 . 111077) 
+\BACKPEEKBIN 110405 . 110766) (\BACKBIN 110768 . 111119) (BIN 111121 . 111338) (\BIN 111340 . 111617) 
-(\BINS 111079 . 111365) (BOUT 111367 . 111729) (\BOUT 111731 . 112046) (\BOUTS 112048 . 112359) (
+(\BINS 111619 . 111905) (BOUT 111907 . 112269) (\BOUT 112271 . 112586) (\BOUTS 112588 . 112899) (
-COPYBYTES 112361 . 115693) (COPYCHARS 115695 . 119361) (COPYFILE 119363 . 120427) (\COPYOPENFILE 
+COPYBYTES 112901 . 116233) (COPYCHARS 116235 . 119901) (COPYFILE 119903 . 120967) (\COPYOPENFILE 
-120429 . 123628) (\INFER.FILE.TYPE 123630 . 124584) (EOFP 124586 . 124883) (FORCEOUTPUT 124885 . 
+120969 . 124168) (\INFER.FILE.TYPE 124170 . 125124) (EOFP 125126 . 125423) (FORCEOUTPUT 125425 . 
-125132) (\FLUSH.OPEN.STREAMS 125134 . 125490) (CHARSET 125492 . 127156) (ACCESS-CHARSET 127158 . 
+125672) (\FLUSH.OPEN.STREAMS 125674 . 126030) (CHARSET 126032 . 127696) (ACCESS-CHARSET 127698 . 
-127375) (GETEOFPTR 127377 . 127627) (GETFILEINFO 127629 . 130822) (\TYPE.FROM.FILETYPE 130824 . 131294
+127915) (GETEOFPTR 127917 . 128167) (GETFILEINFO 128169 . 131362) (\TYPE.FROM.FILETYPE 131364 . 131834
-) (\FILETYPE.FROM.TYPE 131296 . 131475) (GETFILEPTR 131477 . 131729) (SETFILEINFO 131731 . 135837) (
+) (\FILETYPE.FROM.TYPE 131836 . 132015) (GETFILEPTR 132017 . 132269) (SETFILEINFO 132271 . 136377) (
-SETFILEPTR 135839 . 137558) (BOUT16 137560 . 137745) (BIN16 137747 . 137936)) (138041 143357 (
+SETFILEPTR 136379 . 138098) (BOUT16 138100 . 138285) (BIN16 138287 . 138476)) (138581 143897 (
-\GENERIC.BINS 138051 . 138331) (\GENERIC.BOUTS 138333 . 138598) (\GENERIC.RENAMEFILE 138600 . 140431) 
+\GENERIC.BINS 138591 . 138871) (\GENERIC.BOUTS 138873 . 139138) (\GENERIC.RENAMEFILE 139140 . 140971) 
-(\GENERIC.OPENP 140433 . 141748) (\GENERIC.READP 141750 . 142902) (\GENERIC.CHARSET 142904 . 143355)) 
+(\GENERIC.OPENP 140973 . 142288) (\GENERIC.READP 142290 . 143442) (\GENERIC.CHARSET 143444 . 143895)) 
-(143358 143697 (\MAP-OPEN-STREAMS 143368 . 143695)) (145489 147569 (\EOF.ACTION 145499 . 145750) (
+(143898 144237 (\MAP-OPEN-STREAMS 143908 . 144235)) (146029 148109 (\EOF.ACTION 146039 . 146290) (
-\EOSERROR 145752 . 145945) (\GETEOFPTR 145947 . 146129) (\INCFILEPTR 146131 . 146481) (\PEEKBIN 146483
+\EOSERROR 146292 . 146485) (\GETEOFPTR 146487 . 146669) (\INCFILEPTR 146671 . 147021) (\PEEKBIN 147023
- . 146674) (\SETCLOSEDFILELENGTH 146676 . 147010) (\SETEOFPTR 147012 . 147200) (\SETFILEPTR 147202 . 
+ . 147214) (\SETCLOSEDFILELENGTH 147216 . 147550) (\SETEOFPTR 147552 . 147740) (\SETFILEPTR 147742 . 
-147567)) (147570 148112 (\FIXPOUT 147580 . 147880) (\FIXPIN 147882 . 148110)) (148113 148679 (\BOUTEOL
+148107)) (148110 148652 (\FIXPOUT 148120 . 148420) (\FIXPIN 148422 . 148650)) (148653 149219 (\BOUTEOL
- 148123 . 148677)) (151575 161439 (\BUFFERED.BIN 151585 . 152437) (\BUFFERED.PEEKBIN 152439 . 153221) 
+ 148663 . 149217)) (152115 161979 (\BUFFERED.BIN 152125 . 152977) (\BUFFERED.PEEKBIN 152979 . 153761) 
-(\BUFFERED.BOUT 153223 . 154083) (\BUFFERED.BINS 154085 . 157770) (\BUFFERED.BOUTS 157772 . 159573) (
+(\BUFFERED.BOUT 153763 . 154623) (\BUFFERED.BINS 154625 . 158310) (\BUFFERED.BOUTS 158312 . 160113) (
-\BUFFERED.COPYBYTES 159575 . 161437)))))
+\BUFFERED.COPYBYTES 160115 . 161977)))))
 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)
+      :CHANGES-TO (VARS INTERPRESSCOMS)
-                  (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)
 
-      :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)
+                              (HELVETICA NIL MODERN)
-                              (CLASSIC)
+                              (CLASSIC NIL MODERN)
-                              (GACHA)
+                              (GACHA NIL MODERN)
-                              (TIMESROMAN)
+                              (TIMESROMAN NIL MODERN)
                               (LOGO NIL LOGOTYPES)
                               (HIPPO HIPPOTONSARRAY CLASSIC)
                               (CYRILLIC CYRILLICTONSARRAY CLASSIC)
-                              (SYMBOL \SYMBOLTONSARRAY MODERN)))
+                              (SYMBOL \SYMBOLTONSARRAY MODERN)
-              (UGLYVARS \SYMBOLTONSARRAY HIPPOTONSARRAY CYRILLICTONSARRAY))
+                              (MATH \MATHTONSARRAY CLASSIC)))
+              (UGLYVARS \SYMBOLTONSARRAY HIPPOTONSARRAY CYRILLICTONSARRAY \MATHTONSARRAY))
         (DECLARE%: DONTEVAL@LOAD DOCOPY (P (\INTERPRESSINIT)))
-        [DECLARE%: EVAL@COMPILE DONTCOPY (P (LOADDEF 'SYSTEMBRUSH 'RESOURCES 'IMAGEIO)
+        (DECLARE%: EVAL@COMPILE DONTCOPY (P (LOADDEF 'SYSTEMBRUSH 'RESOURCES 'IMAGEIO)
-                                            (LOADDEF 'BRUSH 'RECORDS 'IMAGEIO]
+                                            (LOADDEF 'BRUSH 'RECORDS 'IMAGEIO])
-        (FUNCTIONS \IPC)))
 
 
 
@@ -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)
+          (HELVETICA NIL MODERN)
-          (CLASSIC)
+          (CLASSIC NIL MODERN)
-          (GACHA)
+          (GACHA NIL MODERN)
-          (TIMESROMAN)
+          (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)
+(READVARS-FROM-STRINGS '(\SYMBOLTONSARRAY HIPPOTONSARRAY CYRILLICTONSARRAY \MATHTONSARRAY)
-       "({Y256 SMALLPOSP 0 0 0 180 42 0 61287 177 61309 61282 61283 61284 61285 0 184 0 0 61296 61298 61273 
+       "({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 
+ 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
-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 
+ 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
+61239 61362 61363 61360 61361 123 125 61234 61235 61052 8514 61243 61242 8740 8742 61308 8546 0 61301 
-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 
+{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
-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 
+ 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
-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 
+ 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 
-9728 9805 9806 9807 9808 9810 9811 9803 9813 9814 9816 9817 9728 9821 9819 9820 9801 91 92 93 173 172 
+9796 9802 9804 74 9805 9806 9807 9808 9810 9811 9803 9813 9814 9816 9817 86 9821 9819 9820 9801 91 92 
-185 9825 9826 9841 9829 9830 9850 9828 9834 9836 9847 9837 9838 9839 9840 9842 9843 9835 9845 9846 
+93 173 172 96 9825 9826 9841 9829 9830 9850 9828 9834 9836 106 9837 9838 9839 9840 9842 9843 9835 9845
-9848 9849 9728 9853 9851 9852 9833 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139
+ 9846 9848 9849 118 9853 9851 9852 9833 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 
- 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 61220 61221 157 158 159 160 161 162 163 
+138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 61220 61221 157 158 159 160 161 
-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 
+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 
-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 
+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 
-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 
+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 
-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
+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
- 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
+ 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 
- 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 
+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
-10018 10046 10021 10022 10038 10020 10049 10026 10027 10028 10029 10030 10031 10032 10033 10039 10034 
+ 10017 10018 10046 10021 10022 10038 10020 10049 10026 10027 10028 10029 10030 10031 10032 10033 10039
-10035 10036 10037 10019 10024 10045 10048 10025 10090 9984 10091 10044 10092 9984 10065 10066 10110 
+ 10034 10035 10036 10037 10019 10024 10045 10048 10025 10090 9984 10091 10044 10092 9984 10065 10066 
-10069 10070 10086 10068 10097 10074 10075 10076 10077 10078 10079 10080 10081 10087 10082 10083 10084 
+10110 10069 10070 10086 10068 10097 10074 10075 10076 10077 10078 10079 10080 10081 10087 10082 10083 
-10085 10067 10072 10093 10096 10073 10042 9984 10043 10040 9984 128 129 130 131 132 133 134 135 136 
+10084 10085 10067 10072 10093 10096 10073 10042 9984 10043 10040 9984 128 129 130 131 132 133 134 135 
-137 138 139 140 141 142 10094 144 145 146 147 148 149 150 151 152 153 154 61220 61221 157 158 159 160 
+136 137 138 139 140 141 142 10094 144 145 146 147 148 149 150 151 152 153 154 61220 61221 157 158 159 
-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 
+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 
-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 
+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 
-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 
+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 
-236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 })
+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) (
+  (FILEMAP (NIL (15420 16164 (\IPC 15420 . 16164)) (16397 22049 (APPENDBYTE.IP 16407 . 16543) (
-APPENDIDENTIFIER.IP 17865 . 18387) (APPENDINT.IP 18389 . 18840) (APPENDINTEGER.IP 18842 . 19414) (
+APPENDIDENTIFIER.IP 16545 . 17067) (APPENDINT.IP 17069 . 17520) (APPENDINTEGER.IP 17522 . 18094) (
-APPENDLARGEVECTOR.IP 19416 . 20381) (APPENDNUMBER.IP 20383 . 20852) (APPENDOP.IP 20854 . 21500) (
+APPENDLARGEVECTOR.IP 18096 . 19061) (APPENDNUMBER.IP 19063 . 19532) (APPENDOP.IP 19534 . 20180) (
-APPENDRATIONAL.IP 21502 . 21995) (APPENDSEQUENCEDESCRIPTOR.IP 21997 . 23192) (BYTESININT.IP 23194 . 
+APPENDRATIONAL.IP 20182 . 20675) (APPENDSEQUENCEDESCRIPTOR.IP 20677 . 21872) (BYTESININT.IP 21874 . 
-23367)) (23405 63212 (ARCTO.IP 23415 . 24696) (BEGINMASTER.IP 24698 . 24971) (BEGINPAGE.IP 24973 . 
+22047)) (22085 61892 (ARCTO.IP 22095 . 23376) (BEGINMASTER.IP 23378 . 23651) (BEGINPAGE.IP 23653 . 
-25329) (BEGINPREAMBLE.IP 25331 . 25702) (CLIPRECTANGLE.IP 25704 . 26194) (CONCAT.IP 26196 . 26461) (
+24009) (BEGINPREAMBLE.IP 24011 . 24382) (CLIPRECTANGLE.IP 24384 . 24874) (CONCAT.IP 24876 . 25141) (
-CONCATT.IP 26463 . 26730) (ENDMASTER.IP 26732 . 27176) (ENDPAGE.IP 27178 . 27555) (ENDPREAMBLE.IP 
+CONCATT.IP 25143 . 25410) (ENDMASTER.IP 25412 . 25856) (ENDPAGE.IP 25858 . 26235) (ENDPREAMBLE.IP 
-27557 . 28356) (FGET.IP 28358 . 28661) (FILLRECTANGLE.IP 28663 . 30991) (FILLTRAJECTORY.IP 30993 . 
+26237 . 27036) (FGET.IP 27038 . 27341) (FILLRECTANGLE.IP 27343 . 29671) (FILLTRAJECTORY.IP 29673 . 
-31628) (FILLNGON.IP 31630 . 33907) (FSET.IP 33909 . 34212) (GETFRAMEVAR.IP 34214 . 34532) (
+30308) (FILLNGON.IP 30310 . 32587) (FSET.IP 32589 . 32892) (GETFRAMEVAR.IP 32894 . 33212) (
-INITIALIZEMASTER.IP 34534 . 35135) (INITIALIZECOLOR.IP 35137 . 36458) (ISET.IP 36460 . 36831) (
+INITIALIZEMASTER.IP 33214 . 33815) (INITIALIZECOLOR.IP 33817 . 35138) (ISET.IP 35140 . 35511) (
-GETCP.IP 36833 . 37142) (LINETO.IP 37144 . 37749) (MASKSTROKE.IP 37751 . 38024) (MOVETO.IP 38026 . 
+GETCP.IP 35513 . 35822) (LINETO.IP 35824 . 36429) (MASKSTROKE.IP 36431 . 36704) (MOVETO.IP 36706 . 
-38363) (ROTATE.IP 38365 . 38667) (SCALE.IP 38669 . 38972) (SCALE2.IP 38974 . 39311) (SETCOLOR.IP 39313
+37043) (ROTATE.IP 37045 . 37347) (SCALE.IP 37349 . 37652) (SCALE2.IP 37654 . 37991) (SETCOLOR.IP 37993
- . 41542) (SETRGB.IP 41544 . 42600) (SETCOLORLV.IP 42602 . 47215) (SETCOLOR16.IP 47217 . 50323) (
+ . 40222) (SETRGB.IP 40224 . 41280) (SETCOLORLV.IP 41282 . 45895) (SETCOLOR16.IP 45897 . 49003) (
-SETFONT.IP 50325 . 51146) (SETSPACE.IP 51148 . 51460) (SETXREL.IP 51462 . 52646) (SETX.IP 52648 . 
+SETFONT.IP 49005 . 49826) (SETSPACE.IP 49828 . 50140) (SETXREL.IP 50142 . 51326) (SETX.IP 51328 . 
-54165) (SETXY.IP 54167 . 55339) (SETXYREL.IP 55341 . 56647) (SETY.IP 56649 . 57958) (SETYREL.IP 57960
+52845) (SETXY.IP 52847 . 54019) (SETXYREL.IP 54021 . 55327) (SETY.IP 55329 . 56638) (SETYREL.IP 56640
- . 58860) (SHOW.IP 58862 . 62122) (TRAJECTORY.IP 62124 . 62522) (TRANS.IP 62524 . 62863) (TRANSLATE.IP
+ . 57540) (SHOW.IP 57542 . 60802) (TRAJECTORY.IP 60804 . 61202) (TRANS.IP 61204 . 61543) (TRANSLATE.IP
- 62865 . 63210)) (63243 69333 (\CHANGE-VISIBLE-REGION.IP 63253 . 66914) (\PAPERSIZE.IP 66916 . 67737) 
+ 61545 . 61890)) (61923 68013 (\CHANGE-VISIBLE-REGION.IP 61933 . 65594) (\PAPERSIZE.IP 65596 . 66417) 
-(HEADINGOP.IP 67739 . 69331)) (69334 174344 (DEFINEFONT.IP 69344 . 70318) (FONTNAME.IP 70320 . 71250) 
+(HEADINGOP.IP 66419 . 68011)) (68014 173024 (DEFINEFONT.IP 68024 . 68998) (FONTNAME.IP 69000 . 69930) 
-(INTERPRESS.BITMAPSCALE 71252 . 72061) (INTERPRESS.OUTCHARFN 72063 . 78235) (INTERPRESSFILEP 78237 . 
+(INTERPRESS.BITMAPSCALE 69932 . 70741) (INTERPRESS.OUTCHARFN 70743 . 76915) (INTERPRESSFILEP 76917 . 
-79571) (MAKEINTERPRESS 79573 . 79757) (NEWLINE.IP 79759 . 80491) (NEWPAGE.IP 80493 . 85468) (
+78251) (MAKEINTERPRESS 78253 . 78437) (NEWLINE.IP 78439 . 79171) (NEWPAGE.IP 79173 . 84148) (
-NEWPAGE?.IP 85470 . 85949) (OPENIPSTREAM 85951 . 94302) (SETUPFONTS.IP 94304 . 95296) (SHOWBITMAP.IP 
+NEWPAGE?.IP 84150 . 84629) (OPENIPSTREAM 84631 . 92982) (SETUPFONTS.IP 92984 . 93976) (SHOWBITMAP.IP 
-95298 . 99839) (\BITMAPSIZE.IP 99841 . 100618) (SHOWBITMAP1.IP 100620 . 104992) (SHOWSHADE.IP 104994
+93978 . 98519) (\BITMAPSIZE.IP 98521 . 99298) (SHOWBITMAP1.IP 99300 . 103672) (SHOWSHADE.IP 103674 . 
- . 105947) (\BITBLT.IP 105949 . 110153) (\SCALEDBITBLT.IP 110155 . 113800) (\BLTSHADE.IP 113802 . 
+104627) (\BITBLT.IP 104629 . 108833) (\SCALEDBITBLT.IP 108835 . 112480) (\BLTSHADE.IP 112482 . 113940)
-115260) (\CHARWIDTH.IP 115262 . 115712) (\CLOSEIPSTREAM 115714 . 116041) (\DRAWARC.IP 116043 . 116490)
+ (\CHARWIDTH.IP 113942 . 114392) (\CLOSEIPSTREAM 114394 . 114721) (\DRAWARC.IP 114723 . 115170) (
- (\DRAWCURVE.IP 116492 . 118929) (\DRAWPOINT.IP 118931 . 119968) (\DSPCOLOR.IP 119970 . 120921) (
+\DRAWCURVE.IP 115172 . 117609) (\DRAWPOINT.IP 117611 . 118648) (\DSPCOLOR.IP 118650 . 119601) (
-ENSURE.RGB 120923 . 121587) (\IPCURVE2 121589 . 134843) (\CLIPCURVELINE.IP 134845 . 139543) (
+ENSURE.RGB 119603 . 120267) (\IPCURVE2 120269 . 133523) (\CLIPCURVELINE.IP 133525 . 138223) (
-\DRAWLINE.IP 139545 . 143277) (\CLIPLINE 143279 . 147979) (\DSPBOTTOMMARGIN.IP 147981 . 148397) (
+\DRAWLINE.IP 138225 . 141957) (\CLIPLINE 141959 . 146659) (\DSPBOTTOMMARGIN.IP 146661 . 147077) (
-\DSPFONT.IP 148399 . 152446) (\DSPLEFTMARGIN.IP 152448 . 152908) (\DSPLINEFEED.IP 152910 . 153577) (
+\DSPFONT.IP 147079 . 151126) (\DSPLEFTMARGIN.IP 151128 . 151588) (\DSPLINEFEED.IP 151590 . 152257) (
-\DSPRIGHTMARGIN.IP 153579 . 154376) (\DSPSPACEFACTOR.IP 154378 . 155507) (\DSPTOPMARGIN.IP 155509 . 
+\DSPRIGHTMARGIN.IP 152259 . 153056) (\DSPSPACEFACTOR.IP 153058 . 154187) (\DSPTOPMARGIN.IP 154189 . 
-155945) (\DSPXPOSITION.IP 155947 . 156934) (\DSPROTATE.IP 156936 . 157114) (\PUSHSTATE.IP 157116 . 
+154625) (\DSPXPOSITION.IP 154627 . 155614) (\DSPROTATE.IP 155616 . 155794) (\PUSHSTATE.IP 155796 . 
-158008) (\POPSTATE.IP 158010 . 158645) (\DEFAULTSTATE.IP 158647 . 158999) (\DSPTRANSLATE.IP 159001 . 
+156688) (\POPSTATE.IP 156690 . 157325) (\DEFAULTSTATE.IP 157327 . 157679) (\DSPTRANSLATE.IP 157681 . 
-159182) (\DSPSCALE2.IP 159184 . 159359) (\DSPYPOSITION.IP 159361 . 159662) (FILLCIRCLE.IP 159664 . 
+157862) (\DSPSCALE2.IP 157864 . 158039) (\DSPYPOSITION.IP 158041 . 158342) (FILLCIRCLE.IP 158344 . 
-160747) (\FILLPOLYGON.IP 160749 . 162080) (\DRAWPOLYGON.IP 162082 . 168212) (\FIXLINELENGTH.IP 168214
+159427) (\FILLPOLYGON.IP 159429 . 160760) (\DRAWPOLYGON.IP 160762 . 166892) (\FIXLINELENGTH.IP 166894
- . 169428) (\MOVETO.IP 169430 . 169794) (\SETBRUSH.IP 169796 . 171962) (\STRINGWIDTH.IP 171964 . 
+ . 168108) (\MOVETO.IP 168110 . 168474) (\SETBRUSH.IP 168476 . 170642) (\STRINGWIDTH.IP 170644 . 
-172367) (\DSPCLIPPINGREGION.IP 172369 . 173545) (\DSPOPERATION.IP 173547 . 174342)) (174535 175290 (
+171047) (\DSPCLIPPINGREGION.IP 171049 . 172225) (\DSPOPERATION.IP 172227 . 173022)) (173215 173970 (
-IP-TOS 174545 . 174805) (POP-IP-STACK 174807 . 175102) (PUSH-IP-STACK 175104 . 175288)) (175351 187915
+IP-TOS 173225 . 173485) (POP-IP-STACK 173487 . 173782) (PUSH-IP-STACK 173784 . 173968)) (174031 186595
- (\CREATECHARSET.IP 175361 . 187152) (\CHANGECHARSET.IP 187154 . 187913)) (187916 192642 (
+ (\CREATECHARSET.IP 174041 . 185832) (\CHANGECHARSET.IP 185834 . 186593)) (186596 191322 (
-\INTERPRESSINIT 187926 . 192640)) (192643 193201 (SCALEREGION 192653 . 193199)) (206129 208553 (
+\INTERPRESSINIT 186606 . 191320)) (191323 191881 (SCALEREGION 191333 . 191879)) (204809 207233 (
-INTERPRESSBITMAP 206139 . 208551)) (210761 217417 (NSMAP 210771 . 211353) (\COERCEASCIITONSFONT 211355
+INTERPRESSBITMAP 204819 . 207231)) (209441 216097 (NSMAP 209451 . 210033) (\COERCEASCIITONSFONT 210035
- . 215209) (\CREATEINTERPRESSFONT 215211 . 217076) (\SEARCHINTERPRESSFONTS 217078 . 217415)) (220992 
+ . 213889) (\CREATEINTERPRESSFONT 213891 . 215756) (\SEARCHINTERPRESSFONTS 215758 . 216095)))))
-221736 (\IPC 220992 . 221736)))))
 STOP

sources/LLSYMBOL

@@ -1,13 +1,11 @@
-(DEFINE-FILE-INFO READTABLE "XCL" PACKAGE "LISP")
+(DEFINE-FILE-INFO PACKAGE "LISP" READTABLE "XCL" BASE 10)
-
(IL:FILECREATED "11-Jun-90 17:56:50" IL:|{PELE:MV:ENVOS}<LISPCORE>SOURCES>LLSYMBOL.;5|
 9443   
 
-      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)
+                (SETF (SYMBOL-VALUE
 NEW-SYM)
-                      (SYMBOL-VALUE SYM)))
+                      (SYMBOL-VALUE
 SYM)))
-            (IF (FBOUNDP SYM)
+            (IF (FBOUNDP
 SYM)
-                (SETF (SYMBOL-FUNCTION NEW-SYM)
+                (SETF (SYMBOL-FUNCTION
 NEW-SYM)
-                      (SYMBOL-FUNCTION 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