Merge branch 'develop' into tlc3-errata

latex3 · Aug 4, 2023 · 764c9c4 · 764c9c4
2 parents 238e7e0 + 763e4f6
commit 764c9c4
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 11 deletions.
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-06-30>
+L3 programming layer <2023-08-03>
  ***********
  *File List*
  -show the file list here-

diff --git a/texmf/tex/latex/l3kernel/expl3-code.tex b/texmf/tex/latex/l3kernel/expl3-code.tex
@@ -71,7 +71,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2023-06-30}%
+\def\ExplFileDate{2023-08-03}%
 \begingroup
   \def\next{\endgroup}%
   \expandafter\ifx\csname PackageError\endcsname\relax
@@ -881,6 +881,11 @@
   \__kernel_primitive:NN \XeTeXvariationmin     \tex_XeTeXvariationmin:D
   \__kernel_primitive:NN \XeTeXvariationname    \tex_XeTeXvariationname:D
   \__kernel_primitive:NN \XeTeXversion          \tex_XeTeXversion:D
+  \__kernel_primitive:NN \XeTeXselectorcode     \tex_XeTeXselectorcode:D
+  \__kernel_primitive:NN \XeTeXinterwordspaceshaping
+                   \tex_XeTeXinterwordspaceshaping:D
+  \__kernel_primitive:NN \XeTeXhyphenatablelength
+                   \tex_XeTeXhyphenatablelength:D
   \__kernel_primitive:NN \creationdate          \tex_creationdate:D
   \__kernel_primitive:NN \elapsedtime           \tex_elapsedtime:D
   \__kernel_primitive:NN \filedump              \tex_filedump:D
@@ -891,6 +896,7 @@
   \__kernel_primitive:NN \primitive             \tex_primitive:D
   \__kernel_primitive:NN \resettimer            \tex_resettimer:D
   \__kernel_primitive:NN \shellescape           \tex_shellescape:D
+  \__kernel_primitive:NN \XeTeXprotrudechars    \tex_protrudechars:D
   \__kernel_primitive:NN \alignmark             \tex_alignmark:D
   \__kernel_primitive:NN \aligntab              \tex_aligntab:D
   \__kernel_primitive:NN \attribute             \tex_attribute:D
@@ -903,6 +909,7 @@
   \__kernel_primitive:NN \begincsname           \tex_begincsname:D
   \__kernel_primitive:NN \bodydir               \tex_bodydir:D
   \__kernel_primitive:NN \bodydirection         \tex_bodydirection:D
+  \__kernel_primitive:NN \boundary              \tex_boundary:D
   \__kernel_primitive:NN \boxdir                \tex_boxdir:D
   \__kernel_primitive:NN \boxdirection          \tex_boxdirection:D
   \__kernel_primitive:NN \breakafterdirmode     \tex_breakafterdirmode:D
@@ -914,6 +921,7 @@
   \__kernel_primitive:NN \crampedscriptstyle    \tex_crampedscriptstyle:D
   \__kernel_primitive:NN \crampedtextstyle      \tex_crampedtextstyle:D
   \__kernel_primitive:NN \csstring              \tex_csstring:D
+  \__kernel_primitive:NN \deferred              \tex_deferred:D
   \__kernel_primitive:NN \discretionaryligaturemode
     \tex_discretionaryligaturemode:D
   \__kernel_primitive:NN \directlua             \tex_directlua:D
@@ -926,6 +934,7 @@
   \__kernel_primitive:NN \etoksapp              \tex_etoksapp:D
   \__kernel_primitive:NN \etokspre              \tex_etokspre:D
   \__kernel_primitive:NN \exceptionpenalty      \tex_exceptionpenalty:D
+  \__kernel_primitive:NN \exhyphenchar          \tex_exhyphenchar:D
   \__kernel_primitive:NN \explicithyphenpenalty \tex_explicithyphenpenalty:D
   \__kernel_primitive:NN \expanded              \tex_expanded:D
   \__kernel_primitive:NN \explicitdiscretionary \tex_explicitdiscretionary:D
@@ -938,6 +947,10 @@
   \__kernel_primitive:NN \hyphenationmin        \tex_hyphenationmin:D
   \__kernel_primitive:NN \hyphenpenaltymode     \tex_hyphenpenaltymode:D
   \__kernel_primitive:NN \gleaders              \tex_gleaders:D
