summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
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
parent4b66d592c272818abc28cb9cffff32691090e89e (diff)
tagpdf (24aug22)
git-svn-id: svn://tug.org/texlive/trunk@64190 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdfbin1240587 -> 1240872 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdfbin492426 -> 492448 bytes
-rw-r--r--Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex28
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx8
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-generic.dtx6
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-luacode.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-mc-shared.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-roles.dtx9
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-struct.dtx16
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-tree.dtx23
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx4
-rw-r--r--Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx50
-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
24 files changed, 129 insertions, 134 deletions
diff --git a/Master/texmf-dist/doc/latex/tagpdf/README.md b/Master/texmf-dist/doc/latex/tagpdf/README.md
index 222f51cb498..265428377f3 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/README.md
+++ b/Master/texmf-dist/doc/latex/tagpdf/README.md
@@ -1,6 +1,6 @@
#tagpdf — A package to create tagged pdf
-Packageversion: 0.96
-Packagedate: 2022/08/06
+Packageversion: 0.97
+Packagedate: 2022/08/24
Author: Ulrike Fischer
## License
diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf b/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf
index 4def4f399b9..551a7006249 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf-code.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf
index ff623f0fa9e..f75c057dbf3 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf
+++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex
index 977e32cf325..217314035c5 100644
--- a/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex
+++ b/Master/texmf-dist/doc/latex/tagpdf/tagpdf.tex
@@ -4,8 +4,8 @@
\DocumentMetadata{pdfversion=2.0,lang=en-UK,testphase=phase-II}
\makeatletter
-\def\UlrikeFischer@package@version{0.96}
-\def\UlrikeFischer@package@date{2022-08-06}
+\def\UlrikeFischer@package@version{0.97}
+\def\UlrikeFischer@package@date{2022-08-24}
\makeatother
\documentclass[DIV=12,parskip=half-,bibliography=totoc]{scrartcl}
@@ -184,8 +184,8 @@ So the name of the package is a bit wrong. As excuse I can only say that it is s
\subsection{Engines and modes}
-The package theoretically with all engines,
-But the xelatex and the latex-dvips-route are not much tested and they also don't support
+The package theoretically with all engines,
+But the xelatex and the latex-dvips-route are not much tested and they also don't support
real space glyphs. lualatex is the most powerful and safe modus, but pdflatex works ok too.
The package has two modes: the \emph{generic mode} which should work in theory with every engine and the \emph{lua mode} which works only with lualatex.
@@ -195,7 +195,7 @@ I implemented the generic mode first. Mostly because my tex skills are much bett
While the generic mode is not bad and I spent quite some time to get it working I nevertheless think that the lua mode is the future and the only one that will be usable for larger documents. \PDF{} is a page orientated format and so the ability of luatex to manipulate pages and nodes after the \TeX-processing is really useful here. Also with luatex characters are normally already given as unicode.
The package uses quite a lot labels (in generic mode more than with luamode). At the begin it relied on the \pkg{zref} package, but switched now to a new experimental implementation for labels. The drawback of the new method is that they don't give yet good rerun messages if they have changed. I advise to use the \pkg{rerunfilecheck} package as a intermediate work-around and when using pdflatex compile
-at best at least once or twice more often then normal.
+at best at least once or twice more often then normal.
\subsection{References and target PDF version}
@@ -255,7 +255,7 @@ Feedback, contribuations and corrections are welcome!
\end{tcolorbox}
-All examples should use the \cs{DocumentMetadata} key \PrintKeyName{uncompress}
+All examples should use the \cs{DocumentMetadata} key \PrintKeyName{uncompress}
so that uncompressed \PDF{} are created and the internal objects and structures can be inspected and -- hopefully soon -- be compared by the l3build checks.%
@@ -424,10 +424,10 @@ Small bug fixes.
\begin{itemize}
\item The \texttt{alttext} key has been renamed to \texttt{alt}, the other key name exists as alias.
-\item The new command |\tag_struct_object_ref:n| allows to
+\item The new command |\tag_struct_object_ref:n| allows to
create the object reference of a structure.
-
-\item a new key \texttt{parent} has been added
+
+\item a new key \texttt{parent} has been added
to allow structures to choose their parent structure.
\item a new option \texttt{paratag} allows to change the tag name used for the
@@ -436,7 +436,7 @@ Small bug fixes.
\item the commands |\tag_start:|, |\tag_stop:n| and |\tag_start:n| allow
to stop and start tagging for example in trial typesetting.
-\item Small bug fixes.
+\item Small bug fixes.
\end{itemize}
\subsection{Proof of concept: the tagging of the documentation itself}
@@ -481,12 +481,12 @@ some text
\minisec{Activation needed!}
-The package can also be loaded normally with |\usepackage| (but it is
+The package can also be loaded normally with |\usepackage| (but it is
still required to use \cs{DocumentMetadata} to load the pdfmanagement) but
it will then -- apart from loading more packages and defining a lot of things -- not do much. You will have to \emph{activate} it with \verb+\tagpdfsetup+.
The pdfmanagement loaded with \cs{DocumentMetadata} will in any case load \texttt{tagpdf-base} a
-small package that provides no-op versions of the main tagging commands.
+small package that provides no-op versions of the main tagging commands.
Most commands do nothing if tagging is not activated, but in case a test is needed a command (with the usual p,T,F variants) is provided:
@@ -1376,10 +1376,10 @@ The key-val list understands the following keys:
See also section~\ref{sec:attributes}.
\item[\PrintKeyName{title}]
- This key allows to set the dictionary entry \texttt{/Title} in the structure object. The value is handled as verbatim string and hex encoded. Commands are not expanded.
+ This key allows to set the dictionary entry \texttt{/T} (for a title) in the structure object. The value is handled as verbatim string and hex encoded. Commands are not expanded.
\item[\PrintKeyName{title-o}]
- This key allows to set the dictionary entry \texttt{/Title} in the structure object.
+ This key allows to set the dictionary entry \texttt{/T} in the structure object.
The value is expanded once and then handled as verbatim string like the \PrintKeyName{title} key.
\item[\PrintKeyName{AF}]
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-backend.dtx
index fe68e700887..800a6bfa468 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.96, released 2022-08-06}
+% \date{Version 0.97, released 2022-08-24}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*luatex>
-\ProvidesExplFile {tagpdf-luatex.def} {2022-08-06} {0.96}
+\ProvidesExplFile {tagpdf-luatex.def} {2022-08-24} {0.97}
{tagpdf~driver~for~luatex}
% \end{macrocode}
% \section{Loading the lua}
@@ -157,8 +157,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/source/latex/tagpdf/tagpdf-checks.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-checks.dtx
index 121e2216113..e5ba53195fe 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.96, released 2022-08-06}
+% \date{Version 0.97, released 2022-08-24}
% \maketitle
% \begin{documentation}
% \section{Commands}
@@ -295,7 +295,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-checks-code} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-checks-code} {2022-08-24} {0.97}
{part of tagpdf - code related to checks, conditionals, debugging and messages}
%</header>
% \end{macrocode}
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 7881210a409..42017f48366 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.96, released 2022-08-06}
+% \date{Version 0.97, released 2022-08-24}
% \maketitle
% \begin{documentation}
% \end{documentation}
@@ -55,11 +55,11 @@
% \begin{macrocode}
%<@@=tag>
%<*generic>
-\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}
%</generic>
%<*debug>
-\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}
%</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 e001a4837a8..fd4362227c2 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.96, released 2022-08-06}
+% \date{Version 0.97, released 2022-08-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-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2022-08-24} {0.97}
{tagpdf - mc code only for the luamode }
%</luamode>
% \end{macrocode}
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 0c6857c22a9..6ea1b355442 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.96, released 2022-08-06}
+% \date{Version 0.97, released 2022-08-24}
% \maketitle
% \begin{documentation}
% \section{Public Commands}
@@ -174,7 +174,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-mc-code-shared} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-mc-code-shared} {2022-08-24} {0.97}
{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 15c389e6764..0b1899bf71d 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.96, released 2022-08-06}
+% \date{Version 0.97, released 2022-08-24}
% \maketitle
% \begin{documentation}
% \begin{function}
@@ -87,7 +87,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-roles-code} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-roles-code} {2022-08-24} {0.97}
{part of tagpdf - code related to roles and structure names}
%</header>
% \end{macrocode}
@@ -164,9 +164,9 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_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_@@_role/Namespace_#1_dict}
- \pdf_object_new:nn {@@/RoleMapNS/#1}{dict}
+ \pdf_object_new:n {@@/RoleMapNS/#1}
\pdfdict_new:n {g_@@_role/RoleMapNS_#1_dict}
\pdfdict_gput:nnn
{g_@@_role/Namespace_#1_dict}
@@ -221,6 +221,7 @@
\@@_role_NS_new:nnn {pdf} {http://iso.org/pdf/ssn}{}
\@@_role_NS_new:nnn {pdf2} {http://iso.org/pdf2/ssn}{}
\@@_role_NS_new:nnn {mathml}{http://www.w3.org/1998/Math/MathML}{}
+ %\@@_role_NS_new:nnn {latex} {https://www.latex-project.org/ns/2022}{}
\exp_args:Nnx
\@@_role_NS_new:nnn {user}{\c_@@_role_userNS_id_str}{}
}
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-space.dtx
index 8da502c7091..20f189f8a54 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.96, released 2022-08-06}
+% \date{Version 0.97, released 2022-08-24}
% \maketitle
% \begin{documentation}
% \begin{function}{interwordspace (setup-key)}
@@ -64,7 +64,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-space-code} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-space-code} {2022-08-24} {0.97}
{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 a476e3cf865..dd85e47277b 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.96, released 2022-08-06}
+% \date{Version 0.97, released 2022-08-24}
% \maketitle
% \begin{documentation}
% \section{Public Commands}
@@ -242,7 +242,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-struct-code} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-struct-code} {2022-08-24} {0.97}
{part of tagpdf - code related to storing structure}
%</header>
% \end{macrocode}
@@ -707,8 +707,9 @@
\@@_struct_fill_kid_key:n { #1 }
\@@_struct_get_dict_content:nN { #1 } \l_@@_tmpa_tl
\exp_args:Nx
- \pdf_object_write_dict:nx
+ \pdf_object_write:nnx
{ @@/struct/#1 }
+ {dict}
{
\l_@@_tmpa_tl
}
@@ -874,7 +875,7 @@
},
title .code:n = % T property
{
- \str_set_convert:Nnon
+ \str_set_convert:Nnnn
\l_@@_tmpa_str
{ #1 }
{ default }
@@ -886,7 +887,7 @@
},
title-o .code:n = % T property
{
- \str_set_convert:Nnon
+ \str_set_convert:Nonn
\l_@@_tmpa_str
{ #1 }
{ default }
@@ -1105,9 +1106,8 @@
\@@_new_output_prop_handler:n {\int_eval:n { \c@g_@@_struct_abs_int }}
\@@_seq_new:c { g_@@_struct_kids_\int_eval:n { \c@g_@@_struct_abs_int }_seq}
\exp_args:Ne
- \pdf_object_new:nn
+ \pdf_object_new:n
{ @@/struct/\int_eval:n { \c@g_@@_struct_abs_int } }
- { dict }
\@@_prop_gput:cno
{ g_@@_struct_\int_eval:n { \c@g_@@_struct_abs_int }_prop }
{ Type }
@@ -1319,7 +1319,7 @@
% \section{Attributes and attribute classes}
% \begin{macrocode}
%<*header>
-\ProvidesExplPackage {tagpdf-attr-code} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-attr-code} {2022-08-24} {0.97}
{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 26124a3afd6..6bb4aa99806 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.96, released 2022-08-06}
+% \date{Version 0.97, released 2022-08-24}
% \maketitle
% \begin{implementation}
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-tree-code} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-tree-code} {2022-08-24} {0.97}
{part of tagpdf - code related to writing trees and dictionaries to the pdf}
%</header>
% \end{macrocode}
@@ -87,7 +87,7 @@
% \begin{macro}{@@/struct/0}
% This is the object for the root object, the StructTreeRoot
% \begin{macrocode}
-\pdf_object_new:nn { @@/struct/0 }{ dict }
+\pdf_object_new:n { @@/struct/0 }
% \end{macrocode}
% \end{macro}
% \begin{macrocode}
@@ -141,7 +141,7 @@
% \begin{macro}{@@/tree/parenttree}
% The object which will hold the parenttree
% \begin{macrocode}
-\pdf_object_new:nn { @@/tree/parenttree }{ dict }
+\pdf_object_new:n { @@/tree/parenttree }
% \end{macrocode}
% \end{macro}
% The ParentTree maps numbers to objects or (if the number represents a page)
@@ -285,7 +285,7 @@
\@@_tree_fill_parenttree:
}
\tl_put_right:NV \l_@@_parenttree_content_tl\g_@@_parenttree_objr_tl
- \pdf_object_write_dict:nx { @@/tree/parenttree }
+ \pdf_object_write:nnx { @@/tree/parenttree }{dict}
{
/Nums\c_space_tl [\l_@@_parenttree_content_tl]
}
@@ -300,7 +300,7 @@
% \begin{variable}{@@/tree/rolemap}
% At first we reserve again an object.
% \begin{macrocode}
-\pdf_object_new:nn { @@/tree/rolemap }{ dict }
+\pdf_object_new:n { @@/tree/rolemap }
% \end{macrocode}
% \end{variable}
%
@@ -310,7 +310,7 @@
% \begin{macrocode}
\cs_new_protected:Npn \@@_tree_write_rolemap:
{
- \pdf_object_write_dict:nx { @@/tree/rolemap }
+ \pdf_object_write:nnx { @@/tree/rolemap }{dict}
{
\pdfdict_use:n{g_@@_role/RoleMap_dict}
}
@@ -345,9 +345,10 @@
\tl_if_empty:NF
\l_@@_tmpa_tl
{
- \pdf_object_new:nn { @@/tree/classmap }{ dict }
- \pdf_object_write_dict:nx
+ \pdf_object_new:n { @@/tree/classmap }
+ \pdf_object_write:nnx
{ @@/tree/classmap }
+ {dict}
{ \l_@@_tmpa_tl }
\@@_prop_gput:cnx
{ g_@@_struct_0_prop }
@@ -373,14 +374,14 @@
{
\pdfdict_if_empty:nF {g_@@_role/RoleMapNS_##1_dict}
{
- \pdf_object_write_dict:nx {@@/RoleMapNS/##1}
+ \pdf_object_write:nnx {@@/RoleMapNS/##1}{dict}
{
\pdfdict_use:n {g_@@_role/RoleMapNS_##1_dict}
}
\pdfdict_gput:nnx{g_@@_role/Namespace_##1_dict}
{RoleMapNS}{\pdf_object_ref:n {@@/RoleMapNS/##1}}
}
- \pdf_object_write_dict:nx{tag/NS/##1}
+ \pdf_object_write:nnx{tag/NS/##1}{dict}
{
\pdfdict_use:n {g_@@_role/Namespace_##1_dict}
}
diff --git a/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx b/Master/texmf-dist/source/latex/tagpdf/tagpdf-user.dtx
index 607e949eed2..bd2e26ec927 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.96, released 2022-08-06}
+% \date{Version 0.97, released 2022-08-24}
% \maketitle
% \begin{documentation}
% \section{Setup commands}
@@ -246,7 +246,7 @@
% \begin{macrocode}
%<@@=tag>
%<*header>
-\ProvidesExplPackage {tagpdf-user} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf-user} {2022-08-24} {0.97}
{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 51d67e2ae9f..be718ec36df 100644
--- a/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx
+++ b/Master/texmf-dist/source/latex/tagpdf/tagpdf.dtx
@@ -92,7 +92,7 @@
% \begin{macrocode}
%<@@=tag>
%<*package>
-\ProvidesExplPackage {tagpdf} {2022-08-06} {0.96}
+\ProvidesExplPackage {tagpdf} {2022-08-24} {0.97}
{ A package to experiment with pdf tagging }
\bool_if:nF
@@ -118,7 +118,7 @@
% \end{macrocode}
%<*debug>
% \begin{macrocode}
-\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}
% \end{macrocode}
@@ -159,7 +159,7 @@
% \end{macrocode}
% \begin{macrocode}
%<*base>
-\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 }
%</base>
% \end{macrocode}
@@ -182,47 +182,43 @@
% \end{macrocode}
% \section{Temporary code}
% This is code which will be removed when proper support exists in LaTeX
+% It writes only dictionaries!
% \subsection{Faster object writing}
-%
% \begin{macrocode}
%<*package>
-\cs_if_free:NT \pdf_object_write_dict:nn
- {
- \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_object_write:nnn
{
- \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}
+
%</package>
% \end{macrocode}
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}