PDFSTREAM: Fix logic around closing the postscript sub-stream

library/PDFSTREAM

@@ -1,10 +1,12 @@
 (DEFINE-FILE-INFO PACKAGE "INTERLISP" READTABLE "INTERLISP" BASE 10)
 
-
(FILECREATED " 2-Jul-2023 17:00:18" {WMEDLEY}<library>PDFSTREAM.;37
 12671  
+
(FILECREATED "17-Jul-2023 22:33:21" {WMEDLEY}<library>PDFSTREAM.;38
 12982  
 
       :EDIT-BY rmk
 
-      :PREVIOUS-DATE "25-Jun-2023 16:41:34" {WMEDLEY}<library>PDFSTREAM.;36)
+      :CHANGES-TO (FNS CLOSE-PDF-STREAM)
+
+      :PREVIOUS-DATE " 2-Jul-2023 17:00:18" {WMEDLEY}<library>PDFSTREAM.;37)
 
 
 (PRETTYCOMPRINT PDFSTREAMCOMS)
@@ -158,7 +160,8 @@
                 PSSTREAM])
 
 (CLOSE-PDF-STREAM

-  [LAMBDA (PSSTREAM)
                                         (* ; "Edited 24-Jun-2023 13:57 by rmk")

+  [LAMBDA (PSSTREAM)
                                         (* ; "Edited 17-Jul-2023 22:32 by rmk")


+                                                             (* ; "Edited 24-Jun-2023 13:57 by rmk")

 
     (* ;; "PSSTREAM is a tmp/ postscript rendition of what is intended to end up as a pdf.  If we are going directly to a printer, we can probably just pass it along without worrying about conversion.  In fact, in that case we probably should not have bothered even setting up the PDF stream.")

 
@@ -166,9 +169,11 @@
 
     (* ;; "We have to back up to the ordinary POSTSCRIPT close, so that we don't loop through here")

 
-    (replace
 (STREAM IMAGEOPS) of
 PSSTREAM with
 \POSTSCRIPTIMAGEOPS)
-    (PDF-CONVERT
 (CLOSEF PSSTREAM)
-           (fetch
 (\POSTSCRIPTDATA POSTSCRIPTTARGETINFO) of
 (fetch
 (STREAM IMAGEDATA) of
 PSSTREAM])
+    (CL:WHEN (EQ \PDFIMAGEOPS (fetch
 (STREAM IMAGEOPS) of
 PSSTREAM))
+        (replace
 (STREAM IMAGEOPS) of
 PSSTREAM with
 \POSTSCRIPTIMAGEOPS)
+        (PDF-CONVERT
 (CLOSEF PSSTREAM)
+               (fetch
 (\POSTSCRIPTDATA POSTSCRIPTTARGETINFO) of
 (fetch
 (STREAM IMAGEDATA)
+                                                                   of
 PSSTREAM))))])
 
 (PDF-CONVERT

   [LAMBDA (PSTMPFILENAME TARGETPDFNAME DONTDELETE)
           (* ; "Edited 24-Jun-2023 15:01 by rmk")


@@ -225,7 +230,7 @@
 
 (PDF-INIT
)
 (DECLARE%: DONTCOPY
-  (FILEMAP (NIL (2668 5002 (PDFFILEP 2678 . 3592) (PDF.HARDCOPYW 3594 . 4021) (PDF.TEXT 4023 . 4631) (
-PDF.TEDIT 4633 . 5000)) (5428 12632 (PDF-INIT 5438 . 6163) (OPEN-PDF-STREAM 6165 . 8268) (
-CLOSE-PDF-STREAM 8270 . 9185) (PDF-CONVERT 9187 . 12630)))))
+  (FILEMAP (NIL (2710 5044 (PDFFILEP 2720 . 3634) (PDF.HARDCOPYW 3636 . 4063) (PDF.TEXT 4065 . 4673) (
+PDF.TEDIT 4675 . 5042)) (5470 12943 (PDF-INIT 5480 . 6205) (OPEN-PDF-STREAM 6207 . 8310) (
+CLOSE-PDF-STREAM 8312 . 9496) (PDF-CONVERT 9498 . 12941)))))
 STOP