witharrows (4mar21)

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

4 files changed, 48 insertions, 15 deletions

diff --git a/Master/texmf-dist/doc/generic/witharrows/witharrows-french.pdf b/Master/texmf-dist/doc/generic/witharrows/witharrows-french.pdf
index 8ea76ae1de0..2d9b238271a 100644
--- a/Master/texmf-dist/doc/generic/witharrows/witharrows-french.pdf
+++ b/Master/texmf-dist/doc/generic/witharrows/witharrows-french.pdf
diff --git a/Master/texmf-dist/doc/generic/witharrows/witharrows-french.tex b/Master/texmf-dist/doc/generic/witharrows/witharrows-french.tex
index 86b7f660f96..8c19fc72f8e 100644
--- a/Master/texmf-dist/doc/generic/witharrows/witharrows-french.tex
+++ b/Master/texmf-dist/doc/generic/witharrows/witharrows-french.tex
@@ -1228,11 +1228,11 @@ $\begin{WithArrows}[code-after = \Arrow[v]{1-2}{2-2}{division par $2$} ]
 \end{WithArrows}$
 
  
-\interitem
+\interitem 
 L'extension \pkg{witharrows} fournit une autre commande disponible dans le |code-after| : la commande
-|\MultiArrow|. Cette commande dessine un «rateau». La liste des rangées concernées par ce rateau
-est donnée dans le premier argument de la commande |\MultiArrow|. La syntaxe utilisée pour décrire cette liste
-est celle de la commande |\foreach| de \pkg{pgffor}.
+|\MultiArrow|. Cette commande dessine un «rateau». La liste des rangées concernées par ce rateau est donnée dans le
+premier argument de la commande |\MultiArrow|. La syntaxe utilisée pour décrire cette liste est celle de la
+commande |\foreach| de \pkg{pgffor}.
 
 \begin{Verbatim}
 $\begin{WithArrows}[tikz = rounded corners,
diff --git a/Master/texmf-dist/doc/generic/witharrows/witharrows.pdf b/Master/texmf-dist/doc/generic/witharrows/witharrows.pdf
index 7727d27d1ca..03a0cb1161e 100644
--- a/Master/texmf-dist/doc/generic/witharrows/witharrows.pdf
+++ b/Master/texmf-dist/doc/generic/witharrows/witharrows.pdf
diff --git a/Master/texmf-dist/doc/generic/witharrows/witharrows.tex b/Master/texmf-dist/doc/generic/witharrows/witharrows.tex
index 97cb5359466..f0adab1ae7d 100644
--- a/Master/texmf-dist/doc/generic/witharrows/witharrows.tex
+++ b/Master/texmf-dist/doc/generic/witharrows/witharrows.tex
@@ -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{2.6b}
-\def\myfiledate{2021/01/31}
+\def\myfileversion{2.6c}
+\def\myfiledate{2021/03/04}
 \input tikz.tex
 \input expl3-generic.tex
 \usetikzlibrary{arrows.meta,bending}
@@ -1550,6 +1550,21 @@
         } ;
         \endtikzpicture
   }
+\str_new:N \l_witharrows_body_str
+\cs_new:Npn \__witharrows_potential_body_i:
+  {
+    \str_if_empty:NF \l_witharrows_body_str
+      { \\ If~you~want~to~see~the~body~of~the~environment,~type~H~<return>. }
+  }
+\cs_new:Npn \__witharrows_potential_body_ii:
+  {
+    \str_if_empty:NTF \l_nicematrix_body_str
+      { No~further~help~available }
+      {
+        The~body~of~your~environment~was:\\
+        \l_witharrows_body_str
+      }
+  }
 \str_const:Nn \c__witharrows_option_ignored_str
   { If~you~go~on,~this~option~will~be~ignored. }
 \str_const:Nn \c__witharrows_command_ignored_str
@@ -1580,23 +1595,29 @@
     (or~another~line)~of~your~environment~\{\l__witharrows_type_env_str\}.\\
     You~can~go~on~but~you~may~have~others~errors.
   }
-\__witharrows_msg_new:nn { Invalid~option~format }
+\__witharrows_msg_new:nnn { Invalid~option~format }
   {
     The~key~'format'~should~contain~only~letters~r,~c~and~l~and~
     must~not~be~empty.\\
     \c__witharrows_option_ignored_str
+    \__witharrows_potential_body_i:
   }
-\__witharrows_msg_new:nn { invalid~key~o }
+  { \__witharrows_potential_body_ii: }
+\__witharrows_msg_new:nnn { invalid~key~o }
   {
     The~key~'o'~for~individual~arrows~can~be~used~only~in~mode~
     'group'~or~in~mode~'groups'.\\
     \c__witharrows_option_ignored_str
+    \__witharrows_potential_body_i:
   }
-\__witharrows_msg_new:nn { Value~for~a~key }
+  { \__witharrows_potential_body_ii: }
+\__witharrows_msg_new:nnn { Value~for~a~key }
   {
     The~key~'\l_keys_key_str'~should~be~used~without~value. \\
     However,~you~can~go~on~for~this~time.
+    \__witharrows_potential_body_i:
   }
