skeyval (12feb13)

git-svn-id: svn://tug.org/texlive/trunk@29092 c570f23f-e606-0410-a88d-b1316a301751

1 files changed, 40 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/skeyval/skeyval-testpkg.sty b/Master/texmf-dist/doc/latex/skeyval/skeyval-testpkg.sty
index 30de37acd89..d2467bc9f1d 100644
--- a/Master/texmf-dist/doc/latex/skeyval/skeyval-testpkg.sty
+++ b/Master/texmf-dist/doc/latex/skeyval/skeyval-testpkg.sty
@@ -1,5 +1,5 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
-% This is file 'skeyval-testpkg.sty', version 1.1a, 2012/10/16.            %
+% This is file 'skeyval-testpkg.sty', version 1.2, 2013/02/10.             %
 %                                                                          %
 % This package and accompanying files may be distributed and/or            %
 % modified under the conditions of the LaTeX Project Public License,       %
@@ -23,11 +23,10 @@
 %  skeyval-pstkey.sty, skeyval-pstkey.tex, skeyval-testclass.cls,          %
 %  and skeyval-testpkg.sty.                                                %
 %                                                                          %
-% Copyright (c) 2010-2012 Ahmed Musa (amusa22@gmail.com).                  %
+% Copyright (c) 2010-2013 Ahmed Musa (amusa22@gmail.com).                  %
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
 
-\ProvidesPackage{skeyval-testpkg}
-  [2012/10/16 v1.1a skeyval test package 1 (AM)]
+\ProvidesPackage{skeyval-testpkg}[2013/02/10 v1.2 skeyval test package (AM)]
 \NeedsTeXFormat{LaTeX2e}
 \@ifpackageloaded{skeyval}{}{\RequirePackage{skeyval}}
 \RequirePackage{graphicx}
@@ -41,7 +40,7 @@
 % Declare options with default values that will be used when the options
 % are called without user values.
 %
-\skvDeclarePassedOptionsLoadPackage[SKVT]{testpkg}{%
+\skvdeclarepassedoptionsloadpackage[SKVT]{testpkg}{%
   hyperref={colorlinks,breaklinks},xcolor=svgnames
 }
 
@@ -72,8 +71,10 @@
 \def\alignvalb{\alignval}
 \def\stextstyle{\sffamily}
 
-\skvsetkeys[SKVT]{abrtext}{align=.expand twice{\alignvalb},
-  text style=.expand once{\stextstyle},author,show author}
+\skvsetkeys[SKVT]{abrtext}{
+  align=.expand twice{\alignvalb},
+  text style=.expand once{\stextstyle},author,show author
+}
 
 %%+++++++++++++++++++++++++++ Citations +++++++++++++++++++++++++++%%
 
@@ -266,13 +267,12 @@
     .k handler={2}{\def\x##1{##1*#1*#2}},
     .l handler={3}{\def\x##1{##1*#1*#2*#3}}
   },
+  .reserve handlers={reservedx , reservedy},
   .holder prefix = mp@,
   .prefix = KV,
-  .add prefixes = {KVA,KVD},
   .families = {fam1, fam2},
   .add family = {fam3},
   .add families = {fama,famb,famc},
-  .ignore prefixes = {KVA,KVD},
   .ignore families = {fama,famb,famc},
   .restore families = {fama,famb},
   .restore paths = {KVA/fama,KVD/famc},
@@ -330,21 +330,21 @@
     .set keys = {keya=vala},
   },
   .exec code = \def\keycval{true},
-  % Prepend style keye to key1 and key2:
-  .prepend style={key1/{keye=.expanded{\keycval}},key2/{keye=false}},
-  % Multi-prepend styles:
-  .prepend style={{key3,key4}/{keye=true,keyf=true},key5/{keye=false}},
-  % Prepend style keyd to key6:
-  .prepend style={key6/{keyd=right}},
-  % Append styles keye and keyf to key7 and key8.
-  % '.styles' and '.style' are equivalent to '.append styles'
-  % and '.append style'.
-  .append style={key7/{keye=true},key8/{keyf=false}},
+  % Prepend slot keye to key1 and key2:
+  .prepend slot={key1/{keye=.expanded{\keycval}},key2/{keye=false}},
+  % Multi-prepend slots:
+  .prepend slot={{key3,key4}/{keye=true,keyf=true},key5/{keye=false}},
+  % Prepend slot keyd to key6:
+  .prepend slot={key6/{keyd=right}},
+  % Append slots keye and keyf to key7 and key8.
+  % '.slots' and '.slot' are equivalent to '.append slots'
+  % and '.append slot'.
+  .append slot={key7/{keye=true},key8/{keyf=false}},
   % The next two link keyb and keyc to key9. #1 here refers to the
   % current value of key9. The same effect can be achieved directly
   % via the '.link' handler:
-  .prepend style={key9/{keyb=#1}},
-  .append style={key9/{keyc=#1}},
+  .prepend slot={key9/{keyb=#1}},
+  .append slot={key9/{keyc=#1}},
   .set keys = {key9=val9},
   % Link keye and keyf to key10 and key11. The values of key10 and
   % key11 are used to set keye and keyf. key10 and key11 are hence
@@ -432,4 +432,23 @@
 \skvprocessoptions*+[SKVT]<abrtext,shadowbox,citation,testpkg>\relax
 %\skvrestrictedprocessoptions*+[SKVT]<abrtext,shadowbox,citation,testpkg>\relax
 
+\skvcomment
+Here you could also use:
+
+\directkeys{
+  .mega process options*={
+    .prefix=SKVT,
+    .families={abrtext,shadowbox,citation,testpkg},
+  }
+}
+
+or
+
+\directkeys{
+  .prefix=SKVT,
+  .families={abrtext,shadowbox,citation,testpkg},
+  .copy class options and process options in all families,
+}
+\endcomment
+
 \endinput