witharrows (14sep18)

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

1 files changed, 572 insertions, 542 deletions

diff --git a/Master/texmf-dist/tex/latex/witharrows/witharrows.sty b/Master/texmf-dist/tex/latex/witharrows/witharrows.sty
index f9bb8aa968a..5b9bb5d4710 100644
--- a/Master/texmf-dist/tex/latex/witharrows/witharrows.sty
+++ b/Master/texmf-dist/tex/latex/witharrows/witharrows.sty
@@ -18,8 +18,8 @@
 %% and version 1.3 or later is part of all distributions of
 %% LaTeX version 2005/12/01 or later.
 %% 
-\def\myfileversion{1.9}
-\def\myfiledate{2018/08/17}
+\def\myfileversion{1.10}
+\def\myfiledate{2018/09/13}
 \RequirePackage{tikz}
 \usetikzlibrary{arrows.meta,bending}
 \RequirePackage{l3keys2e}
@@ -29,12 +29,18 @@
   {\myfileversion}
   {Draws arrows for explanations on the right}
 \RequirePackage{xparse}
-\bool_new:N \g__wa_footnotehyper_bool
-\bool_new:N \g__wa_footnote_bool
-\int_new:N \l__wa_level_int
+\bool_new:N \g__ww_footnotehyper_bool
+\bool_new:N \g__ww_footnote_bool
+\int_new:N \l__ww_level_int
 \keys_define:nn {WithArrows/package}
-      {footnote          .bool_gset:N = \g__wa_footnote_bool,
-       footnotehyper     .bool_gset:N = \g__wa_footnotehyper_bool}
+      {footnote      .bool_gset:N = \g__ww_footnote_bool,
+       footnotehyper .bool_gset:N = \g__ww_footnotehyper_bool,
+       unknown       .code:n      = \msg_fatal:nn {witharrows}
+                                         {Option~unknown~for~package}}
+\msg_new:nnn {witharrows}
+             {Option~unknown~for~package}
+             {You~can't~use~the~option~"\tl_use:N\l_keys_key_tl"~when~loading~the~
+              package~witharrows.}
 \ProcessKeysOptions {WithArrows/package}
 \msg_new:nnn {witharrows}
              {Option~incompatible~with~Beamer}
@@ -54,7 +60,7 @@
               If~you~want,~you~can~use~the~option~"footnote"~and~the~footnotes~
               within~the~environments~{WithArrows}~will~be~extracted~with~the~tools~
               of~the~package~footnote.}
-\bool_if:NT \g__wa_footnote_bool
+\bool_if:NT \g__ww_footnote_bool
       {\@ifclassloaded {beamer}
                 {\msg_fatal:nn {witharrows}
                                {Option~incompatible~with~Beamer}}
@@ -64,7 +70,7 @@
                           {footnote~with~footnotehyper~package}}
            {}
        \usepackage{footnote}}
-\bool_if:NT \g__wa_footnotehyper_bool
+\bool_if:NT \g__ww_footnotehyper_bool
       {\@ifclassloaded {beamer}
                 {\msg_fatal:nn {witharrows}
                                {Option~incompatible~with~Beamer}}
@@ -74,91 +80,97 @@
                           {footnotehyper~with~footnote~package}}
            {}
        \usepackage{footnotehyper}
