showlabels update (30jun08)

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

2 files changed, 13 insertions, 77 deletions

diff --git a/Master/texmf-dist/source/latex/showlabels/showlabels.drv b/Master/texmf-dist/source/latex/showlabels/showlabels.drv
deleted file mode 100644
index 83d038bf9de..00000000000
--- a/Master/texmf-dist/source/latex/showlabels/showlabels.drv
+++ /dev/null
@@ -1,64 +0,0 @@
-%%
-%% This is file `showlabels.drv',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% showlabels.dtx  (with options: `driver')
-%% Showlabels: Style to display labels in the margin
-%% This is the showlabels package
-%%
-%% This software is copyright, 1999, 2001--2007, Norman Gray.
-%%
-%% This program is free software; you can redistribute it and/or
-%% modify it under the terms of the GNU General Public License
-%% as published by the Free Software Foundation; either version 2
-%% of the License, or (at your option) any later version.
-%%
-%% This program is distributed in the hope that it will be useful,
-%% but WITHOUT ANY WARRANTY; without even the implied warranty of
-%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-%% GNU General Public License for more details.
-%%
-%% You should have received a copy of the GNU General Public License
-%% along with this program; if not, write to the Free Software
-%% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-%%
-%% Author: Norman Gray, norman@astro.gla.ac.uk.
-%% Department of Physics and Astronomy, University of Glasgow, UK
-%%
-%% 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.31 2007/06/17 15:34:32 norman Exp $
-%%
-\def\filename{showlabels}
-\def\fileversion{1.6.1}
-\def\filedate{2007/06/17}
-\def\docdate{2007 June 17}
-\def\filemaintainer{norman@astro.gla.ac.uk}
-\documentclass{ltxdoc}
-\EnableCrossrefs
-\newcommand\Lopt[1]{\textsf{#1}} % package options
-\newcommand\file[1]{\texttt{#1}} % filename
-\newcommand\pstyle[1]{\textsf{\{#1\}}} % packages
-%% \url macro (url.sty does this better, but we don't want extra dependencies)
-\def\setpathdots{\discretionary{.}{}{.}}
-\def\setpathslash{\discretionary{/}{}{/}}
-{\catcode`\.=\active
- \catcode`\/=\active
-  \gdef\pathcats{%
-    \catcode`\%=12      \catcode`\~=12
-    \catcode`\.=\active  \let.\setpathdots
-    \catcode`\/=\active \let/\setpathslash
-    \catcode`\#=12      \catcode`\_=12}%
-    }
-\def\setpath#1{\ttfamily <\nobreak #1\nobreak>\endgroup}
-\def\url{\begingroup\pathcats\setpath}
-\begin{document}
-\DocInput{showlabels.dtx}
-\PrintIndex
-\end{document}
-\endinput
-%%
-%% End of file `showlabels.drv'.
diff --git a/Master/texmf-dist/source/latex/showlabels/showlabels.dtx b/Master/texmf-dist/source/latex/showlabels/showlabels.dtx
index 1eafcf3fcf7..a094b911b61 100644
--- a/Master/texmf-dist/source/latex/showlabels/showlabels.dtx
+++ b/Master/texmf-dist/source/latex/showlabels/showlabels.dtx
@@ -24,13 +24,13 @@
 %% 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.31 2007/06/17 15:34:32 norman Exp $
+%% $Id: showlabels.dtx,v 1.32 2008/06/27 15:18:43 norman Exp $
 %%
 %
 \def\filename{showlabels}
-\def\fileversion{1.6.1}
-\def\filedate{2007/06/17}
-\def\docdate{2007 June 17}
+\def\fileversion{1.6.2}
+\def\filedate{2008/06/27}
+\def\docdate{2008 June 27}
 \def\filemaintainer{norman@astro.gla.ac.uk}
 % \changes{v1.4}{2001/07/23}{Avoided defining RCSDate}
 %<+package>\NeedsTeXFormat{LaTeX2e}
@@ -326,10 +326,10 @@
   \let\SL@maketag@@@=\maketag@@@
   \def\maketag@@@#1{%
     \SL@maketag@@@{#1}%
-    \ifx\df@label\@empty
-%    \SL@eqnlrtext{???}%
+    \ifx\SL@labelname\@empty
+%      \SL@eqnlrtext{???}% it's not clear to me when this would happen
     \else
-      \SL@eqnlrtext{\df@label}%
+      \SL@eqnlrtext{\SL@labelname}%
     \fi
   }
 \else
@@ -521,14 +521,14 @@
 \def\SL@margtext#1{%
 %    \end{macrocode}
 % In maths mode, produce a label name alongside the equation number.
-% If we're not using \pstyle{amsmath}, then save the label name in
-% |\SL@labelname|.  If we \emph{are} using \pstyle{amsmath}, then we don't
-% have to worry, because it's saved in |\df@label| for us.
+% Save the label name in |\SL@labelname|, so we can use it later
+% (this is redundant in most \pstyle{amsmath} contexts, because that
+% style generally saves this in |\df@label|, but sometimes -- for
+% example when using eqnarray within \pstyle{amsart} -- it seems not
+% to be; in any case, it's simpler just to use |\SL@labelname| all the time).
 %    \begin{macrocode}
   \ifmmode
-    \ifSL@AMS\else
-      \xdef\SL@labelname{\SL@prlabelname{#1}}%
-    \fi
+    \xdef\SL@labelname{\SL@prlabelname{#1}}%
 %    \end{macrocode}
 % Otherwise, create a box with zero height and depth, and the same width 
 % as the page.  Put all this in braces, to contain the setting of