[latex3-commits] [git/LaTeX3-latex3-pdfresources] splitting: adapt test to new active boolean (545dd6b)
Ulrike Fischer
fischer at troubleshooting-tex.de
Mon Jul 6 00:35:33 CEST 2020
Repository : https://github.com/latex3/pdfresources
On branch : splitting
Link : https://github.com/latex3/pdfresources/commit/545dd6b7bdbba619ade69de729ec27c8cdac7e5e
>---------------------------------------------------------------
commit 545dd6b7bdbba619ade69de729ec27c8cdac7e5e
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Jul 6 00:35:33 2020 +0200
adapt test to new active boolean
>---------------------------------------------------------------
545dd6b7bdbba619ade69de729ec27c8cdac7e5e
l3pdfcoredict.dtx | 26 +++++++++++++++++++-------
pdfresources.dtx | 19 +++++++++++++++----
testfiles-dvips/annot.pvt | 4 +++-
testfiles-dvips/bdc-properties.pvt | 4 +++-
testfiles-dvips/ismap.pvt | 3 ++-
testfiles-dvips/pagelabels.pvt | 6 +++---
testfiles-dvips/pdffilelink.pvt | 8 ++------
testfiles-luatex/non-ascii-links.pvt | 3 ++-
testfiles-noxetex/calculationsortorder.pvt | 7 ++-----
testfiles-noxetex/extgstate-patches.pvt | 1 +
testfiles-noxetex/metadata.pvt | 5 +++--
testfiles-noxetex/pgfpatches.pvt | 2 +-
testfiles-noxetex/transparent-tikz.pvt | 1 +
testfiles/annot-last.lvt | 1 +
testfiles/bdc-properties.pvt | 5 +++--
testfiles/dict_if_empty.lvt | 3 ++-
testfiles/dict_if_empty.xetex.tlg | 2 +-
testfiles/infodict-new.pvt | 6 ++----
testfiles/infodict.pvt | 11 +++--------
testfiles/ismap.pvt | 3 ++-
testfiles/mixpageattr.pvt | 1 +
testfiles/ocgcolorlinks.pvt | 3 ++-
testfiles/pageattr.pvt | 1 +
testfiles/pagelabels-log.lvt | 3 ++-
testfiles/pagelabels-log.xetex.tlg | 2 +-
testfiles/pagelabels.pvt | 5 ++---
testfiles/pagesattr.pvt | 3 ++-
testfiles/pdffilelink.pvt | 3 ++-
testfiles/show.lvt | 4 +++-
testfiles/show.xetex.tlg | 2 +-
testfiles/thispageattr.pvt | 4 ++--
testfiles/transition.pvt | 7 ++-----
testfiles/version-compare.lvt | 3 ++-
testfiles/version-compare.xetex.tlg | 2 +-
testfiles/xform.pvt | 3 ++-
35 files changed, 97 insertions(+), 69 deletions(-)
diff --git a/l3pdfcoredict.dtx b/l3pdfcoredict.dtx
index 76740d7..339e58b 100644
--- a/l3pdfcoredict.dtx
+++ b/l3pdfcoredict.dtx
@@ -539,20 +539,29 @@
% \begin{macrocode}
\hook_gput_code:nnn {pdf/coredict/thispage_shipout} {pdf}
{
- \exp_args:NV \__pdf_backend_ThisPage_gpush:n { \g_shipout_readonly_int }
- \exp_args:NV \__pdf_backend_PageResources_gpush:n { \g_shipout_readonly_int }
+ \bool_if:NT \g__pdf_Core_active_bool
+ {
+ \exp_args:NV \__pdf_backend_ThisPage_gpush:n { \g_shipout_readonly_int }
+ \exp_args:NV \__pdf_backend_PageResources_gpush:n { \g_shipout_readonly_int }
+ }
}
\hook_gput_code:nnn {pdf/coredict/lastpage_shipout} {pdf}
{
- \__pdf_backend_PageResources_obj_gpush: %ExtGState etc
+ \bool_if:NT \g__pdf_Core_active_bool
+ {
+ \__pdf_backend_PageResources_obj_gpush: %ExtGState etc
+ }
}
\hook_gput_code:nnn {pdf/coredict/end_run} {pdf}
{
- \__pdfcoredict_Pages_gpush: %pagesattr
- \__pdfcoredict_Info_gpush: %pdfinfo
- \__pdfcoredict_Catalog_gpush:
+ \bool_if:NT \g__pdf_Core_active_bool
+ {
+ \__pdfcoredict_Pages_gpush: %pagesattr
+ \__pdfcoredict_Info_gpush: %pdfinfo
+ \__pdfcoredict_Catalog_gpush:
+ }
}
% \end{macrocode}
% \subsection{Internal dictionary Code}
@@ -779,7 +788,10 @@
\cs_new_protected:cpn { @@_handler/ThisPage/?_gput:nn } #1 #2
{
\prop_gput:cnn { \pdfdict_gname:n { Core/ThisPage } }{ #1 } { #2 }
- \__pdf_backend_ThisPage_gput:nn { #1 }{ #2 }
+ \bool_if:NT \g__pdf_Core_active_bool
+ {
+ \__pdf_backend_ThisPage_gput:nn { #1 }{ #2 }
+ }
}
\cs_new_protected:cpn { @@_handler/ThisPage/?_gremove:n } #1
diff --git a/pdfresources.dtx b/pdfresources.dtx
index 0234cbb..9384984 100644
--- a/pdfresources.dtx
+++ b/pdfresources.dtx
@@ -98,7 +98,7 @@
%<*package>
\bool_new:N \g_@@_Core_active_bool
% temporarly
-\bool_gset_true:N \g_@@_Core_active_bool
+%\bool_gset_true:N \g_@@_Core_active_bool
%</package>
% \end{macrocode}
% \end{variable}
@@ -1325,10 +1325,21 @@
\@@_patch_pgfcolorspaces:w ##1\q_stop
}
}
-\def\pgfutil at setuppdfresources{\@@_pgf_sys_setuppdfresources_plain:}
+\cs_set_eq:NN \@@_pgfori_pgfutil at setuppdfresources\pgfutil at setuppdfresources
+\def\pgfutil at setuppdfresources
+ {
+ \bool_if:NTF \g_@@_Core_active_bool
+ {
+ \@@_pgf_sys_setuppdfresources_plain:
+ }
+ {
+ \@@_pgfori_pgfutil at setuppdfresources
+ }
+ }
+
+% Why on earth do I explicitly call the command? Doesn't pgf do it?
+%\hook_gput_code:nnn {begindocument/end} {pdf} { \pgfutil at setuppdfresources }
-%label??
-\hook_gput_code:nnn {begindocument/end} {pdf} { \pgfutil at setuppdfresources }
%\AtEndPreamble{\pgfutil at setuppdfresources}
% helper commands as pgf doesn't pass resources as two arguments
% code to add to the resources existing stuff in the format "/name value":
diff --git a/testfiles-dvips/annot.pvt b/testfiles-dvips/annot.pvt
index 17be347..e225b1b 100644
--- a/testfiles-dvips/annot.pvt
+++ b/testfiles-dvips/annot.pvt
@@ -1,6 +1,8 @@
\input{regression-test}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
+
\documentclass{article}
-\usepackage{pdfresources}
\ExplSyntaxOn
%%% for reproducible tests:
\pdfcoredict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
diff --git a/testfiles-dvips/bdc-properties.pvt b/testfiles-dvips/bdc-properties.pvt
index 72abec2..6a77b65 100644
--- a/testfiles-dvips/bdc-properties.pvt
+++ b/testfiles-dvips/bdc-properties.pvt
@@ -1,6 +1,8 @@
\input{regression-test}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
+
\documentclass{article}
-\usepackage{l3pdf,pdfresources}
\ExplSyntaxOn
%%% for reproducible tests:
\pdfcoredict_gput:nnn {Info}{CreationDate}{(D:20200202111111+01'00')}
diff --git a/testfiles-dvips/ismap.pvt b/testfiles-dvips/ismap.pvt
index c4721aa..71113e5 100644
--- a/testfiles-dvips/ismap.pvt
+++ b/testfiles-dvips/ismap.pvt
@@ -1,5 +1,6 @@
\input{regression-test}
-\RequirePackage{lthooks}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{report}
\usepackage[customdriver=hgeneric-experimental]{hyperref}
diff --git a/testfiles-dvips/pagelabels.pvt b/testfiles-dvips/pagelabels.pvt
index 393a2d2..e5f22d5 100644
--- a/testfiles-dvips/pagelabels.pvt
+++ b/testfiles-dvips/pagelabels.pvt
@@ -1,10 +1,10 @@
\input{regression-test}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
+
\documentclass{article}
-\usepackage{l3pdf}
\ExplSyntaxOn
-\usepackage{pdfresources}
\sys_if_engine_pdftex:T {\usepackage[LGR]{fontenc}}
-\pdf_uncompress:
\ExplSyntaxOff
\usepackage[pdfpagelabels=true,customdriver=hgeneric-experimental
]{hyperref}
diff --git a/testfiles-dvips/pdffilelink.pvt b/testfiles-dvips/pdffilelink.pvt
index c3f821e..343791b 100644
--- a/testfiles-dvips/pdffilelink.pvt
+++ b/testfiles-dvips/pdffilelink.pvt
@@ -1,11 +1,7 @@
\input{regression-test}
-\RequirePackage{lthooks}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{article}
-
-\usepackage{l3pdf}
-\ExplSyntaxOn
-\pdf_uncompress:
-\ExplSyntaxOff
\usepackage[customdriver=hgeneric-experimental]{hyperref}
\begin{document}
diff --git a/testfiles-luatex/non-ascii-links.pvt b/testfiles-luatex/non-ascii-links.pvt
index 1fd57a9..3f4761e 100644
--- a/testfiles-luatex/non-ascii-links.pvt
+++ b/testfiles-luatex/non-ascii-links.pvt
@@ -1,5 +1,6 @@
\input{regression-test}
-\RequirePackage{lthooks}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{article}
\usepackage[customdriver=hgeneric-experimental]{hyperref}
diff --git a/testfiles-noxetex/calculationsortorder.pvt b/testfiles-noxetex/calculationsortorder.pvt
index ace50dd..24d10a5 100644
--- a/testfiles-noxetex/calculationsortorder.pvt
+++ b/testfiles-noxetex/calculationsortorder.pvt
@@ -2,12 +2,9 @@
% ok for pdftex and luatex. Perhaps some changes to avoid a two pass are possible/needed
% fails with xetex because of the missing \pdf_link_last:
\input{regression-test}
-\RequirePackage{lthooks}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{article}
-\usepackage{l3pdf}
-\ExplSyntaxOn
-\pdf_uncompress:
-\ExplSyntaxOff
\usepackage[customdriver=hgeneric-experimental]
{hyperref}
\begin{document}
diff --git a/testfiles-noxetex/extgstate-patches.pvt b/testfiles-noxetex/extgstate-patches.pvt
index 9c551eb..a8e3d2d 100644
--- a/testfiles-noxetex/extgstate-patches.pvt
+++ b/testfiles-noxetex/extgstate-patches.pvt
@@ -6,6 +6,7 @@
% but nothing harmful
\RequirePackage[enable-debug,check-declarations]{expl3}
\RequirePackage[patches]{pdfresources}
+\DeclareDocumentMetaData { }
\input{regression-test}
\documentclass{article}
diff --git a/testfiles-noxetex/metadata.pvt b/testfiles-noxetex/metadata.pvt
index 530fc2d..5a067af 100644
--- a/testfiles-noxetex/metadata.pvt
+++ b/testfiles-noxetex/metadata.pvt
@@ -1,7 +1,8 @@
\input{regression-test}
-\documentclass{article}
\PassOptionsToPackage{debug}{pdfresources}
-\usepackage{pdfresources}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
+\documentclass{article}
\usepackage{hyperxmp,lipsum}
diff --git a/testfiles-noxetex/pgfpatches.pvt b/testfiles-noxetex/pgfpatches.pvt
index bbe4601..ebf6f6b 100644
--- a/testfiles-noxetex/pgfpatches.pvt
+++ b/testfiles-noxetex/pgfpatches.pvt
@@ -1,7 +1,7 @@
\input{regression-test}
\PassOptionsToPackage{enable-debug,check-declarations}{expl3}
\RequirePackage[debug,patches]{pdfresources}
-
+\DeclareDocumentMetaData { }
\documentclass{article}
\usepackage{tikz}
\usetikzlibrary{patterns}
diff --git a/testfiles-noxetex/transparent-tikz.pvt b/testfiles-noxetex/transparent-tikz.pvt
index 34f20b4..6afe7b0 100644
--- a/testfiles-noxetex/transparent-tikz.pvt
+++ b/testfiles-noxetex/transparent-tikz.pvt
@@ -2,6 +2,7 @@
\input{regression-test}
\RequirePackage[enable-debug,check-declarations]{expl3}
\RequirePackage[patches]{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{article}
\usepackage{new-transparent}
\usepackage{tikz}
diff --git a/testfiles/annot-last.lvt b/testfiles/annot-last.lvt
index 42b1143..3484980 100644
--- a/testfiles/annot-last.lvt
+++ b/testfiles/annot-last.lvt
@@ -1,5 +1,6 @@
\input{regression-test}
\RequirePackage{pdfresources}
+\DeclareDocumentMetaData {}
\documentclass{article}
\begin{document}
diff --git a/testfiles/bdc-properties.pvt b/testfiles/bdc-properties.pvt
index e29091a..d7bfea2 100644
--- a/testfiles/bdc-properties.pvt
+++ b/testfiles/bdc-properties.pvt
@@ -1,7 +1,8 @@
\input{regression-test}
-\documentclass{article}
-\usepackage{l3pdf,pdfresources}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData {}
+\documentclass{article}
\begin{document}
\ExplSyntaxOn
diff --git a/testfiles/dict_if_empty.lvt b/testfiles/dict_if_empty.lvt
index 2e03282..3fd934d 100644
--- a/testfiles/dict_if_empty.lvt
+++ b/testfiles/dict_if_empty.lvt
@@ -1,6 +1,7 @@
\input{regression-test}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{article}
-\usepackage{pdfresources}
\begin{document}\START
\showoutput
diff --git a/testfiles/dict_if_empty.xetex.tlg b/testfiles/dict_if_empty.xetex.tlg
index 08ce303..525b2ef 100644
--- a/testfiles/dict_if_empty.xetex.tlg
+++ b/testfiles/dict_if_empty.xetex.tlg
@@ -17,11 +17,11 @@ Completed box being shipped out [1]
..\glue 25.0
..\glue(\lineskip) 0.0
..\vbox(550.0+0.0)x345.0, glue set 491.94745fil
-...\write-{}
...\special{pdf:obj @pdf.obj1 << >>}
...\special{pdf:obj @pdf.obj2 << >>}
...\special{pdf:obj @pdf.obj3 << >>}
...\special{pdf:obj @pdf.obj4 << >>}
+...\write-{}
...\glue(\topskip) 3.85
...\hbox(6.15+2.04999)x345.0, glue set 288.33fil
....\hbox(0.0+0.0)x15.0
diff --git a/testfiles/infodict-new.pvt b/testfiles/infodict-new.pvt
index d83ecec..ee1063c 100644
--- a/testfiles/infodict-new.pvt
+++ b/testfiles/infodict-new.pvt
@@ -1,8 +1,6 @@
\input{regression-test}
-\RequirePackage{l3pdf,lthooks}
-\ExplSyntaxOn
-\pdf_version_gset:n{1.7}
-\ExplSyntaxOff
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { pdfversion=1.7 }
\documentclass{article}
\usepackage[customdriver=hgeneric-experimental]{hyperref}
diff --git a/testfiles/infodict.pvt b/testfiles/infodict.pvt
index a1e9627..74f0242 100644
--- a/testfiles/infodict.pvt
+++ b/testfiles/infodict.pvt
@@ -1,16 +1,11 @@
\PassOptionsToPackage{enable-debug,check-declarations}{expl3}
\RequirePackage[debug]{pdfresources}
+\DeclareDocumentMetaData { }
\input{regression-test}
\documentclass{article}
\ExplSyntaxOn
-\sys_if_engine_pdftex:TF
-{
- \str_set_convert:Nnnn \l_tmpa_str { Grüße }{ utf8 } {utf16/string}
-}
-{
- \str_set_convert:Nnnn \l_tmpa_str { Grüße }{ } {utf16/string}
-}
-\pdfcoredict_gput:nnx {Info} {Title}{(\l_tmpa_str)}
+\pdf_text_convert:nnN {string-lit-print}{Grüße}\l_tmpa_str
+\pdfcoredict_gput:nnx {Info} {Title}{\l_tmpa_str}
\pdfcoredict_gput:nnx {Info} {Author}{(Some~Author)}
\ExplSyntaxOff
\begin{document}
diff --git a/testfiles/ismap.pvt b/testfiles/ismap.pvt
index 99d1aa8..aa14559 100644
--- a/testfiles/ismap.pvt
+++ b/testfiles/ismap.pvt
@@ -1,5 +1,6 @@
\input{regression-test}
-\RequirePackage{lthooks}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{report}
\usepackage[customdriver=hgeneric-experimental]{hyperref}
diff --git a/testfiles/mixpageattr.pvt b/testfiles/mixpageattr.pvt
index 7ed4bcb..6260299 100644
--- a/testfiles/mixpageattr.pvt
+++ b/testfiles/mixpageattr.pvt
@@ -1,5 +1,6 @@
\PassOptionsToPackage{enable-debug,check-declarations}{expl3}
\RequirePackage[debug]{pdfresources}
+\DeclareDocumentMetaData { }
\input{regression-test}
\documentclass{article}
\usepackage{fancyhdr,zref-user}
diff --git a/testfiles/ocgcolorlinks.pvt b/testfiles/ocgcolorlinks.pvt
index 9702da9..c0e59b1 100644
--- a/testfiles/ocgcolorlinks.pvt
+++ b/testfiles/ocgcolorlinks.pvt
@@ -1,5 +1,6 @@
\input{regression-test}
-\RequirePackage{lthooks}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{article}
\usepackage{xcolor}
\usepackage[verbose,ocgcolorlinks,customdriver=hgeneric-experimental]
diff --git a/testfiles/pageattr.pvt b/testfiles/pageattr.pvt
index a8b859b..2fd3a2e 100644
--- a/testfiles/pageattr.pvt
+++ b/testfiles/pageattr.pvt
@@ -1,5 +1,6 @@
\PassOptionsToPackage{enable-debug,check-declarations}{expl3}
\RequirePackage[debug]{pdfresources}
+\DeclareDocumentMetaData { }
\input{regression-test}
\documentclass{article}
\begin{document}
diff --git a/testfiles/pagelabels-log.lvt b/testfiles/pagelabels-log.lvt
index 0ed79a6..4846d4b 100644
--- a/testfiles/pagelabels-log.lvt
+++ b/testfiles/pagelabels-log.lvt
@@ -1,5 +1,6 @@
\input{regression-test}
-\RequirePackage{lthooks}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{article}
\usepackage{l3pdf}
\ExplSyntaxOn
diff --git a/testfiles/pagelabels-log.xetex.tlg b/testfiles/pagelabels-log.xetex.tlg
index 6796c63..21fe964 100644
--- a/testfiles/pagelabels-log.xetex.tlg
+++ b/testfiles/pagelabels-log.xetex.tlg
@@ -35,11 +35,11 @@ Completed box being shipped out [1]
...\glue 25.0
...\glue(\lineskip) 0.0
...\vbox(550.0+0.0)x345.0, glue set 539.94232fil
-....\write-{}
....\special{pdf:obj @pdf.obj1 << >>}
....\special{pdf:obj @pdf.obj2 << >>}
....\special{pdf:obj @pdf.obj3 << >>}
....\special{pdf:obj @pdf.obj4 << >>}
+....\write-{}
....\special{pdf:dest (Doc-Start)[@thispage/XYZ @xpos @ypos null]}
....\glue(\topskip) 3.06
....\hbox(6.94+0.10999)x345.0, glue set 314.72fil
diff --git a/testfiles/pagelabels.pvt b/testfiles/pagelabels.pvt
index 92905a2..492ae3f 100644
--- a/testfiles/pagelabels.pvt
+++ b/testfiles/pagelabels.pvt
@@ -1,10 +1,9 @@
\input{regression-test}
-\RequirePackage{lthooks}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{article}
-\usepackage{l3pdf}
\ExplSyntaxOn
\sys_if_engine_pdftex:T {\usepackage[LGR]{fontenc}}
-\pdf_uncompress:
\ExplSyntaxOff
\usepackage[pdfpagelabels=true,customdriver=hgeneric-experimental
]{hyperref}
diff --git a/testfiles/pagesattr.pvt b/testfiles/pagesattr.pvt
index bd14411..efa1238 100644
--- a/testfiles/pagesattr.pvt
+++ b/testfiles/pagesattr.pvt
@@ -1,6 +1,7 @@
\PassOptionsToPackage{enable-debug,check-declarations}{expl3}
-\RequirePackage[debug]{pdfresources}
\input{regression-test}
+\RequirePackage[debug]{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{article}
\begin{document}
\START
diff --git a/testfiles/pdffilelink.pvt b/testfiles/pdffilelink.pvt
index b07c445..614f963 100644
--- a/testfiles/pdffilelink.pvt
+++ b/testfiles/pdffilelink.pvt
@@ -1,5 +1,6 @@
\input{regression-test}
-\RequirePackage{lthooks}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{article}
\usepackage{l3pdf}
diff --git a/testfiles/show.lvt b/testfiles/show.lvt
index e3f2968..7136b53 100644
--- a/testfiles/show.lvt
+++ b/testfiles/show.lvt
@@ -1,6 +1,8 @@
\input{regression-test}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData {}
\documentclass{article}
-\usepackage{pdfresources}
+
\usepackage[customdriver=hgeneric-experimental]{hyperref}
\begin{document}
\START
diff --git a/testfiles/show.xetex.tlg b/testfiles/show.xetex.tlg
index 3eeb83d..07dbde6 100644
--- a/testfiles/show.xetex.tlg
+++ b/testfiles/show.xetex.tlg
@@ -65,11 +65,11 @@ Completed box being shipped out [1]
...\glue 25.0
...\glue(\lineskip) 0.0
...\vbox(550.0+0.0)x345.0, glue set 539.94232fil
-....\write-{}
....\special{pdf:obj @pdf.obj1 << >>}
....\special{pdf:obj @pdf.obj2 << >>}
....\special{pdf:obj @pdf.obj3 << >>}
....\special{pdf:obj @pdf.obj4 << >>}
+....\write-{}
....\special{pdf:dest (Doc-Start)[@thispage/XYZ @xpos @ypos null]}
....\glue(\topskip) 2.95
....\hbox(7.05+0.10999)x345.0, glue set 267.95999fil
diff --git a/testfiles/thispageattr.pvt b/testfiles/thispageattr.pvt
index 7e91509..1bf9065 100644
--- a/testfiles/thispageattr.pvt
+++ b/testfiles/thispageattr.pvt
@@ -1,7 +1,7 @@
\input{regression-test}
-\documentclass{article}
\RequirePackage{pdfresources}
-\usepackage{l3pdf}
+\DeclareDocumentMetaData { }
+\documentclass{article}
\usepackage{zref-user}
\ExplSyntaxOn
\pdf_uncompress:
diff --git a/testfiles/transition.pvt b/testfiles/transition.pvt
index 2593d1d..c645e05 100644
--- a/testfiles/transition.pvt
+++ b/testfiles/transition.pvt
@@ -1,9 +1,6 @@
\input{regression-test}
-\RequirePackage{l3pdf,lthooks}
-\ExplSyntaxOn
-\pdf_uncompress:
-\pdf_version_gset:n{1.7}
-\ExplSyntaxOff
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { pdfversion=1.7 }
\documentclass{article}
\usepackage{lipsum}
diff --git a/testfiles/version-compare.lvt b/testfiles/version-compare.lvt
index 6a825fe..fc50d49 100644
--- a/testfiles/version-compare.lvt
+++ b/testfiles/version-compare.lvt
@@ -1,7 +1,8 @@
\input{regression-test}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{article}
-\usepackage{pdfresources}
\begin{document}\START\showoutput
\ExplSyntaxOn
diff --git a/testfiles/version-compare.xetex.tlg b/testfiles/version-compare.xetex.tlg
index 518d7ac..fd3ea8c 100644
--- a/testfiles/version-compare.xetex.tlg
+++ b/testfiles/version-compare.xetex.tlg
@@ -21,11 +21,11 @@ Completed box being shipped out [1]
..\glue 25.0
..\glue(\lineskip) 0.0
..\vbox(550.0+0.0)x345.0, glue set 467.95001fil
-...\write-{}
...\special{pdf:obj @pdf.obj1 << >>}
...\special{pdf:obj @pdf.obj2 << >>}
...\special{pdf:obj @pdf.obj3 << >>}
...\special{pdf:obj @pdf.obj4 << >>}
+...\write-{}
...\glue(\topskip) 3.23
...\hbox(6.77+0.39098)x345.0, glue set 284.4122fil
....\hbox(0.0+0.0)x15.0
diff --git a/testfiles/xform.pvt b/testfiles/xform.pvt
index 76c7be0..83fcd68 100644
--- a/testfiles/xform.pvt
+++ b/testfiles/xform.pvt
@@ -1,7 +1,8 @@
% !Mode:: "TeX:DE:UTF-8:Main"
\input{regression-test}
+\RequirePackage{pdfresources}
+\DeclareDocumentMetaData { }
\documentclass{article}
-\usepackage{pdfresources}
\begin{document}
\START
text
More information about the latex3-commits
mailing list.