Merge pull request #1269 from Interlisp/fgh_ipfonts

Add ipfonts to release tars

.github/ISSUE_TEMPLATE/documentation.md

@@ -0,0 +1,17 @@
+---
+name: Documentation problem
+about: Problems with this web site?
+title: ''
+labels: ''
+
+---
+
+**Errors happen. Please tell us the URL**
+
+
+**What does it say?**
+
+
+**What should it say?**
+
+**Screen shot**

.github/ISSUE_TEMPLATE/what_people_are_saying.yml

@@ -0,0 +1,32 @@
+name: "New entry for **What People Are Saying**"
+description: "Suggest a new entry for the **What People are Saying** page"
+title: "What People are Saying suggestion"
+body:
+  - type: dropdown
+    id: contentType
+    attributes:
+      label: "What type of entry?"
+      options:
+        - Blog
+        - Tweet
+        - Email
+        - Other
+    validations:
+      required: true
+  - type: input
+    id: entryLink
+    attributes:
+      label: Link to entry
+      description: "What is the link to the item we should add to the **What People are Saying** page?"
+    validations:
+      required: true
+  - type: textarea
+    id: additionalInformation
+    attributes:
+      label:  Additional information
+      description: "Use this space to supply any addiitonal information on the suggested item."
+    validations:
+      required: false
+  - type: markdown
+    attributes:
+      value: "## Thank you for your suggestion!"

.github/workflows/Dockerfile_medley

@@ -0,0 +1,78 @@
+#*******************************************************************************
+# 
+# Dockerfile to build Medley image from latest Maiko image 
+# plus latest release tars from github
+#
+# Copyright 2022-2023 by Interlisp.org
+#
+# ******************************************************************************
+
+FROM ubuntu:22.10
+ARG TARGETPLATFORM
+
+#  Handle ARGs, ENV variables, and LABELs
+ARG BUILD_DATE=unknown
+ARG MEDLEY_RELEASE=unknown
+ARG MAIKO_RELEASE=unknown
+ARG REPO_OWNER=Interlisp
+LABEL name="Medley"
+LABEL description="The Medley Interlisp environment"
+LABEL url="https://github.com/${REPO_OWNER}/medley"
+LABEL build-date=$BUILD_DATE
+LABEL medley_release=$MEDLEY_RELEASE
+LABEL maiko_release=$MAIKO_RELEASE
+
+ENV MEDLEY_DOCKER_BUILD_DATE=$BUILD_DATE
+ENV MEDLEY_RELEASE=$MEDLEY_RELEASE
+ENV MAIKO_RELEASE=$MAIKO_RELEASE
+
+ENV LANG=C.UTF-8
+
+# Copy over the release deb files
+ADD ./*.deb /tmp
+
+# Install Medley/Maiko and add tightvnc server and xclip to the image
+RUN apt-get update                                               \
+    && apt-get install -y apt-utils                              \ 
+    && apt-get install -y tigervnc-standalone-server             \
+    && apt-get install -y xclip                                  \
+    && apt-get install -y man-db                                 \
+    && apt-get install -y nano                                   \
+    && apt-get install -y sudo                                   \
+    && p=$(echo "${TARGETPLATFORM}" | sed -e "s#linux/##")       \
+    && p=$(                                                      \
+           if [ "$p" = "amd64" ];                                \
+               then echo "x86_64";                               \
+           elif [ "$p" = "arm64" ];                              \
+               then echo "aarch64";                              \
+           elif [ "$p" = "arm/v7" ];                             \
+               then echo "armv7l";                               \
+           else                                                  \
+               echo "x86_64";                                    \
+           fi                                                    \
+          )                                                      \
+    && deb="medley-full-${MEDLEY_RELEASE#medley-}"               \
+    && deb=${deb}_${MAIKO_RELEASE#maiko-}-linux-${p}.deb         \
+    && apt-get install -y /tmp/${deb}                            \
+    && chown --recursive root:root /usr/local/interlisp          \
+    && (if [ -n "$(which unminimize)" ]; then (yes | unminimize); fi)
+
+# "Finalize" image
+EXPOSE 5900
+RUN    adduser --gecos "" medley                                 \
+    && adduser --gecos "" ubuntu                                 \
+    && adduser medley sudo                                       \
+    && adduser ubuntu sudo                                       \
+    && (echo 'medley:yeldem' | chpasswd )                        \
+    && (echo 'ubuntu:utnubu' | chpasswd )                        \
+    && echo "medley     ALL=(ALL) NOPASSWD:ALL" >>/etc/sudoers   \
+    && echo "ubuntu     ALL=(ALL) NOPASSWD:ALL" >>/etc/sudoers   \  
+    && mkdir -p /home/medley/il                                  \
+    && chown medley:medley /home/medley/il
+
+ENV TERM=xterm
+USER medley
+WORKDIR /home/medley
+#ENTRYPOINT USER=medley Xvnc -SecurityTypes none -geometry 1280x720 :0 & DISPLAY=:0 medley --full -g 1280x720
+ENTRYPOINT /bin/bash
+

.github/workflows/buildDocker.yml

@@ -136,60 +136,60 @@ jobs:
       # Checkout latest commit
       - name: Checkout Medley
         uses: actions/checkout@v3
+  
+      # 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" ];
+          then
+            tag=$(gh release list | grep Draft | head -n 1 | awk '{ print $3 }')
+          fi
+          if [ -z "${tag}" ];
+          then
+            tag=$(gh release list | grep Latest | head -n 1 | awk '{ print $3 }')
+          fi
+          mkdir -p release_debs
+          gh release download ${tag} -D release_debs -p '*-linux-*.deb'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      # Get Maiko and Medley release information from name of deb files
+      # just downloaded from the Medley latest release
+      - name: Get info about Miako and Medley releases
+        id: release_info
+        run: |
+          regex="^[^0-9]*\([^_]*\)_\([^-]*-[^-]*\)-\([^-]*\)-\([^.]*\).*\$"
+          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)"
+          rm -f debname.tmp
+          echo "MEDLEY_RELEASE=${medley_release}"     >> ${GITHUB_ENV}
+          echo "MAIKO_RELEASE=${maiko_release}"       >> ${GITHUB_ENV}
 
       # Set repo env variables
       - name: Set repo/docker env variables
         id: repo_env
         run: |
-          REPO_NAME=${GITHUB_REPOSITORY#*/}
-          echo "REPO_NAME=${REPO_NAME}" >> ${GITHUB_ENV}
-          echo "repo_name=${REPO_NAME}" >> ${GITHUB_OUTPUT}
-          DOCKER_NAMESPACE=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
-          echo "DOCKER_NAMESPACE=${DOCKER_NAMESPACE}" >> ${GITHUB_ENV}
-          echo "docker_namespace=${DOCKER_NAMESPACE}" >> ${GITHUB_OUTPUT}
-
-      # Get tag of latest Medley release.
-      - name: Get Medley Release Information
-        id: release_info
-        uses: abatilo/release-info-action@v1.3.2
-        with:
-          owner: ${{ github.repository_owner }}
-          repo: medley
-          
-      # Get asset tars from latest Medley release
-      - name: Download Release Assets
-        uses: robinraju/release-downloader@v1.7
-        with:
-          repository: ${{ github.repository_owner }}/medley
-          token: ${{ secrets.GITHUB_TOKEN }}
-          latest: true
-          fileName: "*"
-          out-file-path: "release_tars"
-
-      # Get Maiko release information about latest Maiko Docker Image
-      - name: Get info from latest Maiko image
-        id: maiko_setup
-        run: |
-          docker pull ${DOCKER_NAMESPACE}/maiko:latest
-          MAIKO_RELEASE=$(docker run --entrypoint /bin/bash ${DOCKER_NAMESPACE}/maiko:latest -c "echo \${MAIKO_RELEASE}")
-          echo "MAIKO_RELEASE=${MAIKO_RELEASE}" >> ${GITHUB_ENV}
-          echo "maiko_release=${MAIKO_RELEASE}" >> ${GITHUB_OUTPUT}
-
-      # Setup environment variables
-      - name: Setup Environment Variables
-        id: setup_env
-        run: |
-          RELEASE_TAG=${{ steps.release_info.outputs.latest_tag }}
-          DOCKER_IMAGE=${DOCKER_NAMESPACE}/${REPO_NAME}
+          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 DOCKER_TAGS="${DOCKER_IMAGE}:latest,${DOCKER_IMAGE}:${RELEASE_TAG#*-}_${MAIKO_RELEASE#*-}"
-              else DOCKER_TAGS="${DOCKER_IMAGE}:draft"
+          then 
+              docker_tags="${docker_image}:latest,${docker_image}:${MEDLEY_RELEASE#*-}_${MAIKO_RELEASE#*-}"
+              platforms="linux/amd64,linux/arm64"
+          else 
+              docker_tags="${docker_image}:draft"
+              platforms="linux/amd64"
           fi
-          echo "docker_tags=${DOCKER_TAGS}" >> ${GITHUB_OUTPUT}
-          echo "docker_image=${DOCKER_IMAGE}" >> ${GITHUB_OUTPUT}
-          echo "build_time=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> ${GITHUB_OUTPUT}
-          echo "release_tag=${RELEASE_TAG}" >> ${GITHUB_OUTPUT}
-          echo "release_tag=${RELEASE_TAG}" >> ${GITHUB_ENV}
+          echo "REPO_NAME=${repo_name}"                       >> ${GITHUB_ENV}
+          echo "DOCKER_NAMESPACE=${docker_namespace}"         >> ${GITHUB_ENV}
+          echo "DOCKER_IMAGE=${docker_image}"                 >> ${GITHUB_ENV}
+          echo "DOCKER_TAGS=${docker_tags}"                   >> ${GITHUB_ENV}
+          echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')"  >> ${GITHUB_ENV}
+          echo "PLATFORMS=${platforms}"                       >> ${GITHUB_ENV}
+          #linux/amd64,linux/arm64,linux/arm/v7
 
       # Setup the Docker Machine Emulation environment.  
       - name: Set up QEMU
@@ -217,17 +217,16 @@ jobs:
         with:
           builder: ${{ steps.buildx.outputs.name }}
           build-args: |
-            BUILD_DATE=${{ steps.setup_env.outputs.build_time }}
-            RELEASE_TAG=${{ steps.setup_env.outputs.release_tag }}
-            MAIKO_RELEASE=${{ steps.setup_env.outputs.maiko_release }}
-            DOCKER_NAMESPACE=${{ steps.repo_env.outputs.docker_namespace }}
+            BUILD_DATE=${{ env.BUILD_DATE }}
+            MEDLEY_RELEASE=${{ env.MEDLEY_RELEASE }}
+            MAIKO_RELEASE=${{ env.MAIKO_RELEASE }}
             REPO_OWNER=${{ github.repository_owner }}
-          context: ./release_tars
-          file: ./Dockerfile
-          platforms: linux/amd64,linux/arm64,linux/arm/v7
+          context: ./release_debs
+          file: ./.github/workflows/Dockerfile_medley
+          platforms: ${{ env.PLATFORMS }}
           # Push the result to DockerHub
           push: true
-          tags: ${{ steps.setup_env.outputs.docker_tags }}
+          tags: ${{ env.DOCKER_TAGS }}
 
 ######################################################################################
 

.github/workflows/buildLoadup.yml

@@ -49,12 +49,15 @@ on:
         required: false
         type: string
         default: 'false'
+    secrets:
+      OIO_SSH_KEY:
+        required: true
 
 defaults:
   run:
     shell: bash
-    
-  
+
+
 jobs:
 
 ######################################################################################
@@ -80,7 +83,7 @@ jobs:
               echo "draft=${{ inputs.draft }}" >> $GITHUB_OUTPUT;
               echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT;
           fi
-        
+
 
 
 ######################################################################################
@@ -94,7 +97,7 @@ jobs:
     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
@@ -104,7 +107,7 @@ jobs:
       - 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
@@ -113,6 +116,8 @@ jobs:
 
 ######################################################################################
 
+
+  #
   # Do the loadup
   # 
 
@@ -120,11 +125,17 @@ jobs:
 
     runs-on: ubuntu-latest
 
+    outputs:
+      combined_release_tag: ${{ steps.job_outputs.outputs.COMBINED_RELEASE_TAG }}
+      medley_release_tag: ${{ steps.job_outputs.outputs.MEDLEY_RELEASE_TAG }}
+      medley_short_release_tag: ${{ steps.job_outputs.outputs.MEDLEY_SHORT_RELEASE_TAG }}
+      debs_filename_base: ${{ steps.debs.outputs.DEBS_FILENAME_BASE }}
+
     needs: [inputs, sentry]
     if: |
       needs.sentry.outputs.release_not_built == 'true'
       || needs.inputs.outputs.force == 'true'
-    
+
     steps:
       # Checkout the actions for this repo owner
       - name: Checkout Actions
@@ -143,20 +154,6 @@ jobs:
         id: tag
         uses: ./../actions/release-tag-action
 
-      # Setup environment variables
-      - name: Setup Environment Variables
-        id: setup_env
-        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 "MEDLEY_RELEASE_TAG=${RELEASE_TAG}" >>${GITHUB_ENV}
-
-      # Setup some needed dirs in workspace
-      - name: Create work dirs
-        run: mkdir -p ${TARBALL_DIR}
-
       # Get Maiko release information, retrieves the name of the latest
       # release.  Used to download the correct Maiko release
       - name: Get Maiko Release Information
@@ -165,7 +162,34 @@ jobs:
         with:
           owner: ${{ github.repository_owner }}
           repo: maiko
-          
+
+      # 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 "MEDLEY_RELEASE_TAG=${RELEASE_TAG}" >>${GITHUB_ENV}
+          echo "MAIKO_RELEASE_TAG=${{ steps.maiko.outputs.latest_tag }}" >>${GITHUB_ENV}
+      - name: More Environment Variables
+        run: |
+          echo "MEDLEY_SHORT_RELEASE_TAG=${MEDLEY_RELEASE_TAG#medley-}" >>${GITHUB_ENV}
+          echo "MAIKO_SHORT_RELEASE_TAG=${MAIKO_RELEASE_TAG#maiko-}" >>${GITHUB_ENV}
+      - name: Even More Environment Variables
+        run: |
+          echo "COMBINED_RELEASE_TAG=${MEDLEY_SHORT_RELEASE_TAG}_${MAIKO_SHORT_RELEASE_TAG}" >>${GITHUB_ENV}
+      - 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;
+
+      # Setup some needed dirs in workspace
+      - name: Create work dirs
+        run: mkdir -p ${TARBALL_DIR}
+
       # Download Maiko Release Assets
       - name: Download Release Assets
         uses: robinraju/release-downloader@v1.6
@@ -174,11 +198,11 @@ jobs:
           token: ${{ secrets.GITHUB_TOKEN }}
           latest: true
           out-file-path: ${{ env.TARBALL_DIR }}
-          fileName: "${{ steps.maiko.outputs.latest_tag }}-linux.*.tgz" 
+          fileName: "${{ env.MAIKO_RELEASE_TAG }}-linux.*.tgz"
 
       - name: Untar Maiko Release for use in loadup
         run: |
-          tar -xzf "${TARBALL_DIR}/${{ steps.maiko.outputs.latest_tag }}-linux.x86_64.tgz"
+          tar -xzf "${TARBALL_DIR}/${{ env.MAIKO_RELEASE_TAG }}-linux.x86_64.tgz"
 
       # Checkout Notecards and tar it in the tarballsdir
       - name: Checkout Notecards
@@ -192,7 +216,7 @@ jobs:
           cd ..
           tar cfz medley/${TARBALL_DIR}/notecards.tgz notecards
 
-      #
+      # Install vnc
       - name: Install vnc
         run: sudo apt-get update && sudo apt-get install -y tightvncserver
 
@@ -200,22 +224,24 @@ jobs:
         run: |
           Xvnc -geometry 1280x720 :0 &
           export DISPLAY=":0"
-          PATH="$PWD/maiko:$PATH" 
+          PATH="$PWD/maiko:$PATH"
           scripts/loadup-all.sh -apps
 
       - name: Build loadups release tar
         run: |
           cd ..
+          mkdir -p medley/${TARBALL_DIR}
           tar cfz medley/${TARBALL_DIR}/${MEDLEY_RELEASE_TAG}-loadups.tgz        \
             medley/loadups/lisp.sysout               \
             medley/loadups/full.sysout               \
             medley/loadups/apps.sysout               \
             medley/loadups/whereis.hash              \
             medley/library/exports.all
-      
+
       - name: Build runtime release tar
         run: |
           cd ..
