From 2c09a813df08895666d3755db66718dcd501aee5 Mon Sep 17 00:00:00 2001
From: Norbert Preining <norbert@preining.info>
Date: Fri, 31 Dec 2021 03:01:26 +0000
Subject: CTAN sync 202112310301

---
 macros/generic/witharrows/witharrows.dtx | 52 +++++++++++++++++---------------
 1 file changed, 28 insertions(+), 24 deletions(-)

(limited to 'macros/generic/witharrows/witharrows.dtx')

diff --git a/macros/generic/witharrows/witharrows.dtx b/macros/generic/witharrows/witharrows.dtx
index 2e6c4270ea..921c2ebc77 100644
--- a/macros/generic/witharrows/witharrows.dtx
+++ b/macros/generic/witharrows/witharrows.dtx
@@ -1,6 +1,6 @@
 %\iffalse meta-comment
 %
-% Copyright (C) 2017-2021 by F. Pantigny
+% Copyright (C) 2017-2022 by F. Pantigny
 % -----------------------------------
 %
 % This file may be distributed and/or modified under the
@@ -15,8 +15,8 @@
 %
 % \fi
 % \iffalse
-\def\myfileversion{2.6c}
-\def\myfiledate{2021/03/04}
+\def\myfileversion{2.6d}
+\def\myfiledate{2022/01/01}
 %
 %
 %<*batchfile>
@@ -26,7 +26,7 @@
 \usedir{tex/latex/witharrows}
 \preamble
 
-Copyright (C) 2017-2021 by F. Pantigny
+Copyright (C) 2017-2022 by F. Pantigny
 -----------------------------------
 
 This file may be distributed and/or modified under the
@@ -45,10 +45,12 @@ version 2005/12/01 or later.
 %</batchfile>
 %
 %<*driver>
-\documentclass[dvipsnames]{l3doc}% dvipsnames is for xcolor (loaded by Tikz, loaded by witharrows)
+\documentclass[dvipsnames]{l3doc}% dvipsnames is for xcolor (loaded by Tikz)
+\VerbatimFootnotes
 \usepackage{xltxtra}
 \usepackage[xetex]{geometry}
 \geometry{left=2.8cm,right=2.8cm,top=2.5cm,bottom=2.5cm,papersize={21cm,29.7cm}}
+\usepackage[hyperfootnotes=false]{footnotehyper}
 \usepackage[footnotehyper]{witharrows}
 \usetikzlibrary{calc}
 \usepackage{mathtools}
@@ -698,7 +700,7 @@ version 2005/12/01 or later.
 % \bigskip 
 % In an environment which uses the option |group| or the option |groups|, it's
 % still possible to give an option of position (|ll|, |lr|, |rl|, |rr| or |i|)
