diff options
Diffstat (limited to 'Master/texmf-dist/source/latex/l3kernel/l3int.dtx')
| -rw-r--r-- | Master/texmf-dist/source/latex/l3kernel/l3int.dtx | 106 |
1 files changed, 49 insertions, 57 deletions
diff --git a/Master/texmf-dist/source/latex/l3kernel/l3int.dtx b/Master/texmf-dist/source/latex/l3kernel/l3int.dtx index d0f7ab46de7..7a176c93588 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{l3bootstrap} -\GetIdInfo$Id: l3int.dtx 3991 2012-07-16 19:00:35Z joseph $ +\GetIdInfo$Id: l3int.dtx 4121 2012-08-17 01:36:30Z bruno $ {L3 Integers} %</driver|package> %<*driver> @@ -258,7 +258,7 @@ % \begin{syntax} % \cs{int_sub:Nn} \meta{integer} \Arg{integer expression} % \end{syntax} -% Subtracts the result of the \meta{integer expression} to the +% Subtracts the result of the \meta{integer expression} from the % current content of the \meta{integer}. % \end{function} % @@ -365,36 +365,9 @@ % % \section{Integer expression loops} % -% \begin{function}[rEXP]{\int_do_while:nNnn} -% \begin{syntax} -% \cs{int_do_while:nNnn} -% ~~\Arg{intexpr_1} \meta{relation} \Arg{intexpr_2} \Arg{code} -% \end{syntax} -% Evaluates the relationship between the two \meta{integer expressions} -% as described for \cs{int_compare:nNnTF}, and then places the -% \meta{code} in the input stream if the \meta{relation} is -% \texttt{true}. After the \meta{code} has been processed by \TeX{} the -% test will be repeated, and a loop will occur until the test is -% \texttt{false}. -% \end{function} -% % \begin{function}[rEXP]{\int_do_until:nNnn} % \begin{syntax} -% \cs{int_do_until:nNnn} -% ~~\Arg{intexpr_1} \meta{relation} \Arg{intexpr_2} \Arg{code} -% \end{syntax} -% Evaluates the relationship between the two \meta{integer expressions} -% as described for \cs{int_compare:nNnTF}, and then places the -% \meta{code} in the input stream if the \meta{relation} is -% \texttt{false}. After the \meta{code} has been processed by \TeX{} the -% test will be repeated, and a loop will occur until the test is -% \texttt{true}. -% \end{function} -% -% \begin{function}[rEXP]{\int_until_do:nNnn} -% \begin{syntax} -% \cs{int_until_do:nNnn} -% ~~\Arg{intexpr_1} \meta{relation} \Arg{intexpr_2} \Arg{code} +% \cs{int_do_until:nNnn} \Arg{intexpr_1} \meta{relation} \Arg{intexpr_2} \Arg{code} % \end{syntax} % Places the \meta{code} in the input stream for \TeX{} to process, and % then evaluates the relationship between the two @@ -404,10 +377,9 @@ % \meta{relation} is \texttt{true}. % \end{function} % -% \begin{function}[rEXP]{\int_while_do:nNnn} +% \begin{function}[rEXP]{\int_do_while:nNnn} % \begin{syntax} -% \cs{int_while_do:nNnn} \ -% ~~\Arg{intexpr_1} \meta{relation} \Arg{intexpr_2} \Arg{code} +% \cs{int_do_while:nNnn} \Arg{intexpr_1} \meta{relation} \Arg{intexpr_2} \Arg{code} % \end{syntax} % Places the \meta{code} in the input stream for \TeX{} to process, and % then evaluates the relationship between the two @@ -417,38 +389,35 @@ % \meta{relation} is \texttt{false}. % \end{function} % -% \begin{function}[rEXP]{\int_do_while:nn} +% \begin{function}[rEXP]{\int_until_do:nNnn} % \begin{syntax} -% \cs{int_do_while:nn} -% ~~\{ \meta{intexpr_1} \meta{relation} \meta{intexpr_2} \} \Arg{code} +% \cs{int_until_do:nNnn} \Arg{intexpr_1} \meta{relation} \Arg{intexpr_2} \Arg{code} % \end{syntax} % Evaluates the relationship between the two \meta{integer expressions} -% as described for \cs{int_compare:nTF}, and then places the +% as described for \cs{int_compare:nNnTF}, and then places the % \meta{code} in the input stream if the \meta{relation} is -% \texttt{true}. After the \meta{code} has been processed by \TeX{} the +% \texttt{false}. After the \meta{code} has been processed by \TeX{} the % test will be repeated, and a loop will occur until the test is -% \texttt{false}. +% \texttt{true}. % \end{function} % -% \begin{function}[rEXP]{\int_do_until:nn} +% \begin{function}[rEXP]{\int_while_do:nNnn} % \begin{syntax} -% \cs{int_do_until:nn} -% ~~\{ \meta{intexpr_1} \meta{relation} \meta{intexpr_2} \} \Arg{code} +% \cs{int_while_do:nNnn} \Arg{intexpr_1} \meta{relation} \Arg{intexpr_2} \Arg{code} % \end{syntax} % Evaluates the relationship between the two \meta{integer expressions} -% as described for \cs{int_compare:nTF}, and then places the +% as described for \cs{int_compare:nNnTF}, and then places the % \meta{code} in the input stream if the \meta{relation} is -% \texttt{false}. After the \meta{code} has been processed by \TeX{} the +% \texttt{true}. After the \meta{code} has been processed by \TeX{} the % test will be repeated, and a loop will occur until the test is -% \texttt{true}. +% \texttt{false}. % \end{function} % -% \begin{function}[rEXP]{\int_until_do:nn} +% \begin{function}[rEXP]{\int_do_until:nn} % \begin{syntax} -% \cs{int_until_do:nn} -% ~~\{ \meta{intexpr_1} \meta{relation} \meta{intexpr_2} \} \Arg{code} +% \cs{int_do_until:nn} \{ \meta{intexpr_1} \meta{relation} \meta{intexpr_2} \} \Arg{code} % \end{syntax} -% Places the \meta{code} in the input stream for \TeX\ to process, and +% Places the \meta{code} in the input stream for \TeX{} to process, and % then evaluates the relationship between the two % \meta{integer expressions} as described for \cs{int_compare:nTF}. % If the test is \texttt{false} then the \meta{code} will be inserted @@ -456,10 +425,9 @@ % \meta{relation} is \texttt{true}. % \end{function} % -% \begin{function}[rEXP]{\int_while_do:nn} +% \begin{function}[rEXP]{\int_do_while:nn} % \begin{syntax} -% \cs{int_while_do:nn} \ -% ~~\{ \meta{intexpr_1} \meta{relation} \meta{intexpr_2} \} \Arg{code} +% \cs{int_do_while:nn} \{ \meta{intexpr_1} \meta{relation} \meta{intexpr_2} \} \Arg{code} % \end{syntax} % Places the \meta{code} in the input stream for \TeX{} to process, and % then evaluates the relationship between the two @@ -469,6 +437,30 @@ % \meta{relation} is \texttt{false}. % \end{function} % +% \begin{function}[rEXP]{\int_until_do:nn} +% \begin{syntax} +% \cs{int_until_do:nn} \{ \meta{intexpr_1} \meta{relation} \meta{intexpr_2} \} \Arg{code} +% \end{syntax} +% Evaluates the relationship between the two \meta{integer expressions} +% as described for \cs{int_compare:nTF}, and then places the +% \meta{code} in the input stream if the \meta{relation} is +% \texttt{false}. After the \meta{code} has been processed by \TeX{} the +% test will be repeated, and a loop will occur until the test is +% \texttt{true}. +% \end{function} +% +% \begin{function}[rEXP]{\int_while_do:nn} +% \begin{syntax} +% \cs{int_while_do:nn} \{ \meta{intexpr_1} \meta{relation} \meta{intexpr_2} \} \Arg{code} +% \end{syntax} +% Evaluates the relationship between the two \meta{integer expressions} +% as described for \cs{int_compare:nTF}, and then places the +% \meta{code} in the input stream if the \meta{relation} is +% \texttt{true}. After the \meta{code} has been processed by \TeX{} the +% test will be repeated, and a loop will occur until the test is +% \texttt{false}. +% \end{function} +% % \section{Integer step functions} % % \begin{function}[added = 2012-06-04, updated = 2012-06-29, rEXP] @@ -1508,11 +1500,11 @@ } \cs_new:Npn \int_until_do:nNnn #1#2#3#4 { - \int_compare:nNnF {#1} #2 {#3} - { - #4 - \int_until_do:nNnn {#1} #2 {#3} {#4} - } + \int_compare:nNnF {#1} #2 {#3} + { + #4 + \int_until_do:nNnn {#1} #2 {#3} {#4} + } } \cs_new:Npn \int_do_while:nNnn #1#2#3#4 { |