From 0069692ff697680e3a6423929b9ae589df48087e Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 3 Oct 2020 21:48:43 +0000 Subject: semantex (3oct20) git-svn-id: svn://tug.org/texlive/trunk@56529 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/semantex/semantex.sty | 510 ++++++++++----------- .../tex/latex/semantex/stripsemantex.lua | 11 +- .../tex/latex/semantex/stripsemantex.sty | 2 +- 3 files changed, 246 insertions(+), 277 deletions(-) (limited to 'Master/texmf-dist/tex') diff --git a/Master/texmf-dist/tex/latex/semantex/semantex.sty b/Master/texmf-dist/tex/latex/semantex/semantex.sty index dcbf1f9193b..82cf996f5a9 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} -\ProvidesExplPackage{semantex}{2020/09/27}{0.44}{} +\RequirePackage{xparse,l3keys2e,leftindex,semtex} +\ProvidesExplPackage{semantex}{2020/10/03}{0.45}{} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -136,98 +136,6 @@ \cs_set_eq:NN\SemantexRecordObject\semantex_write_object_declaration_to_semtex_file:n -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% -% THE FOLLOWING SECTION IS IDENTICAL TO THE semtex PACKAGE -% -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% These are some essential commands that are needed for bullets and parentheses, -% and they are the only ones that will not be stripped by running the -% stripsemantex algorithm. Therefore, they are also available as a standalone -% package, called "semtex". This name is meant to suggest "stripped SemanTeX", -% and at the same time, semtex is the name of a plastic explosive, suggesting -% "blown-up SemanTeX". -% (Mathematicians are not famous for the quality of their humour.) - -% Bullets: - -\box_if_exist:NF \g__semantex_bullet_box -{ - \box_new:N \g__semantex_bullet_box - \hbox_set:Nn \g__semantex_bullet_box { $\cdot$ } - \box_scale:Nnn \g__semantex_bullet_box {1.2} {1.2} - \tl_set:Nn\g_semantex_bullet - { - \box_move_up:nn{-0.25ex}{\box_use:N \g__semantex_bullet_box} - } - - \tl_set:Nn\g_semantex_double_bullet{\g_semantex_bullet \g_semantex_bullet} - - \tl_set_eq:NN\SemantexBullet \g_semantex_bullet - - \tl_set_eq:NN \SemantexDoubleBullet \g_semantex_double_bullet -} - -% Parentheses: - -\cs_set:Npn\SemantexLeft { \mathopen{}\mathclose\bgroup\left } - -\cs_set:Npn\SemantexRight { \aftergroup\egroup\right } - -\DeclareDocumentCommand\SemantexDelimiterSize { } -{ - \semantex_write_original_source_to_semtex_file:n { \SemantexDelimiterSize } - \semantex_write_output_to_semtex_file_V:N \l_semantex_delimiter_size_temp_tl - \l_semantex_delimiter_size_temp_tl -} - -\DeclareDocumentCommand\RecordSemantexDelimiterSize { } -{ - \semantex_write_output_to_semtex_file_V:N \l_semantex_delimiter_size_temp_tl -} - -\DeclareDocumentCommand\SemantexDelimiterSizeNoRecord { } -{ - \l_semantex_delimiter_size_temp_tl -} - -\DeclareDocumentCommand\SemantexMathOpen { mm } -{ - \group_begin: - \tl_set:Nn\l_semantex_delimiter_size_temp_tl { #1 } - \str_if_eq:nnF { #2 } { . } { \mathopen #1 #2 } -} - -\DeclareDocumentCommand\SemantexMathClose { mm } -{ - \str_if_eq:nnF { #2 } { . } { \mathclose #1 #2 } - \group_end: -} - -\DeclareDocumentCommand\SemantexMathOpenAuto { m } -{ - \group_begin: - \tl_set:Nn\l_semantex_delimiter_size_temp_tl { \middle } - \SemantexLeft #1 -} - -\DeclareDocumentCommand\SemantexMathCloseAuto { m } -{ - \SemantexRight #1 - \group_end: -} - -\DeclareDocumentCommand\SemantexMathOpenNoPar { } -{ - \group_begin: - \tl_clear:N\l_semantex_delimiter_size_temp_tl -} - -\DeclareDocumentCommand\SemantexMathCloseNoPar { } -{ - \group_end: -} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % @@ -1355,7 +1263,7 @@ \use:c { __semantex_new_object_of_\semantex_class_to_register:N #1:Nw } } { - \msg_error:nnnn { semantex } { created_object_of_unknown_class } { #1 } + \msg_error:nnn { semantex } { created_object_of_unknown_class } { #1 } } } @@ -1375,7 +1283,7 @@ } } { - \msg_error:nnnn { semantex } { used_unknown_class } { #1 } + \msg_error:nnn { semantex } { used_unknown_class } { #1 } } } @@ -1795,6 +1703,60 @@ % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\DeclareDocumentCommand\SemantexDelimiterSize { } +{ + \semantex_write_original_source_to_semtex_file:n { \SemantexDelimiterSize } + \semantex_write_output_to_semtex_file_V:N \l_semantex_delimiter_size_temp_tl + \l_semantex_delimiter_size_temp_tl +} + +\DeclareDocumentCommand\RecordSemantexDelimiterSize { } +{ + \semantex_write_output_to_semtex_file_V:N \l_semantex_delimiter_size_temp_tl +} + +\DeclareDocumentCommand\SemantexDelimiterSizeNoRecord { } +{ + \l_semantex_delimiter_size_temp_tl +} + +\DeclareDocumentCommand\SemantexMathOpen { mm } +{ + \group_begin: + \tl_set:Nn\l_semantex_delimiter_size_temp_tl { #1 } + \str_if_eq:nnF { #2 } { . } { \mathopen #1 #2 } +} + +\DeclareDocumentCommand\SemantexMathClose { mm } +{ + \str_if_eq:nnF { #2 } { . } { \mathclose #1 #2 } + \group_end: +} + +\DeclareDocumentCommand\SemantexMathOpenAuto { m } +{ + \group_begin: + \tl_set:Nn\l_semantex_delimiter_size_temp_tl { \middle } + \SemantexLeft #1 +} + +\DeclareDocumentCommand\SemantexMathCloseAuto { m } +{ + \SemantexRight #1 + \group_end: +} + +\DeclareDocumentCommand\SemantexMathOpenNoPar { } +{ + \group_begin: + \tl_clear:N\l_semantex_delimiter_size_temp_tl +} + +\DeclareDocumentCommand\SemantexMathCloseNoPar { } +{ + \group_end: +} + \cs_new_protected:Npn \semantex_parentheses_store:nN#1#2 { \semantex_data_tl_get_store:nnN { #1 } { parsize } \l__semantex_parentheses_store_temp_tl @@ -2444,17 +2406,6 @@ } } -\cs_new_protected:Npn \semantex_data_clone_object:nn#1#2 -{ - \semantex_object_if_exist:NTF { #2 } - { - \tl_set:cx { g__semantex_data_tl_#1_parent } { \semantex_object_to_register:N #2 } - } - { - \semantex_msg_error:nnnn { #1 } { object_not_found } { clone } { #2 } - } -} - % COMMANDS FOR HANDLING DATA CONSISTING OF TOKEN LISTS \cs_new:Npn \semantex_data_tl_get:nn#1#2 @@ -2476,7 +2427,7 @@ { \str_if_eq:nnTF { #1 } { class_SemantexBaseObject } { - \semantex_msg_error:nnn { #3 } { data_tl_not_found } { #2 } + \semantex_msg_error:nnx { #3 } { data_tl_not_found } { #2 } } { \__semantex_data_tl_get_auxiliary:fnn { \semantex_data_parent_get:n { #1 } } { #2 } { #3 } @@ -2505,7 +2456,7 @@ { \str_if_eq:nnTF { #1 } { class_SemantexBaseObject } { - \semantex_msg_error:nnn { #3 } { data_tl_not_found } { #2 } + \semantex_msg_error:nnx { #3 } { data_tl_not_found } { #2 } } { \__semantex_data_tl_get_exp_not_auxiliary:fnn { \semantex_data_parent_get:n { #1 } } { #2 } { #3 } @@ -2536,7 +2487,7 @@ { \str_if_eq:nnTF { #1 } { class_SemantexBaseObject } { - \msg_error:nnn { #4 } { data_tl_not_found } { #2 } + \semantex_msg_error:nnx { #4 } { data_tl_not_found } { #2 } } { \__semantex_data_tl_get_store_auxiliary:fnNn { \semantex_data_parent_get:n { #1 } } { #2 } #3 { #4 } @@ -2642,13 +2593,13 @@ \cs_new:Npn \semantex_data_int_get:nn#1#2{ % #1 = name of object - % #2 = the intuence to get + % #2 = the integer to get \__semantex_data_int_get_auxiliary:nnn { #1 } { #2 } { #1 } } \cs_new:Npn \__semantex_data_int_get_auxiliary:nnn#1#2#3{ % #1 = name of object - % #2 = the intuence to get + % #2 = the integer to get % #3 = stores the original register, for error message purposes \bool_if_exist:cTF { g__semantex_data_int_#1_#2_bool_if_provided } { @@ -2659,7 +2610,7 @@ { \str_if_eq:nnTF { #1 } { class_SemantexBaseObject } { - \semantex_msg_error:nnn { #3 } { data_int_not_found } { #2 } + \semantex_msg_error:nnx { #3 } { data_int_not_found } { #2 } } { \__semantex_data_int_get_auxiliary:fnn { \semantex_data_parent_get:n { #1 } } { #2 } { #3 } @@ -2669,7 +2620,7 @@ { \str_if_eq:nnTF { #1 } { class_SemantexBaseObject } { - \semantex_msg_error:nnn { #3 } { data_int_not_found } { #2 } + \semantex_msg_error:nnx { #3 } { data_int_not_found } { #2 } } { \__semantex_data_int_get_auxiliary:fnn { \semantex_data_parent_get:n { #1 } } { #2 } { #3 } @@ -2682,14 +2633,14 @@ \cs_new_protected:Npn \semantex_data_int_get_store:nnN#1#2#3{ % #1 = name of object - % #2 = the intuence to get + % #2 = the integer to get % #3 = the command to store it in \__semantex_data_int_get_store_auxiliary:nnNn { #1 } { #2 } #3 { #1 } } \cs_new_protected:Npn\__semantex_data_int_get_store_auxiliary:nnNn#1#2#3#4{ % #1 = name of object - % #2 = the intuence to get + % #2 = the integer to get % #3 = the command to store it in \bool_if_exist:cTF { g__semantex_data_int_#1_#2_bool_if_provided } { @@ -2700,7 +2651,7 @@ { \str_if_eq:nnTF { #1 } { class_SemantexBaseObject } { - \semantex_msg_error:nnn { #4 } { data_int_not_found } { #2 } + \semantex_msg_error:nnx { #4 } { data_int_not_found } { #2 } } { \__semantex_data_int_get_store_auxiliary:fnNn { \semantex_data_parent_get:n { #1 } } { #2 } #3 { #4 } @@ -2710,7 +2661,7 @@ { \str_if_eq:nnTF { #1 } { class_SemantexBaseObject } { - \semantex_msg_error:nnn { #4 } { data_int_not_found } { #2 } + \semantex_msg_error:nnx { #4 } { data_int_not_found } { #2 } } { \__semantex_data_int_get_store_auxiliary:fnNn { \semantex_data_parent_get:n { #1 } } { #2 } #3 { #4 } @@ -2823,10 +2774,22 @@ \cs_new:Npn\semantex_data_bool_get:nnTF#1#2#3#4 { - % #1 = name of the object + % #1 = name of the register % #2 = boolean to get % #3 = if true % #4 = if false + \__semantex_data_bool_get_auxiliary:nnTFn { #1 } { #2 } { #3 } { #4 } { #1 } +} + +\cs_new:Npn\__semantex_data_bool_get_auxiliary:nnTFn#1#2#3#4#5 +{ + % We keep the somewhat unusual order of the arguments + % to be consistent with how these commands look elsewhere. + % #1 = name of the register + % #2 = boolean to get + % #3 = if true + % #4 = if false + % #5 = name of the original register, to be used for error messaging \bool_if_exist:cTF { g__semantex_data_bool_#1_if_#2_bool_if_provided } { \bool_if:cTF { g__semantex_data_bool_#1_if_#2_bool_if_provided } @@ -2839,22 +2802,24 @@ #4 } { - \semantex_data_bool_get:fnTF { \semantex_data_parent_get:n { #1 } } { #2 } { #3 } { #4 } + \__semantex_data_bool_get_auxiliary:fnTFn { \semantex_data_parent_get:n { #1 } } { #2 } { #3 } { #4 } { #5 } } } } { \str_if_eq:nnTF { #1 } { class_SemantexBaseObject } { - #4 + \semantex_msg_error:nnx { #5 } { data_bool_not_found } { #2 } } { - \semantex_data_bool_get:fnTF { \semantex_data_parent_get:n { #1 } } { #2 } { #3 } { #4 } + \__semantex_data_bool_get_auxiliary:fnTFn { \semantex_data_parent_get:n { #1 } } { #2 } { #3 } { #4 } { #5 } } } } -\cs_generate_variant:Nn \semantex_data_bool_get:nnTF { fnTF, nnT } +\cs_generate_variant:Nn \__semantex_data_bool_get_auxiliary:nnTFn { fnTFn } + +\cs_generate_variant:Nn \semantex_data_bool_get:nnTF { nnT } \cs_new:Npn\semantex_data_bool_get:nnF#1#2#3 { @@ -3112,7 +3077,7 @@ { \str_if_eq:nnTF { #1 } { class_SemantexBaseObject } { - \msg_error:nnn { #1 } { arg_valuekey_not_found } { #2 } + \semantex_msg_error:nnn { #1 } { arg_valuekey_not_found } { #2 } } { \__semantex_arg_valuekey:fnnn { \semantex_data_parent_get:n { #1 } } { #2 } { #3 } { #4 } @@ -5313,6 +5278,8 @@ } { #3 } } +\cs_generate_variant:Nn \semantex_msg_error:nnn { nnx } + \cs_new_protected:Npn \semantex_msg_error:nnnn#1#2#3#4 { \semantex_error_output_format:xN { #1 } \l__semantex_msg_error_nnnnn_temp_tl @@ -5687,7 +5654,6 @@ {parent}{ execute={ \semantex_data_parent_set:nn { ##1 } { #1 } } }, {class}{ execute={ \semantex_data_class_set:nn { ##1 } { #1 } } }, {copy}{ execute={ \semantex_data_copy_object:nn { ##1 } { #1 } } }, - {clone}{ execute={ \semantex_data_clone_object:nn { ##1 } { #1 } } }, {texclass}{ execute={ \semantex_data_tl_set:nnn { ##1 } { texclass } { #1 } } }, {symbol}{ execute={ @@ -5749,8 +5715,8 @@ }, }, }, - {default}{si={#1}}, - {degreedefault}{sd={#1}}, + {default}{sepi={#1}}, + {degreedefault}{sepd={#1}}, {arg}{ execute={ \semantex_arg_singlekeys_set:nn { ##1 } { #1 } } }, {*withothersep}{ d*withothersep={#1}, @@ -5773,10 +5739,10 @@ {argreturn}{ execute={ \semantex_arg_return:n { ##1 } } }, {parse}{ execute={ \semantex_parse:n { ##1 } } }, {clearcommand}{ execute={ \semantex_data_seq_clear:nn { ##1 } { commands_sequence } } }, - {...}{sidots}, - {-}{sislot}, - {*}{sd*}, - {**}{sd**}, + {...}{sepidots}, + {-}{sepislot}, + {*}{sepd*}, + {**}{sepd**}, }, % The "spar" routine: definekeys={ @@ -5806,12 +5772,12 @@ definekeys={ {argdots}{setargkeys={...}}, {arg...}{setargkeys={dots}}, - {cargdots}{setargkeys={cdots}}, - {carg...}{setargkeys={c...}}, + {commaargdots}{setargkeys={commadots}}, + {commaarg...}{setargkeys={comma...}}, {argslot}{setargkeys={slot}}, {arg-}{setargkeys={-}}, - {cargslot}{setargkeys={cslot}}, - {carg-}{setargkeys={c-}}, + {commaargslot}{setargkeys={commaslot}}, + {commaarg-}{setargkeys={comma-}}, {cleararg}{ execute={ \semantex_data_tl_clear:nn { ##1 } { arg } \semantex_data_int_clear:nn { ##1 } { numberofarguments } @@ -5908,8 +5874,8 @@ }, }, }, - {sarg}{setargkeys={s={#1}}}, - {carg}{setargkeys={c={#1}}}, + {separg}{setargkeys={sep={#1}}}, + {commaarg}{setargkeys={comma={#1}}}, {argdotswithothersep}{setargkeys={dotswithothersep={#1}}}, {arg...withothersep}{setargkeys={dotswithothersep={#1}}}, {argslotwithothersep}{setargkeys={slotwithothersep={#1}}}, @@ -5990,16 +5956,16 @@ definekeys={ {upperslot}{ setkeysx={ upper=\semantex_data_tl_get_exp_not:nn { ##1 } { upperslot } } }, {upper-}{upperslot}, - {supperslot}{ setkeysx={ supper=\semantex_data_tl_get_exp_not:nn { ##1 } { upperslot } } }, - {supper-}{supperslot}, - {cupperslot}{ setkeysx={ cupper=\semantex_data_tl_get_exp_not:nn { ##1 } { upperslot } } }, - {cupper-}{cupperslot}, + {sepupperslot}{ setkeysx={ sepupper=\semantex_data_tl_get_exp_not:nn { ##1 } { upperslot } } }, + {sepupper-}{sepupperslot}, + {commaupperslot}{ setkeysx={ commaupper=\semantex_data_tl_get_exp_not:nn { ##1 } { upperslot } } }, + {commaupper-}{commaupperslot}, {upperdots}{ setkeysx={ upper=\semantex_data_tl_get_exp_not:nn { ##1 } { upperdots } } }, {upper...}{upperdots}, - {supperdots}{ setkeysx={ supper=\semantex_data_tl_get_exp_not:nn { ##1 } { upperdots } } }, - {supper...}{supperdots}, - {cupperdots}{ setkeysx={ cupper=\semantex_data_tl_get_exp_not:nn { ##1 } { upperdots } } }, - {cupper...}{cupperdots}, + {sepupperdots}{ setkeysx={ sepupper=\semantex_data_tl_get_exp_not:nn { ##1 } { upperdots } } }, + {sepupper...}{sepupperdots}, + {commaupperdots}{ setkeysx={ commaupper=\semantex_data_tl_get_exp_not:nn { ##1 } { upperdots } } }, + {commaupper...}{commaupperdots}, {clearupper}{ execute={ \semantex_data_tl_clear:nn { ##1 } { upper } @@ -6015,10 +5981,10 @@ }, {upper*}{upper=\SemantexBullet}, {upper**}{upper=\SemantexDoubleBullet}, - {supper*}{supper=\SemantexBullet}, - {supper**}{supper=\SemantexDoubleBullet}, - {cupper*}{cupper=\SemantexBullet}, - {cupper**}{cupper=\SemantexDoubleBullet}, + {sepupper*}{sepupper=\SemantexBullet}, + {sepupper**}{sepupper=\SemantexDoubleBullet}, + {commaupper*}{commaupper=\SemantexBullet}, + {commaupper**}{commaupper=\SemantexDoubleBullet}, }, definekeys[1]={ {upper}{ @@ -6031,7 +5997,7 @@ } }, }, - {supper}{ + {sepupper}{ execute={ \tl_if_blank:nF { #1 } { @@ -6049,7 +6015,7 @@ } }, }, - {cupper}{ + {commaupper}{ execute={ \tl_if_blank:nF{#1} { @@ -6175,16 +6141,16 @@ definekeys={ {lowerslot}{ setkeysx={ lower=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerslot } } }, {lower-}{lowerslot}, - {slowerslot}{ setkeysx={ slower=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerslot } } }, - {slower-}{slowerslot}, - {clowerslot}{ setkeysx={ clower=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerslot } } }, - {clower-}{clowerslot}, + {seplowerslot}{ setkeysx={ seplower=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerslot } } }, + {seplower-}{seplowerslot}, + {commalowerslot}{ setkeysx={ commalower=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerslot } } }, + {commalower-}{commalowerslot}, {lowerdots}{ setkeysx={ lower=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerdots } } }, {lower...}{lowerdots}, - {slowerdots}{ setkeysx={ slower=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerdots } } }, - {slower...}{slowerdots}, - {clowerdots}{ setkeysx={ clower=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerdots } } }, - {clower...}{clowerdots}, + {seplowerdots}{ setkeysx={ seplower=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerdots } } }, + {seplower...}{seplowerdots}, + {commalowerdots}{ setkeysx={ commalower=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerdots } } }, + {commalower...}{commalowerdots}, {clearlower}{ execute={ \semantex_data_tl_clear:nn { ##1 } { lower } @@ -6200,10 +6166,10 @@ }, {lower*}{lower=\SemantexBullet}, {lower**}{lower=\SemantexDoubleBullet}, - {slower*}{slower=\SemantexBullet}, - {slower**}{slower=\SemantexDoubleBullet}, - {clower*}{clower=\SemantexBullet}, - {clower**}{clower=\SemantexDoubleBullet}, + {seplower*}{seplower=\SemantexBullet}, + {seplower**}{seplower=\SemantexDoubleBullet}, + {commalower*}{commalower=\SemantexBullet}, + {commalower**}{commalower=\SemantexDoubleBullet}, }, definekeys[1]={ {lower}{ @@ -6215,7 +6181,7 @@ } }, }, - {slower}{ + {seplower}{ execute={ \tl_if_blank:nF { #1 } { @@ -6233,7 +6199,7 @@ } }, }, - {clower}{ + {commalower}{ execute={ \tl_if_blank:nF{#1} { @@ -6359,16 +6325,16 @@ definekeys={ {upperleftslot}{ setkeysx={ upperleft=\semantex_data_tl_get_exp_not:nn { ##1 } { upperleftslot } } }, {upperleft-}{upperleftslot}, - {supperleftslot}{ setkeysx={ supperleft=\semantex_data_tl_get_exp_not:nn { ##1 } { upperleftslot } } }, - {supperleft-}{supperleftslot}, - {cupperleftslot}{ setkeysx={ cupperleft=\semantex_data_tl_get_exp_not:nn { ##1 } { upperleftslot } } }, - {cupperleft-}{cupperleftslot}, + {sepupperleftslot}{ setkeysx={ sepupperleft=\semantex_data_tl_get_exp_not:nn { ##1 } { upperleftslot } } }, + {sepupperleft-}{sepupperleftslot}, + {commaupperleftslot}{ setkeysx={ commaupperleft=\semantex_data_tl_get_exp_not:nn { ##1 } { upperleftslot } } }, + {commaupperleft-}{commaupperleftslot}, {upperleftdots}{ setkeysx={ upperleft=\semantex_data_tl_get_exp_not:nn { ##1 } { upperleftdots } } }, {upperleft...}{upperleftdots}, - {supperleftdots}{ setkeysx={ supperleft=\semantex_data_tl_get_exp_not:nn { ##1 } { upperleftdots } } }, - {supperleft...}{supperleftdots}, - {cupperleftdots}{ setkeysx={ cupperleft=\semantex_data_tl_get_exp_not:nn { ##1 } { upperleftdots } } }, - {cupperleft...}{cupperleftdots}, + {sepupperleftdots}{ setkeysx={ sepupperleft=\semantex_data_tl_get_exp_not:nn { ##1 } { upperleftdots } } }, + {sepupperleft...}{sepupperleftdots}, + {commaupperleftdots}{ setkeysx={ commaupperleft=\semantex_data_tl_get_exp_not:nn { ##1 } { upperleftdots } } }, + {commaupperleft...}{commaupperleftdots}, {clearupperleft}{ execute={ \semantex_data_tl_clear:nn { ##1 } { upperleft } @@ -6384,10 +6350,10 @@ }, {upperleft*}{upperleft=\SemantexBullet}, {upperleft**}{upperleft=\SemantexDoubleBullet}, - {supperleft*}{supperleft=\SemantexBullet}, - {supperleft**}{supperleft=\SemantexDoubleBullet}, - {cupperleft*}{cupperleft=\SemantexBullet}, - {cupperleft**}{cupperleft=\SemantexDoubleBullet}, + {sepupperleft*}{sepupperleft=\SemantexBullet}, + {sepupperleft**}{sepupperleft=\SemantexDoubleBullet}, + {commaupperleft*}{commaupperleft=\SemantexBullet}, + {commaupperleft**}{commaupperleft=\SemantexDoubleBullet}, }, definekeys[1]={ {upperleft}{ @@ -6399,7 +6365,7 @@ } }, }, - {supperleft}{ + {sepupperleft}{ execute={ \tl_if_blank:nF { #1 } { @@ -6417,7 +6383,7 @@ } }, }, - {cupperleft}{ + {commaupperleft}{ execute={ \tl_if_blank:nF{#1} { @@ -6543,16 +6509,16 @@ definekeys={ {lowerleftslot}{ setkeysx={ lowerleft=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerleftslot } } }, {lowerleft-}{lowerleftslot}, - {slowerleftslot}{ setkeysx={ slowerleft=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerleftslot } } }, - {slowerleft-}{slowerleftslot}, - {clowerleftslot}{ setkeysx={ clowerleft=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerleftslot } } }, - {clowerleft-}{clowerleftslot}, + {seplowerleftslot}{ setkeysx={ seplowerleft=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerleftslot } } }, + {seplowerleft-}{seplowerleftslot}, + {commalowerleftslot}{ setkeysx={ commalowerleft=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerleftslot } } }, + {commalowerleft-}{commalowerleftslot}, {lowerleftdots}{ setkeysx={ lowerleft=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerleftdots } } }, {lowerleft...}{lowerleftdots}, - {slowerleftdots}{ setkeysx={ slowerleft=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerleftdots } } }, - {slowerleft...}{slowerleftdots}, - {clowerleftdots}{ setkeysx={ clowerleft=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerleftdots } } }, - {clowerleft...}{clowerleftdots}, + {seplowerleftdots}{ setkeysx={ seplowerleft=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerleftdots } } }, + {seplowerleft...}{seplowerleftdots}, + {commalowerleftdots}{ setkeysx={ commalowerleft=\semantex_data_tl_get_exp_not:nn { ##1 } { lowerleftdots } } }, + {commalowerleft...}{commalowerleftdots}, {clearlowerleft}{ execute={ \semantex_data_tl_clear:nn { ##1 } { lowerleft } @@ -6568,10 +6534,10 @@ }, {lowerleft*}{lowerleft=\SemantexBullet}, {lowerleft**}{lowerleft=\SemantexDoubleBullet}, - {slowerleft*}{slowerleft=\SemantexBullet}, - {slowerleft**}{slowerleft=\SemantexDoubleBullet}, - {clowerleft*}{clowerleft=\SemantexBullet}, - {clowerleft**}{clowerleft=\SemantexDoubleBullet}, + {seplowerleft*}{seplowerleft=\SemantexBullet}, + {seplowerleft**}{seplowerleft=\SemantexDoubleBullet}, + {commalowerleft*}{commalowerleft=\SemantexBullet}, + {commalowerleft**}{commalowerleft=\SemantexDoubleBullet}, }, definekeys[1]={ {lowerleft}{ @@ -6583,7 +6549,7 @@ } }, }, - {slowerleft}{ + {seplowerleft}{ execute={ \tl_if_blank:nF { #1 } { @@ -6601,7 +6567,7 @@ } }, }, - {clowerleft}{ + {commalowerleft}{ execute={ \tl_if_blank:nF{#1} { @@ -6726,36 +6692,36 @@ { lowerslot }, }, {d-}{dslot}, - {sdslot}{ + {sepdslot}{ boolifTF={uppergrading} - { supperslot } - { slowerslot }, + { sepupperslot } + { seplowerslot }, }, - {sd-}{sdslot}, - {cdslot}{ + {sepd-}{sepdslot}, + {commadslot}{ boolifTF={uppergrading} - { cupperslot } - { clowerslot }, + { commaupperslot } + { commalowerslot }, }, - {cd-}{cdslot}, + {commad-}{commadslot}, {ddots}{ boolifTF={uppergrading} { upperdots } { lowerdots }, }, {d...}{ddots}, - {sddots}{ + {sepddots}{ boolifTF={uppergrading} - { supperdots } - { slowerdots }, + { sepupperdots } + { seplowerdots }, }, - {sd...}{sddots}, - {cddots}{ + {sepd...}{sepddots}, + {commaddots}{ boolifTF={uppergrading} - { cupperdots } - { clowerdots }, + { commaupperdots } + { commalowerdots }, }, - {cd...}{cddots}, + {commad...}{commaddots}, {cleard}{ boolifTF={uppergrading} { clearupper } @@ -6781,25 +6747,25 @@ { upper** } { lower** }, }, - {sd*}{ + {sepd*}{ boolifTF={uppergrading} - { supper* } - { slower* }, + { sepupper* } + { seplower* }, }, - {sd**}{ + {sepd**}{ boolifTF={uppergrading} - { supper** } - { slower** }, + { sepupper** } + { seplower** }, }, - {cd*}{ + {commad*}{ boolifTF={uppergrading} - { cupper* } - { clower* }, + { commaupper* } + { commalower* }, }, - {cd**}{ + {commad**}{ boolifTF={uppergrading} - { cupper** } - { clower** }, + { commaupper** } + { commalower** }, }, }, definekeys[1]={ @@ -6810,18 +6776,18 @@ { \semantex_valuekey:nnn { ##1 } { lower } { #1 } } }, }, - {sd}{ + {sepd}{ execute={ \semantex_data_bool_get:nnTF { ##1 } { uppergrading } - { \semantex_valuekey:nnn { ##1 } { supper } { #1 } } - { \semantex_valuekey:nnn { ##1 } { slower } { #1 } } + { \semantex_valuekey:nnn { ##1 } { sepupper } { #1 } } + { \semantex_valuekey:nnn { ##1 } { seplower } { #1 } } }, }, - {cd}{ + {commad}{ execute={ \semantex_data_bool_get:nnTF { ##1 } { uppergrading } - { \semantex_valuekey:nnn { ##1 } { cupper } { #1 } } - { \semantex_valuekey:nnn { ##1 } { clower } { #1 } } + { \semantex_valuekey:nnn { ##1 } { commaupper } { #1 } } + { \semantex_valuekey:nnn { ##1 } { commalower } { #1 } } }, }, {pred}{ @@ -6959,36 +6925,36 @@ { upperslot }, }, {i-}{islot}, - {sislot}{ + {sepislot}{ boolifTF={uppergrading} - { slowerslot } - { supperslot }, + { seplowerslot } + { sepupperslot }, }, - {si-}{sislot}, - {cislot}{ + {sepi-}{sepislot}, + {commaislot}{ boolifTF={uppergrading} - { clowerslot } - { cupperslot }, + { commalowerslot } + { commaupperslot }, }, - {ci-}{cislot}, + {commai-}{commaislot}, {idots}{ boolifTF={uppergrading} { lowerdots } { upperdots }, }, {i...}{idots}, - {sidots}{ + {sepidots}{ boolifTF={uppergrading} - { slowerdots } - { supperdots }, + { seplowerdots } + { sepupperdots }, }, - {si...}{sidots}, - {cidots}{ + {sepi...}{sepidots}, + {commaidots}{ boolifTF={uppergrading} - { clowerdots } - { cupperdots }, + { commalowerdots } + { commaupperdots }, }, - {ci...}{cidots}, + {commai...}{commaidots}, {cleari}{ boolifTF={uppergrading} { clearlower } @@ -7014,25 +6980,25 @@ { lower** } { upper** }, }, - {si*}{ + {sepi*}{ boolifTF={uppergrading} - { slower* } - { supper* }, + { seplower* } + { sepupper* }, }, - {si**}{ + {sepi**}{ boolifTF={uppergrading} - { slower** } - { supper** }, + { seplower** } + { sepupper** }, }, - {ci*}{ + {commai*}{ boolifTF={uppergrading} - { clower* } - { cupper* }, + { commalower* } + { commaupper* }, }, - {ci**}{ + {commai**}{ boolifTF={uppergrading} - { clower** } - { cupper** }, + { commalower** } + { commaupper** }, }, }, definekeys[1]={ @@ -7043,18 +7009,18 @@ { \semantex_valuekey:nnn { ##1 } { upper } { #1 } } }, }, - {si}{ + {sepi}{ execute={ \semantex_data_bool_get:nnTF { ##1 } { uppergrading } - { \semantex_valuekey:nnn { ##1 } { slower } { #1 } } - { \semantex_valuekey:nnn { ##1 } { supper } { #1 } } + { \semantex_valuekey:nnn { ##1 } { seplower } { #1 } } + { \semantex_valuekey:nnn { ##1 } { sepupper } { #1 } } }, }, - {ci}{ + {commai}{ execute={ \semantex_data_bool_get:nnTF { ##1 } { uppergrading } - { \semantex_valuekey:nnn { ##1 } { clower } { #1 } } - { \semantex_valuekey:nnn { ##1 } { cupper } { #1 } } + { \semantex_valuekey:nnn { ##1 } { commalower } { #1 } } + { \semantex_valuekey:nnn { ##1 } { commaupper } { #1 } } }, }, {prei}{ @@ -7204,10 +7170,10 @@ {argwithoutkeyvalset}{ execute={ \semantex_arg_without_keyval:nn { ##1 } { #1 } } }, {setargwithoutkeyvalx}{ execute={ \semantex_arg_without_keyval:nx { ##1 } { #1 } } }, {argwithoutkeyvalsetx}{ execute={ \semantex_arg_without_keyval:nx { ##1 } { #1 } } }, - {default}{s={#1}}, + {default}{sep={#1}}, {-withothersep}{slotwithothersep={#1}}, {...withothersep}{dotswithothersep={#1}}, - {s}{ + {sep}{ execute={ \semantex_data_bool_get:nnTF { ##1 } { nextargwithsep } { @@ -7224,7 +7190,7 @@ \semantex_data_bool_set_true:nn { ##1 } { nextargwithsep } } }, - {c}{ + {comma}{ execute={ \semantex_data_bool_get:nnTF { ##1 } { nextargwithsep } { @@ -7259,40 +7225,40 @@ defineargkeys={ {dots}{ execute={ - \semantex_arg_valuekey:nnx { ##1 } { s } + \semantex_arg_valuekey:nnx { ##1 } { sep } { \semantex_data_tl_get_exp_not:nn { ##1 } { argdots } } }, }, {...}{dots}, - {cdots}{ + {commadots}{ execute={ - \semantex_arg_valuekey:nnx { ##1 } { c } + \semantex_arg_valuekey:nnx { ##1 } { comma } { \semantex_data_tl_get_exp_not:nn { ##1 } { argdots } } }, }, - {c...}{cdots}, + {comma...}{commadots}, {slot}{ execute={ - \semantex_arg_valuekey:nnx { ##1 } { s } + \semantex_arg_valuekey:nnx { ##1 } { sep } { \semantex_data_tl_get_exp_not:nn { ##1 } { argslot } } }, }, {-}{slot}, - {cslot}{ + {commaslot}{ execute={ - \semantex_arg_valuekey:nnx { ##1 } { c } + \semantex_arg_valuekey:nnx { ##1 } { comma } { \semantex_data_tl_get_exp_not:nn { ##1 } { argslot } } }, }, - {c-}{cslot}, + {comma-}{commaslot}, }, defineargkeys[2]={ {othersep}{ diff --git a/Master/texmf-dist/tex/latex/semantex/stripsemantex.lua b/Master/texmf-dist/tex/latex/semantex/stripsemantex.lua index 0ecb5e62408..f50648dd231 100644 --- a/Master/texmf-dist/tex/latex/semantex/stripsemantex.lua +++ b/Master/texmf-dist/tex/latex/semantex/stripsemantex.lua @@ -297,12 +297,15 @@ addSemtexPackageToFile = function() \aftergroup\egroup\right } -\providecommand\SemantexBullet{% - \raisebox{-0.25ex}{\scalebox{1.2}{$\cdot$}}% +\makeatletter +\DeclareRobustCommand\SemantexBullet{% + \mathord{\mathpalette\SemantexBullet@{0.5}}% } -\providecommand\SemantexDoubleBullet{% - \SemantexBullet\SemantexBullet +\newcommand\SemantexBullet@[2]{% + \vcenter{\hbox{\scalebox{#2}{$\m@th#1\bullet$}}}% } +\DeclareRobustCommand\SemantexDoubleBullet{\SemantexBullet \SemantexBullet} +\makeatother ]] .. content end \ No newline at end of file diff --git a/Master/texmf-dist/tex/latex/semantex/stripsemantex.sty b/Master/texmf-dist/tex/latex/semantex/stripsemantex.sty index 419a4dd75a4..679b2ab72c3 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/09/27}{0.44}{} +\ProvidesExplPackage{stripsemantex}{2020/10/03}{0.45}{} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % -- cgit v1.2.3