texlive[54651] Master/texmf-dist: acronym (11apr20)
commits+karl at tug.org
commits+karl at tug.org
Sun Apr 12 00:20:38 CEST 2020
Revision: 54651
http://tug.org/svn/texlive?view=revision&revision=54651
Author: karl
Date: 2020-04-12 00:20:38 +0200 (Sun, 12 Apr 2020)
Log Message:
-----------
acronym (11apr20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/acronym/CHANGES
trunk/Master/texmf-dist/doc/latex/acronym/README
trunk/Master/texmf-dist/doc/latex/acronym/acronym.pdf
trunk/Master/texmf-dist/doc/latex/acronym/acrotest.tex
trunk/Master/texmf-dist/source/latex/acronym/acronym.dtx
trunk/Master/texmf-dist/tex/latex/acronym/acronym.sty
Modified: trunk/Master/texmf-dist/doc/latex/acronym/CHANGES
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acronym/CHANGES 2020-04-11 21:25:25 UTC (rev 54650)
+++ trunk/Master/texmf-dist/doc/latex/acronym/CHANGES 2020-04-11 22:20:38 UTC (rev 54651)
@@ -1,3 +1,14 @@
+Version 1.47 (Apr 2020)
+
+- Fixed \Iac macro expansion bug
+-- Tobias Oetiker
+- Fixed regression in commands for capitalisation
+-- Marcus Meeßen
+- Fixed bug were output depends on the position of the list of acronyms
+-- Marcus Meeßen
+- Fixed \Iac hyperlink nesting
+-- Marcus Meeßen
+
Version 1.46 (Mar 2020)
- Fix merge error
@@ -4,7 +15,7 @@
Version 1.45 (Mar 2020)
-- Fixed hyperref and "missing aux" regressions
+- Fixed hyperref regression and the longstanding "missing aux" bug.
-- Marcus Meeßen
Version 1.44 (Feb 2020)
Modified: trunk/Master/texmf-dist/doc/latex/acronym/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acronym/README 2020-04-11 21:25:25 UTC (rev 54650)
+++ trunk/Master/texmf-dist/doc/latex/acronym/README 2020-04-11 22:20:38 UTC (rev 54651)
@@ -16,11 +16,11 @@
CTAN:macros/latex/contrib/bigfoot/
Files of the `acronym' package:
- README This file
- acronym.dtx Sourcecode, example file & documentation
- acronym.ins Installation script generating the source and an example
- acronym.pdf PDF Version of the Docs
- CHANGES list of changes
+ README This file
+ acronym.dtx Sourcecode, example file & documentation
+ 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
Modified: trunk/Master/texmf-dist/doc/latex/acronym/acronym.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acronym/acrotest.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acronym/acrotest.tex 2020-04-11 21:25:25 UTC (rev 54650)
+++ trunk/Master/texmf-dist/doc/latex/acronym/acrotest.tex 2020-04-11 22:20:38 UTC (rev 54651)
@@ -71,7 +71,8 @@
\subsection{Some testing 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
+\acp{BUT}. To test a \ac{BUT} requires defining a testing strategy\dots{}
+\Iac{IC} popped up unexpectedly.
\section{Acronyms}
\begin{acronym}[TDMA]
@@ -90,6 +91,7 @@
\acro{IC}{Integrated Circuit}%
\acro{BUT}{Block Under Test}%
\acrodefplural{BUT}{Blocks Under Test}%
+ \acroindefinite{IC}{an}{an}
\end{acronym}
\end{document}
Modified: trunk/Master/texmf-dist/source/latex/acronym/acronym.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/acronym/acronym.dtx 2020-04-11 21:25:25 UTC (rev 54650)
+++ trunk/Master/texmf-dist/source/latex/acronym/acronym.dtx 2020-04-11 22:20:38 UTC (rev 54651)
@@ -35,7 +35,7 @@
%</driver>
% \fi
%
-% \CheckSum{1522}
+% \CheckSum{1526}
%
%% \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,7 @@
% \DoNotIndex{\textbf, \textsf, \textsmaller, \textsuperscript, \the}
% \DoNotIndex{\usepackage}
%
+% \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.}
% \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}
@@ -636,7 +637,8 @@
\subsection{Some testing 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
+\acp{BUT}. To test a \ac{BUT} requires defining a testing strategy\dots{}
+\Iac{IC} popped up unexpectedly.
\section{Acronyms}
\begin{acronym}[TDMA]
@@ -655,6 +657,7 @@
\acro{IC}{Integrated Circuit}%
\acro{BUT}{Block Under Test}%
\acrodefplural{BUT}{Blocks Under Test}%
+ \acroindefinite{IC}{an}{an}
\end{acronym}
\end{document}
@@ -679,8 +682,8 @@
% First we test that we got the right format and name the package.
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{acronym}[2020/03/13
- v1.46
+\ProvidesPackage{acronym}[2020/04/17
+ v1.47
Support for acronyms (Tobias Oetiker)]
\RequirePackage{suffix,xstring}
% \end{macrocode}
@@ -1039,7 +1042,6 @@
% acronyms is in the front matter of the document.
% \begin{macrocode}
\newcommand*{\AC at logged}[1]{%
- \acronymused{#1}% mark it as used in the current run too
\@bsphack
\protected at write\@auxout{}{\string\acronymused{#1}}%
\@esphack}
@@ -1080,9 +1082,8 @@
% Internal commands for making a first letter upper case.
% \begin{macrocode}
\newcommand{\@firstupper}[1]{%
- \StrLeft{#1}{1}[\firstletter]%
- \StrGobbleLeft{#1}{1}[\remainder]%
- \MakeUppercase\firstletter\remainder%
+ \StrSplit{#1}{1}{\head}{\tail}%
+ \MakeUppercase\head\tail%
}
% \end{macrocode}
% \end{macro}
@@ -1340,7 +1341,7 @@
\newcommand\AC at acroindefinite[3]{
\@bsphack
\protected at write\@auxout{}%
- {\string\newacroindefinite{#1}{\string\AC at hyperlink{#1}{#2}}{#3}}%
+ {\string\newacroindefinite{#1}{#2}{#3}}%
\@esphack
}
% \end{macrocode}
@@ -1438,7 +1439,9 @@
\fi
}
\newcommand*\AC at Aclp[1]{%
- \@firstupper\expandafter{\AC at aclp{#1}}%
+ \AC at uppertrue%
+ \AC at aclp{#1}%
+ \AC at upperfalse%
}
\newcommand*\AC at acsp[1]{%
\ifcsname fn@#1 at PS\endcsname
@@ -1465,6 +1468,16 @@
% \end{macrocode}
% \end{macro}
%
+% \begin{macro}{\ifAC at upper}
+% If an acronym needs to be capitalized, this flag is used to indicate
+% this at an appropriate point in the code. In that case, the firstupper
+% command will be called at a time when the acronym is expandable, otherwise
+% the xstring command will not work properly.
+% \begin{macrocode}
+\newif\ifAC at upper
+% \end{macrocode}
+% \end{macro}
+%
% \begin{macro}{\AC at get}
% If the acronym is undefined, the internal macro \cmd{\AC at get}
% warns the user by printing the name in bold with an exclamation
@@ -1475,12 +1488,17 @@
% saved in \fnacro.
% \begin{macrocode}
\newcommand*\AC at get[3]{%
- \ifx#1\relax
- \PackageWarning{acronym}{Acronym `#3' is not defined}%
- \textbf{#3!}%
+ \ifx#1\relax
+ \PackageWarning{acronym}{Acronym `#3' is not defined}%
+ \textbf{#3!}%
+ \else
+ \ifAC at upper
+ \@firstupper{\expandafter#2#1}%
\else
- \expandafter#2#1%
- \fi}
+ \expandafter#2#1%
+ \fi
+ \fi
+}
% \end{macrocode}
% \end{macro}
%
@@ -1500,7 +1518,9 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand*\AC at Acl[1]{%
- \@firstupper\expandafter{\AC at acl{#1}}%
+ \AC at uppertrue%
+ \AC at acl{#1}%
+ \AC at upperfalse%
}
% \end{macrocode}
% \end{macro}
@@ -1780,25 +1800,26 @@
% \end{macrocode}
% \begin{macrocode}
\newcommand*{\@iaci}[1]{%
- \ifcsname fn@#1 at IL\endcsname
- \ifAC at dua
- \csname fn@#1 at IL\endcsname%
- \else
- \expandafter\ifx\csname AC@\AC at prefix#1\endcsname\AC at used%
+ \ifcsname fn@#1 at IL\endcsname
+ \ifAC at dua
+ \csname fn@#1 at IL\endcsname%
+ \else
+ \expandafter\ifx\csname AC@\AC at prefix#1\endcsname\AC at used%
\csname fn@#1 at IS\endcsname%
\else
\csname fn@#1 at IL\endcsname%
\fi
- \fi
- \else
- a%
- \fi
+ \fi
+ \else
+ a%
+ \fi
}
\newcommand*{\@iac}[2][\AC at linebreakpenalty]{%
\@iaci{#2} \ifAC at starred\ac*[#1]{#2}\else\ac[#1]{#2}\fi%
}
\newcommand*{\@Iac}[2][\AC at linebreakpenalty]{%
- \@firstupper{\@iaci{#2}} \ifAC at starred\ac*[#1]{#2}\else\ac[#1]{#2}\fi%
+ \@firstupper{\@iaci{#2}}\space%
+ \ifAC at starred\ac*[#1]{#2}\else\ac[#1]{#2}\fi%
}
% \end{macrocode}
% \end{macro}
Modified: trunk/Master/texmf-dist/tex/latex/acronym/acronym.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/acronym/acronym.sty 2020-04-11 21:25:25 UTC (rev 54650)
+++ trunk/Master/texmf-dist/tex/latex/acronym/acronym.sty 2020-04-11 22:20:38 UTC (rev 54651)
@@ -40,8 +40,8 @@
%%
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{acronym}[2020/03/13
- v1.46
+\ProvidesPackage{acronym}[2020/04/17
+ v1.47
Support for acronyms (Tobias Oetiker)]
\RequirePackage{suffix,xstring}
\newif\ifAC at footnote
@@ -172,7 +172,6 @@
\newcommand*\AC at used{@<>@<>@}
\newcommand{\AC at populated}{}
\newcommand*{\AC at logged}[1]{%
- \acronymused{#1}% mark it as used in the current run too
\@bsphack
\protected at write\@auxout{}{\string\acronymused{#1}}%
\@esphack}
@@ -199,9 +198,8 @@
\fi%
}
\newcommand{\@firstupper}[1]{%
- \StrLeft{#1}{1}[\firstletter]%
- \StrGobbleLeft{#1}{1}[\remainder]%
- \MakeUppercase\firstletter\remainder%
+ \StrSplit{#1}{1}{\head}{\tail}%
+ \MakeUppercase\head\tail%
}
\ifAC at noacroprefix
\newcommand*\AC at prefix{}
@@ -344,7 +342,7 @@
\newcommand\AC at acroindefinite[3]{
\@bsphack
\protected at write\@auxout{}%
- {\string\newacroindefinite{#1}{\string\AC at hyperlink{#1}{#2}}{#3}}%
+ {\string\newacroindefinite{#1}{#2}{#3}}%
\@esphack
}
\newcommand*\newacroplural[1]{%
@@ -399,7 +397,9 @@
\fi
}
\newcommand*\AC at Aclp[1]{%
- \@firstupper\expandafter{\AC at aclp{#1}}%
+ \AC at uppertrue%
+ \AC at aclp{#1}%
+ \AC at upperfalse%
}
\newcommand*\AC at acsp[1]{%
\ifcsname fn@#1 at PS\endcsname
@@ -409,19 +409,27 @@
\fi
}
\newif\ifAC at starred
+\newif\ifAC at upper
\newcommand*\AC at get[3]{%
- \ifx#1\relax
- \PackageWarning{acronym}{Acronym `#3' is not defined}%
- \textbf{#3!}%
+ \ifx#1\relax
+ \PackageWarning{acronym}{Acronym `#3' is not defined}%
+ \textbf{#3!}%
+ \else
+ \ifAC at upper
+ \@firstupper{\expandafter#2#1}%
\else
- \expandafter#2#1%
- \fi}
+ \expandafter#2#1%
+ \fi
+ \fi
+}
\newcommand*\AC at acs[1]{%
\mbox{\expandafter\AC at get\csname fn@#1\endcsname\@firstoftwo{#1}}}
\newcommand*\AC at acl[1]{%
\expandafter\AC at get\csname fn@#1\endcsname\@secondoftwo{#1}}
\newcommand*\AC at Acl[1]{%
- \@firstupper\expandafter{\AC at acl{#1}}%
+ \AC at uppertrue%
+ \AC at acl{#1}%
+ \AC at upperfalse%
}
\newcommand*{\acs}{\AC at starredfalse\protect\acsa}%
\WithSuffix\newcommand\acs*{\AC at starredtrue\protect\acsa}%
@@ -581,25 +589,26 @@
\newcommand*{\Iac}{\AC at starredfalse\protect\@Iac}%
\WithSuffix\newcommand\Iac*{\AC at starredtrue\protect\@Iac}%
\newcommand*{\@iaci}[1]{%
- \ifcsname fn@#1 at IL\endcsname
- \ifAC at dua
- \csname fn@#1 at IL\endcsname%
- \else
- \expandafter\ifx\csname AC@\AC at prefix#1\endcsname\AC at used%
+ \ifcsname fn@#1 at IL\endcsname
+ \ifAC at dua
+ \csname fn@#1 at IL\endcsname%
+ \else
+ \expandafter\ifx\csname AC@\AC at prefix#1\endcsname\AC at used%
\csname fn@#1 at IS\endcsname%
\else
\csname fn@#1 at IL\endcsname%
\fi
- \fi
- \else
- a%
- \fi
+ \fi
+ \else
+ a%
+ \fi
}
\newcommand*{\@iac}[2][\AC at linebreakpenalty]{%
\@iaci{#2} \ifAC at starred\ac*[#1]{#2}\else\ac[#1]{#2}\fi%
}
\newcommand*{\@Iac}[2][\AC at linebreakpenalty]{%
- \@firstupper{\@iaci{#2}} \ifAC at starred\ac*[#1]{#2}\else\ac[#1]{#2}\fi%
+ \@firstupper{\@iaci{#2}}\space%
+ \ifAC at starred\ac*[#1]{#2}\else\ac[#1]{#2}\fi%
}
\newcommand*{\acsp}{\AC at starredfalse\protect\acspa}%
\WithSuffix\newcommand\acsp*{\AC at starredtrue\protect\acspa}%
More information about the tex-live-commits
mailing list.