Merge branch 'lab-review-01' of https://github.com/latex3/latex2e int…

…o lab-review-01

base/changes.txt

@@ -6,6 +6,12 @@ completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
 
+2023-05-26  Yukai Chou <muzimuzhi@gmail.com>
+
+    * ltcmd.dtx (subsection{Structure of \pkg{xparse} commands}):
+    Use simpler 'NNno' variant instead of 'NNVo' for
+    \cs_generate_from_arg_count:NNnn
+
 2023-05-22  Joseph Wright  <Joseph.Wright@latex-project.org>
 
 	* usrguide.tex

base/doc/ltnews37.tex

@@ -178,7 +178,7 @@ \section{New functionality offered as part of the
 A prototype for math tagging (including support for the \pkg{amsmath}
 environments) is already available, but it is mainly intended for
 experimentation and feedback and the resulting tagging is by no means
-the way we envision it to be eventually. If you like to try it out use
+the way we envision it to be eventually. If you would like to try it out use
 the following line:
 \begin{verbatim}
 \DocumentMetadata{testphase={phase-III,math}}
@@ -187,8 +187,8 @@ \section{New functionality offered as part of the
 packages that redefine the \texttt{\$} (which then may lead to strange
 errors) and that packages that use math mode for non-mathematical
 constructs may result in surprising output as far as tagging is
-concerned. Feedback on which packages fail with the code in one or the
-other way would be appreciated.
+concerned. Feedback on which packages fail with the code in one or
+another way would be appreciated.
 
 The \texttt{latex-lab} bundle contains various 
 (still untagged) documentation files about the new code that can
@@ -250,14 +250,14 @@ \subsection{Extending hooks to take arguments}
 The commands \cs{NewReversedHookWithArguments}, \cs
 {NewMirroredHookPairWithArguments}, \cs
 {AddToHookNextWithArguments}, \cs{UseOneTimeHookWithArguments}, and
-the \pkg{expl3} conterparts of the commands discussed in this section
+the \pkg{expl3} counterparts of the commands discussed in this section
 were also added.  The complete documentation can be found in the
 \pkg{lthooks} documentation \cite{37:lthooks-doc}.
 
 \subsubsection{Generic \texttt{cmd} hooks with arguments}
 
 Along with the possibility to pass arguments to a regular hook as
-discussed above, generic \hook{cmd} hooks now can access the arguments
+discussed above, generic \hook{cmd} hooks can now access the arguments
 of the command they are patched into using the interface described in
 the previous section.
 
@@ -384,7 +384,7 @@ \subsection{Extension of the \cs{label} command}
 
 Previously, in standard \LaTeX{}, the \cs{label} command wrote a \cs{newlabel} declaration into
 the \texttt{.aux} file and stored two values in
-second argument of this \cs{newlabel} command:
+the second argument of this \cs{newlabel} command:
 \cs{@currentlabel}, which normally contains the state of the current 
 counter and \cs{thepage} for the current page number.
 
@@ -396,7 +396,7 @@ \subsection{Extension of the \cs{label} command}
 active link. The fifth argument was only used if external 
 references were loaded with the \pkg{xr-hyper} package. 
 
-Starting with this release, the number of values stored in \cs{newlabel} have been unified. 
+Starting with this release, the number of values stored in \cs{newlabel} has been unified. 
 \cs{label} now writes a
 \cs{newlabel} command that always contains five values in the second argument (each in a brace group):
 \cs{@currentlabel}, \cs{thepage}, \cs{@currentlabelname}, 
@@ -549,7 +549,7 @@ \subsection{Incompatibility between \pkg{doc} and \pkg{unicode-math}}
 
 The \pkg{unicode-math} package alters the catcode of \verb=|= but does
 not adjust its value for use in \pkg{doc}, with the result that
-\enquote{or} module, i.e., $\langle A | B \rangle$ are displayed in a
+\enquote{or} modules, i.e., $\langle A | B \rangle$ are displayed in a
 strange way. This is now fixed with some firstaid code that will
 eventually be moved into \pkg{unicode-math}.
 %
@@ -594,7 +594,7 @@ \subsection{Improve spacing at top of \env{minipages}}
 
 With the new paragraph handling introduced in 2021 it is now finally
 possible to detect and avoid this problem and apply appropriate
-counter measures so that from now on the spacing will be always
+counter measures so that from now on the spacing will always be
 correct.
 %
 \githubissue{989}
@@ -656,7 +656,7 @@ \subsection{Updates to the guides}
 When \LaTeXe{} was released, the team provided documentation for both document
 authors and package/class developers in the two files \texttt{usrguide} and
 \texttt{clsguide}. Over time, the team have augmented these documents as new
-methods have been added to the kernel. However, they retained there structure
+methods have been added to the kernel. However, they retained their structure
 as starting from familiarity with \LaTeX{}~2.09. This meant that for new users,
 there was material which is no longer relevant, and less clarity than desirable
 in what approaches are recommended today.
@@ -671,7 +671,7 @@ \subsection{Updates to the guides}
 \subsection{Displaying the exact release dates for \LaTeX{}}
 
 In some situations it is necessary to find out the exact release dates
-for older version of the \LaTeX{} format, for example, when you need
+for older versions of the \LaTeX{} format, for example, when you need
 to use different code in a package depending on the availability of a
 certain feature and you therefore want to use
 \cs{IfFormatAtLeastTF}\texttt\{\meta{date}\texttt\} or the
@@ -686,7 +686,7 @@ \subsection{Displaying the exact release dates for \LaTeX{}}
 
 The big problem is to know the exact \meta{date} to put into such
 commands and in the past that was not that easy to find. You could have 
-looked in the the file \file{changes.txt}, but that is hidden somewhere
+looked in the file \file{changes.txt}, but that is hidden somewhere
 in your installation and if you try
 \verb*/texdoc -l changes.txt/ you get more than thirty results and the %*
 right file is by no means the first.
@@ -722,7 +722,7 @@ \subsection{Fresh from the press: \enquote{The \LaTeX{} Companion, third edition
 successfully navigate the \LaTeX{} ecosystem and efficiently produce
 beautiful documents.
 
-Since the publication of the last edition (2004) a lot has happened in
+Since the publication of the last edition (2004), a lot has happened in
 the \LaTeX{} world and thus a complete rewrite was necessary.  All
 chapters have been thoroughly revised and in many cases largely
 extended to describe new important functionality and features. More
@@ -744,10 +744,12 @@ \subsection{Fresh from the press: \enquote{The \LaTeX{} Companion, third edition
 \end{quote}
 
 The edition is also available as an eBook (Parts I and II combined)
-consisting of PDF and ePub format without DRM. Finally, the publisher
+consisting of PDF and ePub format without DRM\@. Finally, the publisher
 offers the combination of the printed books and the digital versions at
 a very attractive price not available anywhere else.
 
+%% bb -- add reference to TUGboat review here
+
 
 %\section{Changes to packages in the \pkg{amsmath} category}
 

base/doc/tlc3.err

@@ -1,4 +1,4 @@
-\newcommand\erratafiledate{2023-05-16}
+\newcommand\erratafiledate{2023-05-25}
 
 \def\comando#1{\texttt{\string#1}}
 
@@ -20,7 +20,7 @@
 \begin{filecontents}{ttcterrata.cls}
 %%
 %% Copyright (C) 1997-2021 Frank Mittelbach
-%% This class file is licenced under LPPL latest version;
+%% This class file is licensed under LPPL latest version;
 %% see https://www.latex-project.org/lppl
 %
 %
@@ -391,7 +391,7 @@ content differs from that of the printed version: there is only a
 single font matter, a single bibliography, and a single index, whereas
 in the printed books these are separated out. However, all versions share the main
 matter (down to the page numbering) so most of the errata applies to
-all versions, but to a few only to the digital and others only to the
+all versions, but a few only to the digital and some only to the
 printed version. Thus, we end up with three separate lists.
 
 
@@ -410,7 +410,7 @@ printed version. Thus, we end up with three separate lists.
 \section*{Errata for the print version (not applicable to the digital version)}
 
 The printed books differ from the digital version in that the
-biligraphy is split across both volumes (with a few repeats) and that
+bibliography is split across both volumes (with a few repeats) and that
 the font matter of each volume has its own table of contents and list
 of figures and tables. Therefore these parts have different page
 numbers and you will see similar errata entries for both print and
@@ -430,7 +430,7 @@ formulas \> \u{F}ormulas
 documents \> \u{D}ocuments
 
 \erroronpage{I-xvii}{chapter head}{FMi}{2023/04/04}{s}
-beyond \> \u{B}yond
+beyond \> \u{B}eyond
 
 \erroronpage{I-xx\ldots I-xxi}{}{FMi}{2023/04/04}{s}
 Dot leaders have been changed on all sections.
@@ -457,7 +457,7 @@ Add: Vancouver, 1999
 Publishing \> Publishing\u{,}
 
 \erroronpage{I-790}{[122], l.1}{kb/bb}{2023/04/04}{s}
-In \u{ACM editor} ``Proceedings \> In ``PODC'01: Proceedings
+In \u{ACM editor} ``Proceedings \> In ``\u{PODC'01: }Proceedings
 
 \erroronpage{I-790}{[122], l.1}{kb/bb}{2023/04/04}{s}
 In \u{Unicode Consortium, editor} \> In
@@ -480,7 +480,7 @@ formulas \> \u{F}ormulas
 documents \> \u{D}ocuments
 
 \erroronpage{II-xxi}{chapter head}{FMi}{2023/04/04}{s}
-beyond \> \u{B}yond
+beyond \> \u{B}eyond
 
 
 
@@ -716,7 +716,7 @@ Paragraph moved to page 141.
 \\ Already corrected in the digital version.
 
 \erroronpage{II-141}{}{FMi}{2023/04/04}{s}
-One paragraph added moved over from page 144.
+One paragraph moved over from page 140.
 \\ Already corrected in the digital version.
 
 \erroronpage{II-144}{para 2, l.-3}{FMi}{2023/04/04}{s}

base/ltcmd.dtx

@@ -34,8 +34,8 @@
 %%% From File: ltcmd.dtx
 %
 %    \begin{macrocode}
-\def\ltcmdversion{v1.1d}
-\def\ltcmddate{2023-04-13}
+\def\ltcmdversion{v1.1e}
+\def\ltcmddate{2023-05-26}
 %    \end{macrocode}
 %
 %<*driver>
@@ -725,6 +725,9 @@
       { \@@_environment_or_command: }
   }
 %    \end{macrocode}
+%
+% \changes{v1.1e}{2023/05/26}
+%         {Use simpler variant \cs{cs_generate_from_arg_count:NNno}}
 %   To construct \cs{@@_tmp:w}, first go through the arguments
 %   found and the corresponding defaults, building a token list with
 %   |{#|\meta{arg number}|}| for arguments found in the input (whose
@@ -738,10 +741,10 @@
     \int_zero:N \l_@@_current_arg_int
     \@@_tl_mapthread_function:NNN \l_@@_args_tl \l_@@_defaults_tl
       \@@_defaults_def:nn
-    \cs_generate_from_arg_count:NNVo \@@_tmp:w \cs_set:Npn
+    \cs_generate_from_arg_count:NNno \@@_tmp:w \cs_set:Npn
       \l_@@_current_arg_int \l_@@_tmpa_tl
   }
-\cs_generate_variant:Nn \cs_generate_from_arg_count:NNnn { NNVo }
+\cs_generate_variant:Nn \cs_generate_from_arg_count:NNnn { NNno }
 \cs_new_protected:Npn \@@_defaults_def:nn
   {
     \int_incr:N \l_@@_current_arg_int

base/ltoutput.dtx

@@ -37,7 +37,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltoutput.dtx}
-             [2022/08/20 v1.4j LaTeX Kernel (Output Routine)]
+             [2023/05/26 v1.4j LaTeX Kernel (Output Routine)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltoutput.dtx}
@@ -3005,9 +3005,6 @@
 %
 % There is also an |\addpenalty\interlinepenalty| above.
 %
-% Since in 2e |\samepage| is no longer supported, these could be
-% removed.
-%
 % Although it is best to use |\addvspace| in case two h floats come
 % together, this makes other spacing more difficult to adjust; whereas
 % if a user specifies two h floats together then they can more easily
@@ -3227,9 +3224,6 @@
 %
 % There is also an |\addpenalty\interlinepenalty| above.
 %
-% Since in 2e |\samepage| is no longer supported, these could be
-% removed.
-%
 % Although it is best to use |\addvspace| in case two h floats come
 % together, this makes other spacing more difficult to adjust; whereas
 % if a user specifies two h floats together then they can more easily

base/ltspace.dtx

@@ -32,7 +32,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltspace.dtx}
-             [2023/03/22 v1.3p LaTeX Kernel (spacing)]
+             [2023/05/26 v1.3p LaTeX Kernel (spacing)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltspace.dtx}
@@ -94,6 +94,7 @@
 % inhibits page breaking most places by setting the
 % following penalties to 10000:\\
 %                    |\interlinepenalty|\\
+%                    |\predisplaypenalty|\\
 %                    |\postdisplaypenalty|\\
 %                    |\interdisplaylinepenalty|\\
 %                    |\@beginparpenalty|\\

required/latex-lab/documentmetadata-support.dtx

@@ -132,7 +132,9 @@
 %      it is also possible to use the values
 %      |X-4|, |X-4p|, |X-5g|, |X-5n|, |X-5pg|, |X-6|, |X-6n|, |X-6p|, |UA-1| for
 %      a PDF/X and PDF/UA standard. These keys currently set \emph{only} the relevant
-%      XMP-metadata.
+%      XMP-metadata. In version 0.95z support for |UA-2| has been added but
+%      note that |UA-2| hasn't been released yet. It should be used only together
+%      with pdf version 2.0.
 %
 %      |pdfstandard| can be used more than once to set overlapping standards, e.g:\\
 %      |pdfstandard=A-2b,pdfstandard=X-4,pdfstandard=UA-1|
@@ -159,11 +161,18 @@
 %       |\tagpdfsetup{activate,interwordspace}|. This phase
 %       is frozen.
 %    \item[\texttt{phase-II}]
-%       This is the current development phase.
-%       Currently it differs from \texttt{phase-I} only in one point: It will
+%       It differs from \texttt{phase-I} only in one point: It will
 %       additionally activate tagging of paragraphs with
 %       |\tagpdfsetup{paratagging}|. In the upcoming months it will
 %       also enable automatic tagging of other basic document elements.
+%    \item[\texttt{phase-III}]
+%       This is the current development phase.
+%       It differs from \texttt{phase-II} \emph{a lot}: It will
+%       load new code for the tagging of lists, sectioning commands,
+%       table of contents and similar lists, graphics, minipages and floats. 
+%       As it redefines many internals it is restricted to the use of 
+%       standard classes (article, report, and book) 
+%       and it supports only a limited number of add-on package.  
 %    \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 
@@ -188,6 +197,10 @@
 %     \item[\texttt{firstaidoff}] This accepts a comma lists of keywords and disables the patches
 %       related to them. More information can be found in the documentation of
 %       \pkg{pdfmanagement-firstaid}.
+%     \item[\texttt{xmp-export}] This will export the XMP-metadata to a file \verb+\jobname.xmpi+.
+%     with \texttt{debug=\{xmp-export=filename\}} the file name can be changed. 
+%     More information can be found in the documentation of \pkg{l3pdfmeta} of the \pkg{pdfmanagement-testphase}
+%     bundle.         
 %    \end{description}
 % \end{description}
 %