expl3 update (2008/06/20)

git-svn-id: svn://tug.org/texlive/trunk@9869 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 13 insertions, 2 deletions

diff --git a/Master/texmf-dist/tex/latex/expl3/l3num.sty b/Master/texmf-dist/tex/latex/expl3/l3num.sty
index 3392ecd86f2..89c12cdb625 100644
--- a/Master/texmf-dist/tex/latex/expl3/l3num.sty
+++ b/Master/texmf-dist/tex/latex/expl3/l3num.sty
@@ -48,9 +48,13 @@
 %%
 %% -----------------------------------------------------------------------
 \RequirePackage{l3names}
-\GetIdInfo$Id: l3num.dtx 573 2006-08-21 20:59:37Z morten $
+\GetIdInfo$Id: l3num.dtx 702 2007-11-27 14:21:49Z morten $
        {L3 Experimental token numbers}
+
+\ProvidesExplPackage
+  {\filename}{\filedate}{\fileversion}{\filedescription}
 \RequirePackage{l3expan}\par
+\let_new:NN \num_value:w        \tex_number:D
 \let_new:NN \num_eval:w         \etex_numexpr:D
 \let_new:NN \if_num:w           \tex_ifnum:D
 \let_new:NN \if_num_odd:w       \tex_ifodd:D
@@ -89,7 +93,9 @@
 \def_new:Npn \num_gset_eq:Nc {\exp_args:NNc \num_gset_eq:NN}
 \def_new:Npn \num_gset_eq:cc {\exp_args:Ncc \num_gset_eq:NN}
 \def_new:Npn \num_add:Nn #1#2 {\num_set:Nn #1{#1+#2}}
+\def_new:Npn \num_add:cn {\exp_args:Nc\num_add:Nn}
 \def_new:Npn \num_gadd:Nn {\pref_global:D \num_add:Nn}
+\def_new:Npn \num_gadd:cn {\exp_args:Nc\num_gadd:Nn}
 \let_new:NN\num_use:N \use_arg_i:n
 \let_new:NN\num_use:c \cs_use:c
 \def_test_function_new:npn {num_compare:nNn}#1#2#3{
@@ -103,12 +109,17 @@
     \c_false
   \fi:
 }
+\def_new:Npn \num_abs:n#1{
+  \if_num:w \num_eval:n{#1}<\c_zero \exp_after:NN -\fi: #1
+}
+\def_new:Npn \num_max_of:nn#1#2{\num_compare:nNnTF {#1}>{#2}{#1}{#2}}
+\def_new:Npn \num_min_of:nn#1#2{\num_compare:nNnTF {#1}<{#2}{#1}{#2}}
 \num_new:N \l_tmpa_num
 \num_new:N \l_tmpb_num
 \num_new:N \l_tmpc_num
 \num_new:N \g_tmpa_num
 \num_new:N \g_tmpb_num
-\engine_aleph:TF
+\engine_if_aleph:TF
 {
   \let_new:NN \const_new_aux:Nw \tex_chardef:D
   \const_new_aux:Nw \c_max_register_num = 65535 \scan_stop: