expl3 update (9jun10)

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

4 files changed, 387 insertions, 624 deletions

diff --git a/Master/texmf-dist/source/latex/expl3/l3.ins b/Master/texmf-dist/source/latex/expl3/l3.ins
deleted file mode 100644
index 4d6718c0431..00000000000
--- a/Master/texmf-dist/source/latex/expl3/l3.ins
+++ /dev/null
@@ -1,118 +0,0 @@
-
-\input docstrip.tex
-\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
-
-% wrapper package for the expl3 bundle
-\generate{\file{expl3.sty}{\from{expl3.dtx}{package}}}
-
-
-% l3names.sty sets up the naming scheme for TeX primitives.
-\generate{\file{l3names.sty}{\from{l3names.dtx}{package}}}
-
-
-
-% Define some basic commands to get us started with the new
-% programming style.
-\generate{\file{l3basics.sty}{\from{l3basics.dtx}{package,trace}}}
-
-
-% Define some basic commands that check various conditions
-% related to defining commands eg defined/undefined global/local
-% Not sure how much of this really makes sense as a package, but...
-\generate{\file{l3chk.sty}{\from{l3chk.dtx}{package,trace}}}
-
-
-%% toks register handling (can be compiled with check module)
-\generate{\file{l3toks.sty}{\from{l3toks.dtx}{package,trace}}}
-
-
-%% token lists
-\generate{\file{l3tl.sty}{\from{l3tl.dtx}{package,trace}}}
-
-
-%% LaTeX3 expansion module
-\generate{\file{l3expan.sty}{\from{l3expan.dtx}{package,trace}}}
-
-
-%% LaTeX3 quarks.
-\generate{\file{l3quark.sty}{\from{l3quark.dtx}{package,trace}}}
-
-
-%% LaTeX3 sequences.
-\generate{\file{l3seq.sty}{\from{l3seq.dtx}{package,trace}}}
-
-
-%% LaTeX3 clists.
-\generate{\file{l3clist.sty}{\from{l3clist.dtx}{package,trace}}}
-
-
-%% LaTeX3 property lists.
-\generate{\file{l3prop.sty}{\from{l3prop.dtx}{package,trace}}}
-
-
-%% LaTeX3 fake integer macros. --- this is still needed in places such as xor !!!
-\generate{\file{l3num.sty}{\from{l3num.dtx}{package,trace}}}
-
-%% LaTeX3 integer registers.  (can be compiled with check module)
-\generate{\file{l3int.sty}{\from{l3int.dtx}{package,trace}}}
-
-%% LaTeX3 integer expressions.
-\generate{\file{l3intexpr.sty}{\from{l3intexpr.dtx}{package,trace}}}
-
-
-%% LaTeX3 skip registers.
-\generate{\file{l3skip.sty}{\from{l3skip.dtx}{package,trace}}}
-
-
-%% LaTeX3 precompilation
-\generate{\file{l3precom.sty}{\from{l3precom.dtx}{package,precompile,trace}}}
-
-%% LaTeX3 I/O module.
-\generate{\file{l3io.sty}{\from{l3io.dtx}{package,trace}}}
-
-%% LaTeX3 program control structures (loops, booleans, ...)
-\generate{\file{l3prg.sty}{\from{l3prg.dtx}{package}}}
-
-%% LaTeX3 box module
-\generate{\file{l3box.sty}{\from{l3box.dtx}{package}}}
-
-%% LaTeX3 messages
-\generate{\file{l3msg.sty}{\from{l3msg.dtx}{package}}}
-
-%% LaTeX3 tokens
-\generate{\file{l3token.sty}{\from{l3token.dtx}{package}}}
-
-%% LaTeX3 cross references
-\generate{\file{l3xref.sty}{\from{l3xref.dtx}{package}}}
-%%\generate{\file{l3xref-test.tex}{\from{l3xref.dtx}{testfile}}}
-
-%% LaTeX3 calc module
-\generate{\file{l3calc.sty}{\from{l3calc.dtx}{package}}}
-
-%% LaTeX3 keyval modules
-\generate{\file{l3keyval.sty}{\from{l3keyval.dtx}{package}}}
-\generate{\file{l3keys.sty}{\from{l3keys.dtx}{package}}}
-
-%% LaTeX3 file loading
-\generate{\file{l3file.sty}{\from{l3file.dtx}{package}}}
-
-
-\endbatchfile
diff --git a/Master/texmf-dist/source/latex/expl3/l3basics.dtx b/Master/texmf-dist/source/latex/expl3/l3basics.dtx
index 69e40a05f59..99712ddc497 100644
--- a/Master/texmf-dist/source/latex/expl3/l3basics.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3basics.dtx
@@ -35,7 +35,7 @@
 \RequirePackage{l3names}
 %</driver|package>
 %\fi
-\GetIdInfo$Id: l3basics.dtx 1921 2010-05-22 08:28:54Z joseph $
+\GetIdInfo$Id: l3basics.dtx 1942 2010-06-07 17:06:11Z will $
        {L3 Experimental basic definitions}
 %\iffalse
 %<*driver>
@@ -743,6 +743,76 @@
 % expansion.
 % \end{function}
 %
