From bdb49dc7cff52d4fe224fdf41eb1e26f02fa033a Mon Sep 17 00:00:00 2001 From: Ulrike Fischer Date: Tue, 17 Sep 2024 11:58:35 +0200 Subject: [PATCH] Update tagpdf to 0.99f and pdfmanagement to 0.96l in texmf tree (#1469) * test tagpdf with new suspend/resume * update testfiles * more testfiles. * missed one * update tagpdf to 0.99f * update pdfmanagement to 0.96l --- .../float-010-outside.luatex.tlg | 12 +- .../testfiles-float/float-010-outside.tlg | 12 +- .../minipage-001.luatex.tlg | 28 +- .../testfiles-minipage/minipage-001.tlg | 28 +- .../minipage-002-todo.luatex.tlg | 12 +- .../testfiles-minipage/minipage-002-todo.tlg | 12 +- .../table-004-tabularx.tlg | 16 +- .../testfiles-table-luatex/table-005.tlg | 8 +- .../table-006-longtable.tlg | 24 +- .../table-007-longtable.tlg | 16 +- .../table-008-multi.tlg | 8 +- .../testfiles-table-luatex/table-009.tlg | 8 +- .../table-004-tabularx.tlg | 16 +- .../testfiles-table-pdftex/table-005.tlg | 8 +- .../table-006-longtable.tlg | 24 +- .../table-007-longtable.tlg | 16 +- .../table-008-disable.tlg | 8 +- .../table-008-multi.tlg | 8 +- .../testfiles-table-pdftex/table-009.tlg | 8 +- .../testfiles-toc/toc-debug.luatex.tlg | 12 +- .../latex-lab/testfiles-toc/toc-debug.tlg | 12 +- .../pdfmanagement-testphase/color-ltx.sty | 2 +- .../colorspace-patches-tmp-ltx.sty | 4 +- .../hgeneric-testphase.def | 2 +- .../l3backend-testphase-dvipdfmx.def | 2 +- .../l3backend-testphase-dvips.def | 2 +- .../l3backend-testphase-dvisvgm.def | 2 +- .../l3backend-testphase-luatex.def | 2 +- .../l3backend-testphase-pdftex.def | 2 +- .../l3backend-testphase-xetex.def | 2 +- .../l3pdffield-testphase.sty | 2 +- .../pdfmanagement-firstaid.sty | 2 +- .../pdfmanagement-testphase.ltx | 108 ++++--- .../pdfmanagement-testphase.sty | 2 +- .../xcolor-patches-tmp-ltx.sty | 2 +- texmf/tex/latex/tagpdf/tagpdf-base.sty | 4 +- .../tex/latex/tagpdf/tagpdf-debug-generic.sty | 2 +- texmf/tex/latex/tagpdf/tagpdf-debug-lua.sty | 2 +- texmf/tex/latex/tagpdf/tagpdf-debug.sty | 51 ++- texmf/tex/latex/tagpdf/tagpdf-luatex.def | 8 +- .../latex/tagpdf/tagpdf-mc-code-generic.sty | 2 +- texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty | 2 +- .../tex/latex/tagpdf/tagpdf-ns-latex-book.def | 2 +- texmf/tex/latex/tagpdf/tagpdf-ns-latex.def | 2 +- texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def | 2 +- texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def | 2 +- texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def | 2 +- .../latex/tagpdf/tagpdf-parent-child-2.csv | 2 +- .../tex/latex/tagpdf/tagpdf-parent-child.csv | 2 +- texmf/tex/latex/tagpdf/tagpdf.lua | 4 +- texmf/tex/latex/tagpdf/tagpdf.sty | 83 +++-- texmf/tex/latex/tagpdf/tagpdfdocu-patches.sty | 293 ------------------ 52 files changed, 344 insertions(+), 553 deletions(-) delete mode 100644 texmf/tex/latex/tagpdf/tagpdfdocu-patches.sty diff --git a/required/latex-lab/testfiles-float/float-010-outside.luatex.tlg b/required/latex-lab/testfiles-float/float-010-outside.luatex.tlg index d141f3891..7681166bb 100644 --- a/required/latex-lab/testfiles-float/float-010-outside.luatex.tlg +++ b/required/latex-lab/testfiles-float/float-010-outside.luatex.tlg @@ -1,8 +1,8 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: caption [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: caption [on line ...] Package tagpdf Info: Parent-Child 'Document' --> 'Caption'. (tagpdf) Relation is -1 (='∅') @@ -48,13 +48,13 @@ The sequence \g__tag_struct_tag_stack_seq contains the items (without outer braces): > {{Document}{Document}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] [1 ] (float-010-outside.aux) diff --git a/required/latex-lab/testfiles-float/float-010-outside.tlg b/required/latex-lab/testfiles-float/float-010-outside.tlg index 71599892a..6a80ca9df 100644 --- a/required/latex-lab/testfiles-float/float-010-outside.tlg +++ b/required/latex-lab/testfiles-float/float-010-outside.tlg @@ -1,8 +1,8 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: caption [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: caption [on line ...] Package tagpdf Info: Parent-Child 'Document' --> 'Caption'. (tagpdf) Relation is -1 (='^^e2^^88^^85') @@ -61,15 +61,15 @@ Pick up new bot mark! The sequence \g__tag_mc_main_marks_seq is empty > . tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] [1 diff --git a/required/latex-lab/testfiles-minipage/minipage-001.luatex.tlg b/required/latex-lab/testfiles-minipage/minipage-001.luatex.tlg index a3a51b9d5..02dfca8cd 100644 --- a/required/latex-lab/testfiles-minipage/minipage-001.luatex.tlg +++ b/required/latex-lab/testfiles-minipage/minipage-001.luatex.tlg @@ -179,13 +179,13 @@ braces): > {{text-unit}{Part}} > {{Document}{Document}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: minipage [on line ...] LaTeX Font Info: External font `cmex10' loaded for size (Font) <7> on input line .... LaTeX Font Info: External font `cmex10' loaded for size (Font) <5> on input line .... -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: minipage [on line ...] Package tagpdf Info: closing structure 7 tagged /Div tagpdf DEBUG Info: Struct end inserted [on line ...] @@ -363,9 +363,9 @@ braces): > {{text-unit}{Part}} > {{Document}{Document}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: minipage [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: minipage [on line ...] Package tagpdf Info: closing structure 15 tagged /Div tagpdf DEBUG Info: Struct end inserted [on line ...] @@ -543,9 +543,9 @@ braces): > {{text-unit}{Part}} > {{Document}{Document}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: minipage [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: minipage [on line ...] Package tagpdf Info: closing structure 23 tagged /Div tagpdf DEBUG Info: Struct end inserted [on line ...] @@ -723,9 +723,9 @@ braces): > {{text-unit}{Part}} > {{Document}{Document}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: minipage [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: minipage [on line ...] Package tagpdf Info: closing structure 31 tagged /Div tagpdf DEBUG Info: Struct end inserted [on line ...] @@ -1826,9 +1826,9 @@ braces): > {{text-unit}{Part}} > {{Document}{Document}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: minipage [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: minipage [on line ...] Package tagpdf Info: closing structure 73 tagged /Div tagpdf DEBUG Info: Struct end inserted [on line ...] @@ -1867,15 +1867,15 @@ braces): > {{Document}{Document}} > {{Root}{StructTreeRoot}}. Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact diff --git a/required/latex-lab/testfiles-minipage/minipage-001.tlg b/required/latex-lab/testfiles-minipage/minipage-001.tlg index 41f70d19f..3e16d76ec 100644 --- a/required/latex-lab/testfiles-minipage/minipage-001.tlg +++ b/required/latex-lab/testfiles-minipage/minipage-001.tlg @@ -187,13 +187,13 @@ braces): > {{text-unit}{Part}} > {{Document}{Document}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: minipage [on line ...] LaTeX Font Info: External font `cmex10' loaded for size (Font) <7> on input line .... LaTeX Font Info: External font `cmex10' loaded for size (Font) <5> on input line .... -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: minipage [on line ...] Package tagpdf Info: closing structure 7 tagged /Div tagpdf DEBUG Info: Struct end inserted [on line ...] @@ -380,9 +380,9 @@ braces): > {{text-unit}{Part}} > {{Document}{Document}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: minipage [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: minipage [on line ...] Package tagpdf Info: closing structure 15 tagged /Div tagpdf DEBUG Info: Struct end inserted [on line ...] @@ -569,9 +569,9 @@ braces): > {{text-unit}{Part}} > {{Document}{Document}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: minipage [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: minipage [on line ...] Package tagpdf Info: closing structure 23 tagged /Div tagpdf DEBUG Info: Struct end inserted [on line ...] @@ -758,9 +758,9 @@ braces): > {{text-unit}{Part}} > {{Document}{Document}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: minipage [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: minipage [on line ...] Package tagpdf Info: closing structure 31 tagged /Div tagpdf DEBUG Info: Struct end inserted [on line ...] @@ -1912,9 +1912,9 @@ braces): > {{text-unit}{Part}} > {{Document}{Document}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: minipage [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: minipage [on line ...] Package tagpdf Info: closing structure 73 tagged /Div tagpdf DEBUG Info: Struct end inserted [on line ...] @@ -1958,15 +1958,15 @@ braces): The sequence \g__tag_mc_main_marks_seq is empty > . tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] [1 diff --git a/required/latex-lab/testfiles-minipage/minipage-002-todo.luatex.tlg b/required/latex-lab/testfiles-minipage/minipage-002-todo.luatex.tlg index 447750f9d..c572c35cb 100644 --- a/required/latex-lab/testfiles-minipage/minipage-002-todo.luatex.tlg +++ b/required/latex-lab/testfiles-minipage/minipage-002-todo.luatex.tlg @@ -105,9 +105,9 @@ The sequence \g__tag_struct_tag_stack_seq contains the items (without outer braces): > {{Div}{Div}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: minipage [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: minipage [on line ...] Package tagpdf Info: closing structure 5 tagged /Div tagpdf DEBUG Info: Struct end inserted [on line ...] @@ -174,15 +174,15 @@ braces): > {{text}{P}} > {{Root}{StructTreeRoot}}. Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact diff --git a/required/latex-lab/testfiles-minipage/minipage-002-todo.tlg b/required/latex-lab/testfiles-minipage/minipage-002-todo.tlg index 8e2834c02..68c564e4b 100644 --- a/required/latex-lab/testfiles-minipage/minipage-002-todo.tlg +++ b/required/latex-lab/testfiles-minipage/minipage-002-todo.tlg @@ -109,9 +109,9 @@ The sequence \g__tag_struct_tag_stack_seq contains the items (without outer braces): > {{Div}{Div}} > {{Root}{StructTreeRoot}}. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: minipage [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: minipage [on line ...] Package tagpdf Info: closing structure 5 tagged /Div tagpdf DEBUG Info: Struct end inserted [on line ...] @@ -182,15 +182,15 @@ braces): The sequence \g__tag_mc_main_marks_seq is empty > . tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] [1 diff --git a/required/latex-lab/testfiles-table-luatex/table-004-tabularx.tlg b/required/latex-lab/testfiles-table-luatex/table-004-tabularx.tlg index 935ac41bb..811e5f821 100644 --- a/required/latex-lab/testfiles-table-luatex/table-004-tabularx.tlg +++ b/required/latex-lab/testfiles-table-luatex/table-004-tabularx.tlg @@ -1,6 +1,6 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: tabularx [on line ...] [Sockets] ==> Socket 'tagsupport/para/begin' containing plug 'block' used. tagpdf DEBUG Info: Struct 2 begin ignored with options: @@ -26,7 +26,7 @@ tagpdf DEBUG Info: Struct 2 begin ignored with options: [Sockets] ==> Socket 'tagsupport/para/end' containing plug 'plain' used. tagpdf DEBUG Info: Struct end ignored [on line ...] tagpdf DEBUG Info: Struct end ignored [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: tabularx [on line ...] [Sockets] ==> Socket 'tagsupport/para/begin' containing plug 'block' used. [Sockets] ==> Socket 'tag/struct/tag' containing plug 'latex-tags' used. @@ -984,13 +984,13 @@ braces): Package tagpdf Info: Parent-Child 'TD' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'TD' --> 'MC' on line ... -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: tabularx [on line ...] [Sockets] ==> Socket 'tagsupport/para/begin' containing plug 'block' used. [Sockets] ==> Socket 'tagsupport/para/end' containing plug 'plain' used. [Sockets] ==> Socket 'tagsupport/para/begin' containing plug 'block' used. [Sockets] ==> Socket 'tagsupport/para/end' containing plug 'plain' used. -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: tabularx [on line ...] [Sockets] ==> Socket 'tagsupport/tbl/hmode/begin' containing plug 'Table' used. Package tagpdf Info: TD has been pushed to the mc stack @@ -2039,15 +2039,15 @@ The structure has the following kids: ========================= [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact diff --git a/required/latex-lab/testfiles-table-luatex/table-005.tlg b/required/latex-lab/testfiles-table-luatex/table-005.tlg index a152a6ca6..b405e863d 100644 --- a/required/latex-lab/testfiles-table-luatex/table-005.tlg +++ b/required/latex-lab/testfiles-table-luatex/table-005.tlg @@ -434,15 +434,15 @@ The structure has the following kids: ========================= [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact diff --git a/required/latex-lab/testfiles-table-luatex/table-006-longtable.tlg b/required/latex-lab/testfiles-table-luatex/table-006-longtable.tlg index 015c2284d..163e40b75 100644 --- a/required/latex-lab/testfiles-table-luatex/table-006-longtable.tlg +++ b/required/latex-lab/testfiles-table-luatex/table-006-longtable.tlg @@ -2396,15 +2396,15 @@ braces): [Sockets] ==> Socket 'tagsupport/tbl/longtable/foot' containing plug 'Table' used. [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact @@ -2872,15 +2872,15 @@ Non-PDF special ignored! [Sockets] ==> Socket 'tagsupport/tbl/longtable/foot' containing plug 'Table' used. [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact @@ -4389,15 +4389,15 @@ The structure has the following kids: ========================= [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact diff --git a/required/latex-lab/testfiles-table-luatex/table-007-longtable.tlg b/required/latex-lab/testfiles-table-luatex/table-007-longtable.tlg index 927a1d6d9..0602ede3f 100644 --- a/required/latex-lab/testfiles-table-luatex/table-007-longtable.tlg +++ b/required/latex-lab/testfiles-table-luatex/table-007-longtable.tlg @@ -1350,15 +1350,15 @@ braces): [Sockets] ==> Socket 'tagsupport/tbl/longtable/foot' containing plug 'Table' used. [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact @@ -2453,15 +2453,15 @@ The structure has the following kids: ========================= [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact diff --git a/required/latex-lab/testfiles-table-luatex/table-008-multi.tlg b/required/latex-lab/testfiles-table-luatex/table-008-multi.tlg index 4fed4074a..d5d0fe526 100644 --- a/required/latex-lab/testfiles-table-luatex/table-008-multi.tlg +++ b/required/latex-lab/testfiles-table-luatex/table-008-multi.tlg @@ -431,13 +431,13 @@ The structure has the following kids: > MC 15 ========================= [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Completed box being shipped out [1] \vbox(633.0+0.0)x407.0, direction TLT diff --git a/required/latex-lab/testfiles-table-luatex/table-009.tlg b/required/latex-lab/testfiles-table-luatex/table-009.tlg index 4fb23909d..551b3c806 100644 --- a/required/latex-lab/testfiles-table-luatex/table-009.tlg +++ b/required/latex-lab/testfiles-table-luatex/table-009.tlg @@ -948,15 +948,15 @@ The structure has the following kids: ========================= [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack Package tagpdf Info: -1 has been pushed to the mc stack -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Package tagpdf Info: -1 has been removed from the mc stack tagpdf: INFO TAG-NOT-TAGGED: this has not been tagged, using artifact diff --git a/required/latex-lab/testfiles-table-pdftex/table-004-tabularx.tlg b/required/latex-lab/testfiles-table-pdftex/table-004-tabularx.tlg index 9f85c5a6a..eaf8fdca2 100644 --- a/required/latex-lab/testfiles-table-pdftex/table-004-tabularx.tlg +++ b/required/latex-lab/testfiles-table-pdftex/table-004-tabularx.tlg @@ -1,6 +1,6 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: tabularx [on line ...] [Sockets] ==> Socket 'tagsupport/para/begin' containing plug 'block' used. tagpdf DEBUG Info: Struct 2 begin ignored with options: @@ -30,7 +30,7 @@ tagpdf DEBUG Info: MC begin ignored with options: [on line ...] tagpdf DEBUG Info: MC end ignored [on line ...] tagpdf DEBUG Info: Struct end ignored [on line ...] tagpdf DEBUG Info: Struct end ignored [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: tabularx [on line ...] [Sockets] ==> Socket 'tagsupport/para/begin' containing plug 'block' used. [Sockets] ==> Socket 'tag/struct/tag' containing plug 'latex-tags' used. @@ -1030,13 +1030,13 @@ tagpdf DEBUG Info: MC begin inserted with options: [on line ...] Package tagpdf Info: Parent-Child 'TD' --> 'MC'. (tagpdf) Relation is 1 (='0..n') (tagpdf) Rolemapped from: 'TD' --> 'MC' on line ... -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: tabularx [on line ...] [Sockets] ==> Socket 'tagsupport/para/begin' containing plug 'block' used. [Sockets] ==> Socket 'tagsupport/para/end' containing plug 'plain' used. [Sockets] ==> Socket 'tagsupport/para/begin' containing plug 'block' used. [Sockets] ==> Socket 'tagsupport/para/end' containing plug 'plain' used. -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: tabularx [on line ...] [Sockets] ==> Socket 'tagsupport/tbl/hmode/begin' containing plug 'Table' used. Package tagpdf Info: TD has been pushed to the mc stack @@ -2108,15 +2108,15 @@ The sequence \g__tag_mc_main_marks_seq is empty > . [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] Completed box being shipped out [1] diff --git a/required/latex-lab/testfiles-table-pdftex/table-005.tlg b/required/latex-lab/testfiles-table-pdftex/table-005.tlg index caaacbf7e..8a052f614 100644 --- a/required/latex-lab/testfiles-table-pdftex/table-005.tlg +++ b/required/latex-lab/testfiles-table-pdftex/table-005.tlg @@ -386,15 +386,15 @@ The sequence \g__tag_mc_main_marks_seq is empty > . [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] Completed box being shipped out [1] diff --git a/required/latex-lab/testfiles-table-pdftex/table-006-longtable.tlg b/required/latex-lab/testfiles-table-pdftex/table-006-longtable.tlg index d26b4c75c..ed6f9a6ee 100644 --- a/required/latex-lab/testfiles-table-pdftex/table-006-longtable.tlg +++ b/required/latex-lab/testfiles-table-pdftex/table-006-longtable.tlg @@ -2542,15 +2542,15 @@ The sequence \g__tag_mc_main_marks_seq is empty > . [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] Completed box being shipped out [1] @@ -3132,15 +3132,15 @@ braces): > {41}. [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] Completed box being shipped out [2] @@ -4749,15 +4749,15 @@ braces): > {77}. [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] Completed box being shipped out [3] diff --git a/required/latex-lab/testfiles-table-pdftex/table-007-longtable.tlg b/required/latex-lab/testfiles-table-pdftex/table-007-longtable.tlg index 84e73f434..0a8a4954e 100644 --- a/required/latex-lab/testfiles-table-pdftex/table-007-longtable.tlg +++ b/required/latex-lab/testfiles-table-pdftex/table-007-longtable.tlg @@ -1443,15 +1443,15 @@ The sequence \g__tag_mc_main_marks_seq is empty > . [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] Completed box being shipped out [1] @@ -2656,15 +2656,15 @@ braces): > {44}. [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] Completed box being shipped out [2] diff --git a/required/latex-lab/testfiles-table-pdftex/table-008-disable.tlg b/required/latex-lab/testfiles-table-pdftex/table-008-disable.tlg index cea50029a..f6414d672 100644 --- a/required/latex-lab/testfiles-table-pdftex/table-008-disable.tlg +++ b/required/latex-lab/testfiles-table-pdftex/table-008-disable.tlg @@ -1031,15 +1031,15 @@ The sequence \g__tag_mc_main_marks_seq is empty > . [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] Completed box being shipped out [1] diff --git a/required/latex-lab/testfiles-table-pdftex/table-008-multi.tlg b/required/latex-lab/testfiles-table-pdftex/table-008-multi.tlg index 51ad0e916..b6056874a 100644 --- a/required/latex-lab/testfiles-table-pdftex/table-008-multi.tlg +++ b/required/latex-lab/testfiles-table-pdftex/table-008-multi.tlg @@ -435,13 +435,13 @@ The structure has the following kids: > MC 15 ========================= [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] Completed box being shipped out [1] \vbox(633.0+0.0)x407.0 diff --git a/required/latex-lab/testfiles-table-pdftex/table-009.tlg b/required/latex-lab/testfiles-table-pdftex/table-009.tlg index 8bcbfac2f..ba983f8a3 100644 --- a/required/latex-lab/testfiles-table-pdftex/table-009.tlg +++ b/required/latex-lab/testfiles-table-pdftex/table-009.tlg @@ -985,15 +985,15 @@ The sequence \g__tag_mc_main_marks_seq is empty > . [Sockets] ==> Socket '@makecol/outputbox' containing plug 'footnotes-floats' used. tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] tagpdf DEBUG Info: MC begin inserted with options: artifact [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] tagpdf DEBUG Info: MC end inserted [on line ...] Completed box being shipped out [1] diff --git a/required/latex-lab/testfiles-toc/toc-debug.luatex.tlg b/required/latex-lab/testfiles-toc/toc-debug.luatex.tlg index 27e183223..3157cd62c 100644 --- a/required/latex-lab/testfiles-toc/toc-debug.luatex.tlg +++ b/required/latex-lab/testfiles-toc/toc-debug.luatex.tlg @@ -2,17 +2,17 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. (toc-debug.toc) \tf@toc=\write... -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: hangfrom [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: hangfrom [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] [1 ] (toc-debug.aux) diff --git a/required/latex-lab/testfiles-toc/toc-debug.tlg b/required/latex-lab/testfiles-toc/toc-debug.tlg index 0e0b6ee90..26682d928 100644 --- a/required/latex-lab/testfiles-toc/toc-debug.tlg +++ b/required/latex-lab/testfiles-toc/toc-debug.tlg @@ -2,17 +2,17 @@ This is a generated file for the l3build validation system. Don't change this file in any respect. (toc-debug.toc) \tf@toc=\write... -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: hangfrom [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: hangfrom [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging stopped +tagpdf DEBUG Info: Tagging suspended (tagpdf DEBUG) level: 0 ==> 1, label: headfoot [on line ...] -tagpdf DEBUG Info: Tagging restarted +tagpdf DEBUG Info: Tagging resumed (tagpdf DEBUG) level: 1 ==> 0, label: headfoot [on line ...] [1 ] (toc-debug.aux) diff --git a/texmf/tex/latex/pdfmanagement-testphase/color-ltx.sty b/texmf/tex/latex/pdfmanagement-testphase/color-ltx.sty index 68272c9b1..6a13e4e3e 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/color-ltx.sty +++ b/texmf/tex/latex/pdfmanagement-testphase/color-ltx.sty @@ -24,7 +24,7 @@ %% This file has the LPPL maintenance status "maintained". %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] -\ProvidesPackage{color-ltx}[2024-08-17 v0.96j +\ProvidesPackage{color-ltx}[2024-09-13 v0.96l Standard LaTeX Color (patched for l3color, part of pdfmanagement-testphase, original version 2022/01/06 v1.3d) (DPC)] \edef\Gin@codes{% \catcode`\noexpand\^^A\the\catcode`\^^A\relax diff --git a/texmf/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty b/texmf/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty index eb3c8e4b8..5078b8568 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty +++ b/texmf/tex/latex/pdfmanagement-testphase/colorspace-patches-tmp-ltx.sty @@ -19,7 +19,7 @@ % % for those people who are interested. \NeedsTeXFormat{LaTeX2e}[2020/10/01] -\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2024-08-17}{0.96j} +\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2024-09-13}{0.96l} {temporary patches for the colorspace package to test pdfresource management ... UF} @@ -72,7 +72,7 @@ \RemoveFromHook{begindocument}[colorspace] -\hook_gput_code:nnn {enddocument} {pdf} +\hook_gput_code:nnn {begindocument/end} {pdf} { \def\spc@elt#1#2 { diff --git a/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def b/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def index 7929a7ae1..1f103b2fd 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def +++ b/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: hyperref-generic.dtx -\ProvidesFile{hgeneric-testphase.def}[2024-08-17 v0.96j % +\ProvidesFile{hgeneric-testphase.def}[2024-09-13 v0.96l % generic Hyperref driver for the LaTeX PDF management testphase bundle] \RequirePackage{etoolbox} %why? diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def index 23634ecb9..bfb2a63a9 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def +++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvipdfmx.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-dvipdfmx.def}{2024-08-17}{} + {l3backend-testphase-dvipdfmx.def}{2024-09-13}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvipdfmx} \cs_generate_variant:Nn \__kernel_backend_literal:n { e } \cs_generate_variant:Nn \__pdf_backend:n { e } diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def index 7058f285c..e13315c01 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def +++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-dvips.def}{2024-08-17}{} + {l3backend-testphase-dvips.def}{2024-09-13}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvips} \cs_generate_variant:Nn \__kernel_backend_postscript:n { e } \cs_generate_variant:Nn \__pdf_backend_pdfmark:n { e } diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def index df51df34d..def40db84 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def +++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-dvisvgm.def}{2024-08-17}{} + {l3backend-testphase-dvisvgm.def}{2024-09-13}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm} \bool_if:NT \l__pdfmanagement_delayed_shipout_bool { diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def index c7f70a838..ac7fe6cad 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def +++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-luatex.def}{2024-08-17}{} + {l3backend-testphase-luatex.def}{2024-09-13}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (LuaTeX)} \cs_generate_variant:Nn \__kernel_backend_literal_page:n { e } \bool_if:NT \l__pdfmanagement_delayed_shipout_bool diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def index 5936e3204..9b3930f19 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def +++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-pdftex.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-pdftex.def}{2024-08-17}{} + {l3backend-testphase-pdftex.def}{2024-09-13}{} {LaTeX~PDF~management~testphase~bundle~backend~support: PDF output (pdfTeX)} \cs_generate_variant:Nn \__kernel_backend_literal_page:n { e } \bool_if:NT \l__pdfmanagement_delayed_shipout_bool diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def index 67567a9b5..776aefe60 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def +++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def @@ -20,7 +20,7 @@ %% %% File: l3backend-testphase.dtx \ProvidesExplFile - {l3backend-testphase-xetex.def}{2024-08-17}{} + {l3backend-testphase-xetex.def}{2024-09-13}{} {LaTeX~PDF~management~testphase~bundle~backend~support: XeTeX} \cs_generate_variant:Nn \__kernel_backend_literal:n { e } \cs_generate_variant:Nn \__pdf_backend:n { e } diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty b/texmf/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty index 8e4727785..b50689658 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty +++ b/texmf/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty @@ -27,7 +27,7 @@ %% File: l3pdffield.dtx \NeedsTeXFormat{LaTeX2e} -\ProvidesExplPackage{l3pdffield-testphase}{2024-08-17}{0.96j}% +\ProvidesExplPackage{l3pdffield-testphase}{2024-09-13}{0.96l}% {form fields} \csname HyField@NeedAppearancesfalse\endcsname % suppress NeedAppearances \str_new:N \l__pdffield_tmpa_str diff --git a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty index 783ba92c9..7ad662108 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty +++ b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-firstaid.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-firstaid.dtx -\ProvidesExplPackage{pdfmanagement-firstaid}{2024-08-17}{0.96j} +\ProvidesExplPackage{pdfmanagement-firstaid}{2024-09-13}{0.96l} {LaTeX PDF management testphase bundle / firstaid-patches} \clist_map_inline:nn diff --git a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx index 458a1d95b..60d22fd0a 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx +++ b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.ltx @@ -27,7 +27,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-testphase.dtx -\ProvidesExplFile{pdfmanagement-testphase.ltx}{2024-08-17}{0.96j} +\ProvidesExplFile{pdfmanagement-testphase.ltx}{2024-09-13}{0.96l} {PDF~management~code~(testphase)} \bool_new:N\l__pdfmanagement_delayed_shipout_bool \msg_new:nnn {pdfmanagement}{delayed-shipout} @@ -1080,6 +1080,13 @@ \prop_map_function:NN \g__pdfmanagement_documentproperties_prop \msg_show_item:nn } } +\NewDocumentCommand\LogDocumentProperties {} + { + \msg_log:nne {pdfmanagement}{show-properties} + { + \prop_map_function:NN \g__pdfmanagement_documentproperties_prop \msg_show_item:nn + } + } %% File: l3pdfannot.dtx \cs_if_exist:NF \bitset_new:Nn { \RequirePackage { l3bitset } } @@ -1313,6 +1320,7 @@ %% File: l3pdfmeta.dtx + \msg_new:nnn {pdf }{unknown-standard}{The~standard~'#1'~is~unknown~and~has~been~ignored} \msg_new:nnn {pdf }{wrong-pdfversion} {PDF~version~#1~is~too~#2~for~standard~'#3'.} @@ -1463,7 +1471,10 @@ % %=============== % Rule 6.1.13-1 CosDocument, isOptionalContentPresent == false - ,Catalog_no_OCProperties = + ,Catalog_no_OCProperties = + % Rule 6.9-4 The AS key shall not appear in any optional content configuration dictionary. + % actually only starting with A-2 but doesn't harm here either + ,Catalog_OCProperties_no_AS= %=============== % Rule 6.6.1-1: PDAction, S == "GoTo" || S == "GoToR" || S == "Thread" % || S == "URI" || S == "Named" || S == "SubmitForm" @@ -1512,6 +1523,10 @@ { g__pdfmeta_standard_pdf/A-2B_prop }{max_pdf_version}{1.7} \prop_gput:cnn { g__pdfmeta_standard_pdf/A-2B_prop }{omit_CID}{} +\prop_gremove:cn + { g__pdfmeta_standard_pdf/A-2B_prop } + { Catalog_no_OCProperties } + %A-2u ============== \prop_new:c { g__pdfmeta_standard_pdf/A-2U_prop } \prop_gset_eq:cc @@ -1590,7 +1605,8 @@ { g__pdfmeta_standard_pdf/A-4_prop }{conformance} \prop_gremove:cn { g__pdfmeta_standard_pdf/A-4_prop }{max_pdf_version} - +\prop_gremove:cn + { g__pdfmeta_standard_pdf/A-4_prop }{Catalog_OCProperties_no_AS} \prop_new:c { g__pdfmeta_standard_pdf/A-4F_prop } \prop_gset_eq:cc { g__pdfmeta_standard_pdf/A-4F_prop } @@ -1886,7 +1902,8 @@ } ,debug / xmp-export .default:n = true } -\msg_new:nnn{pdfmeta}{namespace-defined}{The~xmlns~namespace~`#1`~is~already~declared} +\msg_new:nnn{pdfmeta}{xmp-defined}{The~XMP~#1~`#2`~is~already~declared} +\msg_new:nnn{pdfmeta}{xmp-undefined}{The~XMP~#1~`#2`~is~undefined} \msg_new:nnn{pdfmeta}{colorprofile-undefined}{The~colorprofile~`#1`~is~unknown} \bool_lazy_or:nnTF { \sys_if_engine_luatex_p: } @@ -2207,63 +2224,78 @@ \__pdfmeta_xmp_indent:n{4} xmlns:\exp_not:n{#1="#2"} } } -\cs_generate_variant:Nn \__pdfmeta_xmp_xmlns_new:nn {ne} \__pdfmeta_xmp_xmlns_new:nn {pdf} {http://ns.adobe.com/pdf/1.3/} \__pdfmeta_xmp_xmlns_new:nn {xmpRights}{http://ns.adobe.com/xap/1.0/rights/} \__pdfmeta_xmp_xmlns_new:nn {dc} {http://purl.org/dc/elements/1.1/} \__pdfmeta_xmp_xmlns_new:nn {photoshop}{http://ns.adobe.com/photoshop/1.0/} \__pdfmeta_xmp_xmlns_new:nn {xmp} {http://ns.adobe.com/xap/1.0/} \__pdfmeta_xmp_xmlns_new:nn {xmpMM} {http://ns.adobe.com/xap/1.0/mm/} -\__pdfmeta_xmp_xmlns_new:ne {stEvt} +\__pdfmeta_xmp_xmlns_new:nn {stEvt} {http://ns.adobe.com/xap/1.0/sType/ResourceEvent\c_hash_str} \__pdfmeta_xmp_xmlns_new:nn {pdfaid} {http://www.aiim.org/pdfa/ns/id/} \__pdfmeta_xmp_xmlns_new:nn {pdfuaid} {http://www.aiim.org/pdfua/ns/id/} \__pdfmeta_xmp_xmlns_new:nn {pdfx} {http://ns.adobe.com/pdfx/1.3/} \__pdfmeta_xmp_xmlns_new:nn {pdfxid} {http://www.npes.org/pdfx/ns/id/} \__pdfmeta_xmp_xmlns_new:nn {prism} {http://prismstandard.org/namespaces/basic/3.0/} -\__pdfmeta_xmp_xmlns_new:ne {stFnt} {http://ns.adobe.com/xap/1.0/sType/Font\c_hash_str} +\__pdfmeta_xmp_xmlns_new:nn {stFnt} {http://ns.adobe.com/xap/1.0/sType/Font\c_hash_str} \__pdfmeta_xmp_xmlns_new:nn {Iptc4xmpCore}{http://iptc.org/std/Iptc4xmpCore/1.0/xmlns/} \__pdfmeta_xmp_xmlns_new:nn {pdfaExtension}{http://www.aiim.org/pdfa/ns/extension/} -\__pdfmeta_xmp_xmlns_new:ne {pdfaSchema}{http://www.aiim.org/pdfa/ns/schema\c_hash_str} -\__pdfmeta_xmp_xmlns_new:ne {pdfaProperty}{http://www.aiim.org/pdfa/ns/property\c_hash_str} -\__pdfmeta_xmp_xmlns_new:ne {pdfaType} {http://www.aiim.org/pdfa/ns/type\c_hash_str} -\__pdfmeta_xmp_xmlns_new:ne {pdfaField}{http://www.aiim.org/pdfa/ns/field\c_hash_str} +\__pdfmeta_xmp_xmlns_new:nn {pdfaSchema}{http://www.aiim.org/pdfa/ns/schema\c_hash_str} +\__pdfmeta_xmp_xmlns_new:nn {pdfaProperty}{http://www.aiim.org/pdfa/ns/property\c_hash_str} +\__pdfmeta_xmp_xmlns_new:nn {pdfaType} {http://www.aiim.org/pdfa/ns/type\c_hash_str} +\__pdfmeta_xmp_xmlns_new:nn {pdfaField}{http://www.aiim.org/pdfa/ns/field\c_hash_str} \seq_new:N \l__pdfmeta_xmp_schema_seq \cs_new_protected:Npn \__pdfmeta_xmp_schema_new:nnn #1 #2 #3 %#1 name #2 prefix, #3 text { - \seq_put_right:Nn \l__pdfmeta_xmp_schema_seq { #2 } - \tl_new:c { g__pdfmeta_xmp_schema_#2_tl } - \tl_new:c { g__pdfmeta_xmp_schema_#2_properties_tl } - \tl_gput_right:cn { g__pdfmeta_xmp_schema_#2_tl } + \tl_if_exist:cTF { g__pdfmeta_xmp_schema_#2_tl } { - \__pdfmeta_xmp_add_packet_open_attr:nnn{rdf}{li}{rdf:parseType="Resource"} - \__pdfmeta_xmp_add_packet_line:nnn {pdfaSchema}{schema}{#1} - \__pdfmeta_xmp_add_packet_line:nnn {pdfaSchema}{prefix}{#2} - \__pdfmeta_xmp_add_packet_line:nnn {pdfaSchema}{namespaceURI}{#3} - \__pdfmeta_xmp_add_packet_open:nn {pdfaSchema}{property} - \__pdfmeta_xmp_add_packet_open:nn{rdf}{Seq} - \tl_use:c { g__pdfmeta_xmp_schema_#2_properties_tl } - \__pdfmeta_xmp_add_packet_close:nn{rdf}{Seq} - \__pdfmeta_xmp_add_packet_close:nn {pdfaSchema}{property} - \cs_if_exist_use:c {__pdfmeta_xmp_schema_#2_additions:} - \__pdfmeta_xmp_add_packet_close:nn{rdf}{li} + \msg_warning:nnnn{pdfmeta}{xmp-defined}{schema}{#2} + } + { + \seq_put_right:Nn \l__pdfmeta_xmp_schema_seq { #2 } + \tl_new:c { g__pdfmeta_xmp_schema_#2_tl } + \tl_new:c { g__pdfmeta_xmp_schema_#2_properties_tl } + \tl_gput_right:cn { g__pdfmeta_xmp_schema_#2_tl } + { + \__pdfmeta_xmp_add_packet_open_attr:nnn{rdf}{li}{rdf:parseType="Resource"} + \__pdfmeta_xmp_add_packet_line:nnn {pdfaSchema}{schema}{#1} + \__pdfmeta_xmp_add_packet_line:nnn {pdfaSchema}{prefix}{#2} + \__pdfmeta_xmp_add_packet_line:nnn {pdfaSchema}{namespaceURI}{#3} + \__pdfmeta_xmp_add_packet_open:nn {pdfaSchema}{property} + \__pdfmeta_xmp_add_packet_open:nn{rdf}{Seq} + \tl_use:c { g__pdfmeta_xmp_schema_#2_properties_tl } + \__pdfmeta_xmp_add_packet_close:nn{rdf}{Seq} + \__pdfmeta_xmp_add_packet_close:nn {pdfaSchema}{property} + \cs_if_exist_use:c {__pdfmeta_xmp_schema_#2_additions:} + \__pdfmeta_xmp_add_packet_close:nn{rdf}{li} + } } } - +\prop_new:N\g__pdfmeta_xmp_schema_property_prop \cs_new_protected:Npn \__pdfmeta_xmp_property_new:nnnnn #1 #2 #3 #4 #5 % %#1 schema #2 name, #3 type, #4 category #5 description { - \tl_gput_right:cn { g__pdfmeta_xmp_schema_#1_properties_tl } + \tl_if_exist:cTF { g__pdfmeta_xmp_schema_#1_properties_tl } + { + \prop_get:NeNF \g__pdfmeta_xmp_schema_property_prop {#1:#2}\l__pdfmeta_tmpa_tl + { + \prop_gput:Nee \g__pdfmeta_xmp_schema_property_prop {#1:#2}{#3} + \tl_gput_right:cn { g__pdfmeta_xmp_schema_#1_properties_tl } + { + \__pdfmeta_xmp_add_packet_open:nn {rdf}{li~rdf:parseType="Resource"} + \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{name}{#2} + \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{valueType}{#3} + \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{category}{#4} + \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{description}{#5} + \__pdfmeta_xmp_add_packet_close:nn{rdf}{li} + } + } + } { - \__pdfmeta_xmp_add_packet_open:nn {rdf}{li~rdf:parseType="Resource"} - \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{name}{#2} - \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{valueType}{#3} - \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{category}{#4} - \__pdfmeta_xmp_add_packet_line:nnn {pdfaProperty}{description}{#5} - \__pdfmeta_xmp_add_packet_close:nn{rdf}{li} - } + \msg_warning:nnnn{pdfmeta}{xmp-undefined}{schema}{#1} + } } \cs_new_protected:Npn \__pdfmeta_xmp_add_packet_field:nnn #1 #2 #3 % @@ -2469,7 +2501,7 @@ } \cs_new_protected:Npn \__pdfmeta_xmp_schema_enable_pdfd: { - \__pdfmeta_xmp_xmlns_new:ne {pdfd}{http://pdfa.org/declarations/} + \__pdfmeta_xmp_xmlns_new:nn {pdfd}{http://pdfa.org/declarations/} \__pdfmeta_xmp_schema_new:nnn {PDF~Declarations~Schema} {pdfd} @@ -2832,9 +2864,11 @@ \cs_new_protected:Npn \pdfmeta_xmp_xmlns_new:nn #1 #2 { \prop_if_in:NnTF \g__pdfmeta_xmp_xmlns_prop {#1} - {\msg_warning:nnn{pdfmeta}{namespace-defined}{#1}} + {\msg_warning:nnnn{pdfmeta}{xmp-defined}{xmlns~namespace}{#1}} {\__pdfmeta_xmp_xmlns_new:nn {#1}{#2}} } +\cs_set_eq:NN \pdfmeta_xmp_schema_new:nnn \__pdfmeta_xmp_schema_new:nnn +\cs_set_eq:NN \pdfmeta_xmp_property_new:nnnnn \__pdfmeta_xmp_property_new:nnnnn \cs_new_protected:Npn \pdfmeta_xmp_add_declaration:n #1 %conformsTo uri { \__pdfmeta_xmp_schema_enable_pdfd: diff --git a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty index ce1dbc393..6ac5b4299 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty +++ b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: pdfmanagement-testphase.dtx -\ProvidesExplPackage{pdfmanagement-testphase}{2024-08-17}{0.96j} +\ProvidesExplPackage{pdfmanagement-testphase}{2024-09-13}{0.96l} {LaTeX PDF management testphase bundle} \providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} \IfFormatAtLeastTF{2020-10-01}{}{ diff --git a/texmf/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty b/texmf/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty index 5fce11f19..51316ead6 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty +++ b/texmf/tex/latex/pdfmanagement-testphase/xcolor-patches-tmp-ltx.sty @@ -1,6 +1,6 @@ %% LaTeX2e file `xcolor-patches-tmp-ltx.sty' %% -\ProvidesPackage{xcolor-patches-tmp-ltx}[2024-08-17 v0.96j patch xcolor for l3color] +\ProvidesPackage{xcolor-patches-tmp-ltx}[2024-09-13 v0.96l patch xcolor for l3color] \@ifundefined{color_set:nn}{\RequirePackage{l3color}}{} \ExplSyntaxOn diff --git a/texmf/tex/latex/tagpdf/tagpdf-base.sty b/texmf/tex/latex/tagpdf/tagpdf-base.sty index e02c03e63..a6f4347d4 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-base.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-base.sty @@ -25,7 +25,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf-base} {2024-09-11} {0.99e} +\ProvidesExplPackage {tagpdf-base} {2024-09-16} {0.99f} {part of tagpdf - provide base, no-op versions of the user commands } \cs_new_protected:Npn \__tag_whatsits: {} \AddToHook{begindocument} @@ -45,6 +45,8 @@ \cs_new_protected:Npn \tagstart{} \cs_new_protected:Npn \tag_stop:n #1 {} \cs_new_protected:Npn \tag_start:n #1 {} +\cs_set_eq:NN \tag_suspend:n \tag_stop:n +\cs_set_eq:NN \tag_resume:n \tag_start:n %% File: tagpdf-mc-generic.dtx \cs_new_protected:Npn \tag_mc_begin:n #1 { \__tag_whatsits: \int_gincr:N \c@g__tag_MCID_abs_int } \cs_new_protected:Nn \tag_mc_end:{ \__tag_whatsits: } diff --git a/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty b/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty index c49870fb2..10b9399ba 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-generic.dtx -\ProvidesExplPackage {tagpdf-debug-generic} {2024-09-11} {0.99e} +\ProvidesExplPackage {tagpdf-debug-generic} {2024-09-16} {0.99f} {part of tagpdf - debugging code related to marking chunks - generic mode} \cs_set_protected:Npn \tag_mc_begin:n #1 %#1 keyval { diff --git a/texmf/tex/latex/tagpdf/tagpdf-debug-lua.sty b/texmf/tex/latex/tagpdf/tagpdf-debug-lua.sty index 1ae2ed1ed..104228a14 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-debug-lua.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-debug-lua.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-luacode.dtx -\ProvidesExplPackage {tagpdf-debug-lua} {2024-09-11} {0.99e} +\ProvidesExplPackage {tagpdf-debug-lua} {2024-09-16} {0.99f} {part of tagpdf - debugging code related to marking chunks - lua mode} \cs_set_protected:Npn \__tag_mc_handle_stash:n #1 %1 mcidnum { diff --git a/texmf/tex/latex/tagpdf/tagpdf-debug.sty b/texmf/tex/latex/tagpdf/tagpdf-debug.sty index e2ef54ead..198c0be0c 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-debug.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-debug.sty @@ -26,14 +26,14 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf-debug} {2024-09-11} {0.99e} +\ProvidesExplPackage {tagpdf-debug} {2024-09-16} {0.99f} { debug code for tagpdf } \@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput} \prop_gput:Nnn \g_msg_module_type_prop { tag / debug} {} \prop_gput:Nnn \g_msg_module_name_prop { tag / debug }{tagpdf~DEBUG} \cs_set_protected:Npn \tag_stop: { - \msg_note:nne {tag / debug }{tag-stop}{ \int_use:N \l__tag_tag_stop_int } + \msg_note:nne {tag / debug }{tag-suspend}{ \int_use:N \l__tag_tag_stop_int } \int_incr:N \l__tag_tag_stop_int \bool_set_false:N \l__tag_active_struct_bool \bool_set_false:N \l__tag_active_mc_bool @@ -50,13 +50,13 @@ \bool_set_true:N \l__tag_active_socket_bool \__tag_start_para_ints: } - \msg_note:nne {tag / debug }{tag-start}{ \int_use:N \l__tag_tag_stop_int } + \msg_note:nne {tag / debug }{tag-resume}{ \int_use:N \l__tag_tag_stop_int } } \cs_set_eq:NN\tagstop\tag_stop: \cs_set_eq:NN\tagstart\tag_start: -\cs_set_protected:Npn \tag_stop:n #1 +\cs_set_protected:Npn \tag_suspend:n #1 { - \msg_note:nnee {tag / debug }{tag-stop} + \msg_note:nnee {tag / debug }{tag-suspend} { \int_use:N \l__tag_tag_stop_int }{\exp_not:n{#1}} \int_incr:N \l__tag_tag_stop_int \bool_set_false:N \l__tag_active_struct_bool @@ -64,7 +64,8 @@ \bool_set_false:N \l__tag_active_socket_bool \__tag_stop_para_ints: } -\cs_set_protected:Npn \tag_start:n #1 +\cs_set_eq:NN \tag_stop:n \tag_suspend:n +\cs_set_protected:Npn \tag_resume:n #1 { \int_if_zero:nF { \l__tag_tag_stop_int } { \int_decr:N \l__tag_tag_stop_int } \int_if_zero:nT { \l__tag_tag_stop_int } @@ -74,9 +75,10 @@ \bool_set_true:N \l__tag_active_socket_bool \__tag_start_para_ints: } - \msg_note:nnee {tag / debug }{tag-start} + \msg_note:nnee {tag / debug }{tag-resume} { \int_use:N \l__tag_tag_stop_int }{\exp_not:n{#1}} } +\cs_set_eq:NN \tag_start:n \tag_resume:n \bool_if:NTF \g__tag_mode_lua_bool { \RequirePackage {tagpdf-debug-lua} @@ -195,20 +197,20 @@ } } } -\msg_new:nnn { tag / debug } {tag-stop} +\msg_new:nnn { tag / debug } {tag-suspend} { \int_if_zero:nTF {#1} - {Tagging~stopped} - {Tagging~(not)~stopped~(already~inactive)}\\ + {Tagging~suspended} + {Tagging~(not)~suspended~(already~inactive)}\\ level:~#1~==>~\int_eval:n{#1+1}\tl_if_empty:nF{#2}{,~label:~#2}~[\msg_line_context:] } -\msg_new:nnn { tag / debug } {tag-start} +\msg_new:nnn { tag / debug } {tag-resume} { \int_if_zero:nTF {#1} - {Tagging~restarted} - {Tagging~(not)~restarted}\\ + {Tagging~resumed} + {Tagging~(not)~resumed}\\ level:~\int_eval:n{#1+1}~==>~#1\tl_if_empty:nF{#2}{,~label:~#2}~[\msg_line_context:] } %% File: tagpdf-user.dtx @@ -263,7 +265,7 @@ \seq_new:c { g__tag_struct_debug_kids_1_seq } \prop_gset_eq:cc { g__tag_struct_debug_1_prop }{ g__tag_struct_1_prop } \prop_gremove:cn { g__tag_struct_debug_1_prop }{Namespaces} -\cs_set_protected:Npn \__tag_struct_kid_mc_gput_right:nn #1 #2 %#1 structure num, #2 MCID absnum% +\cs_set_protected:Npn \__tag_struct_kid_mc_gput_right:nn #1 #2 { \__tag_seq_gput_right:ce { g__tag_struct_kids_#1_seq } @@ -281,7 +283,8 @@ \prop_item:Nn \g__tag_struct_cont_mc_prop {#2} } } -\cs_set_protected:Npn\__tag_struct_kid_struct_gput_right:nn #1 #2 %#1 num of parent struct, #2 kid struct +\cs_set_protected:Npn\__tag_struct_kid_struct_gput_right:nn #1 #2 +%%#1 num of parent struct, #2 kid struct { \__tag_seq_gput_right:ce { g__tag_struct_kids_#1_seq } @@ -294,8 +297,22 @@ Struct~#2 } } - +\cs_set_protected:Npn\__tag_struct_kid_struct_gput_left:nn #1 #2 +%%#1 num of parent struct, #2 kid struct + { + \__tag_seq_gput_left:ce + { g__tag_struct_kids_#1_seq } + { + \pdf_object_ref_indexed:nn { __tag/struct }{ #2 } + } + \seq_gput_left:cn + { g__tag_struct_debug_kids_#1_seq } + { + Struct~#2 + } + } \cs_set_protected:Npn\__tag_struct_kid_OBJR_gput_right:nnn #1 #2 #3 +%%#1 num of parent struct,#2 obj reference,#3 page object reference { \pdf_object_unnamed_write:nn { dict } @@ -450,7 +467,7 @@ %record this structure as kid: %\tl_show:N \g__tag_struct_stack_current_tl %\tl_show:N \l__tag_struct_stack_parent_tmpa_tl - \__tag_struct_kid_struct_gput_right:ee + \use:c { __tag_struct_kid_struct_gput_ \l__tag_struct_addkid_tl :ee } { \l__tag_struct_stack_parent_tmpa_tl } { \g__tag_struct_stack_current_tl } %\prop_show:c { g__tag_struct_\g__tag_struct_stack_current_tl _prop } diff --git a/texmf/tex/latex/tagpdf/tagpdf-luatex.def b/texmf/tex/latex/tagpdf/tagpdf-luatex.def index d9496473f..9782383e6 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-luatex.def +++ b/texmf/tex/latex/tagpdf/tagpdf-luatex.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-backend.dtx -\ProvidesExplFile {tagpdf-luatex.def} {2024-09-11} {0.99e} +\ProvidesExplFile {tagpdf-luatex.def} {2024-09-16} {0.99f} {tagpdf~driver~for~luatex} { \fontencoding{TU}\fontfamily{lmr}\fontseries{m}\fontshape{n}\fontsize{10pt}{10pt}\selectfont @@ -54,7 +54,11 @@ \seq_gput_right:Nn #1 { #2 } \lua_now:e { table.insert(ltx.__tag.tables.\cs_to_str:N#1, "#2") } } - +\cs_set_protected:Npn \__tag_seq_gput_left:Nn #1 #2 + { + \seq_gput_left:Nn #1 { #2 } + \lua_now:e { table.insert(ltx.__tag.tables.\cs_to_str:N#1, "#2") } + } \cs_set:Npn \__tag_seq_item:cn #1 #2 { diff --git a/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty b/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty index 44a984cba..e15b161e4 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-generic.dtx -\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-09-11} {0.99e} +\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-09-16} {0.99f} {part of tagpdf - code related to marking chunks - generic mode} \tl_new:N \l__tag_mc_ref_abspage_tl diff --git a/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty b/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty index 8bc92d6fb..cdaa00d74 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-mc-luacode.dtx -\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-09-11} {0.99e} +\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-09-16} {0.99f} {tagpdf - mc code only for the luamode } \hook_gput_code:nnn{begindocument}{tagpdf/mc} { diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def b/texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def index dae09e938..1e3f6a621 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def +++ b/texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-09-11} {0.99e} +%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-09-16} {0.99f} %% {latex-book} {https://www.latex-project.org/ns/book/2022}{} chapter, H1,pdf2, section, H2,pdf2, diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def b/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def index 66dc96804..23ed98ec6 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def +++ b/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-09-11} {0.99e} +%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-09-16} {0.99f} %% {latex} {https://www.latex-project.org/ns/dflt/2022}{} title, Title, pdf2, part, Title, pdf2, diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def b/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def index 7b7b2bc93..89c8e7192 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def +++ b/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-09-11} {0.99e} +%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-09-16} {0.99f} abs,abs,mathml, and,and,mathml, annotation,annotation,mathml, diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def b/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def index 99b8c6c8f..013cd0a2e 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def +++ b/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-09-11} {0.99e} +%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-09-16} {0.99f} %% {pdf} {http://iso.org/pdf/ssn}{} StructTreeRoot,StructTreeRoot,pdf,D, Document,Document,pdf,D, diff --git a/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def b/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def index e893515d6..f00b99a56 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def +++ b/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-09-11} {0.99e} +%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-09-16} {0.99f} %% {pdf2} {http://iso.org/pdf2/ssn}{} StructTreeRoot,StructTreeRoot,pdf2,D, Document,Document,pdf2,D, diff --git a/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv b/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv index 9b4b63434..29dc81f79 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv +++ b/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-09-11} {0.99e} +%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-09-16} {0.99f} ,,,StructTreeRoot,Document,DocumentFragment,Art,Part,Div,Sect,Aside,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Title,Sub,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Em,Strong,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,FENote,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,math,mathml,Artifact,MC Document,both,document level,1,0..n,0..n,∅,‡,‡,∅,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅ DocumentFragment,2.0,document level,∅,0..n,0..n,0..n,‡,‡,0..n,0..n,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅*,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅*,∅,∅,∅,∅,0..n,∅ diff --git a/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv b/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv index aef127400..38f5c3394 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv +++ b/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-09-11} {0.99e} +%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-09-16} {0.99f} ,,,StructTreeRoot,Document,Art,Part,Div,Sect,BlockQuote,NonStruct,TOC,TOCI,Index,Private,Quote,Note,Reference,BibEntry,P,Hn,H,Lbl,Code,Span,Link,Annot,Form,Ruby,RB,RT,RP,Warichu,WT,WP,L,LI,LBody,Table,TR,TH,TD,THead,TBody,TFoot,Caption,Figure,Formula,MC Document,both,document level,1,0..n,∅,‡,‡,∅,0..n,‡,∅,∅,∅,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅ Art,1.7,grouping,∅,0..n,∅,‡,‡,0..n,0..n,‡,∅,∅,∅,0..n,∅,0..n,∅,∅,∅,0..1,0..1,∅,∅,∅,0..n,0..n,∅,∅,∅,∅,∅,∅,∅,∅,∅,∅,0..n,∅,∅,0..n,0..n,∅,∅,∅,0..n,0..n,∅,∅ diff --git a/texmf/tex/latex/tagpdf/tagpdf.lua b/texmf/tex/latex/tagpdf/tagpdf.lua index a5573a14b..5aec9d346 100644 --- a/texmf/tex/latex/tagpdf/tagpdf.lua +++ b/texmf/tex/latex/tagpdf/tagpdf.lua @@ -24,8 +24,8 @@ local ProvidesLuaModule = { name = "tagpdf", - version = "0.99e", --TAGVERSION - date = "2024-09-11", --TAGDATE + version = "0.99f", --TAGVERSION + date = "2024-09-16", --TAGDATE description = "tagpdf lua code", license = "The LATEX Project Public License 1.3c" } diff --git a/texmf/tex/latex/tagpdf/tagpdf.sty b/texmf/tex/latex/tagpdf/tagpdf.sty index 93217d1fc..2f85934f3 100644 --- a/texmf/tex/latex/tagpdf/tagpdf.sty +++ b/texmf/tex/latex/tagpdf/tagpdf.sty @@ -28,7 +28,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf} {2024-09-11} {0.99e} +\ProvidesExplPackage {tagpdf} {2024-09-16} {0.99f} { LaTeX kernel code for PDF tagging } \bool_if:nF @@ -180,12 +180,14 @@ \cs_set_eq:NN \__tag_seq_new:N \seq_new:N \cs_set_eq:NN \__tag_prop_gput:Nnn \prop_gput:Nnn \cs_set_eq:NN \__tag_seq_gput_right:Nn \seq_gput_right:Nn +\cs_set_eq:NN \__tag_seq_gput_left:Nn \seq_gput_left:Nn \cs_set_eq:NN \__tag_seq_item:cn \seq_item:cn \cs_set_eq:NN \__tag_prop_item:cn \prop_item:cn \cs_set_eq:NN \__tag_seq_show:N \seq_show:N \cs_set_eq:NN \__tag_prop_show:N \prop_show:N \cs_generate_variant:Nn \__tag_prop_gput:Nnn { Nen , Nee, Nne , cnn, cen, cne, cno, cnx} \cs_generate_variant:Nn \__tag_seq_gput_right:Nn { Ne , No, cn, ce } +\cs_generate_variant:Nn \__tag_seq_gput_left:Nn { ce } \cs_generate_variant:Nn \__tag_prop_new:N { c } \cs_generate_variant:Nn \__tag_seq_new:N { c } \cs_generate_variant:Nn \__tag_seq_show:N { c } @@ -212,7 +214,7 @@ } \cs_set_eq:NN\tagstop\tag_stop: \cs_set_eq:NN\tagstart\tag_start: -\cs_set_protected:Npn \tag_stop:n #1 +\cs_set_protected:Npn \tag_suspend:n #1 { \int_incr:N \l__tag_tag_stop_int \bool_set_false:N \l__tag_active_struct_bool @@ -220,7 +222,8 @@ \bool_set_false:N \l__tag_active_socket_bool \__tag_stop_para_ints: } -\cs_set_protected:Npn \tag_start:n #1 +\cs_set_eq:NN \tag_stop:n \tag_suspend:n +\cs_set_protected:Npn \tag_resume:n #1 { \int_if_zero:nF { \l__tag_tag_stop_int } { \int_decr:N \l__tag_tag_stop_int } \int_if_zero:nT { \l__tag_tag_stop_int } @@ -231,6 +234,7 @@ \__tag_start_para_ints: } } +\cs_set_eq:NN \tag_start:n \tag_resume:n \keys_define:nn { __tag / setup } { activate/mc .bool_gset:N = \g__tag_active_mc_bool, @@ -666,12 +670,12 @@ \tag_mc_end_push: \tag_mc_begin:n {artifact=#1} \group_begin: - \tag_stop:n{artifact-group} + \tag_suspend:n{artifact-group} } \cs_set_protected:Npn \tag_mc_artifact_group_end: { - \tag_start:n{artifact-group} + \tag_resume:n{artifact-group} \group_end: \tag_mc_end: \tag_mc_begin_pop:n{} @@ -1973,6 +1977,9 @@ \prop_new_linked:N \g__tag_struct_label_num_prop \bool_new:N \l__tag_struct_elem_stash_bool +\tl_new:N \l__tag_struct_addkid_tl +\tl_set:Nn \l__tag_struct_addkid_tl {right} + \prop_new_linked:N \g__tag_struct_ref_by_dest_prop \cs_new:Npn \__tag_struct_output_prop_aux:nn #1 #2 %#1 num, #2 key { @@ -2097,7 +2104,7 @@ /MCID \c_space_tl \property_ref:enn{mcid-#1}{tagmcid}{1} >> } -\cs_new_protected:Npn \__tag_struct_kid_mc_gput_right:nn #1 #2 %#1 structure num, #2 MCID absnum% +\cs_new_protected:Npn \__tag_struct_kid_mc_gput_right:nn #1 #2 { \__tag_seq_gput_right:ce { g__tag_struct_kids_#1_seq } @@ -2111,7 +2118,8 @@ } } \cs_generate_variant:Nn \__tag_struct_kid_mc_gput_right:nn {ne} -\cs_new_protected:Npn\__tag_struct_kid_struct_gput_right:nn #1 #2 %#1 num of parent struct, #2 kid struct +\cs_new_protected:Npn\__tag_struct_kid_struct_gput_right:nn #1 #2 +%%#1 num of parent struct, #2 kid struct { \__tag_seq_gput_right:ce { g__tag_struct_kids_#1_seq } @@ -2119,11 +2127,21 @@ \pdf_object_ref_indexed:nn { __tag/struct }{ #2 } } } - \cs_generate_variant:Nn \__tag_struct_kid_struct_gput_right:nn {ee} -\cs_new_protected:Npn\__tag_struct_kid_OBJR_gput_right:nnn #1 #2 #3 %#1 num of parent struct, - %#2 obj reference - %#3 page object reference +\cs_new_protected:Npn\__tag_struct_kid_struct_gput_left:nn #1 #2 +%%#1 num of parent struct, #2 kid struct + { + \__tag_seq_gput_left:ce + { g__tag_struct_kids_#1_seq } + { + \pdf_object_ref_indexed:nn { __tag/struct }{ #2 } + } + } +\cs_generate_variant:Nn \__tag_struct_kid_struct_gput_left:nn {ee} +\cs_new_protected:Npn\__tag_struct_kid_OBJR_gput_right:nnn #1 #2 #3 + + +%%#1 num of parent struct,#2 obj reference,#3 page object reference { \pdf_object_unnamed_write:nn { dict } @@ -2262,7 +2280,8 @@ { \prop_get:cnNF { g__tag_struct_#1_prop } {P}\l__tag_tmpb_tl { - \prop_gput:cne { g__tag_struct_#1_prop } {P}{\pdf_object_ref_indexed:nn { __tag/struct }{1}} + \prop_gput:cne { g__tag_struct_#1_prop } {P} + {\pdf_object_ref_indexed:nn { __tag/struct }{1}} \prop_gput:cne { g__tag_struct_#1_prop } {S}{/Artifact} \seq_if_empty:cF {g__tag_struct_kids_#1_seq} { @@ -2288,8 +2307,9 @@ \msg_error:nnn { tag } { struct-no-objnum } { #1} } } -\cs_new_protected:Npn \__tag_struct_insert_annot:nn #1 #2 %#1 object reference to the annotation/xform - %#2 structparent number +\cs_new_protected:Npn \__tag_struct_insert_annot:nn #1 #2 + %#1 object reference to the annotation/xform + %#2 structparent number { \bool_if:NT \g__tag_active_struct_bool { @@ -2311,7 +2331,8 @@ #1 % } { - \pdf_pageobject_ref:n { \property_ref:nnn {@tag@objr@page@#2 }{ tagabspage }{1} } + \pdf_pageobject_ref:n + { \property_ref:nnn {@tag@objr@page@#2 }{ tagabspage }{1} } } % add the parent obj number to the parent tree: \exp_args:Nne @@ -2320,7 +2341,8 @@ #2 } { - \pdf_object_ref_indexed:nn { __tag/struct }{ \l__tag_struct_stack_parent_tmpa_tl } + \pdf_object_ref_indexed:nn + { __tag/struct }{ \l__tag_struct_stack_parent_tmpa_tl } } % increase the int: \int_gincr:N \c@g__tag_parenttree_obj_int @@ -2341,7 +2363,8 @@ \socket_new:nn { tag/struct/tag }{1} \socket_new_plug:nnn { tag/struct/tag }{ latex-tags } { - \seq_set_split:Nne \l__tag_tmpa_seq { / } {#1/\prop_item:Ne\g__tag_role_tags_NS_prop{#1}} + \seq_set_split:Nne \l__tag_tmpa_seq { / } + {#1/\prop_item:Ne\g__tag_role_tags_NS_prop{#1}} \tl_gset:Ne \g__tag_struct_tag_tl { \seq_item:Nn\l__tag_tmpa_seq {1} } \tl_gset:Ne \g__tag_struct_tag_NS_tl{ \seq_item:Nn\l__tag_tmpa_seq {2} } \__tag_check_structure_tag:N \g__tag_struct_tag_tl @@ -2349,10 +2372,12 @@ \socket_new_plug:nnn { tag/struct/tag }{ pdf-tags } { - \seq_set_split:Nne \l__tag_tmpa_seq { / } {#1/\prop_item:Ne\g__tag_role_tags_NS_prop{#1}} + \seq_set_split:Nne \l__tag_tmpa_seq { / } + {#1/\prop_item:Ne\g__tag_role_tags_NS_prop{#1}} \tl_gset:Ne \g__tag_struct_tag_tl { \seq_item:Nn\l__tag_tmpa_seq {1} } \tl_gset:Ne \g__tag_struct_tag_NS_tl{ \seq_item:Nn\l__tag_tmpa_seq {2} } - \__tag_role_get:VVNN \g__tag_struct_tag_tl\g__tag_struct_tag_NS_tl\l__tag_tmpa_tl\l__tag_tmpb_tl + \__tag_role_get:VVNN + \g__tag_struct_tag_tl \g__tag_struct_tag_NS_tl \l__tag_tmpa_tl \l__tag_tmpb_tl \tl_gset:Ne \g__tag_struct_tag_tl {\l__tag_tmpa_tl} \tl_gset:Ne \g__tag_struct_tag_NS_tl{\l__tag_tmpb_tl} \__tag_check_structure_tag:N \g__tag_struct_tag_tl @@ -2387,6 +2412,7 @@ } }, parent .default:n = {-1}, +firstkid .code:n = { \tl_set:Nn \l__tag_struct_addkid_tl {left} }, tag .code:n = % S property { \socket_use:nn { tag/struct/tag }{#1} @@ -2548,7 +2574,7 @@ } \cs_generate_variant:Nn \__tag_struct_add_inline_AF:nn {on} -\cs_new_protected:Npn \__tag_struct_add_AF:nn #1 #2 % #1 struct num #2 object reference +\cs_new_protected:Npn \__tag_struct_add_AF:nn #1 #2 { \tl_if_exist:cTF { @@ -2574,7 +2600,8 @@ { \pdf_object_if_exist:eTF {#1} { - \__tag_struct_add_AF:ee { \int_use:N \c@g__tag_struct_abs_int }{\pdf_object_ref:e {#1}} + \__tag_struct_add_AF:ee + { \int_use:N \c@g__tag_struct_abs_int }{\pdf_object_ref:e {#1}} \__tag_struct_prop_gput:nne { \int_use:N \c@g__tag_struct_abs_int } { AF } @@ -2788,7 +2815,7 @@ %record this structure as kid: %\tl_show:N \g__tag_struct_stack_current_tl %\tl_show:N \l__tag_struct_stack_parent_tmpa_tl - \__tag_struct_kid_struct_gput_right:ee + \use:c { __tag_struct_kid_struct_gput_ \l__tag_struct_addkid_tl :ee } { \l__tag_struct_stack_parent_tmpa_tl } { \g__tag_struct_stack_current_tl } %\prop_show:c { g__tag_struct_\g__tag_struct_stack_current_tl _prop } @@ -3515,9 +3542,9 @@ {\tagmcbegin{tag=Lbl}} {#1} } - \tag_stop:n{hangfrom} + \tag_suspend:n{hangfrom} \hangindent \wd\@tempboxa\noindent - \tag_start:n{hangfrom} + \tag_resume:n{hangfrom} \tagmcbegin{}\box\@tempboxa\tagmcend\tagstructend\tagmcbegin{} } } @@ -3768,11 +3795,11 @@ \bool_gset_false:N \g__tag_in_mc_bool } \tag_mc_begin:n {artifact} - \tag_stop:n{headfoot} + \tag_suspend:n{headfoot} } \cs_new_protected:Npn \__tag_exclude_headfoot_end: { - \tag_start:n{headfoot} + \tag_resume:n{headfoot} \tag_mc_end: \bool_if:NTF \g__tag_mode_lua_bool { @@ -3796,12 +3823,12 @@ } \tag_struct_begin:n{tag=Artifact,attribute-class=__tag/attr/#1} \tag_mc_begin:n {artifact=#1} - \tag_stop:n{headfoot} + \tag_suspend:n{headfoot} } \cs_new_protected:Npn \__tag_exclude_struct_headfoot_end: { - \tag_start:n{headfoot} + \tag_resume:n{headfoot} \tag_mc_end: \tag_struct_end: \bool_if:NTF \g__tag_mode_lua_bool diff --git a/texmf/tex/latex/tagpdf/tagpdfdocu-patches.sty b/texmf/tex/latex/tagpdf/tagpdfdocu-patches.sty deleted file mode 100644 index 5619d5957..000000000 --- a/texmf/tex/latex/tagpdf/tagpdfdocu-patches.sty +++ /dev/null @@ -1,293 +0,0 @@ -%\RequirePackage[enable-debug]{expl3}[2018/06/14] -\ProvidesExplPackage {tagpdfdocu-patches} {2024-09-11} {0.99e} - {patches/commands for the tagpdf documentation} -\RequirePackage{etoolbox,xpatch} - -%Logos -% only spacing changes: -\ExplSyntaxOn -\DeclareRobustCommand\TeX{ - \leavevmode - T\kern-.1667em\lower.5ex\hbox{E}\kern-.05emX\@ %changed from -.125em - } -\DeclareRobustCommand{\LaTeX}{ - \leavevmode - L\kern-.25em % %changed from -0.36em - \sbox\z@ T% - \vbox to\ht\z@{\hbox{\check@mathfonts - \fontsize\sf@size\z@ - \math@fontsfalse\selectfont - A}% - \vss}% - \kern-.1em % %changed from 0.15em - T\kern-.1667em\lower.5ex\hbox{E}\kern-.05emX\@ %changed from -0.125 - } - -% minisec, correct tagging is still unclear. -\newcommand\minisec[1]{% - \if@noskipsec \leavevmode \fi - \par - \@afterindentfalse - \if@nobreak - \everypar{}% - \else - \addpenalty\@secpenalty\addvspace{1.5ex}% - \fi - {\tagpdfsetup{para/maintag=P,para/tag=Strong}\parindent \z@ - \setlength{\parfillskip}{\z@ plus 1fil}% - \raggedright\normalfont\bfseries\nobreak - \nobreak\interlinepenalty \@M #1\par\nobreak% - }\nobreak - \@afterheading -} - -% listings. Unclear how to make it work for the original lstlisting, so we make a -% copy taglstlisting for now -\DeclareInstance{blockenv}{lstlisting}{display} -{ - env-name = lstlisting, - tag-name = verbatim, - tag-class = , - tagging-recipe = standard, - inner-level-counter = , - level-increase = false, - setup-code = , - block-instance = displayblock , - inner-instance = , - final-code = \tl_set:Nn \l__tag_para_main_tag_tl {codeline}\tagtool{paratag=Code}, -} - -\lstnewenvironment{taglstlisting}[2][]{% - \UseInstance{blockenv}{lstlisting} {} - \lst@TestEOLChar{#2}% - \lstset{#1}% - \csname\@lst @SetFirstNumber\endcsname% - }{% - \@nobreakfalse - \csname\@lst @SaveFirstNumber\endcsname% - \endblockenv - } - -% ======== marginnote ========== -% 2024-03-23 currently marginnote is no longer used, we use marginpar -% TODO marginnote has a bug (a \par is missing) so it messes up tagging. -% but currently unneeded as we marked them up as artifacts anyway as they don't contain -% meaningful contents -%\renewcommand*{\mn@parboxrestore}{\tagpdfparaOff}% - -%\NewDocumentCommand\sidenote{m} -% {% -% %\tag_mc_artifact_group_begin:n{notype}\tagpdfparaOff\marginnote{#1}\tag_mc_artifact_group_end: -% \marginpar{#1}% -% } - -\ExplSyntaxOff - -%======== tcolorbox ======== -% We switch of paratagging at the begin and reenable it locally in before upper. -% the before upper setting is dangerous as it can be overwritten by -% users. So a more stable hook is needed. -% we force also a \par and add a div structure, to avoid clashes with the block -% tagging code. This needs revisiting! - -\AddToHook{env/tcolorbox/before}{\par\tagstructbegin{tag=Div}} -\AddToHook{env/tcolorbox/begin}{\tagpdfparaOff \tcbset{before upper=\tagpdfparaOn}} -\AddToHook{env/tcolorbox/after}{\par\tagstructend} - -% ========= doc Commands from tcolorbox -% Not sure if this is generally usable but one must avoid tagstop if there can -% be a pagebreak -\DeclareInstance{blockenv}{docCommand}{display} -{ - env-name = docCommand, - tag-name = Div, - tag-class = , - tagging-recipe = standalone, - inner-level-counter = , - level-increase = false, - setup-code = , - block-instance = displayblock , -} - -\RenewDocumentEnvironment{tcb@manual@entry}{} - {\UseInstance{blockenv}{docCommand} - {tag-name=Div, - leftmargin=\kvtcb@doc@left, - rightmargin=\kvtcb@doc@right, - }% - \tagtool{para=false}% - \AssignSocketPlug{tagsupport/minipage/before}{noop} - \AssignSocketPlug{tagsupport/minipage/after}{noop} - \AssignSocketPlug{tagsupport/parbox/before}{noop} - \AssignSocketPlug{tagsupport/parbox/after}{noop} - } - {\endblockenv } - -\tcbset{ - doc head command= - {before upper=\tagstructbegin{tag=Code}\tagmcbegin{}, - after upper=\tagmcend\tagstructend}, - } - - - -% ======= footnote ======== -% done in testphase code - -% ====== hyperref ======== -% this should probably go into tagpdf, but it is related to -% problem of pdf strings and context .... - -\AddToHook{package/hyperref/after} - {% - \pdfstringdefDisableCommands{% - \let\tagstructbegin\@gobble - \let\tagmcbegin\@gobble - \let\tagmcend\relax - \let\tagstructend\relax - }}{} - -%====== tikz picture ======= -% first draft to tag. The main problem is to handle paragraphs. One -\ExplSyntaxOn -\cs_new_protected:Npn\__tag_tikz_savepos:n #1 - { - \tex_savepos:D - \tikz@resetexpandcount% - \tikz@scan@one@point\pgfutil@firstofone(current~bounding~box.north~east)\relax - \pgf@pos@transform{\pgf@x}{\pgf@y}% - \property_record:nn{#1}{xpos,ypos,abspage} - \property_record:nn{#1-tr}{pgfx,pgfy} - \tikz@scan@one@point\pgfutil@firstofone(current~bounding~box.south~west)\relax - \pgf@pos@transform{\pgf@x}{\pgf@y}% - \property_record:nn{#1-bl}{pgfx,pgfy} - \tex_savepos:D - } -\cs_generate_variant:Nn \__tag_tikz_savepos:n {e} - -\NewProperty{pgfx}{now}{0} - { - \dim_compare:nNnTF {\dim_abs:n {\pgf@x}} > {15999pt} - { 0 } - { \dim_to_decimal_in_sp:n{\pgf@x} } - } -\NewProperty{pgfy}{now}{0} - { - \dim_compare:nNnTF {\dim_abs:n {\pgf@y}} > {15999pt} - { 0 } - { \dim_to_decimal_in_sp:n{\pgf@y} } - } - -\cs_new_protected:Npn \__tag_tikz_getbbox: - { - \int_gincr:N\g__tag_graphic_int - \tl_set:Ne\l__tag_graphic_currentlabel_tl {__tag_graphic_\int_use:N \g__tag_graphic_int} - \tl_gset:Ne\g__tag_graphic_lx_tl - { - \dim_to_decimal_in_bp:n - { \property_ref:een {\l__tag_graphic_currentlabel_tl}{xpos}{0}sp - + \property_ref:een {\l__tag_graphic_currentlabel_tl-bl}{pgfx}{0}sp - } - } - \tl_gset:Ne\g__tag_graphic_ly_tl - { - \dim_to_decimal_in_bp:n - { \property_ref:een {\l__tag_graphic_currentlabel_tl}{ypos}{0}sp - + \property_ref:een {\l__tag_graphic_currentlabel_tl-bl}{pgfy}{0}sp - } - } - \tl_gset:Ne\g__tag_graphic_ux_tl - { - \dim_to_decimal_in_bp:n - { \property_ref:een {\l__tag_graphic_currentlabel_tl}{xpos}{0}sp - + \property_ref:een {\l__tag_graphic_currentlabel_tl-tr}{pgfx}{0}sp - } - } - \tl_gset:Ne\g__tag_graphic_uy_tl - { - \dim_to_decimal_in_bp:n - { \property_ref:een {\l__tag_graphic_currentlabel_tl}{ypos}{0}sp - + \property_ref:een {\l__tag_graphic_currentlabel_tl-tr}{pgfy}{0}sp - } - } - } - -\cs_new_protected:Npn \__tag_graphic_tikz_begin_picture: - { - \tag_mc_end_push: - \bool_if:NTF \l__tag_graphic_artifact_bool - { \tagmcbegin{artifact} } - { - \__tag_tikz_getbbox: - \tagstructbegin{tag=Figure,alt=\l__tag_graphic_alt_tl}\tagmcbegin{} - \__tag_prop_gput:cne - { g__tag_struct_\int_eval:n {\c@g__tag_struct_abs_int}_prop } - { A } - { - << - /O /Layout /BBox~ - [ - \g__tag_graphic_lx_tl\c_space_tl - \g__tag_graphic_ly_tl\c_space_tl - \g__tag_graphic_ux_tl\c_space_tl - \g__tag_graphic_uy_tl - ] - >> - } - \bool_if:NT\l__tag_graphic_debug_bool - { - \__tag_graphic_show_bbox:VVVVne - \g__tag_graphic_lx_tl - \g__tag_graphic_ly_tl - \g__tag_graphic_ux_tl - \g__tag_graphic_uy_tl - {red} - {\int_use:N\g__tag_graphic_int} - } - } - \SuspendTagging{tikz} - } - -\cs_new_protected:Npn \__tag_graphic_tikz_end_picture: - { - \ResumeTagging{tikz}\tagmcend - \bool_if:NF \l__tag_graphic_artifact_bool - { - \tagstructend - \__tag_tikz_savepos:e {__tag_graphic_\int_use:N \g__tag_graphic_int} - } - \tag_mc_begin_pop:n{} - } - -\tikzset - { - every~picture/.style= - { - artifact, - execute~at~begin~picture=\__tag_graphic_tikz_begin_picture:, - execute~at~end~picture=\__tag_graphic_tikz_end_picture: - } - } -\AddToHook{env/tikzpicture/before}{\leavevmode} - -\tikzset - { - alt/.code= - { - \bool_set_false:N \l__tag_graphic_artifact_bool - \tl_set:Nn \l__tag_graphic_alt_tl{#1} - } - } -\tikzset - { - artifact/.code= - \bool_set_true:N \l__tag_graphic_artifact_bool - } - -\ExplSyntaxOff - - - - - -\endinput