Merge branch 'master' into error-option

Author: oetiker

acronym.dtx

@@ -2,7 +2,7 @@
 %
 % Doc-Source file to use with LaTeX2e
 %
-% Copyright 1994-2024 by Tobias Oetiker ([email protected]) and many Contributors.
+% Copyright 1994-2025 by Tobias Oetiker ([email protected]) and many Contributors.
 % All rights reserved.
 %
 % This work may be distributed and/or modified under the conditions of
@@ -82,7 +82,7 @@
 % \DoNotIndex{\textbf, \textsf, \textsmaller, \textsuperscript, \the}
 % \DoNotIndex{\usepackage}
 %
-%  \changes{v1.50}{2024/09/26}{Theo von Arx adds the option 'error' to throw errors upon undefined acronyms}
+%  \changes{v1.50}{2025/01/16}{Theo von Arx adds the option 'error' to throw errors upon undefined acronyms, Tobi integrates patches for issue/60 ltx and amsmath}
 %  \changes{v1.49}{2024/03/30}{Chris Landis adds noforwardlinks option and fixes targets for forward links to acs/acl/etc.-only use}
 %  \changes{v1.48}{2021/10/09}{Bruno Le Floch corrected capitalization of acronyms with a custom plural form.}
 %  \changes{v1.47}{2020/04/10}{Tobi Oetiker and Marcus Meeßen \cmd{hskip} Fixed several bugs in macros that use capitalisation, a bug were the output depends on the position of the list of acronyms, and a bug were nested hyperlinks could cause errors.}
@@ -603,6 +603,7 @@
 %<*acrotest>
 \documentclass{article}
 \usepackage[colorlinks]{hyperref}
+\usepackage{amsmath}
 \usepackage[printonlyused,withpage]{acronym}
 \begin{document}
 
@@ -637,7 +638,7 @@ ring, a pyridine derivate.
 One mol consists of \acs{NA} atoms or molecules. There is a relation
 between the constant of Boltzmann and the \acl{NA}:
 \begin{equation}
-  k = R/\acs{NA}
+  k = R/\acs{NA}\label{my:eq}
 \end{equation}
 
 \acl{lox}/\acl{lh2} (\acsu{lox}/\acsu{lh2})
@@ -646,7 +647,7 @@ between the constant of Boltzmann and the \acl{NA}:
 and final states are different. An example for \iac{LFVP} is
 neutrinoless double beta decay.
 
-\subsection{Some testing fundamentals}
+\subsection{Some testing \acp{IC} fundamentals}
 When testing \acp{IC}, one typically wants to identify functional
 blocks to be tested separately. The latter are commonly indicated as
 \acp{BUT}. To test a \ac{BUT} requires defining a testing strategy\dots{}
@@ -694,8 +695,8 @@ blocks to be tested separately. The latter are commonly indicated as
 %    First we test that we got the right format and name the package.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{acronym}[2024/03/30
-                          v1.49
+\ProvidesPackage{acronym}[2025/01/17
+                          v1.50
                           Support for acronyms (Tobias Oetiker)]
 \RequirePackage{suffix,xstring}
 %    \end{macrocode}
@@ -1643,17 +1644,21 @@ blocks to be tested separately. The latter are commonly indicated as
 %
 %    \subsection{Helper functions to unset labels}
 %
-%    \begin{macro}{\@verridelabel} The internal \cmd{\@verridelabel}
+%    \begin{macro}{\AC@verridelabel} The internal \cmd{\AC@verridelabel}
 %    command lets us 'redefine' an acronym label such that the page
 %    reference in the acronym list points where it should be pointing and
 %    not just to the very first occurrence of the acronym, where it may not
-%    even be expanded. (code by Ulrich Diez)
+%    even be expanded. (code by Ulrich Diez).
 %
 %    \begin{macrocode}
-\newcommand*\@verridelabel[1]{%
+\newcommand*\AC@verridelabel[1]{%
   \@bsphack
   \protected@write\@auxout{}{\string\AC@undonewlabel{#1}}%
-  \label{#1}%
+  \ifdefined\ltx@label%
+    \ltx@label{#1}%
+  \else%
+    \label{#1}%
+  \fi%
   \AC@overriddenmessage rs{#1}%
   \@esphack
 }%
@@ -1719,13 +1724,13 @@ blocks to be tested separately. The latter are commonly indicated as
 \newcommand*\AC@placelabel@part[1]{%
   \expandafter\ifx\csname AC@\AC@prefix#1\endcsname\AC@used
   \else
-    {\AC@phantomsection\@verridelabel{acro:#1}}%
+    \texorpdfstring{\AC@phantomsection\AC@verridelabel{acro:#1}}{}%
   \fi
 }%
 \newcommand*\AC@placelabel[1]{%
   \expandafter\ifx\csname AC@\AC@prefix#1\endcsname\AC@used
   \else
-    {\AC@phantomsection\@verridelabel{acro:#1}}%
+    {\AC@phantomsection\AC@verridelabel{acro:#1}}%
     \ifAC@starred\else%
     \global\expandafter\let\csname AC@\AC@prefix#1\endcsname\AC@used
     \fi%