From f68b03f56bde06e4bba155632ff807b991945d8b Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 10 Mar 2022 21:22:10 +0000 Subject: create-theorem (10mar22) git-svn-id: svn://tug.org/texlive/trunk@62595 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/latex/create-theorem/create-theorem.sty | 92 ++++++++++++---------- 1 file changed, 52 insertions(+), 40 deletions(-) (limited to 'Master/texmf-dist/tex/latex/create-theorem') diff --git a/Master/texmf-dist/tex/latex/create-theorem/create-theorem.sty b/Master/texmf-dist/tex/latex/create-theorem/create-theorem.sty index f9fa3d4e9f9..b7439ea4668 100644 --- a/Master/texmf-dist/tex/latex/create-theorem/create-theorem.sty +++ b/Master/texmf-dist/tex/latex/create-theorem/create-theorem.sty @@ -13,7 +13,7 @@ \RequirePackage{l3keys2e} \ProvidesExplPackage {create-theorem} - {2022/03/03} {} + {2022/03/10} {} {Initializing theorem-like environments with multilingual support} \keys_define:nn { create-theorem } @@ -90,27 +90,27 @@ , Crefname .value_required:n = true , heading~style .code:n = { \crthm_set_name_style_heading:en { \l__crthm_current_env_tl } { #1 } } , heading~style .value_required:n = true - , heading-style .meta:n = { heading~style = #1 } + , heading-style .meta:n = { heading~style = { #1 } } , heading-style .value_required:n = true - , heading style .meta:n = { heading~style = #1 } + , heading style .meta:n = { heading~style = { #1 } } , heading style .value_required:n = true , crefname~style .code:n = { \crthm_set_name_style_crefname:en { \l__crthm_current_env_tl } { #1 } } , crefname~style .value_required:n = true - , crefname-style .meta:n = { crefname~style = #1 } + , crefname-style .meta:n = { crefname~style = { #1 } } , crefname-style .value_required:n = true - , crefname style .meta:n = { crefname~style = #1 } + , crefname style .meta:n = { crefname~style = { #1 } } , crefname style .value_required:n = true , Crefname~style .code:n = { \crthm_set_name_style_Crefname:en { \l__crthm_current_env_tl } { #1 } } , Crefname~style .value_required:n = true - , Crefname-style .meta:n = { Crefname~style = #1 } + , Crefname-style .meta:n = { Crefname~style = { #1 } } , Crefname-style .value_required:n = true - , Crefname style .meta:n = { Crefname~style = #1 } + , Crefname style .meta:n = { Crefname~style = { #1 } } , Crefname style .value_required:n = true , numbering~style .code:n = { \crthm_set_name_style_numbering:en { \l__crthm_current_env_tl } { #1 } } , numbering~style .value_required:n = true - , numbering-style .meta:n = { numbering~style = #1 } + , numbering-style .meta:n = { numbering~style = { #1 } } , numbering-style .value_required:n = true - , numbering style .meta:n = { numbering~style = #1 } + , numbering style .meta:n = { numbering~style = { #1 } } , numbering style .value_required:n = true , unknown .code:n = {} } @@ -317,17 +317,23 @@ \cs_set:cpn { #4 ref@ #1 @format@second } ##1##2##3 { \crefpairconjunction + \group_begin: \crthm_format_short_generic:nnn { \tl_use:c { g_crthm_number_style_ #2 _tl } { ##1 } } { ##2 } { ##3 } + \group_end: } \cs_set:cpn { #4 ref@ #1 @format@middle } ##1##2##3 { \crefmiddleconjunction + \group_begin: \crthm_format_short_generic:nnn { \tl_use:c { g_crthm_number_style_ #2 _tl } { ##1 } } { ##2 } { ##3 } + \group_end: } \cs_set:cpn { #4 ref@ #1 @format@last } ##1##2##3 { \creflastconjunction + \group_begin: \crthm_format_short_generic:nnn { \tl_use:c { g_crthm_number_style_ #2 _tl } { ##1 } } { ##2 } { ##3 } + \group_end: } \crthm_define_format_long_version:nnnn { #2 } { #4 refrange@ #1 @format } @@ -355,26 +361,32 @@ \cs_set:cpn { #4 refrange@ #1 @format@second } ##1##2##3##4##5##6 { \crefpairconjunction + \group_begin: \crthm_format_long_generic:nnnnnn { \tl_use:c { g_crthm_number_style_ #2 _tl } { ##1 } } { \tl_use:c { g_crthm_number_style_ #2 _tl } { ##2 } } { ##3 } { ##4 } { ##5 } { ##6 } + \group_end: } \cs_set:cpn { #4 refrange@ #1 @format@middle } ##1##2##3##4##5##6 { \crefmiddleconjunction + \group_begin: \crthm_format_long_generic:nnnnnn { \tl_use:c { g_crthm_number_style_ #2 _tl } { ##1 } } { \tl_use:c { g_crthm_number_style_ #2 _tl } { ##2 } } { ##3 } { ##4 } { ##5 } { ##6 } + \group_end: } \cs_set:cpn { #4 refrange@ #1 @format@last } ##1##2##3##4##5##6 { \creflastconjunction + \group_begin: \crthm_format_long_generic:nnnnnn { \tl_use:c { g_crthm_number_style_ #2 _tl } { ##1 } } { \tl_use:c { g_crthm_number_style_ #2 _tl } { ##2 } } { ##3 } { ##4 } { ##5 } { ##6 } + \group_end: } } @@ -387,7 +399,7 @@ { \cs_new:cn { crthm_format_ #2 :nnn } { - #3 ##2 #4 \nobreakspace { \tl_use:c { g_crthm_number_style_ #1 _tl } { ##1 } } ##3 + { #3 } ##2 { #4 } \nobreakspace { \tl_use:c { g_crthm_number_style_ #1 _tl } { ##1 } } ##3 } \cs_set_eq:cc { #2 } { crthm_format_ #2 :nnn } } @@ -401,7 +413,7 @@ { \cs_new:cn { crthm_format_ #2 :nnnnnn } { - #3 ##3 #4 + { #3 } ##3 { #4 } \nobreakspace \crefrangepreconjunction { \tl_use:c { g_crthm_number_style_ #1 _tl } { ##1 } } ##4 \crefrangeconjunction @@ -519,18 +531,18 @@ , name .value_required:n = true , name~style .code:n = { \exp_args:Ne \NameTheorem { \l__crthm_current_env_tl } { #1 } } , name~style .value_required:n = true - , name-style .meta:n = { name~style = #1 } + , name-style .meta:n = { name~style = { #1 } } , name-style .value_required:n = true - , name style .meta:n = { name~style = #1 } + , name style .meta:n = { name~style = { #1 } } , name style .value_required:n = true , style .code:n = { \bool_set_true:N \l__crthm_creating_apply_style_bool \tl_set:Nn \l__crthm_creating_apply_style_tl { #1 } } , style .value_required:n = true - , apply~style .meta:n = { style = #1 } + , apply~style .meta:n = { style = { #1 } } , apply~style .value_required:n = true - , apply-style .meta:n = { style = #1 } + , apply-style .meta:n = { style = { #1 } } , apply-style .value_required:n = true - , apply style .meta:n = { style = #1 } + , apply style .meta:n = { style = { #1 } } , apply style .value_required:n = true , numberless .bool_set:N = \l__crthm_creating_numberless_bool , create~starred~version .bool_set:N = \l__crthm_creating_create_starred_bool @@ -542,9 +554,9 @@ , copy~existed .code:n = { \bool_set_true:N \l__crthm_creating_copy_existed_bool \tl_set:Nn \l__crthm_creating_copy_existed_tl { #1 } } , copy~existed .value_required:n = true - , copy-existed .meta:n = { copy~existed = #1 } + , copy-existed .meta:n = { copy~existed = { #1 } } , copy-existed .value_required:n = true - , copy existed .meta:n = { copy~existed = #1 } + , copy existed .meta:n = { copy~existed = { #1 } } , copy existed .value_required:n = true , quiet .bool_set:N = \l__crthm_creating_quiet_bool , quiet .initial:n = { false } @@ -555,27 +567,27 @@ { , parent~counter .code:n = { \crthm_counter_within:en { \l__crthm_current_env_tl } { #1 } } , parent~counter .value_required:n = true - , parent-counter .meta:n = { parent~counter = #1 } + , parent-counter .meta:n = { parent~counter = { #1 } } , parent-counter .value_required:n = true - , parent counter .meta:n = { parent~counter = #1 } + , parent counter .meta:n = { parent~counter = { #1 } } , parent counter .value_required:n = true - , number~within .meta:n = { parent~counter = #1 } + , number~within .meta:n = { parent~counter = { #1 } } , number~within .value_required:n = true - , number-within .meta:n = { parent~counter = #1 } + , number-within .meta:n = { parent~counter = { #1 } } , number-within .value_required:n = true - , number within .meta:n = { parent~counter = #1 } + , number within .meta:n = { parent~counter = { #1 } } , number within .value_required:n = true , shared~counter .code:n = { \crthm_counter_alias:en { \l__crthm_current_env_tl } { #1 } } , shared~counter .value_required:n = true - , shared-counter .meta:n = { shared~counter = #1 } + , shared-counter .meta:n = { shared~counter = { #1 } } , shared-counter .value_required:n = true - , shared counter .meta:n = { shared~counter = #1 } + , shared counter .meta:n = { shared~counter = { #1 } } , shared counter .value_required:n = true - , number~like .meta:n = { shared~counter = #1 } + , number~like .meta:n = { shared~counter = { #1 } } , number~like .value_required:n = true - , number-like .meta:n = { shared~counter = #1 } + , number-like .meta:n = { shared~counter = { #1 } } , number-like .value_required:n = true - , number like .meta:n = { shared~counter = #1 } + , number like .meta:n = { shared~counter = { #1 } } , number like .value_required:n = true , unknown .code:n = {} } @@ -692,33 +704,33 @@ , name .value_required:n = true , name~style .code:n = { \exp_args:Ne \NameTheorem { \l__crthm_current_env_tl } { #1 } } , name~style .value_required:n = true - , name-style .meta:n = { name~style = #1 } + , name-style .meta:n = { name~style = { #1 } } , name-style .value_required:n = true - , name style .meta:n = { name~style = #1 } + , name style .meta:n = { name~style = { #1 } } , name style .value_required:n = true , parent~counter .code:n = { \crthm_counter_within:en { \l__crthm_current_env_tl } { #1 } } , parent~counter .value_required:n = true - , parent-counter .meta:n = { parent~counter = #1 } + , parent-counter .meta:n = { parent~counter = { #1 } } , parent-counter .value_required:n = true - , parent counter .meta:n = { parent~counter = #1 } + , parent counter .meta:n = { parent~counter = { #1 } } , parent counter .value_required:n = true - , number~within .meta:n = { parent~counter = #1 } + , number~within .meta:n = { parent~counter = { #1 } } , number~within .value_required:n = true - , number-within .meta:n = { parent~counter = #1 } + , number-within .meta:n = { parent~counter = { #1 } } , number-within .value_required:n = true - , number within .meta:n = { parent~counter = #1 } + , number within .meta:n = { parent~counter = { #1 } } , number within .value_required:n = true , shared~counter .code:n = { \crthm_counter_alias:en { \l__crthm_current_env_tl } { #1 } } , shared~counter .value_required:n = true - , shared-counter .meta:n = { shared~counter = #1 } + , shared-counter .meta:n = { shared~counter = { #1 } } , shared-counter .value_required:n = true - , shared counter .meta:n = { shared~counter = #1 } + , shared counter .meta:n = { shared~counter = { #1 } } , shared counter .value_required:n = true - , number~like .meta:n = { shared~counter = #1 } + , number~like .meta:n = { shared~counter = { #1 } } , number~like .value_required:n = true - , number-like .meta:n = { shared~counter = #1 } + , number-like .meta:n = { shared~counter = { #1 } } , number-like .value_required:n = true - , number like .meta:n = { shared~counter = #1 } + , number like .meta:n = { shared~counter = { #1 } } , number like .value_required:n = true , unknown .code:n = {} } -- cgit v1.2.3