texlive[54156] Master/texmf-dist: acro (7mar20)
commits+karl at tug.org
commits+karl at tug.org
Sat Mar 7 22:39:41 CET 2020
Revision: 54156
http://tug.org/svn/texlive?view=revision&revision=54156
Author: karl
Date: 2020-03-07 22:39:40 +0100 (Sat, 07 Mar 2020)
Log Message:
-----------
acro (7mar20)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/acro/README
trunk/Master/texmf-dist/doc/latex/acro/acro-manual.pdf
trunk/Master/texmf-dist/doc/latex/acro/acro.history
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 2020-03-07 21:39:27 UTC (rev 54155)
+++ trunk/Master/texmf-dist/doc/latex/acro/README 2020-03-07 21:39:40 UTC (rev 54156)
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the ACRO package v2.11c 2020/02/03
+the ACRO package v2.11d 2020/03/07
Typeset Acronyms
Modified: trunk/Master/texmf-dist/doc/latex/acro/acro-manual.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/acro/acro.history
===================================================================
--- trunk/Master/texmf-dist/doc/latex/acro/acro.history 2020-03-07 21:39:27 UTC (rev 54155)
+++ trunk/Master/texmf-dist/doc/latex/acro/acro.history 2020-03-07 21:39:40 UTC (rev 54156)
@@ -283,3 +283,4 @@
2020/01/16 v2.11a - adapt to new l3text module
2020/01/24 v2.11b - fix issue #147
2020/02/03 v2.11c - fix issue #76
+2020/03/07 v2.11c - fix issues #149 and #150
Modified: trunk/Master/texmf-dist/tex/latex/acro/acro.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/acro/acro.sty 2020-03-07 21:39:27 UTC (rev 54155)
+++ trunk/Master/texmf-dist/tex/latex/acro/acro.sty 2020-03-07 21:39:40 UTC (rev 54156)
@@ -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
{
More information about the tex-live-commits
mailing list.