diff options
author | Karl Berry <karl@freefriends.org> | 2010-03-29 23:35:06 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2010-03-29 23:35:06 +0000 |
commit | ddbdb3f4d5aab38f7e6fc17ad7456dc968579140 (patch) | |
tree | 77373b3c46854424ed19fb8949b301239864cd74 /Master/texmf-dist/tex | |
parent | 17036ad38f780e71d150dd4b6272d79dd19e9997 (diff) |
xstring 1.5d (28mar10)
git-svn-id: svn://tug.org/texlive/trunk@17614 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/xstring/xstring.sty | 3 | ||||
-rw-r--r-- | Master/texmf-dist/tex/generic/xstring/xstring.tex | 47 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/xstring/xstring.sty | 3 |
3 files changed, 33 insertions, 20 deletions
diff --git a/Master/texmf-dist/tex/generic/xstring/xstring.sty b/Master/texmf-dist/tex/generic/xstring/xstring.sty new file mode 100644 index 00000000000..9dc5a187f7c --- /dev/null +++ b/Master/texmf-dist/tex/generic/xstring/xstring.sty @@ -0,0 +1,3 @@ +\input xstring.tex +\ProvidesPackage{xstring}[\xstringdate\space\space v\xstringversion\space\space String manipulations (C Tellechea)] +\endinput
\ No newline at end of file diff --git a/Master/texmf-dist/tex/generic/xstring/xstring.tex b/Master/texmf-dist/tex/generic/xstring/xstring.tex index 2367211bcd3..cbad33e6490 100644 --- a/Master/texmf-dist/tex/generic/xstring/xstring.tex +++ b/Master/texmf-dist/tex/generic/xstring/xstring.tex @@ -1,24 +1,22 @@ % __________________________________________________ % | | % | | -% | xstring v1.5c | +% | xstring v1.5d | % | | -% | June 5 2009 | +% | March 28 2010 | % | | % |__________________________________________________| % % This is xtring.tex % -% "xstring" package consists of the 11 following files: +% "xstring" package consists of the 7 following files: % xstring.tex (this file) % xstring.sty % README % xstring_doc_fr.tex, xstring_doc_fr.pdf (manual in french) % xstring_doc_en.tex, xstring_doc_en.pdf (manual in english) -% test_latex.tex, test_latex.pdf (test file with LaTeX) -% test_etex.tex, test_etex.pdf (test file with Plain eTeX) % -% Christian Tellechea 2009 +% Christian Tellechea 2008-2010 % email : unbonpetit@gmail.com % ------------------------------------------------------------------- % This work may be distributed and/or modified under the @@ -35,10 +33,10 @@ % % The Current Maintainer of this work is Christian Tellechea % ------------------------------------------------------------------- -\def\xstringversion {1.5c} -\def\xstringdate {2009/06/05} -\def\xstringfrenchdate {5 juin 2009} -\def\xstringenglishdate {June $5^{\mathrm{th}}$ 2009} +\def\xstringversion {1.5d} +\def\xstringdate {2010/03/28} +\def\xstringfrenchdate {28 mars 2010} +\def\xstringenglishdate {March $28^{\mathrm{th}}$ 2010} \edef\CurrentAtCatcode {\the\catcode`\@} \catcode`\@=11 \newwrite\@xs@message% canal pour les messages @@ -580,13 +578,21 @@ \fi} \@xs@newmacro\IfInteger{}{1}{0}{% - \expandafter\@xs@formatnumber\expandafter{\detokenize{#1}}\@xs@reserved@A + \@xs@formatnumber{#1}\@xs@reserved@A \decimalpart\z@ \afterassignment\@xs@defafterinteger\integerpart\@xs@reserved@A\relax\@xs@nil + \let\@xs@after@intpart\@xs@afterinteger \expandafter\@xs@testdot\@xs@afterinteger\@xs@nil - \let\@xs@next\@secondoftwo \ifx\@empty\@xs@afterdecimal - \ifnum\decimalpart=\z@\let\@xs@next\@firstoftwo\fi + \ifnum\decimalpart=\z@ + \let\@xs@next\@firstoftwo% partie décimale constituée de 0 --> seul cas où on renvoie vrai + \else + \let\@xs@afterinteger\@xs@after@intpart + \let\@xs@next\@secondoftwo + \fi + \else + \let\@xs@afterinteger\@xs@after@intpart + \let\@xs@next\@secondoftwo \fi \@xs@next} @@ -598,13 +604,12 @@ \ifx\@empty\@xs@afterdecimal \expandafter\@firstoftwo \else - \expandafter\tokenize\expandafter\@xs@afterdecimal\expandafter{\@xs@afterdecimal}% \expandafter\@secondoftwo \fi} \def\@xs@defafterinteger#1\relax\@xs@nil{\def\@xs@afterinteger{#1}} -\def\@xs@testdot{\@ifnextchar.{\@xs@readdecimalpart}{\@xs@testcomma}} -\def\@xs@testcomma{\@ifnextchar,{\@xs@readdecimalpart}{\@xs@endnumber}} +\def\@xs@testdot{\let\xs@decsep\@empty\@ifnextchar.{\def\xs@decsep{.}\@xs@readdecimalpart}{\@xs@testcomma}} +\def\@xs@testcomma{\@ifnextchar,{\def\xs@dessep{,}\@xs@readdecimalpart}{\@xs@endnumber}} \def\@xs@readdecimalpart#1#2\@xs@nil{% \ifx\@empty#2\@empty\def\@xs@reserved@A{0X}\else\def\@xs@reserved@A{0#2}\fi \afterassignment\@xs@defafterinteger\decimalpart\@xs@reserved@A\relax\@xs@nil @@ -1150,4 +1155,12 @@ % faisait que \truc se développait en un espace. % - Correction d'un bug dans \@xs@removefirstsyntaxunit où le cas % \@xs@removefirstsyntaxunit{ {b}}\truc -% donnait \truc se développant en «b» au lieu de «{b}».
\ No newline at end of file +% donnait \truc se développant en «b» au lieu de «{b}». +%------------------------------------------------------------------------------ +% v1.5d 28/3/2010 +% - Correction d'un bug dans \IfInteger : \@xs@afterinteger ne donnait pas le +% bon r\'esultat. Par exemple avec 1.23 il renvoyait {} au lieu de {.23} +% - \xs@formatnumber ne detokenize plus ses arguments (que m'est-il pass\'e +% par la t\^ete pour que je code un truc comme ca ?), et donc +% \@xs@afterinteger et \@xs@afterdecimal ont des tokens ayant le bon +% catcode
\ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/xstring/xstring.sty b/Master/texmf-dist/tex/latex/xstring/xstring.sty deleted file mode 100644 index 23e4b1a6e5e..00000000000 --- a/Master/texmf-dist/tex/latex/xstring/xstring.sty +++ /dev/null @@ -1,3 +0,0 @@ -\input xstring.tex -\ProvidesPackage{xstring}[\xstringdate\space v\xstringversion\space String manipulations (C Tellechea)] -\endinput
\ No newline at end of file |