texlive[47051] Build/source/texk/web2c/pdftexdir: handle nested

[commits+karl at tug.org]

Revision: 47051
          http://tug.org/svn/texlive?view=revision&revision=47051
Author:   karl
Date:     2018-03-20 23:37:12 +0100 (Tue, 20 Mar 2018)
Log Message:
-----------
handle nested xforms

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	2018-03-20 22:10:59 UTC (rev 47050)
+++ trunk/Build/source/texk/web2c/pdftexdir/ChangeLog	2018-03-20 22:37:12 UTC (rev 47051)
@@ -1,3 +1,10 @@
+2018-03-20  Hans Hagen  <pragma at wxs.nl>
+
+	* pdftex.web (Glob...): defined saved_pdf_cur_form.
+	(Write out pending forms): save and restore the form.
+	Original report from Alexander Grahn,
+	http://tug.org/pipermail/tex-live/2018-March/041210.html.
+
 2018-03-06  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* pdftex.web: pdftex_revision=="19".

Modified: trunk/Build/source/texk/web2c/pdftexdir/pdftex.web
===================================================================
--- trunk/Build/source/texk/web2c/pdftexdir/pdftex.web	2018-03-20 22:10:59 UTC (rev 47050)
+++ trunk/Build/source/texk/web2c/pdftexdir/pdftex.web	2018-03-20 22:37:12 UTC (rev 47051)
@@ -19310,6 +19310,9 @@
     end;
 end
 
+@ @<Glob...@>=
+@!saved_pdf_cur_form: integer;
+
 @ When flushing pending forms we need to save and restore resource lists
   (|pdf_font_list|, |pdf_obj_list|, |pdf_xform_list| and |pdf_ximage_list|),
   which are also used by page shipping.
@@ -19319,10 +19322,12 @@
     k := pdf_xform_list;
     while k <> null do begin
         if not is_obj_written(info(k)) then begin
+            saved_pdf_cur_form := pdf_cur_form;
             pdf_cur_form := info(k);
             @<Save resource lists@>;
             @<Reset resource lists@>;
             pdf_ship_out(obj_xform_box(pdf_cur_form), false);
+            pdf_cur_form := saved_pdf_cur_form;
             @<Restore resource lists@>;
         end;
         k := link(k);