From b8866d008edc38236ea4a29cbcaab1696e4f36a1 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Tue, 30 Sep 2014 00:02:25 +0000 Subject: acronym (29sep14) git-svn-id: svn://tug.org/texlive/trunk@35281 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/acronym/acronym.sty | 27 ++++++++++++------------- 1 file changed, 13 insertions(+), 14 deletions(-) (limited to 'Master/texmf-dist/tex/latex/acronym') diff --git a/Master/texmf-dist/tex/latex/acronym/acronym.sty b/Master/texmf-dist/tex/latex/acronym/acronym.sty index 76d6606c8fc..0674d2e7871 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}[2012/10/29 - v1.38 +\ProvidesPackage{acronym}[2014/09/29 + v1.40 Support for acronyms (Tobias Oetiker)] \RequirePackage{suffix,xstring} \newif\ifAC@footnote @@ -168,15 +168,16 @@ \@bsphack \protected@write\@auxout{}{\string\newacro{#1}[#2]{#3}}% \@esphack} -\def\bflabel#1{{\textbf{\textsf{#1}}\hfill}} +\newcommand*{\aclabelfont}[1]{\textbf{\acsfont{#1}}} +\def\AC@makelabel#1{#1\hfil} \newenvironment{AC@deflist}[1]% {\ifAC@nolist% \else% \raggedright\begin{list}{}% - {\settowidth{\labelwidth}{\textbf{\textsf{#1}}}% + {\settowidth{\labelwidth}{\AC@makelabel{\aclabelfont{#1}}}% \setlength{\leftmargin}{\labelwidth}% \addtolength{\leftmargin}{\labelsep}% - \renewcommand{\makelabel}{\bflabel}}% + \renewcommand{\makelabel}{\AC@makelabel}}% \fi}% {\ifAC@nolist% \else% @@ -222,7 +223,7 @@ \else% \ifAC@printonlyused% \expandafter\ifx\csname acused@#1\endcsname\AC@used% - \item[\protect\AC@hypertarget{#1}{\acsfont{#2}}] #3% + \item[\protect\AC@hypertarget{#1}{\aclabelfont{#2}}] #3% \ifAC@withpage% \expandafter\ifx\csname r@acro:#1\endcsname\relax% \PackageInfo{acronym}{% @@ -234,7 +235,7 @@ \fi% \fi% \else% - \item[\protect\AC@hypertarget{#1}{\acsfont{#2}}] #3% + \item[\protect\AC@hypertarget{#1}{\aclabelfont{#2}}] #3% \fi% \fi% \begingroup @@ -405,9 +406,7 @@ \@testdef{#1}{#2}{#3}% }% }% -\protected@write\@auxout{}{% - \string\reset@newl@bel -}% +\AtBeginDocument{\immediate\write\@auxout{\string\reset@newl@bel}} \newcommand*\reset@newl@bel{% \ifx\@newl@bel\@testdef \let\@newl@bel\ac@testdef @@ -431,10 +430,10 @@ \newcommand*{\@acf}[1]{% \ifAC@footnote \acsfont{\AC@acs{#1}}% - \footnote{\AC@placelabel{#1}\hskip\z@\AC@acl{#1}{}}% + \footnote{\AC@placelabel{#1}\AC@acl{#1}{}}% \else \acffont{% - \AC@placelabel{#1}\hskip\z@\AC@acl{#1}% + \AC@placelabel{#1}\AC@acl{#1}% \nolinebreak[3] % \acfsfont{(\acsfont{\AC@acs{#1}})}% }% @@ -501,10 +500,10 @@ \newcommand*{\@acfp}[1]{% \ifAC@footnote \acsfont{\AC@acsp{#1}}% - \footnote{\AC@placelabel{#1}\hskip\z@\AC@aclp{#1}{}}% + \footnote{\AC@placelabel{#1}\AC@aclp{#1}{}}% \else \acffont{% - \AC@placelabel{#1}\hskip\z@\AC@aclp{#1}% + \AC@placelabel{#1}\AC@aclp{#1}% \nolinebreak[3] % \acfsfont{(\acsfont{\AC@acsp{#1}})}% }% -- cgit v1.2.3