From 850706cd4d23138d5bf7c7cc2050bde2cccb55bc Mon Sep 17 00:00:00 2001 From: Reinhard Kotucha Date: Sat, 25 Nov 2006 04:07:06 +0000 Subject: update xkeyval. git-svn-id: svn://tug.org/texlive/trunk@2520 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/xkeyval/README | 4 ++-- Master/texmf-dist/doc/latex/xkeyval/xkeyval.pdf | Bin 423958 -> 426092 bytes Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx | 22 ++++++++++++--------- Master/texmf-dist/tex/latex/xkeyval/keyval.tex | 2 +- Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty | 2 +- Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex | 2 +- Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty | 4 ++-- Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex | 12 ++++++----- Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty | 2 +- Master/texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex | 2 +- Master/texmf-dist/tex/latex/xkeyval/xkvview.sty | 2 +- Master/texmf-dist/tpm/xkeyval.tpm | 8 ++++---- 12 files changed, 34 insertions(+), 28 deletions(-) diff --git a/Master/texmf-dist/doc/latex/xkeyval/README b/Master/texmf-dist/doc/latex/xkeyval/README index 719985a1baf..bd110671ba4 100644 --- a/Master/texmf-dist/doc/latex/xkeyval/README +++ b/Master/texmf-dist/doc/latex/xkeyval/README @@ -1,4 +1,4 @@ -xkeyval v2.5e +xkeyval v2.5f ------------- 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-2005 Hendri Adriaens +Copyright (C) 2004-2006 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 72a32521e29..8b6f56c5d5d 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 2aabc0bc603..20daa13d6a9 100644 --- a/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx +++ b/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx @@ -25,7 +25,7 @@ % pst-xkey.sty % %% --------------------------------------- -%% Copyright (C) 2004-2005 Hendri Adriaens +%% Copyright (C) 2004-2006 Hendri Adriaens %% --------------------------------------- %% %% This work may be distributed and/or modified under the @@ -176,7 +176,7 @@ documentation and for contributing the |\@selective@sanitize| macro. % % \GetFileInfo{xkeyval.sty} % -% \CheckSum{2964} +% \CheckSum{2967} % %\DoNotIndex{\:,\@,\@@,\@backslashchar,\@ehc,\@empty,\@expandtwoargs, %\@for,\@forloop,\@fornoop,\@fortmp,\@gobble,\@gobbletwo,\@if,\@ifnch, @@ -2046,10 +2046,10 @@ documentation and for contributing the |\@selective@sanitize| macro. % Load \LaTeX\ primitives if necessary and provide information. % \begin{macrocode} \ifx\ProvidesFile\@undefined - \message{2005/11/25 v2.5e key=value parser (HA)} + \message{2006/11/18 v2.5f key=value parser (HA)} \input xkvtxhdr \else - \ProvidesFile{xkeyval.tex}[2005/11/25 v2.5e key=value parser (HA)] + \ProvidesFile{xkeyval.tex}[2006/11/18 v2.5f key=value parser (HA)] \@addtofilelist{xkeyval.tex} \fi % \end{macrocode} @@ -2695,6 +2695,7 @@ documentation and for contributing the |\@selective@sanitize| macro. % \end{macrocode} % \end{macro} % \begin{macro}{\XKV@srstate} +% \changes{v2.5f}{2006/11/18}{Added \texttt{XKV@tkey} and \texttt{XKV@rm} to solve bugs} % \marg{postfix1}\marg{postfix2}\\ % Macro to save and restore \pf{xkeyval} internals to allow for % nesting |\setkeys| commands. It executes a for loop over a set of @@ -2707,8 +2708,9 @@ documentation and for contributing the |\@selective@sanitize| macro. % \begin{macrocode} \def\XKV@srstate#1#2{% \ifx\@empty#2\@empty\advance\XKV@depth\@ne\fi - \XKV@for@n{XKV@prefix,XKV@fams,XKV@na,ifXKV@st,ifXKV@pl,ifXKV@knf}% - \XKV@resa{\expandafter\let\csname\XKV@resa#1\expandafter + \XKV@for@n{XKV@prefix,XKV@fams,XKV@tkey,XKV@na,% + XKV@rm,ifXKV@st,ifXKV@pl,ifXKV@knf}\XKV@resa{% + \expandafter\let\csname\XKV@resa#1\expandafter \endcsname\csname\XKV@resa#2\endcsname }% \ifx\@empty#1\@empty\advance\XKV@depth\m@ne\fi @@ -3585,6 +3587,7 @@ documentation and for contributing the |\@selective@sanitize| macro. % \begin{macro}{\XKV@setkeys} % \oarg{na}\marg{key=value list}\\ % \changes{v1.8a}{2004/12/20}{Solved small bug} +% \changes{v2.5f}{2006/11/18}{Added reset of \cs{CurrentOption}} % Workhorse for |\setkeys|. % \begin{macrocode} \def\XKV@setkeys[#1]#2{% @@ -3607,6 +3610,7 @@ documentation and for contributing the |\@selective@sanitize| macro. \XKV@usepresetkeys{#1}{preseth}% \expandafter\XKV@s@tkeys\expandafter{\XKV@resb}{#1}% \XKV@usepresetkeys{#1}{presett}% + \let\CurrentOption\@empty } % \end{macrocode} % \end{macro} @@ -3994,7 +3998,7 @@ documentation and for contributing the |\@selective@sanitize| macro. %<*xkvlatex> \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{xkeyval} - [2005/11/25 v2.5e package option processing (HA)] + [2006/11/18 v2.5f package option processing (HA)] % \end{macrocode} % Initializations. Load |xkeyval.tex|, adjust some catcodes to define % internal macros and initialize the |\DeclareOptionX*| working macro. @@ -5270,7 +5274,7 @@ example the %% keyvii will set \keyvii in xkvesc.sty \usepackage[keyvii]{xkvesc} -\title{\textsf{xkeyval} package\\\normalsize\emph{Example 2}} +\title{\textsf{xkeyval} package\\\normalsize\emph{Example 3}} \author{Hendri Adriaens} \setlength{\parindent}{0cm} @@ -5331,7 +5335,7 @@ problems.\\ %% keyvii will set \keyvii in xkvesc.sty \usepackage[keyvii]{xkvesc} -\title{\textsf{xkeyval} package\\\normalsize\emph{Example 3}} +\title{\textsf{xkeyval} package\\\normalsize\emph{Example 4}} \author{Hendri Adriaens} \setlength{\parindent}{0cm} diff --git a/Master/texmf-dist/tex/latex/xkeyval/keyval.tex b/Master/texmf-dist/tex/latex/xkeyval/keyval.tex index 0aed1d328ab..38a505abeee 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/keyval.tex +++ b/Master/texmf-dist/tex/latex/xkeyval/keyval.tex @@ -7,7 +7,7 @@ %% xkeyval.dtx (with options: `xkvkeyval') %% %% --------------------------------------- -%% Copyright (C) 2004-2005 Hendri Adriaens +%% Copyright (C) 2004-2006 Hendri Adriaens %% --------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty index b8aebc251d7..c7fdde29d96 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.sty @@ -7,7 +7,7 @@ %% xkeyval.dtx (with options: `pxklatex') %% %% --------------------------------------- -%% Copyright (C) 2004-2005 Hendri Adriaens +%% Copyright (C) 2004-2006 Hendri Adriaens %% --------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex index cad6b16f6e3..e2067f99909 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex +++ b/Master/texmf-dist/tex/latex/xkeyval/pst-xkey.tex @@ -7,7 +7,7 @@ %% xkeyval.dtx (with options: `pxktex') %% %% --------------------------------------- -%% Copyright (C) 2004-2005 Hendri Adriaens +%% Copyright (C) 2004-2006 Hendri Adriaens %% --------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty index 34b6222bcec..41c8b5aa1cb 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.sty @@ -7,7 +7,7 @@ %% xkeyval.dtx (with options: `xkvlatex') %% %% --------------------------------------- -%% Copyright (C) 2004-2005 Hendri Adriaens +%% Copyright (C) 2004-2006 Hendri Adriaens %% --------------------------------------- %% %% This work may be distributed and/or modified under the @@ -35,7 +35,7 @@ %% \NeedsTeXFormat{LaTeX2e}[1995/12/01] \ProvidesPackage{xkeyval} - [2005/11/25 v2.5e package option processing (HA)] + [2006/11/18 v2.5f package option processing (HA)] \ifx\XKeyValLoaded\endinput\else\input xkeyval \fi \edef\XKVcatcodes{% \catcode`\noexpand\=\the\catcode`\=\relax diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex index aca45ff5443..ed42476ca6f 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex +++ b/Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex @@ -7,7 +7,7 @@ %% xkeyval.dtx (with options: `xkvtex') %% %% --------------------------------------- -%% Copyright (C) 2004-2005 Hendri Adriaens +%% Copyright (C) 2004-2006 Hendri Adriaens %% --------------------------------------- %% %% This work may be distributed and/or modified under the @@ -57,10 +57,10 @@ \newif\ifXKV@preset \let\XKV@rm\@empty \ifx\ProvidesFile\@undefined - \message{2005/11/25 v2.5e key=value parser (HA)} + \message{2006/11/18 v2.5f key=value parser (HA)} \input xkvtxhdr \else - \ProvidesFile{xkeyval.tex}[2005/11/25 v2.5e key=value parser (HA)] + \ProvidesFile{xkeyval.tex}[2006/11/18 v2.5f key=value parser (HA)] \@addtofilelist{xkeyval.tex} \fi \long\def\@firstoftwo#1#2{#1} @@ -309,8 +309,9 @@ } \def\XKV@srstate#1#2{% \ifx\@empty#2\@empty\advance\XKV@depth\@ne\fi - \XKV@for@n{XKV@prefix,XKV@fams,XKV@na,ifXKV@st,ifXKV@pl,ifXKV@knf}% - \XKV@resa{\expandafter\let\csname\XKV@resa#1\expandafter + \XKV@for@n{XKV@prefix,XKV@fams,XKV@tkey,XKV@na,% + XKV@rm,ifXKV@st,ifXKV@pl,ifXKV@knf}\XKV@resa{% + \expandafter\let\csname\XKV@resa#1\expandafter \endcsname\csname\XKV@resa#2\endcsname }% \ifx\@empty#1\@empty\advance\XKV@depth\m@ne\fi @@ -666,6 +667,7 @@ \XKV@usepresetkeys{#1}{preseth}% \expandafter\XKV@s@tkeys\expandafter{\XKV@resb}{#1}% \XKV@usepresetkeys{#1}{presett}% + \let\CurrentOption\@empty } \def\XKV@usepresetkeys#1#2{% \XKV@presettrue diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty b/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty index 9f66ecccc60..ca06bc13af8 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/xkvltxp.sty @@ -7,7 +7,7 @@ %% xkeyval.dtx (with options: `xkvltxpatch') %% %% --------------------------------------- -%% Copyright (C) 2004-2005 Hendri Adriaens +%% Copyright (C) 2004-2006 Hendri Adriaens %% --------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex b/Master/texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex index f86969290f7..5beb03c3bd2 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex +++ b/Master/texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex @@ -7,7 +7,7 @@ %% xkeyval.dtx (with options: `xkvheader') %% %% --------------------------------------- -%% Copyright (C) 2004-2005 Hendri Adriaens +%% Copyright (C) 2004-2006 Hendri Adriaens %% --------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/tex/latex/xkeyval/xkvview.sty b/Master/texmf-dist/tex/latex/xkeyval/xkvview.sty index 112f2b7cfea..ec2d24e9a6b 100644 --- a/Master/texmf-dist/tex/latex/xkeyval/xkvview.sty +++ b/Master/texmf-dist/tex/latex/xkeyval/xkvview.sty @@ -7,7 +7,7 @@ %% xkeyval.dtx (with options: `xkvview') %% %% --------------------------------------- -%% Copyright (C) 2004-2005 Hendri Adriaens +%% Copyright (C) 2004-2006 Hendri Adriaens %% --------------------------------------- %% %% This work may be distributed and/or modified under the diff --git a/Master/texmf-dist/tpm/xkeyval.tpm b/Master/texmf-dist/tpm/xkeyval.tpm index d53102ab311..db338fd4706 100644 --- a/Master/texmf-dist/tpm/xkeyval.tpm +++ b/Master/texmf-dist/tpm/xkeyval.tpm @@ -3,7 +3,7 @@ xkeyval Package - 2006/10/04 08:43:01 + 2006/11/18 19:01:36 2.5c rahtz Extension of the keyval package. @@ -20,7 +20,7 @@ documents where several packages define their own sets of keys. Hendri Adriaens 692426 - + texmf-dist/tex/latex/xkeyval/keyval.tex texmf-dist/tex/latex/xkeyval/pst-xkey.sty texmf-dist/tex/latex/xkeyval/pst-xkey.tex @@ -31,11 +31,11 @@ texmf-dist/tex/latex/xkeyval/xkvtxhdr.tex texmf-dist/tex/latex/xkeyval/xkvview.sty texmf-dist/tpm/xkeyval.tpm - + texmf-dist/doc/latex/xkeyval/README texmf-dist/doc/latex/xkeyval/xkeyval.pdf - texmf-dist/source/latex/xkeyval/xkeyval.dtx + texmf-dist/source/latex/xkeyval/xkeyval.dtx Package/xkeyval -- cgit v1.2.3