[latex3-commits] [latex3/tagpdf] develop: fix recording of used attributes (9d0911c)

github at latex-project.org github at latex-project.org
Thu Mar 21 19:01:44 CET 2024


Repository : https://github.com/latex3/tagpdf
On branch  : develop
Link       : https://github.com/latex3/tagpdf/commit/9d0911c3bda20a767cfa22483c3c58076c8ca833

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

commit 9d0911c3bda20a767cfa22483c3c58076c8ca833
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date:   Thu Mar 21 19:01:44 2024 +0100

    fix recording of used attributes


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

9d0911c3bda20a767cfa22483c3c58076c8ca833
 resave.bat                                 |  10 +-
 tagpdf-struct.dtx                          |   8 +-
 tagpdf-tree.dtx                            |  25 ++---
 testfiles-luatex/test-attribute.tpf        |  47 ++++----
 testfiles-luatex/test-fakespace-gh72.tpf   |  67 +++++------
 testfiles-luatex/test-reset-attributes.tpf |  49 ++++----
 testfiles-luatex/test-root-AF.tpf          |  51 ++++-----
 testfiles-pdftex/openaction-0.tpf          |  51 ++++-----
 testfiles-pdftex/openaction-1.tpf          |  51 ++++-----
 testfiles-pdftex/openaction-2.tpf          |  51 ++++-----
 testfiles-pdftex/test-attribute-dev.tpf    |  43 +++----
 testfiles-pdftex/test-attribute-name.tpf   |  43 +++----
 testfiles-pdftex/test-attribute.tpf        |  45 ++++----
 testfiles-pdftex/test-reset-attributes.tpf |  55 ++++-----
 testfiles-pdftex/test-root-AF.tpf          |  51 ++++-----
 testfiles/remap-tags.luatex.tpf            | 175 +++++++++++++++--------------
 testfiles/remap-tags.pdftexmain.tpf        | 155 ++++++++++++-------------
 testfiles/remap-tags.tpf                   | 159 +++++++++++++-------------
 18 files changed, 571 insertions(+), 565 deletions(-)

diff --git a/resave.bat b/resave.bat
index 69c408f..0ee58b0 100644
--- a/resave.bat
+++ b/resave.bat
@@ -8,12 +8,6 @@ REM
 REM Failed tests for configuration config-luatex:
 REM 
 REM   Check failed with difference files
-  l3build save test-add-new-tag-2
-  l3build save -c config-pdftex test-struct-OBJR test-root-AF test-ref test-AFref show-variables-17 test-beast-1 test-namespace-pdfII-book test-namespace-pdfII-article test-link test-AF-file test-header-footer test-beast-2 parent-child-20-structures show-variables-20
-  l3build save -c config-luatex parent-child-20-structures test-header-footer test-struct-OBJR test-root-AF test-ref test-link test-AF-file
 
-
-
-  l3build check --show-saves test-add-new-tag-2
-  l3build check --show-saves -c config-pdftex test-struct-OBJR test-root-AF test-ref test-AFref show-variables-17 test-beast-1 test-namespace-pdfII-book test-namespace-pdfII-article test-link test-AF-file test-header-footer test-beast-2 parent-child-20-structures show-variables-20
-  l3build check --show-saves -c config-luatex parent-child-20-structures test-header-footer test-struct-OBJR test-root-AF test-ref test-link test-AF-file
+l3build check -S openaction-2 test-root-AF test-attribute-dev test-reset-attributes test-attribute-name test-attribute openaction-1 openaction-0
+REM  l3build save -c config-luatex test-fakespace-gh72 test-reset-attributes test-attribute test-root-AF
diff --git a/tagpdf-struct.dtx b/tagpdf-struct.dtx
index edde706..e1e3f5b 100644
--- a/tagpdf-struct.dtx
+++ b/tagpdf-struct.dtx
@@ -1928,12 +1928,12 @@
 %  \begin{variable}
 %   {
 %     ,\g_@@_attr_entries_prop
-%     ,\g_@@_attr_class_used_seq
+%     ,\g_@@_attr_class_used_prop
 %     ,\g_@@_attr_objref_prop
 %     ,\l_@@_attr_value_tl
 %   }
 % |\g_@@_attr_entries_prop| will store attribute names and their dictionary content.\\
-% |\g_@@_attr_class_used_seq| will hold the attributes which have been used as
+% |\g_@@_attr_class_used_prop| will hold the attributes which have been used as
 % class name.
 % |\l_@@_attr_value_tl| is used to build the attribute array or key.
 % Every time an attribute is used for the first time, and object is created
@@ -1942,7 +1942,7 @@
 %    \begin{macrocode}
 %<*package>
 \prop_new:N \g_@@_attr_entries_prop
-\seq_new:N  \g_@@_attr_class_used_seq
+\prop_new_linked:N \g_@@_attr_class_used_prop
 \tl_new:N   \l_@@_attr_value_tl
 \prop_new:N \g_@@_attr_objref_prop %will contain obj num of used attributes
 %    \end{macrocode}
