From d7d4ecda8eebb16c7d1e0bf81bf450eb81f02adb Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 23 Nov 2009 18:09:45 +0000 Subject: etextools update (31oct09) git-svn-id: svn://tug.org/texlive/trunk@16145 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/etextools/etextools.sty | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'Master/texmf-dist/tex/latex/etextools') diff --git a/Master/texmf-dist/tex/latex/etextools/etextools.sty b/Master/texmf-dist/tex/latex/etextools/etextools.sty index 4ea55490a0a..89b6e7f0b96 100644 --- a/Master/texmf-dist/tex/latex/etextools/etextools.sty +++ b/Master/texmf-dist/tex/latex/etextools/etextools.sty @@ -21,10 +21,10 @@ %% etextools.sty, etextools.pdf, etextools.ins, %% and etextools-examples.tex %% -%%% etextools : e-TeX tools for LaTeX Users and package Writers (v.3.14 - 2009/10/04) +%%% etextools : e-TeX tools for LaTeX Users and package Writers (v.3.1415 - 2009/10/14) \NeedsTeXFormat{LaTeX2e}[1996/12/01] \ProvidesPackage{etextools} - [2009/10/04 v3.14 e-TeX more useful tools for LaTeX package writers] + [2009/10/14 v3.1415 e-TeX more useful tools for LaTeX package writers] \csname ettl@onlyonce\endcsname\let\ettl@onlyonce\endinput \RequirePackage{etex,etoolbox,letltxmacro} \let\ettl@AtEnd\@empty @@ -268,7 +268,7 @@ \ifx#1#21\else2\fi of2\endcsname} %% \ifsingletoken{ tokenA }{ tokenB }{ true }{ false } -\newcommand\ifsingletoken[2]{\csname @\ettl@firstspace{#2} +\newcommand\ifsingletoken[2]{\romannumeral\csname rmn@\ettl@firstspace{#2} {\ettl@nbk#1#2//{second}{\if @\detokenize{#1#2}@first\else\ifx#1#2first\else second\fi\fi}//} {\if @\detokenize\expandafter{\ettl@cdr#2\@nil}@% \expandafter\ettl@ifxsingle @@ -369,9 +369,9 @@ }\@xifblank} %% \deblank{ string } -\newcommand\deblank[1]{\romannumeral-`\q\ettl@deblank#1/ /} +\newcommand\deblank[1]{\romannumeral\ettl@deblank#1/ /} \long\def\ettl@deblank#1 /{\ettl@deblank@i#1/} -\long\def\ettl@deblank@i#1/#2{ #1} +\long\def\ettl@deblank@i#1/#2{\z@#1} \newcommand\ettl@stringify[1]{\romannumeral-`\q\ettl@expandafthree\@gobblescape% \expandafter\ettl@deblank\detokenize{#1}/ /} @@ -559,7 +559,7 @@ {\ettl@getsinglelist{\ettl@ifchar{#2}}{#1}}}{#2}} {\ExpandNextTwo{\ettl@supergobble[{{#2}}]}{-1}{\getcharlistcount{#1}+1}}} \long\def\ettl@FE@modifiers#1#2#3{\expandafter\ettl@supergobble% - \expandafter[\romannumeral-`\q\ifnum#2<0 {#3}\fi]{#2}{#1+1}} + \expandafter[\romannumeral-`\q\ifnum#2<0 \@swap{{#3}}\fi]{#2}{#1+1}} %% \ettl@supergobble{ p }{ q }{token_1}{token_2}...{token_p}{TOKEN_p+1}{token_p+2}...{token_p+q+1} \newcommand\ettl@supergobble[1]{\FE@testopt{#1}\ettl@superg@bble{}} @@ -576,10 +576,10 @@ \ifcsname ettl@supergobble\number\numexpr#1\endcsname \csname ettl@supergobble\number\numexpr#1\endcsname {#3{#2-(#1)-1}}% - \else\ettl@supergobbleheight{\ettl@supergobble@loop{#1-8}{#2-8}{#3}}% + \else\ettl@supergobbleeight{\ettl@supergobble@loop{#1-8}{#2-8}{#3}}% \fi} \long\def\ettl@supergobble@end#1#2#3{\fi\fi\fi#1#2} -\long\csdef{ettl@supergobbleheight}#1\fi#2#3#4#5#6#7#8#9{\fi#1} +\long\csdef{ettl@supergobbleeight}#1\fi#2#3#4#5#6#7#8#9{\fi#1} \long\csdef{ettl@supergobble7}#1#2\fi#3#4#5#6#7#8#9{#1} \long\csdef{ettl@supergobble6}#1#2\fi#3#4#5#6#7#8{#1} \long\csdef{ettl@supergobble5}#1#2\fi#3#4#5#6#7{#1} @@ -832,7 +832,7 @@ \or \ettl@or\@swaplast{#60{\ettl@lst@getitem{##3}}}#6% \or \ettl@or\@swaplast{#5{##3}}#5% \or \ettl@fi\@swaplast{#60{##3}}#6% - \fi{##4#3//}{\ettl@breakloop{}}% + \fi{##4#3//}{\ettl@breakloop{\ifx##10\expandafter\relax\fi}}% }{\ettl@breakloop{}}///End§List/}}% #1\long\def#5##1##2#3##3##4/##5##6##7/End§List/{% \if @\detokenize{##2}@\expandafter\@gobbletwo\fi\@firstofone{##1{##2}}% @@ -1072,9 +1072,8 @@ \expandafter\expandafter\expandafter\ettl@nbk\parameters@meaningcs{#1}//{first}{second}//oftwo\endcsname} \renewcommand\ifnumcomp[3]{\csname @% \ifnum\numexpr#1#2\numexpr#3 first\else second\fi oftwo\endcsname} -}% etoolbox option -\ProcessOptions - +}% etoolbox option - not to be used - experimental +\ProcessOptions*\relax \endinput %% -- cgit v1.2.3