+%
+%
+%
+%
+%
+%
+% \subsection{Defining new functions using the signature}
+%
+%
+% \begin{function}{\cs_new:Nn |
+%                  \cs_new:Nx |
+%                  \cs_new:cn |
+%                  \cs_new:cx
+% }
+% \begin{syntax}
+%   "\cs_new:Nn" <cs> \Arg{code}
+% \end{syntax}
+% Defines a new function, making sure that <cs> is unused so far. The
+% parameter text is automatically detected from the length of the
+% function signature. If <cs> is missing a colon in its name, an error
+% is raised.  It is under the responsibility of the programmer to name
+% the new function according to the rules laid out in the previous
+% section.  <code> is either passed literally or may be subject to
+% expansion (under the "x" variants).
+% \begin{texnote}
+% Internally, these use \TeX's "\long". These forms are
+% recommended for low-level definitions as experience has shown that "\par"
+% tokens often turn up in programming situations that wouldn't have been 
+% expected.
+% \end{texnote}
+% \end{function}
+%
+% \begin{function}{\cs_new_nopar:Nn |
+%                  \cs_new_nopar:Nx |
+%                  \cs_new_nopar:cn |
+%                  \cs_new_nopar:cx
+% }
+% \begin{syntax}
+%   "\cs_new_nopar:Nn" <cs>  \Arg{code}
+% \end{syntax}
+% Version of the above in which "\par" is not allowed to appear within the 
+% argument(s) of the defined functions.
+% \end{function}
+%
+% \begin{function}{\cs_new_protected:Nn |
+%                  \cs_new_protected:Nx |
+%                  \cs_new_protected:cn |
+%                  \cs_new_protected:cx
+% }
+% \begin{syntax}
+%   "\cs_new_protected:Nn" <cs>  \Arg{code}
+% \end{syntax}
+% Defines a function that is both robust and may contain "\par" tokens
+% in the argument(s) when called.
+% \end{function}
+%
+% \begin{function}{\cs_new_protected_nopar:Nn |
+%                  \cs_new_protected_nopar:Nx |
+%                  \cs_new_protected_nopar:cn |
+%                  \cs_new_protected_nopar:cx
+% }
+% \begin{syntax}
+%   "\cs_new_protected_nopar:Nn" <cs>  \Arg{code}
+% \end{syntax}
+% Defines a function that does not expand when inside an |x| type
+% expansion. "\par" is not allowed in the argument(s) of the defined function.
+% \end{function}
+%
+%
+%
 % \subsection{Defining functions using primitive parameter text}
 %
 %
@@ -862,6 +932,107 @@
 % \end{function}
 %
 %
