From 16559ce13a74c7a182875559b379cac00b07efda Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Thu, 9 Jun 2022 03:01:00 +0000
Subject: CTAN sync 202206090300

---
 macros/latex/required/tools/showkeys.dtx | 52 +++++++++++++++++---------------
 1 file changed, 28 insertions(+), 24 deletions(-)

(limited to 'macros/latex/required/tools/showkeys.dtx')

diff --git a/macros/latex/required/tools/showkeys.dtx b/macros/latex/required/tools/showkeys.dtx
index 3c9236f2ef..3aed90d304 100644
--- a/macros/latex/required/tools/showkeys.dtx
+++ b/macros/latex/required/tools/showkeys.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 1993-2021
+% Copyright (C) 1993-2022
 %
 % The LaTeX Project and any individual authors listed elsewhere
 % in this file.
@@ -28,11 +28,18 @@
           \ProvidesFile{showkeys.dtx}
 %</dtx>
 %<package>\NeedsTeXFormat{LaTeX2e}
+%<package>
+%<package>\providecommand\DeclareRelease[3]{}
+%<package>\providecommand\DeclareCurrentRelease[2]{}
+%<package>
+%<package>\DeclareRelease{}{2014-10-28}{showkeys-2014-10-28.sty}
+%<package>\DeclareCurrentRelease{}{2022-06-01}
+%<package>
 %<package>\ProvidesPackage{showkeys}
 %<driver> \ProvidesFile{showkeys.drv}
 % \fi
 %         \ProvidesFile{showkeys.dtx}
-          [2014/10/28 v3.17 Show cite and label keys (DPC, MH)]
+          [2022/04/12 v3.18 Show cite and label keys (DPC, MH)]
 %
 % \iffalse
 %<*driver>
@@ -70,7 +77,8 @@
 %         {Support harvard, varioref and natbib packages,}
 % \changes{v3.02}{1995/03/17}
 %         {Support new AMS files}
-%
+% \changes{v3.18}{2022/04/12}
+%         {Support starred references}
 % \section{Introduction}\label{sec:intro}
 %
 % |showkeys.sty| modifies the |\label|, |\ref|, |\pageref|, |\cite|, and
@@ -248,7 +256,7 @@
 %
 % \end{thebibliography}
 %
-% \StopEventually{}
+% \MaybeStop{}
 %
 % \section{The Macros}
 %
@@ -749,18 +757,10 @@
 % \changes{v3.13}{2006/01/09}{Updated varioref support, for latex/3373}
 % \changes{v3.15}{2006/06/19}
 %         {Prevent loss of brackets}
+% \changes{v3.18}{2022/04/12}
+%         {update varioref support: it no longer uses label, so no patch
+%         needed if notref is used.}
 %    \begin{macrocode}
-\AtBeginDocument{%
-  \@ifpackageloaded{varioref}{%
-    \SK@def\@@vpageref#1[#2]#3{{%
-      \let\label\SK@label
-      \SK@@@vpageref{#1}[{#2}]{#3}}}%
-    \def\vr@f#1{%
-      \leavevmode\unskip\vref@space
-      \ref{#1}%
-      {\let\label\SK@label
-      \vpageref[\unskip]{#1}}}%
-  }{}}
 \else
 %    \end{macrocode}
 %
@@ -775,22 +775,26 @@
 %      {Make redefinition conditional on notref option}
 % \changes{v3.15}{2006/06/19}
 %         {Prevent loss of brackets}
+% \changes{v3.18}{2022/04/12}
+%         {support new kernel commands with starred versions}
+% \changes{v3.18}{2022/04/12}
+%         {update varioref support: it no longer uses label}
 %    \begin{macrocode}
 \AtBeginDocument{%
-  \SK@def\ref#1{\SK@\SK@@ref{#1}\SK@ref{#1}}%
-  \SK@def\pageref#1{\SK@\SK@@ref{#1}\SK@pageref{#1}}%
+  \let\@kernel@ref@\@kernel@ref
+  \let\@kernel@sref@\@kernel@sref
+  \SK@def\@kernel@ref#1{\SK@\SK@@ref{#1}\SK@@kernel@ref{#1}}%
+  \SK@def\@kernel@sref#1{\SK@\SK@@ref{#1}\SK@@kernel@sref{#1}}%
+  \SK@def\@kernel@pageref#1{\SK@\SK@@ref{#1}\SK@@kernel@pageref{#1}}%
+  \SK@def\@kernel@spageref#1{\SK@\SK@@ref{#1}\SK@@kernel@spageref{#1}}%
+  \SK@def\@kernel@Ref#1{{\let\@kernel@ref\@kernel@ref@\SK@\SK@@ref{#1}\SK@@kernel@Ref{#1}}}%
+  \SK@def\@kernel@sRef#1{\let\@kernel@sref\@kernel@sref@\SK@\SK@@ref{#1}\SK@@kernel@sRef{#1}}%
 %    \end{macrocode}
 % varioref support.
 %    \begin{macrocode}
   \@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}}}%
-    \def\vr@f#1{%
-      \leavevmode\unskip\vref@space
-      \ref{#1}%
-      \let\label\SK@label\let\ref\SK@ref\let\pageref\SK@pageref
-      \vpageref[\unskip]{#1}}%
+      \leavevmode\unskip\SK@\SK@@ref{#3}\SK@@@vpageref{#1}[{#2}]{#3}}}%%
   }{}}
 %    \end{macrocode}
 %
-- 
cgit v1.2.3

