6 files changed, 25 insertions, 19 deletions
diff --git a/Master/texmf-dist/doc/generic/witharrows/witharrows-french.pdf b/Master/texmf-dist/doc/generic/witharrows/witharrows-french.pdf
index 10b2e831912..418b113d7f1 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.pdf b/Master/texmf-dist/doc/generic/witharrows/witharrows.pdf
index 7b350f06316..bd8cdb7be49 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 3e806744d6e..d46f9a806d9 100644
--- a/Master/texmf-dist/doc/generic/witharrows/witharrows.tex
+++ b/Master/texmf-dist/doc/generic/witharrows/witharrows.tex
@@ -6,7 +6,7 @@
 %%
 %% witharrows.dtx  (with options: `plain-TeX')
 %% 
-%% Copyright (C) 2017-2020 by F. Pantigny
+%% Copyright (C) 2017-2021 by F. Pantigny
 %% 
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -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.6}
-\def\myfiledate{2020/09/08}
+\def\myfileversion{2.6a}
+\def\myfiledate{2021/01/12}
 \input tikz.tex
 \input expl3-generic.tex
 \usetikzlibrary{arrows.meta,bending}
@@ -908,7 +908,7 @@
     \dim_gzero_new:N \g__witharrows_alignment_dim
     \dim_gset:Nn \g__witharrows_alignment_dim { \box_wd:N \l_tmpa_box }
     \box_clear_new:N \l__witharrows_new_box
-    \hbox_set:Nn \l__witharrows_new_box { \hbox_unpack_clear:N \l_tmpa_box }
+    \hbox_set:Nn \l__witharrows_new_box { \hbox_unpack_drop:N \l_tmpa_box }
     \dim_compare:nNnT
       { \box_wd:N \l__witharrows_new_box } < \g__witharrows_alignment_dim
       { \dim_gset:Nn \g__witharrows_alignment_dim { \box_wd:N \l__witharrows_new_box } }
diff --git a/Master/texmf-dist/source/generic/witharrows/witharrows.dtx b/Master/texmf-dist/source/generic/witharrows/witharrows.dtx
index 79f46f5d697..567911b1bca 100644
--- a/Master/texmf-dist/source/generic/witharrows/witharrows.dtx
+++ b/Master/texmf-dist/source/generic/witharrows/witharrows.dtx
@@ -1,6 +1,6 @@
 %\iffalse meta-comment
 %
-% Copyright (C) 2017-2020 by F. Pantigny
+% Copyright (C) 2017-2021 by F. Pantigny
 % -----------------------------------
 %
 % This file may be distributed and/or modified under the
@@ -15,8 +15,8 @@
 %
 % \fi
 % \iffalse
-\def\myfileversion{2.6}
-\def\myfiledate{2020/09/08}
+\def\myfileversion{2.6a}
+\def\myfiledate{2021/01/12}
 %
 %
 %<*batchfile>
@@ -26,7 +26,7 @@
 \usedir{tex/latex/witharrows}
 \preamble
 
-Copyright (C) 2017-2020 by F. Pantigny
+Copyright (C) 2017-2021 by F. Pantigny
 -----------------------------------
 
 This file may be distributed and/or modified under the
@@ -5348,7 +5348,7 @@ version 2005/12/01 or later.
     \dim_gzero_new:N \g_@@_alignment_dim
     \dim_gset:Nn \g_@@_alignment_dim { \box_wd:N \l_tmpa_box }
     \box_clear_new:N \l_@@_new_box
-    \hbox_set:Nn \l_@@_new_box { \hbox_unpack_clear:N \l_tmpa_box } 
+    \hbox_set:Nn \l_@@_new_box { \hbox_unpack_drop:N \l_tmpa_box } 
     \dim_compare:nNnT 
       { \box_wd:N \l_@@_new_box } < \g_@@_alignment_dim
       { \dim_gset:Nn \g_@@_alignment_dim { \box_wd:N \l_@@_new_box } }
@@ -6333,9 +6333,9 @@ version 2005/12/01 or later.
 %<*LaTeX> 
            node [ anchor = west ]
             { 
-              \begin { varwidth } { \l_tmpa_dim }
+              \begin { minipage } { \l_tmpa_dim }
               #3 
-              \end { varwidth }
+              \end { minipage }
             } ; 
 %</LaTeX>
 %<*plain-TeX>
@@ -7928,6 +7928,12 @@ version 2005/12/01 or later.
 %
 % The key |format| now support the letters |R|, |C| and |L|.
 % 
+%
+% \subsection*{Changes between 2.6 and 2.6a}
+%
+% Replacement of |\hbox_unpack_clear:N| by |\hbox_unpack_drop:N| since
+% |\hbox_unpack_clear:N| is now deprecated in \pkg{expl3}.
+%
 % \PrintIndex
 %
 % \tableofcontents
diff --git a/Master/texmf-dist/source/generic/witharrows/witharrows.ins b/Master/texmf-dist/source/generic/witharrows/witharrows.ins
index 66ef8293fb3..fb1d7ae5edc 100644
--- a/Master/texmf-dist/source/generic/witharrows/witharrows.ins
+++ b/Master/texmf-dist/source/generic/witharrows/witharrows.ins
@@ -1,5 +1,5 @@
 %%
-%% Copyright (C) 2017-2020 by F. Pantigny
+%% Copyright (C) 2017-2021 by F. Pantigny
 %%
 %%
 %% This file may be distributed and/or modified under the
@@ -17,7 +17,7 @@
 \usedir{tex/latex/witharrows}
 \preamble
 
-Copyright (C) 2017-2020 by F. Pantigny
+Copyright (C) 2017-2021 by F. Pantigny
 
 This file may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either
diff --git a/Master/texmf-dist/tex/generic/witharrows/witharrows.sty b/Master/texmf-dist/tex/generic/witharrows/witharrows.sty
index 9f49ebbca2e..435b298dce7 100644
--- a/Master/texmf-dist/tex/generic/witharrows/witharrows.sty
+++ b/Master/texmf-dist/tex/generic/witharrows/witharrows.sty
@@ -6,7 +6,7 @@
 %%
 %% witharrows.dtx  (with options: `LaTeX')
 %% 
-%% Copyright (C) 2017-2020 by F. Pantigny
+%% Copyright (C) 2017-2021 by F. Pantigny
 %% 
 %% This file may be distributed and/or modified under the
 %% conditions of the LaTeX Project Public License, either
@@ -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.6}
-\def\myfiledate{2020/09/08}
+\def\myfileversion{2.6a}
+\def\myfiledate{2021/01/12}
 \RequirePackage{tikz}
 \usetikzlibrary{arrows.meta,bending}
 \RequirePackage{l3keys2e}
@@ -1155,7 +1155,7 @@
     \dim_gzero_new:N \g__witharrows_alignment_dim
     \dim_gset:Nn \g__witharrows_alignment_dim { \box_wd:N \l_tmpa_box }
     \box_clear_new:N \l__witharrows_new_box
-    \hbox_set:Nn \l__witharrows_new_box { \hbox_unpack_clear:N \l_tmpa_box }
+    \hbox_set:Nn \l__witharrows_new_box { \hbox_unpack_drop:N \l_tmpa_box }
     \dim_compare:nNnT
       { \box_wd:N \l__witharrows_new_box } < \g__witharrows_alignment_dim
       { \dim_gset:Nn \g__witharrows_alignment_dim { \box_wd:N \l__witharrows_new_box } }
@@ -1617,9 +1617,9 @@
         \path ( __witharrows_label.west )
            node [ anchor = west ]
             {
-              \begin { varwidth } { \l_tmpa_dim }
+              \begin { minipage } { \l_tmpa_dim }
               #3
-              \end { varwidth }
+              \end { minipage }
             } ;
       }
   }