diff options
author | Karl Berry <karl@freefriends.org> | 2023-01-30 20:50:36 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-01-30 20:50:36 +0000 |
commit | 7ec937f5d9705e694ccc7f41806a5483c71848ed (patch) | |
tree | 9fce1a327e0a67ae29c32c18f2a85d9a8937fdad /Master/texmf-dist/tex | |
parent | 38280eae96de3dadef30422111c85a5781b710b7 (diff) |
tagpdf (30jan23)
git-svn-id: svn://tug.org/texlive/trunk@65691 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
17 files changed, 74 insertions, 52 deletions
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty index e33868b0b0d..0e7220b7d51 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty @@ -10,6 +10,7 @@ %% tagpdf-struct.dtx (with options: `base') %% tagpdf-checks.dtx (with options: `base') %% tagpdf-user.dtx (with options: `base') +%% tagpdf-roles.dtx (with options: `base') %% %% Copyright (C) 2019-2022 Ulrike Fischer %% @@ -24,7 +25,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf-base} {2023-01-24} {0.98b} +\ProvidesExplPackage {tagpdf-base} {2023-01-30} {0.98c} {part of tagpdf - provide base, no-op versions of the user commands } \AddToHook{begindocument} { @@ -107,6 +108,8 @@ } \newcommand\tagpdfparaOn {} \newcommand\tagpdfparaOff{} +%% File: tagpdf-roles.dtx +\prg_new_protected_conditional:Npnn \tag_check_child:nn #1 #2 {T,F,TF}{\prg_return_true:} %% %% %% End of file `tagpdf-base.sty'. diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty index 367a746c612..15df01d76e7 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty +++ b/Master/texmf-dist/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} {2023-01-24} {0.98b} +\ProvidesExplPackage {tagpdf-debug-generic} {2023-01-30} {0.98c} {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/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty index bac841f7404..fe27dc45683 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty +++ b/Master/texmf-dist/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} {2023-01-24} {0.98b} +\ProvidesExplPackage {tagpdf-debug} {2023-01-30} {0.98c} { debug code for tagpdf } \@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput} \prop_gput:Nnn \g_msg_module_type_prop { tag / debug} {} diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def index 021c829abb9..df0c825346c 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def +++ b/Master/texmf-dist/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} {2023-01-24} {0.98b} +\ProvidesExplFile {tagpdf-luatex.def} {2023-01-30} {0.98c} {tagpdf~driver~for~luatex} { \fontencoding{TU}\fontfamily{lmr}\fontseries{m}\fontshape{n}\fontsize{10pt}{10pt}\selectfont diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty index 254b5c1c7fa..8de786b494d 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty +++ b/Master/texmf-dist/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} {2023-01-24} {0.98b} +\ProvidesExplPackage {tagpdf-mc-code-generic} {2023-01-30} {0.98c} {part of tagpdf - code related to marking chunks - generic mode} \__tag_prop_new:N \g__tag_MCID_byabspage_prop diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty index e7ec855ee54..15a1a0d024b 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty +++ b/Master/texmf-dist/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} {2023-01-24} {0.98b} +\ProvidesExplPackage {tagpdf-mc-code-lua} {2023-01-30} {0.98c} {tagpdf - mc code only for the luamode } \hook_gput_code:nnn{begindocument}{tagpdf/mc} { diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def index c73e98afa38..1bcd546b017 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-book.def +++ b/Master/texmf-dist/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} {2023-01-24} {0.98b} +%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2023-01-30} {0.98c} %% {latex-book} {https://www.latex-project.org/ns/book/2022}{} chapter, H1,pdf2, section, H2,pdf2, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-inline.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-inline.def index 05f27502519..5323306b4e4 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-inline.def +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex-inline.def @@ -19,7 +19,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf-data.dtx -%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2023-01-24} {0.98b} +%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2023-01-30} {0.98c} %% {latex-inline} {https://www.latex-project.org/ns/inline/2022}{} chapter, Span, pdf2, section, Span, pdf2, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def index b6275cd847d..aa90f54f130 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-latex.def +++ b/Master/texmf-dist/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} {2023-01-24} {0.98b} +%% \ProvidesExplFile {tagpdf-ns-latex.def} {2023-01-30} {0.98c} %% {latex} {https://www.latex-project.org/ns/dflt/2022}{} title, Title, pdf2, part, Title, pdf2, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def index a3e97ada0ba..f9404e71730 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-mathml.def +++ b/Master/texmf-dist/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} {2023-01-24} {0.98b} +%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2023-01-30} {0.98c} abs,,, and,,, annotation,,, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def index b6bb6391cbe..2cfe3a9c4e9 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf.def +++ b/Master/texmf-dist/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} {2023-01-24} {0.98b} +%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2023-01-30} {0.98c} %% {pdf} {http://iso.org/pdf/ssn}{} StructTreeRoot,StructTreeRoot,pdf,D, Document,Document,pdf,D, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def index 6c2c31df27c..d89a25be779 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-ns-pdf2.def +++ b/Master/texmf-dist/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} {2023-01-24} {0.98b} +%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2023-01-30} {0.98c} %% {pdf2} {http://iso.org/pdf2/ssn}{} Document,Document,pdf2,D, Part,Part,pdf2,G, diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv index 96faf168ae9..e29387bfefc 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child-2.csv +++ b/Master/texmf-dist/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} {2023-01-24} {0.98b} +%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2023-01-30} {0.98c} ,,,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/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv index cd41098083d..fac6a9312d5 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-parent-child.csv +++ b/Master/texmf-dist/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} {2023-01-24} {0.98b} +%% \ProvidesExplFile {tagpdf-parent-child.csv} {2023-01-30} {0.98c} ,,,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/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua index b4accfdb906..d2ee6479afb 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua @@ -24,8 +24,8 @@ local ProvidesLuaModule = { name = "tagpdf", - version = "0.98b", --TAGVERSION - date = "2023-01-24", --TAGDATE + version = "0.98c", --TAGVERSION + date = "2023-01-30", --TAGDATE description = "tagpdf lua code", license = "The LATEX Project Public License 1.3c" } diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty index 8591ee5f978..38f35c6b2df 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty @@ -28,7 +28,7 @@ %% and all files in that bundle must be distributed together. %% %% File: tagpdf.dtx -\ProvidesExplPackage {tagpdf} {2023-01-24} {0.98b} +\ProvidesExplPackage {tagpdf} {2023-01-30} {0.98c} { A package to experiment with pdf tagging } \bool_if:nF @@ -1709,6 +1709,22 @@ } \cs_generate_variant:Nn\__tag_check_parent_child:nnN {VVN} \cs_generate_variant:Nn\__tag_check_parent_child:nnnnN {VVVVN,nVnVN,VVnnN} +\prg_set_protected_conditional:Npnn \tag_check_child:nn #1 #2 {T,F,TF} + { + \seq_get:NN\g__tag_struct_stack_seq\l__tag_tmpa_tl + \__tag_struct_get_tag_info:eNN + {\l__tag_tmpa_tl} + \l__tag_get_parent_tmpa_tl + \l__tag_get_parent_tmpb_tl + \__tag_check_parent_child:VVnnN + \l__tag_get_parent_tmpa_tl + \l__tag_get_parent_tmpb_tl + {#1}{#2} + \l__tag_parent_child_check_tl + \int_compare:nNnTF { \l__tag_parent_child_check_tl } < {0} + {\prg_return_false:} + {\prg_return_true:} + } \tl_new:N \l__tag_role_remap_tag_tl \tl_new:N \l__tag_role_remap_NS_tl \cs_new_protected:Npn \__tag_role_remap: { } @@ -2626,7 +2642,7 @@ { attribute-class .code:n = { - \clist_set:No \l__tag_tmpa_clist { #1 } + \clist_set:Nx \l__tag_tmpa_clist { #1 } \seq_set_from_clist:NN \l__tag_tmpb_seq \l__tag_tmpa_clist \seq_set_map_x:NNn \l__tag_tmpa_seq \l__tag_tmpb_seq { @@ -2660,47 +2676,50 @@ { attribute .code:n = % A property (attribute, value currently a dictionary) { - \clist_set:No \l__tag_tmpa_clist { #1 } - \seq_set_from_clist:NN \l__tag_tmpb_seq \l__tag_tmpa_clist - \seq_set_map_x:NNn \l__tag_tmpa_seq \l__tag_tmpb_seq + \clist_set:Nx \l__tag_tmpa_clist { #1 } + \clist_if_empty:NF \l__tag_tmpa_clist { - \pdf_name_from_unicode_e:n {##1} - } - \tl_set:Nx \l__tag_attr_value_tl - { - \int_compare:nT { \seq_count:N \l__tag_tmpa_seq > 1 }{[}%] - } - \seq_map_inline:Nn \l__tag_tmpa_seq - { - \prop_if_in:NnF \g__tag_attr_entries_prop {##1} + \seq_set_from_clist:NN \l__tag_tmpb_seq \l__tag_tmpa_clist + \seq_set_map_x:NNn \l__tag_tmpa_seq \l__tag_tmpb_seq + { + \pdf_name_from_unicode_e:n {##1} + } + \tl_set:Nx \l__tag_attr_value_tl { - \msg_error:nnn { tag } { attr-unknown } { ##1 } + \int_compare:nT { \seq_count:N \l__tag_tmpa_seq > 1 }{[}%] } - \prop_if_in:NnF \g__tag_attr_objref_prop {##1} - {%\prop_show:N \g__tag_attr_entries_prop - \pdf_object_unnamed_write:nx - { dict } + \seq_map_inline:Nn \l__tag_tmpa_seq + { + \prop_if_in:NnF \g__tag_attr_entries_prop {##1} { - \prop_item:Nn\g__tag_attr_entries_prop {##1} + \msg_error:nnn { tag } { attr-unknown } { ##1 } } - \prop_gput:Nnx \g__tag_attr_objref_prop {##1} {\pdf_object_ref_last:} + \prop_if_in:NnF \g__tag_attr_objref_prop {##1} + {%\prop_show:N \g__tag_attr_entries_prop + \pdf_object_unnamed_write:nx + { dict } + { + \prop_item:Nn\g__tag_attr_entries_prop {##1} + } + \prop_gput:Nnx \g__tag_attr_objref_prop {##1} {\pdf_object_ref_last:} + } + \tl_put_right:Nx \l__tag_attr_value_tl + { + \c_space_tl + \prop_item:Nn \g__tag_attr_objref_prop {##1} + } + % \tl_show:N \l__tag_attr_value_tl } \tl_put_right:Nx \l__tag_attr_value_tl - { - \c_space_tl - \prop_item:Nn \g__tag_attr_objref_prop {##1} + { %[ + \int_compare:nT { \seq_count:N \l__tag_tmpa_seq > 1 }{]}% } - % \tl_show:N \l__tag_attr_value_tl - } - \tl_put_right:Nx \l__tag_attr_value_tl - { %[ - \int_compare:nT { \seq_count:N \l__tag_tmpa_seq > 1 }{]}% - } - % \tl_show:N \l__tag_attr_value_tl - \__tag_prop_gput:cnx - { g__tag_struct_\int_eval:n {\c@g__tag_struct_abs_int}_prop } - { A } - { \l__tag_attr_value_tl } + % \tl_show:N \l__tag_attr_value_tl + \__tag_prop_gput:cnx + { g__tag_struct_\int_eval:n {\c@g__tag_struct_abs_int}_prop } + { A } + { \l__tag_attr_value_tl } + } }, } %% File: tagpdf-space.dtx diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty index 3ad0e3de746..dc1c94b9114 100644 --- a/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty +++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty @@ -1,5 +1,5 @@ %\RequirePackage[enable-debug]{expl3}[2018/06/14] -\ProvidesExplPackage {tagpdfdocu-patches} {2023-01-24} {0.98b} +\ProvidesExplPackage {tagpdfdocu-patches} {2023-01-30} {0.98c} {patches/commands for the tagpdf documentation} \RequirePackage{etoolbox,xpatch} |