diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3quark.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3quark.sty | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty index d95b117b5f8..8cc8cbc1a73 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3quark.sty @@ -22,7 +22,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. @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3quark.dtx 2665 2011-08-25 22:15:27Z joseph $ +\GetIdInfo$Id: l3quark.dtx 2798 2011-09-10 15:42:13Z will $ {L3 Experimental quarks} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -64,47 +64,30 @@ \exp_after:wN \use_none_delimit_by_q_recursion_stop:w \fi: } -\cs_new:Npn \quark_if_recursion_tail_stop_do:Nn #1#2 +\cs_new:Npn \quark_if_recursion_tail_stop_do:Nn #1 { \if_meaning:w #1 \q_recursion_tail \exp_after:wN \use_i_delimit_by_q_recursion_stop:nw \else: \exp_after:wN \use_none:n \fi: - {#2} } \cs_new:Npn \quark_if_recursion_tail_stop:n #1 { - \if_catcode:w - A - \etex_detokenize:D \exp_after:wN - { - \quark_if_recursion_tail_aux:w #1 \q_recursion_stop - \q_recursion_tail \q_recursion_stop \q_stop - } - A + \if_int_compare:w \pdftex_strcmp:D + { \exp_not:N \q_recursion_tail } { \exp_not:n {#1} } = \c_zero \exp_after:wN \use_none_delimit_by_q_recursion_stop:w \fi: } -\cs_new:Npn \quark_if_recursion_tail_stop_do:nn #1#2 +\cs_new:Npn \quark_if_recursion_tail_stop_do:nn #1 { - \if_catcode:w - A - \etex_detokenize:D \exp_after:wN - { - \quark_if_recursion_tail_aux:w #1 \q_recursion_stop - \q_recursion_tail \q_recursion_stop \q_stop - } - A + \if_int_compare:w \pdftex_strcmp:D + { \exp_not:N \q_recursion_tail } { \exp_not:n {#1} } = \c_zero \exp_after:wN \use_i_delimit_by_q_recursion_stop:nw \else: \exp_after:wN \use_none:n \fi: - {#2} } -\cs_new:Npn \quark_if_recursion_tail_aux:w - #1 \q_recursion_tail #2 \q_recursion_stop #3 \q_stop - { #1 #2 } \cs_generate_variant:Nn \quark_if_recursion_tail_stop:n { o } \cs_generate_variant:Nn \quark_if_recursion_tail_stop_do:nn { o } \prg_new_conditional:Nnn \quark_if_nil:N { p, T , F , TF } |