diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/expl3/l3prg.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/expl3/l3prg.sty | 52 |
1 files changed, 26 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/latex/expl3/l3prg.sty b/Master/texmf-dist/tex/latex/expl3/l3prg.sty index b4f8ec44ed6..13d62b490a9 100644 --- a/Master/texmf-dist/tex/latex/expl3/l3prg.sty +++ b/Master/texmf-dist/tex/latex/expl3/l3prg.sty @@ -48,7 +48,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3prg.dtx 2043 2010-09-22 02:10:43Z will $ +\GetIdInfo$Id: l3prg.dtx 2063 2010-10-03 08:26:49Z mittelba $ {L3 Experimental control structures} \ProvidesExplPackage {\filename}{\filedate}{\fileversion}{\filedescription} @@ -73,11 +73,11 @@ \if_false:{\fi:\if_num:w`}=\c_zero\fi:} \cs_new_nopar:Npn \group_align_safe_end: {\if_num:w`{=\c_zero}\fi:} \cs_new_nopar:Npn \scan_align_safe_stop: { - \intexpr_compare:nNnT \etex_currentgrouptype:D = \c_six + \int_compare:nNnT \etex_currentgrouptype:D = \c_six { - \intexpr_compare:nNnF \etex_lastnodetype:D = \c_zero + \int_compare:nNnF \etex_lastnodetype:D = \c_zero { - \intexpr_compare:nNnF \etex_lastnodetype:D = \c_seven + \int_compare:nNnF \etex_lastnodetype:D = \c_seven \scan_stop: } } @@ -85,7 +85,7 @@ \cs_new_nopar:Npn \prg_replicate:nn #1{ \cs:w prg_do_nothing: \exp_after:wN\prg_replicate_first_aux:N - \tex_romannumeral:D -`\q \intexpr_eval:n{#1} \cs_end: + \tex_romannumeral:D -`\q \int_eval:n{#1} \cs_end: \cs_end: } \cs_new_nopar:Npn \prg_replicate_aux:N#1{ @@ -124,26 +124,26 @@ \cs_new:cpn {prg_replicate_first_8:n}#1{\cs_end: #1#1#1#1#1#1#1#1} \cs_new:cpn {prg_replicate_first_9:n}#1{\cs_end: #1#1#1#1#1#1#1#1#1} \cs_new:Npn \prg_stepwise_function:nnnN #1#2{ - \intexpr_compare:nNnTF{#2}<\c_zero + \int_compare:nNnTF{#2}<\c_zero {\exp_args:Nf\prg_stepwise_function_decr:nnnN } {\exp_args:Nf\prg_stepwise_function_incr:nnnN } - {\intexpr_eval:n{#1}}{#2} + {\int_eval:n{#1}}{#2} } \cs_new:Npn \prg_stepwise_function_incr:nnnN #1#2#3#4{ - \intexpr_compare:nNnF {#1}>{#3} + \int_compare:nNnF {#1}>{#3} { #4{#1} \exp_args:Nf \prg_stepwise_function_incr:nnnN - {\intexpr_eval:n{#1 + #2}} + {\int_eval:n{#1 + #2}} {#2}{#3}{#4} } } \cs_new:Npn \prg_stepwise_function_decr:nnnN #1#2#3#4{ - \intexpr_compare:nNnF {#1}<{#3} + \int_compare:nNnF {#1}<{#3} { #4{#1} \exp_args:Nf \prg_stepwise_function_decr:nnnN - {\intexpr_eval:n{#1 + #2}} + {\int_eval:n{#1 + #2}} {#2}{#3}{#4} } } @@ -151,49 +151,49 @@ \cs_new_protected:Npn\prg_stepwise_inline:nnnn #1#2#3#4{ \int_gincr:N \g_prg_inline_level_int \cs_gset_nopar:cpn{prg_stepwise_inline_\int_use:N\g_prg_inline_level_int :n}##1{#4} - \intexpr_compare:nNnTF {#2}<\c_zero + \int_compare:nNnTF {#2}<\c_zero {\exp_args:Ncf \prg_stepwise_inline_decr:Nnnn } {\exp_args:Ncf \prg_stepwise_inline_incr:Nnnn } {prg_stepwise_inline_\int_use:N\g_prg_inline_level_int :n} - {\intexpr_eval:n{#1}} {#2} {#3} + {\int_eval:n{#1}} {#2} {#3} \int_gdecr:N \g_prg_inline_level_int } \cs_new:Npn \prg_stepwise_inline_incr:Nnnn #1#2#3#4{ - \intexpr_compare:nNnF {#2}>{#4} + \int_compare:nNnF {#2}>{#4} { #1{#2} \exp_args:NNf \prg_stepwise_inline_incr:Nnnn #1 - {\intexpr_eval:n{#2 + #3}} {#3}{#4} + {\int_eval:n{#2 + #3}} {#3}{#4} } } \cs_new:Npn \prg_stepwise_inline_decr:Nnnn #1#2#3#4{ - \intexpr_compare:nNnF {#2}<{#4} + \int_compare:nNnF {#2}<{#4} { #1{#2} \exp_args:NNf \prg_stepwise_inline_decr:Nnnn #1 - {\intexpr_eval:n{#2 + #3}} {#3}{#4} + {\int_eval:n{#2 + #3}} {#3}{#4} } } \cs_new_protected:Npn \prg_stepwise_variable:nnnNn #1#2 { - \intexpr_compare:nNnTF {#2}<\c_zero + \int_compare:nNnTF {#2}<\c_zero {\exp_args:Nf\prg_stepwise_variable_decr:nnnNn} {\exp_args:Nf\prg_stepwise_variable_incr:nnnNn} - {\intexpr_eval:n{#1}}{#2} + {\int_eval:n{#1}}{#2} } \cs_new_protected:Npn \prg_stepwise_variable_incr:nnnNn #1#2#3#4#5 { - \intexpr_compare:nNnF {#1}>{#3} + \int_compare:nNnF {#1}>{#3} { \cs_set_nopar:Npn #4{#1} #5 \exp_args:Nf \prg_stepwise_variable_incr:nnnNn - {\intexpr_eval:n{#1 + #2}}{#2}{#3}#4{#5} + {\int_eval:n{#1 + #2}}{#2}{#3}#4{#5} } } \cs_new_protected:Npn \prg_stepwise_variable_decr:nnnNn #1#2#3#4#5 { - \intexpr_compare:nNnF {#1}<{#3} + \int_compare:nNnF {#1}<{#3} { \cs_set_nopar:Npn #4{#1} #5 \exp_args:Nf \prg_stepwise_variable_decr:nnnNn - {\intexpr_eval:n{#1 + #2}}{#2}{#3}#4{#5} + {\int_eval:n{#1 + #2}}{#2}{#3}#4{#5} } } \cs_new_protected_nopar:Npn \bool_new:N #1 { \cs_new_eq:NN #1 \c_false_bool } @@ -360,7 +360,7 @@ \cs_generate_variant:Nn \bool_gset:Nn {c} \cs_new:Npn \bool_not_p:n #1{ \bool_if_p:n{!(#1)} } \cs_new:Npn \bool_xor_p:nn #1#2 { - \intexpr_compare:nNnTF {\bool_if_p:n { #1 }} = {\bool_if_p:n { #2 }} + \int_compare:nNnTF {\bool_if_p:n { #1 }} = {\bool_if_p:n { #2 }} {\c_false_bool}{\c_true_bool} } \prg_set_conditional:Npnn \bool_if:n #1 {TF,T,F}{ @@ -380,12 +380,12 @@ #2 \bool_if:nF {#1} { \bool_do_until:nn {#1}{#2} } } \cs_new:Npn \prg_case_int:nnn #1 #2 { - \exp_args:Nf \prg_case_int_aux:nnn { \intexpr_eval:n{#1}} #2 + \exp_args:Nf \prg_case_int_aux:nnn { \int_eval:n{#1}} #2 \q_recursion_tail ? \q_recursion_stop } \cs_new:Npn \prg_case_int_aux:nnn #1#2#3{ \quark_if_recursion_tail_stop_do:nn{#2}{\use:n} - \intexpr_compare:nNnTF{#1}={#2} + \int_compare:nNnTF{#1}={#2} { \prg_end_case:nw {#3} } { \prg_case_int_aux:nnn {#1}} } |