l3kernel

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

4 files changed, 12 insertions, 193 deletions

diff --git a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
index b7a91c8d848..176bf791101 100644
--- a/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/expl3.dtx
@@ -49,8 +49,8 @@
 %<*driver|package>
 \def\ExplFileName{expl3}
 \def\ExplFileDescription{L3 Experimental code bundle wrapper}
-\def\ExplFileDate{2013/03/12}
-\def\ExplFileVersion{4467}
+\def\ExplFileDate{2013/03/14}
+\def\ExplFileVersion{4469}
 %</driver|package>
 %<*driver>
 \documentclass[full]{l3doc}
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3.ins b/Master/texmf-dist/source/latex/l3kernel/l3.ins
deleted file mode 100644
index b869a70fee5..00000000000
--- a/Master/texmf-dist/source/latex/l3kernel/l3.ins
+++ /dev/null
@@ -1,93 +0,0 @@
-\iffalse meta-comment
-
-File l3.ins Copyright (C) 2011,2012 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
-license or (at your option) any later version.  The latest version
-of this license is in the file
-
-   http://www.latex-project.org/lppl.txt
-
-This file is part of the "l3kernel bundle" (The Work in LPPL)
-and all files in that bundle must be distributed together.
-
-The released version of this bundle is available from CTAN.
-
-\fi
-
-\let\jobname\relax
-\input l3docstrip.dtx
-\askforoverwritefalse
-
-\preamble
-
-EXPERIMENTAL CODE
-
-Do not distribute this file without also distributing the
-source files specified above.
-
-Do not distribute a modified version of this file.
-
-\endpreamble
-% stop docstrip adding \endinput
-\postamble
-\endpostamble
-
-\keepsilent
-
-% ===== PACKAGE ONLY ======
-\generate{\file{expl3.sty}       {\from{expl3.dtx}      {package}}}
-% ========================
-\generate{\file{l3bootstrap.sty} {\from{l3bootstrap.dtx}{package}}}
-\generate{\file{l3names.sty}     {\from{l3names.dtx}    {package}}}
-\generate{\file{l3basics.sty}    {\from{l3basics.dtx}   {package}}}
-\generate{\file{l3expan.sty}     {\from{l3expan.dtx}    {package}}}
-\generate{\file{l3tl.sty}        {\from{l3tl.dtx}       {package}}}
-\generate{\file{l3seq.sty}       {\from{l3seq.dtx}      {package}}}
-\generate{\file{l3int.sty}       {\from{l3int.dtx}      {package}}}
-\generate{\file{l3quark.sty}     {\from{l3quark.dtx}    {package}}}
-\generate{\file{l3prg.sty}       {\from{l3prg.dtx}      {package}}}
-\generate{\file{l3clist.sty}     {\from{l3clist.dtx}    {package}}}
-\generate{\file{l3token.sty}     {\from{l3token.dtx}    {package}}}
-\generate{\file{l3prop.sty}      {\from{l3prop.dtx}     {package}}}
-\generate{\file{l3msg.sty}       {\from{l3msg.dtx}      {package}}}
-\generate{\file{l3file.sty}      {\from{l3file.dtx}     {package}}}
-\generate{\file{l3skip.sty}      {\from{l3skip.dtx}     {package}}}
-\generate{\file{l3keys.sty}      {\from{l3keys.dtx}     {package}}}
-\generate
-  {%
-    \file{l3fp.sty}
-      {%
-        \from{l3fp.dtx}         {package}
-        \from{l3fp-aux.dtx}     {package}
-        \from{l3fp-traps.dtx}   {package}
-        \from{l3fp-round.dtx}   {package}
-        \from{l3fp-parse.dtx}   {package}
-        \from{l3fp-logic.dtx}   {package}
-        \from{l3fp-basics.dtx}  {package}
-        \from{l3fp-extended.dtx}{package}
-        \from{l3fp-expo.dtx}    {package}
-        \from{l3fp-trig.dtx}    {package}
-        \from{l3fp-convert.dtx} {package}
-        \from{l3fp-assign.dtx}  {package}
-        \from{l3fp-old.dtx}     {package}
-      }%
-  }
-\generate{\file{l3box.sty}       {\from{l3box.dtx}       {package}}}
-\generate{\file{l3coffins.sty}   {\from{l3coffins.dtx}   {package}}}
-\generate{\file{l3color.sty}     {\from{l3color.dtx}     {package}}}
-\generate{\file{l3luatex.sty}    {\from{l3luatex.dtx}    {package}}}
-\generate{\file{l3candidates.sty}{\from{l3candidates.dtx}{package}}}
-
-\generate{\file{l3doc.cls}       {\from{l3doc.dtx}       {class}}}
-\generate{\file{l3doc.ist}       {\from{l3doc.dtx}       {docist}}}
-
-\generate{\file{l3dvipdfmx.def}  {\from{l3drivers.dtx}   {package,dvipdfmx} }}
-\generate{\file{l3dvips.def}     {\from{l3drivers.dtx}   {package,dvips}    }}
-\generate{\file{l3pdfmode.def}   {\from{l3drivers.dtx}   {package,pdfmode}  }}
-\generate{\file{l3xdvipdfmx.def} {\from{l3drivers.dtx}   {package,xdvipdfmx}}}
-
-\generate{\file{l3docstrip.tex}  {\from{l3docstrip.dtx}  {program}}}
-
-\endbatchfile
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
index 88a4d9898b5..e144922e224 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3candidates.dtx
@@ -36,7 +36,7 @@
 %
 %<*driver|package>
 \RequirePackage{l3bootstrap}
-\GetIdInfo$Id: l3candidates.dtx 4466 2013-03-09 14:58:43Z joseph $
+\GetIdInfo$Id: l3candidates.dtx 4468 2013-03-14 20:30:45Z joseph $
   {L3 Experimental additions to l3kernel}
 %</driver|package>
 %<*driver>
