latex-dev (11jun23)

git-svn-id: svn://tug.org/texlive/trunk@67328 c570f23f-e606-0410-a88d-b1316a301751

6 files changed, 47 insertions, 21 deletions

diff --git a/Master/texmf-dist/source/latex-dev/base/ltcmd.dtx b/Master/texmf-dist/source/latex-dev/base/ltcmd.dtx
index 5f019cdc2a0..d6322ff3ee8 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltcmd.dtx
+++ b/Master/texmf-dist/source/latex-dev/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
diff --git a/Master/texmf-dist/source/latex-dev/base/ltfinal.dtx b/Master/texmf-dist/source/latex-dev/base/ltfinal.dtx
index 1e39e293e08..2652f6ce44e 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltfinal.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltfinal.dtx
@@ -33,7 +33,7 @@
 %<*driver>
 % \fi
 \ProvidesFile{ltfinal.dtx}
-             [2023/04/20 v2.3b LaTeX Kernel (Final Settings)]
+             [2023/05/30 v2.3c LaTeX Kernel (Final Settings)]
 % \iffalse
 \documentclass{ltxdoc}
 \GetFileInfo{ltfinal.dtx}
@@ -1201,6 +1201,8 @@
 % \changes{v2.2u}{2022/06/30}{Add \cs{AddToNoCaseChangeList}}
 % \changes{v2.3b}{2023/04/19}{Add \cs{DeclareLowercaseMapping},
 %   \cs{DeclareTitlecaseMapping} and \cs{DeclareUppercaseMapping}}
+% \changes{v2.3c}{2023/05/30}{Fix a typo in implementation of
+%   \cs{DeclareLowercaseMapping}, etc.}
 % |\NoCaseChange| protects its argument from the case change functions.
 %
 % |\AddToNoCaseChangeList| Allows new commands to protect their arguments, eg
