summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/xkeyval/README4
-rw-r--r--Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdfbin490861 -> 490568 bytes
-rw-r--r--Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx17
-rw-r--r--Master/texmf-dist/tex/generic/xkeyval/keyval.tex4
-rw-r--r--Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex8
-rw-r--r--Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty2
6 files changed, 18 insertions, 17 deletions
diff --git a/Master/texmf-dist/doc/latex/xkeyval/README b/Master/texmf-dist/doc/latex/xkeyval/README
index 146b1d68afa..f6bf088d172 100644
--- a/Master/texmf-dist/doc/latex/xkeyval/README
+++ b/Master/texmf-dist/doc/latex/xkeyval/README
@@ -1,4 +1,4 @@
-xkeyval v2.6c
+xkeyval v2.6d
-------------
This package is an extension of the keyval package by David Carlisle
@@ -60,7 +60,7 @@ xkeyval into your LaTeX distribution
License
-------
-Copyright (C) 2004-2012 Hendri Adriaens
+Copyright (C) 2004-2014 Hendri Adriaens
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf b/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf
index daedd994211..502e0a6065d 100644
--- a/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf
+++ b/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf
Binary files differ
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
diff --git a/Master/texmf-dist/tex/generic/xkeyval/keyval.tex b/Master/texmf-dist/tex/generic/xkeyval/keyval.tex
index 20b64a84a47..845262148f9 100644
--- a/Master/texmf-dist/tex/generic/xkeyval/keyval.tex
+++ b/Master/texmf-dist/tex/generic/xkeyval/keyval.tex
@@ -45,10 +45,10 @@
\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
diff --git a/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex b/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex
index 838aa208869..9b956a077ef 100644
--- a/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex
+++ b/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex
@@ -58,10 +58,10 @@
\newif\ifXKV@preset
\let\XKV@rm\@empty
\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
\long\def\@firstoftwo#1#2{#1}
@@ -783,10 +783,10 @@
\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}{%
diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty
index 9456ddbd67f..727ed8802af 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}
- [2014/04/27 v2.6c package option processing (HA)]
+ [2014/05/09 v2.6d package option processing (HA)]
\ifx\XKeyValLoaded\endinput\else\input xkeyval \fi
\edef\XKVcatcodes{%
\catcode`\noexpand\=\the\catcode`\=\relax