ebproof (28jan21)

git-svn-id: svn://tug.org/texlive/trunk@57544 c570f23f-e606-0410-a88d-b1316a301751

5 files changed, 43 insertions, 21 deletions

diff --git a/Master/texmf-dist/doc/latex/ebproof/README.md b/Master/texmf-dist/doc/latex/ebproof/README.md
index e794db1feed..4c805330cd0 100644
--- a/Master/texmf-dist/doc/latex/ebproof/README.md
+++ b/Master/texmf-dist/doc/latex/ebproof/README.md
@@ -15,8 +15,8 @@ styles of inference rules, placement of labels, etc.
 The distribution includes the following files:
 
 - `ebproof.dtx` : the doctrip source for the package and documentation
+- `ebproof.ins` : the generation script for producing `ebproof.sty`
 - `ebproof.pdf` : the compiled documentation
-- `ebproof.sty` : the generated package
 
 The package requires `expl3` (the LaTeX3 programming environment) which
 provides many useful programming tools.
@@ -25,7 +25,7 @@ provides many useful programming tools.
 License
 -------
 
-Copyright 2015-2020 Emmanuel Beffara <manu@beffara.org>
+Copyright 2015-2021 Emmanuel Beffara <manu@beffara.org>
 
 This work may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either version 1.3
diff --git a/Master/texmf-dist/doc/latex/ebproof/ebproof.pdf b/Master/texmf-dist/doc/latex/ebproof/ebproof.pdf
index 60d433b9fd9..ee5c6afa39f 100644
--- a/Master/texmf-dist/doc/latex/ebproof/ebproof.pdf
+++ b/Master/texmf-dist/doc/latex/ebproof/ebproof.pdf
diff --git a/Master/texmf-dist/source/latex/ebproof/ebproof.dtx b/Master/texmf-dist/source/latex/ebproof/ebproof.dtx
index 71735ffc007..df4f11f0cab 100644
--- a/Master/texmf-dist/source/latex/ebproof/ebproof.dtx
+++ b/Master/texmf-dist/source/latex/ebproof/ebproof.dtx
@@ -1,6 +1,6 @@
 % \iffalse meta-comment
 %
-% Copyright (C) 2015-2020 by Emmanuel Beffara
+% Copyright (C) 2015-2021 by Emmanuel Beffara
 %
 % This file may be distributed and/or modified under the conditions of the
 % LaTeX Project Public License, either version 1.3 of this license or (at
@@ -49,7 +49,7 @@
 %     }^^A
 % }
 %
-% \date{Version 2.1 -- Released 2020-08-19}
+% \date{Version 2.1.1 -- Released 2021-01-28}
 %
 % \maketitle
 %
@@ -648,6 +648,13 @@
 % This section lists the principal evolutions of the package, in reverse
 % chronological order.
 % \begin{description}
+% \item[Version 2.1.1 (2021-01-28)]
+%   Bugfix release, no changes in the user interface.
+%   \begin{itemize}
+%   \item Fixes a deprecation issue with \LaTeX3 release 2021-01-09 and
+%     various warnings that appear in \LaTeX3 debugging mode.
+%   \item Fixes \cmd{proof style=downwards}.
+%   \end{itemize}
 % \item[Version 2.1 (2020-08-19)]
 %   Mostly a bugfix release.
 %   \begin{itemize}
@@ -694,7 +701,7 @@
 \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}
 %<@@=ebproof>
 %    \end{macrocode}
 %
@@ -704,6 +711,7 @@
 % section~\ref{sec:options}.
 %
 %    \begin{macrocode}
