diff options
author | Karl Berry <karl@freefriends.org> | 2011-11-25 00:14:23 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-11-25 00:14:23 +0000 |
commit | 4796116f06de1574987757c8945f6678d21f0a40 (patch) | |
tree | b6d95196b38ef31d6021471ecbf7c4d48fcaa730 /Master/texmf-dist/tex/latex/l3kernel/l3int.sty | |
parent | 27ecf3bfa131e03a530396ff6c0016cf6dffacd0 (diff) |
l3kernel 2966 (19nov11)
git-svn-id: svn://tug.org/texlive/trunk@24657 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/l3kernel/l3int.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/l3kernel/l3int.sty | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty index 8196f23e1eb..831fb50ae02 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty @@ -46,7 +46,7 @@ %% %% ----------------------------------------------------------------------- \RequirePackage{l3names} -\GetIdInfo$Id: l3int.dtx 2896 2011-10-09 20:36:50Z joseph $ +\GetIdInfo$Id: l3int.dtx 2928 2011-10-22 12:32:44Z bruno $ {L3 Experimental integers} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -126,7 +126,7 @@ \newcount #1 } \cs_generate_variant:Nn \int_new:N { c } -\cs_new_protected_nopar:Npn \int_const:Nn #1#2 +\cs_new_protected:Npn \int_const:Nn #1#2 { \int_compare:nNnTF {#2} > \c_minus_one { @@ -157,9 +157,9 @@ \cs_new_protected_nopar:Npn \int_gset_eq:NN #1#2 { \tex_global:D #1 = #2 } \cs_generate_variant:Nn \int_gset_eq:NN { c } \cs_generate_variant:Nn \int_gset_eq:NN { Nc , cc } -\cs_new_protected_nopar:Npn \int_add:Nn #1#2 +\cs_new_protected:Npn \int_add:Nn #1#2 { \tex_advance:D #1 by \int_eval:w #2 \int_eval_end: } -\cs_new_nopar:Npn \int_sub:Nn #1#2 +\cs_new_protected:Npn \int_sub:Nn #1#2 { \tex_advance:D #1 by - \int_eval:w #2 \int_eval_end: } \cs_new_protected_nopar:Npn \int_gadd:Nn { \tex_global:D \int_add:Nn } @@ -181,13 +181,13 @@ \cs_generate_variant:Nn \int_decr:N { c } \cs_generate_variant:Nn \int_gincr:N { c } \cs_generate_variant:Nn \int_gdecr:N { c } -\cs_new_protected_nopar:Npn \int_set:Nn #1#2 +\cs_new_protected:Npn \int_set:Nn #1#2 { #1 ~ \int_eval:w #2\int_eval_end: } \cs_new_protected_nopar:Npn \int_gset:Nn { \tex_global:D \int_set:Nn } \cs_generate_variant:Nn \int_set:Nn { c } \cs_generate_variant:Nn \int_gset:Nn { c } \cs_new_eq:NN \int_use:N \tex_the:D -\cs_new_nopar:Npn \int_use:c #1 { \int_use:N \cs:w #1 \cs_end: } +\cs_new:Npn \int_use:c #1 { \int_use:N \cs:w #1 \cs_end: } \prg_new_conditional:Npnn \int_compare:n #1 { p , T , F , TF } { \exp_after:wN \int_compare_aux:nw \int_value:w \int_eval:w #1 \q_stop } \cs_new:Npn \int_compare_aux:nw #1#2 \q_stop @@ -338,7 +338,7 @@ \int_compare:nNnF {#1} #2 {#3} { \int_do_until:nNnn {#1} #2 {#3} {#4} } } -\cs_new_nopar:Npn \int_to_arabic:n #1 { \int_eval:n {#1} } +\cs_new:Npn \int_to_arabic:n #1 { \int_eval:n {#1} } \cs_new:Npn \int_to_symbols:nnn #1#2#3 { \int_compare:nNnTF {#1} > {#2} @@ -490,7 +490,7 @@ { \int_to_base:nn {#1} { 16 } } \cs_new:Npn \int_to_octal:n #1 { \int_to_base:nn {#1} { 8 } } -\cs_new_nopar:Npn \int_to_roman:n #1 +\cs_new:Npn \int_to_roman:n #1 { \exp_after:wN \int_to_roman_aux:N \int_to_roman:w \int_eval:n {#1} Q @@ -500,7 +500,7 @@ \use:c { int_to_roman_ #1 :w } \int_to_roman_aux:N } -\cs_new_nopar:Npn \int_to_Roman:n #1 +\cs_new:Npn \int_to_Roman:n #1 { \exp_after:wN \int_to_Roman_aux:N \int_to_roman:w \int_eval:n {#1} Q |