diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3toks.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3toks.dtx | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3toks.dtx b/Master/texmf-dist/source/latex/l3kernel/l3toks.dtx index c060225ab31..a7e14bc472c 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3toks.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3toks.dtx @@ -9,7 +9,7 @@ %% %% http://www.latex-project.org/lppl.txt %% -%% This file is part of the "expl3 bundle" (The Work in LPPL) +%% 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. @@ -35,7 +35,7 @@ % %<*driver|package> \RequirePackage{l3names} -\GetIdInfo$Id: l3toks.dtx 2670 2011-08-27 09:58:02Z will $ +\GetIdInfo$Id: l3toks.dtx 2818 2011-09-12 14:47:38Z will $ {L3 Experimental token registers} %</driver|package> %<*driver> @@ -133,8 +133,8 @@ % \begin{macro}{\toks_set:cv} % \begin{macro}{\toks_set:cx} % \begin{macro}{\toks_set:cf} -% |\toks_set:Nn|\m{toks}\m{stuff} stores \m{stuff} without expansion -% in \m{toks}. |\toks_set:No| and |\toks_set:Nx| expand \m{stuff} once +% |\toks_set:Nn|\meta{toks}\meta{stuff} stores \meta{stuff} without expansion +% in \meta{toks}. |\toks_set:No| and |\toks_set:Nx| expand \meta{stuff} once % and fully. % \begin{macrocode} %<*check> @@ -142,7 +142,7 @@ \cs_generate_variant:Nn \toks_set:Nn {No,Nf} %</check> % \end{macrocode} -% If we don't check if \m{toks} is a local register then the +% If we don't check if \meta{toks} is a local register then the % |\toks_set:Nn| function has nothing to do. % We implement |\toks_set:No|/|d|/|f| by hand when not checking because this % is going to be used \emph{extensively} in keyval processing! @@ -151,10 +151,10 @@ % \begin{macrocode} %<*!check> \cs_new_eq:NN \toks_set:Nn \prg_do_nothing: -\cs_new_protected:Npn \toks_set:NV #1#2 { +\cs_new_protected:Npn \toks_set:NV #1#2 { #1 \exp_after:wN { \int_to_roman:w -`0 \exp_eval_register:N #2 } } -\cs_new_protected:Npn \toks_set:Nv #1#2 { +\cs_new_protected:Npn \toks_set:Nv #1#2 { #1 \exp_after:wN { \int_to_roman:w -`0 \exp_eval_register:c {#2} } } \cs_new_protected:Npn \toks_set:No #1#2 { #1 \exp_after:wN {#2} } @@ -163,7 +163,7 @@ } %</!check> % \end{macrocode} -% +% % \begin{macrocode} \cs_generate_variant:Nn \toks_set:Nn {Nx,cn,cV,cv,co,cx,cf} % \end{macrocode} @@ -190,8 +190,8 @@ % \begin{macro}{\toks_gset:cx} % These functions are the global variants of the above. % \begin{macrocode} -%<check>\cs_new_protected_nopar:Npn \toks_gset:Nn #1 { \chk_global:N #1 \pref_global:D #1 } -%<!check>\cs_new_eq:NN \toks_gset:Nn \pref_global:D +%<check>\cs_new_protected_nopar:Npn \toks_gset:Nn #1 { \chk_global:N #1 \tex_global:D #1 } +%<!check>\cs_new_eq:NN \toks_gset:Nn \tex_global:D \cs_generate_variant:Nn \toks_gset:Nn {NV,No,Nx,cn,cV,co,cx} % \end{macrocode} % \end{macro} @@ -211,8 +211,8 @@ % \begin{macro}{\toks_gset_eq:Nc} % \begin{macro}{\toks_gset_eq:cN} % \begin{macro}{\toks_gset_eq:cc} -% |\toks_set_eq:NN|\m{toks1}\m{toks2} copies the contents of \m{toks2} -% in \m{toks1}. +% |\toks_set_eq:NN|\meta{toks1}\meta{toks2} copies the contents of \meta{toks2} +% in \meta{toks1}. % \begin{macrocode} %<*check> \cs_new_protected_nopar:Npn\toks_set_eq:NN #1#2 { @@ -223,12 +223,12 @@ \cs_new_protected_nopar:Npn\toks_gset_eq:NN #1#2 { \chk_global:N #1 \chk_var_or_const:N #2 - \pref_global:D #1 #2 + \tex_global:D #1 #2 } %</check> %<*!check> \cs_new_eq:NN \toks_set_eq:NN \prg_do_nothing: -\cs_new_eq:NN \toks_gset_eq:NN \pref_global:D +\cs_new_eq:NN \toks_gset_eq:NN \tex_global:D %</!check> \cs_generate_variant:Nn \toks_set_eq:NN {Nc,cN,cc} \cs_generate_variant:Nn \toks_gset_eq:NN {Nc,cN,cc} @@ -247,18 +247,18 @@ % \begin{macrocode} \cs_new_protected_nopar:Npn \toks_clear:N #1 { #1\c_empty_toks -%<check>\chk_local_or_pref_global:N #1 +%<check>\chk_local_or_tex_global:N #1 } % \end{macrocode} -% +% % \begin{macrocode} \cs_new_protected_nopar:Npn \toks_gclear:N { -%<check> \pref_global_chk: -%<!check> \pref_global:D +%<check> \tex_global_chk: +%<!check> \tex_global:D \toks_clear:N } % \end{macrocode} -% +% % \begin{macrocode} \cs_generate_variant:Nn \toks_clear:N {c} \cs_generate_variant:Nn \toks_gclear:N {c} @@ -283,8 +283,8 @@ % % \begin{macrocode} \cs_new_protected_nopar:Npn \toks_use_gclear:N { -%<check> \pref_global_chk: -%<!check> \pref_global:D +%<check> \tex_global_chk: +%<!check> \tex_global:D \toks_use_clear:N } % \end{macrocode} @@ -327,7 +327,7 @@ % \begin{macro}[aux]{\toks_put_left_aux:w} % |\toks_put_left:Nn |\meta{toks}\meta{stuff\/} adds the tokens of % \textsl{stuff} on the `left-side' of the token register -% \m{toks}. |\toks_put_left:No| does the same, but expands the +% \meta{toks}. |\toks_put_left:No| does the same, but expands the % tokens once. We need to look out for brace stripping so we add a % token, which is then later removed. % \begin{macrocode} @@ -336,19 +336,19 @@ \toks_use:N #1 \q_stop #1 } % \end{macrocode} -% +% % \begin{macrocode} \cs_generate_variant:Nn \toks_put_left:Nn {NV,No,Nx,cn,co,cV} % \end{macrocode} -% +% % \begin{macrocode} \cs_new_protected_nopar:Npn \toks_gput_left:Nn { -%<check> \pref_global_chk: -%<!check> \pref_global:D +%<check> \tex_global_chk: +%<!check> \tex_global:D \toks_put_left:Nn } % \end{macrocode} -% +% % \begin{macrocode} \cs_generate_variant:Nn \toks_gput_left:Nn {NV,No,Nx,cn,cV,co} % \end{macrocode} @@ -359,7 +359,7 @@ % \begin{macrocode} \cs_new:Npn \toks_put_left_aux:w #1\q_stop #2#3 { #2 \exp_after:wN { \use_i:nn {#3} #1 } -%<check> \chk_local_or_pref_global:N #2 +%<check> \chk_local_or_tex_global:N #2 } % \end{macrocode} % \end{macro} @@ -396,14 +396,14 @@ % \begin{macrocode} \cs_new_protected:Npn \toks_put_right:Nn #1#2 { #1 \exp_after:wN { \toks_use:N #1 #2 } -%<check> \chk_local_or_pref_global:N #1 +%<check> \chk_local_or_tex_global:N #1 } % \end{macrocode} -% +% % \begin{macrocode} \cs_new_protected_nopar:Npn \toks_gput_right:Nn { -%<check> \pref_global_chk: -%<!check> \pref_global:D +%<check> \tex_global_chk: +%<!check> \tex_global:D \toks_put_right:Nn } % \end{macrocode} @@ -413,13 +413,13 @@ %<*!check> \cs_new_protected:Npn \toks_put_right:NV #1#2 { #1 \exp_after:wN \exp_after:wN \exp_after:wN { - \exp_after:wN \toks_use:N \exp_after:wN #1 + \exp_after:wN \toks_use:N \exp_after:wN #1 \int_to_roman:w -`0 \exp_eval_register:N #2 } } \cs_new_protected:Npn \toks_put_right:No #1#2 { - #1 \exp_after:wN \exp_after:wN \exp_after:wN { - \exp_after:wN \toks_use:N \exp_after:wN #1 #2 + #1 \exp_after:wN \exp_after:wN \exp_after:wN { + \exp_after:wN \toks_use:N \exp_after:wN #1 #2 } } %</!check> @@ -461,9 +461,9 @@ % % \begin{macro}{\toks_if_empty_p:N,\toks_if_empty_p:c} % \begin{macro}[TF]{\toks_if_empty:N,\toks_if_empty:c} -% |\toks_if_empty:NTF|\m{toks}\m{true code}\m{false code} tests if a -% token register is empty and executes either \m{true code} or -% \m{false code}. This test had the advantage of being +% |\toks_if_empty:NTF|\meta{toks}\meta{true code}\meta{false code} tests if a +% token register is empty and executes either \meta{true code} or +% \meta{false code}. This test had the advantage of being % expandable. Otherwise one has to do an |x| type expansion in order % to prevent problems with parameter tokens. % \begin{macrocode} |