diff options
author | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2009-07-11 00:46:31 +0000 |
---|---|---|
committer | Manuel Pégourié-Gonnard <mpg@elzevir.fr> | 2009-07-11 00:46:31 +0000 |
commit | af8f869831d4976ff671f8f0b0ed8de0bb5dc7e8 (patch) | |
tree | d5f531a67e24d8b5b16030c5d50750cf8d3fea3e /Master/texmf-dist/tex/latex/expl3/l3tl.sty | |
parent | 0c5054c55e1f737f4ecea5cde8f2d552a3d7ffd8 (diff) |
expl3 update
git-svn-id: svn://tug.org/texlive/trunk@14222 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 | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3tl.sty b/Master/texmf-dist/tex/latex/expl3/l3tl.sty index 2e5c8294ac1..ef0a0ac8af4 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 1365 2009-05-31 17:26:17Z mittelba $ +\GetIdInfo$Id: l3tl.dtx 1421 2009-07-10 21:10:59Z joseph $ {L3 Experimental Token Lists} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -80,8 +80,8 @@ \cs_new:Npn\tl_set:Nx#1#2{\cs_set_nopar:Npx#1{#2}} \cs_new:Npn\tl_gset:Nn#1#2{\cs_gset_nopar:Npn#1{#2}} \cs_new:Npn\tl_gset:Nx#1#2{\cs_gset_nopar:Npx#1{#2}} -\cs_generate_variant:Nn \tl_set:Nn {NV,No,Nv,Nd,Nf,cn,cV,co,cx} -\cs_generate_variant:Nn \tl_gset:Nn {NV,No,Nv,Nd,cn,cx} +\cs_generate_variant:Nn \tl_set:Nn {NV,No,Nv,Nf,cn,cV,co,cx} +\cs_generate_variant:Nn \tl_gset:Nn {NV,No,Nv,cn,cx} \cs_new_eq:NN \tl_set_eq:NN \cs_set_eq:NN \cs_new_eq:NN \tl_gset_eq:NN \cs_gset_eq:NN \cs_generate_variant:Nn \tl_set_eq:NN {Nc,c,cc} @@ -122,8 +122,7 @@ \cs_new:Npn \tl_gput_left:Nx #1#2{ \tl_gset:Nx #1 { #2 \exp_not:V #1 } } -\cs_generate_variant:Nn \tl_put_left:Nn {cn,co} -\cs_generate_variant:Nn \tl_put_left:NV {cV} +\cs_generate_variant:Nn \tl_put_left:Nn {cn,co,cV} \cs_generate_variant:Nn \tl_gput_left:Nn {cn,co} \cs_generate_variant:Nn \tl_gput_left:NV {cV} \cs_new:Npn \tl_put_right:Nn #1#2 { @@ -156,8 +155,7 @@ } \cs_generate_variant:Nn \tl_put_right:Nn {cn,co} \cs_generate_variant:Nn \tl_put_right:NV {cV} -\cs_generate_variant:Nn \tl_gput_right:Nn {cn,co} -\cs_generate_variant:Nn \tl_gput_right:NV {cV} +\cs_generate_variant:Nn \tl_gput_right:Nn {cn,co,cV} \cs_new_nopar:Npn \tl_gset:Nc { \pref_global:D \tl_set:Nc} @@ -453,19 +451,19 @@ } \cs_new:Npn \tl_set_rescan_aux:NNnn #1#2#3#4 { \group_begin: - \toks_set:No \etex_everyeof:D { \c_two_ats_with_two_catcodes_tl } + \toks_set:NV \etex_everyeof:D \c_two_ats_with_two_catcodes_tl \tex_endlinechar:D = \c_minus_one #3 \exp_after:wN \tl_rescan_aux:w \etex_scantokens:D {#4} - \exp_args:NNNo + \exp_args:NNNV \group_end: - #1 #2 { \l_tmpa_tl } + #1 #2 \l_tmpa_toks } \exp_after:wN \cs_set:Npn \exp_after:wN \tl_rescan_aux:w \exp_after:wN # \exp_after:wN 1 \c_two_ats_with_two_catcodes_tl { - \tl_set:Nn \l_tmpa_tl {#1} + \tl_set:Nn \l_tmpa_toks {#1} } \cs_new:Npn \tl_set_rescan:Nnx #1#2#3 { \group_begin: @@ -473,9 +471,9 @@ \tex_endlinechar:D = \c_minus_one #2 \tl_set:Nx \l_tmpa_tl { \etex_scantokens:D {#3} } - \exp_args:NNNo + \exp_args:NNNV \group_end: - \tl_set:Nn #1 { \l_tmpa_tl } + \tl_set:Nn #1 \l_tmpa_tl } \cs_new:Npn \tl_gset_rescan:Nnx #1#2#3 { \group_begin: @@ -487,11 +485,12 @@ } \cs_new:Npn \tl_rescan:nn #1#2 { \group_begin: - \etex_everyeof:D { \exp_not:N } + \toks_set:NV \etex_everyeof:D \c_two_ats_with_two_catcodes_tl \tex_endlinechar:D = \c_minus_one #1 - \toks_set:Nx \l_tmpa_toks { \etex_scantokens:D {#2} } - \exp_args:NV \group_end: \l_tmpa_toks + \exp_after:wN \tl_rescan_aux:w \etex_scantokens:D {#2} + \exp_args:NV \group_end: + \l_tmpa_toks } \prg_new_protected_conditional:Npnn \tl_if_in:Nn #1#2 {TF,T,F} { \cs_set:Npn \tl_tmp:w ##1 #2 ##2 \q_stop { |