summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic/xstring
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-02-05 21:54:20 +0000
committerKarl Berry <karl@freefriends.org>2019-02-05 21:54:20 +0000
commit11ab7fc9bf5dd125cdea55cb8e3c15b598ff1641 (patch)
treeda76f2f8e519c0338b3a310c1c0fd51d8da4dcf5 /Master/texmf-dist/tex/generic/xstring
parent554485d7d87fdca34ffb1aa17679afe69e7ff648 (diff)
xstring (5feb19)
git-svn-id: svn://tug.org/texlive/trunk@49946 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic/xstring')
-rw-r--r--Master/texmf-dist/tex/generic/xstring/xstring.tex16
1 files changed, 10 insertions, 6 deletions
diff --git a/Master/texmf-dist/tex/generic/xstring/xstring.tex b/Master/texmf-dist/tex/generic/xstring/xstring.tex
index 6f16dfba0db..654fe462ae0 100644
--- a/Master/texmf-dist/tex/generic/xstring/xstring.tex
+++ b/Master/texmf-dist/tex/generic/xstring/xstring.tex
@@ -4,9 +4,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
\def\xstringname {xstring} %
-\def\xstringversion {1.82} %
+\def\xstringversion {1.83} %
% %
-\def\xstringdate {2019/02/01} %
+\def\xstringdate {2019/02/06} %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -42,15 +42,15 @@
\long\def\xs_gobarg#1{}
\expandafter\def\expandafter\xs_gobspace\space{}
\def\xs_deftok#1#2{\let#1= #2\relax}\xs_deftok\xs_sptoken{ }
-\def\xs_ifnxttok#1#2#3{\xs_deftok\xs_toktotest{#1}\def\__truecode{#2}\def\__falsecode{#3}\xs_ifnxttok_a}
+\long\def\xs_ifnxttok#1#2#3{\xs_deftok\xs_toksmatch{#1}\def\__truecode{#2}\def\__falsecode{#3}\xs_ifnxttok_a}
\def\xs_ifnxttok_a{\futurelet\__futurtok\xs_ifnxttok_b}
\def\xs_ifnxttok_b{%
\xs_ifx{\__futurtok\xs_sptoken}
{\afterassignment\xs_ifnxttok_a\let\__futurtok= }
- {\xs_ifx{\__futurtok\xs_toktotest}\__truecode\__falsecode}%
+ {\xs_ifx{\__futurtok\xs_toksmatch}\__truecode\__falsecode}%
}
\def\xs_ifstar#1{\xs_ifnxttok*{\xs_execfirst{#1}}}
-\def\xs_testopt#1#2{\xs_ifnxttok[{#1}{#1[{#2}]}}
+\long\def\xs_testopt#1#2{\xs_ifnxttok[{#1}{#1[{#2}]}}
\long\def\xs_exparg#1#2{\expandafter\xs_exparg_a\expandafter{#2}{#1}}%
\long\def\xs_exparg_a#1#2{#2{#1}}
\long\def\xs_exptwoargs#1#2#3{\xs_exparg{\xs_exparg{#1}{#2}}{#3}}
@@ -1220,4 +1220,8 @@ v1.81 09/12/2018
v1.82 01/02/2019
- \xs_testopt n'est pas longue et provoque un bug dans \xs_IfStrCase et
\xs_IfStrCase lorsque #1 contient \par : \xs_testopt reste courte et
- \xs_IfStringCase a été modifiée pour que cela fonctionne. \ No newline at end of file
+ \xs_IfStringCase a été modifiée pour que cela fonctionne.
+ ------------------------------------------------------------------------------
+v1.83 06/02/2019
+ - mauvaise approche et mauvais fix dans la v1.82 : \xs_testopt devient
+ longue, pas le choix (et donc aussi \xs_ifnxttok) \ No newline at end of file