[latex3-commits] [git/LaTeX3-latex3-pdfresources] develop: use dictionary for action, changes order, remade test (15e6bf6)
Ulrike Fischer
fischer at troubleshooting-tex.de
Sat Mar 6 23:50:16 CET 2021
Repository : https://github.com/latex3/pdfresources
On branch : develop
Link : https://github.com/latex3/pdfresources/commit/15e6bf67faead21aadcaca0ad6f0bfdbfee51265
>---------------------------------------------------------------
commit 15e6bf67faead21aadcaca0ad6f0bfdbfee51265
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Sat Mar 6 23:50:16 2021 +0100
use dictionary for action, changes order, remade test
>---------------------------------------------------------------
15e6bf67faead21aadcaca0ad6f0bfdbfee51265
hyperref-generic.dtx | 34 +++++-----
resave.bat | 3 -
testfiles-luatex/non-ascii-links.tpf | 40 ++++++-----
testfiles/disable-links.luatex.tpf | 105 ++++++++++++++---------------
testfiles/disable-links.tpf | 89 ++++++++++++-------------
testfiles/ismap.luatex.tpf | 40 ++++++-----
testfiles/ismap.tpf | 36 +++++-----
testfiles/linkbordercolor.luatex.tpf | 93 +++++++++++++-------------
testfiles/linkbordercolor.tpf | 81 +++++++++++-----------
testfiles/linkhook.luatex.tpf | 57 ++++++++--------
testfiles/linkhook.tpf | 53 ++++++++-------
testfiles/linkmargin.luatex.tpf | 71 ++++++++++----------
testfiles/linkmargin.tpf | 61 ++++++++---------
testfiles/ocgcolorlinks.luatex.tpf | 126 ++++++++++++++++-------------------
testfiles/ocgcolorlinks.tpf | 114 +++++++++++++++----------------
testfiles/pdffilelink.luatex.tpf | 35 +++++-----
testfiles/pdffilelink.tpf | 31 +++++----
17 files changed, 511 insertions(+), 558 deletions(-)
diff --git a/hyperref-generic.dtx b/hyperref-generic.dtx
index c279519..49b6c96 100644
--- a/hyperref-generic.dtx
+++ b/hyperref-generic.dtx
@@ -1822,12 +1822,13 @@
\cs_set_eq:NN \% \c_percent_str
\Hy at safe@activestrue
\mode_leave_vertical:
+ \pdfannot_dict_put:nnx {link/URI}{A}{<<\pdfdict_use:n {l_hyp/annot/A/URI}>>}
\pdfannot_link:nxn { URI }
{
- /A
- <<
- \pdfdict_use:n {l_hyp/annot/A/URI}
- >>
+ % /A
+% <<
+% \pdfdict_use:n {l_hyp/annot/A/URI}
+% >>
}
{
#1
@@ -1877,12 +1878,13 @@
\pdfdict_put:nno{l_hyp/annot/A/Next}{Next}{\Hy at href@nextactionraw}
}
\mode_leave_vertical:
+ \pdfannot_dict_put:nnx {link/GoToR}{A}{<<\pdfdict_use:n {l_hyp/annot/A/GoToR}>>}
\pdfannot_link:nxn %expansion??
{ GoToR }
{
- /A<<
- \pdfdict_use:n {l_hyp/annot/A/GoToR}
- >>
+ % /A<<
+% \pdfdict_use:n {l_hyp/annot/A/GoToR}
+% >>
}
{
#1\Hy at xspace@end
@@ -1935,13 +1937,14 @@
\pdfdict_put:nno{l_hyp/annot/A/Next}{Next}{\Hy at href@nextactionraw}
}
\mode_leave_vertical:
+ \pdfannot_dict_put:nnx {link/Launch}{A}{<<\pdfdict_use:n {l_hyp/annot/A/Launch}>>}
\pdfannot_link:nxn
{ Launch }
{
- /A
- <<
- \pdfdict_use:n {l_hyp/annot/A/Launch}
- >>
+ % /A
+% <<
+% \pdfdict_use:n {l_hyp/annot/A/Launch}
+% >>
}
{
#2\Hy at xspace@end
@@ -1986,12 +1989,13 @@
\str_remove_once:Nn \Hy at href@nextactionraw {/Next}
\pdfdict_put:nno{l_hyp/annot/A/Next}{Next}{\Hy at href@nextactionraw}
}
+ \pdfannot_dict_put:nnx {link/Named}{A}{<<\pdfdict_use:n {l_hyp/annot/A/Named}>>}
\pdfannot_link:nxn { Named }
{
- /A
- <<
- \pdfdict_use:n { l_hyp/annot/A/Named }
- >>
+% /A
+% <<
+% \pdfdict_use:n { l_hyp/annot/A/Named }
+% >>
}
{
#2
diff --git a/resave.bat b/resave.bat
index 0c57546..e7ab889 100644
--- a/resave.bat
+++ b/resave.bat
@@ -3,6 +3,3 @@ rem l3build save -e\2 \1
rem l3build save -cconfig-dvips \1
rem l3build save -cconfig-luatex -e\2 \1
rem l3build save -cconfig-noxetex -e\2 \1
-
-
-l3build save -cconfig-dvips annot-last
diff --git a/testfiles-luatex/non-ascii-links.tpf b/testfiles-luatex/non-ascii-links.tpf
index de22a2e..3531886 100644
--- a/testfiles-luatex/non-ascii-links.tpf
+++ b/testfiles-luatex/non-ascii-links.tpf
@@ -21,13 +21,11 @@ endobj
[ 6 0 R 7 0 R ]
endobj
6 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Rect [ 147.716 704.077 196.264 715.035 ]
- /A<</Type /Action /S /URI /URI (http://ang.wikipedia.org/wiki/Elisabe%C3%BE_I_Engla_Cw%C4%93n) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (http://ang.wikipedia.org/wiki/Elisabe%C3%BE_I_Engla_Cw%C4%93n) >> /Rect [ 147.716 704.077 196.264 715.035 ]
>>
endobj
7 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Rect [ 197.589 704.077 236.443 715.035 ]
- /A<</Type /Action /S /URI /URI (http://ja.wikipedia.org/wiki/%E3%82%A8%E3%83%AA%E3%82%B6%E3%83%99%E3%82%B91%E4%B8%96_\(%E3%82%A4%E3%83%B3%E3%82%B0%E3%83%A9%E3%83%B3%E3%83%89%E5%A5%B3%E7%8E%8B) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (http://ja.wikipedia.org/wiki/%E3%82%A8%E3%83%AA%E3%82%B6%E3%83%99%E3%82%B91%E4%B8%96_\(%E3%82%A4%E3%83%B3%E3%82%B0%E3%83%A9%E3%83%B3%E3%83%89%E5%A5%B3%E7%8E%8B) >> /Rect [ 197.589 704.077 236.443 715.035 ]
>>
endobj
10 0 obj
@@ -131,26 +129,26 @@ xref
0000000000 00000 f
0000000317 00000 n
0000000478 00000 n
-0000000719 00000 n
-0000001179 00000 n
+0000000720 00000 n
+0000001181 00000 n
0000000067 00000 n
-0000001058 00000 n
-0000001118 00000 n
-0000004861 00000 n
-0000005215 00000 n
+0000001060 00000 n
+0000001120 00000 n
+0000004863 00000 n
+0000005217 00000 n
0000000446 00000 n
-0000001265 00000 n
-0000003704 00000 n
-0000001421 00000 n
-0000001494 00000 n
-0000003940 00000 n
-0000005015 00000 n
-0000005276 00000 n
-0000005377 00000 n
-0000005413 00000 n
-0000005570 00000 n
+0000001267 00000 n
+0000003706 00000 n
+0000001423 00000 n
+0000001496 00000 n
+0000003942 00000 n
+0000005017 00000 n
+0000005278 00000 n
+0000005379 00000 n
+0000005415 00000 n
+0000005572 00000 n
trailer
<< /Size 25 /Root 23 0 R /Info 24 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
startxref
-5791
+5793
%%EOF
diff --git a/testfiles/disable-links.luatex.tpf b/testfiles/disable-links.luatex.tpf
index 5d7bc21..73a9f5d 100644
--- a/testfiles/disable-links.luatex.tpf
+++ b/testfiles/disable-links.luatex.tpf
@@ -78,28 +78,23 @@ endobj
<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.701176 0.4 0.414118] /Rect [ 132.772 632.485 139.746 643.036 ]/A << /S /GoTo /D (section.1) >> >>
endobj
16 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Rect [ 147.716 620.171 395.537 631.359 ]
- /A<</Type /Action /S /URI /URI (https://github.com/latex3/luaotfload/issues/154) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://github.com/latex3/luaotfload/issues/154) >> /Rect [ 147.716 620.171 395.537 631.359 ]
>>
endobj
17 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /Rect [ 147.716 610.388 181.858 619.514 ]
- /A<</Type /Action /S /GoToR /F (test-pdfresources.pdf) /D [0/Fit] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /A <</Type /Action /S /GoToR /F (test-pdfresources.pdf) /D [0/Fit] >> /Rect [ 147.716 610.388 181.858 619.514 ]
>>
endobj
18 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.680002 0.67765] /Rect [ 147.716 598.433 169.096 607.449 ]
- /A<</Type /Action /S /Launch /F (tests-nopdf.toc) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.680002 0.67765] /A <</Type /Action /S /Launch /F (tests-nopdf.toc) >> /Rect [ 147.716 598.433 169.096 607.449 ]
>>
endobj
19 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /Rect [ 147.716 586.478 170.062 595.494 ]
- /A<</Type /Action /S /Named /N /Find >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /A <</Type /Action /S /Named /N /Find >> /Rect [ 147.716 586.478 170.062 595.494 ]
>>
endobj
20 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /Rect [ 147.716 572.58 191.582 583.429 ]
- /A<</Type /Action /S /Named /N /FirstPage >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /A <</Type /Action /S /Named /N /FirstPage >> /Rect [ 147.716 572.58 191.582 583.429 ]
>>
endobj
24 0 obj
@@ -428,57 +423,57 @@ xref
0000000469 00000 n
0000000528 00000 n
0000000588 00000 n
-0000019359 00000 n
-0000016022 00000 n
-0000013343 00000 n
-0000019707 00000 n
+0000019364 00000 n
+0000016027 00000 n
+0000013348 00000 n
+0000019712 00000 n
0000002307 00000 n
0000002482 00000 n
-0000002710 00000 n
-0000002928 00000 n
-0000003129 00000 n
-0000003313 00000 n
-0000003624 00000 n
+0000002711 00000 n
+0000002930 00000 n
+0000003132 00000 n
+0000003317 00000 n
+0000003629 00000 n
0000002120 00000 n
0000000806 00000 n
-0000003501 00000 n
-0000003562 00000 n
-0000008711 00000 n
+0000003506 00000 n
+0000003567 00000 n
+0000008716 00000 n
0000002245 00000 n
-0000003735 00000 n
-0000019849 00000 n
-0000003781 00000 n
-0000003824 00000 n
-0000007406 00000 n
-0000004077 00000 n
-0000004152 00000 n
-0000007641 00000 n
-0000008864 00000 n
-0000009063 00000 n
-0000012112 00000 n
-0000009278 00000 n
-0000009354 00000 n
-0000012348 00000 n
-0000013497 00000 n
-0000013697 00000 n
-0000014995 00000 n
-0000013773 00000 n
-0000013847 00000 n
-0000015229 00000 n
-0000016173 00000 n
-0000016370 00000 n
-0000018261 00000 n
-0000016487 00000 n
-0000016561 00000 n
-0000018495 00000 n
-0000019510 00000 n
-0000019775 00000 n
-0000019910 00000 n
-0000020067 00000 n
-0000020103 00000 n
-0000020277 00000 n
+0000003740 00000 n
+0000019854 00000 n
+0000003786 00000 n
+0000003829 00000 n
+0000007411 00000 n
+0000004082 00000 n
+0000004157 00000 n
+0000007646 00000 n
+0000008869 00000 n
+0000009068 00000 n
+0000012117 00000 n
+0000009283 00000 n
+0000009359 00000 n
+0000012353 00000 n
+0000013502 00000 n
+0000013702 00000 n
+0000015000 00000 n
+0000013778 00000 n
+0000013852 00000 n
+0000015234 00000 n
+0000016178 00000 n
+0000016375 00000 n
+0000018266 00000 n
+0000016492 00000 n
+0000016566 00000 n
+0000018500 00000 n
+0000019515 00000 n
+0000019780 00000 n
+0000019915 00000 n
+0000020072 00000 n
+0000020108 00000 n
+0000020282 00000 n
trailer
<< /Size 60 /Root 58 0 R /Info 59 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
startxref
-20498
+20503
%%EOF
diff --git a/testfiles/disable-links.tpf b/testfiles/disable-links.tpf
index 5459bec..23532f7 100644
--- a/testfiles/disable-links.tpf
+++ b/testfiles/disable-links.tpf
@@ -88,41 +88,36 @@ endobj
16 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646]
+/Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://github.com/latex3/luaotfload/issues/154) >>
/Rect [147.716 620.249 395.535 631.374]
-/A<</Type /Action /S /URI /URI (https://github.com/latex3/luaotfload/issues/154) >>
>>
endobj
17 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002]
+/Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /A <</Type /Action /S /GoToR /F (test-pdfresources.pdf) /D [0/Fit] >>
/Rect [147.716 610.508 181.866 619.419]
-/A<</Type /Action /S /GoToR /F (test-pdfresources.pdf) /D [0/Fit] >>
>>
endobj
18 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.680002 0.67765]
+/Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.680002 0.67765] /A <</Type /Action /S /Launch /F (tests-nopdf.toc) >>
/Rect [147.716 598.553 169.08 607.464]
-/A<</Type /Action /S /Launch /F (tests-nopdf.toc) >>
>>
endobj
19 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4]
+/Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /A <</Type /Action /S /Named /N /Find >>
/Rect [147.716 586.598 170.049 595.509]
-/A<</Type /Action /S /Named /N /Find >>
>>
endobj
20 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4]
+/Subtype /Link /Border [0 0 1] /H /I /C [0.668236 0.675292 0.4] /A <</Type /Action /S /Named /N /FirstPage >>
/Rect [147.716 572.705 191.579 583.443]
-/A<</Type /Action /S /Named /N /FirstPage >>
>>
endobj
24 0 obj
@@ -847,51 +842,51 @@ xref
0000000388 00000 n
0000000445 00000 n
0000000503 00000 n
-0000053117 00000 n
-0000051171 00000 n
-0000055059 00000 n
-0000056978 00000 n
+0000053122 00000 n
+0000051176 00000 n
+0000055064 00000 n
+0000056983 00000 n
0000001565 00000 n
0000001738 00000 n
-0000001962 00000 n
-0000002176 00000 n
-0000002372 00000 n
-0000002552 00000 n
-0000002856 00000 n
+0000001963 00000 n
+0000002178 00000 n
+0000002375 00000 n
+0000002556 00000 n
+0000002861 00000 n
0000001403 00000 n
0000000720 00000 n
-0000002737 00000 n
-0000002796 00000 n
-0000056819 00000 n
-0000002968 00000 n
-0000057117 00000 n
-0000003014 00000 n
-0000003056 00000 n
-0000003374 00000 n
-0000003960 00000 n
-0000004256 00000 n
-0000004658 00000 n
-0000013861 00000 n
-0000014092 00000 n
-0000022991 00000 n
-0000023230 00000 n
-0000036106 00000 n
-0000036366 00000 n
-0000049096 00000 n
-0000049383 00000 n
-0000051329 00000 n
-0000053276 00000 n
-0000055217 00000 n
-0000057043 00000 n
-0000057178 00000 n
-0000057331 00000 n
-0000057367 00000 n
-0000057541 00000 n
+0000002742 00000 n
+0000002801 00000 n
+0000056824 00000 n
+0000002973 00000 n
+0000057122 00000 n
+0000003019 00000 n
+0000003061 00000 n
+0000003379 00000 n
+0000003965 00000 n
+0000004261 00000 n
+0000004663 00000 n
+0000013866 00000 n
+0000014097 00000 n
+0000022996 00000 n
+0000023235 00000 n
+0000036111 00000 n
+0000036371 00000 n
+0000049101 00000 n
+0000049388 00000 n
+0000051334 00000 n
+0000053281 00000 n
+0000055222 00000 n
+0000057048 00000 n
+0000057183 00000 n
+0000057336 00000 n
+0000057372 00000 n
+0000057546 00000 n
trailer
<< /Size 51
/Root 49 0 R
/Info 50 0 R
/ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
startxref
-57762
+57767
%%EOF
diff --git a/testfiles/ismap.luatex.tpf b/testfiles/ismap.luatex.tpf
index 18b37fd..aacd495 100644
--- a/testfiles/ismap.luatex.tpf
+++ b/testfiles/ismap.luatex.tpf
@@ -22,13 +22,11 @@ endobj
[ 6 0 R 7 0 R ]
endobj
6 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Rect [ 147.716 706.129 176.01 712.415 ]
- /A<</Type /Action /S /URI /URI (https://www.latex-project.org#abc~xyz) /IsMap true >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org#abc~xyz) /IsMap true >> /Rect [ 147.716 706.129 176.01 712.415 ]
>>
endobj
7 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Rect [ 147.716 694.174 176.01 700.46 ]
- /A<</Type /Action /S /URI /URI (https://www.latex-project.org#abc~xyz) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org#abc~xyz) >> /Rect [ 147.716 694.174 176.01 700.46 ]
>>
endobj
10 0 obj
@@ -121,26 +119,26 @@ xref
0000000000 00000 f
0000000306 00000 n
0000000467 00000 n
-0000000695 00000 n
-0000001031 00000 n
+0000000696 00000 n
+0000001033 00000 n
0000000067 00000 n
-0000000910 00000 n
-0000000970 00000 n
-0000003093 00000 n
-0000003447 00000 n
+0000000912 00000 n
+0000000972 00000 n
+0000003095 00000 n
+0000003449 00000 n
0000000435 00000 n
-0000001117 00000 n
-0000002091 00000 n
-0000001160 00000 n
-0000001235 00000 n
-0000002327 00000 n
-0000003247 00000 n
-0000003508 00000 n
-0000003609 00000 n
-0000003645 00000 n
-0000003802 00000 n
+0000001119 00000 n
+0000002093 00000 n
+0000001162 00000 n
+0000001237 00000 n
+0000002329 00000 n
+0000003249 00000 n
+0000003510 00000 n
+0000003611 00000 n
+0000003647 00000 n
+0000003804 00000 n
trailer
<< /Size 25 /Root 23 0 R /Info 24 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
startxref
-4023
+4025
%%EOF
diff --git a/testfiles/ismap.tpf b/testfiles/ismap.tpf
index a59ee31..840fe73 100644
--- a/testfiles/ismap.tpf
+++ b/testfiles/ismap.tpf
@@ -27,17 +27,15 @@ endobj
6 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646]
+/Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org#abc~xyz) /IsMap true >>
/Rect [147.716 706.129 175.999 712.411]
-/A<</Type /Action /S /URI /URI (https://www.latex-project.org#abc~xyz) /IsMap true >>
>>
endobj
7 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646]
+/Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org#abc~xyz) >>
/Rect [147.716 694.174 175.999 700.456]
-/A<</Type /Action /S /URI /URI (https://www.latex-project.org#abc~xyz) >>
>>
endobj
10 0 obj
@@ -260,26 +258,26 @@ xref
0000000000 00000 f
0000000238 00000 n
0000000374 00000 n
-0000000599 00000 n
-0000000929 00000 n
+0000000600 00000 n
+0000000931 00000 n
0000000062 00000 n
-0000000812 00000 n
-0000000870 00000 n
-0000011187 00000 n
-0000011345 00000 n
-0000001016 00000 n
-0000001423 00000 n
-0000009183 00000 n
-0000009404 00000 n
-0000011403 00000 n
-0000011500 00000 n
-0000011536 00000 n
-0000011693 00000 n
+0000000814 00000 n
+0000000872 00000 n
+0000011189 00000 n
+0000011347 00000 n
+0000001018 00000 n
+0000001425 00000 n
+0000009185 00000 n
+0000009406 00000 n
+0000011405 00000 n
+0000011502 00000 n
+0000011538 00000 n
+0000011695 00000 n
trailer
<< /Size 22
/Root 20 0 R
/Info 21 0 R
/ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
startxref
-11914
+11916
%%EOF
diff --git a/testfiles/linkbordercolor.luatex.tpf b/testfiles/linkbordercolor.luatex.tpf
index ef24312..dad3d19 100644
--- a/testfiles/linkbordercolor.luatex.tpf
+++ b/testfiles/linkbordercolor.luatex.tpf
@@ -33,18 +33,15 @@ endobj
<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.0 1.0 0.0] /Rect [ 156.304 644.284 163.278 653.191 ]/A << /S /GoTo /D (section.1) >> >>
endobj
7 0 obj
-<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.0 0.0 1.0] /Rect [ 152.179 632.219 211.706 641.235 ]
- /A<</Type /Action /S /URI /URI (www.blub.de) >>
+<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.0 0.0 1.0] /A <</Type /Action /S /URI /URI (www.blub.de) >> /Rect [ 152.179 632.219 211.706 641.235 ]
>>
endobj
8 0 obj
-<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [1 1 0] /Rect [ 152.697 620.264 186.839 629.39 ]
- /A<</Type /Action /S /GoToR /F (test-pdfresources.pdf) /D [0/Fit] >>
+<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [1 1 0] /A <</Type /Action /S /GoToR /F (test-pdfresources.pdf) /D [0/Fit] >> /Rect [ 152.697 620.264 186.839 629.39 ]
>>
endobj
9 0 obj
-<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.75 0.5 0.25] /Rect [ 163.487 608.309 185.833 617.325 ]
- /A<</Type /Action /S /Named /N /Find >>
+<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.75 0.5 0.25] /A <</Type /Action /S /Named /N /Find >> /Rect [ 163.487 608.309 185.833 617.325 ]
>>
endobj
12 0 obj
@@ -310,57 +307,57 @@ endobj
xref
0 50
0000000002 65535 f
-0000001738 00000 n
+0000001741 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
0000000635 00000 n
0000000803 00000 n
0000000967 00000 n
-0000001148 00000 n
-0000001343 00000 n
-0000001639 00000 n
+0000001149 00000 n
+0000001345 00000 n
+0000001642 00000 n
0000000020 00000 n
-0000001518 00000 n
-0000001578 00000 n
-0000011894 00000 n
-0000007171 00000 n
-0000012248 00000 n
+0000001521 00000 n
+0000001581 00000 n
+0000011897 00000 n
+0000007174 00000 n
+0000012251 00000 n
0000000759 00000 n
-0000002185 00000 n
-0000002247 00000 n
-0000002014 00000 n
-0000001785 00000 n
-0000002124 00000 n
-0000004286 00000 n
-0000002346 00000 n
-0000012390 00000 n
-0000002392 00000 n
-0000002425 00000 n
-0000003301 00000 n
-0000002467 00000 n
-0000002538 00000 n
-0000003535 00000 n
-0000004437 00000 n
-0000004634 00000 n
-0000006105 00000 n
-0000004733 00000 n
-0000004808 00000 n
-0000006340 00000 n
-0000007324 00000 n
-0000007523 00000 n
-0000010649 00000 n
-0000007749 00000 n
-0000007825 00000 n
-0000010885 00000 n
-0000012048 00000 n
-0000012316 00000 n
-0000012451 00000 n
-0000012590 00000 n
-0000012626 00000 n
-0000012800 00000 n
+0000002188 00000 n
+0000002250 00000 n
+0000002017 00000 n
+0000001788 00000 n
+0000002127 00000 n
+0000004289 00000 n
+0000002349 00000 n
+0000012393 00000 n
+0000002395 00000 n
+0000002428 00000 n
+0000003304 00000 n
+0000002470 00000 n
+0000002541 00000 n
+0000003538 00000 n
+0000004440 00000 n
+0000004637 00000 n
+0000006108 00000 n
+0000004736 00000 n
+0000004811 00000 n
+0000006343 00000 n
+0000007327 00000 n
+0000007526 00000 n
+0000010652 00000 n
+0000007752 00000 n
+0000007828 00000 n
+0000010888 00000 n
+0000012051 00000 n
+0000012319 00000 n
+0000012454 00000 n
+0000012593 00000 n
+0000012629 00000 n
+0000012803 00000 n
trailer
<< /Size 50 /Root 48 0 R /Info 49 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
startxref
-13021
+13024
%%EOF
diff --git a/testfiles/linkbordercolor.tpf b/testfiles/linkbordercolor.tpf
index 94fd9c5..84f62a6 100644
--- a/testfiles/linkbordercolor.tpf
+++ b/testfiles/linkbordercolor.tpf
@@ -39,25 +39,22 @@ endobj
7 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [1 1 1] /H /I /C [0.0 0.0 1.0]
+/Subtype /Link /Border [1 1 1] /H /I /C [0.0 0.0 1.0] /A <</Type /Action /S /URI /URI (www.blub.de) >>
/Rect [152.172 632.329 211.698 641.24]
-/A<</Type /Action /S /URI /URI (www.blub.de) >>
>>
endobj
8 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [1 1 1] /H /I /C [1 1 0]
+/Subtype /Link /Border [1 1 1] /H /I /C [1 1 0] /A <</Type /Action /S /GoToR /F (test-pdfresources.pdf) /D [0/Fit] >>
/Rect [152.697 620.374 186.847 629.285]
-/A<</Type /Action /S /GoToR /F (test-pdfresources.pdf) /D [0/Fit] >>
>>
endobj
9 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [1 1 1] /H /I /C [0.75 0.5 0.25]
+/Subtype /Link /Border [1 1 1] /H /I /C [0.75 0.5 0.25] /A <</Type /Action /S /Named /N /Find >>
/Rect [163.49 608.418 185.823 617.329]
-/A<</Type /Action /S /Named /N /Find >>
>>
endobj
12 0 obj
@@ -655,53 +652,53 @@ endobj
xref
0 43
0000000002 65535 f
-0000001484 00000 n
+0000001487 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
0000000424 00000 n
0000000567 00000 n
0000000729 00000 n
-0000000905 00000 n
-0000001097 00000 n
-0000001384 00000 n
+0000000906 00000 n
+0000001099 00000 n
+0000001387 00000 n
0000000015 00000 n
-0000001267 00000 n
-0000001325 00000 n
-0000038319 00000 n
-0000040079 00000 n
-0000040238 00000 n
-0000001901 00000 n
-0000001961 00000 n
-0000001734 00000 n
-0000001531 00000 n
-0000001842 00000 n
-0000036378 00000 n
-0000002061 00000 n
-0000040377 00000 n
-0000002107 00000 n
-0000002139 00000 n
-0000002439 00000 n
-0000002753 00000 n
-0000003339 00000 n
-0000010925 00000 n
-0000011148 00000 n
-0000024286 00000 n
-0000024548 00000 n
-0000034357 00000 n
-0000034590 00000 n
-0000036536 00000 n
-0000038477 00000 n
-0000040303 00000 n
-0000040438 00000 n
-0000040573 00000 n
-0000040609 00000 n
-0000040783 00000 n
+0000001270 00000 n
+0000001328 00000 n
+0000038322 00000 n
+0000040082 00000 n
+0000040241 00000 n
+0000001904 00000 n
+0000001964 00000 n
+0000001737 00000 n
+0000001534 00000 n
+0000001845 00000 n
+0000036381 00000 n
+0000002064 00000 n
+0000040380 00000 n
+0000002110 00000 n
+0000002142 00000 n
+0000002442 00000 n
+0000002756 00000 n
+0000003342 00000 n
+0000010928 00000 n
+0000011151 00000 n
+0000024289 00000 n
+0000024551 00000 n
+0000034360 00000 n
+0000034593 00000 n
+0000036539 00000 n
+0000038480 00000 n
+0000040306 00000 n
+0000040441 00000 n
+0000040576 00000 n
+0000040612 00000 n
+0000040786 00000 n
trailer
<< /Size 43
/Root 41 0 R
/Info 42 0 R
/ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
startxref
-41004
+41007
%%EOF
diff --git a/testfiles/linkhook.luatex.tpf b/testfiles/linkhook.luatex.tpf
index 0cf3712..97ea3c7 100644
--- a/testfiles/linkhook.luatex.tpf
+++ b/testfiles/linkhook.luatex.tpf
@@ -30,8 +30,7 @@ endobj
[ 6 0 R 7 0 R ]
endobj
6 0 obj
-<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.724708 0.4 0.717646] /StructParent 123 /Contents (url) /Rect [ 186.78 654.187 205.111 665.146 ]
- /A<</Type /Action /S /URI /URI (www.dante.de) >>
+<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.724708 0.4 0.717646] /StructParent 123 /Contents (url) /A <</Type /Action /S /URI /URI (www.dante.de) >> /Rect [ 186.78 654.187 205.111 665.146 ]
>>
endobj
7 0 obj
@@ -206,36 +205,36 @@ xref
0000000000 00000 f
0000000504 00000 n
0000000658 00000 n
-0000000883 00000 n
-0000001239 00000 n
+0000000884 00000 n
+0000001240 00000 n
0000000067 00000 n
-0000001057 00000 n
-0000001117 00000 n
-0000007511 00000 n
-0000001178 00000 n
-0000003976 00000 n
-0000007865 00000 n
+0000001058 00000 n
+0000001118 00000 n
+0000007512 00000 n
+0000001179 00000 n
+0000003977 00000 n
+0000007866 00000 n
0000000626 00000 n
-0000001313 00000 n
-0000008000 00000 n
-0000001359 00000 n
-0000001422 00000 n
-0000002922 00000 n
-0000001524 00000 n
-0000003141 00000 n
-0000004127 00000 n
-0000004324 00000 n
-0000006397 00000 n
-0000004466 00000 n
-0000006618 00000 n
-0000007665 00000 n
-0000007926 00000 n
-0000008061 00000 n
-0000008184 00000 n
-0000008220 00000 n
-0000008394 00000 n
+0000001314 00000 n
+0000008001 00000 n
+0000001360 00000 n
+0000001423 00000 n
+0000002923 00000 n
+0000001525 00000 n
+0000003142 00000 n
+0000004128 00000 n
+0000004325 00000 n
+0000006398 00000 n
+0000004467 00000 n
+0000006619 00000 n
+0000007666 00000 n
+0000007927 00000 n
+0000008062 00000 n
+0000008185 00000 n
+0000008221 00000 n
+0000008395 00000 n
trailer
<< /Size 35 /Root 33 0 R /Info 34 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
startxref
-8615
+8616
%%EOF
diff --git a/testfiles/linkhook.tpf b/testfiles/linkhook.tpf
index b94f460..e57c376 100644
--- a/testfiles/linkhook.tpf
+++ b/testfiles/linkhook.tpf
@@ -33,9 +33,8 @@ endobj
6 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [1 1 1] /H /I /C [0.724708 0.4 0.717646] /StructParent 123 /Contents (url)
+/Subtype /Link /Border [1 1 1] /H /I /C [0.724708 0.4 0.717646] /StructParent 123 /Contents (url) /A <</Type /Action /S /URI /URI (www.dante.de) >>
/Rect [186.764 654.302 205.084 665.15]
-/A<</Type /Action /S /URI /URI (www.dante.de) >>
>>
endobj
7 0 obj
@@ -456,36 +455,36 @@ xref
0000000000 00000 f
0000000374 00000 n
0000000503 00000 n
-0000000724 00000 n
-0000001072 00000 n
+0000000725 00000 n
+0000001073 00000 n
0000000062 00000 n
-0000000896 00000 n
-0000000954 00000 n
-0000026393 00000 n
-0000001013 00000 n
-0000024451 00000 n
-0000026551 00000 n
-0000001171 00000 n
-0000026683 00000 n
-0000001217 00000 n
-0000001279 00000 n
-0000001681 00000 n
-0000002070 00000 n
-0000010613 00000 n
-0000010848 00000 n
-0000022424 00000 n
-0000022663 00000 n
-0000024610 00000 n
-0000026609 00000 n
-0000026744 00000 n
-0000026863 00000 n
-0000026899 00000 n
-0000027073 00000 n
+0000000897 00000 n
+0000000955 00000 n
+0000026394 00000 n
+0000001014 00000 n
+0000024452 00000 n
+0000026552 00000 n
+0000001172 00000 n
+0000026684 00000 n
+0000001218 00000 n
+0000001280 00000 n
+0000001682 00000 n
+0000002071 00000 n
+0000010614 00000 n
+0000010849 00000 n
+0000022425 00000 n
+0000022664 00000 n
+0000024611 00000 n
+0000026610 00000 n
+0000026745 00000 n
+0000026864 00000 n
+0000026900 00000 n
+0000027074 00000 n
trailer
<< /Size 32
/Root 30 0 R
/Info 31 0 R
/ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
startxref
-27294
+27295
%%EOF
diff --git a/testfiles/linkmargin.luatex.tpf b/testfiles/linkmargin.luatex.tpf
index 70ba897..ec5d199 100644
--- a/testfiles/linkmargin.luatex.tpf
+++ b/testfiles/linkmargin.luatex.tpf
@@ -24,8 +24,7 @@ endobj
[ 6 0 R ]
endobj
6 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Rect [ 128.787 635.029 326.047 684.075 ]
- /A<</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org/) >> /Rect [ 128.787 635.029 326.047 684.075 ]
>>
endobj
9 0 obj
@@ -64,13 +63,11 @@ endobj
[ 15 0 R 16 0 R ]
endobj
15 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Rect [ 144.727 650.969 310.107 668.134 ]
- /A<</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org/) >> /Rect [ 144.727 650.969 310.107 668.134 ]
>>
endobj
16 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /Rect [ 144.727 627.059 310.107 644.224 ]
- /A<</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org/) >> /Rect [ 144.727 627.059 310.107 644.224 ]
>>
endobj
20 0 obj
@@ -227,45 +224,45 @@ endobj
xref
0 38
0000000002 65535 f
-0000000942 00000 n
+0000000943 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
0000000366 00000 n
0000000514 00000 n
-0000000844 00000 n
+0000000845 00000 n
0000000020 00000 n
-0000000724 00000 n
-0000000783 00000 n
-0000008490 00000 n
-0000004128 00000 n
-0000008842 00000 n
+0000000725 00000 n
+0000000784 00000 n
+0000008493 00000 n
+0000004131 00000 n
+0000008845 00000 n
0000000488 00000 n
-0000001646 00000 n
-0000001857 00000 n
-0000002129 00000 n
-0000001487 00000 n
-0000000989 00000 n
-0000002068 00000 n
-0000001612 00000 n
-0000002228 00000 n
-0000003126 00000 n
-0000002271 00000 n
-0000002345 00000 n
-0000003362 00000 n
-0000004282 00000 n
-0000004482 00000 n
-0000007269 00000 n
-0000004690 00000 n
-0000004765 00000 n
-0000007504 00000 n
-0000008643 00000 n
-0000008910 00000 n
-0000009026 00000 n
-0000009062 00000 n
-0000009219 00000 n
+0000001647 00000 n
+0000001859 00000 n
+0000002132 00000 n
+0000001488 00000 n
+0000000990 00000 n
+0000002071 00000 n
+0000001613 00000 n
+0000002231 00000 n
+0000003129 00000 n
+0000002274 00000 n
+0000002348 00000 n
+0000003365 00000 n
+0000004285 00000 n
+0000004485 00000 n
+0000007272 00000 n
+0000004693 00000 n
+0000004768 00000 n
+0000007507 00000 n
+0000008646 00000 n
+0000008913 00000 n
+0000009029 00000 n
+0000009065 00000 n
+0000009222 00000 n
trailer
<< /Size 38 /Root 36 0 R /Info 37 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
startxref
-9440
+9443
%%EOF
diff --git a/testfiles/linkmargin.tpf b/testfiles/linkmargin.tpf
index 8a28024..325d7f1 100644
--- a/testfiles/linkmargin.tpf
+++ b/testfiles/linkmargin.tpf
@@ -30,9 +30,8 @@ endobj
6 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646]
+/Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
/Rect [128.787 635.096 326.046 684.079]
-/A<</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
>>
endobj
9 0 obj
@@ -84,17 +83,15 @@ endobj
14 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646]
+/Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
/Rect [144.727 651.036 310.106 668.139]
-/A<</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
>>
endobj
15 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646]
+/Subtype /Link /Border [0 0 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
/Rect [144.727 627.126 310.106 644.229]
-/A<</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
>>
endobj
19 0 obj
@@ -458,42 +455,42 @@ endobj
xref
0 32
0000000002 65535 f
-0000000794 00000 n
+0000000795 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
0000000250 00000 n
0000000373 00000 n
-0000000695 00000 n
+0000000696 00000 n
0000000015 00000 n
-0000000579 00000 n
-0000000636 00000 n
-0000025866 00000 n
-0000024107 00000 n
-0000026025 00000 n
-0000001257 00000 n
-0000001464 00000 n
-0000001730 00000 n
-0000001123 00000 n
-0000000841 00000 n
-0000001671 00000 n
-0000001830 00000 n
-0000001856 00000 n
-0000002178 00000 n
-0000010281 00000 n
-0000010504 00000 n
-0000022056 00000 n
-0000022324 00000 n
-0000024264 00000 n
-0000026090 00000 n
-0000026202 00000 n
-0000026238 00000 n
-0000026395 00000 n
+0000000580 00000 n
+0000000637 00000 n
+0000025869 00000 n
+0000024110 00000 n
+0000026028 00000 n
+0000001258 00000 n
+0000001466 00000 n
+0000001733 00000 n
+0000001124 00000 n
+0000000842 00000 n
+0000001674 00000 n
+0000001833 00000 n
+0000001859 00000 n
+0000002181 00000 n
+0000010284 00000 n
+0000010507 00000 n
+0000022059 00000 n
+0000022327 00000 n
+0000024267 00000 n
+0000026093 00000 n
+0000026205 00000 n
+0000026241 00000 n
+0000026398 00000 n
trailer
<< /Size 32
/Root 30 0 R
/Info 31 0 R
/ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
startxref
-26616
+26619
%%EOF
diff --git a/testfiles/ocgcolorlinks.luatex.tpf b/testfiles/ocgcolorlinks.luatex.tpf
index 4ff736c..5c660b3 100644
--- a/testfiles/ocgcolorlinks.luatex.tpf
+++ b/testfiles/ocgcolorlinks.luatex.tpf
@@ -313,23 +313,19 @@ endobj
<< /Type /Annot /Subtype /Link /Border [0 0 0] /H /I /C [0.508234 0.696472 0.498826] /Rect [ 229.639 584.396 236.613 593.023 ]/A << /S /GoTo /D (cite.cite) >> >>
endobj
12 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 0] /H /I /C [0.444706 0.456472 0.680002] /Rect [ 226.869 556.899 241.594 570.846 ]
- /A<</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >>
+<< /Type /Annot /Subtype /Link /Border [0 0 0] /H /I /C [0.444706 0.456472 0.680002] /A <</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >> /Rect [ 226.869 556.899 241.594 570.846 ]
>>
endobj
13 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 0] /H /I /C [0.724708 0.4 0.717646] /Rect [ 226.869 532.988 386.271 546.936 ]
- /A<</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 0] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org/) >> /Rect [ 226.869 532.988 386.271 546.936 ]
>>
endobj
14 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 0] /H /I /C [0.668236 0.675292 0.4] /Rect [ 226.869 509.078 299.985 523.026 ]
- /A<</Type /Action /S /Named /N /View >>
+<< /Type /Annot /Subtype /Link /Border [0 0 0] /H /I /C [0.668236 0.675292 0.4] /A <</Type /Action /S /Named /N /View >> /Rect [ 226.869 509.078 299.985 523.026 ]
>>
endobj
15 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 0] /H /I /C [0.444706 0.680002 0.67765] /Rect [ 226.869 485.168 291.497 499.115 ]
- /A<</Type /Action /S /Launch /F (sumatra) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 0] /H /I /C [0.444706 0.680002 0.67765] /A <</Type /Action /S /Launch /F (sumatra) >> /Rect [ 226.869 485.168 291.497 499.115 ]
>>
endobj
16 0 obj
@@ -339,23 +335,19 @@ endobj
<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.508234 0.696472 0.498826] /Rect [ 277.629 387.337 284.603 395.964 ]/A << /S /GoTo /D (cite.cite) >> >>
endobj
18 0 obj
-<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.444706 0.456472 0.680002] /Rect [ 274.859 359.84 289.584 373.787 ]
- /A<</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >>
+<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.444706 0.456472 0.680002] /A <</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >> /Rect [ 274.859 359.84 289.584 373.787 ]
>>
endobj
19 0 obj
-<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.724708 0.4 0.717646] /Rect [ 274.859 335.929 434.262 349.877 ]
- /A<</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
+<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org/) >> /Rect [ 274.859 335.929 434.262 349.877 ]
>>
endobj
20 0 obj
-<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.668236 0.675292 0.4] /Rect [ 274.859 312.019 347.975 325.967 ]
- /A<</Type /Action /S /Named /N /View >>
+<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.668236 0.675292 0.4] /A <</Type /Action /S /Named /N /View >> /Rect [ 274.859 312.019 347.975 325.967 ]
>>
endobj
21 0 obj
-<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.444706 0.680002 0.67765] /Rect [ 274.859 288.109 339.487 302.056 ]
- /A<</Type /Action /S /Launch /F (sumatra) >>
+<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0.444706 0.680002 0.67765] /A <</Type /Action /S /Launch /F (sumatra) >> /Rect [ 274.859 288.109 339.487 302.056 ]
>>
endobj
24 0 obj
@@ -667,60 +659,60 @@ xref
0000000020 00000 n
0000007769 00000 n
0000007949 00000 n
-0000008163 00000 n
-0000008374 00000 n
-0000008558 00000 n
-0000008751 00000 n
-0000008925 00000 n
-0000009105 00000 n
-0000009318 00000 n
-0000009529 00000 n
-0000009713 00000 n
-0000010270 00000 n
+0000008164 00000 n
+0000008376 00000 n
+0000008561 00000 n
+0000008755 00000 n
+0000008929 00000 n
+0000009109 00000 n
+0000009323 00000 n
+0000009535 00000 n
+0000009720 00000 n
+0000010278 00000 n
0000000474 00000 n
-0000009906 00000 n
-0000009966 00000 n
-0000010027 00000 n
-0000026440 00000 n
-0000021862 00000 n
-0000015216 00000 n
-0000010088 00000 n
-0000010149 00000 n
-0000010209 00000 n
-0000026788 00000 n
+0000009914 00000 n
+0000009974 00000 n
+0000010035 00000 n
+0000026448 00000 n
+0000021870 00000 n
+0000015224 00000 n
+0000010096 00000 n
+0000010157 00000 n
+0000010217 00000 n
+0000026796 00000 n
0000007492 00000 n
-0000010724 00000 n
-0000010774 00000 n
-0000026997 00000 n
-0000010820 00000 n
-0000010997 00000 n
-0000026923 00000 n
-0000011043 00000 n
-0000011208 00000 n
-0000013995 00000 n
-0000011416 00000 n
-0000011491 00000 n
-0000014230 00000 n
-0000015369 00000 n
-0000015568 00000 n
-0000020435 00000 n
-0000015921 00000 n
-0000015997 00000 n
-0000020671 00000 n
-0000022016 00000 n
-0000022216 00000 n
-0000025216 00000 n
-0000022434 00000 n
-0000022509 00000 n
-0000025450 00000 n
-0000026591 00000 n
-0000026849 00000 n
-0000027071 00000 n
-0000027252 00000 n
-0000027288 00000 n
-0000027482 00000 n
+0000010732 00000 n
+0000010782 00000 n
+0000027005 00000 n
+0000010828 00000 n
+0000011005 00000 n
+0000026931 00000 n
+0000011051 00000 n
+0000011216 00000 n
+0000014003 00000 n
+0000011424 00000 n
+0000011499 00000 n
+0000014238 00000 n
+0000015377 00000 n
+0000015576 00000 n
+0000020443 00000 n
+0000015929 00000 n
+0000016005 00000 n
+0000020679 00000 n
+0000022024 00000 n
+0000022224 00000 n
+0000025224 00000 n
+0000022442 00000 n
+0000022517 00000 n
+0000025458 00000 n
+0000026599 00000 n
+0000026857 00000 n
+0000027079 00000 n
+0000027260 00000 n
+0000027296 00000 n
+0000027490 00000 n
trailer
<< /Size 65 /Root 63 0 R /Info 64 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
startxref
-27703
+27711
%%EOF
diff --git a/testfiles/ocgcolorlinks.tpf b/testfiles/ocgcolorlinks.tpf
index f71b2da..d05f9cf 100644
--- a/testfiles/ocgcolorlinks.tpf
+++ b/testfiles/ocgcolorlinks.tpf
@@ -289,33 +289,29 @@ endobj
12 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 0] /H /I /C [0.444706 0.456472 0.680002]
+/Subtype /Link /Border [0 0 0] /H /I /C [0.444706 0.456472 0.680002] /A <</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >>
/Rect [226.864 556.909 241.586 570.857]
-/A<</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >>
>>
endobj
13 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 0] /H /I /C [0.724708 0.4 0.717646]
+/Subtype /Link /Border [0 0 0] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
/Rect [226.864 532.999 386.265 546.946]
-/A<</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
>>
endobj
14 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 0] /H /I /C [0.668236 0.675292 0.4]
+/Subtype /Link /Border [0 0 0] /H /I /C [0.668236 0.675292 0.4] /A <</Type /Action /S /Named /N /View >>
/Rect [226.864 509.088 299.979 523.036]
-/A<</Type /Action /S /Named /N /View >>
>>
endobj
15 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 0] /H /I /C [0.444706 0.680002 0.67765]
+/Subtype /Link /Border [0 0 0] /H /I /C [0.444706 0.680002 0.67765] /A <</Type /Action /S /Launch /F (sumatra) >>
/Rect [226.864 485.178 291.483 499.126]
-/A<</Type /Action /S /Launch /F (sumatra) >>
>>
endobj
16 0 obj
@@ -339,33 +335,29 @@ endobj
18 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [1 1 1] /H /I /C [0.444706 0.456472 0.680002]
+/Subtype /Link /Border [1 1 1] /H /I /C [0.444706 0.456472 0.680002] /A <</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >>
/Rect [274.823 359.876 289.546 373.823]
-/A<</Type /Action /S /GoToR /F (example-image.pdf) /D [0/Fit] >>
>>
endobj
19 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [1 1 1] /H /I /C [0.724708 0.4 0.717646]
+/Subtype /Link /Border [1 1 1] /H /I /C [0.724708 0.4 0.717646] /A <</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
/Rect [274.823 335.965 434.224 349.913]
-/A<</Type /Action /S /URI /URI (https://www.latex-project.org/) >>
>>
endobj
20 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [1 1 1] /H /I /C [0.668236 0.675292 0.4]
+/Subtype /Link /Border [1 1 1] /H /I /C [0.668236 0.675292 0.4] /A <</Type /Action /S /Named /N /View >>
/Rect [274.823 312.055 347.938 326.003]
-/A<</Type /Action /S /Named /N /View >>
>>
endobj
21 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [1 1 1] /H /I /C [0.444706 0.680002 0.67765]
+/Subtype /Link /Border [1 1 1] /H /I /C [0.444706 0.680002 0.67765] /A <</Type /Action /S /Launch /F (sumatra) >>
/Rect [274.823 288.145 339.442 302.092]
-/A<</Type /Action /S /Launch /F (sumatra) >>
>>
endobj
24 0 obj
@@ -968,56 +960,56 @@ xref
0000000015 00000 n
0000005613 00000 n
0000005791 00000 n
-0000006001 00000 n
-0000006208 00000 n
-0000006388 00000 n
-0000006577 00000 n
-0000006750 00000 n
-0000006927 00000 n
-0000007137 00000 n
-0000007344 00000 n
-0000007524 00000 n
-0000008066 00000 n
+0000006002 00000 n
+0000006210 00000 n
+0000006391 00000 n
+0000006581 00000 n
+0000006754 00000 n
+0000006931 00000 n
+0000007142 00000 n
+0000007350 00000 n
+0000007531 00000 n
+0000008074 00000 n
0000000469 00000 n
-0000007713 00000 n
-0000007771 00000 n
-0000007830 00000 n
-0000051318 00000 n
-0000053260 00000 n
-0000055020 00000 n
-0000007889 00000 n
-0000007948 00000 n
-0000008007 00000 n
-0000055179 00000 n
-0000008545 00000 n
-0000008595 00000 n
-0000055385 00000 n
-0000008641 00000 n
-0000008817 00000 n
-0000055311 00000 n
-0000008863 00000 n
-0000009027 00000 n
-0000009349 00000 n
-0000009959 00000 n
-0000010401 00000 n
-0000021197 00000 n
-0000021460 00000 n
-0000037391 00000 n
-0000037710 00000 n
-0000049262 00000 n
-0000049530 00000 n
-0000051477 00000 n
-0000053418 00000 n
-0000055237 00000 n
-0000055459 00000 n
-0000055636 00000 n
-0000055672 00000 n
-0000055866 00000 n
+0000007721 00000 n
+0000007779 00000 n
+0000007838 00000 n
+0000051326 00000 n
+0000053268 00000 n
+0000055028 00000 n
+0000007897 00000 n
+0000007956 00000 n
+0000008015 00000 n
+0000055187 00000 n
+0000008553 00000 n
+0000008603 00000 n
+0000055393 00000 n
+0000008649 00000 n
+0000008825 00000 n
+0000055319 00000 n
+0000008871 00000 n
+0000009035 00000 n
+0000009357 00000 n
+0000009967 00000 n
+0000010409 00000 n
+0000021205 00000 n
+0000021468 00000 n
+0000037399 00000 n
+0000037718 00000 n
+0000049270 00000 n
+0000049538 00000 n
+0000051485 00000 n
+0000053426 00000 n
+0000055245 00000 n
+0000055467 00000 n
+0000055644 00000 n
+0000055680 00000 n
+0000055874 00000 n
trailer
<< /Size 58
/Root 56 0 R
/Info 57 0 R
/ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
startxref
-56087
+56095
%%EOF
diff --git a/testfiles/pdffilelink.luatex.tpf b/testfiles/pdffilelink.luatex.tpf
index ca5fb69..8170e54 100644
--- a/testfiles/pdffilelink.luatex.tpf
+++ b/testfiles/pdffilelink.luatex.tpf
@@ -21,8 +21,7 @@ endobj
[ 6 0 R ]
endobj
6 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /Rect [ 147.716 704.196 164.115 715.145 ]
- /A<</Type /Action /S /GoToR /F (blub.pdf) /D (destination) >>
+<< /Type /Annot /Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /A <</Type /Action /S /GoToR /F (blub.pdf) /D (destination) >> /Rect [ 147.716 704.196 164.115 715.145 ]
>>
endobj
9 0 obj
@@ -117,25 +116,25 @@ xref
0000000000 00000 f
0000000250 00000 n
0000000405 00000 n
-0000000735 00000 n
+0000000736 00000 n
0000000067 00000 n
-0000000615 00000 n
-0000000674 00000 n
-0000003028 00000 n
-0000003382 00000 n
+0000000616 00000 n
+0000000675 00000 n
+0000003029 00000 n
+0000003383 00000 n
0000000379 00000 n
-0000000821 00000 n
-0000001998 00000 n
-0000000885 00000 n
-0000000956 00000 n
-0000002234 00000 n
-0000003182 00000 n
-0000003443 00000 n
-0000003543 00000 n
-0000003579 00000 n
-0000003736 00000 n
+0000000822 00000 n
+0000001999 00000 n
+0000000886 00000 n
+0000000957 00000 n
+0000002235 00000 n
+0000003183 00000 n
+0000003444 00000 n
+0000003544 00000 n
+0000003580 00000 n
+0000003737 00000 n
trailer
<< /Size 24 /Root 22 0 R /Info 23 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
startxref
-3957
+3958
%%EOF
diff --git a/testfiles/pdffilelink.tpf b/testfiles/pdffilelink.tpf
index 669efdf..010f72f 100644
--- a/testfiles/pdffilelink.tpf
+++ b/testfiles/pdffilelink.tpf
@@ -27,9 +27,8 @@ endobj
6 0 obj
<<
/Type /Annot
-/Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002]
+/Subtype /Link /Border [0 0 1] /H /I /C [0.444706 0.456472 0.680002] /A <</Type /Action /S /GoToR /F (blub.pdf) /D (destination) >>
/Rect [147.716 704.192 164.099 715.04]
-/A<</Type /Action /S /GoToR /F (blub.pdf) /D (destination) >>
>>
endobj
9 0 obj
@@ -252,25 +251,25 @@ xref
0000000000 00000 f
0000000215 00000 n
0000000345 00000 n
-0000000666 00000 n
+0000000667 00000 n
0000000062 00000 n
-0000000550 00000 n
-0000000607 00000 n
-0000012785 00000 n
-0000012943 00000 n
-0000000753 00000 n
-0000001112 00000 n
-0000010777 00000 n
-0000011002 00000 n
-0000013001 00000 n
-0000013097 00000 n
-0000013133 00000 n
-0000013290 00000 n
+0000000551 00000 n
+0000000608 00000 n
+0000012786 00000 n
+0000012944 00000 n
+0000000754 00000 n
+0000001113 00000 n
+0000010778 00000 n
+0000011003 00000 n
+0000013002 00000 n
+0000013098 00000 n
+0000013134 00000 n
+0000013291 00000 n
trailer
<< /Size 21
/Root 19 0 R
/Info 20 0 R
/ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
startxref
-13511
+13512
%%EOF
More information about the latex3-commits
mailing list.