diff options
Diffstat (limited to 'Master')
| -rw-r--r-- | Master/texmf-dist/doc/latex/acro/README | 4 | ||||
| -rw-r--r-- | Master/texmf-dist/doc/latex/acro/acro-manual.pdf | bin | 889312 -> 907817 bytes | |||
| -rw-r--r-- | Master/texmf-dist/doc/latex/acro/acro-manual.tex | 48 | ||||
| -rw-r--r-- | Master/texmf-dist/tex/latex/acro/acro.sty | 122 |
4 files changed, 103 insertions, 71 deletions
diff --git a/Master/texmf-dist/doc/latex/acro/README b/Master/texmf-dist/doc/latex/acro/README index b0382e13026..a4d9244e72c 100644 --- a/Master/texmf-dist/doc/latex/acro/README +++ b/Master/texmf-dist/doc/latex/acro/README @@ -1,5 +1,5 @@ #-------------------------------------------------------------------------- -the ACRO package v3.5 2021/01/16 +the ACRO package v3.6 2022/01/04 Typeset Acronyms @@ -8,7 +8,7 @@ Clemens Niederberger Web: https://github.com/cgnieder/acro E-Mail: contact@mychemistry.eu -------------------------------------------------------------------------- -Copyright 2012--2021 Clemens Niederberger +Copyright 2012--2022 Clemens Niederberger This work may be distributed and/or modified under the conditions of the LaTeX Project Public License, either version 1.3c diff --git a/Master/texmf-dist/doc/latex/acro/acro-manual.pdf b/Master/texmf-dist/doc/latex/acro/acro-manual.pdf Binary files differindex 54c8b151c6d..71f8b0a0067 100644 --- a/Master/texmf-dist/doc/latex/acro/acro-manual.pdf +++ b/Master/texmf-dist/doc/latex/acro/acro-manual.pdf diff --git a/Master/texmf-dist/doc/latex/acro/acro-manual.tex b/Master/texmf-dist/doc/latex/acro/acro-manual.tex index b8288eb6ca7..5ccd7d2df3b 100644 --- a/Master/texmf-dist/doc/latex/acro/acro-manual.tex +++ b/Master/texmf-dist/doc/latex/acro/acro-manual.tex @@ -10,7 +10,7 @@ % Web: https://github.com/cgnieder/acro/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2011--2021 Clemens Niederberger +% Copyright 2011--2022 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -295,12 +295,11 @@ argument to \cs*{usepackage}: The option allows you to use the last version prior to the update to version~3. This may help if you don't have the time to fix issues after upgrading to the new version. - \keybool{upgrade}\Default{true} + \keybool{upgrade}\Default{false} When this option is used \acro\ tries to give as much helpful and meaningful warning or error messages when a deprecated or removed command, property, or option is used. This is especially useful if you are - upgrading from version~2. The option will initially be true for a few - months after the upgrade to version~3. + upgrading from version~2. \end{options} \subsection{Setup command}\label{sec:setup-command} @@ -355,10 +354,12 @@ following sections. This is a comprehensive overview over the existing properties. Many properties are also explained in more detail in later sections of this manual. \begin{options} - \keybool{case-sensitive}\Default{false} + \keybool{case-sensitive}\Default{true} When this is set you can write the \ac{id} of the acronym upper- or lower- or mixed case and it is recognized by \acro\ as the same. This might be useful when the acronym appears in the page header, for example. + \keybool{case-insensitive}\Default{false} + \sinceversion{3.6}The inverse of the option \option{case-sensitive}. \end{options} \begin{bewareofthedog} @@ -595,7 +596,7 @@ the same. In that case you can use %% preset \propval{preset}{set name}\Default \sinceversion{3.5}Enables to load a set of properties that has been - defined earlier with \cs{NewAcroPreset}, siehe + defined earlier with \cs{NewAcroPreset}, see section~\vref{sec:presets}. %% uselist \propval{uselist}{csv list of acronym ids}\Default @@ -786,7 +787,7 @@ single appearance of the acronym is printed\footnote{This usually requires at The single appearance of an acronym is determined by this option: \begin{options} \keychoice{single}{\default{true},false,\meta{number}}\Default{false} - This option determines wether a single appearance of an acronym counts as + This option determines whether a single appearance of an acronym counts as \emph{usage}. It might be desirable in such cases that an acronym is simply printed as long form and not added to the list of acronym. This is what this option does. With \meta{number} the minimal number of usages @@ -843,15 +844,15 @@ The main idea is simple: just place \end{commands} The options controlling the list are these: \begin{options} - \keychoice{template}{description,table,longtable,lof,toc}% + \keychoice{template}{description,tabular,longtable,supertabular,lof,toc}% \Module{list}\Default{description} Choose the template to create the list with. See more on this in sections~\vref{sec:templates} and~\vref{sec:examples}. \keybool{sort}\Module{list}\Default{true} - Decide wether to sort the list of acronyms alphabetically or to print it + Decide whether to sort the list of acronyms alphabetically or to print it in order of definition. \keychoice{display}{all,used}\Module{list}\Default{used} - Decide wether to print only the acronyms actually used in the document or + Decide whether to print only the acronyms actually used in the document or all acronyms which have been declared in the preamble. \keyval{exclude}{csv list of tags}\Module{list}\Default Set a list of tags to exclude from the list. Only acronyms not @@ -879,7 +880,7 @@ The options controlling the list are these: This only has an effect if the list template supports it. All pre-defined templates \emph{do} support it. \keybool{display}\Module{list,locale}\Default{false} - This options determines wether the language of the foreign form is printed + This options determines whether the language of the foreign form is printed or not. This only has an effect if the list template supports foreign forms. All @@ -900,9 +901,10 @@ If you want to include the page numbers where the acronyms have been used in the list of acronym you can use these options: \begin{options} \keychoice{display}{first,all,none}\Module{pages}\Default{none} - Decide wether to include page numbers in the list of acroynms and wether - to add the first page or every page. When you choose \code{first} and - have \pkg{hyperref} loaded you will also get a backlink to that page. + Decide whether to include page numbers in the list of acroynms and + whether to add the first page or every page. When you choose + \code{first} and have \pkg{hyperref} loaded you will also get a + backlink to that page. \keybool{use}\Module{pages,seq}\Default{true} Turns a two-page range into \meta{num}\,f.\ (\latin{sequens}) and a three-page range into \meta{num}\,ff.\ (\latin{sequentes}) when set to @@ -1236,12 +1238,12 @@ properties for such cases: There are also some options: \begin{options} \keybool{display}\Module{foreign}\Default{true} - Determine wether to hide or display the foreign form. + Determine whether to hide or display the foreign form. \keybool{display}\Module{list,foreign}\Default{true} - \sinceversion{3.2}Determine wether to hide or display the foreign form in + \sinceversion{3.2}Determine whether to hide or display the foreign form in the list of acronyms. \keybool{display}\Module{locale}\Default{false} - This options determines wether the language of the foreign form is printed + This options determines whether the language of the foreign form is printed or not when the full form of the acronym is printed. \keybool{display}\Module{list,locale}\Default{false} The same but for the list of acronyms. @@ -1368,11 +1370,11 @@ like these \acro\ offers a number of options:\acuse{ny} \keyval{cmd}{citation command}\Module{cite}\Default{\cs*{cite}} Choose the command with which citations ar printed. \keybool{group}\Module{cite}\Default{false} - Decide wether to group citations with the short form in the parentheses. + Decide whether to group citations with the short form in the parentheses. The template must support this. \acro's pre-defined templates \emph{do} support it. \keychoice{display}{first,all,none}\Module{cite}\Default{first} - Decide wether to output the citation in the first/full usage only or + Decide whether to output the citation in the first/full usage only or always or never. \keyval{pre}{text}\Module{cite}\Default{\cs*{nobreakspace}} Arbitrary code directly output before the citation. @@ -1931,8 +1933,14 @@ to defines own such objects: \tmpl{addchap} Only defined in a \KOMAScript\ class and if \cs*{chapter} is defined. Uses \cs*{addchap} for the heading. + \tmpl{addchap*} + \sinceversion{3.6}Only defined in a \KOMAScript\ class and if + \cs*{chapter} is defined. Uses \cs*{addchap*} for the heading. \tmpl{addsec} Only defined in a \KOMAScript\ class. Uses \cs*{addsec} for the heading. + \tmpl{addsec*} + \sinceversion{3.6}Only defined in a \KOMAScript\ class. Uses \cs*{addsec*} + for the heading. \tmpl{chapter} Only defined if \cs*{chapter} is defined. Uses \cs*{chapter} for the heading. \tmpl{chapter*} @@ -1953,7 +1961,7 @@ For the definition of templates these commends are available: which inserts \meta{code} when used. A template of type \meta{type} with name \meta{name} must not exist. The default type is \code{acronym}. \command{RenewAcroTemplate}[\oarg{type}\marg{name}\marg{code}] - This re-defines a template of type \meta{type} woth the name \meta{name} + This re-defines a template of type \meta{type} with the name \meta{name} which inserts \meta{code} when used. A template of type \meta{type} with name \meta{name} must exist. The default type is \code{acronym}. \command{SetupAcroTemplate}[\oarg{type}\marg{name}\marg{code}] diff --git a/Master/texmf-dist/tex/latex/acro/acro.sty b/Master/texmf-dist/tex/latex/acro/acro.sty index cfa5193f856..140b54ad8f0 100644 --- a/Master/texmf-dist/tex/latex/acro/acro.sty +++ b/Master/texmf-dist/tex/latex/acro/acro.sty @@ -8,7 +8,7 @@ % Web: https://github.com/cgnieder/acro/ % E-Mail: contact@mychemistry.eu % -------------------------------------------------------------------------- -% Copyright 2011--2021 Clemens Niederberger +% Copyright 2011--2022 Clemens Niederberger % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -27,9 +27,9 @@ % setup package: \tl_const:Nn \c_acro_package_name_tl {acro} -\tl_const:Nn \c_acro_date_tl {2021/01/16} +\tl_const:Nn \c_acro_date_tl {2022/01/04} \tl_const:Nn \c_acro_version_major_number_tl {3} -\tl_const:Nn \c_acro_version_minor_number_tl {5} +\tl_const:Nn \c_acro_version_minor_number_tl {6} \tl_const:Nn \c_acro_version_subrelease_tl {} \tl_const:Nx \c_acro_version_number_tl { @@ -75,7 +75,7 @@ \msg_new:nnn {acro} {unknown-option} { Unknown~ option~ `#1' \\ - I~ dont'~ know~ the~ option~ `#1'.~ Please~ make~ sure~ there~ is~ no~ + I~ don't~ know~ the~ option~ `#1'.~ Please~ make~ sure~ there~ is~ no~ typo.~ Check~ the~ manual~ for~ help. } @@ -190,7 +190,7 @@ debug .bool_gset:N = \g__acro_debug_bool , debug .initial:n = false , upgrade .bool_gset:N = \g__acro_upgrade_bool , - upgrade .initial:n = true , + upgrade .initial:n = false , final .bool_gset:N = \g__acro_final_bool , final .initial:n = false , version .choice: , @@ -481,6 +481,7 @@ \cs_generate_variant:Nn \seq_set_split:Nnn {Nne} \cs_generate_variant:Nn \clist_if_empty:nTF {e} \cs_generate_variant:Nn \clist_item:nn {e} +\cs_generate_variant:Nn \clist_count:n {e} \cs_generate_variant:Nn \int_set:Nn {Nx} \cs_generate_variant:Nn \tl_set:Nn {Ne} \cs_generate_variant:Nn \tl_remove_all:Nn {NV} @@ -747,7 +748,7 @@ \acro_property_make_alias:nn {#6} {#7} } -\NewDocumentCommand \MakeAcroPropertyAlias {mm} +\NewDocumentCommand \MakeAcroPropertyAlias{mm} { \acro_property_make_alias:nn {#1} {#2} } \NewDocumentCommand \NewAcroPreset {m+m} @@ -778,6 +779,11 @@ \NewDocumentCommand \DeclareAcronym {m+m} { \acro_declare_acronym:nn {#1} {#2} } +% declaring acronyms in the document body does not work, +% cf. https://tex.stackexchange.com/q/568856/ +% so lets prevent people from doing so: +\@onlypreamble \DeclareAcronym + \NewDocumentCommand \DeclareAcroEnding {mmm} { \acro_declare_ending:nnn {#1} {#2} {#3} } @@ -1009,27 +1015,8 @@ \iow_new:N \l__acro_aux_file_iow \tl_new:N \l__acro_mdfive_hash_tl -\acro_at_begin_document:n - { - \legacy_if:nT {@filesw} - { - \iow_now:Nx \@auxout - { \token_to_str:N \providecommand \token_to_str:N \ACRO [1] {} } - } - \file_get_mdfive_hash:VN - \c_acro_auxfile_tl - \l__acro_mdfive_hash_tl - \iow_open:NV \l__acro_aux_file_iow \c_acro_auxfile_tl - } - \cs_new_protected:Npn \acro_close_aux: { - \iow_close:N \l__acro_aux_file_iow - \file_get_mdfive_hash:VN - \c_acro_auxfile_tl - \l__acro_tmpa_tl - \tl_if_eq:NNF \l__acro_mdfive_hash_tl \l__acro_tmpa_tl - { \acro_rerun:n {general} } \legacy_if:nT {@filesw} { \iow_now:Nx \@auxout { \token_to_str:N \ACRO {readaux} } } } @@ -1037,7 +1024,7 @@ \cs_new_protected:Npn \acro_write_to_aux:n #1 { \legacy_if:nT {@filesw} - { \iow_now:Nn \l__acro_aux_file_iow {#1} } + { \iow_now:Nn \@auxout {#1} } } \cs_generate_variant:Nn \acro_write_to_aux:n {x} @@ -1978,14 +1965,20 @@ { \prg_return_false: } } -\cs_new_protected:Npn \acro_check_definition:n #1 +\cs_new_protected:Npn \acro_check_definition:nT #1#2 { - \acro_if_defined:nF {#1} - { \msg_error:nnn {acro} {undefined} {#1} } - \acro_boolean_property_if:nnF {#1} {used} - { \__acro_uselist_if_used:nT {#1} { \acro_use:n {#1} } } + \acro_if_defined:nTF {#1} + { + \acro_boolean_property_if:nnF {#1} {used} + { \__acro_uselist_if_used:nT {#1} { \__acro_use:n {#1} } } + #2 + } + { \acro_acronym_undefined:n {#1} } } +\cs_new_protected:Npn \acro_acronym_undefined:n #1 + { \msg_error:nnn {acro} {undefined} {#1} } + % -------------------------------------------------------------------------- % use and reset: \bool_new:N \l__acro_use_bool @@ -2936,7 +2929,8 @@ \bool_if:NT \l__acro_barriers_bool { \int_compare:nNnTF - { \intarray_count:c {g__acro_#1_barriers_intarray} } > 0 + { \intarray_count:c {g__acro_#1_barriers_intarray} } < \g_acro_barrier_int + { \acro_rerun:n {barriers} } { \intarray_gset:cnn {g__acro_#1_barriers_intarray} { \int_use:N \g_acro_barrier_int } @@ -2946,14 +2940,16 @@ +1 } } - { \acro_rerun:n {barriers} } } } % #1: id \cs_new:Npn \acro_barrier_usage:n #1 { - \clist_if_empty:eTF { \acro_property_get:nn {#1} {barriers} } + \int_compare:nNnTF + { \clist_count:e { \acro_property_get:nn {#1} {barriers} } } + < + \g_acro_barrier_int {0} { \clist_item:en @@ -3022,8 +3018,9 @@ \keys_define:nn {acro} { - case-sensitive .bool_gset:N = \g__acro_case_sensitive_bool , - case-sensitive .initial:n = true , + case-sensitive .bool_gset:N = \g__acro_case_sensitive_bool , + case-insensitive .bool_gset_inverse:N = \g__acro_case_sensitive_bool , + case-sensitive .initial:n = true } % ---------------------------------------------------------------------------- @@ -3295,15 +3292,18 @@ \acro_begin: \l__acro_begin_command_hook_tl \cs_set:Npn \nospace { \exp:w \exp_end_continue_f:w } - \acro_check_definition:n {####1} - \keys_set:nV {acro} \l__acro_options_tl - \tl_set:Ne \l_acro_id_tl { \acro_case_insensitive:n {####1} } - \tl_set_eq:NN \AcronymID \l_acro_id_tl - ##3 - \acro_finalize:ne - { \l__acro_star_bool } - { \acro_case_insensitive:n {####1} } - \l__acro_end_command_hook_tl + \acro_check_definition:nT + {####1} + { + \keys_set:nV {acro} \l__acro_options_tl + \tl_set:Ne \l_acro_id_tl { \acro_case_insensitive:n {####1} } + \tl_set_eq:NN \AcronymID \l_acro_id_tl + ##3 + \acro_finalize:ne + { \l__acro_star_bool } + { \acro_case_insensitive:n {####1} } + \l__acro_end_command_hook_tl + } \acro_end: } \use:x @@ -3842,8 +3842,8 @@ \acro_if_komascript:TF { \cs_if_exist:NTF \chapter - { \keys_set:nn {acro/list}{ heading = addchap } } - { \keys_set:nn {acro/list}{ heading = addsec } } + { \keys_set:nn {acro/list}{ heading = addchap* } } + { \keys_set:nn {acro/list}{ heading = addsec* } } } { \cs_if_exist:NTF \chapter @@ -4411,12 +4411,17 @@ % hyper linking \bool_new:N \l__acro_hyperref_use_bool \bool_new:N \l__acro_link_only_first_bool +\bool_new:N \l__acro_link_back_bool \cs_new_eq:NN \__acro_hyper_target:nn \use_ii:nn \cs_new_eq:NN \__acro_hyper_link:nn \use_ii:nn +\cs_new_eq:NN \__acro_hyper_back_target:nn \use_ii:nn +\cs_new_eq:NN \__acro_hyper_back_link:nn \use_ii:nn \cs_generate_variant:Nn \__acro_hyper_target:nn {e} \cs_generate_variant:Nn \__acro_hyper_link:nn {e} +\cs_generate_variant:Nn \__acro_hyper_back_target:nn {e} +\cs_generate_variant:Nn \__acro_hyper_back_link:nn {e} \cs_new_protected:Npn \__acro_activate_hyperref_support: { @@ -4432,6 +4437,8 @@ { \cs_set_eq:NN \__acro_hyper_link:nn \hyperlink } \cs_set:Npn \__acro_hyper_target:nn ##1##2 { \raisebox {3ex} [0pt] { \hypertarget {##1} { } } ##2 } + \cs_set_eq:NN \__acro_hyper_back_link:nn \__acro_hyper_link:nn + \cs_set_eq:NN \__acro_hyper_back_target:nn \__acro_hyper_target:nn } } @@ -5050,9 +5057,22 @@ \acro_new_patch:n {tabu} \acro_new_patch:n {ltxtable} \acro_new_patch:n {caption} +\acro_new_patch:n {maketitle} \AtEndPreamble { + % maketitle: + \acro_if_patch:nT {maketitle} + { + \pretocmd \maketitle + { \acswitchoff } + {} + { \msg_error:nnn {acro} {patch} {maketitle} } + \apptocmd \maketitle + { \acswitchon } + {} + { \msg_error:nnn {acro} {patch} {maketitle} } + } % floats: \acro_if_patch:nT {floats} { @@ -5219,7 +5239,7 @@ ) } } - + \NewAcroTemplate {footnote} { \acrowrite {short} @@ -5278,6 +5298,8 @@ { \NewAcroTemplate[heading] {addsec} { \addsec { \acrolistname } } + \NewAcroTemplate[heading] {addsec*} + { \addsec* { \acrolistname } } } \cs_if_exist:NT \chapter @@ -5290,6 +5312,8 @@ { \NewAcroTemplate[heading] {addchap} { \addchap { \acrolistname } } + \NewAcroTemplate[heading] {addchap*} + { \addchap* { \acrolistname } } } } @@ -5534,7 +5558,7 @@ { Fallback = pp\abbrdot , English = pp\abbrdot , - French = pp\abbrdot , + French = p\abbrdot , German = S\abbrdot , Italian = pp\abbrdot , Portuguese = pp\abbrdot , |