keyreader 0.4a (24dec11)

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

2 files changed, 16 insertions, 47 deletions

diff --git a/Master/texmf-dist/tex/latex/keyreader/keyreader-guide.cfg b/Master/texmf-dist/tex/latex/keyreader/keyreader-guide.cfg
deleted file mode 100644
index a43780b1f25..00000000000
--- a/Master/texmf-dist/tex/latex/keyreader/keyreader-guide.cfg
+++ /dev/null
@@ -1,38 +0,0 @@
-\ProvidesFile{keyreader-guide.cfg}%
-  [2011/12/20 v0.0.3 Configuration file for keyreader-guide (AM)]
-
-\amltxoptions{%
-  geometryoptions       = {left=3cm,right=3cm,top=2.5cm,%
-                          bottom=2.5cm,includeheadfoot},
-  reviewdocument        = false,
-  parindent             = false,
-  toc                   = false,
-  frontpagestyle        = empty,
-  pretitleskip          = 0ex,
-  posttitleskip         = 1ex,
-  presuptitleskip       = 15ex,
-  postsuptitleskip      = 0ex,
-  presubtitleskip       = 0ex,
-  postsubtitleskip      = 0ex,
-  natbiboptions         = {numbers,sort&compress},
-  cmdcolor              = xmagenta1,
-  stylecolor            = xgreen1,
-  speccolor             = teal,
-  sectionheadcolor      = blue
-}
-\fancypagenos[%
-  textalign         = center,
-  show-on-page-one  = false,
-  show-page-numbers = true,
-  show-headrule     = true,
-  show-footrule     = false,
-  y-position        = -.44\paperheight,
-  x-position        = 0,
-  scale             = 1,
-  angle             = 0,
-  style             = \textsc{Page~\thepage~of~\pageref{xwmlastpage}},
-  left-header       = The \textcolor{macrocolor}{keyreader} package,
-  right-header      = \ttcl{black}{\today}
-]
-
-\endinput
diff --git a/Master/texmf-dist/tex/latex/keyreader/keyreader.sty b/Master/texmf-dist/tex/latex/keyreader/keyreader.sty
index 3cefcf964ab..a64ec1e7908 100644
--- a/Master/texmf-dist/tex/latex/keyreader/keyreader.sty
+++ b/Master/texmf-dist/tex/latex/keyreader/keyreader.sty
@@ -1,6 +1,6 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
 %                                                                          %
-% This is file 'keyreader.sty', version 0.4, December 2011.                %
+% This is file 'keyreader.sty', version 0.4a, December 2011.               %
 %                                                                          %
 % This package and accompanying files may be distributed and/or            %
 % modified under the conditions of the LaTeX Project Public License,       %
@@ -21,7 +21,7 @@
 %++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++%
 
 \ProvidesPackage{keyreader}
-  [2011/12/20 v0.4 Robust xkeyval package interface (AM)]
+  [2011/12/23 v0.4a Robust xkeyval package interface (AM)]
 \ifcase
   \ifx\eTeXversion\@undefined\z@\else
     \ifnum\eTeXversion<\tw@\z@\else\@ne\fi\fi
@@ -197,6 +197,15 @@
 }
 \endgroup
 
+% Eg,
+% \newcount\nr\nr=\tw@
+% \def\do#1{%
+%   \let\noexpand#1%
+%   \expandafter\noexpand\csname\expandafter\@gobble\string#1@%
+%   \romannumeral\nr\endcsname
+% }
+% \edef\x{\krdfor{\cmda,\cmdb}}
+% \show\x -> \let\cmda\cmda@ii \let\cmdb\cmdb@ii
 \def\krdfor#1{\krd@for@a#1,\krd@nnil,\krd@nil}
 \def\krd@for@a#1,#2\krd@nil{%
   \krdifblank{#1}{%
@@ -417,17 +426,17 @@
   }%
   \ifnum\XKV@depth=\z@\let\XKV@rm\@empty\fi
   \expandafter\XKV@usepresetkeys\expandafter{\krd@na}{preseth}%
-  \krdexpandsecond\XKV@s@tkeys
+  \krdexpandsecond\krd@s@tkeys
     {{\krdexpandonce\XKV@resb}{\krdexpandonce\krd@na}}%
   \expandafter\XKV@usepresetkeys\expandafter{\krd@na}{presett}%
   \let\CurrentOption\@empty
 }
-\protected\def\XKV@s@tkeys#1#2{%
+\protected\def\krd@s@tkeys#1#2{%
   \edef\key@list{\unexpanded{#1}}%
   \krdkvnormalize\key@list
   \edef\XKV@na{\unexpanded{#2}}%
   \krdifx\XKV@na\@empty{}{\krdcsvnormalize\XKV@na}%
-  \def\XKV@s@tkeys@a##1={%
+  \def\krd@s@tkeys@a##1={%
     \def\reserved@a####1=####2\@nil{%
       \edef\reserved@a{\expandafter\krdtrimspace\expandafter{\@gobble####1}}%
       \krdifx\reserved@a\@empty{%
@@ -446,7 +455,7 @@
     \reserved@a.%
   }%
   \XKV@for@o\key@list\CurrentOption{%
-    \expandafter\XKV@s@tkeys@a\CurrentOption==\@nil
+    \expandafter\krd@s@tkeys@a\CurrentOption==\@nil
   }%
 }
 \protected\def\krdsetrmkeys{\XKV@testopta{\XKV@testoptc\krd@setrmkeys}}
@@ -559,8 +568,7 @@
         \krdifx\key@default\krd@rej{}{%
           [\expandafter\krdifbraced\expandafter{\key@default}%
             {{{\krdexpandonce\key@default}}}{\krdexpandonce\key@default}]%
-        }%
-        {%
+        }{%
           \ifnum\key@typenr=\thr@@
             \krdifx\krd@resb\krd@rej{}{\unexpanded{##5}}%
             \krd@executealt{########1}{\krdexpandonce\krd@altlistb}%
@@ -573,7 +581,6 @@
     }%
   }%
   \edef\key@list{\unexpanded{#4}}%
-  \krdcsvnormalize[/]\key@list
   \krdlistloop*[;]\key@list\ifx\end\@undefined\fi{}{}{%
     \krd@splita##1/^?^/^?^/^?^/^?^/\krd@nil
   }%