diff --git a/doctools/IMINDEX b/doctools/IMINDEX
index 1e96d387..b0a0e94b 100644
--- a/doctools/IMINDEX
+++ b/doctools/IMINDEX
@@ -1,21 +1,20 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
-(FILECREATED "12-Feb-92 12:28:48" {DSK}<users>sybalsky>PUBS>IMINDEX.;2 37264  
 
-      changes to%:  (FNS IM.CHAP.DISPLAYFN)
+(FILECREATED " 6-Mar-2024 21:19:25" {WMEDLEY}<doctools>IMINDEX.;2 36416  
 
-      previous date%: " 8-Dec-91 15:46:22" {DSK}<users>sybalsky>PUBS>IMINDEX.;1)
+      :EDIT-BY rmk
 
+      :CHANGES-TO (VARS IMINDEXCOMS)
+
+      :PREVIOUS-DATE "12-Feb-92 12:28:48" {WMEDLEY}<doctools>IMINDEX.;1)
 
-(* ; "
-Copyright (c) 1986, 1987, 1988, 1991, 1992 by Xerox Corporation.  All rights reserved.
-")
 
 (PRETTYCOMPRINT IMINDEXCOMS)
 
 (RPAQQ IMINDEXCOMS
        (
         (* ;; 
-      "this file contains the functions used for creating and manipulating index image objects")
+        "this file contains the functions used for creating and manipulating index image objects")
 
         (FNS IM.INDEX.CLOSEF IM.INDEX.COPYFN IM.INDEX.CREATEOBJ IM.INDEX.DISPLAY.STRING 
              IM.INDEX.DISPLAYFN IM.INDEX.EDIT IM.INDEX.LIST.FROM.STRING IM.INDEX.SIZEFN 
@@ -32,12 +31,7 @@ Copyright (c) 1986, 1987, 1988, 1991, 1992 by Xerox Corporation.  All rights res
         (COMS                                                (* ; "An image object to set the chapter number, on the TEXTOBJ's proplist, on the INDEXING-CHAPTER property.")
               (FNS IM.CHAP.COPYFN IM.CHAP.CREATEOBJ IM.CHAP.DISPLAYFN IM.CHAP.SIZEFN IM.CHAP.PUTFN 
                    IM.CHAP.GETFN IM.CHAP.BUTTONEVENTFN))
-        (P (ADVISE 'TEDIT.FORMAT.HARDCOPY 'AROUND '(RESETLST
-                                                       (RESETSAVE NIL (LIST (FUNCTION IM.INDEX.CLOSEF
-                                                                                   )
-                                                                            STREAM))
-                                                       *))
-           (IM.INDEX.INIT))))
+        (P (IM.INDEX.INIT))))
 
 
 
@@ -494,9 +488,9 @@ Copyright (c) 1986, 1987, 1988, 1991, 1992 by Xerox Corporation.  All rights res
 (DECLARE%: EVAL@COMPILE
 
 (RECORD IM.INDEX.DATA (NAME TYPE SAV INFO SUBSEC PAGE# . PROPLIST)
-                          SUBSEC _ IM.INDEX.DEFAULT.SUBSEC (TYPE? (AND (LISTP DATUM)
-                                                                           (IGEQ (LENGTH DATUM)
-                                                                                 6))))
+                      SUBSEC _ IM.INDEX.DEFAULT.SUBSEC (TYPE? (AND (LISTP DATUM)
+                                                                   (IGEQ (LENGTH DATUM)
+                                                                         6))))
 )
 
 (RPAQQ IM.INDEX.OBJ.FREEMENU.SPECS
@@ -638,21 +632,15 @@ Copyright (c) 1986, 1987, 1988, 1991, 1992 by Xerox Corporation.  All rights res
     T])
 )
 
-(ADVISE 'TEDIT.FORMAT.HARDCOPY 'AROUND '(RESETLST
-                                            (RESETSAVE NIL (LIST (FUNCTION IM.INDEX.CLOSEF)
-                                                                 STREAM))
-                                            *))
-
 (IM.INDEX.INIT)
