diff --git a/sources/ADISPLAY b/sources/ADISPLAY
index 7e3bd10d..28b9736e 100644
--- a/sources/ADISPLAY
+++ b/sources/ADISPLAY
@@ -1,12 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "13-Jun-2021 14:03:35" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ADISPLAY.;10 248693 
 
-      changes to%:  (FNS \DRAWLINE.DISPLAY)
-                    (VARS ADISPLAYCOMS)
+(FILECREATED " 1-Mar-2023 07:49:03" {DSK}<home>larry>il>medley>sources>ADISPLAY.;2 245335 
 
-      previous date%: "15-Sep-94 17:07:04" 
-{DSK}<Users>kaplan>Local>medley3.5>git-medley>sources>ADISPLAY.;8)
+      :EDIT-BY "lmm"
+
+      :CHANGES-TO (FNS \DRAWLINE.DISPLAY)
+
+      :PREVIOUS-DATE "28-Feb-2023 06:37:11" {DSK}<home>larry>il>medley>sources>ADISPLAY.;1)
 
 
 (* ; "
@@ -16,11 +16,11 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (PRETTYCOMPRINT ADISPLAYCOMS)
 
 (RPAQQ ADISPLAYCOMS
-       [(COMS                                                (* ; "COMPILE SUPPORT")
+       [(COMS                                                (* ; "COMPILE SUPPORT")
               (DECLARE%: EVAL@COMPILE DONTCOPY (FILES (LOADCOMP)
                                                       WINDOW)))
         (P (MOVD? 'NILL 'BIGBITMAPP))
-        (COMS                                                (* ; "Interlisp-D dependent stuff.")
+        (COMS                                                (* ; "Interlisp-D dependent stuff.")
               (EXPORT (RECORDS REGION BITMAP BITMAPWORD POSITION CURSOR MOUSEEVENT SCREENREGION 
                              SCREENPOSITION))
               (SYSRECORDS PILOTBBT \DISPLAYDATA)
@@ -30,21 +30,19 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
               (P (DEFPRINT 'BITMAP 'PRINT-BITMAPS-NICELY))
               (FNS \GETINTEGERPART \CONVERTTOFRACTION)
               (CONSTANTS (INTEGERBITS 12)))
-        [COMS                                                (* ; 
-                                                           "cursor functions not on LLDISPLAY")
+        [COMS                                                (* ; "cursor functions not on LLDISPLAY")
               (FNS CURSORP CURSORBITMAP CreateCursorBitMap)
               (EXPORT (MACROS CURSORBITMAP)
                      (CONSTANTS (HARDCURSORHEIGHT 16)
                             (HARDCURSORWIDTH 16))
                      (DECLARE%: EVAL@COMPILE (ADDVARS (GLOBALVARS CursorBitMap]
         (COMS * CARETCOMS)
-        (COMS                                                (* ; "Region functions")
+        (COMS                                                (* ; "Region functions")
               (FNS CREATEREGION REGIONP INTERSECTREGIONS UNIONREGIONS REGIONSINTERSECTP SUBREGIONP 
                    EXTENDREGION EXTENDREGIONBOTTOM EXTENDREGIONLEFT EXTENDREGIONRIGHT EXTENDREGIONTOP
                    INSIDEP STRINGREGION))
-        (COMS                                                (* ; "line and spline drawing.")
-              (COMS                                          (* ; 
-                                                           "Brushes and brush initialization")
+        (COMS                                                (* ; "line and spline drawing.")
+              (COMS                                          (* ; "Brushes and brush initialization")
                     (GLOBALRESOURCES \BRUSHBBT)
                     (FNS \BRUSHBITMAP \GETBRUSH \GETBRUSHBBT \InitCurveBrushes \BrushFromWidth)
                     (FNS \MAKEBRUSH.DIAGONAL \MAKEBRUSH.HORIZONTAL \MAKEBRUSH.VERTICAL 
@@ -56,29 +54,29 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                     (RECORDS BRUSHITEM)
                     (DECLARE%: DONTEVAL@LOAD DOCOPY (P (\InitCurveBrushes)))
                     (DECLARE%: DONTCOPY (GLOBALVARS \BrushAList KNOWN.BRUSHES)))
-                                                             (* ; "Lines")
+                                                             (* ; "Lines")
               (FNS \DRAWLINE.DISPLAY RELMOVETO MOVETOUPPERLEFT)
               (FNS \CLIPANDDRAWLINE \CLIPANDDRAWLINE1 \CLIPCODE \LEASTPTAT \GREATESTPTAT \DRAWLINE1 
                    \DRAWLINE.UFN)
               (DECLARE%: DONTCOPY (MACROS .DRAWLINEX. .DRAWLINEY.))
-                                                             (* ; "Curves")
+                                                             (* ; "Curves")
               (FNS \DRAWCIRCLE.DISPLAY \DRAWARC.DISPLAY \DRAWARC.GENERIC \COMPUTE.ARC.POINTS 
                    \DRAWELLIPSE.DISPLAY \DRAWCURVE.DISPLAY \DRAWPOINT.DISPLAY \DRAWPOLYGON.DISPLAY 
                    \LINEWITHBRUSH)
               (FNS LOADPOLY PARAMETRICSPLINE \CURVE \CURVE2 \CURVEEND \CURVESLOPE \CURVESTART 
                    \FDIFS/FROM/DERIVS)
-              (DECLARE%: DONTCOPY                            (* ; "Used by drawcurve")
+              (DECLARE%: DONTCOPY                            (* ; "Used by drawcurve")
                      (EXPORT (RECORDS POLYNOMIAL SPLINE)))
               (DECLARE%: DONTCOPY (EXPORT (MACROS HALF \FILLCIRCLEBLT))
                      (MACROS \CURVEPT .SETUP.FOR.\BBTCURVEPT. \CIRCLEPTS \CURVESMOOTH))
               (FNS \FILLCIRCLE.DISPLAY \LINEBLT))
-        [COMS                                                (* ; "making and copying bitmaps")
+        [COMS                                                (* ; "making and copying bitmaps")
               (FNS SCREENBITMAP BITMAPP BITMAPHEIGHT BITSPERPIXEL)
               (EXPORT (FILEPKGCOMS BITMAPS CURSORS))
               (DECLARE%: EVAL@COMPILE (EXPORT (ADDVARS (GLOBALVARS SCREENHEIGHT SCREENWIDTH 
                                                               ScreenBitMap]
-        [COMS                                                (* ; 
-                             "Display stream functions that are not needed in the primitive system")
+        [COMS                                                (* ; 
+                               "Display stream functions that are not needed in the primitive system")
               (FNS DSPFILL INVERTW)
               (FNS \DSPCOLOR.DISPLAY \DSPBACKCOLOR.DISPLAY DSPEOLFN)
               (EXPORT (CONSTANTS (BLACKSHADE 65535)
@@ -87,7 +85,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                      (ADDVARS (GLOBALVARS GRAYSHADE)))
               (MACROS DSPRUBOUTCHAR)
               (FNS DSPCLEOL DSPRUBOUTCHAR \DSPMOVELR)
-              (COMS                                          (* ; "for cursor")
+              (COMS                                          (* ; "for cursor")
                     (BITMAPS \DefaultCursor)
                     (FNS \CURSOR.DEFPRINT)
                     [DECLARE%: DONTEVAL@LOAD DOCOPY (INITVARS (DEFAULTCURSOR (CURSORCREATE 
@@ -97,8 +95,8 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                      (SETQ \CURRENTCURSOR DEFAULTCURSOR)))
                               (DEFPRINT 'CURSOR '\CURSOR.DEFPRINT]
                     (DECLARE%: DONTCOPY (GLOBALVARS DEFAULTCURSOR]
-        [COMS                                                (* ; 
-      "stuff to interpret colors as textures which is needed even in system that don't have color.")
+        [COMS                                                (* ; 
+        "stuff to interpret colors as textures which is needed even in system that don't have color.")
               (FNS TEXTUREOFCOLOR \PRIMARYTEXTURE \LEVELTEXTURE INSURE.B&W.TEXTURE INSURE.RGB.COLOR 
                    \LOOKUPCOLORNAME RGBP HLSP HLSTORGB \HLSVALUEFN)
               (VARS COLORNAMES)
@@ -107,7 +105,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                          WHITESHADE16 REDTEXTURE GREENTEXTURE BLUETEXTURE))
               (UGLYVARS BLACKSHADE16 DARKGRAY16 MEDIUMGRAY16 LIGHTGRAY16 WHITESHADE16 REDTEXTURE 
                      GREENTEXTURE BLUETEXTURE)
-              (DECLARE%: DONTCOPY                            (* ; "Used by drawcurve")
+              (DECLARE%: DONTCOPY                            (* ; "Used by drawcurve")
                      (EXPORT (RECORDS HLS RGB]
         (DECLARE%: DONTEVAL@LOAD DOEVAL@COMPILE DONTCOPY COMPILERVARS (ADDVARS (NLAMA)
                                                                              (NLAML)
@@ -133,62 +131,62 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE
 
 (RECORD REGION (LEFT BOTTOM WIDTH HEIGHT)
-                   LEFT _ -16383 BOTTOM _ -16383 WIDTH _ 32767 HEIGHT _ 32767
-                   [ACCESSFNS ((TOP (IPLUS (fetch (REGION BOTTOM) of DATUM)
-                                           (fetch (REGION HEIGHT) of DATUM)
-                                           -1))
-                               (PTOP (IPLUS (fetch (REGION BOTTOM) of DATUM)
-                                            (fetch (REGION HEIGHT) of DATUM)))
-                               (RIGHT (IPLUS (fetch (REGION LEFT) of DATUM)
-                                             (fetch (REGION WIDTH) of DATUM)
-                                             -1))
-                               (PRIGHT (IPLUS (fetch (REGION LEFT) of DATUM)
-                                              (fetch (REGION WIDTH) of DATUM]
-                   [TYPE? (AND (EQLENGTH DATUM 4)
-                                   (EVERY DATUM (FUNCTION NUMBERP]
-                   (SYSTEM))
+               LEFT _ -16383 BOTTOM _ -16383 WIDTH _ 32767 HEIGHT _ 32767
+               [ACCESSFNS ((TOP (IPLUS (fetch (REGION BOTTOM) of DATUM)
+                                       (fetch (REGION HEIGHT) of DATUM)
+                                       -1))
+                           (PTOP (IPLUS (fetch (REGION BOTTOM) of DATUM)
+                                        (fetch (REGION HEIGHT) of DATUM)))
+                           (RIGHT (IPLUS (fetch (REGION LEFT) of DATUM)
+                                         (fetch (REGION WIDTH) of DATUM)
+                                         -1))
+                           (PRIGHT (IPLUS (fetch (REGION LEFT) of DATUM)
+                                          (fetch (REGION WIDTH) of DATUM]
+               [TYPE? (AND (EQLENGTH DATUM 4)
+                           (EVERY DATUM (FUNCTION NUMBERP]
+               (SYSTEM))
 
 (DATATYPE BITMAP ((BITMAPBASE POINTER)
-                      (BITMAPRASTERWIDTH WORD)
-                      (BITMAPHEIGHT WORD)
-                      (BITMAPWIDTH WORD)
-                      (BITMAPBITSPERPIXEL WORD))
-                     BITMAPBITSPERPIXEL _ 1 (BLOCKRECORD BITMAP ((BitMapHiLoc WORD)
-                                                                 (BitMapLoLoc WORD))
-                                                             (* ; "overlay initial pointer")
-                                                   )
-                     (SYSTEM))
+                  (BITMAPRASTERWIDTH WORD)
+                  (BITMAPHEIGHT WORD)
+                  (BITMAPWIDTH WORD)
+                  (BITMAPBITSPERPIXEL WORD))
+                 BITMAPBITSPERPIXEL _ 1 (BLOCKRECORD BITMAP ((BitMapHiLoc WORD)
+                                                             (BitMapLoLoc WORD))
+                                                             (* ; "overlay initial pointer")
+                                               )
+                 (SYSTEM))
 
 (BLOCKRECORD BITMAPWORD ((BITS WORD))
-                            (SYSTEM))
+                        (SYSTEM))
 
 (RECORD POSITION (XCOORD . YCOORD)
-                     [TYPE? (AND (LISTP DATUM)
-                                     (NUMBERP (CAR DATUM))
-                                     (NUMBERP (CDR DATUM]
-                     (SYSTEM))
+                 [TYPE? (AND (LISTP DATUM)
+                             (NUMBERP (CAR DATUM))
+                             (NUMBERP (CDR DATUM]
+                 (SYSTEM))
 
 (DATATYPE CURSOR (CUIMAGE CUMASK CUHOTSPOTX CUHOTSPOTY CUDATA)
-                     [ACCESSFNS ((CUBITSPERPIXEL (fetch (BITMAP BITMAPBITSPERPIXEL)
-                                                    of (fetch (CURSOR CUIMAGE) of DATUM]
-                     (SYSTEM))
+                 [ACCESSFNS ((CUBITSPERPIXEL (fetch (BITMAP BITMAPBITSPERPIXEL)
+                                                of (fetch (CURSOR CUIMAGE) of DATUM]
+                 (SYSTEM))
 
 (RECORD MOUSEEVENT (MOUSEX MOUSEY MOUSEBUTTONS KEYBOARD MOUSETIME)
-                       (SYSTEM))
+                   (SYSTEM))
 
 (RECORD SCREENREGION (SCREEN . REGION)
-                         (SUBRECORD REGION)
-                         [TYPE? (AND (LISTP DATUM)
-                                         (type? SCREEN (CAR DATUM))
-                                         (type? REGION (CDR DATUM]
-                         (SYSTEM))
+                     (SUBRECORD REGION)
+                     [TYPE? (AND (LISTP DATUM)
+                                 (type? SCREEN (CAR DATUM))
+                                 (type? REGION (CDR DATUM]
+                     (SYSTEM))
 
 (RECORD SCREENPOSITION (SCREEN . POSITION)
-                           (SUBRECORD POSITION)
-                           [TYPE? (AND (LISTP DATUM)
-                                           (type? SCREEN (CAR DATUM))
-                                           (type? POSITION (CDR DATUM]
-                           (SYSTEM))
+                       (SUBRECORD POSITION)
+                       [TYPE? (AND (LISTP DATUM)
+                                   (type? SCREEN (CAR DATUM))
+                                   (type? POSITION (CDR DATUM]
+                       (SYSTEM))
 )
 
 (/DECLAREDATATYPE 'BITMAP '(POINTER WORD WORD WORD WORD)
@@ -212,17 +210,17 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (ADDTOVAR SYSTEMRECLST
 
 (DATATYPE PILOTBBT ((PBTDESTLO WORD)
-                        (PBTDESTHI WORD)
-                        (PBTDESTBIT WORD)
-                        (PBTDESTBPL SIGNEDWORD)
-                        (PBTSOURCELO WORD)
-                        (PBTSOURCEHI WORD)
-                        (PBTSOURCEBIT WORD)
-                        (PBTSOURCEBPL SIGNEDWORD)
-                        (PBTWIDTH WORD)
-                        (PBTHEIGHT WORD)
-                        (PBTFLAGS WORD)
-                        (NIL 5 WORD)))
+                    (PBTDESTHI WORD)
+                    (PBTDESTBIT WORD)
+                    (PBTDESTBPL SIGNEDWORD)
+                    (PBTSOURCELO WORD)
+                    (PBTSOURCEHI WORD)
+                    (PBTSOURCEBIT WORD)
+                    (PBTSOURCEBPL SIGNEDWORD)
+                    (PBTWIDTH WORD)
+                    (PBTHEIGHT WORD)
+                    (PBTFLAGS WORD)
+                    (NIL 5 WORD)))
 
 (DATATYPE \DISPLAYDATA 
           (DDXPOSITION DDYPOSITION DDXOFFSET DDYOFFSET DDDestination DDClippingRegion DDFONT 
@@ -253,7 +251,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (\BBTCURVEPT
   [LAMBDA (X Y BBT LEFT BRUSHWIDTH LEFTMINUSBRUSH RIGHTPLUS1 NBITSRIGHTPLUS1 TOPMINUSBRUSH 
              DestinationBitMap BRUSHHEIGHT BOTTOMMINUSBRUSH TOP BRUSHBASE DESTINATIONBASE RASTERWIDTH
-             BRUSHRASTERWIDTH COLORBRUSHBASE NBITS DISPLAYDATA)
+             BRUSHRASTERWIDTH COLORBRUSHBASE NBITS DISPLAYDATA)
                                                              (* kbr%: "27-Aug-86 23:17")
 
     (* ;; "Called by \CURVEPT macro.  Draws a brush point by bitblting BRUSHBM to point X,Y in DestinationBitMap.  BBT is a BitBlt table where everything is already set except the source and destination addresses, width and height.  In other words, only the easy stuff")
@@ -261,99 +259,89 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
     [PROG (CLIPPEDTOP STY)
           [COND
              [(ILEQ Y TOPMINUSBRUSH)                         (* ; 
-                                                           "the top part of the brush is visible")
+                                                             "the top part of the brush is visible")
               (SETQ CLIPPEDTOP (IPLUS Y BRUSHHEIGHT))
               (replace PBTSOURCE of BBT with BRUSHBASE)
-              (freplace PBTHEIGHT of BBT with (IMIN BRUSHHEIGHT (IDIFFERENCE Y 
-                                                                                   BOTTOMMINUSBRUSH]
+              (freplace PBTHEIGHT of BBT with (IMIN BRUSHHEIGHT (IDIFFERENCE Y BOTTOMMINUSBRUSH]
              (T                                              (* ; "only the bottom is visible")
                 (SETQ CLIPPEDTOP TOP)
-                [replace PBTSOURCE of BBT with (\ADDBASE BRUSHBASE
-                                                                  (ITIMES BRUSHRASTERWIDTH
-                                                                         (SETQ STY (IDIFFERENCE
-                                                                                    Y TOPMINUSBRUSH]
-                (freplace PBTHEIGHT of BBT with (IDIFFERENCE (IMIN BRUSHHEIGHT
-                                                                               (IDIFFERENCE Y 
+                [replace PBTSOURCE of BBT with (\ADDBASE BRUSHBASE (ITIMES BRUSHRASTERWIDTH
+                                                                          (SETQ STY (IDIFFERENCE
+                                                                                     Y TOPMINUSBRUSH]
+                (freplace PBTHEIGHT of BBT with (IDIFFERENCE (IMIN BRUSHHEIGHT (IDIFFERENCE Y 
                                                                                      BOTTOMMINUSBRUSH
                                                                                       ))
-                                                                   STY]
+                                                       STY]
           (freplace PBTDEST of BBT with (\ADDBASE DESTINATIONBASE (ITIMES RASTERWIDTH
-                                                                                     (\SFInvert
-                                                                                      
-                                                                                    DestinationBitMap
-                                                                                      CLIPPEDTOP]
+                                                                         (\SFInvert DestinationBitMap
+                                                                                CLIPPEDTOP]
     [COND
        (COLORBRUSHBASE [COND
                           [(ILESSP X LEFT)                   (* ; 
-                                                      "only the right part of the brush is visible")
+                                                        "only the right part of the brush is visible")
                                                              (* ; 
-                                                           "FOR NOW BRUTE FORCE WITH NBITS CHECK")
+                                                             "FOR NOW BRUTE FORCE WITH NBITS CHECK")
                            [freplace PBTDESTBIT of BBT with (COND
-                                                                           ((EQ NBITS 4)
-                                                                            (LLSH LEFT 2))
-                                                                           (T (LLSH LEFT 3]
+                                                               ((EQ NBITS 4)
+                                                                (LLSH LEFT 2))
+                                                               (T (LLSH LEFT 3]
                            (freplace PBTSOURCEBIT of BBT
-                              with (IDIFFERENCE BRUSHWIDTH
-                                              (freplace PBTWIDTH of BBT
-                                                 with (COND
-                                                             ((EQ NBITS 4)
-                                                              (LLSH (IDIFFERENCE X LEFTMINUSBRUSH)
-                                                                    2))
-                                                             (T (LLSH (IDIFFERENCE X LEFTMINUSBRUSH)
-                                                                      3]
+                              with (IDIFFERENCE BRUSHWIDTH (freplace PBTWIDTH of BBT
+                                                              with (COND
+                                                                      ((EQ NBITS 4)
+                                                                       (LLSH (IDIFFERENCE X 
+                                                                                    LEFTMINUSBRUSH)
+                                                                             2))
+                                                                      (T (LLSH (IDIFFERENCE X 
+                                                                                      LEFTMINUSBRUSH)
+                                                                               3]
                           (T                                 (* ; "left edge is visible")
-                             [freplace PBTDESTBIT of BBT with (SETQ X
-                                                                           (COND
-                                                                              ((EQ NBITS 4)
-                                                                               (LLSH X 2))
-                                                                              (T (LLSH X 3]
+                             [freplace PBTDESTBIT of BBT with (SETQ X (COND
+                                                                         ((EQ NBITS 4)
+                                                                          (LLSH X 2))
+                                                                         (T (LLSH X 3]
                              (freplace PBTSOURCEBIT of BBT with 0)
                                                              (* ; 
-                                                          "set width to the amount that is visible")
-                             (freplace PBTWIDTH of BBT with (IMIN BRUSHWIDTH
-                                                                              (IDIFFERENCE 
-                                                                                     NBITSRIGHTPLUS1
-                                                                                     X]
+                                                            "set width to the amount that is visible")
+                             (freplace PBTWIDTH of BBT with (IMIN BRUSHWIDTH (IDIFFERENCE 
+                                                                                    NBITSRIGHTPLUS1 X
+                                                                                    ]
                                                              (* ; 
-                   "if color brush is used, the ground must be cleared before the brush is put in.")
+                     "if color brush is used, the ground must be cleared before the brush is put in.")
               (\SETPBTFUNCTION BBT (ffetch DDSOURCETYPE of DISPLAYDATA)
                      'ERASE)
               (\PILOTBITBLT BBT 0)                           (* ; 
-                                                   "reset the source to point to the color bitmap.")
+                                                     "reset the source to point to the color bitmap.")
               [COND
                  ((ILEQ Y TOPMINUSBRUSH)                     (* ; 
-                                                           "the top part of the brush is visible")
+                                                             "the top part of the brush is visible")
                   (freplace PBTSOURCE of BBT with COLORBRUSHBASE))
                  (T                                          (* ; "only the bottom is visible")
-                    (freplace PBTSOURCE of BBT with (\ADDBASE COLORBRUSHBASE
-                                                                       (ITIMES BRUSHRASTERWIDTH
-                                                                              (IDIFFERENCE Y 
-                                                                                     TOPMINUSBRUSH]
+                    (freplace PBTSOURCE of BBT with (\ADDBASE COLORBRUSHBASE (ITIMES BRUSHRASTERWIDTH
+                                                                                    (IDIFFERENCE
+                                                                                     Y TOPMINUSBRUSH]
               (\SETPBTFUNCTION BBT (ffetch DDSOURCETYPE of DISPLAYDATA)
                      'PAINT))
        (T (COND
              [(ILESSP X LEFT)                                (* ; 
-                                                      "only the right part of the brush is visible")
+                                                        "only the right part of the brush is visible")
               (freplace PBTDESTBIT of BBT with LEFT)
-              (freplace PBTSOURCEBIT of BBT with (IDIFFERENCE BRUSHWIDTH
-                                                                    (freplace PBTWIDTH
-                                                                       of BBT
-                                                                       with (IDIFFERENCE X 
+              (freplace PBTSOURCEBIT of BBT with (IDIFFERENCE BRUSHWIDTH (freplace PBTWIDTH
+                                                                            of BBT
+                                                                            with (IDIFFERENCE X 
                                                                                        LEFTMINUSBRUSH
-                                                                                       ]
+                                                                                        ]
              (T                                              (* ; "left edge is visible")
                 (freplace PBTDESTBIT of BBT with X)
-                (freplace PBTSOURCEBIT of BBT with 0)
-                                                             (* ; 
-                                                          "set width to the amount that is visible")
-                (freplace PBTWIDTH of BBT with (IMIN BRUSHWIDTH (IDIFFERENCE RIGHTPLUS1 X
-                                                                                   ]
+                (freplace PBTSOURCEBIT of BBT with 0)        (* ; 
+                                                            "set width to the amount that is visible")
+                (freplace PBTWIDTH of BBT with (IMIN BRUSHWIDTH (IDIFFERENCE RIGHTPLUS1 X]
     (\PILOTBITBLT BBT 0])
 )
 (DEFINEQ
 
 (CREATETEXTUREFROMBITMAP
-  [LAMBDA (BITMAP)                                       (* rrb "17-May-84 11:22")
+  [LAMBDA (BITMAP)                                           (* rrb "17-May-84 11:22")
 
     (* ;; "creates a texture object from the lower left corner of a bitmap")
 
@@ -367,31 +355,29 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                        (EQ W 4))
                    (OR (EQ H 2)
                        (EQ H 4)))                            (* ; 
-                           "small texture will match bitmap exactly so use integer representation.")
+                             "small texture will match bitmap exactly so use integer representation.")
               (SETQ TEXTURE 0)
               [for X from 0 to 3
                  do (for Y from 0 to 3
-                           do (COND
-                                     ([NOT (EQ 0 (BITMAPBIT BITMAP (IREMAINDER X W)
-                                                        (IREMAINDER Y H]
-                                      (SETQ TEXTURE (LOGOR TEXTURE
-                                                           (\BITMASK (IPLUS (ITIMES (IDIFFERENCE
+                       do (COND
+                             ([NOT (EQ 0 (BITMAPBIT BITMAP (IREMAINDER X W)
+                                                (IREMAINDER Y H]
+                              (SETQ TEXTURE (LOGOR TEXTURE (\BITMASK (IPLUS (ITIMES (IDIFFERENCE
                                                                                      3 Y)
                                                                                    4)
                                                                             X]
               (RETURN TEXTURE))
              ((AND (EQ W 16)
                    (ILESSP H 17))                            (* ; 
-                                                          "if it is already 16 by n n<=16, use it.")
+                                                            "if it is already 16 by n n<=16, use it.")
               (RETURN BITMAP))
              (T                                              (* ; "make a 16 bit wide one.")
                 (SETQ TEXTURE (BITMAPCREATE 16 (IMIN H 16)))
-                (for X from 0 by W to 16
-                   do (BITBLT BITMAP 0 0 TEXTURE X 0 W H 'INPUT 'REPLACE))
+                (for X from 0 by W to 16 do (BITBLT BITMAP 0 0 TEXTURE X 0 W H 'INPUT 'REPLACE))
                 (RETURN TEXTURE])
 
 (PRINTBITMAP
-  [LAMBDA (BITMAP FILE)                                  (* ; "Edited  1-Dec-86 16:24 by Pavel")
+  [LAMBDA (BITMAP FILE)                                      (* ; "Edited  1-Dec-86 16:24 by Pavel")
 
 (* ;;; "Writes a bitmap on a file such that READBITMAP will read it back in.")
 
@@ -400,26 +386,26 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           (COND
              ((type? BITMAP BITMAP))
              ([AND (LITATOM BITMAP)
-                   (type? BITMAP (SETQ BM (EVALV BITMAP] (* ; 
-                                    "Coerce litatoms for compatibility with original specification")
+                   (type? BITMAP (SETQ BM (EVALV BITMAP]     (* ; 
+                                      "Coerce litatoms for compatibility with original specification")
               )
              (T (printout T "******** " BITMAP " is not a BITMAP." T)
                 (RETURN NIL)))
           (printout FILE "(" .P2 (BITMAPWIDTH BM)
-                 %, .P2 (BITMAPHEIGHT BM))               (* ; 
-                                          "if the number of bits per pixel is not 1, write it out.")
+                 %, .P2 (BITMAPHEIGHT BM))                   (* ; 
+                                            "if the number of bits per pixel is not 1, write it out.")
           (COND
              ((NEQ (BITSPERPIXEL BM)
                    1)
               (SPACES 1 FILE)
               (PRIN2 (BITSPERPIXEL BM)
                      FILE)))                                 (* ; 
-                                                   "Enclose in list so that compile-copying works.")
-          (\WRITEBITMAP BM FILE)                         (* ; "Now write out contents.")
+                                                     "Enclose in list so that compile-copying works.")
+          (\WRITEBITMAP BM FILE)                             (* ; "Now write out contents.")
           (PRIN1 ")" FILE])
 
 (PRINT-BITMAPS-NICELY
-  [LAMBDA (BITMAP STREAM)                                (* ; "Edited 20-Mar-87 17:06 by jop")
+  [LAMBDA (BITMAP STREAM)                                    (* ; "Edited 20-Mar-87 17:06 by jop")
 
 (* ;;; "The syntax for bitmaps is")
 
@@ -430,60 +416,57 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (* ;;; "This function %"observes%" *print-length*: it truncates after printing *print-length* characters in the bitmap's representation.")
 
     (if (OR (NULL STREAM)
-                (NULL *PRINT-ARRAY*))
+            (NULL *PRINT-ARRAY*))
         then 
+             (* ;; "Let it be printed in the normal way, with an address.")
 
-              (* ;; "Let it be printed in the normal way, with an address.")
-
-              NIL
+             NIL
       else 
+           (* ;; "Print this bitmap in the preferred way.")
 
-            (* ;; "Print this bitmap in the preferred way.")
-
-            (LET* ((WIDTH (BITMAPWIDTH BITMAP))
-                   (HEIGHT (BITMAPHEIGHT BITMAP))
-                   (BITS-PER-PIXEL (BITSPERPIXEL BITMAP))
-                   (BASE (fetch BITMAPBASE of BITMAP))
-                   (QUAD-CHARS-PER-ROW (FOLDHI (CL:* WIDTH BITS-PER-PIXEL)
-                                              16))
-                   (CHARS-SO-FAR *PRINT-LENGTH*))
-                  (PRINTOUT STREAM "#*(" .P2 WIDTH " " .P2 HEIGHT)
-                  (if (NEQ BITS-PER-PIXEL 1)
-                      then (PRINTOUT STREAM " " .P2 BITS-PER-PIXEL))
-                  (PRINTOUT STREAM ")")
-                  (PROG NIL
-                        [CL:MACROLET [(ELIDE? NIL `(IF (AND CHARS-SO-FAR (EQ 0 (CL:DECF 
-                                                                                         CHARS-SO-FAR
-                                                                                          )))
-                                                       THEN (PRINTOUT STREAM "...")
-                                                             (GO OUT]
-                               (CL:DOTIMES (ROW HEIGHT)
-                                   (CL:DOTIMES (QUAD QUAD-CHARS-PER-ROW)
-                                       (CL:WRITE-CHAR (CL:INT-CHAR (+ (LRSH (\GETBASEBYTE BASE 0)
-                                                                            4)
-                                                                      (CL:CHAR-INT #\@)))
-                                              STREAM)
-                                       (ELIDE?)
-                                       (CL:WRITE-CHAR (CL:INT-CHAR (+ (LOGAND (\GETBASEBYTE BASE 0)
-                                                                             15)
-                                                                      (CL:CHAR-INT #\@)))
-                                              STREAM)
-                                       (ELIDE?)
-                                       (CL:WRITE-CHAR (CL:INT-CHAR (+ (LRSH (\GETBASEBYTE BASE 1)
-                                                                            4)
-                                                                      (CL:CHAR-INT #\@)))
-                                              STREAM)
-                                       (ELIDE?)
-                                       (CL:WRITE-CHAR (CL:INT-CHAR (+ (LOGAND (\GETBASEBYTE BASE 1)
-                                                                             15)
-                                                                      (CL:CHAR-INT #\@)))
-                                              STREAM)
-                                       (ELIDE?)
-                                       (SETQ BASE (\ADDBASE BASE 1))))]
-                    OUT (RETURN T])
+           (LET* ((WIDTH (BITMAPWIDTH BITMAP))
+                  (HEIGHT (BITMAPHEIGHT BITMAP))
+                  (BITS-PER-PIXEL (BITSPERPIXEL BITMAP))
+                  (BASE (fetch BITMAPBASE of BITMAP))
+                  (QUAD-CHARS-PER-ROW (FOLDHI (CL:* WIDTH BITS-PER-PIXEL)
+                                             16))
+                  (CHARS-SO-FAR *PRINT-LENGTH*))
+                 (PRINTOUT STREAM "#*(" .P2 WIDTH " " .P2 HEIGHT)
+                 (if (NEQ BITS-PER-PIXEL 1)
+                     then (PRINTOUT STREAM " " .P2 BITS-PER-PIXEL))
+                 (PRINTOUT STREAM ")")
+                 (PROG NIL
+                       [CL:MACROLET [(ELIDE? NIL `(IF (AND CHARS-SO-FAR (EQ 0 (CL:DECF CHARS-SO-FAR))
+                                                           )
+                                                      THEN (PRINTOUT STREAM "...")
+                                                           (GO OUT]
+                              (CL:DOTIMES (ROW HEIGHT)
+                                  (CL:DOTIMES (QUAD QUAD-CHARS-PER-ROW)
+                                      (CL:WRITE-CHAR (CL:INT-CHAR (+ (LRSH (\GETBASEBYTE BASE 0)
+                                                                           4)
+                                                                     (CL:CHAR-INT #\@)))
+                                             STREAM)
+                                      (ELIDE?)
+                                      (CL:WRITE-CHAR (CL:INT-CHAR (+ (LOGAND (\GETBASEBYTE BASE 0)
+                                                                            15)
+                                                                     (CL:CHAR-INT #\@)))
+                                             STREAM)
+                                      (ELIDE?)
+                                      (CL:WRITE-CHAR (CL:INT-CHAR (+ (LRSH (\GETBASEBYTE BASE 1)
+                                                                           4)
+                                                                     (CL:CHAR-INT #\@)))
+                                             STREAM)
+                                      (ELIDE?)
+                                      (CL:WRITE-CHAR (CL:INT-CHAR (+ (LOGAND (\GETBASEBYTE BASE 1)
+                                                                            15)
+                                                                     (CL:CHAR-INT #\@)))
+                                             STREAM)
+                                      (ELIDE?)
+                                      (SETQ BASE (\ADDBASE BASE 1))))]
+                   OUT (RETURN T])
 
 (PRINTCURSOR
-  [LAMBDA (VAR)                                          (* ; "Edited  2-Dec-86 14:15 by Pavel")
+  [LAMBDA (VAR)                                              (* ; "Edited  2-Dec-86 14:15 by Pavel")
 
     (* ;; "Writes an expression that will define the cursor value of VAR")
 
@@ -495,13 +478,16 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           (\CURSORBITSPERPIXEL CUR 1)
           (SETQ IMAGE (fetch (CURSOR CUIMAGE) of CUR))
           (SETQ MASK (fetch (CURSOR CUMASK) of CUR))
-          (PRINT `(RPAQ ,VAR (CURSORCREATE ',IMAGE ',(AND (NOT (EQ IMAGE MASK))
-                                                          MASK)
-                                    ,(fetch (CURSOR CUHOTSPOTX) of CUR)
-                                    ,(fetch (CURSOR CUHOTSPOTY) of CUR])
+          (PRINT `(RPAQ (\, VAR)
+                        (CURSORCREATE ',IMAGE ',(AND (NOT (EQ IMAGE MASK))
+                                                     MASK)
+                               ,(fetch (CURSOR CUHOTSPOTX)
+                                       of CUR)
+                               ,(fetch (CURSOR CUHOTSPOTY)
+                                       of CUR)))])
 
 (\WRITEBITMAP
-  [LAMBDA (BITMAP FILE)                                  (* ; "Edited  1-Dec-86 16:24 by Pavel")
+  [LAMBDA (BITMAP FILE)                                      (* ; "Edited  1-Dec-86 16:24 by Pavel")
 
 (* ;;; "writes the contents of a bitmap onto the currently open output file.")
 
@@ -513,18 +499,18 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                  (\BOUT OFD (CHARCODE %"))
                  (SETQ LIM (\ADDBASE BASE W))
                  (until (EQ BASE LIM) do (\BOUT OFD (IPLUS (SUB1 (CHARCODE A))
-                                                                   (LRSH (\GETBASEBYTE BASE 0)
-                                                                         4)))
-                                                (\BOUT OFD (IPLUS (SUB1 (CHARCODE A))
-                                                                  (LOGAND (\GETBASEBYTE BASE 0)
-                                                                         15)))
-                                                (\BOUT OFD (IPLUS (SUB1 (CHARCODE A))
-                                                                  (LRSH (\GETBASEBYTE BASE 1)
-                                                                        4)))
-                                                (\BOUT OFD (IPLUS (SUB1 (CHARCODE A))
-                                                                  (LOGAND (\GETBASEBYTE BASE 1)
-                                                                         15)))
-                                                (SETQ BASE (\ADDBASE BASE 1)))
+                                                           (LRSH (\GETBASEBYTE BASE 0)
+                                                                 4)))
+                                         (\BOUT OFD (IPLUS (SUB1 (CHARCODE A))
+                                                           (LOGAND (\GETBASEBYTE BASE 0)
+                                                                  15)))
+                                         (\BOUT OFD (IPLUS (SUB1 (CHARCODE A))
+                                                           (LRSH (\GETBASEBYTE BASE 1)
+                                                                 4)))
+                                         (\BOUT OFD (IPLUS (SUB1 (CHARCODE A))
+                                                           (LOGAND (\GETBASEBYTE BASE 1)
+                                                                  15)))
+                                         (SETQ BASE (\ADDBASE BASE 1)))
                  (\BOUT OFD (CHARCODE %"])
 )
 
@@ -532,7 +518,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (\GETINTEGERPART
-  [LAMBDA (FRACT)                                        (* JonL " 7-May-84 02:43")
+  [LAMBDA (FRACT)                                            (* JonL " 7-May-84 02:43")
 
     (* ;; "gets the integer part of a fixed point number.  The integer part has INTEGERBITS worth of significant bits the leftmost of which is sign.")
 
@@ -551,13 +537,13 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                                     (CONSTANT (IDIFFERENCE BITSPERWORD INTEGERBITS]
                              (CONSTANT (EXPT 2 (SUB1 INTEGERBITS]
                                                              (* ; 
-                                                           "the sign bit is on, make it negative.")
+                                                             "the sign bit is on, make it negative.")
                       (IDIFFERENCE (IDIFFERENCE HIPART (CONSTANT (EXPT 2 INTEGERBITS)))
                              ROUNDER))
                      (T (IPLUS HIPART ROUNDER])
 
 (\CONVERTTOFRACTION
-  [LAMBDA (FLOAT)                                        (* rmk%: " 3-JUL-82 23:29")
+  [LAMBDA (FLOAT)                                            (* rmk%: " 3-JUL-82 23:29")
 
     (* ;; "converts a floating point number into a fixed point number with INTEGERBITS worth of integer part.  Always returns a large integer so that the box can be clobbered.")
 
@@ -588,7 +574,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (CURSORP
-  [LAMBDA (X)                                            (* kbr%: " 5-Jul-85 17:54")
+  [LAMBDA (X)                                                (* kbr%: " 5-Jul-85 17:54")
                                                              (* ; "is X a cursor?")
     (type? CURSOR X])
 
@@ -596,14 +582,14 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
   [LAMBDA NIL CursorBitMap])
 
 (CreateCursorBitMap
-  [LAMBDA (ARRAY)                                        (* rmk%: " 1-APR-82 22:20")
+  [LAMBDA (ARRAY)                                            (* rmk%: " 1-APR-82 22:20")
                                                              (* ; 
-                                                        "makes a bitmap out of an array of values.")
+                                                          "makes a bitmap out of an array of values.")
     (PROG ((BM (BITMAPCREATE 16 16))
            BASE)
           (SETQ BASE (ffetch BITMAPBASE of BM))
           (for I from 0 to 15 do (\PUTBASE BASE I (LOGAND (ELT ARRAY (ADD1 I))
-                                                                         WORDMASK)))
+                                                         WORDMASK)))
           (RETURN BM])
 )
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE 
@@ -632,16 +618,15 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
        ((BITMAPS \DefaultCaret)
         (INITVARS (\CARET.UP NIL 
 
-                         (* ;; "global.  NIL if no caret showing, otherwise a CARET1 record with CURSOR, stream, x, y, and RATE (= off rate)")
+                         (* ;; "global.  NIL if no caret showing, otherwise a CARET1 record with CURSOR, stream, x, y, and RATE (= off rate)")
 )
-               (\CARET.DEFAULT NIL                           (* ; 
-                                "global = default caret to put up.  An instance of CARET1 datatype")
+               (\CARET.DEFAULT NIL                           (* ; 
+                                  "global = default caret to put up.  An instance of CARET1 datatype")
                       )
                (\CARET.TIMER (SETUPTIMER 0)
-                                                             (* ; "time for next caret action"))
+                                                             (* ; "time for next caret action"))
                (DEFAULTCARET (CURSORCREATE \DefaultCaret NIL 3 4))
-               (DEFAULTCARETRATE 333                         (* ; "default rate for flashing caret")
-                      )
+               (DEFAULTCARETRATE 333                         (* ; "default rate for flashing caret"))
                (\CARET.ON.RATE DEFAULTCARETRATE)
                (\CARET.OFF.RATE DEFAULTCARETRATE)
                (\CARET.FORCED.OFF.RATE 0))
@@ -651,7 +636,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
         (FNS CARET \CARET.CREATE \CARET.DOWN \CARET.FLASH? \CARET.SHOW CARETRATE \CARET.FLASH.AGAIN 
              \CARET.FLASH.MULTIPLE \CARET.FLASH)
         (FNS \MEDW.CARET.SHOW)
-                                                             (* ; "some declarations are on LLDISPLAY -- macro for \CHECKCARET and globalvar declaration for \CARET.UP")
+                                                             (* ; "some declarations are on LLDISPLAY -- macro for \CHECKCARET and globalvar declaration for \CARET.UP")
         (GLOBALVARS \CARET.DEFAULT \CARET.ON.RATE \CARET.OFF.RATE DEFAULTCARET \CARET.TIMER \CARET.UP
                \CARET.FORCED.OFF.RATE)
         (DECLARE%: DONTEVAL@LOAD DOCOPY (ADDVARS (TTYBACKGROUNDFNS \CARET.FLASH?)))
@@ -661,20 +646,19 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (RPAQQ \DefaultCaret #*(7 6)A@@@CH@@CH@@FL@@FL@@LF@@)
 
 (RPAQ? \CARET.UP NIL 
-                         (* ;; "global.  NIL if no caret showing, otherwise a CARET1 record with CURSOR, stream, x, y, and RATE (= off rate)")
+                     (* ;; "global.  NIL if no caret showing, otherwise a CARET1 record with CURSOR, stream, x, y, and RATE (= off rate)")
 )
 
-(RPAQ? \CARET.DEFAULT NIL                                (* ; 
-                                "global = default caret to put up.  An instance of CARET1 datatype")
+(RPAQ? \CARET.DEFAULT NIL                                    (* ; 
+                                  "global = default caret to put up.  An instance of CARET1 datatype")
 )
 
 (RPAQ? \CARET.TIMER (SETUPTIMER 0)
-                                                             (* ; "time for next caret action"))
+                                                             (* ; "time for next caret action"))
 
 (RPAQ? DEFAULTCARET (CURSORCREATE \DefaultCaret NIL 3 4))
 
-(RPAQ? DEFAULTCARETRATE 333                              (* ; "default rate for flashing caret")
-)
+(RPAQ? DEFAULTCARETRATE 333                                  (* ; "default rate for flashing caret"))
 
 (RPAQ? \CARET.ON.RATE DEFAULTCARETRATE)
 
@@ -686,36 +670,36 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DECLARE%: DONTCOPY 
 (DECLARE%: EVAL@COMPILE
 
-(RECORD CARET1                                           (* ; 
-                                                          "a record that describes a SHOWING caret")
-                   (STREAM                                   (* ; 
-                                                           "the stream the caret is showing in")
-                          STREAMX                            (* ; 
-                                              "the X position stream relative that it was shown at")
-                          STREAMY                            (* ; 
-                                              "the Y position stream relative that it was shown at")
-                          CURSOR                             (* ; 
-                                           "the cursor bitmap + x and y that this caret represents")
-                          RATE                               (* ; "the 'down rate' for this caret, in ticks.  After comes down (when \CARET.TIMER expires), \CARET.TIMER will be rescheduled to put something up.  This is the rate to use")
-                                                             (* ; 
-                                                           "NEXT for threading carets together")
-                           . NEXT))
+(RECORD CARET1                                               (* ; 
+                                                            "a record that describes a SHOWING caret")
+               (STREAM                                       (* ; 
+                                                             "the stream the caret is showing in")
+                      STREAMX                                (* ; 
+                                                "the X position stream relative that it was shown at")
+                      STREAMY                                (* ; 
+                                                "the Y position stream relative that it was shown at")
+                      CURSOR                                 (* ; 
+                                             "the cursor bitmap + x and y that this caret represents")
+                      RATE                                   (* ; "the 'down rate' for this caret, in ticks.  After comes down (when \CARET.TIMER expires), \CARET.TIMER will be rescheduled to put something up.  This is the rate to use")
+                                                             (* ; 
+                                                             "NEXT for threading carets together")
+                       . NEXT))
 )
 )
 (DEFINEQ
 
 (CARET
-  [LAMBDA (NEWCARET)                                     (* kbr%: " 6-Jul-85 16:13")
+  [LAMBDA (NEWCARET)                                         (* kbr%: " 6-Jul-85 16:13")
                                                              (* ; 
-                                                           "changes the 'system default' caret")
+                                                             "changes the 'system default' caret")
     (PROG1 (COND
               (\CARET.DEFAULT                                (* ; 
-                                                "merely stored as a 'cursor' record for simplicity")
+                                                  "merely stored as a 'cursor' record for simplicity")
                      (fetch (CARET1 CURSOR) of \CARET.DEFAULT))
               (T 'OFF))
         [COND
            (NEWCARET (\CHECKCARET)
-                  (CARETRATE (CARETRATE))            (* ; "make sure the caret rate is set")
+                  (CARETRATE (CARETRATE))                    (* ; "make sure the caret rate is set")
                   (SETQ \CARET.DEFAULT (SELECTQ NEWCARET
                                            (T (COND
                                                  ((EQ DEFAULTCARET 'OFF)
@@ -733,12 +717,12 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                               (T (LISPERROR "ILLEGAL ARG" NEWCARET])])
 
 (\CARET.CREATE
-  [LAMBDA (CURSOR)                                       (* jds "11-Jul-85 19:38")
+  [LAMBDA (CURSOR)                                           (* jds "11-Jul-85 19:38")
     (create CARET1
            CURSOR _ (OR CURSOR DEFAULTCARET])
 
 (\CARET.DOWN
-  [LAMBDA (STREAM INTERVAL UNLESSOCCLUDED)               (* lmm " 4-May-84 18:15")
+  [LAMBDA (STREAM INTERVAL UNLESSOCCLUDED)                   (* lmm " 4-May-84 18:15")
 
     (* ;; "take caret down if it is up.  If you take it down, reschedule to put it back up in INTERVAL (or 0) --- often called thru \CHECKCARET macro")
 
@@ -752,18 +736,17 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                   (fetch (WINDOW DSP) of STREAM))
                                  (T STREAM]
                       [while (UNINTERRUPTABLY
-                                     [COND
-                                        ((\CARET.SHOW \CARET.UP UNLESSOCCLUDED)
+                                 [COND
+                                    ((\CARET.SHOW \CARET.UP UNLESSOCCLUDED)
                                                              (* ; 
-                                                           "take caret down and set global state")
-                                         (replace (CARET1 STREAM) of \CARET.UP with
-                                                                                       NIL)
-                                         (SETQ \CARET.UP (fetch (CARET1 NEXT) of \CARET.UP])]
+                                                             "take caret down and set global state")
+                                     (replace (CARET1 STREAM) of \CARET.UP with NIL)
+                                     (SETQ \CARET.UP (fetch (CARET1 NEXT) of \CARET.UP])]
                       (SETUPTIMER (OR INTERVAL \CARET.FORCED.OFF.RATE)
                              \CARET.TIMER])
 
 (\CARET.FLASH?
-  [LAMBDA (STREAM CARET ONRATE OFFRATE X Y)              (* AJB "17-Jul-85 12:47")
+  [LAMBDA (STREAM CARET ONRATE OFFRATE X Y)                  (* AJB "17-Jul-85 12:47")
 
 (* ;;; "Flashes the CARET at the ONRATE/OFFRATE at the X,Y position in the current TTY window.  If CARET is NIL, uses \CARET.DEFAULT as the caret.  Takes either a display stream or a textstream as the destination stream to flash the caret.  The caret is not flashed on a shift-selection in a window")
 
@@ -779,38 +762,35 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
              (TIMEREXPIRED? \CARET.TIMER)
              [OR [DISPLAYSTREAMP (OR STREAM (SETQ STREAM (TTYDISPLAYSTREAM]
                  (AND (IMAGESTREAMTYPEP STREAM 'TEXT)
-                      (SETQ STREAM (WINDOWPROP (CAR (fetch (TEXTOBJ \WINDOW) of (TEXTOBJ
-                                                                                         STREAM)))
+                      (SETQ STREAM (WINDOWPROP (CAR (fetch (TEXTOBJ \WINDOW) of (TEXTOBJ STREAM)))
                                           'DSP]
              (\CARET.FLASH CARET STREAM OFFRATE (OR (KEYDOWNP 'LSHIFT)
-                                                        (KEYDOWNP 'RSHIFT)
-                                                        (KEYDOWNP 'COPY))
+                                                    (KEYDOWNP 'RSHIFT)
+                                                    (KEYDOWNP 'COPY))
                     X Y))
 
         (* ;; "\CARET.DEFAULT is NIL if by default the caret is OFF --- the KEYDOWNP clause is a hack to detect whether we are doing a copy-select")
 
-        (replace (CARET1 NEXT) of CARET with NIL)(* ; 
-           "Since this function is displaying a new caret, destroy any chaining of multiple carets")
+        (replace (CARET1 NEXT) of CARET with NIL)            (* ; 
+             "Since this function is displaying a new caret, destroy any chaining of multiple carets")
         (SETUPTIMER (OR ONRATE \CARET.ON.RATE)
                \CARET.TIMER)
         T])
 
 (\CARET.SHOW
-  [LAMBDA (CARET UNLESSOCCLUDED)                  (* ; "Edited 25-Feb-94 16:53 by sybalsky")
+  [LAMBDA (CARET UNLESSOCCLUDED)                          (* ; "Edited 25-Feb-94 16:53 by sybalsky")
 
     (* ;; "GENERIC caret flasher.")
 
     (LET (DS)
          (SETQ DS (fetch (CARET1 STREAM) of CARET))
-         (WINDOWOP 'SCCARETFLASH (FETCH (WINDOW SCREEN) OF (FETCH (\DISPLAYDATA 
-                                                                                     XWINDOWHINT)
-                                                                      OF (FETCH (STREAM
-                                                                                         IMAGEDATA)
-                                                                                OF DS)))
+         (WINDOWOP 'SCCARETFLASH (FETCH (WINDOW SCREEN) OF (FETCH (\DISPLAYDATA XWINDOWHINT)
+                                                              OF (FETCH (STREAM IMAGEDATA)
+                                                                    OF DS)))
                 CARET UNLESSOCCLUDED])
 
 (CARETRATE
-  [LAMBDA (ONRATE OFFRATE)                               (* lmm " 3-May-84 11:35")
+  [LAMBDA (ONRATE OFFRATE)                                   (* lmm " 3-May-84 11:35")
 
     (* ;; "sets the default caret rate (s) to be ONRATE/OFFRATE in milliseconds")
 
@@ -827,50 +807,44 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                       \CARET.ON.RATE])])
 
 (\CARET.FLASH.AGAIN
-  [LAMBDA (CARET STREAM X Y)                         (* AJB "14-Aug-85 17:04")
+  [LAMBDA (CARET STREAM X Y)                                 (* AJB "14-Aug-85 17:04")
     (LET ((OCARET \CARET.UP))
          (COND
             ([AND OCARET CARET (DISPLAYSTREAMP (OR STREAM (SETQ STREAM (TTYDISPLAYSTREAM]
              (for (OC _ OCARET) by (fetch (CARET1 NEXT) of OC)
                 do (COND
-                          [(NULL OC)
-                           (RETURN (COND
-                                      ((\CARET.FLASH CARET STREAM (fetch (CARET1 RATE)
-                                                                         of \CARET.UP)
-                                              (OR (KEYDOWNP 'LSHIFT)
-                                                  (KEYDOWNP 'RSHIFT)
-                                                  (KEYDOWNP 'COPY))
-                                              X Y)           (* ; "OK, showed this one")
-                                       (OR (EQ \CARET.UP CARET)
-                                           (SHOULDNT))
-                                       (replace (CARET1 NEXT) of CARET with OCARET]
-                          ((EQ OC CARET)                     (* ; "this CARET is already showing")
-                           (RETURN])
+                      [(NULL OC)
+                       (RETURN (COND
+                                  ((\CARET.FLASH CARET STREAM (fetch (CARET1 RATE) of \CARET.UP)
+                                          (OR (KEYDOWNP 'LSHIFT)
+                                              (KEYDOWNP 'RSHIFT)
+                                              (KEYDOWNP 'COPY))
+                                          X Y)               (* ; "OK, showed this one")
+                                   (OR (EQ \CARET.UP CARET)
+                                       (SHOULDNT))
+                                   (replace (CARET1 NEXT) of CARET with OCARET]
+                      ((EQ OC CARET)                         (* ; "this CARET is already showing")
+                       (RETURN])
 
 (\CARET.FLASH.MULTIPLE
-  [LAMBDA (STREAMS CARETS ONRATE OFFRATE)                (* AJB "14-Aug-85 17:10")
+  [LAMBDA (STREAMS CARETS ONRATE OFFRATE)                    (* AJB "14-Aug-85 17:10")
                                                              (* ; 
-                                "this is probably just a template for how to flash multiple carets")
+                                  "this is probably just a template for how to flash multiple carets")
     (COND
        ((\CARET.FLASH? (CAR STREAMS)
                (CAR CARETS)
                ONRATE OFFRATE)
-        (for STR in (CDR STREAMS) as CARET in (CDR CARETS)
-           do (\CARET.FLASH.AGAIN CARET STR])
+        (for STR in (CDR STREAMS) as CARET in (CDR CARETS) do (\CARET.FLASH.AGAIN CARET STR])
 
 (\CARET.FLASH
-  [LAMBDA (CARET STREAM RATE UNLESSOCCLUDED X Y)     (* kbr%: " 5-Jul-85 17:51")
+  [LAMBDA (CARET STREAM RATE UNLESSOCCLUDED X Y)             (* kbr%: " 5-Jul-85 17:51")
     (PROG (CURSOR ANSWER)
           (SETQ CURSOR (fetch (CARET1 CURSOR) of CARET))
           (replace (CARET1 STREAM) of CARET with STREAM)
-          (replace (CARET1 STREAMX) of CARET with (IDIFFERENCE (OR X (DSPXPOSITION NIL 
-                                                                                        STREAM))
-                                                                     (fetch (CURSOR CUHOTSPOTX)
-                                                                        of CURSOR)))
-          (replace (CARET1 STREAMY) of CARET with (IDIFFERENCE (OR Y (DSPYPOSITION NIL 
-                                                                                        STREAM))
-                                                                     (fetch (CURSOR CUHOTSPOTY)
-                                                                        of CURSOR)))
+          (replace (CARET1 STREAMX) of CARET with (IDIFFERENCE (OR X (DSPXPOSITION NIL STREAM))
+                                                         (fetch (CURSOR CUHOTSPOTX) of CURSOR)))
+          (replace (CARET1 STREAMY) of CARET with (IDIFFERENCE (OR Y (DSPYPOSITION NIL STREAM))
+                                                         (fetch (CURSOR CUHOTSPOTY) of CURSOR)))
           (replace (CARET1 RATE) of CARET with (OR RATE \CARET.OFF.RATE))
           (UNINTERRUPTABLY
               (COND
@@ -882,8 +856,8 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (\MEDW.CARET.SHOW
-  [LAMBDA (SCREEN CARET UNLESSOCCLUDED)       (* ; 
-                                                "Edited 17-Jan-94 10:28 by sybalsky:mv:envos")
+  [LAMBDA (SCREEN CARET UNLESSOCCLUDED)                      (* ; 
+                                                        "Edited 17-Jan-94 10:28 by sybalsky:mv:envos")
 
     (* ;; "MEDLEY-window-system specific version of \CARET.SHOW (vectored thru the screen).  Flash the caret (by inverting its image).  UNLESSOCCLUDED controls whether you bring the window to the top if the caret is under some other window.")
 
@@ -903,7 +877,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                         (SETQ CARETBMWIDTH (fetch (BITMAP BITMAPWIDTH) of CARETBM))
                         (SETQ CARETBMHEIGHT (fetch (BITMAP BITMAPHEIGHT) of CARETBM))
                                                              (* ; 
-        "calculate how much to reduce the caret region by do to the clipping region of the window.")
+          "calculate how much to reduce the caret region by do to the clipping region of the window.")
                         (SETQ CLIPREG (fetch (\DISPLAYDATA DDClippingRegion) of DD))
                         (COND
                            ((IGREATERP (SETQ CLIPVAR (fetch (REGION LEFT) of CLIPREG))
@@ -913,8 +887,8 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                             (SETQ CWX CLIPVAR)))
                         (COND
                            ((IGREATERP CARETBMWIDTH (SETQ CLIPVAR (IDIFFERENCE
-                                                                   (IPLUS CLIPVAR (fetch
-                                                                                   (REGION WIDTH)
+                                                                   (IPLUS CLIPVAR (fetch (REGION
+                                                                                          WIDTH)
                                                                                      of CLIPREG))
                                                                    CWX)))
                             (SETQ CARETBMWIDTH CLIPVAR)))
@@ -933,20 +907,19 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                             (SETQ CARETBMHEIGHT CLIPVAR)))
 
          (* note the time of the next change. This must be done without creating boxes 
-       because happens during keyboard wait.)
+         because happens during keyboard wait.)
 
                         (COND
                            ((OR (ILESSP CARETBMWIDTH 1)
-                                (ILESSP CARETBMHEIGHT 1))    (* caret isn't within clipping 
-                                                           region.)
+                                (ILESSP CARETBMHEIGHT 1))    (* caret isn't within clipping region.)
                             (RETURN T)))                     (* convert the base of the caret 
-                                                           location to screen coordinates.)
+                                                             location to screen coordinates.)
                         (SETQ CWX (\DSPTRANSFORMX CWX DD))
                         (SETQ CWY (\DSPTRANSFORMY CWY DD))
 
-         (* having only this section uninterruptable leaves open the possibility that 
-       the window moves or the timer is wrong but these will only mess up the display 
-       and are low frequency events.)
+         (* having only this section uninterruptable leaves open the possibility that the 
+         window moves or the timer is wrong but these will only mess up the display and 
+         are low frequency events.)
 
                         (COND
                            [(AND (OPENWP CARETWIN)
@@ -976,7 +949,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (\AREAVISIBLE?
-  [LAMBDA (WIN LFT BTM RGHT TOP)                         (* kbr%: "18-Feb-86 18:05")
+  [LAMBDA (WIN LFT BTM RGHT TOP)                             (* kbr%: "18-Feb-86 18:05")
 
     (* ;; "is the area whose screen limits are LFT BTM RGHT and TOP eniretly visible within WIN,")
 
@@ -985,7 +958,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           (COND
              ((NOT (\AREAINREGIONP (fetch (WINDOW REG) of WIN)
                           LFT BTM RGHT TOP))                 (* ; 
-                               "if the caret region isn't completely within the window, forget it.")
+                                 "if the caret region isn't completely within the window, forget it.")
               (RETURN)))
       LP  (COND
              ((EQ WPTR WIN)
@@ -997,10 +970,10 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
               (GO LP])
 
 (\REGIONOVERLAPAREAP
-  [LAMBDA (REG LFT BTM RGHT TOP)                         (* rrb "17-Feb-86 18:50")
+  [LAMBDA (REG LFT BTM RGHT TOP)                             (* rrb "17-Feb-86 18:50")
 
     (* ;; 
-  "is there any overlap between the region REG and the area defined by left bottom right and top?")
+    "is there any overlap between the region REG and the area defined by left bottom right and top?")
 
     (NOT (OR (IGREATERP (fetch (REGION LEFT) of REG)
                     RGHT)
@@ -1010,7 +983,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
              (IGREATERP BTM (fetch (REGION TOP) of REG])
 
 (\AREAINREGIONP
-  [LAMBDA (REGION LFT BTM RGHT TOP)                      (* rrb "14-OCT-83 15:32")
+  [LAMBDA (REGION LFT BTM RGHT TOP)                          (* rrb "14-OCT-83 15:32")
     (AND (IGEQ LFT (fetch LEFT of REGION))
          (IGEQ BTM (fetch BOTTOM of REGION))
          (IGEQ (fetch PRIGHT of REGION)
@@ -1028,7 +1001,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (CREATEREGION
-  [LAMBDA (LEFT BOTTOM WIDTH HEIGHT)                     (* rrb "17-JUN-83 08:56")
+  [LAMBDA (LEFT BOTTOM WIDTH HEIGHT)                         (* rrb "17-JUN-83 08:56")
                                                              (* ; "creates a region structure.")
     (create REGION
            LEFT _ LEFT
@@ -1037,12 +1010,12 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
            HEIGHT _ HEIGHT])
 
 (REGIONP
-  [LAMBDA (X)                                            (* rrb "29-Jun-84 18:00")
+  [LAMBDA (X)                                                (* rrb "29-Jun-84 18:00")
     (AND (type? REGION X)
          X])
 
 (INTERSECTREGIONS
-  [LAMBDA REGIONS                                        (* kbr%: "24-Jan-86 18:30")
+  [LAMBDA REGIONS                                            (* kbr%: "24-Jan-86 18:30")
 
     (* ;; "returns the largest region that is contained in all of REGIONS")
 
@@ -1065,32 +1038,22 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                 (SETQ BTTM (fetch (REGION BOTTOM) of REG))
                 [SETQ TP (SUB1 (IPLUS BTTM (fetch (REGION HEIGHT) of REG]
                 [for I from 2 thru REGIONS do (SETQ REG (ARG REGIONS I))
-                                                             [COND
-                                                                ((IGREATERP (fetch (REGION LEFT)
-                                                                               of REG)
-                                                                        LFT)
-                                                                 (SETQ LFT (fetch (REGION LEFT)
-                                                                              of REG]
-                                                             [COND
-                                                                ((IGREATERP (fetch (REGION BOTTOM
-                                                                                              )
-                                                                               of REG)
-                                                                        BTTM)
-                                                                 (SETQ BTTM (fetch (REGION BOTTOM
-                                                                                              )
-                                                                               of REG]
-                                                             [COND
-                                                                ((ILESSP (fetch (REGION RIGHT)
-                                                                            of REG)
-                                                                        RGHT)
-                                                                 (SETQ RGHT (fetch (REGION RIGHT)
-                                                                               of REG]
-                                                             (COND
-                                                                ((ILESSP (fetch (REGION TOP)
-                                                                            of REG)
-                                                                        TP)
-                                                                 (SETQ TP (fetch (REGION TOP)
-                                                                             of REG]
+                                              [COND
+                                                 ((IGREATERP (fetch (REGION LEFT) of REG)
+                                                         LFT)
+                                                  (SETQ LFT (fetch (REGION LEFT) of REG]
+                                              [COND
+                                                 ((IGREATERP (fetch (REGION BOTTOM) of REG)
+                                                         BTTM)
+                                                  (SETQ BTTM (fetch (REGION BOTTOM) of REG]
+                                              [COND
+                                                 ((ILESSP (fetch (REGION RIGHT) of REG)
+                                                         RGHT)
+                                                  (SETQ RGHT (fetch (REGION RIGHT) of REG]
+                                              (COND
+                                                 ((ILESSP (fetch (REGION TOP) of REG)
+                                                         TP)
+                                                  (SETQ TP (fetch (REGION TOP) of REG]
                 (RETURN (COND
                            ((AND (IGEQ RGHT LFT)
                                  (IGEQ TP BTTM))
@@ -1101,7 +1064,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                    HEIGHT _ (ADD1 (IDIFFERENCE TP BTTM])
 
 (UNIONREGIONS
-  [LAMBDA REGIONS                                        (* rrb "30-Dec-85 17:07")
+  [LAMBDA REGIONS                                            (* rrb "30-Dec-85 17:07")
 
     (* ;; "returns the smallest region that encloses all of REGIONS")
 
@@ -1115,32 +1078,22 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                 (SETQ BTTM (fetch (REGION BOTTOM) of REG))
                 (SETQ TP (fetch (REGION PTOP) of REG))
                 [for I from 2 thru REGIONS do (SETQ REG (ARG REGIONS I))
-                                                             [COND
-                                                                ((LESSP (fetch (REGION LEFT)
-                                                                           of REG)
-                                                                        LFT)
-                                                                 (SETQ LFT (fetch (REGION LEFT)
-                                                                              of REG]
-                                                             [COND
-                                                                ((LESSP (fetch (REGION BOTTOM)
-                                                                           of REG)
-                                                                        BTTM)
-                                                                 (SETQ BTTM (fetch (REGION BOTTOM
-                                                                                              )
-                                                                               of REG]
-                                                             [COND
-                                                                ((GREATERP (fetch (REGION PRIGHT)
-                                                                              of REG)
-                                                                        RGHT)
-                                                                 (SETQ RGHT (fetch (REGION PRIGHT
-                                                                                              )
-                                                                               of REG]
-                                                             (COND
-                                                                ((GREATERP (fetch (REGION PTOP)
-                                                                              of REG)
-                                                                        TP)
-                                                                 (SETQ TP (fetch (REGION PTOP)
-                                                                             of REG]
+                                              [COND
+                                                 ((LESSP (fetch (REGION LEFT) of REG)
+                                                         LFT)
+                                                  (SETQ LFT (fetch (REGION LEFT) of REG]
+                                              [COND
+                                                 ((LESSP (fetch (REGION BOTTOM) of REG)
+                                                         BTTM)
+                                                  (SETQ BTTM (fetch (REGION BOTTOM) of REG]
+                                              [COND
+                                                 ((GREATERP (fetch (REGION PRIGHT) of REG)
+                                                         RGHT)
+                                                  (SETQ RGHT (fetch (REGION PRIGHT) of REG]
+                                              (COND
+                                                 ((GREATERP (fetch (REGION PTOP) of REG)
+                                                         TP)
+                                                  (SETQ TP (fetch (REGION PTOP) of REG]
                 (RETURN (create REGION
                                LEFT _ LFT
                                BOTTOM _ BTTM
@@ -1148,7 +1101,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                HEIGHT _ (DIFFERENCE TP BTTM])
 
 (REGIONSINTERSECTP
-  [LAMBDA (REGION1 REGION2)                              (* rrb "16-AUG-81 08:29")
+  [LAMBDA (REGION1 REGION2)                                  (* rrb "16-AUG-81 08:29")
 
     (* ;; "determines if two regions intersect")
 
@@ -1162,7 +1115,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                     (fetch TOP of REGION1])
 
 (SUBREGIONP
-  [LAMBDA (LARGEREGION SMALLREGION)                      (* rrb "25-JUN-82 15:09")
+  [LAMBDA (LARGEREGION SMALLREGION)                          (* rrb "25-JUN-82 15:09")
 
     (* ;; "determines if small region is a subset of large region.  (SUBREGIONP '(9 0 100 100) '(0 10 100 80))")
 
@@ -1176,100 +1129,82 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                (fetch PTOP of SMALLREGION])
 
 (EXTENDREGION
-  [LAMBDA (REGION INCLUDEREGION)                         (* rrb " 5-FEB-82 09:25")
+  [LAMBDA (REGION INCLUDEREGION)                             (* rrb " 5-FEB-82 09:25")
 
     (* ;; "destructively extends REGION to include INCLUDEREGION")
 
     [COND
        ((IGREATERP (fetch (REGION LEFT) of REGION)
                (fetch (REGION LEFT) of INCLUDEREGION))
-        (replace (REGION WIDTH) of REGION with (IDIFFERENCE (fetch (REGION PRIGHT)
-                                                                           of REGION)
-                                                                  (fetch (REGION LEFT)
-                                                                     of INCLUDEREGION)))
-        (replace (REGION LEFT) of REGION with (fetch (REGION LEFT) of 
-                                                                                        INCLUDEREGION
-                                                                 ]
+        (replace (REGION WIDTH) of REGION with (IDIFFERENCE (fetch (REGION PRIGHT) of REGION)
+                                                      (fetch (REGION LEFT) of INCLUDEREGION)))
+        (replace (REGION LEFT) of REGION with (fetch (REGION LEFT) of INCLUDEREGION]
     [COND
        ((IGREATERP (fetch (REGION BOTTOM) of REGION)
                (fetch (REGION BOTTOM) of INCLUDEREGION))
-        (replace (REGION HEIGHT) of REGION with (IDIFFERENCE (fetch (REGION PTOP)
-                                                                            of REGION)
-                                                                   (fetch (REGION BOTTOM)
-                                                                      of INCLUDEREGION)))
-        (replace (REGION BOTTOM) of REGION with (fetch (REGION BOTTOM) of 
-                                                                                        INCLUDEREGION
-                                                                   ]
+        (replace (REGION HEIGHT) of REGION with (IDIFFERENCE (fetch (REGION PTOP) of REGION)
+                                                       (fetch (REGION BOTTOM) of INCLUDEREGION)))
+        (replace (REGION BOTTOM) of REGION with (fetch (REGION BOTTOM) of INCLUDEREGION]
     [COND
        ((IGREATERP (fetch (REGION RIGHT) of INCLUDEREGION)
                (fetch (REGION RIGHT) of REGION))
-        (replace (REGION WIDTH) of REGION with (ADD1 (IDIFFERENCE (fetch (REGION
-                                                                                          RIGHT)
-                                                                                 of INCLUDEREGION
-                                                                                     )
-                                                                        (fetch (REGION LEFT)
-                                                                           of REGION]
+        (replace (REGION WIDTH) of REGION with (ADD1 (IDIFFERENCE (fetch (REGION RIGHT) of 
+                                                                                        INCLUDEREGION
+                                                                         )
+                                                            (fetch (REGION LEFT) of REGION]
     [COND
        ((IGREATERP (fetch (REGION TOP) of INCLUDEREGION)
                (fetch (REGION TOP) of REGION))
-        (replace (REGION HEIGHT) of REGION with (ADD1 (IDIFFERENCE (fetch
-                                                                                (REGION TOP)
-                                                                                  of 
+        (replace (REGION HEIGHT) of REGION with (ADD1 (IDIFFERENCE (fetch (REGION TOP) of 
                                                                                         INCLUDEREGION
-                                                                                )
-                                                                         (fetch (REGION BOTTOM)
-                                                                            of REGION]
+                                                                          )
+                                                             (fetch (REGION BOTTOM) of REGION]
     REGION])
 
 (EXTENDREGIONBOTTOM
-  [LAMBDA (REG NEWBOTTOM)                                (* rrb "29-DEC-81 10:02")
+  [LAMBDA (REG NEWBOTTOM)                                    (* rrb "29-DEC-81 10:02")
                                                              (* ; "extends a region to the bottom")
     (PROG ((OLDBOTTOM (fetch (REGION BOTTOM) of REG)))
           [COND
              ((IGREATERP OLDBOTTOM NEWBOTTOM)
               (replace (REGION BOTTOM) of REG with NEWBOTTOM)
-              (replace (REGION HEIGHT) of REG with (IPLUS (fetch (REGION HEIGHT)
-                                                                         of REG)
-                                                                      (IDIFFERENCE OLDBOTTOM 
-                                                                             NEWBOTTOM]
+              (replace (REGION HEIGHT) of REG with (IPLUS (fetch (REGION HEIGHT) of REG)
+                                                          (IDIFFERENCE OLDBOTTOM NEWBOTTOM]
           (RETURN REG])
 
 (EXTENDREGIONLEFT
-  [LAMBDA (REG NEWLEFT)                                  (* rrb "29-DEC-81 09:37")
+  [LAMBDA (REG NEWLEFT)                                      (* rrb "29-DEC-81 09:37")
                                                              (* ; "extends a region to the left")
     (PROG ((OLDLEFT (fetch (REGION LEFT) of REG)))
           [COND
              ((IGREATERP OLDLEFT NEWLEFT)
               (replace (REGION LEFT) of REG with NEWLEFT)
-              (replace (REGION WIDTH) of REG with (IPLUS (fetch (REGION WIDTH)
-                                                                        of REG)
-                                                                     (IDIFFERENCE OLDLEFT NEWLEFT]
+              (replace (REGION WIDTH) of REG with (IPLUS (fetch (REGION WIDTH) of REG)
+                                                         (IDIFFERENCE OLDLEFT NEWLEFT]
           (RETURN REG])
 
 (EXTENDREGIONRIGHT
-  [LAMBDA (REG NEWRIGHT)                                 (* rrb "29-DEC-81 10:06")
+  [LAMBDA (REG NEWRIGHT)                                     (* rrb "29-DEC-81 10:06")
                                                              (* ; "extends a region to the left")
     (PROG ((OLDRIGHT (fetch (REGION RIGHT) of REG)))
           [COND
              ((ILESSP OLDRIGHT NEWRIGHT)
-              (replace (REGION WIDTH) of REG with (IPLUS (fetch (REGION WIDTH)
-                                                                        of REG)
-                                                                     (IDIFFERENCE NEWRIGHT OLDRIGHT]
+              (replace (REGION WIDTH) of REG with (IPLUS (fetch (REGION WIDTH) of REG)
+                                                         (IDIFFERENCE NEWRIGHT OLDRIGHT]
           (RETURN REG])
 
 (EXTENDREGIONTOP
-  [LAMBDA (REG NEWTOP)                                   (* rrb "29-DEC-81 10:07")
+  [LAMBDA (REG NEWTOP)                                       (* rrb "29-DEC-81 10:07")
                                                              (* ; "extends a region to the top")
     (PROG ((OLDTOP (fetch (REGION TOP) of REG)))
           [COND
              ((ILESSP OLDTOP NEWTOP)
-              (replace (REGION HEIGHT) of REG with (IPLUS (fetch (REGION HEIGHT)
-                                                                         of REG)
-                                                                      (IDIFFERENCE NEWTOP OLDTOP]
+              (replace (REGION HEIGHT) of REG with (IPLUS (fetch (REGION HEIGHT) of REG)
+                                                          (IDIFFERENCE NEWTOP OLDTOP]
           (RETURN REG])
 
 (INSIDEP
-  [LAMBDA (REGION POSORX Y)                              (* rrb "18-May-84 21:04")
+  [LAMBDA (REGION POSORX Y)                                  (* rrb "18-May-84 21:04")
 
     (* ;; "returns T if the position X Y is inside the region REGION.  If POSORX is a position, returns T if that position is inside of REGION")
 
@@ -1289,7 +1224,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
              (T (\ILLEGAL.ARG POSORX])
 
 (STRINGREGION
-  [LAMBDA (STR STREAM PRIN2FLG RDTBL)                    (* rmk%: "25-AUG-83 18:06")
+  [LAMBDA (STR STREAM PRIN2FLG RDTBL)                        (* rmk%: "25-AUG-83 18:06")
 
     (* ;; "returns the region taken up by STR if it were printed at the current position of STREAM")
 
@@ -1321,10 +1256,9 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (\BRUSHBITMAP
-  [LAMBDA (BRUSHSHAPE BRUSHWIDTH)                        (* rrb " 9-Sep-86 16:30")
+  [LAMBDA (BRUSHSHAPE BRUSHWIDTH)                            (* rrb " 9-Sep-86 16:30")
 
-(* ;;; 
-"returns the bitmap for the brush of the shape and size.  See comments on \InitCurveBrushes.")
+(* ;;; "returns the bitmap for the brush of the shape and size.  See comments on \InitCurveBrushes.")
 
     (DECLARE (GLOBALVARS \BrushAList))
     (LET [(BRUSHES&METHOD (CDR (OR (FASSOC BRUSHSHAPE \BrushAList)
@@ -1336,7 +1270,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 
              (BITMAPCREATE 0 0))
             [(ILESSP BRUSHWIDTH 17)                          (* ; 
-                                            "lowest 16 brushes are stored.  FIX them so ELT works.")
+                                              "lowest 16 brushes are stored.  FIX them so ELT works.")
              (ELT (fetch (BRUSHITEM BRUSHARRAY) of BRUSHES&METHOD)
                   (COND
                      ((FIXP BRUSHWIDTH))
@@ -1351,11 +1285,11 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                         BRUSHWIDTH)))
                     (replace (BRUSHITEM BRUSHCACHE) of BRUSHES&METHOD
                        with (CONS (CONS BRUSHWIDTH NEWBRUSHBM)
-                                      (fetch (BRUSHITEM BRUSHCACHE) of BRUSHES&METHOD)))
+                                  (fetch (BRUSHITEM BRUSHCACHE) of BRUSHES&METHOD)))
                     NEWBRUSHBM])
 
 (\GETBRUSH
-  [LAMBDA (BRUSH)                                        (* rrb " 9-Sep-86 16:30")
+  [LAMBDA (BRUSH)                                            (* rrb " 9-Sep-86 16:30")
     (COND
        ((type? BITMAP BRUSH)
         BRUSH)
@@ -1365,7 +1299,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
        (T (\BRUSHBITMAP 'ROUND (OR BRUSH 1])
 
 (\GETBRUSHBBT
-  [LAMBDA (BRUSHBM DISPLAYDATA BBT)                      (* kbr%: "18-Aug-85 12:46")
+  [LAMBDA (BRUSHBM DISPLAYDATA BBT)                          (* kbr%: "18-Aug-85 12:46")
 
     (* ;; "Initializes BBT for the BRUSHBM and DS and returns BBT, unless the BRUSHBM is a 1-point brush, in which case it returns NIL.")
 
@@ -1376,25 +1310,17 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                  1)
              (EQ (BITMAPBIT BRUSHBM 0 0)
                  1))                                         (* ; 
-                                                        "special case of single point brush shape.")
+                                                          "special case of single point brush shape.")
         NIL)
        (T                                                    (* ; 
-                             "update as many fields in the brush bitblt table as possible from DS.")
-          (replace (PILOTBBT PBTDESTBPL) of BBT with (UNFOLD (fetch (BITMAP 
-                                                                                    BITMAPRASTERWIDTH
-                                                                                           )
-                                                                            of
-                                                                            (fetch (\DISPLAYDATA
-                                                                                        DDDestination
-                                                                                        )
-                                                                               of DISPLAYDATA))
-                                                                        BITSPERWORD))
-          (freplace (PILOTBBT PBTSOURCEBPL) of BBT with (UNFOLD (ffetch (BITMAP
-                                                                                         
-                                                                                    BITMAPRASTERWIDTH
-                                                                                         )
-                                                                               of BRUSHBM)
-                                                                           BITSPERWORD))
+                               "update as many fields in the brush bitblt table as possible from DS.")
+          (replace (PILOTBBT PBTDESTBPL) of BBT with (UNFOLD (fetch (BITMAP BITMAPRASTERWIDTH)
+                                                                of (fetch (\DISPLAYDATA DDDestination
+                                                                                 ) of DISPLAYDATA))
+                                                            BITSPERWORD))
+          (freplace (PILOTBBT PBTSOURCEBPL) of BBT with (UNFOLD (ffetch (BITMAP BITMAPRASTERWIDTH)
+                                                                   of BRUSHBM)
+                                                               BITSPERWORD))
           (freplace (PILOTBBT PBTFLAGS) of BBT with 0)
           (freplace (PILOTBBT PBTDISJOINT) of BBT with T)
           (\SETPBTFUNCTION BBT (ffetch (\DISPLAYDATA DDSOURCETYPE) of DISPLAYDATA)
@@ -1407,7 +1333,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           BBT])
 
 (\InitCurveBrushes
-  [LAMBDA NIL                                            (* ; "Edited 13-Oct-87 14:31 by jds")
+  [LAMBDA NIL                                                (* ; "Edited 13-Oct-87 14:31 by jds")
 
     (* ;; "Set up the initial set of brush specs for curve drawing.  \BrushAList is an association list from brush-shape-names to a spec which is an instance of the record BRUSHITEM.")
 
@@ -1416,31 +1342,27 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           (SETQ \SingleBitBitmap (BITMAPCREATE 1 1))
           (BITMAPBIT \SingleBitBitmap 0 0 1)
           (for BRUSHNAME in \BrushNames do (SETQ BARRAY (ARRAY 16 'POINTER NIL 1))
-                                                      (SETQ CREATIONMETHOD (PACK* '\MAKEBRUSH. 
-                                                                                  BRUSHNAME))
-                                                      (SETA BARRAY 1 \SingleBitBitmap)
-                                                      (for SIZE from 2 to 16
-                                                         do (SETA BARRAY SIZE (APPLY* 
-                                                                                       CREATIONMETHOD
-                                                                                         SIZE)))
-                                                      (INSTALLBRUSH BRUSHNAME CREATIONMETHOD 
-                                                             BARRAY])
+                                           (SETQ CREATIONMETHOD (PACK* '\MAKEBRUSH. BRUSHNAME))
+                                           (SETA BARRAY 1 \SingleBitBitmap)
+                                           (for SIZE from 2 to 16
+                                              do (SETA BARRAY SIZE (APPLY* CREATIONMETHOD SIZE)))
+                                           (INSTALLBRUSH BRUSHNAME CREATIONMETHOD BARRAY])
 
 (\BrushFromWidth
-  [LAMBDA (W)                                            (* hdj " 5-Nov-84 16:47")
+  [LAMBDA (W)                                                (* hdj " 5-Nov-84 16:47")
     (LIST 'ROUND W])
 )
 (DEFINEQ
 
 (\MAKEBRUSH.DIAGONAL
-  [LAMBDA (SIZE)                                         (* kbr%: "18-Aug-85 12:51")
+  [LAMBDA (SIZE)                                             (* kbr%: "18-Aug-85 12:51")
     (PROG (BM)
           (SETQ BM (BITMAPCREATE SIZE SIZE))
           (for X from 0 to (SUB1 SIZE) do (BITMAPBIT BM X X 1))
           (RETURN BM])
 
 (\MAKEBRUSH.HORIZONTAL
-  [LAMBDA (SIZE)                                         (* kbr%: "18-Aug-85 12:52")
+  [LAMBDA (SIZE)                                             (* kbr%: "18-Aug-85 12:52")
 
 (* ;;; "create a brush that has a horizontal line across it halfway down")
 
@@ -1451,7 +1373,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           (RETURN BM])
 
 (\MAKEBRUSH.VERTICAL
-  [LAMBDA (SIZE)                                         (* kbr%: "18-Aug-85 12:53")
+  [LAMBDA (SIZE)                                             (* kbr%: "18-Aug-85 12:53")
     (PROG (BM)
           (SETQ BM (BITMAPCREATE SIZE SIZE))
           (BITBLT NIL NIL NIL BM (SUB1 (FOLDHI SIZE 2))
@@ -1459,16 +1381,16 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           (RETURN BM])
 
 (\MAKEBRUSH.SQUARE
-  [LAMBDA (SIZE)                                         (* kbr%: "18-Aug-85 13:07")
+  [LAMBDA (SIZE)                                             (* kbr%: "18-Aug-85 13:07")
     (PROG (BM)
           (SETQ BM (BITMAPCREATE SIZE SIZE))
           (BITBLT NIL NIL NIL BM NIL NIL NIL NIL 'TEXTURE 'REPLACE BLACKSHADE)
           (RETURN BM])
 
 (\MAKEBRUSH.ROUND
-  [LAMBDA (SIZE)                                         (* rrb "15-Sep-86 14:32")
+  [LAMBDA (SIZE)                                             (* rrb "15-Sep-86 14:32")
                                                              (* ; 
-                                       "special cased 8 so that it wouldn't have a width of 7. rrb")
+                                         "special cased 8 so that it wouldn't have a width of 7. rrb")
     (PROG (RADIUS BITMAP BASE)
           (SETQ RADIUS (SUB1 (HALF SIZE)))
           (SETQ BITMAP (BITMAPCREATE SIZE SIZE))
@@ -1503,22 +1425,22 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (INSTALLBRUSH
-  [LAMBDA (BRUSHNAME BRUSHFN BRUSHARRAY)                 (* kbr%: "18-Jan-86 15:27")
+  [LAMBDA (BRUSHNAME BRUSHFN BRUSHARRAY)                     (* kbr%: "18-Jan-86 15:27")
     (DECLARE (GLOBALVARS \BrushAList))
     (PROG (OLDENTRY)
           (SETQ OLDENTRY (FASSOC BRUSHNAME \BrushAList))
           (COND
-             (OLDENTRY (AND BRUSHARRAY (replace (BRUSHITEM BRUSHARRAY) of (CDR OLDENTRY)
-                                          with BRUSHARRAY))
-                    (AND BRUSHFN (replace (BRUSHITEM CREATEMETHOD) of (CDR OLDENTRY)
-                                    with BRUSHFN)))
+             (OLDENTRY (AND BRUSHARRAY (replace (BRUSHITEM BRUSHARRAY) of (CDR OLDENTRY) with 
+                                                                                           BRUSHARRAY
+                                              ))
+                    (AND BRUSHFN (replace (BRUSHITEM CREATEMETHOD) of (CDR OLDENTRY) with BRUSHFN)))
              (T [COND
                    ((AND BRUSHFN (NOT (ARRAYP BRUSHARRAY)))
                     (SETQ BRUSHARRAY (ARRAY 16 'POINTER NIL 1))
                     (for X from 1 to 16 do (SETA BRUSHARRAY X (APPLY* BRUSHFN X]
                 (push \BrushAList (CONS BRUSHNAME (create BRUSHITEM
-                                                             BRUSHARRAY _ BRUSHARRAY
-                                                             CREATEMETHOD _ BRUSHFN)))
+                                                         BRUSHARRAY _ BRUSHARRAY
+                                                         CREATEMETHOD _ BRUSHFN)))
                 (push KNOWN.BRUSHES BRUSHNAME])
 )
 
@@ -1549,40 +1471,81 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (\DRAWLINE.DISPLAY
-  [LAMBDA (DISPLAYSTREAM X1 Y1 X2 Y2 WIDTH OPERATION COLOR DASHING)
-                                                            (* ; "Edited 13-Jun-2021 14:03 by rmk:")
+  [LAMBDA (DISPLAYSTREAM X1 Y1 X2 Y2 WIDTH OPERATION COLOR DASHING)
+                                                             (* ; "Edited  1-Mar-2023 07:42 by lmm")
+                                                           (* ; "Edited 29-Jan-91 14:59 by matsuda")
 
-    (* ;; "DISPLAYSTREAM is guaranteed to be a display-stream.  Draws a line from x1,y1 to x2,y2 leaving the position at x2,y2")
+    (* ;; "DISPLAYSTREAM is guaranteed to be a display-stream.  Draws a line from x1,y1 to x2,y2 leaving the position at x2,y2")
 
-    (* ;; "Added handling of brushes (I think, this is actually pretty tricky).")
+    (* ;; "Added handling of brushes (I think, this is actually pretty tricky).")
 
-    (DECLARE (LOCALVARS . T))
-    (SELECTQ OPERATION
-        (NIL (ffetch DDOPERATION of (fetch IMAGEDATA of DISPLAYSTREAM)))
-        ((REPLACE PAINT INVERT ERASE) 
-             OPERATION)
-        (\ILLEGAL.ARG OPERATION))
-    (\INSURETOPWDS DISPLAYSTREAM)                            (* ; 
-                                                   "RMK:  This was only in the no-dash case, oddly")
-    (IF (OR DASHING (BRUSHP WIDTH))
-        THEN [LET ((BRUSH (INSURE.BRUSH WIDTH)))
-                      (if COLOR
-                          then (replace (BRUSH BRUSHCOLOR) of BRUSH with COLOR))
-                      (IF (BIGBITMAPP (ffetch DDDestination of (fetch IMAGEDATA
-                                                                              of DISPLAYSTREAM)))
-                          THEN (\DRAWLINE.BIGBM.DASH DISPLAYSTREAM X1 Y1 X2 Y2 BRUSH DASHING 
-                                          OPERATION)
-                        ELSE (GLOBALRESOURCES \BRUSHBBT (\LINEWITHBRUSH X1 Y1 X2 Y2 BRUSH
-                                                                   (\GOOD.DASHLST DASHING BRUSH)
-                                                                   DISPLAYSTREAM \BRUSHBBT OPERATION]
-      ELSEIF (BIGBITMAPP (ffetch DDDestination of (fetch IMAGEDATA of 
-                                                                                        DISPLAYSTREAM
-                                                                     )))
-        THEN (\DRAWLINE.BIGBM.NODASH DISPLAYSTREAM X1 Y1 X2 Y2 WIDTH OPERATION COLOR)
-      ELSE (LET ((DD (fetch IMAGEDATA of DISPLAYSTREAM)))
+    (DECLARE (LOCALVARS . T)
+           (GLOBALVARS \SCREENBITMAPS))
+    [COND
+       [(OR DASHING (BRUSHP WIDTH))
+        (GLOBALRESOURCE
+         \BRUSHBBT
+         (LET ((BBT \BRUSHBBT)
+               (BRUSH (INSURE.BRUSH WIDTH)))
+              (if COLOR
+                  then (replace (BRUSH BRUSHCOLOR) of BRUSH with COLOR))
+              (IF [NOT (type? BIGBM (ffetch DDDestination of (fetch IMAGEDATA of DISPLAYSTREAM]
+                  THEN (\LINEWITHBRUSH X1 Y1 X2 Y2 BRUSH (\GOOD.DASHLST DASHING BRUSH)
+                              DISPLAYSTREAM BBT (SELECTQ OPERATION
+                                                    (NIL (ffetch DDOPERATION
+                                                            of (fetch IMAGEDATA of DISPLAYSTREAM)))
+                                                    ((REPLACE PAINT INVERT ERASE) 
+                                                         OPERATION)
+                                                    (\ILLEGAL.ARG OPERATION)))
+                ELSE (PROG ((DD (fetch IMAGEDATA of DISPLAYSTREAM))
+                            BITMAP BIGBMLIST HEIGHT BOTTOM BM YY1 YY2 ClippingTop ClippingBottom CTop
+                            CBottom)
+                           (SETQ BITMAP (ffetch DDDestination of DD))
+                           (SETQ BIGBMLIST (fetch (BIGBM BIGBMLIST) of BITMAP))
+                           (SETQ HEIGHT (BITMAPHEIGHT BITMAP))
+                           (SETQ ClippingTop (ffetch DDClippingTop of DD))
+                           (SETQ ClippingBottom (ffetch DDClippingBottom of DD))
+                           (SETQ BM (GetNewFragment BIGBMLIST))
+                           (while (AND BM (IGREATERP HEIGHT ClippingBottom))
+                              do (SETQ BOTTOM (IDIFFERENCE HEIGHT (BITMAPHEIGHT BM)))
+                                 [SETQ CTop (COND
+                                               ((IGREATERP ClippingTop HEIGHT)
+                                                (IDIFFERENCE HEIGHT BOTTOM))
+                                               (T (IDIFFERENCE ClippingTop BOTTOM]
+                                 (if (IGEQ CTop 0)
+                                     then [SETQ CBottom (COND
+                                                           ((ILESSP ClippingBottom BOTTOM)
+                                                            0)
+                                                           (T (IDIFFERENCE ClippingBottom BOTTOM]
+                                          (replace DDDestination of DD with BM)
+                                          (replace DDClippingTop of DD with CTop)
+                                          (replace DDClippingBottom of DD with CBottom)
+                                          (\LINEWITHBRUSH X1 (IDIFFERENCE Y1 BOTTOM)
+                                                 X2
+                                                 (IDIFFERENCE Y2 BOTTOM)
+                                                 BRUSH
+                                                 (\GOOD.DASHLST DASHING BRUSH)
+                                                 DISPLAYSTREAM BBT
+                                                 (SELECTQ OPERATION
+                                                     (NIL (ffetch DDOPERATION
+                                                             of (fetch IMAGEDATA of DISPLAYSTREAM)))
+                                                     ((REPLACE PAINT INVERT ERASE) 
+                                                          OPERATION)
+                                                     (\ILLEGAL.ARG OPERATION)))
+                                          (SETQ BM (GetNewFragment BIGBMLIST))
+                                          (SETQ HEIGHT BOTTOM)))
+                           (freplace DDDestination of DD with BITMAP)
+                           (freplace DDClippingTop of DD with ClippingTop)
+                           (freplace DDClippingBottom of DD with ClippingBottom]
+       (T (PROG ((DD (fetch IMAGEDATA of DISPLAYSTREAM))
+                 BITMAP)
+                (\INSURETOPWDS DISPLAYSTREAM)                (* ; "bring the window to the top")
+                (SETQ BITMAP (ffetch DDDestination of DD))
+                (COND
+                   ((NOT (type? BIGBM BITMAP))
                     (\CLIPANDDRAWLINE (\DSPTRANSFORMX (OR (FIXP X1)
-                                                              (FIXR X1))
-                                                 DD)
+                                                          (FIXR X1))
+                                             DD)
                            (\DSPTRANSFORMY (OR (FIXP Y1)
                                                (FIXR Y1))
                                   DD)
@@ -1597,18 +1560,71 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                1)
                               ((OR (FIXP WIDTH)
                                    (FIXR WIDTH]
-                           OPERATION
-                           (ffetch DDDestination of DD)
+                           (SELECTQ OPERATION
+                               (NIL (ffetch DDOPERATION of DD))
+                               ((REPLACE PAINT INVERT ERASE) 
+                                    OPERATION)
+                               (\ILLEGAL.ARG OPERATION))
+                           BITMAP
                            (ffetch DDClippingLeft of DD)
                            (SUB1 (ffetch DDClippingRight of DD))
                            (ffetch DDClippingBottom of DD)
                            (SUB1 (ffetch DDClippingTop of DD))
-                           DISPLAYSTREAM COLOR)))            (* ; 
-             "the generic case of MOVETO is used so that the hardcopy streams get handled as well.")
+                           DISPLAYSTREAM COLOR))
+                   (T (PROG ((BIGBMLIST (fetch (BIGBM BIGBMLIST) of BITMAP))
+                             (HEIGHT (BITMAPHEIGHT BITMAP))
+                             BOTTOM BM CTop CBottom (ClippingTop (ffetch DDClippingTop of DD))
+                             (ClippingBottom (ffetch DDClippingBottom of DD))
+                             (YY1 (\DSPTRANSFORMY (OR (FIXP Y1)
+                                                      (FIXR Y1))
+                                         DD))
+                             (YY2 (\DSPTRANSFORMY (OR (FIXP Y2)
+                                                      (FIXR Y2))
+                                         DD)))
+                            (SETQ BM (GetNewFragment BIGBMLIST))
+                            (while (AND BM (IGREATERP HEIGHT ClippingBottom))
+                               do (SETQ BOTTOM (IDIFFERENCE HEIGHT (BITMAPHEIGHT BM)))
+                                  [SETQ CTop (COND
+                                                ((IGREATERP ClippingTop HEIGHT)
+                                                 (IDIFFERENCE HEIGHT BOTTOM))
+                                                (T (IDIFFERENCE ClippingTop BOTTOM]
+                                  (COND
+                                     ((IGEQ CTop 0)
+                                      [SETQ CBottom (COND
+                                                       ((ILESSP ClippingBottom BOTTOM)
+                                                        0)
+                                                       (T (IDIFFERENCE ClippingBottom BOTTOM]
+                                      (\CLIPANDDRAWLINE (\DSPTRANSFORMX (OR (FIXP X1)
+                                                                            (FIXR X1))
+                                                               DD)
+                                             (IDIFFERENCE YY1 BOTTOM)
+                                             (\DSPTRANSFORMX (OR (FIXP X2)
+                                                                 (FIXR X2))
+                                                    DD)
+                                             (IDIFFERENCE YY2 BOTTOM)
+                                             [COND
+                                                ((NULL WIDTH)
+                                                 1)
+                                                ((OR (FIXP WIDTH)
+                                                     (FIXR WIDTH]
+                                             (SELECTQ OPERATION
+                                                 (NIL (ffetch DDOPERATION of DD))
+                                                 ((REPLACE PAINT INVERT ERASE) 
+                                                      OPERATION)
+                                                 (\ILLEGAL.ARG OPERATION))
+                                             BM
+                                             (ffetch DDClippingLeft of DD)
+                                             (SUB1 (ffetch DDClippingRight of DD))
+                                             CBottom
+                                             (SUB1 CTop)
+                                             DISPLAYSTREAM COLOR)))
+                                  (SETQ BM (GetNewFragment BIGBMLIST))
+                                  (SETQ HEIGHT BOTTOM]       (* ; 
+               "the generic case of MOVETO is used so that the hardcopy streams get handled as well.")
     (MOVETO X2 Y2 DISPLAYSTREAM])
 
 (RELMOVETO
-  [LAMBDA (DX DY STREAM)                                 (* rmk%: "25-AUG-83 18:13")
+  [LAMBDA (DX DY STREAM)                                     (* rmk%: "25-AUG-83 18:13")
                                                              (* ; "moves the position by a vector")
     (DSPXPOSITION [IPLUS DX (DSPXPOSITION NIL (SETQ STREAM (\OUTSTREAMARG STREAM]
            STREAM)
@@ -1616,7 +1632,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
            STREAM])
 
 (MOVETOUPPERLEFT
-  [LAMBDA (STREAM REGION)                                (* hdj " 5-Jul-85 12:19")
+  [LAMBDA (STREAM REGION)                                    (* hdj " 5-Jul-85 12:19")
 
     (* ;; "moves the current position to the upper left corner so that the first line of text will all appear.")
 
@@ -1650,7 +1666,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
     (COND
        ((NOT (EQ (fetch (BITMAP BITMAPBITSPERPIXEL) of BITMAP)
                  1))                                         (* ; 
-                                                           "make adjustments in case of color.")
+                                                             "make adjustments in case of color.")
         (SETQ COLOR (COLORNUMBERP (OR COLOR (DSPCOLOR NIL DS))
                            (fetch (BITMAP BITMAPBITSPERPIXEL) of BITMAP)))
                                                              (* ; "(COND ((EQ OPERATION 'ERASE) ; treat erase as AND of background (SETQ COLOR (OPPOSITECOLOR COLOR (fetch (BITMAP BITMAPBITSPERPIXEL) of BITMAP)))))")
@@ -1687,8 +1703,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                                             (ADD1 (IDIFFERENCE (IMIN MAX TOP)
                                                                          MIN))
                                                             'TEXTURE OPERATION COLOR]
-             [(EQ Y1 Y2)                                     (* ; 
-                                                           "special case of horizontal line.")
+             [(EQ Y1 Y2)                                     (* ; "special case of horizontal line.")
               [COND
                  ((IGREATERP WIDTH 2)
                   (SETQ Y1 (SETQ Y2 (IDIFFERENCE Y1 (LRSH (SUB1 WIDTH)
@@ -1714,7 +1729,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
               (\CLIPANDDRAWLINE1 X1 Y1 X2 Y2 OPERATION BITMAP LEFT RIGHT BOTTOM TOP DS COLOR))
              ((IGREATERP (IABS (IDIFFERENCE X1 X2))
                      (IABS (IDIFFERENCE Y1 Y2)))             (* ; 
-                         "slope is more horizontal, so make line grow in the positive y direction.")
+                           "slope is more horizontal, so make line grow in the positive y direction.")
               [COND
                  ((IGREATERP WIDTH 2)
                   (PROG (HALFWIDTH)
@@ -1723,10 +1738,9 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                         (SETQ Y1 (IDIFFERENCE Y1 HALFWIDTH))
                         (SETQ Y2 (IDIFFERENCE Y2 HALFWIDTH]
               (for I from Y1 to (SUB1 (IPLUS Y1 WIDTH)) as J from Y2
-                 do (\CLIPANDDRAWLINE1 X1 I X2 J OPERATION BITMAP LEFT RIGHT BOTTOM TOP DS 
-                               COLOR)))
+                 do (\CLIPANDDRAWLINE1 X1 I X2 J OPERATION BITMAP LEFT RIGHT BOTTOM TOP DS COLOR)))
              (T                                              (* ; 
-                           "slope is more vertical, so make line grow in the positive x direction.")
+                             "slope is more vertical, so make line grow in the positive x direction.")
                 [COND
                    ((IGREATERP WIDTH 2)
                     (PROG (HALFWIDTH)
@@ -1735,11 +1749,10 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                           (SETQ X1 (IDIFFERENCE X1 HALFWIDTH))
                           (SETQ X2 (IDIFFERENCE X2 HALFWIDTH]
                 (for I from X1 to (SUB1 (IPLUS X1 WIDTH)) as J from X2
-                   do (\CLIPANDDRAWLINE1 I Y1 J Y2 OPERATION BITMAP LEFT RIGHT BOTTOM TOP DS
-                                 COLOR])
+                   do (\CLIPANDDRAWLINE1 I Y1 J Y2 OPERATION BITMAP LEFT RIGHT BOTTOM TOP DS COLOR])
 
 (\CLIPANDDRAWLINE1
-  [LAMBDA (X1 Y1 X2 Y2 OPERATION BITMAP LEFT RIGHT BOTTOM TOP DS COLOR)
+  [LAMBDA (X1 Y1 X2 Y2 OPERATION BITMAP LEFT RIGHT BOTTOM TOP DS COLOR)
                                                              (* JonL " 7-May-84 02:57")
 
     (* ;; "LEFT, RIGHT, BOTTOM, TOP are set to the boundaries of the clipping region")
@@ -1749,14 +1762,14 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
     (PROG (DX DY YMOVEUP HALFDX HALFDY (BMRASTERWIDTH (fetch BITMAPRASTERWIDTH of BITMAP)))
           (COND
              ((IGREATERP X1 X2)                              (* ; 
-                                                          "switch points so DX is always positive.")
+                                                            "switch points so DX is always positive.")
               (SETQ HALFDX X1)
               (SETQ X1 X2)
               (SETQ X2 HALFDX)
               (SETQ HALFDX Y1)
               (SETQ Y1 Y2)
               (SETQ Y2 HALFDX)))                             (* ; 
-                                                    "calculate differences and sign of Y movement.")
+                                                      "calculate differences and sign of Y movement.")
           (SETQ HALFDX (LRSH (SETQ DX (IDIFFERENCE X2 X1))
                              1))
           (SETQ HALFDY (LRSH [SETQ DY (COND
@@ -1775,7 +1788,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                               (IGEQ TOP Y1]
                    (EQ (fetch (BITMAP BITMAPBITSPERPIXEL) of BITMAP)
                        1))                                   (* ; 
-                                                           "line is completely visible, fast case.")
+                                                             "line is completely visible, fast case.")
               (.WHILE.TOP.DS. DS (\DRAWLINE1 X1 (SUB1 (\SFInvert BITMAP Y1))
                                         DX DY DX DY (COND
                                                        ((IGREATERP DX DY)
@@ -1785,7 +1798,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                                           HALFDY))
                                         (COND
                                            (YMOVEUP          (* ; 
-                                  "y is moving in positive direction but bits are stored inversely")
+                                    "y is moving in positive direction but bits are stored inversely")
                                                   (IMINUS BMRASTERWIDTH))
                                            (T BMRASTERWIDTH))
                                         OPERATION
@@ -1799,13 +1812,13 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                      (CA1 (\CLIPCODE X1 Y1 LEFT RIGHT TOP BOTTOM))
                      (CA2 (\CLIPCODE X2 Y2 LEFT RIGHT TOP BOTTOM)))
                                                              (* ; 
-                                           "save the original points for the clipping computation.")
+                                             "save the original points for the clipping computation.")
                                                              (* ; 
-                                                  "determine the sectors in which the points fall.")
+                                                    "determine the sectors in which the points fall.")
                 CLIPLP
                     [COND
                        ((NOT (EQ 0 (LOGAND CA1 CA2)))        (* ; 
-                                                          "line is entirely out of clipping region")
+                                                            "line is entirely out of clipping region")
                         (RETURN NIL))
                        ((EQ 0 (IPLUS CA1 CA2))               (* ; "line is completely visible")
 
@@ -1838,7 +1851,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                                            DY)))
                                         (COND
                                            (YMOVEUP          (* ; 
-                                  "y is moving in positive direction but bits are stored inversely")
+                                    "y is moving in positive direction but bits are stored inversely")
                                                   (IMINUS BMRASTERWIDTH))
                                            (T BMRASTERWIDTH))
                                         OPERATION
@@ -1868,7 +1881,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                                        DY)))
                                     (COND
                                        (YMOVEUP              (* ; 
-                                  "y is moving in positive direction but bits are stored inversely")
+                                    "y is moving in positive direction but bits are stored inversely")
                                               (IMINUS BMRASTERWIDTH))
                                        (T BMRASTERWIDTH))
                                     OPERATION
@@ -1885,7 +1898,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                         (COND
                            ((IGREATERP CA1 7)                (* ; "y1 less than bottom")
                                                              (* ; 
-                                             "calculate the least X for which Y will be at bottom.")
+                                               "calculate the least X for which Y will be at bottom.")
                             [SETQ CX1 (IPLUS X1 (\LEASTPTAT DX DY (IDIFFERENCE BOTTOM Y1]
                             (SETQ CY1 BOTTOM))
                            ((IGREATERP CA1 3)                (* ; "y1 is greater than top")
@@ -1893,14 +1906,12 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                             (SETQ CY1 TOP))
                            (T                                (* ; "x1 is less than left")
                               [SETQ CY1 (COND
-                                           [YMOVEUP (IPLUS Y1 (\LEASTPTAT DY DX (IDIFFERENCE
-                                                                                     LEFT X1]
-                                           (T (IDIFFERENCE Y1 (\LEASTPTAT DY DX (IDIFFERENCE
-                                                                                     LEFT X1]
+                                           [YMOVEUP (IPLUS Y1 (\LEASTPTAT DY DX (IDIFFERENCE LEFT X1]
+                                           (T (IDIFFERENCE Y1 (\LEASTPTAT DY DX (IDIFFERENCE LEFT X1]
                               (SETQ CX1 LEFT)))
                         (SETQ CA1 (\CLIPCODE CX1 CY1 LEFT RIGHT TOP BOTTOM)))
                        (T                                    (* ; 
-                "now move point CX2 CY2 so that one of the coordinates is on one of the boundaries")
+                  "now move point CX2 CY2 so that one of the coordinates is on one of the boundaries")
                           (COND
                              ((IGREATERP CA2 7)              (* ; "y2 less than bottom")
                               [SETQ CX2 (IPLUS X1 (\GREATESTPTAT DX DY (IDIFFERENCE Y1 BOTTOM]
@@ -1910,16 +1921,16 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                               (SETQ CY2 TOP))
                              (T                              (* ; "x2 is greater than right")
                                 [SETQ CY2 (COND
-                                             [YMOVEUP (IPLUS Y1 (\GREATESTPTAT DY DX
-                                                                       (IDIFFERENCE RIGHT X1]
-                                             (T (IDIFFERENCE Y1 (\GREATESTPTAT DY DX
-                                                                       (IDIFFERENCE RIGHT X1]
+                                             [YMOVEUP (IPLUS Y1 (\GREATESTPTAT DY DX (IDIFFERENCE
+                                                                                      RIGHT X1]
+                                             (T (IDIFFERENCE Y1 (\GREATESTPTAT DY DX (IDIFFERENCE
+                                                                                      RIGHT X1]
                                 (SETQ CX2 RIGHT)))
                           (SETQ CA2 (\CLIPCODE CX2 CY2 LEFT RIGHT TOP BOTTOM]
                     (GO CLIPLP])
 
 (\CLIPCODE
-  [LAMBDA (X Y LEFT RIGHT TOP BOTTOM)                    (* rrb " 4-DEC-80 10:34")
+  [LAMBDA (X Y LEFT RIGHT TOP BOTTOM)                        (* rrb " 4-DEC-80 10:34")
 
     (* ;; "determines the sector code for a point wrt a region.  Used to clip things quickly.")
 
@@ -1950,7 +1961,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           0])
 
 (\LEASTPTAT
-  [LAMBDA (DA DB THISB)                                  (* rrb " 7-JAN-82 11:56")
+  [LAMBDA (DA DB THISB)                                      (* rrb " 7-JAN-82 11:56")
 
     (* ;; "determines the smallest value in the dimension A that would give a B coordinate of THISB if a line were drawn from the point (0,0) with a slope of DA/DB.")
 
@@ -1965,7 +1976,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                  DB])
 
 (\GREATESTPTAT
-  [LAMBDA (DA DB THISB)                                  (* rrb " 7-JAN-82 14:24")
+  [LAMBDA (DA DB THISB)                                      (* rrb " 7-JAN-82 14:24")
 
     (* ;; "determines the largest value in the dimension A that would give a B coordinate of THISB if a line were drawn from the point (0,0) with a slope of DA/DB.")
 
@@ -1981,7 +1992,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                  DB])
 
 (\DRAWLINE1
-  [LAMBDA (X0 Y0 XLIMIT YLIMIT DX DY CDL YINC MODE BITMAPBASE RASTERWIDTH)
+  [LAMBDA (X0 Y0 XLIMIT YLIMIT DX DY CDL YINC MODE BITMAPBASE RASTERWIDTH)
                                                              (* mpl " 2-Jan-84 18:00")
 
     (* ;; "this was changed to interface with the opcode for line drawing.  It probably be incorporated into the places it is called.")
@@ -1989,7 +2000,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
     (* ;; "draws a line starting at X0,Y0 at a slope of DX/DY until reaching either XLIMIT or YLIMIT with an initial overflow bucket size of CDL in MODE.  Arranged so that the clipping routines can determine what the exact location of the end point of the clipped line is wrt line drawing coordinates eg.  amount in overflow bucket.  XLIMIT and YLIMIT are the number of points to be moved in that direction.")
 
     (\DRAWLINE.UFN (\ADDBASE BITMAPBASE (IPLUS (ITIMES Y0 RASTERWIDTH)
-                                                   (FOLDLO X0 BITSPERWORD)))
+                                               (FOLDLO X0 BITSPERWORD)))
            (LOGAND X0 15)
            DX YINC DY (SELECTQ MODE
                           (INVERT 2)
@@ -2000,7 +2011,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
            (ADD1 YLIMIT])
 
 (\DRAWLINE.UFN
-  [LAMBDA (FIRSTADDR FIRSTBIT XDELTA YINCR YDELTA OPERATIONCODE INITIALBUCKET PIXELSINX PIXELSINY)
+  [LAMBDA (FIRSTADDR FIRSTBIT XDELTA YINCR YDELTA OPERATIONCODE INITIALBUCKET PIXELSINX PIXELSINY)
                                                              (* jds " 6-Jan-86 11:27")
 
     (* ;; "FIRSTADDR is the address of the word which contains the first point.  FIRSTBIT is the address of the first bit in FIRSTADDR.  XDELTA and YDELTA are how far the complete line has to move in X and Y respectively;  both are positive quantities.  YINCR is the amount the address should be incremented if the Y coordinate changes and can be either positive or negative.  OPERATIONCODE is 0 for REPLACE, 1 for ERASE and 2 for INVERT.  INITIALBUCKET is between 0 and the maximum of DX and DY and gives the starting amount of the bucket used to determine when to increment in the slower moving direction.  PIXELSINX and PIXELSINY indicates how many pixels should be drawn in the X and Y direction.")
@@ -2023,78 +2034,63 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS .DRAWLINEX. MACRO [(MODE)
-                                     (bind (NY _ 0) for PT from 1 to PIXELSINX
-                                        do               (* ; "main loop")
-                                              [replace (BITMAPWORD BITS) of FIRSTADDR
-                                                 with (SELECTQ MODE
-                                                              (INVERT (LOGXOR MASK
-                                                                             (fetch (BITMAPWORD
-                                                                                         BITS)
-                                                                                of FIRSTADDR)))
-                                                              (ERASE (LOGAND (LOGXOR MASK WORDMASK)
-                                                                            (fetch (BITMAPWORD
-                                                                                        BITS)
-                                                                               of FIRSTADDR)))
-                                                              (PROGN 
-                                                             (* ; 
-           "case is PAINT or REPLACE.  Legality of OPERATION has been checked by \CLIPANDDRAWLINE1")
-                                                                     (LOGOR MASK (fetch
-                                                                                  (BITMAPWORD BITS)
-                                                                                    of FIRSTADDR]
-                                              [COND
-                                                 ([NOT (IGREATERP XDELTA (SETQ INITIALBUCKET
-                                                                          (IPLUS INITIALBUCKET YDELTA
-                                                                                 ]
-                                                             (* ; "increment in the Y direction")
-                                                  (COND
-                                                     ((EQ (SETQ NY (ADD1 NY))
-                                                          PIXELSINY)
-                                                      (RETURN)))
-                                                  (SETQ INITIALBUCKET (IDIFFERENCE INITIALBUCKET 
-                                                                             XDELTA))
-                                                  (SETQ FIRSTADDR (\ADDBASE FIRSTADDR YINCR]
-                                              (SETQ MASK (LRSH MASK 1))
-                                              (COND
-                                                 ((EQ 0 MASK)(* ; "crossed word boundary")
-                                                  (SETQ FIRSTADDR (\ADDBASE FIRSTADDR 1))
-                                                  (SETQ MASK 32768])
+                             (bind (NY _ 0) for PT from 1 to PIXELSINX
+                                do                           (* ; "main loop")
+                                   [replace (BITMAPWORD BITS) of FIRSTADDR
+                                      with (SELECTQ MODE
+                                               (INVERT (LOGXOR MASK (fetch (BITMAPWORD BITS)
+                                                                       of FIRSTADDR)))
+                                               (ERASE (LOGAND (LOGXOR MASK WORDMASK)
+                                                             (fetch (BITMAPWORD BITS) of FIRSTADDR)))
+                                               (PROGN        (* ; 
+             "case is PAINT or REPLACE.  Legality of OPERATION has been checked by \CLIPANDDRAWLINE1")
+                                                      (LOGOR MASK (fetch (BITMAPWORD BITS)
+                                                                     of FIRSTADDR]
+                                   [COND
+                                      ([NOT (IGREATERP XDELTA (SETQ INITIALBUCKET (IPLUS 
+                                                                                        INITIALBUCKET
+                                                                                         YDELTA]
+                                                             (* ; "increment in the Y direction")
+                                       (COND
+                                          ((EQ (SETQ NY (ADD1 NY))
+                                               PIXELSINY)
+                                           (RETURN)))
+                                       (SETQ INITIALBUCKET (IDIFFERENCE INITIALBUCKET XDELTA))
+                                       (SETQ FIRSTADDR (\ADDBASE FIRSTADDR YINCR]
+                                   (SETQ MASK (LRSH MASK 1))
+                                   (COND
+                                      ((EQ 0 MASK)           (* ; "crossed word boundary")
+                                       (SETQ FIRSTADDR (\ADDBASE FIRSTADDR 1))
+                                       (SETQ MASK 32768])
 
 (PUTPROPS .DRAWLINEY. MACRO [(MODE)
-                                     (bind (NX _ 0) for PT from 1 to PIXELSINY
-                                        do               (* ; "main loop")
-                                              [replace (BITMAPWORD BITS) of FIRSTADDR
-                                                 with (SELECTQ MODE
-                                                              (INVERT (LOGXOR MASK
-                                                                             (fetch (BITMAPWORD
-                                                                                         BITS)
-                                                                                of FIRSTADDR)))
-                                                              (ERASE (LOGAND (LOGXOR MASK WORDMASK)
-                                                                            (fetch (BITMAPWORD
-                                                                                        BITS)
-                                                                               of FIRSTADDR)))
-                                                              (PROGN 
-                                                             (* ; 
-           "case is PAINT or REPLACE.  Legality of OPERATION has been checked by \CLIPANDDRAWLINE1")
-                                                                     (LOGOR MASK (fetch
-                                                                                  (BITMAPWORD BITS)
-                                                                                    of FIRSTADDR]
-                                              [COND
-                                                 ([NOT (IGREATERP YDELTA (SETQ INITIALBUCKET
-                                                                          (IPLUS INITIALBUCKET XDELTA
-                                                                                 ]
-                                                  (COND
-                                                     ((EQ (SETQ NX (ADD1 NX))
-                                                          PIXELSINX)
-                                                      (RETURN)))
-                                                  (SETQ INITIALBUCKET (IDIFFERENCE INITIALBUCKET 
-                                                                             YDELTA))
-                                                  (SETQ MASK (LRSH MASK 1))
-                                                  (COND
-                                                     ((EQ 0 MASK)
-                                                             (* ; "crossed word boundary")
-                                                      (SETQ FIRSTADDR (\ADDBASE FIRSTADDR 1))
-                                                      (SETQ MASK 32768]
-                                              (SETQ FIRSTADDR (\ADDBASE FIRSTADDR YINCR])
+                             (bind (NX _ 0) for PT from 1 to PIXELSINY
+                                do                           (* ; "main loop")
+                                   [replace (BITMAPWORD BITS) of FIRSTADDR
+                                      with (SELECTQ MODE
+                                               (INVERT (LOGXOR MASK (fetch (BITMAPWORD BITS)
+                                                                       of FIRSTADDR)))
+                                               (ERASE (LOGAND (LOGXOR MASK WORDMASK)
+                                                             (fetch (BITMAPWORD BITS) of FIRSTADDR)))
+                                               (PROGN        (* ; 
+             "case is PAINT or REPLACE.  Legality of OPERATION has been checked by \CLIPANDDRAWLINE1")
+                                                      (LOGOR MASK (fetch (BITMAPWORD BITS)
+                                                                     of FIRSTADDR]
+                                   [COND
+                                      ([NOT (IGREATERP YDELTA (SETQ INITIALBUCKET (IPLUS 
+                                                                                        INITIALBUCKET
+                                                                                         XDELTA]
+                                       (COND
+                                          ((EQ (SETQ NX (ADD1 NX))
+                                               PIXELSINX)
+                                           (RETURN)))
+                                       (SETQ INITIALBUCKET (IDIFFERENCE INITIALBUCKET YDELTA))
+                                       (SETQ MASK (LRSH MASK 1))
+                                       (COND
+                                          ((EQ 0 MASK)       (* ; "crossed word boundary")
+                                           (SETQ FIRSTADDR (\ADDBASE FIRSTADDR 1))
+                                           (SETQ MASK 32768]
+                                   (SETQ FIRSTADDR (\ADDBASE FIRSTADDR YINCR])
 )
 )
 
@@ -2105,11 +2101,11 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (\DRAWCIRCLE.DISPLAY
-  [LAMBDA (DISPLAYSTREAM CENTERX CENTERY RADIUS BRUSH DASHING)
+  [LAMBDA (DISPLAYSTREAM CENTERX CENTERY RADIUS BRUSH DASHING)
                                                              (* kbr%: "15-Feb-86 22:24")
 
     (* ;; 
-"\DRAWCIRCLE.DISPLAY extended for color.  Color is specified by either BRUSH or the DSPCOLOR of DS.")
+ "\DRAWCIRCLE.DISPLAY extended for color.  Color is specified by either BRUSH or the DSPCOLOR of DS.")
 
     (DECLARE (LOCALVARS . T))
     (COND
@@ -2120,7 +2116,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
        ((EQ RADIUS 0)                                        (* ; "don't draw anything.")
         NIL)
        (DASHING                                              (* ; 
-                       "draw it with the arc drawing code which does dashing.  Slow but effective.")
+                         "draw it with the arc drawing code which does dashing.  Slow but effective.")
 
               (* ;; "the CDR removes the first point to work around a bug in curve drawing when closed and first and last points the same.  AR 4623.0")
 
@@ -2143,7 +2139,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 
                        (COND
                           (USERFN                            (* ; 
-             "if calling user fn, don't bother with set up and leave points in stream coordinates.")
+               "if calling user fn, don't bother with set up and leave points in stream coordinates.")
                                  (SETQ CX CENTERX)
                                  (SETQ CY CENTERY))
                           (T (.SETUP.FOR.\BBTCURVEPT.)
@@ -2159,15 +2155,14 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                                                     (FOLDLO (LRSH BRUSHWIDTH 3)
                                                                            2))
                                                     DISPLAYDATA)))
-                                 (24                         (* ; 
-                                                           "I doubt that this will be right.")
+                                 (24                         (* ; "I doubt that this will be right.")
                                      (SETQ CX (\DSPTRANSFORMX (IDIFFERENCE CENTERX
                                                                      (FOLDLO (IQUOTIENT BRUSHWIDTH 24
                                                                                     )
                                                                             2))
                                                      DISPLAYDATA)))
                                  (SHOULDNT))                 (* ; 
-                                                           "take into account the brush thickness.")
+                                                             "take into account the brush thickness.")
                              (SETQ CY (\DSPTRANSFORMY (IDIFFERENCE CENTERY (FOLDLO BRUSHHEIGHT 2))
                                              DISPLAYDATA))
 
@@ -2177,13 +2172,13 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                        [COND
                           ((EQ RADIUS 1)                     (* ; "put a single brush down.")
                                                              (* ; 
-                                                           "draw the top and bottom most points.")
+                                                             "draw the top and bottom most points.")
                            [COND
                               (USERFN (APPLY* USERFN CX CY DISPLAYSTREAM))
                               (T (.WHILE.TOP.DS. DISPLAYSTREAM (\CURVEPT CX CY]
                            (RETURN))
                           (T                                 (* ; 
-                                                           "draw the top and bottom most points.")
+                                                             "draw the top and bottom most points.")
                              (COND
                                 (USERFN (APPLY* USERFN CX (IPLUS CY RADIUS)
                                                DISPLAYSTREAM)
@@ -2192,7 +2187,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                 (T (.WHILE.TOP.DS. DISPLAYSTREAM (\CURVEPT CX (IPLUS CY RADIUS))
                                           (\CURVEPT CX (IDIFFERENCE CY RADIUS]
                    LP                                        (* ; 
-                                                     "(UNFOLD x 2) is used instead of (ITIMES x 2)")
+                                                       "(UNFOLD x 2) is used instead of (ITIMES x 2)")
                        [COND
                           [(IGREATERP 0 D)
                            (SETQ X (ADD1 X))
@@ -2254,17 +2249,16 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
     (\DRAWARC.GENERIC STREAM CENTERX CENTERY RADIUS STARTANGLE NDEGREES BRUSH DASHING])
 
 (\DRAWARC.GENERIC
-  [LAMBDA (STREAM CENTERX CENTERY RADIUS STARTANGLE NDEGREES BRUSH DASHING)
+  [LAMBDA (STREAM CENTERX CENTERY RADIUS STARTANGLE NDEGREES BRUSH DASHING)
                                                              (* rrb " 4-Oct-85 18:23")
-                                                             (* ; 
-                                                           "draws an arc by drawing a curve.")
+                                                             (* ; "draws an arc by drawing a curve.")
     (COND
        ((AND (GREATERP 360 NDEGREES)
              (LESSP -360 NDEGREES))
         (DRAWCURVE (\COMPUTE.ARC.POINTS CENTERX CENTERY RADIUS STARTANGLE NDEGREES)
                NIL BRUSH DASHING STREAM))
        (T                                                    (* ; 
-                                                         "use circle drawing which could be faster")
+                                                           "use circle drawing which could be faster")
           (DRAWCIRCLE CENTERX CENTERY RADIUS BRUSH DASHING STREAM])
 
 (\COMPUTE.ARC.POINTS
@@ -2286,7 +2280,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                  (IMIN (IMAX (ABS (FIX (FQUOTIENT ANGLESIZE 10.0)))
                                              5)
                                        (PROGN                (* ; 
-                                                          "don't have more than a knot every 5 pts")
+                                                            "don't have more than a knot every 5 pts")
                                               (IMAX (ABS (FIX (QUOTIENT (TIMES RADIUS 6.3
                                                                                (QUOTIENT ANGLESIZE 
                                                                                       360.0))
@@ -2295,14 +2289,11 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 
      (* ;; "go from initial point to just past the last point.  The just past (PLUS BETA (QUOTIENT ANGLEINCR 5.0)) picks up the case where the floating pt rounding error accumulates to be greater than the last point when it is very close to it.")
 
-          (RETURN (for ANGLE from STARTANGLE to (PLUS STARTANGLE ANGLESIZE
-                                                                  (QUOTIENT ANGLEINCR 5.0))
+          (RETURN (for ANGLE from STARTANGLE to (PLUS STARTANGLE ANGLESIZE (QUOTIENT ANGLEINCR 5.0))
                      by ANGLEINCR collect (create POSITION
-                                                         XCOORD _ [FIXR (PLUS CENTERX
-                                                                              (TIMES RADIUS
+                                                 XCOORD _ [FIXR (PLUS CENTERX (TIMES RADIUS
                                                                                      (COS ANGLE]
-                                                         YCOORD _ (FIXR (PLUS CENTERY
-                                                                              (TIMES RADIUS
+                                                 YCOORD _ (FIXR (PLUS CENTERY (TIMES RADIUS
                                                                                      (SIN ANGLE])
 
 (\DRAWELLIPSE.DISPLAY
@@ -2371,11 +2362,11 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 
                        (COND
                           (USERFN                            (* ; 
-             "if calling user fn, don't bother with set up and leave points in window coordinates.")
+               "if calling user fn, don't bother with set up and leave points in window coordinates.")
                                  (SETQ CX CENTERX)
                                  (SETQ CY CENTERY))
                           (T (.SETUP.FOR.\BBTCURVEPT.)       (* ; 
-                                                           "take into account the brush thickness.")
+                                                             "take into account the brush thickness.")
                              (SELECTQ NBITS
                                  (1 (SETQ CX (\DSPTRANSFORMX (IDIFFERENCE CENTERX (FOLDLO BRUSHWIDTH
                                                                                          2))
@@ -2554,7 +2545,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                        (GO DIAGONAL])
 
 (\DRAWCURVE.DISPLAY
-  [LAMBDA (DISPLAYSTREAM KNOTS CLOSED BRUSH DASHING)     (* ; "Edited  9-Jan-87 16:49 by rrb")
+  [LAMBDA (DISPLAYSTREAM KNOTS CLOSED BRUSH DASHING)         (* ; "Edited  9-Jan-87 16:49 by rrb")
 
     (* ;; "draws a spline curve with a given brush.")
 
@@ -2562,15 +2553,14 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                      (DASHLST (\GOOD.DASHLST DASHING BRUSH)))
                                     (SELECTQ (LENGTH KNOTS)
                                         (0                   (* ; 
-                                                       "No knots => empty curve rather than error?")
+                                                         "No knots => empty curve rather than error?")
                                            NIL)
                                         (1                   (* ; 
-                                                           "only one knot, put down a brush shape")
+                                                             "only one knot, put down a brush shape")
                                            (OR (type? POSITION (CAR KNOTS))
                                                (ERROR "bad knot" (CAR KNOTS)))
                                            (\DRAWPOINT.DISPLAY DISPLAYSTREAM (fetch XCOORD
-                                                                                    of
-                                                                                    (CAR KNOTS))
+                                                                                of (CAR KNOTS))
                                                   (fetch YCOORD of (CAR KNOTS))
                                                   BRUSH))
                                         (2 (OR (type? POSITION (CAR KNOTS))
@@ -2587,16 +2577,17 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                     (RETURN DISPLAYSTREAM])
 
 (\DRAWPOINT.DISPLAY
-  [LAMBDA (DISPLAYSTREAM X Y BRUSH OPERATION)            (* rrb "17-Sep-86 17:51")
+  [LAMBDA (DISPLAYSTREAM X Y BRUSH OPERATION)                (* rrb "17-Sep-86 17:51")
 
     (* ;; "draws a brush point at position X Y")
 
     (* ;; "this is used in 4, 8, and 24 bit per pixel bitmaps as well.  For these, it may be should call BITMAPWIDTH instead of fetching.")
 
-    (PROG ((BRUSHBM (\GETBRUSH BRUSH)))                  (* ; 
-                                       "SUB1 is to put extra bit of even brush on the top or left.")
-          (RETURN (BITBLT BRUSHBM 0 0 DISPLAYSTREAM [IDIFFERENCE X (HALF (SUB1 (fetch
-                                                                                (BITMAP BITMAPWIDTH)
+    (PROG ((BRUSHBM (\GETBRUSH BRUSH)))                      (* ; 
+                                         "SUB1 is to put extra bit of even brush on the top or left.")
+          (RETURN (BITBLT BRUSHBM 0 0 DISPLAYSTREAM [IDIFFERENCE X (HALF (SUB1 (fetch (BITMAP 
+                                                                                          BITMAPWIDTH
+                                                                                             )
                                                                                   of BRUSHBM]
                          [IDIFFERENCE Y (HALF (SUB1 (fetch (BITMAP BITMAPHEIGHT) of BRUSHBM]
                          NIL NIL NIL (SELECTQ (OR OPERATION (DSPOPERATION NIL DISPLAYSTREAM))
@@ -2604,7 +2595,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                          OPERATION])
 
 (\DRAWPOLYGON.DISPLAY
-  [LAMBDA (STREAM POINTS CLOSED BRUSH DASHING)           (* ; "Edited 13-Apr-88 14:14 by FS")
+  [LAMBDA (STREAM POINTS CLOSED BRUSH DASHING)               (* ; "Edited 13-Apr-88 14:14 by FS")
 
     (* ;; "Somewhat less generic version of drawpolygon that calls \drawline.display.  Brush must be a brush (guaranteed in DRAWPOLYGON) other users must also ensure.")
 
@@ -2616,41 +2607,36 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                               BRUSH)
                              (T (create BRUSH using BRUSH BRUSHSHAPE _ 'ROUND]
           (SETQ COLOR (fetch (BRUSH BRUSHCOLOR) of PTBRUSH))
-          (for PTAIL on POINTS while (CDR PTAIL) do (\DRAWLINE.DISPLAY
-                                                                     STREAM
-                                                                     (fetch (POSITION XCOORD)
-                                                                        of (CAR PTAIL))
-                                                                     (ffetch (POSITION YCOORD)
-                                                                        of (CAR PTAIL))
-                                                                     (fetch (POSITION XCOORD)
-                                                                        of (CADR PTAIL))
-                                                                     (ffetch (POSITION YCOORD)
-                                                                        of (CADR PTAIL))
-                                                                     (fetch (BRUSH BRUSHSIZE)
-                                                                        of BRUSH)
-                                                                     NIL COLOR DASHING) 
-                                                             (* ; 
-    "put a brush between lines so it looks better.  It's not mitered this way but better than not.")
-                                                                   (\DRAWPOINT.DISPLAY
-                                                                    STREAM
-                                                                    (fetch (POSITION XCOORD)
-                                                                       of (CADR POINTS))
-                                                                    (fetch (POSITION YCOORD)
-                                                                       of (CADR POINTS))
-                                                                    PTBRUSH
-                                                                    'NIL)
-             finally (COND
-                            ((AND CLOSED (CDDR POINTS))      (* ; "draw the closing line.")
-                             (\DRAWLINE.DISPLAY STREAM (fetch (POSITION XCOORD)
+          (for PTAIL on POINTS while (CDR PTAIL) do (\DRAWLINE.DISPLAY STREAM (fetch (POSITION XCOORD
+                                                                                            )
+                                                                                 of (CAR PTAIL))
+                                                           (ffetch (POSITION YCOORD)
                                                               of (CAR PTAIL))
-                                    (ffetch (POSITION YCOORD) of (CAR PTAIL))
-                                    (fetch (POSITION XCOORD) of (CAR POINTS))
-                                    (ffetch (POSITION YCOORD) of (CAR POINTS))
-                                    (fetch (BRUSH BRUSHSIZE) of BRUSH)
-                                    NIL COLOR DASHING)))
+                                                           (fetch (POSITION XCOORD)
+                                                              of (CADR PTAIL))
+                                                           (ffetch (POSITION YCOORD)
+                                                              of (CADR PTAIL))
+                                                           (fetch (BRUSH BRUSHSIZE) of BRUSH)
+                                                           NIL COLOR DASHING) 
+                                                             (* ; 
+      "put a brush between lines so it looks better.  It's not mitered this way but better than not.")
+                                                    (\DRAWPOINT.DISPLAY STREAM (fetch (POSITION
+                                                                                       XCOORD)
+                                                                                  of (CADR POINTS))
+                                                           (fetch (POSITION YCOORD)
+                                                              of (CADR POINTS))
+                                                           PTBRUSH
+                                                           'NIL)
+             finally (COND
+                        ((AND CLOSED (CDDR POINTS))          (* ; "draw the closing line.")
+                         (\DRAWLINE.DISPLAY STREAM (fetch (POSITION XCOORD) of (CAR PTAIL))
+                                (ffetch (POSITION YCOORD) of (CAR PTAIL))
+                                (fetch (POSITION XCOORD) of (CAR POINTS))
+                                (ffetch (POSITION YCOORD) of (CAR POINTS))
+                                (fetch (BRUSH BRUSHSIZE) of BRUSH)
+                                NIL COLOR DASHING)))
                    (OR (NULL (CDR POINTS))
-                       (\DRAWPOINT.DISPLAY STREAM (fetch (POSITION XCOORD)
-                                                         of (CAR POINTS))
+                       (\DRAWPOINT.DISPLAY STREAM (fetch (POSITION XCOORD) of (CAR POINTS))
                               (fetch (POSITION YCOORD) of (CAR POINTS))
                               PTBRUSH NIL])
 
@@ -2674,13 +2660,13 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 
      (* ;; "many of these variables are used by the macro for \CURVEPT that passes them to \BBTCURVEPT and .SETUP.FOR.\BBTCURVEPT.  sets them up.")
                                                              (* ; 
-                           "move the display stream position before the coordinates are clobbered.")
+                             "move the display stream position before the coordinates are clobbered.")
           (COND
              ((NOT USERFN)
               (.SETUP.FOR.\BBTCURVEPT.)
               (SELECTQ NBITS
                   (1                                         (* ; 
-  "SUB1 is so that the extra bit goes on the top and right as it is documented as doing for lines.")
+    "SUB1 is so that the extra bit goes on the top and right as it is documented as doing for lines.")
                      (SETQ X1 (\DSPTRANSFORMX (IDIFFERENCE X1 (SETQ HALFBRUSHWIDTH
                                                                (FOLDLO (SUB1 BRUSHWIDTH)
                                                                       2)))
@@ -2703,14 +2689,14 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                                                                            )
                                                                                     2)))
                               DISPLAYDATA))                  (* ; 
-                                                           "take into account the brush thickness.")
+                                                             "take into account the brush thickness.")
               (SETQ Y2 (\DSPTRANSFORMY (IDIFFERENCE Y2 HALFBRUSHHEIGHT)
                               DISPLAYDATA))
 
               (* ;; "Move the window to top while interruptable, but verify that it is still there uninterruptably with drawing points")
 
               (\INSURETOPWDS DISPLAYSTREAM)))                (* ; 
-                                                           "arrange things so that dx is positive.")
+                                                             "arrange things so that dx is positive.")
           (COND
              ((IGREATERP X1 X2)                              (* ; "switch points")
               (swap X1 X2)
@@ -2724,18 +2710,70 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                (IDIFFERENCE Y1 Y2]
           [SETQ CDL (HALF (COND
                              ((IGREATERP DX DY)              (* ; 
-                                             "set up the bucket so that the ends will be the same.")
+                                               "set up the bucket so that the ends will be the same.")
                               (IREMAINDER DX DY))
                              (T (IREMAINDER DY DX]
           [COND
              [USERFN                                         (* ; 
-           "if user function is being called, don't bother bringing window to top uninterruptably.")
+             "if user function is being called, don't bother bringing window to top uninterruptably.")
                     (COND
                        ((IGEQ DX DY)                         (* ; "X is the fastest mover.")
                         (until (IGREATERP X1 X2)
-                           do                            (* ; "main loop")
+                           do                                (* ; "main loop")
+                              (COND
+                                 (DASHON (APPLY* USERFN X1 Y1 DISPLAYSTREAM)))
+                              [COND
+                                 (DASHTAIL                   (* ; "do dashing.")
+                                        (COND
+                                           ((EQ 0 (SETQ DASHCNT (SUB1 DASHCNT)))
+                                            (SETQ DASHON (NOT DASHON))
+                                            (SETQ DASHTAIL (OR (LISTP (CDR DASHTAIL))
+                                                               DASHLST))
+                                            (SETQ DASHCNT (CAR DASHTAIL]
+                              [COND
+                                 ((NOT (IGREATERP DX (add CDL DY)))
+                                  (add Y1 YINC)
+                                  (COND
+                                     ((COND
+                                         ((EQ YINC -1)
+                                          (ILESSP Y1 Y2))
+                                         ((IGREATERP Y1 Y2)))
+                                      (RETURN)))
+                                  (SETQ CDL (IDIFFERENCE CDL DX]
+                              (add X1 1)))
+                       (T                                    (* ; "Y is the fastest mover.")
+                          (until (COND
+                                    ((EQ YINC -1)
+                                     (ILESSP Y1 Y2))
+                                    ((IGREATERP Y1 Y2)))
+                             do                              (* ; "main loop")
+                                (COND
+                                   (DASHON (APPLY* USERFN X1 Y1 DISPLAYSTREAM)))
+                                [COND
+                                   (DASHTAIL                 (* ; "do dashing.")
+                                          (COND
+                                             ((EQ 0 (SETQ DASHCNT (SUB1 DASHCNT)))
+                                              (SETQ DASHON (NOT DASHON))
+                                              (SETQ DASHTAIL (OR (LISTP (CDR DASHTAIL))
+                                                                 DASHLST))
+                                              (SETQ DASHCNT (CAR DASHTAIL]
+                                [COND
+                                   ([NOT (IGREATERP DY (SETQ CDL (IPLUS CDL DX]
+                                    (COND
+                                       ((IGREATERP (SETQ X1 (ADD1 X1))
+                                               X2)
+                                        (RETURN)))
+                                    (SETQ CDL (IDIFFERENCE CDL DY]
+                                (add Y1 YINC]
+             (T                                              (* ; 
+                                                "when we put the points down make it uninterruptable")
+                (.WHILE.TOP.DS. DISPLAYSTREAM
+                       (COND
+                          [(IGEQ DX DY)                      (* ; "X is the fastest mover.")
+                           (until (IGREATERP X1 X2)
+                              do                             (* ; "main loop")
                                  (COND
-                                    (DASHON (APPLY* USERFN X1 Y1 DISPLAYSTREAM)))
+                                    (DASHON (\CURVEPT X1 Y1)))
                                  [COND
                                     (DASHTAIL                (* ; "do dashing.")
                                            (COND
@@ -2745,8 +2783,8 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                                                   DASHLST))
                                                (SETQ DASHCNT (CAR DASHTAIL]
                                  [COND
-                                    ((NOT (IGREATERP DX (add CDL DY)))
-                                     (add Y1 YINC)
+                                    ([NOT (IGREATERP DX (SETQ CDL (IPLUS CDL DY]
+                                     (SETQ Y1 (IPLUS Y1 YINC))
                                      (COND
                                         ((COND
                                             ((EQ YINC -1)
@@ -2754,15 +2792,15 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                             ((IGREATERP Y1 Y2)))
                                          (RETURN)))
                                      (SETQ CDL (IDIFFERENCE CDL DX]
-                                 (add X1 1)))
-                       (T                                    (* ; "Y is the fastest mover.")
-                          (until (COND
-                                        ((EQ YINC -1)
-                                         (ILESSP Y1 Y2))
-                                        ((IGREATERP Y1 Y2)))
-                             do                          (* ; "main loop")
+                                 (SETQ X1 (ADD1 X1]
+                          (T                                 (* ; "Y is the fastest mover.")
+                             (until (COND
+                                       ((EQ YINC -1)
+                                        (ILESSP Y1 Y2))
+                                       ((IGREATERP Y1 Y2)))
+                                do                           (* ; "main loop")
                                    (COND
-                                      (DASHON (APPLY* USERFN X1 Y1 DISPLAYSTREAM)))
+                                      (DASHON (\CURVEPT X1 Y1)))
                                    [COND
                                       (DASHTAIL              (* ; "do dashing.")
                                              (COND
@@ -2778,65 +2816,13 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                                   X2)
                                            (RETURN)))
                                        (SETQ CDL (IDIFFERENCE CDL DY]
-                                   (add Y1 YINC]
-             (T                                              (* ; 
-                                              "when we put the points down make it uninterruptable")
-                (.WHILE.TOP.DS. DISPLAYSTREAM
-                       (COND
-                          [(IGEQ DX DY)                      (* ; "X is the fastest mover.")
-                           (until (IGREATERP X1 X2)
-                              do                         (* ; "main loop")
-                                    (COND
-                                       (DASHON (\CURVEPT X1 Y1)))
-                                    [COND
-                                       (DASHTAIL             (* ; "do dashing.")
-                                              (COND
-                                                 ((EQ 0 (SETQ DASHCNT (SUB1 DASHCNT)))
-                                                  (SETQ DASHON (NOT DASHON))
-                                                  (SETQ DASHTAIL (OR (LISTP (CDR DASHTAIL))
-                                                                     DASHLST))
-                                                  (SETQ DASHCNT (CAR DASHTAIL]
-                                    [COND
-                                       ([NOT (IGREATERP DX (SETQ CDL (IPLUS CDL DY]
-                                        (SETQ Y1 (IPLUS Y1 YINC))
-                                        (COND
-                                           ((COND
-                                               ((EQ YINC -1)
-                                                (ILESSP Y1 Y2))
-                                               ((IGREATERP Y1 Y2)))
-                                            (RETURN)))
-                                        (SETQ CDL (IDIFFERENCE CDL DX]
-                                    (SETQ X1 (ADD1 X1]
-                          (T                                 (* ; "Y is the fastest mover.")
-                             (until (COND
-                                           ((EQ YINC -1)
-                                            (ILESSP Y1 Y2))
-                                           ((IGREATERP Y1 Y2)))
-                                do                       (* ; "main loop")
-                                      (COND
-                                         (DASHON (\CURVEPT X1 Y1)))
-                                      [COND
-                                         (DASHTAIL           (* ; "do dashing.")
-                                                (COND
-                                                   ((EQ 0 (SETQ DASHCNT (SUB1 DASHCNT)))
-                                                    (SETQ DASHON (NOT DASHON))
-                                                    (SETQ DASHTAIL (OR (LISTP (CDR DASHTAIL))
-                                                                       DASHLST))
-                                                    (SETQ DASHCNT (CAR DASHTAIL]
-                                      [COND
-                                         ([NOT (IGREATERP DY (SETQ CDL (IPLUS CDL DX]
-                                          (COND
-                                             ((IGREATERP (SETQ X1 (ADD1 X1))
-                                                     X2)
-                                              (RETURN)))
-                                          (SETQ CDL (IDIFFERENCE CDL DY]
-                                      (SETQ Y1 (IPLUS Y1 YINC]
+                                   (SETQ Y1 (IPLUS Y1 YINC]
           (RETURN NIL])
 )
 (DEFINEQ
 
 (LOADPOLY
-  [LAMBDA (POLY POLYPRIME A B C D)                       (* hdj "13-Mar-85 18:01")
+  [LAMBDA (POLY POLYPRIME A B C D)                           (* hdj "13-Mar-85 18:01")
     (replace (POLYNOMIAL A) of POLY with (FQUOTIENT A 6.0))
     (replace (POLYNOMIAL B) of POLY with (FQUOTIENT B 2.0))
     (replace (POLYNOMIAL C) of POLY with C)
@@ -2846,7 +2832,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
     (replace (POLYNOMIAL C) of POLYPRIME with C])
 
 (PARAMETRICSPLINE
-  [LAMBDA (KNOTS CLOSEDFLG SPLINE)                       (* rmk%: "30-Nov-84 17:02")
+  [LAMBDA (KNOTS CLOSEDFLG SPLINE)                           (* rmk%: "30-Nov-84 17:02")
 
     (* ;; "KNOTS is a non-NIL list of knots, CLOSEDFLG => closed curve")
 
@@ -2863,11 +2849,10 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           (SETQ DDDY (ARRAY %#KNOTS 0 0.0))
           (SETQ X (ARRAY %#KNOTS 0 0.0))
           (SETQ Y (ARRAY %#KNOTS 0 0.0))
-          (for KNOT in KNOTS as I from 1 to %#KNOTS
-             do (OR (type? POSITION KNOT)
-                        (ERROR "bad knot" KNOT))
-                   (SETA X I (CAR KNOT))
-                   (SETA Y I (CDR KNOT)))
+          (for KNOT in KNOTS as I from 1 to %#KNOTS do (OR (type? POSITION KNOT)
+                                                           (ERROR "bad knot" KNOT))
+                                                       (SETA X I (CAR KNOT))
+                                                       (SETA Y I (CDR KNOT)))
           (SETQ A (ARRAY %#KNOTS 0 0.0))
           (SETQ BX (ARRAY %#KNOTS 0 0.0))
           (SETQ BY (ARRAY %#KNOTS 0 0.0))
@@ -2883,7 +2868,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
              (CLOSEDFLG (SETA C 1 1.0)
                     (for I from 2 to (IDIFFERENCE %#KNOTS 2)
                        do (SETA C I (FMINUS (FQUOTIENT (ELT C (SUB1 I))
-                                                       (ELT A (SUB1 I]
+                                                   (ELT A (SUB1 I]
           [COND
              ((IGEQ %#KNOTS 3)
               (COND
@@ -2895,19 +2880,19 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                                       (ELT Y (SUB1 %#KNOTS]
                         [for I from 2 to (IDIFFERENCE %#KNOTS 2)
                            do [SETA BX I (FDIFFERENCE [FTIMES 6.0
-                                                                 (FPLUS (ELT X (ADD1 I))
-                                                                        (FMINUS (FTIMES 2.0
-                                                                                       (ELT X I)))
-                                                                        (ELT X (SUB1 I]
-                                                    (FQUOTIENT (ELT BX (SUB1 I))
-                                                           (ELT A (SUB1 I]
-                                 (SETA BY I (FDIFFERENCE [FTIMES 6.0
-                                                                (FPLUS (ELT Y (ADD1 I))
-                                                                       (FMINUS (FTIMES 2.0
-                                                                                      (ELT Y I)))
-                                                                       (ELT Y (SUB1 I]
-                                                   (FQUOTIENT (ELT BY (SUB1 I))
-                                                          (ELT A (SUB1 I]
+                                                             (FPLUS (ELT X (ADD1 I))
+                                                                    (FMINUS (FTIMES 2.0
+                                                                                   (ELT X I)))
+                                                                    (ELT X (SUB1 I]
+                                                (FQUOTIENT (ELT BX (SUB1 I))
+                                                       (ELT A (SUB1 I]
+                              (SETA BY I (FDIFFERENCE [FTIMES 6.0
+                                                             (FPLUS (ELT Y (ADD1 I))
+                                                                    (FMINUS (FTIMES 2.0
+                                                                                   (ELT Y I)))
+                                                                    (ELT Y (SUB1 I]
+                                                (FQUOTIENT (ELT BY (SUB1 I))
+                                                       (ELT A (SUB1 I]
                         (SETA R (SUB1 %#KNOTS)
                               1.0)
                         (SETA SX (SUB1 %#KNOTS)
@@ -2916,14 +2901,14 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                               0.0)
                         (for I from (IDIFFERENCE %#KNOTS 2) to 1 by -1
                            do [SETA R I (FMINUS (FQUOTIENT (FPLUS (ELT R (ADD1 I))
-                                                                      (ELT C I))
-                                                           (ELT A I]
-                                 (SETA SX I (FQUOTIENT (FDIFFERENCE (ELT BX I)
-                                                              (ELT SX (ADD1 I)))
-                                                   (ELT A I)))
-                                 (SETA SY I (FQUOTIENT (FDIFFERENCE (ELT BY I)
-                                                              (ELT SY (ADD1 I)))
-                                                   (ELT A I]
+                                                                  (ELT C I))
+                                                       (ELT A I]
+                              (SETA SX I (FQUOTIENT (FDIFFERENCE (ELT BX I)
+                                                           (ELT SX (ADD1 I)))
+                                                (ELT A I)))
+                              (SETA SY I (FQUOTIENT (FDIFFERENCE (ELT BY I)
+                                                           (ELT SY (ADD1 I)))
+                                                (ELT A I]
                  (T [SETA BX 1 (FTIMES 6.0 (FPLUS (FDIFFERENCE (ELT X 3)
                                                          (FTIMES 2.0 (ELT X 2)))
                                                   (ELT X 1]
@@ -2931,20 +2916,20 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                                          (FTIMES 2.0 (ELT Y 2)))
                                                   (ELT Y 1]
                     (for I from 2 to (IDIFFERENCE %#KNOTS 2)
-                       do [SETA BX I (FDIFFERENCE (FTIMES
-                                                       6.0
-                                                       (FPLUS [FDIFFERENCE (ELT X (IPLUS I 2))
-                                                                     (FTIMES 2 (ELT X (ADD1 I]
-                                                              (ELT X I)))
-                                                (FQUOTIENT (ELT BX (SUB1 I))
-                                                       (ELT A (SUB1 I]
-                             (SETA BY I (FDIFFERENCE (FTIMES 6.0
-                                                            (FPLUS [FDIFFERENCE
-                                                                    (ELT Y (IPLUS I 2))
-                                                                    (FTIMES 2 (ELT Y (ADD1 I]
-                                                                   (ELT Y I)))
-                                               (FQUOTIENT (ELT BY (SUB1 I))
-                                                      (ELT A (SUB1 I]
+                       do [SETA BX I (FDIFFERENCE (FTIMES 6.0
+                                                         (FPLUS [FDIFFERENCE
+                                                                 (ELT X (IPLUS I 2))
+                                                                 (FTIMES 2 (ELT X (ADD1 I]
+                                                                (ELT X I)))
+                                            (FQUOTIENT (ELT BX (SUB1 I))
+                                                   (ELT A (SUB1 I]
+                          (SETA BY I (FDIFFERENCE (FTIMES 6.0
+                                                         (FPLUS [FDIFFERENCE
+                                                                 (ELT Y (IPLUS I 2))
+                                                                 (FTIMES 2 (ELT Y (ADD1 I]
+                                                                (ELT Y I)))
+                                            (FQUOTIENT (ELT BY (SUB1 I))
+                                                   (ELT A (SUB1 I]
           [COND
              (CLOSEDFLG [SETQ D2X (FPLUS (ELT X %#KNOTS)
                                          [FMINUS (FTIMES 2.0 (ELT X (SUB1 %#KNOTS]
@@ -2968,38 +2953,38 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                         4.0)))
                     [for I from 1 to (IDIFFERENCE %#KNOTS 2)
                        do [SETA DDX I (FPLUS (ELT SX I)
-                                                 (FTIMES (ELT R I)
-                                                        (ELT DDX (SUB1 %#KNOTS]
-                             (SETA DDY I (FPLUS (ELT SY I)
-                                                (FTIMES (ELT R I)
-                                                       (ELT DDY (SUB1 %#KNOTS]
+                                             (FTIMES (ELT R I)
+                                                    (ELT DDX (SUB1 %#KNOTS]
+                          (SETA DDY I (FPLUS (ELT SY I)
+                                             (FTIMES (ELT R I)
+                                                    (ELT DDY (SUB1 %#KNOTS]
                     (SETA DDX %#KNOTS (ELT DDX 1))
                     (SETA DDY %#KNOTS (ELT DDY 1)))
              (T                                              (* ; "COMPUTE SECOND DERIVATIVES.")
                 [SETA DDX 1 (SETA DDY 1 (SETA DDX %#KNOTS (SETA DDY %#KNOTS 0.0]
                 (for I from (SUB1 %#KNOTS) to 2 by -1
                    do [SETA DDX I (FQUOTIENT (FDIFFERENCE (ELT BX (SUB1 I))
-                                                        (ELT DDX (ADD1 I)))
-                                             (ELT A (SUB1 I]
-                         (SETA DDY I (FQUOTIENT (FDIFFERENCE (ELT BY (SUB1 I))
-                                                       (ELT DDY (ADD1 I)))
-                                            (ELT A (SUB1 I]
+                                                    (ELT DDX (ADD1 I)))
+                                         (ELT A (SUB1 I]
+                      (SETA DDY I (FQUOTIENT (FDIFFERENCE (ELT BY (SUB1 I))
+                                                    (ELT DDY (ADD1 I)))
+                                         (ELT A (SUB1 I]
           [for I from 1 to (SUB1 %#KNOTS)
-             do                                          (* ; "COMPUTE 1ST & 3RD DERIVATIVES")
-                   (SETA DX I (FDIFFERENCE (FDIFFERENCE (ELT X (ADD1 I))
-                                                  (ELT X I))
-                                     (FQUOTIENT (FPLUS (FTIMES 2 (ELT DDX I))
-                                                       (ELT DDX (ADD1 I)))
-                                            6.0)))
-                   (SETA DY I (FDIFFERENCE (FDIFFERENCE (ELT Y (ADD1 I))
-                                                  (ELT Y I))
-                                     (FQUOTIENT (FPLUS (FTIMES 2 (ELT DDY I))
-                                                       (ELT DDY (ADD1 I)))
-                                            6.0)))
-                   (SETA DDDX I (FDIFFERENCE (ELT DDX (ADD1 I))
-                                       (ELT DDX I)))
-                   (SETA DDDY I (FDIFFERENCE (ELT DDY (ADD1 I))
-                                       (ELT DDY I]
+             do                                              (* ; "COMPUTE 1ST & 3RD DERIVATIVES")
+                (SETA DX I (FDIFFERENCE (FDIFFERENCE (ELT X (ADD1 I))
+                                               (ELT X I))
+                                  (FQUOTIENT (FPLUS (FTIMES 2 (ELT DDX I))
+                                                    (ELT DDX (ADD1 I)))
+                                         6.0)))
+                (SETA DY I (FDIFFERENCE (FDIFFERENCE (ELT Y (ADD1 I))
+                                               (ELT Y I))
+                                  (FQUOTIENT (FPLUS (FTIMES 2 (ELT DDY I))
+                                                    (ELT DDY (ADD1 I)))
+                                         6.0)))
+                (SETA DDDX I (FDIFFERENCE (ELT DDX (ADD1 I))
+                                    (ELT DDX I)))
+                (SETA DDDY I (FDIFFERENCE (ELT DDY (ADD1 I))
+                                    (ELT DDY I]
           (SETQ SPLINE
            (create SPLINE
                   %#KNOTS _ %#KNOTS
@@ -3014,7 +2999,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           (RETURN SPLINE])
 
 (\CURVE
-  [LAMBDA (X0 Y0 X1 Y1 DX DY DDX DDY DDDX DDDY N BRUSHBM DISPLAYDATA BBT ENDING USERFN DISPLAYSTREAM)
+  [LAMBDA (X0 Y0 X1 Y1 DX DY DDX DDY DDDX DDDY N BRUSHBM DISPLAYDATA BBT ENDING USERFN DISPLAYSTREAM)
                                                              (* rrb "30-Apr-85 12:44")
     (DECLARE (LOCALVARS . T))
 
@@ -3025,7 +3010,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
              ((NEQ N 0)
               [COND
                  (USERFN                                     (* ; 
-                                                  "if there is a user fn, stay in his coordinates.")
+                                                    "if there is a user fn, stay in his coordinates.")
                         (SETQ OLDX X0)
                         (SETQ OLDY Y0))
                  (T 
@@ -3038,7 +3023,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                                                      1))
                                       DISPLAYDATA]           (* ; "draw origin point")
               (\CURVESMOOTH OLDX OLDY USERFN DISPLAYSTREAM)  (* ; 
-                                            "convert the derivatives to fractional representation.")
+                                              "convert the derivatives to fractional representation.")
 
               (* ;; "\CONVERTTOFRACTION always returns a large number box.  This uses 0.49 because 0.5 causes rounding up.")
 
@@ -3050,45 +3035,37 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
               (SETQ DDY (\CONVERTTOFRACTION DDY))
               (SETQ DDDX (\CONVERTTOFRACTION DDDX))
               (SETQ DDDY (\CONVERTTOFRACTION DDDY))
-              [for I from 1 to N do          (* ; 
-                           "uses \BOXIPLUS to save box and also set the new value of the variable.")
-                                                   (\BOXIPLUS X DX)
-                                                   (\BOXIPLUS DX DDX)
-                                                   (\BOXIPLUS DDX DDDX)
-                                                   (\BOXIPLUS Y DY)
-                                                   (\BOXIPLUS DY DDY)
-                                                   (\BOXIPLUS DDY DDDY)
-                                                   (SETQ OOLDX OLDX)
-                                                   (SETQ OOLDY OLDY)
-                                                   (SETQ DELTAX (IDIFFERENCE (SETQ OLDX (
-                                                                                    \GETINTEGERPART
-                                                                                         X))
-                                                                       OOLDX))
-                                                   (SETQ DELTAY (IDIFFERENCE (SETQ OLDY (
-                                                                                    \GETINTEGERPART
-                                                                                         Y))
-                                                                       OOLDY))
-                                                   (SETQ DELTA (IMAX (IABS DELTAX)
-                                                                     (IABS DELTAY)))
-                                                   (COND
-                                                      ((EQ DELTA 1)
-                                                       (\CURVESMOOTH OLDX OLDY USERFN DISPLAYSTREAM))
-                                                      )
-                                                   (COND
-                                                      ((IGREATERP DELTA 1)
-                                                       (SETQ DELTAX (\CONVERTTOFRACTION
-                                                                     (FQUOTIENT DELTAX DELTA)))
-                                                       (SETQ DELTAY (\CONVERTTOFRACTION
-                                                                     (FQUOTIENT DELTAY DELTA)))
-                                                       (SETQ TX (\CONVERTTOFRACTION OOLDX))
-                                                       (SETQ TY (\CONVERTTOFRACTION OOLDY))
-                                                       (for I from 0 to DELTA
-                                                          do (\CURVESMOOTH (\GETINTEGERPART
-                                                                                TX)
-                                                                        (\GETINTEGERPART TY)
-                                                                        USERFN DISPLAYSTREAM)
-                                                                (\BOXIPLUS TX DELTAX)
-                                                                (\BOXIPLUS TY DELTAY]
+              [for I from 1 to N do                          (* ; 
+                             "uses \BOXIPLUS to save box and also set the new value of the variable.")
+                                    (\BOXIPLUS X DX)
+                                    (\BOXIPLUS DX DDX)
+                                    (\BOXIPLUS DDX DDDX)
+                                    (\BOXIPLUS Y DY)
+                                    (\BOXIPLUS DY DDY)
+                                    (\BOXIPLUS DDY DDDY)
+                                    (SETQ OOLDX OLDX)
+                                    (SETQ OOLDY OLDY)
+                                    (SETQ DELTAX (IDIFFERENCE (SETQ OLDX (\GETINTEGERPART X))
+                                                        OOLDX))
+                                    (SETQ DELTAY (IDIFFERENCE (SETQ OLDY (\GETINTEGERPART Y))
+                                                        OOLDY))
+                                    (SETQ DELTA (IMAX (IABS DELTAX)
+                                                      (IABS DELTAY)))
+                                    (COND
+                                       ((EQ DELTA 1)
+                                        (\CURVESMOOTH OLDX OLDY USERFN DISPLAYSTREAM)))
+                                    (COND
+                                       ((IGREATERP DELTA 1)
+                                        (SETQ DELTAX (\CONVERTTOFRACTION (FQUOTIENT DELTAX DELTA)))
+                                        (SETQ DELTAY (\CONVERTTOFRACTION (FQUOTIENT DELTAY DELTA)))
+                                        (SETQ TX (\CONVERTTOFRACTION OOLDX))
+                                        (SETQ TY (\CONVERTTOFRACTION OOLDY))
+                                        (for I from 0 to DELTA do (\CURVESMOOTH (\GETINTEGERPART
+                                                                                 TX)
+                                                                         (\GETINTEGERPART TY)
+                                                                         USERFN DISPLAYSTREAM)
+                                                                  (\BOXIPLUS TX DELTAX)
+                                                                  (\BOXIPLUS TY DELTAY]
                                                              (* ; "draw the end point")
               (COND
                  (USERFN (\CURVESMOOTH X1 Y1 USERFN DISPLAYSTREAM))
@@ -3110,7 +3087,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           (RETURN NIL])
 
 (\CURVE2
-  [LAMBDA (SPLINE BRUSH DASHLST BBT DISPLAYSTREAM)       (* jds "26-Nov-85 12:21")
+  [LAMBDA (SPLINE BRUSH DASHLST BBT DISPLAYSTREAM)           (* jds "26-Nov-85 12:21")
 
 (* ;;; "Given a spline curve, represented as a set of derivatives for each segment, draw it on DISPLAYSTREAM using the brush BRUSH, and dashing it according to DASHLST.  For speed, use the bitblt table BBT.")
 
@@ -3137,21 +3114,20 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 
           [COND
              (USERFN                                         (* ; 
-             "if calling user fn, don't bother with set up and leave points in window coordinates.")
+               "if calling user fn, don't bother with set up and leave points in window coordinates.")
                     (\CURVESTART (ELT (fetch (SPLINE SPLINEX) of SPLINE)
-                                          1)
+                                      1)
                            (ELT (fetch (SPLINE SPLINEY) of SPLINE)
                                 1)))
              (T (.SETUP.FOR.\BBTCURVEPT.)                    (* ; 
-                 "Do it interruptably here to get set up, then uninterruptably when drawing points")
+                   "Do it interruptably here to get set up, then uninterruptably when drawing points")
                 (\INSURETOPWDS DISPLAYSTREAM)                (* ; 
-                      "curve pts will be kept in screen coordinates, start smoothing values there.")
-                (\CURVESTART (\DSPTRANSFORMX (IDIFFERENCE (ELT (fetch (SPLINE SPLINEX)
-                                                                      of SPLINE)
-                                                                   1)
-                                                        (LRSH (SUB1 BRUSHWIDTH)
-                                                              1))
-                                        DISPLAYDATA)
+                        "curve pts will be kept in screen coordinates, start smoothing values there.")
+                (\CURVESTART (\DSPTRANSFORMX (IDIFFERENCE (ELT (fetch (SPLINE SPLINEX) of SPLINE)
+                                                               1)
+                                                    (LRSH (SUB1 BRUSHWIDTH)
+                                                          1))
+                                    DISPLAYDATA)
                        (\DSPTRANSFORMY (IDIFFERENCE (ELT (fetch (SPLINE SPLINEY) of SPLINE)
                                                          1)
                                               (LRSH (SUB1 BRUSHHEIGHT)
@@ -3159,135 +3135,131 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                               DISPLAYDATA]
           [bind PERSEG for KNOT from 1 to (SUB1 (fetch %#KNOTS of SPLINE))
              when (PROGN 
-                             (* ;; 
-                           "Loop thru the segments of the spline curve, drawing each in turn.")
+                         (* ;; "Loop thru the segments of the spline curve, drawing each in turn.")
 
-                             (SETQ X0 (ELT (fetch (SPLINE SPLINEX) of SPLINE)
-                                           KNOT))            (* ; 
-                                               "Set up X0,Y0 -- the starting point of this segment")
-                             (SETQ Y0 (ELT (fetch (SPLINE SPLINEY) of SPLINE)
-                                           KNOT))
-                             (SETQ X1 (ELT (fetch (SPLINE SPLINEX) of SPLINE)
-                                           (ADD1 KNOT)))     (* ; "And X1,Y1 -- the ending point")
-                             (SETQ Y1 (ELT (fetch (SPLINE SPLINEY) of SPLINE)
-                                           (ADD1 KNOT)))
-                             (SETQ DX (ELT (fetch (SPLINE SPLINEDX) of SPLINE)
-                                           KNOT))            (* ; 
-                                                           "And the initial derivatives -- first")
-                             (SETQ DY (ELT (fetch (SPLINE SPLINEDY) of SPLINE)
-                                           KNOT))
-                             (SETQ DDX (ELT (fetch SPLINEDDX of SPLINE)
-                                            KNOT))           (* ; "Second")
-                             (SETQ DDY (ELT (fetch SPLINEDDY of SPLINE)
-                                            KNOT))
-                             (SETQ DDDX (ELT (fetch SPLINEDDDX of SPLINE)
-                                             KNOT))          (* ; "And third.")
-                             (SETQ DDDY (ELT (fetch SPLINEDDDY of SPLINE)
-                                             KNOT))
-                             (SETQ NPOINTS (FOLDLO (ITIMES (IMAX (IABS (IDIFFERENCE X1 X0))
-                                                                 (IABS (IDIFFERENCE Y1 Y0)))
-                                                          3)
-                                                  2))
+                         (SETQ X0 (ELT (fetch (SPLINE SPLINEX) of SPLINE)
+                                       KNOT))                (* ; 
+                                                 "Set up X0,Y0 -- the starting point of this segment")
+                         (SETQ Y0 (ELT (fetch (SPLINE SPLINEY) of SPLINE)
+                                       KNOT))
+                         (SETQ X1 (ELT (fetch (SPLINE SPLINEX) of SPLINE)
+                                       (ADD1 KNOT)))         (* ; "And X1,Y1 -- the ending point")
+                         (SETQ Y1 (ELT (fetch (SPLINE SPLINEY) of SPLINE)
+                                       (ADD1 KNOT)))
+                         (SETQ DX (ELT (fetch (SPLINE SPLINEDX) of SPLINE)
+                                       KNOT))                (* ; 
+                                                             "And the initial derivatives -- first")
+                         (SETQ DY (ELT (fetch (SPLINE SPLINEDY) of SPLINE)
+                                       KNOT))
+                         (SETQ DDX (ELT (fetch SPLINEDDX of SPLINE)
+                                        KNOT))               (* ; "Second")
+                         (SETQ DDY (ELT (fetch SPLINEDDY of SPLINE)
+                                        KNOT))
+                         (SETQ DDDX (ELT (fetch SPLINEDDDX of SPLINE)
+                                         KNOT))              (* ; "And third.")
+                         (SETQ DDDY (ELT (fetch SPLINEDDDY of SPLINE)
+                                         KNOT))
+                         (SETQ NPOINTS (FOLDLO (ITIMES (IMAX (IABS (IDIFFERENCE X1 X0))
+                                                             (IABS (IDIFFERENCE Y1 Y0)))
+                                                      3)
+                                              2))
 
-                             (* ;; "Establish an upper bound on the number of points we'll draw while painting this segment.  We know that 3/2 the maximum DX or DY is the right amount.")
+                         (* ;; "Establish an upper bound on the number of points we'll draw while painting this segment.  We know that 3/2 the maximum DX or DY is the right amount.")
 
-                             (NOT (ZEROP NPOINTS)))
+                         (NOT (ZEROP NPOINTS)))
              do 
+                (* ;; "NPOINTS can be zero if a knot is duplicated in the spline curve to produce a discontinuity.  Skip over zero-length segments to avoid divide-by-zero trouble")
 
-                   (* ;; "NPOINTS can be zero if a knot is duplicated in the spline curve to produce a discontinuity.  Skip over zero-length segments to avoid divide-by-zero trouble")
+                (* ;; "To prevent round-off errors from accumulating, we'll draw this segment as runs of no more than 64 points each -- recomputing completely at the start of each run.  This is a trade off of speed and accuracy.")
 
-                   (* ;; "To prevent round-off errors from accumulating, we'll draw this segment as runs of no more than 64 points each -- recomputing completely at the start of each run.  This is a trade off of speed and accuracy.")
-
-                   [COND
-                      ((ILEQ NPOINTS 64)                     (* ; 
-                                                 "Fewer than 64 points to draw.  Do it in one run.")
-                       (SETQ NSEGS 1)
-                       (SETQ POINTSPERSEG NPOINTS))
-                      (T                                     (* ; 
-                                                           "Figure out how many runs to do it in.")
-                         (SETQ NSEGS (FOLDLO NPOINTS 64))
-                         (SETQ POINTSPERSEG 64)
-                         (SETQ NPOINTS (UNFOLD NSEGS 64]
-                   (SETQ D1 (FQUOTIENT 1.0 NPOINTS))         (* ; 
-                                        "Set up ÿ&Eÿt, ÿ&Eÿt**2 and ÿ&Eÿt**3, for computing the next point.")
-                   (SETQ D2 (FTIMES D1 D1))
-                   (SETQ D3 (FTIMES D2 D1))
-                   (SETQ D3X (FTIMES D3 DDDX))
-                   (SETQ D3Y (FTIMES D3 DDDY))
-                   (COND
-                      [(EQ NSEGS 1)                          (* ; "Just one segment to draw.")
-                       [SETQ DX (FPLUS (FTIMES D1 DX)
-                                       (FTIMES DDX D2 0.5)
-                                       (FTIMES DDDX D3 (CONSTANT (FQUOTIENT 1.0 6.0]
-                       (SETQ D2X (FPLUS (FTIMES D2 DDX)
-                                        (FTIMES D3 DDDX)))
-                       [SETQ DY (FPLUS (FTIMES D1 DY)
-                                       (FTIMES D2 DDY 0.5)
-                                       (FTIMES D3 DDDY (CONSTANT (FQUOTIENT 1.0 6.0]
-                       (SETQ D2Y (FPLUS (FTIMES D2 DDY)
-                                        (FTIMES D3 DDDY)))
-                       (COND
-                          (USERFN                            (* ; 
-                                     "Draw this run of points, using the user's supplied function.")
+                [COND
+                   ((ILEQ NPOINTS 64)                        (* ; 
+                                                   "Fewer than 64 points to draw.  Do it in one run.")
+                    (SETQ NSEGS 1)
+                    (SETQ POINTSPERSEG NPOINTS))
+                   (T                                        (* ; 
+                                                             "Figure out how many runs to do it in.")
+                      (SETQ NSEGS (FOLDLO NPOINTS 64))
+                      (SETQ POINTSPERSEG 64)
+                      (SETQ NPOINTS (UNFOLD NSEGS 64]
+                (SETQ D1 (FQUOTIENT 1.0 NPOINTS))            (* ; 
+                                          "Set up ÿ&Eÿt, ÿ&Eÿt**2 and ÿ&Eÿt**3, for computing the next point.")
+                (SETQ D2 (FTIMES D1 D1))
+                (SETQ D3 (FTIMES D2 D1))
+                (SETQ D3X (FTIMES D3 DDDX))
+                (SETQ D3Y (FTIMES D3 DDDY))
+                (COND
+                   [(EQ NSEGS 1)                             (* ; "Just one segment to draw.")
+                    [SETQ DX (FPLUS (FTIMES D1 DX)
+                                    (FTIMES DDX D2 0.5)
+                                    (FTIMES DDDX D3 (CONSTANT (FQUOTIENT 1.0 6.0]
+                    (SETQ D2X (FPLUS (FTIMES D2 DDX)
+                                     (FTIMES D3 DDDX)))
+                    [SETQ DY (FPLUS (FTIMES D1 DY)
+                                    (FTIMES D2 DDY 0.5)
+                                    (FTIMES D3 DDDY (CONSTANT (FQUOTIENT 1.0 6.0]
+                    (SETQ D2Y (FPLUS (FTIMES D2 DDY)
+                                     (FTIMES D3 DDDY)))
+                    (COND
+                       (USERFN                               (* ; 
+                                       "Draw this run of points, using the user's supplied function.")
+                              (\CURVE X0 Y0 X1 Y1 DX DY D2X D2Y D3X D3Y NPOINTS BRUSHBM DISPLAYDATA 
+                                     BBT NIL USERFN DISPLAYSTREAM))
+                       (T                                    (* ; 
+                                                          "Draw this run of points, using the brush.")
+                          (.WHILE.TOP.DS. DISPLAYSTREAM
                                  (\CURVE X0 Y0 X1 Y1 DX DY D2X D2Y D3X D3Y NPOINTS BRUSHBM 
-                                        DISPLAYDATA BBT NIL USERFN DISPLAYSTREAM))
-                          (T                                 (* ; 
-                                                        "Draw this run of points, using the brush.")
-                             (.WHILE.TOP.DS. DISPLAYSTREAM
-                                    (\CURVE X0 Y0 X1 Y1 DX DY D2X D2Y D3X D3Y NPOINTS BRUSHBM 
-                                           DISPLAYDATA BBT NIL NIL DISPLAYSTREAM]
-                      (T                                     (* ; 
-                                                         "Have to do this segment in several runs.")
-                         (SETQ PERSEG (FQUOTIENT 1.0 NSEGS))
-                         (LOADPOLY XPOLY X/PRIME/POLY DDDX DDX DX X0)
-                         (LOADPOLY YPOLY Y/PRIME/POLY DDDY DDY DY Y0)
-                         (bind (TT _ 0.0)
-                                (DDDX/PER/SEG _ (FTIMES DDDX PERSEG))
-                                (DDDY/PER/SEG _ (FTIMES DDDY PERSEG))
-                                [D3XFACTOR _ (FTIMES D3 DDDX (CONSTANT (FQUOTIENT 1.0 6.0]
-                                [D3YFACTOR _ (FTIMES D3 DDDY (CONSTANT (FQUOTIENT 1.0 6.0]
-                            for I from 0 to (SUB1 NSEGS)
-                            do 
+                                        DISPLAYDATA BBT NIL NIL DISPLAYSTREAM]
+                   (T                                        (* ; 
+                                                           "Have to do this segment in several runs.")
+                      (SETQ PERSEG (FQUOTIENT 1.0 NSEGS))
+                      (LOADPOLY XPOLY X/PRIME/POLY DDDX DDX DX X0)
+                      (LOADPOLY YPOLY Y/PRIME/POLY DDDY DDY DY Y0)
+                      (bind (TT _ 0.0)
+                            (DDDX/PER/SEG _ (FTIMES DDDX PERSEG))
+                            (DDDY/PER/SEG _ (FTIMES DDDY PERSEG))
+                            [D3XFACTOR _ (FTIMES D3 DDDX (CONSTANT (FQUOTIENT 1.0 6.0]
+                            [D3YFACTOR _ (FTIMES D3 DDDY (CONSTANT (FQUOTIENT 1.0 6.0] for I
+                         from 0 to (SUB1 NSEGS)
+                         do 
+                            (* ;; 
+         "TT is the parameter, and runs from 0 to 1 as the curve segment runs from beginning to end.")
 
-                                  (* ;; 
-       "TT is the parameter, and runs from 0 to 1 as the curve segment runs from beginning to end.")
-
-                                  (SETQ TT (FPLUS TT PERSEG))
-                                  (SETQ X1 (POLYEVAL TT XPOLY 3))
-                                  (SETQ Y1 (POLYEVAL TT YPOLY 3))
-                                  (SETQ DX (FPLUS (FTIMES D1 DX)
-                                                  (FTIMES D2 DDX 0.5)
-                                                  D3XFACTOR))
-                                  (SETQ D2X (FPLUS (FTIMES D2 DDX)
-                                                   (FTIMES D3 DDDX)))
-                                  (SETQ DY (FPLUS (FTIMES D1 DY)
-                                                  (FTIMES D2 DDY 0.5)
-                                                  D3YFACTOR))
-                                  (SETQ D2Y (FPLUS (FTIMES D2 DDY)
-                                                   (FTIMES D3 DDDY)))
-                                  [COND
-                                     (USERFN (\CURVE X0 Y0 X1 Y1 DX DY D2X D2Y D3X D3Y 64 BRUSHBM
-                                                    DISPLAYDATA BBT NIL USERFN DISPLAYSTREAM))
-                                     (T (.WHILE.TOP.DS. DISPLAYSTREAM
-                                               (\CURVE X0 Y0 X1 Y1 DX DY D2X D2Y D3X D3Y 64 
-                                                      BRUSHBM DISPLAYDATA BBT NIL NIL DISPLAYSTREAM]
-                                  (SETQ X0 X1)
-                                  (SETQ Y0 Y1)
-                                  (SETQ DDX (FPLUS DDX DDDX/PER/SEG))
-                                  (SETQ DDY (FPLUS DDY DDDY/PER/SEG))
-                                  (SETQ DX (POLYEVAL TT X/PRIME/POLY 2))
-                                  (SETQ DY (POLYEVAL TT Y/PRIME/POLY 2]
+                            (SETQ TT (FPLUS TT PERSEG))
+                            (SETQ X1 (POLYEVAL TT XPOLY 3))
+                            (SETQ Y1 (POLYEVAL TT YPOLY 3))
+                            (SETQ DX (FPLUS (FTIMES D1 DX)
+                                            (FTIMES D2 DDX 0.5)
+                                            D3XFACTOR))
+                            (SETQ D2X (FPLUS (FTIMES D2 DDX)
+                                             (FTIMES D3 DDDX)))
+                            (SETQ DY (FPLUS (FTIMES D1 DY)
+                                            (FTIMES D2 DDY 0.5)
+                                            D3YFACTOR))
+                            (SETQ D2Y (FPLUS (FTIMES D2 DDY)
+                                             (FTIMES D3 DDDY)))
+                            [COND
+                               (USERFN (\CURVE X0 Y0 X1 Y1 DX DY D2X D2Y D3X D3Y 64 BRUSHBM 
+                                              DISPLAYDATA BBT NIL USERFN DISPLAYSTREAM))
+                               (T (.WHILE.TOP.DS. DISPLAYSTREAM
+                                         (\CURVE X0 Y0 X1 Y1 DX DY D2X D2Y D3X D3Y 64 BRUSHBM 
+                                                DISPLAYDATA BBT NIL NIL DISPLAYSTREAM]
+                            (SETQ X0 X1)
+                            (SETQ Y0 Y1)
+                            (SETQ DDX (FPLUS DDX DDDX/PER/SEG))
+                            (SETQ DDY (FPLUS DDY DDDY/PER/SEG))
+                            (SETQ DX (POLYEVAL TT X/PRIME/POLY 2))
+                            (SETQ DY (POLYEVAL TT Y/PRIME/POLY 2]
 
      (* ;; "Draw the final point on the curve.")
 
           (COND
-             (USERFN (\CURVE 0 0 0 0 0 0 0 0 0 0 0 BRUSHBM DISPLAYDATA BBT T USERFN DISPLAYSTREAM
-                            ))
+             (USERFN (\CURVE 0 0 0 0 0 0 0 0 0 0 0 BRUSHBM DISPLAYDATA BBT T USERFN DISPLAYSTREAM))
              (T (.WHILE.TOP.DS. DISPLAYSTREAM
                        (\CURVE 0 0 0 0 0 0 0 0 0 0 0 BRUSHBM DISPLAYDATA BBT T NIL DISPLAYSTREAM])
 
 (\CURVEEND
-  [LAMBDA NIL                                            (* rrb " 5-JAN-82 17:24")
+  [LAMBDA NIL                                                (* rrb " 5-JAN-82 17:24")
 
     (* ;; "Put out the last two points, using \CURVEPT, since they were held back for smoothing.")
 
@@ -3296,10 +3268,10 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
            (DX (IDIFFERENCE \CURX \OLDX))
            (DY (IDIFFERENCE \CURY \OLDY)))
           (for I from 1 to 2 do (\CURVESMOOTH (SETQ X (IPLUS X DX))
-                                                       (SETQ Y (IPLUS Y DY])
+                                       (SETQ Y (IPLUS Y DY])
 
 (\CURVESLOPE
-  [LAMBDA (KNOTS ENDFLG)                                 (* rrb "30-Nov-84 18:17")
+  [LAMBDA (KNOTS ENDFLG)                                     (* rrb "30-Nov-84 18:17")
 
     (* ;; "returns a CONS of DX DY that gives the slope of the curve thru KNOTS.  If ENDFLG is NIL, it is at the beginning.  If ENDFLG is T, it is at the last point.")
 
@@ -3312,29 +3284,29 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                (DIFFERENCE (fetch (POSITION YCOORD) of (CADR KNOTS))
                                       (fetch (POSITION YCOORD) of (CAR KNOTS])
                       (PROGN [SETQ PARAMS (COND
-                                             [ENDFLG (PARAMETRICSPLINE (REVERSE
-                                                                            (NLEFT KNOTS
-                                                                                   (IMIN %#KNOTS 4]
+                                             [ENDFLG (PARAMETRICSPLINE (REVERSE (NLEFT KNOTS
+                                                                                       (IMIN %#KNOTS
+                                                                                             4]
                                              (T (PARAMETRICSPLINE (COND
-                                                                         ((EQ %#KNOTS 3)
-                                                                          (LIST (CAR KNOTS)
-                                                                                (CADR KNOTS)
-                                                                                (CADDR KNOTS)))
-                                                                         (T (LIST (CAR KNOTS)
-                                                                                  (CADR KNOTS)
-                                                                                  (CADDR KNOTS)
-                                                                                  (CADDDR KNOTS]
+                                                                     ((EQ %#KNOTS 3)
+                                                                      (LIST (CAR KNOTS)
+                                                                            (CADR KNOTS)
+                                                                            (CADDR KNOTS)))
+                                                                     (T (LIST (CAR KNOTS)
+                                                                              (CADR KNOTS)
+                                                                              (CADDR KNOTS)
+                                                                              (CADDDR KNOTS]
                              (SETQ DX (ELT (fetch (SPLINE SPLINEDX) of PARAMS)
                                            1))
                              (SETQ DY (ELT (fetch (SPLINE SPLINEDY) of PARAMS)
                                            1))
                              (if ENDFLG
                                  then (CONS (MINUS DX)
-                                                (MINUS DY))
+                                            (MINUS DY))
                                else (CONS DX DY])
 
 (\CURVESTART
-  [LAMBDA (X Y)                                          (* jds "27-OCT-81 15:48")
+  [LAMBDA (X Y)                                              (* jds "27-OCT-81 15:48")
 
     (* ;; "Set up the init vals for \OLDER* \OLD* \CUR*, for curve smoothing in \CURVEPT.")
 
@@ -3346,7 +3318,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
     (SETQ \CURY Y])
 
 (\FDIFS/FROM/DERIVS
-  [LAMBDA (DZ DDZ DDDZ RAD NSTEPS)                       (* rrb "12-MAY-81 10:59")
+  [LAMBDA (DZ DDZ DDDZ RAD NSTEPS)                           (* rrb "12-MAY-81 10:59")
 
     (* ;; "the derivatives of the function, plus a scale factor (radius for drawing circles) See 'Spline Curve Techniques' , equations 2.18.")
 
@@ -3366,11 +3338,10 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE
 
 (ARRAYRECORD POLYNOMIAL (A B C D)
-                            (CREATE (ARRAY 4 'FLOATP))
-                            (SYSTEM))
+                        (CREATE (ARRAY 4 'FLOATP))
+                        (SYSTEM))
 
-(RECORD SPLINE (%#KNOTS SPLINEX SPLINEY SPLINEDX SPLINEDY SPLINEDDX SPLINEDDY SPLINEDDDX 
-                          SPLINEDDDY))
+(RECORD SPLINE (%#KNOTS SPLINEX SPLINEY SPLINEDX SPLINEDY SPLINEDDX SPLINEDDY SPLINEDDDX SPLINEDDDY))
 )
 
 (* "END EXPORTED DEFINITIONS")
@@ -3380,21 +3351,20 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS HALF MACRO ((X)
-                              (LRSH X 1)))
+                      (LRSH X 1)))
 
-(PUTPROPS \FILLCIRCLEBLT MACRO (OPENLAMBDA (CX CY X Y)
-                                                             (* ; 
-                                            "calls bitblt twice to fill in one line of the circle.")
-                                         (\LINEBLT FCBBT (IDIFFERENCE CX X)
-                                                (IPLUS CY Y)
-                                                (IPLUS CX X)
-                                                DESTINATIONBASE RASTERWIDTH LEFT RIGHT BOTTOM TOP 
-                                                GRAYWIDTH GRAYHEIGHT GRAYBASE NBITS)
-                                         (\LINEBLT FCBBT (IDIFFERENCE CX X)
-                                                (IDIFFERENCE CY Y)
-                                                (IPLUS CX X)
-                                                DESTINATIONBASE RASTERWIDTH LEFT RIGHT BOTTOM TOP 
-                                                GRAYWIDTH GRAYHEIGHT GRAYBASE NBITS)))
+(PUTPROPS \FILLCIRCLEBLT MACRO (OPENLAMBDA (CX CY X Y)       (* ; 
+                                              "calls bitblt twice to fill in one line of the circle.")
+                                 (\LINEBLT FCBBT (IDIFFERENCE CX X)
+                                        (IPLUS CY Y)
+                                        (IPLUS CX X)
+                                        DESTINATIONBASE RASTERWIDTH LEFT RIGHT BOTTOM TOP GRAYWIDTH 
+                                        GRAYHEIGHT GRAYBASE NBITS)
+                                 (\LINEBLT FCBBT (IDIFFERENCE CX X)
+                                        (IDIFFERENCE CY Y)
+                                        (IPLUS CX X)
+                                        DESTINATIONBASE RASTERWIDTH LEFT RIGHT BOTTOM TOP GRAYWIDTH 
+                                        GRAYHEIGHT GRAYBASE NBITS)))
 )
 
 (* "END EXPORTED DEFINITIONS")
@@ -3403,131 +3373,153 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS \CURVEPT MACRO [OPENLAMBDA (X Y)
-                                   (COND
-                                      ((OR (ILEQ X LEFTMINUSBRUSH)
-                                           (IGEQ X RIGHTPLUS1)
-                                           (ILEQ Y BOTTOMMINUSBRUSH)
-                                           (IGEQ Y TOP))
-                                       NIL)
-                                      ((NULL BBT)
-                                       (\FBITMAPBIT DESTINATIONBASE X Y OPERATION HEIGHTMINUS1 
-                                              RASTERWIDTH))
-                                      (T 
-                                         (* ;; 
-                       "This should have been done in .SETUP.FOR.\BBTCURVEPT., under \GETBRUSHBBT.")
+                           (COND
+                              ((OR (ILEQ X LEFTMINUSBRUSH)
+                                   (IGEQ X RIGHTPLUS1)
+                                   (ILEQ Y BOTTOMMINUSBRUSH)
+                                   (IGEQ Y TOP))
+                               NIL)
+                              ((NULL BBT)
+                               (\FBITMAPBIT DESTINATIONBASE X Y OPERATION HEIGHTMINUS1 RASTERWIDTH))
+                              (T 
+                                 (* ;; 
+                         "This should have been done in .SETUP.FOR.\BBTCURVEPT., under \GETBRUSHBBT.")
 
-                                         (* ;; 
-                                     "Its a bug here, because brushes can't use operation REPLACE.")
+                                 (* ;; "Its a bug here, because brushes can't use operation REPLACE.")
 
-                                         (* ;; 
-                             "(\SETPBTFUNCTION BBT (ffetch DDSOURCETYPE of DISPLAYDATA) OPERATION)")
+                                 (* ;; 
+                               "(\SETPBTFUNCTION BBT (ffetch DDSOURCETYPE of DISPLAYDATA) OPERATION)")
 
-                                         (\BBTCURVEPT X Y BBT LEFT BRUSHWIDTH LEFTMINUSBRUSH 
-                                                RIGHTPLUS1 NBITSRIGHTPLUS1 TOPMINUSBRUSH 
-                                                DestinationBitMap BRUSHHEIGHT BOTTOMMINUSBRUSH TOP 
-                                                BRUSHBASE DESTINATIONBASE RASTERWIDTH 
-                                                BRUSHRASTERWIDTH COLORBRUSHBASE NBITS DISPLAYDATA])
+                                 (\BBTCURVEPT X Y BBT LEFT BRUSHWIDTH LEFTMINUSBRUSH RIGHTPLUS1 
+                                        NBITSRIGHTPLUS1 TOPMINUSBRUSH DestinationBitMap BRUSHHEIGHT 
+                                        BOTTOMMINUSBRUSH TOP BRUSHBASE DESTINATIONBASE RASTERWIDTH 
+                                        BRUSHRASTERWIDTH COLORBRUSHBASE NBITS DISPLAYDATA])
 
-(PUTPROPS .SETUP.FOR.\BBTCURVEPT. MACRO
-          [NIL (PROGN (SETQ BOTTOM (ffetch (\DISPLAYDATA DDClippingBottom) of DISPLAYDATA))
-                      (SETQ TOP (ffetch (\DISPLAYDATA DDClippingTop) of DISPLAYDATA))
-                      (SETQ RIGHTPLUS1 (ffetch (\DISPLAYDATA DDClippingRight) of DISPLAYDATA)
-                       )
-                      (SETQ LEFT (ffetch (\DISPLAYDATA DDClippingLeft) of DISPLAYDATA))
-                      (SETQ DestinationBitMap (ffetch (\DISPLAYDATA DDDestination) of 
-                                                                                          DISPLAYDATA
-                                                     ))
-                      (SETQ OPERATION (OR OPERATION (ffetch (\DISPLAYDATA DDOPERATION)
-                                                       of DISPLAYDATA)))
-                      (SETQ NBITS (fetch (BITMAP BITMAPBITSPERPIXEL) of DestinationBitMap))
-                      [COND
-                         [(NOT (EQ NBITS 1))
-                          (SETQ BRUSHBM (\GETCOLORBRUSH BRUSH (MAXIMUMCOLOR NBITS)
-                                               NBITS))
-                          [SETQ COLOR (COND
-                                         [(AND (LISTP BRUSH)
-                                               (CAR (LISTP (CDDR BRUSH]
-                                         ((DSPCOLOR NIL DISPLAYSTREAM))
-                                         (T (MAXIMUMCOLOR NBITS]
-                          [COND
-                             ((EQ OPERATION 'ERASE)
-                              (SETQ COLOR (OPPOSITECOLOR COLOR NBITS]
-                          (SETQ COLORBRUSHBASE (fetch (BITMAP BITMAPBASE)
-                                                  of (\GETCOLORBRUSH BRUSH COLOR NBITS]
-                         (T (SETQ BRUSHBM (\GETBRUSH BRUSH]
-                      (SETQ RASTERWIDTH (ffetch (BITMAP BITMAPRASTERWIDTH) of 
+(PUTPROPS .SETUP.FOR.\BBTCURVEPT. MACRO [NIL (PROGN (SETQ BOTTOM (ffetch (\DISPLAYDATA 
+                                                                                DDClippingBottom)
+                                                                    of DISPLAYDATA))
+                                                    (SETQ TOP (ffetch (\DISPLAYDATA DDClippingTop)
+                                                                 of DISPLAYDATA))
+                                                    (SETQ RIGHTPLUS1 (ffetch (\DISPLAYDATA 
+                                                                                    DDClippingRight)
+                                                                        of DISPLAYDATA))
+                                                    (SETQ LEFT (ffetch (\DISPLAYDATA DDClippingLeft)
+                                                                  of DISPLAYDATA))
+                                                    (SETQ DestinationBitMap (ffetch (\DISPLAYDATA
+                                                                                     DDDestination)
+                                                                               of DISPLAYDATA))
+                                                    (SETQ OPERATION (OR OPERATION (ffetch
+                                                                                   (\DISPLAYDATA
+                                                                                    DDOPERATION)
+                                                                                     of DISPLAYDATA))
+                                                     )
+                                                    (SETQ NBITS (fetch (BITMAP BITMAPBITSPERPIXEL)
+                                                                   of DestinationBitMap))
+                                                    [COND
+                                                       [(NOT (EQ NBITS 1))
+                                                        (SETQ BRUSHBM (\GETCOLORBRUSH BRUSH
+                                                                             (MAXIMUMCOLOR NBITS)
+                                                                             NBITS))
+                                                        [SETQ COLOR
+                                                         (COND
+                                                            [(AND (LISTP BRUSH)
+                                                                  (CAR (LISTP (CDDR BRUSH]
+                                                            ((DSPCOLOR NIL DISPLAYSTREAM))
+                                                            (T (MAXIMUMCOLOR NBITS]
+                                                        [COND
+                                                           ((EQ OPERATION 'ERASE)
+                                                            (SETQ COLOR (OPPOSITECOLOR COLOR NBITS]
+                                                        (SETQ COLORBRUSHBASE
+                                                         (fetch (BITMAP BITMAPBASE)
+                                                            of (\GETCOLORBRUSH BRUSH COLOR NBITS]
+                                                       (T (SETQ BRUSHBM (\GETBRUSH BRUSH]
+                                                    (SETQ RASTERWIDTH (ffetch (BITMAP 
+                                                                                    BITMAPRASTERWIDTH
+                                                                                     ) of 
                                                                                     DestinationBitMap
-                                               ))
-                      (SETQ DESTINATIONBASE (ffetch (BITMAP BITMAPBASE) of DestinationBitMap)
-                       )
-                      (SETQ BBT (\GETBRUSHBBT BRUSHBM DISPLAYDATA BBT))
-                      (SETQ BRUSHBASE (fetch (BITMAP BITMAPBASE) of BRUSHBM))
-                      (SETQ BRUSHRASTERWIDTH (ffetch (BITMAP BITMAPRASTERWIDTH) of BRUSHBM))
-                      [COND
-                         ((NULL BBT)
-                          (SETQ HEIGHTMINUS1 (SUB1 (ffetch (BITMAP BITMAPHEIGHT) of 
+                                                                             ))
+                                                    (SETQ DESTINATIONBASE (ffetch (BITMAP BITMAPBASE)
+                                                                             of DestinationBitMap))
+                                                    (SETQ BBT (\GETBRUSHBBT BRUSHBM DISPLAYDATA BBT))
+                                                    (SETQ BRUSHBASE (fetch (BITMAP BITMAPBASE)
+                                                                       of BRUSHBM))
+                                                    (SETQ BRUSHRASTERWIDTH (ffetch (BITMAP 
+                                                                                    BITMAPRASTERWIDTH
+                                                                                          )
+                                                                              of BRUSHBM))
+                                                    [COND
+                                                       ((NULL BBT)
+                                                        (SETQ HEIGHTMINUS1 (SUB1 (ffetch (BITMAP
+                                                                                          
+                                                                                         BITMAPHEIGHT
+                                                                                          )
+                                                                                    of 
                                                                                     DestinationBitMap
-                                                          )))
-                          (COND
-                             ((EQ (ffetch (\DISPLAYDATA DDOPERATION) of DISPLAYDATA)
-                                  'INVERT)
-                              (SETQ OPERATION 'INVERT]
-                      (SETQ BRUSHWIDTH (ffetch (BITMAP BITMAPWIDTH) of BRUSHBM))
-                      (SETQ BRUSHHEIGHT (ffetch (BITMAP BITMAPHEIGHT) of BRUSHBM))
-                      (SETQ LEFTMINUSBRUSH (IDIFFERENCE LEFT BRUSHWIDTH))
-                      (SETQ BOTTOMMINUSBRUSH (IDIFFERENCE BOTTOM BRUSHHEIGHT))
-                      (SETQ TOPMINUSBRUSH (IDIFFERENCE TOP BRUSHHEIGHT))
-                      (SETQ NBITSRIGHTPLUS1 (ITIMES RIGHTPLUS1 NBITS))
-                      (SETQ BRUSHWIDTH (ITIMES BRUSHWIDTH NBITS])
+                                                                                        )))
+                                                        (COND
+                                                           ((EQ (ffetch (\DISPLAYDATA DDOPERATION)
+                                                                   of DISPLAYDATA)
+                                                                'INVERT)
+                                                            (SETQ OPERATION 'INVERT]
+                                                    (SETQ BRUSHWIDTH (ffetch (BITMAP BITMAPWIDTH)
+                                                                        of BRUSHBM))
+                                                    (SETQ BRUSHHEIGHT (ffetch (BITMAP BITMAPHEIGHT)
+                                                                         of BRUSHBM))
+                                                    (SETQ LEFTMINUSBRUSH (IDIFFERENCE LEFT BRUSHWIDTH
+                                                                                ))
+                                                    (SETQ BOTTOMMINUSBRUSH (IDIFFERENCE BOTTOM 
+                                                                                  BRUSHHEIGHT))
+                                                    (SETQ TOPMINUSBRUSH (IDIFFERENCE TOP BRUSHHEIGHT)
+                                                     )
+                                                    (SETQ NBITSRIGHTPLUS1 (ITIMES RIGHTPLUS1 NBITS))
+                                                    (SETQ BRUSHWIDTH (ITIMES BRUSHWIDTH NBITS])
 
 (PUTPROPS \CIRCLEPTS MACRO (OPENLAMBDA (CX CY X Y)
-                                     (\CURVEPT (IPLUS CX X)
-                                            (IPLUS CY Y))
-                                     (\CURVEPT (IDIFFERENCE CX X)
-                                            (IPLUS CY Y))
-                                     (\CURVEPT (IPLUS CX X)
-                                            (IDIFFERENCE CY Y))
-                                     (\CURVEPT (IDIFFERENCE CX X)
-                                            (IDIFFERENCE CY Y))))
+                             (\CURVEPT (IPLUS CX X)
+                                    (IPLUS CY Y))
+                             (\CURVEPT (IDIFFERENCE CX X)
+                                    (IPLUS CY Y))
+                             (\CURVEPT (IPLUS CX X)
+                                    (IDIFFERENCE CY Y))
+                             (\CURVEPT (IDIFFERENCE CX X)
+                                    (IDIFFERENCE CY Y))))
 
 (PUTPROPS \CURVESMOOTH MACRO (OPENLAMBDA (NEWX NEWY USERFN DISPLAYSTREAM)
-                                       (PROG [(DX (IABS (IDIFFERENCE NEWX \OLDX)))
-                                              (DY (IABS (IDIFFERENCE NEWY \OLDY]
+                               (PROG [(DX (IABS (IDIFFERENCE NEWX \OLDX)))
+                                      (DY (IABS (IDIFFERENCE NEWY \OLDY]
+                                     (COND
+                                        ((OR (IGREATERP DX 1)
+                                             (IGREATERP DY 1))
+                                         [COND
+                                            ((NEQ [IPLUS (ADD1 (IDIFFERENCE \OLDX \OLDERX))
+                                                         (ITIMES 3 (ADD1 (IDIFFERENCE \OLDY \OLDERY]
+                                                  4)
+                                             [COND
+                                                (DASHON (COND
+                                                           (USERFN (APPLY* USERFN \OLDX \OLDY 
+                                                                          DISPLAYSTREAM))
+                                                           (T (.WHILE.TOP.DS. DISPLAYSTREAM
+                                                                     (\CURVEPT \OLDX \OLDY]
                                              (COND
-                                                ((OR (IGREATERP DX 1)
-                                                     (IGREATERP DY 1))
-                                                 [COND
-                                                    ((NEQ [IPLUS (ADD1 (IDIFFERENCE \OLDX \OLDERX))
-                                                                 (ITIMES 3 (ADD1 (IDIFFERENCE \OLDY 
-                                                                                        \OLDERY]
-                                                          4)
-                                                     [COND
-                                                        (DASHON (COND
-                                                                   (USERFN (APPLY* USERFN \OLDX \OLDY
-                                                                                  DISPLAYSTREAM))
-                                                                   (T (.WHILE.TOP.DS. DISPLAYSTREAM
-                                                                             (\CURVEPT \OLDX \OLDY]
-                                                     (COND
-                                                        (DASHTAIL (COND
-                                                                     ((EQ 0 (SETQ DASHCNT
-                                                                             (SUB1 DASHCNT)))
-                                                                      (SETQ DASHON (NOT DASHON))
-                                                                      (SETQ DASHTAIL
-                                                                       (OR (LISTP (CDR DASHTAIL))
-                                                                           DASHLST))
-                                                                      (SETQ DASHCNT (CAR DASHTAIL]
-                                                 (SETQ \OLDERX \OLDX)
-                                                 (SETQ \OLDERY \OLDY)
-                                                 (SETQ \OLDX \CURX)
-                                                 (SETQ \OLDY \CURY)))
-                                             (SETQ \CURX NEWX)
-                                             (SETQ \CURY NEWY))))
+                                                (DASHTAIL (COND
+                                                             ((EQ 0 (SETQ DASHCNT (SUB1 DASHCNT)))
+                                                              (SETQ DASHON (NOT DASHON))
+                                                              (SETQ DASHTAIL
+                                                               (OR (LISTP (CDR DASHTAIL))
+                                                                   DASHLST))
+                                                              (SETQ DASHCNT (CAR DASHTAIL]
+                                         (SETQ \OLDERX \OLDX)
+                                         (SETQ \OLDERY \OLDY)
+                                         (SETQ \OLDX \CURX)
+                                         (SETQ \OLDY \CURY)))
+                                     (SETQ \CURX NEWX)
+                                     (SETQ \CURY NEWY))))
 )
 )
 (DEFINEQ
 
 (\FILLCIRCLE.DISPLAY
-  [LAMBDA (DISPLAYSTREAM CENTERX CENTERY RADIUS TEXTURE) (* kbr%: "24-Jan-86 19:12")
+  [LAMBDA (DISPLAYSTREAM CENTERX CENTERY RADIUS TEXTURE)     (* kbr%: "24-Jan-86 19:12")
 
     (* ;; "Fill in area bounded by circle DRAWCIRCLE would draw.")
 
@@ -3548,45 +3540,42 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                        (SETQ LEFT (fetch (\DISPLAYDATA DDClippingLeft) of DISPLAYDATA))
                        (SETQ BOTTOM (fetch (\DISPLAYDATA DDClippingBottom) of DISPLAYDATA))
                        (SETQ TOP (SUB1 (fetch (\DISPLAYDATA DDClippingTop) of DISPLAYDATA)))
-                       (SETQ RIGHT (SUB1 (fetch (\DISPLAYDATA DDClippingRight) of DISPLAYDATA
-                                                )))
+                       (SETQ RIGHT (SUB1 (fetch (\DISPLAYDATA DDClippingRight) of DISPLAYDATA)))
                        (SETQ OPERATION (fetch (\DISPLAYDATA DDOPERATION) of DISPLAYDATA))
-                       (SETQ DestinationBitMap (fetch (\DISPLAYDATA DDDestination) of 
-                                                                                          DISPLAYDATA
-                                                      ))
+                       (SETQ DestinationBitMap (fetch (\DISPLAYDATA DDDestination) of DISPLAYDATA))
                        (SETQ NBITS (fetch (BITMAP BITMAPBITSPERPIXEL) of DestinationBitMap))
                        [SETQ TEXTUREBM (COND
                                           ((BITMAPP TEXTURE))
                                           [(NOT (EQ NBITS 1))(* ; 
-                                                          "color case, default texture differently")
+                                                            "color case, default texture differently")
                                            (COND
                                               ((BITMAPP (COLORTEXTUREFROMCOLOR#
-                                                             (COLORNUMBERP (OR TEXTURE
-                                                                               (DSPCOLOR NIL 
-                                                                                      DISPLAYSTREAM))
-                                                                    NBITS T)
-                                                             NBITS)))
+                                                         (COLORNUMBERP (OR TEXTURE (DSPCOLOR NIL 
+                                                                                        DISPLAYSTREAM
+                                                                                          ))
+                                                                NBITS T)
+                                                         NBITS)))
                                               [(AND (LISTP TEXTURE)
                                                     (BITMAPP (COLORTEXTUREFROMCOLOR#
-                                                                  (COLORNUMBERP (CADR TEXTURE)
-                                                                         NBITS)
-                                                                  NBITS]
+                                                              (COLORNUMBERP (CADR TEXTURE)
+                                                                     NBITS)
+                                                              NBITS]
                                               (T (\ILLEGAL.ARG TEXTURE]
                                           ((LISTP TEXTURE)   (* ; 
-                                                      "either a color or a list of (texture color)")
+                                                        "either a color or a list of (texture color)")
                                            (INSURE.B&W.TEXTURE TEXTURE))
                                           [(AND (NULL TEXTURE)
-                                                (BITMAPP (fetch (\DISPLAYDATA DDTexture)
-                                                                of DISPLAYDATA]
+                                                (BITMAPP (fetch (\DISPLAYDATA DDTexture) of 
+                                                                                          DISPLAYDATA
+                                                                ]
                                           ([OR (FIXP TEXTURE)
                                                (AND (NULL TEXTURE)
                                                     (SETQ TEXTURE (fetch (\DISPLAYDATA DDTexture)
                                                                      of DISPLAYDATA]
                                                              (* ; 
-            "create bitmap for the texture.  Could reuse a bitmap but for now this is good enough.")
+              "create bitmap for the texture.  Could reuse a bitmap but for now this is good enough.")
                                            (SETQ TEXTUREBM (BITMAPCREATE 16 4))
-                                           (SETQ GRAYBASE (fetch (BITMAP BITMAPBASE) of
-                                                                                         TEXTUREBM))
+                                           (SETQ GRAYBASE (fetch (BITMAP BITMAPBASE) of TEXTUREBM))
                                            (\PUTBASE GRAYBASE 0 (\SFReplicate (LOGAND (LRSH TEXTURE 
                                                                                             12)
                                                                                      15)))
@@ -3600,36 +3589,32 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                            TEXTUREBM)
                                           (T (\ILLEGAL.ARG TEXTURE]
                        (SETQ GRAYBASE (fetch (BITMAP BITMAPBASE) of TEXTUREBM))
-                       (SETQ DESTINATIONBASE (fetch (BITMAP BITMAPBASE) of DestinationBitMap)
-                        )
-                       (SETQ RASTERWIDTH (fetch (BITMAP BITMAPRASTERWIDTH) of 
-                                                                                    DestinationBitMap
-                                                ))           (* ; 
-                             "update as many fields in the brush bitblt table as possible from DS.")
-                       (replace (PILOTBBT PBTFLAGS) of FCBBT with 0)
-                       (replace (PILOTBBT PBTDESTBPL) of FCBBT with (UNFOLD RASTERWIDTH 
-                                                                                       BITSPERWORD))
+                       (SETQ DESTINATIONBASE (fetch (BITMAP BITMAPBASE) of DestinationBitMap))
+                       (SETQ RASTERWIDTH (fetch (BITMAP BITMAPRASTERWIDTH) of DestinationBitMap))
                                                              (* ; 
-                          "clear gray information.  PBTSOURCEBPL is used for gray information too.")
+                               "update as many fields in the brush bitblt table as possible from DS.")
+                       (replace (PILOTBBT PBTFLAGS) of FCBBT with 0)
+                       (replace (PILOTBBT PBTDESTBPL) of FCBBT with (UNFOLD RASTERWIDTH BITSPERWORD))
+                                                             (* ; 
+                            "clear gray information.  PBTSOURCEBPL is used for gray information too.")
                        (replace (PILOTBBT PBTSOURCEBPL) of FCBBT with 0)
                        (replace (PILOTBBT PBTUSEGRAY) of FCBBT with T)
                        [replace (PILOTBBT PBTGRAYWIDTHLESSONE) of FCBBT
-                          with (SUB1 (SETQ GRAYWIDTH (IMIN (fetch (BITMAP BITMAPWIDTH)
-                                                                  of TEXTUREBM)
-                                                               16]
+                          with (SUB1 (SETQ GRAYWIDTH (IMIN (fetch (BITMAP BITMAPWIDTH) of TEXTUREBM)
+                                                           16]
                        [replace (PILOTBBT PBTGRAYHEIGHTLESSONE) of FCBBT
-                          with (SUB1 (SETQ GRAYHEIGHT (IMIN (fetch (BITMAP BITMAPHEIGHT)
-                                                                   of TEXTUREBM)
-                                                                16]
+                          with (SUB1 (SETQ GRAYHEIGHT (IMIN (fetch (BITMAP BITMAPHEIGHT) of TEXTUREBM
+                                                                   )
+                                                            16]
                        (replace (PILOTBBT PBTDISJOINT) of FCBBT with T)
                        (\SETPBTFUNCTION FCBBT 'TEXTURE OPERATION)
                        (replace (PILOTBBT PBTHEIGHT) of FCBBT with 1)
                                                              (* ; 
-                                                           "take into account the brush thickness.")
+                                                             "take into account the brush thickness.")
                        (SETQ CX (\DSPTRANSFORMX CENTERX DISPLAYDATA))
                        (SETQ CY (\DSPTRANSFORMY CENTERY DISPLAYDATA))
                                                              (* ; 
-                                              "change Y TOP and BOTTOM to be in bitmap coordinates")
+                                                "change Y TOP and BOTTOM to be in bitmap coordinates")
                        (SETQ CY (SUB1 (\SFInvert DestinationBitMap CY)))
                        (SETQ TOP (SUB1 (\SFInvert DestinationBitMap TOP)))
                        (SETQ BOTTOM (SUB1 (\SFInvert DestinationBitMap BOTTOM)))
@@ -3640,13 +3625,13 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 
                        (COND
                           ((EQ RADIUS 0)                     (* ; 
-                               "put a single point down.  Use \LINEBLT to get proper texture.  NIL")
+                                 "put a single point down.  Use \LINEBLT to get proper texture.  NIL")
                            (.WHILE.TOP.DS. DISPLAYSTREAM
-                                  (\LINEBLT FCBBT CX CY CX DESTINATIONBASE RASTERWIDTH LEFT RIGHT
+                                  (\LINEBLT FCBBT CX CY CX DESTINATIONBASE RASTERWIDTH LEFT RIGHT 
                                          BOTTOM TOP GRAYWIDTH GRAYHEIGHT GRAYBASE NBITS))
                            (RETURN)))
                    LP                                        (* ; 
-                                                     "(UNFOLD x 2) is used instead of (ITIMES x 2)")
+                                                       "(UNFOLD x 2) is used instead of (ITIMES x 2)")
                        [COND
                           [(IGREATERP 0 D)
                            (SETQ X (ADD1 X))
@@ -3670,7 +3655,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                             3]
                        (COND
                           ((EQ Y 0)                          (* ; 
-                                           "draw the middle line differently to avoid duplication.")
+                                             "draw the middle line differently to avoid duplication.")
                            (.WHILE.TOP.DS. DISPLAYSTREAM
                                   (\LINEBLT FCBBT (IDIFFERENCE CX X)
                                          CY
@@ -3685,7 +3670,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 
 (\LINEBLT
   [LAMBDA (BBT X Y XRIGHT DESTINATIONBASE RASTERWIDTH LEFT RIGHT BOTTOM TOP GRAYWIDTH GRAYHEIGHT 
-               GRAYBASE NBITS)                           (* kbr%: "15-Feb-86 22:08")
+               GRAYBASE NBITS)                               (* kbr%: "15-Feb-86 22:08")
 
     (* ;; "fills in the changing fields of a bit blt tablt to draw one line of aan area.")
 
@@ -3701,43 +3686,38 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                   (IGREATERP Y TOP)
                   (IGREATERP BOTTOM Y))
               (RETURN)))
-          (replace (PILOTBBT PBTDEST) of BBT with (\ADDBASE DESTINATIONBASE
-                                                                     (ITIMES RASTERWIDTH Y)))
-          [freplace (PILOTBBT PBTSOURCE) of BBT with (\ADDBASE GRAYBASE
-                                                                        (freplace (PILOTBBT
-                                                                                       PBTGRAYOFFSET)
+          (replace (PILOTBBT PBTDEST) of BBT with (\ADDBASE DESTINATIONBASE (ITIMES RASTERWIDTH Y)))
+          [freplace (PILOTBBT PBTSOURCE) of BBT with (\ADDBASE GRAYBASE (freplace (PILOTBBT 
+                                                                                        PBTGRAYOFFSET
+                                                                                         )
                                                                            of BBT
-                                                                           with (MOD Y GRAYHEIGHT
-                                                                                         ]
+                                                                           with (MOD Y GRAYHEIGHT]
           (SELECTQ NBITS
               (1 (freplace (PILOTBBT PBTDESTBIT) of BBT with X)
                  (freplace (PILOTBBT PBTSOURCEBIT) of BBT with (MOD X GRAYWIDTH))
                  (freplace (PILOTBBT PBTWIDTH) of BBT with (ADD1 (IDIFFERENCE XRIGHT X))))
               (4                                             (* ; 
-                                "color case, shift x values {which are in pixels} into bit values.")
+                                  "color case, shift x values {which are in pixels} into bit values.")
                  (freplace (PILOTBBT PBTDESTBIT) of BBT with (SETQ X (LLSH X 2)))
                                                              (* ; 
-                             "if TEXTURE is not a multiple of nbits wide this is probably garbage.")
+                               "if TEXTURE is not a multiple of nbits wide this is probably garbage.")
                  (freplace (PILOTBBT PBTSOURCEBIT) of BBT with (MOD X GRAYWIDTH))
-                 (freplace (PILOTBBT PBTWIDTH) of BBT with (IDIFFERENCE
-                                                                        (LLSH (ADD1 XRIGHT)
+                 (freplace (PILOTBBT PBTWIDTH) of BBT with (IDIFFERENCE (LLSH (ADD1 XRIGHT)
                                                                               2)
-                                                                        X)))
+                                                                  X)))
               (8                                             (* ; 
-                                "color case, shift x values {which are in pixels} into bit values.")
+                                  "color case, shift x values {which are in pixels} into bit values.")
                  (freplace (PILOTBBT PBTDESTBIT) of BBT with (SETQ X (LLSH X 3)))
                  (freplace (PILOTBBT PBTSOURCEBIT) of BBT with (MOD X GRAYWIDTH))
-                 (freplace (PILOTBBT PBTWIDTH) of BBT with (IDIFFERENCE
-                                                                        (LLSH (ADD1 XRIGHT)
+                 (freplace (PILOTBBT PBTWIDTH) of BBT with (IDIFFERENCE (LLSH (ADD1 XRIGHT)
                                                                               3)
-                                                                        X)))
+                                                                  X)))
               (24                                            (* ; 
-                                "color case, shift x values {which are in pixels} into bit values.")
+                                  "color case, shift x values {which are in pixels} into bit values.")
                   (freplace (PILOTBBT PBTDESTBIT) of BBT with (SETQ X (ITIMES 24 X)))
                   (freplace (PILOTBBT PBTSOURCEBIT) of BBT with (MOD X GRAYWIDTH))
-                  (freplace (PILOTBBT PBTWIDTH) of BBT with (IDIFFERENCE
-                                                                         (ITIMES 24 (ADD1 XRIGHT))
-                                                                         X)))
+                  (freplace (PILOTBBT PBTWIDTH) of BBT with (IDIFFERENCE (ITIMES 24 (ADD1 XRIGHT))
+                                                                   X)))
               (SHOULDNT))
           (\PILOTBITBLT BBT 0])
 )
@@ -3749,7 +3729,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (SCREENBITMAP
-  [LAMBDA (SCREEN)                                       (* ; "Edited 20-Feb-87 14:57 by rrb")
+  [LAMBDA (SCREEN)                                           (* ; "Edited 20-Feb-87 14:57 by rrb")
 
     (* ;; "Return bitmap destination of SCREEN.")
 
@@ -3763,13 +3743,13 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
        (T (\ILLEGAL.ARG SCREEN])
 
 (BITMAPP
-  [LAMBDA (X)                                            (* rrb "25-JUN-82 15:21")
+  [LAMBDA (X)                                                (* rrb "25-JUN-82 15:21")
                                                              (* ; "is x a bitmap?")
     (AND (type? BITMAP X)
          X])
 
 (BITMAPHEIGHT
-  [LAMBDA (BITMAP)                                       (* kbr%: " 8-Jul-85 16:01")
+  [LAMBDA (BITMAP)                                           (* kbr%: " 8-Jul-85 16:01")
 
     (* ;; "returns the height in pixels of a bitmap.")
 
@@ -3781,7 +3761,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
        (T (\ILLEGAL.ARG BITMAP])
 
 (BITSPERPIXEL
-  [LAMBDA (BITMAP)                                     (* ; "Edited 15-Feb-94 16:10 by nilsson")
+  [LAMBDA (BITMAP)                                         (* ; "Edited 15-Feb-94 16:10 by nilsson")
 
     (* ;; "returns the height in pixels of a bitmap.")
 
@@ -3796,8 +3776,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
             (fetch (SCREEN SCBITSPERPIXEL) of BITMAP)))
        ((type? WINDOW BITMAP)
         (BITSPERPIXEL (fetch (WINDOW SCREEN) of BITMAP)))
-       ((ARRAYP BITMAP)                                      (* ; 
-                                                           "Consider array to be a colormap.")
+       ((ARRAYP BITMAP)                                      (* ; "Consider array to be a colormap.")
         (SELECTQ (ARRAYSIZE BITMAP)
             (256 8)
             (16 4)
@@ -3826,7 +3805,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (DSPFILL
-  [LAMBDA (REGION TEXTURE OPERATION STREAM)              (* kbr%: " 8-Jul-85 15:40")
+  [LAMBDA (REGION TEXTURE OPERATION STREAM)                  (* kbr%: " 8-Jul-85 15:40")
 
     (* ;; "wipes a region of an imagestream with texture.")
 
@@ -3842,7 +3821,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                          OPERATION])
 
 (INVERTW
-  [LAMBDA (WIN SHADE)                                    (* rrb "18-May-84 21:52")
+  [LAMBDA (WIN SHADE)                                        (* rrb "18-May-84 21:52")
 
     (* ;; "inverts a window and returns the window.  Used in RESETFORMS.")
 
@@ -3854,7 +3833,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (\DSPCOLOR.DISPLAY
-  [LAMBDA (STREAM COLOR)                               (* ; "Edited 29-Jan-91 11:33 by matsuda")
+  [LAMBDA (STREAM COLOR)                                   (* ; "Edited 29-Jan-91 11:33 by matsuda")
 
     (* ;; "sets and returns a display stream's background color.")
 
@@ -3877,7 +3856,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                             (MAXIMUMCOLOR BITSPERPIXEL])
 
 (\DSPBACKCOLOR.DISPLAY
-  [LAMBDA (STREAM COLOR)                                 (* kbr%: "25-Aug-85 18:15")
+  [LAMBDA (STREAM COLOR)                                     (* kbr%: "25-Aug-85 18:15")
 
     (* ;; "sets and returns a display stream's foreground color.")
 
@@ -3886,9 +3865,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           (SETQ COLORCELL (fetch (\DISPLAYDATA DDCOLOR) of DD))
           (RETURN (COND
                      (COLOR (SETQ DESTINATION (fetch (\DISPLAYDATA DDDestination) of DD))
-                            (SETQ BITSPERPIXEL (fetch (BITMAP BITMAPBITSPERPIXEL) of 
-                                                                                          DESTINATION
-                                                      ))
+                            (SETQ BITSPERPIXEL (fetch (BITMAP BITMAPBITSPERPIXEL) of DESTINATION))
                             (SETQ COLOR (COLORNUMBERP COLOR BITSPERPIXEL))
                             (PROG1 (COND
                                       (COLORCELL (PROG1 (CDR COLORCELL)
@@ -3896,14 +3873,14 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                       (T                     (* ; "no color cell yet, make one.")
                                          (replace (\DISPLAYDATA DDCOLOR) of DD
                                             with (CONS (MAXIMUMCOLOR BITSPERPIXEL)
-                                                           COLOR))
+                                                       COLOR))
                                          0))
                                    (\SFFixFont STREAM DD)))
                      (T (OR (CDR COLORCELL)
                             0])
 
 (DSPEOLFN
-  [LAMBDA (EOLFN DISPLAYSTREAM)                          (* rrb "18-May-84 21:44")
+  [LAMBDA (EOLFN DISPLAYSTREAM)                              (* rrb "18-May-84 21:44")
 
     (* ;; "sets the end of line function for a displaystream.  EOLFN will be called every EOL with the argument of the display stream.  If EOLFN is 'OFF, the eolfn is cleared.")
 
@@ -3915,9 +3892,9 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                     [(LITATOM EOLFN)
                                      (replace (\DISPLAYDATA DDEOLFN) of DD
                                         with (COND
-                                                    ((EQ EOLFN 'OFF)
-                                                     NIL)
-                                                    (T EOLFN]
+                                                ((EQ EOLFN 'OFF)
+                                                 NIL)
+                                                (T EOLFN]
                                     (T (\ILLEGAL.ARG EOLFN])])
 )
 (* "FOLLOWING DEFINITIONS EXPORTED")(DECLARE%: EVAL@COMPILE 
@@ -3940,17 +3917,16 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DECLARE%: EVAL@COMPILE 
 
 (PUTPROPS DSPRUBOUTCHAR MACRO ((DS CHAR X Y TTBL)
-                                       (\DSPMOVELR DS CHAR X Y TTBL NIL T)))
+                               (\DSPMOVELR DS CHAR X Y TTBL NIL T)))
 )
 (DEFINEQ
 
 (DSPCLEOL
-  [LAMBDA (DISPLAYSTREAM XPOS YPOS HEIGHT)               (* lmm " 3-May-84 10:31")
+  [LAMBDA (DISPLAYSTREAM XPOS YPOS HEIGHT)                   (* lmm " 3-May-84 10:31")
     (\CHECKCARET DISPLAYSTREAM)
     (PROG ((DD (\GETDISPLAYDATA DISPLAYSTREAM DISPLAYSTREAM)))
           (RETURN (BITBLT NIL NIL NIL DISPLAYSTREAM (OR (FIXP XPOS)
-                                                        (SETQ XPOS (ffetch DDLeftMargin
-                                                                      of DD)))
+                                                        (SETQ XPOS (ffetch DDLeftMargin of DD)))
                          [OR (FIXP YPOS)
                              (IDIFFERENCE (ffetch DDYPOSITION of DD)
                                     (FONTPROP DISPLAYSTREAM 'DESCENT]
@@ -3962,28 +3938,27 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                          'REPLACE])
 
 (DSPRUBOUTCHAR
-  [LAMBDA (STREAM CHAR X Y TTBL)                         (* Pavel " 6-Oct-86 22:44")
+  [LAMBDA (STREAM CHAR X Y TTBL)                             (* Pavel " 6-Oct-86 22:44")
     (if (DISPLAYSTREAMP CHAR)
         then 
+             (* ;; "Some older code may use the CHAR argument first.")
 
-              (* ;; "Some older code may use the CHAR argument first.")
-
-              (swap STREAM CHAR)
-              (SETQ TTBL X)
-              (SETQ X)
-              (SETQ Y))
+             (swap STREAM CHAR)
+             (SETQ TTBL X)
+             (SETQ X)
+             (SETQ Y))
     (\GETDISPLAYDATA STREAM STREAM)
     (\DSPMOVELR STREAM CHAR X Y TTBL NIL T])
 
 (\DSPMOVELR
-  [LAMBDA (DS CHAR X Y TTBL RIGHTWARDSFLG ERASEFLG)      (* JonL " 7-May-84 02:47")
+  [LAMBDA (DS CHAR X Y TTBL RIGHTWARDSFLG ERASEFLG)          (* JonL " 7-May-84 02:47")
 
     (* ;; "Moves the cursor 'leftwards' (or 'rightwards' if RIGHTWARDSFLG is non-null) over any main character and control or meta indicators.  Returns NIL if the move can't be determined, such as trying to move left when already at the left margin.  Effaces (or 'Rubs out') any bits moved over if ERASEFLG is non-null.")
 
     ([LAMBDA (DD)
 
        (* ;; 
-     "Must do the \GETDISPLAYDATA first, since it may reset DS when it coerces to a DISPLAYSTREAM")
+       "Must do the \GETDISPLAYDATA first, since it may reset DS when it coerces to a DISPLAYSTREAM")
 
        (PROG [(WIDTH (\STREAMCHARWIDTH (COND
                                           ((CHARCODEP CHAR)
@@ -3993,7 +3968,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
               (DEFAULTPOS? (AND (NULL X)
                                 (NULL Y]
              (OR ERASEFLG DEFAULTPOS? (SHOULDNT))            (* ; 
-    "CURSORLEFT and CURSORRIGHT commands aren't allowed to start from anywhere except current spot")
+      "CURSORLEFT and CURSORRIGHT commands aren't allowed to start from anywhere except current spot")
 
         (* ;; "Note that if CHAR is not specified and DS has a variable-pitch font, then the results may be somewhat random.  Smart terminal drivers thus can work well only on fixed-pitch fonts.")
 
@@ -4011,12 +3986,11 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                     (RIGHTWARDSFLG (IGREATERP (add X WIDTH)
                                           (ffetch DDRightMargin of DD)))
                     (T (ILESSP (add X (IMINUS WIDTH))
-                              (ffetch DDLeftMargin of DD]
-                                                             (* ; 
-                              "If we can't do the full backup, then return NIL to signal this fact")
+                              (ffetch DDLeftMargin of DD]    (* ; 
+                                "If we can't do the full backup, then return NIL to signal this fact")
                  (RETURN)))
              (\CHECKCARET DS)                                (* ; 
-                        "Take down the caret, if there is one, just in case we are moving over it.")
+                          "Take down the caret, if there is one, just in case we are moving over it.")
              [COND
                 (ERASEFLG                                    (* ; "And do the erasure if requested")
                        ([LAMBDA (FONT)
@@ -4025,7 +3999,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                                 (COND
                                    ((NOT DEFAULTPOS?)
                                     (MOVETO X Y DS)          (* ; 
-                                                       "Backup over the bits, and 'wipe' them out.")
+                                                         "Backup over the bits, and 'wipe' them out.")
                                     ))
                                 (BITBLT NIL 0 0 DS X YPRIME WIDTH HEIGHT 'TEXTURE 'REPLACE)
                                                              (* ; "wipe out some bits")
@@ -4045,7 +4019,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (\CURSOR.DEFPRINT
-  [LAMBDA (CURSOR STREAM)                             (* ; "Edited 15-Sep-94 16:13 by sybalsky")
+  [LAMBDA (CURSOR STREAM)                                 (* ; "Edited 15-Sep-94 16:13 by sybalsky")
     (COND
        (*PRINT-ARRAY* (PRIN1 "#,(LET(image) (CURSORCREATE (SETQ image '" STREAM)
               (PRIN4 (fetch (CURSOR CUIMAGE) of CURSOR)
@@ -4094,7 +4068,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (DEFINEQ
 
 (TEXTUREOFCOLOR
-  [LAMBDA (COLOR NOERRORFLG)                             (* rrb "30-Oct-85 19:43")
+  [LAMBDA (COLOR NOERRORFLG)                                 (* rrb "30-Oct-85 19:43")
 
     (* ;; "returns a texture to represent a color on a black and white display")
 
@@ -4117,7 +4091,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                               (RETURN TEX])
 
 (\PRIMARYTEXTURE
-  [LAMBDA (PRIMARY LEVEL)                                (* rrb "30-Oct-85 19:25")
+  [LAMBDA (PRIMARY LEVEL)                                    (* rrb "30-Oct-85 19:25")
 
     (* ;; "returns the 16x16 texture for a primary color level.")
 
@@ -4131,7 +4105,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
           (RETURN TEXTURE])
 
 (\LEVELTEXTURE
-  [LAMBDA (LEVEL)                                        (* rrb "20-Aug-85 16:42")
+  [LAMBDA (LEVEL)                                            (* rrb "20-Aug-85 16:42")
 
     (* ;; "returns a 16x16 texture which is merged so that only light bits on both go to light with a primary color pattern to get a level primary pattern.")
 
@@ -4147,7 +4121,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
        (T WHITESHADE16])
 
 (INSURE.B&W.TEXTURE
-  [LAMBDA (TEXTURE NOERRORFLG)                           (* rrb "30-Oct-85 19:47")
+  [LAMBDA (TEXTURE NOERRORFLG)                               (* rrb "30-Oct-85 19:47")
 
     (* ;; "coerces a TEXTURE argument to a 1 bit per pixel bitmap or small number")
 
@@ -4161,7 +4135,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
              (LOGAND TEXTURE BLACKSHADE))
         (BITMAP TEXTURE)
         (LISTP                                               (* ; 
-                                 "can be a list of (TEXTURE COLOR) or a list of levels rgb or hls.")
+                                   "can be a list of (TEXTURE COLOR) or a list of levels rgb or hls.")
                (COND
                   ((TEXTUREOFCOLOR TEXTURE T))
                   ((CAR TEXTURE)
@@ -4177,43 +4151,42 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
             (\ILLEGAL.ARG TEXTURE])
 
 (INSURE.RGB.COLOR
-  [LAMBDA (COLOR NOERRFLG)                               (* rrb "30-Oct-85 19:34")
+  [LAMBDA (COLOR NOERRFLG)                                   (* rrb "30-Oct-85 19:34")
                                                              (* ; 
-                                                           "returns the RGB triple for a color.")
+                                                             "returns the RGB triple for a color.")
     (PROG (LEVELS)
           (RETURN (COND
                      [(FIXP COLOR)                           (* ; 
-                                                "don't know what to do with color numbers so error")
+                                                  "don't know what to do with color numbers so error")
                       (COND
                          (NOERRFLG NIL)
                          (T (\ILLEGAL.ARG COLOR]
                      [(LITATOM COLOR)
                       (COND
                          ((SETQ LEVELS (\LOOKUPCOLORNAME COLOR))
-                                                             (* ; 
-                                                           "recursively look up color number")
+                                                             (* ; "recursively look up color number")
                           (INSURE.RGB.COLOR (CDR LEVELS)
                                  NOERRFLG))
                          (NOERRFLG NIL)
                          (T (ERROR "Unknown color name" COLOR]
-                     ((HLSP COLOR)                       (* ; "HLS form convert to RGB")
+                     ((HLSP COLOR)                           (* ; "HLS form convert to RGB")
                       (HLSTORGB COLOR))
-                     ((RGBP COLOR)                       (* ; "check for RGB or HLS")
+                     ((RGBP COLOR)                           (* ; "check for RGB or HLS")
                       COLOR)
                      (NOERRFLG NIL)
                      (T (\ILLEGAL.ARG COLOR])
 
 (\LOOKUPCOLORNAME
-  [LAMBDA (COLORNAME)                                    (* rrb "13-DEC-82 13:14")
+  [LAMBDA (COLORNAME)                                        (* rrb "13-DEC-82 13:14")
 
     (* ;; "looks up a prospective color name.  Returns a list whose CAR is the name and whose CDR is a color spec.")
 
     (FASSOC COLORNAME COLORNAMES])
 
 (RGBP
-  [LAMBDA (X)                                            (* rrb "27-OCT-82 10:15")
+  [LAMBDA (X)                                                (* rrb "27-OCT-82 10:15")
                                                              (* ; 
-                                                       "return X if it is a red green blue triple.")
+                                                         "return X if it is a red green blue triple.")
     (PROG (TMP)
           (RETURN (AND (LISTP X)
                        (SMALLP (SETQ TMP (CAR X)))
@@ -4228,7 +4201,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                        X])
 
 (HLSP
-  [LAMBDA (X)                                            (* rrb "31-Oct-85 10:51")
+  [LAMBDA (X)                                                (* rrb "31-Oct-85 10:51")
 
     (* ;; "return T if X is a hue lightness saturation triple.")
 
@@ -4241,7 +4214,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
          X])
 
 (HLSTORGB
-  [LAMBDA (HLS)                                          (* rrb "30-Oct-85 19:59")
+  [LAMBDA (HLS)                                              (* rrb "30-Oct-85 19:59")
 
     (* ;; "converts from a hue saturation lightness triple into red green blue triple.  HUE is in range 0 to 360, lightness and saturation are in the range 0 to 1.0")
 
@@ -4264,7 +4237,7 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
                          BLUE _ (\HLSVALUEFN Min Max (IDIFFERENCE H 240])
 
 (\HLSVALUEFN
-  [LAMBDA (MIN MAX HUE)                                  (* rrb "25-OCT-82 10:47")
+  [LAMBDA (MIN MAX HUE)                                      (* rrb "25-OCT-82 10:47")
 
     (* ;; "internal value function for converting from HLS to RGB.")
 
@@ -4461,40 +4434,40 @@ Copyright (c) 1982-1988, 1990-1991, 1993-1994, 2021 by Venue & Xerox Corporation
 (PUTPROPS ADISPLAY COPYRIGHT ("Venue & Xerox Corporation" 1982 1983 1984 1985 1986 1987 1988 1990 1991
  1993 1994 2021))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (12479 20536 (\BBTCURVEPT 12489 . 20534)) (20537 30595 (CREATETEXTUREFROMBITMAP 20547 . 
-22579) (PRINTBITMAP 22581 . 23910) (PRINT-BITMAPS-NICELY 23912 . 27929) (PRINTCURSOR 27931 . 28878) (
-\WRITEBITMAP 28880 . 30593)) (30638 33184 (\GETINTEGERPART 30648 . 32191) (\CONVERTTOFRACTION 32193 . 
-33182)) (33321 34207 (CURSORP 33331 . 33550) (CURSORBITMAP 33552 . 33598) (CreateCursorBitMap 33600 . 
-34205)) (38573 48435 (CARET 38583 . 40331) (\CARET.CREATE 40333 . 40511) (\CARET.DOWN 40513 . 41966) (
-\CARET.FLASH? 41968 . 43865) (\CARET.SHOW 43867 . 44623) (CARETRATE 44625 . 45283) (\CARET.FLASH.AGAIN
- 45285 . 46560) (\CARET.FLASH.MULTIPLE 46562 . 47094) (\CARET.FLASH 47096 . 48433)) (48436 53536 (
-\MEDW.CARET.SHOW 48446 . 53534)) (53900 55731 (\AREAVISIBLE? 53910 . 54832) (\REGIONOVERLAPAREAP 54834
- . 55377) (\AREAINREGIONP 55379 . 55729)) (55780 71837 (CREATEREGION 55790 . 56126) (REGIONP 56128 . 
-56274) (INTERSECTREGIONS 56276 . 60099) (UNIONREGIONS 60101 . 63301) (REGIONSINTERSECTP 63303 . 63911)
- (SUBREGIONP 63913 . 64558) (EXTENDREGION 64560 . 67780) (EXTENDREGIONBOTTOM 67782 . 68587) (
-EXTENDREGIONLEFT 68589 . 69292) (EXTENDREGIONRIGHT 69294 . 69931) (EXTENDREGIONTOP 69933 . 70559) (
-INSIDEP 70561 . 71329) (STRINGREGION 71331 . 71835)) (72082 78471 (\BRUSHBITMAP 72092 . 73816) (
-\GETBRUSH 73818 . 74129) (\GETBRUSHBBT 74131 . 76894) (\InitCurveBrushes 76896 . 78335) (
-\BrushFromWidth 78337 . 78469)) (78472 81537 (\MAKEBRUSH.DIAGONAL 78482 . 78762) (
-\MAKEBRUSH.HORIZONTAL 78764 . 79158) (\MAKEBRUSH.VERTICAL 79160 . 79472) (\MAKEBRUSH.SQUARE 79474 . 
-79751) (\MAKEBRUSH.ROUND 79753 . 81535)) (81538 82650 (INSTALLBRUSH 81548 . 82648)) (83051 87935 (
-\DRAWLINE.DISPLAY 83061 . 86650) (RELMOVETO 86652 . 87039) (MOVETOUPPERLEFT 87041 . 87933)) (87936 
-111678 (\CLIPANDDRAWLINE 87946 . 94515) (\CLIPANDDRAWLINE1 94517 . 106387) (\CLIPCODE 106389 . 107763)
- (\LEASTPTAT 107765 . 108363) (\GREATESTPTAT 108365 . 108993) (\DRAWLINE1 108995 . 110119) (
-\DRAWLINE.UFN 110121 . 111676)) (117836 164835 (\DRAWCIRCLE.DISPLAY 117846 . 126714) (\DRAWARC.DISPLAY
- 126716 . 127006) (\DRAWARC.GENERIC 127008 . 127827) (\COMPUTE.ARC.POINTS 127829 . 130330) (
-\DRAWELLIPSE.DISPLAY 130332 . 145997) (\DRAWCURVE.DISPLAY 145999 . 148368) (\DRAWPOINT.DISPLAY 148370
- . 149455) (\DRAWPOLYGON.DISPLAY 149457 . 153399) (\LINEWITHBRUSH 153401 . 164833)) (164836 198066 (
-LOADPOLY 164846 . 165406) (PARAMETRICSPLINE 165408 . 175677) (\CURVE 175679 . 182223) (\CURVE2 182225
- . 194049) (\CURVEEND 194051 . 194549) (\CURVESLOPE 194551 . 197049) (\CURVESTART 197051 . 197375) (
-\FDIFS/FROM/DERIVS 197377 . 198064)) (208033 223185 (\FILLCIRCLE.DISPLAY 208043 . 219241) (\LINEBLT 
-219243 . 223183)) (223229 225285 (SCREENBITMAP 223239 . 223712) (BITMAPP 223714 . 223948) (
-BITMAPHEIGHT 223950 . 224326) (BITSPERPIXEL 224328 . 225283)) (225926 226919 (DSPFILL 225936 . 226619)
- (INVERTW 226621 . 226917)) (226920 230721 (\DSPCOLOR.DISPLAY 226930 . 228223) (\DSPBACKCOLOR.DISPLAY 
-228225 . 229754) (DSPEOLFN 229756 . 230719)) (231162 235940 (DSPCLEOL 231172 . 232118) (DSPRUBOUTCHAR 
-232120 . 232558) (\DSPMOVELR 232560 . 235938)) (236070 237184 (\CURSOR.DEFPRINT 236080 . 237182)) (
-237596 246218 (TEXTUREOFCOLOR 237606 . 238868) (\PRIMARYTEXTURE 238870 . 239452) (\LEVELTEXTURE 239454
- . 239955) (INSURE.B&W.TEXTURE 239957 . 241350) (INSURE.RGB.COLOR 241352 . 242832) (\LOOKUPCOLORNAME 
-242834 . 243104) (RGBP 243106 . 243869) (HLSP 243871 . 244246) (HLSTORGB 244248 . 245388) (\HLSVALUEFN
- 245390 . 246216)))))
+  (FILEMAP (NIL (12060 19421 (\BBTCURVEPT 12070 . 19419)) (19422 29238 (CREATETEXTUREFROMBITMAP 19432 . 
+21362) (PRINTBITMAP 21364 . 22715) (PRINT-BITMAPS-NICELY 22717 . 26568) (PRINTCURSOR 26570 . 27603) (
+\WRITEBITMAP 27605 . 29236)) (29281 31829 (\GETINTEGERPART 29291 . 30836) (\CONVERTTOFRACTION 30838 . 
+31827)) (31966 32838 (CURSORP 31976 . 32195) (CURSORBITMAP 32197 . 32243) (CreateCursorBitMap 32245 . 
+32836)) (37200 46243 (CARET 37210 . 38970) (\CARET.CREATE 38972 . 39150) (\CARET.DOWN 39152 . 40504) (
+\CARET.FLASH? 40506 . 42320) (\CARET.SHOW 42322 . 42891) (CARETRATE 42893 . 43551) (\CARET.FLASH.AGAIN
+ 43553 . 44719) (\CARET.FLASH.MULTIPLE 44721 . 45244) (\CARET.FLASH 45246 . 46241)) (46244 51316 (
+\MEDW.CARET.SHOW 46254 . 51314)) (51680 53515 (\AREAVISIBLE? 51690 . 52614) (\REGIONOVERLAPAREAP 52616
+ . 53161) (\AREAINREGIONP 53163 . 53513)) (53564 66040 (CREATEREGION 53574 . 53910) (REGIONP 53912 . 
+54058) (INTERSECTREGIONS 54060 . 56830) (UNIONREGIONS 56832 . 58983) (REGIONSINTERSECTP 58985 . 59593)
+ (SUBREGIONP 59595 . 60240) (EXTENDREGION 60242 . 62399) (EXTENDREGIONBOTTOM 62401 . 63043) (
+EXTENDREGIONLEFT 63045 . 63664) (EXTENDREGIONRIGHT 63666 . 64219) (EXTENDREGIONTOP 64221 . 64762) (
+INSIDEP 64764 . 65532) (STRINGREGION 65534 . 66038)) (66285 71559 (\BRUSHBITMAP 66295 . 68012) (
+\GETBRUSH 68014 . 68325) (\GETBRUSHBBT 68327 . 70355) (\InitCurveBrushes 70357 . 71423) (
+\BrushFromWidth 71425 . 71557)) (71560 74627 (\MAKEBRUSH.DIAGONAL 71570 . 71850) (
+\MAKEBRUSH.HORIZONTAL 71852 . 72246) (\MAKEBRUSH.VERTICAL 72248 . 72560) (\MAKEBRUSH.SQUARE 72562 . 
+72839) (\MAKEBRUSH.ROUND 72841 . 74625)) (74628 75793 (INSTALLBRUSH 74638 . 75791)) (76194 87596 (
+\DRAWLINE.DISPLAY 76204 . 86311) (RELMOVETO 86313 . 86700) (MOVETOUPPERLEFT 86702 . 87594)) (87597 
+111082 (\CLIPANDDRAWLINE 87607 . 94053) (\CLIPANDDRAWLINE1 94055 . 105803) (\CLIPCODE 105805 . 107179)
+ (\LEASTPTAT 107181 . 107779) (\GREATESTPTAT 107781 . 108409) (\DRAWLINE1 108411 . 109527) (
+\DRAWLINE.UFN 109529 . 111080)) (115612 161659 (\DRAWCIRCLE.DISPLAY 115622 . 124435) (\DRAWARC.DISPLAY
+ 124437 . 124727) (\DRAWARC.GENERIC 124729 . 125482) (\COMPUTE.ARC.POINTS 125484 . 127749) (
+\DRAWELLIPSE.DISPLAY 127751 . 143420) (\DRAWCURVE.DISPLAY 143422 . 145711) (\DRAWPOINT.DISPLAY 145713
+ . 146909) (\DRAWPOLYGON.DISPLAY 146911 . 150439) (\LINEWITHBRUSH 150441 . 161657)) (161660 193352 (
+LOADPOLY 161670 . 162230) (PARAMETRICSPLINE 162232 . 172429) (\CURVE 172431 . 178033) (\CURVE2 178035
+ . 189366) (\CURVEEND 189368 . 189850) (\CURVESLOPE 189852 . 192335) (\CURVESTART 192337 . 192661) (
+\FDIFS/FROM/DERIVS 192663 . 193350)) (205881 220217 (\FILLCIRCLE.DISPLAY 205891 . 216639) (\LINEBLT 
+216641 . 220215)) (220261 222261 (SCREENBITMAP 220271 . 220748) (BITMAPP 220750 . 220984) (
+BITMAPHEIGHT 220986 . 221362) (BITSPERPIXEL 221364 . 222259)) (222902 223895 (DSPFILL 222912 . 223595)
+ (INVERTW 223597 . 223893)) (223896 227539 (\DSPCOLOR.DISPLAY 223906 . 225203) (\DSPBACKCOLOR.DISPLAY 
+225205 . 226584) (DSPEOLFN 226586 . 227537)) (227972 232626 (DSPCLEOL 227982 . 228858) (DSPRUBOUTCHAR 
+228860 . 229292) (\DSPMOVELR 229294 . 232624)) (232756 233874 (\CURSOR.DEFPRINT 232766 . 233872)) (
+234286 242860 (TEXTUREOFCOLOR 234296 . 235558) (\PRIMARYTEXTURE 235560 . 236142) (\LEVELTEXTURE 236144
+ . 236645) (INSURE.B&W.TEXTURE 236647 . 238042) (INSURE.RGB.COLOR 238044 . 239472) (\LOOKUPCOLORNAME 
+239474 . 239744) (RGBP 239746 . 240511) (HLSP 240513 . 240888) (HLSTORGB 240890 . 242030) (\HLSVALUEFN
+ 242032 . 242858)))))
 STOP
diff --git a/sources/ADISPLAY.LCOM b/sources/ADISPLAY.LCOM
index 997d6bed..f3094c84 100644
Binary files a/sources/ADISPLAY.LCOM and b/sources/ADISPLAY.LCOM differ
diff --git a/sources/FILESETS b/sources/FILESETS
index d9a51911..0aea357f 100644
--- a/sources/FILESETS
+++ b/sources/FILESETS
@@ -1,14 +1,10 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "23-May-2023 08:11:56" {DSK}<home>larry>il>medley>sources>FILESETS.;24 6239   
-
+(FILECREATED "23-May-2023 08:11:56" {DSK}<home>larry>il>medley>sources>FILESETS.;24
       :EDIT-BY "lmm"
 
-      :CHANGES-TO (VARS 2LISPSET)
-
       :PREVIOUS-DATE " 1-Mar-2023 07:49:03" {DSK}<home>larry>il>medley>sources>FILESETS.;23)
 
-
 (PRETTYCOMPRINT FILESETSCOMS)
 
 (RPAQQ FILESETSCOMS
@@ -69,7 +65,7 @@
               LLCHAR LLSTK PMAP LLGC ATBL FILEIO EXTERNALFORMAT LLARITH LLFLOAT FONT LLKEY LLDISPLAY
               ADISPLAY AINTERRUPT RENAMEMACROS HLDISPLAY WINDOW MACROAUX ADDARITH LLFAULT LLTIMER 
               IMAGEIO PROC XCCS PASSWORDS INTERPRESS HARDCOPY CMLARRAY LLSUBRS LLETHER PUP UFS 
-              DTDECLARE))
+              DTDECLARE BIGBITMAPS))
 
 (RPAQQ MAKEINITFILES (MAKEINIT MEM I-NEW))
 
diff --git a/sources/LOADUP-LISP b/sources/LOADUP-LISP
index a6cacd14..a2f54a70 100644
--- a/sources/LOADUP-LISP
+++ b/sources/LOADUP-LISP
@@ -1,10 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "XCL" BASE 10)
 
-(FILECREATED "12-Aug-2022 12:29:57" |{DSK}<home>larry>medley>sources>LOADUP-LISP.;2| 5250   
+(FILECREATED "27-Feb-2023 17:15:53" |{DSK}<home>larry>il>medley>sources>LOADUP-LISP.;2| 5263   
 
-      :CHANGES-TO (VARS LOADUP-LISPCOMS)
+      :EDIT-BY "lmm"
 
-      :PREVIOUS-DATE "13-Jul-2022 14:10:00" |{DSK}<home>larry>medley>sources>LOADUP-LISP.;1|)
+      :CHANGES-TO (FNS LOADUP-LISP)
+
+      :PREVIOUS-DATE "12-Aug-2022 12:29:57" |{DSK}<home>larry>il>medley>sources>LOADUP-LISP.;1|)
 
 
 (PRETTYCOMPRINT LOADUP-LISPCOMS)
@@ -17,10 +19,9 @@
 (DEFINEQ
 
 (LOADUP-LISP
-  (LAMBDA NIL                                               (* \; "Edited 13-Jul-2022 14:09 by rmk")
+  (LAMBDA NIL                                               (* \; "Edited 26-Feb-2023 12:17 by lmm")
+                                                            (* \; "Edited 13-Jul-2022 14:09 by rmk")
                                                           (* \; "Edited  4-Mar-2022 19:13 by larry")
-                                                          (* \; "Edited  2-Mar-2022 16:31 by larry")
-                                                          (* \; "Edited 28-Feb-2022 15:02 by larry")
                                                            (* \; "Edited 29-Apr-2021 22:30 by rmk:")
     (SETQQ COMPILE.EXT LCOM)
     (MEDLEY-INIT-VARS)                                       (* \; "should be set earlier")
@@ -99,6 +100,10 @@
     (LOADUP '(CMLSMARTARGS))
     (LOADUP '(IMPLICIT-KEY-HASH CLOSURE-CACHE))
 
+    (* |;;| " not sure what this depends on, so putting it here")
+
+    (LOADUP '(BIGBITMAPS))
+
     (* |;;| "Already enabled, but this time fixes tables that weren't defined in the init")
 
     (PACKAGE-ENABLE)
@@ -119,5 +124,5 @@
 (GLOBALVARS MAKESYSFILENAME MEDLEY-INIT-VARS MEDLEYDIR SYSTEMINITVARS USERRECLST)
 )
 (DECLARE\: DONTCOPY
-  (FILEMAP (NIL (631 5044 (LOADUP-LISP 641 . 5042)))))
+  (FILEMAP (NIL (654 5057 (LOADUP-LISP 664 . 5055)))))
 STOP
diff --git a/sources/LOADUP-LISP.LCOM b/sources/LOADUP-LISP.LCOM
index 79019e09..8e01adf6 100644
Binary files a/sources/LOADUP-LISP.LCOM and b/sources/LOADUP-LISP.LCOM differ
