From d6e66d2f4e31fc28a5f7527497c6655a7ac72fa5 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Dec 2022 21:01:12 +0000 Subject: semantex (3dec22) git-svn-id: svn://tug.org/texlive/trunk@65183 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/semantex/semantex.pdf | Bin 397454 -> 397760 bytes Master/texmf-dist/doc/latex/semantex/semantex.tex | 62 +++++++----- Master/texmf-dist/tex/latex/semantex/semantex.sty | 107 +++++++++++++++++++-- .../tex/latex/semantex/stripsemantex.sty | 2 +- 4 files changed, 137 insertions(+), 34 deletions(-) diff --git a/Master/texmf-dist/doc/latex/semantex/semantex.pdf b/Master/texmf-dist/doc/latex/semantex/semantex.pdf index 64e0bae6cfc..62ad68d4357 100644 Binary files a/Master/texmf-dist/doc/latex/semantex/semantex.pdf and b/Master/texmf-dist/doc/latex/semantex/semantex.pdf differ diff --git a/Master/texmf-dist/doc/latex/semantex/semantex.tex b/Master/texmf-dist/doc/latex/semantex/semantex.tex index 08587d1ad85..5868300ec05 100644 --- a/Master/texmf-dist/doc/latex/semantex/semantex.tex +++ b/Master/texmf-dist/doc/latex/semantex/semantex.tex @@ -1952,7 +1952,7 @@ on \( \vn \)~elements. ] \NewObject\MyVar\inner[left par=\langle, right par=\rangle] -In this chapter, se show how to define delimiter commands like \( \norm{slot} \) and~\( \inner{slot,slot} \). +In this chapter, se show how to define delimiter commands like \( \norm{---} \) and~\( \inner{---,---} \). This is easy to do via the keys \lstinline!left par! and~\lstinline!right par!: \begin{lstlisting} \NewObject\MyVar\norm[left par=\lVert, right par=\rVert] @@ -1962,10 +1962,10 @@ Indeed: \begin{LTXexample} $\norm{\va}$, $\inner{\va,\vb}$, -$\inner{slot,slot}$ +$\inner{---,---}$ \end{LTXexample} In the case where you want to use different kinds of -norms, say \( \norm[2]{slot} \) or~\( \norm[\infty]{slot} \), +norms, say \( \norm[2]{---} \) or~\( \norm[\infty]{---} \), you can use the key~\mylst!output options={$\$}!. This allows you to pass the~\ to the output class (in this case,~\lstinline!\MyVar!): @@ -3706,12 +3706,12 @@ In the following sections, we include the full list. Adds a double bullet to the \lstinline!d!-index. \item - \mylst!slot! + \mylst!---!, \mylst!slot! Adds a slot to the \lstinline!i!-index. \item - \mylst!dots!, \mylst!...! + \mylst!...!, \mylst!dots! Adds three dots to the \lstinline!i!-index. @@ -4034,33 +4034,35 @@ In the following sections, we include the full list. argument by the \. \item + \mylst!arg --- with other sep={$\$}!, \mylst!arg slot with other sep={$\$}! Adds a slot to the argument, separated from any previous argument by the \. \item - \mylst!arg dots!, \mylst!arg ...! + \mylst!arg ...!, \mylst!arg dots! Adds three dots to the argument, separated from any previous arguments by the standard separator. \item - \mylst!comma arg dots!, \mylst!comma arg ...! + \mylst!comma arg ...!, \mylst!comma arg dots! Adds three dots to the argument, separated from any previous arguments by a comma. \item - \mylst!arg slot! + \mylst!arg ---!, \mylst!arg slot! Adds a slot to the argument, separated from any previous arguments by the standard separator. \item + \mylst!comma arg ---!, \mylst!comma arg slot! Adds a slot to the argument, @@ -4156,12 +4158,14 @@ In the following sections, we include the full list. any prevous upper index by~\. \item + \mylst!upper ---!, \mylst!upper slot! Adds a slot to the upper index, with no separator from any previous upper index. \item + \mylst!sep upper ---!, \mylst!sep upper slot! Adds a slot to the upper index, @@ -4169,6 +4173,7 @@ In the following sections, we include the full list. index by the default separator. \item + \mylst!comma upper ---!, \mylst!comma upper slot! Adds a slot to the upper index, @@ -4182,6 +4187,7 @@ In the following sections, we include the full list. By default, this is~\lstinline!{-}!. \item + \mylst!upper --- with other sep={$\$}!,\\ \mylst!upper slot with other sep={$\$}! @@ -4364,20 +4370,20 @@ In the following sections, we include the full list. any prevous lower index by~\. \item - \mylst!lower slot! + \mylst!lower ---!, \mylst!lower slot! Adds a slot to the lower index, with no separator from any previous lower index. \item - \mylst!sep lower slot! + \mylst!sep lower ---!, \mylst!sep lower slot! Adds a slot to the lower index, separated from any previous lower index by the default separator. \item - \mylst!comma lower slot! + \mylst!comma lower ---!, \mylst!comma lower slot! Adds a slot to the lower index, separated from any previous lower @@ -4390,6 +4396,7 @@ In the following sections, we include the full list. By default, this is~\lstinline!{-}!. \item + \mylst!lower --- with other sep={$\$}!,\\ \mylst!lower slot with other sep={$\$}! @@ -4572,20 +4579,20 @@ In the following sections, we include the full list. any prevous upper left index by~\. \item - \mylst!upper left slot! + \mylst!upper left ---!, \mylst!upper left slot! Adds a slot to the upper left index, with no separator from any previous upper left index. \item - \mylst!sep upper left slot! + \mylst!sep upper left ---!, \mylst!sep upper left slot! Adds a slot to the upper left index, separated from any previous upper left index by the default separator. \item - \mylst!comma upper left slot! + \mylst!comma upper left ---!, \mylst!comma upper left slot! Adds a slot to the upper left index, separated from any previous upper left @@ -4598,6 +4605,7 @@ In the following sections, we include the full list. By default, this is~\lstinline!{-}!. \item + \mylst!upper left --- with other sep={$\$}!,\\ \mylst!upper left slot with other sep={$\$}! @@ -4780,20 +4788,20 @@ In the following sections, we include the full list. any prevous lower left index by~\. \item - \mylst!lower left slot! + \mylst!lower left ---!, \mylst!lower left slot! Adds a slot to the lower left index, with no separator from any previous lower left index. \item - \mylst!sep lower left slot! + \mylst!sep lower left ---!, \mylst!sep lower left slot! Adds a slot to the lower left index, separated from any previous lower left index by the default separator. \item - \mylst!comma lower left slot! + \mylst!comma lower left ---!, \mylst!comma lower left slot! Adds a slot to the lower left index, separated from any previous lower left @@ -4806,6 +4814,7 @@ In the following sections, we include the full list. By default, this is~\lstinline!{-}!. \item + \mylst!lower left --- with other sep={$\$}!,\\ \mylst!lower left slot with other sep={$\$}! @@ -4988,20 +4997,20 @@ In the following sections, we include the full list. any prevous \lstinline!d!-index by~\. \item - \mylst!d slot! + \mylst!d ---!, \mylst!d slot! Adds a slot to the \lstinline!d!-index, with no separator from any previous \lstinline!d!-index. \item - \mylst!sep d slot! + \mylst!sep d ---!, \mylst!sep d slot! Adds a slot to the \lstinline!d!-index, separated from any previous \lstinline!d!-index by the default separator. \item - \mylst!comma d slot! + \mylst!comma d ---!, \mylst!comma d slot! Adds a slot to the \lstinline!d!-index, separated from any previous \lstinline!d!-index @@ -5014,6 +5023,7 @@ In the following sections, we include the full list. By default, this is~\lstinline!{-}!. \item + \mylst!d --- with other sep={$\$}!, \mylst!d slot with other sep={$\$}! Adds a slot to the \lstinline!d!-index, separated @@ -5195,20 +5205,20 @@ In the following sections, we include the full list. any prevous \lstinline!i!-index by~\. \item - \mylst!i slot! + \mylst!i ---!, \mylst!i slot! Adds a slot to the \lstinline!i!-index, with no separator from any previous \lstinline!i!-index. \item - \mylst!sep i slot! + \mylst!sep i ---!, \mylst!sep i slot! Adds a slot to the \lstinline!i!-index, separated from any previous \lstinline!i!-index by the default separator. \item - \mylst!comma i slot! + \mylst!comma i ---!, \mylst!comma i slot! Adds a slot to the \lstinline!i!-index, separated from any previous \lstinline!i!-index @@ -5221,6 +5231,7 @@ In the following sections, we include the full list. By default, this is~\lstinline!{-}!. \item + \mylst!i --- with other sep={$\$}!, \mylst!i slot with other sep={$\$}! @@ -5445,14 +5456,14 @@ These are the predefined keys that work inside the argument. by a comma. \item - \mylst!slot! + \mylst!---!, \mylst!slot! Adds a slot to the argument, separated from any previous argument by the default separator. \item - \mylst!comma slot! + \mylst!comma ---!, \mylst!comma slot! Adds a slot to the argument, separated from any previous argument @@ -5480,6 +5491,7 @@ These are the predefined keys that work inside the argument. by~\. \item + \mylst!--- with other sep={$\$}!, \mylst!slot with other sep={$\$}! Adds a slot to the argument, separated diff --git a/Master/texmf-dist/tex/latex/semantex/semantex.sty b/Master/texmf-dist/tex/latex/semantex/semantex.sty index 1937f4e5c48..0543e3c030e 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}{2022/10/04}{0.522}{} +\ProvidesExplPackage{semantex}{2022/12/03}{0.523}{} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -10,7 +10,7 @@ % % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\tl_set:Nn\SemantexVersion{0.522} +\tl_set:Nn\SemantexVersion{0.523} \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 } @@ -7072,6 +7072,7 @@ {dots}{sep~i~dots}, {...}{dots}, {slot}{sep~i~slot}, + {---}{slot}, {*}{sep~d~*}, {**}{sep~d~**}, }, @@ -7101,12 +7102,14 @@ data~provide=pre~arg, data~provide=post~arg, define~keys={ - {arg~dots}{set~arg~keys={...}}, - {arg~...}{set~arg~keys={dots}}, + {arg~dots}{set~arg~keys={dots}}, + {arg~...}{set~arg~keys={...}}, {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 } @@ -7303,8 +7306,9 @@ {sep~arg}{set~arg~keys={sep={#1}}}, {comma~arg}{set~arg~keys={comma={#1}}}, {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~...~with~other~sep}{set~arg~keys={...~with~other~sep={#1}}}, {arg~slot~with~other~sep}{set~arg~keys={slot~with~other~sep={#1}}}, + {arg~---~with~other~sep}{set~arg~keys={---~with~other~sep={#1}}}, }, define~keys[2]={ {arg~with~other~sep}{set~arg~keys={other~sep={#1}{#2}}}, @@ -7380,8 +7384,11 @@ 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 } } }, @@ -7503,6 +7510,15 @@ } }, }, + {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 } }, }, @@ -7567,8 +7583,11 @@ 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 } } }, @@ -7689,6 +7708,15 @@ } }, }, + {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 } }, }, @@ -7753,8 +7781,11 @@ 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 } } }, @@ -7875,6 +7906,15 @@ } }, }, + {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 } }, }, @@ -7939,8 +7979,11 @@ 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 } } }, @@ -8061,6 +8104,15 @@ } }, }, + {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 } }, }, @@ -8124,16 +8176,19 @@ { 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 } @@ -8283,6 +8338,15 @@ lower~slot~with~other~sep={#1}, }, }, + {d~---~with~other~sep}{ + bool~if~TF={upper~grading} + { + upper~---~with~other~sep={#1}, + } + { + lower~---~with~other~sep={#1}, + }, + }, {set~d~dots}{ bool~if~TF={upper~grading} { @@ -8302,7 +8366,13 @@ }, }, {d~...~with~other~sep}{ - d~dots~with~other~sep={#1}, + bool~if~TF={upper~grading} + { + upper~...~with~other~sep={#1}, + } + { + lower~...~with~other~sep={#1}, + }, }, {d~*~with~other~sep}{ bool~if~TF={upper~grading} @@ -8369,16 +8439,19 @@ { 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 } @@ -8527,6 +8600,15 @@ upper~slot~with~other~sep={#1}, }, }, + {i~---~with~other~sep}{ + bool~if~TF={upper~grading} + { + lower~---~with~other~sep={#1}, + } + { + upper~---~with~other~sep={#1}, + }, + }, {set~i~dots}{ bool~if~TF={upper~grading} { @@ -8546,7 +8628,13 @@ }, }, {i~...~with~other~sep}{ - i~dots~with~other~sep={#1}, + bool~if~TF={upper~grading} + { + lower~...~with~other~sep={#1}, + } + { + upper~...~with~other~sep={#1}, + }, }, {i~*~with~other~sep}{ bool~if~TF={upper~grading} @@ -8712,7 +8800,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}{dots~with~other~sep={#1}}, {sep}{ execute={ \semantex_data_bool_get:nnTF { ##1 } { next~arg~with~sep } @@ -8752,6 +8839,7 @@ } }, }, + {...~with~other~sep}{dots~with~other~sep={#1}}, {slot~with~other~sep}{ execute={ \semantex_arg_valuekey:nnx { ##1 } { other~sep } @@ -8761,6 +8849,7 @@ } }, }, + {---~with~other~sep}{slot~with~other~sep={#1}}, }, define~arg~keys={ {dots}{ @@ -8789,6 +8878,7 @@ } }, }, + {---}{slot}, {comma~slot}{ execute={ \semantex_arg_valuekey:nnx { ##1 } { comma } @@ -8797,6 +8887,7 @@ } }, }, + {comma~---}{comma~slot}, }, define~arg~keys[2]={ {other~sep}{ diff --git a/Master/texmf-dist/tex/latex/semantex/stripsemantex.sty b/Master/texmf-dist/tex/latex/semantex/stripsemantex.sty index 5a984356440..1778ac29eca 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}{2022/10/04}{0.522}{} +\ProvidesExplPackage{stripsemantex}{2022/12/03}{0.523}{} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % -- cgit v1.2.3