latex3 (5may14)

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

4 files changed, 50 insertions, 32 deletions

diff --git a/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty b/Master/texmf-dist/tex/latex/l3packages/l3keys2e/l3keys2e.sty
index eefd87478f3..6d5daa9410e 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-2013 The LaTeX3 Project
+%% File: l3keys2e.dtx (C) Copyright 2009,2011-2014 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}[2013/12/31]
-\@ifpackagelater{expl3}{2013/12/31}
+\RequirePackage{expl3}[2014/05/05]
+\@ifpackagelater{expl3}{2014/05/05}
   {}
   {%
     \PackageError{l3keys2e}{Support package l3kernel too old}
@@ -59,10 +59,11 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: l3keys2e.dtx 4634 2013-12-31 17:32:19Z joseph $
+\GetIdInfo$Id: l3keys2e.dtx 4740 2014-05-05 14:04:24Z joseph $
   {LaTeX2e option processing using LaTeX3 keys}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
+\cs_generate_variant:Nn \clist_put_right:Nn { Nv }
 \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
@@ -81,7 +82,11 @@
               }
           }
       }
-    \keys_set:nV {#1} \l__keys_latexe_options_clist
+    \clist_map_inline:Nn \l__keys_latexe_options_clist
+      {
+        \tl_set:Nn \CurrentOption {##1}
+        \keys_set:nn {#1} {##1}
+      }
     \AtEndOfPackage { \cs_set_eq:NN \@unprocessedoptions \scan_stop: }
   }
 \cs_new_protected:Npn \__keys_latexe_options_global:n #1
@@ -98,14 +103,20 @@
   }
 \cs_new_protected:Npn \__keys_latexe_options_class:n #1
   {
-    \keys_if_exist:nnTF {#1} { unknown }
-      { \clist_put_right:No \l__keys_latexe_options_clist \@classoptionslist }
+    \cs_if_free:cF { opt@ \@currname . \@currext }
       {
-        \clist_map_inline:Nn \@classoptionslist
+        \keys_if_exist:nnTF {#1} { unknown }
           {
-            \keys_if_exist:nnTF {#1} { \__keys_latexe_remove_equals:n {##1} }
-              { \clist_put_right:Nn \l__keys_latexe_options_clist {##1} }
-              { \clist_put_right:Nn \@unusedoptionlist {##1} }
+            \clist_put_right:Nv \l__keys_latexe_options_clist
+              { opt@ \@currname . \@currext }
+          }
+          {
+            \clist_map_inline:cn { opt@ \@currname . \@currext }
+              {
+                \keys_if_exist:nnTF {#1} { \__keys_latexe_remove_equals:n {##1} }
+                  { \clist_put_right:Nn \l__keys_latexe_options_clist {##1} }
+                  { \clist_put_right:Nn \@unusedoptionlist {##1} }
+              }
           }
       }
   }
diff --git a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
index 44b4a39bba0..320805da81a 100644
--- a/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
+++ b/Master/texmf-dist/tex/latex/l3packages/xfrac/xfrac.sty
@@ -14,7 +14,7 @@
 %% Do not distribute a modified version of this file.
 %% 
 %% File: xfrac.dtx Copyright (C) 2004, 2008-2010 Morten Hoegholm
-%%                           (C) 2011,2012 The LaTeX3 Project
+%%                           (C) 2011,2012,2014 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
@@ -48,7 +48,7 @@
 %% -----------------------------------------------------------------------
 %%
 \RequirePackage{amstext,graphicx,l3keys2e,textcomp,xparse,xtemplate}
-\GetIdInfo$Id: xfrac.dtx 4299 2012-11-09 18:48:51Z joseph $
+\GetIdInfo$Id: xfrac.dtx 4728 2014-05-04 13:25:37Z joseph $
   {L3 Experimental split-level fractions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff --git a/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty b/Master/texmf-dist/tex/latex/l3packages/xparse/xparse.sty
index aa5177281ed..beae464378c 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-2013 The LaTeX3 Project
+%%                  (C) Copyright 2009-2014 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}[2013/12/31]
-\@ifpackagelater{expl3}{2013/12/31}
+\RequirePackage{expl3}[2014/05/05]
+\@ifpackagelater{expl3}{2014/05/05}
   {}
   {%
     \PackageError{xparse}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: xparse.dtx 4634 2013-12-31 17:32:19Z joseph $
+\GetIdInfo$Id: xparse.dtx 4740 2014-05-05 14:04:24Z joseph $
   {L3 Experimental document command parser}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -546,17 +546,20 @@
   }
 \cs_new_protected_nopar:Npn \__xparse_add_expandable_type_g:w
   {
-    \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { g }
+    \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+      { g }
     \__xparse_add_expandable_type_m:w
   }
 \cs_new_protected_nopar:Npn \__xparse_add_expandable_type_G:w #1
   {
-    \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { G }
+    \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+      { G }
     \__xparse_add_expandable_type_m:w
   }
 \cs_new_protected_nopar:Npn \__xparse_add_expandable_type_l:w
   {
-    \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { l }
+    \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+      { l }
     \__xparse_add_expandable_type_m:w
   }
 \cs_new_protected_nopar:Npn \__xparse_add_expandable_type_m:w
@@ -600,12 +603,14 @@
   }
 \cs_new_protected_nopar:Npn \__xparse_add_expandable_type_u:w #1
   {
-    \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { u }
+    \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+      { u }
     \__xparse_add_expandable_type_m:w
   }
 \cs_new_protected_nopar:Npn \__xparse_add_expandable_type_v:w
   {
-    \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type } { v }
+    \__msg_kernel_error:nnx { xparse } { invalid-expandable-argument-type }
+      { v }
     \__xparse_add_expandable_type_m:w
   }
 \cs_new_protected_nopar:Npn \__xparse_add_expandable_grabber_mandatory:n #1
@@ -1399,20 +1404,20 @@
   {
     You~have~used~\NewDocumentCommand
     with~a~command~that~already~has~a~definition. \\
-    The~existing~definition~of~'#1'~will~be~overwritten.
+    The~existing~definition~of~'#1'~will~not~be~altered.
   }
 \__msg_kernel_new:nnnn { xparse } { command-not-yet-defined }
   { Command ~'#1'~not~yet~defined! }
   {
     You~have~used~\RenewDocumentCommand
-    with~a~command~that~was~never~defined.\\
+    with~a~command~that~was~never~defined. \\
     A~new~command~'#1'~will~be~created.
   }
 \__msg_kernel_new:nnnn { xparse } { environment-already-defined }
   { Environment~'#1'~already~defined! }
   {
     You~have~used~\NewDocumentEnvironment
-    with~an~environment~that~already~has~a~definition.\\
+    with~an~environment~that~already~has~a~definition. \\
     The~existing~definition~of~'#1'~will~be~overwritten.
   }
 \__msg_kernel_new:nnnn { xparse } { environment-mismatch }
@@ -1425,18 +1430,20 @@
   { Environment~'#1'~not~yet~defined! }
   {
     You~have~used~\RenewDocumentEnvironment
-    with~an~environment~that~was~never~defined.\\
+    with~an~environment~that~was~never~defined. \\
     A~new~environment~'#1'~will~be~created.
   }
 \__msg_kernel_new:nnnn { xparse } { environment-unknown }
   { Environment~'#1'~undefined. }
   {
     You~have~tried~to~start~an~environment~called~'#1',~
-    but~this~has~never~been~defined.\\
+    but~this~has~never~been~defined. \\
     The~command~will~be~ignored.
   }
 \__msg_kernel_new:nnnn { xparse } { expandable-ending-optional }
-  { Argument~specification~for~expandable~command~ends~with~optional~argument. }
+  {
+    Argument~specification~for~expandable~command~ends~with~optional~argument.
+  }
   {
     \c_msg_coding_error_text_tl
     Expandable~commands~must~have~a~final~mandatory~argument~
diff --git a/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty b/Master/texmf-dist/tex/latex/l3packages/xtemplate/xtemplate.sty
index e054d0013c5..499b870ecf6 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-2013 The LaTeX3 Project
+%%                     (C) Copyright 2011-2014 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}[2013/12/31]
-\@ifpackagelater{expl3}{2013/12/31}
+\RequirePackage{expl3}[2014/05/05]
+\@ifpackagelater{expl3}{2014/05/05}
   {}
   {%
     \PackageError{xtemplate}{Support package l3kernel too old}
@@ -63,7 +63,7 @@
       }%
     \endinput
   }
-\GetIdInfo$Id: xtemplate.dtx 4634 2013-12-31 17:32:19Z joseph $
+\GetIdInfo$Id: xtemplate.dtx 4740 2014-05-05 14:04:24Z joseph $
   {L3 Experimental prototype document functions}
 \ProvidesExplPackage
   {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}