Fixing up confusion between Docker username and Docker namespaces. Hopefully will fix docker login issues with buildDocker workflow. (#677)

* New version of IRM

New version of the IRM, updated to Medley.

* moved to docs/medley-irm as discussed

.github/workflows/buildDocker.yml

@@ -1,106 +1,245 @@
-#  based on https://blog.oddbit.com/post/2020-09-25-building-multi-architecture-im/
----
-# Interlisp workflow to build Docker Image that support multiple architectures
-name: Build Medley Docker image
+#*******************************************************************************
+# buidDocker.yml
+#
+# Workflow to build and push a multiplatform (amd64, arm64 & arm7) Linux Docker
+# image for Medley. This workflow uses the latest Maiko docker image and the 
+# latest Medley release on github.
+#
+# This workflow contains a sentry that causes it to skip the build (as identified
+# by its commit SHA) if its already been done.  Setting the "force" input to true
+# will bypass this sentry,
+#
+# Updated 2022-01-18 by Frank Halasz from on earlier buildDocker.yml
+#
+# Copyright 2022 by Interlisp.org
+#
+# ******************************************************************************
 
-# Run this workflow on demand
+name: 'Build/Push Docker Image'
+
+# Run this workflow on ...
 on:
   workflow_dispatch:
+    force:
+      description: "Force build even if build already successfully completed for this commit"
+      type: choice
+      options:
+      - 'false'
+      - 'true'
+  
+  workflow_call:
+    outputs:
+      successful:
+        description: "'True' if medley docker build completed successully"
+        value: ${{ jobs.complete.outputs.build_successful }}
+    inputs:
+      force:
+        description: "Force build even if build already successfully completed for this commit"
+        required: false
+        type: string
+        default: 'false'
+    secrets:
+      DOCKER_USERNAME:
+        required: true
+      DOCKER_PASSWORD:
+        required: true
+
+defaults:
+  run:
+    shell: bash
+    
 
-# Jobs that compose this workflow
 jobs:
-  # Job to build the docker image
-  docker:
+
+######################################################################################
+
+  # Regularize the inputs so they can be referenced the same way whether they are
+  # the result of a workflow_dispatch or a workflow_call
+
+  inputs:
     runs-on: ubuntu-latest
+    outputs:
+      force: ${{ steps.force.outputs.force }}
     steps:
-      # Checkout the branch
-      - name: Checkout
+      - id: force
+        run: >
+          if [ '${{ toJSON(inputs) }}' = 'null'  ];
+          then echo ::set-output name=force::'${{ github.event.inputs.force }}'; echo "workflow_dispatch";
+          else echo ::set-output name=force::'${{ inputs.force }}'; echo "workflow_call";
+          fi
+        
+
+
+######################################################################################
+
+  # Use sentry-action to determine if this release has already been built
+  # based on the latest commit to the repo
+
+  sentry:
+    needs: inputs
+    runs-on: ubuntu-latest
+    outputs:
+      release_not_built: ${{ steps.check.outputs.release_not_built }}
+
+    steps: 
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # Check if build already run for this commit
+      - name: Build already completed? 
+        id: check
+        continue-on-error: true
+        uses: ./../actions/check-sentry-action
+        with:
+          tag: "docker"
+
+######################################################################################
+
+  #
+  #  Build and push the medley docker image
+  #
+
+  build_and-push:
+
+    runs-on: ubuntu-latest
+
+    needs: [inputs, sentry]
+    if: |
+      needs.sentry.outputs.release_not_built == 'true'
+      || needs.inputs.outputs.force == 'true'
+    
+    steps:
+      # Checkout latest commit
+      - name: Checkout Medley
         uses: actions/checkout@v2
 
-      # Get the Medley Release Information
-      - name: Get Medley Release Information
-        id: medley_version
-        uses: abatilo/release-info-action@v1.3.0
-        with:
-          owner: Interlisp
-          repo: medley
-
-      # Get the Maiko Release Information
-      - name: Get Maiko Release Information
-        id: maiko_version
-        uses: abatilo/release-info-action@v1.3.0
-        with:
-          owner: Interlisp
-          repo: maiko
-
-      # Setup needed environment variables
-      - name: Prepare
-        id: prep
+      # Set repo env variables
+      - name: Set repo/docker env variables
+        id: repo_env
         run: |
-          DOCKERHUB_ACCOUNT=interlisp
-          DOCKER_IMAGE=${DOCKERHUB_ACCOUNT}/${GITHUB_REPOSITORY#*/}
-          VERSION=latest
-          MAIKO_RELEASE=${{ steps.maiko_version.outputs.latest_tag }}
-          MEDLEY_RELEASE=${{ steps.medley_version.outputs.latest_tag }}
+          REPO_NAME=${GITHUB_REPOSITORY#*/}
+          echo "REPO_NAME=${REPO_NAME}" >> ${GITHUB_ENV}
+          echo ::set-output name=repo_name::${REPO_NAME}
+          DOCKER_NAMESPACE=$(echo "${{ github.repository_owner }}" | tr '[:upper:]' '[:lower:]')
+          echo "DOCKER_NAMESPACE=${DOCKER_NAMESPACE}" >> ${GITHUB_ENV}
+          echo ::set-output name=docker_namespace::${DOCKER_NAMESPACE}
 
-          TAGS="${DOCKER_IMAGE}:${MEDLEY_RELEASE},${DOCKER_IMAGE}:${VERSION},${DOCKER_IMAGE}:${MAIKO_RELEASE}"
+      # Get tag of latest Medley release.
+      - name: Get Medley Release Information
+        id: release_info
+        uses: abatilo/release-info-action@v1.3.0
+        with:
+          owner: ${{ github.repository_owner }}
+          repo: medley
           
-          # Set output parameters.
-          echo ::set-output name=tags::${TAGS}
+      # Get asset tars from latest Medley release
+      - name: Download Release Assets
+        uses: robinraju/release-downloader@v1.2
+        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 ::set-output name=maiko_release::${MAIKO_RELEASE}
+
+      # 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}
+          DOCKER_TAGS="${DOCKER_IMAGE}:latest,${DOCKER_IMAGE}:${RELEASE_TAG#*-}_${MAIKO_RELEASE#*-}"
+          echo ::set-output name=docker_tags::${DOCKER_TAGS}
           echo ::set-output name=docker_image::${DOCKER_IMAGE}
           echo ::set-output name=build_time::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
-          echo ::set-output name=version::${VERSION}
+          echo ::set-output name=release_tag::${RELEASE_TAG}
+          echo "release_tag=${RELEASE_TAG}" >> ${GITHUB_ENV}
 
-      # Download Medley Release Assets
-      - name: Download Release Assets
-        uses: robinraju/release-downloader@v1.2
-        with:
-          repository: Interlisp/medley
-          token: ${{ secrets.GITHUB_TOKEN }}
-          latest: true
-          fileName: "*"
-
-      # Download Maiko Release Assets
-      - name: Download Release Assets
-        uses: robinraju/release-downloader@v1.2
-        with:
-          repository: Interlisp/maiko
-          token: ${{ secrets.GITHUB_TOKEN }}
-          latest: true
-          fileName: "*"
-
-      # Setup Docker Machine Emulation environment
+      # Setup the Docker Machine Emulation environment.  
       - name: Set up QEMU
         uses: docker/setup-qemu-action@master
         with:
-          platforms: all
+          platforms: linux/amd64,linux/arm64,linux/arm/v7
 
-      # Setup Docker Buildx function
+      # Setup the Docker Buildx funtion
       - name: Set up Docker Buildx
         id: buildx
         uses: docker/setup-buildx-action@master
 
-      # Login to DockerHub - required to store the image
+      # Login into DockerHub - required to store the created image
       - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
         uses: docker/login-action@v1
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
 
-      # Start the Docker Build using the Dockerfilein the repository
-      - name: Build
+      # Do the Docker Build using the Dockerfile in the repository
+      # checked out and the release tars just downloaded.
+      # Push the result to Docker Hub
+      - name: Build Docker Image for Push to Docker Hub
         uses: docker/build-push-action@v2
         with:
           builder: ${{ steps.buildx.outputs.name }}
-          context: .
+          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 }}
+            REPO_OWNER=${{ github.repository_owner }}
+          context: ./release_tars
           file: ./Dockerfile
-          # Platforms
-          #  linux/amd64 -- Standard x86_64
-          #  linux/arm64 -- Apple M1
-          #  linux/arm/v7 -- Raspberry pi
           platforms: linux/amd64,linux/arm64,linux/arm/v7
-          # Push the created image
+          # Push the result to DockerHub
           push: true
-          # tags to assign to the Docker image
-          tags: ${{ steps.prep.outputs.tags }}
+          tags: ${{ steps.setup_env.outputs.docker_tags }}
+
+######################################################################################
+
+  # Use set-sentry-action to determine set the sentry that says this release has
+  # been successfully built
+
+  complete:
+
+    runs-on: ubuntu-latest
+
+    outputs:
+      build_successful: ${{ steps.output.outputs.build_successful }}
+
+    needs: [inputs, sentry, build_and-push]
+
+    steps: 
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # Set sentry
+      - name: Set flag that build for this commit has been completed
+        id: set
+        uses: ./../actions/set-sentry-action
+        with:
+          tag: "docker"
+     
+      - name: Output
+        id: output
+        run: |
+          echo ::set-output name=build_successful::'true'
+          
+######################################################################################

.github/workflows/buildLoadup.yml

@@ -1,46 +1,150 @@
-# Interlisp workflow to build Medley release
-name: Build Medley Release
+#*******************************************************************************
+# buidLoadup.yml
+#
+# Interlisp workflow to build Medley release and push it to github. This workflow
+# is platform independent - but runs on Linux/amd64.
+#
+# This workflow contains a sentry that causes it to skip the build (as identified
+# by its commit SHA) if its already been done.  Setting the "force" input to true
+# will bypass this sentry,
+#
+# 2022-01-17 Frank Halasz based on an earlier version of buildLoadup for Medley.
+#
+# Copyright 2022 by Interlisp.org
+#
+# ******************************************************************************
 
-# Run this workflow on push to master
+name: Build/Push Medley Release
+
+# Run this workflow on ...
 on:
   workflow_dispatch:
     inputs:
-      tag:
-        description:  'Release Tag'
+      force:
+        description: "Force build even if build already successfully completed for this commit"
+        type: choice
+        options:
+        - 'false'
+        - 'true'
 
-# Jobs that compose this workflow
+  workflow_call:
+    outputs:
+      successful:
+        description: "'True' if medley build completed successully"
+        value: ${{ jobs.complete.outputs.build_successful }}
+    inputs:
+      force:
+        description: "Force build even if build already successfully completed for this commit"
+        required: false
+        type: string
+        default: 'false'
+
+defaults:
+  run:
+    shell: bash
+    
+  
 jobs:
-  # Build Loadup
-  loadup:
+
+######################################################################################
+
+  # Regularize the inputs so they can be referenced the same way whether they are
+  # the result of a workflow_dispatch or a workflow_call
+
+  inputs:
     runs-on: ubuntu-latest
+    outputs:
+      force: ${{ steps.force.outputs.force }}
     steps:
-      - name: Set release tag if currently undefined
-        if: ${{ github.event.inputs.tag == null }}
-        run:  |
-          echo "tag=medley-`date +%y%m%d`" >> $GITHUB_ENV
+      - id: force
+        run: >
+          if [ '${{ toJSON(inputs) }}' = 'null'  ];
+          then echo ::set-output name=force::'${{ github.event.inputs.force }}'; echo "workflow_dispatch";
+          else echo ::set-output name=force::'${{ inputs.force }}'; echo "workflow_call";
+          fi
+        
 
-      - name: Set release tag to input value
-        if: ${{ github.event.inputs.tag != null }}
-        run: |
-          echo "tag=${{ github.event.inputs.tag }}" >> $GITHUB_ENV
 
+######################################################################################
+
+  # Use sentry-action to determine if this release has already been built
+  # based on the latest commit to the repo
+
+  sentry:
+    needs: inputs
+    runs-on: ubuntu-latest
+    outputs:
+      release_not_built: ${{ steps.check.outputs.release_not_built }}
+
+    steps: 
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # Check if build already run for this commit
+      - name: Build already completed? 
+        id: check
+        continue-on-error: true
+        uses: ./../actions/check-sentry-action
+        with:
+          tag: "loadup"
+
+######################################################################################
+
+  # Do the loadup
+  # 
+
+  loadup:
+
+    runs-on: ubuntu-latest
+
+    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
+        uses: actions/checkout@v2
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # Checkout latest commit
       - name: Checkout Medley
         uses: actions/checkout@v2
 
+      # Setup release tag
+      - name: Setup Release Tag
+        id: tag
+        uses: ./../actions/release-tag-action
+
+      # Setup environment variables
+      - name: Setup Environment Variables
+        id: setup_env
+        run: |
+          echo ::set-output name=build_time::$(date -u +'%Y-%m-%dT%H:%M:%SZ')
+
       # Get Maiko release information, retrieves the name of the latest
       # release.  Used to download the correct Maiko release
       - name: Get Maiko Release Information
         id: latest_version
         uses: abatilo/release-info-action@v1.3.0
         with:
-          owner: Interlisp
+          owner: ${{ github.repository_owner }}
           repo: maiko
           
       # Download Maiko Release Assets
       - name: Download Release Assets
         uses: robinraju/release-downloader@v1.2
         with:
-          repository: Interlisp/maiko
+          repository: ${{ github.repository_owner }}/maiko
           token: ${{ secrets.GITHUB_TOKEN }}
           latest: true
           fileName: "${{ steps.latest_version.outputs.latest_tag }}-linux.x86_64.tgz" 
@@ -49,7 +153,7 @@ jobs:
         run: |
           tar -xvzf "${{ steps.latest_version.outputs.latest_tag }}-linux.x86_64.tgz"
 
-      - name: install vnc
+      - name: Install vnc
         run: sudo apt-get update && sudo apt-get install -y tightvncserver
 
       - name: Build Loadout
@@ -59,23 +163,25 @@ jobs:
           PATH="$PWD/maiko:$PATH" 
           scripts/loadup-all.sh
 
-      - name: Build release tar get libs
+      - name: Build loadups release tar
         run: |
           cp -p tmp/full.sysout tmp/lisp.sysout tmp/*.dribble tmp/whereis.hash loadups/
           cp -p tmp/exports.all tmp/RDSYS tmp/RDSYS.LCOM library/
           cd ..
-          tar cfz medley/tmp/$tag-loadups.tgz        \
+          tar cfz medley/tmp/${release_tag}-loadups.tgz        \
             medley/loadups/lisp.sysout               \
             medley/loadups/full.sysout               \
             medley/loadups/whereis.hash              \
             medley/library/exports.all               \
             medley/library/RDSYS/                    \
             medley/library/RDSYS.LCOM   
+        env:
+          release_tag: ${{ steps.tag.outputs.release_tag }}
       
-      - name: tar part 2
+      - name: Build runtime release tar
         run: |
           cd ..
-          tar cfz medley/tmp/$tag-runtime.tgz                    \
+          tar cfz medley/tmp/${release_tag}-runtime.tgz                    \
                      --exclude "*~" --exclude "*#*"              \
                      medley/docs/dinfo                           \
                      medley/docs/Documentation\ Tools            \
@@ -91,16 +197,57 @@ jobs:
                      medley/fonts/other                          \
                      medley/sources/                             \
                      medley/internal/library      
+        env:
+          release_tag: ${{ steps.tag.outputs.release_tag }}
 
       - name: Release notes
         run: |
-          sed s/'$tag'/$tag/g < release-notes.md > tmp/release-notes.md
+          sed s/'$tag'/${{ steps.tag.outputs.release_tag }}/g < release-notes.md > tmp/release-notes.md
       
-      - name: push the release
+      - name: Push the release
         uses: ncipollo/release-action@v1.8.10
         with: 
-          artifacts: tmp/${{ env.tag }}-loadups.tgz,tmp/${{ env.tag }}-runtime.tgz
-          tag: ${{ env.tag }}
+          artifacts: tmp/${{ env.release_tag }}-loadups.tgz,tmp/${{ env.release_tag }}-runtime.tgz
+          tag: ${{ env.release_tag }}
           draft: true
           bodyfile: tmp/release-notes.md
-          token: ${{ secrets.GITHUB_TOKEN }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+        env:
+          release_tag: ${{ steps.tag.outputs.release_tag }}
+
+######################################################################################
+
+  # Use set-sentry-action to determine set the sentry that says this release has
+  # been successfully built
+
+  complete:
+
+    runs-on: ubuntu-latest
+
+    outputs:
+      build_successful: ${{ steps.output.outputs.build_successful }}
+
+    needs: [inputs, sentry, loadup]
+
+    steps: 
+      # Checkout the actions for this repo owner
+      - name: Checkout Actions
+        uses: actions/checkout@v2
+        with:
+          repository: ${{ github.repository_owner }}/.github
+          path: ./Actions_${{ github.sha }}
+      - run: mv ./Actions_${{ github.sha }}/actions ../actions && rm -rf ./Actions_${{ github.sha }}
+
+      # Set sentry
+      - name: Set flag that build for this commit has been completed
+        id: set
+        uses: ./../actions/set-sentry-action
+        with:
+          tag: "loadup"
+
+      - name: Output
+        id: output
+        run: |
+          echo ::set-output name=build_successful::'true'
+          
+######################################################################################

.github/workflows/buildReleaseInclDocker.yml

@@ -0,0 +1,36 @@
+#*******************************************************************************
+# buidReleaseInclDocker.yml
+#
+# Interlisp webflow to build a Medley release and push it to github.
+# And to build a multiplatform Docker image for the release and push it to Docker Hub.
+#
+# This workflow just calls two reuseable workflows to the two task:
+# buildLoadup.yml and buildDocker.yml
+#
+# 2022-01-18 Frank Halasz
+#
+# Copyright 2022 by Interlisp.org
+#
+# ******************************************************************************
+
+
+name: "Build/Push Release & Docker"
+
+# Run this workflow on ...
+on:
+  workflow_dispatch:
+  
+
+# Jobs that compose this workflow
+jobs:
+  # Build Loadup
+  do_release:
+    uses: ./.github/workflows/buildLoadup.yml
+    
+  # Build Docker Image
+  do_docker:
+    needs: do_release
+    uses: ./.github/workflows/buildDocker.yml
+    secrets:
+      DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
+      DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}

.github/workflows/testLogin.yml

@@ -0,0 +1,23 @@
+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,20 +1,54 @@
-FROM ubuntu:focal
-ARG BUILD_DATE
-LABEL name="Medley"
-# LABEL tags=${tags}
-LABEL description="The Medley Interlisp environment"
-LABEL url="https://github.com/Interlisp/medley"
-LABEL build-time=$BUILD_DATE
+#*******************************************************************************
+# 
+# Dockerfile to build Medley image from latest Maiko image 
+# plus latest release tars from github
+#
+# Copyright 2022 by Interlisp.org
+#
+# ******************************************************************************
 
+ARG DOCKER_NAMESPACE=interlisp
+
+FROM ${DOCKER_NAMESPACE}/maiko:latest
+
+# Add tightvnc server to the image
 RUN apt-get update && apt-get install -y tightvncserver
 
+#  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 INSTALL_LOCATION=/usr/local/interlisp
+ENV INSTALL_LOCATION=${INSTALL_LOCATION}
+
+ARG DOCKER_NAMESPACE=interlisp
+ENV DOCKER_NAMESPACE=${DOCKER_NAMESPACE}
+
+# Copy over the release tars
+RUN mkdir -p ${INSTALL_LOCATION}
+ADD ./*.tgz ${INSTALL_LOCATION}
+
+# Create a run_medley script in /usr/local/bin
+RUN mkdir -p /usr/local/bin                                     && \
+    echo "#!/bin/bash"              > /usr/local/bin/run-medley && \
+    echo "cd ${INSTALL_LOCATION}"  >> /usr/local/bin/run-medley && \
+    echo './run-medley "$@"'       >> /usr/local/bin/run-medley && \
+    chmod ugo+x /usr/local/bin/run-medley
+    
+# "Finalize" image
 EXPOSE 5900
-
-# Copy and uncompress loadup and required source files.
-ADD *.tgz /app
-
-WORKDIR /app/medley
-
 RUN adduser --disabled-password --gecos "" medley
 USER medley
-ENTRYPOINT USER=medley Xvnc -geometry 1280x720 :0 & DISPLAY=:0 PATH="/app/maiko:$PATH" ./run-medley -full -g 1280x720 -sc 1280x720
+WORKDIR /home/medley
+ENTRYPOINT USER=medley Xvnc -geometry 1280x720 :0 & DISPLAY=:0 ${INSTALL_LOCATION}/medley/run-medley -full -g 1280x720 -sc 1280x720

README.md

@@ -14,7 +14,7 @@ There (soon) will also be Docker containers with the latest, and a way to try ou
 
 ### Getting releases
 
-Get the Maiko release [here](https://github.com/Interlisp/maiko/releases). You'll need the one corresponding to your operating system and processor (for Windows with WSL or Intel linux, use `linux.x86_64`; for Macs use `darwin.x86_64` for Intel and `darwin.aarch64` for M1.)
+Get the Maiko release [here](https://github.com/Interlisp/maiko/releases). You'll need the one corresponding to your operating system and processor (for Windows with WSL or Intel Linux, use `linux.x86_64`; for Macs use `darwin.x86_64` for Intel and `darwin.aarch64` for M1.)
 
 Or, build your own maiko (the binaries `lde` `ldex` and `ldeinit`.) We can build for other OS arch pairs depending on what is available for GitHub actions.
 
@@ -99,7 +99,7 @@ Or from the Common Lisp prompt with:
 ```
 (IL:LOGOUT)
 ```
-When you logout of the system, Medley automatically creates a binary
+When you log out of the system, Medley automatically creates a binary
 dump of your system located in your home directory named
 `lisp.virtualmem`. The next time you run the system, if you don't
 specify a specific image to run, Medley restores that image so that

greetfiles/MEDLEYDIR-INIT

@@ -1,18 +1,21 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "14-Nov-2021 22:34:49" {DSK}<home>larry>medley>greetfiles>MEDLEYDIR-INIT.;2
 2303   
+
(FILECREATED " 2-Dec-2021 21:13:55" {DSK}<home>larry>medley>greetfiles>MEDLEYDIR-INIT.;3
 2392   
 
       changes to%:  (VARS MEDLEYDIR-INITCOMS)
+                    (FNS INTERLISPMODE)
 
-      previous date%: "14-Nov-2021 22:10:37" {DSK}<home>larry>medley>greetfiles>medleydir-INIT.;1)
+      previous date%: "14-Nov-2021 22:34:49" {DSK}<home>larry>medley>greetfiles>MEDLEYDIR-INIT.;1)
 
 
 (PRETTYCOMPRINT MEDLEYDIR-INITCOMS)
 
 (RPAQQ MEDLEYDIR-INITCOMS

-       ((P (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR")
+       ([P (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR")
                               "")
-                         "/sources/MEDLEYDIR.LCOM")))
+                         "/sources/MEDLEYDIR.LCOM"))
+           (MEDLEY-INIT-VARS)
+           (KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE]
         (FILES BACKGROUND-YIELD)
         (VARS (FILING.ENUMERATION.DEPTH 1)
               [LOGINDIR (DIRECTORYNAME (OR (UNIX-GETENV "LOGINDIR")
@@ -20,13 +23,16 @@
               [USERGREETFILES `((,LOGINDIR "INIT" COM)
                                 (,LOGINDIR "INIT"]
               (COPYRIGHTSRESERVED NIL))
-        [P (KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE]
         (FNS INTERLISPMODE)))
 
 (LOAD? (CONCAT (OR (UNIX-GETENV "MEDLEYDIR")
                    "")
               "/sources/MEDLEYDIR.LCOM"))
 
+(MEDLEY-INIT-VARS)
+
+(KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE))
+
 (FILESLOAD BACKGROUND-YIELD)
 
 (RPAQQ FILING.ENUMERATION.DEPTH
 1)
@@ -38,8 +44,6 @@
                            (,LOGINDIR "INIT")))
 
 (RPAQQ COPYRIGHTSRESERVED
 NIL)
-
-(KEYACTION 'LOCK '(LOCKTOGGLE . IGNORE))
 (DEFINEQ
 
 (INTERLISPMODE

@@ -56,5 +60,5 @@
                                                :PACKAGE "INTERLISP"])
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (1455 2280 (INTERLISPMODE 1465 . 2278)))))
+  (FILEMAP (NIL (1544 2369 (INTERLISPMODE 1554 . 2367)))))
 STOP

internal/library/MEDLEY-UTILS

@@ -1,43 +1,41 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-
(FILECREATED "25-Oct-2021 14:54:43" |{DSK}<home>larry>medley>internal>library>MEDLEY-UTILS.;14|
 9472   
+
(FILECREATED "26-Dec-2021 18:58:43" |{DSK}<home>larry>medley>internal>library>MEDLEY-UTILS.;2|
 9049   
 
-      |changes| |to:|  (VARS MEDLEY-UTILSCOMS)
-                       (FNS GATHER-INFO)
+      :CHANGES-TO (FNS GATHER-INFO)
 
-      |previous| |date:| "23-Oct-2021 14:53:16" 
-|{DSK}<home>larry>medley>internal>library>MEDLEY-UTILS.;2|)
+      :PREVIOUS-DATE "25-Oct-2021 14:54:43" |{DSK}<home>larry>medley>internal>library>MEDLEY-UTILS.;1|
+)
 
 
 (PRETTYCOMPRINT MEDLEY-UTILSCOMS)
 
 (RPAQQ MEDLEY-UTILSCOMS
 ((FNS GATHER-INFO MEDLEY-FIX-LINKS MEDLEY-FIX-DATES)
-                             (VARS MEDLEY-FIX-DIRS)
-                             (FNS MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH)))
+                         (VARS MEDLEY-FIX-DIRS)
+                         (FNS MAKE-EXPORTS-ALL MAKE-WHEREIS-HASH)))
 (DEFINEQ
 
 (GATHER-INFO

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

+
                                                             "Edited 26-Dec-2021 18:56 by larry")

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

     (SELECTQ PHASE
-        (ALL (SETQ SYSFILES (UNION SYSFILES FILELST))
-             (SETQ FILELST NIL)
-             (FILESLOAD (SOURCE)
-                    SYSEDIT)
-             (|for|
 I |from|
 1 |to|
 4 |do|
 (GATHER-INFO
 I)))
-        (1 (SETQ LOADEDFILES (|for|
 X |in|
 LOADEDFILELST |collect|
 (FILENAMEFIELD
-                                                                                X
-                                                                                'NAME)))
+        (ALL (|for|
 I |from|
 0 |to|
 4 |do|
 (GATHER-INFO
 I)))
+        (0 (SETQ SYSFILES (UNION SYSFILES FILELST))
+           (SETQ FILELST NIL)
+           (FILESLOAD (SOURCE)
+                  SYSEDIT))
+        (1 (SETQ LOADEDFILES (|for|
 X |in|
 LOADEDFILELST |collect|
 (FILENAMEFIELD X 'NAME)))
            (FILESLOAD FILESETS)
            (SETQ ALLFILESETSFILES (|for|
 X |in|
 FILESETS |join|
 (APPEND (EVAL X))))
            (SETQ SOURCES (|for|
 X |in|
 (DIRECTORY (MEDLEYDIR "sources" "*.*;" T))
                             |when|
 (NOT (MEMB (FILENAMEFIELD X 'EXTENSION)
-                                                  '(LCOM DFASL TEDIT TXT)))
+                                              '(LCOM DFASL TEDIT TXT)))
                             |collect|
 (FILENAMEFIELD X 'NAME))))
         (-1 (PRINTOUT T " loaded files not in SYSFILES or FILELST: "
                    (|for|
 X |in|
 LOADEDFILES |when|
 (NOT (OR (FMEMB X SYSFILES)
-                                                                         (FMEMB X FILELST)))
-                      |collect|
 X)
+                                                             (FMEMB X FILELST))) |collect|
 X)
                    T)
             (PRINTOUT T "Sources not loaded: " (CL:SET-DIFFERENCE SOURCES (APPEND ALLFILESETSFILES 
                                                                                  LOADEDFILES))
@@ -52,50 +50,45 @@
                                  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)
-                               |as|
 VAL |in|
 Y
-                               |do|
 (|for|
 S |in|
 VAL
-                                           |do|
 (PUTPROP S REV (CONS X (GETPROP S REV)))))))
+                        (|for|
 REV |in|
 '(BLOCK-CALLED-BY CALLED-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)
            (MAPATOMS (FUNCTION (LAMBDA (X)
                                  (|if|
 (AND (NOT (GETD X))
-                                                (GETPROP X 'CALLED-BY))
+                                            (GETPROP X 'CALLED-BY))
                                      |then|
 (CL:PUSH X CALLEDFNS))))))
         (-2 (PRINTOUT T "Functions called and not defined" CALLEDFNS T))
         (3 (|for|
 X |in|
 SYSFILES
-              |do|

-              (LOAD X 'PROP)
-              (PUTPROP X 'CONTENT (READFILE X))
-              (|for|
 EXR |in|
 (GETPROP X 'CONTENT)
-                 |do|
 (SELECTQ (CAR EXR)
-                              (DEFINEQ (|for|
 DFN |in|
 (CDR EXR)
-                                          |do|
 (|if|
 (EQUAL (CADR DFN)
-                                                                    (GETPROP (CAR DFN)
-                                                                           'EXPR))
-                                                       |then|
 (PRINTOUT T (CAR DFN)
-                                                                         " ")
-                                                             (PUTPROP (CAR DFN)
-                                                                    'EXPR
-                                                                    (CADR DFN))
-                                                     |else|
 (PRINTOUT T (CAR DFN)
-                                                                       "* "))))
-                              NIL)))
-           (SETQ ALLCONTENT (|for|
 X |in|
 SYSFILES |collect|
 (CONS X (GETPROP
-                                                                                  X
-                                                                                  'CONTENT))))
+              |do|
 (LOAD X 'PROP)
+                   (PUTPROP X 'CONTENT (READFILE X))
+                   (|for|
 EXR |in|
 (GETPROP X 'CONTENT)
+                      |do|
 (SELECTQ (CAR EXR)
+                               (DEFINEQ (|for|
 DFN |in|
 (CDR EXR)
+                                           |do|
 (|if|
 (EQUAL (CADR DFN)
+                                                             (GETPROP (CAR DFN)
+                                                                    'EXPR))
+                                                    |then|
 (PRINTOUT T (CAR DFN)
+                                                                  " ")
+                                                          (PUTPROP (CAR DFN)
+                                                                 'EXPR
+                                                                 (CADR DFN))
+                                                  |else|
 (PRINTOUT T (CAR DFN)
+                                                                "* "))))
+                               NIL)))
+           (SETQ ALLCONTENT (|for|
 X |in|
 SYSFILES |collect|
 (CONS X (GETPROP X 'CONTENT))))
                                                              (* \; " don't edit with SEDIT")

            (LET (DUPS)
                 (|for|
 X |in|
 SYSFILES
                    |do|
 (|for|
 FN |in|
 (FILEFNSLST X)
-                               |do|
 (|if|
 (GETPROP FN 'WHEREIS)
-                                            |then|
 (NCONC1 (GETPROP FN 'WHEREIS)
-                                                              X)
-                                                  (OR (FMEMB FN DUPS)
-                                                      (SETQ DUPS (CONS FN DUPS)))
-                                          |else|
 (PUTPROP FN 'WHEREIS (LIST X)))))
+                           |do|
 (|if|
 (GETPROP FN 'WHEREIS)
+                                    |then|
 (NCONC1 (GETPROP FN 'WHEREIS)
+                                                  X)
+                                          (OR (FMEMB FN DUPS)
+                                              (SETQ DUPS (CONS FN DUPS)))
+                                  |else|
 (PUTPROP FN 'WHEREIS (LIST X)))))
                 (SETQ DUPFNS DUPS))
-           (SETQ NO-SOURCE (|for|
 X |in|
 DEFINEDFNS |when|
 (NOT (GETPROP X 'EXPR))
-                              |collect|
 X)))
+           (SETQ NO-SOURCE (|for|
 X |in|
 DEFINEDFNS |when|
 (NOT (GETPROP X 'EXPR)) |collect|
 X)))
         (-3 (PRINTOUT T "Functions compiled but no expr" NO-SOURCE T)
             (PRINTOUT T "Functions on more than one file: " DUPFNS T))
         (4 (PRINTOUT T T "STARTING MASTERSCOPE PHASE ON " (DATE)
@@ -104,7 +97,7 @@
                   SYSEDIT)
            (|for|
 X |in|
 SYSFILES |do|
 (MSNOTICEFILE X))
            (|for|
 X |in|
 SYSFILES |do|
 (PRINTOUT T T "Analyzing " X T)
-                                                (MASTERSCOPE `(ANALYZE ON ,(KWOTE X)))))
+                                       (MASTERSCOPE `(ANALYZE ON ,(KWOTE X)))))
         (-4 "No queries yet")
         (HELP))))
 
@@ -124,7 +117,7 @@
 )
 
 (RPAQQ MEDLEY-FIX-DIRS
 ("sources" "library" "lispusers" "internal/library" "greetfiles" 
-                                  "docs>Documentation Tools"))
+                              "docs>Documentation Tools"))
 (DEFINEQ
 
 (MAKE-EXPORTS-ALL

@@ -157,6 +150,6 @@
          (DRIBBLE))))
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (618 7420 (GATHER-INFO 628 . 6522) (MEDLEY-FIX-LINKS 6524 . 7047) (MEDLEY-FIX-DATES 7049
- . 7418)) (7578 9449 (MAKE-EXPORTS-ALL 7588 . 8604) (MAKE-WHEREIS-HASH 8606 . 9447)))))
+  (FILEMAP (NIL (553 7001 (GATHER-INFO 563 . 6103) (MEDLEY-FIX-LINKS 6105 . 6628) (MEDLEY-FIX-DATES 6630
+ . 6999)) (7155 9026 (MAKE-EXPORTS-ALL 7165 . 8181) (MAKE-WHEREIS-HASH 8183 . 9024)))))
 STOP

internal/test/LANGUAGE/from-sun/language/15/15-2-LISTSTAR.TEST%

@@ -1,91 +0,0 @@
-;; Function To Be Tested: LIST*
-;;
-;; Source: Guy L Steele's CLTL
-;; Section: 15.2 Lists
-;; Page: 267
-;;
-;; Created By:    Kelly Roach
-;;
-;; Creation Date: June 27,1986
-;;
-;; Last Update:   June 27,1986
-;;			   July 15, 1986 Sye/  create test cases
-;;
-;; Filed As:      {ERIS}<LISPCORE>CML>TEST>15-2-LIST*.TEST
-;;
-;;
-;; Syntax:        (LIST* ARG &REST OTHERS)
-;;
-;; Function Description:
-;; LIST* is like LIST except that the last CONS
-;; of the constructed list is ``dotted.''  The last argument to LIST*
-;; is used as the CDR of the last cons constructed;
-;; this need not be an atom.  If it is not an atom,
-;; then the effect is to add several new elements to the front of a list.
-;; For example:
-;; 
-;;     (LIST* 'A 'B 'C 'D) => (A B C . D)
-;;     This is like
-;;     (CONS 'A (CONS 'B (CONS 'C 'D)))
-;;     Also:
-;;     (LIST* 'A 'B 'C '(D E F)) => (A B C D E F)
-;;     (LIST* X) = X
-;;     
-;; 
-;; Argument(s):   ARG - anything
-;;                OTHERS - anything
-;;
-;; Returns:       a dotted list
-;;
-(do-test "test list*0 - test case copied from page 267 of CLtL"
-	(and (EQUAL (LIST* 'A 'B 'C 'D) '(A B C . D))
-		(EQUAL (LIST* 'A 'B 'C '(D E F)) '(A B C D E F))
-		(EQUAL (LIST* 'X) 'X)
-	)
-)
-
-(do-test "test list*1"
-   (and (equal (list* 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999
-                    999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999 999)
-			 (append (make-list 48 :initial-element 999) '(999 . 999)))
-
-	   (equal (list* "evening" 'sun 'reflected "in Lake" 'Shanti) '("evening" sun reflected "in Lake" . Shanti))
-   )
-)
-
-(do-test "test list*2"
-    (equal (list* 1.009 'a (cons 3 4) (funcall #'list* 2.009 #\g "string") (every #'evenp '(2 4 6 8)) (not (or 1 100 1000 0))
-                 (apply #'list*  'm 'n 'b '(88)) (list* (+ 2 3) (caddr '(w x y z))) )
-         '(1.009 a (3 . 4) (2.009 #\g . "string") t nil (m n b . 88) 5 . y)))
-
-(do-test "test list*3"
-   (progn
-    (setq aa '(a b c d e f g h))
-    (equal (list* (last aa)  (nth 3 aa) (nthcdr 5 aa)  (list* (car aa) (endp aa))
-               (progn 1 2 3 (setq x 1 y 2 z 3))
-               (prog2 (defun fun () "fun1") (fun))
-               (prog1 (setq a 100) (setq a (1+ a)))
-               (progn (defmacro mac () `(list* ,(* 2 2) ,(list-length ()))) (mac)))
-          '( (h) d (f g h) (a . nil) 3 "fun1" 100 4 . 0))  ))
-
-(do-test "test list*4 - nested list* functions"
-   (and 
-    (equal (setq aa (list* (list* (list* (list* (list* (list* (list* (list* (list* (list* 'a 'b 'c 'd 'e 'f 'g 'h 'i 'j 'k)))))))))))
-    '(a b c d e f g h i j . k)  )
-    (equal  (list* aa aa aa aa aa)
-		  '((a b c d e f g h i j . k) (a b c d e f g h i j . k) (a b c d e f g h i j . k) (a b c d e f g h i j . k)
-               a b c d e f g h i j . k) )
-   )
-)
-
-(do-test "test list*5 -  (list* x) is equivalent to x [page 268]"
-    (and  (eq (list* ()) ())
-		(eq (list* 10) 10)
-		(equal (list* '(1)) '(1))
-		(equal (list* (list* (list 2))) '(2))
-		(prog2 (setq a (list* #'-)) (= (funcall a 4 3 2 1) -2))
-		(equal (list* (list (list* 1 2 3) '(4) ) '(5 . "a")) '(((1 2 . 3) (4)) 5 . "a"))
-	)
-)
-
-STOP

library/MSANALYZE

@@ -1,10 +1,10 @@
-(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10 FORMAT XCCS)
-
(FILECREATED "18-Aug-2021 12:13:11" {DSK}<home>larry>medley>library>MSANALYZE.;5
 62745  
+(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-      changes to%:  (FNS MSPRGMACRO MSFINDP)
-                    (VARS MSMACROPROPS)
+
(FILECREATED "26-Dec-2021 10:10:02" {DSK}<home>larry>medley>library>MSANALYZE.;6
 62468  
 
-      previous date%: "18-Aug-2021 10:56:25" {DSK}<home>larry>medley>library>MSANALYZE.;4)
+      :CHANGES-TO (FNS MSPRGTEMPLATE)
+
+      :PREVIOUS-DATE "18-Aug-2021 12:13:11" {DSK}<home>larry>medley>library>MSANALYZE.;5)
 
 
 (* ; "
@@ -269,7 +269,7 @@ DONTCOPY
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS MSVBNOTICED
 MACRO
 [OPENLAMBDA (VERB MOD)
-                                      (CDR (ASSOC MOD (CDR (ASSOC VERB MS.VERB.TO.NOTICED])
+                              (CDR (ASSOC MOD (CDR (ASSOC VERB MS.VERB.TO.NOTICED])
 )
 )
 (DEFINEQ
@@ -752,19 +752,18 @@ DONTCOPY
                          (CDR TEMPLATE])
 
 (MSPRGTEMPLATE

-  (LAMBDA (PARENT TEMPLATE PARENTCONTEXT)
                    (* lmm "23-Jul-86 00:15")

-    (BLOCK)                                                  (* 
-
                       "Masterscope should block every once and a while. This is one place to do it.")

+  [LAMBDA (PARENT TEMPLATE PARENTCONTEXT)                    (* ; "Edited 26-Dec-2021 10:09 by larry")

+                                                             (* lmm "23-Jul-86 00:15")

     (PROG ((VARS
 VARS)
            TEM)
           (COND
-             ((EQ TEMPLATE 'MACRO)
+             [(EQ TEMPLATE 'MACRO)
               (COND
                  ((SETQ TEM (GETMACROPROP (CAR PARENT)
                                    MSMACROPROPS))
                   (MSPRGMACRO
 PARENT TEM))
-                 (T (MSPRGTEMPLATE1
 PARENT '(CALL .. EVAL)))))
-             (T (MSPRGTEMPLATE1
 PARENT TEMPLATE))))))
+                 (T (MSPRGTEMPLATE1
 PARENT '(CALL |..| EVAL]
+             (T (MSPRGTEMPLATE1
 PARENT TEMPLATE])
 
 (MSPRGLAMBDA

   [LAMBDA (EXPR FLG TYPE)
                                (* ; "Edited  3-Jun-88 10:23 by jrb:")

@@ -1036,22 +1035,21 @@ DONTCOPY
 
 (RPAQQ MSRECORDTRANFLG
 NIL)
 
-(ADDTOVAR INVISIBLEVARS
 $$1 $$2 $$3 $$4 $$5 $$6 $$7 $$8 $$9 $$10 $$11 $$12 $$13 $$14 $$15 $$16 
-                                $$17)
+(ADDTOVAR INVISIBLEVARS
 $$1 $$2 $$3 $$4 $$5 $$6 $$7 $$8 $$9 $$10 $$11 $$12 $$13 $$14 $$15 $$16 $$17)
 (DECLARE%: DONTCOPY 
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS INCLISP
 MACRO
 ((.X.)
-                                 (COND
-                                    ((AND INCLISP EACHTIME (NOT (MSFINDP
 INCLISP .X.)))
-                                     INCLISP)
-                                    (T .X.))))
+                         (COND
+                            ((AND INCLISP EACHTIME (NOT (MSFINDP
 INCLISP .X.)))
+                             INCLISP)
+                            (T .X.))))
 
 (PUTPROPS LTEMPLATE
 MACRO
 [LAMBDA (Y)
-                                    (DECLARE
 (LOCALVARS Y))
-                                    (AND [NEQ T (SETQ Y (OR (GETHASH Y USERTEMPLATES)
-                                                            (GETHASH Y MSTEMPLATES]
-                                         Y])
+                            (DECLARE
 (LOCALVARS Y))
+                            (AND [NEQ T (SETQ Y (OR (GETHASH Y USERTEMPLATES)
+                                                    (GETHASH Y MSTEMPLATES]
+                                 Y])
 )
 )
 (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY
@@ -1265,10 +1263,10 @@ DONTCOPY
 (DECLARE%: EVAL@COMPILE DONTCOPY 
 
 (PUTPROPS LTEMPLATE
 MACRO
 [LAMBDA (Y)
-                                    (DECLARE
 (LOCALVARS Y))
-                                    (AND [NEQ T (SETQ Y (OR (GETHASH Y USERTEMPLATES)
-                                                            (GETHASH Y MSTEMPLATES]
-                                         Y])
+                            (DECLARE
 (LOCALVARS Y))
+                            (AND [NEQ T (SETQ Y (OR (GETHASH Y USERTEMPLATES)
+                                                    (GETHASH Y MSTEMPLATES]
+                                 Y])
 )
 (DEFINEQ
 
@@ -1288,11 +1286,11 @@ DONTCOPY
 )
 (PUTPROPS MSANALYZE COPYRIGHT ("Venue & Xerox Corporation" T 1982 1983 1984 1985 1986 1988 1990 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3820 11339 (VARS 3830 . 3971) (FREEVARS 3973 . 4126) (CALLS 4128 . 10469) (
-COLLECTFNDATA 10471 . 10850) (CALLS3 10852 . 11337)) (13596 52783 (ALLCALLS 13606 . 14285) (
-MSINITFNDATA 14287 . 14531) (MSPRGE 14533 . 21607) (MSPRGMACRO 21609 . 22205) (MSPRGCALL 22207 . 22531
-) (MSBINDVAR 22533 . 23052) (MSPRGRECORD 23054 . 29967) (MSPRGERR 29969 . 30137) (MSPRGTEMPLATE1 30139
- . 39300) (MSPRGTEMPLATE 39302 . 39982) (MSPRGLAMBDA 39984 . 49579) (MSPRGLST 49581 . 49749) (ADDTO 
-49751 . 50542) (NLAMBDAFNP 50544 . 51296) (MSPRGDWIM 51298 . 52117) (MSDWIMTRAN 52119 . 52781)) (62109
- 62541 (MSFINDP 62119 . 62539)))))
+  (FILEMAP (NIL (3759 11278 (VARS 3769 . 3910) (FREEVARS 3912 . 4065) (CALLS 4067 . 10408) (
+COLLECTFNDATA 10410 . 10789) (CALLS3 10791 . 11276)) (13527 52635 (ALLCALLS 13537 . 14216) (
+MSINITFNDATA 14218 . 14462) (MSPRGE 14464 . 21538) (MSPRGMACRO 21540 . 22136) (MSPRGCALL 22138 . 22462
+) (MSBINDVAR 22464 . 22983) (MSPRGRECORD 22985 . 29898) (MSPRGERR 29900 . 30068) (MSPRGTEMPLATE1 30070
+ . 39231) (MSPRGTEMPLATE 39233 . 39834) (MSPRGLAMBDA 39836 . 49431) (MSPRGLST 49433 . 49601) (ADDTO 
+49603 . 50394) (NLAMBDAFNP 50396 . 51148) (MSPRGDWIM 51150 . 51969) (MSDWIMTRAN 51971 . 52633)) (61832
+ 62264 (MSFINDP 61842 . 62262)))))
 STOP

library/MSCOMMON

@@ -1,12 +1,17 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
-
(FILECREATED " 4-May-92 13:10:53" |{PELE:MV:ENVOS}<LISPCORE>LIBRARY>MSCOMMON.;3|
 23489  
 
-      |changes| |to:|  (TEMPLATES CL:DECF CL:INCF CL:PUSH)
+
(FILECREATED "15-Jan-2022 20:17:21" |{DSK}<home>larry>medley>library>MSCOMMON.;4|
 24053  
 
-      |previous| |date:| "12-Jun-90 10:17:31" |{PELE:MV:ENVOS}<LISPCORE>LIBRARY>MSCOMMON.;2|)
+      :CHANGES-TO (TEMPLATES ADD-EXEC CL:ASSOC CL:COMPILE-FILE EXEC CL:IN-PACKAGE CL:MAKE-STRING OPEN
+                         CL:PUSH CL:PUSHNEW CL:RASSOC CL:WRITE-LINE CL:WRITE-STRING CL:WHEN CL:UNLESS
+                         )
+                  (FNS FUNCTIONSMSGETDEF FUNCTIONSMSMC VARIABLESMSGETDEF)
+                  (VARS MSCOMMONCOMS)
+
+      :PREVIOUS-DATE " 4-May-92 13:10:53" |{DSK}<home>larry>medley>library>MSCOMMON.;3|)
 
 
-; Copyright (c) 1988, 1990, 1992 by Venue & Xerox Corporation.  All rights reserved.
+; Copyright (c) 1988, 1990, 1992 by Venue & Xerox Corporation.
 
 (PRETTYCOMPRINT MSCOMMONCOMS)
 
@@ -37,8 +42,8 @@
                CL:STRING-LESSP CL:STRING-NOT-EQUAL CL:STRING-NOT-GREATERP CL:STRING-NOT-LESSP 
                CL:STRING-UPCASE CL:STRING/= CL:STRING< CL:STRING<= CL:STRING= CL:STRING> CL:STRING>=
                CL:SUBLIS CL:SUBSETP CL:SUBST CL:SUBST-IF CL:SUBST-IF-NOT CL:SUBSTITUTE 
-               CL:SUBSTITUTE-IF CL:SUBSTITUTE-IF-NOT CL:TREE-EQUAL CL:UNION CL:VECTOR-PUSH 
-               CL:VECTOR-PUSH-EXTEND WRITE CL:WRITE-LINE CL:WRITE-STRING CL:WRITE-TO-STRING)
+               CL:SUBSTITUTE-IF CL:SUBSTITUTE-IF-NOT CL:TREE-EQUAL CL:UNION CL:UNLESS CL:VECTOR-PUSH
+               CL:VECTOR-PUSH-EXTEND CL:WHEN WRITE CL:WRITE-LINE CL:WRITE-STRING CL:WRITE-TO-STRING)
         (P 
            (* |;;| "First tell Masterscope how to find FUNCTIONS and VARIABLES")

 
@@ -46,7 +51,7 @@
            (MSADDANALYZE 'FUNCTIONS 'FUNCTION 'FUNCTIONS 'FUNCTIONSMSGETDEF 'FUNCTIONSMSMC)
            
            (* |;;| 
-
        "Then add KEYWORD support.  Templates may now contain the following as their last element:")

+
          "Then add KEYWORD support.  Templates may now contain the following as their last element:")

 
            
            (* |;;| "... KEYWORDS list of keywords accepted)")

@@ -65,7 +70,7 @@
            (MSADDMODIFIER 'SPECIFY 'KEYWORDS 'KEYSPECIFY)
            
            (* |;;| 
-
   "Stuff for locally-defined things.  We don't attempt to handle them (*sigh*), just record them.")

+
     "Stuff for locally-defined things.  We don't attempt to handle them (*sigh*), just record them.")

 
            (MSADDRELATION '(FLET FLETS FLETTING FLET))
            (MSADDRELATION '(LABEL LABELS LABELLING LABELLED))
@@ -87,42 +92,48 @@
 (DEFINEQ
 
 (FUNCTIONSMSGETDEF

-  (LAMBDA (NAME TYPE SOURCE OPTIONS)
                     (* \; "Edited 31-Mar-88 17:31 by jrb:")

+  (LAMBDA (NAME TYPE SOURCE OPTIONS)                         (* \; "Edited 31-Mar-88 17:31 by jrb:")

     (LET ((BODY (REMOVE-COMMENTS (GETDEF NAME 'FUNCTIONS SOURCE OPTIONS))))
          (AND BODY (SELECTQ (CAR BODY)
                        (DEFMACRO (OR (GETTEMPLATE NAME)
                                      (SETTEMPLATE NAME 'MACRO))
                                  NIL)
                        (CL:DEFUN 
-          (* |;;| "Body is of the form:")

-          (* |;;| "(DEFUN name (args...) bodies...)")

-          (* |;;| "We want to hand Masterscope a massaged form it will understand.")

-          (* |;;| "Which I believe is of this form:")

+                                 (* |;;| "Body is of the form:")

 
-                                 `(CL:LAMBDA ,(CADDR BODY) ,@(CDDDR BODY)))
+                                 (* |;;| "(DEFUN name (args...) bodies...)")

+
+                                 (* |;;| 
+
                                 "We want to hand Masterscope a massaged form it will understand.")

+
+                                 (* |;;| "Which I believe is of this form:")

+
+                                 `(CL:LAMBDA ,(CADDR BODY)
+                                         ,@(CDDDR BODY)))
                        NIL)))))
 
 (FUNCTIONSMSMC

-  (LAMBDA (NAME TYPE REASON)
                             (* \; "Edited  1-Apr-88 13:47 by jrb:")

-          (* |;;| "Trick here is we don't want to mark FUNCTIONS macros as changed because they really don't get analyzed, but we do want to call CHANGEMACRO for them")

+  (LAMBDA (NAME TYPE REASON)                                 (* \; "Edited  1-Apr-88 13:47 by jrb:")

+
+    (* |;;| "Trick here is we don't want to mark FUNCTIONS macros as changed because they really don't get analyzed, but we do want to call CHANGEMACRO for them")

 
     (|if|
 (EQ (CAR (GETDEF NAME 'FUNCTIONS NIL '(NOERROR)))
-                  'DEFMACRO)
+              'DEFMACRO)
         |then|
 (CHANGEMACRO NAME TYPE REASON)
               NIL
       |else|
 T)))
 
 (VARIABLESMSGETDEF

-  (LAMBDA (NAME TYPE SOURCE OPTIONS)
                     (* \; "Edited 19-Feb-88 19:46 by jrb:")

-
+  (LAMBDA (NAME TYPE SOURCE OPTIONS)                         (* \; "Edited 19-Feb-88 19:46 by jrb:")

     (LET ((BODY (GETDEF NAME 'VARIABLES SOURCE OPTIONS))
           SPECVARP)
          (AND BODY 
-          
-          (* |;;| "We have to return something here so Masterscope can get hold of the init form, and so It'll stop looking for other things")

+
+              (* |;;| "We have to return something here so Masterscope can get hold of the init form, and so It'll stop looking for other things")

 
               `(CL:LAMBDA NIL ,(IF
 (CADDR BODY)
-                                   THEN
 `(SETQ ,(CADR BODY) ,(CADDR BODY))))))))
+                                   THEN
 `(SETQ ,(CADR BODY)
+                                          ,(CADDR BODY))))))))
 )
 
 
@@ -162,9 +173,9 @@
                                      :LOAD :FILE-MANAGER-FORMAT :PROCESS-ENTIRE-FILE))
 
 (SETTEMPLATE 'CL:COMPILER-LET '(! NIL (BOTH (|..| (IF
 LISTP (NIL EVAL |..| EFFECT)
-                                                         NIL))
+                                                      NIL))
                                             (|..| (IF
 LISTP ((BOTH BIND COMPILER-LET))
-                                                         (BOTH BIND COMPILER-LET))))
+                                                      (BOTH BIND COMPILER-LET))))
                                   |..| EFFECT RETURN))
 
 (SETTEMPLATE 'CL:COUNT '(EVAL EVAL KEYWORDS :FROM-END :TEST :TEST-NOT :START :END :KEY))
@@ -179,10 +190,10 @@
 
 (SETTEMPLATE 'DECLARE '(|..| (@ EXPR (CONS NIL (SELECTQ (CAR (LISTP EXPR))
                                                    (LOCALVARS '(IF
 LISTP (|..| LOCALVARS)
-                                                                      LOCALVARS))
+                                                                   LOCALVARS))
                                                    ((SPECVARS CL:SPECIAL) 
                                                         '(IF
 LISTP (|..| SPECVARS)
-                                                                SPECVARS))
+                                                             SPECVARS))
                                                    NIL)))))
 
 (SETTEMPLATE 'CL:DELETE '(EVAL SMASH KEYWORDS :FROM-END :TEST :TEST-NOT :START :END :COUNT :KEY))
@@ -391,7 +402,7 @@
 (SETTEMPLATE 'CL:REPLACE '(SMASH EVAL KEYWORDS :START1 :END1 :START2 :END2))
 
 (SETTEMPLATE 'CL:ROTATEF '(|..| (IF
 (ATOM EXPR)
-                                       SET SMASH)))
+                                    SET SMASH)))
 
 (SETTEMPLATE 'CL:SEARCH '(EVAL EVAL KEYWORDS :FROM-END :TEST :TEST-NOT :KEY :START1 :START2 :END1 
                                :END2))
@@ -401,7 +412,7 @@
 (SETTEMPLATE 'CL:SET-EXCLUSIVE-OR '(EVAL EVAL KEYWORDS :TEST :TEST-NOT :KEY))
 
 (SETTEMPLATE 'CL:SHIFTF '(|..| (IF
 (ATOM EXPR)
-                                      SET SMASH)
+                                   SET SMASH)
                                EVAL))
 
 (SETTEMPLATE 'CL:SORT '(EVAL FUNCTION KEYWORDS :KEY))
@@ -459,10 +470,14 @@
 
 (SETTEMPLATE 'CL:UNION '(EVAL EVAL KEYWORDS :TEST :TEST-NOT :KEY))
 
+(SETTEMPLATE 'CL:UNLESS '(TEST |..| EFECT RETURN))
+
 (SETTEMPLATE 'CL:VECTOR-PUSH '(EVAL SMASH))
 
 (SETTEMPLATE 'CL:VECTOR-PUSH-EXTEND '(EVAL SMASH EVAL))
 
+(SETTEMPLATE 'CL:WHEN '(TEST |..| EFECT RETURN))
+
 (SETTEMPLATE 'WRITE '(EVAL KEYWORDS :STREAM :ESCAPE :RADIX :BASE :CIRCLE :PRETTY :LEVEL :LENGTH :CASE
                            :GENSYM :ARRAY))
 
@@ -539,6 +554,6 @@
 (CLRHASH USERTEMPLATES)
 (PUTPROPS MSCOMMON COPYRIGHT ("Venue & Xerox Corporation" 1988 1990 1992))
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (5000 6811 (FUNCTIONSMSGETDEF 5010 . 5804) (FUNCTIONSMSMC 5806 . 6286) (
-VARIABLESMSGETDEF 6288 . 6809)))))
+  (FILEMAP (NIL (5280 7291 (FUNCTIONSMSGETDEF 5290 . 6258) (FUNCTIONSMSMC 6260 . 6731) (
+VARIABLESMSGETDEF 6733 . 7289)))))
 STOP

library/SKETCH

@@ -1,13 +1,15 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED "21-Jan-93 11:59:03" {DSK}<python>lde>lispcore>library>SKETCH.;3
 491018 
 
-      changes to%:  (FNS SK.BUILD.IMAGEOBJ)
+
(FILECREATED " 1-Feb-2022 09:17:12" {DSK}<Users>kaplan>Local>medley3.5>my-medley>library>SKETCH.;2
 490756 
 
-      previous date%: "20-Jan-93 14:46:57" {DSK}<python>lde>lispcore>library>SKETCH.;2)
+      :CHANGES-TO (FNS SKETCH.PUT)
+
+      :PREVIOUS-DATE "21-Jan-93 11:59:03" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>SKETCH.;1)
 
 
 (* ; "
-Copyright (c) 1984, 1985, 1986, 1987, 1988, 1990, 1992, 1993 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1984-1988, 1990, 1992-1993 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT SKETCHCOMS)
@@ -19,8 +21,7 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988, 1990, 1992, 1993 by Venue & Xerox Co
                                          ALL.SKETCHES))
                          TEDITFLG)
                         
-                        (* ;; 
-
                      "current knows about SKETCH TEDIT and NOTECARDS.  Everyone else loses.")

+                        (* ;; "current knows about SKETCH TEDIT and NOTECARDS.  Everyone else loses.")

 
                         [MAP.PROCESSES (FUNCTION (LAMBDA (PROC PROCNAME PROCFORM)
                                                         (AND (EQ (CAR PROCFORM)
@@ -62,22 +63,22 @@ To abort loading the new version of Sketch, type '^'."]
              SK.CHECK.IMAGEOBJ.WHENDELETEDFN SK.APPLY.IMAGEOBJ.WHENDELETEDFN SK.RETURN.TTY 
              SK.TAKE.TTY)
         (COMS                                                (* ; 
-
                                                           "fns for dealing with the sketch menu")

+
                                                             "fns for dealing with the sketch menu")

               (FNS SKETCH.COMMANDMENU SKETCH.COMMANDMENU.ITEMS CREATE.SKETCHW.COMMANDMENU 
                    SKETCHW.SELECTIONFN SKETCH.MONITORLOCK SK.EVAL.AS.PROCESS SK.EVAL.WITH.LOCK)
               (FNS SK.FIX.MENU SK.SET.UP.MENUS SK.INSURE.HAS.MENU SK.CREATE.STANDARD.MENU 
                    SK.ADD.ITEM.TO.MENU SK.GET.VIEWER.POPUP.MENU SK.CLEAR.POPUP.MENU))
         (COMS                                                (* ; 
-
                                                           "fns for dealing with sketch structures")

+
                                                             "fns for dealing with sketch structures")

               (FNS SKETCH.CREATE GETSKETCHPROP PUTSKETCHPROP CREATE.DEFAULT.SKETCH.CONTEXT)
               (PROP ARGNAMES SKETCH.CREATE))
         (COMS                                                (* ; 
-
                           "fns for implementing copy and delete functions under keyboard control.")

+
                             "fns for implementing copy and delete functions under keyboard control.")

               (FNS SK.COPY.BUTTONEVENTFN SK.BUTTONEVENT.MARK SK.BUILD.IMAGEOBJ SK.BUTTONEVENT.OVERP 
                    SK.BUTTONEVENT.SAME.KEYS)
               (MACROS .DELETEKEYDOWNP. .MOVEKEYDOWNP.))
         (COMS                                                (* ; 
-
                                                         "fns for implementing the CHANGE command.")

+
                                                           "fns for implementing the CHANGE command.")

               (FNS SK.SEL.AND.CHANGE SK.CHECK.WHENCHANGEDFN SK.CHECK.PRECHANGEFN SK.CHANGE.ELT 
                    SK.CHANGE.THING SKETCH.CHANGE.ELEMENTS SK.APPLY.SINGLE.CHANGEFN SK.DO.CHANGESPECS
                    SK.VIEWER.FROM.SKETCH.ARG SK.DO.CHANGESPEC1 SK.CHANGEFN SK.READCHANGEFN 
@@ -109,7 +110,7 @@ To abort loading the new version of Sketch, type '^'."]
                    SK.SHOW.FIG.FROM.INFO SK.MOVE.THING UPDATE.ELEMENT.IN.SKETCH SK.UPDATE.ELEMENT 
                    SK.UPDATE.ELEMENTS SK.UPDATE.ELEMENT1 SK.MOVE.ELEMENT.POINT)
                                                              (* ; 
-
                                                    "fns for moving points or a collection of pts.")

+
                                                      "fns for moving points or a collection of pts.")

               (FNS SK.MOVE.POINTS SK.SEL.AND.MOVE.POINTS SK.DO.MOVE.ELEMENT.POINTS 
                    SK.MOVE.ITEM.POINTS SK.TRANSLATEPTSFN SK.TRANSLATE.POINTS 
                    SK.SELECT.MULTIPLE.POINTS SK.CONTROL.POINTS.IN.REGION SK.ADD.PT.SELECTION 
@@ -124,7 +125,7 @@ To abort loading the new version of Sketch, type '^'."]
                    SK.GET.SELECTED.ELEMENT.STRUCTURE SK.CORRESPONDING.CONTROL.PT 
                    SK.CONTROL.POINT.NUMBER SK.DO.ALIGN.SETVALUE))
         (COMS                                                (* ; 
-
                                                   "stuff for supporting the GROUP sketch element.")

+
                                                     "stuff for supporting the GROUP sketch element.")

               (FNS SKETCH.CREATE.GROUP SK.CREATE.GROUP1 SK.UPDATE.GROUP.AFTER.CHANGE SK.GROUP.ELTS 
                    SK.SEL.AND.GROUP SK.GROUP.ELEMENTS SK.UNGROUP.ELT SK.SEL.AND.UNGROUP 
                    SK.UNGROUP.ELEMENT SK.GLOBAL.REGION.OF.LOCAL.ELEMENTS 
@@ -134,17 +135,16 @@ To abort loading the new version of Sketch, type '^'."]
                    GROUP.GLOBALREGIONFN GROUP.TRANSLATEFN GROUP.TRANSFORMFN GROUP.READCHANGEFN)
               (FNS REGION.CENTER REMOVE.LAST)
                                                              (* ; 
-
                                                           "moving the control point of a group")

+
                                                             "moving the control point of a group")

               (FNS SK.MOVE.GROUP.CONTROL.PT SK.SEL.AND.MOVE.CONTROL.PT 
                    SK.MOVE.GROUP.ELEMENT.CONTROL.POINT SK.READ.NEW.GROUP.CONTROL.PT)
               (RECORDS GROUP LOCALGROUP)
-              (COMS                                          (* ; 
-
                                                           "history and undo stuff for groups")

+              (COMS                                          (* ; "history and undo stuff for groups")

                     (FNS SK.DO.GROUP SK.CHECK.WHENGROUPEDFN SK.DO.UNGROUP SK.CHECK.WHENUNGROUPEDFN 
                          SK.GROUP.UNDO SK.UNGROUP.UNDO)
                     (IFPROP EVENTFNS GROUP UNGROUP)))
         (COMS                                                (* ; 
-
                                                    "stuff for supporting the freezing of elements")

+
                                                      "stuff for supporting the freezing of elements")

               (FNS SK.FREEZE.ELTS SK.SEL.AND.FREEZE SK.FREEZE.ELEMENTS SK.UNFREEZE.ELT 
                    SK.SEL.AND.UNFREEZE SK.UNFREEZE.ELEMENTS SK.FREEZE.UNDO SK.UNFREEZE.UNDO 
                    SK.DO.FREEZE SK.DO.UNFREEZE)
@@ -154,13 +154,13 @@ To abort loading the new version of Sketch, type '^'."]
                    SKETCH.DELETE.ELEMENT DELFROMGROUPELT SKETCH.ELEMENT.TYPE SKETCH.ELEMENT.CHANGED 
                    SK.ELEMENT.CHANGED1 SK.UPDATE.GLOBAL.IMAGE.OBJECT.ELEMENT))
                                                              (* ; 
-
                                                           "utility routines for sketch windows.")

+
                                                             "utility routines for sketch windows.")

         (FNS INSURE.SKETCH LOCALSPECS.FROM.VIEWER SK.LOCAL.ELT.FROM.GLOBALPART SKETCH.FROM.VIEWER 
              INSPECT.SKETCH ELT.INSIDE.SKETCHWP SK.INSIDE.REGION)
         (FNS MAPSKETCHSPECS MAPCOLLECTSKETCHSPECS MAPSKETCHSPECSUNTIL MAPGLOBALSKETCHSPECS 
              MAPGLOBALSKETCHELEMENTS)
         (COMS                                                (* ; 
-
                                                     "multiple selection and copy select functions")

+
                                                       "multiple selection and copy select functions")

               (FNS SK.ADD.SELECTION SK.COPY.INSERTFN SCREENELEMENTP SK.ITEM.REGION 
                    SK.ELEMENT.GLOBAL.REGION SK.LOCAL.ITEMS.IN.REGION SK.REGIONFN SK.GLOBAL.REGIONFN 
                    SK.REMOVE.SELECTION SK.SELECT.MULTIPLE.ITEMS SKETCH.GET.ELEMENTS SK.PUT.MARKS.UP 
@@ -169,11 +169,10 @@ To abort loading the new version of Sketch, type '^'."]
               (CONSTANTS (SK.NO.MOVE.DISTANCE 4))
               (DECLARE%: DONTCOPY (RECORDS SKFIGUREIMAGE)))
         (COMS                                                (* ; 
-
                                                           "stuff for changing the input scale")

+
                                                             "stuff for changing the input scale")

               (FNS SK.INPUT.SCALE SK.UPDATE.SKETCHCONTEXT SK.SET.INPUT.SCALE 
                    SK.SET.INPUT.SCALE.CURRENT SK.SET.INPUT.SCALE.VALUE))
-        (COMS                                                (* ; 
-
                                                           "stuff for setting feedback amount")

+        (COMS                                                (* ; "stuff for setting feedback amount")

               (FNS SK.SET.FEEDBACK.MODE SK.SET.FEEDBACK.POINT SK.SET.FEEDBACK.VERBOSE 
                    SK.SET.FEEDBACK.ALWAYS)
               (INITVARS (SKETCH.VERBOSE.FEEDBACK T))
@@ -181,8 +180,7 @@ To abort loading the new version of Sketch, type '^'."]
         (COMS                                                (* ; "sketch icon support")

               (FNS SKETCH.TITLE SK.SHRINK.ICONCREATE)
               (UGLYVARS SKETCH.TITLED.ICON.TEMPLATE))
-        (COMS                                                (* ; 
-
                                                           "fns for reading in various values")

+        (COMS                                                (* ; "fns for reading in various values")

               (FNS READBRUSHSHAPE READ.FUNCTION READBRUSHSIZE READANGLE READARCDIRECTION)
               (FNS SK.CHANGE.DASHING READ.AND.SAVE.NEW.DASHING READ.NEW.DASHING READ.DASHING.CHANGE 
                    SK.CACHE.DASHING SK.DASHING.LABEL)
@@ -195,8 +193,7 @@ To abort loading the new version of Sketch, type '^'."]
                  (SK.CACHE.FILLING BLACKSHADE)
                  (SK.CACHE.FILLING GRAYSHADE)
                  (SK.CACHE.FILLING HIGHLIGHTSHADE)))
-        (COMS                                                (* ; 
-
                                                           "stuff for reading input positions")

+        (COMS                                                (* ; "stuff for reading input positions")

               (FNS SK.GETGLOBALPOSITION SKETCH.TRACK.ELEMENTS SK.PICKOUT.WHOLE.MOVE.ELEMENTS 
                    MAP.SKETCH.ELEMENTS.INTO.VIEWER MAP.GLOBAL.POSITION.INTO.VIEWER 
                    SKETCH.TO.VIEWER.POSITION SKETCH.TRACK.IMAGE SK.TRACK.IMAGE1 
@@ -207,7 +204,7 @@ To abort loading the new version of Sketch, type '^'."]
                    )
               (RECORDS INPUTPT)
               (COMS                                          (* ; 
-
                                               "stuff to allow reading positions from a number pad")

+
                                                 "stuff to allow reading positions from a number pad")

                     (INITVARS (SKETCH.USE.POSITION.PAD NIL))
                     (GLOBALVARS SKETCH.USE.POSITION.PAD)
                     (FNS SK.BRING.UP.POSITION.PAD SK.PAD.READER.POSITION SK.POSITION.READER.REPAINTFN
@@ -227,7 +224,7 @@ To abort loading the new version of Sketch, type '^'."]
         (UGLYVARS SK.SELECTEDMARK SK.LOCATEMARK COPYSELECTIONMARK MOVESELECTIONMARK 
                DELETESELECTIONMARK OTHERCONTROLPOINTMARK)
                                                              (* ; 
-
                                            "accessing functions for the methods of a sketch type.")

+
                                              "accessing functions for the methods of a sketch type.")

         (FNS SK.DRAWFN SK.TRANSFORMFN SK.EXPANDFN SK.INPUT SK.INSIDEFN SK.UPDATEFN)
         (INITRECORDS SKETCHTYPE)
         (DECLARE%: DONTCOPY (RECORDS SCREENELT GLOBALPART COMMONGLOBALPART INDIVIDUALGLOBALPART 
@@ -253,7 +250,7 @@ To abort loading the new version of Sketch, type '^'."]
                                                                 SKETCHOPS SKETCHELEMENTS SKETCHOBJ 
                                                                 SKETCHEDIT))
                                                              (* ; 
-
            "recompute the sketch element types because loading SKETCH clobbers the previous ones.")

+
              "recompute the sketch element types because loading SKETCH clobbers the previous ones.")

         (P (INIT.BITMAP.ELEMENT)
            (INIT.SKETCH.ELEMENTS)
            (INIT.GROUP.ELEMENT))
@@ -265,14 +262,14 @@ To abort loading the new version of Sketch, type '^'."]
               (GLOBALVARS SKETCH.RECORD.LENGTHS)
               (P (SK.SET.RECORD.LENGTHS)))
         [COMS                                                (* ; 
-
                   "to correct for a bug in the file package that marks LOADCOMPed file as changed")

+
                     "to correct for a bug in the file package that marks LOADCOMPed file as changed")

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

+
                                                  "add sketch as option to file browser edit command")

               (FNS SK.ADD.EDIT.COMMAND.TO.FILE.BROWSER)
               (P (SK.ADD.EDIT.COMMAND.TO.FILE.BROWSER)))
         (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA)
@@ -449,10 +446,11 @@ To abort loading the new version of Sketch, type '^'."]
        (T (FILENAMELESSVERSION
 SKETCHFILENAME])
 
 (SKETCH.PUT

-  [LAMBDA (FILENAME SKETCH VIEWER REGION SCALE GRID)
     (* ; "Edited 17-Nov-87 17:47 by rrb")

-          
-          (* puts the sketch SKETCH on the file named FILENAME.
-
        VIEWER if given provides promptwindows and PUTFNs.)

+  [LAMBDA (FILENAME SKETCH VIEWER REGION SCALE GRID)
         (* ; "Edited  1-Feb-2022 09:17 by rmk")


+                                                             (* ; "Edited 17-Nov-87 17:47 by rrb")

+
+         (* puts the sketch SKETCH on the file named FILENAME.
+
         VIEWER if given provides promptwindows and PUTFNs.)

 
     (PROG (TEXTSTREAM FILESTREAM)
           [COND
@@ -463,14 +461,13 @@ To abort loading the new version of Sketch, type '^'."]
                   (FILESLOAD TEDIT))
                  (T (STATUSPRINT VIEWER "Sketch not saved.")
                     (RETURN NIL]
-          [SETQ TEXTSTREAM (OPENTEXTSTREAM "" NIL NIL NIL (AND VIEWER (LIST 'PUTFN
-                                                                            (WINDOWPROP VIEWER
-                                                                                   'TEDIT.PUTFN)
-                                                                            'PROMPTWINDOW
-                                                                            (GETPROMPTWINDOW VIEWER]
-          
-          (* make a text stream with nothing in it except the sketch.)

-
+          [SETQ TEXTSTREAM (OPENTEXTSTREAM NIL NIL NIL NIL (AND VIEWER (LIST 'PUTFN
+                                                                             (WINDOWPROP VIEWER
+                                                                                    'TEDIT.PUTFN)
+                                                                             'PROMPTWINDOW
+                                                                             (GETPROMPTWINDOW VIEWER]
+                                                             (* make a text stream with nothing in 
+
                                                             it except the sketch.)

           (TEDIT.INSERT.OBJECT [SKETCH.IMAGEOBJ (INSURE.SKETCH
 SKETCH)
                                       (COND
                                          ((REGIONP REGION))
@@ -482,16 +479,17 @@ To abort loading the new version of Sketch, type '^'."]
                                          ((NUMBERP GRID))
                                          (VIEWER (SK.GRIDFACTOR VIEWER]
                  TEXTSTREAM 1)
-          
-          (* set the margins so that if the user hardcopies it directly the margins 
-
        come out)

 
-          (TEDIT.PARALOOKS TEXTSTREAM '(LEFTMARGIN 0 RIGHTMARGIN 0 QUAD CENTER) 1 1)
+         (* set the margins so that if the user hardcopies it directly the margins come 
+
         out)

+
+          (TEDIT.PARALOOKS TEXTSTREAM '(LEFTMARGIN 0 RIGHTMARGIN 0 QUAD CENTER)
+                 1 1)
           (TEDIT.PAGEFORMAT TEXTSTREAM (TEDIT.SINGLE.PAGEFORMAT NIL NIL NIL NIL NIL 0 0 0 0))
                                                              (* save the stream so that it can be 
-
                                                           closed.)

+
                                                             closed.)

           (SETQ FILESTREAM (TEDIT.PUT TEXTSTREAM FILENAME))  (* grab the full file name if it is 
-
                                                           available.)

+
                                                             available.)

           (AND (OPENP FILESTREAM)
                (SETQ FILENAME (CLOSEF FILESTREAM)))
           (SK.MARK.UNDIRTY
 SKETCH)
@@ -2345,7 +2343,7 @@ This will be slow for arcs and curves."]
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS .DELETEKEYDOWNP.
 MACRO
 [NIL (OR (KEYDOWNP 'CTRL)
-                                                  (KEYDOWNP 'DELETE])
+                                          (KEYDOWNP 'DELETE])
 
 (PUTPROPS .MOVEKEYDOWNP.
 MACRO
 (NIL (KEYDOWNP 'MOVE)))
 )
@@ -4546,7 +4544,7 @@ This will be slow for arcs and curves."]
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS .SHIFTKEYDOWNP.
 MACRO
 [NIL (OR (KEYDOWNP 'LSHIFT)
-                                                 (KEYDOWNP 'RSHIFT])
+                                         (KEYDOWNP 'RSHIFT])
 )
 (DEFINEQ
 
@@ -5472,7 +5470,7 @@ This will be slow for arcs and curves."]
 (TYPERECORD GROUP
 (GROUPREGION LISTOFGLOBALELTS GROUPCONTROLPOINT))
 
 (RECORD LOCALGROUP
 ((GROUPPOSITION)
-                        LOCALHOTREGION LOCALGROUPREGION LOCALELEMENTS))
+                    LOCALHOTREGION LOCALGROUPREGION LOCALELEMENTS))
 )
 
 
@@ -7782,12 +7780,12 @@ Enter 'Abort' to leave the dashing unchanged.")
 (DECLARE%: EVAL@COMPILE
 
 (RECORD INPUTPT
 (INPUT.ONGRID? INPUT.POSITION INPUT.GLOBALPOSITION)
-                    [TYPE?
 (AND (LISTP DATUM)
-                                    (OR (NULL (CAR DATUM))
-                                        (EQ (CAR DATUM)
-                                            T))
-                                    (LISTP (CDR DATUM))
-                                    (POSITIONP (CADR DATUM])
+                [TYPE?
 (AND (LISTP DATUM)
+                            (OR (NULL (CAR DATUM))
+                                (EQ (CAR DATUM)
+                                    T))
+                            (LISTP (CDR DATUM))
+                            (POSITIONP (CADR DATUM])
 )
 
 
@@ -8508,14 +8506,14 @@ Otherwise, type '^'.")
 (DECLARE%: EVAL@COMPILE
 
 (RECORD SCREENELT
 (LOCALPART . GLOBALPART)
-                      (RECORD GLOBALPART (COMMONGLOBALPART INDIVIDUALGLOBALPART)
-                             (RECORD INDIVIDUALGLOBALPART (GTYPE . GOTHERINFO))
-                             (RECORD COMMONGLOBALPART (MINSCALE MAXSCALE SKELEMENTPROPLIST)))
-                      (RECORD LOCALPART (HOTSPOTS LOCALHOTREGION . OTHERLOCALINFO)))
+                  (RECORD GLOBALPART (COMMONGLOBALPART INDIVIDUALGLOBALPART)
+                         (RECORD INDIVIDUALGLOBALPART (GTYPE . GOTHERINFO))
+                         (RECORD COMMONGLOBALPART (MINSCALE MAXSCALE SKELEMENTPROPLIST)))
+                  (RECORD LOCALPART (HOTSPOTS LOCALHOTREGION . OTHERLOCALINFO)))
 
 (RECORD GLOBALPART
 (COMMONGLOBALPART INDIVIDUALGLOBALPART)
-                       (RECORD INDIVIDUALGLOBALPART (GTYPE . RESTOFGLOBALPART))
-                       (RECORD COMMONGLOBALPART (MINSCALE MAXSCALE SKELEMENTPROPLIST)))
+                   (RECORD INDIVIDUALGLOBALPART (GTYPE . RESTOFGLOBALPART))
+                   (RECORD COMMONGLOBALPART (MINSCALE MAXSCALE SKELEMENTPROPLIST)))
 
 (RECORD COMMONGLOBALPART
 (MINSCALE MAXSCALE SKELEMENTPROPLIST))
 
@@ -8524,41 +8522,39 @@ Otherwise, type '^'.")
 (RECORD LOCALPART
 (HOTSPOTS LOCALHOTREGION . OTHERLOCALINFO))
 
 (RECORD SKETCH
 (ALLSKETCHPROPS . SKETCHTCELL)
-                   [RECORD ALLSKETCHPROPS (SKETCHKEY SKETCHNAME . SKETCHPROPS)
-                          (CREATE
 (LIST 'SKETCH NIL 'VERSION SKETCH.VERSION 'PRIRANGE
-                                            (CONS 0 0]
-                   [RECORD SKETCHTCELL (SKETCHELTS)
-                          (CREATE
 (CONS SKETCHELTS (LAST SKETCHELTS]
-                   [TYPE?
 (AND (LISTP DATUM)
-                                   (LISTP (CAR DATUM))
-                                   (EQ (CAAR DATUM)
-                                       'SKETCH])
+               [RECORD ALLSKETCHPROPS (SKETCHKEY SKETCHNAME . SKETCHPROPS)
+                      (CREATE
 (LIST 'SKETCH NIL 'VERSION SKETCH.VERSION 'PRIRANGE (CONS 0 0]
+               [RECORD SKETCHTCELL (SKETCHELTS)
+                      (CREATE
 (CONS SKETCHELTS (LAST SKETCHELTS]
+               [TYPE?
 (AND (LISTP DATUM)
+                           (LISTP (CAR DATUM))
+                           (EQ (CAAR DATUM)
+                               'SKETCH])
 
-(DATATYPE SKETCHTYPE
 (LABEL                              (* the label if it is non-NIL will 
-
                                                           be used in the sketch menu.)

-                                DOCSTR                       (* if put in the menu, this is the 
-
                                                           help string for its item.)

-                                DRAWFN EXPANDFN obsolete CHANGEFN INPUTFN INSIDEFN REGIONFN 
-                                TRANSLATEFN UPDATEFN READCHANGEFN TRANSFORMFN 
-                                                             (* fn to transform the control 
-
                                                           points of an element.
-
                                                           takes args Gelt Tranfn trandata.)

-                                TRANSLATEPTSFN
+(DATATYPE SKETCHTYPE
 (LABEL                                  (* the label if it is non-NIL will be 
+
                                                             used in the sketch menu.)

+                            DOCSTR                           (* if put in the menu, this is the 
+
                                                             help string for its item.)

+                            DRAWFN EXPANDFN obsolete CHANGEFN INPUTFN INSIDEFN REGIONFN TRANSLATEFN 
+                            UPDATEFN READCHANGEFN TRANSFORMFN 
+                                                             (* fn to transform the control points 
+
                                                             of an element. takes args Gelt Tranfn 
+
                                                             trandata.)

+                            TRANSLATEPTSFN
 
          (* fn to move some but not all points of a screen element.
-
       Takes args%: LocalSelectedPts GlobalDeltaToTranslate ScreenElt SketchWindow)

+
         Takes args%: LocalSelectedPts GlobalDeltaToTranslate ScreenElt SketchWindow)

 
-                                GLOBALREGIONFN
+                            GLOBALREGIONFN
 
          (* takes a GLOBAL element and returns the global region it occupies.
-
       Note%: this is the only fn that takes a global rather that a local element.)

+
         Note%: this is the only fn that takes a global rather that a local element.)

 
-                                ))
+                            ))
 
 (RECORD SKETCHCONTEXT
 (SKETCHBRUSH SKETCHFONT SKETCHTEXTALIGNMENT SKETCHARROWHEAD SKETCHDASHING 
-                                 SKETCHUSEARROWHEAD SKETCHTEXTBOXALIGNMENT SKETCHFILLING 
-                                 SKETCHLINEMODE SKETCHARCDIRECTION SKETCHMOVEMODE SKETCHINPUTSCALE 
-                                 SKETCHDRAWINGMODE))
+                             SKETCHUSEARROWHEAD SKETCHTEXTBOXALIGNMENT SKETCHFILLING SKETCHLINEMODE 
+                             SKETCHARCDIRECTION SKETCHMOVEMODE SKETCHINPUTSCALE SKETCHDRAWINGMODE))
 )
 
 (/DECLAREDATATYPE 'SKETCHTYPE
@@ -8710,7 +8706,7 @@ Otherwise, type '^'.")
 (PUTPROPS SK.SET.RECORD.LENGTHS.MACRO
 MACRO

           [ARGS (CONS 'LIST (for
 X in
 SKETCH.ELEMENT.TYPE.NAMES
                                collect
 (LIST 'LIST (KWOTE X)
-                                                 (LIST 'LENGTH (LIST 'CREATE X])
+                                             (LIST 'LENGTH (LIST 'CREATE X])
 )
 (DECLARE%: DOEVAL@COMPILE DONTCOPY
 
@@ -8767,149 +8763,149 @@ Otherwise, type '^'.")
 )
 (PUTPROPS SKETCH COPYRIGHT ("Venue & Xerox Corporation" 1984 1985 1986 1987 1988 1990 1992 1993))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (22416 85555 (SKETCH 22426 . 24531) (SKETCH.FROM.A.FILE 24533 . 24848) (SKETCHW.CREATE 
-24850 . 29424) (SKETCH.RESET 29426 . 30948) (SKETCHW.FIG.CHANGED 30950 . 31290) (SK.WINDOW.TITLE 31292
- . 31679) (EDITSLIDE 31681 . 32087) (EDITSKETCH 32089 . 32413) (SK.PUT.ON.FILE 32415 . 33867) (
-SK.OUTPUT.FILE.NAME 33869 . 34243) (SKETCH.PUT 34245 . 36919) (SK.GET.FROM.FILE 36921 . 37814) (
-SK.INCLUDE.FILE 37816 . 40324) (SK.GET.IMAGEOBJ.FROM.FILE 40326 . 42529) (SKETCH.GET 42531 . 42838) (
-ADD.SKETCH.TO.VIEWER 42840 . 45426) (FILENAMELESSVERSION 45428 . 45704) (SK.ADD.ELEMENTS.TO.SKETCH 
-45706 . 46220) (SKETCH.SET.A.DEFAULT 46222 . 53380) (SK.POPUP.SELECTIONFN 53382 . 53924) (
-GETSKETCHWREGION 53926 . 54132) (SK.ADD.ELEMENT 54134 . 55713) (SK.ADD.PRIORITY.ELEMENT.TO.SKETCH 
-55715 . 57109) (SK.ELTS.BY.PRIORITY 57111 . 57407) (SK.ORDER.ELEMENTS 57409 . 57676) (
-SK.ADD.PRIORITY.LOCAL.ELEMENT.TO.SKETCH 57678 . 59172) (SK.ADD.ELEMENTS 59174 . 59698) (
-SK.CHECK.WHENADDEDFN 59700 . 60430) (SK.APPLY.MENU.COMMAND 60432 . 61230) (SK.DELETE.ELEMENT1 61232 . 
-62810) (SK.MARK.DIRTY 62812 . 63478) (SK.MARK.UNDIRTY 63480 . 63811) (SK.MENU.AND.RETURN.FIELD 63813
- . 64478) (SKETCH.SET.BRUSH.SHAPE 64480 . 65065) (SKETCH.SET.BRUSH.SIZE 65067 . 65573) (
-SKETCHW.CLOSEFN 65575 . 67366) (SK.CONFIRM.DESTRUCTION 67368 . 68367) (SKETCHW.OUTFN 68369 . 68633) (
-SKETCHW.REOPENFN 68635 . 69047) (MAKE.LOCAL.SKETCH 69049 . 69779) (MAP.SKETCHSPEC.INTO.VIEWER 69781 . 
-70991) (SKETCHW.REPAINTFN 70993 . 71821) (SKETCHW.REPAINTFN1 71823 . 72762) (SK.DRAWFIGURE.IF 72764 . 
-73286) (SKETCHW.SCROLLFN 73288 . 77481) (SKETCHW.RESHAPEFN 77483 . 79741) (SK.UPDATE.EVENT.SELECTION 
-79743 . 81798) (LIGHTGRAYWINDOW 81800 . 81963) (SK.ADD.SPACES 81965 . 82711) (SK.SKETCH.MENU 82713 . 
-83035) (SK.CHECK.IMAGEOBJ.WHENDELETEDFN 83037 . 83889) (SK.APPLY.IMAGEOBJ.WHENDELETEDFN 83891 . 84851)
- (SK.RETURN.TTY 84853 . 85221) (SK.TAKE.TTY 85223 . 85553)) (85609 108602 (SKETCH.COMMANDMENU 85619 . 
-85956) (SKETCH.COMMANDMENU.ITEMS 85958 . 105706) (CREATE.SKETCHW.COMMANDMENU 105708 . 106128) (
-SKETCHW.SELECTIONFN 106130 . 107233) (SKETCH.MONITORLOCK 107235 . 107706) (SK.EVAL.AS.PROCESS 107708
- . 108321) (SK.EVAL.WITH.LOCK 108323 . 108600)) (108603 116407 (SK.FIX.MENU 108613 . 109707) (
-SK.SET.UP.MENUS 109709 . 112010) (SK.INSURE.HAS.MENU 112012 . 112674) (SK.CREATE.STANDARD.MENU 112676
- . 113121) (SK.ADD.ITEM.TO.MENU 113123 . 113798) (SK.GET.VIEWER.POPUP.MENU 113800 . 116001) (
-SK.CLEAR.POPUP.MENU 116003 . 116405)) (116463 125285 (SKETCH.CREATE 116473 . 117259) (GETSKETCHPROP 
-117261 . 120318) (PUTSKETCHPROP 120320 . 124252) (CREATE.DEFAULT.SKETCH.CONTEXT 124254 . 125283)) (
-125451 148347 (SK.COPY.BUTTONEVENTFN 125461 . 136689) (SK.BUTTONEVENT.MARK 136691 . 137074) (
-SK.BUILD.IMAGEOBJ 137076 . 146991) (SK.BUTTONEVENT.OVERP 146993 . 147616) (SK.BUTTONEVENT.SAME.KEYS 
-147618 . 148345)) (148634 174449 (SK.SEL.AND.CHANGE 148644 . 148936) (SK.CHECK.WHENCHANGEDFN 148938 . 
-149644) (SK.CHECK.PRECHANGEFN 149646 . 150247) (SK.CHANGE.ELT 150249 . 150441) (SK.CHANGE.THING 150443
- . 151694) (SKETCH.CHANGE.ELEMENTS 151696 . 152879) (SK.APPLY.SINGLE.CHANGEFN 152881 . 153454) (
-SK.DO.CHANGESPECS 153456 . 155115) (SK.VIEWER.FROM.SKETCH.ARG 155117 . 155559) (SK.DO.CHANGESPEC1 
-155561 . 157436) (SK.CHANGEFN 157438 . 158018) (SK.READCHANGEFN 158020 . 158479) (SK.DEFAULT.CHANGEFN 
-158481 . 160953) (CHANGEABLEFIELDITEMS 160955 . 161602) (SK.APPLY.CHANGE.COMMAND 161604 . 162221) (
-SK.DO.AND.RECORD.CHANGES 162223 . 163620) (SK.APPLY.CHANGE.COMMAND1 163622 . 165110) (
-SK.ELEMENTS.CHANGEFN 165112 . 167436) (READ.POINT.TO.ADD 167438 . 168382) (GLOBAL.KNOT.FROM.LOCAL 
-168384 . 168844) (SK.ADD.KNOT.TO.ELEMENT 168846 . 169790) (SK.GROUP.CHANGEFN 169792 . 171004) (
-SK.GROUP.CHANGEFN1 171006 . 174447)) (174616 188349 (ADD.ELEMENT.TO.SKETCH 174626 . 176332) (
-ADD.SKETCH.VIEWER 176334 . 177002) (REMOVE.SKETCH.VIEWER 177004 . 177617) (ALL.SKETCH.VIEWERS 177619
- . 177859) (SKETCH.ALL.VIEWERS 177861 . 178121) (VIEWER.BUCKET 178123 . 178274) (ELT.INSIDE.REGION? 
-178276 . 178603) (ELT.INSIDE.SKWP 178605 . 178896) (SCALE.FROM.SKW 178898 . 179148) (
-SK.ADDELT.TO.WINDOW 179150 . 180010) (SK.CALC.REGION.VIEWED 180012 . 180390) (SK.DRAWFIGURE 180392 . 
-181681) (SK.DRAWFIGURE1 181683 . 182067) (SK.LOCAL.FROM.GLOBAL 182069 . 183304) (SKETCH.REGION.VIEWED 
-183306 . 185993) (SKETCH.VIEW.FROM.NAME 185995 . 186425) (SK.UPDATE.REGION.VIEWED 186427 . 186819) (
-SKETCH.ADD.AND.DISPLAY 186821 . 187229) (SKETCH.ADD.AND.DISPLAY1 187231 . 187669) (SK.ADD.ITEM 187671
- . 188003) (SKETCHW.ADD.INSTANCE 188005 . 188347)) (188390 201578 (SK.SEL.AND.DELETE 188400 . 188788) 
-(SK.ERASE.AND.DELETE.ITEM 188790 . 189209) (REMOVE.ELEMENT.FROM.SKETCH 189211 . 190322) (
-SK.DELETE.ELEMENT 190324 . 190882) (SK.DELETE.ELEMENT2 190884 . 191545) (SK.DELETE.KNOT 191547 . 
-191838) (SK.SEL.AND.DELETE.KNOT 191840 . 192965) (SK.DELETE.ELEMENT.KNOT 192967 . 196174) (
-SK.CHECK.WHENDELETEDFN 196176 . 196956) (SK.CHECK.PREEDITFN 196958 . 197442) (
-SK.CHECK.END.INITIAL.EDIT 197444 . 197978) (SK.CHECK.WHENPOINTDELETEDFN 197980 . 198776) (SK.ERASE.ELT
- 198778 . 199114) (SK.DELETE.ELT 199116 . 199491) (SK.DELETE.ITEM 199493 . 199901) (DELFROMTCONC 
-199903 . 201576)) (201617 215451 (SK.COPY.ELT 201627 . 201997) (SK.SEL.AND.COPY 201999 . 202382) (
-SK.COPY.ELEMENTS 202384 . 208012) (SK.ADD.COPY.OF.ELEMENTS 208014 . 209781) (
-SK.GLOBAL.FROM.LOCAL.ELEMENTS 209783 . 210023) (SK.COPY.ITEM 210025 . 210822) (SK.INSERT.SKETCH 210824
- . 215449)) (215491 245512 (SK.MOVE.ELT 215501 . 215776) (SK.MOVE.ELT.OR.PT 215778 . 216091) (
-SK.APPLY.DEFAULT.MOVE 216093 . 216527) (SK.SEL.AND.MOVE 216529 . 217076) (SK.MOVE.ELEMENTS 217078 . 
-227950) (SKETCH.MOVE.ELEMENTS 227952 . 229883) (SKETCH.COPY.ELEMENTS 229885 . 231932) (
-\SKETCH.COPY.ELEMENT 231934 . 232659) (SK.TRANSLATE.ELEMENT 232661 . 233144) (SK.COPY.GLOBAL.ELEMENT 
-233146 . 233357) (SK.MAKE.ELEMENT.MOVE.ARG 233359 . 233979) (SK.MAKE.ELEMENTS.MOVE.ARG 233981 . 234503
-) (SK.MAKE.POINTS.AND.ELEMENTS.MOVE.ARG 234505 . 235574) (SK.SHOW.FIG.FROM.INFO 235576 . 235944) (
-SK.MOVE.THING 235946 . 236852) (UPDATE.ELEMENT.IN.SKETCH 236854 . 238909) (SK.UPDATE.ELEMENT 238911 . 
-240470) (SK.UPDATE.ELEMENTS 240472 . 241191) (SK.UPDATE.ELEMENT1 241193 . 245093) (
-SK.MOVE.ELEMENT.POINT 245095 . 245510)) (245575 267864 (SK.MOVE.POINTS 245585 . 245872) (
-SK.SEL.AND.MOVE.POINTS 245874 . 246179) (SK.DO.MOVE.ELEMENT.POINTS 246181 . 254838) (
-SK.MOVE.ITEM.POINTS 254840 . 256511) (SK.TRANSLATEPTSFN 256513 . 256897) (SK.TRANSLATE.POINTS 256899
- . 257800) (SK.SELECT.MULTIPLE.POINTS 257802 . 263442) (SK.CONTROL.POINTS.IN.REGION 263444 . 264865) (
-SK.ADD.PT.SELECTION 264867 . 265331) (SK.REMOVE.PT.SELECTION 265333 . 265950) (SK.ADD.POINT 265952 . 
-266575) (SK.ELTS.CONTAINING.PTS 266577 . 267202) (SK.HOTSPOTS.NOT.ON.LIST 267204 . 267862)) (268030 
-270826 (SK.SET.MOVE.MODE 268040 . 268711) (SK.SET.MOVE.MODE.POINTS 268713 . 269052) (
-SK.SET.MOVE.MODE.ELEMENTS 269054 . 269398) (SK.SET.MOVE.MODE.COMBINED 269400 . 269750) (READMOVEMODE 
-269752 . 270824)) (270827 289582 (SK.ALIGN.POINTS 270837 . 271127) (SK.SEL.AND.ALIGN.POINTS 271129 . 
-271438) (SK.ALIGN.POINTS.LEFT 271440 . 271743) (SK.ALIGN.POINTS.RIGHT 271745 . 272050) (
-SK.ALIGN.POINTS.TOP 272052 . 272353) (SK.ALIGN.POINTS.BOTTOM 272355 . 272662) (
-SK.EVEN.SPACE.POINTS.IN.X 272664 . 272984) (SK.EVEN.SPACE.POINTS.IN.Y 272986 . 273306) (
-SK.DO.ALIGN.POINTS 273308 . 283930) (SK.NTH.CONTROL.POINT 283932 . 284393) (
-SK.GET.SELECTED.ELEMENT.STRUCTURE 284395 . 285061) (SK.CORRESPONDING.CONTROL.PT 285063 . 285617) (
-SK.CONTROL.POINT.NUMBER 285619 . 285989) (SK.DO.ALIGN.SETVALUE 285991 . 289580)) (289646 303078 (
-SKETCH.CREATE.GROUP 289656 . 290145) (SK.CREATE.GROUP1 290147 . 290694) (SK.UPDATE.GROUP.AFTER.CHANGE 
-290696 . 291485) (SK.GROUP.ELTS 291487 . 291768) (SK.SEL.AND.GROUP 291770 . 292156) (SK.GROUP.ELEMENTS
- 292158 . 293807) (SK.UNGROUP.ELT 293809 . 294093) (SK.SEL.AND.UNGROUP 294095 . 295764) (
-SK.UNGROUP.ELEMENT 295766 . 296702) (SK.GLOBAL.REGION.OF.LOCAL.ELEMENTS 296704 . 297626) (
-SK.LOCAL.REGION.OF.LOCAL.ELEMENTS 297628 . 298639) (SK.GLOBAL.REGION.OF.GLOBAL.ELEMENTS 298641 . 
-299981) (SK.UNIONREGIONS 299983 . 302349) (SKETCH.REGION.OF.SKETCH 302351 . 302767) (SK.FLASHREGION 
-302769 . 303076)) (303079 316550 (INIT.GROUP.ELEMENT 303089 . 303961) (GROUP.DRAWFN 303963 . 304413) (
-GROUP.EXPANDFN 304415 . 305978) (GROUP.INSIDEFN 305980 . 306389) (GROUP.REGIONFN 306391 . 306786) (
-GROUP.GLOBALREGIONFN 306788 . 307106) (GROUP.TRANSLATEFN 307108 . 309140) (GROUP.TRANSFORMFN 309142 . 
-312622) (GROUP.READCHANGEFN 312624 . 316548)) (316551 317559 (REGION.CENTER 316561 . 317162) (
-REMOVE.LAST 317164 . 317557)) (317612 322719 (SK.MOVE.GROUP.CONTROL.PT 317622 . 317913) (
-SK.SEL.AND.MOVE.CONTROL.PT 317915 . 319319) (SK.MOVE.GROUP.ELEMENT.CONTROL.POINT 319321 . 321394) (
-SK.READ.NEW.GROUP.CONTROL.PT 321396 . 322717)) (322982 327606 (SK.DO.GROUP 322992 . 324444) (
-SK.CHECK.WHENGROUPEDFN 324446 . 325156) (SK.DO.UNGROUP 325158 . 326363) (SK.CHECK.WHENUNGROUPEDFN 
-326365 . 326952) (SK.GROUP.UNDO 326954 . 327277) (SK.UNGROUP.UNDO 327279 . 327604)) (327847 332769 (
-SK.FREEZE.ELTS 327857 . 328141) (SK.SEL.AND.FREEZE 328143 . 328533) (SK.FREEZE.ELEMENTS 328535 . 
-329086) (SK.UNFREEZE.ELT 329088 . 329377) (SK.SEL.AND.UNFREEZE 329379 . 330915) (SK.UNFREEZE.ELEMENTS 
-330917 . 331476) (SK.FREEZE.UNDO 331478 . 331723) (SK.UNFREEZE.UNDO 331725 . 331972) (SK.DO.FREEZE 
-331974 . 332367) (SK.DO.UNFREEZE 332369 . 332767)) (332999 342809 (SKETCH.ELEMENTS.OF.SKETCH 333009 . 
-333844) (SKETCH.LIST.OF.ELEMENTS 333846 . 334564) (SKETCH.ADD.ELEMENT 334566 . 335641) (
-SKETCH.DELETE.ELEMENT 335643 . 337375) (DELFROMGROUPELT 337377 . 338177) (SKETCH.ELEMENT.TYPE 338179
- . 338528) (SKETCH.ELEMENT.CHANGED 338530 . 340098) (SK.ELEMENT.CHANGED1 340100 . 340751) (
-SK.UPDATE.GLOBAL.IMAGE.OBJECT.ELEMENT 340753 . 342807)) (342863 347475 (INSURE.SKETCH 342873 . 345488)
- (LOCALSPECS.FROM.VIEWER 345490 . 345850) (SK.LOCAL.ELT.FROM.GLOBALPART 345852 . 346320) (
-SKETCH.FROM.VIEWER 346322 . 346556) (INSPECT.SKETCH 346558 . 346883) (ELT.INSIDE.SKETCHWP 346885 . 
-347158) (SK.INSIDE.REGION 347160 . 347473)) (347476 351806 (MAPSKETCHSPECS 347486 . 348107) (
-MAPCOLLECTSKETCHSPECS 348109 . 348858) (MAPSKETCHSPECSUNTIL 348860 . 349668) (MAPGLOBALSKETCHSPECS 
-349670 . 350371) (MAPGLOBALSKETCHELEMENTS 350373 . 351804)) (351868 377760 (SK.ADD.SELECTION 351878 . 
-352618) (SK.COPY.INSERTFN 352620 . 356251) (SCREENELEMENTP 356253 . 356726) (SK.ITEM.REGION 356728 . 
-357215) (SK.ELEMENT.GLOBAL.REGION 357217 . 357745) (SK.LOCAL.ITEMS.IN.REGION 357747 . 359726) (
-SK.REGIONFN 359728 . 360050) (SK.GLOBAL.REGIONFN 360052 . 360410) (SK.REMOVE.SELECTION 360412 . 361140
-) (SK.SELECT.MULTIPLE.ITEMS 361142 . 371584) (SKETCH.GET.ELEMENTS 371586 . 373009) (SK.PUT.MARKS.UP 
-373011 . 373350) (SK.TAKE.MARKS.DOWN 373352 . 373691) (SK.TRANSLATE.GLOBALPART 373693 . 375820) (
-SK.TRANSLATE.ITEM 375822 . 376749) (SK.TRANSLATEFN 376751 . 376947) (TRANSLATE.SKETCH 376949 . 377758)
-) (378026 380933 (SK.INPUT.SCALE 378036 . 378883) (SK.UPDATE.SKETCHCONTEXT 378885 . 379482) (
-SK.SET.INPUT.SCALE 379484 . 380133) (SK.SET.INPUT.SCALE.CURRENT 380135 . 380426) (
-SK.SET.INPUT.SCALE.VALUE 380428 . 380931)) (380984 382896 (SK.SET.FEEDBACK.MODE 380994 . 382300) (
-SK.SET.FEEDBACK.POINT 382302 . 382470) (SK.SET.FEEDBACK.VERBOSE 382472 . 382641) (
-SK.SET.FEEDBACK.ALWAYS 382643 . 382894)) (383047 384324 (SKETCH.TITLE 383057 . 383320) (
-SK.SHRINK.ICONCREATE 383322 . 384322)) (390014 392828 (READBRUSHSHAPE 390024 . 390483) (READ.FUNCTION 
-390485 . 391000) (READBRUSHSIZE 391002 . 391460) (READANGLE 391462 . 391954) (READARCDIRECTION 391956
- . 392826)) (392829 403240 (SK.CHANGE.DASHING 392839 . 396787) (READ.AND.SAVE.NEW.DASHING 396789 . 
-398557) (READ.NEW.DASHING 398559 . 400299) (READ.DASHING.CHANGE 400301 . 401776) (SK.CACHE.DASHING 
-401778 . 402780) (SK.DASHING.LABEL 402782 . 403238)) (403241 406946 (READ.FILLING.CHANGE 403251 . 
-405232) (SK.CACHE.FILLING 405234 . 405952) (READ.AND.SAVE.NEW.FILLING 405954 . 406552) (
-SK.FILLING.LABEL 406554 . 406944)) (407330 443583 (SK.GETGLOBALPOSITION 407340 . 407645) (
-SKETCH.TRACK.ELEMENTS 407647 . 411167) (SK.PICKOUT.WHOLE.MOVE.ELEMENTS 411169 . 411728) (
-MAP.SKETCH.ELEMENTS.INTO.VIEWER 411730 . 412122) (MAP.GLOBAL.POSITION.INTO.VIEWER 412124 . 412504) (
-SKETCH.TO.VIEWER.POSITION 412506 . 412865) (SKETCH.TRACK.IMAGE 412867 . 413721) (SK.TRACK.IMAGE1 
-413723 . 415135) (MAP.VIEWER.XY.INTO.GLOBAL 415137 . 416131) (SK.SET.POSITION 416133 . 416469) (
-MAP.VIEWER.PT.INTO.GLOBAL 416471 . 417577) (VIEWER.TO.SKETCH.POSITION 417579 . 418214) (
-SK.INSURE.SCALE 418216 . 418476) (SKETCH.TO.VIEWER.REGION 418478 . 419284) (VIEWER.TO.SKETCH.REGION 
-419286 . 419624) (SK.READ.POINT.WITH.FEEDBACK 419626 . 430629) (SKETCH.GET.POSITION 430631 . 432511) (
-\CLOBBER.POSITION 432513 . 432961) (NEAREST.HOT.SPOT 432963 . 434491) (GETWREGION 434493 . 435254) (
-GET.BITMAP.POSITION 435256 . 436040) (SK.TRACK.BITMAP1 436042 . 443581)) (444196 475082 (
-SK.BRING.UP.POSITION.PAD 444206 . 450066) (SK.PAD.READER.POSITION 450068 . 451717) (
-SK.POSITION.READER.REPAINTFN 451719 . 453503) (SK.POSITION.PAD.FROM.VIEWER 453505 . 454847) (
-SK.INIT.POSITION.NUMBER.PAD.MENU 454849 . 455199) (SK.READ.POSITION.PAD.HANDLER 455201 . 460933) (
-DISPLAY.POSITION.READER.TOTAL 460935 . 463233) (POSITION.PAD.READER.HANDLER 463235 . 471278) (
-POSITIONPAD.HELDFN 471280 . 472764) (\POSITION.PAD.ADD.DIGIT.MENU 472766 . 474345) (
-\POSITION.READER.NUMBERPAD 474347 . 475080)) (476708 479386 (SK.DRAWFN 476718 . 477084) (
-SK.TRANSFORMFN 477086 . 477467) (SK.EXPANDFN 477469 . 477746) (SK.INPUT 477748 . 478129) (SK.INSIDEFN 
-478131 . 478771) (SK.UPDATEFN 478773 . 479384)) (485115 489060 (SK.CHECK.SKETCH.VERSION 485125 . 
-486365) (SK.INSURE.RECORD.LENGTH 486367 . 487850) (SK.INSURE.HAS.LENGTH 487852 . 488590) (
-SK.RECORD.LENGTH 488592 . 488766) (SK.SET.RECORD.LENGTHS 488768 . 489058)) (489805 490692 (
-SK.ADD.EDIT.COMMAND.TO.FILE.BROWSER 489815 . 490690)))))
+  (FILEMAP (NIL (22155 85518 (SKETCH 22165 . 24270) (SKETCH.FROM.A.FILE 24272 . 24587) (SKETCHW.CREATE 
+24589 . 29163) (SKETCH.RESET 29165 . 30687) (SKETCHW.FIG.CHANGED 30689 . 31029) (SK.WINDOW.TITLE 31031
+ . 31418) (EDITSLIDE 31420 . 31826) (EDITSKETCH 31828 . 32152) (SK.PUT.ON.FILE 32154 . 33606) (
+SK.OUTPUT.FILE.NAME 33608 . 33982) (SKETCH.PUT 33984 . 36882) (SK.GET.FROM.FILE 36884 . 37777) (
+SK.INCLUDE.FILE 37779 . 40287) (SK.GET.IMAGEOBJ.FROM.FILE 40289 . 42492) (SKETCH.GET 42494 . 42801) (
+ADD.SKETCH.TO.VIEWER 42803 . 45389) (FILENAMELESSVERSION 45391 . 45667) (SK.ADD.ELEMENTS.TO.SKETCH 
+45669 . 46183) (SKETCH.SET.A.DEFAULT 46185 . 53343) (SK.POPUP.SELECTIONFN 53345 . 53887) (
+GETSKETCHWREGION 53889 . 54095) (SK.ADD.ELEMENT 54097 . 55676) (SK.ADD.PRIORITY.ELEMENT.TO.SKETCH 
+55678 . 57072) (SK.ELTS.BY.PRIORITY 57074 . 57370) (SK.ORDER.ELEMENTS 57372 . 57639) (
+SK.ADD.PRIORITY.LOCAL.ELEMENT.TO.SKETCH 57641 . 59135) (SK.ADD.ELEMENTS 59137 . 59661) (
+SK.CHECK.WHENADDEDFN 59663 . 60393) (SK.APPLY.MENU.COMMAND 60395 . 61193) (SK.DELETE.ELEMENT1 61195 . 
+62773) (SK.MARK.DIRTY 62775 . 63441) (SK.MARK.UNDIRTY 63443 . 63774) (SK.MENU.AND.RETURN.FIELD 63776
+ . 64441) (SKETCH.SET.BRUSH.SHAPE 64443 . 65028) (SKETCH.SET.BRUSH.SIZE 65030 . 65536) (
+SKETCHW.CLOSEFN 65538 . 67329) (SK.CONFIRM.DESTRUCTION 67331 . 68330) (SKETCHW.OUTFN 68332 . 68596) (
+SKETCHW.REOPENFN 68598 . 69010) (MAKE.LOCAL.SKETCH 69012 . 69742) (MAP.SKETCHSPEC.INTO.VIEWER 69744 . 
+70954) (SKETCHW.REPAINTFN 70956 . 71784) (SKETCHW.REPAINTFN1 71786 . 72725) (SK.DRAWFIGURE.IF 72727 . 
+73249) (SKETCHW.SCROLLFN 73251 . 77444) (SKETCHW.RESHAPEFN 77446 . 79704) (SK.UPDATE.EVENT.SELECTION 
+79706 . 81761) (LIGHTGRAYWINDOW 81763 . 81926) (SK.ADD.SPACES 81928 . 82674) (SK.SKETCH.MENU 82676 . 
+82998) (SK.CHECK.IMAGEOBJ.WHENDELETEDFN 83000 . 83852) (SK.APPLY.IMAGEOBJ.WHENDELETEDFN 83854 . 84814)
+ (SK.RETURN.TTY 84816 . 85184) (SK.TAKE.TTY 85186 . 85516)) (85572 108565 (SKETCH.COMMANDMENU 85582 . 
+85919) (SKETCH.COMMANDMENU.ITEMS 85921 . 105669) (CREATE.SKETCHW.COMMANDMENU 105671 . 106091) (
+SKETCHW.SELECTIONFN 106093 . 107196) (SKETCH.MONITORLOCK 107198 . 107669) (SK.EVAL.AS.PROCESS 107671
+ . 108284) (SK.EVAL.WITH.LOCK 108286 . 108563)) (108566 116370 (SK.FIX.MENU 108576 . 109670) (
+SK.SET.UP.MENUS 109672 . 111973) (SK.INSURE.HAS.MENU 111975 . 112637) (SK.CREATE.STANDARD.MENU 112639
+ . 113084) (SK.ADD.ITEM.TO.MENU 113086 . 113761) (SK.GET.VIEWER.POPUP.MENU 113763 . 115964) (
+SK.CLEAR.POPUP.MENU 115966 . 116368)) (116426 125248 (SKETCH.CREATE 116436 . 117222) (GETSKETCHPROP 
+117224 . 120281) (PUTSKETCHPROP 120283 . 124215) (CREATE.DEFAULT.SKETCH.CONTEXT 124217 . 125246)) (
+125414 148310 (SK.COPY.BUTTONEVENTFN 125424 . 136652) (SK.BUTTONEVENT.MARK 136654 . 137037) (
+SK.BUILD.IMAGEOBJ 137039 . 146954) (SK.BUTTONEVENT.OVERP 146956 . 147579) (SK.BUTTONEVENT.SAME.KEYS 
+147581 . 148308)) (148589 174404 (SK.SEL.AND.CHANGE 148599 . 148891) (SK.CHECK.WHENCHANGEDFN 148893 . 
+149599) (SK.CHECK.PRECHANGEFN 149601 . 150202) (SK.CHANGE.ELT 150204 . 150396) (SK.CHANGE.THING 150398
+ . 151649) (SKETCH.CHANGE.ELEMENTS 151651 . 152834) (SK.APPLY.SINGLE.CHANGEFN 152836 . 153409) (
+SK.DO.CHANGESPECS 153411 . 155070) (SK.VIEWER.FROM.SKETCH.ARG 155072 . 155514) (SK.DO.CHANGESPEC1 
+155516 . 157391) (SK.CHANGEFN 157393 . 157973) (SK.READCHANGEFN 157975 . 158434) (SK.DEFAULT.CHANGEFN 
+158436 . 160908) (CHANGEABLEFIELDITEMS 160910 . 161557) (SK.APPLY.CHANGE.COMMAND 161559 . 162176) (
+SK.DO.AND.RECORD.CHANGES 162178 . 163575) (SK.APPLY.CHANGE.COMMAND1 163577 . 165065) (
+SK.ELEMENTS.CHANGEFN 165067 . 167391) (READ.POINT.TO.ADD 167393 . 168337) (GLOBAL.KNOT.FROM.LOCAL 
+168339 . 168799) (SK.ADD.KNOT.TO.ELEMENT 168801 . 169745) (SK.GROUP.CHANGEFN 169747 . 170959) (
+SK.GROUP.CHANGEFN1 170961 . 174402)) (174571 188304 (ADD.ELEMENT.TO.SKETCH 174581 . 176287) (
+ADD.SKETCH.VIEWER 176289 . 176957) (REMOVE.SKETCH.VIEWER 176959 . 177572) (ALL.SKETCH.VIEWERS 177574
+ . 177814) (SKETCH.ALL.VIEWERS 177816 . 178076) (VIEWER.BUCKET 178078 . 178229) (ELT.INSIDE.REGION? 
+178231 . 178558) (ELT.INSIDE.SKWP 178560 . 178851) (SCALE.FROM.SKW 178853 . 179103) (
+SK.ADDELT.TO.WINDOW 179105 . 179965) (SK.CALC.REGION.VIEWED 179967 . 180345) (SK.DRAWFIGURE 180347 . 
+181636) (SK.DRAWFIGURE1 181638 . 182022) (SK.LOCAL.FROM.GLOBAL 182024 . 183259) (SKETCH.REGION.VIEWED 
+183261 . 185948) (SKETCH.VIEW.FROM.NAME 185950 . 186380) (SK.UPDATE.REGION.VIEWED 186382 . 186774) (
+SKETCH.ADD.AND.DISPLAY 186776 . 187184) (SKETCH.ADD.AND.DISPLAY1 187186 . 187624) (SK.ADD.ITEM 187626
+ . 187958) (SKETCHW.ADD.INSTANCE 187960 . 188302)) (188345 201533 (SK.SEL.AND.DELETE 188355 . 188743) 
+(SK.ERASE.AND.DELETE.ITEM 188745 . 189164) (REMOVE.ELEMENT.FROM.SKETCH 189166 . 190277) (
+SK.DELETE.ELEMENT 190279 . 190837) (SK.DELETE.ELEMENT2 190839 . 191500) (SK.DELETE.KNOT 191502 . 
+191793) (SK.SEL.AND.DELETE.KNOT 191795 . 192920) (SK.DELETE.ELEMENT.KNOT 192922 . 196129) (
+SK.CHECK.WHENDELETEDFN 196131 . 196911) (SK.CHECK.PREEDITFN 196913 . 197397) (
+SK.CHECK.END.INITIAL.EDIT 197399 . 197933) (SK.CHECK.WHENPOINTDELETEDFN 197935 . 198731) (SK.ERASE.ELT
+ 198733 . 199069) (SK.DELETE.ELT 199071 . 199446) (SK.DELETE.ITEM 199448 . 199856) (DELFROMTCONC 
+199858 . 201531)) (201572 215406 (SK.COPY.ELT 201582 . 201952) (SK.SEL.AND.COPY 201954 . 202337) (
+SK.COPY.ELEMENTS 202339 . 207967) (SK.ADD.COPY.OF.ELEMENTS 207969 . 209736) (
+SK.GLOBAL.FROM.LOCAL.ELEMENTS 209738 . 209978) (SK.COPY.ITEM 209980 . 210777) (SK.INSERT.SKETCH 210779
+ . 215404)) (215446 245467 (SK.MOVE.ELT 215456 . 215731) (SK.MOVE.ELT.OR.PT 215733 . 216046) (
+SK.APPLY.DEFAULT.MOVE 216048 . 216482) (SK.SEL.AND.MOVE 216484 . 217031) (SK.MOVE.ELEMENTS 217033 . 
+227905) (SKETCH.MOVE.ELEMENTS 227907 . 229838) (SKETCH.COPY.ELEMENTS 229840 . 231887) (
+\SKETCH.COPY.ELEMENT 231889 . 232614) (SK.TRANSLATE.ELEMENT 232616 . 233099) (SK.COPY.GLOBAL.ELEMENT 
+233101 . 233312) (SK.MAKE.ELEMENT.MOVE.ARG 233314 . 233934) (SK.MAKE.ELEMENTS.MOVE.ARG 233936 . 234458
+) (SK.MAKE.POINTS.AND.ELEMENTS.MOVE.ARG 234460 . 235529) (SK.SHOW.FIG.FROM.INFO 235531 . 235899) (
+SK.MOVE.THING 235901 . 236807) (UPDATE.ELEMENT.IN.SKETCH 236809 . 238864) (SK.UPDATE.ELEMENT 238866 . 
+240425) (SK.UPDATE.ELEMENTS 240427 . 241146) (SK.UPDATE.ELEMENT1 241148 . 245048) (
+SK.MOVE.ELEMENT.POINT 245050 . 245465)) (245530 267819 (SK.MOVE.POINTS 245540 . 245827) (
+SK.SEL.AND.MOVE.POINTS 245829 . 246134) (SK.DO.MOVE.ELEMENT.POINTS 246136 . 254793) (
+SK.MOVE.ITEM.POINTS 254795 . 256466) (SK.TRANSLATEPTSFN 256468 . 256852) (SK.TRANSLATE.POINTS 256854
+ . 257755) (SK.SELECT.MULTIPLE.POINTS 257757 . 263397) (SK.CONTROL.POINTS.IN.REGION 263399 . 264820) (
+SK.ADD.PT.SELECTION 264822 . 265286) (SK.REMOVE.PT.SELECTION 265288 . 265905) (SK.ADD.POINT 265907 . 
+266530) (SK.ELTS.CONTAINING.PTS 266532 . 267157) (SK.HOTSPOTS.NOT.ON.LIST 267159 . 267817)) (267977 
+270773 (SK.SET.MOVE.MODE 267987 . 268658) (SK.SET.MOVE.MODE.POINTS 268660 . 268999) (
+SK.SET.MOVE.MODE.ELEMENTS 269001 . 269345) (SK.SET.MOVE.MODE.COMBINED 269347 . 269697) (READMOVEMODE 
+269699 . 270771)) (270774 289529 (SK.ALIGN.POINTS 270784 . 271074) (SK.SEL.AND.ALIGN.POINTS 271076 . 
+271385) (SK.ALIGN.POINTS.LEFT 271387 . 271690) (SK.ALIGN.POINTS.RIGHT 271692 . 271997) (
+SK.ALIGN.POINTS.TOP 271999 . 272300) (SK.ALIGN.POINTS.BOTTOM 272302 . 272609) (
+SK.EVEN.SPACE.POINTS.IN.X 272611 . 272931) (SK.EVEN.SPACE.POINTS.IN.Y 272933 . 273253) (
+SK.DO.ALIGN.POINTS 273255 . 283877) (SK.NTH.CONTROL.POINT 283879 . 284340) (
+SK.GET.SELECTED.ELEMENT.STRUCTURE 284342 . 285008) (SK.CORRESPONDING.CONTROL.PT 285010 . 285564) (
+SK.CONTROL.POINT.NUMBER 285566 . 285936) (SK.DO.ALIGN.SETVALUE 285938 . 289527)) (289593 303025 (
+SKETCH.CREATE.GROUP 289603 . 290092) (SK.CREATE.GROUP1 290094 . 290641) (SK.UPDATE.GROUP.AFTER.CHANGE 
+290643 . 291432) (SK.GROUP.ELTS 291434 . 291715) (SK.SEL.AND.GROUP 291717 . 292103) (SK.GROUP.ELEMENTS
+ 292105 . 293754) (SK.UNGROUP.ELT 293756 . 294040) (SK.SEL.AND.UNGROUP 294042 . 295711) (
+SK.UNGROUP.ELEMENT 295713 . 296649) (SK.GLOBAL.REGION.OF.LOCAL.ELEMENTS 296651 . 297573) (
+SK.LOCAL.REGION.OF.LOCAL.ELEMENTS 297575 . 298586) (SK.GLOBAL.REGION.OF.GLOBAL.ELEMENTS 298588 . 
+299928) (SK.UNIONREGIONS 299930 . 302296) (SKETCH.REGION.OF.SKETCH 302298 . 302714) (SK.FLASHREGION 
+302716 . 303023)) (303026 316497 (INIT.GROUP.ELEMENT 303036 . 303908) (GROUP.DRAWFN 303910 . 304360) (
+GROUP.EXPANDFN 304362 . 305925) (GROUP.INSIDEFN 305927 . 306336) (GROUP.REGIONFN 306338 . 306733) (
+GROUP.GLOBALREGIONFN 306735 . 307053) (GROUP.TRANSLATEFN 307055 . 309087) (GROUP.TRANSFORMFN 309089 . 
+312569) (GROUP.READCHANGEFN 312571 . 316495)) (316498 317506 (REGION.CENTER 316508 . 317109) (
+REMOVE.LAST 317111 . 317504)) (317559 322666 (SK.MOVE.GROUP.CONTROL.PT 317569 . 317860) (
+SK.SEL.AND.MOVE.CONTROL.PT 317862 . 319266) (SK.MOVE.GROUP.ELEMENT.CONTROL.POINT 319268 . 321341) (
+SK.READ.NEW.GROUP.CONTROL.PT 321343 . 322664)) (322925 327549 (SK.DO.GROUP 322935 . 324387) (
+SK.CHECK.WHENGROUPEDFN 324389 . 325099) (SK.DO.UNGROUP 325101 . 326306) (SK.CHECK.WHENUNGROUPEDFN 
+326308 . 326895) (SK.GROUP.UNDO 326897 . 327220) (SK.UNGROUP.UNDO 327222 . 327547)) (327790 332712 (
+SK.FREEZE.ELTS 327800 . 328084) (SK.SEL.AND.FREEZE 328086 . 328476) (SK.FREEZE.ELEMENTS 328478 . 
+329029) (SK.UNFREEZE.ELT 329031 . 329320) (SK.SEL.AND.UNFREEZE 329322 . 330858) (SK.UNFREEZE.ELEMENTS 
+330860 . 331419) (SK.FREEZE.UNDO 331421 . 331666) (SK.UNFREEZE.UNDO 331668 . 331915) (SK.DO.FREEZE 
+331917 . 332310) (SK.DO.UNFREEZE 332312 . 332710)) (332942 342752 (SKETCH.ELEMENTS.OF.SKETCH 332952 . 
+333787) (SKETCH.LIST.OF.ELEMENTS 333789 . 334507) (SKETCH.ADD.ELEMENT 334509 . 335584) (
+SKETCH.DELETE.ELEMENT 335586 . 337318) (DELFROMGROUPELT 337320 . 338120) (SKETCH.ELEMENT.TYPE 338122
+ . 338471) (SKETCH.ELEMENT.CHANGED 338473 . 340041) (SK.ELEMENT.CHANGED1 340043 . 340694) (
+SK.UPDATE.GLOBAL.IMAGE.OBJECT.ELEMENT 340696 . 342750)) (342806 347418 (INSURE.SKETCH 342816 . 345431)
+ (LOCALSPECS.FROM.VIEWER 345433 . 345793) (SK.LOCAL.ELT.FROM.GLOBALPART 345795 . 346263) (
+SKETCH.FROM.VIEWER 346265 . 346499) (INSPECT.SKETCH 346501 . 346826) (ELT.INSIDE.SKETCHWP 346828 . 
+347101) (SK.INSIDE.REGION 347103 . 347416)) (347419 351749 (MAPSKETCHSPECS 347429 . 348050) (
+MAPCOLLECTSKETCHSPECS 348052 . 348801) (MAPSKETCHSPECSUNTIL 348803 . 349611) (MAPGLOBALSKETCHSPECS 
+349613 . 350314) (MAPGLOBALSKETCHELEMENTS 350316 . 351747)) (351811 377703 (SK.ADD.SELECTION 351821 . 
+352561) (SK.COPY.INSERTFN 352563 . 356194) (SCREENELEMENTP 356196 . 356669) (SK.ITEM.REGION 356671 . 
+357158) (SK.ELEMENT.GLOBAL.REGION 357160 . 357688) (SK.LOCAL.ITEMS.IN.REGION 357690 . 359669) (
+SK.REGIONFN 359671 . 359993) (SK.GLOBAL.REGIONFN 359995 . 360353) (SK.REMOVE.SELECTION 360355 . 361083
+) (SK.SELECT.MULTIPLE.ITEMS 361085 . 371527) (SKETCH.GET.ELEMENTS 371529 . 372952) (SK.PUT.MARKS.UP 
+372954 . 373293) (SK.TAKE.MARKS.DOWN 373295 . 373634) (SK.TRANSLATE.GLOBALPART 373636 . 375763) (
+SK.TRANSLATE.ITEM 375765 . 376692) (SK.TRANSLATEFN 376694 . 376890) (TRANSLATE.SKETCH 376892 . 377701)
+) (377969 380876 (SK.INPUT.SCALE 377979 . 378826) (SK.UPDATE.SKETCHCONTEXT 378828 . 379425) (
+SK.SET.INPUT.SCALE 379427 . 380076) (SK.SET.INPUT.SCALE.CURRENT 380078 . 380369) (
+SK.SET.INPUT.SCALE.VALUE 380371 . 380874)) (380927 382839 (SK.SET.FEEDBACK.MODE 380937 . 382243) (
+SK.SET.FEEDBACK.POINT 382245 . 382413) (SK.SET.FEEDBACK.VERBOSE 382415 . 382584) (
+SK.SET.FEEDBACK.ALWAYS 382586 . 382837)) (382990 384267 (SKETCH.TITLE 383000 . 383263) (
+SK.SHRINK.ICONCREATE 383265 . 384265)) (389957 392771 (READBRUSHSHAPE 389967 . 390426) (READ.FUNCTION 
+390428 . 390943) (READBRUSHSIZE 390945 . 391403) (READANGLE 391405 . 391897) (READARCDIRECTION 391899
+ . 392769)) (392772 403183 (SK.CHANGE.DASHING 392782 . 396730) (READ.AND.SAVE.NEW.DASHING 396732 . 
+398500) (READ.NEW.DASHING 398502 . 400242) (READ.DASHING.CHANGE 400244 . 401719) (SK.CACHE.DASHING 
+401721 . 402723) (SK.DASHING.LABEL 402725 . 403181)) (403184 406889 (READ.FILLING.CHANGE 403194 . 
+405175) (SK.CACHE.FILLING 405177 . 405895) (READ.AND.SAVE.NEW.FILLING 405897 . 406495) (
+SK.FILLING.LABEL 406497 . 406887)) (407273 443526 (SK.GETGLOBALPOSITION 407283 . 407588) (
+SKETCH.TRACK.ELEMENTS 407590 . 411110) (SK.PICKOUT.WHOLE.MOVE.ELEMENTS 411112 . 411671) (
+MAP.SKETCH.ELEMENTS.INTO.VIEWER 411673 . 412065) (MAP.GLOBAL.POSITION.INTO.VIEWER 412067 . 412447) (
+SKETCH.TO.VIEWER.POSITION 412449 . 412808) (SKETCH.TRACK.IMAGE 412810 . 413664) (SK.TRACK.IMAGE1 
+413666 . 415078) (MAP.VIEWER.XY.INTO.GLOBAL 415080 . 416074) (SK.SET.POSITION 416076 . 416412) (
+MAP.VIEWER.PT.INTO.GLOBAL 416414 . 417520) (VIEWER.TO.SKETCH.POSITION 417522 . 418157) (
+SK.INSURE.SCALE 418159 . 418419) (SKETCH.TO.VIEWER.REGION 418421 . 419227) (VIEWER.TO.SKETCH.REGION 
+419229 . 419567) (SK.READ.POINT.WITH.FEEDBACK 419569 . 430572) (SKETCH.GET.POSITION 430574 . 432454) (
+\CLOBBER.POSITION 432456 . 432904) (NEAREST.HOT.SPOT 432906 . 434434) (GETWREGION 434436 . 435197) (
+GET.BITMAP.POSITION 435199 . 435983) (SK.TRACK.BITMAP1 435985 . 443524)) (444095 474981 (
+SK.BRING.UP.POSITION.PAD 444105 . 449965) (SK.PAD.READER.POSITION 449967 . 451616) (
+SK.POSITION.READER.REPAINTFN 451618 . 453402) (SK.POSITION.PAD.FROM.VIEWER 453404 . 454746) (
+SK.INIT.POSITION.NUMBER.PAD.MENU 454748 . 455098) (SK.READ.POSITION.PAD.HANDLER 455100 . 460832) (
+DISPLAY.POSITION.READER.TOTAL 460834 . 463132) (POSITION.PAD.READER.HANDLER 463134 . 471177) (
+POSITIONPAD.HELDFN 471179 . 472663) (\POSITION.PAD.ADD.DIGIT.MENU 472665 . 474244) (
+\POSITION.READER.NUMBERPAD 474246 . 474979)) (476607 479285 (SK.DRAWFN 476617 . 476983) (
+SK.TRANSFORMFN 476985 . 477366) (SK.EXPANDFN 477368 . 477645) (SK.INPUT 477647 . 478028) (SK.INSIDEFN 
+478030 . 478670) (SK.UPDATEFN 478672 . 479283)) (484857 488802 (SK.CHECK.SKETCH.VERSION 484867 . 
+486107) (SK.INSURE.RECORD.LENGTH 486109 . 487592) (SK.INSURE.HAS.LENGTH 487594 . 488332) (
+SK.RECORD.LENGTH 488334 . 488508) (SK.SET.RECORD.LENGTHS 488510 . 488800)) (489543 490430 (
+SK.ADD.EDIT.COMMAND.TO.FILE.BROWSER 489553 . 490428)))))
 STOP

library/SPY

@@ -1,22 +1,22 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED "29-Apr-94 14:13:52" {DSK}<king>export>lispcore>library>SPY.;4
 64372  
 
-      changes to%:  (FILES GRAPHER)
-                    (FNS SPY.GRAPH.EDITOR SPY.UPDATE.TITLE SPY.MERGEINFO SPY.MAKEGRAPHNODES SPY.MAX 
-                         SPY.MERGE SPY.MERGE1 SPY.MERGETREE SPY.NEXT.TREE SPY.SUM SPY.MAKE.TREE 
-                         SPY.DELETE SPY.DUMP.BUFFER SPY.ORIGINAL SPY.MERGE.CALLEES)
+
(FILECREATED " 4-Jan-2022 14:09:48" {DSK}<Users>kaplan>Local>medley3.5>my-medley>library>SPY.;2
 63314  
 
-      previous date%: "28-Apr-94 15:56:32" {DSK}<king>export>lispcore>library>SPY.;3)
+      :CHANGES-TO (VARS SPYCOMS)
+                  (FNS SPY.MAKE.TREE)
+
+      :PREVIOUS-DATE "29-Apr-94 14:13:52" {DSK}<Users>kaplan>Local>medley3.5>my-medley>library>SPY.;1
+)
 
 
 (* ; "
-Copyright (c) 1984, 1985, 1987, 1988, 1990, 1991, 1993, 1994 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1984-1985, 1987-1988, 1990-1991, 1993-1994 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT SPYCOMS)
 
-(RPAQQ SPYCOMS
 
-       ((VARS SPY.BORDERS SPY.BUFFER.SIZE SPY.FRAGMENTS SPY.NOMERGEFNS SPY.MERGEINFO (SPY.HASH)
+(RPAQQ SPYCOMS

+       [(VARS SPY.BORDERS SPY.BUFFER.SIZE SPY.FRAGMENTS SPY.NOMERGEFNS SPY.MERGEINFO (SPY.HASH)
               (SPY.GRAPH.MENU)
               SPY.SHOW.PERCENTAGES SPY.SMALLGHOSTS SPY.ICON)
         (INITVARS (SPY.NEXT 0)
@@ -42,38 +42,41 @@ Copyright (c) 1984, 1985, 1987, 1988, 1990, 1991, 1993, 1994 by Venue & Xerox Co
         (MACROS WITH-SPY WITH.SPY)
         (DECLARE%: DONTCOPY (RECORDS SPYRECORD SPYDATA))
         (INITRECORDS SPYRECORD)
-        (DECLARE%: DOCOPY DOEVAL@COMPILE (FILES GRAPHER READNUMBER IMAGEOBJ))))
+        (DECLARE%: DOCOPY DOEVAL@COMPILE (FILES GRAPHER READNUMBER IMAGEOBJ))
+        (P (MOVD? 'NILL 'MODERNWINDOW])
 
-(RPAQQ SPY.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)))
+(RPAQQ SPY.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)))
 
 (RPAQQ SPY.BUFFER.SIZE
 5120)
 
 (RPAQQ SPY.FRAGMENTS
 T)
 
-(RPAQQ SPY.NOMERGEFNS
 (SI::*UNWIND-PROTECT* CL:EVAL \EVAL-PROGN \INTERPRET-ARGUMENTS \INTERPRETER
-                                 \INTERPRETER1 ERRORSET \EVAL \EVALFORM APPLY \PROGV EVAL))
+(RPAQQ SPY.NOMERGEFNS
 (SI::*UNWIND-PROTECT* CL:EVAL \EVAL-PROGN \INTERPRET-ARGUMENTS \INTERPRETER 
+                             \INTERPRETER1 ERRORSET \EVAL \EVALFORM APPLY \PROGV EVAL))
 
-(RPAQQ SPY.MERGEINFO
 ((EXEC :EXEC)
-                          (EXEC-READ-LINE :EXEC)
-                          (EXEC-READ :EXEC)
-                          (XCL-USER::LEX-DO-EVENT :EXEC)
-                          (DO-EVENT :EXEC)
-                          (EVAL-INPUT :EXEC)
-                          (SI::*UNWIND-PROTECT* :ANY)
-                          (\MAKE.PROCESS0 T)
-                          (\PROC.REPEATEDLYEVALQT T)
-                          (\EVALFORM T :EVAL)
-                          (PROGN PROGN :EVAL T)
-                          (TTYIN1 TTYIN)
-                          (TTBIN TTYIN)
-                          (TTWAITFORINPUT TTYIN)
-                          (\PROGV :ANY)))
+(RPAQQ SPY.MERGEINFO

+       ((EXEC :EXEC)
+        (EXEC-READ-LINE :EXEC)
+        (EXEC-READ :EXEC)
+        (XCL-USER::LEX-DO-EVENT :EXEC)
+        (DO-EVENT :EXEC)
+        (EVAL-INPUT :EXEC)
+        (SI::*UNWIND-PROTECT* :ANY)
+        (\MAKE.PROCESS0 T)
+        (\PROC.REPEATEDLYEVALQT T)
+        (\EVALFORM T :EVAL)
+        (PROGN PROGN :EVAL T)
+        (TTYIN1 TTYIN)
+        (TTBIN TTYIN)
+        (TTWAITFORINPUT TTYIN)
+        (\PROGV :ANY)))
 
 (RPAQQ SPY.HASH
 NIL)
 
@@ -102,19 +105,19 @@ Copyright (c) 1984, 1985, 1987, 1988, 1990, 1991, 1993, 1994 by Venue & Xerox Co
 
 (RPAQ? SPY.TREE
 )
 
-(RPAQQ SPYOBJCOMS
 ((FNS SPYOBJ SPYOBJ.BUTTON SPYOBJ.SAVE SPYOBJ.COPY SPYOBJ.GET SPYOBJ.IMAGEBOX 
-                            SPYOBJ.DISPLAY SPYOBJ.LABEL SPYOBJ.HEIGHT SPYOBJ.COPYIN SPY.COPYBUTTON 
-                            SPY.MERGEINFO)
-                       [VARS (SPYOBJ.IMAGEFNS (IMAGEFNSCREATE (FUNCTION SPYOBJ.DISPLAY)
-                                                     (FUNCTION SPYOBJ.IMAGEBOX)
-                                                     (FUNCTION SPYOBJ.SAVE)
-                                                     (FUNCTION SPYOBJ.GET)
-                                                     (FUNCTION SPYOBJ.COPY)
-                                                     (FUNCTION SPYOBJ.BUTTON)
-                                                     (FUNCTION SPYOBJ.COPYIN)
-                                                     NIL NIL NIL NIL NIL NIL 'SPYNODE]
-                       (DECLARE%: DONTCOPY DOEVAL@COMPILE (RECORDS FX SPYOBJDATA))
-                       (INITRECORDS SPYOBJDATA)))
+(RPAQQ SPYOBJCOMS

+       ((FNS SPYOBJ SPYOBJ.BUTTON SPYOBJ.SAVE SPYOBJ.COPY SPYOBJ.GET SPYOBJ.IMAGEBOX SPYOBJ.DISPLAY 
+             SPYOBJ.LABEL SPYOBJ.HEIGHT SPYOBJ.COPYIN SPY.COPYBUTTON SPY.MERGEINFO)
+        [VARS (SPYOBJ.IMAGEFNS (IMAGEFNSCREATE (FUNCTION SPYOBJ.DISPLAY)
+                                      (FUNCTION SPYOBJ.IMAGEBOX)
+                                      (FUNCTION SPYOBJ.SAVE)
+                                      (FUNCTION SPYOBJ.GET)
+                                      (FUNCTION SPYOBJ.COPY)
+                                      (FUNCTION SPYOBJ.BUTTON)
+                                      (FUNCTION SPYOBJ.COPYIN)
+                                      NIL NIL NIL NIL NIL NIL 'SPYNODE]
+        (DECLARE%: DONTCOPY DOEVAL@COMPILE (RECORDS FX SPYOBJDATA))
+        (INITRECORDS SPYOBJDATA)))
 (DEFINEQ
 
 (SPYOBJ

@@ -176,148 +179,145 @@ Copyright (c) 1984, 1985, 1987, 1988, 1990, 1991, 1993, 1994 by Venue & Xerox Co
             then
 '(:INTERPRETER CL:EVAL])
 )
 
-(RPAQ SPYOBJ.IMAGEFNS
 (IMAGEFNSCREATE (FUNCTION SPYOBJ.DISPLAY)
-                                 (FUNCTION SPYOBJ.IMAGEBOX)
-                                 (FUNCTION SPYOBJ.SAVE)
-                                 (FUNCTION SPYOBJ.GET)
-                                 (FUNCTION SPYOBJ.COPY)
-                                 (FUNCTION SPYOBJ.BUTTON)
-                                 (FUNCTION SPYOBJ.COPYIN)
-                                 NIL NIL NIL NIL NIL NIL 'SPYNODE))
+(RPAQ SPYOBJ.IMAGEFNS

+      (IMAGEFNSCREATE (FUNCTION SPYOBJ.DISPLAY)
+             (FUNCTION SPYOBJ.IMAGEBOX)
+             (FUNCTION SPYOBJ.SAVE)
+             (FUNCTION SPYOBJ.GET)
+             (FUNCTION SPYOBJ.COPY)
+             (FUNCTION SPYOBJ.BUTTON)
+             (FUNCTION SPYOBJ.COPYIN)
+             NIL NIL NIL NIL NIL NIL 'SPYNODE))
 (DECLARE%: DONTCOPY DOEVAL@COMPILE 
 (DECLARE%: EVAL@COMPILE
 
-(ACCESSFNS FX
 ((FXBLOCK (ADDSTACKBASE DATUM)))           (* ; "frame extension index")

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

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

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

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

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

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

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

-                                        (NIL FULLXPOINTER 2)
-                                        (NAMETABHI WORD)
-                                        (NAMETABLO WORD)))
-                  (TYPE?
 (IEQ (fetch
 (FX FLAGS) of
 DATUM)
-                                  \STK.FX))
-                  [ACCESSFNS FX ((NAMETABLE (COND
-                                               ((fetch
 (FX VALIDNAMETABLE) of
 DATUM)
-                                                (fetch
 (FX NAMETABLE#) of
 DATUM))
-                                               (T (fetch
 (FX FNHEADER) of
 DATUM)))
-                                        (PROGN (replace
 (FX FAST) of
 DATUM with
 NIL)
-                                               (replace
 (FX NAMETABLE#) of
 DATUM with

-                                                                                         NEWVALUE)
-                                               (replace
 (FX VALIDNAMETABLE) of
 DATUM
-                                                  with
 T)))
-                                 (FRAMENAME (fetch
 (FNHEADER FRAMENAME)
-                                               of
 (fetch
 (FX NAMETABLE) of
 DATUM)))
-                                 (INVALIDP (EQ DATUM 0))     (* ; 
-
                                   "true when A/CLink points at nobody, i.e. FX is bottom of stack")

-                                 [FASTP (NOT (fetch
 (FX SLOWP) of
 DATUM))
-                                        (PROGN (CHECK (NULL NEWVALUE))
-                                               (COND
-                                                  ((fetch
 (FX FASTP) of
 DATUM)
-                                                   (replace
 (FX %#BLINK) of
 DATUM
-                                                      with
 (fetch
 (FX DUMMYBF) of
 DATUM))
-                                                   (replace
 (FX %#CLINK) of
 DATUM
-                                                      with
 (fetch
 (FX %#ALINK) of
 DATUM))
-                                                   (replace
 (FX SLOWP) of
 DATUM with

-                                                                                        T]
-                                 [BLINK (COND
-                                           ((fetch
 (FX FASTP) of
 DATUM)
-                                            (fetch
 (FX DUMMYBF) of
 DATUM))
-                                           (T (fetch
 (FX %#BLINK) of
 DATUM)))
-                                        (PROGN (replace
 (FX %#BLINK) of
 DATUM with
 
-                                                                                            NEWVALUE)
-                                               (COND
-                                                  ((fetch
 (FX FASTP) of
 DATUM)
-                                                   (replace
 (FX %#CLINK) of
 DATUM
-                                                      with
 (fetch
 (FX %#ALINK) of
 DATUM))
-                                                   (replace
 (FX SLOWP) of
 DATUM with

-                                                                                        T]
-                                 [CLINK (IDIFFERENCE (COND
-                                                        ((fetch
 (FX FASTP) of
 DATUM)
-                                                         (fetch
 (FX %#ALINK) of
 DATUM))
-                                                        (T (fetch
 (FX %#CLINK) of
 DATUM)))
-                                               \#ALINK.OFFSET)
-                                        (PROGN (replace
 (FX %#CLINK) of
 DATUM
-                                                  with
 (IPLUS NEWVALUE \#ALINK.OFFSET))
-                                               (COND
-                                                  ((fetch
 (FX FASTP) of
 DATUM)
-                                                   (replace
 (FX %#BLINK) of
 DATUM
-                                                      with
 (fetch
 (FX DUMMYBF) of
 DATUM))
-                                                   (replace
 (FX SLOWP) of
 DATUM with

-                                                                                        T]
-                                 [ALINK (IDIFFERENCE (FLOOR (fetch
 (FX %#ALINK) of
 DATUM)
-                                                            WORDSPERCELL)
-                                               \#ALINK.OFFSET)
-                                        (PROGN [COND
-                                                  ((fetch
 (FX FASTP) of
 DATUM)
-                                                   (replace
 (FX %#BLINK) of
 DATUM
-                                                      with
 (fetch
 (FX DUMMYBF) of
 DATUM))
-                                                   (replace
 (FX %#CLINK) of
 DATUM
-                                                      with
 (fetch
 (FX %#ALINK) of
 DATUM]
-                                               (replace
 (FX %#ALINK) of
 DATUM
-                                                  with
 (IPLUS NEWVALUE \#ALINK.OFFSET
-                                                                  (SUB1 WORDSPERCELL]
-                                 [ACLINK (SHOULDNT)
-                                        (PROGN [COND
-                                                  ((fetch
 (FX FASTP) of
 DATUM)
-                                                   (replace
 (FX %#BLINK) of
 DATUM
-                                                      with
 (fetch
 (FX DUMMYBF) of
 DATUM]
+(ACCESSFNS FX
 ((FXBLOCK (ADDSTACKBASE DATUM)))               (* ; "frame extension index")

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

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

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

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

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

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

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

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

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

-                                 (DUMMYBF (IDIFFERENCE DATUM WORDSPERCELL))
+
                                      "replaces A & C Links at once more efficiently than separately")

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

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

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

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

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

-                                 (FIRSTTEMP (IPLUS (fetch
 (FX FIRSTPVAR) of
 DATUM)
-                                                   (fetch
 (FX NPVARWORDS) of
 DATUM)
-                                                   (fetch
 (FX PADDING) of
 DATUM)))
+                             (FXSIZE (PROGN 10))             (* ; 
+
                                                             "fixed overhead from flags thru clink")

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

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

-                                 (SIZE (IDIFFERENCE (fetch
 (FX NEXTBLOCK) of
 DATUM)
-                                              DATUM])
+
                                                 "note that NPVARWORDS is obtained from the FNHEADER")

+                             (SIZE (IDIFFERENCE (fetch
 (FX NEXTBLOCK) of
 DATUM)
+                                          DATUM])
 
 (RECORD SPYOBJDATA
 (CACHEDLABEL PERCENT LABEL))
 )
@@ -745,7 +745,9 @@ Copyright (c) 1984, 1985, 1987, 1988, 1990, 1991, 1993, 1994 by Venue & Xerox Co
            ", " TOPCOUNT " samples"])
 
 (SPY.MAKE.TREE

-  [LAMBDA (TREES SPYDATA WINDOW)
                      (* ; "Edited 28-Apr-94 13:59 by sybalsky")

+  [LAMBDA (TREES SPYDATA WINDOW)                             (* ; "Edited  4-Jan-2022 14:08 by rmk")

+                                                             (* ; 
+
                                                             "Edited 28-Apr-94 13:59 by sybalsky")

     (PROG (GRAPH IDS W H THRSH TOPCOUNT (*PACKAGE* (fetch
 (SPYDATA PACKAGE) of
 SPYDATA))
                  (*READTABLE* (fetch
 (SPYDATA READTABLE) of
 SPYDATA))
                  (*PRINT-CASE* (fetch
 (SPYDATA PRINT-CASE) of
 SPYDATA)))
@@ -755,8 +757,7 @@ Copyright (c) 1984, 1985, 1987, 1988, 1990, 1991, 1993, 1994 by Venue & Xerox Co
           (SETQ THRSH (QUOTIENT (TIMES TOPCOUNT (fetch
 (SPYDATA THRESHOLD) of
 SPYDATA))
                              100))
           (SETQ SPY.NODES)
-          (SETQ SPY.TOPNODES (for
 X in
 TREES collect
 (SPY.MAKEGRAPHNODES
 X THRSH 
-                                                                        SPYDATA)))
+          (SETQ SPY.TOPNODES (for
 X in
 TREES collect
 (SPY.MAKEGRAPHNODES
 X THRSH SPYDATA)))
           (SETQ TITLE (SPY.TITLE
 (CAR SPY.TOPNODES)
                              TOPCOUNT SPYDATA))
           (SETQ SPY.WINDOW (SHOWGRAPH (LAYOUTGRAPH (REVERSE SPY.NODES)
@@ -773,7 +774,8 @@ Copyright (c) 1984, 1985, 1987, 1988, 1990, 1991, 1993, 1994 by Venue & Xerox Co
           (WINDOWPROP SPY.WINDOW 'SPYDATA SPYDATA)
           (WINDOWPROP SPY.WINDOW 'TREES TREES)
           (WINDOWPROP SPY.WINDOW 'SPYTITLE TITLE)
-          (WINDOWPROP SPY.WINDOW 'TOPCOUNT TOPCOUNT])
+          (WINDOWPROP SPY.WINDOW 'TOPCOUNT TOPCOUNT)
+          (MODERNWINDOW SPY.WINDOW])
 
 (SPY.UPDATE.TITLE

   [LAMBDA (W)
                                         (* ; "Edited 29-Apr-94 14:03 by sybalsky")

@@ -965,23 +967,23 @@ Copyright (c) 1984, 1985, 1987, 1988, 1990, 1991, 1993, 1994 by Venue & Xerox Co
 )
 (DECLARE%: EVAL@COMPILE 
 
-[PUTPROPS WITH-SPY MACRO ((FORM)
+(PUTPROPS WITH-SPY
 MACRO
 [(FORM)
                           (PROGN (SPY.START
)
-                                 (PROG1 FORM (SPY.END
]
+                                 (PROG1 FORM (SPY.END
])
 
-[PUTPROPS WITH.SPY MACRO ((FORM)
+(PUTPROPS WITH.SPY
 MACRO
 [(FORM)
                           (PROGN (SPY.START
)
-                                 (PROG1 FORM (SPY.END
]
+                                 (PROG1 FORM (SPY.END
])
 )
 (DECLARE%: DONTCOPY 
 (DECLARE%: EVAL@COMPILE
 
 (DATATYPE SPYRECORD
 (NAME COUNT SUM CALLEES STATUS TREEFROM)
-                        STATUS _ 'NORMAL (INIT (DEFPRINT 'SPYRECORD 'SPY.PRINT)))
+                    STATUS _ 'NORMAL (INIT (DEFPRINT 'SPYRECORD 'SPY.PRINT)))
 
-(PROPRECORD SPYDATA
 (DELETED CUMULATIVE MERGETYPE THRESHOLD SPYMENU DEPTH NOGHOSTS PACKAGE 
-                               READTABLE PRINT-CASE MERGEINFO PENDING)
-                        CUMULATIVE _ T)
+(PROPRECORD SPYDATA
 (DELETED CUMULATIVE MERGETYPE THRESHOLD SPYMENU DEPTH NOGHOSTS PACKAGE READTABLE
+                           PRINT-CASE MERGEINFO PENDING)
+                    CUMULATIVE _ T)
 )
 
 (/DECLAREDATATYPE 'SPYRECORD '(POINTER POINTER POINTER POINTER POINTER POINTER)
@@ -1010,19 +1012,21 @@ Copyright (c) 1984, 1985, 1987, 1988, 1990, 1991, 1993, 1994 by Venue & Xerox Co
 
 (FILESLOAD GRAPHER READNUMBER IMAGEOBJ)
 )
+
+(MOVD? 'NILL 'MODERNWINDOW)
 (PUTPROPS SPY COPYRIGHT ("Venue & Xerox Corporation" 1984 1985 1987 1988 1990 1991 1993 1994))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (5474 8081 (SPYOBJ 5484 . 5773) (SPYOBJ.BUTTON 5775 . 5885) (SPYOBJ.SAVE 5887 . 6006) (
-SPYOBJ.COPY 6008 . 6070) (SPYOBJ.GET 6072 . 6201) (SPYOBJ.IMAGEBOX 6203 . 6727) (SPYOBJ.DISPLAY 6729
- . 7028) (SPYOBJ.LABEL 7030 . 7166) (SPYOBJ.HEIGHT 7168 . 7381) (SPYOBJ.COPYIN 7383 . 7426) (
-SPY.COPYBUTTON 7428 . 7520) (SPY.MERGEINFO 7522 . 8079)) (19431 60601 (SPY.FIND.TREE 19441 . 19850) (
-SPY.TOGGLE 19852 . 20042) (SPY.TREE 20044 . 21156) (SPY.LEGEND 21158 . 21508) (SPY.GRAPH.EDITOR 21510
- . 31075) (SPY.END 31077 . 31319) (SPY.MAKEGRAPHNODES 31321 . 33421) (SPY.MAX 33423 . 34306) (
-SPY.MERGE 34308 . 35739) (SPY.MERGE1 35741 . 42224) (SPY.MERGETREE 42226 . 45156) (SPY.NEXT.TREE 45158
- . 45832) (SPY.SUM 45834 . 46523) (SPY.TITLE 46525 . 46742) (SPY.MAKE.TREE 46744 . 48632) (
-SPY.UPDATE.TITLE 48634 . 51210) (SPY.DELETE 51212 . 51747) (SPY.DRAWBOX 51749 . 52274) (
-SPY.BUFFER.ENTRY 52276 . 52514) (SPY.BUTTON 52516 . 53085) (SPY.END.ENTRY 53087 . 53167) (SPY.START 
-53169 . 53453) (SPY.INIT 53455 . 53690) (\SPY.INTERRUPT 53692 . 54328) (SPY.DUMP.BUFFER 54330 . 55790)
- (SPY.START.ENTRY 55792 . 55920) (SPY.ADD.ENTRY 55922 . 56304) (SPY.ORIGINAL 56306 . 57133) (
-SPY.OVERFLOW 57135 . 57236) (SPY.MERGE.CALLEES 57238 . 60274) (SPY.PRINT 60276 . 60599)))))
+  (FILEMAP (NIL (4753 7360 (SPYOBJ 4763 . 5052) (SPYOBJ.BUTTON 5054 . 5164) (SPYOBJ.SAVE 5166 . 5285) (
+SPYOBJ.COPY 5287 . 5349) (SPYOBJ.GET 5351 . 5480) (SPYOBJ.IMAGEBOX 5482 . 6006) (SPYOBJ.DISPLAY 6008
+ . 6307) (SPYOBJ.LABEL 6309 . 6445) (SPYOBJ.HEIGHT 6447 . 6660) (SPYOBJ.COPYIN 6662 . 6705) (
+SPY.COPYBUTTON 6707 . 6799) (SPY.MERGEINFO 6801 . 7358)) (18202 59509 (SPY.FIND.TREE 18212 . 18621) (
+SPY.TOGGLE 18623 . 18813) (SPY.TREE 18815 . 19927) (SPY.LEGEND 19929 . 20279) (SPY.GRAPH.EDITOR 20281
+ . 29846) (SPY.END 29848 . 30090) (SPY.MAKEGRAPHNODES 30092 . 32192) (SPY.MAX 32194 . 33077) (
+SPY.MERGE 33079 . 34510) (SPY.MERGE1 34512 . 40995) (SPY.MERGETREE 40997 . 43927) (SPY.NEXT.TREE 43929
+ . 44603) (SPY.SUM 44605 . 45294) (SPY.TITLE 45296 . 45513) (SPY.MAKE.TREE 45515 . 47540) (
+SPY.UPDATE.TITLE 47542 . 50118) (SPY.DELETE 50120 . 50655) (SPY.DRAWBOX 50657 . 51182) (
+SPY.BUFFER.ENTRY 51184 . 51422) (SPY.BUTTON 51424 . 51993) (SPY.END.ENTRY 51995 . 52075) (SPY.START 
+52077 . 52361) (SPY.INIT 52363 . 52598) (\SPY.INTERRUPT 52600 . 53236) (SPY.DUMP.BUFFER 53238 . 54698)
+ (SPY.START.ENTRY 54700 . 54828) (SPY.ADD.ENTRY 54830 . 55212) (SPY.ORIGINAL 55214 . 56041) (
+SPY.OVERFLOW 56043 . 56144) (SPY.MERGE.CALLEES 56146 . 59182) (SPY.PRINT 59184 . 59507)))))
 STOP

library/TEDIT

@@ -1,12 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "13-Oct-2021 10:00:40" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDIT.;19
 142287 
+
(FILECREATED "30-Dec-2021 20:50:54" {DSK}<Users>kaplan>Local>medley3.5>my-medley>library>TEDIT.;30
 142870 
 
-      changes to%:  (FNS TEDIT-SEE)
+      :CHANGES-TO (FNS TEDIT TEDIT-SEE)
 
-      previous date%: "11-Oct-2021 14:03:12" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDIT.;18)
+      :PREVIOUS-DATE "28-Dec-2021 11:02:43" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>TEDIT.;24)
 
 
 (* ; "
@@ -27,9 +26,9 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
               (TEDIT.STARTUP.MONITORLOCK (CREATE.MONITORLOCK 'TEDIT.STARTUP))
               (TEDIT.RESTART.MENU (\CREATE.TEDIT.RESTART.MENU))
                                                              (* ; 
-
                                            "Original was (CREATE MENU ITEMS _ '(NewEditProcess)).")

+
                                              "Original was (CREATE MENU ITEMS _ '(NewEditProcess)).")

                                                              (* ; 
-
                                                  "Changed by yabu.fx, for SUNLOADUP without DWIM.")

+
                                                    "Changed by yabu.fx, for SUNLOADUP without DWIM.")

               )
         (GLOBALVARS TEDIT.TENTATIVE TEDIT.DEFAULT.PROPS)
         (FNS \TEDIT2 COERCETEXTOBJ TEDIT TEDIT-SEE TEDIT.CHARWIDTH TEDIT.COPY TEDIT.DELETE 
@@ -40,10 +39,10 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
              \TEDIT.FOREIGN.COPY? \TEDIT.QUIT \TEDIT.WORDDELETE \TEDIT1)
         (P (MOVD? 'NILL 'OBJECTOUTOFTEDIT))
                                                              (* ; 
-
                                  "HOOK for looked-string copy, etc. Used in \TEDIT.FOREIGN.COPY?.")

+
                                    "HOOK for looked-string copy, etc. Used in \TEDIT.FOREIGN.COPY?.")

         (COMS (FNS \CREATE.TEDIT.RESTART.MENU))
                                                              (* ; 
-
                                                    "Added by yabu.fx, for SUNLOADUP without DWIM.")

+
                                                      "Added by yabu.fx, for SUNLOADUP without DWIM.")

         (COMS                                                (* ; "Debugging functions")

               (FNS PLCHAIN PRINTLINE SEEFILE))
         (COMS                                                (* ; "Object-oriented editing")

@@ -56,10 +55,10 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
               (VARS TEDITSYSTEMDATE (TEDITSUPPORT "TEditSupport.PA"))
               (FNS MAKETEDITFORM)
               (P (ADDTOVAR LAFITESPECIALFORMS
 ("TEdit Report" 'MAKETEDITFORM 
-                                                         "Report a problem with TEdit"))
+                                                     "Report a problem with TEdit"))
                  (SETQ LAFITEFORMSMENU NIL)))
         (COMS                                                (* ; 
-
                         "LISTFILES Interface, so the system can decide if a file is a TEdit file.")

+
                           "LISTFILES Interface, so the system can decide if a file is a TEdit file.")

               (ADDVARS (PRINTFILETYPES (TEDIT (TEST \TEDIT.FORMATTEDP1)
                                               (EXTENSION (TEDIT])
 
@@ -251,21 +250,29 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
                       NIL])
 
 (TEDIT

-  [LAMBDA (TEXT WINDOW DONTSPAWN PROPS)
                  (* ; "Edited 11-Jun-99 14:14 by rmk:")


-                                                             (* ; "Edited 11-Jun-99 14:13 by rmk:")


-                                                             (* ; "Edited 11-Jun-99 14:08 by rmk:")


-                                                             (* ; "Edited  3-Jun-88 14:27 by jds")

+  [LAMBDA (TEXT WINDOW DONTSPAWN PROPS)                      (* ; "Edited 30-Dec-2021 20:50 by rmk")

+                                                             (* ; "Edited 28-Dec-2021 00:12 by rmk")

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

+                                                             (* ; "Edited 11-Jun-99 14:14 by rmk:")

+                                                             (* ; "Edited  3-Jun-88 14:27 by jds")

 
-    (* ;; "User entry to the text editor.  Takes an optional window to be used for editing")

+    (* ;; "User entry to the text editor.  Takes an optional window to be used for editing")

 
-    (* ;; "DONTSPAWN => Don't try to create a new process for this edit.")

+    (* ;; "DONTSPAWN => Don't try to create a new process for this edit.")

 
-    (PROG (PROC TEDITCREATEDWINDOW)                          (* ; 
-
                                                      "Include the default properties in the list.")

+    (PROG (PROC TEDITCREATEDWINDOW)                          (* ; 
+
                                                        "Include the default properties in the list.")

           [COND
-             ((AND TEXT (ATOM TEXT))                         (* ; 
-
                                      "Make sure the file exists before trying to open the window.")

+             ((AND TEXT (ATOM TEXT))                         (* ; 
+
                                        "Make sure the file exists before trying to open the window.")

               (SETQ TEXT (OPENFILE TEXT 'INPUT 'OLD '((TYPE TEXT]
+          (CL:WHEN (AND WINDOW (OR (LITATOM WINDOW)
+                                   (REGIONP WINDOW)))
+
+              (* ;; "Pass specified and typed regions to TEDIT.CREATEW")

+
+              (PUSH
 PROPS 'REGION-TYPE WINDOW)
+              (SETQ WINDOW NIL))
           (RESETLST
               [RESETSAVE NIL `(AND ,WINDOW (WINDOWPROP ,WINDOW 'TEXTOBJ NIL]
               (WITH.MONITOR TEDIT.STARTUP.MONITORLOCK
@@ -273,7 +280,8 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
                      ((NOT WINDOW)
                       (SETQ TEDITCREATEDWINDOW T)
                       (SETQ WINDOW (COND
-                                      [(OR (NOT TEDIT.DEFAULT.WINDOW)
+                                      [(OR (LISTGET PROPS 'REGION-TYPE)
+                                           (NOT TEDIT.DEFAULT.WINDOW)
                                            (\TEDIT.ACTIVE.WINDOWP TEDIT.DEFAULT.WINDOW))
                                        (TEDIT.CREATEW (COND
                                                          ((AND TEXT (ATOM TEXT))
@@ -289,28 +297,27 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
                                                                             'REGION)
                                                 TEXT
                                                 (APPEND PROPS (COPY TEDIT.DEFAULT.PROPS)))
-                                                             (* ; "Replace the old title")

+                                                             (* ; "Replace the old title")

                                          TEDIT.DEFAULT.WINDOW)))
 
-                      (* ;; 
-
               "Mark the newly-created window reserved until the OPENTEXTSTREAM has done its work.")

+                      (* ;; 
+
                 "Mark the newly-created window reserved until the OPENTEXTSTREAM has done its work.")

 
-                      (* ;; 
-
                    "mark that we created the window so that we know we can update the title, etc.")

+                      (* ;; 
+
                      "mark that we created the window so that we know we can update the title, etc.")

 
                       (WINDOWPROP WINDOW 'TEXTOBJ T)))))
           [SETQ TEXT (OPENTEXTSTREAM TEXT WINDOW NIL NIL (APPEND PROPS '(BEING-EDITED T]
-                                                             (* ; 
-
                                                           "Connect the editor to the window")

+                                                             (* ; "Connect the editor to the window")

           (replace
 (TEXTOBJ
 TXTEDITING) of
 (TEXTOBJ
 TEXT) with
 T)
-                                                             (* ; "For the moment, mark the document as actively in edit. (so caret flashes when the window is first brought up.)")

+                                                             (* ; "For the moment, mark the document as actively in edit. (so caret flashes when the window is first brought up.)")

           [COND
              (TEDITCREATEDWINDOW (TEXTPROP TEXT 'TEDITCREATEDWINDOW 'T]
           (COND
-             (DONTSPAWN                                      (* ; 
-
                                   "Either no processes running, or specifically not to spawn one.")

+             (DONTSPAWN                                      (* ; 
+
                                     "Either no processes running, or specifically not to spawn one.")

                     (RETURN (\TEDIT2
 TEXT WINDOW T)))
-             (T                                              (* ; "Spawn a process to do the edit.")

+             (T                                              (* ; "Spawn a process to do the edit.")

                 [SETQ PROC (ADD.PROCESS (LIST '\TEDIT2 (KWOTE TEXT)
                                               WINDOW NIL)
                                   'NAME
@@ -324,14 +331,16 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
                 (PROCESSPROP PROC 'WINDOW WINDOW)
                 (COND
                    ((NOT (LISTGET (APPEND PROPS (COPY TEDIT.DEFAULT.PROPS))
-                                'LEAVETTY))                  (* ; 
-
                            "Unless he asked us to leave the tty where it is, TEdit should get it.")

+                                'LEAVETTY))                  (* ; 
+
                              "Unless he asked us to leave the tty where it is, TEdit should get it.")

                     (TTY.PROCESS PROC)))
                 (RETURN PROC])
 
 (TEDIT-SEE

-  [LAMBDA (FILE WINDOW FORMAT)
                          (* ; "Edited 13-Oct-2021 10:00 by rmk:")


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


+  [LAMBDA (FILE WINDOW FORMAT TITLE)                         (* ; "Edited 30-Dec-2021 18:03 by rmk")

+                                                             (* ; "Edited 16-Dec-2021 12:33 by rmk")

+                                                             (* ; "Edited 13-Oct-2021 10:00 by rmk:")

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

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

 
     (* ;; "See FILE in a scrollable READONLY TEDIT window.  If FILE is a LISP source file, copy first to a temporary NODIRCORE image file that interpretes the fontchange characters rather than showing black boxes.")

@@ -347,29 +356,27 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
                 (IF
 (\TEDIT.FORMATTEDP1 STREAM)
                   ELSEIF
 (LISPSOURCEFILEP STREAM)
                     THEN
 
+                         (* ;; "Lisp source file")

 
-                          (* ;; "Lisp source file")

-
-                          (SETQ SEESTREAM (OPENTEXTSTREAM))
-                          (DSPFONT DEFAULTFONT SEESTREAM)
-                          (COPY.TEXT.TO.IMAGE STREAM SEESTREAM)
+                         (SETQ SEESTREAM (OPENTEXTSTREAM))
+                         (DSPFONT DEFAULTFONT SEESTREAM)
+                         (COPY.TEXT.TO.IMAGE STREAM SEESTREAM)
                   ELSE
 
+                       (* ;; "Not a Lisp source file and not a Tedit file.  If it is not random access, we copy it so we can scroll around.")

 
-                        (* ;; "Not a Lisp source file and not a Tedit file.  If it is not random access, we copy it so we can scroll around.")

+                       (* ;; "Maybe there is a conventional way of finding out the external format of a plain-text stream (an EMACS header?), here we nudge towards :UTF-8 (if it exists).")

 
-                        (* ;; "Maybe there is a conventional way of finding out the external format of a plain-text stream (an EMACS header?), here we nudge towards :UTF-8 (if it exists).")

-
-                        (SETFILEINFO STREAM 'FORMAT (OR FORMAT (FIND-FORMAT :UTF-8)
-                                                        :DEFAULT))
-                        (CL:UNLESS (RANDACCESSP STREAM)
-                            (SETQ SEESTREAM (OPENSTREAM '{NODIRCORE} 'BOTH 'NEW))
-                            (COPYCHARS STREAM SEESTREAM)))
+                       (SETFILEINFO STREAM 'FORMAT (OR FORMAT (FIND-FORMAT :UTF-8)
+                                                       :DEFAULT))
+                       (CL:UNLESS (RANDACCESSP STREAM)
+                           (SETQ SEESTREAM (OPENSTREAM '{NODIRCORE} 'BOTH 'NEW))
+                           (COPYCHARS STREAM SEESTREAM)))
                 [SETQ TSTREAM (TEXTSTREAM
 (TEDIT
 SEESTREAM WINDOW NIL
-                                                     `(READONLY T FONT ,DEFAULTFONT]
-                (WINDOWPROP (WFROMDS TSTREAM)
+                                                 `(READONLY T LEAVETTY T FONT ,DEFAULTFONT]
+                [WINDOWPROP (WFROMDS TSTREAM)
                        'TITLE
-                       (CONCAT "SEE window for " (FULLNAME STREAM)))
-                (FULLNAME STREAM])
+                       (OR TITLE (CONCAT "SEE window for " (FULLNAME STREAM]
+                TSTREAM])
 
 (TEDIT.CHARWIDTH

   [LAMBDA (CH FONT TERMSA)
                                   (* jds "22-OCT-83 19:32")

@@ -2236,7 +2243,7 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
 (* ; "TEDIT Support information")

 
 
-(RPAQQ TEDITSYSTEMDATE
 "13-Oct-2021 10:00:40")
+(RPAQQ TEDITSYSTEMDATE
 "30-Dec-2021 20:50:54")
 
 (RPAQ TEDITSUPPORT
 "TEditSupport.PA")
 (DEFINEQ
@@ -2258,23 +2265,23 @@ Copyright (c) 1983-1993, 1995, 1999, 2018, 2021 by Venue & Xerox Corporation.
 
 
 (ADDTOVAR PRINTFILETYPES
 (TEDIT (TEST \TEDIT.FORMATTEDP1)
-                                    (EXTENSION (TEDIT))))
+                                (EXTENSION (TEDIT))))
 (PUTPROPS TEDIT COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 1991 
 1992 1993 1995 1999 2018 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (4330 117453 (\TEDIT2 4340 . 7091) (COERCETEXTOBJ 7093 . 15869) (TEDIT 15871 . 20840) (
-TEDIT-SEE 20842 . 23129) (TEDIT.CHARWIDTH 23131 . 25155) (TEDIT.COPY 25157 . 33593) (TEDIT.DELETE 
-33595 . 34285) (TEDIT.DO.BLUEPENDINGDELETE 34287 . 37354) (TEDIT.INSERT 37356 . 42886) (TEDIT.KILL 
-42888 . 44445) (TEDIT.MAPLINES 44447 . 45846) (TEDIT.MAPPIECES 45848 . 46804) (TEDIT.MOVE 46806 . 
-56590) (TEDIT.QUIT 56592 . 58592) (TEDIT.STRINGWIDTH 58594 . 59265) (TEDIT.\INSERT 59267 . 61292) (
-TEXTOBJ 61294 . 62419) (TEXTSTREAM 62421 . 64036) (\TEDIT.INCLUDE 64038 . 67938) (\TEDIT.INSERT.PIECES
- 67940 . 77855) (\TEDIT.MOVE.PIECEMAPFN 77857 . 79936) (\TEDIT.OBJECT.SHOWSEL 79938 . 83567) (
-\TEDIT.RESTARTFN 83569 . 85564) (\TEDIT.CHARDELETE 85566 . 89528) (\TEDIT.COPY.PIECEMAPFN 89530 . 
-92755) (\TEDIT.DELETE 92757 . 100275) (\TEDIT.DIFFUSE.PARALOOKS 100277 . 103041) (\TEDIT.FOREIGN.COPY?
- 103043 . 106770) (\TEDIT.QUIT 106772 . 109918) (\TEDIT.WORDDELETE 109920 . 114753) (\TEDIT1 114755 . 
-117451)) (117567 117683 (\CREATE.TEDIT.RESTART.MENU 117577 . 117681)) (117782 121471 (PLCHAIN 117792
- . 118066) (PRINTLINE 118068 . 120832) (SEEFILE 120834 . 121469)) (121512 141155 (TEDIT.INSERT.OBJECT 
-121522 . 130599) (TEDIT.EDIT.OBJECT 130601 . 132857) (TEDIT.FIND.OBJECT 132859 . 133752) (
-TEDIT.FIND.OBJECT.SUBTREE 133754 . 134560) (TEDIT.PUT.OBJECT 134562 . 136221) (TEDIT.GET.OBJECT 136223
- . 139422) (TEDIT.OBJECT.CHANGED 139424 . 141153)) (141433 141796 (MAKETEDITFORM 141443 . 141794)))))
+  (FILEMAP (NIL (4336 118040 (\TEDIT2 4346 . 7097) (COERCETEXTOBJ 7099 . 15875) (TEDIT 15877 . 21230) (
+TEDIT-SEE 21232 . 23716) (TEDIT.CHARWIDTH 23718 . 25742) (TEDIT.COPY 25744 . 34180) (TEDIT.DELETE 
+34182 . 34872) (TEDIT.DO.BLUEPENDINGDELETE 34874 . 37941) (TEDIT.INSERT 37943 . 43473) (TEDIT.KILL 
+43475 . 45032) (TEDIT.MAPLINES 45034 . 46433) (TEDIT.MAPPIECES 46435 . 47391) (TEDIT.MOVE 47393 . 
+57177) (TEDIT.QUIT 57179 . 59179) (TEDIT.STRINGWIDTH 59181 . 59852) (TEDIT.\INSERT 59854 . 61879) (
+TEXTOBJ 61881 . 63006) (TEXTSTREAM 63008 . 64623) (\TEDIT.INCLUDE 64625 . 68525) (\TEDIT.INSERT.PIECES
+ 68527 . 78442) (\TEDIT.MOVE.PIECEMAPFN 78444 . 80523) (\TEDIT.OBJECT.SHOWSEL 80525 . 84154) (
+\TEDIT.RESTARTFN 84156 . 86151) (\TEDIT.CHARDELETE 86153 . 90115) (\TEDIT.COPY.PIECEMAPFN 90117 . 
+93342) (\TEDIT.DELETE 93344 . 100862) (\TEDIT.DIFFUSE.PARALOOKS 100864 . 103628) (\TEDIT.FOREIGN.COPY?
+ 103630 . 107357) (\TEDIT.QUIT 107359 . 110505) (\TEDIT.WORDDELETE 110507 . 115340) (\TEDIT1 115342 . 
+118038)) (118154 118270 (\CREATE.TEDIT.RESTART.MENU 118164 . 118268)) (118369 122058 (PLCHAIN 118379
+ . 118653) (PRINTLINE 118655 . 121419) (SEEFILE 121421 . 122056)) (122099 141742 (TEDIT.INSERT.OBJECT 
+122109 . 131186) (TEDIT.EDIT.OBJECT 131188 . 133444) (TEDIT.FIND.OBJECT 133446 . 134339) (
+TEDIT.FIND.OBJECT.SUBTREE 134341 . 135147) (TEDIT.PUT.OBJECT 135149 . 136808) (TEDIT.GET.OBJECT 136810
+ . 140009) (TEDIT.OBJECT.CHANGED 140011 . 141740)) (142020 142383 (MAKETEDITFORM 142030 . 142381)))))
 STOP

library/TEDITHCPY

@@ -1,12 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED "21-Sep-2021 15:33:24" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITHCPY.;10
 106458 
 
-      changes to%:  (FNS TEDIT.HARDCOPYFN)
-                    (VARS TEDITHCPYCOMS)
+
(FILECREATED "26-Jan-2022 23:03:27" {DSK}<Users>kaplan>Local>medley3.5>my-medley>library>TEDITHCPY.;15
 106802 
 
-      previous date%: "21-Sep-2021 12:54:04" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITHCPY.;7)
+      :CHANGES-TO (VARS TEDITHCPYCOMS)
+
+      :PREVIOUS-DATE "27-Sep-2021 23:28:48" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>TEDITHCPY.;14)
 
 
 (* ; "
@@ -35,18 +34,18 @@ Copyright (c) 1983-1994, 2021 by Venue & Xerox Corporation.
 
               (VARS (TEDIT.DEFAULTPAGEREGION (CREATEREGION 2794 1905 16256 23495)))
                                                              (* ; 
-
                                                           "0.75 inches from bottom, 1 from top")

-              )
+
                                                             "0.75 inches from bottom, 1 from top")
)
         [COMS 
               (* ;; "Support for the window-menu's HARDCOPY button, LISTFILES, etc.")

 
               (FNS TEDIT.HARDCOPYFN \TEDIT.HARDCOPY \TEDIT.PRESS.HARDCOPY)
-              (P (LISTPUT (ASSOC 'CONVERSION (ASSOC 'INTERPRESS PRINTFILETYPES))
-                        'TEDIT
-                        (FUNCTION \TEDIT.HARDCOPY)))
+              [P (LET [(IPVALUES (ASSOC 'CONVERSION (ASSOC 'INTERPRESS PRINTFILETYPES]
+                      (COND (IPVALUES                        (* ; 
+
                                          "Only install INTERPRESS printing if INTERPRESS is loaded.")

+                                   (LISTPUT IPVALUES 'TEDIT (FUNCTION \TEDIT.HARDCOPY]
               (P (LET [(PRESSVALUES (ASSOC 'CONVERSION (ASSOC 'PRESS PRINTFILETYPES]
                       (COND (PRESSVALUES                     (* ; 
-
                                                  "Only install PRESS printing if PRESS is loaded.")

+
                                                    "Only install PRESS printing if PRESS is loaded.")

                                    (LISTPUT PRESSVALUES 'TEDIT (FUNCTION \TEDIT.PRESS.HARDCOPY]
         [COMS 
               (* ;; "vars for Japanese Line Break")

@@ -1568,14 +1567,16 @@ Copyright (c) 1983-1994, 2021 by Venue & Xerox Corporation.
         PFILE)])
 )
 
-(LISTPUT (ASSOC 'CONVERSION (ASSOC 'INTERPRESS PRINTFILETYPES))
-       'TEDIT
-       (FUNCTION \TEDIT.HARDCOPY))
+[LET [(IPVALUES (ASSOC 'CONVERSION (ASSOC 'INTERPRESS PRINTFILETYPES]
+     (COND
+        (IPVALUES                                            (* ; 
+
                                          "Only install INTERPRESS printing if INTERPRESS is loaded.")

+               (LISTPUT IPVALUES 'TEDIT (FUNCTION \TEDIT.HARDCOPY]
 
 [LET [(PRESSVALUES (ASSOC 'CONVERSION (ASSOC 'PRESS PRINTFILETYPES]
      (COND
         (PRESSVALUES                                         (* ; 
-
                                                  "Only install PRESS printing if PRESS is loaded.")

+
                                                    "Only install PRESS printing if PRESS is loaded.")

                (LISTPUT PRESSVALUES 'TEDIT (FUNCTION \TEDIT.PRESS.HARDCOPY]
 
 
@@ -1616,11 +1617,11 @@ Copyright (c) 1983-1994, 2021 by Venue & Xerox Corporation.
 (PUTPROPS TEDITHCPY COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 
 1991 1992 1993 1994 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3655 100373 (TEDIT.HARDCOPY 3665 . 4916) (TEDIT.HCPYFILE 4918 . 6992) (
-\TEDIT.HARDCOPY.DISPLAYLINE 6994 . 21139) (\TEDIT.HARDCOPY.FORMATLINE 21141 . 68463) (
-\DOFORMATTING.HARDCOPY 68465 . 81758) (\TEDIT.HARDCOPY.MODIFYLOOKS 81760 . 84167) (
-\TEDIT.HCPYLOOKS.UPDATE 84169 . 94777) (\TEDIT.HCPYFMTSPEC 94779 . 99799) (\TEDIT.INTEGER.IMAGEBOX 
-99801 . 100371)) (100462 101546 (\TEDIT.SCALE 100472 . 100766) (\TEDIT.SCALEREGION 100768 . 101544)) (
-101789 104340 (TEDIT.HARDCOPYFN 101799 . 102704) (\TEDIT.HARDCOPY 102706 . 103615) (
-\TEDIT.PRESS.HARDCOPY 103617 . 104338)) (105405 106308 (TEDIT-BOOK 105415 . 106306)))))
+  (FILEMAP (NIL (3784 100502 (TEDIT.HARDCOPY 3794 . 5045) (TEDIT.HCPYFILE 5047 . 7121) (
+\TEDIT.HARDCOPY.DISPLAYLINE 7123 . 21268) (\TEDIT.HARDCOPY.FORMATLINE 21270 . 68592) (
+\DOFORMATTING.HARDCOPY 68594 . 81887) (\TEDIT.HARDCOPY.MODIFYLOOKS 81889 . 84296) (
+\TEDIT.HCPYLOOKS.UPDATE 84298 . 94906) (\TEDIT.HCPYFMTSPEC 94908 . 99928) (\TEDIT.INTEGER.IMAGEBOX 
+99930 . 100500)) (100591 101675 (\TEDIT.SCALE 100601 . 100895) (\TEDIT.SCALEREGION 100897 . 101673)) (
+101918 104469 (TEDIT.HARDCOPYFN 101928 . 102833) (\TEDIT.HARDCOPY 102835 . 103744) (
+\TEDIT.PRESS.HARDCOPY 103746 . 104467)) (105749 106652 (TEDIT-BOOK 105759 . 106650)))))
 STOP

library/TEDITMENU

@@ -1,11 +1,11 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED "29-Apr-2021 22:44:22" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITMENU.;5
 275764 
 
-      changes to%:  (FNS \TEDIT.MENU.INIT)
+
(FILECREATED "31-Jan-2022 22:54:59" {DSK}<Users>kaplan>Local>medley3.5>my-medley>library>TEDITMENU.;3
 275091 
 
-      previous date%: "29-Apr-2021 22:40:33" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITMENU.;4)
+      :CHANGES-TO (FNS \TEXTMENU.DOC.CREATE)
+
+      :PREVIOUS-DATE "26-Oct-2021 08:44:02" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>TEDITMENU.;2)
 
 
 (* ; "
@@ -19,7 +19,7 @@ Copyright (c) 1983-1995, 2021 by Venue & Xerox Corporation.
         (DECLARE%: EVAL@COMPILE DONTCOPY (CONSTANTS (\SCRATCHLEN 64))
                (FILES (LOADCOMP)
                       TEDITDCL))
-        [COMS                                                (* ; "Simple Menu Button support")

+        [COMS                                                (* ; "Simple Menu Button support")

               (FNS MB.BUTTONEVENTINFN MB.DISPLAY MB.SETIMAGE MB.SELFN MB.SIZEFN MB.WHENOPERATEDFN 
                    MB.COPYFN MB.GETFN MB.PUTFN MB.SHOWSELFN MBUTTON.CREATE MBUTTON.CHANGENAME 
                    MBUTTON.FIND.BUTTON MBUTTON.FIND.NEXT.BUTTON MBUTTON.FIND.NEXT.FIELD MBUTTON.INIT
@@ -31,13 +31,13 @@ Copyright (c) 1983-1995, 2021 by Venue & Xerox Corporation.
               (DECLARE%: DONTEVAL@LOAD DOCOPY (P (MBUTTON.INIT))
                      (ADDVARS (IMAGEOBJTYPES (TEditMenuButton FILE TEDITMENU GETFN MB.GETFN]
         [COMS 
-              (* ;; 
-
            "Three-state (ON-OFF-NEUTRAL) menu buttons, for, e.g., character properties like BOLD")

+              (* ;; 
+
              "Three-state (ON-OFF-NEUTRAL) menu buttons, for, e.g., character properties like BOLD")

 
               (FNS MB.CREATE.THREESTATEBUTTON MB.THREESTATE.DISPLAY MB.THREESTATE.SHOWSELFN 
                    MB.THREESTATE.WHENOPERATEDFN MB.THREESTATEBUTTON.FN THREESTATE.INIT)
               (DECLARE%: DONTEVAL@LOAD DOCOPY (P (THREESTATE.INIT]
-        [COMS                                                (* ; "One-of-N Menu button sets")

+        [COMS                                                (* ; "One-of-N Menu button sets")

               (FNS MB.CREATE.NWAYBUTTON MB.NB.DISPLAYFN MB.NB.WHENOPERATEDFN MB.NB.SIZEFN 
                    MB.NWAYBUTTON.SELFN MB.NWAYMENU.NEWBUTTON NWAYBUTTON.INIT MB.NB.PACKITEMS 
                    MB.NWAYBUTTON.ADDITEM)
@@ -45,7 +45,7 @@ Copyright (c) 1983-1995, 2021 by Venue & Xerox Corporation.
               (DECLARE%: DONTEVAL@LOAD DOCOPY (P (NWAYBUTTON.INIT))
                      (ADDVARS (IMAGEOBJTYPES (NWayButton FILE TEDITMENU GETFN MB.GETFN]
         [COMS 
-              (* ;; "Two-state, toggling menu buttons.")

+              (* ;; "Two-state, toggling menu buttons.")

 
               (FNS \TEXTMENU.TOGGLE.CREATE \TEXTMENU.TOGGLE.DISPLAY \TEXTMENU.TOGGLE.SHOWSELFN 
                    \TEXTMENU.TOGGLE.WHENOPERATEDFN \TEXTMENU.TOGGLEFN \TEXTMENU.TOGGLE.INIT 
@@ -54,7 +54,7 @@ Copyright (c) 1983-1995, 2021 by Venue & Xerox Corporation.
               (DECLARE%: DONTEVAL@LOAD DOCOPY (P (\TEXTMENU.TOGGLE.INIT))
                      (ADDVARS (IMAGEOBJTYPES (ToggleButton FILE TEDITMENU GETFN MB.GETFN]
         [COMS 
-              (* ;; "Margin Setting and display")

+              (* ;; "Margin Setting and display")

 
               (FNS DRAWMARGINSCALE MARGINBAR MARGINBAR.CREATE MB.MARGINBAR.SELFN MB.MARGINBAR.SIZEFN
                    MB.MARGINBAR.DISPLAYFN MDESCALE MSCALE MB.MARGINBAR.SHOWTAB MB.MARGINBAR.TABTRACK
@@ -66,11 +66,11 @@ Copyright (c) 1983-1995, 2021 by Venue & Xerox Corporation.
               (DECLARE%: DONTEVAL@LOAD DOCOPY (P (MARGINBAR.INIT))
                      (ADDVARS (IMAGEOBJTYPES (MarginRuler FILE TEDITMENU GETFN MB.GETFN]
         (COMS 
-              (* ;; "Text menu creation and support")

+              (* ;; "Text menu creation and support")

 
               (FNS \TEXTMENU.START \TEXTMENU.DOC.CREATE TEXTMENU.CLOSEFN)
               (BITMAPS TEXTMENUICON TEXTMENUICONMASK))
-        [COMS                                                (* ; "TEdit-specific support")

+        [COMS                                                (* ; "TEdit-specific support")

               (FNS \TEDITMENU.CREATE \TEDIT.EXPANDED.MENU MB.DEFAULTBUTTON.FN 
                    \TEDITMENU.RECORD.UNFORMATTED MB.DEFAULTBUTTON.ACTIONFN)
               (FNS \TEDIT.CHARLOOKSMENU.CREATE \TEDIT.EXPANDEDCHARLOOKS.MENU \TEDIT.APPLY.BOLDNESS 
@@ -82,7 +82,7 @@ Copyright (c) 1983-1995, 2021 by Venue & Xerox Corporation.
                    \TEDIT.SHOW.PARALOOKS \TEDIT.NEUTRALIZE.PARALOOKS.MENU \TEDIT.RECORD.TABLEADERS)
               (FNS \TEDIT.SHOW.PAGEFORMATTING \TEDITPAGEMENU.CREATE \TEDIT.APPLY.PAGEFORMATTING 
                    TEDIT.UNPARSE.PAGEFORMAT)
-              (COMS                                          (* ; "Initialization Code")

+              (COMS                                          (* ; "Initialization Code")

                     (GLOBALVARS TEDIT.EXPANDED.MENU TEDIT.EXPANDEDPARA.MENU TEDIT.CHARLOOKS.MENU 
                            TEDIT.MENUDIVIDER.SPEC TEDIT.EXPANDEDMENU.SPEC TEDIT.CHARLOOKSMENU.SPEC 
                            TEDIT.PARAMENU.SPEC TEDIT.PAGEMENU.SPEC TEDIT.EXPANDED.PAGEMENU)
@@ -2067,11 +2067,14 @@ Copyright (c) 1983-1995, 2021 by Venue & Xerox Corporation.
 (DEFINEQ
 
 (\TEXTMENU.START

-  [LAMBDA (MENU MAINWINDOW TITLE HEIGHT)
      (* ; 
+  [LAMBDA (MENU MAINWINDOW TITLE HEIGHT)
                (* ; "Edited 26-Oct-2021 08:43 by rmk:")


+                                                  (* ; 
 
                                                "Edited  4-Jun-93 11:59 by sybalsky:mv:envos")

 
     (* ;; "Create a TEdit-based menu for a given main window.")

 
+    (* ;; "RMK: Add MAX/MINSIZE so menus don't grow vertically when the main window is reshaped.  Not sure why HEIGHT is passed in or defaults to 133, but either way, the original window height should persist")

+
     (PROG ([WREG (COND
                     (MAINWINDOW (WINDOWPROP MAINWINDOW 'REGION))
                     (T (GETREGION]
@@ -2104,6 +2107,9 @@ Copyright (c) 1983-1995, 2021 by Venue & Xerox Corporation.
                                                              (* ; 
 
                                                           "Mark this as a TEDIT MENU window")

           (ATTACHWINDOW MENUW MAINWINDOW 'TOP 'JUSTIFY 'LOCALCLOSE)
+          [SETQ HEIGHT (FETCH
 (REGION HEIGHT) OF
 (WINDOWPROP MENUW 'REGION]
+          (WINDOWPROP MENUW 'MAXSIZE (CONS 64000 HEIGHT))
+          (WINDOWPROP MENUW 'MINSIZE (CONS 0 HEIGHT))
           (SETQ MENUTEXT MENU)
           (replace
 (TEXTOBJ MENUFLG) of
 (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
              with
 T)
@@ -2116,155 +2122,141 @@ Copyright (c) 1983-1995, 2021 by Venue & Xerox Corporation.
           (AND MAINWINDOW (TTY.PROCESS (WINDOWPROP MAINWINDOW 'PROCESS])
 
 (\TEXTMENU.DOC.CREATE

-  [LAMBDA (MENUDESC MENUPROPS)
                          (* ; "Edited 12-Jun-90 19:00 by mitani")

+  [LAMBDA (MENUDESC MENUPROPS)
                               (* ; "Edited 31-Jan-2022 22:48 by rmk")


+                                                            (* ; "Edited 12-Jun-90 19:00 by mitani")

 
-         (* Create the TEXTSTREAM for a menu, given a description.
-
       That stream is passed to \TEXTMENU.START to get the menu up on screen)

+         (* Create the TEXTSTREAM for a menu, given a description.
+
         That stream is passed to \TEXTMENU.START to get the menu up on screen)

 
     (PROG ((CH#1 NIL)
            MENUW MENUTEXT)
-          [SETQ MENUTEXT (OPENTEXTSTREAM "" NIL NIL NIL (OR MENUPROPS '(FONT (MODERN 10]
+          [SETQ MENUTEXT (OPENTEXTSTREAM NIL NIL NIL NIL (OR MENUPROPS '(FONT (MODERN 10]
           (bind
 (CH# _ 1)
-                 OBJ for
 DESC in
 MENUDESC
+                OBJ for
 DESC in
 MENUDESC
              do
 (SELECTQ (CAR DESC)
-                        (*                                   (* This is a comment within a menu 
-
                                                           description -- Ignore it.)
)
-                        (MB.BUTTON                           (* A menu button --
-
                                                           hitting it calls a function)

-                                   (TEDIT.INSERT.OBJECT (MBUTTON.CREATE

-                                                         (MKATOM (fetch
 (MB.BUTTON MBLABEL)
-                                                                    of
 DESC))
-                                                         (fetch
 (MB.BUTTON MBBUTTONEVENTFN)
-                                                            of
 DESC)
-                                                         (fetch
 (MB.BUTTON MBFONT) of
 DESC))
-                                          MENUTEXT CH#)
-                                   (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
-                                          '(PROTECTED OFF)
-                                          CH# 1)
-                                   (add
 CH# 1))
-                        (MB.3STATE                           (* 3-state button;
-
                                                           hitting it changes state among ON, 
-
                                                           OFF, and NEUTRAL.)

-                                   (TEDIT.INSERT.OBJECT (MB.CREATE.THREESTATEBUTTON

-                                                         (MKATOM (fetch
 (MB.3STATE MBLABEL)
-                                                                    of
 DESC))
-                                                         (fetch
 (MB.3STATE MBFONT) of
 DESC)
-                                                         (fetch
 (MB.3STATE MBCHANGESTATEFN)
-                                                            of
 DESC)
-                                                         (fetch
 (MB.3STATE MBINITSTATE)
-                                                            of
 DESC))
-                                          MENUTEXT CH#)
-                                   (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
-                                          '(PROTECTED OFF)
-                                          CH# 1)
-                                   (add
 CH# 1))
-                        (MB.TOGGLE                           (* TOGGLE button; hitting it 
-
                                                           switches between ON and OFF.)

-                                   (TEDIT.INSERT.OBJECT (\TEXTMENU.TOGGLE.CREATE

-                                                         (MKATOM (fetch
 (MB.TOGGLE MBTEXT)
-                                                                    of
 DESC))
-                                                         (fetch
 (MB.TOGGLE MBFONT) of
 DESC)
-                                                         (fetch
 (MB.TOGGLE MBCHANGESTATEFN)
-                                                            of
 DESC)
-                                                         (fetch
 (MB.TOGGLE MBINITSTATE)
-                                                            of
 DESC))
-                                          MENUTEXT CH#)
-                                   (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
-                                          '(PROTECTED OFF)
-                                          CH# 1)
-                                   (add
 CH# 1))
-                        (MB.NWAY                             (* N-way buttons; choosing one turns 
-
                                                           the others off.)

-                                 (SETQ OBJ (MB.CREATE.NWAYBUTTON
 (fetch
 (MB.NWAY MBBUTTONS)
-                                                                        of
 DESC)
-                                                  (fetch
 (MB.NWAY MBFONT) of
 DESC)
-                                                  (fetch
 (MB.NWAY MBCHANGESTATEFN) of
 DESC)
-                                                  (fetch
 (MB.NWAY MBINITSTATE) of
 DESC)
-                                                  (fetch
 (MB.NWAY MBMAXITEMSPERLINE) of

-                                                                                         DESC)))
-                                 (TEDIT.INSERT.OBJECT OBJ MENUTEXT CH#)
-                                 (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
-                                        '(PROTECTED OFF)
-                                        CH# 1)
-                                 (add
 CH# 1))
-                        (MENU                                (* Real menu, except the selection 
-
                                                           sticks)

-                              (TEDIT.INSERT.OBJECT (MB.CREATE.FULLMENU (CADR DESC))
-                                     MENUTEXT CH#)
-                              (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
-                                     '(PROTECTED OFF)
-                                     CH# 1)
-                              (add
 CH# 1))
-                        (MB.MARGINBAR                        (* Margin ruler for TEdit formatting)

-                                      (TEDIT.INSERT.OBJECT (MARGINBAR.CREATE
 -0.5 -0.5 -39.5 NIL
-                                                                  12)
-                                             MENUTEXT CH#)
-                                      (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
-                                             '(PROTECTED OFF)
-                                             CH# 1)
-                                      (add
 CH# 1))
-                        (MB.TEXT                             (* Arbitrary text, which will be 
-
                                                           protected from the user.)

-                                 (TEDIT.INSERT MENUTEXT (fetch
 (MB.TEXT MBSTRING) of
 DESC)
-                                        CH#)
-                                 [AND (fetch
 (MB.TEXT MBFONT) of
 DESC)
-                                      (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
-                                             (LIST 'MBFONT (fetch
 (MB.TEXT MBFONT) of
 DESC))
-                                             CH#
-                                             (NCHARS (fetch
 (MB.TEXT MBSTRING) of
 DESC]
-                                 (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
-                                        '(PROTECTED ON)
-                                        CH#
-                                        (NCHARS (fetch
 (MB.TEXT MBSTRING) of
 DESC)))
-                                 (add
 CH# (NCHARS (fetch
 (MB.TEXT MBSTRING) of
 DESC))))
-                        (MB.INSERT                           (* An insertion point, with optional 
-
                                                           text to put there)

-                                   (TEDIT.INSERT MENUTEXT "  {}" CH#)
-                                   (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
-                                          '(PROTECTED ON)
-                                          CH# 4)
-                                   (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
-                                          '(PROTECTED ON SELECTPOINT ON)
-                                          (IPLUS CH# 2)
-                                          1)
-                                   (OR CH#1 (SETQ CH#1 (IPLUS CH# 3)))
-                                   [COND
-                                      ((fetch
 (MB.INSERT MBINITENTRY) of
 DESC)
-                                                             (* There is an initial entry to be 
-
                                                           made. Make it)

-                                       [COND
-                                          ((IMAGEOBJP (fetch
 (MB.INSERT MBINITENTRY) of

-                                                                                         DESC))
-                                                             (* It is an imageobj.)

-                                           (TEDIT.INSERT.OBJECT (fetch
 (MB.INSERT MBINITENTRY)
-                                                                   of
 DESC)
-                                                  MENUTEXT
-                                                  (IPLUS CH# 3)))
-                                          (T                 (* It's regular text.)

-                                             (TEDIT.INSERT MENUTEXT (MKSTRING (fetch
 (MB.INSERT
-                                                                                          MBINITENTRY
+                    (*                                       (* This is a comment within a menu 
+
                                                             description -- Ignore it.)
)
+                    (MB.BUTTON                               (* A menu button -- hitting it calls a 
+
                                                             function)

+                               (TEDIT.INSERT.OBJECT (MBUTTON.CREATE
 (MKATOM (fetch
 (MB.BUTTON MBLABEL
                                                                                           )
-                                                                                 of
 DESC))
-                                                    (IPLUS CH# 3]
-                                       [TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
-                                              '(PROTECTED OFF SELECTPOINT OFF)
-                                              (IPLUS CH# 3)
-                                              (NCHARS (MKSTRING (fetch
 (MB.INSERT MBINITENTRY)
-                                                                   of
 DESC]
-                                       (add
 CH# (NCHARS (fetch
 (MB.INSERT MBINITENTRY)
+                                                                               of
 DESC))
+                                                           (fetch
 (MB.BUTTON MBBUTTONEVENTFN)
+                                                              of
 DESC)
+                                                           (fetch
 (MB.BUTTON MBFONT) of
 DESC))
+                                      MENUTEXT CH#)
+                               (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
+                                      '(PROTECTED OFF)
+                                      CH# 1)
+                               (add
 CH# 1))
+                    (MB.3STATE                               (* 3-state button; hitting it changes 
+
                                                             state among ON, OFF, and NEUTRAL.)

+                               (TEDIT.INSERT.OBJECT (MB.CREATE.THREESTATEBUTTON

+                                                     (MKATOM (fetch
 (MB.3STATE MBLABEL) of
 DESC))
+                                                     (fetch
 (MB.3STATE MBFONT) of
 DESC)
+                                                     (fetch
 (MB.3STATE MBCHANGESTATEFN) of
 DESC)
+                                                     (fetch
 (MB.3STATE MBINITSTATE) of
 DESC))
+                                      MENUTEXT CH#)
+                               (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
+                                      '(PROTECTED OFF)
+                                      CH# 1)
+                               (add
 CH# 1))
+                    (MB.TOGGLE                               (* TOGGLE button; hitting it switches 
+
                                                             between ON and OFF.)

+                               (TEDIT.INSERT.OBJECT (\TEXTMENU.TOGGLE.CREATE

+                                                     (MKATOM (fetch
 (MB.TOGGLE MBTEXT) of
 DESC))
+                                                     (fetch
 (MB.TOGGLE MBFONT) of
 DESC)
+                                                     (fetch
 (MB.TOGGLE MBCHANGESTATEFN) of
 DESC)
+                                                     (fetch
 (MB.TOGGLE MBINITSTATE) of
 DESC))
+                                      MENUTEXT CH#)
+                               (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
+                                      '(PROTECTED OFF)
+                                      CH# 1)
+                               (add
 CH# 1))
+                    (MB.NWAY                                 (* N-way buttons; choosing one turns 
+
                                                             the others off.)

+                             (SETQ OBJ (MB.CREATE.NWAYBUTTON
 (fetch
 (MB.NWAY MBBUTTONS) of
 DESC)
+                                              (fetch
 (MB.NWAY MBFONT) of
 DESC)
+                                              (fetch
 (MB.NWAY MBCHANGESTATEFN) of
 DESC)
+                                              (fetch
 (MB.NWAY MBINITSTATE) of
 DESC)
+                                              (fetch
 (MB.NWAY MBMAXITEMSPERLINE) of
 DESC)))
+                             (TEDIT.INSERT.OBJECT OBJ MENUTEXT CH#)
+                             (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
+                                    '(PROTECTED OFF)
+                                    CH# 1)
+                             (add
 CH# 1))
+                    (MENU                                    (* Real menu, except the selection 
+
                                                             sticks)

+                          (TEDIT.INSERT.OBJECT (MB.CREATE.FULLMENU (CADR DESC))
+                                 MENUTEXT CH#)
+                          (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
+                                 '(PROTECTED OFF)
+                                 CH# 1)
+                          (add
 CH# 1))
+                    (MB.MARGINBAR                            (* Margin ruler for TEdit formatting)

+                                  (TEDIT.INSERT.OBJECT (MARGINBAR.CREATE
 -0.5 -0.5 -39.5 NIL 12)
+                                         MENUTEXT CH#)
+                                  (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
+                                         '(PROTECTED OFF)
+                                         CH# 1)
+                                  (add
 CH# 1))
+                    (MB.TEXT                                 (* Arbitrary text, which will be 
+
                                                             protected from the user.)

+                             (TEDIT.INSERT MENUTEXT (fetch
 (MB.TEXT MBSTRING) of
 DESC)
+                                    CH#)
+                             [AND (fetch
 (MB.TEXT MBFONT) of
 DESC)
+                                  (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
+                                         (LIST 'MBFONT (fetch
 (MB.TEXT MBFONT) of
 DESC))
+                                         CH#
+                                         (NCHARS (fetch
 (MB.TEXT MBSTRING) of
 DESC]
+                             (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
+                                    '(PROTECTED ON)
+                                    CH#
+                                    (NCHARS (fetch
 (MB.TEXT MBSTRING) of
 DESC)))
+                             (add
 CH# (NCHARS (fetch
 (MB.TEXT MBSTRING) of
 DESC))))
+                    (MB.INSERT                               (* An insertion point, with optional 
+
                                                             text to put there)

+                               (TEDIT.INSERT MENUTEXT "  {}" CH#)
+                               (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
+                                      '(PROTECTED ON)
+                                      CH# 4)
+                               (TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
+                                      '(PROTECTED ON SELECTPOINT ON)
+                                      (IPLUS CH# 2)
+                                      1)
+                               (OR CH#1 (SETQ CH#1 (IPLUS CH# 3)))
+                               [COND
+                                  ((fetch
 (MB.INSERT MBINITENTRY) of
 DESC)
+                                                             (* There is an initial entry to be 
+
                                                             made. Make it)

+                                   [COND
+                                      ((IMAGEOBJP (fetch
 (MB.INSERT MBINITENTRY) of
 DESC))
+                                                             (* It is an imageobj.)

+                                       (TEDIT.INSERT.OBJECT (fetch
 (MB.INSERT MBINITENTRY)
+                                                               of
 DESC)
+                                              MENUTEXT
+                                              (IPLUS CH# 3)))
+                                      (T                     (* It's regular text.)

+                                         (TEDIT.INSERT MENUTEXT (MKSTRING (fetch
 (MB.INSERT 
+                                                                                        MBINITENTRY)
+                                                                             of
 DESC))
+                                                (IPLUS CH# 3]
+                                   [TEDIT.LOOKS (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
+                                          '(PROTECTED OFF SELECTPOINT OFF)
+                                          (IPLUS CH# 3)
+                                          (NCHARS (MKSTRING (fetch
 (MB.INSERT MBINITENTRY)
                                                                of
 DESC]
-                                   (add
 CH# 4))
-                        (\ILLEGAL.ARG DESC)))
-          (replace
 (TEXTOBJ MENUFLG) of
 (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT)
-             with
 T)                                     (* Remember that this is a menu)

+                                   (add
 CH# (NCHARS (fetch
 (MB.INSERT MBINITENTRY) of
 DESC]
+                               (add
 CH# 4))
+                    (\ILLEGAL.ARG DESC)))
+          (replace
 (TEXTOBJ MENUFLG) of
 (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT) with
 T)
+                                                             (* Remember that this is a menu)

           [COND
-             (CH#1                                           (* We actually inserted some text, 
-
                                                           so it makes sense to put up a 
-
                                                           selection)

-                   (push
 (fetch
 (TEXTOBJ EDITPROPS) of
 (fetch
 (TEXTSTREAM TEXTOBJ)
-                                                                      of
 MENUTEXT))
-                          (LIST 'SEL CH#1]                   (* And where the first selection 
-
                                                           should be.)

+             (CH#1                                           (* We actually inserted some text, so 
+
                                                             it makes sense to put up a selection)

+                   (push
 (fetch
 (TEXTOBJ EDITPROPS) of
 (fetch
 (TEXTSTREAM TEXTOBJ) of
 MENUTEXT))
+                         (LIST 'SEL CH#1]                    (* And where the first selection 
+
                                                             should be.)

           (RETURN MENUTEXT])
 
 (TEXTMENU.CLOSEFN

@@ -4502,42 +4494,42 @@ Tab Type:  "
 (PUTPROPS TEDITMENU COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 
 1991 1992 1993 1994 1995 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (6266 33108 (MB.BUTTONEVENTINFN 6276 . 7607) (MB.DISPLAY 7609 . 9977) (MB.SETIMAGE 9979
- . 10937) (MB.SELFN 10939 . 12354) (MB.SIZEFN 12356 . 13373) (MB.WHENOPERATEDFN 13375 . 13707) (
-MB.COPYFN 13709 . 14171) (MB.GETFN 14173 . 14781) (MB.PUTFN 14783 . 15560) (MB.SHOWSELFN 15562 . 16534
-) (MBUTTON.CREATE 16536 . 17820) (MBUTTON.CHANGENAME 17822 . 18217) (MBUTTON.FIND.BUTTON 18219 . 19235
-) (MBUTTON.FIND.NEXT.BUTTON 19237 . 20632) (MBUTTON.FIND.NEXT.FIELD 20634 . 24348) (MBUTTON.INIT 24350
- . 25140) (MBUTTON.NEXT.FIELD.AS.NUMBER 25142 . 25495) (MBUTTON.NEXT.FIELD.AS.PIECES 25497 . 25927) (
-MBUTTON.NEXT.FIELD.AS.TEXT 25929 . 26351) (MBUTTON.NEXT.FIELD.AS.ATOM 26353 . 27226) (
-MBUTTON.SET.FIELD 27228 . 29284) (MBUTTON.SET.NEXT.FIELD 29286 . 30503) (MBUTTON.SET.NEXT.BUTTON.STATE
- 30505 . 31001) (TEDITMENU.STREAM 31003 . 31612) (\TEDITMENU.SELSCREENER 31614 . 33106)) (33412 43835 
-(MB.CREATE.THREESTATEBUTTON 33422 . 34593) (MB.THREESTATE.DISPLAY 34595 . 37185) (
-MB.THREESTATE.SHOWSELFN 37187 . 40289) (MB.THREESTATE.WHENOPERATEDFN 40291 . 41670) (
-MB.THREESTATEBUTTON.FN 41672 . 42769) (THREESTATE.INIT 42771 . 43833)) (43936 63172 (
-MB.CREATE.NWAYBUTTON 43946 . 47914) (MB.NB.DISPLAYFN 47916 . 50188) (MB.NB.WHENOPERATEDFN 50190 . 
-51222) (MB.NB.SIZEFN 51224 . 54763) (MB.NWAYBUTTON.SELFN 54765 . 56709) (MB.NWAYMENU.NEWBUTTON 56711
- . 57297) (NWAYBUTTON.INIT 57299 . 58152) (MB.NB.PACKITEMS 58154 . 60151) (MB.NWAYBUTTON.ADDITEM 60153
- . 63170)) (63426 74074 (\TEXTMENU.TOGGLE.CREATE 63436 . 64837) (\TEXTMENU.TOGGLE.DISPLAY 64839 . 
-67191) (\TEXTMENU.TOGGLE.SHOWSELFN 67193 . 69555) (\TEXTMENU.TOGGLE.WHENOPERATEDFN 69557 . 70945) (
-\TEXTMENU.TOGGLEFN 70947 . 72027) (\TEXTMENU.TOGGLE.INIT 72029 . 72864) (\TEXTMENU.SET.TOGGLE 72866 . 
-74072)) (74326 111698 (DRAWMARGINSCALE 74336 . 77880) (MARGINBAR 77882 . 85252) (MARGINBAR.CREATE 
-85254 . 88164) (MB.MARGINBAR.SELFN 88166 . 100760) (MB.MARGINBAR.SIZEFN 100762 . 101124) (
-MB.MARGINBAR.DISPLAYFN 101126 . 103811) (MDESCALE 103813 . 104252) (MSCALE 104254 . 104588) (
-MB.MARGINBAR.SHOWTAB 104590 . 106761) (MB.MARGINBAR.TABTRACK 106763 . 108098) (\TEDIT.TABTYPE.SET 
-108100 . 110807) (MARGINBAR.INIT 110809 . 111696)) (112715 130317 (\TEXTMENU.START 112725 . 115917) (
-\TEXTMENU.DOC.CREATE 115919 . 127443) (TEXTMENU.CLOSEFN 127445 . 130315)) (130627 150691 (
-\TEDITMENU.CREATE 130637 . 130937) (\TEDIT.EXPANDED.MENU 130939 . 131643) (MB.DEFAULTBUTTON.FN 131645
- . 134517) (\TEDITMENU.RECORD.UNFORMATTED 134519 . 134857) (MB.DEFAULTBUTTON.ACTIONFN 134859 . 150689)
-) (150692 178075 (\TEDIT.CHARLOOKSMENU.CREATE 150702 . 152842) (\TEDIT.EXPANDEDCHARLOOKS.MENU 152844
- . 153218) (\TEDIT.APPLY.BOLDNESS 153220 . 153505) (\TEDIT.APPLY.CHARLOOKS 153507 . 155438) (
-\TEDIT.APPLY.OLINE 155440 . 155721) (\TEDIT.SHOW.CHARLOOKS 155723 . 157636) (
-\TEDIT.NEUTRALIZE.CHARLOOKS 157638 . 158564) (\TEDIT.FILL.IN.CHARLOOKS.MENU 158566 . 166219) (
-\TEDIT.NEUTRALIZE.CHARLOOKS.MENU 166221 . 169104) (\TEDIT.PARSE.CHARLOOKS.MENU 169106 . 177214) (
-\TEDIT.APPLY.SLOPE 177216 . 177499) (\TEDIT.APPLY.STRIKEOUT 177501 . 177788) (\TEDIT.APPLY.ULINE 
-177790 . 178073)) (178076 210142 (\TEDITPARAMENU.CREATE 178086 . 178466) (\TEDIT.EXPANDEDPARA.MENU 
-178468 . 178788) (\TEDIT.APPLY.PARALOOKS 178790 . 191020) (\TEDIT.SHOW.PARALOOKS 191022 . 202549) (
-\TEDIT.NEUTRALIZE.PARALOOKS.MENU 202551 . 208622) (\TEDIT.RECORD.TABLEADERS 208624 . 210140)) (210143 
-248145 (\TEDIT.SHOW.PAGEFORMATTING 210153 . 226693) (\TEDITPAGEMENU.CREATE 226695 . 227738) (
-\TEDIT.APPLY.PAGEFORMATTING 227740 . 240111) (TEDIT.UNPARSE.PAGEFORMAT 240113 . 248143)) (248450 
-275299 (\TEDIT.MENU.INIT 248460 . 275297)))))
+  (FILEMAP (NIL (6267 33109 (MB.BUTTONEVENTINFN 6277 . 7608) (MB.DISPLAY 7610 . 9978) (MB.SETIMAGE 9980
+ . 10938) (MB.SELFN 10940 . 12355) (MB.SIZEFN 12357 . 13374) (MB.WHENOPERATEDFN 13376 . 13708) (
+MB.COPYFN 13710 . 14172) (MB.GETFN 14174 . 14782) (MB.PUTFN 14784 . 15561) (MB.SHOWSELFN 15563 . 16535
+) (MBUTTON.CREATE 16537 . 17821) (MBUTTON.CHANGENAME 17823 . 18218) (MBUTTON.FIND.BUTTON 18220 . 19236
+) (MBUTTON.FIND.NEXT.BUTTON 19238 . 20633) (MBUTTON.FIND.NEXT.FIELD 20635 . 24349) (MBUTTON.INIT 24351
+ . 25141) (MBUTTON.NEXT.FIELD.AS.NUMBER 25143 . 25496) (MBUTTON.NEXT.FIELD.AS.PIECES 25498 . 25928) (
+MBUTTON.NEXT.FIELD.AS.TEXT 25930 . 26352) (MBUTTON.NEXT.FIELD.AS.ATOM 26354 . 27227) (
+MBUTTON.SET.FIELD 27229 . 29285) (MBUTTON.SET.NEXT.FIELD 29287 . 30504) (MBUTTON.SET.NEXT.BUTTON.STATE
+ 30506 . 31002) (TEDITMENU.STREAM 31004 . 31613) (\TEDITMENU.SELSCREENER 31615 . 33107)) (33413 43836 
+(MB.CREATE.THREESTATEBUTTON 33423 . 34594) (MB.THREESTATE.DISPLAY 34596 . 37186) (
+MB.THREESTATE.SHOWSELFN 37188 . 40290) (MB.THREESTATE.WHENOPERATEDFN 40292 . 41671) (
+MB.THREESTATEBUTTON.FN 41673 . 42770) (THREESTATE.INIT 42772 . 43834)) (43937 63173 (
+MB.CREATE.NWAYBUTTON 43947 . 47915) (MB.NB.DISPLAYFN 47917 . 50189) (MB.NB.WHENOPERATEDFN 50191 . 
+51223) (MB.NB.SIZEFN 51225 . 54764) (MB.NWAYBUTTON.SELFN 54766 . 56710) (MB.NWAYMENU.NEWBUTTON 56712
+ . 57298) (NWAYBUTTON.INIT 57300 . 58153) (MB.NB.PACKITEMS 58155 . 60152) (MB.NWAYBUTTON.ADDITEM 60154
+ . 63171)) (63427 74075 (\TEXTMENU.TOGGLE.CREATE 63437 . 64838) (\TEXTMENU.TOGGLE.DISPLAY 64840 . 
+67192) (\TEXTMENU.TOGGLE.SHOWSELFN 67194 . 69556) (\TEXTMENU.TOGGLE.WHENOPERATEDFN 69558 . 70946) (
+\TEXTMENU.TOGGLEFN 70948 . 72028) (\TEXTMENU.TOGGLE.INIT 72030 . 72865) (\TEXTMENU.SET.TOGGLE 72867 . 
+74073)) (74327 111699 (DRAWMARGINSCALE 74337 . 77881) (MARGINBAR 77883 . 85253) (MARGINBAR.CREATE 
+85255 . 88165) (MB.MARGINBAR.SELFN 88167 . 100761) (MB.MARGINBAR.SIZEFN 100763 . 101125) (
+MB.MARGINBAR.DISPLAYFN 101127 . 103812) (MDESCALE 103814 . 104253) (MSCALE 104255 . 104589) (
+MB.MARGINBAR.SHOWTAB 104591 . 106762) (MB.MARGINBAR.TABTRACK 106764 . 108099) (\TEDIT.TABTYPE.SET 
+108101 . 110808) (MARGINBAR.INIT 110810 . 111697)) (112716 129644 (\TEXTMENU.START 112726 . 116439) (
+\TEXTMENU.DOC.CREATE 116441 . 126770) (TEXTMENU.CLOSEFN 126772 . 129642)) (129954 150018 (
+\TEDITMENU.CREATE 129964 . 130264) (\TEDIT.EXPANDED.MENU 130266 . 130970) (MB.DEFAULTBUTTON.FN 130972
+ . 133844) (\TEDITMENU.RECORD.UNFORMATTED 133846 . 134184) (MB.DEFAULTBUTTON.ACTIONFN 134186 . 150016)
+) (150019 177402 (\TEDIT.CHARLOOKSMENU.CREATE 150029 . 152169) (\TEDIT.EXPANDEDCHARLOOKS.MENU 152171
+ . 152545) (\TEDIT.APPLY.BOLDNESS 152547 . 152832) (\TEDIT.APPLY.CHARLOOKS 152834 . 154765) (
+\TEDIT.APPLY.OLINE 154767 . 155048) (\TEDIT.SHOW.CHARLOOKS 155050 . 156963) (
+\TEDIT.NEUTRALIZE.CHARLOOKS 156965 . 157891) (\TEDIT.FILL.IN.CHARLOOKS.MENU 157893 . 165546) (
+\TEDIT.NEUTRALIZE.CHARLOOKS.MENU 165548 . 168431) (\TEDIT.PARSE.CHARLOOKS.MENU 168433 . 176541) (
+\TEDIT.APPLY.SLOPE 176543 . 176826) (\TEDIT.APPLY.STRIKEOUT 176828 . 177115) (\TEDIT.APPLY.ULINE 
+177117 . 177400)) (177403 209469 (\TEDITPARAMENU.CREATE 177413 . 177793) (\TEDIT.EXPANDEDPARA.MENU 
+177795 . 178115) (\TEDIT.APPLY.PARALOOKS 178117 . 190347) (\TEDIT.SHOW.PARALOOKS 190349 . 201876) (
+\TEDIT.NEUTRALIZE.PARALOOKS.MENU 201878 . 207949) (\TEDIT.RECORD.TABLEADERS 207951 . 209467)) (209470 
+247472 (\TEDIT.SHOW.PAGEFORMATTING 209480 . 226020) (\TEDITPAGEMENU.CREATE 226022 . 227065) (
+\TEDIT.APPLY.PAGEFORMATTING 227067 . 239438) (TEDIT.UNPARSE.PAGEFORMAT 239440 . 247470)) (247777 
+274626 (\TEDIT.MENU.INIT 247787 . 274624)))))
 STOP

library/TEDITPAGE

@@ -1,19 +1,94 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-
(FILECREATED "25-Aug-94 10:55:28" {DSK}<king>export>lispcore>library>TEDITPAGE.;3
 123769 
 
-      changes to%:  (VARS TEDITPAGECOMS) (FILES TEDITDCL)
+
(FILECREATED "31-Jan-2022 23:33:37" {DSK}<Users>kaplan>Local>medley3.5>my-medley>library>TEDITPAGE.;2
 124691 
 
-      previous date%: " 4-Jul-93 00:42:12" {DSK}<king>export>lispcore>library>TEDITPAGE.;2)
+      :CHANGES-TO (FNS TEDIT.FORMATHEADING TEDIT.FORMATFOLIO)
+
+      :PREVIOUS-DATE "25-Aug-94 10:55:28" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>TEDITPAGE.;1)
 
 
 (* ; "
-Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994 by Venue & Xerox Corporation.  All rights reserved.
+Copyright (c) 1984-1991, 1993-1994 by Venue & Xerox Corporation.
 ")
 
 (PRETTYCOMPRINT TEDITPAGECOMS)
 
-(RPAQQ TEDITPAGECOMS
 ((FILES TEDITDCL) (DECLARE%: EVAL@COMPILE DONTCOPY (CONSTANTS (\SCRATCHLEN 64)) (FILES (LOADCOMP) TEDITDCL)) (COMS (* ;; "Page-numbering font specification/default") (* ;; "(Must come before calls to TEDIT.SINGLE.PAGEFORMAT below.)") (GLOBALVARS TEDIT.DEFAULT.FOLIO.LOOKS) (INITVARS (TEDIT.DEFAULT.FOLIO.LOOKS (\TEDIT.PARSE.CHARLOOKS.LIST (QUOTE (FAMILY MODERN SIZE 10 WEIGHT MEDIUM SLOPE REGULAR))))) (* ;; "If non-nil, TEdit appends the start & end fileptrs for pages here.") (INITVARS (*TEDIT-PAGE-BREAKS* NIL))) (VARS (MAXPAGE# 65535) (MINPAGE# 1) (TEDIT.PAGE.FRAMES (LIST (TEDIT.SINGLE.PAGEFORMAT NIL NIL NIL NIL NIL 72 72 72 72 NIL 1) (TEDIT.SINGLE.PAGEFORMAT T 72 756 NIL (QUOTE LEFT) 72 72 72 72 NIL 1) (TEDIT.SINGLE.PAGEFORMAT T 540 756 NIL (QUOTE RIGHT) 72 72 72 72 NIL 1)))) (COMS (* ;; "Creation, GET, and PUT of page frames.") (FNS TEDIT.GET.PAGEFRAMES TEDIT.PARSE.PAGEFRAMES TEDIT.PUT.PAGEFRAMES TEDIT.UNPARSE.PAGEFRAMES)) (COMS (* ;; "For setting up page layouts") (FNS TEDIT.SINGLE.PAGEFORMAT TEDIT.COMPOUND.PAGEFORMAT TEDIT.PAGEFORMAT)) (COMS (* ;; "Perform page layout, based on a regular expression of typed regions.") (FNS TEDIT.FORMAT.HARDCOPY TEDIT.FORMATBOX TEDIT.FORMATHEADING TEDIT.FORMATPAGE TEDIT.FORMATTEXTBOX TEDIT.FORMATFOLIO \TEDIT.FORMAT.FOUNDBOX? TEDIT.SKIP.SPECIALCOND) (* ;; "Aux function to capture page headings during line formatting:") (FNS TEDIT.HARDCOPY.PAGEHEADING) (* ;; " Aux function to handle end-of-column processing (paragraph keep, widow elimination, etc):") (FNS TEDIT.HARDCOPY-COLUMN-END)) (COMS (* ;; "Handle varying paper sizes") (FNS SCALEPAGEUNITS SCALEPAGEXUNITS SCALEPAGEYUNITS \TEDIT.PAPERHEIGHT \TEDIT.PAPERWIDTH) (GLOBALVARS TEDIT.PAPER.SIZES) (VARS (TEDIT.PAPER.SIZES (QUOTE ((A0 2384 3370) (A1 1684 2384) (A2 1191 1684) (A3 842 1191) (A4 595 842) (A5 420 595) (B0 2835 4008) (B1 2004 2835) (B2 1417 2004) (B3 1001 1417) (B4 709 1001) (B5 499 709)))))) (COMS (* ; "Page numbering option support") (FNS ROMANNUMERALS)) (COMS (* ;; "Foot note support") (FNS \TEDIT.FORMAT.FOOTNOTE)))
-)
+(RPAQQ TEDITPAGECOMS

+       ((FILES TEDITDCL)
+        (DECLARE%: EVAL@COMPILE DONTCOPY (CONSTANTS (\SCRATCHLEN 64))
+               (FILES (LOADCOMP)
+                      TEDITDCL))
+        (COMS 
+              (* ;; "Page-numbering font specification/default")

+
+              
+              (* ;; "(Must come before calls to TEDIT.SINGLE.PAGEFORMAT below.)")

+
+              (GLOBALVARS TEDIT.DEFAULT.FOLIO.LOOKS)
+              [INITVARS (TEDIT.DEFAULT.FOLIO.LOOKS (\TEDIT.PARSE.CHARLOOKS.LIST '(FAMILY MODERN SIZE
+                                                                                        10 WEIGHT 
+                                                                                        MEDIUM SLOPE
+                                                                                        REGULAR]
+              
+              (* ;; "If non-nil, TEdit appends the start & end fileptrs for pages here.")

+
+              (INITVARS (*TEDIT-PAGE-BREAKS* NIL)))
+        [VARS (MAXPAGE# 65535)
+              (MINPAGE# 1)
+              (TEDIT.PAGE.FRAMES (LIST (TEDIT.SINGLE.PAGEFORMAT NIL NIL NIL NIL NIL 72 72 72 72 NIL 1
+                                              )
+                                       (TEDIT.SINGLE.PAGEFORMAT T 72 756 NIL 'LEFT 72 72 72 72 NIL 1)
+                                       (TEDIT.SINGLE.PAGEFORMAT T 540 756 NIL 'RIGHT 72 72 72 72 NIL
+                                              1]
+        (COMS 
+              (* ;; "Creation, GET, and PUT of page frames.")

+
+              (FNS TEDIT.GET.PAGEFRAMES TEDIT.PARSE.PAGEFRAMES TEDIT.PUT.PAGEFRAMES 
+                   TEDIT.UNPARSE.PAGEFRAMES))
+        (COMS 
+              (* ;; "For setting up page layouts")

+
+              (FNS TEDIT.SINGLE.PAGEFORMAT TEDIT.COMPOUND.PAGEFORMAT TEDIT.PAGEFORMAT))
+        (COMS 
+              (* ;; "Perform page layout, based on a regular expression of typed regions.")

+
+              (FNS TEDIT.FORMAT.HARDCOPY TEDIT.FORMATBOX TEDIT.FORMATHEADING TEDIT.FORMATPAGE 
+                   TEDIT.FORMATTEXTBOX TEDIT.FORMATFOLIO \TEDIT.FORMAT.FOUNDBOX? 
+                   TEDIT.SKIP.SPECIALCOND)
+              
+              (* ;; "Aux function to capture page headings during line formatting:")

+
+              (FNS TEDIT.HARDCOPY.PAGEHEADING)
+              
+              (* ;; 
+
         " Aux function to handle end-of-column processing (paragraph keep, widow elimination, etc):")

+
+              (FNS TEDIT.HARDCOPY-COLUMN-END))
+        [COMS 
+              (* ;; "Handle varying paper sizes")

+
+              (FNS SCALEPAGEUNITS SCALEPAGEXUNITS SCALEPAGEYUNITS \TEDIT.PAPERHEIGHT 
+                   \TEDIT.PAPERWIDTH)
+              (GLOBALVARS TEDIT.PAPER.SIZES)
+              (VARS (TEDIT.PAPER.SIZES '((A0 2384 3370)
+                                         (A1 1684 2384)
+                                         (A2 1191 1684)
+                                         (A3 842 1191)
+                                         (A4 595 842)
+                                         (A5 420 595)
+                                         (B0 2835 4008)
+                                         (B1 2004 2835)
+                                         (B2 1417 2004)
+                                         (B3 1001 1417)
+                                         (B4 709 1001)
+                                         (B5 499 709]
+        (COMS                                                (* ; "Page numbering option support")

+              (FNS ROMANNUMERALS))
+        (COMS 
+              (* ;; "Foot note support")

+
+              (FNS \TEDIT.FORMAT.FOOTNOTE))))
 
 (FILESLOAD TEDITDCL)
 (DECLARE%: EVAL@COMPILE DONTCOPY 
@@ -26,7 +101,8 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994 by Venu
 )
 
 
-(FILESLOAD (LOADCOMP) TEDITDCL)
+(FILESLOAD (LOADCOMP)
+       TEDITDCL)
 )
 
 
@@ -43,8 +119,8 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994 by Venu
 (GLOBALVARS TEDIT.DEFAULT.FOLIO.LOOKS)
 )
 
-(RPAQ? TEDIT.DEFAULT.FOLIO.LOOKS
 (\TEDIT.PARSE.CHARLOOKS.LIST (QUOTE (FAMILY MODERN SIZE 10 WEIGHT MEDIUM SLOPE REGULAR)))
-)
+(RPAQ? TEDIT.DEFAULT.FOLIO.LOOKS
 (\TEDIT.PARSE.CHARLOOKS.LIST '(FAMILY MODERN SIZE 10 WEIGHT MEDIUM 
+                                                                      SLOPE REGULAR)))
 
 
 
@@ -57,8 +133,10 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994 by Venu
 
 (RPAQQ MINPAGE#
 1)
 
-(RPAQ TEDIT.PAGE.FRAMES
 (LIST (TEDIT.SINGLE.PAGEFORMAT NIL NIL NIL NIL NIL 72 72 72 72 NIL 1) (TEDIT.SINGLE.PAGEFORMAT T 72 756 NIL (QUOTE LEFT) 72 72 72 72 NIL 1) (TEDIT.SINGLE.PAGEFORMAT T 540 756 NIL (QUOTE RIGHT) 72 72 72 72 NIL 1))
-)
+(RPAQ TEDIT.PAGE.FRAMES

+      (LIST (TEDIT.SINGLE.PAGEFORMAT NIL NIL NIL NIL NIL 72 72 72 72 NIL 1)
+            (TEDIT.SINGLE.PAGEFORMAT T 72 756 NIL 'LEFT 72 72 72 72 NIL 1)
+            (TEDIT.SINGLE.PAGEFORMAT T 540 756 NIL 'RIGHT 72 72 72 72 NIL 1)))
 
 
 
@@ -677,25 +755,26 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994 by Venu
                    (replace
 (PAGEFORMATTINGSTATE CHNO) of
 FORMATTINGSTATE with
 CHNO])
 
 (TEDIT.FORMATHEADING

-  [LAMBDA (TEXTOBJ PRSTREAM FORMATTINGSTATE PAGEREGION)
  (* ; "Edited  9-Oct-90 13:24 by jds")

+  [LAMBDA (TEXTOBJ PRSTREAM FORMATTINGSTATE PAGEREGION)
      (* ; "Edited 31-Jan-2022 23:30 by rmk")


+                                                             (* ; "Edited  9-Oct-90 13:24 by jds")

 
     (* ;; "Grab text from the TEXTOBJ, starting with CH#, and use it to fill REGION on a page.  Return a list of line descriptors which, taken together, fill the region.")

 
     (PROG ((CHNO 1)
            [REGION (for
 VALUE in
 (fetch
 (PAGEREGION REGIONSPEC) of
 PAGEREGION)
                       collect
 (FIXR (FTIMES (DSPSCALE NIL PRSTREAM)
-                                               VALUE]
+                                           VALUE]
            (LOCALINFO (fetch
 (PAGEREGION REGIONLOCALINFO) of
 PAGEREGION))
            HEADINGSTREAM HEADINGTEXTOBJ PRECONDITIONS THISLINE LINE YBOT (FORCENEXTPAGE NIL)
            LINES HEADING)
           [COND
              ((SETQ PRECONDITIONS (LISTGET LOCALINFO 'PRECONDITIONS))
                                                              (* ; 
-
                                 "There are preconditions for this heading to appear.  Check them.")

+
                                   "There are preconditions for this heading to appear.  Check them.")

               (COND
                  ((for
 FORM inside
 PRECONDITIONS thereis
 (NOT (EVAL FORM)))
                                                              (* ; 
-
                               "One of the predicates returned NIL, so don't display this heading.")

+
                                 "One of the predicates returned NIL, so don't display this heading.")

                   (RETURN]
           (COND
              ([NOT (SETQ HEADING (LISTGET (fetch
 (PAGEFORMATTINGSTATE PAGEHEADINGS) of
 
@@ -703,23 +782,20 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994 by Venu
                                                  )
                                         (LISTGET LOCALINFO 'HEADINGTYPE]
                                                              (* ; 
-
                                                         "There's no text for this heading.  Punt.")

+
                                                           "There's no text for this heading.  Punt.")

               (RETURN)))
-          [SETQ HEADINGTEXTOBJ (fetch
 (TEXTSTREAM TEXTOBJ)
-                                  of
 (SETQ HEADINGSTREAM (OPENTEXTSTREAM
-                                                              "" NIL NIL NIL
-                                                              (LIST 'PARALOOKS (fetch

-                                                                                (PIECE PPARALOOKS)
-                                                                                  of
 (CAR HEADING
-                                                                                              ]
+          [SETQ HEADINGTEXTOBJ (fetch
 (TEXTSTREAM TEXTOBJ) of
 (SETQ HEADINGSTREAM
+                                                               (OPENTEXTSTREAM
+                                                                NIL NIL NIL NIL
+                                                                (LIST 'PARALOOKS (fetch
 (PIECE 
+                                                                                           PPARALOOKS
+                                                                                               )
+                                                                                    of
 (CAR HEADING]
           (\TEDIT.INSERT.PIECES HEADINGTEXTOBJ 1 HEADING)
-          (for
 PC in
 HEADING do
 (add
 (fetch
 (TEXTOBJ TEXTLEN) of
 
-                                                                                       HEADINGTEXTOBJ
-                                                            )
-                                                   (fetch
 (PIECE PLEN) of
 PC)))
-          (SETQ LINES (while
 (AND (ILESSP CHNO (fetch
 (TEXTOBJ TEXTLEN) of
 HEADINGTEXTOBJ
-                                                          ))
-                                      (NOT FORCENEXTPAGE))
+          (for
 PC in
 HEADING do
 (add
 (fetch
 (TEXTOBJ TEXTLEN) of
 HEADINGTEXTOBJ)
+                                     (fetch
 (PIECE PLEN) of
 PC)))
+          (SETQ LINES (while
 (AND (ILESSP CHNO (fetch
 (TEXTOBJ TEXTLEN) of
 HEADINGTEXTOBJ))
+                                  (NOT FORCENEXTPAGE))
                          collect
 (SETQ THISLINE (create
 THISLINE))
                                (SETQ FORCENEXTPAGE (\TEDIT.HARDCOPY.FORMATLINE HEADINGTEXTOBJ
                                                           (fetch
 (REGION WIDTH) of
 REGION)
@@ -729,36 +805,31 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994 by Venu
                                                           PRSTREAM T))
                                (replace
 (LINEDESCRIPTOR CACHE) of
 LINE with
 THISLINE) 
                                                              (* ; 
-
                                                      "Mark this line as having cached print info.")

-                               (replace
 (LINEDESCRIPTOR LTEXTOBJ) of
 LINE with
 
-                                                                                        HEADINGSTREAM
-                                      )                      (* ; 
-
                                                          "And remember the document it came from.")

+
                                                        "Mark this line as having cached print info.")

+                               (replace
 (LINEDESCRIPTOR LTEXTOBJ) of
 LINE with
 HEADINGSTREAM) 
+                                                             (* ; 
+
                                                            "And remember the document it came from.")

                                (add
 (fetch
 (LINEDESCRIPTOR LEFTMARGIN) of
 LINE)
-                                      (fetch
 (REGION LEFT) of
 REGION))
+                                    (fetch
 (REGION LEFT) of
 REGION))
                                (add
 (fetch
 (LINEDESCRIPTOR RIGHTMARGIN) of
 LINE)
-                                      (fetch
 (REGION LEFT) of
 REGION)) 
+                                    (fetch
 (REGION LEFT) of
 REGION)) 
                                                              (* ; "Format the next possible line")

                                [COND
                                   [YBOT                      (* ; 
-
                                               "We're into it;  take account of this line's height")

-                                        (SETQ YBOT (IDIFFERENCE YBOT (fetch
 (LINEDESCRIPTOR
-                                                                                 LHEIGHT)
+
                                                 "We're into it;  take account of this line's height")

+                                        (SETQ YBOT (IDIFFERENCE YBOT (fetch
 (LINEDESCRIPTOR LHEIGHT)
                                                                         of
 LINE]
                                   (T                         (* ; 
-
 "Just starting out;  find the line's position with respect to the top of the region to be filled.")

-                                     (SETQ YBOT (IDIFFERENCE (fetch
 (REGION BOTTOM) of
 REGION
-                                                                    )
-                                                       (fetch
 (LINEDESCRIPTOR DESCENT)
-                                                          of
 LINE] 
+
   "Just starting out;  find the line's position with respect to the top of the region to be filled.")

+                                     (SETQ YBOT (IDIFFERENCE (fetch
 (REGION BOTTOM) of
 REGION)
+                                                       (fetch
 (LINEDESCRIPTOR DESCENT) of
 LINE] 
                                                              (* ; "This line is good;  use it.")

                                (replace
 (LINEDESCRIPTOR YBOT) of
 LINE with
 YBOT)
                                (replace
 (LINEDESCRIPTOR YBASE) of
 LINE
-                                  with
 (IPLUS YBOT (fetch
 (LINEDESCRIPTOR DESCENT)
-                                                          of
 LINE)))
+                                  with
 (IPLUS YBOT (fetch
 (LINEDESCRIPTOR DESCENT) of
 LINE)))
                                (SETQ CHNO (ADD1 (fetch
 (LINEDESCRIPTOR CHARLIM) of
 LINE))) 
                                                              (* ; 
-
                                                           "Keep track of the next character...")

+
                                                             "Keep track of the next character...")

                                LINE))
           (RETURN LINES])
 
@@ -1216,13 +1287,14 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994 by Venu
                 FORMATTINGSTATE FINAL-CHNO])
 
 (TEDIT.FORMATFOLIO

-  [LAMBDA (TEXTOBJ PRSTREAM FORMATTINGSTATE REGIONSPEC)
  (* ; "Edited 30-May-91 12:51 by jds")

+  [LAMBDA (TEXTOBJ PRSTREAM FORMATTINGSTATE REGIONSPEC)
      (* ; "Edited 31-Jan-2022 23:33 by rmk")


+                                                             (* ; "Edited 30-May-91 12:51 by jds")

 
     (* ;; "Print a page number (called a %"folio%" in the biz) at the location and with the alignment specified in the REGIONSPEC.")

 
     (PROG ([REGION (for
 VALUE in
 (fetch
 (PAGEREGION REGIONSPEC) of
 REGIONSPEC)
                       collect
 (FIXR (FTIMES (DSPSCALE NIL PRSTREAM)
-                                               VALUE]
+                                           VALUE]
            (FOLIOINFO (fetch
 (PAGEREGION REGIONLOCALINFO) of
 REGIONSPEC))
            (FORCENEXTPAGE NIL)
            (CHNO 1)
@@ -1233,36 +1305,33 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994 by Venu
                               TEDIT.DEFAULT.FOLIO.LOOKS))
           (SETQ NOFIRSTPAGE (LISTGET FOLIOINFO 'NOFIRSTPAGE))
           (SETQ INFOLIST (LISTGET FOLIOINFO 'FORMATINFO))    (* ; 
-
                                                           "A LIST OF (FORMAT PRETEXT POSTTEXT)")

+
                                                             "A LIST OF (FORMAT PRETEXT POSTTEXT)")

           (SETQ FOLIOFORMAT (CAR INFOLIST))
           (SETQ PRETEXT (CADR INFOLIST))
           (SETQ POSTTEXT (CADDR INFOLIST))
           [SETQ PAGE# (COND
                          ((fetch
 (PAGEFORMATTINGSTATE PAGE#TEXT) of
 FORMATTINGSTATE)
-                          (MKSTRING (fetch
 (PAGEFORMATTINGSTATE PAGE#TEXT) of
 FORMATTINGSTATE
-                                           )))
+                          (MKSTRING (fetch
 (PAGEFORMATTINGSTATE PAGE#TEXT) of
 FORMATTINGSTATE)))
                          (T (SELECTQ FOLIOFORMAT
                                 (LOWERROMAN (ROMANNUMERALS
 (fetch
 (PAGEFORMATTINGSTATE PAGE#)
-                                                                  of
 FORMATTINGSTATE)))
+                                                              of
 FORMATTINGSTATE)))
                                 (UPPERROMAN (ROMANNUMERALS
 (fetch
 (PAGEFORMATTINGSTATE PAGE#)
-                                                                  of
 FORMATTINGSTATE)
+                                                              of
 FORMATTINGSTATE)
                                                    T))
-                                (MKSTRING (fetch
 (PAGEFORMATTINGSTATE PAGE#) of
 
-                                                                                      FORMATTINGSTATE
-                                                 ]
+                                (MKSTRING (fetch
 (PAGEFORMATTINGSTATE PAGE#) of
 FORMATTINGSTATE]
           [COND
              (PRETEXT (SETQ PAGE# (CONCAT PRETEXT PAGE#]
           [COND
              (POSTTEXT (SETQ PAGE# (CONCAT PAGE# POSTTEXT]
-          [SETQ FOLIOTEXTOBJ (TEXTOBJ (SETQ FOLIOSTREAM (OPENTEXTSTREAM PAGE# NIL NIL NIL
-                                                               (LIST 'PARALOOKS PARALOOKS
-                                                                     'LOOKS CHARLOOKS]
+          [SETQ FOLIOTEXTOBJ (TEXTOBJ (SETQ FOLIOSTREAM (OPENTEXTSTREAM (OPENSTRINGSTREAM PAGE#)
+                                                               NIL NIL NIL (LIST 'PARALOOKS PARALOOKS
+                                                                                 'LOOKS CHARLOOKS]
           (COND
              ((OR (NOT (fetch
 (PAGEFORMATTINGSTATE FIRSTPAGE) of
 FORMATTINGSTATE))
                   (NOT NOFIRSTPAGE))                         (* ; 
-
     "If this isn't the first page, OR we want a page # on the first page, go ahead and format it.")

+
       "If this isn't the first page, OR we want a page # on the first page, go ahead and format it.")

               (RETURN (while
 (AND (ILEQ CHNO (fetch
 (TEXTOBJ TEXTLEN) of
 FOLIOTEXTOBJ))
-                                      (NOT FORCENEXTPAGE))
+                                  (NOT FORCENEXTPAGE))
                          collect
 (SETQ THISLINE (create
 THISLINE))
                                (SETQ FORCENEXTPAGE (\TEDIT.HARDCOPY.FORMATLINE FOLIOTEXTOBJ
                                                           (fetch
 (REGION WIDTH) of
 REGION)
@@ -1271,41 +1340,36 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994 by Venu
                                                                                           ))
                                                           PRSTREAM))
                                (replace
 (LINEDESCRIPTOR CACHE) of
 LINE with
 THISLINE)
-                               (replace
 (LINEDESCRIPTOR LTEXTOBJ) of
 LINE with
 
-                                                                                        FOLIOSTREAM)
+                               (replace
 (LINEDESCRIPTOR LTEXTOBJ) of
 LINE with
 FOLIOSTREAM)
                                (add
 (fetch
 (LINEDESCRIPTOR LEFTMARGIN) of
 LINE)
-                                      (fetch
 (REGION LEFT) of
 REGION))
+                                    (fetch
 (REGION LEFT) of
 REGION))
                                (add
 (fetch
 (LINEDESCRIPTOR RIGHTMARGIN) of
 LINE)
-                                      (fetch
 (REGION LEFT) of
 REGION)) 
+                                    (fetch
 (REGION LEFT) of
 REGION)) 
                                                              (* ; "Format the next possible line")

                                (SETQ CHNO (ADD1 (fetch
 (LINEDESCRIPTOR CHARLIM) of
 LINE))) 
                                                              (* ; 
-
                                                           "Keep track of the next character...")

+
                                                             "Keep track of the next character...")

                                [COND
                                   [YBOT                      (* ; 
-
                                               "We're into it;  take account of this line's height")

-                                        (SETQ YBOT (IDIFFERENCE YBOT (fetch
 (LINEDESCRIPTOR
-                                                                                 LHEIGHT)
+
                                                 "We're into it;  take account of this line's height")

+                                        (SETQ YBOT (IDIFFERENCE YBOT (fetch
 (LINEDESCRIPTOR LHEIGHT)
                                                                         of
 LINE]
                                   (T                         (* ; 
-
 "Just starting out;  find the line's position with respect to the top of the region to be filled.")

+
   "Just starting out;  find the line's position with respect to the top of the region to be filled.")

                                      (SETQ YBOT (SETQ YBOT (IDIFFERENCE (fetch
 (REGION BOTTOM)
                                                                            of
 REGION)
                                                                   (fetch
 (LINEDESCRIPTOR DESCENT)
                                                                      of
 LINE]
                                (COND
-                                  ((ILESSP YBOT (IDIFFERENCE (fetch
 (REGION BOTTOM) of
 REGION
-                                                                    )
-                                                       (fetch
 (LINEDESCRIPTOR DESCENT)
-                                                          of
 LINE)))
+                                  ((ILESSP YBOT (IDIFFERENCE (fetch
 (REGION BOTTOM) of
 REGION)
+                                                       (fetch
 (LINEDESCRIPTOR DESCENT) of
 LINE)))
                                                              (* ; 
-
                                                        "This line hangs off the bottom;  punt it.")

+
                                                          "This line hangs off the bottom;  punt it.")

                                    NIL)
                                   (T                         (* ; "This line is good;  use it.")

                                      (replace
 (LINEDESCRIPTOR YBOT) of
 LINE with
 YBOT)
                                      (replace
 (LINEDESCRIPTOR YBASE) of
 LINE
-                                        with
 (IPLUS YBOT (fetch
 (LINEDESCRIPTOR DESCENT)
-                                                                of
 LINE)))
+                                        with
 (IPLUS YBOT (fetch
 (LINEDESCRIPTOR DESCENT) of
 LINE)))
                                      LINE])
 
 (\TEDIT.FORMAT.FOUNDBOX?

@@ -1696,8 +1760,19 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994 by Venu
 (GLOBALVARS TEDIT.PAPER.SIZES)
 )
 
-(RPAQQ TEDIT.PAPER.SIZES
 ((A0 2384 3370) (A1 1684 2384) (A2 1191 1684) (A3 842 1191) (A4 595 842) (A5 420 595) (B0 2835 4008) (B1 2004 2835) (B2 1417 2004) (B3 1001 1417) (B4 709 1001) (B5 499 709))
-)
+(RPAQQ TEDIT.PAPER.SIZES

+       ((A0 2384 3370)
+        (A1 1684 2384)
+        (A2 1191 1684)
+        (A3 842 1191)
+        (A4 595 842)
+        (A5 420 595)
+        (B0 2835 4008)
+        (B1 2004 2835)
+        (B2 1417 2004)
+        (B3 1001 1417)
+        (B4 709 1001)
+        (B5 499 709)))
 
 
 
@@ -1825,15 +1900,15 @@ Copyright (c) 1984, 1985, 1986, 1987, 1988, 1989, 1990, 1991, 1993, 1994 by Venu
 (PUTPROPS TEDITPAGE COPYRIGHT ("Venue & Xerox Corporation" 1984 1985 1986 1987 1988 1989 1990 1991 
 1993 1994))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (3553 7108 (TEDIT.GET.PAGEFRAMES 3563 . 3915) (TEDIT.PARSE.PAGEFRAMES 3917 . 5620) (
-TEDIT.PUT.PAGEFRAMES 5622 . 6250) (TEDIT.UNPARSE.PAGEFRAMES 6252 . 7106)) (7154 19997 (
-TEDIT.SINGLE.PAGEFORMAT 7164 . 17723) (TEDIT.COMPOUND.PAGEFORMAT 17725 . 18351) (TEDIT.PAGEFORMAT 
-18353 . 19995)) (20084 97190 (TEDIT.FORMAT.HARDCOPY 20094 . 31166) (TEDIT.FORMATBOX 31168 . 46475) (
-TEDIT.FORMATHEADING 46477 . 53053) (TEDIT.FORMATPAGE 53055 . 64626) (TEDIT.FORMATTEXTBOX 64628 . 84946
-) (TEDIT.FORMATFOLIO 84948 . 91873) (\TEDIT.FORMAT.FOUNDBOX? 91875 . 94064) (TEDIT.SKIP.SPECIALCOND 
-94066 . 97188)) (97270 100471 (TEDIT.HARDCOPY.PAGEHEADING 97280 . 100469)) (100580 110247 (
-TEDIT.HARDCOPY-COLUMN-END 100590 . 110245)) (110292 115296 (SCALEPAGEUNITS 110302 . 111530) (
-SCALEPAGEXUNITS 111532 . 112296) (SCALEPAGEYUNITS 112298 . 113063) (\TEDIT.PAPERHEIGHT 113065 . 113994
-) (\TEDIT.PAPERWIDTH 113996 . 115294)) (115618 119532 (ROMANNUMERALS 115628 . 119530)) (119568 123634 
-(\TEDIT.FORMAT.FOOTNOTE 119578 . 123632)))))
+  (FILEMAP (NIL (5196 8751 (TEDIT.GET.PAGEFRAMES 5206 . 5558) (TEDIT.PARSE.PAGEFRAMES 5560 . 7263) (
+TEDIT.PUT.PAGEFRAMES 7265 . 7893) (TEDIT.UNPARSE.PAGEFRAMES 7895 . 8749)) (8797 21640 (
+TEDIT.SINGLE.PAGEFORMAT 8807 . 19366) (TEDIT.COMPOUND.PAGEFORMAT 19368 . 19994) (TEDIT.PAGEFORMAT 
+19996 . 21638)) (21727 98018 (TEDIT.FORMAT.HARDCOPY 21737 . 32809) (TEDIT.FORMATBOX 32811 . 48118) (
+TEDIT.FORMATHEADING 48120 . 54287) (TEDIT.FORMATPAGE 54289 . 65860) (TEDIT.FORMATTEXTBOX 65862 . 86180
+) (TEDIT.FORMATFOLIO 86182 . 92701) (\TEDIT.FORMAT.FOUNDBOX? 92703 . 94892) (TEDIT.SKIP.SPECIALCOND 
+94894 . 98016)) (98098 101299 (TEDIT.HARDCOPY.PAGEHEADING 98108 . 101297)) (101408 111075 (
+TEDIT.HARDCOPY-COLUMN-END 101418 . 111073)) (111120 116124 (SCALEPAGEUNITS 111130 . 112358) (
+SCALEPAGEXUNITS 112360 . 113124) (SCALEPAGEYUNITS 113126 . 113891) (\TEDIT.PAPERHEIGHT 113893 . 114822
+) (\TEDIT.PAPERWIDTH 114824 . 116122)) (116540 120454 (ROMANNUMERALS 116550 . 120452)) (120490 124556 
+(\TEDIT.FORMAT.FOOTNOTE 120500 . 124554)))))
 STOP

library/TEDITSCREEN

@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED "29-Sep-2021 22:03:57" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITSCREEN.;8
 214517 
+
(FILECREATED "12-Jan-2022 18:56:46" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>TEDITSCREEN.;11
 214540 
 
-      changes to%:  (FNS \DISPLAYLINE)
+      :CHANGES-TO (FNS \SHOWTEXT)
 
-      previous date%: "21-Sep-2021 12:53:40" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>library>TEDITSCREEN.;7)
+      :PREVIOUS-DATE "12-Jan-2022 18:27:35" 
+{DSK}<Users>kaplan>Local>medley3.5>my-medley>library>TEDITSCREEN.;10)
 
 
 (* ; "
@@ -1409,14 +1409,13 @@ Copyright (c) 1983-1994, 2021 by Venue & Xerox Corporation.
 (DECLARE%: EVAL@COMPILE DONTCOPY 
 (DECLARE%: EVAL@COMPILE 
 
-(PUTPROPS MI-TEDIT.BLTCHAR
 MACRO
 [(CHARCODE DISPLAYSTREAM CURX DISPLAYDATA DDPILOTBBT 
-                                                 CLIPRIGHT)
-                                          (COND
-                                             ((EQ 'MAIKO (MACHINETYPE))
-                                              (SUBRCALL TEDIT.BLTCHAR CHARCODE DISPLAYSTREAM CURX 
-                                                     DISPLAYDATA DDPILOTBBT CLIPRIGHT))
-                                             (T (\TEDIT.BLTCHAR
 CHARCODE DISPLAYSTREAM CURX 
-                                                       DISPLAYDATA DDPILOTBBT CLIPRIGHT])
+(PUTPROPS MI-TEDIT.BLTCHAR
 MACRO
 [(CHARCODE DISPLAYSTREAM CURX DISPLAYDATA DDPILOTBBT CLIPRIGHT)
+                                  (COND
+                                     ((EQ 'MAIKO (MACHINETYPE))
+                                      (SUBRCALL TEDIT.BLTCHAR CHARCODE DISPLAYSTREAM CURX DISPLAYDATA
+                                             DDPILOTBBT CLIPRIGHT))
+                                     (T (\TEDIT.BLTCHAR
 CHARCODE DISPLAYSTREAM CURX DISPLAYDATA 
+                                               DDPILOTBBT CLIPRIGHT])
 )
 )
 (DEFINEQ
@@ -2212,53 +2211,58 @@ Copyright (c) 1983-1994, 2021 by Venue & Xerox Corporation.
              (\TEDIT.FIXINSSEL SEL TEXTOBJ CH#1 DCH])
 
 (\SHOWTEXT

-  [LAMBDA (TEXTOBJ LINES WINDOW)
                        (* ; "Edited 12-Jun-90 19:22 by mitani")

-                                                             (* Fill the editor window with text, 
-
                                                           starting from the top of the file.)

+  [LAMBDA (TEXTOBJ LINES WINDOW)
+
+    (* ;; "Edited 12-Jan-2022 18:56 by rmk: I took out the WAITINGCURSOR, the resetsave wasn't working for some reason, and it really isn't necessary for modern machines.")

+
+    (* ;; "Edited 12-Jun-90 19:22 by mitani")

+
+    (* ;; "Fill the editor window with text, starting from the top of the file.")

+
     (COND
-       ((fetch
 (TEXTOBJ \WINDOW) of
 TEXTOBJ)         (* If there is no edit window, just 
-
                                                           return.)

-        (PROG (WREG)
-              (SETQ WINDOW (OR WINDOW (\TEDIT.PRIMARYW TEXTOBJ)))
-              (DSPFILL (PROG1 (DSPCLIPPINGREGION NIL WINDOW) (* For region within a window%:)

-                                                             (* (CREATEREGION (fetch
-
                                                           (TEXTOBJ WLEFT) of TEXTOBJ)
-
                                                           (fetch (TEXTOBJ WBOTTOM) of TEXTOBJ)
-
                                                           (IDIFFERENCE (fetch
-
                                                           (TEXTOBJ WRIGHT) of TEXTOBJ)
-
                                                           (fetch (TEXTOBJ WLEFT) of TEXTOBJ))
-
                                                           (IDIFFERENCE (fetch
-
                                                           (TEXTOBJ WTOP) of TEXTOBJ)
-
                                                           (fetch (TEXTOBJ WBOTTOM) of TEXTOBJ))))

-                           )
-                     WHITESHADE
-                     'REPLACE WINDOW)                        (* Clear the window.)

-              (RETURN (RESETLST
-                          (RESETSAVE (CURSOR WAITINGCURSOR)) (* Display the hourglass cursor as 
-
                                                           we work)

-                          (SETQ LINES
-                           (create
 LINEDESCRIPTOR
-                                  YBOT _ (WINDOWPROP WINDOW 'HEIGHT)
-                                  CHAR1 _ 0
-                                  CHARLIM _ 0
-                                  SPACELEFT _ -1
-                                  RIGHTMARGIN _ (SUB1 (fetch
 (TEXTOBJ WRIGHT) of
 TEXTOBJ))
-                                  NEXTLINE _ NIL
-                                  CHARTOP _ -1
-                                  LHEIGHT _ 0
-                                  LXLIM _ (fetch
 (TEXTOBJ WRIGHT) of
 TEXTOBJ)
-                                  CR\END _ T
-                                  ASCENT _ 0
-                                  DESCENT _ 0
-                                  LTRUEASCENT _ 0
-                                  LFMTSPEC _ TEDIT.DEFAULT.FMTSPEC))
-                                                             (* Make sure we have the anchor 
-
                                                           pseudo-line)

-                          (WINDOWPROP WINDOW 'LINES LINES)
-                          (\FILLWINDOW
 (WINDOWPROP WINDOW 'HEIGHT)
-                                 LINES TEXTOBJ NIL WINDOW)   (* Fill the window as usual)

-                          (\TEDIT.SET.WINDOW.EXTENT TEXTOBJ WINDOW)
-                          LINES)])
+       ((fetch
 (TEXTOBJ \WINDOW) of
 TEXTOBJ)                 (* ; 
+
                                                           "If there is no edit window, just return.")

+        (PROG1 (PROG (WREG)
+                     (SETQ WINDOW (OR WINDOW (\TEDIT.PRIMARYW TEXTOBJ)))
+                     (DSPFILL (PROG1 (DSPCLIPPINGREGION NIL WINDOW)
+                                                             (* ; "For region within a window:")

+
+                                 (* ;; "(CREATEREGION (fetch (TEXTOBJ WLEFT) of TEXTOBJ) (fetch (TEXTOBJ WBOTTOM) of TEXTOBJ) (IDIFFERENCE (fetch (TEXTOBJ WRIGHT) of TEXTOBJ) (fetch (TEXTOBJ WLEFT) of TEXTOBJ)) (IDIFFERENCE (fetch (TEXTOBJ WTOP) of TEXTOBJ) (fetch (TEXTOBJ WBOTTOM) of TEXTOBJ)))")

+
+                                  )
+                            WHITESHADE
+                            'REPLACE WINDOW)                 (* ; "Clear the window.")

+                     (RETURN (RESETLST
+
+                                 (* ;; "RMK: For reasons unknown, the original cursor is not restored when this exits.  But there is presumably no need for this waiting indicator in modern times.  This only fills lines visible within a window, and machines are really fast.")

+
+                                 (* ;; "Display the hourglass cursor as we work")

+
+                                 (AND NIL (RESETSAVE (CURSOR WAITINGCURSOR)))
+                                 (SETQ LINES
+                                  (create
 LINEDESCRIPTOR
+                                         YBOT _ (WINDOWPROP WINDOW 'HEIGHT)
+                                         CHAR1 _ 0
+                                         CHARLIM _ 0
+                                         SPACELEFT _ -1
+                                         RIGHTMARGIN _ (SUB1 (fetch
 (TEXTOBJ WRIGHT) of
 TEXTOBJ))
+                                         NEXTLINE _ NIL
+                                         CHARTOP _ -1
+                                         LHEIGHT _ 0
+                                         LXLIM _ (fetch
 (TEXTOBJ WRIGHT) of
 TEXTOBJ)
+                                         CR\END _ T
+                                         ASCENT _ 0
+                                         DESCENT _ 0
+                                         LTRUEASCENT _ 0
+                                         LFMTSPEC _ TEDIT.DEFAULT.FMTSPEC))
+                                                             (* ; 
+
                                                           "Make sure we have the anchor pseudo-line")

+                                 (WINDOWPROP WINDOW 'LINES LINES)
+                                 (\FILLWINDOW
 (WINDOWPROP WINDOW 'HEIGHT)
+                                        LINES TEXTOBJ NIL WINDOW)
+                                                             (* ; "Fill the window as usual")

+                                 (\TEDIT.SET.WINDOW.EXTENT TEXTOBJ WINDOW)
+                                 LINES)])
 
 (\TEDIT.ADJUST.LINES

   [LAMBDA (TEXTOBJ FIRSTLINE WINDOW LINETOP DY)
          (* ; "Edited 30-May-91 15:59 by jds")

@@ -2979,25 +2983,25 @@ Copyright (c) 1983-1994, 2021 by Venue & Xerox Corporation.
 
 
 
-(* (VARS (TEDIT.DONT.BREAK.CHARS (CHARCODE ("41,42" "41,43" "41,53" "41,54" "41,74" "41,115" 
-"41,133" "41,131" "41,127" "Hira,41" "Hira,43" "Hira,45" "Hira,47" "Hira,51" "Hira,103" "Hira,143" 
-"Hira,145" "Hira,147" "Hira,156" "Kata,41" "Kata,43" "Kata,45" "Kata,47" "Kata,51" "Kata,103" 
-"Kata,143" "Kata,145" "Kata,147" "Kata,156"))) (TEDIT.DONT.LAST.CHARS (CHARCODE ("41,114" "41,132" 
-"41,130" "41,126"))) (GLOBALVARS TEDIT.DONT.BREAK.CHARS TEDIT.DONT.LAST.CHARS)))

+(* (VARS (TEDIT.DONT.BREAK.CHARS (CHARCODE ("41,42" "41,43" "41,53" "41,54" "41,74" "41,115" "41,133" 
+"41,131" "41,127" "Hira,41" "Hira,43" "Hira,45" "Hira,47" "Hira,51" "Hira,103" "Hira,143" "Hira,145" 
+"Hira,147" "Hira,156" "Kata,41" "Kata,43" "Kata,45" "Kata,47" "Kata,51" "Kata,103" "Kata,143" 
+"Kata,145" "Kata,147" "Kata,156"))) (TEDIT.DONT.LAST.CHARS (CHARCODE ("41,114" "41,132" "41,130" 
+"41,126"))) (GLOBALVARS TEDIT.DONT.BREAK.CHARS TEDIT.DONT.LAST.CHARS)))

 
 (PUTPROPS TEDITSCREEN COPYRIGHT ("Venue & Xerox Corporation" 1983 1984 1985 1986 1987 1988 1989 1990 
 1991 1992 1993 1994 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2767 76759 (\FORMATLINE 2777 . 56505) (\TEDIT.NSCHAR.RUN 56507 . 63324) (
-\TEDIT.PURGE.SPACES 63326 . 63784) (\DOFORMATTING 63786 . 76757)) (76760 98628 (\DISPLAYLINE 76770 . 
-94628) (\TEDIT.LINECACHE 94630 . 95381) (\TEDIT.CREATE.LINECACHE 95383 . 96127) (\TEDIT.BLTCHAR 96129
- . 98626)) (99342 213797 (TEDIT.CR.UPDATESCREEN 99352 . 100603) (TEDIT.DELETELINE 100605 . 101639) (
-TEDIT.INSERT.DISPLAYTEXT 101641 . 116880) (TEDIT.INSERT.UPDATESCREEN 116882 . 123634) (
-TEDIT.UPDATE.SCREEN 123636 . 124854) (\BACKFORMAT 124856 . 129167) (\FILLWINDOW 129169 . 144273) (
-\FIXDLINES 144275 . 151512) (\FIXILINES 151514 . 159489) (\SHOWTEXT 159491 . 162747) (
-\TEDIT.ADJUST.LINES 162749 . 170216) (\TEDIT.CLEAR.SCREEN.BELOW.LINE 170218 . 170948) (
-\TEDIT.CLOSEUPLINES 170950 . 179466) (\TEDIT.COPY.LINEDESCRIPTOR 179468 . 185034) (
-\TEDIT.FIXCHANGEDLINE 185036 . 196215) (\TEDIT.FIXCHANGEDPART 196217 . 208644) (\TEDIT.INSERTLINE 
-208646 . 209466) (\TEDIT.LINE.LIST 209468 . 209794) (\TEDIT.MARK.LINES.DIRTY 209796 . 211482) (
-\TEDIT.NEXT.LINE.BOTTOM 211484 . 213795)))))
+  (FILEMAP (NIL (2761 76753 (\FORMATLINE 2771 . 56499) (\TEDIT.NSCHAR.RUN 56501 . 63318) (
+\TEDIT.PURGE.SPACES 63320 . 63778) (\DOFORMATTING 63780 . 76751)) (76754 98622 (\DISPLAYLINE 76764 . 
+94622) (\TEDIT.LINECACHE 94624 . 95375) (\TEDIT.CREATE.LINECACHE 95377 . 96121) (\TEDIT.BLTCHAR 96123
+ . 98620)) (99237 213820 (TEDIT.CR.UPDATESCREEN 99247 . 100498) (TEDIT.DELETELINE 100500 . 101534) (
+TEDIT.INSERT.DISPLAYTEXT 101536 . 116775) (TEDIT.INSERT.UPDATESCREEN 116777 . 123529) (
+TEDIT.UPDATE.SCREEN 123531 . 124749) (\BACKFORMAT 124751 . 129062) (\FILLWINDOW 129064 . 144168) (
+\FIXDLINES 144170 . 151407) (\FIXILINES 151409 . 159384) (\SHOWTEXT 159386 . 162770) (
+\TEDIT.ADJUST.LINES 162772 . 170239) (\TEDIT.CLEAR.SCREEN.BELOW.LINE 170241 . 170971) (
+\TEDIT.CLOSEUPLINES 170973 . 179489) (\TEDIT.COPY.LINEDESCRIPTOR 179491 . 185057) (
+\TEDIT.FIXCHANGEDLINE 185059 . 196238) (\TEDIT.FIXCHANGEDPART 196240 . 208667) (\TEDIT.INSERTLINE 
+208669 . 209489) (\TEDIT.LINE.LIST 209491 . 209817) (\TEDIT.MARK.LINES.DIRTY 209819 . 211505) (
+\TEDIT.NEXT.LINE.BOTTOM 211507 . 213818)))))
 STOP