From b774596c0632c5e6b3bb370b24d8e0331ec9baff Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 19 Apr 2010 22:51:43 +0000 Subject: keycommand update (19apr10) git-svn-id: svn://tug.org/texlive/trunk@17929 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/keycommand/keycommand.sty | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'Master/texmf-dist/tex/latex/keycommand') diff --git a/Master/texmf-dist/tex/latex/keycommand/keycommand.sty b/Master/texmf-dist/tex/latex/keycommand/keycommand.sty index 8683f1fd7c2..9f79ac612aa 100644 --- a/Master/texmf-dist/tex/latex/keycommand/keycommand.sty +++ b/Master/texmf-dist/tex/latex/keycommand/keycommand.sty @@ -8,7 +8,7 @@ %% %% This is a generated file. %% -%% keycommand : key-value interface for commands and environments in LaTeX [v3.1 2010/04/15] +%% keycommand : key-value interface for commands and environments in LaTeX [v3.14 2010/04/18] %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public License, either @@ -27,7 +27,7 @@ \NeedsTeXFormat{LaTeX2e}% LaTeX 2.09 can't be used (nor non-LaTeX) [2005/12/01]% LaTeX must be 2005/12/01 or younger (see kvsetkeys.dtx). \ProvidesPackage{keycommand} - [2010/04/15 v3.1 - key-value interface for commands and environments in LaTeX] + [2010/04/18 v3.14 - key-value interface for commands and environments in LaTeX] \def\kcmd@pkg@name{keycommand} \RequirePackage{etex,kvsetkeys,xkeyval,etoolbox,etextools} \def\kcmd@Xsetkeys{\XKV@testopta{\XKV@testoptc\XKV@setkeys}}% in case \setkeys was overwritten @@ -145,7 +145,7 @@ \protected\long\def\kcmd@def#1#2[#3][#4][#5]#6#7{% \@ifdefinable#1{\kcmd@defcommand#1[{#3}][{#4}][{#5}]{#6}{#2}{#7}}} \protected\long\def\kcmd@defcommand#1[#2][#3][#4]#5#6#7{% - \edef\kcmd@fam{\kcmd@keyfam{#1}}\let\commandkey\relax + \edef\kcmd@fam{\kcmd@keyfam{#1}}\let\commandkey\relax\let\getcommandkey\relax \edef\kcmd@defcommand{\endgroup \kcmd@undefinekeys{\kcmd@gbl}{\kcmd@fam}% undefines all keys for this keycommand family \kcmd@mount@unexpandchar{\kcmd@fam}{\expandonce\kcmd@unexpandchar}% @@ -154,7 +154,8 @@ \csdef{\kcmd@fam.getcommandkey}####1{% \unexpanded{\unexpanded\expandafter\expandafter\expandafter}{% \noexpand\csname\kcmd@fam @####1\endcsname}}% - \let\commandkey\noexpandcs{\kcmd@fam.\kcmd@plus get\fi commandkey}% + % \let\commandkey\noexpandcs{\kcmd@fam.\kcmd@plus get\fi commandkey}% + % \let\getcommandkey\noexpandcs{\kcmd@fam.getcommandkey}% \kcmd@plus% \newkeycommand+ \csdef{\kcmd@fam}{\kcmd@yargedef{\kcmd@gbl}{\kcmd@long}{\noexpandcs\kcmd@fam} {\number#4}{#6}{\csname\kcmd@fam.unexpandchar\endcsname}}% @@ -172,6 +173,8 @@ \kcmd@gbl\protected\edef#1{% entry point \let\noexpand\noexpand\commandkey\noexpand\noexpand\noexpandcs{% \kcmd@fam.\kcmd@plus get\fi commandkey}% + \let\noexpand\noexpand\getcommandkey\noexpand\noexpand\noexpandcs{% + \kcmd@fam.getcommandkey}% \noexpand\csvloop[\noexpand\kcmd@resetdefault{\kcmd@fam}]{\noexpandcs{\kcmd@fam.keylist}}% \noexpand\noexpand\noexpand\@testopt{% \kcmd@setkeys\noexpand\noexpand#1{\kcmd@fam}{\kcmd@otherkeys{#3}}}{}}% -- cgit v1.2.3