merge develop

latex3 · Oct 15, 2023 · 714da4d · 714da4d
2 parents cf24576 + c4e69ac
commit 714da4d
Show file tree

Hide file tree

Showing 55 changed files with 3,578 additions and 1,814 deletions.
diff --git a/base/changes.txt b/base/changes.txt
@@ -5,23 +5,39 @@ It is provided for convenience only.  It therefore makes no claims to
 completeness or accuracy and it contains some references to files that
 are not part of the distribution.
 ================================================================================
+
+2023-10-14 Joseph Wright  <Joseph.Wright@latex-project.org>
+	* clsguide.tex:
+	Additional documentation
+
+
+2023-10-14 Joseph Wright  <Joseph.Wright@latex-project.org>
+	* clsguide.tex:
+	Add that \CurrentOption is available in \DeclareUnknownKeyHandler
+
+2023-10-10  Frank Mittelbach  <Frank.Mittelbach@latex-project.org>
+
+	* docstrip.dtx (section{Internal functions and variables}):
+	Explain the steps carried out by the replacement algorithm for @@.
+
 2023-09-13 Ulrike Fischer <Ulrike.Fischer@latex-project.org>
 	* ltproperties.dtx: 
-      use \protected@edef for expansion in the LaTeX2e commands.
+      Use \protected@edef for expansion in the LaTeX2e commands.
 
 2023-09-13 Ulrike Fischer <Ulrike.Fischer@latex-project.org>
-	* ltproperties.dtx: 
-      expand consistently the label/property names in the LaTeX2e commands.
+	* ltproperties.dtx:
+	Expand consistently the label/property names in the LaTeX2e commands.
 
 2023-09-13 Joseph Wright  <Joseph.Wright@latex-project.org>
-    * ltmiscen.dtx:
-      add test to \enddocument for changes in property values.
+	* ltmiscen.dtx:
+	Correct typo
 
 2023-09-05 Ulrike Fischer <Ulrike.Fischer@latex-project.org>
-	* ltproperties.dtx: 
-      First implementation of properties module
-    * ltmiscen.dtx:
-      Correct typo
+	* ltproperties.dtx:
+	First implementation of properties module
+
+	* ltmiscen.dtx:
+	Add test to \enddocument for changes in property values.
 
 2023-09-01  Joseph Wright  <Joseph.Wright@latex-project.org>
 
@@ -40,8 +56,6 @@ are not part of the distribution.
 
 2023-08-19 Joseph Wright  <Joseph.Wright@latex-project.org>
 
-2023-08-19 Joseph Wright  <Joseph.Wright@latex-project.org> 
-
 	* ltcmd.dtx, usrguide.tex
 	Remove \GetDocumentCommandArgSpec,
 	  \GetDocumentEnvironmentArgSpec,

diff --git a/base/doc/clsguide.tex b/base/doc/clsguide.tex
@@ -875,7 +875,15 @@ \subsection{Creating and using keyval options}
 The command |\DeclareUnknownKeyHandler| may be used to define the behavior when
 an undefined key is encountered. The \m{code} will receive the unknown key name
 as |#1| and the value as |#2|. These can then be processed as appropriate,
-e.g.~by forwarding to another package.
+e.g.~by forwarding to another package. The entire option is available as
+\cs{CurrentOption}, should it be necessary to pass on options which may or
+may not contain an |=|~sign. For example, this may be used to pass an
+unknown option on to a non-keyval class such as \pkg{article}:
+\begin{verbatim}
+\DeclareUnknownKeyHandler{%
+  \PassOptionsToClass{\CurrentOption}{article}
+}
+\end{verbatim}
 
 \begin{decl}
   |\ProcessKeyOptions| \oarg{family}

diff --git a/base/doc/ltnews38.tex b/base/doc/ltnews38.tex
@@ -237,6 +237,13 @@ \subsection{Support for tabs in \cs{verb*} and \texttt{verbatim*}}
 %
 \githubissue{1085}
 
+\subsection{In the programming layer}
+
+In the programming layer (\pkg{expl3}), we have revised the behavior of the
+titlecasing function to enable this to either titlecase only the first word of
+the input, or to titlecase every word. This should be transparent at the
+document level but will be useful for programmers.
+
 \section{Bug fixes}
 
 \section{Changes to packages in the \pkg{amsmath} category}

diff --git a/base/doc/tlc3.err b/base/doc/tlc3.err
@@ -1,4 +1,4 @@
-\newcommand\erratafiledate{2023/09/01}        % needs / not -
+\newcommand\erratafiledate{2023/10/11}        % needs / and not -
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 % To produce a printed version of this errata file run this file through
@@ -259,8 +259,9 @@
 % printing are typeset.
 %
 
