diff options
author | Reinhard Kotucha <reinhard.kotucha@web.de> | 2006-11-25 04:07:06 +0000 |
---|---|---|
committer | Reinhard Kotucha <reinhard.kotucha@web.de> | 2006-11-25 04:07:06 +0000 |
commit | 850706cd4d23138d5bf7c7cc2050bde2cccb55bc (patch) | |
tree | f5807292da86094e86a299ec3cf4da1a60a44851 /Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex | |
parent | 451833e2188d33c208f5d81394af9ca3799b3789 (diff) |
update xkeyval.
git-svn-id: svn://tug.org/texlive/trunk@2520 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/xkeyval/xkeyval.tex | 12 |
1 files changed, 7 insertions, 5 deletions
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 |