diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/expl3/l3clist.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/expl3/l3clist.dtx | 34 |
1 files changed, 6 insertions, 28 deletions
diff --git a/Master/texmf-dist/source/latex/expl3/l3clist.dtx b/Master/texmf-dist/source/latex/expl3/l3clist.dtx index adf2e659ba5..0f6276b47d2 100644 --- a/Master/texmf-dist/source/latex/expl3/l3clist.dtx +++ b/Master/texmf-dist/source/latex/expl3/l3clist.dtx @@ -36,7 +36,7 @@ \RequirePackage{l3names} %</driver|package> %\fi -\GetIdInfo$Id: l3clist.dtx 1441 2009-08-05 19:23:23Z joseph $ +\GetIdInfo$Id: l3clist.dtx 1713 2009-11-06 07:02:42Z will $ {L3 Experimental comma separated lists} %\iffalse %<*driver> @@ -144,12 +144,6 @@ % \end{function} % % -% \begin{function}{\clist_set_from_seq:NN|\clist_gset_from_seq:NN} -% \begin{syntax} -% "\clist_set_from_seq:NN" <clist> <seq> -% \end{syntax} -% Transforms sequence <seq> into comma-list variable <clist>. -% \end{function} % % % \section{Putting data in} @@ -603,22 +597,6 @@ % \end{macro} % \end{macro} % -% \begin{macro}{\clist_set_from_seq:NN,\clist_gset_from_seq:NN} -% I hope this technique is more efficient than looping through each element -% and using "\clist_put_right:Nn" (Will). -% \begin{macrocode} -\cs_new:Npn \clist_set_from_seq_aux:NNN #1#2#3 { - \cs_set:Npn \seq_elt:w ##1 \seq_elt_end: ##2 { - \exp_not:n {##1} - \quark_if_nil:NF ##2 { , ##2 } - } - #1 #2 { #3 \q_nil } -} -\cs_new:Npn \clist_set_from_seq:NN { \clist_set_from_seq_aux:NNN \tl_set:Nx } -\cs_new:Npn \clist_gset_from_seq:NN { \clist_set_from_seq_aux:NNN \tl_gset:Nx } -% \end{macrocode} -% \end{macro} -% % \subsection{Predicates and conditionals} % % \begin{macro}{\clist_if_empty_p:N,\clist_if_empty_p:c} @@ -1077,12 +1055,12 @@ % from left to right. For each element check if the element is % already present in the list. % \begin{macrocode} -\cs_new:Nn \clist_remove_duplicates_aux:NN { +\cs_new:Npn \clist_remove_duplicates_aux:NN #1#2 { \clist_clear:N \l_clist_remove_clist \clist_map_function:NN #2 \clist_remove_duplicates_aux:n #1 #2 \l_clist_remove_clist } -\cs_new:Nn \clist_remove_duplicates_aux:n { +\cs_new:Npn \clist_remove_duplicates_aux:n #1 { \clist_if_in:NnF \l_clist_remove_clist {#1} { \clist_put_right:Nn \l_clist_remove_clist {#1} } @@ -1116,9 +1094,9 @@ \cs_new_nopar:Npn \clist_gremove_element:Nn { \clist_remove_element_aux:NNn \clist_gset_eq:NN } -\cs_new:Nn \clist_remove_element_aux:NNn { +\cs_new:Npn \clist_remove_element_aux:NNn #1#2#3 { \clist_clear:N \l_clist_remove_clist - \cs_set:Nn \clist_remove_element_aux:n { + \cs_set:Npn \clist_remove_element_aux:n ##1 { \tl_if_eq:nnF {#3} {##1} { \clist_put_right:Nn \l_clist_remove_clist {##1} } @@ -1126,7 +1104,7 @@ \clist_map_function:NN #2 \clist_remove_element_aux:n #1 #2 \l_clist_remove_clist } -\cs_new:Nn \clist_remove_element_aux:n { } +\cs_new:Npn \clist_remove_element_aux:n #1 { } % \end{macrocode} %\end{macro} %\end{macro} |