From be38c2422e48f73f3418e80d8675fa58f60c6b7f Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 13 May 2014 22:14:28 +0000 Subject: xkeyval (10may14) git-svn-id: svn://tug.org/texlive/trunk@34020 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'Master/texmf-dist/source/latex/xkeyval') diff --git a/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx b/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx index ee715703549..07ce2c46f7d 100644 --- a/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx +++ b/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx @@ -181,10 +181,11 @@ macro. \PrintChangesX\PrintIndexX % not only the once from the outermost \cs{setkeys*}} % \changes{v2.6c}{2014/04/27}{Added support for \cs{par} to support similar % changes in \pf{keyval}} +% \changes{v2.6d}{2014/05/09}{Implemented fix conform fix in \pf{keyval}} % % \GetFileInfo{xkeyval.sty} % -% \CheckSum{3031} +% \CheckSum{3025} % %\DoNotIndex{\:,\@,\@@,\@backslashchar,\@ehc,\@empty,\@expandtwoargs, %\@for,\@forloop,\@fornoop,\@fortmp,\@gobble,\@gobbletwo,\@if,\@ifnch, @@ -2057,10 +2058,10 @@ macro. \PrintChangesX\PrintIndexX % Load \LaTeX\ primitives if necessary and provide information. % \begin{macrocode} \ifx\ProvidesFile\@undefined - \message{2014/04/27 v2.6c key=value parser (HA)} + \message{2014/05/09 v2.6d key=value parser (HA)} \input xkvtxhdr \else - \ProvidesFile{xkeyval.tex}[2014/04/27 v2.6c key=value parser (HA)] + \ProvidesFile{xkeyval.tex}[2014/05/09 v2.6d key=value parser (HA)] \@addtofilelist{xkeyval.tex} \fi % \end{macrocode} @@ -3884,10 +3885,10 @@ macro. \PrintChangesX\PrintIndexX \long\def\XKV@replacepointers#1{% \let\XKV@tempa\@empty \let\XKV@resa\@empty - \XKV@r@placepointers\@empty#1\usevalue\@nil + \XKV@r@placepointers#1\usevalue\@nil } \long\def\XKV@r@placepointers#1\usevalue#2{% - \expandafter\XKV@addtomacro@n\expandafter\XKV@tempa\expandafter{#1}% + \XKV@addtomacro@n\XKV@tempa{#1}% \def\XKV@tempb{#2}% \ifx\XKV@tempb\@nnil\else\XKV@afterfi \XKV@ifundefined{XKV@\XKV@header#2@value}{% @@ -4030,7 +4031,7 @@ macro. \PrintChangesX\PrintIndexX %<*xkvlatex> \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{xkeyval} - [2014/04/27 v2.6c package option processing (HA)] + [2014/05/09 v2.6d package option processing (HA)] % \end{macrocode} % Initializations. Load |xkeyval.tex|, adjust some catcodes to define % internal macros and initialize the |\DeclareOptionX*| working macro. @@ -4327,10 +4328,10 @@ macro. \PrintChangesX\PrintIndexX \else \expandafter\KV@@sp@b\expandafter#1% \fi}% -\long\def\KV@@sp@b#1##1 \@nil{\KV@@sp@c\@empty##1}% +\long\def\KV@@sp@b#1##1 \@nil{\KV@@sp@c##1}% } \XKV@tempa{ } -\long\def\KV@@sp@c#1\@nil#2\relax#3{\XKV@toks\expandafter{#1}\edef#3{\the\XKV@toks}} +\long\def\KV@@sp@c#1\@nil#2\relax#3{\XKV@toks{#1}\edef#3{\the\XKV@toks}} \long\def\KV@do#1,{% \ifx\relax#1\@empty\else \KV@split#1==\relax -- cgit v1.2.3