summaryrefslogtreecommitdiff
path: root/Master/texmf-dist
diff options
context:
space:
mode:
Diffstat (limited to 'Master/texmf-dist')
-rw-r--r--Master/texmf-dist/doc/latex/acro/README4
-rw-r--r--Master/texmf-dist/doc/latex/acro/acro_en.pdfbin501337 -> 501837 bytes
-rw-r--r--Master/texmf-dist/doc/latex/acro/acro_en.tex12
-rw-r--r--Master/texmf-dist/tex/latex/acro/acro.sty42
-rw-r--r--Master/texmf-dist/tex/latex/acro/acro0.def7
-rw-r--r--Master/texmf-dist/tex/latex/acro/acro1.def3
6 files changed, 50 insertions, 18 deletions
diff --git a/Master/texmf-dist/doc/latex/acro/README b/Master/texmf-dist/doc/latex/acro/README
index 09c8e5427f3..5e4a11dd0ca 100644
--- a/Master/texmf-dist/doc/latex/acro/README
+++ b/Master/texmf-dist/doc/latex/acro/README
@@ -1,9 +1,9 @@
--------------------------------------------------------------------------
-the ACRO package v1.4
+the ACRO package v1.4a
Typeset Acronyms
-2013/08/27
+2013/09/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 bbd2894a8d8..e0d343b446e 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/doc/latex/acro/acro_en.tex b/Master/texmf-dist/doc/latex/acro/acro_en.tex
index fb5db184bf7..141d2495739 100644
--- a/Master/texmf-dist/doc/latex/acro/acro_en.tex
+++ b/Master/texmf-dist/doc/latex/acro/acro_en.tex
@@ -787,7 +787,11 @@ lists.
If you want for some reason to fool \acro into thinking that an acronym is used
for the first time you can call one of these commands:
\begin{beschreibung}
- \Befehl{acreset}{<comma separated list of ids>}\sinceversion{0.5}
+ \Befehl{acreset}{<comma separated list of ids>}\newline
+ \sinceversion{0.5}This will reset a used acronym such that the next use of
+ \cmd{ac} will again print it as if it were used the first time. This will
+ \emph{not} remove an acronym from being printed in the list if it actually
+ \emph{has} been used before.
\Befehl{acresetall}
\Befehl{acifused}{<id>}\ma{<true>}\ma{<false>}\newline
\sinceversion{1.3e}This command tests if the acronym with \ac{id}
@@ -800,7 +804,11 @@ for the first time you can call one of these commands:
Beware that both commands act \emph{globally}! There are also commands that
effectively do the opposite of \cmd{acreset}, i.e., mark acronyms as used:
\begin{beschreibung}
- \Befehl{acuse}{<comma separated list of ids>}\sinceversion{0.5}
+ \Befehl{acuse}{<comma separated list of ids>}\newline
+ \sinceversion{0.5}This has the same effect as if an acronym had been used
+ twice, that is, further uses of \cmd{ac} will print the short form and the
+ acronym will in any case be printed in the list (as long as its class is
+ not excluded).
\Befehl{acuseall}\sinceversion{0.6a}
\end{beschreibung}
diff --git a/Master/texmf-dist/tex/latex/acro/acro.sty b/Master/texmf-dist/tex/latex/acro/acro.sty
index 40d3cef8a9c..7a7718898d7 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}
\ProvidesExplPackage
{acro}
- {2013/08/27}
- {1.4}
+ {2013/09/02}
+ {1.4a}
{Typeset Acronyms}
% --------------------------------------------------------------------------
@@ -1046,10 +1046,17 @@
\acro_get:n { ##1 }
\bool_if:nT
{
- \bool_if_p:c { g__acro_##1_used_bool } && (
- ( \l__acro_use_single_bool && \cs_if_exist_p:c { acro@##1@twice } ) ||
- ( !\l__acro_use_single_bool && \cs_if_exist_p:c { acro@##1@once } && \l__acro_print_only_used_bool ) ||
- ( !\l__acro_use_single_bool && !\l__acro_print_only_used_bool )
+ \bool_if_p:c { g__acro_##1_in_list_bool } &&
+ (
+ ( \l__acro_use_single_bool && \cs_if_exist_p:c { acro@##1@twice } )
+ ||
+ (
+ !\l__acro_use_single_bool &&
+ \cs_if_exist_p:c { acro@##1@once } &&
+ \l__acro_print_only_used_bool
+ )
+ ||
+ ( !\l__acro_use_single_bool && !\l__acro_print_only_used_bool )
)
}
{
@@ -1510,13 +1517,14 @@
% the commands for the auxiliary file:
\cs_new_protected:Npn \acro@used@once #1#2#3#4
{
- \expandafter\xdef\csname acro@#1@once \endcsname { #1 }
+ \cs_gset_nopar:cpn { acro@#1@once } { #1 }
+ \bool_gset_true:c { g__acro_#1_in_list_bool }
\tl_if_empty:nF { #2#3#4 }
{ \seq_gput_right:cn { g__acro_#1_pages_seq } { {#2}{#3}{#4} } }
}
\cs_new_protected:Npn \acro@used@twice #1#2#3#4
{
- \expandafter\xdef\csname acro@#1@twice \endcsname { #1 }
+ \cs_gset_nopar:cpn { acro@#1@twice } { #1 }
\tl_if_empty:nF { #2#3#4 }
{ \seq_gput_right:cn { g__acro_#1_pages_seq } { {#2}{#3}{#4} } }
}
@@ -2186,11 +2194,22 @@
{
\bool_gset_true:c { g__acro_#1_used_bool }
\bool_gset_true:c { g__acro_#1_first_use_bool }
+ \bool_gset_true:c { g__acro_#1_in_list_bool }
\cs_if_exist:cTF { acro@#1@once }
- { \cs_gset:cpn { acro@#1@twice } { #1 } }
- { \cs_gset:cpn { acro@#1@once } { #1 } }
+ { \cs_gset_nopar:cpn { acro@#1@twice } { #1 } }
+ {
+ \cs_gset_nopar:cpn { acro@#1@once } { #1 }
+ \cs_gset_nopar:cpn { acro@#1@twice } { #1 }
+ }
+ \if@filesw
+ \iow_shipout_x:Nn \@auxout
+ { \token_to_str:N \acro@used@once { #1 } {} {} {} }
+ \iow_shipout_x:Nn \@auxout
+ { \token_to_str:N \acro@used@twice { #1 } {} {} {} }
+ \fi
}
+
\cs_new_protected:Npn \acro_reset_all:
{ \prop_map_inline:Nn \l__acro_short_prop { \acro_reset:n { ##1 } } }
@@ -2416,6 +2435,9 @@
2013/08/07 v1.3e - bug fix in the list when testing for used acronyms
- new commands \acifused, \acfirstupper
2013/08/27 v1.4 - new property `list'
+2013/09/02 v1.4a - bug fix: used acronyms are added to the list when the list
+ is printed before the use
+ - \DeclareAcronym may now be used after \begin{document}
% --------------------------------------------------------------------------
% TODO:
diff --git a/Master/texmf-dist/tex/latex/acro/acro0.def b/Master/texmf-dist/tex/latex/acro/acro0.def
index ddca2627df6..cff564c2fc3 100644
--- a/Master/texmf-dist/tex/latex/acro/acro0.def
+++ b/Master/texmf-dist/tex/latex/acro/acro0.def
@@ -44,8 +44,8 @@
\cs_new:Npn \acro_new:nnnnnnnnn #1#2#3#4#5#6#7#8#9
{
\IfBooleanTF { #1 }
- { \prop_put:Nnn \l__acro_replace_plural_prop { #2 } { \c_true_bool } }
- { \prop_put:Nnn \l__acro_replace_plural_prop { #2 } { \c_false_bool } }
+ { \prop_put:Nnn \l__acro_replace_long_plural_prop { #2 } { \c_true_bool } }
+ { \prop_put:Nnn \l__acro_replace_long_plural_prop { #2 } { \c_false_bool } }
\prop_put:Nnn \l__acro_short_prop { #2 } { #3 }
\prop_put:Nnn \l__acro_sort_prop { #2 } { #2 }
\prop_put:Nnn \l__acro_pdfstring_prop { #2 } { #3 }
@@ -74,6 +74,7 @@
{ \prop_put:Nnn \l__acro_extra_prop { #2 } { #9 } }
\bool_new:c { g__acro_#2_first_use_bool }
\bool_new:c { g__acro_#2_used_bool }
+ \bool_new:c { g__acro_#2_in_list_bool }
\bool_new:c { g__acro_#2_label_bool }
\bool_if:NT \l__acro_create_macros_bool
{
@@ -166,4 +167,4 @@
\NewDocumentCommand \printacronyms { G{}O{} }
{ \acro_print_acronyms:nn { #1 } { #2 } }
-\tex_endinput:D \ No newline at end of file
+\tex_endinput:D
diff --git a/Master/texmf-dist/tex/latex/acro/acro1.def b/Master/texmf-dist/tex/latex/acro/acro1.def
index ed3c0568b9f..9d6e7a2b9dc 100644
--- a/Master/texmf-dist/tex/latex/acro/acro1.def
+++ b/Master/texmf-dist/tex/latex/acro/acro1.def
@@ -433,6 +433,7 @@
\bool_new:c { g__acro_#1_first_use_bool }
\bool_new:c { g__acro_#1_used_bool }
\bool_new:c { g__acro_#1_label_bool }
+ \bool_new:c { g__acro_#1_in_list_bool }
\acro_create_page_records:n { #1 }
\acro_define_acronym_macro:n { #1 }
\tl_clear:N \l__acro_current_key_tl
@@ -446,7 +447,7 @@
% the user command:
\NewDocumentCommand \DeclareAcronym { mm }
{ \acro_declare_acronym:nn { #1 } { #2 } }
-\@onlypreamble\DeclareAcronym
+% \@onlypreamble\DeclareAcronym
% --------------------------------------------------------------------------
% print the list:
generated by cgit v1.2.3 (git 2.39.1) at 2024-10-31 14:57:12 +0000