[latex3-commits] [git/LaTeX3-latex3-pdfresources] develop, main: one shouldn't forget the structure commands (e8fdfef)
Ulrike Fischer
fischer at troubleshooting-tex.de
Mon Jun 14 19:28:15 CEST 2021
Repository : https://github.com/latex3/pdfresources
On branches: develop,main
Link : https://github.com/latex3/pdfresources/commit/e8fdfefb6396937f4e0c575562031dc776d43de9
>---------------------------------------------------------------
commit e8fdfefb6396937f4e0c575562031dc776d43de9
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Jun 14 19:28:15 2021 +0200
one shouldn't forget the structure commands
>---------------------------------------------------------------
e8fdfefb6396937f4e0c575562031dc776d43de9
l3pdffield.dtx | 55 ++++++++++--
testfiles/tag-checkbox.luatex.tpf | 132 ++++++++++++++++-------------
testfiles/tag-checkbox.pvt | 2 +-
testfiles/tag-checkbox.tpf | 173 ++++++++++++++++++++------------------
testfiles/tag-checkbox.xetex.tpf | 141 ++++++++++++++++---------------
5 files changed, 290 insertions(+), 213 deletions(-)
diff --git a/l3pdffield.dtx b/l3pdffield.dtx
index 5db515e..27cf47e 100644
--- a/l3pdffield.dtx
+++ b/l3pdffield.dtx
@@ -73,7 +73,7 @@
% }^^A
% }
%
-% \date{Version 0.95d, released 2021-05-14}
+% \date{Version 0.95e, released 2021-06-14}
%
% \maketitle
% \begin{documentation}
@@ -255,6 +255,10 @@
% to the structure where they are created. It is possible to deactivate tagging for
% a field annotation by setting the |tag| to false as described below.
%
+% If lualatex is used tagging require either that \pkg{tagpdf} is used with the
+% option |global-mc|, or mc-chunks must be correctly closed manually, as the automatic
+% code can't escape the grouping.
+%
% It is recommended to use the |TU|/|altname| key to give the field a readable
% name.
%
@@ -307,7 +311,7 @@
%
% \begin{function}{\pdffield_annot_ref_last:}
% \begin{syntax}
-% \pdffield_annot_ref_last:
+% \cs{pdffield_annot_ref_last:}
% \end{syntax}
% If a tagged PDF should be created, the object
% of the annotation of a field should be referenced in the Form structure element.
@@ -883,11 +887,16 @@
% ,\cs_new_protected:Npn
% ,\cs_set_eq:NN
% ,\cs_set_protected:Npn
+% ,\cs_if_exist:NTF
+% ,\cs_if_exist:NT
+% ,\cs_new:Npn
% ,\csname
% ,\dim_eval:n
% ,\dim_new:N
% ,\endcsname
% ,\exp_args:Ne
+% ,\exp_args:Nnx
+% ,\exp_args:NV
% ,\group_begin:
% ,\group_end:
% ,\hbox_to_wd:nn
@@ -961,7 +970,7 @@
%<*package>
%<@@=pdffield>
\NeedsTeXFormat{LaTeX2e}
-\ProvidesExplPackage{l3pdffield-testphase}{2021-05-14}{0.95d}%
+\ProvidesExplPackage{l3pdffield-testphase}{2021-06-14}{0.95e}%
{form fields}
% \end{macrocode}
% \subsection{hyperref specific command}
@@ -1005,6 +1014,7 @@
\str_new:N \l_@@_CO_sortkey_str
\tl_new:N \g_@@_annot_ref_last_tl
\bool_new:N \l_@@_tag_bool
+\bool_set_true:N \l_@@_tag_bool
% \end{macrocode}
% \end{variable}
%
@@ -1280,6 +1290,7 @@
}
}
\mode_leave_vertical:
+ \@@_tag_struct_begin:
\hbox_to_wd:nn
{ \l_@@_annot_wd_dim }
{
@@ -1292,6 +1303,7 @@
}
\tl_gset:Nx \g_@@_annot_ref_last_tl { \pdfannot_box_ref_last: }
\exp_args:NV \@@_tag_add_objr:n \g_@@_annot_ref_last_tl
+ \@@_tag_struct_end:
\tl_if_empty:NF \l_@@_currentparent_tl
{
\seq_if_exist:cTF {g_@@_field/Kids/\l_@@_currentparent_tl _seq}
@@ -1333,13 +1345,35 @@
{
\cs_set_protected:Npn \@@_tag_add_struct_parent:
{
- \pdfannot_dict_put:nnx {widget}{StructParent}{ \tag_struct_parent_int: }
+ \bool_if:NT \l_@@_tag_bool
+ {
+ \pdfannot_dict_put:nnx {widget}{StructParent}{ \tag_struct_parent_int: }
+ }
}
\cs_set_protected:Npn \@@_tag_add_objr:n #1
{
- \exp_args:Nnx
- \tag_struct_insert_annot:nn {#1}{ \tag_struct_parent_int: }
+ \bool_if:NT \l_@@_tag_bool
+ {
+ \exp_args:Nnx
+ \tag_struct_insert_annot:nn {#1}{ \tag_struct_parent_int: }
+ }
}
+ \cs_set_protected:Npn \@@_tag_struct_begin:
+ {
+ \bool_if:NT \l_@@_tag_bool
+ {
+ \tag_mc_end_push:
+ \tag_struct_begin:n{tag=Form}
+ }
+ }
+ \cs_set_protected:Npn \@@_tag_struct_end:
+ {
+ \bool_if:NT \l_@@_tag_bool
+ {
+ \tag_struct_end:
+ \tag_mc_begin_pop:n{}
+ }
+ }
}
}
}
@@ -1700,6 +1734,15 @@
}
% \end{macrocode}
% \end{macro}
+% \begin{macro}{tag}
+% to disable tagging locall
+% \begin{macrocode}
+\keys_define:nn { pdffield }
+ {
+ ,tag .bool_set:N = \l_@@_tag_bool
+ }
+% \end{macrocode}
+% \end{macro}
% \begin{macro}{\@@_appearance_handler:nnn}
% Appearances have to be handled in various ways, so we use a handler, that
% the field types can redefine if needed.
diff --git a/testfiles/tag-checkbox.luatex.tpf b/testfiles/tag-checkbox.luatex.tpf
index 0f331a0..d0b6c53 100644
--- a/testfiles/tag-checkbox.luatex.tpf
+++ b/testfiles/tag-checkbox.luatex.tpf
@@ -58,20 +58,20 @@ endobj
16 0 obj
<< /T (a) /V /Off /DV /Off /FT /Btn /Kids 17 0 R /Ff 0 >>
endobj
-18 0 obj
+19 0 obj
<< /N 15 0 R >>
endobj
-20 0 obj
-<< /Type /OBJR /Obj 19 0 R >>
+21 0 obj
+<< /Type /OBJR /Obj 20 0 R >>
endobj
17 0 obj
-[ 19 0 R ]
+[ 20 0 R ]
endobj
1 0 obj
<< /opacity1 <</ca 1/CA 1>> >>
endobj
-23 0 obj
-<< /Length 226 >>
+24 0 obj
+<< /Length 314 >>
stream
/opacity1 gs
/Artifact BMC
@@ -79,7 +79,15 @@ EMC
/P<</MCID 0>> BDC
BT
/F23 9.96264 Tf
-1 0 0 1 148.712 705.133 Tm [<001C001C001C001C>-1533<0023002300230023>]TJ
+1 0 0 1 148.712 705.133 Tm [<001C001C001C001C>]TJ
+ET
+EMC
+/Artifact BMC
+EMC
+/P<</MCID 1>> BDC
+BT
+/F23 9.96264 Tf
+1 0 0 1 183.91 705.133 Tm [<0023002300230023>]TJ
ET
EMC
/Artifact BMC
@@ -90,30 +98,30 @@ ET
EMC
endstream
endobj
-22 0 obj
-<< /Type /Page /Contents 23 0 R /Resources 21 0 R /MediaBox [ 0 0 595.276 841.89 ] /StructParents 0/Tabs /S /Parent 24 0 R /Annots 25 0 R >>
+23 0 obj
+<< /Type /Page /Contents 24 0 R /Resources 22 0 R /MediaBox [ 0 0 595.276 841.89 ] /StructParents 0/Tabs /S /Parent 25 0 R /Annots 26 0 R >>
endobj
-25 0 obj
-[ 19 0 R ]
+26 0 obj
+[ 20 0 R ]
endobj
-19 0 obj
-<< /Type /Annot /Subtype /Widget /AS /Off /F 0 /StructParent 1 /Parent 16 0 R /AP 18 0 R /Rect [ 171.955 705.133 183.91 717.088 ] >>
+20 0 obj
+<< /Type /Annot /Subtype /Widget /AS /Off /F 0 /StructParent 1 /Parent 16 0 R /AP 19 0 R /Rect [ 171.955 705.133 183.91 717.088 ] >>
endobj
-21 0 obj
+22 0 obj
<< /ExtGState 1 0 R /Font << /F23 12 0 R >> /ProcSet [ /PDF /Text ] >>
endobj
-26 0 obj
-[ 16 0 R ]
-endobj
27 0 obj
-<< /Fields 26 0 R >>
+[ 16 0 R ]
endobj
28 0 obj
+<< /Fields 27 0 R >>
+endobj
+29 0 obj
<< /Marked true >>
endobj
6 0 obj
-<< /Nums [0 [9 0 R]
-1 9 0 R
+<< /Nums [0 [ 9 0 R 9 0 R]
+1 18 0 R
] >>
endobj
7 0 obj
@@ -123,26 +131,29 @@ endobj
[ ]
endobj
9 0 obj
-<< /Type /StructElem /S /P /P 5 0 R /K [<</Type /MCR /Pg 22 0 R /MCID 0>> 20 0 R] >>
+<< /Type /StructElem /S /P /P 5 0 R /K [<</Type /MCR /Pg 23 0 R /MCID 0>> 18 0 R <</Type /MCR /Pg 23 0 R /MCID 1>> ] >>
+endobj
+18 0 obj
+<< /Type /StructElem /S /Form /P 9 0 R /K 21 0 R >>
endobj
5 0 obj
<< /Type /StructTreeRoot /K 9 0 R /ParentTree 6 0 R /RoleMap 7 0 R /Namespaces 8 0 R >>
endobj
-29 0 obj
+30 0 obj
[ 28 [ 500 ] 35 [ 556 ] 82 [ 500 ] 403 [ 778 ] ]
endobj
-31 0 obj
+32 0 obj
<< /Length 51 >>
[BINARY STREAM]
endobj
-32 0 obj
+33 0 obj
<< /Subtype /CIDFontType0C /Length 959 >>
[BINARY STREAM]
endobj
-30 0 obj
-<< /Type /FontDescriptor /FontName /OIGWJD+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 32 0 R /CIDSet 31 0 R >>
+31 0 obj
+<< /Type /FontDescriptor /FontName /OIGWJD+LMRoman10-Regular /Flags 4 /FontBBox [ -430 -290 1417 1127 ] /Ascent 1127 /CapHeight 683 /Descent -290 /ItalicAngle 0 /StemV 93 /XHeight 431 /FontFile3 33 0 R /CIDSet 32 0 R >>
endobj
-33 0 obj
+34 0 obj
<< /Length 734 >>
stream
%!PS-Adobe-3.0 Resource-CMap
@@ -182,61 +193,62 @@ end
endstream
endobj
12 0 obj
-<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OIGWJD+LMRoman10-Regular /DescendantFonts [ 34 0 R ] /ToUnicode 33 0 R >>
-endobj
-34 0 obj
-<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OIGWJD+LMRoman10-Regular /FontDescriptor 30 0 R /W 29 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
-endobj
-24 0 obj
-<< /Type /Pages /Count 1 /Kids [ 22 0 R ] >>
+<< /Type /Font /Subtype /Type0 /Encoding /Identity-H /BaseFont /OIGWJD+LMRoman10-Regular /DescendantFonts [ 35 0 R ] /ToUnicode 34 0 R >>
endobj
35 0 obj
-<< /Type /Catalog /Pages 24 0 R /MarkInfo 28 0 R/Lang (en-US)/StructTreeRoot 5 0 R/AcroForm 27 0 R >>
+<< /Type /Font /Subtype /CIDFontType0 /BaseFont /OIGWJD+LMRoman10-Regular /FontDescriptor 31 0 R /W 30 0 R /CIDSystemInfo << /Registry (Adobe) /Ordering (Identity) /Supplement 0 >> >>
+endobj
+25 0 obj
+<< /Type /Pages /Count 1 /Kids [ 23 0 R ] >>
endobj
36 0 obj
+<< /Type /Catalog /Pages 25 0 R /MarkInfo 29 0 R/Lang (en-US)/StructTreeRoot 5 0 R/AcroForm 28 0 R >>
+endobj
+37 0 obj
<< /Creator (TeX)/Producer (LuaTeX)/CreationDate (D:20010101205959-00'00')/ModDate (D:20010101205959-00'00') /Trapped /False >>
endobj
xref
-0 37
+0 38
0000000002 65535 f
0000001298 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
-0000002474 00000 n
-0000002153 00000 n
-0000002201 00000 n
-0000002352 00000 n
-0000002372 00000 n
+0000002675 00000 n
+0000002241 00000 n
+0000002298 00000 n
+0000002449 00000 n
+0000002469 00000 n
0000000020 00000 n
0000000502 00000 n
-0000004827 00000 n
+0000005028 00000 n
0000000589 00000 n
0000001015 00000 n
0000001072 00000 n
0000001117 00000 n
0000001271 00000 n
+0000002606 00000 n
0000001192 00000 n
-0000001815 00000 n
+0000001903 00000 n
0000001225 00000 n
-0000001965 00000 n
-0000001631 00000 n
+0000002053 00000 n
+0000001719 00000 n
0000001345 00000 n
-0000005181 00000 n
-0000001788 00000 n
-0000002052 00000 n
-0000002079 00000 n
-0000002117 00000 n
-0000002578 00000 n
-0000003797 00000 n
-0000002643 00000 n
-0000002754 00000 n
-0000004033 00000 n
-0000004981 00000 n
-0000005243 00000 n
-0000005361 00000 n
+0000005382 00000 n
+0000001876 00000 n
+0000002140 00000 n
+0000002167 00000 n
+0000002205 00000 n
+0000002779 00000 n
+0000003998 00000 n
+0000002844 00000 n
+0000002955 00000 n
+0000004234 00000 n
+0000005182 00000 n
+0000005444 00000 n
+0000005562 00000 n
trailer
-<< /Size 37 /Root 35 0 R /Info 36 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
+<< /Size 38 /Root 36 0 R /Info 37 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
startxref
-5505
+5706
%%EOF
diff --git a/testfiles/tag-checkbox.pvt b/testfiles/tag-checkbox.pvt
index 9c7d14c..2bde9a1 100644
--- a/testfiles/tag-checkbox.pvt
+++ b/testfiles/tag-checkbox.pvt
@@ -8,7 +8,7 @@
\usepackage{tagpdf}
\usepackage{l3pdffield-testphase}
-\tagpdfsetup{activate-all,paratagging}
+\tagpdfsetup{activate-all,paratagging,global-mc}
\begin{document}
diff --git a/testfiles/tag-checkbox.tpf b/testfiles/tag-checkbox.tpf
index 82eded5..f725617 100644
--- a/testfiles/tag-checkbox.tpf
+++ b/testfiles/tag-checkbox.tpf
@@ -84,27 +84,35 @@ endobj
18 0 obj
<< /T (a) /V /Off /DV /Off /FT /Btn /Kids 19 0 R /Ff 0 >>
endobj
-20 0 obj
+21 0 obj
<< /N 17 0 R >>
endobj
-22 0 obj
-<< /Type /OBJR /Obj 21 0 R >>
+23 0 obj
+<< /Type /OBJR /Obj 22 0 R >>
+endobj
+24 0 obj
+<< /MCID 1 >>
endobj
19 0 obj
-[ 21 0 R ]
+[ 22 0 R ]
endobj
1 0 obj
<< /opacity1 <</ca 1/CA 1>> >>
endobj
-24 0 obj
+26 0 obj
<<
-/Length 142
+/Length 201
>>
stream
/opacity1 gs
/P /l3pdf1 BDC
BT
-/F19 9.9626 Tf 148.712 705.133 Td [(aaaa)-1533(bbbb)]TJ
+/F19 9.9626 Tf 148.712 705.133 Td [(aaaa)]TJ
+ET
+EMC
+/P /l3pdf2 BDC
+BT
+/F19 9.9626 Tf 183.914 705.133 Td [(bbbb)]TJ
ET
EMC
BT
@@ -115,40 +123,40 @@ endobj
11 0 obj
<<
/Type /Page
-/Contents 24 0 R
-/Resources 23 0 R
+/Contents 26 0 R
+/Resources 25 0 R
/MediaBox [0 0 595.276 841.89]
/Tabs /S /StructParents 0
-/Parent 26 0 R
-/Annots [ 21 0 R ]
+/Parent 28 0 R
+/Annots [ 22 0 R ]
>>
endobj
-21 0 obj
+22 0 obj
<<
/Type /Annot
-/Subtype /Widget /AS /Off /F 0 /StructParent 1 /Parent 18 0 R /AP 20 0 R
+/Subtype /Widget /AS /Off /F 0 /StructParent 1 /Parent 18 0 R /AP 21 0 R
/Rect [171.959 705.133 183.914 717.088]
>>
endobj
-23 0 obj
+25 0 obj
<<
-/Properties <</l3pdf1 10 0 R >>/ExtGState 1 0 R
-/Font << /F19 25 0 R >>
+/Properties <</l3pdf1 10 0 R /l3pdf2 24 0 R >>/ExtGState 1 0 R
+/Font << /F19 27 0 R >>
/ProcSet [ /PDF /Text ]
>>
endobj
-27 0 obj
+29 0 obj
[ 18 0 R ]
endobj
-28 0 obj
-<< /Fields 27 0 R >>
+30 0 obj
+<< /Fields 29 0 R >>
endobj
-29 0 obj
+31 0 obj
<< /Marked true >>
endobj
6 0 obj
-<< /Nums [0 [ 9 0 R ]
-1 9 0 R
+<< /Nums [0 [ 9 0 R 9 0 R ]
+1 20 0 R
] >>
endobj
7 0 obj
@@ -158,18 +166,21 @@ endobj
[ ]
endobj
9 0 obj
-<< /Type /StructElem /S /P /P 5 0 R /K [<</Type /MCR /Pg 11 0 R/MCID 0>> 22 0 R] >>
+<< /Type /StructElem /S /P /P 5 0 R /K [<</Type /MCR /Pg 11 0 R/MCID 0>> 20 0 R <</Type /MCR /Pg 11 0 R/MCID 1>>] >>
+endobj
+20 0 obj
+<< /Type /StructElem /S /Form /P 9 0 R /K 23 0 R >>
endobj
5 0 obj
<< /Type /StructTreeRoot /K 9 0 R /ParentTree 6 0 R /RoleMap 7 0 R /Namespaces 8 0 R >>
endobj
-30 0 obj
+32 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]
endobj
-32 0 obj
+34 0 obj
[777.6]
endobj
-33 0 obj
+35 0 obj
<<
/Length1 1393
/Length2 7602
@@ -178,7 +189,7 @@ endobj
>>
[BINARY STREAM]
endobj
-34 0 obj
+36 0 obj
<<
/Type /FontDescriptor
/FontName /XFWMEY+CMR10
@@ -191,10 +202,10 @@ endobj
/StemV 69
/XHeight 431
/CharSet (/a/b/one)
-/FontFile 33 0 R
+/FontFile 35 0 R
>>
endobj
-35 0 obj
+37 0 obj
<<
/Length1 721
/Length2 1088
@@ -203,7 +214,7 @@ endobj
>>
[BINARY STREAM]
endobj
-36 0 obj
+38 0 obj
<<
/Type /FontDescriptor
/FontName /LNEZCO+SFRM1000
@@ -216,16 +227,16 @@ endobj
/StemV 50
/XHeight 430
/CharSet (/multiply)
-/FontFile 35 0 R
+/FontFile 37 0 R
>>
endobj
-31 0 obj
+33 0 obj
<<
/Type /Encoding
/Differences [214/multiply]
>>
endobj
-37 0 obj
+39 0 obj
<<
/Length 1724
>>
@@ -347,19 +358,19 @@ end
%%EOF
endstream
endobj
-25 0 obj
+27 0 obj
<<
/Type /Font
/Subtype /Type1
/BaseFont /XFWMEY+CMR10
-/FontDescriptor 34 0 R
+/FontDescriptor 36 0 R
/FirstChar 49
/LastChar 98
-/Widths 30 0 R
-/ToUnicode 37 0 R
+/Widths 32 0 R
+/ToUnicode 39 0 R
>>
endobj
-38 0 obj
+40 0 obj
<<
/Length 1568
>>
@@ -474,82 +485,84 @@ endobj
/Type /Font
/Subtype /Type1
/BaseFont /LNEZCO+SFRM1000
-/FontDescriptor 36 0 R
+/FontDescriptor 38 0 R
/FirstChar 214
/LastChar 214
-/Widths 32 0 R
-/Encoding 31 0 R
-/ToUnicode 38 0 R
+/Widths 34 0 R
+/Encoding 33 0 R
+/ToUnicode 40 0 R
>>
endobj
-26 0 obj
+28 0 obj
<<
/Type /Pages
/Count 1
/Kids [11 0 R]
>>
endobj
-39 0 obj
+41 0 obj
<<
/Type /Catalog
-/Pages 26 0 R
-/MarkInfo 29 0 R/Lang (en-US)/StructTreeRoot 5 0 R/AcroForm 28 0 R
+/Pages 28 0 R
+/MarkInfo 31 0 R/Lang (en-US)/StructTreeRoot 5 0 R/AcroForm 30 0 R
>>
endobj
-40 0 obj
+42 0 obj
<<
/Creator (TeX)/Producer (pdfTeX)/CreationDate (D:20010101205959-00'00')/ModDate (D:20010101205959-00'00')
/Trapped /False
>>
endobj
xref
-0 41
+0 43
0000000002 65535 f
-0000001322 00000 n
+0000001353 00000 n
0000000003 00000 f
0000000004 00000 f
0000000000 00000 f
-0000002421 00000 n
-0000002100 00000 n
-0000002150 00000 n
-0000002301 00000 n
-0000002321 00000 n
+0000002635 00000 n
+0000002205 00000 n
+0000002262 00000 n
+0000002413 00000 n
+0000002433 00000 n
0000000015 00000 n
-0000001570 00000 n
+0000001660 00000 n
0000000046 00000 n
0000000535 00000 n
-0000017904 00000 n
+0000018118 00000 n
0000000622 00000 n
0000001039 00000 n
0000001096 00000 n
0000001141 00000 n
-0000001295 00000 n
+0000001326 00000 n
+0000002566 00000 n
0000001216 00000 n
-0000001731 00000 n
+0000001821 00000 n
0000001249 00000 n
-0000001880 00000 n
-0000001369 00000 n
-0000016120 00000 n
-0000018083 00000 n
-0000001999 00000 n
-0000002026 00000 n
-0000002064 00000 n
-0000002525 00000 n
-0000014271 00000 n
-0000002804 00000 n
-0000002828 00000 n
-0000011921 00000 n
-0000012144 00000 n
-0000014050 00000 n
-0000014337 00000 n
-0000016277 00000 n
-0000018142 00000 n
-0000018260 00000 n
+0000001295 00000 n
+0000001970 00000 n
+0000001400 00000 n
+0000016334 00000 n
+0000018297 00000 n
+0000002104 00000 n
+0000002131 00000 n
+0000002169 00000 n
+0000002739 00000 n
+0000014485 00000 n
+0000003018 00000 n
+0000003042 00000 n
+0000012135 00000 n
+0000012358 00000 n
+0000014264 00000 n
+0000014551 00000 n
+0000016491 00000 n
+0000018356 00000 n
+0000018474 00000 n
trailer
-<< /Size 41
-/Root 39 0 R
-/Info 40 0 R
+<< /Size 43
+/Root 41 0 R
+/Info 42 0 R
/ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
startxref
-18404
+18618
%%EOF
diff --git a/testfiles/tag-checkbox.xetex.tpf b/testfiles/tag-checkbox.xetex.tpf
index 37404da..577d8e5 100644
--- a/testfiles/tag-checkbox.xetex.tpf
+++ b/testfiles/tag-checkbox.xetex.tpf
@@ -20,14 +20,14 @@ stream
0 G 0 g 0 g 0 G /opacity1 gs q .3985 w -60.045 80.568 m -48.09 80.568 l S Q q .3985 w -59.846 68.413 m -59.846 80.369 l S Q q .3985 w -48.289 68.413 m -48.289 80.369 l S Q q .3985 w -60.045 68.214 m -48.09 68.214 l S Q
endstream
endobj
-29 0 obj
-<</Length 301>>
+31 0 obj
+<</Length 319>>
stream
- q 1 0 0 1 72 769.89 cm 0 G 0 g 0 g 0 G /opacity1 gs 0 G 0 g 0 g 0 G /opacity1 gs 0 G 0 g 0 g 0 G /opacity1 gs /P/l3pdf1 BDC BT /F1 9.9626 Tf 76.712 -64.757 Td[<001c001c001c001c>]TJ ET BT /F1 9.9626 Tf 111.91 -64.757 Td[<0023002300230023>]TJ ET EMC BT /F1 9.9626 Tf 231.133 -630.635 Td[<0052>]TJ ET Q
+ q 1 0 0 1 72 769.89 cm 0 G 0 g 0 g 0 G /opacity1 gs 0 G 0 g 0 g 0 G /opacity1 gs 0 G 0 g 0 g 0 G /opacity1 gs /P/l3pdf1 BDC BT /F1 9.9626 Tf 76.712 -64.757 Td[<001c001c001c001c>]TJ ET EMC /P/l3pdf2 BDC BT /F1 9.9626 Tf 111.91 -64.757 Td[<0023002300230023>]TJ ET EMC BT /F1 9.9626 Tf 231.133 -630.635 Td[<0052>]TJ ET Q
endstream
endobj
-30 0 obj
-<</ExtGState 7 0 R/Properties<</l3pdf1 14 0 R>>/Font<</F1 5 0 R>>/ProcSet[/PDF/Text/ImageC/ImageB/ImageI]>>
+32 0 obj
+<</ExtGState 7 0 R/Properties<</l3pdf1 14 0 R/l3pdf2 20 0 R>>/Font<</F1 5 0 R>>/ProcSet[/PDF/Text/ImageC/ImageB/ImageI]>>
endobj
7 0 obj
<</opacity1<</ca 1/CA 1>>>>
@@ -41,20 +41,21 @@ endobj
9 0 obj
<<>>
endobj
-21 0 obj
-<</Type/StructTreeRoot/K 20 0 R/ParentTree 23 0 R/RoleMap 24 0 R/Namespaces 25 0 R>>
-endobj
23 0 obj
-<</Nums[0[20 0 R]1 20 0 R]>>
+<</Type/StructTreeRoot/K 21 0 R/ParentTree 25 0 R/RoleMap 26 0 R/Namespaces 27 0 R>>
endobj
-24 0 obj
+25 0 obj
+<</Nums[0[21 0 R 21 0 R]1 22 0 R]>>
+endobj
+26 0 obj
<</DocumentFragment/Art/Aside/Note/Title/H1/Sub/Span/H7/H6/H8/H6/H9/H6/H10/H6/FENote/Note/Em/Span/Strong/Span>>
endobj
-25 0 obj
+27 0 obj
[]
endobj
-20 0 obj
-<</Type/StructElem/S/P/P 21 0 R/K[<</Type/MCR/Pg 3 0 R/MCID 0>>22 0 R]>>
+21 0 obj
+<</Type/StructElem/S/P/P 23 0 R/K[<</Type/MCR/Pg 3 0 R/MCID 0>>22 0 R<</Type/MCR/Pg
+3 0 R/MCID 1>>]>>
endobj
14 0 obj
<</MCID 0>>
@@ -68,6 +69,9 @@ endobj
15 0 obj
[19 0 R]
endobj
+22 0 obj
+<</Type/StructElem/S/Form/P 21 0 R/K 24 0 R>>
+endobj
18 0 obj
<</N 16 0 R>>
endobj
@@ -75,35 +79,38 @@ endobj
<</Type/Annot/Subtype/Widget/AS/Off/F 0/StructParent 1/Parent 17 0 R/AP 18 0 R/Rect[171.955
705.133 183.91 717.088]>>
endobj
-22 0 obj
+24 0 obj
<</Type/OBJR/Obj 19 0 R>>
endobj
-26 0 obj
-[17 0 R]
+20 0 obj
+<</MCID 1>>
endobj
28 0 obj
-<</Fields 26 0 R>>
+[17 0 R]
endobj
-27 0 obj
+30 0 obj
+<</Fields 28 0 R>>
+endobj
+29 0 obj
<</Marked true>>
endobj
-32 0 obj
+34 0 obj
[19 0 R]
endobj
3 0 obj
-<</Tabs/S/StructParents 0/Resources 30 0 R/Type/Page/Parent 31 0 R/Contents[29 0 R]/Annots
-32 0 R>>
+<</Tabs/S/StructParents 0/Resources 32 0 R/Type/Page/Parent 33 0 R/Contents[31 0 R]/Annots
+34 0 R>>
endobj
-31 0 obj
+33 0 obj
<</Type/Pages/Count 1/Kids[3 0 R]/MediaBox[0 0 595.28 841.89]>>
endobj
2 0 obj
<</Creator(TeX)/Producer(xetex)/CreationDate(D:20010101194934+01'00')/ModDate(D:20010101205959-00'00')>>
endobj
1 0 obj
-<</MarkInfo 27 0 R/Lang(en-US)/StructTreeRoot 21 0 R/AcroForm 28 0 R/Pages 31 0 R/Type/Catalog>>
+<</MarkInfo 29 0 R/Lang(en-US)/StructTreeRoot 23 0 R/AcroForm 30 0 R/Pages 33 0 R/Type/Catalog>>
endobj
-33 0 obj
+35 0 obj
<</Length 398>>
stream
/CIDInit /ProcSet findresource begin
@@ -131,73 +138,75 @@ end
end
endstream
endobj
-35 0 obj
+37 0 obj
<</Subtype/CIDFontType0C/Length 938>>
[BINARY STREAM]
endobj
-36 0 obj
+38 0 obj
[28[500]35[556]82[500]403[778]]
endobj
-37 0 obj
+39 0 obj
<</Length 51>>
[BINARY STREAM]
endobj
6 0 obj
<</Type/Font/Subtype/CIDFontType0/BaseFont/EXQIVM+LMRoman10-Regular/CIDSystemInfo<</Registry(Adobe)/Ordering(Identity)/Supplement
-0>>/FontDescriptor 34 0 R/DW 280/W 36 0 R>>
+0>>/FontDescriptor 36 0 R/DW 280/W 38 0 R>>
endobj
-34 0 obj
+36 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
-35 0 R/CIDSet 37 0 R>>
+37 0 R/CIDSet 39 0 R>>
endobj
5 0 obj
<</Type/Font/Subtype/Type0/BaseFont/EXQIVM+LMRoman10-Regular-Identity-H/Encoding/Identity-H/DescendantFonts[6 0 R]/ToUnicode
-33 0 R>>
+35 0 R>>
endobj
xref
-0 38
+0 40
0000000000 65535 f
-0000002837 00000 n
-0000002717 00000 n
-0000002522 00000 n
+0000002995 00000 n
+0000002875 00000 n
+0000002680 00000 n
0000000156 00000 n
-0000005005 00000 n
-0000004555 00000 n
-0000001554 00000 n
-0000001618 00000 n
-0000001638 00000 n
-0000001597 00000 n
+0000005163 00000 n
+0000004713 00000 n
+0000001586 00000 n
+0000001650 00000 n
+0000001670 00000 n
+0000001629 00000 n
0000000015 00000 n
0000000694 00000 n
0000000571 00000 n
-0000002040 00000 n
-0000002173 00000 n
-0000002068 00000 n
-0000002110 00000 n
-0000002198 00000 n
-0000002228 00000 n
-0000001951 00000 n
-0000001658 00000 n
-0000002362 00000 n
-0000001759 00000 n
-0000001804 00000 n
-0000001932 00000 n
-0000002404 00000 n
-0000002464 00000 n
-0000002429 00000 n
+0000002108 00000 n
+0000002241 00000 n
+0000002136 00000 n
+0000002178 00000 n
+0000002328 00000 n
+0000002358 00000 n
+0000002534 00000 n
+0000001990 00000 n
+0000002266 00000 n
+0000001690 00000 n
+0000002492 00000 n
+0000001791 00000 n
+0000001843 00000 n
+0000001971 00000 n
+0000002562 00000 n
+0000002622 00000 n
+0000002587 00000 n
0000001079 00000 n
-0000001430 00000 n
-0000002637 00000 n
-0000002497 00000 n
-0000002949 00000 n
-0000004744 00000 n
-0000003397 00000 n
-0000004407 00000 n
-0000004455 00000 n
+0000001448 00000 n
+0000002795 00000 n
+0000002655 00000 n
+0000003107 00000 n
+0000004902 00000 n
+0000003555 00000 n
+0000004565 00000 n
+0000004613 00000 n
trailer
<</ID[<ID-STRING><ID-STRING>]/Root
-1 0 R/Info 2 0 R/Size 38>>
+1 0 R/Info 2 0 R/Size 40>>
startxref
-5154
+5312
%%EOF
More information about the latex3-commits
mailing list.