summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/expl3/l3quark.sty
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-27 00:38:35 +0000
committerKarl Berry <karl@freefriends.org>2010-09-27 00:38:35 +0000
commit6f75f25fe8d374ef4209118bd8849d742410ccd1 (patch)
treec485a2517a4fba54346c4492d4b34f0c8d815962 /Master/texmf-dist/tex/latex/expl3/l3quark.sty
parent36e4bf755052bf5d5cef33cc2ffbad8f00b22163 (diff)
expl3 2047 (26sep10)
git-svn-id: svn://tug.org/texlive/trunk@19904 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3/l3quark.sty')
-rw-r--r--Master/texmf-dist/tex/latex/expl3/l3quark.sty57
1 files changed, 16 insertions, 41 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3quark.sty b/Master/texmf-dist/tex/latex/expl3/l3quark.sty
index 79e0f26f0b3..3fb3d4ee1f8 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3quark.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3quark.sty
@@ -48,7 +48,7 @@
%%
%% -----------------------------------------------------------------------
\RequirePackage{l3names}
-\GetIdInfo$Id: l3quark.dtx 1853 2010-03-21 09:11:08Z joseph $
+\GetIdInfo$Id: l3quark.dtx 2036 2010-09-20 20:33:54Z joseph $
{L3 Experimental Quark Commands}
\ProvidesExplPackage
{\filename}{\filedate}{\fileversion}{\filedescription}
@@ -63,7 +63,7 @@
\quark_new:N\q_recursion_stop
\cs_new:Npn \quark_if_recursion_tail_stop:n #1 {
\exp_after:wN\if_meaning:w
- \quark_if_recursion_tail_aux:w #1?\q_nil\q_recursion_tail\q_recursion_tail
+ \quark_if_recursion_tail_aux:w #1?\q_stop\q_recursion_tail\q_recursion_tail
\exp_after:wN \use_none_delimit_by_q_recursion_stop:w
\fi:
}
@@ -75,7 +75,7 @@
\cs_generate_variant:Nn \quark_if_recursion_tail_stop:n {o}
\cs_new:Npn \quark_if_recursion_tail_stop_do:nn #1#2 {
\exp_after:wN\if_meaning:w
- \quark_if_recursion_tail_aux:w #1?\q_nil\q_recursion_tail\q_recursion_tail
+ \quark_if_recursion_tail_aux:w #1?\q_stop\q_recursion_tail\q_recursion_tail
\exp_after:wN \use_i_delimit_by_q_recursion_stop:nw
\else:
\exp_after:wN\use_none:n
@@ -91,52 +91,27 @@
{#2}
}
\cs_generate_variant:Nn \quark_if_recursion_tail_stop_do:nn {on}
-\cs_new:Npn \quark_if_recursion_tail_aux:w #1#2 \q_nil \q_recursion_tail {#1}
+\cs_new:Npn \quark_if_recursion_tail_aux:w #1#2 \q_stop \q_recursion_tail {#1}
\prg_new_conditional:Nnn \quark_if_no_value:N {p,TF,T,F} {
\if_meaning:w \q_no_value #1
\prg_return_true: \else: \prg_return_false: \fi:
}
-\cs_if_exist:cTF {pdf_strcmp:D}
-{
- \prg_new_conditional:Nnn \quark_if_no_value:n {p,TF,T,F} {
- \if_num:w \pdf_strcmp:D
- {\exp_not:N \q_no_value}
- {\exp_not:n{#1}} = \c_zero
- \prg_return_true: \else: \prg_return_false:
- \fi:
- }
-}
-{
- \prg_new_conditional:Nnn \quark_if_no_value:n {p,TF,T,F} {
- \exp_args:NNo
- \if_predicate:w \str_if_eq_var_p:nf
- {\token_to_str:N\q_no_value\c_space_tl}
- {\tl_to_str:n{#1}}
- \prg_return_true: \else: \prg_return_false:
- \fi:
- }
+\prg_new_conditional:Nnn \quark_if_no_value:n {p,TF,T,F} {
+ \if_num:w \pdf_strcmp:D
+ {\exp_not:N \q_no_value}
+ {\exp_not:n{#1}} = \c_zero
+ \prg_return_true: \else: \prg_return_false:
+ \fi:
}
\prg_new_conditional:Nnn \quark_if_nil:N {p,TF,T,F} {
\if_meaning:w \q_nil #1 \prg_return_true: \else: \prg_return_false: \fi:
}
-\cs_if_exist:cTF {pdf_strcmp:D} {
- \prg_new_conditional:Nnn \quark_if_nil:n {p,TF,T,F} {
- \if_num:w \pdf_strcmp:D
- {\exp_not:N \q_nil}
- {\exp_not:n{#1}} = \c_zero
- \prg_return_true: \else: \prg_return_false:
- \fi:
- }
-}
-{
- \prg_new_conditional:Nnn \quark_if_nil:n {p,TF,T,F} {
- \exp_args:NNo
- \if_predicate:w \str_if_eq_var_p:nf
- {\token_to_str:N\q_nil\c_space_tl}
- {\tl_to_str:n{#1}}
- \prg_return_true: \else: \prg_return_false:
- \fi:
- }
+\prg_new_conditional:Nnn \quark_if_nil:n {p,TF,T,F} {
+ \if_num:w \pdf_strcmp:D
+ {\exp_not:N \q_nil}
+ {\exp_not:n{#1}} = \c_zero
+ \prg_return_true: \else: \prg_return_false:
+ \fi:
}
\cs_generate_variant:Nn \quark_if_nil_p:n {V}
\cs_generate_variant:Nn \quark_if_nil:nTF {V}