diff options
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex | 23 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty | 2 |
2 files changed, 13 insertions, 12 deletions
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 |