summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex/tools/showkeys.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist/source/latex/tools/showkeys.dtx')
-rw-r--r--Master/texmf-dist/source/latex/tools/showkeys.dtx55
1 files changed, 30 insertions, 25 deletions
diff --git a/Master/texmf-dist/source/latex/tools/showkeys.dtx b/Master/texmf-dist/source/latex/tools/showkeys.dtx
index 4e55633b15d..8419ba1c98b 100644
--- a/Master/texmf-dist/source/latex/tools/showkeys.dtx
+++ b/Master/texmf-dist/source/latex/tools/showkeys.dtx
@@ -1,28 +1,28 @@
% \iffalse meta-comment
%
% Copyright 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005
-% 2006 2008 2009
+% 2006 2008 2009 2011
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
% of this license or (at your option) any later version.
% The latest version of this license is in
% http://www.latex-project.org/lppl.txt
-% and version 1.3c or later is part of all distributions of LaTeX
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
% \iffalse
%% File: showkeys.dtx Copyright (C) 1992-1997 David Carlisle
-%% File: showkeys.dtx Copyright (C) 2006-2007 David Carlisle, LaTeX3 Project
+%% File: showkeys.dtx Copyright (C) 2006-2014 David Carlisle, LaTeX3 Project
%
%<*dtx>
\ProvidesFile{showkeys.dtx}
@@ -32,7 +32,7 @@
%<driver> \ProvidesFile{showkeys.drv}
% \fi
% \ProvidesFile{showkeys.dtx}
- [2007/08/07 v3.15 Show cite and label keys (DPC, MH)]
+ [2014/04/24 v3.17 Show cite and label keys (DPC, MH)]
%
% \iffalse
%<*driver>
@@ -58,7 +58,7 @@
%
% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% \CheckSum{596}
+% \CheckSum{595}
%
%
% \changes{v1.01}{1992/08/25}{Initial version}
@@ -111,7 +111,7 @@
% \end{description}
% The colours may be changed by redefining the following two colours
% after the package is loaded.
-% |refkey| (also used for |\cite|) and
+% |refkey| (also used for |\cite|) and
% |labelkey| (also used for |\bibitem|).
% The defaults are:
%\begin{verbatim}
@@ -442,7 +442,7 @@
% skip. (This may slightly move the surrounding text (but perhaps not
% now that |\prevdepth| is restored.)
% \changes{v3.00}{1994/09/07}
-% {Back up over a previous skip because of the new
+% {Back up over a previous skip because of the new
% \cs{belowcaptionskip}}
% \changes{v3.04}{1995/10/30}
% {\cs{advance} added, to total two successive skips.}
@@ -517,8 +517,8 @@
\vadjust{\llap{\SK@lab\kern\marginparsep}}%
\fi
\SK@lab@relax
- \fi
- \fi
+ \fi
+ \fi
\fi}
% \end{macrocode}
% \end{macro}
@@ -732,7 +732,7 @@
\csname\@tempa\space\endcsname}%
\expandafter\def\expandafter#1\expandafter{%
\expandafter\protect\csname\@tempa\space\endcsname}%
- \expandafter\def\csname\@tempa\space\endcsname}
+ \expandafter\def\csname\@tempa\space\endcsname}
% \end{macrocode}
% \end{macro}
%
@@ -788,7 +788,7 @@
\leavevmode\unskip\SK@\SK@@ref{#3}\SK@@@vpageref{#1}[{#2}]{#3}}}%
\def\vr@f#1{%
\leavevmode\unskip\vref@space
- \ref{#1}%
+ \ref{#1}%
\let\label\SK@label\let\ref\SK@ref\let\pageref\SK@pageref
\vpageref[\unskip]{#1}}%
}{}}
@@ -800,7 +800,7 @@
% \end{macro}
% \end{macro}
%
-% Now redefine |\cite| unless \texttt{notcite} option given.
+% Now redefine |\cite| unless \texttt{notcite} option given.
% \begin{macrocode}
\ifx\SK@cite\@empty
% \end{macrocode}
@@ -832,13 +832,15 @@
% {Add \cs{citefullauthor}}
% \changes{v3.12}{1997/06/12}
% {Support cite package. tools/2490}
+% \changes{v3.17}{2014/04/24}
+% {rededine \cs{@citex} rather than \cs{cite} for tools/4162}
%
% If \textsf{cite} or \textsf{overcite} is being used, redefine |\citen|
% rather than |\cite| so as not to spoil the space and punctuation
% calculations done by those packages.
% \begin{macrocode}
\ifx\citen\@undefined
- \SK@def\cite#1#{\SK@citea{#1}}%
+ \SK@def\@citex[#1]#2{\SK@citex[{#1}]{#2}}%
\else
\SK@def\citen#1{\SK@\SK@@ref{#1}\SK@citen{#1}}%
\fi
@@ -865,9 +867,11 @@
\fi}
% \end{macrocode}
%
+% \changes{v3.17}{2014/04/24}
+% {Change name, rededine \cs{@citex} rather than \cs{cite} for tools/4162}
% \begin{macrocode}
-\def\SK@citea#1#2{%
- \SK@\SK@@ref{#2}\SK@cite#1{#2}}
+\def\SK@citex[#1]#2{%
+ \SK@\SK@@ref{#2}\SK@@citex[{#1}]{#2}}
% \end{macrocode}
%
% \begin{macrocode}
@@ -877,14 +881,15 @@
%
% \begin{macro}{\SK@@ref}
% This is much simpler than the printing of the label, as we know
-% that we can be in horizontal mode. We temporarily set the switch
-% \cs{if@inlabel} false in order to avoid problems with the pdf\TeX\
-% color driver.
-% \changes{v3.14}{2006/09/25}
+% that we can be in horizontal mode.
+% Note extra group for colour safety.
+% \changes{v3.14}{2006/09/25}
% {Add fix for pdf\TeX.}
+% \changes{v3.16}{2011/11/24}
+% {revert change made at v3.14 because of tools/4173}
% \begin{macrocode}
\def\SK@@ref#1>#2\SK@{%
- {\@inlabelfalse\leavevmode\vbox to\z@{%
+ \leavevmode\vbox to\z@{{%
\vss
\SK@refcolor
\rlap{\vrule\raise .75em%