summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2014-12-04 22:38:13 +0000
committerKarl Berry <karl@freefriends.org>2014-12-04 22:38:13 +0000
commit1164add0f5ec898954017e804a7ae41ca32351d1 (patch)
tree3d3479f8144b673bf9d2abd4e7ad3d4f18b2c5ed
parent2c37f59c3fcb1624310ddc9bd6301d85f99a9cfd (diff)
xkeyval (4dec14)
git-svn-id: svn://tug.org/texlive/trunk@35741 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/xkeyval/README4
-rw-r--r--Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdfbin492701 -> 492265 bytes
-rw-r--r--Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx12
-rw-r--r--Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex7
-rw-r--r--Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty2
5 files changed, 12 insertions, 13 deletions
diff --git a/Master/texmf-dist/doc/latex/xkeyval/README b/Master/texmf-dist/doc/latex/xkeyval/README
index 24959e0fe04..1f2a97ca228 100644
--- a/Master/texmf-dist/doc/latex/xkeyval/README
+++ b/Master/texmf-dist/doc/latex/xkeyval/README
@@ -1,5 +1,5 @@
-xkeyval v2.7
-------------
+xkeyval v2.7a
+-------------
This package is an extension of the keyval package by David Carlisle
and offers additional macros for setting keys and declaring and
diff --git a/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf b/Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf
index 3ae61104626..336f81eb547 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 b8bb4ed4e25..874701926a9 100644
--- a/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx
+++ b/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx
@@ -188,7 +188,7 @@ macro. \PrintChangesX\PrintIndexX
%
% \GetFileInfo{xkeyval.sty}
%
-% \CheckSum{3047}
+% \CheckSum{3042}
%
%\DoNotIndex{\:,\@,\@@,\@backslashchar,\@ehc,\@empty,\@expandtwoargs,
%\@for,\@forloop,\@fornoop,\@fortmp,\@gobble,\@gobbletwo,\@if,\@ifnch,
@@ -2060,10 +2060,10 @@ macro. \PrintChangesX\PrintIndexX
% Load \LaTeX\ primitives if necessary and provide information.
% \begin{macrocode}
\ifx\ProvidesFile\@undefined
- \message{2014/05/25 v2.7 key=value parser (HA)}
+ \message{2014/12/03 v2.7a key=value parser (HA)}
\input xkvtxhdr
\else
- \ProvidesFile{xkeyval.tex}[2014/05/25 v2.7 key=value parser (HA)]
+ \ProvidesFile{xkeyval.tex}[2014/12/03 v2.7a key=value parser (HA)]
\@addtofilelist{xkeyval.tex}
\fi
% \end{macrocode}
@@ -3284,6 +3284,7 @@ macro. \PrintChangesX\PrintIndexX
% problems when too many pointers present}
% \changes{v1.9}{2005/01/16}{Added back linking test}
% \changes{v2.0}{2005/01/30}{Simplified}
+% \changes{v2.7a}{2014/12/03}{Removed erroneous \cs{@empty}}
% \marg{key=value list}\\
% Replaces all pointers by their saved values. The result is stored in
% |\XKV@tempa|. We feed the replacement and the following tokens again to the
@@ -3302,7 +3303,7 @@ macro. \PrintChangesX\PrintIndexX
\ifx\XKV@tempb\@nnil\else\XKV@afterfi
\XKV@ifundefined{XKV@\XKV@header#2@value}{%
\XKV@err{no value recorded for key `#2'; ignored}%
- \XKV@r@placepointers\@empty
+ \XKV@r@placepointers
}{%
\@expandtwoargs\in@{,#2,}{,\XKV@resa,}%
\ifin@\XKV@afterelsefi
@@ -3310,7 +3311,6 @@ macro. \PrintChangesX\PrintIndexX
\else\XKV@afterfi
\XKV@addtolist@x\XKV@resa{#2}%
\expandafter\expandafter\expandafter\XKV@r@placepointers
- \expandafter\expandafter\expandafter\@empty
\csname XKV@\XKV@header#2@value\endcsname
\fi
}%
@@ -3440,7 +3440,7 @@ macro. \PrintChangesX\PrintIndexX
%<*xkvlatex>
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{xkeyval}
- [2014/05/25 v2.7 package option processing (HA)]
+ [2014/12/03 v2.7a 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 954450c1685..0679246f4bf 100644
--- a/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex
+++ b/Master/texmf-dist/tex/generic/xkeyval/xkeyval.tex
@@ -57,10 +57,10 @@
\newif\ifXKV@preset
\let\XKV@rm\@empty
\ifx\ProvidesFile\@undefined
- \message{2014/05/25 v2.7 key=value parser (HA)}
+ \message{2014/12/03 v2.7a key=value parser (HA)}
\input xkvtxhdr
\else
- \ProvidesFile{xkeyval.tex}[2014/05/25 v2.7 key=value parser (HA)]
+ \ProvidesFile{xkeyval.tex}[2014/12/03 v2.7a key=value parser (HA)]
\@addtofilelist{xkeyval.tex}
\fi
\def\XKV@warn#1{\message{xkeyval warning: #1}}
@@ -567,7 +567,7 @@
\ifx\XKV@tempb\@nnil\else\XKV@afterfi
\XKV@ifundefined{XKV@\XKV@header#2@value}{%
\XKV@err{no value recorded for key `#2'; ignored}%
- \XKV@r@placepointers\@empty
+ \XKV@r@placepointers
}{%
\@expandtwoargs\in@{,#2,}{,\XKV@resa,}%
\ifin@\XKV@afterelsefi
@@ -575,7 +575,6 @@
\else\XKV@afterfi
\XKV@addtolist@x\XKV@resa{#2}%
\expandafter\expandafter\expandafter\XKV@r@placepointers
- \expandafter\expandafter\expandafter\@empty
\csname XKV@\XKV@header#2@value\endcsname
\fi
}%
diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty
index 2a56d2b7b2a..5082a308fa8 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/05/25 v2.7 package option processing (HA)]
+ [2014/12/03 v2.7a package option processing (HA)]
\ifx\XKeyValLoaded\endinput\else\input xkeyval \fi
\edef\XKVcatcodes{%
\catcode`\noexpand\=\the\catcode`\=\relax