l3kernel (7sep20)

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

4 files changed, 63 insertions, 47 deletions

diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index c1ab7150a4a..9553268383f 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -69,7 +69,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2020-09-03}%
+\def\ExplFileDate{2020-09-06}%
 \begingroup
   \def\next{\endgroup}%
   \expandafter\ifx\csname PackageError\endcsname\relax
@@ -11822,52 +11822,52 @@
         kpsewhich ~ --all ~
           --engine = \c_sys_engine_exec_str
           \c_space_tl \c_sys_engine_format_str
-            \tl_if_empty:NF \development@branch@name { -dev } .fmt
+            \bool_lazy_and:nnF
+                { \tl_if_exist_p:N \development@branch@name }
+                { ! \tl_if_empty_p:N \development@branch@name }
+              { -dev } .fmt
       }
     \seq_clear:N \l__file_tmp_seq
     \ior_map_inline:Nn \g__file_internal_ior
       { \seq_put_right:Nn \l__file_tmp_seq {##1} }
     \ior_close:N \g__file_internal_ior
-    \group_begin:
-      \cs_set:Npn \\ { \MessageBreak }
-      \cs_set_eq:NN \  \c_space_tl
-      \@latex@error
-        {
-          Mismatched~LaTeX~support~files~detected. \\
-          Loading~'#2'~aborted!
-          \tl_if_exist:NT \c__kernel_expl_date_tl
-            {
-              \\ \\
-              The~L3~programming~layer~in~the~LaTeX~format \\
-              is~dated~\c__kernel_expl_date_tl,~but~in~your~TeX~
-              tree~the~files~require \\ at~least~#1.
-            }
-          \use_none:n
-        }
-        {
-          \int_compare:nNnTF { \seq_count:N \l__file_tmp_seq } > 1
-            {
-              The~cause~seems~to~be~an~old~format~file~in~the~user~tree. \\
-              LaTeX~found~these~files:
-              \seq_map_tokens:Nn \l__file_tmp_seq { \\~-~\use:n } \\
-              Try~deleting~the~file~in~the~user~tree~then~run~LaTeX~again.
-            }
-            {
-              The~most~likely~causes~are:
-              \\~-~A~recent~format~generation~failed;
-              \\~-~A~stray~format~file~in~the~user~tree~which~needs~
-                   to~be~removed~or~rebuilt;
-              \\~-~You~are~running~a~manually~installed~version~of~#2 \\
-              \ \ \ which~is~incompatible~with~the~version~in~LaTeX. \\
-            }
-          \\
-          LaTeX~will~abort~loading~the~incompatible~support~files~
-          but~this~may~lead~to \\ later~errors.~Please~ensure~that~
-          your~LaTeX~format~is~correctly~regenerated.
-        }
-    \group_end:
+    \__kernel_msg_error:nnnn { kernel } { mismatched-support-file }
+      {#1} {#2}
     \tex_endinput:D
   }
+\__kernel_msg_new:nnnn { kernel } { mismatched-support-file }
+  {
+    Mismatched~LaTeX~support~files~detected. \\
+    Loading~'#2'~aborted!
+    \tl_if_exist:NT \c__kernel_expl_date_tl
+      {
+        \\ \\
+        The~L3~programming~layer~in~the~LaTeX~format \\
+        is~dated~\c__kernel_expl_date_tl,~but~in~your~TeX~
+        tree~the~files~require \\ at~least~#1.
+      }
+  }
+  {
+    \int_compare:nNnTF { \seq_count:N \l__file_tmp_seq } > 1
+      {
+        The~cause~seems~to~be~an~old~format~file~in~the~user~tree. \\
+        LaTeX~found~these~files:
+        \seq_map_tokens:Nn \l__file_tmp_seq { \\~-~\use:n } \\
+        Try~deleting~the~file~in~the~user~tree~then~run~LaTeX~again.
+      }
+      {
+        The~most~likely~causes~are:
+        \\~-~A~recent~format~generation~failed;
+        \\~-~A~stray~format~file~in~the~user~tree~which~needs~
+             to~be~removed~or~rebuilt;
+        \\~-~You~are~running~a~manually~installed~version~of~#2 \\
+        \ \ \ which~is~incompatible~with~the~version~in~LaTeX. \\
+      }
+    \\
+    LaTeX~will~abort~loading~the~incompatible~support~files~
+    but~this~may~lead~to \\ later~errors.~Please~ensure~that~
+    your~LaTeX~format~is~correctly~regenerated.
+  }
 \__kernel_msg_new:nnnn { kernel } { file-not-found }
   { File~'#1'~not~found. }
   {
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
index f6a3f1f9d15..d9dee0de3ca 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-generic.tex
@@ -19,9 +19,19 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2020-09-03}%
+\def\ExplFileDate{2020-09-06}%
 \let\ExplLoaderFileDate\ExplFileDate
 \begingroup
+  \catcode`\>=12
+  \def\aux#1>{}
+  \def\auxi{c__kernel_expl_date_tl}%
+  \edef\auxi{\expandafter\aux\meaning\auxi}%
+  \expandafter
+  \ifx\csname\auxi\endcsname\relax
+    \global\expandafter\let\csname\auxi\endcsname\ExplFileDate
+  \fi
+\endgroup
+\begingroup
   \def\tempa{LaTeX2e}%
   \def\next{}%
   \ifx\fmtname\tempa
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
index 55d3b3c881e..eec1f2b6611 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.ltx
@@ -19,12 +19,18 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2020-09-03}%
+\def\ExplFileDate{2020-09-06}%
 \let\ExplLoaderFileDate\ExplFileDate
-\unless\ifcsname\detokenize{c__kernel_expl_date_tl}\endcsname
-  \global\expandafter\let\csname\detokenize
-    {c__kernel_expl_date_tl}\endcsname\ExplFileDate
-\fi
+\begingroup
+  \catcode`\>=12
+  \def\aux#1>{}
+  \def\auxi{c__kernel_expl_date_tl}%
+  \edef\auxi{\expandafter\aux\meaning\auxi}%
+  \expandafter
+  \ifx\csname\auxi\endcsname\relax
+    \global\expandafter\let\csname\auxi\endcsname\ExplFileDate
+  \fi
+\endgroup
 \everyjob\expandafter{\the\everyjob
   \message{L3 programming layer <\ExplFileDate>}%
 }
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
index 60faf419827..a46667be426 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3.sty
@@ -19,7 +19,7 @@
 %% and all files in that bundle must be distributed together.
 %% 
 %% File: expl3.dtx
-\def\ExplFileDate{2020-09-03}%
+\def\ExplFileDate{2020-09-06}%
 \let\ExplLoaderFileDate\ExplFileDate
 \ProvidesPackage{expl3}
   [%