[latex3-commits] [git/LaTeX3-latex3-pdfresources] test-new-hooks: annotation flags, adapted testfiles (0c8d46d)
Ulrike Fischer
fischer at troubleshooting-tex.de
Mon May 18 17:23:59 CEST 2020
Repository : https://github.com/latex3/pdfresources
On branch : test-new-hooks
Link : https://github.com/latex3/pdfresources/commit/0c8d46d869455d039ec12db59b447dfc7c7bc4f7
>---------------------------------------------------------------
commit 0c8d46d869455d039ec12db59b447dfc7c7bc4f7
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon May 18 17:23:59 2020 +0200
annotation flags, adapted testfiles
>---------------------------------------------------------------
0c8d46d869455d039ec12db59b447dfc7c7bc4f7
pdfresources.dtx | 38 +++++++++-
testfiles-dvips/ismap.tpf | Bin 4733 -> 4745 bytes
testfiles-dvips/linkhook.tpf | Bin 8067 -> 8079 bytes
testfiles-dvips/pdffilelink.tpf | Bin 4576 -> 4582 bytes
testfiles-luatex/non-ascii-links.tpf | 38 +++++-----
testfiles/ismap.luatex.tpf | 38 +++++-----
testfiles/ismap.tpf | 32 ++++-----
testfiles/ismap.xetex.tpf | 44 ++++++------
testfiles/linkbordercolor.luatex.tpf | 84 +++++++++++-----------
testfiles/linkbordercolor.tpf | 66 +++++++++---------
testfiles/linkbordercolor.xetex.tpf | 90 ++++++++++++------------
testfiles/linkhook.luatex.tpf | 50 +++++++-------
testfiles/linkhook.tpf | 42 +++++------
testfiles/linkhook.xetex.tpf | 60 ++++++++--------
testfiles/ocgcolorlinks.luatex.tpf | 112 +++++++++++++++---------------
testfiles/ocgcolorlinks.tpf | 98 +++++++++++++-------------
testfiles/ocgcolorlinks.xetex.tpf | 130 +++++++++++++++++------------------
testfiles/pdffilelink.luatex.tpf | 34 ++++-----
testfiles/pdffilelink.tpf | 28 ++++----
testfiles/pdffilelink.xetex.tpf | 40 +++++------
20 files changed, 529 insertions(+), 495 deletions(-)
diff --git a/pdfresources.dtx b/pdfresources.dtx
index 22e33c7..4659fd8 100644
--- a/pdfresources.dtx
+++ b/pdfresources.dtx
@@ -38,7 +38,7 @@
%<*package>
\RequirePackage{xparse,l3pdf}
%\RequirePackage{tmpl3shipout}
-\RequirePackage{lthooks,zref-lastpage}
+\RequirePackage{lthooks,zref-lastpage,bitset}
\ProvidesExplPackage {pdfresources} {2020-04-08} {0.5}
{experimental pdf-resource management}
\DeclareOption { debug }
@@ -3227,7 +3227,7 @@
% \end{macrocode}
-%% \subsection{Annotations, help tools}
+% \subsection{Annotations, Flags}
% \begin{variable}{ \c_pdfannot_flags_prop }
% This property list maps keys like \enquote{Invisible} to the
% bit positions for the /F-flag. It can be used
@@ -3248,6 +3248,37 @@
ToggleNoView = 8,
LockedContents = 9
}
+
+%Link annotations will always use flags, as we need for the standards.
+%If flags should be different for the subtypes, the hooks should be used.
+%Other flags should perhaps follow. For now we use the bitset package,
+%but this should perhaps change ....
+%
+\cs_new_protected:Npn \pdfannot_flag_new:n #1
+ {
+ \bitsetReset { @@_#1_flag }
+ }
+
+\pdfannot_flag_new:n {annot/Link}
+
+% #1: type, e.g. annot/Link
+% #2: name of flag, e.g. Print
+\cs_new_protected:Npn \pdfannot_flag_set:nn #1 #2
+ {
+ \bitsetSet { @@_#1_flag }{\prop_item:Nn\c_pdfannot_flags_prop {#1}}
+ }
+
+\cs_new_protected:Npn \pdfannot_flag_clear:nn #1 #2
+ {
+ \bitsetClear{ @@_#1_flag }{\prop_item:Nn\c_pdfannot_flags_prop {#1}}
+ }
+
+%flags are output as decimals.
+\cs_new:Npn \pdfannot_flag_use:n #1
+ {
+ \bitsetGetDec { @@_#1_flag }
+ }
+
% \end{macrocode}
% \subsection{Annotations, subtype Widget}\label{pdf:annot:widget}
% The local dictionary \texttt{annot/Widget} is a sceleton
@@ -3309,6 +3340,9 @@
\seq_map_inline:Nn \c_pdfannot_link_types_seq
{
\pdfdict_new:n { annot/Link/#1 }
+ \pdfdict_put:nnn { annot/Link/#1}{ F }{ \pdfannot_flag_use:n { annot/Link} }
+ \hook_new:n {pdf/annot/Link/#1/before}
+ \hook_new:n {pdf/annot/Link/#1/after}
\seq_new:c { l_@@_hook_annot/Link/#1_begin_seq }
\seq_new:c { l_@@_hook_annot/Link/#1_end_seq }
}
diff --git a/testfiles-dvips/ismap.tpf b/testfiles-dvips/ismap.tpf
index ad80e21..c99ee00 100644
Binary files a/testfiles-dvips/ismap.tpf and b/testfiles-dvips/ismap.tpf differ
diff --git a/testfiles-dvips/linkhook.tpf b/testfiles-dvips/linkhook.tpf
index 7fb8119..6b62b7a 100644
Binary files a/testfiles-dvips/linkhook.tpf and b/testfiles-dvips/linkhook.tpf differ
diff --git a/testfiles-dvips/pdffilelink.tpf b/testfiles-dvips/pdffilelink.tpf
index 4872114..7d5d718 100644
Binary files a/testfiles-dvips/pdffilelink.tpf and b/testfiles-dvips/pdffilelink.tpf differ
diff --git a/testfiles-luatex/non-ascii-links.tpf b/testfiles-luatex/non-ascii-links.tpf
index 66afaf6..b196b63 100644
--- a/testfiles-luatex/non-ascii-links.tpf
+++ b/testfiles-luatex/non-ascii-links.tpf
@@ -17,12 +17,12 @@ endobj
[ 6 0 R 7 0 R ]
endobj
6 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0 1 1] /Rect [ 147.716 704.077 196.264 715.035 ]
+<< /Type /Annot /F 0 /Border [0 0 1] /H /I /C [0 1 1] /Rect [ 147.716 704.077 196.264 715.035 ]
/Subtype/Link/A<</Type/Action /S/URI /URI(http://ang.wikipedia.org/wiki/Elisabe\303\276_I_Engla_Cw\304\223n) >>
>>
endobj
7 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0 1 1] /Rect [ 197.589 704.077 236.443 715.035 ]
+<< /Type /Annot /F 0 /Border [0 0 1] /H /I /C [0 1 1] /Rect [ 197.589 704.077 236.443 715.035 ]
/Subtype/Link/A<</Type/Action /S/URI /URI(http://ja.wikipedia.org/wiki/\343\202\250\343\203\252\343\202\266\343\203\231\343\202\2711\344\270\226_\(\343\202\244\343\203\263\343\202\260\343\203\251\343\203\263\343\203\211\345\245\263\347\216\213) >>
>>
endobj
@@ -127,26 +127,26 @@ xref
0000000000 00000 f
0000000257 00000 n
0000000418 00000 n
-0000000642 00000 n
-0000001123 00000 n
+0000000647 00000 n
+0000001133 00000 n
0000000020 00000 n
-0000001002 00000 n
-0000001062 00000 n
-0000004788 00000 n
-0000005142 00000 n
+0000001012 00000 n
+0000001072 00000 n
+0000004798 00000 n
+0000005152 00000 n
0000000386 00000 n
-0000001192 00000 n
-0000003631 00000 n
-0000001348 00000 n
-0000001421 00000 n
-0000003867 00000 n
-0000004942 00000 n
-0000005203 00000 n
-0000005304 00000 n
-0000005340 00000 n
-0000005484 00000 n
+0000001202 00000 n
+0000003641 00000 n
+0000001358 00000 n
+0000001431 00000 n
+0000003877 00000 n
+0000004952 00000 n
+0000005213 00000 n
+0000005314 00000 n
+0000005350 00000 n
+0000005494 00000 n
trailer
<< /Size 25 /Root 23 0 R /Info 24 0 R >>
startxref
-5674
+5684
%%EOF
diff --git a/testfiles/ismap.luatex.tpf b/testfiles/ismap.luatex.tpf
index 587fc46..2c24952 100644
--- a/testfiles/ismap.luatex.tpf
+++ b/testfiles/ismap.luatex.tpf
@@ -18,12 +18,12 @@ endobj
[ 6 0 R 7 0 R ]
endobj
6 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0 1 1] /Rect [ 147.716 706.129 176.01 712.415 ]
+<< /Type /Annot /F 0 /Border [0 0 1] /H /I /C [0 1 1] /Rect [ 147.716 706.129 176.01 712.415 ]
/Subtype/Link/A<</Type/Action /S/URI /URI(https://www.latex-project.org#abc~xyz) /IsMap true>>
>>
endobj
7 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0 1 1] /Rect [ 147.716 694.174 176.01 700.46 ]
+<< /Type /Annot /F 0 /Border [0 0 1] /H /I /C [0 1 1] /Rect [ 147.716 694.174 176.01 700.46 ]
/Subtype/Link/A<</Type/Action /S/URI /URI(https://www.latex-project.org#abc~xyz) >>
>>
endobj
@@ -117,26 +117,26 @@ xref
0000000000 00000 f
0000000246 00000 n
0000000407 00000 n
-0000000613 00000 n
-0000000928 00000 n
+0000000618 00000 n
+0000000938 00000 n
0000000020 00000 n
-0000000807 00000 n
-0000000867 00000 n
-0000002973 00000 n
-0000003327 00000 n
+0000000817 00000 n
+0000000877 00000 n
+0000002983 00000 n
+0000003337 00000 n
0000000375 00000 n
-0000000997 00000 n
-0000001971 00000 n
-0000001040 00000 n
-0000001115 00000 n
-0000002207 00000 n
-0000003127 00000 n
-0000003388 00000 n
-0000003489 00000 n
-0000003525 00000 n
-0000003669 00000 n
+0000001007 00000 n
+0000001981 00000 n
+0000001050 00000 n
+0000001125 00000 n
+0000002217 00000 n
+0000003137 00000 n
+0000003398 00000 n
+0000003499 00000 n
+0000003535 00000 n
+0000003679 00000 n
trailer
<< /Size 25 /Root 23 0 R /Info 24 0 R >>
startxref
-3859
+3869
%%EOF
diff --git a/testfiles/ismap.tpf b/testfiles/ismap.tpf
index 69b7952..f33b982 100644
--- a/testfiles/ismap.tpf
+++ b/testfiles/ismap.tpf
@@ -23,7 +23,7 @@ endobj
6 0 obj
<<
/Type /Annot
-/Border [0 0 1] /H /I /C [0 1 1]
+/F 0 /Border [0 0 1] /H /I /C [0 1 1]
/Rect [147.716 706.129 175.999 712.411]
/Subtype/Link/A<</Type/Action /S/URI /URI(https://www.latex-project.org#abc~xyz) /IsMap true>>
>>
@@ -31,7 +31,7 @@ endobj
7 0 obj
<<
/Type /Annot
-/Border [0 0 1] /H /I /C [0 1 1]
+/F 0 /Border [0 0 1] /H /I /C [0 1 1]
/Rect [147.716 694.174 175.999 700.456]
/Subtype/Link/A<</Type/Action /S/URI /URI(https://www.latex-project.org#abc~xyz) >>
>>
@@ -132,25 +132,25 @@ xref
0000000000 00000 f
0000000177 00000 n
0000000313 00000 n
-0000000516 00000 n
-0000000825 00000 n
+0000000521 00000 n
+0000000835 00000 n
0000000015 00000 n
-0000000708 00000 n
-0000000766 00000 n
-0000009281 00000 n
-0000009421 00000 n
-0000000893 00000 n
-0000001300 00000 n
-0000009060 00000 n
-0000009479 00000 n
-0000009576 00000 n
-0000009612 00000 n
-0000009756 00000 n
+0000000718 00000 n
+0000000776 00000 n
+0000009291 00000 n
+0000009431 00000 n
+0000000903 00000 n
+0000001310 00000 n
+0000009070 00000 n
+0000009489 00000 n
+0000009586 00000 n
+0000009622 00000 n
+0000009766 00000 n
trailer
<< /Size 21
/Root 19 0 R
/Info 20 0 R
>>
startxref
-9946
+9956
%%EOF
diff --git a/testfiles/ismap.xetex.tpf b/testfiles/ismap.xetex.tpf
index ca2b308..1b7e7a6 100644
--- a/testfiles/ismap.xetex.tpf
+++ b/testfiles/ismap.xetex.tpf
@@ -1,11 +1,11 @@
%PDF-1.5
%äðíø
6 0 obj
-<</Type/Annot/Border[0 0 1]/H/I/C[0 1 1]/Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org#abc~xyz)/IsMap
+<</Type/Annot/F 0/Border[0 0 1]/H/I/C[0 1 1]/Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org#abc~xyz)/IsMap
true>>/Rect[147.716 703.24 176.01 719.349]>>
endobj
7 0 obj
-<</Type/Annot/Border[0 0 1]/H/I/C[0 1 1]/Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org#abc~xyz)>>/Rect[147.716
+<</Type/Annot/F 0/Border[0 0 1]/H/I/C[0 1 1]/Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org#abc~xyz)>>/Rect[147.716
691.285 176.01 707.394]>>
endobj
8 0 obj
@@ -97,29 +97,29 @@ endobj
xref
0 21
0000000000 65535 f
-0000001223 00000 n
-0000001093 00000 n
-0000000923 00000 n
-0000002661 00000 n
-0000003111 00000 n
+0000001231 00000 n
+0000001101 00000 n
+0000000931 00000 n
+0000002669 00000 n
+0000003119 00000 n
0000000015 00000 n
-0000000200 00000 n
-0000000375 00000 n
-0000000627 00000 n
-0000000765 00000 n
-0000000812 00000 n
-0000000705 00000 n
-0000000859 00000 n
-0000001013 00000 n
-0000000893 00000 n
-0000001325 00000 n
-0000002850 00000 n
-0000001745 00000 n
-0000002563 00000 n
-0000002597 00000 n
+0000000204 00000 n
+0000000383 00000 n
+0000000635 00000 n
+0000000773 00000 n
+0000000820 00000 n
+0000000713 00000 n
+0000000867 00000 n
+0000001021 00000 n
+0000000901 00000 n
+0000001333 00000 n
+0000002858 00000 n
+0000001753 00000 n
+0000002571 00000 n
+0000002605 00000 n
trailer
<</Root 1 0 R/Info 2 0 R/ID[<ID-STRING><ID-STRING>]/Size
21>>
startxref
-3260
+3268
%%EOF
diff --git a/testfiles/linkbordercolor.luatex.tpf b/testfiles/linkbordercolor.luatex.tpf
index b6159f2..e05ace7 100644
--- a/testfiles/linkbordercolor.luatex.tpf
+++ b/testfiles/linkbordercolor.luatex.tpf
@@ -29,20 +29,20 @@ endobj
[ 6 0 R 7 0 R 8 0 R 9 0 R ]
endobj
6 0 obj
-<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [0 1 0] /Rect [ 156.304 644.284 163.278 653.191 ]/A << /S /GoTo /D (section.1) >> >>
+<< /Type /Annot /Subtype /Link /F 0 /Border [1 1 1] /H /I /C [0 1 0] /Rect [ 156.304 644.284 163.278 653.191 ]/A << /S /GoTo /D (section.1) >> >>
endobj
7 0 obj
-<< /Type /Annot /Border [1 1 1] /H /I /C [0 0 1] /Rect [ 152.179 632.219 211.706 641.235 ]
+<< /Type /Annot /F 0 /Border [1 1 1] /H /I /C [0 0 1] /Rect [ 152.179 632.219 211.706 641.235 ]
/Subtype/Link/A<</Type/Action /S/URI /URI(www.blub.de) >>
>>
endobj
8 0 obj
-<< /Type /Annot /Border [1 1 1] /H /I /C [1 1 0] /Rect [ 152.697 620.264 186.839 629.39 ]
+<< /Type /Annot /F 0 /Border [1 1 1] /H /I /C [1 1 0] /Rect [ 152.697 620.264 186.839 629.39 ]
/Subtype/Link/A<</F(test-pdfresources.pdf)/S/GoToR/D[0/Fit]>>
>>
endobj
9 0 obj
-<< /Type /Annot /Border [1 1 1] /H /I /C [.75 .5 .25] /Rect [ 163.487 608.309 185.833 617.325 ]
+<< /Type /Annot /F 0 /Border [1 1 1] /H /I /C [.75 .5 .25] /Rect [ 163.487 608.309 185.833 617.325 ]
/Subtype/Link/A<</S/Named/N/Find>>
>>
endobj
@@ -299,47 +299,47 @@ xref
0000000000 00000 f
0000000622 00000 n
0000000790 00000 n
-0000000948 00000 n
-0000001118 00000 n
-0000001291 00000 n
-0000001564 00000 n
+0000000953 00000 n
+0000001128 00000 n
+0000001306 00000 n
+0000001584 00000 n
0000000020 00000 n
-0000001443 00000 n
-0000001503 00000 n
-0000011646 00000 n
-0000006923 00000 n
-0000012000 00000 n
+0000001463 00000 n
+0000001523 00000 n
+0000011666 00000 n
+0000006943 00000 n
+0000012020 00000 n
0000000746 00000 n
-0000002033 00000 n
-0000002095 00000 n
-0000001862 00000 n
-0000001646 00000 n
-0000001972 00000 n
-0000004038 00000 n
-0000002177 00000 n
-0000003053 00000 n
-0000002219 00000 n
-0000002290 00000 n
-0000003287 00000 n
-0000004189 00000 n
-0000004386 00000 n
-0000005857 00000 n
-0000004485 00000 n
-0000004560 00000 n
-0000006092 00000 n
-0000007076 00000 n
-0000007275 00000 n
-0000010401 00000 n
-0000007501 00000 n
-0000007577 00000 n
-0000010637 00000 n
-0000011800 00000 n
-0000012068 00000 n
-0000012207 00000 n
-0000012243 00000 n
-0000012387 00000 n
+0000002053 00000 n
+0000002115 00000 n
+0000001882 00000 n
+0000001666 00000 n
+0000001992 00000 n
+0000004058 00000 n
+0000002197 00000 n
+0000003073 00000 n
+0000002239 00000 n
+0000002310 00000 n
+0000003307 00000 n
+0000004209 00000 n
+0000004406 00000 n
+0000005877 00000 n
+0000004505 00000 n
+0000004580 00000 n
+0000006112 00000 n
+0000007096 00000 n
+0000007295 00000 n
+0000010421 00000 n
+0000007521 00000 n
+0000007597 00000 n
+0000010657 00000 n
+0000011820 00000 n
+0000012088 00000 n
+0000012227 00000 n
+0000012263 00000 n
+0000012407 00000 n
trailer
<< /Size 46 /Root 44 0 R /Info 45 0 R >>
startxref
-12577
+12597
%%EOF
diff --git a/testfiles/linkbordercolor.tpf b/testfiles/linkbordercolor.tpf
index 6bdff7c..efd62de 100644
--- a/testfiles/linkbordercolor.tpf
+++ b/testfiles/linkbordercolor.tpf
@@ -30,7 +30,7 @@ endobj
<<
/Type /Annot
/Subtype /Link
-/Border [1 1 1] /H /I /C [0 1 0]
+/F 0 /Border [1 1 1] /H /I /C [0 1 0]
/Rect [156.295 644.284 163.269 653.195]
/A << /S /GoTo /D (section.1) >>
>>
@@ -38,7 +38,7 @@ endobj
7 0 obj
<<
/Type /Annot
-/Border [1 1 1] /H /I /C [0 0 1]
+/F 0 /Border [1 1 1] /H /I /C [0 0 1]
/Rect [152.172 632.329 211.698 641.24]
/Subtype/Link/A<</Type/Action /S/URI /URI(www.blub.de) >>
>>
@@ -46,7 +46,7 @@ endobj
8 0 obj
<<
/Type /Annot
-/Border [1 1 1] /H /I /C [1 1 0]
+/F 0 /Border [1 1 1] /H /I /C [1 1 0]
/Rect [152.697 620.374 186.847 629.285]
/Subtype/Link/A<</F(test-pdfresources.pdf)/S/GoToR/D[0/Fit]>>
>>
@@ -54,7 +54,7 @@ endobj
9 0 obj
<<
/Type /Annot
-/Border [1 1 1] /H /I /C [.75 .5 .25]
+/F 0 /Border [1 1 1] /H /I /C [.75 .5 .25]
/Rect [163.49 608.418 185.823 617.329]
/Subtype/Link/A<</S/Named/N/Find>>
>>
@@ -273,40 +273,40 @@ xref
0000000000 00000 f
0000000409 00000 n
0000000552 00000 n
-0000000708 00000 n
-0000000873 00000 n
-0000001043 00000 n
-0000001307 00000 n
+0000000713 00000 n
+0000000883 00000 n
+0000001058 00000 n
+0000001327 00000 n
0000000015 00000 n
-0000001190 00000 n
-0000001248 00000 n
-0000034476 00000 n
-0000034616 00000 n
-0000034757 00000 n
-0000001744 00000 n
-0000001804 00000 n
-0000001577 00000 n
-0000001388 00000 n
-0000001685 00000 n
-0000034336 00000 n
-0000001885 00000 n
-0000002185 00000 n
-0000002499 00000 n
-0000003085 00000 n
-0000010671 00000 n
-0000010894 00000 n
-0000024032 00000 n
-0000024294 00000 n
-0000034103 00000 n
-0000034822 00000 n
-0000034957 00000 n
-0000034993 00000 n
-0000035137 00000 n
+0000001210 00000 n
+0000001268 00000 n
+0000034496 00000 n
+0000034636 00000 n
+0000034777 00000 n
+0000001764 00000 n
+0000001824 00000 n
+0000001597 00000 n
+0000001408 00000 n
+0000001705 00000 n
+0000034356 00000 n
+0000001905 00000 n
+0000002205 00000 n
+0000002519 00000 n
+0000003105 00000 n
+0000010691 00000 n
+0000010914 00000 n
+0000024052 00000 n
+0000024314 00000 n
+0000034123 00000 n
+0000034842 00000 n
+0000034977 00000 n
+0000035013 00000 n
+0000035157 00000 n
trailer
<< /Size 36
/Root 34 0 R
/Info 35 0 R
>>
startxref
-35327
+35347
%%EOF
diff --git a/testfiles/linkbordercolor.xetex.tpf b/testfiles/linkbordercolor.xetex.tpf
index f6c3d7d..c3b8a77 100644
--- a/testfiles/linkbordercolor.xetex.tpf
+++ b/testfiles/linkbordercolor.xetex.tpf
@@ -1,19 +1,19 @@
%PDF-1.5
%äðíø
6 0 obj
-<</Type/Annot/Border[1 1 1]/H/I/C[0 1 0]/Subtype/Link/A<</S/GoTo/D(section.1)>>/Rect[156.304
+<</Type/Annot/F 0/Border[1 1 1]/H/I/C[0 1 0]/Subtype/Link/A<</S/GoTo/D(section.1)>>/Rect[156.304
641.395 163.278 657.504]>>
endobj
9 0 obj
-<</Type/Annot/Border[1 1 1]/H/I/C[0 0 1]/Subtype/Link/A<</Type/Action/S/URI/URI(www.blub.de)>>/Rect[152.179
+<</Type/Annot/F 0/Border[1 1 1]/H/I/C[0 0 1]/Subtype/Link/A<</Type/Action/S/URI/URI(www.blub.de)>>/Rect[152.179
629.181 211.706 644.443]>>
endobj
10 0 obj
-<</Type/Annot/Border[1 1 1]/H/I/C[1 1 0]/Subtype/Link/A<</F(test-pdfresources.pdf)/S/GoToR/D[0/Fit]>>/Rect[152.697
+<</Type/Annot/F 0/Border[1 1 1]/H/I/C[1 1 0]/Subtype/Link/A<</F(test-pdfresources.pdf)/S/GoToR/D[0/Fit]>>/Rect[152.697
617.484 186.839 633.594]>>
endobj
11 0 obj
-<</Type/Annot/Border[1 1 1]/H/I/C[.75 .5 .25]/Subtype/Link/A<</S/Named/N/Find>>/Rect[163.487
+<</Type/Annot/F 0/Border[1 1 1]/H/I/C[.75 .5 .25]/Subtype/Link/A<</S/Named/N/Find>>/Rect[163.487
605.529 185.833 621.639]>>
endobj
12 0 obj
@@ -245,50 +245,50 @@ endobj
xref
0 42
0000000000 65535 f
-0000002530 00000 n
-0000002323 00000 n
-0000002071 00000 n
-0000007206 00000 n
-0000010763 00000 n
+0000002546 00000 n
+0000002339 00000 n
+0000002087 00000 n
+0000007222 00000 n
+0000010779 00000 n
0000000015 00000 n
-0000009051 00000 n
-0000010912 00000 n
-0000000150 00000 n
-0000000300 00000 n
-0000000458 00000 n
-0000000594 00000 n
-0000001322 00000 n
-0000002163 00000 n
-0000010312 00000 n
-0000011060 00000 n
-0000001410 00000 n
-0000001625 00000 n
-0000001805 00000 n
-0000001851 00000 n
-0000001898 00000 n
-0000001946 00000 n
-0000001714 00000 n
-0000001993 00000 n
-0000002242 00000 n
-0000002027 00000 n
-0000002632 00000 n
-0000003295 00000 n
-0000003784 00000 n
-0000007395 00000 n
-0000004201 00000 n
-0000006988 00000 n
-0000007141 00000 n
-0000009239 00000 n
-0000007656 00000 n
-0000008917 00000 n
-0000008987 00000 n
-0000010499 00000 n
-0000009498 00000 n
-0000010219 00000 n
-0000010252 00000 n
+0000009067 00000 n
+0000010928 00000 n
+0000000154 00000 n
+0000000308 00000 n
+0000000470 00000 n
+0000000610 00000 n
+0000001338 00000 n
+0000002179 00000 n
+0000010328 00000 n
+0000011076 00000 n
+0000001426 00000 n
+0000001641 00000 n
+0000001821 00000 n
+0000001867 00000 n
+0000001914 00000 n
+0000001962 00000 n
+0000001730 00000 n
+0000002009 00000 n
+0000002258 00000 n
+0000002043 00000 n
+0000002648 00000 n
+0000003311 00000 n
+0000003800 00000 n
+0000007411 00000 n
+0000004217 00000 n
+0000007004 00000 n
+0000007157 00000 n
+0000009255 00000 n
+0000007672 00000 n
+0000008933 00000 n
+0000009003 00000 n
+0000010515 00000 n
+0000009514 00000 n
+0000010235 00000 n
+0000010268 00000 n
trailer
<</Root 1 0 R/Info 2 0 R/ID[<ID-STRING><ID-STRING>]/Size
42>>
startxref
-11208
+11224
%%EOF
diff --git a/testfiles/linkhook.luatex.tpf b/testfiles/linkhook.luatex.tpf
index 59b2506..0eae5af 100644
--- a/testfiles/linkhook.luatex.tpf
+++ b/testfiles/linkhook.luatex.tpf
@@ -26,12 +26,12 @@ endobj
[ 6 0 R 7 0 R ]
endobj
6 0 obj
-<< /Type /Annot /Border [1 1 1] /H /I /C [0 1 1] /StructParent 123 /Contents (url) /Rect [ 186.78 654.187 205.111 665.146 ]
+<< /Type /Annot /F 0 /Border [1 1 1] /H /I /C [0 1 1] /StructParent 123 /Contents (url) /Rect [ 186.78 654.187 205.111 665.146 ]
/Subtype/Link/A<</Type/Action /S/URI /URI(www.dante.de) >>
>>
endobj
7 0 obj
-<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [1 1 0] /Contents (ref) /Rect [ 132.772 601.447 139.746 610.074 ]/A << /S /GoTo /D (section.1) >> >>
+<< /Type /Annot /Subtype /Link /F 0 /Border [1 1 1] /H /I /C [1 1 0] /Contents (ref) /Rect [ 132.772 601.447 139.746 610.074 ]/A << /S /GoTo /D (section.1) >> >>
endobj
10 0 obj
<< /D [ 5 0 R /XYZ 132.768 705.06 null ] >>
@@ -190,32 +190,32 @@ xref
0000000000 00000 f
0000000444 00000 n
0000000598 00000 n
-0000000802 00000 n
-0000001158 00000 n
+0000000807 00000 n
+0000001168 00000 n
0000000020 00000 n
-0000000976 00000 n
-0000001036 00000 n
-0000007304 00000 n
-0000001097 00000 n
-0000003769 00000 n
-0000007658 00000 n
+0000000986 00000 n
+0000001046 00000 n
+0000007314 00000 n
+0000001107 00000 n
+0000003779 00000 n
+0000007668 00000 n
0000000566 00000 n
-0000001215 00000 n
-0000002715 00000 n
-0000001317 00000 n
-0000002934 00000 n
-0000003920 00000 n
-0000004117 00000 n
-0000006190 00000 n
-0000004259 00000 n
-0000006411 00000 n
-0000007458 00000 n
-0000007719 00000 n
-0000007842 00000 n
-0000007878 00000 n
-0000008035 00000 n
+0000001225 00000 n
+0000002725 00000 n
+0000001327 00000 n
+0000002944 00000 n
+0000003930 00000 n
+0000004127 00000 n
+0000006200 00000 n
+0000004269 00000 n
+0000006421 00000 n
+0000007468 00000 n
+0000007729 00000 n
+0000007852 00000 n
+0000007888 00000 n
+0000008045 00000 n
trailer
<< /Size 31 /Root 29 0 R /Info 30 0 R >>
startxref
-8225
+8235
%%EOF
diff --git a/testfiles/linkhook.tpf b/testfiles/linkhook.tpf
index b159adf..4fc0d28 100644
--- a/testfiles/linkhook.tpf
+++ b/testfiles/linkhook.tpf
@@ -29,7 +29,7 @@ endobj
6 0 obj
<<
/Type /Annot
-/Border [1 1 1] /H /I /C [0 1 1] /StructParent 123 /Contents (url)
+/F 0 /Border [1 1 1] /H /I /C [0 1 1] /StructParent 123 /Contents (url)
/Rect [186.764 654.302 205.084 665.15]
/Subtype/Link/A<</Type/Action /S/URI /URI(www.dante.de) >>
>>
@@ -38,7 +38,7 @@ endobj
<<
/Type /Annot
/Subtype /Link
-/Border [1 1 1] /H /I /C [1 1 0] /Contents (ref)
+/F 0 /Border [1 1 1] /H /I /C [1 1 0] /Contents (ref)
/Rect [132.772 601.472 139.746 609.885]
/A << /S /GoTo /D (section.1) >>
>>
@@ -183,30 +183,30 @@ xref
0000000000 00000 f
0000000312 00000 n
0000000441 00000 n
-0000000641 00000 n
-0000000989 00000 n
+0000000646 00000 n
+0000000999 00000 n
0000000015 00000 n
-0000000813 00000 n
-0000000871 00000 n
-0000022594 00000 n
-0000000930 00000 n
-0000022453 00000 n
-0000022734 00000 n
-0000001069 00000 n
-0000001471 00000 n
-0000001860 00000 n
-0000010403 00000 n
-0000010638 00000 n
-0000022214 00000 n
-0000022792 00000 n
-0000022911 00000 n
-0000022947 00000 n
-0000023104 00000 n
+0000000823 00000 n
+0000000881 00000 n
+0000022604 00000 n
+0000000940 00000 n
+0000022463 00000 n
+0000022744 00000 n
+0000001079 00000 n
+0000001481 00000 n
+0000001870 00000 n
+0000010413 00000 n
+0000010648 00000 n
+0000022224 00000 n
+0000022802 00000 n
+0000022921 00000 n
+0000022957 00000 n
+0000023114 00000 n
trailer
<< /Size 26
/Root 24 0 R
/Info 25 0 R
>>
startxref
-23294
+23304
%%EOF
diff --git a/testfiles/linkhook.xetex.tpf b/testfiles/linkhook.xetex.tpf
index 9777cd1..e77c021 100644
--- a/testfiles/linkhook.xetex.tpf
+++ b/testfiles/linkhook.xetex.tpf
@@ -1,11 +1,11 @@
%PDF-2.0
%äðíø
6 0 obj
-<</Type/Annot/Border[1 1 1]/H/I/C[0 1 1]/StructParent 123/Contents(url)/Subtype/Link/A<</Type/Action/S/URI/URI(www.dante.de)>>/Rect[186.78
+<</Type/Annot/F 0/Border[1 1 1]/H/I/C[0 1 1]/StructParent 123/Contents(url)/Subtype/Link/A<</Type/Action/S/URI/URI(www.dante.de)>>/Rect[186.78
653.35 205.111 669.46]>>
endobj
9 0 obj
-<</Type/Annot/Border[1 1 1]/H/I/C[1 1 0]/Contents(ref)/Subtype/Link/A<</S/GoTo/D(section.1)>>/Rect[132.772
+<</Type/Annot/F 0/Border[1 1 1]/H/I/C[1 1 0]/Contents(ref)/Subtype/Link/A<</S/GoTo/D(section.1)>>/Rect[132.772
598.557 139.746 614.667]>>
endobj
10 0 obj
@@ -165,37 +165,37 @@ endobj
xref
0 29
0000000000 65535 f
-0000001527 00000 n
-0000001397 00000 n
-0000001231 00000 n
-0000004743 00000 n
-0000007136 00000 n
+0000001535 00000 n
+0000001405 00000 n
+0000001239 00000 n
+0000004751 00000 n
+0000007144 00000 n
0000000015 00000 n
-0000006686 00000 n
-0000007285 00000 n
-0000000194 00000 n
-0000000343 00000 n
-0000000862 00000 n
-0000001027 00000 n
-0000001073 00000 n
-0000001120 00000 n
-0000000950 00000 n
-0000001167 00000 n
-0000001323 00000 n
-0000001201 00000 n
-0000001641 00000 n
-0000002188 00000 n
-0000004932 00000 n
-0000002689 00000 n
-0000004583 00000 n
-0000004680 00000 n
-0000006872 00000 n
-0000005193 00000 n
-0000006550 00000 n
-0000006623 00000 n
+0000006694 00000 n
+0000007293 00000 n
+0000000198 00000 n
+0000000351 00000 n
+0000000870 00000 n
+0000001035 00000 n
+0000001081 00000 n
+0000001128 00000 n
+0000000958 00000 n
+0000001175 00000 n
+0000001331 00000 n
+0000001209 00000 n
+0000001649 00000 n
+0000002196 00000 n
+0000004940 00000 n
+0000002697 00000 n
+0000004591 00000 n
+0000004688 00000 n
+0000006880 00000 n
+0000005201 00000 n
+0000006558 00000 n
+0000006631 00000 n
trailer
<</Root 1 0 R/Info 2 0 R/ID[<ID-STRING><ID-STRING>]/Size
29>>
startxref
-7431
+7439
%%EOF
diff --git a/testfiles/ocgcolorlinks.luatex.tpf b/testfiles/ocgcolorlinks.luatex.tpf
index d23eee3..24113aa 100644
--- a/testfiles/ocgcolorlinks.luatex.tpf
+++ b/testfiles/ocgcolorlinks.luatex.tpf
@@ -291,54 +291,54 @@ endobj
[ 10 0 R 11 0 R 12 0 R 13 0 R 14 0 R 15 0 R 16 0 R 17 0 R 18 0 R 19 0 R 20 0 R 21 0 R ]
endobj
10 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 0] /H /I /C [1 0 0] /Rect [ 226.869 604.719 233.843 618.667 ]/A << /S /GoTo /D (section.1) >> >>
+<< /Type /Annot /Subtype /Link /F 0 /Border [0 0 0] /H /I /C [1 0 0] /Rect [ 226.869 604.719 233.843 618.667 ]/A << /S /GoTo /D (section.1) >> >>
endobj
11 0 obj
-<< /Type /Annot /Subtype /Link /Border [0 0 0] /H /I /C [1 0 0] /Rect [ 229.639 584.396 236.613 593.023 ]/A << /S /GoTo /D (cite.cite) >> >>
+<< /Type /Annot /Subtype /Link /F 0 /Border [0 0 0] /H /I /C [1 0 0] /Rect [ 229.639 584.396 236.613 593.023 ]/A << /S /GoTo /D (cite.cite) >> >>
endobj
12 0 obj
-<< /Type /Annot /Border [0 0 0] /H /I /C [0 .5 .5] /Rect [ 226.869 556.899 241.594 570.846 ]
+<< /Type /Annot /F 0 /Border [0 0 0] /H /I /C [0 .5 .5] /Rect [ 226.869 556.899 241.594 570.846 ]
/Subtype/Link/A<</F(example-image.pdf)/S/GoToR/D[0/Fit]>>
>>
endobj
13 0 obj
-<< /Type /Annot /Border [0 0 0] /H /I /C [0 1 1] /Rect [ 226.869 532.988 386.271 546.936 ]
+<< /Type /Annot /F 0 /Border [0 0 0] /H /I /C [0 1 1] /Rect [ 226.869 532.988 386.271 546.936 ]
/Subtype/Link/A<</Type/Action /S/URI /URI(https://www.latex-project.org/) >>
>>
endobj
14 0 obj
-<< /Type /Annot /Border [0 0 0] /H /I /C [1 0 0] /Rect [ 226.869 509.078 299.985 523.026 ]
+<< /Type /Annot /F 0 /Border [0 0 0] /H /I /C [1 0 0] /Rect [ 226.869 509.078 299.985 523.026 ]
/Subtype/Link/A<</S/Named/N/View>>
>>
endobj
15 0 obj
-<< /Type /Annot /Border [0 0 0] /H /I /C [0 .7 .7] /Rect [ 226.869 485.168 291.497 499.115 ]
+<< /Type /Annot /F 0 /Border [0 0 0] /H /I /C [0 .7 .7] /Rect [ 226.869 485.168 291.497 499.115 ]
/Subtype/Link/A<</F(sumatra)/S/Launch>>
>>
endobj
16 0 obj
-<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [1 0 0] /Rect [ 274.859 407.66 281.833 421.608 ]/A << /S /GoTo /D (section.1) >> >>
+<< /Type /Annot /Subtype /Link /F 0 /Border [1 1 1] /H /I /C [1 0 0] /Rect [ 274.859 407.66 281.833 421.608 ]/A << /S /GoTo /D (section.1) >> >>
endobj
17 0 obj
-<< /Type /Annot /Subtype /Link /Border [1 1 1] /H /I /C [1 0 0] /Rect [ 277.629 387.337 284.603 395.964 ]/A << /S /GoTo /D (cite.cite) >> >>
+<< /Type /Annot /Subtype /Link /F 0 /Border [1 1 1] /H /I /C [1 0 0] /Rect [ 277.629 387.337 284.603 395.964 ]/A << /S /GoTo /D (cite.cite) >> >>
endobj
18 0 obj
-<< /Type /Annot /Border [1 1 1] /H /I /C [0 .5 .5] /Rect [ 274.859 359.84 289.584 373.787 ]
+<< /Type /Annot /F 0 /Border [1 1 1] /H /I /C [0 .5 .5] /Rect [ 274.859 359.84 289.584 373.787 ]
/Subtype/Link/A<</F(example-image.pdf)/S/GoToR/D[0/Fit]>>
>>
endobj
19 0 obj
-<< /Type /Annot /Border [1 1 1] /H /I /C [0 1 1] /Rect [ 274.859 335.929 434.262 349.877 ]
+<< /Type /Annot /F 0 /Border [1 1 1] /H /I /C [0 1 1] /Rect [ 274.859 335.929 434.262 349.877 ]
/Subtype/Link/A<</Type/Action /S/URI /URI(https://www.latex-project.org/) >>
>>
endobj
20 0 obj
-<< /Type /Annot /Border [1 1 1] /H /I /C [1 0 0] /Rect [ 274.859 312.019 347.975 325.967 ]
+<< /Type /Annot /F 0 /Border [1 1 1] /H /I /C [1 0 0] /Rect [ 274.859 312.019 347.975 325.967 ]
/Subtype/Link/A<</S/Named/N/View>>
>>
endobj
21 0 obj
-<< /Type /Annot /Border [1 1 1] /H /I /C [0 .7 .7] /Rect [ 274.859 288.109 339.487 302.056 ]
+<< /Type /Annot /F 0 /Border [1 1 1] /H /I /C [0 .7 .7] /Rect [ 274.859 288.109 339.487 302.056 ]
/Subtype/Link/A<</F(sumatra)/S/Launch>>
>>
endobj
@@ -628,55 +628,55 @@ xref
0000000020 00000 n
0000006770 00000 n
0000006998 00000 n
-0000007157 00000 n
-0000007316 00000 n
-0000007489 00000 n
-0000007679 00000 n
-0000007827 00000 n
-0000007982 00000 n
-0000008140 00000 n
-0000008299 00000 n
-0000008471 00000 n
-0000008661 00000 n
-0000008809 00000 n
-0000009328 00000 n
+0000007162 00000 n
+0000007326 00000 n
+0000007504 00000 n
+0000007699 00000 n
+0000007852 00000 n
+0000008012 00000 n
+0000008175 00000 n
+0000008339 00000 n
+0000008516 00000 n
+0000008711 00000 n
+0000008864 00000 n
+0000009388 00000 n
0000000423 00000 n
-0000008964 00000 n
0000009024 00000 n
-0000009085 00000 n
-0000025048 00000 n
-0000020470 00000 n
-0000013824 00000 n
-0000009146 00000 n
-0000009207 00000 n
+0000009084 00000 n
+0000009145 00000 n
+0000025108 00000 n
+0000020530 00000 n
+0000013884 00000 n
+0000009206 00000 n
0000009267 00000 n
-0000025396 00000 n
+0000009327 00000 n
+0000025456 00000 n
0000006894 00000 n
-0000009766 00000 n
-0000009816 00000 n
-0000012603 00000 n
-0000010024 00000 n
-0000010099 00000 n
-0000012838 00000 n
-0000013977 00000 n
-0000014176 00000 n
-0000019043 00000 n
-0000014529 00000 n
-0000014605 00000 n
-0000019279 00000 n
-0000020624 00000 n
-0000020824 00000 n
-0000023824 00000 n
-0000021042 00000 n
-0000021117 00000 n
-0000024058 00000 n
-0000025199 00000 n
-0000025457 00000 n
-0000025638 00000 n
-0000025674 00000 n
-0000025838 00000 n
+0000009826 00000 n
+0000009876 00000 n
+0000012663 00000 n
+0000010084 00000 n
+0000010159 00000 n
+0000012898 00000 n
+0000014037 00000 n
+0000014236 00000 n
+0000019103 00000 n
+0000014589 00000 n
+0000014665 00000 n
+0000019339 00000 n
+0000020684 00000 n
+0000020884 00000 n
+0000023884 00000 n
+0000021102 00000 n
+0000021177 00000 n
+0000024118 00000 n
+0000025259 00000 n
+0000025517 00000 n
+0000025698 00000 n
+0000025734 00000 n
+0000025898 00000 n
trailer
<< /Size 58 /Root 56 0 R /Info 57 0 R >>
startxref
-26028
+26088
%%EOF
diff --git a/testfiles/ocgcolorlinks.tpf b/testfiles/ocgcolorlinks.tpf
index 1e498df..3e51c55 100644
--- a/testfiles/ocgcolorlinks.tpf
+++ b/testfiles/ocgcolorlinks.tpf
@@ -256,7 +256,7 @@ endobj
<<
/Type /Annot
/Subtype /Link
-/Border [0 0 0] /H /I /C [1 0 0]
+/F 0 /Border [0 0 0] /H /I /C [1 0 0]
/Rect [226.864 604.73 233.838 618.677]
/A << /S /GoTo /D (section.1) >>
>>
@@ -265,7 +265,7 @@ endobj
<<
/Type /Annot
/Subtype /Link
-/Border [0 0 0] /H /I /C [1 0 0]
+/F 0 /Border [0 0 0] /H /I /C [1 0 0]
/Rect [229.631 584.406 236.605 592.819]
/A << /S /GoTo /D (cite.cite) >>
>>
@@ -273,7 +273,7 @@ endobj
12 0 obj
<<
/Type /Annot
-/Border [0 0 0] /H /I /C [0 .5 .5]
+/F 0 /Border [0 0 0] /H /I /C [0 .5 .5]
/Rect [226.864 556.909 241.586 570.857]
/Subtype/Link/A<</F(example-image.pdf)/S/GoToR/D[0/Fit]>>
>>
@@ -281,7 +281,7 @@ endobj
13 0 obj
<<
/Type /Annot
-/Border [0 0 0] /H /I /C [0 1 1]
+/F 0 /Border [0 0 0] /H /I /C [0 1 1]
/Rect [226.864 532.999 386.265 546.946]
/Subtype/Link/A<</Type/Action /S/URI /URI(https://www.latex-project.org/) >>
>>
@@ -289,7 +289,7 @@ endobj
14 0 obj
<<
/Type /Annot
-/Border [0 0 0] /H /I /C [1 0 0]
+/F 0 /Border [0 0 0] /H /I /C [1 0 0]
/Rect [226.864 509.088 299.979 523.036]
/Subtype/Link/A<</S/Named/N/View>>
>>
@@ -297,7 +297,7 @@ endobj
15 0 obj
<<
/Type /Annot
-/Border [0 0 0] /H /I /C [0 .7 .7]
+/F 0 /Border [0 0 0] /H /I /C [0 .7 .7]
/Rect [226.864 485.178 291.483 499.126]
/Subtype/Link/A<</F(sumatra)/S/Launch>>
>>
@@ -306,7 +306,7 @@ endobj
<<
/Type /Annot
/Subtype /Link
-/Border [1 1 1] /H /I /C [1 0 0]
+/F 0 /Border [1 1 1] /H /I /C [1 0 0]
/Rect [274.823 407.696 281.797 421.644]
/A << /S /GoTo /D (section.1) >>
>>
@@ -315,7 +315,7 @@ endobj
<<
/Type /Annot
/Subtype /Link
-/Border [1 1 1] /H /I /C [1 0 0]
+/F 0 /Border [1 1 1] /H /I /C [1 0 0]
/Rect [277.59 387.373 284.564 395.785]
/A << /S /GoTo /D (cite.cite) >>
>>
@@ -323,7 +323,7 @@ endobj
18 0 obj
<<
/Type /Annot
-/Border [1 1 1] /H /I /C [0 .5 .5]
+/F 0 /Border [1 1 1] /H /I /C [0 .5 .5]
/Rect [274.823 359.876 289.546 373.823]
/Subtype/Link/A<</F(example-image.pdf)/S/GoToR/D[0/Fit]>>
>>
@@ -331,7 +331,7 @@ endobj
19 0 obj
<<
/Type /Annot
-/Border [1 1 1] /H /I /C [0 1 1]
+/F 0 /Border [1 1 1] /H /I /C [0 1 1]
/Rect [274.823 335.965 434.224 349.913]
/Subtype/Link/A<</Type/Action /S/URI /URI(https://www.latex-project.org/) >>
>>
@@ -339,7 +339,7 @@ endobj
20 0 obj
<<
/Type /Annot
-/Border [1 1 1] /H /I /C [1 0 0]
+/F 0 /Border [1 1 1] /H /I /C [1 0 0]
/Rect [274.823 312.055 347.938 326.003]
/Subtype/Link/A<</S/Named/N/View>>
>>
@@ -347,7 +347,7 @@ endobj
21 0 obj
<<
/Type /Annot
-/Border [1 1 1] /H /I /C [0 .7 .7]
+/F 0 /Border [1 1 1] /H /I /C [0 .7 .7]
/Rect [274.823 288.145 339.442 302.092]
/Subtype/Link/A<</F(sumatra)/S/Launch>>
>>
@@ -554,48 +554,48 @@ xref
0000000015 00000 n
0000004607 00000 n
0000004810 00000 n
-0000004966 00000 n
-0000005123 00000 n
-0000005292 00000 n
-0000005478 00000 n
-0000005622 00000 n
-0000005773 00000 n
-0000005930 00000 n
-0000006086 00000 n
-0000006255 00000 n
-0000006441 00000 n
-0000006585 00000 n
-0000007089 00000 n
+0000004971 00000 n
+0000005133 00000 n
+0000005307 00000 n
+0000005498 00000 n
+0000005647 00000 n
+0000005803 00000 n
+0000005965 00000 n
+0000006126 00000 n
+0000006300 00000 n
+0000006491 00000 n
+0000006640 00000 n
+0000007149 00000 n
0000000418 00000 n
-0000006736 00000 n
-0000006794 00000 n
-0000006853 00000 n
-0000048103 00000 n
-0000048244 00000 n
-0000048384 00000 n
-0000006912 00000 n
-0000006971 00000 n
-0000007030 00000 n
-0000048525 00000 n
-0000007550 00000 n
-0000007600 00000 n
-0000007922 00000 n
-0000008532 00000 n
-0000008974 00000 n
-0000019770 00000 n
-0000020033 00000 n
-0000035964 00000 n
-0000036283 00000 n
-0000047835 00000 n
-0000048583 00000 n
-0000048760 00000 n
-0000048796 00000 n
-0000048960 00000 n
+0000006796 00000 n
+0000006854 00000 n
+0000006913 00000 n
+0000048163 00000 n
+0000048304 00000 n
+0000048444 00000 n
+0000006972 00000 n
+0000007031 00000 n
+0000007090 00000 n
+0000048585 00000 n
+0000007610 00000 n
+0000007660 00000 n
+0000007982 00000 n
+0000008592 00000 n
+0000009034 00000 n
+0000019830 00000 n
+0000020093 00000 n
+0000036024 00000 n
+0000036343 00000 n
+0000047895 00000 n
+0000048643 00000 n
+0000048820 00000 n
+0000048856 00000 n
+0000049020 00000 n
trailer
<< /Size 48
/Root 46 0 R
/Info 47 0 R
>>
startxref
-49150
+49210
%%EOF
diff --git a/testfiles/ocgcolorlinks.xetex.tpf b/testfiles/ocgcolorlinks.xetex.tpf
index 724265a..e85eba1 100644
--- a/testfiles/ocgcolorlinks.xetex.tpf
+++ b/testfiles/ocgcolorlinks.xetex.tpf
@@ -1,51 +1,51 @@
%PDF-1.5
%äðíø
13 0 obj
-<</Type/Annot/Border[0 0 0]/H/I/C[1 0 0]/Subtype/Link/A<</S/GoTo/D(section.1)>>/Rect[226.869
+<</Type/Annot/F 0/Border[0 0 0]/H/I/C[1 0 0]/Subtype/Link/A<</S/GoTo/D(section.1)>>/Rect[226.869
605.417 233.843 621.526]>>
endobj
14 0 obj
-<</Type/Annot/Border[0 0 0]/H/I/C[1 0 0]/Subtype/Link/A<</S/GoTo/D(cite.cite)>>/Rect[229.639
+<</Type/Annot/F 0/Border[0 0 0]/H/I/C[1 0 0]/Subtype/Link/A<</S/GoTo/D(cite.cite)>>/Rect[229.639
581.506 236.613 597.616]>>
endobj
15 0 obj
-<</Type/Annot/Border[0 0 0]/H/I/C[0 .5 .5]/Subtype/Link/A<</F(example-image.pdf)/S/GoToR/D[0/Fit]>>/Rect[226.869
+<</Type/Annot/F 0/Border[0 0 0]/H/I/C[0 .5 .5]/Subtype/Link/A<</F(example-image.pdf)/S/GoToR/D[0/Fit]>>/Rect[226.869
557.596 241.594 573.706]>>
endobj
18 0 obj
-<</Type/Annot/Border[0 0 0]/H/I/C[0 1 1]/Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org/)>>/Rect[226.869
+<</Type/Annot/F 0/Border[0 0 0]/H/I/C[0 1 1]/Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org/)>>/Rect[226.869
533.427 386.272 548.689]>>
endobj
19 0 obj
-<</Type/Annot/Border[0 0 0]/H/I/C[1 0 0]/Subtype/Link/A<</S/Named/N/View>>/Rect[226.869
+<</Type/Annot/F 0/Border[0 0 0]/H/I/C[1 0 0]/Subtype/Link/A<</S/Named/N/View>>/Rect[226.869
509.775 299.985 525.885]>>
endobj
20 0 obj
-<</Type/Annot/Border[0 0 0]/H/I/C[0 .7 .7]/Subtype/Link/A<</F(sumatra)/S/Launch>>/Rect[226.869
+<</Type/Annot/F 0/Border[0 0 0]/H/I/C[0 .7 .7]/Subtype/Link/A<</F(sumatra)/S/Launch>>/Rect[226.869
485.865 291.497 501.975]>>
endobj
21 0 obj
-<</Type/Annot/Border[1 1 1]/H/I/C[1 0 0]/Subtype/Link/A<</S/GoTo/D(section.1)>>/Rect[274.859
+<</Type/Annot/F 0/Border[1 1 1]/H/I/C[1 0 0]/Subtype/Link/A<</S/GoTo/D(section.1)>>/Rect[274.859
408.358 281.833 424.467]>>
endobj
22 0 obj
-<</Type/Annot/Border[1 1 1]/H/I/C[1 0 0]/Subtype/Link/A<</S/GoTo/D(cite.cite)>>/Rect[277.629
+<</Type/Annot/F 0/Border[1 1 1]/H/I/C[1 0 0]/Subtype/Link/A<</S/GoTo/D(cite.cite)>>/Rect[277.629
384.447 284.603 400.557]>>
endobj
23 0 obj
-<</Type/Annot/Border[1 1 1]/H/I/C[0 .5 .5]/Subtype/Link/A<</F(example-image.pdf)/S/GoToR/D[0/Fit]>>/Rect[274.859
+<</Type/Annot/F 0/Border[1 1 1]/H/I/C[0 .5 .5]/Subtype/Link/A<</F(example-image.pdf)/S/GoToR/D[0/Fit]>>/Rect[274.859
360.537 289.584 376.647]>>
endobj
24 0 obj
-<</Type/Annot/Border[1 1 1]/H/I/C[0 1 1]/Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org/)>>/Rect[274.859
+<</Type/Annot/F 0/Border[1 1 1]/H/I/C[0 1 1]/Subtype/Link/A<</Type/Action/S/URI/URI(https://www.latex-project.org/)>>/Rect[274.859
336.368 434.262 351.63]>>
endobj
25 0 obj
-<</Type/Annot/Border[1 1 1]/H/I/C[1 0 0]/Subtype/Link/A<</S/Named/N/View>>/Rect[274.859
+<</Type/Annot/F 0/Border[1 1 1]/H/I/C[1 0 0]/Subtype/Link/A<</S/Named/N/View>>/Rect[274.859
312.716 347.975 328.826]>>
endobj
26 0 obj
-<</Type/Annot/Border[1 1 1]/H/I/C[0 .7 .7]/Subtype/Link/A<</F(sumatra)/S/Launch>>/Rect[274.859
+<</Type/Annot/F 0/Border[1 1 1]/H/I/C[0 .7 .7]/Subtype/Link/A<</F(sumatra)/S/Launch>>/Rect[274.859
288.806 339.487 304.916]>>
endobj
27 0 obj
@@ -335,62 +335,62 @@ endobj
xref
0 54
0000000000 65535 f
-0000009455 00000 n
-0000009325 00000 n
-0000009159 00000 n
-0000008177 00000 n
-0000008274 00000 n
-0000008372 00000 n
-0000008568 00000 n
-0000008539 00000 n
-0000014600 00000 n
-0000023330 00000 n
-0000019756 00000 n
-0000023477 00000 n
+0000009503 00000 n
+0000009373 00000 n
+0000009207 00000 n
+0000008225 00000 n
+0000008322 00000 n
+0000008420 00000 n
+0000008616 00000 n
+0000008587 00000 n
+0000014648 00000 n
+0000023378 00000 n
+0000019804 00000 n
+0000023525 00000 n
0000000015 00000 n
-0000000151 00000 n
-0000000287 00000 n
-0000022882 00000 n
-0000023628 00000 n
-0000000443 00000 n
-0000000613 00000 n
-0000000744 00000 n
-0000000882 00000 n
-0000001018 00000 n
-0000001154 00000 n
-0000001310 00000 n
-0000001479 00000 n
-0000001610 00000 n
-0000001748 00000 n
-0000007735 00000 n
-0000008743 00000 n
-0000008976 00000 n
-0000008836 00000 n
-0000008789 00000 n
-0000008883 00000 n
-0000008929 00000 n
-0000008614 00000 n
-0000009023 00000 n
-0000009251 00000 n
-0000009057 00000 n
-0000009576 00000 n
-0000010232 00000 n
-0000011077 00000 n
-0000014786 00000 n
-0000011721 00000 n
-0000014387 00000 n
-0000014536 00000 n
-0000019946 00000 n
-0000015050 00000 n
-0000019451 00000 n
-0000019691 00000 n
-0000023071 00000 n
-0000020207 00000 n
-0000022675 00000 n
-0000022818 00000 n
+0000000155 00000 n
+0000000295 00000 n
+0000022930 00000 n
+0000023676 00000 n
+0000000455 00000 n
+0000000629 00000 n
+0000000764 00000 n
+0000000906 00000 n
+0000001046 00000 n
+0000001186 00000 n
+0000001346 00000 n
+0000001519 00000 n
+0000001654 00000 n
+0000001796 00000 n
+0000007783 00000 n
+0000008791 00000 n
+0000009024 00000 n
+0000008884 00000 n
+0000008837 00000 n
+0000008931 00000 n
+0000008977 00000 n
+0000008662 00000 n
+0000009071 00000 n
+0000009299 00000 n
+0000009105 00000 n
+0000009624 00000 n
+0000010280 00000 n
+0000011125 00000 n
+0000014834 00000 n
+0000011769 00000 n
+0000014435 00000 n
+0000014584 00000 n
+0000019994 00000 n
+0000015098 00000 n
+0000019499 00000 n
+0000019739 00000 n
+0000023119 00000 n
+0000020255 00000 n
+0000022723 00000 n
+0000022866 00000 n
trailer
<</Root 1 0 R/Info 2 0 R/ID[<ID-STRING><ID-STRING>]/Size
54>>
startxref
-23778
+23826
%%EOF
diff --git a/testfiles/pdffilelink.luatex.tpf b/testfiles/pdffilelink.luatex.tpf
index 8365fe8..621553a 100644
--- a/testfiles/pdffilelink.luatex.tpf
+++ b/testfiles/pdffilelink.luatex.tpf
@@ -17,7 +17,7 @@ endobj
[ 6 0 R ]
endobj
6 0 obj
-<< /Type /Annot /Border [0 0 1] /H /I /C [0 .5 .5] /Rect [ 147.716 704.196 164.115 715.145 ]
+<< /Type /Annot /F 0 /Border [0 0 1] /H /I /C [0 .5 .5] /Rect [ 147.716 704.196 164.115 715.145 ]
/Subtype/Link/A<</F(blub.pdf)/S/GoToR/D(destination)>>
>>
endobj
@@ -113,25 +113,25 @@ xref
0000000000 00000 f
0000000190 00000 n
0000000345 00000 n
-0000000634 00000 n
+0000000639 00000 n
0000000020 00000 n
-0000000514 00000 n
-0000000573 00000 n
-0000002910 00000 n
-0000003264 00000 n
+0000000519 00000 n
+0000000578 00000 n
+0000002915 00000 n
+0000003269 00000 n
0000000319 00000 n
-0000000703 00000 n
-0000001880 00000 n
-0000000767 00000 n
-0000000838 00000 n
-0000002116 00000 n
-0000003064 00000 n
-0000003325 00000 n
-0000003425 00000 n
-0000003461 00000 n
-0000003605 00000 n
+0000000708 00000 n
+0000001885 00000 n
+0000000772 00000 n
+0000000843 00000 n
+0000002121 00000 n
+0000003069 00000 n
+0000003330 00000 n
+0000003430 00000 n
+0000003466 00000 n
+0000003610 00000 n
trailer
<< /Size 24 /Root 22 0 R /Info 23 0 R >>
startxref
-3795
+3800
%%EOF
diff --git a/testfiles/pdffilelink.tpf b/testfiles/pdffilelink.tpf
index 9749920..d0f5c36 100644
--- a/testfiles/pdffilelink.tpf
+++ b/testfiles/pdffilelink.tpf
@@ -23,7 +23,7 @@ endobj
6 0 obj
<<
/Type /Annot
-/Border [0 0 1] /H /I /C [0 .5 .5]
+/F 0 /Border [0 0 1] /H /I /C [0 .5 .5]
/Rect [147.716 704.192 164.099 715.04]
/Subtype/Link/A<</F(blub.pdf)/S/GoToR/D(destination)>>
>>
@@ -124,24 +124,24 @@ xref
0000000000 00000 f
0000000154 00000 n
0000000284 00000 n
-0000000564 00000 n
+0000000569 00000 n
0000000015 00000 n
-0000000448 00000 n
-0000000505 00000 n
-0000010881 00000 n
-0000011021 00000 n
-0000000632 00000 n
-0000000991 00000 n
-0000010656 00000 n
-0000011079 00000 n
-0000011175 00000 n
-0000011211 00000 n
-0000011355 00000 n
+0000000453 00000 n
+0000000510 00000 n
+0000010886 00000 n
+0000011026 00000 n
+0000000637 00000 n
+0000000996 00000 n
+0000010661 00000 n
+0000011084 00000 n
+0000011180 00000 n
+0000011216 00000 n
+0000011360 00000 n
trailer
<< /Size 20
/Root 18 0 R
/Info 19 0 R
>>
startxref
-11545
+11550
%%EOF
diff --git a/testfiles/pdffilelink.xetex.tpf b/testfiles/pdffilelink.xetex.tpf
index e583dd9..30280be 100644
--- a/testfiles/pdffilelink.xetex.tpf
+++ b/testfiles/pdffilelink.xetex.tpf
@@ -1,7 +1,7 @@
%PDF-1.5
%äðíø
6 0 obj
-<</Type/Annot/Border[0 0 1]/H/I/C[0 .5 .5]/Subtype/Link/A<</F(blub.pdf)/S/GoToR/D(destination)>>/Rect[147.716
+<</Type/Annot/F 0/Border[0 0 1]/H/I/C[0 .5 .5]/Subtype/Link/A<</F(blub.pdf)/S/GoToR/D(destination)>>/Rect[147.716
703.24 164.115 719.349]>>
endobj
7 0 obj
@@ -95,28 +95,28 @@ endobj
xref
0 20
0000000000 65535 f
-0000000940 00000 n
-0000000810 00000 n
-0000000640 00000 n
-0000002601 00000 n
-0000003051 00000 n
+0000000944 00000 n
+0000000814 00000 n
+0000000644 00000 n
+0000002605 00000 n
+0000003055 00000 n
0000000015 00000 n
-0000000166 00000 n
-0000000352 00000 n
-0000000489 00000 n
-0000000535 00000 n
-0000000430 00000 n
-0000000582 00000 n
-0000000730 00000 n
-0000000616 00000 n
-0000001042 00000 n
-0000002790 00000 n
-0000001490 00000 n
-0000002494 00000 n
-0000002541 00000 n
+0000000170 00000 n
+0000000356 00000 n
+0000000493 00000 n
+0000000539 00000 n
+0000000434 00000 n
+0000000586 00000 n
+0000000734 00000 n
+0000000620 00000 n
+0000001046 00000 n
+0000002794 00000 n
+0000001494 00000 n
+0000002498 00000 n
+0000002545 00000 n
trailer
<</Root 1 0 R/Info 2 0 R/ID[<ID-STRING><ID-STRING>]/Size
20>>
startxref
-3200
+3204
%%EOF
More information about the latex3-commits
mailing list.