TEDIT.FORMAT.HARDCOPY fetches the AFTERHARDCOPYFN at the end (#1671)

so that it can be set by a display fn or boxfn along the way. This permits the fix to IRM indexing in PR #1649 to take effect (for HCFILES).
Interlisp · Apr 30, 2024 · 047aa5f · 047aa5f
1 parent 710513f
commit 047aa5f
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 27 deletions.
diff --git a/library/tedit/TEDIT-PAGE b/library/tedit/TEDIT-PAGE
@@ -1,15 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-(FILECREATED "17-Mar-2024 18:15:40" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>tedit>TEDIT-PAGE.;173 113461 
+(FILECREATED " 5-Apr-2024 08:01:17" {WMEDLEY}<library>tedit>TEDIT-PAGE.;175 113329 
 
       :EDIT-BY rmk
 
-      :CHANGES-TO (FNS TEDIT.FORMAT.HARDCOPY TEDIT.SKIP.SPECIALCOND \TEDIT.FORMATBOX 
-                       \TEDIT.FORMATHEADING \TEDIT.FORMATFOLIO)
+      :CHANGES-TO (FNS TEDIT.FORMAT.HARDCOPY)
 
-      :PREVIOUS-DATE "17-Mar-2024 00:27:48" 
-{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>tedit>TEDIT-PAGE.;172)
+      :PREVIOUS-DATE " 4-Apr-2024 23:17:31" {WMEDLEY}<library>tedit>TEDIT-PAGE.;174)
 
 
 (PRETTYCOMPRINT TEDIT-PAGECOMS)
@@ -557,7 +554,8 @@
 
 (TEDIT.FORMAT.HARDCOPY
   [LAMBDA (TEXTSTREAM FILE DONTSEND BREAKPAGETITLE SERVER PRINTOPTIONS IMAGETYPE FIRSTPG# STARTPG 
-                 ENDPG)                                      (* ; "Edited 16-Mar-2024 09:31 by rmk")
+                 ENDPG)                                      (* ; "Edited  5-Apr-2024 08:01 by rmk")
+                                                             (* ; "Edited 16-Mar-2024 09:31 by rmk")
                                                              (* ; "Edited  7-Mar-2024 12:34 by rmk")
                                                              (* ; "Edited 19-Jan-2024 23:39 by rmk")
                                                              (* ; "Edited 24-Dec-2023 14:10 by rmk")
@@ -593,10 +591,10 @@
                                                              (CDR FIRSTPG#))
                                        PAGE#TEXT _ (AND (LISTP FIRSTPG#)
                                                         (CAR FIRSTPG#]
-               PRSTREAM PAGEFRAMES SCRATCHFILE BEFOREFN AFTERFN NPAGES WASOPEN TARGETFILENAME)
-              (CL:WHEN (AND (SETQ BEFOREFN (GETTEXTPROP TEXTOBJ 'BEFOREHARDCOPYFN))
-                            (EQ 'DON'T (APPLY* BEFOREFN TEXTSTREAM TEXTOBJ)))
-                                                             (* ; 
+               PRSTREAM PAGEFRAMES SCRATCHFILE NPAGES WASOPEN TARGETFILENAME)
+              (CL:WHEN (EQ 'DON'T (APPLY* (OR (GETTEXTPROP TEXTOBJ 'BEFOREHARDCOPYFN)
+                                              (FUNCTION NILL))
+                                         TEXTSTREAM))        (* ; 
                                                  "Do pre-hardcopy processing as indicated, or refuse")
                   (RETURN))
               (SETQ PAGEFRAMES (OR (FGETTOBJ TEXTOBJ TXTPAGEFRAMES)
@@ -625,10 +623,7 @@
                                           "It's a real file, so use the file name on the break page.")
                                              (fetch (STREAM FULLNAME) of (FGETTOBJ TEXTOBJ TXTFILE])
               [SETQ SCRATCHFILE (OR FILE (PRINTER.SCRATCH.FILE (TEXTSTREAM TEXTSTREAM]
-              (RESETLST
-                  (CL:WHEN (SETQ AFTERFN (GETTEXTPROP TEXTOBJ 'AFTERHARDCOPYFN))
-                      (RESETSAVE NIL (LIST AFTERFN TEXTSTREAM TEXTOBJ)))
-                                                             (* ; 
+              (RESETLST                                      (* ; 
                                            "Set up to do the user's cleanup on the way out, as well.")
                   (TEDIT.PROMPTPRINT TEXTOBJ "Formatting for print..." T)
                   [COND
@@ -689,7 +684,10 @@
                           (SEND.FILE.TO.PRINTER PRSTREAM SERVER (APPEND PRINTOPTIONS
                                                                        (LIST 'DOCUMENT.NAME 
                                                                              BREAKPAGETITLE)))))
-                  (CL:UNLESS FILE (DELFILE SCRATCHFILE)))
+                  (CL:UNLESS FILE (DELFILE SCRATCHFILE))
+                  (APPLY* (OR (GETTEXTPROP TEXTOBJ 'AFTERHARDCOPYFN)
+                              (FUNCTION NILL))
+                         TEXTSTREAM))
               (SETQ NPAGES (GETPFS FORMATTINGSTATE PAGECOUNT))
               (TEDIT.PROMPTPRINT TEXTOBJ (CONCAT NPAGES " page" (CL:IF (EQ 1 NPAGES)
                                                                     ""
@@ -1807,15 +1805,15 @@
                         (RETURN (DREMOVE NIL $$VAL])
 )
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (12106 15439 (\TEDIT.PARSE.PAGEFRAMES 12116 . 13616) (\TEDIT.PUT.PAGEFRAMES 13618 . 
-14442) (\TEDIT.UNPARSE.PAGEFRAMES 14444 . 15437)) (15502 31964 (TEDIT.SINGLE.PAGEFORMAT 15512 . 25730)
- (TEDIT.COMPOUND.PAGEFORMAT 25732 . 26711) (TEDIT.PAGEFORMAT 26713 . 31962)) (31965 45142 (
-TEDIT.FORMAT.HARDCOPY 31975 . 43075) (TEDIT.SKIP.SPECIALCOND 43077 . 45140)) (45229 92152 (
-\TEDIT.FORMATBOX 45239 . 58019) (\TEDIT.FORMATHEADING 58021 . 62041) (\TEDIT.FORMATPAGE 62043 . 70463)
- (\TEDIT.FORMATTEXTBOX 70465 . 85364) (\TEDIT.FORMATFOLIO 85366 . 90109) (\TEDIT.FORMAT.FOUNDBOX? 
-90111 . 92150)) (92232 94648 (TEDIT.HARDCOPY.PAGEHEADINGS 92242 . 94646)) (94757 101940 (
-TEDIT.HARDCOPY-COLUMN-END 94767 . 101938)) (101985 106926 (SCALEPAGEUNITS 101995 . 103136) (
-SCALEPAGEXUNITS 103138 . 103908) (SCALEPAGEYUNITS 103910 . 104681) (\TEDIT.PAPERHEIGHT 104683 . 105618
-) (\TEDIT.PAPERWIDTH 105620 . 106924)) (107342 110910 (ROMANNUMERALS 107352 . 110908)) (110946 113438 
-(\TEDIT.FORMAT.FOOTNOTE 110956 . 113436)))))
+  (FILEMAP (NIL (11920 15253 (\TEDIT.PARSE.PAGEFRAMES 11930 . 13430) (\TEDIT.PUT.PAGEFRAMES 13432 . 
+14256) (\TEDIT.UNPARSE.PAGEFRAMES 14258 . 15251)) (15316 31778 (TEDIT.SINGLE.PAGEFORMAT 15326 . 25544)
+ (TEDIT.COMPOUND.PAGEFORMAT 25546 . 26525) (TEDIT.PAGEFORMAT 26527 . 31776)) (31779 45010 (
+TEDIT.FORMAT.HARDCOPY 31789 . 42943) (TEDIT.SKIP.SPECIALCOND 42945 . 45008)) (45097 92020 (
+\TEDIT.FORMATBOX 45107 . 57887) (\TEDIT.FORMATHEADING 57889 . 61909) (\TEDIT.FORMATPAGE 61911 . 70331)
+ (\TEDIT.FORMATTEXTBOX 70333 . 85232) (\TEDIT.FORMATFOLIO 85234 . 89977) (\TEDIT.FORMAT.FOUNDBOX? 
+89979 . 92018)) (92100 94516 (TEDIT.HARDCOPY.PAGEHEADINGS 92110 . 94514)) (94625 101808 (
+TEDIT.HARDCOPY-COLUMN-END 94635 . 101806)) (101853 106794 (SCALEPAGEUNITS 101863 . 103004) (
+SCALEPAGEXUNITS 103006 . 103776) (SCALEPAGEYUNITS 103778 . 104549) (\TEDIT.PAPERHEIGHT 104551 . 105486
+) (\TEDIT.PAPERWIDTH 105488 . 106792)) (107210 110778 (ROMANNUMERALS 107220 . 110776)) (110814 113306 
+(\TEDIT.FORMAT.FOOTNOTE 110824 . 113304)))))
 STOP
diff --git a/library/tedit/TEDIT-PAGE.LCOM b/library/tedit/TEDIT-PAGE.LCOM