diff options
author | Karl Berry <karl@freefriends.org> | 2022-05-11 19:52:50 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-05-11 19:52:50 +0000 |
commit | 553e9726f51a42d6c41518390dad709caa19c9ca (patch) | |
tree | d1571f7d2a8896af998d50095d4bf24010379737 /Master/texmf-dist/source/latex | |
parent | e86d22fd7e27d2b130b3265fd12994e6f5c92d25 (diff) |
tagpdf (11may22)
git-svn-id: svn://tug.org/texlive/trunk@63282 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
12 files changed, 129 insertions, 108 deletions
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx index dcf7afb8234..17fd4407921 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx @@ -23,11 +23,7 @@ % for those people who are interested. % %<*driver> -\RequirePackage{pdfmanagement-testphase} -\DeclareDocumentMetadata{} -\makeatletter -\declare@file@substitution{doc.sty}{doc-v3beta.sty} -\makeatother +\DocumentMetadata{} \documentclass{l3doc} \usepackage{array,booktabs,caption} \hypersetup{pdfauthor=Ulrike Fischer, @@ -51,13 +47,13 @@ % }^^A % } % -% \date{Version 0.93, released 2022-01-13} +% \date{Version 0.94, released 2022-05-11} % \maketitle % \begin{implementation} % \begin{macrocode} %<@@=tag> %<*luatex> -\ProvidesExplFile {tagpdf-luatex.def} {2022-01-13} {0.93} +\ProvidesExplFile {tagpdf-luatex.def} {2022-05-11} {0.94} {tagpdf~driver~for~luatex} % \end{macrocode} % \section{Loading the lua} @@ -161,8 +157,8 @@ local ProvidesLuaModule = { name = "tagpdf", - version = "0.93", --TAGVERSION - date = "2022-01-13", --TAGDATE + version = "0.94", --TAGVERSION + date = "2022-05-11", --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 53f97383f88..add77ce81f7 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx @@ -24,11 +24,7 @@ % % %<*driver> -\RequirePackage{pdfmanagement-testphase} -\DeclareDocumentMetadata{} -\makeatletter -\declare@file@substitution{doc.sty}{doc-v3beta.sty} -\makeatother +\DocumentMetadata{} \documentclass{l3doc} \usepackage{array,booktabs,caption} \hypersetup{pdfauthor=Ulrike Fischer, @@ -52,7 +48,7 @@ % }^^A % } % -% \date{Version 0.93, released 2022-01-13} +% \date{Version 0.94, released 2022-05-11} % \maketitle % \begin{documentation} % \section{Commands} @@ -298,7 +294,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-checks-code} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf-checks-code} {2022-05-11} {0.94} {part of tagpdf - code related to checks, conditionals, debugging and messages} %</header> % \end{macrocode} @@ -468,6 +464,7 @@ % the only sensible values for the argument are |mc_tag| and |struct_tag|. % \begin{macrocode} \cs_new:Npn \tag_get:n #1 { \use:c {@@_get_data_#1: } } +%</package> % \end{macrocode} % \end{macro} % @@ -478,7 +475,12 @@ % The test is true if all booleans, the global and the two local one are true. % % \begin{macrocode} +%<*base> \prg_new_conditional:Npnn \tag_if_active: { p , T , TF, F } + { \prg_return_false: } +%</base> +%<*package> +\prg_set_conditional:Npnn \tag_if_active: { p , T , TF, F } { \bool_lazy_all:nTF { @@ -528,7 +530,7 @@ } % \end{macrocode} % \end{macro} -% \subsection{Checks related to stuctures} +% \subsection{Checks related to structures} % \begin{macro}{\@@_check_structure_has_tag:n} % Structures must have a tag, so we check if the S entry is in the property. % It is an error if this is missing. The argument is a number. 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 994e3b0b851..e0713b61d63 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: tagpdf-mc.dtx +%% File: tagpdf-mc-generic.dtx % % Copyright (C) 2019-2022 Ulrike Fischer % @@ -22,11 +22,7 @@ % % for those people who are interested. %<*driver> -\RequirePackage{pdfmanagement-testphase} -\DeclareDocumentMetadata{} -\makeatletter -\declare@file@substitution{doc.sty}{doc-v3beta.sty} -\makeatother +\DocumentMetadata{} \documentclass{l3doc} \usepackage{array,booktabs,caption} \hypersetup{pdfauthor=Ulrike Fischer, @@ -50,7 +46,7 @@ % }^^A % } % -% \date{Version 0.93, released 2022-01-13} +% \date{Version 0.94, released 2022-05-11} % \maketitle % \begin{documentation} % \end{documentation} @@ -59,11 +55,11 @@ % \begin{macrocode} %<@@=tag> %<*generic> -\ProvidesExplPackage {tagpdf-mc-code-generic} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf-mc-code-generic} {2022-05-11} {0.94} {part of tagpdf - code related to marking chunks - generic mode} %</generic> %<*debug> -\ProvidesExplPackage {tagpdf-debug-generic} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf-debug-generic} {2022-05-11} {0.94} {part of tagpdf - debugging code related to marking chunks - generic mode} %</debug> % \end{macrocode} @@ -668,9 +664,11 @@ % the state is passed to the end command through a global var and % a global boolean. % \begin{macrocode} +%<base>\cs_new_protected:Npn \tag_mc_begin:n #1 {} +%<base>\cs_new_protected:Nn \tag_mc_end:{} %<*generic|debug> %<*generic> -\cs_new_protected:Npn \tag_mc_begin:n #1 %#1 keyval +\cs_set_protected:Npn \tag_mc_begin:n #1 %#1 keyval { \@@_check_if_active_mc:T { @@ -717,7 +715,7 @@ %</debug> } %<*generic> -\cs_new_protected:Nn \tag_mc_end: +\cs_set_protected:Nn \tag_mc_end: { \@@_check_if_active_mc:T { 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 d8dba57fd1b..af6dbd1b395 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: tagpdf-mc.dtx +%% File: tagpdf-mc-luacode.dtx % % Copyright (C) 2019-2022 Ulrike Fischer % @@ -22,11 +22,7 @@ % % for those people who are interested. %<*driver> -\RequirePackage{pdfmanagement-testphase} -\DeclareDocumentMetadata{} -\makeatletter -\declare@file@substitution{doc.sty}{doc-v3beta.sty} -\makeatother +\DocumentMetadata{} \documentclass{l3doc} \usepackage{array,booktabs,caption} \hypersetup{pdfauthor=Ulrike Fischer, @@ -50,7 +46,7 @@ % }^^A % } % -% \date{Version 0.93, released 2022-01-13} +% \date{Version 0.94, released 2022-05-11} % \maketitle % \begin{implementation} % The code is splitted into three parts: code shared by all engines, @@ -90,7 +86,7 @@ % \begin{macrocode} %<@@=tag> %<*luamode> -\ProvidesExplPackage {tagpdf-mc-code-lua} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf-mc-code-lua} {2022-05-11} {0.94} {tagpdf - mc code only for the luamode } %</luamode> % \end{macrocode} @@ -294,7 +290,7 @@ % We currently don't check if there is nesting as it doesn't matter so % much in lua. % \begin{macrocode} -\cs_new_protected:Nn \tag_mc_begin:n +\cs_set_protected:Nn \tag_mc_begin:n { \@@_check_if_active_mc:T { @@ -331,7 +327,7 @@ % % TODO: check how the use command must be guarded. % \begin{macrocode} -\cs_new_protected:Nn \tag_mc_end: +\cs_set_protected:Nn \tag_mc_end: { \@@_check_if_active_mc:T { 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 852f1d0846f..bbf8b3f7205 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx @@ -1,6 +1,6 @@ % \iffalse meta-comment % -%% File: tagpdf-mc.dtx +%% File: tagpdf-mc-shared.dtx % % Copyright (C) 2019-2022 Ulrike Fischer % @@ -22,11 +22,7 @@ % % for those people who are interested. %<*driver> -\RequirePackage{pdfmanagement-testphase} -\DeclareDocumentMetadata{} -\makeatletter -\declare@file@substitution{doc.sty}{doc-v3beta.sty} -\makeatother +\DocumentMetadata{} \documentclass{l3doc} \usepackage{array,booktabs,caption} \hypersetup{pdfauthor=Ulrike Fischer, @@ -50,7 +46,7 @@ % }^^A % } % -% \date{Version 0.93, released 2022-01-13} +% \date{Version 0.94, released 2022-05-11} % \maketitle % \begin{documentation} % \section{Public Commands} @@ -178,7 +174,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-mc-code-shared} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf-mc-code-shared} {2022-05-11} {0.94} {part of tagpdf - code related to marking chunks - code shared by generic and luamode } %</header> @@ -300,6 +296,7 @@ { \tl_new:c { g_@@_mc_label_\tl_to_str:n{#1}_used_tl } } +%</shared> % \end{macrocode} % % \end{macro} @@ -311,7 +308,9 @@ % % TODO: is testing for struct the right test? % \begin{macrocode} -\cs_new_protected:Npn \tag_mc_use:n #1 %#1: label name +%<base>\cs_new_protected:Npn \tag_mc_use:n #1 {} +%<*shared> +\cs_set_protected:Npn \tag_mc_use:n #1 %#1: label name { \@@_check_if_active_struct:T { @@ -332,6 +331,7 @@ } } } +%</shared> % \end{macrocode} % \end{macro} % \begin{macro} @@ -343,26 +343,33 @@ % and then stops all tagging. It creates a group. % It pushes and pops mc-chunks at the begin and end. % \begin{macrocode} -\cs_new_protected:Npn \tag_mc_artifact_group_begin:n #1 +%<base>\cs_new_protected:Npn \tag_mc_artifact_group_begin:n #1 {} +%<base>\cs_new_protected:Npn \tag_mc_artifact_group_end:{} +%<*shared> +\cs_set_protected:Npn \tag_mc_artifact_group_begin:n #1 { \tag_mc_end_push: \tag_mc_begin:n {artifact=#1} \tag_stop_group_begin: } -\cs_new_protected:Npn \tag_mc_artifact_group_end: +\cs_set_protected:Npn \tag_mc_artifact_group_end: { \tag_stop_group_end: \tag_mc_end: \tag_mc_begin_pop:n{} } +%</shared> % \end{macrocode} % \end{macro} % % \begin{macro}{\tag_mc_end_push:, \tag_mc_begin_pop:n} % % \begin{macrocode} -\cs_new_protected:Npn \tag_mc_end_push: +%<base>\cs_new_protected:Npn \tag_mc_end_push: {} +%<base>\cs_new_protected:Npn \tag_mc_begin_pop:n #1 {} +%<*shared> +\cs_set_protected:Npn \tag_mc_end_push: { \@@_check_if_active_mc:T { @@ -381,7 +388,7 @@ } } -\cs_new_protected:Npn \tag_mc_begin_pop:n #1 +\cs_set_protected:Npn \tag_mc_begin_pop:n #1 { \@@_check_if_active_mc:T { diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx index f8b0589bb5f..5fa36ce06e7 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx @@ -22,11 +22,7 @@ % % for those people who are interested. %<*driver> -\RequirePackage{pdfmanagement-testphase} -\DeclareDocumentMetadata{} -\makeatletter -\declare@file@substitution{doc.sty}{doc-v3beta.sty} -\makeatother +\DocumentMetadata{} \documentclass{l3doc} \usepackage{array,booktabs,caption} \hypersetup{pdfauthor=Ulrike Fischer, @@ -50,7 +46,7 @@ % }^^A % } % -% \date{Version 0.93, released 2022-01-13} +% \date{Version 0.94, released 2022-05-11} % \maketitle % \begin{documentation} % \begin{function} @@ -91,7 +87,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-roles-code} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf-roles-code} {2022-05-11} {0.94} {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 40c4367ba2a..21a41f959fa 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx @@ -22,11 +22,7 @@ % % for those people who are interested. %<*driver> -\RequirePackage{pdfmanagement-testphase} -\DeclareDocumentMetadata{} -\makeatletter -\declare@file@substitution{doc.sty}{doc-v3beta.sty} -\makeatother +\DocumentMetadata{} \documentclass{l3doc} \usepackage{array,booktabs,caption} \hypersetup{pdfauthor=Ulrike Fischer, @@ -50,7 +46,7 @@ % }^^A % } % -% \date{Version 0.93, released 2022-01-13} +% \date{Version 0.94, released 2022-05-11} % \maketitle % \begin{documentation} % \begin{function}{interwordspace (setup-key)} @@ -68,7 +64,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-space-code} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf-space-code} {2022-05-11} {0.94} {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 6f03c5ac0fe..621ef672b88 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx @@ -22,11 +22,7 @@ % % for those people who are interested. %<*driver> -\RequirePackage{pdfmanagement-testphase} -\DeclareDocumentMetadata{} -\makeatletter -\declare@file@substitution{doc.sty}{doc-v3beta.sty} -\makeatother +\DocumentMetadata{} \documentclass{l3doc} \usepackage{array,booktabs,caption} \hypersetup{pdfauthor=Ulrike Fischer, @@ -50,7 +46,7 @@ % }^^A % } % -% \date{Version 0.93, released 2022-01-13} +% \date{Version 0.94, released 2022-05-11} % \maketitle % \begin{documentation} % \section{Public Commands} @@ -221,7 +217,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-struct-code} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf-struct-code} {2022-05-11} {0.94} {part of tagpdf - code related to storing structure} %</header> % \end{macrocode} @@ -969,7 +965,6 @@ \group_end: } } -%</package> % \end{macrocode} % \end{macro} % \begin{macro}{root-AF (setup-key)} @@ -998,14 +993,17 @@ } }, } +%</package> % \end{macrocode} % \end{macro} % \section{User commands} % % \begin{macro}{\tag_struct_begin:n,\tag_struct_end:} % \begin{macrocode} +%<base>\cs_new_protected:Npn \tag_struct_begin:n #1 {} +%<base>\cs_new_protected:Npn \tag_struct_end:{} %<*package|debug> -%<package>\cs_new_protected:Npn \tag_struct_begin:n #1 %#1 key-val +%<package>\cs_set_protected:Npn \tag_struct_begin:n #1 %#1 key-val %<debug>\cs_set_protected:Npn \tag_struct_begin:n #1 %#1 key-val { %<package>\@@_check_if_active_struct:T @@ -1067,7 +1065,7 @@ } %<debug>{ \@@_debug_struct_begin_ignore:n { #1 }} } -%<package>\cs_new_protected:Nn \tag_struct_end: +%<package>\cs_set_protected:Nn \tag_struct_end: %<debug>\cs_set_protected:Nn \tag_struct_end: { %take the current structure num from the stack: %the objects are written later, lua mode hasn't all needed info yet @@ -1104,8 +1102,9 @@ % This command allows to use a stashed structure in another place. % TODO: decide how it should be guarded. Probably by the struct-check. % \begin{macrocode} +%<base>\cs_new_protected:Npn \tag_struct_use:n #1 {} %<*package> -\cs_new_protected:Nn \tag_struct_use:n %#1 is the label +\cs_set_protected:Npn \tag_struct_use:n #1 %#1 is the label { \@@_check_if_active_struct:T { @@ -1171,7 +1170,7 @@ % \section{Attributes and attribute classes} % \begin{macrocode} %<*header> -\ProvidesExplPackage {tagpdf-attr-code} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf-attr-code} {2022-05-11} {0.94} {part of tagpdf - code related to attributes and attribute classes} %</header> % \end{macrocode} @@ -1217,8 +1216,8 @@ % \begin{macrocode} \cs_new_protected:Npn \@@_attr_new_entry:nn #1 #2 %#1:name, #2: content { - \prop_gput:Nnn \g_@@_attr_entries_prop - {#1}{#2} + \prop_gput:Nen \g_@@_attr_entries_prop + {\pdf_name_from_unicode_e:n{#1}}{#2} } \keys_define:nn { @@ / setup } @@ -1239,7 +1238,14 @@ attribute-class .code:n = { \clist_set:No \l_@@_tmpa_clist { #1 } - \seq_set_from_clist:NN \l_@@_tmpa_seq \l_@@_tmpa_clist + \seq_set_from_clist:NN \l_@@_tmpb_seq \l_@@_tmpa_clist +% \end{macrocode} +% we convert the names into pdf names with slash +% \begin{macrocode} + \seq_set_map_x:NNn \l_@@_tmpa_seq \l_@@_tmpb_seq + { + \pdf_name_from_unicode_e:n {##1} + } \seq_map_inline:Nn \l_@@_tmpa_seq { \prop_if_in:NnF \g_@@_attr_entries_prop {##1} @@ -1248,14 +1254,10 @@ } \seq_gput_left:Nn\g_@@_attr_class_used_seq { ##1} } - \seq_set_map:NNn \l_@@_tmpb_seq \l_@@_tmpa_seq - { - /##1 - } \tl_set:Nx \l_@@_tmpa_tl { \int_compare:nT { \seq_count:N \l_@@_tmpa_seq > 1 }{[} - \seq_use:Nn \l_@@_tmpb_seq { \c_space_tl } + \seq_use:Nn \l_@@_tmpa_seq { \c_space_tl } \int_compare:nT { \seq_count:N \l_@@_tmpa_seq > 1 }{]} } \int_compare:nT { \seq_count:N \l_@@_tmpa_seq > 0 } @@ -1277,7 +1279,14 @@ attribute .code:n = % A property (attribute, value currently a dictionary) { \clist_set:No \l_@@_tmpa_clist { #1 } - \seq_set_from_clist:NN \l_@@_tmpa_seq \l_@@_tmpa_clist + \seq_set_from_clist:NN \l_@@_tmpb_seq \l_@@_tmpa_clist +% \end{macrocode} +% we convert the names into pdf names with slash +% \begin{macrocode} + \seq_set_map_x:NNn \l_@@_tmpa_seq \l_@@_tmpb_seq + { + \pdf_name_from_unicode_e:n {##1} + } \tl_set:Nx \l_@@_attr_value_tl { \int_compare:nT { \seq_count:N \l_@@_tmpa_seq > 1 }{[}%] diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx index e6964666d93..a63dce4687d 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx @@ -23,11 +23,7 @@ % for those people who are interested. % %<*driver> -\RequirePackage{pdfmanagement-testphase} -\DeclareDocumentMetadata{} -\makeatletter -\declare@file@substitution{doc.sty}{doc-v3beta.sty} -\makeatother +\DocumentMetadata{} \documentclass{l3doc} \usepackage{array,booktabs,caption} \hypersetup{pdfauthor=Ulrike Fischer, @@ -51,13 +47,13 @@ % }^^A % } % -% \date{Version 0.93, released 2022-01-13} +% \date{Version 0.94, released 2022-05-11} % \maketitle % \begin{implementation} % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-tree-code} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf-tree-code} {2022-05-11} {0.94} {part of tagpdf - code related to writing trees and dictionaries to the pdf} %</header> % \end{macrocode} @@ -333,7 +329,7 @@ \seq_gremove_duplicates:N \g_@@_attr_class_used_seq \seq_set_map:NNn \l_@@_tmpa_seq \g_@@_attr_class_used_seq { - /##1\c_space_tl + ##1\c_space_tl << \prop_item:Nn \g_@@_attr_entries_prop diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx index 2b58d816594..5b7cf4bb408 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx @@ -22,11 +22,7 @@ % % for those people who are interested. %<*driver> -\RequirePackage{pdfmanagement-testphase} -\DeclareDocumentMetadata{} -\makeatletter -\declare@file@substitution{doc.sty}{doc-v3beta.sty} -\makeatother +\DocumentMetadata{} \documentclass{l3doc} \usepackage{array,booktabs,caption} \hypersetup{pdfauthor=Ulrike Fischer, @@ -50,7 +46,7 @@ % }^^A % } % -% \date{Version 0.93, released 2022-01-13} +% \date{Version 0.94, released 2022-05-11} % \maketitle % \begin{documentation} % \section{Setup commands} @@ -250,7 +246,7 @@ % \begin{macrocode} %<@@=tag> %<*header> -\ProvidesExplPackage {tagpdf-user} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf-user} {2022-05-11} {0.94} {tagpdf - user commands} %</header> % \end{macrocode} diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx index 5406505c597..95154859ee5 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx @@ -33,9 +33,10 @@ % \end{syntax} % \end{function} % -% \begin{function}{ \tag_stop_group_begin:, \tag_stop_group_end: } +% \begin{function}{ \tag_stop_group_begin:, \tag_stop_group_end:, \tag_stop: } % We need a command to stop tagging in some places. -% This simply switches the two local booleans. +% This simply switches the two local booleans. The grouping commands +% can be used to group the effect. % \end{function} % % \begin{function}{activate-space (setup-key)} @@ -80,7 +81,7 @@ % \begin{macrocode} %<@@=tag> %<*package> -\ProvidesExplPackage {tagpdf} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf} {2022-05-11} {0.94} { A package to experiment with pdf tagging } \bool_if:nF @@ -98,7 +99,7 @@ { Activate~it~with \MessageBreak \string\RequirePackage{pdfmanagement-testphase}\MessageBreak - \string\DeclareDocumentMetadata{<options>}\MessageBreak + \string\DocumentMetadata{<options>}\MessageBreak before~\string\documentclass } } @@ -106,7 +107,7 @@ % \end{macrocode} %<*debug> % \begin{macrocode} -\ProvidesExplPackage {tagpdf-debug} {2022-01-13} {0.93} +\ProvidesExplPackage {tagpdf-debug} {2022-05-11} {0.94} { debug code for tagpdf } \@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput} \end{macrocode} @@ -140,13 +141,24 @@ % \begin{macrocode} \RequirePackage{l3ref-tmp} % \end{macrocode} -% +% To be on the safe side for now, load also the base definitions +% \begin{macrocode} +\RequirePackage{tagpdf-base} +%</package> +% \end{macrocode} +% \begin{macrocode} +%<*base> +\ProvidesExplPackage {tagpdf-base} {2022-05-11} {0.94} + {part of tagpdf - provide base, no-op versions of the user commands } +%</base> +% \end{macrocode} % \section{Temporary code} % This is code which will be removed when proper support exists in LaTeX % \subsection{a LastPage label} % See also issue \#2 in Accessible-xref % \begin{macro}{\@@_lastpagelabel:} % \begin{macrocode} +%<*package> \cs_new_protected:Npn \@@_lastpagelabel: { \legacy_if:nT { @filesw } @@ -302,7 +314,7 @@ \cs_generate_variant:Nn \pdf_object_ref:n {e} \cs_generate_variant:Nn \pdfannot_dict_put:nnn {nnx} \cs_generate_variant:Nn \pdffile_embed_stream:nnn {nxx,oxx} -\cs_generate_variant:Nn \prop_gput:Nnn {Nxx} +\cs_generate_variant:Nn \prop_gput:Nnn {Nxx,Nen} \cs_generate_variant:Nn \prop_put:Nnn {Nxx} \cs_generate_variant:Nn \ref_label:nn { nv } \cs_generate_variant:Nn \seq_set_split:Nnn{Nne} @@ -427,6 +439,11 @@ \bool_set_false:N \l_@@_active_mc_bool } \cs_set_eq:NN \tag_stop_group_end: \group_end: +\cs_new_protected:Npn \tag_stop: + { + \bool_set_false:N \l_@@_active_struct_bool + \bool_set_false:N \l_@@_active_mc_bool + } % \end{macrocode} % \end{macro} % diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf.ins b/Master/texmf-dist/source/latex/tagpdf/tagpdf.ins index e212ae48b27..54809f67c10 100644 --- a/Master/texmf-dist/source/latex/tagpdf/tagpdf.ins +++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf.ins @@ -70,6 +70,17 @@ and all files in that bundle must be distributed together. } \generate + {\file{tagpdf-base.sty} + { + \from{tagpdf.dtx}{base} + \from{tagpdf-mc-generic.dtx}{base} + \from{tagpdf-mc-shared.dtx}{base} + \from{tagpdf-struct.dtx}{base} + \from{tagpdf-checks.dtx}{base} + } + } + +\generate {\file{tagpdf-luatex.def}{\from{tagpdf-backend.dtx}{luatex}}} \generate {\file{tagpdf-mc-code-generic.sty}{\from{tagpdf-mc-generic.dtx}{generic}}} @@ -97,6 +108,7 @@ and all files in that bundle must be distributed together. \generate {\file{tagpdf-debug-lua.sty}{\from{tagpdf-mc-luacode.dtx}{debug}}} + \def\MetaPrefix{-- } \def\defaultpostamble{% \MetaPrefix^^J% |