summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2017-08-28 23:21:57 +0000
committerKarl Berry <karl@freefriends.org>2017-08-28 23:21:57 +0000
commit562cf4801c5cc3c04317bbdaafc94eec984c0d94 (patch)
treed6e272bf542aaacaec022730ef858eed77157400 /Master
parentc842b000b903dd4298e10d3b23a8e5abaed9c2c7 (diff)
acro (28aug17)
git-svn-id: svn://tug.org/texlive/trunk@45154 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/acro/README4
-rw-r--r--Master/texmf-dist/doc/latex/acro/acro_en.pdfbin565937 -> 565826 bytes
-rw-r--r--Master/texmf-dist/tex/latex/acro/acro.sty27
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds2
4 files changed, 24 insertions, 9 deletions
diff --git a/Master/texmf-dist/doc/latex/acro/README b/Master/texmf-dist/doc/latex/acro/README
index 84320cd3da4..bc95e18f4bd 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.7b
+the ACRO package v2.7c
Typeset Acronyms
-2017/06/21
+2017/08/28
--------------------------------------------------------------------------
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 6d2c10778e0..62ea4bb2a36 100644
--- a/Master/texmf-dist/doc/latex/acro/acro_en.pdf
+++ b/Master/texmf-dist/doc/latex/acro/acro_en.pdf
Binary files differ
diff --git a/Master/texmf-dist/tex/latex/acro/acro.sty b/Master/texmf-dist/tex/latex/acro/acro.sty
index a968e9899ce..8b2aac064d3 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}
- {2017/06/21}
- {2.7b}
+ {2017/08/28}
+ {2.7c}
{Typeset Acronyms}
% --------------------------------------------------------------------------
@@ -3478,16 +3478,21 @@
then.
}
+% #1: acronym
+% #2: property
\cs_new_protected:Npn \__acro_property_check:nn #1#2
{
\tl_if_blank:VT \l__acro_current_property_tl
{ \acro_serious_message:n {no-id} }
- \bool_if:cF { l__acro_#1_short_set_bool }
+ \str_if_eq:nnF {#2} {short}
{
- \keys_set:nn { acro / declare-acronym } { short = {#1} }
- \acro_harmless_message:nn {substitute-short} {#1}
+ \bool_if:cF { l__acro_#1_short_set_bool }
+ {
+ \keys_set:nn { acro / declare-acronym } { short = {#1} }
+ \acro_harmless_message:nn {substitute-short} {#1}
+ }
}
- \bool_new:c { l__acro_#1_#2_set_bool }
+ % \bool_new:c { l__acro_#1_#2_set_bool }
\bool_set_true:c { l__acro_#1_#2_set_bool }
}
@@ -3506,6 +3511,10 @@
% --------------------------------------------------------------------------
% the internal property selection functions for \DeclareAcronym:
+\prop_new:N \g__acro_properties_prop
+
+\cs_new_protected:Npn \acro_for_properties_do:n
+ { \prop_map_inline:Nn \g__acro_properties_prop }
% #1: name in associated cs
% #2: property name
@@ -3515,11 +3524,14 @@
\prop_clear_new:c {l__acro_#1_prop}
\cs_new_protected:cpn {__acro_declare_#1:nn} ##1##2 {#3}
\cs_generate_variant:cn {__acro_declare_#1:nn} {V}
+ % \bool_new:c {l__acro_ \l__acro_current_property_tl _#1_set_bool}
\keys_define:nn {acro/declare-acronym}
{
#2 .code:n =
\use:c {__acro_declare_#1:Vn} \l__acro_current_property_tl {##1}
+ \bool_set_true:c {l__acro_ \l__acro_current_property_tl _#2_set_bool}
}
+ \prop_gput:Nnn \g__acro_properties_prop {#2} {#1}
}
% #1: name in associated cs
@@ -3815,6 +3827,8 @@
\seq_gput_right:Nn \g__acro_declared_acronyms_seq {#1}
\bool_gset_true:N \g__acro_first_acronym_declared_bool
\tl_set:Nn \l__acro_current_property_tl {#1}
+ \acro_for_properties_do:n
+ { \bool_new:c {l__acro_#1_##1_set_bool} }
\keys_set:nn { acro / declare-acronym } {#2}
\bool_new:c {g__acro_#1_first_use_bool}
\bool_new:c {g__acro_#1_used_bool}
@@ -4604,6 +4618,7 @@
- \acro_add_action:n (adds code to \acro_get:n)
2017/02/09 v2.7a - adapt to integration of l3sort into l3kernel
2017/06/21 v2.7b - fix issue #93
+2017/08/28 v2.7c - fix issue #96
% --------------------------------------------------------------------------
% TODO:
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index c1186ea2cdf..8c604f3a178 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -410,7 +410,7 @@ chomp ($Build = `cd $Master/../Build/source && pwd`);
'epyt', "die 'renamed to beamertheme-epyt'",
'eq-save', "die 'skipping, requires acrotex'",
'eq2db', "die 'skipping, author request (and nonfree requirements)'",
- 'eqexam', "die 'skipping, per author request'",
+ 'eqexam', "die 'skipping, per author (dps) request'",
'eqmark', "die 'skipping, latex 2.09, was never in TL'",
'esindex', "die 'skipping, use bezos'",
'eskdx', "&MAKEeskdx",