+          mkdir -p medley/${TARBALL_DIR}
           tar cfz medley/${TARBALL_DIR}/${MEDLEY_RELEASE_TAG}-runtime.tgz          \
                      --exclude "*~" --exclude "*#*"              \
                      --exclude exports.all                       \
@@ -232,27 +258,33 @@ jobs:
                      medley/fonts/altofonts                      \
                      medley/fonts/adobe                          \
                      medley/fonts/postscriptfonts                \
+                     medley/fonts/ipfonts                        \
                      medley/library                              \
                      medley/lispusers                            \
                      medley/sources                              \
                      medley/internal
 
 
+      # 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
+          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
         with:
-            tag: ${{ env.MEDLEY_RELEASE_TAG }} 
+            tag: ${{ env.MEDLEY_RELEASE_TAG }}
         continue-on-error: true
 
       - name: Push the release
         id: push_release
         uses: ncipollo/release-action@v1
-        with: 
+        with:
           allowUpdates: true
           artifacts:
             ${{ env.TARBALL_DIR }}/${{ env.MEDLEY_RELEASE_TAG }}-loadups.tgz,
@@ -265,36 +297,108 @@ jobs:
           generateReleaseNotes: true
           token: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Update the downloads page and the man page to the OIO satic page host
+
+  #
+  # Create the Windows installer, push it up to the release on github and
+  # update the downloads page on OIO
+  #
+  windows_installer:
+
+    runs-on: windows-latest
+
+    needs: [inputs, sentry, loadup]
+    if: |
+      needs.sentry.outputs.release_not_built == 'true'
+      || needs.inputs.outputs.force == 'true'
+
+    steps:
+      # Checkout latest commit
+      - name: Checkout Medley
+        uses: actions/checkout@v3
+
+      # Store the values output from loadup job as environment variables
+      - name: Environment Variables
+        shell: powershell
         run: |