-(PUTPROPS IMINDEX COPYRIGHT ("Xerox Corporation" 1986 1987 1988 1991 1992))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2160 15212 (IM.INDEX.CLOSEF 2170 . 2785) (IM.INDEX.COPYFN 2787 . 2972) (
-IM.INDEX.CREATEOBJ 2974 . 4320) (IM.INDEX.DISPLAY.STRING 4322 . 4743) (IM.INDEX.DISPLAYFN 4745 . 8588)
- (IM.INDEX.EDIT 8590 . 12058) (IM.INDEX.LIST.FROM.STRING 12060 . 13094) (IM.INDEX.SIZEFN 13096 . 13856
-) (IM.INDEX.STRING.FROM.LIST 13858 . 14103) (IM.INDEX.PUTFN 14105 . 14294) (IM.INDEX.GETFN 14296 . 
-14451) (IM.INDEX.BUTTONEVENTFN 14453 . 15210)) (15213 17283 (IM.INDEX.INIT 15223 . 17281)) (17284 
-29200 (IM.INDEX.MENU 17294 . 18982) (IM.INDEX.MENU.WHENSELECTEDFN 18984 . 25739) (
-IM.INDEX.OBJ.FREEMENU.SELECTEDFN 25741 . 29198)) (31736 36879 (IM.CHAP.COPYFN 31746 . 31926) (
-IM.CHAP.CREATEOBJ 31928 . 33354) (IM.CHAP.DISPLAYFN 33356 . 35316) (IM.CHAP.SIZEFN 35318 . 36320) (
-IM.CHAP.PUTFN 36322 . 36506) (IM.CHAP.GETFN 36508 . 36669) (IM.CHAP.BUTTONEVENTFN 36671 . 36877)))))
+  (FILEMAP (NIL (1673 14725 (IM.INDEX.CLOSEF 1683 . 2298) (IM.INDEX.COPYFN 2300 . 2485) (
+IM.INDEX.CREATEOBJ 2487 . 3833) (IM.INDEX.DISPLAY.STRING 3835 . 4256) (IM.INDEX.DISPLAYFN 4258 . 8101)
+ (IM.INDEX.EDIT 8103 . 11571) (IM.INDEX.LIST.FROM.STRING 11573 . 12607) (IM.INDEX.SIZEFN 12609 . 13369
+) (IM.INDEX.STRING.FROM.LIST 13371 . 13616) (IM.INDEX.PUTFN 13618 . 13807) (IM.INDEX.GETFN 13809 . 
+13964) (IM.INDEX.BUTTONEVENTFN 13966 . 14723)) (14726 16796 (IM.INDEX.INIT 14736 . 16794)) (16797 
+28713 (IM.INDEX.MENU 16807 . 18495) (IM.INDEX.MENU.WHENSELECTEDFN 18497 . 25252) (
+IM.INDEX.OBJ.FREEMENU.SELECTEDFN 25254 . 28711)) (31229 36372 (IM.CHAP.COPYFN 31239 . 31419) (
+IM.CHAP.CREATEOBJ 31421 . 32847) (IM.CHAP.DISPLAYFN 32849 . 34809) (IM.CHAP.SIZEFN 34811 . 35813) (
+IM.CHAP.PUTFN 35815 . 35999) (IM.CHAP.GETFN 36001 . 36162) (IM.CHAP.BUTTONEVENTFN 36164 . 36370)))))
 STOP
diff --git a/doctools/IMINDEX.LCOM b/doctools/IMINDEX.LCOM
index 02a963a9..133af2de 100644
Binary files a/doctools/IMINDEX.LCOM and b/doctools/IMINDEX.LCOM differ
diff --git a/doctools/IMTEDIT b/doctools/IMTEDIT
index 31b3417c..b5539ee0 100644
--- a/doctools/IMTEDIT
+++ b/doctools/IMTEDIT
@@ -1,17 +1,13 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "20-Jul-2022 15:10:53" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>doctools>IMTEDIT.;2 117347 
+(FILECREATED " 6-Mar-2024 21:18:02" {WMEDLEY}<doctools>IMTEDIT.;4 116622 
 
-      :CHANGES-TO (FNS MAKE.IM.DOCUMENT)
+      :EDIT-BY rmk
 
-      :PREVIOUS-DATE " 8-Dec-91 15:41:54" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>doctools>IMTEDIT.;1)
+      :CHANGES-TO (FNS TRANSLATE.DUMPOUT MAKE.IM.DOCUMENT)
 
+      :PREVIOUS-DATE "20-Jul-2022 15:10:53" {WMEDLEY}<doctools>IMTEDIT.;2)
 
