summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-10-13 21:46:45 +0000
committerKarl Berry <karl@freefriends.org>2019-10-13 21:46:45 +0000
commit91284e8864b60adf2269790bccb4878887c72bcb (patch)
tree712f1c9c13a90d3b54157de565419d8f9836bbc6
parent1828cfdc0e3f0b73f56269b2a136f1a06af68c86 (diff)
acro (12oct19)
git-svn-id: svn://tug.org/texlive/trunk@52373 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/acro/README3
-rw-r--r--Master/texmf-dist/doc/latex/acro/acro.history1
-rw-r--r--Master/texmf-dist/doc/latex/acro/acro_en.pdfbin566338 -> 565833 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acro/acro_en.tex2
-rw-r--r--Master/texmf-dist/tex/latex/acro/acro.sty52
5 files changed, 33 insertions, 25 deletions
diff --git a/Master/texmf-dist/doc/latex/acro/README b/Master/texmf-dist/doc/latex/acro/README
index 710728a81ba..8263eb47e5a 100644
--- a/Master/texmf-dist/doc/latex/acro/README
+++ b/Master/texmf-dist/doc/latex/acro/README
@@ -1,9 +1,8 @@
--------------------------------------------------------------------------
-the ACRO package v2.10b
+the ACRO package v2.10c 2019/10/12
Typeset Acronyms
-2019/10/06
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://bitbucket.org/cgnieder/acro
diff --git a/Master/texmf-dist/doc/latex/acro/acro.history b/Master/texmf-dist/doc/latex/acro/acro.history
index 8d3cbdf6531..c442d5bb523 100644
--- a/Master/texmf-dist/doc/latex/acro/acro.history
+++ b/Master/texmf-dist/doc/latex/acro/acro.history
@@ -266,3 +266,4 @@
2019/10/06 v2.10b - fix issue #137
- clearer documentation of `uppercase-short'
- set the default of `uppercase-short' to `true'
+2019/10/12 v2.10c - fix issue #139
diff --git a/Master/texmf-dist/doc/latex/acro/acro_en.pdf b/Master/texmf-dist/doc/latex/acro/acro_en.pdf
index 3b7332abbb9..31e6bdb4403 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 1df3caab9b8..2ac8b01d657 100644
--- a/Master/texmf-dist/doc/latex/acro/acro_en.tex
+++ b/Master/texmf-dist/doc/latex/acro/acro_en.tex
@@ -509,7 +509,7 @@ This is an example of the logging info with \keyis{log}{true} or
\keyis{log}{silent}.
\begin{sourcecode}
=================================================
- | acro info -- defining new acronym:
+ | Package acro Info -- defining new acronym:
| ID = {jpg}
| short = {JPEG}
| long = {Joint Photographic Experts Group}
diff --git a/Master/texmf-dist/tex/latex/acro/acro.sty b/Master/texmf-dist/tex/latex/acro/acro.sty
index d5e477a0f48..4f94b1304c8 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,etoolbox}
\ProvidesExplPackage
{acro}
- {2019/10/06}
- {2.10b}
+ {2019/10/12}
+ {2.10c}
{Typeset Acronyms}
% --------------------------------------------------------------------------
@@ -3507,20 +3507,42 @@
\fi:
}
+\cs_new:Npn \acro_expandable_short:n #1
+ { \use:e { \prop_item:Nn \l__acro_short_prop {#1} } }
+
+\cs_new:Npn \acro_expandable_alt:n #1
+ { \use:e { \prop_item:Nn \l__acro_alt_prop {#1} } }
+
\cs_new:Npn \acro_expandable_long:n #1
- { \prop_item:Nn \l__acro_long_prop {#1} }
+ { \use:e { \prop_item:Nn \l__acro_long_prop {#1} } }
\cs_new:Npn \acro_expandable_long_plural:n #1
{
- \bool_if:nTF
- { \prop_item:Nn \l__acro_long_plural_form_prop {#1} }
- { \prop_item:Nn \l__acro_long_plural_prop {#1} }
+ \bool_if:cTF
+ { c_ \prop_item:Nn \l__acro_long_plural_form_prop {#1} _bool }
+ { \use:e { \prop_item:Nn \l__acro_long_plural_prop {#1} } }
{
- \prop_item:Nn \l__acro_long_prop {#1}
- \prop_item:Nn \l__acro_long_plural_prop {#1}
+ \use:e {
+ \prop_item:Nn \l__acro_long_prop {#1}
+ \prop_item:Nn \l__acro_long_plural_prop {#1}
+ }
}
}
+\cs_new:Npn \acro_pdf_string_short:n #1
+ {
+ \acro_if_star_gobble:nTF {#1}
+ { \acro_expandable_short:n }
+ { \acro_expandable_short:n {#1} }
+ }
+
+\cs_new:Npn \acro_pdf_string_alt:n #1
+ {
+ \acro_if_star_gobble:nTF {#1}
+ { \acro_expandable_alt:n }
+ { \acro_expandable_alt:n {#1} }
+ }
+
\cs_new:Npn \acro_pdf_string_long:n #1
{
\acro_if_star_gobble:nTF {#1}
@@ -3535,20 +3557,6 @@
{ \acro_expandable_long_plural:n }
{ \acro_expandable_long_plural:n {#1} }
}
-
-\cs_new:Npn \acro_pdf_string_short:n #1
- {
- \acro_if_star_gobble:nTF {#1}
- { \prop_item:Nn \l__acro_pdfstring_short_prop }
- { \prop_item:Nn \l__acro_pdfstring_short_prop {#1} }
- }
-
-\cs_new:Npn \acro_pdf_string_alt:n #1
- {
- \acro_if_star_gobble:nTF {#1}
- { \prop_item:Nn \l__acro_pdfstring_alt_prop }
- { \prop_item:Nn \l__acro_pdfstring_alt_prop {#1} }
- }
\AtBeginDocument
{