diff --git a/texmf/tex/latex/pdfmanagement-testphase/color-ltx.sty b/texmf/tex/latex/pdfmanagement-testphase/color-ltx.sty index a8ced5210..1716e9f9b 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-09-29 v0.96m +\ProvidesPackage{color-ltx}[2024-10-27 v0.96n 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 8a7c2a1b3..599680b6c 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-09-29}{0.96m} +\ProvidesExplPackage{colorspace-patches-tmp-ltx}{2024-10-27}{0.96n} {temporary patches for the colorspace package to test pdfresource management ... UF} diff --git a/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def b/texmf/tex/latex/pdfmanagement-testphase/hgeneric-testphase.def index 54cff3f59..dcaffb96f 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-09-29 v0.96m % +\ProvidesFile{hgeneric-testphase.def}[2024-10-27 v0.96n % 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 66e2654e3..178df5a68 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-09-29}{} + {l3backend-testphase-dvipdfmx.def}{2024-10-27}{} {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 } @@ -152,7 +152,6 @@ \cs_new_protected:Npn \__pdf_backend_PageResources_obj_gpush: {} \bool_new:N \l__pdf_backend_xform_bool - \cs_set_protected:Npn \__pdf_backend_bdcobject:nn #1 #2 % #1 eg. Span, #2: object name { \int_gincr:N \g__pdf_backend_name_int diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvips.def index 20af21ab2..3b3211a42 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-09-29}{} + {l3backend-testphase-dvips.def}{2024-10-27}{} {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 } @@ -134,6 +134,8 @@ { \__pdf_backend_pdfmark:n{/#1~<<#2>>~/BDC} } +\cs_set_eq:NN \__pdf_backend_bdc_contobj:nn \__pdf_backend_bdc:nn +\cs_set_eq:NN \__pdf_backend_bdc_contstream:nn \__pdf_backend_bdc:nn \bool_if:NT\l__pdfmanagement_delayed_shipout_bool { @@ -163,7 +165,6 @@ \cs_new_protected:Npn \__pdf_backend_PageResources_gpush:n #1 {} - \cs_new_protected:Npn \__pdf_backend_Names_gpush:nn #1 #2 {} \cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:nn #1 #2 { diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-dvisvgm.def index 3be79d711..1b2c0adb4 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-09-29}{} + {l3backend-testphase-dvisvgm.def}{2024-10-27}{} {LaTeX~PDF~management~testphase~bundle~backend~support: dvisvgm} \bool_if:NT \l__pdfmanagement_delayed_shipout_bool { @@ -106,6 +106,9 @@ \bool_new:N \l__pdf_backend_xform_bool \cs_set_protected:Npn \__pdf_backend_bdc:nn #1 #2 % #1 eg. Span, #2: dict_content {} +\cs_set_eq:NN \__pdf_backend_bdc_contobj:nn \__pdf_backend_bdc:nn +\cs_set_eq:NN \__pdf_backend_bdc_contstream:nn \__pdf_backend_bdc:nn + \bool_if:NT\l__pdfmanagement_delayed_shipout_bool { \cs_set_protected:Npn \__pdf_backend_shipout_bdc:ee #1 #2 % #1 eg. Span, #2: dict_content @@ -122,7 +125,6 @@ \cs_new_protected:Npn \__pdf_backend_PageResources_gpush:n #1 {} - \cs_new_protected:Npn \__pdf_backend_Names_gpush:nn #1 #2 {} \cs_new_protected:Npn \__pdf_backend_NamesEmbeddedFiles_add:nn #1 #2 {} diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-luatex.def index 39c0e7e47..d56136ad8 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-09-29}{} + {l3backend-testphase-luatex.def}{2024-10-27}{} {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 @@ -204,7 +204,6 @@ } } \bool_new:N \l__pdf_backend_xform_bool - \cs_set_protected:Npn \__pdf_backend_bdcobject:nn #1 #2 % #1 eg. Span, #2: object name { \int_gincr:N \g__pdf_backend_name_int @@ -267,13 +266,7 @@ \__kernel_backend_literal_page:n { /#1~<<#2>>~BDC } } - \cs_set_protected:Npn \__pdf_backend_bdc:nn #1 #2 - { - \bool_if:NTF \g__pdfmanagement_active_bool - {\cs_gset_eq:NN \__pdf_backend_bdc:nn \__pdf_backend_bdc_contobj:nn} - {\cs_gset_eq:NN \__pdf_backend_bdc:nn \__pdf_backend_bdc_contstream:nn} - \__pdf_backend_bdc:nn {#1}{#2} - } +\cs_set_eq:NN \__pdf_backend_bdc:nn \__pdf_backend_bdc_contstream:nn \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 754692557..9b694bcbb 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-09-29}{} + {l3backend-testphase-pdftex.def}{2024-10-27}{} {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 @@ -170,7 +170,6 @@ } } \bool_new:N \l__pdf_backend_xform_bool - \cs_set_protected:Npn \__pdf_backend_bdcobject:nn #1 #2 % #1 eg. Span, #2: object name { \int_gincr:N \g__pdf_backend_name_int @@ -245,14 +244,8 @@ { \__kernel_backend_literal_page:n { /#1~<<#2>>~BDC } } +\cs_set_eq:NN \__pdf_backend_bdc:nn \__pdf_backend_bdc_contstream:nn -\cs_set_protected:Npn \__pdf_backend_bdc:nn #1 #2 - { - \bool_if:NTF \g__pdfmanagement_active_bool - {\cs_gset_eq:NN \__pdf_backend_bdc:nn \__pdf_backend_bdc_contobj:nn} - {\cs_gset_eq:NN \__pdf_backend_bdc:nn \__pdf_backend_bdc_contstream:nn} - \__pdf_backend_bdc:nn {#1}{#2} - } \bool_if:NT\l__pdfmanagement_delayed_shipout_bool { \cs_set_protected:Npn \__pdf_backend_bdc_shipout_contstream:ee #1 #2 diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase-xetex.def index c29a76a19..3f8858d58 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-09-29}{} + {l3backend-testphase-xetex.def}{2024-10-27}{} {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 } @@ -152,7 +152,6 @@ \cs_new_protected:Npn \__pdf_backend_PageResources_obj_gpush: {} \bool_new:N \l__pdf_backend_xform_bool - \cs_set_protected:Npn \__pdf_backend_bdcobject:nn #1 #2 % #1 eg. Span, #2: object name { \int_gincr:N \g__pdf_backend_name_int diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase.lua b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase.lua index 988585867..02de44427 100644 --- a/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase.lua +++ b/texmf/tex/latex/pdfmanagement-testphase/l3backend-testphase.lua @@ -23,7 +23,6 @@ - ltx= ltx or {} ltx.__pdf = ltx.__pdf or {} ltx.__pdf.Page = ltx.__pdf.Page or {} diff --git a/texmf/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty b/texmf/tex/latex/pdfmanagement-testphase/l3pdffield-testphase.sty index 6c37dc8c2..5580ee0e2 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-09-29}{0.96m}% +\ProvidesExplPackage{l3pdffield-testphase}{2024-10-27}{0.96n}% {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 afa15df49..0ed1866d0 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-09-29}{0.96m} +\ProvidesExplPackage{pdfmanagement-firstaid}{2024-10-27}{0.96n} {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 8d3622910..63aa929d3 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-09-29}{0.96m} +\ProvidesExplFile{pdfmanagement-testphase.ltx}{2024-10-27}{0.96n} {PDF~management~code~(testphase)} \bool_new:N\l__pdfmanagement_delayed_shipout_bool \msg_new:nnn {pdfmanagement}{delayed-shipout} @@ -3051,6 +3051,8 @@ \cs_new_protected:Npn \pdf_bdc:nn #1 #2 { \__pdf_backend_bdc:nn { #1 }{ #2 } } \cs_generate_variant:Nn \pdf_bdc:nn {ee} +\cs_new_protected:Npn \pdf_bdc_property:nn #1 #2 + { \__pdf_backend_bdc_contobj:nn { #1 }{ #2 } } \cs_new_protected:Npn \pdf_bdc_shipout:ee #1 #2 { \bool_if:NTF\l__pdfmanagement_delayed_shipout_bool diff --git a/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty b/texmf/tex/latex/pdfmanagement-testphase/pdfmanagement-testphase.sty index f78f2e9fc..0d31a57e4 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-09-29}{0.96m} +\ProvidesExplPackage{pdfmanagement-testphase}{2024-10-27}{0.96n} {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 a429ca975..bde07318f 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-09-29 v0.96m patch xcolor for l3color] +\ProvidesPackage{xcolor-patches-tmp-ltx}[2024-10-27 v0.96n 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 a6f4347d4..bdcfa47bf 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-16} {0.99f} +\ProvidesExplPackage {tagpdf-base} {2024-10-27} {0.99g} {part of tagpdf - provide base, no-op versions of the user commands } \cs_new_protected:Npn \__tag_whatsits: {} \AddToHook{begindocument} @@ -108,7 +108,6 @@ - \NewDocumentCommand \tagpdfsetup { m }{} \cs_new_protected:Npn\tag_tool:n #1 {} \cs_set_eq:NN\tagtool\tag_tool:n @@ -144,7 +143,13 @@ } \providecommand\tag_socket_use:n[1]{} \providecommand\tag_socket_use:nn[2]{} +\providecommand\tag_socket_use:nnn[3]{} +\providecommand\tag_socket_use_expandable:n[1]{} +\providecommand\socket_use_expandable:nw [1] { + \use:c { __socket_#1_plug_ \str_use:c { l__socket_#1_plug_str } :w } +} \providecommand\UseTaggingSocket[1]{} +\providecommand\UseExpandableTaggingSocket[1]{} \bool_new:N \l__tag_para_flattened_bool \bool_new:N \l__tag_para_bool \newcommand\tagpdfparaOn {} diff --git a/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty b/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty index 10b9399ba..faed53b3c 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-16} {0.99f} +\ProvidesExplPackage {tagpdf-debug-generic} {2024-10-27} {0.99g} {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 104228a14..7b0f3b96d 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-16} {0.99f} +\ProvidesExplPackage {tagpdf-debug-lua} {2024-10-27} {0.99g} {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 198c0be0c..2ad6c2103 100644 --- a/texmf/tex/latex/tagpdf/tagpdf-debug.sty +++ b/texmf/tex/latex/tagpdf/tagpdf-debug.sty @@ -26,7 +26,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf-debug} {2024-09-16} {0.99f} +\ProvidesExplPackage {tagpdf-debug} {2024-10-27} {0.99g} { debug code for tagpdf } \@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput} \prop_gput:Nnn \g_msg_module_type_prop { tag / debug} {} @@ -219,7 +219,6 @@ - \keys_define:nn { __tag / show } { ,debug/structures .code:n = diff --git a/texmf/tex/latex/tagpdf/tagpdf-luatex.def b/texmf/tex/latex/tagpdf/tagpdf-luatex.def index 9782383e6..e25286e33 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-16} {0.99f} +\ProvidesExplFile {tagpdf-luatex.def} {2024-10-27} {0.99g} {tagpdf~driver~for~luatex} { \fontencoding{TU}\fontfamily{lmr}\fontseries{m}\fontshape{n}\fontsize{10pt}{10pt}\selectfont diff --git a/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty b/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty index e15b161e4..716de1a1d 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-16} {0.99f} +\ProvidesExplPackage {tagpdf-mc-code-generic} {2024-10-27} {0.99g} {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 cdaa00d74..7f0331f89 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-16} {0.99f} +\ProvidesExplPackage {tagpdf-mc-code-lua} {2024-10-27} {0.99g} {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 1e3f6a621..113d92036 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-16} {0.99f} +%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2024-10-27} {0.99g} %% {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 23ed98ec6..516094991 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-16} {0.99f} +%% \ProvidesExplFile {tagpdf-ns-latex.def} {2024-10-27} {0.99g} %% {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 89c8e7192..af23601b3 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-16} {0.99f} +%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2024-10-27} {0.99g} 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 013cd0a2e..88d859999 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-16} {0.99f} +%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2024-10-27} {0.99g} %% {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 f00b99a56..ccb4e7282 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-16} {0.99f} +%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2024-10-27} {0.99g} %% {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 29dc81f79..4c89e41f8 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-16} {0.99f} +%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2024-10-27} {0.99g} ,,,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 38f5c3394..27dd3a33b 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-16} {0.99f} +%% \ProvidesExplFile {tagpdf-parent-child.csv} {2024-10-27} {0.99g} ,,,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 5aec9d346..4ad1ba5b3 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.99f", --TAGVERSION - date = "2024-09-16", --TAGDATE + version = "0.99g", --TAGVERSION + date = "2024-10-27", --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 2f85934f3..f4451113d 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-16} {0.99f} +\ProvidesExplPackage {tagpdf} {2024-10-27} {0.99g} { LaTeX kernel code for PDF tagging } \bool_if:nF @@ -448,7 +448,7 @@ \msg_error:nnn { tag } {role-missing} {#1} } { - \prop_get:NnNTF \g__tag_role_tags_NS_prop {#2} \l_tmpa_tl + \prop_get:NnNTF \g__tag_role_tags_NS_prop {#2} \l__tag_tmpa_tl { \int_compare:nNnT {\l__tag_loglevel_int} > { 0 } { @@ -467,7 +467,7 @@ \msg_error:nnn { tag } {role-missing} {#1} } { - \prop_get:cnNTF { g__tag_role_NS_#3_prop } {#2} \l_tmpa_tl + \prop_get:cnNTF { g__tag_role_NS_#3_prop } {#2} \l__tag_tmpa_tl { \int_compare:nNnT {\l__tag_loglevel_int} > { 0 } { @@ -555,7 +555,7 @@ \l__tag_tmpa_tl } { - \seq_clear:N \l_tmpa_seq + \seq_clear:N \l__tag_tmpa_seq \int_step_inline:nnnn {1} {1} @@ -575,7 +575,7 @@ ##1 } { - \seq_gput_right:Ne \l_tmpa_seq + \seq_gput_right:Ne \l__tag_tmpa_seq { Page##1-####1- \property_ref:enn @@ -585,7 +585,7 @@ } } } - \seq_show:N \l_tmpa_seq + \seq_show:N \l__tag_tmpa_seq } } \prg_new_conditional:Npnn \__tag_check_if_mc_in_galley: { T,F,TF } @@ -1878,12 +1878,12 @@ tag-namespace=user, role-namespace=, %so that we can test for it. #1 - }{__tag/tag-role}\l_tmpa_tl - \tl_if_empty:NF \l_tmpa_tl + }{__tag/tag-role}\l__tag_tmpa_tl + \tl_if_empty:NF \l__tag_tmpa_tl { - \exp_args:NNno \seq_set_split:Nnn \l_tmpa_seq { / } {\l_tmpa_tl/} - \tl_set:Ne \l__tag_role_tag_tmpa_tl { \seq_item:Nn \l_tmpa_seq {1} } - \tl_set:Ne \l__tag_role_role_tmpa_tl { \seq_item:Nn \l_tmpa_seq {2} } + \exp_args:NNno \seq_set_split:Nnn \l__tag_tmpa_seq { / } {\l__tag_tmpa_tl/} + \tl_set:Ne \l__tag_role_tag_tmpa_tl { \seq_item:Nn \l__tag_tmpa_seq {1} } + \tl_set:Ne \l__tag_role_role_tmpa_tl { \seq_item:Nn \l__tag_tmpa_seq {2} } } \tl_if_empty:NT \l__tag_role_role_namespace_tmpa_tl { @@ -3256,7 +3256,6 @@ firstkid .code:n = { \tl_set:Nn \l__tag_struct_addkid_tl {left} }, - \RenewDocumentCommand \tagpdfsetup { m } { \keys_set:nn { __tag / setup } { #1 } @@ -3275,24 +3274,50 @@ firstkid .code:n = { \tl_set:Nn \l__tag_struct_addkid_tl {left} }, \cs_set_protected:Npn \tag_socket_use:n #1 { \bool_if:NT \l__tag_active_socket_bool - { \UseSocket {tagsupport/#1} } + { \socket_use:n {tagsupport/#1} } } \cs_set_protected:Npn \tag_socket_use:nn #1#2 { \bool_if:NT \l__tag_active_socket_bool - { \UseSocket {tagsupport/#1} {#2} } + { \socket_use:nn {tagsupport/#1} {#2} } + } +\cs_set_protected:Npn \tag_socket_use:nnn #1#2#3 + { + \bool_if:NT \l__tag_active_socket_bool + { \socket_use:nnn {tagsupport/#1} {#2} {#3} } + } +\cs_set:Npn \tag_socket_use_expandable:n #1 + { + \bool_if:NT \l__tag_active_socket_bool + { \socket_use_expandable:n {tagsupport/#1} } } \cs_set_protected:Npn \UseTaggingSocket #1 { \bool_if:NTF \l__tag_active_socket_bool - { \UseSocket{tagsupport/#1} } + { \socket_use:nw {tagsupport/#1} } { \int_case:nnF { \int_use:c { c__socket_tagsupport/#1_args_int } } { 0 \prg_do_nothing: 1 \use_none:n - 2 \use_none:nn + 2 \use_ii:nn + } + \ERRORusetaggingsocket + } + } + +\cs_set:Npn \UseExpandableTaggingSocket #1 + { + \bool_if:NTF \l__tag_active_socket_bool + { \socket_use_expandable:nw {tagsupport/#1} } + { + \int_case:nnF + { \int_use:c { c__socket_tagsupport/#1_args_int } } + { + 0 \prg_do_nothing: + 1 \use_none:n + 2 \use_ii:nn } \ERRORusetaggingsocket } @@ -3606,75 +3631,78 @@ firstkid .code:n = { \tl_set:Nn \l__tag_struct_addkid_tl {left} }, \tag_mc_end: } } -\socket_new:nn {tagsupport/para/begin}{0} -\socket_new:nn {tagsupport/para/end}{0} - -\socket_new_plug:nnn{tagsupport/para/begin}{plain} +\str_if_exist:cF { l__socket_tagsupport/para/begin_plug_str } { - \bool_if:NT \l__tag_para_bool + \socket_new:nn {tagsupport/para/begin}{0} + \socket_new:nn {tagsupport/para/end}{0} + + \socket_new_plug:nnn{tagsupport/para/begin}{plain} { - \bool_if:NF \l__tag_para_flattened_bool - { - \__tag_gincr_para_main_begin_int: - \tag_struct_begin:n + \bool_if:NT \l__tag_para_bool + { + \bool_if:NF \l__tag_para_flattened_bool { - tag=\l__tag_para_main_tag_tl, + \__tag_gincr_para_main_begin_int: + \tag_struct_begin:n + { + tag=\l__tag_para_main_tag_tl, + } + \__tag_para_main_store_struct: } - \__tag_para_main_store_struct: - } - \__tag_gincr_para_begin_int: - \tag_struct_begin:n {tag=\l__tag_para_tag_tl} - \__tag_check_para_begin_show:nn {green}{} - \tag_mc_begin:n {} + \__tag_gincr_para_begin_int: + \tag_struct_begin:n {tag=\l__tag_para_tag_tl} + \__tag_check_para_begin_show:nn {green}{} + \tag_mc_begin:n {} + } } - } -\socket_new_plug:nnn{tagsupport/para/begin}{block} - { - \bool_if:NT \l__tag_para_bool + \socket_new_plug:nnn{tagsupport/para/begin}{block} { - \legacy_if:nF { @inlabel } + \bool_if:NT \l__tag_para_bool { - \__tag_check_typeout_v:n - {==>~ @endpe = \legacy_if:nTF { @endpe }{true}{false} \on@line } - \legacy_if:nF { @endpe } - { - \bool_if:NF \l__tag_para_flattened_bool - { - \__tag_gincr_para_main_begin_int: - \tag_struct_begin:n - { - tag=\l__tag_para_main_tag_tl, - attribute-class=\l__tag_para_main_attr_class_tl, - } - \__tag_para_main_store_struct: + \legacy_if:nF { @inlabel } + { + \__tag_check_typeout_v:n + {==>~ @endpe = \legacy_if:nTF { @endpe }{true}{false} \on@line } + \legacy_if:nF { @endpe } + { + \bool_if:NF \l__tag_para_flattened_bool + { + \__tag_gincr_para_main_begin_int: + \tag_struct_begin:n + { + tag=\l__tag_para_main_tag_tl, + attribute-class=\l__tag_para_main_attr_class_tl, + } + \__tag_para_main_store_struct: + } } - } - \__tag_gincr_para_begin_int: - \__tag_check_typeout_v:n {==>~increment~ P \on@line } - \tag_struct_begin:n - { - tag=\l__tag_para_tag_tl - ,attribute-class=\l__tag_para_attr_class_tl - } - \__tag_check_para_begin_show:nn {green}{\PARALABEL} - \tag_mc_begin:n {} - } - } - } -\socket_new_plug:nnn{tagsupport/para/end}{plain} - { - \bool_if:NT \l__tag_para_bool + \__tag_gincr_para_begin_int: + \__tag_check_typeout_v:n {==>~increment~ P \on@line } + \tag_struct_begin:n + { + tag=\l__tag_para_tag_tl + ,attribute-class=\l__tag_para_attr_class_tl + } + \__tag_check_para_begin_show:nn {green}{\PARALABEL} + \tag_mc_begin:n {} + } + } + } + \socket_new_plug:nnn{tagsupport/para/end}{plain} { - \__tag_gincr_para_end_int: - \__tag_check_typeout_v:n {==>~increment~ /P \on@line } - \tag_mc_end: - \__tag_check_para_end_show:nn {red}{} - \tag_struct_end: - \bool_if:NF \l__tag_para_flattened_bool - { - \__tag_gincr_para_main_end_int: - \tag_struct_end: - } + \bool_if:NT \l__tag_para_bool + { + \__tag_gincr_para_end_int: + \__tag_check_typeout_v:n {==>~increment~ /P \on@line } + \tag_mc_end: + \__tag_check_para_end_show:nn {red}{} + \tag_struct_end: + \bool_if:NF \l__tag_para_flattened_bool + { + \__tag_gincr_para_main_end_int: + \tag_struct_end: + } + } } } \socket_assign_plug:nn { tagsupport/para/begin}{plain}