From 2da1229487e5586f88bbccd034057d5164b79863 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 22 Dec 2009 22:44:22 +0000 Subject: reprocess etextools.dtx without a tcx git-svn-id: svn://tug.org/texlive/trunk@16481 c570f23f-e606-0410-a88d-b1316a301751 --- .../texmf-dist/tex/latex/etextools/etextools.sty | 136 ++++++++++----------- Master/tlpkg/libexec/ctan2tds | 3 +- 2 files changed, 70 insertions(+), 69 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/tex/latex/etextools/etextools.sty b/Master/texmf-dist/tex/latex/etextools/etextools.sty index 89b6e7f0b96..a38eb293ff4 100644 --- a/Master/texmf-dist/tex/latex/etextools/etextools.sty +++ b/Master/texmf-dist/tex/latex/etextools/etextools.sty @@ -37,8 +37,8 @@ } \TMP@EnsureCode{32}{10}% space... just in case \TMP@EnsureCode{47}{8}% / -\TMP@EnsureCode{167}{7}% § -\TMP@EnsureCode{164}{7}% ¤ +\TMP@EnsureCode{167}{7}% ^^a7 +\TMP@EnsureCode{164}{7}% ^^a4 \TMP@EnsureCode{95}{11}% _ \TMP@EnsureCode{42}{12}% * \TMP@EnsureCode{43}{12}% + @@ -50,9 +50,9 @@ \TMP@EnsureCode{33}{12}% ! \TMP@EnsureCode{152}{13}% ~ for the character test \ifundef\pdfstrcmp{% - \TMP@EnsureCode{163}{9}% £ ignore - \TMP@EnsureCode{128}{14}% \texteuro comment € -}{\TMP@EnsureCode{163}{14}% £ comment + \TMP@EnsureCode{163}{9}% ^^a3 ignore + \TMP@EnsureCode{128}{14}% \texteuro comment ^^80 +}{\TMP@EnsureCode{163}{14}% ^^a3 comment \TMP@EnsureCode{128}{9}% \texteuro ignore } \AtEndOfPackage{\ettl@AtEnd\undef\ettl@AtEnd} @@ -222,9 +222,9 @@ %% \ifdefmathchar { cs-token }{ true }{ false } \FEII \def\ettl@ifdef[#1]{\expandafter\ettl@ifd@f\expandafter{#1}} \def\ettl@ifd@f#1#2{% - \csdef{ettl@ifdef#2}##1#1##2/End§Meaning/{\ettl@nbk##2//{\rmn@firstoftwo}{\rmn@secondoftwo}//} + \csdef{ettl@ifdef#2}##1#1##2/End^^a7Meaning/{\ettl@nbk##2//{\rmn@firstoftwo}{\rmn@secondoftwo}//} \csedef{ifdef#2}##1{\noexpand\romannumeral\noexpandafter% - \noexpandcs{ettl@ifdef#2}\noexpand\meaning##1#1/End§Meaning/}%//{##2}{##3}//} + \noexpandcs{ettl@ifdef#2}\noexpand\meaning##1#1/End^^a7Meaning/}%//{##2}{##3}//} } \ettl@ifdef[\string\count]{count} % defines \def\ifdefcount \ettl@ifdef[\string\toks]{toks} % \def\ifdeftoks @@ -343,9 +343,9 @@ \long\def\ettl@do@detokenChars#1{\ifOneChar{#1}\detokenize\unexpanded{#1}} %% \protectspace { string } -\newcommand\protectspace[1]{\romannumeral\ettl@protectspace#1 /End§String/} -\long\def\ettl@protectspace#1 #2/End§String/{\ifempty{#2}{\z@#1} - {\expandafter\@swap\expandafter{\romannumeral\ettl@protectspace#2/End§String/}{\z@#1{ }}}} +\newcommand\protectspace[1]{\romannumeral\ettl@protectspace#1 /End^^a7String/} +\long\def\ettl@protectspace#1 #2/End^^a7String/{\ifempty{#2}{\z@#1} + {\expandafter\@swap\expandafter{\romannumeral\ettl@protectspace#2/End^^a7String/}{\z@#1{ }}}} %% \ifempty{ text }{ true }{ false } \newcommand\ifempty[1]{\romannumeral\csname rmn@\if @\detokenize{#1}@% @@ -425,14 +425,14 @@ first\else second\fi oftwo\endcsname} \else \newcommand\ifstrnum[1]{\romannumeral\csname rmn@\ettl@nbk#1//% - {\expandafter\ettl@numberminus\detokenize{#1}-/End§String/}{second}//oftwo\endcsname} -\long\def\ettl@numberminus#1-#2/End§String/{\ettl@nbk#2//% - {\ettl@nbk#1//{second}{\ettl@numberminus#2/End§String/}//}% - {\expandafter\expandafter\expandafter\ettl@numberspace\deblank{#1} /End§String/}//}% -\long\def\ettl@numberspace#1 #2/End§String/{\ettl@nbk#2//{second}{\ettl@ifstrnum#1/End§String/}//} -\long\def\ettl@ifstrnum#1#2/End§String/{% + {\expandafter\ettl@numberminus\detokenize{#1}-/End^^a7String/}{second}//oftwo\endcsname} +\long\def\ettl@numberminus#1-#2/End^^a7String/{\ettl@nbk#2//% + {\ettl@nbk#1//{second}{\ettl@numberminus#2/End^^a7String/}//}% + {\expandafter\expandafter\expandafter\ettl@numberspace\deblank{#1} /End^^a7String/}//}% +\long\def\ettl@numberspace#1 #2/End^^a7String/{\ettl@nbk#2//{second}{\ettl@ifstrnum#1/End^^a7String/}//} +\long\def\ettl@ifstrnum#1#2/End^^a7String/{% \ifcsname ettl@number#1\endcsname% #1 detokenized before, ok - \ettl@nbk#2//{\ettl@ifstrnum#2/End§String/}{first}//% + \ettl@nbk#2//{\ettl@ifstrnum#2/End^^a7String/}{first}//% \else second% \fi} \fi%\pdfmatch @@ -442,7 +442,7 @@ {\expandnext\ettl@declarestrfilter% {\csname\@gobblescape#2\detokenize{->"#3"}\endcsname}{#1}{#2}{#3}}} \newcommand\ettl@declarestrfilter[4]{% - #2\csdef{\@gobblescape#1}##1#4##2/End§String/{##1/##2}% This the FILTER + #2\csdef{\@gobblescape#1}##1#4##2/End^^a7String/{##1/##2}% This the FILTER #2\long\def#3##1{\FE@modifiers{=<>?-+!}{##1} {\ettl@strfilt@mod 0{{#4}{}{#1}[1]}}%= {\ettl@strfilt@mod 1{{#4}{}{#1}[1]}}%< @@ -479,7 +479,7 @@ {\FE@testopt{#3}{\ettl@strfilt@REPLACE#2}{\ettl@intmax}}% \fi} \long\def\ettl@strfilt#1#2#3#4[#5]#6{% % #1 = test macro - \ExpandAftercmds#1{\ettl@Remove #6/End§String/{#2}{#3}[{#5}]{#4}}} + \ExpandAftercmds#1{\ettl@Remove #6/End^^a7String/{#2}{#3}[{#5}]{#4}}} \long\def\ettl@strfilt@REMOVE #1[#2]{% \ifnum\numexpr#2>0 \ettl@else\ettl@strfilt\ettl@strfilt@remove#1[#2]% \else\expandafter\@firstofone% @@ -488,11 +488,11 @@ \ifnum\numexpr#5>0 \ettl@else\ettl@strfilt\ettl@strfilt@replace{#1}{#7}{#3}[{#5}]{#6}% \else\expandafter\@firstoftwo% \fi} -\long\def\ettl@Remove#1/End§String/#2#3[#4]#5{% - \expandafter\ettl@Remove@loop #5#1//#2/End§String//End§String/{#3}[{#4-1}]{#5}} -\long\def\ettl@Remove@loop#1/#2//#3/End§String/#4[#5]#6{% +\long\def\ettl@Remove#1/End^^a7String/#2#3[#4]#5{% + \expandafter\ettl@Remove@loop #5#1//#2/End^^a7String//End^^a7String/{#3}[{#4-1}]{#5}} +\long\def\ettl@Remove@loop#1/#2//#3/End^^a7String/#4[#5]#6{% \ifnum\numexpr#5>0 \ettl@nbk@else#2//% - {\ettl@Remove #1#4#2/End§String/{#3}{#4}[{#5}]{#6}} + {\ettl@Remove #1#4#2/End^^a7String/{#3}{#4}[{#5}]{#6}} {{#1}{#4#2}{#3}{#5}}//% \else\ettl@fi{#1}{#4#2}{#3}{#5}% \fi} @@ -519,8 +519,8 @@ %---------------------------------------------------------------------------- % Purely Expandable Macros With Options / Star Forms / Variants %% \FE@testopt{ #1 }{ commands }{ default option } -\long\def\ettl@BasicFilter#1#2#3/End§String/{\expandafter\ettl@B@sicFilter #1#3//#2/End§String//End§String/} -\long\def\ettl@B@sicFilter#1/#2//#3/End§String/{@\ettl@nbk#3//% +\long\def\ettl@BasicFilter#1#2#3/End^^a7String/{\expandafter\ettl@B@sicFilter #1#3//#2/End^^a7String//End^^a7String/} +\long\def\ettl@B@sicFilter#1/#2//#3/End^^a7String/{@\ettl@nbk#3//% {\if @\detokenize{#1#2}@first\else second\fi} {second}//oftwo} \newcommand\FE@testopt[3]{\ettl@FE@testopt#1/[/% @@ -683,21 +683,21 @@ \ifcat\noexpand\ettl@x\bgroup\ettl@futuredef@end{}\else \ifcat\noexpand\ettl@x\egroup\ettl@futuredef@end{}\else \ifcat\noexpand\ettl@x\ettl@sptoken\ettl@futuredef@space#1\else - \ettl@futur@def@collect#1\fi\fi\fi/Ne¤t/{#2}{##1}}% - \long \def \ettl@futuredef@end##1##2/Ne¤t/##3##4{##2\endgroup\def#3{##4}#4##1}% + \ettl@futur@def@collect#1\fi\fi\fi/Ne^^a4t/{#2}{##1}}% + \long \def \ettl@futuredef@end##1##2/Ne^^a4t/##3##4{##2\endgroup\def#3{##4}#4##1}% \futurelet \ettl@x \ettl@futuredef@loop} -\long\def\ettl@futuredef@collect#1#2/Ne¤t/#3#4#5{#2% +\long\def\ettl@futuredef@collect#1#2/Ne^^a4t/#3#4#5{#2% \ifcat\noexpand#5\relax \ettl@futuredef@filt\unexpanded \else \ettl@futuredef@filt#1 \fi{#5}{#3} {\def\ettl@futuredef@loop{\ettl@futuredef@test{#4#5}}\futurelet\ettl@x\ettl@futuredef@loop} - {\ettl@futuredef@end{#5}/Ne¤t/{}{#4}}/Ne¤t/} -\long\def\ettl@futuredef@space#1#2/Ne¤t/#3#4 {% - \ettl@futur@def@collect#1#2/Ne¤t/{#3}{#4}{ }} -\long\def\ettl@futuredef@collectall#1#2/Ne¤t/#3#4#5{#2% + {\ettl@futuredef@end{#5}/Ne^^a4t/{}{#4}}/Ne^^a4t/} +\long\def\ettl@futuredef@space#1#2/Ne^^a4t/#3#4 {% + \ettl@futur@def@collect#1#2/Ne^^a4t/{#3}{#4}{ }} +\long\def\ettl@futuredef@collectall#1#2/Ne^^a4t/#3#4#5{#2% \def\ettl@futuredef@loop{\ettl@futuredef@test{#4#5}}\futurelet\ettl@x\ettl@futuredef@loop} \long\def\ettl@futur@def@filt#1#2{% #1=token to check, #2=allowed list - \long\def\ettl@futdef@filt##1#1##2##3/##4##5##6/Ne¤t/{##5}% + \long\def\ettl@futdef@filt##1#1##2##3/##4##5##6/Ne^^a4t/{##5}% \ettl@futdef@filt#2#1//} \long\def\ettl@futuredef@filt#1#2\fi#3#4{\fi % #1=detokenize/unexpanded, #2=discard, #3=token,#4=allowed list \expandafter\ettl@futur@def@filt\expandafter{#1{#3}}{#4}} @@ -708,21 +708,21 @@ \ifcat\noexpand\ettl@x\bgroup\ettl@futured@f@end\else \ifcat\noexpand\ettl@x\egroup\ettl@futured@f@end\else \ifcat\noexpand\ettl@x\ettl@sptoken\ettl@futured@f@space#1\else - \ettl@futur@def@collect#1\fi\fi\fi/Ne¤t/{##1}{#2}{}}% - \long \def \ettl@futured@f@end##1/Ne¤t/##2##3##4{##1\endgroup\def#3{##2}#4##4}% + \ettl@futur@def@collect#1\fi\fi\fi/Ne^^a4t/{##1}{#2}{}}% + \long \def \ettl@futured@f@end##1/Ne^^a4t/##2##3##4{##1\endgroup\def#3{##2}#4##4}% \futurelet \ettl@x \ettl@futured@f@loop} -\long\def\ettl@futured@f@space#1#2/Ne¤t/#3#4#5 {% - \ettl@futur@def@collect#1#2/Ne¤t/{#3}{#4}{#5}{ }} -\long\def\ettl@futured@f@collect#1#2/Ne¤t/#3#4#5#6{#2% +\long\def\ettl@futured@f@space#1#2/Ne^^a4t/#3#4#5 {% + \ettl@futur@def@collect#1#2/Ne^^a4t/{#3}{#4}{#5}{ }} +\long\def\ettl@futured@f@collect#1#2/Ne^^a4t/#3#4#5#6{#2% \ifcat\noexpand\ettl@x\relax \ettl@futuredef@filt\unexpanded \else \ettl@futuredef@filt#1 \fi{#6}{#4} - {\let \ettl@y \@undefined \ettl@futured@f@append/Ne¤t/{#3}{}{#6}}% - {\ettl@futured@f@try@expand{#3}\ettl@futured@f@end{#6}}/Ne¤t/} -\long\def\ettl@futured@f@collectall#1#2/Ne¤t/#3#4#5#6{#2% + {\let \ettl@y \@undefined \ettl@futured@f@append/Ne^^a4t/{#3}{}{#6}}% + {\ettl@futured@f@try@expand{#3}\ettl@futured@f@end{#6}}/Ne^^a4t/} +\long\def\ettl@futured@f@collectall#1#2/Ne^^a4t/#3#4#5#6{#2% \ettl@futured@f@try@expand{#3}\ettl@futured@f@append{#6}} -\long\def\ettl@futured@f@space#1#2/Ne¤t/#3#4#5 {% - \ettl@futur@def@collect#1#2/Ne¤t/{#3}{#4}{#5}{ }} +\long\def\ettl@futured@f@space#1#2/Ne^^a4t/#3#4#5 {% + \ettl@futur@def@collect#1#2/Ne^^a4t/{#3}{#4}{#5}{ }} \long\def\ettl@futured@f@try@expand#1#2#3{% \expandafter\ifx\noexpand\ettl@x\ettl@x \let\ettl@y=#2% @@ -730,15 +730,15 @@ {\let \ettl@y=#2}% {\ifx\ettl@x\ettl@y \let \ettl@y \ettl@futured@f@end\else \let \ettl@y \ettl@futured@f@expand\fi}% - \fi\ettl@y/Ne¤t/{#1}{}{#3}} -\long\def\ettl@futured@f@expand/Ne¤t/#1#2#3{\let\ettl@y\ettl@x + \fi\ettl@y/Ne^^a4t/{#1}{}{#3}} +\long\def\ettl@futured@f@expand/Ne^^a4t/#1#2#3{\let\ettl@y\ettl@x \expandafter\futurelet\expandafter\ettl@x\expandafter\ettl@futured@f@loop#3} \long\def\ettl@futured@f@CheckSpecials#1{\ifintokslist{#1}{% \@undefined\if\ifcat\ifnum\ifdim\ifodd% \ifvmode\ifhmode\ifmmode\ifinner\ifvoid\ifhbox\ifvbox% \ifx\ifeof\iftrue\iffalse\ifcase\ifdefined\ifcsname\iffontchar% \else\fi\or}} -\def\ettl@futured@f@append/Ne¤t/#1#2#3{% +\def\ettl@futured@f@append/Ne^^a4t/#1#2#3{% \def\ettl@futured@f@loop{\ettl@futured@f@test{#1#3}}% \futurelet\ettl@x\ettl@futured@f@loop}% @@ -769,9 +769,9 @@ \long\def\ettl@ifincharlist#1#2{\ettl@ifchar{#1}{#2}{\ettl@breakloop\z@}{}} \long\def\ettl@dosinglelist#1#2{\ettl@nbk#2//% {\ettl@dosinglelist@loop{#1}#2//{\ettl@dosinglelist@loop{#1}}{\ettl@breakloop{}}} - {\ettl@breakloop{}}///End§List/} -\long\def\ettl@dosinglelist@loop#1#2#3#4/#5#6#7/End§List/{% - #1{#2}#6{#3}#4//{#6}{#7}/End§List/} + {\ettl@breakloop{}}///End^^a7List/} +\long\def\ettl@dosinglelist@loop#1#2#3#4/#5#6#7/End^^a7List/{% + #1{#2}#6{#3}#4//{#6}{#7}/End^^a7List/} %% \gettokslistindex { item }{ list of tokens } %% \gettokslistcount { item }{ list of tokens } @@ -795,16 +795,16 @@ {}//}{}} \long\def\ettl@getsinglelist#1#2{\ettl@singlelist@loop{-1}{-1}{}#2//% {\ettl@expandafthree\ettl@singlelist@loop#1}% - {\expandafter\ettl@singlelist@result\@thirdofthree}/End§List/} -\long\def\ettl@singlelist@loop#1#2#3#4#5/#6#7#8/End§List/{% + {\expandafter\ettl@singlelist@result\@thirdofthree}/End^^a7List/} +\long\def\ettl@singlelist@loop#1#2#3#4#5/#6#7#8/End^^a7List/{% #7{#4} {{#1+1}{#2+1+0*(0}{#4}} - {{#1+1}{#2+1}{#3}}#5//{#7}{#8}/End§List/} + {{#1+1}{#2+1}{#3}}#5//{#7}{#8}/End^^a7List/} % \csname @#1#5{first}{second}oftwo\endcsname % {#8{#1}{#2+1}{#3+1+0*(0}{#5}#6//#8#9} - % {#8{#1}{#2+1}{#3+1}{#4}#6//#8#9}/End§List/} + % {#8{#1}{#2+1}{#3+1}{#4}#6//#8#9}/End^^a7List/} -\def\ettl@singlelist@result#1#2#3#4/End§List/{\ExpandNextTwo\@swaptwo% +\def\ettl@singlelist@result#1#2#3#4/End^^a7List/{\ExpandNextTwo\@swaptwo% {\number\numexpr\ifempty{#3}{-1}{#2)}}{\number\numexpr#1}{#3}} \def\ettl@setresult#1of#2>#3<{\ettl@nbk #3//% {\ifdefcount{#3}{#3=\csname ettl@#1of#2\endcsname} @@ -833,13 +833,13 @@ \or \ettl@or\@swaplast{#5{##3}}#5% \or \ettl@fi\@swaplast{#60{##3}}#6% \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/{% + }{\ettl@breakloop{}}///End^^a7List/}}% + #1\long\def#5##1##2#3##3##4/##5##6##7/End^^a7List/{% \if @\detokenize{##2}@\expandafter\@gobbletwo\fi\@firstofone{##1{##2}}% - ##6{##1}##3##4//{##6}{##7}/End§List/} - #1\long\def#6##1##2##3#3##4##5/##6##7##8/End§List/{% + ##6{##1}##3##4//{##6}{##7}/End^^a7List/} + #1\long\def#6##1##2##3#3##4##5/##6##7##8/End^^a7List/{% \if @\detokenize{##3}@\expandafter\@gobbletwo\fi\@firstofone{##2[##1]{##3}}% - \expandafter##7\expandafter{\number\numexpr##1+1}{##2}##4##5//{##7}{##8}/End§List/} + \expandafter##7\expandafter{\number\numexpr##1+1}{##2}##4##5//{##7}{##8}/End^^a7List/} #1\protected\def#7{\@ifchar*% {\@ifchar+{\ettl@forloop{\expandafter#2\expandafter*\expandafter+}{[####1]####2}} {\ettl@forloop{\expandafter#2\expandafter*\expandafter+}{####1}}} @@ -860,7 +860,7 @@ {\ettl@lst@opt{#1}{#2}{#4}[\do]}}% (default option) \long\def\ettl@lst@opt#1#2#3[#4]{% \expandafter#1\expandafter{\number\ifnum#2=0 0\else\ifstrnum{#4}{1}{#2}\fi}{#3}[{#4}]} -\long\def\ettl@breakloop#1#2/End§List/{#1} +\long\def\ettl@breakloop#1#2/End^^a7List/{#1} \let\breakloop\ettl@breakloop \globcount\ettl@for@nested \long\def\ettl@forloop#1#2#3\do{% @@ -937,13 +937,13 @@ }\ettl@RemoveInList{#1}#2% }\expandafter\ettl@RemoveInList\expandafter{\romannumeral-`\q\@gobblescape#2}} \protected\long\def\ettl@Rem@veInList#1#2#3#4#5#6#7#8{% - \long\def#3[##1]##2#5#8#5##3##4/##5##6##7/End§List/{##6[##1+1]##2#5##3##4//##6##7/End§List/}% + \long\def#3[##1]##2#5#8#5##3##4/##5##6##7/End^^a7List/{##6[##1+1]##2#5##3##4//##6##7/End^^a7List/}% \ifnotempty{#5}%% special case if no separator - {\long\def#4[##1]#5##2#5#5##3//##4/End§List/{\unexpanded{#1\def#7{##2#5}}% + {\long\def#4[##1]#5##2#5#5##3//##4/End^^a7List/{\unexpanded{#1\def#7{##2#5}}% \ettl@nbk#6//\ettl@setresult 1of1>#6<{\number\numexpr##1-1\relax}{}//}}% - {\long\def#4[##1]##2//##3/End§List/{\unexpanded{#1\def#7{##2}}% + {\long\def#4[##1]##2//##3/End^^a7List/{\unexpanded{#1\def#7{##2}}% \ettl@nbk#6//\ettl@setresult 1of1>#6<{\number\numexpr##1-1\relax}{}//}}% - \long\def#2##1{#3[0]#5##1#5#5#8#5//#3#4/End§List/}% + \long\def#2##1{#3[0]#5##1#5#5#8#5//#3#4/End^^a7List/}% \edef#7{\endgroup\expandafter#2\expandafter{#7}}#7} \def\ettl@gobble@relax#1\relax{} @@ -986,9 +986,9 @@ %% \getlistindex[\indexmacro]{ \Listmacro } %% \getlistindex*[\indexmacro]{ expanded List } \newrobustcmd\ettl@getlistindex[6][]{% #1=result, #2=\expandafter, #3=loop macro, #4=separator, #5=list of list macro, #6=item - \begingroup\def\ettl@getlistindex##1#4#6#4##2/End§List/{\endgroup + \begingroup\def\ettl@getlistindex##1#4#6#4##2/End^^a7List/{\endgroup \romannumeral-`\q\ettl@setresult 1of1>#1<{\ettl@nbk##2//{#3*!{##1}}{-1}//}% - }#2\ettl@getlistindex#2#5#4#6#4/End§List/} + }#2\ettl@getlistindex#2#5#4#6#4/End^^a7List/} \begingroup\catcode`\|=3% etb catcode \newrobustcmd\getlistindex[3][]{\@ifstar% {\ettl@getlistindex{}\listloop{|}{#1}{#2}{#3}} @@ -1008,8 +1008,8 @@ \def\ettl@xif@inlist#1#2{% \newrobustcmd*#1{\@ifstar{\ettl@xifinlist{#2}{}}{\ettl@xifinlist{#2}\expandafter}}} \protected\long\def\ettl@ifinlist#1#2#3#4{\begingroup - \def\ettl@tempa##1#1##2#1/End§List/{\endgroup\ifnotblank{##2}% - }#2\ettl@tempa#2#1#3#1#4#1/End§List/} + \def\ettl@tempa##1#1##2#1/End^^a7List/{\endgroup\ifnotblank{##2}% + }#2\ettl@tempa#2#1#3#1#4#1/End^^a7List/} \protected\long\def\ettl@xifinlist#1#2#3#4{\begingroup \protected@edef\ettl@tempa{\endgroup\ettl@ifinlist{#1}{#2}{#3}{#4}% }\ettl@tempa} diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds index aa1035245c4..3e61c3aa809 100755 --- a/Master/tlpkg/libexec/ctan2tds +++ b/Master/tlpkg/libexec/ctan2tds @@ -1257,7 +1257,8 @@ $standardins='\.ins'; 'bullcntr' => 'latex', # requires interaction 'ctable' => 'latex', # requires interaction 'dateiliste' => 'latex', # requires interaction - 'extpfeil' => 'latex -translate-file=empty.tcx', # requires interaction + 'etextools' => 'latex -translate-file=empty.tcx', # no 8-bit + 'extpfeil' => 'latex -translate-file=empty.tcx', # no 8-bit 'geometry' => 'tex', 'graphics-pln' => "env TEXINPUTS=$Master/texmf-dist/source/latex/base: latex", 'labelcas' => 'latex', # requires interaction -- cgit v1.2.3