1
0
mirror of synced 2026-01-29 13:31:48 +00:00

Fixed dumping of the running page header that was from the HEADER option of TEXTTOIMAGESTREAM. (#2461)

* Fixed dumping of the running page header that was from the HEADER option of TEXTTOIMAGESTREAM.

* Restored (CONSTANT ...) around a TIMES call (that *really* ought to optimize at compilation).
This commit is contained in:
Matt Heffron
2026-01-27 19:58:12 -08:00
committed by GitHub
parent 43e08ea85b
commit 05a4c48f38
2 changed files with 43 additions and 42 deletions

View File

@@ -1,13 +1,13 @@
(DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
(FILECREATED "19-Jan-2026 17:04:42" {WMEDLEY}<library>POSTSCRIPTSTREAM.;64 258252
(FILECREATED "27-Jan-2026 17:57:49" {DSK}<home>matt>Interlisp>medley>library>POSTSCRIPTSTREAM.;4 258423
:EDIT-BY rmk
:EDIT-BY "mth"
:CHANGES-TO (FNS OPENPOSTSCRIPTSTREAM)
(VARS POSTSCRIPTSTREAMCOMS)
:CHANGES-TO (FNS POSTSCRIPT.STARTPAGE)
:PREVIOUS-DATE "31-Dec-2025 22:38:51" {WMEDLEY}<library>POSTSCRIPTSTREAM.;62)
:PREVIOUS-DATE "27-Jan-2026 13:15:17"
{DSK}<home>matt>Interlisp>medley>library>POSTSCRIPTSTREAM.;3)
(PRETTYCOMPRINT POSTSCRIPTSTREAMCOMS)
@@ -1800,7 +1800,8 @@
(freplace (\POSTSCRIPTDATA POSTSCRIPTCHARSTOSHOW) of IMAGEDATA with NIL])
(POSTSCRIPT.STARTPAGE
[LAMBDA (STREAM) (* ; "Edited 12-Jun-2021 14:52 by rmk:")
[LAMBDA (STREAM) (* ; "Edited 27-Jan-2026 17:54 by mth")
(* ; "Edited 12-Jun-2021 14:52 by rmk:")
(* ;; "Start up a new page in a Postscript document.")
@@ -1831,11 +1832,11 @@
(LET [(FONT (\DSPFONT.PSC STREAM (fetch (\POSTSCRIPTDATA POSTSCRIPTHEADINGFONT)
of IMAGEDATA]
(\DSPRESET.PSC STREAM)
(POSTSCRIPT.OUTSTR STREAM (fetch (\POSTSCRIPTDATA POSTSCRIPTHEADING) of IMAGEDATA))
(for CH instring (fetch (\POSTSCRIPTDATA POSTSCRIPTHEADING) of IMAGEDATA)
do (\POSTSCRIPT.OUTCHARFN STREAM CH))
(RELMOVETO (CONSTANT (TIMES 72 \PS.SCALE0))
0 STREAM) (* ; "Skip an inch before page number")
(POSTSCRIPT.OUTSTR STREAM "Page ")
(POSTSCRIPT.OUTSTR STREAM NEW-PAGE)
(for CH instring (CONCAT "Page " NEW-PAGE) do (\POSTSCRIPT.OUTCHARFN STREAM CH))
(\TERPRI.PSC STREAM) (* ; "Skip 2 lines")
(\TERPRI.PSC STREAM)
(\DSPFONT.PSC STREAM FONT)))
@@ -4391,37 +4392,37 @@
(ADDTOVAR LAMA POSTSCRIPT.PUTCOMMAND)
)
(DECLARE%: DONTCOPY
(FILEMAP (NIL (22369 32688 (POSTSCRIPT.INIT 22379 . 29294) (POSTSCRIPT.PUTRGBCOLOR 29296 . 30318) (
\PSC.COLOR.TO.RGB 30320 . 32686)) (33674 69096 (PSCFONT.READFONT 33684 . 35592) (PSCFONT.SPELLFILE
35594 . 36407) (PSCFONT.COERCEFILE 36409 . 37981) (PSCFONTFROMCACHE.SPELLFILE 37983 . 38968) (
PSCFONTFROMCACHE.COERCEFILE 38970 . 40622) (PSCFONT.WRITEFONT 40624 . 41639) (READ-AFM-FILE 41641 .
47512) (CONVERT-AFM-FILES 47514 . 48726) (POSTSCRIPT.GETFONTID 48728 . 50123) (POSTSCRIPT.FONTCREATE
50125 . 63019) (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 63021 . 65418) (POSTSCRIPT.FONTSAVAILABLE 65420
. 67707) (POSTSCRIPT.FONTEXISTS? 67709 . 69094)) (69097 79006 (OPENPOSTSCRIPTSTREAM 69107 . 78672) (
CLOSEPOSTSCRIPTSTREAM 78674 . 79004)) (79051 85377 (POSTSCRIPT.HARDCOPYW 79061 . 82168) (
POSTSCRIPT.TEDIT 82170 . 82622) (POSTSCRIPTFILEP 82624 . 84112) (MAKEEPSFILE 84114 . 85375)) (85378
128952 (POSTSCRIPT.BITMAPSCALE 85388 . 87844) (POSTSCRIPT.CLOSESTRING 87846 . 88399) (
POSTSCRIPT.ENDPAGE 88401 . 89292) (POSTSCRIPT.OUTSTR 89294 . 90511) (POSTSCRIPT.PUTBITMAPBYTES 90513
. 98984) (POSTSCRIPT.PUTCOMMAND 98986 . 99975) (POSTSCRIPT.SET-FAKE-LANDSCAPE 99977 . 104497) (
POSTSCRIPT.SHOWACCUM 104499 . 106654) (POSTSCRIPT.STARTPAGE 106656 . 109188) (\POSTSCRIPTTAB 109190 .
109987) (\PS.BOUTFIXP 109989 . 111269) (\PS.SCALEHACK 111271 . 113914) (\PS.SCALEREGION 113916 .
114476) (\SCALEDBITBLT.PSC 114478 . 118788) (\SETPOS.PSC 118790 . 119271) (\SETXFORM.PSC 119273 .
121857) (\STRINGWIDTH.PSC 121859 . 122332) (\SWITCHFONTS.PSC 122334 . 127826) (\TERPRI.PSC 127828 .
128950)) (128987 182843 (\BITBLT.PSC 128997 . 129549) (\BLTSHADE.PSC 129551 . 134212) (\CHARWIDTH.PSC
134214 . 134721) (\CREATECHARSET.PSC 134723 . 136079) (\DRAWARC.PSC 136081 . 138459) (\DRAWCIRCLE.PSC
138461 . 140712) (\DRAWCURVE.PSC 140714 . 144558) (\DRAWELLIPSE.PSC 144560 . 146924) (\DRAWLINE.PSC
146926 . 149666) (\DRAWPOINT.PSC 149668 . 150244) (\DRAWPOLYGON.PSC 150246 . 153375) (
\DSPBOTTOMMARGIN.PSC 153377 . 154064) (\DSPCLIPPINGREGION.PSC 154066 . 155441) (\DSPCOLOR.PSC 155443
. 156374) (\DSPFONT.PSC 156376 . 160013) (\DSPLEFTMARGIN.PSC 160015 . 160701) (\DSPLINEFEED.PSC
160703 . 161293) (\DSPPUSHSTATE.PSC 161295 . 162755) (\DSPPOPSTATE.PSC 162757 . 166242) (\DSPRESET.PSC
166244 . 166909) (\DSPRIGHTMARGIN.PSC 166911 . 167600) (\DSPROTATE.PSC 167602 . 168601) (
\DSPSCALE.PSC 168603 . 169555) (\DSPSCALE2.PSC 169557 . 170397) (\DSPSPACEFACTOR.PSC 170399 . 171320)
(\DSPTOPMARGIN.PSC 171322 . 171893) (\DSPTRANSLATE.PSC 171895 . 173926) (\DSPXPOSITION.PSC 173928 .
174492) (\DSPYPOSITION.PSC 174494 . 175085) (\FILLCIRCLE.PSC 175087 . 177312) (\FILLPOLYGON.PSC 177314
. 180551) (\FIXLINELENGTH.PSC 180553 . 181872) (\MOVETO.PSC 181874 . 182644) (\NEWPAGE.PSC 182646 .
182841)) (182899 205045 (\POSTSCRIPT.CHANGECHARSET 182909 . 183627) (\POSTSCRIPT.OUTCHARFN 183629 .
195899) (\POSTSCRIPT.PRINTSLUG 195901 . 197625) (\POSTSCRIPT.SPECIALOUTCHARFN 197627 . 199978) (
\UPDATE.PSC 199980 . 201226) (\POSTSCRIPT.ACCENTFN 201228 . 202170) (\POSTSCRIPT.ACCENTPAIR 202172 .
205043)) (205143 206788 (\PSC.SPACEDISP 205153 . 205432) (\PSC.SPACEWID 205434 . 206053) (\PSC.SYMBOLS
206055 . 206786)) (206897 209888 (\POSTSCRIPT.NSHASH 206907 . 209886)))))
(FILEMAP (NIL (22370 32689 (POSTSCRIPT.INIT 22380 . 29295) (POSTSCRIPT.PUTRGBCOLOR 29297 . 30319) (
\PSC.COLOR.TO.RGB 30321 . 32687)) (33675 69097 (PSCFONT.READFONT 33685 . 35593) (PSCFONT.SPELLFILE
35595 . 36408) (PSCFONT.COERCEFILE 36410 . 37982) (PSCFONTFROMCACHE.SPELLFILE 37984 . 38969) (
PSCFONTFROMCACHE.COERCEFILE 38971 . 40623) (PSCFONT.WRITEFONT 40625 . 41640) (READ-AFM-FILE 41642 .
47513) (CONVERT-AFM-FILES 47515 . 48727) (POSTSCRIPT.GETFONTID 48729 . 50124) (POSTSCRIPT.FONTCREATE
50126 . 63020) (\POSTSCRIPT.SPECIALFONT.SCALEDWIDTHS 63022 . 65419) (POSTSCRIPT.FONTSAVAILABLE 65421
. 67708) (POSTSCRIPT.FONTEXISTS? 67710 . 69095)) (69098 79007 (OPENPOSTSCRIPTSTREAM 69108 . 78673) (
CLOSEPOSTSCRIPTSTREAM 78675 . 79005)) (79052 85378 (POSTSCRIPT.HARDCOPYW 79062 . 82169) (
POSTSCRIPT.TEDIT 82171 . 82623) (POSTSCRIPTFILEP 82625 . 84113) (MAKEEPSFILE 84115 . 85376)) (85379
129123 (POSTSCRIPT.BITMAPSCALE 85389 . 87845) (POSTSCRIPT.CLOSESTRING 87847 . 88400) (
POSTSCRIPT.ENDPAGE 88402 . 89293) (POSTSCRIPT.OUTSTR 89295 . 90512) (POSTSCRIPT.PUTBITMAPBYTES 90514
. 98985) (POSTSCRIPT.PUTCOMMAND 98987 . 99976) (POSTSCRIPT.SET-FAKE-LANDSCAPE 99978 . 104498) (
POSTSCRIPT.SHOWACCUM 104500 . 106655) (POSTSCRIPT.STARTPAGE 106657 . 109359) (\POSTSCRIPTTAB 109361 .
110158) (\PS.BOUTFIXP 110160 . 111440) (\PS.SCALEHACK 111442 . 114085) (\PS.SCALEREGION 114087 .
114647) (\SCALEDBITBLT.PSC 114649 . 118959) (\SETPOS.PSC 118961 . 119442) (\SETXFORM.PSC 119444 .
122028) (\STRINGWIDTH.PSC 122030 . 122503) (\SWITCHFONTS.PSC 122505 . 127997) (\TERPRI.PSC 127999 .
129121)) (129158 183014 (\BITBLT.PSC 129168 . 129720) (\BLTSHADE.PSC 129722 . 134383) (\CHARWIDTH.PSC
134385 . 134892) (\CREATECHARSET.PSC 134894 . 136250) (\DRAWARC.PSC 136252 . 138630) (\DRAWCIRCLE.PSC
138632 . 140883) (\DRAWCURVE.PSC 140885 . 144729) (\DRAWELLIPSE.PSC 144731 . 147095) (\DRAWLINE.PSC
147097 . 149837) (\DRAWPOINT.PSC 149839 . 150415) (\DRAWPOLYGON.PSC 150417 . 153546) (
\DSPBOTTOMMARGIN.PSC 153548 . 154235) (\DSPCLIPPINGREGION.PSC 154237 . 155612) (\DSPCOLOR.PSC 155614
. 156545) (\DSPFONT.PSC 156547 . 160184) (\DSPLEFTMARGIN.PSC 160186 . 160872) (\DSPLINEFEED.PSC
160874 . 161464) (\DSPPUSHSTATE.PSC 161466 . 162926) (\DSPPOPSTATE.PSC 162928 . 166413) (\DSPRESET.PSC
166415 . 167080) (\DSPRIGHTMARGIN.PSC 167082 . 167771) (\DSPROTATE.PSC 167773 . 168772) (
\DSPSCALE.PSC 168774 . 169726) (\DSPSCALE2.PSC 169728 . 170568) (\DSPSPACEFACTOR.PSC 170570 . 171491)
(\DSPTOPMARGIN.PSC 171493 . 172064) (\DSPTRANSLATE.PSC 172066 . 174097) (\DSPXPOSITION.PSC 174099 .
174663) (\DSPYPOSITION.PSC 174665 . 175256) (\FILLCIRCLE.PSC 175258 . 177483) (\FILLPOLYGON.PSC 177485
. 180722) (\FIXLINELENGTH.PSC 180724 . 182043) (\MOVETO.PSC 182045 . 182815) (\NEWPAGE.PSC 182817 .
183012)) (183070 205216 (\POSTSCRIPT.CHANGECHARSET 183080 . 183798) (\POSTSCRIPT.OUTCHARFN 183800 .
196070) (\POSTSCRIPT.PRINTSLUG 196072 . 197796) (\POSTSCRIPT.SPECIALOUTCHARFN 197798 . 200149) (
\UPDATE.PSC 200151 . 201397) (\POSTSCRIPT.ACCENTFN 201399 . 202341) (\POSTSCRIPT.ACCENTPAIR 202343 .
205214)) (205314 206959 (\PSC.SPACEDISP 205324 . 205603) (\PSC.SPACEWID 205605 . 206224) (\PSC.SYMBOLS
206226 . 206957)) (207068 210059 (\POSTSCRIPT.NSHASH 207078 . 210057)))))
STOP

Binary file not shown.