@@ -2014,7 +2014,7 @@
              {
                \msg_error:nnn { tag } { attr-unknown } { ##1 }
              }
-           \seq_gput_left:Nn\g_@@_attr_class_used_seq { ##1}
+           \prop_gput:Nnn\g_@@_attr_class_used_prop { ##1} {}
          }
        \tl_set:Ne \l_@@_tmpa_tl
          {
diff --git a/tagpdf-tree.dtx b/tagpdf-tree.dtx
index 52a5102..0b92a5b 100644
--- a/tagpdf-tree.dtx
+++ b/tagpdf-tree.dtx
@@ -505,22 +505,19 @@
 \cs_new_protected:Npn \@@_tree_write_classmap:
   {
     \tl_clear:N \l_@@_tmpa_tl
-    \seq_gremove_duplicates:N \g_@@_attr_class_used_seq
-    \seq_set_map:NNn \l_@@_tmpa_seq \g_@@_attr_class_used_seq
-      {
-        ##1\c_space_tl
-        <<
-          \prop_item:Nn
+    \prop_map_inline:Nn \g_@@_attr_class_used_prop
+     {
+       \tl_put_right:Ne \l_@@_tmpa_tl
+        {
+          ##1\c_space_tl
+          <<
+           \prop_item:Nn
             \g_@@_attr_entries_prop
             {##1}
-        >>
-      }
-    \tl_set:Ne \l_@@_tmpa_tl
-      {
-        \seq_use:Nn
-          \l_@@_tmpa_seq
-          { \iow_newline: }
-      }
+          >>
+         \iow_newline:
+        }
+     }
     \tl_if_empty:NF
       \l_@@_tmpa_tl
       {
diff --git a/testfiles-luatex/test-attribute.tpf b/testfiles-luatex/test-attribute.tpf
index e613aef..1b9bcfe 100644
--- a/testfiles-luatex/test-attribute.tpf
+++ b/testfiles-luatex/test-attribute.tpf
@@ -97,7 +97,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H1 /subsection /H2 /subsubsection /H3 /paragraph /H4 /subparagraph /H5 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect  >>
 endobj
 28 0 obj
-<< /TH-row <<<</O/Table /Scope/Row>>>> >>
+<< /TH-row <<<</O/Table /Scope/Row>>>>
+ >>
 endobj
 9 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K 10 0 R /ID (ID.001) >>
@@ -207,40 +208,40 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000003313 00000 n 
+0000003314 00000 n 
 0000001374 00000 n 
 0000001693 00000 n 
 0000000000 00000 f 
-0000002330 00000 n 
-0000002415 00000 n 
-0000002507 00000 n 
-0000002591 00000 n 
-0000002681 00000 n 
+0000002331 00000 n 
+0000002416 00000 n 
+0000002508 00000 n 
+0000002592 00000 n 
+0000002682 00000 n 
 0000000020 00000 n 
-0000002801 00000 n 
-0000002921 00000 n 
-0000003005 00000 n 
-0000003095 00000 n 
-0000003204 00000 n 
+0000002802 00000 n 
+0000002922 00000 n 
+0000003006 00000 n 
+0000003096 00000 n 
+0000003205 00000 n 
 0000001204 00000 n 
 0000001062 00000 n 
 0000000066 00000 n 
-0000005620 00000 n 
-0000005974 00000 n 
+0000005621 00000 n 
+0000005975 00000 n 
 0000001338 00000 n 
 0000001438 00000 n 
 0000001656 00000 n 
 0000002272 00000 n 
-0000003431 00000 n 
-0000004590 00000 n 
-0000003496 00000 n 
-0000003570 00000 n 
-0000004826 00000 n 
-0000005774 00000 n 
-0000006036 00000 n 
-0000006138 00000 n 
+0000003432 00000 n 
+0000004591 00000 n 
+0000003497 00000 n 
+0000003571 00000 n 
+0000004827 00000 n 
+0000005775 00000 n 
+0000006037 00000 n 
+0000006139 00000 n 
 trailer
 << /Size 37 /Root 35 0 R /Info 36 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
 startxref
-6272
+6273
 %%EOF
diff --git a/testfiles-luatex/test-fakespace-gh72.tpf b/testfiles-luatex/test-fakespace-gh72.tpf
index f87cb41..239100b 100644
--- a/testfiles-luatex/test-fakespace-gh72.tpf
+++ b/testfiles-luatex/test-fakespace-gh72.tpf
@@ -60,7 +60,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H1 /subsection /H2 /subsubsection /H3 /paragraph /H4 /subparagraph /H5 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect  >>
 endobj
 31 0 obj
-<< /justify <</O/Layout/TextAlign/Justify>> >>
+<< /justify <</O/Layout/TextAlign/Justify>>
+ >>
 endobj
 9 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K [12 0 R 14 0 R 18 0 R 20 0 R] /ID (ID.001) >>
@@ -235,49 +236,49 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000003163 00000 n 
+0000003164 00000 n 
 0000000880 00000 n 
 0000001247 00000 n 
 0000000000 00000 f 
-0000001889 00000 n 
-0000001997 00000 n 
-0000002073 00000 n 
-0000002149 00000 n 
-0000002236 00000 n 
-0000002359 00000 n 
-0000002446 00000 n 
-0000002533 00000 n 
-0000002620 00000 n 
-0000002743 00000 n 
-0000002830 00000 n 
-0000002953 00000 n 
-0000003040 00000 n 
+0000001890 00000 n 
+0000001998 00000 n 
+0000002074 00000 n 
+0000002150 00000 n 
+0000002237 00000 n 
+0000002360 00000 n 
+0000002447 00000 n 
+0000002534 00000 n 
+0000002621 00000 n 
+0000002744 00000 n 
+0000002831 00000 n 
+0000002954 00000 n 
+0000003041 00000 n 
 0000000698 00000 n 
 0000000563 00000 n 
 0000000020 00000 n 
-0000007499 00000 n 
-0000005143 00000 n 
-0000007859 00000 n 
+0000007500 00000 n 
+0000005144 00000 n 
+0000007860 00000 n 
 0000000844 00000 n 
 0000000944 00000 n 
 0000001210 00000 n 
 0000001826 00000 n 
-0000003281 00000 n 
-0000004147 00000 n 
-0000003325 00000 n 
-0000003400 00000 n 
-0000004382 00000 n 
-0000005296 00000 n 
-0000005495 00000 n 
-0000006465 00000 n 
-0000005549 00000 n 
-0000005623 00000 n 
-0000006704 00000 n 
-0000007656 00000 n 
-0000007921 00000 n 
-0000008023 00000 n 
+0000003282 00000 n 
+0000004148 00000 n 
+0000003326 00000 n 
+0000003401 00000 n 
+0000004383 00000 n 
+0000005297 00000 n 
+0000005496 00000 n 
+0000006466 00000 n 
+0000005550 00000 n 
+0000005624 00000 n 
+0000006705 00000 n 
+0000007657 00000 n 
+0000007922 00000 n 
+0000008024 00000 n 
 trailer
 << /Size 46 /Root 44 0 R /Info 45 0 R >>
 startxref
-8123
+8124
 %%EOF
diff --git a/testfiles-luatex/test-reset-attributes.tpf b/testfiles-luatex/test-reset-attributes.tpf
index 24d42e7..3a2b830 100644
--- a/testfiles-luatex/test-reset-attributes.tpf
+++ b/testfiles-luatex/test-reset-attributes.tpf
@@ -308,7 +308,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H1 /subsection /H2 /subsubsection /H3 /paragraph /H4 /subparagraph /H5 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect  >>
 endobj
 29 0 obj
-<< /justify <</O/Layout/TextAlign/Justify>> >>
+<< /justify <</O/Layout/TextAlign/Justify>>
+ >>
 endobj
 9 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K [12 0 R 14 0 R 16 0 R 18 0 R] /ID (ID.001) >>
@@ -435,41 +436,41 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000014840 00000 n 
+0000014841 00000 n 
 0000012677 00000 n 
 0000013026 00000 n 
 0000000000 00000 f 
-0000013668 00000 n 
-0000013776 00000 n 
-0000013852 00000 n 
-0000013928 00000 n 
-0000014015 00000 n 
-0000014174 00000 n 
-0000014261 00000 n 
-0000014420 00000 n 
-0000014507 00000 n 
-0000014630 00000 n 
-0000014717 00000 n 
+0000013669 00000 n 
+0000013777 00000 n 
+0000013853 00000 n 
+0000013929 00000 n 
+0000014016 00000 n 
+0000014175 00000 n 
+0000014262 00000 n 
+0000014421 00000 n 
+0000014508 00000 n 
+0000014631 00000 n 
+0000014718 00000 n 
 0000000020 00000 n 
 0000012507 00000 n 
 0000012372 00000 n 
 0000011485 00000 n 
-0000019154 00000 n 
-0000019508 00000 n 
+0000019155 00000 n 
+0000019509 00000 n 
 0000012641 00000 n 
 0000012755 00000 n 
 0000012989 00000 n 
 0000013605 00000 n 
-0000014958 00000 n 
-0000017927 00000 n 
-0000015166 00000 n 
-0000015241 00000 n 
-0000018163 00000 n 
-0000019308 00000 n 
-0000019570 00000 n 
-0000019688 00000 n 
+0000014959 00000 n 
+0000017928 00000 n 
+0000015167 00000 n 
+0000015242 00000 n 
+0000018164 00000 n 
+0000019309 00000 n 
+0000019571 00000 n 
+0000019689 00000 n 
 trailer
 << /Size 38 /Root 36 0 R /Info 37 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
 startxref
-19820
+19821
 %%EOF
diff --git a/testfiles-luatex/test-root-AF.tpf b/testfiles-luatex/test-root-AF.tpf
index eba6425..f9d385d 100644
--- a/testfiles-luatex/test-root-AF.tpf
+++ b/testfiles-luatex/test-root-AF.tpf
@@ -74,8 +74,9 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H1 /subsection /H2 /subsubsection /H3 /paragraph /H4 /subparagraph /H5 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect  >>
 endobj
 36 0 obj
-<< /font-bold <</O /CSS-3 >>
-/font-red <</O /CSS-3 >> >>
+<< /font-red <</O /CSS-3 >>
+/font-bold <</O /CSS-3 >>
+ >>
 endobj
 13 0 obj
 << /Type /Namespace /NS (http://iso.org/pdf/ssn)  >>
@@ -198,43 +199,43 @@ xref
 0000000237 00000 n 
 0000000399 00000 n 
 0000000625 00000 n 
-0000004171 00000 n 
+0000004172 00000 n 
 0000001516 00000 n 
 0000001706 00000 n 
-0000003735 00000 n 
-0000002359 00000 n 
+0000003736 00000 n 
+0000002360 00000 n 
 0000000016 00000 f 
-0000002428 00000 n 
+0000002429 00000 n 
 0000000018 00000 f 
-0000002498 00000 n 
+0000002499 00000 n 
 0000000024 00000 f 
-0000003263 00000 n 
-0000002579 00000 n 
-0000003541 00000 n 
-0000003370 00000 n 
-0000003648 00000 n 
+0000003264 00000 n 
+0000002580 00000 n 
+0000003542 00000 n 
+0000003371 00000 n 
+0000003649 00000 n 
 0000000000 00000 f 
-0000003798 00000 n 
-0000003904 00000 n 
-0000004037 00000 n 
+0000003799 00000 n 
+0000003905 00000 n 
+0000004038 00000 n 
 0000001370 00000 n 
 0000001228 00000 n 
 0000000792 00000 n 
-0000007523 00000 n 
-0000007877 00000 n 
+0000007524 00000 n 
+0000007878 00000 n 
 0000001480 00000 n 
 0000001567 00000 n 
 0000001669 00000 n 
 0000002286 00000 n 
-0000004329 00000 n 
-0000006409 00000 n 
-0000004457 00000 n 
-0000006630 00000 n 
-0000007677 00000 n 
-0000007939 00000 n 
-0000008041 00000 n 
+0000004330 00000 n 
+0000006410 00000 n 
+0000004458 00000 n 
+0000006631 00000 n 
+0000007678 00000 n 
+0000007940 00000 n 
+0000008042 00000 n 
 trailer
 << /Size 44 /Root 42 0 R /Info 43 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
 startxref
-8175
+8176
 %%EOF
diff --git a/testfiles-pdftex/openaction-0.tpf b/testfiles-pdftex/openaction-0.tpf
index 07b0e97..da1490d 100644
--- a/testfiles-pdftex/openaction-0.tpf
+++ b/testfiles-pdftex/openaction-0.tpf
@@ -309,7 +309,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H2 /subsection /H3 /subsubsection /H4 /paragraph /H5 /subparagraph /H6 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect /chapter /H1  >>
 endobj
 30 0 obj
-<< /justify <</O/Layout/TextAlign/Justify>> >>
+<< /justify <</O/Layout/TextAlign/Justify>>
+ >>
 endobj
 10 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K [13 0 R 15 0 R] /ID (ID.01) >>
@@ -614,49 +615,49 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000014003 00000 n 
+0000014004 00000 n 
 0000012443 00000 n 
 0000012692 00000 n 
 0000000000 00000 f 
 0000011906 00000 n 
-0000013347 00000 n 
-0000013441 00000 n 
-0000013516 00000 n 
-0000013591 00000 n 
-0000013678 00000 n 
-0000013797 00000 n 
-0000013884 00000 n 
+0000013348 00000 n 
+0000013442 00000 n 
+0000013517 00000 n 
+0000013592 00000 n 
+0000013679 00000 n 
+0000013798 00000 n 
+0000013885 00000 n 
 0000000015 00000 n 
 0000012260 00000 n 
 0000011482 00000 n 
 0000012040 00000 n 
 0000012099 00000 n 
-0000030288 00000 n 
+0000030289 00000 n 
 0000012150 00000 n 
 0000012209 00000 n 
-0000031159 00000 n 
-0000031323 00000 n 
+0000031160 00000 n 
+0000031324 00000 n 
 0000012407 00000 n 
 0000012493 00000 n 
 0000012655 00000 n 
 0000013284 00000 n 
-0000014122 00000 n 
-0000014146 00000 n 
-0000014553 00000 n 
-0000025392 00000 n 
-0000025623 00000 n 
-0000028287 00000 n 
-0000028505 00000 n 
-0000030446 00000 n 
-0000031381 00000 n 
-0000031478 00000 n 
-0000031514 00000 n 
-0000031756 00000 n 
+0000014123 00000 n 
+0000014147 00000 n 
+0000014554 00000 n 
+0000025393 00000 n 
+0000025624 00000 n 
+0000028288 00000 n 
+0000028506 00000 n 
+0000030447 00000 n 
+0000031382 00000 n 
+0000031479 00000 n 
+0000031515 00000 n 
+0000031757 00000 n 
 trailer
 << /Size 43
 /Root 41 0 R
 /Info 42 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-31965
+31966
 %%EOF
diff --git a/testfiles-pdftex/openaction-1.tpf b/testfiles-pdftex/openaction-1.tpf
index 582554a..6e0b26c 100644
--- a/testfiles-pdftex/openaction-1.tpf
+++ b/testfiles-pdftex/openaction-1.tpf
@@ -309,7 +309,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H2 /subsection /H3 /subsubsection /H4 /paragraph /H5 /subparagraph /H6 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect /chapter /H1  >>
 endobj
 30 0 obj
-<< /justify <</O/Layout/TextAlign/Justify>> >>
+<< /justify <</O/Layout/TextAlign/Justify>>
+ >>
 endobj
 10 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K [13 0 R 15 0 R] /ID (ID.01) >>
@@ -614,49 +615,49 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000014003 00000 n 
+0000014004 00000 n 
 0000012443 00000 n 
 0000012692 00000 n 
 0000000000 00000 f 
 0000011906 00000 n 
-0000013347 00000 n 
-0000013441 00000 n 
-0000013516 00000 n 
-0000013591 00000 n 
-0000013678 00000 n 
-0000013797 00000 n 
-0000013884 00000 n 
+0000013348 00000 n 
+0000013442 00000 n 
+0000013517 00000 n 
+0000013592 00000 n 
+0000013679 00000 n 
+0000013798 00000 n 
+0000013885 00000 n 
 0000000015 00000 n 
 0000012260 00000 n 
 0000011482 00000 n 
 0000012040 00000 n 
 0000012099 00000 n 
-0000030288 00000 n 
+0000030289 00000 n 
 0000012150 00000 n 
 0000012209 00000 n 
-0000031159 00000 n 
-0000031323 00000 n 
+0000031160 00000 n 
+0000031324 00000 n 
 0000012407 00000 n 
 0000012493 00000 n 
 0000012655 00000 n 
 0000013284 00000 n 
-0000014122 00000 n 
-0000014146 00000 n 
-0000014553 00000 n 
-0000025392 00000 n 
-0000025623 00000 n 
-0000028287 00000 n 
-0000028505 00000 n 
-0000030446 00000 n 
-0000031381 00000 n 
-0000031478 00000 n 
-0000031514 00000 n 
-0000031756 00000 n 
+0000014123 00000 n 
+0000014147 00000 n 
+0000014554 00000 n 
+0000025393 00000 n 
+0000025624 00000 n 
+0000028288 00000 n 
+0000028506 00000 n 
+0000030447 00000 n 
+0000031382 00000 n 
+0000031479 00000 n 
+0000031515 00000 n 
+0000031757 00000 n 
 trailer
 << /Size 43
 /Root 41 0 R
 /Info 42 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-31965
+31966
 %%EOF
diff --git a/testfiles-pdftex/openaction-2.tpf b/testfiles-pdftex/openaction-2.tpf
index a7a01be..c65ba3b 100644
--- a/testfiles-pdftex/openaction-2.tpf
+++ b/testfiles-pdftex/openaction-2.tpf
@@ -309,7 +309,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H2 /subsection /H3 /subsubsection /H4 /paragraph /H5 /subparagraph /H6 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect /chapter /H1  >>
 endobj
 30 0 obj
-<< /justify <</O/Layout/TextAlign/Justify>> >>
+<< /justify <</O/Layout/TextAlign/Justify>>
+ >>
 endobj
 10 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K [13 0 R 15 0 R] /ID (ID.01) >>
@@ -614,49 +615,49 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000014003 00000 n 
+0000014004 00000 n 
 0000012443 00000 n 
 0000012692 00000 n 
 0000000000 00000 f 
 0000011906 00000 n 
-0000013347 00000 n 
-0000013441 00000 n 
-0000013516 00000 n 
-0000013591 00000 n 
-0000013678 00000 n 
-0000013797 00000 n 
-0000013884 00000 n 
+0000013348 00000 n 
+0000013442 00000 n 
+0000013517 00000 n 
+0000013592 00000 n 
+0000013679 00000 n 
+0000013798 00000 n 
+0000013885 00000 n 
 0000000015 00000 n 
 0000012260 00000 n 
 0000011482 00000 n 
 0000012040 00000 n 
 0000012099 00000 n 
-0000030288 00000 n 
+0000030289 00000 n 
 0000012150 00000 n 
 0000012209 00000 n 
-0000031159 00000 n 
-0000031323 00000 n 
+0000031160 00000 n 
+0000031324 00000 n 
 0000012407 00000 n 
 0000012493 00000 n 
 0000012655 00000 n 
 0000013284 00000 n 
-0000014122 00000 n 
-0000014146 00000 n 
-0000014553 00000 n 
-0000025392 00000 n 
-0000025623 00000 n 
-0000028287 00000 n 
-0000028505 00000 n 
-0000030446 00000 n 
-0000031381 00000 n 
-0000031478 00000 n 
-0000031514 00000 n 
-0000031756 00000 n 
+0000014123 00000 n 
+0000014147 00000 n 
+0000014554 00000 n 
+0000025393 00000 n 
+0000025624 00000 n 
+0000028288 00000 n 
+0000028506 00000 n 
+0000030447 00000 n 
+0000031382 00000 n 
+0000031479 00000 n 
+0000031515 00000 n 
+0000031757 00000 n 
 trailer
 << /Size 43
 /Root 41 0 R
 /Info 42 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-31965
+31966
 %%EOF
diff --git a/testfiles-pdftex/test-attribute-dev.tpf b/testfiles-pdftex/test-attribute-dev.tpf
index c09f53e..6affa15 100644
--- a/testfiles-pdftex/test-attribute-dev.tpf
+++ b/testfiles-pdftex/test-attribute-dev.tpf
@@ -100,7 +100,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H1 /subsection /H2 /subsubsection /H3 /paragraph /H4 /subparagraph /H5 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect  >>
 endobj
 28 0 obj
-<< /TH-row <</O/Table /Scope/Row>> >>
+<< /TH-row <</O/Table /Scope/Row>>
+ >>
 endobj
 9 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K 10 0 R /ID (ID.001) >>
@@ -326,41 +327,41 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000003179 00000 n 
+0000003180 00000 n 
 0000001252 00000 n 
 0000001571 00000 n 
 0000000000 00000 f 
-0000002204 00000 n 
-0000002289 00000 n 
-0000002381 00000 n 
-0000002465 00000 n 
-0000002555 00000 n 
+0000002205 00000 n 
+0000002290 00000 n 
+0000002382 00000 n 
+0000002466 00000 n 
+0000002556 00000 n 
 0000000015 00000 n 
 0000000939 00000 n 
-0000002673 00000 n 
-0000002791 00000 n 
-0000002875 00000 n 
-0000002965 00000 n 
-0000003072 00000 n 
+0000002674 00000 n 
+0000002792 00000 n 
+0000002876 00000 n 
+0000002966 00000 n 
+0000003073 00000 n 
 0000001081 00000 n 
 0000000057 00000 n 
-0000015414 00000 n 
-0000015572 00000 n 
+0000015415 00000 n 
+0000015573 00000 n 
 0000001216 00000 n 
 0000001316 00000 n 
 0000001534 00000 n 
 0000002150 00000 n 
-0000003297 00000 n 
-0000003668 00000 n 
-0000013404 00000 n 
-0000013631 00000 n 
-0000015631 00000 n 
-0000015733 00000 n 
+0000003298 00000 n 
+0000003669 00000 n 
+0000013405 00000 n 
+0000013632 00000 n 
+0000015632 00000 n 
+0000015734 00000 n 
 trailer
 << /Size 35
 /Root 33 0 R
 /Info 34 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-15867
+15868
 %%EOF
diff --git a/testfiles-pdftex/test-attribute-name.tpf b/testfiles-pdftex/test-attribute-name.tpf
index 4d826aa..c920118 100644
--- a/testfiles-pdftex/test-attribute-name.tpf
+++ b/testfiles-pdftex/test-attribute-name.tpf
@@ -100,7 +100,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H1 /subsection /H2 /subsubsection /H3 /paragraph /H4 /subparagraph /H5 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect  >>
 endobj
 28 0 obj
-<< /tag#2FTH#20row <</O/Table /Scope/Row>> >>
+<< /tag#2FTH#20row <</O/Table /Scope/Row>>
+ >>
 endobj
 9 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K 10 0 R /ID (ID.001) >>
@@ -326,41 +327,41 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000003195 00000 n 
+0000003196 00000 n 
 0000001252 00000 n 
 0000001571 00000 n 
 0000000000 00000 f 
-0000002212 00000 n 
-0000002297 00000 n 
-0000002389 00000 n 
-0000002473 00000 n 
-0000002563 00000 n 
+0000002213 00000 n 
+0000002298 00000 n 
+0000002390 00000 n 
+0000002474 00000 n 
+0000002564 00000 n 
 0000000015 00000 n 
 0000000939 00000 n 
-0000002681 00000 n 
-0000002807 00000 n 
-0000002891 00000 n 
-0000002981 00000 n 
-0000003088 00000 n 
+0000002682 00000 n 
+0000002808 00000 n 
+0000002892 00000 n 
+0000002982 00000 n 
+0000003089 00000 n 
 0000001081 00000 n 
 0000000057 00000 n 
-0000015430 00000 n 
-0000015588 00000 n 
+0000015431 00000 n 
+0000015589 00000 n 
 0000001216 00000 n 
 0000001316 00000 n 
 0000001534 00000 n 
 0000002150 00000 n 
-0000003313 00000 n 
-0000003684 00000 n 
-0000013420 00000 n 
-0000013647 00000 n 
-0000015647 00000 n 
-0000015749 00000 n 
+0000003314 00000 n 
+0000003685 00000 n 
+0000013421 00000 n 
+0000013648 00000 n 
+0000015648 00000 n 
+0000015750 00000 n 
 trailer
 << /Size 35
 /Root 33 0 R
 /Info 34 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-15883
+15884
 %%EOF
diff --git a/testfiles-pdftex/test-attribute.tpf b/testfiles-pdftex/test-attribute.tpf
index 8725513..195cda3 100644
--- a/testfiles-pdftex/test-attribute.tpf
+++ b/testfiles-pdftex/test-attribute.tpf
@@ -100,7 +100,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H1 /subsection /H2 /subsubsection /H3 /paragraph /H4 /subparagraph /H5 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect  >>
 endobj
 29 0 obj
-<< /TH-row <</O/Table /Scope/Row>> >>
+<< /TH-row <</O/Table /Scope/Row>>
+ >>
 endobj
 9 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K 10 0 R /ID (ID.001) >>
@@ -329,42 +330,42 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000003282 00000 n 
+0000003283 00000 n 
 0000001252 00000 n 
 0000001587 00000 n 
 0000000000 00000 f 
-0000002220 00000 n 
-0000002305 00000 n 
-0000002391 00000 n 
-0000002484 00000 n 
-0000002568 00000 n 
-0000002658 00000 n 
+0000002221 00000 n 
+0000002306 00000 n 
+0000002392 00000 n 
+0000002485 00000 n 
+0000002569 00000 n 
+0000002659 00000 n 
 0000000015 00000 n 
 0000000939 00000 n 
-0000002776 00000 n 
-0000002894 00000 n 
-0000002978 00000 n 
-0000003068 00000 n 
-0000003175 00000 n 
+0000002777 00000 n 
+0000002895 00000 n 
+0000002979 00000 n 
+0000003069 00000 n 
+0000003176 00000 n 
 0000001081 00000 n 
 0000000057 00000 n 
-0000015517 00000 n 
-0000015675 00000 n 
+0000015518 00000 n 
+0000015676 00000 n 
 0000001216 00000 n 
 0000001316 00000 n 
 0000001550 00000 n 
 0000002166 00000 n 
-0000003400 00000 n 
-0000003771 00000 n 
-0000013507 00000 n 
-0000013734 00000 n 
-0000015734 00000 n 
-0000015836 00000 n 
+0000003401 00000 n 
+0000003772 00000 n 
+0000013508 00000 n 
+0000013735 00000 n 
+0000015735 00000 n 
+0000015837 00000 n 
 trailer
 << /Size 36
 /Root 34 0 R
 /Info 35 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-15970
+15971
 %%EOF
diff --git a/testfiles-pdftex/test-reset-attributes.tpf b/testfiles-pdftex/test-reset-attributes.tpf
index 716cedb..1a6a294 100644
--- a/testfiles-pdftex/test-reset-attributes.tpf
+++ b/testfiles-pdftex/test-reset-attributes.tpf
@@ -303,7 +303,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H1 /subsection /H2 /subsubsection /H3 /paragraph /H4 /subparagraph /H5 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect  >>
 endobj
 30 0 obj
-<< /justify <</O/Layout/TextAlign/Justify>> >>
+<< /justify <</O/Layout/TextAlign/Justify>>
+ >>
 endobj
 9 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K [12 0 R 15 0 R 17 0 R 19 0 R] /ID (ID.001) >>
@@ -608,47 +609,47 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000014688 00000 n 
+0000014689 00000 n 
 0000012619 00000 n 
 0000012954 00000 n 
 0000000000 00000 f 
-0000013596 00000 n 
-0000013704 00000 n 
-0000013780 00000 n 
-0000013856 00000 n 
-0000013943 00000 n 
+0000013597 00000 n 
+0000013705 00000 n 
+0000013781 00000 n 
+0000013857 00000 n 
+0000013944 00000 n 
 0000012301 00000 n 
-0000014064 00000 n 
-0000014151 00000 n 
-0000014272 00000 n 
-0000014359 00000 n 
-0000014480 00000 n 
-0000014567 00000 n 
+0000014065 00000 n 
+0000014152 00000 n 
+0000014273 00000 n 
+0000014360 00000 n 
+0000014481 00000 n 
+0000014568 00000 n 
 0000000015 00000 n 
 0000012436 00000 n 
 0000011477 00000 n 
-0000033036 00000 n 
-0000033907 00000 n 
-0000034071 00000 n 
+0000033037 00000 n 
+0000033908 00000 n 
+0000034072 00000 n 
 0000012583 00000 n 
 0000012683 00000 n 
 0000012917 00000 n 
 0000013533 00000 n 
-0000014806 00000 n 
-0000014830 00000 n 
-0000015243 00000 n 
-0000028120 00000 n 
-0000028371 00000 n 
-0000031035 00000 n 
-0000031253 00000 n 
-0000033194 00000 n 
-0000034130 00000 n 
-0000034248 00000 n 
+0000014807 00000 n 
+0000014831 00000 n 
+0000015244 00000 n 
+0000028121 00000 n 
+0000028372 00000 n 
+0000031036 00000 n 
+0000031254 00000 n 
+0000033195 00000 n 
+0000034131 00000 n 
+0000034249 00000 n 
 trailer
 << /Size 41
 /Root 39 0 R
 /Info 40 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-34380
+34381
 %%EOF
diff --git a/testfiles-pdftex/test-root-AF.tpf b/testfiles-pdftex/test-root-AF.tpf
index e34b692..98b6c5a 100644
--- a/testfiles-pdftex/test-root-AF.tpf
+++ b/testfiles-pdftex/test-root-AF.tpf
@@ -85,8 +85,9 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H1 /subsection /H2 /subsubsection /H3 /paragraph /H4 /subparagraph /H5 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect  >>
 endobj
 37 0 obj
-<< /font-bold <</O /CSS-3 >>
-/font-red <</O /CSS-3 >> >>
+<< /font-red <</O /CSS-3 >>
+/font-bold <</O /CSS-3 >>
+ >>
 endobj
 13 0 obj
 << /Type /Namespace /NS (http://iso.org/pdf/ssn)  >>
@@ -325,46 +326,46 @@ xref
 0000000231 00000 n 
 0000000393 00000 n 
 0000000618 00000 n 
-0000004167 00000 n 
+0000004168 00000 n 
 0000001403 00000 n 
 0000001608 00000 n 
-0000003637 00000 n 
-0000002261 00000 n 
+0000003638 00000 n 
+0000002262 00000 n 
 0000000016 00000 f 
-0000002330 00000 n 
+0000002331 00000 n 
 0000000018 00000 f 
-0000002400 00000 n 
+0000002401 00000 n 
 0000000024 00000 f 
-0000003165 00000 n 
-0000002481 00000 n 
-0000003443 00000 n 
-0000003272 00000 n 
-0000003550 00000 n 
+0000003166 00000 n 
+0000002482 00000 n 
+0000003444 00000 n 
+0000003273 00000 n 
+0000003551 00000 n 
 0000000000 00000 f 
-0000003700 00000 n 
-0000003797 00000 n 
-0000003904 00000 n 
+0000003701 00000 n 
+0000003798 00000 n 
+0000003905 00000 n 
 0000001114 00000 n 
-0000004035 00000 n 
+0000004036 00000 n 
 0000001256 00000 n 
 0000000785 00000 n 
-0000018234 00000 n 
-0000018392 00000 n 
+0000018235 00000 n 
+0000018393 00000 n 
 0000001367 00000 n 
 0000001454 00000 n 
 0000001571 00000 n 
 0000002188 00000 n 
-0000004325 00000 n 
-0000004708 00000 n 
-0000016212 00000 n 
-0000016451 00000 n 
-0000018451 00000 n 
-0000018553 00000 n 
+0000004326 00000 n 
+0000004709 00000 n 
+0000016213 00000 n 
+0000016452 00000 n 
+0000018452 00000 n 
+0000018554 00000 n 
 trailer
 << /Size 44
 /Root 42 0 R
 /Info 43 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-18687
+18688
 %%EOF
diff --git a/testfiles/remap-tags.luatex.tpf b/testfiles/remap-tags.luatex.tpf
index 2e681db..126ecef 100644
--- a/testfiles/remap-tags.luatex.tpf
+++ b/testfiles/remap-tags.luatex.tpf
@@ -511,7 +511,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H1 /subsection /H2 /subsubsection /H3 /paragraph /H4 /subparagraph /H5 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect  >>
 endobj
 98 0 obj
-<< /justify <</O/Layout/TextAlign/Justify>> >>
+<< /justify <</O/Layout/TextAlign/Justify>>
+ >>
 endobj
 10 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K [13 0 R 33 0 R] /ID (ID.001) >>
@@ -964,54 +965,54 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000021852 00000 n 
+0000021853 00000 n 
 0000016140 00000 n 
 0000017054 00000 n 
 0000000000 00000 f 
 0000013789 00000 n 
-0000017696 00000 n 
-0000017791 00000 n 
-0000017867 00000 n 
-0000017943 00000 n 
-0000018035 00000 n 
-0000018157 00000 n 
-0000018269 00000 n 
-0000018361 00000 n 
-0000018486 00000 n 
-0000018598 00000 n 
-0000018686 00000 n 
-0000018860 00000 n 
-0000018969 00000 n 
+0000017697 00000 n 
+0000017792 00000 n 
+0000017868 00000 n 
+0000017944 00000 n 
+0000018036 00000 n 
+0000018158 00000 n 
+0000018270 00000 n 
+0000018362 00000 n 
+0000018487 00000 n 
+0000018599 00000 n 
+0000018687 00000 n 
+0000018861 00000 n 
+0000018970 00000 n 
 0000013972 00000 n 
 0000000020 00000 n 
-0000019088 00000 n 
-0000019198 00000 n 
-0000019290 00000 n 
-0000019387 00000 n 
-0000019515 00000 n 
-0000019631 00000 n 
-0000019715 00000 n 
-0000019803 00000 n 
-0000019925 00000 n 
-0000020017 00000 n 
-0000020134 00000 n 
-0000020246 00000 n 
-0000020338 00000 n 
-0000020456 00000 n 
-0000020569 00000 n 
-0000020652 00000 n 
-0000020825 00000 n 
-0000020925 00000 n 
+0000019089 00000 n 
+0000019199 00000 n 
+0000019291 00000 n 
+0000019388 00000 n 
+0000019516 00000 n 
+0000019632 00000 n 
+0000019716 00000 n 
+0000019804 00000 n 
+0000019926 00000 n 
+0000020018 00000 n 
+0000020135 00000 n 
+0000020247 00000 n 
+0000020339 00000 n 
+0000020457 00000 n 
+0000020570 00000 n 
+0000020653 00000 n 
+0000020826 00000 n 
+0000020926 00000 n 
 0000014193 00000 n 
 0000000073 00000 n 
-0000021045 00000 n 
-0000021151 00000 n 
-0000021233 00000 n 
-0000021325 00000 n 
-0000021450 00000 n 
-0000021566 00000 n 
-0000021649 00000 n 
-0000021732 00000 n 
+0000021046 00000 n 
+0000021152 00000 n 
+0000021234 00000 n 
+0000021326 00000 n 
+0000021451 00000 n 
+0000021567 00000 n 
+0000021650 00000 n 
+0000021733 00000 n 
 0000000126 00000 n 
 0000015552 00000 n 
 0000011594 00000 n 
@@ -1021,11 +1022,11 @@ xref
 0000014587 00000 n 
 0000014640 00000 n 
 0000014701 00000 n 
-0000033965 00000 n 
+0000033966 00000 n 
 0000014754 00000 n 
 0000014815 00000 n 
-0000031347 00000 n 
-0000028636 00000 n 
+0000031348 00000 n 
+0000028637 00000 n 
 0000014868 00000 n 
 0000014929 00000 n 
 0000014982 00000 n 
@@ -1034,67 +1035,67 @@ xref
 0000015157 00000 n 
 0000015210 00000 n 
 0000015271 00000 n 
-0000026396 00000 n 
-0000024149 00000 n 
+0000026397 00000 n 
+0000024150 00000 n 
 0000015324 00000 n 
 0000015385 00000 n 
 0000015438 00000 n 
 0000015499 00000 n 
-0000034318 00000 n 
+0000034319 00000 n 
 0000013938 00000 n 
 0000015734 00000 n 
 0000015770 00000 n 
-0000034688 00000 n 
+0000034689 00000 n 
 0000015827 00000 n 
 0000015860 00000 n 
-0000034627 00000 n 
+0000034628 00000 n 
 0000015922 00000 n 
 0000015955 00000 n 
-0000034515 00000 n 
+0000034516 00000 n 
 0000016012 00000 n 
 0000016045 00000 n 
-0000034454 00000 n 
+0000034455 00000 n 
 0000016107 00000 n 
 0000016334 00000 n 
 0000017017 00000 n 
 0000017633 00000 n 
-0000021971 00000 n 
-0000023121 00000 n 
-0000022036 00000 n 
-0000022111 00000 n 
-0000023359 00000 n 
-0000024304 00000 n 
-0000024505 00000 n 
-0000025395 00000 n 
-0000024549 00000 n 
-0000024624 00000 n 
-0000025634 00000 n 
-0000026551 00000 n 
-0000026753 00000 n 
-0000027635 00000 n 
-0000026797 00000 n 
-0000026872 00000 n 
-0000027874 00000 n 
-0000028791 00000 n 
-0000028993 00000 n 
-0000030299 00000 n 
-0000029071 00000 n 
-0000029147 00000 n 
-0000030538 00000 n 
-0000031503 00000 n 
-0000031706 00000 n 
-0000032920 00000 n 
-0000031795 00000 n 
-0000031870 00000 n 
-0000033157 00000 n 
-0000034118 00000 n 
-0000034379 00000 n 
-0000034800 00000 n 
-0000035084 00000 n 
-0000035122 00000 n 
-0000035384 00000 n 
+0000021972 00000 n 
+0000023122 00000 n 
+0000022037 00000 n 
+0000022112 00000 n 
+0000023360 00000 n 
+0000024305 00000 n 
+0000024506 00000 n 
+0000025396 00000 n 
+0000024550 00000 n 
+0000024625 00000 n 
+0000025635 00000 n 
+0000026552 00000 n 
+0000026754 00000 n 
+0000027636 00000 n 
+0000026798 00000 n 
+0000026873 00000 n 
+0000027875 00000 n 
+0000028792 00000 n 
+0000028994 00000 n 
+0000030300 00000 n 
+0000029072 00000 n 
+0000029148 00000 n 
+0000030539 00000 n 
+0000031504 00000 n 
+0000031707 00000 n 
+0000032921 00000 n 
+0000031796 00000 n 
+0000031871 00000 n 
+0000033158 00000 n 
+0000034119 00000 n 
+0000034380 00000 n 
+0000034801 00000 n 
+0000035085 00000 n 
+0000035123 00000 n 
+0000035385 00000 n 
 trailer
 << /Size 134 /Root 132 0 R /Info 133 0 R /ID [ <2350CAD05F8A7AF0AA4058486855344F> <2350CAD05F8A7AF0AA4058486855344F> ] >>
 startxref
-35594
+35595
 %%EOF
diff --git a/testfiles/remap-tags.pdftexmain.tpf b/testfiles/remap-tags.pdftexmain.tpf
index f424302..1174a0d 100644
--- a/testfiles/remap-tags.pdftexmain.tpf
+++ b/testfiles/remap-tags.pdftexmain.tpf
@@ -544,7 +544,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H1 /subsection /H2 /subsubsection /H3 /paragraph /H4 /subparagraph /H5 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect  >>
 endobj
 95 0 obj
-<< /justify <</O/Layout/TextAlign/Justify>> >>
+<< /justify <</O/Layout/TextAlign/Justify>>
+ >>
 endobj
 10 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K [13 0 R 32 0 R] /ID (ID.001) >>
@@ -1566,52 +1567,52 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000021978 00000 n 
+0000021979 00000 n 
 0000015971 00000 n 
 0000016951 00000 n 
 0000000000 00000 f 
 0000013695 00000 n 
-0000017593 00000 n 
-0000017688 00000 n 
-0000017764 00000 n 
-0000017840 00000 n 
-0000017932 00000 n 
-0000018052 00000 n 
-0000018159 00000 n 
-0000018251 00000 n 
-0000018374 00000 n 
-0000018481 00000 n 
-0000018604 00000 n 
-0000018811 00000 n 
-0000018982 00000 n 
+0000017594 00000 n 
+0000017689 00000 n 
+0000017765 00000 n 
+0000017841 00000 n 
+0000017933 00000 n 
+0000018053 00000 n 
+0000018160 00000 n 
+0000018252 00000 n 
+0000018375 00000 n 
+0000018482 00000 n 
+0000018605 00000 n 
+0000018812 00000 n 
+0000018983 00000 n 
 0000013855 00000 n 
 0000000015 00000 n 
-0000019099 00000 n 
-0000019209 00000 n 
-0000019301 00000 n 
-0000019389 00000 n 
-0000019611 00000 n 
-0000019725 00000 n 
-0000019813 00000 n 
-0000019934 00000 n 
-0000020026 00000 n 
-0000020142 00000 n 
-0000020250 00000 n 
-0000020342 00000 n 
-0000020458 00000 n 
-0000020566 00000 n 
-0000020684 00000 n 
-0000020891 00000 n 
-0000021055 00000 n 
+0000019100 00000 n 
+0000019210 00000 n 
+0000019302 00000 n 
+0000019390 00000 n 
+0000019612 00000 n 
+0000019726 00000 n 
+0000019814 00000 n 
+0000019935 00000 n 
+0000020027 00000 n 
+0000020143 00000 n 
+0000020251 00000 n 
+0000020343 00000 n 
+0000020459 00000 n 
+0000020567 00000 n 
+0000020685 00000 n 
+0000020892 00000 n 
+0000021056 00000 n 
 0000014073 00000 n 
 0000000068 00000 n 
-0000021173 00000 n 
-0000021279 00000 n 
-0000021361 00000 n 
-0000021444 00000 n 
-0000021663 00000 n 
-0000021777 00000 n 
-0000021860 00000 n 
+0000021174 00000 n 
+0000021280 00000 n 
+0000021362 00000 n 
+0000021445 00000 n 
+0000021664 00000 n 
+0000021778 00000 n 
+0000021861 00000 n 
 0000000121 00000 n 
 0000015386 00000 n 
 0000011586 00000 n 
@@ -1621,11 +1622,11 @@ xref
 0000014457 00000 n 
 0000014508 00000 n 
 0000014567 00000 n 
-0000067212 00000 n 
+0000067213 00000 n 
 0000014618 00000 n 
 0000014676 00000 n 
-0000069157 00000 n 
-0000073033 00000 n 
+0000069158 00000 n 
+0000073034 00000 n 
 0000014726 00000 n 
 0000014785 00000 n 
 0000014836 00000 n 
@@ -1634,61 +1635,61 @@ xref
 0000015005 00000 n 
 0000015056 00000 n 
 0000015115 00000 n 
-0000071096 00000 n 
-0000074970 00000 n 
+0000071097 00000 n 
+0000074971 00000 n 
 0000015166 00000 n 
 0000015225 00000 n 
 0000015276 00000 n 
 0000015335 00000 n 
-0000075130 00000 n 
+0000075131 00000 n 
 0000015569 00000 n 
 0000015605 00000 n 
-0000075497 00000 n 
+0000075498 00000 n 
 0000015662 00000 n 
 0000015694 00000 n 
-0000075436 00000 n 
+0000075437 00000 n 
 0000015756 00000 n 
 0000015788 00000 n 
-0000075324 00000 n 
+0000075325 00000 n 
 0000015845 00000 n 
 0000015877 00000 n 
-0000075263 00000 n 
+0000075264 00000 n 
 0000015939 00000 n 
 0000016263 00000 n 
 0000016914 00000 n 
 0000017530 00000 n 
-0000022097 00000 n 
-0000022211 00000 n 
-0000022241 00000 n 
-0000022271 00000 n 
-0000022678 00000 n 
-0000023001 00000 n 
-0000031238 00000 n 
-0000031476 00000 n 
-0000041509 00000 n 
-0000041738 00000 n 
-0000049306 00000 n 
-0000049530 00000 n 
-0000057092 00000 n 
-0000057316 00000 n 
-0000065199 00000 n 
-0000065423 00000 n 
-0000067373 00000 n 
-0000069317 00000 n 
-0000071254 00000 n 
-0000073191 00000 n 
-0000075188 00000 n 
-0000075609 00000 n 
-0000075795 00000 n 
-0000075952 00000 n 
-0000076038 00000 n 
-0000076076 00000 n 
-0000076338 00000 n 
+0000022098 00000 n 
+0000022212 00000 n 
+0000022242 00000 n 
+0000022272 00000 n 
+0000022679 00000 n 
+0000023002 00000 n 
+0000031239 00000 n 
+0000031477 00000 n 
+0000041510 00000 n 
+0000041739 00000 n 
+0000049307 00000 n 
+0000049531 00000 n 
+0000057093 00000 n 
+0000057317 00000 n 
+0000065200 00000 n 
+0000065424 00000 n 
+0000067374 00000 n 
+0000069318 00000 n 
+0000071255 00000 n 
+0000073192 00000 n 
+0000075189 00000 n 
+0000075610 00000 n 
+0000075796 00000 n 
+0000075953 00000 n 
+0000076039 00000 n 
+0000076077 00000 n 
+0000076339 00000 n 
 trailer
 << /Size 123
 /Root 121 0 R
 /Info 122 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-76548
+76549
 %%EOF
diff --git a/testfiles/remap-tags.tpf b/testfiles/remap-tags.tpf
index 1d5066f..55ff0c1 100644
--- a/testfiles/remap-tags.tpf
+++ b/testfiles/remap-tags.tpf
@@ -546,7 +546,8 @@ endobj
 << /Artifact /NonStruct /DocumentFragment /Art /Aside /Note /H7 /H6 /H8 /H6 /H9 /H6 /H10 /H6 /Title /P /FENote /Note /Sub /Span /Em /Span /Strong /Span /title /P /part /P /section /H1 /subsection /H2 /subsubsection /H3 /paragraph /H4 /subparagraph /H5 /list /L /itemize /L /enumerate /L /description /L /quote /BlockQuote /quotation /BlockQuote /verbatim /P /item /LI /itemlabel /Lbl /itembody /LBody /footnote /Note /footnotemark /Lbl /footnotelabel /Lbl /text-unit /Part /text /P /theorem-like /Sect /codeline /Span /float /Note /figures /Sect /tables /Sect  >>
 endobj
 97 0 obj
-<< /justify <</O/Layout/TextAlign/Justify>> >>
+<< /justify <</O/Layout/TextAlign/Justify>>
+ >>
 endobj
 10 0 obj
 <<  /Type /StructElem /S /Document /P 5 0 R /K [13 0 R 33 0 R] /ID (ID.001) >>
@@ -1574,54 +1575,54 @@ xref
 0000000003 00000 f 
 0000000004 00000 f 
 0000000008 00000 f 
-0000022188 00000 n 
+0000022189 00000 n 
 0000015982 00000 n 
 0000016994 00000 n 
 0000000000 00000 f 
 0000013706 00000 n 
-0000017636 00000 n 
-0000017731 00000 n 
-0000017807 00000 n 
-0000017883 00000 n 
-0000017975 00000 n 
-0000018095 00000 n 
-0000018202 00000 n 
-0000018294 00000 n 
-0000018417 00000 n 
-0000018524 00000 n 
-0000018612 00000 n 
-0000018845 00000 n 
-0000019016 00000 n 
+0000017637 00000 n 
+0000017732 00000 n 
+0000017808 00000 n 
+0000017884 00000 n 
+0000017976 00000 n 
+0000018096 00000 n 
+0000018203 00000 n 
+0000018295 00000 n 
+0000018418 00000 n 
+0000018525 00000 n 
+0000018613 00000 n 
+0000018846 00000 n 
+0000019017 00000 n 
 0000013866 00000 n 
 0000000015 00000 n 
-0000019133 00000 n 
-0000019243 00000 n 
-0000019335 00000 n 
-0000019432 00000 n 
-0000019654 00000 n 
-0000019768 00000 n 
-0000019852 00000 n 
-0000019940 00000 n 
-0000020061 00000 n 
-0000020153 00000 n 
-0000020269 00000 n 
-0000020377 00000 n 
-0000020469 00000 n 
-0000020585 00000 n 
-0000020693 00000 n 
-0000020776 00000 n 
-0000021009 00000 n 
-0000021173 00000 n 
+0000019134 00000 n 
+0000019244 00000 n 
+0000019336 00000 n 
+0000019433 00000 n 
+0000019655 00000 n 
+0000019769 00000 n 
+0000019853 00000 n 
+0000019941 00000 n 
+0000020062 00000 n 
+0000020154 00000 n 
+0000020270 00000 n 
+0000020378 00000 n 
+0000020470 00000 n 
+0000020586 00000 n 
+0000020694 00000 n 
+0000020777 00000 n 
+0000021010 00000 n 
+0000021174 00000 n 
 0000014084 00000 n 
 0000000068 00000 n 
-0000021291 00000 n 
-0000021397 00000 n 
-0000021479 00000 n 
-0000021571 00000 n 
-0000021790 00000 n 
-0000021904 00000 n 
-0000021987 00000 n 
-0000022070 00000 n 
+0000021292 00000 n 
+0000021398 00000 n 
+0000021480 00000 n 
+0000021572 00000 n 
+0000021791 00000 n 
+0000021905 00000 n 
+0000021988 00000 n 
+0000022071 00000 n 
 0000000121 00000 n 
 0000015397 00000 n 
 0000011586 00000 n 
@@ -1631,11 +1632,11 @@ xref
 0000014468 00000 n 
 0000014519 00000 n 
 0000014578 00000 n 
-0000067424 00000 n 
+0000067425 00000 n 
 0000014629 00000 n 
 0000014687 00000 n 
-0000069369 00000 n 
-0000073246 00000 n 
+0000069370 00000 n 
+0000073247 00000 n 
 0000014737 00000 n 
 0000014796 00000 n 
 0000014847 00000 n 
@@ -1644,61 +1645,61 @@ xref
 0000015016 00000 n 
 0000015067 00000 n 
 0000015126 00000 n 
-0000071309 00000 n 
-0000075184 00000 n 
+0000071310 00000 n 
+0000075185 00000 n 
 0000015177 00000 n 
 0000015236 00000 n 
 0000015287 00000 n 
 0000015346 00000 n 
-0000075344 00000 n 
+0000075345 00000 n 
 0000015580 00000 n 
 0000015616 00000 n 
-0000075711 00000 n 
+0000075712 00000 n 
 0000015673 00000 n 
 0000015705 00000 n 
-0000075650 00000 n 
+0000075651 00000 n 
 0000015767 00000 n 
 0000015799 00000 n 
-0000075538 00000 n 
+0000075539 00000 n 
 0000015856 00000 n 
 0000015888 00000 n 
-0000075477 00000 n 
+0000075478 00000 n 
 0000015950 00000 n 
 0000016274 00000 n 
 0000016957 00000 n 
 0000017573 00000 n 
-0000022307 00000 n 
-0000022421 00000 n 
-0000022451 00000 n 
-0000022482 00000 n 
-0000022890 00000 n 
-0000023213 00000 n 
-0000031450 00000 n 
-0000031688 00000 n 
-0000041721 00000 n 
-0000041950 00000 n 
-0000049518 00000 n 
-0000049742 00000 n 
-0000057304 00000 n 
-0000057528 00000 n 
-0000065411 00000 n 
-0000065635 00000 n 
-0000067585 00000 n 
-0000069530 00000 n 
-0000071467 00000 n 
-0000073405 00000 n 
-0000075402 00000 n 
-0000075823 00000 n 
-0000076009 00000 n 
-0000076166 00000 n 
-0000076252 00000 n 
-0000076290 00000 n 
-0000076552 00000 n 
+0000022308 00000 n 
+0000022422 00000 n 
+0000022452 00000 n 
+0000022483 00000 n 
+0000022891 00000 n 
+0000023214 00000 n 
+0000031451 00000 n 
+0000031689 00000 n 
+0000041722 00000 n 
+0000041951 00000 n 
+0000049519 00000 n 
+0000049743 00000 n 
+0000057305 00000 n 
+0000057529 00000 n 
+0000065412 00000 n 
+0000065636 00000 n 
+0000067586 00000 n 
+0000069531 00000 n 
+0000071468 00000 n 
+0000073406 00000 n 
+0000075403 00000 n 
+0000075824 00000 n 
+0000076010 00000 n 
+0000076167 00000 n 
+0000076253 00000 n 
+0000076291 00000 n 
+0000076553 00000 n 
 trailer
 << /Size 125
 /Root 123 0 R
 /Info 124 0 R
 /ID [<9BD18DF3359C1216B83ADB4AA401CC9A> <9BD18DF3359C1216B83ADB4AA401CC9A>] >>
 startxref
-76762
+76763
 %%EOF





More information about the latex3-commits mailing list.