diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3clist.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3clist.dtx | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx b/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx index 51ff7dc3082..b9987de422b 100644 --- a/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx +++ b/Master/texmf-dist/source/latex/l3kernel/l3clist.dtx @@ -2,7 +2,7 @@ % %% File: l3clist.dtx Copyright (C) 2004-2011 Frank Mittelbach, %% The LaTeX3 project -%% (C) 2012-2015 The LaTeX3 Project +%% (C) 2012-2016 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 @@ -39,7 +39,7 @@ \documentclass[full]{l3doc} %</driver> %<*driver|package> -\GetIdInfo$Id: l3clist.dtx 5901 2015-09-02 05:59:23Z joseph $ +\GetIdInfo$Id: l3clist.dtx 6685 2016-08-19 16:26:52Z bruno $ {L3 Comma separated lists} %</driver|package> %<*driver> @@ -135,7 +135,8 @@ % \cs{clist_clear_new:N} \meta{comma list} % \end{syntax} % Ensures that the \meta{comma list} exists globally by applying -% \cs{clist_new:N} if necessary, then applies \cs{clist_(g)clear:N} to leave +% \cs{clist_new:N} if necessary, then applies +% \cs[index=clist_clear:N]{clist_(g)clear:N} to leave % the list empty. % \end{function} % @@ -877,9 +878,9 @@ % there needs to be the correct addition of a comma to the output. So % a little work to do. % \begin{macrocode} -\cs_new_protected_nopar:Npn \clist_concat:NNN +\cs_new_protected:Npn \clist_concat:NNN { \@@_concat:NNNN \tl_set:Nx } -\cs_new_protected_nopar:Npn \clist_gconcat:NNN +\cs_new_protected:Npn \clist_gconcat:NNN { \@@_concat:NNNN \tl_gset:Nx } \cs_new_protected:Npn \@@_concat:NNNN #1#2#3#4 { @@ -1014,9 +1015,9 @@ % Comma lists cannot hold empty values: there are therefore a couple % of sanity checks to avoid accumulating commas. % \begin{macrocode} -\cs_new_protected_nopar:Npn \clist_put_left:Nn +\cs_new_protected:Npn \clist_put_left:Nn { \@@_put_left:NNNn \clist_concat:NNN \clist_set:Nn } -\cs_new_protected_nopar:Npn \clist_gput_left:Nn +\cs_new_protected:Npn \clist_gput_left:Nn { \@@_put_left:NNNn \clist_gconcat:NNN \clist_set:Nn } \cs_new_protected:Npn \@@_put_left:NNNn #1#2#3#4 { @@ -1050,9 +1051,9 @@ % \UnitTested % \begin{macro}[aux]{\@@_put_right:NNNn} % \begin{macrocode} -\cs_new_protected_nopar:Npn \clist_put_right:Nn +\cs_new_protected:Npn \clist_put_right:Nn { \@@_put_right:NNNn \clist_concat:NNN \clist_set:Nn } -\cs_new_protected_nopar:Npn \clist_gput_right:Nn +\cs_new_protected:Npn \clist_gput_right:Nn { \@@_put_right:NNNn \clist_gconcat:NNN \clist_set:Nn } \cs_new_protected:Npn \@@_put_right:NNNn #1#2#3#4 { @@ -1105,9 +1106,9 @@ % either \cs{exp_not:n} or \cs{use_none:n} as |#2|, ensuring that the % result can safely be an empty comma list. % \begin{macrocode} -\cs_new_protected_nopar:Npn \clist_pop:NN +\cs_new_protected:Npn \clist_pop:NN { \@@_pop:NNN \tl_set:Nx } -\cs_new_protected_nopar:Npn \clist_gpop:NN +\cs_new_protected:Npn \clist_gpop:NN { \@@_pop:NNN \tl_gset:Nx } \cs_new_protected:Npn \@@_pop:NNN #1#2#3 { @@ -1338,15 +1339,15 @@ % \begin{macro}[aux, EXP]{\@@_reverse:wwNww, \@@_reverse_end:ww} % The reversed token list is built one item at a time, and stored % between \cs{q_stop} and \cs{q_mark}, in the form of |?| followed by -% zero or more instances of ``\meta{item}|,|''. We start from a comma -% list ``\meta{item_1}|,|\ldots|,|\meta{item_n}''. During the loop, -% the auxiliary \cs{@@_reverse:wwNww} receives ``|?|\meta{item_i}'' as -% |#1|, ``\meta{item_{i+1}}|,|\ldots|,|\meta{item_n}'' as |#2|, +% zero or more instances of \enquote{\meta{item}\texttt{,}}. We start from a comma +% list \enquote{\meta{item_1}\texttt{,\ldots,}\meta{item_n}}. During the loop, +% the auxiliary \cs{@@_reverse:wwNww} receives \enquote{\texttt{?}\meta{item_i}} as +% |#1|, \enquote{\meta{item_{i+1}}\texttt{,\ldots,}\meta{item_n}} as |#2|, % \cs{@@_reverse:wwNww} as |#3|, what remains until \cs{q_stop} as -% |#4|, and ``\meta{item_{i-1}}|,|\ldots|,|\meta{item_1}|,|'' as |#5|. +% |#4|, and \enquote{\meta{item_{i-1}}\texttt{,\ldots,}\meta{item_1}\texttt{,}} as |#5|. % The auxiliary moves |#1| just before |#5|, with a comma, and calls % itself (|#3|). After the last item is moved, \cs{@@_reverse:wwNww} -% receives ``\cs{q_mark} \cs{@@_reverse:wwNww} |!|'' as its argument +% receives \enquote{\cs{q_mark} \cs{@@_reverse:wwNww} \texttt{!}} as its argument % |#1|, thus \cs{@@_reverse_end:ww} as its argument |#3|. This second % auxiliary cleans up until the marker~|!|, removes the trailing comma % (introduced when the first item was moved after \cs{q_stop}), and @@ -1601,9 +1602,9 @@ % \begin{macro}{\clist_map_break:, \clist_map_break:n} % The break statements use the general \cs{__prg_map_break:Nn} mechanism. % \begin{macrocode} -\cs_new_nopar:Npn \clist_map_break: +\cs_new:Npn \clist_map_break: { \__prg_map_break:Nn \clist_map_break: { } } -\cs_new_nopar:Npn \clist_map_break:n +\cs_new:Npn \clist_map_break:n { \__prg_map_break:Nn \clist_map_break: } % \end{macrocode} % \end{macro} |