xstring (14oct13)

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

5 files changed, 20 insertions, 17 deletions

diff --git a/Master/texmf-dist/doc/generic/xstring/README b/Master/texmf-dist/doc/generic/xstring/README
index c4da89e029d..6af0fd06ab1 100644
--- a/Master/texmf-dist/doc/generic/xstring/README
+++ b/Master/texmf-dist/doc/generic/xstring/README
@@ -1,8 +1,8 @@
                               _________________
 
                                xstring package
-                                   v 1.7b
-                                 2013/07/29
+                                   v 1.7c
+                                 2013/10/13
                               _________________
 
 This package provides macros manipulating strings for programming use.
diff --git a/Master/texmf-dist/doc/generic/xstring/xstring_doc_en.pdf b/Master/texmf-dist/doc/generic/xstring/xstring_doc_en.pdf
index 35b0880dfb4..8d2903e233c 100644
--- a/Master/texmf-dist/doc/generic/xstring/xstring_doc_en.pdf
+++ b/Master/texmf-dist/doc/generic/xstring/xstring_doc_en.pdf
diff --git a/Master/texmf-dist/doc/generic/xstring/xstring_doc_en.tex b/Master/texmf-dist/doc/generic/xstring/xstring_doc_en.tex
index cc45e122a4f..4c95b0c1ae8 100644
--- a/Master/texmf-dist/doc/generic/xstring/xstring_doc_en.tex
+++ b/Master/texmf-dist/doc/generic/xstring/xstring_doc_en.tex
@@ -175,7 +175,7 @@ This manual is a translation of the french manual. I apologize for my poor engli
 \subsection{Description}
 This extension\footnote{This extension does not require \LaTeX{} and can be compiled with Plain $\varepsilon$-\TeX{}.} provides macros and tests operating on "strings of tokens", as other programmation languages have. They provides the usual strings operations, such as: test if a string contains another, begins or ends with another, extractions of strings, calculation of the position of a substring, of the number of occurrences, etc.\medskip
 
