acronym update (18apr08)

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

6 files changed, 64 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/acronym/CHANGES b/Master/texmf-dist/doc/latex/acronym/CHANGES
index c21f586403c..f836e4bd1b7 100644
--- a/Master/texmf-dist/doc/latex/acronym/CHANGES
+++ b/Master/texmf-dist/doc/latex/acronym/CHANGES
@@ -1,3 +1,7 @@
+<Version 1.27 (April 2008) add option 'addpage' to add pagenumber of first
+occurenace to list of acronyms.
+-- Tobias Oetiker (tobi with oetiker.ch)
+
 Version 1.26 (June 2006) supress lone item when nolist is in effect
 -- Immo Köster <Immo.Koester there rwth-aachen.de>
 
@@ -8,7 +12,7 @@ Version 1.24 (October 2005) ac* commands are now not fragile anymore ...
 -- José Emilio Vila Forcén jose.vila there cui.unige.ch
 
 Version 1.23 (October 2005) fixed typo in nolist option. added comment about fragility of ac commands.
--- Tobias Oetiker (oetiker with ee.ethz.ch)
+-- Tobias Oetiker (tobi with oetiker.ch)
 
 Version 1.22 (October 2005) added starred versions of ac(p), acf(p), acs(p),
 acl(p), acfi, acsu & aclu 
@@ -17,7 +21,7 @@ acl(p), acfi, acsu & aclu
 Version 1.21 (September 2005): fixed the  \acused command again ... broke it
 in 1.20 (this time I amended the docs, so that the intention becomes clear).
 Set acronyms as used in the first run, not only in the second one.
--- Tobi Oetiker oetiker there ee.ethz.ch
+-- Tobi Oetiker tobi at oetiker.ch
 
 added new option nolist to suppress printing the acronym list all together
 -- José Emilio Vila Forcén jose.vila there cui.unige.ch
@@ -53,7 +57,7 @@ avoid unnecessary naming conflict.
 --  Peter May <peter.may there philips.com>
 
 Version 1.13 (July 2004): printonlyused was not working anymore
---  Tobi Oetiker <oetiker there ee.ethz.ch>
+--  Tobi Oetiker <tobi at oetiker.ch>
 
 Version 1.13 (July 2004): if the footnote option was on, footnotes were
 printed for ALL acronyms ALL the time, this looked rather odd if the same
@@ -63,7 +67,7 @@ print footnote first time). One might think about changing this, so that
 either footnotes get printed 'once' per page. Or that the footnote marks are
 issued once per acronym and page, so that all instances of the same acronym
 on a page get the same footnote mark. Feel free to contribute patches.
---  Tobi Oetiker <oetiker there ee.ethz.ch>
+--  Tobi Oetiker <tobi at oetiker.ch>
 
 Version 1.12 (June 2004): Make acronyms robust and compatible
 with pdf bookmarks.
@@ -114,4 +118,4 @@ instead of <acronym>, if available.
 Version 1.2 (August 1996) features a new command: \acl to print the
 expanded acronym with out even mentioning that there is an acronym for
 this word.
--- Tobias Oetiker <oetiker there ee.ethz.ch>
+-- Tobias Oetiker <tobi at oetiker.ch>
diff --git a/Master/texmf-dist/doc/latex/acronym/acronym.pdf b/Master/texmf-dist/doc/latex/acronym/acronym.pdf
index d8fa19db438..265ed251eb3 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/doc/latex/acronym/acrotest.tex b/Master/texmf-dist/doc/latex/acronym/acrotest.tex
index b27644e91ab..8075419078d 100644
--- a/Master/texmf-dist/doc/latex/acronym/acrotest.tex
+++ b/Master/texmf-dist/doc/latex/acronym/acrotest.tex
@@ -24,7 +24,7 @@
 %%
 
 \documentclass{article}
-\usepackage[printonlyused]{acronym}
+\usepackage[printonlyused,withpage]{acronym}
 \begin{document}
 
 \section{Intro}
