latex3 (12mar13)

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

3 files changed, 59 insertions, 26 deletions

diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index 7411941082b..eff969849a0 100644
--- a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
@@ -13,7 +13,7 @@
 %% 
 %% Do not distribute a modified version of this file.
 %% 
-%% File: l3keys2e.dtx (C) Copyright 2009,2011,2012 The LaTeX3 Project
+%% File: l3keys2e.dtx (C) Copyright 2009,2011-2013 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -46,8 +46,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2012/12/21]
-\@ifpackagelater{expl3}{2012/12/21}
+\RequirePackage{expl3}[2013/03/12]
+\@ifpackagelater{expl3}{2013/03/12}
   {}
   {%
     \PackageError{l3keys2e}{Support package l3kernel too old}
@@ -59,15 +59,15 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3keys2e.dtx 4390 2012-12-21 06:59:20Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 4467 2013-03-12 08:29:05Z joseph $
   {LaTeX2e option processing using LaTeX3 keys}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
-\clist_new:N \__keys_latexe_options_clist
+\clist_new:N \l__keys_latexe_options_clist
 \bool_new:N \l__keys_process_class_bool
 \cs_new_protected:Npn \__keys_latexe_options:n #1
   {
-    \clist_clear:N \__keys_latexe_options_clist
+    \clist_clear:N \l__keys_latexe_options_clist
     \__keys_latexe_options_global:n {#1}
     \__keys_latexe_options_local:
     \keys_if_exist:nnF {#1} { unknown }
@@ -81,7 +81,7 @@
               }
           }
       }
-    \keys_set:nV {#1} \__keys_latexe_options_clist
+    \keys_set:nV {#1} \l__keys_latexe_options_clist
     \AtEndOfPackage { \cs_set_eq:NN \@unprocessedoptions \scan_stop: }
   }
 \cs_new_protected:Npn \__keys_latexe_options_global:n #1
@@ -99,12 +99,12 @@
 \cs_new_protected:Npn \__keys_latexe_options_class:n #1
   {
     \keys_if_exist:nnTF {#1} { unknown }
-      { \clist_put_right:No \__keys_latexe_options_clist \@classoptionslist }
+      { \clist_put_right:No \l__keys_latexe_options_clist \@classoptionslist }
       {
         \clist_map_inline:Nn \@classoptionslist
           {
             \keys_if_exist:nnTF {#1} { \__keys_latexe_remove_equals:n {##1} }
-              { \clist_put_right:Nn \__keys_latexe_options_clist {##1} }
+              { \clist_put_right:Nn \l__keys_latexe_options_clist {##1} }
               { \clist_put_right:Nn \@unusedoptionlist {##1} }
           }
       }
@@ -115,7 +115,7 @@
       {
         \keys_if_exist:nnT {#1} { \__keys_latexe_remove_equals:n {##1} }
           {
-            \clist_put_right:Nn \__keys_latexe_options_clist {##1}
+            \clist_put_right:Nn \l__keys_latexe_options_clist {##1}
             \clist_remove_all:Nn \@unusedoptionlist {##1}
           }
       }
@@ -126,7 +126,7 @@
       {
         \cs_if_exist:cT { opt@ \@currname . \@currext }
           {
-            \exp_args:NNc \clist_put_right:NV \__keys_latexe_options_clist
+            \exp_args:NNc \clist_put_right:NV \l__keys_latexe_options_clist
               { opt@ \@currname . \@currext }
           }
       }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index 16f16a26a13..fd2d7b22112 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
@@ -17,7 +17,7 @@
 %%                      David Carlisle
 %%                  (C) Copyright 2004-2008 Frank Mittelbach,
 %%                      The LaTeX3 Project
-%%                  (C) Copyright 2009-2012 The LaTeX3 Project
+%%                  (C) Copyright 2009-2013 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -50,8 +50,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2012/12/21]
-\@ifpackagelater{expl3}{2012/12/21}
+\RequirePackage{expl3}[2013/03/12]
+\@ifpackagelater{expl3}{2013/03/12}
   {}
   {%
     \PackageError{xparse}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: xparse.dtx 4390 2012-12-21 06:59:20Z joseph $
+\GetIdInfo$Id: xparse.dtx 4467 2013-03-12 08:29:05Z joseph $
   {L3 Experimental document command parser}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -666,7 +666,15 @@
             \tl_if_in:nnTF {####1} {#1}
               { \__xparse_grab_D_nested:NNnnN #1 #2 {####1} {#3} #4 }
               {
-                \__xparse_add_arg:o { \use_none:n ####1 }
+                \tl_if_blank:oTF { \use_none:n ####1 }
+                  { \__xparse_add_arg:o { \use_none:n ####1 } }
+                  {
+                    \str_if_eq_x:nnTF
+                      { \exp_not:o { \use_none:n ####1 } }
+                      { { \exp_not:o { \use_ii:nnn ####1 \q_nil } } }
+                      { \__xparse_add_arg:o { \use_ii:nn ####1 } }
+                      { \__xparse_add_arg:o { \use_none:n ####1 } }
+                  }
                 #3 \l__xparse_args_tl
               }
           }
@@ -1131,7 +1139,15 @@
     \exp_args:No \tl_if_empty:oTF
       { #3 { \use_none:nnn } #2 \q__xparse #5 #4 \q__xparse #5 }
       {
-        \__xparse_put_arg_expandable:ow { \use_none:nn #1#2 }
+        \tl_if_blank:oTF { \use_none:nn #1#2 }
+          { \__xparse_put_arg_expandable:ow { } }
+          {
+            \str_if_eq_x:nnTF
+              { \exp_not:o { \use_none:nn #1#2 } }
+              { { \exp_not:o { \use_iii:nnnn #1#2 \q_nil } } }
+              { \__xparse_put_arg_expandable:ow { \use_iii:nnn #1#2 } }
+              { \__xparse_put_arg_expandable:ow { \use_none:nn #1#2 } }
+          }
           #6 \q__xparse #7
       }
       {
@@ -1155,7 +1171,18 @@
       { #4 {#3} \q__xparse #5 {#6} }
   }
 \cs_new:Npn \__xparse_expandable_grab_D_alt:Nwn #1#2 \q__xparse #3
-  { \__xparse_put_arg_expandable:ow { \use_none:n #3 } #2 \q__xparse #1 }
+  {
+    \tl_if_blank:oTF { \use_none:nn #1#2 }
+      { \__xparse_put_arg_expandable:ow { } }
+      {
+        \str_if_eq_x:nnTF
+          { \exp_not:o { \use_none:n #3 } }
+          { { \exp_not:o { \use_ii:nnn #3 \q_nil } } }
+          { \__xparse_put_arg_expandable:ow { \use_ii:nn #3 } }
+          { \__xparse_put_arg_expandable:ow { \use_none:n #3 } }
+      }
+      #2 \q__xparse #1
+  }
 \cs_new:Npn \__xparse_expandable_grab_m:w #1 \q__xparse #2
   { #2 { \__xparse_expandable_grab_m_aux:wNn #1 \q__xparse #2 } }
 \cs_new:Npn \__xparse_expandable_grab_m_aux:wNn #1 \q__xparse #2#3
@@ -1578,14 +1605,20 @@
 \cs_new_eq:NN \GetDocumentEnvironmmentArgSpec \__xparse_get_arg_spec:n
 \cs_new_eq:NN \ShowDocumentCommandArgSpec     \__xparse_show_arg_spec:N
 \cs_new_eq:NN \ShowDocumentEnvironmentArgSpec \__xparse_show_arg_spec:n
-\DeclareOption { log-declarations = true } { }
-\DeclareOption { log-declarations = false }
+\clist_new:N \l__xparse_options_clist
+\DeclareOption* { \clist_put_right:NV \l__xparse_options_clist \CurrentOption }
+\ProcessOptions \relax
+\keys_define:nn { xparse }
+  {
+    log-declarations .bool_set:N = \l__xparse_log_bool ,
+    log-declarations .initial:n  = true
+  }
+\keys_set:nV { xparse } \l__xparse_options_clist
+\bool_if:NF \l__xparse_log_bool
   {
     \msg_redirect_module:nnn { LaTeX / xparse } { info }    { none }
     \msg_redirect_module:nnn { LaTeX / xparse } { warning } { none }
   }
-\DeclareOption { log-declarations } { }
-\ProcessOptions \scan_stop:
 %% 
 %%
 %% End of file `xparse.sty'.
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index 7c33f8c0803..38767bd6e67 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
@@ -17,7 +17,7 @@
 %%                         David Carlisle
 %%                     (C) Copyright 2004-2010 Frank Mittelbach,
 %%                         The LaTeX3 Project
-%%                     (C) Copyright 2011,2012 The LaTeX3 Project
+%%                     (C) Copyright 2011-2013 The LaTeX3 Project
 %%
 %% It may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -50,8 +50,8 @@
 %%
 %% -----------------------------------------------------------------------
 %%
-\RequirePackage{expl3}[2012/12/21]
-\@ifpackagelater{expl3}{2012/12/21}
+\RequirePackage{expl3}[2013/03/12]
+\@ifpackagelater{expl3}{2013/03/12}
   {}
   {%
     \PackageError{xtemplate}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: xtemplate.dtx 4390 2012-12-21 06:59:20Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 4467 2013-03-12 08:29:05Z joseph $
   {L3 Experimental prototype document functions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}