+% \subsection{Defining functions using the signature (no checks)}
+%
+% As above but now detecting the parameter text from inspecting the
+% signature.
+%
+% \begin{function}{\cs_set:Nn |
+%                  \cs_set:Nx |
+%                  \cs_set:cn |
+%                  \cs_set:cx |
+% }
+% \begin{syntax}
+%   "\cs_set:Nn" <cs>  \Arg{code}
+% \end{syntax}
+% Like "\cs_set_nopar:Nn" but allows "\par" tokens in the arguments of the
+% function being defined.
+% \end{function}
+%
+% \begin{function}{\cs_gset:Nn |
+%                  \cs_gset:Nx |
+%                  \cs_gset:cn |
+%                  \cs_gset:cx |
+% }
+% \begin{syntax}
+%   "\cs_gset:Nn" <cs>  \Arg{code}
+% \end{syntax}
+% Global variant of "\cs_set:Nn".
+% \end{function}
+%
+% \begin{function}{\cs_set_nopar:Nn |
+%                  \cs_set_nopar:Nx |
+%                  \cs_set_nopar:cn |
+%                  \cs_set_nopar:cx |
+% }
+% \begin{syntax}
+%   "\cs_set_nopar:Nn" <cs>  \Arg{code}
+% \end{syntax}
+% Like "\cs_new_nopar:Nn" etc.\ but does not check the <cs> name.
+% \end{function}
+%
+% \begin{function}{\cs_gset_nopar:Nn |
+%                  \cs_gset_nopar:Nx |
+%                  \cs_gset_nopar:cn |
+%                  \cs_gset_nopar:cx |
+% }
+% \begin{syntax}
+%   "\cs_gset_nopar:Nn" <cs> \Arg{code}
+% \end{syntax}
+% Like "\cs_set_nopar:Nn" but defines the <cs> globally.
+% \end{function}
+%
+% \begin{function}{\cs_set_protected:Nn |
+%                  \cs_set_protected:cn |
+%                  \cs_set_protected:Nx |
+%                  \cs_set_protected:cx |
+% }
+% \begin{syntax}
+%   "\cs_set_protected:Nn" <cs>  \Arg{code}
+% \end{syntax}
+% Naturally robust macro that won't expand in an |x| type argument.
+% These varieties also allow |\par| tokens in the arguments of the
+% function being defined.
+% \end{function}
+%
+% \begin{function}{\cs_gset_protected:Nn |
+%                  \cs_gset_protected:cn |
+%                  \cs_gset_protected:Nx |
+%                  \cs_gset_protected:cx |
+% }
+% \begin{syntax}
+%   "\cs_gset_protected:Nn" <cs> \Arg{code}
+% \end{syntax}
+% Global versions of the above functions.
+% \end{function}
+%
+% \begin{function}{\cs_set_protected_nopar:Nn |
+%                  \cs_set_protected_nopar:cn |
+%                  \cs_set_protected_nopar:Nx |
+%                  \cs_set_protected_nopar:cx |
+% }
+% \begin{syntax}
+%   "\cs_set_protected_nopar:Nn" <cs> \Arg{code}
+% \end{syntax}
+% Naturally robust macro that won't expand in an |x| type argument.
+% This also comes as a |long| version. If you for some reason want to
+% expand it inside an |x| type expansion, prefix it with
+% |\exp_after:wN \prg_do_nothing:|.
+% \end{function}
+%
+% \begin{function}{\cs_gset_protected_nopar:Nn |
+%                  \cs_gset_protected_nopar:cn |
+%                  \cs_gset_protected_nopar:Nx |
+%                  \cs_gset_protected_nopar:cx |
+% }
+% \begin{syntax}
+%   "\cs_gset_protected_nopar:Nn" <cs>  \Arg{code}
+% \end{syntax}
+% Global versions of the above functions.
+% \end{function}
+%
+%
+%
 % \subsection{Undefining functions}
 %
 % \begin{function}{
@@ -2618,11 +2789,9 @@
 %  Don't provide a "_p" predicate because the "_bool" is used for the
 %  same thing.
 %    \begin{macrocode}
-\if_cs_exist:N \xetex_version:D
-  \cs_new_eq:NN \c_xetex_is_engine_bool \c_true_bool
-\else:
-  \cs_new_eq:NN \c_xetex_is_engine_bool \c_false_bool
-\fi:
+\cs_if_exist:NTF \xetex_version:D
+  { \cs_new_eq:NN \c_xetex_is_engine_bool \c_true_bool  }
+  { \cs_new_eq:NN \c_xetex_is_engine_bool \c_false_bool }
 \prg_new_conditional:Npnn \xetex_if_engine: {TF,T,F} {
   \if_bool:N \c_xetex_is_engine_bool
     \prg_return_true: \else: \prg_return_false: \fi:
@@ -2630,11 +2799,9 @@
 %    \end{macrocode}
 %
 %    \begin{macrocode}
-\if_cs_exist:N \luatex_directlua:D
-  \cs_new_eq:NN \c_luatex_is_engine_bool \c_true_bool
-\else:
-  \cs_new_eq:NN \c_luatex_is_engine_bool \c_false_bool
-\fi:
+\cs_if_exist:NTF \luatex_directlua:D
+  { \cs_new_eq:NN \c_luatex_is_engine_bool \c_true_bool  }
+  { \cs_new_eq:NN \c_luatex_is_engine_bool \c_false_bool }
 \prg_set_conditional:Npnn \xetex_if_engine: {TF,T,F}{
   \if_bool:N \c_xetex_is_engine_bool \prg_return_true:
   \else: \prg_return_false: \fi:
@@ -2775,6 +2942,215 @@
 % \end{macro}
 %
 %
+%
+%
+% \subsection{Using the signature to define functions}
+%
+% We can now combine some of the tools we have to provide a simple
+% interface for defining functions.  We define some simpler functions
+% with user interface |\cs_set:Nn \foo_bar:nn {#1,#2}|, i.e., the
+% number of arguments is read from the signature.
+%
+% 
+% \begin{macro}{\cs_set:Nn}
+% \begin{macro}{\cs_set:Nx}
+% \begin{macro}{\cs_set_nopar:Nn}
+% \begin{macro}{\cs_set_nopar:Nx}
+% \begin{macro}{\cs_set_protected:Nn}
+% \begin{macro}{\cs_set_protected:Nx}
+% \begin{macro}{\cs_set_protected_nopar:Nn}
+% \begin{macro}{\cs_set_protected_nopar:Nx}
+% \begin{macro}{\cs_gset:Nn}
+% \begin{macro}{\cs_gset:Nx}
+% \begin{macro}{\cs_gset_nopar:Nn}
+% \begin{macro}{\cs_gset_nopar:Nx}
+% \begin{macro}{\cs_gset_protected:Nn}
+% \begin{macro}{\cs_gset_protected:Nx}
+% \begin{macro}{\cs_gset_protected_nopar:Nn}
+% \begin{macro}{\cs_gset_protected_nopar:Nx}
+% We want to define |\cs_set:Nn| as 
+% \begin{verbatim}
+% \cs_set_protected:Npn \cs_set:Nn #1#2{
+%   \cs_generate_from_arg_count:NNnn #1\cs_set:Npn 
+%     {\cs_get_arg_count_from_signature:N #1}{#2}
+% }
+% \end{verbatim}
+% In short, to define |\cs_set:Nn| we need just use |\cs_set:Npn|,
+% everything else is the same for each variant.  Therefore, we can
+% make it simpler by temporarily defining a function to do this for
+% us.
+%    \begin{macrocode}
+\cs_set:Npn \cs_tmp:w #1#2#3{
+  \cs_set_protected:cpx {cs_#1:#2}##1##2{
+    \exp_not:N \cs_generate_from_arg_count:NNnn ##1
+    \exp_after:wN \exp_not:N \cs:w cs_#1:#3 \cs_end: 
+      {\exp_not:N\cs_get_arg_count_from_signature:N ##1}{##2}
+  }
+}
+%    \end{macrocode}
+% Then we define the 32 variants beginning with |N|. 
+%    \begin{macrocode}
+\cs_tmp:w {set}{Nn}{Npn}
+\cs_tmp:w {set}{Nx}{Npx}
+\cs_tmp:w {set_nopar}{Nn}{Npn}
+\cs_tmp:w {set_nopar}{Nx}{Npx}
+\cs_tmp:w {set_protected}{Nn}{Npn}
+\cs_tmp:w {set_protected}{Nx}{Npx}
+\cs_tmp:w {set_protected_nopar}{Nn}{Npn}
+\cs_tmp:w {set_protected_nopar}{Nx}{Npx}
+\cs_tmp:w {gset}{Nn}{Npn}
+\cs_tmp:w {gset}{Nx}{Npx}
+\cs_tmp:w {gset_nopar}{Nn}{Npn}
+\cs_tmp:w {gset_nopar}{Nx}{Npx}
+\cs_tmp:w {gset_protected}{Nn}{Npn}
+\cs_tmp:w {gset_protected}{Nx}{Npx}
+\cs_tmp:w {gset_protected_nopar}{Nn}{Npn}
+\cs_tmp:w {gset_protected_nopar}{Nx}{Npx}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\cs_new:Nn}
+% \begin{macro}{\cs_new:Nx}
+% \begin{macro}{\cs_new_nopar:Nn}
+% \begin{macro}{\cs_new_nopar:Nx}
+% \begin{macro}{\cs_new_protected:Nn}
+% \begin{macro}{\cs_new_protected:Nx}
+% \begin{macro}{\cs_new_protected_nopar:Nn}
+% \begin{macro}{\cs_new_protected_nopar:Nx}
+%    \begin{macrocode}
+\cs_tmp:w {new}{Nn}{Npn}
+\cs_tmp:w {new}{Nx}{Npx}
+\cs_tmp:w {new_nopar}{Nn}{Npn}
+\cs_tmp:w {new_nopar}{Nx}{Npx}
+\cs_tmp:w {new_protected}{Nn}{Npn}
+\cs_tmp:w {new_protected}{Nx}{Npx}
+\cs_tmp:w {new_protected_nopar}{Nn}{Npn}
+\cs_tmp:w {new_protected_nopar}{Nx}{Npx}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% Then something similar for the |c| variants. 
+% \begin{verbatim}
+% \cs_set_protected:Npn \cs_set:cn #1#2{
+%   \cs_generate_from_arg_count:cNnn {#1}\cs_set:Npn 
+%     {\cs_get_arg_count_from_signature:c {#1}}{#2}
+% }
+% \end{verbatim}
+%    \begin{macrocode}
+\cs_set:Npn \cs_tmp:w #1#2#3{
+  \cs_set_protected:cpx {cs_#1:#2}##1##2{
+    \exp_not:N\cs_generate_from_arg_count:cNnn {##1}
+    \exp_after:wN \exp_not:N \cs:w cs_#1:#3 \cs_end: 
+      {\exp_not:N\cs_get_arg_count_from_signature:c {##1}}{##2}
+  }
+}
+%    \end{macrocode}
+% \begin{macro}{\cs_set:cn}
+% \begin{macro}{\cs_set:cx}
+% \begin{macro}{\cs_set_nopar:cn}
+% \begin{macro}{\cs_set_nopar:cx}
+% \begin{macro}{\cs_set_protected:cn}
+% \begin{macro}{\cs_set_protected:cx}
+% \begin{macro}{\cs_set_protected_nopar:cn}
+% \begin{macro}{\cs_set_protected_nopar:cx}
+% \begin{macro}{\cs_gset:cn}
+% \begin{macro}{\cs_gset:cx}
+% \begin{macro}{\cs_gset_nopar:cn}
+% \begin{macro}{\cs_gset_nopar:cx}
+% \begin{macro}{\cs_gset_protected:cn}
+% \begin{macro}{\cs_gset_protected:cx}
+% \begin{macro}{\cs_gset_protected_nopar:cn}
+% \begin{macro}{\cs_gset_protected_nopar:cx}
+% The 32 |c| variants.
+%    \begin{macrocode}
+\cs_tmp:w {set}{cn}{Npn}
+\cs_tmp:w {set}{cx}{Npx}
+\cs_tmp:w {set_nopar}{cn}{Npn}
+\cs_tmp:w {set_nopar}{cx}{Npx}
+\cs_tmp:w {set_protected}{cn}{Npn}
+\cs_tmp:w {set_protected}{cx}{Npx}
+\cs_tmp:w {set_protected_nopar}{cn}{Npn}
+\cs_tmp:w {set_protected_nopar}{cx}{Npx}
+\cs_tmp:w {gset}{cn}{Npn}
+\cs_tmp:w {gset}{cx}{Npx}
+\cs_tmp:w {gset_nopar}{cn}{Npn}
+\cs_tmp:w {gset_nopar}{cx}{Npx}
+\cs_tmp:w {gset_protected}{cn}{Npn}
+\cs_tmp:w {gset_protected}{cx}{Npx}
+\cs_tmp:w {gset_protected_nopar}{cn}{Npn}
+\cs_tmp:w {gset_protected_nopar}{cx}{Npx}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+% \begin{macro}{\cs_new:cn}
+% \begin{macro}{\cs_new:cx}
+% \begin{macro}{\cs_new_nopar:cn}
+% \begin{macro}{\cs_new_nopar:cx}
+% \begin{macro}{\cs_new_protected:cn}
+% \begin{macro}{\cs_new_protected:cx}
+% \begin{macro}{\cs_new_protected_nopar:cn}
+% \begin{macro}{\cs_new_protected_nopar:cx}
+%    \begin{macrocode}
+\cs_tmp:w {new}{cn}{Npn}
+\cs_tmp:w {new}{cx}{Npx}
+\cs_tmp:w {new_nopar}{cn}{Npn}
+\cs_tmp:w {new_nopar}{cx}{Npx}
+\cs_tmp:w {new_protected}{cn}{Npn}
+\cs_tmp:w {new_protected}{cx}{Npx}
+\cs_tmp:w {new_protected_nopar}{cn}{Npn}
+\cs_tmp:w {new_protected_nopar}{cx}{Npx}
+%    \end{macrocode}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+% \end{macro}
+%
+%
+%
+%
+%
+%
 % \begin{macro}{\cs_if_eq_p:NN,\cs_if_eq_p:cN,\cs_if_eq_p:Nc,\cs_if_eq_p:cc}
 % \begin{macro}[TF]{\cs_if_eq:NN,\cs_if_eq:cN,\cs_if_eq:Nc,\cs_if_eq:cc}
 % Check if two control sequences are identical.
diff --git a/Master/texmf-dist/source/latex/expl3/l3format.ins b/Master/texmf-dist/source/latex/expl3/l3format.ins
deleted file mode 100644
index fc3e62d85f0..00000000000
--- a/Master/texmf-dist/source/latex/expl3/l3format.ins
+++ /dev/null
@@ -1,81 +0,0 @@
-
-\input docstrip.tex
-\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 the format file
-\generate{%
-   \file{latex3.ltx}{%
-     \from{l3names.dtx}{initex}   % The naming conventions
-     \from{l3basics.dtx}{initex}  % Initialisations
-     \from{l3expan.dtx}{initex}   % Controlling expansion of arguments
-     \from{l3tl.dtx}{initex}      % token list variables
-     \from{l3intexpr.dtx}{initex} %
-     \from{l3quark.dtx}{initex}   % quarks
-     \from{l3seq.dtx}{initex}     % Sequences and stacks
-%
-     \from{l3alloc.dtx}{initex}   % Register allocations
-%
-     \from{l3toks.dtx}{initex}    % dealing with token registers
-     \from{l3int.dtx}{initex}     % dealing with integer registers
-     \from{l3prg.dtx}{initex}     % Program control structures
-     \from{l3clist.dtx}{initex}   % Comma separated lists
-     \from{l3token.dtx}{initex}   % token investigation
-     \from{l3prop.dtx}{initex}    % property lists
-     \from{l3msg.dtx}{initex}     % setting up for user communication
-     \from{l3io.dtx}{initex}      % dealing with I/O
-     \from{l3skip.dtx}{initex}    % dealing with skip registers
-     \from{l3box.dtx}{initex}     % dealing with box registers   
-     \from{l3keyval.dtx}{initex}  %
-     \from{l3keys.dtx}{initex}    %
-%
-%     \from{l3precom.dtx}{initex,precompile} %
-%     
-     \from{l3calc.dtx}{initex}    %
-     \from{l3xref.dtx}{initex}    % Cross references  
-     \from{l3file.dtx}{initex}    % file loading
-%
-     \from{l3vers.dtx}{initex}   % Version information
-%
-%
-%     \from{l3chk.dtx}{initex}    % Checking functions
-%
-     \from{l3final.dtx}{initex}  % Final wrap-up
-   }
-}
-
-% generate higher-level material
-\generate{%
-  \file{xparse.ltx}{\from{xparse.dtx}{initex}}
-  \file{xtemplate.ltx}{\from{xtemplate.dtx}{initex}}
-}
-
-\Msg{}
-\Msg{*************************************}
-\Msg{*}
-\Msg{*  Now run (PDF)INITEX on lbase.ltx}
-\Msg{*}
-\Msg{*  On an up to date system, run }
-\Msg{*  pdftex -ini -etex *latex3.ltx }
-\Msg{*}
-\Msg{*************************************}
-\Msg{}
-
-\endbatchfile
diff --git a/Master/texmf-dist/source/latex/expl3/source3.tex b/Master/texmf-dist/source/latex/expl3/source3.tex
deleted file mode 100644
index bb530ae9b02..00000000000
--- a/Master/texmf-dist/source/latex/expl3/source3.tex
+++ /dev/null
@@ -1,414 +0,0 @@
-% \iffalse
-%% File: source3.dtx Copyright (C) 1990-2009 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 ``expl3 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.
-%%
-%% -----------------------------------------------------------------------
-%%
-%% The development version of the bundle can be found at
-%%
-%%    http://www.latex-project.org/svnroot/experimental/trunk/
-%%
-%% for those people who are interested.
-%%
-%%%%%%%%%%%
-%% NOTE: %%
-%%%%%%%%%%%
-%%
-%%   Snapshots taken from the repository represent work in progress and may
-%%   not work or may contain conflicting material!  We therefore ask
-%%   people _not_ to put them into distributions, archives, etc. without
-%%   prior consultation with the LaTeX Project Team.
-%%
-%% -----------------------------------------------------------------------
-%% \fi
-
-% This document will typeset the LaTeX3 sources as a single document.
-% This will produce quite a large file (roughly ??? pages) and may
-% take a long time on a slow machine.
-
-\documentclass{l3doc}
-\listfiles
-
-\begin{document}
-
-\title{The \LaTeX3 Sources}
-\author{\Team}
-
-
-\pagenumbering{roman}
-\maketitle
-
-\begin{abstract}
-
-\parindent=0pt
-\parskip=\baselineskip
-
-\noindent This is the reference documentation for the \pkg{expl3} 
-programming environment. The \pkg{expl3} modules set up an experimental
-naming scheme for \LaTeX\ commands, which allow the \LaTeX\ programmer
-to systematically name functions and variables, and specify the argument
-types of functions.
-
-The \TeX\ and \eTeX\ primitives are all given a new name according to
-these conventions. However, in the main direct use of the primitives is
-not required or encouraged: the \pkg{expl3} modules define an
-independent low-level \LaTeX3 programming language.
-
-At present, the \pkg{expl3} modules are designed to be loaded on top of
-\LaTeXe. In time, a \LaTeX3 format will be produced based on this code.
-This allows the code to be used in \LaTeXe\ packages \emph{now} while a
-stand-alone \LaTeX3 is developed.
-
-\begin{bfseries}
-  While \pkg{expl3} is still experimental, the bundle is now regarded as
-  broadly stable. The syntax conventions and functions provided are now
-  ready for wider use. There may still be changes to some functions, but
-  these will be minor when compared to the scope of \pkg{expl3}.
-
-  New modules will be added to the distributed version of \pkg{expl3} as
-  they reach maturity.
-\end{bfseries}
-
-\end{abstract}
-
-\clearpage
-
-{\def\\{:}% fix "newlines" in the ToC
-\tableofcontents}
-
-\clearpage
-\pagenumbering{arabic}
-
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-% Each of the following \DocInput lines includes a file with extension
-% .dtx. Each of these files may be typeset separately. For instance
-%   pdflatex l3box.dtx
-% will typeset the source of the LaTeX3 box commands. If you use the
-% Makefile, the index will be generated automatically; e.g.,
-%   make doc F=l3box
-%
-% If this file is processed, each of these separate dtx files will be
-% contained as a part of a single document.
-
-\makeatletter
-\def\partname{Part}
-\def\maketitle{\part{\@title}}
-\let\thanks\@gobble
-\let\DelayPrintIndex\PrintIndex
-\let\PrintIndex\@empty
-\makeatother
-
-\part{Introduction to \pkg{expl3} and this document}
-
-This document is intended to act as a comprehensive reference manual 
-for the \pkg{expl3} language. A general guide to the \LaTeX3 
-programming language is found in \href{expl3.pdf}{expl3.pdf}.
-
-\section{Naming functions and variables} 
-
-\LaTeX3 does not use \texttt{@} as a ``letter'' for defining
-internal macros.  Instead, the symbols |_| and \texttt{:}
-are used in internal macro names to provide structure. The name of
-each \emph{function} is divided into logical units using \texttt{_}, 
-while \texttt{:} separates the \emph{name} of the function from the 
-\emph{argument specifier} (``arg-spec''). This describes the arguments 
-expected by the function. In most cases, each argument is represented 
-by a single letter. The complete list of arg-spec letters for a function
-is referred to as the \emph{signature} of the function.
-
-Each function name starts with the \emph{module} to which it belongs.
-Thus apart from a small number of very basic functions, all \pkg{expl3}
-function names contain at least one underscore to divide the module
-name from the descriptive name of the function. For example, all
-functions concerned with comma lists are in module \texttt{clist} and
-begin \cs{clist_}.
-
-Every function must include an argument specifier. For functions which
-take no arguments, this will be blank and the function name will end
-\texttt{:}. Most functions take one or more arguments, and use the
-following argument specifiers:
-\begin{description}
-  \item[\texttt{D}] The \texttt{D} specifier means \emph{do not use}. 
-    All of the \TeX\ primitives are initially \cs{let} to a \texttt{D}
-    name, and some are then given a second name.  Only the kernel 
-    team should use anything with a \texttt{D} specifier!
-  \item[\texttt{N} and \texttt{n}] These mean \emph{no manipulation},
-    of a single token for \texttt{N} and of a set of tokens given in 
-    braces for \texttt{n}. Both pass the argument though exactly as 
-    given. Usually, if you use a single token for an \texttt{n} argument, 
-    all will be well.
-  \item[\texttt{c}] This means \emph{csname}, and indicates that the 
-    argument will be turned into a csname before being used. So
-    So \cs{foo:c} |{ArgumentOne}| will act in the same way as \cs{foo:N}
-    \cs{ArgumentOne}.
-  \item[\texttt{V} and \texttt{v}] These mean \emph{value 
-    of variable}. The \texttt{V} and \texttt{v} specifiers are used to 
-    get the content of a variable without needing to worry about the
-    underlying \TeX\ structure containing the data. A \texttt{V} 
-    argument will be a single token (similar to \texttt{N}), for example
-    \cs{foo:V} \cs{MyVariable}; on the other hand, using \texttt{v} a 
-    csname is constructed first, and then the value is recovered, for 
-    example \cs{foo:v} |{MyVariable}|.
-  \item[\texttt{o}] This means \emph{expansion once}. In general, the
-    \texttt{V} and \texttt{v} specifiers are favoured over \texttt{o}
-    for recovering stored information. However, \texttt{o} is useful
-    for correctly processing information with delimited arguments.
-  \item[\texttt{x}] The \texttt{x} specifier stands for \emph{exhaustive 
-    expansion}: the plain \TeX\ \cs{edef}.
-  \item[\texttt{f}] The \texttt{f} specifier stands for \emph{full 
-    expansion}, and in contrast to \emph{x} stops at the first 
-    non-expandable item without trying to execute it.
-  \item[\texttt{T} and \texttt{F}] For logic tests, there are the branch
-    specifiers \texttt{T} (\emph{true}) and \texttt{F} (\emph{false}). 
-    Both specifiers treat the input in the same way as \texttt{n} (no 
-    change), but make the logic much easier to see.
-  \item[\texttt{p}] The letter \texttt{p} indicates \TeX\ 
-    \emph{parameters}. Normally this will be used for delimited 
-    functions as \pkg{expl3} provides better methods for creating simple
-    sequential arguments.    
-  \item[\texttt{w}] Finally, there is the \texttt{w} specifier for 
-    \emph{weird} arguments. This covers everything else, but mainly 
-    applies to delimited values (where the argument must be terminated 
-    by some arbitrary string).
-\end{description}
-Notice that the argument specifier describes how the argument is 
-processed prior to being passed to the underlying function. For example,
-\cs{foo:c} will take its argument, convert it to a control sequence and
-pass it to \cs{foo:N}.
-
-Variables are named in a similar manner to functions, but begin with
-a single letter to define the type of variable:
-\begin{description}
-  \item[\texttt{c}] Constant: global parameters whose value should not
-    be changed.
-  \item[\texttt{g}] Parameters whose value should only be set globally.
-  \item[\texttt{l}] Parameters whose value should only be set locally.
-\end{description}
-Each variable name is then build up in a similar way to that of a 
-function, typically starting with the module\footnote{The module names are
-  not used in case of generic scratch registers defined in the data
-  type modules, e.g., the
-  \texttt{int} module contains some scratch variables called \cs{l_tmpa_int},
-  \cs{l_tmpb_int}, and so on. In such a case adding the module name up front
-  to denote the module
-  and in the back to indicate the type, as in
-  \cs{l_int_tmpa_int} would be very unreadable.}  name
-and then a descriptive part.
-Variables end with a short identifier to show the variable type:
-\begin{description}
-  \item[\texttt{bool}] Either true or false.
-  \item[\texttt{box}] Box register.
-  \item[\texttt{clist}] Comma separated list.
-  \item[\texttt{dim}] `Rigid' lengths.
-  \item[\texttt{int}] Integer-valued count register.
-  \item[\texttt{num}] A `fake' integer type using only macros. Useful for
-    setting up allocation routines.
-  \item[\texttt{prop}] Property list.
-  \item[\texttt{skip}] `Rubber' lengths.
-  \item[\texttt{seq}] `Sequence': a data-type used to implement lists 
-    (with access at both ends) and stacks.
-  \item[\texttt{stream}] An input or output stream (for reading from or 
-    writing to, respectively).
-  \item[\texttt{tl}] Token list variables: placeholder for a token list.
-  \item[\texttt{toks}] Token register.
-\end{description}
-
-\subsubsection{Terminological inexactitude}
-
-A word of warning. In this document, and others referring to the \pkg{expl3}
-programming modules, we often refer to `variables' and `functions' as if
-they were actual constructs from a real programming language.
-In truth, \TeX\ is a macro processor, and functions are simply macros that
-may or mayn't take arguments and expand to their replacement text.
-Many of the common variables are \emph{also} macros, and if placed into the
-input stream will simply expand to their definition as well~--- a `function'
-with no arguments and a `token list variable' are in truth one and the same.
-On the other hand, some `variables' are actually registers that must be initialised and their values set and retreived with specific functions.
-
-The conventions of the \pkg{expl3} code are designed to clearly separate the
-ideas of `macros that contain data' and `macros that contain code', and a consistent wrapper is applied to all forms of `data' whether they be macros or actually registers.
-This means that sometimes we will use phrases like `the function returns a value', when actually we just mean `the macro expands to something'. Similarly, the term `execute' might be used in place of `expand' or it might refer to the more specific case of `processing in \TeX's stomach' (if you are familiar with the \TeX{}book parlance).
-
-If in doubt, please ask; chances are we've been hasty in writing certain definitions and need to be told to tighten up our terminology. 
-
-\section{Documentation conventions}
-
-This document is typeset with the experimental \pkg{l3doc} class; 
-several conventions are used to help describe the features of the code.
-A number of conventions are used here to make the documentation clearer.
-
-Each group of related functions is given in a box. For a function with
-a ``user'' name, this might read:
-\begin{function}{
-    \ExplSyntaxOn |
-    \ExplSyntaxOff
-  }
-  \begin{syntax}
-    "\ExplSyntaxOn" \dots\ "\ExplSyntaxOff"
-  \end{syntax}
-  The textual description of how the function works would appear here. The 
-  syntax of the function is shown in mono-spaced text to the right of 
-  the box. In this example, the function takes no arguments and so the 
-  name of the function is simply reprinted.
-\end{function}
-
-For programming functions, which use \texttt{_} and \texttt{:} in their
-name there are a few additional conventions: If two related functions are given with identical names but 
-different argument specifiers, these are termed \emph{variants} of each 
-other, and the latter functions are printed in grey to show this more 
-clearly. They will carry out the same function but will take different
-types of argument:
-\begin{function}{
-    \seq_new:N |
-    \seq_new:c
-  }
-  \begin{syntax}
-    "\seq_new:N" <sequence>
-  \end{syntax}
-  When a number of variants are described, the arguments are usually
-  illustrated only for the base function. Here, <sequence> indicates 
-  that \cs{seq_new:N} expects the name of a sequence. From the argument
-  specifier, \cs{seq_new:c} also expects a sequence name, but as a 
-  name rather than as a control sequence. Each argument given in the
-  illustration should be described in the following text.
-\end{function}
-
-Some functions are fully expandable, which allows it to be used within 
-an \texttt{x}-type argument (in plain \TeX\ terms, inside an \cs{edef}).
-These fully expandable functions are indicated in the documentation by 
-a star:
-\begin{function}{
-    \cs_to_str:N / (EXP)
-  }
-  \begin{syntax}
-    "\cs_to_str:N" <cs>
-  \end{syntax}
-  As with other functions, some text should follow which explains how
-  the function works. Usually, only the star will indicate that the 
-  function is expandable. In this case, the function expects a <cs>, 
-  shorthand for a <control sequence>. 
-\end{function}
-
-Conditional (\texttt{if}) functions are normally defined in three variants, with
-\texttt{T}, \texttt{F} and \texttt{TF} argument specifiers. This allows
-them to be used for different `true'/`false' branches, depending on 
-which outcome the conditional is being used to test. To indicate this 
-without repetition, this information is given in a shortened form:
-\begin{function}{
-    \xetex_if_engine: / (TF) (EXP)
-  }
-  \begin{syntax}
-    "\xetex_if_engine:TF" <true code> <false code>
-  \end{syntax}
-  The underlining and italic of \texttt{TF} indicates that 
-  \cs{xetex_if_engine:T}, \cs{xetex_if_engine:F} and 
-  \cs{xetex_if_engine:TF} are all available. Usually, the illustration 
-  will use the \texttt{TF} variant, and so both <true code>
-  and <false code> will be shown. The two variant forms \texttt{T} and
-  \texttt{F} take only <true code> and <false code>, respectively.
-  Here, the star also shows that this function is expandable.
-  With some minor exceptions, \emph{all} conditional functions in the 
-  \pkg{expl3} modules should be defined in this way.
-\end{function}
-
-Variables, constants and so on are described in a similar manner:
-\begin{variable}{
-    \l_tmpa_tl
-  }
-  A short piece of text will describe the variable: there is no 
-  syntax illustration in this case.
-\end{variable}
-
-In some cases, the function is similar to one in \LaTeXe\ or plain \TeX.
-In these cases, the text will include an extra `\textbf{\TeX{}hackers 
-note}' section:
-\begin{function}{
-    \token_to_str:N / (EXP)
-  }
-  \begin{syntax}
-    "\token_to_str:N" <token> 
-  \end{syntax}
-  The normal description text.
-  \begin{texnote}
-    Detail for the experienced \TeX\ or \LaTeXe\ programmer. In this 
-    case, it would point out that this function is the \TeX\ primitive
-    \cs{string}.
-  \end{texnote}
-\end{function}
-
-\DisableImplementation
-
-\DocInput{l3names.dtx}
-
-\DocInput{l3basics.dtx}
-\DocInput{l3expan.dtx}
-\DocInput{l3prg.dtx}
-\DocInput{l3quark.dtx}
-\DocInput{l3token.dtx}
-
-\DocInput{l3int.dtx}
-\DocInput{l3intexpr.dtx}
-\DocInput{l3skip.dtx}
-
-\DocInput{l3tl.dtx}
-\DocInput{l3toks.dtx}
-\DocInput{l3seq.dtx}
-\DocInput{l3clist.dtx}
-\DocInput{l3prop.dtx}
-
-\DocInput{l3io.dtx}
-\DocInput{l3msg.dtx}
-\DocInput{l3box.dtx}
-\DocInput{l3xref.dtx}
-\DocInput{l3keyval.dtx}
-\DocInput{l3keys.dtx}
-\DocInput{l3calc.dtx}
-\DocInput{l3file.dtx}
-
-% \DocInput{l3precom.dtx}
-% \DocInput{l3alloc.dtx}
-% \DocInput{l3chk.dtx}
-
-\part{Implementation}
-\def\maketitle{}
-\EnableImplementation
-\DisableDocumentation
-\DocInputAgain
-
-%% \DocInput{l3vers.dtx}   % Current version date
-
-\clearpage
-\pagestyle{headings}
-
-% Make TeX shut up.
-\hbadness=10000
-\newcount\hbadness
-\hfuzz=\maxdimen
-
-\PrintChanges
-\clearpage
-
-\begingroup
-\def\endash{--}
-\catcode`\-\active
-\def-{\futurelet\temp\indexdash}
-\def\indexdash{\ifx\temp-\endash\fi}
-
-\DelayPrintIndex
-\endgroup
-
-\end{document}
-
-