-% to an individual arrow\footnote{Such an arrow will be called
+% to an individual arrow\footnote{Such arrow will be called
 % \emph{independent} in the technical documentation}. Such arrow will be drawn
 % irrespective of the groups. It's also possible to start a new group by
 % applying the option |new-group| to an given arrow.
@@ -814,7 +816,7 @@ version 2005/12/01 or later.
 %
 % \bigskip
 % The horizontal space between an arrow of type |o| and the arrows immediately
-% covered is fixed by the dimension \verb|xoffset-for-o-arrows| which can be set
+% covered is fixed by the dimension |xoffset-for-o-arrows| which can be set
 % which the command |\WithArrowsOptions| (initial value: 2~mm).
 % 
 %
@@ -1813,7 +1815,7 @@ version 2005/12/01 or later.
 %
 % For lisibility, this option |left-brace| is also available with a special
 % syntax: it's possible to give this option between angle brackets  
-% (\verb|<| and \verb|>|) just after \verb|{DispWithArrows}| (before the optional
+% (|<| and |>|) just after |{DispWithArrows}| (before the optional
 % arguments between square brackets).
 %
 % \bigskip 
@@ -1872,7 +1874,7 @@ version 2005/12/01 or later.
 % interactive link.
 %
 % \bigskip
-% With the option \verb|replace-left-brace-by|, it's possible to replace the
+% With the option |replace-left-brace-by|, it's possible to replace the
 % left curly brace by another extensible delimiter. For example,
 % ``|replace-left-brace-by = [\enskip|'' will compose with a bracket and add also a
 % |\enskip| after this bracket.
@@ -1931,7 +1933,7 @@ version 2005/12/01 or later.
 % By default, the value is the following:
 % 
 % \smallskip
-% \qquad \verb|\draw (#1) to node {#3} (#2) ;|
+% \qquad |\draw (#1) to node {#3} (#2) ;|
 %
 %
 % \bigskip
@@ -2377,7 +2379,7 @@ version 2005/12/01 or later.
 % environments nested inside).}
 %
 % \smallskip
-% The value by defaut of |tikz-code| is \verb|\draw (#1) to node {#3} (#2) ;|
+% The value by defaut of |tikz-code| is |\draw (#1) to node {#3} (#2) ;|
 % where the three markers |#1|, |#2| and |#3| represent the start row, the end
 % row and the label of the arrow.
 %
@@ -5162,7 +5164,7 @@ version 2005/12/01 or later.
 % Even if the default value of |\nulldelimiterspace| is 1.2~pt, we take it into account.
 %    \begin{macrocode}
             \group_begin:
-            \dim_set_eq:NN \nulldelimiterspace \c_zero_dim
+            \dim_zero:N \nulldelimiterspace 
             \c_math_toggle_token
             \left \l_@@_replace_left_brace_by_tl \vcenter to 1 cm { } \right.
             \c_math_toggle_token
@@ -5222,7 +5224,10 @@ version 2005/12/01 or later.
 %</plain-TeX>
 %<*LaTeX>
     \bool_if:NTF \l_@@_in_label_or_minipage_bool
-      { \c_math_toggle_token } 
+      { 
+        \noindent % added in v. 2.6d
+        \c_math_toggle_token 
+      } 
       {  
 %</LaTeX>
 %    \end{macrocode}
@@ -5336,13 +5341,17 @@ version 2005/12/01 or later.
             \hbox_to_wd:nn \g_@@_alignment_dim 
               { 
                 \box_use_drop:N \l_@@_left_brace_box
+%    \end{macrocode}
+% Here, you should use |\box_ht_plus_dp:N| when TeXLive 2021 will be available
+% on Overleaf. 
+%    \begin{macrocode}
                 \dim_set:Nn \l_tmpa_dim 
                   { 
                     \box_ht:N \l_@@_halign_box
                     + \box_dp:N \l_@@_halign_box
                   }
                 \group_begin:
-                \dim_set_eq:NN \nulldelimiterspace \c_zero_dim
+                \dim_zero:N \nulldelimiterspace 
                 \c_math_toggle_token
                   \left \l_@@_replace_left_brace_by_tl 
                     \vcenter to \l_tmpa_dim { \vfil } 
@@ -6154,7 +6163,7 @@ version 2005/12/01 or later.
 % \bigskip
 % Eventually, we can draw the arrow with the code in |\l_@@_tikz_code_tl|. We
 % recall that the value by default for this token list is :\enskip
-% ``\verb|\draw (#1) to node {#3} (#2) ;|''. This value can be modified with the
+% ``|\draw (#1) to node {#3} (#2) ;|''. This value can be modified with the
 % option |tikz-code|. We use the variant |\@@_draw_arrow:nno| of the macro
 % |\@@_draw_arrow:nnn| because of the characters \emph{underscore} in the name
 % |\l_tmpa_tl|: if the user uses the Tikz library |babel|, the third argument of
@@ -6162,7 +6171,7 @@ version 2005/12/01 or later.
 % will be in the argument of a command |node| of an instruction |\draw| of
 % Tikz... and we will have an error because of the characters
 % \emph{underscore}.\footnote{There were other solutions: use another name
-% without \emph{underscore} (like \Verb|\ltmpatl|) or use the package
+% without \emph{underscore} (like |\ltmpatl|) or use the package
 % \pkg{underscore} (with this package, the characters \emph{underscore} will be
 % rescanned without errors, even in text mode).}
 %    \begin{macrocode}
@@ -6206,7 +6215,7 @@ version 2005/12/01 or later.
         \pgf@relevantforpicturesizetrue
           #1 
         \dim_compare:nNnTF \pgf@picminx = { 16000 pt }
-          { \dim_set_eq:NN \l_tmpa_dim \c_zero_dim }
+          { \dim_zero:NN \l_tmpa_dim }
           { \dim_set:Nn \l_tmpa_dim { \pgf@picmaxx - \pgf@picminx } }
         \dim_add:Nn \l_tmpa_dim \l_@@_xoffset_dim
         \prop_gput:cnV
@@ -7724,13 +7733,6 @@ version 2005/12/01 or later.
 % 
 % \section{History}
 %
-% The successive versions of the file |witharrows.sty| provided by TeXLive are available on the
-% \textsc{svn} server of TeXLive:
-%
-% {
-% \small
-% \url{https:www.tug.org/svn/texlive/trunk/Master/texmf-dist/tex/latex/witharrows/witharrows.sty}
-% }
 % \subsection*{Changes between versions 1.0 and 1.1}
 % 
 % Option for the command |\\| and option |interline|
@@ -7947,6 +7949,8 @@ version 2005/12/01 or later.
 % Replacement of |\hbox_unpack_clear:N| by |\hbox_unpack_drop:N| since
 % |\hbox_unpack_clear:N| is now deprecated in \pkg{expl3}.
 %
+% Version 2.6d: correction of a bug (cf. question 628461 on TeX StackExchange).
+%
 % \PrintIndex
 %
 % \tableofcontents
-- 
cgit v1.2.3

