From ecf2a21b95439458a9c895b746654a81b5bcbd20 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 17 Jun 2007 21:36:16 +0000 Subject: showlabels update (17jun07) git-svn-id: svn://tug.org/texlive/trunk@4452 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/showlabels/showlabels.drv | 12 +- .../source/latex/showlabels/showlabels.dtx | 131 ++++++++++----------- 2 files changed, 69 insertions(+), 74 deletions(-) (limited to 'Master/texmf-dist/source/latex/showlabels') diff --git a/Master/texmf-dist/source/latex/showlabels/showlabels.drv b/Master/texmf-dist/source/latex/showlabels/showlabels.drv index 77c8ef995b8..83d038bf9de 100644 --- a/Master/texmf-dist/source/latex/showlabels/showlabels.drv +++ b/Master/texmf-dist/source/latex/showlabels/showlabels.drv @@ -8,7 +8,7 @@ %% Showlabels: Style to display labels in the margin %% This is the showlabels package %% -%% This software is copyright, 1999, 2001--2006, Norman Gray. +%% 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 @@ -30,14 +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.28 2006/05/26 16:29:11 norman Exp $ +%% $Id: showlabels.dtx,v 1.31 2007/06/17 15:34:32 norman Exp $ %% -\def\ParseRCSDate$#1: #2 #3 ${\def\SL@Date{#2}} -\ParseRCSDate$Date: 2006/05/26 16:29:11 $ \def\filename{showlabels} -\def\fileversion{1.6} -\def\filedate{\SL@Date} -\def\docdate{\SL@Date} +\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 diff --git a/Master/texmf-dist/source/latex/showlabels/showlabels.dtx b/Master/texmf-dist/source/latex/showlabels/showlabels.dtx index 7ac0207b94d..1eafcf3fcf7 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--2006, Norman Gray. +%% 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 @@ -24,15 +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.28 2006/05/26 16:29:11 norman Exp $ +%% $Id: showlabels.dtx,v 1.31 2007/06/17 15:34:32 norman Exp $ %% % -\def\ParseRCSDate$#1: #2 #3 ${\def\SL@Date{#2}} -\ParseRCSDate$Date: 2006/05/26 16:29:11 $ \def\filename{showlabels} -\def\fileversion{1.6} -\def\filedate{\SL@Date} -\def\docdate{\SL@Date} +\def\fileversion{1.6.1} +\def\filedate{2007/06/17} +\def\docdate{2007 June 17} \def\filemaintainer{norman@astro.gla.ac.uk} % \changes{v1.4}{2001/07/23}{Avoided defining RCSDate} %<+package>\NeedsTeXFormat{LaTeX2e} @@ -86,12 +84,12 @@ % putting the name of new labels into the margin whenever the % |\label| command is used. % -% The package allows you to do the same thing for other commands (see below). +% You can do the same thing for other commands (see below). % The only one for which this is \emph{obviously} useful is the % |\cite| command, but it is also reasonable to do it with, for example, % the |\ref| or |\begin| commands. % -% You invoke this package with the command |\usepackage{showlabels}| in +% Invoke this package with the command |\usepackage{showlabels}| in % the preamble, and you may give the following options: % \begin{quotation} % \begin{tabular}{lp{25em}} @@ -175,16 +173,14 @@ % % In version 1.1, the package was modified to conform to the slightly % different mechanism that \texttt{amsmath} uses to produce equation -% numbers. I don't habitually use \texttt{amsmath}, so I won't discover any -% bugs or weaknesses with its support here, and I'd consequently be -% glad to be informed of any that appear. Do note that the +% numbers. Do note that the % |\usepackage{showlabels}| command \emph{must} appear after the % |\usepackage{amsmath}| if it is to detect that you are using the -% \pstyle{amsmath} package. Note also that, since these additions -% appeared, AMS-\LaTeX\ and the \texttt{amstex} package seem to have -% been declared `obsolete' in favour of the \texttt{amsmath} package. -% This package now claims conformance with the \texttt{amsmath} -% package alone, though it will probably work with older versions in fact. +% \pstyle{amsmath} package\footnote{Note that AMS-\LaTeX\ and the +% \texttt{amstex} package have been declared `obsolete' in favour of +% the \texttt{amsmath} package. This package now claims conformance +% with the \texttt{amsmath} package alone, though it will probably +% work with older versions in fact.}. % % In version 1.3e, the program became compatible with the % \pstyle{hyperref} package in particular, and in general with other @@ -226,11 +222,17 @@ % The package might still work with \LaTeX2.09, but that's neither % supported, nor even still tested. % -% This software is copyright, 1999, 2001--2003, Norman Gray. It is released under +% This software is copyright, 1999, 2001--2007, Norman Gray. +% It is released under % the terms of the GNU General Public Licence. See the copyright % declaration at the top of file \texttt{showlabels.dtx}, and the file % \texttt{LICENCE} for the licence conditions. You can find an -% online copy of the GPL at \url{http://www.gnu.org/copyleft/gpl.html}. +% online copy of the GPL at +% \url{http://www.gnu.org/copyleft/gpl.html}. +% +% The canonical home page of the package is +% \url{http://purl.org/nxg/dist/showlabels}, and it is on CTAN at +% \url{/macros/latex/contrib/supported/showlabels/}. % % \subsection*{Other packages} % @@ -240,41 +242,25 @@ % % \subsection*{History and Credits} % -% Please do let me know if I've omitted anyone from these lists of -% Helpful People. -% -% I received comments and bug reports on version 1.4 from: -% \begin{quotation} -% \begin{tabular}{rl} -% Andreas Balser & \url{balser@mathematik.tu-darmstadt.de}\\ -% Roland Winkler & \url{roland.winkler@physik.uni-erlangen.de}\\ -% Ignacy Sawicki & \url{sawickii@poczta.onet.pl} -% \end{tabular} -% \end{quotation} -% -% I received comments and bug reports on version 1.3 from: -% \begin{quotation} -% \begin{tabular}{rl} -% Andrei Shelankov & \url{Andrei.Shelankov@tp.umu.se}\\ -% Elmar Walhorn & \url{e.walhorn@tu-bs.de}\\ -% \end{tabular} -% \end{quotation} -% -% Prior to version 1.3, I received comments and bug reports from: -% \begin{quotation} -% \begin{tabular}{rl} -% David R. Leal Valmana & \url{david@quijote.uc3m.es}\\ -% Sungmo Park & \url{smp@dingo.etri.re.kr}\\ -% Olivier Michel & \url{Olivier.Michel@lri.fr}\\ -% Jiri Vesely & \url{jvesely@karlin.mff.cuni.cz}\\ -% Patrick Sibille & \url{sibille@amoco.saclay.cea.fr}\\ -% Hagen Kleinert & \url{kleinert@physik.fu-berlin.de}\\ -% Francis M. C. Ching & \url{fmcching@kingcong.uwaterloo.ca}\\ -% Michael Friendly & \url{friendly@hotspur.psych.yorku.ca}\\ -% lester l. helms & \url{l-helms@math.uiuc.edu}\\ -% \end{tabular} -% \end{quotation} -% Many thanks to all. +% I've received bug reports, fixes, or implementable suggestions from many +% people, including +% Andreas Balser, +% Francis M. C. Ching, +% Michael Friendly, +% Tino G\"ortem\"oller, +% Lester L. Helms, +% Hagen Kleinert, +% Olivier Michel, +% Sungmo Park, +% Ignacy Sawicki, +% Andrei Shelankov, +% Patrick Sibille, +% David R. Leal Valmana, +% Ji\v ri Vesely, +% Elmar Walhorn, +% Roland Winkler. +% Many thanks to all. If I've missed your name out of this list, +% please accept my apologies, and do let me know. % % Back in 29-Jan-92, Darrel Hankerson % \url{hank@ducvax.auburn.edu}, made the update to NFSS, and @@ -338,33 +324,44 @@ % pre-defined with the current label name. % \begin{macrocode} \let\SL@maketag@@@=\maketag@@@ - \def\maketag@@@#1{\SL@maketag@@@{#1}% - \ifx\df@label\@empty + \def\maketag@@@#1{% + \SL@maketag@@@{#1}% + \ifx\df@label\@empty % \SL@eqnlrtext{???}% - \else - \SL@eqnlrtext{\df@label}% - \fi} + \else + \SL@eqnlrtext{\df@label}% + \fi + } \else % \end{macrocode} % The `normal' case, without \pstyle{amsmath}. % \changes{v1.3c}{1999/07/22}{Added expandafter before test -- % how on earth had this escaped before?!?} % \changes{v1.3d}{1999/07/23}{Removed ??? when no label exists} +% \changes{v1.6.1}{2007/06/17}{Fix test again.} +% The test here must be |\ifx\SL@labelname\relax| with +% |\global\let\SL@labelname\relax|, not |\expandafter\ifx\SL@...| and +% |\global\def\SL@labelname{\relax}| (as it once was), since the +% latter evaluates to true when |\SL@...| is |\relax| \emph{and} when +% |\SL@...| starts with two identical characters, which is wrong (it +% took embarrassingly many goes to get this right). % \begin{macrocode} \let\SL@eqnnum=\@eqnnum - \def\@eqnnum{\SL@eqnnum - \expandafter\ifx\SL@labelname\relax + \def\@eqnnum{% + \SL@eqnnum + \ifx\SL@labelname\relax % \SL@eqnlrtext{???}% - \else - \SL@eqnlrtext{\SL@labelname}% - \global\def\SL@labelname{\relax}% - \fi} + \else + \SL@eqnlrtext{\SL@labelname}% + \global\let\SL@labelname\relax + \fi + } % \end{macrocode} % \end{macro} -% And initialise the value of |\labeln@me| to |\relax|, so that +% And initialise the value of |\SL@labelname| to |\relax|, so that % |\@eqnnum| starts off behaving the right way. % \begin{macrocode} - \global\def\SL@labelname{\relax} + \global\let\SL@labelname\relax \fi % \end{macrocode} % -- cgit v1.2.3