diff options
author | Karl Berry <karl@freefriends.org> | 2010-11-07 23:49:09 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-11-07 23:49:09 +0000 |
commit | 87c1785b0399e6f7464638214c13c34e7dfb6df1 (patch) | |
tree | 53cafe8dd5a0112c588688278dfc19e32a1c8218 /Master/texmf-dist/tex/latex/expl3/l3tl.sty | |
parent | 0c48393561956d291e2bd02e70ac3cbf1fce3ea2 (diff) |
expl3 (7nov10)
git-svn-id: svn://tug.org/texlive/trunk@20360 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3/l3tl.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3tl.sty | 80 |
1 files changed, 41 insertions, 39 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3tl.sty b/Master/texmf-dist/tex/latex/expl3/l3tl.sty index 2fd347e0184..68c13a3aeab 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3tl.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3tl.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3tl.dtx 2063 2010-10-03 08:26:49Z mittelba $ +\GetIdInfo$Id: l3tl.dtx 2081 2010-10-29 07:47:38Z joseph $ {L3 Experimental Token Lists} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -122,34 +122,34 @@ \cs_new_eq:NN \tl_gclear_new:N \tl_gclear:N \cs_generate_variant:Nn \tl_gclear_new:N {c} \cs_new_protected:Npn \tl_put_right:Nn #1#2 { - \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:n {#2} } + \cs_set_nopar:Npx #1 { \exp_not:o #1 \exp_not:n {#2} } } \cs_new_protected:Npn \tl_put_right:NV #1#2 { - \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:V #2 } + \cs_set_nopar:Npx #1 { \exp_not:o #1 \exp_not:V #2 } } \cs_new_protected:Npn \tl_put_right:Nv #1#2 { - \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:v {#2} } + \cs_set_nopar:Npx #1 { \exp_not:o #1 \exp_not:v {#2} } } \cs_new_protected:Npn \tl_put_right:Nx #1#2 { - \cs_set_nopar:Npx #1 { \exp_not:V #1 #2 } + \cs_set_nopar:Npx #1 { \exp_not:o #1 #2 } } \cs_new_protected:Npn \tl_put_right:No #1#2 { - \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:o {#2} } + \cs_set_nopar:Npx #1 { \exp_not:o #1 \exp_not:o {#2} } } \cs_new_protected:Npn \tl_gput_right:Nn #1#2 { - \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:n {#2} } + \cs_gset_nopar:Npx #1 { \exp_not:o #1 \exp_not:n {#2} } } \cs_new_protected:Npn \tl_gput_right:NV #1#2 { - \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:V #2 } + \cs_gset_nopar:Npx #1 { \exp_not:o #1 \exp_not:V #2 } } \cs_new_protected:Npn \tl_gput_right:Nv #1#2 { - \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:v {#2} } + \cs_gset_nopar:Npx #1 { \exp_not:o #1 \exp_not:v {#2} } } \cs_new_protected:Npn \tl_gput_right:No #1#2 { - \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:o {#2} } + \cs_gset_nopar:Npx #1 { \exp_not:o #1 \exp_not:o {#2} } } \cs_new_protected:Npn \tl_gput_right:Nx #1#2 { - \cs_gset_nopar:Npx #1 { \exp_not:V #1 #2 } + \cs_gset_nopar:Npx #1 { \exp_not:o #1 #2 } } \cs_generate_variant:Nn \tl_put_right:Nn { c } \cs_generate_variant:Nn \tl_put_right:NV { c } @@ -161,34 +161,34 @@ \cs_generate_variant:Nn \tl_gput_right:No { c } \cs_generate_variant:Nn \tl_gput_right:Nx { c } \cs_new_protected:Npn \tl_put_left:Nn #1#2 { - \cs_set_nopar:Npx #1 { \exp_not:n {#2} \exp_not:V #1 } + \cs_set_nopar:Npx #1 { \exp_not:n {#2} \exp_not:o #1 } } \cs_new_protected:Npn \tl_put_left:NV #1#2 { - \cs_set_nopar:Npx #1 { \exp_not:V #2 \exp_not:V #1 } + \cs_set_nopar:Npx #1 { \exp_not:V #2 \exp_not:o #1 } } \cs_new_protected:Npn \tl_put_left:Nv #1#2 { - \cs_set_nopar:Npx #1 { \exp_not:v {#2} \exp_not:V #1 } + \cs_set_nopar:Npx #1 { \exp_not:v {#2} \exp_not:o #1 } } \cs_new_protected:Npn \tl_put_left:Nx #1#2 { - \cs_set_nopar:Npx #1 { #2 \exp_not:V #1 } + \cs_set_nopar:Npx #1 { #2 \exp_not:o #1 } } \cs_new_protected:Npn \tl_put_left:No #1#2 { - \cs_set_nopar:Npx #1 { \exp_not:o {#2} \exp_not:V #1 } + \cs_set_nopar:Npx #1 { \exp_not:o {#2} \exp_not:o #1 } } \cs_new_protected:Npn \tl_gput_left:Nn #1#2 { - \cs_gset_nopar:Npx #1 { \exp_not:n {#2} \exp_not:V #1 } + \cs_gset_nopar:Npx #1 { \exp_not:n {#2} \exp_not:o #1 } } \cs_new_protected:Npn \tl_gput_left:NV #1#2 { - \cs_gset_nopar:Npx #1 { \exp_not:V #2 \exp_not:V #1 } + \cs_gset_nopar:Npx #1 { \exp_not:V #2 \exp_not:o #1 } } \cs_new_protected:Npn \tl_gput_left:Nv #1#2 { - \cs_gset_nopar:Npx #1 { \exp_not:v {#2} \exp_not:V #1 } + \cs_gset_nopar:Npx #1 { \exp_not:v {#2} \exp_not:o #1 } } \cs_new_protected:Npn \tl_gput_left:No #1#2 { - \cs_gset_nopar:Npx #1 { \exp_not:o {#2} \exp_not:V #1 } + \cs_gset_nopar:Npx #1 { \exp_not:o {#2} \exp_not:o #1 } } \cs_new_protected:Npn \tl_gput_left:Nx #1#2 { - \cs_gset_nopar:Npx #1 { #2 \exp_not:V #1 } + \cs_gset_nopar:Npx #1 { #2 \exp_not:o #1 } } \cs_generate_variant:Nn \tl_put_left:Nn { c } \cs_generate_variant:Nn \tl_put_left:NV { c } @@ -520,7 +520,9 @@ \cs_new:Npn \tl_tail:w #1#2\q_stop{#2} \cs_new:Npn \tl_head_iii:w #1#2#3#4\q_stop{#1#2#3} \cs_generate_variant:Nn \tl_head:n { V } +\cs_generate_variant:Nn \tl_head:n { v } \cs_generate_variant:Nn \tl_tail:n { V } +\cs_generate_variant:Nn \tl_tail:n { v } \prg_new_conditional:Npnn \tl_if_head_eq_meaning:nN #1#2 {p,TF,T,F} { \exp_after:wN \if_meaning:w \tl_head:w #1 \q_stop #2 \prg_return_true: \else: \prg_return_false: \fi: @@ -591,75 +593,75 @@ } \cs_set_protected:Npn \tl_put_right:Nn #1#2 { \_tl_check_exists:N #1 - \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:n {#2} } + \cs_set_nopar:Npx #1 { \exp_not:o #1 \exp_not:n {#2} } } \cs_set_protected:Npn \tl_put_right:NV #1#2 { \_tl_check_exists:N #1 - \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:V #2 } + \cs_set_nopar:Npx #1 { \exp_not:o #1 \exp_not:V #2 } } \cs_set_protected:Npn \tl_put_right:Nv #1#2 { \_tl_check_exists:N #1 - \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:v {#2} } + \cs_set_nopar:Npx #1 { \exp_not:o #1 \exp_not:v {#2} } } \cs_set_protected:Npn \tl_put_right:No #1#2 { \_tl_check_exists:N #1 - \cs_set_nopar:Npx #1 { \exp_not:V #1 \exp_not:o {#2} } + \cs_set_nopar:Npx #1 { \exp_not:o #1 \exp_not:o {#2} } } \cs_set_protected:Npn \tl_put_right:Nx #1#2 { \_tl_check_exists:N #1 - \cs_set_nopar:Npx #1 { \exp_not:V #1 #2 } + \cs_set_nopar:Npx #1 { \exp_not:o #1 #2 } } \cs_set_protected:Npn \tl_gput_right:Nn #1#2 { \_tl_check_exists:N #1 - \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:n {#2} } + \cs_gset_nopar:Npx #1 { \exp_not:o #1 \exp_not:n {#2} } } \cs_set_protected:Npn \tl_gput_right:NV #1#2 { \_tl_check_exists:N #1 - \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:V #2 } + \cs_gset_nopar:Npx #1 { \exp_not:o #1 \exp_not:V #2 } } \cs_set_protected:Npn \tl_gput_right:Nv #1#2 { \_tl_check_exists:N #1 - \cs_gset_nopar:Npx #1 { \exp_not:V #1 \exp_not:v {#2} } + \cs_gset_nopar:Npx #1 { \exp_not:o #1 \exp_not:v {#2} } } \cs_set_protected:Npn \tl_gput_right:Nx #1#2 { \_tl_check_exists:N #1 - \cs_gset_nopar:Npx #1 { \exp_not:V #1 #2 } + \cs_gset_nopar:Npx #1 { \exp_not:o #1 #2 } } \cs_set_protected:Npn \tl_put_left:Nn #1#2 { \_tl_check_exists:N #1 - \cs_set_nopar:Npx #1 { \exp_not:n {#2} \exp_not:V #1 } + \cs_set_nopar:Npx #1 { \exp_not:n {#2} \exp_not:o #1 } } \cs_set_protected:Npn \tl_put_left:NV #1#2 { \_tl_check_exists:N #1 - \cs_set_nopar:Npx #1 { \exp_not:V #2 \exp_not:V #1 } + \cs_set_nopar:Npx #1 { \exp_not:V #2 \exp_not:o #1 } } \cs_set_protected:Npn \tl_put_left:Nv #1#2 { \_tl_check_exists:N #1 - \cs_set_nopar:Npx #1 { \exp_not:v {#2} \exp_not:V #1 } + \cs_set_nopar:Npx #1 { \exp_not:v {#2} \exp_not:o #1 } } \cs_set_protected:Npn \tl_put_left:No #1#2 { \_tl_check_exists:N #1 - \cs_set_nopar:Npx #1 { \exp_not:o {#2} \exp_not:V #1 } + \cs_set_nopar:Npx #1 { \exp_not:o {#2} \exp_not:o #1 } } \cs_set_protected:Npn \tl_put_left:Nx #1#2 { \_tl_check_exists:N #1 - \cs_set_nopar:Npx #1 { #2 \exp_not:V #1 } + \cs_set_nopar:Npx #1 { #2 \exp_not:o #1 } } \cs_set_protected:Npn \tl_gput_left:Nn #1#2 { \_tl_check_exists:N #1 - \cs_gset_nopar:Npx #1 { \exp_not:n {#2} \exp_not:V #1 } + \cs_gset_nopar:Npx #1 { \exp_not:n {#2} \exp_not:o #1 } } \cs_set_protected:Npn \tl_gput_left:NV #1#2 { \_tl_check_exists:N #1 - \cs_gset_nopar:Npx #1 { \exp_not:V #2 \exp_not:V #1 } + \cs_gset_nopar:Npx #1 { \exp_not:V #2 \exp_not:o #1 } } \cs_set_protected:Npn \tl_gput_left:Nv #1#2 { \_tl_check_exists:N #1 - \cs_gset_nopar:Npx #1 { \exp_not:v {#2} \exp_not:V #1 } + \cs_gset_nopar:Npx #1 { \exp_not:v {#2} \exp_not:o #1 } } \cs_set_protected:Npn \tl_gput_left:Nx #1#2 { \_tl_check_exists:N #1 - \cs_gset_nopar:Npx #1 { #2 \exp_not:V #1 } + \cs_gset_nopar:Npx #1 { #2 \exp_not:o #1 } } \tex_fi:D %% |