summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/expl3/l3tl.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/expl3/l3tl.dtx')
-rw-r--r--Master/texmf-dist/source/latex/expl3/l3tl.dtx37
1 files changed, 15 insertions, 22 deletions
diff --git a/Master/texmf-dist/source/latex/expl3/l3tl.dtx b/Master/texmf-dist/source/latex/expl3/l3tl.dtx
index e63646016e8..011f99fc26a 100644
--- a/Master/texmf-dist/source/latex/expl3/l3tl.dtx
+++ b/Master/texmf-dist/source/latex/expl3/l3tl.dtx
@@ -36,7 +36,7 @@
\RequirePackage{l3names}
%</driver|package>
%\fi
-\GetIdInfo$Id: l3tl.dtx 1365 2009-05-31 17:26:17Z mittelba $
+\GetIdInfo$Id: l3tl.dtx 1421 2009-07-10 21:10:59Z joseph $
{L3 Experimental Token Lists}
%\iffalse
%<*driver>
@@ -123,7 +123,6 @@
% \tl_set:NV |
% \tl_set:No |
% \tl_set:Nv |
-% \tl_set:Nd |
% \tl_set:Nf |
% \tl_set:Nx |
% \tl_set:cn |
@@ -134,7 +133,6 @@
% \tl_gset:Nc |
% \tl_gset:No |
% \tl_gset:NV |
-% \tl_gset:Nd |
% \tl_gset:Nv |
% \tl_gset:Nx |
% \tl_gset:cn |
@@ -869,7 +867,6 @@
% \begin{macro}{\tl_set:NV}
% \begin{macro}{\tl_set:No}
% \begin{macro}{\tl_set:Nv}
-% \begin{macro}{\tl_set:Nd}
% \begin{macro}{\tl_set:Nf}
% \begin{macro}{\tl_set:Nx}
% \begin{macro}{\tl_set:cn}
@@ -880,7 +877,6 @@
% \begin{macro}{\tl_gset:NV}
% \begin{macro}{\tl_gset:No}
% \begin{macro}{\tl_gset:Nv}
-% \begin{macro}{\tl_gset:Nd}
% \begin{macro}{\tl_gset:Nx}
% \begin{macro}{\tl_gset:cn}
% \begin{macro}{\tl_gset:cx}
@@ -934,8 +930,8 @@
% The remaining functions can just be defined with help from the
% expansion module.
% \begin{macrocode}
-\cs_generate_variant:Nn \tl_set:Nn {NV,No,Nv,Nd,Nf,cn,cV,co,cx}
-\cs_generate_variant:Nn \tl_gset:Nn {NV,No,Nv,Nd,cn,cx}
+\cs_generate_variant:Nn \tl_set:Nn {NV,No,Nv,Nf,cn,cV,co,cx}
+\cs_generate_variant:Nn \tl_gset:Nn {NV,No,Nv,cn,cx}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -954,8 +950,6 @@
% \end{macro}
% \end{macro}
% \end{macro}
-% \end{macro}
-% \end{macro}
%
% \begin{macro}{\tl_set_eq:NN}
% \begin{macro}{\tl_set_eq:Nc}
@@ -1123,8 +1117,7 @@
\tl_gset:Nx #1 { #2 \exp_not:V #1 }
%<check> \chk_local_or_pref_global:N #1
}
-\cs_generate_variant:Nn \tl_put_left:Nn {cn,co}
-\cs_generate_variant:Nn \tl_put_left:NV {cV}
+\cs_generate_variant:Nn \tl_put_left:Nn {cn,co,cV}
% \end{macrocode}
%
% \begin{macrocode}
@@ -1202,8 +1195,7 @@
% \end{macrocode}
%
% \begin{macrocode}
-\cs_generate_variant:Nn \tl_gput_right:Nn {cn,co}
-\cs_generate_variant:Nn \tl_gput_right:NV {cV}
+\cs_generate_variant:Nn \tl_gput_right:Nn {cn,co,cV}
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -1869,13 +1861,13 @@
% \begin{macrocode}
\cs_new:Npn \tl_set_rescan_aux:NNnn #1#2#3#4 {
\group_begin:
- \toks_set:No \etex_everyeof:D { \c_two_ats_with_two_catcodes_tl }
+ \toks_set:NV \etex_everyeof:D \c_two_ats_with_two_catcodes_tl
\tex_endlinechar:D = \c_minus_one
#3
\exp_after:wN \tl_rescan_aux:w \etex_scantokens:D {#4}
- \exp_args:NNNo
+ \exp_args:NNNV
\group_end:
- #1 #2 { \l_tmpa_tl }
+ #1 #2 \l_tmpa_toks
}
% \end{macrocode}
%
@@ -1885,7 +1877,7 @@
\exp_after:wN \tl_rescan_aux:w
\exp_after:wN #
\exp_after:wN 1 \c_two_ats_with_two_catcodes_tl {
- \tl_set:Nn \l_tmpa_tl {#1}
+ \tl_set:Nn \l_tmpa_toks {#1}
}
% \end{macrocode}
%
@@ -1910,9 +1902,9 @@
\tex_endlinechar:D = \c_minus_one
#2
\tl_set:Nx \l_tmpa_tl { \etex_scantokens:D {#3} }
- \exp_args:NNNo
+ \exp_args:NNNV
\group_end:
- \tl_set:Nn #1 { \l_tmpa_tl }
+ \tl_set:Nn #1 \l_tmpa_tl
}
% \end{macrocode}
% Globally is easier again:
@@ -1937,11 +1929,12 @@
% \begin{macrocode}
\cs_new:Npn \tl_rescan:nn #1#2 {
\group_begin:
- \etex_everyeof:D { \exp_not:N }
+ \toks_set:NV \etex_everyeof:D \c_two_ats_with_two_catcodes_tl
\tex_endlinechar:D = \c_minus_one
#1
- \toks_set:Nx \l_tmpa_toks { \etex_scantokens:D {#2} }
- \exp_args:NV \group_end: \l_tmpa_toks
+ \exp_after:wN \tl_rescan_aux:w \etex_scantokens:D {#2}
+ \exp_args:NV \group_end:
+ \l_tmpa_toks
}
% \end{macrocode}
% \end{macro}