summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-04-05 23:10:37 +0000
committerKarl Berry <karl@freefriends.org>2013-04-05 23:10:37 +0000
commitc26903056a67bff6777edf6ab6062ab268d67980 (patch)
tree4e96d12af004b93b2905e5891f2626a678d3b193
parent4adb9b54822d933c66b163945c3ab551e8a434eb (diff)
acro (5apr13)
git-svn-id: svn://tug.org/texlive/trunk@29681 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/acro/README4
-rw-r--r--Master/texmf-dist/doc/latex/acro/acro_en.pdfbin485444 -> 492735 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acro/acro_en.tex132
-rw-r--r--Master/texmf-dist/tex/latex/acro/acro.sty54
4 files changed, 108 insertions, 82 deletions
diff --git a/Master/texmf-dist/doc/latex/acro/README b/Master/texmf-dist/doc/latex/acro/README
index 35a1e727cbe..7c6ef9d0199 100644
--- a/Master/texmf-dist/doc/latex/acro/README
+++ b/Master/texmf-dist/doc/latex/acro/README
@@ -1,9 +1,9 @@
--------------------------------------------------------------------------
-the ACRO package v1.2
+the ACRO package v1.2a
Typeset Acronyms
-2013/02/09
+2013/04/04
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://bitbucket.org/cgnieder/acro/
diff --git a/Master/texmf-dist/doc/latex/acro/acro_en.pdf b/Master/texmf-dist/doc/latex/acro/acro_en.pdf
index 3c8227899e2..8a9aab7756e 100644
--- a/Master/texmf-dist/doc/latex/acro/acro_en.pdf
+++ b/Master/texmf-dist/doc/latex/acro/acro_en.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/acro/acro_en.tex b/Master/texmf-dist/doc/latex/acro/acro_en.tex
index fc75e3f8c96..28d3f2aa069 100644
--- a/Master/texmf-dist/doc/latex/acro/acro_en.tex
+++ b/Master/texmf-dist/doc/latex/acro/acro_en.tex
@@ -67,7 +67,7 @@
acsetup,acsp,
addcolon,
DeclareAcronym,DeclareAcronymCitation,DeclareAcronymFormat,
- DeclareAcronymPDFString,
+ DeclareAcronymPDFString,DeclareTranslation,
iac,Iac,iaca,Iaca,iacs,Iacs,iacl,Iacl,iacf,Iacf,iacflike,Iacflike,
linewidth,
nato,newlist,ny,
@@ -81,74 +81,80 @@
\addbibresource{\jobname.bib}
\begin{filecontents}{\jobname.bib}
@package{abbrevs,
- title = {abbrevs},
- author = {Matt Swift},
- date = {2001-09-08},
- version = {1.4},
- url = {http://www.ctan.org/pkg/abbrevs}
+ title = {abbrevs},
+ author = {Matt Swift},
+ date = {2001-09-08},
+ version = {1.4},
+ url = {http://www.ctan.org/pkg/abbrevs}
}
@package{acromake,
- title = {acromake},
- author = {Paul A. Thompson},
- date = {1995-07-16},
- version = {na},
- url = {http://www.ctan.org/pkg/acromake}
+ title = {acromake},
+ author = {Paul A. Thompson},
+ date = {1995-07-16},
+ version = {na},
+ url = {http://www.ctan.org/pkg/acromake}
}
@package{acronym,
- title = {acronym -- An Acronym Environment for \LaTeXe},
- author = {Tobias Oetiker},
- date = {2012-10-29},
- version = {1.38},
- url = {http://www.ctan.org/pkg/acronym}
+ title = {acronym},
+ subtitle = {An Acronym Environment for \LaTeXe},
+ author = {Tobias Oetiker},
+ date = {2012-10-29},
+ version = {1.38},
+ url = {http://www.ctan.org/pkg/acronym}
}
@package{acroterm,
- title = {acroterm},
- author = {Jakob Voss},
- date = {2010-11-19},
- version = {0.1},
- url = {http://www.ctan.org/pkg/acroterm}
+ title = {acroterm},
+ author = {Jakob Voss},
+ date = {2010-11-19},
+ version = {0.1},
+ url = {http://www.ctan.org/pkg/acroterm}
}
@package{glossaries,
- title = {glossaries},
- author = {Nicola L.C. Talbot},
- date = {2012-11-18},
- version = {3.04},
- url = {http://www.ctan.org/pkg/glossaries}
+ title = {glossaries},
+ author = {Nicola L.C. Talbot},
+ date = {2012-11-18},
+ version = {3.04},
+ url = {http://www.ctan.org/pkg/glossaries}
}
@package{nomencl,
- title = {nomencl -- A Package to Create a Nomenclature},
- author = {Boris Veytsman and Bernd Schandl and Lee Netherton and C.V. Radhakrishnan},
- date = {2005-09-22},
- version = {4.2},
- url = {http://www.ctan.org/pkg/nomencl}
+ title = {nomencl},
+ subtitle = {A Package to Create a Nomenclature},
+ author = {Boris Veytsman and Bernd Schandl and Lee Netherton and C.V. Radhakrishnan},
+ date = {2005-09-22},
+ version = {4.2},
+ url = {http://www.ctan.org/pkg/nomencl}
}
@online{wikipedia,
- author = {Wikipedia},
- title = {Acronym and initialism},
- urldate = {2012-06-21},
- url = {http://en.wikipedia.org/wiki/Acronyms},
- year = {2012}
+ author = {Wikipedia},
+ title = {Acronym and initialism},
+ urldate = {2012-06-21},
+ url = {http://en.wikipedia.org/wiki/Acronyms},
+ year = {2012}
}
@online{NewYork,
- author = {Wikipedia},
- title = {New York City},
- urldate = {2012-09-27},
- url = {http://en.wikipedia.org/wiki/New_York_City},
- year = {2012}
+ author = {Wikipedia},
+ title = {New York City},
+ urldate = {2012-09-27},
+ url = {http://en.wikipedia.org/wiki/New_York_City},
+ year = {2012}
}
\end{filecontents}
-\begin{filecontents}{\jobname.ist}
+\usepackage{imakeidx}
+\begin{filecontents*}{\jobname.ist}
heading_prefix "{\\bfseries "
heading_suffix "\\hfil}\\nopagebreak\n"
headings_flag 1
- delim_0 "\\dotfill "
- delim_1 "\\dotfill "
- delim_2 "\\dotfill "
- delim_r "\\textendash"
+ delim_0 "\\dotfill\\hyperpage{"
+ delim_1 "\\dotfill\\hyperpage{"
+ delim_2 "\\dotfill\\hyperpage{"
+ delim_r "}\\textendash\\hyperpage{"
+ delim_t "}"
suffix_2p "\\nohyperpage{\\,f.}"
suffix_3p "\\nohyperpage{\\,ff.}"
-\end{filecontents}
+\end{filecontents*}
+\indexsetup{noclearpage,othercode=\footnotesize}
+\makeindex[options={-s \jobname.ist},intoc,columns=3]
\TitlePicture{\parbox{.75\linewidth}{%
\acro not only allows you to create acronyms in a simple way but also lets you
@@ -264,18 +270,15 @@
long-indefinite = an
}
-\usepackage{imakeidx}
-\makeindex[columns=2,options={-sl \jobname.ist},intoc]
-
\usepackage{marginnote}
\makeatletter
-\newcommand*\sinceversion[1]{%
+\providecommand*\sinceversion[1]{%
\@bsphack
\marginnote{%
\footnotesize\sffamily\RaggedRight
\textcolor{black!75}{Introduced in version~#1}}%
\@esphack}
-\newcommand*\changedversion[1]{%
+\providecommand*\changedversion[1]{%
\@bsphack
\marginnote{%
\footnotesize\sffamily\RaggedRight
@@ -289,7 +292,7 @@
\newrobustcmd\@versionstar{\raisebox{-.25em}{*}}
\newcommand\versionstar{\texorpdfstring{\@versionstar}{*}}
-\newcommand*\CTANlink[1]{\href{http://www.ctan.org/pkg/#1}{#1}}
+\providecommand*\CTANlink[1]{\href{http://www.ctan.org/pkg/#1}{#1}}
\makeatother
\begin{document}
@@ -1140,10 +1143,27 @@ style you either have to use the package option \key{record-pages}{false} which
means you will have to pass on page numbers in the list of acronyms, or you need
to make sure that you only use the \emph{starred} versions of the \cmd{ac} commands
on these pages so acronyms don't count as used there!
-\secidx*{Customization}
-
\secidx*{About Page Ranges}
+\section{Language Support}\secidx{Language Support}
+\acro detects if packages \paket{babel} or \paket{polyglossia} are being loaded
+and tries to adapt certain strings to match the chosen language. However, due
+to my limited language knowledge only a few translations are provided. I'll
+show how the English translations are defined so you can add the translations
+to your preamble if needed. Even better would be you'd send me a short email
+at \href{mailto:contact@mychemistry.eu}{contact@mychemistry.eu} with the
+appropriate translations for your language and I'll add them to \acro.
+
+\begin{beispiel}[code only]
+ \DeclareTranslation{English}{acronym-list-name}{Acronyms}
+ \DeclareTranslation{English}{acronym-page-name}{p.}
+ \DeclareTranslation{English}{acronym-pages-name}{pp.}
+ \DeclareTranslation{English}{acronym-next-page}{f.}
+ \DeclareTranslation{English}{acronym-next-pages}{ff.}
+\end{beispiel}
+\secidx*{Language Support}
+\secidx*{Customization}
+
\section{hyperref Support}\secidx{\paket{hyperref} support}[hyperref Support]
The option \key{hyperref}{true} adds internal links from all short (or alternative)
forms to their respective list entries. Of course this only works if you have
@@ -1208,7 +1228,7 @@ description ask me for the documentation to version~0.6a.
\end{beispiel}
\printacronyms[include-classes=city,name=City Acronyms]
-{\RaggedRight\EmbracOff
+{\RaggedRight
\printbibliography}
\indexprologue{%
diff --git a/Master/texmf-dist/tex/latex/acro/acro.sty b/Master/texmf-dist/tex/latex/acro/acro.sty
index 12deaec79fd..5b56c7c2318 100644
--- a/Master/texmf-dist/tex/latex/acro/acro.sty
+++ b/Master/texmf-dist/tex/latex/acro/acro.sty
@@ -31,8 +31,8 @@
\RequirePackage{expl3,xparse,l3keys2e,xtemplate}
\ProvidesExplPackage
{acro}
- {2013/02/09}
- {1.2}
+ {2013/04/04}
+ {1.2a}
{Typeset Acronyms}
% warning and error messages:
@@ -2035,36 +2035,41 @@
% language support
\RequirePackage { translations }
% Listenname
-\DeclareTranslationFallback { acronym-list-name } { Acronyms }
-\DeclareTranslation { English } { acronym-list-name } { Acronyms }
-\DeclareTranslation { American } { acronym-list-name } { Acronyms }
-\DeclareTranslation { British } { acronym-list-name } { Acronyms }
-\DeclareTranslation { French } { acronym-list-name } { Acronymes }
-\DeclareTranslation { German } { acronym-list-name } { Abk\"urzungen }
-\DeclareTranslation { Italian } { acronym-list-name } { Acronimi }
-\DeclareTranslation { Spanish } { acronym-list-name } { Siglas }
-\DeclareTranslation { Catalan } { acronym-list-name } { Sigles }
-\DeclareTranslation { Turkish } { acronym-list-name } { K\i saltmalar }
+\DeclareTranslationFallback { acronym-list-name } { Acronyms }
+\DeclareTranslation { English } { acronym-list-name } { Acronyms }
+\DeclareTranslation { American } { acronym-list-name } { Acronyms }
+\DeclareTranslation { British } { acronym-list-name } { Acronyms }
+\DeclareTranslation { French } { acronym-list-name } { Acronymes }
+\DeclareTranslation { German } { acronym-list-name } { Abk\"urzungen }
+\DeclareTranslation { Italian } { acronym-list-name } { Acronimi }
+\DeclareTranslation { Portuguese } { acronym-list-name } { Acr\'onimos }
+\DeclareTranslation { Spanish } { acronym-list-name } { Siglas }
+\DeclareTranslation { Catalan } { acronym-list-name } { Sigles }
+\DeclareTranslation { Turkish } { acronym-list-name } { K\i saltmalar }
\tl_set:Nn \l__acro_list_name_tl { \GetTranslation { acronym-list-name } }
% Seitenname
-\DeclareTranslationFallback { acronym-page-name } { p. }
-\DeclareTranslation { English } { acronym-page-name } { p. }
-\DeclareTranslation { German } { acronym-page-name } { S. }
+\DeclareTranslationFallback { acronym-page-name } { p. }
+\DeclareTranslation { English } { acronym-page-name } { p. }
+\DeclareTranslation { German } { acronym-page-name } { S. }
+\DeclareTranslation { Portuguese } { acronym-page-name } { p. }
\tl_set:Nn \l__acro_page_name_tl { \GetTranslation { acronym-page-name }\@\, }
% Seitenname - Plural
-\DeclareTranslationFallback { acronym-pages-name } { pp. }
-\DeclareTranslation { English } { acronym-pages-name } { pp. }
-\DeclareTranslation { German } { acronym-pages-name } { S. }
+\DeclareTranslationFallback { acronym-pages-name } { pp. }
+\DeclareTranslation { English } { acronym-pages-name } { pp. }
+\DeclareTranslation { German } { acronym-pages-name } { S. }
+\DeclareTranslation { Portuguese } { acronym-pages-name } { pp. }
\tl_set:Nn \l__acro_pages_name_tl { \GetTranslation { acronym-pages-name }\@\, }
% einzelne folgende Seite
-\DeclareTranslationFallback { acronym-next-page } { f. }
-\DeclareTranslation { English } { acronym-next-page } { f. }
-\DeclareTranslation { German } { acronym-next-page } { f. }
+\DeclareTranslationFallback { acronym-next-page } { f. }
+\DeclareTranslation { English } { acronym-next-page } { f. }
+\DeclareTranslation { German } { acronym-next-page } { f. }
+\DeclareTranslation { Portuguese } { acronym-next-page } { s. }
\tl_set:Nn \l__acro_next_page_tl { \,\GetTranslation {acronym-next-page }\@ }
% mehrere folgende Seiten
-\DeclareTranslationFallback { acronym-next-pages } { ff. }
-\DeclareTranslation { English } { acronym-next-pages } { ff. }
-\DeclareTranslation { German } { acronym-next-pages } { ff. }
+\DeclareTranslationFallback { acronym-next-pages } { ff. }
+\DeclareTranslation { English } { acronym-next-pages } { ff. }
+\DeclareTranslation { German } { acronym-next-pages } { ff. }
+\DeclareTranslation { Portuguese } { acronym-next-pages } { ss. }
\tl_set:Nn \l__acro_next_pages_tl { \,\GetTranslation {acronym-next-pages }\@ }
% --------------------------------------------------------------------------
@@ -2135,6 +2140,7 @@
`long-indefinite'
- new commands: \iac, \Iac, \iacs, \Iacs, \iaca, \Iaca, \iacl,
\Iacl, \iacf, \Iacf, \iacflike and \Iacflike
+2013/04/04 v1.2a - added Portuguese translations
% --------------------------------------------------------------------------
% TODO: