summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2010-09-11 23:01:37 +0000
committerKarl Berry <karl@freefriends.org>2010-09-11 23:01:37 +0000
commit992cdec1c1f6b1115c69406acf54e5b9f165da35 (patch)
tree9b6f27f82752aae285be166f5c26d799a961ad23
parent168e8fb338ddcc94582c9858936bbad786022786 (diff)
acronym update (11sep10)
git-svn-id: svn://tug.org/texlive/trunk@19660 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/acronym/acronym.pdfbin159831 -> 283616 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acronym/acrotest.tex2
-rw-r--r--Master/texmf-dist/source/latex/acronym/acronym.dtx19
-rw-r--r--Master/texmf-dist/source/latex/acronym/acronym.ins2
-rw-r--r--Master/texmf-dist/tex/latex/acronym/acronym.sty10
5 files changed, 17 insertions, 16 deletions
diff --git a/Master/texmf-dist/doc/latex/acronym/acronym.pdf b/Master/texmf-dist/doc/latex/acronym/acronym.pdf
index 317cf9ab2e7..a5940fdd7d5 100644
--- a/Master/texmf-dist/doc/latex/acronym/acronym.pdf
+++ b/Master/texmf-dist/doc/latex/acronym/acronym.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/acronym/acrotest.tex b/Master/texmf-dist/doc/latex/acronym/acrotest.tex
index e48b2eea4a3..e3a2d87546c 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{hyperref}
+\usepackage[colorlinks]{hyperref}
\usepackage[printonlyused,withpage]{acronym}
\begin{document}
diff --git a/Master/texmf-dist/source/latex/acronym/acronym.dtx b/Master/texmf-dist/source/latex/acronym/acronym.dtx
index 87571600168..73d4c0a61ce 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-2008 by Tobias Oetiker (tobi@oetiker.ch) and many Contributors.
+% Copyright 1994-2010 by Tobias Oetiker (tobi@oetiker.ch) and many Contributors.
% All rights reserved.
%
% This work may be distributed and/or modified under the conditions of
@@ -35,7 +35,7 @@
%</driver>
% \fi
%
-% \CheckSum{953}
+% \CheckSum{954}
%
%% \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.36}{2010/09/08}{Uwe Bieling disable hyperlinks in nolist mode, prevent hyphenation of short form of acronyms}
% \changes{v1.35}{2009/10/20}{Sergio Callegari added support for nonstandard plural forms and fixed management of default short form.}
% \changes{v1.34}{2009/01/25}{make sure that the s of acp get smaller as well when the smaller option is active}
% \changes{v1.33}{2008/12/19}{enrico.gregorio provided a patch for makeing non-description acronym lists work}
@@ -489,7 +490,7 @@
% \begin{macrocode}
%<*acrotest>
\documentclass{article}
-\usepackage{hyperref}
+\usepackage[colorlinks]{hyperref}
\usepackage[printonlyused,withpage]{acronym}
\begin{document}
@@ -573,8 +574,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}[2009/10/20
- v1.35
+\ProvidesPackage{acronym}[2010/09/08
+ v1.36
Support for acronyms (Tobias Oetiker)]
\RequirePackage{suffix}
% \end{macrocode}
@@ -663,7 +664,7 @@ blocks to be tested separately. The latter are commonly indicated as
% \begin{macrocode}
\newif\ifAC@nolist
\AC@nolistfalse
-\DeclareOption{nolist}{\AC@nolisttrue}
+\DeclareOption{nolist}{\AC@nolisttrue\AC@nohyperlinkstrue}
% \end{macrocode}
% \end{macro}
%
@@ -1184,7 +1185,7 @@ blocks to be tested separately. The latter are commonly indicated as
\PackageWarning{acronym}{Acronym `#3' is not defined}%
\textbf{#3!}%
\else
- \expandafter#2#1\null
+ \expandafter#2#1%
\fi}
% \end{macrocode}
% \end{macro}
@@ -1193,10 +1194,10 @@ blocks to be tested separately. The latter are commonly indicated as
% \begin{macro}{\AC@acl}
% The internal commands \cmd{\AC@acs} and \cmd{\AC@acl} returns
% the (unformatted) short and the long forms of an acronym as
-% saved in \fnacro.
+% saved in \fnacro. Mbox to prevent hyphenation of short form.
% \begin{macrocode}
\newcommand*\AC@acs[1]{%
- \expandafter\AC@get\csname fn@#1\endcsname\@firstoftwo{#1}}
+ \mbox{\expandafter\AC@get\csname fn@#1\endcsname\@firstoftwo{#1}}}
% \end{macrocode}
% \begin{macrocode}
\newcommand*\AC@acl[1]{%
diff --git a/Master/texmf-dist/source/latex/acronym/acronym.ins b/Master/texmf-dist/source/latex/acronym/acronym.ins
index a2e9f586a08..febefc36372 100644
--- a/Master/texmf-dist/source/latex/acronym/acronym.ins
+++ b/Master/texmf-dist/source/latex/acronym/acronym.ins
@@ -4,7 +4,7 @@
%% driver files from the doc files in this package when run through
%% LaTeX or TeX.
%%
-%% Copyright 1995--2009 by Tobias Oetiker (tobi@oetiker.ch)
+%% Copyright 1995--2010 by Tobias Oetiker (tobi@oetiker.ch)
%% and individual authors listed elsewhere
%% in this file.
%% All rights reserved.
diff --git a/Master/texmf-dist/tex/latex/acronym/acronym.sty b/Master/texmf-dist/tex/latex/acronym/acronym.sty
index 4e9041450aa..df38b32ffb4 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}[2009/10/20
- v1.35
+\ProvidesPackage{acronym}[2010/09/08
+ v1.36
Support for acronyms (Tobias Oetiker)]
\RequirePackage{suffix}
\newif\ifAC@footnote
@@ -64,7 +64,7 @@
\DeclareOption{dua}{\AC@duatrue}
\newif\ifAC@nolist
\AC@nolistfalse
-\DeclareOption{nolist}{\AC@nolisttrue}
+\DeclareOption{nolist}{\AC@nolisttrue\AC@nohyperlinkstrue}
\ProcessOptions\relax
\ifAC@smaller
\RequirePackage{relsize}
@@ -308,10 +308,10 @@
\PackageWarning{acronym}{Acronym `#3' is not defined}%
\textbf{#3!}%
\else
- \expandafter#2#1\null
+ \expandafter#2#1%
\fi}
\newcommand*\AC@acs[1]{%
- \expandafter\AC@get\csname fn@#1\endcsname\@firstoftwo{#1}}
+ \mbox{\expandafter\AC@get\csname fn@#1\endcsname\@firstoftwo{#1}}}
\newcommand*\AC@acl[1]{%
\expandafter\AC@get\csname fn@#1\endcsname\@secondoftwo{#1}}
\newcommand*{\acs}{\AC@starredfalse\protect\acsa}%