texlive[63017] Build/source/texk/web2c/pdftexdir: write forms after

[commits+karl at tug.org]

Revision: 63017
          http://tug.org/svn/texlive?view=revision&revision=63017
Author:   karl
Date:     2022-04-13 02:36:11 +0200 (Wed, 13 Apr 2022)
Log Message:
-----------
write forms after images, to avoid recursive clobbering

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
    trunk/Build/source/texk/web2c/pdftexdir/pdftex.web

Modified: trunk/Build/source/texk/web2c/pdftexdir/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2022-04-12 23:48:39 UTC (rev 63016)
+++ trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2022-04-13 00:36:11 UTC (rev 63017)
@@ -1,3 +1,10 @@
+2022-04-12  Marcel Kr\"uger  <tex at 2krueger.de>
+
+	* pdftex.web (Write out resource list): Write forms last,
+	to avoid recursive xforms clobbering |pdfpagegroupval|.
+	https://tug.org/pipermail/pdftex/2022-April/009276.html
+	https://tug.org/pipermail/pdftex/2022-April/009280.html
+
 2022-03-21  Karl Berry  <karl at tug.org>
 
 	* TL'22 release.

Modified: trunk/Build/source/texk/web2c/pdftexdir/pdftex.web
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/pdftex.web	2022-04-12 23:48:39 UTC (rev 63016)
+++ trunk/Build/source/texk/web2c/pdftexdir/pdftex.web	2022-04-13 00:36:11 UTC (rev 63017)
@@ -1,4 +1,4 @@
-% Copyright 1996-2021 Han Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh,
+% Copyright 1996-2022 Han Th\^e\llap{\raise 0.5ex\hbox{\'{}}} Th\`anh,
 % <thanh@@pdftex.org>
 
 % This file is part of pdfTeX.
@@ -19166,10 +19166,14 @@
 pdfshipoutend(shipping_page);
 pdf_end_stream
 
-@ @<Write out resource lists@>=
+@ We need to write forms last, since the recursive call to |ship_out|
+would reset global state such as |pdfpagegroupval|, which is needed
+while writing images.
+
+@<Write out resource lists@>=
 @<Write out pending raw objects@>;
-@<Write out pending forms@>;
-@<Write out pending images@>
+@<Write out pending images@>;
+@<Write out pending forms@>
 
 @ @<Write out resources dictionary@>=
 pdf_begin_dict(pdf_last_resources, 1);