-       \bool_gset_true:N \g__wa_footnote_bool}
+       \bool_gset_true:N \g__ww_footnote_bool}
+\bool_new:N \c__ww_leqno_bool
+\DeclareOption {leqno} {\bool_set_true:N \c__ww_leqno_bool}
+\DeclareOption* {}
+\ProcessOptions \relax
+\cs_new_protected:Nn \__ww_msg_error:n
+        {\msg_error:nn {witharrows} {#1}}
 \AtBeginDocument{\clist_map_inline:nn
                     {amsmath,mathtools,autonum,cleveref,hyperref,typedref}
-                    {\bool_new:c {c__wa_#1_loaded_bool}
+                    {\bool_new:c {c__ww_#1_loaded_bool}
                      \@ifpackageloaded {#1}
-                           {\bool_set_true:c {c__wa_#1_loaded_bool}}
+                           {\bool_set_true:c {c__ww_#1_loaded_bool}}
                            {}}}
-\tikzset{__wa_node_style/.style= {
-               above = \l__wa_ystart_dim,
+\tikzset{__ww_node_style/.style= {
+               above = \l__ww_ystart_dim,
                inner~sep = 0 pt,
                minimum~width = 0pt,
-               minimum~height = \l__wa_ygap_dim,
+               minimum~height = \l__ww_ygap_dim,
                red,
-               \bool_if:NT \l__wa_shownodes_bool {draw} }}
-\tikzset{__wa_standard/.style= { remember~picture,
+               \bool_if:NT \l__ww_shownodes_bool {draw} }}
+\tikzset{__ww_standard/.style= { remember~picture,
                                overlay,
-                               name~prefix = wa-\l__wa_prefix_str- }}
+                               name~prefix = wa-\l__ww_prefix_str- }}
 \tikzset{WithArrows/arrow/tips/.style = { > = {Straight~Barb[scale=1.2,bend]} }}
 \tikzset{WithArrows/arrow/.style  = { align = left,
                                       auto = left,
-                                      font = {\small\itshape},
+                                      font = \small\itshape,
                                       WithArrows/arrow/tips,
                                       bend~left = 45,
                                       -> }}
 \AtBeginDocument
-    {\bool_if:NF \c__wa_amsmath_loaded_bool
+    {\bool_if:NF \c__ww_amsmath_loaded_bool
        {\cs_set_protected:Npn \spread@equation
            {\openup\jot
             \cs_set_protected:Npn \spread@equation {}}}}
-\bool_new:N \l__wa_in_witharrows_bool
-\seq_new:N \g__wa_position_in_the_tree_seq
-\seq_gput_right:Nn \g__wa_position_in_the_tree_seq 1
-\int_new:N \g__wa_last_env_int
-\skip_new:N \l__wa_interline_skip
-\int_new:N \l__wa_pos_env_int
-\dim_new:N \l__wa_xoffset_dim
-\dim_set:Nn \l__wa_xoffset_dim {3mm}
-\int_new:N \l__wa_pos_arrows_int
-\int_new:N \l__wa_previous_pos_arrows_int
-\dim_new:N \g__wa_x_dim
-\seq_new:N \g__wa_arrow_int_seq
-\int_new:N \g__wa_arrow_int
-\seq_new:N \g__wa_line_int_seq
-\int_new:N \g__wa_line_int
-\seq_new:N \g__wa_line_bis_int_seq
-\int_new:N \g__wa_line_bis_int
-\tl_new:N \l__wa_name_tl
-\bool_new:N \l__wa_notag_bool
-\tl_new:N \l__wa_tag_tl
-\bool_new:N \l__wa_tag_star_bool
-\seq_new:N \l__wa_labels_seq
-\cs_set:Nn \__wa_label:n {\seq_if_empty:NF \l__wa_labels_seq
-                           {\msg_error:nn {witharrows} {Multiple~labels}}
-                        \seq_put_right:Nn \l__wa_labels_seq {#1}
-                        \bool_if:nT \c__wa_mathtools_loaded_bool
+\bool_new:N \l__ww_in_witharrows_bool
+\seq_new:N \g__ww_position_in_the_tree_seq
+\seq_gput_right:Nn \g__ww_position_in_the_tree_seq 1
+\int_new:N \g__ww_last_env_int
+\skip_new:N \l__ww_interline_skip
+\int_new:N \l__ww_pos_env_int
+\dim_new:N \l__ww_xoffset_dim
+\dim_set:Nn \l__ww_xoffset_dim {3mm}
+\int_new:N \l__ww_pos_arrows_int
+\int_new:N \l__ww_previous_pos_arrows_int
+\dim_new:N \g__ww_x_dim
+\seq_new:N \g__ww_arrow_int_seq
+\int_new:N \g__ww_arrow_int
+\seq_new:N \g__ww_line_int_seq
+\int_new:N \g__ww_line_int
+\seq_new:N \g__ww_line_bis_int_seq
+\int_new:N \g__ww_line_bis_int
+\tl_new:N \l__ww_name_tl
+\bool_new:N \l__ww_notag_bool
+\tl_new:N \l__ww_tag_tl
+\bool_new:N \l__ww_tag_star_bool
+\seq_new:N \l__ww_labels_seq
+\cs_set:Nn \__ww_label:n {\seq_if_empty:NF \l__ww_labels_seq
+                           {\__ww_msg_error:n {Multiple~labels}}
+                        \seq_put_right:Nn \l__ww_labels_seq {#1}
+                        \bool_if:nT \c__ww_mathtools_loaded_bool
                            {\MH_if_boolean:nT {show_only_refs}
                                {\cs_if_exist:cTF {MT_r_#1}
-                                 {\bool_set_false:N \l__wa_notag_bool}
-                                 {\bool_set_true:N \l__wa_notag_bool}}}
-                        \bool_if:nT \c__wa_autonum_loaded_bool
+                                 {\bool_set_false:N \l__ww_notag_bool}
+                                 {\bool_set_true:N \l__ww_notag_bool}}}
+                        \bool_if:nT \c__ww_autonum_loaded_bool
                                {\cs_if_exist:cTF {autonum@#1Referenced}
-                                 {\bool_set_false:N \l__wa_notag_bool}
-                                 {\bool_set_true:N \l__wa_notag_bool}}}
-\bool_new:N \l__wa_fleqn_bool
-\dim_new:N \l__wa_mathindent_dim
-\dim_set:Nn \l__wa_mathindent_dim {25pt}
-\bool_new:N \l__wa_wrap_lines_bool
-\int_set:Nn \l__wa_level_int 1
+                                 {\bool_set_false:N \l__ww_notag_bool}
+                                 {\bool_set_true:N \l__ww_notag_bool}}}
+\bool_new:N \l__ww_fleqn_bool
+\dim_new:N \l__ww_mathindent_dim
+\dim_set:Nn \l__ww_mathindent_dim {25pt}
+\bool_new:N \l__ww_wrap_lines_bool
+\int_set:Nn \l__ww_level_int 1
 \keys_define:nn {WithArrows/GlobalOrEnv}
-   {  t   .code:n            = {\bool_if:NTF \l__wa_in_witharrows_bool
-                                  {\int_set:Nn \l__wa_pos_env_int 0}
-                                  {\msg_error:nn {witharrows} {Option~will~be~ignored}}},
+   {  t   .code:n            = {\bool_if:NTF \l__ww_in_witharrows_bool
+                                 {\int_set:Nn \l__ww_pos_env_int 0}
+                                 {\__ww_msg_error:n {Option~will~be~ignored}}},
       t   .value_forbidden:n = true,
-      c   .code:n            = {\bool_if:NTF \l__wa_in_witharrows_bool
-                                  {\int_set:Nn \l__wa_pos_env_int 1}
-                                  {\msg_error:nn {witharrows} {Option~will~be~ignored}}},
+      c   .code:n            = {\bool_if:NTF \l__ww_in_witharrows_bool
+                                 {\int_set:Nn \l__ww_pos_env_int 1}
+                                 {\__ww_msg_error:n {Option~will~be~ignored}}},
       c   .value_forbidden:n = true,
-      b   .code:n            = {\bool_if:NTF \l__wa_in_witharrows_bool
-                                  {\int_set:Nn \l__wa_pos_env_int 2}
-                                  {\msg_error:nn {witharrows} {Option~will~be~ignored}}},
+      b   .code:n            = {\bool_if:NTF \l__ww_in_witharrows_bool
+                                 {\int_set:Nn \l__ww_pos_env_int 2}
+                                 {\__ww_msg_error:n {Option~will~be~ignored}}},
       b   .value_forbidden:n = true,
-      ygap .dim_set:N        = \l__wa_ygap_dim,
+      ygap .dim_set:N        = \l__ww_ygap_dim,
       ygap .value_required:n = true,
       ygap .initial:n        = 0.4 ex,
-      ystart .dim_set:N        = \l__wa_ystart_dim,
+      ystart .dim_set:N        = \l__ww_ystart_dim,
       ystart .value_required:n = true,
       ystart .initial:n        = 0.4 ex,
       MoreColumns .code:n            = { \msg_redirect_name:nnn
@@ -171,179 +183,170 @@
                                             {All~lines~must~have~an~ampersand}
                                             {none} },
       AllowLineWithoutAmpersand .value_forbidden:n = true,
-      CommandName .tl_set:N         = \l__wa_CommandName_tl,
+      CommandName .tl_set:N         = \l__ww_CommandName_tl,
       CommandName .initial:n        = Arrow ,
       CommandName .value_required:n = true,
-      TikzCode .tl_set:N         = \l__wa_tikz_code_tl,
+      TikzCode .tl_set:N         = \l__ww_tikz_code_tl,
       TikzCode .initial:n        = \draw~(#1)~to~node{#3}~(#2)~; ,
       TikzCode .value_required:n = true,
-      displaystyle .bool_set:N     = \l__wa_displaystyle_bool,
+      displaystyle .bool_set:N     = \l__ww_displaystyle_bool,
       displaystyle .initial:n      = false,
-      shownodes .bool_set:N        = \l__wa_shownodes_bool,
+      shownodes .bool_set:N        = \l__ww_shownodes_bool,
       shownodes .initial:n         = false,
-      shownodenames .bool_set:N    = \l__wa_shownodenames_bool,
+      shownodenames .bool_set:N    = \l__ww_shownodenames_bool,
       shownodenames .initial:n     = false,
-      group    .code:n    = {\int_compare:nNnT \l__wa_previous_pos_arrows_int > {-1}
-                                    {\msg_error:nn {witharrows}
-                                                   {Two~options~are~incompatible}}
-                             \int_set:Nn \l__wa_previous_pos_arrows_int 6
-                             \int_set:Nn \l__wa_pos_arrows_int 6} ,
+      group    .code:n    = {\int_compare:nNnT \l__ww_previous_pos_arrows_int > {-1}
+                                    {\__ww_msg_error:n {Two~options~are~incompatible}}
+                             \int_set:Nn \l__ww_previous_pos_arrows_int 6
+                             \int_set:Nn \l__ww_pos_arrows_int 6} ,
       group    .value_forbidden:n = true,
-      groups   .code:n   = {\int_compare:nNnT \l__wa_previous_pos_arrows_int > {-1}
-                                   {\msg_error:nn {witharrows}
-                                                  {Two~options~are~incompatible}}
-                            \int_set:Nn \l__wa_previous_pos_arrows_int 7
-                            \int_set:Nn \l__wa_pos_arrows_int 7} ,
+      groups   .code:n   = {\int_compare:nNnT \l__ww_previous_pos_arrows_int > {-1}
+                                   {\__ww_msg_error:n {Two~options~are~incompatible}}
+                            \int_set:Nn \l__ww_previous_pos_arrows_int 7
+                            \int_set:Nn \l__ww_pos_arrows_int 7} ,
       groups   .value_forbidden:n = true,
-      CodeBefore  .code:n = {\int_compare:nNnTF \l__wa_level_int = 1
-                              {\msg_error:nn {witharrows} {Option~will~be~ignored}}
-                              {\tl_put_right:Nn \l__wa_code_before_tl {#1}}} ,
+      CodeBefore  .code:n = {\int_compare:nNnTF \l__ww_level_int = 1
+                              {\__ww_msg_error:n {Option~will~be~ignored}}
+                              {\tl_put_right:Nn \l__ww_code_before_tl {#1}}} ,
       CodeBefore  .value_required:n = true,
-      CodeAfter .code:n = {\int_compare:nNnTF \l__wa_level_int = 1
-                              {\msg_error:nn {witharrows} {Option~will~be~ignored}}
-                              {\tl_put_right:Nn \l__wa_code_after_tl {#1}}} ,
+      CodeAfter .code:n = {\int_compare:nNnTF \l__ww_level_int = 1
+                              {\__ww_msg_error:n {Option~will~be~ignored}}
+                              {\tl_put_right:Nn \l__ww_code_after_tl {#1}}} ,
       CodeAfter .value_required:n = true,
-      name .code:n = {\int_compare:nNnTF \l__wa_level_int = 1
-                              {\msg_error:nn {witharrows} {Option~will~be~ignored}}
-                              {\tl_set:Nn \l__wa_name_tl {#1}}} ,
+      name .code:n = {\int_compare:nNnTF \l__ww_level_int = 1
+                              {\__ww_msg_error:n {Option~will~be~ignored}}
+                              {\tl_set:Nn \l__ww_name_tl {#1}}} ,
       name .value_required:n = true,
-      fleqn   .code:n = {\bool_if:NTF \l__wa_in_witharrows_bool
-                             {\msg_error:nn {witharrows} {Option~will~be~ignored}}
+      fleqn   .code:n = {\bool_if:NTF \l__ww_in_witharrows_bool
+                             {\__ww_msg_error:n {Option~will~be~ignored}}
                              {\tl_if_eq:nnTF {#1} {true}
-                                 {\bool_set_true:N \l__wa_fleqn_bool}
-                                 {\bool_set_false:N \l__wa_fleqn_bool}}},
+                                 {\bool_set_true:N \l__ww_fleqn_bool}
+                                 {\bool_set_false:N \l__ww_fleqn_bool}}},
       fleqn   .default:n = true,
-      mathindent   .code:n = {\bool_if:NTF \l__wa_in_witharrows_bool
-                               {\msg_error:nn {witharrows} {Option~will~be~ignored}}
-                               {\dim_set:Nn \l__wa_mathindent_dim {#1}}},
+      mathindent   .code:n = {\bool_if:NTF \l__ww_in_witharrows_bool
+                               {\__ww_msg_error:n {Option~will~be~ignored}}
+                               {\dim_set:Nn \l__ww_mathindent_dim {#1}}},
       mathindent   .value_required:n = true,
-      notag   .code:n = {\bool_if:NTF \l__wa_in_witharrows_bool
-                             {\msg_error:nn {witharrows} {Option~will~be~ignored}}
+      notag   .code:n = {\bool_if:NTF \l__ww_in_witharrows_bool
+                             {\__ww_msg_error:n {Option~will~be~ignored}}
                              {\tl_if_eq:nnTF {#1} {true}
-                                 {\bool_set_true:N \l__wa_notag_bool}
-                                 {\bool_set_false:N \l__wa_notag_bool}}},
+                                 {\bool_set_true:N \l__ww_notag_bool}
+                                 {\bool_set_false:N \l__ww_notag_bool}}},
       notag   .default:n = true,
       nonumber .meta:n   = notag,
-      AllowMultipleLabels .code:n = {\bool_if:NTF \l__wa_in_witharrows_bool
-                                         {\msg_error:nn {witharrows} {Option~will~be~ignored}}
+      AllowMultipleLabels .code:n = {\bool_if:NTF \l__ww_in_witharrows_bool
+                                         {\__ww_msg_error:n {Option~will~be~ignored}}
                                          {\msg_redirect_name:nnn {witharrows}
                                                            {Multiple~labels}
                                                            {none}}},
       AllowMultipleLabels .value_forbidden:n = true,
-      wrap-lines   .code:n = {\bool_if:NTF \l__wa_in_witharrows_bool
-                             {\msg_error:nn {witharrows} {Option~will~be~ignored}}
+      wrap-lines   .code:n = {\bool_if:NTF \l__ww_in_witharrows_bool
+                             {\__ww_msg_error:n {Option~will~be~ignored}}
                              {\tl_if_eq:nnTF {#1} {true}
-                                 {\bool_set_true:N \l__wa_wrap_lines_bool}
-                                 {\bool_set_false:N \l__wa_wrap_lines_bool}}},
+                                 {\bool_set_true:N \l__ww_wrap_lines_bool}
+                                 {\bool_set_false:N \l__ww_wrap_lines_bool}}},
       wrap-lines   .default:n = true,
-      unknown .code:n  = \msg_error:nn {witharrows} {Option~unknown}
+      unknown .code:n  = \__ww_msg_error:n {Option~unknown}
      }
 \keys_define:nn {WithArrows/General}
      {tikz     .code:n            = \tikzset {WithArrows/arrow/.append~style = {#1}},
       tikz     .initial:n         = {},
       tikz     .value_required:n  = true,
       rr       .value_forbidden:n = true,
-      rr       .code:n            = \__wa_analyze_option_position:n 0 ,
+      rr       .code:n            = \__ww_analyze_option_position:n 0 ,
       ll       .value_forbidden:n = true,
-      ll       .code:n            = \__wa_analyze_option_position:n 1 ,
+      ll       .code:n            = \__ww_analyze_option_position:n 1 ,
       rl       .value_forbidden:n = true,
-      rl       .code:n            = \__wa_analyze_option_position:n 2 ,
+      rl       .code:n            = \__ww_analyze_option_position:n 2 ,
       lr       .value_forbidden:n = true,
-      lr       .code:n            = \__wa_analyze_option_position:n 3 ,
+      lr       .code:n            = \__ww_analyze_option_position:n 3 ,
       i        .value_forbidden:n = true,
-      i        .code:n            = \__wa_analyze_option_position:n 5 ,
-      xoffset  .code:n  = {\bool_if:nTF {\int_compare_p:nNn \l__wa_level_int = 3 &&
-                                        \int_compare_p:nNn \l__wa_pos_arrows_int > 5}
-                               {\msg_error:nn {witharrows}
-                                              {Option~incompatible~with~"group(s)"}}
-                               {\dim_set:Nn \l__wa_xoffset_dim {#1}}} ,
+      i        .code:n            = \__ww_analyze_option_position:n 5 ,
+      xoffset  .code:n  = {\bool_if:nTF {\int_compare_p:nNn \l__ww_level_int = 3 &&
+                                        \int_compare_p:nNn \l__ww_pos_arrows_int > 5}
+                               {\__ww_msg_error:n {Option~incompatible~with~"group(s)"}}
+                               {\dim_set:Nn \l__ww_xoffset_dim {#1}}} ,
       xoffset  .value_required:n  = true,
-      jot       .code:n     = {\int_compare:nNnTF \l__wa_level_int = 2
+      jot       .code:n     = {\int_compare:nNnTF \l__ww_level_int = 2
                                   {\dim_set:Nn \jot {#1}}
-                                  {\msg_error:nn {witharrows}
-                                                 {Option~will~be~ignored}}} ,
+                                  {\__ww_msg_error:n {Option~will~be~ignored}}} ,
       jot       .value_required:n  = true,
-      interline   .code:n       = {\int_compare:nNnTF \l__wa_level_int = 2
-                                      {\skip_set:Nn \l__wa_interline_skip {#1}}
-                                      {\msg_error:nn {witharrows}
-                                                     {Option~will~be~ignored}}} ,
+      interline   .code:n       = {\int_compare:nNnTF \l__ww_level_int = 2
+                                      {\skip_set:Nn \l__ww_interline_skip {#1}}
+                                      {\__ww_msg_error:n {Option~will~be~ignored}}} ,
       interline   .value_required:n = true,
-      jump    .code:n  = \msg_error:nn {witharrows} {Option~will~be~ignored} ,
-      unknown .code:n  = \msg_error:nn {witharrows} {Option~unknown}
+      jump    .code:n  = \__ww_msg_error:n {Option~will~be~ignored} ,
+      unknown .code:n  = \__ww_msg_error:n {Option~unknown}
 }
 \keys_define:nn {WithArrows/jump}
-     {jump  .code:n = {\int_set:Nn \l__wa_jump_int {#1}
-                       \int_compare:nNnF \l__wa_jump_int > 0
-                           {\msg_error:nn {witharrows}
-                                          {The~option~"jump"~must~be~non~negative}}} ,
+     {jump  .code:n = {\int_set:Nn \l__ww_jump_int {#1}
+                       \int_compare:nNnF \l__ww_jump_int > 0
+                           {\__ww_msg_error:n {The~option~"jump"~must~be~non~negative}}} ,
       jump  .value_required:n  = true}
-\cs_new_protected:Nn \__wa_analyze_option_position:n
-     {\int_compare:nNnT \l__wa_previous_pos_arrows_int > {-1}
-        {\msg_error:nn {witharrows}
-                       {Two~options~are~incompatible}}
-      \int_set:Nn \l__wa_previous_pos_arrows_int {#1}
-      \bool_if:nTF { \int_compare_p:nNn \l__wa_level_int = 3 &&
-                     \int_compare_p:nNn \l__wa_pos_arrows_int > 5}
-         {\msg_error:nn {witharrows}
-                        {Option~incompatible~with~"group(s)"}}
-         {\int_set:Nn \l__wa_pos_arrows_int {#1}}}
+\cs_new_protected:Nn \__ww_analyze_option_position:n
+     {\int_compare:nNnT \l__ww_previous_pos_arrows_int > {-1}
+        {\__ww_msg_error:n {Two~options~are~incompatible}}
+      \int_set:Nn \l__ww_previous_pos_arrows_int {#1}
+      \bool_if:nTF { \int_compare_p:nNn \l__ww_level_int = 3 &&
+                     \int_compare_p:nNn \l__ww_pos_arrows_int > 5}
+         {\__ww_msg_error:n {Option~incompatible~with~"group(s)"}}
+         {\int_set:Nn \l__ww_pos_arrows_int {#1}}}
 \NewDocumentCommand \WithArrowsOptions {m}
-    {\int_set:Nn \l__wa_previous_pos_arrows_int {-1}
+    {\int_set:Nn \l__ww_previous_pos_arrows_int {-1}
      \keys_set_known:nnN {WithArrows/General} {#1} \l_tmpa_tl
      \keys_set:nV {WithArrows/GlobalOrEnv} \l_tmpa_tl}
-\NewDocumentCommand \__wa_Arrow {O{} m O{}}
+\NewDocumentCommand \__ww_Arrow {O{} m O{}}
          {
-          \int_gincr:N \g__wa_arrow_int
-          \int_zero_new:N \l__wa_jump_int
-          \int_set:Nn \l__wa_jump_int 1
+          \int_gincr:N \g__ww_arrow_int
+          \int_zero_new:N \l__ww_jump_int
+          \int_set:Nn \l__ww_jump_int 1
           \keys_set_known:nnN {WithArrows/jump} {#1,#3} \l_tmpa_tl
-          \prop_put:NnV \l_tmpa_prop {initial} \g__wa_line_int
-          \int_set:Nn \l_tmpa_int {\g__wa_line_int + \l__wa_jump_int}
+          \prop_put:NnV \l_tmpa_prop {initial} \g__ww_line_int
+          \int_set:Nn \l_tmpa_int {\g__ww_line_int + \l__ww_jump_int}
           \prop_put:NnV \l_tmpa_prop {final} \l_tmpa_int
           \prop_put:NnV \l_tmpa_prop {options} \l_tmpa_tl
           \prop_put:Nnn \l_tmpa_prop {label} {#2}
           \prop_gclear_new:c
-                {g__wa_arrow_\l__wa_prefix_str _\int_use:N\g__wa_arrow_int _prop}
+                {g__ww_arrow_\l__ww_prefix_str _\int_use:N\g__ww_arrow_int _prop}
           \prop_gset_eq:cN
-                {g__wa_arrow_\l__wa_prefix_str _\int_use:N\g__wa_arrow_int _prop}
+                {g__ww_arrow_\l__ww_prefix_str _\int_use:N\g__ww_arrow_int _prop}
                 \l_tmpa_prop
           }
-\cs_new_protected:Nn \__wa_Arrow_first_column:
+\cs_new_protected:Nn \__ww_Arrow_first_column:
                {\tl_set:Nn \l_tmpa_tl {Arrow}
-                \msg_error:nn {witharrows} {Arrow~in~first~column}
-                \__wa_Arrow}
-\cs_new_protected:Nn \__wa_pre_environment:n
-         { \seq_gput_right:NV \g__wa_arrow_int_seq \g__wa_arrow_int
-           \int_gzero:N \g__wa_arrow_int
-           \seq_gput_right:NV \g__wa_line_int_seq \g__wa_line_int
-           \int_gzero:N \g__wa_line_int
-           \seq_gput_right:NV \g__wa_line_bis_int_seq \g__wa_line_bis_int
-           \int_gzero:N \g__wa_line_bis_int
-           \seq_gput_right:Nn \g__wa_position_in_the_tree_seq 1
-           \seq_set_eq:NN \l_tmpa_seq \g__wa_position_in_the_tree_seq
+                \__ww_msg_error:n {Arrow~in~first~column}
+                \__ww_Arrow}
+\cs_new_protected:Nn \__ww_pre_environment:n
+         { \seq_gput_right:NV \g__ww_arrow_int_seq \g__ww_arrow_int
+           \int_gzero:N \g__ww_arrow_int
+           \seq_gput_right:NV \g__ww_line_int_seq \g__ww_line_int
+           \int_gzero:N \g__ww_line_int
+           \seq_gput_right:NV \g__ww_line_bis_int_seq \g__ww_line_bis_int
+           \int_gzero:N \g__ww_line_bis_int
+           \seq_gput_right:Nn \g__ww_position_in_the_tree_seq 1
+           \seq_set_eq:NN \l_tmpa_seq \g__ww_position_in_the_tree_seq
            \seq_pop_right:NN \l_tmpa_seq \l_tmpa_tl
-           \str_clear_new:N \l__wa_prefix_str
-           \str_set:Nx \l__wa_prefix_str {\seq_use:Nnnn \l_tmpa_seq {-} {-} {-}}
-           \cs_set_eq:NN \\ \__wa_cr:
+           \str_clear_new:N \l__ww_prefix_str
+           \str_set:Nx \l__ww_prefix_str {\seq_use:Nnnn \l_tmpa_seq {-} {-} {-}}
+           \cs_set_eq:NN \\ \__ww_cr:
            \dim_zero:N \mathsurround
-           \int_zero_new:N \l__wa_initial_int
-           \int_zero_new:N \l__wa_final_int
-           \int_zero_new:N \l__wa_arrow_int
-           \skip_zero:N \l__wa_interline_skip
-           \tl_clear_new:N \l__wa_code_before_tl
-           \tl_clear_new:N \l__wa_code_after_tl
-           \int_set:Nn \l__wa_previous_pos_arrows_int {-1}
-           \int_set:Nn \l__wa_level_int 2
+           \int_zero_new:N \l__ww_initial_int
+           \int_zero_new:N \l__ww_final_int
+           \int_zero_new:N \l__ww_arrow_int
+           \skip_zero:N \l__ww_interline_skip
+           \tl_clear_new:N \l__ww_code_before_tl
+           \tl_clear_new:N \l__ww_code_after_tl
+           \int_set:Nn \l__ww_previous_pos_arrows_int {-1}
+           \int_set:Nn \l__ww_level_int 2
            \keys_set_known:nnN {WithArrows/General} {#1} \l_tmpa_tl
            \keys_set:nV {WithArrows/GlobalOrEnv} \l_tmpa_tl
-           \bool_if:NT \g__wa_footnote_bool {\begin{savenotes}}
-           \l__wa_code_before_tl
-           \cs_set_eq:cN \l__wa_CommandName_tl \__wa_Arrow}
+           \bool_if:NT \g__ww_footnote_bool {\begin{savenotes}}
+           \l__ww_code_before_tl
+           \cs_set_eq:cN \l__ww_CommandName_tl \__ww_Arrow}
 \NewDocumentEnvironment {WithArrows} {O{}}
-         { \bool_set_true:N \l__wa_in_witharrows_bool
+         { \bool_set_true:N \l__ww_in_witharrows_bool
            \reverse_if:N \if_mode_math:
-                             \msg_error:nn {witharrows}
-                                           {{WithArrows}~used~outside~math~mode}
+                             \__ww_msg_error:n {{WithArrows}~used~outside~math~mode}
                          \fi:
            \cs_set:Npn \notag {\msg_error:nnn {witharrows}
                                               {Command~not~allowed~in~{WithArrows}}
@@ -357,430 +360,454 @@
            \cs_set:Npn \label ##1 {\msg_error:nnn {witharrows}
                                                   {Command~not~allowed~in~{WithArrows}}
                                                   {\label}}
-           \__wa_pre_environment:n {#1}
-           \int_case:nn \l__wa_pos_env_int
+           \__ww_pre_environment:n {#1}
+           \int_case:nn \l__ww_pos_env_int
                    {0 {\vtop}
                     1 {\vcenter}
                     2 {\vbox}}
            \bgroup
            \spread@equation
            \ialign\bgroup
-           \int_gincr:N \g__wa_line_int
-           \cs_set_eq:cN \l__wa_CommandName_tl \__wa_Arrow_first_column:
+           \int_gincr:N \g__ww_line_int
+           \cs_set_eq:cN \l__ww_CommandName_tl \__ww_Arrow_first_column:
            \strut\hfil
-           $\bool_if:NT \l__wa_displaystyle_bool \displaystyle {##}$
+           $\bool_if:NT \l__ww_displaystyle_bool \displaystyle {##}$
            &
-           \int_gincr:N \g__wa_line_bis_int
-           $\bool_if:NT \l__wa_displaystyle_bool \displaystyle {{}##}$
+           \int_gincr:N \g__ww_line_bis_int
+           $\bool_if:NT \l__ww_displaystyle_bool \displaystyle {{}##}$
            \tikz [remember~picture,overlay]
-                 \node [__wa_node_style,
-                        name = wa-\l__wa_prefix_str-\int_use:N\g__wa_line_int-l,
-                        alias = {\tl_if_empty:NF \l__wa_name_tl
-                                     {\l__wa_name_tl-\int_use:N\g__wa_line_int-l}} ] {} ;
+                 \node [__ww_node_style,
+                        name = wa-\l__ww_prefix_str-\int_use:N\g__ww_line_int-l,
+                        alias = {\tl_if_empty:NF \l__ww_name_tl
+                                     {\l__ww_name_tl-\int_use:N\g__ww_line_int-l}} ] {} ;
            \hfil
            \tikz [remember~picture,overlay]
-                 \node [__wa_node_style,
-                        name = wa-\l__wa_prefix_str-\int_use:N\g__wa_line_int-r,
-                        alias = {\tl_if_empty:NF \l__wa_name_tl
-                                   {\l__wa_name_tl-\int_use:N\g__wa_line_int-r}} ] {} ;
-           \bool_if:NT \l__wa_shownodenames_bool
-                {\hbox_overlap_right:n {\small wa-\l__wa_prefix_str
-                                                 -\int_use:N\g__wa_line_int}}
-           && \msg_error:nn {witharrows} {Third~column~in~an~environment~{WithArrows}}
-           $\bool_if:NT \l__wa_displaystyle_bool \displaystyle {##}$
+                 \node [__ww_node_style,
+                        name = wa-\l__ww_prefix_str-\int_use:N\g__ww_line_int-r,
+                        alias = {\tl_if_empty:NF \l__ww_name_tl
+                                   {\l__ww_name_tl-\int_use:N\g__ww_line_int-r}} ] {} ;
+           \bool_if:NT \l__ww_shownodenames_bool
+                {\hbox_overlap_right:n {\small wa-\l__ww_prefix_str
+                                                 -\int_use:N\g__ww_line_int}}
+           && \__ww_msg_error:n {Third~column~in~an~environment~{WithArrows}}
+           $\bool_if:NT \l__ww_displaystyle_bool \displaystyle {##}$
            \cr
           }
           {\crcr
            \egroup
            \egroup
-           \__wa_post_environment:}
-\cs_new_protected:Nn \__wa_post_environment:
-          {\int_compare:nNnT \g__wa_line_bis_int < \g__wa_line_int
-                  {\msg_error:nn {witharrows} {All~lines~must~have~an~ampersand}}
-           \int_compare:nNnT \g__wa_arrow_int > 0
-                  {\int_compare:nNnTF \l__wa_pos_arrows_int > 5
-                    \__wa_draw_arrows:
-                    {\__wa_draw_arrows:nn 1 \g__wa_arrow_int}}
+           \__ww_post_environment:
+           \bool_if:NT \g__ww_footnote_bool {\end{savenotes}}
+}
+\cs_new_protected:Nn \__ww_post_environment:
+          {\int_compare:nNnT \g__ww_line_bis_int < \g__ww_line_int
+                  {\__ww_msg_error:n {All~lines~must~have~an~ampersand}}
+           \int_compare:nNnT \g__ww_arrow_int > 0
+                  {\int_compare:nNnTF \l__ww_pos_arrows_int > 5
+                    \__ww_draw_arrows:
+                    {\__ww_draw_arrows:nn 1 \g__ww_arrow_int}}
            \group_begin:
-           \tikzset{every~picture/.style = __wa_standard}
-           \cs_set:Npn \NbLines {\int_use:N \g__wa_line_int}
-           \cs_set_eq:NN \MultiArrow \__wa_MultiArrow:nn
-           \cs_set_eq:cN \l__wa_CommandName_tl \__wa_Arrow_code_after
-           \l__wa_code_after_tl
+           \tikzset{every~picture/.style = __ww_standard}
+           \cs_set:Npn \NbLines {\int_use:N \g__ww_line_int}
+           \cs_set_eq:NN \MultiArrow \__ww_MultiArrow:nn
+           \cs_set_eq:cN \l__ww_CommandName_tl \__ww_Arrow_code_after
+           \l__ww_code_after_tl
            \group_end:
-           \bool_if:NT \g__wa_footnote_bool {\end{savenotes}}
-           \seq_gpop_right:NN \g__wa_position_in_the_tree_seq \l_tmpa_tl
-           \seq_gpop_right:NN \g__wa_position_in_the_tree_seq \l_tmpa_tl
-           \seq_gput_right:Nx \g__wa_position_in_the_tree_seq {\int_eval:n {\l_tmpa_tl+1}}
-           \int_compare:nNnT {\seq_count:N \g__wa_position_in_the_tree_seq} = 1
-                      {\int_gincr:N \g__wa_last_env_int}
-           \seq_gpop_right:NN \g__wa_arrow_int_seq {\l_tmpa_tl}
-           \int_gset:Nn \g__wa_arrow_int {\l_tmpa_tl}
-           \seq_gpop_right:NN \g__wa_line_int_seq \l_tmpa_tl
-           \int_gset:Nn \g__wa_line_int {\l_tmpa_tl}
-           \seq_gpop_right:NN \g__wa_line_bis_int_seq \l_tmpa_tl
-           \int_gset:Nn \g__wa_line_bis_int {\l_tmpa_tl}
+           \seq_gpop_right:NN \g__ww_position_in_the_tree_seq \l_tmpa_tl
+           \seq_gpop_right:NN \g__ww_position_in_the_tree_seq \l_tmpa_tl
+           \seq_gput_right:Nx \g__ww_position_in_the_tree_seq {\int_eval:n {\l_tmpa_tl+1}}
+           \int_compare:nNnT {\seq_count:N \g__ww_position_in_the_tree_seq} = 1
+                      {\int_gincr:N \g__ww_last_env_int}
+           \seq_gpop_right:NN \g__ww_arrow_int_seq {\l_tmpa_tl}
+           \int_gset:Nn \g__ww_arrow_int {\l_tmpa_tl}
+           \seq_gpop_right:NN \g__ww_line_int_seq \l_tmpa_tl
+           \int_gset:Nn \g__ww_line_int {\l_tmpa_tl}
+           \seq_gpop_right:NN \g__ww_line_bis_int_seq \l_tmpa_tl
+           \int_gset:Nn \g__ww_line_bis_int {\l_tmpa_tl}
            }
-\cs_new_protected:Nn \__wa_cr:
+\cs_new_protected:Nn \__ww_cr:
       {\scan_stop:
        \group_align_safe_begin:
-       \peek_meaning_remove:NTF * \__wa_cr_i: \__wa_cr_i:}
-\cs_new_protected:Nn \__wa_cr_i:
-      {\peek_meaning:NTF [ {\__wa_cr_ii:} {\__wa_cr_ii:[\c_zero_dim]} }
-\cs_new_protected:Npn \__wa_cr_ii:[#1]
+       \peek_meaning_remove:NTF * \__ww_cr_i: \__ww_cr_i:}
+\cs_new_protected:Nn \__ww_cr_i:
+      {\peek_meaning:NTF [ {\__ww_cr_ii:} {\__ww_cr_ii:[\c_zero_dim]} }
+\cs_new_protected:Npn \__ww_cr_ii:[#1]
       {\group_align_safe_end:
-       \bool_if:NF \l__wa_in_witharrows_bool
-           {\bool_if:NTF \l__wa_notag_bool
-                {& \tikz [remember~picture,overlay]
-                   \coordinate [name = wa-\l__wa_prefix_str-\int_use:N\g__wa_line_int-v ]  ; }
+       \bool_if:NF \l__ww_in_witharrows_bool
+           {\bool_if:NTF \l__ww_notag_bool
+                {& \tikz [__ww_standard] \coordinate (\int_use:N\g__ww_line_int-v)  ; }
                 {
-                 \tl_if_empty:NT \l__wa_tag_tl
+                 \tl_if_empty:NT \l__ww_tag_tl
                     {\int_gincr:N \c@equation}
                  \cs_gset:Npx \g_tmpa_tl
-                      {\tl_if_empty:NTF \l__wa_tag_tl
+                      {\tl_if_empty:NTF \l__ww_tag_tl
                           \theequation
-                          \l__wa_tag_tl}
-                 \seq_if_empty:NF \l__wa_labels_seq
+                          \l__ww_tag_tl}
+                 \seq_if_empty:NF \l__ww_labels_seq
                       {
                        \cs_set:Npx \@currentlabel {\p@equation \g_tmpa_tl}
-                       \bool_if:NT \c__wa_hyperref_loaded_bool
+                       \bool_if:NT \c__ww_hyperref_loaded_bool
                             {\cs_set:Npn \This@name {equation}
                              \hyper@refstepcounter{equation}}
-                       \bool_if:NT \c__wa_cleveref_loaded_bool
+                       \bool_if:NT \c__ww_cleveref_loaded_bool
                            {\cref@constructprefix{equation}{\cref@result}
                             \@ifundefined{cref@equation@alias}
                                   {\def\@tempa{equation}}
                                   {\def\@tempa{\csname cref@equation@alias\endcsname}}
-                            \protected@edef\cref@currentlabel{[\@tempa][\arabic{equation}][\cref@result]
-                                                              \p@equation \g_tmpa_tl}}
-                       \bool_if:NT \c__wa_typedref_loaded_bool
+                            \protected@edef\cref@currentlabel
+                                           {[\@tempa][\arabic{equation}][\cref@result]
+                                            \p@equation \g_tmpa_tl}}
+                       \bool_if:NT \c__ww_typedref_loaded_bool
                           {\cs_set:Npn \sr@name {equation}}
-                       \seq_map_function:NN \l__wa_labels_seq \__wa_old_label}
-                 \bool_gset_eq:NN \g_tmpa_bool \l__wa_tag_star_bool
+                       \seq_map_function:NN \l__ww_labels_seq \__ww_old_label}
+                 \bool_gset_eq:NN \g_tmpa_bool \l__ww_tag_star_bool
                  & \cs_set_eq:NN \theequation \g_tmpa_tl
                    \bool_if:NT \g_tmpa_bool {\cs_set:Npn \tagform@ {}}
                    \hbox_overlap_left:n
-                     { \tikz [__wa_standard]
-                          \coordinate [name = \int_use:N \g__wa_line_int-v ]  ;
-                       \quad
-                       \@eqnnum}
+                     {\bool_if:NF \c__ww_leqno_bool
+                        {\tikz [__ww_standard] \coordinate (\int_use:N\g__ww_line_int-v) ;}
+                      \quad
+                      \@eqnnum }
+                   \bool_if:NT \c__ww_leqno_bool
+                      {\tikz [__ww_standard] \coordinate (\int_use:N \g__ww_line_int-v) ;}
              }}
-       \cr\noalign{\skip_vertical:n {#1 + \l__wa_interline_skip}
+       \cr\noalign{\skip_vertical:n {#1 + \l__ww_interline_skip}
        \scan_stop:}}
 \NewDocumentEnvironment {DispWithArrows} {O{}}
          {
-          \bool_if:nT \c__wa_mathtools_loaded_bool
+          \bool_if:nT \c__ww_mathtools_loaded_bool
                  {\MH_if_boolean:nT {show_only_refs}
                     {\MT_showonlyrefs_false:
                       \MH_set_boolean_T:n {show_only_refs}
-                      \bool_set_true:N \l__wa_notag_bool}}
-           \bool_if:NT \c__wa_amsmath_loaded_bool \intertext@
+                      \bool_set_true:N \l__ww_notag_bool}}
+           \bool_if:NT \c__ww_amsmath_loaded_bool \intertext@
            \if_mode_math:
-               \msg_error:nn {witharrows}
-                             {{DispWithArrows}~used~in~math~mode}
+               \__ww_msg_error:n {{DispWithArrows}~used~in~math~mode}
+           \fi:
+           \bool_set_false:N \l__ww_in_witharrows_bool
+           \__ww_pre_environment:n {#1}
+           \if_mode_vertical:
+             \nointerlineskip
+             \makebox[.6\linewidth]{}
            \fi:
-           \bool_set_false:N \l__wa_in_witharrows_bool
-           \__wa_pre_environment:n {#1}
-           \nointerlineskip
-           \makebox[.6\linewidth]{}
            $$
            \vcenter \bgroup
            \spread@equation
-           \bool_if:NTF \l__wa_fleqn_bool
+           \bool_if:NTF \l__ww_fleqn_bool
                   {\tabskip = \c_zero_skip}
                   {\tabskip = 0 pt plus 1000 pt minus 1000 pt}
-           \bool_if:NTF \c__wa_amsmath_loaded_bool
-              {\cs_set_eq:NN \__wa_old_label \ltx@label}
-              {\cs_set_eq:NN \__wa_old_label \label}
+           \bool_if:NTF \c__ww_amsmath_loaded_bool
+              {\cs_set_eq:NN \__ww_old_label \ltx@label}
+              {\cs_set_eq:NN \__ww_old_label \label}
            \cs_set:Npn \notag {\msg_error:nnn {witharrows}
                                               {Command~not~allowed~in~{DispWithArrows}}
                                               {\notag}}
            \cs_set:Npn \nonumber {\msg_error:nnn {witharrows}
-                                                 {Command~not~allowed~in~{DispWithArrows}}
-                                                 {\nonumber}}
+                                       {Command~not~allowed~in~{DispWithArrows}}
+                                       {\nonumber}}
            \cs_set:Npn \tag ##1 {\msg_error:nnn {witharrows}
-                                                {Command~not~allowed~in~{DispWithArrows}}
-                                                {\tag}}
+                                       {Command~not~allowed~in~{DispWithArrows}}
+                                       {\tag}}
            \cs_set:Npn \label ##1 {\msg_error:nnn {witharrows}
-                                                  {Command~not~allowed~in~{DispWithArrows}}
-                                                  {\label}}
+                                       {Command~not~allowed~in~{DispWithArrows}}
+                                       {\label}}
            \halign to \displaywidth \bgroup
-             \int_gincr:N \g__wa_line_int
-             \cs_set_eq:cN \l__wa_CommandName_tl \__wa_Arrow_first_column:
+             \int_gincr:N \g__ww_line_int
+             \cs_set_eq:cN \l__ww_CommandName_tl \__ww_Arrow_first_column:
              \strut
-             \bool_if:NT \l__wa_fleqn_bool
-                   {\skip_horizontal:n \l__wa_mathindent_dim}
+             \bool_if:NT \l__ww_fleqn_bool
+                   {\skip_horizontal:n \l__ww_mathindent_dim}
              \hfil
-             $\bool_if:NT \l__wa_displaystyle_bool \displaystyle {##}$
+             $\bool_if:NT \l__ww_displaystyle_bool \displaystyle {##}$
              \tabskip = \c_zero_skip
             &
-             \cs_set:Npn \notag {\bool_set_true:N \l__wa_notag_bool}
+             \cs_set:Npn \notag {\bool_set_true:N \l__ww_notag_bool}
              \cs_set_eq:NN \nonumber \notag
-             \cs_set_eq:NN \tag \__wa_tag
-             \cs_set_eq:NN \label \__wa_label:n
-             $\bool_if:NT \l__wa_displaystyle_bool \displaystyle {{}##}$
+             \cs_set_eq:NN \tag \__ww_tag
+             \cs_set_eq:NN \label \__ww_label:n
+             $\bool_if:NT \l__ww_displaystyle_bool \displaystyle {{}##}$
              \tabskip = 0 pt plus 1000 pt minus 1000 pt
-             \int_gincr:N \g__wa_line_bis_int
+             \int_gincr:N \g__ww_line_bis_int
              \tikz [remember~picture,overlay]
-                  \node [__wa_node_style,
-                         name = wa-\l__wa_prefix_str-\int_use:N\g__wa_line_int-l,
-                         alias = {\tl_if_empty:NF \l__wa_name_tl
-                                    {\l__wa_name_tl-\int_use:N\g__wa_line_int-l}} ] {} ;
+                  \node [__ww_node_style,
+                         name = wa-\l__ww_prefix_str-\int_use:N\g__ww_line_int-l,
+                         alias = {\tl_if_empty:NF \l__ww_name_tl
+                                    {\l__ww_name_tl-\int_use:N\g__ww_line_int-l}} ] {} ;
              \hfil
              \tikz [remember~picture,overlay]
-                   \node [__wa_node_style,
-                          name = wa-\l__wa_prefix_str-\int_use:N\g__wa_line_int-r,
-                          alias = {\tl_if_empty:NF \l__wa_name_tl
-                                     {\l__wa_name_tl-\int_use:N\g__wa_line_int-r}} ] {} ;
-             \bool_if:NT \l__wa_shownodenames_bool
-                  {\hbox_overlap_right:n {\small wa-\l__wa_prefix_str
-                                                   -\int_use:N\g__wa_line_int}}
+                   \node [__ww_node_style,
+                          name = wa-\l__ww_prefix_str-\int_use:N\g__ww_line_int-r,
+                          alias = {\tl_if_empty:NF \l__ww_name_tl
+                                     {\l__ww_name_tl-\int_use:N\g__ww_line_int-r}} ] {} ;
+             \bool_if:NT \l__ww_shownodenames_bool
+                  {\hbox_overlap_right:n {\small wa-\l__ww_prefix_str
+                                                   -\int_use:N\g__ww_line_int}}
             & ##
              \tabskip = \c_zero_skip
-            && \msg_error:nn {witharrows} {Third~column~in~an~environment~{DispWithArrows}}
+            && \__ww_msg_error:n {Third~column~in~an~environment~{DispWithArrows}}
                \iffalse ## \fi
              \cr}
           {\\
            \egroup
            \egroup
-           $$
-           \bool_if:NT \l__wa_wrap_lines_bool
-             {\dim_gzero_new:N \g__wa_x_right_dim
-              \dim_gset:Nn \g__wa_x_right_dim \c_max_dim
-              \begin{tikzpicture} [__wa_standard]
-              \int_step_variable:nnnNn 1 1 \g__wa_line_int \l_tmpa_int
+           \bool_if:NT \l__ww_wrap_lines_bool
+             {\dim_gzero_new:N \g__ww_x_right_dim
+              \dim_gset:Nn \g__ww_x_right_dim \c_max_dim
+              \begin{tikzpicture} [__ww_standard]
+              \int_step_variable:nnnNn 1 1 \g__ww_line_int \l_tmpa_int
                     {\tikz@parse@node\pgfutil@firstofone (\l_tmpa_int-v)
                      \dim_set:Nn \l_tmpa_dim \pgf@x
-                     \dim_compare:nNnT \l_tmpa_dim < \g__wa_x_right_dim
-                            {\dim_gset:Nn \g__wa_x_right_dim \l_tmpa_dim} }
+                     \dim_compare:nNnT \l_tmpa_dim < \g__ww_x_right_dim
+                            {\dim_gset:Nn \g__ww_x_right_dim \l_tmpa_dim} }
               \end{tikzpicture}}
-           \__wa_post_environment:
-           \bool_if:nT \c__wa_mathtools_loaded_bool
+           {\begin{tikzpicture} [__ww_standard]
+            \int_step_variable:nnnNn 1 1 \g__ww_line_int \l_tmpa_int
+                {\tikz@parse@node\pgfutil@firstofone (\l_tmpa_int-v)
+                     \dim_set:Nn \l_tmpa_dim \pgf@x
+                 \tikz@parse@node\pgfutil@firstofone (\l_tmpa_int-l)
+                     \dim_set:Nn \l_tmpb_dim \pgf@x
+                 \dim_compare:nNnT \l_tmpb_dim > \l_tmpa_dim
+                     {\__ww_msg_error:n {Collision}}}
+             \end{tikzpicture}}
+           \__ww_post_environment:
+           \bool_if:nT \c__ww_mathtools_loaded_bool
                     {\MH_if_boolean:nT {show_only_refs}
                           \MT_showonlyrefs_true:}
+           $$
+           \bool_if:NT \g__ww_footnote_bool {\end{savenotes}}
            \ignorespacesafterend
            }
-\NewDocumentCommand \__wa_tag {sm}
-    {\tl_if_empty:NF \l__wa_tag_tl
+\NewDocumentCommand \__ww_tag {sm}
+    {\tl_if_empty:NF \l__ww_tag_tl
           {\msg_error:nnn {witharrows} {Multiple~tags} {#2}}
-     \bool_set_false:N \l__wa_notag_bool
-     \bool_if:nT \c__wa_mathtools_loaded_bool
+     \bool_set_false:N \l__ww_notag_bool
+     \bool_if:nT \c__ww_mathtools_loaded_bool
            {\MH_if_boolean:nT {show_only_refs}
                 {\MH_if_boolean:nF {show_manual_tags}
-                    {\bool_set_true:N \l__wa_notag_bool}}}
-     \tl_set:Nn \l__wa_tag_tl {#2}
-     \bool_set:Nn \l__wa_tag_star_bool {#1}
-     \bool_if:nT {#1 && ! \bool_if_p:N \c__wa_amsmath_loaded_bool}
-          { \msg_error:nn {witharrows} {tag*~without~amsmath} }
+                    {\bool_set_true:N \l__ww_notag_bool}}}
+     \tl_set:Nn \l__ww_tag_tl {#2}
+     \bool_set:Nn \l__ww_tag_star_bool {#1}
+     \bool_if:nT {#1 && ! \bool_if_p:N \c__ww_amsmath_loaded_bool}
+          { \__ww_msg_error:n {tag*~without~amsmath} }
     }
 \NewDocumentEnvironment {DispWithArrows*} {}
      {\WithArrowsOptions{notag}
       \DispWithArrows}
      {\endDispWithArrows}
-\cs_new_protected:Nn \__wa_draw_arrows:
+\cs_new_protected:Nn \__ww_draw_arrows:
   { \group_begin:
-    \int_zero_new:N \l__wa_first_arrow_of_group_int
-    \int_zero_new:N \l__wa_first_line_of_group_int
-    \int_zero_new:N \l__wa_last_line_of_group_int
-    \bool_set_true:N \l__wa_new_group_bool
-    \int_set:Nn \l__wa_arrow_int 1
-    \int_until_do:nNnn \l__wa_arrow_int > \g__wa_arrow_int
+    \int_zero_new:N \l__ww_first_arrow_of_group_int
+    \int_zero_new:N \l__ww_first_line_of_group_int
+    \int_zero_new:N \l__ww_last_line_of_group_int
+    \bool_set_true:N \l__ww_new_group_bool
+    \int_set:Nn \l__ww_arrow_int 1
+    \int_until_do:nNnn \l__ww_arrow_int > \g__ww_arrow_int
      {
-       \prop_get:cnN {g__wa_arrow_\l__wa_prefix_str _\int_use:N\l__wa_arrow_int _prop}
+       \prop_get:cnN {g__ww_arrow_\l__ww_prefix_str _\int_use:N\l__ww_arrow_int _prop}
                      {initial} \l_tmpa_tl
-       \int_set:Nn \l__wa_initial_int {\l_tmpa_tl}
-       \prop_get:cnN {g__wa_arrow_\l__wa_prefix_str _\int_use:N\l__wa_arrow_int _prop}
+       \int_set:Nn \l__ww_initial_int {\l_tmpa_tl}
+       \prop_get:cnN {g__ww_arrow_\l__ww_prefix_str _\int_use:N\l__ww_arrow_int _prop}
                      {final} \l_tmpa_tl
-       \int_set:Nn \l__wa_final_int {\l_tmpa_tl}
-       \bool_if:nT {     \int_compare_p:nNn \l__wa_pos_arrows_int = 7
-                      && \int_compare_p:nNn \l__wa_arrow_int > 1
+       \int_set:Nn \l__ww_final_int {\l_tmpa_tl}
+       \bool_if:nT {     \int_compare_p:nNn \l__ww_pos_arrows_int = 7
+                      && \int_compare_p:nNn \l__ww_arrow_int > 1
                       && \int_compare_p:nNn
-                                 \l__wa_initial_int > \l__wa_last_line_of_group_int}
-              {\__wa_draw_arrows:nn \l__wa_first_arrow_of_group_int {\l__wa_arrow_int - 1}
-               \bool_set_true:N \l__wa_new_group_bool}
-       \bool_if:nTF \l__wa_new_group_bool
-              {\bool_set_false:N \l__wa_new_group_bool
-               \int_set:Nn \l__wa_first_arrow_of_group_int \l__wa_arrow_int
-               \int_set:Nn \l__wa_first_line_of_group_int \l__wa_initial_int
-               \int_set:Nn \l__wa_last_line_of_group_int \l__wa_final_int
-               \begin{tikzpicture} [__wa_standard]
-               \tikz@parse@node\pgfutil@firstofone (\int_use:N\l__wa_initial_int-l)
-               \dim_gset:Nn \g__wa_x_dim \pgf@x
+                                 \l__ww_initial_int > \l__ww_last_line_of_group_int}
+              {\__ww_draw_arrows:nn \l__ww_first_arrow_of_group_int {\l__ww_arrow_int - 1}
+               \bool_set_true:N \l__ww_new_group_bool}
+       \bool_if:nTF \l__ww_new_group_bool
+              {\bool_set_false:N \l__ww_new_group_bool
+               \int_set:Nn \l__ww_first_arrow_of_group_int \l__ww_arrow_int
+               \int_set:Nn \l__ww_first_line_of_group_int \l__ww_initial_int
+               \int_set:Nn \l__ww_last_line_of_group_int \l__ww_final_int
+               \begin{tikzpicture} [__ww_standard]
+               \tikz@parse@node\pgfutil@firstofone (\int_use:N\l__ww_initial_int-l)
+               \dim_gset:Nn \g__ww_x_dim \pgf@x
                \end{tikzpicture}
                }
-              {\int_set:Nn \l__wa_last_line_of_group_int
-                     {\int_max:nn \l__wa_last_line_of_group_int \l__wa_final_int}}
-       \__wa_update_x_value:nn \l__wa_initial_int \l__wa_final_int
-       \int_incr:N \l__wa_arrow_int
+              {\int_set:Nn \l__ww_last_line_of_group_int
+                     {\int_max:nn \l__ww_last_line_of_group_int \l__ww_final_int}}
+       \__ww_update_x_value:nn \l__ww_initial_int \l__ww_final_int
+       \int_incr:N \l__ww_arrow_int
      }
-     \__wa_draw_arrows:nn \l__wa_first_arrow_of_group_int \g__wa_arrow_int
+     \__ww_draw_arrows:nn \l__ww_first_arrow_of_group_int \g__ww_arrow_int
      \group_end:
   }
 \cs_generate_variant:Nn \keys_set:nn {no}
-\cs_new_protected:Nn \__wa_keys_set: {\keys_set:no {WithArrows/General}}
-\cs_new_protected:Nn \__wa_draw_arrows:nn
+\cs_new_protected:Nn \__ww_keys_set: {\keys_set:no {WithArrows/General}}
+\cs_new_protected:Nn \__ww_draw_arrows:nn
   {\group_begin:
-   \int_zero_new:N \l__wa_first_arrow_int
-   \int_set:Nn \l__wa_first_arrow_int {#1}
-   \int_zero_new:N \l__wa_last_arrow_int
-   \int_set:Nn \l__wa_last_arrow_int {#2}
-   \int_set:Nn \l__wa_arrow_int \l__wa_first_arrow_int
-   \int_until_do:nNnn \l__wa_arrow_int > \l__wa_last_arrow_int
+   \int_zero_new:N \l__ww_first_arrow_int
+   \int_set:Nn \l__ww_first_arrow_int {#1}
+   \int_zero_new:N \l__ww_last_arrow_int
+   \int_set:Nn \l__ww_last_arrow_int {#2}
+   \int_set:Nn \l__ww_arrow_int \l__ww_first_arrow_int
+   \int_until_do:nNnn \l__ww_arrow_int > \l__ww_last_arrow_int
      {
-      \prop_get:cnN {g__wa_arrow_\l__wa_prefix_str _\int_use:N\l__wa_arrow_int _prop}
+      \prop_get:cnN {g__ww_arrow_\l__ww_prefix_str _\int_use:N\l__ww_arrow_int _prop}
                     {initial} \l_tmpa_tl
-      \int_set:Nn \l__wa_initial_int {\l_tmpa_tl}
-      \prop_get:cnN {g__wa_arrow_\l__wa_prefix_str _\int_use:N\l__wa_arrow_int _prop}
+      \int_set:Nn \l__ww_initial_int {\l_tmpa_tl}
+      \prop_get:cnN {g__ww_arrow_\l__ww_prefix_str _\int_use:N\l__ww_arrow_int _prop}
                     {final} \l_tmpa_tl
-      \int_set:Nn \l__wa_final_int {\l_tmpa_tl}
-      \int_compare:nNnTF \l__wa_final_int > \g__wa_line_int
-         {\msg_error:nn {witharrows} {Too~few~lines~for~an~arrow}}
-         {\cs_if_free:cTF {pgf@sh@ns@wa-\l__wa_prefix_str-\int_use:N\l__wa_initial_int-l}
-             { \msg_error:nn {witharrows} {A~PGF~node~doesn't~exist} }
-             {\cs_if_free:cTF {pgf@sh@ns@wa-\l__wa_prefix_str-\int_use:N\l__wa_final_int-l}
-                 { \msg_error:nn {witharrows} {A~PGF~node~doesn't~exist} }
-                 {\__wa_draw_arrows_i:}}}
-      \int_incr:N \l__wa_arrow_int
+      \int_set:Nn \l__ww_final_int {\l_tmpa_tl}
+      \int_compare:nNnTF \l__ww_final_int > \g__ww_line_int
+         {\__ww_msg_error:n {Too~few~lines~for~an~arrow}}
+         {\cs_if_free:cTF{pgf@sh@ns@wa-\l__ww_prefix_str-\int_use:N\l__ww_initial_int-l}
+             { \__ww_msg_error:n {A~PGF~node~doesn't~exist} }
+             {\cs_if_free:cTF{pgf@sh@ns@wa-\l__ww_prefix_str-\int_use:N\l__ww_final_int-l}
+                 { \__ww_msg_error:n {A~PGF~node~doesn't~exist} }
+                 {\__ww_draw_arrows_i:}}}
+      \int_incr:N \l__ww_arrow_int
      }
    \group_end:
    }
-\cs_new:Nn \__wa_draw_arrows_i:
+\cs_new:Nn \__ww_draw_arrows_i:
      {\group_begin:
-      \int_set:Nn \l__wa_previous_pos_arrows_int {-1}
-      \int_set:Nn \l__wa_level_int 3
-      \prop_get:cnN {g__wa_arrow_\l__wa_prefix_str
-                        _\int_use:N\l__wa_arrow_int _prop} {options} \l_tmpa_tl
+      \int_set:Nn \l__ww_previous_pos_arrows_int {-1}
+      \int_set:Nn \l__ww_level_int 3
+      \prop_get:cnN {g__ww_arrow_\l__ww_prefix_str
+                        _\int_use:N\l__ww_arrow_int _prop} {options} \l_tmpa_tl
       \exp_args:NNo \exp_args:No
-          \__wa_keys_set: {\l_tmpa_tl,tikz={xshift = \l__wa_xoffset_dim}}
-      \bool_set_false:N \l__wa_initial_r_bool
-      \bool_set_false:N \l__wa_final_r_bool
-      \int_case:nn \l__wa_pos_arrows_int
-             {0 {\bool_set_true:N \l__wa_initial_r_bool
-                 \bool_set_true:N \l__wa_final_r_bool}
-              2 {\bool_set_true:N \l__wa_initial_r_bool}
-              3 {\bool_set_true:N \l__wa_final_r_bool}}
-      \int_compare:nNnT \l__wa_pos_arrows_int = 5
+          \__ww_keys_set: {\l_tmpa_tl,tikz={xshift = \l__ww_xoffset_dim}}
+      \bool_set_false:N \l__ww_initial_r_bool
+      \bool_set_false:N \l__ww_final_r_bool
+      \int_case:nn \l__ww_pos_arrows_int
+             {0 {\bool_set_true:N \l__ww_initial_r_bool
+                 \bool_set_true:N \l__ww_final_r_bool}
+              2 {\bool_set_true:N \l__ww_initial_r_bool}
+              3 {\bool_set_true:N \l__ww_final_r_bool}}
+      \int_compare:nNnT \l__ww_pos_arrows_int = 5
              {
-              \begin{tikzpicture} [__wa_standard]
-              \tikz@parse@node\pgfutil@firstofone (\int_use:N\l__wa_initial_int-l)
-              \dim_gset:Nn \g__wa_x_dim \pgf@x
+              \begin{tikzpicture} [__ww_standard]
+              \tikz@parse@node\pgfutil@firstofone (\int_use:N\l__ww_initial_int-l)
+              \dim_gset:Nn \g__ww_x_dim \pgf@x
               \end{tikzpicture}
-              \__wa_update_x_value:nn \l__wa_initial_int \l__wa_final_int
+              \__ww_update_x_value:nn \l__ww_initial_int \l__ww_final_int
              }
-      \tl_set:Nx \l__wa_initial_tl
-              {\int_use:N\l__wa_initial_int-\bool_if:NTF\l__wa_initial_r_bool rl .south}
-      \tl_set:Nx \l__wa_final_tl
-              {\int_use:N\l__wa_final_int-\bool_if:NTF\l__wa_final_r_bool rl .north}
-      \prop_get:cnN {g__wa_arrow_\l__wa_prefix_str _\int_use:N\l__wa_arrow_int _prop}
+      \tl_set:Nx \l__ww_initial_tl
+              {\int_use:N\l__ww_initial_int-\bool_if:NTF\l__ww_initial_r_bool rl .south}
+      \tl_set:Nx \l__ww_final_tl
+              {\int_use:N\l__ww_final_int-\bool_if:NTF\l__ww_final_r_bool rl .north}
+      \prop_get:cnN {g__ww_arrow_\l__ww_prefix_str _\int_use:N\l__ww_arrow_int _prop}
                     {label}
                     \l_tmpa_tl
-      \int_compare:nNnTF \l__wa_pos_arrows_int < 5
-         {\begin{tikzpicture} [__wa_standard]
-              \tikz@scan@one@point\pgfutil@firstofone(\l__wa_initial_tl)
+      \int_compare:nNnTF \l__ww_pos_arrows_int < 5
+         {\begin{tikzpicture} [__ww_standard]
+              \tikz@scan@one@point\pgfutil@firstofone(\l__ww_initial_tl)
               \tl_gset:Nx \g_tmpa_tl {\dim_use:N\pgf@x,\dim_use:N\pgf@y}
-              \tikz@scan@one@point\pgfutil@firstofone(\l__wa_final_tl)
+              \tikz@scan@one@point\pgfutil@firstofone(\l__ww_final_tl)
               \tl_gset:Nx \g_tmpb_tl {\dim_use:N\pgf@x,\dim_use:N\pgf@y}
           \end{tikzpicture}
 }
-         {\begin{tikzpicture} [__wa_standard]
-              \tikz@scan@one@point\pgfutil@firstofone (\l__wa_initial_tl)
-              \tl_gset:Nx \g_tmpa_tl {\dim_use:N \g__wa_x_dim , \dim_use:N \pgf@y}
-              \tikz@scan@one@point\pgfutil@firstofone (\l__wa_final_tl)
-              \tl_gset:Nx \g_tmpb_tl {\dim_use:N \g__wa_x_dim , \dim_use:N \pgf@y}
+         {\begin{tikzpicture} [__ww_standard]
+              \tikz@scan@one@point\pgfutil@firstofone (\l__ww_initial_tl)
+              \tl_gset:Nx \g_tmpa_tl {\dim_use:N \g__ww_x_dim , \dim_use:N \pgf@y}
+              \tikz@scan@one@point\pgfutil@firstofone (\l__ww_final_tl)
+              \tl_gset:Nx \g_tmpb_tl {\dim_use:N \g__ww_x_dim , \dim_use:N \pgf@y}
           \end{tikzpicture}}
-      \__wa_draw_arrow:nno {\g_tmpa_tl} {\g_tmpb_tl} {\l_tmpa_tl}
+      \__ww_draw_arrow:nno {\g_tmpa_tl} {\g_tmpb_tl} {\l_tmpa_tl}
       \group_end: }
-\cs_new_protected:Nn \__wa_def_function_tmpa:n
-    {\cs_set:Nn \__wa_tmpa:nnn
-          {\begin{tikzpicture}[__wa_standard,every~path/.style = {WithArrows/arrow}]
+\cs_new_protected:Nn \__ww_def_function_tmpa:n
+    {\cs_set:Nn \__ww_tmpa:nnn
+          {\begin{tikzpicture}[__ww_standard,every~path/.style = {WithArrows/arrow}]
               #1
            \end{tikzpicture}}}
-\cs_new_protected:Nn \__wa_draw_arrow:nnn
+\cs_new_protected:Nn \__ww_draw_arrow:nnn
            {
-            \bool_if:nT {\l__wa_wrap_lines_bool && ! \l__wa_in_witharrows_bool}
-               {\tl_set:Nn \l__wa_tikz_code_tl
-                  {\draw (##1) to node (__wa_label) {} (##2) ;
-                   \tikz@parse@node \pgfutil@firstofone (__wa_label.west)
-                   \path (__wa_label.west)
-                    node [anchor = west,
-                          text~width = \dim_eval:n {\g__wa_x_right_dim - \pgf@x - 0.3333 em}]
-                    {##3} ; }}
-            \exp_args:No \__wa_def_function_tmpa:n \l__wa_tikz_code_tl
-            \__wa_tmpa:nnn {#1} {#2} {#3} }
-\cs_generate_variant:Nn \__wa_draw_arrow:nnn {nno}
-\cs_new_protected:Nn \__wa_update_x_value:nn
-    {\int_step_inline:nnnn {#1} \c_one {#2}
-       {\cs_if_exist:cT {pgf@sh@ns@wa-\l__wa_prefix_str-##1-l}
-          {\begin{tikzpicture} [__wa_standard]
+            \bool_if:nT {\l__ww_wrap_lines_bool && ! \l__ww_in_witharrows_bool}
+               { \tl_set_eq:NN \l__ww_tikz_code_tl \c__ww_tikz_code_wrap_lines_tl }
+            \exp_args:No \__ww_def_function_tmpa:n \l__ww_tikz_code_tl
+            \__ww_tmpa:nnn {#1} {#2} {#3} }
+\cs_generate_variant:Nn \__ww_draw_arrow:nnn {nno}
+\tl_set:Nn \c__ww_tikz_code_wrap_lines_tl
+                 {
+                   \draw (#1) to node (__ww_label) {} (#2) ;
+                   \tikz@parse@node \pgfutil@firstofone (__ww_label.west)
+                   \dim_set:Nn \l_tmpa_dim {\g__ww_x_right_dim - \pgf@x - 0.3333 em}
+                   \path \pgfextra {\tl_gset:Nx \g_tmpa_tl \tikz@text@width} ;
+                   \tl_if_empty:NF \g_tmpa_tl
+                      {\dim_set:Nn \l_tmpb_dim \g_tmpa_tl
+                       \dim_compare:nNnT \l_tmpb_dim < \l_tmpa_dim
+                           {\dim_set_eq:NN \l_tmpa_dim \l_tmpb_dim}}
+                   \dim_compare:nNnT \l_tmpa_dim > \c_zero_dim
+                      {\path (__ww_label.west)
+                        node [anchor = west, text~width = \dim_use:N \l_tmpa_dim]
+                        {#3} ; } }
+\cs_new_protected:Nn \__ww_update_x_value:nn
+    {\int_step_inline:nnnn {#1} 1 {#2}
+       {\cs_if_exist:cT {pgf@sh@ns@wa-\l__ww_prefix_str-##1-l}
+          {\begin{tikzpicture} [__ww_standard]
            \tikz@scan@one@point\pgfutil@firstofone (##1-l)
-           \dim_gset:Nn \g__wa_x_dim {\dim_max:nn \g__wa_x_dim \pgf@x}
+           \dim_gset:Nn \g__ww_x_dim {\dim_max:nn \g__ww_x_dim \pgf@x}
            \end{tikzpicture} } } }
-\cs_new:Npn \WithArrowsLastEnv {\int_use:N \g__wa_last_env_int}
+\cs_new:Npn \WithArrowsLastEnv {\int_use:N \g__ww_last_env_int}
 \keys_define:nn {WithArrows/CodeAfter}
      {tikz     .code:n            = \tikzset {WithArrows/arrow/.append~style = {#1}} ,
       tikz     .value_required:n  = true,
       rr       .value_forbidden:n = true,
-      rr       .code:n            = \__wa_analyze_option_position:n 0 ,
+      rr       .code:n            = \__ww_analyze_option_position:n 0 ,
       ll       .value_forbidden:n = true,
-      ll       .code:n            = \__wa_analyze_option_position:n 1 ,
+      ll       .code:n            = \__ww_analyze_option_position:n 1 ,
       rl       .value_forbidden:n = true,
-      rl       .code:n            = \__wa_analyze_option_position:n 2 ,
+      rl       .code:n            = \__ww_analyze_option_position:n 2 ,
       lr       .value_forbidden:n = true,
-      lr       .code:n            = \__wa_analyze_option_position:n 3 ,
+      lr       .code:n            = \__ww_analyze_option_position:n 3 ,
       v        .value_forbidden:n = true,
-      v        .code:n            = \__wa_analyze_option_position:n 4 ,
-      TikzCode .tl_set:N          = \l__wa_tikz_code_tl,
+      v        .code:n            = \__ww_analyze_option_position:n 4 ,
+      TikzCode .tl_set:N          = \l__ww_tikz_code_tl,
       TikzCode .value_required:n  = true,
-      xoffset  .dim_set:N         = \l__wa_xoffset_dim,
+      xoffset  .dim_set:N         = \l__ww_xoffset_dim,
       xoffset  .value_required:n  = true}
-\NewDocumentCommand \__wa_Arrow_code_after {O{} mmm O{}}
-     {\int_set:Nn \l__wa_pos_arrows_int 1
-      \int_set:Nn \l__wa_previous_pos_arrows_int {-1}
+\NewDocumentCommand \__ww_Arrow_code_after {O{} mmm O{}}
+     {\int_set:Nn \l__ww_pos_arrows_int 1
+      \int_set:Nn \l__ww_previous_pos_arrows_int {-1}
       \group_begin:
-           \int_set:Nn \l__wa_level_int 3
+           \int_set:Nn \l__ww_level_int 3
            \keys_set:nn {WithArrows/CodeAfter}
-                        {#1,#5,tikz={xshift = \l__wa_xoffset_dim}}
-           \bool_set_false:N \l__wa_initial_r_bool
-           \bool_set_false:N \l__wa_final_r_bool
-           \int_case:nn \l__wa_pos_arrows_int
-                  {0 {\bool_set_true:N \l__wa_initial_r_bool
-                      \bool_set_true:N \l__wa_final_r_bool}
-                   2 {\bool_set_true:N \l__wa_initial_r_bool}
-                   3 {\bool_set_true:N \l__wa_final_r_bool}}
-           \cs_if_free:cTF {pgf@sh@ns@wa-\l__wa_prefix_str-#2-l}
+                        {#1,#5,tikz={xshift = \l__ww_xoffset_dim}}
+           \bool_set_false:N \l__ww_initial_r_bool
+           \bool_set_false:N \l__ww_final_r_bool
+           \int_case:nn \l__ww_pos_arrows_int
+                  {0 {\bool_set_true:N \l__ww_initial_r_bool
+                      \bool_set_true:N \l__ww_final_r_bool}
+                   2 {\bool_set_true:N \l__ww_initial_r_bool}
+                   3 {\bool_set_true:N \l__ww_final_r_bool}}
+           \cs_if_free:cTF {pgf@sh@ns@wa-\l__ww_prefix_str-#2-l}
              {\msg_error:nnx {witharrows} {Wrong~line~specification~in~Arrow} {#2}}
-             {\cs_if_free:cTF {pgf@sh@ns@wa-\l__wa_prefix_str-#3-l}
+             {\cs_if_free:cTF {pgf@sh@ns@wa-\l__ww_prefix_str-#3-l}
                 {\msg_error:nnx {witharrows} {Wrong~line~specification~in~Arrow} {#3}}
-                {\int_compare:nNnTF \l__wa_pos_arrows_int = 4
-                    {\begin{tikzpicture} [__wa_standard]
+                {\int_compare:nNnTF \l__ww_pos_arrows_int = 4
+                    {\begin{tikzpicture} [__ww_standard]
                         \tikz@scan@one@point\pgfutil@firstofone(#2-l.south)
                         \dim_set_eq:NN \l_tmpa_dim \pgf@x
                         \dim_set_eq:NN \l_tmpb_dim \pgf@y
                         \tikz@scan@one@point\pgfutil@firstofone(#3-l.north)
                         \dim_set:Nn \l_tmpa_dim {\dim_max:nn \l_tmpa_dim \pgf@x}
-                        \tl_gset:Nx \g_tmpa_tl {\dim_use:N \l_tmpa_dim , \dim_use:N \l_tmpb_dim}
-                        \tl_gset:Nx \g_tmpb_tl {\dim_use:N \l_tmpa_dim , \dim_use:N \pgf@y}
+                        \tl_gset:Nx \g_tmpa_tl
+                                    {\dim_use:N \l_tmpa_dim , \dim_use:N \l_tmpb_dim}
+                        \tl_gset:Nx \g_tmpb_tl
+                                    {\dim_use:N \l_tmpa_dim , \dim_use:N \pgf@y}
                      \end{tikzpicture} }
-                    {\begin{tikzpicture} [__wa_standard]
+                    {\begin{tikzpicture} [__ww_standard]
                         \tikz@scan@one@point\pgfutil@firstofone
-                                            (#2-\bool_if:NTF\l__wa_initial_r_bool rl .south)
+                                    (#2-\bool_if:NTF\l__ww_initial_r_bool rl .south)
                         \tl_gset:Nx \g_tmpa_tl {\dim_use:N \pgf@x , \dim_use:N \pgf@y}
                         \tikz@scan@one@point\pgfutil@firstofone
-                                            (#3-\bool_if:NTF\l__wa_final_r_bool rl .north)
+                                    (#3-\bool_if:NTF\l__ww_final_r_bool rl .north)
                         \tl_gset:Nx \g_tmpb_tl {\dim_use:N \pgf@x , \dim_use:N \pgf@y}
                      \end{tikzpicture}}
-                 \__wa_draw_arrow:nnn {\g_tmpa_tl} {\g_tmpb_tl} {#4} }}
+                 \__ww_draw_arrow:nnn {\g_tmpa_tl} {\g_tmpb_tl} {#4} }}
       \group_end:
       }
-\cs_new_protected:Nn \__wa_MultiArrow:nn
+\cs_new_protected:Nn \__ww_MultiArrow:nn
     {
-     \foreach \x in {#1} {\cs_if_free:cTF {pgf@sh@ns@wa-\l__wa_prefix_str-\x-l}
+     \foreach \x in {#1} {\cs_if_free:cTF {pgf@sh@ns@wa-\l__ww_prefix_str-\x-l}
                             {\msg_error:nnx {witharrows}
                                             {Wrong~line~specification~in~MultiArrow}
                                             {\x}}
                             {\clist_gput_right:Nx \g_tmpa_clist {\x}}}
      \int_compare:nNnTF {\clist_count:N \g_tmpa_clist} < 2
-       {\msg_error:nn {witharrows} {Too~small~specification~for~MultiArrow}}
+       {\__ww_msg_error:n {Too~small~specification~for~MultiArrow}}
        {\clist_sort:Nn \g_tmpa_clist
                        {\int_compare:nNnTF {##1} > {##2}
                              {\sort_return_swapped:}
@@ -788,29 +815,40 @@
         \clist_pop:NN \g_tmpa_clist \l_tmpa_tl
         \clist_reverse:N \g_tmpa_clist
         \clist_pop:NN \g_tmpa_clist \l_tmpb_tl
-        \exp_args:Nx \__wa_MultiArrow_i:n {\g_tmpa_clist}
-        \begin{tikzpicture}[__wa_standard,every~path/.style={WithArrows/arrow}]
-          \draw [<->] ([xshift = \l__wa_xoffset_dim]\l_tmpa_tl-r.south)
+        \exp_args:Nx \__ww_MultiArrow_i:n {\g_tmpa_clist}
+        \begin{tikzpicture}[__ww_standard,every~path/.style={WithArrows/arrow}]
+          \draw [<->] ([xshift = \l__ww_xoffset_dim]\l_tmpa_tl-r.south)
                        -- ++(5mm,0)
-                       -- node (__wa_label) {}
-                          ([xshift = \l__wa_xoffset_dim+5mm]\l_tmpb_tl-r.south)
-                       -- ([xshift = \l__wa_xoffset_dim]\l_tmpb_tl-r.south)  ;
-          \tikz@parse@node \pgfutil@firstofone (__wa_label.west)
-          \path (__wa_label.west)
-           node [anchor = west,
-                 text~width =
-                  {\bool_if:nTF {\l__wa_wrap_lines_bool && ! \l__wa_in_witharrows_bool}
-                                {\dim_eval:n {\g__wa_x_right_dim - \pgf@x - 0.3333 em}}
-                                {20 cm}}
-                ] {#2} ;
+                       -- node (__ww_label) {}
+                          ([xshift = \l__ww_xoffset_dim+5mm]\l_tmpb_tl-r.south)
+                       -- ([xshift = \l__ww_xoffset_dim]\l_tmpb_tl-r.south)  ;
+          \tikz@parse@node \pgfutil@firstofone (__ww_label.west)
+          \dim_set:Nn \l_tmpa_dim {20 cm}
+          \path \pgfextra {\tl_gset:Nx \g_tmpa_tl \tikz@text@width} ;
+          \tl_if_empty:NF \g_tmpa_tl {\dim_set:Nn \l_tmpa_dim \g_tmpa_tl}
+          \bool_if:nT {\l__ww_wrap_lines_bool && ! \l__ww_in_witharrows_bool}
+                  {\dim_set:Nn \l_tmpb_dim {\g__ww_x_right_dim - \pgf@x - 0.3333 em}
+                   \dim_compare:nNnT \l_tmpb_dim < \l_tmpa_dim
+                           {\dim_set_eq:NN \l_tmpa_dim \l_tmpb_dim}}
+          \path (__ww_label.west)
+           node [anchor = west, text~width = \dim_use:N \l_tmpa_dim] {#2} ;
         \end{tikzpicture} } }
 
-\cs_new_protected:Nn \__wa_MultiArrow_i:n
-     {\begin{tikzpicture}[__wa_standard,every~path/.style={WithArrows/arrow}]
+\cs_new_protected:Nn \__ww_MultiArrow_i:n
+     {\begin{tikzpicture}[__ww_standard,every~path/.style={WithArrows/arrow}]
         \foreach \k in {#1}
-           {\draw[<-] ([xshift = \l__wa_xoffset_dim]\k-r.south) -- ++(5mm,0) ;} ;
+           {\draw[<-] ([xshift = \l__ww_xoffset_dim]\k-r.south) -- ++(5mm,0) ;} ;
       \end{tikzpicture}}
 \msg_new:nnn {witharrows}
+             {Option~unknown}
+             {The~option~"\tl_use:N\l_keys_key_tl"~is~unknown~or~
+              meaningless~in~the~context.~If~you~go~on,~it~will~be~ignored.}
+\msg_new:nnn {witharrows}
+             {Collision}
+             {You~have~a~collision~(or~almost~a~collision)~at~the~end~of~row~
+              \int_use:N\g__ww_line_int.~
+              You~can~go~on~but~maybe~you~will~have~overlapping~texts.}
+\msg_new:nnn {witharrows}
              {Third~column~in~an~environment~{WithArrows}}
              {By~default,~an~environment~\{WithArrows\}~can~only~have~two~columns.~
               Maybe~you~have~forgotten~a~\str_use:N \c_backslash_str
@@ -828,7 +866,7 @@
               the~option~"<-"~of~Tikz.}
 \msg_new:nnn {witharrows}
              {Too~few~lines~for~an~arrow}
-             {An~arrow~specified~in~line~\int_use:N \l__wa_initial_int\ can't~be~drawn~
+             {An~arrow~specified~in~line~\int_use:N \l__ww_initial_int\ can't~be~drawn~
               because~it~arrives~after~the~last~line~of~the~environment~(remind~that~
               the~command~\token_to_str:N\Arrow\ must~be~in~the~*start*~line~
               of~the~arrow).~If~you~go~on,~this~arrow~will~be~ignored.}
@@ -844,7 +882,7 @@
              {Two~options~are~incompatible}
              {You~try~to~use~the~option~"\tl_use:N\l_keys_key_tl"~but~
              this~option~is~incompatible~or~redundant~with~the~option~"
-             \int_case:nn\l__wa_previous_pos_arrows_int
+             \int_case:nn\l__ww_previous_pos_arrows_int
                  {0 {rr}
                   1 {ll}
                   2 {rl}
@@ -854,7 +892,7 @@
                   6 {group}
                   7 {groups}}"~
              set~in~the~same~
-             \int_case:nn\l__wa_level_int
+             \int_case:nn\l__ww_level_int
                   {1 {command~\token_to_str:N\WithArrowsOptions}
                    2 {declaration~of~options~of~the~environment~
                       \{\@currenvir\}}
@@ -864,7 +902,7 @@
               {All~lines~must~have~an~ampersand}
               {All~lines~of~an~environment~\{WithArrows\}~should~
                have~an~second~column~(because~the~nodes~are~created~
-               in~the~second~column).~However,~you~can~go~but~you~will~
+               in~the~second~column).~However,~you~can~go~on~but~you~will~
                have~an~error~if~one~of~your~arrows~needs~an~PGF~
                node~absent~by~lack~of~ampersand.~If~you~don't~want~to~
                see~this~message~again,~you~can~use~the~option~
@@ -875,7 +913,7 @@
              {Option~incompatible~with~"group(s)"}
              {You~try~to~use~the~option~"\tl_use:N\l_keys_key_tl"~while~
               you~are~using~the~option~"
-              \int_compare:nNnTF \l__wa_pos_arrows_int = 5
+              \int_compare:nNnTF \l__ww_pos_arrows_int = 5
                    {group}
                    {groups}".~
               It's~incompatible.~You~can~go~on~ignoring~this~option~
@@ -885,20 +923,12 @@
              {The~option~"\tl_use:N\l_keys_key_tl"~can't~be~used~here.~
               If~you~go~on,~it~will~be~ignored.}
 \msg_new:nnn {witharrows}
-             {Option~unknown}
-             {The~option~"\tl_use:N\l_keys_key_tl"~is~unknown~or~
-              meaningless~in~the~context.~If~you~go~on,~it~will~be~ignored.}
-\msg_new:nnn {witharrows}
              {Arrow~in~first~column}
              {You~should~not~use~the~command~\token_to_str:N\Arrow\
-              \tl_if_eq:NNF \l__wa_CommandName_tl \l_tmpa_tl
+              \tl_if_eq:NNF \l__ww_CommandName_tl \l_tmpa_tl
                     {(renamed~in~\str_use:N \c_backslash_str
-                     \tl_use:N \l__wa_CommandName_tl)~}
-              ~in~the~first~column~but~only~in~the~second~column.~
-              This~is~a~restriction~of~the~version~1.3~of~the~
-              package~witharrows~(in~the~aim~of~developping~further~
-              ~a~new~functionality~with~\token_to_str:N\Arrow\ in~the~
-              first~column).\\
+                     \tl_use:N \l__ww_CommandName_tl)~}
+              ~in~the~first~column~but~only~in~the~second~column.\\
               However~you~can~go~on~for~this~time.}
 \msg_new:nnn {witharrows}
              {Wrong~line~specification~in~Arrow}
@@ -949,85 +979,84 @@
               If~you~don't~want~to~see~this~message~again,~you~can~use~the~option~
               "AllowMultipleLabels"~at~the~global~or~
               environment~level~(this~doesn't~work~if~you~use~cleveref).}
-\coffin_new:N \l__wa_halign_coffin
+\coffin_new:N \l__ww_halign_coffin
 \NewDocumentEnvironment {CasesWithArrows} {m O{}}
          {\hbox_set:Nn \l_tmpa_box {$\left\{\vcenter to 1cm {} \right.$}
-          \dim_zero_new:N \l__wa_delim_wd_dim
-          \dim_set:Nn \l__wa_delim_wd_dim {\box_wd:N \l_tmpa_box}
-          \box_clear_new:N \l__wa_left_part_box
-          \hbox_set:Nn \l__wa_left_part_box
-                       {$\bool_if:NT \l__wa_displaystyle_bool \displaystyle #1 {}$}
-          \bool_if:nT \c__wa_mathtools_loaded_bool
+          \dim_zero_new:N \l__ww_delim_wd_dim
+          \dim_set:Nn \l__ww_delim_wd_dim {\box_wd:N \l_tmpa_box}
+          \box_clear_new:N \l__ww_left_part_box
+          \hbox_set:Nn \l__ww_left_part_box
+                       {$\bool_if:NT \l__ww_displaystyle_bool \displaystyle #1 {}$}
+          \bool_if:nT \c__ww_mathtools_loaded_bool
                  {\MH_if_boolean:nT {show_only_refs}
                     {\MT_showonlyrefs_false:
                       \MH_set_boolean_T:n {show_only_refs}
-                      \bool_set_true:N \l__wa_notag_bool}}
-           \bool_if:NT \c__wa_amsmath_loaded_bool \intertext@
+                      \bool_set_true:N \l__ww_notag_bool}}
+           \bool_if:NT \c__ww_amsmath_loaded_bool \intertext@
            \if_mode_math:
-               \msg_error:nn {witharrows}
-                             {{DispWithArrows}~used~in~math~mode}
+               \__ww_msg_error:n {{DispWithArrows}~used~in~math~mode}
            \fi:
-           \bool_set_false:N \l__wa_in_witharrows_bool
+           \bool_set_false:N \l__ww_in_witharrows_bool
            %
-           \__wa_pre_environment:n {#2}
+           \__ww_pre_environment:n {#2}
            \nointerlineskip
            \hbox_to_wd:nn {0.6\linewidth} {}
            $$
            \spread@equation
-           \vcoffin_set:Nnw \l__wa_halign_coffin \displaywidth
-              \bool_if:NTF \l__wa_fleqn_bool
+           \vcoffin_set:Nnw \l__ww_halign_coffin \displaywidth
+              \bool_if:NTF \l__ww_fleqn_bool
                      {\tabskip = \c_zero_skip}
                      {\tabskip = 0 pt plus 1000 pt minus 1000 pt}
-              \bool_if:NTF \c__wa_amsmath_loaded_bool
-                 {\cs_set_eq:NN \__wa_old_label \ltx@label}
-                 {\cs_set_eq:NN \__wa_old_label \label}
+              \bool_if:NTF \c__ww_amsmath_loaded_bool
+                 {\cs_set_eq:NN \__ww_old_label \ltx@label}
+                 {\cs_set_eq:NN \__ww_old_label \label}
               \cs_set:Npn \notag {\msg_error:nnn {witharrows}
-                                                 {Command~not~allowed~in~{DispWithArrows}}
-                                                 {\notag}}
+                                      {Command~not~allowed~in~{DispWithArrows}}
+                                      {\notag}}
               \cs_set:Npn \nonumber {\msg_error:nnn {witharrows}
-                                                    {Command~not~allowed~in~{DispWithArrows}}
-                                                    {\nonumber}}
+                                      {Command~not~allowed~in~{DispWithArrows}}
+                                      {\nonumber}}
               \cs_set:Npn \tag ##1 {\msg_error:nnn {witharrows}
-                                                   {Command~not~allowed~in~{DispWithArrows}}
-                                                   {\tag}}
+                                      {Command~not~allowed~in~{DispWithArrows}}
+                                      {\tag}}
               \cs_set:Npn \label ##1 {\msg_error:nnn {witharrows}
-                                                     {Command~not~allowed~in~{DispWithArrows}}
-                                                     {\label}}
+                                      {Command~not~allowed~in~{DispWithArrows}}
+                                      {\label}}
               \halign to \displaywidth \bgroup
-                \int_gincr:N \g__wa_line_int
-                \cs_set_eq:cN \l__wa_CommandName_tl \__wa_Arrow_first_column:
+                \int_gincr:N \g__ww_line_int
+                \cs_set_eq:cN \l__ww_CommandName_tl \__ww_Arrow_first_column:
                 \strut
-                \bool_if:NT \l__wa_fleqn_bool
-                      {\skip_horizontal:n \l__wa_mathindent_dim}
+                \bool_if:NT \l__ww_fleqn_bool
+                      {\skip_horizontal:n \l__ww_mathindent_dim}
                 \hfil
-                \skip_horizontal:n {\box_wd:N \l__wa_left_part_box + \l__wa_delim_wd_dim}
-                $\bool_if:NT \l__wa_displaystyle_bool \displaystyle {##}$
+                \skip_horizontal:n {\box_wd:N \l__ww_left_part_box + \l__ww_delim_wd_dim}
+                $\bool_if:NT \l__ww_displaystyle_bool \displaystyle {##}$
                 \tabskip = \c_zero_skip
                &
-                \cs_set:Npn \notag {\bool_set_true:N \l__wa_notag_bool}
+                \cs_set:Npn \notag {\bool_set_true:N \l__ww_notag_bool}
                 \cs_set_eq:NN \nonumber \notag
-                \cs_set_eq:NN \tag \__wa_tag
-                \cs_set_eq:NN \label \__wa_label:n
-                $\bool_if:NT \l__wa_displaystyle_bool \displaystyle {{}##}$
+                \cs_set_eq:NN \tag \__ww_tag
+                \cs_set_eq:NN \label \__ww_label:n
+                $\bool_if:NT \l__ww_displaystyle_bool \displaystyle {{}##}$
                 \tabskip = 0 pt plus 1000 pt minus 1000 pt
-                \int_gincr:N \g__wa_line_bis_int
+                \int_gincr:N \g__ww_line_bis_int
                 \tikz [remember~picture,overlay]
-                     \node [__wa_node_style,
-                            name = wa-\l__wa_prefix_str-\int_use:N\g__wa_line_int-l,
-                            alias = {\tl_if_empty:NF \l__wa_name_tl
-                                       {\l__wa_name_tl-\int_use:N\g__wa_line_int-l}} ] {} ;
+                     \node [__ww_node_style,
+                            name = wa-\l__ww_prefix_str-\int_use:N\g__ww_line_int-l,
+                            alias = {\tl_if_empty:NF \l__ww_name_tl
+                                      {\l__ww_name_tl-\int_use:N\g__ww_line_int-l}} ] {} ;
                 \hfil
                 \tikz [remember~picture,overlay]
-                      \node [__wa_node_style,
-                             name = wa-\l__wa_prefix_str-\int_use:N\g__wa_line_int-r,
-                             alias = {\tl_if_empty:NF \l__wa_name_tl
-                                        {\l__wa_name_tl-\int_use:N\g__wa_line_int-r}} ] {} ;
-                \bool_if:NT \l__wa_shownodenames_bool
-                     {\hbox_overlap_right:n {\small wa-\l__wa_prefix_str
-                                                      -\int_use:N\g__wa_line_int}}
+                     \node [__ww_node_style,
+                            name = wa-\l__ww_prefix_str-\int_use:N\g__ww_line_int-r,
+                            alias = {\tl_if_empty:NF \l__ww_name_tl
+                                      {\l__ww_name_tl-\int_use:N\g__ww_line_int-r}} ] {} ;
+                \bool_if:NT \l__ww_shownodenames_bool
+                     {\hbox_overlap_right:n {\small wa-\l__ww_prefix_str
+                                                      -\int_use:N\g__ww_line_int}}
                & ##
                 \tabskip = \c_zero_skip
-               && \msg_error:nn {witharrows} {Third~column~in~an~environment~{DispWithArrows}}
+               && \__ww_msg_error:n {Third~column~in~an~environment~{DispWithArrows}}
                   \if_false: ## \fi:
                 \cr}
           {   \\
@@ -1036,28 +1065,29 @@
               \box_set_to_last:N \l_tmpa_box
               \nointerlineskip
               \box_use:N \l_tmpa_box
-              \dim_gzero_new:N \g__wa_alignment_dim
-              \dim_gset:Nn \g__wa_alignment_dim {\box_wd:N \l_tmpa_box}
-              \box_clear_new:N \l__wa_new_box
-              \hbox_set:Nn \l__wa_new_box {\hbox_unpack_clear:N \l_tmpa_box}
-              \dim_compare:nNnT {\box_wd:N \l__wa_new_box} < \g__wa_alignment_dim
-                   {\dim_gset:Nn \g__wa_alignment_dim {\box_wd:N \l__wa_new_box}}
+              \dim_gzero_new:N \g__ww_alignment_dim
+              \dim_gset:Nn \g__ww_alignment_dim {\box_wd:N \l_tmpa_box}
+              \box_clear_new:N \l__ww_new_box
+              \hbox_set:Nn \l__ww_new_box {\hbox_unpack_clear:N \l_tmpa_box}
+              \dim_compare:nNnT {\box_wd:N \l__ww_new_box} < \g__ww_alignment_dim
+                   {\dim_gset:Nn \g__ww_alignment_dim {\box_wd:N \l__ww_new_box}}
            \vcoffin_set_end:
            \hbox_to_wd:nn \displaywidth
              {
-              \bool_if:NTF \l__wa_fleqn_bool
-                    {\skip_horizontal:n \l__wa_mathindent_dim}
+              \bool_if:NTF \l__ww_fleqn_bool
+                    {\skip_horizontal:n \l__ww_mathindent_dim}
                     {\hfil}
-              \hbox_to_wd:nn \g__wa_alignment_dim
-                   { \box_use_drop:N \l__wa_left_part_box
-                     \dim_set:Nn \l_tmpa_dim {   \box_ht:N \l__wa_halign_coffin
-                                               + \box_dp:N \l__wa_halign_coffin}
+              \hbox_to_wd:nn \g__ww_alignment_dim
+                   { \box_use_drop:N \l__ww_left_part_box
+                     \dim_set:Nn \l_tmpa_dim {   \box_ht:N \l__ww_halign_coffin
+                                               + \box_dp:N \l__ww_halign_coffin}
                      $\left\{ \vcenter to \l_tmpa_dim {\vfil} \right.$}
               \hfil}
-           \coffin_typeset:Nnnnn \l__wa_halign_coffin {l} {vc} {-\displaywidth} \c_zero_dim
+           \coffin_typeset:Nnnnn
+                        \l__ww_halign_coffin {l} {vc} {-\displaywidth} \c_zero_dim
            $$
-           \__wa_post_environment:
-           \bool_if:nT \c__wa_mathtools_loaded_bool
+           \__ww_post_environment:
+           \bool_if:nT \c__ww_mathtools_loaded_bool
                     {\MH_if_boolean:nT {show_only_refs}
                           \MT_showonlyrefs_true:}
            \ignorespacesafterend