+  { \__witharrows_potential_body_ii: }
 \__witharrows_msg_new:nnn { Unknown~option~in~Arrow }
   {
     The~key~'\l_keys_key_str'~is~unknown~for~the~command~
@@ -1652,7 +1673,7 @@
     The~available~keys~are~(in~alphabetic~order):~
     \seq_use:Nnnn \l__witharrows_options_Arrow_code_after_seq {~and~} {,~} {~and~}.
   }
-\__witharrows_msg_new:nn { Too~much~columns~in~WithArrows }
+\__witharrows_msg_new:nnn { Too~much~columns~in~WithArrows }
   {
     Your~environment~\{\l__witharrows_type_env_str\}~has~\int_use:N
     \l__witharrows_nb_cols_int\ columns~and~you~try~to~use~one~more.~
@@ -1660,15 +1681,19 @@
     If~you~really~want~to~use~more~columns~(after~the~arrows)~you~should~use~
     the~option~'more-columns'~at~a~global~level~or~for~an~environment. \\
     However,~you~can~go~one~for~this~time.
+    \__witharrows_potential_body_i:
   }
-\__witharrows_msg_new:nn { Too~much~columns~in~DispWithArrows }
+  { \__witharrows_potential_body_ii: }
+\__witharrows_msg_new:nnn { Too~much~columns~in~DispWithArrows }
   {
     Your~environment~\{\l__witharrows_type_env_str\}~has~\int_use:N
     \l__witharrows_nb_cols_int\ columns~and~you~try~to~use~one~more.~
     Maybe~you~have~forgotten~a~\c_backslash_str\c_backslash_str\
     at~the~end~of~row~\int_use:N \g__witharrows_line_int. \\
     This~error~is~fatal.
+    \__witharrows_potential_body_i:
   }
+  { \__witharrows_potential_body_ii: }
 \__witharrows_msg_new:nn { Negative~jump }
   {
     You~can't~use~a~negative~value~for~the~option~'jump'~of~command~
@@ -1686,7 +1711,7 @@
     'groups'~in~your~environment~\{\l__witharrows_type_env_str\}. \\
     \c__witharrows_option_ignored_str
   }
-\__witharrows_msg_new:nn
+\__witharrows_msg_new:nnn
   { Too~few~lines~for~an~arrow }
   {
     Line~\l__witharrows_input_line_str\
@@ -1694,25 +1719,31 @@
     of~your~environment~\{\l__witharrows_type_env_str\}~can't~be~drawn~
     because~it~arrives~after~the~last~row~of~the~environment. \\
     If~you~go~on,~this~arrow~will~be~ignored.
+    \__witharrows_potential_body_i:
   }
+  { \__witharrows_potential_body_ii: }
 \__witharrows_msg_new:nn { o~arrow~with~no~arrow~under }
   {
     Line~\l__witharrows_input_line_str\
     :~there~is~no~arrow~'under'~your~arrow~of~type~'o'.\\
     If~you~go~on,~this~arrow~won't~be~drawn.
   }
-\__witharrows_msg_new:nn { WithArrows~outside~math~mode }
+\__witharrows_msg_new:nnn { WithArrows~outside~math~mode }
   {
     The~environment~\{\l__witharrows_type_env_str\}~should~be~used~only~in~math~mode~
     like~the~environment~\{aligned\}~of~amsmath. \\
     Nevertheless,~you~can~go~on.
+    \__witharrows_potential_body_i:
   }
-\__witharrows_msg_new:nn { DispWithArrows~in~math~mode }
+  { \__witharrows_potential_body_ii: }
+\__witharrows_msg_new:nnn { DispWithArrows~in~math~mode }
   {
     The~environment~\{\l__witharrows_type_env_str\}~should~be~used~only~outside~math~
     mode~like~the~environments~\{align\}~and~\{align*\}~of~amsmath. \\
     This~error~is~fatal.
+    \__witharrows_potential_body_i:
   }
+  { \__witharrows_potential_body_ii: }
 \__witharrows_msg_new:nn { Incompatible~options~in~Arrow }
   {
     You~try~to~use~the~option~'\l_keys_key_str'~but~
@@ -1732,13 +1763,15 @@
       }. \\
     \c__witharrows_option_ignored_str
   }
-\__witharrows_msg_new:nn { Arrow~not~in~last~column }
+\__witharrows_msg_new:nnn { Arrow~not~in~last~column }
   {
     You~should~use~the~command~\l__witharrows_string_Arrow_for_msg_str\
     only~in~the~last~column~(column~\int_use:N\l__witharrows_nb_cols_int)~
     of~your~environment~\{\l__witharrows_type_env_str\}.\\
     However~you~can~go~on~for~this~time.
+    \__witharrows_potential_body_i:
   }
+  { \__witharrows_potential_body_ii: }
 \__witharrows_msg_new:nn { Wrong~line~in~Arrow }
   {
     The~specification~of~line~'#1'~you~use~in~the~command~