coollist update (20sep09)

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

3 files changed, 29 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/coollist/coollist.pdf b/Master/texmf-dist/doc/latex/coollist/coollist.pdf
index 6d902d24fba..23f9b4806e3 100644
--- a/Master/texmf-dist/doc/latex/coollist/coollist.pdf
+++ b/Master/texmf-dist/doc/latex/coollist/coollist.pdf
diff --git a/Master/texmf-dist/source/latex/coollist/coollist.dtx b/Master/texmf-dist/source/latex/coollist/coollist.dtx
index ddc9bb0ebdd..2e6b0e3a84c 100644
--- a/Master/texmf-dist/source/latex/coollist/coollist.dtx
+++ b/Master/texmf-dist/source/latex/coollist/coollist.dtx
@@ -2,7 +2,7 @@
 %
 %<package>\NeedsTeXFormat{LaTeX2e}[1999/12/01]
 %<package>\ProvidesPackage{coollist}
-%<package> [2007/10/14 v1.3 COntent Oriented LaTeX Lists]
+%<package> [2009/09/20 v1.4 COntent Oriented LaTeX Lists]
 %<package>\RequirePackage{ifthen}
 %<package>\RequirePackage{amsmath}
 %<package>\RequirePackage{amssymb}
@@ -25,7 +25,7 @@
 % \fi
 %
 %
-% \CheckSum{247}
+% \CheckSum{251}
 %
 %
 %% \CharacterTable
@@ -74,7 +74,7 @@
 % \DoNotIndex{\COOL@Hypergeometric@pq,\COOL@Hypergeometric@pq@ab@value,\hideOnSF,\COOL@decide@paren}
 % \DoNotIndex{\COOL@decide@indicies}
 % \DoNotIndex{\mod,\bmod,\pmod,\pod,\operatorname}
