summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex/semantex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-10-06 22:00:21 +0000
committerKarl Berry <karl@freefriends.org>2020-10-06 22:00:21 +0000
commite938e4ed60bd97e22f999fed7003903c0fc40430 (patch)
tree3c72da4e77188fba29b9e7845aad624bc7200135 /Master/texmf-dist/tex/latex/semantex
parenta7f0e43317c9507cb7ef6cc1ab2ba7fcdec39af8 (diff)
semantex (6oct20)
git-svn-id: svn://tug.org/texlive/trunk@56577 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex/semantex')
-rw-r--r--Master/texmf-dist/tex/latex/semantex/semantex.sty35
-rw-r--r--Master/texmf-dist/tex/latex/semantex/stripsemantex.sty2
2 files changed, 16 insertions, 21 deletions
diff --git a/Master/texmf-dist/tex/latex/semantex/semantex.sty b/Master/texmf-dist/tex/latex/semantex/semantex.sty
index 82cf996f5a9..84ab00e4709 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}{2020/10/03}{0.45}{}
+\ProvidesExplPackage{semantex}{2020/10/06}{0.46}{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -1504,7 +1504,6 @@
% #2 = options
\group_begin:
\cs_set:Nn\semantex_this: { #1 }
- \semantex_data_tl_inherit:nn { #1 } { symbol } % Inherit the symbol from parent if not done already
#2 % This is where keys can be set up
\semantex_parse:n { #1 } % Run the "parse" routine, i.e. run the collection of code that the user has added via the key "parseoptions"
\semantex_data_bool_get:nnTF { #1 } { output } % Checks if the register is supposed to output
@@ -1530,7 +1529,8 @@
{
\semantex_data_bool_get:nnTF { #1 } { leftargument } % Checks if left or right argument
{
- \semantex_left_pre_return:n { #1 }
+ \semantex_left_indices_pre_return:n { #1 }
+ \semantex_left_arg_pre_return:n { #1 }
\tl_set:Nx\l__semantex_render_symbol_temp_tl { \semantex_data_tl_get_exp_not:nn { #1 } { symbol } } % Stores the symbol in a temporary command
\tl_set:Nx \l__semantex_render_temp_tl
{
@@ -1564,7 +1564,8 @@
}
}
{
- \semantex_right_pre_return:n { #1 }
+ \semantex_right_indices_pre_return:n { #1 }
+ \semantex_right_arg_pre_return:n { #1 }
\tl_set:Nx\l__semantex_render_symbol_temp_tl { \semantex_data_tl_get_exp_not:nn { #1 } { symbol } } % Stores the symbol in a temporary command
\tl_set:Nx \l__semantex_render_temp_tl
{
@@ -1897,8 +1898,10 @@
% This is an umbrella key that runs all of the three
% return routines, innerreturn, rightreturn, and leftreturn
\semantex_inner_return:n { #1 }
- \semantex_left_return:n { #1 }
- \semantex_right_return:n { #1 }
+ \semantex_left_index_return:n { #1 }
+ \semantex_left_arg_return:n { #1 }
+ \semantex_right_index_return:n { #1 }
+ \semantex_right_arg_return:n { #1 }
}
\cs_new_protected:Npn\semantex_pre_return:n#1
@@ -1909,8 +1912,10 @@
% resetting parameters in this case would just waste
% time.
\semantex_inner_pre_return:n { #1 }
- \semantex_left_pre_return:n { #1 }
- \semantex_right_pre_return:n { #1 }
+ \semantex_left_indices_pre_return:n { #1 }
+ \semantex_left_arg_pre_return:n { #1 }
+ \semantex_right_indices_pre_return:n { #1 }
+ \semantex_right_arg_pre_return:n { #1 }
}
\cs_new_protected:Npn\semantex_inner_return:n#1
@@ -1940,16 +1945,11 @@
\cs_new_protected:Npn\semantex_right_return:n#1
{
+ \semantex_inner_return:n { #1 }
\semantex_right_index_return:n { #1 }
\semantex_right_arg_return:n { #1 }
}
-\cs_new_protected:Npn\semantex_right_pre_return:n#1
-{
- \semantex_right_indices_pre_return:n { #1 }
- \semantex_right_arg_pre_return:n { #1 }
-}
-
\cs_new_protected:Npn\semantex_right_index_return:n#1
{
\semantex_right_indices_pre_return:n { #1 }
@@ -2010,16 +2010,11 @@
\cs_new_protected:Npn\semantex_left_return:n#1
{
+ \semantex_inner_return:n { #1 }
\semantex_left_index_return:n { #1 }
\semantex_left_arg_return:n { #1 }
}
-\cs_new_protected:Npn\semantex_left_pre_return:n#1
-{
- \semantex_left_indices_pre_return:n { #1 }
- \semantex_left_arg_pre_return:n { #1 }
-}
-
\cs_new_protected:Npn\semantex_left_index_return:n#1
{
\semantex_left_indices_pre_return:n { #1 }
diff --git a/Master/texmf-dist/tex/latex/semantex/stripsemantex.sty b/Master/texmf-dist/tex/latex/semantex/stripsemantex.sty
index 679b2ab72c3..221cc7cafe4 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}{2020/10/03}{0.45}{}
+\ProvidesExplPackage{stripsemantex}{2020/10/06}{0.46}{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %