summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3expan.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3expan.dtx26
1 files changed, 12 insertions, 14 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
index 8e14807cfcf..5c853a3a321 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3expan.dtx
@@ -34,8 +34,8 @@
%% -----------------------------------------------------------------------
%
%<*driver|package>
-\RequirePackage{l3names}
-\GetIdInfo$Id: l3expan.dtx 3986 2012-07-15 19:23:51Z joseph $
+\RequirePackage{l3bootstrap}
+\GetIdInfo$Id: l3expan.dtx 4073 2012-08-10 01:33:13Z bruno $
{L3 Argument expansion}
%</driver|package>
%<*driver>
@@ -103,7 +103,7 @@
% how the variants are defined. They just expand into the appropriate
% |\exp_| function followed by the desired base function, \emph{e.g.}
% \begin{quote}
-% |\cs_new_nopar:Npn\seq_gpush:No{\exp_args:NNo\seq_gpush:Nn}|
+% |\cs_new_nopar:Npn \seq_gpush:No { \exp_args:NNo \seq_gpush:Nn }|
% \end{quote}
% Providing variants in this way in style files is uncritical as the
% \cs{cs_new_nopar:Npn} function will silently accept definitions whenever the
@@ -200,7 +200,7 @@
% \meta{tl~var}. In this example we assume |\l_tmpa_tl| contains
% the text string |lur|. The straightforward approach is
% \begin{quote}
-% |\tl_set:No \l_tmpb_tl {\cs_set_eq:Nc \aaa { b \l_tmpa_tl b } }|
+% |\tl_set:No \l_tmpb_tl { \cs_set_eq:Nc \aaa { b \l_tmpa_tl b } }|
% \end{quote}
% Unfortunately this only puts
% |\exp_args:NNc \cs_set_eq:NN \aaa {b \l_tmpa_tl b}| into |\l_tmpb_tl|
@@ -208,7 +208,7 @@
% \cs{tl_set:Nx} is not an option as that will die horribly. Instead
% we can do a
% \begin{quote}
-% |\tl_set:Nf \l_tmpb_tl {\cs_set_eq:Nc \aaa { b \l_tmpa_tl b } }|
+% |\tl_set:Nf \l_tmpb_tl { \cs_set_eq:Nc \aaa { b \l_tmpa_tl b } }|
% \end{quote}
% which puts the desired result in |\l_tmpb_tl|. It requires
% \cs{tl_set:Nf} to be defined as
@@ -443,7 +443,7 @@
% }
% \begin{syntax}
% \cs{exp_last_unbraced:Nno} \meta{token} \meta{tokens_1} \meta{tokens_2}
-% \end{syntax}
+% \end{syntax}
% These functions absorb the number of arguments given by their
% specification, carry out the expansion
% indicated and leave the the results in the input stream, with the
@@ -462,7 +462,7 @@
% \begin{function}{\exp_last_unbraced:Nx}
% \begin{syntax}
% \cs{exp_last_unbraced:Nx} \meta{function} \Arg{tokens}
-% \end{syntax}
+% \end{syntax}
% This functions fully expands the \meta{tokens} and leaves
% the result in the input stream after reinsertion of \meta{function}.
% This function is not expandable.
@@ -616,7 +616,7 @@
% \begin{macrocode}
%<*initex|package>
% \end{macrocode}
-%
+%
% \begin{macrocode}
%<@@=exp>
% \end{macrocode}
@@ -656,11 +656,9 @@
% method for efficiency, typically using calls to \cs{exp_after:wN}.
%
% \begin{variable}{\l_@@_internal_tl}
-% We need a scratch token list variable.
-% We don't use |tl| methods so that \pkg{l3expan} can be loaded earlier.
-% \begin{macrocode}
-\cs_new_nopar:Npn \l_@@_internal_tl { }
-% \end{macrocode}
+% This scratch token list variable is defined in \pkg{l3basics}, as it
+% is needed \enquote{early}. This is just a reminder that that is the
+% case!
% \end{variable}
%
% This code uses internal functions with names that start with |\::|
@@ -724,7 +722,7 @@
% \end{macrocode}
% \end{macro}
%
-% \begin{macro}[int, EXP]{\::o}
+% \begin{macro}[int, EXP]{\::o}
% This function is used to expand an argument once.
% \begin{macrocode}
\cs_new:Npn \::o #1 \::: #2#3