diff options
author | Karl Berry <karl@freefriends.org> | 2023-01-25 20:45:01 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2023-01-25 20:45:01 +0000 |
commit | 6dc17034e79eb06b9fc362217b91a449f726eda2 (patch) | |
tree | 1bc0bc9791d9c8e48cfde33718aa440a5459ec95 /Master/texmf-dist/source/latex | |
parent | 11589eaad9c7f5595a7e35b3f5df4d33f6923a16 (diff) |
tagpdf (25jan23)
git-svn-id: svn://tug.org/texlive/trunk@65629 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
12 files changed, 160 insertions, 46 deletions
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx index e8fac1f6ecf..0028f723970 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx @@ -47,13 +47,13 @@ % }^^A % } % -% \date{Version 0.98a, released 2022-12-22} +% \date{Version 0.98b, released 2023-01-24} % \maketitle % \begin{implementation} % \begin{macrocode} %<@@=tag> %<*luatex> -\ProvidesExplFile {tagpdf-luatex.def} {2022-12-22} {0.98a} +\ProvidesExplFile {tagpdf-luatex.def} {2023-01-24} {0.98b} {tagpdf~driver~for~luatex} % \end{macrocode} % \section{Loading the lua} @@ -158,8 +158,8 @@ local ProvidesLuaModule = { name = "tagpdf", - version = "0.98a", --TAGVERSION - date = "2022-12-22", --TAGDATE + version = "0.98b", --TAGVERSION + date = "2023-01-24", --TAGDATE description = "tagpdf lua code", license = "The LATEX Project Public License 1.3c" } diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx index 6ec0e6aadc9..fae3e853d3a 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx @@ -48,7 +48,7 @@ % }^^A % } % -% \date{Version 0.98a, released 2022-12-22} +% \date{Version 0.98b, released 2023-01-24} % \maketitle % \begin{documentation} % \section{Commands} @@ -63,7 +63,7 @@ % This is a generic command to retrieve data for the current structure or % mc-chunk. Currently % the only sensible values for the argument \meta{keyword} -% are |mc_tag| and |struct_tag| and |struct_num|. +% are |mc_tag|, |struct_tag|, |struct_id| and |struct_num|. % \end{function} % % \section{Description of log messages} @@ -295,7 +295,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-checks-code} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-checks-code} {2023-01-24} {0.98b} {part of tagpdf - code related to checks, conditionals, debugging and messages} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx index 379c2114d76..93bf80667bc 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-data.dtx @@ -47,7 +47,7 @@ % }^^A % } % -% \date{Version 0.98a, released 2022-12-22} +% \date{Version 0.98b, released 2023-01-24} % \maketitle % \begin{documentation} % This files contains a various data files which are read in @@ -60,7 +60,7 @@ % It lists the new tag, the rolemap and the namespace of the rolemap. % \begin{macrocode} %<*ns-latex> -%% \ProvidesExplFile {tagpdf-ns-latex.def} {2022-12-22} {0.98a} +%% \ProvidesExplFile {tagpdf-ns-latex.def} {2023-01-24} {0.98b} %% {latex} {https://www.latex-project.org/ns/dflt/2022}{} title, Title, pdf2, part, Title, pdf2, @@ -86,7 +86,7 @@ footnotelabel,Lbl, pdf2, % It is bound to change % \begin{macrocode} %<*ns-latex-book> -%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2022-12-22} {0.98a} +%% \ProvidesExplFile {tagpdf-ns-latex-book.def} {2023-01-24} {0.98b} %% {latex-book} {https://www.latex-project.org/ns/book/2022}{} chapter, H1,pdf2, section, H2,pdf2, @@ -102,7 +102,7 @@ subparagraph, H6,pdf2, % It is bound to change a lot! % \begin{macrocode} %<*ns-latex-inline> -%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2022-12-22} {0.98a} +%% \ProvidesExplFile {tagpdf-ns-latex-inline.def} {2023-01-24} {0.98b} %% {latex-inline} {https://www.latex-project.org/ns/inline/2022}{} chapter, Span, pdf2, section, Span, pdf2, @@ -116,7 +116,7 @@ P, Span, pdf2, % \section{The pdf namespace data} % \begin{macrocode} %<*ns-pdf> -%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2022-12-22} {0.98a} +%% \ProvidesExplFile {tagpdf-ns-pdf.def} {2023-01-24} {0.98b} %% {pdf} {http://iso.org/pdf/ssn}{} StructTreeRoot,StructTreeRoot,pdf,D, Document,Document,pdf,D, @@ -184,7 +184,7 @@ Strong,Span,pdf,I, % \section{The pdf 2.0 namespace data} % \begin{macrocode} %<*ns-pdf2> -%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2022-12-22} {0.98a} +%% \ProvidesExplFile {tagpdf-ns-pdf2.def} {2023-01-24} {0.98b} %% {pdf2} {http://iso.org/pdf2/ssn}{} Document,Document,pdf2,D, Part,Part,pdf2,G, @@ -240,7 +240,7 @@ Strong,Strong,pdf2,I, % \section{The mathml namespace data} % \begin{macrocode} %<*ns-mathml> -%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2022-12-22} {0.98a} +%% \ProvidesExplFile {tagpdf-ns-mathml.def} {2023-01-24} {0.98b} % {mathml}{http://www.w3.org/1998/Math/MathML}{} abs,,, and,,, @@ -475,7 +475,7 @@ xor,,, % This will perhaps change in future. % \begin{macrocode} %<*parent-child> -%% \ProvidesExplFile {tagpdf-parent-child.csv} {2022-12-22} {0.98a} +%% \ProvidesExplFile {tagpdf-parent-child.csv} {2023-01-24} {0.98b} ,,,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,∅,∅ @@ -530,7 +530,7 @@ MC,both,---,∅,∅,∅,∅,∅,∅,0..n,‡,∅,∅,∅,0..n,0..n,0..n,0..n,0.. % This will perhaps change in future. % \begin{macrocode} %<*parent-child-2> -%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2022-12-22} {0.98a} +%% \ProvidesExplFile {tagpdf-parent-child-2.csv} {2023-01-24} {0.98b} ,,,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/source/latex/tagpdf/tagpdf-mc-generic.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx index 573604fa874..fd3409c73bb 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98a, released 2022-12-22} +% \date{Version 0.98b, released 2023-01-24} % \maketitle % \begin{documentation} % \end{documentation} @@ -55,11 +55,11 @@ % \begin{macrocode} %<@@=tag> %<*generic> -\ProvidesExplPackage {tagpdf-mc-code-generic} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-mc-code-generic} {2023-01-24} {0.98b} {part of tagpdf - code related to marking chunks - generic mode} %</generic> %<*debug> -\ProvidesExplPackage {tagpdf-debug-generic} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-debug-generic} {2023-01-24} {0.98b} {part of tagpdf - debugging code related to marking chunks - generic mode} %</debug> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx index 6195218abf3..de5fe42739f 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98a, released 2022-12-22} +% \date{Version 0.98b, released 2023-01-24} % \maketitle % \begin{implementation} % The code is splitted into three parts: code shared by all engines, @@ -86,7 +86,7 @@ % \begin{macrocode} %<@@=tag> %<*luamode> -\ProvidesExplPackage {tagpdf-mc-code-lua} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-mc-code-lua} {2023-01-24} {0.98b} {tagpdf - mc code only for the luamode } %</luamode> % \end{macrocode} @@ -165,7 +165,7 @@ = {\lua_now:e { - tex.print(tex.getattribute(luatexbase.attributes.g__tag_mc_type_attr)) + tex.print(\int_use:N \c_document_cctab,tex.getattribute(luatexbase.attributes.g__tag_mc_type_attr)) } } { \prg_return_false: } diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx index 66ad8a922ce..e693242d1b0 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98a, released 2022-12-22} +% \date{Version 0.98b, released 2023-01-24} % \maketitle % \begin{documentation} % \section{Public Commands} @@ -174,7 +174,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-mc-code-shared} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-mc-code-shared} {2023-01-24} {0.98b} {part of tagpdf - code related to marking chunks - code shared by generic and luamode } %</header> diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx index d24fae960e3..60ba8572948 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98a, released 2022-12-22} +% \date{Version 0.98b, released 2023-01-24} % \maketitle % \begin{documentation} % \begin{function} @@ -90,7 +90,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-roles-code} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-roles-code} {2023-01-24} {0.98b} {part of tagpdf - code related to roles and structure names} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx index 26602a96b01..f450520a481 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98a, released 2022-12-22} +% \date{Version 0.98b, released 2023-01-24} % \maketitle % \begin{documentation} % \begin{function}{interwordspace (setup-key)} @@ -64,7 +64,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-space-code} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-space-code} {2023-01-24} {0.98b} {part of tagpdf - code related to real space chars} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx index 1299cc10e99..2e83d512806 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98a, released 2022-12-22} +% \date{Version 0.98b, released 2023-01-24} % \maketitle % \begin{documentation} % \section{Public Commands} @@ -242,7 +242,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-struct-code} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-struct-code} {2023-01-24} {0.98b} {part of tagpdf - code related to storing structure} %</header> % \end{macrocode} @@ -507,6 +507,24 @@ % \end{macrocode} % \end{variable} % +% \subsection{Adding the /ID key} +% Every structure gets automatically an ID which is currently +% simply calculated from the structure number. +% \begin{macro}{\@@_struct_get_id:n} +% \begin{macrocode} +\cs_new:Npn \@@_struct_get_id:n #1 %#1=struct num + { + ( + ID. + \prg_replicate:nn + { \int_abs:n{\g_@@_tree_id_pad_int - \tl_count:e { \int_to_arabic:n { #1 } }} } + { 0 } + \int_to_arabic:n { #1 } + ) + } +% \end{macrocode} +% \end{macro} +% % \subsection{Filling in the tag info} % \begin{macro}{\@@_struct_set_tag_info:nnn } @@ -808,7 +826,8 @@ { @@/struct/#1 } {dict} { - \l_@@_tmpa_tl + \l_@@_tmpa_tl\c_space_tl + /ID~\@@_struct_get_id:n{#1} } } { @@ -884,7 +903,7 @@ % % \begin{macro}{\@@_get_data_struct_tag:} % this command allows \cs{tag_get:n} to get the current -% structure tag with the keyword |struct_tag|. We will need to handle nesting +% structure tag with the keyword |struct_tag|. % \begin{macrocode} \cs_new:Npn \@@_get_data_struct_tag: { @@ -894,6 +913,17 @@ \prop_item:cn {g_@@_struct_\g_@@_struct_stack_current_tl _prop}{S} } } +% \end{macrocode} +% \end{macro} +% +% \begin{macro}{\@@_get_data_struct_id:} +% this command allows \cs{tag_get:n} to get the current +% structure id with the keyword |struct_id|. +% \begin{macrocode} +\cs_new:Npn \@@_get_data_struct_id: + { + \@@_struct_get_id:n {\g_@@_struct_stack_current_tl} + } %</package> % \end{macrocode} % \end{macro} @@ -1480,7 +1510,7 @@ % \section{Attributes and attribute classes} % \begin{macrocode} %<*header> -\ProvidesExplPackage {tagpdf-attr-code} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-attr-code} {2023-01-24} {0.98b} {part of tagpdf - code related to attributes and attribute classes} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx index f8c7aa27d75..2a02a7c5df8 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx @@ -47,13 +47,13 @@ % }^^A % } % -% \date{Version 0.98a, released 2022-12-22} +% \date{Version 0.98b, released 2023-01-24} % \maketitle % \begin{implementation} % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-tree-code} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-tree-code} {2023-01-24} {0.98b} {part of tagpdf - code related to writing trees and dictionaries to the pdf} %</header> % \end{macrocode} @@ -119,6 +119,73 @@ } % \end{macrocode} % +% \subsection{Writing the IDtree} +% +% The ID are currently quite simple: every structure has an ID build from +% the prefix ID together with the structure number padded with enough zeros to +% that we get directly an lexical order. We ship them out in bundles +% At first a seq to hold the references for the kids +% \begin{variable}{\g_@@_tree_id_pad_int} +% \begin{macrocode} +\int_new:N\g_@@_tree_id_pad_int +% \end{macrocode} +% \end{variable} +% Now we get the needed padding +% \begin{macrocode} +\cs_generate_variant:Nn \tl_count:n {e} +\hook_gput_code:nnn{begindocument}{tagpdf} + { + \int_gset:Nn\g_@@_tree_id_pad_int + {\tl_count:e { \@@_ref_value_lastpage:nn{tagstruct}{1000}}+1} + } + +% \end{macrocode} +% This is the main code to write the tree it basically splits the +% existing structure numbers in chunks of length 50 +% TODO consider is 50 is a good length. +% \begin{macrocode} +\cs_new_protected:Npn \@@_tree_write_idtree: + { + \tl_clear:N \l_@@_tmpa_tl + \tl_clear:N \l_@@_tmpb_tl + \int_zero:N \l_@@_tmpa_int + \int_step_inline:nn {\c@g_@@_struct_abs_int} + { + \int_incr:N\l_@@_tmpa_int + \tl_put_right:Nx \l_@@_tmpa_tl + { + \@@_struct_get_id:n{##1}~\pdf_object_ref:n{@@/struct/##1}~ + } + \int_compare:nNnF {\l_@@_tmpa_int}<{50} % + { + \pdf_object_unnamed_write:nx {dict} + { /Limits~[\@@_struct_get_id:n{##1-\l_@@_tmpa_int+1}~\@@_struct_get_id:n{##1}] + /Names~[\l_@@_tmpa_tl] + } + \tl_put_right:Nx\l_@@_tmpb_tl {\pdf_object_ref_last:\c_space_tl} + \int_zero:N \l_@@_tmpa_int + \tl_clear:N \l_@@_tmpa_tl + } + } + \tl_if_empty:NF \l_@@_tmpa_tl + { + \pdf_object_unnamed_write:nx {dict} + { + /Limits~ + [\@@_struct_get_id:n{\c@g_@@_struct_abs_int-\l_@@_tmpa_int+1}~ + \@@_struct_get_id:n{\c@g_@@_struct_abs_int}] + /Names~[\l_@@_tmpa_tl] + } + \tl_put_right:Nx\l_@@_tmpb_tl {\pdf_object_ref_last:} + } + \pdf_object_unnamed_write:nx {dict}{/Kids~[\l_@@_tmpb_tl]} + \@@_prop_gput:cnx + { g_@@_struct_0_prop } + { IDTree } + { \pdf_object_ref_last: } + } +% \end{macrocode} +% % \subsection{Writing structure elements} % The following commands are needed to write out the structure. % \begin{macro}{\@@_tree_write_structtreeroot:} @@ -135,8 +202,15 @@ \@@_prop_gput:cnx { g_@@_struct_0_prop } { RoleMap } - { \pdf_object_ref:n { @@/tree/rolemap } } - \@@_struct_write_obj:n { 0 } + { \pdf_object_ref:n { @@/tree/rolemap } } + \@@_struct_fill_kid_key:n { 0 } + \@@_struct_get_dict_content:nN { 0 } \l_@@_tmpa_tl + \pdf_object_write:nnx + { @@/struct/0 } + {dict} + { + \l_@@_tmpa_tl + } } } % \end{macrocode} @@ -149,7 +223,14 @@ { g_@@_struct_0_prop } { ParentTree } { \pdf_object_ref:n { @@/tree/parenttree } } - \@@_struct_write_obj:n { 0 } + \@@_struct_fill_kid_key:n { 0 } + \@@_struct_get_dict_content:nN { 0 } \l_@@_tmpa_tl + \pdf_object_write:nnx + { @@/struct/0 } + {dict} + { + \l_@@_tmpa_tl + } } } % \end{macrocode} @@ -459,6 +540,7 @@ \hook_use:n {tagpdf/finish/before} \@@_tree_final_checks: \@@_tree_write_parenttree: + \@@_tree_write_idtree: \@@_tree_write_rolemap: \@@_tree_write_classmap: \@@_tree_write_namespaces: diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx index a2a0475ccf1..309b62a6c1f 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx @@ -46,7 +46,7 @@ % }^^A % } % -% \date{Version 0.98a, released 2022-12-22} +% \date{Version 0.98b, released 2023-01-24} % \maketitle % \begin{documentation} % \section{Setup commands} @@ -246,7 +246,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-user} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-user} {2023-01-24} {0.98b} {tagpdf - user commands} %</header> % \end{macrocode} @@ -639,6 +639,7 @@ % \begin{macrocode} \AddToHook{begindocument/before} { + \@ifundefined{@mult@ptagging@hook}{\RequirePackage{output-patches-tmp-ltx}}{} % \bool_if:NF \g_@@_mode_lua_bool { \cs_if_exist:NT \@kernel@before@footins diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx index 59795d78a39..c264123ebc7 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx @@ -34,7 +34,7 @@ % \end{function} % % \begin{function}{ \tag_stop_group_begin:, \tag_stop_group_end:, -% \tag_stop:, \tag_start:, \tag_stop:n, \tag_start:n } +% \tag_stop:, \tag_start: } % We need commands to stop tagging in some places. % There simply switches the two local booleans. The grouping commands % can be used to group the effect. @@ -92,7 +92,7 @@ % \begin{macrocode} %<@@=tag> %<*package> -\ProvidesExplPackage {tagpdf} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf} {2023-01-24} {0.98b} { A package to experiment with pdf tagging } \bool_if:nF @@ -118,7 +118,7 @@ % \end{macrocode} %<*debug> % \begin{macrocode} -\ProvidesExplPackage {tagpdf-debug} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-debug} {2023-01-24} {0.98b} { debug code for tagpdf } \@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput} % \end{macrocode} @@ -159,7 +159,7 @@ % \end{macrocode} % \begin{macrocode} %<*base> -\ProvidesExplPackage {tagpdf-base} {2022-12-22} {0.98a} +\ProvidesExplPackage {tagpdf-base} {2023-01-24} {0.98b} {part of tagpdf - provide base, no-op versions of the user commands } %</base> % \end{macrocode} @@ -197,6 +197,7 @@ { {abspage} { \int_use:N \g_shipout_readonly_int} {tagmcabs}{ \int_use:N \c@g_@@_MCID_abs_int } + {tagstruct}{\int_use:N \c@g_@@_struct_abs_int } } } } @@ -518,8 +519,8 @@ %<*base> \cs_new_protected:Npn \tag_stop:{} \cs_new_protected:Npn \tag_start:{} -\cs_new_protected:Npn \tag_stop:n{} -\cs_new_protected:Npn \tag_start:n{} +\cs_new_protected:Npn \tag_stop:n #1 {} +\cs_new_protected:Npn \tag_start:n #1 {} %</base> % \end{macrocode} % \end{macro} |