-A "string of tokens" is a list of tokens of any nature, except that braces must be balanced and tokens catcode 6 and 14 (usualy \verb|%| et \verb|#|) are not allowed. Apart from this, any token is allowed (including \verbinline|\par|), in any order in the list, whatever be the resulting code.\medskip
+A "string of tokens" is a list of tokens of any nature, except that braces must be balanced and tokens catcode 6 and 14 (usualy \verb|%| and \verb|#|) are not allowed. Apart from this, any token is allowed (including \verbinline|\par|), in any order in the list, whatever be the resulting code.\medskip
 
 \Xstring reads the arguments of the macros \US by \US\footnote{In the \TeX{} code, a \US is a control sequence, a group between brace or a single char. See also page~\pageref{developpementarguments}.} : when \USs are \guill{simple} chars (catcode 10, 11 and 12), \Xstring logically read the argument char by char. \Xstring can also be used for programming purpose, including in arguments other tokens such as control sequences, braces and tokens with other catcodes. See chapter on reading mode and arguments expansion (page~\pageref{developpementarguments}), the command \verbinline|\verbtocs| (page~\pageref{verbtocs}) and the command \verbinline|\scancs| (page~\pageref{scancs}).\medskip
 
@@ -691,7 +691,7 @@ In \argu{string}, returns what is rightwards the \argu{number}\th occurrence of
 
 \subsubsection{\ttfamily\textbackslash StrCut}
 Here is the syntax of this macro:\par\nobreak\smallskip
-\verbinline|\StrCut|\etoile\arguC{nunber}\ARGU{string}\ARGU{stringA}\ARGU{macroA}\ARGU{macroB}
+\verbinline|\StrCut|\etoile\arguC{number}\ARGU{string}\ARGU{stringA}\ARGU{macroA}\ARGU{macroB}
 \smallskip
 
 The optional argument \argu{number} is 1 by default.\par\nobreak\smallskip
@@ -1007,7 +1007,7 @@ In \argu{string}, returns the substring between\footnote{In the broad sense, i.e
 \item If \argu{string} is empty, an empty string is returned;
 \item If \argu{numberA}${}>{}$\argu{numberB}, an empty string is returned;
 \item If \argu{numberA}${}<1$ and \argu{numberB}${}<1$ an empty string is returned;
-\item If \argu{numberA}${}>{}$\argu{lengthString} et \argu{numberB}${}>{}$\argu{lengthString}, an empty string is returned;
+\item If \argu{numberA}${}>{}$\argu{lengthString} and \argu{numberB}${}>{}$\argu{lengthString}, an empty string is returned;
 \item If \argu{numberA}${}<1$, the macro behaves as if \argu{numberA}${}=1$;
 \item If \argu{numberB}${}>{}$\argu{lengthString}, the macro behaves as if \argu{numberB}${}={}$\argu{lengthString}.
 \end{Conditions}
@@ -1378,9 +1378,9 @@ Let's see what this means with an example. We want to know what is on the left o
 \end{minipage}%
 \medskip
 
-Exploring the groups\footnote{The file test of \Xstring has many examples underlining differences between exploration modes.} can change the behaviour of most of the macros of \Xstring, excepted these macros untouched by the exploration mode; their behaviour is the same in any case: \verbinline|\IfInteger|, \verbinline|\IfDecimal|, \verbinline|\IfStrEq|, \verbinline|\StrEq| et \verbinline|\StrCompare|.
+Exploring the groups\footnote{The file test of \Xstring has many examples underlining differences between exploration modes.} can change the behaviour of most of the macros of \Xstring, excepted these macros untouched by the exploration mode; their behaviour is the same in any case: \verbinline|\IfInteger|, \verbinline|\IfDecimal|, \verbinline|\IfStrEq|, \verbinline|\StrEq| and \verbinline|\StrCompare|.
 
-Moreover, 2 macros run in \verbinline|\noexploregroups| mode, whatever be the current mode: \verbinline|\StrBetween| et \verbinline|\StrMid|.\medskip
+Moreover, 2 macros run in \verbinline|\noexploregroups| mode, whatever be the current mode: \verbinline|\StrBetween| and \verbinline|\StrMid|.\medskip
 
 It is possible to save the exploration mode with \verbinline|\saveexploremode|, then modify it and come back to the situation when it was saved with \verbinline|\restoreexploremode|.
 
@@ -1865,7 +1865,7 @@ With this code, in both arguments, the first token \verbinline|\empty| is expand
 
 By this way, \verbinline|\empty| is a way to "hack" \verbinline|\expandarg|: it allows to avoid the expansion of all the other tokens. The control sequence \verbinline|\noexpand| can be used instead of \verbinline|\empty| for the same result.
 
-\subsubsection{Exemple 2}
+\subsubsection{Example 2}
 Here, we try to write a macro which gobbles \verb|n| \USs in a string from a given position, and assigns the result to a control sequence.
 
 Let's call this macro \verb|StringDel| and let's give it this syntax:\par\nobreak
diff --git a/Master/texmf-dist/doc/generic/xstring/xstring_doc_fr.pdf b/Master/texmf-dist/doc/generic/xstring/xstring_doc_fr.pdf
index 21258c37ae7..138612eec17 100644
--- a/Master/texmf-dist/doc/generic/xstring/xstring_doc_fr.pdf
+++ b/Master/texmf-dist/doc/generic/xstring/xstring_doc_fr.pdf
diff --git a/Master/texmf-dist/tex/generic/xstring/xstring.tex b/Master/texmf-dist/tex/generic/xstring/xstring.tex
index 5eb45faa749..015fc656bae 100644
--- a/Master/texmf-dist/tex/generic/xstring/xstring.tex
+++ b/Master/texmf-dist/tex/generic/xstring/xstring.tex
@@ -1,9 +1,9 @@
 %  __________________________________________________
 % |                                                  |
 % |                                                  |
-% |                   xstring v1.7b                  |
+% |                   xstring v1.7c                  |
 % |                                                  |
-% |                  29 juillet 2013                 |
+% |                  13 octobre 2013                 |
 % |                                                  |
 % |__________________________________________________|
 %
@@ -33,10 +33,10 @@
 %
 % The Current Maintainer of this work is Christian Tellechea
 % -------------------------------------------------------------------
-\def\xstringversion     {1.7b}
-\def\xstringdate        {2013/07/29}
-\def\xstringfrenchdate  {29 juillet 2013}
-\def\xstringenglishdate {29 july 2013}
+\def\xstringversion     {1.7c}
+\def\xstringdate        {2013/10/13}
+\def\xstringfrenchdate  {13 octobre 2013}
+\def\xstringenglishdate {13 october 2013}
 \edef\CurrentAtCatcode  {\the\catcode`\@}
 \catcode`\@=11
 \newwrite\@xs@message% canal pour les messages
@@ -724,7 +724,7 @@
 		{\def\@xs@reserved@E{\IfStrEq}\@xs@IfStrCase}%
 }
 
-\def\@xs@IfStrCase#1#2{\@testopt{\@xs@IfStringCase{#1}{#2}}{}}
+\long\def\@xs@IfStrCase#1#2{\@testopt{\@xs@IfStringCase{#1}{#2}}{}}
 
 \def\IfEqCase{%
 	\@ifstar
@@ -735,7 +735,7 @@
 \long\def\@xs@IfEqCase#1#2{\@testopt{\@xs@IfStringCase{#1}{#2}}{}}
 
 \long\def\@xs@IfStringCase#1#2[#3]{%
-	\def\@xs@testcase##1##2##3\@xs@nil{% lit les 2 premieres unit\'es syntaxiques dans ##1 et ##2. Les autres dans ##3
+	\long\def\@xs@testcase##1##2##3\@xs@nil{% lit les 2 premieres unit\'es syntaxiques dans ##1 et ##2. Les autres dans ##3
 		\@xs@reserved@E{#1}{##1}%
 			{##2}% le test est positif, on ex\'ecute le code correspondant
 			{\@xs@ifempty{##3}%
@@ -1383,4 +1383,7 @@
 %  - Correction d'un espace parasite dans \@xs@removefirstsyntaxunit
 %------------------------------------------------------------------------------
 % v1.7b 29/7/2013
-%  - La date contenue dans \xstringdate est désormais conforme
\ No newline at end of file
+%  - La date contenue dans \xstringdate est désormais conforme
+%------------------------------------------------------------------------------
+% v1.7c 13/10/2013 
+%  - les macros impliquées dans \IfStrCase et \IfStrEqCase sont désormais \long
\ No newline at end of file