From 0f6f2f72f8dfba6f81cd3ce8cf09975ea16c10b5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 14 Aug 2008 00:11:08 +0000 Subject: xkeyval update (13aug08) git-svn-id: svn://tug.org/texlive/trunk@10326 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf | Bin 469612 -> 469070 bytes Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx | 33 +++++++++++++-------- Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex | 23 +++++++------- Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty | 2 +- 4 files changed, 33 insertions(+), 25 deletions(-) (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf b/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf index 89ab00746c3..612797ba244 100644 Binary files a/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf and b/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf differ diff --git a/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx b/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx index 985f46dd065..939df4cdc05 100644 --- a/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx +++ b/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx @@ -181,7 +181,7 @@ macro. \PrintChangesX\PrintIndexX % % \GetFileInfo{xkeyval.sty} % -% \CheckSum{2999} +% \CheckSum{3001} % %\DoNotIndex{\:,\@,\@@,\@backslashchar,\@ehc,\@empty,\@expandtwoargs, %\@for,\@forloop,\@fornoop,\@fortmp,\@gobble,\@gobbletwo,\@if,\@ifnch, @@ -2040,6 +2040,7 @@ macro. \PrintChangesX\PrintIndexX % and scale). % \begin{macrocode} \newtoks\XKV@toks +\newtoks\XKV@tempa@toks \newcount\XKV@depth \newif\ifXKV@st \newif\ifXKV@sg @@ -2053,10 +2054,10 @@ macro. \PrintChangesX\PrintIndexX % Load \LaTeX\ primitives if necessary and provide information. % \begin{macrocode} \ifx\ProvidesFile\@undefined - \message{2008/08/10 v2.6 key=value parser (HA)} + \message{2008/08/13 v2.6a key=value parser (HA)} \input xkvtxhdr \else - \ProvidesFile{xkeyval.tex}[2008/08/10 v2.6 key=value parser (HA)] + \ProvidesFile{xkeyval.tex}[2008/08/13 v2.6a key=value parser (HA)] \@addtofilelist{xkeyval.tex} \fi % \end{macrocode} @@ -2156,6 +2157,7 @@ macro. \PrintChangesX\PrintIndexX % \end{macro} % \begin{macro}{\XKV@for@n} % \changes{v2.6 }{2008/08/10}{protecting assignments from \#} +% \changes{v2.6a}{2008/08/13}{Use private scratch register} % \marg{list}\meta{cmd}\marg{function}\\ % Fast for-loop. \meta{list} is not expanded. Entries of \meta{list} % will be stored in \meta{cmd} and at every iteration \meta{function} @@ -2163,7 +2165,7 @@ macro. \PrintChangesX\PrintIndexX % Contributed by Morten H\o gholm. % \begin{macrocode} \long\def\XKV@for@n#1#2#3{% - \toks@{#1}\edef#2{\the\toks@}% + \XKV@tempa@toks{#1}\edef#2{\the\XKV@tempa@toks}% \ifx#2\@empty \XKV@for@break \else @@ -2175,11 +2177,12 @@ macro. \PrintChangesX\PrintIndexX % \end{macro} % \begin{macro}{\XKV@f@r} % \changes{v2.6 }{2008/08/10}{protecting assignments from \#} +% \changes{v2.6a}{2008/08/13}{Use private scratch register} % \meta{cmd}\marg{function}\meta{entry}|,|\\ % Looping macro. % \begin{macrocode} \long\def\XKV@f@r#1#2#3,{% - \toks@{#3}\edef#1{\the\toks@}% + \XKV@tempa@toks{#3}\edef#1{\the\XKV@tempa@toks}% \ifx#1\@nnil \expandafter\@gobbletwo \else @@ -2286,17 +2289,19 @@ macro. \PrintChangesX\PrintIndexX % \end{macro} % \begin{macro}{\XKV@addtomacro@n} % \changes{v2.6 }{2008/08/10}{protecting assignments from \#} +% \changes{v2.6a}{2008/08/13}{Use private scratch register} % \meta{macro}\marg{content}\\ % Adds \meta{content} to \meta{macro} without expanding it. % \begin{macrocode} \def\XKV@addtomacro@n#1#2{% - \toks@\expandafter{#1#2}% - \edef#1{\the\toks@}% + \XKV@tempa@toks\expandafter{#1#2}% + \edef#1{\the\XKV@tempa@toks}% } % \end{macrocode} % \end{macro} % \begin{macro}{\XKV@addtomacro@o} % \changes{v2.6 }{2008/08/10}{protecting assignments from \#} +% \changes{v2.6a}{2008/08/13}{Use private scratch register} % \meta{macro}\marg{content}\\ % Adds \meta{content} to \meta{macro} after expanding the first token % of \meta{content} once. Often used to add the content of a macro @@ -2350,6 +2355,7 @@ macro. \PrintChangesX\PrintIndexX % \begin{macro}{\@s@lective@sanitize} % \changes{v2.5a}{2005/05/31}{Added missing `\%'} % \changes{v2.6 }{2008/08/10}{protecting assignments from \#} +% \changes{v2.6a}{2008/08/13}{Use private scratch register} % \oarg{level}\marg{character string}\marg{cmd}\\ % Converts selected characters, given by \meta{character string}, % within the first-level expansion of \meta{cmd} to category code~12, @@ -2377,8 +2383,8 @@ macro. \PrintChangesX\PrintIndexX \def#3{#2}\@onelevel@sanitize#3% \edef#3{{#3}{\the\XKV@toks}}% \expandafter\@s@l@ctive@sanitize\expandafter#3#3% - \expandafter\toks@\expandafter{#3}% - \expandafter\endgroup\expandafter\toks@\expandafter{\the\toks@}% + \expandafter\XKV@tempa@toks\expandafter{#3}% + \expandafter\endgroup\expandafter\toks@\expandafter{\the\XKV@tempa@toks}% \edef#3{\the\toks@}% } % \end{macrocode} @@ -2476,6 +2482,7 @@ macro. \PrintChangesX\PrintIndexX % \begin{macro}{\XKV@ch@cksanitize} % \changes{v1.8b}{2004/12/22}{Fixed bug for key value \cs{@empty}} % \changes{v2.6 }{2008/08/10}{protecting assignments from \#} +% \changes{v2.6a}{2008/08/13}{Use private scratch register} % \marg{character string}\meta{cmd}\meta{token}\\ % This macro first checks whether at least one \meta{token} is in \meta{character string}. % If that is the case, it checks whether the character has catcode 12. @@ -2490,7 +2497,7 @@ macro. \PrintChangesX\PrintIndexX % end of the macro. % \begin{macrocode} \def\XKV@ch@cksanitize#1#2#3{% - \toks@{#1}\edef#2{\the\toks@}% + \XKV@tempa@toks{#1}\edef#2{\the\XKV@tempa@toks}% \@onelevel@sanitize#2% % \end{macrocode} % Check whether there is at least one |=| present. @@ -2504,12 +2511,12 @@ macro. \PrintChangesX\PrintIndexX % before (and for instance stored in a macro or token register). % \begin{macrocode} \def#2##1#3##2\@nil{% - \toks@{##2}\edef#2{\the\toks@}% + \XKV@tempa@toks{##2}\edef#2{\the\XKV@tempa@toks}% \ifx#2\@empty\else\in@false\fi }% #2#1#3\@nil \fi - \toks@{#1}\edef#2{\the\toks@}% + \XKV@tempa@toks{#1}\edef#2{\the\XKV@tempa@toks}% } % \end{macrocode} % \end{macro} @@ -4017,7 +4024,7 @@ macro. \PrintChangesX\PrintIndexX %<*xkvlatex> \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{xkeyval} - [2008/08/10 v2.6 package option processing (HA)] + [2008/08/13 v2.6a package option processing (HA)] % \end{macrocode} % Initializations. Load |xkeyval.tex|, adjust some catcodes to define % internal macros and initialize the |\DeclareOptionX*| working macro. diff --git a/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex b/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex index abee97a2e4f..9768071a791 100644 --- a/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex +++ b/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex @@ -47,6 +47,7 @@ \catcode`\,12\relax \catcode`\:12\relax \newtoks\XKV@toks +\newtoks\XKV@tempa@toks \newcount\XKV@depth \newif\ifXKV@st \newif\ifXKV@sg @@ -57,10 +58,10 @@ \newif\ifXKV@preset \let\XKV@rm\@empty \ifx\ProvidesFile\@undefined - \message{2008/08/10 v2.6 key=value parser (HA)} + \message{2008/08/13 v2.6a key=value parser (HA)} \input xkvtxhdr \else - \ProvidesFile{xkeyval.tex}[2008/08/10 v2.6 key=value parser (HA)] + \ProvidesFile{xkeyval.tex}[2008/08/13 v2.6a key=value parser (HA)] \@addtofilelist{xkeyval.tex} \fi \long\def\@firstoftwo#1#2{#1} @@ -103,7 +104,7 @@ {#2}{#3}#4% } \long\def\XKV@for@n#1#2#3{% - \toks@{#1}\edef#2{\the\toks@}% + \XKV@tempa@toks{#1}\edef#2{\the\XKV@tempa@toks}% \ifx#2\@empty \XKV@for@break \else @@ -112,7 +113,7 @@ #2{#3}#1,\@nil,% } \long\def\XKV@f@r#1#2#3,{% - \toks@{#3}\edef#1{\the\toks@}% + \XKV@tempa@toks{#3}\edef#1{\the\XKV@tempa@toks}% \ifx#1\@nnil \expandafter\@gobbletwo \else @@ -144,8 +145,8 @@ } \long\def\XKV@wh@l@st#1\@@#2#3\fi#4#5{} \def\XKV@addtomacro@n#1#2{% - \toks@\expandafter{#1#2}% - \edef#1{\the\toks@}% + \XKV@tempa@toks\expandafter{#1#2}% + \edef#1{\the\XKV@tempa@toks}% } \def\XKV@addtomacro@o#1#2{% \expandafter\XKV@addtomacro@n\expandafter#1\expandafter{#2}% @@ -173,8 +174,8 @@ \def#3{#2}\@onelevel@sanitize#3% \edef#3{{#3}{\the\XKV@toks}}% \expandafter\@s@l@ctive@sanitize\expandafter#3#3% - \expandafter\toks@\expandafter{#3}% - \expandafter\endgroup\expandafter\toks@\expandafter{\the\toks@}% + \expandafter\XKV@tempa@toks\expandafter{#3}% + \expandafter\endgroup\expandafter\toks@\expandafter{\the\XKV@tempa@toks}% \edef#3{\the\toks@}% } \def\@s@l@ctive@sanitize#1#2#3{% @@ -232,17 +233,17 @@ \ifin@\@selective@sanitize[0],#2\fi } \def\XKV@ch@cksanitize#1#2#3{% - \toks@{#1}\edef#2{\the\toks@}% + \XKV@tempa@toks{#1}\edef#2{\the\XKV@tempa@toks}% \@onelevel@sanitize#2% \@expandtwoargs\in@#3{#2}% \ifin@ \def#2##1#3##2\@nil{% - \toks@{##2}\edef#2{\the\toks@}% + \XKV@tempa@toks{##2}\edef#2{\the\XKV@tempa@toks}% \ifx#2\@empty\else\in@false\fi }% #2#1#3\@nil \fi - \toks@{#1}\edef#2{\the\toks@}% + \XKV@tempa@toks{#1}\edef#2{\the\XKV@tempa@toks}% } \def\XKV@sp@deflist#1#2{% \let#1\@empty diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty index 47a5c11ab65..17a176a4e5b 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{xkeyval} - [2008/08/10 v2.6 package option processing (HA)] + [2008/08/13 v2.6a package option processing (HA)] \ifx\XKeyValLoaded\endinput\else\input xkeyval \fi \edef\XKVcatcodes{% \catcode`\noexpand\=\the\catcode`\=\relax -- cgit v1.2.3