diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/catoptions/catoptions.sty')
| -rw-r--r-- | Master/texmf-dist/tex/latex/catoptions/catoptions.sty | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/Master/texmf-dist/tex/latex/catoptions/catoptions.sty b/Master/texmf-dist/tex/latex/catoptions/catoptions.sty index 798c76cd558..cc9336c44fd 100644 --- a/Master/texmf-dist/tex/latex/catoptions/catoptions.sty +++ b/Master/texmf-dist/tex/latex/catoptions/catoptions.sty @@ -1,5 +1,5 @@ %+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++% -% This is 'catoptions' package, version 0.2.7g, 2014/08/27. % +% This is 'catoptions' package, version 0.2.7h, 2014/08/29. % % % % The catoptions package changes LaTeX package loading internals % % so that all subsequently loaded packages can rely on having % @@ -106,8 +106,6 @@ \cpt@gobbletorelax@fi@endgroup=\cptbgobbletorelax, \ifcasse=\cptifcasse, \docasse=\cptdocasse, - \etrimspace=\trim@@space, - \etrimspaces=\trim@@spaces, \csvnormalize=\csv@@normalize, \kvnormalize=\kv@@normalize }% @@ -123,7 +121,7 @@ \chardef\active=13 \NeedsTeXFormat{LaTeX2e}[2011/06/27] \ProvidesPackage{catoptions} - [2012/11/22 v0.2.7f Securing catcodes and parsing options (AM)] + [2014/08/29 v0.2.7h Securing catcodes and parsing options (AM)] \ifcase% \ifx\eTeXversion\cpt@undefined\z@pt\else \ifnum\eTeXversion<\tw@\z@pt\else\@ne\fi\fi @@ -135,7 +133,7 @@ \tracinggroups\@ne\tracingifs\@ne\tracingall\tracingassigns\@ne } \let\cpttracingall\cptloggingall -% \ifcsdefinable, \cpt@starorlong, \cptcommanormalize, etc, +% \ifcsdefinable, \cpt@starorlong, \cpt@testopt, \cptcommanormalize, etc, % change later on: \@ifdefinable\ifcsdefinable{\let\ifcsdefinable\@ifdefinable} \@ifdefinable\cptnewlet\relax @@ -213,7 +211,9 @@ \newcommand\cptswapbraceboth[2]{{#2}{#1}} \cptswap{ }{\let\cptsptoken= } \def\@space{ } -\@namedef{@gobblespace} {} +\@namedef{cptgobblespace} {} +\@ifdefinable\@gobblespace{\let\@gobblespace\cptgobblespace} +% \cptnewbools[<pref>]{a,b} \newcommand*\cptnewbools[2][]{% \cptfor#2\dofor{% \expandafter\ifcsdefinable\csname if#1##1\endcsname @@ -221,6 +221,7 @@ }% } \cptnewbools[cpt@]{st,pl,pm,cl,verbose} +% \cptnewcounts[<pref>]{a,b} \newcommand*\cptnewcounts[2][]{% \cptfor#2\dofor{% \expandafter\ifcsdefinable\csname#1##1\endcsname @@ -655,10 +656,10 @@ \expandafter\cpt@flet@b\cpt@futureletchars\end\@\@ } -% Removed on 2014/08/27 to avoid noted interference with babel. +% We can't use \AtBeginDocument here in place of \BeforeStartOfDocument. % See <http://tex.stackexchange.com/questions/146391/catoptions % -destroys-french-active-characters-and>. -%\AtBeginDocument{\cptrestorecatcodes} +\AtEndOfPackage{\BeforeStartOfDocument{\cptrestorecatcodes}} \robust@gdef*\futureletresetactives{% \begingroup @@ -1793,7 +1794,7 @@ \cpt@err{Your command \noexpand#1 isn't scannable. \MsgBrk I needed to delimit its last parameter text}\@ehc }% - % Because of parameters, \postgroupdef can be used here: + % Because of parameters, \postgroupdef can't be used here: \gletcs#1\cpt@tempa \endgroup } @@ -1802,7 +1803,7 @@ % \cptdofunclist*[<parser>]{<listcmd>} % The command expects \do, which can be multi-parametered. % Parameters of \do are delimited internally, relieving the user -% of this need. Calling \dofunclist is equivalent to defining +% of this need. Calling \cptdofunclist is equivalent to defining % a multi-parametered \do within \csv@do: \robust@def*\cptdofunclist{% \cptpushnumber\dofunclistdepth @@ -1929,7 +1930,7 @@ \robust@def*\indrisloop{\cpt@teststopt\cpt@indrisloop,} % #1: parser % #2: list -% #3: a one-parameter recurrent macro (eg, \do) +% #3: a one-parameter recurrent macro (eg, \def\do#1{*#1*}) \robust@def*\cpt@indrisloop[#1]#2#3{% \cptpushfunctions\indrisloop{% \\\indris@do\\\indrisnr\\\iflastindris\\\ifloopbreak @@ -1993,7 +1994,7 @@ \fi #2{##1}% }% - \indrisloop*\cpt@tempa\print@do + \expandafter\indrisloop\expandafter{\cpt@tempa}\print@do } %% Robust, multi-level, general-purpose tsv processor: \robust@def*\tsv@@loop{% @@ -4338,9 +4339,7 @@ @afterprocessopt}% }% } -\robust@def*\BeforeStartOfDocument{% - \grightaddtocs\cpt@beforestartdoc -} +\robust@def*\BeforeStartOfDocument{\grightaddtocs\cpt@beforestartdoc} \new@def*\cpt@beforestartdoc{} \gleftaddtocs\document{% \endgroup @@ -4351,9 +4350,7 @@ \gdef\cpt@docstarted{}% \begingroup } -\robust@def*\AfterStartOfDocument{% - \grightaddtocs\cpt@afterstartdoc -} +\robust@def*\AfterStartOfDocument{\grightaddtocs\cpt@afterstartdoc} \new@def*\cpt@afterstartdoc{} \robust@def*\AfterAfterStartOfDocument#1{% \AtBeginDocument{% @@ -5045,6 +5042,7 @@ {\cpt@testfam\cpt@define@default@ds}% {\cpt@testfam\cpt@declareoption}% } +\robust@def*\XDeclareDefaultCallback{\XDeclareOption*} \robust@def*\cpt@declareoption<#1>#2{% \trim@@space{#1}\cpt@currfam \trim@@space{#2}\cpt@curropt @@ -5075,7 +5073,8 @@ \robust@def*\XDeclareOptions{% \let\@fileswith@pti@ns\@badrequireerror \cpt@ifstar{% - \cpt@err{Command \noexpand\XDeclareOptions has no star form}\@ehc + \cpt@err{Command \noexpand\XDeclareOptions has no + star form}\@ehc }{% \cpt@testfam\cpt@declareoptions }% @@ -5229,6 +5228,7 @@ \let\cmdoption\cptswfalse \cpt@testfam\cpt@declarebibooloptions } +\cptnewlet\XDeclareBibooleanOptions\XDeclareBiBooleanOptions \robust@def*\cpt@declarebibooloptions<#1>#2{% \begingroup \@tempcnta\z@pt @@ -5275,7 +5275,7 @@ \robust@def\cpt@d@cl@rebib@oloptions#1#2#3#4#5#6{% \cpt@d@cl@recmdoption{#5}{#1}{#3}(#4){% #6\relax - % If called by sister, don't callback: + % If called by sister, don't call back: \iftogTF{#5@#1}{}{% \settogtrue{#5@#2}% \settogtrue{biboolopts}% @@ -5474,7 +5474,7 @@ \robust@def*\cpt@ifoptdef<#1>#2{% \def\cpt@currfams{#1}% \cpt@choicefdfalse - % May break out of loop: + % may break out of loop: \def\csv@do##1{% \cpt@ifoptd@f{##1}{#2}% }% @@ -6317,7 +6317,9 @@ } \XDisableOptions*{draft,final} \XDeclareOption*{\cpt@warn{Unknown option '\CurrentOption' ignored}} -\XExecuteOptions{verbose=false,usepox=true,optionstacklimit=4}\relax +\XExecuteOptions{% + verbose=false,usepox=true,optionstacklimit=4% +}\relax \XProcessOptions*\relax \cptpopcatcodes |