From 3a2294eff9e415a4ff2a6b6275988c8cf14cd628 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sat, 24 Jul 2021 20:47:56 +0000 Subject: semantex (24jul21) git-svn-id: svn://tug.org/texlive/trunk@60043 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/tex/latex/semantex/semantex.sty | 579 +++++++++++---------- .../tex/latex/semantex/stripsemantex.sty | 2 +- 2 files changed, 302 insertions(+), 279 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 cfc39416661..125979e55a3 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/07/18}{0.508}{} +\ProvidesExplPackage{semantex}{2021/07/24}{0.510}{} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % @@ -156,15 +156,15 @@ { % the actual \#1 command \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } } - \semantex_render_class:Nn #1 { - \semantex_class_set_symbol:Nn #1 { ##1 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } } } \exp_args:Nc\DeclareDocumentCommand{__semantex_make_object_of_\semantex_class_to_register:N #1_with_options:nnw}{mm} { %\semantex_add_to_existing_original_source_in_semtex_file:n { } % add nothing to file - \semantex_render_class:Nn #1 { - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 } } @@ -209,16 +209,16 @@ \IfValueTF{##2} { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } { ##2 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } } - \semantex_render_class:Nn #1 { - \semantex_class_set_symbol:Nn #1 { ##1 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } } } } @@ -227,17 +227,17 @@ \IfValueTF{##3} { \semantex_add_to_existing_original_source_in_semtex_file:n { [##3] } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } } } { %\semantex_add_to_existing_original_source_in_semtex_file:n { } % write nothing to file - \semantex_render_class:Nn #1 { - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 } } @@ -296,19 +296,19 @@ \IfValueTF { ##3 } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } [ ##2 ] { ##3 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } - \semantex_class_set_arg:Nn #1 { ##3 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##3 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } [ ##2 ] } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } } } } @@ -316,16 +316,16 @@ \IfValueTF { ##3 } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } { ##3 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_arg:Nn #1 { ##3 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##3 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } } - \semantex_render_class:Nn #1 { - \semantex_class_set_symbol:Nn #1 { ##1 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } } } } @@ -336,21 +336,21 @@ { \IfValueTF { ##4 }{ \semantex_add_to_existing_original_source_in_semtex_file:n { [ ##3 ] { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } - \semantex_class_set_arg:Nn #1 { ##4 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##4 } } } { \semantex_add_to_existing_original_source_in_semtex_file:n { [ ##3 ] } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } } } } @@ -358,17 +358,17 @@ \IfValueTF { ##4 } { \semantex_add_to_existing_original_source_in_semtex_file:n { { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_arg:Nn #1 { ##4 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##4 } } } { % \semantex_add_to_existing_original_source_in_semtex_file:n { } % write nothing to file - \semantex_render_class:Nn #1 { - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 } } @@ -462,22 +462,22 @@ { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } [ ##2 ] { * } { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } - \semantex_class_use_bullet:N #1 - \semantex_class_set_arg:Nn #1 { ##4 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } + \semantex_object_associated_to_class_use_bullet:N #1 + \semantex_object_associated_to_class_set_arg:Nn #1 { ##4 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } [ ##2 ] { * } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } - \semantex_class_use_bullet:N #1 + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } + \semantex_object_associated_to_class_use_bullet:N #1 } } } @@ -488,22 +488,22 @@ { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } [ ##2 ] { ** } { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } - \semantex_class_use_double_bullet:N #1 - \semantex_class_set_arg:Nn #1 { ##4 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } + \semantex_object_associated_to_class_use_double_bullet:N #1 + \semantex_object_associated_to_class_set_arg:Nn #1 { ##4 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } [ ##2 ] { ** } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } - \semantex_class_use_double_bullet:N #1 + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } + \semantex_object_associated_to_class_use_double_bullet:N #1 } } } @@ -512,22 +512,22 @@ { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } [ ##2 ] { ##3 } { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } - \semantex_class_set_degree_default:Nn #1 { ##3 } - \semantex_class_set_arg:Nn #1 { ##4 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } + \semantex_object_associated_to_class_set_degree_default:Nn #1 { ##3 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##4 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } [ ##2 ] { ##3 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } - \semantex_class_set_degree_default:Nn #1 { ##3 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } + \semantex_object_associated_to_class_set_degree_default:Nn #1 { ##3 } } } } @@ -538,20 +538,20 @@ { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } [ ##2 ] { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } - \semantex_class_set_arg:Nn #1 { ##4 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##4 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } [ ##2 ] } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } } } } @@ -565,20 +565,20 @@ { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } { * } { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_use_bullet:N #1 - \semantex_class_set_arg:Nn #1 { ##4 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_use_bullet:N #1 + \semantex_object_associated_to_class_set_arg:Nn #1 { ##4 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } { * } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_use_bullet:N #1 + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_use_bullet:N #1 } } } @@ -589,20 +589,20 @@ { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } { ** } { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_use_double_bullet:N #1 - \semantex_class_set_arg:Nn #1 { ##4 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_use_double_bullet:N #1 + \semantex_object_associated_to_class_set_arg:Nn #1 { ##4 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } { ** } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_use_double_bullet:N #1 + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_use_double_bullet:N #1 } } } @@ -611,20 +611,20 @@ { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } { ##3 } { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_degree_default:Nn #1 { ##3 } - \semantex_class_set_arg:Nn #1 { ##4 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_degree_default:Nn #1 { ##3 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##4 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } { ##3 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_degree_default:Nn #1 { ##3 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_degree_default:Nn #1 { ##3 } } } } @@ -635,17 +635,17 @@ { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_arg:Nn #1 { ##4 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##4 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } } - \semantex_render_class:Nn #1 { - \semantex_class_set_symbol:Nn #1 { ##1 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } } } } @@ -663,24 +663,24 @@ { \semantex_add_to_existing_original_source_in_semtex_file:n { [ ##3 ] { * } { ##5 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } - \semantex_class_use_bullet:N #1 - \semantex_class_set_arg:Nn #1 { ##5 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_use_bullet:N #1 + \semantex_object_associated_to_class_set_arg:Nn #1 { ##5 } } } { \semantex_add_to_existing_original_source_in_semtex_file:n { [ ##3 ] { * } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } - \semantex_class_use_bullet:N #1 + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_use_bullet:N #1 } } } @@ -691,24 +691,24 @@ { \semantex_add_to_existing_original_source_in_semtex_file:n { [ ##3 ] { ** } { ##5 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } - \semantex_class_use_double_bullet:N #1 - \semantex_class_set_arg:Nn #1 { ##5 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_use_double_bullet:N #1 + \semantex_object_associated_to_class_set_arg:Nn #1 { ##5 } } } { \semantex_add_to_existing_original_source_in_semtex_file:n { [ ##3 ] { ** } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } - \semantex_class_use_double_bullet:N #1 + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_use_double_bullet:N #1 } } } @@ -717,24 +717,24 @@ { \semantex_add_to_existing_original_source_in_semtex_file:n { [ ##3 ] { ##4 } { ##5 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } - \semantex_class_set_degree_default:Nn #1 { ##4 } - \semantex_class_set_arg:Nn #1 { ##5 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_set_degree_default:Nn #1 { ##4 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##5 } } } { \semantex_add_to_existing_original_source_in_semtex_file:n { [ ##3 ] { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } - \semantex_class_set_degree_default:Nn #1 { ##4 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_set_degree_default:Nn #1 { ##4 } } } } @@ -745,22 +745,22 @@ { \semantex_add_to_existing_original_source_in_semtex_file:n { [ ##3 ] { ##5 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } - \semantex_class_set_arg:Nn #1 { ##5 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##5 } } } { \semantex_add_to_existing_original_source_in_semtex_file:n { [ ##3 ] } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } } } } @@ -774,22 +774,22 @@ { \semantex_add_to_existing_original_source_in_semtex_file:n { { * } { ##5 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_use_bullet:N #1 - \semantex_class_set_arg:Nn #1 { ##5 } + \semantex_object_associated_to_class_use_bullet:N #1 + \semantex_object_associated_to_class_set_arg:Nn #1 { ##5 } } } { \semantex_add_to_existing_original_source_in_semtex_file:n { { * } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_use_bullet:N #1 + \semantex_object_associated_to_class_use_bullet:N #1 } } } @@ -800,22 +800,22 @@ { \semantex_add_to_existing_original_source_in_semtex_file:n { { ** } { ##5 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_use_double_bullet:N #1 - \semantex_class_set_arg:Nn #1 { ##5 } + \semantex_object_associated_to_class_use_double_bullet:N #1 + \semantex_object_associated_to_class_set_arg:Nn #1 { ##5 } } } { \semantex_add_to_existing_original_source_in_semtex_file:n { { ** } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_use_double_bullet:N #1 + \semantex_object_associated_to_class_use_double_bullet:N #1 } } } @@ -824,22 +824,22 @@ { \semantex_add_to_existing_original_source_in_semtex_file:n { { ##4 } { ##5 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_degree_default:Nn #1 { ##4 } - \semantex_class_set_arg:Nn #1 { ##5 } + \semantex_object_associated_to_class_set_degree_default:Nn #1 { ##4 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##5 } } } { \semantex_add_to_existing_original_source_in_semtex_file:n { { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_degree_default:Nn #1 { ##4 } + \semantex_object_associated_to_class_set_degree_default:Nn #1 { ##4 } } } } @@ -850,17 +850,17 @@ { \semantex_add_to_existing_original_source_in_semtex_file:n { { ##5 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_arg:Nn #1 { ##5 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##5 } } } { % \semantex_add_to_existing_original_source_in_semtex_file:n { } % write nothing to file - \semantex_render_class:Nn #1 { - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 } } @@ -1089,20 +1089,20 @@ { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } [ ##2 ] { ##3 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } - \semantex_class_set_arg:Nn #1 { ##3 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##3 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } [ ##2 ] } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_keys:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##2 } } } } @@ -1111,17 +1111,17 @@ { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } { ##3 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##1 } - \semantex_class_set_arg:Nn #1 { ##3 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##3 } } } { \semantex_write_original_source_to_semtex_file:n { #1 { ##1 } } - \semantex_render_class:Nn #1 { - \semantex_class_set_symbol:Nn #1 { ##1 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##1 } } } } @@ -1135,41 +1135,41 @@ { \semantex_add_to_existing_original_source_in_semtex_file:n { [ ##3 ] { ##4 } } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } - \semantex_class_set_arg:Nn #1 { ##4 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##4 } } } { \semantex_add_to_existing_original_source_in_semtex_file:n { [ ##3 ] } - \semantex_render_class:Nn #1 { - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_keys:Nn #1 { ##3 } + \semantex_object_associated_to_class_set_keys:Nn #1 { ##3 } } } } { \IfValueTF { ##4 } { - \semantex_render_class:Nn #1 { + \semantex_render_object_associated_to_class:Nn #1 { \semantex_add_to_existing_original_source_in_semtex_file:n { { ##4 } } - \semantex_class_do_output:N #1 - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_object_associated_to_class_do_output:N #1 + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 - \semantex_class_set_arg:Nn #1 { ##4 } + \semantex_object_associated_to_class_set_arg:Nn #1 { ##4 } } } { % \semantex_add_to_existing_original_source_in_semtex_file:n { } % write nothing to file - \semantex_render_class:Nn #1 { - \semantex_class_set_symbol:Nn #1 { ##2 } + \semantex_render_object_associated_to_class:Nn #1 { + \semantex_object_associated_to_class_set_symbol:Nn #1 { ##2 } ##1 } } @@ -1253,6 +1253,12 @@ class_\cs_to_str:N #1 } +\cs_new:Npn\semantex_class_to_associated_object_register:N#1 +{ + % #1 = name of class + object_associated_to_class_\cs_to_str:N #1 +} + \cs_new:Npn\semantex_object_to_register:N#1 { % #1 = name of object @@ -1279,7 +1285,7 @@ { \use:c { __semantex_make_object_of_\semantex_class_to_register:N #1_with_options:nnw } { - \semantex_keys_set:nn { \semantex_class_to_register:N #1 } { #2 } + \semantex_keys_set:nn { \semantex_class_to_associated_object_register:N #1 } { #2 } } } { @@ -1344,6 +1350,9 @@ { \semantex_add_to_list_of_classes:N #1 \semantex_new_register:xn { \semantex_class_to_register:N #1 } { #2 } + \semantex_new_register:xn { \semantex_class_to_associated_object_register:N #1 } { + \semantex_object_associated_to_class_set_class:Nn #1 { #1 } + } } } @@ -1372,9 +1381,14 @@ % complicated, but I've decided to use them anyway to make it more % user-friendly to create your own class type. -\cs_new_protected:Npn\semantex_class_set_symbol:Nn#1#2 +\cs_new_protected:Npn\semantex_class_set_keys:Nn#1#2 +{ + \semantex_keys_set:nn { \semantex_class_to_register:N #1 } { #2 } +} + +\cs_new_protected:Npn\semantex_object_associated_to_class_set_symbol:Nn#1#2 { - \semantex_valuekey:nnn { \semantex_class_to_register:N #1 } { symbol } { #2 } + \semantex_valuekey:nnn { \semantex_class_to_associated_object_register:N #1 } { symbol } { #2 } } \cs_new_protected:Npn\semantex_object_set_symbol:Nn#1#2 @@ -1382,9 +1396,9 @@ \semantex_valuekey:nnn { \semantex_object_to_register:N #1 } { symbol } { #2 } } -\cs_new_protected:Npn\semantex_class_do_output:N#1 +\cs_new_protected:Npn\semantex_object_associated_to_class_do_output:N#1 { - \semantex_data_bool_set_true:nn { \semantex_class_to_register:N #1 } { output } + \semantex_data_bool_set_true:nn { \semantex_class_to_associated_object_register:N #1 } { output } } \cs_new_protected:Npn\semantex_object_do_output:N#1 @@ -1392,9 +1406,9 @@ \semantex_data_bool_set_true:nn { \semantex_object_to_register:N #1 } { output } } -\cs_new_protected:Npn\semantex_class_set_keys:Nn#1#2 +\cs_new_protected:Npn\semantex_object_associated_to_class_set_keys:Nn#1#2 { - \semantex_keys_set:nn { \semantex_class_to_register:N #1 } { #2 } + \semantex_keys_set:nn { \semantex_class_to_associated_object_register:N #1 } { #2 } } \cs_new_protected:Npn\semantex_object_set_keys:Nn#1#2 @@ -1402,9 +1416,9 @@ \semantex_keys_set:nn { \semantex_object_to_register:N #1 } { #2 } } -\cs_new_protected:Npn\semantex_class_set_arg:Nn#1#2 +\cs_new_protected:Npn\semantex_object_associated_to_class_set_arg:Nn#1#2 { - \semantex_valuekey:nnn { \semantex_class_to_register:N #1 } { arg } { #2 } + \semantex_valuekey:nnn { \semantex_class_to_associated_object_register:N #1 } { arg } { #2 } } \cs_new_protected:Npn\semantex_object_set_arg:Nn#1#2 @@ -1412,9 +1426,9 @@ \semantex_valuekey:nnn { \semantex_object_to_register:N #1 } { arg } { #2 } } -\cs_new_protected:Npn\semantex_class_set_degree_default:Nn#1#2 +\cs_new_protected:Npn\semantex_object_associated_to_class_set_degree_default:Nn#1#2 { - \semantex_valuekey:nnn { \semantex_class_to_register:N #1 } { degree~default } { #2 } + \semantex_valuekey:nnn { \semantex_class_to_associated_object_register:N #1 } { degree~default } { #2 } } \cs_new_protected:Npn\semantex_object_set_degree_default:Nn#1#2 @@ -1424,7 +1438,7 @@ \cs_new_protected:Npn\semantex_class_use_bullet:N#1 { - \semantex_singlekey:nn { \semantex_class_to_register:N #1 } { * } + \semantex_singlekey:nn { \semantex_class_to_associated_object_register:N #1 } { * } } \cs_new_protected:Npn\semantex_object_use_bullet:N#1 @@ -1434,7 +1448,7 @@ \cs_new_protected:Npn\semantex_class_use_double_bullet:N#1 { - \semantex_singlekey:nn { \semantex_class_to_register:N #1 } { * } + \semantex_singlekey:nn { \semantex_class_to_associated_object_register:N #1 } { * } } \cs_new_protected:Npn\semantex_object_use_double_bullet:N#1 @@ -1442,9 +1456,9 @@ \semantex_singlekey:nn { \semantex_object_to_register:N #1 } { * } } -\cs_new_protected:Npn\semantex_class_set_left_par:Nn#1#2 +\cs_new_protected:Npn\semantex_object_associated_to_class_set_left_par:Nn#1#2 { - \semantex_data_tl_set:nnn { \semantex_class_to_register:N #1 } { left~par } { #2 } + \semantex_data_tl_set:nnn { \semantex_class_to_associated_object_register:N #1 } { left~par } { #2 } } \cs_new_protected:Npn\semantex_object_set_left_par:Nn#1#2 @@ -1452,9 +1466,9 @@ \semantex_data_tl_set:nnn { \semantex_object_to_register:N #1 } { left~par } { #2 } } -\cs_new_protected:Npn\semantex_class_set_right_par:Nn#1#2 +\cs_new_protected:Npn\semantex_object_associated_to_class_set_right_par:Nn#1#2 { - \semantex_data_tl_set:nnn { \semantex_class_to_register:N #1 } { right~par } { #2 } + \semantex_data_tl_set:nnn { \semantex_class_to_associated_object_register:N #1 } { right~par } { #2 } } \cs_new_protected:Npn\semantex_object_set_right_par:Nn#1#2 @@ -1462,6 +1476,11 @@ \semantex_data_tl_set:nnn { \semantex_object_to_register:N #1 } { right~par } { #2 } } +\cs_new_protected:Npn\semantex_object_associated_to_class_set_class:Nn#1#2 +{ + \semantex_data_class_set:nn { \semantex_class_to_associated_object_register:N #1 } { #2 } +} + \cs_new_protected:Npn\semantex_object_set_class:Nn#1#2 { \semantex_data_class_set:nn { \semantex_object_to_register:N #1 } { #2 } @@ -1514,6 +1533,9 @@ { \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 + \tl_set:Nx \l__semantex_render_object_associated_to_output_class_tempt_tl { + object_associated_to_\l__semantex_render_output_class_temp_tl + } \exp_args:NNx\cs_set:Nn\l__semantex_render_output_options_temp_cs:n { \semantex_data_tl_get_exp_not:nn { #1 } { output~options } } % \cs_set:Nx did not work here, as it changes ##1 to #1, which we don't want. @@ -1546,19 +1568,19 @@ % makes a one-time object of class ??? and allows us to % immediately pass options to it { - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { upper~put~left } { \semantex_data_tl_get_exp_not:nn { #1 } { upper } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { lower~put~left } { \semantex_data_tl_get_exp_not:nn { #1 } { lower } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { pre~upper } { \semantex_data_tl_get_exp_not:nn { #1 } { pre~upper } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { post~upper } { \semantex_data_tl_get_exp_not:nn { #1 } { post~upper } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { pre~lower } { \semantex_data_tl_get_exp_not:nn { #1 } { pre~lower } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { post~lower } { \semantex_data_tl_get_exp_not:nn { #1 } { post~lower } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { math~class } { \semantex_data_tl_get_exp_not:nn { #1 } { math~class } } \exp_not:V \l__semantex_render_output_options_temp_tl % These are the options we pass to the output class so that it @@ -1581,23 +1603,23 @@ % makes a one-time object of class ??? and allows us to % immediately pass options to it { - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { upper~left~put~right } { \semantex_data_tl_get_exp_not:nn { #1 } { upper~left } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { lower~left~put~right } { \semantex_data_tl_get_exp_not:nn { #1 } { lower~left } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { pre~upper~left } { \semantex_data_tl_get_exp_not:nn { #1 } { pre~upper~left } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { post~upper~left } { \semantex_data_tl_get_exp_not:nn { #1 } { post~upper~left } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { pre~lower~left } { \semantex_data_tl_get_exp_not:nn { #1 } { pre~lower~left } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { post~lower~left } { \semantex_data_tl_get_exp_not:nn { #1 } { post~lower~left } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { height~phantom } { \semantex_data_tl_get_exp_not:nn { #1 } { height~phantom } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { slanting~phantom } { \semantex_data_tl_get_exp_not:nn { #1 } { slanting~phantom } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { math~class } { \semantex_data_tl_get_exp_not:nn { #1 } { math~class } } \exp_not:V \l__semantex_render_output_options_temp_tl % These are the options we pass to the output class so that it @@ -1619,35 +1641,35 @@ % makes a one-time object of class ??? and allows us to % immediately pass options to it { - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { upper~put~left } { \semantex_data_tl_get_exp_not:nn { #1 } { upper } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { lower~put~left } { \semantex_data_tl_get_exp_not:nn { #1 } { lower } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { upper~left~put~right } { \semantex_data_tl_get_exp_not:nn { #1 } { upper~left } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { lower~left~put~right } { \semantex_data_tl_get_exp_not:nn { #1 } { lower~left } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { pre~upper } { \semantex_data_tl_get_exp_not:nn { #1 } { pre~upper } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { post~upper } { \semantex_data_tl_get_exp_not:nn { #1 } { post~upper } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { pre~lower } { \semantex_data_tl_get_exp_not:nn { #1 } { pre~lower } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { post~lower } { \semantex_data_tl_get_exp_not:nn { #1 } { post~lower } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { pre~upper~left } { \semantex_data_tl_get_exp_not:nn { #1 } { pre~upper~left } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { post~upper~left } { \semantex_data_tl_get_exp_not:nn { #1 } { post~upper~left } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { pre~lower~left } { \semantex_data_tl_get_exp_not:nn { #1 } { pre~lower~left } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { post~lower~left } { \semantex_data_tl_get_exp_not:nn { #1 } { post~lower~left } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { height~phantom } { \semantex_data_tl_get_exp_not:nn { #1 } { height~phantom } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { slanting~phantom } { \semantex_data_tl_get_exp_not:nn { #1 } { slanting~phantom } } - \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_output_class_temp_tl } + \exp_not:N\semantex_base_object_valuekey:nnn { \l__semantex_render_object_associated_to_output_class_tempt_tl } { math~class } { \semantex_data_tl_get_exp_not:nn { #1 } { math~class } } \exp_not:V \l__semantex_render_output_options_temp_tl % These are the options we pass to the output class so that it @@ -1690,9 +1712,9 @@ \cs_generate_variant:Nn \semantex_render_register:nn { xn } -\cs_new_protected:Npn\semantex_render_class:Nn#1#2 % a front-end command +\cs_new_protected:Npn\semantex_render_object_associated_to_class:Nn#1#2 % a front-end command { - \semantex_render_register:xn { \semantex_class_to_register:N #1 } { #2 } + \semantex_render_register:xn { \semantex_class_to_associated_object_register:N #1 } { #2 } } \cs_new_protected:Npn\semantex_render_object:Nn#1#2 @@ -2090,7 +2112,7 @@ \tl_put_right:Nx #2 { { \semantex_data_tl_get_exp_not:nn { #1 } { height~phantom } } - { \semantex_data_tl_get_exp_not:nn { #1 } { slanting~phantom} } + { \semantex_data_tl_get_exp_not:nn { #1 } { slanting~phantom } } { } { \semantex_data_tl_get_exp_not:nn { #1 } { pre~lower~left } @@ -7076,6 +7098,7 @@ \cs_new_protected:Npn\semantex_error_output_format:nN#1#2 { \tl_set:Nn \l__semantex_error_output_format_temp { #1 } + \tl_replace_all:Nnn \l__semantex_error_output_format_temp { object_associated_to_class_ } { object~of~class~\cs:w } \tl_replace_all:Nnn \l__semantex_error_output_format_temp { object_ } { object~\cs:w } \tl_replace_all:Nnn \l__semantex_error_output_format_temp { class_ } { class~\cs:w } \tl_put_right:Nn \l__semantex_error_output_format_temp { \cs_end: } diff --git a/Master/texmf-dist/tex/latex/semantex/stripsemantex.sty b/Master/texmf-dist/tex/latex/semantex/stripsemantex.sty index 1723ee1f457..7d434805eb8 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/07/18}{0.508}{} +\ProvidesExplPackage{stripsemantex}{2021/07/24}{0.510}{} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % -- cgit v1.2.3