diff --git a/Master/texmf-dist/source/latex/acronym/acronym.dtx b/Master/texmf-dist/source/latex/acronym/acronym.dtx
index 40dfc51b878..212ee413f93 100644
--- a/Master/texmf-dist/source/latex/acronym/acronym.dtx
+++ b/Master/texmf-dist/source/latex/acronym/acronym.dtx
@@ -2,7 +2,7 @@
 %
 % Doc-Source file to use with LaTeX2e
 %
-% Copyright 1994-2005 by Tobias Oetiker (oetiker@ee.ethz.ch) and many Contributors.
+% Copyright 1994-2008 by Tobias Oetiker (tobi@oetiker.ch) and many Contributors.
 % All rights reserved.
 %
 % This work may be distributed and/or modified under the conditions of
@@ -16,7 +16,7 @@
 % 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).
+% The Current Maintainer of this work is Tobias Oetiker (tobi@oetiker.ch).
 %
 %<*driver>
 \documentclass{ltxdoc}
@@ -35,7 +35,7 @@
 %</driver>
 % \fi
 %
-% \CheckSum{725}
+% \CheckSum{744}
 %
 %% \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,7 @@
 % \DoNotIndex{\usepackage}
 %
 %
+%  \changes{v1.27}{2008/04/18}{Added withpage option to print page numbers into acronym list by tobi and Domagoj Babic, babic@cs.ubc.ca}
 %  \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}
@@ -337,7 +338,7 @@
 %    For example, if \textit{HBCI} is the longest acronym used, the
 %    list should start with
 %    \begin{quote}
-%   |\begin{acronym}[HBCI]|
+%    |\begin{acronym}[HBCI]|
 %    \end{quote}
 %
 %    In standard mode, the acronym-list will consist of all defined
@@ -345,11 +346,16 @@
 %    before or not. This behavior can be changed by loading the
 %    package with the parameter \texttt{printonlyused}:
 %    \begin{quote}
-%      |\usepackage[printonlyused]{acronym}|
+%    |\usepackage[printonlyused]{acronym}|
+%    \end{quote}
+%    In \texttt{printonlyused}-mode you can add to each acronym the
+%    the page number where it was first used by additionally specifying
+%    the option \texttt{withpage}.
+%    \begin{quote}
+%    |\usepackage[printonlyused,withpage]{acronym}|
 %    \end{quote}
 %
-%
-% \subsection{Miscellaneous}
+%  \subsection{Miscellaneous}
 %    \subsubsection*{Sectioning and pdf marks}
 %    Acronyms are robust (since version 1.12) and can be used in
 %    sectional headers such as \cmd{\chapter}, \cmd{\section}, etc.,
@@ -397,7 +403,7 @@
 %    \begin{macrocode}
 %<*acrotest>
 \documentclass{article}
-\usepackage[printonlyused]{acronym}
+\usepackage[printonlyused,withpage]{acronym}
 \begin{document}
 
 \section{Intro}
