witharrows (20apr22)

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

2 files changed, 51 insertions, 25 deletions

diff --git a/Master/texmf-dist/source/generic/witharrows/witharrows.dtx b/Master/texmf-dist/source/generic/witharrows/witharrows.dtx
index 921c2ebc77f..ca8955ce215 100644
--- a/Master/texmf-dist/source/generic/witharrows/witharrows.dtx
+++ b/Master/texmf-dist/source/generic/witharrows/witharrows.dtx
@@ -15,8 +15,8 @@
 %
 % \fi
 % \iffalse
-\def\myfileversion{2.6d}
-\def\myfiledate{2022/01/01}
+\def\myfileversion{2.7}
+\def\myfiledate{2022/04/20}
 %
 %
 %<*batchfile>
@@ -98,14 +98,28 @@ version 2005/12/01 or later.
 % \end{abstract}
 %
 %
-% \vspace{1cm} In this document, we describe the LaTeX extension
-% \pkg{witharrows} (however, \pkg{witharrows} can also be used with plain-TeX:
-% see p.~\pageref{plain-TeX}). This package can be used with |xelatex|,
-% |lualatex|, |pdflatex| but also by the classical workflow
-% |latex|-|dvips|-|ps2pdf| (or Adobe Distiller). This package loads the packages
-% \pkg{l3keys2e}, \pkg{varwidth}, \pkg{tikz} and the Tikz libraries
-% \pkg{arrows.meta} and \pkg{bending}. The arrows are drawn with Tikz and that's
-% why several compilations may be necessary.
+% \vspace{1cm} 
+% The package \pkg{witharrows} is entirely contained in the file
+% |witharrows.sty|. This file may be put in the current directory or in a
+% |texmf| tree. However, the best is to install \pkg{witharrows} with a TeX
+% distribution such as MiKTeX, TeX Live or MacTeX.
+%
+% \medskip
+% In fact, \pkg{witharrows} may also be used with plain-TeX and, in that case,
+% the only required file is |witharrows.tex|: see p.~\pageref{plain-TeX}. In what
+% follows, we describe the LaTeX package.
+%
+% \medskip
+% This package can be used with |xelatex|, |lualatex|, |pdflatex| but also by
+% the classical workflow |latex|-|dvips|-|ps2pdf| (or Adobe Distiller). This
+% package loads the packages \pkg{l3keys2e}, \pkg{varwidth}, \pkg{tikz} and the
+% Tikz libraries \pkg{arrows.meta} and \pkg{bending}. The final user only has to
+% load the package with the classical instruction: |\usepackage{witharrows}|. 
+% 
+% \medskip
+% The arrows are drawn with Tikz and that's why \textbf{several compilations may
+% be necessary}.\footnote{If you use Overleaf, Overleaf will do automatically
+% the right number of compilations.}
 %
 % \bigskip
 % This package provides an environment |{WithArrows}| to construct alignments of
@@ -267,9 +281,7 @@ version 2005/12/01 or later.
 %
 % \interitem
 % It's possible to use the Tikz option ``|text width|'' to control the width of
-% the text associated to the arrow.\footnote{It's possible to avoid the
-% hyphenations of the words: use the Tikz option ``|align = flush left|'' in
-% LaTeX and ``|align = {flushleft,nothyphenated}|'' in ConTeXt.}
+% the text associated to the arrow.
 % \newcounter{fnnohyphen}
 % \setcounter{fnnohyphen}{\thefootnote}
 %
@@ -543,7 +555,6 @@ version 2005/12/01 or later.
 % \begin{Verbatim}
 % \begin{DispWithArrows*}[~emphase#format = cCcCc@,
 %                         wrap-lines,
-%                         tikz = {align = flush left},
 %                         interline=1mm]
 % k & \;\le\; & t & \;\le\; & k+1 \\
 % \frac{1}{k+1} & \le & \frac{1}{t} & \le & \frac{1}{k} 