-\renewcommand\erratastartdate{2023/04/01}
+\renewcommand\erratastartdate{2023/04/01}    % ALL ENTRIES
 %\renewcommand\erratastartdate{2023/05/30}   % for the first digital edition
+%\renewcommand\erratastartdate{2023/09/01}   % 
 
 
 % If you own a digital edition (which is more often updated than the
@@ -636,6 +637,18 @@ Typo: Assembler (\u{N}otorola68k, x86masm) \> \\ Assembler (\u{M}otorola68k, x86
 
 \CHAPTER{Chapter 5 --- The Layout of the Page}
 
+\erroronpage{I-386}{exa 5-3-1, l.7}{EOl}{2023/09/09}{s}
+Change:
+paragraph over \u{two} pages. \> paragraph over \u{three} pages.
+
+\textit{Reason: The third page contains just the word ``pages.'' (which would be page 8)
+is not shown.}
+
+\erroronpage{I-389}{syntax box -1}{DC}{2023/10/06}{s}
+
+\u{\cs{right}} \> \u{\cs{rightmark}}
+
+
 
 \CHAPTER{Chapter 6 --- Tabular  Material}
 
@@ -654,6 +667,9 @@ result in ``31.00'', which is probably not desired.
 
 \CHAPTER{Chapter 7 --- Mastering Floats}
 
+\erroronpage{I-520}{paragraph 4, l.3}{EOl}{2023/09/09}{s}
+Change:
+For \u{a} example \> For example
 
 \CHAPTER{Chapter 8 --- Graphics Generation and Manipulation}
 
@@ -1278,9 +1294,11 @@ Jane Doe.\ \textit{A\u{n} second book.}\ 2020.\> Jane Doe.\ \textit{A second boo
 \CHAPTER{Chapter 17 --- \LaTeX{} Package Documentation Tools}
 
 \erroronpage{II-599}{para 3, l.1}{EOl}{2023/07/30}{s}
-
 \u{Whencreating automatically} the driver \> \u{When} the driver
 
+\erroronpage{II-605}{para 1, l.10}{CAR}{2023/10/10}{}
+\u{right numbers} of underscores \> \u{correct number} of underscores
+
 
 \CHAPTER{Appendix A --- \LaTeX{} Overview for Preamble, \ldots}
 
@@ -1325,6 +1343,8 @@ Appendix title not properly capitalized.
 \begin{multicols}{3}[Thanks to all who have found errors or
    omissions. Listed are the people who found an errata entry first.]
 \contributor{BeB}{Bernd Burghardt}
+\contributor{CAR}{Chris Rowley}
+\contributor{DC}{Davide Campagnari}
 \contributor{DFl}{Daniel Flipo}
 \contributor{EOl}{Edgar Olthof}
 \contributor{FMi}{Frank Mittelbach}

diff --git a/base/docstrip.dtx b/base/docstrip.dtx
@@ -31,7 +31,7 @@
 \def\filename{docstrip.dtx}
 \def\fileversion{v2.6b}
 \def\filedate{2022-09-03}
-\def\docdate {2022-09-03}
+\def\docdate {2023-10-10}
 %%
 %
 %\iffalse
@@ -838,6 +838,29 @@
 %    suppressed by giving an empty module name, namely using the
 %    syntax \texttt{\%<@@=>}.
 %
+%    The exact steps that are carried out by this replacement
+%    algorithm are the following:
+%    \begin{enumerate}
+%    \item First, deal with \texttt{@@@@} as a special case (by using a
+%    temporary disguise).
+%
+%    \item Then change all |__@@| to |__|\meta{module}.
+%
+%    \item Then change all remaining |_@@| to
+%      |__|\meta{module}.
+%
+%    \item Then change all remaining \texttt{@@} to
+%      |__|\meta{module}.
+%
+%    \item Finally, tidy up by changing each ``disguised
+%      \texttt{@@@@}'' to \texttt{@@}.
+%    \end{enumerate}
+%    Thus, replacement means that \texttt{@@} is replaced by the
+%    \meta{module} name and that 0, 1, or 2 underscores in front of
+%    \texttt{@@} are replaced by exactly 2 underscores (whilst any
+%    larger number of underscores is preserved).
+%
+%
 % \section{Those other languages}
 %    Since \TeX\ is an open system some of \TeX\ packages include
 %    non-\TeX\ files. Some authors use \ds\ to generate PostScript

diff --git a/base/lthooks.dtx b/base/lthooks.dtx
@@ -32,7 +32,7 @@
 %
 %    \begin{macrocode}
 \def\lthooksversion{v1.1f}
-\def\lthooksdate{2023/08/11}
+\def\lthooksdate{2023/10/02}
 %    \end{macrocode}
 %
 %<*driver>
@@ -795,7 +795,7 @@
 %    \end{itemize}
 %    There can only be a single relation between two labels for a
 %    given hook,
-%    i.e., a later \cs{DeclareHookrule} overwrites any previous
+%    i.e., a later \cs{DeclareHookRule} overwrites any previous
 %    declaration.
 %
 %    The \meta{hook} and \meta{label} can be specified using the
@@ -1566,8 +1566,8 @@
 %
 %    Generic hooks defined in this way are always normal hooks (i.e.,
 %    you can't implement reversed hooks this way). This is a
-%    deliberate limitation, because it speeds up the processessing
-%    conciderably.
+%    deliberate limitation, because it speeds up the processing
+%    considerably.
 %
 %
 % \subsection{Hooks with arguments}

diff --git a/base/source2edoc.cls b/base/source2edoc.cls
@@ -30,7 +30,7 @@
     \seq_if_empty:NF \g__codedoc_nested_names_seq
       {
 % This is a crude change: we grab the first name
-        \__codedoc_get_hyper_target:xN
+        \__codedoc_get_hyper_target:eN
           { \seq_item:Nn \g__codedoc_nested_names_seq { 1 } }
           \l__codedoc_tmpa_tl
 % ... and check if it has a reference

diff --git a/base/testfiles/github-0479-often.luatex.tlg b/base/testfiles/github-0479-often.luatex.tlg
@@ -877,14 +877,14 @@ Applying: [....-..-..] UTF-8 default on input line ....
 Already applied: [....-..-..] UTF-8 default on input line ....
 )
 > \__kernel_chk_if_free_cs:N=\protected\long macro:
-#1->\cs_if_free:NF #1{\msg_error:nnxx {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
+#1->\cs_if_free:NF #1{\msg_error:nnee {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
 l. ...\show \__kernel_chk_if_free_cs:N
 > \e@alloc=macro:
 #1#2#3#4#5#6->\global \advance #3\@ne \e@ch@ck {#3}{#4}{#5}#1\allocationnumber #3\relax \global #2#6\allocationnumber \wlog {\string #6=\string #1\the \allocationnumber }.
 l. ...\show \e@alloc
-> \__kernel_msg_error:nnx=\protected\long macro:
-#1->\msg_error:nnx {LaTeX/#1}.
-l. ...\show \__kernel_msg_error:nnx
+> \__kernel_msg_error:nne=\protected\long macro:
+#1->\msg_error:nne {LaTeX/#1}.
+l. ...\show \__kernel_msg_error:nne
 > \msg_new:nnnn=\protected\long macro:
 #1#2->\__msg_chk_free:nn {#1}{#2}\msg_gset:nnnn {#1}{#2}.
 l. ...\show \msg_new:nnnn

diff --git a/base/testfiles/github-0479-often.lvt b/base/testfiles/github-0479-often.lvt
@@ -9,7 +9,7 @@
 \makeatletter\ExplSyntaxOn
 \show \__kernel_chk_if_free_cs:N
 \show \e@alloc
-\show \__kernel_msg_error:nnx
+\show \__kernel_msg_error:nne
 \show \msg_new:nnnn
 \show \NewDocumentCommand
 \show \newcommand

diff --git a/base/testfiles/github-0479-often.tlg b/base/testfiles/github-0479-often.tlg
@@ -1302,14 +1302,14 @@ Now handling font encoding U ...
 Already applied: [....-..-..] UTF-8 default on input line ....
 )
 > \__kernel_chk_if_free_cs:N=\protected\long macro:
-#1->\cs_if_free:NF #1{\msg_error:nnxx {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
+#1->\cs_if_free:NF #1{\msg_error:nnee {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
 l. ...\show \__kernel_chk_if_free_cs:N
 > \e@alloc=macro:
 #1#2#3#4#5#6->\global \advance #3\@ne \e@ch@ck {#3}{#4}{#5}#1\allocationnumber #3\relax \global #2#6\allocationnumber \wlog {\string #6=\string #1\the \allocationnumber }.
 l. ...\show \e@alloc
-> \__kernel_msg_error:nnx=\protected\long macro:
-#1->\msg_error:nnx {LaTeX/#1}.
-l. ...\show \__kernel_msg_error:nnx
+> \__kernel_msg_error:nne=\protected\long macro:
+#1->\msg_error:nne {LaTeX/#1}.
+l. ...\show \__kernel_msg_error:nne
 > \msg_new:nnnn=\protected\long macro:
 #1#2->\__msg_chk_free:nn {#1}{#2}\msg_gset:nnnn {#1}{#2}.
 l. ...\show \msg_new:nnnn

diff --git a/base/testfiles/github-0479-often.xetex.tlg b/base/testfiles/github-0479-often.xetex.tlg
@@ -874,14 +874,14 @@ Applying: [....-..-..] UTF-8 default on input line ....
 Already applied: [....-..-..] UTF-8 default on input line ....
 )
 > \__kernel_chk_if_free_cs:N=\protected\long macro:
-#1->\cs_if_free:NF #1{\msg_error:nnxx {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
+#1->\cs_if_free:NF #1{\msg_error:nnee {kernel}{command-already-defined}{\token_to_str:N #1}{\token_to_meaning:N #1}}.
 l. ...\show \__kernel_chk_if_free_cs:N
 > \e@alloc=macro:
 #1#2#3#4#5#6->\global \advance #3\@ne \e@ch@ck {#3}{#4}{#5}#1\allocationnumber #3\relax \global #2#6\allocationnumber \wlog {\string #6=\string #1\the \allocationnumber }.
 l. ...\show \e@alloc
-> \__kernel_msg_error:nnx=\protected\long macro:
-#1->\msg_error:nnx {LaTeX/#1}.
-l. ...\show \__kernel_msg_error:nnx
+> \__kernel_msg_error:nne=\protected\long macro:
+#1->\msg_error:nne {LaTeX/#1}.
+l. ...\show \__kernel_msg_error:nne
 > \msg_new:nnnn=\protected\long macro:
 #1#2->\__msg_chk_free:nn {#1}{#2}\msg_gset:nnnn {#1}{#2}.
 l. ...\show \msg_new:nnnn

diff --git a/base/testfiles/github-0944.tlg b/base/testfiles/github-0944.tlg
@@ -22,7 +22,7 @@ LaTeX Warning: Reference `unknown' on page 1 undefined on input line ....
 ] (github-0944.aux)
  ***********
 -formatname- <-formatversion-> pre-release-2 (-release-version-test- branch)
-L3 programming layer <2023-08-29>
+L3 programming layer <2023-10-10>
  ***********
  *File List*
  -show the file list here-

diff --git a/required/tools/afterpage.dtx b/required/tools/afterpage.dtx
@@ -25,7 +25,7 @@
 %
 %<package>\NeedsTeXFormat{LaTeX2e}
 %<package>\ProvidesPackage{afterpage}
-%<package>         [2014/10/28 v1.08 After-Page Package (DPC)]
+%<package>         [2023/07/04 v1.08 After-Page Package (DPC)]
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -199,7 +199,7 @@
          \global\setbox\@ne\lastbox}%
 %    \end{macrocode}
 % If the text that is saved in |\AP@partial| had footnotes, we'd
-% better grab them as well otherwise they may come out on a page
+% better grab them as well, otherwise they may come out on a page
 % with the `afterpage' text, before the page that has the
 % footnote mark! (Added at v1.08.)
 %    \begin{macrocode}
@@ -218,7 +218,7 @@
 %    \end{macrocode}
 %
 % Restore the |\everydisplay| register. |\ignorespaces| prevents a space
-% or newline after |$$| creating rogue a indentation or paragraph.
+% or newline after |$$| creating a rogue indentation or paragraph.
 %    \begin{macrocode}
 \def\AP@ed{\everydisplay\expandafter{\the\toks@}\ignorespaces}
 %    \end{macrocode}
@@ -264,7 +264,7 @@
 % `afterpage' commands, so just add the new commands to the end of the
 % list. Otherwise save the commands in |\AP@|. (within a local group),
 % and switch the output routine. (The new output routine just calls the
-% old one if it is invoked by a \LaTeX{} float.
+% old one if it is invoked by a \LaTeX{} float.)
 %    \begin{macrocode}
 \long\def\afterpage#1{%
   \ifx\AP@\relax
@@ -291,7 +291,7 @@
     \global\output\expandafter{\the\AP@output}%
     \AP@clearpage
 %    \end{macrocode}
-% At this point (since v1.08) Need to clear |\AP@| \emph{before}
+% At this point (since v1.08) need to clear |\AP@| \emph{before}
 % using its expansion, as otherwise hit an infinite loop. Sigh.
 %    \begin{macrocode}
     \global\expandafter\let\expandafter\AP@\expandafter\relax
@@ -350,7 +350,7 @@
 %    \end{macrocode}
 % Subtract the new height of |#1| from |\skip@|, and add back on
 % |\splittopskip|, so |\skip@| is now the height of the first row of
-% |#1| This may still be 0pt if (eg) a mark or whatsit is between the
+% |#1|. This may still be 0pt if (eg) a mark or whatsit is between the
 % top glue and the first box. Save (this height${}-{}$|\splittopskip|)
 % in |\skip\tw@|.
 %    \begin{macrocode}