showlabels update (29may09)

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

3 files changed, 12 insertions, 79 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 ae2e961c032..00000000000
--- a/Master/texmf-dist/source/latex/showlabels/showlabels.drv
+++ /dev/null
@@ -1,65 +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--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
-%% 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.36 2008/10/10 21:32:01 norman Exp $
-%%
-\def\filename{showlabels}
-\def\fileversion{1.6.4}
-\def\filedate{2008/10/10}
-\def\docdate{2008 October 10}
-\def\filemaintainer{norman@astro.gla.ac.uk}
-\documentclass{ltxdoc}
-\EnableCrossrefs
-\newcommand\Lopt[1]{\textsf{#1}} % package options
-\newcommand\file[1]{\texttt{#1}} % filename
-\newcommand\Lenv[1]{\textsl{\{#1\}}}
-\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 b4591fd24dd..e137804064b 100644
--- a/Master/texmf-dist/source/latex/showlabels/showlabels.dtx
+++ b/Master/texmf-dist/source/latex/showlabels/showlabels.dtx
@@ -2,7 +2,7 @@
 %
 %% This is the showlabels package
 %%
-%% This software is copyright, 1999, 2001--2008, Norman Gray. 
+%% This software is copyright, 1999, 2001--2009, Norman Gray. 
 %% 
 %% This program is free software; you can redistribute it and/or
 %% modify it under the terms of the GNU General Public License
@@ -24,13 +24,11 @@
 %% 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.36 2008/10/10 21:32:01 norman Exp $
-%%
 %
 \def\filename{showlabels}
-\def\fileversion{1.6.4}
-\def\filedate{2008/10/10}
-\def\docdate{2008 October 10}
+\def\fileversion{1.6.5}
+\def\filedate{2009/05/29}
+\def\docdate{2009 May 29}
 \def\filemaintainer{norman@astro.gla.ac.uk}
 % \changes{v1.4}{2001/07/23}{Avoided defining RCSDate}
 %<+package>\NeedsTeXFormat{LaTeX2e}
@@ -122,7 +120,7 @@
 % |\small\ttfamily|.  For example, to have labels in a slanted font, you
 % could include the definition
 % \begin{quote}
-% |\renewcommand{\showlabelfont}{\small\slfamily}|
+% |\renewcommand{\showlabelfont}{\small\slshape}|
 % \end{quote}
 % in the preamble of your document.
 % If you want still more control over the labels, you can
@@ -245,6 +243,7 @@
 % I've received bug reports, fixes, or implementable suggestions from many
 % people, including
 %   Andreas Balser,
+%   Francesco Biccari,
 %   Francis M. C. Ching,
 %   Sven de Vries,
 %   Michael Friendly,
@@ -265,13 +264,12 @@
 % (or indeed if I've alphabetised you incorrectly),
 % please accept my apologies, and do let me know.
 %
-% Back in 29-Jan-92, Darrel Hankerson
+% The package was originally released by me on 1991 September 21, under the name
+% \texttt{labels.sty}.
+% On 1992 January 29, Darrel Hankerson
 % \url{hank@ducvax.auburn.edu}, made the update to NFSS, and
 % changed the name to `showlabel.sty'.
 %
-% The package was originally released by me on 21-Sep-91, under the name
-% \texttt{labels.sty}.
-%
 %
 % \StopEventually{}
 %
@@ -343,7 +341,7 @@
   \let\SL@maketag@@@=\maketag@@@
   \def\maketag@@@#1{%
     \SL@maketag@@@{#1}%
-    \message{maketag@@@: df@label=\df@label, SL@labelname=\SL@labelname, env=\@currenvir}%
+    %\message{maketag@@@: df@label=\df@label, SL@labelname=\SL@labelname, env=\@currenvir}%
     \ifx\df@label\@empty
       \ifx\SL@labelname\relax
         % do nothing
@@ -606,7 +604,7 @@
     \xdef\SL@labelname{\SL@prlabelname{#1}}%
   \fi
 \else
-  \SL@interlinetextright{#1}%
+  \SL@interlinetextright{\SL@prlabelname{#1}}%
 \fi
 }
 %    \end{macrocode}
diff --git a/Master/texmf-dist/source/latex/showlabels/showlabels.ins b/Master/texmf-dist/source/latex/showlabels/showlabels.ins
index fde5edb09ff..739ad5571f7 100644
--- a/Master/texmf-dist/source/latex/showlabels/showlabels.ins
+++ b/Master/texmf-dist/source/latex/showlabels/showlabels.ins
@@ -11,4 +11,4 @@
 
 \endbatchfile
 
-%% $Id: showlabels.ins,v 1.2 2001/04/19 15:18:00 norman Exp $
+%% $Id$