diff --git a/build_info.json b/build_info.json index a1f2b46..22c98f6 100644 --- a/build_info.json +++ b/build_info.json @@ -1,8 +1,8 @@ { "build_time": "", "source files": { - "version": "v2.8.2", - "commit": "b15dedb36666df299d532ebacd861ff40858857b", + "version": "v2.8.2-3-g123299b", + "commit": "123299b87ded3cb6fbc945ccfc039c2140d8c7e0", "dirty": false }, "pytex": { @@ -421,23 +421,23 @@ { "name": "environments/groupthm/groupthm.sty", "source file": "environments/groupthm/groupthm.dtx", - "build time": "2022/02/03 14:11", - "source version": "v2.8.2", - "source commit hash": "b15dedb36666df299d532ebacd861ff40858857b", + "build time": "2022/02/03 14:45", + "source version": "v2.8.2-3-g123299b", + "source commit hash": "123299b87ded3cb6fbc945ccfc039c2140d8c7e0", "pytex version": "v1.2.0-31-gc9bb0e8", "pytex commit hash": "c9bb0e87c91beae3e17a829603e4459cf804ec51", - "md5sum": "f1cce2b87d3e6d2b320b84daece33f22", + "md5sum": "0f33140e20147b63d152a6fbac866730", "dirty": false }, { "name": "environments/fancythm/fancythm.sty", "source file": "environments/fancythm/fancythm.dtx", - "build time": "2022/02/03 14:11", - "source version": "v2.8.2", - "source commit hash": "b15dedb36666df299d532ebacd861ff40858857b", + "build time": "2022/02/03 14:45", + "source version": "v2.8.2-3-g123299b", + "source commit hash": "123299b87ded3cb6fbc945ccfc039c2140d8c7e0", "pytex version": "v1.2.0-31-gc9bb0e8", "pytex commit hash": "c9bb0e87c91beae3e17a829603e4459cf804ec51", - "md5sum": "e659775e98a2451a69f4bf6ab66917f0", + "md5sum": "de5651d5fb829ae4a174d0d9e333d2dd", "dirty": false } ] diff --git a/environments/fancythm/fancythm.sty b/environments/fancythm/fancythm.sty index cabaefa..28afd59 100644 --- a/environments/fancythm/fancythm.sty +++ b/environments/fancythm/fancythm.sty @@ -23,7 +23,6 @@ %% File: fancytm.dtx \ProvidesExplPackage{fancythm}{2022/01/30}{0.0.2}{Grouped theorems.} \RequirePackage{l3keys2e} -\RequirePackage{groupthm} \RequirePackage[default styles]{thmstyle} \cs_set_eq:NN \arabic:n \arabic \cs_set_eq:NN \counter_new:n \newcounter @@ -109,24 +108,35 @@ \tl_new:N \l__fancythm_name_tl \clist_new:N \l__fancythm_thmtools_clist \clist_new:N \l__fancythm_group_clist +\clist_new:N \g__fancythm_groupthm_option_clist \keys_define:nn { fancythm } { - translator .bool_set:N = \g__fancythm_translator_bool , - translator .default:n = { true } , - generate defaults .bool_set:N = \g__fancythm_generate_defaults_bool , - generate defaults .default:n = { true } , + translator .bool_set:N = \g__fancythm_translator_bool , + translator .default:n = { true } , + generate defaults .bool_set:N = \g__fancythm_generate_defaults_bool , + generate defaults .default:n = { true } , number in .choices:nn = { document, section, subsection, chapter, part } { \counter_alias:nx { toplevel } { in \tl_use:N \l_keys_choice_tl } - } , - number in .default:n = { document } , + } , + number in .default:n = { document } , style .choices:nn = { fancy, plain, classic } { \str_set:Nn \g__fancythm_style_str { \tl_use:N \l_keys_choice_tl } - } , - style .default:n = { fancy } , + } , + style .default:n = { fancy } , + cache .code:n = + { + \clist_put_right:Nn \g__fancythm_groupthm_option_clist { cache = #1 } + } , + cache .default:n = { true } , + cache version .code:n = + { + \clist_put_right:Nn \g__fancythm_groupthm_option_clist { cache version = #1 } + } , + cache version .default:n = { 0 } , } \keys_define:nn { fancythm / fancytheorem } { @@ -143,6 +153,13 @@ } \keys_set:nn { fancythm } { translator, generate defaults, number in, style } \ProcessKeysOptions{ fancythm } + +\cs_new:Npn \__fancythm_require_package:nn #1 + { + \RequirePackage [ #1 ] + } +\cs_generate_variant:Nn \__fancythm_require_package:nn { V n } +\__fancythm_require_package:Vn \g__fancythm_groupthm_option_clist { groupthm } \bool_if:NTF \g__fancythm_translator_bool { \RequirePackage{translator} diff --git a/environments/groupthm/groupthm.sty b/environments/groupthm/groupthm.sty index 44cbb3d..ec13476 100644 --- a/environments/groupthm/groupthm.sty +++ b/environments/groupthm/groupthm.sty @@ -895,6 +895,7 @@ } { \cs_set_eq:NN \__groupthm_cache:n \use_none:n + \cs_set_eq:NN \__groupthm_cache_slow:n \use_none:n \cs_set_eq:NN \__groupthm_lazy:n \use:n } \groupthm_new_group:nnnnn { all } { } { } { } { }