l3pdffiles: use utf8/string in F key for better compability with zugferd

latex3 · Feb 24, 2024 · f1a1b29 · f1a1b29
1 parent 7dbb56e
commit f1a1b29
Show file tree

Hide file tree

Showing 26 changed files with 697 additions and 690 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,11 @@ first release 0.95a, 2021-02-23 will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 this project uses date-based 'snapshot' version identifiers.
 
+## [Unreleased]
+
+### Changed
+ - format of /F in filespec: use utf8/string for better compability with zugferd.
+
 ## [2024-02-22]
 
 ### Changed

diff --git a/l3pdffile.dtx b/l3pdffile.dtx
@@ -645,8 +645,9 @@
       }
       {
         \group_begin:
-          \@@_filename_convert_to_print:nN  { #2 } \l_@@_tmpa_str
+          \pdf_string_from_unicode:nnN {utf8/string}{#2}\l_@@_tmpa_str
           \pdfdict_put:nne {l_pdffile/Filespec}{F} { \l_@@_tmpa_str }
+          \@@_filename_convert_to_print:nN  { #2 } \l_@@_tmpa_str          
           \pdfdict_put:nne {l_pdffile/Filespec}{UF}{ \l_@@_tmpa_str }
           \pdf_object_write:nne { #1 } { dict }
             {
@@ -669,8 +670,9 @@
       }
       {
         \group_begin:
-          \@@_filename_convert_to_print:nN  { #1 } \l_@@_tmpa_str
+          \pdf_string_from_unicode:nnN {utf8/string}{#1}\l__pdffile_tmpa_str
           \pdfdict_put:nne {l_pdffile/Filespec}{F} { \l_@@_tmpa_str }
+          \@@_filename_convert_to_print:nN  { #1 } \l_@@_tmpa_str
           \pdfdict_put:nne {l_pdffile/Filespec}{UF}{ \l_@@_tmpa_str }
           \pdf_object_unnamed_write:ne {dict}
             {

diff --git a/testfiles-dvips/disable-links.tpf b/testfiles-dvips/disable-links.tpf
diff --git a/testfiles-dvips/embedfile.tpf b/testfiles-dvips/embedfile.tpf
diff --git a/testfiles-dvips/pdffilelink.tpf b/testfiles-dvips/pdffilelink.tpf
diff --git a/testfiles-luatex/structure-destination.tpf b/testfiles-luatex/structure-destination.tpf
@@ -448,7 +448,7 @@ endobj
 << /Dests 51 0 R >>
 endobj
 53 0 obj
-<< /Type /Catalog /Pages 41 0 R /Names 52 0 R /MarkInfo 43 0 R/Lang (en-US)/PageMode /UseOutlines/OpenAction [21 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>>/Metadata 31 0 R/StructTreeRoot 5 0 R >>
+<< /Type /Catalog /Pages 41 0 R /Names 52 0 R /MarkInfo 43 0 R/Lang (en-US)/PageMode /UseOutlines/OpenAction <</S/GoTo /D [21 0 R /Fit] /SD [22 0 R/Fit]>>/PageLabels <</Nums[0<</S/D>>]>>/Metadata 31 0 R/StructTreeRoot 5 0 R >>
 endobj
 54 0 obj
 << /Producer (LuaTeX)/Creator <FEFF004C006100540065005800200077006900740068002000680079007000650072007200650066>/CreationDate (D:20160520090000Z)/ModDate (D:20160520090000Z) /Trapped /False >>
@@ -509,9 +509,9 @@ xref
 0000020090 00000 n 
 0000020213 00000 n 
 0000020249 00000 n 
-0000020460 00000 n 
+0000020492 00000 n 
 trailer
 << /Size 55 /Root 53 0 R /Info 54 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
 startxref
-20669
+20701
 %%EOF
diff --git a/testfiles-pdftex/structure-destination.tpf b/testfiles-pdftex/structure-destination.tpf
@@ -655,7 +655,7 @@ endobj
 /Type /Catalog
 /Pages 42 0 R
 /Names 55 0 R
-/MarkInfo 43 0 R/Lang (en-US)/PageMode /UseOutlines/OpenAction [21 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>>/Metadata 31 0 R/StructTreeRoot 5 0 R
+/MarkInfo 43 0 R/Lang (en-US)/PageMode /UseOutlines/OpenAction <</S/GoTo /D [21 0 R /Fit] /SD [22 0 R/Fit]>>/PageLabels <</Nums[0<</S/D>>]>>/Metadata 31 0 R/StructTreeRoot 5 0 R
 >>
 endobj
 57 0 obj
@@ -723,12 +723,12 @@ xref
 0000034532 00000 n 
 0000034651 00000 n 
 0000034687 00000 n 
-0000034898 00000 n 
+0000034930 00000 n 
 trailer
 << /Size 58
 /Root 56 0 R
 /Info 57 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-35107
+35139
 %%EOF
diff --git a/testfiles-xetex/structure-destination.tpf b/testfiles-xetex/structure-destination.tpf
@@ -354,7 +354,7 @@ endobj
 <</Creator<feff004c006100540065005800200077006900740068002000680079007000650072007200650066>/Producer(xetex)/CreationDate(D:20160520090000Z)/ModDate(D:20160520090000Z)>>
 endobj
 1 0 obj
-<</MarkInfo 31 0 R/Lang(en-US)/PageMode/UseOutlines/OpenAction[3 0 R/Fit]/PageLabels<</Nums[0<</S/D>>]>>/Metadata
+<</MarkInfo 31 0 R/Lang(en-US)/PageMode/UseOutlines/OpenAction<</S/GoTo/D[3 0 R/Fit]/SD[5 0 R/Fit]>>/PageLabels<</Nums[0<</S/D>>]>>/Metadata
 32 0 R/StructTreeRoot 25 0 R/Names 39 0 R/Pages 40 0 R/Type/Catalog>>
 endobj
 42 0 obj
@@ -421,8 +421,8 @@ xref
 0000015693 00000 n 
 0000000908 00000 n 
 0000002965 00000 n 
-0000019429 00000 n 
-0000018993 00000 n 
+0000019456 00000 n 
+0000019020 00000 n 
 0000003254 00000 n 
 0000000862 00000 n 
 0000000675 00000 n 
@@ -457,13 +457,13 @@ xref
 0000015634 00000 n 
 0000015808 00000 n 
 0000015668 00000 n 
-0000016272 00000 n 
-0000019182 00000 n 
-0000016833 00000 n 
-0000018891 00000 n 
+0000016299 00000 n 
+0000019209 00000 n 
+0000016860 00000 n 
+0000018918 00000 n 
 trailer
 <</ID[<ID-STRING><ID-STRING>]/Root
 1 0 R/Info 2 0 R/Size 46>>
 startxref
-19578
+19605
 %%EOF
diff --git a/testfiles/disable-links.luatex.tpf b/testfiles/disable-links.luatex.tpf
@@ -34,7 +34,7 @@ endobj
 << /ExtGState 1 0 R /Font << /F17 11 0 R /F18 12 0 R /F15 13 0 R >> /ProcSet [ /PDF /Text ] >>
 endobj
 17 0 obj
-<< /Type /Filespec /AFRelationship /Unspecified /Subtype /application#2Fpdf /F <FEFF0074006500730074002D007000640066007200650073006F00750072006300650073002E007000640066> /UF <FEFF0074006500730074002D007000640066007200650073006F00750072006300650073002E007000640066>  >>
+<< /Type /Filespec /AFRelationship /Unspecified /Subtype /application#2Fpdf /F (test-pdfresources.pdf) /UF <FEFF0074006500730074002D007000640066007200650073006F00750072006300650073002E007000640066>  >>
 endobj
 18 0 obj
 << /Type /Action /S /GoToR /F 17 0 R /D [0/Fit]  >>
@@ -647,7 +647,7 @@ endobj
 xref
 0 63
 0000000002 65535 f 
-0000015457 00000 n 
+0000015390 00000 n 
 0000000003 00000 f 
 0000000004 00000 f 
 0000000000 00000 f 
@@ -657,60 +657,60 @@ xref
 0000000469 00000 n 
 0000000528 00000 n 
 0000000588 00000 n 
-0000031128 00000 n 
-0000027791 00000 n 
-0000025112 00000 n 
-0000031476 00000 n 
-0000014084 00000 n 
-0000014259 00000 n 
+0000031061 00000 n 
+0000027724 00000 n 
+0000025045 00000 n 
+0000031409 00000 n 
+0000014017 00000 n 
+0000014192 00000 n 
 0000000759 00000 n 
-0000001044 00000 n 
-0000014488 00000 n 
-0000014647 00000 n 
-0000014849 00000 n 
-0000015034 00000 n 
-0000001112 00000 n 
-0000015346 00000 n 
-0000013897 00000 n 
-0000012583 00000 n 
-0000015223 00000 n 
-0000015284 00000 n 
-0000020480 00000 n 
-0000014022 00000 n 
-0000015504 00000 n 
-0000031618 00000 n 
-0000015550 00000 n 
-0000015593 00000 n 
-0000019175 00000 n 
-0000015846 00000 n 
-0000015921 00000 n 
-0000019410 00000 n 
-0000020633 00000 n 
-0000020832 00000 n 
-0000023881 00000 n 
-0000021047 00000 n 
-0000021123 00000 n 
-0000024117 00000 n 
-0000025266 00000 n 
-0000025466 00000 n 
-0000026764 00000 n 
-0000025542 00000 n 
-0000025616 00000 n 
-0000026998 00000 n 
-0000027942 00000 n 
-0000028139 00000 n 
-0000030030 00000 n 
-0000028256 00000 n 
-0000028330 00000 n 
-0000030264 00000 n 
-0000031279 00000 n 
-0000031544 00000 n 
-0000031679 00000 n 
-0000031836 00000 n 
-0000031872 00000 n 
-0000032062 00000 n 
+0000000977 00000 n 
+0000014421 00000 n 
+0000014580 00000 n 
+0000014782 00000 n 
+0000014967 00000 n 
+0000001045 00000 n 
+0000015279 00000 n 
+0000013830 00000 n 
+0000012516 00000 n 
+0000015156 00000 n 
+0000015217 00000 n 
+0000020413 00000 n 
+0000013955 00000 n 
+0000015437 00000 n 
+0000031551 00000 n 
+0000015483 00000 n 
+0000015526 00000 n 
+0000019108 00000 n 
+0000015779 00000 n 
+0000015854 00000 n 
+0000019343 00000 n 
+0000020566 00000 n 
+0000020765 00000 n 
+0000023814 00000 n 
+0000020980 00000 n 
+0000021056 00000 n 
+0000024050 00000 n 
+0000025199 00000 n 
+0000025399 00000 n 
+0000026697 00000 n 
+0000025475 00000 n 
+0000025549 00000 n 
+0000026931 00000 n 
+0000027875 00000 n 
+0000028072 00000 n 
+0000029963 00000 n 
+0000028189 00000 n 
+0000028263 00000 n 
+0000030197 00000 n 
+0000031212 00000 n 
+0000031477 00000 n 
+0000031612 00000 n 
+0000031769 00000 n 
+0000031805 00000 n 
+0000031995 00000 n 
 trailer
 << /Size 63 /Root 61 0 R /Info 62 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
 startxref
-32271
+32204
 %%EOF
diff --git a/testfiles/disable-links.tpf b/testfiles/disable-links.tpf
@@ -48,7 +48,7 @@ endobj
 >>
 endobj
 17 0 obj
-<< /Type /Filespec /AFRelationship /Unspecified /Subtype /application#2Fpdf /F <FEFF0074006500730074002D007000640066007200650073006F00750072006300650073002E007000640066> /UF <FEFF0074006500730074002D007000640066007200650073006F00750072006300650073002E007000640066>  >>
+<< /Type /Filespec /AFRelationship /Unspecified /Subtype /application#2Fpdf /F (test-pdfresources.pdf) /UF <FEFF0074006500730074002D007000640066007200650073006F00750072006300650073002E007000640066>  >>
 endobj
 18 0 obj
 << /Type /Action /S /GoToR /F 17 0 R /D [0/Fit]  >>
@@ -1069,7 +1069,7 @@ endobj
 xref
 0 54
 0000000002 65535 f 
-0000014687 00000 n 
+0000014620 00000 n 
 0000000003 00000 f 
 0000000004 00000 f 
 0000000000 00000 f 
@@ -1079,54 +1079,54 @@ xref
 0000000388 00000 n 
 0000000445 00000 n 
 0000000503 00000 n 
-0000064883 00000 n 
-0000062937 00000 n 
-0000066825 00000 n 
-0000068744 00000 n 
-0000013339 00000 n 
-0000013512 00000 n 
+0000064816 00000 n 
+0000062870 00000 n 
+0000066758 00000 n 
+0000068677 00000 n 
+0000013272 00000 n 
+0000013445 00000 n 
 0000000673 00000 n 
-0000000958 00000 n 
-0000013737 00000 n 
-0000013892 00000 n 
-0000014089 00000 n 
-0000014270 00000 n 
-0000001026 00000 n 
-0000014575 00000 n 
-0000013177 00000 n 
-0000012494 00000 n 
-0000014456 00000 n 
-0000014515 00000 n 
-0000068585 00000 n 
-0000014734 00000 n 
-0000068883 00000 n 
-0000014780 00000 n 
-0000014822 00000 n 
-0000015140 00000 n 
-0000015726 00000 n 
-0000016022 00000 n 
-0000016424 00000 n 
-0000025627 00000 n 
-0000025858 00000 n 
-0000034757 00000 n 
-0000034996 00000 n 
-0000047872 00000 n 
-0000048132 00000 n 
-0000060862 00000 n 
-0000061149 00000 n 
-0000063095 00000 n 
-0000065042 00000 n 
-0000066983 00000 n 
-0000068809 00000 n 
-0000068944 00000 n 
-0000069097 00000 n 
-0000069133 00000 n 
-0000069323 00000 n 
+0000000891 00000 n 
+0000013670 00000 n 
+0000013825 00000 n 
+0000014022 00000 n 
+0000014203 00000 n 
+0000000959 00000 n 
+0000014508 00000 n 
+0000013110 00000 n 
+0000012427 00000 n 
+0000014389 00000 n 
+0000014448 00000 n 
+0000068518 00000 n 
+0000014667 00000 n 
+0000068816 00000 n 
+0000014713 00000 n 
+0000014755 00000 n 
+0000015073 00000 n 
+0000015659 00000 n 
+0000015955 00000 n 
+0000016357 00000 n 
+0000025560 00000 n 
+0000025791 00000 n 
+0000034690 00000 n 
+0000034929 00000 n 
+0000047805 00000 n 
+0000048065 00000 n 
+0000060795 00000 n 
+0000061082 00000 n 
+0000063028 00000 n 
+0000064975 00000 n 
+0000066916 00000 n 
+0000068742 00000 n 
+0000068877 00000 n 
+0000069030 00000 n 
+0000069066 00000 n 
+0000069256 00000 n 
 trailer
 << /Size 54
 /Root 52 0 R
 /Info 53 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-69532
+69465
 %%EOF