summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-03-27 21:53:40 +0000
committerKarl Berry <karl@freefriends.org>2019-03-27 21:53:40 +0000
commitf163f9fe30ea30e94aac851cc8ecac09eeec84d0 (patch)
tree1bedbdc1b29e9ea9d69058ba3b4e66b9197cc0e1 /Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
parentfdf72eb7326451df89152180380aeea978386658 (diff)
l3kernel (27mar19)
git-svn-id: svn://tug.org/texlive/trunk@50620 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.tex55
1 files changed, 47 insertions, 8 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 16f72cdf764..f7bfa226825 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
+++ b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
@@ -63,7 +63,7 @@
%% and all files in that bundle must be distributed together.
%%
%% File: expl3.dtx
-\def\ExplFileDate{2019-03-05}%
+\def\ExplFileDate{2019-03-26}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -3351,6 +3351,7 @@
\cs_new_protected:Npn \exp_args:Nox { \::o \::x \::: }
\cs_new_protected:Npn \exp_args:Nxo { \::x \::o \::: }
\cs_new_protected:Npn \exp_args:Nxx { \::x \::x \::: }
+\cs_new:Npn \exp_args:NNNv { \::N \::N \::v \::: }
\cs_new:Npn \exp_args:NNcf { \::N \::c \::f \::: }
\cs_new:Npn \exp_args:NNno { \::N \::n \::o \::: }
\cs_new:Npn \exp_args:NNnV { \::N \::n \::V \::: }
@@ -7645,13 +7646,6 @@
\int_new:N \g__kernel_prg_map_int
%% File: l3sys.dtx
\str_const:Nx \c_sys_jobname_str { \tex_jobname:D }
-\int_const:Nn \c_sys_minute_int
- { \int_mod:nn { \tex_primitive:D \time } { 60 } }
-\int_const:Nn \c_sys_hour_int
- { \int_div_truncate:nn { \tex_primitive:D \time } { 60 } }
-\int_const:Nn \c_sys_day_int { \tex_primitive:D \day }
-\int_const:Nn \c_sys_month_int { \tex_primitive:D \month }
-\int_const:Nn \c_sys_year_int { \tex_primitive:D \year }
\cs_new_protected:Npn \__sys_const:nn #1#2
{
\bool_if:nTF {#2}
@@ -7687,6 +7681,35 @@
\__sys_const:nn { sys_if_engine_ #1 }
{ \str_if_eq_p:Vn \c_sys_engine_str {#1} }
}
+\group_begin:
+ \cs_set:Npn \__sys_tmp:w #1
+ {
+ \str_if_eq:eeTF { \cs_meaning:N #1 } { \token_to_str:N #1 }
+ { #1 }
+ {
+ \cs_if_exist:NTF \tex_primitive:D
+ {
+ \bool_lazy_and:nnTF
+ { \sys_if_engine_xetex_p: }
+ {
+ \int_compare_p:nNn
+ { \exp_after:wN \use_none:n \tex_XeTeXrevision:D }
+ < { 99999 }
+ }
+ { 0 }
+ { \tex_primitive:D #1 }
+ }
+ { 0 }
+ }
+ }
+ \int_const:Nn \c_sys_minute_int
+ { \int_mod:nn { \__sys_tmp:w \time } { 60 } }
+ \int_const:Nn \c_sys_hour_int
+ { \int_div_truncate:nn { \__sys_tmp:w \time } { 60 } }
+ \int_const:Nn \c_sys_day_int { \__sys_tmp:w \day }
+ \int_const:Nn \c_sys_month_int { \__sys_tmp:w \month }
+ \int_const:Nn \c_sys_year_int { \__sys_tmp:w \year }
+\group_end:
\str_const:Nx \c_sys_output_str
{
\int_compare:nNnTF
@@ -10329,6 +10352,22 @@
\prg_return_true:
}
}
+\int_const:Nn \c__ior_term_ior { -1 }
+\cs_new_protected:Npn \ior_get_term:nN #1#2
+ { \__ior_get_term:NnN \__ior_get:NN {#1} #2 }
+\cs_new_protected:Npn \ior_str_get_term:nN #1#2
+ { \__ior_get_term:NnN \__ior_str_get:NN {#1} #2 }
+\cs_new_protected:Npn \__ior_get_term:NnN #1#2#3
+ {
+ \group_begin:
+ \tex_escapechar:D = -1 \scan_stop:
+ \tl_if_blank:nTF {#2}
+ { \exp_args:NNc #1 \c__ior_term_ior }
+ { \exp_args:NNc #1 \c_term_ior }
+ {#2}
+ \exp_args:NNNv \group_end:
+ \tl_set:Nn #3 {#2}
+ }
\cs_new:Npn \ior_map_break:
{ \prg_map_break:Nn \ior_map_break: { } }
\cs_new:Npn \ior_map_break:n