-% \DoNotIndex{\forLoop}
+% \DoNotIndex{\forLoop,\forloop}
 % \DoNotIndex{\listval,\liststore,\isint,\isnumeric}
 % \DoNotIndex{
 % \COOL@list@temp@i,
@@ -169,8 +169,8 @@
 %
 % \DescribeMacro{\listsum}
 % |\listsum|\oarg{storedlist}\marg{list}\marg{macro} stores the sum of the comma delimited list \meta{list} 
-% (if \meta{storedlist} is |storedlist=false|) or the sum of the stored list with base name \meta{list} 
-% (if \meta{storedlist} is |storedlist=true|) in the macro \meta{macro}.  
+% (if \meta{storedlist} is |storedlist=false| or |liststored=false|) or the sum of the stored list with base name \meta{list} 
+% (if \meta{storedlist} is |storedlist=true| or |liststored=true|) in the macro \meta{macro}.  
 % Integers are recognized and summed accordingly.  All other tokens are summed as variables with some
 % integer coefficient as the end result.
 %
@@ -571,6 +571,7 @@
 % \begin{macro}{\listsum}
 % \changes{v1.2}{2007/10/10}{added this function to the package}
 % \changes{v1.3}{2007/10/14}{altered function to take optional argument for summing stored lists}
+% \changes{v1.4}{2009/09/20}{corrected optional argument to accept both `storedlist' and `liststored' due to original error in error message}
 % Sum the contents of the list.  Integers are recognized and summed, tokens are treated as independent variables.  
 % The function returns a string of the sum
 %
@@ -595,7 +596,7 @@
 %    \end{macrocode}
 % Check to see if the list is already stored.  If it is, copy it; otherwise store it
 %    \begin{macrocode}
-\ifthenelse{ \equal{#1}{liststored=false} }%
+\ifthenelse{ \equal{#1}{liststored=false} \OR \equal{#1}{storedlist=false} }%
         {%
 %    \end{macrocode}
 % First store the entire list
@@ -609,7 +610,7 @@
 %    \end{macrocode}
 % ElseIf
 %    \begin{macrocode}
-{ \ifthenelse{ \equal{#1}{liststored=true} }%
+{ \ifthenelse{ \equal{#1}{liststored=true} \OR \equal{#1}{storedlist=true} }%
         {%
         \listcopy{#2}{COOL@listtosum@element@}%
         \setcounter{COOL@listlen}{\COOL@listtosum@element@length}%
@@ -619,7 +620,7 @@
 %    \begin{macrocode}
         {%
         \PackageError{cool}{Invalid listsum optional argument}%
-                {listsum's optional argument may only be `storedlist=true' or `storedlist=false'}%
+                {optional argument may only be `storedlist=true', `liststored=true', `storedlist=false', or `liststored=false'}%
         }}%
 %    \end{macrocode}
 % check for the list having a non-zero length
@@ -697,7 +698,9 @@
                                                 }%
                                         \setcounter{COOL@intsum}{\COOL@listsum@known@element@coef}%
                                         \addtocounter{COOL@intsum}{1}%
-                                        \expandafter\xdef\csname COOL@listsum@register@coef@\roman{COOL@register@ct}\endcsname{\arabic{COOL@intsum}}%
+                                        \expandafter%
+                                                \xdef\csname COOL@listsum@register@coef@\roman{COOL@register@ct}\endcsname%
+                                                        {\arabic{COOL@intsum}}%
 %    \end{macrocode}
 %                                       flag the element as found and set the counter to the length of the register $+1$
 %    \begin{macrocode}
@@ -719,8 +722,11 @@
 %    \begin{macrocode}
                                 {%
                                 \addtocounter{COOL@register@len}{1}%
-                                \expandafter\xdef\csname COOL@listsum@register@\roman{COOL@register@len}\endcsname{\COOL@listsum@element}%
-                                \expandafter\xdef\csname COOL@listsum@register@coef@\roman{COOL@register@len}\endcsname{1}%
+                                \expandafter%
+                                        \xdef\csname COOL@listsum@register@\roman{COOL@register@len}\endcsname%
+                                                {\COOL@listsum@element}%
+                                \expandafter%
+                                        \xdef\csname COOL@listsum@register@coef@\roman{COOL@register@len}\endcsname{1}%
                                 }%
                         }%
                 }%
diff --git a/Master/texmf-dist/tex/latex/coollist/coollist.sty b/Master/texmf-dist/tex/latex/coollist/coollist.sty
index 052ea198fe6..a17ecac30ac 100644
--- a/Master/texmf-dist/tex/latex/coollist/coollist.sty
+++ b/Master/texmf-dist/tex/latex/coollist/coollist.sty
@@ -13,7 +13,7 @@
 %% 
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
 \ProvidesPackage{coollist}
- [2007/10/14 v1.3 COntent Oriented LaTeX Lists]
+ [2009/09/20 v1.4 COntent Oriented LaTeX Lists]
 \RequirePackage{ifthen}
 \RequirePackage{amsmath}
 \RequirePackage{amssymb}
@@ -114,19 +114,19 @@
 \newcounter{COOL@register@len}
 \newboolean{COOL@listsum@isint}
 \newcommand{\listsum}[3][liststored=false]{%
-\ifthenelse{ \equal{#1}{liststored=false} }%
+\ifthenelse{ \equal{#1}{liststored=false} \OR \equal{#1}{storedlist=false} }%
         {%
         \liststore{#2}{COOL@listtosum@element@}%
         \listlenstore{COOL@listlen}{#2}%
         }%
-{ \ifthenelse{ \equal{#1}{liststored=true} }%
+{ \ifthenelse{ \equal{#1}{liststored=true} \OR \equal{#1}{storedlist=true} }%
         {%
         \listcopy{#2}{COOL@listtosum@element@}%
         \setcounter{COOL@listlen}{\COOL@listtosum@element@length}%
         }%
         {%
         \PackageError{cool}{Invalid listsum optional argument}%
-                {listsum's optional argument may only be `storedlist=true' or `storedlist=false'}%
+                {optional argument may only be `storedlist=true', `liststored=true', `storedlist=false', or `liststored=false'}%
         }}%
 \ifthenelse{ \value{COOL@listlen} < 1 }%
         {%
@@ -170,7 +170,9 @@
                                                 }%
                                         \setcounter{COOL@intsum}{\COOL@listsum@known@element@coef}%
                                         \addtocounter{COOL@intsum}{1}%
-                                        \expandafter\xdef\csname COOL@listsum@register@coef@\roman{COOL@register@ct}\endcsname{\arabic{COOL@intsum}}%
+                                        \expandafter%
+                                                \xdef\csname COOL@listsum@register@coef@\roman{COOL@register@ct}\endcsname%
+                                                        {\arabic{COOL@intsum}}%
                                         \setboolean{COOL@found}{true}%
                                         }%
                                         {%
@@ -180,8 +182,11 @@
                                 {}%
                                 {%
                                 \addtocounter{COOL@register@len}{1}%
-                                \expandafter\xdef\csname COOL@listsum@register@\roman{COOL@register@len}\endcsname{\COOL@listsum@element}%
-                                \expandafter\xdef\csname COOL@listsum@register@coef@\roman{COOL@register@len}\endcsname{1}%
+                                \expandafter%
+                                        \xdef\csname COOL@listsum@register@\roman{COOL@register@len}\endcsname%
+                                                {\COOL@listsum@element}%
+                                \expandafter%
+                                        \xdef\csname COOL@listsum@register@coef@\roman{COOL@register@len}\endcsname{1}%
                                 }%
                         }%
                 }%