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

A few fixes to UNICODE that I stumbled across.

.github/workflows/buildLoadup.yml

@@ -128,6 +128,8 @@ jobs:
       combined_release_tag: ${{ steps.job_outputs.outputs.COMBINED_RELEASE_TAG }}
       medley_release_tag: ${{ steps.job_outputs.outputs.MEDLEY_RELEASE_TAG }}
       medley_short_release_tag: ${{ steps.job_outputs.outputs.MEDLEY_SHORT_RELEASE_TAG }}
+      debs_filename_base: ${{ steps.debs.outputs.DEBS_FILENAME_BASE }}
+      maiko_release_tag: ${{ steps.job_outputs.outputs.MAIKO_RELEASE_TAG }}
       artifacts_filename_template: ${{ steps.job_outputs.outputs.ARTIFACTS_FILENAME_TEMPLATE }}
       release_url: ${{ steps.push.outputs.html_url }}
 
@@ -154,7 +156,7 @@ jobs:
         id: tag
         uses: ./../actions/release-tag-action
 
-      # Get Maiko release information, retrieves the name of the latest
+      # Get Maiko release information, retrieves the name of the latest (draft)
       # release.  Used to download the correct Maiko release
       # Find latest release (draft or normal)
       - name: Get maiko release information
@@ -176,7 +178,6 @@ jobs:
           echo "maiko_tag=${tag}" >> ${GITHUB_OUTPUT}
         env:
           GITHUB_TOKEN: ${{ secrets.MAIKO_TOKEN }}
-
       # Setup environment variables & establish job outputs
       - name: Setup Environment Variables
         run: |
@@ -198,6 +199,7 @@ jobs:
           echo "COMBINED_RELEASE_TAG=${COMBINED_RELEASE_TAG}" >> ${GITHUB_OUTPUT}
           echo "MEDLEY_RELEASE_TAG=${MEDLEY_RELEASE_TAG}" >> ${GITHUB_OUTPUT}
           echo "MEDLEY_SHORT_RELEASE_TAG=${MEDLEY_SHORT_RELEASE_TAG}" >> ${GITHUB_OUTPUT}
+          echo "MAIKO_RELEASE_TAG=${MAIKO_RELEASE_TAG}" >> $GITHUB_OUTPUT;
           echo "ARTIFACTS_FILENAME_TEMPLATE=${ARTIFACTS_FILENAME_TEMPLATE}" >> ${GITHUB_OUTPUT}
 
       # Setup some needed dirs in workspace
@@ -337,6 +339,17 @@ jobs:
           omitNameDuringUpdate: true
           omitPrereleaseDuringUpdate: true
 
+      - name: Rename medley tar for the x86_64 platform
+        run: |
+            cd ${{ env.TARS_DIR }}
+            mv  medley-full-linux-x86_64-*.tgz medley.tgz
+
+      - name: Save medley tar for use in cygwin installers
+        uses: actions/upload-artifact@v3
+        with:
+          name: medley-tar
+          path: |
+            ${{ env.TARS_DIR }}/medley.tgz
 
 
 # JOB: macos_installer ##############################################################
@@ -371,8 +384,7 @@ jobs:
           echo "MACOS_DIR=${MACOS_DIR}" >>${GITHUB_ENV}
           echo "ARTIFACTS_DIR=${MACOS_DIR}/artifacts" >>${GITHUB_ENV}
           echo "TARBALL_DIR=${MACOS_DIR}/tmp/tarballs" >>${GITHUB_ENV}
-          echo "MEDLEY_RELEASE_TAG=${{ needs.loadup.outputs.medley_release_tag }}" \
-                >>${GITHUB_ENV}
+          echo "MEDLEY_RELEASE_TAG=${{ needs.loadup.outputs.medley_release_tag }}" >>${GITHUB_ENV}
           echo "ARTIFACTS_FILENAME_TEMPLATE=${{ needs.loadup.outputs.artifacts_filename_template }}" >>${GITHUB_ENV}
 
       # Create tarball dir
@@ -410,23 +422,23 @@ jobs:
 
 
 
-# JOB: windows_installer #############################################################
+# JOB: cygwin_installer #############################################################
 
   #
   # Create the Windows installer, push it up to the release on github and
   # update the downloads page on OIO
   #
-  windows_installer:
+  cygwin_installer:
 
-    runs-on: windows-latest
+    runs-on: windows-2022
 
-    needs: [inputs, sentry, loadup]
+    needs: [inputs, sentry, loadup, linux_installer]
     if: |
       needs.sentry.outputs.release_not_built == 'true'
       || needs.inputs.outputs.force == 'true'
 
     outputs:
-      windows_installer_filename: ${{ steps.jobout.outputs.INSTALLER_FILENAME }}
+      cygwin_installer: ${{ steps.compile_iss.outputs.CYGWIN_INSTALLER }}
 
     steps:
 
@@ -446,21 +458,57 @@ jobs:
           echo "MEDLEY_SHORT_RELEASE_TAG=$msrt" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
           $aft="${{ needs.loadup.outputs.artifacts_filename_template }}"
           echo "ARTIFACTS_FILENAME_TEMPLATE=$aft" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+          $debs="${{ needs.loadup.outputs.debs_filename_base }}"
+          echo "DEBS_FILENAME_BASE=$debs" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+
+      # Retrieve medley tars from artifact store
+      - name: Retrieve medley tar
+        uses: actions/download-artifact@v3
+        with:
+          name: medley-tar
+          path: installers/cygwin/
+
+      # Download maiko cygwin build
+      - name: Retrieve maiko cygwin build
+        shell: powershell
+        env:
+          GH_TOKEN: ${{ secrets.MAIKO_TOKEN }}
+        run: |
+          gh release download ${{ needs.loadup.outputs.maiko_release_tag }} --repo interlisp/maiko --pattern ${{ needs.loadup.outputs.maiko_release_tag }}-cygwin.x86_64.tgz --output installers\cygwin\maiko-cygwin.x86_64.tgz
+
+      # Download cygwin installer to be included by medley.iss
+      - name: Download cygwin installer
+        id: cygwin
+        shell: powershell
+        run: |
+          wget https://cygwin.com/setup-x86_64.exe -OutFile installers\cygwin\setup-x86_64.exe
 
       # Download vnc viewer
-      - name: Download vncviewer
-        shell: powershell
-        run: |
-          $url = "https://online.interlisp.org/downloads/vncviewer64-1.12.0.exe"
-          $output = "installers\win\vncviewer64-1.12.0.exe"
-          (New-Object System.Net.WebClient).DownloadFile($url, $output)
+      #- name: Download vncviewer
+      #  shell: powershell
+      #  run: |
+      #    $url = "https://sourceforge.net/projects/tigervnc/files/stable/1.12.0/vncviewer64-1.12.0.exe"
+      #    $output = "installers\win\vncviewer64-1.12.0.exe"
+      #    (New-Object System.Net.WebClient).DownloadFile($url, $output)
 
       # Run iscc.exe to compile the installer
-      - name: Compile medley.iss
+      #- name: Compile medley.iss
+      #  shell: powershell
+      #  run: |
+      #     iscc installers\win\medley.iss
+      #     $filename="medley-install_${env:COMBINED_RELEASE_TAG}_x64.exe"
+      #     echo "INSTALLER_FILENAME=$filename" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+
+      # Run iscc.exe to compile the installer
+      - name: Compile cygwin_medley.iss
+        id: compile_iss
         shell: powershell
         run: |
-           iscc installers\win\medley.iss
-
+           $Env:CYGWIN_INSTALLER_BASE="medley-full-cygwin-x86_64-${env:COMBINED_RELEASE_TAG}"
+           $CYGWIN_INSTALLER="${Env:CYGWIN_INSTALLER_BASE}.exe"
+           echo "CYGWIN_INSTALLER=$CYGWIN_INSTALLER" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+           echo "CYGWIN_INSTALLER=$CYGWIN_INSTALLER" | Out-File -FilePath $Env:GITHUB_OUTPUT -Encoding utf8 -Append
+           iscc installers\cygwin\medley.iss
 
       # Upload windows installer to release
       - name: Upload windows installer to release
@@ -468,7 +516,7 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          artifacts: installers/win/medley-*.exe
+          artifacts: installers/cygwin/${{ env.CYGWIN_INSTALLER }}
           tag: ${{ env.MEDLEY_RELEASE_TAG }}
           token: ${{ secrets.GITHUB_TOKEN }}
           omitBodyDuringUpdate: true
@@ -487,7 +535,7 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    needs: [inputs, sentry, loadup, linux_installer, macos_installer, windows_installer]
+    needs: [inputs, sentry, loadup, linux_installer, macos_installer, cygwin_installer]
     if: |
       needs.sentry.outputs.release_not_built == 'true'
       || needs.inputs.outputs.force == 'true'
@@ -503,6 +551,8 @@ jobs:
           echo "MEDLEY_RELEASE_TAG=${mrt}" >>${GITHUB_ENV}
           msrt="${{ needs.loadup.outputs.medley_short_release_tag }}"
           echo "MEDLEY_SHORT_RELEASE_TAG=${msrt}" >>${GITHUB_ENV}
+          cyginst="${{ needs.cygwin_installer.outputs.cygwin_installer }}"
+          echo "CYGWIN_INSTALLER=${cyginst}" >>${GITHUB_ENV}
 
       # Checkout latest commit
       - name: Checkout Medley
@@ -514,7 +564,7 @@ jobs:
       # So this will be the final update before creating downloads page
       # and we can use its url for the page
       - run: echo "placeholder" >placeholder.txt
-      - name: Upload windows installer to release
+      - name: Upload windows placeholder.txt to release
         id: pushph
         uses: ncipollo/release-action@v1
         with:
@@ -552,6 +602,7 @@ jobs:
                -e "s/@@@MEDLEY.SHORT.RELEASE.TAG@@@/${MEDLEY_SHORT_RELEASE_TAG}/g" \
                -e "s/@@@COMBINED.RELEASE.TAG@@@/${COMBINED_RELEASE_TAG}/g" \
                -e "s~@@@DOWNLOAD_URL@@@~${download_url}~g" \
+               -e "s~@@@CYGWIN.INSTALLER@@@~${CYGWIN_INSTALLER}~g" \
                < "${local_template}" > "${local_filename}"
             # Create sftp instruction file
             echo "-rm ${remote_filepath}.oldold" > batch
@@ -566,6 +617,12 @@ jobs:
         env:
             SSH_KEY: ${{ secrets.OIO_SSH_KEY }}
 
+      # Remove placeholder.txt
+      - name: Remove placeholder.txt
+        run: |
+          gh release delete-asset ${{ env.MEDLEY_RELEASE_TAG }} placeholder.txt --yes
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
 
 # JOB: complete #####################################################################

README.md

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

greetfiles/APPS-INIT

@@ -1,12 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "19-Jan-2023 12:44:20" {DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;9
 21022  
+
(FILECREATED "16-Jun-2023 17:20:09" {DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;11
 21130  
 
-      :CHANGES-TO (VARS APPS-INITCOMS)
-                  (FNS Apps.DoInit)
+      :CHANGES-TO (FNS Apps.DoInit)
 
-      :PREVIOUS-DATE "19-Jan-2023 11:57:40" {DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;8
-)
+      :PREVIOUS-DATE "19-Jan-2023 12:44:20" 
+{DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;10)
 
 
 (PRETTYCOMPRINT APPS-INITCOMS)
@@ -170,7 +169,11 @@
 
            (* ;; " create the Documentation and ROOMS, Notecards Activation Buttons, if needed")

 
-           (Apps.CreateButtons
 T])
+           (Apps.CreateButtons
 T)
+
+           (* ;; " Make sure Notecards doesn't try to load its HASH file in NC.PostGreet")

+
+           (SETTOPVAL '\NC.SourceAccessFlg NIL])
 
 (Apps.CreateButtons

   [LAMBDA (DoDocsToo)
                                      (* ; "Edited 13-Dec-2022 12:51 by frank")


@@ -373,8 +376,8 @@
 (BKSYSBUF " ")
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1146 20888 (Apps.InitNotecards 1156 . 5018) (Apps.DoInit 5020 . 8119) (
-Apps.CreateButtons 8121 . 16945) (Apps.CreateLabel 16947 . 17757) (Apps.ActivateCLOS 17759 . 19108) (
-Apps.ActivateRooms 19110 . 19961) (Apps.ShowDoc 19963 . 20112) (XCL-USER::EXEC_INTERLISP 20114 . 20886
+  (FILEMAP (NIL (1109 20996 (Apps.InitNotecards 1119 . 4981) (Apps.DoInit 4983 . 8227) (
+Apps.CreateButtons 8229 . 17053) (Apps.CreateLabel 17055 . 17865) (Apps.ActivateCLOS 17867 . 19216) (
+Apps.ActivateRooms 19218 . 20069) (Apps.ShowDoc 20071 . 20220) (XCL-USER::EXEC_INTERLISP 20222 . 20994
 )))))
 STOP

installers/cygwin/.gitignore

@@ -0,0 +1,6 @@
+medley*.exe
+medley*.tgz
+maiko*.tgz
+setup-x86_64.exe
+medley.bat
+

installers/cygwin/editpath/EditPath.iss

@@ -0,0 +1,165 @@
+; Copyright (C) 2021-2023 by Bill Stewart (bstewart at iname.com)
+;
+; This program is free software; you can redistribute it and/or modify it under
+; the terms of the GNU Lesser General Public License as published by the Free
+; Software Foundation; either version 3 of the License, or (at your option) any
+; later version.
+;
+; This program is distributed in the hope that it will be useful, but WITHOUT
+; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+; FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
+; details.
+;
+; You should have received a copy of the GNU Lesser General Public License
+; along with this program. If not, see https://www.gnu.org/licenses/.
+
+; Sample Inno Setup (https://www.jrsoftware.org/isinfo.php) script
+; demonstrating use of PathMgr.dll.
+;
+; This script uses PathMgr.dll in the following ways:
+; * Copies PathMgr.dll to the target machine (required for uninstall)
+; * Defines a task in [Tasks] that should modify the Path
+; * Imports the AddDirToPath() DLL function at setup time
+; * Imports the RemoveDirFromPath() DLL function at uninstall time
+; * Stores task state as custom setting using RegisterPreviousData()
+; * Retrieves task state custom setting during setup and uninstall initialize
+; * At post install, adds app dir to Path if task selected
+; * At uninstall, removes dir from Path if custom setting present
+; * Unloads and deletes DLL and removes app dir at uninstall deinitialize
+
+#if Ver < EncodeVer(6,0,0,0)
+  #error This script requires Inno Setup 6 or later
+#endif
+
+[Setup]
+AppId={{A17D2D05-C729-4F2A-9CC7-E04906C5A842}
+AppName=EditPath
+AppVersion=4.0.4.0
+UsePreviousAppDir=false
+DefaultDirName={autopf}\EditPath
+Uninstallable=true
+OutputDir=.
+OutputBaseFilename=EditPath_Setup
+ArchitecturesInstallIn64BitMode=x64
+PrivilegesRequired=none
+PrivilegesRequiredOverridesAllowed=dialog
+
+[Files]
+; Install PathMgr.dll for use with both setup and uninstall; use
+; uninsneveruninstall flag because DeinitializeSetup() will delete after
+; unloading the DLL; install the 32-bit version of PathMgr.dll because both
+; setup and uninstall executables are 32-bit
+Source: "i386\PathMgr.dll";  DestDir: "{app}"; Flags: uninsneveruninstall
+
+; Other files to install on target system
+Source: "i386\EditPath.exe";   DestDir: "{app}"; Check: not Is64BitInstallMode()
+Source: "x86_64\EditPath.exe"; DestDir: "{app}"; Check: Is64BitInstallMode()
+Source: "EditPath.md";         DestDir: "{app}"
+
+[Tasks]
+Name: modifypath; Description: "&Add to Path"
+
+[Code]
+const
+  MODIFY_PATH_TASK_NAME = 'modifypath';  // Specify name of task
+
+var
+  PathIsModified: Boolean;          // Cache task selection from previous installs
+  ApplicationUninstalled: Boolean;  // Has application been uninstalled?
+
+// Import AddDirToPath() at setup time ('files:' prefix)
+function DLLAddDirToPath(DirName: string; PathType, AddType: DWORD): DWORD;
+  external 'AddDirToPath@files:PathMgr.dll stdcall setuponly';
+
+// Import RemoveDirFromPath() at uninstall time ('{app}\' prefix)
+function DLLRemoveDirFromPath(DirName: string; PathType: DWORD): DWORD;
+  external 'RemoveDirFromPath@{app}\PathMgr.dll stdcall uninstallonly';
+
+// Wrapper for AddDirToPath() DLL function
+function AddDirToPath(const DirName: string): DWORD;
+var
+  PathType, AddType: DWORD;
+begin
+  // PathType = 0 - use system Path
+  // PathType = 1 - use user Path
+  // AddType = 0 - add to end of Path
+  // AddType = 1 - add to beginning of Path
+  if IsAdminInstallMode() then
+    PathType := 0
+  else
+    PathType := 1;
+  AddType := 0;
+  result := DLLAddDirToPath(DirName, PathType, AddType);
+end;
+
+// Wrapper for RemoveDirFromPath() DLL function
+function RemoveDirFromPath(const DirName: string): DWORD;
+var
+  PathType: DWORD;
+begin
+  // PathType = 0 - use system Path
+  // PathType = 1 - use user Path
+  if IsAdminInstallMode() then
+    PathType := 0
+  else
+    PathType := 1;
+  result := DLLRemoveDirFromPath(DirName, PathType);
+end;
+
+procedure RegisterPreviousData(PreviousDataKey: Integer);
+begin
+  // Store previous or current task selection as custom user setting
+  if PathIsModified or WizardIsTaskSelected(MODIFY_PATH_TASK_NAME) then
+    SetPreviousData(PreviousDataKey, MODIFY_PATH_TASK_NAME, 'true');
+end;
+
+function InitializeSetup(): Boolean;
+begin
+  result := true;
+  // Was task selected during a previous install?
+  PathIsModified := GetPreviousData(MODIFY_PATH_TASK_NAME, '') = 'true';
+end;
+
+function InitializeUninstall(): Boolean;
+begin
+  result := true;
+  // Was task selected during a previous install?
+  PathIsModified := GetPreviousData(MODIFY_PATH_TASK_NAME, '') = 'true';
+  ApplicationUninstalled := false;
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssPostInstall then
+  begin
+    // Add app directory to Path at post-install step if task selected
+    if PathIsModified or WizardIsTaskSelected(MODIFY_PATH_TASK_NAME) then
+      AddDirToPath(ExpandConstant('{app}'));
+  end;
+end;
+
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+begin
+  if CurUninstallStep = usUninstall then
+  begin
+    // Remove app directory from path during uninstall if task was selected;
+    // use variable because we can't use WizardIsTaskSelected() at uninstall
+    if PathIsModified then
+      RemoveDirFromPath(ExpandConstant('{app}'));
+  end
+  else if CurUninstallStep = usPostUninstall then
+  begin
+    ApplicationUninstalled := true;
+  end;
+end;
+
+procedure DeinitializeUninstall();
+begin
+  if ApplicationUninstalled then
+  begin
+    // Unload and delete PathMgr.dll and remove app dir when uninstalling
+    UnloadDLL(ExpandConstant('{app}\PathMgr.dll'));
+    DeleteFile(ExpandConstant('{app}\PathMgr.dll'));
+    RemoveDir(ExpandConstant('{app}'));
+  end;
+end;

installers/cygwin/editpath/EditPath.md

@@ -0,0 +1,118 @@
+# EditPath
+
+EditPath is a Windows console (text-based, command-line) program for managing the system Path and user Path.
+
+# Author
+
+Bill Stewart - bstewart at iname dot com
+
+# License
+
+EditPath.exe is covered by the GNU Lesser Public License (LPGL). See the file `LICENSE` for details.
+
+# Download
+
+https://github.com/Bill-Stewart/PathMgr/releases/
+
+# Background
+
+The system Path is found in the following location in the Windows registry:
+
+Root: `HKEY_LOCAL_MACHINE`  
+Subkey: `SYSTEM\CurrentControlSet\Control\Session Manager\Environment`  
+Value name: `Path`
+
+The current user Path is found in the following location in the registry:
+
+Root: `HKEY_CURRENT_USER`  
+Subkey: `Environment`  
+Value name: `Path`
+
+In both cases, the `Path` value is (or should be) the registry type `REG_EXPAND_SZ`, which means that it is a string that can contain values surrounded by `%` characters that Windows will automatically expand to environment variable values. (For example, `%SystemRoot%` will be expanded to `C:\Windows` on most systems.)
+
+The `Path` value contains a `;`-delimited list of directory names that the system should search for executables, library files, scripts, etc. Windows appends the content of the current user Path to the system Path and expands the environment variable references. The resulting string is set as the `Path` environment variable for processes.
+
+EditPath provides a command-line interface for managing the `Path` value in the system location (in `HKEY_LOCAL_MACHINE`) and the current user location (in `HKEY_CURRENT_USER`).
+
+# Usage
+
+The following describes the command-line usage for the program. Parameters are case-sensitive.
+
+**EditPath** [_options_] _type_ _action_
+
+You must specify only one of the following _type_ parameters:
+
+| _type_       | Abbreviation | Description
+| -------      | ------------ | -----------
+| **--system** | **-s**       | Specifies the system Path
+| **--user**   | **-u**       | Specifies the user Path
+
+You must specify only one of the following _action_ parameters:
+
+| _action_                     | Abbreviation           | Description
+| --------                     | ------------           | -----------
+| **--list**                   | **-l**                 | Lists directories in Path
+| **--test "**_dirname_**"**   | **-t "**_dirname_**"** | Tests if directory exists in Path
+| **--add "**_dirname_**"**    | **-a "**_dirname_**"** | Adds directory to Path
+| **--remove "**_dirname_**"** | **-r "**_dirname_**"** | Removes directory from Path
+
+The following parameters are optional:
+
+| _options_       | Abbreviation | Description
+| ---------       | ------------ | -----------
+| **--quiet**     | **-q**       | Suppresses result messages
+| **--expand**    | **-x**       | Expands environment variables (**--list** only)
+| **--beginning** | **-b**       | Adds to beginning of Path (**--add** only)
+
+# Exit Codes
+
+The following table lists typical exit codes when not using **--test** (**-t**).
+
+| Exit Code | Description
+| --------- | -----------
+| 0         | No errors
+| 2         | The Path value is not present in the registry
+| 3         | The specified directory does not exist in the Path
+| 5         | Access is denied
+| 87        | Incorrect parameter(s)
+| 183       | The specified directory already exists in the Path
+
+The following table lists typical exit codes when using **--test** (**-t**).
+
+| Exit Code | Description
+| --------- | -----------
+| 1         | The specified directory exists in the unexpanded Path
+| 2         | The specified directory exists in the expanded Path
+| 3         | The specified directory does not exist in the Path
+
+# Remarks
+
+* Anything on the command line after **--test**, **--add**, or **--remove** is considered to be the argument for the parameter. To avoid ambiguity, specify the _action_ parameter last on the command line.
+
+* Uexpanded vs. expanded refers to whether the environment variable references (i.e., names between `%` characters) are expanded after retrieving the Path value from the registry. For example, `%SystemRoot%` is unexpanded but `C:\Windows` is expanded.
+
+* The **--add** (**-a**) parameter checks whether the specified directory exists in both the unexpanded and expanded copies of the Path before adding the directory. For example, if the environment variable `TESTAPP` is set to `C:\TestApp` and `%TESTAPP%` is in the Path, specifying `--add C:\TestApp` will return exit code 183 (i.e., the directory already exists in the Path) because `%TESTAPP%` expands to `C:\TestApp`.
+
+* The **--remove** (**-r**) parameter does not expand environment variable references. For example, if the environment variable `TESTAPP` is set to `C:\TestApp` and `%TESTAPP%` is in the Path, specifying `--remove "C:\TestApp"` will return exit code 3 (i.e., the directory does not exist in the Path) because **--remove** does not expand `%TESTAPP%` to `C:\TestApp`. For the command to succeed, you would have to specify `--remove "%TESTAPP%"` instead.
+
+* The program will exit with error code 87 if a parameter (or an argument to a parameter) is missing or not valid, if mutually exclusive parameters are specified, etc.
+
+* The program will exit with error code 5 if the current user does not have permission to update the Path value in the registry (for example, if you try to update the system Path using a standard user account or an unelevated administrator account).
+
+# Examples
+
+1.  `EditPath --expand --system --list`
+
+    This command outputs the directories in the system Path, with environment variables expanded. You can also write this command as `EditPath -x -s -l`.
+
+2.  `EditPath --user --add "%LOCALAPPDATA%\Programs\MyApp"`
+
+    Adds the specified directory name to the user Path.
+
+3.  `EditPath -s -r "C:\Program Files\MyApp\bin"`
+
+    Removes the specified directory from the system Path.
+
+4.  `EditPath -s --test "C:\Program Files (x86)\MyApp\bin"`
+
+    Returns an exit code of 3 if the specified directory is not in the system Path, 1 if the specified directory is in the unexpanded copy of the system Path, or 2 if the specified directory is in the expanded copy of the system Path.

installers/cygwin/editpath/README.TXT

@@ -0,0 +1,3 @@
+Editpath installed here is extracted from Release 1.04 from https://github.com/Bill-Stewart/PathMgr.
+
+

installers/cygwin/makeflix.iss

@@ -0,0 +1,128 @@
+; -- makeflix.iss --
+; fgh 2016-08-19
+
+#define x86_or_x64 "x86"
+#define version "1.0.1"
+
+#if x86_or_x64 == "x86" 
+#define exe_dir "Win32"
+#else
+#define exe_dir "x64"
+#endif
+
+[Setup]
+ArchitecturesAllowed={#x86_or_x64}
+AppName=Makeflix
+AppVersion={#version}
+AppPublisher=Lellan, Inc.
+AppPublisherURL=http://www.lellan.com/
+AppCopyright=Copyright (C) 2012-2017 Lellan, Inc.
+DefaultDirName={pf}\Lellan\Makeflix
+DefaultGroupName=Lellan
+UninstallDisplayIcon={app}\makeflix.exe
+Compression=lzma2
+SolidCompression=yes
+; "ArchitecturesInstallIn64BitMode=x64" requests that the install be
+; done in "64-bit mode" on x64, meaning it should use the native
+; 64-bit Program Files directory and the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64
+; Source Dir is lellan/toolchain/makeflix/windows
+SourceDir="..\"
+OutputDir="deploy"
+OutputBaseFilename="makeflix_v{#version}_{#x86_or_x64}"
+SetupIconFile="..\images\Lellan_Logo_20130221.ico"
+LicenseFile="..\deploy\EULA.rtf"
+DisableWelcomePage=no
+
+[Files]
+Source: "makeflix\{#exe_dir}\Release\makeflix.exe"; DestDir: "{app}"; DestName: "makeflix.exe"; Flags: ignoreversion
+Source: "deploy\DLLs\{#x86_or_x64}\Qt5Core.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "deploy\DLLs\{#x86_or_x64}\Qt5Gui.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "deploy\DLLs\{#x86_or_x64}\Qt5Widgets.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "deploy\DLLs\{#x86_or_x64}\Qt5Network.dll"; DestDir: "{app}"; Flags: ignoreversion
+Source: "deploy\DLLs\{#x86_or_x64}\platforms\qwindows.dll"; DestDir: "{app}\platforms"; Flags: ignoreversion
+Source: "deploy\gstreamer\{#x86_or_x64}\*"; DestDir: "{app}\gstreamer"; Flags: recursesubdirs ignoreversion
+Source: "deploy\vc_redist\vc_redist.{#x86_or_x64}.exe"; DestDir: "{tmp}"; Flags: deleteafterinstall 
+Source: "deploy\bonjour\Bonjour.{#x86_or_x64}.msi"; DestDir: "{tmp}" ; Flags: deleteafterinstall
+
+Source: "..\deploy\Makeflix_Open_Source_Libraries.pdf"; DestDir: "{app}"
+
+[Icons]
+Name: "{group}\Makeflix"; Filename: "{app}\makeflix.exe"
+Name: "{group}\Uninstall Makeflix"; Filename: "{uninstallexe}"
+
+
+[Run]
+#define VCmsg "Installing Microsoft Visual C++ Redistributable ..."
+Filename: "{tmp}\vc_redist{#x86_or_x64}.exe"; StatusMsg: "{#VCmsg}"; Check: not VCinstalled
+#define BonjourMsg "Installing Apple Bonjour support ..."
+Filename: "msiexec"; Parameters: "/i {tmp}\Bonjour.{#x86_or_x64}.msi"; StatusMsg: "{#BonjourMsg}"; Check: not BonjourInstalled
+
+[Registry]
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\makeflix.exe"; ValueType: string; ValueName: "(Default)"; ValueData: "{app}\makeflix.exe"; Flags: uninsdeletekey
+Root: HKLM; Subkey: "SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\makeflix.exe"; ValueType: string; ValueName: "Path"; ValueData: "{app}\gstreamer\bin"; Flags: uninsdeletekey
+
+[Code]
+function VCinstalled: Boolean;
+ // By Michael Weiner <mailto:spam@cogit.net>
+ // Function for Inno Setup Compiler
+ // 13 November 2015
+ // Modified by Frank G Halasz to handle WOW case
+ // 23 August 2016
+ // Returns True if Microsoft Visual C++ Redistributable is installed, otherwise False.
+ // The programmer may set the year of redistributable to find; see below.
+ var
+  names: TArrayOfString;
+  i: Integer;
+  dName, key, year, platfm: String;
+ begin
+  // Year of redistributable to find; leave null to find installation for any year.
+  year := '2015';
+  Result := False;
+  if Is64BitInstallMode then
+    begin
+      platfm := 'x64'; 
+      key := 'Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall';
+    end
+  else if not IsWin64 then
+    begin
+      platfm := 'x86';
+      key := 'Software\Microsoft\Windows\CurrentVersion\Uninstall';
+    end
+  else
+    begin
+      platfm := 'x86';
+      key := 'Software\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall';
+    end;
+  // Get an array of all of the uninstall subkey names.
+  if RegGetSubkeyNames(HKEY_LOCAL_MACHINE, key, names) then
+   // Uninstall subkey names were found.
+   begin
+    i := 0
+    while ((i < GetArrayLength(names)) and (Result = False)) do
+     // The loop will end as soon as one instance of a Visual C++ redistributable is found.
+     begin
+      // For each uninstall subkey, look for a DisplayName value.
+      // If not found, then the subkey name will be used instead.
+      if not RegQueryStringValue(HKEY_LOCAL_MACHINE, key + '\' + names[i], 'DisplayName', dName) then
+       dName := names[i];
+      // See if the value contains both of the strings below.
+      Result := (Pos(Trim('Visual C++ ' + year),dName) * Pos('Redistributable',dName) * Pos(platfm, dName) <> 0)
+      i := i + 1;
+     end;
+   end;
+ end;
+
+ function BonjourInstalled: Boolean;
+ // Returns True if Apple Bonjour is installed, otherwise False.
+ // Ignores date/version of Bonjour.
+ begin
+  Result := False;
+  // If this key exists, then
+  // bonjour services must already be installed
+  if RegKeyExists(HKEY_LOCAL_MACHINE, 'SYSTEM\CurrentControlSet\Services\Bonjour Service') then
+   // Uninstall subkey names were found.
+   begin
+     Result := True;
+   end;
+ end;

installers/cygwin/medley.iss

@@ -0,0 +1,85 @@
+;###############################################################################
+;#
+;#    medley.iss - Inno Setup compiler script for creating a Windows
+;#                 installer for cygwin and Medley on cygwin
+;#
+;#   2023-06-03 Frank Halasz
+;#
+;#   Copyright 2023 Interlisp.org
+;#
+;###############################################################################
+
+#define x86_or_x64 "x64"
+#if GetEnv('COMBINED_RELEASE_TAG') != ""
+#define VERSION=GetEnv('COMBINED_RELEASE_TAG')
+#else
+#define VERSION="local"
+#endif
+
+#if GetEnv('CYGWIN_INSTALLER_BASE') != ""
+#define OUTFILE=GetEnv('CYGWIN_INSTALLER_BASE')
+#else
+#define OUTFILE="medley-full-cygwin-x86_64-local"
+#endif
+
+[Setup]
+PrivilegesRequired=lowest
+ArchitecturesAllowed={#x86_or_x64}
+AppName=Medley
+AppVersion={#version}
+AppPublisher=Interlisp.org
+AppPublisherURL=https://interlisp.org/
+AppCopyright=Copyright (C) 2023 Interlisp.org
+DefaultDirName={%USERPROFILE}\il
+DefaultGroupName=Medley
+Compression=lzma2
+SolidCompression=yes
+; "ArchitecturesInstallIn64BitMode=x64" requests that the install be
+; done in "64-bit mode" on x64, meaning it should use the native
+; 64-bit Program Files directory and the 64-bit view of the registry.
+ArchitecturesInstallIn64BitMode=x64
+OutputDir="."
+OutputBaseFilename={#OUTFILE}
+SetupIconFile="Medley.ico"
+DisableWelcomePage=no
+MissingRunOnceIdsWarning=no
+DisableProgramGroupPage=yes
+WizardImageFile=medley_logo.bmp
+WizardSmallImageFile=medley_logo_small.bmp
+WizardImageStretch=no
+UninstallDisplayIcon="{app}\Medley.ico"
+UninstallFilesDir={app}\uninstall
+UsePreviousAppDir=no
+
+[Dirs]
+Name: "{app}\install"; Permissions: everyone-full
+Name: "{app}\uninstall"; Permissions: everyone-full
+Name: "{app}\cygwin"; Permissions: everyone-full
+
+[Files]
+Source: "setup-x86_64.exe"; DestDir: "{app}\cygwin"; DestName: "setup-x86_64.exe"; Flags: ignoreversion
+Source: "maiko-cygwin.x86_64.tgz"; DestDir: "{app}\install"; DestName: "maiko-cygwin.x86_64.tgz"; Flags: ignoreversion
+Source: "medley.tgz"; DestDir: "{app}\install"; DestName: "medley.tgz"; Flags: ignoreversion
+Source: "..\win\editpath\x86_64\EditPath.exe"; DestDir: "{app}\uninstall"; DestName: "EditPath.exe"; Flags: ignoreversion
+Source: "Medley.ico"; DestDir: "{app}"; DestName: "Medley.ico"; Flags: ignoreversion
+
+[Icons]
+Name: "{group}\Medley\Uninstall_Medley"; Filename: "{uninstallexe}"
+; Name: "{group}\Medley\Medley"; Filename: "powershell"; Parameters: "-NoExit -File {app}\medley.ps1 --help"; IconFilename: "{app}\Medley.ico"
+
+[Run]
+Filename: "{app}\cygwin\setup-x86_64.exe"; Parameters: "--quiet-mode --no-admin --wait --no-shortcuts --no-write-registry --verbose --root {app} --site http://www.gtlib.gatech.edu/pub/cygwin/ --only-site --local-package-dir {app}\cygwin --packages nano,xdg-utils"; StatusMsg: "Installing Cygwin ..."
+Filename: "{app}\bin\bash"; Parameters: "-login -c 'sed -i -e s/^none/#none/ /etc/fstab && echo none / cygdrive binary,posix=0,user 0 0 >>/etc/fstab'"; Flags: runhidden
+Filename: "tar"; Parameters: "-x -z -C {app} -f {app}\install\medley.tgz"; Flags: runhidden; StatusMsg: "Installing Medley ..."
+Filename: "powershell"; Parameters: "remove-item -force -recurse {app}\maiko"; Flags: runhidden; StatusMsg: "Installing Maiko ..."
+Filename: "tar"; Parameters: "-x -z -C {app} -f {app}\install\maiko-cygwin.x86_64.tgz"; Flags: runhidden; StatusMsg: "Installing Maiko ..."
+; Recreate medley symbolic links (lost in tars)
+Filename: "{app}\bin\bash"; Parameters: "-login -c 'cd /medley/scripts/medley && ln -s medley.command medley.sh && cd ../.. && ln -s /medley/scripts/medley/medley.sh medley'"; Flags: runhidden
+; Create medley.bat
+Filename: "powershell"; Parameters: "write-output \""{app}\bin\bash -login -c '/medley/scripts/medley/medley.sh %*'\""  | out-file medley.bat -Encoding ascii"; WorkingDir: "{app}"; Flags: runhidden; StatusMsg: "Creating medley.bat ..."
+Filename: "{app}\uninstall\EditPath.exe"; Parameters: "--user --add {app}"; Flags: runhidden; StatusMsg: "Adding to PATH ..."
+Filename: "powershell"; Parameters: "remove-item -recurse -force {app}\install"; Flags: runhidden; StatusMsg: "Cleaning up ..."
+
+[UninstallRun]
+Filename: "{app}\uninstall\EditPath.exe"; Parameters: "--user --remove {app}"; Flags: runhidden 
+

installers/downloads_page/medley_downloads.html

@@ -38,6 +38,9 @@
 <p><a href="@@@DOWNLOAD_URL@@@/medley-full-wsl-aarch64-@@@COMBINED.RELEASE.TAG@@@.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p></li>
 </ul></li>
 </ul></li>
+<li><h2>WINDOWS 10/11 (Single install based on cygwin - Docker install deprecated)</h2>
+
+<p><a href="@@@DOWNLOAD_URL@@@/@@@CYGWIN.INSTALLER@@@">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for Windows x64 machines</a></p></li>
 <li><h2>macOS 11 (Big Sur) and later - for both Intel and Apple Silicon</h2>
 
 <ul>
@@ -48,8 +51,5 @@
 
 <p><a href="@@@DOWNLOAD_URL@@@/medley-full-macos-universal-@@@COMBINED.RELEASE.TAG@@@.zip">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@</a></p></li>
 </ul></li>
-<li><h2>WINDOWS 10/11 (Medley running within Cygwin)</h2>
-
-<p>Not available</p></li>
 </ul></li>
 </ul>

installers/downloads_page/medley_downloads.md

@@ -34,6 +34,10 @@
 
              [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/medley-full-wsl-aarch64-@@@COMBINED.RELEASE.TAG@@@.tgz)
 
+     *    ## WINDOWS 10/11 (Single install based on cygwin - Docker install deprecated)
+
+     [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for Windows x64 machines](@@@DOWNLOAD_URL@@@/@@@CYGWIN.INSTALLER@@@)
+
      *    ## macOS 11 (Big Sur) and later - for both Intel and Apple Silicon
 
          *    ### DMG Installer
@@ -43,12 +47,3 @@
          *    ### ZIP Installer
 
               [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@](@@@DOWNLOAD_URL@@@/medley-full-macos-universal-@@@COMBINED.RELEASE.TAG@@@.zip)
-
-     *    ## WINDOWS 10/11 (Medley running within Cygwin)
-
-          Not available
-
-
-
-
-

installers/win/editpath/EditPath.iss

@@ -1,165 +1,165 @@
-; Copyright (C) 2021-2023 by Bill Stewart (bstewart at iname.com)
-;
-; This program is free software; you can redistribute it and/or modify it under
-; the terms of the GNU Lesser General Public License as published by the Free
-; Software Foundation; either version 3 of the License, or (at your option) any
-; later version.
-;
-; This program is distributed in the hope that it will be useful, but WITHOUT
-; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-; FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
-; details.
-;
-; You should have received a copy of the GNU Lesser General Public License
-; along with this program. If not, see https://www.gnu.org/licenses/.
-
-; Sample Inno Setup (https://www.jrsoftware.org/isinfo.php) script
-; demonstrating use of PathMgr.dll.
-;
-; This script uses PathMgr.dll in the following ways:
-; * Copies PathMgr.dll to the target machine (required for uninstall)
-; * Defines a task in [Tasks] that should modify the Path
-; * Imports the AddDirToPath() DLL function at setup time
-; * Imports the RemoveDirFromPath() DLL function at uninstall time
-; * Stores task state as custom setting using RegisterPreviousData()
-; * Retrieves task state custom setting during setup and uninstall initialize
-; * At post install, adds app dir to Path if task selected
-; * At uninstall, removes dir from Path if custom setting present
-; * Unloads and deletes DLL and removes app dir at uninstall deinitialize
-
-#if Ver < EncodeVer(6,0,0,0)
-  #error This script requires Inno Setup 6 or later
-#endif
-
-[Setup]
-AppId={{A17D2D05-C729-4F2A-9CC7-E04906C5A842}
-AppName=EditPath
-AppVersion=4.0.4.0
-UsePreviousAppDir=false
-DefaultDirName={autopf}\EditPath
-Uninstallable=true
-OutputDir=.
-OutputBaseFilename=EditPath_Setup
-ArchitecturesInstallIn64BitMode=x64
-PrivilegesRequired=none
-PrivilegesRequiredOverridesAllowed=dialog
-
-[Files]
-; Install PathMgr.dll for use with both setup and uninstall; use
-; uninsneveruninstall flag because DeinitializeSetup() will delete after
-; unloading the DLL; install the 32-bit version of PathMgr.dll because both
-; setup and uninstall executables are 32-bit
-Source: "i386\PathMgr.dll";  DestDir: "{app}"; Flags: uninsneveruninstall
-
-; Other files to install on target system
-Source: "i386\EditPath.exe";   DestDir: "{app}"; Check: not Is64BitInstallMode()
-Source: "x86_64\EditPath.exe"; DestDir: "{app}"; Check: Is64BitInstallMode()
-Source: "EditPath.md";         DestDir: "{app}"
-
-[Tasks]
-Name: modifypath; Description: "&Add to Path"
-
-[Code]
-const
-  MODIFY_PATH_TASK_NAME = 'modifypath';  // Specify name of task
-
-var
-  PathIsModified: Boolean;          // Cache task selection from previous installs
-  ApplicationUninstalled: Boolean;  // Has application been uninstalled?
-
-// Import AddDirToPath() at setup time ('files:' prefix)
-function DLLAddDirToPath(DirName: string; PathType, AddType: DWORD): DWORD;
-  external 'AddDirToPath@files:PathMgr.dll stdcall setuponly';
-
-// Import RemoveDirFromPath() at uninstall time ('{app}\' prefix)
-function DLLRemoveDirFromPath(DirName: string; PathType: DWORD): DWORD;
-  external 'RemoveDirFromPath@{app}\PathMgr.dll stdcall uninstallonly';
-
-// Wrapper for AddDirToPath() DLL function
-function AddDirToPath(const DirName: string): DWORD;
-var
-  PathType, AddType: DWORD;
-begin
-  // PathType = 0 - use system Path
-  // PathType = 1 - use user Path
-  // AddType = 0 - add to end of Path
-  // AddType = 1 - add to beginning of Path
-  if IsAdminInstallMode() then
-    PathType := 0
-  else
-    PathType := 1;
-  AddType := 0;
-  result := DLLAddDirToPath(DirName, PathType, AddType);
-end;
-
-// Wrapper for RemoveDirFromPath() DLL function
-function RemoveDirFromPath(const DirName: string): DWORD;
-var
-  PathType: DWORD;
-begin
-  // PathType = 0 - use system Path
-  // PathType = 1 - use user Path
-  if IsAdminInstallMode() then
-    PathType := 0
-  else
-    PathType := 1;
-  result := DLLRemoveDirFromPath(DirName, PathType);
-end;
-
-procedure RegisterPreviousData(PreviousDataKey: Integer);
-begin
-  // Store previous or current task selection as custom user setting
-  if PathIsModified or WizardIsTaskSelected(MODIFY_PATH_TASK_NAME) then
-    SetPreviousData(PreviousDataKey, MODIFY_PATH_TASK_NAME, 'true');
-end;
-
-function InitializeSetup(): Boolean;
-begin
-  result := true;
-  // Was task selected during a previous install?
-  PathIsModified := GetPreviousData(MODIFY_PATH_TASK_NAME, '') = 'true';
-end;
-
-function InitializeUninstall(): Boolean;
-begin
-  result := true;
-  // Was task selected during a previous install?
-  PathIsModified := GetPreviousData(MODIFY_PATH_TASK_NAME, '') = 'true';
-  ApplicationUninstalled := false;
-end;
-
-procedure CurStepChanged(CurStep: TSetupStep);
-begin
-  if CurStep = ssPostInstall then
-  begin
-    // Add app directory to Path at post-install step if task selected
-    if PathIsModified or WizardIsTaskSelected(MODIFY_PATH_TASK_NAME) then
-      AddDirToPath(ExpandConstant('{app}'));
-  end;
-end;
-
-procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
-begin
-  if CurUninstallStep = usUninstall then
-  begin
-    // Remove app directory from path during uninstall if task was selected;
-    // use variable because we can't use WizardIsTaskSelected() at uninstall
-    if PathIsModified then
-      RemoveDirFromPath(ExpandConstant('{app}'));
-  end
-  else if CurUninstallStep = usPostUninstall then
-  begin
-    ApplicationUninstalled := true;
-  end;
-end;
-
-procedure DeinitializeUninstall();
-begin
-  if ApplicationUninstalled then
-  begin
-    // Unload and delete PathMgr.dll and remove app dir when uninstalling
-    UnloadDLL(ExpandConstant('{app}\PathMgr.dll'));
-    DeleteFile(ExpandConstant('{app}\PathMgr.dll'));
-    RemoveDir(ExpandConstant('{app}'));
-  end;
-end;
+; Copyright (C) 2021-2023 by Bill Stewart (bstewart at iname.com)
+;
+; This program is free software; you can redistribute it and/or modify it under
+; the terms of the GNU Lesser General Public License as published by the Free
+; Software Foundation; either version 3 of the License, or (at your option) any
+; later version.
+;
+; This program is distributed in the hope that it will be useful, but WITHOUT
+; ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+; FOR A PARTICULAR PURPOSE. See the GNU General Lesser Public License for more
+; details.
+;
+; You should have received a copy of the GNU Lesser General Public License
+; along with this program. If not, see https://www.gnu.org/licenses/.
+
+; Sample Inno Setup (https://www.jrsoftware.org/isinfo.php) script
+; demonstrating use of PathMgr.dll.
+;
+; This script uses PathMgr.dll in the following ways:
+; * Copies PathMgr.dll to the target machine (required for uninstall)
+; * Defines a task in [Tasks] that should modify the Path
+; * Imports the AddDirToPath() DLL function at setup time
+; * Imports the RemoveDirFromPath() DLL function at uninstall time
+; * Stores task state as custom setting using RegisterPreviousData()
+; * Retrieves task state custom setting during setup and uninstall initialize
+; * At post install, adds app dir to Path if task selected
+; * At uninstall, removes dir from Path if custom setting present
+; * Unloads and deletes DLL and removes app dir at uninstall deinitialize
+
+#if Ver < EncodeVer(6,0,0,0)
+  #error This script requires Inno Setup 6 or later
+#endif
+
+[Setup]
+AppId={{A17D2D05-C729-4F2A-9CC7-E04906C5A842}
+AppName=EditPath
+AppVersion=4.0.4.0
+UsePreviousAppDir=false
+DefaultDirName={autopf}\EditPath
+Uninstallable=true
+OutputDir=.
+OutputBaseFilename=EditPath_Setup
+ArchitecturesInstallIn64BitMode=x64
+PrivilegesRequired=none
+PrivilegesRequiredOverridesAllowed=dialog
+
+[Files]
+; Install PathMgr.dll for use with both setup and uninstall; use
+; uninsneveruninstall flag because DeinitializeSetup() will delete after
+; unloading the DLL; install the 32-bit version of PathMgr.dll because both
+; setup and uninstall executables are 32-bit
+Source: "i386\PathMgr.dll";  DestDir: "{app}"; Flags: uninsneveruninstall
+
+; Other files to install on target system
+Source: "i386\EditPath.exe";   DestDir: "{app}"; Check: not Is64BitInstallMode()
+Source: "x86_64\EditPath.exe"; DestDir: "{app}"; Check: Is64BitInstallMode()
+Source: "EditPath.md";         DestDir: "{app}"
+
+[Tasks]
+Name: modifypath; Description: "&Add to Path"
+
+[Code]
+const
+  MODIFY_PATH_TASK_NAME = 'modifypath';  // Specify name of task
+
+var
+  PathIsModified: Boolean;          // Cache task selection from previous installs
+  ApplicationUninstalled: Boolean;  // Has application been uninstalled?
+
+// Import AddDirToPath() at setup time ('files:' prefix)
+function DLLAddDirToPath(DirName: string; PathType, AddType: DWORD): DWORD;
+  external 'AddDirToPath@files:PathMgr.dll stdcall setuponly';
+
+// Import RemoveDirFromPath() at uninstall time ('{app}\' prefix)
+function DLLRemoveDirFromPath(DirName: string; PathType: DWORD): DWORD;
+  external 'RemoveDirFromPath@{app}\PathMgr.dll stdcall uninstallonly';
+
+// Wrapper for AddDirToPath() DLL function
+function AddDirToPath(const DirName: string): DWORD;
+var
+  PathType, AddType: DWORD;
+begin
+  // PathType = 0 - use system Path
+  // PathType = 1 - use user Path
+  // AddType = 0 - add to end of Path
+  // AddType = 1 - add to beginning of Path
+  if IsAdminInstallMode() then
+    PathType := 0
+  else
+    PathType := 1;
+  AddType := 0;
+  result := DLLAddDirToPath(DirName, PathType, AddType);
+end;
+
+// Wrapper for RemoveDirFromPath() DLL function
+function RemoveDirFromPath(const DirName: string): DWORD;
+var
+  PathType: DWORD;
+begin
+  // PathType = 0 - use system Path
+  // PathType = 1 - use user Path
+  if IsAdminInstallMode() then
+    PathType := 0
+  else
+    PathType := 1;
+  result := DLLRemoveDirFromPath(DirName, PathType);
+end;
+
+procedure RegisterPreviousData(PreviousDataKey: Integer);
+begin
+  // Store previous or current task selection as custom user setting
+  if PathIsModified or WizardIsTaskSelected(MODIFY_PATH_TASK_NAME) then
+    SetPreviousData(PreviousDataKey, MODIFY_PATH_TASK_NAME, 'true');
+end;
+
+function InitializeSetup(): Boolean;
+begin
+  result := true;
+  // Was task selected during a previous install?
+  PathIsModified := GetPreviousData(MODIFY_PATH_TASK_NAME, '') = 'true';
+end;
+
+function InitializeUninstall(): Boolean;
+begin
+  result := true;
+  // Was task selected during a previous install?
+  PathIsModified := GetPreviousData(MODIFY_PATH_TASK_NAME, '') = 'true';
+  ApplicationUninstalled := false;
+end;
+
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssPostInstall then
+  begin
+    // Add app directory to Path at post-install step if task selected
+    if PathIsModified or WizardIsTaskSelected(MODIFY_PATH_TASK_NAME) then
+      AddDirToPath(ExpandConstant('{app}'));
+  end;
+end;
+
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+begin
+  if CurUninstallStep = usUninstall then
+  begin
+    // Remove app directory from path during uninstall if task was selected;
+    // use variable because we can't use WizardIsTaskSelected() at uninstall
+    if PathIsModified then
+      RemoveDirFromPath(ExpandConstant('{app}'));
+  end
+  else if CurUninstallStep = usPostUninstall then
+  begin
+    ApplicationUninstalled := true;
+  end;
+end;
+
+procedure DeinitializeUninstall();
+begin
+  if ApplicationUninstalled then
+  begin
+    // Unload and delete PathMgr.dll and remove app dir when uninstalling
+    UnloadDLL(ExpandConstant('{app}\PathMgr.dll'));
+    DeleteFile(ExpandConstant('{app}\PathMgr.dll'));
+    RemoveDir(ExpandConstant('{app}'));
+  end;
+end;

installers/win/editpath/EditPath.md

@@ -1,118 +1,118 @@
-# EditPath
-
-EditPath is a Windows console (text-based, command-line) program for managing the system Path and user Path.
-
-# Author
-
-Bill Stewart - bstewart at iname dot com
-
-# License
-
-EditPath.exe is covered by the GNU Lesser Public License (LPGL). See the file `LICENSE` for details.
-
-# Download
-
-https://github.com/Bill-Stewart/PathMgr/releases/
-
-# Background
-
-The system Path is found in the following location in the Windows registry:
-
-Root: `HKEY_LOCAL_MACHINE`  
-Subkey: `SYSTEM\CurrentControlSet\Control\Session Manager\Environment`  
-Value name: `Path`
-
-The current user Path is found in the following location in the registry:
-
-Root: `HKEY_CURRENT_USER`  
-Subkey: `Environment`  
-Value name: `Path`
-
-In both cases, the `Path` value is (or should be) the registry type `REG_EXPAND_SZ`, which means that it is a string that can contain values surrounded by `%` characters that Windows will automatically expand to environment variable values. (For example, `%SystemRoot%` will be expanded to `C:\Windows` on most systems.)
-
-The `Path` value contains a `;`-delimited list of directory names that the system should search for executables, library files, scripts, etc. Windows appends the content of the current user Path to the system Path and expands the environment variable references. The resulting string is set as the `Path` environment variable for processes.
-
-EditPath provides a command-line interface for managing the `Path` value in the system location (in `HKEY_LOCAL_MACHINE`) and the current user location (in `HKEY_CURRENT_USER`).
-
-# Usage
-
-The following describes the command-line usage for the program. Parameters are case-sensitive.
-
-**EditPath** [_options_] _type_ _action_
-
-You must specify only one of the following _type_ parameters:
-
-| _type_       | Abbreviation | Description
-| -------      | ------------ | -----------
-| **--system** | **-s**       | Specifies the system Path
-| **--user**   | **-u**       | Specifies the user Path
-
-You must specify only one of the following _action_ parameters:
-
-| _action_                     | Abbreviation           | Description
-| --------                     | ------------           | -----------
-| **--list**                   | **-l**                 | Lists directories in Path
-| **--test "**_dirname_**"**   | **-t "**_dirname_**"** | Tests if directory exists in Path
-| **--add "**_dirname_**"**    | **-a "**_dirname_**"** | Adds directory to Path
-| **--remove "**_dirname_**"** | **-r "**_dirname_**"** | Removes directory from Path
-
-The following parameters are optional:
-
-| _options_       | Abbreviation | Description
-| ---------       | ------------ | -----------
-| **--quiet**     | **-q**       | Suppresses result messages
-| **--expand**    | **-x**       | Expands environment variables (**--list** only)
-| **--beginning** | **-b**       | Adds to beginning of Path (**--add** only)
-
-# Exit Codes
-
-The following table lists typical exit codes when not using **--test** (**-t**).
-
-| Exit Code | Description
-| --------- | -----------
-| 0         | No errors
-| 2         | The Path value is not present in the registry
-| 3         | The specified directory does not exist in the Path
-| 5         | Access is denied
-| 87        | Incorrect parameter(s)
-| 183       | The specified directory already exists in the Path
-
-The following table lists typical exit codes when using **--test** (**-t**).
-
-| Exit Code | Description
-| --------- | -----------
-| 1         | The specified directory exists in the unexpanded Path
-| 2         | The specified directory exists in the expanded Path
-| 3         | The specified directory does not exist in the Path
-
-# Remarks
-
-* Anything on the command line after **--test**, **--add**, or **--remove** is considered to be the argument for the parameter. To avoid ambiguity, specify the _action_ parameter last on the command line.
-
-* Uexpanded vs. expanded refers to whether the environment variable references (i.e., names between `%` characters) are expanded after retrieving the Path value from the registry. For example, `%SystemRoot%` is unexpanded but `C:\Windows` is expanded.
-
-* The **--add** (**-a**) parameter checks whether the specified directory exists in both the unexpanded and expanded copies of the Path before adding the directory. For example, if the environment variable `TESTAPP` is set to `C:\TestApp` and `%TESTAPP%` is in the Path, specifying `--add C:\TestApp` will return exit code 183 (i.e., the directory already exists in the Path) because `%TESTAPP%` expands to `C:\TestApp`.
-
-* The **--remove** (**-r**) parameter does not expand environment variable references. For example, if the environment variable `TESTAPP` is set to `C:\TestApp` and `%TESTAPP%` is in the Path, specifying `--remove "C:\TestApp"` will return exit code 3 (i.e., the directory does not exist in the Path) because **--remove** does not expand `%TESTAPP%` to `C:\TestApp`. For the command to succeed, you would have to specify `--remove "%TESTAPP%"` instead.
-
-* The program will exit with error code 87 if a parameter (or an argument to a parameter) is missing or not valid, if mutually exclusive parameters are specified, etc.
-
-* The program will exit with error code 5 if the current user does not have permission to update the Path value in the registry (for example, if you try to update the system Path using a standard user account or an unelevated administrator account).
-
-# Examples
-
-1.  `EditPath --expand --system --list`
-
-    This command outputs the directories in the system Path, with environment variables expanded. You can also write this command as `EditPath -x -s -l`.
-
-2.  `EditPath --user --add "%LOCALAPPDATA%\Programs\MyApp"`
-
-    Adds the specified directory name to the user Path.
-
-3.  `EditPath -s -r "C:\Program Files\MyApp\bin"`
-
-    Removes the specified directory from the system Path.
-
-4.  `EditPath -s --test "C:\Program Files (x86)\MyApp\bin"`
-
-    Returns an exit code of 3 if the specified directory is not in the system Path, 1 if the specified directory is in the unexpanded copy of the system Path, or 2 if the specified directory is in the expanded copy of the system Path.
+# EditPath
+
+EditPath is a Windows console (text-based, command-line) program for managing the system Path and user Path.
+
+# Author
+
+Bill Stewart - bstewart at iname dot com
+
+# License
+
+EditPath.exe is covered by the GNU Lesser Public License (LPGL). See the file `LICENSE` for details.
+
+# Download
+
+https://github.com/Bill-Stewart/PathMgr/releases/
+
+# Background
+
+The system Path is found in the following location in the Windows registry:
+
+Root: `HKEY_LOCAL_MACHINE`  
+Subkey: `SYSTEM\CurrentControlSet\Control\Session Manager\Environment`  
+Value name: `Path`
+
+The current user Path is found in the following location in the registry:
+
+Root: `HKEY_CURRENT_USER`  
+Subkey: `Environment`  
+Value name: `Path`
+
+In both cases, the `Path` value is (or should be) the registry type `REG_EXPAND_SZ`, which means that it is a string that can contain values surrounded by `%` characters that Windows will automatically expand to environment variable values. (For example, `%SystemRoot%` will be expanded to `C:\Windows` on most systems.)
+
+The `Path` value contains a `;`-delimited list of directory names that the system should search for executables, library files, scripts, etc. Windows appends the content of the current user Path to the system Path and expands the environment variable references. The resulting string is set as the `Path` environment variable for processes.
+
+EditPath provides a command-line interface for managing the `Path` value in the system location (in `HKEY_LOCAL_MACHINE`) and the current user location (in `HKEY_CURRENT_USER`).
+
+# Usage
+
+The following describes the command-line usage for the program. Parameters are case-sensitive.
+
+**EditPath** [_options_] _type_ _action_
+
+You must specify only one of the following _type_ parameters:
+
+| _type_       | Abbreviation | Description
+| -------      | ------------ | -----------
+| **--system** | **-s**       | Specifies the system Path
+| **--user**   | **-u**       | Specifies the user Path
+
+You must specify only one of the following _action_ parameters:
+
+| _action_                     | Abbreviation           | Description
+| --------                     | ------------           | -----------
+| **--list**                   | **-l**                 | Lists directories in Path
+| **--test "**_dirname_**"**   | **-t "**_dirname_**"** | Tests if directory exists in Path
+| **--add "**_dirname_**"**    | **-a "**_dirname_**"** | Adds directory to Path
+| **--remove "**_dirname_**"** | **-r "**_dirname_**"** | Removes directory from Path
+
+The following parameters are optional:
+
+| _options_       | Abbreviation | Description
+| ---------       | ------------ | -----------
+| **--quiet**     | **-q**       | Suppresses result messages
+| **--expand**    | **-x**       | Expands environment variables (**--list** only)
+| **--beginning** | **-b**       | Adds to beginning of Path (**--add** only)
+
+# Exit Codes
+
+The following table lists typical exit codes when not using **--test** (**-t**).
+
+| Exit Code | Description
+| --------- | -----------
+| 0         | No errors
+| 2         | The Path value is not present in the registry
+| 3         | The specified directory does not exist in the Path
+| 5         | Access is denied
+| 87        | Incorrect parameter(s)
+| 183       | The specified directory already exists in the Path
+
+The following table lists typical exit codes when using **--test** (**-t**).
+
+| Exit Code | Description
+| --------- | -----------
+| 1         | The specified directory exists in the unexpanded Path
+| 2         | The specified directory exists in the expanded Path
+| 3         | The specified directory does not exist in the Path
+
+# Remarks
+
+* Anything on the command line after **--test**, **--add**, or **--remove** is considered to be the argument for the parameter. To avoid ambiguity, specify the _action_ parameter last on the command line.
+
+* Uexpanded vs. expanded refers to whether the environment variable references (i.e., names between `%` characters) are expanded after retrieving the Path value from the registry. For example, `%SystemRoot%` is unexpanded but `C:\Windows` is expanded.
+
+* The **--add** (**-a**) parameter checks whether the specified directory exists in both the unexpanded and expanded copies of the Path before adding the directory. For example, if the environment variable `TESTAPP` is set to `C:\TestApp` and `%TESTAPP%` is in the Path, specifying `--add C:\TestApp` will return exit code 183 (i.e., the directory already exists in the Path) because `%TESTAPP%` expands to `C:\TestApp`.
+
+* The **--remove** (**-r**) parameter does not expand environment variable references. For example, if the environment variable `TESTAPP` is set to `C:\TestApp` and `%TESTAPP%` is in the Path, specifying `--remove "C:\TestApp"` will return exit code 3 (i.e., the directory does not exist in the Path) because **--remove** does not expand `%TESTAPP%` to `C:\TestApp`. For the command to succeed, you would have to specify `--remove "%TESTAPP%"` instead.
+
+* The program will exit with error code 87 if a parameter (or an argument to a parameter) is missing or not valid, if mutually exclusive parameters are specified, etc.
+
+* The program will exit with error code 5 if the current user does not have permission to update the Path value in the registry (for example, if you try to update the system Path using a standard user account or an unelevated administrator account).
+
+# Examples
+
+1.  `EditPath --expand --system --list`
+
+    This command outputs the directories in the system Path, with environment variables expanded. You can also write this command as `EditPath -x -s -l`.
+
+2.  `EditPath --user --add "%LOCALAPPDATA%\Programs\MyApp"`
+
+    Adds the specified directory name to the user Path.
+
+3.  `EditPath -s -r "C:\Program Files\MyApp\bin"`
+
+    Removes the specified directory from the system Path.
+
+4.  `EditPath -s --test "C:\Program Files (x86)\MyApp\bin"`
+
+    Returns an exit code of 3 if the specified directory is not in the system Path, 1 if the specified directory is in the unexpanded copy of the system Path, or 2 if the specified directory is in the expanded copy of the system Path.

internal/MEDLEY-UTILS

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

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

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

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


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

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

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


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


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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

library/BIGBITMAPS

@@ -1,15 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED " 9-Jul-2022 09:41:26" 
-|{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>BIGBITMAPS.;12|
 108851 
+
(FILECREATED "31-Jul-2023 13:39:50" |{WMEDLEY}<library>BIGBITMAPS.;13|
 109376 
+
+      :EDIT-BY |rmk|
 
       :CHANGES-TO (VARS BIGBITMAPSCOMS)
-                  (FNS \\GENERIC.DSPCREATE.DESTINATION.BITMAP?.BIGBM \\GENERIC.DSPCREATE.BIGBM 
-                       \\DSPCREATE.BIGBM)
-                  (MACROS |\\SFInvert|)
+                  (FNS BIGBITMAPEQUAL)
 
-      :PREVIOUS-DATE "26-Oct-2021 14:51:38" 
-|{DSK}<users>kaplan>local>medley3.5>working-medley>library>BIGBITMAPS.;6|)
+      :PREVIOUS-DATE " 9-Jul-2022 09:41:26" |{WMEDLEY}<library>BIGBITMAPS.;12|)
 
 
 ; Copyright (c) 1991, 1993-1994 by Venue.
@@ -24,8 +22,8 @@
                (MACROS |GetNewFragment|)
                (MACROS |\\SFInvert|))
         (INITRECORDS BIGBM)
-        (FNS BIGBITMAPP BITBLT.BIGBM BITMAPCREATE.BIGBM BITMAPCREATE BITMAPCOPY BLTSHADE.BIGBM BITBLT
-             \\ORG.BITBLT \\BLTSHADE.DISPLAY \\RESHOWBORDER1)
+        (FNS BIGBITMAPP BITBLT.BIGBM BITMAPCREATE.BIGBM BITMAPCREATE BITMAPCOPY BIGBITMAPEQUAL 
+             BLTSHADE.BIGBM BITBLT \\ORG.BITBLT \\BLTSHADE.DISPLAY \\RESHOWBORDER1)
         (FNS \\DRAWCIRCLE.BIGBM \\FILLCIRCLE.BIGBM \\DRAWELLIPSE.BIGBM \\DRAWCURVE.BIGBM 
              \\DRAWLINE.BIGBM.DASH \\DRAWLINE.BIGBM.NODASH)
         (FNS \\GENERIC.DSPCREATE.DESTINATION.BITMAP?.BIGBM)
@@ -353,6 +351,20 @@
                  0 0 NIL NIL 'INPUT 'REPLACE 0)
           (RETURN NEWBITMAP))))
 
+(BIGBITMAPEQUAL

+  (LAMBDA (BM1 BM2)
                                         (* \; "Edited 31-Jul-2023 13:08 by rmk")

+
+    (* |;;| "Fields may not be SMALLP")

+
+    (AND (|type?|
 BIGBM |of|
 BM1)
+         (|type?|
 BIGBM |of|
 BM2)
+         (IEQP (|ffetch|
 (BIGBM BIGBMWIDTH) |of|
 BM1)
+               (|ffetch|
 (BIGBM BIGBMWIDTH) |of|
 BM2))
+         (IEQP (|ffetch|
 (BIGBM BIGBMHEIGHT) |of|
 BM1)
+               (|ffetch|
 (BIGBM BIGBMHEIGHT) |of|
 BM2))
+         (|for|
 B1 |in|
 (|ffetch|
 (BIGBM BIGBMLIST) |of|
 BM1) |as|
 B2
+            |in|
 (|ffetch|
 (BIGBM BIGBMLIST) |of|
 BM2) |always|
 (EQUALBITMAPP B1 B2)))))
+
 (BLTSHADE.BIGBM

   (LAMBDA (TEXTURE DESTINATION DESTLEFT DESTBOTTOM WIDTH HEIGHT OPERATION CLIPPINGREGION)

                                                           (* \; "Edited 17-Oct-89 19:01 by takeshi")

@@ -1699,15 +1711,15 @@
 )
 (PUTPROPS BIGBITMAPS COPYRIGHT ("Venue" 1991 1993 1994))
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (3546 48244 (BIGBITMAPP 3556 . 3702) (BITBLT.BIGBM 3704 . 14527) (BITMAPCREATE.BIGBM 
-14529 . 15871) (BITMAPCREATE 15873 . 17475) (BITMAPCOPY 17477 . 18012) (BLTSHADE.BIGBM 18014 . 21150) 
-(BITBLT 21152 . 22800) (\\ORG.BITBLT 22802 . 34371) (\\BLTSHADE.DISPLAY 34373 . 43611) (
-\\RESHOWBORDER1 43613 . 48242)) (48245 71523 (\\DRAWCIRCLE.BIGBM 48255 . 51618) (\\FILLCIRCLE.BIGBM 
-51620 . 55666) (\\DRAWELLIPSE.BIGBM 55668 . 60188) (\\DRAWCURVE.BIGBM 60190 . 64040) (
-\\DRAWLINE.BIGBM.DASH 64042 . 68401) (\\DRAWLINE.BIGBM.NODASH 68403 . 71521)) (71524 71893 (
-\\GENERIC.DSPCREATE.DESTINATION.BITMAP?.BIGBM 71534 . 71891)) (72025 85168 (DSPDESTINATION 72035 . 
-75933) (|\\SFFixY| 75935 . 81657) (|\\SFFixDestination| 81659 . 82842) (|\\SFFixClippingRegion| 82844
- . 85166)) (85169 93255 (\\SW2BM 85179 . 90203) (BITMAPHEIGHT 90205 . 90703) (BITMAPWIDTH 90705 . 
-91197) (|\\SFFixFont| 91199 . 92171) (BITSPERPIXEL 92173 . 93253)) (93256 108609 (COLORIZEBITMAP 93266
- . 96076) (\\BWTOCOLORBLT 96078 . 102671) (UNCOLORIZEBITMAP 102673 . 108607)))))
+  (FILEMAP (NIL (3364 48769 (BIGBITMAPP 3374 . 3520) (BITBLT.BIGBM 3522 . 14345) (BITMAPCREATE.BIGBM 
+14347 . 15689) (BITMAPCREATE 15691 . 17293) (BITMAPCOPY 17295 . 17830) (BIGBITMAPEQUAL 17832 . 18537) 
+(BLTSHADE.BIGBM 18539 . 21675) (BITBLT 21677 . 23325) (\\ORG.BITBLT 23327 . 34896) (\\BLTSHADE.DISPLAY
+ 34898 . 44136) (\\RESHOWBORDER1 44138 . 48767)) (48770 72048 (\\DRAWCIRCLE.BIGBM 48780 . 52143) (
+\\FILLCIRCLE.BIGBM 52145 . 56191) (\\DRAWELLIPSE.BIGBM 56193 . 60713) (\\DRAWCURVE.BIGBM 60715 . 64565
+) (\\DRAWLINE.BIGBM.DASH 64567 . 68926) (\\DRAWLINE.BIGBM.NODASH 68928 . 72046)) (72049 72418 (
+\\GENERIC.DSPCREATE.DESTINATION.BITMAP?.BIGBM 72059 . 72416)) (72550 85693 (DSPDESTINATION 72560 . 
+76458) (|\\SFFixY| 76460 . 82182) (|\\SFFixDestination| 82184 . 83367) (|\\SFFixClippingRegion| 83369
+ . 85691)) (85694 93780 (\\SW2BM 85704 . 90728) (BITMAPHEIGHT 90730 . 91228) (BITMAPWIDTH 91230 . 
+91722) (|\\SFFixFont| 91724 . 92696) (BITSPERPIXEL 92698 . 93778)) (93781 109134 (COLORIZEBITMAP 93791
+ . 96601) (\\BWTOCOLORBLT 96603 . 103196) (UNCOLORIZEBITMAP 103198 . 109132)))))
 STOP

library/DANDELIONKEYBOARDS

@@ -1,171 +0,0 @@
-((EUROPEAN ((100 (53 197 NOLOCKSHIFT)) (101 (52 196 NOLOCKSHIFT)) (102 (54 198 NOLOCKSHIFT)) (103 (
-61887 61759 LOCKSHIFT)) (104 (55 199 NOLOCKSHIFT)) (105 (61888 61760 LOCKSHIFT)) (106 (61872 61744 
-LOCKSHIFT)) (107 (61860 61732 LOCKSHIFT)) (108 (48 126 NOLOCKSHIFT)) (109 (61892 61764 LOCKSHIFT)) (
-110 (203 207 NOLOCKSHIFT)) (111 (61919 61791 LOCKSHIFT)) (112 (47 191 NOLOCKSHIFT)) (115 (8 8 
-NOLOCKSHIFT) . IGNORE) (116 (51 195 NOLOCKSHIFT)) (117 (50 194 NOLOCKSHIFT)) (118 (61873 61745 
-LOCKSHIFT)) (119 (61858 61730 LOCKSHIFT)) (120 (61874 61746 LOCKSHIFT)) (121 (61859 61731 LOCKSHIFT)) 
-(122 (57 202 NOLOCKSHIFT)) (123 (61886 61758 LOCKSHIFT)) (124 (61864 61736 LOCKSHIFT)) (125 (61903 
-61775 LOCKSHIFT)) (126 (61908 61780 LOCKSHIFT)) (127 (241 225 LOCKSHIFT)) (128 (187 170 LOCKSHIFT)) (
-129 (249 233 LOCKSHIFT)) (132 (49 193 NOLOCKSHIFT)) (133 (92 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 
-NOLOCKSHIFT) . IGNORE) (135 (61905 61777 LOCKSHIFT)) (137 (61869 61741 LOCKSHIFT)) (138 (61877 61749 
-LOCKSHIFT)) (139 (61906 61778 LOCKSHIFT)) (140 (251 90 LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (142 (
-250 234 LOCKSHIFT)) (143 (59 58 LOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (145 (171 186 LOCKSHIFT
-)) (148 (61904 61776 LOCKSHIFT)) (149 (61920 61792 LOCKSHIFT)) (150 (61921 61793 LOCKSHIFT)) (151 (
-61857 61729 LOCKSHIFT)) (152 (61863 61735 LOCKSHIFT)) (153 (56 200 NOLOCKSHIFT)) (154 (61900 61772 
-LOCKSHIFT)) (155 (239 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (
-246 230 LOCKSHIFT)) (159 (207 176 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DANDELION) (logic ((100 (
-53 37 NOLOCKSHIFT)) (101 (52 164 NOLOCKSHIFT)) (102 (54 126 NOLOCKSHIFT)) (103 (61258 61260 
-NOLOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 (61292 61293 NOLOCKSHIFT)) (106 (61271 61270 NOLOCKSHIFT)
-) (107 (61284 61285 NOLOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (61307 61306 NOLOCKSHIFT)) (110 (45 
-177 NOLOCKSHIFT)) (111 (61269 61268 LOCKSHIFT)) (112 (172 174 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . 
-IGNORE) (116 (51 35 NOLOCKSHIFT)) (117 (50 64 NOLOCKSHIFT)) (118 (61240 61241 NOLOCKSHIFT)) (119 (
-61234 61235 NOLOCKSHIFT)) (120 (61266 61262 NOLOCKSHIFT)) (121 (61365 61365 NOLOCKSHIFT)) (122 (57 40 
-NOLOCKSHIFT)) (123 (61275 61274 NOLOCKSHIFT)) (124 (61300 61299 NOLOCKSHIFT)) (125 (61273 61272 
-NOLOCKSHIFT)) (126 (61282 61283 NOLOCKSHIFT)) (127 (61256 61257 NOLOCKSHIFT)) (128 (61356 61356 
-NOLOCKSHIFT)) (129 (93 125 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (133 (92 124 NOLOCKSHIFT) . IGNORE)
- (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (61250 61251 NOLOCKSHIFT)) (137 (61298 61297 NOLOCKSHIFT)) (138
- (61305 61303 NOLOCKSHIFT)) (139 (61265 61264 NOLOCKSHIFT)) (140 (61364 61364 NOLOCKSHIFT)) (141 
-1SHIFTDOWN . 1SHIFTUP) (142 (61281 233 NOLOCKSHIFT)) (143 (61351 61351 NOLOCKSHIFT)) (144 (13 13 
-NOLOCKSHIFT) . IGNORE) (145 (61357 61357 NOLOCKSHIFT)) (148 (61279 61278 NOLOCKSHIFT)) (149 (61239 
-61238 NOLOCKSHIFT)) (150 (61290 61290 NOLOCKSHIFT)) (151 (61263 61261 NOLOCKSHIFT)) (152 (61295 61295 
-NOLOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (154 (61252 61253 NOLOCKSHIFT)) (155 (61254 61255 NOLOCKSHIFT)
-) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (91 123 NOLOCKSHIFT)) (159 (61 43 
-NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DANDELION) (MATH ((100 (53 37 NOLOCKSHIFT)) (101 (52 36 
-NOLOCKSHIFT)) (102 (54 126 NOLOCKSHIFT)) (103 (61284 61285 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 
-(100 68 LOCKSHIFT)) (106 (174 61245 NOLOCKSHIFT)) (107 (61369 61363 NOLOCKSHIFT)) (108 (48 41 
-NOLOCKSHIFT)) (109 (61254 61255 NOLOCKSHIFT)) (110 (45 45 NOLOCKSHIFT)) (111 (173 61246 LOCKSHIFT)) (
-112 (47 61300 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . IGNORE) (116 (51 35 NOLOCKSHIFT)) (117 (50 64 
-NOLOCKSHIFT)) (118 (61282 61283 LOCKSHIFT)) (119 (61287 61286 NOLOCKSHIFT)) (120 (61301 61302 
-NOLOCKSHIFT)) (121 (61351 65 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (175 61247 LOCKSHIFT)) (124 (
-180 184 LOCKSHIFT)) (125 (172 61244 LOCKSHIFT)) (126 (61256 61257 LOCKSHIFT)) (127 (44 61250 
-NOLOCKSHIFT)) (128 (61298 61253 NOLOCKSHIFT)) (129 (93 61265 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (
-133 (92 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (102 70 LOCKSHIFT)) (137 (
-61356 61362 LOCKSHIFT)) (138 (61254 61291 NOLOCKSHIFT)) (139 (98 61360 NOLOCKSHIFT)) (140 (61309 177 
-LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (142 (46 61251 NOLOCKSHIFT)) (143 (61299 61252 NOLOCKSHIFT)) (
-144 (13 13 NOLOCKSHIFT) . IGNORE) (145 (95 94 NOLOCKSHIFT)) (148 (61358 82 LOCKSHIFT)) (149 (61296 
-61266 NOLOCKSHIFT)) (150 (61305 61303 NOLOCKSHIFT)) (151 (61308 61267 LOCKSHIFT)) (152 (61288 72 
-LOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (154 (61357 61361 NOLOCKSHIFT)) (155 (61292 61293 LOCKSHIFT)) (
-156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (91 61264 NOLOCKSHIFT)) (159 (61 43 
-NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DANDELION) (OFFICE ((100 (61397 61381 NOLOCKSHIFT)) (101 (
-61396 61380 NOLOCKSHIFT)) (102 (61398 61382 NOLOCKSHIFT)) (103 (8557 8554 NOLOCKSHIFT)) (104 (61399 
-61383 NOLOCKSHIFT)) (105 (61232 8743 NOLOCKSHIFT)) (106 (61346 8571 NOLOCKSHIFT)) (107 (188 86 
-NOLOCKSHIFT)) (108 (61402 61386 NOLOCKSHIFT)) (109 (210 8738 NOLOCKSHIFT)) (110 (61437 61438 
-NOLOCKSHIFT)) (111 (163 8558 NOLOCKSHIFT)) (112 (61248 63 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . 
-IGNORE) (116 (61395 61379 NOLOCKSHIFT)) (117 (61394 61378 NOLOCKSHIFT)) (118 (185 8553 NOLOCKSHIFT)) (
-119 (176 8546 NOLOCKSHIFT)) (120 (167 8744 NOLOCKSHIFT)) (121 (97 8745 NOLOCKSHIFT)) (122 (61401 61385
- NOLOCKSHIFT)) (123 (162 8570 NOLOCKSHIFT)) (124 (61437 88 NOLOCKSHIFT)) (125 (111 8569 NOLOCKSHIFT)) 
-(126 (61289 8737 NOLOCKSHIFT)) (127 (44 60 NOLOCKSHIFT)) (128 (39 34 NOLOCKSHIFT)) (129 (93 125 
-NOLOCKSHIFT)) (132 (61393 61377 NOLOCKSHIFT)) (133 (92 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 
-NOLOCKSHIFT) . IGNORE) (135 (61233 8742 NOLOCKSHIFT)) (137 (61438 67 NOLOCKSHIFT)) (138 (8739 74 
-NOLOCKSHIFT)) (139 (190 61436 NOLOCKSHIFT)) (140 (189 90 NOLOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (
-142 (61249 62 NOLOCKSHIFT)) (143 (61352 58 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (145 (95 
-61280 NOLOCKSHIFT)) (148 (212 8574 NOLOCKSHIFT)) (149 (61354 8573 NOLOCKSHIFT)) (150 (61286 8741 
-NOLOCKSHIFT)) (151 (165 8572 NOLOCKSHIFT)) (152 (61368 8740 NOLOCKSHIFT)) (153 (61400 61384 
-NOLOCKSHIFT)) (154 (173 175 NOLOCKSHIFT)) (155 (172 174 NOLOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32
- 32 NOLOCKSHIFT) . IGNORE) (158 (91 123 NOLOCKSHIFT)) (159 (61406 61368 NOLOCKSHIFT)) (160 2SHIFTDOWN
- . 2SHIFTUP)) DANDELION) (DVORAK ((100 (49 42 NOLOCKSHIFT)) (101 (51 41 NOLOCKSHIFT)) (102 (57 37 
-NOLOCKSHIFT)) (103 (46 62 NOLOCKSHIFT)) (104 (48 38 NOLOCKSHIFT)) (105 (101 69 LOCKSHIFT)) (106 (103 
-71 LOCKSHIFT)) (107 (107 75 LOCKSHIFT)) (108 (54 45 NOLOCKSHIFT)) (109 (116 84 LOCKSHIFT)) (110 (56 95
- NOLOCKSHIFT)) (111 (108 76 LOCKSHIFT)) (112 (122 90 LOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . IGNORE) (116
- (53 40 NOLOCKSHIFT)) (117 (55 35 NOLOCKSHIFT)) (118 (44 60 NOLOCKSHIFT)) (119 (63 47 NOLOCKSHIFT)) (
-120 (111 79 LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (52 164 NOLOCKSHIFT)) (123 (99 67 LOCKSHIFT)) (
-124 (113 81 LOCKSHIFT)) (125 (114 82 LOCKSHIFT)) (126 (110 78 LOCKSHIFT)) (127 (119 87 LOCKSHIFT)) (
-128 (44 186 NOLOCKSHIFT)) (129 (93 125 NOLOCKSHIFT)) (132 (33 64 NOLOCKSHIFT)) (133 (92 124 
-NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (117 85 LOCKSHIFT)) (137 (106 74 
-LOCKSHIFT)) (138 (104 72 LOCKSHIFT)) (139 (120 88 LOCKSHIFT)) (140 (59 58 NOLOCKSHIFT)) (141 
-1SHIFTDOWN . 1SHIFTUP) (142 (118 86 LOCKSHIFT)) (143 (115 83 LOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . 
-IGNORE) (145 (169 170 NOLOCKSHIFT)) (148 (112 80 LOCKSHIFT)) (149 (121 89 LOCKSHIFT)) (150 (105 73 
-LOCKSHIFT)) (151 (102 70 LOCKSHIFT)) (152 (100 68 LOCKSHIFT)) (153 (50 162 NOLOCKSHIFT)) (154 (98 66 
-LOCKSHIFT)) (155 (109 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (
-91 123 NOLOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DANDELION) (GREEK ((100 (
-53 37 NOLOCKSHIFT)) (101 (52 36 NOLOCKSHIFT)) (102 (54 126 NOLOCKSHIFT)) (103 (9830 69 LOCKSHIFT)) (
-104 (55 38 NOLOCKSHIFT)) (105 (9829 9797 LOCKSHIFT)) (106 (9849 9817 LOCKSHIFT)) (107 (115 9814 
-LOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (9837 9805 LOCKSHIFT)) (110 (45 45 NOLOCKSHIFT)) (111 (9843
- 9811 LOCKSHIFT)) (112 (47 63 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . IGNORE) (116 (51 35 NOLOCKSHIFT))
- (117 (50 64 NOLOCKSHIFT)) (118 (9853 9821 LOCKSHIFT)) (119 (9835 9803 LOCKSHIFT)) (120 (9846 9814 
-LOCKSHIFT)) (121 (9825 9793 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (9836 9804 LOCKSHIFT)) (124 (
-9851 9819 LOCKSHIFT)) (125 (9842 9810 LOCKSHIFT)) (126 (9838 9806 LOCKSHIFT)) (127 (44 60 NOLOCKSHIFT)
-) (128 (39 34 NOLOCKSHIFT)) (129 (93 125 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (133 (92 124 
-NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (9850 9818 LOCKSHIFT)) (137 (9841 9809 
-LOCKSHIFT)) (138 (106 74 LOCKSHIFT)) (139 (9826 66 LOCKSHIFT)) (140 (9833 9801 LOCKSHIFT)) (141 
-1SHIFTDOWN . 1SHIFTUP) (142 (46 62 NOLOCKSHIFT)) (143 (59 58 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . 
-IGNORE) (145 (95 94 NOLOCKSHIFT)) (148 (9845 9813 LOCKSHIFT)) (149 (9848 9816 LOCKSHIFT)) (150 (9828 
-9796 LOCKSHIFT)) (151 (9852 9820 LOCKSHIFT)) (152 (9834 9802 LOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (
-154 (9840 9808 LOCKSHIFT)) (155 (9839 9807 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT
-) . IGNORE) (158 (91 123 NOLOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) 
-DANDELION) (ITALIAN ((100 (53 61903 NOLOCKSHIFT)) (101 (52 61886 NOLOCKSHIFT)) (102 (54 61919 
-NOLOCKSHIFT)) (103 (101 69 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 (100 68 LOCKSHIFT)) (106 (117 85
- LOCKSHIFT)) (107 (118 86 LOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (107 75 LOCKSHIFT)) (110 (45 45 
-NOLOCKSHIFT)) (111 (112 80 LOCKSHIFT)) (112 (204 63 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . IGNORE) (
-116 (51 61872 NOLOCKSHIFT)) (117 (50 61858 NOLOCKSHIFT)) (118 (119 87 LOCKSHIFT)) (119 (113 81 
-LOCKSHIFT)) (120 (115 83 LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (105 73 
-LOCKSHIFT)) (124 (120 88 LOCKSHIFT)) (125 (111 79 LOCKSHIFT)) (126 (108 76 LOCKSHIFT)) (127 (44 171 
-NOLOCKSHIFT)) (128 (39 186 NOLOCKSHIFT)) (129 (93 125 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (133 (92
- 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (102 70 LOCKSHIFT)) (137 (99 67 
-LOCKSHIFT)) (138 (106 74 LOCKSHIFT)) (139 (98 66 LOCKSHIFT)) (140 (122 90 LOCKSHIFT)) (141 1SHIFTDOWN
- . 1SHIFTUP) (142 (46 187 NOLOCKSHIFT)) (143 (59 58 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (
-145 (95 170 NOLOCKSHIFT)) (148 (114 82 LOCKSHIFT)) (149 (116 84 LOCKSHIFT)) (150 (103 71 LOCKSHIFT)) (
-151 (121 89 LOCKSHIFT)) (152 (104 72 LOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (154 (110 78 LOCKSHIFT)) (
-155 (109 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (91 123 
-NOLOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DANDELION) (SPANISH ((100 (53 
-61904 NOLOCKSHIFT)) (101 (52 61887 NOLOCKSHIFT)) (102 (54 61920 NOLOCKSHIFT)) (103 (101 69 LOCKSHIFT))
- (104 (55 38 NOLOCKSHIFT)) (105 (100 68 LOCKSHIFT)) (106 (117 85 LOCKSHIFT)) (107 (118 86 LOCKSHIFT)) 
-(108 (48 41 NOLOCKSHIFT)) (109 (107 75 LOCKSHIFT)) (110 (45 45 NOLOCKSHIFT)) (111 (112 80 LOCKSHIFT)) 
-(112 (204 63 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . IGNORE) (116 (51 61873 NOLOCKSHIFT)) (117 (50 
-61858 NOLOCKSHIFT)) (118 (119 87 LOCKSHIFT)) (119 (113 81 LOCKSHIFT)) (120 (115 83 LOCKSHIFT)) (121 (
-97 65 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (105 73 LOCKSHIFT)) (124 (120 88 LOCKSHIFT)) (125 (
-111 79 LOCKSHIFT)) (126 (108 76 LOCKSHIFT)) (127 (44 171 NOLOCKSHIFT)) (128 (59 58 NOLOCKSHIFT)) (129 
-(203 187 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (133 (92 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 
-NOLOCKSHIFT) . IGNORE) (135 (102 70 LOCKSHIFT)) (137 (99 67 LOCKSHIFT)) (138 (106 74 LOCKSHIFT)) (139 
-(98 66 LOCKSHIFT)) (140 (122 90 LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (142 (46 187 NOLOCKSHIFT)) (
-143 (61900 61772 LOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (145 (161 191 NOLOCKSHIFT)) (148 (114 
-82 LOCKSHIFT)) (149 (116 84 LOCKSHIFT)) (150 (103 71 LOCKSHIFT)) (151 (121 89 LOCKSHIFT)) (152 (104 72
- LOCKSHIFT)) (153 (56 61925 NOLOCKSHIFT)) (154 (110 78 LOCKSHIFT)) (155 (109 77 LOCKSHIFT)) (156 
-LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (44 171 NOLOCKSHIFT)) (159 (61 43 
-NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DANDELION) (FRENCH ((100 (53 61905 NOLOCKSHIFT)) (101 (52 
-61888 NOLOCKSHIFT)) (102 (54 61921 NOLOCKSHIFT)) (103 (101 69 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (
-105 (100 68 LOCKSHIFT)) (106 (117 85 LOCKSHIFT)) (107 (118 86 LOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (
-109 (107 75 LOCKSHIFT)) (110 (45 45 NOLOCKSHIFT)) (111 (112 80 LOCKSHIFT)) (112 (204 63 NOLOCKSHIFT)) 
-(115 (8 8 NOLOCKSHIFT) . IGNORE) (116 (51 61874 NOLOCKSHIFT)) (117 (50 61859 NOLOCKSHIFT)) (118 (119 
-87 LOCKSHIFT)) (119 (113 81 LOCKSHIFT)) (120 (115 83 LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (57 40 
-NOLOCKSHIFT)) (123 (105 73 LOCKSHIFT)) (124 (120 88 LOCKSHIFT)) (125 (111 79 LOCKSHIFT)) (126 (108 76 
-LOCKSHIFT)) (127 (44 171 NOLOCKSHIFT)) (128 (39 61857 NOLOCKSHIFT)) (129 (61872 61892 LOCKSHIFT)) (132
- (49 33 NOLOCKSHIFT)) (133 (92 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (102 
-70 LOCKSHIFT)) (137 (99 67 LOCKSHIFT)) (138 (106 74 LOCKSHIFT)) (139 (98 66 LOCKSHIFT)) (140 (122 90 
-LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (142 (46 187 NOLOCKSHIFT)) (143 (59 58 NOLOCKSHIFT)) (144 (13 
-13 NOLOCKSHIFT) . IGNORE) (145 (61869 61741 LOCKSHIFT)) (148 (114 82 LOCKSHIFT)) (149 (116 84 
-LOCKSHIFT)) (150 (103 71 LOCKSHIFT)) (151 (121 89 LOCKSHIFT)) (152 (104 72 LOCKSHIFT)) (153 (56 61919 
-NOLOCKSHIFT)) (154 (110 78 LOCKSHIFT)) (155 (109 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 
-NOLOCKSHIFT) . IGNORE) (158 (61873 61877 LOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 
-2SHIFTUP)) DANDELION) (GERMAN ((100 (53 37 NOLOCKSHIFT)) (101 (52 36 NOLOCKSHIFT)) (102 (54 126 
-NOLOCKSHIFT)) (103 (101 69 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 (100 68 LOCKSHIFT)) (106 (117 85
- LOCKSHIFT)) (107 (118 86 LOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (107 75 LOCKSHIFT)) (110 (45 45 
-NOLOCKSHIFT)) (111 (112 80 LOCKSHIFT)) (112 (251 63 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . IGNORE) (
-116 (51 35 NOLOCKSHIFT)) (117 (50 64 NOLOCKSHIFT)) (118 (119 87 LOCKSHIFT)) (119 (113 81 LOCKSHIFT)) (
-120 (115 83 LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (105 73 LOCKSHIFT)) (
-124 (120 88 LOCKSHIFT)) (125 (111 79 LOCKSHIFT)) (126 (108 76 LOCKSHIFT)) (127 (44 60 NOLOCKSHIFT)) (
-128 (39 34 NOLOCKSHIFT)) (129 (61863 61735 LOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (133 (92 124 
-NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (102 70 LOCKSHIFT)) (137 (99 67 LOCKSHIFT
-)) (138 (106 74 LOCKSHIFT)) (139 (98 66 LOCKSHIFT)) (140 (122 90 LOCKSHIFT)) (141 1SHIFTDOWN . 
-1SHIFTUP) (142 (46 62 NOLOCKSHIFT)) (143 (59 58 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (145 
-(95 94 NOLOCKSHIFT)) (148 (114 82 LOCKSHIFT)) (149 (116 84 LOCKSHIFT)) (150 (103 71 LOCKSHIFT)) (151 (
-121 89 LOCKSHIFT)) (152 (104 72 LOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (154 (110 78 LOCKSHIFT)) (155 (
-109 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (61908 61780 
-LOCKSHIFT)) (159 (61925 61797 LOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DANDELION) (STANDARD-RUSSIAN ((
-100 (34 52 NOLOCKSHIFT)) (101 (47 51 NOLOCKSHIFT)) (102 (58 53 NOLOCKSHIFT)) (103 (10085 10037 
-LOCKSHIFT)) (104 (44 54 NOLOCKSHIFT)) (105 (10067 10019 LOCKSHIFT)) (106 (10068 10020 LOCKSHIFT)) (107
- (10078 10030 LOCKSHIFT)) (108 (63 57 NOLOCKSHIFT)) (109 (10077 10029 LOCKSHIFT)) (110 (37 48 
-NOLOCKSHIFT)) (111 (10073 10025 LOCKSHIFT)) (112 (10071 10023 LOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . 
-IGNORE) (116 (45 50 NOLOCKSHIFT)) (117 (61352 49 NOLOCKSHIFT)) (118 (10088 10040 LOCKSHIFT)) (119 (
-10075 10027 LOCKSHIFT)) (120 (10093 10045 LOCKSHIFT)) (121 (10086 10038 LOCKSHIFT)) (122 (95 56 
-NOLOCKSHIFT)) (123 (10090 10042 LOCKSHIFT)) (124 (10089 10041 LOCKSHIFT)) (125 (10091 10043 LOCKSHIFT)
-) (126 (10069 10021 LOCKSHIFT)) (127 (10066 10018 LOCKSHIFT)) (128 (10095 10047 LOCKSHIFT)) (129 (
-10092 10044 LOCKSHIFT)) (132 (167 43 NOLOCKSHIFT)) (133 (92 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 
-NOLOCKSHIFT) . IGNORE) (135 (10065 10017 LOCKSHIFT)) (137 (10083 10035 LOCKSHIFT)) (138 (10080 10032 
-LOCKSHIFT)) (139 (10074 10026 LOCKSHIFT)) (140 (10097 10049 LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (
-142 (10096 10048 LOCKSHIFT)) (143 (10072 10024 LOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (145 (41
- 40 NOLOCKSHIFT)) (148 (10076 10028 LOCKSHIFT)) (149 (10070 10022 LOCKSHIFT)) (150 (10081 10033 
-LOCKSHIFT)) (151 (10079 10031 LOCKSHIFT)) (152 (10082 10034 LOCKSHIFT)) (153 (46 55 NOLOCKSHIFT)) (154
- (10084 10036 LOCKSHIFT)) (155 (10094 10046 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 
-NOLOCKSHIFT) . IGNORE) (158 (10087 10039 LOCKSHIFT)) (159 (33 61 NOLOCKSHIFT)) (160 2SHIFTDOWN . 
-2SHIFTUP)) DANDELION))

library/DORADOKEYBOARDS

@@ -1,171 +0,0 @@
-((EUROPEAN ((100 (53 197 NOLOCKSHIFT)) (101 (52 196 NOLOCKSHIFT)) (102 (54 198 NOLOCKSHIFT)) (103 (
-61887 61759 LOCKSHIFT)) (104 (55 199 NOLOCKSHIFT)) (105 (61888 61760 LOCKSHIFT)) (106 (61872 61744 
-LOCKSHIFT)) (107 (61860 61732 LOCKSHIFT)) (108 (48 126 NOLOCKSHIFT)) (109 (61892 61764 LOCKSHIFT)) (
-110 (203 207 NOLOCKSHIFT)) (111 (61919 61791 LOCKSHIFT)) (112 (47 191 NOLOCKSHIFT)) (115 (1 1 
-NOLOCKSHIFT) . IGNORE) (116 (51 195 NOLOCKSHIFT)) (117 (50 194 NOLOCKSHIFT)) (118 (61873 61745 
-LOCKSHIFT)) (119 (61858 61730 LOCKSHIFT)) (120 (61874 61746 LOCKSHIFT)) (121 (61859 61731 LOCKSHIFT)) 
-(122 (57 202 NOLOCKSHIFT)) (123 (61886 61758 LOCKSHIFT)) (124 (61864 61736 LOCKSHIFT)) (125 (61903 
-61775 LOCKSHIFT)) (126 (61908 61780 LOCKSHIFT)) (127 (241 225 LOCKSHIFT)) (128 (187 170 LOCKSHIFT)) (
-129 (249 233 LOCKSHIFT)) (132 (49 193 NOLOCKSHIFT)) (133 (92 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 
-NOLOCKSHIFT) . IGNORE) (135 (61905 61777 LOCKSHIFT)) (137 (61869 61741 LOCKSHIFT)) (138 (61877 61749 
-LOCKSHIFT)) (139 (61906 61778 LOCKSHIFT)) (140 (251 90 LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (142 (
-250 234 LOCKSHIFT)) (143 (59 58 LOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (145 (171 186 LOCKSHIFT
-)) (148 (61904 61776 LOCKSHIFT)) (149 (61920 61792 LOCKSHIFT)) (150 (61921 61793 LOCKSHIFT)) (151 (
-61857 61729 LOCKSHIFT)) (152 (61863 61735 LOCKSHIFT)) (153 (56 200 NOLOCKSHIFT)) (154 (61900 61772 
-LOCKSHIFT)) (155 (239 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (
-246 230 LOCKSHIFT)) (159 (207 176 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DORADO) (logic ((100 (
-53 37 NOLOCKSHIFT)) (101 (52 164 NOLOCKSHIFT)) (102 (54 126 NOLOCKSHIFT)) (103 (61258 61260 
-NOLOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 (61292 61293 NOLOCKSHIFT)) (106 (61271 61270 NOLOCKSHIFT)
-) (107 (61284 61285 NOLOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (61307 61306 NOLOCKSHIFT)) (110 (45 
-177 NOLOCKSHIFT)) (111 (61269 61268 LOCKSHIFT)) (112 (172 174 NOLOCKSHIFT)) (115 (1 1 NOLOCKSHIFT) . 
-IGNORE) (116 (51 35 NOLOCKSHIFT)) (117 (50 64 NOLOCKSHIFT)) (118 (61240 61241 NOLOCKSHIFT)) (119 (
-61234 61235 NOLOCKSHIFT)) (120 (61266 61262 NOLOCKSHIFT)) (121 (61365 61365 NOLOCKSHIFT)) (122 (57 40 
-NOLOCKSHIFT)) (123 (61275 61274 NOLOCKSHIFT)) (124 (61300 61299 NOLOCKSHIFT)) (125 (61273 61272 
-NOLOCKSHIFT)) (126 (61282 61283 NOLOCKSHIFT)) (127 (61256 61257 NOLOCKSHIFT)) (128 (61356 61356 
-NOLOCKSHIFT)) (129 (93 125 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (133 (92 124 NOLOCKSHIFT) . IGNORE)
- (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (61250 61251 NOLOCKSHIFT)) (137 (61298 61297 NOLOCKSHIFT)) (138
- (61305 61303 NOLOCKSHIFT)) (139 (61265 61264 NOLOCKSHIFT)) (140 (61364 61364 NOLOCKSHIFT)) (141 
-1SHIFTDOWN . 1SHIFTUP) (142 (61281 233 NOLOCKSHIFT)) (143 (61351 61351 NOLOCKSHIFT)) (144 (13 13 
-NOLOCKSHIFT) . IGNORE) (145 (61357 61357 NOLOCKSHIFT)) (148 (61279 61278 NOLOCKSHIFT)) (149 (61239 
-61238 NOLOCKSHIFT)) (150 (61290 61290 NOLOCKSHIFT)) (151 (61263 61261 NOLOCKSHIFT)) (152 (61295 61295 
-NOLOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (154 (61252 61253 NOLOCKSHIFT)) (155 (61254 61255 NOLOCKSHIFT)
-) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (91 123 NOLOCKSHIFT)) (159 (61 43 
-NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DORADO) (MATH ((100 (53 37 NOLOCKSHIFT)) (101 (52 36 
-NOLOCKSHIFT)) (102 (54 126 NOLOCKSHIFT)) (103 (61284 61285 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 
-(100 68 LOCKSHIFT)) (106 (174 61245 NOLOCKSHIFT)) (107 (61369 61363 NOLOCKSHIFT)) (108 (48 41 
-NOLOCKSHIFT)) (109 (61254 61255 NOLOCKSHIFT)) (110 (45 45 NOLOCKSHIFT)) (111 (173 61246 LOCKSHIFT)) (
-112 (47 61300 NOLOCKSHIFT)) (115 (1 1 NOLOCKSHIFT) . IGNORE) (116 (51 35 NOLOCKSHIFT)) (117 (50 64 
-NOLOCKSHIFT)) (118 (61282 61283 LOCKSHIFT)) (119 (61287 61286 NOLOCKSHIFT)) (120 (61301 61302 
-NOLOCKSHIFT)) (121 (61351 65 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (175 61247 LOCKSHIFT)) (124 (
-180 184 LOCKSHIFT)) (125 (172 61244 LOCKSHIFT)) (126 (61256 61257 LOCKSHIFT)) (127 (44 61250 
-NOLOCKSHIFT)) (128 (61298 61253 NOLOCKSHIFT)) (129 (93 61265 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (
-133 (92 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (102 70 LOCKSHIFT)) (137 (
-61356 61362 LOCKSHIFT)) (138 (61254 61291 NOLOCKSHIFT)) (139 (98 61360 NOLOCKSHIFT)) (140 (61309 177 
-LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (142 (46 61251 NOLOCKSHIFT)) (143 (61299 61252 NOLOCKSHIFT)) (
-144 (13 13 NOLOCKSHIFT) . IGNORE) (145 (95 94 NOLOCKSHIFT)) (148 (61358 82 LOCKSHIFT)) (149 (61296 
-61266 NOLOCKSHIFT)) (150 (61305 61303 NOLOCKSHIFT)) (151 (61308 61267 LOCKSHIFT)) (152 (61288 72 
-LOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (154 (61357 61361 NOLOCKSHIFT)) (155 (61292 61293 LOCKSHIFT)) (
-156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (91 61264 NOLOCKSHIFT)) (159 (61 43 
-NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DORADO) (OFFICE ((100 (61397 61381 NOLOCKSHIFT)) (101 (
-61396 61380 NOLOCKSHIFT)) (102 (61398 61382 NOLOCKSHIFT)) (103 (8557 8554 NOLOCKSHIFT)) (104 (61399 
-61383 NOLOCKSHIFT)) (105 (61232 8743 NOLOCKSHIFT)) (106 (61346 8571 NOLOCKSHIFT)) (107 (188 86 
-NOLOCKSHIFT)) (108 (61402 61386 NOLOCKSHIFT)) (109 (210 8738 NOLOCKSHIFT)) (110 (61437 61438 
-NOLOCKSHIFT)) (111 (163 8558 NOLOCKSHIFT)) (112 (61248 63 NOLOCKSHIFT)) (115 (1 1 NOLOCKSHIFT) . 
-IGNORE) (116 (61395 61379 NOLOCKSHIFT)) (117 (61394 61378 NOLOCKSHIFT)) (118 (185 8553 NOLOCKSHIFT)) (
-119 (176 8546 NOLOCKSHIFT)) (120 (167 8744 NOLOCKSHIFT)) (121 (97 8745 NOLOCKSHIFT)) (122 (61401 61385
- NOLOCKSHIFT)) (123 (162 8570 NOLOCKSHIFT)) (124 (61437 88 NOLOCKSHIFT)) (125 (111 8569 NOLOCKSHIFT)) 
-(126 (61289 8737 NOLOCKSHIFT)) (127 (44 60 NOLOCKSHIFT)) (128 (39 34 NOLOCKSHIFT)) (129 (93 125 
-NOLOCKSHIFT)) (132 (61393 61377 NOLOCKSHIFT)) (133 (92 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 
-NOLOCKSHIFT) . IGNORE) (135 (61233 8742 NOLOCKSHIFT)) (137 (61438 67 NOLOCKSHIFT)) (138 (8739 74 
-NOLOCKSHIFT)) (139 (190 61436 NOLOCKSHIFT)) (140 (189 90 NOLOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (
-142 (61249 62 NOLOCKSHIFT)) (143 (61352 58 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (145 (95 
-61280 NOLOCKSHIFT)) (148 (212 8574 NOLOCKSHIFT)) (149 (61354 8573 NOLOCKSHIFT)) (150 (61286 8741 
-NOLOCKSHIFT)) (151 (165 8572 NOLOCKSHIFT)) (152 (61368 8740 NOLOCKSHIFT)) (153 (61400 61384 
-NOLOCKSHIFT)) (154 (173 175 NOLOCKSHIFT)) (155 (172 174 NOLOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32
- 32 NOLOCKSHIFT) . IGNORE) (158 (91 123 NOLOCKSHIFT)) (159 (61406 61368 NOLOCKSHIFT)) (160 2SHIFTDOWN
- . 2SHIFTUP)) DORADO) (DVORAK ((100 (49 42 NOLOCKSHIFT)) (101 (51 41 NOLOCKSHIFT)) (102 (57 37 
-NOLOCKSHIFT)) (103 (46 62 NOLOCKSHIFT)) (104 (48 38 NOLOCKSHIFT)) (105 (101 69 LOCKSHIFT)) (106 (103 
-71 LOCKSHIFT)) (107 (107 75 LOCKSHIFT)) (108 (54 45 NOLOCKSHIFT)) (109 (116 84 LOCKSHIFT)) (110 (56 95
- NOLOCKSHIFT)) (111 (108 76 LOCKSHIFT)) (112 (122 90 LOCKSHIFT)) (115 (1 1 NOLOCKSHIFT) . IGNORE) (116
- (53 40 NOLOCKSHIFT)) (117 (55 35 NOLOCKSHIFT)) (118 (44 60 NOLOCKSHIFT)) (119 (63 47 NOLOCKSHIFT)) (
-120 (111 79 LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (52 164 NOLOCKSHIFT)) (123 (99 67 LOCKSHIFT)) (
-124 (113 81 LOCKSHIFT)) (125 (114 82 LOCKSHIFT)) (126 (110 78 LOCKSHIFT)) (127 (119 87 LOCKSHIFT)) (
-128 (44 186 NOLOCKSHIFT)) (129 (93 125 NOLOCKSHIFT)) (132 (33 64 NOLOCKSHIFT)) (133 (92 124 
-NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (117 85 LOCKSHIFT)) (137 (106 74 
-LOCKSHIFT)) (138 (104 72 LOCKSHIFT)) (139 (120 88 LOCKSHIFT)) (140 (59 58 NOLOCKSHIFT)) (141 
-1SHIFTDOWN . 1SHIFTUP) (142 (118 86 LOCKSHIFT)) (143 (115 83 LOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . 
-IGNORE) (145 (169 170 NOLOCKSHIFT)) (148 (112 80 LOCKSHIFT)) (149 (121 89 LOCKSHIFT)) (150 (105 73 
-LOCKSHIFT)) (151 (102 70 LOCKSHIFT)) (152 (100 68 LOCKSHIFT)) (153 (50 162 NOLOCKSHIFT)) (154 (98 66 
-LOCKSHIFT)) (155 (109 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (
-91 123 NOLOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DORADO) (GREEK ((100 (
-53 37 NOLOCKSHIFT)) (101 (52 36 NOLOCKSHIFT)) (102 (54 126 NOLOCKSHIFT)) (103 (9830 69 LOCKSHIFT)) (
-104 (55 38 NOLOCKSHIFT)) (105 (9829 9797 LOCKSHIFT)) (106 (9849 9817 LOCKSHIFT)) (107 (115 9814 
-LOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (9837 9805 LOCKSHIFT)) (110 (45 45 NOLOCKSHIFT)) (111 (9843
- 9811 LOCKSHIFT)) (112 (47 63 NOLOCKSHIFT)) (115 (1 1 NOLOCKSHIFT) . IGNORE) (116 (51 35 NOLOCKSHIFT))
- (117 (50 64 NOLOCKSHIFT)) (118 (9853 9821 LOCKSHIFT)) (119 (9835 9803 LOCKSHIFT)) (120 (9846 9814 
-LOCKSHIFT)) (121 (9825 9793 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (9836 9804 LOCKSHIFT)) (124 (
-9851 9819 LOCKSHIFT)) (125 (9842 9810 LOCKSHIFT)) (126 (9838 9806 LOCKSHIFT)) (127 (44 60 NOLOCKSHIFT)
-) (128 (39 34 NOLOCKSHIFT)) (129 (93 125 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (133 (92 124 
-NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (9850 9818 LOCKSHIFT)) (137 (9841 9809 
-LOCKSHIFT)) (138 (106 74 LOCKSHIFT)) (139 (9826 66 LOCKSHIFT)) (140 (9833 9801 LOCKSHIFT)) (141 
-1SHIFTDOWN . 1SHIFTUP) (142 (46 62 NOLOCKSHIFT)) (143 (59 58 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . 
-IGNORE) (145 (95 94 NOLOCKSHIFT)) (148 (9845 9813 LOCKSHIFT)) (149 (9848 9816 LOCKSHIFT)) (150 (9828 
-9796 LOCKSHIFT)) (151 (9852 9820 LOCKSHIFT)) (152 (9834 9802 LOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (
-154 (9840 9808 LOCKSHIFT)) (155 (9839 9807 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT
-) . IGNORE) (158 (91 123 NOLOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) 
-DORADO) (ITALIAN ((100 (53 61903 NOLOCKSHIFT)) (101 (52 61886 NOLOCKSHIFT)) (102 (54 61919 
-NOLOCKSHIFT)) (103 (101 69 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 (100 68 LOCKSHIFT)) (106 (117 85
- LOCKSHIFT)) (107 (118 86 LOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (107 75 LOCKSHIFT)) (110 (45 45 
-NOLOCKSHIFT)) (111 (112 80 LOCKSHIFT)) (112 (204 63 NOLOCKSHIFT)) (115 (1 1 NOLOCKSHIFT) . IGNORE) (
-116 (51 61872 NOLOCKSHIFT)) (117 (50 61858 NOLOCKSHIFT)) (118 (119 87 LOCKSHIFT)) (119 (113 81 
-LOCKSHIFT)) (120 (115 83 LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (105 73 
-LOCKSHIFT)) (124 (120 88 LOCKSHIFT)) (125 (111 79 LOCKSHIFT)) (126 (108 76 LOCKSHIFT)) (127 (44 171 
-NOLOCKSHIFT)) (128 (39 186 NOLOCKSHIFT)) (129 (93 125 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (133 (92
- 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (102 70 LOCKSHIFT)) (137 (99 67 
-LOCKSHIFT)) (138 (106 74 LOCKSHIFT)) (139 (98 66 LOCKSHIFT)) (140 (122 90 LOCKSHIFT)) (141 1SHIFTDOWN
- . 1SHIFTUP) (142 (46 187 NOLOCKSHIFT)) (143 (59 58 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (
-145 (95 170 NOLOCKSHIFT)) (148 (114 82 LOCKSHIFT)) (149 (116 84 LOCKSHIFT)) (150 (103 71 LOCKSHIFT)) (
-151 (121 89 LOCKSHIFT)) (152 (104 72 LOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (154 (110 78 LOCKSHIFT)) (
-155 (109 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (91 123 
-NOLOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DORADO) (SPANISH ((100 (53 
-61904 NOLOCKSHIFT)) (101 (52 61887 NOLOCKSHIFT)) (102 (54 61920 NOLOCKSHIFT)) (103 (101 69 LOCKSHIFT))
- (104 (55 38 NOLOCKSHIFT)) (105 (100 68 LOCKSHIFT)) (106 (117 85 LOCKSHIFT)) (107 (118 86 LOCKSHIFT)) 
-(108 (48 41 NOLOCKSHIFT)) (109 (107 75 LOCKSHIFT)) (110 (45 45 NOLOCKSHIFT)) (111 (112 80 LOCKSHIFT)) 
-(112 (204 63 NOLOCKSHIFT)) (115 (1 1 NOLOCKSHIFT) . IGNORE) (116 (51 61873 NOLOCKSHIFT)) (117 (50 
-61858 NOLOCKSHIFT)) (118 (119 87 LOCKSHIFT)) (119 (113 81 LOCKSHIFT)) (120 (115 83 LOCKSHIFT)) (121 (
-97 65 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (105 73 LOCKSHIFT)) (124 (120 88 LOCKSHIFT)) (125 (
-111 79 LOCKSHIFT)) (126 (108 76 LOCKSHIFT)) (127 (44 171 NOLOCKSHIFT)) (128 (59 58 NOLOCKSHIFT)) (129 
-(203 187 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (133 (92 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 
-NOLOCKSHIFT) . IGNORE) (135 (102 70 LOCKSHIFT)) (137 (99 67 LOCKSHIFT)) (138 (106 74 LOCKSHIFT)) (139 
-(98 66 LOCKSHIFT)) (140 (122 90 LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (142 (46 187 NOLOCKSHIFT)) (
-143 (61900 61772 LOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (145 (161 191 NOLOCKSHIFT)) (148 (114 
-82 LOCKSHIFT)) (149 (116 84 LOCKSHIFT)) (150 (103 71 LOCKSHIFT)) (151 (121 89 LOCKSHIFT)) (152 (104 72
- LOCKSHIFT)) (153 (56 61925 NOLOCKSHIFT)) (154 (110 78 LOCKSHIFT)) (155 (109 77 LOCKSHIFT)) (156 
-LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (44 171 NOLOCKSHIFT)) (159 (61 43 
-NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DORADO) (FRENCH ((100 (53 61905 NOLOCKSHIFT)) (101 (52 
-61888 NOLOCKSHIFT)) (102 (54 61921 NOLOCKSHIFT)) (103 (101 69 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (
-105 (100 68 LOCKSHIFT)) (106 (117 85 LOCKSHIFT)) (107 (118 86 LOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (
-109 (107 75 LOCKSHIFT)) (110 (45 45 NOLOCKSHIFT)) (111 (112 80 LOCKSHIFT)) (112 (204 63 NOLOCKSHIFT)) 
-(115 (1 1 NOLOCKSHIFT) . IGNORE) (116 (51 61874 NOLOCKSHIFT)) (117 (50 61859 NOLOCKSHIFT)) (118 (119 
-87 LOCKSHIFT)) (119 (113 81 LOCKSHIFT)) (120 (115 83 LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (57 40 
-NOLOCKSHIFT)) (123 (105 73 LOCKSHIFT)) (124 (120 88 LOCKSHIFT)) (125 (111 79 LOCKSHIFT)) (126 (108 76 
-LOCKSHIFT)) (127 (44 171 NOLOCKSHIFT)) (128 (39 61857 NOLOCKSHIFT)) (129 (61872 61892 LOCKSHIFT)) (132
- (49 33 NOLOCKSHIFT)) (133 (92 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (102 
-70 LOCKSHIFT)) (137 (99 67 LOCKSHIFT)) (138 (106 74 LOCKSHIFT)) (139 (98 66 LOCKSHIFT)) (140 (122 90 
-LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (142 (46 187 NOLOCKSHIFT)) (143 (59 58 NOLOCKSHIFT)) (144 (13 
-13 NOLOCKSHIFT) . IGNORE) (145 (61869 61741 LOCKSHIFT)) (148 (114 82 LOCKSHIFT)) (149 (116 84 
-LOCKSHIFT)) (150 (103 71 LOCKSHIFT)) (151 (121 89 LOCKSHIFT)) (152 (104 72 LOCKSHIFT)) (153 (56 61919 
-NOLOCKSHIFT)) (154 (110 78 LOCKSHIFT)) (155 (109 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 
-NOLOCKSHIFT) . IGNORE) (158 (61873 61877 LOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 
-2SHIFTUP)) DORADO) (GERMAN ((100 (53 37 NOLOCKSHIFT)) (101 (52 36 NOLOCKSHIFT)) (102 (54 126 
-NOLOCKSHIFT)) (103 (101 69 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 (100 68 LOCKSHIFT)) (106 (117 85
- LOCKSHIFT)) (107 (118 86 LOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (107 75 LOCKSHIFT)) (110 (45 45 
-NOLOCKSHIFT)) (111 (112 80 LOCKSHIFT)) (112 (251 63 NOLOCKSHIFT)) (115 (1 1 NOLOCKSHIFT) . IGNORE) (
-116 (51 35 NOLOCKSHIFT)) (117 (50 64 NOLOCKSHIFT)) (118 (119 87 LOCKSHIFT)) (119 (113 81 LOCKSHIFT)) (
-120 (115 83 LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (105 73 LOCKSHIFT)) (
-124 (120 88 LOCKSHIFT)) (125 (111 79 LOCKSHIFT)) (126 (108 76 LOCKSHIFT)) (127 (44 60 NOLOCKSHIFT)) (
-128 (39 34 NOLOCKSHIFT)) (129 (61863 61735 LOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (133 (92 124 
-NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (102 70 LOCKSHIFT)) (137 (99 67 LOCKSHIFT
-)) (138 (106 74 LOCKSHIFT)) (139 (98 66 LOCKSHIFT)) (140 (122 90 LOCKSHIFT)) (141 1SHIFTDOWN . 
-1SHIFTUP) (142 (46 62 NOLOCKSHIFT)) (143 (59 58 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (145 
-(95 94 NOLOCKSHIFT)) (148 (114 82 LOCKSHIFT)) (149 (116 84 LOCKSHIFT)) (150 (103 71 LOCKSHIFT)) (151 (
-121 89 LOCKSHIFT)) (152 (104 72 LOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (154 (110 78 LOCKSHIFT)) (155 (
-109 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (61908 61780 
-LOCKSHIFT)) (159 (61925 61797 LOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DORADO) (STANDARD-RUSSIAN ((
-100 (34 52 NOLOCKSHIFT)) (101 (47 51 NOLOCKSHIFT)) (102 (58 53 NOLOCKSHIFT)) (103 (10085 10037 
-LOCKSHIFT)) (104 (44 54 NOLOCKSHIFT)) (105 (10067 10019 LOCKSHIFT)) (106 (10068 10020 LOCKSHIFT)) (107
- (10078 10030 LOCKSHIFT)) (108 (63 57 NOLOCKSHIFT)) (109 (10077 10029 LOCKSHIFT)) (110 (37 48 
-NOLOCKSHIFT)) (111 (10073 10025 LOCKSHIFT)) (112 (10071 10023 LOCKSHIFT)) (115 (1 1 NOLOCKSHIFT) . 
-IGNORE) (116 (45 50 NOLOCKSHIFT)) (117 (61352 49 NOLOCKSHIFT)) (118 (10088 10040 LOCKSHIFT)) (119 (
-10075 10027 LOCKSHIFT)) (120 (10093 10045 LOCKSHIFT)) (121 (10086 10038 LOCKSHIFT)) (122 (95 56 
-NOLOCKSHIFT)) (123 (10090 10042 LOCKSHIFT)) (124 (10089 10041 LOCKSHIFT)) (125 (10091 10043 LOCKSHIFT)
-) (126 (10069 10021 LOCKSHIFT)) (127 (10066 10018 LOCKSHIFT)) (128 (10095 10047 LOCKSHIFT)) (129 (
-10092 10044 LOCKSHIFT)) (132 (167 43 NOLOCKSHIFT)) (133 (92 124 NOLOCKSHIFT) . IGNORE) (134 (9 9 
-NOLOCKSHIFT) . IGNORE) (135 (10065 10017 LOCKSHIFT)) (137 (10083 10035 LOCKSHIFT)) (138 (10080 10032 
-LOCKSHIFT)) (139 (10074 10026 LOCKSHIFT)) (140 (10097 10049 LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (
-142 (10096 10048 LOCKSHIFT)) (143 (10072 10024 LOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (145 (41
- 40 NOLOCKSHIFT)) (148 (10076 10028 LOCKSHIFT)) (149 (10070 10022 LOCKSHIFT)) (150 (10081 10033 
-LOCKSHIFT)) (151 (10079 10031 LOCKSHIFT)) (152 (10082 10034 LOCKSHIFT)) (153 (46 55 NOLOCKSHIFT)) (154
- (10084 10036 LOCKSHIFT)) (155 (10094 10046 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 
-NOLOCKSHIFT) . IGNORE) (158 (10087 10039 LOCKSHIFT)) (159 (33 61 NOLOCKSHIFT)) (160 2SHIFTDOWN . 
-2SHIFTUP)) DORADO))

library/DOVEKEYBOARDS

@@ -1,171 +0,0 @@
-((EUROPEAN ((100 (53 197 NOLOCKSHIFT)) (101 (52 196 NOLOCKSHIFT)) (102 (54 198 NOLOCKSHIFT)) (103 (
-61887 61759 LOCKSHIFT)) (104 (55 199 NOLOCKSHIFT)) (105 (61888 61760 LOCKSHIFT)) (106 (61872 61744 
-LOCKSHIFT)) (107 (61860 61732 LOCKSHIFT)) (108 (48 126 NOLOCKSHIFT)) (109 (61892 61764 LOCKSHIFT)) (
-110 (203 207 NOLOCKSHIFT)) (111 (61919 61791 LOCKSHIFT)) (112 (47 191 NOLOCKSHIFT)) (115 (8 8 
-NOLOCKSHIFT) . IGNORE) (116 (51 195 NOLOCKSHIFT)) (117 (50 194 NOLOCKSHIFT)) (118 (61873 61745 
-LOCKSHIFT)) (119 (61858 61730 LOCKSHIFT)) (120 (61874 61746 LOCKSHIFT)) (121 (61859 61731 LOCKSHIFT)) 
-(122 (57 202 NOLOCKSHIFT)) (123 (61886 61758 LOCKSHIFT)) (124 (61864 61736 LOCKSHIFT)) (125 (61903 
-61775 LOCKSHIFT)) (126 (61908 61780 LOCKSHIFT)) (127 (241 225 LOCKSHIFT)) (171 (187 170 LOCKSHIFT)) (
-129 (249 233 LOCKSHIFT)) (132 (49 193 NOLOCKSHIFT)) (165 (27 27 NOLOCKSHIFT) . IGNORE) (134 (9 9 
-NOLOCKSHIFT) . IGNORE) (135 (61905 61777 LOCKSHIFT)) (137 (61869 61741 LOCKSHIFT)) (138 (61877 61749 
-LOCKSHIFT)) (139 (61906 61778 LOCKSHIFT)) (140 (251 90 LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (142 (
-250 234 LOCKSHIFT)) (143 (59 58 LOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (208 (171 186 LOCKSHIFT
-)) (148 (61904 61776 LOCKSHIFT)) (149 (61920 61792 LOCKSHIFT)) (150 (61921 61793 LOCKSHIFT)) (151 (
-61857 61729 LOCKSHIFT)) (152 (61863 61735 LOCKSHIFT)) (153 (56 200 NOLOCKSHIFT)) (154 (61900 61772 
-LOCKSHIFT)) (155 (239 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (
-246 230 LOCKSHIFT)) (159 (207 176 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DOVE) (logic ((100 (53 37
- NOLOCKSHIFT)) (101 (52 164 NOLOCKSHIFT)) (102 (54 126 NOLOCKSHIFT)) (103 (61258 61260 NOLOCKSHIFT)) (
-104 (55 38 NOLOCKSHIFT)) (105 (61292 61293 NOLOCKSHIFT)) (106 (61271 61270 NOLOCKSHIFT)) (107 (61284 
-61285 NOLOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (61307 61306 NOLOCKSHIFT)) (110 (45 177 NOLOCKSHIFT
-)) (111 (61269 61268 LOCKSHIFT)) (112 (172 174 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . IGNORE) (116 (51
- 35 NOLOCKSHIFT)) (117 (50 64 NOLOCKSHIFT)) (118 (61240 61241 NOLOCKSHIFT)) (119 (61234 61235 
-NOLOCKSHIFT)) (120 (61266 61262 NOLOCKSHIFT)) (121 (61365 61365 NOLOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)
-) (123 (61275 61274 NOLOCKSHIFT)) (124 (61300 61299 NOLOCKSHIFT)) (125 (61273 61272 NOLOCKSHIFT)) (126
- (61282 61283 NOLOCKSHIFT)) (127 (61256 61257 NOLOCKSHIFT)) (171 (61356 61356 NOLOCKSHIFT)) (129 (93 
-125 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (165 (27 27 NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT)
- . IGNORE) (135 (61250 61251 NOLOCKSHIFT)) (137 (61298 61297 NOLOCKSHIFT)) (138 (61305 61303 
-NOLOCKSHIFT)) (139 (61265 61264 NOLOCKSHIFT)) (140 (61364 61364 NOLOCKSHIFT)) (141 1SHIFTDOWN . 
-1SHIFTUP) (142 (61281 233 NOLOCKSHIFT)) (143 (61351 61351 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . 
-IGNORE) (208 (61357 61357 NOLOCKSHIFT)) (148 (61279 61278 NOLOCKSHIFT)) (149 (61239 61238 NOLOCKSHIFT)
-) (150 (61290 61290 NOLOCKSHIFT)) (151 (61263 61261 NOLOCKSHIFT)) (152 (61295 61295 NOLOCKSHIFT)) (153
- (56 42 NOLOCKSHIFT)) (154 (61252 61253 NOLOCKSHIFT)) (155 (61254 61255 NOLOCKSHIFT)) (156 LOCKDOWN . 
-LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (91 123 NOLOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 
-2SHIFTDOWN . 2SHIFTUP)) DOVE) (MATH ((100 (53 37 NOLOCKSHIFT)) (101 (52 36 NOLOCKSHIFT)) (102 (54 126 
-NOLOCKSHIFT)) (103 (61284 61285 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 (100 68 LOCKSHIFT)) (106 (
-174 61245 NOLOCKSHIFT)) (107 (61369 61363 NOLOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (61254 61255 
-NOLOCKSHIFT)) (110 (45 45 NOLOCKSHIFT)) (111 (173 61246 LOCKSHIFT)) (112 (47 61300 NOLOCKSHIFT)) (115 
-(8 8 NOLOCKSHIFT) . IGNORE) (116 (51 35 NOLOCKSHIFT)) (117 (50 64 NOLOCKSHIFT)) (118 (61282 61283 
-LOCKSHIFT)) (119 (61287 61286 NOLOCKSHIFT)) (120 (61301 61302 NOLOCKSHIFT)) (121 (61351 65 LOCKSHIFT))
- (122 (57 40 NOLOCKSHIFT)) (123 (175 61247 LOCKSHIFT)) (124 (180 184 LOCKSHIFT)) (125 (172 61244 
-LOCKSHIFT)) (126 (61256 61257 LOCKSHIFT)) (127 (44 61250 NOLOCKSHIFT)) (171 (61298 61253 NOLOCKSHIFT))
- (129 (93 61265 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (165 (27 27 NOLOCKSHIFT) . IGNORE) (134 (9 9 
-NOLOCKSHIFT) . IGNORE) (135 (102 70 LOCKSHIFT)) (137 (61356 61362 LOCKSHIFT)) (138 (61254 61291 
-NOLOCKSHIFT)) (139 (98 61360 NOLOCKSHIFT)) (140 (61309 177 LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (
-142 (46 61251 NOLOCKSHIFT)) (143 (61299 61252 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (208 (
-95 94 NOLOCKSHIFT)) (148 (61358 82 LOCKSHIFT)) (149 (61296 61266 NOLOCKSHIFT)) (150 (61305 61303 
-NOLOCKSHIFT)) (151 (61308 61267 LOCKSHIFT)) (152 (61288 72 LOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (154 
-(61357 61361 NOLOCKSHIFT)) (155 (61292 61293 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 
-NOLOCKSHIFT) . IGNORE) (158 (91 61264 NOLOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 
-2SHIFTUP)) DOVE) (OFFICE ((100 (61397 61381 NOLOCKSHIFT)) (101 (61396 61380 NOLOCKSHIFT)) (102 (61398 
-61382 NOLOCKSHIFT)) (103 (8557 8554 NOLOCKSHIFT)) (104 (61399 61383 NOLOCKSHIFT)) (105 (61232 8743 
-NOLOCKSHIFT)) (106 (61346 8571 NOLOCKSHIFT)) (107 (188 86 NOLOCKSHIFT)) (108 (61402 61386 NOLOCKSHIFT)
-) (109 (210 8738 NOLOCKSHIFT)) (110 (61437 61438 NOLOCKSHIFT)) (111 (163 8558 NOLOCKSHIFT)) (112 (
-61248 63 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . IGNORE) (116 (61395 61379 NOLOCKSHIFT)) (117 (61394 
-61378 NOLOCKSHIFT)) (118 (185 8553 NOLOCKSHIFT)) (119 (176 8546 NOLOCKSHIFT)) (120 (167 8744 
-NOLOCKSHIFT)) (121 (97 8745 NOLOCKSHIFT)) (122 (61401 61385 NOLOCKSHIFT)) (123 (162 8570 NOLOCKSHIFT))
- (124 (61437 88 NOLOCKSHIFT)) (125 (111 8569 NOLOCKSHIFT)) (126 (61289 8737 NOLOCKSHIFT)) (127 (44 60 
-NOLOCKSHIFT)) (171 (39 34 NOLOCKSHIFT)) (129 (93 125 NOLOCKSHIFT)) (132 (61393 61377 NOLOCKSHIFT)) (
-165 (27 27 NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (61233 8742 NOLOCKSHIFT)) (137
- (61438 67 NOLOCKSHIFT)) (138 (8739 74 NOLOCKSHIFT)) (139 (190 61436 NOLOCKSHIFT)) (140 (189 90 
-NOLOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (142 (61249 62 NOLOCKSHIFT)) (143 (61352 58 NOLOCKSHIFT)) (
-144 (13 13 NOLOCKSHIFT) . IGNORE) (208 (95 61280 NOLOCKSHIFT)) (148 (212 8574 NOLOCKSHIFT)) (149 (
-61354 8573 NOLOCKSHIFT)) (150 (61286 8741 NOLOCKSHIFT)) (151 (165 8572 NOLOCKSHIFT)) (152 (61368 8740 
-NOLOCKSHIFT)) (153 (61400 61384 NOLOCKSHIFT)) (154 (173 175 NOLOCKSHIFT)) (155 (172 174 NOLOCKSHIFT)) 
-(156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (91 123 NOLOCKSHIFT)) (159 (61406 
-61368 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DOVE) (DVORAK ((100 (49 42 NOLOCKSHIFT)) (101 (51 41 
-NOLOCKSHIFT)) (102 (57 37 NOLOCKSHIFT)) (103 (46 62 NOLOCKSHIFT)) (104 (48 38 NOLOCKSHIFT)) (105 (101 
-69 LOCKSHIFT)) (106 (103 71 LOCKSHIFT)) (107 (107 75 LOCKSHIFT)) (108 (54 45 NOLOCKSHIFT)) (109 (116 
-84 LOCKSHIFT)) (110 (56 95 NOLOCKSHIFT)) (111 (108 76 LOCKSHIFT)) (112 (122 90 LOCKSHIFT)) (115 (8 8 
-NOLOCKSHIFT) . IGNORE) (116 (53 40 NOLOCKSHIFT)) (117 (55 35 NOLOCKSHIFT)) (118 (44 60 NOLOCKSHIFT)) (
-119 (63 47 NOLOCKSHIFT)) (120 (111 79 LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (52 164 NOLOCKSHIFT)) (
-123 (99 67 LOCKSHIFT)) (124 (113 81 LOCKSHIFT)) (125 (114 82 LOCKSHIFT)) (126 (110 78 LOCKSHIFT)) (127
- (119 87 LOCKSHIFT)) (171 (44 186 NOLOCKSHIFT)) (129 (93 125 NOLOCKSHIFT)) (132 (33 64 NOLOCKSHIFT)) (
-165 (27 27 NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (117 85 LOCKSHIFT)) (137 (106 
-74 LOCKSHIFT)) (138 (104 72 LOCKSHIFT)) (139 (120 88 LOCKSHIFT)) (140 (59 58 NOLOCKSHIFT)) (141 
-1SHIFTDOWN . 1SHIFTUP) (142 (118 86 LOCKSHIFT)) (143 (115 83 LOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . 
-IGNORE) (208 (169 170 NOLOCKSHIFT)) (148 (112 80 LOCKSHIFT)) (149 (121 89 LOCKSHIFT)) (150 (105 73 
-LOCKSHIFT)) (151 (102 70 LOCKSHIFT)) (152 (100 68 LOCKSHIFT)) (153 (50 162 NOLOCKSHIFT)) (154 (98 66 
-LOCKSHIFT)) (155 (109 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (
-91 123 NOLOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DOVE) (GREEK ((100 (53 37 
-NOLOCKSHIFT)) (101 (52 36 NOLOCKSHIFT)) (102 (54 126 NOLOCKSHIFT)) (103 (9830 69 LOCKSHIFT)) (104 (55 
-38 NOLOCKSHIFT)) (105 (9829 9797 LOCKSHIFT)) (106 (9849 9817 LOCKSHIFT)) (107 (115 9814 LOCKSHIFT)) (
-108 (48 41 NOLOCKSHIFT)) (109 (9837 9805 LOCKSHIFT)) (110 (45 45 NOLOCKSHIFT)) (111 (9843 9811 
-LOCKSHIFT)) (112 (47 63 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . IGNORE) (116 (51 35 NOLOCKSHIFT)) (117 
-(50 64 NOLOCKSHIFT)) (118 (9853 9821 LOCKSHIFT)) (119 (9835 9803 LOCKSHIFT)) (120 (9846 9814 LOCKSHIFT
-)) (121 (9825 9793 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (9836 9804 LOCKSHIFT)) (124 (9851 9819 
-LOCKSHIFT)) (125 (9842 9810 LOCKSHIFT)) (126 (9838 9806 LOCKSHIFT)) (127 (44 60 NOLOCKSHIFT)) (171 (39
- 34 NOLOCKSHIFT)) (129 (93 125 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (165 (27 27 NOLOCKSHIFT) . 
-IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (9850 9818 LOCKSHIFT)) (137 (9841 9809 LOCKSHIFT)) (138 
-(106 74 LOCKSHIFT)) (139 (9826 66 LOCKSHIFT)) (140 (9833 9801 LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) 
-(142 (46 62 NOLOCKSHIFT)) (143 (59 58 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (208 (95 94 
-NOLOCKSHIFT)) (148 (9845 9813 LOCKSHIFT)) (149 (9848 9816 LOCKSHIFT)) (150 (9828 9796 LOCKSHIFT)) (151
- (9852 9820 LOCKSHIFT)) (152 (9834 9802 LOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (154 (9840 9808 
-LOCKSHIFT)) (155 (9839 9807 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (
-158 (91 123 NOLOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DOVE) (ITALIAN ((171 
-(39 34 NOLOCKSHIFT)) (100 (53 61903 NOLOCKSHIFT)) (101 (52 61886 NOLOCKSHIFT)) (102 (54 61919 
-NOLOCKSHIFT)) (103 (101 69 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 (100 68 LOCKSHIFT)) (106 (117 85
- LOCKSHIFT)) (107 (118 86 LOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (107 75 LOCKSHIFT)) (110 (45 45 
-NOLOCKSHIFT)) (111 (112 80 LOCKSHIFT)) (112 (95 63 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . IGNORE) (116
- (51 61872 NOLOCKSHIFT)) (117 (50 61857 NOLOCKSHIFT)) (118 (119 87 LOCKSHIFT)) (119 (113 81 LOCKSHIFT)
-) (120 (115 83 LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (105 73 LOCKSHIFT)) 
-(124 (120 88 LOCKSHIFT)) (125 (111 79 LOCKSHIFT)) (126 (108 76 LOCKSHIFT)) (127 (44 171 NOLOCKSHIFT)) 
-(171 (39 186 NOLOCKSHIFT)) (129 (93 125 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (165 (27 27 
-NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (102 70 LOCKSHIFT)) (137 (99 67 LOCKSHIFT
-)) (138 (106 74 LOCKSHIFT)) (139 (98 66 LOCKSHIFT)) (140 (122 90 LOCKSHIFT)) (141 1SHIFTDOWN . 
-1SHIFTUP) (142 (46 187 NOLOCKSHIFT)) (143 (59 58 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (208
- (95 170 NOLOCKSHIFT)) (148 (114 82 LOCKSHIFT)) (149 (116 84 LOCKSHIFT)) (150 (103 71 LOCKSHIFT)) (151
- (121 89 LOCKSHIFT)) (152 (104 72 LOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (154 (110 78 LOCKSHIFT)) (155 
-(109 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (91 123 
-NOLOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DOVE) (SPANISH ((208 (161 191 
-NOLOCKSHIFT)) (171 (59 58 NOLOCKSHIFT)) (100 (53 61904 NOLOCKSHIFT)) (101 (52 61887 NOLOCKSHIFT)) (102
- (54 61920 NOLOCKSHIFT)) (103 (101 69 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 (100 68 LOCKSHIFT)) (
-106 (117 85 LOCKSHIFT)) (107 (118 86 LOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (107 75 LOCKSHIFT)) (
-110 (45 45 NOLOCKSHIFT)) (111 (112 80 LOCKSHIFT)) (112 (95 63 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . 
-IGNORE) (116 (51 61873 NOLOCKSHIFT)) (117 (50 61858 NOLOCKSHIFT)) (118 (119 87 LOCKSHIFT)) (119 (113 
-81 LOCKSHIFT)) (120 (115 83 LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (105 73
- LOCKSHIFT)) (124 (120 88 LOCKSHIFT)) (125 (111 79 LOCKSHIFT)) (126 (108 76 LOCKSHIFT)) (127 (44 171 
-NOLOCKSHIFT)) (171 (59 58 NOLOCKSHIFT)) (129 (185 186 NOLOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (165 (27
- 27 NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (102 70 LOCKSHIFT)) (137 (99 67 
-LOCKSHIFT)) (138 (106 74 LOCKSHIFT)) (139 (98 66 LOCKSHIFT)) (140 (122 90 LOCKSHIFT)) (141 1SHIFTDOWN
- . 1SHIFTUP) (142 (46 187 NOLOCKSHIFT)) (143 (61900 61772 LOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . 
-IGNORE) (208 (161 191 NOLOCKSHIFT)) (148 (114 82 LOCKSHIFT)) (149 (116 84 LOCKSHIFT)) (150 (103 71 
-LOCKSHIFT)) (151 (121 89 LOCKSHIFT)) (152 (104 72 LOCKSHIFT)) (153 (56 61925 NOLOCKSHIFT)) (154 (110 
-78 LOCKSHIFT)) (155 (109 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (
-158 (169 170 NOLOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DOVE) (FRENCH ((208 
-(61869 61741 NOLOCKSHIFT)) (171 (39 61857 NOLOCKSHIFT)) (100 (53 61905 NOLOCKSHIFT)) (101 (52 61888 
-NOLOCKSHIFT)) (102 (54 61921 NOLOCKSHIFT)) (103 (101 69 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 (
-100 68 LOCKSHIFT)) (106 (117 85 LOCKSHIFT)) (107 (118 86 LOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (
-107 75 LOCKSHIFT)) (110 (45 45 NOLOCKSHIFT)) (111 (112 80 LOCKSHIFT)) (112 (95 63 NOLOCKSHIFT)) (115 (
-1 1 NOLOCKSHIFT) . IGNORE) (116 (51 61874 NOLOCKSHIFT)) (117 (50 61859 NOLOCKSHIFT)) (118 (119 87 
-LOCKSHIFT)) (119 (113 81 LOCKSHIFT)) (120 (115 83 LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (57 40 
-NOLOCKSHIFT)) (123 (105 73 LOCKSHIFT)) (124 (120 88 LOCKSHIFT)) (125 (111 79 LOCKSHIFT)) (126 (108 76 
-LOCKSHIFT)) (127 (44 171 NOLOCKSHIFT)) (171 (39 61857 NOLOCKSHIFT)) (129 (61872 61892 LOCKSHIFT)) (132
- (49 33 NOLOCKSHIFT)) (165 (27 27 NOLOCKSHIFT) . IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (102 70
- LOCKSHIFT)) (137 (99 67 LOCKSHIFT)) (138 (106 74 LOCKSHIFT)) (139 (98 66 LOCKSHIFT)) (140 (122 90 
-LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (142 (46 187 NOLOCKSHIFT)) (143 (59 58 NOLOCKSHIFT)) (144 (13 
-13 NOLOCKSHIFT) . IGNORE) (208 (61869 61741 LOCKSHIFT)) (148 (114 82 LOCKSHIFT)) (149 (116 84 
-LOCKSHIFT)) (150 (103 71 LOCKSHIFT)) (151 (121 89 LOCKSHIFT)) (152 (104 72 LOCKSHIFT)) (153 (56 61919 
-NOLOCKSHIFT)) (154 (110 78 LOCKSHIFT)) (155 (109 77 LOCKSHIFT)) (156 LOCKDOWN . LOCKUP) (157 (32 32 
-NOLOCKSHIFT) . IGNORE) (158 (61873 61877 LOCKSHIFT)) (159 (61 43 NOLOCKSHIFT)) (160 2SHIFTDOWN . 
-2SHIFTUP)) DOVE) (GERMAN ((100 (53 37 NOLOCKSHIFT)) (101 (52 36 NOLOCKSHIFT)) (102 (54 126 NOLOCKSHIFT
-)) (103 (101 69 LOCKSHIFT)) (104 (55 38 NOLOCKSHIFT)) (105 (100 68 LOCKSHIFT)) (106 (117 85 LOCKSHIFT)
-) (107 (118 86 LOCKSHIFT)) (108 (48 41 NOLOCKSHIFT)) (109 (107 75 LOCKSHIFT)) (110 (45 45 NOLOCKSHIFT)
-) (111 (112 80 LOCKSHIFT)) (112 (251 63 NOLOCKSHIFT)) (115 (8 8 NOLOCKSHIFT) . IGNORE) (116 (51 35 
-NOLOCKSHIFT)) (117 (50 64 NOLOCKSHIFT)) (118 (119 87 LOCKSHIFT)) (119 (113 81 LOCKSHIFT)) (120 (115 83
- LOCKSHIFT)) (121 (97 65 LOCKSHIFT)) (122 (57 40 NOLOCKSHIFT)) (123 (105 73 LOCKSHIFT)) (124 (120 88 
-LOCKSHIFT)) (125 (111 79 LOCKSHIFT)) (126 (108 76 LOCKSHIFT)) (127 (44 60 NOLOCKSHIFT)) (171 (39 34 
-NOLOCKSHIFT)) (129 (61863 61735 LOCKSHIFT)) (132 (49 33 NOLOCKSHIFT)) (165 (27 27 NOLOCKSHIFT) . 
-IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (102 70 LOCKSHIFT)) (137 (99 67 LOCKSHIFT)) (138 (106 74
- LOCKSHIFT)) (139 (98 66 LOCKSHIFT)) (140 (122 90 LOCKSHIFT)) (141 1SHIFTDOWN . 1SHIFTUP) (142 (46 62 
-NOLOCKSHIFT)) (143 (59 58 NOLOCKSHIFT)) (144 (13 13 NOLOCKSHIFT) . IGNORE) (208 (95 94 NOLOCKSHIFT)) (
-148 (114 82 LOCKSHIFT)) (149 (116 84 LOCKSHIFT)) (150 (103 71 LOCKSHIFT)) (151 (121 89 LOCKSHIFT)) (
-152 (104 72 LOCKSHIFT)) (153 (56 42 NOLOCKSHIFT)) (154 (110 78 LOCKSHIFT)) (155 (109 77 LOCKSHIFT)) (
-156 LOCKDOWN . LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (61908 61780 LOCKSHIFT)) (159 (61925 
-61797 LOCKSHIFT)) (160 2SHIFTDOWN . 2SHIFTUP)) DOVE) (STANDARD-RUSSIAN ((208 (41 40 NOLOCKSHIFT)) (171
- (10073 10025 NOLOCKSHIFT)) (100 (34 52 NOLOCKSHIFT)) (101 (47 51 NOLOCKSHIFT)) (102 (58 53 
-NOLOCKSHIFT)) (103 (10085 10037 LOCKSHIFT)) (104 (44 54 NOLOCKSHIFT)) (105 (10067 10019 LOCKSHIFT)) (
-106 (10068 10020 LOCKSHIFT)) (107 (10078 10030 LOCKSHIFT)) (108 (63 57 NOLOCKSHIFT)) (109 (10077 10029
- LOCKSHIFT)) (110 (37 48 NOLOCKSHIFT)) (111 (10073 10025 LOCKSHIFT)) (112 (10071 10023 LOCKSHIFT)) (
-115 (8 8 NOLOCKSHIFT) . IGNORE) (116 (45 50 NOLOCKSHIFT)) (117 (61352 49 NOLOCKSHIFT)) (118 (10088 
-10040 LOCKSHIFT)) (119 (10075 10027 LOCKSHIFT)) (120 (10093 10045 LOCKSHIFT)) (121 (10086 10038 
-LOCKSHIFT)) (122 (95 56 NOLOCKSHIFT)) (123 (10090 10042 LOCKSHIFT)) (124 (10089 10041 LOCKSHIFT)) (125
- (10091 10043 LOCKSHIFT)) (126 (10069 10021 LOCKSHIFT)) (127 (10066 10018 LOCKSHIFT)) (171 (10095 
-10047 LOCKSHIFT)) (129 (10092 10044 LOCKSHIFT)) (132 (167 43 NOLOCKSHIFT)) (165 (27 27 NOLOCKSHIFT) . 
-IGNORE) (134 (9 9 NOLOCKSHIFT) . IGNORE) (135 (10065 10017 LOCKSHIFT)) (137 (10083 10035 LOCKSHIFT)) (
-138 (10080 10032 LOCKSHIFT)) (139 (10074 10026 LOCKSHIFT)) (140 (10097 10049 LOCKSHIFT)) (141 
-1SHIFTDOWN . 1SHIFTUP) (142 (10096 10048 LOCKSHIFT)) (143 (10072 10024 LOCKSHIFT)) (144 (13 13 
-NOLOCKSHIFT) . IGNORE) (208 (41 40 NOLOCKSHIFT)) (148 (10076 10028 LOCKSHIFT)) (149 (10070 10022 
-LOCKSHIFT)) (150 (10081 10033 LOCKSHIFT)) (151 (10079 10031 LOCKSHIFT)) (152 (10082 10034 LOCKSHIFT)) 
-(153 (46 55 NOLOCKSHIFT)) (154 (10084 10036 LOCKSHIFT)) (155 (10094 10046 LOCKSHIFT)) (156 LOCKDOWN . 
-LOCKUP) (157 (32 32 NOLOCKSHIFT) . IGNORE) (158 (10087 10039 LOCKSHIFT)) (159 (33 61 NOLOCKSHIFT)) (
-160 2SHIFTDOWN . 2SHIFTUP)) DOVE))

library/FILEBROWSER

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

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

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

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


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


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


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

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

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

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

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

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

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

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

library/HRULE

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

library/PDFSTREAM

@@ -0,0 +1,287 @@
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+
+
(FILECREATED "11-Nov-2023 11:24:42" {WMEDLEY}<library>PDFSTREAM.;56
 14033  
+
+      :EDIT-BY rmk
+
+      :CHANGES-TO (VARS PDFSTREAMCOMS)
+
+      :PREVIOUS-DATE " 9-Oct-2023 00:42:25" {WMEDLEY}<library>PDFSTREAM.;55)
+
+
+(PRETTYCOMPRINT PDFSTREAMCOMS)
+
+(RPAQQ PDFSTREAMCOMS

+       ((FILES (SYSLOAD)
+               POSTSCRIPTSTREAM)
+        [COMS                                                (* ; "Hook into hardcopy interface")

+              [ADDVARS [PRINTERTYPES ((PDF)
+                                      (CANPRINT (PDF))
+                                      (STATUS TRUE)
+                                      (PROPERTIES NILL)
+                                      (SEND POSTSCRIPTSEND)
+                                      (BITMAPSCALE POSTSCRIPT.BITMAPSCALE)
+                                      (BITMAPFILE (PDF.HARDCOPYW FILE BITMAP SCALEFACTOR REGION 
+                                                         ROTATION TITLE]
+                     [PRINTFILETYPES (PDF (TEST PDFFILEP)
+                                          (EXTENSION (PDF))
+                                          (CONVERSION (TEXT PDF.TEXT TEDIT PDF.TEDIT]
+                     (IMAGESTREAMTYPES (PDF (OPENSTREAM OPEN-PDF-STREAM)
+                                            (FONTCREATE POSTSCRIPT.FONTCREATE)
+                                            (FONTSAVAILABLE POSTSCRIPT.FONTSAVAILABLE)
+                                            (CREATECHARSET \CREATECHARSET.PSC]
+              (VARS (DEFAULTPRINTERTYPE 'PDF))
+              (FNS PDFFILEP PDF.HARDCOPYW PDF.TEXT PDF.TEDIT)
+              (P (FONTPROFILE.ADDDEVICE 'PDF 'POSTSCRIPT]
+        
+        (* ;; "")

+
+        
+        (* ;; "Implementation of PDF streams")

+
+        (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)
+        (ADDVARS (FB.SEE.METHODS (PDFFILEP SEE-PDF)))
+        (FNS PDFCONVERTER)))
+
+(FILESLOAD (SYSLOAD)
+       POSTSCRIPTSTREAM)
+
+
+
+(* ; "Hook into hardcopy interface")

+
+
+(ADDTOVAR PRINTERTYPES
 ((PDF)
+                        (CANPRINT (PDF))
+                        (STATUS TRUE)
+                        (PROPERTIES NILL)
+                        (SEND POSTSCRIPTSEND)
+                        (BITMAPSCALE POSTSCRIPT.BITMAPSCALE)
+                        (BITMAPFILE (PDF.HARDCOPYW FILE BITMAP SCALEFACTOR REGION ROTATION TITLE))))
+
+(ADDTOVAR PRINTFILETYPES
 (PDF (TEST PDFFILEP)
+                              (EXTENSION (PDF))
+                              (CONVERSION (TEXT PDF.TEXT TEDIT PDF.TEDIT))))
+
+(ADDTOVAR IMAGESTREAMTYPES
 (PDF (OPENSTREAM OPEN-PDF-STREAM)
+                                (FONTCREATE POSTSCRIPT.FONTCREATE)
+                                (FONTSAVAILABLE POSTSCRIPT.FONTSAVAILABLE)
+                                (CREATECHARSET \CREATECHARSET.PSC)))
+
+(RPAQQ DEFAULTPRINTERTYPE
 PDF)
+(DEFINEQ
+
+(PDFFILEP

+  [LAMBDA (FILE)
                                             (* ; "Edited 23-Jun-2023 14:43 by rmk")


+                                                             (* ; "Edited  5-Mar-93 21:40 by rmk:")


+                                                             (* ; "Edited 14-Jan-93 10:56 by jds")

+    (OR (CL:MEMBER (UNPACKFILENAME.STRING FILE 'EXTENSION)
+               '("PDF")
+               :TEST
+               (FUNCTION STRING-EQUAL))
+        (CL:WHEN (STREAMP FILE)
+            (SETFILEPTR FILE 0)
+            (PROG1 (AND (EQ (BIN FILE)
+                            (CHARCODE %%))
+                        (EQ (BIN FILE)
+                            (CHARCODE P))
+                        (EQ (BIN FILE)
+                            (CHARCODE D))
+                        (EQ (BIN FILE)
+                            (CHARCODE F)))
+                   (SETFILEPTR FILE 0)))])
+
+(PDF.HARDCOPYW

+  [LAMBDA (PDFFILE BITMAP SCALEFACTOR REGION Landscape? TITLE)

+                                                             (* ; "Edited 24-Jul-2023 10:37 by rmk")


+                                                             (* ; "Edited 23-Jun-2023 13:28 by rmk")


+                                                             (* ; "Edited  6-Mar-2023 22:43 by rmk")

+    (LET ((PSTTMP (PACKFILENAME 'EXTENSION 'TMPPS 'BODY PDFFILE)))
+         (PS-TO-PDF
 (POSTSCRIPT.HARDCOPYW PSTTMP BITMAP SCALEFACTOR REGION Landscape? TITLE)
+                PDFFILE])
+
+(PDF.TEXT

+  [LAMBDA (FILE PDFFILE FONTS HEADING TABS)
                  (* ; "Edited  1-Oct-2023 15:24 by rmk")


+                                                             (* ; "Edited 23-Jun-2023 13:23 by rmk")


+                                                             (* ; "Edited  7-Mar-2023 08:39 by rmk")

+    (TEXTTOIMAGEFILE FILE PDFFILE 'PDF FONTS HEADING TABS `(REGION ,POSTSCRIPT.DEFAULT.PAGEREGION 
+                                                                  ROTATION ,(NOT (NOT 
+                                                                        POSTSCRIPT.TEXTFILE.LANDSCAPE
+                                                                                      ])
+
+(PDF.TEDIT

+  [LAMBDA (FILE PDFFILE)
                                     (* ; "Edited 23-Jun-2023 13:22 by rmk")


+                                                             (* ; "Edited  7-Mar-2023 08:39 by rmk")

+    (LET ((TSTREAM (OPENTEXTSTREAM FILE)))
+         (TEDIT.FORMAT.HARDCOPY FILE PDFFILE T NIL NIL NIL 'PDF)
+         (CLOSEF TSTREAM])
+)
+
+(FONTPROFILE.ADDDEVICE 'PDF 'POSTSCRIPT)
+
+
+
+(* ;; "")

+
+
+
+
+(* ;; "Implementation of PDF streams")

+
+
+(RPAQ? PDFCONVERTER
 NIL)
+
+
+
+(* ; "Mac with ghostscript?")

+
+
+(ADDTOVAR PDF-CONVERTER-TEMPLATES
 (ps2pdf " " PSFILE " " PDFFILE " 2> " ERRORFILE)
+                                  (pstopdf " " PSFILE " -o " PDFFILE " 2> " ERRORFILE))
+(DECLARE%: DOEVAL@COMPILE DONTCOPY
+
+(GLOBALVARS PDFCONVERTER PDF-CONVERTER-TEMPLATES)
+)
+(DEFINEQ
+
+(OPEN-PDF-STREAM

+  [LAMBDA (FILE OPTIONS)
                                     (* ; "Edited 23-Sep-2023 15:38 by rmk")


+                                                             (* ; "Edited 22-Sep-2023 11:04 by rmk")


+                                                             (* ; "Edited 24-Jun-2023 14:49 by rmk")

+
+    (* ;; "Open a temporary PS file, but set it up so that at closing it gets converted to PDF using an operating-system utility (if available), and then gets renamed to the original intended filename.")

+
+    (* ;; "We have to stash the original filename someplace.  We could put it in the tmp filename and then parse it out, but then we would have to worry about how unix filenames might parse against our {, },  etc.  ")

+
+    (* ;; 
+
    "Simplest thing for now is to just add an extra field at the end of the \POSTSCRIPTDATA record.")

+
+    (* ;; "")

+
+    (if
 [AND NIL (EQ 'LPT (FILENAMEFIELD FILE 'HOST]
+        then
 
+             (* ;; "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 (ASSOC (PDFCONVERTER
)
+                             PDF-CONVERTER-TEMPLATES)
+                  (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)))
+           (LET ((PSSTREAM (OPENPOSTSCRIPTSTREAM (CONCAT "{UNIX}/tmp/medley-pdf-" (IDATE)
+                                                        "-"
+                                                        (RAND)
+                                                        ".ps")
+                                  OPTIONS)))
+                (STREAMPROP PSSTREAM 'AFTERCLOSE (CONS (FUNCTION CLOSE-PDF-STREAM)))
+                (STREAMPROP PSSTREAM 'PDFTARGETINFO FILE)
+                PSSTREAM])
+
+(CLOSE-PDF-STREAM

+  [LAMBDA (PSSTREAM)
                                         (* ; "Edited 22-Sep-2023 11:18 by rmk")


+                                                             (* ; "Edited 24-Jul-2023 10:37 by rmk")


+                                                             (* ; "Edited 17-Jul-2023 22:32 by rmk")


+                                                             (* ; "Edited 24-Jun-2023 13:57 by rmk")

+
+    (* ;; "PSSTREAM is a postscript (maybe in tmp) rendition of what is intended to end up as a pdf.  If we are going directly to a printer, we can probably just pass it along without worrying about conversion.  In fact, in that case we probably should not have bothered even setting up the PDF stream.")

+
+    (* ;; "But for a file we execute the PDFCONVERTER as a shell command to make a pdf, and then we rename it to the intended filename")

+
+    (STREAMPROP PSSTREAM 'AFTERCLOSE NIL)                    (* ; 
+
                                             "Maybe just remove  only CLOSE-PDF-STREAMfrom the list?")

+    (LET ((TARGETINFO (STREAMPROP PSSTREAM 'PDFTARGETINFO NIL)))
+         (CL:IF TARGETINFO
+             (RENAMEFILE (PS-TO-PDF
 PSSTREAM)
+                    TARGETINFO)
+             PSSTREAM)])
+
+(PS-TO-PDF

+  [LAMBDA (PSFILE PDFFILE DONTDELETE)
                        (* ; "Edited  1-Oct-2023 15:18 by rmk")


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


+                                                             (* ; "Edited 23-Jul-2023 22:30 by rmk")


+                                                             (* ; "Edited 24-Jun-2023 15:01 by rmk")


+                                                             (* ; "Edited 16-Jul-2022 13:06 by rmk")


+                                                             (* ; "Edited  8-Jul-2022 10:20 by rmk")


+                                                             (* ; "Edited  7-May-2022 22:40 by rmk")


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

+
+    (* ;; "PSFILE is the name of a closed PS file on a DSK/UNIX device.  This function uses the PDFCONVERTER utility to convert that to a parallel pdf file, which is then renamed to PDFFILE.  ")

+
+    (* ;; "DONTDELETE is just for debugging, keeps the /tmp/ files")

+
+    (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)))
+    (LET ((ERRORFILE (PACKFILENAME 'EXTENSION 'error 'BODY PSFILE))
+          COMPLETIONCODE)
+
+         (* ;; "PROCESS-COMMAND is currently from GITFNS.  Not sure whether ShellCommand in UNIXUTILS is appropriate.")

+
+         (* ;; 
+
     "We have to map the filenames down to Unix conventions:  (not pseudohost or host, slashes, etc.")

+
+         [SETQ COMPLETIONCODE (PROCESS-COMMAND (CONCATLIST (SUBLIS
+                                                            `((PSFILE \, (SLASHIT (TRUEFILENAME
+                                                                                   PSFILE)
+                                                                                NIL T))
+                                                              (PDFFILE \, (SLASHIT (TRUEFILENAME
+                                                                                    PDFFILE)
+                                                                                 NIL T))
+                                                              (ERRORFILE \, (SLASHIT (TRUEFILENAME
+                                                                                      ERRORFILE)
+                                                                                   NIL T)))
+                                                            (ASSOC (PDFCONVERTER
)
+                                                                   PDF-CONVERTER-TEMPLATES]
+
+         (* ;; "Now use Medley names")

+
+         (CLOSEF? PSFILE)
+         (CL:UNLESS DONTDELETE (DELFILE PSFILE))
+         (CLOSEF? ERRORFILE)
+         (CL:WHEN (INFILEP ERRORFILE)
+             (CL:WHEN (IGREATERP (PROG1 (GETFILEINFO ERRORFILE 'LENGTH)
+                                     (CL:UNLESS DONTDELETE (DELFILE ERRORFILE)))
+                             0)
+                    (ERROR "Cannot create PDF file for " PDFFILE)))
+         (CL:WHEN (IGREATERP COMPLETIONCODE 0)
+                (ERROR "Cannot create PDF file for " PDFFILE))
+         PDFFILE])
+)
+(DEFINEQ
+
+(SEE-PDF

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


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

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

+
+    (ShellOpen (PACKFILENAME 'BODY PDFFILE 'EXTENSION 'PDF])
+)
+
+(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 (3162 5776 (PDFFILEP 3172 . 4086) (PDF.HARDCOPYW 4088 . 4686) (PDF.TEXT 4688 . 5405) (
+PDF.TEDIT 5407 . 5774)) (6216 13276 (OPEN-PDF-STREAM 6226 . 8362) (CLOSE-PDF-STREAM 8364 . 9651) (
+PS-TO-PDF 9653 . 13274)) (13277 13675 (SEE-PDF 13287 . 13673)) (13726 14010 (PDFCONVERTER 13736 . 
+14008)))))
+STOP

library/UNICODE

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

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

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

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

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

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

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


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


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


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

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

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

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

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


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

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

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

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

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

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


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


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


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


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

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

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

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

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


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

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

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

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

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

 
     (* ;; "                                     for XCCS mapping files")

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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


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


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

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

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

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

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

 
     (* ;; "")

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

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

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

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

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

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

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

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

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

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

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

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

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

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


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


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

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

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

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

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

+
+    (* ;; "")

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

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

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

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

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

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


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

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

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


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


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


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

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

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

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

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

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

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

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

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

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


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


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

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

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

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

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

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


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

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

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

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

library/UNICODE.TXT

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

library/UNIXUTILS

@@ -1,28 +1,41 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "18-Jan-2023 20:36:10" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;7
 5091   
+
(FILECREATED "13-Nov-2023 12:57:10" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;26
 16663  
 
-      :CHANGES-TO (FNS ShellBrowser ShellBrowse ShellOpen)
-                  (VARS UNIXUTILSCOMS)
-                  (FUNCTIONS ShellWhich)
+      :CHANGES-TO (FNS ShellBrowser)
 
-      :PREVIOUS-DATE "18-Jan-2023 13:22:28" {DSK}<home>frank>il>medley>gmedley>greetfiles>UNIXUTILS.;1
+      :PREVIOUS-DATE "11-Nov-2023 09:06:39" {DSK}<home>frank>il>medley>gmedley>library>UNIXUTILS.;25
 )
 
 
 (PRETTYCOMPRINT UNIXUTILSCOMS)
 
-(RPAQQ UNIXUTILSCOMS
 ((GLOBALVARS ShellBrowser)
-                      (INITVARS (ShellBrowser))
-                      (FUNCTIONS ShellCommand ShellWhich)
-                      (FNS ShellBrowser ShellBrowse)))
+(RPAQQ UNIXUTILSCOMS

+       ((DECLARE%: EVAL@COMPILE DONTCOPY                     (* ; "For PROCESS-COMMAND")

+               (FILES (FROM LOADUPS)
+                      EXPORTS.ALL))
+        (GLOBALVARS ShellBrowser ShellOpener)
+        (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 
+
+(FILESLOAD (FROM
 LOADUPS)
+       EXPORTS.ALL)
+)
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
-(GLOBALVARS ShellBrowser)
+(GLOBALVARS ShellBrowser ShellOpener)
 )
 
 (RPAQ? ShellBrowser
 )
 
+(RPAQ? ShellOpener
 )
+
 (CL:DEFUN ShellCommand
 (Cmd &OPTIONAL (Output T))
    (CL:WITH-OPEN-STREAM (s (CREATE-PROCESS-STREAM Cmd))
           (CL:TAGBODY [SETFILEINFO s 'ENDOFSTREAMOP #'(CL:LAMBDA (s)
@@ -34,62 +47,59 @@
 
 (CL:DEFUN ShellWhich
 (Cmd)
                                   (* ; "Edited 18-Jan-2023 13:19 by FGH")

    [CL:WITH-OPEN-STREAM (S (OPENSTREAM '{NODIRCORE} 'BOTH))
-          (ShellCommand
 (CONCAT "which " Cmd)
+          (ShellCommand
 (CONCAT "command -v " Cmd)
                  S)
           (COND
              ((EQ (GETEOFPTR S)
                   0)
               NIL)
              (T (SETFILEPTR S 0)
-                (MKSTRING (READ S])
+                (RSTRING S])
+
+(ADDTOVAR MEDLEY-INIT-VARS
 (ShellBrowser)
+                           (ShellOpener))
 (DEFINEQ
 
 (ShellBrowser

   [LAMBDA NIL
                                                (* ; "Edited 18-Jan-2023 20:30 by FGH")

-    (OR ShellBrowser (SETQ ShellBrowser (LET (CMDPATH)
-                                             (if
 (STRPOS "darwin" (OR (UNIX-GETENV "OSTYPE")
-                                                                      (UNIX-GETENV "PATH")))
-                                                 then
 
-                                                      (* ;; " MacOS")

 
-                                                      "open"
-                                               elseif
 (SETQ CMDPATH (ShellWhich
 "wslview"))
-                                                 then
 
-                                                      (* ;; "windows with WSL")

+    (* ;; "Figure out the browser  to use for the ShellOpen/ShellBrowse functions. ")

 
-                                                      CMDPATH
-                                               elseif
 (SETQ CMDPATH (ShellWhich
 "xdg-open"))
-                                                 then
 
-                                                      (* ;; "Linux systems with xdg-utils installed ")

+    (* ;; " Ordinarily, this would be the same as the generic ShellOpener.")

 
-                                                      CMDPATH
-                                               elseif
 (SETQ CMDPATH (ShellWhich
 "git"))
-                                                 then
 
-                                                      (* ;; " Systems with git installed")

+    (* ;; " But if a generic ShellOpener is not found, then there are some additional")

 
-                                                      (CONCAT CMDPATH " web--browse") 
-                                                             (* ; "")

-                                               elseif
 (SETQ CMDPATH (ShellWhich
 "lynx"))
-                                                 then
 
-                                                      (* ;; " Systems with lynx installed")

+    (* ;; " possibilities that will work for http/https URLs.  If one of these exists return it.")

 
-                                                      (LET (CMDPATH2)
-                                                           (if
 (SETQ CMDPATH2 (ShellWhich
 "xterm"))
-                                                               then
 (CONCAT CMDPATH2 " -e " CMDPATH)
-                                                             else
 (LIST CMDPATH)))
-                                               else
 
-                                                    (* ;; 
-
                                                    " Out of ideas - just return a dummy function")

+    (OR ShellBrowser (SETQ ShellBrowser
+                      (if
 (NOT (STREQUAL (ShellOpener
)
+                                      "true"))
+                          then
 ShellOpener
+                        else
 (LET (CMDPATH)
+                                  (if
 (SETQ CMDPATH (ShellWhich
 "git"))
+                                      then
 
+                                           (* ;; " Systems with git installed")

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

+
+                                           (LET (CMDPATH2)
+                                                (if
 (SETQ CMDPATH2 (ShellWhich
 "xterm"))
+                                                    then
 (CONCAT CMDPATH2 " -e " CMDPATH)
+                                                  else
 (LIST CMDPATH)))
+                                    else
 
+                                         (* ;; " Out of ideas - just return a dummy function")

+
+                                         "true"])
 
 (ShellBrowse

   [LAMBDA (URL)
                                              (* ; "Edited 18-Jan-2023 20:32 by FGH")

 
     (* ;; " Open the web page specified by URL using an external browser via shell call")

 
-    (* ;; 
-
  " URL must start with http:// or https:// (case ireelevant) or this function will just return NIL.")

+    (* ;; " URL must start with http:// or https:// or file:/// (case ireelevant) or this function will just return NIL.")

 
     (* ;; " Returns T otherwise.")

 
@@ -97,17 +107,218 @@
     (if
 (OR (EQ (STRPOS "http://" (L-CASE URL))
                 1)
             (EQ (STRPOS "https://" (L-CASE URL))
+                1)
+            (EQ (STRPOS "file:///" (L-CASE URL))
+                1))
+        then
 (ShellOpen
 URL)
+      else
 NIL])
+
+(ShellOpener

+  [LAMBDA NIL
+
+    (* ;; "Find an %"opener%" that will open files (and URLs) using the appropriate/default app on this machine")

+
+    (OR ShellOpener (SETQ ShellOpener (LET (CMDPATH)
+                                           (if
 (SETQ CMDPATH (ShellWhich
 "wslview"))
+                                               then
 
+                                                    (* ;; "windows with WSL")

+
+                                                    CMDPATH
+                                             elseif
 (SETQ CMDPATH (ShellWhich
 "cygstart"))
+                                               then
 
+                                                    (* ;; "windows with cygwin")

+
+                                                    CMDPATH
+                                             elseif
 (SETQ CMDPATH (ShellWhich
 "xdg-open"))
+                                               then
 
+                                                    (* ;; "Linux systems with xdg-utils installed ")

+
+                                                    CMDPATH
+                                             elseif
 (SETQ CMDPATH (ShellWhich
 "open"))
+                                               then
 
+                                                    (* ;; " MacOS open")

+
+                                                    CMDPATH
+                                             else
 
+                                                  (* ;; 
+
                                                  " Out of ideas - just return a dummy function")

+
+                                                  "true"])
+
+(ShellOpen

+  [LAMBDA (FilenameOrURL)
+
+    (* ;; "Open the  file or URL using the generic %"opener%" for this machine via a shell call.")

+
+    (* ;; " If FilenameOrURL starts with %"http://%" or %"https://%" or %"file:///%",  then we use (ShellBrowser) as")

+
+    (* ;; " the %"opener%" (which includes some browsers on a machine without a generic opener).")

+
+    (* ;; 
+
    " Otherwise FilenameOrURL is assumed to be a filename and will be opened using (ShellOpener).")

+
+    (* ;; " 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)
+            (EQ (STRPOS "https://" (L-CASE FilenameOrURL))
+                1)
+            (EQ (STRPOS "file://" (L-CASE FilenameOrURL))
                 1))
         then
 (LET ((BROWSER (ShellBrowser
)))
-                  (if
 (LISTP BROWSER)
-                      then
 (CHAT 'SHELL NIL (CONCAT (CAR BROWSER)
-                                                   " '" URL "'"))
-                    else
 (ShellCommand
 (CONCAT BROWSER " '" URL "'" 
-                                              " >>/tmp/ShellBrowser-warnings-$$.txt")))
-                  T)
-      else
 NIL])
+                  (if
 (NOT (STREQUAL BROWSER "true"))
+                      then
 (if
 (LISTP BROWSER)
+                               then
 (CHAT 'SHELL NIL (CONCAT (CAR BROWSER)
+                                                            " '" FilenameOrURL "'"))
+                             else
 (ShellCommand
 (CONCAT BROWSER " '" FilenameOrURL "'" 
+                                                       " >>/tmp/ShellBrowser-warnings-$$.txt"))
+                                  T)
+                    else
 (CONCAT "Unable to find a browser to open: " FilenameOrURL)))
+      else

+      (LET*
+       ((OPENER (ShellOpener
))
+        (FULLNAME (FULLNAME FilenameOrURL)))
+       (if
 (NOT FULLNAME)
+           then
 (CONCAT "File not found: " FilenameOrURL)
+         elseif
 (STREQUAL OPENER "true")
+           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")
+                            SHELLSTREAM)
+                     (if
 (EQ (GETFILEPTR SHELLSTREAM)
+                             0)
+                         then
 T
+                       else
 (LET* ((OUTSTRING (ALLOCSTRING (GETFILEPTR SHELLSTREAM)
+                                                     " ")))
+                                  (CL:WITH-OPEN-STREAM (STRINGSTREAM (OPENSTRINGSTREAM OUTSTRING
+                                                                            'OUTPUT))
+                                         (SETFILEPTR SHELLSTREAM 0)
+                                         (CL:TAGBODY [SETFILEINFO SHELLSTREAM 'ENDOFSTREAMOP
+                                                            #'(CL:LAMBDA (s)
+                                                                     (GO OUT]
+                                                (CL:LOOP (PRINTCCODE (READCCODE SHELLSTREAM)
+                                                                STRINGSTREAM))
+                                                OUT))
+                                  OUTSTRING])
+
+(PROCESS-COMMAND

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

+
+    (* ;; "This sets up an asynchronous process and waits until it returns with an exit code.  Typically 0 means success.")

+
+    (CL:WITH-OPEN-STREAM (PS (CREATE-PROCESS-STREAM CMD))
+           (BIND
 CODE WHILE
 (EQ T (SETQ CODE (OR (SUBRCALL UNIX-HANDLECOMM 7 (fetch
 (STREAM F1)
+                                                                                of
 PS))
+                                                 0))) DO
 (BLOCK) FINALLY
 (RETURN CODE])
+
+(SLASHIT

+  [LAMBDA (X LCASEDIRS NOHOST)
                               (* ; "Edited 23-Sep-2023 15:27 by rmk")

+
+    (* ;; "It would also be nice to use the generic unpackfilename/packfilename tools.  But packfilename sticks in brackets again, and sticks a dot on when removing the version.")

+
+    (* ;; "Perhaps this should be a per file-device operation that maps device names into the local file system.")

+
+    (* ;; "This is a first approximation to a utility that converts a filename X on a host whose files physically reside in the local Unix file system into the strings that shell commands can use to reference that file.  For now, this just involves replacing directory brackets with /, removing the host, and perhaps lower-casing the directory.  It probably should be extended to deal with version number translation, for now it just keeps the ; version. ")

+
+    (LET [LASTDIRPOS SLASHED (DIRPOS (ADD1 (OR (STRPOS "}" X)
+                                               0]
+         [SETQ SLASHED (CONCATCODES (for
 I C from
 DIRPOS while
 (SETQ C (NTHCHARCODE X I))
+                                       collect
 (SELCHARQ C
+                                                    ((< >) 
+                                                         (SETQ LASTDIRPOS I)
+                                                         (CHARCODE /))
+                                                    (/ (SETQ LASTDIRPOS I)
+                                                       C)
+                                                    C]
+         (CL:WHEN (AND LCASEDIRS LASTDIRPOS)
+             (SETQ LASTDIRPOS (ADD1 (IDIFFERENCE LASTDIRPOS DIRPOS)))
+             (SETQ SLASHED (CONCAT (L-CASE (SUBSTRING SLASHED 1 LASTDIRPOS))
+                                  (OR (SUBSTRING SLASHED (ADD1 LASTDIRPOS))
+                                      ""))))
+         (CL:IF (OR (EQ DIRPOS 1)
+                    NOHOST)
+             SLASHED
+             (CONCAT (SUBSTRING X 1 (SUB1 DIRPOS))
+                    SLASHED))])
+
+(UNIX-FILE-NAME

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

+
+    (* ;; "Tries to return the string that would reference FILE in a Unix shell, for the use of PROCESS-COMMAND and ShellCommand.  If VERSION is 1, it assumes that the Unix file is doesn't have the Medley version convention.  If FILE does not have a corresponding Unix name, COPY is non-NIL, and ACCESS is INPUT, FILE will be copied to a unix tmp file (with COPY in its name) and that name will be returned.")

+
+    (CL:WHEN (\GETSTREAM FILE ACCESS T)
+        (SETQ FILE (OR (FULLNAME FILE)
+                       FILE)))                               (* ; "Might catch NODIRCORE")

+    (CL:WHEN FILE
+        (SETQ FILE (TRUEFILENAME FILE))
+        (CL:UNLESS (STREAMP FILE)
+            [SETQ FILE (\GETFILENAME FILE (SELECTQ ACCESS
+                                              (OUTPUT 'NEW)
+                                              (INPUT 'OLD)
+                                              (NIL (SETQ ACCESS 'INPUT)
+                                                   'OLD)
+                                              (\ILLEGAL.ARG ACCESS])
+        [SELECTQ (FILENAMEFIELD FILE 'HOST)
+            (UNIX [SUBSTRING FILE (ADD1 (CONSTANT (NCHARS "{UNIX}"])
+            (DSK (LET [(VERSION (FILENAMEFIELD FILE 'VERSION]
+                      (SETQ FILE (SLASHIT
 (PACKFILENAME 'HOST NIL 'VERSION NIL 'BODY FILE)))
+                      (CL:IF (AND VERSION (IGREATERP VERSION 1))
+                          (CONCAT FILE (CL:IF (FILENAMEFIELD FILE 'EXTENSION)
+                                           "."
+                                           "")
+                                 "~" VERSION "~")
+                          FILE)))
+            (CL:WHEN (AND COPY (EQ ACCESS 'INPUT)
+                          FILE)
+                (RESETLST
+                    (CL:WHEN (\GETSTREAM FILE 'INPUT T)      (* ; "Hope is randaccess")

+                        [RESETSAVE (GETFILEPTR FILE)
+                               `(PROGN (SETFILEPTR ,FILE OLDVALUE])
+                    (COPYFILE FILE (CONCAT "{UNIX}/tmp/medley-" (L-CASE COPY)
+                                          "-"
+                                          (IDATE)
+                                          "-"
+                                          (RAND)
+                                          (CL:IF (FILENAMEFIELD FILE 'EXTENSION)
+                                              (CONCAT "." (FILENAMEFIELD FILE 'EXTENSION))
+                                              "")))))])])
 )
+
+(PUTPROPS UNIXUTILS
 FILETYPE
 CL:COMPILE-FILE)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (764 1137 (ShellCommand 764 . 1137)) (1139 1538 (ShellWhich 1139 . 1538)) (1539 5068 (
-ShellBrowser 1549 . 4072) (ShellBrowse 4074 . 5066)))))
+  (FILEMAP (NIL (1146 1519 (ShellCommand 1146 . 1519)) (1521 1918 (ShellWhich 1521 . 1918)) (2008 16585 
+(ShellBrowser 2018 . 3790) (ShellBrowse 3792 . 4477) (ShellOpener 4479 . 6167) (ShellOpen 6169 . 11324
+) (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 
-                                                                SKETCHEDIT))
+                                                                SKETCH-OPS SKETCH-ELEMENTS SKETCH-OBJ
+                                                                SKETCH-EDIT))
+        (DECLARE%: EVAL@COMPILE DONTCOPY (FILES (FROM LOADUPS)
+                                                EXPORTS.ALL))
                                                              (* ; 
 
              "recompute the sketch element types because loading SKETCH clobbers the previous ones.")

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

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

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

library/sketch/SKETCH-BMELT

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

+(RPAQQ SKETCH-BMELTCOMS

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

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

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

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

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

+
         This may be a subregion of LOCALBITMAPREGION)

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

library/sketch/SKETCH-EDIT

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

+(RPAQQ SKETCH-EDITCOMS

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

library/sketch/SKETCH-ELEMENTS

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

+(RPAQQ SKETCH-ELEMENTSCOMS

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

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

library/sketch/SKETCH-OBJ

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

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

library/sketch/SKETCH-OPS

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

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

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

library/sketch/SKETCH-STREAM

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

+(RPAQQ SKETCH-STREAMCOMS

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

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

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

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

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

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

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

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

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

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

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

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

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

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

library/tedit/TEDIT-WINDOW

@@ -1,10 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "14-Jul-2022 16:55:53" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>library>tedit>TEDIT-WINDOW.;1
 180402 
+
(FILECREATED "20-Oct-2023 21:46:58" {MEDLEY}<library>tedit>TEDIT-WINDOW.;7
 180689 
 
-      :PREVIOUS-DATE "14-Jul-2022 11:08:01" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>library>newtedit>TEDIT-WINDOW.;2)
+      :EDIT-BY rmk
+
+      :CHANGES-TO (FNS TEDIT.DEACTIVATE.WINDOW)
+
+      :PREVIOUS-DATE "14-Jul-2022 16:55:53" {MEDLEY}<library>tedit>TEDIT-WINDOW.;5)
 
 
 (PRETTYCOMPRINT TEDIT-WINDOWCOMS)
@@ -1631,113 +1633,114 @@
 (DEFINEQ
 
 (TEDIT.DEACTIVATE.WINDOW

-  [LAMBDA (W FORCEFLG DISCONNECTONLYFLG)
                    (* ; "Edited 16-Oct-2021 18:51 by rmk:")

+  [LAMBDA (W FORCEFLG DISCONNECTONLYFLG)
                     (* ; "Edited 20-Oct-2023 21:46 by rmk")


+                                                            (* ; "Edited 16-Oct-2021 18:51 by rmk:")

 
     (* ;; "Deactivate the various button fns for this window")

 
     (PROG [(TEXTOBJ (WINDOWPROP W 'TEXTOBJ]                  (* ; 
 
                             "Can't be a call to TEXTOBJ, since window may NOT have a textobj on it.")

-          (replace
 (TEXTOBJ EDITFINISHEDFLG) of
 TEXTOBJ with
 T)
-          [COND
-             ((AND TEXTOBJ (fetch
 (TEXTOBJ EDITOPACTIVE) of
 TEXTOBJ))
-
-              (* ;; "If something is going on, DON'T CLOSE THE WINDOW")

-
-              (TEDIT.PROMPTPRINT
 TEXTOBJ "Not closed; edit operation in progress" T)
-              (RETURN 'DON'T))
-             ((AND TEXTOBJ (PROCESSP (WINDOWPROP W 'PROCESS))
-                   (NOT (fetch
 (TEXTOBJ EDITFINISHEDFLG) of
 TEXTOBJ))
-                   (NOT (fetch
 (TEXTOBJ TXTREADONLY) of
 TEXTOBJ))
-                   (NOT FORCEFLG))                           (* ; 
-
                                        "This is an un-quit TEdit window.  Try to QUIT out of TEdit.")

-              (COND
-                 ((\TEDIT.QUIT W T))
-                 (T 
-                    (* ;; "Always return DON'T: If we didn't quit, we don't want to close the window;  if we did quit, the window is closed already, and will be reopened to reclose it.")

-
-                    (RETURN 'DON'T]
-          (COND
-             ([AND TEXTOBJ (OR FORCEFLG (fetch
 (TEXTOBJ EDITFINISHEDFLG) of
 TEXTOBJ)
-                               (fetch
 (TEXTOBJ TXTREADONLY) of
 TEXTOBJ)
-                               (NOT (PROCESSP (WINDOWPROP W 'PROCESS]
-                                                             (* ; 
-
                                     "Only do this if it's a TEdit window, and has been QUIT out of.")

+          (CL:WHEN TEXTOBJ
+              (replace
 (TEXTOBJ EDITFINISHEDFLG) of
 TEXTOBJ with
 T)
               [COND
-                 ((AND (fetch
 (TEXTOBJ PROMPTWINDOW) of
 TEXTOBJ)
-                       (OPENWP (fetch
 (TEXTOBJ PROMPTWINDOW) of
 TEXTOBJ)))
-                  (CLEARW (fetch
 (TEXTOBJ PROMPTWINDOW) of
 TEXTOBJ]
-              (\SHOWSEL (fetch
 (TEXTOBJ SEL) of
 TEXTOBJ)
-                     NIL NIL)                                (* ; 
-
        "Before the window is closed, make SURE that the caret is down, or the window will reappear.")

+                 ((fetch
 (TEXTOBJ EDITOPACTIVE) of
 TEXTOBJ)
+
+                  (* ;; "If something is going on, DON'T CLOSE THE WINDOW")

+
+                  (TEDIT.PROMPTPRINT
 TEXTOBJ "Not closed; edit operation in progress" T)
+                  (RETURN 'DON'T))
+                 ((AND (PROCESSP (WINDOWPROP W 'PROCESS))
+                       (NOT (fetch
 (TEXTOBJ EDITFINISHEDFLG) of
 TEXTOBJ))
+                       (NOT (fetch
 (TEXTOBJ TXTREADONLY) of
 TEXTOBJ))
+                       (NOT FORCEFLG))                       (* ; 
+
                                        "This is an un-quit TEdit window.  Try to QUIT out of TEdit.")

+                  (COND
+                     ((\TEDIT.QUIT W T))
+                     (T 
+                        (* ;; "Always return DON'T: If we didn't quit, we don't want to close the window;  if we did quit, the window is closed already, and will be reopened to reclose it.")

+
+                        (RETURN 'DON'T]
               (COND
-                 ((AND (\TEDIT.WINDOW.TITLE
 TEXTOBJ)
-                       (OPENWP (fetch
 (TEXTOBJ PROMPTWINDOW) of
 TEXTOBJ))
-                       (OPENWP W)
-                       (EQ W (CAR (fetch
 (TEXTOBJ \WINDOW) of
 TEXTOBJ)))
-                       (NOT DISCONNECTONLYFLG))
-                  (\TEDIT.WINDOW.TITLE
 TEXTOBJ "Edit Window [Inactive]")
+                 ([OR FORCEFLG (fetch
 (TEXTOBJ EDITFINISHEDFLG) of
 TEXTOBJ)
+                      (fetch
 (TEXTOBJ TXTREADONLY) of
 TEXTOBJ)
+                      (NOT (PROCESSP (WINDOWPROP W 'PROCESS] (* ; 
+
                                     "Only do this if it's a TEdit window, and has been QUIT out of.")

+                  [COND
+                     ((AND (fetch
 (TEXTOBJ PROMPTWINDOW) of
 TEXTOBJ)
+                           (OPENWP (fetch
 (TEXTOBJ PROMPTWINDOW) of
 TEXTOBJ)))
+                      (CLEARW (fetch
 (TEXTOBJ PROMPTWINDOW) of
 TEXTOBJ]
+                  (\SHOWSEL (fetch
 (TEXTOBJ SEL) of
 TEXTOBJ)
+                         NIL NIL)                            (* ; 
+
        "Before the window is closed, make SURE that the caret is down, or the window will reappear.")

+                  (COND
+                     ((AND (\TEDIT.WINDOW.TITLE
 TEXTOBJ)
+                           (OPENWP (fetch
 (TEXTOBJ PROMPTWINDOW) of
 TEXTOBJ))
+                           (OPENWP W)
+                           (EQ W (CAR (fetch
 (TEXTOBJ \WINDOW) of
 TEXTOBJ)))
+                           (NOT DISCONNECTONLYFLG))
+                      (\TEDIT.WINDOW.TITLE
 TEXTOBJ "Edit Window [Inactive]")
                                                              (* ; 
 
                                               "Reset the window's title to a known 'inactive' value")

-                  ))
-              [COND
-                 ((NOT DISCONNECTONLYFLG)
-                  (for
 PANE in
 (REVERSE (CDR (fetch
 (TEXTOBJ \WINDOW) of
 TEXTOBJ)))
-                     do
 
-                        (* ;; "Run thru any split-off sub-panes, and reattach them, so we get a whole window back before the end of the world.")

+                      ))
+                  [COND
+                     ((NOT DISCONNECTONLYFLG)
+                      (for
 PANE in
 (REVERSE (CDR (fetch
 (TEXTOBJ \WINDOW) of
 TEXTOBJ)))
+                         do
 
+                            (* ;; "Run thru any split-off sub-panes, and reattach them, so we get a whole window back before the end of the world.")

 
-                        (\TEDIT.UNSPLITW
 PANE))
-                  (replace
 (TEXTOBJ \WINDOW) of
 TEXTOBJ with
 NIL)
-                  (COND
-                     ((type?
 STREAM (fetch
 (TEXTOBJ TXTFILE) of
 TEXTOBJ))
+                            (\TEDIT.UNSPLITW
 PANE))
+                      (replace
 (TEXTOBJ \WINDOW) of
 TEXTOBJ with
 NIL)
+                      (COND
+                         ((type?
 STREAM (fetch
 (TEXTOBJ TXTFILE) of
 TEXTOBJ))
                                                              (* ; 
 
                                                       "Close the file that this window was open on.")

-                      (COND
-                         ((NOT (WINDOWPROP W 'TEDIT-CLOSING-FILE T))
-                          (CLOSEF? (fetch
 (TEXTOBJ TXTFILE) of
 TEXTOBJ))
-                          (WINDOWPROP W 'TEDIT-CLOSING-FILE NIL]
-              (WINDOWPROP W 'TEXTOBJ NIL)                    (* ; 
+                          (COND
+                             ((NOT (WINDOWPROP W 'TEDIT-CLOSING-FILE T))
+                              (CLOSEF? (fetch
 (TEXTOBJ TXTFILE) of
 TEXTOBJ))
+                              (WINDOWPROP W 'TEDIT-CLOSING-FILE NIL]
+                  (WINDOWPROP W 'TEXTOBJ NIL)                (* ; 
 
                                                    "Detach the edit data structures from the window")

-              (WINDOWPROP W 'TEXTSTREAM NIL)
-              (WINDOWPROP W 'LINES NIL)
-              (WINDOWPROP W 'THISLINE NIL)
-              (WINDOWPROP W 'PROCESS.EXITFN NIL)
-              (WINDOWPROP W 'PROCESS.IDLEFN NIL)
-              (WINDOWPROP W 'CURSOROUTFN NIL)
-              (WINDOWPROP W 'CURSORMOVEDFN NIL)
-              (WINDOWPROP W 'BUTTONEVENTFN 'TOTOPW)          (* ; "And the button functions")

-              (WINDOWPROP W 'RIGHTBUTTONFN 'DOWINDOWCOM)
-              (WINDOWDELPROP W 'CLOSEFN 'TEDIT.DEACTIVATE.WINDOW)
-              (WINDOWPROP W 'SCROLLFN NIL)
-              (WINDOWDELPROP W 'RESHAPEFN '\EDITRESHAPEFN)
-              (AND (NOT DISCONNECTONLYFLG)
-                   (WINDOWPROP W 'PROCESS)
-                   (\TEDIT.INTERRUPT.SETUP (WINDOWPROP W 'PROCESS)
-                          T))                                (* ; 
+                  (WINDOWPROP W 'TEXTSTREAM NIL)
+                  (WINDOWPROP W 'LINES NIL)
+                  (WINDOWPROP W 'THISLINE NIL)
+                  (WINDOWPROP W 'PROCESS.EXITFN NIL)
+                  (WINDOWPROP W 'PROCESS.IDLEFN NIL)
+                  (WINDOWPROP W 'CURSOROUTFN NIL)
+                  (WINDOWPROP W 'CURSORMOVEDFN NIL)
+                  (WINDOWPROP W 'BUTTONEVENTFN 'TOTOPW)      (* ; "And the button functions")

+                  (WINDOWPROP W 'RIGHTBUTTONFN 'DOWINDOWCOM)
+                  (WINDOWDELPROP W 'CLOSEFN 'TEDIT.DEACTIVATE.WINDOW)
+                  (WINDOWPROP W 'SCROLLFN NIL)
+                  (WINDOWDELPROP W 'RESHAPEFN '\EDITRESHAPEFN)
+                  (AND (NOT DISCONNECTONLYFLG)
+                       (WINDOWPROP W 'PROCESS)
+                       (\TEDIT.INTERRUPT.SETUP (WINDOWPROP W 'PROCESS)
+                              T))                            (* ; 
 
                                                    "Make sure any disarmed interrupts are restored.")

-              (for
 MENUW in
 (ATTACHEDWINDOWS W) when
 (AND (WINDOWPROP MENUW 'TEDITMENU)
-                                                          (WINDOWPROP MENUW 'TEXTOBJ))
-                 do
                                          (* ; 
+                  (for
 MENUW in
 (ATTACHEDWINDOWS W) when
 (AND (WINDOWPROP MENUW 'TEDITMENU)
+                                                              (WINDOWPROP MENUW 'TEXTOBJ))
+                     do
                                      (* ; 
 
                                       "Detach all the TEDITMENU windows that belong to this window.")

-                    (replace
 (TEXTOBJ EDITFINISHEDFLG) of
 (TEXTOBJ MENUW) with
 T) 
+                        (replace
 (TEXTOBJ EDITFINISHEDFLG) of
 (TEXTOBJ MENUW) with
 T) 
                                                              (* ; "Mark it finished")

-                    (WINDOWPROP MENUW 'TEDITMENU NIL)        (* ; 
+                        (WINDOWPROP MENUW 'TEDITMENU NIL)    (* ; 
 
                                                             "And mark it no longer a menu window")

-                    (GIVE.TTY.PROCESS MENUW)                 (* ; 
+                        (GIVE.TTY.PROCESS MENUW)             (* ; 
 
                                                           "Then give it a chance to kill itself off")

-                    (DISMISS 300))
-              (COND
-                 ((NOT DISCONNECTONLYFLG)
-                  (GIVE.TTY.PROCESS W)
-                  (DISMISS 300)))
-              [replace
 (TEXTOBJ \WINDOW) of
 TEXTOBJ with
 (COND
-                                                            ((LISTP (fetch
 (TEXTOBJ \WINDOW)
-                                                                       of
 TEXTOBJ))
+                        (DISMISS 300))
+                  (COND
+                     ((NOT DISCONNECTONLYFLG)
+                      (GIVE.TTY.PROCESS W)
+                      (DISMISS 300)))
+                  [replace
 (TEXTOBJ \WINDOW) of
 TEXTOBJ with
 (COND
+                                                                ((LISTP (fetch
 (TEXTOBJ \WINDOW)
+                                                                           of
 TEXTOBJ))
                                                              (* ; "It's a list;  remove this window")

-                                                             (DREMOVE W (fetch
 (TEXTOBJ \WINDOW)
-                                                                           of
 TEXTOBJ]
+                                                                 (DREMOVE W (fetch
 (TEXTOBJ \WINDOW)
+                                                                               of
 TEXTOBJ]
                                                              (* ; 
 
                                       "Disconnect the window from the edit data structures as well.")

-              ])
+                  )))])
 
 (\TEDIT.REPAINTFN

   [LAMBDA (W)
                                                (* ; "Edited 30-May-91 23:34 by jds")

@@ -2726,25 +2729,25 @@
 (RPAQ? TEDIT.TITLED.ICON.TEMPLATE
 (CONS TEDITICON (CONS TEDITMASK (CONS TEDIT.ICON.TITLE.REGION NIL))
                                         ))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (7116 90052 (TEDIT.CREATEW 7126 . 9899) (\TEDIT.CREATEW.FROM.REGION 9901 . 10881) (
-TEDIT.CURSORMOVEDFN 10883 . 20782) (TEDIT.CURSOROUTFN 20784 . 21327) (TEDIT.WINDOW.SETUP 21329 . 23154
-) (TEDIT.MINIMAL.WINDOW.SETUP 23156 . 30934) (\TEDIT.ACTIVE.WINDOWP 30936 . 31929) (
-\TEDIT.BUTTONEVENTFN 31931 . 55639) (\TEDIT.WINDOW.OPS 55641 . 58853) (\TEDIT.EXPANDFN 58855 . 59418) 
-(\TEDIT.MAINW 59420 . 60717) (\TEDIT.PRIMARYW 60719 . 61880) (\TEDIT.COPYINSERTFN 61882 . 62678) (
-\TEDIT.NEWREGIONFN 62680 . 65196) (\TEDIT.SET.WINDOW.EXTENT 65198 . 70741) (\TEDIT.SHRINK.ICONCREATE 
-70743 . 72944) (\TEDIT.SHRINKFN 72946 . 73505) (\TEDIT.SPLITW 73507 . 78972) (\TEDIT.UNSPLITW 78974 . 
-83830) (\TEDIT.WINDOW.SETUP 83832 . 89655) (\SAFE.FIRST 89657 . 90050)) (91382 92293 (TEDITWINDOWP 
-91392 . 92291)) (92330 95120 (TEDIT.GETINPUT 92340 . 94400) (\TEDIT.MAKEFILENAME 94402 . 95118)) (
-95169 101597 (TEDIT.PROMPTPRINT 95179 . 98114) (TEDIT.PROMPTFLASH 98116 . 100025) (
-\TEDIT.PROMPT.PAGEFULLFN 100027 . 101595)) (101832 105804 (TEXTSTREAM.TITLE 101842 . 102467) (
-\TEDIT.ORIGINAL.WINDOW.TITLE 102469 . 104391) (\TEDIT.WINDOW.TITLE 104393 . 105047) (
-\TEXTSTREAM.FILENAME 105049 . 105802)) (105847 147324 (TEDIT.DEACTIVATE.WINDOW 105857 . 112821) (
-\TEDIT.REPAINTFN 112823 . 115671) (\TEDIT.RESHAPEFN 115673 . 120517) (\TEDIT.SCROLLFN 120519 . 147322)
-) (147366 149497 (\TEDIT.PROCIDLEFN 147376 . 148671) (\TEDIT.PROCENTRYFN 148673 . 149118) (
-\TEDIT.PROCEXITFN 149120 . 149495)) (149576 160542 (\EDIT.DOWNCARET 149586 . 150255) (\EDIT.FLIPCARET 
-150257 . 151776) (TEDIT.FLASHCARET 151778 . 153059) (\EDIT.UPCARET 153061 . 153486) (
-TEDIT.NORMALIZECARET 153488 . 159185) (\SETCARET 159187 . 160115) (\TEDIT.CARET 160117 . 160540)) (
-160576 174370 (TEDIT.ADD.MENUITEM 160586 . 162877) (TEDIT.DEFAULT.MENUFN 162879 . 171849) (
-TEDIT.REMOVE.MENUITEM 171851 . 172848) (\TEDIT.CREATEMENU 172850 . 173287) (\TEDIT.MENU.WHENHELDFN 
-173289 . 174055) (\TEDIT.MENU.WHENSELECTEDFN 174057 . 174368)))))
+  (FILEMAP (NIL (7098 90034 (TEDIT.CREATEW 7108 . 9881) (\TEDIT.CREATEW.FROM.REGION 9883 . 10863) (
+TEDIT.CURSORMOVEDFN 10865 . 20764) (TEDIT.CURSOROUTFN 20766 . 21309) (TEDIT.WINDOW.SETUP 21311 . 23136
+) (TEDIT.MINIMAL.WINDOW.SETUP 23138 . 30916) (\TEDIT.ACTIVE.WINDOWP 30918 . 31911) (
+\TEDIT.BUTTONEVENTFN 31913 . 55621) (\TEDIT.WINDOW.OPS 55623 . 58835) (\TEDIT.EXPANDFN 58837 . 59400) 
+(\TEDIT.MAINW 59402 . 60699) (\TEDIT.PRIMARYW 60701 . 61862) (\TEDIT.COPYINSERTFN 61864 . 62660) (
+\TEDIT.NEWREGIONFN 62662 . 65178) (\TEDIT.SET.WINDOW.EXTENT 65180 . 70723) (\TEDIT.SHRINK.ICONCREATE 
+70725 . 72926) (\TEDIT.SHRINKFN 72928 . 73487) (\TEDIT.SPLITW 73489 . 78954) (\TEDIT.UNSPLITW 78956 . 
+83812) (\TEDIT.WINDOW.SETUP 83814 . 89637) (\SAFE.FIRST 89639 . 90032)) (91364 92275 (TEDITWINDOWP 
+91374 . 92273)) (92312 95102 (TEDIT.GETINPUT 92322 . 94382) (\TEDIT.MAKEFILENAME 94384 . 95100)) (
+95151 101579 (TEDIT.PROMPTPRINT 95161 . 98096) (TEDIT.PROMPTFLASH 98098 . 100007) (
+\TEDIT.PROMPT.PAGEFULLFN 100009 . 101577)) (101814 105786 (TEXTSTREAM.TITLE 101824 . 102449) (
+\TEDIT.ORIGINAL.WINDOW.TITLE 102451 . 104373) (\TEDIT.WINDOW.TITLE 104375 . 105029) (
+\TEXTSTREAM.FILENAME 105031 . 105784)) (105829 147611 (TEDIT.DEACTIVATE.WINDOW 105839 . 113108) (
+\TEDIT.REPAINTFN 113110 . 115958) (\TEDIT.RESHAPEFN 115960 . 120804) (\TEDIT.SCROLLFN 120806 . 147609)
+) (147653 149784 (\TEDIT.PROCIDLEFN 147663 . 148958) (\TEDIT.PROCENTRYFN 148960 . 149405) (
+\TEDIT.PROCEXITFN 149407 . 149782)) (149863 160829 (\EDIT.DOWNCARET 149873 . 150542) (\EDIT.FLIPCARET 
+150544 . 152063) (TEDIT.FLASHCARET 152065 . 153346) (\EDIT.UPCARET 153348 . 153773) (
+TEDIT.NORMALIZECARET 153775 . 159472) (\SETCARET 159474 . 160402) (\TEDIT.CARET 160404 . 160827)) (
+160863 174657 (TEDIT.ADD.MENUITEM 160873 . 163164) (TEDIT.DEFAULT.MENUFN 163166 . 172136) (
+TEDIT.REMOVE.MENUITEM 172138 . 173135) (\TEDIT.CREATEMENU 173137 . 173574) (\TEDIT.MENU.WHENHELDFN 
+173576 . 174342) (\TEDIT.MENU.WHENSELECTEDFN 174344 . 174655)))))
 STOP

library/virtualkeyboards/DANDELIONKEYBOARDS

@@ -0,0 +1,625 @@
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+
+
(FILECREATED " 6-Jul-2023 08:52:09" {WMEDLEY}<library>virtualkeyboards>DANDELIONKEYBOARDS.;3
 33795  
+
+      :EDIT-BY rmk
+
+      :CHANGES-TO (VARS DANDELIONKEYBOARDSCOMS)
+
+      :PREVIOUS-DATE " 4-Jul-2023 23:18:05" {WMEDLEY}<library>virtualkeyboards>DANDELIONKEYBOARDS.;2
+)
+
+
+(PRETTYCOMPRINT DANDELIONKEYBOARDSCOMS)
+
+(RPAQQ DANDELIONKEYBOARDSCOMS
 ((ALISTS (VKBD.LOADED-KEYBOARDS DANDELION))))
+
+(ADDTOVAR VKBD.LOADED-KEYBOARDS

+          (DANDELION (EUROPEAN ((100 (53 197 NOLOCKSHIFT))
+                                (101 (52 196 NOLOCKSHIFT))
+                                (102 (54 198 NOLOCKSHIFT))
+                                (103 (61887 61759 LOCKSHIFT))
+                                (104 (55 199 NOLOCKSHIFT))
+                                (105 (61888 61760 LOCKSHIFT))
+                                (106 (61872 61744 LOCKSHIFT))
+                                (107 (61860 61732 LOCKSHIFT))
+                                (108 (48 126 NOLOCKSHIFT))
+                                (109 (61892 61764 LOCKSHIFT))
+                                (110 (203 207 NOLOCKSHIFT))
+                                (111 (61919 61791 LOCKSHIFT))
+                                (112 (47 191 NOLOCKSHIFT))
+                                (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                                (116 (51 195 NOLOCKSHIFT))
+                                (117 (50 194 NOLOCKSHIFT))
+                                (118 (61873 61745 LOCKSHIFT))
+                                (119 (61858 61730 LOCKSHIFT))
+                                (120 (61874 61746 LOCKSHIFT))
+                                (121 (61859 61731 LOCKSHIFT))
+                                (122 (57 202 NOLOCKSHIFT))
+                                (123 (61886 61758 LOCKSHIFT))
+                                (124 (61864 61736 LOCKSHIFT))
+                                (125 (61903 61775 LOCKSHIFT))
+                                (126 (61908 61780 LOCKSHIFT))
+                                (127 (241 225 LOCKSHIFT))
+                                (128 (187 170 LOCKSHIFT))
+                                (129 (249 233 LOCKSHIFT))
+                                (132 (49 193 NOLOCKSHIFT))
+                                (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                                (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                                (135 (61905 61777 LOCKSHIFT))
+                                (137 (61869 61741 LOCKSHIFT))
+                                (138 (61877 61749 LOCKSHIFT))
+                                (139 (61906 61778 LOCKSHIFT))
+                                (140 (251 90 LOCKSHIFT))
+                                (141 1SHIFTDOWN . 1SHIFTUP)
+                                (142 (250 234 LOCKSHIFT))
+                                (143 (59 58 LOCKSHIFT))
+                                (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                                (145 (171 186 LOCKSHIFT))
+                                (148 (61904 61776 LOCKSHIFT))
+                                (149 (61920 61792 LOCKSHIFT))
+                                (150 (61921 61793 LOCKSHIFT))
+                                (151 (61857 61729 LOCKSHIFT))
+                                (152 (61863 61735 LOCKSHIFT))
+                                (153 (56 200 NOLOCKSHIFT))
+                                (154 (61900 61772 LOCKSHIFT))
+                                (155 (239 77 LOCKSHIFT))
+                                (156 LOCKDOWN . LOCKUP)
+                                (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                                (158 (246 230 LOCKSHIFT))
+                                (159 (207 176 NOLOCKSHIFT))
+                                (160 2SHIFTDOWN . 2SHIFTUP))
+                            DANDELION)
+                 (logic ((100 (53 37 NOLOCKSHIFT))
+                         (101 (52 164 NOLOCKSHIFT))
+                         (102 (54 126 NOLOCKSHIFT))
+                         (103 (61258 61260 NOLOCKSHIFT))
+                         (104 (55 38 NOLOCKSHIFT))
+                         (105 (61292 61293 NOLOCKSHIFT))
+                         (106 (61271 61270 NOLOCKSHIFT))
+                         (107 (61284 61285 NOLOCKSHIFT))
+                         (108 (48 41 NOLOCKSHIFT))
+                         (109 (61307 61306 NOLOCKSHIFT))
+                         (110 (45 177 NOLOCKSHIFT))
+                         (111 (61269 61268 LOCKSHIFT))
+                         (112 (172 174 NOLOCKSHIFT))
+                         (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                         (116 (51 35 NOLOCKSHIFT))
+                         (117 (50 64 NOLOCKSHIFT))
+                         (118 (61240 61241 NOLOCKSHIFT))
+                         (119 (61234 61235 NOLOCKSHIFT))
+                         (120 (61266 61262 NOLOCKSHIFT))
+                         (121 (61365 61365 NOLOCKSHIFT))
+                         (122 (57 40 NOLOCKSHIFT))
+                         (123 (61275 61274 NOLOCKSHIFT))
+                         (124 (61300 61299 NOLOCKSHIFT))
+                         (125 (61273 61272 NOLOCKSHIFT))
+                         (126 (61282 61283 NOLOCKSHIFT))
+                         (127 (61256 61257 NOLOCKSHIFT))
+                         (128 (61356 61356 NOLOCKSHIFT))
+                         (129 (93 125 NOLOCKSHIFT))
+                         (132 (49 33 NOLOCKSHIFT))
+                         (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                         (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                         (135 (61250 61251 NOLOCKSHIFT))
+                         (137 (61298 61297 NOLOCKSHIFT))
+                         (138 (61305 61303 NOLOCKSHIFT))
+                         (139 (61265 61264 NOLOCKSHIFT))
+                         (140 (61364 61364 NOLOCKSHIFT))
+                         (141 1SHIFTDOWN . 1SHIFTUP)
+                         (142 (61281 233 NOLOCKSHIFT))
+                         (143 (61351 61351 NOLOCKSHIFT))
+                         (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                         (145 (61357 61357 NOLOCKSHIFT))
+                         (148 (61279 61278 NOLOCKSHIFT))
+                         (149 (61239 61238 NOLOCKSHIFT))
+                         (150 (61290 61290 NOLOCKSHIFT))
+                         (151 (61263 61261 NOLOCKSHIFT))
+                         (152 (61295 61295 NOLOCKSHIFT))
+                         (153 (56 42 NOLOCKSHIFT))
+                         (154 (61252 61253 NOLOCKSHIFT))
+                         (155 (61254 61255 NOLOCKSHIFT))
+                         (156 LOCKDOWN . LOCKUP)
+                         (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                         (158 (91 123 NOLOCKSHIFT))
+                         (159 (61 43 NOLOCKSHIFT))
+                         (160 2SHIFTDOWN . 2SHIFTUP))
+                        DANDELION)
+                 (MATH ((100 (53 37 NOLOCKSHIFT))
+                        (101 (52 36 NOLOCKSHIFT))
+                        (102 (54 126 NOLOCKSHIFT))
+                        (103 (61284 61285 LOCKSHIFT))
+                        (104 (55 38 NOLOCKSHIFT))
+                        (105 (100 68 LOCKSHIFT))
+                        (106 (174 61245 NOLOCKSHIFT))
+                        (107 (61369 61363 NOLOCKSHIFT))
+                        (108 (48 41 NOLOCKSHIFT))
+                        (109 (61254 61255 NOLOCKSHIFT))
+                        (110 (45 45 NOLOCKSHIFT))
+                        (111 (173 61246 LOCKSHIFT))
+                        (112 (47 61300 NOLOCKSHIFT))
+                        (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                        (116 (51 35 NOLOCKSHIFT))
+                        (117 (50 64 NOLOCKSHIFT))
+                        (118 (61282 61283 LOCKSHIFT))
+                        (119 (61287 61286 NOLOCKSHIFT))
+                        (120 (61301 61302 NOLOCKSHIFT))
+                        (121 (61351 65 LOCKSHIFT))
+                        (122 (57 40 NOLOCKSHIFT))
+                        (123 (175 61247 LOCKSHIFT))
+                        (124 (180 184 LOCKSHIFT))
+                        (125 (172 61244 LOCKSHIFT))
+                        (126 (61256 61257 LOCKSHIFT))
+                        (127 (44 61250 NOLOCKSHIFT))
+                        (128 (61298 61253 NOLOCKSHIFT))
+                        (129 (93 61265 NOLOCKSHIFT))
+                        (132 (49 33 NOLOCKSHIFT))
+                        (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                        (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                        (135 (102 70 LOCKSHIFT))
+                        (137 (61356 61362 LOCKSHIFT))
+                        (138 (61254 61291 NOLOCKSHIFT))
+                        (139 (98 61360 NOLOCKSHIFT))
+                        (140 (61309 177 LOCKSHIFT))
+                        (141 1SHIFTDOWN . 1SHIFTUP)
+                        (142 (46 61251 NOLOCKSHIFT))
+                        (143 (61299 61252 NOLOCKSHIFT))
+                        (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                        (145 (95 94 NOLOCKSHIFT))
+                        (148 (61358 82 LOCKSHIFT))
+                        (149 (61296 61266 NOLOCKSHIFT))
+                        (150 (61305 61303 NOLOCKSHIFT))
+                        (151 (61308 61267 LOCKSHIFT))
+                        (152 (61288 72 LOCKSHIFT))
+                        (153 (56 42 NOLOCKSHIFT))
+                        (154 (61357 61361 NOLOCKSHIFT))
+                        (155 (61292 61293 LOCKSHIFT))
+                        (156 LOCKDOWN . LOCKUP)
+                        (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                        (158 (91 61264 NOLOCKSHIFT))
+                        (159 (61 43 NOLOCKSHIFT))
+                        (160 2SHIFTDOWN . 2SHIFTUP))
+                       DANDELION)
+                 (OFFICE ((100 (61397 61381 NOLOCKSHIFT))
+                          (101 (61396 61380 NOLOCKSHIFT))
+                          (102 (61398 61382 NOLOCKSHIFT))
+                          (103 (8557 8554 NOLOCKSHIFT))
+                          (104 (61399 61383 NOLOCKSHIFT))
+                          (105 (61232 8743 NOLOCKSHIFT))
+                          (106 (61346 8571 NOLOCKSHIFT))
+                          (107 (188 86 NOLOCKSHIFT))
+                          (108 (61402 61386 NOLOCKSHIFT))
+                          (109 (210 8738 NOLOCKSHIFT))
+                          (110 (61437 61438 NOLOCKSHIFT))
+                          (111 (163 8558 NOLOCKSHIFT))
+                          (112 (61248 63 NOLOCKSHIFT))
+                          (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                          (116 (61395 61379 NOLOCKSHIFT))
+                          (117 (61394 61378 NOLOCKSHIFT))
+                          (118 (185 8553 NOLOCKSHIFT))
+                          (119 (176 8546 NOLOCKSHIFT))
+                          (120 (167 8744 NOLOCKSHIFT))
+                          (121 (97 8745 NOLOCKSHIFT))
+                          (122 (61401 61385 NOLOCKSHIFT))
+                          (123 (162 8570 NOLOCKSHIFT))
+                          (124 (61437 88 NOLOCKSHIFT))
+                          (125 (111 8569 NOLOCKSHIFT))
+                          (126 (61289 8737 NOLOCKSHIFT))
+                          (127 (44 60 NOLOCKSHIFT))
+                          (128 (39 34 NOLOCKSHIFT))
+                          (129 (93 125 NOLOCKSHIFT))
+                          (132 (61393 61377 NOLOCKSHIFT))
+                          (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                          (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                          (135 (61233 8742 NOLOCKSHIFT))
+                          (137 (61438 67 NOLOCKSHIFT))
+                          (138 (8739 74 NOLOCKSHIFT))
+                          (139 (190 61436 NOLOCKSHIFT))
+                          (140 (189 90 NOLOCKSHIFT))
+                          (141 1SHIFTDOWN . 1SHIFTUP)
+                          (142 (61249 62 NOLOCKSHIFT))
+                          (143 (61352 58 NOLOCKSHIFT))
+                          (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                          (145 (95 61280 NOLOCKSHIFT))
+                          (148 (212 8574 NOLOCKSHIFT))
+                          (149 (61354 8573 NOLOCKSHIFT))
+                          (150 (61286 8741 NOLOCKSHIFT))
+                          (151 (165 8572 NOLOCKSHIFT))
+                          (152 (61368 8740 NOLOCKSHIFT))
+                          (153 (61400 61384 NOLOCKSHIFT))
+                          (154 (173 175 NOLOCKSHIFT))
+                          (155 (172 174 NOLOCKSHIFT))
+                          (156 LOCKDOWN . LOCKUP)
+                          (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                          (158 (91 123 NOLOCKSHIFT))
+                          (159 (61406 61368 NOLOCKSHIFT))
+                          (160 2SHIFTDOWN . 2SHIFTUP))
+                        DANDELION)
+                 (DVORAK ((100 (49 42 NOLOCKSHIFT))
+                          (101 (51 41 NOLOCKSHIFT))
+                          (102 (57 37 NOLOCKSHIFT))
+                          (103 (46 62 NOLOCKSHIFT))
+                          (104 (48 38 NOLOCKSHIFT))
+                          (105 (101 69 LOCKSHIFT))
+                          (106 (103 71 LOCKSHIFT))
+                          (107 (107 75 LOCKSHIFT))
+                          (108 (54 45 NOLOCKSHIFT))
+                          (109 (116 84 LOCKSHIFT))
+                          (110 (56 95 NOLOCKSHIFT))
+                          (111 (108 76 LOCKSHIFT))
+                          (112 (122 90 LOCKSHIFT))
+                          (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                          (116 (53 40 NOLOCKSHIFT))
+                          (117 (55 35 NOLOCKSHIFT))
+                          (118 (44 60 NOLOCKSHIFT))
+                          (119 (63 47 NOLOCKSHIFT))
+                          (120 (111 79 LOCKSHIFT))
+                          (121 (97 65 LOCKSHIFT))
+                          (122 (52 164 NOLOCKSHIFT))
+                          (123 (99 67 LOCKSHIFT))
+                          (124 (113 81 LOCKSHIFT))
+                          (125 (114 82 LOCKSHIFT))
+                          (126 (110 78 LOCKSHIFT))
+                          (127 (119 87 LOCKSHIFT))
+                          (128 (44 186 NOLOCKSHIFT))
+                          (129 (93 125 NOLOCKSHIFT))
+                          (132 (33 64 NOLOCKSHIFT))
+                          (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                          (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                          (135 (117 85 LOCKSHIFT))
+                          (137 (106 74 LOCKSHIFT))
+                          (138 (104 72 LOCKSHIFT))
+                          (139 (120 88 LOCKSHIFT))
+                          (140 (59 58 NOLOCKSHIFT))
+                          (141 1SHIFTDOWN . 1SHIFTUP)
+                          (142 (118 86 LOCKSHIFT))
+                          (143 (115 83 LOCKSHIFT))
+                          (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                          (145 (169 170 NOLOCKSHIFT))
+                          (148 (112 80 LOCKSHIFT))
+                          (149 (121 89 LOCKSHIFT))
+                          (150 (105 73 LOCKSHIFT))
+                          (151 (102 70 LOCKSHIFT))
+                          (152 (100 68 LOCKSHIFT))
+                          (153 (50 162 NOLOCKSHIFT))
+                          (154 (98 66 LOCKSHIFT))
+                          (155 (109 77 LOCKSHIFT))
+                          (156 LOCKDOWN . LOCKUP)
+                          (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                          (158 (91 123 NOLOCKSHIFT))
+                          (159 (61 43 NOLOCKSHIFT))
+                          (160 2SHIFTDOWN . 2SHIFTUP))
+                        DANDELION)
+                 (GREEK ((100 (53 37 NOLOCKSHIFT))
+                         (101 (52 36 NOLOCKSHIFT))
+                         (102 (54 126 NOLOCKSHIFT))
+                         (103 (9830 69 LOCKSHIFT))
+                         (104 (55 38 NOLOCKSHIFT))
+                         (105 (9829 9797 LOCKSHIFT))
+                         (106 (9849 9817 LOCKSHIFT))
+                         (107 (115 9814 LOCKSHIFT))
+                         (108 (48 41 NOLOCKSHIFT))
+                         (109 (9837 9805 LOCKSHIFT))
+                         (110 (45 45 NOLOCKSHIFT))
+                         (111 (9843 9811 LOCKSHIFT))
+                         (112 (47 63 NOLOCKSHIFT))
+                         (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                         (116 (51 35 NOLOCKSHIFT))
+                         (117 (50 64 NOLOCKSHIFT))
+                         (118 (9853 9821 LOCKSHIFT))
+                         (119 (9835 9803 LOCKSHIFT))
+                         (120 (9846 9814 LOCKSHIFT))
+                         (121 (9825 9793 LOCKSHIFT))
+                         (122 (57 40 NOLOCKSHIFT))
+                         (123 (9836 9804 LOCKSHIFT))
+                         (124 (9851 9819 LOCKSHIFT))
+                         (125 (9842 9810 LOCKSHIFT))
+                         (126 (9838 9806 LOCKSHIFT))
+                         (127 (44 60 NOLOCKSHIFT))
+                         (128 (39 34 NOLOCKSHIFT))
+                         (129 (93 125 NOLOCKSHIFT))
+                         (132 (49 33 NOLOCKSHIFT))
+                         (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                         (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                         (135 (9850 9818 LOCKSHIFT))
+                         (137 (9841 9809 LOCKSHIFT))
+                         (138 (106 74 LOCKSHIFT))
+                         (139 (9826 66 LOCKSHIFT))
+                         (140 (9833 9801 LOCKSHIFT))
+                         (141 1SHIFTDOWN . 1SHIFTUP)
+                         (142 (46 62 NOLOCKSHIFT))
+                         (143 (59 58 NOLOCKSHIFT))
+                         (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                         (145 (95 94 NOLOCKSHIFT))
+                         (148 (9845 9813 LOCKSHIFT))
+                         (149 (9848 9816 LOCKSHIFT))
+                         (150 (9828 9796 LOCKSHIFT))
+                         (151 (9852 9820 LOCKSHIFT))
+                         (152 (9834 9802 LOCKSHIFT))
+                         (153 (56 42 NOLOCKSHIFT))
+                         (154 (9840 9808 LOCKSHIFT))
+                         (155 (9839 9807 LOCKSHIFT))
+                         (156 LOCKDOWN . LOCKUP)
+                         (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                         (158 (91 123 NOLOCKSHIFT))
+                         (159 (61 43 NOLOCKSHIFT))
+                         (160 2SHIFTDOWN . 2SHIFTUP))
+                        DANDELION)
+                 (ITALIAN ((100 (53 61903 NOLOCKSHIFT))
+                           (101 (52 61886 NOLOCKSHIFT))
+                           (102 (54 61919 NOLOCKSHIFT))
+                           (103 (101 69 LOCKSHIFT))
+                           (104 (55 38 NOLOCKSHIFT))
+                           (105 (100 68 LOCKSHIFT))
+                           (106 (117 85 LOCKSHIFT))
+                           (107 (118 86 LOCKSHIFT))
+                           (108 (48 41 NOLOCKSHIFT))
+                           (109 (107 75 LOCKSHIFT))
+                           (110 (45 45 NOLOCKSHIFT))
+                           (111 (112 80 LOCKSHIFT))
+                           (112 (204 63 NOLOCKSHIFT))
+                           (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                           (116 (51 61872 NOLOCKSHIFT))
+                           (117 (50 61858 NOLOCKSHIFT))
+                           (118 (119 87 LOCKSHIFT))
+                           (119 (113 81 LOCKSHIFT))
+                           (120 (115 83 LOCKSHIFT))
+                           (121 (97 65 LOCKSHIFT))
+                           (122 (57 40 NOLOCKSHIFT))
+                           (123 (105 73 LOCKSHIFT))
+                           (124 (120 88 LOCKSHIFT))
+                           (125 (111 79 LOCKSHIFT))
+                           (126 (108 76 LOCKSHIFT))
+                           (127 (44 171 NOLOCKSHIFT))
+                           (128 (39 186 NOLOCKSHIFT))
+                           (129 (93 125 NOLOCKSHIFT))
+                           (132 (49 33 NOLOCKSHIFT))
+                           (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                           (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                           (135 (102 70 LOCKSHIFT))
+                           (137 (99 67 LOCKSHIFT))
+                           (138 (106 74 LOCKSHIFT))
+                           (139 (98 66 LOCKSHIFT))
+                           (140 (122 90 LOCKSHIFT))
+                           (141 1SHIFTDOWN . 1SHIFTUP)
+                           (142 (46 187 NOLOCKSHIFT))
+                           (143 (59 58 NOLOCKSHIFT))
+                           (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                           (145 (95 170 NOLOCKSHIFT))
+                           (148 (114 82 LOCKSHIFT))
+                           (149 (116 84 LOCKSHIFT))
+                           (150 (103 71 LOCKSHIFT))
+                           (151 (121 89 LOCKSHIFT))
+                           (152 (104 72 LOCKSHIFT))
+                           (153 (56 42 NOLOCKSHIFT))
+                           (154 (110 78 LOCKSHIFT))
+                           (155 (109 77 LOCKSHIFT))
+                           (156 LOCKDOWN . LOCKUP)
+                           (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                           (158 (91 123 NOLOCKSHIFT))
+                           (159 (61 43 NOLOCKSHIFT))
+                           (160 2SHIFTDOWN . 2SHIFTUP))
+                        DANDELION)
+                 (SPANISH ((100 (53 61904 NOLOCKSHIFT))
+                           (101 (52 61887 NOLOCKSHIFT))
+                           (102 (54 61920 NOLOCKSHIFT))
+                           (103 (101 69 LOCKSHIFT))
+                           (104 (55 38 NOLOCKSHIFT))
+                           (105 (100 68 LOCKSHIFT))
+                           (106 (117 85 LOCKSHIFT))
+                           (107 (118 86 LOCKSHIFT))
+                           (108 (48 41 NOLOCKSHIFT))
+                           (109 (107 75 LOCKSHIFT))
+                           (110 (45 45 NOLOCKSHIFT))
+                           (111 (112 80 LOCKSHIFT))
+                           (112 (204 63 NOLOCKSHIFT))
+                           (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                           (116 (51 61873 NOLOCKSHIFT))
+                           (117 (50 61858 NOLOCKSHIFT))
+                           (118 (119 87 LOCKSHIFT))
+                           (119 (113 81 LOCKSHIFT))
+                           (120 (115 83 LOCKSHIFT))
+                           (121 (97 65 LOCKSHIFT))
+                           (122 (57 40 NOLOCKSHIFT))
+                           (123 (105 73 LOCKSHIFT))
+                           (124 (120 88 LOCKSHIFT))
+                           (125 (111 79 LOCKSHIFT))
+                           (126 (108 76 LOCKSHIFT))
+                           (127 (44 171 NOLOCKSHIFT))
+                           (128 (59 58 NOLOCKSHIFT))
+                           (129 (203 187 NOLOCKSHIFT))
+                           (132 (49 33 NOLOCKSHIFT))
+                           (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                           (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                           (135 (102 70 LOCKSHIFT))
+                           (137 (99 67 LOCKSHIFT))
+                           (138 (106 74 LOCKSHIFT))
+                           (139 (98 66 LOCKSHIFT))
+                           (140 (122 90 LOCKSHIFT))
+                           (141 1SHIFTDOWN . 1SHIFTUP)
+                           (142 (46 187 NOLOCKSHIFT))
+                           (143 (61900 61772 LOCKSHIFT))
+                           (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                           (145 (161 191 NOLOCKSHIFT))
+                           (148 (114 82 LOCKSHIFT))
+                           (149 (116 84 LOCKSHIFT))
+                           (150 (103 71 LOCKSHIFT))
+                           (151 (121 89 LOCKSHIFT))
+                           (152 (104 72 LOCKSHIFT))
+                           (153 (56 61925 NOLOCKSHIFT))
+                           (154 (110 78 LOCKSHIFT))
+                           (155 (109 77 LOCKSHIFT))
+                           (156 LOCKDOWN . LOCKUP)
+                           (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                           (158 (44 171 NOLOCKSHIFT))
+                           (159 (61 43 NOLOCKSHIFT))
+                           (160 2SHIFTDOWN . 2SHIFTUP))
+                        DANDELION)
+                 (FRENCH ((100 (53 61905 NOLOCKSHIFT))
+                          (101 (52 61888 NOLOCKSHIFT))
+                          (102 (54 61921 NOLOCKSHIFT))
+                          (103 (101 69 LOCKSHIFT))
+                          (104 (55 38 NOLOCKSHIFT))
+                          (105 (100 68 LOCKSHIFT))
+                          (106 (117 85 LOCKSHIFT))
+                          (107 (118 86 LOCKSHIFT))
+                          (108 (48 41 NOLOCKSHIFT))
+                          (109 (107 75 LOCKSHIFT))
+                          (110 (45 45 NOLOCKSHIFT))
+                          (111 (112 80 LOCKSHIFT))
+                          (112 (204 63 NOLOCKSHIFT))
+                          (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                          (116 (51 61874 NOLOCKSHIFT))
+                          (117 (50 61859 NOLOCKSHIFT))
+                          (118 (119 87 LOCKSHIFT))
+                          (119 (113 81 LOCKSHIFT))
+                          (120 (115 83 LOCKSHIFT))
+                          (121 (97 65 LOCKSHIFT))
+                          (122 (57 40 NOLOCKSHIFT))
+                          (123 (105 73 LOCKSHIFT))
+                          (124 (120 88 LOCKSHIFT))
+                          (125 (111 79 LOCKSHIFT))
+                          (126 (108 76 LOCKSHIFT))
+                          (127 (44 171 NOLOCKSHIFT))
+                          (128 (39 61857 NOLOCKSHIFT))
+                          (129 (61872 61892 LOCKSHIFT))
+                          (132 (49 33 NOLOCKSHIFT))
+                          (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                          (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                          (135 (102 70 LOCKSHIFT))
+                          (137 (99 67 LOCKSHIFT))
+                          (138 (106 74 LOCKSHIFT))
+                          (139 (98 66 LOCKSHIFT))
+                          (140 (122 90 LOCKSHIFT))
+                          (141 1SHIFTDOWN . 1SHIFTUP)
+                          (142 (46 187 NOLOCKSHIFT))
+                          (143 (59 58 NOLOCKSHIFT))
+                          (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                          (145 (61869 61741 LOCKSHIFT))
+                          (148 (114 82 LOCKSHIFT))
+                          (149 (116 84 LOCKSHIFT))
+                          (150 (103 71 LOCKSHIFT))
+                          (151 (121 89 LOCKSHIFT))
+                          (152 (104 72 LOCKSHIFT))
+                          (153 (56 61919 NOLOCKSHIFT))
+                          (154 (110 78 LOCKSHIFT))
+                          (155 (109 77 LOCKSHIFT))
+                          (156 LOCKDOWN . LOCKUP)
+                          (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                          (158 (61873 61877 LOCKSHIFT))
+                          (159 (61 43 NOLOCKSHIFT))
+                          (160 2SHIFTDOWN . 2SHIFTUP))
+                        DANDELION)
+                 (GERMAN ((100 (53 37 NOLOCKSHIFT))
+                          (101 (52 36 NOLOCKSHIFT))
+                          (102 (54 126 NOLOCKSHIFT))
+                          (103 (101 69 LOCKSHIFT))
+                          (104 (55 38 NOLOCKSHIFT))
+                          (105 (100 68 LOCKSHIFT))
+                          (106 (117 85 LOCKSHIFT))
+                          (107 (118 86 LOCKSHIFT))
+                          (108 (48 41 NOLOCKSHIFT))
+                          (109 (107 75 LOCKSHIFT))
+                          (110 (45 45 NOLOCKSHIFT))
+                          (111 (112 80 LOCKSHIFT))
+                          (112 (251 63 NOLOCKSHIFT))
+                          (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                          (116 (51 35 NOLOCKSHIFT))
+                          (117 (50 64 NOLOCKSHIFT))
+                          (118 (119 87 LOCKSHIFT))
+                          (119 (113 81 LOCKSHIFT))
+                          (120 (115 83 LOCKSHIFT))
+                          (121 (97 65 LOCKSHIFT))
+                          (122 (57 40 NOLOCKSHIFT))
+                          (123 (105 73 LOCKSHIFT))
+                          (124 (120 88 LOCKSHIFT))
+                          (125 (111 79 LOCKSHIFT))
+                          (126 (108 76 LOCKSHIFT))
+                          (127 (44 60 NOLOCKSHIFT))
+                          (128 (39 34 NOLOCKSHIFT))
+                          (129 (61863 61735 LOCKSHIFT))
+                          (132 (49 33 NOLOCKSHIFT))
+                          (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                          (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                          (135 (102 70 LOCKSHIFT))
+                          (137 (99 67 LOCKSHIFT))
+                          (138 (106 74 LOCKSHIFT))
+                          (139 (98 66 LOCKSHIFT))
+                          (140 (122 90 LOCKSHIFT))
+                          (141 1SHIFTDOWN . 1SHIFTUP)
+                          (142 (46 62 NOLOCKSHIFT))
+                          (143 (59 58 NOLOCKSHIFT))
+                          (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                          (145 (95 94 NOLOCKSHIFT))
+                          (148 (114 82 LOCKSHIFT))
+                          (149 (116 84 LOCKSHIFT))
+                          (150 (103 71 LOCKSHIFT))
+                          (151 (121 89 LOCKSHIFT))
+                          (152 (104 72 LOCKSHIFT))
+                          (153 (56 42 NOLOCKSHIFT))
+                          (154 (110 78 LOCKSHIFT))
+                          (155 (109 77 LOCKSHIFT))
+                          (156 LOCKDOWN . LOCKUP)
+                          (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                          (158 (61908 61780 LOCKSHIFT))
+                          (159 (61925 61797 LOCKSHIFT))
+                          (160 2SHIFTDOWN . 2SHIFTUP))
+                        DANDELION)
+                 (STANDARD-RUSSIAN ((100 (34 52 NOLOCKSHIFT))
+                                    (101 (47 51 NOLOCKSHIFT))
+                                    (102 (58 53 NOLOCKSHIFT))
+                                    (103 (10085 10037 LOCKSHIFT))
+                                    (104 (44 54 NOLOCKSHIFT))
+                                    (105 (10067 10019 LOCKSHIFT))
+                                    (106 (10068 10020 LOCKSHIFT))
+                                    (107 (10078 10030 LOCKSHIFT))
+                                    (108 (63 57 NOLOCKSHIFT))
+                                    (109 (10077 10029 LOCKSHIFT))
+                                    (110 (37 48 NOLOCKSHIFT))
+                                    (111 (10073 10025 LOCKSHIFT))
+                                    (112 (10071 10023 LOCKSHIFT))
+                                    (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                                    (116 (45 50 NOLOCKSHIFT))
+                                    (117 (61352 49 NOLOCKSHIFT))
+                                    (118 (10088 10040 LOCKSHIFT))
+                                    (119 (10075 10027 LOCKSHIFT))
+                                    (120 (10093 10045 LOCKSHIFT))
+                                    (121 (10086 10038 LOCKSHIFT))
+                                    (122 (95 56 NOLOCKSHIFT))
+                                    (123 (10090 10042 LOCKSHIFT))
+                                    (124 (10089 10041 LOCKSHIFT))
+                                    (125 (10091 10043 LOCKSHIFT))
+                                    (126 (10069 10021 LOCKSHIFT))
+                                    (127 (10066 10018 LOCKSHIFT))
+                                    (128 (10095 10047 LOCKSHIFT))
+                                    (129 (10092 10044 LOCKSHIFT))
+                                    (132 (167 43 NOLOCKSHIFT))
+                                    (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                                    (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                                    (135 (10065 10017 LOCKSHIFT))
+                                    (137 (10083 10035 LOCKSHIFT))
+                                    (138 (10080 10032 LOCKSHIFT))
+                                    (139 (10074 10026 LOCKSHIFT))
+                                    (140 (10097 10049 LOCKSHIFT))
+                                    (141 1SHIFTDOWN . 1SHIFTUP)
+                                    (142 (10096 10048 LOCKSHIFT))
+                                    (143 (10072 10024 LOCKSHIFT))
+                                    (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                                    (145 (41 40 NOLOCKSHIFT))
+                                    (148 (10076 10028 LOCKSHIFT))
+                                    (149 (10070 10022 LOCKSHIFT))
+                                    (150 (10081 10033 LOCKSHIFT))
+                                    (151 (10079 10031 LOCKSHIFT))
+                                    (152 (10082 10034 LOCKSHIFT))
+                                    (153 (46 55 NOLOCKSHIFT))
+                                    (154 (10084 10036 LOCKSHIFT))
+                                    (155 (10094 10046 LOCKSHIFT))
+                                    (156 LOCKDOWN . LOCKUP)
+                                    (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                                    (158 (10087 10039 LOCKSHIFT))
+                                    (159 (33 61 NOLOCKSHIFT))
+                                    (160 2SHIFTDOWN . 2SHIFTUP))
+                        DANDELION)))
+(DECLARE%: DONTCOPY
+  (FILEMAP (NIL)))
+STOP

library/virtualkeyboards/DORADOKEYBOARDS

@@ -0,0 +1,624 @@
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+
+
(FILECREATED " 6-Jul-2023 08:52:15" {WMEDLEY}<library>virtualkeyboards>DORADOKEYBOARDS.;4
 33578  
+
+      :EDIT-BY rmk
+
+      :CHANGES-TO (VARS DORADOKEYBOARDSCOMS)
+
+      :PREVIOUS-DATE " 4-Jul-2023 23:15:23" {WMEDLEY}<library>virtualkeyboards>DORADOKEYBOARDS.;2)
+
+
+(PRETTYCOMPRINT DORADOKEYBOARDSCOMS)
+
+(RPAQQ DORADOKEYBOARDSCOMS
 ((ALISTS (VKBD.LOADED-KEYBOARDS DORADO))))
+
+(ADDTOVAR VKBD.LOADED-KEYBOARDS

+          (DORADO (EUROPEAN ((100 (53 197 NOLOCKSHIFT))
+                             (101 (52 196 NOLOCKSHIFT))
+                             (102 (54 198 NOLOCKSHIFT))
+                             (103 (61887 61759 LOCKSHIFT))
+                             (104 (55 199 NOLOCKSHIFT))
+                             (105 (61888 61760 LOCKSHIFT))
+                             (106 (61872 61744 LOCKSHIFT))
+                             (107 (61860 61732 LOCKSHIFT))
+                             (108 (48 126 NOLOCKSHIFT))
+                             (109 (61892 61764 LOCKSHIFT))
+                             (110 (203 207 NOLOCKSHIFT))
+                             (111 (61919 61791 LOCKSHIFT))
+                             (112 (47 191 NOLOCKSHIFT))
+                             (115 (1 1 NOLOCKSHIFT) . IGNORE)
+                             (116 (51 195 NOLOCKSHIFT))
+                             (117 (50 194 NOLOCKSHIFT))
+                             (118 (61873 61745 LOCKSHIFT))
+                             (119 (61858 61730 LOCKSHIFT))
+                             (120 (61874 61746 LOCKSHIFT))
+                             (121 (61859 61731 LOCKSHIFT))
+                             (122 (57 202 NOLOCKSHIFT))
+                             (123 (61886 61758 LOCKSHIFT))
+                             (124 (61864 61736 LOCKSHIFT))
+                             (125 (61903 61775 LOCKSHIFT))
+                             (126 (61908 61780 LOCKSHIFT))
+                             (127 (241 225 LOCKSHIFT))
+                             (128 (187 170 LOCKSHIFT))
+                             (129 (249 233 LOCKSHIFT))
+                             (132 (49 193 NOLOCKSHIFT))
+                             (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                             (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                             (135 (61905 61777 LOCKSHIFT))
+                             (137 (61869 61741 LOCKSHIFT))
+                             (138 (61877 61749 LOCKSHIFT))
+                             (139 (61906 61778 LOCKSHIFT))
+                             (140 (251 90 LOCKSHIFT))
+                             (141 1SHIFTDOWN . 1SHIFTUP)
+                             (142 (250 234 LOCKSHIFT))
+                             (143 (59 58 LOCKSHIFT))
+                             (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                             (145 (171 186 LOCKSHIFT))
+                             (148 (61904 61776 LOCKSHIFT))
+                             (149 (61920 61792 LOCKSHIFT))
+                             (150 (61921 61793 LOCKSHIFT))
+                             (151 (61857 61729 LOCKSHIFT))
+                             (152 (61863 61735 LOCKSHIFT))
+                             (153 (56 200 NOLOCKSHIFT))
+                             (154 (61900 61772 LOCKSHIFT))
+                             (155 (239 77 LOCKSHIFT))
+                             (156 LOCKDOWN . LOCKUP)
+                             (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                             (158 (246 230 LOCKSHIFT))
+                             (159 (207 176 NOLOCKSHIFT))
+                             (160 2SHIFTDOWN . 2SHIFTUP))
+                         DORADO)
+                 (logic ((100 (53 37 NOLOCKSHIFT))
+                         (101 (52 164 NOLOCKSHIFT))
+                         (102 (54 126 NOLOCKSHIFT))
+                         (103 (61258 61260 NOLOCKSHIFT))
+                         (104 (55 38 NOLOCKSHIFT))
+                         (105 (61292 61293 NOLOCKSHIFT))
+                         (106 (61271 61270 NOLOCKSHIFT))
+                         (107 (61284 61285 NOLOCKSHIFT))
+                         (108 (48 41 NOLOCKSHIFT))
+                         (109 (61307 61306 NOLOCKSHIFT))
+                         (110 (45 177 NOLOCKSHIFT))
+                         (111 (61269 61268 LOCKSHIFT))
+                         (112 (172 174 NOLOCKSHIFT))
+                         (115 (1 1 NOLOCKSHIFT) . IGNORE)
+                         (116 (51 35 NOLOCKSHIFT))
+                         (117 (50 64 NOLOCKSHIFT))
+                         (118 (61240 61241 NOLOCKSHIFT))
+                         (119 (61234 61235 NOLOCKSHIFT))
+                         (120 (61266 61262 NOLOCKSHIFT))
+                         (121 (61365 61365 NOLOCKSHIFT))
+                         (122 (57 40 NOLOCKSHIFT))
+                         (123 (61275 61274 NOLOCKSHIFT))
+                         (124 (61300 61299 NOLOCKSHIFT))
+                         (125 (61273 61272 NOLOCKSHIFT))
+                         (126 (61282 61283 NOLOCKSHIFT))
+                         (127 (61256 61257 NOLOCKSHIFT))
+                         (128 (61356 61356 NOLOCKSHIFT))
+                         (129 (93 125 NOLOCKSHIFT))
+                         (132 (49 33 NOLOCKSHIFT))
+                         (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                         (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                         (135 (61250 61251 NOLOCKSHIFT))
+                         (137 (61298 61297 NOLOCKSHIFT))
+                         (138 (61305 61303 NOLOCKSHIFT))
+                         (139 (61265 61264 NOLOCKSHIFT))
+                         (140 (61364 61364 NOLOCKSHIFT))
+                         (141 1SHIFTDOWN . 1SHIFTUP)
+                         (142 (61281 233 NOLOCKSHIFT))
+                         (143 (61351 61351 NOLOCKSHIFT))
+                         (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                         (145 (61357 61357 NOLOCKSHIFT))
+                         (148 (61279 61278 NOLOCKSHIFT))
+                         (149 (61239 61238 NOLOCKSHIFT))
+                         (150 (61290 61290 NOLOCKSHIFT))
+                         (151 (61263 61261 NOLOCKSHIFT))
+                         (152 (61295 61295 NOLOCKSHIFT))
+                         (153 (56 42 NOLOCKSHIFT))
+                         (154 (61252 61253 NOLOCKSHIFT))
+                         (155 (61254 61255 NOLOCKSHIFT))
+                         (156 LOCKDOWN . LOCKUP)
+                         (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                         (158 (91 123 NOLOCKSHIFT))
+                         (159 (61 43 NOLOCKSHIFT))
+                         (160 2SHIFTDOWN . 2SHIFTUP))
+                        DORADO)
+                 (MATH ((100 (53 37 NOLOCKSHIFT))
+                        (101 (52 36 NOLOCKSHIFT))
+                        (102 (54 126 NOLOCKSHIFT))
+                        (103 (61284 61285 LOCKSHIFT))
+                        (104 (55 38 NOLOCKSHIFT))
+                        (105 (100 68 LOCKSHIFT))
+                        (106 (174 61245 NOLOCKSHIFT))
+                        (107 (61369 61363 NOLOCKSHIFT))
+                        (108 (48 41 NOLOCKSHIFT))
+                        (109 (61254 61255 NOLOCKSHIFT))
+                        (110 (45 45 NOLOCKSHIFT))
+                        (111 (173 61246 LOCKSHIFT))
+                        (112 (47 61300 NOLOCKSHIFT))
+                        (115 (1 1 NOLOCKSHIFT) . IGNORE)
+                        (116 (51 35 NOLOCKSHIFT))
+                        (117 (50 64 NOLOCKSHIFT))
+                        (118 (61282 61283 LOCKSHIFT))
+                        (119 (61287 61286 NOLOCKSHIFT))
+                        (120 (61301 61302 NOLOCKSHIFT))
+                        (121 (61351 65 LOCKSHIFT))
+                        (122 (57 40 NOLOCKSHIFT))
+                        (123 (175 61247 LOCKSHIFT))
+                        (124 (180 184 LOCKSHIFT))
+                        (125 (172 61244 LOCKSHIFT))
+                        (126 (61256 61257 LOCKSHIFT))
+                        (127 (44 61250 NOLOCKSHIFT))
+                        (128 (61298 61253 NOLOCKSHIFT))
+                        (129 (93 61265 NOLOCKSHIFT))
+                        (132 (49 33 NOLOCKSHIFT))
+                        (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                        (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                        (135 (102 70 LOCKSHIFT))
+                        (137 (61356 61362 LOCKSHIFT))
+                        (138 (61254 61291 NOLOCKSHIFT))
+                        (139 (98 61360 NOLOCKSHIFT))
+                        (140 (61309 177 LOCKSHIFT))
+                        (141 1SHIFTDOWN . 1SHIFTUP)
+                        (142 (46 61251 NOLOCKSHIFT))
+                        (143 (61299 61252 NOLOCKSHIFT))
+                        (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                        (145 (95 94 NOLOCKSHIFT))
+                        (148 (61358 82 LOCKSHIFT))
+                        (149 (61296 61266 NOLOCKSHIFT))
+                        (150 (61305 61303 NOLOCKSHIFT))
+                        (151 (61308 61267 LOCKSHIFT))
+                        (152 (61288 72 LOCKSHIFT))
+                        (153 (56 42 NOLOCKSHIFT))
+                        (154 (61357 61361 NOLOCKSHIFT))
+                        (155 (61292 61293 LOCKSHIFT))
+                        (156 LOCKDOWN . LOCKUP)
+                        (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                        (158 (91 61264 NOLOCKSHIFT))
+                        (159 (61 43 NOLOCKSHIFT))
+                        (160 2SHIFTDOWN . 2SHIFTUP))
+                       DORADO)
+                 (OFFICE ((100 (61397 61381 NOLOCKSHIFT))
+                          (101 (61396 61380 NOLOCKSHIFT))
+                          (102 (61398 61382 NOLOCKSHIFT))
+                          (103 (8557 8554 NOLOCKSHIFT))
+                          (104 (61399 61383 NOLOCKSHIFT))
+                          (105 (61232 8743 NOLOCKSHIFT))
+                          (106 (61346 8571 NOLOCKSHIFT))
+                          (107 (188 86 NOLOCKSHIFT))
+                          (108 (61402 61386 NOLOCKSHIFT))
+                          (109 (210 8738 NOLOCKSHIFT))
+                          (110 (61437 61438 NOLOCKSHIFT))
+                          (111 (163 8558 NOLOCKSHIFT))
+                          (112 (61248 63 NOLOCKSHIFT))
+                          (115 (1 1 NOLOCKSHIFT) . IGNORE)
+                          (116 (61395 61379 NOLOCKSHIFT))
+                          (117 (61394 61378 NOLOCKSHIFT))
+                          (118 (185 8553 NOLOCKSHIFT))
+                          (119 (176 8546 NOLOCKSHIFT))
+                          (120 (167 8744 NOLOCKSHIFT))
+                          (121 (97 8745 NOLOCKSHIFT))
+                          (122 (61401 61385 NOLOCKSHIFT))
+                          (123 (162 8570 NOLOCKSHIFT))
+                          (124 (61437 88 NOLOCKSHIFT))
+                          (125 (111 8569 NOLOCKSHIFT))
+                          (126 (61289 8737 NOLOCKSHIFT))
+                          (127 (44 60 NOLOCKSHIFT))
+                          (128 (39 34 NOLOCKSHIFT))
+                          (129 (93 125 NOLOCKSHIFT))
+                          (132 (61393 61377 NOLOCKSHIFT))
+                          (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                          (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                          (135 (61233 8742 NOLOCKSHIFT))
+                          (137 (61438 67 NOLOCKSHIFT))
+                          (138 (8739 74 NOLOCKSHIFT))
+                          (139 (190 61436 NOLOCKSHIFT))
+                          (140 (189 90 NOLOCKSHIFT))
+                          (141 1SHIFTDOWN . 1SHIFTUP)
+                          (142 (61249 62 NOLOCKSHIFT))
+                          (143 (61352 58 NOLOCKSHIFT))
+                          (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                          (145 (95 61280 NOLOCKSHIFT))
+                          (148 (212 8574 NOLOCKSHIFT))
+                          (149 (61354 8573 NOLOCKSHIFT))
+                          (150 (61286 8741 NOLOCKSHIFT))
+                          (151 (165 8572 NOLOCKSHIFT))
+                          (152 (61368 8740 NOLOCKSHIFT))
+                          (153 (61400 61384 NOLOCKSHIFT))
+                          (154 (173 175 NOLOCKSHIFT))
+                          (155 (172 174 NOLOCKSHIFT))
+                          (156 LOCKDOWN . LOCKUP)
+                          (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                          (158 (91 123 NOLOCKSHIFT))
+                          (159 (61406 61368 NOLOCKSHIFT))
+                          (160 2SHIFTDOWN . 2SHIFTUP))
+                        DORADO)
+                 (DVORAK ((100 (49 42 NOLOCKSHIFT))
+                          (101 (51 41 NOLOCKSHIFT))
+                          (102 (57 37 NOLOCKSHIFT))
+                          (103 (46 62 NOLOCKSHIFT))
+                          (104 (48 38 NOLOCKSHIFT))
+                          (105 (101 69 LOCKSHIFT))
+                          (106 (103 71 LOCKSHIFT))
+                          (107 (107 75 LOCKSHIFT))
+                          (108 (54 45 NOLOCKSHIFT))
+                          (109 (116 84 LOCKSHIFT))
+                          (110 (56 95 NOLOCKSHIFT))
+                          (111 (108 76 LOCKSHIFT))
+                          (112 (122 90 LOCKSHIFT))
+                          (115 (1 1 NOLOCKSHIFT) . IGNORE)
+                          (116 (53 40 NOLOCKSHIFT))
+                          (117 (55 35 NOLOCKSHIFT))
+                          (118 (44 60 NOLOCKSHIFT))
+                          (119 (63 47 NOLOCKSHIFT))
+                          (120 (111 79 LOCKSHIFT))
+                          (121 (97 65 LOCKSHIFT))
+                          (122 (52 164 NOLOCKSHIFT))
+                          (123 (99 67 LOCKSHIFT))
+                          (124 (113 81 LOCKSHIFT))
+                          (125 (114 82 LOCKSHIFT))
+                          (126 (110 78 LOCKSHIFT))
+                          (127 (119 87 LOCKSHIFT))
+                          (128 (44 186 NOLOCKSHIFT))
+                          (129 (93 125 NOLOCKSHIFT))
+                          (132 (33 64 NOLOCKSHIFT))
+                          (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                          (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                          (135 (117 85 LOCKSHIFT))
+                          (137 (106 74 LOCKSHIFT))
+                          (138 (104 72 LOCKSHIFT))
+                          (139 (120 88 LOCKSHIFT))
+                          (140 (59 58 NOLOCKSHIFT))
+                          (141 1SHIFTDOWN . 1SHIFTUP)
+                          (142 (118 86 LOCKSHIFT))
+                          (143 (115 83 LOCKSHIFT))
+                          (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                          (145 (169 170 NOLOCKSHIFT))
+                          (148 (112 80 LOCKSHIFT))
+                          (149 (121 89 LOCKSHIFT))
+                          (150 (105 73 LOCKSHIFT))
+                          (151 (102 70 LOCKSHIFT))
+                          (152 (100 68 LOCKSHIFT))
+                          (153 (50 162 NOLOCKSHIFT))
+                          (154 (98 66 LOCKSHIFT))
+                          (155 (109 77 LOCKSHIFT))
+                          (156 LOCKDOWN . LOCKUP)
+                          (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                          (158 (91 123 NOLOCKSHIFT))
+                          (159 (61 43 NOLOCKSHIFT))
+                          (160 2SHIFTDOWN . 2SHIFTUP))
+                        DORADO)
+                 (GREEK ((100 (53 37 NOLOCKSHIFT))
+                         (101 (52 36 NOLOCKSHIFT))
+                         (102 (54 126 NOLOCKSHIFT))
+                         (103 (9830 69 LOCKSHIFT))
+                         (104 (55 38 NOLOCKSHIFT))
+                         (105 (9829 9797 LOCKSHIFT))
+                         (106 (9849 9817 LOCKSHIFT))
+                         (107 (115 9814 LOCKSHIFT))
+                         (108 (48 41 NOLOCKSHIFT))
+                         (109 (9837 9805 LOCKSHIFT))
+                         (110 (45 45 NOLOCKSHIFT))
+                         (111 (9843 9811 LOCKSHIFT))
+                         (112 (47 63 NOLOCKSHIFT))
+                         (115 (1 1 NOLOCKSHIFT) . IGNORE)
+                         (116 (51 35 NOLOCKSHIFT))
+                         (117 (50 64 NOLOCKSHIFT))
+                         (118 (9853 9821 LOCKSHIFT))
+                         (119 (9835 9803 LOCKSHIFT))
+                         (120 (9846 9814 LOCKSHIFT))
+                         (121 (9825 9793 LOCKSHIFT))
+                         (122 (57 40 NOLOCKSHIFT))
+                         (123 (9836 9804 LOCKSHIFT))
+                         (124 (9851 9819 LOCKSHIFT))
+                         (125 (9842 9810 LOCKSHIFT))
+                         (126 (9838 9806 LOCKSHIFT))
+                         (127 (44 60 NOLOCKSHIFT))
+                         (128 (39 34 NOLOCKSHIFT))
+                         (129 (93 125 NOLOCKSHIFT))
+                         (132 (49 33 NOLOCKSHIFT))
+                         (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                         (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                         (135 (9850 9818 LOCKSHIFT))
+                         (137 (9841 9809 LOCKSHIFT))
+                         (138 (106 74 LOCKSHIFT))
+                         (139 (9826 66 LOCKSHIFT))
+                         (140 (9833 9801 LOCKSHIFT))
+                         (141 1SHIFTDOWN . 1SHIFTUP)
+                         (142 (46 62 NOLOCKSHIFT))
+                         (143 (59 58 NOLOCKSHIFT))
+                         (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                         (145 (95 94 NOLOCKSHIFT))
+                         (148 (9845 9813 LOCKSHIFT))
+                         (149 (9848 9816 LOCKSHIFT))
+                         (150 (9828 9796 LOCKSHIFT))
+                         (151 (9852 9820 LOCKSHIFT))
+                         (152 (9834 9802 LOCKSHIFT))
+                         (153 (56 42 NOLOCKSHIFT))
+                         (154 (9840 9808 LOCKSHIFT))
+                         (155 (9839 9807 LOCKSHIFT))
+                         (156 LOCKDOWN . LOCKUP)
+                         (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                         (158 (91 123 NOLOCKSHIFT))
+                         (159 (61 43 NOLOCKSHIFT))
+                         (160 2SHIFTDOWN . 2SHIFTUP))
+                        DORADO)
+                 (ITALIAN ((100 (53 61903 NOLOCKSHIFT))
+                           (101 (52 61886 NOLOCKSHIFT))
+                           (102 (54 61919 NOLOCKSHIFT))
+                           (103 (101 69 LOCKSHIFT))
+                           (104 (55 38 NOLOCKSHIFT))
+                           (105 (100 68 LOCKSHIFT))
+                           (106 (117 85 LOCKSHIFT))
+                           (107 (118 86 LOCKSHIFT))
+                           (108 (48 41 NOLOCKSHIFT))
+                           (109 (107 75 LOCKSHIFT))
+                           (110 (45 45 NOLOCKSHIFT))
+                           (111 (112 80 LOCKSHIFT))
+                           (112 (204 63 NOLOCKSHIFT))
+                           (115 (1 1 NOLOCKSHIFT) . IGNORE)
+                           (116 (51 61872 NOLOCKSHIFT))
+                           (117 (50 61858 NOLOCKSHIFT))
+                           (118 (119 87 LOCKSHIFT))
+                           (119 (113 81 LOCKSHIFT))
+                           (120 (115 83 LOCKSHIFT))
+                           (121 (97 65 LOCKSHIFT))
+                           (122 (57 40 NOLOCKSHIFT))
+                           (123 (105 73 LOCKSHIFT))
+                           (124 (120 88 LOCKSHIFT))
+                           (125 (111 79 LOCKSHIFT))
+                           (126 (108 76 LOCKSHIFT))
+                           (127 (44 171 NOLOCKSHIFT))
+                           (128 (39 186 NOLOCKSHIFT))
+                           (129 (93 125 NOLOCKSHIFT))
+                           (132 (49 33 NOLOCKSHIFT))
+                           (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                           (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                           (135 (102 70 LOCKSHIFT))
+                           (137 (99 67 LOCKSHIFT))
+                           (138 (106 74 LOCKSHIFT))
+                           (139 (98 66 LOCKSHIFT))
+                           (140 (122 90 LOCKSHIFT))
+                           (141 1SHIFTDOWN . 1SHIFTUP)
+                           (142 (46 187 NOLOCKSHIFT))
+                           (143 (59 58 NOLOCKSHIFT))
+                           (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                           (145 (95 170 NOLOCKSHIFT))
+                           (148 (114 82 LOCKSHIFT))
+                           (149 (116 84 LOCKSHIFT))
+                           (150 (103 71 LOCKSHIFT))
+                           (151 (121 89 LOCKSHIFT))
+                           (152 (104 72 LOCKSHIFT))
+                           (153 (56 42 NOLOCKSHIFT))
+                           (154 (110 78 LOCKSHIFT))
+                           (155 (109 77 LOCKSHIFT))
+                           (156 LOCKDOWN . LOCKUP)
+                           (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                           (158 (91 123 NOLOCKSHIFT))
+                           (159 (61 43 NOLOCKSHIFT))
+                           (160 2SHIFTDOWN . 2SHIFTUP))
+                        DORADO)
+                 (SPANISH ((100 (53 61904 NOLOCKSHIFT))
+                           (101 (52 61887 NOLOCKSHIFT))
+                           (102 (54 61920 NOLOCKSHIFT))
+                           (103 (101 69 LOCKSHIFT))
+                           (104 (55 38 NOLOCKSHIFT))
+                           (105 (100 68 LOCKSHIFT))
+                           (106 (117 85 LOCKSHIFT))
+                           (107 (118 86 LOCKSHIFT))
+                           (108 (48 41 NOLOCKSHIFT))
+                           (109 (107 75 LOCKSHIFT))
+                           (110 (45 45 NOLOCKSHIFT))
+                           (111 (112 80 LOCKSHIFT))
+                           (112 (204 63 NOLOCKSHIFT))
+                           (115 (1 1 NOLOCKSHIFT) . IGNORE)
+                           (116 (51 61873 NOLOCKSHIFT))
+                           (117 (50 61858 NOLOCKSHIFT))
+                           (118 (119 87 LOCKSHIFT))
+                           (119 (113 81 LOCKSHIFT))
+                           (120 (115 83 LOCKSHIFT))
+                           (121 (97 65 LOCKSHIFT))
+                           (122 (57 40 NOLOCKSHIFT))
+                           (123 (105 73 LOCKSHIFT))
+                           (124 (120 88 LOCKSHIFT))
+                           (125 (111 79 LOCKSHIFT))
+                           (126 (108 76 LOCKSHIFT))
+                           (127 (44 171 NOLOCKSHIFT))
+                           (128 (59 58 NOLOCKSHIFT))
+                           (129 (203 187 NOLOCKSHIFT))
+                           (132 (49 33 NOLOCKSHIFT))
+                           (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                           (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                           (135 (102 70 LOCKSHIFT))
+                           (137 (99 67 LOCKSHIFT))
+                           (138 (106 74 LOCKSHIFT))
+                           (139 (98 66 LOCKSHIFT))
+                           (140 (122 90 LOCKSHIFT))
+                           (141 1SHIFTDOWN . 1SHIFTUP)
+                           (142 (46 187 NOLOCKSHIFT))
+                           (143 (61900 61772 LOCKSHIFT))
+                           (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                           (145 (161 191 NOLOCKSHIFT))
+                           (148 (114 82 LOCKSHIFT))
+                           (149 (116 84 LOCKSHIFT))
+                           (150 (103 71 LOCKSHIFT))
+                           (151 (121 89 LOCKSHIFT))
+                           (152 (104 72 LOCKSHIFT))
+                           (153 (56 61925 NOLOCKSHIFT))
+                           (154 (110 78 LOCKSHIFT))
+                           (155 (109 77 LOCKSHIFT))
+                           (156 LOCKDOWN . LOCKUP)
+                           (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                           (158 (44 171 NOLOCKSHIFT))
+                           (159 (61 43 NOLOCKSHIFT))
+                           (160 2SHIFTDOWN . 2SHIFTUP))
+                        DORADO)
+                 (FRENCH ((100 (53 61905 NOLOCKSHIFT))
+                          (101 (52 61888 NOLOCKSHIFT))
+                          (102 (54 61921 NOLOCKSHIFT))
+                          (103 (101 69 LOCKSHIFT))
+                          (104 (55 38 NOLOCKSHIFT))
+                          (105 (100 68 LOCKSHIFT))
+                          (106 (117 85 LOCKSHIFT))
+                          (107 (118 86 LOCKSHIFT))
+                          (108 (48 41 NOLOCKSHIFT))
+                          (109 (107 75 LOCKSHIFT))
+                          (110 (45 45 NOLOCKSHIFT))
+                          (111 (112 80 LOCKSHIFT))
+                          (112 (204 63 NOLOCKSHIFT))
+                          (115 (1 1 NOLOCKSHIFT) . IGNORE)
+                          (116 (51 61874 NOLOCKSHIFT))
+                          (117 (50 61859 NOLOCKSHIFT))
+                          (118 (119 87 LOCKSHIFT))
+                          (119 (113 81 LOCKSHIFT))
+                          (120 (115 83 LOCKSHIFT))
+                          (121 (97 65 LOCKSHIFT))
+                          (122 (57 40 NOLOCKSHIFT))
+                          (123 (105 73 LOCKSHIFT))
+                          (124 (120 88 LOCKSHIFT))
+                          (125 (111 79 LOCKSHIFT))
+                          (126 (108 76 LOCKSHIFT))
+                          (127 (44 171 NOLOCKSHIFT))
+                          (128 (39 61857 NOLOCKSHIFT))
+                          (129 (61872 61892 LOCKSHIFT))
+                          (132 (49 33 NOLOCKSHIFT))
+                          (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                          (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                          (135 (102 70 LOCKSHIFT))
+                          (137 (99 67 LOCKSHIFT))
+                          (138 (106 74 LOCKSHIFT))
+                          (139 (98 66 LOCKSHIFT))
+                          (140 (122 90 LOCKSHIFT))
+                          (141 1SHIFTDOWN . 1SHIFTUP)
+                          (142 (46 187 NOLOCKSHIFT))
+                          (143 (59 58 NOLOCKSHIFT))
+                          (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                          (145 (61869 61741 LOCKSHIFT))
+                          (148 (114 82 LOCKSHIFT))
+                          (149 (116 84 LOCKSHIFT))
+                          (150 (103 71 LOCKSHIFT))
+                          (151 (121 89 LOCKSHIFT))
+                          (152 (104 72 LOCKSHIFT))
+                          (153 (56 61919 NOLOCKSHIFT))
+                          (154 (110 78 LOCKSHIFT))
+                          (155 (109 77 LOCKSHIFT))
+                          (156 LOCKDOWN . LOCKUP)
+                          (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                          (158 (61873 61877 LOCKSHIFT))
+                          (159 (61 43 NOLOCKSHIFT))
+                          (160 2SHIFTDOWN . 2SHIFTUP))
+                        DORADO)
+                 (GERMAN ((100 (53 37 NOLOCKSHIFT))
+                          (101 (52 36 NOLOCKSHIFT))
+                          (102 (54 126 NOLOCKSHIFT))
+                          (103 (101 69 LOCKSHIFT))
+                          (104 (55 38 NOLOCKSHIFT))
+                          (105 (100 68 LOCKSHIFT))
+                          (106 (117 85 LOCKSHIFT))
+                          (107 (118 86 LOCKSHIFT))
+                          (108 (48 41 NOLOCKSHIFT))
+                          (109 (107 75 LOCKSHIFT))
+                          (110 (45 45 NOLOCKSHIFT))
+                          (111 (112 80 LOCKSHIFT))
+                          (112 (251 63 NOLOCKSHIFT))
+                          (115 (1 1 NOLOCKSHIFT) . IGNORE)
+                          (116 (51 35 NOLOCKSHIFT))
+                          (117 (50 64 NOLOCKSHIFT))
+                          (118 (119 87 LOCKSHIFT))
+                          (119 (113 81 LOCKSHIFT))
+                          (120 (115 83 LOCKSHIFT))
+                          (121 (97 65 LOCKSHIFT))
+                          (122 (57 40 NOLOCKSHIFT))
+                          (123 (105 73 LOCKSHIFT))
+                          (124 (120 88 LOCKSHIFT))
+                          (125 (111 79 LOCKSHIFT))
+                          (126 (108 76 LOCKSHIFT))
+                          (127 (44 60 NOLOCKSHIFT))
+                          (128 (39 34 NOLOCKSHIFT))
+                          (129 (61863 61735 LOCKSHIFT))
+                          (132 (49 33 NOLOCKSHIFT))
+                          (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                          (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                          (135 (102 70 LOCKSHIFT))
+                          (137 (99 67 LOCKSHIFT))
+                          (138 (106 74 LOCKSHIFT))
+                          (139 (98 66 LOCKSHIFT))
+                          (140 (122 90 LOCKSHIFT))
+                          (141 1SHIFTDOWN . 1SHIFTUP)
+                          (142 (46 62 NOLOCKSHIFT))
+                          (143 (59 58 NOLOCKSHIFT))
+                          (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                          (145 (95 94 NOLOCKSHIFT))
+                          (148 (114 82 LOCKSHIFT))
+                          (149 (116 84 LOCKSHIFT))
+                          (150 (103 71 LOCKSHIFT))
+                          (151 (121 89 LOCKSHIFT))
+                          (152 (104 72 LOCKSHIFT))
+                          (153 (56 42 NOLOCKSHIFT))
+                          (154 (110 78 LOCKSHIFT))
+                          (155 (109 77 LOCKSHIFT))
+                          (156 LOCKDOWN . LOCKUP)
+                          (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                          (158 (61908 61780 LOCKSHIFT))
+                          (159 (61925 61797 LOCKSHIFT))
+                          (160 2SHIFTDOWN . 2SHIFTUP))
+                        DORADO)
+                 (STANDARD-RUSSIAN ((100 (34 52 NOLOCKSHIFT))
+                                    (101 (47 51 NOLOCKSHIFT))
+                                    (102 (58 53 NOLOCKSHIFT))
+                                    (103 (10085 10037 LOCKSHIFT))
+                                    (104 (44 54 NOLOCKSHIFT))
+                                    (105 (10067 10019 LOCKSHIFT))
+                                    (106 (10068 10020 LOCKSHIFT))
+                                    (107 (10078 10030 LOCKSHIFT))
+                                    (108 (63 57 NOLOCKSHIFT))
+                                    (109 (10077 10029 LOCKSHIFT))
+                                    (110 (37 48 NOLOCKSHIFT))
+                                    (111 (10073 10025 LOCKSHIFT))
+                                    (112 (10071 10023 LOCKSHIFT))
+                                    (115 (1 1 NOLOCKSHIFT) . IGNORE)
+                                    (116 (45 50 NOLOCKSHIFT))
+                                    (117 (61352 49 NOLOCKSHIFT))
+                                    (118 (10088 10040 LOCKSHIFT))
+                                    (119 (10075 10027 LOCKSHIFT))
+                                    (120 (10093 10045 LOCKSHIFT))
+                                    (121 (10086 10038 LOCKSHIFT))
+                                    (122 (95 56 NOLOCKSHIFT))
+                                    (123 (10090 10042 LOCKSHIFT))
+                                    (124 (10089 10041 LOCKSHIFT))
+                                    (125 (10091 10043 LOCKSHIFT))
+                                    (126 (10069 10021 LOCKSHIFT))
+                                    (127 (10066 10018 LOCKSHIFT))
+                                    (128 (10095 10047 LOCKSHIFT))
+                                    (129 (10092 10044 LOCKSHIFT))
+                                    (132 (167 43 NOLOCKSHIFT))
+                                    (133 (92 124 NOLOCKSHIFT) . IGNORE)
+                                    (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                                    (135 (10065 10017 LOCKSHIFT))
+                                    (137 (10083 10035 LOCKSHIFT))
+                                    (138 (10080 10032 LOCKSHIFT))
+                                    (139 (10074 10026 LOCKSHIFT))
+                                    (140 (10097 10049 LOCKSHIFT))
+                                    (141 1SHIFTDOWN . 1SHIFTUP)
+                                    (142 (10096 10048 LOCKSHIFT))
+                                    (143 (10072 10024 LOCKSHIFT))
+                                    (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                                    (145 (41 40 NOLOCKSHIFT))
+                                    (148 (10076 10028 LOCKSHIFT))
+                                    (149 (10070 10022 LOCKSHIFT))
+                                    (150 (10081 10033 LOCKSHIFT))
+                                    (151 (10079 10031 LOCKSHIFT))
+                                    (152 (10082 10034 LOCKSHIFT))
+                                    (153 (46 55 NOLOCKSHIFT))
+                                    (154 (10084 10036 LOCKSHIFT))
+                                    (155 (10094 10046 LOCKSHIFT))
+                                    (156 LOCKDOWN . LOCKUP)
+                                    (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                                    (158 (10087 10039 LOCKSHIFT))
+                                    (159 (33 61 NOLOCKSHIFT))
+                                    (160 2SHIFTDOWN . 2SHIFTUP))
+                        DORADO)))
+(DECLARE%: DONTCOPY
+  (FILEMAP (NIL)))
+STOP

library/virtualkeyboards/DOVEKEYBOARDS

@@ -0,0 +1,631 @@
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
+
+
(FILECREATED " 6-Jul-2023 08:52:04" {WMEDLEY}<library>virtualkeyboards>DOVEKEYBOARDS.;3
 33268  
+
+      :EDIT-BY rmk
+
+      :CHANGES-TO (VARS DOVEKEYBOARDSCOMS)
+
+      :PREVIOUS-DATE " 4-Jul-2023 23:19:33" {WMEDLEY}<library>virtualkeyboards>DOVEKEYBOARDS.;2)
+
+
+(PRETTYCOMPRINT DOVEKEYBOARDSCOMS)
+
+(RPAQQ DOVEKEYBOARDSCOMS
 ((ALISTS (VKBD.LOADED-KEYBOARDS DOVE))))
+
+(ADDTOVAR VKBD.LOADED-KEYBOARDS

+          (DOVE (EUROPEAN ((100 (53 197 NOLOCKSHIFT))
+                           (101 (52 196 NOLOCKSHIFT))
+                           (102 (54 198 NOLOCKSHIFT))
+                           (103 (61887 61759 LOCKSHIFT))
+                           (104 (55 199 NOLOCKSHIFT))
+                           (105 (61888 61760 LOCKSHIFT))
+                           (106 (61872 61744 LOCKSHIFT))
+                           (107 (61860 61732 LOCKSHIFT))
+                           (108 (48 126 NOLOCKSHIFT))
+                           (109 (61892 61764 LOCKSHIFT))
+                           (110 (203 207 NOLOCKSHIFT))
+                           (111 (61919 61791 LOCKSHIFT))
+                           (112 (47 191 NOLOCKSHIFT))
+                           (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                           (116 (51 195 NOLOCKSHIFT))
+                           (117 (50 194 NOLOCKSHIFT))
+                           (118 (61873 61745 LOCKSHIFT))
+                           (119 (61858 61730 LOCKSHIFT))
+                           (120 (61874 61746 LOCKSHIFT))
+                           (121 (61859 61731 LOCKSHIFT))
+                           (122 (57 202 NOLOCKSHIFT))
+                           (123 (61886 61758 LOCKSHIFT))
+                           (124 (61864 61736 LOCKSHIFT))
+                           (125 (61903 61775 LOCKSHIFT))
+                           (126 (61908 61780 LOCKSHIFT))
+                           (127 (241 225 LOCKSHIFT))
+                           (171 (187 170 LOCKSHIFT))
+                           (129 (249 233 LOCKSHIFT))
+                           (132 (49 193 NOLOCKSHIFT))
+                           (165 (27 27 NOLOCKSHIFT) . IGNORE)
+                           (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                           (135 (61905 61777 LOCKSHIFT))
+                           (137 (61869 61741 LOCKSHIFT))
+                           (138 (61877 61749 LOCKSHIFT))
+                           (139 (61906 61778 LOCKSHIFT))
+                           (140 (251 90 LOCKSHIFT))
+                           (141 1SHIFTDOWN . 1SHIFTUP)
+                           (142 (250 234 LOCKSHIFT))
+                           (143 (59 58 LOCKSHIFT))
+                           (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                           (208 (171 186 LOCKSHIFT))
+                           (148 (61904 61776 LOCKSHIFT))
+                           (149 (61920 61792 LOCKSHIFT))
+                           (150 (61921 61793 LOCKSHIFT))
+                           (151 (61857 61729 LOCKSHIFT))
+                           (152 (61863 61735 LOCKSHIFT))
+                           (153 (56 200 NOLOCKSHIFT))
+                           (154 (61900 61772 LOCKSHIFT))
+                           (155 (239 77 LOCKSHIFT))
+                           (156 LOCKDOWN . LOCKUP)
+                           (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                           (158 (246 230 LOCKSHIFT))
+                           (159 (207 176 NOLOCKSHIFT))
+                           (160 2SHIFTDOWN . 2SHIFTUP))
+                       DOVE)
+                (logic ((100 (53 37 NOLOCKSHIFT))
+                        (101 (52 164 NOLOCKSHIFT))
+                        (102 (54 126 NOLOCKSHIFT))
+                        (103 (61258 61260 NOLOCKSHIFT))
+                        (104 (55 38 NOLOCKSHIFT))
+                        (105 (61292 61293 NOLOCKSHIFT))
+                        (106 (61271 61270 NOLOCKSHIFT))
+                        (107 (61284 61285 NOLOCKSHIFT))
+                        (108 (48 41 NOLOCKSHIFT))
+                        (109 (61307 61306 NOLOCKSHIFT))
+                        (110 (45 177 NOLOCKSHIFT))
+                        (111 (61269 61268 LOCKSHIFT))
+                        (112 (172 174 NOLOCKSHIFT))
+                        (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                        (116 (51 35 NOLOCKSHIFT))
+                        (117 (50 64 NOLOCKSHIFT))
+                        (118 (61240 61241 NOLOCKSHIFT))
+                        (119 (61234 61235 NOLOCKSHIFT))
+                        (120 (61266 61262 NOLOCKSHIFT))
+                        (121 (61365 61365 NOLOCKSHIFT))
+                        (122 (57 40 NOLOCKSHIFT))
+                        (123 (61275 61274 NOLOCKSHIFT))
+                        (124 (61300 61299 NOLOCKSHIFT))
+                        (125 (61273 61272 NOLOCKSHIFT))
+                        (126 (61282 61283 NOLOCKSHIFT))
+                        (127 (61256 61257 NOLOCKSHIFT))
+                        (171 (61356 61356 NOLOCKSHIFT))
+                        (129 (93 125 NOLOCKSHIFT))
+                        (132 (49 33 NOLOCKSHIFT))
+                        (165 (27 27 NOLOCKSHIFT) . IGNORE)
+                        (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                        (135 (61250 61251 NOLOCKSHIFT))
+                        (137 (61298 61297 NOLOCKSHIFT))
+                        (138 (61305 61303 NOLOCKSHIFT))
+                        (139 (61265 61264 NOLOCKSHIFT))
+                        (140 (61364 61364 NOLOCKSHIFT))
+                        (141 1SHIFTDOWN . 1SHIFTUP)
+                        (142 (61281 233 NOLOCKSHIFT))
+                        (143 (61351 61351 NOLOCKSHIFT))
+                        (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                        (208 (61357 61357 NOLOCKSHIFT))
+                        (148 (61279 61278 NOLOCKSHIFT))
+                        (149 (61239 61238 NOLOCKSHIFT))
+                        (150 (61290 61290 NOLOCKSHIFT))
+                        (151 (61263 61261 NOLOCKSHIFT))
+                        (152 (61295 61295 NOLOCKSHIFT))
+                        (153 (56 42 NOLOCKSHIFT))
+                        (154 (61252 61253 NOLOCKSHIFT))
+                        (155 (61254 61255 NOLOCKSHIFT))
+                        (156 LOCKDOWN . LOCKUP)
+                        (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                        (158 (91 123 NOLOCKSHIFT))
+                        (159 (61 43 NOLOCKSHIFT))
+                        (160 2SHIFTDOWN . 2SHIFTUP))
+                       DOVE)
+                (MATH ((100 (53 37 NOLOCKSHIFT))
+                       (101 (52 36 NOLOCKSHIFT))
+                       (102 (54 126 NOLOCKSHIFT))
+                       (103 (61284 61285 LOCKSHIFT))
+                       (104 (55 38 NOLOCKSHIFT))
+                       (105 (100 68 LOCKSHIFT))
+                       (106 (174 61245 NOLOCKSHIFT))
+                       (107 (61369 61363 NOLOCKSHIFT))
+                       (108 (48 41 NOLOCKSHIFT))
+                       (109 (61254 61255 NOLOCKSHIFT))
+                       (110 (45 45 NOLOCKSHIFT))
+                       (111 (173 61246 LOCKSHIFT))
+                       (112 (47 61300 NOLOCKSHIFT))
+                       (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                       (116 (51 35 NOLOCKSHIFT))
+                       (117 (50 64 NOLOCKSHIFT))
+                       (118 (61282 61283 LOCKSHIFT))
+                       (119 (61287 61286 NOLOCKSHIFT))
+                       (120 (61301 61302 NOLOCKSHIFT))
+                       (121 (61351 65 LOCKSHIFT))
+                       (122 (57 40 NOLOCKSHIFT))
+                       (123 (175 61247 LOCKSHIFT))
+                       (124 (180 184 LOCKSHIFT))
+                       (125 (172 61244 LOCKSHIFT))
+                       (126 (61256 61257 LOCKSHIFT))
+                       (127 (44 61250 NOLOCKSHIFT))
+                       (171 (61298 61253 NOLOCKSHIFT))
+                       (129 (93 61265 NOLOCKSHIFT))
+                       (132 (49 33 NOLOCKSHIFT))
+                       (165 (27 27 NOLOCKSHIFT) . IGNORE)
+                       (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                       (135 (102 70 LOCKSHIFT))
+                       (137 (61356 61362 LOCKSHIFT))
+                       (138 (61254 61291 NOLOCKSHIFT))
+                       (139 (98 61360 NOLOCKSHIFT))
+                       (140 (61309 177 LOCKSHIFT))
+                       (141 1SHIFTDOWN . 1SHIFTUP)
+                       (142 (46 61251 NOLOCKSHIFT))
+                       (143 (61299 61252 NOLOCKSHIFT))
+                       (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                       (208 (95 94 NOLOCKSHIFT))
+                       (148 (61358 82 LOCKSHIFT))
+                       (149 (61296 61266 NOLOCKSHIFT))
+                       (150 (61305 61303 NOLOCKSHIFT))
+                       (151 (61308 61267 LOCKSHIFT))
+                       (152 (61288 72 LOCKSHIFT))
+                       (153 (56 42 NOLOCKSHIFT))
+                       (154 (61357 61361 NOLOCKSHIFT))
+                       (155 (61292 61293 LOCKSHIFT))
+                       (156 LOCKDOWN . LOCKUP)
+                       (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                       (158 (91 61264 NOLOCKSHIFT))
+                       (159 (61 43 NOLOCKSHIFT))
+                       (160 2SHIFTDOWN . 2SHIFTUP))
+                      DOVE)
+                (OFFICE ((100 (61397 61381 NOLOCKSHIFT))
+                         (101 (61396 61380 NOLOCKSHIFT))
+                         (102 (61398 61382 NOLOCKSHIFT))
+                         (103 (8557 8554 NOLOCKSHIFT))
+                         (104 (61399 61383 NOLOCKSHIFT))
+                         (105 (61232 8743 NOLOCKSHIFT))
+                         (106 (61346 8571 NOLOCKSHIFT))
+                         (107 (188 86 NOLOCKSHIFT))
+                         (108 (61402 61386 NOLOCKSHIFT))
+                         (109 (210 8738 NOLOCKSHIFT))
+                         (110 (61437 61438 NOLOCKSHIFT))
+                         (111 (163 8558 NOLOCKSHIFT))
+                         (112 (61248 63 NOLOCKSHIFT))
+                         (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                         (116 (61395 61379 NOLOCKSHIFT))
+                         (117 (61394 61378 NOLOCKSHIFT))
+                         (118 (185 8553 NOLOCKSHIFT))
+                         (119 (176 8546 NOLOCKSHIFT))
+                         (120 (167 8744 NOLOCKSHIFT))
+                         (121 (97 8745 NOLOCKSHIFT))
+                         (122 (61401 61385 NOLOCKSHIFT))
+                         (123 (162 8570 NOLOCKSHIFT))
+                         (124 (61437 88 NOLOCKSHIFT))
+                         (125 (111 8569 NOLOCKSHIFT))
+                         (126 (61289 8737 NOLOCKSHIFT))
+                         (127 (44 60 NOLOCKSHIFT))
+                         (171 (39 34 NOLOCKSHIFT))
+                         (129 (93 125 NOLOCKSHIFT))
+                         (132 (61393 61377 NOLOCKSHIFT))
+                         (165 (27 27 NOLOCKSHIFT) . IGNORE)
+                         (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                         (135 (61233 8742 NOLOCKSHIFT))
+                         (137 (61438 67 NOLOCKSHIFT))
+                         (138 (8739 74 NOLOCKSHIFT))
+                         (139 (190 61436 NOLOCKSHIFT))
+                         (140 (189 90 NOLOCKSHIFT))
+                         (141 1SHIFTDOWN . 1SHIFTUP)
+                         (142 (61249 62 NOLOCKSHIFT))
+                         (143 (61352 58 NOLOCKSHIFT))
+                         (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                         (208 (95 61280 NOLOCKSHIFT))
+                         (148 (212 8574 NOLOCKSHIFT))
+                         (149 (61354 8573 NOLOCKSHIFT))
+                         (150 (61286 8741 NOLOCKSHIFT))
+                         (151 (165 8572 NOLOCKSHIFT))
+                         (152 (61368 8740 NOLOCKSHIFT))
+                         (153 (61400 61384 NOLOCKSHIFT))
+                         (154 (173 175 NOLOCKSHIFT))
+                         (155 (172 174 NOLOCKSHIFT))
+                         (156 LOCKDOWN . LOCKUP)
+                         (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                         (158 (91 123 NOLOCKSHIFT))
+                         (159 (61406 61368 NOLOCKSHIFT))
+                         (160 2SHIFTDOWN . 2SHIFTUP))
+                       DOVE)
+                (DVORAK ((100 (49 42 NOLOCKSHIFT))
+                         (101 (51 41 NOLOCKSHIFT))
+                         (102 (57 37 NOLOCKSHIFT))
+                         (103 (46 62 NOLOCKSHIFT))
+                         (104 (48 38 NOLOCKSHIFT))
+                         (105 (101 69 LOCKSHIFT))
+                         (106 (103 71 LOCKSHIFT))
+                         (107 (107 75 LOCKSHIFT))
+                         (108 (54 45 NOLOCKSHIFT))
+                         (109 (116 84 LOCKSHIFT))
+                         (110 (56 95 NOLOCKSHIFT))
+                         (111 (108 76 LOCKSHIFT))
+                         (112 (122 90 LOCKSHIFT))
+                         (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                         (116 (53 40 NOLOCKSHIFT))
+                         (117 (55 35 NOLOCKSHIFT))
+                         (118 (44 60 NOLOCKSHIFT))
+                         (119 (63 47 NOLOCKSHIFT))
+                         (120 (111 79 LOCKSHIFT))
+                         (121 (97 65 LOCKSHIFT))
+                         (122 (52 164 NOLOCKSHIFT))
+                         (123 (99 67 LOCKSHIFT))
+                         (124 (113 81 LOCKSHIFT))
+                         (125 (114 82 LOCKSHIFT))
+                         (126 (110 78 LOCKSHIFT))
+                         (127 (119 87 LOCKSHIFT))
+                         (171 (44 186 NOLOCKSHIFT))
+                         (129 (93 125 NOLOCKSHIFT))
+                         (132 (33 64 NOLOCKSHIFT))
+                         (165 (27 27 NOLOCKSHIFT) . IGNORE)
+                         (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                         (135 (117 85 LOCKSHIFT))
+                         (137 (106 74 LOCKSHIFT))
+                         (138 (104 72 LOCKSHIFT))
+                         (139 (120 88 LOCKSHIFT))
+                         (140 (59 58 NOLOCKSHIFT))
+                         (141 1SHIFTDOWN . 1SHIFTUP)
+                         (142 (118 86 LOCKSHIFT))
+                         (143 (115 83 LOCKSHIFT))
+                         (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                         (208 (169 170 NOLOCKSHIFT))
+                         (148 (112 80 LOCKSHIFT))
+                         (149 (121 89 LOCKSHIFT))
+                         (150 (105 73 LOCKSHIFT))
+                         (151 (102 70 LOCKSHIFT))
+                         (152 (100 68 LOCKSHIFT))
+                         (153 (50 162 NOLOCKSHIFT))
+                         (154 (98 66 LOCKSHIFT))
+                         (155 (109 77 LOCKSHIFT))
+                         (156 LOCKDOWN . LOCKUP)
+                         (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                         (158 (91 123 NOLOCKSHIFT))
+                         (159 (61 43 NOLOCKSHIFT))
+                         (160 2SHIFTDOWN . 2SHIFTUP))
+                       DOVE)
+                (GREEK ((100 (53 37 NOLOCKSHIFT))
+                        (101 (52 36 NOLOCKSHIFT))
+                        (102 (54 126 NOLOCKSHIFT))
+                        (103 (9830 69 LOCKSHIFT))
+                        (104 (55 38 NOLOCKSHIFT))
+                        (105 (9829 9797 LOCKSHIFT))
+                        (106 (9849 9817 LOCKSHIFT))
+                        (107 (115 9814 LOCKSHIFT))
+                        (108 (48 41 NOLOCKSHIFT))
+                        (109 (9837 9805 LOCKSHIFT))
+                        (110 (45 45 NOLOCKSHIFT))
+                        (111 (9843 9811 LOCKSHIFT))
+                        (112 (47 63 NOLOCKSHIFT))
+                        (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                        (116 (51 35 NOLOCKSHIFT))
+                        (117 (50 64 NOLOCKSHIFT))
+                        (118 (9853 9821 LOCKSHIFT))
+                        (119 (9835 9803 LOCKSHIFT))
+                        (120 (9846 9814 LOCKSHIFT))
+                        (121 (9825 9793 LOCKSHIFT))
+                        (122 (57 40 NOLOCKSHIFT))
+                        (123 (9836 9804 LOCKSHIFT))
+                        (124 (9851 9819 LOCKSHIFT))
+                        (125 (9842 9810 LOCKSHIFT))
+                        (126 (9838 9806 LOCKSHIFT))
+                        (127 (44 60 NOLOCKSHIFT))
+                        (171 (39 34 NOLOCKSHIFT))
+                        (129 (93 125 NOLOCKSHIFT))
+                        (132 (49 33 NOLOCKSHIFT))
+                        (165 (27 27 NOLOCKSHIFT) . IGNORE)
+                        (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                        (135 (9850 9818 LOCKSHIFT))
+                        (137 (9841 9809 LOCKSHIFT))
+                        (138 (106 74 LOCKSHIFT))
+                        (139 (9826 66 LOCKSHIFT))
+                        (140 (9833 9801 LOCKSHIFT))
+                        (141 1SHIFTDOWN . 1SHIFTUP)
+                        (142 (46 62 NOLOCKSHIFT))
+                        (143 (59 58 NOLOCKSHIFT))
+                        (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                        (208 (95 94 NOLOCKSHIFT))
+                        (148 (9845 9813 LOCKSHIFT))
+                        (149 (9848 9816 LOCKSHIFT))
+                        (150 (9828 9796 LOCKSHIFT))
+                        (151 (9852 9820 LOCKSHIFT))
+                        (152 (9834 9802 LOCKSHIFT))
+                        (153 (56 42 NOLOCKSHIFT))
+                        (154 (9840 9808 LOCKSHIFT))
+                        (155 (9839 9807 LOCKSHIFT))
+                        (156 LOCKDOWN . LOCKUP)
+                        (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                        (158 (91 123 NOLOCKSHIFT))
+                        (159 (61 43 NOLOCKSHIFT))
+                        (160 2SHIFTDOWN . 2SHIFTUP))
+                       DOVE)
+                (ITALIAN ((171 (39 34 NOLOCKSHIFT))
+                          (100 (53 61903 NOLOCKSHIFT))
+                          (101 (52 61886 NOLOCKSHIFT))
+                          (102 (54 61919 NOLOCKSHIFT))
+                          (103 (101 69 LOCKSHIFT))
+                          (104 (55 38 NOLOCKSHIFT))
+                          (105 (100 68 LOCKSHIFT))
+                          (106 (117 85 LOCKSHIFT))
+                          (107 (118 86 LOCKSHIFT))
+                          (108 (48 41 NOLOCKSHIFT))
+                          (109 (107 75 LOCKSHIFT))
+                          (110 (45 45 NOLOCKSHIFT))
+                          (111 (112 80 LOCKSHIFT))
+                          (112 (95 63 NOLOCKSHIFT))
+                          (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                          (116 (51 61872 NOLOCKSHIFT))
+                          (117 (50 61857 NOLOCKSHIFT))
+                          (118 (119 87 LOCKSHIFT))
+                          (119 (113 81 LOCKSHIFT))
+                          (120 (115 83 LOCKSHIFT))
+                          (121 (97 65 LOCKSHIFT))
+                          (122 (57 40 NOLOCKSHIFT))
+                          (123 (105 73 LOCKSHIFT))
+                          (124 (120 88 LOCKSHIFT))
+                          (125 (111 79 LOCKSHIFT))
+                          (126 (108 76 LOCKSHIFT))
+                          (127 (44 171 NOLOCKSHIFT))
+                          (171 (39 186 NOLOCKSHIFT))
+                          (129 (93 125 NOLOCKSHIFT))
+                          (132 (49 33 NOLOCKSHIFT))
+                          (165 (27 27 NOLOCKSHIFT) . IGNORE)
+                          (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                          (135 (102 70 LOCKSHIFT))
+                          (137 (99 67 LOCKSHIFT))
+                          (138 (106 74 LOCKSHIFT))
+                          (139 (98 66 LOCKSHIFT))
+                          (140 (122 90 LOCKSHIFT))
+                          (141 1SHIFTDOWN . 1SHIFTUP)
+                          (142 (46 187 NOLOCKSHIFT))
+                          (143 (59 58 NOLOCKSHIFT))
+                          (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                          (208 (95 170 NOLOCKSHIFT))
+                          (148 (114 82 LOCKSHIFT))
+                          (149 (116 84 LOCKSHIFT))
+                          (150 (103 71 LOCKSHIFT))
+                          (151 (121 89 LOCKSHIFT))
+                          (152 (104 72 LOCKSHIFT))
+                          (153 (56 42 NOLOCKSHIFT))
+                          (154 (110 78 LOCKSHIFT))
+                          (155 (109 77 LOCKSHIFT))
+                          (156 LOCKDOWN . LOCKUP)
+                          (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                          (158 (91 123 NOLOCKSHIFT))
+                          (159 (61 43 NOLOCKSHIFT))
+                          (160 2SHIFTDOWN . 2SHIFTUP))
+                       DOVE)
+                (SPANISH ((208 (161 191 NOLOCKSHIFT))
+                          (171 (59 58 NOLOCKSHIFT))
+                          (100 (53 61904 NOLOCKSHIFT))
+                          (101 (52 61887 NOLOCKSHIFT))
+                          (102 (54 61920 NOLOCKSHIFT))
+                          (103 (101 69 LOCKSHIFT))
+                          (104 (55 38 NOLOCKSHIFT))
+                          (105 (100 68 LOCKSHIFT))
+                          (106 (117 85 LOCKSHIFT))
+                          (107 (118 86 LOCKSHIFT))
+                          (108 (48 41 NOLOCKSHIFT))
+                          (109 (107 75 LOCKSHIFT))
+                          (110 (45 45 NOLOCKSHIFT))
+                          (111 (112 80 LOCKSHIFT))
+                          (112 (95 63 NOLOCKSHIFT))
+                          (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                          (116 (51 61873 NOLOCKSHIFT))
+                          (117 (50 61858 NOLOCKSHIFT))
+                          (118 (119 87 LOCKSHIFT))
+                          (119 (113 81 LOCKSHIFT))
+                          (120 (115 83 LOCKSHIFT))
+                          (121 (97 65 LOCKSHIFT))
+                          (122 (57 40 NOLOCKSHIFT))
+                          (123 (105 73 LOCKSHIFT))
+                          (124 (120 88 LOCKSHIFT))
+                          (125 (111 79 LOCKSHIFT))
+                          (126 (108 76 LOCKSHIFT))
+                          (127 (44 171 NOLOCKSHIFT))
+                          (171 (59 58 NOLOCKSHIFT))
+                          (129 (185 186 NOLOCKSHIFT))
+                          (132 (49 33 NOLOCKSHIFT))
+                          (165 (27 27 NOLOCKSHIFT) . IGNORE)
+                          (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                          (135 (102 70 LOCKSHIFT))
+                          (137 (99 67 LOCKSHIFT))
+                          (138 (106 74 LOCKSHIFT))
+                          (139 (98 66 LOCKSHIFT))
+                          (140 (122 90 LOCKSHIFT))
+                          (141 1SHIFTDOWN . 1SHIFTUP)
+                          (142 (46 187 NOLOCKSHIFT))
+                          (143 (61900 61772 LOCKSHIFT))
+                          (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                          (208 (161 191 NOLOCKSHIFT))
+                          (148 (114 82 LOCKSHIFT))
+                          (149 (116 84 LOCKSHIFT))
+                          (150 (103 71 LOCKSHIFT))
+                          (151 (121 89 LOCKSHIFT))
+                          (152 (104 72 LOCKSHIFT))
+                          (153 (56 61925 NOLOCKSHIFT))
+                          (154 (110 78 LOCKSHIFT))
+                          (155 (109 77 LOCKSHIFT))
+                          (156 LOCKDOWN . LOCKUP)
+                          (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                          (158 (169 170 NOLOCKSHIFT))
+                          (159 (61 43 NOLOCKSHIFT))
+                          (160 2SHIFTDOWN . 2SHIFTUP))
+                       DOVE)
+                (FRENCH ((208 (61869 61741 NOLOCKSHIFT))
+                         (171 (39 61857 NOLOCKSHIFT))
+                         (100 (53 61905 NOLOCKSHIFT))
+                         (101 (52 61888 NOLOCKSHIFT))
+                         (102 (54 61921 NOLOCKSHIFT))
+                         (103 (101 69 LOCKSHIFT))
+                         (104 (55 38 NOLOCKSHIFT))
+                         (105 (100 68 LOCKSHIFT))
+                         (106 (117 85 LOCKSHIFT))
+                         (107 (118 86 LOCKSHIFT))
+                         (108 (48 41 NOLOCKSHIFT))
+                         (109 (107 75 LOCKSHIFT))
+                         (110 (45 45 NOLOCKSHIFT))
+                         (111 (112 80 LOCKSHIFT))
+                         (112 (95 63 NOLOCKSHIFT))
+                         (115 (1 1 NOLOCKSHIFT) . IGNORE)
+                         (116 (51 61874 NOLOCKSHIFT))
+                         (117 (50 61859 NOLOCKSHIFT))
+                         (118 (119 87 LOCKSHIFT))
+                         (119 (113 81 LOCKSHIFT))
+                         (120 (115 83 LOCKSHIFT))
+                         (121 (97 65 LOCKSHIFT))
+                         (122 (57 40 NOLOCKSHIFT))
+                         (123 (105 73 LOCKSHIFT))
+                         (124 (120 88 LOCKSHIFT))
+                         (125 (111 79 LOCKSHIFT))
+                         (126 (108 76 LOCKSHIFT))
+                         (127 (44 171 NOLOCKSHIFT))
+                         (171 (39 61857 NOLOCKSHIFT))
+                         (129 (61872 61892 LOCKSHIFT))
+                         (132 (49 33 NOLOCKSHIFT))
+                         (165 (27 27 NOLOCKSHIFT) . IGNORE)
+                         (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                         (135 (102 70 LOCKSHIFT))
+                         (137 (99 67 LOCKSHIFT))
+                         (138 (106 74 LOCKSHIFT))
+                         (139 (98 66 LOCKSHIFT))
+                         (140 (122 90 LOCKSHIFT))
+                         (141 1SHIFTDOWN . 1SHIFTUP)
+                         (142 (46 187 NOLOCKSHIFT))
+                         (143 (59 58 NOLOCKSHIFT))
+                         (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                         (208 (61869 61741 LOCKSHIFT))
+                         (148 (114 82 LOCKSHIFT))
+                         (149 (116 84 LOCKSHIFT))
+                         (150 (103 71 LOCKSHIFT))
+                         (151 (121 89 LOCKSHIFT))
+                         (152 (104 72 LOCKSHIFT))
+                         (153 (56 61919 NOLOCKSHIFT))
+                         (154 (110 78 LOCKSHIFT))
+                         (155 (109 77 LOCKSHIFT))
+                         (156 LOCKDOWN . LOCKUP)
+                         (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                         (158 (61873 61877 LOCKSHIFT))
+                         (159 (61 43 NOLOCKSHIFT))
+                         (160 2SHIFTDOWN . 2SHIFTUP))
+                       DOVE)
+                (GERMAN ((100 (53 37 NOLOCKSHIFT))
+                         (101 (52 36 NOLOCKSHIFT))
+                         (102 (54 126 NOLOCKSHIFT))
+                         (103 (101 69 LOCKSHIFT))
+                         (104 (55 38 NOLOCKSHIFT))
+                         (105 (100 68 LOCKSHIFT))
+                         (106 (117 85 LOCKSHIFT))
+                         (107 (118 86 LOCKSHIFT))
+                         (108 (48 41 NOLOCKSHIFT))
+                         (109 (107 75 LOCKSHIFT))
+                         (110 (45 45 NOLOCKSHIFT))
+                         (111 (112 80 LOCKSHIFT))
+                         (112 (251 63 NOLOCKSHIFT))
+                         (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                         (116 (51 35 NOLOCKSHIFT))
+                         (117 (50 64 NOLOCKSHIFT))
+                         (118 (119 87 LOCKSHIFT))
+                         (119 (113 81 LOCKSHIFT))
+                         (120 (115 83 LOCKSHIFT))
+                         (121 (97 65 LOCKSHIFT))
+                         (122 (57 40 NOLOCKSHIFT))
+                         (123 (105 73 LOCKSHIFT))
+                         (124 (120 88 LOCKSHIFT))
+                         (125 (111 79 LOCKSHIFT))
+                         (126 (108 76 LOCKSHIFT))
+                         (127 (44 60 NOLOCKSHIFT))
+                         (171 (39 34 NOLOCKSHIFT))
+                         (129 (61863 61735 LOCKSHIFT))
+                         (132 (49 33 NOLOCKSHIFT))
+                         (165 (27 27 NOLOCKSHIFT) . IGNORE)
+                         (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                         (135 (102 70 LOCKSHIFT))
+                         (137 (99 67 LOCKSHIFT))
+                         (138 (106 74 LOCKSHIFT))
+                         (139 (98 66 LOCKSHIFT))
+                         (140 (122 90 LOCKSHIFT))
+                         (141 1SHIFTDOWN . 1SHIFTUP)
+                         (142 (46 62 NOLOCKSHIFT))
+                         (143 (59 58 NOLOCKSHIFT))
+                         (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                         (208 (95 94 NOLOCKSHIFT))
+                         (148 (114 82 LOCKSHIFT))
+                         (149 (116 84 LOCKSHIFT))
+                         (150 (103 71 LOCKSHIFT))
+                         (151 (121 89 LOCKSHIFT))
+                         (152 (104 72 LOCKSHIFT))
+                         (153 (56 42 NOLOCKSHIFT))
+                         (154 (110 78 LOCKSHIFT))
+                         (155 (109 77 LOCKSHIFT))
+                         (156 LOCKDOWN . LOCKUP)
+                         (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                         (158 (61908 61780 LOCKSHIFT))
+                         (159 (61925 61797 LOCKSHIFT))
+                         (160 2SHIFTDOWN . 2SHIFTUP))
+                       DOVE)
+                (STANDARD-RUSSIAN ((208 (41 40 NOLOCKSHIFT))
+                                   (171 (10073 10025 NOLOCKSHIFT))
+                                   (100 (34 52 NOLOCKSHIFT))
+                                   (101 (47 51 NOLOCKSHIFT))
+                                   (102 (58 53 NOLOCKSHIFT))
+                                   (103 (10085 10037 LOCKSHIFT))
+                                   (104 (44 54 NOLOCKSHIFT))
+                                   (105 (10067 10019 LOCKSHIFT))
+                                   (106 (10068 10020 LOCKSHIFT))
+                                   (107 (10078 10030 LOCKSHIFT))
+                                   (108 (63 57 NOLOCKSHIFT))
+                                   (109 (10077 10029 LOCKSHIFT))
+                                   (110 (37 48 NOLOCKSHIFT))
+                                   (111 (10073 10025 LOCKSHIFT))
+                                   (112 (10071 10023 LOCKSHIFT))
+                                   (115 (8 8 NOLOCKSHIFT) . IGNORE)
+                                   (116 (45 50 NOLOCKSHIFT))
+                                   (117 (61352 49 NOLOCKSHIFT))
+                                   (118 (10088 10040 LOCKSHIFT))
+                                   (119 (10075 10027 LOCKSHIFT))
+                                   (120 (10093 10045 LOCKSHIFT))
+                                   (121 (10086 10038 LOCKSHIFT))
+                                   (122 (95 56 NOLOCKSHIFT))
+                                   (123 (10090 10042 LOCKSHIFT))
+                                   (124 (10089 10041 LOCKSHIFT))
+                                   (125 (10091 10043 LOCKSHIFT))
+                                   (126 (10069 10021 LOCKSHIFT))
+                                   (127 (10066 10018 LOCKSHIFT))
+                                   (171 (10095 10047 LOCKSHIFT))
+                                   (129 (10092 10044 LOCKSHIFT))
+                                   (132 (167 43 NOLOCKSHIFT))
+                                   (165 (27 27 NOLOCKSHIFT) . IGNORE)
+                                   (134 (9 9 NOLOCKSHIFT) . IGNORE)
+                                   (135 (10065 10017 LOCKSHIFT))
+                                   (137 (10083 10035 LOCKSHIFT))
+                                   (138 (10080 10032 LOCKSHIFT))
+                                   (139 (10074 10026 LOCKSHIFT))
+                                   (140 (10097 10049 LOCKSHIFT))
+                                   (141 1SHIFTDOWN . 1SHIFTUP)
+                                   (142 (10096 10048 LOCKSHIFT))
+                                   (143 (10072 10024 LOCKSHIFT))
+                                   (144 (13 13 NOLOCKSHIFT) . IGNORE)
+                                   (208 (41 40 NOLOCKSHIFT))
+                                   (148 (10076 10028 LOCKSHIFT))
+                                   (149 (10070 10022 LOCKSHIFT))
+                                   (150 (10081 10033 LOCKSHIFT))
+                                   (151 (10079 10031 LOCKSHIFT))
+                                   (152 (10082 10034 LOCKSHIFT))
+                                   (153 (46 55 NOLOCKSHIFT))
+                                   (154 (10084 10036 LOCKSHIFT))
+                                   (155 (10094 10046 LOCKSHIFT))
+                                   (156 LOCKDOWN . LOCKUP)
+                                   (157 (32 32 NOLOCKSHIFT) . IGNORE)
+                                   (158 (10087 10039 LOCKSHIFT))
+                                   (159 (33 61 NOLOCKSHIFT))
+                                   (160 2SHIFTDOWN . 2SHIFTUP))
+                       DOVE)))
+(DECLARE%: DONTCOPY
+  (FILEMAP (NIL)))
+STOP

library/virtualkeyboards/KEYBOARDEDITOR

@@ -1,13 +1,16 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-
(FILECREATED "25-May-95 14:32:35" {DSK}<project>medley2.0>library>KEYBOARDEDITOR.;4
 51139  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (FNS EDITKEYBOARD VKBD.EDIT.CREATE-DISPLAY)
+
(FILECREATED " 6-Jul-2023 16:23:12" {WMEDLEY}<library>KEYBOARDEDITOR.;3
 50717  
 
-      previous date%: "25-May-95 11:35:16" {DSK}<project>medley2.0>library>KEYBOARDEDITOR.;2)
+      :EDIT-BY rmk
+
+      :CHANGES-TO (FNS VKBD.EDIT.CREATE-CHARACTERS-MENU)
+
+      :PREVIOUS-DATE "25-May-95 14:32:35" {WMEDLEY}<library>KEYBOARDEDITOR.;1)
 
 
 (* ; "
-Copyright (c) 1985, 1987, 1990, 1995 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1985, 1987, 1990, 1995 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT KEYBOARDEDITORCOMS)
@@ -15,14 +18,14 @@ Copyright (c) 1985, 1987, 1990, 1995 by Venue & Xerox Corporation.  All rights r
 (RPAQQ KEYBOARDEDITORCOMS

        ((FILES VIRTUALKEYBOARDS)
         (COMS 
-              (* ;; "Editor for Configurations -- the description of the physical key layout, which keys are assignable, etc.")

+              (* ;; "Editor for Configurations -- the description of the physical key layout, which keys are assignable, etc.")

 
               (FNS EDITCONFIGURATION VKBD.CONF.CHANGE-KEY-VALUE VKBD.CONF.DISPLAY-FIELD-VALUE 
                    VKBD.CONF.DISPLAY-INFO-KEYBOARD VKBD.CONF.DISPLAY-KEY-INFO 
                    VKBD.CONF.EDIT-DEFAULT-ASSIGNMENTS VKBD.CONF.ICONFN VKBD.CONF.PARSE-CONFIGURATION)
               (BITMAPS VKBD.CONF.ICON))
         
-        (* ;; "EEditor for keyboard layouts per se:")

+        (* ;; "EEditor for keyboard layouts per se:")

 
         (FNS EDITKEYBOARD VKBD.EDIT.ADD-SUBITEM-TO-BACKGROUND-MENU VKBD.EDIT.CREATE-COMMAND-MENU 
              VKBD.EDIT.CREATE-NON-CHAR-ASSIGMENTS-MENU VKBD.EDIT-KEYBOARD-COMMAND 
@@ -459,7 +462,8 @@ Copyright (c) 1985, 1987, 1990, 1995 by Venue & Xerox Corporation.  All rights r
                   ITEMWIDTH _ 29])
 
 (VKBD.EDIT.CREATE-CHARACTERS-MENU

-  [LAMBDA (CHAR-SET-NUMBER FONT)
                             (* sm "15-Aug-85 12:15")

+  [LAMBDA (CHAR-SET-NUMBER FONT)
                             (* ; "Edited  6-Jul-2023 16:23 by rmk")

+                                                             (* sm "15-Aug-85 12:15")

     (PROG (EXISTING-MENU-INFO NEW-MENU)
           [SETQ EXISTING-MENU-INFO (for
 CHARSET-FONT-MENU in
 VKBD.EDIT.CASH-MENUES
                                       thereis
 (AND (EQP (CAR CHARSET-FONT-MENU)
@@ -468,21 +472,17 @@ Copyright (c) 1985, 1987, 1990, 1995 by Venue & Xerox Corporation.  All rights r
                                                        FONT]
           (if
 EXISTING-MENU-INFO
               then
 (RETURN (CADDR EXISTING-MENU-INFO)))
-          (PRINTOUT PROMPTWINDOW T "Wait. Bitmaps for character set " (OCTALSTRING CHAR-SET-NUMBER)
-                 " are being retrieved. ")
+          (PRINTOUT PROMPTWINDOW T "Retrieving bitmaps for character set " (OCTALSTRING 
+                                                                                  CHAR-SET-NUMBER))
           (SETQ NEW-MENU (create
 MENU
                                 ITEMS _ (for
 I from
 0 to
 255 bind
 CODE bind
 ROTATED-I
-                                           collect
 (PROGN (SETQ ROTATED-I (SUB1 (
-
                                                                             VKBD.EDIT.ROTATED-NUMBER

-                                                                                 (ADD1 I)
-                                                                                 16 16)))
-                                                          (LIST (GETCHARBITMAP (SETQ CODE
-                                                                                (VKBD.PARSE-CHAR-CODE
-                                                                                 (LIST 
-                                                                                      CHAR-SET-NUMBER 
-                                                                                       ROTATED-I)))
-                                                                       FONT)
-                                                                CODE)))
+                                           collect
 (SETQ ROTATED-I (SUB1 (VKBD.EDIT.ROTATED-NUMBER

+                                                                          (ADD1 I)
+                                                                          16 16)))
+                                                 (SETQ CODE (LOGOR (LLSH CHAR-SET-NUMBER 8)
+                                                                   I))
+                                                 (LIST (GETCHARBITMAP CODE FONT)
+                                                       CODE))
                                 MENUCOLUMNS _ 16
                                 CENTERFLG _ T
                                 ITEMHEIGHT _ 25
@@ -717,16 +717,16 @@ Copyright (c) 1985, 1987, 1990, 1995 by Venue & Xerox Corporation.  All rights r
         ("Accented Characters" 241)))
 
 (RPAQQ VKBD.EDIT.MENU-ITEMS
 (("CharSet" VKBD.EDIT.SWITCH-CHAR-SET-COMMAND "Pops up a menu of all possible character set number. Selecting one will switch the displayed character set."
-                                        )
-                                 ("Stop" VKBD.EDIT.STOP-COMMAND 
+                                    )
+                             ("Stop" VKBD.EDIT.STOP-COMMAND 
      "Exit from the keyboard editor. Returns the new keyboard, but does not modify the original one."
-                                        )
-                                 ("Quit" VKBD.EDIT.QUIT-COMMAND 
+                                    )
+                             ("Quit" VKBD.EDIT.QUIT-COMMAND 
                     "Exit from the keyboard editor. Modifies the roriginal keyboard and returns it ."
-                                        )
-                                 ("Define" VKBD.EDIT.DEFINE-COMMAND 
+                                    )
+                             ("Define" VKBD.EDIT.DEFINE-COMMAND 
                        "Adds the edited keyboard in its current state to the set of known keyboards."
-                                        )))
+                                    )))
 
 (RPAQQ VKBD.EDIT.NON-CHAR-ASSIGNMENTS
 (SHIFT CTRL META LOCK LOCKDOWN LOCKUP EVENT))
 
@@ -744,27 +744,26 @@ Copyright (c) 1985, 1987, 1990, 1995 by Venue & Xerox Corporation.  All rights r
        VKBD.EDIT.MASK)
 )
 
-(VKBD.EDIT.ADD-SUBITEM-TO-BACKGROUND-MENU
 (LIST "Edit" '(ADD.PROCESS '(
-
                                                                         VKBD.EDIT-KEYBOARD-COMMAND

-                                                                           T))
-                                                    "Calls the keyboard editor. Will prompt for name for the new keyboard, and will use the default keyboard as the initial keyboard"
-                                                    VKBD.EDIT.BACKGROUND-MENU-SUBITEMS)
+(VKBD.EDIT.ADD-SUBITEM-TO-BACKGROUND-MENU
 (LIST "Edit" '(ADD.PROCESS '(VKBD.EDIT-KEYBOARD-COMMAND

+                                                                       T))
+                                                "Calls the keyboard editor. Will prompt for name for the new keyboard, and will use the default keyboard as the initial keyboard"
+                                                VKBD.EDIT.BACKGROUND-MENU-SUBITEMS)
        "Keyboard")
 (PUTPROPS KEYBOARDEDITOR COPYRIGHT ("Venue & Xerox Corporation" 1985 1987 1990 1995))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3451 17311 (EDITCONFIGURATION 3461 . 3784) (VKBD.CONF.CHANGE-KEY-VALUE 3786 . 8411) (
-VKBD.CONF.DISPLAY-FIELD-VALUE 8413 . 10186) (VKBD.CONF.DISPLAY-INFO-KEYBOARD 10188 . 12135) (
-VKBD.CONF.DISPLAY-KEY-INFO 12137 . 12894) (VKBD.CONF.EDIT-DEFAULT-ASSIGNMENTS 12896 . 14277) (
-VKBD.CONF.ICONFN 14279 . 15020) (VKBD.CONF.PARSE-CONFIGURATION 15022 . 17309)) (19637 42746 (
-EDITKEYBOARD 19647 . 21947) (VKBD.EDIT.ADD-SUBITEM-TO-BACKGROUND-MENU 21949 . 22875) (
-VKBD.EDIT.CREATE-COMMAND-MENU 22877 . 23227) (VKBD.EDIT.CREATE-NON-CHAR-ASSIGMENTS-MENU 23229 . 23692)
- (VKBD.EDIT-KEYBOARD-COMMAND 23694 . 25067) (VKBD.EDIT.ASSIGN-CHARACTER 25069 . 27743) (
-VKBD.EDIT.ASSIGN-NON-CHARACTER 27745 . 28363) (VKBD.EDIT.CREATE-CHARACTER-SETS-MENU 28365 . 29404) (
-VKBD.EDIT.CREATE-CHARACTERS-MENU 29406 . 31987) (VKBD.EDIT.CREATE-DISPLAY 31989 . 35222) (
-VKBD.EDIT.DEFINE-COMMAND 35224 . 35626) (VKBD.EDIT.DO-MENU-COMMAND 35628 . 35838) (VKBD.EDIT.ICONFN 
-35840 . 36489) (VKBD.EDIT.INVERT-IF-LOCKED 36491 . 36924) (VKBD.EDIT.KEYBOARD-REPAINTFN 36926 . 37496)
- (VKBD.EDIT.LARGE-WINDOW-REPAINTFN 37498 . 38093) (VKBD.EDIT.MAKE-CURRENT-KEY 38095 . 40147) (
-VKBD.EDIT.QUIT-COMMAND 40149 . 40502) (VKBD.EDIT.STOP-COMMAND 40504 . 40730) (
-VKBD.EDIT.SWITCH-CHAR-SET-COMMAND 40732 . 41658) (VKBD.EDIT.SWITCH-CHARACTER-SET 41660 . 42443) (
-VKBD.EDIT.ROTATED-NUMBER 42445 . 42744)))))
+  (FILEMAP (NIL (3425 17285 (EDITCONFIGURATION 3435 . 3758) (VKBD.CONF.CHANGE-KEY-VALUE 3760 . 8385) (
+VKBD.CONF.DISPLAY-FIELD-VALUE 8387 . 10160) (VKBD.CONF.DISPLAY-INFO-KEYBOARD 10162 . 12109) (
+VKBD.CONF.DISPLAY-KEY-INFO 12111 . 12868) (VKBD.CONF.EDIT-DEFAULT-ASSIGNMENTS 12870 . 14251) (
+VKBD.CONF.ICONFN 14253 . 14994) (VKBD.CONF.PARSE-CONFIGURATION 14996 . 17283)) (19611 42442 (
+EDITKEYBOARD 19621 . 21921) (VKBD.EDIT.ADD-SUBITEM-TO-BACKGROUND-MENU 21923 . 22849) (
+VKBD.EDIT.CREATE-COMMAND-MENU 22851 . 23201) (VKBD.EDIT.CREATE-NON-CHAR-ASSIGMENTS-MENU 23203 . 23666)
+ (VKBD.EDIT-KEYBOARD-COMMAND 23668 . 25041) (VKBD.EDIT.ASSIGN-CHARACTER 25043 . 27717) (
+VKBD.EDIT.ASSIGN-NON-CHARACTER 27719 . 28337) (VKBD.EDIT.CREATE-CHARACTER-SETS-MENU 28339 . 29378) (
+VKBD.EDIT.CREATE-CHARACTERS-MENU 29380 . 31683) (VKBD.EDIT.CREATE-DISPLAY 31685 . 34918) (
+VKBD.EDIT.DEFINE-COMMAND 34920 . 35322) (VKBD.EDIT.DO-MENU-COMMAND 35324 . 35534) (VKBD.EDIT.ICONFN 
+35536 . 36185) (VKBD.EDIT.INVERT-IF-LOCKED 36187 . 36620) (VKBD.EDIT.KEYBOARD-REPAINTFN 36622 . 37192)
+ (VKBD.EDIT.LARGE-WINDOW-REPAINTFN 37194 . 37789) (VKBD.EDIT.MAKE-CURRENT-KEY 37791 . 39843) (
+VKBD.EDIT.QUIT-COMMAND 39845 . 40198) (VKBD.EDIT.STOP-COMMAND 40200 . 40426) (
+VKBD.EDIT.SWITCH-CHAR-SET-COMMAND 40428 . 41354) (VKBD.EDIT.SWITCH-CHARACTER-SET 41356 . 42139) (
+VKBD.EDIT.ROTATED-NUMBER 42141 . 42440)))))
 STOP

library/virtualkeyboards/VIRTUALKEYBOARDS

@@ -1,17 +1,17 @@
-(DEFINE-FILE-INFO PACKAGE "IL" READTABLE "XCL" BASE 10)
-
(FILECREATED "22-Dec-2018 22:58:47" 
-|{DSK}<Users>kaplan>Local>medley3.5>lispcore>library>VIRTUALKEYBOARDS.;10|
 141793 
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-      |changes| |to:|  (VARS VIRTUALKEYBOARDSCOMS VKBD.BACKGROUND-MENU-SUBITEMS 
-                             VKBD.NON-CHAR-ASSIGNMENTS-LABELS VKBD.WINDOW-MENU-SUBITEMS VKBD.ICON 
-                             VKBD.MASK MODEACTIONS)
-                       (RECORDS KEYBOARDCONFIGURATION VIRTUALKEYBOARD)
+
(FILECREATED " 6-Jul-2023 15:55:10" |{WMEDLEY}<library>VIRTUALKEYBOARDS>VIRTUALKEYBOARDS.;16|
 140655 
 
-      |previous| |date:| "22-Dec-2018 22:52:44" 
-|{DSK}<Users>kaplan>Local>medley3.5>lispcore>library>VIRTUALKEYBOARDS.;9|)
+      :EDIT-BY |rmk|
+
+      :CHANGES-TO (VARS VIRTUALKEYBOARDSCOMS)
+                  (FNS VKBD.INIT VKBD.LOAD-KEYBOARD-FILE METASHIFT)
+
+      :PREVIOUS-DATE "28-Jun-2023 11:52:23" |{WMEDLEY}<library>virtualkeyboards>VIRTUALKEYBOARDS.;9|
+)
 
 
-; Copyright (c) 1985, 1986, 1987, 1988, 1990, 1992, 1993, 1995, 1996, 2017, 2018 by Venue & Xerox Corporation.  All rights reserved.
+; Copyright (c) 1985-1988, 1990, 1992-1993, 1995-1996, 2017-2018 by Venue & Xerox Corporation.
 
 (PRETTYCOMPRINT VIRTUALKEYBOARDSCOMS)
 
@@ -50,7 +50,8 @@
                        UNDERLINE NOTUNDERLINE SUBSCRIPT SUPERSCRIPT SMALLER LARGER MARGINS NOTMARGINS
                        LOOKS NOTLOOKS F11 NOTF11 F12 NOTF12))
         (RECORDS KEYBOARDCONFIGURATION VIRTUALKEYBOARD)
-        (INITVARS (VKBD.KNOWN-KEYBOARDS NIL))
+        (INITVARS (VKBD.LOADED-KEYBOARDS NIL)
+               (VKBD.KNOWN-KEYBOARDS NIL))
         (FILES (SOURCE)
                KEYBOARDCONFIGS)
         (VARS VKBD.BACKGROUND-MENU-SUBITEMS VKBD.NON-CHAR-ASSIGNMENTS-LABELS 
@@ -60,6 +61,7 @@
                VKBD.KNOWN-KEYBOARDS VKBD.NON-CHAR-ASSIGNMENTS-LABELS VKBD.ICON VKBD.MASK 
                CURRENTKEYBOARDCONFIG VKBD.CONFIGURATIONS VKBD.COMMONCODELABELS VKBD.COMMONKEYLABELS 
                VKBD.COMMONDEFAULTASSIGNMENT)
+        (INITVARS (CURRENTKEYBOARDCONFIG NIL))
         (COMS (DECLARE\: FIRST (P (MOVD? '\\KEYBOARDEVENTFN '\\OLDKEYBOARDEVENTFN)))
               (INITVARS (\\ORIGINALDEFAULTKEYACTION))
               (FNS VKBD.\\KEYBOARDEVENTFN VKBD.RESETKEYACTIONTABLES)
@@ -75,11 +77,12 @@
                                    'DEFAULT)))
         (FNS FIXKEYBOARD FIXKEYBOARDCONFIG FIXKEYASSIGNMENTS)
         (DECLARE\: DONTEVAL@LOAD DOCOPY (P (VKBD.INIT)))
-        (COMS (FNS METASHIFT)
-                                                             (* \; 
-
                                               "Call new definition if the old one had been called")

-              (P (AND (MEMB (MACHINETYPE)
-                            '(MAIKO DORADO))
+        (COMS (P (MOVD? 'METASHIFT 'OLDMETASHIFT))
+              (FNS METASHIFT)
+                                                             (* \; 
+
                                                 "Call new definition if the old one had been called")

+              (P (AND (MEMB (KEYBOARDTYPE)
+                            '(X DORADO))
                       (EQUAL (KEYACTION 'BLANK-BOTTOM)
                              '(METADOWN . METAUP))
                       (METASHIFT T))))
@@ -217,61 +220,34 @@
                             'DEFAULT)))))))
 
 (VKBD.CREATE-KEYACTION-TABLE

-
-  (LAMBDA (NEW-KEYBOARD OLDTABLE)
                        (* \; "Edited 29-Feb-96 12:32 by rmk")

-
+  (LAMBDA (NEW-KEYBOARD OLDTABLE)
                           (* \; "Edited 28-Jun-2023 11:52 by rmk")


+                                                             (* \; "Edited 29-Feb-96 12:32 by rmk")

     (PROG (KEYBOARDNAME FOUND KEYACTION-TABLE CONFIG)
-
           (CL:UNLESS (COND
-
                         ((AND (ATOM NEW-KEYBOARD)
-
                               (SETQ FOUND (FINDVIRTUALKEYBOARD
 NEW-KEYBOARD)))
-
                          (SETQ NEW-KEYBOARD FOUND))
-
                         ((MEMB NEW-KEYBOARD VKBD.KNOWN-KEYBOARDS)))
 
-
-
-              (* |;;| "Use FOUND to preserve NEW-KEYBOARD for error")

-
-
+              (* |;;| "Use FOUND to preserve NEW-KEYBOARD for error")

 
               (ERROR "INVALID KEYBOARD" NEW-KEYBOARD))
-
           (SETQ KEYBOARDNAME (FETCH
 (VIRTUALKEYBOARD KEYBOARDNAME) OF
 NEW-KEYBOARD))
-
           (COND
-
              (OLDTABLE (SETQ KEYACTION-TABLE (RESETKEYACTION OLDTABLE)))
-
              ((SETQ KEYACTION-TABLE (GETPROP KEYBOARDNAME 'KEYACTIONTABLE))
-
               (RETURN KEYACTION-TABLE))
-
              (T (SETQ KEYACTION-TABLE (KEYACTIONTABLE))))
-
           (SETQ NEW-KEYBOARD (VKBD.COMPLETE-KEYBOARD
 NEW-KEYBOARD))
-
           (SETQ CONFIG (VKBD.GET-CONFIGURATION
 (FETCH
 (VIRTUALKEYBOARD KEYBOARDCONFIGURATION)
-
-                                                      OF
 NEW-KEYBOARD)))
-
-          (FOR
 KEY-ASSIGNMENT IN
 (FETCH
 (VIRTUALKEYBOARD COMPLETEKEYASSIGNMENTS)
-
-                                            OF
 NEW-KEYBOARD) DO
 (OLDKEYACTION (CAR 
-
-                                                                                       KEY-ASSIGNMENT
-
-                                                                                           )
-
-                                                                               (CDR KEY-ASSIGNMENT)
-
-                                                                               KEYACTION-TABLE))
-
+                                                  OF
 NEW-KEYBOARD)))
+          (FOR
 KEY-ASSIGNMENT IN
 (FETCH
 (VIRTUALKEYBOARD COMPLETEKEYASSIGNMENTS) OF
 NEW-KEYBOARD)
+             DO
 (CL:UNLESS (MEMB (CAR KEY-ASSIGNMENT)
+                                 '(31 86))
+                    (OLDKEYACTION (CAR KEY-ASSIGNMENT)
+                           (CDR KEY-ASSIGNMENT)
+                           KEYACTION-TABLE)))
           (PUTPROP KEYBOARDNAME 'KEYACTIONTABLE KEYACTION-TABLE)
-
           (RETURN KEYACTION-TABLE))))
 
 (vkbd.windowmenufn

@@ -414,7 +390,9 @@
     (setq |BackgroundMenu| nil)))
 
 (VKBD.INIT

-  (LAMBDA NIL
                                        (* \; "Edited 14-Jun-2017 14:22 by kaplan")


+  (LAMBDA NIL
                                               (* \; "Edited  6-Jul-2023 15:14 by rmk")


+                                                            (* \; "Edited 28-Jun-2023 10:40 by rmk")


+                                                         (* \; "Edited 14-Jun-2017 14:22 by kaplan")


                                                            (* \; "Edited 16-Jun-92 11:14 by kaplan")

 
     (* |;;| "Reads virtual keyboard file for current type (or default type), if it can be found.  Keyboards that don't match current keyboard can be displayed but not installed (via PROCESS.KEYBOARD)")

@@ -423,35 +401,22 @@
         (SETQ \\ORIGINALDEFAULTKEYACTION (KEYACTIONTABLE \\DEFAULTKEYACTION)))
     (SETQ VKBD.COMMONCODELABELS (FOR
 X IN
 VKBD.COMMONCHARLABELS
                                    COLLECT
 (IF
 (LISTP X)
-                                                   THEN
 (IF
 (SMALLP (CAR X))
-                                                                THEN
 X
-                                                              ELSE
 (LIST (CHARCODE.DECODE
-                                                                              (CAR X))
-                                                                             (CADR X)))
-                                                 ELSE
 (LIST (CHARCODE.DECODE X)
-                                                                X))))
+                                               THEN
 (IF
 (SMALLP (CAR X))
+                                                        THEN
 X
+                                                      ELSE
 (LIST (CHARCODE.DECODE (CAR X))
+                                                                 (CADR X)))
+                                             ELSE
 (LIST (CHARCODE.DECODE X)
+                                                        X))))
     (VKBD.ADD-ITEM-TO-BACKGROUND-MENU
 "Keyboard" ''(SWITCHKEYBOARDS
 T NIL)
            "Displays a menu for switching keyboards" VKBD.BACKGROUND-MENU-SUBITEMS)
     (VKBD.WINDOWMENUINIT
)
-    (LET (FILE (KT (KEYBOARDTYPE)))
+    (LET ((KT (KEYBOARDTYPE)))
          (SETQ CURRENTKEYBOARDCONFIG (VKBD.GET-CONFIGURATION
 KT))
-         (COND
-            ((SETQ FILE (COND
-                           ((AND KT (FINDFILE (PACK* KT "KEYBOARDS")
-                                           T)))
-                           (T (FINDFILE (PACK* DEFAULTVIRTUALKEYBOARDTYPE "KEYBOARDS")
-                                     T))))
-             (VKBD.LOAD-KEYBOARD-FILE
 FILE)
+         (CL:WHEN (VKBD.LOAD-KEYBOARD-FILE
 KT)
 
              (* |;;| "Loading a keyboard file may change our notion of KEYBOARDTYPE, because of new coercion paths.  The default keyboard will be added for the new type")

 
-             (VKBD.ADD-DEFAULT-KEYBOARD
))
-            (T 
-               (* |;;| "Special printing here to avoid file-not-found error in case where user calls VKBD.LOAD-KEYBOARD-FILE directly")

-
-               (PROMPTPRINT "Note: virtual keyboard file for type " (OR (KEYBOARDTYPE)
-                                                                        DEFAULTVIRTUALKEYBOARDTYPE)
-                      " keyboards not found"))))))
+             (VKBD.ADD-DEFAULT-KEYBOARD
)))))
 
 (VKBD.CREATE-DEFAULT-KEYBOARD

 
@@ -474,9 +439,10 @@
                                           OF
 CONFIGURATION)))))
 
 (VKBD.ADD-DEFAULT-KEYBOARD

-  (LAMBDA (KEYBOARDTYPE)
                                 (* \; "Edited 23-May-95 17:04 by rmk:")

+  (LAMBDA (KEYBOARDTYPE)
                                    (* \; "Edited 28-Jun-2023 10:45 by rmk")


+                                                             (* \; "Edited 23-May-95 17:04 by rmk:")

 
-(* |;;;| "It is useful practice to be able to switch back to the original key assignments.  Thus the program is adding one special keyboard with the name DEFAULT which is the current keyboardtype's default keyboard.")

+(* |;;;| "It is useful practice to be able to switch back to the original key assignments.  Thus the program is adding one special keyboard with the name DEFAULT which is the current keyboardtype's default keyboard.")

 
     (SETQ KEYBOARDTYPE (OR KEYBOARDTYPE (KEYBOARDTYPE)))
     (BIND
 DEFAULT WHILE
 (SETQ DEFAULT (FINDVIRTUALKEYBOARD
 'DEFAULT KEYBOARDTYPE))
@@ -504,114 +470,55 @@
              THEN
 (VKBD.LOAD-KEYBOARD-FILE
 F REDEFINE? DELETE-FIRST? T)))))
 
 (VKBD.LOAD-KEYBOARD-FILE

+  (LAMBDA (KEYBOARDTYPE REDEFINE? DELETE-CURRENT-DEFINITIONS?)

+                                                            (* \; "Edited  6-Jul-2023 15:11 by rmk")


+                                                            (* \; "Edited  4-Jul-2023 23:22 by rmk")

+    (CL:UNLESS KEYBOARDTYPE (SETQ KEYBOARDTYPE DEFAULTVIRTUALKEYBOARDTYPE))
 
-  (LAMBDA (FILENAME REDEFINE? DELETE-CURRENT-DEFINITIONS? PROMPTPRINT)

+    (* |;;| "Returns T if keyboards of type KEYBOARDTYPE found. Prints prompt warning and returns NIL if not found.")

 
-                                                             (* \; "Edited  4-Mar-96 10:53 by rmk")

+    (* |;;| "Note:  Can't switch to READFILE, since it uses OLD-INTERLISP readtable which doesn't honor vertical bars around numeric atoms.")

 
+    (LET (FILE (VKBDDIRS (CONS (MEDLEYDIR "library/virtualkeyboards/")
+                               LISPUSERSDIRECTORIES))
+               (NEWKEYBOARDS (CDR (ASSOC KEYBOARDTYPE VKBD.LOADED-KEYBOARDS))))
+         (CL:UNLESS NEWKEYBOARDS
 
+             (* |;;| "If keyboards of type KEYBOARDTYPE have not previously been loaded, we look for a file <KEYBOARDTYPE>KEYBOARDS (e.g. XKEYBOARDS, SDLKEYBOARDS), defaulting to the directory that VIRTUALKEYBOARDS is coming from.  It is assumed that that file will add the desired keyboards to VKBD.LOADED-KEYBOARDS,")

 
-    (* |;;| "Note:  Can't switch to READFILE, since it uses OLD-INTERLISP readtable which doesn't honor vertical bars around numeric atoms.")

+             (CL:WHEN (SETQ FILE (FINDFILE (PACK* KEYBOARDTYPE "KEYBOARDS")
+                                        T VKBDDIRS))
+                 (LOAD FILE T)
+                 (SETQ NEWKEYBOARDS (CDR (ASSOC KEYBOARDTYPE VKBD.LOADED-KEYBOARDS)))))
+         (|if|
 NEWKEYBOARDS
+             |then|
 (COND
+                       (DELETE-CURRENT-DEFINITIONS? (SETQ VKBD.KNOWN-KEYBOARDS NEWKEYBOARDS)
+                              (VKBD.ADD-DEFAULT-KEYBOARD
))
+                       (T (FOR
 NEWKEYBOARD KN KC IN
 NEWKEYBOARDS
+                             DO
 
+                                (* |;;| 
+
 "To make sure that COMPLETEDASSIGNMENTS cell (or any other new cells) exist--backward compatibility")

 
+                                (SETQ NEWKEYBOARD (CREATE
 VIRTUALKEYBOARD USING
 NEWKEYBOARD))
+                                (SETQ KN (FETCH
 KEYBOARDNAME OF
 NEWKEYBOARD))
+                                (SETQ KC (FETCH
 KEYBOARDCONFIGURATION OF
 NEWKEYBOARD))
+                                (FOR
 TAIL OLDKEYBOARD ON
 VKBD.KNOWN-KEYBOARDS
+                                   WHEN
 (AND (EQ KN (FETCH
 KEYBOARDNAME OF
 (SETQ OLDKEYBOARD
+                                                                            (CAR TAIL))))
+                                             (EQ KC (FETCH
 KEYBOARDCONFIGURATION OF
 OLDKEYBOARD)))
+                                   DO
 
 
+                                  (* |;;| "If REDEFINE?, then replace one with same name and configuration.  Otherwise, keep the old one instead of installing the new one.")

 
-    (LET ((NEWKEYBOARDS (CL:WITH-OPEN-FILE (STREAM FILENAME :DIRECTION :INPUT)
-
-                               (BIND
 KB DATE (*PACKAGE* _ *INTERLISP-PACKAGE*)
-
-                                      (RDTBL _ (FIND-READTABLE "INTERLISP"))
-
-                                  FIRST
 (SETQ DATE (READ STREAM RDTBL))
-
-                                        (CL:UNLESS (LISTP DATE)
-
-                                            (CL:WHEN (STRINGP DATE)
-
-                                                (SETQ DATE (CONCAT "Keyboards from " (FULLNAME STREAM
-
-                                                                                            )
-
-                                                                  " [" DATE "]"))
-
-                                                (IF
 PROMPTPRINT
-
-                                                    THEN
 (PROMPTPRINT DATE)
-
-                                                  ELSE
 (PRINTOUT T DATE T)))
-
-                                            (SETQ DATE NIL)) WHILE
 (SKIPSEPRCODES STREAM RDTBL)
-
-                                  UNTIL
 (EQ 'STOP (SETQ KB (READ STREAM RDTBL))) COLLECT

-
-                                                                                     KB
-
-                                  FINALLY
 (CL:WHEN DATE
-
-
-
-                                                  (* |;;| 
-
-
                                                "Was a LISTP date, must have been a keyboard")

-
-
-
-                                                  (PUSH
 DATE $$VAL))))))
-
-         (COND
-
-            (DELETE-CURRENT-DEFINITIONS? (SETQ VKBD.KNOWN-KEYBOARDS NEWKEYBOARDS)
-
-                   (VKBD.ADD-DEFAULT-KEYBOARD
))
-
-            (T (FOR
 NEWKEYBOARD KN KC IN
 NEWKEYBOARDS
-
-                  DO
 
-
-
-
-                        (* |;;| 
-
-
"To make sure that COMPLETEDASSIGNMENTS cell (or any other new cells) exist--backward compatibility")

-
-
-
-                        (SETQ NEWKEYBOARD (CREATE
 VIRTUALKEYBOARD USING
 NEWKEYBOARD))
-
-                        (SETQ KN (FETCH
 KEYBOARDNAME OF
 NEWKEYBOARD))
-
-                        (SETQ KC (FETCH
 KEYBOARDCONFIGURATION OF
 NEWKEYBOARD))
-
-                        (FOR
 TAIL OLDKEYBOARD ON
 VKBD.KNOWN-KEYBOARDS
-
-                           WHEN
 (AND (EQ KN (FETCH
 KEYBOARDNAME OF
 (SETQ OLDKEYBOARD
-
-                                                                                (CAR TAIL))))
-
-                                         (EQ KC (FETCH
 KEYBOARDCONFIGURATION OF
 OLDKEYBOARD))
-
-                                         ) DO
 
-
-
-
-                                  (* |;;| "If REDEFINE?, then replace one with same name and configuration.  Otherwise, keep the old one instead of installing the new one.")

-
-
-
-                                                 (COND
-
-                                                    (REDEFINE? (RPLACA TAIL NEWKEYBOARD))
-
-                                                    (T (RETURN))) FINALLY
 (SETQ 
-
-                                                                               VKBD.KNOWN-KEYBOARDS
-
-                                                                               (NCONC1 
-
-                                                                                 VKBD.KNOWN-KEYBOARDS
-
-                                                                                      NEWKEYBOARD))))
-
-               )))))
+                                      (COND
+                                         (REDEFINE? (RPLACA TAIL NEWKEYBOARD))
+                                         (T (RETURN))) FINALLY
 (SETQ VKBD.KNOWN-KEYBOARDS
+                                                                (NCONC1 VKBD.KNOWN-KEYBOARDS 
+                                                                       NEWKEYBOARD))))))
+                   T
+           |else|
 (PROMPTPRINT "Note: Can't find virtual keyboard file for " KEYBOARDTYPE 
+                         " keyboards")
+                 NIL))))
 
 (vkbd.store-file-command

   (lambda (f)
                                            (* \; "Edited 15-Dec-87 16:31 by Snow")

@@ -2412,29 +2319,29 @@
           (NOTF12 621))
 (DECLARE\: EVAL@COMPILE
 
-(RECORD KEYBOARDCONFIGURATION
 (CONFIGURATIONNAME KBCDUMMY1 KEYREGIONS KBCDUMMY2 DEFAULTASSIGNMENT
-                                         KEYNAMESMAPPING KEYBOARDTYPE KEYLABELS KEYLABELSFONT 
-                                         BACKGROUNDSHADE KEYBOARDDISPLAYFONT CHARLABELS)
+(RECORD KEYBOARDCONFIGURATION
 (CONFIGURATIONNAME KBCDUMMY1 KEYREGIONS KBCDUMMY2 DEFAULTASSIGNMENT 
+                                     KEYNAMESMAPPING KEYBOARDTYPE KEYLABELS KEYLABELSFONT 
+                                     BACKGROUNDSHADE KEYBOARDDISPLAYFONT CHARLABELS)
 
-                                  (* |;;| "Dummy fields so length test still works")

+                              (* |;;| "Dummy fields so length test still works")

 
-                                  (TYPE?
 (EQLENGTH DATUM (CONSTANT (LENGTH (RECORDFIELDNAMES
-                                                                                
-                                                                                '
-                                                                                KEYBOARDCONFIGURATION
-                                                                                )))))
-                                  KEYBOARDTYPE _ (KEYBOARDTYPE)
-                                  KEYLABELSFONT _ DEFAULTKEYBOARDLABELSFONT BACKGROUNDSHADE _ 23130 
-                                  KEYBOARDDISPLAYFONT _ DEFAULTKEYBOARDDISPLAYFONT)
+                              (TYPE?
 (EQLENGTH DATUM (CONSTANT (LENGTH (RECORDFIELDNAMES 
+                                                                              'KEYBOARDCONFIGURATION)
+                                                                      ))))
+                              KEYBOARDTYPE _ (KEYBOARDTYPE)
+                              KEYLABELSFONT _ DEFAULTKEYBOARDLABELSFONT BACKGROUNDSHADE _ 23130 
+                              KEYBOARDDISPLAYFONT _ DEFAULTKEYBOARDDISPLAYFONT)
 
 (RECORD VIRTUALKEYBOARD
 (KEYBOARDNAME KEYASSIGNMENTS KEYBOARDCONFIGURATION KEYBOARDDISPLAYFONT)
-                            (HASHLINK VIRTUALKEYBOARD (COMPLETEKEYASSIGNMENTS VKBDHASHARRAY 20)))
+                        (HASHLINK VIRTUALKEYBOARD (COMPLETEKEYASSIGNMENTS VKBDHASHARRAY 20)))
 )
 
 (DECLARE\:
 EVAL@COMPILE (GLOBALVARS VKBDHASHARRAY))
 
 (SETUPHASHARRAY 'VKBDHASHARRAY 20)
 
+(RPAQ? VKBD.LOADED-KEYBOARDS
 NIL)
+
 (RPAQ? VKBD.KNOWN-KEYBOARDS
 NIL)
 
 (FILESLOAD (SOURCE)
@@ -2485,11 +2392,11 @@
                                    )))))
 
 (RPAQQ VKBD.NON-CHAR-ASSIGNMENTS-LABELS
 ((SHIFT SHIFT)
-                                             (CTRL CTRL)
-                                             (META META)
-                                             (LOCK LOCK)
-                                             (LOCKUP LOCKUP)
-                                             (LOCKDOWN LOCKDOWN)))
+                                         (CTRL CTRL)
+                                         (META META)
+                                         (LOCK LOCK)
+                                         (LOCKUP LOCKUP)
+                                         (LOCKDOWN LOCKDOWN)))
 
 (RPAQQ VKBD.WINDOW-MENU-SUBITEMS

        (SUBITEMS ("Switch keyboard" (FUNCTION (LAMBDA (W)
@@ -2549,6 +2456,8 @@
        VKBD.NON-CHAR-ASSIGNMENTS-LABELS VKBD.ICON VKBD.MASK CURRENTKEYBOARDCONFIG VKBD.CONFIGURATIONS
        VKBD.COMMONCODELABELS VKBD.COMMONKEYLABELS VKBD.COMMONDEFAULTASSIGNMENT)
 )
+
+(RPAQ? CURRENTKEYBOARDCONFIG
 NIL)
 (DECLARE\: FIRST 
 
 (MOVD? '\\KEYBOARDEVENTFN '\\OLDKEYBOARDEVENTFN)
@@ -2858,18 +2767,18 @@
 
 (RPAQ? MODEKEYS
 )
 
-(RPAQQ MODEACTIONS
 (EVENT CTRLUP CTRLDOWN 1SHIFTUP 1SHIFTDOWN 2SHIFTUP 2SHIFTDOWN LOCKUP LOCKDOWN
-                              LOCKTOGGLE METAUP METADOWN FONTUP FONTDOWN FONTTOGGLE USERMODE1UP 
-                              USERMODE1DOWN USERMODE1TOGGLE USERMODE2UP USERMODE2DOWN USERMODE2TOGGLE
-                              USERMODE3UP USERMODE3DOWN USERMODE3TOGGLE))
+(RPAQQ MODEACTIONS
 (EVENT CTRLUP CTRLDOWN 1SHIFTUP 1SHIFTDOWN 2SHIFTUP 2SHIFTDOWN LOCKUP LOCKDOWN 
+                          LOCKTOGGLE METAUP METADOWN FONTUP FONTDOWN FONTTOGGLE USERMODE1UP 
+                          USERMODE1DOWN USERMODE1TOGGLE USERMODE2UP USERMODE2DOWN USERMODE2TOGGLE 
+                          USERMODE3UP USERMODE3DOWN USERMODE3TOGGLE))
 (DECLARE\: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS MODEKEYS MODEACTIONS)
 )
 
 (ADDTOVAR BREAKRESETFORMS
 ((LAMBDA (K)
-                                      (PROCESS.KEYBOARD NIL K))
-                               'DEFAULT))
+                                  (PROCESS.KEYBOARD NIL K))
+                           'DEFAULT))
 (DEFINEQ
 
 (FIXKEYBOARD

@@ -3390,12 +3299,15 @@
 
 (VKBD.INIT
)
 )
+
+(MOVD? 'METASHIFT 'OLDMETASHIFT)
 (DEFINEQ
 
 (METASHIFT

-  (LAMBDA FLG
                                            (* \; "Edited 16-Jun-92 08:44 by rmk:")

+  (LAMBDA FLG
                                               (* \; "Edited  6-Jul-2023 09:21 by rmk")


+                                                             (* \; "Edited 16-Jun-92 08:44 by rmk:")

 
-    (* |;;| "Sets interpretation of swat key to first arg, where T means meta-shift, NIL means original setting.  Returns previous setting.  This differs from LLKEY version in that it changes the \\DORADOKEYACTIONS and \\DEFAULTKEYACTION table to insure that the metashift remains in effect across keyboard switches.")

+    (* |;;| "Sets interpretation of swat key to first arg, where T means meta-shift, NIL means original setting.  Returns previous setting.  This differs from LLKEY version in that it changes the \\DORADOKEYACTIONS and \\DEFAULTKEYACTION table to insure that the metashift remains in effect across keyboard switches.")

 
     (PROG* ((METASTATUS '(METADOWN . METAUP))
             (ARGUMENT (AND (IGREATERP FLG 0)
@@ -3408,19 +3320,19 @@
             OLDSETTING)
            (SETQ OLDSETTING (KEYACTION 'BLANK-BOTTOM ARGUMENT))
 
-     (* |;;| 
-
 "Update \\doradokeyactions table so we don't lose the change when we repalce the keyaction table.")

+     (* |;;| 
+
   "Update \\doradokeyactions table so we don't lose the change when we repalce the keyaction table.")

 
-           (AND (EQ (MACHINETYPE)
-                    'DORADO)
-                (COND
-                   (ARGUMENT (PUTASSOC 'BLANK-BOTTOM ARGUMENT \\DORADOKEYACTIONS)
-                          (KEYACTION 'BLANK-BOTTOM ARGUMENT \\DEFAULTKEYACTION))
-                   (T (SETQ \\DORADOKEYACTIONS (|for|
 X |in|
 \\DORADOKEYACTIONS
-                                                  |join|
 (AND (NEQ (CAR X)
-                                                                       'BLANK-BOTTOM)
-                                                                  (LIST X))))
-                      (KEYACTION 'BLANK-BOTTOM NIL \\DEFAULTKEYACTION))))
+           (CL:WHEN (EQ (KEYBOARDTYPE)
+                        'DORADO)
+               (COND
+                  (ARGUMENT (PUTASSOC 'BLANK-BOTTOM ARGUMENT \\DORADOKEYACTIONS)
+                         (KEYACTION 'BLANK-BOTTOM ARGUMENT \\DEFAULTKEYACTION))
+                  (T (SETQ \\DORADOKEYACTIONS (|for|
 X |in|
 \\DORADOKEYACTIONS
+                                                 |join|
 (AND (NEQ (CAR X)
+                                                                  'BLANK-BOTTOM)
+                                                             (LIST X))))
+                     (KEYACTION 'BLANK-BOTTOM NIL \\DEFAULTKEYACTION))))
            (RETURN (COND
                       ((EQUAL OLDSETTING METASTATUS)
                        T)
@@ -3432,8 +3344,8 @@
 (* \; "Call new definition if the old one had been called")

 
 
-(AND (MEMB (MACHINETYPE)
-           '(MAIKO DORADO))
+(AND (MEMB (KEYBOARDTYPE)
+           '(X DORADO))
      (EQUAL (KEYACTION 'BLANK-BOTTOM)
             '(METADOWN . METAUP))
      (METASHIFT
 T))
@@ -3450,38 +3362,38 @@
 (PUTPROPS VIRTUALKEYBOARDS COPYRIGHT ("Venue & Xerox Corporation" 1985 1986 1987 1988 1990 1992 1993 
 1995 1996 2017 2018))
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (5486 14142 (FINDVIRTUALKEYBOARD 5496 . 8650) (PROCESS.KEYBOARD 8652 . 11328) (
-VKBD.CREATE-KEYACTION-TABLE 11330 . 13246) (VKBD.WINDOWMENUFN 13248 . 13515) (VKBD.WINDOWMENUINIT 
-13517 . 14140)) (14143 19504 (LOADKEYBOARDDISPLAYFONTS 14153 . 19502)) (19613 20837 (DEFINEKEYBOARD 
-19623 . 20835)) (20838 25256 (VKBD.ADD-ITEM-TO-BACKGROUND-MENU 20848 . 21256) (VKBD.INIT 21258 . 23796
-) (VKBD.CREATE-DEFAULT-KEYBOARD 23798 . 24390) (VKBD.ADD-DEFAULT-KEYBOARD 24392 . 25254)) (25257 31597
- (VKBD.LOAD-FILE-COMMAND 25267 . 25721) (VKBD.LOAD-KEYBOARD-FILE 25723 . 29558) (
-VKBD.STORE-FILE-COMMAND 29560 . 29901) (VKBD.STORE-KEYBOARD-FILE 29903 . 31595)) (31598 40899 (
-SWITCHKEYBOARDS 31608 . 33086) (VKBD.POP-MENU-AND-SWITCH-KEYBOARDS 33088 . 33458) (
-VKBD.POP-UP-KEYBOARDS-MENU 33460 . 34842) (VKBD.GET-CONFIGURATION 34844 . 35762) (
-VKBD.SUBCONFIGURATION 35764 . 40897)) (40900 81185 (VKBD.BUTTONEVENTFN 40910 . 43817) (
-VKBD.CENTER-BITMAP-IN-REGION 43819 . 45343) (VKBD.CLEAR-KEY-DISPLAY 45345 . 47476) (
-VKBD.CREATE-KEYBOARD-BITMAP 47478 . 49522) (VKBD.CREATE-KEYBOARD-DISPLAY 49524 . 52653) (
-VKBD.CURSORMOVEDFN 52655 . 54559) (VKBD.DISPLAY-CHARACTER 54561 . 56519) (VKBD.DISPLAY-EMPTY-KEY-CAP 
-56521 . 67059) (VKBD.DISPLAY-KEY 67061 . 70268) (VKBD.DISPLAY-KEY-CHARACTERS 70270 . 71463) (
-VKBD.DRAW-KEY-CAPS 71465 . 73653) (VKBD.ERASE-FRAME 73655 . 73978) (VKBD.EXTEND-REGION 73980 . 74569) 
-(VKBD.GET-KEY-AND-REGIONS-OF-CURSOR-POSITION 74571 . 75186) (VKBD.GET-KEY-REGIONS 75188 . 75444) (
-VKBD.INVERT-KEY 75446 . 75736) (VKBD.INVERT-REGION 75738 . 76429) (VKBD.KEYBOARD-WINDOW-REPAINTFN 
-76431 . 78388) (VKBD.LOWER-HALF-REGION 78390 . 78790) (VKBD.POSITION-IS-IN-KEY-REGION 78792 . 79076) (
-VKBD.REMOVE-KEYBOARD-COMMAND 79078 . 79535) (VKBD.UNION-REGIONS 79537 . 80682) (VKBD.UPPER-HALF-REGION
- 80684 . 81183)) (81186 100744 (VKBD.KEY-ASSOC 81196 . 81696) (VKBD.CHAR-ASSIGNMENTP 81698 . 81862) (
-VKBD.COMPLETE-KEYBOARD 81864 . 84523) (VKBD.CTRL-ASSIGNMENTP 84525 . 84768) (VKBD.EVENT-ASSIGNMENTP 
-84770 . 85010) (VKBD.META-ASSIGNMENTP 85012 . 85255) (VKBD.FRAME-KEY 85257 . 87134) (
-VKBD.GET-CURRENT-KEY-ASSIGNMENT 87136 . 87505) (VKBD.GET-NON-CHAR-LABEL 87507 . 88162) (VKBD.ICONFN 
-88164 . 88900) (VKBD.INVERT-LOCK-KEYS 88902 . 89580) (VKBD.INVERT-SHIFT-KEYS 89582 . 90264) (
-VKBD.TRANSLATE-KEY-ID 90266 . 90945) (VKBD.KEY-ID-TO-KEY-NAMES 90947 . 91433) (
-VKBD.KEYBOARD-IS-KEYBOARDTYPE-KEYBOARD 91435 . 92033) (VKBD.LOCK-ASSIGNMENTP 92035 . 92482) (
-VKBD.LOCK-KEYP 92484 . 92802) (VKBD.LOCK/NOLOCK 92804 . 92963) (VKBD.LOCKDOWN-ASSIGNMENTP 92965 . 
-93259) (VKBD.LOCKUP-ASSIGNMENTP 93261 . 93551) (VKBD.PARSE-CHAR-CODE 93553 . 94052) (
-VKBD.PARSE-KEY-ASSIGNMENT 94054 . 97510) (VKBD.RESET-KEYBOARD-WINDOW 97512 . 98105) (
-VKBD.SEND-CHARACTER 98107 . 99616) (VKBD.SHIFT-ASSIGNMENTP 99618 . 100012) (VKBD.SHIFTED-CHAR 100014
- . 100172) (VKBD.UNDEFINE-KEYBOARD 100174 . 100581) (VKBD.UNSHIFTED-CHAR 100583 . 100742)) (113812 
-116258 (VKBD.\\KEYBOARDEVENTFN 113822 . 115025) (VKBD.RESETKEYACTIONTABLES 115027 . 116256)) (116364 
-122515 (NEWKEYACTION 116374 . 122513)) (123170 139358 (FIXKEYBOARD 123180 . 124300) (FIXKEYBOARDCONFIG
- 124302 . 131526) (FIXKEYASSIGNMENTS 131528 . 139356)) (139411 141267 (METASHIFT 139421 . 141265)))))
+  (FILEMAP (NIL (5390 13914 (FINDVIRTUALKEYBOARD 5400 . 8554) (PROCESS.KEYBOARD 8556 . 11232) (
+VKBD.CREATE-KEYACTION-TABLE 11234 . 13018) (VKBD.WINDOWMENUFN 13020 . 13287) (VKBD.WINDOWMENUINIT 
+13289 . 13912)) (13915 19276 (LOADKEYBOARDDISPLAYFONTS 13925 . 19274)) (19385 20609 (DEFINEKEYBOARD 
+19395 . 20607)) (20610 24555 (VKBD.ADD-ITEM-TO-BACKGROUND-MENU 20620 . 21028) (VKBD.INIT 21030 . 22982
+) (VKBD.CREATE-DEFAULT-KEYBOARD 22984 . 23576) (VKBD.ADD-DEFAULT-KEYBOARD 23578 . 24553)) (24556 30484
+ (VKBD.LOAD-FILE-COMMAND 24566 . 25020) (VKBD.LOAD-KEYBOARD-FILE 25022 . 28445) (
+VKBD.STORE-FILE-COMMAND 28447 . 28788) (VKBD.STORE-KEYBOARD-FILE 28790 . 30482)) (30485 39786 (
+SWITCHKEYBOARDS 30495 . 31973) (VKBD.POP-MENU-AND-SWITCH-KEYBOARDS 31975 . 32345) (
+VKBD.POP-UP-KEYBOARDS-MENU 32347 . 33729) (VKBD.GET-CONFIGURATION 33731 . 34649) (
+VKBD.SUBCONFIGURATION 34651 . 39784)) (39787 80072 (VKBD.BUTTONEVENTFN 39797 . 42704) (
+VKBD.CENTER-BITMAP-IN-REGION 42706 . 44230) (VKBD.CLEAR-KEY-DISPLAY 44232 . 46363) (
+VKBD.CREATE-KEYBOARD-BITMAP 46365 . 48409) (VKBD.CREATE-KEYBOARD-DISPLAY 48411 . 51540) (
+VKBD.CURSORMOVEDFN 51542 . 53446) (VKBD.DISPLAY-CHARACTER 53448 . 55406) (VKBD.DISPLAY-EMPTY-KEY-CAP 
+55408 . 65946) (VKBD.DISPLAY-KEY 65948 . 69155) (VKBD.DISPLAY-KEY-CHARACTERS 69157 . 70350) (
+VKBD.DRAW-KEY-CAPS 70352 . 72540) (VKBD.ERASE-FRAME 72542 . 72865) (VKBD.EXTEND-REGION 72867 . 73456) 
+(VKBD.GET-KEY-AND-REGIONS-OF-CURSOR-POSITION 73458 . 74073) (VKBD.GET-KEY-REGIONS 74075 . 74331) (
+VKBD.INVERT-KEY 74333 . 74623) (VKBD.INVERT-REGION 74625 . 75316) (VKBD.KEYBOARD-WINDOW-REPAINTFN 
+75318 . 77275) (VKBD.LOWER-HALF-REGION 77277 . 77677) (VKBD.POSITION-IS-IN-KEY-REGION 77679 . 77963) (
+VKBD.REMOVE-KEYBOARD-COMMAND 77965 . 78422) (VKBD.UNION-REGIONS 78424 . 79569) (VKBD.UPPER-HALF-REGION
+ 79571 . 80070)) (80073 99631 (VKBD.KEY-ASSOC 80083 . 80583) (VKBD.CHAR-ASSIGNMENTP 80585 . 80749) (
+VKBD.COMPLETE-KEYBOARD 80751 . 83410) (VKBD.CTRL-ASSIGNMENTP 83412 . 83655) (VKBD.EVENT-ASSIGNMENTP 
+83657 . 83897) (VKBD.META-ASSIGNMENTP 83899 . 84142) (VKBD.FRAME-KEY 84144 . 86021) (
+VKBD.GET-CURRENT-KEY-ASSIGNMENT 86023 . 86392) (VKBD.GET-NON-CHAR-LABEL 86394 . 87049) (VKBD.ICONFN 
+87051 . 87787) (VKBD.INVERT-LOCK-KEYS 87789 . 88467) (VKBD.INVERT-SHIFT-KEYS 88469 . 89151) (
+VKBD.TRANSLATE-KEY-ID 89153 . 89832) (VKBD.KEY-ID-TO-KEY-NAMES 89834 . 90320) (
+VKBD.KEYBOARD-IS-KEYBOARDTYPE-KEYBOARD 90322 . 90920) (VKBD.LOCK-ASSIGNMENTP 90922 . 91369) (
+VKBD.LOCK-KEYP 91371 . 91689) (VKBD.LOCK/NOLOCK 91691 . 91850) (VKBD.LOCKDOWN-ASSIGNMENTP 91852 . 
+92146) (VKBD.LOCKUP-ASSIGNMENTP 92148 . 92438) (VKBD.PARSE-CHAR-CODE 92440 . 92939) (
+VKBD.PARSE-KEY-ASSIGNMENT 92941 . 96397) (VKBD.RESET-KEYBOARD-WINDOW 96399 . 96992) (
+VKBD.SEND-CHARACTER 96994 . 98503) (VKBD.SHIFT-ASSIGNMENTP 98505 . 98899) (VKBD.SHIFTED-CHAR 98901 . 
+99059) (VKBD.UNDEFINE-KEYBOARD 99061 . 99468) (VKBD.UNSHIFTED-CHAR 99470 . 99629)) (112553 114999 (
+VKBD.\\KEYBOARDEVENTFN 112563 . 113766) (VKBD.RESETKEYACTIONTABLES 113768 . 114997)) (115105 121256 (
+NEWKEYACTION 115115 . 121254)) (121893 138081 (FIXKEYBOARD 121903 . 123023) (FIXKEYBOARDCONFIG 123025
+ . 130249) (FIXKEYASSIGNMENTS 130251 . 138079)) (138168 140132 (METASHIFT 138178 . 140130)))))
 STOP

lispusers/COMMON-MAKE

@@ -1,27 +1,26 @@
-(DEFINE-FILE-INFO READTABLE "INTERLISP" PACKAGE "INTERLISP")
-
(FILECREATED "11-Dec-87 14:48:16" {DSK}<XAVIER>COMMON-MAKE.;5
 15290  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (VARS COMMON-MAKECOMS)
-                    (FNS COMMON-FILE-COMMAND COMMON-MAKEFILE)
-                    (PROPS (COMMON-MAKE MAKEFILE-ENVIRONMENT))
+
(FILECREATED "13-Oct-2023 16:40:48" {LU}COMMON-MAKE.;2
 14315  
 
-      previous date%: "11-Dec-87 12:53:46" {DSK}<XAVIER>COMMON-MAKE.;1)
+      :EDIT-BY "mth"
 
+      :CHANGES-TO (VARS COMMON-MAKECOMS)
+
+      :PREVIOUS-DATE "11-Dec-87 14:48:16" {LU}COMMON-MAKE.;1)
 
-(* "
-Copyright (c) 1987 by Unisys Corp..  All rights reserved.
-")
 
 (PRETTYCOMPRINT COMMON-MAKECOMS)
 
-(RPAQQ COMMON-MAKECOMS
 ((* FUNCTIONS TO HANDLE WRITING STANDARD COMMONLISP SOURCE FILES)
+(RPAQQ COMMON-MAKECOMS
 [
+                        (* ;; "FUNCTIONS TO HANDLE WRITING STANDARD COMMONLISP SOURCE FILES")

+
                         (FNS COMMON-FILE-COMMAND COMMON-MAKEFILE)
                         (PROP MAKEFILE-ENVIRONMENT COMMON-MAKE)
-                        (EDITHIST COMMON-MAKE)))
+                        (DECLARE%: DONTCOPY (ALISTS (EDITHISTALIST COMMON-MAKE])
 
 
 
-(* FUNCTIONS TO HANDLE WRITING STANDARD COMMONLISP SOURCE FILES)

+(* ;; "FUNCTIONS TO HANDLE WRITING STANDARD COMMONLISP SOURCE FILES")

 
 (DEFINEQ
 
@@ -227,30 +226,20 @@ Copyright (c) 1987 by Unisys Corp..  All rights reserved.
                                        (CLOSEF *STANDARD-OUTPUT*])
 )
 
-(PUTPROPS COMMON-MAKE MAKEFILE-ENVIRONMENT
 (:READTABLE "INTERLISP" :PACKAGE "INTERLISP"))
+(PUTPROPS COMMON-MAKE
 MAKEFILE-ENVIRONMENT
 (:READTABLE "INTERLISP" :PACKAGE "INTERLISP"))
 (DECLARE%: DONTCOPY 
 
-(ADDTOVAR EDITHISTALIST
 (COMMON-MAKE ("11-Dec-87 12:54:22" DJVB {DSK}<XAVIER>COMMON-MAKE.;1
-                                            (COMMON-FILE-COMMAND COMMON-MAKEFILE))
-                               ("11-Dec-87 13:35:35" DJVB {DSK}<XAVIER>COMMON-MAKE.;2 (
-                                                                                  COMMON-FILE-COMMAND
-                                                                                       
-                                                                                      COMMON-MAKEFILE
-                                                                                       )
-                                      (GETTING DETAILS RIGHT))
-                               ("11-Dec-87 13:40:48" DJVB {DSK}<XAVIER>COMMON-MAKE.;3 (
-                                                                                  COMMON-FILE-COMMAND
-                                                                                       ))
-                               ("11-Dec-87 14:09:04" DJVB {DSK}<XAVIER>COMMON-MAKE.;4 (
-                                                                                  COMMON-FILE-COMMAND
-                                                                                       ))
-                               ("11-Dec-87 14:48:44" DJVB {DSK}<XAVIER>COMMON-MAKE.;5 (
-                                                                                  COMMON-FILE-COMMAND
-                                                                                       )
-                                      (FIXED FILE COMMENTS AND CL:DEFVAR ET AL))))
+(ADDTOVAR EDITHISTALIST

+          (COMMON-MAKE ("11-Dec-87 12:54:22" DJVB {DSK}<XAVIER>COMMON-MAKE.;1 (COMMON-FILE-COMMAND
+                                                                               COMMON-MAKEFILE))
+                 ("11-Dec-87 13:35:35" DJVB {DSK}<XAVIER>COMMON-MAKE.;2 (COMMON-FILE-COMMAND 
+                                                                               COMMON-MAKEFILE)
+                        (GETTING DETAILS RIGHT))
+                 ("11-Dec-87 13:40:48" DJVB {DSK}<XAVIER>COMMON-MAKE.;3 (COMMON-FILE-COMMAND))
+                 ("11-Dec-87 14:09:04" DJVB {DSK}<XAVIER>COMMON-MAKE.;4 (COMMON-FILE-COMMAND))
+                 ("11-Dec-87 14:48:44" DJVB {DSK}<XAVIER>COMMON-MAKE.;5 (COMMON-FILE-COMMAND)
+                        (FIXED FILE COMMENTS AND CL:DEFVAR ET AL))))
 )
-(PUTPROPS COMMON-MAKE COPYRIGHT ("Unisys Corp." 1987))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (829 13460 (COMMON-FILE-COMMAND 839 . 9055) (COMMON-MAKEFILE 9057 . 13458)))))
+  (FILEMAP (NIL (722 13353 (COMMON-FILE-COMMAND 732 . 8948) (COMMON-MAKEFILE 8950 . 13351)))))
 STOP
-ÿ

lispusers/COMPAREDIRECTORIES

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 3-Oct-2022 12:03:37" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>lispusers>COMPAREDIRECTORIES.;252
 128695 
+
(FILECREATED "29-Sep-2023 17:25:57" {WMEDLEY}<lispusers>COMPAREDIRECTORIES.;257
 130870 
 
-      :CHANGES-TO (FNS CDFILES)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "14-Aug-2022 12:13:45" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>lispusers>COMPAREDIRECTORIES.;250)
+      :CHANGES-TO (FNS COMPAREDIRECTORIES COMPAREDIRECTORIES.INFOS)
+
+      :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)
-                          ELSEIF
 (MEMB (FILENAMEFIELD FILE 'EXTENSION)
-                                       '(TXT TEXT SH MD C))
+             (SETQ TYPE (IF
 (SETQ DATE (TEDIT.FILEDATE FILE))
+                            THEN
 'TEDIT
+                          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
-              JOIN
 (SETQ UNPACK (UNPACKFILENAME P))
-                   (SETQ SD (LISTGET UNPACK 'SUBDIRECTORY)) 
+      ELSE
 (FOR
 P N E SD DEPTH UNPACK INSIDE
 PATTERNS
+              JOIN
 (SETQ UNPACK (UNPACKFILENAME.STRING P))   (* ; 
+
                                              "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 '*)
-                               THEN
 MAX.SMALLP
-                             ELSE
 (FOR
 I (CNT _ 1) FROM
 1 DO
 (SELCHARQ (NTHCHARCODE SD I)
-                                                                  ((/ >) 
-                                                                       (ADD
 CNT 1))
-                                                                  (NIL (RETURN CNT))
-                                                                  NIL]
+                   [SETQ DEPTH (IF
 (EQ SD '*)
+                                   THEN
 MAX.SMALLP
+                                 ELSE
 (FOR
 I (CNT _ 1) FROM
 1 DO
 (SELCHARQ (NTHCHARCODE SD I)
+                                                                      ((/ >) 
+                                                                           (ADD
 CNT 1))
+                                                                      (NIL (RETURN CNT))
+                                                                      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))
-                              NC2 _ (ADD1 (NCHARS DIR2)) IN
 (CDR CDS)
+                   (SORT [FOR
 CDV (NC1 _ (ADD1 (NCHARS DIR1)))
+                              (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) (
-COMPAREDIRECTORIES.CANDIDATES 10345 . 13730) (CDENTRIES.SELECT 13732 . 18507) (
-COMPAREDIRECTORIES.INFOS.TYPE 18509 . 19415) (MATCHNAME 19417 . 20097) (CD.INSURECDVALUE 20099 . 21713
-) (CD.UPDATEWIDTHS 21715 . 22179)) (22182 32000 (CDFILES 22192 . 28094) (CDFILES.MATCH 28096 . 29721) 
-(CDFILES.PATS 29723 . 31998)) (32001 49822 (CDPRINT 32011 . 34528) (CDPRINT.HEADER 34530 . 35427) (
-CDPRINT.LINE 35429 . 38661) (CDPRINT.MAXWIDTHS 38663 . 42778) (CDPRINT.COLHEADERS 42780 . 44065) (
-CDPRINT.COLUMNS 44067 . 49187) (CDTEDIT 49189 . 49820)) (49823 58192 (CDMAP 49833 . 51265) (CDENTRY 
-51267 . 51576) (CDSUBSET 51578 . 53017) (CDMERGE 53019 . 56873) (CDMERGE.COMMON 56875 . 58190)) (58193
- 65731 (BINCOMP 58203 . 62492) (EOLTYPE 62494 . 65056) (EOLTYPE.SHOW 65058 . 65729)) (66259 78786 (
-FIND-UNCOMPILED-FILES 66269 . 69912) (FIND-UNSOURCED-FILES 69914 . 72298) (FIND-SOURCE-FILES 72300 . 
-74038) (FIND-COMPILED-FILES 74040 . 75917) (FIND-UNLOADED-FILES 75919 . 76772) (FIND-LOADED-FILES 
-76774 . 77202) (FIND-MULTICOMPILED-FILES 77204 . 78784)) (78787 87218 (CREATED-AS 78797 . 83594) (
-SOURCE-FOR-COMPILED-P 83596 . 86523) (COMPILE-SOURCE-DATE-DIFF 86525 . 87216)) (87219 97525 (
-FIX-DIRECTORY-DATES 87229 . 90222) (FIX-EQUIV-DATES 90224 . 91749) (COPY-COMPARED-FILES 91751 . 93572)
- (COPY-MISSING-FILES 93574 . 95731) (COMPILED-ON-SAME-SOURCE 95733 . 97523)) (97719 105557 (CDBROWSER 
-97729 . 101656) (CDBROWSER.STRINGS 101658 . 105555)) (105719 107455 (CD.TABLEITEM 105729 . 105949) (
-CD.TABLEITEM.PRINTFN 105951 . 106150) (CD.TABLEITEM.COPYFN 106152 . 107210) (
-CDTABLEBROWSER.HEADING.REPAINTFN 107212 . 107453)) (107456 128111 (CDTABLEBROWSER.WHENSELECTEDFN 
-107466 . 107934) (CD.COMMANDSELECTEDFN 107936 . 113037) (CD-MENUFN 113039 . 117350) (CD-COMPARE-FILES 
-117352 . 120704) (CDBROWSER-COPY 120706 . 124375) (CDBROWSER-DELETE-FILE 124377 . 127590) (CD-SWAPDIRS
- 127592 . 128109)))))
+  (FILEMAP (NIL (2651 22769 (COMPAREDIRECTORIES 2661 . 7751) (COMPAREDIRECTORIES.INFOS 7753 . 10711) (
+COMPAREDIRECTORIES.CANDIDATES 10713 . 14098) (CDENTRIES.SELECT 14100 . 18875) (
+COMPAREDIRECTORIES.INFOS.TYPE 18877 . 20003) (MATCHNAME 20005 . 20685) (CD.INSURECDVALUE 20687 . 22301
+) (CD.UPDATEWIDTHS 22303 . 22767)) (22770 33392 (CDFILES 22780 . 28794) (CDFILES.MATCH 28796 . 30421) 
+(CDFILES.PATS 30423 . 33390)) (33393 51214 (CDPRINT 33403 . 35920) (CDPRINT.HEADER 35922 . 36819) (
+CDPRINT.LINE 36821 . 40053) (CDPRINT.MAXWIDTHS 40055 . 44170) (CDPRINT.COLHEADERS 44172 . 45457) (
+CDPRINT.COLUMNS 45459 . 50579) (CDTEDIT 50581 . 51212)) (51215 60336 (CDMAP 51225 . 52657) (CDENTRY 
+52659 . 52968) (CDSUBSET 52970 . 54409) (CDMERGE 54411 . 58395) (CDMERGE.COMMON 58397 . 59712) (
+CD.SORT 59714 . 60334)) (60337 67875 (BINCOMP 60347 . 64636) (EOLTYPE 64638 . 67200) (EOLTYPE.SHOW 
+67202 . 67873)) (68403 80930 (FIND-UNCOMPILED-FILES 68413 . 72056) (FIND-UNSOURCED-FILES 72058 . 74442
+) (FIND-SOURCE-FILES 74444 . 76182) (FIND-COMPILED-FILES 76184 . 78061) (FIND-UNLOADED-FILES 78063 . 
+78916) (FIND-LOADED-FILES 78918 . 79346) (FIND-MULTICOMPILED-FILES 79348 . 80928)) (80931 89362 (
+CREATED-AS 80941 . 85738) (SOURCE-FOR-COMPILED-P 85740 . 88667) (COMPILE-SOURCE-DATE-DIFF 88669 . 
+89360)) (89363 99669 (FIX-DIRECTORY-DATES 89373 . 92366) (FIX-EQUIV-DATES 92368 . 93893) (
+COPY-COMPARED-FILES 93895 . 95716) (COPY-MISSING-FILES 95718 . 97875) (COMPILED-ON-SAME-SOURCE 97877
+ . 99667)) (99863 107701 (CDBROWSER 99873 . 103800) (CDBROWSER.STRINGS 103802 . 107699)) (107863 
+109599 (CD.TABLEITEM 107873 . 108093) (CD.TABLEITEM.PRINTFN 108095 . 108294) (CD.TABLEITEM.COPYFN 
+108296 . 109354) (CDTABLEBROWSER.HEADING.REPAINTFN 109356 . 109597)) (109600 130255 (
+CDTABLEBROWSER.WHENSELECTEDFN 109610 . 110078) (CD.COMMANDSELECTEDFN 110080 . 115181) (CD-MENUFN 
+115183 . 119494) (CD-COMPARE-FILES 119496 . 122848) (CDBROWSER-COPY 122850 . 126519) (
+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" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>lispusers>COMPARESOURCES.;128
 39655  
+
(FILECREATED "17-Jun-2023 15:22:40" {WMEDLEY}<lispusers>COMPARESOURCES.;131
 39663  
 
-      :CHANGES-TO (FNS COMPARESOURCES CSBROWSER \CS.EXAMINE)
-                  (VARS COMPARESOURCESCOMS)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE "12-May-2022 10:17:13" 
-{DSK}<users>kaplan>local>medley3.5>working-medley>lispusers>COMPARESOURCES.;123)
+      :CHANGES-TO (FNS CSBROWSER \CS.COMPARE.MASTERS)
+
+      :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)
-         (SETQ BODYX (CL:REMOVE-IF (FUNCTION EDITDATE?)
-                            BODYX))                          (* ; 
+    (LET (THING2 THING1 PRED DIFS TMP)
+         (SETQ BODY1 (CL:REMOVE-IF (FUNCTION EDITDATE?)
+                            BODY1))                          (* ; 
 
                                                             "We don't care about editdate comments")

-         (SETQ BODYY (CL:REMOVE-IF (FUNCTION EDITDATE?)
-                            BODYY))
-         (SETQ BODYX (\CS.FIXFNS
 BODYX))
-         (SETQ BODYY (\CS.FIXFNS
 BODYY))
-         (CL:WHEN (AND (SETQ XTHING (ASSOC 'DEFINE-FILE-INFO BODYX))
-                       (SETQ YTHING (ASSOC 'DEFINE-FILE-INFO BODYY))
-                       (\CS.COMPARE.DEFINE-FILE-INFO
 XTHING YTHING))
-             (SETQ BODYX (REMOVE XTHING BODYX))
-             (SETQ BODYY (REMOVE YTHING BODYY)))
+         (SETQ BODY2 (CL:REMOVE-IF (FUNCTION EDITDATE?)
+                            BODY2))
+         (SETQ BODY1 (\CS.FIXFNS
 BODY1))
+         (SETQ BODY2 (\CS.FIXFNS
 BODY2))
+         (CL:WHEN (AND (SETQ THING1 (ASSOC 'DEFINE-FILE-INFO BODY1))
+                       (SETQ THING2 (ASSOC 'DEFINE-FILE-INFO BODY2))
+                       (\CS.COMPARE.DEFINE-FILE-INFO
 THING1 THING2))
+             (SETQ BODY1 (REMOVE THING1 BODY1))
+             (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 BODYY (CL:SET-DIFFERENCE BODYY YTHING :TEST (FUNCTION EQUALALL)))
-                     (CL:WHEN (SETQ DIFS (\CS.COMPARE.TYPES
 XTHING YTHING
+                     (SETQ BODY1 (CL:SET-DIFFERENCE BODY1 THING1 :TEST (FUNCTION EQUALALL)))
+                     (SETQ BODY2 (CL:SET-DIFFERENCE BODY2 THING2 :TEST (FUNCTION EQUALALL)))
+                     (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)))
-                      (SETQ YTHING (for
 X in
 BODYY collect
 X when
 (CL:FUNCALL PRED X]
-            do
 (SETQ BODYX (CL:SET-DIFFERENCE BODYX XTHING :TEST (FUNCTION EQUALALL)))
-               (SETQ BODYY (CL:SET-DIFFERENCE BODYY YTHING :TEST (FUNCTION EQUALALL)))
-               (CL:WHEN [SETQ DIFS (\CS.COMPARE.TYPES
 XTHING YTHING (OR (fetch
 (CSTYPE TITLE)
+            WHEN
 [AND (SETQ THING1 (for
 X in
 BODY1 collect
 X when
 (CL:FUNCALL PRED X)))
+                      (SETQ THING2 (for
 X in
 BODY2 collect
 X when
 (CL:FUNCALL PRED X]
+            do
 (SETQ BODY1 (CL:SET-DIFFERENCE BODY1 THING1 :TEST (FUNCTION EQUALALL)))
+               (SETQ BODY2 (CL:SET-DIFFERENCE BODY2 THING2 :TEST (FUNCTION EQUALALL)))
+               (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 BODYX (CL:SET-DIFFERENCE
-                                                               BODYX BODYY :TEST
+         (SETQ BODY2 (CL:SET-DIFFERENCE BODY2 (PROG1 BODY1
+                                                  (SETQ BODY1 (CL:SET-DIFFERENCE
+                                                               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
-                               (BODYY (COMPARELISTS BODYX BODYY COMPARESTREAM)
-                                      (\CS.EXAMINE
 BODYX BODYY NIL 'Expression))
+                     [BODY1 (COND
+                               (BODY2 (COMPARELISTS BODY1 BODY2 COMPARESTREAM)
+                                      (\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)
-                            (FOR
 Y IN
 BODYY DO
 (LVLPRINT Y COMPARESTREAM 2 3)
+                     (BODY2 (printout COMPARESTREAM "These are not on File 1:" T)
+                            (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)
-                    (INFILEP FILEX)
-                    (FINDFILE FILEX NIL DIRECTORIES)
-                    (ERROR "FILE NOT FOUND" FILEX)))
-    (SETQ FILEY (OR (STREAMP FILEY)
-                    (INFILEP FILEY)
-                    (FINDFILE FILEY NIL DIRECTORIES)
-                    (ERROR "FILE NOT FOUND" FILEY)))
-    (CL:UNLESS (LISPSOURCEFILEP FILEX)
-           (ERROR FILEX " is not a Medley source file"))
-    (CL:UNLESS (LISPSOURCEFILEP FILEY)
-           (ERROR FILEX " is not a Medley source file"))
+    (SETQ FILE1 (OR (STREAMP FILE1)
+                    (INFILEP FILE1)
+                    (FINDFILE FILE1 NIL DIRECTORIES)
+                    (ERROR "FILE NOT FOUND" FILE1)))
+    (SETQ FILE2 (OR (STREAMP FILE2)
+                    (INFILEP FILE2)
+                    (FINDFILE FILE2 NIL DIRECTORIES)
+                    (ERROR "FILE NOT FOUND" FILE2)))
+    (CL:UNLESS (LISPSOURCEFILEP FILE1)
+           (ERROR FILE1 " is not a Medley source file"))
+    (CL:UNLESS LABEL1
+        (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
-                                                                   'BODY FILEX))
-                           " and "
-                           (OR LABEL2 (PACKFILENAME 'HOST NIL 'DIRECTORY NIL 'BODY FILEY])
+        (SETQ TITLE (CONCAT "COMPARESOURCES of " LABEL1 " and " LABEL2)))
     (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) (
-\CS.COMPARE.TYPES 15417 . 18683) (\CS.EXAMINE 18685 . 21863) (\CS.FIXFNS 21865 . 23367) (
-\CS.SORT.DECLARES 23369 . 23712) (\CS.SORT.DECLARE1 23714 . 25134) (\CS.FILTER.GARBAGE 25136 . 25614))
- (25617 30153 (\CS.ISFNFORM 25627 . 25895) (\CS.COMPARE.FNS 25897 . 26139) (\CS.FNSID 26141 . 26285) (
-\CS.ISVARFORM 26287 . 26392) (\CS.COMPARE.VARS 26394 . 27056) (\CS.ISMACROFORM 27058 . 27196) (
-\CS.ISRECFORM 27198 . 27526) (\CS.REC.NAME 27528 . 27847) (\CS.ISCOURIERFORM 27849 . 27949) (
-\CS.ISTEMPLATEFORM 27951 . 28049) (\CS.COMPARE.TEMPLATES 28051 . 28416) (\CS.ISPROPFORM 28418 . 28573)
- (\CS.PROP.NAME 28575 . 28720) (\CS.COMPARE.PROPS 28722 . 28879) (\CS.ISADDVARFORM 28881 . 28974) (
-\CS.COMPARE.ADDVARS 28976 . 29141) (\CS.ISFPKGCOMFORM 29143 . 29350) (\CS.COMPARE.FPKGCOMS 29352 . 
-29559) (\CS.COMPARE.DEFINE-FILE-INFO 29561 . 30151)) (30154 36218 (CSOBJ.CREATE 30164 . 30577) (
-CSOBJ.DISPLAYFN 30579 . 31332) (CSOBJ.IMAGEBOXFN 31334 . 33495) (CSOBJ.BUTTONEVENTINFN 33497 . 35968) 
-(CSOBJ.COPYBUTTONEVENTINFN 35970 . 36216)) (37099 39228 (CSBROWSER 37109 . 39226)))))
+  (FILEMAP (NIL (1751 25612 (COMPARESOURCES 1761 . 7888) (\CS.COMPARE.MASTERS 7890 . 15411) (
+\CS.COMPARE.TYPES 15413 . 18679) (\CS.EXAMINE 18681 . 21859) (\CS.FIXFNS 21861 . 23363) (
+\CS.SORT.DECLARES 23365 . 23708) (\CS.SORT.DECLARE1 23710 . 25130) (\CS.FILTER.GARBAGE 25132 . 25610))
+ (25613 30149 (\CS.ISFNFORM 25623 . 25891) (\CS.COMPARE.FNS 25893 . 26135) (\CS.FNSID 26137 . 26281) (
+\CS.ISVARFORM 26283 . 26388) (\CS.COMPARE.VARS 26390 . 27052) (\CS.ISMACROFORM 27054 . 27192) (
+\CS.ISRECFORM 27194 . 27522) (\CS.REC.NAME 27524 . 27843) (\CS.ISCOURIERFORM 27845 . 27945) (
+\CS.ISTEMPLATEFORM 27947 . 28045) (\CS.COMPARE.TEMPLATES 28047 . 28412) (\CS.ISPROPFORM 28414 . 28569)
+ (\CS.PROP.NAME 28571 . 28716) (\CS.COMPARE.PROPS 28718 . 28875) (\CS.ISADDVARFORM 28877 . 28970) (
+\CS.COMPARE.ADDVARS 28972 . 29137) (\CS.ISFPKGCOMFORM 29139 . 29346) (\CS.COMPARE.FPKGCOMS 29348 . 
+29555) (\CS.COMPARE.DEFINE-FILE-INFO 29557 . 30147)) (30150 36214 (CSOBJ.CREATE 30160 . 30573) (
+CSOBJ.DISPLAYFN 30575 . 31328) (CSOBJ.IMAGEBOXFN 31330 . 33491) (CSOBJ.BUTTONEVENTINFN 33493 . 35964) 
+(CSOBJ.COPYBUTTONEVENTINFN 35966 . 36212)) (37095 39236 (CSBROWSER 37105 . 39234)))))
 STOP