summaryrefslogtreecommitdiff
path: root/macros/generic/witharrows/witharrows.dtx
diff options
context:
space:
mode:
Diffstat (limited to 'macros/generic/witharrows/witharrows.dtx')
-rw-r--r--macros/generic/witharrows/witharrows.dtx84
1 files changed, 39 insertions, 45 deletions
diff --git a/macros/generic/witharrows/witharrows.dtx b/macros/generic/witharrows/witharrows.dtx
index 9a4b5067ef..b32e5f62d8 100644
--- a/macros/generic/witharrows/witharrows.dtx
+++ b/macros/generic/witharrows/witharrows.dtx
@@ -15,8 +15,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{2.5}
-\def\myfiledate{2020/06/22}
+\def\myfileversion{2.5.1}
+\def\myfiledate{2020/07/28}
%
%
%<*batchfile>
@@ -162,7 +162,7 @@ version 2005/12/01 or later.
% \end{WithArrows}$
%
% \interitem
-% It's possible to put several arrows which start from the same row.
+% It's possible to put several arrows starting from the same row.
% \begin{Verbatim}
% $\begin{WithArrows}
% A & = \bigl((a+b)+1\bigr)^2 ~emphase#\Arrow{}\Arrow{}[jump=2]@ \\
@@ -1579,7 +1579,7 @@ version 2005/12/01 or later.
% the left margin can be controlled with the option |mathindent| (with a name
% inspired by the parameter |\mathindent| of standard LaTeX\footnote{In LaTeX,
% |mathindent| is a dimension (|dim|) and not a glue (|skip|) but should become
-% a skip in a future version of LaTeX. As for now, the parameter |mathindent| of
+% a skip in a future version of LaTeX. As of now, the parameter |mathindent| of
% \pkg{witharrows} is a dimension.}). The initial value
% of this parameter is 25~pt.
%
@@ -2699,19 +2699,19 @@ version 2005/12/01 or later.
% |{WithArrows}|. Idem for the option |footnotehyper|.
%
% \medskip
-% The boolean |\g_@@_footnotehyper_bool| will indicate if the option
+% The boolean |\c_@@_footnotehyper_bool| will indicate if the option
% |footnotehyper| is used.
% \begin{macrocode}
%<*LaTeX>
-\bool_new:N \g_@@_footnotehyper_bool
+\bool_new:N \c_@@_footnotehyper_bool
% \end{macrocode}
%
% \medskip
-% The boolean |\g_@@_footnote_bool| will indicate if the option |footnote| is
+% The boolean |\c_@@_footnote_bool| will indicate if the option |footnote| is
% used, but quicky, it will also be set to |true| if the option |footnotehyper|
% is used.
% \begin{macrocode}
-\bool_new:N \g_@@_footnote_bool
+\bool_new:N \c_@@_footnote_bool
%</LaTeX>
% \end{macrocode}
%
@@ -2734,8 +2734,8 @@ version 2005/12/01 or later.
%<*LaTeX>
\keys_define:nn { WithArrows / package }
{
- footnote .bool_gset:N = \g_@@_footnote_bool ,
- footnotehyper .bool_gset:N = \g_@@_footnotehyper_bool ,
+ footnote .bool_set:N = \c_@@_footnote_bool ,
+ footnotehyper .bool_set:N = \c_@@_footnotehyper_bool ,
unknown .code:n =
\@@_fatal:n { Option~unknown~for~package }
}
@@ -2793,7 +2793,7 @@ version 2005/12/01 or later.
%
% \medskip
% \begin{macrocode}
-\bool_if:NT \g_@@_footnote_bool
+\bool_if:NT \c_@@_footnote_bool
{
\@ifclassloaded { beamer }
{ \msg_info:nn { witharrows } { Option~incompatible~with~Beamer } }
@@ -2806,7 +2806,7 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \begin{macrocode}
-\bool_if:NT \g_@@_footnotehyper_bool
+\bool_if:NT \c_@@_footnotehyper_bool
{
\@ifclassloaded { beamer }
{ \@@_info:n { Option~incompatible~with~Beamer } }
@@ -2815,11 +2815,11 @@ version 2005/12/01 or later.
{ \@@_error:n { footnotehyper~with~footnote~package } }
{ \usepackage { footnotehyper } }
}
- \bool_gset_true:N \g_@@_footnote_bool
+ \bool_set_true:N \c_@@_footnote_bool
}
% \end{macrocode}
-% The flag |\g_@@_footnote_bool| is raised and so, we will only have to test
-% |\g_@@_footnote_bool| in order to know if we have to insert an environment
+% The flag |\c_@@_footnote_bool| is raised and so, we will only have to test
+% |\c_@@_footnote_bool| in order to know if we have to insert an environment
% |{savenotes}| (the |\begin{savenotes}| is in |\@@_pre_halign:n| and
% |\end{savenotes}| at the end of the environments |{WithArrows}| and
% |{DispWithArrows}|).
@@ -2850,7 +2850,6 @@ version 2005/12/01 or later.
%
%
% \begin{macrocode}
-\cs_generate_variant:Nn \tl_put_right:Nn { N v }
\cs_generate_variant:Nn \seq_set_split:Nnn { N x x }
% \end{macrocode}
%
@@ -2918,22 +2917,14 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \bigskip
-% The following command converts each item of a sequence from |tl| to |str|. It
-% will be used when creating list of keys (a key name is always a |str|).
+% The following command creates a sequence of strings (|str|) from a |clist|. Be
+% careful: we use |\seq_set_map:NNn| and the name of that function will maybe
+% change to |\eq_set_map_x:NNn|.
% \begin{macrocode}
-\cs_new_protected:Npn \@@_convert_to_str_seq:N #1
- {
- \seq_clear:N \l_tmpa_seq
- \seq_map_inline:Nn #1
- {
- \seq_put_left:Nx \l_tmpa_seq { \tl_to_str:n { ##1 } }
- }
- \seq_set_eq:NN #1 \l_tmpa_seq
- }
\cs_new_protected:Npn \@@_set_seq_of_str_from_clist:Nn #1 #2
{
\seq_set_from_clist:Nn #1 { #2 }
- \@@_convert_to_str_seq:N #1
+ \seq_set_map:NNn #1 #1 { \tl_to_str:n { ##1 } }
}
% \end{macrocode}
%
@@ -3686,7 +3677,6 @@ version 2005/12/01 or later.
t, tikz, tikz-code,
xoffset, ygap, ystart
}
-\@@_convert_to_str_seq:N \l_@@_options_WithArrows_seq
% \end{macrocode}
%
% \medskip
@@ -4332,14 +4322,14 @@ version 2005/12/01 or later.
% \pkg{footnote} or the package \pkg{footnotehyper}).
% \begin{macrocode}
%<*LaTeX>
- \bool_if:NT \g_@@_footnote_bool { \begin { savenotes } }
+ \bool_if:NT \c_@@_footnote_bool { \begin { savenotes } }
%</LaTeX>
% \end{macrocode}
%
% \bigskip
% We execute the code |\l_@@_code_before_tl| of the option |code-before| of the
-% environment after the eventual |\begin{savenotes}| and, symetrically, we will
-% execute the |\l_@@_code_after_tl| before the eventual |\end{savenotes}| (we
+% environment after the potential |\begin{savenotes}| and, symetrically, we will
+% execute the |\l_@@_code_after_tl| before the potential |\end{savenotes}| (we
% have a good reason for the last point: we want to extract the footnotes of the
% arrows executed in the |code-after|).
% \begin{macrocode}
@@ -4514,11 +4504,6 @@ version 2005/12/01 or later.
node~contents = { } ,
@@_node_style ,
name = wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - l ,
- alias =
- {
- \str_if_empty:NF \l_@@_name_str
- { \l_@@_name_str - \int_use:N \g_@@_line_int - l }
- }
]
;
\hfil
@@ -4535,13 +4520,19 @@ version 2005/12/01 or later.
node~contents = { } ,
@@_node_style ,
name = wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - r ,
- alias =
- {
- \str_if_empty:NF \l_@@_name_str
- { \l_@@_name_str - \int_use:N \g_@@_line_int - r }
- }
]
;
+ \str_if_empty:NF \l_@@_name_str
+ {
+ \pgfpicture
+ \pgfnodealias
+ { \l_@@_name_str - \int_use:N \g_@@_line_int - l }
+ { wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - l }
+ \pgfnodealias
+ { \l_@@_name_str - \int_use:N \g_@@_line_int - r }
+ { wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - r }
+ \endpgfpicture
+ }
\bool_if:NT \l_@@_show_node_names_bool
{
\hbox_overlap_right:n
@@ -4654,7 +4645,7 @@ version 2005/12/01 or later.
% \pkg{footnote} or the package \pkg{footnotehyper}).
% \begin{macrocode}
%<*LaTeX>
- \bool_if:NT \g_@@_footnote_bool { \end { savenotes } }
+ \bool_if:NT \c_@@_footnote_bool { \end { savenotes } }
%</LaTeX>
%<*plain-TeX>
\group_end:
@@ -4723,7 +4714,7 @@ version 2005/12/01 or later.
% \end{macrocode}
% The command |\MultiArrow| is available in |code-after|, and we have a special
% version of |\Arrow|, called ``|\Arrow| in |code-after|'' in the
-% documentation.\footnote{As for now, |\MultiArrow| has no option, and that's
+% documentation.\footnote{As of now, |\MultiArrow| has no option, and that's
% why its internal name is a name of \pkg{expl3} with the signature |:nn|
% whereas |\Arrow| in |code-after| provides options and has the name of a
% function defined with |\NewDocumentCommand|.}
@@ -5435,7 +5426,7 @@ version 2005/12/01 or later.
% extract the footnotes with an environment |{savenotes}| (of the package
% \pkg{footnote} or the package \pkg{footnotehyper}).
% \begin{macrocode}
- \bool_if:NT \g_@@_footnote_bool { \end { savenotes } }
+ \bool_if:NT \c_@@_footnote_bool { \end { savenotes } }
%</LaTeX>
%<*plain-TeX>
\group_end:
@@ -7892,6 +7883,9 @@ version 2005/12/01 or later.
%
% \pkg{witharrows} now requires and loads \pkg{varwidth}
%
+% \subsection*{Changes between 2.5 and 2.5.1}
+%
+% Correction of the erroneous programmation of the nodes aliases.
%
% \PrintIndex
%