[latex3-commits] [git/LaTeX3-latex3-latex2e] develop: Update l3kernel to 2020-09-06 (93b15560)
PhelypeOleinik
phelype.oleinik at latex-project.org
Sun Sep 6 23:01:53 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : develop
Link : https://github.com/latex3/latex2e/commit/93b155609118e5ca189a199cb98ec5ed07ac6454
>---------------------------------------------------------------
commit 93b155609118e5ca189a199cb98ec5ed07ac6454
Author: PhelypeOleinik <phelype.oleinik at latex-project.org>
Date: Sun Sep 6 18:01:53 2020 -0300
Update l3kernel to 2020-09-06
>---------------------------------------------------------------
93b155609118e5ca189a199cb98ec5ed07ac6454
base/testfiles/m3expl009.luatex.tlg | 21 ++++----
base/testfiles/m3expl009.tlg | 21 ++++----
texmf/tex/latex/l3kernel/expl3-code.tex | 86 ++++++++++++++++--------------
texmf/tex/latex/l3kernel/expl3-generic.tex | 12 ++++-
texmf/tex/latex/l3kernel/expl3.ltx | 16 ++++--
texmf/tex/latex/l3kernel/expl3.sty | 2 +-
6 files changed, 89 insertions(+), 69 deletions(-)
diff --git a/base/testfiles/m3expl009.luatex.tlg b/base/testfiles/m3expl009.luatex.tlg
index 9deed758..c734c1d3 100644
--- a/base/testfiles/m3expl009.luatex.tlg
+++ b/base/testfiles/m3expl009.luatex.tlg
@@ -3,13 +3,13 @@ Don't change this file in any respect.
\cnta=\count...
(../expl3.sty
Package: expl3 ....-..-.. L3 programming layer (loader)
-! LaTeX Error: Mismatched LaTeX support files detected.
- Loading 'expl3.sty' aborted!
- The L3 programming layer in the LaTeX format
- is dated ....-..-.., but in your TeX tree the files require
- at least ....-..-...
-See the LaTeX manual or LaTeX Companion for explanation.
-Type H <return> for immediate help.
+! LaTeX3 Error: Mismatched LaTeX support files detected.
+(LaTeX3) Loading 'expl3.sty' aborted!
+(LaTeX3)
+(LaTeX3) The L3 programming layer in the LaTeX format
+(LaTeX3) is dated ....-..-.., but in your TeX tree the files require
+(LaTeX3) at least ....-..-...
+For immediate help type H <return>.
...
l. ... \ExplLoaderFileDate{expl3.sty}}
%
@@ -25,10 +25,9 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
)
(../expl3.sty
Package: expl3 ....-..-.. L3 programming layer (loader)
-! LaTeX Error: Mismatched LaTeX support files detected.
- Loading 'expl3.sty' aborted!
-See the LaTeX manual or LaTeX Companion for explanation.
-Type H <return> for immediate help.
+! LaTeX3 Error: Mismatched LaTeX support files detected.
+(LaTeX3) Loading 'expl3.sty' aborted!
+For immediate help type H <return>.
...
l. ... \ExplLoaderFileDate{expl3.sty}}
%
diff --git a/base/testfiles/m3expl009.tlg b/base/testfiles/m3expl009.tlg
index 23a58d79..3f7e658b 100644
--- a/base/testfiles/m3expl009.tlg
+++ b/base/testfiles/m3expl009.tlg
@@ -3,13 +3,13 @@ Don't change this file in any respect.
\cnta=\count...
(../expl3.sty
Package: expl3 ....-..-.. L3 programming layer (loader)
-! LaTeX Error: Mismatched LaTeX support files detected.
- Loading 'expl3.sty' aborted!
- The L3 programming layer in the LaTeX format
- is dated ....-..-.., but in your TeX tree the files require
- at least ....-..-...
-See the LaTeX manual or LaTeX Companion for explanation.
-Type H <return> for immediate help.
+! LaTeX3 Error: Mismatched LaTeX support files detected.
+(LaTeX3) Loading 'expl3.sty' aborted!
+(LaTeX3)
+(LaTeX3) The L3 programming layer in the LaTeX format
+(LaTeX3) is dated ....-..-.., but in your TeX tree the files require
+(LaTeX3) at least ....-..-...
+For immediate help type H <return>.
...
l. ... \ExplLoaderFileDate{expl3.sty}}
%
@@ -25,10 +25,9 @@ Package: expl3 ....-..-.. L3 programming layer (loader)
)
(../expl3.sty
Package: expl3 ....-..-.. L3 programming layer (loader)
-! LaTeX Error: Mismatched LaTeX support files detected.
- Loading 'expl3.sty' aborted!
-See the LaTeX manual or LaTeX Companion for explanation.
-Type H <return> for immediate help.
+! LaTeX3 Error: Mismatched LaTeX support files detected.
+(LaTeX3) Loading 'expl3.sty' aborted!
+For immediate help type H <return>.
...
l. ... \ExplLoaderFileDate{expl3.sty}}
%
diff --git a/texmf/tex/latex/l3kernel/expl3-code.tex b/texmf/tex/latex/l3kernel/expl3-code.tex
index 34bc67ff..95532683 100644
--- a/texmf/tex/latex/l3kernel/expl3-code.tex
+++ b/texmf/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-01}%
+\def\ExplFileDate{2020-09-06}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -1445,6 +1445,12 @@
\tex_let:D \tex_pdftexrevision:D \tex_undefined:D
\tex_let:D \tex_pdftexversion:D \tex_undefined:D
\tex_fi:D
+\tex_ifdefined:D \orieveryjob
+ \tex_let:D \tex_everyjob:D \orieveryjob
+\tex_fi:D
+\tex_ifdefined:D \oripdfoutput
+ \tex_let:D \tex_pdfoutput:D \oripdfoutput
+\tex_fi:D
\tex_ifdefined:D \normalend
\tex_let:D \tex_end:D \normalend
\tex_let:D \tex_everyjob:D \normaleveryjob
@@ -11816,52 +11822,52 @@
kpsewhich ~ --all ~
--engine = \c_sys_engine_exec_str
\c_space_tl \c_sys_engine_format_str
- \tl_if_empty:NF \development at branch@name { -dev } .fmt
+ \bool_lazy_and:nnF
+ { \tl_if_exist_p:N \development at branch@name }
+ { ! \tl_if_empty_p:N \development at 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 at 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/texmf/tex/latex/l3kernel/expl3-generic.tex b/texmf/tex/latex/l3kernel/expl3-generic.tex
index 5f590f7e..d9dee0de 100644
--- a/texmf/tex/latex/l3kernel/expl3-generic.tex
+++ b/texmf/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-01}%
+\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/texmf/tex/latex/l3kernel/expl3.ltx b/texmf/tex/latex/l3kernel/expl3.ltx
index cba13163..eec1f2b6 100644
--- a/texmf/tex/latex/l3kernel/expl3.ltx
+++ b/texmf/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-01}%
+\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/texmf/tex/latex/l3kernel/expl3.sty b/texmf/tex/latex/l3kernel/expl3.sty
index 25816100..a46667be 100644
--- 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{2020-09-01}%
+\def\ExplFileDate{2020-09-06}%
\let\ExplLoaderFileDate\ExplFileDate
\ProvidesPackage{expl3}
[%
More information about the latex3-commits
mailing list.