summaryrefslogtreecommitdiff
path: root/macros/latex/contrib/semantex/semantex.sty
diff options
context:
space:
mode:
Diffstat (limited to 'macros/latex/contrib/semantex/semantex.sty')
-rw-r--r--macros/latex/contrib/semantex/semantex.sty118
1 files changed, 26 insertions, 92 deletions
diff --git a/macros/latex/contrib/semantex/semantex.sty b/macros/latex/contrib/semantex/semantex.sty
index d9f313cc56..5d7e6070a1 100644
--- a/macros/latex/contrib/semantex/semantex.sty
+++ b/macros/latex/contrib/semantex/semantex.sty
@@ -1,5 +1,5 @@
\RequirePackage{xparse,l3keys2e,leftindex,semtex}
-\ProvidesExplPackage{semantex}{2021/07/25}{0.511}{}
+\ProvidesExplPackage{semantex}{2021/08/10}{0.512}{}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -10,6 +10,7 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\tl_set:Nn\SemantexVersion{0.512}
\cs_set_eq:NN \semantex_keyval_parse:NNn \keyval_parse:NNn
\cs_set:Npn \semantex_singlekey_parse:Nn#1#2 { \clist_map_function:nN { #2 } #1 }
@@ -7710,7 +7711,6 @@
{dots}{sep~i~dots},
{...}{dots},
{slot}{sep~i~slot},
- {-}{slot},
{*}{sep~d~*},
{**}{sep~d~**},
},
@@ -7745,9 +7745,7 @@
{comma~arg~dots}{set~arg~keys={comma~dots}},
{comma~arg~...}{set~arg~keys={comma~...}},
{arg~slot}{set~arg~keys={slot}},
- {arg-}{set~arg~keys={-}},
{comma~arg~slot}{set~arg~keys={comma~slot}},
- {comma~arg~-}{set~arg~keys={comma~-}},
{clear~arg}{ execute={
\semantex_data_tl_clear:nn { ##1 } { arg }
\semantex_data_int_clear:nn { ##1 } { number~of~arguments }
@@ -7920,7 +7918,6 @@
{arg~dots~with~other~sep}{set~arg~keys={dots~with~other~sep={#1}}},
{arg~...~with~other~sep}{set~arg~keys={dots~with~other~sep={#1}}},
{arg~slot~with~other~sep}{set~arg~keys={slot~with~other~sep={#1}}},
- {arg~-~with~other~sep}{set~arg~keys={slot~with~other~sep={#1}}},
},
define~keys[2]={
{arg~with~other~sep}{set~arg~keys={other~sep={#1}{#2}}},
@@ -7996,11 +7993,8 @@
data~provide=post~upper,
define~keys={
{upper~slot}{ set~keys~x={ upper=\semantex_data_tl_get_exp_not:nn { ##1 } { upper~slot } } },
- {upper~-}{upper~slot},
{sep~upper~slot}{ set~keys~x={ sep~upper=\semantex_data_tl_get_exp_not:nn { ##1 } { upper~slot } } },
- {sep~upper~-}{sep~upper~slot},
{comma~upper~slot}{ set~keys~x={ comma~upper=\semantex_data_tl_get_exp_not:nn { ##1 } { upper~slot } } },
- {comma~upper~-}{comma~upper~slot},
{upper~dots}{ set~keys~x={ upper=\semantex_data_tl_get_exp_not:nn { ##1 } { upper~dots } } },
{upper~...}{upper~dots},
{sep~upper~dots}{ set~keys~x={ sep~upper=\semantex_data_tl_get_exp_not:nn { ##1 } { upper~dots } } },
@@ -8108,15 +8102,6 @@
}
},
},
- {upper~-~with~other~sep}{
- execute={
- \semantex_valuekey:nnx { ##1 } { upper~with~other~sep }
- {
- { \exp_not:n { #1 } }
- { \semantex_data_tl_get_exp_not:nn { ##1 } { upper~slot } }
- }
- },
- },
{set~upper~dots}{
execute={ \semantex_data_tl_set:nnn { ##1 } { upper~dots } { #1 } },
},
@@ -8181,11 +8166,8 @@
data~provide=post~lower,
define~keys={
{lower~slot}{ set~keys~x={ lower=\semantex_data_tl_get_exp_not:nn { ##1 } { lower~slot } } },
- {lower~-}{lower~slot},
{sep~lower~slot}{ set~keys~x={ sep~lower=\semantex_data_tl_get_exp_not:nn { ##1 } { lower~slot } } },
- {sep~lower~-}{sep~lower~slot},
{comma~lower~slot}{ set~keys~x={ comma~lower=\semantex_data_tl_get_exp_not:nn { ##1 } { lower~slot } } },
- {comma~lower~-}{comma~lower~slot},
{lower~dots}{ set~keys~x={ lower=\semantex_data_tl_get_exp_not:nn { ##1 } { lower~dots } } },
{lower~...}{lower~dots},
{sep~lower~dots}{ set~keys~x={ sep~lower=\semantex_data_tl_get_exp_not:nn { ##1 } { lower~dots } } },
@@ -8205,12 +8187,12 @@
{clear~post~lower}{
execute={ \semantex_data_tl_clear:nn { ##1 } { post~lower } },
},
- {lower~**}{lower=\SemantexBullet},
- {lower~***}{lower=\SemantexDoubleBullet},
- {sep~lower~**}{sep~lower=\SemantexBullet},
- {sep~lower~***}{sep~lower=\SemantexDoubleBullet},
- {comma~lower~**}{comma~lower=\SemantexBullet},
- {comma~lower~***}{comma~lower=\SemantexDoubleBullet},
+ {lower~*}{lower=\SemantexBullet},
+ {lower~**}{lower=\SemantexDoubleBullet},
+ {sep~lower~*}{sep~lower=\SemantexBullet},
+ {sep~lower~**}{sep~lower=\SemantexDoubleBullet},
+ {comma~lower~*}{comma~lower=\SemantexBullet},
+ {comma~lower~**}{comma~lower=\SemantexDoubleBullet},
},
define~keys[1]={
{lower}{
@@ -8292,15 +8274,6 @@
}
},
},
- {lower~-~with~other~sep}{
- execute={
- \semantex_valuekey:nnx { ##1 } { lower~with~other~sep }
- {
- { \exp_not:n { #1 } }
- { \semantex_data_tl_get_exp_not:nn { ##1 } { lower~slot } }
- }
- },
- },
{set~lower~dots}{
execute={ \semantex_data_tl_set:nnn { ##1 } { lower~dots } { #1 } },
},
@@ -8322,8 +8295,8 @@
}
},
},
- {lower~**~with~other~sep}{lower~with~other~sep={#1}{\SemantexBullet}},
- {lower~***~with~other~sep}{lower~with~other~sep={#1}{\SemantexDoubleBullet}},
+ {lower~*~with~other~sep}{lower~with~other~sep={#1}{\SemantexBullet}},
+ {lower~**~with~other~sep}{lower~with~other~sep={#1}{\SemantexDoubleBullet}},
{set~lower~sep}{
execute={ \semantex_data_tl_set:nnn { ##1 } { lower~sep } { #1 } },
},
@@ -8365,11 +8338,8 @@
data~provide=post~upper~left,
define~keys={
{upper~left~slot}{ set~keys~x={ upper~left=\semantex_data_tl_get_exp_not:nn { ##1 } { upper~left~slot } } },
- {upper~left~-}{upper~left~slot},
{sep~upper~left~slot}{ set~keys~x={ sep~upper~left=\semantex_data_tl_get_exp_not:nn { ##1 } { upper~left~slot } } },
- {sep~upper~left~-}{sep~upper~left~slot},
{comma~upper~left~slot}{ set~keys~x={ comma~upper~left=\semantex_data_tl_get_exp_not:nn { ##1 } { upper~left~slot } } },
- {comma~upper~left~-}{comma~upper~left~slot},
{upper~left~dots}{ set~keys~x={ upper~left=\semantex_data_tl_get_exp_not:nn { ##1 } { upper~left~dots } } },
{upper~left~...}{upper~left~dots},
{sep~upper~left~dots}{ set~keys~x={ sep~upper~left=\semantex_data_tl_get_exp_not:nn { ##1 } { upper~left~dots } } },
@@ -8476,15 +8446,6 @@
}
},
},
- {upper~left~-~with~other~sep}{
- execute={
- \semantex_valuekey:nnx { ##1 } { upper~left~with~other~sep }
- {
- { \exp_not:n { #1 } }
- { \semantex_data_tl_get_exp_not:nn { ##1 } { upper~left~slot } }
- }
- },
- },
{set~upper~left~dots}{
execute={ \semantex_data_tl_set:nnn { ##1 } { upper~left~dots } { #1 } },
},
@@ -8549,11 +8510,8 @@
data~provide=post~lower~left,
define~keys={
{lower~left~slot}{ set~keys~x={ lower~left=\semantex_data_tl_get_exp_not:nn { ##1 } { lower~left~slot } } },
- {lower~left~-}{lower~left~slot},
{sep~lower~left~slot}{ set~keys~x={ sep~lower~left=\semantex_data_tl_get_exp_not:nn { ##1 } { lower~left~slot } } },
- {sep~lower~left~-}{sep~lower~left~slot},
{comma~lower~left~slot}{ set~keys~x={ comma~lower~left=\semantex_data_tl_get_exp_not:nn { ##1 } { lower~left~slot } } },
- {comma~lower~left~-}{comma~lower~left~slot},
{lower~left~dots}{ set~keys~x={ lower~left=\semantex_data_tl_get_exp_not:nn { ##1 } { lower~left~dots } } },
{lower~left~...}{lower~left~dots},
{sep~lower~left~dots}{ set~keys~x={ sep~lower~left=\semantex_data_tl_get_exp_not:nn { ##1 } { lower~left~dots } } },
@@ -8660,15 +8618,6 @@
}
},
},
- {lower~left~-~with~other~sep}{
- execute={
- \semantex_valuekey:nnx { ##1 } { lower~left~with~other~sep }
- {
- { \exp_not:n { #1 } }
- { \semantex_data_tl_get_exp_not:nn { ##1 } { lower~left~slot } },
- }
- },
- },
{set~lower~left~dots}{
execute={ \semantex_data_tl_set:nnn { ##1 } { lower~left~dots } { #1 } },
},
@@ -8732,19 +8681,16 @@
{ upper~slot }
{ lower~slot },
},
- {d~-}{d~slot},
{sep~d~slot}{
bool~if~TF={upper~grading}
{ sep~upper~slot }
{ sep~lower~slot },
},
- {sep~d~-}{sep~d~slot},
{comma~d~slot}{
bool~if~TF={upper~grading}
{ comma~upper~slot }
{ comma~lower~slot },
},
- {comma~d~-}{comma~d~slot},
{d~dots}{
bool~if~TF={upper~grading}
{ upper~dots }
@@ -8781,32 +8727,32 @@
{d~*}{
bool~if~TF={upper~grading}
{ upper~* }
- { lower~** },
+ { lower~* },
},
{d~**}{
bool~if~TF={upper~grading}
{ upper~** }
- { lower~*** },
+ { lower~** },
},
{sep~d~*}{
bool~if~TF={upper~grading}
{ sep~upper~* }
- { sep~lower~** },
+ { sep~lower~* },
},
{sep~d~**}{
bool~if~TF={upper~grading}
{ sep~upper~** }
- { sep~lower~*** },
+ { sep~lower~** },
},
{comma~d~*}{
bool~if~TF={upper~grading}
{ comma~upper~* }
- { comma~lower~** },
+ { comma~lower~* },
},
{comma~d~**}{
bool~if~TF={upper~grading}
{ comma~upper~** }
- { comma~lower~*** },
+ { comma~lower~** },
},
},
define~keys[1]={
@@ -8876,9 +8822,6 @@
lower~slot~with~other~sep={#1},
},
},
- {d~-~with~other~sep}{
- d~slot~with~other~sep={#1},
- },
{set~d~dots}{
bool~if~TF={upper~grading}
{
@@ -8903,12 +8846,12 @@
{d~*~with~other~sep}{
bool~if~TF={upper~grading}
{ upper~*~with~other~sep={#1} }
- { lower~**~with~other~sep={#1} },
+ { lower~*~with~other~sep={#1} },
},
{d~**~with~other~sep}{
bool~if~TF={upper~grading}
{ upper~**~with~other~sep={#1} }
- { lower~***~with~other~sep={#1} },
+ { lower~**~with~other~sep={#1} },
},
{set~d~sep}{
bool~if~TF={upper~grading}
@@ -8965,19 +8908,16 @@
{ lower~slot }
{ upper~slot },
},
- {i~-}{i~slot},
{sep~i~slot}{
bool~if~TF={upper~grading}
{ sep~lower~slot }
{ sep~upper~slot },
},
- {sep~i~-}{sep~i~slot},
{comma~i~slot}{
bool~if~TF={upper~grading}
{ comma~lower~slot }
{ comma~upper~slot },
},
- {comma~i~-}{comma~i~slot},
{i~dots}{
bool~if~TF={upper~grading}
{ lower~dots }
@@ -9013,32 +8953,32 @@
},
{i~*}{
bool~if~TF={upper~grading}
- { lower~** }
+ { lower~* }
{ upper~* },
},
{i~**}{
bool~if~TF={upper~grading}
- { lower~*** }
+ { lower~** }
{ upper~** },
},
{sep~i~*}{
bool~if~TF={upper~grading}
- { sep~lower~** }
+ { sep~lower~* }
{ sep~upper~* },
},
{sep~i~**}{
bool~if~TF={upper~grading}
- { sep~lower~*** }
+ { sep~lower~** }
{ sep~upper~** },
},
{comma~i~*}{
bool~if~TF={upper~grading}
- { comma~lower~** }
+ { comma~lower~* }
{ comma~upper~* },
},
{comma~i~**}{
bool~if~TF={upper~grading}
- { comma~lower~*** }
+ { comma~lower~** }
{ comma~upper~** },
},
},
@@ -9108,9 +9048,6 @@
upper~slot~with~other~sep={#1},
},
},
- {i~-~with~other~sep}{
- i~slot~with~other~sep={#1},
- },
{set~i~dots}{
bool~if~TF={upper~grading}
{
@@ -9134,12 +9071,12 @@
},
{i~*~with~other~sep}{
bool~if~TF={upper~grading}
- { lower~**~with~other~sep={#1} }
+ { lower~*~with~other~sep={#1} }
{ upper~*~with~other~sep={#1} },
},
{i~**~with~other~sep}{
bool~if~TF={upper~grading}
- { lower~***~with~other~sep={#1} }
+ { lower~**~with~other~sep={#1} }
{ upper~**~with~other~sep={#1} },
},
{set~i~sep}{
@@ -9296,7 +9233,6 @@
{set~arg~without~keyval~x}{ execute={ \semantex_arg_without_keyval:nx { ##1 } { #1 } } },
{arg~without~keyval~set~x}{ execute={ \semantex_arg_without_keyval:nx { ##1 } { #1 } } },
{default}{sep={#1}},
- {-~with~other~sep}{slot~with~other~sep={#1}},
{...~with~other~sep}{dots~with~other~sep={#1}},
{sep}{
execute={
@@ -9374,7 +9310,6 @@
}
},
},
- {-}{slot},
{comma~slot}{
execute={
\semantex_arg_valuekey:nnx { ##1 } { comma }
@@ -9383,7 +9318,6 @@
}
},
},
- {comma~-}{comma~slot},
},
define~arg~keys[2]={
{other~sep}{