summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/tagpdf
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2022-08-24 19:40:12 +0000
committerKarl Berry <karl@freefriends.org>2022-08-24 19:40:12 +0000
commit6194bc04fd80fb0fbb58da9ec7dc935832fc0a45 (patch)
tree44d04891bdd5b7b1d68829e4a95b88c390df2e27 /Master/texmf-dist/tex/latex/tagpdf
parent4b66d592c272818abc28cb9cffff32691090e89e (diff)
tagpdf (24aug22)
git-svn-id: svn://tug.org/texlive/trunk@64190 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/tagpdf')
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug-generic.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-debug.sty5
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-generic.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf-mc-code-lua.sty2
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua4
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty78
-rw-r--r--Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty2
9 files changed, 48 insertions, 51 deletions
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty
index bd1fab006a3..a268313ab61 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-base.sty
@@ -24,7 +24,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf.dtx
-\ProvidesExplPackage {tagpdf-base} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-base} {2022-08-24} {0.97}
{part of tagpdf - provide base, no-op versions of the user commands }
\AddToHook{begindocument}
{
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 472f34c02f3..185bb750b9a 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} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-debug-generic} {2022-08-24} {0.97}
{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 113d6e5c0c3..819600419db 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} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-debug} {2022-08-24} {0.97}
{ debug code for tagpdf }
\@ifpackageloaded{tagpdf}{}{\PackageWarning{tagpdf-debug}{tagpdf~not~loaded,~quitting}\endinput}
\prop_gput:Nnn \g_msg_module_type_prop { tag / debug} {}
@@ -131,9 +131,8 @@
\__tag_new_output_prop_handler:n {\int_eval:n { \c@g__tag_struct_abs_int }}
\__tag_seq_new:c { g__tag_struct_kids_\int_eval:n { \c@g__tag_struct_abs_int }_seq}
\exp_args:Ne
- \pdf_object_new:nn
+ \pdf_object_new:n
{ __tag/struct/\int_eval:n { \c@g__tag_struct_abs_int } }
- { dict }
\__tag_prop_gput:cno
{ g__tag_struct_\int_eval:n { \c@g__tag_struct_abs_int }_prop }
{ Type }
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def b/Master/texmf-dist/tex/latex/tagpdf/tagpdf-luatex.def
index d28c12ab214..7fcc6ec6095 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} {2022-08-06} {0.96}
+\ProvidesExplFile {tagpdf-luatex.def} {2022-08-24} {0.97}
{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 37034dd31fb..38651bdcf03 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} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-mc-code-generic} {2022-08-24} {0.97}
{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 b62d900b62f..d109c3acc97 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} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2022-08-24} {0.97}
{tagpdf - mc code only for the luamode }
\hook_gput_code:nnn{begindocument}{tagpdf/mc}
{
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.lua
index 05e314583a0..1c8d298677d 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.96", --TAGVERSION
- date = "2022-08-06", --TAGDATE
+ version = "0.97", --TAGVERSION
+ date = "2022-08-24", --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 abeb7530146..064ce5998de 100644
--- a/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty
+++ b/Master/texmf-dist/tex/latex/tagpdf/tagpdf.sty
@@ -27,7 +27,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: tagpdf.dtx
-\ProvidesExplPackage {tagpdf} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf} {2022-08-24} {0.97}
{ A package to experiment with pdf tagging }
\bool_if:nF
@@ -57,43 +57,39 @@
\ProcessOptions
\RequirePackage{l3ref-tmp}
\RequirePackage{tagpdf-base}
-\cs_if_free:NT \pdf_object_write_dict:nn
+\cs_if_free:NT \pdf_object_write:nnn
{
- \cs_set_eq:NN \pdf_object_write_dict:nn \pdf_object_write:nn
- }
-\cs_generate_variant:Nn \pdf_object_write_dict:nn {nx}
-
-\str_if_eq:VnT \c_sys_backend_str {pdftex}
- {
- \cs_if_free:NT \__pdf_backend_object_write_dict:nn
+ \cs_new_protected:Npn \pdf_object_new:n #1
+ { \pdf_object_new:nn{#1}{dict} }
+ \cs_new_protected:Npn \pdf_object_write:nnn #1#2#3
+ {
+ \pdf_object_write:nn {#1}{#3}
+ }
+ \str_if_eq:VnT \c_sys_backend_str {pdftex}
{
- \cs_new_protected:Npn \__pdf_backend_object_write_dict:nn #1#2
- {
+ \cs_set_protected:Npn \pdf_object_write:nnn #1#2#3
+ {
\tex_immediate:D \tex_pdfobj:D
- useobjnum ~
+ useobjnum ~
\int_use:c
{ c__pdf_backend_object_ \tl_to_str:n {#1} _int }
- { << ~ \exp_not:n {#2} ~ >> }
- }
- \cs_set_eq:NN \pdf_object_write_dict:nn \__pdf_backend_object_write_dict:nn
+ { << ~ \exp_not:n {#3} ~ >> }
+ }
}
- }
-
-\str_if_eq:VnT \c_sys_backend_str {luatex}
- {
- \cs_if_free:NT \__pdf_backend_object_write_dict:nn
+ \str_if_eq:VnT \c_sys_backend_str {luatex}
{
- \cs_new_protected:Npn \__pdf_backend_object_write_dict:nn #1#2
+ \cs_set_protected:Npn \pdf_object_write:nnn #1#2#3
{
\tex_immediate:D \tex_pdfextension:D obj ~
useobjnum ~
\int_use:c
{ c__pdf_backend_object_ \tl_to_str:n {#1} _int }
- { << ~ \exp_not:n {#2} ~ >> }
+ { << ~ \exp_not:n {#3} ~ >> }
}
- \cs_set_eq:NN \pdf_object_write_dict:nn \__pdf_backend_object_write_dict:nn
- }
+ }
}
+\cs_generate_variant:Nn \pdf_object_write:nnn {nnx}
+
\cs_new_protected:Npn \__tag_lastpagelabel:
{
@@ -722,7 +718,7 @@
}
}
}
-\pdf_object_new:nn { __tag/struct/0 }{ dict }
+\pdf_object_new:n { __tag/struct/0 }
\hook_gput_code:nnn{shipout/lastpage}{tagpdf}
{
\bool_if:NT \g__tag_active_tree_bool
@@ -753,7 +749,7 @@
\__tag_struct_write_obj:n { ##1 }
}
}
-\pdf_object_new:nn { __tag/tree/parenttree }{ dict }
+\pdf_object_new:n { __tag/tree/parenttree }
\newcounter { g__tag_parenttree_obj_int }
\hook_gput_code:nnn{begindocument}{tagpdf}
{
@@ -843,15 +839,15 @@
\__tag_tree_fill_parenttree:
}
\tl_put_right:NV \l__tag_parenttree_content_tl\g__tag_parenttree_objr_tl
- \pdf_object_write_dict:nx { __tag/tree/parenttree }
+ \pdf_object_write:nnx { __tag/tree/parenttree }{dict}
{
/Nums\c_space_tl [\l__tag_parenttree_content_tl]
}
}
-\pdf_object_new:nn { __tag/tree/rolemap }{ dict }
+\pdf_object_new:n { __tag/tree/rolemap }
\cs_new_protected:Npn \__tag_tree_write_rolemap:
{
- \pdf_object_write_dict:nx { __tag/tree/rolemap }
+ \pdf_object_write:nnx { __tag/tree/rolemap }{dict}
{
\pdfdict_use:n{g__tag_role/RoleMap_dict}
}
@@ -878,9 +874,10 @@
\tl_if_empty:NF
\l__tag_tmpa_tl
{
- \pdf_object_new:nn { __tag/tree/classmap }{ dict }
- \pdf_object_write_dict:nx
+ \pdf_object_new:n { __tag/tree/classmap }
+ \pdf_object_write:nnx
{ __tag/tree/classmap }
+ {dict}
{ \l__tag_tmpa_tl }
\__tag_prop_gput:cnx
{ g__tag_struct_0_prop }
@@ -895,14 +892,14 @@
{
\pdfdict_if_empty:nF {g__tag_role/RoleMapNS_##1_dict}
{
- \pdf_object_write_dict:nx {__tag/RoleMapNS/##1}
+ \pdf_object_write:nnx {__tag/RoleMapNS/##1}{dict}
{
\pdfdict_use:n {g__tag_role/RoleMapNS_##1_dict}
}
\pdfdict_gput:nnx{g__tag_role/Namespace_##1_dict}
{RoleMapNS}{\pdf_object_ref:n {__tag/RoleMapNS/##1}}
}
- \pdf_object_write_dict:nx{tag/NS/##1}
+ \pdf_object_write:nnx{tag/NS/##1}{dict}
{
\pdfdict_use:n {g__tag_role/Namespace_##1_dict}
}
@@ -950,9 +947,9 @@
\tl_new:N \l__tag_role_role_namespace_tmpa_tl
\cs_new_protected:Npn \__tag_role_NS_new:nnn #1 #2 #3
{
- \pdf_object_new:nn {tag/NS/#1}{dict}
+ \pdf_object_new:n {tag/NS/#1}
\pdfdict_new:n {g__tag_role/Namespace_#1_dict}
- \pdf_object_new:nn {__tag/RoleMapNS/#1}{dict}
+ \pdf_object_new:n {__tag/RoleMapNS/#1}
\pdfdict_new:n {g__tag_role/RoleMapNS_#1_dict}
\pdfdict_gput:nnn
{g__tag_role/Namespace_#1_dict}
@@ -993,6 +990,7 @@
\__tag_role_NS_new:nnn {pdf} {http://iso.org/pdf/ssn}{}
\__tag_role_NS_new:nnn {pdf2} {http://iso.org/pdf2/ssn}{}
\__tag_role_NS_new:nnn {mathml}{http://www.w3.org/1998/Math/MathML}{}
+ %\__tag_role_NS_new:nnn {latex} {https://www.latex-project.org/ns/2022}{}
\exp_args:Nnx
\__tag_role_NS_new:nnn {user}{\c__tag_role_userNS_id_str}{}
}
@@ -1679,8 +1677,9 @@
\__tag_struct_fill_kid_key:n { #1 }
\__tag_struct_get_dict_content:nN { #1 } \l__tag_tmpa_tl
\exp_args:Nx
- \pdf_object_write_dict:nx
+ \pdf_object_write:nnx
{ __tag/struct/#1 }
+ {dict}
{
\l__tag_tmpa_tl
}
@@ -1776,7 +1775,7 @@
},
title .code:n = % T property
{
- \str_set_convert:Nnon
+ \str_set_convert:Nnnn
\l__tag_tmpa_str
{ #1 }
{ default }
@@ -1788,7 +1787,7 @@
},
title-o .code:n = % T property
{
- \str_set_convert:Nnon
+ \str_set_convert:Nonn
\l__tag_tmpa_str
{ #1 }
{ default }
@@ -1975,9 +1974,8 @@
\__tag_new_output_prop_handler:n {\int_eval:n { \c@g__tag_struct_abs_int }}
\__tag_seq_new:c { g__tag_struct_kids_\int_eval:n { \c@g__tag_struct_abs_int }_seq}
\exp_args:Ne
- \pdf_object_new:nn
+ \pdf_object_new:n
{ __tag/struct/\int_eval:n { \c@g__tag_struct_abs_int } }
- { dict }
\__tag_prop_gput:cno
{ g__tag_struct_\int_eval:n { \c@g__tag_struct_abs_int }_prop }
{ Type }
diff --git a/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty b/Master/texmf-dist/tex/latex/tagpdf/tagpdfdocu-patches.sty
index 60aee8f3642..e01f9fa594f 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} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdfdocu-patches} {2022-08-24} {0.97}
{patches/commands for the tagpdf documentation}
\RequirePackage{etoolbox}