Remove extra scheduled Medley builds that were added for testing purposes last weeek. (#1615)

Add TEDIT.XYTOCH for Notecards

.github/workflows/Dockerfile_medley

@@ -7,7 +7,7 @@
 #
 # ******************************************************************************
 
-FROM ubuntu:22.10
+FROM ubuntu:22.04
 ARG TARGETPLATFORM
 
 #  Handle ARGs, ENV variables, and LABELs
@@ -31,6 +31,12 @@ ENV LANG=C.UTF-8
 # Copy over the release deb files
 ADD ./*.deb /tmp
 
+# Get tzdata setup ahead of time
+RUN apt-get update; \
+    ln -fs /usr/share/zoneinfo/America/Los_Angeles /etc/localtime; \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y tzdata; \
+    dpkg-reconfigure --frontend noninteractive tzdata
+
 # Install Medley/Maiko and add tightvnc server and xclip to the image
 RUN apt-get update                                               \
     && apt-get install -y apt-utils                              \ 
@@ -51,8 +57,8 @@ RUN apt-get update                                               \
                echo "x86_64";                                    \
            fi                                                    \
           )                                                      \
-    && deb="medley-full-${MEDLEY_RELEASE#medley-}"               \
-    && deb=${deb}_${MAIKO_RELEASE#maiko-}-linux-${p}.deb         \
+    && deb="medley-full-linux-${p}-${MEDLEY_RELEASE#medley-}"    \
+    && deb=${deb}_${MAIKO_RELEASE#maiko-}.deb                    \
     && apt-get install -y /tmp/${deb}                            \
     && chown --recursive root:root /usr/local/interlisp          \
     && (if [ -n "$(which unminimize)" ]; then (yes | unminimize); fi)

.github/workflows/buildDocker.yml

@@ -20,7 +20,7 @@ name: 'Build/Push Docker Image'
 # Run this workflow on ...
 on:
   workflow_dispatch:
-    inputs: 
+    inputs:
       draft:
         description: "Mark this as a draft release"
         type: choice
@@ -33,7 +33,7 @@ on:
         options:
         - 'false'
         - 'true'
-  
+
   workflow_call:
     outputs:
       successful:
@@ -59,35 +59,10 @@ on:
 defaults:
   run:
     shell: bash
-    
+
 
 jobs:
 
-######################################################################################
-
-  # Regularize the inputs so they can be referenced the same way whether they are
-  # the result of a workflow_dispatch or a workflow_call
-
-  inputs:
-    runs-on: ubuntu-latest
-    outputs:
-      draft: ${{ steps.one.outputs.draft }}
-      force: ${{ steps.one.outputs.force }}
-    steps:
-      - id: one
-        run: >
-          if [ '${{ toJSON(inputs) }}' = 'null'  ];
-          then
-              echo "workflow_dispatch";
-              echo "draft=${{ github.event.inputs.draft }}" >> $GITHUB_OUTPUT;
-              echo "force=${{ github.event.inputs.force }}" >> $GITHUB_OUTPUT;
-          else
-              echo "workflow_call";
-              echo "draft=${{ inputs.draft }}" >> $GITHUB_OUTPUT;
-              echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT;
-          fi
-        
-
 
 ######################################################################################
 
@@ -95,22 +70,21 @@ jobs:
   # based on the latest commit to the repo
 
   sentry:
-    needs: inputs
     runs-on: ubuntu-latest
     outputs:
       release_not_built: ${{ steps.check.outputs.release_not_built }}
 
-    steps: 
+    steps:
       # Checkout the actions for this repo owner
       - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/.github
           path: ./Actions_${{ github.sha }}
       - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
 
       # Check if build already run for this commit
-      - name: Build already completed? 
+      - name: Build already completed?
         id: check
         continue-on-error: true
         uses: ./../actions/check-sentry-action
@@ -127,22 +101,22 @@ jobs:
 
     runs-on: ubuntu-latest
 
-    needs: [inputs, sentry]
+    needs: [sentry]
     if: |
       needs.sentry.outputs.release_not_built == 'true'
-      || needs.inputs.outputs.force == 'true'
-    
+      || inputs.force == 'true'
+
     steps:
       # Checkout latest commit
       - name: Checkout Medley
-        uses: actions/checkout@v3
-  
+        uses: actions/checkout@v4
+
       # Find latest release (draft or normal)
       # and download its assets
       - name: Download linux debs from latest (draft) release
         run: |
           tag=""
-          if [ "${{ needs.inputs.outputs.draft }}" = "true" ];
+          if [ "${{ inputs.draft }}" = "true" ];
           then
             tag=$(gh release list | grep Draft | head -n 1 | awk '{ print $3 }')
           fi
@@ -160,7 +134,7 @@ jobs:
       - name: Get info about Miako and Medley releases
         id: release_info
         run: |
-          regex="^[^0-9]*\([^_]*\)_\([^-]*-[^-]*\)-\([^-]*\)-\([^.]*\).*\$"
+          regex="^medley-full-[^-]*-[^-]*-\([^_]*\)_\(.*\).deb\$"
           ls -1 release_debs | head -n 1 > debname.tmp
           medley_release="medley-$(sed -e "s/${regex}/\1/" debname.tmp)"
           maiko_release="maiko-$(sed -e "s/${regex}/\2/" debname.tmp)"
@@ -168,6 +142,8 @@ jobs:
           echo "MEDLEY_RELEASE=${medley_release}"     >> ${GITHUB_ENV}
           echo "MAIKO_RELEASE=${maiko_release}"       >> ${GITHUB_ENV}
 
+          # regex="^[^0-9]*\([^_]*\)_\([^-]*-[^-]*\)-\([^-]*\)-\([^.]*\).*\$"
+
       # Set repo env variables
       - name: Set repo/docker env variables
         id: repo_env
@@ -175,11 +151,11 @@ jobs:
           repo_name="${GITHUB_REPOSITORY#*/}"
           docker_namespace="$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')"
           docker_image="${docker_namespace}/${repo_name}"
-          if [ "${{ needs.inputs.outputs.draft }}" = "false" ];
-          then 
+          if [ "${{ inputs.draft }}" = "false" ];
+          then
               docker_tags="${docker_image}:latest,${docker_image}:${MEDLEY_RELEASE#*-}_${MAIKO_RELEASE#*-}"
               platforms="linux/amd64,linux/arm64"
-          else 
+          else
               docker_tags="${docker_image}:draft"
               platforms="linux/amd64"
           fi
@@ -193,18 +169,18 @@ jobs:
 
       # Setup the Docker Machine Emulation environment.  
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@master
+        uses: docker/setup-qemu-action@v3
         with:
           platforms: linux/amd64,linux/arm64,linux/arm/v7
 
       # Setup the Docker Buildx funtion
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@master
+        uses: docker/setup-buildx-action@v3
 
       # Login into DockerHub - required to store the created image
       - name: Login to DockerHub
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
@@ -213,7 +189,7 @@ jobs:
       # checked out and the release tars just downloaded.
       # Push the result to Docker Hub
       - name: Build Docker Image for Push to Docker Hub
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           builder: ${{ steps.buildx.outputs.name }}
           build-args: |
@@ -240,12 +216,12 @@ jobs:
     outputs:
       build_successful: ${{ steps.output.outputs.build_successful }}
 
-    needs: [inputs, sentry, build_and-push]
+    needs: [sentry, build_and-push]
 
-    steps: 
+    steps:
       # Checkout the actions for this repo owner
       - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/.github
           path: ./Actions_${{ github.sha }}
@@ -257,10 +233,10 @@ jobs:
         uses: ./../actions/set-sentry-action
         with:
           tag: "docker"
-     
+
       - name: Output
         id: output
         run: |
           echo "build_successful='true'" >> ${GITHUB_OUTPUT}
-          
+
 ######################################################################################

.github/workflows/buildLoadup.yml

@@ -60,39 +60,12 @@ defaults:
 
 jobs:
 
-######################################################################################
-
-  # Regularize the inputs so they can be referenced the same way whether they are
-  # the result of a workflow_dispatch or a workflow_call
-
-  inputs:
-    runs-on: ubuntu-latest
-    outputs:
-      draft: ${{ steps.one.outputs.draft }}
-      force: ${{ steps.one.outputs.force }}
-    steps:
-      - id: one
-        run: >
-          if [ '${{ toJSON(inputs) }}' = 'null'  ];
-          then
-              echo "workflow_dispatch";
-              echo "draft=${{ github.event.inputs.draft }}" >> $GITHUB_OUTPUT;
-              echo "force=${{ github.event.inputs.force }}" >> $GITHUB_OUTPUT;
-          else
-              echo "workflow_call";
-              echo "draft=${{ inputs.draft }}" >> $GITHUB_OUTPUT;
-              echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT;
-          fi
-
-
-
-######################################################################################
+# JOB: sentry #######################################################################
 
   # Use sentry-action to determine if this release has already been built
   # based on the latest commit to the repo
 
   sentry:
-    needs: inputs
     runs-on: ubuntu-latest
     outputs:
       release_not_built: ${{ steps.check.outputs.release_not_built }}
@@ -100,7 +73,7 @@ jobs:
     steps:
       # Checkout the actions for this repo owner
       - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/.github
           path: ./Actions_${{ github.sha }}
@@ -114,11 +87,11 @@ jobs:
         with:
           tag: "loadup"
 
-######################################################################################
 
+# JOB: loadup #######################################################################
 
   #
-  # Do the loadup
+  # Do the loadup and push to release on github
   # 
 
   loadup:
@@ -130,16 +103,19 @@ jobs:
       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 }}
 
-    needs: [inputs, sentry]
+    needs: [sentry]
     if: |
       needs.sentry.outputs.release_not_built == 'true'
-      || needs.inputs.outputs.force == 'true'
+      || inputs.force == 'true'
 
     steps:
       # Checkout the actions for this repo owner
       - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/.github
           path: ./Actions_${{ github.sha }}
@@ -147,31 +123,43 @@ jobs:
 
       # Checkout latest commit
       - name: Checkout Medley
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Setup release tag
       - name: Setup Release Tag
         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
-      - name: Get Maiko Release Information
+      # Find latest release (draft or normal)
+      - name: Get maiko release information
         id: maiko
-        uses: abatilo/release-info-action@v1.3.2
-        with:
-          owner: ${{ github.repository_owner }}
-          repo: maiko
-
+        run: |
+          tag=""
+          if [ "${{ inputs.draft }}" = "true" ];
+          then
+            gh release list --repo ${{ github.repository_owner }}/maiko | grep Draft >/tmp/releases-$$
+            if [ $? -eq 0 ];
+            then
+              tag=$(head -n 1 /tmp/releases-$$ | awk '{ print $3 }')
+            fi
+          fi
+          if [ -z "${tag}" ];
+          then
+            tag=$(gh release list --repo ${{ github.repository_owner }}/maiko | grep Latest | head -n 1 | awk '{ print $3 }')
+          fi
+          echo "maiko_tag=${tag}" >> ${GITHUB_OUTPUT}
+        env:
+          GITHUB_TOKEN: ${{ secrets.MAIKO_TOKEN }}
       # Setup environment variables & establish job outputs
       - name: Setup Environment Variables
         run: |
           echo "build_time=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> ${GITHUB_OUTPUT}
-          echo "TARBALL_DIR=installers/deb/tmp/tarballs" >>${GITHUB_ENV}
-          echo "DEBS_DIR=installers/deb/debs" >>${GITHUB_ENV}
-          echo "TARS_DIR=installers/deb/tars" >>${GITHUB_ENV}
+          echo "TARBALL_DIR=/tmp/tarballs" >>${GITHUB_ENV}
           echo "MEDLEY_RELEASE_TAG=${RELEASE_TAG}" >>${GITHUB_ENV}
-          echo "MAIKO_RELEASE_TAG=${{ steps.maiko.outputs.latest_tag }}" >>${GITHUB_ENV}
+          echo "MAIKO_RELEASE_TAG=${{ steps.maiko.outputs.maiko_tag }}" >>${GITHUB_ENV}
+          echo "ARTIFACTS_FILENAME_TEMPLATE=medley-full-@@PLATFORM@@-@@ARCH@@-@@MEDLEY.RELEASE@@_@@MAIKO.RELEASE@@" >>${GITHUB_ENV}
       - name: More Environment Variables
         run: |
           echo "MEDLEY_SHORT_RELEASE_TAG=${MEDLEY_RELEASE_TAG#medley-}" >>${GITHUB_ENV}
@@ -182,39 +170,38 @@ jobs:
       - name: Establish job outputs
         id: job_outputs
         run: |
-          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 "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
       - name: Create work dirs
         run: mkdir -p ${TARBALL_DIR}
 
-      # Download Maiko Release Assets
+      # Download Maiko Release Assets and untar it
       - name: Download Release Assets
-        uses: robinraju/release-downloader@v1.6
-        with:
-          repository: ${{ github.repository_owner }}/maiko
-          token: ${{ secrets.GITHUB_TOKEN }}
-          latest: true
-          out-file-path: ${{ env.TARBALL_DIR }}
-          fileName: "${{ env.MAIKO_RELEASE_TAG }}-linux.*.tgz"
-
-      - name: Untar Maiko Release for use in loadup
         run: |
-          tar -xzf "${TARBALL_DIR}/${{ env.MAIKO_RELEASE_TAG }}-linux.x86_64.tgz"
+          gh release download ${MAIKO_RELEASE_TAG} \
+                              -D ${TARBALL_DIR}    \
+                              --repo ${{ github.repository_owner }}/maiko \
+                              -p '*.tgz'
+          tar -xzf "${TARBALL_DIR}/${MAIKO_RELEASE_TAG}-linux.x86_64.tgz"
+        env:
+          GITHUB_TOKEN: ${{ secrets.MAIKO_TOKEN }}
 
       # Checkout Notecards and tar it in the tarballsdir
       - name: Checkout Notecards
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/notecards
           path: ./notecards
-      - run: mv ./notecards ../notecards
       - name: Tar notecards into tarball dir
         run: |
-          cd ..
-          tar cfz medley/${TARBALL_DIR}/notecards.tgz notecards
+          mv ./notecards ../notecards
+          cd ../notecards
+          git archive --format=tgz --output="${TARBALL_DIR}/notecards.tgz" --prefix=notecards/ main
 
       # Install vnc
       - name: Install vnc
@@ -224,7 +211,6 @@ jobs:
         run: |
           Xvnc -geometry 1280x720 :0 &
           export DISPLAY=":0"
-          PATH="$PWD/maiko:$PATH"
           scripts/loadup-all.sh -apps
           scripts/loadup-db.sh
 