+  \__kernel_primitive:NN \glet                  \tex_glet:D
+  \__kernel_primitive:NN \glyphdimensionsmode   \tex_glyphdimensionsmode:D
+  \__kernel_primitive:NN \gtoksapp              \tex_gtoksapp:D
+  \__kernel_primitive:NN \gtokspre              \tex_gtokspre:D
   \__kernel_primitive:NN \ifcondition           \tex_ifcondition:D
   \__kernel_primitive:NN \immediateassigned     \tex_immediateassigned:D
   \__kernel_primitive:NN \immediateassignment   \tex_immediateassignment:D
@@ -970,6 +983,8 @@
   \__kernel_primitive:NN \mathdisplayskipmode   \tex_mathdisplayskipmode:D
   \__kernel_primitive:NN \matheqdirmode         \tex_matheqdirmode:D
   \__kernel_primitive:NN \matheqnogapstep       \tex_matheqnogapstep:D
+  \__kernel_primitive:NN \mathflattenmode       \tex_mathflattenmode:D
+  \__kernel_primitive:NN \mathitalicsmode       \tex_mathitalicsmode:D
   \__kernel_primitive:NN \mathnolimitsmode      \tex_mathnolimitsmode:D
   \__kernel_primitive:NN \mathoption            \tex_mathoption:D
   \__kernel_primitive:NN \mathpenaltiesmode     \tex_mathpenaltiesmode:D
@@ -1004,6 +1019,7 @@
   \__kernel_primitive:NN \preexhyphenchar       \tex_preexhyphenchar:D
   \__kernel_primitive:NN \prehyphenchar         \tex_prehyphenchar:D
   \__kernel_primitive:NN \prerelpenalty         \tex_prerelpenalty:D
+  \__kernel_primitive:NN \protrusionboundary    \tex_protrusionboundary:D
   \__kernel_primitive:NN \rightghost            \tex_rightghost:D
   \__kernel_primitive:NN \savecatcodetable      \tex_savecatcodetable:D
   \__kernel_primitive:NN \scantextokens         \tex_scantextokens:D
@@ -1020,7 +1036,11 @@
   \__kernel_primitive:NN \toksapp               \tex_toksapp:D
   \__kernel_primitive:NN \tokspre               \tex_tokspre:D
   \__kernel_primitive:NN \tpack                 \tex_tpack:D
+  \__kernel_primitive:NN \variablefam           \tex_variablefam:D
   \__kernel_primitive:NN \vpack                 \tex_vpack:D
+  \__kernel_primitive:NN \wordboundary          \tex_wordboundary:D
+  \__kernel_primitive:NN \xtoksapp              \tex_xtoksapp:D
+  \__kernel_primitive:NN \xtokspre              \tex_xtokspre:D
   \__kernel_primitive:NN \adjustspacing         \tex_adjustspacing:D
   \__kernel_primitive:NN \copyfont              \tex_copyfont:D
   \__kernel_primitive:NN \draftmode             \tex_draftmode:D
@@ -1060,6 +1080,7 @@
   \__kernel_primitive:NN \Udelimiterover        \tex_Udelimiterover:D
   \__kernel_primitive:NN \Udelimiterunder       \tex_Udelimiterunder:D
   \__kernel_primitive:NN \Uhextensible          \tex_Uhextensible:D
+  \__kernel_primitive:NN \Uleft                 \tex_Uleft:D
   \__kernel_primitive:NN \Umathaccent           \tex_Umathaccent:D
   \__kernel_primitive:NN \Umathaxis             \tex_Umathaxis:D
   \__kernel_primitive:NN \Umathbinbinspacing    \tex_Umathbinbinspacing:D
@@ -1204,10 +1225,12 @@
     \tex_Umathunderdelimiterbgap:D
   \__kernel_primitive:NN \Umathunderdelimitervgap
     \tex_Umathunderdelimitervgap:D
+  \__kernel_primitive:NN \Umiddle               \tex_Umiddle:D
   \__kernel_primitive:NN \Unosubscript          \tex_Unosubscript:D
   \__kernel_primitive:NN \Unosuperscript        \tex_Unosuperscript:D
   \__kernel_primitive:NN \Uoverdelimiter        \tex_Uoverdelimiter:D
   \__kernel_primitive:NN \Uradical              \tex_Uradical:D
+  \__kernel_primitive:NN \Uright                \tex_Uright:D
   \__kernel_primitive:NN \Uroot                 \tex_Uroot:D
   \__kernel_primitive:NN \Uskewed               \tex_Uskewed:D
   \__kernel_primitive:NN \Uskewedwithdelims     \tex_Uskewedwithdelims:D
@@ -1260,9 +1283,11 @@
   \__kernel_primitive:NN \pagefistretch         \tex_pagefistretch:D
   \__kernel_primitive:NN \postbreakpenalty      \tex_postbreakpenalty:D
   \__kernel_primitive:NN \prebreakpenalty       \tex_prebreakpenalty:D
