Lab review 02 (#1109)

* redefine \part only if it defined * add implementation for verse (correct indentation) * handle also end of double floats * avoid anchor in caption * add tests for caption spacing * add firstaid for cleveref * update tagpdf and testfiles (change of messages) * use sec instead of sec-tagging everywhere * rename toc-tagging to toc * rename block-tagging to block * update testphase key docu * rename mathtagging to math * adapt also yaml * missing renames toc-tagging -> toc * clean up dates and package declarations * correct guard * remove ltugboat firstaid, it is done by the class * fix dvilualatex: do not load glyphtounicode * correct testfile (line changes) * correct doc --------- Co-authored-by: Ulrike Fischer <fischer@troubleshooting-tex.de>
latex3 · Jul 22, 2023 · 7a3bf4f · 7a3bf4f
1 parent 592f862
commit 7a3bf4f
Show file tree

Hide file tree

Showing 247 changed files with 15,301 additions and 7,054 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -81,15 +81,15 @@ jobs:
           - module: required/latex-lab
             config: config-OR
           - module: required/latex-lab
-            config: config-mathtagging
+            config: config-math
           - module: required/latex-lab
             config: config-OR-luatex
           - module: required/latex-lab
             config: config-sec
           - module: required/latex-lab
             config: config-toc
           - module: required/latex-lab
-            config: config-block-tagging
+            config: config-block
           - module: required/latex-lab
             config: config-LM-tagging
           - module: required/latex-lab

diff --git a/required/latex-lab/blocks-code.tex b/required/latex-lab/blocks-code.tex
@@ -1,4 +1,4 @@
 % this will typeset documentation + code
 
 \AtBeginDocument{\AlsoImplementation}
-\input{latex-lab-block-tagging.dtx}
+\input{latex-lab-block.dtx}
diff --git a/required/latex-lab/blocks-doc.tex b/required/latex-lab/blocks-doc.tex
@@ -1,4 +1,4 @@
 % this will typeset documentation + code
 
 \AtBeginDocument{\OnlyDescription}
-\input{latex-lab-block-tagging.dtx}
+\input{latex-lab-block.dtx}
diff --git a/required/latex-lab/build.lua b/required/latex-lab/build.lua
@@ -62,11 +62,11 @@ checksearch  = true
 
 checkconfigs = 
  {"build","config-TU","config-OR",
-  "config-mathtagging",
+  "config-math",
   "config-OR-luatex",
   "config-sec",
   "config-toc",
-  "config-block-tagging",
+  "config-block",
   "config-graphic",
   "config-minipage",
   "config-float",

diff --git a/required/latex-lab/changes.txt b/required/latex-lab/changes.txt
@@ -1,3 +1,20 @@
+2023-07-21 Ulrike Fischer <Ulrike.Fischer@latex-project.org>
+    * rename latex-lab-toc-tagging.dtx to latex-lab-toc.dtx
+    * clean up versions and package declarations
+    * remove firstaid for ltugboat, this is now handled by the class
+    * do not load glyphtounicode with dvilualatex
+
+2023-07-19 Ulrike Fischer <Ulrike.Fischer@latex-project.org>
+    * really rename sec-tagging to sec
+    * really rename toc-tagging to toc
+    * rename block-tagging to block
+    * rename mathtagging to math
+    * document testphase key sec, toc, math, graphic, block
+
+2023-06-21 Ulrike Fischer <Ulrike.Fischer@latex-project.org>
+    * latex-lab-sec.dtx: redefine \part only if it defined (letter.cls ...)
+    * latex-lab-block-tagging: add definition for verse
+
 2023-06-07 Ulrike Fischer <Ulrike.Fischer@latex-project.org>
     * latex-lab-block-tagging.dtx corrected tagging of caption
     * new latex-lab-firstaid.dtx with adaptions to external packages

diff --git a/required/latex-lab/config-block-tagging.lua → required/latex-lab/config-block.lua b/required/latex-lab/config-block-tagging.lua → required/latex-lab/config-block.lua
@@ -1,9 +1,9 @@
--- Tests for block tagging stuff
+-- Tests for block stuff
 
 stdengine    = "pdftex"
 checkengines = {"pdftex","luatex"}
 checksearch  = true
-testfiledir  = "testfiles-block-tagging"
+testfiledir  = "testfiles-block"
 
 checkruns     = 4
 forcecheckruns = true  --- for tagged stuff

diff --git a/required/latex-lab/config-mathtagging.lua → required/latex-lab/config-math.lua b/required/latex-lab/config-mathtagging.lua → required/latex-lab/config-math.lua
@@ -3,7 +3,7 @@
 stdengine    = "pdftex"
 checkengines = {"pdftex"}
 checksearch  = true
-testfiledir  = "testfiles-mathtagging"
+testfiledir  = "testfiles-math"
 
 checkdeps =
   {

diff --git a/required/latex-lab/documentmetadata-support.dtx b/required/latex-lab/documentmetadata-support.dtx
@@ -18,8 +18,8 @@
 % for those people who are interested or want to report an issue.
 %
 %    \begin{macrocode}
-\def\documentmetadatasupportversion{1.0d}
-\def\documentmetadatasupportdate{2023-06-07}
+\def\documentmetadatasupportversion{1.0e}
+\def\documentmetadatasupportdate{2023-07-19}
 %    \end{macrocode}
 %
 %
@@ -151,9 +151,13 @@
 %    \item[\texttt{colorprofiles}] This allows to load icc-colorprofiles. Details
 %       are described in the documentation of \pkg{l3pdfmeta}.
 %
-%    \item[\texttt{testphase}] This key is used to load testphase code. The values it accepts
-%    and their effect will change over time, when testphase packages are added or
-%    removed or when the code is moved into the kernel.
+%    \item[\texttt{testphase}] This key is used to load testphase code. 
+%    The |testphase| key can only be used in the first \cs{DocumentMetadata}.
+%    The values it accepts and their effect will change over time, when testphase packages are added or
+%    removed or when the code is moved into the kernel. The key accepts a list of values
+%    and it can be used more than once.
+%    
+%    The \texttt{phase} key bundle testphase modules. They also all activate tagging.
 %     \begin{description}
 %    \item[\texttt{phase-I}]
 %       This value loads code implementing the first phase of the project~\cite{blueprint}, i.e., it
@@ -172,7 +176,13 @@
 %       table of contents and similar lists, graphics, minipages and floats. 
 %       As it redefines many internals it is currently restricted to the use of 
 %       standard classes (article, report, and book) 
-%       and it supports only a limited number of add-on packages.  
+%       and it supports only a limited number of add-on packages. 
+%   \end{description}
+%   
+%   The various testphase modules can also be loaded individually (and least in theory,
+%   they can be hidden dependencies). If loaded like this, the tagpdf package is not
+%   loaded and tagging is not activated! The list of modules will change over time.
+%   \begin{description}           
 %    \item[\texttt{new-or-1}] This patches a few commands related
 %    to the output routine. The patches are needed for the tagging
 %    of paragraphs, for the tagging of header and footer and 
@@ -183,8 +193,32 @@
 %    \item[\texttt{new-or}] This loads more changes to the output routine required for the 
 %    tagging. It is not compatible with every class! The code is also loaded by the 
 %    \texttt{phase-II} value.
+%    \item[\texttt{sec}] This adapts commands related to sectioning to make them tagging aware.
+%     The \texttt{sec} module is loaded by \texttt{phase-III}.
+%    \item[\texttt{toc}] This adapts commands related to the table of contents and
+%    similar list to make them tagging aware. The \texttt{toc} module is loaded by \texttt{phase-III}. 
+%    \item[\texttt{graphic}] This enables tagging support for
+%    the \cs{includegraphics} command and the \texttt{picture} environment. 
+%    This code is also loaded by the \texttt{phase-III} key.
+%    \item[\texttt{block}] This reimplements lists and blocks environments and
+%    add tagging support.
+%    This code is also loaded by the \texttt{phase-III} key.
+%    \item[\texttt{minipage}] This adds tagging support to \texttt{minipage} 
+%    and \cs{parbox}.
+%    This code is also loaded by the \texttt{phase-III} key.
+%    \item[\texttt{float}] This adds tagging support to floats.
+%    This code is also loaded by the \texttt{phase-III} key.
+%    \item[\texttt{bib}] This adds tagging support to citations and bibliographies.
+%    This code is also loaded by the \texttt{phase-III} key.
+%    \item[\texttt{text}] This module adds tagging support to the \LaTeX{} logo and
+%    to the \cs{emph} command.
+%    This code is also loaded by the \texttt{phase-III} key.
+%    \item[\texttt{math}] This adapts math for tagging. This is only a prototype. 
+%    The module is currently not loaded by any \texttt{phase} key. 
+%    \item[\texttt{firstaid}] This contains small adjustments to external packages.
+%    The module is currently not loaded by any \texttt{phase} key.  
 %    \end{description}
-%    The |testphase| key can only be used in the first \cs{DocumentMetadata}.
+%    
 %
 %    \item[\texttt{debug}] This key activates some debug options. It takes a list of key-values
 %    as value. Currently the following keys are known:

diff --git a/required/latex-lab/latex-lab-bib.dtx b/required/latex-lab/latex-lab-bib.dtx
@@ -16,6 +16,8 @@
 %
 % for those people who are interested or want to report an issue.
 %
+\def\ltlabbibdate{2023-07-20}
+\def\ltlabbibversion{0.81a}
 %<*driver>
 \documentclass{l3doc}
 \EnableCrossrefs
@@ -31,7 +33,7 @@
 % Changes and additions to the kernel related to tagging and links in citations and 
 % bibliography entries}
 % \author{\LaTeX{} Project\thanks{Initial implementation done by Ulrike Fischer}}
-% \date{Version 0.81 2023-06-07}
+% \date{v\ltlabbibversion\ \ltlabbibdate}
 %
 % \maketitle
 %
@@ -129,12 +131,12 @@
 %<@@=tag>
 %    \end{macrocode}
 %    \begin{macrocode}
-\ProvidesExplPackage {latex-lab-testphase-bib} {2023-05-18} {0.8}
+\ProvidesExplPackage {latex-lab-testphase-bib} {\ltlabbibdate} {\ltlabbibversion}
   {Code related to the tagging of bibliography and cite command}
 %    \end{macrocode}
 % We need at least the block tagging code.
 %    \begin{macrocode}
-\RequirePackage{latex-lab-testphase-block-tagging}  
+\RequirePackage{latex-lab-testphase-block}  
 %    \end{macrocode}
 %
 % At first we suppress the patches from hyperref. This will only work with the next
@@ -398,7 +400,8 @@
 %    \begin{macrocode}
 %<*latex-lab>
 \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/...red/latex-lab/latex-lab-block-tagging.dtx → required/latex-lab/latex-lab-block.dtx b/...red/latex-lab/latex-lab-block-tagging.dtx → required/latex-lab/latex-lab-block.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-%% File: latex-lab-block-tagging.dtx (C) Copyright 2021-2023 LaTeX Project
+%% File: latex-lab-block.dtx (C) Copyright 2021-2023 LaTeX Project
 %
 % It may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -9,7 +9,8 @@
 %
 %    https://www.latex-project.org/lppl.txt
 %
-%
+\def\ltlabblockdate{2023-07-20}
+\def\ltlabblockversion{0.8g}
 %<*driver>
 \documentclass{l3doc}
 \usepackage{amstext}
@@ -19,21 +20,17 @@
 \usepackage{todonotes}
 
 \begin{document}
-  \DocInput{latex-lab-block-tagging.dtx}
+  \DocInput{latex-lab-block.dtx}
 \end{document}
 %</driver>
 %
 % \fi
 %
-
-\def\ltblocksversion{v0.8d}
-\def\ltblocksdate{2023/06/07}
-
 %
 % \title{Prototype reimplementation of \LaTeXe{}'s block environments using templates}
 % \author{\LaTeX{} Project\thanks{Initial reimplementation of lists done by Bruno
 %    Le Floch, generalized second version with tagging support by Frank Mittelbach.}}
-% \date{\ltblocksversion\ \ltblocksdate}
+% \date{v\ltlabblockversion\ \ltlabblockdate}
 %
 % \maketitle
 %
@@ -641,8 +638,8 @@
 %
 %
 %    \begin{macrocode}
-\ProvidesPackage {latex-lab-testphase-block-tagging}
-                 [\ltblocksdate\space \ltblocksversion\space
+\ProvidesPackage {latex-lab-testphase-block}
+                 [\ltlabblockdate\space v\ltlabblockversion\space
                             blockenv implementation]
 %    \end{macrocode}
 %
@@ -1143,8 +1140,6 @@
 %  \end{macro}
 %
 %
-%
-%
 % \subsubsection{Standard list environments}
 %
 %
@@ -1173,8 +1168,32 @@
 % \end{environment}
 %
 %
+% \subsubsection{verse environment}
 %
-%
+%  \begin{environment}{verse}
+%  The verse environment has not special tagging currently. It is
+%  defined as a simple standard list and takes the tagging from there.
+%  But it must be redefined so that \cs{itemindent} is correctly set.
+%    \begin{macrocode}
+\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 }
+  }   
+%    \end{macrocode}
+% \end{environment}
 %
 %
 % \begin{environment}{list}
@@ -3844,10 +3863,10 @@
 %
 %    \begin{macrocode}
 %<*latex-lab>
-\ProvidesFile{block-tagging-latex-lab-testphase.ltx}
-        [\ltblocksdate\space \ltblocksversion\space
+\ProvidesFile{block-latex-lab-testphase.ltx}
+        [\ltlabblockdate\space v\ltlabblockversion\space
                             blockenv implementation]
-\RequirePackage{latex-lab-testphase-block-tagging}
+\RequirePackage{latex-lab-testphase-block}
 %</latex-lab>
 %    \end{macrocode}
 %