acronym 1.26 update

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

6 files changed, 92 insertions, 14 deletions

diff --git a/Master/texmf-dist/doc/latex/acronym/CHANGES b/Master/texmf-dist/doc/latex/acronym/CHANGES
index 4e6bd60a541..c21f586403c 100644
--- a/Master/texmf-dist/doc/latex/acronym/CHANGES
+++ b/Master/texmf-dist/doc/latex/acronym/CHANGES
@@ -1,3 +1,9 @@
+Version 1.26 (June 2006) supress lone item when nolist is in effect
+-- Immo Köster <Immo.Koester there rwth-aachen.de>
+
+Version 1.25 (November 2005) properly handle acronyms in pdfbookmarks
+-- Heiko Oberdiek <oberdiek there uni-freiburg.de>
+
 Version 1.24 (October 2005) ac* commands are now not fragile anymore ... 
 -- José Emilio Vila Forcén jose.vila there cui.unige.ch
 
diff --git a/Master/texmf-dist/doc/latex/acronym/README b/Master/texmf-dist/doc/latex/acronym/README
index 4b8dda7f47f..68f5f235b76 100644
--- a/Master/texmf-dist/doc/latex/acronym/README
+++ b/Master/texmf-dist/doc/latex/acronym/README
@@ -14,9 +14,13 @@ This package makes sure, that all acronyms used in the text are
 spelled out in full at least once. And it provides an environment to
 keep a list of used acronyms.
 
