diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx index 4aa22e27714..88a4d9898b5 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx @@ -36,7 +36,7 @@ % %<*driver|package> \RequirePackage{l3bootstrap} -\GetIdInfo$Id: l3candidates.dtx 4383 2012-12-20 15:10:48Z bruno $ +\GetIdInfo$Id: l3candidates.dtx 4466 2013-03-09 14:58:43Z joseph $ {L3 Experimental additions to l3kernel} %</driver|package> %<*driver> @@ -406,7 +406,7 @@ % \cs{ior_str_map_inline:Nn} \Arg{stream} \Arg{inline function} % \end{syntax} % Applies the \meta{inline function} to every \meta{line} -% in the \meta{sream}. The material is read from the \meta{stream} +% in the \meta{stream}. The material is read from the \meta{stream} % as a series of tokens with category code $12$ (other), with the % exception of space characters which are given category code $10$ % (space). The \meta{inline function} should consist of code which @@ -2243,12 +2243,14 @@ \cs_new:Npn \prop_map_tokens:Nn #1#2 { \exp_last_unbraced:Nno \@@_map_tokens:nwn {#2} #1 - \q_recursion_tail \q__prop { } + \s_@@ \q_recursion_tail \s_@@ { } \__prg_break_point:Nn \prop_map_break: { } } -\cs_new:Npn \@@_map_tokens:nwn #1 \q__prop #2 \q__prop #3 +\cs_new:Npn \@@_map_tokens:nwn #1 \s_@@ #2 \s_@@ #3 { - \__quark_if_recursion_tail_break:NN #2 \prop_map_break: + \if_meaning:w \q_recursion_tail #2 + \exp_after:wN \prop_map_break: + \fi: \use:n {#1} {#2} {#3} \@@_map_tokens:nwn {#1} } @@ -2271,10 +2273,10 @@ { \exp_last_unbraced:Noo \@@_get_Nn:nwn { \tl_to_str:n {#2} } #1 - \tl_to_str:n {#2} \q__prop { } + \tl_to_str:n {#2} \q_@@ { } \__prg_break_point: } -\cs_new:Npn \@@_get_Nn:nwn #1 \q__prop #2 \q__prop #3 +\cs_new:Npn \@@_get_Nn:nwn #1 \q_@@ #2 \q_@@ #3 { \str_if_eq_x:nnTF {#1} {#2} { \__prg_break:n { \exp_not:n {#3} } } @@ -2886,11 +2888,11 @@ \exp_after:wN \@@_false:w \fi: } - \cs_new_protected_nopar:Npn \@@_N_type:w #1 OUTER #2 \q_mark #3 + \cs_new_protected:Npn \@@_N_type:w #1 OUTER #2 \q_mark #3 { #3 {#1} {#2} } } \group_end: -\cs_new_protected_nopar:Npn \@@_N_type_aux:nnw #1 #2 #3 \fi: +\cs_new_protected:Npn \@@_N_type_aux:nnw #1 #2 #3 \fi: { \fi: \tl_if_in:noTF {#1} { \tl_to_str:n {ma} } |