texlive[76183] Master/texmf-dist: showlabels (29aug25)
commits+karl at tug.org
commits+karl at tug.org
Fri Aug 29 23:30:11 CEST 2025
Revision: 76183
https://tug.org/svn/texlive?view=revision&revision=76183
Author: karl
Date: 2025-08-29 23:30:11 +0200 (Fri, 29 Aug 2025)
Log Message:
-----------
showlabels (29aug25)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/showlabels/showlabels.html
trunk/Master/texmf-dist/source/latex/showlabels/showlabels.drv
trunk/Master/texmf-dist/source/latex/showlabels/showlabels.dtx
trunk/Master/texmf-dist/tex/latex/showlabels/showlabels.sty
Added Paths:
-----------
trunk/Master/texmf-dist/doc/latex/showlabels/README-ctan.txt
trunk/Master/texmf-dist/doc/latex/showlabels/README.md
Removed Paths:
-------------
trunk/Master/texmf-dist/doc/latex/showlabels/README
trunk/Master/texmf-dist/doc/latex/showlabels/VERSION
trunk/Master/texmf-dist/doc/latex/showlabels/lppl.txt
trunk/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf
trunk/Master/texmf-dist/doc/latex/showlabels/style.css
Deleted: trunk/Master/texmf-dist/doc/latex/showlabels/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/showlabels/README 2025-08-29 21:29:39 UTC (rev 76182)
+++ trunk/Master/texmf-dist/doc/latex/showlabels/README 2025-08-29 21:30:11 UTC (rev 76183)
@@ -1,59 +0,0 @@
-Showlabels
-==========
-
-Put the names of `\labels` and other commands into the margins of a draft document.
-
-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
-documents, by putting the name of the new label into the margin
-whenever either the `\label` command is used, or an equation is
-automatically numbered. It is compatible with the amsmath and hyperref
-packages.
-
-It is similar to, but does a little more than, the showkeys package.
-
-You invoke this package with the command `\usepackage{showlabels}` in the
-preamble. You can control 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.
-
-As well, you can have the arguments to other commands besides `\label`
-displayed. This is fairly obviously useful for the `\cite` command, but
-it can be useful for `\ref` or `\begin` as well.
-
-Links:
-
- * Canonical software home page: <https://purl.org/nxg/dist/showlabels>
- (_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 heptapod.host](https://heptapod.host/nxg/showlabels), where there is an issue tracker.
- Or you can just mail me.
-
-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.
-
-For more information, see showlabels.html in the distribution.
-
-
-CTAN upload info
-----------------
-
- * Name: showlabels
- * Version: 1.9.2
- * Maintainer: gray at 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://heptapod.host/nxg/showlabels/-/issues
- * Repository: https://heptapod.host/nxg/showlabels
-
-Norman Gray
-https://nxg.me.uk
Added: trunk/Master/texmf-dist/doc/latex/showlabels/README-ctan.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/showlabels/README-ctan.txt (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/showlabels/README-ctan.txt 2025-08-29 21:30:11 UTC (rev 76183)
@@ -0,0 +1,22 @@
+CTAN information
+================
+
+Package name: showlabels
+Version: 1.9.3
+Maintainer: Norman Gray <gray at nxg.name>
+Release date: 2025 August 20
+Suggested directory: /macros/latex/contrib/showlabels
+Licence: LPPL v1.3c
+Home page: https://purl.org/nxg/dist/showlabels
+Repository: https://heptapod.host/nxg/showlabels
+
+Summary: Show label commands in the margin
+Description:
+
+ This package helps you keep track of all the labels you define, by
+ 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. The
+ only one for which this is obviously useful is the \cite command, but
+ it’s easy to do it for others, such as the \ref or \begin commands.
Property changes on: trunk/Master/texmf-dist/doc/latex/showlabels/README-ctan.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/doc/latex/showlabels/README.md
===================================================================
--- trunk/Master/texmf-dist/doc/latex/showlabels/README.md (rev 0)
+++ trunk/Master/texmf-dist/doc/latex/showlabels/README.md 2025-08-29 21:30:11 UTC (rev 76183)
@@ -0,0 +1,59 @@
+Showlabels
+==========
+
+Put the names of `\labels` and other commands into the margins of a draft document.
+
+Version 1.9.3, 2025 August 20;
+<https://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
+whenever either the `\label` command is used, or an equation is
+automatically numbered. It is compatible with the amsmath and hyperref
+packages.
+
+It is similar to, but does a little more than, the showkeys package.
+
+You invoke this package with the command `\usepackage{showlabels}` in the
+preamble. You can control 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.
+
+As well, you can have the arguments to other commands besides `\label`
+displayed. This is fairly obviously useful for the `\cite` command, but
+it can be useful for `\ref` or `\begin` as well.
+
+Links:
+
+ * Canonical software home page: <https://purl.org/nxg/dist/showlabels>
+ (_please use this URL_ rather than the URL it redirects to).
+
+ * On CTAN: <https://ctan.org/pkg/showlabels>
+
+ * The source code for the package is maintained
+ [at heptapod.host](https://heptapod.host/nxg/showlabels), where there is an issue tracker.
+ Or you can just mail me.
+
+This work is Copyright 1999, 2001-09, 2013-22, 2025, 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.
+
+For more information, see showlabels.html in the distribution.
+
+
+CTAN upload info
+----------------
+
+ * Name: showlabels
+ * Version: 1.9.3
+ * Maintainer: gray at 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://heptapod.host/nxg/showlabels/-/issues
+ * Repository: https://heptapod.host/nxg/showlabels
+
+Norman Gray
+https://nxg.me.uk
Property changes on: trunk/Master/texmf-dist/doc/latex/showlabels/README.md
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Deleted: trunk/Master/texmf-dist/doc/latex/showlabels/VERSION
===================================================================
--- trunk/Master/texmf-dist/doc/latex/showlabels/VERSION 2025-08-29 21:29:39 UTC (rev 76182)
+++ trunk/Master/texmf-dist/doc/latex/showlabels/VERSION 2025-08-29 21:30:11 UTC (rev 76183)
@@ -1 +0,0 @@
-1.9.2
Deleted: trunk/Master/texmf-dist/doc/latex/showlabels/lppl.txt
===================================================================
--- trunk/Master/texmf-dist/doc/latex/showlabels/lppl.txt 2025-08-29 21:29:39 UTC (rev 76182)
+++ trunk/Master/texmf-dist/doc/latex/showlabels/lppl.txt 2025-08-29 21:30:11 UTC (rev 76183)
@@ -1,416 +0,0 @@
-The LaTeX Project Public License
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
-LPPL Version 1.3c 2008-05-04
-
-Copyright 1999 2002-2008 LaTeX3 Project
- Everyone is allowed to distribute verbatim copies of this
- license document, but modification of it is not allowed.
-
-
-PREAMBLE
-========
-
-The LaTeX Project Public License (LPPL) is the primary license under
-which the LaTeX kernel and the base LaTeX packages are distributed.
-
-You may use this license for any work of which you hold the copyright
-and which you wish to distribute. This license may be particularly
-suitable if your work is TeX-related (such as a LaTeX package), but
-it is written in such a way that you can use it even if your work is
-unrelated to TeX.
-
-The section `WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE',
-below, gives instructions, examples, and recommendations for authors
-who are considering distributing their works under this license.
-
-This license gives conditions under which a work may be distributed
-and modified, as well as conditions under which modified versions of
-that work may be distributed.
-
-We, the LaTeX3 Project, believe that the conditions below give you
-the freedom to make and distribute modified versions of your work
-that conform with whatever technical specifications you wish while
-maintaining the availability, integrity, and reliability of
-that work. If you do not see how to achieve your goal while
-meeting these conditions, then read the document `cfgguide.tex'
-and `modguide.tex' in the base LaTeX distribution for suggestions.
-
-
-DEFINITIONS
-===========
-
-In this license document the following terms are used:
-
- `Work'
- Any work being distributed under this License.
-
- `Derived Work'
- Any work that under any applicable law is derived from the Work.
-
- `Modification'
- Any procedure that produces a Derived Work under any applicable
- law -- for example, the production of a file containing an
- original file associated with the Work or a significant portion of
- such a file, either verbatim or with modifications and/or
- translated into another language.
-
- `Modify'
- To apply any procedure that produces a Derived Work under any
- applicable law.
-
- `Distribution'
- Making copies of the Work available from one person to another, in
- whole or in part. Distribution includes (but is not limited to)
- making any electronic components of the Work accessible by
- file transfer protocols such as FTP or HTTP or by shared file
- systems such as Sun's Network File System (NFS).
-
- `Compiled Work'
- A version of the Work that has been processed into a form where it
- is directly usable on a computer system. This processing may
- include using installation facilities provided by the Work,
- transformations of the Work, copying of components of the Work, or
- other activities. Note that modification of any installation
- facilities provided by the Work constitutes modification of the Work.
-
- `Current Maintainer'
- A person or persons nominated as such within the Work. If there is
- no such explicit nomination then it is the `Copyright Holder' under
- any applicable law.
-
- `Base Interpreter'
- A program or process that is normally needed for running or
- interpreting a part or the whole of the Work.
-
- A Base Interpreter may depend on external components but these
- are not considered part of the Base Interpreter provided that each
- external component clearly identifies itself whenever it is used
- interactively. Unless explicitly specified when applying the
- license to the Work, the only applicable Base Interpreter is a
- `LaTeX-Format' or in the case of files belonging to the
- `LaTeX-format' a program implementing the `TeX language'.
-
-
-
-CONDITIONS ON DISTRIBUTION AND MODIFICATION
-===========================================
-
-1. Activities other than distribution and/or modification of the Work
-are not covered by this license; they are outside its scope. In
-particular, the act of running the Work is not restricted and no
-requirements are made concerning any offers of support for the Work.
-
-2. You may distribute a complete, unmodified copy of the Work as you
-received it. Distribution of only part of the Work is considered
-modification of the Work, and no right to distribute such a Derived
-Work may be assumed under the terms of this clause.
-
-3. You may distribute a Compiled Work that has been generated from a
-complete, unmodified copy of the Work as distributed under Clause 2
-above, as long as that Compiled Work is distributed in such a way that
-the recipients may install the Compiled Work on their system exactly
-as it would have been installed if they generated a Compiled Work
-directly from the Work.
-
-4. If you are the Current Maintainer of the Work, you may, without
-restriction, modify the Work, thus creating a Derived Work. You may
-also distribute the Derived Work without restriction, including
-Compiled Works generated from the Derived Work. Derived Works
-distributed in this manner by the Current Maintainer are considered to
-be updated versions of the Work.
-
-5. If you are not the Current Maintainer of the Work, you may modify
-your copy of the Work, thus creating a Derived Work based on the Work,
-and compile this Derived Work, thus creating a Compiled Work based on
-the Derived Work.
-
-6. If you are not the Current Maintainer of the Work, you may
-distribute a Derived Work provided the following conditions are met
-for every component of the Work unless that component clearly states
-in the copyright notice that it is exempt from that condition. Only
-the Current Maintainer is allowed to add such statements of exemption
-to a component of the Work.
-
- a. If a component of this Derived Work can be a direct replacement
- for a component of the Work when that component is used with the
- Base Interpreter, then, wherever this component of the Work
- identifies itself to the user when used interactively with that
- Base Interpreter, the replacement component of this Derived Work
- clearly and unambiguously identifies itself as a modified version
- of this component to the user when used interactively with that
- Base Interpreter.
-
- b. Every component of the Derived Work contains prominent notices
- detailing the nature of the changes to that component, or a
- prominent reference to another file that is distributed as part
- of the Derived Work and that contains a complete and accurate log
- of the changes.
-
- c. No information in the Derived Work implies that any persons,
- including (but not limited to) the authors of the original version
- of the Work, provide any support, including (but not limited to)
- the reporting and handling of errors, to recipients of the
- Derived Work unless those persons have stated explicitly that
- they do provide such support for the Derived Work.
-
- d. You distribute at least one of the following with the Derived Work:
-
- 1. A complete, unmodified copy of the Work;
- if your distribution of a modified component is made by
- offering access to copy the modified component from a
- designated place, then offering equivalent access to copy
- the Work from the same or some similar place meets this
- condition, even though third parties are not compelled to
- copy the Work along with the modified component;
-
- 2. Information that is sufficient to obtain a complete,
- unmodified copy of the Work.
-
-7. If you are not the Current Maintainer of the Work, you may
-distribute a Compiled Work generated from a Derived Work, as long as
-the Derived Work is distributed to all recipients of the Compiled
-Work, and as long as the conditions of Clause 6, above, are met with
-regard to the Derived Work.
-
-8. The conditions above are not intended to prohibit, and hence do not
-apply to, the modification, by any method, of any component so that it
-becomes identical to an updated version of that component of the Work as
-it is distributed by the Current Maintainer under Clause 4, above.
-
-9. Distribution of the Work or any Derived Work in an alternative
-format, where the Work or that Derived Work (in whole or in part) is
-then produced by applying some process to that format, does not relax or
-nullify any sections of this license as they pertain to the results of
-applying that process.
-
-10. a. A Derived Work may be distributed under a different license
- provided that license itself honors the conditions listed in
- Clause 6 above, in regard to the Work, though it does not have
- to honor the rest of the conditions in this license.
-
- b. If a Derived Work is distributed under a different license, that
- Derived Work must provide sufficient documentation as part of
- itself to allow each recipient of that Derived Work to honor the
- restrictions in Clause 6 above, concerning changes from the Work.
-
-11. This license places no restrictions on works that are unrelated to
-the Work, nor does this license place any restrictions on aggregating
-such works with the Work by any means.
-
-12. Nothing in this license is intended to, or may be used to, prevent
-complete compliance by all parties with all applicable laws.
-
-
-NO WARRANTY
-===========
-
-There is no warranty for the Work. Except when otherwise stated in
-writing, the Copyright Holder provides the Work `as is', without
-warranty of any kind, either expressed or implied, including, but not
-limited to, the implied warranties of merchantability and fitness for a
-particular purpose. The entire risk as to the quality and performance
-of the Work is with you. Should the Work prove defective, you assume
-the cost of all necessary servicing, repair, or correction.
-
-In no event unless required by applicable law or agreed to in writing
-will The Copyright Holder, or any author named in the components of the
-Work, or any other party who may distribute and/or modify the Work as
-permitted above, be liable to you for damages, including any general,
-special, incidental or consequential damages arising out of any use of
-the Work or out of inability to use the Work (including, but not limited
-to, loss of data, data being rendered inaccurate, or losses sustained by
-anyone as a result of any failure of the Work to operate with any other
-programs), even if the Copyright Holder or said author or said other
-party has been advised of the possibility of such damages.
-
-
-MAINTENANCE OF THE WORK
-=======================
-
-The Work has the status `author-maintained' if the Copyright Holder
-explicitly and prominently states near the primary copyright notice in
-the Work that the Work can only be maintained by the Copyright Holder
-or simply that it is `author-maintained'.
-
-The Work has the status `maintained' if there is a Current Maintainer
-who has indicated in the Work that they are willing to receive error
-reports for the Work (for example, by supplying a valid e-mail
-address). It is not required for the Current Maintainer to acknowledge
-or act upon these error reports.
-
-The Work changes from status `maintained' to `unmaintained' if there
-is no Current Maintainer, or the person stated to be Current
-Maintainer of the work cannot be reached through the indicated means
-of communication for a period of six months, and there are no other
-significant signs of active maintenance.
-
-You can become the Current Maintainer of the Work by agreement with
-any existing Current Maintainer to take over this role.
-
-If the Work is unmaintained, you can become the Current Maintainer of
-the Work through the following steps:
-
- 1. Make a reasonable attempt to trace the Current Maintainer (and
- the Copyright Holder, if the two differ) through the means of
- an Internet or similar search.
-
- 2. If this search is successful, then enquire whether the Work
- is still maintained.
-
- a. If it is being maintained, then ask the Current Maintainer
- to update their communication data within one month.
-
- b. If the search is unsuccessful or no action to resume active
- maintenance is taken by the Current Maintainer, then announce
- within the pertinent community your intention to take over
- maintenance. (If the Work is a LaTeX work, this could be
- done, for example, by posting to comp.text.tex.)
-
- 3a. If the Current Maintainer is reachable and agrees to pass
- maintenance of the Work to you, then this takes effect
- immediately upon announcement.
-
- b. If the Current Maintainer is not reachable and the Copyright
- Holder agrees that maintenance of the Work be passed to you,
- then this takes effect immediately upon announcement.
-
- 4. If you make an `intention announcement' as described in 2b. above
- and after three months your intention is challenged neither by
- the Current Maintainer nor by the Copyright Holder nor by other
- people, then you may arrange for the Work to be changed so as
- to name you as the (new) Current Maintainer.
-
- 5. If the previously unreachable Current Maintainer becomes
- reachable once more within three months of a change completed
- under the terms of 3b) or 4), then that Current Maintainer must
- become or remain the Current Maintainer upon request provided
- they then update their communication data within one month.
-
-A change in the Current Maintainer does not, of itself, alter the fact
-that the Work is distributed under the LPPL license.
-
-If you become the Current Maintainer of the Work, you should
-immediately provide, within the Work, a prominent and unambiguous
-statement of your status as Current Maintainer. You should also
-announce your new status to the same pertinent community as
-in 2b) above.
-
-
-WHETHER AND HOW TO DISTRIBUTE WORKS UNDER THIS LICENSE
-======================================================
-
-This section contains important instructions, examples, and
-recommendations for authors who are considering distributing their
-works under this license. These authors are addressed as `you' in
-this section.
-
-Choosing This License or Another License
-----------------------------------------
-
-If for any part of your work you want or need to use *distribution*
-conditions that differ significantly from those in this license, then
-do not refer to this license anywhere in your work but, instead,
-distribute your work under a different license. You may use the text
-of this license as a model for your own license, but your license
-should not refer to the LPPL or otherwise give the impression that
-your work is distributed under the LPPL.
-
-The document `modguide.tex' in the base LaTeX distribution explains
-the motivation behind the conditions of this license. It explains,
-for example, why distributing LaTeX under the GNU General Public
-License (GPL) was considered inappropriate. Even if your work is
-unrelated to LaTeX, the discussion in `modguide.tex' may still be
-relevant, and authors intending to distribute their works under any
-license are encouraged to read it.
-
-A Recommendation on Modification Without Distribution
------------------------------------------------------
-
-It is wise never to modify a component of the Work, even for your own
-personal use, without also meeting the above conditions for
-distributing the modified component. While you might intend that such
-modifications will never be distributed, often this will happen by
-accident -- you may forget that you have modified that component; or
-it may not occur to you when allowing others to access the modified
-version that you are thus distributing it and violating the conditions
-of this license in ways that could have legal implications and, worse,
-cause problems for the community. It is therefore usually in your
-best interest to keep your copy of the Work identical with the public
-one. Many works provide ways to control the behavior of that work
-without altering any of its licensed components.
-
-How to Use This License
------------------------
-
-To use this license, place in each of the components of your work both
-an explicit copyright notice including your name and the year the work
-was authored and/or last substantially modified. Include also a
-statement that the distribution and/or modification of that
-component is constrained by the conditions in this license.
-
-Here is an example of such a notice and statement:
-
- %% pig.dtx
- %% Copyright 2005 M. Y. Name
- %
- % 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
- % 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.
- %
- % This work has the LPPL maintenance status `maintained'.
- %
- % The Current Maintainer of this work is M. Y. Name.
- %
- % This work consists of the files pig.dtx and pig.ins
- % and the derived file pig.sty.
-
-Given such a notice and statement in a file, the conditions
-given in this license document would apply, with the `Work' referring
-to the three files `pig.dtx', `pig.ins', and `pig.sty' (the last being
-generated from `pig.dtx' using `pig.ins'), the `Base Interpreter'
-referring to any `LaTeX-Format', and both `Copyright Holder' and
-`Current Maintainer' referring to the person `M. Y. Name'.
-
-If you do not want the Maintenance section of LPPL to apply to your
-Work, change `maintained' above into `author-maintained'.
-However, we recommend that you use `maintained', as the Maintenance
-section was added in order to ensure that your Work remains useful to
-the community even when you can no longer maintain and support it
-yourself.
-
-Derived Works That Are Not Replacements
----------------------------------------
-
-Several clauses of the LPPL specify means to provide reliability and
-stability for the user community. They therefore concern themselves
-with the case that a Derived Work is intended to be used as a
-(compatible or incompatible) replacement of the original Work. If
-this is not the case (e.g., if a few lines of code are reused for a
-completely different task), then clauses 6b and 6d shall not apply.
-
-
-Important Recommendations
--------------------------
-
- Defining What Constitutes the Work
-
- The LPPL requires that distributions of the Work contain all the
- files of the Work. It is therefore important that you provide a
- way for the licensee to determine which files constitute the Work.
- This could, for example, be achieved by explicitly listing all the
- files of the Work near the copyright notice of each file or by
- using a line such as:
-
- % This work consists of all files listed in manifest.txt.
-
- in that place. In the absence of an unequivocal list it might be
- impossible for the licensee to determine what is considered by you
- to comprise the Work and, in such a case, the licensee would be
- entitled to make reasonable conjectures as to which files comprise
- the Work.
-
Modified: trunk/Master/texmf-dist/doc/latex/showlabels/showlabels.html
===================================================================
--- trunk/Master/texmf-dist/doc/latex/showlabels/showlabels.html 2025-08-29 21:29:39 UTC (rev 76182)
+++ trunk/Master/texmf-dist/doc/latex/showlabels/showlabels.html 2025-08-29 21:30:11 UTC (rev 76183)
@@ -6,6 +6,8 @@
<link href="https://nxg.me.uk" rev="author"/>
<!-- content of style file, to make this document standalone... -->
<style type='text/css'>
+/* Installed from repo: 2021-09-14T22:35:45+01:00, Hg:1d9954537983 */
+
body {
color: #333;
background: white;
@@ -12,7 +14,7 @@
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;
@@ -61,15 +63,32 @@
}
*/
-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) {
@@ -78,7 +97,7 @@
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%
@@ -89,6 +108,7 @@
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),
@@ -99,7 +119,7 @@
width: 350pt;
margin-left: auto; /* ...takes up the slack */
}
- div.topsidebar {
+ .topsidebar {
position: absolute;
width: 290pt; /* same 290pt as above */
left: auto;
@@ -107,6 +127,7 @@
padding-left: 0pt;
border: none;
}
+ /* .topsidebar li { text-align: center; } */
}
@@ -209,8 +230,8 @@
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;
}
@@ -288,8 +309,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 dc6d682fadbc, 2022-07-18T23:32:32+01:00 -->
-<p>Version 1.9.2, 2022 July 18,
+<!-- This is revision cbfafc628d39, 2025-08-18T18:37:19+01:00 -->
+<p>Version 1.9.3-rcbfafc628d39, 2025 August 18,
<a href='https://purl.org/nxg/dist/showlabels'
><code>https://purl.org/nxg/dist/showlabels</code></a>.</p>
</div>
@@ -337,11 +358,11 @@
<ol>
<li>Download the file
-<a href="showlabels-1.9.2.tar.gz"
- >showlabels-1.9.2.tar.gz</a>
+<a href="showlabels-1.9.3-rcbfafc628d39.tar.gz"
+ >showlabels-1.9.3-rcbfafc628d39.tar.gz</a>
or
-<a href="showlabels-1.9.2.zip"
- >showlabels-1.9.2.zip</a>
+<a href="showlabels-1.9.3-rcbfafc628d39.zip"
+ >showlabels-1.9.3-rcbfafc628d39.zip</a>
and unpack it.</li>
<li>Run LaTeX on the file <code>showlabels.ins</code> – this will
@@ -361,7 +382,7 @@
instead of the URL it redirects to.</li>
<li>On CTAN:
-<a href='https://www.ctan.org/pkg/showlabels'
+<a href='https://ctan.org/pkg/showlabels'
>macros/latex/contrib/showlabels</a></li>
<li>The source code for the package is maintained
@@ -376,7 +397,7 @@
</ul>
-<p>This work is Copyright 1999, 2001-09, 2013-22, Norman Gray, and may be distributed and/or modified under the
+<p>This work is Copyright 1999, 2001-09, 2013-22, 2025, 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>
@@ -384,7 +405,34 @@
<!-- @RELEASENOTES@ -->
<h:dl xmlns:h="http://www.w3.org/1999/xhtml">
- <h:dt><h:span class="attention">1.9.2, 2022 July 18</h:span></h:dt><h:dd>
+ <h:dt><h:span class="attention">1.9.3, 2025 August 20</h:span></h:dt><h:dd>
+ <p xmlns="http://www.w3.org/1999/xhtml">Feedback suggests the reported problems seems resolved in practice.
+ No changes from 1.9.3-b1, beyond some minor documentation and
+ bundling adjustments.</p>
+ </h:dd>
+
+ <h:dt>1.9.3-b1, 2025 August 10</h:dt><h:dd>
+ <ul xmlns="http://www.w3.org/1999/xhtml">
+ <li>Fixed an (invisible) duplication in the amsmath support.
+ Thanks to the discussion on a
+ <a href="https://github.com/latex3/latex2e/issues/118">LaTeX3 issue</a>
+ for the clue here.</li>
+ <li>Fix: handling of colours
+ (<a href="https://heptapod.host/nxg/showlabels/-/issues/3">issue 3</a>;
+ thanks to Aaron Montgomery for reporting).</li>
+ <li>Fix: when marking non-<code>\label</code> commands, if
+ these were found within non-display maths mode, then they didn't
+ appear as shown labels
+ (<a href="https://heptapod.host/nxg/showlabels/-/issues/4">issue 4</a>;
+ thanks to Mike Schroeder for reporting).</li>
+ <li>Fix: labels were being spuriously reported when using
+ amsmath's <code>\eqref</code> command
+ (<a href="https://heptapod.host/nxg/showlabels/-/issues/6">issue 6</a>;
+ thanks to Tamas Lakoba for reporting)</li>
+ </ul>
+ </h:dd>
+
+ <h:dt>1.9.2, 2022 July 18</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>
@@ -391,8 +439,8 @@
<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>
+ (<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
@@ -407,7 +455,7 @@
<code>\bibitem[P\'olya]{polya_54}</code> are now handled with the
correct catcodes.
Fixes <a href="https://heptapod.host/nxg/showlabels/-/issues/1">issue 1</a>
- (new sequencing for issues).
+ (<em>Note:</em> new sequencing for issues, after a repo change).
Thanks to Michael Levitin for the report here.</p>
</h:dd>
@@ -612,7 +660,7 @@
<div class="signature">
<a href="https://nxg.me.uk">Norman Gray</a><br/>
-2022 July 18
+2025 August 18
</div>
</body>
Deleted: trunk/Master/texmf-dist/doc/latex/showlabels/showlabels.pdf
===================================================================
(Binary files differ)
Deleted: trunk/Master/texmf-dist/doc/latex/showlabels/style.css
===================================================================
--- trunk/Master/texmf-dist/doc/latex/showlabels/style.css 2025-08-29 21:29:39 UTC (rev 76182)
+++ trunk/Master/texmf-dist/doc/latex/showlabels/style.css 2025-08-29 21:30:11 UTC (rev 76183)
@@ -1,289 +0,0 @@
-/* Installed from repo: 2022-07-12T17:44:22+01:00, Hg:4e5b8a899d61 */
-
-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 */
- at 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.
- at 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;
- }
- }
-}
-*/
-
-/* 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/ */
- at media screen and (min-width: 700pt) and (max-width: 850pt) {
- body {
- margin-left: 210pt;
- width: 350pt; /* 50% of 700pt */
- margin-right: auto;
- }
- .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;
- }
- /* .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),
- the left margin will be 210pt, the width 350pt, and the right margin therefore 290pt.*/
- at media screen and (min-width: 850pt) {
- body {
- margin-right: 290pt; /* 290 = 850-(210+350) */
- width: 350pt;
- margin-left: auto; /* ...takes up the slack */
- }
- .topsidebar {
- position: absolute;
- width: 290pt; /* same 290pt as above */
- left: auto;
- right: 0%;
- padding-left: 0pt;
- border: none;
- }
- /* .topsidebar li { text-align: center; } */
-}
-
-
-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%;
-}
-
-/* a span/div style for attracting attention */
-.attention {
- color: #822;
-}
-
-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-top: solid thin #666;
- padding-top: 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: "; ";
-}
Modified: trunk/Master/texmf-dist/source/latex/showlabels/showlabels.drv
===================================================================
--- trunk/Master/texmf-dist/source/latex/showlabels/showlabels.drv 2025-08-29 21:29:39 UTC (rev 76182)
+++ trunk/Master/texmf-dist/source/latex/showlabels/showlabels.drv 2025-08-29 21:30:11 UTC (rev 76183)
@@ -8,7 +8,7 @@
%% Showlabels: Style to display labels in the margin
%% This is the showlabels package
%%
-%%%% Copyright 1999, 2001-09, 2013-22, Norman Gray
+%%%% Copyright 1999, 2001-09, 2013-22, 2025, Norman Gray
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public Licence, either version 1.3c
@@ -26,7 +26,7 @@
%% and the derived file showlabels.sty.
%%%% File: showlabels.dtx
-%%%% Source: dc6d682fadbc, 2022-07-18T23:32:32+01:00
+%%%% Source: 66d69fa049ab, 2025-08-20T22:15:23+01:00
\documentclass{ltxdoc}
\EnableCrossrefs
Modified: trunk/Master/texmf-dist/source/latex/showlabels/showlabels.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/showlabels/showlabels.dtx 2025-08-29 21:29:39 UTC (rev 76182)
+++ trunk/Master/texmf-dist/source/latex/showlabels/showlabels.dtx 2025-08-29 21:30:11 UTC (rev 76183)
@@ -2,7 +2,7 @@
%
%% This is the showlabels package
%%
-%%%% Copyright 1999, 2001-09, 2013-22, Norman Gray
+%%%% Copyright 1999, 2001-09, 2013-22, 2025, 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: dc6d682fadbc, 2022-07-18T23:32:32+01:00
+%%%% Source: 66d69fa049ab, 2025-08-20T22:15:23+01:00
-% This is revision dc6d682fadbc, 2022-07-18T23:32:32+01:00.
+% This is revision 66d69fa049ab, 2025-08-20T22:15:23+01:00.
%<+package>\NeedsTeXFormat{LaTeX2e}
-%<+package>\ProvidesPackage{showlabels}[2022/07/18\space v1.9.2]
-%<+package>\typeout{Package: `showlabels' v1.9.2\space<2022/07/18>}
+%<+package>\ProvidesPackage{showlabels}[2025/08/20\space v1.9.3]
+%<+package>\typeout{Package: `showlabels' v1.9.3\space<2025/08/20>}
%
%<*driver>
\documentclass{ltxdoc}
@@ -64,7 +64,7 @@
%
% \title{The \texttt{showlabels} package}
% \author{Norman Gray\\https://nxg.me.uk}
-% \date{Version 1.9.2, 2022 July 18}
+% \date{Version 1.9.3, 2025 August 20}
%
% \maketitle
%
@@ -110,7 +110,9 @@
% option is given globally in the |\documentclass| declaration then this
% package does respect it. The \Lopt{draft} option does nothing, and therefore
% simply continues the default behaviour of this package; it is here
-% to partner the \Lopt{final} option.
+% to partner the \Lopt{final} option. Note that if any of the
+% packages in your document preamble are loaded with a \Lopt{final}
+% option, it will be set for all subsequent packages.
%
% \DescribeMacro{\showlabels}
% If you wish the package to do its magic with another command |\foo|
@@ -230,11 +232,7 @@
% 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
-% \Lpackage{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.}.
+% \Lpackage{amsmath} package.
%
% In version 1.3e, the package became compatible with the
% \Lpackage{hyperref} package in particular, and in general with other
@@ -281,7 +279,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-22 Norman Gray.
+% This software is copyright, 1999, 2001-09, 2013-22, 2025 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.
@@ -288,7 +286,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
+% \url{https://ctan.org/pkg/showlabels}. The source is in
% a repository online: \url{https://heptapod.host/nxg/showlabels}.
%
% \section{Other packages}
@@ -312,6 +310,7 @@
% A L Dukeman,
% Michael Friendly,
% Guillermo Garza,
+% Romano Giannetti,
% Tino G\"ortem\"oller,
% Lester L. Helms,
% Boris Kheyfets,
@@ -318,9 +317,11 @@
% Hagen Kleinert,
% David R. Leal Valmana,
% Olivier Michel,
+% Aaron Montgomery,
% Enno Nagel,
% Sungmo Park,
% Ignacy Sawicki,
+% Mike Schroeder,
% Andrei Shelankov,
% Patrick Sibille,
% `Stirling' (on Stackexchange),
@@ -348,9 +349,23 @@
% \fi
% \catcode`\~=12
% \iffalse @RELEASENOTES@ \fi
-% \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
+% \begin{description}\item[1.9.3, 2025 August 20]\relax Feedback suggests the reported problems seems resolved in practice.
+% No changes from 1.9.3-b1, beyond some minor documentation and
+% bundling adjustments.\par \item[1.9.3-b1, 2025 August 10]\relax \P\thinspace Fixed an (invisible) duplication in the amsmath support.
+% Thanks to the discussion on a
+% LaTeX3 issue\footnote{\url{https://github.com/latex3/latex2e/issues/118}}
+% for the clue here. \P\thinspace Fix: handling of colours
+% (issue 3\footnote{\url{https://heptapod.host/nxg/showlabels/-/issues/3}};
+% thanks to Aaron Montgomery for reporting). \P\thinspace Fix: when marking non-|\label| commands, if
+% these were found within non-display maths mode, then they didn't
+% appear as shown labels
+% (issue 4\footnote{\url{https://heptapod.host/nxg/showlabels/-/issues/4}};
+% thanks to Mike Schroeder for reporting). \P\thinspace Fix: labels were being spuriously reported when using
+% amsmath's |\eqref| command
+% (issue 6\footnote{\url{https://heptapod.host/nxg/showlabels/-/issues/6}};
+% thanks to Tamas Lakoba for reporting)\par\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}}.
@@ -358,7 +373,7 @@
% |\bibitem[P\'olya]{polya_54}| are now handled with the
% correct catcodes.
% Fixes issue 1\footnote{\url{https://heptapod.host/nxg/showlabels/-/issues/1}}
-% (new sequencing for issues).
+% (\emph{Note:} new sequencing for issues, after a repo change).
% 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
@@ -449,7 +464,7 @@
% changed the name to |showlabel.sty|.\par \item[Original, 1991 September 21]\relax The package was originally released by me on 1991 September 21, under the name
% |labels.sty|.\par \end{description}% \endgroup
%
-% \StopEventually{}
+% \MaybeStop
%
% \section{Implementation}
% \begin{macrocode}
@@ -467,10 +482,27 @@
% Original release of labels.sty
% \fi
%
-% Before we do anything else, find out if we're using \Lpackage{amsmath}\dots.
-% Note that, since these additions appeared, AMS-\LaTeX\ and the
-% \texttt{amstex} package seem to have been declared `obsolete'. This
-% package now claims conformance with the \texttt{amsmath} package.
+% The principle command is |\SL at wrap@labeller|, which monkeypatches a
+% command |\foo| by creating a command |\SL at origfoo| with the original
+% definition, and (re)defining |\foo| to call that original version,
+% while immediately including a call of a macro |\SL at set@text| which
+% sets the argument of |\foo| appropriately.
+%
+% Without \Lpackage{amsmath}, the only thing remaining is to ensure
+% (by default) a call |\SL at wrap@labeller{@eqnnum}|, to ensure that
+% this happens to equation labels, too.
+%
+% \emph{With} \Lpackage{amsmath}, however, things are more
+% complicated, since that package has an independent mechanism for
+% setting equation labels. Almost all of the relevant
+% \Lpackage{amsmath} code paths run through the command |\maketag@@@|,
+% enough that this is really the only macro we need to patch. Most of
+% the intricacy below comes from (i)~the slightly different sequence
+% of the commands when labelling an equation in \Lpackage{amsmath},
+% and (ii)~the fact that calls to |\maketag@@@| are not quite
+% restricted to this case.
+%
+% Before we do anything else, find out if we're using \Lpackage{amsmath}.
% \begin{macrocode}
\newif\ifSL at AMS
\@ifundefined{maketag@@@}
@@ -478,21 +510,28 @@
{\SL at AMStrue\typeout{with amsmath equation tags}}
% \end{macrocode}
%
-% The command which sets equation text is |\SL at eqntext|, which tests
+% \begin{macro}{\SL at set@text}
+% The command which sets equation text is |\SL at set@text|, which tests
% whether the content should be inline or not.
% \begin{macrocode}
-\def\SL at eqntext{%
+\def\SL at set@text{%
\ifSL at labelsinline
\let\@tempa\SL at interlinetextleft
\else
- \let\@tempa\SL at eqnlrtext
+ \let\@tempa\SL at set@lrtext
\fi
\@tempa
}
% \end{macrocode}
+% \end{macro}
%
+% \begin{macro}{\SL at wrap@labeller}
% The |\SL at wrap@labeller| macro wraps the given macro in such a way
% that we display the label.
+% |\SL at labelname| is initialised to |\relax|, redefined within the
+% |\label| macro, and reset to |\relax| after use here. If it's
+% already equal to |\relax| in this macro, the equation number hasn't
+% been labelled, and so we avoid putting anything in the margin.
% \begin{macrocode}
\def\SL at wrap@labeller#1{%
\expandafter\let\csname SL at orig@#1\expandafter\endcsname\csname #1\endcsname
@@ -501,20 +540,12 @@
\ifx\SL at labelname\relax
% do nothing
\else
- \SL at eqntext{\SL at labelname}%
+ \SL at set@text{\SL at labelname}%
\fi
\global\let\SL at labelname\relax}}
% \end{macrocode}
+% \end{macro}
%
-% \begin{macro}{\@eqnnum}
-% This replacement for |\@eqnnum| will produce a note, sticking
-% into the margin beside the equation number, showing the equation's label.
-% |\SL at labelname| is initialised to |\relax|, redefined within the
-% |\label| macro, and reset to |\relax| here. If it's already equal
-% to |\relax| here, the equation number hasn't been labelled, and so
-% we avoid putting anything in the margin. In the \Lpackage{amsmath} case
-% we instead redefine |\maketag@@@|.
-%
% First, deal with the case where the document uses the
% \Lpackage{amsmath} macros.
% \begin{macrocode}
@@ -521,16 +552,25 @@
\ifSL at AMS
% \end{macrocode}
%
+% \begin{macro}{\maketag@@@}
% \Lpackage{amsmath} redefines |\label| to set the macro |\df at label|,
% and then uses |\maketag@@@{\df at label}| or |\tagform@| to form tags
-% (ie, equation labels) in equations. So we hook into \emph{both} of
-% these macros. If the |\df at label| is
-% empty (almost certainly because the user has used the
-% \Lenv{eqnarray} environment within \Lpackage{amsmath}), then fall back
-% on the |\SL at labelname| contents instead.
+% (ie, equation labels) in equations. The command |\tagform@| wraps
+% |\maketag@@@|, so we needn't wrap both. Indeed, we \emph{mustn't}
+% wrap both, or else we duplicate any side-effects that happen in
+% there, such as typesetting the label! As discussed in a similar
+% bugreport for \Lpackage{showkeys}
+% (see \url{https://github.com/latex3/latex2e/issues/118} and test t/t21.tex),
+% monkeypatching both commands ends up double-setting the equation
+% label, which is invisible, but still wrong.
+%
+% If the |\df at label| is empty
+% (almost certainly because the user has used the
+% \Lenv{eqnarray} environment within \Lpackage{amsmath}),
+% then fall back on the |\SL at labelname| contents instead.
% \iffalse See tests t2, t11 and t18. \fi
% We must make sure to leave |\SL at labelname| equal to |\relax| at the
-% end of this macro, otherwise a |{eqnarray}| followed by an (AMSTeX)
+% end of this macro, otherwise a |{eqnarray}| followed by an (amsmath)
% |\eqref| can end up with the wrong label being referred to by the
% |\maketag@@@| within |\eqref| (or something like that).
%
@@ -539,20 +579,46 @@
% |\global\def\SL at labelname{\relax}| (as it once was), since the
% latter evaluates to true when |\SL at ...| is |\relax| \emph{and} when
% |\SL at ...| starts with two identical characters, which is wrong (it
-% took embarrassingly many goes to get this right). The following is
+% took embarrassingly many goes to get this right).
+%
+% The following is
% similar to the effect of |\SL at wrap@labeller|, but is not quite identical,
% because (a) |\maketag@@@| and |\tagform@| take an argument,
% and (b) we also have to check |\df at label|.
+%
+% This is happening \emph{before} we expand the |\label| that we have
+% patched. That means that, at the time the equation text is set in
+% |\SL at set@text|, we have not set the |\SL at fmt@| appropriately.
+% Therefore, as part of the general special-casing of
+% \Lpackage{amsmath} labels, we must do this explicitly here (see test t23).
+%
+% The final wrinkle here is that we must distinguish between this
+% being called when |\displaywidth| is 0pt, and when it is non-zero.
+% In the latter case, we are in a display, setting the equation
+% number. The former case occurs because \Lpackage{amsmath}'s
+% |\eqref| calls |\maketag@@@| via |\tagform@|, and if we don't detect
+% this (by detecting that this is being called outside a display) then
+% we get a spurious appearance of the printed label obscuring the text
+% (see tests t2 and t17, and heptapod issue \#6).
+%
+% The \Lpackage{amsmath} package includes support for the
+% \Lpackage{showkeys} package, by including hooks |\SK at ...| for a few
+% package functions. It might be reasonable, at some point, to
+% examine these more closely, and possibly start monkeypatching \emph{these}.
+% \begin{macro}{\SL at setlabel@ams}
% \begin{macrocode}
\def\SL at setlabel@ams{%
- \ifx\df at label\@empty
- \ifx\SL at labelname\relax
- % do nothing
+ \let\SL at fmt@\SL at fmt@label
+ \ifdim\displaywidth>0pt
+ \ifx\df at label\@empty
+ \ifx\SL at labelname\relax
+ % do nothing
+ \else
+ \SL at set@text{\SL at labelname}%
+ \fi
\else
- \SL at eqntext{\SL at labelname}%
+ \SL at set@text{\df at label}%
\fi
- \else
- \SL at eqntext{\df at label}%
\fi
\global\let\SL at labelname\relax
}
@@ -561,29 +627,17 @@
\SL at orig@maketag@@@{#1}%
\SL at setlabel@ams
}
- \let\SL at orig@tagform@\tagform@
- \def\SL at tagform@#1{%
- \SL at orig@tagform@{#1}%
- \SL at setlabel@ams
- }
-\else
% \end{macrocode}
+% \end{macro}
+% \end{macro}
%
+% \begin{macro}{\@eqnnum}
% Next, deal with the `normal' case, without \Lpackage{amsmath}.
% Package \Lpackage{amsmath} redefines |\@eqnnum| in terms of
-% |\maketag@@@|, so we should avoid doing this in the
+% |\maketag@@@|, so we should avoid touching this in the
% non-\Lpackage{amsmath} case.
% \begin{macrocode}
- %% \let\SL at eqnnum=\@eqnnum
- %% \def\@eqnnum{%
- %% \SL at eqnnum
- %% \ifx\SL at labelname\relax
- %% % do nothing
- %% \else
- %% \SL at eqntext{\SL at labelname}%
- %% \fi
- %% \global\let\SL at labelname\relax
- %% }
+\else
\SL at wrap@labeller{@eqnnum}
\fi
% \end{macrocode}
@@ -604,11 +658,13 @@
{\providecommand{\showlabelfont}{\small\ttfamily}}
% \end{macrocode}
%
+% \begin{macro}{\showlabelsetlabel}
% If you want slightly more general control over the labels, you can
% instead override |\showlabelsetlabel|.
% \begin{macrocode}
\providecommand{\showlabelsetlabel}[1]{{\normalfont\showlabelfont\SL at fmt@{#1}}}
% \end{macrocode}
+% \end{macro}
%
% For the benefit of |\SL at prlabelname|, define |\SL at gobblethree| to do nothing
% other than eat three tokens.
@@ -754,7 +810,7 @@
% open another group for |\showlabeltype|, then we'd have to close it
% \emph{after} |\SL at orig@@next|, where we risk colliding with whatever
% comes after it (and see above). It might be possible to be cleverer
-% about this, but it's at least harmeless to have the command defined
+% about this, but it's at least harmless to have the command defined
% globally.
% \begin{macrocode}
\DeclareRobustCommand\SL at showlabels[1]{%
@@ -819,22 +875,35 @@
% There are three cases here:
% \begin{enumerate}
% \item We are in maths mode, setting an equation.
+% We need to distinguish (1a) being in a display, when we \emph{assume}
+% we're processing a |\label|, and (1b) not, when we should act more like
+% case~3. Note that case 1a is somewhat heuristic, and will go
+% wrong if someone uses the |\showlabels{foo}| mechanism to show
+% some different command within a maths display.
% \item We are not in maths mode but we \emph{are} within a display
% (this can happen in, for example, the \Lenv{cases} environment from
% the \Lpackage{cases} package).
% \item We are in text.
% \end{enumerate}
+% There are two outcomes:
+% \begin{enumerate}
+% \item we print a label name alongside the equation number
+% (cases~1a and~2), or
+% \item we produce a zero-height box in the vertical list (cases~1b
+% and~3).
+% \end{enumerate}
%
% Case 1:
-% In maths mode, produce a label name alongside the equation number.
-% Save the label name in |\SL at labelname|, so we can use it later
-% (this is redundant in most \Lpackage{amsmath} contexts, because that
-% style generally saves this in |\df at label|, but sometimes -- for
-% example when using the traditional \Lenv{eqnarray} environment
-% within \Lpackage{amsart} -- |\df at label| can end up unset).
+% In maths mode, and \emph{if} we're in a display (case~1a), produce a
+% label name alongside the equation number; if we're not in a display
+% (case~1b), then act like case~3.
% \begin{macrocode}
\ifmmode
- \xdef\SL at labelname{\SL at prlabelname{#1}}%
+ \ifdim\displaywidth>0pt
+ \@tempswatrue
+ \else
+ \@tempswafalse
+ \fi
% \end{macrocode}
%
% Case 2:
@@ -847,10 +916,29 @@
% non-|\label| commands.
% \begin{macrocode}
\else\ifdim\displaywidth>0pt
- \xdef\SL at labelname{\SL at prlabelname{#1}}%
+ \@tempswatrue
% \end{macrocode}
%
% Case 3:
+% Otherwise, create an inter-line zero-height box.
+% \begin{macrocode}
+ \else
+ \@tempswafalse
+ \fi\fi
+% \end{macrocode}
+% Now, |\@tempswa| is true if we are to make a label, and false if
+% we're to include an interline box.
+%
+% True case first:
+% Save the label name in |\SL at labelname|, so we can use it later
+% (this is redundant in most \Lpackage{amsmath} contexts, because that
+% style generally saves this in |\df at label|, but sometimes -- for
+% example when using the traditional \Lenv{eqnarray} environment
+% within \Lpackage{amsart} -- |\df at label| can end up unset).
+% \begin{macrocode}
+ \if at tempswa
+ \xdef\SL at labelname{\SL at prlabelname{#1}}%
+% \end{macrocode}
% Otherwise, create a box with zero height and depth, and the same width
% as the page. Put all this in braces, to contain the setting of
% |\box\@tempboxa| (which probably shouldn't be necessary). The box
@@ -876,6 +964,9 @@
% case (it might be thought smart to use |\marginpar| here, and so
% avoid some of this nonsense, but that's not possible since this
% might be called within boxes, which |\marginpar| objects to).
+%
+% We don't always get the vertical spacing right here,
+% but that's perhaps a problem for another day.
% \begin{macrocode}
\ifvmode
\@tempdima=\prevdepth
@@ -884,10 +975,7 @@
\else
\vadjust{\box\@tempboxa\nobreak}%
\fi
-% \end{macrocode}
-% That's it. Finish off the sequence of cases.
-% \begin{macrocode}
- \fi\fi
+ \fi
}
% \end{macrocode}
% \end{macro}
@@ -897,9 +985,16 @@
% inline as much as possible, and avoids straying into the margins.
% We just use the same mechanism as for |\SL at margtext|, but do the
% inline-or-not testing there.
+%
+% If |\df at label| is non-empty, then we are setting an (AMS) equation
+% label, and the display of the label text has been done in
+% |\SL at setlabel@ams|, so we mustn't repeat it here.
+% \iffalse see test t17\fi
% \begin{macrocode}
\def\SL at inlinetext#1{%
- \SL at interlinetextright{\SL at prlabelname{#1}}%
+ \ifx\df at label\@empty
+ \SL at interlinetextright{\SL at prlabelname{#1}}%
+ \fi
}
% \end{macrocode}
% In vmode, put the label between lines. Set the box depth to zero to
@@ -1028,7 +1123,7 @@
% The case where the \Lopt{twocolumn} option is set is slightly different.
% There we have to switch between placing the note in the left and right
% margins, depending on whether we're setting the first or second column.
-% This macro, and |\SL at eqntwocoltext| below, uses the switch
+% This macro, and |\SL at set@twocoltext| below, uses the switch
% |\if at firstcolumn| to decide whether it's in the first or the second
% column of the text (I suppose it'll get terribly confused if we use
% \file{multicol.sty} along with this). This is defined and maintained in
@@ -1060,11 +1155,11 @@
% \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 at eqnrighttext}
-% \begin{macro}{\SL at eqnlefttext}
+% \begin{macro}{\SL at set@righttext}
+% \begin{macro}{\SL at set@lefttext}
% \begin{macrocode}
-\def\SL at eqnrighttext#1{\rlap{\quad\SL at margintext{#1}}}
-\def\SL at eqnlefttext #1{\hbox to 0pt{\kern -\columnwidth
+\def\SL at set@righttext#1{\rlap{\quad\SL at margintext{#1}}}
+\def\SL at set@lefttext #1{\hbox to 0pt{\kern -\columnwidth
\llap{\SL at margintext{#1}\quad}\hss}}
% \end{macrocode}
% \end{macro}
@@ -1071,14 +1166,14 @@
% \end{macro}
% Now do the analogues for the equation numbers, in the case of the
% alternate page selection\dots
-% \begin{macro}{\SL at eqnalternatetext}
+% \begin{macro}{\SL at set@alternatetext}
% \begin{macrocode}
-\def\SL at eqnalternatetext{%
+\def\SL at set@alternatetext{%
\SL at setLR
\ifSL at setleft
- \let\SL at next\SL at eqnlefttext
+ \let\SL at next\SL at set@lefttext
\else
- \let\SL at next\SL at eqnrighttext
+ \let\SL at next\SL at set@righttext
\fi
\SL at next
}
@@ -1085,13 +1180,13 @@
% \end{macrocode}
% \end{macro}
% \dots and the twocolumn option
-% \begin{macro}{\SL at eqntwocoltext}
+% \begin{macro}{\SL at set@twocoltext}
% \begin{macrocode}
-\def\SL at eqntwocoltext{%
+\def\SL at set@twocoltext{%
\if at firstcolumn
- \let\SL at next\SL at eqnlefttext
+ \let\SL at next\SL at set@lefttext
\else
- \let\SL at next\SL at eqnrighttext
+ \let\SL at next\SL at set@righttext
\fi
\SL at next}
% \end{macrocode}
@@ -1165,6 +1260,7 @@
% \begin{macrocode}
\def\showlabelsmarginal{\SL at labelsinlinefalse}
% \end{macrocode}
+% \end{macro}
% By default, we run |\showlabels{label}|. The option \Lopt{nolabel}
% turns this off.
% \begin{macrocode}
@@ -1198,39 +1294,39 @@
% \begin{macrocode}
\if at twocolumn
\let\SL at lrtext\SL at twocoltext
- \let\SL at eqnlrtext\SL at eqntwocoltext
+ \let\SL at set@lrtext\SL at set@twocoltext
\else
\ifcase\SL at labelposition
% 0=outer margin
\if at twoside
\let\SL at lrtext\SL at alternatetext
- \let\SL at eqnlrtext\SL at eqnalternatetext
+ \let\SL at set@lrtext\SL at set@alternatetext
\else
\let\SL at lrtext\SL at righttext
- \let\SL at eqnlrtext\SL at eqnrighttext
+ \let\SL at set@lrtext\SL at set@righttext
\fi
\or
% 1=inner margin
\if at twoside
\let\SL at lrtext\SL at alternatetext
- \let\SL at eqnlrtext\SL at eqnalternatetext
+ \let\SL at set@lrtext\SL at set@alternatetext
\else
\let\SL at lrtext\SL at lefttext
- \let\SL at eqnlrtext\SL at eqnlefttext
+ \let\SL at set@lrtext\SL at set@lefttext
\fi
\or
% 2=left margin
\let\SL at lrtext\SL at lefttext
- \let\SL at eqnlrtext\SL at eqnlefttext
+ \let\SL at set@lrtext\SL at set@lefttext
\or
% 3=right margin
\let\SL at lrtext\SL at righttext
- \let\SL at eqnlrtext\SL at eqnrighttext
+ \let\SL at set@lrtext\SL at set@righttext
\else
\SL at canthappen{Impossible labelposition \the\SL at labelposition}
\SL at labelposition=3 % put everything in the right-margin for now
\let\SL at lrtext\SL at righttext
- \let\SL at eqnlrtext\SL at eqnrighttext
+ \let\SL at set@lrtext\SL at set@righttext
\fi
\fi
% \end{macrocode}
@@ -1245,9 +1341,7 @@
\ifx\showlabels\@gobble
% do nothing -- we're in [final] mode (see test case t13)
\else
- \AtBeginDocument{%
- \let\maketag@@@\SL at maketag@@@
- \let\tagform@\SL at tagform@}
+ \AtBeginDocument{\let\maketag@@@\SL at maketag@@@}
\fi
\fi
\@ifundefined{theIEEEsubequationdis}\relax % and \theequationdis
Modified: trunk/Master/texmf-dist/tex/latex/showlabels/showlabels.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/showlabels/showlabels.sty 2025-08-29 21:29:39 UTC (rev 76182)
+++ trunk/Master/texmf-dist/tex/latex/showlabels/showlabels.sty 2025-08-29 21:30:11 UTC (rev 76183)
@@ -8,7 +8,7 @@
%% Showlabels: Style to display labels in the margin
%% This is the showlabels package
%%
-%%%% Copyright 1999, 2001-09, 2013-22, Norman Gray
+%%%% Copyright 1999, 2001-09, 2013-22, 2025, Norman Gray
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public Licence, either version 1.3c
@@ -26,20 +26,20 @@
%% and the derived file showlabels.sty.
%%%% File: showlabels.dtx
-%%%% Source: dc6d682fadbc, 2022-07-18T23:32:32+01:00
+%%%% Source: 66d69fa049ab, 2025-08-20T22:15:23+01:00
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{showlabels}[2022/07/18\space v1.9.2]
-\typeout{Package: `showlabels' v1.9.2\space<2022/07/18>}
+\ProvidesPackage{showlabels}[2025/08/20\space v1.9.3]
+\typeout{Package: `showlabels' v1.9.3\space<2025/08/20>}
\newif\ifSL at AMS
\@ifundefined{maketag@@@}
\SL at AMSfalse
{\SL at AMStrue\typeout{with amsmath equation tags}}
-\def\SL at eqntext{%
+\def\SL at set@text{%
\ifSL at labelsinline
\let\@tempa\SL at interlinetextleft
\else
- \let\@tempa\SL at eqnlrtext
+ \let\@tempa\SL at set@lrtext
\fi
\@tempa
}
@@ -50,19 +50,22 @@
\ifx\SL at labelname\relax
% do nothing
\else
- \SL at eqntext{\SL at labelname}%
+ \SL at set@text{\SL at labelname}%
\fi
\global\let\SL at labelname\relax}}
\ifSL at AMS
\def\SL at setlabel@ams{%
- \ifx\df at label\@empty
- \ifx\SL at labelname\relax
- % do nothing
+ \let\SL at fmt@\SL at fmt@label
+ \ifdim\displaywidth>0pt
+ \ifx\df at label\@empty
+ \ifx\SL at labelname\relax
+ % do nothing
+ \else
+ \SL at set@text{\SL at labelname}%
+ \fi
\else
- \SL at eqntext{\SL at labelname}%
+ \SL at set@text{\df at label}%
\fi
- \else
- \SL at eqntext{\df at label}%
\fi
\global\let\SL at labelname\relax
}
@@ -71,22 +74,7 @@
\SL at orig@maketag@@@{#1}%
\SL at setlabel@ams
}
- \let\SL at orig@tagform@\tagform@
- \def\SL at tagform@#1{%
- \SL at orig@tagform@{#1}%
- \SL at setlabel@ams
- }
\else
- %% \let\SL at eqnnum=\@eqnnum
- %% \def\@eqnnum{%
- %% \SL at eqnnum
- %% \ifx\SL at labelname\relax
- %% % do nothing
- %% \else
- %% \SL at eqntext{\SL at labelname}%
- %% \fi
- %% \global\let\SL at labelname\relax
- %% }
\SL at wrap@labeller{@eqnnum}
\fi
\global\let\SL at labelname\relax
@@ -152,8 +140,17 @@
\AtBeginDocument{\SL at initmakecaption}
\def\SL at margtext#1{%
\ifmmode
- \xdef\SL at labelname{\SL at prlabelname{#1}}%
+ \ifdim\displaywidth>0pt
+ \@tempswatrue
+ \else
+ \@tempswafalse
+ \fi
\else\ifdim\displaywidth>0pt
+ \@tempswatrue
+ \else
+ \@tempswafalse
+ \fi\fi
+ \if at tempswa
\xdef\SL at labelname{\SL at prlabelname{#1}}%
\else
\setbox\@tempboxa=\vbox to 0pt{%
@@ -167,10 +164,12 @@
\else
\vadjust{\box\@tempboxa\nobreak}%
\fi
- \fi\fi
+ \fi
}
\def\SL at inlinetext#1{%
- \SL at interlinetextright{\SL at prlabelname{#1}}%
+ \ifx\df at label\@empty
+ \SL at interlinetextright{\SL at prlabelname{#1}}%
+ \fi
}
\def\SL at interlinetextleft{\SL at setlefttrue\SL at interlinetext}
\def\SL at interlinetextright{\SL at setleftfalse\SL at interlinetext}
@@ -247,23 +246,23 @@
\let\SL at next\SL at righttext
\fi
\SL at next}
-\def\SL at eqnrighttext#1{\rlap{\quad\SL at margintext{#1}}}
-\def\SL at eqnlefttext #1{\hbox to 0pt{\kern -\columnwidth
+\def\SL at set@righttext#1{\rlap{\quad\SL at margintext{#1}}}
+\def\SL at set@lefttext #1{\hbox to 0pt{\kern -\columnwidth
\llap{\SL at margintext{#1}\quad}\hss}}
-\def\SL at eqnalternatetext{%
+\def\SL at set@alternatetext{%
\SL at setLR
\ifSL at setleft
- \let\SL at next\SL at eqnlefttext
+ \let\SL at next\SL at set@lefttext
\else
- \let\SL at next\SL at eqnrighttext
+ \let\SL at next\SL at set@righttext
\fi
\SL at next
}
-\def\SL at eqntwocoltext{%
+\def\SL at set@twocoltext{%
\if at firstcolumn
- \let\SL at next\SL at eqnlefttext
+ \let\SL at next\SL at set@lefttext
\else
- \let\SL at next\SL at eqnrighttext
+ \let\SL at next\SL at set@righttext
\fi
\SL at next}
\def\SL at canthappen#1{%
@@ -301,39 +300,39 @@
\ProcessOptions
\if at twocolumn
\let\SL at lrtext\SL at twocoltext
- \let\SL at eqnlrtext\SL at eqntwocoltext
+ \let\SL at set@lrtext\SL at set@twocoltext
\else
\ifcase\SL at labelposition
% 0=outer margin
\if at twoside
\let\SL at lrtext\SL at alternatetext
- \let\SL at eqnlrtext\SL at eqnalternatetext
+ \let\SL at set@lrtext\SL at set@alternatetext
\else
\let\SL at lrtext\SL at righttext
- \let\SL at eqnlrtext\SL at eqnrighttext
+ \let\SL at set@lrtext\SL at set@righttext
\fi
\or
% 1=inner margin
\if at twoside
\let\SL at lrtext\SL at alternatetext
- \let\SL at eqnlrtext\SL at eqnalternatetext
+ \let\SL at set@lrtext\SL at set@alternatetext
\else
\let\SL at lrtext\SL at lefttext
- \let\SL at eqnlrtext\SL at eqnlefttext
+ \let\SL at set@lrtext\SL at set@lefttext
\fi
\or
% 2=left margin
\let\SL at lrtext\SL at lefttext
- \let\SL at eqnlrtext\SL at eqnlefttext
+ \let\SL at set@lrtext\SL at set@lefttext
\or
% 3=right margin
\let\SL at lrtext\SL at righttext
- \let\SL at eqnlrtext\SL at eqnrighttext
+ \let\SL at set@lrtext\SL at set@righttext
\else
\SL at canthappen{Impossible labelposition \the\SL at labelposition}
\SL at labelposition=3 % put everything in the right-margin for now
\let\SL at lrtext\SL at righttext
- \let\SL at eqnlrtext\SL at eqnrighttext
+ \let\SL at set@lrtext\SL at set@righttext
\fi
\fi
\ifSL at labellabel
@@ -342,9 +341,7 @@
\ifx\showlabels\@gobble
% do nothing -- we're in [final] mode (see test case t13)
\else
- \AtBeginDocument{%
- \let\maketag@@@\SL at maketag@@@
- \let\tagform@\SL at tagform@}
+ \AtBeginDocument{\let\maketag@@@\SL at maketag@@@}
\fi
\fi
\@ifundefined{theIEEEsubequationdis}\relax % and \theequationdis
More information about the tex-live-commits
mailing list.