tools (latex core) update via latex-tds (25sep09)

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

1 files changed, 15 insertions, 12 deletions

diff --git a/Master/texmf-dist/tex/latex/tools/showkeys.sty b/Master/texmf-dist/tex/latex/tools/showkeys.sty
index 04a6723e820..bed1206b5af 100644
--- a/Master/texmf-dist/tex/latex/tools/showkeys.sty
+++ b/Master/texmf-dist/tex/latex/tools/showkeys.sty
@@ -8,7 +8,8 @@
 %% 
 %% This is a generated file.
 %% 
-%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006
+%% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
+%% 2006 2008 2009
 %% The LaTeX3 Project and any individual authors listed elsewhere
 %% in this file.
 %% 
@@ -31,10 +32,10 @@
 %% given in the file `manifest.txt'.
 %% 
 %% File: showkeys.dtx Copyright (C) 1992-1997 David Carlisle
-%% File: showkeys.dtx Copyright (C) 2006 David Carlisle, LaTeX3 Project
+%% File: showkeys.dtx Copyright (C) 2006-2007 David Carlisle, LaTeX3 Project
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{showkeys}
-          [2006/01/09 v3.13 Show cite and label keys (DPC)]
+          [2007/08/07 v3.15 Show cite and label keys (DPC, MH)]
 \DeclareOption{notref}{\let\SK@ref\@empty}
 \DeclareOption{notcite}{\let\SK@cite\@empty}
 \let\SK@refcolor\relax
@@ -45,7 +46,9 @@
   \definecolor{labelkey}{gray}{.75}%
   \def\SK@refcolor{\color{refkey}}%
   \def\SK@labelcolor{\color{labelkey}}}}
-\DeclareOption{final}{\endinput}
+\DeclareOption{final}{%
+  \providecommand*\showkeyslabelformat[1]{}%
+  \endinput}
 \DeclareOption{draft}{}
 \ProcessOptions
 \let\SK@label\label
@@ -61,7 +64,7 @@
 \def\@bibitem#1{%
   \SK@bibitem{#1}\SK@\SK@@label{#1}\ignorespaces}
 \def\@lbibitem[#1]#2{%
-  \SK@lbibitem[#1]{#2}\SK@\SK@@label{#2}\ignorespaces}
+  \SK@lbibitem[{#1}]{#2}\SK@\SK@@label{#2}\ignorespaces}
 \def\SK@#1#2{%
   \protected@edef\@tempa{#2}%
   \expandafter#1\meaning\@tempa\SK@}
@@ -85,7 +88,7 @@
         \ifvoid\z@
           \llap{\SK@lab\SK@lab@relax\kern\marginparsep}%
         \else
-          \hbox{\box\z@\kern\marginparsep\SK@labx}%
+          \hbox{\box\z@\rlap{\kern\marginparsep\SK@labx}}%
         \fi
         \vskip\skip@
       \else
@@ -201,7 +204,7 @@
   \@ifpackageloaded{varioref}{%
     \SK@def\@@vpageref#1[#2]#3{{%
       \let\label\SK@label
-      \SK@@@vpageref#1[#2]{#3}}}%
+      \SK@@@vpageref{#1}[{#2}]{#3}}}%
     \def\vr@f#1{%
       \leavevmode\unskip\vref@space
       \ref{#1}%
@@ -215,7 +218,7 @@
   \@ifpackageloaded{varioref}{%
     \SK@def\@@vpageref#1[#2]#3{{%
       \let\label\SK@label\let\ref\SK@ref\let\pageref\SK@pageref
-      \leavevmode\unskip\SK@\SK@@ref{#3}\SK@@@vpageref#1[#2]{#3}}}%
+      \leavevmode\unskip\SK@\SK@@ref{#3}\SK@@@vpageref{#1}[{#2}]{#3}}}%
     \def\vr@f#1{%
       \leavevmode\unskip\vref@space
       \ref{#1}%
@@ -229,7 +232,7 @@
       \expandafter\let\expandafter
          \SK@HAR@bi\csname\string\harvarditem\endcsname
       \expandafter\def\csname\string\harvarditem\endcsname[#1]#2#3#4{%
-        \SK@HAR@bi[#1]{#2}{#3}{#4}\SK@\SK@@label{#4}}%
+        \SK@HAR@bi[{#1}]{#2}{#3}{#4}\SK@\SK@@label{#4}}%
   \fi}
 \else
 \AtBeginDocument{%
@@ -249,17 +252,17 @@
       \expandafter\let\expandafter
          \SK@HAR@bi\csname\string\harvarditem\endcsname
       \expandafter\def\csname\string\harvarditem\endcsname[#1]#2#3#4{%
-        \SK@HAR@bi[#1]{#2}{#3}{#4}\SK@\SK@@label{#4}}%
+        \SK@HAR@bi[{#1}]{#2}{#3}{#4}\SK@\SK@@label{#4}}%
   \fi}
 \def\SK@citea#1#2{%
   \SK@\SK@@ref{#2}\SK@cite#1{#2}}
 \fi
 \def\SK@@ref#1>#2\SK@{%
-  \leavevmode\vbox to\z@{%
+  {\@inlabelfalse\leavevmode\vbox to\z@{%
     \vss
     \SK@refcolor
     \rlap{\vrule\raise .75em%
-       \hbox{\underbar{\normalfont\footnotesize\ttfamily#2}}}}}
+       \hbox{\underbar{\normalfont\footnotesize\ttfamily#2}}}}}}
 \endinput
 %%
 %% End of file `showkeys.sty'.