showlabels 1.6.3 (24jul08)

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

1 files changed, 15 insertions, 10 deletions

diff --git a/Master/texmf-dist/tex/latex/showlabels/showlabels.sty b/Master/texmf-dist/tex/latex/showlabels/showlabels.sty
index b15e3ce8bbb..99c35d6ab24 100644
--- a/Master/texmf-dist/tex/latex/showlabels/showlabels.sty
+++ b/Master/texmf-dist/tex/latex/showlabels/showlabels.sty
@@ -8,7 +8,7 @@
 %% Showlabels: Style to display labels in the margin
 %% This is the showlabels package
 %%
-%% This software is copyright, 1999, 2001--2007, Norman Gray.
+%% This software is copyright, 1999, 2001--2008, Norman Gray.
 %%
 %% This program is free software; you can redistribute it and/or
 %% modify it under the terms of the GNU General Public License
@@ -30,12 +30,12 @@
 %% See the file LICENCE for a copy of the GPL.
 %% You can also find an online copy at http://www.gnu.org/copyleft/gpl.html .
 %%
-%% $Id: showlabels.dtx,v 1.32 2008/06/27 15:18:43 norman Exp $
+%% $Id: showlabels.dtx,v 1.34 2008/07/24 10:59:31 norman Exp $
 %%
 \def\filename{showlabels}
-\def\fileversion{1.6.2}
-\def\filedate{2008/06/27}
-\def\docdate{2008 June 27}
+\def\fileversion{1.6.3}
+\def\filedate{2008/07/24}
+\def\docdate{2008 July 24}
 \def\filemaintainer{norman@astro.gla.ac.uk}
 \NeedsTeXFormat{LaTeX2e}
 \ProvidesPackage{showlabels}[\filedate\space v\fileversion]
@@ -51,9 +51,14 @@
   \let\SL@maketag@@@=\maketag@@@
   \def\maketag@@@#1{%
     \SL@maketag@@@{#1}%
-    \ifx\SL@labelname\@empty
+    \ifx\df@label\@empty
+      \ifx\SL@labelname\relax
+        \SL@eqnlrtext{???}% it's not clear to me when this would happen
+      \else
+        \SL@eqnlrtext{\SL@labelname}%
+      \fi
     \else
-      \SL@eqnlrtext{\SL@labelname}%
+      \SL@eqnlrtext{\df@label}%
     \fi
   }
 \else
@@ -66,8 +71,8 @@
       \global\let\SL@labelname\relax
     \fi
   }
-  \global\let\SL@labelname\relax
 \fi
+\global\let\SL@labelname\relax
 \@ifundefined{ttfamily}
   {\providecommand{\showlabelfont}{\small\tt}}
   {\providecommand{\showlabelfont}{\small\ttfamily}}
@@ -84,8 +89,8 @@
   \AtBeginDocument{\csname SL@init#1\endcsname}%
   \expandafter\def\csname SL@#1\endcsname{\SL@showlabels{#1}}
 }
-\def\SL@showlabels#1{%
-  \def\@tempa{\csname SL@orig#1\endcsname}
+\DeclareRobustCommand\SL@showlabels[1]{%
+  \def\@tempa{\csname SL@orig#1\endcsname}%
   \@ifnextchar[\SL@showlabelsopt\SL@showlabelsplain
 }
 \def\SL@showlabelsopt[#1]#2{%