+  \__kernel_primitive:NN \ptexfontname          \tex_ptexfontname:D
   \__kernel_primitive:NN \ptexlineendmode       \tex_lineendmode:D
   \__kernel_primitive:NN \ptexminorversion      \tex_ptexminorversion:D
   \__kernel_primitive:NN \ptexrevision          \tex_ptexrevision:D
+  \__kernel_primitive:NN \ptextracingfonts      \tex_ptextracingfonts:D
   \__kernel_primitive:NN \ptexversion           \tex_ptexversion:D
   \__kernel_primitive:NN \readpapersizespecial  \tex_readpapersizespecial:D
   \__kernel_primitive:NN \scriptbaselineshiftfactor
@@ -1276,6 +1301,7 @@
   \__kernel_primitive:NN \textbaselineshiftfactor
     \tex_textbaselineshiftfactor:D
   \__kernel_primitive:NN \tfont                 \tex_tfont:D
+  \__kernel_primitive:NN \tojis                 \tex_tojis:D
   \__kernel_primitive:NN \toucs                 \tex_toucs:D
   \__kernel_primitive:NN \ucs                   \tex_ucs:D
   \__kernel_primitive:NN \xkanjiskip            \tex_xkanjiskip:D
@@ -32994,13 +33020,18 @@
   }
 \cs_new:Npn \__text_change_case_cs_check:nnN #1#2#3
   {
-    \token_if_cs:NTF #3
-      { \__text_change_case_exclude:nnN {#1} {#2} }
+    \exp_args:Ne \__text_change_case_cs_check:nnn
+      { \__text_token_to_explicit:N #3 } {#1} {#2}
+  }
+\cs_new:Npn \__text_change_case_cs_check:nnn #1#2#3
+  {
+    \token_if_cs:NTF #1
+      { \__text_change_case_exclude:nnN {#2} {#3} }
       {
         \__text_codepoint_process:nN
-          { \use:c { __text_change_case_custom_ #1 :nnn } {#1} {#2} }
+          { \use:c { __text_change_case_custom_ #2 :nnn } {#2} {#3} }
       }
-        #3
+        #1
   }
 \cs_new:Npn \__text_change_case_exclude:nnN #1#2#3
   {

diff --git a/texmf/tex/latex/l3kernel/expl3-generic.tex b/texmf/tex/latex/l3kernel/expl3-generic.tex
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2023-06-30}%
+\def\ExplFileDate{2023-08-03}%
 \let\ExplLoaderFileDate\ExplFileDate
 \begingroup
   \catcode`\_=11

diff --git a/texmf/tex/latex/l3kernel/expl3.ltx b/texmf/tex/latex/l3kernel/expl3.ltx
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2023-06-30}%
+\def\ExplFileDate{2023-08-03}%
 \let\ExplLoaderFileDate\ExplFileDate
 \begingroup
   \catcode`\_=11
@@ -53,9 +53,10 @@
     \else
       \@expl@provides@generic@@wnnw{#2}%
     \fi
-      {#3}[{#4 \ifx\relax#5\relax\else v#5\space\fi #6}]%
+      {#3}[{#4 \ifx\relax#5\relax\else\@expl@provides@file@@N#5\space\fi #6}]%
     \ExplSyntaxOn
   }
+\long\def\@expl@provides@file@@N#1{v\if#1v\else#1\fi}
 \protected\long\def\@expl@provides@generic@@wnnw#1\fi#2[#3]%
   {%
     \immediate\write-1{#1: #2 #3}%

diff --git a/texmf/tex/latex/l3kernel/expl3.sty b/texmf/tex/latex/l3kernel/expl3.sty
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2023-06-30}%
+\def\ExplFileDate{2023-08-03}%
 \let\ExplLoaderFileDate\ExplFileDate
 \ProvidesPackage{expl3}
   [%
@@ -42,9 +42,10 @@
     \else
       \@expl@provides@generic@@wnnw{#2}%
     \fi
-      {#3}[{#4 \ifx\relax#5\relax\else v#5\space\fi #6}]%
+      {#3}[{#4 \ifx\relax#5\relax\else\@expl@provides@file@@N#5\space\fi #6}]%
     \ExplSyntaxOn
   }
+\long\def\@expl@provides@file@@N#1{v\if#1v\else#1\fi}
 \protected\long\def\@expl@provides@generic@@wnnw#1\fi#2[#3]%
   {%
     \immediate\write-1{#1: #2 #3}%