From 225a184bfc1b671c261ff245653d8de3636baa14 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 30 May 2009 22:57:28 +0000 Subject: showlabels update (29may09) git-svn-id: svn://tug.org/texlive/trunk@13536 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/showlabels/README | 18 ++++-- Master/texmf-dist/doc/latex/showlabels/VERSION | 2 +- .../doc/latex/showlabels/showlabels.html | 30 +++++++--- .../texmf-dist/doc/latex/showlabels/showlabels.pdf | Bin 87669 -> 87166 bytes .../source/latex/showlabels/showlabels.drv | 65 --------------------- .../source/latex/showlabels/showlabels.dtx | 24 ++++---- .../source/latex/showlabels/showlabels.ins | 2 +- .../texmf-dist/tex/latex/showlabels/showlabels.sty | 14 ++--- 8 files changed, 54 insertions(+), 101 deletions(-) delete mode 100644 Master/texmf-dist/source/latex/showlabels/showlabels.drv diff --git a/Master/texmf-dist/doc/latex/showlabels/README b/Master/texmf-dist/doc/latex/showlabels/README index 764533b88c9..f87c9a38f39 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.4, 2008 October 10, http://purl.org/nxg/dist/showlabels. + Version 1.6.5, 2009 May 29, http://purl.org/nxg/dist/showlabels. This class option helps you keep track of all the labels in your documents, by putting the name of the new label into the margin @@ -26,6 +26,10 @@ In this case, the options [inner] and [outer] will be ignored, and the label will be placed in the nearer margin. + The source code for the package is maintained at bitbucket.org, which + also includes an issue tracker, where you can report bugs (or just mail + me). + Compatibility and problems For reasonably obvious reasons, this package will not work at all well @@ -38,8 +42,8 @@ Download and installation - 1. Download the file showlabels-1.6.4.tar.gz or - showlabels-1.6.4.zip and unpack it. + 1. Download the file showlabels-1.6.5.tar.gz or + showlabels-1.6.5.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. @@ -49,8 +53,14 @@ On the web http://purl.org/nxg/dist/showlabels + The sources are in a Mercurial repository at bitbucket.org. + History + 1.6.5, 2009 May 27 + Fixed a bug in the way that labels including underscores (and + other 'exotic' characters) were displayed. + 1.6.4, 2008 October 10 Fixed another poor interaction between eqnarray and amsart. Now we get equation labels in eqnarray, and we don't get marginal @@ -141,4 +151,4 @@ in fact. Norman Gray - 2008 October 10 + 2009 May 29 diff --git a/Master/texmf-dist/doc/latex/showlabels/VERSION b/Master/texmf-dist/doc/latex/showlabels/VERSION index 99e60399ca0..b905166fc32 100644 --- a/Master/texmf-dist/doc/latex/showlabels/VERSION +++ b/Master/texmf-dist/doc/latex/showlabels/VERSION @@ -1 +1 @@ -showlabels-1.6.4 +showlabels-1.6.5 diff --git a/Master/texmf-dist/doc/latex/showlabels/showlabels.html b/Master/texmf-dist/doc/latex/showlabels/showlabels.html index 03bcfe29a4b..b88428b05b3 100644 --- a/Master/texmf-dist/doc/latex/showlabels/showlabels.html +++ b/Master/texmf-dist/doc/latex/showlabels/showlabels.html @@ -13,7 +13,7 @@

Put the names of \labels and other commands into the margins of a draft document.

-

Version 1.6.4, 2008 October 10, +

Version 1.6.5, 2009 May 29, http://purl.org/nxg/dist/showlabels.

@@ -42,6 +42,11 @@ the \cite command, but it can be useful for [inner] and [outer] will be ignored, and the label will be placed in the nearer margin.

+

The source code for the package is maintained at +bitbucket.org, +which also includes an issue tracker, where you can report bugs (or +just mail me).

+

Compatibility and problems

For reasonably obvious reasons, this package will not work at @@ -56,9 +61,9 @@ for a discussion of this.

  1. Download the file -showlabels-1.6.4.tar.gz +showlabels-1.6.5.tar.gz or -showlabels-1.6.4.zip +showlabels-1.6.5.zip and unpack it.
  2. Run LaTeX on the file showlabels.ins -- this will @@ -77,9 +82,16 @@ documentation.
  3. http://purl.org/nxg/dist/showlabels

    +

    The sources are in a Mercurial repository at +bitbucket.org.

    +

    History

    +
    1.6.5, 2009 May 27
    +
    Fixed a bug in the way that labels including underscores (and +other 'exotic' characters) were displayed.
    +
    1.6.4, 2008 October 10
    Fixed another poor interaction between eqnarray and amsart. Now we get equation labels in eqnarray, and we don't get marginal notes @@ -98,7 +110,7 @@ equation labels disappeared in that case. Fixed.
    Fix an errant test, which mangled equation labels starting with two identical letters.
    -
    1.6, 2006 May 26
    +
    1.6, 2006 May 26
    The \showlabels command will now work with commands (such as \cite or \includegraphics) which take an optional argument.
    @@ -111,7 +123,7 @@ incompatibility with LaTeX 2.09, but (a) I imagine the package is incompatible with that for other reasons, and (b) it's really not worth the hassle...). -
    1.5, 2004 October 8
    +
    1.5, 2004 October 8
    Added \showlabelfont and \showlabelsetlabel commands, allowing customisation of the printed labels. Added and documented @@ -124,7 +136,7 @@ nothing; the latter is the default behaviour). [right] options, and fixed a bug which affected \label commands in captions.
    -
    1.4, 2001 July 24
    +
    1.4, 2001 July 24
    Became (more) compatible with the wrapfig package. Also, I added the \showlabels command, to have the package display @@ -143,7 +155,7 @@ other packages which do this. Notwithstanding Sebastian Rahtz's excellent general advice on this, showlabels should indeed be loaded after hyperref.
    -
    1.3
    +
    1.3

    After a long delay, here is an updated version of my showlabels package. It corrects all the reported bugs which I could reproduce, namely:

    @@ -167,7 +179,7 @@ package.
    -
    1.1, 2001?
    +
    1.1, 2001?
    Modified to conform to the slightly different mechanism that amsmath uses to produce equation numbers. I don't habitually use amsmath, so I won't @@ -188,7 +200,7 @@ older versions in fact.
    Norman Gray
    -2008 October 10 +2009 May 29
    diff --git a/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf b/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf index fbdeb2b259e..60c3838bb2a 100644 Binary files a/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf and b/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf differ 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$ diff --git a/Master/texmf-dist/tex/latex/showlabels/showlabels.sty b/Master/texmf-dist/tex/latex/showlabels/showlabels.sty index a483be4df6c..9edf8e9b878 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--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 @@ -30,12 +30,10 @@ %% 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} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{showlabels}[\filedate\space v\fileversion] @@ -51,7 +49,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 @@ -135,7 +133,7 @@ \xdef\SL@labelname{\SL@prlabelname{#1}}% \fi \else - \SL@interlinetextright{#1}% + \SL@interlinetextright{\SL@prlabelname{#1}}% \fi } \def\SL@interlinetextleft{\SL@setlefttrue\SL@interlinetext} -- cgit v1.2.3