[latex3-commits] [git/LaTeX3-latex3-pdfresources] reworking-annot: changed pdfpagelabel to add default pagelabels entry always, and adjusted tests (7c96b9e)

Ulrike Fischer fischer at troubleshooting-tex.de
Fri Jan 8 12:31:43 CET 2021


Repository : https://github.com/latex3/pdfresources
On branch  : reworking-annot
Link       : https://github.com/latex3/pdfresources/commit/7c96b9ea3f26258b1cff67b4542d8a87efe20cf2

>---------------------------------------------------------------

commit 7c96b9ea3f26258b1cff67b4542d8a87efe20cf2
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Fri Jan 8 12:31:43 2021 +0100

    changed pdfpagelabel to add default pagelabels entry always, and adjusted tests


>---------------------------------------------------------------

7c96b9ea3f26258b1cff67b4542d8a87efe20cf2
 hyperref-generic.dtx                    |  11 ++------
 resave.bat                              |  41 ---------------------------
 testfiles-dvips/destination-options.tpf | Bin 11185 -> 11229 bytes
 testfiles-dvips/embedfile.tpf           | Bin 9241 -> 9285 bytes
 testfiles-dvips/ismap.tpf               | Bin 4338 -> 4382 bytes
 testfiles-dvips/linkhook.tpf            | Bin 7925 -> 7969 bytes
 testfiles-dvips/pdffilelink.tpf         | Bin 4193 -> 4237 bytes
 testfiles/destination-options.xetex.tpf |  34 +++++++++++-----------
 testfiles/embedfile.xetex.tpf           |  34 +++++++++++-----------
 testfiles/formtextfields.xetex.tpf      |  42 ++++++++++++++--------------
 testfiles/infodict-new.xetex.tpf        |  19 +++++++------
 testfiles/ismap.xetex.tpf               |  19 +++++++------
 testfiles/linkbordercolor.xetex.tpf     |  48 ++++++++++++++++----------------
 testfiles/linkhook.xetex.tpf            |  30 ++++++++++----------
 testfiles/ocgcolorlinks.xetex.tpf       |  48 ++++++++++++++++----------------
 testfiles/pdffilelink.xetex.tpf         |  19 +++++++------
 testfiles/show.xetex.tlg                |   1 +
 testfiles/transition.xetex.tpf          |  19 +++++++------
 testfiles/viewerpreferences.xetex.tpf   |  18 ++++++------
 19 files changed, 171 insertions(+), 212 deletions(-)

diff --git a/hyperref-generic.dtx b/hyperref-generic.dtx
index 40375c5..623a8de 100644
--- a/hyperref-generic.dtx
+++ b/hyperref-generic.dtx
@@ -801,7 +801,8 @@
 % catalog is continuously updated and pushed out at the end of the document.
 % This works (hopefully \ldots) with all drivers.
 %