+\bool_new:N \l_@@_updown_bool
 \keys_define:nn { ebproof } {
 center .bool_set:N = \l_@@_center_bool,
 proof~style .choice: ,
@@ -828,18 +836,25 @@ label~axis .dim_set:N = \l_@@_label_axis_dim,
 % \begin{macro}{\@@_new:N}
 %   Using only public interfaces forces a convoluted approach to allocation:
 %   we use a global counter \cs{g_ebproof_register_int} to number registers,
-%   then each allocation creates registers named \cs{g_ebproof_K_N} where K is
-%   the kind of component (box or marks) and N is the identifier of the
+%   then each allocation creates registers named \cs{S_ebproof_K_N} where
+%   S is the scope of the register (local or global, deduced from the argument),
+%   K is the kind of component (box or marks) and N is the identifier of the
 %   register. The proof box register itself only contains the identifier used
 %   for indirection.
 %    \begin{macrocode}
 \int_new:N \g_@@_register_int
-\cs_new:Nn \@@_box:N { g__ebproof_box_ \tl_use:N #1 }
-\cs_new:Nn \@@_marks:N { g__ebproof_marks_ \tl_use:N #1 }
+\cs_new:Nn \@@_box:N {
+  \str_item:nn { #1 } { 2 } __ebproof_ \tl_use:N #1 _box
+}
+\cs_new:Nn \@@_marks:N {
+  \str_item:nn { #1 } { 2 } __ebproof_ \tl_use:N #1 _prop
+}
 \cs_new:Nn \@@_new:N {
   \tl_new:N #1
   \int_gincr:N \g_@@_register_int
-  \tl_gset:Nx #1 { \int_to_arabic:n { \g_@@_register_int } }
+  \str_if_eq:eeTF { \str_item:nn { #1 } { 2 } } { g }
+    { \tl_gset:Nx #1 { \int_to_arabic:n { \g_@@_register_int } } }
+    { \tl_set:Nx #1 { \int_to_arabic:n { \g_@@_register_int } } }
   \box_new:c { \@@_box:N #1 }
   \prop_new:c { \@@_marks:N #1 }
 }
@@ -1068,7 +1083,7 @@ label~axis .dim_set:N = \l_@@_label_axis_dim,
 %    \begin{macrocode}
 \cs_new:Nn \@@_append_below:NN {
   \@@_align:NN #1 #2
-  \vbox_set_top:Nn #1 {
+  \vbox_set_top:cn { \@@_box:N #1 } {
     \box_use:c { \@@_box:N #1 }
     \tex_prevdepth:D -1000pt
     \box_use:c { \@@_box:N #2 }
@@ -1235,7 +1250,7 @@ label~axis .dim_set:N = \l_@@_label_axis_dim,
       \hbox_unpack:N \g_@@_stack_box
       \box_gset_to_last:N \g_tmpa_box
     }
-    \box_set_eq_clear:cN { \@@_box:N #1 } \g_tmpa_box
+    \box_set_eq_drop:cN { \@@_box:N #1 } \g_tmpa_box
     \seq_gpop_left:NN \g_@@_stack_seq \l_tmpa_tl
     \tl_set_eq:cN { \@@_marks:N #1 } \l_tmpa_tl
   } {
@@ -1383,7 +1398,7 @@ label~axis .dim_set:N = \l_@@_label_axis_dim,
 %    \begin{macrocode}
 \cs_new:Nn \@@_new_statement:nnn {
   \exp_args:Nc \NewDocumentCommand { ebproof#1 }{ #2 } { #3 }
-  \seq_put_right:Nn \g_@@_statements_seq { #1 }
+  \seq_gput_right:Nn \g_@@_statements_seq { #1 }
 }
 %    \end{macrocode}
 % \end{macro}
diff --git a/Master/texmf-dist/source/latex/ebproof/ebproof.ins b/Master/texmf-dist/source/latex/ebproof/ebproof.ins
index 25bcc734965..2a62d0abae9 100644
--- a/Master/texmf-dist/source/latex/ebproof/ebproof.ins
+++ b/Master/texmf-dist/source/latex/ebproof/ebproof.ins
@@ -1,4 +1,4 @@
-%% Copyright (C) 2015-2018 by Emmanuel Beffara
+%% Copyright (C) 2015-2021 by Emmanuel Beffara
 %%
 %% This file may be distributed and/or modified under the conditions of the
 %% LaTeX Project Public License, either version 1.3 of this license or (at
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: } {