From e679d4dd811dedc2b164b4ec19ba8053b2cae3ad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 17 May 2010 16:12:12 +0000 Subject: spreadtab update (16may10) git-svn-id: svn://tug.org/texlive/trunk@18315 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/spreadtab/README | 4 +-- .../doc/latex/spreadtab/spreadtab_doc_en.pdf | Bin 767688 -> 768434 bytes .../doc/latex/spreadtab/spreadtab_doc_en.tex | 6 ++-- .../doc/latex/spreadtab/spreadtab_doc_fr.pdf | Bin 801780 -> 802544 bytes .../doc/latex/spreadtab/spreadtab_doc_fr.tex | 6 ++-- .../texmf-dist/tex/latex/spreadtab/spreadtab.sty | 34 ++++++++++++++------- 6 files changed, 31 insertions(+), 19 deletions(-) diff --git a/Master/texmf-dist/doc/latex/spreadtab/README b/Master/texmf-dist/doc/latex/spreadtab/README index e2d33bd5da9..88f7329b6f7 100644 --- a/Master/texmf-dist/doc/latex/spreadtab/README +++ b/Master/texmf-dist/doc/latex/spreadtab/README @@ -1,8 +1,8 @@ _____________________ spreadtab package - v0.3 - 2010/03/28 + v0.3a + 2010/05/15 _____________________ This package provides spreadsheet features for LaTeX table environments. diff --git a/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_en.pdf b/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_en.pdf index 843b9f4f338..02881028218 100644 Binary files a/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_en.pdf and b/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_en.pdf differ diff --git a/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_en.tex b/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_en.tex index d2471820012..9cbde6945eb 100644 --- a/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_en.tex +++ b/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_en.tex @@ -1,16 +1,16 @@ % ____________________________________________________________________________ % | | % | | -% | spreadtab v0.2a | +% | spreadtab v0.3a | % | | -% | February 2, 2010 | +% | May 15, 2010 | % | | % |___________________________________________________________________________| % % This file is spreadtab_doc_en.tex, the source code of the english manual of % the spreadtab package. % -% Copyright Christian Tellechea 2009 +% Copyright Christian Tellechea 2009-2010 % email : unbonpetit@gmail.com % % ------------------------------------------------------------------- diff --git a/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_fr.pdf b/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_fr.pdf index 52d00b687ef..2ba2f35c977 100644 Binary files a/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_fr.pdf and b/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_fr.pdf differ diff --git a/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_fr.tex b/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_fr.tex index 31bf465eeef..67ff436c8a6 100644 --- a/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_fr.tex +++ b/Master/texmf-dist/doc/latex/spreadtab/spreadtab_doc_fr.tex @@ -1,9 +1,9 @@ -% ____________________________________________________________________________ +% ____________________________________________________________________________ % | | % | | -% | spreadtab v0.2a | +% | spreadtab v0.3a | % | | -% | 2 février 2010 | +% | May 15, 2010 | % | | % |___________________________________________________________________________| % diff --git a/Master/texmf-dist/tex/latex/spreadtab/spreadtab.sty b/Master/texmf-dist/tex/latex/spreadtab/spreadtab.sty index 0b99176c0e3..3b82d43ee65 100644 --- a/Master/texmf-dist/tex/latex/spreadtab/spreadtab.sty +++ b/Master/texmf-dist/tex/latex/spreadtab/spreadtab.sty @@ -1,9 +1,9 @@ % ____________________________________________________________________________ % | | % | | -% | spreadtab v0.3 | +% | spreadtab v0.3a | % | | -% | March 28, 2010 | +% | May 15, 2010 | % | | % |___________________________________________________________________________| % @@ -37,15 +37,15 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%% Définitions préalables %%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newcommand\ST@ver {0.3} -\newcommand\ST@date {2010/03/28} -\newcommand\ST@fr@date {28 mars 2010} -\newcommand\ST@eng@date{March $28^\text{th}$ 2010} +\newcommand\ST@ver {0.3a} +\newcommand\ST@date {2010/05/15} +\newcommand\ST@fr@date {15 mai 2010} +\newcommand\ST@eng@date{May $15^\text{th}$ 2010} \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écessaire +\RequirePackage{xstring}[2010/0/28]% version nécessaire \newcount\ST@count \newcount\ST@colcount @@ -201,7 +201,14 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%% Macros de manipulation de chaines %%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\def\ST@gobble@remain#1\relax{} +\def\ST@gobble@remain{% + \afterassignment\ST@gobble@remain@i + \let\ST@toks= +} + +\def\ST@gobble@remain@i{% + \unless\ifx\ST@toks\relax\expandafter\ST@gobble@remain\fi +} \newcommand\ST@splitatfirstcar[3]{% \def\ST@splitatfirstcar@i##1##2\@nil{\def#2{##1}\def#3{##2}}% @@ -440,7 +447,7 @@ }% \noexploregroups \unless\ifnum\csname code@\number\ST@colcount @\number\ST@rowcount\endcsname=\z@% si le code est <> 0 - \ST@try@calc@cell(\number\ST@colcount,\number\ST@rowcount)% on essaie de calculer la cellule en cours + \ST@try@calc@cell(\number\ST@colcount,\number\ST@rowcount)% on essaie de calculer la cellule en cours TODO : bug \fi \ST@letname{text@\number\ST@colcount @\number\ST@rowcount}\ST@current@cell \unless\ifx\@empty\ST@multicol@number% si c'est une cellule qui contient \multicolumn @@ -1063,7 +1070,7 @@ \let\ST@function@namefound\@empty\let\ST@function@argfound\@empty \let\ST@function@namefound@\@empty\let\ST@function@argfound@\@empty \let\ST@tempfunc#1% - \ST@find@first@func@i + \ST@find@first@func@i } \newcommand\ST@find@first@func@i{% @@ -1105,7 +1112,7 @@ \edef\ST@openbrace@catcode{\number\catcode`\(}\edef\ST@closebrace@catcode{\number\catcode`\)}% \catcode`\(1 \catcode`\)2 \everyeof{\relax}\endlinechar\m@ne - \afterassignment\ST@gobble@remain + \afterassignment\ST@gobble@remain% TODO bug \expandafter\def\expandafter#2\scantokens\expandafter{#1}% \catcode`\(\ST@openbrace@catcode\catcode`\)\ST@closebrace@catcode \def\ST@assignarg##1\relax{\def#2{##1}}% @@ -1851,6 +1858,11 @@ v0.3 2010/03/28 de \@xs@afterinteger lorsqu'on appelle \IfInteger 8 Correction d'un bug dans \ST@build@tab@i pour prendre en compte les cellules de code 0 dans lesquelles ":=" doit être supprimé +------------------------------------------------------------------------------- +v0.3a 2010/05/15 + 1 Correction d'un bug dans \ST@gobble@remain : ce qui reste à manger peut + contenir des tokens de catcode 1 ou 2 ce qui fait que l'utilisation + d'arguments délimités ne fonctionnerait pas dans ces cas. ############################################################################### # TODO list # ############################################################################### -- cgit v1.2.3