diff options
| author | Karl Berry <karl@freefriends.org> | 2019-10-13 21:46:45 +0000 |
|---|---|---|
| committer | Karl Berry <karl@freefriends.org> | 2019-10-13 21:46:45 +0000 |
| commit | 91284e8864b60adf2269790bccb4878887c72bcb (patch) | |
| tree | 712f1c9c13a90d3b54157de565419d8f9836bbc6 /Master/texmf-dist/tex/latex | |
| parent | 1828cfdc0e3f0b73f56269b2a136f1a06af68c86 (diff) | |
acro (12oct19)
git-svn-id: svn://tug.org/texlive/trunk@52373 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
| -rw-r--r-- | Master/texmf-dist/tex/latex/acro/acro.sty | 52 |
1 files changed, 30 insertions, 22 deletions
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 { |