@@ -233,15 +219,6 @@ jobs:
           scripts/release-make-tars.sh "${MEDLEY_RELEASE_TAG}"
           mv releases/"${MEDLEY_SHORT_RELEASE_TAG}"/*.tgz "${TARBALL_DIR}"
 
-      # Build the deb files as well as the tgz files
-      - name: Build .deb files for 3 architectures
-        id: debs
-        run: |
-          cd installers/deb
-          debs_filename_base=$(./build_deb.sh)
-          echo "DEBS_FILENAME_BASE=${debs_filename_base}" >> $GITHUB_ENV;
-          echo "DEBS_FILENAME_BASE=${debs_filename_base}" >> $GITHUB_OUTPUT;
-
       # Push the release up to github releases
       - name: Delete existing release with same tag (if any)
         uses: cb80/delrel@latest
@@ -249,40 +226,199 @@ jobs:
             tag: ${{ env.MEDLEY_RELEASE_TAG }}
         continue-on-error: true
 
+      - name: Push the release
+        id: push
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts:
+            # ${{ env.TARBALL_DIR }}/notecards.tgz,
+            ${{ env.TARBALL_DIR }}/${{ env.MEDLEY_RELEASE_TAG }}-loadups.tgz,
+            ${{ env.TARBALL_DIR }}/${{ env.MEDLEY_RELEASE_TAG }}-runtime.tgz
+          tag: ${{ env.MEDLEY_RELEASE_TAG }}
+          draft: ${{ inputs.draft }}
+          prerelease: false
+          generateReleaseNotes: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      # Save the tarball directory for subsequent jobs
+      - name: Save tarballs
+        uses: actions/upload-artifact@v4
+        with:
+          name: tarballs
+          path: ${{ env.TARBALL_DIR }}
+          if-no-files-found: error
+
+
+# JOB: linux_installer ##############################################################
+
+  #
+  # Create the linux installers (.deb and .tgz) and push to release on github
+  #
+  linux_installer:
+
+    runs-on: ubuntu-latest
+
+    needs: [sentry, loadup]
+    if: |
+      needs.sentry.outputs.release_not_built == 'true'
+      || inputs.force == 'true'
+
+    steps:
+
+      # Checkout latest commit
+      - name: Checkout Medley
+        uses: actions/checkout@v4
+
+      # Environment variables
+      - name: Environment variables
+        run: |
+          echo "DEBS_DIR=installers/deb/debs" >>${GITHUB_ENV}
+          echo "TARS_DIR=installers/deb/tars" >>${GITHUB_ENV}
+          echo "TARBALL_DIR=installers/deb/tmp/tarballs" >>${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 taball dir
+      - run: mkdir -p ${TARBALL_DIR}
+
+      #  Get the tarballs
+      - name: Get tarballs
+        uses: actions/download-artifact@v4
+        with:
+          name: tarballs
+          path: ${{ env.TARBALL_DIR }}
+
+      # Build the deb files as well as the tgz files
+      - name: Build .deb files for 3 architectures
+        id: debs
+        run: |
+          cd installers/deb
+          ./build_deb.sh
+
+      # Push the debs and tgz up to github releases
       - name: Push the release
         id: push_release
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
           artifacts:
-            ${{ env.TARBALL_DIR }}/${{ env.MEDLEY_RELEASE_TAG }}-loadups.tgz,
-            ${{ env.TARBALL_DIR }}/${{ env.MEDLEY_RELEASE_TAG }}-runtime.tgz,
             ${{ env.DEBS_DIR }}/*.deb,
             ${{ env.TARS_DIR }}/*.tgz
           tag: ${{ env.MEDLEY_RELEASE_TAG }}
-          draft: ${{ needs.inputs.outputs.draft }}
-          prerelease: false
-          generateReleaseNotes: true
           token: ${{ secrets.GITHUB_TOKEN }}
+          omitBodyDuringUpdate: true
+          omitDraftDuringUpdate: true
+          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@v4
+        with:
+          name: medley-tar
+          path: |
+            ${{ env.TARS_DIR }}/medley.tgz
+
+
+# JOB: macos_installer ##############################################################
+
+  #
+  # Create the macos installers (.dmg and .zip) and push to release on github
+  #
+  macos_installer:
+
+    runs-on: macos-12
+
+    needs: [sentry, loadup]
+    if: |
+      needs.sentry.outputs.release_not_built == 'true'
+      || inputs.force == 'true'
+#    if: false
+
+    defaults:
+      run:
+        shell: bash
+
+    steps:
+
+      # Checkout latest commit
+      - name: Checkout Medley
+        uses: actions/checkout@v4
+
+      # Environment variables
+      - name: Environment variables
+        run: |
+          MACOS_DIR=installers/macos
+          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 "ARTIFACTS_FILENAME_TEMPLATE=${{ needs.loadup.outputs.artifacts_filename_template }}" >>${GITHUB_ENV}
+
+      # Create tarball dir
+      - run: mkdir -p ${TARBALL_DIR}
+
+      #  Get the tarballs
+      - name: Get tarballs
+        uses: actions/download-artifact@v4
+        with:
+          name: tarballs
+          path: ${{ env.TARBALL_DIR }}
+
+      # Build the .dmg and .zip files
+      - name: Build .dmg & .zip files
+        id: dmg-zip
+        run: |
+          cd ${MACOS_DIR}
+          ./build_artifacts.sh
+
+      # Push the .dmg and .zip up to github releases
+      - name: Push the release
+        id: push_release
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts:
+            # 2023-07-20 not yet building dmg -- ${{ env.ARTIFACTS_DIR }}/*.dmg,
+            ${{ env.ARTIFACTS_DIR }}/*.zip
+          tag: ${{ env.MEDLEY_RELEASE_TAG }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          omitBodyDuringUpdate: true
+          omitDraftDuringUpdate: true
+          omitNameDuringUpdate: true
+          omitPrereleaseDuringUpdate: true
+
+
+
+# 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: [sentry, loadup, linux_installer]
     if: |
       needs.sentry.outputs.release_not_built == 'true'
-      || needs.inputs.outputs.force == 'true'
+      || inputs.force == 'true'
+
+    outputs:
+      cygwin_installer: ${{ steps.compile_iss.outputs.CYGWIN_INSTALLER }}
 
     steps:
+
       # Checkout latest commit
       - name: Checkout Medley
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       # Store the values output from loadup job as environment variables
       - name: Environment Variables
@@ -294,24 +430,59 @@ jobs:
           echo "MEDLEY_RELEASE_TAG=$mrt" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
           $msrt="${{ needs.loadup.outputs.medley_short_release_tag }}"
           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
 
-      # Download vnc viewer
-      - name: Download vncviewer
+      # Retrieve medley tars from artifact store
+      - name: Retrieve medley tar
+        uses: actions/download-artifact@v4
+        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: |
-          $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)
+          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://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
-           $filename="medley-install_${env:COMBINED_RELEASE_TAG}_x64.exe"
-           echo "INSTALLER_FILENAME=$filename" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+           $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
@@ -319,7 +490,7 @@ jobs:
         uses: ncipollo/release-action@v1
         with:
           allowUpdates: true
-          artifacts: installers/win/${{ env.INSTALLER_FILENAME }}
+          artifacts: installers/cygwin/${{ env.CYGWIN_INSTALLER }}
           tag: ${{ env.MEDLEY_RELEASE_TAG }}
           token: ${{ secrets.GITHUB_TOKEN }}
           omitBodyDuringUpdate: true
@@ -327,23 +498,70 @@ jobs:
           omitNameDuringUpdate: true
           omitPrereleaseDuringUpdate: true
 
-      # Install the OpenSSH Client
-      - name: Install the OpenSSH Client
-        shell: powershell
+
+# JOB: downloads_page ################################################################
+
+  #
+  # Update the downloads page on OIO
+  #
+
+  downloads_page:
+
+    runs-on: ubuntu-latest
+
+    needs: [sentry, loadup, linux_installer, macos_installer, cygwin_installer]
+    if: |
+      needs.sentry.outputs.release_not_built == 'true'
+      || inputs.force == 'true'
+
+    steps:
+
+      # Environment variables
+      - name: Environment Varibales (from other jobs)
         run: |
-          Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0
+          crt="${{ needs.loadup.outputs.combined_release_tag }}"
+          echo "COMBINED_RELEASE_TAG=${crt}" >>${GITHUB_ENV}
+          mrt="${{ needs.loadup.outputs.medley_release_tag }}"
+          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
+        uses: actions/checkout@v4
+
+
+      # Upload a dummy file to release
+      # Needed since download url of the release changes on every update
+      # 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 placeholder.txt to release
+        id: pushph
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts: placeholder.txt
+          tag: ${{ env.MEDLEY_RELEASE_TAG }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          omitBodyDuringUpdate: true
+          omitDraftDuringUpdate: true
+          omitNameDuringUpdate: true
+          omitPrereleaseDuringUpdate: true
 
       # Update the downloads page and the man page on OIO
       - name: Update the downloads page and the man page to the OIO static page host
         shell: bash
         run: |
             # Figure out filenames
-            download_url="${{ steps.push.outputs.html_url }}"
+            download_url="${{ steps.pushph.outputs.html_url }}"
             download_url="${download_url/\/tag\//\/download\/}"
             local_template="installers/downloads_page/medley_downloads.html"
             local_filename="medley_downloads.html"
             local_manpath="docs/man-page/man_medley.html"
-            if [ "${{ needs.inputs.outputs.draft }}" = "true" ];
+            if [ "${{ inputs.draft }}" = "true" ];
             then
                 remote_filename="draft_downloads"
                 remote_manname="man_draft.html"
@@ -356,9 +574,9 @@ jobs:
             # Fill in downloads page template
             sed \
                -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/@@@DEBS.FILENAME.BASE@@@/${DEBS_FILENAME_BASE}/g" \
-               -e "s/@@@WINDOWS.INSTALLER.FILENAME@@@/${INSTALLER_FILENAME}/g" \
+               -e "s~@@@CYGWIN.INSTALLER@@@~${CYGWIN_INSTALLER}~g" \
                < "${local_template}" > "${local_filename}"
             # Create sftp instruction file
             echo "-rm ${remote_filepath}.oldold" > batch
@@ -373,9 +591,15 @@ 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 #####################################################################
 
   # Use set-sentry-action to determine set the sentry that says this release has
   # been successfully built
@@ -387,12 +611,19 @@ jobs:
     outputs:
       build_successful: ${{ steps.output.outputs.build_successful }}
 
-    needs: [inputs, sentry, loadup, windows_installer]
+    needs: [sentry, loadup, downloads_page]
 
     steps:
+      # Delete the tarballs artifact
+      - name: Delete tarballs artifact
+        uses: geekyeggo/delete-artifact@v5
+        with:
+          name: tarballs
+          failOnError: false
+
       # Checkout the actions for this repo owner
       - name: Checkout Actions
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: ${{ github.repository_owner }}/.github
           path: ./Actions_${{ github.sha }}
@@ -411,21 +642,4 @@ jobs:
           echo "build_successful='true'" >> $GITHUB_OUTPUT
 
 ######################################################################################
-
-
-
-#      - name: Download the Windows installer created in windows job
-#        uses: actions/download-artifact@v3
-#        with:
-#           name: windows_installer
-#           path: installers/win
-
-#     - name: Rename the Windows installer w/ version tag
-#        run: |
-#          maiko_release_tag="${{ steps.maiko.outputs.latest_tag }}"
-#          combined_release_tag="${MEDLEY_RELEASE_TAG#medley-}_${maiko_release_tag#maiko-}"
-#          windows_installer_filename="medley_install_${combined_release_tag}_x64.exe"
-#          cd installers/win
-#          mv medley_install_vXXXVERSIONXXX_x64.exe "${windows_installer_filename}"  
-#          echo "WINDOWS_INSTALLER_FILENAME=${windows_installer_filename}" >>${GITHUB_ENV}
-
+######################################################################################

.github/workflows/buildReleaseInclDocker.yml

@@ -75,7 +75,7 @@ jobs:
     steps:
       - id: one
         run: >
-          if [ '${{ toJSON(inputs) }}' != 'null'  ];
+          if [ '${{ toJSON(inputs) }}' != '{}'  ];
           then
             echo "draft=${{ inputs.draft }}" >> $GITHUB_OUTPUT;
             echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT;
@@ -84,6 +84,7 @@ jobs:
             echo "force=false" >> $GITHUB_OUTPUT;
           fi
 
+
 ######################################################################################
 
 
@@ -94,8 +95,7 @@ jobs:
     with:
         draft: ${{ needs.inputs.outputs.draft }}
         force: ${{ needs.inputs.outputs.force }}
-    secrets:
-        OIO_SSH_KEY: ${{ secrets.OIO_SSH_KEY }}
+    secrets: inherit
 
 
 ######################################################################################
@@ -107,9 +107,7 @@ jobs:
     with:
         draft: ${{ needs.inputs.outputs.draft }}
         force: ${{ needs.inputs.outputs.force }}
-    secrets:
-        DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
-        DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
+    secrets: inherit
 
 ######################################################################################
 

BUILDING.md

@@ -1,34 +1,126 @@
-# How to build a medley release
+# How to Build Medley and make a Release
 
-Originally done only with shell scripts:
-```
-./scripts/loadup-all.sh 
-```
-to make the loadups
-```
-./scripts/loadup-and-release.sh
-```
-to go on to make the tgz files and release them
+The files in the Medley repository are used for making "loadups" lisp.sysout, full.sysout, apps.sysout. In order to build the Medley images, you need to have a build of "Maiko" (in flavors 'ldeinit' and 'lde' and either (`ldex` or `ldesdl`).  Head over to the `Interlisp/maiko` repository to find out about making those.
 
-# Using github actions
+# Using GitHub actions
 
-In the github medley repository (Interlisp/medley) go to the Actions tab. 
+Note that GitHub actions are used to automate the build process and insure that the system is built using known files, and that the releases are coordinated across platforms.  We try to minimize dependencies on GitHub.
 
-It will list the available github actions, select: **Build Medley Release**. 
+That said, you can manually trigger the automatic making of Medley loadups.
+
+In the GitHub medley repository (Interlisp/medley) go to the Actions tab.
+
+It will list the available GitHub actions.
+Select: **Build/Push Release & Docker**. 
+
+In the middle of the screen there is a box labeled "Workflow Runs".
 
-In the middle of the screen there's a box labeled workflow runs.
 There should be a row in it that states 'This workflow has a workflow_dispatch event trigger' with a drop down menu (it really looks more like a button) on the right side labeled 'Run workflow'.  Select that and you'll get a form allowing you to select the branch (I've only used Master) and enter the release name.  Enter a name or leave it empty and press the green 'Run workflow' button. The workflow should queue up and run.  
 
-# How to create a Docker image for the latest Medley release
-
-In the github medley repository (Interlisp/medley) go to the Actions tab. 
-
-It will list the available github actions, select: **Build Medley Docker image**. 
-
-A table is presented which lists the previous runs of the workflow.  If the workflow has never been run, it will be empty.  A the top of the list is a row labeled, 'This workflow has a workflow_dispatch event trigger.' with a drop down menu labeled 'Run workflow'.  Select it.
-
-A box will be presented asking, 'Use workflow from' with a drop down menu of all available branches.  The default branch is **master**.  Leave it selected and push the green 'Run workflow' button.
-
-The workflow will be queued to run and start running.
+Build/Push Release & Docker first builds Maiko and Medley, pushes a Medley release to the Interlisp/medley repo Releases, then makes a Docker image.
 
+The files in .github/workflows/ contain the details.
+<!-- 
 The workflow pulls the latest Maiko image from Docker Hub and the Release Assets from the latest Medley release, generally defined as medley-YYMMDD.  The Medley Docker image adds in Tight VNC Server and retrieves the two tarballs associated with a release, one containing the sysouts and the other the other needed files source, fonts, etc.  The contents are uncompressed and loaded into the Medley directory structure.
+-->
+
+# Building Medley for yourself
+
+The actual building itself is done with various shell scripts, found in the `scripts` directory in the medley repository. Most of the scripts have a minimal sanity check that they are being run from the medley repository.
+
+Historically, building the medley image (called a "sysout") was called "doing a loadup".  Back in the day, a loadup took the better part of a day, and no one would do the whole thing -- there was no automation.
+
+## Prerequisites
+
+In these instructions, there is an assumption that the loadup scripts can find other repositories. All of the loadup scripts have to find `lde` and `ldex` or `ldisdl` and also `ldeinit`.
+
+Loadups use the run-medley script, which looks for Maiko (actually the lde & ldeinit executables) as follows:
+
+1. lde (ldeinit) on PATH
+2. In the `<osversion>.<machinetype>` subdirectory of the directory specified by the $MAIKODIR environment variable
+3. In the `<osversion>.<machinetype>` subdirectory of the directory specified by $MEDLEYDIR/../maiko/
+4. In the `<osversion>.<machinetype>` subdirectory of the directory specified by $MEDLEYDIR/maiko/
+
+where $MEDLEYDIR is the directory from which you called the loadup script.
+
+## Make everything
+
+The shell command:
+```
+time ./scripts/loadup-all.sh -apps && time ./scripts/loadup-db.sh
+```
+does everything; on a fast machine it takes 4-6 minutes, most of which is spent in the `loadup-db.sh` step. Without the `loadup-db.sh` step, it runs in 22 seconds on a fast system.
+
+## How loadup-all.sh works
+
+You don't need to know this unless you want to change some of the low-level files involved.
+
+The script "loadup-all.sh" itself involes scripts used for different steps in the loadup -- basically loadup-all calls the scripts in this order:
+
+* `loadup-init.sh` 
+* `loadup-mid-from-init.sh`
+* `loadup-lisp-from-mid.sh` 
+* `loadup-full-from-lisp.sh`
+* `loadup-aux.sh`
+* `loadup-apps-from-full.sh`
+* `loadup-db.sh`
+* `copy-all.sh`
+
+Most of these scripts should only be run from the 'medley' repository top level directory.
+
+```
+ your-working-area
+    maiko
+    medley
+    notecards
+```
+
+These are explained in reverse order:
+
+### `copy-all.sh`: copy files from build directory to loadups
+
+Most of the scripts build things in a temporary directory and, if the entire process succeeds, copies the results to the `loadups` directory. The environment variable `LOADUP-OUTDIR`, if set, is used, otherwise a sub-directory of /tmp.
+
+`copy-db.sh` and `copy-full.sh` are provided if you've only done partial loadups.
+
+`cpv` is a script that copies a file from one place to another while maintaining Medley version numbering.
+
+### `loadup.db`: build `fuller.database`
+
+This step was added to make a Masterscope database of "everything". The result is a file `fuller.database`. This was an artifact of an attempt to build some diagnostic tools to help understand what was going on in Medley.  There is a 4 step process in the `GATHER-INFO` function in the file `MEDLEY-UTILS` in the `internal` subdirectory of the medley repository that ends with creating a masterscope database after loading all of the source files for every file that is part of the loadup, plus a few additional LispUsers files listed in variables that are part of `MEDLEY-UTILS`.
+
+There are some problems that `GATHER-INFO` results hint at, but haven't been explored systematically.
+
+Masterscope has some gaps and bugs so `fuller.database` isn't as useful as it could be. For example, Masterscope 'show paths' was written assuming you had only anlayzed the parts you were working on, and so the results of `SHOW PATHS` are too big to be useful.
+
+## `loadup-aux.sh`: rebuild two files used for Medley development
+
+`exports.all` is a collection of external declarations from a set of files in the medley/sources directory that are marked as being exported within those sources. Low level system declarations that aren't needed by most users. The files that need exports.all are generally loaded by loading `SYSEDIT`, which sets up a couple of preferences and then loads `exports.all`. 
+
+`whereis.hash` is an index file mapping function, variable, record declarations and other components to the file name containing that definition. It is the result of scanning the directories in the medley repository, including lispusers and library and internal etc. (but not obsolete?).
+
+### `loadup-apps-from-full.sh:`build `apps.sysout`
+
+`apps.sysout` includes some other components that are part of online.interlisp.org experience. In particular, you need `notecards`, which is in a separate repository (currently).
+
+### `loadup-full-from-lisp.sh`: Build a `full.sysout` and
+
+`full.sysout` Includes what we hope is a useful subset of Interlisp library and lispusers components as well as our modernization components.
+
+
+### Build a `lisp.sysout` in 4 scripts:
+
+### `loadup-lisp-from-mid.sh` build `lisp.sysout`
+
+`lisp.sysout` is what most 1990s customers started with. This step starts with `init-mid.sysout` and runs `sources/LOADUP-LISP`.
+
+### `loadup-mid-from-init.sh` build `mid.sysout`
+
+This step uses a Maiko that has been compiled with the `init` option. It reads the `init.dlinit` and initializes the package system and runs the EXPRESSIONS from the files that were "loaded" by MAKEINIT, and writes out `init-mid.sysout`.
+
+### `loadup-init.sh`: build `mid.sysout`
+
+This step (called `MAKEINIT`) runs a Lisp program (using a `starter` sysout) that reads in Lisp sources for the bootstrap loader, walks through the code renaming the low-level memory management functions to work on a file instead of in memory. These renamed functions are written to a file (called I-NEW), and I-NEW is then compiled and loaded in and run to 'virtually' load the core set of files in an initial memory image (called INIT.SYSOUT). It then does another (theoretically unnecessary) pass of reading in INIT.SYSOUT using a different renaming of variables used originally for remote debugging (called TELERAID) and moving some pages around to make room for Dandelion IO Processor boot code. 
+
+While this step requires an Interlisp implementation, it isn't necessarily a Medley implementation. If  you want to change the instruction set or modify any data structures that are reflected in both the Lisp code and Maiko, you can run this part in an older Interlisp. Theoretically.
+

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
-

docs/README.md

@@ -1,5 +1,5 @@
-See [Documentation links](https://github.com/Interlisp/medley/wiki/Documentation)
-a complete list of available documentation. Much of the documentation still
+See [Using Medley](https://interlisp.org/software/using-medley)
+for a list of available documentation. Much of the documentation still
 needs review and updating.
 
 This directory has source (.TEDIT) for some documents that are found elsewhere.

doctools/IMINDEX

@@ -1,21 +1,20 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED "12-Feb-92 12:28:48" {DSK}<users>sybalsky>PUBS>IMINDEX.;2
 37264  
 
-      changes to%:  (FNS IM.CHAP.DISPLAYFN)
+
(FILECREATED " 6-Mar-2024 21:19:25" {WMEDLEY}<doctools>IMINDEX.;2
 36416  
 
-      previous date%: " 8-Dec-91 15:46:22" {DSK}<users>sybalsky>PUBS>IMINDEX.;1)
+      :EDIT-BY rmk
 
+      :CHANGES-TO (VARS IMINDEXCOMS)
+
+      :PREVIOUS-DATE "12-Feb-92 12:28:48" {WMEDLEY}<doctools>IMINDEX.;1)
 
-(* ; "
-Copyright (c) 1986, 1987, 1988, 1991, 1992 by Xerox Corporation.  All rights reserved.
-")
 
 (PRETTYCOMPRINT IMINDEXCOMS)
 
 (RPAQQ IMINDEXCOMS

        (
         (* ;; 
-
      "this file contains the functions used for creating and manipulating index image objects")

+
        "this file contains the functions used for creating and manipulating index image objects")

 
         (FNS IM.INDEX.CLOSEF IM.INDEX.COPYFN IM.INDEX.CREATEOBJ IM.INDEX.DISPLAY.STRING 
              IM.INDEX.DISPLAYFN IM.INDEX.EDIT IM.INDEX.LIST.FROM.STRING IM.INDEX.SIZEFN 
@@ -32,12 +31,7 @@ Copyright (c) 1986, 1987, 1988, 1991, 1992 by Xerox Corporation.  All rights res
         (COMS                                                (* ; "An image object to set the chapter number, on the TEXTOBJ's proplist, on the INDEXING-CHAPTER property.")

               (FNS IM.CHAP.COPYFN IM.CHAP.CREATEOBJ IM.CHAP.DISPLAYFN IM.CHAP.SIZEFN IM.CHAP.PUTFN 
                    IM.CHAP.GETFN IM.CHAP.BUTTONEVENTFN))
-        (P (ADVISE 'TEDIT.FORMAT.HARDCOPY 'AROUND '(RESETLST
-                                                       (RESETSAVE NIL (LIST (FUNCTION IM.INDEX.CLOSEF
-                                                                                   )
-                                                                            STREAM))
-                                                       *))
-           (IM.INDEX.INIT))))
+        (P (IM.INDEX.INIT))))
 
 
 
@@ -494,9 +488,9 @@ Copyright (c) 1986, 1987, 1988, 1991, 1992 by Xerox Corporation.  All rights res
 (DECLARE%: EVAL@COMPILE
 
 (RECORD IM.INDEX.DATA
 (NAME TYPE SAV INFO SUBSEC PAGE# . PROPLIST)
-                          SUBSEC _ IM.INDEX.DEFAULT.SUBSEC (TYPE?
 (AND (LISTP DATUM)
-                                                                           (IGEQ (LENGTH DATUM)
-                                                                                 6))))
+                      SUBSEC _ IM.INDEX.DEFAULT.SUBSEC (TYPE?
 (AND (LISTP DATUM)
+                                                                   (IGEQ (LENGTH DATUM)
+                                                                         6))))
 )
 
 (RPAQQ IM.INDEX.OBJ.FREEMENU.SPECS

@@ -638,21 +632,15 @@ Copyright (c) 1986, 1987, 1988, 1991, 1992 by Xerox Corporation.  All rights res
     T])
 )
 
-(ADVISE 'TEDIT.FORMAT.HARDCOPY 'AROUND '(RESETLST
-                                            (RESETSAVE NIL (LIST (FUNCTION IM.INDEX.CLOSEF)
-                                                                 STREAM))
-                                            *))
-
 (IM.INDEX.INIT
)
-(PUTPROPS IMINDEX COPYRIGHT ("Xerox Corporation" 1986 1987 1988 1991 1992))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2160 15212 (IM.INDEX.CLOSEF 2170 . 2785) (IM.INDEX.COPYFN 2787 . 2972) (
-IM.INDEX.CREATEOBJ 2974 . 4320) (IM.INDEX.DISPLAY.STRING 4322 . 4743) (IM.INDEX.DISPLAYFN 4745 . 8588)
- (IM.INDEX.EDIT 8590 . 12058) (IM.INDEX.LIST.FROM.STRING 12060 . 13094) (IM.INDEX.SIZEFN 13096 . 13856
-) (IM.INDEX.STRING.FROM.LIST 13858 . 14103) (IM.INDEX.PUTFN 14105 . 14294) (IM.INDEX.GETFN 14296 . 
-14451) (IM.INDEX.BUTTONEVENTFN 14453 . 15210)) (15213 17283 (IM.INDEX.INIT 15223 . 17281)) (17284 
-29200 (IM.INDEX.MENU 17294 . 18982) (IM.INDEX.MENU.WHENSELECTEDFN 18984 . 25739) (
-IM.INDEX.OBJ.FREEMENU.SELECTEDFN 25741 . 29198)) (31736 36879 (IM.CHAP.COPYFN 31746 . 31926) (
-IM.CHAP.CREATEOBJ 31928 . 33354) (IM.CHAP.DISPLAYFN 33356 . 35316) (IM.CHAP.SIZEFN 35318 . 36320) (
-IM.CHAP.PUTFN 36322 . 36506) (IM.CHAP.GETFN 36508 . 36669) (IM.CHAP.BUTTONEVENTFN 36671 . 36877)))))
+  (FILEMAP (NIL (1673 14725 (IM.INDEX.CLOSEF 1683 . 2298) (IM.INDEX.COPYFN 2300 . 2485) (
+IM.INDEX.CREATEOBJ 2487 . 3833) (IM.INDEX.DISPLAY.STRING 3835 . 4256) (IM.INDEX.DISPLAYFN 4258 . 8101)
+ (IM.INDEX.EDIT 8103 . 11571) (IM.INDEX.LIST.FROM.STRING 11573 . 12607) (IM.INDEX.SIZEFN 12609 . 13369
+) (IM.INDEX.STRING.FROM.LIST 13371 . 13616) (IM.INDEX.PUTFN 13618 . 13807) (IM.INDEX.GETFN 13809 . 
+13964) (IM.INDEX.BUTTONEVENTFN 13966 . 14723)) (14726 16796 (IM.INDEX.INIT 14736 . 16794)) (16797 
+28713 (IM.INDEX.MENU 16807 . 18495) (IM.INDEX.MENU.WHENSELECTEDFN 18497 . 25252) (
+IM.INDEX.OBJ.FREEMENU.SELECTEDFN 25254 . 28711)) (31229 36372 (IM.CHAP.COPYFN 31239 . 31419) (
+IM.CHAP.CREATEOBJ 31421 . 32847) (IM.CHAP.DISPLAYFN 32849 . 34809) (IM.CHAP.SIZEFN 34811 . 35813) (
+IM.CHAP.PUTFN 35815 . 35999) (IM.CHAP.GETFN 36001 . 36162) (IM.CHAP.BUTTONEVENTFN 36164 . 36370)))))
 STOP

doctools/IMTEDIT

@@ -1,17 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "20-Jul-2022 15:10:53" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>doctools>IMTEDIT.;2
 117347 
+
(FILECREATED " 6-Mar-2024 21:18:02" {WMEDLEY}<doctools>IMTEDIT.;4
 116622 
 
-      :CHANGES-TO (FNS MAKE.IM.DOCUMENT)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE " 8-Dec-91 15:41:54" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>doctools>IMTEDIT.;1)
+      :CHANGES-TO (FNS TRANSLATE.DUMPOUT MAKE.IM.DOCUMENT)
 
+      :PREVIOUS-DATE "20-Jul-2022 15:10:53" {WMEDLEY}<doctools>IMTEDIT.;2)
 
-(* ; "
-Copyright (c) 1983-1986, 1991 by Xerox Corporation.
-")
 
 (PRETTYCOMPRINT IMTEDITCOMS)
 
@@ -493,27 +489,26 @@ Copyright (c) 1983-1986, 1991 by Xerox Corporation.
     (DUMPOUT FONT LISP DUMP.CHARS SAV])
 
 (MAKE.IM.DOCUMENT

-  [LAMBDA (FORM OUTFILE.FLG PAGE.LAYOUT OUTPUT.MESSAGE DEFAULT.PARALOOKS PTRFILENAME)

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

+  [LAMBDA (FORM OUTFILE.FLG PAGE.LAYOUT OUTPUT.MESSAGE DEFAULT.PARALOOKS PTRFILENAME)
+
+    (* ;; "Edited  6-Mar-2024 21:17 by rmk: Fixed backquote commas. Also put IM.INDEX.CLOSEF calls in TEXTPROPs so advice in IMINDEX can be eliminated.")

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

                                                              (* mjs " 4-Aug-86 10:52")

 
-         (* * this function creates an IM output file, in XPS-compatible format.
-
         If sets up all of the special variables needed by DUMP, evaluates FORM, and sets 
-
         all of the para and font looks)

+(* ;;; "this function creates an IM output file, in XPS-compatible format.  If sets up all of the special variables needed by DUMP, evaluates FORM, and sets all of the para and font looks")

 
-         (* * If OUTFILE.FLG is NIL, the output file is just sent to the default printer.
-
         If OUTFILE.FLG is T, the outfile textstream is simply returned.
-
         If OUTFILE.FLG = anything else, it is taken as a file name to put the press file 
-
         which is created <but not printed>.)

+(* ;;; "If OUTFILE.FLG is NIL, the output file is just sent to the default printer.  If OUTFILE.FLG is T, the outfile textstream is simply returned.  If OUTFILE.FLG = anything else, it is taken as a file name to put the press file which is created <but not printed>.")

 
-         (* * if PAGE.LAYOUT is non-NIL, it should be the compound page layout to be used.)

+(* ;;; "if PAGE.LAYOUT is non-NIL, it should be the compound page layout to be used.")

 
-         (* * if OUTPUT.MESSAGE is non-NIL, it is printed on the hardcopy output)

+(* ;;; "if OUTPUT.MESSAGE is non-NIL, it is printed on the hardcopy output")

 
-         (* * PTRFILENAME is the name to be used if an index pointer file is generated 
-
         during hardcopy <by printing index objects>)

+(* ;;; "PTRFILENAME is the name to be used if an index pointer file is generated during hardcopy <by printing index objects>")

 
-    (PROG ((IM.OUTFILE (OPENTEXTSTREAM NIL NIL NIL NIL (LIST 'IM.INDEX.PTRFILENAME PTRFILENAME)))
+    (PROG ([IM.OUTFILE (OPENTEXTSTREAM NIL NIL NIL NIL `(IM.INDEX.PTRFILENAME ,PTRFILENAME 
+                                                               AFTERHARDCOPYFN (FUNCTION 
+                                                                                IM.INDEX.INIT]
            (FONT.STACK (CONS))
            (IM.TEDIT.LAST.PARA.BEGIN 1)
            (IM.TEDIT.LAST.FONT.BEGIN 1)
@@ -532,7 +527,7 @@ Copyright (c) 1983-1986, 1991 by Xerox Corporation.
           (DUMP.HEADERS.FOOTERS
 "  " "  ")
           (DUMPOUT CR CR START.PARA PARALOOKS
                  `(TYPE PAGEHEADING SUBTYPE DRAFTMESSAGE QUAD LEFT 1STLEFTMARGIN 0 LEFTMARGIN 0 
-                        RIGHTMARGIN %, IM.TEXT.RIGHTMARGIN)
+                        RIGHTMARGIN ,IM.TEXT.RIGHTMARGIN)
                  DUMP.CHARS
                  (COND
                     (IM.DRAFT.FLG (CONCAT "***DRAFT***  " (DATE)
@@ -543,73 +538,65 @@ Copyright (c) 1983-1986, 1991 by Xerox Corporation.
           (COND
              (IM.EVEN.FLG 
 
-         (* if you must quarantee that you have an even number of pages for two-sided 
-
         copying, dump out a blank page no matter what --
-
         it can always be discarded)

+                    (* ;; "if you must quarantee that you have an even number of pages for two-sided copying, dump out a blank page no matter what -- it can always be discarded")

 
                     (DUMPOUT CR CR START.PARA PARALOOKS
-                           `(NEWPAGEBEFORE T QUAD LEFT 1STLEFTMARGIN 0 LEFTMARGIN 0 RIGHTMARGIN %, 
-                                   IM.TEXT.RIGHTMARGIN SPECIALX %, IM.BLANKPAGE.SPECIALX SPECIALY %,
-                                   IM.BLANKPAGE.SPECIALY)
+                           `(NEWPAGEBEFORE T QUAD LEFT 1STLEFTMARGIN 0 LEFTMARGIN 0 RIGHTMARGIN
+                                   ,IM.TEXT.RIGHTMARGIN SPECIALX ,IM.BLANKPAGE.SPECIALX SPECIALY
+                                   ,IM.BLANKPAGE.SPECIALY)
                            DUMP.CHARS "[This page intentionally left blank]" CR CR)))
 
-         (* after converting document, make sure that last para is formatted correctly by 
-
         changing font, ending current para, and starting new para)

+     (* ;; "after converting document, make sure that last para is formatted correctly by changing font, ending current para, and starting new para")

 
           (DUMPOUT CR CR FONT NIL)
           (DUMP
 '(START.PARA))
 
-         (* * set page format)

+(* ;;; "set page format")

 
           [TEDIT.PAGEFORMAT IM.OUTFILE
                  (COND
                     (PAGE.LAYOUT)
-                    (T (TEDIT.COMPOUND.PAGEFORMAT [TEDIT.SINGLE.PAGEFORMAT NIL NIL NIL NIL NIL 
-                                                         IM.PAGE.LEFTMARGIN IM.PAGE.RIGHTMARGIN 
-                                                         IM.PAGE.FIRST.TOPMARGIN IM.PAGE.BOTTOMMARGIN
-                                                         1 NIL NIL
-                                                         `((RECTOFOOT %, IM.PAGE.LEFTMARGIN %, 
-                                                                  IM.FOOTER.Y)
-                                                           (RECTOFOOTRULE %, IM.PAGE.LEFTMARGIN %, 
-                                                                  IM.FOOTER.RULE.Y)
-                                                           (DRAFTMESSAGE %, IM.DRAFT.MESSAGE.X %, 
-                                                                  IM.DRAFT.MESSAGE.BOTTOM.Y]
+                    (T (TEDIT.COMPOUND.PAGEFORMAT [TEDIT.SINGLE.PAGEFORMAT
+                                                   NIL NIL NIL NIL NIL IM.PAGE.LEFTMARGIN 
+                                                   IM.PAGE.RIGHTMARGIN IM.PAGE.FIRST.TOPMARGIN 
+                                                   IM.PAGE.BOTTOMMARGIN 1 NIL NIL
+                                                   `((RECTOFOOT ,IM.PAGE.LEFTMARGIN ,IM.FOOTER.Y)
+                                                     (RECTOFOOTRULE ,IM.PAGE.LEFTMARGIN 
+                                                            ,IM.FOOTER.RULE.Y)
+                                                     (DRAFTMESSAGE ,IM.DRAFT.MESSAGE.X 
+                                                            ,IM.DRAFT.MESSAGE.BOTTOM.Y]
                               [TEDIT.SINGLE.PAGEFORMAT NIL NIL NIL NIL NIL IM.PAGE.LEFTMARGIN 
                                      IM.PAGE.RIGHTMARGIN IM.PAGE.TOPMARGIN IM.PAGE.BOTTOMMARGIN 1 NIL
-                                     NIL `((DRAFTMESSAGE %, IM.DRAFT.MESSAGE.X %, 
-                                                  IM.DRAFT.MESSAGE.TOP.Y)
-                                           (VERSOHEAD %, IM.PAGE.LEFTMARGIN %, IM.HEADER.Y)
-                                           (VERSOHEADRULE %, IM.PAGE.LEFTMARGIN %, IM.HEADER.RULE.Y)
-                                           (VERSOFOOT %, IM.PAGE.LEFTMARGIN %, IM.FOOTER.Y)
-                                           (VERSOFOOTRULE %, IM.PAGE.LEFTMARGIN %, IM.FOOTER.RULE.Y)
-                                           (DRAFTMESSAGE %, IM.DRAFT.MESSAGE.X %, 
-                                                  IM.DRAFT.MESSAGE.BOTTOM.Y]
+                                     NIL `((DRAFTMESSAGE ,IM.DRAFT.MESSAGE.X ,IM.DRAFT.MESSAGE.TOP.Y)
+                                           (VERSOHEAD ,IM.PAGE.LEFTMARGIN ,IM.HEADER.Y)
+                                           (VERSOHEADRULE ,IM.PAGE.LEFTMARGIN ,IM.HEADER.RULE.Y)
+                                           (VERSOFOOT ,IM.PAGE.LEFTMARGIN ,IM.FOOTER.Y)
+                                           (VERSOFOOTRULE ,IM.PAGE.LEFTMARGIN ,IM.FOOTER.RULE.Y)
+                                           (DRAFTMESSAGE ,IM.DRAFT.MESSAGE.X 
+                                                  ,IM.DRAFT.MESSAGE.BOTTOM.Y]
                               (TEDIT.SINGLE.PAGEFORMAT NIL NIL NIL NIL NIL IM.PAGE.LEFTMARGIN 
                                      IM.PAGE.RIGHTMARGIN IM.PAGE.TOPMARGIN IM.PAGE.BOTTOMMARGIN 1 NIL
-                                     NIL `((DRAFTMESSAGE %, IM.DRAFT.MESSAGE.X %, 
-                                                  IM.DRAFT.MESSAGE.TOP.Y)
-                                           (RECTOHEAD %, IM.PAGE.LEFTMARGIN %, IM.HEADER.Y)
-                                           (RECTOHEADRULE %, IM.PAGE.LEFTMARGIN %, IM.HEADER.RULE.Y)
-                                           (RECTOFOOT %, IM.PAGE.LEFTMARGIN %, IM.FOOTER.Y)
-                                           (RECTOFOOTRULE %, IM.PAGE.LEFTMARGIN %, IM.FOOTER.RULE.Y)
-                                           (DRAFTMESSAGE %, IM.DRAFT.MESSAGE.X %, 
-                                                  IM.DRAFT.MESSAGE.BOTTOM.Y]
+                                     NIL `((DRAFTMESSAGE ,IM.DRAFT.MESSAGE.X ,IM.DRAFT.MESSAGE.TOP.Y)
+                                           (RECTOHEAD ,IM.PAGE.LEFTMARGIN ,IM.HEADER.Y)
+                                           (RECTOHEADRULE ,IM.PAGE.LEFTMARGIN ,IM.HEADER.RULE.Y)
+                                           (RECTOFOOT ,IM.PAGE.LEFTMARGIN ,IM.FOOTER.Y)
+                                           (RECTOFOOTRULE ,IM.PAGE.LEFTMARGIN ,IM.FOOTER.RULE.Y)
+                                           (DRAFTMESSAGE ,IM.DRAFT.MESSAGE.X 
+                                                  ,IM.DRAFT.MESSAGE.BOTTOM.Y]
 
-         (* * dump default char and para looks for whole document --
-
         and looks that should be different should be specified in the fns)

+(* ;;; "dump default char and para looks for whole document -- and looks that should be different should be specified in the fns")

 
           (TEDIT.LOOKS IM.OUTFILE IM.TEXT.FONT 1 (GETFILEINFO IM.OUTFILE 'LENGTH))
-          (TEDIT.PARALOOKS IM.OUTFILE
-                 [COND
-                    (DEFAULT.PARALOOKS)
-                    (T `(QUAD JUSTIFIED 1STLEFTMARGIN %, IM.TEXT.LEFTMARGIN LEFTMARGIN %, 
-                              IM.TEXT.LEFTMARGIN RIGHTMARGIN %, IM.TEXT.RIGHTMARGIN LINELEADING 0 
-                              PARALEADING 5 POSTPARALEADING 0]
+          (TEDIT.PARALOOKS IM.OUTFILE [COND
+                                         (DEFAULT.PARALOOKS)
+                                         (T `(QUAD JUSTIFIED 1STLEFTMARGIN ,IM.TEXT.LEFTMARGIN 
+                                                   LEFTMARGIN ,IM.TEXT.LEFTMARGIN RIGHTMARGIN
+                                                   ,IM.TEXT.RIGHTMARGIN LINELEADING 0 PARALEADING 5 
+                                                   POSTPARALEADING 0]
                  1
                  (GETFILEINFO IM.OUTFILE 'LENGTH))
 
-         (* must reverse list because the order of some char and paragraph looks is 
-
         significant << earlier looks are overridden by later ones >>)

+     (* ;; "must reverse list because the order of some char and paragraph looks is significant << earlier looks are overridden by later ones >>")

 
           (SETQ IM.CHARLOOKS (DREVERSE IM.CHARLOOKS))
           (SETQ IM.PARALOOKS (DREVERSE IM.PARALOOKS))
@@ -2309,83 +2296,75 @@ page edge.)

 (DEFINEQ
 
 (TRANSLATE.DUMPOUT

-  [LAMBDA (DUMPOUT.ARGS)
                                 (* mjs "18-Sep-85 16:17")

+  [LAMBDA (DUMPOUT.ARGS)                                     (* mjs "18-Sep-85 16:17")

 
-         (* * this function translates the DUMPOUT macro form into a PROGN form that 
-
       calls a series of functions, such as DUMP.)

+         (* * this function translates the DUMPOUT macro form into a PROGN form that calls 
+
         a series of functions, such as DUMP.)

 
          (* * the indentation code has been commented out ---
-
       will try indenting everything to same, unless specified otherwise with 
-
       PARALOOKS)

+
         will try indenting everything to same, unless specified otherwise with PARALOOKS)

 
     (PROG ((DUMPOUT.FORMS NIL)
            (DUMPOUT.UNDO NIL)
            COMM COMM.ARG)
           [while
 DUMPOUT.ARGS do
 (SELECTQ (SETQ COMM (pop
 DUMPOUT.ARGS))
-                                             (NIL)
-                                             ((CR TAB START.PARA DUMP.FOOTNOTES START.SUPER START.SUB
-                                                  END.SUPER END.SUB) 
-                                                             (* just pass these atoms as commands 
-
                                                           to DUMP)

-                                                  (push
 DUMPOUT.FORMS (LIST 'DUMP.FORMAT
-                                                                                (KWOTE COMM))))
-                                             ((FLUSH.ARG TRIVIAL.ARG DUMP.ARG) 
-                                                  (push
 DUMPOUT.FORMS (LIST COMM)))
-                                             (INDENT 
+                                     (NIL)
+                                     ((CR TAB START.PARA DUMP.FOOTNOTES START.SUPER START.SUB 
+                                          END.SUPER END.SUB) (* just pass these atoms as commands 
+
                                                             to DUMP)

+                                          (push
 DUMPOUT.FORMS (LIST 'DUMP.FORMAT (KWOTE COMM))))
+                                     ((FLUSH.ARG TRIVIAL.ARG DUMP.ARG) 
+                                          (push
 DUMPOUT.FORMS (LIST COMM)))
+                                     (INDENT 
 
          (* * SELECTQ (SETQ COMM.ARG (pop DUMPOUT.ARGS))
-
       (INIT (push DUMPOUT.FORMS (QUOTE (PUT.MY.PROP
-
       (QUOTE INDENT) INITIAL.INDENT))) (push DUMPOUT.FORMS
-
       (QUOTE (PUT.MY.PROP (QUOTE WIDTH) INITIAL.WIDTH)))
-
       (push DUMPOUT.FORMS (QUOTE (DUMP.FORMAT
-
       (QUOTE INDENT) INITIAL.INDENT)))) (NONE
-
       (push DUMPOUT.FORMS (QUOTE (PUT.MY.PROP
-
       (QUOTE INDENT) (QUOTE NONE)))) (push DUMPOUT.FORMS
-
       (QUOTE (PUT.MY.PROP (QUOTE WIDTH) (ANC.WIDTH))))
-
       (push DUMPOUT.FORMS (QUOTE (DUMP.FORMAT
-
       (QUOTE INDENT) (QUOTE NONE))))) (push DUMPOUT.FORMS
-
       (LIST (QUOTE (LAMBDA (I) (PUT.MY.PROP (QUOTE INDENT)
-
       (IPLUS (ANC.INDENT) I)) (PUT.MY.PROP (QUOTE WIDTH)
-
       (IDIFFERENCE (ANC.WIDTH) I)) (DUMP.FORMAT
-
       (QUOTE INDENT) (IPLUS (ANC.INDENT) I)))) COMM.ARG)))

+
         (INIT (push DUMPOUT.FORMS (QUOTE (PUT.MY.PROP
+
         (QUOTE INDENT) INITIAL.INDENT))) (push DUMPOUT.FORMS
+
         (QUOTE (PUT.MY.PROP (QUOTE WIDTH) INITIAL.WIDTH)))
+
         (push DUMPOUT.FORMS (QUOTE (DUMP.FORMAT (QUOTE INDENT) INITIAL.INDENT))))
+
         (NONE (push DUMPOUT.FORMS (QUOTE (PUT.MY.PROP
+
         (QUOTE INDENT) (QUOTE NONE)))) (push DUMPOUT.FORMS
+
         (QUOTE (PUT.MY.PROP (QUOTE WIDTH) (ANC.WIDTH))))
+
         (push DUMPOUT.FORMS (QUOTE (DUMP.FORMAT (QUOTE INDENT)
+
         (QUOTE NONE))))) (push DUMPOUT.FORMS (LIST
+
         (QUOTE (LAMBDA (I) (PUT.MY.PROP (QUOTE INDENT)
+
         (IPLUS (ANC.INDENT) I)) (PUT.MY.PROP (QUOTE WIDTH)
+
         (IDIFFERENCE (ANC.WIDTH) I)) (DUMP.FORMAT
+
         (QUOTE INDENT) (IPLUS (ANC.INDENT) I)))) COMM.ARG)))

 
          (* * push DUMPOUT.UNDO (QUOTE INDENT))

 
-                                                     (SETQ COMM.ARG (pop
 DUMPOUT.ARGS)))
-                                             (WIDTH (push
 DUMPOUT.FORMS
-                                                           (LIST 'PUT.MY.PROP (KWOTE 'WIDTH)
-                                                                 (pop
 DUMPOUT.ARGS))))
-                                             (FONT (SETQ COMM.ARG (pop
 DUMPOUT.ARGS))
-                                                   [push
 DUMPOUT.FORMS
-                                                          (LIST 'DUMP.FORMAT (KWOTE 'FONT)
-                                                                (COND
-                                                                   ((LISTGET IM.TEDIT.FONT.DEFS 
-                                                                           COMM.ARG)
-                                                                    (KWOTE COMM.ARG))
-                                                                   (T COMM.ARG]
-                                                   (push
 DUMPOUT.UNDO 'FONT))
-                                             (PARALOOKS (push
 DUMPOUT.FORMS
-                                                               (LIST 'DUMP.FORMAT (KWOTE 'PARALOOKS)
-                                                                     (pop
 DUMPOUT.ARGS))))
-                                             (DUMP.CHARS (push
 DUMPOUT.FORMS
-                                                                (LIST (FUNCTION IM.DUMP.CHARS)
+                                             (SETQ COMM.ARG (pop
 DUMPOUT.ARGS)))
+                                     (WIDTH (push
 DUMPOUT.FORMS (LIST 'PUT.MY.PROP
+                                                                      (KWOTE 'WIDTH)
                                                                       (pop
 DUMPOUT.ARGS))))
-                                             (push
 DUMPOUT.FORMS (LIST 'DUMP.FORMAT
-                                                                           (KWOTE 'TEXT)
-                                                                           (LIST 'MAKE.SAVE COMM]
-          [for
 X in
 DUMPOUT.UNDO do
 (push
 DUMPOUT.FORMS (LIST 'DUMP.FORMAT
-                                                                              (KWOTE 'UNDO)
-                                                                              (KWOTE X]
+                                     (FONT (SETQ COMM.ARG (pop
 DUMPOUT.ARGS))
+                                           [push
 DUMPOUT.FORMS (LIST 'DUMP.FORMAT (KWOTE 'FONT)
+                                                                     (COND
+                                                                        ((LISTGET IM.TEDIT.FONT.DEFS
+                                                                                COMM.ARG)
+                                                                         (KWOTE COMM.ARG))
+                                                                        (T COMM.ARG]
+                                           (push
 DUMPOUT.UNDO 'FONT))
+                                     (PARALOOKS (push
 DUMPOUT.FORMS (LIST 'DUMP.FORMAT
+                                                                          (KWOTE 'PARALOOKS)
+                                                                          (pop
 DUMPOUT.ARGS))))
+                                     (DUMP.CHARS (push
 DUMPOUT.FORMS (LIST (FUNCTION IM.DUMP.CHARS)
+                                                                           (pop
 DUMPOUT.ARGS))))
+                                     (push
 DUMPOUT.FORMS (LIST 'DUMP.FORMAT (KWOTE 'TEXT)
+                                                               (LIST 'MAKE.SAVE COMM]
+          [for
 X in
 DUMPOUT.UNDO do
 (push
 DUMPOUT.FORMS (LIST 'DUMP.FORMAT (KWOTE 'UNDO)
+                                                              (KWOTE X]
 
          (* * push DUMPOUT.FORMS (QUOTE (PUT.MY.PROP
-
       (QUOTE INDENT) DUMPOUT.SAVE.INDENT)))

+
         (QUOTE INDENT) DUMPOUT.SAVE.INDENT)))

 
          (* * push DUMPOUT.FORMS (QUOTE (PUT.MY.PROP
-
       (QUOTE WIDTH) DUMPOUT.SAVE.WIDTH)))

+
         (QUOTE WIDTH) DUMPOUT.SAVE.WIDTH)))

 
          (* * RETURN (APPEND (QUOTE (PROG ((DUMPOUT.SAVE.INDENT
-
       (GET.MY.PROP (QUOTE INDENT))) (DUMPOUT.SAVE.WIDTH
-
       (GET.MY.PROP (QUOTE WIDTH)))))) (DREVERSE DUMPOUT.FORMS)))

+
         (GET.MY.PROP (QUOTE INDENT))) (DUMPOUT.SAVE.WIDTH
+
         (GET.MY.PROP (QUOTE WIDTH)))))) (DREVERSE DUMPOUT.FORMS)))

 
           (RETURN (CONS 'PROGN (DREVERSE DUMPOUT.FORMS])
 
@@ -2408,25 +2387,24 @@ page edge.)

 
 (PUTPROPS SAVE.DUMPOUT
 MACRO
 (X (TRANSLATE.SAVE.DUMPOUT
 X)))
 )
-(PUTPROPS IMTEDIT COPYRIGHT ("Xerox Corporation" 1983 1984 1985 1986 1991))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (10773 38278 (IM.TEDIT 10783 . 12464) (DUMP 12466 . 14761) (DUMP.HEADERS.FOOTERS 14763
- . 17129) (DUMP.HRULE 17131 . 18282) (CHANGE.FONT 18284 . 19478) (IM.BOUT.IMAGEOBJ 19480 . 19803) (
-IM.TEDIT.DUMP.COMMANDS 19805 . 23358) (IM.TEDIT.DUMP.FOOTNOTES 23360 . 23801) (IM.TEDIT.DUMP.PARA 
-23803 . 24577) (INDEXX.PARSE.TYPE 24579 . 25874) (FORMAT.DEF 25876 . 28007) (FORMAT.LISPWORD 28009 . 
-28160) (MAKE.IM.DOCUMENT 28162 . 37133) (PRINT.NOTE 37135 . 37349) (SEND.INFO 37351 . 38276)) (38387 
-42405 (IM.VRULE.DISPLAYFN 38397 . 38721) (CREATE.VRULE.OBJECT 38723 . 40503) (PRINT.VRULES.ON.PAGE 
-40505 . 42403)) (42563 47318 (IM.FOLIO.DISPLAYFN 42573 . 43251) (IM.FOLIO.SIZEFN 43253 . 44102) (
-CREATE.FOLIO.OBJECT 44104 . 45650) (GET.FOLIO.STRING 45652 . 47316)) (47450 93690 (ARG#TOPROG 47460 . 
-47599) (BIGLISPCODE#TOPROG 47601 . 48837) (BRACKET#TOPROG 48839 . 49003) (CHAPTER#TOPROG 49005 . 51686
-) (COMMENT#TOPROG 51688 . 52240) (DEF#TOPROG 52242 . 55577) (FIGURE#TOPROG 55579 . 56923) (FN#TOPROG 
-56925 . 57322) (FNDEF#TOPROG 57324 . 61216) (FOOT#TOPROG 61218 . 61759) (INCLUDE#TOPROG 61761 . 62076)
- (INDEX#TOPROG 62078 . 63168) (INDEXX#TOPROG 63170 . 65251) (IT#TOPROG 65253 . 65394) (LBRACKET#TOPROG
- 65396 . 65550) (LISP#TOPROG 65552 . 65693) (LISPCODE#TOPROG 65695 . 66814) (LISPWORD#TOPROG 66816 . 
-67556) (LIST#TOPROG 67558 . 71980) (MACDEF#TOPROG 71982 . 73160) (NOTE#TOPROG 73162 . 73842) (
-PRINT.SPECIAL.CHARS#TOPROG 73844 . 74821) (PROPDEF#TOPROG 74823 . 75100) (RBRACKET#TOPROG 75102 . 
-75256) (REF#TOPROG 75258 . 83097) (RM#TOPROG 83099 . 83237) (SUB#TOPROG 83239 . 83387) (SUBSEC#TOPROG 
-83389 . 87892) (SUPER#TOPROG 87894 . 88048) (TABLE#TOPROG 88050 . 92002) (TAG#TOPROG 92004 . 92271) (
-TERM#TOPROG 92273 . 92586) (VAR#TOPROG 92588 . 92991) (VARDEF#TOPROG 92993 . 93688)) (111336 116764 (
-TRANSLATE.DUMPOUT 111346 . 116363) (TRANSLATE.SAVE.DUMPOUT 116365 . 116762)))))
+  (FILEMAP (NIL (10668 38115 (IM.TEDIT 10678 . 12359) (DUMP 12361 . 14656) (DUMP.HEADERS.FOOTERS 14658
+ . 17024) (DUMP.HRULE 17026 . 18177) (CHANGE.FONT 18179 . 19373) (IM.BOUT.IMAGEOBJ 19375 . 19698) (
+IM.TEDIT.DUMP.COMMANDS 19700 . 23253) (IM.TEDIT.DUMP.FOOTNOTES 23255 . 23696) (IM.TEDIT.DUMP.PARA 
+23698 . 24472) (INDEXX.PARSE.TYPE 24474 . 25769) (FORMAT.DEF 25771 . 27902) (FORMAT.LISPWORD 27904 . 
+28055) (MAKE.IM.DOCUMENT 28057 . 36970) (PRINT.NOTE 36972 . 37186) (SEND.INFO 37188 . 38113)) (38224 
+42242 (IM.VRULE.DISPLAYFN 38234 . 38558) (CREATE.VRULE.OBJECT 38560 . 40340) (PRINT.VRULES.ON.PAGE 
+40342 . 42240)) (42400 47155 (IM.FOLIO.DISPLAYFN 42410 . 43088) (IM.FOLIO.SIZEFN 43090 . 43939) (
+CREATE.FOLIO.OBJECT 43941 . 45487) (GET.FOLIO.STRING 45489 . 47153)) (47287 93527 (ARG#TOPROG 47297 . 
+47436) (BIGLISPCODE#TOPROG 47438 . 48674) (BRACKET#TOPROG 48676 . 48840) (CHAPTER#TOPROG 48842 . 51523
+) (COMMENT#TOPROG 51525 . 52077) (DEF#TOPROG 52079 . 55414) (FIGURE#TOPROG 55416 . 56760) (FN#TOPROG 
+56762 . 57159) (FNDEF#TOPROG 57161 . 61053) (FOOT#TOPROG 61055 . 61596) (INCLUDE#TOPROG 61598 . 61913)
+ (INDEX#TOPROG 61915 . 63005) (INDEXX#TOPROG 63007 . 65088) (IT#TOPROG 65090 . 65231) (LBRACKET#TOPROG
+ 65233 . 65387) (LISP#TOPROG 65389 . 65530) (LISPCODE#TOPROG 65532 . 66651) (LISPWORD#TOPROG 66653 . 
+67393) (LIST#TOPROG 67395 . 71817) (MACDEF#TOPROG 71819 . 72997) (NOTE#TOPROG 72999 . 73679) (
+PRINT.SPECIAL.CHARS#TOPROG 73681 . 74658) (PROPDEF#TOPROG 74660 . 74937) (RBRACKET#TOPROG 74939 . 
+75093) (REF#TOPROG 75095 . 82934) (RM#TOPROG 82936 . 83074) (SUB#TOPROG 83076 . 83224) (SUBSEC#TOPROG 
+83226 . 87729) (SUPER#TOPROG 87731 . 87885) (TABLE#TOPROG 87887 . 91839) (TAG#TOPROG 91841 . 92108) (
+TERM#TOPROG 92110 . 92423) (VAR#TOPROG 92425 . 92828) (VARDEF#TOPROG 92830 . 93525)) (111173 116115 (
+TRANSLATE.DUMPOUT 111183 . 115714) (TRANSLATE.SAVE.DUMPOUT 115716 . 116113)))))
 STOP

greetfiles/APPS-INIT

@@ -1,12 +1,12 @@
 (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 "25-Feb-2024 13:56:23" {DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;17
 23321  
 
       :CHANGES-TO (VARS APPS-INITCOMS)
-                  (FNS Apps.DoInit)
+                  (FNS Apps.DoInit Apps.AroundExitFn)
 
-      :PREVIOUS-DATE "19-Jan-2023 11:57:40" {DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;8
-)
+      :PREVIOUS-DATE "25-Feb-2024 13:14:02" 
+{DSK}<home>frank>il>medley>gmedley>greetfiles>APPS-INIT.;16)
 
 
 (PRETTYCOMPRINT APPS-INITCOMS)
@@ -17,8 +17,9 @@
         (GLOBALVARS Apps.NotecardsActivated Apps.RoomsActivated)
         (INITVARS (Apps.NotecardsActivated NIL)
                (Apps.RoomsActivated NIL))
-        (FNS Apps.InitNotecards Apps.DoInit Apps.CreateButtons Apps.CreateLabel Apps.ActivateCLOS 
-             Apps.ActivateRooms Apps.ShowDoc XCL-USER::EXEC_INTERLISP)
+        (FNS Apps.InitNotecards Apps.SetUpNOTECARDSDIRECTORIES Apps.DoInit Apps.CreateButtons 
+             Apps.CreateLabel Apps.ActivateCLOS Apps.ActivateRooms Apps.ShowDoc 
+             XCL-USER::EXEC_INTERLISP Apps.AroundExitFn)
         (DECLARE%: DONTEVAL@LOAD DOCOPY (P (Apps.DoInit)))
         (DECLARE%: FIRST DONTEVAL@LOAD DOCOPY (P (BKSYSBUF " "])
 
@@ -91,6 +92,33 @@
           (if
 (NOT DoNotRefreshButtons)
               then
 (Apps.CreateButtons
])
 
+(Apps.SetUpNOTECARDSDIRECTORIES

+  [LAMBDA NIL
+
+    (* ;; "Find the location of the Notecards directory and call NC.SetUpNOTECARDSDIRECTORIES.")

+
+    (* ;; " This is needed to make sure that lazy loading of Notecard types works.")

+
+    (LET* [(LOC1 (CONCAT MEDLEYDIR "notecards>"))
+           (LOC2 (CONCAT MEDLEYDIR "..>notecards>"))
+           (LOC3 (CONCAT MEDLEYDIR "..>..>notecards>"))
+           (NCDIR (for
 LOC in
 (LIST LOC1 LOC2 LOC3) thereis
 (OR (INFILEP (CONCAT LOC 
+                                                                                "system>NOTECARDS"))
+                                                                (INFILEP (CONCAT LOC 
+                                                                              "system>NOTECARDS.LCOM"
+                                                                                ]
+          (if
 NCDIR
+              then
 [SETQ NCDIR (OR (INFILEP (CONCAT NCDIR "system>NOTECARDS"))
+                                   (INFILEP (CONCAT NCDIR "system>NOTECARDS.LCOM"]
+                   (SETQ NCDIR (SUBSTRING NCDIR 1 (IDIFFERENCE (STRPOS "system>NOTECARDS" NCDIR)
+                                                         1)))
+                   (NC.SetUpNOTECARDSDIRECTORIES NCDIR)
+                   T
+            else
 (PRIN1 "Warning: Notecards directory could not be found." T)
+                 (PRIN1 "Hence, NOTECARDSDIRECTORIES is probably not set correctly" T)
+                 (PRIN1 "and Notecards will not work properly." T)
+                 NIL])
+
 (Apps.DoInit

   [LAMBDA NIL
 
@@ -170,7 +198,20 @@
 
            (* ;; " 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)
+
+           (* ;; "Setup NOTECARDSDIRECTORIES.")

+
+           (Apps.SetUpNOTECARDSDIRECTORIES
)
+
+           (* ;; "Add AROUNDEXITFN to ensure NOTECARDSDIRECTORIES get reset after LOGOUT, etc.")

+
+           (SETQ AROUNDEXITFNS (LSUBST '(MEDLEY-INIT-VARS Apps.AroundExitFn)
+                                      'MEDLEY-INIT-VARS AROUNDEXITFNS])
 
 (Apps.CreateButtons

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


@@ -363,6 +404,11 @@
                                                         YCOORD _ (IDIFFERENCE SCREENHEIGHT 460]
            (XCL:SET-DEFAULT-EXEC-TYPE 'INTERLISP)
            (XCL:SET-EXEC-TYPE 'INTERLISP])
+
+(Apps.AroundExitFn

+  [LAMBDA (EVENT)
+    (if
 (MEMB EVENT '(AFTERLOGOUT AFTERSYSOUT AFTERSAVEVM))
+        then
 (Apps.SetUpNOTECARDSDIRECTORIES
])
 )
 (DECLARE%: DONTEVAL@LOAD DOCOPY 
 
@@ -373,8 +419,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 (1229 23187 (Apps.InitNotecards 1239 . 5101) (Apps.SetUpNOTECARDSDIRECTORIES 5103 . 6658
+) (Apps.DoInit 6660 . 10257) (Apps.CreateButtons 10259 . 19083) (Apps.CreateLabel 19085 . 19895) (
+Apps.ActivateCLOS 19897 . 21246) (Apps.ActivateRooms 21248 . 22099) (Apps.ShowDoc 22101 . 22250) (
+XCL-USER::EXEC_INTERLISP 22252 . 23024) (Apps.AroundExitFn 23026 . 23185)))))
 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/deb/build_deb.sh

@@ -11,15 +11,6 @@
 ###############################################################################
 # set -x
 
-# mess with file desscriptors so we get only one line on stdout
-# so we can communicate only what we want back to any githib runner
-# stash fd 1 in fd 3
-exec 3>&1
-# make fd 1 (stdout) be the same as stdout
-# so none of the std output from this file will be captured by
-# $() but it will still be written out to the tty (via stderr)
-exec 1>&2
-
 tarball_dir=tmp/tarballs
 
 #  Make sure we are in the right directory
@@ -32,6 +23,13 @@ then
   exit 1
 fi
 
+# template for artifacts file names should be passed down in the ENV variable: ARTIFACTS_FILENAME_TEMPLATE
+if [ -z "${ARTIFACTS_FILENAME_TEMPLATE}" ];
+then
+  ARTIFACTS_FILENAME_TEMPLATE="medley-full-@@PLATFORM@@-@@ARCH@@-@@MEDLEY.RELEASE@@_@@MAIKO.RELEASE@@"
+fi
+
+
 
 #  If running as a github action or -t arg, then skip downloading the tarballs
 if ! [[ -n "${GITHUB_WORKSPACE}" || "$1" = "-t" ]];
@@ -69,7 +67,6 @@ fi
 pushd ${tarball_dir} >/dev/null 2>/dev/null
 medley_release=$(echo medley-*-loadups.tgz | sed "s/medley-\(.*\)-loadups.tgz/\1/")
 maiko_release=$(echo maiko-*-linux.x86_64.tgz | sed "s/maiko-\(.*\)-linux.x86_64.tgz/\1/")
-debs_filename_base="medley-full-${medley_release}_${maiko_release}"
 popd >/dev/null 2>/dev/null
 
 
@@ -136,7 +133,7 @@ do
     #
     #  Create tar file for this arch
     #
-    filename="${debs_filename_base}-${wslp}-${arch}"
+    filename="$(echo ${ARTIFACTS_FILENAME_TEMPLATE} | sed -e "s#@@PLATFORM@@#${wslp}#" -e "s#@@ARCH@@#${arch}#" -e "s#@@MEDLEY.RELEASE@@#${medley_release}#" -e "s#@@MAIKO.RELEASE@@#${maiko_release}#" )"
     mkdir -p tars
     echo "Creating tar file tars/${filename}.tgz"
     tar -C ${il_dir} -czf tars/${filename}.tgz .
@@ -151,8 +148,5 @@ do
   done
 done
 
-# send just one line back to github $() construct
-# do this by restoring fd 1 to what it was orginally
-exec 1>&3
-echo "${debs_filename_base}"
-
+################################################################################################################
+################################################################################################################

installers/downloads_page/medley_downloads.html

@@ -10,36 +10,46 @@
 <ul>
 <li><h4>Standard Linux</h4>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-x86_64.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-linux-x86_64-@@@COMBINED.RELEASE.TAG@@@.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-aarch64.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-linux-aarch64-@@@COMBINED.RELEASE.TAG@@@.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-armv7l.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines</a></p></li>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-linux-armv7l-@@@COMBINED.RELEASE.TAG@@@.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines</a></p></li>
 <li><h4>Windows System for Linux</h4>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-x86_64.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86.64 machines</a></p>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-wsl-x86_64-@@@COMBINED.RELEASE.TAG@@@.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86.64 machines</a></p>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-aarch64.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p></li>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-wsl-aarch64-@@@COMBINED.RELEASE.TAG@@@.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p></li>
 </ul></li>
 <li><h3>Local Installations (for any Linux distro)</h3>
 
 <ul>
 <li><h4>Standard Linux</h4>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-x86_64.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-linux-x86_64-@@@COMBINED.RELEASE.TAG@@@.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-aarch64.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-linux-aarch64-@@@COMBINED.RELEASE.TAG@@@.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-armv7l.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines</a></p></li>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-linux-armv7l-@@@COMBINED.RELEASE.TAG@@@.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines</a></p></li>
 <li><h4>Windows System for Linux</h4>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-x86_64.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-wsl-x86_64-@@@COMBINED.RELEASE.TAG@@@.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-aarch64.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p></li>
+<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 (Medley runs in a Docker container)</h2>
+<li><h2>WINDOWS 10/11 (Single install based on cygwin - Docker install deprecated)</h2>
 
-<p><a href="@@@DOWNLOAD_URL@@@/@@@WINDOWS.INSTALLER.FILENAME@@@">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for Windows x64 machines</a></p></li>
+<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>
+<li><h3>DMG Installer</h3>
+
+<p>Not available</p></li>
+<li><h3>ZIP Installer</h3>
+
+<p><a href="@@@DOWNLOAD_URL@@@/medley-full-macos-universal-@@@COMBINED.RELEASE.TAG@@@.zip">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@</a></p></li>
+</ul></li>
 </ul></li>
 </ul>

installers/downloads_page/medley_downloads.md

@@ -6,40 +6,44 @@
 
              * #### Standard Linux
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-x86\_64.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/medley-full-linux-x86\_64-@@@COMBINED.RELEASE.TAG@@@.deb)
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-aarch64.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/medley-full-linux-aarch64-@@@COMBINED.RELEASE.TAG@@@.deb)
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-armv7l.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines](@@@DOWNLOAD_URL@@@/medley-full-linux-armv7l-@@@COMBINED.RELEASE.TAG@@@.deb)
 
              * #### Windows System for Linux
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\.64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-x86\_64.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\.64 machines](@@@DOWNLOAD_URL@@@/medley-full-wsl-x86\_64-@@@COMBINED.RELEASE.TAG@@@.deb)
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-aarch64.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/medley-full-wsl-aarch64-@@@COMBINED.RELEASE.TAG@@@.deb)
 
          *    ### Local Installations (for any Linux distro)
 
              * #### Standard Linux
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-x86\_64.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/medley-full-linux-x86\_64-@@@COMBINED.RELEASE.TAG@@@.tgz)
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-aarch64.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/medley-full-linux-aarch64-@@@COMBINED.RELEASE.TAG@@@.tgz)
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-armv7l.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines](@@@DOWNLOAD_URL@@@/medley-full-linux-armv7l-@@@COMBINED.RELEASE.TAG@@@.tgz)
 
              * #### Windows System for Linux
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-x86\_64.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/medley-full-wsl-x86\_64-@@@COMBINED.RELEASE.TAG@@@.tgz)
 
-             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-aarch64.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/medley-full-wsl-aarch64-@@@COMBINED.RELEASE.TAG@@@.tgz)
 
-     *    ## WINDOWS 10/11 (Medley runs in a Docker container)
-
-         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for Windows x64 machines](@@@DOWNLOAD_URL@@@/@@@WINDOWS.INSTALLER.FILENAME@@@)
+     *    ## 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
 
+              Not available
 
+         *    ### ZIP Installer
 
+              [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@](@@@DOWNLOAD_URL@@@/medley-full-macos-universal-@@@COMBINED.RELEASE.TAG@@@.zip)

installers/macos/.gitignore

@@ -0,0 +1,7 @@
+tmp
+devtmp
+pkg/*.pkg
+artifacts
+
+
+

installers/macos/app/Info.plist

@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CFBundleDevelopmentRegion</key>
+    <string>English</string>
+    <key>CFBundleExecutable</key>
+    <string>medley/medley</string>
+    <key>CFBundleGetInfoString</key>
+    <string>Medley Interlisp, Copyright 2023 Interlisp.org</string>
+    <key>CFBundleIconFile</key>
+    <string>Medley.icns</string>
+    <key>CFBundleIdentifier</key>
+    <string>org.interlisp.Medley</string>
+    <key>CFBundleDocumentTypes</key>
+    <array>
+    </array>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>3.51</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>--VERSION_TAG--</string>
+    <key>CFBundleSignature</key>
+    <string>Medley</string>
+    <key>CFBundleVersion</key>
+    <string>--VERSION_TAG--</string>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright 2023 Interlisp.org</string>
+    <key>LSMinimumSystemVersion</key>
+    <string>11.0</string>
+</dict>
+</plist>

installers/macos/app/PkgInfo

@@ -0,0 +1 @@
+APPLMedley

installers/macos/build_app.sh

@@ -0,0 +1,170 @@
+#!/bin/bash
+###############################################################################
+#
+#    build_app.sh: build app bundle for installing Medley Interlisp on MacOS
+#
+#    2023-02-23 Frank Halasz
+#
+#    Copyright 2023 by Interlisp.org
+#
+###############################################################################
+
+APPNAME=Medley
+
+# 2023-07-19 Temorary selector to allow us to create .zip asset before app/dmg work is finished
+INCLUDE_APP="no"   # "yes" or "no"
+
+#  Make sure we are in the right directory
+if [ ! -f ./app/Info.plist ];
+then
+echo "Can't find ./app/Info.plist file."
+echo "Incorrect cwd?"
+echo "Should be in medley/installers/macos"
+echo "Exiting"
+exit 1
+fi
+
+# template for artifacts file names should be passed down in the ENV variable: ARTIFACTS_FILENAME_TEMPLATE
+if [ -z "${ARTIFACTS_FILENAME_TEMPLATE}" ];
+then
+  ARTIFACTS_FILENAME_TEMPLATE="medley-full-@@PLATFORM@@-@@ARCH@@-@@MEDLEY.RELEASE@@_@@MAIKO.RELEASE@@"
+fi
+
+#
+#  Setup directories
+#
+CWD=$(pwd)
+RESULTS_DIR=${CWD}/artifacts
+APPBUNDLE=${RESULTS_DIR}/${APPNAME}.app
+APPBUNDLECONTENTS=${APPBUNDLE}/Contents
+APPBUNDLEEXE=${APPBUNDLECONTENTS}/MacOS
+APPBUNDLERESOURCES=${APPBUNDLECONTENTS}/Resources
+APPBUNDLEICON=${APPBUNDLECONTENTS}/Resources
+tmp_dir=${CWD}/tmp
+tarball_dir=${tmp_dir}/tarballs
+
+#  If running as a github action or -t arg, then skip downloading the tarballs
+if ! [[ -n "${GITHUB_WORKSPACE}" || "$1" = "-t" ]];
+then
+  #  First, make sure gh is available and we are logged in to github
+  if [ -z "$(which gh)" ];
+  then
+    echo "Can't find gh"
+    echo "Exiting."
+    exit 2
+  fi
+  gh auth status 2>&1 | grep --quiet --no-messages "Logged in to github.com"
+  if [ $? -ne 0 ];
+  then
+    echo "Not logged into github."
+    echo "Exiting."
+    exit 3
+  fi
+  # then clear out the ./tmp directory
+  rm -rf ${tmp_dir}
+  mkdir -p ${tmp_dir}
+  # then download the maiko and medley tarballs
+  mkdir -p ${tarball_dir}
+  echo "Fetching maiko and medley release tarballs"
+  TAG=$(gh release list --repo interlisp/maiko | head -n 1 | awk "{print \$1 }")
+  gh release download ${TAG} \
+                      --repo interlisp/maiko \
+                      --dir ${tarball_dir} \
+                      --pattern "*darwin*.tgz"
+  TAG=$(gh release list --repo interlisp/medley | head -n 1 | awk "{print \$1 }")
+  gh release download ${TAG} \
+                      --repo interlisp/medley \
+                      --dir ${tarball_dir} \
+                      --pattern "*-loadups.tgz" \
+                      --pattern "*-runtime.tgz"
+  gh repo clone interlisp/notecards notecards -- --depth 1
+  (cd notecards; git archive --format=tgz --output=../notecards.tgz --prefix=notecards/ main)
+  mv notecards.tgz ${tarball_dir}
+  rm -rf notecards
+fi
+
+# Figure out release tags from tarball names
+pushd ${tarball_dir} >/dev/null 2>/dev/null
+medley_release=$(echo medley-*-loadups.tgz | sed "s/medley-\(.*\)-loadups.tgz/\1/")
+maiko_release=$(echo maiko-*-darwin.x86_64.tgz | sed "s/maiko-\(.*\)-darwin.x86_64.tgz/\1/")
+popd >/dev/null 2>/dev/null
+
+if [ "${INCLUDE_APP}" = "yes" ]; then
+	#
+	#  Create bundle dirs
+	#
+	rm -rf ${RESULTS_DIR}
+	mkdir -p ${RESULTS_DIR}
+	rm -rf ${APPBUNDLE}
+	mkdir -p ${APPBUNDLE}
+	mkdir ${APPBUNDLE}/Contents
+	mkdir ${APPBUNDLE}/Contents/MacOS
+	mkdir ${APPBUNDLE}/Contents/Resources
+	#
+	#  Create icons and put in bundle
+	#
+	iconset_dir=${tmp_dir}/${APPNAME}.iconset
+	rm -rf ${iconset_dir}
+	mkdir -p ${iconset_dir}
+	image_dir=${CWD}/images
+	sips -z 16 16     ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_16x16.png >/dev/null 2>&1
+	sips -z 32 32     ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_16x16@2x.png >/dev/null 2>&1
+	sips -z 32 32     ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_32x32.png >/dev/null 2>&1
+	sips -z 64 64     ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_32x32@2x.png >/dev/null 2>&1
+	sips -z 128 128   ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_128x128.png >/dev/null 2>&1
+	sips -z 256 256   ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_128x128@2x.png >/dev/null 2>&1
+	sips -z 256 256   ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_256x256.png >/dev/null 2>&1
+	sips -z 512 512   ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_256x256@2x.png >/dev/null 2>&1
+	sips -z 512 512   ${image_dir}/App_icon1024.png --out ${iconset_dir}/icon_512x512.png >/dev/null 2>&1
+	cp ${image_dir}/App_icon1024.png ${iconset_dir}/icon_512x512@2x.png
+	iconutil -c icns -o ${tmp_dir}/${APPNAME}.icns ${iconset_dir}
+	cp ${tmp_dir}/${APPNAME}.icns ${APPBUNDLEICON}/
+	rm -r ${iconset_dir}
+	rm ${tmp_dir}/${APPNAME}.icns
+	#
+	#  Update and copy in "control" files
+	#
+	sed -e "s/--VERSION_TAG--/${medley_release}.${maiko_release}.0/g" \
+	    < app/Info.plist \
+	    > ${APPBUNDLECONTENTS}/Info.plist
+	cp app/PkgInfo ${APPBUNDLECONTENTS}/
+fi #INCLUDE_APP
+
+#
+#  Untar the maiko and medley releases into the bundle
+#
+il_dir=${APPBUNDLE}/Contents/MacOS
+mkdir -p ${il_dir}
+tar -x -z -C ${il_dir} \
+          -f "${tarball_dir}/maiko-${maiko_release}-darwin.universal.tgz"
+tar -x -z -C ${il_dir} \
+          -f "${tarball_dir}/medley-${medley_release}-runtime.tgz"
+tar -x -z -C ${il_dir} \
+          -f "${tarball_dir}/medley-${medley_release}-loadups.tgz"
+tar -x -z -C ${il_dir} \
+          -f "${tarball_dir}/notecards.tgz"
+#
+#  Handle run_medley needing separate directories for each arch
+#
+pushd ${il_dir}/maiko >/dev/null 2>&1
+ln -s darwin.universal darwin.aarch64
+ln -s darwin.universal darwin.x86_64
+popd >/dev/null 2>&1
+#
+#  Add file icon to medley.command
+#
+if [ -z "$(which fileicon)" ];
+then
+  brew install fileicon
+fi
+fileicon set ${il_dir}/medley/scripts/medley/medley.command ${image_dir}/Command_icon128.png
+#
+#  Also create the zip file of il_dir for distribution
+#
+pushd ${il_dir} >/dev/null 2>&1
+filename="$(echo ${ARTIFACTS_FILENAME_TEMPLATE} | sed -e "s#@@PLATFORM@@#macos#" -e "s#@@ARCH@@#universal#" -e "s#@@MEDLEY.RELEASE@@#${medley_release}#" -e "s#@@MAIKO.RELEASE@@#${maiko_release}#" )"
+zip -r -6 -y -q  ${RESULTS_DIR}/${filename}.zip .
+popd >/dev/null 2>&1
+
+######################################################################################################
+######################################################################################################

installers/macos/build_artifacts.sh

@@ -0,0 +1,66 @@
+#!/bin/bash
+###############################################################################
+#
+#    build_artifacts.sh: build the artifacts for installing Medley Interlisp on
+#                  MacOS.  Basically just calls build_app.sh and build_dmg.sh.
+#                  based on Medley.app built by build_app.sh
+#
+#    2023-03-03 Frank Halasz
+#
+#    Copyright 2023 by Interlisp.org
+#
+###############################################################################
+
+#
+# Figure out what directory this script is being executed from
+#
+get_abs_filename() {
+  # $1 : relative filename
+  echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+}
+
+get_script_dir() {
+
+    # call this with ${BASH_SOURCE[0]:-$0} as its (only) parameter
+
+    # set -x
+
+    local SCRIPT_PATH="$( get_abs_filename "$1" )";
+
+    pushd . > '/dev/null';
+
+    while [ -h "$SCRIPT_PATH" ];
+    do
+        cd "$( dirname -- "$SCRIPT_PATH"; )";
+        SCRIPT_PATH="$( readlink -f -- "$SCRIPT_PATH"; )";
+    done
+
+    cd "$( dirname -- "$SCRIPT_PATH"; )" > '/dev/null';
+    SCRIPT_PATH="$( pwd; )";
+
+    popd  > '/dev/null';
+
+    # set +x
+
+    echo "${SCRIPT_PATH}"
+}
+
+SCRIPTDIR=$(get_script_dir "${BASH_SOURCE[0]:-$0}")
+
+#
+#  cd to the dir we are executing from and call
+#    build_app.sh and the build_dmg.sh
+#
+cd ${SCRIPTDIR}
+t=""
+c=""
+if [[ "$1" = "-t" || "$2" = "-t" ]]; then t="-t"; fi
+if [[ "$1" = "-c" || "$2" = "-c" ]]; then c="-c"; fi
+./build_app.sh "${t}" 2>&1
+# 2023-07-20 Not building dmg as yet, just using this to build zip file
+# while we finish work around dmg
+# ./build_dmg.sh "${c}"
+
+
+
+###############################################################################

installers/macos/build_dmg.sh

@@ -0,0 +1,185 @@
+#!/bin/bash
+###############################################################################
+#
+#    build_dmg.sh: build dmg for installing Medley Interlisp on MacOS
+#                  based on Medley.app built by build_app.sh
+#
+#    2023-03-03 Frank Halasz
+#
+#    Copyright 2023 by Interlisp.org
+#
+#    Based on code found at:
+#    http://stackoverflow.com/questions/96882/how-do-i-create-a-nice-looking-dmg-for-mac-os-x-using-command-line-tools
+#
+###############################################################################
+
+#set -o verbose #echo onset +o verbose #echo off
+
+# template for artifacts file names should be passed down in the ENV variable: ARTIFACTS_FILENAME_TEMPLATE
+if [ -z "${ARTIFACTS_FILENAME_TEMPLATE}" ];
+then
+  ARTIFACTS_FILENAME_TEMPLATE="medley-full-@@PLATFORM@@-@@ARCH@@-@@MEDLEY.RELEASE@@_@@MAIKO.RELEASE@@"
+fi
+
+#
+#  Set Parameters
+#
+APP_NAME="Medley.app"
+VOL_NAME="Medley_Install"
+BG_NAME=Install_Message.png
+WIN_WIDTH=700
+WIN_HEIGHT=850
+
+#
+#  Set pathnames
+#
+CWD=$(pwd)
+TMP_DIR=${CWD}/tmp
+RESULTS_DIR=${CWD}/artifacts
+APP_PATH=${RESULTS_DIR}/${APP_NAME}
+DMG_PATH=${RESULTS_DIR}/${VOL_NAME}
+SRC_DIR=${TMP_DIR}/dmg_src
+IMAGES_DIR=${CWD}/images
+SCRIPTS_DIR=${CWD}/scripts
+
+#
+#  Make sure we are in the right directory
+#
+if [ ! -e ${APP_PATH} ];
+then
+  echo "Can't find the app: ${APP_NAME}."
+  echo "Incorrect cwd?  Should be in medley/installers/macos."
+  echo "Or build_app.sh not yet run?"
+  echo "Exiting"
+  exit 1
+fi
+
+#
+#  Copy over files from build app etc to dmg proto-directory
+#
+if [ ! "$1" = "-c" ]
+then
+  #
+  #  Cleanup anything leftover from last run
+  #
+  rm -rf ${SRC_DIR}
+  mkdir -p ${SRC_DIR}
+
+  #
+  #  Assemble source directory for DMG
+  #
+  #ditto ${APP_PATH} ${SRC_DIR}/${APP_NAME}
+  mv ${APP_PATH} ${SRC_DIR}/${APP_NAME}
+  SetFile -a B ${SRC_DIR}/${APP_NAME}
+  ditto ${SCRIPTS_DIR}/medley_add2path ${SRC_DIR}/medley_add2path
+  ditto ${IMAGES_DIR}/${BG_NAME} ${SRC_DIR}/.background/${BG_NAME}
+fi
+
+#
+#  Create initial dmg image
+#
+if [ -e "/Volumes/${VOL_NAME}" ];
+then
+  hdiutil detach /Volumes/${VOL_NAME}
+fi
+rm -f ${DMG_PATH}.temp.dmg
+hdiutil create -srcfolder ${SRC_DIR} -volname ${VOL_NAME} -fs HFS+ \
+               -fsargs "-c c=64,a=16,e=16" -format UDRW ${DMG_PATH}.temp.dmg
+device=$(\
+          hdiutil attach -readwrite -noverify -noautoopen "${DMG_PATH}".temp.dmg \
+          | egrep '^/dev/' | sed 1q | awk '{print $1}' \
+        )
+
+#
+# cd to the new dmg
+#
+pushd /Volumes/${VOL_NAME} >/dev/null 2>&1
+
+#
+#  Add symbolic link for medley script and icon for addpath
+#
+ln -s Medley.app/Contents/MacOS/medley/scripts/medley/medley.command medley
+if [ -z "$(which fileicon)" ];
+then
+  brew install fileicon
+fi
+fileicon set medley_add2path ${IMAGES_DIR}/A2P_icon128.png
+
+#
+# Dress up the appearance using Applescript
+#
+ROW1=375
+ROW2=650
+COL1=139
+COL2=350
+COL3=561
+osascript <<EOT
+  tell application "Finder"
+    tell disk "${VOL_NAME}"
+      open
+      set current view of container window to icon view
+      set toolbar visible of container window to false
+      set statusbar visible of container window to false
+      set old_bounds to bounds of container window
+      set l to item 1 of old_bounds
+      set t to item 2 of old_bounds 
+      set r to l + ${WIN_WIDTH}
+      set b to t + ${WIN_HEIGHT} 
+      set the bounds of container window to {l, t, r, b}
+      set theViewOptions to the icon view options of container window
+      set arrangement of theViewOptions to snap to grid
+      set icon size of theViewOptions to 128
+      set background picture of theViewOptions to file ".background:${BG_NAME}"
+      set appHome to path to applications folder from system domain
+      make new alias file at container window to appHome with properties {name:"Applications"}
+      set appHome to path to applications folder from user domain
+      make new alias file at container window to appHome with properties {name:"My Applications"}
+      set appHome to path to home folder from user domain
+      make new alias file at container window to appHome with properties {name:"My Home Folder"}
+      delay 1
+      set position of item "${APP_NAME}" of container window to     {${COL1}, ${ROW1}}
+      set position of item "medley" of container window to          {${COL2}, ${ROW1}}
+      set position of item "medley_add2path" of container window to {${COL3}, ${ROW1}}
+      set position of item "Applications" of container window to    {${COL1}, ${ROW2}}
+      set position of item "My Applications" of container window to {${COL2}, ${ROW2}}
+      set position of item "My Home Folder" of container window to  {${COL3}, ${ROW2}}
+      close
+    end tell
+  end tell
+EOT
+
+#
+# Add icon to dmg
+#
+fileicon set /Volumes/${VOL_NAME} ${IMAGES_DIR}/Install_icon128.png
+
+#
+# return to original dir
+#
+popd >/dev/null 2>&1
+
+#
+#  Detach the tmp dmg and convert it to final (compressed, ro) dmg
+#
+hdiutil detach ${device}
+sync
+rm -f ${DMG_PATH}.dmg
+hdiutil convert "${DMG_PATH}".temp.dmg -format UDZO -imagekey zlib-level=6 -o ${DMG_PATH}.dmg
+rm -rf "${DMG_PATH}".temp.dmg
+
+#
+#  Extract version info from app Info.plist & rename dmg using version
+#
+sed_script='{/CFBundleVersion/!d;N;s/^.*<string>\(.*\)<\/string>/\1/;s/.0$//;s/\./_/;p;}'
+version=$(sed -ne "${sed_script}" ${SRC_DIR}/${APP_NAME}/Contents/Info.plist)
+DMG_NAME="$(echo ${ARTIFACTS_FILENAME_TEMPLATE} | sed -e 's#@@PLATFORM@@#macos#' -e 's#@@ARCH@@#$universal#' -e 's#@@MEDLEY.RELEASE@@_@@MAIKO.RELEASE@@#${version}#' )"
+mv ${DMG_PATH}.dmg ${RESULTS_DIR}/${DMG_NAME}.dmg
+
+#
+#  Done
+#
+echo "DMG build completed."
+
+###############################################################################
+###############################################################################
+

installers/macos/images/A2P_icon.svg

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   preserveAspectRatio="xMidYMid meet"
+   width="2000"
+   height="2000"
+   viewBox="0 0 2000 2000"
+   version="1.1"
+   id="svg2704"
+   sodipodi:docname="A2P_icon.svg"
+   inkscape:version="1.2 (dc2aeda, 2022-05-15)"
+   inkscape:export-filename="A2P_icon128.png"
+   inkscape:export-xdpi="6.1440001"
+   inkscape:export-ydpi="6.1440001"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <g
+     id="g1126"
+     transform="translate(-23.756927,163.29152)">
+    <text
+       x="597.27948"
+       y="997.78094"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text2702"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:420px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan25093">Medley</tspan></text>
+    <use
+       xlink:href="#window-icon"
+       x="1066.795"
+       y="218.396"
+       width="372"
+       height="300"
+       id="use2674"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="865.021"
+       y="89.851997"
+       width="372"
+       height="300"
+       id="use2676"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="629.06"
+       y="50.366001"
+       width="372"
+       height="300"
+       id="use2678"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="396.42899"
+       y="106.215"
+       width="372"
+       height="300"
+       id="use2680"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="204.11301"
+       y="248.522"
+       width="372"
+       height="300"
+       id="use2682"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="82.689003"
+       y="454.659"
+       width="372"
+       height="300"
+       id="use2684"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="51.462002"
+       y="691.854"
+       width="372"
+       height="300"
+       id="use2686"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="115.396"
+       y="922.39398"
+       width="372"
+       height="300"
+       id="use2688"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="264.327"
+       y="1109.627"
+       width="372"
+       height="300"
+       id="use2690"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="474.577"
+       y="1223.783"
+       width="372"
+       height="300"
+       id="use2692"
+       transform="translate(147.4565)" />
+    <text
+       xml:space="preserve"
+       style="font-style:italic;font-size:766.666px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Italic';fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:7.8"
+       x="1003.8107"
+       y="1163.4888"
+       id="text288"><tspan
+         sodipodi:role="line"
+         id="tspan286"
+         x="1003.8107"
+         y="1163.4888" /></text>
+    <text
+       x="946.01031"
+       y="1500.8351"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text292"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:233.333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan290">add2path</tspan></text>
+  </g>
+  <defs
+     id="defs2708">
+    <rect
+       x="1144.3981"
+       y="797.67157"
+       width="915.91937"
+       height="555.16339"
+       id="rect44588" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview2706"
+     pagecolor="#f5e6c4"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.49895222"
+     inkscape:cx="864.81227"
+     inkscape:cy="918.92566"
+     inkscape:window-width="1752"
+     inkscape:window-height="1205"
+     inkscape:window-x="1508"
+     inkscape:window-y="107"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2704"
+     fit-margin-top="100"
+     fit-margin-left="100"
+     fit-margin-right="100"
+     fit-margin-bottom="100"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <symbol
+     id="window-icon"
+     viewBox="0 0 372 300"
+     transform="translate(-98.918502,49.633999)">
+    <rect
+       x="10"
+       y="10"
+       width="352"
+       height="280"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="rect2665" />
+    <line
+       x1="10"
+       y1="30"
+       x2="362"
+       y2="30"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="line2667" />
+  </symbol>
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="20"
+     style="display:none;fill:#ffffff;stroke:#ff0000;stroke-width:5"
+     id="circle2696" />
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="600"
+     style="display:none;fill:none;stroke:#0000ff;stroke-width:5"
+     id="circle2698" />
+  <rect
+     x="-98.918503"
+     y="49.633999"
+     width="2922"
+     height="1600"
+     style="display:none;fill:none;stroke:#00ff00;stroke-width:10"
+     id="rect2700" />
+  <text
+     xml:space="preserve"
+     id="text44586"
+     style="font-size:40px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, ';white-space:pre;shape-inside:url(#rect44588);display:inline"
+     transform="translate(-98.918502,49.633999)" />
+</svg>

installers/macos/images/App_icon.svg

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   preserveAspectRatio="xMidYMid meet"
+   width="2000"
+   height="2000"
+   viewBox="0 0 2000 2000"
+   version="1.1"
+   id="svg2704"
+   sodipodi:docname="App_icon.svg"
+   inkscape:version="1.2 (dc2aeda, 2022-05-15)"
+   inkscape:export-filename="App_icon512.png"
+   inkscape:export-xdpi="24.576"
+   inkscape:export-ydpi="24.576"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <g
+     id="g1126"
+     transform="translate(-23.756927,163.29152)">
+    <text
+       x="597.27948"
+       y="997.78094"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text2702"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:420px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan25093">Medley</tspan></text>
+    <use
+       xlink:href="#window-icon"
+       x="1066.795"
+       y="218.396"
+       width="372"
+       height="300"
+       id="use2674"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="865.021"
+       y="89.851997"
+       width="372"
+       height="300"
+       id="use2676"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="629.06"
+       y="50.366001"
+       width="372"
+       height="300"
+       id="use2678"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="396.42899"
+       y="106.215"
+       width="372"
+       height="300"
+       id="use2680"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="204.11301"
+       y="248.522"
+       width="372"
+       height="300"
+       id="use2682"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="82.689003"
+       y="454.659"
+       width="372"
+       height="300"
+       id="use2684"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="51.462002"
+       y="691.854"
+       width="372"
+       height="300"
+       id="use2686"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="115.396"
+       y="922.39398"
+       width="372"
+       height="300"
+       id="use2688"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="264.327"
+       y="1109.627"
+       width="372"
+       height="300"
+       id="use2690"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="474.577"
+       y="1223.783"
+       width="372"
+       height="300"
+       id="use2692"
+       transform="translate(147.4565)" />
+    <text
+       xml:space="preserve"
+       style="font-style:italic;font-size:766.666px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Italic';fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:7.8"
+       x="1003.8107"
+       y="1163.4888"
+       id="text288"><tspan
+         sodipodi:role="line"
+         id="tspan286"
+         x="1003.8107"
+         y="1163.4888" /></text>
+    <text
+       x="1263.5646"
+       y="1466.0958"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text292"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:233.333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan290">app</tspan></text>
+  </g>
+  <defs
+     id="defs2708">
+    <rect
+       x="1144.3981"
+       y="797.67157"
+       width="915.91937"
+       height="555.16339"
+       id="rect44588" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview2706"
+     pagecolor="#f5eddc"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.49895222"
+     inkscape:cx="760.59387"
+     inkscape:cy="1017.1315"
+     inkscape:window-width="2286"
+     inkscape:window-height="1205"
+     inkscape:window-x="45"
+     inkscape:window-y="53"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1126"
+     fit-margin-top="100"
+     fit-margin-left="100"
+     fit-margin-right="100"
+     fit-margin-bottom="100"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <symbol
+     id="window-icon"
+     viewBox="0 0 372 300"
+     transform="translate(-98.918502,49.633999)">
+    <rect
+       x="10"
+       y="10"
+       width="352"
+       height="280"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="rect2665" />
+    <line
+       x1="10"
+       y1="30"
+       x2="362"
+       y2="30"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="line2667" />
+  </symbol>
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="20"
+     style="display:none;fill:#ffffff;stroke:#ff0000;stroke-width:5"
+     id="circle2696" />
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="600"
+     style="display:none;fill:none;stroke:#0000ff;stroke-width:5"
+     id="circle2698" />
+  <rect
+     x="-98.918503"
+     y="49.633999"
+     width="2922"
+     height="1600"
+     style="display:none;fill:none;stroke:#00ff00;stroke-width:10"
+     id="rect2700" />
+  <text
+     xml:space="preserve"
+     id="text44586"
+     style="font-size:40px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, ';white-space:pre;shape-inside:url(#rect44588);display:inline"
+     transform="translate(-98.918502,49.633999)" />
+</svg>

installers/macos/images/Command_icon.svg

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   preserveAspectRatio="xMidYMid meet"
+   width="2000"
+   height="2000"
+   viewBox="0 0 2000 2000"
+   version="1.1"
+   id="svg2704"
+   sodipodi:docname="Command_icon.svg"
+   inkscape:version="1.2 (dc2aeda, 2022-05-15)"
+   inkscape:export-filename="Command_icon256.png"
+   inkscape:export-xdpi="12.288"
+   inkscape:export-ydpi="12.288"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <g
+     id="g1126"
+     transform="translate(-23.756927,163.29152)">
+    <text
+       x="597.27948"
+       y="997.78094"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text2702"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:420px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan25093">Medley</tspan></text>
+    <use
+       xlink:href="#window-icon"
+       x="1066.795"
+       y="218.396"
+       width="372"
+       height="300"
+       id="use2674"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="865.021"
+       y="89.851997"
+       width="372"
+       height="300"
+       id="use2676"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="629.06"
+       y="50.366001"
+       width="372"
+       height="300"
+       id="use2678"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="396.42899"
+       y="106.215"
+       width="372"
+       height="300"
+       id="use2680"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="204.11301"
+       y="248.522"
+       width="372"
+       height="300"
+       id="use2682"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="82.689003"
+       y="454.659"
+       width="372"
+       height="300"
+       id="use2684"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="51.462002"
+       y="691.854"
+       width="372"
+       height="300"
+       id="use2686"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="115.396"
+       y="922.39398"
+       width="372"
+       height="300"
+       id="use2688"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="264.327"
+       y="1109.627"
+       width="372"
+       height="300"
+       id="use2690"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="474.577"
+       y="1223.783"
+       width="372"
+       height="300"
+       id="use2692"
+       transform="translate(147.4565)" />
+    <text
+       xml:space="preserve"
+       style="font-style:italic;font-size:766.666px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Italic';fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:7.8"
+       x="1003.8107"
+       y="1163.4888"
+       id="text288"><tspan
+         sodipodi:role="line"
+         id="tspan286"
+         x="1003.8107"
+         y="1163.4888" /></text>
+    <text
+       x="936.01031"
+       y="1500.8351"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text292"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:233.333px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan290">command</tspan></text>
+  </g>
+  <defs
+     id="defs2708">
+    <rect
+       x="1144.3981"
+       y="797.67157"
+       width="915.91937"
+       height="555.16339"
+       id="rect44588" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview2706"
+     pagecolor="#f5ebd3"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.49895222"
+     inkscape:cx="1195.5053"
+     inkscape:cy="916.92146"
+     inkscape:window-width="1752"
+     inkscape:window-height="1205"
+     inkscape:window-x="1099"
+     inkscape:window-y="119"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1126"
+     fit-margin-top="100"
+     fit-margin-left="100"
+     fit-margin-right="100"
+     fit-margin-bottom="100"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <symbol
+     id="window-icon"
+     viewBox="0 0 372 300"
+     transform="translate(-98.918502,49.633999)">
+    <rect
+       x="10"
+       y="10"
+       width="352"
+       height="280"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="rect2665" />
+    <line
+       x1="10"
+       y1="30"
+       x2="362"
+       y2="30"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="line2667" />
+  </symbol>
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="20"
+     style="display:none;fill:#ffffff;stroke:#ff0000;stroke-width:5"
+     id="circle2696" />
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="600"
+     style="display:none;fill:none;stroke:#0000ff;stroke-width:5"
+     id="circle2698" />
+  <rect
+     x="-98.918503"
+     y="49.633999"
+     width="2922"
+     height="1600"
+     style="display:none;fill:none;stroke:#00ff00;stroke-width:10"
+     id="rect2700" />
+  <text
+     xml:space="preserve"
+     id="text44586"
+     style="font-size:40px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, ';white-space:pre;shape-inside:url(#rect44588);display:inline"
+     transform="translate(-98.918502,49.633999)" />
+</svg>

installers/macos/images/Install_icon.svg

@@ -0,0 +1,209 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   preserveAspectRatio="xMidYMid meet"
+   width="2000"
+   height="2000"
+   viewBox="0 0 2000 2000"
+   version="1.1"
+   id="svg2704"
+   sodipodi:docname="Install_icon.svg"
+   inkscape:version="1.2 (dc2aeda, 2022-05-15)"
+   inkscape:export-filename="Install_icon256.png"
+   inkscape:export-xdpi="6.1440001"
+   inkscape:export-ydpi="6.1440001"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <g
+     id="g1126"
+     transform="translate(-23.756927,163.29152)">
+    <text
+       x="597.27948"
+       y="997.78094"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text2702"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:420px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan25093">Medley</tspan></text>
+    <use
+       xlink:href="#window-icon"
+       x="1066.795"
+       y="218.396"
+       width="372"
+       height="300"
+       id="use2674"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="865.021"
+       y="89.851997"
+       width="372"
+       height="300"
+       id="use2676"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="629.06"
+       y="50.366001"
+       width="372"
+       height="300"
+       id="use2678"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="396.42899"
+       y="106.215"
+       width="372"
+       height="300"
+       id="use2680"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="204.11301"
+       y="248.522"
+       width="372"
+       height="300"
+       id="use2682"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="82.689003"
+       y="454.659"
+       width="372"
+       height="300"
+       id="use2684"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="51.462002"
+       y="691.854"
+       width="372"
+       height="300"
+       id="use2686"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="115.396"
+       y="922.39398"
+       width="372"
+       height="300"
+       id="use2688"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="264.327"
+       y="1109.627"
+       width="372"
+       height="300"
+       id="use2690"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="474.577"
+       y="1223.783"
+       width="372"
+       height="300"
+       id="use2692"
+       transform="translate(147.4565)" />
+    <text
+       xml:space="preserve"
+       style="font-style:italic;font-size:766.666px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Italic';fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:7.8"
+       x="1003.8107"
+       y="1163.4888"
+       id="text288"><tspan
+         sodipodi:role="line"
+         id="tspan286"
+         x="1003.8107"
+         y="1163.4888" /></text>
+    <text
+       x="970.08179"
+       y="1540.9191"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text292"
+       style="font-weight:bold;font-size:366.667px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:366.667px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan290">install</tspan></text>
+  </g>
+  <defs
+     id="defs2708">
+    <rect
+       x="1144.3981"
+       y="797.67157"
+       width="915.91937"
+       height="555.16339"
+       id="rect44588" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview2706"
+     pagecolor="#f5ebd3"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.49895222"
+     inkscape:cx="1199.5137"
+     inkscape:cy="920.92986"
+     inkscape:window-width="1752"
+     inkscape:window-height="1205"
+     inkscape:window-x="1099"
+     inkscape:window-y="63"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1126"
+     fit-margin-top="100"
+     fit-margin-left="100"
+     fit-margin-right="100"
+     fit-margin-bottom="100"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <symbol
+     id="window-icon"
+     viewBox="0 0 372 300"
+     transform="translate(-98.918502,49.633999)">
+    <rect
+       x="10"
+       y="10"
+       width="352"
+       height="280"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="rect2665" />
+    <line
+       x1="10"
+       y1="30"
+       x2="362"
+       y2="30"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="line2667" />
+  </symbol>
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="20"
+     style="display:none;fill:#ffffff;stroke:#ff0000;stroke-width:5"
+     id="circle2696" />
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="600"
+     style="display:none;fill:none;stroke:#0000ff;stroke-width:5"
+     id="circle2698" />
+  <rect
+     x="-98.918503"
+     y="49.633999"
+     width="2922"
+     height="1600"
+     style="display:none;fill:none;stroke:#00ff00;stroke-width:10"
+     id="rect2700" />
+  <text
+     xml:space="preserve"
+     id="text44586"
+     style="font-size:40px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, ';white-space:pre;shape-inside:url(#rect44588);display:inline"
+     transform="translate(-98.918502,49.633999)" />
+</svg>

installers/macos/images/MedleyIcon.svg

@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   preserveAspectRatio="xMidYMid meet"
+   width="2000"
+   height="2000"
+   viewBox="0 0 2000 2000"
+   version="1.1"
+   id="svg2704"
+   sodipodi:docname="MedleyIcon.svg"
+   inkscape:version="1.2 (dc2aeda, 2022-05-15)"
+   inkscape:export-filename="C:\Users\Frank\Dev\il\logos\MedleyIcon256.png"
+   inkscape:export-xdpi="12.287999"
+   inkscape:export-ydpi="12.287999"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <g
+     id="g1126"
+     transform="translate(-23.756927,163.29152)">
+    <text
+       x="597.27948"
+       y="997.78094"
+       font-family="'Times New Roman', Times, serif"
+       font-weight="bold"
+       font-size="420px"
+       id="text2702"
+       style="font-weight:bold;font-size:420px;font-family:'Times New Roman', Times, serif"><tspan
+         style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:420px;font-family:Arial;-inkscape-font-specification:'Arial, Normal';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-east-asian:normal"
+         id="tspan25093">Medley</tspan></text>
+    <use
+       xlink:href="#window-icon"
+       x="1066.795"
+       y="218.396"
+       width="372"
+       height="300"
+       id="use2674"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="865.021"
+       y="89.851997"
+       width="372"
+       height="300"
+       id="use2676"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="629.06"
+       y="50.366001"
+       width="372"
+       height="300"
+       id="use2678"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="396.42899"
+       y="106.215"
+       width="372"
+       height="300"
+       id="use2680"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="204.11301"
+       y="248.522"
+       width="372"
+       height="300"
+       id="use2682"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="82.689003"
+       y="454.659"
+       width="372"
+       height="300"
+       id="use2684"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="51.462002"
+       y="691.854"
+       width="372"
+       height="300"
+       id="use2686"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="115.396"
+       y="922.39398"
+       width="372"
+       height="300"
+       id="use2688"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="264.327"
+       y="1109.627"
+       width="372"
+       height="300"
+       id="use2690"
+       transform="translate(147.4565)" />
+    <use
+       xlink:href="#window-icon"
+       x="474.577"
+       y="1223.783"
+       width="372"
+       height="300"
+       id="use2692"
+       transform="translate(147.4565)" />
+    <text
+       xml:space="preserve"
+       style="font-style:italic;font-size:766.666px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Italic';fill:#000000;fill-opacity:0;stroke:#000000;stroke-width:7.8"
+       x="1003.8107"
+       y="1163.4888"
+       id="text288"><tspan
+         sodipodi:role="line"
+         id="tspan286"
+         x="1003.8107"
+         y="1163.4888" /></text>
+  </g>
+  <defs
+     id="defs2708">
+    <rect
+       x="1144.3981"
+       y="797.67157"
+       width="915.91937"
+       height="555.16339"
+       id="rect44588" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview2706"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="1"
+     inkscape:pagecheckerboard="0"
+     showgrid="false"
+     inkscape:zoom="0.49895222"
+     inkscape:cx="1302.7299"
+     inkscape:cy="918.92566"
+     inkscape:window-width="1752"
+     inkscape:window-height="1205"
+     inkscape:window-x="172"
+     inkscape:window-y="96"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g1126"
+     fit-margin-top="100"
+     fit-margin-left="100"
+     fit-margin-right="100"
+     fit-margin-bottom="100"
+     inkscape:showpageshadow="2"
+     inkscape:deskcolor="#d1d1d1" />
+  <symbol
+     id="window-icon"
+     viewBox="0 0 372 300"
+     transform="translate(-98.918502,49.633999)">
+    <rect
+       x="10"
+       y="10"
+       width="352"
+       height="280"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="rect2665" />
+    <line
+       x1="10"
+       y1="30"
+       x2="362"
+       y2="30"
+       style="fill:#ffffff;stroke:#000000;stroke-width:20"
+       id="line2667" />
+  </symbol>
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="20"
+     style="display:none;fill:#ffffff;stroke:#ff0000;stroke-width:5"
+     id="circle2696" />
+  <circle
+     cx="551.08148"
+     cy="699.63397"
+     r="600"
+     style="display:none;fill:none;stroke:#0000ff;stroke-width:5"
+     id="circle2698" />
+  <rect
+     x="-98.918503"
+     y="49.633999"
+     width="2922"
+     height="1600"
+     style="display:none;fill:none;stroke:#00ff00;stroke-width:10"
+     id="rect2700" />
+  <text
+     xml:space="preserve"
+     id="text44586"
+     style="font-size:40px;line-height:1.25;font-family:'Times New Roman';-inkscape-font-specification:'Times New Roman, ';white-space:pre;shape-inside:url(#rect44588)"
+     transform="translate(-98.918502,49.633999)" />
+</svg>

installers/macos/pkg/Distribution.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<installer-gui-script minSpecVersion="1">
+    <pkg-ref id="org.interlisp.Medley"/>
+    <options customize="always" require-scripts="false" hostArchitectures="x86_64,arm64" />
+    <domains enable_anywhere="false" enable_currentUserHome="true" enable_localSystem="false" />
+    <choices-outline>
+        <line choice="default">
+            <line choice="org.interlisp.Medley" />
+        </line>
+        <line choice="Location" />
+    </choices-outline>
+    <choice id="default" visible="false" />
+    <choice id="org.interlisp.Medley"
+            description="D Install for all Users?" 
+            title="T Install for all users?"
+            customLocation="tests"
+    >
+        <pkg-ref id="org.interlisp.Medley"/>
+    </choice>
+    <choice id="Location" 
+            description="D Install for all Users?" 
+            title="T Install for all users?"
+            customLocation="tests"
+    >
+        <pkg-ref id="org.interlisp.Medley"/>
+    </choice>
+    <pkg-ref id="org.interlisp.Medley" version="01.01.01" onConclusion="none">Medley-base.pkg</pkg-ref>
+</installer-gui-script>
+

installers/macos/scripts/medley_add2path

@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# functions to discover what directory this script is being executed from
+get_abs_filename() {
+  # $1 : relative filename
+  echo "$(cd "$(dirname "$1")" && pwd)/$(basename "$1")"
+}
+
+get_script_dir() {
+
+    # call this with ${BASH_SOURCE[0]:-$0} as its (only) parameter
+
+    # set -x
+
+    local SCRIPT_PATH="$( get_abs_filename "$1" )";
+
+    pushd . > '/dev/null';
+
+    while [ -h "$SCRIPT_PATH" ];
+    do
+        cd "$( dirname -- "$SCRIPT_PATH"; )";
+        SCRIPT_PATH="$( readlink -f -- "$SCRIPT_PATH"; )";
+    done
+
+    cd "$( dirname -- "$SCRIPT_PATH"; )" > '/dev/null';
+    SCRIPT_PATH="$( pwd; )";
+
+    popd  > '/dev/null';
+
+    # set +x
+
+    echo "${SCRIPT_PATH}"
+}
+
+SCRIPTDIR=$(get_script_dir "${BASH_SOURCE[0]:-$0}")
+
+touch ~/.profile
+cat >> ~/.profile <<EOF
+PATH=\${PATH}:${SCRIPTDIR}
+EOF
+rm ${SCRIPTDIR}/medley_add2path.command
+
+

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.

installers/win/medley.iss

@@ -34,7 +34,7 @@ SolidCompression=yes
 ; 64-bit Program Files directory and the 64-bit view of the registry.
 ArchitecturesInstallIn64BitMode=x64
 OutputDir="."
-OutputBaseFilename="medley-install_{#version}_{#x86_or_x64}"
+OutputBaseFilename="medley-full-{#version}-windows-{#x86_or_x64}"
 SetupIconFile="Medley.ico"
 DisableWelcomePage=no
 MissingRunOnceIdsWarning=no

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

internal/loadups/LOADUP-LISP

@@ -1,11 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED "31-Jul-2023 18:22:53" |{DSK}<home>frank>il>medley>gmedley>sources>LOADUP-LISP.;2|
 5235   
+
(FILECREATED "14-Mar-2024 12:16:33" |{DSK}<home>larry>il>medley>internal>loadups>LOADUP-LISP.;2|
 5426   
+
+      :EDIT-BY "lmm"
 
       :CHANGES-TO (FNS LOADUP-LISP)
 
-      :PREVIOUS-DATE "27-Feb-2023 17:15:53" 
-|{DSK}<home>frank>il>medley>gmedley>sources>LOADUP-LISP.;1|)
+      :PREVIOUS-DATE "31-Jul-2023 18:22:53" 
+|{DSK}<home>larry>il>medley>internal>loadups>LOADUP-LISP.;1|)
 
 
 (PRETTYCOMPRINT LOADUP-LISPCOMS)
@@ -18,7 +20,8 @@
 (DEFINEQ
 
 (LOADUP-LISP

-  (LAMBDA (DRIBBLEFILE)
                                     (* \; "Edited 26-Feb-2023 12:17 by lmm")


+  (LAMBDA (DRIBBLEFILE)
                                     (* \; "Edited 14-Mar-2024 12:16 by lmm")


+                                                            (* \; "Edited 26-Feb-2023 12:17 by lmm")


                                                             (* \; "Edited 13-Jul-2022 14:09 by rmk")


                                                           (* \; "Edited  4-Mar-2022 19:13 by larry")


                                                            (* \; "Edited 29-Apr-2021 22:30 by rmk:")

@@ -107,6 +110,10 @@
 
     (PACKAGE-ENABLE)
 
+    (* |;;| " Added late")

+
+    (LOADUP '(XCL-LOOP))
+
     (* |;;| " networking code -- should make it optional but too many cross dependencies")

 
     (LOADUP '(PUP 10MBDRIVER LEAF LLETHER DPUPFTP LOCALFILE DSKDISPLAY COURIER LLNS TRSERVER SPP 
@@ -123,5 +130,5 @@
 (GLOBALVARS MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR SYSTEMINITVARS USERRECLST)
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (649 5029 (LOADUP-LISP 659 . 5027)))))
+  (FILEMAP (NIL (673 5220 (LOADUP-LISP 683 . 5218)))))
 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/CLIPBOARD

@@ -1,13 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 7-Jul-2022 23:53:01" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>CLIPBOARD.;7
 9243   
+
(FILECREATED "19-Oct-2023 00:20:01" {WMEDLEY}<library>CLIPBOARD.;8
 9130   
 
-      :CHANGES-TO (VARS CLIPBOARDCOMS)
-                  (FNS CLIPBOARD-COPY-STREAM CLIPBOARD-PASTE-STREAM)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE " 3-Jul-2021 13:16:26" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>CLIPBOARD.;6)
+      :CHANGES-TO (FNS TEDIT.EXTRACTTOCLIPBOARD)
+
+      :PREVIOUS-DATE " 7-Jul-2022 23:53:01" {WMEDLEY}<library>CLIPBOARD.;7)
 
 
 (PRETTYCOMPRINT CLIPBOARDCOMS)
@@ -146,12 +145,12 @@
              THEN
 (PUTCLIPBOARD
 (TEDIT.SEL.AS.STRING TEXTSTREAM])
 
 (TEDIT.EXTRACTTOCLIPBOARD

-  [LAMBDA NIL
                                           (* ; "Edited 19-Apr-2020 12:17 by rmk:")


-                                                            (* ; "Edited 18-Apr-2018 00:02 by rmk:")

-    (LET [(TEXTSTREAM (TEXTSTREAM (TTY.PROCESS]
-         (IF
 TEXTSTREAM
-             THEN
 (PUTCLIPBOARD
 (TEDIT.SEL.AS.STRING TEXTSTREAM))
-                   (TEDIT.DELETE TEXTSTREAM (TEDIT.GETSEL TEXTSTREAM])
+  [LAMBDA (TSTREAM TEXTOBJ SEL)
                              (* ; "Edited 19-Oct-2023 00:19 by rmk")


+                                                            (* ; "Edited 19-Apr-2020 12:17 by rmk:")


+                                                            (* ; "Edited 18-Apr-2018 00:02 by rmk:")

+    (CL:WHEN TSTREAM
+        (PUTCLIPBOARD
 (TEDIT.SEL.AS.STRING TSTREAM))
+        (TEDIT.DELETE TSTREAM SEL))])
 )
 (DEFINEQ
 
@@ -199,8 +198,8 @@
 )
 (PUTPROPS CLIPBOARD COPYRIGHT (NONE))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1317 6626 (INSTALL-CLIPBOARD 1327 . 3259) (GETCLIPBOARD 3261 . 3635) (PUTCLIPBOARD 3637
- . 4042) (PASTEFROMCLIPBOARD 4044 . 4962) (LISPINTERRUPTS.PASTE 4964 . 5385) (CLIPBOARD-COPY-STREAM 
-5387 . 5902) (CLIPBOARD-PASTE-STREAM 5904 . 6624)) (6627 7386 (TEDIT.COPYTOCLIPBOARD 6637 . 6918) (
-TEDIT.EXTRACTTOCLIPBOARD 6920 . 7384)) (7387 8926 (SEDIT.COPYTOCLIPBOARD 7397 . 8924)))))
+  (FILEMAP (NIL (1196 6505 (INSTALL-CLIPBOARD 1206 . 3138) (GETCLIPBOARD 3140 . 3514) (PUTCLIPBOARD 3516
+ . 3921) (PASTEFROMCLIPBOARD 3923 . 4841) (LISPINTERRUPTS.PASTE 4843 . 5264) (CLIPBOARD-COPY-STREAM 
+5266 . 5781) (CLIPBOARD-PASTE-STREAM 5783 . 6503)) (6506 7273 (TEDIT.COPYTOCLIPBOARD 6516 . 6797) (
+TEDIT.EXTRACTTOCLIPBOARD 6799 . 7271)) (7274 8813 (SEDIT.COPYTOCLIPBOARD 7284 . 8811)))))
 STOP

library/CLIPBOARD.TXT

@@ -1,17 +0,0 @@
-library/CLIPBOARD
-
-Written by Ron Kaplan, 2020-2021
-
-A small package that implements copy and paste to the system clipboard.
-
-It arms meta-C for copy to the clipboard from the current selection of an application that has been armed (Tedit, Sedit), and also meta-X for extraction (copy followed by delete).
-
-Meta-V is defined as an interrupt character that pastes the current clipboard contents into whatever process curent has input focus.
-
-The information in the clipboard can be provided from or provided to external (non-Medley) applications (mail, emacs, etc.) in the usual way.  For example, a form cselected in SEDIT can be copied to the clipboard and pasted into an email message.
-
-It assumes that the external format of the clipboard is determined by (SYSTEM-EXTERNALFORMAT, and characters will be converted to and from the Medley internal character encoding.
-
-The name of the clipboard stream may differ from platform to platform.  On the Mac, the paste stream is "pbpaste" and the copy stream is "pbcopy".  Those names are used if "darwin" is a substring of (UNIX-GETENV "ostype").  Otherwise both stream-names default to "xclip".  The functions CLIPBOARD-COPY-STREAM and CLIPBOARD-PASTE-STREAM perform this selection.
-
-

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

@@ -1,14 +1,16 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "27-Oct-2021 10:55:18" {DSK}<home>larry>medley>library>DATABASEFNS.;7
 16051  
+
(FILECREATED "20-Feb-2024 23:45:56" {DSK}<mnt>e>Interlisp>medley>library>DATABASEFNS.;4
 18445  
 
-      changes to%:  (FNS DUMPDB)
+      :EDIT-BY "mth"
 
-      previous date%: "24-Oct-2021 20:18:51" {DSK}<home>larry>medley>library>DATABASEFNS.;6)
+      :CHANGES-TO (FNS DUMPDB)
+
+      :PREVIOUS-DATE "19-Feb-2024 16:29:44" {DSK}<mnt>e>Interlisp>medley>library>DATABASEFNS.;1)
 
 
 (* ; "
-Copyright (c) 1986, 1990-1993 by Xerox Corporation.
+Copyright (c) 1986, 1990-1993, 2024 by Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT DATABASEFNSCOMS)
@@ -31,7 +33,8 @@ Copyright (c) 1986, 1990-1993 by Xerox Corporation.
         (INITVARS (LOADDBFLG 'ASK)
                (SAVEDBFLG 'ASK))
         (ADDVARS (MAKEFILEFORMS (MAKEDB FILE)))
-        (INITVARS (MSFILETABLE))
+        (INITVARS (MSFILETABLE)
+               (DEFAULTDATABASECOPYRIGHTOWNER 'NEVER))
                                                              (* ; "To permit MSHASH interface")

         (LOCALVARS . T)
         (BLOCKS (LOADDB LOADDB DBFILE DBFILE1 DBFILE2 (NOLINKFNS . T)))
@@ -161,52 +164,85 @@ Copyright (c) 1986, 1990-1993 by Xerox Corporation.
 (DEFINEQ
 
 (DUMPDB

-  [LAMBDA (FILE PROPFLG)                                     (* ; 
-
                                                           "Edited 27-Oct-2021 10:51 by larry")

-                                                             (* ; 
-
                                                           "Edited 24-Oct-2021 16:24 by rmk:")

+  [LAMBDA (FILE PROPFLG)
                                     (* ; "Edited 20-Feb-2024 23:45 by mth")


+                                                             (* ; "Edited  7-Feb-2024 18:26 by mth")


+                                                           (* ; "Edited 27-Oct-2021 10:51 by larry")


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

 
     (* ;; "Dumps a Masterscope database for functions in FILE.  Checks the DATABASE property if PROPFLG=T which is how the MAKEFILE advice calls it.  A user-level call would default PROPFLG to NIL.")

 
-    (* ;; 
-
  "The FILE check is because MAKEFILE returns a list when it doesn't understand the options")

+    (* ;; "The FILE check is because MAKEFILE returns a list when it doesn't understand the options")

 
-    (DECLARE
 (GLOBALVARS MSFILETABLE SAVEDBFLG))
+    (DECLARE
 (GLOBALVARS MSFILETABLE SAVEDBFLG COPYRIGHTFLG DEFAULTCOPYRIGHTOWNER)
+           (SPECVARS DEFAULTDATABASECOPYRIGHTOWNER))
     (CL:WHEN (AND FILE (OR (LITATOM FILE)
                            (STRINGP FILE)))
-        (PROG (DBFILE
 (FL (NAMEFIELD FILE))
-                     (FNS (FILEFNSLST FILE)))
-              (COND
-                 (FNS)
-                 ((AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE)))
+        (LET ((SAVEDCOPYRIGHTFLG COPYRIGHTFLG)
+              (SAVEDDEFAULTCOPYRIGHTOWNER DEFAULTCOPYRIGHTOWNER))
+             (CL:UNWIND-PROTECT
+                 (PROG (DBFILE
 DBFN DBROOTFN FLCPR (FL (NAMEFIELD FILE))
+                              (FNS (FILEFNSLST FILE)))
+                       (SETQ DBFN (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL 'BODY FILE))
+                       (SETQ DBROOTFN (ROOTFILENAME DBFN))
+                       (CL:UNLESS (OR (EQ COPYRIGHTFLG 'NEVER)
+                                      (NULL DEFAULTDATABASECOPYRIGHTOWNER)
+                                      (GETPROP DBROOTFN 'COPYRIGHT))
+                           (SELECTQ DEFAULTDATABASECOPYRIGHTOWNER
+                               ((NONE NEVER) 
+                                             (* ;; 
+
                                          "Set the COPYRIGHT to NONE (I.e., never mention it again.)")

+
+                                    (/PUT DBROOTFN 'COPYRIGHT (LIST 'NONE)))
+                               (SAME 
+                                     (* ;; 
+
                         "Same as the source file. If it doesn't have one, then just normal handling")

+
+                                     (CL:WHEN (SETQ FLCPR (GETPROP FL 'COPYRIGHT))
+                                         (/PUT DBROOTFN 'COPYRIGHT (LIST (CAR FLCPR)))))
+                               (DEFAULT 
+                                        (* ;; "Use the general default for copyright")

+
+                                        (SETQ COPYRIGHTFLG 'DEFAULT))
+                               (PROGN (SETQ COPYRIGHTFLG 'DEFAULT)
+
+                                      (* ;; 
+
                        "Hopefully, DEFAULTDATABASECOPYRIGHTOWNER is one of the COPYRIGHTOWNERS keys")

+
+                                      (SETQ DEFAULTCOPYRIGHTOWNER DEFAULTDATABASECOPYRIGHTOWNER))))
+                       (COND
+                          (FNS)
+                          ((AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE)))
                                                              (* ; 
-
                                                           "Always dump if this is a known file")

-                  (SETQ PROPFLG NIL))
-                 (T (COND
-                       (PROPFLG (/REMPROP FL 'DATABASE))
-                       (T (printout T T FILE " has no functions." T)))
-                    (RETURN)))
-              (CL:WHEN [OR (NULL PROPFLG)
-                           (EQ (GETPROP FL 'DATABASE)
-                               'YES)
-                           (EQ SAVEDBFLG 'YES)
-                           (AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE]
-                  (CL:WHEN MSFILETABLE
-                      [STORETABLE FL MSFILETABLE (CAR (GETPROP FL 'FILEDATES])
-                  [SETQ DBFILE (PRETTYDEF NIL (PACKFILENAME 'EXTENSION 'DATABASE 'VERSION NIL
-                                                     'BODY FILE)
-                                      `((P (PROGN (PRIN1 "Use LOADDB to load database files!" T)
-                                                  (ERROR!)))
-                                        (E [PRINT (CAR (GETPROP ',FILE 'FILEDATES]
-                                           (DUMPDATABASE ',FNS]
-                  [COND
-                     (PROPFLG (PRINT (FULLNAME DBFILE)
-                                     T))
-                     (T (/PUT FL 'DATABASEFILENAME DBFILE)   (* ; 
-
                                                   "Remember that we have this file valid already.")

-                        (/PUT FL 'DATABASE 'YES]             (* ; 
-
                                                   "Take future note of the databae on a user call")

-                  (RETURN DBFILE))))])
+
                                                             "Always dump if this is a known file")

+                           (SETQ PROPFLG NIL))
+                          (T (COND
+                                (PROPFLG (/REMPROP FL 'DATABASE))
+                                (T (printout T T FILE " has no functions." T)))
+                             (RETURN)))
+                       (CL:WHEN [OR (NULL PROPFLG)
+                                    (EQ (GETPROP FL 'DATABASE)
+                                        'YES)
+                                    (EQ SAVEDBFLG 'YES)
+                                    (AND MSFILETABLE (TESTTABLE FL (CADR MSFILETABLE]
+                           (CL:WHEN MSFILETABLE
+                               [STORETABLE FL MSFILETABLE (CAR (GETPROP FL 'FILEDATES])
+                           [SETQ DBFILE
+                            (PRETTYDEF NIL DBFN
+                                   `((P (PROGN (PRIN1 "Use LOADDB to load database files!" T)
+                                               (ERROR!)))
+                                     (E [PRINT (CAR (GETPROP ',FILE 'FILEDATES]
+                                        (DUMPDATABASE ',FNS]
+                           [COND
+                              (PROPFLG (PRINT (FULLNAME DBFILE)
+                                              T))
+                              (T (/PUT FL 'DATABASEFILENAME DBFILE)
+                                                             (* ; 
+
                                                     "Remember that we have this file valid already.")

+                                 (/PUT FL 'DATABASE 'YES]    (* ; 
+
                                                    "Take future note of the database on a user call")

+                           (RETURN DBFILE))))
+             (SETQ COPYRIGHTFLG SAVEDCOPYRIGHTFLG)
+             (SETQ DEFAULTCOPYRIGHTOWNER SAVEDDEFAULTCOPYRIGHTOWNER)))])
 
 (LOADDB

   [LAMBDA (FILE ASKFLAG)
                                (* ; "Edited 24-Oct-2021 17:44 by rmk:")


@@ -321,6 +357,8 @@ Copyright (c) 1986, 1990-1993 by Xerox Corporation.
 
 (RPAQ? MSFILETABLE
 )
 
+(RPAQ? DEFAULTDATABASECOPYRIGHTOWNER
 'NEVER)
+
 
 
 (* ; "To permit MSHASH interface")

@@ -337,9 +375,9 @@ Copyright (c) 1986, 1990-1993 by Xerox Corporation.
 
 (RESETSAVE DWIMIFYCOMPFLG T)
 )
-(PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993))
+(PUTPROPS DATABASEFNS COPYRIGHT ("Xerox Corporation" 1986 1990 1991 1992 1993 2024))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1679 6704 (DBFILE 1689 . 3334) (DBFILE1 3336 . 4846) (DBFILE2 4848 . 6070) (LOAD 6072
- . 6302) (LOADFROM 6304 . 6492) (MAKEFILE 6494 . 6702)) (6760 15499 (DUMPDB 6770 . 9534) (LOADDB 9536
- . 14411) (MAKEDB 14413 . 15497)))))
+  (FILEMAP (NIL (1768 6793 (DBFILE 1778 . 3423) (DBFILE1 3425 . 4935) (DBFILE2 4937 . 6159) (LOAD 6161
+ . 6391) (LOADFROM 6393 . 6581) (MAKEFILE 6583 . 6791)) (6849 17838 (DUMPDB 6859 . 11873) (LOADDB 
+11875 . 16750) (MAKEDB 16752 . 17836)))))
 STOP

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

@@ -1,13 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "28-Jul-2023 20:13:45" {DSK}<home>larry>il>medley>library>SPY.;4
 64149  
+
(FILECREATED "27-Feb-2024 20:25:02" {DSK}<home>larry>il>medley>SPY.;1
 53724  
 
       :EDIT-BY "lmm"
 
-      :CHANGES-TO (VARS SPYCOMS)
-                  (FNS \SPY.INTERRUPT SPY.BUFFER.ENTRY SPY.ADD.ENTRY)
+      :CHANGES-TO (RECORDS FX)
+                  (VARS SPYOBJCOMS)
 
-      :PREVIOUS-DATE " 4-Jan-2022 14:09:48" {DSK}<home>larry>il>medley>library>SPY.;1)
+      :PREVIOUS-DATE "28-Jul-2023 20:13:45" {DSK}<home>larry>il>medley>library>SPY.;1)
 
 
 (PRETTYCOMPRINT SPYCOMS)
@@ -114,7 +114,7 @@
                                       (FUNCTION SPYOBJ.BUTTON)
                                       (FUNCTION SPYOBJ.COPYIN)
                                       NIL NIL NIL NIL NIL NIL 'SPYNODE]
-        (DECLARE%: DONTCOPY DOEVAL@COMPILE (RECORDS FX SPYOBJDATA))
+        (DECLARE%: DONTCOPY DOEVAL@COMPILE (RECORDS SPYOBJDATA))
         (INITRECORDS SPYOBJDATA)))
 (DEFINEQ
 
@@ -189,134 +189,6 @@
 (DECLARE%: DONTCOPY DOEVAL@COMPILE 
 (DECLARE%: EVAL@COMPILE
 
-(ACCESSFNS FX
 ((FXBLOCK (ADDSTACKBASE DATUM)))               (* ; "frame extension index")

-              (BLOCKRECORD FXBLOCK ((FLAGS BITS 3)           (* ; "= \STK.FX")

-                                    (FAST FLAG)
-                                    (NIL FLAG)
-                                    (INCALL FLAG)            (* ; 
-
                                                             "set when fncall microcode has to punt")

-                                    (VALIDNAMETABLE FLAG)    (* ; 
-
                                  "if on, NAMETABLE field is filled in.  If off, is same as FNHEADER")

-                                    (NOPUSH FLAG)            (* ; 
-
                           "when returning to this frame, don't push a value.  Set by interrupt code")

-                                    (USECNT BITS 8)
-                                    (%#ALINK WORD)           (* ; "low bit is SLOWP")

-                                    (FNHEADER FULLXPOINTER)
-                                    (NEXTBLOCK WORD)
-                                    (PC WORD)
-                                    (NAMETABLE# FULLXPOINTER)
-                                    (%#BLINK WORD)
-                                    (%#CLINK WORD)))
-              (BLOCKRECORD FXBLOCK ((FLAGBYTE BYTE)
-                                    (NIL BYTE)
-                                    (NIL BITS 15)            (* ; "most of the bits of #ALINK")

-                                    (SLOWP FLAG)             (* ; 
-
                           "if on, then BLINK and CLINK fields are valid.  If off, they are implicit")

-                                    (NIL FULLXPOINTER 2)
-                                    (NAMETABHI WORD)
-                                    (NAMETABLO WORD)))
-              (TYPE?
 (IEQ (fetch
 (FX FLAGS) of
 DATUM)
-                          \STK.FX))
-              [ACCESSFNS FX ((NAMETABLE (COND
-                                           ((fetch
 (FX VALIDNAMETABLE) of
 DATUM)
-                                            (fetch
 (FX NAMETABLE#) of
 DATUM))
-                                           (T (fetch
 (FX FNHEADER) of
 DATUM)))
-                                    (PROGN (replace
 (FX FAST) of
 DATUM with
 NIL)
-                                           (replace
 (FX NAMETABLE#) of
 DATUM with
 NEWVALUE)
-                                           (replace
 (FX VALIDNAMETABLE) of
 DATUM with
 T)))
-                             (FRAMENAME (fetch
 (FNHEADER FRAMENAME) of
 (fetch
 (FX NAMETABLE)
-                                                                          of
 DATUM)))
-                             (INVALIDP (EQ DATUM 0))         (* ; 
-
                                     "true when A/CLink points at nobody, i.e. FX is bottom of stack")

-                             [FASTP (NOT (fetch
 (FX SLOWP) of
 DATUM))
-                                    (PROGN (CHECK (NULL NEWVALUE))
-                                           (COND
-                                              ((fetch
 (FX FASTP) of
 DATUM)
-                                               (replace
 (FX %#BLINK) of
 DATUM
-                                                  with
 (fetch
 (FX DUMMYBF) of
 DATUM))
-                                               (replace
 (FX %#CLINK) of
 DATUM
-                                                  with
 (fetch
 (FX %#ALINK) of
 DATUM))
-                                               (replace
 (FX SLOWP) of
 DATUM with
 T]
-                             [BLINK (COND
-                                       ((fetch
 (FX FASTP) of
 DATUM)
-                                        (fetch
 (FX DUMMYBF) of
 DATUM))
-                                       (T (fetch
 (FX %#BLINK) of
 DATUM)))
-                                    (PROGN (replace
 (FX %#BLINK) of
 DATUM with
 NEWVALUE)
-                                           (COND
-                                              ((fetch
 (FX FASTP) of
 DATUM)
-                                               (replace
 (FX %#CLINK) of
 DATUM
-                                                  with
 (fetch
 (FX %#ALINK) of
 DATUM))
-                                               (replace
 (FX SLOWP) of
 DATUM with
 T]
-                             [CLINK (IDIFFERENCE (COND
-                                                    ((fetch
 (FX FASTP) of
 DATUM)
-                                                     (fetch
 (FX %#ALINK) of
 DATUM))
-                                                    (T (fetch
 (FX %#CLINK) of
 DATUM)))
-                                           \#ALINK.OFFSET)
-                                    (PROGN (replace
 (FX %#CLINK) of
 DATUM with
 (IPLUS NEWVALUE 
-                                                                                      \#ALINK.OFFSET)
-                                                  )
-                                           (COND
-                                              ((fetch
 (FX FASTP) of
 DATUM)
-                                               (replace
 (FX %#BLINK) of
 DATUM
-                                                  with
 (fetch
 (FX DUMMYBF) of
 DATUM))
-                                               (replace
 (FX SLOWP) of
 DATUM with
 T]
-                             [ALINK (IDIFFERENCE (FLOOR (fetch
 (FX %#ALINK) of
 DATUM)
-                                                        WORDSPERCELL)
-                                           \#ALINK.OFFSET)
-                                    (PROGN [COND
-                                              ((fetch
 (FX FASTP) of
 DATUM)
-                                               (replace
 (FX %#BLINK) of
 DATUM
-                                                  with
 (fetch
 (FX DUMMYBF) of
 DATUM))
-                                               (replace
 (FX %#CLINK) of
 DATUM
-                                                  with
 (fetch
 (FX %#ALINK) of
 DATUM]
-                                           (replace
 (FX %#ALINK) of
 DATUM with
 (IPLUS NEWVALUE 
-                                                                                      \#ALINK.OFFSET
-                                                                                      (SUB1 
-                                                                                         WORDSPERCELL
-                                                                                            ]
-                             [ACLINK (SHOULDNT)
-                                    (PROGN [COND
-                                              ((fetch
 (FX FASTP) of
 DATUM)
-                                               (replace
 (FX %#BLINK) of
 DATUM
-                                                  with
 (fetch
 (FX DUMMYBF) of
 DATUM]
-                                           (replace
 (FX %#CLINK) of
 DATUM with
 (IPLUS NEWVALUE 
-                                                                                      \#ALINK.OFFSET)
-                                                  )
-                                           (replace
 (FX %#ALINK) of
 DATUM with
 (IPLUS NEWVALUE 
-                                                                                      \#ALINK.OFFSET
-                                                                                      (SUB1 
-                                                                                         WORDSPERCELL
-                                                                                            ]
-                                                             (* ; 
-
                                      "replaces A & C Links at once more efficiently than separately")

-                             (DUMMYBF (IDIFFERENCE DATUM WORDSPERCELL))
-
-                             (* ;; "This is either an actual BF or %"residual%" BF that provides enough BF to find its IVAR slot.  This means that when a FX is copied, the cell preceding the FX is copied too.")

-
-                             (IVAR (fetch
 (BF IVAR) of
 (fetch
 (FX DUMMYBF) of
 DATUM)))
-                             [CHECKED (AND (type?
 FX DATUM)
-                                           (OR (IEQ (fetch
 (FX DUMMYBF) of
 DATUM)
-                                                    (fetch
 (FX BLINK) of
 DATUM))
-                                               (AND (fetch
 (BF RESIDUAL) of
 (fetch
 (FX DUMMYBF)
-                                                                               of
 DATUM))
-                                                    (IEQ (fetch
 (BF IVAR) of
 (fetch
 (FX DUMMYBF)
-                                                                                of
 DATUM))
-                                                         (fetch
 (BF IVAR) of
 (fetch
 (FX BLINK)
-                                                                                of
 DATUM]
-                             (FIRSTPVAR (IPLUS DATUM (fetch
 (FX FXSIZE) of
 T)))
-                                                             (* ; "stack offset of PVAR0")

-                             (FXSIZE (PROGN 10))             (* ; 
-
                                                             "fixed overhead from flags thru clink")

-                             (PADDING (PROGN 4))             (* ; 
-
                                                            "doublecell of garbage for microcode use")

-                             (FIRSTTEMP (IPLUS (fetch
 (FX FIRSTPVAR) of
 DATUM)
-                                               (fetch
 (FX NPVARWORDS) of
 DATUM)
-                                               (fetch
 (FX PADDING) of
 DATUM)))
-                                                             (* ; 
-
                                                 "note that NPVARWORDS is obtained from the FNHEADER")

-                             (SIZE (IDIFFERENCE (fetch
 (FX NEXTBLOCK) of
 DATUM)
-                                          DATUM])
-
 (RECORD SPYOBJDATA
 (CACHEDLABEL PERCENT LABEL))
 )
 )
@@ -1053,17 +925,17 @@
 
 (MOVD? 'NILL 'MODERNWINDOW)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4707 7314 (SPYOBJ 4717 . 5006) (SPYOBJ.BUTTON 5008 . 5118) (SPYOBJ.SAVE 5120 . 5239) (
-SPYOBJ.COPY 5241 . 5303) (SPYOBJ.GET 5305 . 5434) (SPYOBJ.IMAGEBOX 5436 . 5960) (SPYOBJ.DISPLAY 5962
- . 6261) (SPYOBJ.LABEL 6263 . 6399) (SPYOBJ.HEIGHT 6401 . 6614) (SPYOBJ.COPYIN 6616 . 6659) (
-SPY.COPYBUTTON 6661 . 6753) (SPY.MERGEINFO 6755 . 7312)) (18156 60387 (SPY.FIND.TREE 18166 . 18575) (
-SPY.TOGGLE 18577 . 18767) (SPY.TREE 18769 . 19881) (SPY.LEGEND 19883 . 20233) (SPY.GRAPH.EDITOR 20235
- . 29800) (SPY.END 29802 . 30044) (SPY.MAKEGRAPHNODES 30046 . 32146) (SPY.MAX 32148 . 33031) (
-SPY.MERGE 33033 . 34464) (SPY.MERGE1 34466 . 40949) (SPY.MERGETREE 40951 . 43881) (SPY.NEXT.TREE 43883
- . 44557) (SPY.SUM 44559 . 45248) (SPY.TITLE 45250 . 45467) (SPY.MAKE.TREE 45469 . 47494) (
-SPY.UPDATE.TITLE 47496 . 50072) (SPY.DELETE 50074 . 50609) (SPY.DRAWBOX 50611 . 51136) (
-SPY.BUFFER.ENTRY 51138 . 51481) (SPY.BUTTON 51483 . 52052) (SPY.END.ENTRY 52054 . 52134) (SPY.START 
-52136 . 52420) (SPY.INIT 52422 . 52657) (\SPY.INTERRUPT 52659 . 54064) (SPY.DUMP.BUFFER 54066 . 55526)
- (SPY.START.ENTRY 55528 . 55656) (SPY.ADD.ENTRY 55658 . 56090) (SPY.ORIGINAL 56092 . 56919) (
-SPY.OVERFLOW 56921 . 57022) (SPY.MERGE.CALLEES 57024 . 60060) (SPY.PRINT 60062 . 60385)))))
+  (FILEMAP (NIL (4660 7267 (SPYOBJ 4670 . 4959) (SPYOBJ.BUTTON 4961 . 5071) (SPYOBJ.SAVE 5073 . 5192) (
+SPYOBJ.COPY 5194 . 5256) (SPYOBJ.GET 5258 . 5387) (SPYOBJ.IMAGEBOX 5389 . 5913) (SPYOBJ.DISPLAY 5915
+ . 6214) (SPYOBJ.LABEL 6216 . 6352) (SPYOBJ.HEIGHT 6354 . 6567) (SPYOBJ.COPYIN 6569 . 6612) (
+SPY.COPYBUTTON 6614 . 6706) (SPY.MERGEINFO 6708 . 7265)) (7731 49962 (SPY.FIND.TREE 7741 . 8150) (
+SPY.TOGGLE 8152 . 8342) (SPY.TREE 8344 . 9456) (SPY.LEGEND 9458 . 9808) (SPY.GRAPH.EDITOR 9810 . 19375
+) (SPY.END 19377 . 19619) (SPY.MAKEGRAPHNODES 19621 . 21721) (SPY.MAX 21723 . 22606) (SPY.MERGE 22608
+ . 24039) (SPY.MERGE1 24041 . 30524) (SPY.MERGETREE 30526 . 33456) (SPY.NEXT.TREE 33458 . 34132) (
+SPY.SUM 34134 . 34823) (SPY.TITLE 34825 . 35042) (SPY.MAKE.TREE 35044 . 37069) (SPY.UPDATE.TITLE 37071
+ . 39647) (SPY.DELETE 39649 . 40184) (SPY.DRAWBOX 40186 . 40711) (SPY.BUFFER.ENTRY 40713 . 41056) (
+SPY.BUTTON 41058 . 41627) (SPY.END.ENTRY 41629 . 41709) (SPY.START 41711 . 41995) (SPY.INIT 41997 . 
+42232) (\SPY.INTERRUPT 42234 . 43639) (SPY.DUMP.BUFFER 43641 . 45101) (SPY.START.ENTRY 45103 . 45231) 
+(SPY.ADD.ENTRY 45233 . 45665) (SPY.ORIGINAL 45667 . 46494) (SPY.OVERFLOW 46496 . 46597) (
+SPY.MERGE.CALLEES 46599 . 49635) (SPY.PRINT 49637 . 49960)))))
 STOP