diff options
| -rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/README | 6 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/VERSION | 2 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/showlabels.html | 30 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/showlabels.pdf | bin | 76667 -> 89577 bytes | |||
| -rw-r--r-- | Master/texmf-dist/source/latex/showlabels/showlabels.drv | 12 | ||||
| -rw-r--r-- | Master/texmf-dist/source/latex/showlabels/showlabels.dtx | 131 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/showlabels/showlabels.sty | 40 | ||||
| -rw-r--r-- | Master/texmf-dist/tpm/showlabels.tpm | 8 |
8 files changed, 116 insertions, 113 deletions
diff --git a/Master/texmf-dist/doc/latex/showlabels/README b/Master/texmf-dist/doc/latex/showlabels/README index 9136c277fc2..d07ac8cca4f 100644 --- a/Master/texmf-dist/doc/latex/showlabels/README +++ b/Master/texmf-dist/doc/latex/showlabels/README @@ -1,8 +1,8 @@ -Showlabels: put the names of \labels into the margins of a draft document -------------------------------------------------------------------------- +Showlabels: put the names of \labels and other commands into margins +-------------------------------------------------------------------- -Version 1.6 +Version 1.6.1 This package helps you keep track of all the labels you define, by putting the name of new labels into the margin whenever the diff --git a/Master/texmf-dist/doc/latex/showlabels/VERSION b/Master/texmf-dist/doc/latex/showlabels/VERSION index 569f03d6890..f261b5cdb4f 100644 --- a/Master/texmf-dist/doc/latex/showlabels/VERSION +++ b/Master/texmf-dist/doc/latex/showlabels/VERSION @@ -1 +1 @@ -showlabels-1.6 +showlabels-1.6.1 diff --git a/Master/texmf-dist/doc/latex/showlabels/showlabels.html b/Master/texmf-dist/doc/latex/showlabels/showlabels.html index 5b3b7886604..0a6a6d66fec 100644 --- a/Master/texmf-dist/doc/latex/showlabels/showlabels.html +++ b/Master/texmf-dist/doc/latex/showlabels/showlabels.html @@ -1,8 +1,6 @@ <?xml version="1.0"?> -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "dtd/xhtml1-strict.dtd"> -<html> +<html xmlns="http://www.w3.org/1999/xhtml"> <head> <title>Showlabels</title> <link href="http://nxg.me.uk" rev="author"/> @@ -13,9 +11,11 @@ <body> <h1>Showlabels</h1> <div class="abstract"> -<p>Put the names of <code>\label</code>s into the margins of a -draft document.</p> -<p>Version 1.6, 2006 May 26.</p> +<p>Put the names of <code>\label</code>s and other commands into +the margins of a draft document.</p> +<p>Version 1.6.1, 2007 June 17, + <a href='http://purl.org/nxg/dist/showlabels' + ><code>http://purl.org/nxg/dist/showlabels</code></a>.</p> </div> <p>This class option introduces no new commands, it just helps you @@ -35,6 +35,10 @@ label will be placed in the nearer margin.</p> <dl> +<dt>1.6.1, 2007 June 17</dt> +<dd>Fix an errant test, which mangled equation labels starting +with two identical letters.</dd> + <dt>1.6, 2006 May 26</dt> <dd>The <code>\showlabels</code> command will now work with commands (such as <code>\cite</code> or <code>\includegraphics</code>) which @@ -112,9 +116,9 @@ for a discussion of this.</p> <ol> <li>Download the file -<a href="showlabels-1.6.tar.gz" >showlabels-1.6.tar.gz</a> +<a href="showlabels-1.6.1.tar.gz" >showlabels-1.6.1.tar.gz</a> or -<a href="showlabels-1.6.zip" >showlabels-1.6.zip</a> +<a href="showlabels-1.6.1.zip" >showlabels-1.6.1.zip</a> and unpack it.</li> <li>Run LaTeX on the file <code>showlabels.ins</code> -- this will @@ -129,10 +133,14 @@ documentation.</li> <a href='http://www.tex.ac.uk/tex-archive/macros/latex/contrib/supported/showlabels/' >/tex-archive/macros/latex/contrib/supported/showlabels/</a></p> +<p>On the web +<a href="http://purl.org/nxg/dist/showlabels" + ><code>http://purl.org/nxg/dist/showlabels</code></a></p> + <div class="signature"> <a href="http://www.astro.gla.ac.uk/users/norman/" >Norman Gray</a><br/> -2006 May 26 +2007 June 17 </div> </body> @@ -142,7 +150,5 @@ documentation.</li> <!-- Local Variables: --> -<!-- mode: xml --> -<!-- sgml-indent-step: 0 --> -<!-- sgml-indent-data: nil --> +<!-- mode: nxml --> <!-- End: --> diff --git a/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf b/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf Binary files differindex 74e4a8f56de..8f1416ffb23 100644 --- a/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf +++ b/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf 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} % diff --git a/Master/texmf-dist/tex/latex/showlabels/showlabels.sty b/Master/texmf-dist/tex/latex/showlabels/showlabels.sty index 85319695262..e0a95811749 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--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} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{showlabels}[\filedate\space v\fileversion] @@ -51,20 +49,24 @@ \fi \ifSL@AMS \let\SL@maketag@@@=\maketag@@@ - \def\maketag@@@#1{\SL@maketag@@@{#1}% - \ifx\df@label\@empty - \else - \SL@eqnlrtext{\df@label}% - \fi} + \def\maketag@@@#1{% + \SL@maketag@@@{#1}% + \ifx\df@label\@empty + \else + \SL@eqnlrtext{\df@label}% + \fi + } \else \let\SL@eqnnum=\@eqnnum - \def\@eqnnum{\SL@eqnnum - \expandafter\ifx\SL@labelname\relax - \else - \SL@eqnlrtext{\SL@labelname}% - \global\def\SL@labelname{\relax}% - \fi} - \global\def\SL@labelname{\relax} + \def\@eqnnum{% + \SL@eqnnum + \ifx\SL@labelname\relax + \else + \SL@eqnlrtext{\SL@labelname}% + \global\let\SL@labelname\relax + \fi + } + \global\let\SL@labelname\relax \fi \@ifundefined{ttfamily} {\providecommand{\showlabelfont}{\small\tt}} diff --git a/Master/texmf-dist/tpm/showlabels.tpm b/Master/texmf-dist/tpm/showlabels.tpm index dea135101c0..9d1959d4fe0 100644 --- a/Master/texmf-dist/tpm/showlabels.tpm +++ b/Master/texmf-dist/tpm/showlabels.tpm @@ -3,7 +3,7 @@ <rdf:Description about="http://texlive.dante.de/texlive/Package/showlabels.zip"> <TPM:Name>showlabels</TPM:Name> <TPM:Type>Package</TPM:Type> - <TPM:Date>2006/05/27 00:52:47</TPM:Date> + <TPM:Date>2007/06/17 21:36:10</TPM:Date> <TPM:Version>1.4a</TPM:Version> <TPM:Creator>rahtz</TPM:Creator> <TPM:Title>Show label commands in the margin.</TPM:Title> @@ -21,18 +21,18 @@ command, but it's easy to do it for others, such as the \ref or <TPM:Size>151752</TPM:Size> <TPM:License></TPM:License> <TPM:Build/> - <TPM:RunFiles size="9812"> + <TPM:RunFiles size="9749"> texmf-dist/tex/latex/showlabels/showlabels.sty texmf-dist/tpm/showlabels.tpm </TPM:RunFiles> - <TPM:DocFiles size="104331"> + <TPM:DocFiles size="117494"> texmf-dist/doc/latex/showlabels/LICENCE texmf-dist/doc/latex/showlabels/README texmf-dist/doc/latex/showlabels/VERSION texmf-dist/doc/latex/showlabels/showlabels.html texmf-dist/doc/latex/showlabels/showlabels.pdf </TPM:DocFiles> - <TPM:SourceFiles size="37609"> + <TPM:SourceFiles size="37026"> texmf-dist/source/latex/showlabels/showlabels.drv texmf-dist/source/latex/showlabels/showlabels.dtx texmf-dist/source/latex/showlabels/showlabels.ins |