acronym (29sep14)

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

4 files changed, 119 insertions, 110 deletions

diff --git a/Master/texmf-dist/doc/latex/acronym/acronym.pdf b/Master/texmf-dist/doc/latex/acronym/acronym.pdf
index 69e70277332..3ea9070189f 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 349edb46ce7..4c086c59cd1 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{1066}
+% \CheckSum{1062}
 %
 %% \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
@@ -83,6 +83,8 @@
 % \DoNotIndex{\usepackage}
 %
 %
+%  \changes{v1.40}{2014/09/29}{Hartmut Henkel - remove \cmd{hskip} instances, since they cause bad formating since space at the end of a line can not be collapsed anymore}
+%  \changes{v1.39}{2014/08/14}{Yann Leprince - make the appearance of labels consistent whether or not the acronym environment has its optional argument provided}
 %  \changes{v1.38}{2012/10/09}{Ash Hughes - add support for dynamic indefinite articles depending on the acronym form used}
 %  \changes{v1.37}{2012/09/04}{Martin Falk - ac* should NOT set the used flag ... now it does not. Martin Ruessler found fix for non hyphenation in the first word of the long form of the acronym}
 %  \changes{v1.36}{2010/09/08}{Uwe Bieling disable hyperlinks in nolist mode, prevent hyphenation of short form of acronyms}
@@ -360,6 +362,15 @@
 %    |\begin{acronym}[HBCI]|
 %    \end{quote}
 %
+%    \DescribeMacro{\aclabelfont}
+%    The short form of each acronym in the list is formatted using
+%    \cmd{\aclabelfont}, which typesets its arguments in bold font by
+%    default. It can be redefined to produce bold sans-serif labels, for
+%    example, with
+%    \begin{quote}
+%      |\renewcommand*{\aclabelfont}[1]{\textbf{\textsf{\acsfont{#1}}}}|
+%    \end{quote}
+%
 %    In standard mode, the acronym-list will consist of all defined
 %    acronyms, regardless if the the acronym was used in the text
 %    before or not. This behavior can be changed by loading the
@@ -609,8 +620,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}[2012/10/29
-                          v1.38
+\ProvidesPackage{acronym}[2014/09/29
+                          v1.40
                           Support for acronyms (Tobias Oetiker)]
 \RequirePackage{suffix,xstring}
 %    \end{macrocode}
@@ -975,15 +986,16 @@ blocks to be tested separately. The latter are commonly indicated as
 %    longest appearing acronym as parameter. If the option 'nolist' is selected
 %    the enviroment is empty.
 %    \begin{macrocode}
-\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%
@@ -1065,7 +1077,7 @@ blocks to be tested separately. The latter are commonly indicated as
   \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}{%
@@ -1077,7 +1089,7 @@ blocks to be tested separately. The latter are commonly indicated as
           \fi%
     \fi%
  \else%
-    \item[\protect\AC@hypertarget{#1}{\acsfont{#2}}] #3%
+    \item[\protect\AC@hypertarget{#1}{\aclabelfont{#2}}] #3%
  \fi%
  \fi%
  \begingroup
@@ -1388,9 +1400,7 @@ blocks to be tested separately. The latter are commonly indicated as
     \@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
@@ -1436,10 +1446,10 @@ blocks to be tested separately. The latter are commonly indicated as
 \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}})}%
         }%
@@ -1588,10 +1598,10 @@ blocks to be tested separately. The latter are commonly indicated as
 \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}})}%
          }%
diff --git a/Master/texmf-dist/source/latex/acronym/acronym.ins b/Master/texmf-dist/source/latex/acronym/acronym.ins
index febefc36372..0af1e114c07 100644
--- a/Master/texmf-dist/source/latex/acronym/acronym.ins
+++ b/Master/texmf-dist/source/latex/acronym/acronym.ins
@@ -1,81 +1,81 @@
-%% The acronym package

-%%

-%% This file will generate fast loadable files and documentation

-%% driver files from the doc files in this package when run through

-%% LaTeX or TeX.

-%%

-%% Copyright 1995--2010  by Tobias Oetiker (tobi@oetiker.ch)

-%%                       and individual authors listed elsewhere

-%%                       in this file.

-%% All rights reserved.

-%%

-%% 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 the

-%% license is in

-%%

-%%     http://www.latex-project.org/lppl.txt

-%%

-%% and version 1.3 or later is part of all distributions of LaTeX

-%% version 2003/12/01 or later.

-%%

