xint (8may13)

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

1 files changed, 29 insertions, 76 deletions

diff --git a/Master/texmf-dist/tex/generic/xint/xintseries.sty b/Master/texmf-dist/tex/generic/xint/xintseries.sty
index 54cb650d53f..48145867882 100644
--- a/Master/texmf-dist/tex/generic/xint/xintseries.sty
+++ b/Master/texmf-dist/tex/generic/xint/xintseries.sty
@@ -22,7 +22,7 @@
 %% in the same archive or directory.)
 %%
 %%----------------------------------------------------------------
-%% The xint bundle (version 1.05a of May 2nd, 2013)
+%% The xint bundle (version 1.06 of May 7th, 2013)
 %% xintseries: Expandable partial sums with xint package
 %% Copyright (C) 2013 by Jean-Francois Burnol
 %%----------------------------------------------------------------
@@ -116,6 +116,7 @@
       {%
         \catcode93=\the\catcode93   % ]
         \catcode91=\the\catcode91   % [
+        \catcode96=\the\catcode96   % `
         \catcode47=\the\catcode47   % /
         \catcode41=\the\catcode41   % )
         \catcode40=\the\catcode40   % (
@@ -162,21 +163,15 @@
   \fi
 \expandafter\x\csname ver@xintseries.sty\endcsname
 \ProvidesPackage{xintseries}%
-  [2013/05/02 v1.05a Expandable partial sums with xint package (jfB)]%
+  [2013/05/07 v1.06 Expandable partial sums with xint package (jfB)]%
 \def\xintSeries {\romannumeral0\xintseries }%
 \def\xintseries #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@series@i
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@series@i\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@series@i #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@series@ii
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@series@ii\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@series@ii #1#2#3%
 {%
@@ -196,22 +191,16 @@
 }%
 \def\XINT@series@exit \fi #1#2#3#4#5#6#7#8%
 {%
-    \fi\xint@gobble@two #6%
+    \fi\xint@gobble@ii #6%
 }%
 \def\xintiSeries {\romannumeral0\xintiseries }%
 \def\xintiseries #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@iseries@i
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@iseries@i\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@iseries@i #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@iseries@ii
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@iseries@ii\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@iseries@ii #1#2#3%
 {%
@@ -231,22 +220,16 @@
 }%
 \def\XINT@iseries@exit \fi #1#2#3#4#5#6#7#8%
 {%
-    \fi\xint@gobble@two #6%
+    \fi\xint@gobble@ii #6%
 }%
 \def\xintPowerSeries {\romannumeral0\xintpowerseries }%
 \def\xintpowerseries #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@powseries@i
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@powseries@i\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@powseries@i #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@powseries@ii
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@powseries@ii\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@powseries@ii #1#2#3#4%
 {%
@@ -280,17 +263,11 @@
 \def\xintPowerSeriesX {\romannumeral0\xintpowerseriesx }%
 \def\xintpowerseriesx #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@powseriesx@i
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@powseriesx@i\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@powseriesx@i #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@powseriesx@ii
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@powseriesx@ii\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@powseriesx@ii #1#2#3#4%
 {%
@@ -298,8 +275,9 @@
       \xint@afterfi { 0[0]}%
    \else
       \xint@afterfi
-      {\expandafter\expandafter\expandafter\XINT@powseriesx@pre
-       \expandafter\expandafter\expandafter {#4}{#1}{#2}{#3}}%
+      {\expandafter\XINT@powseriesx@pre\expandafter
+                  {\romannumeral-`0#4}{#1}{#2}{#3}%
+      }%
    \fi
 }%
 \def\XINT@powseriesx@pre #1#2#3#4%
@@ -309,17 +287,11 @@
 \def\xintRationalSeries {\romannumeral0\xintratseries }%
 \def\xintratseries #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@ratseries@i
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@ratseries@i\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@ratseries@i #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@ratseries@ii
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@ratseries@ii\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@ratseries@ii #1#2#3#4%
 {%
@@ -352,17 +324,11 @@
 \def\xintRationalSeriesX {\romannumeral0\xintratseriesx }%
 \def\xintratseriesx #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@ratseriesx@i
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@ratseriesx@i\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@ratseriesx@i #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@ratseriesx@ii
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@ratseriesx@ii\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@ratseriesx@ii #1#2#3#4#5%
 {%
@@ -370,8 +336,9 @@
       \xint@afterfi { 0[0]}%
    \else
       \xint@afterfi
-      {\expandafter\expandafter\expandafter\XINT@ratseriesx@pre
-       \expandafter\expandafter\expandafter {#5}{#2}{#1}{#4}{#3}}%
+      {\expandafter\XINT@ratseriesx@pre\expandafter
+                   {\romannumeral-`0#5}{#2}{#1}{#4}{#3}%
+      }%
    \fi
 }%
 \def\XINT@ratseriesx@pre #1#2#3#4#5%
@@ -381,17 +348,11 @@
 \def\xintFxPtPowerSeries {\romannumeral0\xintfxptpowerseries }%
 \def\xintfxptpowerseries #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@fppowseries@i
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@fppowseries@i\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@fppowseries@i #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@fppowseries@ii
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@fppowseries@ii\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@fppowseries@ii #1#2#3#4#5%
 {%
@@ -440,17 +401,11 @@
 \def\xintFxPtPowerSeriesX {\romannumeral0\xintfxptpowerseriesx }%
 \def\xintfxptpowerseriesx #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@fppowseriesx@i
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@fppowseriesx@i\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@fppowseriesx@i #1#2%
 {%
-    \expandafter\expandafter\expandafter
-        \XINT@fppowseriesx@ii
-    \expandafter\expandafter\expandafter
-        {#2}{#1}%
+    \expandafter\XINT@fppowseriesx@ii\expandafter {\the\numexpr #2}{#1}%
 }%
 \def\XINT@fppowseriesx@ii #1#2#3#4#5%
 {%
@@ -458,10 +413,8 @@
       \xint@afterfi { 0}%
    \else
       \xint@afterfi
-        {\expandafter\expandafter\expandafter
-         \XINT@fppowseriesx@pre
-         \expandafter\expandafter\expandafter
-         {#4}{#1}{#2}{#3}{#5}%
+        {\expandafter \XINT@fppowseriesx@pre \expandafter
+         {\romannumeral-`0#4}{#1}{#2}{#3}{#5}%
         }%
    \fi
 }%