From b7e5ac45c380741bed7e201ab7a99d213a36e4b7 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 13 Jun 2021 20:53:04 +0000 Subject: semantex (13jun21) git-svn-id: svn://tug.org/texlive/trunk@59579 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/semantex/semantex.sty | 74 ++++++++++++++++------ .../tex/latex/semantex/stripsemantex.sty | 2 +- 2 files changed, 54 insertions(+), 22 deletions(-) (limited to 'Master/texmf-dist/tex/latex/semantex') diff --git a/Master/texmf-dist/tex/latex/semantex/semantex.sty b/Master/texmf-dist/tex/latex/semantex/semantex.sty index 0031ccf8549..30f015be317 100644 --- a/Master/texmf-dist/tex/latex/semantex/semantex.sty +++ b/Master/texmf-dist/tex/latex/semantex/semantex.sty @@ -1,5 +1,5 @@ \RequirePackage{xparse,l3keys2e,leftindex,semtex} -\ProvidesExplPackage{semantex}{2021/06/10}{0.501}{} +\ProvidesExplPackage{semantex}{2021/06/13}{0.502}{} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -1508,7 +1508,7 @@ \semantex_singlekey:nn { #1 } { parse } % Run the "parse" routine, i.e. run the collection of code that the user has added via the key "parse options" \semantex_data_bool_get:nnTF { #1 } { output } % Checks if the register is supposed to output { - \semantex_inner_return:n { #1 } + \semantex_inner_pre_return:n { #1 } \tl_set:Nx \l__semantex_render_output_class_temp_tl { \semantex_data_tl_get:nn { #1 } { output } } % The output class \exp_args:NNx\cs_set:Nn\l__semantex_render_output_options_temp_cs:n { \semantex_data_tl_get_exp_not:nn { #1 } { output~options } } @@ -3692,7 +3692,7 @@ \semantex_preprocess_arg_keys_x:nN { #3 } #4 } { arg~keys~set~x }{ - \semantex_preprocess_arg_keys_x:nN { #3 } #4 + \semantex_preprocess_arg_keys_x:nN { #3 } #4\textbf{} } { set~arg~single~keys }{ \semantex_preprocess_arg_singlekeys:nN { #3 } #4 @@ -3712,8 +3712,16 @@ \semantex_append_singlekey_with_raw_code:nnn { #1 } { parse~code } } \group_begin: - \tl_set:Nn\l__semantex_preprocess_valuekey_keys_temp_tl {} - \semantex_preprocess_keys:nN { #3 } \l__semantex_preprocess_valuekey_keys_temp_tl + \tl_set:Nn\l__semantex_preprocess_valuekey_keys_pre_temp_tl {} + \semantex_preprocess_keys:nN { #3 } \l__semantex_preprocess_valuekey_keys_pre_temp_tl + \cs_set:Npo\l__semantex_preprocess_valuekey_keys_temp_cs:nnnnnnnnn##1##2##3##4##5##6##7##8##9 + { + \l__semantex_preprocess_valuekey_keys_pre_temp_tl + } + \tl_set:No\l__semantex_preprocess_valuekey_keys_temp_tl + { + \l__semantex_preprocess_valuekey_keys_temp_cs:nnnnnnnnn { ###1 } { ##2 } { ##3 } { ##4 } { ##5 } { ##6 } { ##7 } { ##8 } { ##9 } + } \exp_args:NNNx \group_end: \tl_put_right:Nn#4 @@ -3727,8 +3735,16 @@ \semantex_pre_append_singlekey_with_raw_code:nnn { #1 } { parse~code } } \group_begin: - \tl_set:Nn\l__semantex_preprocess_valuekey_keys_temp_tl {} - \semantex_preprocess_keys:nN { #3 } \l__semantex_preprocess_valuekey_keys_temp_tl + \tl_set:Nn\l__semantex_preprocess_valuekey_keys_pre_temp_tl {} + \semantex_preprocess_keys:nN { #3 } \l__semantex_preprocess_valuekey_keys_pre_temp_tl + \cs_set:Npo\l__semantex_preprocess_valuekey_keys_temp_cs:nnnnnnnnn##1##2##3##4##5##6##7##8##9 + { + \l__semantex_preprocess_valuekey_keys_pre_temp_tl + } + \tl_set:No\l__semantex_preprocess_valuekey_keys_temp_tl + { + \l__semantex_preprocess_valuekey_keys_temp_cs:nnnnnnnnn { ###1 } { ##2 } { ##3 } { ##4 } { ##5 } { ##6 } { ##7 } { ##8 } { ##9 } + } \exp_args:NNNx \group_end: \tl_put_right:Nn#4 @@ -4277,8 +4293,16 @@ \semantex_append_singlekey_with_raw_code:nnn { #1 } { parse~code } } \group_begin: - \tl_set:Nn\l__semantex_preprocess_valuekey_keys_temp_tl {} - \semantex_preprocess_keys_x:nN { #3 } \l__semantex_preprocess_valuekey_keys_temp_tl + \tl_set:Nn\l__semantex_preprocess_valuekey_keys_pre_temp_tl {} + \semantex_preprocess_keys:nN { #3 } \l__semantex_preprocess_valuekey_keys_pre_temp_tl + \cs_set:Npo\l__semantex_preprocess_valuekey_keys_temp_cs:nnnnnnnnn##1##2##3##4##5##6##7##8##9 + { + \l__semantex_preprocess_valuekey_keys_pre_temp_tl + } + \tl_set:No\l__semantex_preprocess_valuekey_keys_temp_tl + { + \l__semantex_preprocess_valuekey_keys_temp_cs:nnnnnnnnn { ###1 } { ##2 } { ##3 } { ##4 } { ##5 } { ##6 } { ##7 } { ##8 } { ##9 } + } \exp_args:NNNx \group_end: \tl_put_right:Nn#4 @@ -4292,8 +4316,16 @@ \semantex_pre_append_singlekey_with_raw_code:nnn { #1 } { parse~code } } \group_begin: - \tl_set:Nn\l__semantex_preprocess_valuekey_keys_temp_tl {} - \semantex_preprocess_keys_x:nN { #3 } \l__semantex_preprocess_valuekey_keys_temp_tl + \tl_set:Nn\l__semantex_preprocess_valuekey_keys_pre_temp_tl {} + \semantex_preprocess_keys:nN { #3 } \l__semantex_preprocess_valuekey_keys_pre_temp_tl + \cs_set:Npo\l__semantex_preprocess_valuekey_keys_temp_cs:nnnnnnnnn##1##2##3##4##5##6##7##8##9 + { + \l__semantex_preprocess_valuekey_keys_pre_temp_tl + } + \tl_set:No\l__semantex_preprocess_valuekey_keys_temp_tl + { + \l__semantex_preprocess_valuekey_keys_temp_cs:nnnnnnnnn { ###1 } { ##2 } { ##3 } { ##4 } { ##5 } { ##6 } { ##7 } { ##8 } { ##9 } + } \exp_args:NNNx \group_end: \tl_put_right:Nn#4 @@ -5020,7 +5052,7 @@ % } %} % -%\cs_new_protected:Npn\__semantex_nine_valuekey_format_auxiliary:nnn#1#2#3%CHECK2 +%\cs_new_protected:Npn\__semantex_nine_valuekey_format_auxiliary:nnn#1#2#3 %{ % \cs_set:Npn\l__semantex_nine_valuekey_auxiliary_temp_cs:nnnnnnnnn##1##2##3##4##5##6##7##8##9 { #3 } % \tl_set:Nn\l__semantex_nine_valuekey_auxiliary_temp_tl{} @@ -5135,14 +5167,14 @@ % #1 = register % #2 = key % #3 = raw code - \tl_set:Nn \l__semantex_add_raw_code_to_singlekey_auxiliary_temp_tl { #3 } - \semantex_singlekey_store:nnN { #1 } { #2 } \l__semantex_append_singlekeys_auxiliary_original_temp_tl + \tl_set:Nn \l__semantex_append_singlekey_with_raw_code_auxiliary_temp_tl { #3 } + \semantex_singlekey_store:nnN { #1 } { #2 } \l__semantex_append_singlekey_with_raw_code_auxiliary_original_temp_tl \exp_args:Nnx\cs_set_protected:cn % \cs_set_protected:cx gave us ##1 where we wanted #1 { __semantex_data_cs_custom_singlekey_#1_\tl_trim_spaces:n{#2}:n } { - \exp_not:V\l__semantex_append_singlekeys_auxiliary_original_temp_tl - \exp_not:V\l__semantex_append_singlekeys_auxiliary_temp_tl + \exp_not:V\l__semantex_append_singlekey_with_raw_code_auxiliary_original_temp_tl + \exp_not:V\l__semantex_append_singlekey_with_raw_code_auxiliary_temp_tl } } @@ -5152,14 +5184,14 @@ % #1 = register % #2 = key % #3 = raw code - \tl_set:Nn \l__semantex_add_raw_code_to_singlekey_auxiliary_temp_tl { #3 } - \semantex_singlekey_store:nnN { #1 } { #2 } \l__semantex_append_singlekeys_auxiliary_original_temp_tl + \tl_set:Nn \l__semantex_pre_append_singlekey_with_raw_code_auxiliary_temp_tl { #3 } + \semantex_singlekey_store:nnN { #1 } { #2 } \l__semantex_pre_append_singlekey_with_raw_code_auxiliary_original_temp_tl \exp_args:Nnx\cs_set_protected:cn % \cs_set_protected:cx gave us ##1 where we wanted #1 { __semantex_data_cs_custom_singlekey_#1_\tl_trim_spaces:n{#2}:n } { - \exp_not:V\l__semantex_append_singlekeys_auxiliary_temp_tl - \exp_not:V\l__semantex_append_singlekeys_auxiliary_original_temp_tl + \exp_not:V\l__semantex_pre_append_singlekey_with_raw_code_auxiliary_temp_tl + \exp_not:V\l__semantex_pre_append_singlekey_with_raw_code_auxiliary_original_temp_tl } } @@ -5699,7 +5731,7 @@ } -\cs_new_protected:Npn\__semantex_preprocess_arg_valuekey:nnnN#1#2#3#4%CHECK4 +\cs_new_protected:Npn\__semantex_preprocess_arg_valuekey:nnnN#1#2#3#4 { \str_case:nnF { #2 } { diff --git a/Master/texmf-dist/tex/latex/semantex/stripsemantex.sty b/Master/texmf-dist/tex/latex/semantex/stripsemantex.sty index c4fce11d956..7e4298d2f36 100644 --- a/Master/texmf-dist/tex/latex/semantex/stripsemantex.sty +++ b/Master/texmf-dist/tex/latex/semantex/stripsemantex.sty @@ -1,5 +1,5 @@ \RequirePackage{xparse} -\ProvidesExplPackage{stripsemantex}{2021/06/10}{0.500}{} +\ProvidesExplPackage{stripsemantex}{2021/06/13}{0.502}{} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % -- cgit v1.2.3