+Note that acronym requires the 'suffix' package. You can find it on 
+CTAN:macros/latex/contrib/bigfoot/
+
 Files of the `acronym' package:
-  readme		This file
+  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
+
diff --git a/Master/texmf-dist/doc/latex/acronym/acronym.pdf b/Master/texmf-dist/doc/latex/acronym/acronym.pdf
index 44a52c70078..d8fa19db438 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 0616dcaabdb..40dfc51b878 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{642}
+% \CheckSum{725}
 %
 %% \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,9 +83,11 @@
 % \DoNotIndex{\usepackage}
 %
 %
+%  \changes{v1.26}{2006/06/26}{Don't put out an empty item if nolist is in effect by Immo.Koester@rwth-aachen.de}
+%  \changes{v1.25}{2005/11/11}{Properly handle acronym commands in PDF Bookmarks by Heiko Oberdiek oberdiek@uni-freiburg.de}
 %  \changes{v1.24}{2005/10/25}{Now the acronyms commands and fixed a bug in the option nolist, by Jose Emilio Vila Forcen, jemilio@ieee.org}
 %  \changes{v1.23}{2005/10/24}{Fix fpr nolist option by Tobi}
-%  \changes{v1.22}{2005/10/04}{added starred versions of ac(p), acf(p), acs(p), acl(p), acfi, acsu & aclu by Stefan Pinnow (Mo-Gul@gmx.net)}
+%  \changes{v1.22}{2005/10/04}{added starred versions of ac(p), acf(p), acs(p), acl(p), acfi, acsu \& aclu by Stefan Pinnow (Mo-Gul@gmx.net)}
 %  \changes{v1.21}{2005/09/20}{fixed acused again by Tobi. added option nolist, by Jose Emilio Vila Forcen, jemilio@ieee.org}
 %  \changes{v1.20}{2005/08/16}{make acused actually work. by Richard.Walker with cs.anu.edu.au}
 %  \changes{v1.19}{2005/04/26}{three new commands acused (set-used), acsu (adds to used), aclu (adds to used) by Lee Netherton ltn100@ohm.york.ac.uk}
@@ -470,8 +472,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}[2005/10/04
-                          v1.22
+\ProvidesPackage{acronym}[2006/06/26
+                          v1.26
                           Support for acronyms (Tobias Oetiker)]
 \RequirePackage{suffix}
 %    \end{macrocode}
@@ -626,6 +628,36 @@ between the constant of Boltzmann and the \acl{NA}:
 \AtBeginDocument{%
    \providecommand\texorpdfstring[2]{#1}%
    \providecommand\pdfstringdefDisableCommands[1]{}%
+   \pdfstringdefDisableCommands{%
+     \csname AC@starredfalse\endcsname
+     \csname AC@footnotefalse\endcsname
+     \let\AC@hyperlink\@secondoftwo
+     \let\acsfont\relax
+     \let\acffont\relax
+     \let\acfsfont\relax
+     \let\acused\relax
+     \let\null\relax
+     \def\AChy@call#1#2{%
+        \ifx*#1\@empty
+          \expandafter #2%
+        \else
+          #2{#1}%
+        \fi
+      }%
+      \def\acs#1{\AChy@call{#1}\AC@acs}%
+      \def\acl#1{\AChy@call{#1}\@acl}%
+      \def\acf#1{\AChy@call{#1}\AChy@acf}%
+      \def\ac#1{\AChy@call{#1}\@ac}%
+      \def\acsp#1{\AChy@call{#1}\@acsp}%
+      \def\aclp#1{\AChy@call{#1}\@aclp}%
+      \def\acfp#1{\AChy@call{#1}\AChy@acfp}%
+      \def\acp#1{\AChy@call{#1}\@acp}%
+      \def\acfi#1{\AChy@call{#1}\AChy@acf}%
+      \let\acsu\acs
+      \let\aclu\acl
+      \def\AChy@acf#1{\AC@acl{#1} (\AC@acs{#1})}%
+      \def\AChy@acfp#1{\AC@acl{#1}s (\AC@acs{#1}s)}%
+   }%
 }
 %    \end{macrocode}
 %
@@ -844,7 +876,10 @@ between the constant of Boltzmann and the \acl{NA}:
   }%
   {%
    \ifx\AC@populated\AC@used\else%
-      \item[]\relax%
+      \ifAC@nolist%
+      \else%
+          \item[]\relax%
+      \fi%
    \fi%
    \expandafter\ifx\csname ac@des@mark\endcsname\AC@used%
       \ifAC@nolist%
diff --git a/Master/texmf-dist/tex/latex/acronym/acronym.sty b/Master/texmf-dist/tex/latex/acronym/acronym.sty
index b69eaf4e2eb..bbede03632e 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}[2005/10/04
-                          v1.22
+\ProvidesPackage{acronym}[2006/06/26
+                          v1.26
                           Support for acronyms (Tobias Oetiker)]
 \RequirePackage{suffix}
 \newif\ifAC@footnote
@@ -85,6 +85,36 @@
 \AtBeginDocument{%
    \providecommand\texorpdfstring[2]{#1}%
    \providecommand\pdfstringdefDisableCommands[1]{}%
+   \pdfstringdefDisableCommands{%
+     \csname AC@starredfalse\endcsname
+     \csname AC@footnotefalse\endcsname
+     \let\AC@hyperlink\@secondoftwo
+     \let\acsfont\relax
+     \let\acffont\relax
+     \let\acfsfont\relax
+     \let\acused\relax
+     \let\null\relax
+     \def\AChy@call#1#2{%
+        \ifx*#1\@empty
+          \expandafter #2%
+        \else
+          #2{#1}%
+        \fi
+      }%
+      \def\acs#1{\AChy@call{#1}\AC@acs}%
+      \def\acl#1{\AChy@call{#1}\@acl}%
+      \def\acf#1{\AChy@call{#1}\AChy@acf}%
+      \def\ac#1{\AChy@call{#1}\@ac}%
+      \def\acsp#1{\AChy@call{#1}\@acsp}%
+      \def\aclp#1{\AChy@call{#1}\@aclp}%
+      \def\acfp#1{\AChy@call{#1}\AChy@acfp}%
+      \def\acp#1{\AChy@call{#1}\@acp}%
+      \def\acfi#1{\AChy@call{#1}\AChy@acf}%
+      \let\acsu\acs
+      \let\aclu\acl
+      \def\AChy@acf#1{\AC@acl{#1} (\AC@acs{#1})}%
+      \def\AChy@acfp#1{\AC@acl{#1}s (\AC@acs{#1}s)}%
+   }%
 }
 \newtoks\clearlist
 \newcommand*\AC@addtoclearlist[1]{%
@@ -157,7 +187,10 @@
   }%
   {%
    \ifx\AC@populated\AC@used\else%
-      \item[]\relax%
+      \ifAC@nolist%
+      \else%
+          \item[]\relax%
+      \fi%
    \fi%
    \expandafter\ifx\csname ac@des@mark\endcsname\AC@used%
       \ifAC@nolist%
diff --git a/Master/texmf-dist/tpm/acronym.tpm b/Master/texmf-dist/tpm/acronym.tpm
index cce14ef583f..b3f99f58f60 100644
--- a/Master/texmf-dist/tpm/acronym.tpm
+++ b/Master/texmf-dist/tpm/acronym.tpm
@@ -3,8 +3,8 @@
   <rdf:Description about="http://texlive.dante.de/texlive/Package/acronym.zip">
     <TPM:Name>acronym</TPM:Name>
     <TPM:Type>Package</TPM:Type>
-    <TPM:Date>2006/01/11 23:49:59</TPM:Date>
-    <TPM:Version>1.6</TPM:Version>
+    <TPM:Date>2006/06/30 13:22:10</TPM:Date>
+    <TPM:Version></TPM:Version>
     <TPM:Creator>rahtz</TPM:Creator>
     <TPM:Title>Expand acronyms at least once.</TPM:Title>
     <TPM:Description>
@@ -17,17 +17,17 @@ compatible with pdf bookmarks.
     <TPM:Author>Tobias Oetiker and Heiko Oberdiek</TPM:Author>
     <TPM:Size>217848</TPM:Size>
     <TPM:Build/>
-    <TPM:RunFiles size="11672">
+    <TPM:RunFiles size="12634">
 texmf-dist/tex/latex/acronym/acronym.sty
 texmf-dist/tpm/acronym.tpm
     </TPM:RunFiles>
-    <TPM:DocFiles size="161598">
+    <TPM:DocFiles size="161923">
 texmf-dist/doc/latex/acronym/CHANGES
 texmf-dist/doc/latex/acronym/README
 texmf-dist/doc/latex/acronym/acronym.pdf
 texmf-dist/doc/latex/acronym/acrotest.tex
     </TPM:DocFiles>
-    <TPM:SourceFiles size="44578">
+    <TPM:SourceFiles size="45780">
 texmf-dist/source/latex/acronym/acronym.dtx
 texmf-dist/source/latex/acronym/acronym.ins
     </TPM:SourceFiles>