summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex-dev
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-09-14 20:25:56 +0000
committerKarl Berry <karl@freefriends.org>2023-09-14 20:25:56 +0000
commit1d3ae017495efdb1b2d9fbdc639b3d9a1088c3fb (patch)
tree7f5a65cf5215a622f7759f51a1c6114616fa4b0f /Master/texmf-dist/tex/latex-dev
parentbdf29fccef93127229dd75857543360f7932afa3 (diff)
latex-lab-dev (14sep23)
git-svn-id: svn://tug.org/texlive/trunk@68279 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex-dev')
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/bib-latex-lab-testphase.ltx5
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/block-latex-lab-testphase.ltx (renamed from Master/texmf-dist/tex/latex-dev/latex-lab/block-tagging-latex-lab-testphase.ltx)20
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/documentmetadata-support.ltx14
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/firstaid-latex-lab-testphase.ltx5
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/float-latex-lab-testphase.ltx4
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/graphic-latex-lab-testphase.ltx4
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footmisc.ltx96
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footnotes.ltx240
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-kernel-changes.sty20
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-math.ltx (renamed from Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathtagging.ltx)49
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-bib.sty6
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-block.sty (renamed from Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-block-tagging.sty)85
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-firstaid.sty43
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-float.sty43
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-graphic.sty4
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-math.sty7
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-minipage.sty13
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-1.sty42
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-2.sty74
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-sec.sty47
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-text.sty7
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-toc.sty23
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/math-latex-lab-testphase.ltx5
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/minipage-latex-lab-testphase.ltx9
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/new-or-1-latex-lab-testphase.ltx10
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/new-or-latex-lab-testphase.ltx3
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/phase-I-latex-lab-testphase.ltx1
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/phase-II-latex-lab-testphase.ltx3
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/phase-III-latex-lab-testphase.ltx5
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/sec-latex-lab-testphase.ltx (renamed from Master/texmf-dist/tex/latex-dev/latex-lab/sec-tagging-latex-lab-testphase.ltx)10
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-latex-lab-testphase.ltx1
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-ns-latex-lab.def42
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/text-latex-lab-testphase.ltx6
-rw-r--r--Master/texmf-dist/tex/latex-dev/latex-lab/toc-latex-lab-testphase.ltx (renamed from Master/texmf-dist/tex/latex-dev/latex-lab/toc-tagging-latex-lab-testphase.ltx)15
34 files changed, 574 insertions, 387 deletions
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/bib-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/bib-latex-lab-testphase.ltx
index 1b8ca3cb7ad..b15043fd884 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/bib-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/bib-latex-lab-testphase.ltx
@@ -33,8 +33,11 @@
%%
%%
%% File: latex-lab-bib.dtx (C) Copyright 2023 LaTeX Project
+\def\ltlabbibdate{2023-07-20}
+\def\ltlabbibversion{0.81a}
\ProvidesFile{bib-latex-lab-testphase.ltx}
- [2023-05-18 v0.8 code related to the tagging of bib and citations]
+ [\ltlabbibdate\space v\ltlabbibversion\space
+ latex-lab wrapper bib]
\RequirePackage{latex-lab-testphase-bib}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/block-tagging-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/block-latex-lab-testphase.ltx
index 80eb00b8567..98dd43bb43d 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/block-tagging-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/block-latex-lab-testphase.ltx
@@ -1,10 +1,10 @@
%%
-%% This is file `block-tagging-latex-lab-testphase.ltx',
+%% This is file `block-latex-lab-testphase.ltx',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
-%% latex-lab-block-tagging.dtx (with options: `latex-lab')
+%% latex-lab-block.dtx (with options: `latex-lab')
%%
%% This is a generated file.
%%
@@ -32,17 +32,15 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-block-tagging.dtx (C) Copyright 2021-2023 LaTeX Project
-
-\def\ltblocksversion{v0.8d}
-\def\ltblocksdate{2023/06/07}
-
-\ProvidesFile{block-tagging-latex-lab-testphase.ltx}
- [\ltblocksdate\space \ltblocksversion\space
+%% File: latex-lab-block.dtx (C) Copyright 2021-2023 LaTeX Project
+\def\ltlabblockdate{2023-09-01}
+\def\ltlabblockversion{0.8h}
+\ProvidesFile{block-latex-lab-testphase.ltx}
+ [\ltlabblockdate\space v\ltlabblockversion\space
blockenv implementation]
-\RequirePackage{latex-lab-testphase-block-tagging}
+\RequirePackage{latex-lab-testphase-block}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\endinput
%%
-%% End of file `block-tagging-latex-lab-testphase.ltx'.
+%% End of file `block-latex-lab-testphase.ltx'.
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/documentmetadata-support.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/documentmetadata-support.ltx
index ba72b004841..fa6a346a3a8 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/documentmetadata-support.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/documentmetadata-support.ltx
@@ -33,8 +33,8 @@
%%
%%
%% File: documentmetadata-support.dtx
-\def\documentmetadatasupportversion{1.0d}
-\def\documentmetadatasupportdate{2023-06-07}
+\def\documentmetadatasupportversion{1.0f}
+\def\documentmetadatasupportdate{2023-09-01}
\RequirePackage{pdfmanagement-testphase}
\ExplSyntaxOn\makeatletter
@@ -180,6 +180,16 @@
\tagpdfsetup{log=#1}
}
}
+ ,debug / tagpdf .code:n =
+ {
+ \AddToHook
+ {
+ package/tagpdf/after
+ }
+ {
+ \RequirePackage{tagpdf-debug}
+ }
+ }
,debug / uncompress .code:n =
{
\pdf_uncompress:
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/firstaid-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/firstaid-latex-lab-testphase.ltx
index 4d8ea15f1e0..f8719fcdfbf 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/firstaid-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/firstaid-latex-lab-testphase.ltx
@@ -33,9 +33,12 @@
%%
%%
%% File: latex-lab-firstaid.dtx (C) Copyright 2023 LaTeX Project
+\def\ltlabfirstaiddate{2023-07-20}
+\def\ltlabfirstaidversion{0.85a}
\ProvidesFile{firstaid-latex-lab-testphase.ltx}
- [2023-06-04 v0.8 Temporary patches to external packages need for the tagging project]
+ [\ltlabfirstaiddate\space v\ltlabfirstaidversion\space
+ latex-lab wrapper firstaid]
\RequirePackage{latex-lab-testphase-firstaid}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/float-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/float-latex-lab-testphase.ltx
index 29a76c4ed93..3f8eefffbdd 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/float-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/float-latex-lab-testphase.ltx
@@ -33,9 +33,11 @@
%%
%%
%% File: latex-lab-float.dtx (C) Copyright 2023 LaTeX Project
+\def\ltlabfloatdate{2023-07-20}
+\def\ltlabfloatversion{0.81a}
\ProvidesFile{float-latex-lab-testphase.ltx}
- [2023-04-30 v0.8 code related to the tagging of floats]
+ [\ltlabfloatdate\space v\ltlabfloatversion\space latex-lab wrapper float]
\RequirePackage{latex-lab-testphase-float}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/graphic-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/graphic-latex-lab-testphase.ltx
index 12fd17f5d2c..858853ed3f6 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/graphic-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/graphic-latex-lab-testphase.ltx
@@ -33,9 +33,11 @@
%%
%%
%% File: latex-lab-graphic.dtx (C) Copyright 2022-2023 LaTeX Project
+\def\ltlabgraphicdate{2023-07-20}
+\def\ltlabgraphicversion{0.80a}
\ProvidesFile{graphic-latex-lab-testphase.ltx}
- [2023-04-07 v0.8 code related to the tagging included graphics]
+ [\ltlabgraphicdate\space v\ltlabgraphicversion\space latex-lab wrapper graphic]
\RequirePackage{latex-lab-testphase-graphic}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footmisc.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footmisc.ltx
index 79d3063aeb4..a4c95e4cb11 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footmisc.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footmisc.ltx
@@ -33,9 +33,12 @@
%%
%%
%% File: latex-lab-footnotes.dtx
+\def\ltlabfootnotedate{2023-09-04}
+\def\ltlabfootnoteversion{0.8c}
+
%%
%% Copyright (c) 1995-2011 Robin Fairbairns
-%% Copyright (c) 2018-2022 Robin Fairbairns, Frank Mittelbach
+%% Copyright (c) 2018-2023 Robin Fairbairns, Frank Mittelbach
%%
%% This file is part of the `latex-lab Bundle'.
%% --------------------------------------------
@@ -50,9 +53,6 @@
%%
%% This work has the LPPL maintenance status 'maintained'.
%%
-%%
-%% File: footmisc.dtx (C) Copyright 1995-2011 Robin Fairbairns
-%% (C) Copyright 2018-2022 Frank Mittelbach
\NeedsTeXFormat{LaTeX2e}
\providecommand\DeclareRelease[3]{}
\providecommand\DeclareCurrentRelease[2]{}
@@ -92,14 +92,13 @@
option "para"}%
{I shall ignore "\CurrentOption"}%
\else
- \def\@footnotetext@cfgpoint {\marginpar}
\AddToHook{fntext/para}{%
\hsize\marginparwidth % correct the default \hsize
\footnotesep\z@ % don't add a default separation
}
- \def\@footnotetext@cfgpointii {\@makefntext}
- \def\@footnotetext@cfgpointiii {}
- \def\@footnotetext@cfgpointiv {}
+ \AssignSocketPlug{fntext/process}{side}
+ \AssignSocketPlug{fntext/begin}{noop}
+ \AssignSocketPlug{fntext/end}{noop}
\fi
}
\let\footnotelayout\@empty
@@ -168,9 +167,10 @@
\DeclareOption{multiple}{\FN@multiplefootnotetrue}
\ProcessOptions
\ifFN@para
- \def\@makecol@cfgpointii {%
+ \NewSocketPlug{@makecol/footnotes}{para}{%
\global\setbox\footins\vbox{\FN@makefootnoteparagraph}%
}
+ \AssignSocketPlug{@makecol/footnotes}{para}
\fi
\ifFN@fixskip
\def\@outputbox@removebskip{%
@@ -193,61 +193,27 @@
\let\@outputbox@reinsertbskip\relax
\fi
\ifcase \FN@bottomcases\relax
-\ERROR
-\or
+ \ERROR
+\or %1
\ifFN@abovefloats
- \def\@makecol@cfgpoint {%
- \@if@footnotes@TF
- {\@outputbox@append{\vfill}}%
- {\@if@bfloats@TF{\@outputbox@append{\vfill}}%
- {\@outputbox@reinsertbskip}}%
- \@outputbox@appendfootnotes
- \@outputbox@attachfloats
- }
+ \AssignSocketPlug {@makecol/outputbox}{space-footnotes-floats}
\else
- \def\@makecol@cfgpoint {%
- \@outputbox@attachfloats
- \@if@footnotes@TF
- {\@outputbox@append{\vfill}}%
- {\@outputbox@reinsertbskip}%
- \@outputbox@appendfootnotes
- }
+ \AssignSocketPlug {@makecol/outputbox}{floats-footnotes-space}
\fi
-\or
+\or %2
\ifFN@abovefloats
- \def\@makecol@cfgpoint {%
- \@outputbox@appendfootnotes
- \@if@bfloats@TF
- {\@outputbox@append{\vfill}}%
- {\@outputbox@reinsertbskip}%
- \@outputbox@attachfloats
- }
+ \AssignSocketPlug {@makecol/outputbox}{footnotes-space-floats}
\else
- \def\@makecol@cfgpoint {%
- \@if@footnotes@TF
- {\@outputbox@append{\vfill}}%
- {\@if@bfloats@TF{\@outputbox@append{\vfill}}%
- {\@outputbox@reinsertbskip}}%
- \@outputbox@attachfloats
- \@outputbox@appendfootnotes
- }
+ \AssignSocketPlug {@makecol/outputbox}{space-floats-footnotes}
\fi
-\or
+\or %3
\ifFN@abovefloats
- \def\@makecol@cfgpoint {%
- \@outputbox@appendfootnotes
- \@outputbox@attachfloats
- \@outputbox@reinsertbskip
- }
+ \AssignSocketPlug {@makecol/outputbox}{footnotes-floats}
\else
- \def\@makecol@cfgpoint {%
- \@outputbox@attachfloats
- \@outputbox@appendfootnotes
- \@outputbox@reinsertbskip
-}
+ \AssignSocketPlug {@makecol/outputbox}{floats-footnotes}
\fi
\else
-\ERROR
+ \ERROR
\fi
\newif\ifFN@setspace
@@ -268,23 +234,11 @@
}
\ifFN@para
- \def\@footnotetext@cfgpoint {\insert\footins}
- \long\def\@footnotetext@cfgpointii #1{%
- \setbox\FN@tempboxa\hbox{\@makefntext{#1}}%
- \dp\FN@tempboxa\z@
- \ht\FN@tempboxa
- \dimexpr\wd\FN@tempboxa *%
- \footnotebaselineskip /\columnwidth\relax
- \box\FN@tempboxa
- }
+ \AssignSocketPlug{fntext/make}{para}
+ \AssignSocketPlug{fntext/begin}{noop}
+ \AssignSocketPlug{fntext/end}{para}
- \def\@footnotetext@cfgpointiii {}
- \def\@footnotetext@cfgpointiv {% config point
- \strut
- \penalty-10\relax
- \hskip\footglue
- }
\fi
\ifFN@para
@@ -347,7 +301,7 @@
-\AddToHook{fntext/begin}{\nobreak \hspace{.2em}}
+ \AddToHook{fntext/begin}{\nobreak \hspace{.2em}}
\else
@@ -611,7 +565,7 @@
{\mathparagraph\mathparagraph\mathparagraph}%
}
\newcommand\mpfootnotemark{%
- \@ifnextchar[%
+ \@ifnextchar[%]
\@xmpfootnotemark
{%
\stepcounter\@mpfn
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footnotes.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footnotes.ltx
index 4a3a046a21d..c7615b453b9 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footnotes.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-footnotes.ltx
@@ -33,8 +33,12 @@
%%
%%
%% File: latex-lab-footnotes.dtx
+\def\ltlabfootnotedate{2023-09-04}
+\def\ltlabfootnoteversion{0.8c}
+
\ProvidesFile{latex-lab-footnotes.ltx}
- [2023-02-04 v0.7 changes to the footnote interfaces]
+ [\ltlabfootnotedate\space v\ltlabfootnoteversion\space
+ changes to the footnote interfaces]
%% alterations not covered:
\ExplSyntaxOn
@@ -54,7 +58,6 @@
\bool_set_true:N \l__fnote_autodetect_bool
\tl_new:N \l__fnote_currentstruct_tl
\tl_set:Nn \l__fnote_currentstruct_tl {1}
-\cs_generate_variant:Nn \ref_label:nn { Vn }
\cs_generate_variant:Nn \ref_value:nn { Vn }
\cs_generate_variant:Nn \prop_gput:Nnn {cxn}
\cs_generate_variant:Nn \hook_gput_code:nnn{nne}
@@ -99,11 +102,11 @@
{
\bool_if:NT \g_fnote_debug_bool
{
- \LogHook{fnmark/before}
- \LogHook{fnmark}
- \LogHook{fnmark/begin}
- \LogHook{fnmark/end}
- \LogHook{fnmark/after}
+ \hook_log:n {fnmark/before}
+ \hook_log:n {fnmark}
+ \hook_log:n {fnmark/begin}
+ \hook_log:n {fnmark/end}
+ \hook_log:n {fnmark/after}
\cs_gset_eq:NN \__fnote_debug_footnotemark: \prg_do_nothing:
}
}
@@ -111,52 +114,56 @@
{
\bool_if:NT \g_fnote_debug_bool
{
- \cs_log:N\@footnotetext@cfgpoint
- \cs_log:N\@footnotetext@cfgpointii
- \cs_log:N\@footnotetext@cfgpointiii
- \cs_log:N\@footnotetext@cfgpointiv
- \cs_log:N\@makefntext@cfgpoint
- \cs_log:N\@makefntext@cfgpointii
- \LogHook{fntext/before}
- \LogHook{fntext}
- \LogHook{fntext/para}
- \LogHook{fntext/begin}
- \LogHook{fntext/end}
- \LogHook{fntext/after}
+ \socket_log:n {fntext/process}
+ \socket_log:n {fntext/make}
+ \socket_log:n {fntext/begin}
+ \socket_log:n {fntext/end}
+ \socket_log:n {fntext/mark}
+ \socket_log:n {fntext/text}
+ \socket_log:n {tagsupport/fnmark}
+ \socket_log:n {tagsupport/fntext/begin}
+ \socket_log:n {tagsupport/fntext/end}
+ \socket_log:n {tagsupport/fntext/mark}
+ \socket_log:n {tagsupport/fntext/text}
+ \hook_log:n {fntext/before}
+ \hook_log:n {fntext}
+ \hook_log:n {fntext/para}
+ \hook_log:n {fntext/begin}
+ \hook_log:n {fntext/end}
+ \hook_log:n {fntext/after}
\cs_gset_eq:NN \__fnote_debug_footnotetext: \prg_do_nothing:
}
}
\cs_new_protected:Npn \fnote_footnotemark: {
\__fnote_debug_footnotemark:
- \UseHook{fnmark/before}
+ \hook_use:n {fnmark/before}
\leavevmode
\ifhmode
\edef\@x@sf{\the\spacefactor}
- \UseHook{fnmark}
+ \hook_use:n {fnmark}
\nobreak
\fi
- \UseHook{fnmark/begin}
- \@kernel@process@makefnmark
- \@makefnmark
+ \hook_use:n {fnmark/begin}
+ \socket_use:nn {tagsupport/fnmark} \@makefnmark
\__fnote_footnotemark_finish:
}
-\cs_new_protected:Npn \__fnote_finish: {
+\cs_new_protected:Npn \__fnote_footnotemark_default_finish: {
\UseHook{fnmark/end}
\ifhmode
\spacefactor \@x@sf \relax
\fi
\UseHook{fnmark/after}
}
-
-\cs_new_eq:NN \__fnote_footnotemark_finish: \__fnote_finish:
-\def \@kernel@process@makefnmark { }
+\cs_new_eq:NN \__fnote_footnotemark_finish: \__fnote_footnotemark_default_finish:
+\NewSocket{tagsupport/fnmark}{1}
\cs_set_eq:NN \@footnotemark \fnote_footnotemark:
\cs_new_protected:Npn \fnote_footnotetext:n #1 {
\__fnote_debug_footnotetext:
- \UseHook{fntext/before}
- \@kernel@process@footnotetext
- \@footnotetext@cfgpoint { % config point
- \UseHook{fntext}
+ \hook_use:n {fntext/before}
+ \socket_use:n {tagsupport/fntext/begin}
+ \socket_use:nn {fntext/process}
+ {
+ \hook_use:n {fntext}
\reset@font
\footnotesize
\interlinepenalty\interfootnotelinepenalty
@@ -168,27 +175,53 @@
\parindent 1em % typical default used in \@makefntext moved up here
\def\@currentcounter{footnote}
\protected@edef \@currentlabel { \p@footnote \@thefnmark }
- \UseHook{fntext/para}
+ \hook_use:n {fntext/para}
\color@begingroup
- \@footnotetext@cfgpointii % config point
+ \socket_use:nn {fntext/make}
{
- \@footnotetext@cfgpointiii % config point
- \UseHook{fntext/begin}
+ \socket_use:n {fntext/begin}%
+ \hook_use:n {fntext/begin}
\ignorespaces
#1
- \UseHook{fntext/end}
- \@footnotetext@cfgpointiv % config point
+ \hook_use:n {fntext/end}
+ \socket_use:n {fntext/end}
}
\par
\color@endgroup
}
- \UseHook{fntext/after}
+ \socket_use:n{tagsupport/fntext/end}
+ \hook_use:n {fntext/after}
+}
+\NewSocket {fntext/process}{1}
+\NewSocketPlug{fntext/process}{default}{ \insert\footins {#1} }
+\NewSocketPlug{fntext/process}{side} { \marginpar {#1} }
+\AssignSocketPlug{fntext/process}{default}
+\NewSocket {fntext/make}{1}
+\NewSocketPlug{fntext/make}{default}{ \@makefntext {#1} }
+\NewSocketPlug{fntext/make}{para}
+{
+ \setbox\FN@tempboxa\hbox{\@makefntext{#1}}%
+ \dp\FN@tempboxa\z@
+ \ht\FN@tempboxa
+ \dimexpr\wd\FN@tempboxa *%
+ \footnotebaselineskip /\columnwidth\relax
+ \box\FN@tempboxa
}
-\cs_new_protected:Npn \@footnotetext@cfgpoint { \insert\footins }
-\cs_new_protected:Npn \@footnotetext@cfgpointii { \@makefntext }
-\cs_new_protected:Npn \@footnotetext@cfgpointiii { \rule\z@\footnotesep }
-\cs_new_protected:Npn \@footnotetext@cfgpointiv { \@finalstrut\strutbox }
-\cs_new_protected:Npn \@kernel@process@footnotetext {}
+\AssignSocketPlug{fntext/make}{default}
+\NewSocket {fntext/begin}{0}
+\NewSocketPlug{fntext/begin}{default}{ \rule\z@\footnotesep }
+\AssignSocketPlug{fntext/begin}{default}
+\NewSocket {fntext/end}{0}
+\NewSocketPlug{fntext/end}{default}{ \@finalstrut\strutbox }
+\NewSocketPlug{fntext/end}{para}
+ {%
+ \strut
+ \penalty-10\relax
+ \hskip\footglue
+ }
+\AssignSocketPlug{fntext/end}{default}
+\NewSocket{tagsupport/fntext/begin}{0}
+\NewSocket{tagsupport/fntext/end}{0}
\AddToHook{begindocument}
{
\cs_set_eq:NN \@footnotetext \fnote_footnotetext:n
@@ -202,29 +235,31 @@
\setlength\footnotemargin{1.8em}
\fi
}
-
\cs_new_protected:Npn \fnote_makefntext:n #1 {
- \@makefntext@cfgpoint
- {
- \ifdim\footnotemargin>\z@
- \hb@xt@ \footnotemargin{\hss\@makefnmark}
- \else
- \ifdim\footnotemargin=\z@
- \llap{\@makefnmark}
- \else
- \ifdim\footnotemargin=-\maxdimen
- \@makefnmark
- \else
- \llap{\hb@xt@ -\footnotemargin{\@makefnmark\hss}}
- \fi
- \fi
- \fi
- }
- \@makefntext@cfgpointii
- { #1 }
+ \noindent
+ \socket_use:nn {tagsupport/fntext/mark} { \socket_use:n {fntext/mark} }
+ \socket_use:nn {tagsupport/fntext/text} { \socket_use:nn {fntext/text}{#1} }
+}
+\NewSocket {fntext/mark}{0}
+\NewSocketPlug{fntext/mark}{default}{
+ \ifdim\footnotemargin>\z@
+ \hb@xt@ \footnotemargin{\hss\@makefnmark}
+ \else
+ \ifdim\footnotemargin=\z@
+ \llap{\@makefnmark}
+ \else
+ \ifdim\footnotemargin=-\maxdimen
+ \@makefnmark
+ \else
+ \llap{\hb@xt@ -\footnotemargin{\@makefnmark\hss}}
+ \fi
+ \fi
+ \fi
}
-\cs_new_protected:Npn \@makefntext@cfgpoint { \noindent }
-\cs_new_protected:Npn \@makefntext@cfgpointii #1 { #1 }
+\AssignSocketPlug{fntext/mark}{default}
+\NewSocket {fntext/text}{1}
+\NewSocket{tagsupport/fntext/mark}{1}
+\NewSocket{tagsupport/fntext/text}{1}
\newcommand\old@std@class@makefntext[1]{%
\parindent 1em%
\noindent
@@ -234,7 +269,7 @@
\cs_new_protected:Npn \__fnote_patch:
{
- \tl_set:No \l__fnote_patch_tl { \@makefntext { \@makefntext@cfgpointii{##1} } }
+ \tl_set:No \l__fnote_patch_tl { \@makefntext { \UseSocket{tagsupport/fntext/text}{##1} } }
\tl_if_in:NnTF \l__fnote_patch_tl { \hbox }
{ \cs_set_eq:NN \__fnote_tmp:w \__fnote_patch_hbox:w }
{
@@ -258,7 +293,7 @@
{ \exp_stop_f: #1 \@makefntext@processX { \hb@xt@ #2 } }
\cs_new:Npn \__fnote_patch_@makefnmark:w #1 \@makefnmark
{ \exp_stop_f: #1 \@makefntext@processX { \use:n } { \@makefnmark } }
-\cs_new:Npn \@makefntext@processX #1#2{\@makefntext@cfgpoint{#1{#2}}}
+\cs_new:Npn \@makefntext@processX #1#2{\UseSocket{tagsupport/fntext/mark}{#1{#2}}}
\AddToHook{begindocument}
{
@@ -281,7 +316,7 @@
\fnote_step_fnmark:nn {#1} \@mpfn
\cs_set_eq:NN \__fnote_footnotemark_finish: \prg_do_nothing:
\@footnotemark
- \cs_set_eq:NN \__fnote_footnotemark_finish: \__fnote_finish:
+ \cs_set_eq:NN \__fnote_footnotemark_finish: \__fnote_footnotemark_default_finish:
\@footnotetext {#2}
\__fnote_footnotemark_finish:
}
@@ -302,20 +337,13 @@
\@footnotemark
\bool_set_true:N \l__fnote_autodetect_bool
}
-\cs_new_protected:Npn \@mpfootnotetext@cfgpoint #1
+\NewSocketPlug{fntext/process}{mp}
{
\global\setbox\@mpfootins\vbox{%
\unvbox\@mpfootins
#1
}
}
-\RequirePackage{etoolbox}
-\ExplSyntaxOff
-\patchcmd\@iiiminipage
- {\let\@footnotetext\@mpfootnotetext}
- {\let\@footnotetext@cfgpoint\@mpfootnotetext@cfgpoint}
- {}{\ERROR}
-\ExplSyntaxOn
\AddToHook{class/memoir/before}
{ \let\new@std@class@makecol\@makecol }
\AddToHook{class/memoir/after}
@@ -344,28 +372,21 @@
}
}
\ref_attribute_gset:nnnn {fnote/struct}{1}{now}{\l__fnote_currentstruct_tl}
-\cs_new_protected:Npn \__fnote_label_hook: {}
-\AddToHook{begindocument/before}
- {
- \RequirePackage{nameref}
- \g@addto@macro\label@hook
- {
- \__fnote_label_hook:
- }
- }
+\cs_new_protected:Npn \__fnote_label_hook:n #1 {}
+\AddToHookWithArguments{label}{ \__fnote_label_hook:n{#1}}
\AddToHook{fntext/begin}
{
- \cs_set_protected:Npn \__fnote_label_hook:
+ \cs_set_protected:Npn \__fnote_label_hook:n #1
{
- \ref_label:Vn \label@name {fnote/struct}
+ \ref_label:nn {#1} {fnote/struct}
}
}
-\cs_new_protected:Npn \fnote_new:nn #1 #2 % #1 name, #2 options
+\cs_new_protected:Npn \fnote_class_new:nn #1 #2 % #1 name, #2 options
{
\prop_new:c { g__fnote_currentmarks_ #1 _prop }
}
-\fnote_new:nn {default}{}
+\fnote_class_new:nn {default}{}
\cs_new_protected:Npn \fnote_mark_gput:nn #1 #2 % #1 the representation of the mark, #2 type
{
\prop_gput:cxn { g__fnote_currentmarks_ #2 _prop }
@@ -374,7 +395,7 @@
}
\cs_generate_variant:Nn \fnote_mark_gput:nn {no,oo}
-\cs_new_protected:Npn \fnote_mark_gpop:nnN #1 #2 #3
+\cs_new_protected:Npn \fnote_mark_gpop_all:nnN #1 #2 #3
{
\seq_clear:N #3
\prop_set_eq:Nc \l__fnote_tmpa_prop { g__fnote_currentmarks_ #2 _prop }
@@ -387,9 +408,8 @@
}
}
}
-\cs_generate_variant:Nn\fnote_mark_gpop:nnN {ooN}
-
-\cs_new_protected:Npn \tag@FEMark #1 %#1 content
+\cs_generate_variant:Nn\fnote_mark_gpop_all:nnN {ooN}
+\NewSocketPlug{tagsupport/fnmark}{FEMark}
{
\tag_mc_end_push:
\tag_struct_begin:n { tag=footnotemark }
@@ -423,8 +443,7 @@
\tag_struct_end:
\tag_mc_begin_pop:n{}
}
-\cs_set_eq:NN \@kernel@process@makefnmark \tag@FEMark
-
+\AssignSocketPlug{tagsupport/fnmark}{FEMark}
\cs_new_protected:Npn \__fnote_gput_ref:nn #1 #2 %#1 the structure number receiving the ref #2
{
@@ -441,7 +460,7 @@
\cs_generate_variant:Nn \fnote_gput_refs:nn {ee}
\tl_new:N \l__fnote_dflt_struct_tl
\tl_set:Nn \l__fnote_dflt_struct_tl {1}
-\cs_new_protected:Npn \tag@FENote #1#2 % #1 config point, \insert\footins #2 content
+\NewSocketPlug{tagsupport/fntext/begin}{FENote}
{
\tag_mc_end_push:
\tag_check_child:nnTF {FENote}{pdf2}
@@ -455,7 +474,7 @@
\tag_struct_begin:n { tag=footnotelabel }\tag_struct_end:
\bool_if:NTF \l__fnote_autodetect_bool
{
- \fnote_mark_gpop:ooN { \@thefnmark }{ \l_fnote_type_tl } \l__fnote_currentrefs_seq
+ \fnote_mark_gpop_all:ooN { \@thefnmark }{ \l_fnote_type_tl } \l__fnote_currentrefs_seq
\seq_map_inline:Nn \l__fnote_currentrefs_seq
{
\fnote_gput_refs:ee {##1}{ \l__fnote_currentstruct_tl }
@@ -464,20 +483,18 @@
{%no auto
}
- #1 {#2}
- \tag_struct_end:
- \tag_mc_begin_pop:n{}
}
-\cs_set_eq:NN \@kernel@process@footnotetext \tag@FENote
-\cs_set_protected:Npn \@makefntext@cfgpoint #1 %#1 code that typesets the mark.
+
+\NewSocketPlug{tagsupport/fntext/end}{FENote}
{
- \noindent
- \tag_mc_end_push:
- \tag@FENoteLbl { #1 }
+ \tag_struct_end:
\tag_mc_begin_pop:n{}
}
-\cs_new_protected:Npn \tag@FENoteLbl #1
+\AssignSocketPlug{tagsupport/fntext/begin}{FENote}
+\AssignSocketPlug{tagsupport/fntext/end}{FENote}
+\NewSocketPlug{tagsupport/fntext/mark}{FENoteLbl}
{
+ \tag_mc_end_push:
%\seq_show:N\l__fnote_currentrefs_seq
\seq_map_inline:Nn\l__fnote_currentrefs_seq {\MakeLinkTarget*{footnote*.##1}}
\MakeLinkTarget*{footnote*.\l__fnote_currentstruct_tl}
@@ -486,19 +503,18 @@
#1
\tag_mc_end:
\tag_struct_end:
- }
-\cs_set_protected:Npn \@makefntext@cfgpointii #1
- {
- \tag_mc_end_push:
- \tag@FENotetext { #1 }
\tag_mc_begin_pop:n{}
}
-\cs_new_protected:Npn \tag@FENotetext #1
+\AssignSocketPlug{tagsupport/fntext/mark}{FENoteLbl}
+\NewSocketPlug{tagsupport/fntext/text}{FENotetext}
{
+ \tag_mc_end_push:
\tag_mc_begin:n{}
#1
\tag_mc_end:
+ \tag_mc_begin_pop:n{}
}
+\AssignSocketPlug{tagsupport/fntext/text}{FENotetext}
\ExplSyntaxOff
\endinput
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-kernel-changes.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-kernel-changes.sty
index 2c990ee7ef8..14294ee125a 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-kernel-changes.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-kernel-changes.sty
@@ -33,7 +33,12 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-toc-kernel-functions.dtx (C) Copyright 2022-2023 LaTeX Project
+%% File: latex-lab-toc-kernel-changes.dtx (C) Copyright 2022-2023 LaTeX Project
+\def\ltlabkerneldate{2023-07-20}
+\def\ltlabkernelversion{0.85a}
+\ProvidesPackage{latex-lab-kernel-changes}
+ [\ltlabkerneldate\space v\ltlabkernelversion\space
+ General kernel and class changes]
\def\hyper@nopatch@counter{}
\def\@definecounter#1{\expandafter\newcount\csname c@#1\endcsname
\setcounter{#1}\z@
@@ -72,13 +77,16 @@
\def\toclevel@subparagraph{5}
\def\toclevel@figure{1}
\def\toclevel@table{1}
-
%% File: latex-lab-sec.dtx (C) Copyright 2022-2023 LaTeX Project
+\def\ltlabsecdate{2023-07-20}
+\def\ltlabsecversion{0.84a}
\ifdefined\directlua
- \pdfvariable gentounicode =1
- \protected\def\pdfglyphtounicode {\pdfextension glyphtounicode }
- \protected\edef\pdfgentounicode {\pdfvariable gentounicode}
- \input{glyphtounicode}
+ \ifnum\outputmode > 0
+ \pdfvariable gentounicode =1
+ \protected\def\pdfglyphtounicode {\pdfextension glyphtounicode }
+ \protected\edef\pdfgentounicode {\pdfvariable gentounicode}
+ \input{glyphtounicode}
+ \fi
\fi
\ifdefined\pdfglyphtounicode
\input{glyphtounicode-cmex}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathtagging.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-math.ltx
index d333b5ca9a3..1b96a15a65f 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-mathtagging.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-math.ltx
@@ -1,10 +1,10 @@
%%
-%% This is file `latex-lab-mathtagging.ltx',
+%% This is file `latex-lab-math.ltx',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
-%% latex-lab-mathtagging.dtx (with options: `kernel')
+%% latex-lab-math.dtx (with options: `kernel')
%%
%% This is a generated file.
%%
@@ -32,14 +32,14 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-mathtagging.dtx
-\def\ltmathtaggingdate{2023-03-08}
-\def\ltmathtaggingversion{v0.5a}
-\ProvidesFile{latex-lab-mathtagging.ltx}
- [\ltmathtaggingdate\space
- \ltmathtaggingversion\space
+%% File: latex-lab-math.dtx
+\def\ltlabmathdate{2023-09-11}
+\def\ltlabmathversion{0.5c}
+\ProvidesFile{latex-lab-math.ltx}
+ [\ltlabmathdate\space
+ v\ltlabmathversion\space
Grab all the math(s) and tag it (experiments)]
-\AddToHook{begindocument/before}{\RequirePackage{latex-lab-testphase-block-tagging}}
+\AddToHook{begindocument/before}{\RequirePackage{latex-lab-testphase-block}}
\ExplSyntaxOn
\tl_gput_right:Nn \@kernel@before@begindocument
{ \RequirePackage { amsmath } }
@@ -70,11 +70,20 @@
\tl_if_blank:nF {#1}
{
\__math_process:nn { math } {#1} % $
- \tagmcend %end P-chunk, in code: \tag_mc_end_push:
- \@kernel@math@begin
- #1 $
- \@kernel@math@end
- \tagmcbegin{} % restart P-chunk (whatsits in pdftex)
+ \legacy_if:nTF { measuring@ }
+ { #1 $ }
+ {
+ \tl_if_in:nnTF {#1} { \m@th }
+ { #1 $ }
+ {
+ \tagmcend %end P-chunk, in code: \tag_mc_end_push:
+ \@kernel@math@begin
+ #1 $
+ \@kernel@math@end
+ \tagmcbegin{} % restart P-chunk (whatsits in pdftex)
+ }
+ }
+
}
}
@@ -90,9 +99,10 @@
$$
}
}
-
\cs_new_protected:Npn \@kernel@close@P {
- \tagmcend %end P-chunk, in code: \tag_mc_end_push:
+ \tag_if_active:T
+ {
+ \tagmcend %end P-chunk, should perhaps be \tag_mc_end_push: ...
\int_gincr:N \g__tag_para_end_int
\bool_if:NT \l__tag_para_show_bool
{ \tag_mc_begin:n{artifact}
@@ -100,6 +110,7 @@
\tag_mc_end:
}
\tag_struct_end:
+ }
}
\cs_new_protected:Npn \__math_tag_dollardollar_display:nn #1#2 {
@@ -116,7 +127,7 @@
\l__math_tmpa_skip \lastskip
\@kernel@math@end
\penalty \postdisplaypenalty
- \skip_vertical:n { -\l__math_tmpa_skip }
+ \skip_vertical:n { -\l__math_tmpa_skip * 2 }
\@doendpe % this has no \end{...} to take care of it
}
@@ -352,6 +363,7 @@
\__math_grab_dollar:w
}
}
+
\exp_args:No \tex_everydisplay:D
{
\tex_the:D \tex_everydisplay:D
@@ -654,7 +666,6 @@
\fi
}
\ExplSyntaxOff
-
\endinput
%%
-%% End of file `latex-lab-mathtagging.ltx'.
+%% End of file `latex-lab-math.ltx'.
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-bib.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-bib.sty
index 62e98a45f63..9261393042e 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-bib.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-bib.sty
@@ -33,9 +33,11 @@
%%
%%
%% File: latex-lab-bib.dtx (C) Copyright 2023 LaTeX Project
-\ProvidesExplPackage {latex-lab-testphase-bib} {2023-05-18} {0.8}
+\def\ltlabbibdate{2023-07-20}
+\def\ltlabbibversion{0.81a}
+\ProvidesExplPackage {latex-lab-testphase-bib} {\ltlabbibdate} {\ltlabbibversion}
{Code related to the tagging of bibliography and cite command}
-\RequirePackage{latex-lab-testphase-block-tagging}
+\RequirePackage{latex-lab-testphase-block}
\def\hyper@nopatch@bib{}
\providecommand*\@extra@binfo{}%
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-block-tagging.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-block.sty
index c65c155fc5c..2764ca6d8bb 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-block-tagging.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-block.sty
@@ -1,10 +1,10 @@
%%
-%% This is file `latex-lab-testphase-block-tagging.sty',
+%% This is file `latex-lab-testphase-block.sty',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
-%% latex-lab-block-tagging.dtx (with options: `package')
+%% latex-lab-block.dtx (with options: `package')
%%
%% This is a generated file.
%%
@@ -32,13 +32,11 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-block-tagging.dtx (C) Copyright 2021-2023 LaTeX Project
-
-\def\ltblocksversion{v0.8d}
-\def\ltblocksdate{2023/06/07}
-
-\ProvidesPackage {latex-lab-testphase-block-tagging}
- [\ltblocksdate\space \ltblocksversion\space
+%% File: latex-lab-block.dtx (C) Copyright 2021-2023 LaTeX Project
+\def\ltlabblockdate{2023-09-01}
+\def\ltlabblockversion{0.8h}
+\ProvidesPackage {latex-lab-testphase-block}
+ [\ltlabblockdate\space v\ltlabblockversion\space
blockenv implementation]
\RequirePackage{xtemplate}
\RequirePackage{latex-lab-kernel-changes}
@@ -145,8 +143,6 @@
}
\cs_new_eq:NN \__block_skip_remove_last: \tex_unskip:D
\cs_generate_variant:Nn \tl_if_novalue:nTF { o }
-\cs_if_exist:NF \tag_if_active:T
- { \cs_new_eq:NN \tag_if_active:T \use_none:n }
\bool_new:N \g__block_debug_bool
\cs_new_eq:NN \__block_debug:n \use_none:n
\cs_new_eq:NN \__block_debug_typeout:n \use_none:n
@@ -244,6 +240,23 @@
{ \endblockenv }
}
\AddToHook{begindocument/before}{
+ \RenewDocumentEnvironment{verse}{ !O{} }
+ {
+ \let\\\@centercr
+ \UseInstance{blockenv}{list}
+ {
+ item-indent=-1.5em,
+ parindent=-1.5em,
+ item-skip=0pt,
+ rightmargin=\leftmargin,
+ leftmargin=\leftmargin+1.5em,
+ #1
+ }
+ \item\relax
+ }
+ { \endblockenv }
+ }
+\AddToHook{begindocument/before}{
\RenewDocumentEnvironment{list}{O{} m m }
{
\tl_set:Nn \@itemlabel {#2}
@@ -252,9 +265,6 @@
}
{ \endblockenv }
}
-\tag_if_active:T {
- \tagpdfsetup{add-new-tag={tag=list,role=L}}
-}
\tl_new:N \l__block_env_params_tl
\cs_new:Npn \legacylistsetupcode {
\dim_zero:N \listparindent
@@ -318,10 +328,17 @@
\global\@namedef{end#1}{ \@endtheorem }
}
}
+\tl_new:N \l__block_thm_current_counter_tl
+\def\@thm#1#2{%
+ \@kernel@refstepcounter{#1}
+ \tl_set:Nn \l__block_thm_current_counter_tl{#1}
+ \@ifnextchar[{\@ythm{#1}{#2}}{\@xthm{#1}{#2}}}
+\def\hyper@nopatch@thm{}
\def\@begintheorem#1#2{
\UseInstance{blockenv}{theorem}{}
\tagpdfparaOff
\mode_leave_vertical:
+ \MakeLinkTarget{\l__block_thm_current_counter_tl}
\tag_struct_begin:n{tag=Caption}
\group_begin:
\bfseries
@@ -345,6 +362,7 @@
\UseInstance{blockenv}{theorem}{}
\tagpdfparaOff
\mode_leave_vertical:
+ \MakeLinkTarget{\l__block_thm_current_counter_tl}
\tag_struct_begin:n{tag=Caption}
\group_begin:
\bfseries
@@ -478,16 +496,17 @@
\addpenalty \@endparpenalty
\addvspace \l__block_topsepadd_skip
}
- % \begin{macrocode}
- \bool_if:NTF \l__block_standalone_bool
- { \legacy_if_gset_false:n { @endpe } }
- { \legacy_if_gset_true:n { @endpe } }
+ \socket_use:n {tagsupport/block-endpe}
}
\cs_new:Npn \__kernel_displayblock_end: {
\__block_debug_typeout:n{\detokenize{__kernel_displayblock_end:}}
}
-\bool_new:N \l__block_standalone_bool
-\bool_set_false:N \l__block_standalone_bool
+\socket_new:nn {tagsupport/block-endpe}{0}
+\socket_new_plug:nnn{tagsupport/block-endpe}{on}
+ { \legacy_if_gset_true:n { @endpe } }
+\socket_new_plug:nnn{tagsupport/block-endpe}{off}
+ { \legacy_if_gset_false:n { @endpe } }
+\socket_assign_plug:nn{tagsupport/block-endpe}{on}
\DeclareTemplateCode{para}{std}{1}
{
indent-width = \parindent ,
@@ -828,6 +847,7 @@
\__block_beginpar_vmode:
\let \__kernel_displayblock_begin: \prg_do_nothing:
\let \__kernel_displayblock_end: \prg_do_nothing:
+ \socket_assign_plug:nn{tagsupport/block-endpe}{on}
}
\cs_new:Npn \__block_recipe_standalone: {
\cs_set_eq:NN \__kernel_displayblock_beginpar_hmode:w
@@ -836,7 +856,7 @@
\prg_do_nothing:
\cs_set_eq:NN \__kernel_displayblock_begin: \__block_inner_begin:
\cs_set_eq:NN \__kernel_displayblock_end: \__block_inner_end:
- \bool_set_true:N \l__block_standalone_bool
+ \socket_assign_plug:nn{tagsupport/block-endpe}{off}
\tl_if_empty:NTF \l__block_tag_name_tl
{ \tl_set:Nn \l__block_tag_inner_tag_tl {Sect} }
{ \tl_set_eq:NN \l__block_tag_inner_tag_tl \l__block_tag_name_tl }
@@ -849,6 +869,7 @@
\__block_beginpar_vmode:
\cs_set_eq:NN \__kernel_displayblock_begin: \__block_inner_begin:
\cs_set_eq:NN \__kernel_displayblock_end: \__block_inner_end:
+ \socket_assign_plug:nn{tagsupport/block-endpe}{on}
\tl_if_empty:NTF \l__block_tag_name_tl
{ \tl_set:Nn \l__block_tag_inner_tag_tl {Figure} }
{ \tl_set_eq:NN \l__block_tag_inner_tag_tl \l__block_tag_name_tl }
@@ -864,6 +885,7 @@
\cs_set_eq:NN \__kernel_displayblock_end: \__block_list_end:
\cs_set_eq:NN \__kernel_list_item_begin: \__block_list_item_begin:
\cs_set_eq:NN \__kernel_list_item_end: \__block_list_item_end:
+ \socket_assign_plug:nn{tagsupport/block-endpe}{on}
\tl_if_empty:NTF \l__block_tag_name_tl
{ \tl_set:Nn \l__tag_L_tag_tl {L} }
{ \tl_set_eq:NN \l__tag_L_tag_tl \l__block_tag_name_tl }
@@ -939,10 +961,7 @@
para-instance = raggedleft ,
inner-instance = ,
}
-\tag_if_active:T {
- \tagpdfsetup{add-new-tag={tag=quote,role=BlockQuote}}
- \tagpdfsetup{add-new-tag={tag=quotation,role=BlockQuote}}
-}
+ %
\DeclareInstance{blockenv}{quotation}{display}
{
env-name = quotation,
@@ -979,13 +998,6 @@
setup-code = ,
block-instance = displayblock ,
}
-\tag_if_active:T {
- \tagpdfsetup{add-new-tag={tag=theorem-like,role=Sect}}
-}
-\tag_if_active:T {
- \tagpdfsetup{add-new-tag={tag=verbatim,role=P}}
- \tagpdfsetup{add-new-tag={tag=codeline,role=Sub}}
-}
\DeclareInstance{blockenv}{verbatim}{display}
{
env-name = verbatim,
@@ -1179,7 +1191,7 @@
\DeclareRobustCommand\justifying {\UseInstance{para}{justify}{}}
\justifying
-\tag_if_active:T {
+\tag_if_active:TF {
\cs_set:Npn \__block_beginpar_vmode: {
\__block_debug_typeout:n
{ @endpe = \legacy_if:nTF { @endpe }{true}{false}
@@ -1275,8 +1287,6 @@
\__tag_check_para_begin_show:nn {green}{#1}
\tag_mc_begin:n {}
}
-\tag_if_active:T {
-}
\RemoveFromHook{para/end}[tagpdf]
\AddToHook{para/end}
{
@@ -1419,8 +1429,11 @@
\tagstructend % end L
}
}
+{
+ \cs_new:Npn \__block_start_para_structure_unconditionally:n #1 {}
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\endinput
%%
-%% End of file `latex-lab-testphase-block-tagging.sty'.
+%% End of file `latex-lab-testphase-block.sty'.
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-firstaid.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-firstaid.sty
index b95e81c61b4..7ea7fe54bec 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-firstaid.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-firstaid.sty
@@ -33,9 +33,12 @@
%%
%%
%% File: latex-lab-firstaid.dtx (C) Copyright 2023 LaTeX Project
+\def\ltlabfirstaiddate{2023-07-20}
+\def\ltlabfirstaidversion{0.85a}
-\ProvidesPackage {latex-lab-testphase-firstaid} [2023-06-04 v0.8
- Temporary patches to external packages need for the tagging project]
+\ProvidesPackage {latex-lab-testphase-firstaid} [%
+ \ltlabfirstaiddate\space v\ltlabfirstaiddate\space
+ Temporary patches to external packages needed for the tagging project]
\AddToHook{file/blindtext.sty/after}[latex-lab-firstaid]{%
\FirstAidNeededT{blindtext}{sty}{\blindfiledate\space\blindfileversion\space%
@@ -72,32 +75,20 @@
}
}%
}
-\AddToHook{file/ltugboat.cls/after}
+\AddToHook{package/cleveref/after}
{
- \def\l@section#1#2{\addpenalty{\@secpenalty}%
- \addvspace{\TBtocsectionspace}%
- \@tempdima 1.5em
- \begingroup
- \parindent\z@ \rightskip\z@ % article style makes \rightskip > 0
- \parfillskip\z@
- \TBtocsectionfont
- \leavevmode\advance\leftskip\@tempdima\hskip-\leftskip
- \UseHookWithArguments{contentsline/text/before}{4}
- {\toclevel@part}{#1}{#2}{\@contentsline@destination}%
- \csname contentsline@text@1@format\endcsname{#1}%
- \UseHookWithArguments{contentsline/text/after}{4}
- {\toclevel@part}{#1}{#2}{\@contentsline@destination}%
- \nobreak\hfil
- \nobreak\hb@xt@\@pnumwidth{\hss
- \UseHookWithArguments{contentsline/page/before}{4}
- {\toclevel@part}{#1}{#2}{\@contentsline@destination}%
- #2%
- \UseHookWithArguments{contentsline/page/after}{4}
- {\toclevel@part}{#1}{#2}{\@contentsline@destination}%
- }\par
- \endgroup}
+ \let\@makefntext\cref@old@makefntext
+ \AddToHook{cmd/@makefntext/before}{%
+ \cref@constructprefix{footnote}{\cref@result}%
+ \protected@edef\cref@currentlabel{%
+ [footnote][\arabic{footnote}][\cref@result]%
+ \p@footnote\@thefnmark}}
+ \RenewDocumentCommand\refstepcounter{om}{%
+ \IfNoValueTF{#1}%
+ {\refstepcounter@noarg{#2}}%
+ {\refstepcounter@optarg[#1]{#2}}%
+ }%
}
-
\endinput
%%
%% End of file `latex-lab-testphase-firstaid.sty'.
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-float.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-float.sty
index 92268acbe81..8b38e4aedef 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-float.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-float.sty
@@ -33,11 +33,10 @@
%%
%%
%% File: latex-lab-float.dtx (C) Copyright 2023 LaTeX Project
-\ProvidesExplPackage {latex-lab-testphase-float} {2023-04-28} {0.8}
+\def\ltlabfloatdate{2023-07-20}
+\def\ltlabfloatversion{0.81a}
+\ProvidesExplPackage {latex-lab-testphase-float} {\ltlabfloatdate} {\ltlabfloatversion}
{Code related to the tagging of floats}
-\tagpdfsetup{add-new-tag=float/Aside}
-\tagpdfsetup{add-new-tag=figures/Sect}
-\tagpdfsetup{add-new-tag=tables/Sect}
\prop_new:N \g__tag_float_sect_prop
\seq_new:N \g__tag_float_types_seq
\seq_gput_right:Nn \g__tag_float_types_seq {figure}
@@ -219,8 +218,42 @@
\fi
\fi
}
+\def\end@dblfloat{%
+ \if@twocolumn
+ \@endfloatbox
+ \@nameuse{__tag_float_end:}%
+ \ifnum\@floatpenalty <\z@
+ \@largefloatcheck
+ \global\dp\@currbox1sp %
+ \@cons\@currlist\@currbox
+ \ifnum\@floatpenalty <-\@Mii
+ \penalty -\@Miv
+ \@tempdima\prevdepth
+ \vbox{}%
+ \prevdepth\@tempdima
+ \penalty\@floatpenalty
+ \else
+ \vadjust{\penalty -\@Miv \vbox{}\penalty\@floatpenalty}\@Esphack
+ \@nameuse{__tag_float_start_par:} %restart P safe here??
+ \fi
+ \fi
+ \else
+ \end@float
+ \fi
+}%
\ExplSyntaxOn
\def\hyper@nopatch@caption{}
+\let\@kernel@refstepcounter\refstepcounter %as long it is not in the kernel
+\def\caption{%
+ \ifx\@captype\@undefined
+ \@latex@error{\noexpand\caption outside float}\@ehd
+ \expandafter\@gobble
+ \else
+ \@kernel@refstepcounter\@captype
+ \expandafter\@firstofone
+ \fi
+ {\@dblarg{\@caption\@captype}}%
+}
\providecommand\theHg__tag_struct_abs_int{\int_use:N\c@g__tag_struct_abs_int}
\AddToHook{begindocument}
@@ -253,7 +286,7 @@
\tag_mc_end:
\tag_struct_end:
\tag_mc_begin:n{}
- #2\par
+ #2
\tag_mc_end:\hfil}%
\fi
\tag_struct_end: %caption
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-graphic.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-graphic.sty
index afe5a4625e5..b8c4bdb6989 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-graphic.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-graphic.sty
@@ -33,7 +33,9 @@
%%
%%
%% File: latex-lab-graphic.dtx (C) Copyright 2022-2023 LaTeX Project
-\ProvidesExplPackage {latex-lab-testphase-graphic} {2023-04-07} {0.8}
+\def\ltlabgraphicdate{2023-07-20}
+\def\ltlabgraphicversion{0.80a}
+\ProvidesExplPackage {latex-lab-testphase-graphic} {\ltlabgraphicdate} {\ltlabgraphicversion}
{Code related to the tagging of graphics}
\RequirePackage{l3opacity}
\ref_attribute_gset:nnnn{xpos}{0}{shipout}{\int_use:N\tex_lastxpos:D}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-math.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-math.sty
index efda100178d..592dca80c1b 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-math.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-math.sty
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% latex-lab-testphase.dtx (with options: `math-sty')
+%% latex-lab-testphase.dtx (with options: `math-package')
%%
%% This is a generated file.
%%
@@ -34,9 +34,10 @@
%%
%% File: latex-lab-testphase.dtx
+
\ProvidesPackage{latex-lab-testphase-math}
- [2023-01-07 v0.8 code related to the math tagging]
-\input{latex-lab-mathtagging.ltx}
+ [2023-07-20 v0.8a code related to the math tagging]
+\input{latex-lab-math.ltx}
\input{latex-lab-amsmath.ltx}
\input{latex-lab-mathtools.ltx}
\input{latex-lab-mathpkg.ltx}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-minipage.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-minipage.sty
index b6f6fe4357a..7bed296b11b 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-minipage.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-minipage.sty
@@ -33,12 +33,13 @@
%%
%%
%% File: latex-lab-minipage.dtx (C) Copyright 2023 LaTeX Project
-
-\def\ltlistsversion{v0.81}
-\def\ltlistsdate{2023/05/10}
-
-\ProvidesExplPackage {latex-lab-testphase-minipage} {2023-05-10} {0.81}
+\def\ltlabminipagedate{2023-08-20}
+\def\ltlabminipageversion{0.81b}
+\ProvidesExplPackage {latex-lab-testphase-minipage}
+ {\ltlabminipagedate} {\ltlabminipageversion}
{Code related to the tagging of minipages and parboxes}
+\RequirePackage{latex-lab-testphase-new-or-1}
+\RequirePackage{latex-lab-testphase-new-or-2}
\def\@kernel@init@minipage{}
\def\@kernel@init@parbox{}
@@ -59,7 +60,7 @@
\textwidth\hsize \columnwidth\hsize
\@parboxrestore
\def\@mpfn{mpfootnote}\def\thempfn{\thempfootnote}\c@mpfootnote\z@
- \let\@footnotetext\@mpfootnotetext
+ \AssignSocketPlug{fntext/process}{mp}%
\let\@listdepth\@mplistdepth \@mplistdepth\z@
\@minipagerestore
\@setminipage}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-1.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-1.sty
index a0c12a56ee0..167c5d6130e 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-1.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-1.sty
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% latex-lab-new-or-1.dtx (with options: `code')
+%% latex-lab-new-or-1.dtx (with options: `package')
%%
%% This is a generated file.
%%
@@ -33,8 +33,11 @@
%%
%%
%% File: latex-lab-new-or-1.dtx (C) Copyright 2020-2023 Frank Mittelbach
+\def\ltlabneworIdate{2023-07-20}
+\def\ltlabneworIversion{0.85a}
\ProvidesPackage{latex-lab-testphase-new-or-1}
- [2022-11-94 v0.1a Temporary output patches for tagging and better link support]
+ [\ltlabneworIdate\space v\ltlabneworIversion\space
+ Temporary output patches for tagging and better link support]
\RequirePackage{etoolbox}
\providecommand\@kernel@before@head{}
\providecommand\@kernel@before@foot{}
@@ -51,17 +54,36 @@
{\color@hbox\normalcolor\hb@xt@\textwidth{\@thefoot}\color@endbox}
{\@kernel@before@foot\color@hbox\normalcolor\hb@xt@\textwidth{\@thefoot}\color@endbox\@kernel@after@foot}
{\typeout{Patching footer in \string\@outputpage}}{\PATCHerror }
- \providecommand\@kernel@before@footins{}
- \providecommand\@kernel@before@cclv{}
+\providecommand\@kernel@before@footins{}
+\providecommand\@kernel@tagsupport@@makecol{}
- \patchcmd\@makecol
- {\vskip\skip\footins}
- {\vskip\skip\footins\@kernel@before@footins}
- {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror }
+\patchcmd\@makecol
+ {\vskip\skip\footins}
+ {\vskip\skip\footins\@kernel@before@footins}
+ {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror }
+\patchcmd\@makecol
+ {\let\@elt\relax}
+ {\@kernel@tagsupport@@makecol\let\@elt\relax}
+ {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror }
- \pretocmd\@makecol{\@kernel@before@cclv}
- {\typeout{Patching \string\@makecol\space for tagging}}{\PATCHerror }
+\AddToHook{package/footmisc/after}
+ {%
+ \def\@makecol{%
+ \setbox\@outputbox \box\@cclv
+ \@outputbox@removebskip
+ \@kernel@tagsupport@@makecol
+ \let\@elt\relax
+ \xdef\@freelist{\@freelist\@midlist}%
+ \global \let \@midlist \@empty
+ \@makecol@appendblocks
+ \ifvbox\@kludgeins
+ \@makespecialcolbox
+ \else
+ \@makenormalcolbox
+ \fi
+ \global \maxdepth \@maxdepth}
+}
\AddToHook{package/multicol/after}
{% multicol needs later loading
\patchcmd\page@sofar
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-2.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-2.sty
index 7b7be705354..cb81b74c017 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-2.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-new-or-2.sty
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% latex-lab-new-or-2.dtx (with options: `code')
+%% latex-lab-new-or-2.dtx (with options: `package')
%%
%% This is a generated file.
%%
@@ -33,25 +33,29 @@
%%
%%
%% File: latex-lab-new-or-2.dtx
+\def\ltlabneworIIdate{2023-09-04}
+\def\ltlabneworIIversion{0.85c}
+
\ProvidesPackage{latex-lab-testphase-new-or-2}
- [2022-11-04 v0.1c changes to the output routine]
+ [\ltlabneworIIdate\space v\ltlabneworIIversion\space
+ Changes to the output routine]
\def \@makecol {%
- \@kernel@before@cclv
\setbox\@outputbox \box\@cclv
\@outputbox@removebskip
+ \@kernel@tagsupport@@makecol
\let\@elt\relax
\xdef\@freelist{\@freelist\@midlist}%
\global \let \@midlist \@empty
- \@makecol@cfgpoint
+ \UseSocket{@makecol/outputbox}%
\ifvbox\@kludgeins
- \@makespecialcolbox
+ \@make@specialcolbox
\else
- \@makenormalcolbox
+ \@make@normalcolbox
\fi
\global \maxdepth \@maxdepth
}
\newdimen\@outputbox@depth
-\def \@makenormalcolbox {%
+\def \@make@normalcolbox {%
\setbox\@outputbox \vbox to\@colht {%
\@texttop
\@outputbox@depth \dp\@outputbox
@@ -60,7 +64,7 @@
\@textbottom
}%
}
-\def \@makespecialcolbox {%
+\def \@make@specialcolbox {%
\@outputbox@append {\vskip-\@outputbox@depth}%
\@tempdima \@colht
\ifdim \wd\@kludgeins>\z@
@@ -109,7 +113,7 @@
\def\@outputbox@appendfootnotes {%
\ifvoid\footins \else
\@makecol@handlesplitfootnotes
- \@makecol@cfgpointii
+ \UseSocket{@makecol/footnotes}%
\@outputbox@append{%
\vskip \skip\footins
\@kernel@before@footins
@@ -135,7 +139,7 @@
\fi
}
\let \@makecol@splitfootnotemessagehook \@empty
-\let \@makecol@cfgpointii \@empty
+\NewSocket{@makecol/footnotes}{0}
\def\@if@flushbottom@TF{%
\ifx\@textbottom\relax
\expandafter\@firstoftwo
@@ -157,11 +161,51 @@
\expandafter\@firstoftwo
\fi
}
- \def\@makecol@cfgpoint {%
- \@outputbox@appendfootnotes
- \@outputbox@attachfloats
- \@outputbox@reinsertbskip
- }
+\NewSocket{@makecol/outputbox}{0}
+\NewSocketPlug {@makecol/outputbox}{space-footnotes-floats} {%
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}%
+ {\@if@bfloats@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}%
+ }%
+ \@outputbox@appendfootnotes
+ \@outputbox@attachfloats
+}
+\NewSocketPlug {@makecol/outputbox}{floats-footnotes-space} {%
+ \@outputbox@attachfloats
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}%
+ \@outputbox@appendfootnotes
+}
+\NewSocketPlug {@makecol/outputbox}{footnotes-space-floats} {%
+ \@outputbox@appendfootnotes
+ \@if@bfloats@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}%
+ \@outputbox@attachfloats
+}
+\NewSocketPlug {@makecol/outputbox}{space-floats-footnotes} {%
+ \@if@footnotes@TF
+ {\@outputbox@append{\vfill}}%
+ {\@if@bfloats@TF
+ {\@outputbox@append{\vfill}}%
+ {\@outputbox@reinsertbskip}}%
+ \@outputbox@attachfloats
+ \@outputbox@appendfootnotes
+}
+\NewSocketPlug {@makecol/outputbox}{floats-footnotes} {%
+ \@outputbox@attachfloats
+ \@outputbox@appendfootnotes
+ \@outputbox@reinsertbskip
+}
+\NewSocketPlug {@makecol/outputbox}{footnotes-floats} {%
+ \@outputbox@appendfootnotes
+ \@outputbox@attachfloats
+ \@outputbox@reinsertbskip
+}
+\AssignSocketPlug {@makecol/outputbox}{footnotes-floats}
\declare@file@substitution{footmisc.sty}{latex-lab-footmisc.ltx}
\input{latex-lab-footnotes.ltx}
\endinput
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-sec.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-sec.sty
index 37d260300ad..7ff5295cce7 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-sec.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-sec.sty
@@ -33,7 +33,9 @@
%%
%%
%% File: latex-lab-sec.dtx (C) Copyright 2022-2023 LaTeX Project
-\ProvidesExplPackage {latex-lab-testphase-sec} {2023-05-20} {0.81}
+\def\ltlabsecdate{2023-07-20}
+\def\ltlabsecversion{0.84a}
+\ProvidesExplPackage {latex-lab-testphase-sec} {\ltlabsecdate} {\ltlabsecversion}
{Code related to the tagging of sectioning commands}
\RequirePackage{latex-lab-kernel-changes}
\seq_new:N \g__tag_sec_stack_seq
@@ -161,31 +163,34 @@
{
\@ifundefined{chapter}
{
- \RenewDocumentCommand\part{ s O{#3} m }
+ \@ifundefined{part}{}
{
- \if@noskipsec \leavevmode \fi
- \par
- \addvspace{4ex}%
- \@afterindentfalse
+ \RenewDocumentCommand\part{ s O{#3} m }
+ {
+ \if@noskipsec \leavevmode \fi
+ \par
+ \addvspace{4ex}%
+ \@afterindentfalse
% tagging start commands
- \tag_tool:n {sec-start-part=#2}
+ \tag_tool:n {sec-start-part=#2}
% end tagging start commands
- \bool_lazy_any:nT
- {
- { #1 }
+ \bool_lazy_any:nT
{
- \int_compare_p:nNn {\c@secnumdepth}<{-1}
+ { #1 }
+ {
+ \int_compare_p:nNn {\c@secnumdepth}<{-1}
+ }
}
- }
- {
- \MakeLinkTarget[part]{}
- }
- \IfBooleanTF
- {#1}
- { \@spart {#3} }
- { \@part [#2]{#3} }
- \tag_tool:n {sec-stop-part}
- }
+ {
+ \MakeLinkTarget[part]{}
+ }
+ \IfBooleanTF
+ {#1}
+ { \@spart {#3} }
+ { \@part [#2]{#3} }
+ \tag_tool:n {sec-stop-part}
+ }
+ }
}
{
\RenewDocumentCommand\chapter{ s O{#3} m }
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-text.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-text.sty
index eb79c90efea..7cae4fc4897 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-text.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-text.sty
@@ -33,8 +33,11 @@
%%
%%
%% File: latex-lab-text.dtx (C) Copyright 2023 LaTeX Project
-\ProvidesExplPackage {latex-lab-testphase-text} {2023-05-28} {0.8}
- {Code related to the tagging of inline text commands}
+\def\ltlabtextdate{2023-07-20}
+\def\ltlabtextversion{0.85a}
+
+\ProvidesExplPackage {latex-lab-testphase-text} {\ltlabtextdate} {\ltlabtextversion}
+ {Code related to the tagging of various small text commands}
\AddToHook{cmd/LaTeX/before}
{
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-toc.sty b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-toc.sty
index effe44b7358..0411e550b9c 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-toc.sty
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/latex-lab-testphase-toc.sty
@@ -4,9 +4,9 @@
%%
%% The original source files were:
%%
-%% latex-lab-toc-tagging-functions.dtx (with options: `header')
+%% latex-lab-toc.dtx (with options: `header')
%% latex-lab-toc-kernel-changes.dtx (with options: `package')
-%% latex-lab-toc-tagging-functions.dtx (with options: `package')
+%% latex-lab-toc.dtx (with options: `package')
%% latex-lab-toc-hyperref-changes.dtx (with options: `package')
%%
%% This is a generated file.
@@ -35,10 +35,14 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-toc-tagging-functions.dtx (C) Copyright 2022-2023 LaTeX Project
-\ProvidesExplPackage {latex-lab-testphase-toc} {2023-05-20} {0.82}
- { commands related to the tagging of toc-like lists}
-%% File: latex-lab-toc-kernel-functions.dtx (C) Copyright 2022-2023 LaTeX Project
+%% File: latex-lab-toc.dtx (C) Copyright 2022-2023 LaTeX Project
+\def\ltlabtocdate{2023-07-20}
+\def\ltlabtocversion{0.85a}
+\ProvidesExplPackage {latex-lab-testphase-toc} {\ltlabtocdate} {\ltlabtocversion}
+ { Code related to the tagging of toc-like lists}
+%% File: latex-lab-toc-kernel-changes.dtx (C) Copyright 2022-2023 LaTeX Project
+\def\ltlabkerneldate{2023-07-20}
+\def\ltlabkernelversion{0.85a}
\RequirePackage{latex-lab-kernel-changes}
\def\@contentsline@cfgpoint@before#1#2#3#4{}
\def\@contentsline@cfgpoint@after#1#2#3#4{}
@@ -271,8 +275,9 @@
\endgroup
\fi}
}
-
-%% File: latex-lab-toc-tagging-functions.dtx (C) Copyright 2022-2023 LaTeX Project
+%% File: latex-lab-toc.dtx (C) Copyright 2022-2023 LaTeX Project
+\def\ltlabtocdate{2023-07-20}
+\def\ltlabtocversion{0.85a}
\tl_new:N \l__tag_toc_tmpa_tl
\AddToHook{cmd/refstepcounter/after}
{
@@ -440,6 +445,8 @@
\tag_mc_begin:n{artifact}\tag_stop:n{leaders}\nobreak#1\nobreak\tag_start:n{leaders}\tag_mc_end:}
%% File: latex-lab-toc-hyperref-changes.dtx (C) Copyright 2022-2023 LaTeX Project
+\def\ltlabtochyperdate{2023-07-20}
+\def\ltlabtochyperversion{0.85a}
\def\hyper@nopatch@toc{}
\AddToHook{package/hyperref/after}
{
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/math-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/math-latex-lab-testphase.ltx
index d57dc7e8742..2c89d19d494 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/math-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/math-latex-lab-testphase.ltx
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% latex-lab-testphase.dtx (with options: `math-lab')
+%% latex-lab-testphase.dtx (with options: `math')
%%
%% This is a generated file.
%%
@@ -34,8 +34,9 @@
%%
%% File: latex-lab-testphase.dtx
+
\ProvidesFile{math-latex-lab-testphase.ltx}
- [2023-01-07 v0.8 code related to the math tagging]
+ [2023-07-20 v0.8a latex-lab wrapper math]
\RequirePackage{latex-lab-testphase-math}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/minipage-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/minipage-latex-lab-testphase.ltx
index 9c0a803cb68..cf329a8e806 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/minipage-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/minipage-latex-lab-testphase.ltx
@@ -33,13 +33,12 @@
%%
%%
%% File: latex-lab-minipage.dtx (C) Copyright 2023 LaTeX Project
-
-\def\ltlistsversion{v0.81}
-\def\ltlistsdate{2023/05/10}
-
+\def\ltlabminipagedate{2023-08-20}
+\def\ltlabminipageversion{0.81b}
\ProvidesFile{minipage-latex-lab-testphase.ltx}
- [2022-10-26 v0.8 code related to the tagging of sectioning commands]
+ [\ltlabminipagedate\space v\ltlabminipageversion
+ code related to the tagging of minipage and parbox]
\RequirePackage{latex-lab-testphase-minipage}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-1-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-1-latex-lab-testphase.ltx
index 305ecb25304..015487e4396 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-1-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-1-latex-lab-testphase.ltx
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% latex-lab-testphase.dtx (with options: `new-or-1')
+%% latex-lab-new-or-1.dtx (with options: `latex-lab')
%%
%% This is a generated file.
%%
@@ -32,10 +32,12 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-testphase.dtx
-
+%% File: latex-lab-new-or-1.dtx (C) Copyright 2020-2023 Frank Mittelbach
+\def\ltlabneworIdate{2023-07-20}
+\def\ltlabneworIversion{0.85a}
\ProvidesFile{new-or-1-latex-lab-testphase.ltx}
- [2022-11-04 v0.1a latex-lab wrapper new-or-1]
+ [\ltlabneworIdate\space v\ltlabneworIversion\space
+ latex-lab wrapper new-or-1]
\RequirePackage{latex-lab-testphase-new-or-1}
\endinput
%%
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-latex-lab-testphase.ltx
index 742a1fa3531..45354f15d36 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/new-or-latex-lab-testphase.ltx
@@ -34,8 +34,9 @@
%%
%% File: latex-lab-testphase.dtx
+
\ProvidesFile{new-or-latex-lab-testphase.ltx}
- [2022-11-04 v0.1a latex-lab wrapper new-or]
+ [2023-06-15 v0.1b latex-lab wrapper new-or]
\RequirePackage{latex-lab-testphase-new-or-1}
\RequirePackage{latex-lab-testphase-new-or-2}
\endinput
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/phase-I-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/phase-I-latex-lab-testphase.ltx
index 477a74076fb..c2f68512e79 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/phase-I-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/phase-I-latex-lab-testphase.ltx
@@ -34,6 +34,7 @@
%%
%% File: latex-lab-testphase.dtx
+
\ProvidesFile{phase-I-latex-lab-testphase.ltx}
[2023-02-04 v0.1b latex-lab wrapper phase-I]
\RequirePackage{latex-lab-testphase-new-or-1}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/phase-II-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/phase-II-latex-lab-testphase.ltx
index 7114d4882b2..ff7e6dd7452 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/phase-II-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/phase-II-latex-lab-testphase.ltx
@@ -34,8 +34,9 @@
%%
%% File: latex-lab-testphase.dtx
+
\ProvidesFile{phase-II-latex-lab-testphase.ltx}
- [2022-11-04 v0.1a latex-lab wrapper phase-II]
+ [2023-06-15 v0.1b latex-lab wrapper phase-II]
\RequirePackage{latex-lab-testphase-new-or-1}
\RequirePackage{latex-lab-testphase-new-or-2}
\RequirePackage{tagpdf}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/phase-III-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/phase-III-latex-lab-testphase.ltx
index 3c36a82f86d..2f7a38ef142 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/phase-III-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/phase-III-latex-lab-testphase.ltx
@@ -34,12 +34,13 @@
%%
%% File: latex-lab-testphase.dtx
+
\ProvidesFile{phase-III-latex-lab-testphase.ltx}
- [2023-03-06 v0.1a latex-lab wrapper phase-III]
+ [2023-07-20 v0.1b latex-lab wrapper phase-III]
\input{phase-II-latex-lab-testphase.ltx}
\IfFormatAtLeastTF{2023-06-01}
{
- \RequirePackage{latex-lab-testphase-block-tagging}
+ \RequirePackage{latex-lab-testphase-block}
\RequirePackage{latex-lab-testphase-sec}
\RequirePackage{latex-lab-testphase-toc}
\RequirePackage{latex-lab-testphase-minipage}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/sec-tagging-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/sec-latex-lab-testphase.ltx
index cf6557fa41e..131fce259d1 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/sec-tagging-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/sec-latex-lab-testphase.ltx
@@ -1,5 +1,5 @@
%%
-%% This is file `sec-tagging-latex-lab-testphase.ltx',
+%% This is file `sec-latex-lab-testphase.ltx',
%% generated with the docstrip utility.
%%
%% The original source files were:
@@ -33,10 +33,12 @@
%%
%%
%% File: latex-lab-sec.dtx (C) Copyright 2022-2023 LaTeX Project
+\def\ltlabsecdate{2023-07-20}
+\def\ltlabsecversion{0.84a}
-\ProvidesFile{sec-tagging-latex-lab-testphase.ltx}
- [2023-05-20 v0.82 code related to the tagging of sectioning commands]
+\ProvidesFile{sec-latex-lab-testphase.ltx}
+ [\ltlabsecdate\space v\ltlabsecversion\space latex-lab wrapper sec]
\RequirePackage{latex-lab-testphase-sec}
\endinput
%%
-%% End of file `sec-tagging-latex-lab-testphase.ltx'.
+%% End of file `sec-latex-lab-testphase.ltx'.
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-latex-lab-testphase.ltx
index c12a0c17bbb..99866c0ee12 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-latex-lab-testphase.ltx
@@ -34,6 +34,7 @@
%%
%% File: latex-lab-testphase.dtx
+
\ProvidesFile{tagpdf-latex-lab-testphase.ltx}
[2022-11-04 v0.1a latex-lab wrapper tagpdf (deprecated)]
\RequirePackage{latex-lab-testphase-new-or-1}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-ns-latex-lab.def b/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-ns-latex-lab.def
new file mode 100644
index 00000000000..ac71752ca07
--- /dev/null
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/tagpdf-ns-latex-lab.def
@@ -0,0 +1,42 @@
+%%
+%% This is file `tagpdf-ns-latex-lab.def',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% latex-lab-namespace.dtx (with options: `ns-latex-lab')
+%%
+%% File: latex-lab-namespace.dtx (C) Copyright 2023 LaTeX Project
+%% \ProvidesExplFile {tagpdf-ns-latex-lab.def} {2023-09-04} {0.8}
+%% {latex} {https://www.latex-project.org/ns/lab/2022}{}
+title, Title, pdf2,
+part, Title, pdf2,
+section, H1, pdf2,
+subsection, H2, pdf2,
+subsubsection,H3, pdf2,
+paragraph, H4, pdf2,
+subparagraph, H5, pdf2,
+list, L, pdf2,
+itemize, L, pdf2,
+enumerate, L, pdf2,
+description, L, pdf2,
+quote, BlockQuote,pdf,
+quotation, BlockQuote,pdf,
+verbatim, Div, pdf2,
+item, LI, pdf2,
+itemlabel, Lbl, pdf2,
+itembody, LBody, pdf2,
+footnote, FENote, pdf2,
+footnotemark, Lbl, pdf2,
+footnotelabel,Lbl, pdf2,
+text-unit, Part, pdf2,
+text, P, pdf2,
+theorem-like, Sect, pdf2,
+verbatim, P, pdf2,
+codeline, Sub, pdf2,
+float, Aside, pdf2,
+figures, Sect, pdf2,
+tables, Sect, pdf2,
+%%
+%%
+%% End of file `tagpdf-ns-latex-lab.def'.
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/text-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/text-latex-lab-testphase.ltx
index 62b5de750d7..59d30103ae9 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/text-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/text-latex-lab-testphase.ltx
@@ -33,8 +33,12 @@
%%
%%
%% File: latex-lab-text.dtx (C) Copyright 2023 LaTeX Project
+\def\ltlabtextdate{2023-07-20}
+\def\ltlabtextversion{0.85a}
+
\ProvidesFile{text-latex-lab-testphase.ltx}
- [2023-05-28 v0.8 code related to the tagging of bib and citations]
+ [\ltlabtextdate\space v\ltlabtextversion\space
+ code related to the tagging of various small text commands]
\RequirePackage{latex-lab-testphase-text}
diff --git a/Master/texmf-dist/tex/latex-dev/latex-lab/toc-tagging-latex-lab-testphase.ltx b/Master/texmf-dist/tex/latex-dev/latex-lab/toc-latex-lab-testphase.ltx
index 2ec61214410..8fb6ca3a450 100644
--- a/Master/texmf-dist/tex/latex-dev/latex-lab/toc-tagging-latex-lab-testphase.ltx
+++ b/Master/texmf-dist/tex/latex-dev/latex-lab/toc-latex-lab-testphase.ltx
@@ -1,10 +1,10 @@
%%
-%% This is file `toc-tagging-latex-lab-testphase.ltx',
+%% This is file `toc-latex-lab-testphase.ltx',
%% generated with the docstrip utility.
%%
%% The original source files were:
%%
-%% latex-lab-toc-kernel-changes.dtx (with options: `latex-lab')
+%% latex-lab-toc.dtx (with options: `latex-lab')
%%
%% This is a generated file.
%%
@@ -32,13 +32,14 @@
%% where one can also log issues in case there are any.
%%
%%
-%% File: latex-lab-toc-kernel-functions.dtx (C) Copyright 2022-2023 LaTeX Project
-
-\ProvidesFile{toc-tagging-latex-lab-testphase.ltx}
- [2023-05-20 v0.81 code related to the tagging of toc and similar lists]
+%% File: latex-lab-toc.dtx (C) Copyright 2022-2023 LaTeX Project
+\def\ltlabtocdate{2023-07-20}
+\def\ltlabtocversion{0.85a}
+\ProvidesFile{toc-latex-lab-testphase.ltx}
+ [\ltlabtocdate\space v\ltlabtocversion latex-lab wrapper toc]
\RequirePackage{latex-lab-testphase-toc}
\endinput
%%
-%% End of file `toc-tagging-latex-lab-testphase.ltx'.
+%% End of file `toc-latex-lab-testphase.ltx'.