[latex3-commits] [git/LaTeX3-latex3-latex2e] cleanup-footnote-lab: update tagpdf (7183b4f9)
Ulrike Fischer
fischer at troubleshooting-tex.de
Mon Jan 30 18:18:35 CET 2023
Repository : https://github.com/latex3/latex2e
On branch : cleanup-footnote-lab
Link : https://github.com/latex3/latex2e/commit/7183b4f99817270161fe8d72f3f5a9fe66e2dc10
>---------------------------------------------------------------
commit 7183b4f99817270161fe8d72f3f5a9fe66e2dc10
Author: Ulrike Fischer <fischer at troubleshooting-tex.de>
Date: Mon Jan 30 18:18:35 2023 +0100
update tagpdf
>---------------------------------------------------------------
7183b4f99817270161fe8d72f3f5a9fe66e2dc10
texmf/tex/latex/tagpdf/tagpdf-base.sty | 2 +-
texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty | 2 +-
texmf/tex/latex/tagpdf/tagpdf-debug.sty | 2 +-
texmf/tex/latex/tagpdf/tagpdf-luatex.def | 2 +-
texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty | 2 +-
texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty | 2 +-
texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def | 2 +-
texmf/tex/latex/tagpdf/tagpdf-ns-latex-inline.def | 2 +-
texmf/tex/latex/tagpdf/tagpdf-ns-latex.def | 2 +-
texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def | 2 +-
texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def | 2 +-
texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def | 2 +-
texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv | 2 +-
texmf/tex/latex/tagpdf/tagpdf-parent-child.csv | 2 +-
texmf/tex/latex/tagpdf/tagpdf.lua | 4 +-
texmf/tex/latex/tagpdf/tagpdf.sty | 73 +++++----
texmf/tex/latex/tagpdf/tagpdfdocu-patches.sty | 188 ----------------------
17 files changed, 54 insertions(+), 239 deletions(-)
diff --git a/texmf/tex/latex/tagpdf/tagpdf-base.sty b/texmf/tex/latex/tagpdf/tagpdf-base.sty
index 94033ad9..0e7220b7 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-base.sty
+++ b/texmf/tex/latex/tagpdf/tagpdf-base.sty
@@ -25,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}
{
diff --git a/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty b/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty
index 367a746c..15df01d7 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-debug-generic.sty
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf-debug.sty b/texmf/tex/latex/tagpdf/tagpdf-debug.sty
index bac841f7..fe27dc45 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-debug.sty
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf-luatex.def b/texmf/tex/latex/tagpdf/tagpdf-luatex.def
index 021c829a..df0c8253 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-luatex.def
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty b/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty
index 254b5c1c..8de786b4 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-mc-code-generic.sty
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty b/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty
index e7ec855e..15a1a0d0 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-mc-code-lua.sty
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def b/texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def
index c73e98af..1bcd546b 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-ns-latex-book.def
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf-ns-latex-inline.def b/texmf/tex/latex/tagpdf/tagpdf-ns-latex-inline.def
index 05f27502..5323306b 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-ns-latex-inline.def
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def b/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def
index b6275cd8..aa90f54f 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-ns-latex.def
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def b/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def
index a3e97ada..f9404e71 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-ns-mathml.def
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def b/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def
index b6bb6391..2cfe3a9c 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-ns-pdf.def
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def b/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def
index 6c2c31df..d89a25be 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-ns-pdf2.def
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv b/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv
index 96faf168..e29387bf 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-parent-child-2.csv
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv b/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv
index cd410980..fac6a931 100644
--- a/texmf/tex/latex/tagpdf/tagpdf-parent-child.csv
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf.lua b/texmf/tex/latex/tagpdf/tagpdf.lua
index b4accfdb..d2ee6479 100644
--- a/texmf/tex/latex/tagpdf/tagpdf.lua
+++ b/texmf/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/texmf/tex/latex/tagpdf/tagpdf.sty b/texmf/tex/latex/tagpdf/tagpdf.sty
index ac06c3e7..38f35c6b 100644
--- a/texmf/tex/latex/tagpdf/tagpdf.sty
+++ b/texmf/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
@@ -2642,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
{
@@ -2676,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_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:}
}
- \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 at 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 at g__tag_struct_abs_int}_prop }
+ { A }
+ { \l__tag_attr_value_tl }
+ }
},
}
%% File: tagpdf-space.dtx
diff --git a/texmf/tex/latex/tagpdf/tagpdfdocu-patches.sty b/texmf/tex/latex/tagpdf/tagpdfdocu-patches.sty
deleted file mode 100644
index cc4eb9f4..00000000
--- a/texmf/tex/latex/tagpdf/tagpdfdocu-patches.sty
+++ /dev/null
@@ -1,188 +0,0 @@
-%\RequirePackage[enable-debug]{expl3}[2018/06/14]
-\ProvidesExplPackage {tagpdfdocu-patches} {2022-12-22} {0.98a}
- {patches/commands for the tagpdf documentation}
-\RequirePackage{etoolbox,xpatch}
-
-%vLogos
-
-\ExplSyntaxOn
-\DeclareRobustCommand\TeX{
- \tag_mc_end_push:
- \tag_struct_begin:n{tag=Span,alt=TeX,actualtext=TeX}
- \tagmcbegin{}
- T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@
- \tagmcend
- \tag_struct_end:
- \tag_mc_begin_pop:n{}}
-\DeclareRobustCommand{\LaTeX}{L\kern-.36em%
- {
- \tag_mc_end_push:
- \tag_struct_begin:n{tag=Span,alt=LaTeX,actualtext=LaTeX}
- \tagmcbegin{}
- \sbox\z@ T%
- \vbox to\ht\z@{\hbox{\check at mathfonts
- \fontsize\sf at size\z@
- \math at fontsfalse\selectfont
- A}%
- \vss}%
- }%
- \kern-.15em%
- T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\@
- \tagmcend
- \tag_struct_end:
- \tag_mc_begin_pop:n{}
- }
-% textbf
-
-\AddToHook{cmd/textbf/before}
- {\leavevmode\tag_mc_end_push:\tag_struct_begin:n{tag=Strong}\tagmcbegin{}}
-
-\AddToHook{cmd/textbf/after}
- {\tag_mc_end:\tag_struct_end:\tag_mc_begin_pop:n{}}
-
-
-\newcommand\minisec[1]{%
- \if at noskipsec \leavevmode \fi
- \par
- \@afterindentfalse
- \if at nobreak
- \everypar{}%
- \else
- \addpenalty\@secpenalty\addvspace{1.5ex}%
- \fi
- {\tagpdfsetup{paratag=H10}\parindent \z@
- \setlength{\parfillskip}{\z@ plus 1fil}%
- \raggedright\normalfont\bfseries\nobreak
- \nobreak\interlinepenalty \@M #1\par\nobreak%
- }\nobreak
- \@afterheading
-}
-
-
-
-%%%%
-%% Lists
-%% patches enumitem internals!
-%%%%
-\tagpdfsetup
- {
- newattribute =
- {itemize}{/O /List /ListNumbering/Unordered},
- newattribute =
- {enumerate}{/O /List /ListNumbering/Ordered},
- newattribute =
- {description}{/O /List /ListNumbering/Description},
- }
-\AddToHook{env/itemize/begin}{\par\tagstructbegin{tag=L,attribute-class=itemize}}%\par is needed to close the paragraph before.
-\AddToHook{env/itemize/end}{\par\tagstructend\tagstructend\tagstructend}%LBody,LI,L
-\AddToHook{env/enumerate/begin}{\par\tagstructbegin{tag=L,attribute-class=enumerate}}
-\AddToHook{env/enumerate/end}{\par\tagstructend\tagstructend\tagstructend}%LBody,LI,L
-\AddToHook{env/description/begin}{\par\tagstructbegin{tag=L,attribute-class=description}}
-\AddToHook{env/description/end}{\par\tagstructend\tagstructend\tagstructend}%LBody,LI,L
-
-\newcommand\tag at enit@format at preset[1]{%
- \str_if_eq:eeTF { \prop_item:cn { g__tag_struct_\g__tag_struct_stack_current_tl _prop }{S} }{/L}
- {
- %\typeout{BEGIN~OF~LIST}
- }
- {%\typeout{NEXT ITEM}
- \tagstructend\tagstructend} % for the LBody/LI
- \tagstructbegin{tag=LI}
- \tagstructbegin{tag=Lbl}
- \tagmcbegin{}
- #1
- \tagmcend
- \tagstructend
- \tagstructbegin{tag=LBody}
- }
-
-\ExplSyntaxOff
-\xpatchcmd\enit at preset{\@firstofone}{\tag at enit@format at preset}{}{\fail}
-%close mc from paratagging and reopen ...
-% this disturbs someone docCommand which has then a MC outside a P.
-\xpatchcmd\@item{\box\@labels}{\tagmcend \box\@labels \tagmcbegin{tag=P}}{}{\fail}
-\ExplSyntaxOn
-
-% keys that overwrite \enit at format must be patched, eg like the follow
-% the font key should be patched in a similar way
-\enitkv at key{}{format}{% new enumitem don't use first argument
- \def\enit at format{%
- \tagstructbegin{tag=LI}%
- \tagstructbegin{tag=Lbl}%
- \tagmcbegin{}%
- #1\tagmcend}}
-
-
-% listings + verbatim
-% the paragraph code could create span around the lines ...
-% we use Code for every line.
-
-\AddToHook{env/lstlisting/begin}{\tagpdfsetup{paratag=Code}}
-\AddToHook{env/lstlisting/end}{}
-
-\AddToHook{env/verbatim/begin}{\tagpdfsetup{paratag=Code}}
-\AddToHook{env/verbatim/end}{}
-
-\AddToHook{env/docCommand/begin}{\tagstructbegin{tag=P}\tagpdfsetup{paratag=Code}}
-\AddToHook{env/docCommand/end} {\tagstructend}
-
-% ======== marginnote ==========
-% TODO marginnote has a bug (a \par is missing) so it messes up tagging.
-% but currently unneeded as we marked them up as artifacts anyway as they don't contain
-% meaningful contents
-
-\NewDocumentCommand\sidenote{m}
- {
- \tag_mc_artifact_group_begin:n{notype}\tagpdfparaOff\marginnote{#1}\tag_mc_artifact_group_end:
- }
-
-% ======== tikzpicture ==========
-% TODO this needs some investigation: it messes up the stack if one add paraOff
-
-\AddToHook{env/tikzpicture/begin}{}
-
-%======== tcolorbox ========
-% We switch of paratagging at the begin and reenable it locally in before upper.
-% the before upper setting is dangerous as it can be overwritten by
-% users. So a more stable hook is needed.
-%\AddToHook{env/tcolorbox/begin}{\tagpdfparaOff}
-%\AddToHook{env/docCommand/begin}{\tagpdfparaOff}
-%\tcbset{before~upper=\tagpdfparaOn}
-\AddToHook{env/tcolorbox/begin}{\tagpdfparaOff \tcbset{before~upper=\tagpdfparaOn}}
-\AddToHook{env/docCommand/begin}{\tagpdfparaOff \tcbset{before~upper=\tagpdfparaOn}}
-\ExplSyntaxOff
-% ======= footnote ========
-% done in testphase code
-
-% ======= bibliography ========
-% biblatex. Creates some empty mc-chunks.
-% no internal patches, but redefining begentry/finentry is not safe.
-% better hook is needed.
-
-\newbibmacro*{begentry}{\tagstructbegin{tag=BibEntry}\tagmcbegin{}}
-\newbibmacro*{finentry}{\finentry\tagmcend\tagstructend}
-
-% ====== hyperref ========
-% this should probably go into tagpdf, but it is related to
-% problem of pdf strings and context ....
-
-\AddToHook{package/hyperref/after}
- {%
- \pdfstringdefDisableCommands{%
- \let\tagstructbegin\@gobble
- \let\tagmcbegin\@gobble
- \let\tagmcend\relax
- \let\tagstructend\relax
- }}{}
-
-
-%====== pictures ========
-% PAC3 complained that the BBox is missing, so we are cheating for now
-% and add a fix size.
-\tagpdfsetup
- {
- newattribute =
- {bbox}{/O /Layout /BBox [0 0 100 100]}
- }
-
-\endinput
More information about the latex3-commits
mailing list.