diff options
author | Karl Berry <karl@freefriends.org> | 2011-09-16 22:35:41 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2011-09-16 22:35:41 +0000 |
commit | 6d95b4a2c1bbdaea1a3802c822808f476ac5703b (patch) | |
tree | 1abf9117bf53f2de53fbcc62c352acc92780365b /Master/texmf-dist/tex/latex/l3kernel/l3int.sty | |
parent | b7f762397f5df2d732326713423e31e1bf91b903 (diff) |
l3kernel 2828 (15sep11)
git-svn-id: svn://tug.org/texlive/trunk@23983 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 | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty b/Master/texmf-dist/tex/latex/l3kernel/l3int.sty index 26c0e19a66b..af6b2abb1a8 100644 --- a/Master/texmf-dist/tex/latex/l3kernel/l3int.sty +++ b/Master/texmf-dist/tex/latex/l3kernel/l3int.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: l3int.dtx 2666 2011-08-26 06:10:09Z joseph $ +\GetIdInfo$Id: l3int.dtx 2812 2011-09-12 09:19:26Z bruno $ {L3 Experimental integers} \ProvidesExplPackage {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} @@ -137,7 +137,7 @@ } { \chk_if_free_cs:N #1 - \pref_global:D \tex_mathchardef:D #1 = + \tex_global:D \tex_mathchardef:D #1 = \int_eval:w #2 \int_eval_end: } } @@ -148,13 +148,13 @@ } \cs_generate_variant:Nn \int_const:Nn { c } \cs_new_protected_nopar:Npn \int_zero:N #1 { #1 = \c_zero } -\cs_new_protected_nopar:Npn \int_gzero:N #1 { \pref_global:D #1 = \c_zero } +\cs_new_protected_nopar:Npn \int_gzero:N #1 { \tex_global:D #1 = \c_zero } \cs_generate_variant:Nn \int_zero:N { c } \cs_generate_variant:Nn \int_gzero:N { c } \cs_new_protected_nopar:Npn \int_set_eq:NN #1#2 { #1 = #2 } \cs_generate_variant:Nn \int_set_eq:NN { c } \cs_generate_variant:Nn \int_set_eq:NN { Nc , cc } -\cs_new_protected_nopar:Npn \int_gset_eq:NN #1#2 { \pref_global:D #1 = #2 } +\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 @@ -162,9 +162,9 @@ \cs_new_nopar: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 - { \pref_global:D \int_add:Nn } + { \tex_global:D \int_add:Nn } \cs_new_protected_nopar:Npn \int_gsub:Nn - { \pref_global:D \int_sub:Nn } + { \tex_global:D \int_sub:Nn } \cs_generate_variant:Nn \int_add:Nn { c } \cs_generate_variant:Nn \int_gadd:Nn { c } \cs_generate_variant:Nn \int_sub:Nn { c } @@ -174,16 +174,16 @@ \cs_new_protected_nopar:Npn \int_decr:N #1 { \tex_advance:D #1 \c_minus_one } \cs_new_protected_nopar:Npn \int_gincr:N - { \pref_global:D \int_incr:N } + { \tex_global:D \int_incr:N } \cs_new_protected_nopar:Npn \int_gdecr:N - { \pref_global:D \int_decr:N } + { \tex_global:D \int_decr:N } \cs_generate_variant:Nn \int_incr:N { c } \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 { #1 ~ \int_eval:w #2\int_eval_end: } -\cs_new_protected_nopar:Npn \int_gset:Nn { \pref_global:D \int_set:Nn } +\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 @@ -702,6 +702,7 @@ \cs_new_eq:NN \int_convert_to_base_ten:nn \int_from_base:nn \cs_new_nopar:Npn \int_to_symbol:n { + \scan_align_safe_stop: \mode_if_math:TF { \int_to_symbol_math:n } { \int_to_symbol_text:n } |