-%% This work has the LPPL maintenance status "maintained".

-%% The Current Maintainer of this work is Tobias Oetiker (tobi@oetiker.ch).

-%%

-%% This work consists of the files acronym.dtx and acronym.ins and the

-%% derived files acronym.sty and acrotest.tex.

-%%

-

-\def\batchfile{acronym.ins}

-\input docstrip.tex

-\keepsilent

-

-\preamble

- Copyright 1995--2009  by Tobias Oetiker (tobi@oetiker.ch)

-                       and individual authors listed elsewhere.

- All rights reserved.

-

- 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 the

- license is in

-

-     http://www.latex-project.org/lppl.txt

-

- and version 1.3 or later is part of all distributions of LaTeX

- version 2003/12/01 or later.

-

- This work has the LPPL maintenance status "maintained".

- The Current Maintainer of this work is Tobias Oetiker (oetiker@ee.ethz.ch).

-

-\endpreamble

-\generate{%

-    \askforoverwritefalse

-    \file{acronym.sty}{\from{acronym.dtx}{acronym}}}

-

-\preamble

-\endpreamble

-\generate{%

-    \askforoverwritefalse

-    \file{acrotest.tex}{\from{acronym.dtx}{acrotest}}}

-

-{\obeyspaces

-\ifToplevel{

-   \Msg{*********************************************************}

-   \Msg{*                                                       *}

-   \Msg{* To finish the installation you have to move the       *}

-   \Msg{* following file into a directory searched by TeX:      *}

-   \Msg{*                                                       *}

-   \Msg{*    acronym.sty                                        *}

-   \Msg{*                                                       *}

-   \Msg{* To produce the documentation run the file acronym.dtx *}

-   \Msg{* through LaTeX.                                        *}

-   \Msg{*                                                       *}

-   \Msg{* The file `acrotest.tex' contains an example text.     *}

-   \Msg{*                                                       *}

-   \Msg{* Happy TeXing!                                         *}

-   \Msg{*********************************************************}

-   }}

-\endbatchfile

-

-\endinput

+%% The acronym package
+%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
+%% Copyright 1995--2010  by Tobias Oetiker (tobi@oetiker.ch)
+%%                       and individual authors listed elsewhere
+%%                       in this file.
+%% All rights reserved.
+%%
+%% 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 the
+%% license is in
+%%
+%%     http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/12/01 or later.
+%%
+%% This work has the LPPL maintenance status "maintained".
+%% The Current Maintainer of this work is Tobias Oetiker (tobi@oetiker.ch).
+%%
+%% This work consists of the files acronym.dtx and acronym.ins and the
+%% derived files acronym.sty and acrotest.tex.
+%%
+
+\def\batchfile{acronym.ins}
+\input docstrip.tex
+\keepsilent
+
+\preamble
+ Copyright 1995--2009  by Tobias Oetiker (tobi@oetiker.ch)
+                       and individual authors listed elsewhere.
+ All rights reserved.
+
+ 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 the
+ license is in
+
+     http://www.latex-project.org/lppl.txt
+
+ and version 1.3 or later is part of all distributions of LaTeX
+ version 2003/12/01 or later.
+
+ This work has the LPPL maintenance status "maintained".
+ The Current Maintainer of this work is Tobias Oetiker (oetiker@ee.ethz.ch).
+
+\endpreamble
+\generate{%
+    \askforoverwritefalse
+    \file{acronym.sty}{\from{acronym.dtx}{acronym}}}
+
+\preamble
+\endpreamble
+\generate{%
+    \askforoverwritefalse
+    \file{acrotest.tex}{\from{acronym.dtx}{acrotest}}}
+
+{\obeyspaces
+\ifToplevel{
+   \Msg{*********************************************************}
+   \Msg{*                                                       *}
+   \Msg{* To finish the installation you have to move the       *}
+   \Msg{* following file into a directory searched by TeX:      *}
+   \Msg{*                                                       *}
+   \Msg{*    acronym.sty                                        *}
+   \Msg{*                                                       *}
+   \Msg{* To produce the documentation run the file acronym.dtx *}
+   \Msg{* through LaTeX.                                        *}
+   \Msg{*                                                       *}
+   \Msg{* The file `acrotest.tex' contains an example text.     *}
+   \Msg{*                                                       *}
+   \Msg{* Happy TeXing!                                         *}
+   \Msg{*********************************************************}
+   }}
+\endbatchfile
+
+\endinput
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}})}%
          }%