diff options
author | Karl Berry <karl@freefriends.org> | 2016-06-09 22:09:12 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2016-06-09 22:09:12 +0000 |
commit | c2dd4a1f282809d86d6dce3fca10225d9da37a3f (patch) | |
tree | c3d953104c5ab416c27dd6d195e15e70ebc073ef /Master/texmf-dist | |
parent | 9bbb661832e0d0f03721cd45084b8c0b6e1abf15 (diff) |
showlabels (9jun16)
git-svn-id: svn://tug.org/texlive/trunk@41322 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/README | 10 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/VERSION | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/showlabels.html | 347 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/showlabels.pdf | bin | 156501 -> 156657 bytes | |||
-rw-r--r-- | Master/texmf-dist/source/latex/showlabels/showlabels.drv | 20 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/showlabels/showlabels.dtx | 77 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/showlabels/showlabels.sty | 38 |
7 files changed, 406 insertions, 88 deletions
diff --git a/Master/texmf-dist/doc/latex/showlabels/README b/Master/texmf-dist/doc/latex/showlabels/README index 5043b5ecde0..73daacd6bbb 100644 --- a/Master/texmf-dist/doc/latex/showlabels/README +++ b/Master/texmf-dist/doc/latex/showlabels/README @@ -4,7 +4,7 @@ Showlabels Put the names of `\labels` and other commands into the margins of a draft document. -Version 1.7, 2015 December 8, http://purl.org/nxg/dist/showlabels. +Version 1.8, 2016 June 9, 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 @@ -25,8 +25,12 @@ it can be useful for `\ref` or `\begin` as well. The source code for the package is maintained at [bitbucket.org](https://bitbucket.org/nxg/showlabels). This site -includes an issue tracker, where you can report bugs (or just mail -me). +includes an issue tracker, where you can report bugs (or just mail me). + +This work is Copyright 1999, 2001-09, 2013-16, Norman Gray, and may be +distributed and/or modified under the conditions of the LaTeX Project +Public Licence, either version 1.3 of this licence or (at your option) +any later version. See the distributed file lppl.txt for details. For more information, see showlabels.html in the distribution. diff --git a/Master/texmf-dist/doc/latex/showlabels/VERSION b/Master/texmf-dist/doc/latex/showlabels/VERSION index 4d9033d7ddc..6259340971b 100644 --- a/Master/texmf-dist/doc/latex/showlabels/VERSION +++ b/Master/texmf-dist/doc/latex/showlabels/VERSION @@ -1 +1 @@ -showlabels-1.7 +1.8 diff --git a/Master/texmf-dist/doc/latex/showlabels/showlabels.html b/Master/texmf-dist/doc/latex/showlabels/showlabels.html index 896a35fd7d3..f809112b5a7 100644 --- a/Master/texmf-dist/doc/latex/showlabels/showlabels.html +++ b/Master/texmf-dist/doc/latex/showlabels/showlabels.html @@ -4,8 +4,269 @@ <head> <title>Showlabels</title> <link href="http://nxg.me.uk" rev="author"/> -<link type="text/css" rel="stylesheet" - href="style.css"/> +<!-- content of style file, to make this document standalone... --> +<style type='text/css'> +body { + color: #333; + background: white; + margin-left: +30%; + width: 50%; /* body is 50% of screen width */ + padding: 0.5em; /* this will make a difference if I decide to + have the background a different colour */ + /* I can't decide on font: Optima's always nice, but Gill looks + agreeably intense. Helvetica's a decent fallback. */ + font-family: "Helvetica Neue", Helvetica, "Gill Sans", gill, sans-serif; + /* font-family: Optima, "Gill Sans", gill, Helvetica, sans-serif; */ + /* font-family: "Gill Sans", gill, Helvetica, sans-serif; */ + /* I seem to have used 11pt at some point in the past, but this + is far too big -- did I ever have a reason for that, or is it + just due to browser changes? */ + font-size: 10pt; + line-height: 150%; +} + +/* adapt to wider screens */ +@media screen and (min-width: 700pt) { + body { + margin-left: 210pt; + width: 350pt; + } +} + +/* The following appears not to work in Safari or Chrome + -- don't know why, yet. +@media print { + @page :right { + size: auto; + body { + margin-top: 2cm; + margin-bottom: 3cm; + margin-left: 10%; + width: 60%; + margin-right: 30%; + color: #d33; + } + } + @page :left { + size: auto; + body { + margin-top: 2cm; + margin-bottom: 3cm; + margin-left: 30%; + width: 60%; + margin-right: 10%; + color: #33d; + } + } +} +*/ + +div.topsidebar { + float: right; + width: 50%; /* ...of the body width (ie, 50% x 50% of screen) */ + font-size: smaller; + margin-left: 1em; + padding-left: 1em; + border-left: solid thin #AAA; +} + +/* On wider screens, move the sidebar out to the right hand side */ +/* This uses CSS3 media queries: http://www.w3.org/TR/css3-mediaqueries/ */ +@media screen and (min-width: 700pt) and (max-width: 850pt) { + body { + margin-left: 210pt; + width: 350pt; /* 50% of 700pt */ + margin-right: auto; + } + div.topsidebar { + position: absolute; + /* I feel this size should be 595pt (350 + 210 + 0.05*700), + but that's clearly not right -- I don't think I understand what the -5% + in the h1 spec below is actually 5% of! */ + left: 570pt; + width: auto; + margin-left: 0pt; + padding-left: 0pt; + border: none; + } +} +/* On still-wider screens, expand the left-margin, keeping the sidebar attached to the right-hand edge. + When the screen is 850pt wide (expanding from the @media case above), + the left margin will be 210pt, the width 350pt, and the right margin therefore 290pt.*/ +@media screen and (min-width: 850pt) { + body { + margin-right: 290pt; /* 290 = 850-(210+350) */ + width: 350pt; + margin-left: auto; /* ...takes up the slack */ + } + div.topsidebar { + position: absolute; + width: 290pt; /* same 290pt as above */ + left: auto; + right: 0%; + padding-left: 0pt; + border: none; + } +} + + +code, pre { + font-family: Monaco, fixed; + font-size: 9pt; +} + +a { text-decoration: none; } +a:link { color: #66C; } +a:visited { color: #669; } +a[href]:hover { background: #EEE; } + +div.abstract { + font-style: oblique; + text-align: left; +} +div.abstract em { font-style: normal; } +div.abstract code { + font-style: normal; + font-size: 80%; +} + +h1, h2, h3, h4, h5, h6 { + color: #822; + font-weight: 100; /* few fonts have ultra-light weights */ + line-height: 100%; /* no need to spread out titles */ +} +h1 { + margin-left: -40%; + margin-right: -5%; + padding: 0.5em; + border: solid thin #666; + text-align: right; +} +h2 { + margin-left: -40%; + margin-right: -5%; + padding: 0.2em; + border-top: solid thin #666; + clear: both; +} + +h2.appendices { + margin-top: 10ex; + border-top: double medium #666; +} +h3 { + margin-left: -30%; + float: left; + width: 25%; + display: block; + text-align: right; + vertical-align: bottom; + padding-top: 0pt; + padding-right: 0.5em; + margin-top: 0pt; + line-height: 120%; +} + +/* +h4 { + color: #C66; +} +*/ + +pre, table { background: #dde; } + +pre { + padding: 1em; + line-height: 130%; +} + +table { + font-size: smaller; +} +td { + padding: 0.5ex; +} + +Q:before { content: "“"; } +Q:after { content: "”"; } + +img.smallimage { + float: right; + margin: 24pt; + margin-right: -30%; +} + +div.signature { + margin-left: -40%; + margin-right: -5%; + margin-top: 4ex; + text-align: right; + border: solid thin #666; + padding: 0.3em; + clear: both; +} + +/* ============================================================ + * Some other curiosities of my one-time formatting for web pages + */ +.doc-history { + font-size: xx-small; + background: #eee; + line-height: 100%; +} + +div.subtoc, div.subsubtoc { display: none; } + +/* ============================================================ + * Special formatting for ToC + */ + +/* + If there's significant amount of text in front of the first subsection, + then the following are good to put in the per-document stylesheet: + width: 25%; + float: right; +*/ +div#toc { + color: #888; + padding: 0; + font-size: smaller; + text-align: right; +} +div#toc a:link { color: #888; } +div#toc > ul { + padding: 0pt; + margin: 0pt; + list-style: none; +} +div#toc li { + padding: 0pt; + display: inline-block; +} +div#toc li:before { + content: "§ "; + margin-left: 1em; +} +/* the following elements aren't currently generated by structure.lx */ +div#toc li ul { + padding-left: 1em; + margin-left: 0; + font-style: italic; + display: inline; +} +div#toc li ul:before { + content: "( "; +} +div#toc li ul:after { + content: " ) "; +} +div#toc li li { + padding-left: 0pt; +} +div#toc li li:after { + content: "; "; +} +</style> <style type='text/css'> /* a span/div style for attracting attention */ .attention { @@ -19,8 +280,8 @@ <div class="abstract"> <p>Put the names of <code>\label</code>s and other commands into the margins of a draft document.</p> -<!-- This is revision aa6f5b4db751, 2015-12-08 --> -<p>Version 1.7, 2015 December 8, +<!-- This is revision 95a544e6b41b, 2016-06-09T16:51:03+01:00 --> +<p>Version 1.8, 2016 June 9, <a href='http://purl.org/nxg/dist/showlabels' ><code>http://purl.org/nxg/dist/showlabels</code></a>.</p> </div> @@ -35,7 +296,7 @@ equation is automatically numbered. It is compatible with the <p>You invoke this package with the command <code>\usepackage{showlabels}</code> in the preamble. You can control -where the labels appear -- in the margins or in the interline gaps -- +where the labels appear – in the margins or in the interline gaps – and you can change the appearance of the formatted labels to some extent.</p> @@ -49,12 +310,6 @@ the <code>\cite</code> command, but it can be useful for <code>[inner]</code> and <code>[outer]</code> will be ignored, and the label will be placed in the nearer margin.</p> -<p>The source code for the package is maintained at -<a href='http://bitbucket.org/nxg/showlabels/'>bitbucket.org</a>, -which also includes an -<a href='https://bitbucket.org/nxg/showlabels/issues' >issue tracker</a>, -where you can report bugs (or you can just mail me).</p> - <h3>Compatibility and problems</h3> <p>For reasonably obvious reasons, this package will <em>not</em> work at @@ -62,19 +317,19 @@ all well with the multicol package, and for possibly less obvious reasons, it won't work with the <code>[leqno]</code> option either (at some point it should be modified to at least recognise and warn of the conflict in either case). The package can occasionally place labels -in the wrong margins, near the top of a page -- see the documentation +in the wrong margins, near the top of a page – see the documentation for a discussion of this.</p> <h3>Download and installation</h3> <ol> <li>Download the file -<a href="showlabels-1.7.tar.gz" >showlabels-1.7.tar.gz</a> +<a href="showlabels-1.8.tar.gz" >showlabels-1.8.tar.gz</a> or -<a href="showlabels-1.7.zip" >showlabels-1.7.zip</a> +<a href="showlabels-1.8.zip" >showlabels-1.8.zip</a> and unpack it.</li> -<li>Run LaTeX on the file <code>showlabels.ins</code> -- this will +<li>Run LaTeX on the file <code>showlabels.ins</code> – this will unpack the style file <code>showlabels.sty</code> amongst other files. Place this somewhere where TeX can find it. </li> @@ -82,26 +337,43 @@ Place this somewhere where TeX can find it. </li> documentation.</li> </ol> -<p>On CTAN: -<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 +<p>Links:</p> +<ul> +<li>Canonical package home page: <a href="http://purl.org/nxg/dist/showlabels" - ><code>http://purl.org/nxg/dist/showlabels</code></a></p> + ><code>http://purl.org/nxg/dist/showlabels</code></a></li> + +<li>On CTAN: +<a href='https://www.ctan.org/pkg/showlabels' + >macros/latex/contrib/showlabels</a></li> -<p>The sources are in a Mercurial repository at -<a href='http://bitbucket.org/nxg/showlabels/'>bitbucket.org</a>.</p> +<li>The source code for the package is maintained at +<a href='http://bitbucket.org/nxg/showlabels/'>bitbucket.org</a>, +which also includes an +<a href='https://bitbucket.org/nxg/showlabels/issues' >issue tracker</a>, +where you can report bugs (or you can just mail me).</li> + +</ul> + +<p>This work is Copyright 1999, 2001-09, 2013-16, Norman Gray, and may be distributed and/or modified under the +conditions of the <a href='http://www.latex-project.org/lppl.txt'>LaTeX Project Public Licence</a>, +either version 1.3 of this licence or (at your option) any later version.</p> <h3>History</h3> <dl> -<dt><span class='attention'><strong>1.7, 2015 December 8</strong></span></dt> +<dt><span class='attention'><strong>1.8, 2016 June 9</strong></span></dt> +<dd>The <code>ntheorem</code> package exposed an apparently +long-standing incompleteness in the handling of <code>amsmath</code> +documents. +Fixes <a href='https://bitbucket.org/nxg/showlabels/issues/9/'>issue 9</a>.</dd> + +<dt><strong>1.7, 2015 December 8</strong></dt> <dd>Release v1.7.</dd> <dt>1.7b2, 2015 December 7</dt> <dd>Make the combination of amsmath and [inline] mode work (fixes <a href='https://bitbucket.org/nxg/showlabels/issue/8/'>issue 8</a> -– thanks to A L Dukeman for the report; +– thanks to A L Dukeman for the report; what is it about showlabels and 6 December?!).</dd> <dt>1.7b1, 2014 December 6</dt> @@ -110,22 +382,22 @@ what is it about showlabels and 6 December?!).</dd> <ul> <li>Give <code>\showlabels</code> an optional formatting argument (implements <a href='https://bitbucket.org/nxg/showlabels/issue/1/'>issue 1</a> -– thanks to Francesco Biccari for the suggestion).</li> +– thanks to Francesco Biccari for the suggestion).</li> <li>Special-case the IEEEtrantools package (fixes <a href='https://bitbucket.org/nxg/showlabels/issue/2/'>issue 2</a> -– thanks to Boris Kheyfets for the report and test case, and to +– thanks to Boris Kheyfets for the report and test case, and to Ben William Carabelli for additional analysis and a draft fix).</li> <li>The <code>[final]</code> option now works with the <code>{amsmath}</code> package (fixes <a href='https://bitbucket.org/nxg/showlabels/issue/3/'>issue 3</a> -– thanks to Guillermo Garza and Enno Nagel for the report, and to +– thanks to Guillermo Garza and Enno Nagel for the report, and to Guillermo for the test case).</li> <li>Handle the hyperref package's <code>\ref*{label}</code> variant (fixes <a href='https://bitbucket.org/nxg/showlabels/issue/4/'>issue 4</a> -– thanks to Alex Watson for the report and test case).</li> +– thanks to Alex Watson for the report and test case).</li> <li>Handle the case where a label is in a display, but not in maths mode (fixes <a href='https://bitbucket.org/nxg/showlabels/issue/5/'>issue 5</a> -– thanks to ‘bartgol’ on Stackexchange for the report and test case).</li> +– thanks to ‘bartgol’ on Stackexchange for the report and test case).</li> </ul></dd> <dt>1.6.6, 2013 December 6</dt> @@ -141,7 +413,7 @@ ensure that <code>\color</code> works in <dt>1.6.5, 2009 May 27</dt> <dd>Fixed a bug in the way that labels including underscores (and -other 'exotic' characters) were displayed.</dd> +other ‘exotic’ characters) were displayed.</dd> <dt>1.6.4, 2008 October 10</dt> <dd>Fixed another poor interaction between eqnarray and amsart. Now @@ -225,7 +497,7 @@ the <code>\usepackage{amsmath}</code> command. Bug-sightings here will be warmly appreciated.</li> <li>I haven't worried too much about the precise formatting of the -labels -- this is, after all, supposed to be a draft-only +labels – this is, after all, supposed to be a draft-only package.</li> </ul> </dd> @@ -240,18 +512,25 @@ the <code>\usepackage{showlabels}</code> command <em>must</em> appear after the <code>\usepackage{amsmath}</code> if it is to detect that you are using the amsmath package. Note also that, since these additions appeared, AMS-LaTeX and the <code>amstex</code> package seem -to have been declared `obsolete' in favour of the <code>amsmath</code> +to have been declared ‘obsolete’ in favour of the <code>amsmath</code> package. This package now claims conformance with the <code>amsmath</code> package alone, though it will probably work with older versions in fact. </dd> +<dt>Original release</dt> +<dd>The package was originally released by me on 1991 September 21, under the name +<code>labels.sty</code>. +On 1992 January 29, Darrel Hankerson +(<code>hank@ducvax.auburn.edu</code>), made the update to NFSS, and +changed the name to <code>showlabel.sty</code>.</dd> + </dl> <div class="signature"> <a href="http://www.astro.gla.ac.uk/users/norman/" >Norman Gray</a><br/> -2015 December 8 +2016 June 9 </div> </body> diff --git a/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf b/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf Binary files differindex f7a4f6a7bec..71be316ed37 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 6baee82ff31..f5130ade0d9 100644 --- a/Master/texmf-dist/source/latex/showlabels/showlabels.drv +++ b/Master/texmf-dist/source/latex/showlabels/showlabels.drv @@ -8,12 +8,12 @@ %% Showlabels: Style to display labels in the margin %% This is the showlabels package %% -%%%% Copyright 1999, 2001--09, 2013--15, Norman Gray +%%%% Copyright 1999, 2001-09, 2013-16, Norman Gray %% %% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in +%% conditions of the LaTeX Project Public Licence, either version 1.3 +%% of this licence or (at your option) any later version. +%% The latest version of this licence is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. @@ -23,11 +23,15 @@ %% The Current Maintainer of this work is Norman Gray <http://nxg.me.uk> %% %% This work consists of the files showlabels.dtx and showlabels.ins, -%% and the derived file showlabels.cls. +%% and the derived file showlabels.sty. + +%%%% File: showlabels.dtx +%%%% Source: 95a544e6b41b, 2016-06-09T16:51:03+01:00 + \def\filename{showlabels} -\def\fileversion{1.7} -\def\filedate{2015/12/08} -\def\docdate{2015 December 8} +\def\fileversion{1.8} +\def\filedate{2016/06/09} +\def\docdate{2016 June 9} \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 ec9053b780e..3a2c4579653 100644 --- a/Master/texmf-dist/source/latex/showlabels/showlabels.dtx +++ b/Master/texmf-dist/source/latex/showlabels/showlabels.dtx @@ -2,12 +2,12 @@ % %% This is the showlabels package %% -%%%% Copyright 1999, 2001--09, 2013--15, Norman Gray +%%%% Copyright 1999, 2001-09, 2013-16, Norman Gray %% %% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in +%% conditions of the LaTeX Project Public Licence, either version 1.3 +%% of this licence or (at your option) any later version. +%% The latest version of this licence is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. @@ -17,14 +17,17 @@ %% The Current Maintainer of this work is Norman Gray <http://nxg.me.uk> %% %% This work consists of the files showlabels.dtx and showlabels.ins, -%% and the derived file showlabels.cls. -% +%% and the derived file showlabels.sty. + +%%%% File: showlabels.dtx +%%%% Source: 95a544e6b41b, 2016-06-09T16:51:03+01:00 + \def\filename{showlabels} -\def\fileversion{1.7} -\def\filedate{2015/12/08} -\def\docdate{2015 December 8} +\def\fileversion{1.8} +\def\filedate{2016/06/09} +\def\docdate{2016 June 9} \def\filemaintainer{norman@astro.gla.ac.uk} -% This is revision aa6f5b4db751, 2015-12-08. +% This is revision 95a544e6b41b, 2016-06-09T16:51:03+01:00. %<+package>\NeedsTeXFormat{LaTeX2e} %<+package>\ProvidesPackage{showlabels}[\filedate\space v\fileversion] %<+package>\typeout{Package: `showlabels' v\fileversion\space<\filedate>} @@ -177,9 +180,7 @@ % \subsection*{Compatibility with other packages, and other problems} % % The \Lpackage{showlabels} package works by redefining the |\label| -% command, along with the internal \LaTeX\ commands |\@eqnnum|, -% |\@makecaption| and -% |\maketag@@@| (for \Lpackage{amsmath}). All the other commands it +% command, along with a few internal \LaTeX\ commands. All the other commands it % defines are `hidden' by prefixing them with `\texttt{SL@}', with % the exception of the user commands |\showlabelfont| and % |\showlabelsetlabel|. Each of @@ -243,19 +244,24 @@ % The package might still work with \LaTeX2.09, but that's neither % supported, nor even still tested. % -% This software is copyright, 1999, 2001--09, 2013--15 Norman Gray. +% This software is copyright, 1999, 2001--09, 2013--16 Norman Gray. % It is released under the terms of the LaTeX Project Public Licence. % See the copyright declaration at the top of file \texttt{showlabels.dtx}, -% and the file \texttt{lppl}, for the licence conditions. +% and the file \texttt{lppl.txt}, for the licence conditions. % % 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/}. +% \url{https://www.ctan.org/pkg/showlabels}. The source is in +% a repository at Bitbucket: \url{https://bitbucket.org/nxg/showlabels/}. % % \subsection*{Other packages} % -% David Carlisle's \Lpackage{showkeys} does roughly the same thing, but -% it will only handle |\label| and |\cite| keys. +% The \Lpackage{showlabels} package has a large overlap in +% functionality with David Carlisle's \Lpackage{showkeys}, although +% the latter will only handle |\label| and |\cite| keys. If +% \Lpackage{showlabels} fails in some particular situation, you might +% want to try using \Lpackage{showkeys}, but please do mention the +% problem, either by email to me, or via the Bitbucket issues list. % % \subsection*{History and Credits} % @@ -280,6 +286,7 @@ % Ignacy Sawicki, % Andrei Shelankov, % Patrick Sibille, +% `Stirling' (on Stackexchange), % Mariano Su\'arez-Alvarez, % Ji\v ri Vesely, % Elmar Walhorn, @@ -326,7 +333,7 @@ {\SL@AMStrue\typeout{with amsmath equation tags}} % \end{macrocode} % -% The command which sets equationn text is |\SL@eqntext|, which tests +% The command which sets equation text is |\SL@eqntext|, which tests % whether the content should be inline or not. % \begin{macrocode} \def\SL@eqntext{% @@ -370,13 +377,13 @@ % \end{macrocode} % % \Lpackage{amsmath} redefines |\label| to set the macro |\df@label|, -% and then uses |\maketag@@@{\df@label}|, to form tags (ie, equation -% labels) in equations. So we hook into the |\maketag@@@| macro. -% If the |\df@label| is +% and then uses |\maketag@@@{\df@label}| or |\tagform@| to form tags +% (ie, equation labels) in equations. So we hook into \emph{both} of +% these macros. If the |\df@label| is % empty (almost certainly because the user has used the % \Lenv{eqnarray} environment within \Lpackage{amsmath}), then fall back % on the |\SL@labelname| contents instead. -% \iffalse See tests t2 and t11\fi +% \iffalse See tests t2, t11 and t18. \fi % We must make sure to leave |\SL@labelname| equal to |\relax| at the % end of this macro, otherwise a |{eqnarray}| followed by an (AMSTeX) % |\eqref| can end up with the wrong label being referred to by the @@ -388,13 +395,11 @@ % 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). The following is -% similar to the effect of |\SL@wrap@labeller|, but not quite, -% because (a) |\maketag@@@| takes an argument, and (b) we also have to -% check |\df@label|. +% similar to the effect of |\SL@wrap@labeller|, but is not quite identical, +% because (a) |\maketag@@@| and |\tagform@| take an argument, +% and (b) we also have to check |\df@label|. % \begin{macrocode} - \let\SL@orig@maketag@@@=\maketag@@@ - \def\SL@maketag@@@#1{% - \SL@orig@maketag@@@{#1}% + \def\SL@setlabel@ams{% \ifx\df@label\@empty \ifx\SL@labelname\relax % do nothing @@ -406,6 +411,16 @@ \fi \global\let\SL@labelname\relax } + \let\SL@orig@maketag@@@=\maketag@@@ + \def\SL@maketag@@@#1{% + \SL@orig@maketag@@@{#1}% + \SL@setlabel@ams + } + \let\SL@orig@tagform@\tagform@ + \def\SL@tagform@#1{% + \SL@orig@tagform@{#1}% + \SL@setlabel@ams + } \else % \end{macrocode} % @@ -1034,7 +1049,9 @@ \ifx\showlabels\@gobble % do nothing -- we're in [final] mode (see test case t13) \else - \let\maketag@@@\SL@maketag@@@ + \AtBeginDocument{% + \let\maketag@@@\SL@maketag@@@ + \let\tagform@\SL@tagform@} \fi \fi \@ifundefined{theIEEEsubequationdis}\relax % and \theequationdis diff --git a/Master/texmf-dist/tex/latex/showlabels/showlabels.sty b/Master/texmf-dist/tex/latex/showlabels/showlabels.sty index 408968da868..7942695bbc9 100644 --- a/Master/texmf-dist/tex/latex/showlabels/showlabels.sty +++ b/Master/texmf-dist/tex/latex/showlabels/showlabels.sty @@ -8,12 +8,12 @@ %% Showlabels: Style to display labels in the margin %% This is the showlabels package %% -%%%% Copyright 1999, 2001--09, 2013--15, Norman Gray +%%%% Copyright 1999, 2001-09, 2013-16, Norman Gray %% %% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in +%% conditions of the LaTeX Project Public Licence, either version 1.3 +%% of this licence or (at your option) any later version. +%% The latest version of this licence is in %% http://www.latex-project.org/lppl.txt %% and version 1.3 or later is part of all distributions of LaTeX %% version 2005/12/01 or later. @@ -23,11 +23,15 @@ %% The Current Maintainer of this work is Norman Gray <http://nxg.me.uk> %% %% This work consists of the files showlabels.dtx and showlabels.ins, -%% and the derived file showlabels.cls. +%% and the derived file showlabels.sty. + +%%%% File: showlabels.dtx +%%%% Source: 95a544e6b41b, 2016-06-09T16:51:03+01:00 + \def\filename{showlabels} -\def\fileversion{1.7} -\def\filedate{2015/12/08} -\def\docdate{2015 December 8} +\def\fileversion{1.8} +\def\filedate{2016/06/09} +\def\docdate{2016 June 9} \def\filemaintainer{norman@astro.gla.ac.uk} \NeedsTeXFormat{LaTeX2e} \ProvidesPackage{showlabels}[\filedate\space v\fileversion] @@ -55,9 +59,7 @@ \fi \global\let\SL@labelname\relax}} \ifSL@AMS - \let\SL@orig@maketag@@@=\maketag@@@ - \def\SL@maketag@@@#1{% - \SL@orig@maketag@@@{#1}% + \def\SL@setlabel@ams{% \ifx\df@label\@empty \ifx\SL@labelname\relax % do nothing @@ -69,6 +71,16 @@ \fi \global\let\SL@labelname\relax } + \let\SL@orig@maketag@@@=\maketag@@@ + \def\SL@maketag@@@#1{% + \SL@orig@maketag@@@{#1}% + \SL@setlabel@ams + } + \let\SL@orig@tagform@\tagform@ + \def\SL@tagform@#1{% + \SL@orig@tagform@{#1}% + \SL@setlabel@ams + } \else %% \let\SL@eqnnum=\@eqnnum %% \def\@eqnnum{% @@ -330,7 +342,9 @@ \ifx\showlabels\@gobble % do nothing -- we're in [final] mode (see test case t13) \else - \let\maketag@@@\SL@maketag@@@ + \AtBeginDocument{% + \let\maketag@@@\SL@maketag@@@ + \let\tagform@\SL@tagform@} \fi \fi \@ifundefined{theIEEEsubequationdis}\relax % and \theequationdis |