summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3int.dtx')
-rw-r--r--Master/texmf-dist/source/latex/l3kernel/l3int.dtx29
1 files changed, 16 insertions, 13 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
index 70264286d27..91dc8e798ce 100644
--- a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
+++ b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx
@@ -35,7 +35,7 @@
%
%<*driver|package>
\RequirePackage{l3names}
-\GetIdInfo$Id: l3int.dtx 2478 2011-06-19 21:34:23Z joseph $
+\GetIdInfo$Id: l3int.dtx 2526 2011-08-09 08:58:42Z joseph $
{L3 Experimental integers}
%</driver|package>
%<*driver>
@@ -930,12 +930,12 @@
% Here are the remaining primitives for number comparisons and
% expressions.
% \begin{macrocode}
-\cs_set_eq:NN \int_value:w \tex_number:D
-\cs_set_eq:NN \int_eval:w \etex_numexpr:D
-\cs_new_eq:NN \int_eval_end: \tex_relax:D
-\cs_new_eq:NN \if_num:w \tex_ifnum:D
-\cs_set_eq:NN \if_int_odd:w \tex_ifodd:D
-\cs_new_eq:NN \if_case:w \tex_ifcase:D
+\cs_new_eq:NN \int_value:w \tex_number:D
+\cs_new_eq:NN \int_eval:w \etex_numexpr:D
+\cs_new_eq:NN \int_eval_end: \tex_relax:D
+\cs_new_eq:NN \if_num:w \tex_ifnum:D
+\cs_new_eq:NN \if_int_odd:w \tex_ifodd:D
+\cs_new_eq:NN \if_case:w \tex_ifcase:D
% \end{macrocode}
% \end{macro}
% \end{macro}
@@ -948,10 +948,16 @@
%
% \begin{macro}{\int_eval:n}
% Wrapper for \cs{int_eval:w}. Can be used in an integer expression
-% or directly in the input stream.
+% or directly in the input stream. In format mode, there is already
+% a definition in \pkg{l3alloc} for bookstrapping, which is therefore
+% corrected to the \enquote{real} version here.
% \begin{macrocode}
-\cs_new:Npn \int_eval:n #1
- { \int_value:w \int_eval:w #1 \int_eval_end: }
+%<*initex>
+\cs_set:Npn \int_eval:n #1 { \int_value:w \int_eval:w #1 \int_eval_end: }
+%</initex>
+%<*package>
+\cs_new:Npn \int_eval:n #1 { \int_value:w \int_eval:w #1 \int_eval_end: }
+%</package>
% \end{macrocode}
% \end{macro}
%
@@ -1058,9 +1064,6 @@
% Two ways to do this: one for the format and one for the \LaTeXe{}
% package.
% \begin{macrocode}
-%<*initex>
-\alloc_new:nnnN { int } { 11 } { \c_max_register_int } \tex_countdef:D
-%</initex>
%<*package>
\cs_new_protected_nopar:Npn \int_new:N #1
{