@@ -472,8 +478,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}[2006/06/26
-                          v1.26
+\ProvidesPackage{acronym}[2008/04/18
+                          v1.27
                           Support for acronyms (Tobias Oetiker)]
 \RequirePackage{suffix}
 %    \end{macrocode}
@@ -519,6 +525,17 @@ between the constant of Boltzmann and the \acl{NA}:
 %    \end{macrocode}
 %    \end{macro}
 %
+%    \begin{macro}{\ifAC@withpage}
+%    A marker which tells us to print page numbers.
+%    \begin{macrocode}
+\newif\ifAC@withpage
+\AC@withpagefalse
+%    \end{macrocode}
+%    \begin{macrocode}
+\DeclareOption{withpage}{\AC@withpagetrue}
+%    \end{macrocode}
+%    \end{macro}
+%
 %    \begin{macro}{\ifAC@smaller}
 %    The option |smaller| leads to a redefinition of \cmd{\acsfont}.
 %    We want to make the acronym appear smaller. Since this should
@@ -909,6 +926,13 @@ between the constant of Boltzmann and the \acl{NA}:
   \ifAC@printonlyused%
     \expandafter\ifx\csname acused@#1\endcsname\AC@used%
        \item[\protect\AC@hypertarget{#1}{\acsfont{#2}}] #3%
+          \ifAC@withpage%
+            \expandafter\ifx\csname r@acro:#1\endcsname\relax%
+               \G@refundefinedtrue%
+            \else%
+               \dotfill\pageref{acro:#1}%
+            \fi%
+          \fi%
     \fi%
  \else%
     \item[\protect\AC@hypertarget{#1}{\acsfont{#2}}] #3%
@@ -1054,6 +1078,7 @@ between the constant of Boltzmann and the \acl{NA}:
          \relax%
      \else
          \global\expandafter\let\csname ac@#1\endcsname\AC@used
+         \label{acro:#1}%
          \AC@addtoclearlist{#1}%
      \fi
      \ifAC@starred\else\AC@logged{#1}\fi}
@@ -1161,7 +1186,8 @@ between the constant of Boltzmann and the \acl{NA}:
       \relax%
    \else
        \global\expandafter\let\csname ac@#1\endcsname\AC@used
-          \AC@addtoclearlist{#1}%
+        \label{acro:#1}%
+        \AC@addtoclearlist{#1}%
    \fi
    \ifAC@starred\else\AC@logged{#1}\fi}
 %    \end{macrocode}
diff --git a/Master/texmf-dist/tex/latex/acronym/acronym.sty b/Master/texmf-dist/tex/latex/acronym/acronym.sty
index bbede03632e..74d30c76359 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}[2006/06/26
-                          v1.26
+\ProvidesPackage{acronym}[2008/04/18
+                          v1.27
                           Support for acronyms (Tobias Oetiker)]
 \RequirePackage{suffix}
 \newif\ifAC@footnote
@@ -53,6 +53,9 @@
 \newif\ifAC@printonlyused
 \AC@printonlyusedfalse
 \DeclareOption{printonlyused}{\AC@printonlyusedtrue}
+\newif\ifAC@withpage
+\AC@withpagefalse
+\DeclareOption{withpage}{\AC@withpagetrue}
 \newif\ifAC@smaller
 \AC@smallerfalse
 \DeclareOption{smaller}{\AC@smallertrue}
@@ -210,6 +213,13 @@
   \ifAC@printonlyused%
     \expandafter\ifx\csname acused@#1\endcsname\AC@used%
        \item[\protect\AC@hypertarget{#1}{\acsfont{#2}}] #3%
+          \ifAC@withpage%
+            \expandafter\ifx\csname r@acro:#1\endcsname\relax%
+               \G@refundefinedtrue%
+            \else%
+               \dotfill\pageref{acro:#1}%
+            \fi%
+          \fi%
     \fi%
  \else%
     \item[\protect\AC@hypertarget{#1}{\acsfont{#2}}] #3%
@@ -269,6 +279,7 @@
          \relax%
      \else
          \global\expandafter\let\csname ac@#1\endcsname\AC@used
+         \label{acro:#1}%
          \AC@addtoclearlist{#1}%
      \fi
      \ifAC@starred\else\AC@logged{#1}\fi}
@@ -315,7 +326,8 @@
       \relax%
    \else
        \global\expandafter\let\csname ac@#1\endcsname\AC@used
-          \AC@addtoclearlist{#1}%
+        \label{acro:#1}%
+        \AC@addtoclearlist{#1}%
    \fi
    \ifAC@starred\else\AC@logged{#1}\fi}
 \newcommand*{\acp}{\AC@starredfalse\protect\@acp}%
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 481b6805dc1..a98d58c2964 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -47,9 +47,10 @@ chdir $startdir || die "chdir($startdir) failed: $!";  # back to raw
  'LingTrees',	"die 'skipping, requires python'",
  'SIstyle',	'&MAKEflatten',
  'aastex',	"&MAKEflatten",
+ 'acronym',	"&MAKEunzip",
+ 'active-conf',	"&MAKEactive_conf",
  'aeb_pro',	"die 'skipping, requires new acrobat + complicated'",
  'arabxetex',	'&MAKEflatten',
- 'active-conf',	"&MAKEactive_conf",
  'ae',		"&MAKEae",
  'AkkTeX',	"&MAKEflatten",
  'algorithmicx',"&MAKEnosymlinks",