summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-09-07 21:21:46 +0000
committerKarl Berry <karl@freefriends.org>2020-09-07 21:21:46 +0000
commit82f7e34e882e279a2c67b04855c4f151e7954391 (patch)
tree9327f96b050d24edba5d1e624796bae596544a0e /Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
parent0f8db6b48459d4fbfa7497448127e65515a2e195 (diff)
l3kernel (7sep20)
git-svn-id: svn://tug.org/texlive/trunk@56286 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex80
1 files changed, 40 insertions, 40 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. }
{