diff options
author | Karl Berry <karl@freefriends.org> | 2022-07-19 20:09:37 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2022-07-19 20:09:37 +0000 |
commit | b35fc0d36d1dc34a95beda9066922be1123bffd6 (patch) | |
tree | 0cc3ee5f71f661c59eef8a733092302335d7f2f3 | |
parent | 806b006b66e1093049761c9e0ffdba845d2bd227 (diff) |
showlabels (19jul22)
git-svn-id: svn://tug.org/texlive/trunk@63940 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/README | 18 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/VERSION | 2 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/showlabels.html | 61 | ||||
-rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/showlabels.pdf | bin | 218645 -> 219520 bytes | |||
-rw-r--r-- | Master/texmf-dist/doc/latex/showlabels/style.css | 31 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/showlabels/showlabels.drv | 10 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/showlabels/showlabels.dtx | 83 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/showlabels/showlabels.ins | 9 | ||||
-rw-r--r-- | Master/texmf-dist/tex/latex/showlabels/showlabels.sty | 29 |
9 files changed, 153 insertions, 90 deletions
diff --git a/Master/texmf-dist/doc/latex/showlabels/README b/Master/texmf-dist/doc/latex/showlabels/README index e1cdab84719..cd33dbd21da 100644 --- a/Master/texmf-dist/doc/latex/showlabels/README +++ b/Master/texmf-dist/doc/latex/showlabels/README @@ -3,7 +3,7 @@ Showlabels Put the names of `\labels` and other commands into the margins of a draft document. -Version 1.9.1, 2021 October 27; +Version 1.9.2, 2022 July 18; <https://purl.org/nxg/dist/showlabels>. This class option helps you keep track of all the labels in your @@ -26,17 +26,15 @@ it can be useful for `\ref` or `\begin` as well. Links: * Canonical software home page: <https://purl.org/nxg/dist/showlabels> - (use this rather than the URL it redirects to). + (_please use this URL_ rather than the URL it redirects to). * On CTAN: <https://www.ctan.org/pkg/showlabels> * The source code for the package is maintained - [at sourcehut](https://hg.sr.ht/~nxg/showlabels). + [at heptapod.host](https://heptapod.host/nxg/showlabels), where there is an issue tracker. + Or you can just mail me. - * There's also an [issue tracker](https://todo.sr.ht/~nxg/showlabels) - at sourcehut. Or you can just mail me. - -This work is Copyright 1999, 2001-09, 2013-21, Norman Gray, and may be +This work is Copyright 1999, 2001-09, 2013-22, Norman Gray, and may be distributed and/or modified under the conditions of the LaTeX Project Public Licence, either version 1.3c of this licence or (at your option) any later version. See the distributed file lppl.txt for details. @@ -48,14 +46,14 @@ CTAN upload info ---------------- * Name: showlabels - * Version: 1.9.1 + * Version: 1.9.2 * Maintainer: gray@nxg.name * Summary: Put the names of `\labels` and other commands into the margins of a draft document. * CTAN directory: /macros/latex/contrib/showlabels * Licence: LPPL 1.3c * Home page: https://purl.org/nxg/dist/showlabels - * Bug tracker: https://todo.sr.ht/~nxg/showlabels - * Repository: https://hg.sr.ht/~nxg/showlabels + * Bug tracker: https://heptapod.host/nxg/showlabels/-/issues + * Repository: https://heptapod.host/nxg/showlabels Norman Gray https://nxg.me.uk diff --git a/Master/texmf-dist/doc/latex/showlabels/VERSION b/Master/texmf-dist/doc/latex/showlabels/VERSION index 9ab8337f396..8fdcf386946 100644 --- a/Master/texmf-dist/doc/latex/showlabels/VERSION +++ b/Master/texmf-dist/doc/latex/showlabels/VERSION @@ -1 +1 @@ -1.9.1 +1.9.2 diff --git a/Master/texmf-dist/doc/latex/showlabels/showlabels.html b/Master/texmf-dist/doc/latex/showlabels/showlabels.html index 580b04d566b..e77a579cfdb 100644 --- a/Master/texmf-dist/doc/latex/showlabels/showlabels.html +++ b/Master/texmf-dist/doc/latex/showlabels/showlabels.html @@ -12,7 +12,7 @@ body { 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 */ + 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; @@ -288,8 +288,8 @@ div#toc li li:after { <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 1f8b1fcbe557, 2021-10-27T16:06:03+01:00 --> -<p>Version 1.9.1, 2021 October 27, +<!-- This is revision dc6d682fadbc, 2022-07-18T23:32:32+01:00 --> +<p>Version 1.9.2, 2022 July 18, <a href='https://purl.org/nxg/dist/showlabels' ><code>https://purl.org/nxg/dist/showlabels</code></a>.</p> </div> @@ -337,9 +337,11 @@ problem, typically by email to me.</p> <ol> <li>Download the file -<a href="showlabels-1.9.1.tar.gz" >showlabels-1.9.1.tar.gz</a> +<a href="showlabels-1.9.2.tar.gz" + >showlabels-1.9.2.tar.gz</a> or -<a href="showlabels-1.9.1.zip" >showlabels-1.9.1.zip</a> +<a href="showlabels-1.9.2.zip" + >showlabels-1.9.2.zip</a> and unpack it.</li> <li>Run LaTeX on the file <code>showlabels.ins</code> – this will @@ -354,25 +356,27 @@ documentation.</li> <ul> <li>Canonical package home page: <a href="https://purl.org/nxg/dist/showlabels" - ><code>https://purl.org/nxg/dist/showlabels</code></a></li> + ><code>https://purl.org/nxg/dist/showlabels</code></a>. +<em>Please use this URL</em> to refer to the package, +instead of the URL it redirects to.</li> <li>On CTAN: <a href='https://www.ctan.org/pkg/showlabels' >macros/latex/contrib/showlabels</a></li> <li>The source code for the package is maintained -<a href='https://hg.sr.ht/~nxg/showlabels'>online</a> -at <a href='https://sourcehut.org'>Sourcehut</a>.</li> +<a href='https://heptapod.host/nxg/showlabels'>online</a> +at <a href='https://heptapod.host'>heptapod.host</a>.</li> -<li>There's an <a href='https://todo.sr.ht/~nxg/showlabels'>issue -tracker</a> there (the issues which had accumulated on the bitbucket +<li>There's an issue tracker there +(the issues which had accumulated on the bitbucket tracker were effectively lost when Bitbucket dropped support for -Mercurial; there were few outstanding ones anyway). Or you can just -mail me.</li> +Mercurial; there were few outstanding ones anyway). +Or you can just mail me.</li> </ul> -<p>This work is Copyright 1999, 2001-09, 2013-21, Norman Gray, and may be distributed and/or modified under the +<p>This work is Copyright 1999, 2001-09, 2013-22, 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.3c of this licence or (at your option) any later version.</p> @@ -380,11 +384,29 @@ either version 1.3c of this licence or (at your option) any later version.</p> <!-- @RELEASENOTES@ --> <h:dl xmlns:h="http://www.w3.org/1999/xhtml"> - <h:dt><h:span class="attention">1.9.1, 2021 October 27</h:span></h:dt><h:dd> + <h:dt><h:span class="attention">1.9.2, 2022 July 18</h:span></h:dt><h:dd> + <p xmlns="http://www.w3.org/1999/xhtml">No code changes from 1.9.2-b1, but the documentation notes a new home repository.</p> + </h:dd> + + <h:dt>1.9.2-b1, 2022 June 11</h:dt><h:dd> + <ul xmlns="http://www.w3.org/1999/xhtml"> + <li>Fixed a spacing bug when used with the <code>wrapfig</code> package + (<a href="https://heptapod.host/nxg/showlabels/-/issues/2">issue 2</a>). + Thanks to Romano Giannetti for the report.</li> + <li>Added a <code>\showlabelsmarginal</code> command.</li> + <li>The code has moved (again) to + <a href="https://heptapod.host">heptapod.host</a>: the new + repository is + <a href="https://heptapod.host/nxg/showlabels">https://heptapod.host/nxg/showlabels</a>. + The issues links in the list below are therefore broken.</li> + </ul> + </h:dd> + + <h:dt>1.9.1, 2021 October 27</h:dt><h:dd> <p xmlns="http://www.w3.org/1999/xhtml">Commands with optional arguments, such as <code>\bibitem[P\'olya]{polya_54}</code> are now handled with the correct catcodes. - Fixes <a href="https://todo.sr.ht/~nxg/showlabels/1">issue 1</a> + Fixes <a href="https://heptapod.host/nxg/showlabels/-/issues/1">issue 1</a> (new sequencing for issues). Thanks to Michael Levitin for the report here.</p> </h:dd> @@ -398,10 +420,6 @@ either version 1.3c of this licence or (at your option) any later version.</p> can now take a one-argument command.</li> <li>The macro <code>\showlabeltype</code> expands to the current label type, for possible use in <code>\showlabelsetlabel</code>.</li> - <li>The code has moved from Bitbucket to - <a href="https://sourcehut.org">Sourcehut</a>: the new repository is - <a href="https://hg.sr.ht/~nxg/showlabels">https://hg.sr.ht/~nxg/showlabels</a>. - The issues links in the list below are therefore broken.</li> </ul> </h:dd> @@ -593,9 +611,8 @@ changed the name to <code>showlabel.sty</code>.</p> </h:dl> <div class="signature"> -<a href="https://nxg.me.uk" - >Norman Gray</a><br/> -2021 October 27 +<a href="https://nxg.me.uk">Norman Gray</a><br/> +2022 July 18 </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 b7526ed2221..8a341bbe0c9 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/doc/latex/showlabels/style.css b/Master/texmf-dist/doc/latex/showlabels/style.css index f0a3150cca2..f1c150d234b 100644 --- a/Master/texmf-dist/doc/latex/showlabels/style.css +++ b/Master/texmf-dist/doc/latex/showlabels/style.css @@ -1,3 +1,5 @@ +/* Installed from repo: 2022-07-12T17:44:22+01:00, Hg:4e5b8a899d61 */ + body { color: #333; background: white; @@ -53,15 +55,32 @@ body { } */ -div.topsidebar { +/* The class='topsidebar' is formatting, typically div or ul, + for auxiliary stuff, placed at the top of the right-hand column. + The element with this class should go just _after_ the <h1> heading. */ +.topsidebar { float: right; width: 50%; /* ...of the body width (ie, 50% x 50% of screen) */ font-size: smaller; + line-height: 140%; /* ...of the font size*/ margin-left: 1em; padding-left: 1em; border-left: solid thin #AAA; } +/* +I have in the past styled `.topsidebar li` like this, +but I think this is too much detail for this location: +I should restrict the styling here to the location and general appearance of the sidebar +and I should leave such details to more local stylesheets +(and in any case I think it's only my blog that actually uses this class) +.topsidebar li { + list-style-type: none; + text-align: right; + line-height: 150%; +} +*/ + /* 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) { @@ -70,7 +89,7 @@ div.topsidebar { width: 350pt; /* 50% of 700pt */ margin-right: auto; } - div.topsidebar { + .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% @@ -81,6 +100,7 @@ div.topsidebar { padding-left: 0pt; border: none; } + /* .topsidebar li { text-align: center; } */ } /* 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), @@ -91,7 +111,7 @@ div.topsidebar { width: 350pt; margin-left: auto; /* ...takes up the slack */ } - div.topsidebar { + .topsidebar { position: absolute; width: 290pt; /* same 290pt as above */ left: auto; @@ -99,6 +119,7 @@ div.topsidebar { padding-left: 0pt; border: none; } + /* .topsidebar li { text-align: center; } */ } @@ -201,8 +222,8 @@ div.signature { margin-right: -5%; margin-top: 4ex; text-align: right; - border: solid thin #666; - padding: 0.3em; + border-top: solid thin #666; + padding-top: 0.3em; clear: both; } diff --git a/Master/texmf-dist/source/latex/showlabels/showlabels.drv b/Master/texmf-dist/source/latex/showlabels/showlabels.drv index cb1d23393ab..53cda24bc47 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 %% -%%%% Copyright 1999, 2001-09, 2013-21, Norman Gray +%%%% Copyright 1999, 2001-09, 2013-22, Norman Gray %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public Licence, either version 1.3c @@ -26,14 +26,14 @@ %% and the derived file showlabels.sty. %%%% File: showlabels.dtx -%%%% Source: 1f8b1fcbe557, 2021-10-27T16:06:03+01:00 +%%%% Source: dc6d682fadbc, 2022-07-18T23:32:32+01:00 \documentclass{ltxdoc} \EnableCrossrefs -\newcommand\Lopt[1]{\textsf{#1}} % package options -\newcommand\file[1]{\texttt{#1}} % filename +\newcommand\Lopt[1]{\textsf{#1}} % package options +\newcommand\file[1]{\texttt{#1}} % filename \newcommand\Lenv[1]{\textsl{\{#1\}}} -\newcommand\Lpackage[1]{\textsf{\{#1\}}} % packages +\newcommand\Lpackage[1]{\textsf{\{#1\}}} % packages %% \url macro (url.sty does this better, but we don't want extra dependencies) \def\setpathdots{\discretionary{.}{}{.}} \def\setpathslash{\discretionary{/}{}{/}} diff --git a/Master/texmf-dist/source/latex/showlabels/showlabels.dtx b/Master/texmf-dist/source/latex/showlabels/showlabels.dtx index ef6f107f608..2cfacf91125 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 %% -%%%% Copyright 1999, 2001-09, 2013-21, Norman Gray +%%%% Copyright 1999, 2001-09, 2013-22, Norman Gray %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public Licence, either version 1.3c @@ -20,12 +20,12 @@ %% and the derived file showlabels.sty. %%%% File: showlabels.dtx -%%%% Source: 1f8b1fcbe557, 2021-10-27T16:06:03+01:00 +%%%% Source: dc6d682fadbc, 2022-07-18T23:32:32+01:00 -% This is revision 1f8b1fcbe557, 2021-10-27T16:06:03+01:00. +% This is revision dc6d682fadbc, 2022-07-18T23:32:32+01:00. %<+package>\NeedsTeXFormat{LaTeX2e} -%<+package>\ProvidesPackage{showlabels}[2021/10/27\space v1.9.1] -%<+package>\typeout{Package: `showlabels' v1.9.1\space<2021/10/27>} +%<+package>\ProvidesPackage{showlabels}[2022/07/18\space v1.9.2] +%<+package>\typeout{Package: `showlabels' v1.9.2\space<2022/07/18>} % %<*driver> \documentclass{ltxdoc} @@ -34,11 +34,11 @@ % Some commonly used abbreviations for option names, filenames, % counters and packages. % \begin{macrocode} -\newcommand\Lopt[1]{\textsf{#1}} % package options -\newcommand\file[1]{\texttt{#1}} % filename +\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\Lpackage[1]{\textsf{\{#1\}}} % packages +\newcommand\Lpackage[1]{\textsf{\{#1\}}} % packages %% \url macro (url.sty does this better, but we don't want extra dependencies) \def\setpathdots{\discretionary{.}{}{.}} \def\setpathslash{\discretionary{/}{}{/}} @@ -63,8 +63,8 @@ % % % \title{The \texttt{showlabels} package} -% \author{Norman Gray\\|gray@nxg.name|} -% \date{Version 1.9.1, 2021 October 27} +% \author{Norman Gray\\https://nxg.me.uk} +% \date{Version 1.9.2, 2022 July 18} % % \maketitle % @@ -154,6 +154,9 @@ % situation which this package mishandles) to force inline labels % temporarily, within a block or environment. Use the % |\showlabelsinline| macro to do that. +% \DescribeMacro{\showlabelsmarginal} +% The corresponding |\showlabelsmarginal| command has the opposite +% effect (included for symmetry; it's less likely to be useful). % % \section{Formatting} % @@ -194,7 +197,7 @@ % The command |\showlabeltype| will expand to the current label type % (ie, `label' or `cite', etc), so it would be possible for % |\showlabelsetlabel| to conditionalise on that, if you felt that -% were necessary.\footnote{The support for an one-argument command in +% were necessary.\footnote{The support for a one-argument command in % $\backslash$\texttt{showlabels}, and the presence of the % $\backslash$\texttt{showlabeltype} macro, were added in version 1.9.} % @@ -278,7 +281,7 @@ % 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-21 Norman Gray. +% This software is copyright, 1999, 2001-09, 2013-22 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.txt}, for the licence conditions. @@ -286,7 +289,7 @@ % The canonical home page of the package is % \url{https://purl.org/nxg/dist/showlabels}, and it is on CTAN at % \url{https://www.ctan.org/pkg/showlabels}. The source is in -% a repository online: \url{https://hg.sr.ht/~nxg/showlabels}. +% a repository online: \url{https://heptapod.host/nxg/showlabels}. % % \section{Other packages} % @@ -345,19 +348,22 @@ % \fi % \catcode`\~=12 % \iffalse @RELEASENOTES@ \fi -% \begin{description}\item[1.9.1, 2021 October 27]\relax Commands with optional arguments, such as +% \begin{description}\item[1.9.2, 2022 July 18]\relax No code changes from 1.9.2-b1, but the documentation notes a new home repository.\par \item[1.9.2-b1, 2022 June 11]\relax \P\thinspace Fixed a spacing bug when used with the |wrapfig| package +% (issue 2\footnote{\url{https://heptapod.host/nxg/showlabels/-/issues/2}}). +% Thanks to Romano Giannetti for the report. \P\thinspace Added a |\showlabelsmarginal| command. \P\thinspace The code has moved (again) to +% heptapod.host\footnote{\url{https://heptapod.host}}: the new +% repository is +% https://heptapod.host/nxg/showlabels\footnote{\url{https://heptapod.host/nxg/showlabels}}. +% The issues links in the list below are therefore broken.\par\item[1.9.1, 2021 October 27]\relax Commands with optional arguments, such as % |\bibitem[P\'olya]{polya_54}| are now handled with the % correct catcodes. -% Fixes issue 1\footnote{\url{https://todo.sr.ht/~nxg/showlabels/1}} +% Fixes issue 1\footnote{\url{https://heptapod.host/nxg/showlabels/-/issues/1}} % (new sequencing for issues). % Thanks to Michael Levitin for the report here.\par \item[1.9, 2021 October 9]\relax \P\thinspace Robustness fix: macros in arguments are now handled, so that % (after |\showlabel{index}|), % |\index{Poincar\'e}| doesn't cause an error. \P\thinspace The |\showlabel[optarg]{command}| optional argument % can now take a one-argument command. \P\thinspace The macro |\showlabeltype| expands to the current -% label type, for possible use in |\showlabelsetlabel|. \P\thinspace The code has moved from Bitbucket to -% Sourcehut\footnote{\url{https://sourcehut.org}}: the new repository is -% https://hg.sr.ht/~nxg/showlabels\footnote{\url{https://hg.sr.ht/~nxg/showlabels}}. -% The issues links in the list below are therefore broken.\par\item[1.8, 2016 June 9]\relax The |ntheorem| package exposed an apparently +% label type, for possible use in |\showlabelsetlabel|.\par\item[1.8, 2016 June 9]\relax The |ntheorem| package exposed an apparently % long-standing incompleteness in the handling of |amsmath| % documents. % Fixes issue 9\footnote{\url{https://bitbucket.org/nxg/showlabels/issues/9/}}.\par \item[1.7, 2015 December 8]\relax Release v1.7.\par \item[1.7b2, 2015 December 7]\relax Make the combination of amsmath and [inline] mode work @@ -455,8 +461,8 @@ % \LaTeX2e package. % 29-Jan-92 Darrel Hankerson (hank@ducvax.auburn.edu) % Update to NFSS. Change name to `showlabel.sty'. Substitute -% \nintt -> \small\tt -% \sevit -> \scriptsize\it +% \nintt -> \small\tt +% \sevit -> \scriptsize\it % 21-Sep-91 Norman Gray no_gray@vax.acs.open.ac.uk % Original release of labels.sty % \fi @@ -904,8 +910,10 @@ \def\SL@interlinetext#1{% \setbox\@tempboxa=\hbox{\showlabelsetlabel{\SL@prlabelname{#1}}}\dp\@tempboxa\z@ \ifvmode + \@tempdima=\prevdepth \nointerlineskip\vbox to 0pt{\vss - \hbox to \columnwidth{\hss \box\@tempboxa}}% + \hbox to \hsize{\hss \box\@tempboxa}}\nobreak + \prevdepth=\@tempdima % \end{macrocode} % And in horizontal mode, squeeze it between the lines, at the current point, % carefully taking up no space. @@ -913,16 +921,16 @@ \else \ifSL@setleft \hbox to 0pt{% - \hss - \vbox to 0pt{\vss - \hbox to 0pt{\hss\box\@tempboxa}% - \showlabelrefline + \hss + \vbox to 0pt{\vss + \hbox to 0pt{\hss\box\@tempboxa}% + \showlabelrefline }}% \else \hbox to 0pt{% - \vbox to 0pt{\vss - \box\@tempboxa - \showlabelrefline + \vbox to 0pt{\vss + \box\@tempboxa + \showlabelrefline }\hss}% \fi \penalty10000 @@ -1043,12 +1051,21 @@ % place, rather than within a zero depth box. This code \emph{assumes} that % equation numbers are going to be on the right hand side of the page. It % should probably check for the existence of the \Lopt{leqno} option (how?). +% +% Note that we \emph{do} want this to be |\columnwidth| rather than +% |\hsize|. The \Lpackage{wrapfig} package retains the former as the +% width of the whole column, even though it carefully changes the +% latter to be the width of the \Lenv{wrapfigure} environment. In the +% (unlikely) event we want numbered equations in such an environment +% \emph{and} this label ends up on the left, we do want the +% label right out in the left margin, rather than on the left of the +% \Lenv{wrapfigure} environment. % \begin{macro}{\SL@eqnrighttext} % \begin{macro}{\SL@eqnlefttext} % \begin{macrocode} \def\SL@eqnrighttext#1{\rlap{\quad\SL@margintext{#1}}} \def\SL@eqnlefttext #1{\hbox to 0pt{\kern -\columnwidth - \llap{\SL@margintext{#1}\quad}\hss}} + \llap{\SL@margintext{#1}\quad}\hss}} % \end{macrocode} % \end{macro} % \end{macro} @@ -1142,6 +1159,12 @@ \def\showlabelsinline{\SL@labelsinlinetrue} % \end{macrocode} % \end{macro} +% \begin{macro}{\showlabelsmarginal} +% Add the complementary macro for symmetry, even though this is not +% likely to be useful. +% \begin{macrocode} +\def\showlabelsmarginal{\SL@labelsinlinefalse} +% \end{macrocode} % By default, we run |\showlabels{label}|. The option \Lopt{nolabel} % turns this off. % \begin{macrocode} diff --git a/Master/texmf-dist/source/latex/showlabels/showlabels.ins b/Master/texmf-dist/source/latex/showlabels/showlabels.ins index 739ad5571f7..fbad19c32ac 100644 --- a/Master/texmf-dist/source/latex/showlabels/showlabels.ins +++ b/Master/texmf-dist/source/latex/showlabels/showlabels.ins @@ -1,13 +1,14 @@ \input docstrip \preamble - Showlabels: Style to display labels in the margin +Showlabels: Style to display labels in the margin \endpreamble \keepsilent \askforoverwritefalse -\generate{\file{showlabels.drv}{\from{showlabels.dtx}{driver}} - \file{showlabels.sty}{\from{showlabels.dtx}{package}} - } +\generate{ +\file{showlabels.drv}{\from{showlabels.dtx}{driver}} +\file{showlabels.sty}{\from{showlabels.dtx}{package}} +} \endbatchfile diff --git a/Master/texmf-dist/tex/latex/showlabels/showlabels.sty b/Master/texmf-dist/tex/latex/showlabels/showlabels.sty index 1e36c513b8c..9ed5bda6617 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 %% -%%%% Copyright 1999, 2001-09, 2013-21, Norman Gray +%%%% Copyright 1999, 2001-09, 2013-22, Norman Gray %% %% This work may be distributed and/or modified under the %% conditions of the LaTeX Project Public Licence, either version 1.3c @@ -26,11 +26,11 @@ %% and the derived file showlabels.sty. %%%% File: showlabels.dtx -%%%% Source: 1f8b1fcbe557, 2021-10-27T16:06:03+01:00 +%%%% Source: dc6d682fadbc, 2022-07-18T23:32:32+01:00 \NeedsTeXFormat{LaTeX2e} -\ProvidesPackage{showlabels}[2021/10/27\space v1.9.1] -\typeout{Package: `showlabels' v1.9.1\space<2021/10/27>} +\ProvidesPackage{showlabels}[2022/07/18\space v1.9.2] +\typeout{Package: `showlabels' v1.9.2\space<2022/07/18>} \newif\ifSL@AMS \@ifundefined{maketag@@@} \SL@AMSfalse @@ -177,21 +177,23 @@ \def\SL@interlinetext#1{% \setbox\@tempboxa=\hbox{\showlabelsetlabel{\SL@prlabelname{#1}}}\dp\@tempboxa\z@ \ifvmode + \@tempdima=\prevdepth \nointerlineskip\vbox to 0pt{\vss - \hbox to \columnwidth{\hss \box\@tempboxa}}% + \hbox to \hsize{\hss \box\@tempboxa}}\nobreak + \prevdepth=\@tempdima \else \ifSL@setleft \hbox to 0pt{% - \hss - \vbox to 0pt{\vss - \hbox to 0pt{\hss\box\@tempboxa}% - \showlabelrefline + \hss + \vbox to 0pt{\vss + \hbox to 0pt{\hss\box\@tempboxa}% + \showlabelrefline }}% \else \hbox to 0pt{% - \vbox to 0pt{\vss - \box\@tempboxa - \showlabelrefline + \vbox to 0pt{\vss + \box\@tempboxa + \showlabelrefline }\hss}% \fi \penalty10000 @@ -247,7 +249,7 @@ \SL@next} \def\SL@eqnrighttext#1{\rlap{\quad\SL@margintext{#1}}} \def\SL@eqnlefttext #1{\hbox to 0pt{\kern -\columnwidth -\llap{\SL@margintext{#1}\quad}\hss}} + \llap{\SL@margintext{#1}\quad}\hss}} \def\SL@eqnalternatetext{% \SL@setLR \ifSL@setleft @@ -290,6 +292,7 @@ \@tempa } \def\showlabelsinline{\SL@labelsinlinetrue} +\def\showlabelsmarginal{\SL@labelsinlinefalse} \newif\ifSL@labellabel \SL@labellabeltrue \DeclareOption{nolabel}{\SL@labellabelfalse} |