summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex')
-rw-r--r--Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex79
1 files changed, 44 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex b/Master/texmf-dist/tex/latex/l3kernel/expl3-code.tex
index 86c7aecf56b..2345b6effe0 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 Copyright (C) 1990-2019 The LaTeX3 Project
-\def\ExplFileDate{2019-01-12}%
+\def\ExplFileDate{2019-01-13}%
\begingroup
\def\next{\endgroup}%
\expandafter\ifx\csname PackageError\endcsname\relax
@@ -7776,7 +7776,7 @@
{ \str_if_eq_p:Vn \c_sys_output_str { pdf } }
\__sys_const:nn { sys_if_rand_exist }
{ \cs_if_exist_p:N \tex_uniformdeviate:D }
-%% File: l3clist.dtx Copyright (C) 2004-2011 Frank Mittelbach,
+%% File: l3clist.dtx Copyright (C) 2004-2011,2019 Frank Mittelbach,
%% The LaTeX3 project
%% (C) 2012-2019 The LaTeX3 Project
\cs_new_eq:NN \c_empty_clist \c_empty_tl
@@ -10515,10 +10515,28 @@
{
#2 #3 \l__ior_internal_tl
\if_eof:w #3
- \exp_after:wN \use_none:nnnnnnn
+ \exp_after:wN \ior_map_break:
\fi:
- \exp_args:No #1 \l__ior_internal_tl
- \__ior_map_inline_loop:NNN #1#2#3
+ \exp_args:No #1 \l__ior_internal_tl
+ \__ior_map_inline_loop:NNN #1#2#3
+ }
+\cs_new_protected:Npn \ior_map_variable:NNn
+ { \__ior_map_variable:NNNn \ior_get:NN }
+\cs_new_protected:Npn \ior_str_map_variable:NNn
+ { \__ior_map_variable:NNNn \ior_str_get:NN }
+\cs_new_protected:Npn \__ior_map_variable:NNNn #1#2#3#4
+ {
+ \ior_if_eof:NF #2 { \__ior_map_variable_loop:NNNn #1#2#3 {#4} }
+ \prg_break_point:Nn \ior_map_break: { }
+ }
+\cs_new_protected:Npn \__ior_map_variable_loop:NNNn #1#2#3#4
+ {
+ #1 #2 #3
+ \if_eof:w #2
+ \exp_after:wN \ior_map_break:
+ \fi:
+ #4
+ \__ior_map_variable_loop:NNNn #1#2#3 {#4}
}
\int_const:Nn \c_log_iow { -1 }
\int_const:Nn \c_term_iow
@@ -11214,7 +11232,7 @@
which~will~be~wrapped~using~#1.
\tl_if_empty:nF {#3} { ~ It~was~called~with~argument~'#3'. }
}
-%% File: l3skip.dtx Copyright (C) 2004-2011 Frank Mittelbach, The LaTeX3 Project
+%% File: l3skip.dtx Copyright (C) 2004-2011,2019 Frank Mittelbach, The LaTeX3 Project
%% (C) 2012-2019 The LaTeX3 Project
\cs_new_eq:NN \if_dim:w \tex_ifdim:D
\cs_new_eq:NN \__dim_eval:w \tex_dimexpr:D
@@ -24934,9 +24952,8 @@
}
{
\exp_not:N \tex_Ucharcat:D
- \exp_not:N \tex_number:D #1 ~
- \c_space_tl
- \exp_not:N \tex_the:D \tex_catcode:D #1 ~
+ #1 ~
+ \tex_catcode:D #1 ~
}
}
\ior_open:Nn \g__char_data_ior { UnicodeData.txt }
@@ -24956,12 +24973,12 @@
\fi:
\fi:
}
- \ior_map_inline:Nn \g__char_data_ior
+ \ior_map_variable:NNn \g__char_data_ior \l__char_tmpa_tl
{
- \cs_set_nopar:Npn \l__char_tmpa_tl {#1}
- \reverse_if:N \if_meaning:w \l__char_tmpa_tl \c_space_tl
- \__char_data_auxi:w #1 \q_stop
+ \if_meaning:w \l__char_tmpa_tl \c_space_tl
+ \exp_after:wN \ior_map_break:
\fi:
+ \exp_after:wN \__char_data_auxi:w \l__char_tmpa_tl \q_stop
}
\ior_close:N \g__char_data_ior
\ior_open:Nn \g__char_data_ior { CaseFolding.txt }
@@ -24987,16 +25004,13 @@
\__char_generate:n { "#2 }
\__char_generate:n { "#3 }
\tl_if_blank:nF {#4}
- { \__char_generate:n { "#4 } }
+ { \__char_generate:n { \int_value:w "#4 } }
}
}
\ior_str_map_inline:Nn \g__char_data_ior
{
- \cs_set_nopar:Npn \l__char_tmpa_tl {#1}
- \reverse_if:N \if_meaning:w \l__char_tmpa_tl \c_empty_tl
- \reverse_if:N \if:w \tl_head:n { #1 ? } \c_hash_str
- \__char_data_auxi:w #1 \q_stop
- \fi:
+ \reverse_if:N \if:w \c_hash_str \tl_head:w #1 \c_hash_str \q_stop
+ \__char_data_auxi:w #1 \q_stop
\fi:
}
\ior_close:N \g__char_data_ior
@@ -25025,24 +25039,19 @@
}
\ior_str_map_inline:Nn \g__char_data_ior
{
- \cs_set_nopar:Npn \l__char_tmpa_tl {#1}
- \reverse_if:N \if_meaning:w \l__char_tmpa_tl \c_empty_tl
- \if:w \tl_head:n { #1 ? } \c_hash_str
- \cs_set_nopar:Npx \l__char_tmpb_tl
- {
- \c_hash_str \c_space_tl
- \tl_to_str:n { Conditional~Mappings }
- }
- \if_meaning:w \l__char_tmpa_tl \l__char_tmpb_tl
- \exp_after:wN \exp_after:wN \exp_after:wN \ior_map_break:
- \fi:
- \else:
- \__char_data_auxi:w #1 \q_stop
- \fi:
- \fi:
+ \str_if_eq:eeTF
+ { \tl_head:w #1 \c_hash_str \q_stop }
+ { \c_hash_str }
+ {
+ \str_if_eq:eeT
+ {#1}
+ { \c_hash_str \c_space_tl Conditional~Mappings }
+ { \ior_map_break: }
+ }
+ { \__char_data_auxi:w #1 \q_stop }
}
\ior_close:N \g__char_data_ior
- \group_end:
+ \group_end:
}
{
\group_begin: