summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/expl3/l3tl.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/expl3/l3tl.dtx')
-rw-r--r--Master/texmf-dist/source/latex/expl3/l3tl.dtx29
1 files changed, 16 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/expl3/l3tl.dtx b/Master/texmf-dist/source/latex/expl3/l3tl.dtx
index 00ab46f152d..fe6ecd271f1 100644
--- a/Master/texmf-dist/source/latex/expl3/l3tl.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3tl.dtx
@@ -36,7 +36,7 @@
\RequirePackage{l3names}
%</driver|package>
%\fi
-\GetIdInfo$Id: l3tl.dtx 2138 2011-01-26 08:15:27Z joseph $
+\GetIdInfo$Id: l3tl.dtx 2184 2011-03-07 18:07:12Z joseph $
{L3 Experimental Token Lists}
%\iffalse
%<*driver>
@@ -1900,24 +1900,23 @@
\_tl_replace_in_aux:NNnn \tl_set_eq:NN
}
\cs_new_protected:Npn \_tl_replace_in_aux:NNnn #1#2#3#4 {
- \cs_set:Npn \_tl_tmp:w ##1 #3 ##2 \q_stop
+ \cs_set_protected:Npn \_tl_tmp:w ##1 #3 ##2 \q_stop
{
\quark_if_no_value:nF {##2}
{
\tl_set:No \_l_tl_replace_tl { ##1 #4 }
- \cs_set:Npn \_tl_tmp:w ####1 #3 \q_no_value {
- \tl_put_right:No \_l_tl_replace_tl {####1}
- }
+ \cs_set_protected:Npn \_tl_tmp:w ####1 \q_nil #3 \q_no_value
+ { \tl_put_right:No \_l_tl_replace_tl {####1} }
\_tl_tmp:w \prg_do_nothing: ##2
#1 #2 \_l_tl_replace_tl
}
}
- \use:n
+ \use:n
{
\exp_after:wN \_tl_tmp:w \exp_after:wN
\prg_do_nothing:
- }
- #2 #3 \q_no_value \q_stop
+ }
+ #2 \q_nil #3 \q_no_value \q_stop
}
\cs_new_protected_nopar:Npn \tl_greplace_in:Nnn {
\_tl_replace_in_aux:NNnn \tl_gset_eq:NN
@@ -1947,21 +1946,25 @@
}
\cs_new_protected:Npn \_tl_replace_all_in_aux:NNnn #1#2#3#4 {
\tl_clear:N \_l_tl_replace_tl
- \cs_set:Npn \_tl_tmp:w ##1 #3 ##2 \q_stop
+ \cs_set_protected:Npn \_tl_tmp:w ##1 #3 ##2 \q_stop
{
\quark_if_no_value:nTF {##2}
- { \tl_put_right:No \_l_tl_replace_tl {##1} }
+ {
+ \cs_set_protected:Npn \_tl_tmp:w ####1 \q_nil ####2 \q_stop
+ { \tl_put_right:No \_l_tl_replace_tl {####1} }
+ \_tl_tmp:w ##1 \q_stop
+ }
{
\tl_put_right:No \_l_tl_replace_tl { ##1 #4 }
\_tl_tmp:w \prg_do_nothing: ##2 \q_stop
}
}
- \use:n
+ \use:n
{
\exp_after:wN \_tl_tmp:w \exp_after:wN
\prg_do_nothing:
- }
- #2 #3 \q_no_value \q_stop
+ }
+ #2 \q_nil #3 \q_no_value \q_stop
#1 #2 \_l_tl_replace_tl
}
\cs_generate_variant:Nn \tl_replace_all_in:Nnn { c }