summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2015-08-25 23:12:09 +0000
committerKarl Berry <karl@freefriends.org>2015-08-25 23:12:09 +0000
commit30c05698273f323602dbce2a2de69a2d3595ca59 (patch)
tree4089f5dd39dbc020248e82c9cc9a3dc4af401673
parentb1a554d293617f76634731d09271d441fd54ba32 (diff)
acro (25aug15)
git-svn-id: svn://tug.org/texlive/trunk@38203 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.pdfbin538085 -> 539739 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acro/acro_en.tex26
-rw-r--r--Master/texmf-dist/doc/latex/acro/example_two.tex4
-rw-r--r--Master/texmf-dist/tex/latex/acro/acro.sty11
5 files changed, 30 insertions, 15 deletions
diff --git a/Master/texmf-dist/doc/latex/acro/README b/Master/texmf-dist/doc/latex/acro/README
index 54bb91a97ee..2e30862a000 100644
--- a/Master/texmf-dist/doc/latex/acro/README
+++ b/Master/texmf-dist/doc/latex/acro/README
@@ -1,9 +1,9 @@
--------------------------------------------------------------------------
-the ACRO package v2.0
+the ACRO package v2.0a
Typeset Acronyms
-2015/08/16
+2015/08/25
--------------------------------------------------------------------------
Clemens Niederberger
Web: http://www.mychemistry.eu/forums/forum/acro/
diff --git a/Master/texmf-dist/doc/latex/acro/acro_en.pdf b/Master/texmf-dist/doc/latex/acro/acro_en.pdf
index aba65c0ac93..3cd1857dd2c 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 11b05f82fff..e7cd6970528 100644
--- a/Master/texmf-dist/doc/latex/acro/acro_en.tex
+++ b/Master/texmf-dist/doc/latex/acro/acro_en.tex
@@ -33,7 +33,9 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-\documentclass[load-preamble+,scrartcl={DIV10}]{cnltx-doc}
+\documentclass[load-preamble+]{cnltx-doc}
+% \KOMAoptions{DIV = 10}
+
\usepackage[utf8]{inputenc}
\usepackage[single,macros,accsupp,index]{acro}
\setcnltx{
@@ -295,8 +297,7 @@ may want to choose \pkg{nomencl} (or again: \pkg{glossaries}) and so on.
\section{Basics}
\subsection{Creating New Acronyms}
-\noindent\changedversion{1.0}Acronyms are created with the command
-\cs{DeclareAcronym} that can only be used in the preamble.
+Acronyms\changedversion{1.0} are created with the command \cs{DeclareAcronym}.
\begin{commands}
\command{DeclareAcronym}[\marg{id}\marg{list of keys}]
The basic command for declaring an acronym.
@@ -319,13 +320,24 @@ documentation.
%% short-plural
\keyval{short-plural}{text}\Default{s}
the plural ending appended to the short form.
+ %% short-plural-form
+ \keyval{short-plural-form}{text}
+ the\sinceversion{2.0}plural short form of the acronym; replaces the short
+ form when used instead of appending the plural ending.
%% long-plural
\keyval{long-plural}{text}\Default{s}
the plural ending appended to the long form.
%% long-plural-form
- \keyval{long-plural-form}{text}
- plural long form of the acronym; replaces the long form when used
- instead of appending the plural ending.
+ \keyval{long-plural-form}{text}
+ plural long form of the acronym; replaces the long form when used
+ instead of appending the plural ending.
+ %% alt-plural
+ \keyval{alt-plural}{text}\Default{s}
+ the\sinceversion{2.0} plural ending appended to the alternative form.
+ %% alt-plural-form
+ \keyval{alt-plural-form}{text}
+ the\sinceversion{2.0}plural alternative form of the acronym; replaces the
+ alternative form when used instead of appending the plural ending.
%% list
\keyval{list}{text}
\sinceversion{1.4}if specified this will be written in the list as
@@ -1181,7 +1193,7 @@ possible output forms of the acronyms.
being there are many translations missing, yet. Please notify me if you
find your language missing.
%%
- \keyval{list-table-width}{dimension}\Default{.7\cs*{linewidth}}
+ \keyval{list-table-width}{dimension}\Default{.7\cs*{columnwidth}}
This has only an effect if you chose \key{list-type}{table}. The
\emph{second} column (or the third if you choose one of the \code{-rev}
styles) of the table is a \code{p} column whose width can be specified
diff --git a/Master/texmf-dist/doc/latex/acro/example_two.tex b/Master/texmf-dist/doc/latex/acro/example_two.tex
index f75738b45f4..bc491b5b995 100644
--- a/Master/texmf-dist/doc/latex/acro/example_two.tex
+++ b/Master/texmf-dist/doc/latex/acro/example_two.tex
@@ -79,7 +79,7 @@ and then there are big discussion whether \ac{CDMA} should have
been chosen over \ac{TDMA}.
\section{Furthermore}
-\acreset
+\acresetall
The reader could have forgotten all the nice acronyms, so we repeat the
meaning again.
@@ -113,4 +113,4 @@ blocks to be tested separately. The latter are commonly indicated as
\printacronyms
-\end{document} \ No newline at end of file
+\end{document}
diff --git a/Master/texmf-dist/tex/latex/acro/acro.sty b/Master/texmf-dist/tex/latex/acro/acro.sty
index 0bf51f6373b..1dab58409c2 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,l3sort,xparse,l3keys2e,xtemplate}
\ProvidesExplPackage
{acro}
- {2015/08/16}
- {2.0}
+ {2015/08/25}
+ {2.0a}
{Typeset Acronyms}
% --------------------------------------------------------------------------
@@ -281,7 +281,8 @@
% --------------------------------------------------------------------------
% length variables:
\dim_new:N \l__acro_table_width_dim
-\dim_set:Nn \l__acro_table_width_dim { .7\linewidth }
+\AtBeginDocument
+ { \dim_set:Nn \l__acro_table_width_dim { .7\columnwidth } }
\dim_new:N \l__acro_page_space_dim
% --------------------------------------------------------------------------
@@ -2318,7 +2319,7 @@
\bool_if:nTF
{
\bool_if_p:c { g__acro_#1_used_bool } &&
- ( !\__acro_is_single_p:n {#1} )
+ ( !\acro_if_is_single_p:n {#1} )
}
{ \prg_return_true: }
{ \prg_return_false: }
@@ -3302,6 +3303,8 @@
(https://bitbucket.org/cgnieder/acro/issue/44)
- implement https://bitbucket.org/cgnieder/acro/issue/35
- new option `single-form'
+2015/08/16 v2.0a - fix https://bitbucket.org/cgnieder/acro/issue/38 and
+ https://bitbucket.org/cgnieder/acro/issue/49
% --------------------------------------------------------------------------
update => http://tex.stackexchange.com/questions/236362