acronym (13mar20)

git-svn-id: svn://tug.org/texlive/trunk@54281 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 31 insertions, 13 deletions

diff --git a/Master/texmf-dist/doc/latex/acronym/CHANGES b/Master/texmf-dist/doc/latex/acronym/CHANGES
index a986a417f97..13914c24e79 100644
--- a/Master/texmf-dist/doc/latex/acronym/CHANGES
+++ b/Master/texmf-dist/doc/latex/acronym/CHANGES
@@ -1,7 +1,16 @@
+Version 1.46 (Mar 2020)
 
+- Fix merge error
+
+Version 1.45 (Mar 2020)
+
+-  Fixed hyperref and "missing aux" regressions
+-- Marcus Meeßen
+ 
 Version 1.44 (Feb 2020)
 
 - added the |printonlyreused| option, which allows to automatically exclude acronyms from the list of acronyms if they are used only once
+-- Marcus Meeßen
 
 Version 1.43 (Feb 2020)
 
diff --git a/Master/texmf-dist/doc/latex/acronym/README b/Master/texmf-dist/doc/latex/acronym/README
index 92bc92d41bf..bd6e3debaf9 100644
--- a/Master/texmf-dist/doc/latex/acronym/README
+++ b/Master/texmf-dist/doc/latex/acronym/README
@@ -21,3 +21,10 @@ Files of the `acronym' package:
   acronym.ins		Installation script generating the source and an example
   acronym.pdf		PDF Version of the Docs
   CHANGES               list of changes
+
+If you run into trouble or would like to contribute, please use
+
+https://github.com/oetiker/acronym/
+
+cheers
+tobi
diff --git a/Master/texmf-dist/doc/latex/acronym/acronym.pdf b/Master/texmf-dist/doc/latex/acronym/acronym.pdf
index 4d042bc7425..411480df9f2 100644
--- a/Master/texmf-dist/doc/latex/acronym/acronym.pdf
+++ b/Master/texmf-dist/doc/latex/acronym/acronym.pdf
diff --git a/Master/texmf-dist/source/latex/acronym/acronym.dtx b/Master/texmf-dist/source/latex/acronym/acronym.dtx
index c64031f7cc4..31211759a80 100644
--- a/Master/texmf-dist/source/latex/acronym/acronym.dtx
+++ b/Master/texmf-dist/source/latex/acronym/acronym.dtx
@@ -35,7 +35,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{1518}
+% \CheckSum{1522}
 %
 %% \CharacterTable
 %%  {Upper-case    \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -82,6 +82,8 @@
 % \DoNotIndex{\textbf, \textsf, \textsmaller, \textsuperscript, \the}
 % \DoNotIndex{\usepackage}
 %
+%  \changes{v1.46}{2020/03/13}{Tobi Oetiker \cmd{hskip} Fixed miss merge}
+%  \changes{v1.45}{2020/03/13}{Marcus Meeßen \cmd{hskip} Fixed hyperref and "missing aux" regressions.}
 %  \changes{v1.44}{2020/02/07}{Marcus Meeßen \cmd{hskip} Added the |printonlyreused| option, which allows to automatically exclude acronyms from the list of acronyms if they are used only once}
 %  \changes{v1.43}{2020/02/05}{Marcus Meeßen \cmd{hskip} Fixed unconventional dots spacing in list of acronyms, enhanced list of acronyms with hyperrefs, and fixed collisions between acronyms and package commands, which can be turned of with the |noacroprefix| option}
 %  \changes{v1.42}{2019/11/11}{Philippe Chauvat \cmd{hskip} Fix the carriage return with long lines, Tobi Oetiker and Horst Schirmeier fixed usedflag and page number entries for acfi and Acfi}
@@ -677,8 +679,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}[2020/02/07
-                          v1.44
+\ProvidesPackage{acronym}[2020/03/13
+                          v1.46
                           Support for acronyms (Tobias Oetiker)]
 \RequirePackage{suffix,xstring}
 %    \end{macrocode}
@@ -1254,14 +1256,14 @@ blocks to be tested separately. The latter are commonly indicated as
     \ifAC@printonlyused 1%
     \else\ifAC@printonlyreused 1%
     \else 0\fi\fi%
-  =1%
+  =1\relax%
     \ifnum%
       \ifAC@printonlyused%
         \expandafter\ifx\csname acused@#1@once\endcsname\AC@used 1 \else 0 \fi%
       \else\ifAC@printonlyreused%
         \expandafter\ifx\csname acused@#1@twice\endcsname\AC@used 1 \else 0 \fi%
       \else 0 \fi\fi%
-    =1%
+    =1\relax%
       \item[\protect\AC@hypertarget{#1}{%
         \AC@hyperref[acro:#1]{\aclabelfont{#2}\hfill}%
       }]\AC@hyperref[acro:#1]{#3}%
@@ -1436,7 +1438,7 @@ blocks to be tested separately. The latter are commonly indicated as
   \fi
 }
 \newcommand*\AC@Aclp[1]{%
-  \@firstupper{\AC@aclp{#1}}%
+  \@firstupper\expandafter{\AC@aclp{#1}}%
 }
 \newcommand*\AC@acsp[1]{%
   \ifcsname fn@#1@PS\endcsname
@@ -1498,7 +1500,7 @@ blocks to be tested separately. The latter are commonly indicated as
 %    \end{macrocode}
 %    \begin{macrocode}
 \newcommand*\AC@Acl[1]{%
-   \@firstupper{\AC@acl{#1}}%
+   \@firstupper\expandafter{\AC@acl{#1}}%
 }
 %    \end{macrocode}
 %    \end{macro}
diff --git a/Master/texmf-dist/tex/latex/acronym/acronym.sty b/Master/texmf-dist/tex/latex/acronym/acronym.sty
index ebd2a86d946..134d97500b6 100644
--- a/Master/texmf-dist/tex/latex/acronym/acronym.sty
+++ b/Master/texmf-dist/tex/latex/acronym/acronym.sty
@@ -40,8 +40,8 @@
 %%
 %%
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{acronym}[2020/02/07
-                          v1.44
+\ProvidesPackage{acronym}[2020/03/13
+                          v1.46
                           Support for acronyms (Tobias Oetiker)]
 \RequirePackage{suffix,xstring}
 \newif\ifAC@footnote
@@ -283,14 +283,14 @@
     \ifAC@printonlyused 1%
     \else\ifAC@printonlyreused 1%
     \else 0\fi\fi%
-  =1%
+  =1\relax%
     \ifnum%
       \ifAC@printonlyused%
         \expandafter\ifx\csname acused@#1@once\endcsname\AC@used 1 \else 0 \fi%
       \else\ifAC@printonlyreused%
         \expandafter\ifx\csname acused@#1@twice\endcsname\AC@used 1 \else 0 \fi%
       \else 0 \fi\fi%
-    =1%
+    =1\relax%
       \item[\protect\AC@hypertarget{#1}{%
         \AC@hyperref[acro:#1]{\aclabelfont{#2}\hfill}%
       }]\AC@hyperref[acro:#1]{#3}%
@@ -399,7 +399,7 @@
   \fi
 }
 \newcommand*\AC@Aclp[1]{%
-  \@firstupper{\AC@aclp{#1}}%
+  \@firstupper\expandafter{\AC@aclp{#1}}%
 }
 \newcommand*\AC@acsp[1]{%
   \ifcsname fn@#1@PS\endcsname
@@ -421,7 +421,7 @@
 \newcommand*\AC@acl[1]{%
    \expandafter\AC@get\csname fn@#1\endcsname\@secondoftwo{#1}}
 \newcommand*\AC@Acl[1]{%
-   \@firstupper{\AC@acl{#1}}%
+   \@firstupper\expandafter{\AC@acl{#1}}%
 }
 \newcommand*{\acs}{\AC@starredfalse\protect\acsa}%
 \WithSuffix\newcommand\acs*{\AC@starredtrue\protect\acsa}%