diff options
Diffstat (limited to 'Master/texmf-dist')
4 files changed, 30 insertions, 61 deletions
diff --git a/Master/texmf-dist/doc/latex/catoptions/README b/Master/texmf-dist/doc/latex/catoptions/README index 353ceecf5dd..5d83c9b244a 100644 --- a/Master/texmf-dist/doc/latex/catoptions/README +++ b/Master/texmf-dist/doc/latex/catoptions/README @@ -2,7 +2,7 @@ This is the README file for the 'catoptions' package. VERSION -Version 0.2.7e, 2012/10/14 +Version 0.2.7f, 2012/11/17 LOCATION ON CTAN diff --git a/Master/texmf-dist/doc/latex/catoptions/catoptions-guide.tex b/Master/texmf-dist/doc/latex/catoptions/catoptions-guide.tex index 7d6e11d4d54..bd52c59487f 100644 --- a/Master/texmf-dist/doc/latex/catoptions/catoptions-guide.tex +++ b/Master/texmf-dist/doc/latex/catoptions/catoptions-guide.tex @@ -17,9 +17,6 @@ \makeindex \let\footnote\ltsfootnote -% \ifsingletokenTF -% \ifblankTF - \begin{document} \begin{frontmatter} @@ -1034,6 +1031,9 @@ In the commands \ffx'{\tsv@loop,\tsv@@parse}, it is always possible to break out The following change history highlights significant changes that affect user utilities and interfaces; mutations of technical nature are not documented in this section. The numbers on the right-hand side of the following lists are section numbers; the \stsign means the subject features in the package but is not reflected anywhere in this user guide. \begin{versionhist} + \begin{version}{0.2.7f}{2012/11/17} + \item Bug fix in \fx{\cptonlypreamble}.\vsecref* + \end{version} \begin{version}{0.2.7c-e}{2012/10/14} \item Changes in some command names.\vsecref* \end{version} diff --git a/Master/texmf-dist/tex/latex/catoptions/catoptions-guide.cfg b/Master/texmf-dist/tex/latex/catoptions/catoptions-guide.cfg index dd1a6efd158..a34684ab061 100644 --- a/Master/texmf-dist/tex/latex/catoptions/catoptions-guide.cfg +++ b/Master/texmf-dist/tex/latex/catoptions/catoptions-guide.cfg @@ -1,8 +1,8 @@ \ProvidesFile{catoptions-guide.cfg}% - [2012/10/14 v0.2.7e Configuration file for catoptions-guide.tex (AM)] + [2012/11/17 v0.2.7f Configuration file for catoptions-guide.tex (AM)] \cptloadpackages{% - n-xwatermark|printwatermark; + xwatermark|printwatermark; array; colortbl; ltablex; diff --git a/Master/texmf-dist/tex/latex/catoptions/catoptions.sty b/Master/texmf-dist/tex/latex/catoptions/catoptions.sty index 4f112b72f81..51b670f5f47 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.7e, 2012/10/14. % +% This is 'catoptions' package, version 0.2.7f, 2012/11/22. % % % % The catoptions package changes LaTeX package loading internals % % so that all subsequently loaded packages can rely on having % @@ -83,9 +83,9 @@ \catcode47=12 \catcode94=7 \catcode126=13 + \AtEndOfPackage{% - % Commands to discard later, after all the packages that - % need them have been updated on CTAN: + % **Remove this later, after ltxtools.sty has been updated on CTAN: \newletcsset{% \dofunclist=\cptdofunclist, \docommalist=\cptdocommalist, @@ -112,7 +112,7 @@ \chardef\active=13 \NeedsTeXFormat{LaTeX2e}[2011/06/27] \ProvidesPackage{catoptions} - [2012/10/14 v0.2.7e Securing catcodes and parsing options (AM)] + [2012/11/22 v0.2.7f Securing catcodes and parsing options (AM)] \ifcase% \ifx\eTeXversion\cpt@undefined\z@pt\else \ifnum\eTeXversion<\tw@\z@pt\else\@ne\fi\fi @@ -889,19 +889,16 @@ }% \def\cpt@activecomma#1~#2\cpt@nil{% \ifblankTF{#2} - {\cpt@spacecomma#1 ,\cpt@nil} - {\cpt@activecomma#1,#2\cpt@nil}% + {\cpt@spacecomma#1 ,\cpt@nil}{\cpt@activecomma#1,#2\cpt@nil}% }% } \def\cpt@spacecomma#1 ,#2\cpt@nil{% \ifblankTF{#2} - {\cpt@commaspace#1, \cpt@nil} - {\cpt@spacecomma#1,#2\cpt@nil}% + {\cpt@commaspace#1, \cpt@nil}{\cpt@spacecomma#1,#2\cpt@nil}% } \def\cpt@commaspace#1, #2\cpt@nil{% \ifblankTF{#2} - {\cpt@doublecomma#1,,\cpt@nil} - {\cpt@commaspace#1,#2\cpt@nil}% + {\cpt@doublecomma#1,,\cpt@nil}{\cpt@commaspace#1,#2\cpt@nil}% } \def\cpt@doublecomma#1,,#2\cpt@nil{% \ifblankTF{#2} @@ -1037,9 +1034,7 @@ \pdfresettimer#1% \message{Run time: \the\pdfelapsedtime}% } -\new@def*\ifdocstartedTF{% - \ifdefTF\cpt@docstarted\cptiofii\cptiiofii -} +\new@def*\ifdocstartedTF{\ifdefTF\cpt@docstarted\cptiofii\cptiiofii} \long\def\@gobblethree#1#2#3{} \long\def\@firstofthree#1#2#3{#1} @@ -1201,14 +1196,20 @@ \long\gdef\cpttrimspace#1{\cpt@trimspace@a.#1& &} \long\gdef\cpt@trimspace@a#1 &{\cpt@trimspace@b#1&} \long\gdef\cpt@trimspace@b#1{% - \unexpanded\expandafter - {\romannumeral-`\q\expandafter\noexpand\@gobble#1}% + \unexpanded\expandafter{% + \romannumeral0% + \expandafter\ifleadspaceTF\expandafter{\@gobble#1}{% + \@gobble#1% + }{% + \expandafter\@space\@gobble#1% + }% + }% } \endgroup \robust@def\trim@@spaces#1#2{\edef#2{\cpttrimspaces{#1}}} \robust@def\trim@@space#1#2{\edef#2{\cpttrimspace{#1}}} \robust@def*\despacecontent#1{% - \edef#1{\simpleexpandarg\cpttrimspaces{#1}}% + \edef#1{\simpleexpandarg\cpttrimspace{#1}}% } \robust@def\cptusesimpletrimspaces{% \let\cptcurrtrimspaces\cpttrimspace @@ -1724,7 +1725,7 @@ }% \cptpopnumber{#2}% } -\cptchardef\cpt@optionstacklimit=4 +\cptchardef\cpt@optionstacklimit=4\relax % #1: calling (base) function % #2: state list (a macro) % #3: state counter @@ -1982,41 +1983,6 @@ }% \indrisloop*\cpt@tempa\print@do } -\robust@def*\indristloop#1#2{\cpt@testst\cpt@indristloop} -\robust@def*\cpt@indristloop#1#2{% - \cptpushfunctions\indristloop{% - \\\user@do\\\indrisnr\\\iflastindris\\\ifloopbreak - }\cpt@csvdepth - \cpt@stchoose{cpt@st}{#1}\cpt@rsvda\indristloop - \advance\indrisdepth\@ne - \lastindrisfalse\loopbreakfalse - \chardef\indrisnr\z@pt - \cpt@setupuserdo{#2}% - \cpt@setupnextindris{}% - \let\cpt@incsv\cptswfalse - \def\cpt@indristl@op##1##2\indris@nil{% - \ifdefboolTF{loopbreak}{% - \cptdoremainder{##2}% - }{% - \edef\currindris{\s@expandarg\cpttrimspace{\@gobble##1}}% - \letcsntocs{currindris@\cptrm\indrisdepth}\currindris - \edef\indrisnr{\the\numexpr\indrisnr+1}% - \getnextindris.##2\indris@nil - \ifcseqTF\nextindris\cpt@nnil{% - \lastindristrue - \def\nextindris{}% - \csn@def{nextindris@\cptrm\indrisdepth}{}% - \s@expandarg\user@do\currindris\relax - }{% - \s@expandarg\user@do\currindris\relax - \cpt@indristl@op##2\indris@nil - }% - }% - }% - \expandafter\cpt@indristl@op\expandafter.\cpt@rsvda\cpt@nil\indris@nil - \cptpopfunctions\indristloop\cpt@csvdepth - \advance\indrisdepth\m@one -} %% Robust, multi-level, general-purpose tsv processor: \robust@def*\tsv@@loop{% \let\tsv@inparse\cptswfalse @@ -2276,8 +2242,10 @@ {Move command '\string#1' to document preamble.}% }% }{% - \cpt@warn{Undefined command '\unexpanded{#1}': - \MsgBrk appeared in \string\cptonlypreamble}% + \ifx\relax#1\else + \cpt@warn{Undefined command '\unexpanded{#1}': + \MsgBrk appeared in \string\cptonlypreamble}% + \fi }% }% \cpt@preamblecmdhook @@ -4606,7 +4574,8 @@ \xifstrcmpTF\cpt@tempc{^?^}{% \addto@hook\toks@{\RequirePackage[\cpt@tempb]{\cpt@tempa}}% }{% - \addto@hook\toks@{\RequirePackage[\cpt@tempb]{\cpt@tempa}[\cpt@tempc]}% + \addto@hook\toks@ + {\RequirePackage[\cpt@tempb]{\cpt@tempa}[\cpt@tempc]}% }% }% }% |