diff options
author | Karl Berry <karl@freefriends.org> | 2021-01-28 22:08:51 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-01-28 22:08:51 +0000 |
commit | a7b1aa320c5c210f2f287f55af834a8ee8628cfa (patch) | |
tree | 1205f2caad242346e6ceb283e78307ee08a8098d /Master/texmf-dist/tex | |
parent | 72d9cea6ec049c84fa9c885c2677b390e93753df (diff) |
ebproof (28jan21)
git-svn-id: svn://tug.org/texlive/trunk@57544 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r-- | Master/texmf-dist/tex/latex/ebproof/ebproof.sty | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/Master/texmf-dist/tex/latex/ebproof/ebproof.sty b/Master/texmf-dist/tex/latex/ebproof/ebproof.sty index c2d1d0812e7..e34804f4721 100644 --- a/Master/texmf-dist/tex/latex/ebproof/ebproof.sty +++ b/Master/texmf-dist/tex/latex/ebproof/ebproof.sty @@ -23,7 +23,8 @@ \NeedsTeXFormat{LaTeX2e} \RequirePackage{expl3} \RequirePackage{xparse} -\ProvidesExplPackage{ebproof}{2020/08/19}{2.1}{EB's proof trees} +\ProvidesExplPackage{ebproof}{2021/01/28}{2.1.1}{EB's proof trees} +\bool_new:N \l__ebproof_updown_bool \keys_define:nn { ebproof } { center .bool_set:N = \l__ebproof_center_bool, proof~style .choice: , @@ -105,12 +106,18 @@ label~axis .dim_set:N = \l__ebproof_label_axis_dim, \keys_define:nn { ebproof } { #1 .meta:n = { #2 } } } \int_new:N \g__ebproof_register_int -\cs_new:Nn \__ebproof_box:N { g__ebproof_box_ \tl_use:N #1 } -\cs_new:Nn \__ebproof_marks:N { g__ebproof_marks_ \tl_use:N #1 } +\cs_new:Nn \__ebproof_box:N { + \str_item:nn { #1 } { 2 } __ebproof_ \tl_use:N #1 _box +} +\cs_new:Nn \__ebproof_marks:N { + \str_item:nn { #1 } { 2 } __ebproof_ \tl_use:N #1 _prop +} \cs_new:Nn \__ebproof_new:N { \tl_new:N #1 \int_gincr:N \g__ebproof_register_int - \tl_gset:Nx #1 { \int_to_arabic:n { \g__ebproof_register_int } } + \str_if_eq:eeTF { \str_item:nn { #1 } { 2 } } { g } + { \tl_gset:Nx #1 { \int_to_arabic:n { \g__ebproof_register_int } } } + { \tl_set:Nx #1 { \int_to_arabic:n { \g__ebproof_register_int } } } \box_new:c { \__ebproof_box:N #1 } \prop_new:c { \__ebproof_marks:N #1 } } @@ -214,7 +221,7 @@ label~axis .dim_set:N = \l__ebproof_label_axis_dim, } \cs_new:Nn \__ebproof_append_below:NN { \__ebproof_align:NN #1 #2 - \vbox_set_top:Nn #1 { + \vbox_set_top:cn { \__ebproof_box:N #1 } { \box_use:c { \__ebproof_box:N #1 } \tex_prevdepth:D -1000pt \box_use:c { \__ebproof_box:N #2 } @@ -302,7 +309,7 @@ label~axis .dim_set:N = \l__ebproof_label_axis_dim, \hbox_unpack:N \g__ebproof_stack_box \box_gset_to_last:N \g_tmpa_box } - \box_set_eq_clear:cN { \__ebproof_box:N #1 } \g_tmpa_box + \box_set_eq_drop:cN { \__ebproof_box:N #1 } \g_tmpa_box \seq_gpop_left:NN \g__ebproof_stack_seq \l_tmpa_tl \tl_set_eq:cN { \__ebproof_marks:N #1 } \l_tmpa_tl } { @@ -380,7 +387,7 @@ label~axis .dim_set:N = \l__ebproof_label_axis_dim, } \cs_new:Nn \__ebproof_new_statement:nnn { \exp_args:Nc \NewDocumentCommand { ebproof#1 }{ #2 } { #3 } - \seq_put_right:Nn \g__ebproof_statements_seq { #1 } + \seq_gput_right:Nn \g__ebproof_statements_seq { #1 } } \cs_new:Nn \__ebproof_new_deprecated_statement:nnnn { \cs_new:cpn { ebproof_#1_warning: } { |