xint (28nov13)

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

1 files changed, 16 insertions, 13 deletions

diff --git a/Master/texmf-dist/tex/generic/xint/xintexpr.sty b/Master/texmf-dist/tex/generic/xint/xintexpr.sty
index b8ec31f6495..73cd012e331 100644
--- a/Master/texmf-dist/tex/generic/xint/xintexpr.sty
+++ b/Master/texmf-dist/tex/generic/xint/xintexpr.sty
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 %%
 %%----------------------------------------------------------------
-%% The xint bundle (version 1.09g of November 22, 2013)
+%% The xint bundle (version 1.09h of November 28, 2013)
 %% xintexpr: Expandable expression parser
 %% Copyright (C) 2013 by Jean-Francois Burnol
 %%----------------------------------------------------------------
@@ -105,7 +105,7 @@
 \XINTsetupcatcodes%
 \XINT_providespackage
 \ProvidesPackage{xintexpr}%
-  [2013/11/22 v1.09g Expandable expression parser (jfB)]%
+  [2013/11/28 v1.09h Expandable expression parser (jfB)]%
 \def\xint_gob_til_dot #1.{}%
 \def\xint_gob_til_dot_andstop #1.{ }%
 \def\xint_gob_til_! #1!{}% nota bene: ! is of catcode 11
@@ -726,7 +726,7 @@
 \def\XINT_flexpr_func_max #1#2#3%
 {%
     \expandafter #1\expandafter #2\csname
-              .\xintFloatMaxof:csv{\XINT_expr_unlock #3}\endcsname
+              .\XINTinFloatMaxof:csv{\XINT_expr_unlock #3}\endcsname
 }%
 \def\XINT_expr_func_min #1#2#3%
 {%
@@ -736,7 +736,7 @@
 \def\XINT_flexpr_func_min #1#2#3%
 {%
     \expandafter #1\expandafter #2\csname
-              .\xintFloatMinof:csv{\XINT_expr_unlock #3}\endcsname
+              .\XINTinFloatMinof:csv{\XINT_expr_unlock #3}\endcsname
 }%
 \def\XINT_expr_func_sum #1#2#3%
 {%
@@ -746,7 +746,7 @@
 \def\XINT_flexpr_func_sum #1#2#3%
 {%
     \expandafter #1\expandafter #2\csname
-              .\xintFloatSum:csv{\XINT_expr_unlock #3}\endcsname
+              .\XINTinFloatSum:csv{\XINT_expr_unlock #3}\endcsname
 }%
 \def\XINT_expr_func_prd #1#2#3%
 {%
@@ -756,7 +756,7 @@
 \def\XINT_flexpr_func_prd #1#2#3%
 {%
     \expandafter #1\expandafter #2\csname
-              .\xintFloatPrd:csv{\XINT_expr_unlock #3}\endcsname
+              .\XINTinFloatPrd:csv{\XINT_expr_unlock #3}\endcsname
 }%
 \let\XINT_expr_func_add\XINT_expr_func_sum
 \let\XINT_expr_func_mul\XINT_expr_func_prd
@@ -820,7 +820,7 @@
                             \expandafter\xint_secondoftwo
                            \fi
                            {_xintListWithSep,{#1}}{\xint_firstofone#1}}%
-\xintForpair #1#2 in {(fl,Float),(num,iRound0),(bool,IsTrue)} \do {%
+\xintForpair #1#2 in {(fl,Float),(num,iRound0),(bool,IsTrue)}\do {%
     \expandafter\def\csname XINT_new#1expr_print\endcsname
                       ##1{\ifnum\xintNthElt{0}{##1}>1
                             \expandafter\xint_firstoftwo
@@ -832,18 +832,21 @@
 \toks0 {}%
 \xintFor #1 in {Bool,Toggle,Floor,Ceil,iRound,Round,iTrunc,Trunc,%
         Lt,Gt,Eq,AND,OR,IsNotZero,IsZero,ifNotZero,ifSgn,%
-        Irr,Num,Abs,Sgn,Opp,Quo,Rem,Add,Sub,Mul,Sqr,Div,Pow,Fac,fE} \do
+        Irr,Num,Abs,Sgn,Opp,Quo,Rem,Add,Sub,Mul,Sqr,Div,Pow,Fac,fE}\do
  {\toks0
   \expandafter{\the\toks0\expandafter\def\csname xint#1\endcsname {_xint#1}}}%
-\xintFor #1 in {GCDof,LCMof,Maxof,Minof,ANDof,ORof,XORof,%
-                FloatMaxof,FloatMinof,Sum,Prd,FloatSum,FloatPrd} \do
+\xintFor #1 in {GCDof,LCMof,Maxof,Minof,ANDof,ORof,XORof,Sum,Prd}\do
  {\toks0
   \expandafter{\the\toks0\expandafter\def\csname xint#1:csv\endcsname
-                         ####1{_xint#1 {\xintCSVtoListNonStripped {####1}}}}}%
-\xintFor #1 in {,Sqrt,Add,Sub,Mul,Div,Power,fE} \do
+                ####1{_xint#1{\xintCSVtoListNonStripped {####1}}}}}%
+\xintFor #1 in {Maxof,Minof,Sum,Prd}\do
+ {\toks0
+  \expandafter{\the\toks0\expandafter\def\csname XINTinFloat#1:csv\endcsname
+                ####1{_XINTinFloat#1{\xintCSVtoListNonStripped {####1}}}}}%
+\xintFor #1 in {,Sqrt,Add,Sub,Mul,Div,Power,fE}\do
   {\toks0
    \expandafter{\the\toks0\expandafter\def\csname XINTinFloat#1\endcsname
-                                          {_XINTinFloat#1}}}%
+              {_XINTinFloat#1}}}%
 \expandafter\def\expandafter\XINT_expr_protect\expandafter{\the\toks0
     \def\XINTdigits {_XINTdigits}%
     \def\XINT_expr_print ##1{\expandafter\XINT_newexpr_print\expandafter