acro (3oct19)

git-svn-id: svn://tug.org/texlive/trunk@52269 c570f23f-e606-0410-a88d-b1316a301751

3 files changed, 35 insertions, 28 deletions

diff --git a/Master/texmf-dist/doc/latex/acro/README b/Master/texmf-dist/doc/latex/acro/README
index c9a69ddaee1..f4872ad2217 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.10
+the ACRO package v2.10a
 
   Typeset Acronyms
 
-2019/09/23
+2019/10/02
 --------------------------------------------------------------------------
 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 e816f76124a..fe818a934f1 100644
--- a/Master/texmf-dist/doc/latex/acro/acro_en.pdf
+++ b/Master/texmf-dist/doc/latex/acro/acro_en.pdf
diff --git a/Master/texmf-dist/tex/latex/acro/acro.sty b/Master/texmf-dist/tex/latex/acro/acro.sty
index 2b5cde75b30..b1b49470183 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/09/23}
-  {2.10}
+  {2019/10/02}
+  {2.10a}
   {Typeset Acronyms}
 
 % --------------------------------------------------------------------------
@@ -313,6 +313,7 @@
 \bool_new:N      \l__acro_custom_short_format_bool
 \bool_new:N      \l__acro_custom_alt_format_bool
 \bool_new:N      \l__acro_custom_long_format_bool
+\bool_new:N      \l__acro_override_list_format_bool
 \bool_new:N      \l__acro_strict_bool
 \bool_new:N      \l__acro_create_macros_bool
 \bool_new:N      \l__acro_first_upper_bool
@@ -435,7 +436,7 @@
 
 % --------------------------------------------------------------------------
 % small commands for use at various places
-\cs_new:Npn \acro_no_break: { \tex_penalty:D \c_ten_thousand }
+\cs_new:Npn \acro_no_break: { \tex_penalty:D 10000 \scan_stop: }
 
 \cs_new_protected:Npn \__acro_first_upper_case:n #1
   { \tl_upper_case:n { \tl_head:n {#1} } \tl_tail:n {#1} }
@@ -496,6 +497,8 @@
     list-long-format  .value_required:n = true ,
     list-foreign-format .tl_set:N = \l__acro_foreign_list_format_tl ,
     list-foreign-format .value_required:n = true ,
+    override-list-format .bool_set:N = \l__acro_override_list_format_bool ,
+    override-list-format .initial:n  = true ,
     extra-format      .tl_set:N   = \l__acro_extra_format_tl ,
     extra-format      .value_required:n = true ,
     single            .bool_set:N = \l__acro_use_single_bool ,
@@ -1403,16 +1406,25 @@
 % #1: id
 \cs_new_protected:Npn \__acro_list_entry_short:n #1
   {
-    \acro_hyper_target:nn
-      {#1}
-      {
-        \acro_acc_supp:nn
-          {#1}
-          {
-            \l__acro_list_short_format_tl
-            \__acro_get_property:nn {short} {#1}
-          }
-      }
+    \group_begin:
+      \acro_get:n {#1}
+      \acro_hyper_target:nn
+        {#1}
+        {
+          \acro_acc_supp:nn
+            {#1}
+            {
+              \bool_if:nTF
+                {
+                  \l__acro_custom_short_format_bool &&
+                  \l__acro_override_list_format_bool
+                }
+                { \l__acro_custom_short_format_tl }
+                { \l__acro_list_short_format_tl }
+              \__acro_get_property:nn {short} {#1}
+            }
+        }
+    \group_end:
   }
 
 % #1: id
@@ -3001,10 +3013,10 @@
           end ~
         end
       }
-    \luatex_directlua:D { \l__acro_tmpa_tl }
+    \lua_now:e { \l__acro_tmpa_tl }
     \cs_new_protected:Npn \acro_strcmp:nn #1#2
       {
-        \luatex_directlua:D
+        \lua_now:e
           {
             acro.strcmp
               (
@@ -3015,11 +3027,11 @@
       }
     \cs_new:Npn \__acro_escape_x:n #1
       {
-        \luatex_luaescapestring:D
-          { \etex_detokenize:D \exp_after:wN { \luatex_expanded:D {#1} } }
+        \lua_escape:e
+          { \__kernel_tl_to_str:w \use:e { {#1} } }
       }
   }
-  { \cs_new_eq:NN \acro_strcmp:nn \pdftex_strcmp:D }
+  { \cs_new_eq:NN \acro_strcmp:nn \tex_strcmp:D }
 
 \AtBeginDocument
   {
@@ -3042,7 +3054,7 @@
                     \acro_strcmp:nn
                       { \str_fold_case:n {##1} }
                       { \str_fold_case:n {##2} }
-                        = - \c_one
+                        = -1
                   }
                   { \sort_return_same: }
                   { \sort_return_swapped: }
@@ -4533,7 +4545,7 @@
       \c_acro_config_file_extension_tl
   }
 
-\tex_endinput:D
+\file_input_stop:
 % --------------------------------------------------------------------------
 % HISTORY:
 2012/06/22 v0.1  - first public release
@@ -4770,9 +4782,4 @@
                  - new: `uppercase-short'
                  - a change to how usage is determined (see def. of
                    \acro_is_used:nTF)
-
-% --------------------------------------------------------------------------
-% TODO:
-- extend option `macros' to also define uppercase macros, possibly as a choice
-- add \ACF, \ACFP, \ACL and \ACLP that will print all words of the long form
-  capitalized
+2019/10/02 v2.10 - fix newly introduced issue #135