@@ -2260,7 +2260,8 @@
 % \end{macro}
 %
 % \begin{macro}[EXP]{\prop_get:Nn, \prop_get:cn}
-% \begin{macro}[aux]{\@@_get_Nn:nwn}
+% \begin{macro}[aux, EXP]{\@@_get:Nn, \@@_get:No}
+% \begin{macro}[aux, EXP]{\@@_get_Nn:nwn}
 %   Getting the value corresponding to a key in a property list in an
 %   expandable fashion is a simple instance of mapping some tokens.
 %   Map the function \cs{prop_get:nnn} which takes as its three
@@ -2270,13 +2271,15 @@
 %   to nothing.
 %    \begin{macrocode}
 \cs_new:Npn \prop_get:Nn #1#2
+  { \@@_get:No #1 { \tl_to_str:n {#2} } }
+\cs_new:Npn \@@_get:Nn #1#2
   {
-    \exp_last_unbraced:Noo \@@_get_Nn:nwn
-      { \tl_to_str:n {#2} } #1
-      \tl_to_str:n {#2} \q_@@ { }
+    \exp_last_unbraced:Nno \@@_get_Nn:nwn {#2} #1
+      \s_@@ #2 \s_@@ { }
     \__prg_break_point:
   }
-\cs_new:Npn \@@_get_Nn:nwn #1 \q_@@ #2 \q_@@ #3
+\cs_generate_variant:Nn \@@_get:Nn { No }
+\cs_new:Npn \@@_get_Nn:nwn #1 \s_@@ #2 \s_@@ #3
   {
     \str_if_eq_x:nnTF {#1} {#2}
       { \__prg_break:n { \exp_not:n {#3} } }
@@ -2286,6 +2289,7 @@
 %    \end{macrocode}
 % \end{macro}
 % \end{macro}
+% \end{macro}
 %
 % \subsection{Additions to \pkg{l3seq}}
 %
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3format.ins b/Master/texmf-dist/source/latex/l3kernel/l3format.ins
deleted file mode 100644
index 76fe0ee3e76..00000000000
--- a/Master/texmf-dist/source/latex/l3kernel/l3format.ins
+++ /dev/null
@@ -1,92 +0,0 @@
-\iffalse meta-comment
-
-File l3format.ins Copyright (C) 2011,2012 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
-license or (at your option) any later version.  The latest version
-of this license is in the file
-
-   http://www.latex-project.org/lppl.txt
-
-This file is part of the "l3kernel bundle" (The Work in LPPL)
-and all files in that bundle must be distributed together.
-
-The released version of this bundle is available from CTAN.
-
-\fi
-
-\let\jobname\relax
-\input l3docstrip.dtx
-\askforoverwritefalse
-
-\preamble
-
-EXPERIMENTAL CODE
-
-Do not distribute this file without also distributing the
-source files specified above.
-
-Do not distribute a modified version of this file.
-
-\endpreamble
-% stop docstrip adding \endinput
-\postamble
-\endpostamble
-
-\keepsilent
-
-\generate
-  {
-  \file{l3format.ltx}
-    {
-        \from{l3bootstrap.dtx}  {initex}
-        \from{l3names.dtx}      {initex}
-        \from{l3basics.dtx}     {initex}
-        \from{l3expan.dtx}      {initex}
-        \from{l3tl.dtx}         {initex}
-        \from{l3seq.dtx}        {initex}
-        % ===== ===FORMAT ONLY =========
-        \from{l3alloc.dtx}      {initex}
-        % ==============================
-        \from{l3int.dtx}        {initex}
-        \from{l3quark.dtx}      {initex}
-        \from{l3prg.dtx}        {initex}
-        \from{l3clist.dtx}      {initex}
-        \from{l3token.dtx}      {initex}
-        \from{l3prop.dtx}       {initex}
-        \from{l3msg.dtx}        {initex}
-        \from{l3file.dtx}       {initex}
-        \from{l3skip.dtx}       {initex}
-        \from{l3keys.dtx}       {initex}
-        \from{l3fp.dtx}         {initex}
-        \from{l3fp-aux.dtx}     {initex}
-        \from{l3fp-traps.dtx}   {initex}
-        \from{l3fp-round.dtx}   {initex}
-        \from{l3fp-parse.dtx}   {initex}
-        \from{l3fp-logic.dtx}   {initex}
-        \from{l3fp-basics.dtx}  {initex}
-        \from{l3fp-extended.dtx}{initex}
-        \from{l3fp-expo.dtx}    {initex}
-        \from{l3fp-trig.dtx}    {initex}
-        \from{l3fp-convert.dtx} {initex}
-        \from{l3fp-assign.dtx}  {initex}
-        \from{l3fp-old.dtx}     {initex}
-        \from{l3box.dtx}        {initex}
-        \from{l3coffins.dtx}    {initex}
-        \from{l3color.dtx}      {initex}
-        \from{l3luatex.dtx}     {initex}
-        \from{l3candidates.dtx} {initex}
-        % ======== FORMAT ONLY =========
-        \from{l3final.dtx}      {initex}
-        % ==============================
-      }
-  }
-
-\generate{\file{l3dvips.ltx}    {\from{l3drivers.dtx}{initex,dvips}    }}
-\generate{\file{l3pdfmode.ltx}  {\from{l3drivers.dtx}{initex,pdfmode}  }}
-\generate{\file{l3xdvipdfmx.ltx}{\from{l3drivers.dtx}{initex,xdvipdfmx}}}
-
-\generate{\file{l3docstrip.tex}{\from{l3docstrip.dtx}{program}}}
-
-\endbatchfile
\ No newline at end of file