summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-14 22:06:37 +0000
committerKarl Berry <karl@freefriends.org>2019-01-14 22:06:37 +0000
commit6950156f10651c7d5f976001ab97f0e8e5bcffb4 (patch)
treeee684e58ee9234f7be1395c8bc17652828f5059d /Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
parent255e3d2ea38b32c1acf26bbb1e92c8ec562abdfc (diff)
l3kernel (14jan19)
git-svn-id: svn://tug.org/texlive/trunk@49704 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx51
1 files changed, 21 insertions, 30 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx b/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
index 23a471d1a48..bb483438469 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3unicode.dtx
@@ -41,7 +41,7 @@
% }^^A
% }
%
-% \date{Released 2019-01-12}
+% \date{Released 2019-01-13}
%
% \maketitle
%
@@ -103,9 +103,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 ~
}
}
% \end{macrocode}
@@ -131,12 +130,12 @@
\fi:
\fi:
}
- \ior_map_inline:Nn \g_@@_data_ior
+ \ior_map_variable:NNn \g_@@_data_ior \l_@@_tmpa_tl
{
- \cs_set_nopar:Npn \l_@@_tmpa_tl {#1}
- \reverse_if:N \if_meaning:w \l_@@_tmpa_tl \c_space_tl
- \@@_data_auxi:w #1 \q_stop
+ \if_meaning:w \l_@@_tmpa_tl \c_space_tl
+ \exp_after:wN \ior_map_break:
\fi:
+ \exp_after:wN \@@_data_auxi:w \l_@@_tmpa_tl \q_stop
}
\ior_close:N \g_@@_data_ior
% \end{macrocode}
@@ -170,16 +169,13 @@
\@@_generate:n { "#2 }
\@@_generate:n { "#3 }
\tl_if_blank:nF {#4}
- { \@@_generate:n { "#4 } }
+ { \@@_generate:n { \int_value:w "#4 } }
}
}
\ior_str_map_inline:Nn \g_@@_data_ior
{
- \cs_set_nopar:Npn \l_@@_tmpa_tl {#1}
- \reverse_if:N \if_meaning:w \l_@@_tmpa_tl \c_empty_tl
- \reverse_if:N \if:w \tl_head:n { #1 ? } \c_hash_str
- \@@_data_auxi:w #1 \q_stop
- \fi:
+ \reverse_if:N \if:w \c_hash_str \tl_head:w #1 \c_hash_str \q_stop
+ \@@_data_auxi:w #1 \q_stop
\fi:
}
\ior_close:N \g_@@_data_ior
@@ -213,24 +209,19 @@
}
\ior_str_map_inline:Nn \g_@@_data_ior
{
- \cs_set_nopar:Npn \l_@@_tmpa_tl {#1}
- \reverse_if:N \if_meaning:w \l_@@_tmpa_tl \c_empty_tl
- \if:w \tl_head:n { #1 ? } \c_hash_str
- \cs_set_nopar:Npx \l_@@_tmpb_tl
- {
- \c_hash_str \c_space_tl
- \tl_to_str:n { Conditional~Mappings }
- }
- \if_meaning:w \l_@@_tmpa_tl \l_@@_tmpb_tl
- \exp_after:wN \exp_after:wN \exp_after:wN \ior_map_break:
- \fi:
- \else:
- \@@_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: }
+ }
+ { \@@_data_auxi:w #1 \q_stop }
}
\ior_close:N \g_@@_data_ior
- \group_end:
+ \group_end:
}
% \end{macrocode}
% For the $8$-bit engines, the above is skipped but there is still some