texlive[52373] Master/texmf-dist: acro (12oct19)

[commits+karl at tug.org]

Revision: 52373
          http://tug.org/svn/texlive?view=revision&revision=52373
Author:   karl
Date:     2019-10-13 23:46:45 +0200 (Sun, 13 Oct 2019)
Log Message:
-----------
acro (12oct19)

Modified Paths:
--------------
    trunk/Master/texmf-dist/doc/latex/acro/README
    trunk/Master/texmf-dist/doc/latex/acro/acro.history
    trunk/Master/texmf-dist/doc/latex/acro/acro_en.pdf
    trunk/Master/texmf-dist/doc/latex/acro/acro_en.tex
    trunk/Master/texmf-dist/tex/latex/acro/acro.sty

Modified: trunk/Master/texmf-dist/doc/latex/acro/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acro/README	2019-10-13 21:45:09 UTC (rev 52372)
+++ trunk/Master/texmf-dist/doc/latex/acro/README	2019-10-13 21:46:45 UTC (rev 52373)
@@ -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

Modified: trunk/Master/texmf-dist/doc/latex/acro/acro.history
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acro/acro.history	2019-10-13 21:45:09 UTC (rev 52372)
+++ trunk/Master/texmf-dist/doc/latex/acro/acro.history	2019-10-13 21:46:45 UTC (rev 52373)
@@ -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

Modified: trunk/Master/texmf-dist/doc/latex/acro/acro_en.pdf
===================================================================
(Binary files differ)

Modified: trunk/Master/texmf-dist/doc/latex/acro/acro_en.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acro/acro_en.tex	2019-10-13 21:45:09 UTC (rev 52372)
+++ trunk/Master/texmf-dist/doc/latex/acro/acro_en.tex	2019-10-13 21:46:45 UTC (rev 52373)
@@ -509,7 +509,7 @@
 \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}

Modified: trunk/Master/texmf-dist/tex/latex/acro/acro.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/acro/acro.sty	2019-10-13 21:45:09 UTC (rev 52372)
+++ trunk/Master/texmf-dist/tex/latex/acro/acro.sty	2019-10-13 21:46:45 UTC (rev 52373)
@@ -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
   {