-(* ; "
-Copyright (c) 1983-1986, 1991 by Xerox Corporation.
-")
 
 (PRETTYCOMPRINT IMTEDITCOMS)
 
@@ -493,27 +489,26 @@ Copyright (c) 1983-1986, 1991 by Xerox Corporation.
     (DUMPOUT FONT LISP DUMP.CHARS SAV])
 
 (MAKE.IM.DOCUMENT
-  [LAMBDA (FORM OUTFILE.FLG PAGE.LAYOUT OUTPUT.MESSAGE DEFAULT.PARALOOKS PTRFILENAME)
-                                                             (* ; "Edited 20-Jul-2022 15:10 by rmk")
+  [LAMBDA (FORM OUTFILE.FLG PAGE.LAYOUT OUTPUT.MESSAGE DEFAULT.PARALOOKS PTRFILENAME)
+
+    (* ;; "Edited  6-Mar-2024 21:17 by rmk: Fixed backquote commas. Also put IM.INDEX.CLOSEF calls in TEXTPROPs so advice in IMINDEX can be eliminated.")
+
+    (* ;; "Edited 20-Jul-2022 15:10 by rmk")
                                                              (* mjs " 4-Aug-86 10:52")
 
-         (* * this function creates an IM output file, in XPS-compatible format.
-         If sets up all of the special variables needed by DUMP, evaluates FORM, and sets 
-         all of the para and font looks)
+(* ;;; "this function creates an IM output file, in XPS-compatible format.  If sets up all of the special variables needed by DUMP, evaluates FORM, and sets all of the para and font looks")
 
-         (* * If OUTFILE.FLG is NIL, the output file is just sent to the default printer.
-         If OUTFILE.FLG is T, the outfile textstream is simply returned.
-         If OUTFILE.FLG = anything else, it is taken as a file name to put the press file 
-         which is created <but not printed>.)
+(* ;;; "If OUTFILE.FLG is NIL, the output file is just sent to the default printer.  If OUTFILE.FLG is T, the outfile textstream is simply returned.  If OUTFILE.FLG = anything else, it is taken as a file name to put the press file which is created <but not printed>.")
 
-         (* * if PAGE.LAYOUT is non-NIL, it should be the compound page layout to be used.)
+(* ;;; "if PAGE.LAYOUT is non-NIL, it should be the compound page layout to be used.")
 
-         (* * if OUTPUT.MESSAGE is non-NIL, it is printed on the hardcopy output)
+(* ;;; "if OUTPUT.MESSAGE is non-NIL, it is printed on the hardcopy output")
 
-         (* * PTRFILENAME is the name to be used if an index pointer file is generated 
-         during hardcopy <by printing index objects>)
+(* ;;; "PTRFILENAME is the name to be used if an index pointer file is generated during hardcopy <by printing index objects>")
 
-    (PROG ((IM.OUTFILE (OPENTEXTSTREAM NIL NIL NIL NIL (LIST 'IM.INDEX.PTRFILENAME PTRFILENAME)))
+    (PROG ([IM.OUTFILE (OPENTEXTSTREAM NIL NIL NIL NIL `(IM.INDEX.PTRFILENAME ,PTRFILENAME 
+                                                               AFTERHARDCOPYFN (FUNCTION 
+                                                                                IM.INDEX.INIT]
            (FONT.STACK (CONS))
            (IM.TEDIT.LAST.PARA.BEGIN 1)
            (IM.TEDIT.LAST.FONT.BEGIN 1)
@@ -532,7 +527,7 @@ Copyright (c) 1983-1986, 1991 by Xerox Corporation.
           (DUMP.HEADERS.FOOTERS "  " "  ")
           (DUMPOUT CR CR START.PARA PARALOOKS
                  `(TYPE PAGEHEADING SUBTYPE DRAFTMESSAGE QUAD LEFT 1STLEFTMARGIN 0 LEFTMARGIN 0 
-                        RIGHTMARGIN %, IM.TEXT.RIGHTMARGIN)
+                        RIGHTMARGIN ,IM.TEXT.RIGHTMARGIN)
                  DUMP.CHARS
                  (COND
                     (IM.DRAFT.FLG (CONCAT "***DRAFT***  " (DATE)
@@ -543,73 +538,65 @@ Copyright (c) 1983-1986, 1991 by Xerox Corporation.
           (COND
              (IM.EVEN.FLG 
 
-         (* if you must quarantee that you have an even number of pages for two-sided 
-         copying, dump out a blank page no matter what --
-         it can always be discarded)
+                    (* ;; "if you must quarantee that you have an even number of pages for two-sided copying, dump out a blank page no matter what -- it can always be discarded")
 
                     (DUMPOUT CR CR START.PARA PARALOOKS
-                           `(NEWPAGEBEFORE T QUAD LEFT 1STLEFTMARGIN 0 LEFTMARGIN 0 RIGHTMARGIN %, 
-                                   IM.TEXT.RIGHTMARGIN SPECIALX %, IM.BLANKPAGE.SPECIALX SPECIALY %,
-                                   IM.BLANKPAGE.SPECIALY)
+                           `(NEWPAGEBEFORE T QUAD LEFT 1STLEFTMARGIN 0 LEFTMARGIN 0 RIGHTMARGIN
+                                   ,IM.TEXT.RIGHTMARGIN SPECIALX ,IM.BLANKPAGE.SPECIALX SPECIALY
+                                   ,IM.BLANKPAGE.SPECIALY)
                            DUMP.CHARS "[This page intentionally left blank]" CR CR)))
 
-         (* after converting document, make sure that last para is formatted correctly by 
-         changing font, ending current para, and starting new para)
+     (* ;; "after converting document, make sure that last para is formatted correctly by changing font, ending current para, and starting new para")
 
           (DUMPOUT CR CR FONT NIL)
           (DUMP '(START.PARA))
 
-         (* * set page format)
+(* ;;; "set page format")
 
           [TEDIT.PAGEFORMAT IM.OUTFILE
                  (COND
                     (PAGE.LAYOUT)
-                    (T (TEDIT.COMPOUND.PAGEFORMAT [TEDIT.SINGLE.PAGEFORMAT NIL NIL NIL NIL NIL 
-                                                         IM.PAGE.LEFTMARGIN IM.PAGE.RIGHTMARGIN 
-                                                         IM.PAGE.FIRST.TOPMARGIN IM.PAGE.BOTTOMMARGIN
-                                                         1 NIL NIL
-                                                         `((RECTOFOOT %, IM.PAGE.LEFTMARGIN %, 
-                                                                  IM.FOOTER.Y)
-                                                           (RECTOFOOTRULE %, IM.PAGE.LEFTMARGIN %, 
-                                                                  IM.FOOTER.RULE.Y)
-                                                           (DRAFTMESSAGE %, IM.DRAFT.MESSAGE.X %, 
-                                                                  IM.DRAFT.MESSAGE.BOTTOM.Y]
+                    (T (TEDIT.COMPOUND.PAGEFORMAT [TEDIT.SINGLE.PAGEFORMAT
+                                                   NIL NIL NIL NIL NIL IM.PAGE.LEFTMARGIN 
+                                                   IM.PAGE.RIGHTMARGIN IM.PAGE.FIRST.TOPMARGIN 
+                                                   IM.PAGE.BOTTOMMARGIN 1 NIL NIL
+                                                   `((RECTOFOOT ,IM.PAGE.LEFTMARGIN ,IM.FOOTER.Y)
+                                                     (RECTOFOOTRULE ,IM.PAGE.LEFTMARGIN 
+                                                            ,IM.FOOTER.RULE.Y)
+                                                     (DRAFTMESSAGE ,IM.DRAFT.MESSAGE.X 
+                                                            ,IM.DRAFT.MESSAGE.BOTTOM.Y]
                               [TEDIT.SINGLE.PAGEFORMAT NIL NIL NIL NIL NIL IM.PAGE.LEFTMARGIN 
                                      IM.PAGE.RIGHTMARGIN IM.PAGE.TOPMARGIN IM.PAGE.BOTTOMMARGIN 1 NIL
-                                     NIL `((DRAFTMESSAGE %, IM.DRAFT.MESSAGE.X %, 
-                                                  IM.DRAFT.MESSAGE.TOP.Y)
-                                           (VERSOHEAD %, IM.PAGE.LEFTMARGIN %, IM.HEADER.Y)
-                                           (VERSOHEADRULE %, IM.PAGE.LEFTMARGIN %, IM.HEADER.RULE.Y)
-                                           (VERSOFOOT %, IM.PAGE.LEFTMARGIN %, IM.FOOTER.Y)
-                                           (VERSOFOOTRULE %, IM.PAGE.LEFTMARGIN %, IM.FOOTER.RULE.Y)
-                                           (DRAFTMESSAGE %, IM.DRAFT.MESSAGE.X %, 
-                                                  IM.DRAFT.MESSAGE.BOTTOM.Y]
+                                     NIL `((DRAFTMESSAGE ,IM.DRAFT.MESSAGE.X ,IM.DRAFT.MESSAGE.TOP.Y)
+                                           (VERSOHEAD ,IM.PAGE.LEFTMARGIN ,IM.HEADER.Y)
+                                           (VERSOHEADRULE ,IM.PAGE.LEFTMARGIN ,IM.HEADER.RULE.Y)
+                                           (VERSOFOOT ,IM.PAGE.LEFTMARGIN ,IM.FOOTER.Y)
+                                           (VERSOFOOTRULE ,IM.PAGE.LEFTMARGIN ,IM.FOOTER.RULE.Y)
+                                           (DRAFTMESSAGE ,IM.DRAFT.MESSAGE.X 
+                                                  ,IM.DRAFT.MESSAGE.BOTTOM.Y]
                               (TEDIT.SINGLE.PAGEFORMAT NIL NIL NIL NIL NIL IM.PAGE.LEFTMARGIN 
                                      IM.PAGE.RIGHTMARGIN IM.PAGE.TOPMARGIN IM.PAGE.BOTTOMMARGIN 1 NIL
-                                     NIL `((DRAFTMESSAGE %, IM.DRAFT.MESSAGE.X %, 
-                                                  IM.DRAFT.MESSAGE.TOP.Y)
-                                           (RECTOHEAD %, IM.PAGE.LEFTMARGIN %, IM.HEADER.Y)
-                                           (RECTOHEADRULE %, IM.PAGE.LEFTMARGIN %, IM.HEADER.RULE.Y)
-                                           (RECTOFOOT %, IM.PAGE.LEFTMARGIN %, IM.FOOTER.Y)
-                                           (RECTOFOOTRULE %, IM.PAGE.LEFTMARGIN %, IM.FOOTER.RULE.Y)
-                                           (DRAFTMESSAGE %, IM.DRAFT.MESSAGE.X %, 
-                                                  IM.DRAFT.MESSAGE.BOTTOM.Y]
+                                     NIL `((DRAFTMESSAGE ,IM.DRAFT.MESSAGE.X ,IM.DRAFT.MESSAGE.TOP.Y)
+                                           (RECTOHEAD ,IM.PAGE.LEFTMARGIN ,IM.HEADER.Y)
+                                           (RECTOHEADRULE ,IM.PAGE.LEFTMARGIN ,IM.HEADER.RULE.Y)
+                                           (RECTOFOOT ,IM.PAGE.LEFTMARGIN ,IM.FOOTER.Y)
+                                           (RECTOFOOTRULE ,IM.PAGE.LEFTMARGIN ,IM.FOOTER.RULE.Y)
+                                           (DRAFTMESSAGE ,IM.DRAFT.MESSAGE.X 
+                                                  ,IM.DRAFT.MESSAGE.BOTTOM.Y]
 
-         (* * dump default char and para looks for whole document --
-         and looks that should be different should be specified in the fns)
+(* ;;; "dump default char and para looks for whole document -- and looks that should be different should be specified in the fns")
 
           (TEDIT.LOOKS IM.OUTFILE IM.TEXT.FONT 1 (GETFILEINFO IM.OUTFILE 'LENGTH))
-          (TEDIT.PARALOOKS IM.OUTFILE
-                 [COND
-                    (DEFAULT.PARALOOKS)
-                    (T `(QUAD JUSTIFIED 1STLEFTMARGIN %, IM.TEXT.LEFTMARGIN LEFTMARGIN %, 
-                              IM.TEXT.LEFTMARGIN RIGHTMARGIN %, IM.TEXT.RIGHTMARGIN LINELEADING 0 
-                              PARALEADING 5 POSTPARALEADING 0]
+          (TEDIT.PARALOOKS IM.OUTFILE [COND
+                                         (DEFAULT.PARALOOKS)
+                                         (T `(QUAD JUSTIFIED 1STLEFTMARGIN ,IM.TEXT.LEFTMARGIN 
+                                                   LEFTMARGIN ,IM.TEXT.LEFTMARGIN RIGHTMARGIN
+                                                   ,IM.TEXT.RIGHTMARGIN LINELEADING 0 PARALEADING 5 
+                                                   POSTPARALEADING 0]
                  1
                  (GETFILEINFO IM.OUTFILE 'LENGTH))
 
-         (* must reverse list because the order of some char and paragraph looks is 
-         significant << earlier looks are overridden by later ones >>)
+     (* ;; "must reverse list because the order of some char and paragraph looks is significant << earlier looks are overridden by later ones >>")
 
           (SETQ IM.CHARLOOKS (DREVERSE IM.CHARLOOKS))
           (SETQ IM.PARALOOKS (DREVERSE IM.PARALOOKS))
@@ -2309,83 +2296,75 @@ page edge.)
 (DEFINEQ
 
 (TRANSLATE.DUMPOUT
-  [LAMBDA (DUMPOUT.ARGS)                                 (* mjs "18-Sep-85 16:17")
+  [LAMBDA (DUMPOUT.ARGS)                                     (* mjs "18-Sep-85 16:17")
 
-         (* * this function translates the DUMPOUT macro form into a PROGN form that 
-       calls a series of functions, such as DUMP.)
+         (* * this function translates the DUMPOUT macro form into a PROGN form that calls 
+         a series of functions, such as DUMP.)
 
          (* * the indentation code has been commented out ---
-       will try indenting everything to same, unless specified otherwise with 
-       PARALOOKS)
+         will try indenting everything to same, unless specified otherwise with PARALOOKS)
 
     (PROG ((DUMPOUT.FORMS NIL)
            (DUMPOUT.UNDO NIL)
            COMM COMM.ARG)
           [while DUMPOUT.ARGS do (SELECTQ (SETQ COMM (pop DUMPOUT.ARGS))
-                                             (NIL)
-                                             ((CR TAB START.PARA DUMP.FOOTNOTES START.SUPER START.SUB
-                                                  END.SUPER END.SUB) 
-                                                             (* just pass these atoms as commands 
-                                                           to DUMP)
-                                                  (push DUMPOUT.FORMS (LIST 'DUMP.FORMAT
-                                                                                (KWOTE COMM))))
-                                             ((FLUSH.ARG TRIVIAL.ARG DUMP.ARG) 
-                                                  (push DUMPOUT.FORMS (LIST COMM)))
-                                             (INDENT 
+                                     (NIL)
+                                     ((CR TAB START.PARA DUMP.FOOTNOTES START.SUPER START.SUB 
+                                          END.SUPER END.SUB) (* just pass these atoms as commands 
+                                                             to DUMP)
+                                          (push DUMPOUT.FORMS (LIST 'DUMP.FORMAT (KWOTE COMM))))
+                                     ((FLUSH.ARG TRIVIAL.ARG DUMP.ARG) 
+                                          (push DUMPOUT.FORMS (LIST COMM)))
+                                     (INDENT 
 
          (* * SELECTQ (SETQ COMM.ARG (pop DUMPOUT.ARGS))
-       (INIT (push DUMPOUT.FORMS (QUOTE (PUT.MY.PROP
-       (QUOTE INDENT) INITIAL.INDENT))) (push DUMPOUT.FORMS
-       (QUOTE (PUT.MY.PROP (QUOTE WIDTH) INITIAL.WIDTH)))
-       (push DUMPOUT.FORMS (QUOTE (DUMP.FORMAT
-       (QUOTE INDENT) INITIAL.INDENT)))) (NONE
-       (push DUMPOUT.FORMS (QUOTE (PUT.MY.PROP
-       (QUOTE INDENT) (QUOTE NONE)))) (push DUMPOUT.FORMS
-       (QUOTE (PUT.MY.PROP (QUOTE WIDTH) (ANC.WIDTH))))
-       (push DUMPOUT.FORMS (QUOTE (DUMP.FORMAT
-       (QUOTE INDENT) (QUOTE NONE))))) (push DUMPOUT.FORMS
-       (LIST (QUOTE (LAMBDA (I) (PUT.MY.PROP (QUOTE INDENT)
-       (IPLUS (ANC.INDENT) I)) (PUT.MY.PROP (QUOTE WIDTH)
-       (IDIFFERENCE (ANC.WIDTH) I)) (DUMP.FORMAT
-       (QUOTE INDENT) (IPLUS (ANC.INDENT) I)))) COMM.ARG)))
+         (INIT (push DUMPOUT.FORMS (QUOTE (PUT.MY.PROP
+         (QUOTE INDENT) INITIAL.INDENT))) (push DUMPOUT.FORMS
+         (QUOTE (PUT.MY.PROP (QUOTE WIDTH) INITIAL.WIDTH)))
+         (push DUMPOUT.FORMS (QUOTE (DUMP.FORMAT (QUOTE INDENT) INITIAL.INDENT))))
+         (NONE (push DUMPOUT.FORMS (QUOTE (PUT.MY.PROP
+         (QUOTE INDENT) (QUOTE NONE)))) (push DUMPOUT.FORMS
+         (QUOTE (PUT.MY.PROP (QUOTE WIDTH) (ANC.WIDTH))))
+         (push DUMPOUT.FORMS (QUOTE (DUMP.FORMAT (QUOTE INDENT)
+         (QUOTE NONE))))) (push DUMPOUT.FORMS (LIST
+         (QUOTE (LAMBDA (I) (PUT.MY.PROP (QUOTE INDENT)
+         (IPLUS (ANC.INDENT) I)) (PUT.MY.PROP (QUOTE WIDTH)
+         (IDIFFERENCE (ANC.WIDTH) I)) (DUMP.FORMAT
+         (QUOTE INDENT) (IPLUS (ANC.INDENT) I)))) COMM.ARG)))
 
          (* * push DUMPOUT.UNDO (QUOTE INDENT))
 
-                                                     (SETQ COMM.ARG (pop DUMPOUT.ARGS)))
-                                             (WIDTH (push DUMPOUT.FORMS
-                                                           (LIST 'PUT.MY.PROP (KWOTE 'WIDTH)
-                                                                 (pop DUMPOUT.ARGS))))
-                                             (FONT (SETQ COMM.ARG (pop DUMPOUT.ARGS))
-                                                   [push DUMPOUT.FORMS
-                                                          (LIST 'DUMP.FORMAT (KWOTE 'FONT)
-                                                                (COND
-                                                                   ((LISTGET IM.TEDIT.FONT.DEFS 
-                                                                           COMM.ARG)
-                                                                    (KWOTE COMM.ARG))
-                                                                   (T COMM.ARG]
-                                                   (push DUMPOUT.UNDO 'FONT))
-                                             (PARALOOKS (push DUMPOUT.FORMS
-                                                               (LIST 'DUMP.FORMAT (KWOTE 'PARALOOKS)
-                                                                     (pop DUMPOUT.ARGS))))
-                                             (DUMP.CHARS (push DUMPOUT.FORMS
-                                                                (LIST (FUNCTION IM.DUMP.CHARS)
+                                             (SETQ COMM.ARG (pop DUMPOUT.ARGS)))
+                                     (WIDTH (push DUMPOUT.FORMS (LIST 'PUT.MY.PROP
+                                                                      (KWOTE 'WIDTH)
                                                                       (pop DUMPOUT.ARGS))))
-                                             (push DUMPOUT.FORMS (LIST 'DUMP.FORMAT
-                                                                           (KWOTE 'TEXT)
-                                                                           (LIST 'MAKE.SAVE COMM]
-          [for X in DUMPOUT.UNDO do (push DUMPOUT.FORMS (LIST 'DUMP.FORMAT
-                                                                              (KWOTE 'UNDO)
-                                                                              (KWOTE X]
+                                     (FONT (SETQ COMM.ARG (pop DUMPOUT.ARGS))
+                                           [push DUMPOUT.FORMS (LIST 'DUMP.FORMAT (KWOTE 'FONT)
+                                                                     (COND
+                                                                        ((LISTGET IM.TEDIT.FONT.DEFS
+                                                                                COMM.ARG)
+                                                                         (KWOTE COMM.ARG))
+                                                                        (T COMM.ARG]
+                                           (push DUMPOUT.UNDO 'FONT))
+                                     (PARALOOKS (push DUMPOUT.FORMS (LIST 'DUMP.FORMAT
+                                                                          (KWOTE 'PARALOOKS)
+                                                                          (pop DUMPOUT.ARGS))))
+                                     (DUMP.CHARS (push DUMPOUT.FORMS (LIST (FUNCTION IM.DUMP.CHARS)
+                                                                           (pop DUMPOUT.ARGS))))
+                                     (push DUMPOUT.FORMS (LIST 'DUMP.FORMAT (KWOTE 'TEXT)
+                                                               (LIST 'MAKE.SAVE COMM]
+          [for X in DUMPOUT.UNDO do (push DUMPOUT.FORMS (LIST 'DUMP.FORMAT (KWOTE 'UNDO)
+                                                              (KWOTE X]
 
          (* * push DUMPOUT.FORMS (QUOTE (PUT.MY.PROP
-       (QUOTE INDENT) DUMPOUT.SAVE.INDENT)))
+         (QUOTE INDENT) DUMPOUT.SAVE.INDENT)))
 
          (* * push DUMPOUT.FORMS (QUOTE (PUT.MY.PROP
-       (QUOTE WIDTH) DUMPOUT.SAVE.WIDTH)))
+         (QUOTE WIDTH) DUMPOUT.SAVE.WIDTH)))
 
          (* * RETURN (APPEND (QUOTE (PROG ((DUMPOUT.SAVE.INDENT
-       (GET.MY.PROP (QUOTE INDENT))) (DUMPOUT.SAVE.WIDTH
-       (GET.MY.PROP (QUOTE WIDTH)))))) (DREVERSE DUMPOUT.FORMS)))
+         (GET.MY.PROP (QUOTE INDENT))) (DUMPOUT.SAVE.WIDTH
+         (GET.MY.PROP (QUOTE WIDTH)))))) (DREVERSE DUMPOUT.FORMS)))
 
           (RETURN (CONS 'PROGN (DREVERSE DUMPOUT.FORMS])
 
@@ -2408,25 +2387,24 @@ page edge.)
 
 (PUTPROPS SAVE.DUMPOUT MACRO (X (TRANSLATE.SAVE.DUMPOUT X)))
 )
-(PUTPROPS IMTEDIT COPYRIGHT ("Xerox Corporation" 1983 1984 1985 1986 1991))
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (10773 38278 (IM.TEDIT 10783 . 12464) (DUMP 12466 . 14761) (DUMP.HEADERS.FOOTERS 14763
- . 17129) (DUMP.HRULE 17131 . 18282) (CHANGE.FONT 18284 . 19478) (IM.BOUT.IMAGEOBJ 19480 . 19803) (
-IM.TEDIT.DUMP.COMMANDS 19805 . 23358) (IM.TEDIT.DUMP.FOOTNOTES 23360 . 23801) (IM.TEDIT.DUMP.PARA 
-23803 . 24577) (INDEXX.PARSE.TYPE 24579 . 25874) (FORMAT.DEF 25876 . 28007) (FORMAT.LISPWORD 28009 . 
-28160) (MAKE.IM.DOCUMENT 28162 . 37133) (PRINT.NOTE 37135 . 37349) (SEND.INFO 37351 . 38276)) (38387 
-42405 (IM.VRULE.DISPLAYFN 38397 . 38721) (CREATE.VRULE.OBJECT 38723 . 40503) (PRINT.VRULES.ON.PAGE 
-40505 . 42403)) (42563 47318 (IM.FOLIO.DISPLAYFN 42573 . 43251) (IM.FOLIO.SIZEFN 43253 . 44102) (
-CREATE.FOLIO.OBJECT 44104 . 45650) (GET.FOLIO.STRING 45652 . 47316)) (47450 93690 (ARG#TOPROG 47460 . 
-47599) (BIGLISPCODE#TOPROG 47601 . 48837) (BRACKET#TOPROG 48839 . 49003) (CHAPTER#TOPROG 49005 . 51686
-) (COMMENT#TOPROG 51688 . 52240) (DEF#TOPROG 52242 . 55577) (FIGURE#TOPROG 55579 . 56923) (FN#TOPROG 
-56925 . 57322) (FNDEF#TOPROG 57324 . 61216) (FOOT#TOPROG 61218 . 61759) (INCLUDE#TOPROG 61761 . 62076)
- (INDEX#TOPROG 62078 . 63168) (INDEXX#TOPROG 63170 . 65251) (IT#TOPROG 65253 . 65394) (LBRACKET#TOPROG
- 65396 . 65550) (LISP#TOPROG 65552 . 65693) (LISPCODE#TOPROG 65695 . 66814) (LISPWORD#TOPROG 66816 . 
-67556) (LIST#TOPROG 67558 . 71980) (MACDEF#TOPROG 71982 . 73160) (NOTE#TOPROG 73162 . 73842) (
-PRINT.SPECIAL.CHARS#TOPROG 73844 . 74821) (PROPDEF#TOPROG 74823 . 75100) (RBRACKET#TOPROG 75102 . 
-75256) (REF#TOPROG 75258 . 83097) (RM#TOPROG 83099 . 83237) (SUB#TOPROG 83239 . 83387) (SUBSEC#TOPROG 
-83389 . 87892) (SUPER#TOPROG 87894 . 88048) (TABLE#TOPROG 88050 . 92002) (TAG#TOPROG 92004 . 92271) (
-TERM#TOPROG 92273 . 92586) (VAR#TOPROG 92588 . 92991) (VARDEF#TOPROG 92993 . 93688)) (111336 116764 (
-TRANSLATE.DUMPOUT 111346 . 116363) (TRANSLATE.SAVE.DUMPOUT 116365 . 116762)))))
+  (FILEMAP (NIL (10668 38115 (IM.TEDIT 10678 . 12359) (DUMP 12361 . 14656) (DUMP.HEADERS.FOOTERS 14658
+ . 17024) (DUMP.HRULE 17026 . 18177) (CHANGE.FONT 18179 . 19373) (IM.BOUT.IMAGEOBJ 19375 . 19698) (
+IM.TEDIT.DUMP.COMMANDS 19700 . 23253) (IM.TEDIT.DUMP.FOOTNOTES 23255 . 23696) (IM.TEDIT.DUMP.PARA 
+23698 . 24472) (INDEXX.PARSE.TYPE 24474 . 25769) (FORMAT.DEF 25771 . 27902) (FORMAT.LISPWORD 27904 . 
+28055) (MAKE.IM.DOCUMENT 28057 . 36970) (PRINT.NOTE 36972 . 37186) (SEND.INFO 37188 . 38113)) (38224 
+42242 (IM.VRULE.DISPLAYFN 38234 . 38558) (CREATE.VRULE.OBJECT 38560 . 40340) (PRINT.VRULES.ON.PAGE 
+40342 . 42240)) (42400 47155 (IM.FOLIO.DISPLAYFN 42410 . 43088) (IM.FOLIO.SIZEFN 43090 . 43939) (
+CREATE.FOLIO.OBJECT 43941 . 45487) (GET.FOLIO.STRING 45489 . 47153)) (47287 93527 (ARG#TOPROG 47297 . 
+47436) (BIGLISPCODE#TOPROG 47438 . 48674) (BRACKET#TOPROG 48676 . 48840) (CHAPTER#TOPROG 48842 . 51523
+) (COMMENT#TOPROG 51525 . 52077) (DEF#TOPROG 52079 . 55414) (FIGURE#TOPROG 55416 . 56760) (FN#TOPROG 
+56762 . 57159) (FNDEF#TOPROG 57161 . 61053) (FOOT#TOPROG 61055 . 61596) (INCLUDE#TOPROG 61598 . 61913)
+ (INDEX#TOPROG 61915 . 63005) (INDEXX#TOPROG 63007 . 65088) (IT#TOPROG 65090 . 65231) (LBRACKET#TOPROG
+ 65233 . 65387) (LISP#TOPROG 65389 . 65530) (LISPCODE#TOPROG 65532 . 66651) (LISPWORD#TOPROG 66653 . 
+67393) (LIST#TOPROG 67395 . 71817) (MACDEF#TOPROG 71819 . 72997) (NOTE#TOPROG 72999 . 73679) (
+PRINT.SPECIAL.CHARS#TOPROG 73681 . 74658) (PROPDEF#TOPROG 74660 . 74937) (RBRACKET#TOPROG 74939 . 
+75093) (REF#TOPROG 75095 . 82934) (RM#TOPROG 82936 . 83074) (SUB#TOPROG 83076 . 83224) (SUBSEC#TOPROG 
+83226 . 87729) (SUPER#TOPROG 87731 . 87885) (TABLE#TOPROG 87887 . 91839) (TAG#TOPROG 91841 . 92108) (
+TERM#TOPROG 92110 . 92423) (VAR#TOPROG 92425 . 92828) (VARDEF#TOPROG 92830 . 93525)) (111173 116115 (
+TRANSLATE.DUMPOUT 111183 . 115714) (TRANSLATE.SAVE.DUMPOUT 115716 . 116113)))))
 STOP
diff --git a/doctools/IMTEDIT.LCOM b/doctools/IMTEDIT.LCOM
index ae61f369..68d91551 100644
Binary files a/doctools/IMTEDIT.LCOM and b/doctools/IMTEDIT.LCOM differ
