From b1f3e1f0299744ab0639ddac0ebadcaddcbcfa10 Mon Sep 17 00:00:00 2001 From: dbranford <25404972+dbranford@users.noreply.github.com> Date: Sat, 1 Apr 2023 23:58:13 +0100 Subject: [PATCH 1/6] Add key 'list/format' to set formats local to list(s) --- code/acro.interface.code.tex | 1 + code/acro.list.code.tex | 5 ++++- code/acro.sty | 6 +++++- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/code/acro.interface.code.tex b/code/acro.interface.code.tex index 214264f..21f5fcb 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: } diff --git a/code/acro.list.code.tex b/code/acro.list.code.tex index 73278f0..a99d47a 100644 --- a/code/acro.list.code.tex +++ b/code/acro.list.code.tex @@ -148,6 +148,7 @@ { \tl_use:N \l__acro_postamble_tl } \tl_new:N \l__acro_list_name_tl +\tl_new:N \l__acro_list_format_keys_tl % -------------------------------------------------------------------------- \keys_define:nn {acro/list} @@ -171,7 +172,9 @@ 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} + 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..773f1d7 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: } @@ -3859,6 +3860,7 @@ { \tl_use:N \l__acro_postamble_tl } \tl_new:N \l__acro_list_name_tl +\tl_new:N \l__acro_list_format_keys_tl % -------------------------------------------------------------------------- \keys_define:nn {acro/list} @@ -3882,7 +3884,9 @@ 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} + 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 From e76985c50a52b9d2d16c86756aad6b0a75c3059e Mon Sep 17 00:00:00 2001 From: dbranford <25404972+dbranford@users.noreply.github.com> Date: Sat, 1 Apr 2023 23:58:29 +0100 Subject: [PATCH 2/6] Add global list-label format --- code/acro.formatting.code.tex | 1 + code/acro.sty | 1 + 2 files changed, 2 insertions(+) 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.sty b/code/acro.sty index 773f1d7..573eb33 100644 --- a/code/acro.sty +++ b/code/acro.sty @@ -2199,6 +2199,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} From 154b166008f037168eb2feae5d8389785e1c352f Mon Sep 17 00:00:00 2001 From: dbranford <25404972+dbranford@users.noreply.github.com> Date: Sat, 1 Apr 2023 23:58:34 +0100 Subject: [PATCH 3/6] Add local list-label format --- code/acro.acronyms.code.tex | 1 + code/acro.sty | 1 + 2 files changed, 2 insertions(+) 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.sty b/code/acro.sty index 573eb33..de79a8e 100644 --- a/code/acro.sty +++ b/code/acro.sty @@ -1888,6 +1888,7 @@ \DeclareAcroProperty {foreign-format} % \DeclareAcroProperty {single-format} \DeclareAcroProperty {list-format} +\DeclareAcroProperty {list-label-format} \DeclareAcroProperty {extra-format} % Accessibility: From 8a20c1ae0d65174bfda853f28f60d20f357ab0a6 Mon Sep 17 00:00:00 2001 From: dbranford <25404972+dbranford@users.noreply.github.com> Date: Sat, 1 Apr 2023 23:58:38 +0100 Subject: [PATCH 4/6] Apply list-label-format in templates --- code/acro.definitions.code.tex | 51 +++++++++++++++++++++++++--------- code/acro.sty | 51 +++++++++++++++++++++++++--------- 2 files changed, 76 insertions(+), 26 deletions(-) diff --git a/code/acro.definitions.code.tex b/code/acro.definitions.code.tex index c0f9f67..07e6977 100644 --- a/code/acro.definitions.code.tex +++ b/code/acro.definitions.code.tex @@ -199,7 +199,12 @@ \begin {description} \acronymsmapF { - \item [ \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} ] + \item [ + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } + ] \acrowrite {list} \acroifanyT {foreign,extra} {~(} \acrowrite {foreign} @@ -229,8 +234,10 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -262,8 +269,10 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -296,8 +305,10 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -329,8 +340,10 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -375,8 +388,10 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -413,7 +428,12 @@ \contentsline {acro} { \numberline - { \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} } + { + \acroformat {list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } + } { \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -438,7 +458,12 @@ \acronymsmapF { \contentsline { \acroifchapterTF {chapter} {section} } - { \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} } + { + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } + } {}{} \contentsline { \acroifchapterF {sub} section } { diff --git a/code/acro.sty b/code/acro.sty index de79a8e..371cd5d 100644 --- a/code/acro.sty +++ b/code/acro.sty @@ -5424,7 +5424,12 @@ \begin {description} \acronymsmapF { - \item [ \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} ] + \item [ + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } + ] \acrowrite {list} \acroifanyT {foreign,extra} {~(} \acrowrite {foreign} @@ -5454,8 +5459,10 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5487,8 +5494,10 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5521,8 +5530,10 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5554,8 +5565,10 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5600,8 +5613,10 @@ { \AcroAddRow { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5638,7 +5653,12 @@ \contentsline {acro} { \numberline - { \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} } + { + \acroformat {list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } + } { \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5663,7 +5683,12 @@ \acronymsmapF { \contentsline { \acroifchapterTF {chapter} {section} } - { \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} } + { + \acroformat{list-label} { + \acrowrite {short} + \acroifT {alt} {/} \acrowrite {alt} + } + } {}{} \contentsline { \acroifchapterF {sub} section } { From 461b7131f817c40ee661d8eeb8224003d4b1d043 Mon Sep 17 00:00:00 2001 From: dbranford <25404972+dbranford@users.noreply.github.com> Date: Sat, 1 Apr 2023 23:58:41 +0100 Subject: [PATCH 5/6] Add \acrolistlabel which produces short/alt form under list-label-format --- code/acro.definitions.code.tex | 44 +++++---------------------- code/acro.interface.code.tex | 2 ++ code/acro.list.code.tex | 9 +++++- code/acro.sty | 55 +++++++++++----------------------- 4 files changed, 36 insertions(+), 74 deletions(-) diff --git a/code/acro.definitions.code.tex b/code/acro.definitions.code.tex index 07e6977..a55de63 100644 --- a/code/acro.definitions.code.tex +++ b/code/acro.definitions.code.tex @@ -199,12 +199,7 @@ \begin {description} \acronymsmapF { - \item [ - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } - ] + \item [ \acrolistlabel ] \acrowrite {list} \acroifanyT {foreign,extra} {~(} \acrowrite {foreign} @@ -234,10 +229,7 @@ { \AcroAddRow { - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -269,10 +261,7 @@ { \AcroAddRow { - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -305,10 +294,7 @@ { \AcroAddRow { - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -340,10 +326,7 @@ { \AcroAddRow { - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -388,10 +371,7 @@ { \AcroAddRow { - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -429,10 +409,7 @@ { \numberline { - \acroformat {list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } + \acrolistlabel } { \acrowrite {list} @@ -458,12 +435,7 @@ \acronymsmapF { \contentsline { \acroifchapterTF {chapter} {section} } - { - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } - } + { \acrolistlabel } {}{} \contentsline { \acroifchapterF {sub} section } { diff --git a/code/acro.interface.code.tex b/code/acro.interface.code.tex index 21f5fcb..ec6ebaa 100644 --- a/code/acro.interface.code.tex +++ b/code/acro.interface.code.tex @@ -201,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 a99d47a..0dbb575 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 @@ -148,7 +149,13 @@ { \tl_use:N \l__acro_postamble_tl } \tl_new:N \l__acro_list_name_tl -\tl_new:N \l__acro_list_format_keys_tl + +\cs_new_protected:Npn \acro_list_label: + { + \acroformat {list-label} { + \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} + } + } % -------------------------------------------------------------------------- \keys_define:nn {acro/list} diff --git a/code/acro.sty b/code/acro.sty index 371cd5d..5175ac2 100644 --- a/code/acro.sty +++ b/code/acro.sty @@ -835,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} @@ -3721,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 @@ -3862,7 +3865,13 @@ { \tl_use:N \l__acro_postamble_tl } \tl_new:N \l__acro_list_name_tl -\tl_new:N \l__acro_list_format_keys_tl + +\cs_new_protected:Npn \acro_list_label: + { + \acroformat {list-label} { + \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} + } + } % -------------------------------------------------------------------------- \keys_define:nn {acro/list} @@ -5424,12 +5433,7 @@ \begin {description} \acronymsmapF { - \item [ - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } - ] + \item [ \acrolistlabel ] \acrowrite {list} \acroifanyT {foreign,extra} {~(} \acrowrite {foreign} @@ -5459,10 +5463,7 @@ { \AcroAddRow { - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5494,10 +5495,7 @@ { \AcroAddRow { - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5530,10 +5528,7 @@ { \AcroAddRow { - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5565,10 +5560,7 @@ { \AcroAddRow { - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5613,10 +5605,7 @@ { \AcroAddRow { - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } + \acrolistlabel & \acrowrite {list} \acroifanyT {foreign,extra} {~(} @@ -5654,10 +5643,7 @@ { \numberline { - \acroformat {list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } + \acrolistlabel } { \acrowrite {list} @@ -5683,12 +5669,7 @@ \acronymsmapF { \contentsline { \acroifchapterTF {chapter} {section} } - { - \acroformat{list-label} { - \acrowrite {short} - \acroifT {alt} {/} \acrowrite {alt} - } - } + { \acrolistlabel } {}{} \contentsline { \acroifchapterF {sub} section } { From 239009cb148fd1b22e20f326516bd28639fbb419 Mon Sep 17 00:00:00 2001 From: dbranford <25404972+dbranford@users.noreply.github.com> Date: Sat, 1 Apr 2023 23:58:47 +0100 Subject: [PATCH 6/6] Add list/label key to set contents of \acrolistlabel --- code/acro.list.code.tex | 11 +++++++---- code/acro.sty | 11 +++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/code/acro.list.code.tex b/code/acro.list.code.tex index 0dbb575..2ca7105 100644 --- a/code/acro.list.code.tex +++ b/code/acro.list.code.tex @@ -150,11 +150,11 @@ \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} { - \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} - } + \acroformat {list-label} { \tl_use:N \l__acro_list_label_tl } } % -------------------------------------------------------------------------- @@ -179,9 +179,12 @@ postamble .initial:n = , name .tl_set:N = \l__acro_list_name_tl , name .initial:n = \acro_translate:n {list-name} , + 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 + \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 5175ac2..419a665 100644 --- a/code/acro.sty +++ b/code/acro.sty @@ -3866,11 +3866,11 @@ \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} { - \acrowrite {short} \acroifT {alt} {/} \acrowrite {alt} - } + \acroformat {list-label} { \tl_use:N \l__acro_list_label_tl } } % -------------------------------------------------------------------------- @@ -3895,9 +3895,12 @@ postamble .initial:n = , name .tl_set:N = \l__acro_list_name_tl , name .initial:n = \acro_translate:n {list-name} , + 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 + \keys_precompile:nnN {acro/format} {#1} \l__acro_list_format_keys_tl } \acro_if_komascript:TF