summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx')
-rw-r--r--Master/texmf-dist/source/latex/xkeyval/xkeyval.dtx22
1 files changed, 13 insertions, 9 deletions
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}