From 2ce5888907c674d92dc8b1446458eed147af613b Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Thu, 6 Nov 2014 23:28:55 +0000
Subject: spreadtab (6nov14)

git-svn-id: svn://tug.org/texlive/trunk@35531 c570f23f-e606-0410-a88d-b1316a301751
---
 .../texmf-dist/tex/latex/spreadtab/spreadtab.sty   | 44 ++++++++++++++--------
 1 file changed, 28 insertions(+), 16 deletions(-)

(limited to 'Master/texmf-dist/tex/latex/spreadtab/spreadtab.sty')

diff --git a/Master/texmf-dist/tex/latex/spreadtab/spreadtab.sty b/Master/texmf-dist/tex/latex/spreadtab/spreadtab.sty
index 4e0c9924a34..661eb251946 100644
--- a/Master/texmf-dist/tex/latex/spreadtab/spreadtab.sty
+++ b/Master/texmf-dist/tex/latex/spreadtab/spreadtab.sty
@@ -1,16 +1,16 @@
 %  ____________________________________________________________________________
 % |                                                                           |
 % |                                                                           |
-% |                              spreadtab v0.4b                              |
+% |                              spreadtab v0.4c                              |
 % |                                                                           |
-% |                                13 may 2012                                |
+% |                              6 november 2014                              |
 % |                                                                           |
 % |___________________________________________________________________________|
 %
 % This is spreadtab.sty, the code of the spreadtab package.
 %
-% Copyright Christian Tellechea 2009-2011
-% email : unbonpetit@gmail.com
+% Copyright Christian Tellechea 2009-2014
+% email : unbonpetit@openmailbox.org
 %
 % The "spreadtab" package consists of the 6 following files:
 %   spreadtab.sty (this file)
@@ -37,15 +37,15 @@
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%% D\'efinitions pr\'ealables %%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\newcommand\ST@ver     {0.4b}
-\newcommand\ST@date    {2012/05/13}
-\newcommand\ST@fr@date {13 mai 2012}
-\newcommand\ST@eng@date{13 may 2012}
+\newcommand\ST@ver     {0.4c}
+\newcommand\ST@date    {2014/11/03}
+\newcommand\ST@fr@date {6 novembre 2014}
+\newcommand\ST@eng@date{6 november 2014}
 
 \ProvidesPackage{spreadtab}[\ST@date\space v\ST@ver\space Spreadsheet features for table environments]
 \NeedsTeXFormat{LaTeX2e}
 \RequirePackage{fp}% pour les calculs scientifiques
-\RequirePackage{xstring}[2010/03/28]% version n\'ecessaire
+\RequirePackage{xstring}[2013/07/29]% version n\'ecessaire
 
 \newcount\ST@count
 \newcount\ST@colcount
@@ -237,9 +237,8 @@
 % enl\`eve tous les espaces de la sc #1 et assigne le r\'esultat \'a #1
 \newcommand\ST@remove@first@spaces[1]{%
 	\IfBeginWith#1\space
-		{\StrGobbleLeft#11[#1]\def\ST@nextspace{\ST@remove@first@spaces{#1}}}%
-		{\let\ST@nextspace\relax}%
-	\ST@nextspace
+		{\StrGobbleLeft#11[#1]\ST@remove@first@spaces{#1}}%
+		{}%
 }
 
 \newcommand\ST@keep@firstcar[1]{% on ne garde dans la sc #1 que le 1er caract\`ere de la sc #1 ou on enl\`eve les accolades
@@ -1524,12 +1523,14 @@
 }
 
 \newcommand\ST@analyse@text@engdate[4]{% #1=texte repr\'esentant la date #2=jour #3=n° mois #4=ann\'ee
-	\if\noexpand\today\expandafter\noexpand#1%
+	\ST@remove@first@spaces#1%
+	\def\ST@today{\today}%
+	\ifx#1\ST@today
 		\edef#2{\number\day}\edef#3{\number\month}\edef#4{\number\year}%
 	\else
 		\ST@left#1\space#3%
 		\ST@removespaces#3%
-		\expandafter\lowercase\expandafter{\expandafter\def\expandafter#3\expandafter{#3}}%
+		\lowercase\expandafter{\expandafter\def\expandafter#3\expandafter{#3}}%
 		\IfStrEqCase#3{%
 			{january}{\def#3{1}}%
 			{february}{\def#3{2}}%
@@ -1561,7 +1562,9 @@
 \def\ST@utfencoding{utf8}
 
 \newcommand\ST@analyse@text@frdate[4]{% #1=texte repr\'esentant la date #2=jour #3=n° mois #4=ann\'ee
-	\if\noexpand\today\expandafter\noexpand#1%
+	\ST@remove@first@spaces#1%
+	\def\ST@today{\today}%
+	\ifx#1\ST@today
 		\edef#2{\number\day}\edef#3{\number\month}\edef#4{\number\year}%
 	\else
 		\ST@split#1{ }#2#3%
@@ -1656,6 +1659,7 @@
 	\StrBefore\ST@dipslaycell\ST@enddisplay[\ST@dipslaycell]%
 	\let\ST@next\@gobble% \'a priori, on ne reboucle pas
 	\unless\ifx\@empty\ST@dipslaycell% si ce qui a entre les marqueurs n'est pas vide
+		\edef\ST@current@colnumber{\number\ST@colcount}\edef\ST@current@rownumber{\number\ST@rowcount}%
 		\ST@ifref\ST@dipslaycell% et si c'est une r\'ef\'erence valide
 			{\let\ST@next\ST@startdisplay
 			\ST@expadd@tomacro\ST@next\ST@dipslaycell
@@ -2132,4 +2136,12 @@ v0.4a       2011/08/11
     1  Un bug corrig\'e dans \ST@search@hline@i
 -------------------------------------------------------------------------------
 v0.4b       2012/05/13
-    1  Un bug corrig\'e dans \ST@func@sum
\ No newline at end of file
+    1  Un bug corrig\'e dans \ST@func@sum
+-------------------------------------------------------------------------------
+v0.4c       2014/11/06
+    1  Un bug corrig\'e dans \ST@analyse@text@frdate et
+       \ST@analyse@text@engdate : si #1 commence par un espace parasite,
+       celui-ci est d\'esormais retir\'e.
+    2  Bug corrig\'e dans \ST@displaynumfields : les macros
+       \ST@current@colnumber et \ST@current@rownumber sont définies avant
+       d'appeler \ST@ifref
\ No newline at end of file
-- 
cgit v1.2.3

