acronym v1.31 2008/05/21

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

3 files changed, 19 insertions, 18 deletions

diff --git a/Master/texmf-dist/doc/latex/acronym/acronym.pdf b/Master/texmf-dist/doc/latex/acronym/acronym.pdf
index 449d49dc904..51f9389e056 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 c1c711ae893..708d6f1b9ba 100644
--- a/Master/texmf-dist/source/latex/acronym/acronym.dtx
+++ b/Master/texmf-dist/source/latex/acronym/acronym.dtx
@@ -83,6 +83,7 @@
 % \DoNotIndex{\usepackage}
 %
 %
+%  \changes{v1.31}{2008/05/21}{Philipp Lehman noted a nameconflict with jurabib. Renamed clearlist to AC@clearlist since it is internal anyway}
 %  \changes{v1.30}{2008/04/22}{Ulrich Diez corrected code to redefine labels and adjusted behavior with \cmd{\AC@used}}
 %  \changes{v1.29}{2008/04/22}{added code to redefine labels as acronyms are used multiple times, makeing the right page numbers show up for the withpage option (code by Ulrich Diez on comp.text.tex, integration by Domagoj Babic, babic AT cs.ubc.ca)}
 %  \changes{v1.28}{2008/04/19}{add linebreak to items list by tobi}
@@ -482,8 +483,8 @@ between the constant of Boltzmann and the \acl{NA}:
 %    First we test that we got the right format and name the package.
 %    \begin{macrocode}
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{acronym}[2008/04/22
-                          v1.30
+\ProvidesPackage{acronym}[2008/05/21
+                          v1.31
                           Support for acronyms (Tobias Oetiker)]
 \RequirePackage{suffix}
 %    \end{macrocode}
@@ -698,17 +699,17 @@ between the constant of Boltzmann and the \acl{NA}:
 %    We need a list of the used acronyms after the last \cmd{\acresetall}
 %    (or since beginning), a token list is very useful for this purpose
 %
-%    \begin{macro}{Clearlist}
+%    \begin{macro}{AC@clearlist}
 %    \begin{macrocode}
-\newtoks\clearlist
+\newtoks\AC@clearlist
 %    \end{macrocode}
 %    \end{macro}
 %
-%    \begin{macro}{\AC@addtoclearlist}
+%    \begin{macro}{\AC@addtoAC@clearlist}
 %    Adds acronyms to the clear list
 %    \begin{macrocode}
-\newcommand*\AC@addtoclearlist[1]{%
-  \global\clearlist\expandafter{\the\clearlist\AC@reset{#1}}%
+\newcommand*\AC@addtoAC@clearlist[1]{%
+  \global\AC@clearlist\expandafter{\the\AC@clearlist\AC@reset{#1}}%
 }
 %    \end{macrocode}
 %    \end{macro}
@@ -719,7 +720,7 @@ between the constant of Boltzmann and the \acl{NA}:
 %    This macro resets the |ac@FN| - tag of each acronym, therefore |\ac|
 %    will use FullName (FN) next time it is called
 %    \begin{macrocode}
-\newcommand*\acresetall{\the\clearlist\clearlist={}}
+\newcommand*\acresetall{\the\AC@clearlist\AC@clearlist={}}
 %    \end{macrocode}
 %    \begin{macrocode}
 \def\AC@reset#1{%
@@ -1125,7 +1126,7 @@ between the constant of Boltzmann and the \acl{NA}:
     \global\expandafter\let\csname ac@#1\endcsname\AC@used
     {\AC@phantomsection
      \@ifundefined{s@acro:#1}{\label}{\@verridelabel}{acro:#1}}%
-    \AC@addtoclearlist{#1}%
+    \AC@addtoAC@clearlist{#1}%
   \fi
 }%
 %    \end{macrocode}
@@ -1316,7 +1317,7 @@ between the constant of Boltzmann and the \acl{NA}:
 %    \begin{macrocode}
 \newcommand{\acused}[1]{%
 \global\expandafter\let\csname ac@#1\endcsname\AC@used%
-\AC@addtoclearlist{#1}}
+\AC@addtoAC@clearlist{#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 a093e188baa..35060cbec3e 100644
--- a/Master/texmf-dist/tex/latex/acronym/acronym.sty
+++ b/Master/texmf-dist/tex/latex/acronym/acronym.sty
@@ -39,8 +39,8 @@
 %%   Right brace   \}     Tilde         \~}
 %%
 \NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesPackage{acronym}[2008/04/22
-                          v1.30
+\ProvidesPackage{acronym}[2008/05/21
+                          v1.31
                           Support for acronyms (Tobias Oetiker)]
 \RequirePackage{suffix}
 \newif\ifAC@footnote
@@ -127,11 +127,11 @@
       \def\AChy@acfp#1{\AC@acl{#1}s (\AC@acs{#1}s)}%
    }%
 }
-\newtoks\clearlist
-\newcommand*\AC@addtoclearlist[1]{%
-  \global\clearlist\expandafter{\the\clearlist\AC@reset{#1}}%
+\newtoks\AC@clearlist
+\newcommand*\AC@addtoAC@clearlist[1]{%
+  \global\AC@clearlist\expandafter{\the\AC@clearlist\AC@reset{#1}}%
 }
-\newcommand*\acresetall{\the\clearlist\clearlist={}}
+\newcommand*\acresetall{\the\AC@clearlist\AC@clearlist={}}
 \def\AC@reset#1{%
   \global\expandafter\let\csname ac@#1\endcsname\relax
   \@ifundefined{s@acro:#1}{%
@@ -331,7 +331,7 @@
     \global\expandafter\let\csname ac@#1\endcsname\AC@used
     {\AC@phantomsection
      \@ifundefined{s@acro:#1}{\label}{\@verridelabel}{acro:#1}}%
-    \AC@addtoclearlist{#1}%
+    \AC@addtoAC@clearlist{#1}%
   \fi
 }%
 \newcommand*{\acf}{\AC@starredfalse\protect\acfa}%
@@ -408,7 +408,7 @@
   {\itshape \AC@acl{#1} \nolinebreak[3]} (\ifAC@starred\acs*{#1}\else\acs{#1}\fi)}
 \newcommand{\acused}[1]{%
 \global\expandafter\let\csname ac@#1\endcsname\AC@used%
-\AC@addtoclearlist{#1}}
+\AC@addtoAC@clearlist{#1}}
 \newcommand*{\acsu}{\AC@starredfalse\protect\acsua}%
 \WithSuffix\newcommand\acsu*{\AC@starredtrue\protect\acsua}%
 \newcommand{\acsua}[1]{%