Skip to content

Commit 047aa5f

Browse files
rmkaplanrmkaplan
authored
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).
1 parent 710513f commit 047aa5f

File tree

2 files changed

+25
-27
lines changed

2 files changed

+25
-27
lines changed

‎library/tedit/TEDIT-PAGE‎

Lines changed: 25 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
22

3-
(FILECREATED "17-Mar-2024 18:15:40" 
4-
{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>tedit>TEDIT-PAGE.;173 113461
3+
(FILECREATED " 5-Apr-2024 08:01:17" {WMEDLEY}<library>tedit>TEDIT-PAGE.;175 113329
54

65
:EDIT-BY rmk
76

8-
:CHANGES-TO (FNS TEDIT.FORMAT.HARDCOPY TEDIT.SKIP.SPECIALCOND \TEDIT.FORMATBOX
9-
\TEDIT.FORMATHEADING \TEDIT.FORMATFOLIO)
7+
:CHANGES-TO (FNS TEDIT.FORMAT.HARDCOPY)
108

11-
:PREVIOUS-DATE "17-Mar-2024 00:27:48"
12-
{DSK}<Users>kaplan>Local>medley3.5>working-medley>library>tedit>TEDIT-PAGE.;172)
9+
:PREVIOUS-DATE " 4-Apr-2024 23:17:31" {WMEDLEY}<library>tedit>TEDIT-PAGE.;174)
1310

1411

1512
(PRETTYCOMPRINT TEDIT-PAGECOMS)
@@ -557,7 +554,8 @@
557554

558555
(TEDIT.FORMAT.HARDCOPY
559556
[LAMBDA (TEXTSTREAM FILE DONTSEND BREAKPAGETITLE SERVER PRINTOPTIONS IMAGETYPE FIRSTPG# STARTPG
560-
ENDPG) (* ; "Edited 16-Mar-2024 09:31 by rmk")
557+
ENDPG) (* ; "Edited 5-Apr-2024 08:01 by rmk")
558+
(* ; "Edited 16-Mar-2024 09:31 by rmk")
561559
(* ; "Edited 7-Mar-2024 12:34 by rmk")
562560
(* ; "Edited 19-Jan-2024 23:39 by rmk")
563561
(* ; "Edited 24-Dec-2023 14:10 by rmk")
@@ -593,10 +591,10 @@
593591
(CDR FIRSTPG#))
594592
PAGE#TEXT _ (AND (LISTP FIRSTPG#)
595593
(CAR FIRSTPG#]
596-
PRSTREAM PAGEFRAMES SCRATCHFILE BEFOREFN AFTERFN NPAGES WASOPEN TARGETFILENAME)
597-
(CL:WHEN (AND (SETQ BEFOREFN (GETTEXTPROP TEXTOBJ 'BEFOREHARDCOPYFN))
598-
(EQ 'DON'T (APPLY* BEFOREFN TEXTSTREAM TEXTOBJ)))
599-
(* ;
594+
PRSTREAM PAGEFRAMES SCRATCHFILE NPAGES WASOPEN TARGETFILENAME)
595+
(CL:WHEN (EQ 'DON'T (APPLY* (OR (GETTEXTPROP TEXTOBJ 'BEFOREHARDCOPYFN)
596+
(FUNCTION NILL))
597+
TEXTSTREAM)) (* ;
600598
 "Do pre-hardcopy processing as indicated, or refuse")
601599
(RETURN))
602600
(SETQ PAGEFRAMES (OR (FGETTOBJ TEXTOBJ TXTPAGEFRAMES)
@@ -625,10 +623,7 @@
625623
 "It's a real file, so use the file name on the break page.")
626624
(fetch (STREAM FULLNAME) of (FGETTOBJ TEXTOBJ TXTFILE])
627625
[SETQ SCRATCHFILE (OR FILE (PRINTER.SCRATCH.FILE (TEXTSTREAM TEXTSTREAM]
628-
(RESETLST
629-
(CL:WHEN (SETQ AFTERFN (GETTEXTPROP TEXTOBJ 'AFTERHARDCOPYFN))
630-
(RESETSAVE NIL (LIST AFTERFN TEXTSTREAM TEXTOBJ)))
631-
(* ;
626+
(RESETLST (* ;
632627
 "Set up to do the user's cleanup on the way out, as well.")
633628
(TEDIT.PROMPTPRINT TEXTOBJ "Formatting for print..." T)
634629
[COND
@@ -689,7 +684,10 @@
689684
(SEND.FILE.TO.PRINTER PRSTREAM SERVER (APPEND PRINTOPTIONS
690685
(LIST 'DOCUMENT.NAME
691686
BREAKPAGETITLE)))))
692-
(CL:UNLESS FILE (DELFILE SCRATCHFILE)))
687+
(CL:UNLESS FILE (DELFILE SCRATCHFILE))
688+
(APPLY* (OR (GETTEXTPROP TEXTOBJ 'AFTERHARDCOPYFN)
689+
(FUNCTION NILL))
690+
TEXTSTREAM))
693691
(SETQ NPAGES (GETPFS FORMATTINGSTATE PAGECOUNT))
694692
(TEDIT.PROMPTPRINT TEXTOBJ (CONCAT NPAGES " page" (CL:IF (EQ 1 NPAGES)
695693
""
@@ -1807,15 +1805,15 @@
18071805
(RETURN (DREMOVE NIL $$VAL])
18081806
)
18091807
(DECLARE%: DONTCOPY
1810-
(FILEMAP (NIL (12106 15439 (\TEDIT.PARSE.PAGEFRAMES 12116 . 13616) (\TEDIT.PUT.PAGEFRAMES 13618 .
1811-
14442) (\TEDIT.UNPARSE.PAGEFRAMES 14444 . 15437)) (15502 31964 (TEDIT.SINGLE.PAGEFORMAT 15512 . 25730)
1812-
(TEDIT.COMPOUND.PAGEFORMAT 25732 . 26711) (TEDIT.PAGEFORMAT 26713 . 31962)) (31965 45142 (
1813-
TEDIT.FORMAT.HARDCOPY 31975 . 43075) (TEDIT.SKIP.SPECIALCOND 43077 . 45140)) (45229 92152 (
1814-
\TEDIT.FORMATBOX 45239 . 58019) (\TEDIT.FORMATHEADING 58021 . 62041) (\TEDIT.FORMATPAGE 62043 . 70463)
1815-
(\TEDIT.FORMATTEXTBOX 70465 . 85364) (\TEDIT.FORMATFOLIO 85366 . 90109) (\TEDIT.FORMAT.FOUNDBOX?
1816-
90111 . 92150)) (92232 94648 (TEDIT.HARDCOPY.PAGEHEADINGS 92242 . 94646)) (94757 101940 (
1817-
TEDIT.HARDCOPY-COLUMN-END 94767 . 101938)) (101985 106926 (SCALEPAGEUNITS 101995 . 103136) (
1818-
SCALEPAGEXUNITS 103138 . 103908) (SCALEPAGEYUNITS 103910 . 104681) (\TEDIT.PAPERHEIGHT 104683 . 105618
1819-
) (\TEDIT.PAPERWIDTH 105620 . 106924)) (107342 110910 (ROMANNUMERALS 107352 . 110908)) (110946 113438
1820-
(\TEDIT.FORMAT.FOOTNOTE 110956 . 113436)))))
1808+
(FILEMAP (NIL (11920 15253 (\TEDIT.PARSE.PAGEFRAMES 11930 . 13430) (\TEDIT.PUT.PAGEFRAMES 13432 .
1809+
14256) (\TEDIT.UNPARSE.PAGEFRAMES 14258 . 15251)) (15316 31778 (TEDIT.SINGLE.PAGEFORMAT 15326 . 25544)
1810+
(TEDIT.COMPOUND.PAGEFORMAT 25546 . 26525) (TEDIT.PAGEFORMAT 26527 . 31776)) (31779 45010 (
1811+
TEDIT.FORMAT.HARDCOPY 31789 . 42943) (TEDIT.SKIP.SPECIALCOND 42945 . 45008)) (45097 92020 (
1812+
\TEDIT.FORMATBOX 45107 . 57887) (\TEDIT.FORMATHEADING 57889 . 61909) (\TEDIT.FORMATPAGE 61911 . 70331)
1813+
(\TEDIT.FORMATTEXTBOX 70333 . 85232) (\TEDIT.FORMATFOLIO 85234 . 89977) (\TEDIT.FORMAT.FOUNDBOX?
1814+
89979 . 92018)) (92100 94516 (TEDIT.HARDCOPY.PAGEHEADINGS 92110 . 94514)) (94625 101808 (
1815+
TEDIT.HARDCOPY-COLUMN-END 94635 . 101806)) (101853 106794 (SCALEPAGEUNITS 101863 . 103004) (
1816+
SCALEPAGEXUNITS 103006 . 103776) (SCALEPAGEYUNITS 103778 . 104549) (\TEDIT.PAPERHEIGHT 104551 . 105486
1817+
) (\TEDIT.PAPERWIDTH 105488 . 106792)) (107210 110778 (ROMANNUMERALS 107220 . 110776)) (110814 113306
1818+
(\TEDIT.FORMAT.FOOTNOTE 110824 . 113304)))))
18211819
STOP

‎library/tedit/TEDIT-PAGE.LCOM‎

-316 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)