@@ -1216,21 +1218,21 @@
   \text_declare_case_equivalent:Nn
 \NewDocumentCommand \DeclareLowercaseMapping { o m m }
   {
-    \IFNoValueTF {#1}
+    \IfNoValueTF {#1}
       { \text_declare_lowercase_mapping:nn }
       { \text_declare_lowercase_mapping:nnn {#1} }
         {#2} {#3}
   }
 \NewDocumentCommand \DeclareTitlecaseMapping { o m m }
   {
-    \IFNoValueTF {#1}
+    \IfNoValueTF {#1}
       { \text_declare_titlecase_mapping:nn }
       { \text_declare_titlecase_mapping:nnn {#1} }
         {#2} {#3}
   }
 \NewDocumentCommand \DeclareUppercaseMapping { o m m }
   {
-    \IFNoValueTF {#1}
+    \IfNoValueTF {#1}
       { \text_declare_uppercase_mapping:nn }
       { \text_declare_uppercase_mapping:nnn {#1} }
         {#2} {#3}
diff --git a/Master/texmf-dist/source/latex-dev/base/lthooks.dtx b/Master/texmf-dist/source/latex-dev/base/lthooks.dtx
index c0efe2c9038..3807d25c44b 100644
--- a/Master/texmf-dist/source/latex-dev/base/lthooks.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/lthooks.dtx
@@ -31,8 +31,8 @@
 %%% From File: lthooks.dtx
 %
 %    \begin{macrocode}
-\def\lthooksversion{v1.1d}
-\def\lthooksdate{2023/05/21}
+\def\lthooksversion{v1.1e}
+\def\lthooksdate{2023/06/06}
 %    \end{macrocode}
 %
 %<*driver>
@@ -4424,6 +4424,7 @@
 % \end{macro}
 %
 % \begin{macro}{\@@_cs_gput_right:nnn}
+% \begin{macro}{\@@_cs_gput_right_fast:nnn,\@@_cs_gput_right_slow:nnn}
 % \begin{macro}{\@@_code_gset_auxi:nnnn,\@@_code_gset_auxi:eeen}
 %   This macro is used to append code to the \verb|toplevel| and
 %   \verb|next| token lists, trating them correctly depending on their
@@ -4432,10 +4433,32 @@
 %   stored as parameter tokens.
 % \changes{v1.1a}{2023/04/06}
 %         {Macro added (hook-args).}
+% \changes{v1.1e}{2023/06/06}
+%         {Short-circuit when the hook is declared without args (gh1078).}
 %    \begin{macrocode}
 %<latexrelease>\IncludeInRelease{2023/06/01}{\@@_cs_gput_right:nnn}
 %<latexrelease>                 {Hooks~with~args}
-\cs_new_protected:Npn \@@_cs_gput_right:nnn #1 #2 #3
+%    \end{macrocode}
+%
+%   Check if the current hook is declared and takes no arguments.  In
+%   this case, we short-circuit and use the simpler and much faster
+%   approach that doesn't require hash-doubling.
+%    \begin{macrocode}
+\cs_new_protected:Npn \@@_cs_gput_right:nnn #1 #2
+  {
+    \if:w T
+        \@@_if_declared:nF {#2} { F }
+        \tl_if_empty:cF { c_@@_#2_parameter_tl } { F }
+          T
+      \exp_after:wN \@@_cs_gput_right_fast:nnn
+    \else:
+      \exp_after:wN \@@_cs_gput_right_slow:nnn
+    \fi:
+        {#1} {#2}
+  }
+\cs_new_protected:Npn \@@_cs_gput_right_fast:nnn #1 #2 #3
+  { \cs_gset:cpx { @@#1~#2 } { \exp_not:v { @@#1~#2 } \exp_not:n {#3} } }
+\cs_new_protected:Npn \@@_cs_gput_right_slow:nnn #1 #2 #3
   {
 %    \end{macrocode}
 %   The auxiliary \cs{@@_code_gset_auxi:eeen} just does the assignment
@@ -4498,11 +4521,14 @@
 %<latexrelease>\IncludeInRelease{2020/10/01}{\@@_cs_gput_right:nnn}
 %<latexrelease>                 {Hooks~with~args}
 %<latexrelease>\cs_undefine:N \@@_cs_gput_right:nnn
+%<latexrelease>\cs_undefine:N \@@_cs_gput_right_fast:nnn
+%<latexrelease>\cs_undefine:N \@@_cs_gput_right_slow:nnn
 %<latexrelease>\cs_undefine:N \@@_code_gset_auxi:nnnn
 %<latexrelease>\EndIncludeInRelease
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \begin{macro}{
 %     \@@_code_gset:nn,\@@_code_gset:ne,
diff --git a/Master/texmf-dist/source/latex-dev/base/ltoutput.dtx b/Master/texmf-dist/source/latex-dev/base/ltoutput.dtx
index 29024dd4d6a..18388b1cc64 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltoutput.dtx
+++ b/Master/texmf-dist/source/latex-dev/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
diff --git a/Master/texmf-dist/source/latex-dev/base/ltspace.dtx b/Master/texmf-dist/source/latex-dev/base/ltspace.dtx
index 1dbfefc7b1d..a77314b1bd1 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltspace.dtx
+++ b/Master/texmf-dist/source/latex-dev/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|\\
diff --git a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
index beed347903a..5b124febd9e 100644
--- a/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
+++ b/Master/texmf-dist/source/latex-dev/base/ltvers.dtx
@@ -112,10 +112,10 @@
 %</2ekernel>
 %<latexrelease>\edef\latexreleaseversion
 %<*2ekernel|latexrelease>
-   {2023-06-01}
+   {2023-11-01}
 %</2ekernel|latexrelease>
 %<*2ekernel>
-\def\patch@level{-3}
+\def\patch@level{-0}
 %    \end{macrocode}
 %
 % \begin{macro}{\development@branch@name}