diff --git a/code/acro.acronyms.code.tex b/code/acro.acronyms.code.tex index 2aa3b32..cf7dcac 100644 --- a/code/acro.acronyms.code.tex +++ b/code/acro.acronyms.code.tex @@ -104,6 +104,7 @@ \DeclareAcroProperty {foreign-format} % \DeclareAcroProperty {single-format} \DeclareAcroProperty {list-format} +\DeclareAcroProperty {list-label-format} \DeclareAcroProperty {extra-format} % Accessibility: diff --git a/code/acro.definitions.code.tex b/code/acro.definitions.code.tex index c0f9f67..a55de63 100644 --- a/code/acro.definitions.code.tex +++ b/code/acro.definitions.code.tex @@ -199,7 +199,7 @@ \begin {description} \acronymsmapF { - \item [ \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} ] + \item [ \acrolistlabel ] \acrowrite {list} \acroifanyT {foreign,extra} {~(} \acrowrite {foreign} @@ -229,8 +229,7 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -262,8 +261,7 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -296,8 +294,7 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -329,8 +326,7 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -375,8 +371,7 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -413,7 +408,9 @@ \contentsline {acro} { \numberline - { \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} } + { + \acrolistlabel + } { \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -438,7 +435,7 @@ \acronymsmapF { \contentsline { \acroifchapterTF {chapter} {section} } - { \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} } + { \acrolistlabel } {}{} \contentsline { \acroifchapterF {sub} section } { diff --git a/code/acro.formatting.code.tex b/code/acro.formatting.code.tex index de80eeb..b7010f4 100644 --- a/code/acro.formatting.code.tex +++ b/code/acro.formatting.code.tex @@ -116,6 +116,7 @@ \acro_new_format:n {extra} \acro_new_format:n {foreign} \acro_new_format:n {list} +\acro_new_format:n {list-label} \acro_new_format:n {first-long} \keys_define:nn {acro} diff --git a/code/acro.interface.code.tex b/code/acro.interface.code.tex index 214264f..ec6ebaa 100644 --- a/code/acro.interface.code.tex +++ b/code/acro.interface.code.tex @@ -187,6 +187,7 @@ \group_begin: \IfNoValueF {#1} { \keys_set:nn {acro/list} {#1} } + \tl_use:N \l__acro_list_format_keys_tl \acro_list: \group_end: } @@ -200,6 +201,8 @@ \NewExpandableDocumentCommand \acrolistname {} { \tl_use:N \l__acro_list_name_tl } +\NewDocumentCommand \acrolistlabel {} { \acro_list_label: } + % -------------------------------------------------------------------------- % cmmands for use in templates: \NewDocumentCommand \acronymsmapTF {+m+m+m} diff --git a/code/acro.list.code.tex b/code/acro.list.code.tex index 73278f0..2ca7105 100644 --- a/code/acro.list.code.tex +++ b/code/acro.list.code.tex @@ -7,6 +7,7 @@ \seq_new:N \g__acro_list_seq \tl_new:N \l__acro_list_tl +\tl_new:N \l__acro_list_format_keys_tl \clist_new:N \l__acro_tag_include_clist \clist_new:N \l__acro_tag_exclude_clist @@ -149,6 +150,13 @@ \tl_new:N \l__acro_list_name_tl +\tl_new:N \l__acro_list_label_tl + +\cs_new_protected:Npn \acro_list_label: + { + \acroformat {list-label} { \tl_use:N \l__acro_list_label_tl } + } + % -------------------------------------------------------------------------- \keys_define:nn {acro/list} { @@ -171,7 +179,12 @@ postamble .initial:n = , name .tl_set:N = \l__acro_list_name_tl , name .initial:n = \acro_translate:n {list-name} , - pages .meta:nn = {acro/pages} {#1} + label .tl_set:N = \l__acro_list_label_tl , + label .initial:n = + \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} , + pages .meta:nn = {acro/pages} {#1} , + format .code:n = + \keys_precompile:nnN {acro/format} {#1} \l__acro_list_format_keys_tl } \acro_if_komascript:TF diff --git a/code/acro.sty b/code/acro.sty index 1a40b2b..419a665 100644 --- a/code/acro.sty +++ b/code/acro.sty @@ -821,6 +821,7 @@ \group_begin: \IfNoValueF {#1} { \keys_set:nn {acro/list} {#1} } + \tl_use:N \l__acro_list_format_keys_tl \acro_list: \group_end: } @@ -834,6 +835,8 @@ \NewExpandableDocumentCommand \acrolistname {} { \tl_use:N \l__acro_list_name_tl } +\NewDocumentCommand \acrolistlabel {} { \acro_list_label: } + % -------------------------------------------------------------------------- % cmmands for use in templates: \NewDocumentCommand \acronymsmapTF {+m+m+m} @@ -1887,6 +1890,7 @@ \DeclareAcroProperty {foreign-format} % \DeclareAcroProperty {single-format} \DeclareAcroProperty {list-format} +\DeclareAcroProperty {list-label-format} \DeclareAcroProperty {extra-format} % Accessibility: @@ -2198,6 +2202,7 @@ \acro_new_format:n {extra} \acro_new_format:n {foreign} \acro_new_format:n {list} +\acro_new_format:n {list-label} \acro_new_format:n {first-long} \keys_define:nn {acro} @@ -3718,6 +3723,7 @@ \seq_new:N \g__acro_list_seq \tl_new:N \l__acro_list_tl +\tl_new:N \l__acro_list_format_keys_tl \clist_new:N \l__acro_tag_include_clist \clist_new:N \l__acro_tag_exclude_clist @@ -3860,6 +3866,13 @@ \tl_new:N \l__acro_list_name_tl +\tl_new:N \l__acro_list_label_tl + +\cs_new_protected:Npn \acro_list_label: + { + \acroformat {list-label} { \tl_use:N \l__acro_list_label_tl } + } + % -------------------------------------------------------------------------- \keys_define:nn {acro/list} { @@ -3882,7 +3895,12 @@ postamble .initial:n = , name .tl_set:N = \l__acro_list_name_tl , name .initial:n = \acro_translate:n {list-name} , - pages .meta:nn = {acro/pages} {#1} + label .tl_set:N = \l__acro_list_label_tl , + label .initial:n = + \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} , + pages .meta:nn = {acro/pages} {#1} , + format .code:n = + \keys_precompile:nnN {acro/format} {#1} \l__acro_list_format_keys_tl } \acro_if_komascript:TF @@ -5418,7 +5436,7 @@ \begin {description} \acronymsmapF { - \item [ \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} ] + \item [ \acrolistlabel ] \acrowrite {list} \acroifanyT {foreign,extra} {~(} \acrowrite {foreign} @@ -5448,8 +5466,7 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5481,8 +5498,7 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5515,8 +5531,7 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5548,8 +5563,7 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5594,8 +5608,7 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5632,7 +5645,9 @@ \contentsline {acro} { \numberline - { \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} } + { + \acrolistlabel + } { \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5657,7 +5672,7 @@ \acronymsmapF { \contentsline { \acroifchapterTF {chapter} {section} } - { \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} } + { \acrolistlabel } {}{} \contentsline { \acroifchapterF {sub} section } {