summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Master/texmf-dist/doc/latex/showlabels/README15
-rw-r--r--Master/texmf-dist/doc/latex/showlabels/VERSION2
-rw-r--r--Master/texmf-dist/doc/latex/showlabels/showlabels.html17
-rw-r--r--Master/texmf-dist/doc/latex/showlabels/showlabels.pdfbin87162 -> 87529 bytes
-rw-r--r--Master/texmf-dist/source/latex/showlabels/showlabels.dtx50
-rw-r--r--Master/texmf-dist/tex/latex/showlabels/showlabels.sty25
6 files changed, 68 insertions, 41 deletions
diff --git a/Master/texmf-dist/doc/latex/showlabels/README b/Master/texmf-dist/doc/latex/showlabels/README
index 56b23c7ca52..ccf99ddcdae 100644
--- a/Master/texmf-dist/doc/latex/showlabels/README
+++ b/Master/texmf-dist/doc/latex/showlabels/README
@@ -3,7 +3,7 @@
Put the names of \labels and other commands into the margins of a draft
document.
- Version 1.6.2, 2008 June 27, http://purl.org/nxg/dist/showlabels.
+ Version 1.6.3, 2008 July 24, http://purl.org/nxg/dist/showlabels.
This class option introduces no new commands, it just helps you keep
track of all the labels by putting the name of the new label into the
@@ -18,6 +18,11 @@
In this case, the options [inner] and [outer] will be ignored, and the
label will be placed in the nearer margin.
+ 1.6.3, 2008 July 24
+ Release 1.6.2 broke compatibility with the rest of amsmath
+ (eqnarray became the only thing that worked within amsmath)!
+ Fixed. Doh!
+
1.6.2, 2008 June 27
The reimplementation of eqnarray within amsart was such that
equation labels disappeared in that case. Fixed.
@@ -108,16 +113,16 @@
Download and installation
- 1. Download the file showlabels-1.6.2.tar.gz or
- showlabels-1.6.2.zip and unpack it.
+ 1. Download the file showlabels-1.6.3.tar.gz or
+ showlabels-1.6.3.zip and unpack it.
2. Run LaTeX on the file showlabels.ins -- this will unpack the style
file showlabels.sty amongst other files. Place this somewhere where
TeX can find it.
3. Run LaTeX on the file showlabels.dtx to obtain the documentation.
- On CTAN: /tex-archive/macros/latex/contrib/supported/showlabels/
+ On CTAN: /tex-archive/macros/latex/contrib/showlabels/
On the web http://purl.org/nxg/dist/showlabels
Norman Gray
- 2008 June 27
+ 2008 July 24
diff --git a/Master/texmf-dist/doc/latex/showlabels/VERSION b/Master/texmf-dist/doc/latex/showlabels/VERSION
index 98000fa1fe9..f74342b9e03 100644
--- a/Master/texmf-dist/doc/latex/showlabels/VERSION
+++ b/Master/texmf-dist/doc/latex/showlabels/VERSION
@@ -1 +1 @@
-showlabels-1.6.2
+showlabels-1.6.3
diff --git a/Master/texmf-dist/doc/latex/showlabels/showlabels.html b/Master/texmf-dist/doc/latex/showlabels/showlabels.html
index a03abeab166..33b0198d962 100644
--- a/Master/texmf-dist/doc/latex/showlabels/showlabels.html
+++ b/Master/texmf-dist/doc/latex/showlabels/showlabels.html
@@ -13,7 +13,7 @@
<div class="abstract">
<p>Put the names of <code>\label</code>s and other commands into
the margins of a draft document.</p>
-<p>Version 1.6.2, 2008 June 27,
+<p>Version 1.6.3, 2008 July 24,
<a href='http://purl.org/nxg/dist/showlabels'
><code>http://purl.org/nxg/dist/showlabels</code></a>.</p>
</div>
@@ -35,6 +35,11 @@ label will be placed in the nearer margin.</p>
<dl>
+<dt>1.6.3, 2008 July 24</dt>
+<dd>Release 1.6.2 broke compatibility with the <em>rest</em> of
+amsmath (<code>eqnarray</code> became the only thing that worked
+within amsmath)! Fixed. Doh!</dd>
+
<dt>1.6.2, 2008 June 27</dt>
<dd>The reimplementation of eqnarray within amsart was such that
equation labels disappeared in that case. Fixed.</dd>
@@ -144,9 +149,9 @@ for a discussion of this.</p>
<ol>
<li>Download the file
-<a href="showlabels-1.6.2.tar.gz" >showlabels-1.6.2.tar.gz</a>
+<a href="showlabels-1.6.3.tar.gz" >showlabels-1.6.3.tar.gz</a>
or
-<a href="showlabels-1.6.2.zip" >showlabels-1.6.2.zip</a>
+<a href="showlabels-1.6.3.zip" >showlabels-1.6.3.zip</a>
and unpack it.</li>
<li>Run LaTeX on the file <code>showlabels.ins</code> -- this will
@@ -158,8 +163,8 @@ documentation.</li>
</ol>
<p>On CTAN:
-<a href='http://www.tex.ac.uk/tex-archive/macros/latex/contrib/supported/showlabels/'
- >/tex-archive/macros/latex/contrib/supported/showlabels/</a></p>
+<a href='http://www.tex.ac.uk/tex-archive/macros/latex/contrib/showlabels/'
+ >/tex-archive/macros/latex/contrib/showlabels/</a></p>
<p>On the web
<a href="http://purl.org/nxg/dist/showlabels"
@@ -168,7 +173,7 @@ documentation.</li>
<div class="signature">
<a href="http://www.astro.gla.ac.uk/users/norman/"
>Norman Gray</a><br/>
-2008 June 27
+2008 July 24
</div>
</body>
diff --git a/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf b/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf
index f73695afbcf..aac05201c57 100644
--- a/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf
+++ b/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/showlabels/showlabels.dtx b/Master/texmf-dist/source/latex/showlabels/showlabels.dtx
index a094b911b61..c6f2c2dfe3d 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--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
@@ -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.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}
% \changes{v1.4}{2001/07/23}{Avoided defining RCSDate}
%<+package>\NeedsTeXFormat{LaTeX2e}
@@ -47,6 +47,7 @@
\newcommand\Lopt[1]{\textsf{#1}} % package options
\newcommand\file[1]{\texttt{#1}} % filename
%\newcommand\Lcount[1]{\textsl{\small#1}}
+\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{.}{}{.}}
@@ -222,7 +223,7 @@
% The package might still work with \LaTeX2.09, but that's neither
% supported, nor even still tested.
%
-% This software is copyright, 1999, 2001--2007, Norman Gray.
+% This software is copyright, 1999, 2001--2008, 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
@@ -236,9 +237,8 @@
%
% \subsection*{Other packages}
%
-% I know of, but have not yet played with, the package \pstyle{showkeys},
-% by David Carlisle. As far as I know, both packages do roughly the
-% same thing.
+% David Carlisle's \pstyle{showkeys} does roughly the same thing, but
+% it will only handle |\label| and |\cite| keys.
%
% \subsection*{History and Credits}
%
@@ -321,15 +321,23 @@
% \pstyle{amsmath} uses |\maketag@@@|, to form tags in equations.
% All we have to do is
% hook into the |\maketag@@@| macro, and use |\df@label|, which is
-% pre-defined with the current label name.
+% pre-defined with the current label name. If the |\df@label| is
+% empty (almost certainly because the user has used the
+% \Lenv{eqnarray} environment within \pstyle{amsmath}), then fall back
+% on the |\SL@labelname| contents instead.
+% \iffalse See tests t2 and t11\fi
% \begin{macrocode}
\let\SL@maketag@@@=\maketag@@@
\def\maketag@@@#1{%
\SL@maketag@@@{#1}%
- \ifx\SL@labelname\@empty
-% \SL@eqnlrtext{???}% it's not clear to me when this would happen
+ \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
@@ -356,13 +364,13 @@
\global\let\SL@labelname\relax
\fi
}
+\fi
% \end{macrocode}
% \end{macro}
% And initialise the value of |\SL@labelname| to |\relax|, so that
% |\@eqnnum| starts off behaving the right way.
% \begin{macrocode}
- \global\let\SL@labelname\relax
-\fi
+\global\let\SL@labelname\relax
% \end{macrocode}
%
% Labels are printed with the font specified by |\showlabelfont|, which
@@ -472,9 +480,13 @@
% itself invisible, too. Command sequence |\SL@setlabel| is what does
% the work -- this is |\let| equal to either |\SL@margtext| or
% |\SL@inlinetext| below.
+%
+% We must declare |\SL@showlabels| to be a robust command, or else we
+% get confusing expansion problems when, for example, we do
+% |\showlabels{ref}| and use |\ref| in a caption (see test case t3).
% \begin{macrocode}
-\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{%
@@ -524,8 +536,8 @@
% 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).
+% example when using the traditional \Lenv{eqnarray} environment
+% within \pstyle{amsart} -- |\df@label| can end up unset).
% \begin{macrocode}
\ifmmode
\xdef\SL@labelname{\SL@prlabelname{#1}}%
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{%