-% We do not try to avoid the \enquote{useless} pagelabel entry
+% We do not try to avoid the (in hyperref's wording)
+% \enquote{useless} pagelabel entry
 % |/PageLabels <</Nums[0<</S/D>>]>>|
 % (but it would be possible), we also don't test for empty |\thepage|,
 % \pkg{hyperref} seems to handle this fine and the pdf is valid.
@@ -812,13 +813,7 @@
 %    \begin{macrocode}
 \cs_new_protected:Npn\@@_PageLabels_gpush:
   {
-    \str_if_eq:eeTF{\HyPL at Labels}{0<</S/D>>}
-     {
-       \pdfmanagement_remove:nn {Catalog} {PageLabels}
-     }
-     {
-       \pdfmanagement_add:nnx {Catalog} {PageLabels}{<</Nums[\HyPL at Labels]>>}
-     }
+    \pdfmanagement_add:nnx {Catalog} {PageLabels}{<</Nums[\HyPL at Labels]>>}
   }
 
 \def\Hy at PutCatalog #1 { \__hyp_PageLabels_gpush: }
diff --git a/resave.bat b/resave.bat
index 83200fd..ae72049 100644
--- a/resave.bat
+++ b/resave.bat
@@ -2,44 +2,3 @@ rem */\(1+[a-z\-]\)\.\(2+[a-z]\)\.*
 rem l3build save -e\2 \1
 rem l3build save -cconfig-dvips \1
 rem l3build save -cconfig-luatex -e\2 \1
-
-%all because of pagelabel improvement.
-
-  Check failed with difference files
-  - ./build/test/destination-options.luatex.pdf.fc
-  - ./build/test/destination-options.pdftex.pdf.fc
-  - ./build/test/embedfile.luatex.pdf.fc
-  - ./build/test/embedfile.pdftex.pdf.fc
-  - ./build/test/formtextfields.luatex.pdf.fc
-  - ./build/test/formtextfields.pdftex.pdf.fc
-  - ./build/test/infodict-new.luatex.pdf.fc
-  - ./build/test/infodict-new.pdftex.pdf.fc
-  - ./build/test/ismap.luatex.pdf.fc
-  - ./build/test/ismap.pdftex.pdf.fc
-  - ./build/test/linkbordercolor.luatex.pdf.fc
-  - ./build/test/linkbordercolor.pdftex.pdf.fc
-  - ./build/test/linkhook.luatex.pdf.fc
-  - ./build/test/linkhook.pdftex.pdf.fc
-  - ./build/test/ocgcolorlinks.luatex.pdf.fc
-  - ./build/test/ocgcolorlinks.pdftex.pdf.fc
-  - ./build/test/pdffilelink.luatex.pdf.fc
-  - ./build/test/pdffilelink.pdftex.pdf.fc
-  - ./build/test/transition.luatex.pdf.fc
-  - ./build/test/transition.pdftex.pdf.fc
-  - ./build/test/viewerpreferences.luatex.pdf.fc
-  - ./build/test/viewerpreferences.pdftex.pdf.fc
-
-Failed tests for configuration config-noxetex:
-
-  Check failed with difference files
-  - ./build/test-config-noxetex/calculationsortorder.luatex.pdf.fc
-  - ./build/test-config-noxetex/calculationsortorder.pdftex.pdf.fc
-  - ./build/test-config-noxetex/metadata.luatex.pdf.fc
-  - ./build/test-config-noxetex/metadata.pdftex.pdf.fc
-  - ./build/test-config-noxetex/pgfpatches.luatex.pdf.fc
-  - ./build/test-config-noxetex/pgfpatches.pdftex.pdf.fc
-
-Failed tests for configuration config-luatex:
-
-  Check failed with difference files
-  - ./build/test-config-luatex/non-ascii-links.luatex.pdf.fc
diff --git a/testfiles-dvips/destination-options.tpf b/testfiles-dvips/destination-options.tpf
index f590f0a..d78396c 100644
Binary files a/testfiles-dvips/destination-options.tpf and b/testfiles-dvips/destination-options.tpf differ
diff --git a/testfiles-dvips/embedfile.tpf b/testfiles-dvips/embedfile.tpf
index e5bedec..1baff74 100644
Binary files a/testfiles-dvips/embedfile.tpf and b/testfiles-dvips/embedfile.tpf differ
diff --git a/testfiles-dvips/ismap.tpf b/testfiles-dvips/ismap.tpf
index 60c9b69..b1b5c15 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 6341487..bb1db9e 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 7ab86c1..7deb182 100644
Binary files a/testfiles-dvips/pdffilelink.tpf and b/testfiles-dvips/pdffilelink.tpf differ
diff --git a/testfiles/destination-options.xetex.tpf b/testfiles/destination-options.xetex.tpf
index 84b567e..51bc7ff 100644
--- a/testfiles/destination-options.xetex.tpf
+++ b/testfiles/destination-options.xetex.tpf
@@ -142,8 +142,8 @@ endobj
 <</Creator<feff004c006100540065005800200077006900740068002000680079007000650072007200650066>/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
 endobj
 1 0 obj
-<</PageMode/UseOutlines/OpenAction[3 0 R/FitR 0 0 395.99998 305.99998]/Names 43 0 R/Outlines
-44 0 R/Pages 46 0 R/Type/Catalog>>
+<</PageMode/UseOutlines/OpenAction[3 0 R/FitR 0 0 395.99998 305.99998]/PageLabels<</Nums[0<</S/D>>]>>/Names
+43 0 R/Outlines 44 0 R/Pages 46 0 R/Type/Catalog>>
 endobj
 48 0 obj
 <</Length 395>>
@@ -279,10 +279,10 @@ xref
 0000005217 00000 n 
 0000005049 00000 n 
 0000004710 00000 n 
-0000012152 00000 n 
-0000011702 00000 n 
-0000012748 00000 n 
-0000012298 00000 n 
+0000012183 00000 n 
+0000011733 00000 n 
+0000012779 00000 n 
+0000012329 00000 n 
 0000003427 00000 n 
 0000003449 00000 n 
 0000000015 00000 n 
@@ -323,19 +323,19 @@ xref
 0000004571 00000 n 
 0000004962 00000 n 
 0000004788 00000 n 
-0000005360 00000 n 
-0000005805 00000 n 
-0000011888 00000 n 
-0000006580 00000 n 
-0000007553 00000 n 
-0000007600 00000 n 
-0000012487 00000 n 
-0000007660 00000 n 
-0000011442 00000 n 
-0000011637 00000 n 
+0000005391 00000 n 
+0000005836 00000 n 
+0000011919 00000 n 
+0000006611 00000 n 
+0000007584 00000 n 
+0000007631 00000 n 
+0000012518 00000 n 
+0000007691 00000 n 
+0000011473 00000 n 
+0000011668 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 58>>
 startxref
-12897
+12928
 %%EOF
diff --git a/testfiles/embedfile.xetex.tpf b/testfiles/embedfile.xetex.tpf
index f70f23b..a473c28 100644
--- a/testfiles/embedfile.xetex.tpf
+++ b/testfiles/embedfile.xetex.tpf
@@ -91,8 +91,8 @@ endobj
 <</Creator<feff004c006100540065005800200077006900740068002000680079007000650072007200650066>/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
 endobj
 1 0 obj
-<</PageMode/UseAttachments/OpenAction[3 0 R/Fit]/Names 23 0 R/Outlines 24 0 R/Pages
-26 0 R/Type/Catalog>>
+<</PageMode/UseAttachments/OpenAction[3 0 R/Fit]/PageLabels<</Nums[0<</S/D>>]>>/Names
+23 0 R/Outlines 24 0 R/Pages 26 0 R/Type/Catalog>>
 endobj
 27 0 obj
 <</Length 568>>
@@ -214,14 +214,14 @@ xref
 0000003255 00000 n 
 0000003087 00000 n 
 0000002929 00000 n 
-0000008188 00000 n 
-0000007738 00000 n 
+0000008219 00000 n 
+0000007769 00000 n 
 0000000463 00000 n 
 0000000943 00000 n 
 0000001598 00000 n 
 0000001999 00000 n 
-0000008785 00000 n 
-0000008334 00000 n 
+0000008816 00000 n 
+0000008365 00000 n 
 0000000642 00000 n 
 0000001257 00000 n 
 0000001777 00000 n 
@@ -237,19 +237,19 @@ xref
 0000002875 00000 n 
 0000002654 00000 n 
 0000003007 00000 n 
-0000003376 00000 n 
-0000003994 00000 n 
-0000007924 00000 n 
-0000004400 00000 n 
-0000006832 00000 n 
-0000006962 00000 n 
-0000008524 00000 n 
-0000007027 00000 n 
-0000007652 00000 n 
-0000007678 00000 n 
+0000003407 00000 n 
+0000004025 00000 n 
+0000007955 00000 n 
+0000004431 00000 n 
+0000006863 00000 n 
+0000006993 00000 n 
+0000008555 00000 n 
+0000007058 00000 n 
+0000007683 00000 n 
+0000007709 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 37>>
 startxref
-8936
+8967
 %%EOF
diff --git a/testfiles/formtextfields.xetex.tpf b/testfiles/formtextfields.xetex.tpf
index b6a5adb..34e8739 100644
--- a/testfiles/formtextfields.xetex.tpf
+++ b/testfiles/formtextfields.xetex.tpf
@@ -136,8 +136,8 @@ endobj
 <</Creator<feff004c006100540065005800200077006900740068002000680079007000650072007200650066>/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
 endobj
 1 0 obj
-<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/AcroForm 32 0 R/Names 38 0 R/Pages
-39 0 R/Type/Catalog>>
+<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/PageLabels<</Nums[0<</S/D>>]>>/AcroForm
+32 0 R/Names 38 0 R/Pages 39 0 R/Type/Catalog>>
 endobj
 41 0 obj
 [755 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
@@ -274,7 +274,7 @@ xref
 0000004971 00000 n 
 0000004799 00000 n 
 0000000155 00000 n 
-0000010256 00000 n 
+0000010287 00000 n 
 0000002790 00000 n 
 0000002830 00000 n 
 0000002850 00000 n 
@@ -287,14 +287,14 @@ xref
 0000001120 00000 n 
 0000000998 00000 n 
 0000001433 00000 n 
-0000011024 00000 n 
-0000010575 00000 n 
+0000011055 00000 n 
+0000010606 00000 n 
 0000001292 00000 n 
 0000002005 00000 n 
 0000001864 00000 n 
 0000002870 00000 n 
-0000011625 00000 n 
-0000011174 00000 n 
+0000011656 00000 n 
+0000011205 00000 n 
 0000004220 00000 n 
 0000004053 00000 n 
 0000004130 00000 n 
@@ -310,22 +310,22 @@ xref
 0000004740 00000 n 
 0000004891 00000 n 
 0000004774 00000 n 
-0000005257 00000 n 
-0000005425 00000 n 
-0000006246 00000 n 
-0000006735 00000 n 
-0000010764 00000 n 
-0000007253 00000 n 
-0000008357 00000 n 
-0000008427 00000 n 
-0000011364 00000 n 
-0000008490 00000 n 
-0000010111 00000 n 
-0000010192 00000 n 
-0000010387 00000 n 
+0000005288 00000 n 
+0000005456 00000 n 
+0000006277 00000 n 
+0000006766 00000 n 
+0000010795 00000 n 
+0000007284 00000 n 
+0000008388 00000 n 
+0000008458 00000 n 
+0000011395 00000 n 
+0000008521 00000 n 
+0000010142 00000 n 
+0000010223 00000 n 
+0000010418 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 54>>
 startxref
-11776
+11807
 %%EOF
diff --git a/testfiles/infodict-new.xetex.tpf b/testfiles/infodict-new.xetex.tpf
index 35fb3f5..d8a2eda 100644
--- a/testfiles/infodict-new.xetex.tpf
+++ b/testfiles/infodict-new.xetex.tpf
@@ -31,7 +31,8 @@ endobj
 <</Creator<feff004c006100540065005800200077006900740068002000680079007000650072007200650066>/Producer(xdvipdfmx)/Title<feff0067007200fc00df00650024005c0069006e00740020003d00610024>/Author<feff0062006c00750062>/Subject<feffd83edd86>/Xy#20Z<feff007500700073>/CreationDate(D:20160520090000-00'00')>>
 endobj
 1 0 obj
-<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/Names 11 0 R/Pages 12 0 R/Type/Catalog>>
+<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/PageLabels<</Nums[0<</S/D>>]>>/Names
+11 0 R/Pages 12 0 R/Type/Catalog>>
 endobj
 13 0 obj
 <</Length 370>>
@@ -89,8 +90,8 @@ xref
 0000000913 00000 n 
 0000000601 00000 n 
 0000000445 00000 n 
-0000002806 00000 n 
-0000002356 00000 n 
+0000002837 00000 n 
+0000002387 00000 n 
 0000000015 00000 n 
 0000000183 00000 n 
 0000000319 00000 n 
@@ -98,14 +99,14 @@ xref
 0000000261 00000 n 
 0000000411 00000 n 
 0000000521 00000 n 
-0000001015 00000 n 
-0000002545 00000 n 
-0000001435 00000 n 
-0000002258 00000 n 
-0000002292 00000 n 
+0000001046 00000 n 
+0000002576 00000 n 
+0000001466 00000 n 
+0000002289 00000 n 
+0000002323 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 18>>
 startxref
-2955
+2986
 %%EOF
diff --git a/testfiles/ismap.xetex.tpf b/testfiles/ismap.xetex.tpf
index e9603f0..a383877 100644
--- a/testfiles/ismap.xetex.tpf
+++ b/testfiles/ismap.xetex.tpf
@@ -42,7 +42,8 @@ endobj
 <</Creator<feff004c006100540065005800200077006900740068002000680079007000650072007200650066>/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
 endobj
 1 0 obj
-<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/Names 13 0 R/Pages 14 0 R/Type/Catalog>>
+<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/PageLabels<</Nums[0<</S/D>>]>>/Names
+13 0 R/Pages 14 0 R/Type/Catalog>>
 endobj
 16 0 obj
 <</Length 370>>
@@ -100,8 +101,8 @@ xref
 0000001269 00000 n 
 0000001101 00000 n 
 0000000931 00000 n 
-0000003162 00000 n 
-0000002712 00000 n 
+0000003193 00000 n 
+0000002743 00000 n 
 0000000353 00000 n 
 0000000538 00000 n 
 0000000015 00000 n 
@@ -112,14 +113,14 @@ xref
 0000000867 00000 n 
 0000001021 00000 n 
 0000000901 00000 n 
-0000001371 00000 n 
-0000002901 00000 n 
-0000001791 00000 n 
-0000002614 00000 n 
-0000002648 00000 n 
+0000001402 00000 n 
+0000002932 00000 n 
+0000001822 00000 n 
+0000002645 00000 n 
+0000002679 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 21>>
 startxref
-3311
+3342
 %%EOF
diff --git a/testfiles/linkbordercolor.xetex.tpf b/testfiles/linkbordercolor.xetex.tpf
index 866599a..a46ebe3 100644
--- a/testfiles/linkbordercolor.xetex.tpf
+++ b/testfiles/linkbordercolor.xetex.tpf
@@ -74,8 +74,8 @@ endobj
 <</Creator<feff004c006100540065005800200077006900740068002000680079007000650072007200650066>/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
 endobj
 1 0 obj
-<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/Names 24 0 R/Outlines 25 0 R/Pages
-27 0 R/Type/Catalog>>
+<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/PageLabels<</Nums[0<</S/D>>]>>/Names
+24 0 R/Outlines 25 0 R/Pages 27 0 R/Type/Catalog>>
 endobj
 29 0 obj
 <</Length 613>>
@@ -255,19 +255,19 @@ xref
 0000002638 00000 n 
 0000002470 00000 n 
 0000002218 00000 n 
-0000010007 00000 n 
-0000009557 00000 n 
+0000010038 00000 n 
+0000009588 00000 n 
 0000001151 00000 n 
-0000010603 00000 n 
-0000010156 00000 n 
+0000010634 00000 n 
+0000010187 00000 n 
 0000001286 00000 n 
 0000001436 00000 n 
 0000001594 00000 n 
 0000000015 00000 n 
 0000000751 00000 n 
 0000002310 00000 n 
-0000011202 00000 n 
-0000010751 00000 n 
+0000011233 00000 n 
+0000010782 00000 n 
 0000000839 00000 n 
 0000001062 00000 n 
 0000001821 00000 n 
@@ -280,24 +280,24 @@ xref
 0000002043 00000 n 
 0000002389 00000 n 
 0000002174 00000 n 
-0000002756 00000 n 
-0000003419 00000 n 
-0000003908 00000 n 
-0000009746 00000 n 
-0000004325 00000 n 
-0000007117 00000 n 
-0000007270 00000 n 
-0000010344 00000 n 
-0000007335 00000 n 
-0000008600 00000 n 
-0000008670 00000 n 
-0000010938 00000 n 
-0000008734 00000 n 
-0000009464 00000 n 
-0000009497 00000 n 
+0000002787 00000 n 
+0000003450 00000 n 
+0000003939 00000 n 
+0000009777 00000 n 
+0000004356 00000 n 
+0000007148 00000 n 
+0000007301 00000 n 
+0000010375 00000 n 
+0000007366 00000 n 
+0000008631 00000 n 
+0000008701 00000 n 
+0000010969 00000 n 
+0000008765 00000 n 
+0000009495 00000 n 
+0000009528 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 44>>
 startxref
-11350
+11381
 %%EOF
diff --git a/testfiles/linkhook.xetex.tpf b/testfiles/linkhook.xetex.tpf
index b0c7359..d74fdd1 100644
--- a/testfiles/linkhook.xetex.tpf
+++ b/testfiles/linkhook.xetex.tpf
@@ -51,8 +51,8 @@ endobj
 <</Creator<feff004c006100540065005800200077006900740068002000680079007000650072007200650066>/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
 endobj
 1 0 obj
-<</Lang(de-DE)/PageMode/UseOutlines/OpenAction[3 0 R/Fit]/Names 16 0 R/Outlines 17 0 R/Pages
-19 0 R/Type/Catalog>>
+<</Lang(de-DE)/PageMode/UseOutlines/OpenAction[3 0 R/Fit]/PageLabels<</Nums[0<</S/D>>]>>/Names
+16 0 R/Outlines 17 0 R/Pages 19 0 R/Type/Catalog>>
 endobj
 21 0 obj
 <</Length 497>>
@@ -167,11 +167,11 @@ xref
 0000001728 00000 n 
 0000001560 00000 n 
 0000001394 00000 n 
-0000006777 00000 n 
-0000006341 00000 n 
+0000006808 00000 n 
+0000006372 00000 n 
 0000000630 00000 n 
-0000007362 00000 n 
-0000006926 00000 n 
+0000007393 00000 n 
+0000006957 00000 n 
 0000000809 00000 n 
 0000000015 00000 n 
 0000000542 00000 n 
@@ -184,17 +184,17 @@ xref
 0000001209 00000 n 
 0000001486 00000 n 
 0000001364 00000 n 
-0000001858 00000 n 
-0000002405 00000 n 
-0000006530 00000 n 
-0000002906 00000 n 
-0000004805 00000 n 
-0000007112 00000 n 
-0000004902 00000 n 
-0000006268 00000 n 
+0000001889 00000 n 
+0000002436 00000 n 
+0000006561 00000 n 
+0000002937 00000 n 
+0000004836 00000 n 
+0000007143 00000 n 
+0000004933 00000 n 
+0000006299 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 29>>
 startxref
-7508
+7539
 %%EOF
diff --git a/testfiles/ocgcolorlinks.xetex.tpf b/testfiles/ocgcolorlinks.xetex.tpf
index 54239c4..4e93451 100644
--- a/testfiles/ocgcolorlinks.xetex.tpf
+++ b/testfiles/ocgcolorlinks.xetex.tpf
@@ -125,8 +125,8 @@ endobj
 <</Creator<feff004c006100540065005800200077006900740068002000680079007000650072007200650066>/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
 endobj
 1 0 obj
-<</OCProperties 26 0 R/PageMode/UseOutlines/OpenAction[3 0 R/Fit]/Names 36 0 R/Outlines
-37 0 R/Pages 40 0 R/Type/Catalog>>
+<</OCProperties 26 0 R/PageMode/UseOutlines/OpenAction[3 0 R/Fit]/PageLabels<</Nums[0<</S/D>>]>>/Names
+36 0 R/Outlines 37 0 R/Pages 40 0 R/Type/Catalog>>
 endobj
 42 0 obj
 <</Length 606>>
@@ -352,15 +352,15 @@ xref
 0000008198 00000 n 
 0000008295 00000 n 
 0000008561 00000 n 
-0000022964 00000 n 
-0000022514 00000 n 
-0000023561 00000 n 
-0000023110 00000 n 
+0000022995 00000 n 
+0000022545 00000 n 
+0000023592 00000 n 
+0000023141 00000 n 
 0000006903 00000 n 
 0000007039 00000 n 
 0000007175 00000 n 
-0000024159 00000 n 
-0000023711 00000 n 
+0000024190 00000 n 
+0000023742 00000 n 
 0000007331 00000 n 
 0000007501 00000 n 
 0000007632 00000 n 
@@ -387,24 +387,24 @@ xref
 0000009278 00000 n 
 0000009711 00000 n 
 0000009517 00000 n 
-0000010091 00000 n 
-0000010747 00000 n 
-0000011592 00000 n 
-0000022700 00000 n 
-0000012236 00000 n 
-0000014911 00000 n 
-0000015060 00000 n 
-0000023300 00000 n 
-0000015124 00000 n 
-0000019530 00000 n 
-0000019770 00000 n 
-0000023900 00000 n 
-0000019835 00000 n 
-0000022307 00000 n 
-0000022450 00000 n 
+0000010122 00000 n 
+0000010778 00000 n 
+0000011623 00000 n 
+0000022731 00000 n 
+0000012267 00000 n 
+0000014942 00000 n 
+0000015091 00000 n 
+0000023331 00000 n 
+0000015155 00000 n 
+0000019561 00000 n 
+0000019801 00000 n 
+0000023931 00000 n 
+0000019866 00000 n 
+0000022338 00000 n 
+0000022481 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 57>>
 startxref
-24309
+24340
 %%EOF
diff --git a/testfiles/pdffilelink.xetex.tpf b/testfiles/pdffilelink.xetex.tpf
index 5a19ce6..782ce10 100644
--- a/testfiles/pdffilelink.xetex.tpf
+++ b/testfiles/pdffilelink.xetex.tpf
@@ -38,7 +38,8 @@ endobj
 <</Creator<feff004c006100540065005800200077006900740068002000680079007000650072007200650066>/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
 endobj
 1 0 obj
-<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/Names 12 0 R/Pages 13 0 R/Type/Catalog>>
+<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/PageLabels<</Nums[0<</S/D>>]>>/Names
+12 0 R/Pages 13 0 R/Type/Catalog>>
 endobj
 15 0 obj
 <</Length 398>>
@@ -98,8 +99,8 @@ xref
 0000000986 00000 n 
 0000000818 00000 n 
 0000000648 00000 n 
-0000003102 00000 n 
-0000002652 00000 n 
+0000003133 00000 n 
+0000002683 00000 n 
 0000000287 00000 n 
 0000000015 00000 n 
 0000000209 00000 n 
@@ -109,14 +110,14 @@ xref
 0000000590 00000 n 
 0000000738 00000 n 
 0000000624 00000 n 
-0000001088 00000 n 
-0000002841 00000 n 
-0000001536 00000 n 
-0000002545 00000 n 
-0000002592 00000 n 
+0000001119 00000 n 
+0000002872 00000 n 
+0000001567 00000 n 
+0000002576 00000 n 
+0000002623 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 20>>
 startxref
-3251
+3282
 %%EOF
diff --git a/testfiles/show.xetex.tlg b/testfiles/show.xetex.tlg
index 126970c..929517f 100644
--- a/testfiles/show.xetex.tlg
+++ b/testfiles/show.xetex.tlg
@@ -92,5 +92,6 @@ Completed box being shipped out [1]
 ..\special{pdf:docinfo<</Creator <FEFF004C00610054006500580020007700690074006800\ETC.}
 ..\special{pdf:put @catalog<</PageMode /UseOutlines>>}
 ..\special{pdf:put @catalog<</OpenAction [@page1 /Fit]>>}
+..\special{pdf:put @catalog<</PageLabels <</Nums[0<</S/D>>]>>>>}
 .\kern 633.0
 (show.aux)
diff --git a/testfiles/transition.xetex.tpf b/testfiles/transition.xetex.tpf
index 625e3c0..35bb975 100644
--- a/testfiles/transition.xetex.tpf
+++ b/testfiles/transition.xetex.tpf
@@ -229,7 +229,8 @@ endobj
 <</Creator<feff004c006100540065005800200077006900740068002000680079007000650072007200650066>/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
 endobj
 1 0 obj
-<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/Names 62 0 R/Pages 63 0 R/Type/Catalog>>
+<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/PageLabels<</Nums[0<</S/D>>]>>/Names
+62 0 R/Pages 63 0 R/Type/Catalog>>
 endobj
 68 0 obj
 <</Length 1043>>
@@ -338,8 +339,8 @@ xref
 0000195085 00000 n 
 0000193564 00000 n 
 0000192304 00000 n 
-0000203933 00000 n 
-0000203483 00000 n 
+0000203964 00000 n 
+0000203514 00000 n 
 0000000015 00000 n 
 0000015972 00000 n 
 0000193652 00000 n 
@@ -401,14 +402,14 @@ xref
 0000194187 00000 n 
 0000194544 00000 n 
 0000194901 00000 n 
-0000195355 00000 n 
-0000203672 00000 n 
-0000196449 00000 n 
-0000203130 00000 n 
-0000203418 00000 n 
+0000195386 00000 n 
+0000203703 00000 n 
+0000196480 00000 n 
+0000203161 00000 n 
+0000203449 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 73>>
 startxref
-204082
+204113
 %%EOF
diff --git a/testfiles/viewerpreferences.xetex.tpf b/testfiles/viewerpreferences.xetex.tpf
index a79a916..d4abb25 100644
--- a/testfiles/viewerpreferences.xetex.tpf
+++ b/testfiles/viewerpreferences.xetex.tpf
@@ -50,7 +50,7 @@ endobj
 <</Creator<feff004c006100540065005800200077006900740068002000680079007000650072007200650066>/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
 endobj
 1 0 obj
-<</OCProperties 10 0 R/ViewerPreferences 11 0 R/Lang(de-DE)/PageMode/UseOutlines/OpenAction[3 0 R/Fit]/PageLayout/SinglePage/Names
+<</OCProperties 10 0 R/ViewerPreferences 11 0 R/Lang(de-DE)/PageMode/UseOutlines/OpenAction[3 0 R/Fit]/PageLayout/SinglePage/PageLabels<</Nums[0<</S/D>>]>>/Names
 17 0 R/Pages 18 0 R/Type/Catalog>>
 endobj
 19 0 obj
@@ -114,8 +114,8 @@ xref
 0000000318 00000 n 
 0000000415 00000 n 
 0000000680 00000 n 
-0000003535 00000 n 
-0000003085 00000 n 
+0000003566 00000 n 
+0000003116 00000 n 
 0000000513 00000 n 
 0000000709 00000 n 
 0000000756 00000 n 
@@ -126,14 +126,14 @@ xref
 0000000836 00000 n 
 0000000989 00000 n 
 0000001101 00000 n 
-0000001524 00000 n 
-0000003274 00000 n 
-0000001972 00000 n 
-0000002978 00000 n 
-0000003025 00000 n 
+0000001555 00000 n 
+0000003305 00000 n 
+0000002003 00000 n 
+0000003009 00000 n 
+0000003056 00000 n 
 trailer
 <</ID[({<Csp\303W?<\376V\036\3327yy)({<Csp\303W?<\376V\036\3327yy)]/Root 1 0 R/Info
 2 0 R/Size 24>>
 startxref
-3684
+3715
 %%EOF





More information about the latex3-commits mailing list.