acro (7mar20)

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

1 files changed, 20 insertions, 6 deletions

diff --git a/Master/texmf-dist/tex/latex/acro/acro.sty b/Master/texmf-dist/tex/latex/acro/acro.sty
index 7346367aff9..5209dda3ca9 100644
--- a/Master/texmf-dist/tex/latex/acro/acro.sty
+++ b/Master/texmf-dist/tex/latex/acro/acro.sty
@@ -35,10 +35,10 @@
 
 \ExplSyntaxOn
 
-\tl_const:Nn \c_acro_date_tl                 {2020/02/03}
+\tl_const:Nn \c_acro_date_tl                 {2020/03/07}
 \tl_const:Nn \c_acro_version_major_number_tl {2}
 \tl_const:Nn \c_acro_version_minor_number_tl {11}
-\tl_const:Nn \c_acro_version_subrelease_tl   {c}
+\tl_const:Nn \c_acro_version_subrelease_tl   {d}
 \tl_const:Nx \c_acro_version_number_tl
   {
     \c_acro_version_major_number_tl .
@@ -174,6 +174,7 @@
 \bool_new:N      \l__acro_custom_alt_format_bool
 \bool_new:N      \l__acro_custom_long_format_bool
 \bool_new:N      \l__acro_custom_short_format_bool
+\bool_new:N      \l__acro_custom_foreign_format_bool
 \bool_new:N      \l__acro_extra_punct_bool
 \bool_new:N      \l__acro_extra_use_brackets_bool
 \bool_new:N      \g__acro_first_acronym_declared_bool
@@ -529,8 +530,8 @@
       \tl_set_eq:NN \l__acro_alt_format_tl \l__acro_short_format_tl
       \tl_set:Nn \l__acro_list_short_format_tl {#1} ,
     short-format      .value_required:n = true ,
-    alt-format      .code:n     =
-      \tl_set:Nn \l__acro_alt_format_tl {#1} ,
+    alt-format        .tl_set:N   = \l__acro_alt_format_tl ,
+    alt-format        .value_required:n = true ,
     long-format       .code:n     =
       \tl_set:Nn \l__acro_long_format_tl {#1}
       \tl_set:Nn \l__acro_first_long_format_tl {#1}
@@ -2074,6 +2075,12 @@
         \bool_set_true:N \l__acro_custom_alt_format_bool
       }
       { \bool_set_false:N \l__acro_custom_alt_format_bool }
+    \acro_property_get:nnTF {#1} {foreign-format}
+      {
+        \tl_set_eq:NN \l__acro_custom_foreign_format_tl \l__acro_foreign_format_tl
+        \bool_set_true:N \l__acro_custom_foreign_format_bool
+      }
+      { \bool_set_false:N \l__acro_custom_foreign_format_bool }
     \acro_property_get:nn {#1} {single-format}
     \acro_for_endings_do:n
       {
@@ -2110,7 +2117,7 @@
 % input
 % #1: ending
 % #2: id
-% #3: short|alt|long
+% #3: short|alt|long|foreign
 \cs_new_protected:Npn \__acro_set_ending_for:nnn #1#2#3
   {
     \acro_if_ending_form_exist:nnT {#1} {#3}
@@ -2199,6 +2206,12 @@
                 { \l__acro_custom_alt_format_tl }
                 { \l__acro_alt_format_tl }
             }
+            {foreign}
+            {
+              \bool_if:NTF \l__acro_custom_foreign_format_bool
+                { \l__acro_custom_foreign_format_tl }
+                { \l__acro_foreign_format_tl }
+            }
           }
       }
       { \use:n }
@@ -2652,6 +2665,7 @@
         \acro_property_get:nnT {#1} {foreign}
           {
             \group_begin:
+              \__acro_endings:nn {#1} {foreign}
               \tl_use:N \l__acro_foreign_format_tl
               {
                 \acro_foreign_language:VV
@@ -2663,7 +2677,7 @@
       }
   }
 
-\cs_new:Npn \acroenparen #1 { ( #1 ) }
+\cs_new:Npn \acroenparen #1 { (#1) }
 
 \cs_new_protected:Npn \acro_get_foreign:n #1
   {