[latex3-commits] [git/LaTeX3-latex3-latex2e] earlier-expl3: Update l3kernel to [unreleased] 2020-06-05 (2b26f6e8)
PhelypeOleinik
tex.phelype at gmail.com
Sat Jun 6 03:55:29 CEST 2020
Repository : https://github.com/latex3/latex2e
On branch : earlier-expl3
Link : https://github.com/latex3/latex2e/commit/2b26f6e8904cec1e9fa7d70dd3900bcd2d4f58d8
>---------------------------------------------------------------
commit 2b26f6e8904cec1e9fa7d70dd3900bcd2d4f58d8
Author: PhelypeOleinik <tex.phelype at gmail.com>
Date: Fri Jun 5 22:55:29 2020 -0300
Update l3kernel to [unreleased] 2020-06-05
Updated to this commit:
https://github.com/latex3/latex3/commit/c1cbabb2
>---------------------------------------------------------------
2b26f6e8904cec1e9fa7d70dd3900bcd2d4f58d8
texmf/tex/latex/l3kernel/expl3.ltx | 69 ++++++++++++++++++++++++-----------
texmf/tex/latex/l3kernel/expl3.sty | 74 +++++++++++++++++++++++++++-----------
2 files changed, 102 insertions(+), 41 deletions(-)
diff --git a/texmf/tex/latex/l3kernel/expl3.ltx b/texmf/tex/latex/l3kernel/expl3.ltx
index 538c3fdd..04067f6d 100644
--- a/texmf/tex/latex/l3kernel/expl3.ltx
+++ b/texmf/tex/latex/l3kernel/expl3.ltx
@@ -24,21 +24,29 @@
\everyjob\expandafter{\the\everyjob
\message{L3 programming layer <\ExplFileDate>}%
}
-\protected\def\ProvidesExplPackage#1#2#3#4%
+\protected\def\ProvidesExplPackage
+ {\@expl at provides@file@@Nnnnnn\ProvidesPackage{Package}}
+\protected\def\ProvidesExplClass
+ {\@expl at provides@file@@Nnnnnn\ProvidesClass{Document Class}}
+\protected\def\ProvidesExplFile
+ {\@expl at provides@file@@Nnnnnn\ProvidesFile{File}}
+\protected\long\def\@expl at provides@file@@Nnnnnn#1#2#3#4#5#6%
{%
- \ProvidesPackage{#1}[#2 \ifx\relax#3\relax\else v#3\space\fi #4]%
+ \ifnum0%
+ \ifdefined#11\fi
+ \ifx\relax#1\else1\fi
+ =11
+ \expandafter#1%
+ \else
+ \@expl at provides@generic@@wnnw{#2}%
+ \fi
+ {#3}[{#4 \ifx\relax#5\relax\else v#5\space\fi #6}]%
\ExplSyntaxOn
- }%
-\protected\def\ProvidesExplClass#1#2#3#4%
- {%
- \ProvidesClass{#1}[#2 \ifx\relax#3\relax\else v#3\space\fi #4]%
- \ExplSyntaxOn
- }%
-\protected\def\ProvidesExplFile#1#2#3#4%
+ }
+\protected\long\def\@expl at provides@generic@@wnnw#1\fi#2[#3]%
{%
- \ProvidesFile{#1}[#2 \ifx\relax#3\relax\else v#3\space\fi #4]%
- \ExplSyntaxOn
- }%
+ \immediate\write-1{#1: #2 #3}%
+ }
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname tex\string _let:D\endcsname\relax
\expandafter\@firstofone
@@ -50,10 +58,13 @@
\expandafter\ifx\csname tex\string _let:D\endcsname\relax
\expandafter\endinput
\fi
-\ifdefined\@pushfilenameaux
+\ifcsname\detokenize{g__expl_reload_bool}\endcsname
\ExplSyntaxOn
+ \bool_gset_true:N \g__expl_reload_bool
+\else
+ \bool_new:N \g__expl_reload_bool
\fi
-\cs_if_exist:NF \c__expl_def_ext_tl
+\tl_if_exist:NF \c__expl_def_ext_tl
{ \tl_const:Nn \c__expl_def_ext_tl { def } }
\cs_gset_protected:Npn \__kernel_sys_configuration_load:n #1
{
@@ -88,12 +99,19 @@
\sys_load_deprecation:
}
}
-\tl_put_left:Nn \document
+\cs_if_exist:NF \@expl at sys@load at backend@@
+ {
+ \tl_put_left:Nn \document
+ {
+ \endgroup
+ \@expl at sys@load at backend@@
+ \begingroup
+ }
+ }
+\cs_gset_protected:Npn \@expl at sys@load at backend@@
{
- \endgroup
\str_if_exist:NF \c_sys_backend_str
{ \sys_load_backend:n { } }
- \begingroup
}
\cs_if_free:cTF { ver at expl3.sty }
{
@@ -107,7 +125,12 @@
\reverse_if:N \if_cs_exist:N \s__expl_stop
\scan_new:N \s__expl_stop
\fi:
-\tl_put_left:Nn \@pushfilename
+\cs_if_exist:NF \@expl at push@filename@@
+ {
+ \tl_put_left:Nn \@pushfilename { \@expl at push@filename@@ }
+ \tl_put_right:Nn \@pushfilename { \@expl at push@filename at aux@@ }
+ }
+\cs_gset_protected:Npn \@expl at push@filename@@
{
\exp_args:Nx \__kernel_file_input_push:n
{
@@ -122,13 +145,17 @@
}
\ExplSyntaxOff
}
-\tl_put_right:Nn \@pushfilename { \@pushfilenameaux }
-\cs_set_protected:Npn \@pushfilenameaux #1#2#3
+\cs_gset_protected:Npn \@expl at push@filename at aux@@ #1#2#3
{
\str_gset:Nn \g_file_curr_name_str {#3}
#1 #2 {#3}
}
-\tl_put_right:Nn \@popfilename
+\cs_if_exist:NF \@expl at pop@filename@@
+ {
+ \tl_put_right:Nn \@popfilename
+ { \@expl at pop@filename@@ }
+ }
+\cs_gset_protected:Npn \@expl at pop@filename@@
{
\__kernel_file_input_pop:
\tl_if_empty:NTF \l__expl_status_stack_tl
diff --git a/texmf/tex/latex/l3kernel/expl3.sty b/texmf/tex/latex/l3kernel/expl3.sty
index 4ded77ab..930b06ae 100644
--- a/texmf/tex/latex/l3kernel/expl3.sty
+++ b/texmf/tex/latex/l3kernel/expl3.sty
@@ -26,21 +26,29 @@
\ExplFileDate\space
L3 programming layer (loader)
]%
-\protected\def\ProvidesExplPackage#1#2#3#4%
+\protected\def\ProvidesExplPackage
+ {\@expl at provides@file@@Nnnnnn\ProvidesPackage{Package}}
+\protected\def\ProvidesExplClass
+ {\@expl at provides@file@@Nnnnnn\ProvidesClass{Document Class}}
+\protected\def\ProvidesExplFile
+ {\@expl at provides@file@@Nnnnnn\ProvidesFile{File}}
+\protected\long\def\@expl at provides@file@@Nnnnnn#1#2#3#4#5#6%
{%
- \ProvidesPackage{#1}[#2 \ifx\relax#3\relax\else v#3\space\fi #4]%
+ \ifnum0%
+ \ifdefined#11\fi
+ \ifx\relax#1\else1\fi
+ =11
+ \expandafter#1%
+ \else
+ \@expl at provides@generic@@wnnw{#2}%
+ \fi
+ {#3}[{#4 \ifx\relax#5\relax\else v#5\space\fi #6}]%
\ExplSyntaxOn
- }%
-\protected\def\ProvidesExplClass#1#2#3#4%
- {%
- \ProvidesClass{#1}[#2 \ifx\relax#3\relax\else v#3\space\fi #4]%
- \ExplSyntaxOn
- }%
-\protected\def\ProvidesExplFile#1#2#3#4%
+ }
+\protected\long\def\@expl at provides@generic@@wnnw#1\fi#2[#3]%
{%
- \ProvidesFile{#1}[#2 \ifx\relax#3\relax\else v#3\space\fi #4]%
- \ExplSyntaxOn
- }%
+ \immediate\write-1{#1: #2 #3}%
+ }
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname tex\string _let:D\endcsname\relax
\expandafter\@firstofone
@@ -52,10 +60,13 @@
\expandafter\ifx\csname tex\string _let:D\endcsname\relax
\expandafter\endinput
\fi
-\ifdefined\@pushfilenameaux
+\ifcsname\detokenize{g__expl_reload_bool}\endcsname
\ExplSyntaxOn
+ \bool_gset_true:N \g__expl_reload_bool
+\else
+ \bool_new:N \g__expl_reload_bool
\fi
-\cs_if_exist:NF \c__expl_def_ext_tl
+\tl_if_exist:NF \c__expl_def_ext_tl
{ \tl_const:Nn \c__expl_def_ext_tl { def } }
\cs_gset_protected:Npn \__kernel_sys_configuration_load:n #1
{
@@ -71,7 +82,7 @@
\@onefilewithoptions {#1} [ ] [ ]
\c__expl_def_ext_tl
}
-\cs_if_exist:NF \l__expl_options_clist
+\clist_if_exist:NF \l__expl_options_clist
{ \clist_new:N \l__expl_options_clist }
\DeclareOption*
{ \clist_put_right:NV \l__expl_options_clist \CurrentOption }
@@ -103,10 +114,24 @@
\sys_load_deprecation:
}
}
+\cs_if_exist:NF \@expl at sys@load at backend@@
+ {
+ \tl_put_left:Nn \document
+ {
+ \endgroup
+ \@expl at sys@load at backend@@
+ \begingroup
+ }
+ }
+\cs_gset_protected:Npn \@expl at sys@load at backend@@
+ {
+ \str_if_exist:NF \c_sys_backend_str
+ { \sys_load_backend:n { } }
+ }
\keys_set:nV { sys } \l__expl_options_clist
\str_if_exist:NF \c_sys_backend_str
{ \sys_load_backend:n { } }
-\cs_if_exist:NT \@pushfilenameaux
+\bool_if:NT \g__expl_reload_bool
{
\cs_gset_eq:NN \__kernel_sys_configuration_load:n
\__kernel_sys_configuration_load_std:n
@@ -124,7 +149,12 @@
\reverse_if:N \if_cs_exist:N \s__expl_stop
\scan_new:N \s__expl_stop
\fi:
-\tl_put_left:Nn \@pushfilename
+\cs_if_exist:NF \@expl at push@filename@@
+ {
+ \tl_put_left:Nn \@pushfilename { \@expl at push@filename@@ }
+ \tl_put_right:Nn \@pushfilename { \@expl at push@filename at aux@@ }
+ }
+\cs_gset_protected:Npn \@expl at push@filename@@
{
\exp_args:Nx \__kernel_file_input_push:n
{
@@ -139,13 +169,17 @@
}
\ExplSyntaxOff
}
-\tl_put_right:Nn \@pushfilename { \@pushfilenameaux }
-\cs_set_protected:Npn \@pushfilenameaux #1#2#3
+\cs_gset_protected:Npn \@expl at push@filename at aux@@ #1#2#3
{
\str_gset:Nn \g_file_curr_name_str {#3}
#1 #2 {#3}
}
-\tl_put_right:Nn \@popfilename
+\cs_if_exist:NF \@expl at pop@filename@@
+ {
+ \tl_put_right:Nn \@popfilename
+ { \@expl at pop@filename@@ }
+ }
+\cs_gset_protected:Npn \@expl at pop@filename@@
{
\__kernel_file_input_pop:
\tl_if_empty:NTF \l__expl_status_stack_tl
More information about the latex3-commits
mailing list.