[latex3-commits] [git/LaTeX3-latex3-pdfresources] test-new-hooks: info keys (cb1d239)
Ulrike Fischer
fischer at troubleshooting-tex.de
Fri May 15 00:44:57 CEST 2020
Repository : https://github.com/latex3/pdfresources
On branch : test-new-hooks
Link : https://github.com/latex3/pdfresources/commit/cb1d2397a69314db17fdd60ca01b78dd38e49075
>---------------------------------------------------------------
commit cb1d2397a69314db17fdd60ca01b78dd38e49075
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Fri May 15 00:44:57 2020 +0200
info keys
>---------------------------------------------------------------
cb1d2397a69314db17fdd60ca01b78dd38e49075
hgeneric-experimental.def | 102 +++++++++++--------
l3pdffile.dtx | 2 +-
newpackages/new-attachfile.sty | 6 +-
newpackages/new-pdfescape.sty | 10 +-
.../{ismap.luatex.tpf => infodict-new.luatex.tpf} | 111 +++++++++-----------
testfiles/infodict-new.pvt | 14 +++
testfiles/{ismap.tpf => infodict-new.tpf} | 112 +++++++++------------
.../{annot.xetex.tpf => infodict-new.xetex.tpf} | 98 +++++++++---------
8 files changed, 231 insertions(+), 224 deletions(-)
diff --git a/hgeneric-experimental.def b/hgeneric-experimental.def
index bbb142d..f43abdf 100644
--- a/hgeneric-experimental.def
+++ b/hgeneric-experimental.def
@@ -42,7 +42,7 @@
Hyperref driver for luaTeX]
\RequirePackage{pdfresources}
\RequirePackage{xparse,etoolbox}
-
+\RequirePackage{new-pdfescape} %temporarly!
\chardef\Hy at VersionChecked=1 %don't check the version!
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ExplSyntaxOn
@@ -256,7 +256,7 @@
\cs_new_protected:Npn \__hyp_text_purify:nN #1 #2
{
\hook_use:n {hyp/text/purify}
- \tl_set:Nx #2 {\text_purify:n { #1 }
+ \tl_set:Nx #2 {\text_purify:n { #1 } }
}
% this takes the output of \__hyp_text_purify and applies a converter
@@ -267,15 +267,15 @@
% or lit for \pdftool_textstringlit:nN
\cs_new_protected:Npn \__hyp_text_convert:NnN #1 #2 #3
{
- \use:c { pdftool_textstring#2:VN} #1 #3
+ \use:c { pdftool_textstring#2:VN } #1 #3
}
%% combining both:
% #1=input, #2= handler shortcut #3 output command
-\cs_new_protected:Npn \__hyp_text_pdfdef:Nnn
+\cs_new_protected:Npn \__hyp_text_pdfdef:nnN #1 #2 #3
{
\__hyp_text_purify:nN {#1}\l__hyp_tmpa_tl
- \__hyp_text_convert:NnN \l__hyp_tmpa_tl { #2} #3
+ \__hyp_text_convert:NnN \l__hyp_tmpa_tl { #2 } #3
}
% variants of hyperref commands to get attributes in the prop
@@ -1394,6 +1394,54 @@
\hypupdateattribute
%"info" keys
+% as hyperref resets some at begin document,
+% they only work correctly if set later ...
+% for now they use hex-encoding
+% later we can add instruction to add to meta data here
+\cs_new_protected:Npn \__hyp_setup_info_key:nn #1 #2
+ {
+ \keys_define:nn { hyp / setup }
+ {
+ pdf#1 .code:n =
+ {
+ \__hyp_text_pdfdef:nnN {##1}{ hex_print}\l__hyp_tmpa_tl
+ \pdfdict_gput:nnx {Info}{#2}{\l__hyp_tmpa_tl}
+ }
+ }
+ \keys_define:nn { hyp / info }
+ {
+ #2 .code:n =
+ {
+ \__hyp_text_pdfdef:nnN {##1}{ hex_print}\l__hyp_tmpa_tl
+ \pdfdict_gput:nnx {Info}{#2}{\l__hyp_tmpa_tl}
+ }
+ ,unknown .code:n =
+ {
+ \__hyp_text_pdfdef:nnN {##1}{ hex_print}\l__hyp_tmpa_tl
+ \exp_args:Nnx
+ \pdfdict_gput:nnx {Info}{\exp_args:No\pdftool_name:n{\l_keys_key_str}}{\l__hyp_tmpa_tl}
+ }
+ }
+ }
+\__hyp_setup_info_key:nn {author} {Author}
+\__hyp_setup_info_key:nn {title} {Title}
+\__hyp_setup_info_key:nn {producer} {Producer}
+\__hyp_setup_info_key:nn {creator} {Creator}
+% ignored key: addtopdfcreator
+\__hyp_setup_info_key:nn {creationdate} {Creationdate}
+\__hyp_setup_info_key:nn {moddate} {ModDate}
+\__hyp_setup_info_key:nn {subject} {Subject}
+\__hyp_setup_info_key:nn {keywords} {Keywords}
+
+%pdfinfo allows to set the key with keyval ...
+\keys_define:nn { hyp / setup }
+ {
+ pdfinfo .code:n =
+ {
+ \keys_set:nn { hyp / info } { #1 }
+ }
+ }
+%Trapped is a bit curious, it has an value "unknown", and one can't suppress it ...
\keys_define:nn { hyp / setup }
{
,pdftrapped .code:n =
@@ -1432,47 +1480,15 @@
% }
}
-
-\cs_new:Npn \__hyp_info_generate_addons:
- {
- \group_begin:
- \cs_set:Npn \HyInfo at do##1{%
- \EdefEscapeName\HyInfo at Key{##1}%
- %variant??
- \pdfdict_gput:nox {Info} {\HyInfo at Key}{(\csname HyInfo at Value@##1\endcsname)}
- }
- \HyInfo at AddonList
- \group_end:
- }
-
-
\def\PDF at FinishDoc{}% dummy needed for hyperref ...
\AtEndPreamble{
\pdf at ifdraftmode{}{
- \Hy at UseMaketitleInfos %get Title/Author from \title if pdfusetitle is true
- \__hyp_info_generate_addons:
- \pdfdict_gput:nnx {Info}
- {Author} {(\@pdfauthor)}
- \pdfdict_gput:nnx {Info}
- {Title} {(\@pdftitle)}
- \pdfdict_gput:nnx {Info}
- {Subject}{(\@pdfsubject)}
- \pdfdict_gput:nnx {Info}
- {Creator}{(\@pdfcreator)}
- \pdfdict_gput:nnx {Info}
- {CreationDate}{(\@pdfcreationdate)}
- \pdfdict_gput:nnx {Info}
- {ModDate}{(\@pdfmoddate)}
- \tl_if_exist:NT \@pdfproducer %special, as \relax is default
- {
- \pdfdict_gput:nnx {Info}
- {Producer}{(\@pdfproducer)}
- }
- \pdfdict_gput:nnx {Info}
- {Keywords}{(\@pdfkeywords)}
+ %!!!!! this must be handled somehow
+ \Hy at UseMaketitleInfos %get/set Title/Author from \title if pdfusetitle is true
}
+ %is this still needed?
\Hy at DisableOption{pdfauthor}%
\Hy at DisableOption{pdftitle}%
\Hy at DisableOption{pdfsubject}%
@@ -1487,10 +1503,10 @@
\def\hyper at pagetransition{%
\ifx\@pdfpagetransition\relax
\else
- \pdf_pageattr_gremove:n {Trans}
+ \pdfdict_gremove:nn { Page } {Trans}
\tl_if_empty:NF \@pdfpagetransition
{
- \pdfdict_gput:nnx {Page} {Trans}{<< /S /\@pdfpagetransition\space >>}
+ \pdfdict_gput:nnx { Page } {Trans}{<< /S /\@pdfpagetransition\space >>}
}
\fi
}
@@ -1498,7 +1514,7 @@
\def\hyper at pageduration{%
\ifx\@pdfpageduration\relax
\else
- \pdf_pageattr_gremove:n {Dur}
+ \pdfdict_gremove:nn { Page } {Dur}
\tl_if_empty:NF \@pdfpageduration
{
\pdfdict_gput:nnx {Page} {Dur}{\@pdfpageduration\space}
diff --git a/l3pdffile.dtx b/l3pdffile.dtx
index 7e8c113..42730e3 100644
--- a/l3pdffile.dtx
+++ b/l3pdffile.dtx
@@ -402,7 +402,7 @@
{
\prop_get:NVNTF \g_pdffile_mimetypes_prop \l_@@_file_ext_str \l_tmpa_tl
{
- \tl_set:Nx #2 {/Subtype~\pdftool_name:V \l_tmpa_tl}
+ \tl_set:Nx #2 {/Subtype~\pdftool_name_print:V \l_tmpa_tl}
}
{
\msg_warning:nnx { pdffile }{ mimetype-missing} {#1}
diff --git a/newpackages/new-attachfile.sty b/newpackages/new-attachfile.sty
index 85772dc..44b88f4 100644
--- a/newpackages/new-attachfile.sty
+++ b/newpackages/new-attachfile.sty
@@ -151,7 +151,7 @@
\pdfdict_remove:nn {file}{Subtype}
}
{
- \pdfdict_put:nnx {file}{Subtype}{\pdftool_name:n{#1} }
+ \pdfdict_put:nnx {file}{Subtype}{\pdftool_name_print:n{#1} }
}
}
,mimetype .groups:n = { embed }
@@ -168,7 +168,7 @@
,afrelationship .choices:nn =
{Source, Data, Alternative, Supplement, EncryptedPayload, FormData, Schema, Unspecified }
{
- \pdfdict_put:nnx { file/FileSpec } {AFRelationship } { \pdftool_name:n {#1} }
+ \pdfdict_put:nnx { file/FileSpec } {AFRelationship } { \pdftool_name_print:n {#1} }
}
,afrelationship .default:n = { Unspecified }
,afrelationship / .code:n =
@@ -192,7 +192,7 @@
\pdfdict_put:nnx
{ file/FileSpec }
{AFRelationship }
- { \pdftool_name:n {#1} }
+ { \pdftool_name_print:n {#1} }
}
}
}
diff --git a/newpackages/new-pdfescape.sty b/newpackages/new-pdfescape.sty
index b6d1aa6..7852b66 100644
--- a/newpackages/new-pdfescape.sty
+++ b/newpackages/new-pdfescape.sty
@@ -84,11 +84,19 @@
\cs_generate_variant:Nn \str_escape_pdfname:n { e }
%% tool command escape name
+%% name: only name, name_print: with / before, see also string naming
\cs_new:Npn \pdftool_name:n #1
- { / \str_escape_pdfname:e { \text_expand:n{#1} } }
+ { \str_escape_pdfname:e { \text_expand:n{#1} } }
\cs_generate_variant:Nn \pdftool_name:n {V}
+ \cs_new:Npn \pdftool_name_print:n #1
+ { / \str_escape_pdfname:e { \text_expand:n{#1} } }
+
+\cs_generate_variant:Nn \pdftool_name_print:n {V}
+
+
+
%% string conversions and printing
%% we assume here that the text purify step has been done. The input is
%% a list of (utf8) chars.
diff --git a/testfiles/ismap.luatex.tpf b/testfiles/infodict-new.luatex.tpf
similarity index 54%
copy from testfiles/ismap.luatex.tpf
copy to testfiles/infodict-new.luatex.tpf
index 94dad00..de39f70 100644
--- a/testfiles/ismap.luatex.tpf
+++ b/testfiles/infodict-new.luatex.tpf
@@ -1,56 +1,42 @@
-%PDF-1.5
+%PDF-1.7
%ÌÕÁÔÅØÐÄÆ
-9 0 obj
-<< /Length 167 >>
+7 0 obj
+<< /Length 106 >>
stream
BT
/F25 9.96264 Tf
-1 0 0 1 148.712 707.125 Tm [<00740074007400740074>]TJ
-1 0 0 1 148.712 695.17 Tm [<00740074007400740074>]TJ
+1 0 0 1 148.712 707.125 Tm [<007400740074>]TJ
1 0 0 1 303.133 139.255 Tm [<0052>]TJ
ET
endstream
endobj
5 0 obj
-<< /Type /Page /Contents 9 0 R /Resources 8 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 13 0 R /Annots 14 0 R >>
+<< /Type /Page /Contents 7 0 R /Resources 6 0 R /MediaBox [ 0 0 595.276 841.89 ] /Parent 11 0 R >>
endobj
-14 0 obj
-[ 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 ]
- /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 ]
- /Subtype/Link/A<</Type/Action /S/URI /URI(https://www.latex-project.org#abc~xyz) >>
- >>
-endobj
-10 0 obj
+8 0 obj
<< /D [ 5 0 R /XYZ 132.768 754.95 null ] >>
endobj
-11 0 obj
+9 0 obj
<< /D [ 5 0 R /XYZ 133.768 717.088 null ] >>
endobj
-8 0 obj
-<< /Font << /F25 12 0 R >> /ProcSet [ /PDF /Text ] >>
+6 0 obj
+<< /Font << /F25 10 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-15 0 obj
+12 0 obj
[ 82 [ 500 ] 116 [ 528 ] ]
endobj
-17 0 obj
+14 0 obj
<< /Length 15 >>
[BINARY STREAM]
endobj
-18 0 obj
+15 0 obj
<< /Subtype /CIDFontType0C /Length 772 >>
[BINARY STREAM]
endobj
-16 0 obj
-<< /Type /FontDescriptor /FontName /QVKDUG+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 18 0 R /CIDSet 17 0 R >>
+13 0 obj
+<< /Type /FontDescriptor /FontName /QVKDUG+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 15 0 R /CIDSet 14 0 R >>
endobj
-19 0 obj
+16 0 obj
<< /Length 706 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -87,56 +73,53 @@ end
%%EOF
endstream
endobj
-12 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /QVKDUG+LMRoman10-Regular /DescendantFonts [ 20 0 R ] /ToUnicode 19 0 R >>
+10 0 obj
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /QVKDUG+LMRoman10-Regular /DescendantFonts [ 17 0 R ] /ToUnicode 16 0 R >>
endobj
-20 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /QVKDUG+LMRoman10-Regular /FontDescriptor 16 0 R /W 15 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+17 0 obj
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /QVKDUG+LMRoman10-Regular /FontDescriptor 13 0 R /W 12 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
endobj
-13 0 obj
+11 0 obj
<< /Type /Pages /Count 1 /Kids [ 5 0 R ] >>
endobj
-21 0 obj
-<< /Names [ (Doc-Start) 11 0 R (page.1) 10 0 R ] /Limits [ (Doc-Start) (page.1) ] >>
+18 0 obj
+<< /Names [ (Doc-Start) 9 0 R (page.1) 8 0 R ] /Limits [ (Doc-Start) (page.1) ] >>
endobj
-22 0 obj
-<< /Dests 21 0 R >>
+19 0 obj
+<< /Dests 18 0 R >>
endobj
-23 0 obj
-<< /Type /Catalog /Pages 13 0 R /Names 22 0 R /PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
+20 0 obj
+<< /Type /Catalog /Pages 11 0 R /Names 19 0 R /PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>> >>
endobj
-24 0 obj
-<< /Producer (LuaTeX)/Author ()/Title ()/Subject ()/Creator (LaTeX with hyperref)/CreationDate ()/ModDate ()/Keywords () /Trapped /False >>
+21 0 obj
+<< /Producer (LuaTeX)/Title <FEFF0067007200FC00DF00650024005C0069006E00740020003D00610024>/Author <FEFF0062006C00750062>/Subject <FEFFD83EDD86>/Xy#20Z <FEFF007500700073> /Creator (TeX) /Trapped /False >>
endobj
xref
-0 25
+0 22
0000000001 65535 f
0000000002 00000 f
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
-0000000246 00000 n
-0000000407 00000 n
-0000000613 00000 n
-0000000928 00000 n
+0000000185 00000 n
+0000000418 00000 n
0000000020 00000 n
-0000000807 00000 n
-0000000867 00000 n
-0000002973 00000 n
-0000003327 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
+0000000299 00000 n
+0000000358 00000 n
+0000002463 00000 n
+0000002817 00000 n
+0000000487 00000 n
+0000001461 00000 n
+0000000530 00000 n
+0000000605 00000 n
+0000001697 00000 n
+0000002617 00000 n
+0000002878 00000 n
+0000002977 00000 n
+0000003013 00000 n
+0000003157 00000 n
trailer
-<< /Size 25 /Root 23 0 R /Info 24 0 R >>
+<< /Size 22 /Root 20 0 R /Info 21 0 R >>
startxref
-3825
+3377
%%EOF
diff --git a/testfiles/infodict-new.pvt b/testfiles/infodict-new.pvt
new file mode 100644
index 0000000..177219d
--- /dev/null
+++ b/testfiles/infodict-new.pvt
@@ -0,0 +1,14 @@
+\input{regression-test}
+\RequirePackage{l3pdf,lthooks,new-pdfescape}
+\ExplSyntaxOn
+\pdf_version_gset:n{1.7}
+\ExplSyntaxOff
+
+\documentclass{article}
+\usepackage[customdriver=hgeneric-experimental]{hyperref}
+
+\hypersetup{pdfsubject={🦆},pdfinfo={Title={grüße$\int=a$}, Author=blub, Xy Z=ups}}
+
+\begin{document}
+xxx
+\end{document}
\ No newline at end of file
diff --git a/testfiles/ismap.tpf b/testfiles/infodict-new.tpf
similarity index 55%
copy from testfiles/ismap.tpf
copy to testfiles/infodict-new.tpf
index 45636dd..dc6dd25 100644
--- a/testfiles/ismap.tpf
+++ b/testfiles/infodict-new.tpf
@@ -1,61 +1,44 @@
-%PDF-1.5
+%PDF-1.7
%ÐÔÅØ
-9 0 obj
+7 0 obj
<<
-/Length 104
+/Length 76
>>
stream
BT
-/F8 9.9626 Tf 148.712 707.125 Td [(xxxxx)]TJ 0 -11.955 Td [(xxxxx)]TJ 154.421 -555.915 Td [(1)]TJ
+/F8 9.9626 Tf 148.712 707.125 Td [(xxx)]TJ 154.421 -567.87 Td [(1)]TJ
ET
endstream
endobj
5 0 obj
<<
/Type /Page
-/Contents 9 0 R
-/Resources 8 0 R
+/Contents 7 0 R
+/Resources 6 0 R
/MediaBox [0 0 595.276 841.89]
-/Parent 13 0 R
-/Annots [ 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 175.999 712.411]
-/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 175.999 700.456]
-/Subtype/Link/A<</Type/Action /S/URI /URI(https://www.latex-project.org#abc~xyz) >>
+/Parent 11 0 R
>>
endobj
-10 0 obj
+8 0 obj
<<
/D [5 0 R /XYZ 132.768 754.95 null]
>>
endobj
-11 0 obj
+9 0 obj
<<
/D [5 0 R /XYZ 133.768 717.088 null]
>>
endobj
-8 0 obj
+6 0 obj
<<
-/Font << /F8 12 0 R >>
+/Font << /F8 10 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-14 0 obj
+12 0 obj
[500 500 500 500 500 500 500 500 500 277.8 277.8 277.8 777.8 472.2 472.2 777.8 750 708.3 722.2 763.9 680.6 652.8 784.7 750 361.1 513.9 777.8 625 916.7 750 777.8 680.6 777.8 736.1 555.6 722.2 750 750 1027.8 750 750 611.1 277.8 500 277.8 500 277.8 277.8 500 555.6 444.4 555.6 444.4 305.6 500 555.6 277.8 305.6 527.8 277.8 833.3 555.6 500 555.6 527.8 391.7 394.4 388.9 555.6 527.8 722.2 527.8]
endobj
-15 0 obj
+13 0 obj
<<
/Length1 1380
/Length2 6282
@@ -64,7 +47,7 @@ endobj
>>
[BINARY STREAM]
endobj
-16 0 obj
+14 0 obj
<<
/Type /FontDescriptor
/FontName /XKHRBG+CMR10
@@ -77,80 +60,79 @@ endobj
/StemV 69
/XHeight 431
/CharSet (/one/x)
-/FontFile 15 0 R
+/FontFile 13 0 R
>>
endobj
-12 0 obj
+10 0 obj
<<
/Type /Font
/Subtype /Type1
/BaseFont /XKHRBG+CMR10
-/FontDescriptor 16 0 R
+/FontDescriptor 14 0 R
/FirstChar 49
/LastChar 120
-/Widths 14 0 R
+/Widths 12 0 R
>>
endobj
-13 0 obj
+11 0 obj
<<
/Type /Pages
/Count 1
/Kids [5 0 R]
>>
endobj
-17 0 obj
+15 0 obj
<<
-/Names [(Doc-Start) 11 0 R (page.1) 10 0 R]
+/Names [(Doc-Start) 9 0 R (page.1) 8 0 R]
/Limits [(Doc-Start) (page.1)]
>>
endobj
-18 0 obj
+16 0 obj
<<
-/Dests 17 0 R
+/Dests 15 0 R
>>
endobj
-19 0 obj
+17 0 obj
<<
/Type /Catalog
-/Pages 13 0 R
-/Names 18 0 R
+/Pages 11 0 R
+/Names 16 0 R
/PageMode /UseOutlines/OpenAction [5 0 R /Fit]/PageLabels <</Nums[0<</S/D>>]>>
>>
endobj
-20 0 obj
+18 0 obj
<<
-/Producer (pdfTeX)/Author ()/Title ()/Subject ()/Creator (LaTeX with hyperref)/CreationDate ()/ModDate ()/Keywords ()
+/Producer (pdfTeX)/Title <FEFF0067007200FC00DF00650024005C0069006E00740020003D00610024>/Author <FEFF0062006C00750062>/Subject <FEFFD83EDD86>/Xy#20Z <FEFF007500700073>
+/Creator (TeX)
/Trapped /False
>>
endobj
xref
-0 21
+0 19
0000000001 65535 f
0000000002 00000 f
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
-0000000177 00000 n
-0000000313 00000 n
-0000000516 00000 n
-0000000825 00000 n
+0000000149 00000 n
+0000000376 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
+0000000261 00000 n
+0000000318 00000 n
+0000008832 00000 n
+0000008972 00000 n
+0000000444 00000 n
+0000000851 00000 n
+0000008611 00000 n
+0000009030 00000 n
+0000009125 00000 n
+0000009161 00000 n
+0000009305 00000 n
trailer
-<< /Size 21
-/Root 19 0 R
-/Info 20 0 R
+<< /Size 19
+/Root 17 0 R
+/Info 18 0 R
>>
startxref
-9912
+9525
%%EOF
diff --git a/testfiles/annot.xetex.tpf b/testfiles/infodict-new.xetex.tpf
similarity index 56%
copy from testfiles/annot.xetex.tpf
copy to testfiles/infodict-new.xetex.tpf
index 480e691..24de19f 100644
--- a/testfiles/annot.xetex.tpf
+++ b/testfiles/infodict-new.xetex.tpf
@@ -1,35 +1,40 @@
-%PDF-1.5
+%PDF-1.7
%äðíø
-7 0 obj
-<</Length 181>>
+6 0 obj
+<</Length 111>>
stream
- q 1 0 0 1 72 769.89 cm BT /F1 9.9626 Tf 76.712 -62.765 Td[<00740074>]TJ ET BT /F1 9.9626 Tf 87.233 -62.765 Td[<00740074007600760078007800720072>]TJ 143.9 -567.87 Td[<0052>]TJ ET Q
+ q 1 0 0 1 72 769.89 cm BT /F1 9.9626 Tf 76.712 -62.765 Td[<007400740074>]TJ 154.421 -567.87 Td[<0052>]TJ ET Q
endstream
endobj
-8 0 obj
+7 0 obj
<</Font<</F1 5 0 R>>/ProcSet[/PDF/Text/ImageC/ImageB/ImageI]>>
endobj
-6 0 obj
-<</Type/Annot/Subtype/Widget/F 4/T(abc)/FT/Tx/Q 0/BS<</W 1/S/S>>/MK<</BC[1 0 0]/BG[1
-1 1]>>/DA(/Helv 10 Tf 0 0 0 rg)/DV()/V()/Rect[159.233 707.125 187.579 735.472]>>
-endobj
10 0 obj
-[6 0 R]
+<</Names[(Doc-Start)8 0 R(page.1)9 0 R]>>
endobj
-3 0 obj
-<</Resources 8 0 R/Type/Page/Parent 9 0 R/Contents[7 0 R]/Annots 10 0 R>>
+8 0 obj
+[3 0 R/XYZ 133.77 717.09 null]
endobj
9 0 obj
+[3 0 R/XYZ 132.77 754.95 null]
+endobj
+11 0 obj
+<</Dests 10 0 R>>
+endobj
+3 0 obj
+<</Resources 7 0 R/Type/Page/Parent 12 0 R/Contents[6 0 R]>>
+endobj
+12 0 obj
<</Type/Pages/Count 1/Kids[3 0 R]/MediaBox[0 0 595.28 841.89]>>
endobj
2 0 obj
-<</Creator(TeX)/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
+<</Creator(TeX)/Title<feff0067007200fc00df00650024005c0069006e00740020003d00610024>/Author<feff0062006c00750062>/Subject<feffd83edd86>/Xy#20Z<feff007500700073>/Producer(xdvipdfmx)/CreationDate(D:20160520090000-00'00')>>
endobj
1 0 obj
-<</Pages 9 0 R/Type/Catalog>>
+<</PageMode/UseOutlines/OpenAction[3 0 R/Fit]/Names 11 0 R/Pages 12 0 R/Type/Catalog>>
endobj
-11 0 obj
-<</Length 412>>
+13 0 obj
+<</Length 370>>
stream
/CIDInit /ProcSet findresource begin
12 dict begin
@@ -44,12 +49,9 @@ begincmap
1 begincodespacerange
<0000> <FFFF>
endcodespacerange
-5 beginbfchar
+2 beginbfchar
<0052> <0031>
-<0072> <0077>
<0074> <0078>
-<0076> <0079>
-<0078> <007A>
endbfchar
endcmap
CMapName currentdict /CMap defineresource pop
@@ -57,51 +59,53 @@ end
end
endstream
endobj
-13 0 obj
-<</Subtype/CIDFontType0C/Length 1156>>
+15 0 obj
+<</Subtype/CIDFontType0C/Length 746>>
[BINARY STREAM]
endobj
-14 0 obj
-[82[500]114[722]116[528]118[528]120[444]]
+16 0 obj
+[82[500]116[528]]
endobj
-15 0 obj
-<</Length 16>>
+17 0 obj
+<</Length 15>>
[BINARY STREAM]
endobj
4 0 obj
<</Type/Font/Subtype/CIDFontType0/BaseFont/EXQIVM+LMRoman10-Regular/CIDSystemInfo<</Registry(Adobe)/Ordering(Identity)/Supplement
-0>>/FontDescriptor 12 0 R/DW 280/W 14 0 R>>
+0>>/FontDescriptor 14 0 R/DW 280/W 16 0 R>>
endobj
-12 0 obj
+14 0 obj
<</Type/FontDescriptor/Ascent 806/Descent -194/StemV 69/CapHeight 806/AvgWidth 549/FontBBox[-430
-290 1417 1127]/ItalicAngle 0/Flags 6/Style<</Panose<000000000500000000000000>>>/FontName/EXQIVM+LMRoman10-Regular/FontFile3
-13 0 R/CIDSet 15 0 R>>
+15 0 R/CIDSet 17 0 R>>
endobj
5 0 obj
<</Type/Font/Subtype/Type0/BaseFont/EXQIVM+LMRoman10-Regular-Identity-H/Encoding/Identity-H/DescendantFonts[4 0 R]/ToUnicode
-11 0 R>>
+13 0 R>>
endobj
xref
-0 16
+0 18
0000000000 65535 f
-0000000787 00000 n
-0000000696 00000 n
-0000000528 00000 n
-0000002646 00000 n
-0000003096 00000 n
-0000000323 00000 n
+0000000828 00000 n
+0000000593 00000 n
+0000000437 00000 n
+0000002266 00000 n
+0000002716 00000 n
0000000015 00000 n
-0000000245 00000 n
-0000000617 00000 n
-0000000504 00000 n
-0000000832 00000 n
-0000002835 00000 n
-0000001294 00000 n
-0000002523 00000 n
-0000002581 00000 n
+0000000175 00000 n
+0000000311 00000 n
+0000000357 00000 n
+0000000253 00000 n
+0000000403 00000 n
+0000000513 00000 n
+0000000930 00000 n
+0000002455 00000 n
+0000001350 00000 n
+0000002168 00000 n
+0000002202 00000 n
trailer
<</Root 1 0 R/Info 2 0 R/ID[<ID-STRING><ID-STRING>]/Size
-16>>
+18>>
startxref
-3245
+2865
%%EOF
More information about the latex3-commits
mailing list.