summaryrefslogtreecommitdiff
path: root/Build/source/texk/web2c
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-03-20 22:37:12 +0000
committerKarl Berry <karl@freefriends.org>2018-03-20 22:37:12 +0000
commitfee6f3609ee8ecf3233151f9c7962ce65b7223a2 (patch)
tree414bc83561d8706824e20fbbb1ce50ef6caf9493 /Build/source/texk/web2c
parent65d009a0596b194597f47531523addd3e64ed005 (diff)
handle nested xforms
git-svn-id: svn://tug.org/texlive/trunk@47051 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Build/source/texk/web2c')
-rw-r--r--Build/source/texk/web2c/pdftexdir/ChangeLog7
-rw-r--r--Build/source/texk/web2c/pdftexdir/pdftex.web5
2 files changed, 12 insertions, 0 deletions
diff --git a/Build/source/texk/web2c/pdftexdir/ChangeLog b/Build/source/texk/web2c/pdftexdir/ChangeLog
index 7b6b189e1a3..0b211a4b44c 100644
--- a/Build/source/texk/web2c/pdftexdir/ChangeLog
+++ b/Build/source/texk/web2c/pdftexdir/ChangeLog
@@ -1,3 +1,10 @@
+2018-03-20 Hans Hagen <pragma@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@fuk.kindai.ac.jp>
* pdftex.web: pdftex_revision=="19".
diff --git a/Build/source/texk/web2c/pdftexdir/pdftex.web b/Build/source/texk/web2c/pdftexdir/pdftex.web
index e570526488e..86bd827890e 100644
--- a/Build/source/texk/web2c/pdftexdir/pdftex.web
+++ b/Build/source/texk/web2c/pdftexdir/pdftex.web
@@ -19310,6 +19310,9 @@ if pdf_obj_list <> null then begin
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 @@ if pdf_xform_list <> null then begin
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);