latex3

git-svn-id: svn://tug.org/texlive/trunk@27600 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 12 insertions, 8 deletions

diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
index ddcd94376cf..8a8d89bb904 100644
--- a/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
+++ b/Master/texmf-dist/tex/latex/l3kernel/l3tl.sty
@@ -46,7 +46,7 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3tl.dtx 3991 2012-07-16 19:00:35Z joseph $
+\GetIdInfo$Id: l3tl.dtx 4201 2012-09-05 08:00:54Z joseph $
   {L3 Token lists}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -69,7 +69,6 @@
   }
 \cs_generate_variant:Nn \tl_const:Nn { c }
 \cs_generate_variant:Nn \tl_const:Nx { c }
-\tl_const:Nn \c_empty_tl { }
 \cs_new_protected:Npn \tl_clear:N  #1
   { \tl_set_eq:NN #1 \c_empty_tl }
 \cs_new_protected:Npn \tl_gclear:N #1
@@ -104,6 +103,7 @@
 \cs_new_eq:NN \tl_if_exist:cT  \cs_if_exist:cT
 \cs_new_eq:NN \tl_if_exist:cF  \cs_if_exist:cF
 \cs_new_eq:NN \tl_if_exist_p:c \cs_if_exist_p:c
+\tl_const:Nn \c_empty_tl { }
 \tl_const:Nx \c_job_name_tl { \tex_jobname:D }
 \tl_const:Nn \c_space_tl { ~ }
 \cs_new_protected:Npn \tl_set:Nn #1#2
@@ -589,16 +589,19 @@
 \cs_generate_variant:Nn \tl_reverse:N  { c }
 \cs_generate_variant:Nn \tl_greverse:N { c }
 \cs_new:Npn \tl_head:w #1#2 \q_stop {#1}
-\cs_new:Npn \tl_tail:w #1#2 \q_stop {#2}
 \cs_new:Npn \tl_head:n #1
   { \etex_unexpanded:D \exp_after:wN { \tl_head:w #1 { } \q_stop } }
-\cs_new:Npn \tl_tail:n #1
-  { \etex_unexpanded:D \__tl_tail:w #1 \q_mark { } \q_mark \q_stop }
-\cs_new:Npn \__tl_tail:w #1 #2 \q_mark #3 \q_stop { {#2} }
-\cs_new_nopar:Npn \tl_head:N { \exp_args:No \tl_head:n }
 \cs_generate_variant:Nn \tl_head:n { V , v , f }
-\cs_new_nopar:Npn \tl_tail:N { \exp_args:No \tl_tail:n }
+\cs_new_nopar:Npn \tl_head:N { \exp_args:No \tl_head:n }
+\cs_new:Npn \tl_tail:n #1
+  {
+    \etex_unexpanded:D
+      \tl_if_blank:nTF {#1}
+        { { } }
+        { \exp_after:wN { \use_none:n #1 } }
+  }
 \cs_generate_variant:Nn \tl_tail:n { V , v , f }
+\cs_new_nopar:Npn \tl_tail:N { \exp_args:No \tl_tail:n }
 \cs_new:Npn \str_head:n #1
   {
     \exp_after:wN \__str_head:w
@@ -741,6 +744,7 @@
   { p , T , F , TF }
 \prg_new_eq_conditional:NNn \tl_if_head_space:n \tl_if_head_is_space:n
   { p , T , F , TF }
+\cs_new:Npn \tl_tail:w #1#2 \q_stop {#2}
 %% 
 %%
 %% End of file `l3tl.sty'.