-            maiko_release_tag="${{ steps.maiko.outputs.latest_tag }}"
-            medley_short_release_tag="${MEDLEY_RELEASE_TAG#medley-}"
-            full_release_filename="${MEDLEY_RELEASE_TAG/medley/medley-full}_${maiko_release_tag#maiko-}"
-            # Need info about where github stores assets because draft releases are not tagged
-            release_url="${{ steps.push_release.outputs.html_url }}"
-            github_subdir="$( echo "${release_url}" | sed -e "s#^.*/\([^/]\+\)\$#\1#g" )"
-            #
+          $crt="${{ needs.loadup.outputs.combined_release_tag }}"
+          echo "COMBINED_RELEASE_TAG=$crt" | Out-File -FilePath $Env:GITHUB_ENV -Encoding utf8 -Append
+          $mrt="${{ needs.loadup.outputs.medley_release_tag }}"
+          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
+          $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
+        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
+        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
+
+      # Upload windows installer to release
+      - name: Upload windows installer to release
+        id: push
+        uses: ncipollo/release-action@v1
+        with:
+          allowUpdates: true
+          artifacts: installers/win/${{ env.INSTALLER_FILENAME }}
+          tag: ${{ env.MEDLEY_RELEASE_TAG }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          omitBodyDuringUpdate: true
+          omitDraftDuringUpdate: true
+          omitNameDuringUpdate: true
+          omitPrereleaseDuringUpdate: true
+
+      # Install the OpenSSH Client
+      - name: Install the OpenSSH Client
+        shell: powershell
+        run: |
+          Add-WindowsCapability -Online -Name OpenSSH.Client~~~~0.0.1.0
+
+      # 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="${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" ];
             then
                 remote_filename="draft_downloads"
+                remote_manname="man_draft.html"
             else
                 remote_filename="${local_filename%.html}"
-            fi            
+                remote_manname="man_medley.html"
+            fi
             remote_filepath="/srv/oio/static/${remote_filename}"
+            remote_manpath="/srv/oio/static/${remote_manname}"
+            # Fill in downloads page template
             sed \
-               -e "s/@@@FULL.RELEASE.FILENAME@@@/${full_release_filename}/g" \
-               -e "s/@@@GITHUB.SUBDIR@@@/${github_subdir}/g" \
-               -e "s/@@@MEDLEY.SHORT.RELEASE.TAG@@@/${medley_short_release_tag}/g" \
+               -e "s/@@@MEDLEY.SHORT.RELEASE.TAG@@@/${MEDLEY_SHORT_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" \
                < "${local_template}" > "${local_filename}"
-            local_manpath="docs/man-page/man_medley.html"
-            remote_manpath="/srv/oio/static/man_medley.html"
+            # Create sftp instruction file
             echo "-rm ${remote_filepath}.oldold" > batch
             echo "-rename ${remote_filepath}.old ${remote_filepath}.oldold" >> batch
             echo "-rename ${remote_filepath}.html ${remote_filepath}.old" >> batch
             echo "-put ${local_filename} ${remote_filepath}.html" >> batch
             echo "-put ${local_manpath} ${remote_manpath}" >> batch
+            # Do the sftp
             eval $(ssh-agent)
             ssh-add - <<< "${SSH_KEY}"
             sftp -o StrictHostKeyChecking=no -b batch ubuntu@online.interlisp.org
@@ -302,6 +406,7 @@ jobs:
             SSH_KEY: ${{ secrets.OIO_SSH_KEY }}
 
 
+
 ######################################################################################
 
   # Use set-sentry-action to determine set the sentry that says this release has
@@ -314,9 +419,9 @@ jobs:
     outputs:
       build_successful: ${{ steps.output.outputs.build_successful }}
 
-    needs: [inputs, sentry, loadup]
+    needs: [inputs, sentry, loadup, windows_installer]
 
-    steps: 
+    steps:
       # Checkout the actions for this repo owner
       - name: Checkout Actions
         uses: actions/checkout@v3
@@ -336,5 +441,23 @@ jobs:
         id: output
         run: |
           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

@@ -18,6 +18,9 @@ name: "Build/Push Release & Docker"
 
 # Run this workflow on ...
 on:
+  schedule:
+    - cron: '0 9 * * 1'
+
   workflow_dispatch:
     inputs:
       draft:
@@ -53,7 +56,7 @@ on:
 defaults:
   run:
     shell: bash
-    
+
 
 # Jobs that compose this workflow
 jobs:
@@ -72,17 +75,14 @@ jobs:
     steps:
       - id: one
         run: >
-          if [ '${{ toJSON(inputs) }}' = 'null'  ];
+          if [ '${{ toJSON(inputs) }}' != 'null'  ];
           then
-              echo "workflow_dispatch";
-              echo "draft=${{ github.event.inputs.draft }}" >> $GITHUB_OUTPUT;
-              echo "force=${{ github.event.inputs.force }}" >> $GITHUB_OUTPUT;
+            echo "draft=${{ inputs.draft }}" >> $GITHUB_OUTPUT;
+            echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT;
           else
-              echo "workflow_call";
-              echo "draft=${{ inputs.draft }}" >> $GITHUB_OUTPUT;
-              echo "force=${{ inputs.force }}" >> $GITHUB_OUTPUT;
+            echo "draft=false" >> $GITHUB_OUTPUT;
+            echo "force=false" >> $GITHUB_OUTPUT;
           fi
-        
 
 ######################################################################################
 
@@ -94,7 +94,9 @@ jobs:
     with:
         draft: ${{ needs.inputs.outputs.draft }}
         force: ${{ needs.inputs.outputs.force }}
-    
+    secrets:
+        OIO_SSH_KEY: ${{ secrets.OIO_SSH_KEY }}
+
 
 ######################################################################################
 
@@ -109,6 +111,5 @@ jobs:
         DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
         DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
 
-
 ######################################################################################
 

.github/workflows/testLogin.yml

@@ -1,23 +0,0 @@
-name: 'Test Docker Login'
-
-# Run this workflow on ...
-on:
-  workflow_dispatch:
-
-defaults:
-  run:
-    shell: bash
-    
-
-jobs:
-
-  login_test:
-    runs-on: ubuntu-latest
-    steps:
-      - id: only_step
-        uses: docker/login-action@v1
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-

Dockerfile

@@ -1,55 +0,0 @@
-#*******************************************************************************
-# 
-# Dockerfile to build Medley image from latest Maiko image 
-# plus latest release tars from github
-#
-# Copyright 2022-2023 by Interlisp.org
-#
-# ******************************************************************************
-
-ARG DOCKER_NAMESPACE=interlisp
-
-FROM ${DOCKER_NAMESPACE}/maiko:latest
-
-# Add tightvnc server and xclip to the image
-RUN apt-get update && apt-get install -y tightvncserver && apt-get install -y xclip
-
-#  Handle ARGs, ENV variables, and LABELs
-ARG BUILD_DATE=unknown
-ARG RELEASE_TAG=unknown
-ARG MAIKO_RELEASE=unknown
-ARG REPO_OWNER=Interlisp
-LABEL name="Medley"
-LABEL description="The Medley Interlisp environment"
-LABEL url="https://github.com/${REPO_OWNER}/medley"
-LABEL build-time=$BUILD_DATE
-LABEL release_tag=$RELEASE_TAG
-LABEL maiko_release=$MAIKO_RELEASE
-
-ENV MEDLEY_BUILD_DATE=$BUILD_DATE
-ENV MEDLEY_RELEASE=$RELEASE_TAG
-
-ARG IL_INSTALLDIR=/usr/local/interlisp
-ENV IL_INSTALLDIR=${IL_INSTALLDIR}
-ENV MAIKO_INSTALLDIR=${IL_INSTALLDIR}/maiko
-ENV MEDLEY_INSTALLDIR=${IL_INSTALLDIR}/medley
-
-ARG DOCKER_NAMESPACE=interlisp
-ENV DOCKER_NAMESPACE=${DOCKER_NAMESPACE}
-
-ENV LANG=C.UTF-8
-
-# Copy over the release tars
-RUN mkdir -p ${IL_INSTALLDIR}
-ADD ./*.tgz ${IL_INSTALLDIR}
-
-# Link run_medley script into /usr/local/bin
-RUN mkdir -p /usr/local/bin && \
-    ln -s ${MEDLEY_INSTALLDIR}/run-medley /usr/local/bin/run-medley
-    
-# "Finalize" image
-EXPOSE 5900
-RUN adduser --disabled-password --gecos "" medley
-USER medley
-WORKDIR /home/medley
-ENTRYPOINT USER=medley Xvnc -geometry 1280x720 :0 & DISPLAY=:0 ${MEDELY_INSTALLDIR}/run-medley -full -g 1280x720 -sc 1280x720

README.md

@@ -105,8 +105,7 @@ dump of your system located in your home directory named
 specify a specific image to run, Medley restores that image so that
 you can continue right where you left off.
 
-* [Using Medley Interlisp](https://github.com/Interlisp/medley/wiki/Using-Medley-Interlisp)
-
+* [Using Medley Interlisp](https://interlisp.org/doc/info/Using.html)
 
 ## Naming conventions and directory structure
 

docs/man-page/man_medley.html

@@ -37,35 +37,50 @@
 <dd><p>Sets the size of the virtual display as seen from Medley’s point of view. The Medley window is an unscaled viewport onto this virtual display. If --screensize is not specified but --geometry is, then the virtual display size will be set so that the entire virtual display fits into the given window geometry. If neither --screensize nor --geometry is provided, then the screen size is set to 1440x900.</p>
 </dd>
 <dt><strong>-t <em>STRING</em>, --title <em>STRING</em></strong></dt>
-<dd><p>Use STRING as title of Medley window. Not relevent when the --vnc flag is set.</p>
+<dd><p>Use STRING as title of Medley window. Ignored when when the --vnc flag is set or when running on Windows (Docker) installations.</p>
 </dd>
-<dt><strong>-d <em>:N</em>, --display <em>:N</em></strong></dt>
-<dd><p>Use X display :N. Defaults to the value of $DISPLAY. Not relevant when the --vnc flag is set.</p>
+<dt><strong>-d <em>:N</em>, --display <em>:N</em> ** <strong>Not</strong> applicable to Windows (Docker) installations **</strong></dt>
+<dd><p>Use X display :N. Defaults to the value of $DISPLAY. This flag is ignored when the --vnc flag is set as well as on Windows (Docker) installations.</p>
 </dd>
-<dt><strong>-v, --vnc (Applicable only to Windows System for Linux installations)</strong></dt>
-<dd><p>Use a VNC window running on the Windows side instead of an X window. The VNC window will folllow the Windows desktop scaling setting allowing for much more usable Medley on high resolution displays. On WSL, X windows do not scale well.</p>
+<dt><strong>-v, --vnc ** <strong>Applicable</strong> only to WSL installations **</strong></dt>
+<dd><p>Use a VNC window running on the Windows side instead of an X window. The VNC window will folllow the Windows desktop scaling setting allowing for much more usable Medley on high resolution displays. On WSL, X windows do not scale well. This flag is always set for WSL1 installations.</p>
 </dd>
 <dt><strong>-i [<em>ID_STRING</em> | - | --], --id [<em>ID_STRING</em> | - | --]</strong></dt>
 <dd><p>Use ID_STRING as the id for this run of Medley, iunless ID_STRING is “-” or “--”. If ID_STRING is “-”, then use the basename of $MEDLEYDIR as the id. If ID_STRING is “--”, then use the basename of the parent directory of $MEDLEYDIR as the id. Only one instance of Medley with a given id can run at a time. The id is used to distinguish the virtual memory stores so that multiple instances of Medley can run simultaneously. Default id is “default”.</p>
 </dd>
 <dt><strong>-m <em>N</em>, --mem <em>N</em></strong></dt>
-<dd><p>Set Medley to run in N MB of virtual memory. Defaults to 256MB.</p>
+<dd><p>Set Medley to run in <em>N</em> MB of virtual memory. Defaults to 256MB.</p>
 </dd>
 <dt><strong>-p <em>FILE</em>, --vmem <em>FILE</em></strong></dt>
-<dd><p>Use FILE as the Medley virtual memory (vmem) store. FILE must be writeable by the current user. Care must be taken not to use the same vmem FILE for two instances of Medley running simultaneously. The --id flag will not protect against vmem collisions when the --vmem flag is used. Default is to store the vmem in LOGINDIR/vmem/lisp_XXX.virtualmem, where XXX is the id of this Medley run (see --id flag above). See --logindir below for setting of LOGINDIR.</p>
+<dd><p>Use FILE as the Medley virtual memory (vmem) store. FILE must be writeable by the current user. Care must be taken not to use the same vmem FILE for two instances of Medley running simultaneously. The --id flag will not protect against vmem collisions when the --vmem flag is used. Default is to store the vmem in LOGINDIR/vmem/lisp_XXX.virtualmem, where XXX is the id of this Medley run (see --id flag above). See --logindir below for setting of LOGINDIR. On Windows (Docker) installations, <em>FILE</em> is specified in the Medley file system, not the host Windows file system.</p>
 </dd>
 <dt><strong>-r [<em>FILE</em> | -], --greet [<em>FILE</em> | -]</strong></dt>
-<dd><p>Use FILE as the Medley greetfile, unless FILE is “-” in which case Medley will start up without using a greetfile. The default Medley greetfile is $MEDLEYDIR/greetfiles/MEDLEYDIR-INIT, except when the --apps flag is used in which case it is $MEDLEYDIR/greetfiles/APPS-INIT.</p>
+<dd><p>Use FILE as the Medley greetfile, unless FILE is “-” in which case Medley will start up without using a greetfile. The default Medley greetfile is $MEDLEYDIR/greetfiles/MEDLEYDIR-INIT, except when the --apps flag is used in which case it is $MEDLEYDIR/greetfiles/APPS-INIT. On Windows (Docker) installations, <em>FILE</em> is specified in the Medley file system, not the host Windows file system.</p>
 </dd>
-<dt><strong>-x [<em>DIR</em> | -], --logindir [<em>DIR</em> | -]</strong></dt>
-<dd><p>use DIR as LOGINDIR in Medley, unless DIR is “-”, in which case use $MEDLEYDIR/logindir. DIR (or $MEDLEYDIR/logindir) must be writeable by the current user. LOGINDIR defaults to $HOME/il. LOGINDIR is used by Medley as the working directory on start-up and where it loads any “personal” initialization file from.</p>
+<dt><strong>-x [<em>DIR</em> | -], --logindir [<em>DIR</em> | -] ** <strong>On</strong> Linux and WSL installations **</strong></dt>
+<dd><p>Use DIR as LOGINDIR in Medley, unless DIR is “-”, in which case use $MEDLEYDIR/logindir. DIR (or $MEDLEYDIR/logindir) must be writeable by the current user. LOGINDIR defaults to $HOME/il. LOGINDIR is used by Medley as the working directory on start-up and where it loads any “personal” initialization file from.</p>
+</dd>
+<dt><strong>-x [<em>DIR</em> | -], --logindir [<em>DIR</em> | -] ** <strong>On</strong> Windows (Docker) installations **</strong></dt>
+<dd><p>Map DIR in the Windows host file system to /home/medley/il in the Medley file system (in the Docker container). LOGINDIR is always /home/medley/il from Medley’s standpoint. The “-” value is not valid in this case.</p>
+</dd>
+<dt><strong>-u, --update ** <strong>Windows</strong> (Docker) installations only **</strong></dt>
+<dd><p>Before running Medley, do a pull to retrieve the latest interlisp/medley docker image from Docker Hub.</p>
+</dd>
+<dt><strong>-b, --background ** <strong>Windows</strong> (Docker) installations only **</strong></dt>
+<dd><p>Run Medley in background rather than foreground.</p>
+</dd>
+<dt><strong>-p <em>PORT</em>, --port <em>PORT</em> ** <strong>Windows</strong> (Docker) installations only **</strong></dt>
+<dd><p>Use <em>PORT</em> as the port that VNC viewer uses to contact the VNC server within the Docker container. Default is 5900.</p>
+</dd>
+<dt><strong>-w [<em>DISTRO</em> | -], --wsl [<em>DISTRO</em> | -] ** <strong>Windows</strong> (Docker) installations only **</strong></dt>
+<dd><p>Run Medley in the context of the named WSL <em>DISTRO</em> instead of within Docker. If <em>DISTRO</em> is “-”, used the default WSL distro. Equivalent to typing “wsl -d <em>DISTRO</em> medley ...” into a Command or Powershell window.</p>
 </dd>
 </dl>
 <h2>Other Options</h2>
 
 <dl>
 <dt><strong><em>SYSOUT_FILE</em></strong></dt>
-<dd><p>The pathname of the file to use as a sysout for Medley to start from. If SYSOUT_FILE is not provided and none of the flags (--apps, --full, --lisp) is used, then Medley will start from the saved virtual memory file from the previous session with the same ID_STRING as this run. If no such virtual memory file exists, then Medley will start from the standard full.sysout (equivalent to specifying the --full flag).</p>
+<dd><p>The pathname of the file to use as a sysout for Medley to start from. If SYSOUT_FILE is not provided and none of the flags (--apps, --full, --lisp) is used, then Medley will start from the saved virtual memory file from the previous session with the same ID_STRING as this run. If no such virtual memory file exists, then Medley will start from the standard full.sysout (equivalent to specifying the --full flag). On Windows (Docker) installations, <em>SYSOUT_FILE</em> is specified in the Medley file system, not the host Windows file system.</p>
 </dd>
 <dt><strong><em>PASS_ON_ARGS</em></strong></dt>
 <dd><p>All arguments after the “--” flag, are passed unaltered to lde via run-medley.</p>

docs/man-page/medley.1

@@ -95,18 +95,21 @@ size is set to 1440x900.
 .TP
 .B \-t \f[I]STRING\f[R], \-\-title \f[I]STRING\f[R]
 Use STRING as title of Medley window.
-Not relevent when the \-\-vnc flag is set.
+Ignored when when the \-\-vnc flag is set or when running on Windows
+(Docker) installations.
 .TP
-.B \-d \f[I]:N\f[R], \-\-display \f[I]:N\f[R]
+.B \-d \f[I]:N\f[R], \-\-display \f[I]:N\f[R]\ \ \ \ ** \f[B]Not applicable to Windows (Docker) installations\f[R] **
 Use X display :N.
 Defaults to the value of $DISPLAY.
-Not relevant when the \-\-vnc flag is set.
+This flag is ignored when the \-\-vnc flag is set as well as on Windows
+(Docker) installations.
 .TP
-.B \-v, \-\-vnc (Applicable only to Windows System for Linux installations)
+.B \-v, \-\-vnc\ \ \ \ ** \f[B]Applicable only to WSL installations\f[R] **
 Use a VNC window running on the Windows side instead of an X window.
 The VNC window will folllow the Windows desktop scaling setting allowing
 for much more usable Medley on high resolution displays.
 On WSL, X windows do not scale well.
+This flag is always set for WSL1 installations.
 .TP
 .B \-i [\f[I]ID_STRING\f[R] | \- | \-\-], \-\-id [\f[I]ID_STRING\f[R] | \- | \-\-]
 Use ID_STRING as the id for this run of Medley, iunless ID_STRING is
@@ -121,7 +124,7 @@ instances of Medley can run simultaneously.
 Default id is \[lq]default\[rq].
 .TP
 .B \-m \f[I]N\f[R], \-\-mem \f[I]N\f[R]
-Set Medley to run in N MB of virtual memory.
+Set Medley to run in \f[I]N\f[R] MB of virtual memory.
 Defaults to 256MB.
 .TP
 .B \-p \f[I]FILE\f[R], \-\-vmem \f[I]FILE\f[R]
@@ -134,6 +137,8 @@ The \-\-id flag will not protect against vmem collisions when the
 Default is to store the vmem in LOGINDIR/vmem/lisp_XXX.virtualmem, where
 XXX is the id of this Medley run (see \-\-id flag above).
 See \-\-logindir below for setting of LOGINDIR.
+On Windows (Docker) installations, \f[I]FILE\f[R] is specified in the
+Medley file system, not the host Windows file system.
 .TP
 .B \-r [\f[I]FILE\f[R] | \-], \-\-greet [\f[I]FILE\f[R] | \-]
 Use FILE as the Medley greetfile, unless FILE is \[lq]\-\[rq] in which
@@ -141,14 +146,41 @@ case Medley will start up without using a greetfile.
 The default Medley greetfile is $MEDLEYDIR/greetfiles/MEDLEYDIR\-INIT,
 except when the \-\-apps flag is used in which case it is
 $MEDLEYDIR/greetfiles/APPS\-INIT.
+On Windows (Docker) installations, \f[I]FILE\f[R] is specified in the
+Medley file system, not the host Windows file system.
 .TP
-.B \-x [\f[I]DIR\f[R] | \-], \-\-logindir [\f[I]DIR\f[R] | \-]
-use DIR as LOGINDIR in Medley, unless DIR is \[lq]\-\[rq], in which case
+.B \-x [\f[I]DIR\f[R] | \-], \-\-logindir [\f[I]DIR\f[R] | \-]\ \ \ \ ** \f[B]On Linux and WSL installations\f[R] **
+Use DIR as LOGINDIR in Medley, unless DIR is \[lq]\-\[rq], in which case
 use $MEDLEYDIR/logindir.
 DIR (or $MEDLEYDIR/logindir) must be writeable by the current user.
 LOGINDIR defaults to $HOME/il.
 LOGINDIR is used by Medley as the working directory on start\-up and
 where it loads any \[lq]personal\[rq] initialization file from.
+.TP
+.B \-x [\f[I]DIR\f[R] | \-], \-\-logindir [\f[I]DIR\f[R] | \-]\ \ \ \ ** \f[B]On Windows (Docker) installations\f[R] **
+Map DIR in the Windows host file system to /home/medley/il in the Medley
+file system (in the Docker container).
+LOGINDIR is always /home/medley/il from Medley\[cq]s standpoint.
+The \[lq]\-\[rq] value is not valid in this case.
+.TP
+.B \-u, \-\-update\ \ \ \ ** \f[B]Windows (Docker) installations only\f[R] **
+Before running Medley, do a pull to retrieve the latest interlisp/medley
+docker image from Docker Hub.
+.TP
+.B \-b, \-\-background\ \ \ \ ** \f[B]Windows (Docker) installations only\f[R] **
+Run Medley in background rather than foreground.
+.TP
+.B \-p \f[I]PORT\f[R], \-\-port \f[I]PORT\f[R]\ \ \ \ ** \f[B]Windows (Docker) installations only\f[R] **
+Use \f[I]PORT\f[R] as the port that VNC viewer uses to contact the VNC
+server within the Docker container.
+Default is 5900.
+.TP
+.B \-w [\f[I]DISTRO\f[R] | \-], \-\-wsl [\f[I]DISTRO\f[R] | \-]\ \ \ \ ** \f[B]Windows (Docker) installations only\f[R] **
+Run Medley in the context of the named WSL \f[I]DISTRO\f[R] instead of
+within Docker.
+If \f[I]DISTRO\f[R] is \[lq]\-\[rq], used the default WSL distro.
+Equivalent to typing \[lq]wsl \-d \f[I]DISTRO\f[R] medley \&...\[rq]
+into a Command or Powershell window.
 .SS Other Options
 .PP
 \ 
@@ -161,6 +193,8 @@ virtual memory file from the previous session with the same ID_STRING as
 this run.
 If no such virtual memory file exists, then Medley will start from the
 standard full.sysout (equivalent to specifying the \-\-full flag).
+On Windows (Docker) installations, \f[I]SYSOUT_FILE\f[R] is specified in
+the Medley file system, not the host Windows file system.
 .TP
 .B \f[I]PASS_ON_ARGS\f[R]
 All arguments after the \[lq]\-\-\[rq] flag, are passed unaltered to lde

docs/man-page/medley.1.md

@@ -41,7 +41,7 @@ Flags
 -z, \-\-man
 : Show the man page for medley
 
--f, \-\-full                
+-f, \-\-full
 : Start Medley from the standard "full" sysout. full.sysout includes a complete Interlisp and CommonLisp environment
 with a standard set of development tools.  It does not include any of the applications built using Medley.
 (See *SYSOUT_FILE* below for more information on starting sysouts.)
@@ -80,17 +80,18 @@ The Medley window is an unscaled viewport onto this virtual display. If \-\-scre
 window geometry.  If neither \-\-screensize nor \-\-geometry is provided, then the screen size is set to 1440x900.
 
 -t *STRING*, \-\-title *STRING*
-: Use STRING as title of Medley window.  Not relevent when the \-\-vnc flag is set.
+: Use STRING as title of Medley window.  Ignored when when the \-\-vnc flag is set or when running on Windows (Docker)
+installations.
 
--d *:N*, \-\-display *:N*
-: Use X display :N.  Defaults to the value of $DISPLAY.  Not relevant when
-the \-\-vnc flag is set.
+-d *:N*, \-\-display *:N*    \*\* **Not applicable to Windows (Docker) installations** \*\*
+~ Use X display :N.  Defaults to the value of $DISPLAY.  This flag is ignored when the \-\-vnc flag is set as
+well as on Windows (Docker) installations.
 
--v, \-\-vnc  (Applicable only to Windows System for Linux installations)
+-v, \-\-vnc    \*\* **Applicable only to WSL installations** \*\*
 : Use a VNC window running on the Windows side instead of an X window.
 The VNC window will folllow the Windows desktop scaling setting allowing
 for much more usable Medley on high resolution displays.  On WSL, X windows
-do not scale well.
+do not scale well.  This flag is always set for WSL1 installations.
 
 -i [*ID_STRING* | - | \-\-], \-\-id [*ID_STRING* | - | \-\-]
 : Use ID_STRING as the id for this run of Medley, iunless ID_STRING is "-" or "\-\-". 
@@ -101,27 +102,45 @@ The id is used to distinguish the virtual memory stores so that multiple
 instances of Medley can run simultaneously.  Default id is "default".
 
 -m *N*, \-\-mem *N*
-: Set Medley to run in N MB of virtual memory.  Defaults to 256MB.
+: Set Medley to run in *N* MB of virtual memory.  Defaults to 256MB.
 
 -p *FILE*, \-\-vmem *FILE*
 : Use FILE as the Medley virtual memory (vmem) store.  FILE must be writeable by the current user.
 Care must be taken not to use the same vmem FILE for two instances of Medley running simultaneously.
 The \-\-id flag will not protect against vmem collisions when the \-\-vmem flag is used.
-Default is to store the vmem in LOGINDIR/vmem/lisp_XXX.virtualmem, where XXX is the id of this 
-Medley run (see \-\-id flag above).  See \-\-logindir below for setting of LOGINDIR.
+Default is to store the vmem in LOGINDIR/vmem/lisp_XXX.virtualmem, where XXX is the id of this
+Medley run (see \-\-id flag above).  See \-\-logindir below for setting of LOGINDIR. On Windows (Docker) installations, *FILE* is specified in the Medley file system, not the host Windows file system.
 
 -r \[*FILE* | -], \-\-greet \[*FILE* | -]
 : Use FILE as the Medley greetfile, unless FILE is "-" in which case
 Medley will start up without using a greetfile. The default Medley greetfile
 is $MEDLEYDIR/greetfiles/MEDLEYDIR-INIT, except when the \-\-apps flag is used
-in which case it is $MEDLEYDIR/greetfiles/APPS-INIT.
+in which case it is $MEDLEYDIR/greetfiles/APPS-INIT. On Windows (Docker) installations, *FILE* is
+specified in the Medley file system, not the host Windows file system.
 
--x \[*DIR* | -], \-\-logindir \[*DIR* | -]
-: use DIR as LOGINDIR in Medley, unless DIR is "-", in which case use
+-x \[*DIR* | -], \-\-logindir \[*DIR* | -]    \*\* **On Linux and WSL installations** \*\*
+: Use DIR as LOGINDIR in Medley, unless DIR is "-", in which case use
 \$MEDLEYDIR/logindir.  DIR (or \$MEDLEYDIR/logindir) must be writeable by the current user.
 LOGINDIR defaults to \$HOME/il.  LOGINDIR is used by Medley as the working directory on start-up
 and where it loads any "personal" initialization file from.
 
+-x \[*DIR* | -], \-\-logindir \[*DIR* | -]    \*\* **On Windows (Docker) installations** \*\*
+: Map DIR in the Windows host file system to /home/medley/il in the Medley
+file system (in the Docker container).  LOGINDIR is always /home/medley/il from Medley's standpoint.  The "-" value is not valid in this case.
+
+-u, \-\-update    \*\* **Windows (Docker) installations only** \*\*
+: Before running Medley, do a pull to retrieve the latest interlisp/medley docker image from Docker Hub.
+
+-b, \-\-background    \*\* **Windows (Docker) installations only** \*\*
+: Run Medley in background rather than foreground.
+
+-p *PORT*, \-\-port *PORT*    \*\* **Windows (Docker) installations only** \*\*
+: Use *PORT* as the port that VNC viewer uses to contact the VNC server within the Docker container.  Default is 5900.
+
+-w \[*DISTRO* | -], \-\-wsl \[*DISTRO* | -]    \*\* **Windows (Docker) installations only** \*\*
+: Run Medley in the context of the named WSL *DISTRO* instead of within Docker.  If *DISTRO* is "-", used the default WSL distro.  Equivalent to typing "wsl -d *DISTRO* medley ..." into a Command or Powershell window.
+
+
 Other Options
 -------------
  
@@ -130,8 +149,9 @@ Other Options
 : The pathname of the file to use as a sysout for Medley to start from.  If SYSOUT_FILE is not
 provided and none of the flags (\-\-apps, \-\-full, \-\-lisp) is used, then Medley will start from
 the saved virtual memory file from the previous session with the same ID_STRING as this run.
-If no such virtual memory file exists, then Medley will start from the standard full.sysout 
-(equivalent to specifying the \-\-full flag).
+If no such virtual memory file exists, then Medley will start from the standard full.sysout
+(equivalent to specifying the \-\-full flag).  On Windows (Docker) installations, *SYSOUT_FILE* is
+specified in the Medley file system, not the host Windows file system.
 
 *PASS_ON_ARGS*
 : All arguments after the "\-\-" flag, are passed unaltered to lde via run-medley.

greetfiles/MEDLEYDIR-INIT

@@ -1,11 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "22-Nov-2022 20:59:24" {DSK}<home>frank>il>medley>wmedley>greetfiles>MEDLEYDIR-INIT.;6
 2860   
+
(FILECREATED "13-Apr-2023 09:44:06" {DSK}<home>larry>il>medley>greetfiles>MEDLEYDIR-INIT.;6
 2925   
+
+      :EDIT-BY "lmm"
 
       :CHANGES-TO (VARS MEDLEYDIR-INITCOMS)
 
-      :PREVIOUS-DATE "22-Nov-2022 20:42:43" 
-{DSK}<home>frank>il>medley>wmedley>greetfiles>MEDLEYDIR-INIT.;5)
+      :PREVIOUS-DATE "10-Apr-2023 11:58:07" {DSK}<home>larry>il>medley>greetfiles>MEDLEYDIR-INIT.;5
+)
 
 
 (PRETTYCOMPRINT MEDLEYDIR-INITCOMS)
@@ -22,18 +24,19 @@
 
               (DWIMWAIT 180)
               (HELPDEPTH 4)
-              (HELPTIME 10)
+              (HELPTIME 1)
               (FILING.ENUMERATION.DEPTH 1)
               [LOGINDIR (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR")
                                            (UNIX-GETENV "HOME"]
               [USERGREETFILES `((,LOGINDIR "INIT" COM)
                                 (,LOGINDIR "INIT"]
+              (COPYRIGHTFLG 'NEVER)
               (COPYRIGHTSRESERVED NIL)
               (AUTOBACKTRACEFLG 'ALWAYS)
               (MAXLEVEL 30000)
               (MAXLOOP 30000))
         (FNS INTERLISPMODE)
-        (ALISTS (FONTDEFS LARGER))))
+        (ALISTS (FONTDEFS))))
 
 (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR")
                    "")
@@ -49,7 +52,7 @@
 
 (RPAQQ HELPDEPTH
 4)
 
-(RPAQQ HELPTIME
 10)
+(RPAQQ HELPTIME
 1)
 
 (RPAQQ FILING.ENUMERATION.DEPTH
 1)
 
@@ -59,6 +62,8 @@
 (RPAQ USERGREETFILES
 `((,LOGINDIR "INIT" COM)
                        (,LOGINDIR "INIT")))
 
+(RPAQQ COPYRIGHTFLG
 NEVER)
+
 (RPAQQ COPYRIGHTSRESERVED
 NIL)
 
 (RPAQQ AUTOBACKTRACEFLG
 ALWAYS)
@@ -84,5 +89,5 @@
 
 (ADDTOVAR FONTDEFS
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1986 2811 (INTERLISPMODE 1996 . 2809)))))
+  (FILEMAP (NIL (2051 2876 (INTERLISPMODE 2061 . 2874)))))
 STOP

installers/deb/build_deb.sh

@@ -11,6 +11,15 @@
 ###############################################################################
 # 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
@@ -60,6 +69,7 @@ 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
 
 
@@ -120,9 +130,13 @@ do
       cp -p tmp/vncviewer64-1.12.0.exe ${il_dir}/wsl/vncviewer64-1.12.0.exe
     fi
     #
+    #  Make sure all files are owned by root
+    #
+    sudo su <<< "chown --recursive root:root ${il_dir}"
+    #
     #  Create tar file for this arch
     #
-    filename="medley-full-${medley_release}_${maiko_release}-${wslp}-${arch}"
+    filename="${debs_filename_base}-${wslp}-${arch}"
     mkdir -p tars
     echo "Creating tar file tars/${filename}.tgz"
     tar -C ${il_dir} -czf tars/${filename}.tgz .
@@ -137,3 +151,8 @@ 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/deb/control-linux

@@ -1,9 +1,9 @@
 Package: medley-interlisp
-Version: 1.0.0
+Version: 1.0.1
 Release: --RELEASE--
 Maintainer: info@interlisp.org
 Description: Medley Interlisp for Linux
 Homepage: https://github.com/interlisp/medley
 Architecture: --ARCH--
-Depends: xdg-utils
+Depends: man-db, xdg-utils
 

installers/downloads_page/medley_downloads.html

@@ -2,37 +2,44 @@
 <li><h1>MEDLEY DOWNLOADS</h1>
 
 <ul>
-<li><h2>Standard Installations (for Debian-based distros)</h2>
+<li><h2>LINUX (including Windows System for Linux)</h2>
 
 <ul>
-<li><h3>Standard Linux</h3>
-
-<p><a href="https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-linux-x86_64.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
-
-<p><a href="https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-linux-aarch64.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p>
-
-<p><a href="https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-linux-armv7l.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines</a></p></li>
-<li><h3>Windows System for Linux</h3>
-
-<p><a href="https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-wsl-x86_64.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86.64 machines</a></p>
-
-<p><a href="https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-wsl-aarch64.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p></li>
-</ul></li>
-<li><h2>Local Installations (for any Linux distro)</h2>
+<li><h3>Standard Installations (for Debian-based distros)</h3>
 
 <ul>
-<li><h3>Standard Linux</h3>
+<li><h4>Standard Linux</h4>
 
-<p><a href="https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-linux-x86_64.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
+<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="https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-linux-aarch64.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 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="https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-linux-armv7l.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines</a></p></li>
-<li><h3>Windows System for Linux</h3>
+<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-armv7l.deb">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines</a></p></li>
+<li><h4>Windows System for Linux</h4>
 
-<p><a href="https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-wsl-x86_64.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86_64 machines</a></p>
+<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="https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-wsl-aarch64.tgz">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines</a></p></li>
+<p><a href="@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-aarch64.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@@@/@@@DEBS.FILENAME.BASE@@@-linux-aarch64.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>
+<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@@@/@@@DEBS.FILENAME.BASE@@@-wsl-aarch64.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>
+
+<p><a href="@@@DOWNLOAD_URL@@@/@@@WINDOWS.INSTALLER.FILENAME@@@">Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for Windows x64 machines</a></p></li>
 </ul></li>
 </ul>

installers/downloads_page/medley_downloads.md

@@ -1,38 +1,42 @@
 *    # MEDLEY DOWNLOADS
  
-     *    ## Standard Installations (for Debian-based distros)
+     *    ## LINUX (including Windows System for Linux)
 
-         * ### Standard Linux
+         *    ### Standard Installations (for Debian-based distros)
 
-         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-linux-x86\_64.deb)
+             * #### Standard Linux
 
-         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-linux-aarch64.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-x86\_64.deb)
 
-         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines](https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-linux-armv7l.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-aarch64.deb)
 
-         * ### Windows System for Linux
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-armv7l.deb)
 
-         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\.64 machines](https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-wsl-x86\_64.deb)
+             * #### Windows System for Linux
 
-         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-wsl-aarch64.deb)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\.64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-x86\_64.deb)
 
-     *    ## Local Installations (for any Linux distro)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-aarch64.deb)
 
-         * ### Standard Linux
+         *    ### Local Installations (for any Linux distro)
 
-         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-linux-x86\_64.tgz)
+             * #### Standard Linux
 
-         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-linux-aarch64.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-x86\_64.tgz)
 
-         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines](https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-linux-armv7l.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-aarch64.tgz)
 
-         * ### Windows System for Linux
-
-         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for x86\_64 machines](https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-wsl-x86\_64.tgz)
-
-         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARM64 machines](https://github.com/Interlisp/medley/releases/download/@@@GITHUB.SUBDIR@@@/@@@FULL.RELEASE.FILENAME@@@-wsl-aarch64.tgz)
+             [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for ARMv7 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-linux-armv7l.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 ARM64 machines](@@@DOWNLOAD_URL@@@/@@@DEBS.FILENAME.BASE@@@-wsl-aarch64.tgz)
+
+     *    ## WINDOWS 10/11 (Medley runs in a Docker container)
+
+         [Release @@@MEDLEY.SHORT.RELEASE.TAG@@@ for Windows x64 machines](@@@DOWNLOAD_URL@@@/@@@WINDOWS.INSTALLER.FILENAME@@@)
 
 
 

installers/win/.gitignore

@@ -0,0 +1,3 @@
+medley-install_*.exe
+vncviewer*.exe
+

installers/win/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/win/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/win/editpath/README.TXT

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

installers/win/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/win/medley.iss

@@ -0,0 +1,65 @@
+;###############################################################################
+;#
+;#    medley.iss - Inno Setup compiler script for creating a Windows
+;#                 installer for the medley.ps1 powrshell script for
+;#                 running Medley within a docker container on Windows
+;#
+;#   2023-02-12 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
+
+[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={localappdata}\Medley\Scripts
+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="medley-install_{#version}_{#x86_or_x64}"
+SetupIconFile="Medley.ico"
+DisableWelcomePage=no
+MissingRunOnceIdsWarning=no
+DisableProgramGroupPage=yes
+WizardImageFile=medley_logo.bmp
+WizardSmallImageFile=medley_logo_small.bmp
+WizardImageStretch=no
+UninstallDisplayIcon="{app}\Medley.ico"
+
+
+
+[Files]
+Source: "..\..\scripts\medley\medley.ps1"; DestDir: "{app}"; DestName: "medley.ps1"; Flags: ignoreversion
+Source: "..\..\scripts\medley\medley.cmd"; DestDir: "{app}"; DestName: "medley.cmd"; Flags: ignoreversion
+Source: "editpath\x86_64\EditPath.exe"; DestDir: "{app}"; DestName: "EditPath.exe"; Flags: ignoreversion
+Source: "Medley.ico"; DestDir: "{app}"; DestName: "Medley.ico"; Flags: ignoreversion
+Source: "vncviewer64-1.12.0.exe"; DestDir: "{app}"; DestName: "vncviewer64-1.12.0.exe"; 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}\EditPath.exe"; Parameters: "--user --add {app}"; Flags: runhidden
+
+[UninstallRun]
+Filename: "{app}\EditPath.exe"; Parameters: "--user --remove {app}"; Flags: runhidden 
+

internal/MAINTAIN.TXT

@@ -0,0 +1,2 @@
+MAINTAIN -- Network access to the PUP "Grapevine" server, which did
+            email, distribution lists. Written ~1985 mainly by Bill van Melle.

internal/MEDLEY-UTILS

@@ -1,10 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED " 4-Aug-2022 09:50:04" |{DSK}<home>larry>medley>internal>MEDLEY-UTILS.;2|
 10212  
+
(FILECREATED "23-May-2023 07:10:58" |{DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;12|
 10354  
 
-      :CHANGES-TO (VARS MEDLEY-UTILSCOMS)
+      :EDIT-BY "lmm"
 
-      :PREVIOUS-DATE "17-Jul-2022 12:44:56" |{DSK}<home>larry>medley>internal>MEDLEY-UTILS.;1|)
+      :CHANGES-TO (FNS GATHER-INFO)
+
+      :PREVIOUS-DATE "22-May-2023 22:57:21" |{DSK}<home>larry>il>medley>internal>MEDLEY-UTILS.;11|)
 
 
 (PRETTYCOMPRINT MEDLEY-UTILSCOMS)
@@ -15,7 +17,8 @@
 (DEFINEQ
 
 (GATHER-INFO

-  (LAMBDA (PHASE)
                                         (* \; "Edited 26-Dec-2021 18:56 by larry")


+  (LAMBDA (PHASE)
                                           (* \; "Edited 22-May-2023 23:59 by lmm")


+                                                          (* \; "Edited 26-Dec-2021 18:56 by larry")


                                                           (* \; "Edited 24-Oct-2021 09:43 by larry")

     (SELECTQ PHASE
         (ALL (|for|
 I |from|
 0 |to|
 4 |do|
 (GATHER-INFO
 I)))
@@ -47,7 +50,7 @@
                                  DEFD))
            (|for|
 X |in|
 DEFINEDFNS |when|
 (CCODEP X)
               |do|
 (LET ((Y (PUTPROP X 'CCC (CALLSCCODE X))))
-                        (|for|
 REV |in|
 '(BLOCK-CALLED-BY CALLED-BY SPECIAL-BY GLOBAL-BY)
+                        (|for|
 REV |in|
 '(BLOCK-CALLED-BY CALLED-BY BOUND-BY SPECIAL-BY GLOBAL-BY)
                            |as|
 VAL |in|
 Y |do|
 (|for|
 S |in|
 VAL
                                                    |do|
 (PUTPROP S REV (CONS X (GETPROP S REV)))))))
            (SETQ CALLEDFNS NIL)
@@ -170,7 +173,7 @@
          (DRIBBLE))))
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (600 7357 (GATHER-INFO 610 . 6020) (MAKE-FULLER-DB 6022 . 6712) (MEDLEY-FIX-LINKS 6714
- . 7111) (MEDLEY-FIX-DATES 7113 . 7355)) (8396 10189 (MAKE-EXPORTS-ALL 8406 . 9365) (MAKE-WHEREIS-HASH
- 9367 . 10187)))))
+  (FILEMAP (NIL (624 7499 (GATHER-INFO 634 . 6162) (MAKE-FULLER-DB 6164 . 6854) (MEDLEY-FIX-LINKS 6856
+ . 7253) (MEDLEY-FIX-DATES 7255 . 7497)) (8538 10331 (MAKE-EXPORTS-ALL 8548 . 9507) (MAKE-WHEREIS-HASH
+ 9509 . 10329)))))
 STOP

library/BROWSER

@@ -1,17 +1,17 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 7-Feb-2022 14:06:19" {DSK}<Users>kaplan>Local>medley3.5>my-medley>library>BROWSER.;3
 26344  
+
(FILECREATED "26-Apr-2023 12:41:36" {DSK}<home>larry>il>medley>library>BROWSER.;6
 29801  
 
-      :CHANGES-TO (VARS BROWSERCOMS)
-                  (FNS GET.BROWSE.PP.WINDOW NUMSPATHS)
+      :EDIT-BY "lmm"
 
-      :PREVIOUS-DATE "25-Mar-94 13:43:20" 
-{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>BROWSER.;1)
+      :CHANGES-TO (FNS BROWSER.LEFTFN NUMSPATHS STBROWSER MSPATHS.DISPATCH BROWSER 
+                       BROWSER.WHENFNSCHANGED BRPATHS1 GET.BROWSE.PP.WINDOW 
+                       GET.BROWSE.DESCRIBE.WINDOW BROWSEPP PPREPAINTFN PPRESHAPEFN DESCRIBEREPAINTFN
+                       BROWSERDESCRIBE BROWSER.MIDDLEFN DEDITPROCESSRUNNINGP REDRAWBROWSEGRAPH)
+                  (VARS BROWSERCOMS BROWSER.BORDERS)
 
+      :PREVIOUS-DATE "15-Apr-2023 18:55:36" {DSK}<home>larry>il>medley>library>BROWSER.;1)
 
-(* ; "
-Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation.
-")
 
 (PRETTYCOMPRINT BROWSERCOMS)
 
@@ -20,27 +20,26 @@ Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation
         (DECLARE%: EVAL@COMPILE DONTCOPY (FILES (LOADCOMP)
                                                 GRAPHER)
                (CONSTANTS (CHANGEDSHADE 8840)))
-        (FNS NUMSPATHS BROWSER BROWSER.WHENFNSCHANGED BRPATHS1 BROWSER.LEFTFN GET.BROWSE.PP.WINDOW 
-             GET.BROWSE.DESCRIBE.WINDOW BROWSEPP PPREPAINTFN PPRESHAPEFN DESCRIBEREPAINTFN 
-             BROWSERDESCRIBE BROWSER.MIDDLEFN DEDITPROCESSRUNNINGP REDRAWBROWSEGRAPH STBROWSER)
+        (FNS MSPATHS.DISPATCH NUMSPATHS BROWSER BROWSER.WHENFNSCHANGED BRPATHS1 BROWSER.LEFTFN 
+             GET.BROWSE.PP.WINDOW GET.BROWSE.DESCRIBE.WINDOW BROWSEPP PPREPAINTFN PPRESHAPEFN 
+             DESCRIBEREPAINTFN BROWSERDESCRIBE BROWSER.MIDDLEFN DEDITPROCESSRUNNINGP 
+             REDRAWBROWSEGRAPH STBROWSER)
         (GLOBALRESOURCES BROWSEHASH)
         (DECLARE%: DONTCOPY (RECORDS BROWSEWIN PATHSARGS))
-        [VARS (BROWSERBOXING)
-              (BROWSERFORMAT)
-              (BROWSERWINDOWS)
-              (NODESELECTIONWINDOW)
-              (PFWINDOW)
-              (BROWSER.DESCRIBE.WINDOW)
-              (BrowserPPWindowWidth 750)
-              (BROWSERFONT '(GACHA 8]
-        [P (MOVD? 'MSPATHS 'OLDMSPATHS)
-           (MOVD? 'NILL 'MODERNWINDOW)
-           (PROG [(WC (FILEPKGTYPE 'FNS 'WHENCHANGED]
-                 (OR (MEMB 'BROWSER.WHENFNSCHANGED WC)
-                     (FILEPKGTYPE 'FNS 'WHENCHANGED (CONS 'BROWSER.WHENFNSCHANGED WC]
-        (DECLARE%: DONTEVAL@LOAD DOCOPY (P (SELECTQ (SYSTEMTYPE)
-                                                  (D (BROWSER T))
-                                                  NIL])
+        [INITVARS (BROWSER T)
+               (BROWSERBOXING)
+               (BROWSERFORMAT)
+               (BROWSERWINDOWS)
+               (NODESELECTIONWINDOW)
+               (PFWINDOW)
+               (BROWSER.DESCRIBE.WINDOW)
+               (BrowserPPWindowWidth 750)
+               (BROWSERMAX 10)
+               (BROWSERFONT '(GACHA 8]
+        (P (MOVD? 'NILL 'MODERNWINDOW))
+        (VARS BROWSER.BORDERS)
+        (GLOBALVARS BROWSER.BORDERS BROWSERWINDOWS)
+        (DECLARE%: DONTEVAL@LOAD DOCOPY (P (BROWSER T])
 
 (FILESLOAD MASTERSCOPE GRAPHER)
 (DECLARE%: EVAL@COMPILE DONTCOPY 
@@ -58,64 +57,74 @@ Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation
 )
 (DEFINEQ
 
-(NUMSPATHS

+(MSPATHS.DISPATCH

   [LAMBDA (FROM
 TO
 INVERTED AVOIDING SEPARATE NOTRACE MARKING)

-                                                             (* ; "Edited  7-Feb-2022 13:57 by rmk")


-                                                             (* ; "Edited 11-Apr-88 11:08 by jrb:")

-    (COND
-       [(AND (WINDOWWORLD)
+                                                             (* ; "Edited 15-Apr-2023 11:33 by lmm")

+    (IF
 (AND (GETD 'NUMSPATHS)
+             (WINDOWWORLD)
              (EQ (OUTPUT)
                  T))
-        [OR AVOIDING (SETQ AVOIDING '(NIL (NIL NIL . FNS)
-                                          APPLY LAMBDA (X)
-                                          (GETPROP X 'AVOID]
-        (RESETVARS ((MSPRINTFLG))
-                   (AND INVERTED (UPDATECHANGED))
-                   (STBROWSER

-                    [GLOBALRESOURCE
-                     BROWSEHASH
-                     (PROG [X NAMED TEM (UNDONE (MSLISTSET FROM T))
-                              ROOTS GRAPHNODE.LIST (SEEN BROWSEHASH)
-                              (CALLRELATION (PARSERELATION 'CALL]
-                           (DECLARE
 (SPECVARS SEEN UNDONE GRAPHNODE.LIST))
-                           (CLRHASH SEEN)
-                           (for
 X in
 UNDONE do
 (PUTHASH X (COND
-                                                             ((AND NOTRACE (MSMEMBSET X NOTRACE))
-                                                              -1)
-                                                             (T 0))
-                                                      SEEN)
-                                               (OR INVERTED (UPDATEFN X NIL 0)))
-                           [do
 (COND
-                                  (NAMED (PUTHASH (CAR NAMED)
-                                                0 SEEN)
-                                         [push
 ROOTS (fetch
 (GRAPHNODE NODEID)
-                                                        of
 (BRPATHS1
 (CAR NAMED]
-                                         (SETQ NAMED (CDR NAMED)))
-                                  (UNDONE [COND
-                                             ([OR (NULL (SETQ TEM (GETHASH (CAR UNDONE)
-                                                                         SEEN)))
-                                                  (EQ TEM 0)
-                                                  (AND (LISTP TEM)
-                                                       (NULL (CAR TEM]
-                                              (PUTHASH (CAR UNDONE)
-                                                     (LIST NIL)
-                                                     SEEN)
-                                              (SETQ NAMED (LIST (CAR UNDONE]
-                                         (SETQ UNDONE (CDR UNDONE)))
-                                  (T (RETURN]
-                           (RETURN (LAYOUTFOREST GRAPHNODE.LIST ROOTS BROWSERFORMAT BROWSERBOXING]
-                    (PROG1 (LIST FROM TO INVERTED AVOIDING SEPARATE NOTRACE)
-                                                             (* ; 
-
                                                   "this LIST is actually an 'instance' of PATHSARGS")

-                           ]
-       (T (OLDMSPATHS FROM TO INVERTED AVOIDING SEPARATE NOTRACE MARKING])
+        THEN
 (NUMSPATHS
 FROM TO INVERTED AVOIDING SEPARATE NOTRACE MARKING)
+      ELSE
 (OLDMSPATHS FROM TO INVERTED AVOIDING SEPARATE NOTRACE MARKING])
+
+(NUMSPATHS

+  [LAMBDA (FROM
 TO
 INVERTED AVOIDING SEPARATE NOTRACE MARKING DEPTH)
+    (DECLARE
 (SPECVARS INVERTED GRAPHNODE.LIST))
             (* ; "Edited 26-Apr-2023 09:12 by lmm")


+                                                             (* ; "Edited 15-Apr-2023 18:43 by lmm")


+                                                             (* ; "Edited  7-Feb-2022 13:57 by rmk")


+                                                             (* ; "Edited 11-Apr-88 11:08 by jrb:")

+    [OR AVOIDING (SETQ AVOIDING '(NIL (NIL NIL . FNS)
+                                      APPLY LAMBDA (X)
+                                      (GETPROP X 'AVOID]
+    (AND INVERTED (UPDATECHANGED))
+    (OR DEPTH (SETQ DEPTH BROWSERMAX))
+    (WITH-RESOURCES BROWSEHASH (PROG [NAMED TEM (UNDONE (MSLISTSET FROM T))
+                                            ROOTS GRAPHNODE.LIST (SEEN BROWSEHASH)
+                                            (CALLRELATION (PARSERELATION 'CALL]
+                                     (DECLARE
 (SPECVARS SEEN GRAPHNODE.LIST CALLRELATION))
+                                     (CLRHASH SEEN)
+                                     (for
 X in
 UNDONE do
 (PUTHASH X (COND
+                                                                       ((AND NOTRACE (MSMEMBSET
+                                                                                      X NOTRACE))
+                                                                        -1)
+                                                                       (T 0))
+                                                                SEEN)
+                                                         (OR INVERTED (UPDATEFN X NIL 0)))
+                                     [do
 (COND
+                                            (NAMED (PUTHASH (CAR NAMED)
+                                                          0 SEEN)
+                                                   (PUSH
 ROOTS (fetch
 (GRAPHNODE NODEID)
+                                                                  of
 (BRPATHS1
 (CAR NAMED)
+                                                                            DEPTH)))
+                                                   (SETQ NAMED (CDR NAMED)))
+                                            (UNDONE [COND
+                                                       ([OR (NULL (SETQ TEM (GETHASH (CAR UNDONE)
+                                                                                   SEEN)))
+                                                            (EQ TEM 0)
+                                                            (AND (LISTP TEM)
+                                                                 (NULL (CAR TEM]
+                                                        (PUTHASH (CAR UNDONE)
+                                                               (LIST NIL)
+                                                               SEEN)
+                                                        (SETQ NAMED (LIST (CAR UNDONE]
+                                                   (SETQ UNDONE (CDR UNDONE)))
+                                            (T (RETURN]
+                                     (RETURN (STBROWSER
 (LAYOUTGRAPH GRAPHNODE.LIST ROOTS
+                                                               (APPEND BROWSERFORMAT BROWSERBOXING))
+                                                    (LIST FROM TO INVERTED AVOIDING SEPARATE NOTRACE
+                                                          MARKING DEPTH])
 
 (BROWSER

-  [LAMBDA (DISPLAYFLG)
                                       (* rmk%: "16-Dec-83 15:39")

-    (COND
-       (DISPLAYFLG (SETQ BROWSERFONT (FONTCREATE BROWSERFONT))
-              (MOVD 'NUMSPATHS 'MSPATHS))
-       (T (MOVD 'OLDMSPATHS 'MSPATHS])
+  [LAMBDA (DISPLAYFLG)
                                       (* ; "Edited 15-Apr-2023 14:55 by lmm")

+                                                             (* rmk%: "16-Dec-83 15:39")

+    (MOVD? 'MSPATHS 'OLDMSPATHS)
+    (MOVD 'MSPATHS.DISPATCH 'MSPATHS)
+    (SETQ BROWSER DISPLAYFLG)
+    (OR (FONTP BROWSERFONT)
+        (SETQ BROWSERFONT (FONTCREATE BROWSERFONT)))
+    (PROG [(WC (FILEPKGTYPE 'FNS 'WHENCHANGED]
+          (OR (MEMB 'BROWSER.WHENFNSCHANGED WC)
+              (FILEPKGTYPE 'FNS 'WHENCHANGED (CONS 'BROWSER.WHENFNSCHANGED WC])
 
 (BROWSER.WHENFNSCHANGED

   [LAMBDA (FNNAME TYPE REASON)                               (* DECLARATIONS%: (RECORDS BROWSEWIN))

@@ -134,78 +143,122 @@ Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation
                  FNNAME))
         (BROWSERDESCRIBE
 FNNAME BROWSER.DESCRIBE.WINDOW)))
     (for
 X in
 BROWSERWINDOWS do
 (COND
-                                               ((find
 GRAPHNODE
-                                                   in
 (fetch
 (GRAPH GRAPHNODES)
-                                                             of
 (fetch
 (BROWSEWIN GRAPH)
-                                                                       of
 X))
-                                                   suchthat
 (EQ (fetch
 (GRAPHNODE NODELABEL)
-                                                                       of
 GRAPHNODE)
-                                                                    FNNAME))
-                                                (COND
-                                                   ((fetch
 (BROWSEWIN GRAPH) of
 X)
-                                                    (DSPFILL NIL CHANGEDSHADE 'PAINT
-                                                           (fetch
 (BROWSEWIN WINDOW) of

-                                                                                         X))
-                                                    (WINDOWPROP (fetch
 (BROWSEWIN WINDOW)
-                                                                   of
 X)
-                                                           'BUTTONEVENTFN
-                                                           (FUNCTION REDRAWBROWSEGRAPH))
-                                                    (replace
 (BROWSEWIN GRAPH) of
 X
-                                                       with
 NIL])
+                                   ((find
 GRAPHNODE in
 (fetch
 (GRAPH GRAPHNODES)
+                                                          of
 (fetch
 (BROWSEWIN GRAPH) of
 X))
+                                       suchthat
 (EQ (fetch
 (GRAPHNODE NODELABEL) of
 GRAPHNODE)
+                                                    FNNAME))
+                                    (COND
+                                       ((fetch
 (BROWSEWIN GRAPH) of
 X)
+                                        (DSPFILL NIL CHANGEDSHADE 'PAINT (fetch
 (BROWSEWIN WINDOW)
+                                                                            of
 X))
+                                        (WINDOWPROP (fetch
 (BROWSEWIN WINDOW) of
 X)
+                                               'BUTTONEVENTFN
+                                               (FUNCTION REDRAWBROWSEGRAPH))
+                                        (replace
 (BROWSEWIN GRAPH) of
 X with
 NIL])
 
 (BRPATHS1

-  [LAMBDA (FROM
)
                                     (* ; "Edited 11-Apr-88 11:27 by jrb:")

-    (DECLARE
 (GLOBALVARS BROWSERFONT))
-    (PROG (TEM)
+  [LAMBDA (FROM
 DEPTH)
                                       (* ; "Edited 25-Apr-2023 10:59 by lmm")


+                                                             (* ; "Edited 11-Apr-88 11:27 by jrb:")

+    (DECLARE
 (SPECVARS INVERTED)
+           (GLOBALVARS BROWSERFONT MISSING.GRAPH.NODEBORDER))
+    (PROG (TEM ENTRY TOFNS)
           (MSPATHS2 FROM)
           (COND
              ((EQ (SETQ TEM (GETHASH FROM SEEN))
                   -1)                                        (* ; 
-
                                              "on NOPATHS list - create a node for it with no subs")

+
                                                "on NOPATHS list - create a node for it with no subs")

               (SETQ TEM (create
 GRAPHNODE
                                NODEID _ FROM
                                NODELABEL _ FROM
                                NODEFONT _ BROWSERFONT
                                TONODES _ NIL))
-              (push
 GRAPHNODE.LIST TEM)
+              (PUAH GRAPHNODE.LIST TEM)
               (PUTHASH FROM TEM SEEN)
               (RETURN TEM))
              ((NEQ TEM 0)                                    (* ; "already expanded into a list")

               (RETURN TEM))
-             (T (RETURN (PROG ((ENTRY (create
 GRAPHNODE
-                                             NODEID _ FROM
-                                             NODELABEL _ FROM
-                                             NODEFONT _ BROWSERFONT)))
-                              (push
 GRAPHNODE.LIST ENTRY)
-                              (PUTHASH FROM ENTRY SEEN)
-                              (replace
 (GRAPHNODE TONODES) of
 ENTRY
-                                 with
 (for
 X
-                                             in
 (for
 Y
-                                                       in
 (COND
-                                                                 ((NOT INVERTED)
-                                                                  (GETRELATION FROM CALLRELATION))
-                                                                 (T (GETRELATION FROM CALLRELATION T)
-                                                                    )) when
 (MSPATHS2 Y)
-                                                       collect
 Y) when
 (SETQ X (BRPATHS1

-                                                                                        X))
-                                             collect
 (fetch
 (GRAPHNODE NODEID) of
 X)))
-                              (RETURN ENTRY])
+             (T [SETQ TOFNS (COND
+                               ((NOT INVERTED)
+                                (GETRELATION FROM CALLRELATION))
+                               (T (GETRELATION FROM CALLRELATION T]
+                (SETQ ENTRY (create
 GRAPHNODE
+                                   NODEID _ FROM
+                                   NODELABEL _ FROM
+                                   NODEFONT _ BROWSERFONT))
+                (PUSH
 GRAPHNODE.LIST ENTRY)
+                (PUTHASH FROM ENTRY SEEN)
+                (IF
 (AND TOFNS (<= DEPTH 0))
+                    THEN
 (REPLACE
 (GRAPHNODE NODEBORDER) OF
 ENTRY WITH
 (CDDR (ASSOC 'ENDOFLINE 
+                                                                                    BROWSER.BORDERS))
+                                )
+                         (RETURN ENTRY))
+                (replace
 (GRAPHNODE TONODES) of
 ENTRY with
 (for
 X
+                                                              in
 (for
 Y in
 TOFNS
+                                                                    when
 (MSPATHS2 Y) collect
 Y)
+                                                              when
 (SETQ X (BRPATHS1
 X
+                                                                                  (- DEPTH 1)))
+                                                              collect
 (fetch
 (GRAPHNODE NODEID)
+                                                                         of
 X)))
+                (RETURN ENTRY])
 
 (BROWSER.LEFTFN

-  [LAMBDA (NODE NWINDOW)
                                     (* ; "Edited 31-Mar-87 11:16 by jop")

+  [LAMBDA (NODE NWINDOW)
                                     (* ; "Edited 26-Apr-2023 12:41 by lmm")


+                                                             (* ; "Edited 31-Mar-87 11:16 by jop")

                                                              (* ; 
 
                                                 "function that is applied upon selection of a node.")

-    (COND
-       ((NULL NODE))
-       ((EQ (fetch
 NODELABEL of
 NODE)
-            (WINDOWPROP (GET.BROWSE.PP.WINDOW
)
-                   'FNBROWSED))
-        (BROWSERDESCRIBE
 (fetch
 NODELABEL of
 NODE)
-               (GET.BROWSE.DESCRIBE.WINDOW
)))
-       (T                                                    (* ; 
-
                                                            "if first time touched, pretty print it.")

-          (BROWSEPP
 (fetch
 NODELABEL of
 NODE)
-                 (GET.BROWSE.PP.WINDOW
])
+    (PROG (FN SELECTION)
+          (IF
 (NULL NODE)
+              THEN
 (RETURN)
+                   (MOVEW NWINDOW)                           (* ; 
+
                                                       " really want to just drag the content around")

+                   (RETURN))
+          (IF
 (NULL (SETQ FN (FETCH
 NODELABEL OF
 NODE)))
+              THEN
 (RETURN))
+          [SETQ SELECTION (MENU (CREATE
 MENU
+                                       ITEMS _ '(CallsFrom CallsTo Edit Show InspectCode]
+
+     (* ;; "Mot implemented: Ignore Avoid")

+
+          (DESTRUCTURING-BIND (FROM
 TO
 INVERTED AVOIDING SEPARATE NOTRACE MARKING DEPTH)
+                 (FOR
 BW IN
 BROWSERWINDOWS WHEN
 (EQ (FETCH
 (BROWSEWIN WINDOW) OF
 BW)
+                                                    NWINDOW) DO
 (RETURN (FETCH
 (BROWSEWIN ARGS)
+                                                                           OF
 BW))
+                    FINALLY
 (PROMPTPRINT "No browser window found for" FN)
+                          (RETURN))
+
+                 (* ;; "Now we have the arguments to MSPATHS .. insert this node?")

+
+                 (SELECTQ SELECTION
+                     ((NIL) 
+                          (RETURN))
+                     ((CallsFrom CallsTo) 
+                                          (* ;; "new graph, FN at the root")

+
+                          (NUMSPATHS
 (CREATE
 SENTENCE
+                                            SUBJECT _ '(NIL NIL . FNS)
+                                            MSPRED _ 'QUOTE
+                                            OTHERSTUFF _ (LIST FN))
+                                 (IF
 INVERTED
+                                     THEN
 TO
+                                   ELSE
 FROM)
+                                 INVERTED AVOIDING NIL NOTRACE MARKING DEPTH))
+                     NIL
+                     (Ignore                                 (* ; "local ignore")
)
+                     (Avoid                                  (* ; " global ignore")
)
+                     (Edit (ED FN (IF
 (HASDEF FN 'FNS)
+                                      THEN
 'FNS
+                                    ELSEIF
 (HASDEF FN 'FUNCTIONS)
+                                      THEN
 'FUNCTIONS
+                                    ELSE
 (PROMPTPRINT FN "no definition")
+                                         NIL)))
+                     (Show (CL:UNLESS (EQ FN (WINDOWPROP (GET.BROWSE.PP.WINDOW
)
+                                                    'FNBROWSED))
+                               (BROWSEPP
 FN (GET.BROWSE.PP.WINDOW
))))
+                     (Describe (BROWSERDESCRIBE
 FN (GET.BROWSE.DESCRIBE.WINDOW
)))
+                     (InspectCode (IF
 (NOT (CCODEP FN))
+                                      THEN
 (PROMPTPRINT FN "not compiled")
+                                    ELSE
 (INSPECTCODE FN)))
+                     (HELP])
 
 (GET.BROWSE.PP.WINDOW

   [LAMBDA NIL
                                                (* ; "Edited  7-Feb-2022 14:01 by rmk")


@@ -253,9 +306,9 @@ Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation
                                                             BOTTOM])
 
 (PPREPAINTFN

-  [LAMBDA (WINDOW REGION RESHAPE)
                       (* ; "Edited 11-Jun-90 14:11 by mitani")

+  [LAMBDA (WINDOW REGION RESHAPE)
                           (* ; "Edited 11-Jun-90 14:11 by mitani")

 
-    (* ;; "repaints the browser pp window WINDOW.  Returns the width of the image so that caller can set the EXTENT.")

+    (* ;; "repaints the browser pp window WINDOW.  Returns the width of the image so that caller can set the EXTENT.")

 
     (PROG ((FN (WINDOWPROP WINDOW 'FNBROWSED))
            (EXTENT (WINDOWPROP WINDOW 'EXTENT))
@@ -265,25 +318,23 @@ Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation
                          (MOVETOUPPERLEFT WINDOW EXTENT)
                          (printout WINDOW .FONT DEFAULTFONT)
                          (COND
-                            ((for
 FPTYPE in
 MSFNTYPES
-                                when
 (SETQ DEF (GETDEF FN (ffetch
 (MSANALYZABLE FILEPKGNAME)
-                                                                 of
 FPTYPE)
-                                                          NIL
-                                                          'NOERROR))
-                                do
 (SETQ FNTYPE (ffetch
 (MSANALYZABLE FILEPKGNAME)
-                                                       of
 FPTYPE))
-                                      (RETURN DEF) finally
 NIL)
-                                                             (* ; 
-
                                                           "set up linelength characteristics.")

+                            ((for
 FPTYPE in
 MSFNTYPES when
 (SETQ DEF (GETDEF FN (ffetch
 (MSANALYZABLE
+                                                                                         FILEPKGNAME)
+                                                                                   of
 FPTYPE)
+                                                                            NIL
+                                                                            'NOERROR))
+                                do
 (SETQ FNTYPE (ffetch
 (MSANALYZABLE FILEPKGNAME) of
 FPTYPE))
+                                   (RETURN DEF) finally
 NIL) (* ; 
+
                                                             "set up linelength characteristics.")

                              (RESETLST
                                  (RESETSAVE (OUTPUT WINDOW))
                                  (RESETSAVE (SETREADTABLE T))
                                  (RESETSAVE **COMMENT**FLG)
                                  (if
 (EQ FNTYPE 'FNS)
-                                     then
 (printout WINDOW "(" .FONT LAMBDAFONT |.P2| FN .FONT 
-                                                     DEFAULTFONT T))
-                                 (DSPRIGHTMARGIN (fetch
 (REGION RIGHT) of
 (DSPCLIPPINGREGION
-                                                                                   NIL WINDOW))
+                                     then
 (printout WINDOW "(" .FONT LAMBDAFONT .P2 FN .FONT 
+                                                 DEFAULTFONT T))
+                                 (DSPRIGHTMARGIN (fetch
 (REGION RIGHT) of
 (DSPCLIPPINGREGION NIL 
+                                                                                 WINDOW))
                                         WINDOW)
                                  (PRINTDEF DEF (AND (EQ FNTYPE 'FNS)
                                                     2)
@@ -291,19 +342,19 @@ Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation
                                  (if
 (EQ FNTYPE 'FNS)
                                      then
 (PRIN1 ")" WINDOW)))
                              (fetch
 (REGION WIDTH) of
 (DSPCLIPPINGREGION NIL WINDOW)))
-                            (T                               (* ; 
-
                                                           "set right margin out so wouldn't clip.")

+                            (T                               (* ; 
+
                                                             "set right margin out so wouldn't clip.")

                                (DSPRIGHTMARGIN 5000 WINDOW)
                                (APPLY* (FUNCTION PF*)
                                       FN NIL (GETSTREAM WINDOW))
-                               (DSPRIGHTMARGIN (fetch
 (REGION RIGHT) of
 (DSPCLIPPINGREGION
-                                                                                 NIL WINDOW))
+                               (DSPRIGHTMARGIN (fetch
 (REGION RIGHT) of
 (DSPCLIPPINGREGION NIL WINDOW
+                                                                               ))
                                       WINDOW)
                                BrowserPPWindowWidth)))
                      (T 0])
 
 (PPRESHAPEFN

-  [LAMBDA (WINDOW)
                                           (* lmm "20-Jul-84 15:48")

+  [LAMBDA (WINDOW)                                           (* lmm "20-Jul-84 15:48")

     (BROWSEPP
 (WINDOWPROP WINDOW 'FNBROWSED)
            WINDOW])
 
@@ -314,17 +365,18 @@ Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation
     (PROG [(FN (WINDOWPROP WIN 'FNBROWSED))
            (EXTENT (WINDOWPROP WIN 'EXTENT]
           (COND
-             (FN (RESETLST (RESETSAVE MSPRINTFLG NIL)
-                        (RESETSAVE (OUTPUT WIN))
-                        (DSPSCROLL 'OFF WIN)
-                        (COND
-                           (EXTENT (MOVETOUPPERLEFT WIN EXTENT)))
-                        (MSDESCRIBE FN])
+             (FN (RESETLST
+                     (RESETSAVE MSPRINTFLG NIL)
+                     (RESETSAVE (OUTPUT WIN))
+                     (DSPSCROLL 'OFF WIN)
+                     (COND
+                        (EXTENT (MOVETOUPPERLEFT WIN EXTENT)))
+                     (MSDESCRIBE FN))])
 
 (BROWSERDESCRIBE

   [LAMBDA (FN WIN)
                                           (* ; "Edited 31-Mar-87 11:15 by jop")

-          
-          (* ;; "puts the masterscope DESCRIBE information in the window DS.  Keeps tracks of which fn so if it changes the window can be updated.")

+
+    (* ;; "puts the masterscope DESCRIBE information in the window DS.  Keeps tracks of which fn so if it changes the window can be updated.")

 
     (WINDOWPROP WIN 'FNBROWSED FN)
     (CLEARW WIN)
@@ -337,9 +389,9 @@ Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation
                                                    (DSPYPOSITION NIL WIN])
 
 (BROWSER.MIDDLEFN

-  [LAMBDA (NODE NWINDOW)
                                 (* ; "Edited 25-Mar-94 13:25 by jds")

+  [LAMBDA (NODE NWINDOW)
                                     (* ; "Edited 25-Mar-94 13:25 by jds")

                                                              (* ; 
-
                 "called when yellow selection from browser.  Call display editor on the function.")

+
                   "called when yellow selection from browser.  Call display editor on the function.")

     (COND
        ((NULL NODE))
        [(THIS.PROCESS)                                       (* ; "processes are running.")

@@ -352,7 +404,7 @@ Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation
                               " " "into the Dedit " "window then selecting 'Edit'."))
                       (T (ADD.PROCESS `(ED ',(fetch
 NODELABEL of
 NODE])
             ((SEDIT SEDIT:SEDIT)                             (* ; 
-
                                                     "SEdit doesn't have to worry about this stuff")

+
                                                       "SEdit doesn't have to worry about this stuff")

                  (ED (fetch
 NODELABEL of
 NODE)
                      ':DONTWAIT))
             (ED (fetch
 NODELABEL of
 NODE]
@@ -360,8 +412,8 @@ Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation
 
 (DEDITPROCESSRUNNINGP

   [LAMBDA NIL
                                                (* ; "Edited 31-Mar-87 11:27 by jop")

-          
-          (* ;; "is there a dedit process running?")

+
+    (* ;; "is there a dedit process running?")

 
     (AND (EQ (EDITMODE)
              'DEDIT)
@@ -369,73 +421,69 @@ Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation
 
 (REDRAWBROWSEGRAPH

   [LAMBDA (WINDOW)                                           (* DECLARATIONS%: (RECORDS BROWSEWIN))

+                                                             (* ; "Edited 15-Apr-2023 16:12 by lmm")

                                                              (* ; "Edited 31-Mar-87 11:24 by jop")

-    (PROG [(WN (find
 X in
 BROWSERWINDOWS suchthat
 (EQ (fetch
 (BROWSEWIN WINDOW)
-                                                                     of
 X)
-                                                                  WINDOW]
-          (AND WN (APPLY 'NUMSPATHS (fetch
 (BROWSEWIN ARGS) of
 WN)))
-                                                             (* ; "(OR WN (SHOULDNT))")

+    (PROG [(WN (find
 X in
 BROWSERWINDOWS suchthat
 (EQ (fetch
 (BROWSEWIN WINDOW) of
 X)
+                                                      WINDOW]
+          (AND WN (APPLY (FUNCTION NUMSPATHS)
+                         (fetch
 (BROWSEWIN ARGS) of
 WN)))    (* ; "(OR WN (SHOULDNT))")

           (WINDOWPROP WINDOW 'BUTTONEVENTFN (FUNCTION APPLYTOSELECTEDNODE))
           (APPLYTOSELECTEDNODE WINDOW])
 
 (STBROWSER

   [LAMBDA (GRAPH ARGS)                                       (* DECLARATIONS%: (RECORDS BROWSEWIN))

+                                                             (* ; "Edited 25-Apr-2023 21:05 by lmm")

                                                              (* ; "Edited 31-Mar-87 11:18 by jop")

 
     (* ;; "puts a browser graph for the args FROMFN in a window.  If a similar graph is already a window, that window is reused;  otherwise a new window is created.")

 
-    (WINDOWADDPROP (bind
 TMP for
 W in
 BROWSERWINDOWS
-                      when
 (EQUAL (fetch
 (PATHSARGS DISCRIMINANT) of
 ARGS)
-                                      (fetch
 (PATHSARGS DISCRIMINANT) of
 (fetch

-                                                                                  (BROWSEWIN ARGS)
-                                                                                    of
 W)))
+    (WINDOWADDPROP (bind
 TMP for
 W in
 BROWSERWINDOWS when
 (EQUAL (fetch
 (PATHSARGS DISCRIMINANT)
+                                                                    of
 ARGS)
+                                                                 (fetch
 (PATHSARGS DISCRIMINANT)
+                                                                    of
 (fetch
 (BROWSEWIN ARGS)
+                                                                          of
 W)))
                       do
 (replace
 (BROWSEWIN ARGS) of
 W with
 ARGS)
-                            (replace
 (BROWSEWIN GRAPH) of
 W with
 GRAPH)
-                            (SHOWGRAPH GRAPH (SETQ W (fetch
 (BROWSEWIN WINDOW) of
 W))
-                                   (FUNCTION BROWSER.LEFTFN)
-                                   (FUNCTION BROWSER.MIDDLEFN))
-                            (RETURN W)
+                         (replace
 (BROWSEWIN GRAPH) of
 W with
 GRAPH)
+                         (SHOWGRAPH GRAPH (SETQ W (fetch
 (BROWSEWIN WINDOW) of
 W))
+                                (FUNCTION BROWSER.LEFTFN)
+                                (FUNCTION BROWSER.MIDDLEFN))
+                         (RETURN W)
                       finally
 (SETQ W (SHOWGRAPH GRAPH (CONCAT "PATHS"
-                                                                  (COND
-                                                                     ((SETQ TMP (fetch

-                                                                                 (PATHSARGS FROM)
-                                                                                   of
 ARGS))
+                                                              (COND
+                                                                 ((SETQ TMP (fetch
 (PATHSARGS FROM)
+                                                                               of
 ARGS))
+                                                                  (CONCAT (COND
+                                                                             ((CADR (CADR TMP))
+                                                                              " FROM ")
+                                                                             (T " TO "))
+                                                                         (CADDDR TMP)))
+                                                                 (T ""))
+                                                              (COND
+                                                                 ((SETQ TMP (fetch
 (PATHSARGS TO)
+                                                                               of
 ARGS))
                                                              (* ; 
-
                          "CADDDR here gets the thing that looks like it might be a function name.")

-                                                                      (CONCAT (COND
-                                                                                 ((CADR (CADR TMP))
-                                                                                  " FROM ")
-                                                                                 (T " TO "))
-                                                                             (CADDDR TMP)))
-                                                                     (T ""))
-                                                                  (COND
-                                                                     ((SETQ TMP (fetch

-                                                                                 (PATHSARGS TO)
-                                                                                   of
 ARGS))
-                                                             (* ; 
-
                          "CADDDR here gets the thing that looks like it might be a function name.")

-                                                                      (CONCAT (COND
-                                                                                 ((CADR (CADR TMP))
-                                                                                  " FROM ")
-                                                                                 (T " TO "))
-                                                                             (CADDDR TMP)))
-                                                                     (T "")))
-                                                 (FUNCTION BROWSER.LEFTFN)
-                                                 (FUNCTION BROWSER.MIDDLEFN)))
+
                            "CADDDR here gets the thing that looks like it might be a function name.")

+                                                                  (CONCAT (COND
+                                                                             ((CADR (CADR TMP))
+                                                                              " FROM ")
+                                                                             (T " TO "))
+                                                                         (CADDDR TMP)))
+                                                                 (T "")))
+                                             (FUNCTION BROWSER.LEFTFN)
+                                             (FUNCTION BROWSER.MIDDLEFN)))
                             (push
 BROWSERWINDOWS
-                                   (create
 BROWSEWIN
-                                          ARGS _ ARGS
-                                          GRAPH _ GRAPH
-                                          WINDOW _ W))
+                                  (create
 BROWSEWIN
+                                         ARGS _ ARGS
+                                         GRAPH _ GRAPH
+                                         WINDOW _ W))
                             (RETURN W))
            'CLOSEFN
            (FUNCTION (LAMBDA (WINDOW)                        (* ; 
-
                        "The closing function for browser windows.  removes it from BROWSERWINDOWS")

+
                          "The closing function for browser windows.  removes it from BROWSERWINDOWS")

                        (SETQ BROWSERWINDOWS (DREMOVE (for
 X in
 BROWSERWINDOWS
                                                         when
 (EQ (fetch
 (BROWSEWIN WINDOW)
-                                                                        of
 X)
-                                                                     WINDOW)
-                                                        do
 (RETURN X))
+                                                                    of
 X)
+                                                                 WINDOW) do
 (RETURN X))
                                                    BROWSERWINDOWS])
 )
 (DECLARE%: DONTCOPY 
@@ -457,41 +505,49 @@ Copyright (c) 1983-1984, 1987-1988, 1990, 1993-1994 by Venue & Xerox Corporation
 )
 )
 
-(RPAQQ BROWSERBOXING
 NIL)
+(RPAQ? BROWSER
 T)
 
-(RPAQQ BROWSERFORMAT
 NIL)
+(RPAQ? BROWSERBOXING
 )
 
-(RPAQQ BROWSERWINDOWS
 NIL)
+(RPAQ? BROWSERFORMAT
 )
 
-(RPAQQ NODESELECTIONWINDOW
 NIL)
+(RPAQ? BROWSERWINDOWS
 )
 
-(RPAQQ PFWINDOW
 NIL)
+(RPAQ? NODESELECTIONWINDOW
 )
 
-(RPAQQ BROWSER.DESCRIBE.WINDOW
 NIL)
+(RPAQ? PFWINDOW
 )
 
-(RPAQQ BrowserPPWindowWidth
 750)
+(RPAQ? BROWSER.DESCRIBE.WINDOW
 )
 
-(RPAQQ BROWSERFONT
 (GACHA 8))
+(RPAQ? BrowserPPWindowWidth
 750)
 
-(MOVD? 'MSPATHS 'OLDMSPATHS)
+(RPAQ? BROWSERMAX
 10)
+
+(RPAQ? BROWSERFONT
 '(GACHA 8))
 
 (MOVD? 'NILL 'MODERNWINDOW)
 
-[PROG [(WC (FILEPKGTYPE 'FNS 'WHENCHANGED]
-      (OR (MEMB 'BROWSER.WHENFNSCHANGED WC)
-          (FILEPKGTYPE 'FNS 'WHENCHANGED (CONS 'BROWSER.WHENFNSCHANGED WC]
+(RPAQQ BROWSER.BORDERS

+       ((NORMAL "Normal" 2 -1)
+        (GHOST "Shown elsewhere" 2 8840)
+        (RECURSIVEGHOST "End of recursive chain" 2 0 -1)
+        (MERGED "Includes other branches" 4 42405)
+        (SELFRECURSIVE "Includes self-recursive calls" 2 61375)
+        (RECURSIVE "Head of recursive chain" 4 28086)
+        (ENDOFLINE "exceeded depth limit" 6 64510)))
+(DECLARE%: DOEVAL@COMPILE DONTCOPY
+
+(GLOBALVARS BROWSER.BORDERS BROWSERWINDOWS)
+)
 (DECLARE%: DONTEVAL@LOAD DOCOPY 
 
-(SELECTQ (SYSTEMTYPE)
-    (D (BROWSER
 T))
-    NIL)
+(BROWSER
 T)
 )
-(PUTPROPS BROWSER COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1987 1988 1990 1993 1994))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2054 25148 (NUMSPATHS 2064 . 5246) (BROWSER 5248 . 5511) (BROWSER.WHENFNSCHANGED 5513
- . 7812) (BRPATHS1 7814 . 10080) (BROWSER.LEFTFN 10082 . 10940) (GET.BROWSE.PP.WINDOW 10942 . 11767) (
-GET.BROWSE.DESCRIBE.WINDOW 11769 . 12517) (BROWSEPP 12519 . 13393) (PPREPAINTFN 13395 . 16529) (
-PPRESHAPEFN 16531 . 16711) (DESCRIBEREPAINTFN 16713 . 17409) (BROWSERDESCRIBE 17411 . 18169) (
-BROWSER.MIDDLEFN 18171 . 19478) (DEDITPROCESSRUNNINGP 19480 . 19751) (REDRAWBROWSEGRAPH 19753 . 20516)
- (STBROWSER 20518 . 25146)))))
+  (FILEMAP (NIL (2085 28437 (MSPATHS.DISPATCH 2095 . 2569) (NUMSPATHS 2571 . 6158) (BROWSER 6160 . 6731)
+ (BROWSER.WHENFNSCHANGED 6733 . 8518) (BRPATHS1 8520 . 11171) (BROWSER.LEFTFN 11173 . 14599) (
+GET.BROWSE.PP.WINDOW 14601 . 15426) (GET.BROWSE.DESCRIBE.WINDOW 15428 . 16176) (BROWSEPP 16178 . 17052
+) (PPREPAINTFN 17054 . 20180) (PPRESHAPEFN 20182 . 20358) (DESCRIBEREPAINTFN 20360 . 21064) (
+BROWSERDESCRIBE 21066 . 21808) (BROWSER.MIDDLEFN 21810 . 23125) (DEDITPROCESSRUNNINGP 23127 . 23382) (
+REDRAWBROWSEGRAPH 23384 . 24148) (STBROWSER 24150 . 28435)))))
 STOP

library/PRESS

@@ -1,18 +1,21 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED " 5-Feb-2021 22:18:06" {DSK}<home>larry>ilisp>medley>library>PRESS.;2
 455434Q
 
-      changes to%:  (VARS PRESSCOMS)
+
(FILECREATED "10-Apr-2023 07:15:37" {DSK}<home>larry>il>medley>library>PRESS.;2
 452576Q
 
-      previous date%: "20-Jan-93 14:25:20" {DSK}<home>larry>ilisp>medley>library>PRESS.;1)
+      :EDIT-BY "lmm"
+
+      :CHANGES-TO (VARS PRESSCOMS)
+
+      :PREVIOUS-DATE " 5-Feb-2021 22:18:06" {DSK}<home>larry>il>medley>library>PRESS.;1)
 
 
 (* ; "
-Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1990, 1993, 2021 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1981-1987, 1990, 1993, 2021 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT PRESSCOMS)
 
-(RPAQQ PRESSCOMS

+(RPAQQ PRESSCOMS
 
        [
 
 (* ;;; "PRESS printing support module")

@@ -28,7 +31,7 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1990, 1993, 2021 by Venu
         
         (* ;; "Bitmap printing support")

 
-        (FNS PRESSBITMAP FULLPRESSBITMAP SHOWREGION SHOWPRESSBITMAPREGION PRESSWINDOW WINDOW.BITMAP 
+        (FNS PRESSBITMAP FULLPRESSBITMAP SHOWREGION SHOWPRESSBITMAPREGION PRESSWINDOW 
              \WRITEPRESSBITMAP)
         
         (* ;; "Basic PRESS data structure output functions")

@@ -101,7 +104,7 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1990, 1993, 2021 by Venu
                                                          ROTATION TITLE)))
                               ((FULLPRESS RAVEN)
                                                              (* ; 
-
                                                           "same as PRESS but can scale bitmaps")

+
                                                             "same as PRESS but can scale bitmaps")

                                (CANPRINT (PRESS))
                                (STATUS TRUE)
                                (PROPERTIES NILL)
@@ -718,19 +721,6 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1990, 1993, 2021 by Venu
           (\WRITEPRESSBITMAP
 BITMAP NIL NIL PRSTREAM)
           (RETURN (CLOSEF PRSTREAM])
 
-(WINDOW.BITMAP

-  [LAMBDA (W)
                                           (* ; "Edited 12-Jun-90 10:38 by mitani")

-                                                             (* Returns all of the bitmap of the 
-
                                                           window)

-    (PROG [BM (REGION (WINDOWPROP W 'REGION]
-          (CLOSEW W)
-          (SETQ BM (BITMAPCREATE (fetch
 (REGION WIDTH) of
 REGION)
-                          (fetch
 (REGION HEIGHT) of
 REGION)))
-          (BITBLT (WINDOWPROP W 'IMAGECOVERED)
-                 NIL NIL BM)
-          (OPENW W)
-          (RETURN BM])
-
 (\WRITEPRESSBITMAP

   [LAMBDA (BITMAP XPOS YPOS SCALEFACTOR CLIPPINGREGION PRSTREAM)

                                                             (* ; "Edited 12-Jun-90 10:39 by mitani")

@@ -2344,7 +2334,7 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1990, 1993, 2021 by Venu
 (RPAQQ SPRUCEPAPERTOPSCANS
 4096)
 
 (RPAQ SPRUCEPAPERTOPMICAS
 (FIX (FQUOTIENT (FTIMES SPRUCEPAPERTOPSCANS \MicasPerInch)
-                                          ScansPerIn)))
+                                      ScansPerIn)))
 
 (RPAQ SPRUCEPAPERRIGHTMICAS
 (FIX (FTIMES 8.5 \MicasPerInch)))
 
@@ -2427,85 +2417,74 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1990, 1993, 2021 by Venu
 (DECLARE%: DONTCOPY 
 (DECLARE%: EVAL@COMPILE
 
-(DATATYPE PRESSDATA
 (PRHEADING                           (* The string to be printed atop 
-
                                                           each page.)

-                               PRHEADINGFONT                 (* Font to print the heading in)

-                               PRXPOS                        (* Current X position)

-                               PRYPOS                        (* Current Y position)

-                               PRFONT                        (* Current font)

-                               PRCURRFDE PRESSFONTDIR PRWIDTHSCACHE PRCOLOR PRLINEFEED PRPAGESTATE 
-                               PDSTREAM ELSTREAM XPRPAGEREGION PRDOCNAME (PRLEFT WORD)
+(DATATYPE PRESSDATA
 (PRHEADING                               (* The string to be printed atop each 
+
                                                             page.)

+                           PRHEADINGFONT                     (* Font to print the heading in)

+                           PRXPOS                            (* Current X position)

+                           PRYPOS                            (* Current Y position)

+                           PRFONT                            (* Current font)

+                           PRCURRFDE PRESSFONTDIR PRWIDTHSCACHE PRCOLOR PRLINEFEED PRPAGESTATE 
+                           PDSTREAM ELSTREAM XPRPAGEREGION PRDOCNAME (PRLEFT WORD)
                                                              (* Page left margin)

-                               (PRBOTTOM WORD)               (* Page bottom margin)

-                               (PRRIGHT WORD)                (* Page right margin)

-                               (PRTOP WORD)                  (* Page top margin)

-                               (PRPAGENUM WORD)              (* Current Page number)

-                               (PRNEXTFONT# BYTE)
-                               (PRMAXFONTSET BYTE)
-                               (PRPARTSTART INTEGER)
-                               (DLSTARTBYTE INTEGER)
-                               (ELSTARTBYTE INTEGER)
-                               (STARTCHARBYTE INTEGER)
-                               (VECMOVINGRIGHT FLAG)         (* If we're drawing a curve with 
-
                                                           vector fonts, are we moving to the 
-
                                                           right?)

-                               (VECWASDISPLAYING FLAG)
+                           (PRBOTTOM WORD)                   (* Page bottom margin)

+                           (PRRIGHT WORD)                    (* Page right margin)

+                           (PRTOP WORD)                      (* Page top margin)

+                           (PRPAGENUM WORD)                  (* Current Page number)

+                           (PRNEXTFONT# BYTE)
+                           (PRMAXFONTSET BYTE)
+                           (PRPARTSTART INTEGER)
+                           (DLSTARTBYTE INTEGER)
+                           (ELSTARTBYTE INTEGER)
+                           (STARTCHARBYTE INTEGER)
+                           (VECMOVINGRIGHT FLAG)             (* If we're drawing a curve with 
+
                                                             vector fonts, are we moving to the 
+
                                                             right?)

+                           (VECWASDISPLAYING FLAG)
 
-         (* Used during curve/line clipping to remember whether we were on-screen or 
-
       not, so we know when to force a SETXY.)

+         (* Used during curve/line clipping to remember whether we were on-screen or not, 
+
         so we know when to force a SETXY.)

 
-                               VECSEGCHARS                   (* Cache for vector characters while 
-
                                                           we're moving to the left.)

-                               VECCURX                       (* Current X position within vector 
-
                                                           code, in Dover spots)

-                               VECCURY                       (* Current Y position with vector 
-
                                                           code, in Dover spots)

-                               PRSPACEFACTOR PRSPACEWIDTH (CHARWASDISPLAYING FLAG)
-                                                             (* Says whether we have been 
-
                                                           printing characters inside the 
-
                                                           clipping region)

-                               PRClippingRegion
+                           VECSEGCHARS                       (* Cache for vector characters while 
+
                                                             we're moving to the left.)

+                           VECCURX                           (* Current X position within vector 
+
                                                             code, in Dover spots)

+                           VECCURY                           (* Current Y position with vector 
+
                                                             code, in Dover spots)

+                           PRSPACEFACTOR PRSPACEWIDTH (CHARWASDISPLAYING FLAG)
+                                                             (* Says whether we have been printing 
+
                                                             characters inside the clipping region)

+                           PRClippingRegion
 
          (* The edges of the paper, as far as PRESS is concerned.
-
       Used to protect SPRUCE users who get killed when the image goes off-paper)

+
         Used to protect SPRUCE users who get killed when the image goes off-paper)

 
-                               )
-                        PRSPACEFACTOR _ 1 PRXPOS _ 0 PRYPOS _ 0 
-                                                             (* We assume that the origin is 
-
                                                           translated to the bottom-left of the 
-
                                                           page region)

-                        PRClippingRegion _ (create
 REGION
-                                                  LEFT _ SPRUCEPAPERLEFTMICAS
-                                                  BOTTOM _ SPRUCEPAPERBOTTOMMICAS
-                                                  WIDTH _ (DIFFERENCE SPRUCEPAPERRIGHTMICAS 
-                                                                 SPRUCEPAPERLEFTMICAS)
-                                                  HEIGHT _ 29210)
-                        [ACCESSFNS ((PRWIDTH (IDIFFERENCE (fetch
 (PRESSDATA PRRIGHT) of

-                                                                                         DATUM)
-                                                    (fetch
 (PRESSDATA PRLEFT) of
 DATUM)))
-                                    (PRHEIGHT (IDIFFERENCE (fetch
 (PRESSDATA PRTOP) of
 DATUM)
-                                                     (fetch
 (PRESSDATA PRBOTTOM) of
 DATUM)))
-                                    (PRPAGEREGION (fetch
 (PRESSDATA XPRPAGEREGION) of
 DATUM)
-                                           (PROGN (replace
 (PRESSDATA XPRPAGEREGION) of

-                                                                                         DATUM
-                                                     with
 NEWVALUE)
-                                                  (replace
 (PRESSDATA PRLEFT) of
 DATUM
-                                                     with
 (fetch
 (REGION LEFT) of
 
-                                                                                             NEWVALUE
-                                                                     ))
-                                                  (replace
 (PRESSDATA PRBOTTOM) of
 DATUM
-                                                     with
 (fetch
 (REGION BOTTOM) of

-                                                                                         NEWVALUE))
-                                                  (replace
 (PRESSDATA PRRIGHT) of
 DATUM
-                                                     with
 (IPLUS (fetch
 (REGION LEFT)
-                                                                        of
 NEWVALUE)
-                                                                     (fetch
 (REGION WIDTH)
-                                                                        of
 NEWVALUE)))
-                                                  (replace
 (PRESSDATA PRTOP) of
 DATUM
-                                                     with
 (IPLUS (fetch
 (REGION BOTTOM)
-                                                                        of
 NEWVALUE)
-                                                                     (fetch
 (REGION HEIGHT)
-                                                                        of
 NEWVALUE])
+                           )
+                    PRSPACEFACTOR _ 1 PRXPOS _ 0 PRYPOS _ 0  (* We assume that the origin is 
+
                                                             translated to the bottom-left of the 
+
                                                             page region)

+                    PRClippingRegion _ (create
 REGION
+                                              LEFT _ SPRUCEPAPERLEFTMICAS
+                                              BOTTOM _ SPRUCEPAPERBOTTOMMICAS
+                                              WIDTH _ (DIFFERENCE SPRUCEPAPERRIGHTMICAS 
+                                                             SPRUCEPAPERLEFTMICAS)
+                                              HEIGHT _ 29210)
+                    [ACCESSFNS ((PRWIDTH (IDIFFERENCE (fetch
 (PRESSDATA PRRIGHT) of
 DATUM)
+                                                (fetch
 (PRESSDATA PRLEFT) of
 DATUM)))
+                                (PRHEIGHT (IDIFFERENCE (fetch
 (PRESSDATA PRTOP) of
 DATUM)
+                                                 (fetch
 (PRESSDATA PRBOTTOM) of
 DATUM)))
+                                (PRPAGEREGION (fetch
 (PRESSDATA XPRPAGEREGION) of
 DATUM)
+                                       (PROGN (replace
 (PRESSDATA XPRPAGEREGION) of
 DATUM
+                                                 with
 NEWVALUE)
+                                              (replace
 (PRESSDATA PRLEFT) of
 DATUM
+                                                 with
 (fetch
 (REGION LEFT) of
 NEWVALUE))
+                                              (replace
 (PRESSDATA PRBOTTOM) of
 DATUM
+                                                 with
 (fetch
 (REGION BOTTOM) of
 NEWVALUE))
+                                              (replace
 (PRESSDATA PRRIGHT) of
 DATUM
+                                                 with
 (IPLUS (fetch
 (REGION LEFT) of
 NEWVALUE)
+                                                             (fetch
 (REGION WIDTH) of
 NEWVALUE)))
+                                              (replace
 (PRESSDATA PRTOP) of
 DATUM
+                                                 with
 (IPLUS (fetch
 (REGION BOTTOM) of
 NEWVALUE)
+                                                             (fetch
 (REGION HEIGHT) of
 NEWVALUE])
 
 (RECORD FONTDIRENTRY
 (DESCR FONT# FONTSET#))
 )
@@ -2596,7 +2575,7 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1990, 1993, 2021 by Venu
 (RPAQ? DEFAULTPAGEREGION
 (CREATEREGION 2794 1905 16256 24765))
 
 (RPAQ? PRESSBITMAPREGION
 (CREATEREGION 1270 1270 (FIX (TIMES 7.5 \MicasPerInch))
-                                    (TIMES 10 \MicasPerInch)))
+                                (TIMES 10 \MicasPerInch)))
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
 (GLOBALVARS DEFAULTPAGEREGION)
@@ -2618,7 +2597,7 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1990, 1993, 2021 by Venu
 
 
 
-(RPAQQ PRESSOPS

+(RPAQQ PRESSOPS
 
        (SetX SetY ShowCharacters ShowCharactersShortCode SkipCharactersShortCode 
              ShowCharactersAndSkipCode SetSpaceXShortCode SetSpaceYShortCode FontCode 
              SkipControlBytesImmediateCode AlternativeCode OnlyOnCopyCode SetXCode SetYCode 
@@ -2739,65 +2718,64 @@ Copyright (c) 1981, 1982, 1983, 1984, 1985, 1986, 1987, 1990, 1993, 2021 by Venu
 )
 
 (ADDTOVAR IMAGESTREAMTYPES
 (PRESS (OPENSTREAM OPENPRSTREAM)
-                                      (FONTCREATE \CREATEPRESSFONT)
-                                      (CREATECHARSET \CREATECHARSET.PRESS)
-                                      (FONTSAVAILABLE \SEARCHPRESSFONTS)))
+                                  (FONTCREATE \CREATEPRESSFONT)
+                                  (CREATECHARSET \CREATECHARSET.PRESS)
+                                  (FONTSAVAILABLE \SEARCHPRESSFONTS)))
 
-(ADDTOVAR PRINTERTYPES

-          ((PRESS SPRUCE PENGUIN DOVER)
-           (CANPRINT (PRESS))
-           (STATUS PUP.PRINTER.STATUS)
-           (PROPERTIES PUP.PRINTER.PROPERTIES)
-           (SEND EFTP)
-           (BITMAPSCALE NIL)
-           (BITMAPFILE (PRESSBITMAP FILE BITMAP SCALEFACTOR REGION ROTATION TITLE)))
-          ((FULLPRESS RAVEN)
+(ADDTOVAR PRINTERTYPES
 ((PRESS SPRUCE PENGUIN DOVER)
+                        (CANPRINT (PRESS))
+                        (STATUS PUP.PRINTER.STATUS)
+                        (PROPERTIES PUP.PRINTER.PROPERTIES)
+                        (SEND EFTP)
+                        (BITMAPSCALE NIL)
+                        (BITMAPFILE (PRESSBITMAP FILE BITMAP SCALEFACTOR REGION ROTATION TITLE)))
+                       ((FULLPRESS RAVEN)
                                                              (* ; 
-
                                                           "same as PRESS but can scale bitmaps")

-           (CANPRINT (PRESS))
-           (STATUS TRUE)
-           (PROPERTIES NILL)
-           (SEND EFTP)
-           (BITMAPSCALE PRESS.BITMAPSCALE)
-           (BITMAPFILE (FULLPRESSBITMAP FILE BITMAP SCALEFACTOR REGION ROTATION TITLE))))
+
                                                             "same as PRESS but can scale bitmaps")

+                        (CANPRINT (PRESS))
+                        (STATUS TRUE)
+                        (PROPERTIES NILL)
+                        (SEND EFTP)
+                        (BITMAPSCALE PRESS.BITMAPSCALE)
+                        (BITMAPFILE (FULLPRESSBITMAP FILE BITMAP SCALEFACTOR REGION ROTATION TITLE))))
 
-(ADDTOVAR PRINTFILETYPES

-          [PRESS (TEST PRESSFILEP)
-                 (EXTENSION (PRESS))
-                 (CONVERSION (TEXT MAKEPRESS TEDIT (LAMBDA (FILE PFILE FONTS HEADING)
-                                                          (SETQ FILE (OPENTEXTSTREAM FILE))
-                                                          (TEDIT.FORMAT.HARDCOPY FILE PFILE T NIL NIL
-                                                                 NIL 'PRESS)
-                                                          (CLOSEF? FILE)
-                                                          PFILE])
+(ADDTOVAR PRINTFILETYPES
 [PRESS (TEST PRESSFILEP)
+                                (EXTENSION (PRESS))
+                                (CONVERSION (TEXT MAKEPRESS TEDIT
+                                                  (LAMBDA (FILE PFILE FONTS HEADING)
+                                                         (SETQ FILE (OPENTEXTSTREAM FILE))
+                                                         (TEDIT.FORMAT.HARDCOPY FILE PFILE T NIL NIL
+                                                                NIL 'PRESS)
+                                                         (CLOSEF? FILE)
+                                                         PFILE])
 (PUTPROPS PRESS COPYRIGHT ("Venue & Xerox Corporation" 3675Q 3676Q 3677Q 3700Q 3701Q 3702Q 3703Q 3706Q
  3711Q 3745Q))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (16032Q 73011Q (\SEARCHPRESSFONTS 16044Q . 20001Q) (\GETPRESSFONTNAMES 20003Q . 26641Q) 
-(\PRESSFAMILYCODELST 26643Q . 30565Q) (\DECODEPRESSFACEBYTE 30567Q . 33356Q) (\CREATEPRESSFONT 33360Q
- . 35625Q) (\CREATECHARSET.PRESS 35627Q . 73007Q)) (73446Q 130434Q (PRESSBITMAP 73460Q . 103062Q) (
-FULLPRESSBITMAP 103064Q . 111076Q) (SHOWREGION 111100Q . 112442Q) (SHOWPRESSBITMAPREGION 112444Q . 
-113106Q) (PRESSWINDOW 113110Q . 117247Q) (WINDOW.BITMAP 117251Q . 120432Q) (\WRITEPRESSBITMAP 120434Q
- . 130432Q)) (130532Q 160405Q (\BCPLSOUT.PRESS 130544Q . 131521Q) (\PAGEPAD.PRESS 131523Q . 132760Q) (
-\ENTITYEND.PRESS 132762Q . 140256Q) (\PARTEND.PRESS 140260Q . 142645Q) (\ENTITYSTART.PRESS 142647Q . 
-146260Q) (SETX.PRESS 146262Q . 150115Q) (SETXY.PRESS 150117Q . 153121Q) (SETY.PRESS 153123Q . 154523Q)
- (SHOW.PRESS 154525Q . 160403Q)) (160467Q 275304Q (OPENPRSTREAM 160501Q . 165630Q) (\BITBLT.PRESS 
-165632Q . 170244Q) (\BLTSHADE.PRESS 170246Q . 171701Q) (\SCALEDBITBLT.PRESS 171703Q . 174327Q) (
-\BITMAPSIZE.PRESS 174331Q . 175271Q) (\CHARWIDTH.PRESS 175273Q . 177342Q) (\CLOSEF.PRESS 177344Q . 
-207333Q) (\DRAWLINE.PRESS 207335Q . 210673Q) (\ENDPAGE.PRESS 210675Q . 212145Q) (NEWLINE.PRESS 212147Q
- . 213560Q) (NEWPAGE.PRESS 213562Q . 214054Q) (SETUPFONTS.PRESS 214056Q . 217607Q) (\DEFINEFONT.PRESS 
-217611Q . 221733Q) (\DSPBOTTOMMARGIN.PRESS 221735Q . 222531Q) (\DSPCLIPPINGREGION.PRESS 222533Q . 
-224125Q) (\DSPFONT.PRESS 224127Q . 231121Q) (\DSPLEFTMARGIN.PRESS 231123Q . 232003Q) (
-\DSPLINEFEED.PRESS 232005Q . 233315Q) (\DSPRIGHTMARGIN.PRESS 233317Q . 234202Q) (\DSPSPACEFACTOR.PRESS
- 234204Q . 235610Q) (\DSPTOPMARGIN.PRESS 235612Q . 236375Q) (\DSPXPOSITION.PRESS 236377Q . 237115Q) (
-\DSPYPOSITION.PRESS 237117Q . 237635Q) (\FIXLINELENGTH.PRESS 237637Q . 241734Q) (\OUTCHARFN.PRESS 
-241736Q . 250772Q) (\SETSPACE.PRESS 250774Q . 252270Q) (\STARTPAGE.PRESS 252272Q . 256633Q) (
-\STRINGWIDTH.PRESS 256635Q . 272213Q) (SHOWRECTANGLE.PRESS 272215Q . 272736Q) (
-\PRESS.CONVERT.NSCHARACTER 272740Q . 275302Q)) (275344Q 406406Q (\ENDVECRUN 275356Q . 305174Q) (
-\VECENCODE 305176Q . 306225Q) (\VECPUT 306227Q . 315655Q) (\VECSKIP 315657Q . 316412Q) (\VECFONTINIT 
-316414Q . 323537Q) (\DRAWCIRCLE.PRESS 323541Q . 326044Q) (\DRAWARC.PRESS 326046Q . 326637Q) (
-\DRAWCURVE.PRESS 326641Q . 334577Q) (\DRAWCURVE.PRESS.LINE 334601Q . 343446Q) (\DRAWELLIPSE.PRESS 
-343450Q . 347227Q) (\GETBRUSHFONT.PRESS 347231Q . 351133Q) (\PRESSCURVE2 351135Q . 406404Q)) (412244Q 
-417070Q (\PRESSINIT 412256Q . 417066Q)) (446754Q 452043Q (MAKEPRESS 446766Q . 447272Q) (PRESSFILEP 
-447274Q . 451051Q) (PRESS.BITMAPSCALE 451053Q . 452041Q)))))
+  (FILEMAP (NIL (15752Q 72731Q (\SEARCHPRESSFONTS 15764Q . 17721Q) (\GETPRESSFONTNAMES 17723Q . 26561Q) 
+(\PRESSFAMILYCODELST 26563Q . 30505Q) (\DECODEPRESSFACEBYTE 30507Q . 33276Q) (\CREATEPRESSFONT 33300Q
+ . 35545Q) (\CREATECHARSET.PRESS 35547Q . 72727Q)) (73366Q 127171Q (PRESSBITMAP 73400Q . 103002Q) (
+FULLPRESSBITMAP 103004Q . 111016Q) (SHOWREGION 111020Q . 112362Q) (SHOWPRESSBITMAPREGION 112364Q . 
+113026Q) (PRESSWINDOW 113030Q . 117167Q) (\WRITEPRESSBITMAP 117171Q . 127167Q)) (127267Q 157142Q (
+\BCPLSOUT.PRESS 127301Q . 130256Q) (\PAGEPAD.PRESS 130260Q . 131515Q) (\ENTITYEND.PRESS 131517Q . 
+137013Q) (\PARTEND.PRESS 137015Q . 141402Q) (\ENTITYSTART.PRESS 141404Q . 145015Q) (SETX.PRESS 145017Q
+ . 146652Q) (SETXY.PRESS 146654Q . 151656Q) (SETY.PRESS 151660Q . 153260Q) (SHOW.PRESS 153262Q . 
+157140Q)) (157224Q 274041Q (OPENPRSTREAM 157236Q . 164365Q) (\BITBLT.PRESS 164367Q . 167001Q) (
+\BLTSHADE.PRESS 167003Q . 170436Q) (\SCALEDBITBLT.PRESS 170440Q . 173064Q) (\BITMAPSIZE.PRESS 173066Q
+ . 174026Q) (\CHARWIDTH.PRESS 174030Q . 176077Q) (\CLOSEF.PRESS 176101Q . 206070Q) (\DRAWLINE.PRESS 
+206072Q . 207430Q) (\ENDPAGE.PRESS 207432Q . 210702Q) (NEWLINE.PRESS 210704Q . 212315Q) (NEWPAGE.PRESS
+ 212317Q . 212611Q) (SETUPFONTS.PRESS 212613Q . 216344Q) (\DEFINEFONT.PRESS 216346Q . 220470Q) (
+\DSPBOTTOMMARGIN.PRESS 220472Q . 221266Q) (\DSPCLIPPINGREGION.PRESS 221270Q . 222662Q) (\DSPFONT.PRESS
+ 222664Q . 227656Q) (\DSPLEFTMARGIN.PRESS 227660Q . 230540Q) (\DSPLINEFEED.PRESS 230542Q . 232052Q) (
+\DSPRIGHTMARGIN.PRESS 232054Q . 232737Q) (\DSPSPACEFACTOR.PRESS 232741Q . 234345Q) (
+\DSPTOPMARGIN.PRESS 234347Q . 235132Q) (\DSPXPOSITION.PRESS 235134Q . 235652Q) (\DSPYPOSITION.PRESS 
+235654Q . 236372Q) (\FIXLINELENGTH.PRESS 236374Q . 240471Q) (\OUTCHARFN.PRESS 240473Q . 247527Q) (
+\SETSPACE.PRESS 247531Q . 251025Q) (\STARTPAGE.PRESS 251027Q . 255370Q) (\STRINGWIDTH.PRESS 255372Q . 
+270750Q) (SHOWRECTANGLE.PRESS 270752Q . 271473Q) (\PRESS.CONVERT.NSCHARACTER 271475Q . 274037Q)) (
+274101Q 405143Q (\ENDVECRUN 274113Q . 303731Q) (\VECENCODE 303733Q . 304762Q) (\VECPUT 304764Q . 
+314412Q) (\VECSKIP 314414Q . 315147Q) (\VECFONTINIT 315151Q . 322274Q) (\DRAWCIRCLE.PRESS 322276Q . 
+324601Q) (\DRAWARC.PRESS 324603Q . 325374Q) (\DRAWCURVE.PRESS 325376Q . 333334Q) (
+\DRAWCURVE.PRESS.LINE 333336Q . 342203Q) (\DRAWELLIPSE.PRESS 342205Q . 345764Q) (\GETBRUSHFONT.PRESS 
+345766Q . 347670Q) (\PRESSCURVE2 347672Q . 405141Q)) (410775Q 415621Q (\PRESSINIT 411007Q . 415617Q)) 
+(443570Q 446657Q (MAKEPRESS 443602Q . 444106Q) (PRESSFILEP 444110Q . 445665Q) (PRESS.BITMAPSCALE 
+445667Q . 446655Q)))))
 STOP

library/SYSEDIT

@@ -1,16 +1,14 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "25-Jun-2022 18:22:01" {DSK}<home>larry>medley>library>SYSEDIT.;2
 1373   
+
(FILECREATED "29-Apr-2023 16:15:10" {DSK}<home>larry>il>medley>library>SYSEDIT.;2
 1377   
+
+      :EDIT-BY "lmm"
 
       :CHANGES-TO (VARS SYSEDITCOMS)
 
-      :PREVIOUS-DATE "28-Sep-2021 10:16:44" {DSK}<home>larry>medley>library>SYSEDIT.;1)
+      :PREVIOUS-DATE "17-Apr-2023 14:19:03" {DSK}<home>larry>il>medley>library>SYSEDIT.;1)
 
 
-(* ; "
-Copyright (c) 1984, 1987, 1990, 2021 by Venue & Xerox Corporation.
-")
-
 (PRETTYCOMPRINT SYSEDITCOMS)
 
 (RPAQQ SYSEDITCOMS

@@ -22,8 +20,10 @@ Copyright (c) 1984, 1987, 1990, 2021 by Venue & Xerox Corporation.
               (CLISPIFTRANFLG T)
               (CROSSCOMPILING 'ASK)
               (*REPLACE-OLD-EDIT-DATES* NIL)
-              (COPYRIGHTFLG 'PRESERVE))
-        (P (RESETVARS ((CROSSCOMPILING T))
+              (COPYRIGHTFLG 'NEVER)
+              (MSRECORDTRANFLG T))
+        (P (MOVD? 'APPLY* 'SPREADAPPLY*X)
+           (RESETVARS ((CROSSCOMPILING T))
                   (FILESLOAD (SOURCE)
                          EXPORTS.ALL])
 
@@ -43,12 +43,15 @@ Copyright (c) 1984, 1987, 1990, 2021 by Venue & Xerox Corporation.
 
 (RPAQQ *REPLACE-OLD-EDIT-DATES*
 NIL)
 
-(RPAQQ COPYRIGHTFLG
 PRESERVE)
+(RPAQQ COPYRIGHTFLG
 NEVER)
+
+(RPAQQ MSRECORDTRANFLG
 T)
+
+(MOVD? 'APPLY* 'SPREADAPPLY*X)
 
 (RESETVARS ((CROSSCOMPILING T))
            (FILESLOAD (SOURCE)
                   EXPORTS.ALL))
-(PUTPROPS SYSEDIT COPYRIGHT ("Venue & Xerox Corporation" 1984 1987 1990 2021))
 (DECLARE%: DONTCOPY
   (FILEMAP (NIL)))
 STOP