diff --git a/l3backend-testphase.dtx b/l3backend-testphase.dtx index 29346ee5..1f409021 100644 --- a/l3backend-testphase.dtx +++ b/l3backend-testphase.dtx @@ -1282,8 +1282,11 @@ % the link. We add here backend support for this. % \begin{macrocode} %<*drivers> -\cs_new_protected:Npn \@@_backend_link_off:{} -\cs_new_protected:Npn \@@_backend_link_on: {} +\cs_if_free:NT \@@_backend_link_off: + { + \cs_new_protected:Npn \@@_backend_link_off:{} + \cs_new_protected:Npn \@@_backend_link_on: {} + } % %<*pdftex> \cs_if_exist:NT \pdfrunninglinkoff diff --git a/l3pdfannot.dtx b/l3pdfannot.dtx index 0b972eb1..b8c70a9e 100644 --- a/l3pdfannot.dtx +++ b/l3pdfannot.dtx @@ -612,8 +612,11 @@ % % \subsection{Interruption of links} % \begin{macrocode} -\cs_new_protected:Nn \pdfannot_link_off: { \__pdf_backend_link_off: } -\cs_new_protected:Nn \pdfannot_link_on: { \__pdf_backend_link_on: } +\cs_if_free:NT \pdfannot_link_off: + { + \cs_new_protected:Nn \pdfannot_link_off: { \__pdf_backend_link_off: } + \cs_new_protected:Nn \pdfannot_link_on: { \__pdf_backend_link_on: } + } % \end{macrocode} % % diff --git a/testfiles-dvips/structure-destination.tpf b/testfiles-dvips/structure-destination.tpf index d043a876..9fb68b41 100644 Binary files a/testfiles-dvips/structure-destination.tpf and b/testfiles-dvips/structure-destination.tpf differ diff --git a/testfiles-luatex/fontspec-spotcolor.tpf b/testfiles-luatex/fontspec-spotcolor.tpf index 3b47589f..d70220d5 100644 --- a/testfiles-luatex/fontspec-spotcolor.tpf +++ b/testfiles-luatex/fontspec-spotcolor.tpf @@ -241,7 +241,7 @@ stream endstream endobj 10 0 obj -<< /Length 590 >> +<< /Length 582 >> stream /opacity1 gs 0 g 0 G @@ -251,7 +251,6 @@ stream BT /F27 9.96264 Tf 1 0 0 1 148.712 657.235 Tm [<006900690069>]TJ -0 g 0 G /color1 cs 1.0 scn /color1 CS 1.0 SCN /opacity0.196 gs /F48 9.96264 Tf @@ -469,42 +468,42 @@ endobj xref 0 35 0000000003 65535 f -0000012846 00000 n -0000012930 00000 n +0000012838 00000 n +0000012922 00000 n 0000000004 00000 f 0000000000 00000 f 0000000020 00000 n 0000000104 00000 n 0000000172 00000 n -0000012719 00000 n -0000012611 00000 n +0000012711 00000 n +0000012603 00000 n 0000011961 00000 n -0000019683 00000 n -0000017249 00000 n -0000015104 00000 n -0000020045 00000 n -0000012966 00000 n -0000014065 00000 n -0000013019 00000 n -0000013085 00000 n -0000014304 00000 n -0000015262 00000 n -0000015466 00000 n -0000016243 00000 n -0000015497 00000 n -0000015567 00000 n -0000016482 00000 n -0000017406 00000 n -0000017609 00000 n -0000018643 00000 n -0000017664 00000 n -0000017739 00000 n -0000018883 00000 n -0000019841 00000 n -0000020106 00000 n -0000020183 00000 n +0000019675 00000 n +0000017241 00000 n +0000015096 00000 n +0000020037 00000 n +0000012958 00000 n +0000014057 00000 n +0000013011 00000 n +0000013077 00000 n +0000014296 00000 n +0000015254 00000 n +0000015458 00000 n +0000016235 00000 n +0000015489 00000 n +0000015559 00000 n +0000016474 00000 n +0000017398 00000 n +0000017601 00000 n +0000018635 00000 n +0000017656 00000 n +0000017731 00000 n +0000018875 00000 n +0000019833 00000 n +0000020098 00000 n +0000020175 00000 n trailer << /Size 35 /Root 33 0 R /Info 34 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >> startxref -20315 +20307 %%EOF diff --git a/testfiles-luatex/structure-destination.tpf b/testfiles-luatex/structure-destination.tpf index 0f86e96d..2da5777c 100644 --- a/testfiles-luatex/structure-destination.tpf +++ b/testfiles-luatex/structure-destination.tpf @@ -342,13 +342,13 @@ endobj << /title [/Title 11 0 R] /part [/Title 11 0 R] /section [/H1 11 0 R] /subsection [/H2 11 0 R] /subsubsection [/H3 11 0 R] /paragraph [/H4 11 0 R] /subparagraph [/H5 11 0 R] /list [/L 11 0 R] /itemize [/L 11 0 R] /enumerate [/L 11 0 R] /description [/L 11 0 R] /quote [/BlockQuote 9 0 R] /quotation [/BlockQuote 9 0 R] /verbatim [/P 11 0 R] /item [/LI 11 0 R] /itemlabel [/Lbl 11 0 R] /itembody [/LBody 11 0 R] /footnote [/FENote 11 0 R] /footnotemark [/Lbl 11 0 R] /footnotelabel [/Lbl 11 0 R] /text-unit [/Part 11 0 R] /text [/P 11 0 R] /theorem-like [/Sect 11 0 R] /codeline [/Sub 11 0 R] /float [/Aside 11 0 R] /figures [/Sect 11 0 R] /tables [/Sect 11 0 R] >> endobj 15 0 obj -<< /Type /Namespace /NS (https://www.latex-project.org/ns/dflt/2022) /RoleMapNS 16 0 R >> +<< /Type /Namespace /NS (https://www.latex-project.org/ns/dflt) /RoleMapNS 16 0 R >> endobj 18 0 obj << /chapter [/H1 11 0 R] /section [/H2 11 0 R] /subsection [/H3 11 0 R] /subsubsection [/H4 11 0 R] /paragraph [/H5 11 0 R] /subparagraph [/H6 11 0 R] >> endobj 17 0 obj -<< /Type /Namespace /NS (https://www.latex-project.org/ns/book/2022) /RoleMapNS 18 0 R >> +<< /Type /Namespace /NS (https://www.latex-project.org/ns/book) /RoleMapNS 18 0 R >> endobj 19 0 obj << /Type /Namespace /NS (data:,A63761E-9D7-4FBB-9B27-C3BC8D9BFB06) >> @@ -466,10 +466,10 @@ xref 0000000003 00000 f 0000000004 00000 f 0000000010 00000 f -0000016593 00000 n +0000016583 00000 n 0000013492 00000 n 0000013764 00000 n -0000015716 00000 n +0000015706 00000 n 0000014343 00000 n 0000000012 00000 f 0000014411 00000 n @@ -478,18 +478,18 @@ xref 0000000020 00000 f 0000015244 00000 n 0000014562 00000 n -0000015522 00000 n -0000015351 00000 n -0000015629 00000 n +0000015517 00000 n +0000015346 00000 n +0000015619 00000 n 0000000000 00000 f 0000012492 00000 n -0000015777 00000 n -0000015890 00000 n -0000015989 00000 n -0000016111 00000 n -0000016231 00000 n -0000016330 00000 n -0000016462 00000 n +0000015767 00000 n +0000015880 00000 n +0000015979 00000 n +0000016101 00000 n +0000016221 00000 n +0000016320 00000 n +0000016452 00000 n 0000012676 00000 n 0000000020 00000 n 0000000074 00000 n @@ -499,25 +499,25 @@ xref 0000013064 00000 n 0000013116 00000 n 0000013178 00000 n -0000020111 00000 n +0000020101 00000 n 0000013231 00000 n 0000013293 00000 n -0000020465 00000 n +0000020455 00000 n 0000012649 00000 n 0000013456 00000 n 0000013565 00000 n 0000013727 00000 n -0000016713 00000 n -0000018969 00000 n -0000016872 00000 n -0000019190 00000 n -0000020265 00000 n -0000020527 00000 n -0000020650 00000 n -0000020686 00000 n -0000020926 00000 n +0000016703 00000 n +0000018959 00000 n +0000016862 00000 n +0000019180 00000 n +0000020255 00000 n +0000020517 00000 n +0000020640 00000 n +0000020676 00000 n +0000020916 00000 n trailer << /Size 55 /Root 53 0 R /Info 54 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >> startxref -21135 +21125 %%EOF diff --git a/testfiles-noxetex/metadata-newpage.tlg b/testfiles-noxetex/metadata-newpage.tlg index cd03a24f..407ee4c7 100644 --- a/testfiles-noxetex/metadata-newpage.tlg +++ b/testfiles-noxetex/metadata-newpage.tlg @@ -36,8 +36,6 @@ Completed box being shipped out [1] ...\glue 25.0 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, direction TLT -....\latelua0{ltx.__pdf.Page.Resources.ExtGState=true} -....\latelua0{ltx.pdf.Page_Resources_gpush(tex.count["g_shipout_readonly_int"])} ....\write-{} ....\pdfdest name{Doc-Start} xyz ....\glue(\topskip) 5.52 diff --git a/testfiles-pdftex/structure-destination.tpf b/testfiles-pdftex/structure-destination.tpf index 8a4b2554..5beba749 100644 --- a/testfiles-pdftex/structure-destination.tpf +++ b/testfiles-pdftex/structure-destination.tpf @@ -360,13 +360,13 @@ endobj << /title [/Title 11 0 R] /part [/Title 11 0 R] /section [/H1 11 0 R] /subsection [/H2 11 0 R] /subsubsection [/H3 11 0 R] /paragraph [/H4 11 0 R] /subparagraph [/H5 11 0 R] /list [/L 11 0 R] /itemize [/L 11 0 R] /enumerate [/L 11 0 R] /description [/L 11 0 R] /quote [/BlockQuote 9 0 R] /quotation [/BlockQuote 9 0 R] /verbatim [/P 11 0 R] /item [/LI 11 0 R] /itemlabel [/Lbl 11 0 R] /itembody [/LBody 11 0 R] /footnote [/FENote 11 0 R] /footnotemark [/Lbl 11 0 R] /footnotelabel [/Lbl 11 0 R] /text-unit [/Part 11 0 R] /text [/P 11 0 R] /theorem-like [/Sect 11 0 R] /codeline [/Sub 11 0 R] /float [/Aside 11 0 R] /figures [/Sect 11 0 R] /tables [/Sect 11 0 R] >> endobj 15 0 obj -<< /Type /Namespace /NS (https://www.latex-project.org/ns/dflt/2022) /RoleMapNS 16 0 R >> +<< /Type /Namespace /NS (https://www.latex-project.org/ns/dflt) /RoleMapNS 16 0 R >> endobj 18 0 obj << /chapter [/H1 11 0 R] /section [/H2 11 0 R] /subsection [/H3 11 0 R] /subsubsection [/H4 11 0 R] /paragraph [/H5 11 0 R] /subparagraph [/H6 11 0 R] >> endobj 17 0 obj -<< /Type /Namespace /NS (https://www.latex-project.org/ns/book/2022) /RoleMapNS 18 0 R >> +<< /Type /Namespace /NS (https://www.latex-project.org/ns/book) /RoleMapNS 18 0 R >> endobj 19 0 obj << /Type /Namespace /NS (data:,A63761E-9D7-4FBB-9B27-C3BC8D9BFB06) >> @@ -706,10 +706,10 @@ xref 0000000003 00000 f 0000000004 00000 f 0000000010 00000 f -0000016533 00000 n +0000016523 00000 n 0000013401 00000 n 0000013680 00000 n -0000015632 00000 n +0000015622 00000 n 0000014259 00000 n 0000000012 00000 f 0000014327 00000 n @@ -718,18 +718,18 @@ xref 0000000020 00000 f 0000015160 00000 n 0000014478 00000 n -0000015438 00000 n -0000015267 00000 n -0000015545 00000 n +0000015433 00000 n +0000015262 00000 n +0000015535 00000 n 0000000000 00000 f 0000012425 00000 n -0000015693 00000 n -0000015806 00000 n -0000015905 00000 n -0000016025 00000 n -0000016143 00000 n -0000016242 00000 n -0000016404 00000 n +0000015683 00000 n +0000015796 00000 n +0000015895 00000 n +0000016015 00000 n +0000016133 00000 n +0000016232 00000 n +0000016394 00000 n 0000012586 00000 n 0000000015 00000 n 0000000069 00000 n @@ -739,32 +739,32 @@ xref 0000012970 00000 n 0000013020 00000 n 0000013080 00000 n -0000033689 00000 n -0000034580 00000 n +0000033679 00000 n +0000034570 00000 n 0000013131 00000 n 0000013191 00000 n -0000034744 00000 n +0000034734 00000 n 0000013365 00000 n 0000013481 00000 n 0000013643 00000 n -0000016653 00000 n -0000031495 00000 n -0000016675 00000 n -0000017114 00000 n -0000019778 00000 n -0000019996 00000 n -0000031250 00000 n -0000031600 00000 n -0000033867 00000 n -0000034803 00000 n -0000034922 00000 n -0000034958 00000 n -0000035198 00000 n +0000016643 00000 n +0000031485 00000 n +0000016665 00000 n +0000017104 00000 n +0000019768 00000 n +0000019986 00000 n +0000031240 00000 n +0000031590 00000 n +0000033857 00000 n +0000034793 00000 n +0000034912 00000 n +0000034948 00000 n +0000035188 00000 n trailer << /Size 59 /Root 57 0 R /Info 58 0 R /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >> startxref -35407 +35397 %%EOF diff --git a/testfiles-xetex/structure-destination.tpf b/testfiles-xetex/structure-destination.tpf index 86aed39f..75300745 100644 --- a/testfiles-xetex/structure-destination.tpf +++ b/testfiles-xetex/structure-destination.tpf @@ -43,7 +43,7 @@ endobj <> endobj 22 0 obj -<> +<> endobj 19 0 obj <> endobj 23 0 obj -<> +<> endobj 20 0 obj <]/Root 1 0 R/Info 2 0 R/Size 46>> startxref -20039 +20029 %%EOF diff --git a/testfiles/annot-last.luatex.tlg b/testfiles/annot-last.luatex.tlg index 66b40436..4d23f3d5 100644 --- a/testfiles/annot-last.luatex.tlg +++ b/testfiles/annot-last.luatex.tlg @@ -21,8 +21,6 @@ Completed box being shipped out [1] ..\glue 25.0 ..\glue(\lineskip) 0.0 ..\vbox(550.0+0.0)x345.0, glue set 515.94489fil, direction TLT -...\latelua0{ltx.__pdf.Page.Resources.ExtGState=true} -...\latelua0{ltx.pdf.Page_Resources_gpush(tex.count["g_shipout_readonly_int"])} ...\write-{} ...\glue(\topskip) 3.06 ...\hbox(6.94+0.22)x345.0, glue set 266.79999fil, direction TLT diff --git a/testfiles/bdc-shipout-log.luatex.tlg b/testfiles/bdc-shipout-log.luatex.tlg index aaacd3b0..94cfc7f9 100644 --- a/testfiles/bdc-shipout-log.luatex.tlg +++ b/testfiles/bdc-shipout-log.luatex.tlg @@ -21,8 +21,6 @@ Completed box being shipped out [1] ..\glue 18.06749 ..\glue(\lineskip) 0.0 ..\vbox(550.0+0.0)x345.0, glue set 540.0fil, direction TLT -...\latelua0{ltx.__pdf.Page.Resources.ExtGState=true} -...\latelua0{ltx.pdf.Page_Resources_gpush(tex.count["g_shipout_readonly_int"])} ...\write-{} ...\pdflateliteral page{/\mytag <<\mydict >> BDC} ...\glue(\topskip) 5.69 diff --git a/testfiles/dict_if_empty.luatex.tlg b/testfiles/dict_if_empty.luatex.tlg index fb3cd20d..00014c14 100644 --- a/testfiles/dict_if_empty.luatex.tlg +++ b/testfiles/dict_if_empty.luatex.tlg @@ -21,8 +21,6 @@ Completed box being shipped out [1] ..\glue 25.0 ..\glue(\lineskip) 0.0 ..\vbox(550.0+0.0)x345.0, glue set 491.94745fil, direction TLT -...\latelua0{ltx.__pdf.Page.Resources.ExtGState=true} -...\latelua0{ltx.pdf.Page_Resources_gpush(tex.count["g_shipout_readonly_int"])} ...\write-{} ...\glue(\topskip) 3.85 ...\hbox(6.15+2.05)x345.0, glue set 288.33002fil, direction TLT diff --git a/testfiles/pagelabels-log.luatex.tlg b/testfiles/pagelabels-log.luatex.tlg index ec25687b..60c15e19 100644 --- a/testfiles/pagelabels-log.luatex.tlg +++ b/testfiles/pagelabels-log.luatex.tlg @@ -36,8 +36,6 @@ Completed box being shipped out [1] ...\glue 25.0 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 539.94232fil, direction TLT -....\latelua0{ltx.__pdf.Page.Resources.ExtGState=true} -....\latelua0{ltx.pdf.Page_Resources_gpush(tex.count["g_shipout_readonly_int"])} ....\write-{} ....\pdfdest name{Doc-Start} xyz ....\glue(\topskip) 3.06 diff --git a/testfiles/show.luatex.tlg b/testfiles/show.luatex.tlg index 5adc1605..39bb99a5 100644 --- a/testfiles/show.luatex.tlg +++ b/testfiles/show.luatex.tlg @@ -62,8 +62,6 @@ Completed box being shipped out [1] ...\glue 25.0 ...\glue(\lineskip) 0.0 ...\vbox(550.0+0.0)x345.0, glue set 539.94232fil, direction TLT -....\latelua0{ltx.__pdf.Page.Resources.ExtGState=true} -....\latelua0{ltx.pdf.Page_Resources_gpush(tex.count["g_shipout_readonly_int"])} ....\write-{} ....\pdfdest name{Doc-Start} xyz ....\glue(\topskip) 2.95 diff --git a/testfiles/version-compare.luatex.tlg b/testfiles/version-compare.luatex.tlg index f6cb66ae..57001182 100644 --- a/testfiles/version-compare.luatex.tlg +++ b/testfiles/version-compare.luatex.tlg @@ -25,8 +25,6 @@ Completed box being shipped out [1] ..\glue 25.0 ..\glue(\lineskip) 0.0 ..\vbox(550.0+0.0)x345.0, glue set 467.95001fil, direction TLT -...\latelua0{ltx.__pdf.Page.Resources.ExtGState=true} -...\latelua0{ltx.pdf.Page_Resources_gpush(tex.count["g_shipout_readonly_int"])} ...\write-{} ...\glue(\topskip) 3.23 ...\hbox(6.77+0.39098)x345.0, glue set 284.4122fil, direction TLT