@@ -556,7 +567,6 @@ version 2005/12/01 or later.
 % \end{Verbatim}
 % \begin{DispWithArrows*}[format = cCcCc,
 %                         wrap-lines,
-%                         tikz = {align = flush left},
 %                         interline=1mm]
 % k & \;\le\; & t & \;\le\; & k+1 \\
 % \frac{1}{k+1} & \le & \frac{1}{t} & \le & \frac{1}{k} 
@@ -2671,7 +2681,6 @@ version 2005/12/01 or later.
 %
 % 
 % \medskip
-% We use |\seq_set_map_x:NNn| which has been introduced the 2020/07/16.
 %    \begin{macrocode}
 \msg_new:nnn { witharrows } { expl3~too~old }
   {
@@ -2869,7 +2878,7 @@ version 2005/12/01 or later.
 %   |\@ifpackageloaded| in the core of the functions because |\@ifpackageloaded|
 %   is available only in the preamble.}
 %    \begin{macrocode}
-\AtBeginDocument 
+\AtBeginDocument
   { 
     \clist_map_inline:nn
       { 
@@ -3031,11 +3040,10 @@ version 2005/12/01 or later.
  { 
    WithArrows / arrow / .style  = 
      { 
-       align = left ,
+       align = flush~left ,
 %    \end{macrocode}
 %
-% We have put the option |align = left| because we want to give the user the
-% possibility of using |\\| in the labels.
+% Before the version 2.7, it was |align = left|.
 %    \begin{macrocode}
        auto = left ,
 %<*LaTeX>
@@ -3055,7 +3063,7 @@ version 2005/12/01 or later.
 % |\WithArrowsOptions| and |{DispWithArrows}|.
 %    \begin{macrocode}
 %<*LaTeX>
-\AtBeginDocument 
+\AtBeginDocument
   {
     \bool_if:NTF \c_@@_amsmath_loaded_bool
       {
@@ -3073,8 +3081,9 @@ version 2005/12/01 or later.
 % 
 % Nevertheless, we want the extension \pkg{witharrows} available without
 % \pkg{amsmath}. That's why we give a definition of |\spread@equation| if
-% \pkg{amsmath} is not loaded (we put the code in a |\AtBeginDocument| because
-% the flag |\c_@@_amsmath_loaded_bool| is itself set in a |\AtBeginDocument|).
+% \pkg{amsmath} is not loaded (we put the code in the hook |begindocument|
+% because the flag |\c_@@_amsmath_loaded_bool| is itself set in the hook
+% |begindocument|).
 %    \begin{macrocode}
       { 
 %</LaTeX>
@@ -6309,6 +6318,18 @@ version 2005/12/01 or later.
            node [ anchor = west ]
             { 
               \begin { minipage } { \l_tmpa_dim }
+              \tikz@text@action
+              \pgfkeysgetvalue { / tikz / node~halign~header } \l_tmpa_tl
+              \tl_if_eq:NnTF \l_tmpa_tl { \tikz@align@left@header }
+                { \pgfutil@raggedright }
+                {
+                  \tl_if_eq:NnTF \l_tmpa_tl { \tikz@align@right@header }
+                    { \pgfutil@raggedleft }
+                    {
+                      \tl_if_eq:NnT \l_tmpa_tl { \tikz@align@center@header }
+                        { \centering }
+                    }
+                }
               #3 
               \end { minipage }
             } ; 
@@ -7951,6 +7972,11 @@ version 2005/12/01 or later.
 %
 % Version 2.6d: correction of a bug (cf. question 628461 on TeX StackExchange).
 %
+% \subsection*{Changes between 2.6b and 2.7}
+%
+% Correction of a bug: when the key |wrap-lines| was in force, the content of
+% the annotations was not ``flush left'' by default as it should be (but justified).
+%
 % \PrintIndex
 %
 % \tableofcontents
diff --git a/Master/texmf-dist/source/generic/witharrows/witharrows.ins b/Master/texmf-dist/source/generic/witharrows/witharrows.ins
index fb1d7ae5edc..d101deff19c 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-2021 by F. Pantigny
+%% Copyright (C) 2017-2022 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-2021 by F. Pantigny
+Copyright (C) 2017-2022 by F. Pantigny
 
 This file may be distributed and/or modified under the
 conditions of the LaTeX Project Public License, either