diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/expl3/l3int.dtx')
-rw-r--r-- | Master/texmf-dist/source/latex/expl3/l3int.dtx | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/Master/texmf-dist/source/latex/expl3/l3int.dtx b/Master/texmf-dist/source/latex/expl3/l3int.dtx index ccc30e7dd83..5b13df9cec4 100644 --- a/Master/texmf-dist/source/latex/expl3/l3int.dtx +++ b/Master/texmf-dist/source/latex/expl3/l3int.dtx @@ -1,5 +1,5 @@ % \iffalse -%% File: l3int.dtx Copyright (C) 1990-2006 LaTeX3 project +%% File: l3int.dtx Copyright (C) 1990-2008 LaTeX3 project %% %% It may be distributed and/or modified under the conditions of the %% LaTeX Project Public License (LPPL), either version 1.3c of this @@ -36,7 +36,7 @@ \RequirePackage{l3names} %</driver|package> %\fi -\GetIdInfo$Id: l3int.dtx 702 2007-11-27 14:21:49Z morten $ +\GetIdInfo$Id: l3int.dtx 738 2008-08-01 13:21:42Z morten $ {L3 Experimental Integer module} %\iffalse %<*driver> @@ -551,7 +551,7 @@ % Setting counters is again something that I would like to make % uniform at the moment to get a better overview. % \begin{macrocode} -\def_new:Npn \int_set:Nn #1#2{#1 \int_eval:w #2\scan_stop: +\def_new:Npn \int_set:Nn #1#2{#1 \int_eval:w #2\int_eval_end: %<*check> \chk_local_or_pref_global:N #1 %</check> @@ -603,14 +603,14 @@ % accessed by its number, e.g., |\count23|. Not that it should % ever happen but\dots % \begin{macrocode} - \int_advance:w #1 by \int_eval:w #2\scan_stop: + \int_advance:w #1 by \int_eval:w #2\int_eval_end: %<*check> \chk_local_or_pref_global:N #1 %</check> } \def_new:Npn\int_add:cn{\exp_args:Nc\int_add:Nn} \def_new:Npn \int_sub:Nn #1#2{ - \int_advance:w #1-\int_eval:w #2\scan_stop: + \int_advance:w #1-\int_eval:w #2\int_eval_end: %<*check> \chk_local_or_pref_global:N #1 %</check> @@ -887,15 +887,18 @@ % % \begin{macro}{\int_eval:n} % \begin{macro}{\int_eval:w} +% \begin{macro}{\int_eval_end:} % Evaluating a calc expression using normal operators. Many of these % are exactly the same as the ones in the \textsf{num} module so we % just use them. % \begin{macrocode} -\let_new:NN \int_eval:n \num_eval:n -\let_new:NN \int_eval:w \num_eval:w +\let_new:NN \int_eval:n \num_eval:n +\let_new:NN \int_eval:w \num_eval:w +\let_new:NN \int_eval_end: \num_eval_end: % \end{macrocode} % \end{macro} % \end{macro} +% \end{macro} % % \begin{macro}{\c_max_int} % The largest number allowed is $2^{31}-1$ @@ -960,7 +963,7 @@ 1)/2) \fi: /(#2) - \scan_stop: + \int_eval_end: } % \end{macrocode} % For the sake of completeness: |