texlive[53089] Master/texmf-dist: witharrows (10dec19)
commits+karl at tug.org
commits+karl at tug.org
Tue Dec 10 23:17:20 CET 2019
Revision: 53089
http://tug.org/svn/texlive?view=revision&revision=53089
Author: karl
Date: 2019-12-10 23:17:20 +0100 (Tue, 10 Dec 2019)
Log Message:
-----------
witharrows (10dec19)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/generic/witharrows/witharrows-french.pdf
trunk/Master/texmf-dist/doc/generic/witharrows/witharrows-french.tex
trunk/Master/texmf-dist/doc/generic/witharrows/witharrows.pdf
trunk/Master/texmf-dist/doc/generic/witharrows/witharrows.tex
trunk/Master/texmf-dist/source/generic/witharrows/witharrows.dtx
trunk/Master/texmf-dist/tex/generic/witharrows/witharrows.sty
Modified: trunk/Master/texmf-dist/doc/generic/witharrows/witharrows-french.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/witharrows/witharrows-french.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/witharrows/witharrows-french.tex 2019-12-10 22:17:04 UTC (rev 53088)
+++ trunk/Master/texmf-dist/doc/generic/witharrows/witharrows-french.tex 2019-12-10 22:17:20 UTC (rev 53089)
@@ -18,7 +18,7 @@
\usetikzlibrary{calc}
\usepackage[only,llbracket,rrbracket]{stmaryrd}
-% We use \MakeShortVerb of shortvrb and not \DefineShortVrb of fancyvrb
+% We use \MakeShortVerb of shortvrb and not \DefineShortVerb of fancyvrb
% because we don't want the contents of short verbatim colored in gray
\usepackage{shortvrb}
\MakeShortVerb{\|}
@@ -32,10 +32,10 @@
\titlespacing*{\section}{0pt}{6.5ex plus 1ex minus .2ex}{4.3ex plus .2ex}
\titlespacing*{\subsection}{0pt}{4.5ex plus 1ex minus .2ex}{2ex plus .2ex}
-\usepackage{fncylab} % à supprimer en 2020
+
\labelformat{equation}{(#1)}
-\def\interitem{\vskip 7mm plus 2 mm minus 3mm}
+\def\interitem{\vspace{7mm plus 2 mm minus 3mm}}
\def\emphase{\bgroup\color{RoyalPurple}\let\next=}
\skip \footins = 2 \bigskipamount
@@ -42,11 +42,13 @@
\usepackage[hyperfootnotes = false]{hyperref}
-\hypersetup{
- pdfinfo = {
- Title = { L’extension witharrows },
- Subject = { Une extension pour plain-TeX et LaTeX } ,
- Author = { F. Pantigny }
+\hypersetup
+ {
+ pdfinfo =
+ {
+ Title = L’extension witharrows ,
+ Subject = Une extension pour plain-TeX et LaTeX ,
+ Author = F. Pantigny
}
}
@@ -122,7 +124,7 @@
l'argument obligatoire.
L'option |jump| indique le nombre\footnote{Il n'est pas possible de donner une valeur négative à |jump|.
-Voir plus loin (p.~\pageref{Backwards}) la manière de tracer une flèche qui remonte.} de rangées que la flèche doit sauter (la valeur par défaut est, bien
+Voir plus loin (p.~\pageref{Backwards}) la manière de tracer une flèche qui remonte.} de rangées que la flèche doit sauter (la valeur initiale est, bien
entendu,~$1$).
@@ -158,7 +160,7 @@
\interitem
L'option |xoffset| décale la flèche vers la droite (habituellement, on ne souhaite pas que les flèches soient
-collées au texte). La valeur par défaut de |xoffset| est de $3$~mm.
+collées au texte). La valeur initiale de |xoffset| est de $3$~mm.
\begin{Verbatim}
$\begin{WithArrows}
A & = \bigl((a+b)+1\bigr)^2
@@ -468,7 +470,7 @@
Jusqu'à présent, nous n'avons utilisé l'environnement |{WithArrows}| qu'avec deux colonnes. Néanmoins, il est
possible de l'utiliser avec un nombre arbitraire de colonnes grâce à l'option |format|. La valeur donnée à cette
option est similaire au préambule d'un environnement |{array}|: il s'agit d'une séquence de lettres |r|, |c| et
-|l|. La valeur par défaut de cette option |format| est, en fait, |rl|.
+|l|. La valeur initiale de cette option |format| est, en fait, |rl|.
\bigskip
@@ -834,7 +836,7 @@
\interitem
De même que l'environnement |{aligned}|, |{WithArrows}| a une option de placement qui peut prendre les valeurs |t|,
-|c| ou |b|. Néanmoins, la valeur par défaut n'est pas |c| mais |t|. Si on le souhaite, il est possible d'avoir la
+|c| ou |b|. Néanmoins, la valeur initiale n'est pas |c| mais |t|. Si on le souhaite, il est possible d'avoir la
valeur |c| comme valeur par défaut en utilisant l'instruction |\WithArrowsOptions{c}| au début du document.
%
\begin{Verbatim}
@@ -1373,7 +1375,7 @@
\bigskip
Avec l'option |fleqn|, l'environnement est composé calé à gauche (d'une manière similaire
à l'option |fleqn| des classes standard de LaTeX). Dans ce cas, la marge gauche peut être réglée avec
-l'option |mathindent| (qui a un nom inspiré du paramètre |\mathindent| de LaTeX). La valeur par défaut
+l'option |mathindent| (qui a un nom inspiré du paramètre |\mathindent| de LaTeX). La valeur initiale
pour cette option est de 25~pt.
\begin{Verbatim}
@@ -1623,11 +1625,11 @@
\end{DispWithArrows}
\interitem
-Dans l'exemple suivant, on sous-numérote les équations d'un système avec l'option |subnumerate| (disponible
+Dans l'exemple suivant, on sous-numérote les équations d'un système avec l'option |subequations| (disponible
quand l'|amsmath| est chargé).
\begin{Verbatim}
-\begin{DispWithArrows}~emphase#< \label{système} (\ref*{système}) \Leftrightarrow >@%
+\begin{DispWithArrows}~emphase#< \label{système} \ref*{système} \Leftrightarrow >@%
[format = l, subequations]
x+y+z = -3 \Arrow[tikz=-,jump=2]{3 equations} \\
xy+xz+yz=-2 \\
@@ -1635,7 +1637,7 @@
\end{DispWithArrows}
\end{Verbatim}
%
-\begin{DispWithArrows}< \label{système} (\ref*{système}) \Leftrightarrow >%
+\begin{DispWithArrows}< \label{système} \ref*{système} \Leftrightarrow >%
[format = l, subequations]
x+y+z = -3 \Arrow[tikz=-,jump=2]{3 équations} \\
xy+xz+yz=-2 \\
@@ -1650,8 +1652,8 @@
\bigskip
On peut souhaiter remplacer l'accolade gauche par un autre délimiteur extensible (gauche). On peut le faire avec
-l'option |replace-left-brace-by|. Par exemple «|replace-left-brace-by = [\enskip|» va composer avec un
-crochet et ajouter aussi un espace de 1~em après le crochet.
+l'option |replace-left-brace-by|. Par exemple, «|replace-left-brace-by = [\enskip|» va composer avec un crochet et
+ajouter aussi un espace de 1~em après le crochet.
\bigskip
\section{Fonctionnalités avancées}
@@ -1789,9 +1791,9 @@
zéro:
\begin{itemize}
\item l'option |ystart| représente la distance verticale entre la ligne de base du
-texte et le début de la flèche (valeur par défaut : $0.4$~ex);
+texte et le début de la flèche (valeur initiale : $0.4$~ex);
\item l'option |ygap| représente la distance verticale entre deux flèches consécutives
-(valeur par défaut : $0.4$~ex).
+(valeur initiale : $0.4$~ex).
\end{itemize}
@@ -1841,7 +1843,7 @@
\bigskip
Voici le comportement par défaut depuis la version 1.13 (les paramètres
-|start-adjust| et |end-ajust| sont utilisés avec la valeur par défaut $0.4$~ex). La flèche
+|start-adjust| et |end-ajust| sont utilisés avec la valeur initiale $0.4$~ex). La flèche
est plus longue et le résultat est plus esthétique.
\medskip
@@ -1866,7 +1868,7 @@
\bigskip
Depuis la version 2.1 de \pkg{witharrows}, une flèche de |jump| égal à~$1$ a une longueur\footnote{On appelle
\emph{longueur} de la flèche la différence entre l'ordonnée du point de départ et l'ordonnée du point d'arrivée.}
-maximale égale au paramètre |max-length-of-arrow|. La valeur par défaut de ce paramètre est égale à~$2$~cm.
+maximale égale au paramètre |max-length-of-arrow|. La valeur initiale de ce paramètre est égale à~$2$~cm.
Dans l'exemple suivant, la valeur de |max-length-of-arrow| a été fixée à $1.5$~cm.
\begin{Verbatim}
@@ -2093,7 +2095,7 @@
environnements imbriqués à l'intérieur).}
\smallskip
-La valeur par défaut de |tikz-code| est |\draw (#1) to node {#3} (#2) ;|
+La valeur initiale de |tikz-code| est |\draw (#1) to node {#3} (#2) ;|
où les trois marqueurs |#1|, |#2| et |#3| représentent le point de départ, le point d'arrivée
et l'étiquette de la flèche.
Modified: trunk/Master/texmf-dist/doc/generic/witharrows/witharrows.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/generic/witharrows/witharrows.tex
===================================================================
--- trunk/Master/texmf-dist/doc/generic/witharrows/witharrows.tex 2019-12-10 22:17:04 UTC (rev 53088)
+++ trunk/Master/texmf-dist/doc/generic/witharrows/witharrows.tex 2019-12-10 22:17:20 UTC (rev 53089)
@@ -18,22 +18,22 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\def\myfileversion{2.1}
-\def\myfiledate{2019/10/21}
+\def\myfileversion{2.2}
+\def\myfiledate{2019/12/10}
\input tikz.tex
\input expl3-generic.tex
\usetikzlibrary{arrows.meta,bending}
\ExplSyntaxOn
\catcode `\@ = 11
-\cs_new_protected:Npn \__wa_msg_new:nn { \msg_new:nnn { witharrows } }
-\cs_new_protected:Npn \__wa_msg_new:nnn { \msg_new:nnnn { witharrows } }
-\cs_new_protected:Npn \__wa_msg_redirect_name:nn
+\cs_new_protected:Npn \@@_msg_new:nn { \msg_new:nnn { witharrows } }
+\cs_new_protected:Npn \@@_msg_new:nnn { \msg_new:nnnn { witharrows } }
+\cs_new_protected:Npn \@@_msg_redirect_name:nn
{ \msg_redirect_name:nnn { witharrows } }
-\cs_new_protected:Npn \__wa_error:n { \msg_error:nn { witharrows } }
-\cs_new_protected:Npn \__wa_warning:n { \msg_warning:nn { witharrows } }
-\cs_new_protected:Npn \__wa_fatal:n { \msg_fatal:nn { witharrows } }
-\cs_new_protected:Npn \__wa_error:nn { \msg_error:nnn { witharrows } }
-\cs_generate_variant:Nn \__wa_error:nn { n x }
+\cs_new_protected:Npn \@@_error:n { \msg_error:nn { witharrows } }
+\cs_new_protected:Npn \@@_warning:n { \msg_warning:nn { witharrows } }
+\cs_new_protected:Npn \@@_fatal:n { \msg_fatal:nn { witharrows } }
+\cs_new_protected:Npn \@@_error:nn { \msg_error:nnn { witharrows } }
+\cs_generate_variant:Nn \@@_error:nn { n x }
\cs_generate_variant:Nn \tl_put_right:Nn { N v }
\cs_generate_variant:Nn \seq_set_split:Nnn { N x x }
\AtBeginDocument
@@ -44,26 +44,26 @@
typedref, unicode-math, varwidth
}
{
- \bool_new:c { c__wa_#1_loaded_bool }
- \bool_set_false:c { c__wa_#1_loaded_bool }
+ \bool_new:c { c_@@_#1_loaded_bool }
+ \bool_set_false:c { c_@@_#1_loaded_bool }
}
}
\sys_if_engine_luatex:TF
{
- \cs_new_protected:Npn \__wa_strcmp:nn #1 #2
+ \cs_new_protected:Npn \@@_strcmp:nn #1 #2
{ \lua_now:e { l3kernel.strcmp('#1','#2') } }
}
{
- \cs_new_protected:Npn \__wa_strcmp:nn #1 #2
+ \cs_new_protected:Npn \@@_strcmp:nn #1 #2
{ \tex_strcmp:D { #1 } { #2 } }
}
-\cs_new_protected:Npn \__wa_sort_seq:N #1
+\cs_new_protected:Npn \@@_sort_seq:N #1
{
\seq_sort:Nn #1
{
\int_compare:nNnTF
{
- \__wa_strcmp:nn
+ \@@_strcmp:nn
{ \str_lower_case:n { ##1 } }
{ \str_lower_case:n { ##2 } }
}
@@ -72,7 +72,7 @@
\sort_return_same:
}
}
-\cs_new_protected:Npn \__wa_convert_to_str_seq:N #1
+\cs_new_protected:Npn \@@_convert_to_str_seq:N #1
{
\seq_clear:N \l_tmpa_seq
\seq_map_inline:Nn #1
@@ -81,12 +81,12 @@
}
\seq_set_eq:NN #1 \l_tmpa_seq
}
-\cs_new_protected:Npn \__wa_set_seq_of_str_from_clist:Nn #1 #2
+\cs_new_protected:Npn \@@_set_seq_of_str_from_clist:Nn #1 #2
{
\seq_set_from_clist:Nn #1 { #2 }
- \__wa_convert_to_str_seq:N #1
+ \@@_convert_to_str_seq:N #1
}
-\cs_new_protected:Npn \__wa_save:N #1
+\cs_new_protected:Npn \@@_save:N #1
{
\seq_set_split:Nxx \l_tmpa_seq
{ \char_generate:nn { `_ } { 12 } }
@@ -102,7 +102,7 @@
\use:c { \l_tmpa_str _gset_eq:cN }
{ g _\seq_use:Nnnn \l_tmpa_seq _ _ _ } #1
}
-\cs_new_protected:Npn \__wa_restore:N #1
+\cs_new_protected:Npn \@@_restore:N #1
{
\seq_set_split:Nxx \l_tmpa_seq
{ \char_generate:nn { `_ } { 12 } }
@@ -114,21 +114,21 @@
}
\tikzset
{
- __wa_node_style / .style =
+ @@_node_style / .style =
{
- above = \l__wa_ystart_dim ,
+ above = \l_@@_ystart_dim ,
inner~sep = \c_zero_dim ,
minimum~width = \c_zero_dim ,
- minimum~height = \l__wa_ygap_dim
+ minimum~height = \l_@@_ygap_dim
}
}
\tikzset
{
- __wa_standard / .style =
+ @@_standard / .style =
{
remember~picture ,
overlay ,
- name~prefix = wa - \l__wa_prefix_str -
+ name~prefix = wa - \l_@@_prefix_str -
}
}
\tikzset
@@ -152,161 +152,163 @@
\openup \jot
\cs_set_eq:NN \spread at equation \prg_do_nothing:
}
-\tl_new:N \l__wa_left_brace_tl
-\tl_set_eq:NN \l__wa_left_brace_tl \c_novalue_tl
-\bool_new:N \l__wa_in_WithArrows_bool
-\bool_new:N \l__wa_in_DispWithArrows_bool
-\bool_new:N \l__wa_in_code_after_bool
-\seq_new:N \g__wa_position_in_the_tree_seq
-\seq_gput_right:Nn \g__wa_position_in_the_tree_seq 1
-\int_new:N \g__wa_last_env_int
-\int_new:N \l__wa_pos_env_int
-\int_new:N \l__wa_pos_arrow_int
-\int_set:Nn \l__wa_pos_arrow_int 3
-\seq_new:N \g__wa_arrow_int_seq
-\int_new:N \g__wa_arrow_int
-\seq_new:N \g__wa_line_int_seq
-\int_new:N \g__wa_line_int
-\seq_new:N \g__wa_col_int_seq
-\int_new:N \g__wa_col_int
-\str_new:N \l__wa_command_name_str
-\str_set:Nn \l__wa_command_name_str { Arrow }
-\str_new:N \l__wa_string_Arrow_for_msg_str
-\str_set:Nx \l__wa_string_Arrow_for_msg_str { \token_to_str:N \Arrow }
-\seq_new:N \g__wa_names_seq
-\bool_new:N \l__wa_in_first_columns_bool
-\bool_new:N \l__wa_new_group_bool
-\bool_new:N \l__wa_initial_r_bool
-\bool_new:N \l__wa_final_r_bool
-\tl_new:N \l__wa_initial_tl
-\tl_new:N \l__wa_final_tl
-\int_new:N \l__wa_nb_cols_int
-\str_new:N \l__wa_format_str
-\cs_new_protected:Npn \__wa_eval_if_allowed:n #1
+\tl_new:N \l_@@_left_brace_tl
+\tl_set_eq:NN \l_@@_left_brace_tl \c_novalue_tl
+\bool_new:N \l_@@_in_WithArrows_bool
+\bool_new:N \l_@@_in_DispWithArrows_bool
+\bool_new:N \l_@@_in_code_after_bool
+\seq_new:N \g_@@_position_in_the_tree_seq
+\seq_gput_right:Nn \g_@@_position_in_the_tree_seq 1
+\int_new:N \g_@@_last_env_int
+\int_new:N \l_@@_pos_env_int
+\int_new:N \l_@@_pos_arrow_int
+\int_set:Nn \l_@@_pos_arrow_int 3
+\seq_new:N \g_@@_arrow_int_seq
+\int_new:N \g_@@_arrow_int
+\seq_new:N \g_@@_line_int_seq
+\int_new:N \g_@@_line_int
+\seq_new:N \g_@@_col_int_seq
+\int_new:N \g_@@_col_int
+\seq_new:N \g_@@_static_col_int_seq
+\int_new:N \g_@@_static_col_int
+\str_new:N \l_@@_command_name_str
+\str_set:Nn \l_@@_command_name_str { Arrow }
+\str_new:N \l_@@_string_Arrow_for_msg_str
+\str_set:Nx \l_@@_string_Arrow_for_msg_str { \token_to_str:N \Arrow }
+\seq_new:N \g_@@_names_seq
+\bool_new:N \l_@@_in_first_columns_bool
+\bool_new:N \l_@@_new_group_bool
+\bool_new:N \l_@@_initial_r_bool
+\bool_new:N \l_@@_final_r_bool
+\tl_new:N \l_@@_initial_tl
+\tl_new:N \l_@@_final_tl
+\int_new:N \l_@@_nb_cols_int
+\str_new:N \l_@@_format_str
+\cs_new_protected:Npn \@@_eval_if_allowed:n #1
{
- \str_if_empty:NTF \l__wa_previous_key_str
+ \str_if_empty:NTF \l_@@_previous_key_str
{
- \str_set_eq:NN \l__wa_previous_key_str \l_keys_key_tl
+ \str_set_eq:NN \l_@@_previous_key_str \l_keys_key_tl
#1
}
- { \__wa_error:n { Incompatible~options } }
+ { \@@_error:n { Incompatible~options } }
}
-\cs_new_protected:Npn \__wa_fix_pos_option:n #1
- { \__wa_eval_if_allowed:n { \int_set:Nn \l__wa_pos_arrow_int { #1 } } }
+\cs_new_protected:Npn \@@_fix_pos_option:n #1
+ { \@@_eval_if_allowed:n { \int_set:Nn \l_@@_pos_arrow_int { #1 } } }
\keys_define:nn { WithArrows / Global }
{
- max-length-of-arrow .dim_set:N = \l__wa_max_length_of_arrow_dim ,
+ max-length-of-arrow .dim_set:N = \l_@@_max_length_of_arrow_dim ,
max-length-of-arrow .value_required:n = true ,
max-length-of-arrow .initial:n = 2 cm ,
- ygap .dim_set:N = \l__wa_ygap_dim ,
+ ygap .dim_set:N = \l_@@_ygap_dim ,
ygap .value_required:n = true ,
ygap .initial:n = 0.4 ex ,
- ystart .dim_set:N = \l__wa_ystart_dim ,
+ ystart .dim_set:N = \l_@@_ystart_dim ,
ystart .value_required:n = true ,
ystart .initial:n = 0.4 ex ,
more-columns .code:n =
- \__wa_msg_redirect_name:nn { Too~much~columns~in~WithArrows } { none } ,
+ \@@_msg_redirect_name:nn { Too~much~columns~in~WithArrows } { none } ,
more-columns .value_forbidden:n = true,
command-name .code:n =
- \str_set:Nn \l__wa_command_name_str { #1 }
- \str_set:Nx \l__wa_string_Arrow_for_msg_str
+ \str_set:Nn \l_@@_command_name_str { #1 }
+ \str_set:Nx \l_@@_string_Arrow_for_msg_str
{ \c_backslash_str Arrow~alias~\c_backslash_str #1 } ,
command-name .value_required:n = true ,
- tikz-code .tl_set:N = \l__wa_tikz_code_tl,
+ tikz-code .tl_set:N = \l_@@_tikz_code_tl,
tikz-code .initial:n = \draw~(#1)~to~node{#3}~(#2)~; ,
tikz-code .value_required:n = true ,
TikzCode .meta:n = { tikz-code = #1 } ,
- displaystyle .bool_set:N = \l__wa_displaystyle_bool ,
+ displaystyle .bool_set:N = \l_@@_displaystyle_bool ,
displaystyle .default:n = true ,
show-nodes .code:n =
- \tikzset { __wa_node_style / .append~style = { draw , red } } ,
+ \tikzset { @@_node_style / .append~style = { draw , red } } ,
show-nodes .value_forbidden:n = true,
- show-node-names .bool_set:N = \l__wa_show_node_names_bool ,
+ show-node-names .bool_set:N = \l_@@_show_node_names_bool ,
show-node-names .default:n = true ,
group .code:n =
- \str_if_empty:NTF \l__wa_previous_key_str
+ \str_if_empty:NTF \l_@@_previous_key_str
{
- \str_set:Nn \l__wa_previous_key_str { group }
- \seq_remove_all:Nn \l__wa_options_Arrow_seq { xoffset }
- \int_set:Nn \l__wa_pos_arrow_int 7
+ \str_set:Nn \l_@@_previous_key_str { group }
+ \seq_remove_all:Nn \l_@@_options_Arrow_seq { xoffset }
+ \int_set:Nn \l_@@_pos_arrow_int 7
}
- { \__wa_error:n { Incompatible~options } } ,
+ { \@@_error:n { Incompatible~options } } ,
group .value_forbidden:n = true ,
groups .code:n =
- \str_if_empty:NTF \l__wa_previous_key_str
+ \str_if_empty:NTF \l_@@_previous_key_str
{
- \str_set:Nn \l__wa_previous_key_str { groups }
- \seq_if_in:NnF \l__wa_options_Arrow_seq { new-group }
- { \seq_put_right:Nn \l__wa_options_Arrow_seq { new-group } }
- \seq_remove_all:Nn \l__wa_options_Arrow_seq { xoffset }
- \int_set:Nn \l__wa_pos_arrow_int 6
+ \str_set:Nn \l_@@_previous_key_str { groups }
+ \seq_if_in:NnF \l_@@_options_Arrow_seq { new-group }
+ { \seq_put_right:Nn \l_@@_options_Arrow_seq { new-group } }
+ \seq_remove_all:Nn \l_@@_options_Arrow_seq { xoffset }
+ \int_set:Nn \l_@@_pos_arrow_int 6
}
- { \__wa_error:n { Incompatible~options } } ,
+ { \@@_error:n { Incompatible~options } } ,
groups .value_forbidden:n = true ,
tikz .code:n = \tikzset { WithArrows / arrow / .append~style = { #1 } } ,
tikz .initial:n = \c_empty_tl ,
tikz .value_required:n = true ,
rr .value_forbidden:n = true ,
- rr .code:n = \__wa_fix_pos_option:n 3 ,
+ rr .code:n = \@@_fix_pos_option:n 3 ,
ll .value_forbidden:n = true ,
- ll .code:n = \__wa_fix_pos_option:n 1 ,
+ ll .code:n = \@@_fix_pos_option:n 1 ,
rl .value_forbidden:n = true ,
- rl .code:n = \__wa_fix_pos_option:n 2 ,
+ rl .code:n = \@@_fix_pos_option:n 2 ,
lr .value_forbidden:n = true ,
- lr .code:n = \__wa_fix_pos_option:n 0 ,
+ lr .code:n = \@@_fix_pos_option:n 0 ,
i .value_forbidden:n = true ,
- i .code:n = \__wa_fix_pos_option:n 5 ,
- xoffset .dim_set:N = \l__wa_xoffset_dim ,
+ i .code:n = \@@_fix_pos_option:n 5 ,
+ xoffset .dim_set:N = \l_@@_xoffset_dim ,
xoffset .value_required:n = true ,
xoffset .initial:n = 3 mm ,
jot .dim_set:N = \jot ,
jot .value_required:n = true ,
- interline .skip_set:N = \l__wa_interline_skip ,
+ interline .skip_set:N = \l_@@_interline_skip ,
interline .value_required:n = true ,
- start-adjust .dim_set:N = \l__wa_start_adjust_dim ,
+ start-adjust .dim_set:N = \l_@@_start_adjust_dim ,
start-adjust .value_required:n = true ,
start-adjust .initial:n = 0.4 ex ,
- end-adjust .dim_set:N = \l__wa_end_adjust_dim ,
+ end-adjust .dim_set:N = \l_@@_end_adjust_dim ,
end-adjust .value_required:n = true ,
end-adjust .initial:n = 0.4 ex ,
adjust .meta:n = { start-adjust = #1 , end-adjust = #1 } ,
adjust .value_required:n = true ,
no-arrows .code:n =
- \cs_set_eq:NN \__wa_draw_arrows:nn \use_none:nn
- \cs_set_eq:NN \__wa_draw_arrow:nnn \use_none:nnn ,
+ \cs_set_eq:NN \@@_draw_arrows:nn \use_none:nn
+ \cs_set_eq:NN \@@_draw_arrow:nnn \use_none:nnn ,
no-arrows .value_forbidden:n = true ,
}
\keys_define:nn { WithArrows / WithArrowsSpecific }
{
- t .code:n = \int_set:Nn \l__wa_pos_env_int O ,
+ t .code:n = \int_set:Nn \l_@@_pos_env_int O ,
t .value_forbidden:n = true ,
- c .code:n = \int_set:Nn \l__wa_pos_env_int 1 ,
+ c .code:n = \int_set:Nn \l_@@_pos_env_int 1 ,
c .value_forbidden:n = true ,
- b .code:n = \int_set:Nn \l__wa_pos_env_int 2 ,
+ b .code:n = \int_set:Nn \l_@@_pos_env_int 2 ,
b .value_forbidden:n = true
}
-\clist_new:N \c__wa_extensible_delimiters_clist
-\clist_set:Nn \c__wa_extensible_delimiters_clist
+\clist_new:N \c_@@_extensible_delimiters_clist
+\clist_set:Nn \c_@@_extensible_delimiters_clist
{
., \{, (, [, \lbrace, \lbrack, \lgroup, \langle, \lmoustache, \lceil, \lfloor
}
\keys_define:nn { WithArrows / DispWithArrowsSpecific }
{
- fleqn .bool_set:N = \l__wa_fleqn_bool ,
+ fleqn .bool_set:N = \l_@@_fleqn_bool ,
fleqn .default:n = true ,
- mathindent .dim_set:N = \l__wa_mathindent_dim ,
+ mathindent .dim_set:N = \l_@@_mathindent_dim ,
mathindent .value_required:n = true ,
mathindent .initial:n = 25 pt ,
- wrap-lines .bool_set:N = \l__wa_wrap_lines_bool ,
+ wrap-lines .bool_set:N = \l_@@_wrap_lines_bool ,
wrap-lines .default:n = true ,
replace-left-brace-by .code:n =
{
\tl_set:Nx \l_tmpa_tl { \tl_head:n { #1 } }
\clist_if_in:NVTF
- \c__wa_extensible_delimiters_clist
+ \c_@@_extensible_delimiters_clist
\l_tmpa_tl
- { \tl_set:Nn \l__wa_replace_left_brace_by_tl { #1 } }
- { \__wa_error:n { Bad~value~for~replace~brace~by } }
+ { \tl_set:Nn \l_@@_replace_left_brace_by_tl { #1 } }
+ { \@@_error:n { Bad~value~for~replace~brace~by } }
} ,
replace-left-brace-by .initial:n = \lbrace ,
}
@@ -314,24 +316,24 @@
{
name .code:n =
\str_set:Nn \l_tmpa_str { #1 }
- \seq_if_in:NVTF \g__wa_names_seq \l_tmpa_str
- { \__wa_error:n { Duplicate~name } }
- { \seq_gput_left:NV \g__wa_names_seq \l_tmpa_str }
- \str_set_eq:NN \l__wa_name_str \l_tmpa_str ,
+ \seq_if_in:NVTF \g_@@_names_seq \l_tmpa_str
+ { \@@_error:n { Duplicate~name } }
+ { \seq_gput_left:NV \g_@@_names_seq \l_tmpa_str }
+ \str_set_eq:NN \l_@@_name_str \l_tmpa_str ,
name .value_required:n = true ,
- code-before .code:n = \tl_put_right:Nn \l__wa_code_before_tl { #1 } ,
+ code-before .code:n = \tl_put_right:Nn \l_@@_code_before_tl { #1 } ,
code-before .value_required:n = true,
CodeBefore .meta:n = { code-before = #1 } ,
- code-after .code:n = \tl_put_right:Nn \l__wa_code_after_tl { #1 } ,
+ code-after .code:n = \tl_put_right:Nn \l_@@_code_after_tl { #1 } ,
code-after .value_required:n = true ,
CodeAfter .meta:n = { code-after = #1 } ,
format .code:n =
\tl_if_empty:nTF { #1 }
- { \__wa_error:n { Invalid~option~format } }
+ { \@@_error:n { Invalid~option~format } }
{
\regex_match:nnTF { \A[rcl]*\Z } { #1 }
- { \tl_set:Nn \l__wa_format_str { #1 } }
- { \__wa_error:n { Invalid~option~format } }
+ { \tl_set:Nn \l_@@_format_str { #1 } }
+ { \@@_error:n { Invalid~option~format } }
} ,
format .value_required:n = true ,
}
@@ -356,8 +358,8 @@
WithArrows / DispWithArrowsSpecific
}
}
-\seq_new:N \l__wa_options_WithArrows_seq
-\__wa_set_seq_of_str_from_clist:Nn \l__wa_options_WithArrows_seq
+\seq_new:N \l_@@_options_WithArrows_seq
+\@@_set_seq_of_str_from_clist:Nn \l_@@_options_WithArrows_seq
{
adjust, b, c, code-after, code-before, command-name,
displaystyle, end-adjust,
@@ -369,22 +371,22 @@
t, tikz, tikz-code,
xoffset, ygap, ystart
}
-\__wa_convert_to_str_seq:N \l__wa_options_WithArrows_seq
+\@@_convert_to_str_seq:N \l_@@_options_WithArrows_seq
\keys_define:nn { WithArrows / WithArrows }
{
unknown .code:n =
- \__wa_sort_seq:N \l__wa_options_WithArrows_seq
- \__wa_error:n { Unknown~option~WithArrows }
+ \@@_sort_seq:N \l_@@_options_WithArrows_seq
+ \@@_error:n { Unknown~option~WithArrows }
}
\keys_define:nn { WithArrows / DispWithArrows }
{
- left-brace .tl_set:N = \l__wa_left_brace_tl ,
+ left-brace .tl_set:N = \l_@@_left_brace_tl ,
unknown .code:n =
- \__wa_sort_seq:N \l__wa_options_DispWithArrows_seq
- \__wa_error:n { Unknown~option~DispWithArrows }
+ \@@_sort_seq:N \l_@@_options_DispWithArrows_seq
+ \@@_error:n { Unknown~option~DispWithArrows }
}
-\seq_new:N \l__wa_options_DispWithArrows_seq
-\__wa_set_seq_of_str_from_clist:Nn \l__wa_options_DispWithArrows_seq
+\seq_new:N \l_@@_options_DispWithArrows_seq
+\@@_set_seq_of_str_from_clist:Nn \l_@@_options_DispWithArrows_seq
{
code-after, code-before, command-name, tikz-code, adjust,
displaystyle, end-adjust, fleqn, group, format, groups, i, interline, jot,
@@ -395,14 +397,14 @@
\keys_define:nn { WithArrows / WithArrowsOptions }
{
allow-duplicate-names .code:n =
- \__wa_msg_redirect_name:nn { Duplicate~name } { none } ,
+ \@@_msg_redirect_name:nn { Duplicate~name } { none } ,
allow-duplicate-names .value_forbidden:n = true ,
unknown .code:n =
- \__wa_sort_seq:N \l__wa_options_WithArrowsOptions_seq
- \__wa_error:n { Unknown~option~WithArrowsOptions }
+ \@@_sort_seq:N \l_@@_options_WithArrowsOptions_seq
+ \@@_error:n { Unknown~option~WithArrowsOptions }
}
-\seq_new:N \l__wa_options_WithArrowsOptions_seq
-\__wa_set_seq_of_str_from_clist:Nn \l__wa_options_WithArrowsOptions_seq
+\seq_new:N \l_@@_options_WithArrowsOptions_seq
+\@@_set_seq_of_str_from_clist:Nn \l_@@_options_WithArrowsOptions_seq
{
allow-duplicate-names, b, c, command-name, more-columns, tikz-code, adjust,
displaystyle, end-adjust, fleqn, group, groups, i, interline, jot, ll, lr,
@@ -409,29 +411,29 @@
mathindent, max-length-of-arrow, no-arrows, rl, rr, show-node-names,
show-nodes, start-adjust, t, tikz, wrap-lines, xoffset, ygap, ystart,
}
-\cs_new_protected:Npn \__wa_set_independent:
+\cs_new_protected:Npn \@@_set_independent:
{
- \str_if_empty:NTF \l__wa_previous_key_str
+ \str_if_empty:NTF \l_@@_previous_key_str
{
- \str_set_eq:NN \l__wa_previous_key_str \l_keys_key_tl
- \str_set:Nn \l__wa_status_arrow_str { independent }
+ \str_set_eq:NN \l_@@_previous_key_str \l_keys_key_tl
+ \str_set:Nn \l_@@_status_arrow_str { independent }
\str_if_eq:VnF \l_keys_value_tl { NoValue }
- { \__wa_error:n { Value~for~a~key } }
+ { \@@_error:n { Value~for~a~key } }
}
- { \__wa_error:n { Incompatible~options~in~Arrow } }
+ { \@@_error:n { Incompatible~options~in~Arrow } }
}
\keys_define:nn { WithArrows / Arrow / FirstPass }
{
jump .code:n =
\int_compare:nTF { #1 > 0 }
- { \int_set:Nn \l__wa_jump_int { #1 } }
- { \__wa_error:n { Negative~jump } } ,
+ { \int_set:Nn \l_@@_jump_int { #1 } }
+ { \@@_error:n { Negative~jump } } ,
jump .value_required:n = true,
- rr .code:n = \__wa_set_independent: ,
- ll .code:n = \__wa_set_independent: ,
- rl .code:n = \__wa_set_independent: ,
- lr .code:n = \__wa_set_independent: ,
- i .code:n = \__wa_set_independent: ,
+ rr .code:n = \@@_set_independent: ,
+ ll .code:n = \@@_set_independent: ,
+ rl .code:n = \@@_set_independent: ,
+ lr .code:n = \@@_set_independent: ,
+ i .code:n = \@@_set_independent: ,
rr .default:n = NoValue ,
ll .default:n = NoValue ,
rl .default:n = NoValue ,
@@ -439,9 +441,9 @@
i .default:n = NoValue ,
new-group .value_forbidden:n = true,
new-group .code:n =
- \int_compare:nTF { \l__wa_pos_arrow_int = 6 }
- { \str_set:Nn \l__wa_status_arrow_str { new-group } }
- { \__wa_error:n { new-group~without~groups } } ,
+ \int_compare:nTF { \l_@@_pos_arrow_int = 6 }
+ { \str_set:Nn \l_@@_status_arrow_str { new-group } }
+ { \@@_error:n { new-group~without~groups } } ,
tikz-code .code:n = \prg_do_nothing: ,
tikz-code .value_required:n = true ,
tikz .code:n = \prg_do_nothing: ,
@@ -454,207 +456,208 @@
adjust .value_required:n = true ,
xoffset .code:n = ,
unknown .code:n =
- \__wa_sort_seq:N \l__wa_options_Arrow_seq
- \seq_if_in:NVTF \l__wa_options_WithArrows_seq \l_keys_key_tl
+ \@@_sort_seq:N \l_@@_options_Arrow_seq
+ \seq_if_in:NVTF \l_@@_options_WithArrows_seq \l_keys_key_tl
{
\str_set:Nn \l_tmpa_str
{ ~However,~this~key~can~be~used~in~the~options~of~{WithArrows}. }
}
{ \str_clear:N \l_tmpa_str }
- \__wa_error:n { Unknown~option~in~Arrow }
+ \@@_error:n { Unknown~option~in~Arrow }
}
-\seq_new:N \l__wa_options_Arrow_seq
-\__wa_set_seq_of_str_from_clist:Nn \l__wa_options_Arrow_seq
+\seq_new:N \l_@@_options_Arrow_seq
+\@@_set_seq_of_str_from_clist:Nn \l_@@_options_Arrow_seq
{
adjust, end-adjust, i, jump, ll, lr, rl, rr, start-adjust, tikz, tikz-code,
xoffset
}
-\cs_new_protected:Npn \__wa_fix_pos_arrow:n #1
+\cs_new_protected:Npn \@@_fix_pos_arrow:n #1
{
- \str_if_empty:NT \l__wa_previous_key_str
+ \str_if_empty:NT \l_@@_previous_key_str
{
- \str_set_eq:NN \l__wa_previous_key_str \l_keys_key_tl
- \int_set:Nn \l__wa_pos_arrow_int { #1 }
+ \str_set_eq:NN \l_@@_previous_key_str \l_keys_key_tl
+ \int_set:Nn \l_@@_pos_arrow_int { #1 }
}
}
\keys_define:nn {WithArrows / Arrow / SecondPass }
{
- tikz-code .tl_set:N = \l__wa_tikz_code_tl ,
+ tikz-code .tl_set:N = \l_@@_tikz_code_tl ,
tikz-code .initial:n = \draw~(#1)~to~node{#3}~(#2)~; ,
tikz .code:n = \tikzset { WithArrows / arrow / .append~style = { #1 } } ,
tikz .initial:n = \c_empty_tl ,
- rr .code:n = \__wa_fix_pos_arrow:n 3 ,
- ll .code:n = \__wa_fix_pos_arrow:n 1 ,
- rl .code:n = \__wa_fix_pos_arrow:n 2 ,
- lr .code:n = \__wa_fix_pos_arrow:n 0 ,
- i .code:n = \__wa_fix_pos_arrow:n 5 ,
+ rr .code:n = \@@_fix_pos_arrow:n 3 ,
+ ll .code:n = \@@_fix_pos_arrow:n 1 ,
+ rl .code:n = \@@_fix_pos_arrow:n 2 ,
+ lr .code:n = \@@_fix_pos_arrow:n 0 ,
+ i .code:n = \@@_fix_pos_arrow:n 5 ,
xoffset .code:n =
\bool_if:nTF
{
- \int_compare_p:nNn \g__wa_arrow_int > 1
+ \int_compare_p:nNn \g_@@_arrow_int > 1
&&
- \int_compare_p:nNn \l__wa_pos_arrow_int > 5
+ \int_compare_p:nNn \l_@@_pos_arrow_int > 5
&&
- ! \str_if_eq_p:Vn \l__wa_status_arrow_str { independent }
+ ! \str_if_eq_p:Vn \l_@@_status_arrow_str { independent }
}
- { \__wa_error:n { Option~xoffset~forbidden } }
- { \dim_set:Nn \l__wa_xoffset_dim { #1 } } ,
+ { \@@_error:n { Option~xoffset~forbidden } }
+ { \dim_set:Nn \l_@@_xoffset_dim { #1 } } ,
xoffset .value_required:n = true ,
- start-adjust .dim_set:N = \l__wa_start_adjust_dim,
- end-adjust .dim_set:N = \l__wa_end_adjust_dim,
+ start-adjust .dim_set:N = \l_@@_start_adjust_dim,
+ end-adjust .dim_set:N = \l_@@_end_adjust_dim,
adjust .code:n =
- \dim_set:Nn \l__wa_start_adjust_dim { #1 }
- \dim_set:Nn \l__wa_end_adjust_dim { #1 } ,
+ \dim_set:Nn \l_@@_start_adjust_dim { #1 }
+ \dim_set:Nn \l_@@_end_adjust_dim { #1 } ,
}
\cs_set_protected:Npn \WithArrowsOptions #1
{
- \str_clear_new:N \l__wa_previous_key_str
+ \str_clear_new:N \l_@@_previous_key_str
\keys_set:nn { WithArrows / WithArrowsOptions } { #1 }
}
-\cs_new_protected:Npn \__wa_Arrow
+\cs_new_protected:Npn \@@_Arrow
{
\peek_meaning:NTF [
- { \__wa_Arrow_i }
- { \__wa_Arrow_i [ ] }
+ { \@@_Arrow_i }
+ { \@@_Arrow_i [ ] }
}
-\cs_new_protected:Npn \__wa_Arrow_i [ #1 ] #2
+\cs_new_protected:Npn \@@_Arrow_i [ #1 ] #2
{
\peek_meaning:NTF [
- { \__wa_Arrow_ii [ #1 ] { #2 } }
- { \__wa_Arrow_ii [ #1 ] { #2 } [ ] }
+ { \@@_Arrow_ii [ #1 ] { #2 } }
+ { \@@_Arrow_ii [ #1 ] { #2 } [ ] }
}
-\cs_new_protected:Npn \__wa_Arrow_ii [ #1 ] #2 [ #3 ]
+\cs_new_protected:Npn \@@_Arrow_ii [ #1 ] #2 [ #3 ]
{
- \int_gincr:N \g__wa_arrow_int
- \str_clear_new:N \l__wa_previous_key_str
+ \int_gincr:N \g_@@_arrow_int
+ \str_clear_new:N \l_@@_previous_key_str
\keys_set:nn { WithArrows / Arrow / FirstPass } { #1 , #3 }
- \prop_put:NnV \l_tmpa_prop { initial } \g__wa_line_int
- \int_set:Nn \l_tmpa_int { \g__wa_line_int + \l__wa_jump_int }
+ \prop_put:NnV \l_tmpa_prop { initial } \g_@@_line_int
+ \int_set:Nn \l_tmpa_int { \g_@@_line_int + \l_@@_jump_int }
\prop_put:NnV \l_tmpa_prop { final } \l_tmpa_int
- \prop_put:NnV \l_tmpa_prop { status } \l__wa_status_arrow_str
+ \prop_put:NnV \l_tmpa_prop { status } \l_@@_status_arrow_str
\prop_put:Nnn \l_tmpa_prop { options } { #1 , #3 }
\prop_put:Nnn \l_tmpa_prop { label } { #2 }
\prop_put:Nnx \l_tmpa_prop { input-line } \msg_line_number:
\prop_gclear_new:c
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \g__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \g_@@_arrow_int _ prop }
\prop_gset_eq:cN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \g__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \g_@@_arrow_int _ prop }
\l_tmpa_prop
}
-\cs_new_protected:Npn \__wa_Arrow_first_columns:
- { \__wa_error:n { Arrow~not~in~last~column } \__wa_Arrow }
-\cs_new_protected:Npn \__wa_pre_halign:n #1
+\cs_new_protected:Npn \@@_Arrow_first_columns:
+ { \@@_error:n { Arrow~not~in~last~column } \@@_Arrow }
+\cs_new_protected:Npn \@@_pre_halign:n #1
{
\cs_if_exist:NT \tikz at library@external at loaded
{ \tikzset { external / export = false } }
- \str_clear_new:N \l__wa_name_str
- \str_clear_new:N \l__wa_status_arrow_str
- \dim_zero_new:N \l__wa_x_dim
- \str_clear_new:N \l__wa_input_line_str
- \seq_gput_right:NV \g__wa_arrow_int_seq \g__wa_arrow_int
- \int_gzero:N \g__wa_arrow_int
- \seq_gput_right:NV \g__wa_line_int_seq \g__wa_line_int
- \int_gzero:N \g__wa_line_int
- \seq_gput_right:NV \g__wa_col_int_seq \g__wa_col_int
- \int_gzero:N \g__wa_col_int
- \int_gzero_new:N \g__wa_static_col_int
- \seq_gput_right:Nn \g__wa_position_in_the_tree_seq 1
- \seq_set_eq:NN \l_tmpa_seq \g__wa_position_in_the_tree_seq
+ \str_clear_new:N \l_@@_name_str
+ \str_clear_new:N \l_@@_status_arrow_str
+ \dim_zero_new:N \l_@@_x_dim
+ \str_clear_new:N \l_@@_input_line_str
+ \seq_gput_right:NV \g_@@_arrow_int_seq \g_@@_arrow_int
+ \int_gzero:N \g_@@_arrow_int
+ \seq_gput_right:NV \g_@@_line_int_seq \g_@@_line_int
+ \int_gzero:N \g_@@_line_int
+ \seq_gput_right:NV \g_@@_col_int_seq \g_@@_col_int
+ \int_gzero:N \g_@@_col_int
+ \seq_gput_right:NV \g_@@_static_col_int_seq \g_@@_static_col_int
+ \int_gzero:N \g_@@_static_col_int
+ \seq_gput_right:Nn \g_@@_position_in_the_tree_seq 1
+ \seq_set_eq:NN \l_tmpa_seq \g_@@_position_in_the_tree_seq
\seq_pop_right:NN \l_tmpa_seq \l_tmpa_tl
- \str_clear_new:N \l__wa_prefix_str
- \str_set:Nx \l__wa_prefix_str { \seq_use:Nnnn \l_tmpa_seq - - - }
- \cs_set_eq:NN \\ \__wa_cr:
+ \str_clear_new:N \l_@@_prefix_str
+ \str_set:Nx \l_@@_prefix_str { \seq_use:Nnnn \l_tmpa_seq - - - }
+ \cs_set_eq:NN \\ \@@_cr:
\dim_zero:N \mathsurround
- \int_zero_new:N \l__wa_initial_int
- \int_zero_new:N \l__wa_final_int
- \int_zero_new:N \l__wa_arrow_int
- \int_zero_new:N \l__wa_pos_of_arrow_int
- \int_zero_new:N \l__wa_jump_int
- \int_set:Nn \l__wa_jump_int \c_one_int
- \str_set:Nn \l__wa_format_str { rl }
- \skip_zero:N \l__wa_interline_skip
- \tl_clear_new:N \l__wa_code_before_tl
- \tl_clear_new:N \l__wa_code_after_tl
- \str_clear_new:N \l__wa_previous_key_str
- \bool_if:NT \l__wa_in_WithArrows_bool
+ \int_zero_new:N \l_@@_initial_int
+ \int_zero_new:N \l_@@_final_int
+ \int_zero_new:N \l_@@_arrow_int
+ \int_zero_new:N \l_@@_pos_of_arrow_int
+ \int_zero_new:N \l_@@_jump_int
+ \int_set:Nn \l_@@_jump_int \c_one_int
+ \str_set:Nn \l_@@_format_str { rl }
+ \skip_zero:N \l_@@_interline_skip
+ \tl_clear_new:N \l_@@_code_before_tl
+ \tl_clear_new:N \l_@@_code_after_tl
+ \str_clear_new:N \l_@@_previous_key_str
+ \bool_if:NT \l_@@_in_WithArrows_bool
{ \keys_set:nn { WithArrows / WithArrows } { #1 } }
- \bool_if:NT \l__wa_in_DispWithArrows_bool
+ \bool_if:NT \l_@@_in_DispWithArrows_bool
{ \keys_set:nn { WithArrows / DispWithArrows } { #1 } }
- \cs_set_eq:cN \l__wa_command_name_str \__wa_Arrow_first_columns:
- \int_set:Nn \l__wa_nb_cols_int { \str_count:N \l__wa_format_str }
- \int_gset_eq:NN \g__wa_col_int \l__wa_nb_cols_int
- \seq_clear_new:N \l__wa_format_seq
- \seq_set_split:NnV \l__wa_format_seq { } \l__wa_format_str
- \l__wa_code_before_tl
+ \cs_set_eq:cN \l_@@_command_name_str \@@_Arrow_first_columns:
+ \int_set:Nn \l_@@_nb_cols_int { \str_count:N \l_@@_format_str }
+ \int_gset_eq:NN \g_@@_col_int \l_@@_nb_cols_int
+ \seq_clear_new:N \l_@@_format_seq
+ \seq_set_split:NnV \l_@@_format_seq { } \l_@@_format_str
+ \l_@@_code_before_tl
\spread at equation
}
-\cs_new_protected:Npn \__wa_construct_halign:
+\cs_new_protected:Npn \@@_construct_halign:
{
- \seq_pop_right:NNTF \l__wa_format_seq \l__wa_type_col_str
+ \seq_pop_right:NNTF \l_@@_format_seq \l_@@_type_col_str
{
\use:x
{
- \int_gdecr:N \g__wa_col_int
- \__wa_construct_halign:
- \int_compare:nNnT \g__wa_col_int = \l__wa_nb_cols_int
+ \int_gdecr:N \g_@@_col_int
+ \@@_construct_halign:
+ \int_compare:nNnT \g_@@_col_int = \l_@@_nb_cols_int
{
- \cs_set_eq:cN { \l__wa_command_name_str } \__wa_Arrow
+ \cs_set_eq:cN { \l_@@_command_name_str } \@@_Arrow
}
- \str_if_eq:VnT \l__wa_type_col_str { c } \hfil
- \str_if_eq:VnT \l__wa_type_col_str { r } \hfill
- \int_gincr:N \g__wa_col_int
- \int_gset:Nn \g__wa_static_col_int { \int_use:N \g__wa_col_int }
+ \str_if_eq:VnT \l_@@_type_col_str { c } \hfil
+ \str_if_eq:VnT \l_@@_type_col_str { r } \hfill
+ \int_gincr:N \g_@@_col_int
+ \int_gset:Nn \g_@@_static_col_int { \int_use:N \g_@@_col_int }
\c_math_toggle_token
{
{ }
- \bool_if:NT \l__wa_displaystyle_bool \displaystyle
+ \bool_if:NT \l_@@_displaystyle_bool \displaystyle
####
}
\c_math_toggle_token
- \int_compare:nNnTF \g__wa_col_int = \l__wa_nb_cols_int
- { \__wa_construct_nodes: }
+ \int_compare:nNnTF \g_@@_col_int = \l_@@_nb_cols_int
+ { \@@_construct_nodes: }
{
- \str_if_eq:VnT \l__wa_type_col_str { l } \hfil
- \str_if_eq:VnT \l__wa_type_col_str { c } \hfil
- \bool_if:NT \l__wa_in_DispWithArrows_bool { \tabskip = \c_zero_skip }
+ \str_if_eq:VnT \l_@@_type_col_str { l } \hfil
+ \str_if_eq:VnT \l_@@_type_col_str { c } \hfil
+ \bool_if:NT \l_@@_in_DispWithArrows_bool { \tabskip = \c_zero_skip }
&
}
}
}
{
- \bool_if:NTF \l__wa_in_WithArrows_bool
+ \bool_if:NTF \l_@@_in_WithArrows_bool
{
\ialign
\bgroup
}
{
- \halign to \l__wa_linewidth_dim
+ \halign to \l_@@_linewidth_dim
\bgroup
- \bool_if:NT \l__wa_fleqn_bool
- { \skip_horizontal:N \l__wa_mathindent_dim }
+ \bool_if:NT \l_@@_fleqn_bool
+ { \skip_horizontal:N \l_@@_mathindent_dim }
}
- \int_gincr:N \g__wa_line_int
- \int_gzero:N \g__wa_col_int
- \tl_if_eq:NNF \l__wa_left_brace_tl \c_novalue_tl
+ \int_gincr:N \g_@@_line_int
+ \int_gzero:N \g_@@_col_int
+ \tl_if_eq:NNF \l_@@_left_brace_tl \c_novalue_tl
{
\skip_horizontal:n
- { \box_wd:N \l__wa_left_brace_box + \l__wa_delim_wd_dim }
+ { \box_wd:N \l_@@_left_brace_box + \l_@@_delim_wd_dim }
}
\strut
}
}
-\cs_new_protected:Npn \__wa_construct_nodes:
+\cs_new_protected:Npn \@@_construct_nodes:
{
\tikz [ remember~picture , overlay ]
\node
[
node~contents = { } ,
- __wa_node_style ,
- name = wa - \l__wa_prefix_str - \int_use:N \g__wa_line_int - l ,
+ @@_node_style ,
+ name = wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - l ,
alias =
{
- \str_if_empty:NF \l__wa_name_str
- { \l__wa_name_str - \int_use:N \g__wa_line_int - l }
+ \str_if_empty:NF \l_@@_name_str
+ { \l_@@_name_str - \int_use:N \g_@@_line_int - l }
}
]
;
@@ -663,19 +666,19 @@
\node
[
node~contents = { } ,
- __wa_node_style ,
- name = wa - \l__wa_prefix_str - \int_use:N \g__wa_line_int - r ,
+ @@_node_style ,
+ name = wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - r ,
alias =
{
- \str_if_empty:NF \l__wa_name_str
- { \l__wa_name_str - \int_use:N \g__wa_line_int - r }
+ \str_if_empty:NF \l_@@_name_str
+ { \l_@@_name_str - \int_use:N \g_@@_line_int - r }
}
]
;
- \bool_if:NT \l__wa_show_node_names_bool
+ \bool_if:NT \l_@@_show_node_names_bool
{
\hbox_overlap_right:n
- { \small wa - \l__wa_prefix_str - \int_use:N \g__wa_line_int - r }
+ { \small wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - r }
}
}
\cs_new_protected:Npn \WithArrows
@@ -687,21 +690,21 @@
}
\cs_new_protected:Npn \WithArrows_i [ #1 ]
{
- \bool_set_true:N \l__wa_in_WithArrows_bool
- \bool_set_false:N \l__wa_in_DispWithArrows_bool
- \str_clear_new:N \l__wa_type_env_str
- \str_set:Nn \l__wa_type_env_str { WithArrows }
- \__wa_pre_halign:n { #1 }
+ \bool_set_true:N \l_@@_in_WithArrows_bool
+ \bool_set_false:N \l_@@_in_DispWithArrows_bool
+ \str_clear_new:N \l_@@_type_env_str
+ \str_set:Nn \l_@@_type_env_str { WithArrows }
+ \@@_pre_halign:n { #1 }
\if_mode_math: \else:
- \__wa_error:n { WithArrows~outside~math~mode }
+ \@@_error:n { WithArrows~outside~math~mode }
\fi:
- \int_case:nn \l__wa_pos_env_int { 0 \vtop 1 \vcenter 2 \vbox }
+ \int_case:nn \l_@@_pos_env_int { 0 \vtop 1 \vcenter 2 \vbox }
\bgroup
- \__wa_construct_halign:
+ \@@_construct_halign:
&&
- \__wa_error:n { Too~much~columns~in~WithArrows }
+ \@@_error:n { Too~much~columns~in~WithArrows }
\c_math_toggle_token
- \bool_if:NT \l__wa_displaystyle_bool \displaystyle
+ \bool_if:NT \l_@@_displaystyle_bool \displaystyle
{ ## }
\c_math_toggle_token
\cr
@@ -711,70 +714,73 @@
\\
\egroup
\egroup
- \__wa_post_halign:
+ \@@_post_halign:
\group_end:
}
-\cs_new_protected:Npn \__wa_post_halign:
+\cs_new_protected:Npn \@@_post_halign:
{
- \cs_set:Npn \WithArrowsRightX { \g__wa_right_x_dim }
- \int_compare:nNnT \g__wa_arrow_int > 0
+ \cs_set:Npn \WithArrowsRightX { \g_@@_right_x_dim }
+ \normalbaselines
+ \int_compare:nNnT \g_@@_arrow_int > 0
{
- \int_compare:nNnT \g__wa_arrow_int = 1
+ \int_compare:nNnT \g_@@_arrow_int = 1
{
- \int_compare:nNnT \l__wa_pos_arrow_int > 5
- { \int_set:Nn \l__wa_pos_arrow_int 5 }
+ \int_compare:nNnT \l_@@_pos_arrow_int > 5
+ { \int_set:Nn \l_@@_pos_arrow_int 5 }
}
- \__wa_scan_arrows:
+ \@@_scan_arrows:
}
\group_begin:
- \tikzset { every~picture / .style = __wa_standard }
- \cs_set:Npn \WithArrowsNbLines { \int_use:N \g__wa_line_int }
- \cs_set_eq:NN \MultiArrow \__wa_MultiArrow:nn
- \cs_set_eq:cN \l__wa_command_name_str \__wa_Arrow_code_after
- \bool_set_true:N \l__wa_in_code_after_bool
- \l__wa_code_after_tl
+ \tikzset { every~picture / .style = @@_standard }
+ \cs_set:Npn \WithArrowsNbLines { \int_use:N \g_@@_line_int }
+ \cs_set_eq:NN \MultiArrow \@@_MultiArrow:nn
+ \cs_set_eq:cN \l_@@_command_name_str \@@_Arrow_code_after
+ \bool_set_true:N \l_@@_in_code_after_bool
+ \l_@@_code_after_tl
\group_end:
- \seq_gpop_right:NN \g__wa_position_in_the_tree_seq \l_tmpa_tl
- \seq_gpop_right:NN \g__wa_position_in_the_tree_seq \l_tmpa_tl
- \seq_gput_right:Nx \g__wa_position_in_the_tree_seq
+ \seq_gpop_right:NN \g_@@_position_in_the_tree_seq \l_tmpa_tl
+ \seq_gpop_right:NN \g_@@_position_in_the_tree_seq \l_tmpa_tl
+ \seq_gput_right:Nx \g_@@_position_in_the_tree_seq
{ \int_eval:n { \l_tmpa_tl + 1 } }
- \int_compare:nNnT { \seq_count:N \g__wa_position_in_the_tree_seq } = 1
- { \int_gincr:N \g__wa_last_env_int }
- \seq_gpop_right:NN \g__wa_arrow_int_seq \l_tmpa_tl
- \int_gset:Nn \g__wa_arrow_int \l_tmpa_tl
- \seq_gpop_right:NN \g__wa_line_int_seq \l_tmpa_tl
- \int_gset:Nn \g__wa_line_int \l_tmpa_tl
- \seq_gpop_right:NN \g__wa_col_int_seq \l_tmpa_tl
- \int_gset:Nn \g__wa_col_int \l_tmpa_tl
+ \int_compare:nNnT { \seq_count:N \g_@@_position_in_the_tree_seq } = 1
+ { \int_gincr:N \g_@@_last_env_int }
+ \seq_gpop_right:NN \g_@@_arrow_int_seq \l_tmpa_tl
+ \int_gset:Nn \g_@@_arrow_int \l_tmpa_tl
+ \seq_gpop_right:NN \g_@@_line_int_seq \l_tmpa_tl
+ \int_gset:Nn \g_@@_line_int \l_tmpa_tl
+ \seq_gpop_right:NN \g_@@_col_int_seq \l_tmpa_tl
+ \int_gset:Nn \g_@@_col_int \l_tmpa_tl
+ \seq_gpop_right:NN \g_@@_static_col_int_seq \l_tmpa_tl
+ \int_gset:Nn \g_@@_static_col_int \l_tmpa_tl
}
-\cs_new_protected:Npn \__wa_cr:
+\cs_new_protected:Npn \@@_cr:
{
\scan_stop:
- \int_compare:nNnF \g__wa_col_int = \g__wa_static_col_int
- { \__wa_error:n { omit~probably~used } }
- \prg_replicate:nn { \l__wa_nb_cols_int - \g__wa_static_col_int } { & { } }
+ \int_compare:nNnF \g_@@_col_int = \g_@@_static_col_int
+ { \@@_error:n { omit~probably~used } }
+ \prg_replicate:nn { \l_@@_nb_cols_int - \g_@@_static_col_int } { & { } }
\group_align_safe_begin:
- \peek_meaning_remove:NTF * \__wa_cr_i: \__wa_cr_i:
+ \peek_meaning_remove:NTF * \@@_cr_i: \@@_cr_i:
}
-\cs_new_protected:Npn \__wa_cr_i:
- { \peek_meaning:NTF [ \__wa_cr_ii: { \__wa_cr_ii: [ \c_zero_dim ] } }
-\cs_new_protected:Npn \__wa_cr_ii: [ #1 ]
+\cs_new_protected:Npn \@@_cr_i:
+ { \peek_meaning:NTF [ \@@_cr_ii: { \@@_cr_ii: [ \c_zero_dim ] } }
+\cs_new_protected:Npn \@@_cr_ii: [ #1 ]
{
\group_align_safe_end:
- \bool_if:NT \l__wa_in_DispWithArrows_bool
+ \bool_if:NT \l_@@_in_DispWithArrows_bool
{
&
- \tikz [ __wa_standard ]
- \coordinate ( \int_use:N \g__wa_line_int - v ) ;
+ \tikz [ @@_standard ]
+ \coordinate ( \int_use:N \g_@@_line_int - v ) ;
}
\dim_compare:nNnT { #1 } < \c_zero_dim
- { \__wa_error:n { option~of~cr~negative } }
+ { \@@_error:n { option~of~cr~negative } }
\cr
\noalign
{
\dim_set:Nn \l_tmpa_dim { \dim_max:nn { #1 } \c_zero_dim }
- \skip_vertical:n { \l_tmpa_dim + \l__wa_interline_skip }
+ \skip_vertical:n { \l_tmpa_dim + \l_@@_interline_skip }
\scan_stop:
}
}
@@ -793,12 +799,12 @@
}
\cs_new_protected:Npn \DispWithArrows_ii < #1 > [ #2 ]
{
- \bool_set_true:N \l__wa_in_DispWithArrows_bool
- \str_clear_new:N \l__wa_type_env_str
- \str_set:Nn \l__wa_type_env_str { DispWithArrows }
- \exp_args:No \tl_if_novalue:nF { #1 } { \tl_set:Nn \l__wa_left_brace_tl { #1 } }
- \__wa_pre_halign:n { #2 }
- \tl_if_eq:NNF \l__wa_left_brace_tl \c_novalue_tl
+ \bool_set_true:N \l_@@_in_DispWithArrows_bool
+ \str_clear_new:N \l_@@_type_env_str
+ \str_set:Nn \l_@@_type_env_str { DispWithArrows }
+ \exp_args:No \tl_if_novalue:nF { #1 } { \tl_set:Nn \l_@@_left_brace_tl { #1 } }
+ \@@_pre_halign:n { #2 }
+ \tl_if_eq:NNF \l_@@_left_brace_tl \c_novalue_tl
{
\hbox_set:Nn \l_tmpa_box
{
@@ -805,20 +811,20 @@
\group_begin:
\dim_set_eq:NN \nulldelimiterspace \c_zero_dim
\c_math_toggle_token
- \left \l__wa_replace_left_brace_by_tl \vcenter to 1 cm { } \right.
+ \left \l_@@_replace_left_brace_by_tl \vcenter to 1 cm { } \right.
\c_math_toggle_token
\group_end:
}
- \dim_zero_new:N \l__wa_delim_wd_dim
- \dim_set:Nn \l__wa_delim_wd_dim { \box_wd:N \l_tmpa_box }
- \box_clear_new:N \l__wa_left_brace_box
- \hbox_set:Nn \l__wa_left_brace_box
+ \dim_zero_new:N \l_@@_delim_wd_dim
+ \dim_set:Nn \l_@@_delim_wd_dim { \box_wd:N \l_tmpa_box }
+ \box_clear_new:N \l_@@_left_brace_box
+ \hbox_set:Nn \l_@@_left_brace_box
{
\group_begin:
- \cs_set_eq:NN \label \__wa_old_label
+ \cs_set_eq:NN \label \@@_old_label
\c_math_toggle_token
- \bool_if:NT \l__wa_displaystyle_bool \displaystyle
- \l__wa_left_brace_tl
+ \bool_if:NT \l_@@_displaystyle_bool \displaystyle
+ \l_@@_left_brace_tl
{ }
\c_math_toggle_token
\group_end:
@@ -825,7 +831,7 @@
}
}
\if_mode_math:
- \__wa_fatal:n { DispWithArrows~in~math~mode }
+ \@@_fatal:n { DispWithArrows~in~math~mode }
\fi:
\dim_zero_new:N \linewidth
\dim_set_eq:NN \linewidth \displaywidth
@@ -834,21 +840,21 @@
\hbox_to_wd:nn { .6 \linewidth } { }
\fi:
\c_math_toggle_token \c_math_toggle_token
- \dim_zero_new:N \l__wa_linewidth_dim
- \dim_set_eq:NN \l__wa_linewidth_dim \displaywidth
- \box_clear_new:N \l__wa_halign_box
- \setbox \l__wa_halign_box \vtop \bgroup
+ \dim_zero_new:N \l_@@_linewidth_dim
+ \dim_set_eq:NN \l_@@_linewidth_dim \displaywidth
+ \box_clear_new:N \l_@@_halign_box
+ \setbox \l_@@_halign_box \vtop \bgroup
\tabskip =
- \bool_if:NTF \l__wa_fleqn_bool
+ \bool_if:NTF \l_@@_fleqn_bool
\c_zero_skip
{ 0 pt plus 1000 pt minus 1000 pt }
- \__wa_construct_halign:
+ \@@_construct_halign:
\tabskip = 0 pt plus 1000 pt minus 1000 pt
&
$ ## $
\tabskip = \c_zero_skip
&&
- \__wa_fatal:n { Too~much~columns~in~DispWithArrows }
+ \@@_fatal:n { Too~much~columns~in~DispWithArrows }
\bool_if:nT \c_false_bool { ## }
\cr
}
@@ -860,34 +866,34 @@
\box_set_to_last:N \l_tmpa_box
\nointerlineskip
\box_use:N \l_tmpa_box
- \dim_gzero_new:N \g__wa_alignment_dim
- \dim_gset:Nn \g__wa_alignment_dim { \box_wd:N \l_tmpa_box }
- \box_clear_new:N \l__wa_new_box
- \hbox_set:Nn \l__wa_new_box { \hbox_unpack_clear:N \l_tmpa_box }
+ \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 }
\dim_compare:nNnT
- { \box_wd:N \l__wa_new_box } < \g__wa_alignment_dim
- { \dim_gset:Nn \g__wa_alignment_dim { \box_wd:N \l__wa_new_box } }
+ { \box_wd:N \l_@@_new_box } < \g_@@_alignment_dim
+ { \dim_gset:Nn \g_@@_alignment_dim { \box_wd:N \l_@@_new_box } }
\egroup
- \tl_if_eq:NNTF \l__wa_left_brace_tl \c_novalue_tl
- { \box_use_drop:N \l__wa_halign_box }
+ \tl_if_eq:NNTF \l_@@_left_brace_tl \c_novalue_tl
+ { \box_use_drop:N \l_@@_halign_box }
{
- \hbox_to_wd:nn \l__wa_linewidth_dim
+ \hbox_to_wd:nn \l_@@_linewidth_dim
{
- \bool_if:NTF \l__wa_fleqn_bool
- { \skip_horizontal:n \l__wa_mathindent_dim }
+ \bool_if:NTF \l_@@_fleqn_bool
+ { \skip_horizontal:n \l_@@_mathindent_dim }
\hfil
- \hbox_to_wd:nn \g__wa_alignment_dim
+ \hbox_to_wd:nn \g_@@_alignment_dim
{
- \box_use_drop:N \l__wa_left_brace_box
+ \box_use_drop:N \l_@@_left_brace_box
\dim_set:Nn \l_tmpa_dim
{
- \box_ht:N \l__wa_halign_box
- + \box_dp:N \l__wa_halign_box
+ \box_ht:N \l_@@_halign_box
+ + \box_dp:N \l_@@_halign_box
}
\group_begin:
\dim_set_eq:NN \nulldelimiterspace \c_zero_dim
\c_math_toggle_token
- \left \l__wa_replace_left_brace_by_tl
+ \left \l_@@_replace_left_brace_by_tl
\vcenter to \l_tmpa_dim { \vfil }
\right.
\c_math_toggle_token
@@ -896,266 +902,266 @@
}
\hfil
}
- \skip_horizontal:n { - \l__wa_linewidth_dim }
- \vcenter { \box_use_drop:N \l__wa_halign_box }
+ \skip_horizontal:n { - \l_@@_linewidth_dim }
+ \vcenter { \box_use_drop:N \l_@@_halign_box }
}
- \dim_gzero_new:N \g__wa_right_x_dim
- \dim_gset_eq:NN \g__wa_right_x_dim \c_max_dim
- \tikzpicture [ __wa_standard ]
- \int_step_variable:nNn \g__wa_line_int \l_tmpa_int
+ \dim_gzero_new:N \g_@@_right_x_dim
+ \dim_gset_eq:NN \g_@@_right_x_dim \c_max_dim
+ \tikzpicture [ @@_standard ]
+ \int_step_variable:nNn \g_@@_line_int \l_tmpa_int
{
\cs_if_free:cTF
- { pgf at sh@ns at wa - \l__wa_prefix_str - \l_tmpa_int - v }
- { \__wa_fatal:n { Inexistent~v-node } }
+ { pgf at sh@ns at wa - \l_@@_prefix_str - \l_tmpa_int - v }
+ { \@@_fatal:n { Inexistent~v-node } }
{
\tikz at parse@node\pgfutil at firstofone ( \l_tmpa_int - v )
\dim_set:Nn \l_tmpa_dim \pgf at x
- \dim_compare:nNnT \l_tmpa_dim < \g__wa_right_x_dim
- { \dim_gset:Nn \g__wa_right_x_dim \l_tmpa_dim }
+ \dim_compare:nNnT \l_tmpa_dim < \g_@@_right_x_dim
+ { \dim_gset:Nn \g_@@_right_x_dim \l_tmpa_dim }
}
}
\endtikzpicture
- \__wa_post_halign:
+ \@@_post_halign:
\c_math_toggle_token \c_math_toggle_token
\group_end:
}
-\cs_new_protected:Npn \__wa_if_in_last_col_of_disp:Nn #1 #2
+\cs_new_protected:Npn \@@_if_in_last_col_of_disp:Nn #1 #2
{
- \bool_if:NTF \l__wa_in_WithArrows_bool
- { \__wa_error:nn { Not~allowed~in~WithArrows } { #1 } }
+ \bool_if:NTF \l_@@_in_WithArrows_bool
+ { \@@_error:nn { Not~allowed~in~WithArrows } { #1 } }
{
- \int_compare:nNnTF \g__wa_col_int < \l__wa_nb_cols_int
- { \__wa_error:nn { Not~allowed~in~DispWithArrows } { #1 } }
+ \int_compare:nNnTF \g_@@_col_int < \l_@@_nb_cols_int
+ { \@@_error:nn { Not~allowed~in~DispWithArrows } { #1 } }
{ #2 }
}
}
-\cs_new_protected:Npn \__wa_scan_arrows:
+\cs_new_protected:Npn \@@_scan_arrows:
{
\group_begin:
- \int_compare:nNnT \l__wa_pos_arrow_int = 7
+ \int_compare:nNnT \l_@@_pos_arrow_int = 7
{
- \__wa_scan_arrows_i:
- \int_set:Nn \l__wa_pos_arrow_int 8
+ \@@_scan_arrows_i:
+ \int_set:Nn \l_@@_pos_arrow_int 8
}
- \__wa_scan_arrows_i:
+ \@@_scan_arrows_i:
\group_end:
}
-\cs_new_protected:Npn \__wa_scan_arrows_i:
+\cs_new_protected:Npn \@@_scan_arrows_i:
{
- \int_zero_new:N \l__wa_first_arrow_of_group_int
- \int_zero_new:N \l__wa_first_line_of_group_int
- \int_zero_new:N \l__wa_last_line_of_group_int
- \seq_clear_new:N \l__wa_first_arrows_seq
- \seq_clear_new:N \l__wa_last_arrows_seq
- \bool_set_true:N \l__wa_new_group_bool
- \int_set:Nn \l__wa_arrow_int \c_one_int
- \int_until_do:nNnn \l__wa_arrow_int > \g__wa_arrow_int
+ \int_zero_new:N \l_@@_first_arrow_of_group_int
+ \int_zero_new:N \l_@@_first_line_of_group_int
+ \int_zero_new:N \l_@@_last_line_of_group_int
+ \seq_clear_new:N \l_@@_first_arrows_seq
+ \seq_clear_new:N \l_@@_last_arrows_seq
+ \bool_set_true:N \l_@@_new_group_bool
+ \int_set:Nn \l_@@_arrow_int \c_one_int
+ \int_until_do:nNnn \l_@@_arrow_int > \g_@@_arrow_int
{
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
{ initial } \l_tmpa_tl
- \int_set:Nn \l__wa_initial_int \l_tmpa_tl
+ \int_set:Nn \l_@@_initial_int \l_tmpa_tl
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
{ final } \l_tmpa_tl
- \int_set:Nn \l__wa_final_int \l_tmpa_tl
+ \int_set:Nn \l_@@_final_int \l_tmpa_tl
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
- { status } \l__wa_status_arrow_str
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
+ { status } \l_@@_status_arrow_str
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
- { input-line } \l__wa_input_line_str
- \int_compare:nNnTF \l__wa_final_int > \g__wa_line_int
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
+ { input-line } \l_@@_input_line_str
+ \int_compare:nNnTF \l_@@_final_int > \g_@@_line_int
{
- \int_compare:nNnF \l__wa_pos_arrow_int = 8
- { \__wa_error:n { Too~few~lines~for~an~arrow } }
+ \int_compare:nNnF \l_@@_pos_arrow_int = 8
+ { \@@_error:n { Too~few~lines~for~an~arrow } }
}
- \__wa_code_for_possible_arrow:
- \int_incr:N \l__wa_arrow_int
+ \@@_code_for_possible_arrow:
+ \int_incr:N \l_@@_arrow_int
}
\bool_if:nT
{
- \int_compare_p:n { \l__wa_pos_arrow_int != 7 }
+ \int_compare_p:n { \l_@@_pos_arrow_int != 7 }
&&
- \int_compare_p:nNn \l__wa_first_arrow_of_group_int > 0
+ \int_compare_p:nNn \l_@@_first_arrow_of_group_int > 0
}
- { \__wa_draw_arrows:nn \l__wa_first_arrow_of_group_int \g__wa_arrow_int }
+ { \@@_draw_arrows:nn \l_@@_first_arrow_of_group_int \g_@@_arrow_int }
}
-\cs_new_protected:Npn \__wa_code_for_possible_arrow:
+\cs_new_protected:Npn \@@_code_for_possible_arrow:
{
\bool_if:nT
{
- \int_compare_p:nNn \l__wa_arrow_int > \c_one_int
+ \int_compare_p:nNn \l_@@_arrow_int > \c_one_int
&&
- ( \int_compare_p:n { \l__wa_initial_int > \l__wa_last_line_of_group_int }
+ ( \int_compare_p:n { \l_@@_initial_int > \l_@@_last_line_of_group_int }
&&
- \int_compare_p:n { \l__wa_pos_arrow_int != 7 }
+ \int_compare_p:n { \l_@@_pos_arrow_int != 7 }
||
- \str_if_eq_p:Vn \l__wa_status_arrow_str { new-group }
+ \str_if_eq_p:Vn \l_@@_status_arrow_str { new-group }
)
}
{
- \int_compare:nNnF \l__wa_first_arrow_of_group_int = \c_zero_int
+ \int_compare:nNnF \l_@@_first_arrow_of_group_int = \c_zero_int
{
- \__wa_draw_arrows:nn
- \l__wa_first_arrow_of_group_int
- { \l__wa_arrow_int - 1 }
+ \@@_draw_arrows:nn
+ \l_@@_first_arrow_of_group_int
+ { \l_@@_arrow_int - 1 }
}
- \bool_set_true:N \l__wa_new_group_bool
+ \bool_set_true:N \l_@@_new_group_bool
}
- \bool_if:nTF \l__wa_new_group_bool
+ \bool_if:nTF \l_@@_new_group_bool
{
- \bool_set_false:N \l__wa_new_group_bool
- \int_set_eq:NN \l__wa_first_arrow_of_group_int \l__wa_arrow_int
- \int_set_eq:NN \l__wa_first_line_of_group_int \l__wa_initial_int
- \int_set_eq:NN \l__wa_last_line_of_group_int \l__wa_final_int
- \seq_clear:N \l__wa_first_arrows_seq
- \seq_put_left:NV \l__wa_first_arrows_seq \l__wa_arrow_int
- \seq_clear:N \l__wa_last_arrows_seq
- \seq_put_left:NV \l__wa_last_arrows_seq \l__wa_arrow_int
- \int_compare:nT { \l__wa_pos_arrow_int != 8 }
- { \dim_set:Nn \l__wa_x_dim { - \c_max_dim } }
+ \bool_set_false:N \l_@@_new_group_bool
+ \int_set_eq:NN \l_@@_first_arrow_of_group_int \l_@@_arrow_int
+ \int_set_eq:NN \l_@@_first_line_of_group_int \l_@@_initial_int
+ \int_set_eq:NN \l_@@_last_line_of_group_int \l_@@_final_int
+ \seq_clear:N \l_@@_first_arrows_seq
+ \seq_put_left:NV \l_@@_first_arrows_seq \l_@@_arrow_int
+ \seq_clear:N \l_@@_last_arrows_seq
+ \seq_put_left:NV \l_@@_last_arrows_seq \l_@@_arrow_int
+ \int_compare:nT { \l_@@_pos_arrow_int != 8 }
+ { \dim_set:Nn \l_@@_x_dim { - \c_max_dim } }
}
{
\bool_if:nF
- { \str_if_eq_p:Vn \l__wa_status_arrow_str { independent } }
+ { \str_if_eq_p:Vn \l_@@_status_arrow_str { independent } }
{
\int_compare:nT
- { \l__wa_initial_int = \l__wa_first_line_of_group_int }
- { \seq_put_left:NV \l__wa_first_arrows_seq \l__wa_arrow_int }
- \int_compare:nNnTF \l__wa_final_int > \l__wa_last_line_of_group_int
+ { \l_@@_initial_int = \l_@@_first_line_of_group_int }
+ { \seq_put_left:NV \l_@@_first_arrows_seq \l_@@_arrow_int }
+ \int_compare:nNnTF \l_@@_final_int > \l_@@_last_line_of_group_int
{
- \int_set_eq:NN \l__wa_last_line_of_group_int \l__wa_final_int
- \seq_clear:N \l__wa_last_arrows_seq
- \seq_put_left:NV \l__wa_last_arrows_seq \l__wa_arrow_int
+ \int_set_eq:NN \l_@@_last_line_of_group_int \l_@@_final_int
+ \seq_clear:N \l_@@_last_arrows_seq
+ \seq_put_left:NV \l_@@_last_arrows_seq \l_@@_arrow_int
}
{
- \int_compare:nNnT \l__wa_final_int = \l__wa_last_line_of_group_int
- { \seq_put_left:NV \l__wa_last_arrows_seq \l__wa_arrow_int }
+ \int_compare:nNnT \l_@@_final_int = \l_@@_last_line_of_group_int
+ { \seq_put_left:NV \l_@@_last_arrows_seq \l_@@_arrow_int }
}
}
}
- \bool_if:nF { \str_if_eq_p:Vn \l__wa_status_arrow_str { independent } }
+ \bool_if:nF { \str_if_eq_p:Vn \l_@@_status_arrow_str { independent } }
{
- \int_compare:nT { \l__wa_pos_arrow_int != 8 }
- { \__wa_update_x:nn \l__wa_initial_int \l__wa_final_int }
+ \int_compare:nT { \l_@@_pos_arrow_int != 8 }
+ { \@@_update_x:nn \l_@@_initial_int \l_@@_final_int }
}
}
\cs_generate_variant:Nn \keys_set:nn { n o }
-\cs_new_protected:Npn \__wa_keys_set:
+\cs_new_protected:Npn \@@_keys_set:
{ \keys_set_known:no { WithArrows / Arrow / SecondPass } }
-\cs_new_protected:Npn \__wa_draw_arrows:nn #1 #2
+\cs_new_protected:Npn \@@_draw_arrows:nn #1 #2
{
\group_begin:
- \int_zero_new:N \l__wa_first_arrow_int
- \int_set:Nn \l__wa_first_arrow_int { #1 }
- \int_zero_new:N \l__wa_last_arrow_int
- \int_set:Nn \l__wa_last_arrow_int { #2 }
- \int_set:Nn \l__wa_arrow_int \l__wa_first_arrow_int
- \int_until_do:nNnn \l__wa_arrow_int > \l__wa_last_arrow_int
+ \int_zero_new:N \l_@@_first_arrow_int
+ \int_set:Nn \l_@@_first_arrow_int { #1 }
+ \int_zero_new:N \l_@@_last_arrow_int
+ \int_set:Nn \l_@@_last_arrow_int { #2 }
+ \int_set:Nn \l_@@_arrow_int \l_@@_first_arrow_int
+ \int_until_do:nNnn \l_@@_arrow_int > \l_@@_last_arrow_int
{
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
{ initial } \l_tmpa_tl
- \int_set:Nn \l__wa_initial_int \l_tmpa_tl
+ \int_set:Nn \l_@@_initial_int \l_tmpa_tl
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
{ final } \l_tmpa_tl
- \int_set:Nn \l__wa_final_int \l_tmpa_tl
- \int_compare:nT { \l__wa_final_int <= \g__wa_line_int } \__wa_draw_arrows_i:
- \int_incr:N \l__wa_arrow_int
+ \int_set:Nn \l_@@_final_int \l_tmpa_tl
+ \int_compare:nT { \l_@@_final_int <= \g_@@_line_int } \@@_draw_arrows_i:
+ \int_incr:N \l_@@_arrow_int
}
\group_end:
}
-\cs_new_protected:Npn \__wa_draw_arrows_i:
+\cs_new_protected:Npn \@@_draw_arrows_i:
{
\group_begin:
\prop_get:cnN
- { g__wa_arrow _\l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
+ { g_@@_arrow _\l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
{ options } \l_tmpa_tl
- \str_clear_new:N \l__wa_previous_key_str
+ \str_clear_new:N \l_@@_previous_key_str
\exp_args:NNo \exp_args:No
- \__wa_keys_set: { \l_tmpa_tl , tikz = { xshift = \l__wa_xoffset_dim } }
- \bool_set_false:N \l__wa_initial_r_bool
- \bool_set_false:N \l__wa_final_r_bool
- \int_case:nn \l__wa_pos_arrow_int
+ \@@_keys_set: { \l_tmpa_tl , tikz = { xshift = \l_@@_xoffset_dim } }
+ \bool_set_false:N \l_@@_initial_r_bool
+ \bool_set_false:N \l_@@_final_r_bool
+ \int_case:nn \l_@@_pos_arrow_int
{
- 0 { \bool_set_true:N \l__wa_final_r_bool }
- 2 { \bool_set_true:N \l__wa_initial_r_bool }
+ 0 { \bool_set_true:N \l_@@_final_r_bool }
+ 2 { \bool_set_true:N \l_@@_initial_r_bool }
3
{
- \bool_set_true:N \l__wa_initial_r_bool
- \bool_set_true:N \l__wa_final_r_bool
+ \bool_set_true:N \l_@@_initial_r_bool
+ \bool_set_true:N \l_@@_final_r_bool
}
}
- \int_compare:nNnT \l__wa_pos_arrow_int = 5
+ \int_compare:nNnT \l_@@_pos_arrow_int = 5
{
- \dim_set:Nn \l__wa_x_dim { - \c_max_dim }
- \__wa_update_x:nn \l__wa_initial_int \l__wa_final_int
+ \dim_set:Nn \l_@@_x_dim { - \c_max_dim }
+ \@@_update_x:nn \l_@@_initial_int \l_@@_final_int
}
- \tl_set:Nx \l__wa_initial_tl
+ \tl_set:Nx \l_@@_initial_tl
{
- \int_use:N \l__wa_initial_int - \bool_if:NTF \l__wa_initial_r_bool rl
+ \int_use:N \l_@@_initial_int - \bool_if:NTF \l_@@_initial_r_bool rl
.south
}
- \tl_set:Nx \l__wa_final_tl
- { \int_use:N \l__wa_final_int - \bool_if:NTF \l__wa_final_r_bool rl .north }
+ \tl_set:Nx \l_@@_final_tl
+ { \int_use:N \l_@@_final_int - \bool_if:NTF \l_@@_final_r_bool rl .north }
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
{ label }
\l_tmpa_tl
- \seq_if_in:NxTF \l__wa_first_arrows_seq
- { \int_use:N \l__wa_arrow_int }
+ \seq_if_in:NxTF \l_@@_first_arrows_seq
+ { \int_use:N \l_@@_arrow_int }
{ \bool_set_true:N \l_tmpa_bool }
{ \bool_set_false:N \l_tmpa_bool }
- \seq_if_in:NxTF \l__wa_last_arrows_seq
- { \int_use:N \l__wa_arrow_int }
+ \seq_if_in:NxTF \l_@@_last_arrows_seq
+ { \int_use:N \l_@@_arrow_int }
{ \bool_set_true:N \l_tmpb_bool }
{ \bool_set_false:N \l_tmpb_bool }
- \int_compare:nNnT \l__wa_pos_arrow_int = 5
+ \int_compare:nNnT \l_@@_pos_arrow_int = 5
{
\bool_set_true:N \l_tmpa_bool
\bool_set_true:N \l_tmpb_bool
}
- \dim_gzero_new:N \g__wa_x_initial_dim
- \dim_gzero_new:N \g__wa_x_final_dim
- \dim_gzero_new:N \g__wa_y_initial_dim
- \dim_gzero_new:N \g__wa_y_final_dim
- \tikzpicture [ __wa_standard ]
- \tikz at scan@one at point \pgfutil at firstofone ( \l__wa_initial_tl )
- \dim_gset:Nn \g__wa_x_initial_dim \pgf at x
- \dim_gset:Nn \g__wa_y_initial_dim \pgf at y
- \tikz at scan@one at point \pgfutil at firstofone ( \l__wa_final_tl )
- \dim_gset:Nn \g__wa_x_final_dim \pgf at x
- \dim_gset:Nn \g__wa_y_final_dim \pgf at y
+ \dim_gzero_new:N \g_@@_x_initial_dim
+ \dim_gzero_new:N \g_@@_x_final_dim
+ \dim_gzero_new:N \g_@@_y_initial_dim
+ \dim_gzero_new:N \g_@@_y_final_dim
+ \tikzpicture [ @@_standard ]
+ \tikz at scan@one at point \pgfutil at firstofone ( \l_@@_initial_tl )
+ \dim_gset:Nn \g_@@_x_initial_dim \pgf at x
+ \dim_gset:Nn \g_@@_y_initial_dim \pgf at y
+ \tikz at scan@one at point \pgfutil at firstofone ( \l_@@_final_tl )
+ \dim_gset:Nn \g_@@_x_final_dim \pgf at x
+ \dim_gset:Nn \g_@@_y_final_dim \pgf at y
\endtikzpicture
\bool_if:nTF
- { \dim_compare_p:nNn { \g__wa_y_initial_dim - \g__wa_y_final_dim }
- > \l__wa_max_length_of_arrow_dim
+ { \dim_compare_p:nNn { \g_@@_y_initial_dim - \g_@@_y_final_dim }
+ > \l_@@_max_length_of_arrow_dim
&&
- \int_compare_p:nNn { \l__wa_final_int - \l__wa_initial_int } = 1
+ \int_compare_p:nNn { \l_@@_final_int - \l_@@_initial_int } = 1
}
{
\tl_gset:Nx \g_tmpa_tl
{
- \int_compare:nNnTF \l__wa_pos_arrow_int < 5
- { \dim_use:N \g__wa_x_initial_dim }
- { \dim_use:N \l__wa_x_dim } ,
+ \int_compare:nNnTF \l_@@_pos_arrow_int < 5
+ { \dim_use:N \g_@@_x_initial_dim }
+ { \dim_use:N \l_@@_x_dim } ,
\dim_eval:n
{
- ( \g__wa_y_initial_dim + \g__wa_y_final_dim ) / 2
- + ( \l__wa_max_length_of_arrow_dim / 2 )
+ ( \g_@@_y_initial_dim + \g_@@_y_final_dim ) / 2
+ + ( \l_@@_max_length_of_arrow_dim / 2 )
}
}
\tl_gset:Nx \g_tmpb_tl
{
- \int_compare:nNnTF \l__wa_pos_arrow_int < 5
- { \dim_use:N \g__wa_x_final_dim }
- { \dim_use:N \l__wa_x_dim } ,
+ \int_compare:nNnTF \l_@@_pos_arrow_int < 5
+ { \dim_use:N \g_@@_x_final_dim }
+ { \dim_use:N \l_@@_x_dim } ,
\dim_eval:n
{
- ( \g__wa_y_initial_dim + \g__wa_y_final_dim ) / 2
- - ( \l__wa_max_length_of_arrow_dim / 2 )
+ ( \g_@@_y_initial_dim + \g_@@_y_final_dim ) / 2
+ - ( \l_@@_max_length_of_arrow_dim / 2 )
}
}
}
@@ -1162,33 +1168,33 @@
{
\tl_gset:Nx \g_tmpa_tl
{
- \int_compare:nNnTF \l__wa_pos_arrow_int < 5
- { \dim_use:N \g__wa_x_initial_dim }
- { \dim_use:N \l__wa_x_dim } ,
+ \int_compare:nNnTF \l_@@_pos_arrow_int < 5
+ { \dim_use:N \g_@@_x_initial_dim }
+ { \dim_use:N \l_@@_x_dim } ,
\bool_if:NTF \l_tmpa_bool
- { \dim_eval:n { \g__wa_y_initial_dim + \l__wa_start_adjust_dim } }
- { \dim_use:N \g__wa_y_initial_dim }
+ { \dim_eval:n { \g_@@_y_initial_dim + \l_@@_start_adjust_dim } }
+ { \dim_use:N \g_@@_y_initial_dim }
}
\tl_gset:Nx \g_tmpb_tl
{
- \int_compare:nNnTF \l__wa_pos_arrow_int < 5
- { \dim_use:N \g__wa_x_final_dim }
- { \dim_use:N \l__wa_x_dim } ,
+ \int_compare:nNnTF \l_@@_pos_arrow_int < 5
+ { \dim_use:N \g_@@_x_final_dim }
+ { \dim_use:N \l_@@_x_dim } ,
\bool_if:NTF \l_tmpb_bool
- { \dim_eval:n { \g__wa_y_final_dim - \l__wa_end_adjust_dim } }
- { \dim_use:N \g__wa_y_final_dim }
+ { \dim_eval:n { \g_@@_y_final_dim - \l_@@_end_adjust_dim } }
+ { \dim_use:N \g_@@_y_final_dim }
}
}
- \__wa_draw_arrow:nno \g_tmpa_tl \g_tmpb_tl \l_tmpa_tl
+ \@@_draw_arrow:nno \g_tmpa_tl \g_tmpb_tl \l_tmpa_tl
\group_end:
}
-\cs_new_protected:Npn \__wa_def_function_tmpa:n #1
+\cs_new_protected:Npn \@@_def_function_tmpa:n #1
{
- \cs_set:Npn \__wa_tmpa:nnn ##1 ##2 ##3
+ \cs_set:Npn \@@_tmpa:nnn ##1 ##2 ##3
{
\tikzpicture
[
- __wa_standard ,
+ @@_standard ,
every~path / .style = WithArrows / arrow
]
#1
@@ -1195,20 +1201,20 @@
\endtikzpicture
}
}
-\cs_new_protected:Npn \__wa_draw_arrow:nnn #1 #2 #3
+\cs_new_protected:Npn \@@_draw_arrow:nnn #1 #2 #3
{
- \bool_if:nT { \l__wa_wrap_lines_bool && \l__wa_in_DispWithArrows_bool }
- { \tl_set_eq:NN \l__wa_tikz_code_tl \c__wa_tikz_code_wrap_lines_tl }
- \exp_args:NV \__wa_def_function_tmpa:n \l__wa_tikz_code_tl
- \__wa_tmpa:nnn { #1 } { #2 } { #3 }
+ \bool_if:nT { \l_@@_wrap_lines_bool && \l_@@_in_DispWithArrows_bool }
+ { \tl_set_eq:NN \l_@@_tikz_code_tl \c_@@_tikz_code_wrap_lines_tl }
+ \exp_args:NV \@@_def_function_tmpa:n \l_@@_tikz_code_tl
+ \@@_tmpa:nnn { #1 } { #2 } { #3 }
}
-\cs_generate_variant:Nn \__wa_draw_arrow:nnn { n n o }
-\tl_const:Nn \c__wa_tikz_code_wrap_lines_tl
+\cs_generate_variant:Nn \@@_draw_arrow:nnn { n n o }
+\tl_const:Nn \c_@@_tikz_code_wrap_lines_tl
{
- \draw ( #1 ) to node ( __wa_label ) { } ( #2 ) ;
- \tikz at parse@node \pgfutil at firstofone ( __wa_label.west )
+ \draw ( #1 ) to node ( @@_label ) { } ( #2 ) ;
+ \tikz at parse@node \pgfutil at firstofone ( @@_label.west )
\dim_set:Nn \l_tmpa_dim
- { \g__wa_right_x_dim - \pgf at x - \pgfkeysvalueof { / pgf / inner~xsep } }
+ { \g_@@_right_x_dim - \pgf at x - \pgfkeysvalueof { / pgf / inner~xsep } }
\path \pgfextra { \tl_gset:Nx \g_tmpa_tl \tikz at text@width } ;
\tl_if_empty:NF \g_tmpa_tl
{
@@ -1218,23 +1224,23 @@
}
\dim_compare:nNnT \l_tmpa_dim > \c_zero_dim
{
- \path ( __wa_label.west )
+ \path ( @@_label.west )
node [ anchor = west , text~width = \dim_use:N \l_tmpa_dim ]
{ #3 } ;
}
}
-\cs_new_protected:Npn \__wa_update_x:nn #1 #2
+\cs_new_protected:Npn \@@_update_x:nn #1 #2
{
\int_step_inline:nnn { #1 } { #2 }
{
- \tikzpicture [ __wa_standard ]
+ \tikzpicture [ @@_standard ]
\tikz at scan@one at point \pgfutil at firstofone ( ##1 - l )
- \dim_gset:Nn \g_tmpa_dim { \dim_max:nn \l__wa_x_dim \pgf at x }
+ \dim_gset:Nn \g_tmpa_dim { \dim_max:nn \l_@@_x_dim \pgf at x }
\endtikzpicture
- \dim_set_eq:NN \l__wa_x_dim \g_tmpa_dim
+ \dim_set_eq:NN \l_@@_x_dim \g_tmpa_dim
}
}
-\cs_new:Npn \WithArrowsLastEnv { \int_use:N \g__wa_last_env_int }
+\cs_new:Npn \WithArrowsLastEnv { \int_use:N \g_@@_last_env_int }
\keys_define:nn { WithArrows / Arrow / code-after }
{
tikz .code:n =
@@ -1241,69 +1247,69 @@
\tikzset { WithArrows / arrow / .append~style = { #1 } } ,
tikz .value_required:n = true ,
rr .value_forbidden:n = true ,
- rr .code:n = \__wa_fix_pos_option:n 0 ,
+ rr .code:n = \@@_fix_pos_option:n 0 ,
ll .value_forbidden:n = true,
- ll .code:n = \__wa_fix_pos_option:n 1 ,
+ ll .code:n = \@@_fix_pos_option:n 1 ,
rl .value_forbidden:n = true ,
- rl .code:n = \__wa_fix_pos_option:n 2 ,
+ rl .code:n = \@@_fix_pos_option:n 2 ,
lr .value_forbidden:n = true ,
- lr .code:n = \__wa_fix_pos_option:n 3 ,
+ lr .code:n = \@@_fix_pos_option:n 3 ,
v .value_forbidden:n = true ,
- v .code:n = \__wa_fix_pos_option:n 4 ,
- tikz-code .tl_set:N = \l__wa_tikz_code_tl ,
+ v .code:n = \@@_fix_pos_option:n 4 ,
+ tikz-code .tl_set:N = \l_@@_tikz_code_tl ,
tikz-code .value_required:n = true ,
- xoffset .dim_set:N = \l__wa_xoffset_dim ,
+ xoffset .dim_set:N = \l_@@_xoffset_dim ,
xoffset .value_required:n = true ,
unknown .code:n =
- \__wa_sort_seq:N \l__wa_options_Arrow_code_after_seq
- \__wa_error:n { Unknown~option~Arrow~in~code-after }
+ \@@_sort_seq:N \l_@@_options_Arrow_code_after_seq
+ \@@_error:n { Unknown~option~Arrow~in~code-after }
}
-\seq_new:N \l__wa_options_Arrow_code_after_seq
-\__wa_set_seq_of_str_from_clist:Nn \l__wa_options_Arrow_code_after_seq
+\seq_new:N \l_@@_options_Arrow_code_after_seq
+\@@_set_seq_of_str_from_clist:Nn \l_@@_options_Arrow_code_after_seq
{ ll, lr, rl, rr, tikz, tikz-code, v, x, offset }
-\cs_new_protected:Npn \__wa_Arrow_code_after
+\cs_new_protected:Npn \@@_Arrow_code_after
{
\peek_meaning:NTF [
- { \__wa_Arrow_code_after_i }
- { \__wa_Arrow_code_after_i [ ] }
+ { \@@_Arrow_code_after_i }
+ { \@@_Arrow_code_after_i [ ] }
}
-\cs_new_protected:Npn \__wa_Arrow_code_after_i [ #1 ] #2 #3 #4
+\cs_new_protected:Npn \@@_Arrow_code_after_i [ #1 ] #2 #3 #4
{
\peek_meaning:NTF [
- { \__wa_Arrow_code_after_ii [ #1 ] { #2 } { #3 } { #4 } }
- { \__wa_Arrow_code_after_ii [ #1 ] { #2 } { #3 } { #4 } [ ] }
+ { \@@_Arrow_code_after_ii [ #1 ] { #2 } { #3 } { #4 } }
+ { \@@_Arrow_code_after_ii [ #1 ] { #2 } { #3 } { #4 } [ ] }
}
-\cs_new_protected:Npn \__wa_Arrow_code_after_ii [ #1 ] #2 #3 #4 [ #5 ]
+\cs_new_protected:Npn \@@_Arrow_code_after_ii [ #1 ] #2 #3 #4 [ #5 ]
{
- \int_set:Nn \l__wa_pos_arrow_int 1
- \str_clear_new:N \l__wa_previous_key_str
+ \int_set:Nn \l_@@_pos_arrow_int 1
+ \str_clear_new:N \l_@@_previous_key_str
\group_begin:
\keys_set:nn { WithArrows / Arrow / code-after }
- { #1, #5, tikz = { xshift = \l__wa_xoffset_dim } }
- \bool_set_false:N \l__wa_initial_r_bool
- \bool_set_false:N \l__wa_final_r_bool
- \int_case:nn \l__wa_pos_arrow_int
+ { #1, #5, tikz = { xshift = \l_@@_xoffset_dim } }
+ \bool_set_false:N \l_@@_initial_r_bool
+ \bool_set_false:N \l_@@_final_r_bool
+ \int_case:nn \l_@@_pos_arrow_int
{
0
{
- \bool_set_true:N \l__wa_initial_r_bool
- \bool_set_true:N \l__wa_final_r_bool
+ \bool_set_true:N \l_@@_initial_r_bool
+ \bool_set_true:N \l_@@_final_r_bool
}
- 2 { \bool_set_true:N \l__wa_initial_r_bool }
- 3 { \bool_set_true:N \l__wa_final_r_bool }
+ 2 { \bool_set_true:N \l_@@_initial_r_bool }
+ 3 { \bool_set_true:N \l_@@_final_r_bool }
}
\tl_if_eq:nnTF { #2 } { #3 }
- { \__wa_error:nn { Both~lines~are~equal } { #2 } }
+ { \@@_error:nn { Both~lines~are~equal } { #2 } }
{
- \cs_if_free:cTF { pgf at sh@ns at wa - \l__wa_prefix_str - #2 - l }
- { \__wa_error:nx { Wrong~line~in~Arrow } { #2 } }
+ \cs_if_free:cTF { pgf at sh@ns at wa - \l_@@_prefix_str - #2 - l }
+ { \@@_error:nx { Wrong~line~in~Arrow } { #2 } }
{
- \cs_if_free:cTF { pgf at sh@ns at wa - \l__wa_prefix_str - #3 - l }
- { \__wa_error:nx { Wrong~line~in~Arrow } { #3 } }
+ \cs_if_free:cTF { pgf at sh@ns at wa - \l_@@_prefix_str - #3 - l }
+ { \@@_error:nx { Wrong~line~in~Arrow } { #3 } }
{
- \int_compare:nNnTF \l__wa_pos_arrow_int = 4
+ \int_compare:nNnTF \l_@@_pos_arrow_int = 4
{
- \tikzpicture [ __wa_standard ]
+ \tikzpicture [ @@_standard ]
\tikz at scan@one at point \pgfutil at firstofone (#2-l.south)
\dim_set_eq:NN \l_tmpa_dim \pgf at x
\dim_set_eq:NN \l_tmpb_dim \pgf at y
@@ -1317,42 +1323,42 @@
\endtikzpicture
}
{
- \tikzpicture [ __wa_standard ]
+ \tikzpicture [ @@_standard ]
\tikz at scan@one at point \pgfutil at firstofone
- ( #2-\bool_if:NTF\l__wa_initial_r_bool rl .south )
+ ( #2-\bool_if:NTF\l_@@_initial_r_bool rl .south )
\tl_gset:Nx \g_tmpa_tl
{ \dim_use:N \pgf at x , \dim_use:N \pgf at y }
\tikz at scan@one at point \pgfutil at firstofone
- ( #3-\bool_if:NTF\l__wa_final_r_bool rl .north )
+ ( #3-\bool_if:NTF\l_@@_final_r_bool rl .north )
\tl_gset:Nx \g_tmpb_tl
{ \dim_use:N \pgf at x , \dim_use:N \pgf at y }
\endtikzpicture
}
- \__wa_draw_arrow:nnn \g_tmpa_tl \g_tmpb_tl { #4 }
+ \@@_draw_arrow:nnn \g_tmpa_tl \g_tmpb_tl { #4 }
}
}
}
\group_end:
}
-\cs_new_protected:Npn \__wa_MultiArrow:nn #1 #2
+\cs_new_protected:Npn \@@_MultiArrow:nn #1 #2
{
\exp_args:Nnx
\regex_match:nnTF
{ \A \d+ (\,\d+)* ( \, \.\.\. (\,\d+)+ )* \Z }
{ #1 }
- { \__wa_MultiArrow_i:nn { #1 } { #2 } }
- { \__wa_error:nx { Invalid~specification~for~MultiArrow } { #1 } }
+ { \@@_MultiArrow_i:nn { #1 } { #2 } }
+ { \@@_error:nx { Invalid~specification~for~MultiArrow } { #1 } }
}
-\cs_new_protected:Npn \__wa_MultiArrow_i:nn #1 #2
+\cs_new_protected:Npn \@@_MultiArrow_i:nn #1 #2
{
\foreach \x in { #1 }
{
- \cs_if_free:cTF { pgf at sh@ns at wa - \l__wa_prefix_str - \x - l }
- { \__wa_error:nx { Wrong~line~specification~in~MultiArrow } \x }
+ \cs_if_free:cTF { pgf at sh@ns at wa - \l_@@_prefix_str - \x - l }
+ { \@@_error:nx { Wrong~line~specification~in~MultiArrow } \x }
{ \clist_gput_right:Nx \g_tmpa_clist \x }
}
\int_compare:nTF { \clist_count:N \g_tmpa_clist < 2 }
- { \__wa_error:n { Too~small~specification~for~MultiArrow } }
+ { \@@_error:n { Too~small~specification~for~MultiArrow } }
{
\clist_sort:Nn \g_tmpa_clist
{
@@ -1363,52 +1369,52 @@
\clist_pop:NN \g_tmpa_clist \l_tmpa_tl
\clist_reverse:N \g_tmpa_clist
\clist_pop:NN \g_tmpa_clist \l_tmpb_tl
- \exp_args:NV \__wa_MultiArrow_i:n \g_tmpa_clist
+ \exp_args:NV \@@_MultiArrow_i:n \g_tmpa_clist
\tikzpicture
[
- __wa_standard ,
+ @@_standard ,
every~path / .style = { WithArrows / arrow }
]
- \draw [<->] ([xshift = \l__wa_xoffset_dim]\l_tmpa_tl-r.south)
+ \draw [<->] ([xshift = \l_@@_xoffset_dim]\l_tmpa_tl-r.south)
-- ++(5mm,0)
- -- node (__wa_label) {}
- ([xshift = \l__wa_xoffset_dim+5mm]\l_tmpb_tl-r.south)
- -- ([xshift = \l__wa_xoffset_dim]\l_tmpb_tl-r.south) ;
- \tikz at parse@node \pgfutil at firstofone (__wa_label.west)
+ -- node (@@_label) {}
+ ([xshift = \l_@@_xoffset_dim+5mm]\l_tmpb_tl-r.south)
+ -- ([xshift = \l_@@_xoffset_dim]\l_tmpb_tl-r.south) ;
+ \tikz at parse@node \pgfutil at firstofone (@@_label.west)
\dim_set:Nn \l_tmpa_dim { 20 cm }
\path \pgfextra { \tl_gset:Nx \g_tmpa_tl \tikz at text@width } ;
\tl_if_empty:NF \g_tmpa_tl { \dim_set:Nn \l_tmpa_dim \g_tmpa_tl }
- \bool_if:nT { \l__wa_wrap_lines_bool && \l__wa_in_DispWithArrows_bool }
+ \bool_if:nT { \l_@@_wrap_lines_bool && \l_@@_in_DispWithArrows_bool }
{
\dim_set:Nn \l_tmpb_dim
- { \g__wa_right_x_dim - \pgf at x - 0.3333 em }
+ { \g_@@_right_x_dim - \pgf at x - 0.3333 em }
\dim_compare:nNnT \l_tmpb_dim < \l_tmpa_dim
{ \dim_set_eq:NN \l_tmpa_dim \l_tmpb_dim }
}
- \path (__wa_label.west)
+ \path (@@_label.west)
node [ anchor = west, text~width = \dim_use:N \l_tmpa_dim ] { #2 } ;
\endtikzpicture
}
}
-\cs_new_protected:Npn \__wa_MultiArrow_i:n #1
+\cs_new_protected:Npn \@@_MultiArrow_i:n #1
{
\tikzpicture
[
- __wa_standard ,
+ @@_standard ,
every~path / .style = { WithArrows / arrow }
]
\foreach \k in { #1 }
{
\draw [ <- ]
- ( [xshift = \l__wa_xoffset_dim]\k-r.south ) -- ++(5mm,0) ;
+ ( [xshift = \l_@@_xoffset_dim]\k-r.south ) -- ++(5mm,0) ;
} ;
\endtikzpicture
}
-\str_const:Nn \c__wa_option_ignored_str
+\str_const:Nn \c_@@_option_ignored_str
{ If~you~go~on,~this~option~will~be~ignored. }
-\str_const:Nn \c__wa_command_ignored_str
+\str_const:Nn \c_@@_command_ignored_str
{ If~you~go~on,~this~command~will~be~ignored. }
-\__wa_msg_new:nn { Bad~value~for~replace~brace~by }
+\@@_msg_new:nn { Bad~value~for~replace~brace~by }
{
Bad~value~for~the~option~'\l_keys_key_tl'.~The~value~must~begin~
with~an~extensible~left~delimiter.~The~possible~values~are:~.,
@@ -1418,227 +1424,227 @@
\token_to_str:N \lfloor\ and~\token_to_str:N \lceil\
(and~\token_to_str:N \lvert\ and~\token_to_str:N \lVert\
if~amsmath~or~unicode-math~is~loaded~in~LaTeX).\\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { option~of~cr~negative }
+\@@_msg_new:nn { option~of~cr~negative }
{
The~argument~of~the~command~\token_to_str:N\\~
- should~be~positive~in~the~row~\int_use:N \g__wa_line_int\
- of~your~environment~\{\l__wa_type_env_str\}.\\
- \c__wa_option_ignored_str
+ should~be~positive~in~the~row~\int_use:N \g_@@_line_int\
+ of~your~environment~\{\l_@@_type_env_str\}.\\
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { omit~probably~used }
+\@@_msg_new:nn { omit~probably~used }
{
There~is~a~problem.~Maybe~you~have~used~a~command~
- \token_to_str:N\omit\ in~the~line~\int_use:N \g__wa_line_int\
- (or~another~line)~of~your~environment~\{\l__wa_type_env_str\}.\\
+ \token_to_str:N\omit\ in~the~line~\int_use:N \g_@@_line_int\
+ (or~another~line)~of~your~environment~\{\l_@@_type_env_str\}.\\
You~can~go~on~but~you~may~have~others~errors.
}
-\__wa_msg_new:nn { Invalid~option~format }
+\@@_msg_new:nn { Invalid~option~format }
{
The~key~'format'~should~contain~only~letters~r,~c~and~l~and~
must~not~be~empty.\\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Value~for~a~key }
+\@@_msg_new:nn { Value~for~a~key }
{
The~key~'\l_keys_key_tl'~should~be~used~without~value. \\
However,~you~can~go~on~for~this~time.
}
-\__wa_msg_new:nnn { Unknown~option~in~Arrow }
+\@@_msg_new:nnn { Unknown~option~in~Arrow }
{
The~key~'\l_keys_key_tl'~is~unknown~for~the~command~
- \l__wa_string_Arrow_for_msg_str\ in~the~row~
- \int_use:N \g__wa_line_int\ of~your~environment~
- \{\l__wa_type_env_str\}. \l_tmpa_str \\
- \c__wa_option_ignored_str \\
+ \l_@@_string_Arrow_for_msg_str\ in~the~row~
+ \int_use:N \g_@@_line_int\ of~your~environment~
+ \{\l_@@_type_env_str\}. \l_tmpa_str \\
+ \c_@@_option_ignored_str \\
For~a~list~of~the~available~keys,~type~H~<return>.
}
{
The~available~keys~are~(in~alphabetic~order):~
- \seq_use:Nnnn \l__wa_options_Arrow_seq {~and~} {,~} {~and~}.
+ \seq_use:Nnnn \l_@@_options_Arrow_seq {~and~} {,~} {~and~}.
}
-\__wa_msg_new:nnn { Unknown~option~WithArrows }
+\@@_msg_new:nnn { Unknown~option~WithArrows }
{
- The~key~'\l_keys_key_tl'~is~unknown~in~\{\l__wa_type_env_str\}. \\
- \c__wa_option_ignored_str \\
+ The~key~'\l_keys_key_tl'~is~unknown~in~\{\l_@@_type_env_str\}. \\
+ \c_@@_option_ignored_str \\
For~a~list~of~the~available~keys,~type~H~<return>.
}
{
The~available~keys~are~(in~alphabetic~order):~
- \seq_use:Nnnn \l__wa_options_WithArrows_seq {~and~} {,~} {~and~}.
+ \seq_use:Nnnn \l_@@_options_WithArrows_seq {~and~} {,~} {~and~}.
}
-\__wa_msg_new:nnn { Unknown~option~DispWithArrows }
+\@@_msg_new:nnn { Unknown~option~DispWithArrows }
{
- The~key~'\l_keys_key_tl'~is~unknown~in~\{\l__wa_type_env_str\}. \\
- \c__wa_option_ignored_str \\
+ The~key~'\l_keys_key_tl'~is~unknown~in~\{\l_@@_type_env_str\}. \\
+ \c_@@_option_ignored_str \\
For~a~list~of~the~available~keys,~type~H~<return>.
}
{
The~available~keys~are~(in~alphabetic~order):~
- \seq_use:Nnnn \l__wa_options_DispWithArrows_seq {~and~} {,~} {~and~}.
+ \seq_use:Nnnn \l_@@_options_DispWithArrows_seq {~and~} {,~} {~and~}.
}
-\__wa_msg_new:nnn { Unknown~option~WithArrowsOptions }
+\@@_msg_new:nnn { Unknown~option~WithArrowsOptions }
{
The~key~'\l_keys_key_tl'~is~unknown~in~
\token_to_str:N \WithArrowsOptions. \\
- \c__wa_option_ignored_str \\
+ \c_@@_option_ignored_str \\
For~a~list~of~the~available~keys,~type~H~<return>.
}
{
The~available~keys~are~(in~alphabetic~order):~
- \seq_use:Nnnn \l__wa_options_WithArrowsOptions_seq {~and~} {,~} {~and~}.
+ \seq_use:Nnnn \l_@@_options_WithArrowsOptions_seq {~and~} {,~} {~and~}.
}
-\__wa_msg_new:nnn { Unknown~option~Arrow~in~code-after }
+\@@_msg_new:nnn { Unknown~option~Arrow~in~code-after }
{
The~key~'\l_keys_key_tl'~is~unknown~in~
\token_to_str:N \Arrow\ in~code-after. \\
- \c__wa_option_ignored_str \\
+ \c_@@_option_ignored_str \\
For~a~list~of~the~available~keys,~type~H~<return>.
}
{
The~available~keys~are~(in~alphabetic~order):~
- \seq_use:Nnnn \l__wa_options_Arrow_code_after_seq {~and~} {,~} {~and~}.
+ \seq_use:Nnnn \l_@@_options_Arrow_code_after_seq {~and~} {,~} {~and~}.
}
-\__wa_msg_new:nn { Too~much~columns~in~WithArrows }
+\@@_msg_new:nn { Too~much~columns~in~WithArrows }
{
- Your~environment~\{\l__wa_type_env_str\}~has~\int_use:N
- \l__wa_nb_cols_int\ columns~and~you~try~to~use~one~more.~
+ Your~environment~\{\l_@@_type_env_str\}~has~\int_use:N
+ \l_@@_nb_cols_int\ columns~and~you~try~to~use~one~more.~
Maybe~you~have~forgotten~a~\c_backslash_str\c_backslash_str.~
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.
}
-\__wa_msg_new:nn { Too~much~columns~in~DispWithArrows }
+\@@_msg_new:nn { Too~much~columns~in~DispWithArrows }
{
- Your~environment~\{\l__wa_type_env_str\}~has~\int_use:N
- \l__wa_nb_cols_int\ columns~and~you~try~to~use~one~more.~
+ Your~environment~\{\l_@@_type_env_str\}~has~\int_use:N
+ \l_@@_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__wa_line_int. \\
+ at~the~end~of~row~\int_use:N \g_@@_line_int. \\
This~error~is~fatal.
}
-\__wa_msg_new:nn { Negative~jump }
+\@@_msg_new:nn { Negative~jump }
{
You~can't~use~a~negative~value~for~the~option~'jump'~of~command~
- \l__wa_string_Arrow_for_msg_str\
- in~the~row~\int_use:N \g__wa_line_int\
- of~your~environment~\{\l__wa_type_env_str\}.~
+ \l_@@_string_Arrow_for_msg_str\
+ in~the~row~\int_use:N \g_@@_line_int\
+ of~your~environment~\{\l_@@_type_env_str\}.~
You~can~create~an~arrow~going~backwards~with~the~option~'<-'~of~Tikz. \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { new-group~without~groups }
+\@@_msg_new:nn { new-group~without~groups }
{
You~can't~use~the~option~'new-group'~for~the~command~
- \l__wa_string_Arrow_for_msg_str\
+ \l_@@_string_Arrow_for_msg_str\
because~you~are~not~in~'groups'~mode.~Try~to~use~the~option~
- 'groups'~in~your~environment~\{\l__wa_type_env_str\}. \\
- \c__wa_option_ignored_str
+ 'groups'~in~your~environment~\{\l_@@_type_env_str\}. \\
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn
+\@@_msg_new:nn
{ Too~few~lines~for~an~arrow }
{
- Line~\l__wa_input_line_str\
- :~an~arrow~specified~in~the~row~\int_use:N \l__wa_initial_int\
- of~your~environment~\{\l__wa_type_env_str\}~can't~be~drawn~
+ Line~\l_@@_input_line_str\
+ :~an~arrow~specified~in~the~row~\int_use:N \l_@@_initial_int\
+ of~your~environment~\{\l_@@_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.
}
-\__wa_msg_new:nn { WithArrows~outside~math~mode }
+\@@_msg_new:nn { WithArrows~outside~math~mode }
{
- The~environment~\{\l__wa_type_env_str\}~should~be~used~only~in~math~mode~
+ The~environment~\{\l_@@_type_env_str\}~should~be~used~only~in~math~mode~
like~the~environment~\{aligned\}~of~amsmath. \\
Nevertheless,~you~can~go~on.
}
-\__wa_msg_new:nn { DispWithArrows~in~math~mode }
+\@@_msg_new:nn { DispWithArrows~in~math~mode }
{
- The~environment~\{\l__wa_type_env_str\}~should~be~used~only~outside~math~
+ The~environment~\{\l_@@_type_env_str\}~should~be~used~only~outside~math~
mode~like~the~environment~\{align\}~of~amsmath. \\
This~error~is~fatal.
}
-\__wa_msg_new:nn { Incompatible~options~in~Arrow }
+\@@_msg_new:nn { Incompatible~options~in~Arrow }
{
You~try~to~use~the~option~'\l_keys_key_tl'~but~
this~option~is~incompatible~or~redundant~with~the~option~
- '\l__wa_previous_key_str'~set~in~the~same~command~
- \l__wa_string_Arrow_for_msg_str. \\
- \c__wa_option_ignored_str
+ '\l_@@_previous_key_str'~set~in~the~same~command~
+ \l_@@_string_Arrow_for_msg_str. \\
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Incompatible~options }
+\@@_msg_new:nn { Incompatible~options }
{ You~try~to~use~the~option~'\l_keys_key_tl'~but~
this~option~is~incompatible~or~redundant~with~the~option~
- '\l__wa_previous_key_str'~set~in~the~same~command~
- \bool_if:NT \l__wa_in_code_after_bool
+ '\l_@@_previous_key_str'~set~in~the~same~command~
+ \bool_if:NT \l_@@_in_code_after_bool
{
- \l__wa_string_Arrow_for_msg_str\
- in~the~code-after~of~your~environment~\{\l__wa_type_env_str\}
+ \l_@@_string_Arrow_for_msg_str\
+ in~the~code-after~of~your~environment~\{\l_@@_type_env_str\}
}. \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Arrow~not~in~last~column }
+\@@_msg_new:nn { Arrow~not~in~last~column }
{
- You~should~use~the~command~\l__wa_string_Arrow_for_msg_str\
- only~in~the~last~column~(column~\int_use:N\l__wa_nb_cols_int)~
- of~your~environment~\{\l__wa_type_env_str\}.\\
+ You~should~use~the~command~\l_@@_string_Arrow_for_msg_str\
+ only~in~the~last~column~(column~\int_use:N\l_@@_nb_cols_int)~
+ of~your~environment~\{\l_@@_type_env_str\}.\\
However~you~can~go~on~for~this~time.
}
-\__wa_msg_new:nn { Wrong~line~in~Arrow }
+\@@_msg_new:nn { Wrong~line~in~Arrow }
{
The~specification~of~line~'#1'~you~use~in~the~command~
- \l__wa_string_Arrow_for_msg_str\
- in~the~'code-after'~of~\{\l__wa_type_env_str\}~doesn't~exist. \\
- \c__wa_option_ignored_str
+ \l_@@_string_Arrow_for_msg_str\
+ in~the~'code-after'~of~\{\l_@@_type_env_str\}~doesn't~exist. \\
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Both~lines~are~equal }
+\@@_msg_new:nn { Both~lines~are~equal }
{
- In~the~'code-after'~of~\{\l__wa_type_env_str\}~you~try~to~
+ In~the~'code-after'~of~\{\l_@@_type_env_str\}~you~try~to~
draw~an~arrow~going~to~itself~from~the~line~'#1'.~This~is~not~possible. \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Wrong~line~specification~in~MultiArrow }
+\@@_msg_new:nn { Wrong~line~specification~in~MultiArrow }
{
The~specification~of~line~'#1'~doesn't~exist. \\
If~you~go~on,~it~will~be~ignored~for~\token_to_str:N \MultiArrow.
}
-\__wa_msg_new:nn { Too~small~specification~for~MultiArrow }
+\@@_msg_new:nn { Too~small~specification~for~MultiArrow }
{
The~specification~of~lines~you~gave~to~\token_to_str:N \MultiArrow\
is~too~small:~you~need~at~least~two~lines. \\
- \c__wa_command_ignored_str
+ \c_@@_command_ignored_str
}
-\__wa_msg_new:nn { Not~allowed~in~DispWithArrows }
+\@@_msg_new:nn { Not~allowed~in~DispWithArrows }
{
The~command~\token_to_str:N #1
is~allowed~only~in~the~last~column~
- (column~\int_use:N\l__wa_nb_cols_int)~of~\{\l__wa_type_env_str\}. \\
- \c__wa_option_ignored_str
+ (column~\int_use:N\l_@@_nb_cols_int)~of~\{\l_@@_type_env_str\}. \\
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Not~allowed~in~WithArrows }
+\@@_msg_new:nn { Not~allowed~in~WithArrows }
{
- The~command~\token_to_str:N #1 is~not~allowed~in~\{\l__wa_type_env_str\}~
+ The~command~\token_to_str:N #1 is~not~allowed~in~\{\l_@@_type_env_str\}~
(it's~allowed~in~the~last~column~of~\{DispWithArrows\}). \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Inexistent~v-node }
+\@@_msg_new:nn { Inexistent~v-node }
{
There~is~a~problem.~Maybe~you~have~put~a~command~\token_to_str:N\cr\
instead~of~a~command~\token_to_str:N\\~at~the~end~of~
the~row~\l_tmpa_int\
- of~your~environment~\{\l__wa_type_env_str\}. \\
+ of~your~environment~\{\l_@@_type_env_str\}. \\
This~error~is~fatal.
}
-\__wa_msg_new:nn { Option~xoffset~forbidden }
+\@@_msg_new:nn { Option~xoffset~forbidden }
{
You~can't~use~the~option~'xoffset'~in~the~command~
- \l__wa_string_Arrow_for_msg_str\ in~the~row~\int_use:N \g__wa_line_int\
- of~your~environment~\{\l__wa_type_env_str\}~
+ \l_@@_string_Arrow_for_msg_str\ in~the~row~\int_use:N \g_@@_line_int\
+ of~your~environment~\{\l_@@_type_env_str\}~
because~you~are~using~the~option~
- ' \int_compare:nNnTF \l__wa_pos_arrow_int = 7
+ ' \int_compare:nNnTF \l_@@_pos_arrow_int = 7
{ group }
{ groups } '.~It's~possible~for~an~independent~arrow~or~if~there~is~
only~one~arrow. \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nnn { Duplicate~name }
+\@@_msg_new:nnn { Duplicate~name }
{
The~name~'\l_keys_value_tl'~is~already~used~and~you~shouldn't~use~
the~same~environment~name~twice.~You~can~go~on,~but,~
@@ -1649,12 +1655,12 @@
}
{
The~names~already~defined~in~this~document~are:~
- \seq_use:Nnnn \g__wa_names_seq { ,~ } { ,~ } { ~and~ }.
+ \seq_use:Nnnn \g_@@_names_seq { ,~ } { ,~ } { ~and~ }.
}
\cs_new_protected:Npn \WithArrowsNewStyle #1 #2
{
\keys_if_exist:nnTF { WithArrows / Global } { #1 }
- { \__wa_error:nn { Key~already~defined } { #1 } }
+ { \@@_error:nn { Key~already~defined } { #1 } }
{
\keys_define:nn { WithArrows / Global }
{
@@ -1661,10 +1667,10 @@
#1 .code:n =
{ \keys_set_known:nn { WithArrows / WithArrowsOptions } { #2 } }
}
- \seq_put_right:Nx \l__wa_options_WithArrows_seq { \tl_to_str:n { #1 } }
- \seq_put_right:Nx \l__wa_options_DispWithArrows_seq
+ \seq_put_right:Nx \l_@@_options_WithArrows_seq { \tl_to_str:n { #1 } }
+ \seq_put_right:Nx \l_@@_options_DispWithArrows_seq
{ \tl_to_str:n { #1 } }
- \seq_put_right:Nx \l__wa_options_WithArrowsOptions_seq
+ \seq_put_right:Nx \l_@@_options_WithArrowsOptions_seq
{ \tl_to_str:N { #1 } }
\group_begin:
\msg_set:nnn { witharrows } { Unknown~option~WithArrowsOptions }
@@ -1677,13 +1683,13 @@
\group_end:
}
}
-\__wa_msg_new:nn { Key~already~defined }
+\@@_msg_new:nn { Key~already~defined }
{
The~key~'#1'~is~already~defined. \\
If~you~go~on,~your~instruction~\token_to_str:N\WithArrowsNewStyle\
will~be~ignored.
}
-\tl_const:Nn \c__wa_tikz_code_up_tl
+\tl_const:Nn \c_@@_tikz_code_up_tl
{
\draw [ rounded~corners ]
let \p1 = (#1) ,
@@ -1693,7 +1699,7 @@
}
(\x2,\y1) -- (\p2) ;
}
-\tl_const:Nn \c__wa_tikz_code_down_tl
+\tl_const:Nn \c_@@_tikz_code_down_tl
{
\draw [ rounded~corners ]
let \p1 = (#1) ,
@@ -1706,8 +1712,8 @@
}
\keys_define:nn { WithArrows / Arrow / FirstPass }
{
- up .code:n = \__wa_set_independent: ,
- down .code:n = \__wa_set_independent: ,
+ up .code:n = \@@_set_independent: ,
+ down .code:n = \@@_set_independent: ,
up .default:n = NoValue ,
down .default:n = NoValue
}
@@ -1714,52 +1720,52 @@
\keys_define:nn { WithArrows / Arrow / SecondPass }
{
up .code:n =
- \str_if_empty:NT \l__wa_previous_key_str
+ \str_if_empty:NT \l_@@_previous_key_str
{
- \str_set:Nn \l__wa_previous_key_str { up }
+ \str_set:Nn \l_@@_previous_key_str { up }
\cs_if_exist:cTF { tikz at library@calc at loaded }
{
- \int_set:Nn \l__wa_pos_arrow_int \c_one_int
- \bool_set_false:N \l__wa_wrap_lines_bool
- \tl_set_eq:NN \l__wa_tikz_code_tl
- \c__wa_tikz_code_up_tl
+ \int_set:Nn \l_@@_pos_arrow_int \c_one_int
+ \bool_set_false:N \l_@@_wrap_lines_bool
+ \tl_set_eq:NN \l_@@_tikz_code_tl
+ \c_@@_tikz_code_up_tl
}
- { \__wa_error:n { calc~not~loaded } }
+ { \@@_error:n { calc~not~loaded } }
} ,
down .code:n =
- \str_if_empty:NT \l__wa_previous_key_str
+ \str_if_empty:NT \l_@@_previous_key_str
{
- \str_set:Nn \l__wa_previous_key_str { down }
+ \str_set:Nn \l_@@_previous_key_str { down }
\cs_if_exist:cTF { tikz at library@calc at loaded }
{
- \int_set:Nn \l__wa_pos_arrow_int \c_one_int
- \bool_set_false:N \l__wa_wrap_lines_bool
- \tl_set_eq:NN \l__wa_tikz_code_tl
- \c__wa_tikz_code_down_tl
+ \int_set:Nn \l_@@_pos_arrow_int \c_one_int
+ \bool_set_false:N \l_@@_wrap_lines_bool
+ \tl_set_eq:NN \l_@@_tikz_code_tl
+ \c_@@_tikz_code_down_tl
}
- { \__wa_error:n { calc~not~loaded } }
+ { \@@_error:n { calc~not~loaded } }
}
}
-\seq_put_right:Nn \l__wa_options_Arrow_seq { down }
-\seq_put_right:Nn \l__wa_options_Arrow_seq { up }
-\__wa_msg_new:nn { varwidth~not~loaded }
+\seq_put_right:Nn \l_@@_options_Arrow_seq { down }
+\seq_put_right:Nn \l_@@_options_Arrow_seq { up }
+\@@_msg_new:nn { varwidth~not~loaded }
{
You~can't~use~the~option~'\l_keys_key_tl'~because~
you~don't~have~loaded~the~package~'varwidth'. \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { calc~not~loaded }
+\@@_msg_new:nn { calc~not~loaded }
{
You~can't~use~the~option~'\l_keys_key_tl'~because~you~don't~have~loaded~the~
Tikz~library~'calc'.You~should~add~'\token_to_str:N\usetikzlibrary{calc}'~
~in~the~preamble~of~your~document. \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Invalid~specification~for~MultiArrow }
+\@@_msg_new:nn { Invalid~specification~for~MultiArrow }
{
The~specification~of~rows~for~\token_to_str:N\MultiArrow\
(i.e.~#1)~is~invalid. \\
- \c__wa_command_ignored_str
+ \c_@@_command_ignored_str
}
\catcode `\@ = 12
\ExplSyntaxOff
Modified: trunk/Master/texmf-dist/source/generic/witharrows/witharrows.dtx
===================================================================
--- trunk/Master/texmf-dist/source/generic/witharrows/witharrows.dtx 2019-12-10 22:17:04 UTC (rev 53088)
+++ trunk/Master/texmf-dist/source/generic/witharrows/witharrows.dtx 2019-12-10 22:17:20 UTC (rev 53089)
@@ -15,8 +15,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{2.1}
-\def\myfiledate{2019/10/21}
+\def\myfileversion{2.2}
+\def\myfiledate{2019/12/10}
%
%
%<*batchfile>
@@ -57,7 +57,7 @@
\usepackage{varwidth}
\labelformat{equation}{(#1)}
\NewDocumentEnvironment {scope} {} {} {}
-\def\interitem{\vskip 7mm plus 2 mm minus 3mm}
+\def\interitem{\vspace{7mm plus 2 mm minus 3mm}}
\def\emphase{\bgroup\color{RoyalPurple}\let\next=}
\fvset{commandchars=\~\#\@,formatcom={\color{gray}}}
\DeclareMathOperator{\re}{Re}
@@ -80,9 +80,9 @@
% {
% pdfinfo =
% {
-% Title = { The extension 'witharrows' } ,
-% Subject = { An extension for plain-TeX and LaTeX} ,
-% Author = { F. Pantigny }
+% Title = The extension 'witharrows' ,
+% Subject = An extension for plain-TeX and LaTeX ,
+% Author = F. Pantigny
% }
% }
%
@@ -180,7 +180,7 @@
%
% \interitem
% The option |xoffset| shifts the arrow to the right (we usually don't want the
-% arrows to be stucked on the text). The default value of |xoffset| is $3$~mm.
+% arrows to be stucked on the text). The initial value of |xoffset| is $3$~mm.
% \begin{Verbatim}
% $\begin{WithArrows}
% A & = \bigl((a+b)+1\bigr)^2
@@ -508,7 +508,7 @@
% it's possible to use the environment with an arbitrary number of columns with
% the option |format|. The value given to this option is like the preamble of an
% environment |{array}|, that is to say a sequence of letters |r|, |c| and |l|.
-% The default value of the option |format| is, in fact, |rl|.
+% The initial value of the option |format| is, in fact, |rl|.
%
% \bigskip
% For exemple, if we want only one column left-aligned, we use the option |format=l|.
@@ -879,7 +879,7 @@
%
% \interitem
% Like the environment |{aligned}|, |{WithArrows}| has an option of placement
-% which can assume the values |t|, |c| or |b|. However, the default value is not
+% which can assume the values |t|, |c| or |b|. However, the initial value is not
% |c| but |t|. If desired, it's possible to have the |c| value as the default
% with the command |\WithArrowsOptions{c}| at the beginning of the document.
% %
@@ -1032,7 +1032,7 @@
%
% \smallskip
% A command |\Arrow| in |code-after| takes three arguments :
-% \begin{itemize}
+% \begin{itemize}[beginpenalty=10000]
% \item a specification of the start row of the arrow ;
% \item a specification of the end row of the arrow ;
% \item the label of the arrow.
@@ -1095,7 +1095,7 @@
% \end{WithArrows}$
%
% \bigskip
-% The options allowed for a command |\Arrow| in |code-after| are : |ll|, |lr|,
+% The options allowed for a command |\Arrow| in |code-after| are: |ll|, |lr|,
% |rl|, |rr|, |v|, |xoffset|, |tikz| and |tikz-code|. Except |v|, which is
% specific to |\Arrow| in |code-after|, all these options have their usual
% meaning.
@@ -1215,7 +1215,7 @@
% \medskip
% The package \pkg{witharrows} provides some tools facilitating the use of these
% nodes:
-% \begin{itemize}
+% \begin{itemize}[beginpenalty=10000]
% \item the command |\WithArrowsLastEnv| gives the number of the last
% environment of level~$0$ (\emph{i.e.} which is not included in another
% environment of the package \pkg{witharrows});
@@ -1372,7 +1372,7 @@
% & = a^2 + 2a + 1 \tag{$\star$} \label{my-equation}
% \end{DispWithArrows}
% A link to the equation \ref{my-equation}.\footnote{In this document, the
-% references has been customized with |\labelformat{equation}{(#1)}|}
+% references have been customized with |\labelformat{equation}{(#1)}| in the preamble.}
%
%
% \medskip
@@ -1434,7 +1434,7 @@
% With the option |fleqn|, the environment is composed flush left (in a way
% similar to the option |fleqn| of the standard classes of LaTeX). In this case,
% the left margin can be controlled with the option |mathindent| (with a name
-% inspired by the parameter |\mathindent| of standard LaTeX). The default value
+% inspired by the parameter |\mathindent| of standard LaTeX). The initial value
% of this parameter is 25~pt.
%
% \begin{Verbatim}
@@ -1449,7 +1449,7 @@
% \end{DispWithArrows}
%
% \medskip
-% \emph{Remark} : By design, the option |fleqn| of \pkg{witharrows} is
+% \emph{Remark}: By design, the option |fleqn| of \pkg{witharrows} is
% independent of the option |fleqn| of LaTeX. Indeed, since the environments of
% \pkg{witharrows} are meant to be used with arrows on the right side, the user
% may want to use \pkg{witharrows} with the option |fleqn| (in order to have
@@ -1467,12 +1467,12 @@
% If the package \pkg{amsmath} is loaded, it's possible to use the command
% |\intertext| in the environments |{DispWithArrows}|. It's also possible to use
% the environment |{subequations}|. However, there is, for the environments
-% |{DispWithArrows}| an option |subequations| to encapsulate the environment in
+% |{DispWithArrows}|, an option |subequations| to encapsulate the environment in
% an environment |{subequations}|.
%
% \medskip
% In the following example, the key |{subequations}| is fixed by the command
-% |\WithArrowsOptions|. Each environment |{DispWithArrows}| will subnumerated
+% |\WithArrowsOptions|. Each environment |{DispWithArrows}| will be subnumerated
% (in the scope of the |\WithArrowsOptions|)
% \begin{Verbatim}
% ~emphase#\WithArrowsOptions{subequations}@
@@ -1616,7 +1616,7 @@
% (in fact, it's possible to use \pkg{witharrows} without \pkg{amsmath}).
%
% There are differences between |{DispWithArrows}| and |{align}|.
-% \begin{itemize}
+% \begin{itemize}[beginpenalty=10000]
% \item The environment |{DispWithArrows}| cannot be inserted in an environment
% |{gather}| of \pkg{amsmath}.
% \item An environment |{DispWithArrows}| is always unbreakable (even with
@@ -1688,10 +1688,10 @@
%
% \interitem
% In the following example, we subnumerate the equations with the option
-% |subnumerate| (available when the package \pkg{amsmath} is loaded).
+% |subequations| (available when the package \pkg{amsmath} is loaded).
%
% \begin{Verbatim}
-% \begin{DispWithArrows}~emphase#< \label{system} (\ref*{system}) \Leftrightarrow >@[
+% \begin{DispWithArrows}~emphase#< \label{system} \ref*{system} \Leftrightarrow >@[
% format = l, subequations ]
% x+y+z = -3 \Arrow[tikz=-,jump=2]{3 equations} \\
% xy+xz+yz=-2 \\
@@ -1699,7 +1699,7 @@
% \end{DispWithArrows}
% \end{Verbatim}
% %
-% \begin{DispWithArrows}< \label{system} (\ref*{system}) \Leftrightarrow >[
+% \begin{DispWithArrows}< \label{system} \ref*{system} \Leftrightarrow >[
% format = l, subequations]
% x+y+z = -3 \Arrow[tikz=-,jump=2]{3 equations} \\
% xy+xz+yz=-2 \\
@@ -1708,7 +1708,7 @@
%
%
% \bigskip
-% The whole system is the equation \eqref{system} (this reference has been coded
+% The whole system is the equation \ref{system} (this reference has been coded
% by |\ref{system}|) whereas the last equation is the equation
% \ref{last-equation} (this reference has been coded by
% |\ref{last-equation}|). The command |\ref*| used in the code above is
@@ -1748,7 +1748,7 @@
%
% \medskip
% The version of \pkg{witharrows} for plain-TeX doesn't provide all the
-% functionnlities of the LaTeX version. In particular, the funcionnalities which
+% functionnalities of the LaTeX version. In particular, the functionnalities which
% deal with the number of the equations are not available (since they rely upon
% the system of tags of LaTeX).
%
@@ -1857,11 +1857,11 @@
% \medskip
% We first explain the behaviour when the parameters |start-adjust| and
% |end-adjust| are equal to zero:
-% \begin{itemize}
+% \begin{itemize}[beginpenalty=10000]
% \item the option |ystart| sets the vertical distance between the base line of
-% the text and the start of the arrow (default value: 0.4 ex);
+% the text and the start of the arrow (initial value: 0.4 ex);
% \item the option |ygap| sets the vertical distance between two consecutive
-% arrows (default value: 0.4~ex).
+% arrows (initial value: 0.4~ex).
% \end{itemize}
%
%
@@ -1911,7 +1911,7 @@
%
% \bigskip
% Here is the standard behaviour since version 1.13 (the parameters
-% |start-adjust| and |end-ajust| are used with the default value $0.4$~ex). The
+% |start-adjust| and |end-ajust| are used with the initial value $0.4$~ex). The
% arrow is longer and the result is more aesthetic.
%
% \medskip
@@ -1929,8 +1929,8 @@
% Since the version 2.1 of \pkg{witharrows}, an arrow of |jump| equal to~$1$ has
% a maximal length\footnote{We call \emph{length} of an arrow the difference
% between the $y$-value of its start point and the $y$~value of its end point.}
-% equal to the parameter |max-length-of-arrow|. The default value of this
-% parameter est $2$~cm.
+% equal to the parameter |max-length-of-arrow|. The initial value of this
+% parameter is $2$~cm.
%
% In the following example, the value of |max-length-of-arrow| has been fixed to
% $1.5$~cm.
@@ -1949,7 +1949,7 @@
% $L_2 \gets L_2-L_1$ \\
% $L_3 \gets L_3-L_1$ \\
% $L_4 \gets L_4-L_1$ \\
-% $L_5 \gets L_5-L_1$ % don't put \\ ici
+% $L_5 \gets L_5-L_1$ % don't put \\ here
% } \\
% & =
% \begin{vmatrix}
@@ -2423,14 +2423,12 @@
% |expl3| code fails.\footnote{cf.
% |tex.stackexchange.com/questions/57424/using-of-usetikzlibrary-in-an-expl3-package-fails|}
%
-% \begin{macrocode}
-%<@@=wa>
-% \end{macrocode}
+% <@@=witharrows>
%
% \begin{macrocode}
%<*LaTeX>
\RequirePackage{tikz}
-\RequirePackage{expl3}[2019/02/15]
+\RequirePackage{expl3}[2019/07/01]
%</LaTeX>
%<*plain-TeX>
\input tikz.tex
@@ -2457,7 +2455,7 @@
% |{WithArrows}|, |{DispWithArrows}|, |{DispWithArrows*}| and the commands
% |\Arrow|, |\WithArrowsOptions| and |\WithArrowsNewStyle|.
% \begin{macrocode}
-\RequirePackage { xparse } [ 2018-10-17 ]
+\RequirePackage { xparse } [ 2019-01-01 ]
%</LaTeX>
% \end{macrocode}
%
@@ -2955,10 +2953,10 @@
% \bigskip
% In the |\halign| of an environment |{WithArrows}| or |{DispWithArrows}|, we
% will have to use four counters:
-% \begin{itemize}
+% \begin{itemize}[beginpenalty=10000]
% \item |\g_@@_arrow_int| to count the arrows created in the environment ;
% \item |\g_@@_line_int| to count the lines of the |\halign| ;
-% \item |\g_@@_col_int| to count the column of the |\halign|.
+% \item |\g_@@_col_int| to count the columns of the |\halign|.
% \end{itemize}
%
%
@@ -2975,6 +2973,16 @@
\seq_new:N \g_@@_col_int_seq
\int_new:N \g_@@_col_int
% \end{macrocode}
+%
+% We will also use a ``static'' version of the counter of columns, called
+% |\g_@@_static_col_int|. The value will be set directly in each cell of the
+% array by an instruction in the template of the |\halign|. The aim of this
+% programmation is to try to detect some utilisation of |\omit| (which should be
+% forbidden) in the cells of the |\halign|.
+% \begin{macrocode}
+\seq_new:N \g_@@_static_col_int_seq
+\int_new:N \g_@@_static_col_int
+% \end{macrocode}
%
%
% \bigskip
@@ -2981,7 +2989,7 @@
% For the environment |{DispWithArrows}|, the comma list |\l_@@_tags_clist| will
% be the list of the numbers of lines to be tagged (with the counter |equation|
% of LaTeX). In fact, |\l_@@_tags_clist| may contain non negative integers but
-% also three special values, |first|, |last| and |all|.
+% also three special values: |first|, |last| and |all|.
% \begin{macrocode}
%<*LaTeX>
\clist_new:N \l_@@_tags_clist
@@ -3005,7 +3013,7 @@
% \bigskip
% If the user has given a value for the option |command-name| (at the global or
% at the \emph{environment} level), a command with this name is defined locally
-% in the environment with meaning |\@@_Arrow|. The default value of the option
+% in the environment with meaning |\@@_Arrow|. The initial value of the option
% |command-name| is ``|Arrow|'' and thus, by default, the name of the command
% will be |\Arrow|.
% \begin{macrocode}
@@ -3071,7 +3079,7 @@
% \end{macrocode}
%
% \bigskip
-% The option boolean corresponds to the option |subequations|.
+% The option |\l_@@_subequations_bool| corresponds to the option |subequations|.
% \begin{macrocode}
%<*LaTeX>
\bool_new:N \l_@@_subequations_bool
@@ -3082,7 +3090,7 @@
% \subsection{The definition of the options}
%
% There are four levels where options can be set:
-% \begin{itemize}
+% \begin{itemize}[beginpenalty=10000]
% \item with |\usepackage[...]{witharrows}|: this level will be called
% \emph{package} level;
% \item with |\WithArrowsOptions{...}|: this level will be called \emph{global}
@@ -3856,9 +3864,9 @@
% \end{macrocode}
%
%
-% The initialization of the counters |\g_@@_arrow_int|, |\g_@@_line_int| and
-% |\g_@@_col_int|. However, we have to save their previous values with the
-% stacks created for this end.
+% The initialization of the counters |\g_@@_arrow_int|, |\g_@@_line_int|,
+% |\g_@@_col_int| and |\g_@@_static_col_int|. However, we have to save their
+% previous values with the stacks created for this end.
% \begin{macrocode}
\seq_gput_right:NV \g_@@_arrow_int_seq \g_@@_arrow_int
\int_gzero:N \g_@@_arrow_int
@@ -3866,6 +3874,8 @@
\int_gzero:N \g_@@_line_int
\seq_gput_right:NV \g_@@_col_int_seq \g_@@_col_int
\int_gzero:N \g_@@_col_int
+ \seq_gput_right:NV \g_@@_static_col_int_seq \g_@@_static_col_int
+ \int_gzero:N \g_@@_static_col_int
% \end{macrocode}
%
% In the preamble of the |\halign|, there will be \emph{two} counters of the
@@ -3875,15 +3885,12 @@
% is a third column in the environment), we will have the following instructions :
% \begin{Verbatim}
% \int_gincr:N \g_~@~@_col_int
-% \int_gset:Nn \g_~@~@_static_col_int 3
+% \int_set:Nn \g_~@~@_static_col_int 3
% \end{Verbatim}
% The counter |\g_@@_col_int| is incremented dynamically and the second is
% static. If the user has used a command |\omit|, the dynamic incrementation is
-% not done in the cell and, at this end of the row, the difference between the
+% not done in the cell and, at the end of the row, the difference between the
% counters may infer the presence of |\omit| at least once.
-% \begin{macrocode}
- \int_gzero_new:N \g_@@_static_col_int
-% \end{macrocode}
%
% \bigskip
% We also have to update the position on the nesting tree.
@@ -3924,7 +3931,7 @@
%
% \medskip
% The counter |\l_@@_jump_int| corresponds to the option |jump|. Now, we set the
-% default value for this option.
+% initial value for this option.
% \begin{macrocode}
\int_set:Nn \l_@@_jump_int \c_one_int
% \end{macrocode}
@@ -3931,7 +3938,7 @@
%
% \medskip
% The string |\l_@@_format_str| corresponds to the option |format|. Now, we set
-% the default value for this option.
+% the initial value for this option.
% \begin{macrocode}
\str_set:Nn \l_@@_format_str { rl }
% \end{macrocode}
@@ -4004,7 +4011,7 @@
%
% \medskip
% Be careful! The following counter |\g_@@_col_int| will be used for two usages:
-% \begin{itemize}
+% \begin{itemize}[beginpenalty=10000]
% \item during, the construction of the preamble of the |\halign|, it will be
% used as counter for the number of the column under construction in the
% preamble (since the preamble is constructed backwards, |\g_@@_col_int| will go
@@ -4082,7 +4089,7 @@
%
% Several important points must be noted concerning that construction of the
% preamble.
-% \begin{itemize}
+% \begin{itemize}[beginpenalty=10000]
% \item The construction of the preamble is done by reading backwards the
% format |\l_@@_format_str| and adding the corresponding tokens in the input
% stream of TeX. That means that the part of the preamble concerning the last
@@ -4379,8 +4386,17 @@
\cs_set:Npn \WithArrowsRightX { \g_@@_right_x_dim }
% \end{macrocode}
%
+% \bigskip
+% We use |\normalbaselines| of plain-TeX because we have used
+% |\spread at equation| (of \pkg{amsmath} or defined directly if \pkg{amsmath} is
+% not loaded) and you don't want |\spread at equation| to have effects in the
+% labels of the arrows.
+% \begin{macrocode}
+ \normalbaselines
+% \end{macrocode}
+%
% \bigskip
-% It there is really arrows in the environment, we draw the arrows.
+% If there is really arrows in the environment, we draw the arrows.
% \begin{macrocode}
\int_compare:nNnT \g_@@_arrow_int > 0
{
@@ -4444,7 +4460,7 @@
%
% \bigskip
% Finally, we restore the previous values of the counters |\g_@@_arrow_int|,
-% |\g_@@_line_int| and |\g_@@_col_int|. It is recalled that we manage three
+% |\g_@@_col_int| and |\g_@@_static_col_int|. It is recalled that we manage four
% stacks in order to be able to do such a restoration.
% \begin{macrocode}
\seq_gpop_right:NN \g_@@_arrow_int_seq \l_tmpa_tl
@@ -4453,6 +4469,8 @@
\int_gset:Nn \g_@@_line_int \l_tmpa_tl
\seq_gpop_right:NN \g_@@_col_int_seq \l_tmpa_tl
\int_gset:Nn \g_@@_col_int \l_tmpa_tl
+ \seq_gpop_right:NN \g_@@_static_col_int_seq \l_tmpa_tl
+ \int_gset:Nn \g_@@_static_col_int \l_tmpa_tl
}
% \end{macrocode}
% That's the end of the command |\@@_post_halign:|.
@@ -4699,7 +4717,7 @@
{
\exp_args:NV \str_if_eq:nnT \l_@@_type_env_str { #2 }
{
- \@@_warning:n { newline~at~the~end~of~env }
+ \@@_error:n { newline~at~the~end~of~env }
\group_begin:
\globaldefs = 1
\@@_msg_redirect_name:nn { newline~at~the~end~of~env } { none }
@@ -5300,7 +5318,7 @@
%
% \bigskip
% The arrows are divided in groups. There is two reasons for this division.
-% \begin{itemize}
+% \begin{itemize}[beginpenalty=10000]
% \item If the option |group| or the option |groups| is used, all the arrows of
% a group are drawn on a same vertical at an abscissa of |\l_@@_x_dim|.
% \item For aesthetic reasons, the starting point of all the starting arrows of
@@ -5742,7 +5760,7 @@
% \bigskip
% We compute and store in |\g_tmpa_tl| and |\g_tmpb_tl| the exact coordinates of
% the extremities of the arrow.
-% \begin{itemize}
+% \begin{itemize}[beginpenalty=10000]
% \item Concerning the
% $x$-values, the abscissa computed in |\l_@@_x_dim| will be used if the option
% of position is |i|, |group| or |groups|.
@@ -6365,7 +6383,8 @@
{
The~environments~of~witharrows~(\{WithArrows\}~and~
\{DispWithArrows\})~should~not~end~by~\token_to_str:N \\.\\
- This~warning~might~become~an~error~in~a~future~version.
+ However,~you~can~go~on~for~this~time.~No~similar~error~will~be~
+ raised~in~this~document.
}
%</LaTeX>
% \end{macrocode}
@@ -7127,12 +7146,18 @@
% A version of \pkg{witharrows} is available for plain-TeX.
%
%
-% \subsection*{Changes between 2.0 and 2.1 }
+% \subsection*{Changes between 2.0 and 2.1}
%
% Option |max-length-of-arrow|.
%
% Validation with regular expression for the first argument of |\MultiArrow|.
%
+% \subsection*{Changes between 2.1 and 2.2}
+%
+% Addition of |\normalbaselines| at the beginning of |\@@_post_halign:|.
+%
+% The warning for an environment ending by |\\| has been transformed in |error|.
+%
% \PrintIndex
%
% \tableofcontents
Modified: trunk/Master/texmf-dist/tex/generic/witharrows/witharrows.sty
===================================================================
--- trunk/Master/texmf-dist/tex/generic/witharrows/witharrows.sty 2019-12-10 22:17:04 UTC (rev 53088)
+++ trunk/Master/texmf-dist/tex/generic/witharrows/witharrows.sty 2019-12-10 22:17:20 UTC (rev 53089)
@@ -18,10 +18,10 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\def\myfileversion{2.1}
-\def\myfiledate{2019/10/21}
+\def\myfileversion{2.2}
+\def\myfiledate{2019/12/10}
\RequirePackage{tikz}
-\RequirePackage{expl3}[2019/02/15]
+\RequirePackage{expl3}[2019/07/01]
\usetikzlibrary{arrows.meta,bending}
\RequirePackage{l3keys2e}
\ProvidesExplPackage
@@ -29,26 +29,26 @@
{\myfiledate}
{\myfileversion}
{Draws arrows for explanations on the right}
-\RequirePackage { xparse } [ 2018-10-17 ]
-\bool_new:N \g__wa_footnotehyper_bool
-\bool_new:N \g__wa_footnote_bool
-\cs_new_protected:Npn \__wa_msg_new:nn { \msg_new:nnn { witharrows } }
-\cs_new_protected:Npn \__wa_msg_new:nnn { \msg_new:nnnn { witharrows } }
-\cs_new_protected:Npn \__wa_msg_redirect_name:nn
+\RequirePackage { xparse } [ 2019-01-01 ]
+\bool_new:N \g_@@_footnotehyper_bool
+\bool_new:N \g_@@_footnote_bool
+\cs_new_protected:Npn \@@_msg_new:nn { \msg_new:nnn { witharrows } }
+\cs_new_protected:Npn \@@_msg_new:nnn { \msg_new:nnnn { witharrows } }
+\cs_new_protected:Npn \@@_msg_redirect_name:nn
{ \msg_redirect_name:nnn { witharrows } }
-\cs_new_protected:Npn \__wa_error:n { \msg_error:nn { witharrows } }
-\cs_new_protected:Npn \__wa_warning:n { \msg_warning:nn { witharrows } }
-\cs_new_protected:Npn \__wa_fatal:n { \msg_fatal:nn { witharrows } }
-\cs_new_protected:Npn \__wa_error:nn { \msg_error:nnn { witharrows } }
-\cs_generate_variant:Nn \__wa_error:nn { n x }
+\cs_new_protected:Npn \@@_error:n { \msg_error:nn { witharrows } }
+\cs_new_protected:Npn \@@_warning:n { \msg_warning:nn { witharrows } }
+\cs_new_protected:Npn \@@_fatal:n { \msg_fatal:nn { witharrows } }
+\cs_new_protected:Npn \@@_error:nn { \msg_error:nnn { witharrows } }
+\cs_generate_variant:Nn \@@_error:nn { n x }
\keys_define:nn { WithArrows / package }
{
- footnote .bool_gset:N = \g__wa_footnote_bool ,
- footnotehyper .bool_gset:N = \g__wa_footnotehyper_bool ,
+ footnote .bool_gset:N = \g_@@_footnote_bool ,
+ footnotehyper .bool_gset:N = \g_@@_footnotehyper_bool ,
unknown .code:n =
- \__wa_fatal:n { Option~unknown~for~package }
+ \@@_fatal:n { Option~unknown~for~package }
}
-\__wa_msg_new:nn { Option~unknown~for~package }
+\@@_msg_new:nn { Option~unknown~for~package }
{
You~can't~use~the~option~'\l_keys_key_tl'~when~loading~the~
package~witharrows.~Try~to~use~the~command~
@@ -55,12 +55,12 @@
\token_to_str:N\WithArrowsOptions.
}
\ProcessKeysOptions { WithArrows / package }
-\__wa_msg_new:nn { Option~incompatible~with~Beamer }
+\@@_msg_new:nn { Option~incompatible~with~Beamer }
{
The~option~'\l_keys_key_tl'\ is~incompatible~
with~Beamer~because~Beamer~has~its~own~system~to~extract~footnotes.
}
-\__wa_msg_new:nn { footnote~with~footnotehyper~package }
+\@@_msg_new:nn { footnote~with~footnotehyper~package }
{
You~can't~use~the~option~'footnote'~because~the~package~
footnotehyper~has~already~been~loaded.~
@@ -69,7 +69,7 @@
of~the~package~footnotehyper.\\
If~you~go~on,~the~package~footnote~won't~be~loaded.
}
-\__wa_msg_new:nn { footnotehyper~with~footnote~package }
+\@@_msg_new:nn { footnotehyper~with~footnote~package }
{
You~can't~use~the~option~'footnotehyper'~because~the~package~
footnote~has~already~been~loaded.~
@@ -78,29 +78,29 @@
of~the~package~footnote.\\
If~you~go~on,~the~package~footnotehyper~won't~be~loaded.
}
-\bool_if:NT \g__wa_footnote_bool
+\bool_if:NT \g_@@_footnote_bool
{
\@ifclassloaded { beamer }
{ \msg_info:nn { witharrows } { Option~incompatible~with~Beamer } }
{
\@ifpackageloaded { footnotehyper }
- { \__wa_error:n { footnote~with~footnotehyper~package } }
+ { \@@_error:n { footnote~with~footnotehyper~package } }
{ \usepackage { footnote } }
}
}
-\bool_if:NT \g__wa_footnotehyper_bool
+\bool_if:NT \g_@@_footnotehyper_bool
{
\@ifclassloaded { beamer }
- { \__wa_info:n { Option~incompatible~with~Beamer } }
+ { \@@_info:n { Option~incompatible~with~Beamer } }
{
\@ifpackageloaded { footnote }
- { \__wa_error:n { footnotehyper~with~footnote~package } }
+ { \@@_error:n { footnotehyper~with~footnote~package } }
{ \usepackage { footnotehyper } }
}
- \bool_gset_true:N \g__wa_footnote_bool
+ \bool_gset_true:N \g_@@_footnote_bool
}
-\bool_new:N \c__wa_leqno_bool
-\DeclareOption { leqno } { \bool_set_true:N \c__wa_leqno_bool }
+\bool_new:N \c_@@_leqno_bool
+\DeclareOption { leqno } { \bool_set_true:N \c_@@_leqno_bool }
\DeclareOption* { }
\ProcessOptions*
\cs_generate_variant:Nn \tl_put_right:Nn { N v }
@@ -113,28 +113,28 @@
typedref, unicode-math, varwidth
}
{
- \bool_new:c { c__wa_#1_loaded_bool }
+ \bool_new:c { c_@@_#1_loaded_bool }
\@ifpackageloaded { #1 }
- { \bool_set_true:c { c__wa_#1_loaded_bool } }
+ { \bool_set_true:c { c_@@_#1_loaded_bool } }
{ }
}
}
\sys_if_engine_luatex:TF
{
- \cs_new_protected:Npn \__wa_strcmp:nn #1 #2
+ \cs_new_protected:Npn \@@_strcmp:nn #1 #2
{ \lua_now:e { l3kernel.strcmp('#1','#2') } }
}
{
- \cs_new_protected:Npn \__wa_strcmp:nn #1 #2
+ \cs_new_protected:Npn \@@_strcmp:nn #1 #2
{ \tex_strcmp:D { #1 } { #2 } }
}
-\cs_new_protected:Npn \__wa_sort_seq:N #1
+\cs_new_protected:Npn \@@_sort_seq:N #1
{
\seq_sort:Nn #1
{
\int_compare:nNnTF
{
- \__wa_strcmp:nn
+ \@@_strcmp:nn
{ \str_lower_case:n { ##1 } }
{ \str_lower_case:n { ##2 } }
}
@@ -143,7 +143,7 @@
\sort_return_same:
}
}
-\cs_new_protected:Npn \__wa_convert_to_str_seq:N #1
+\cs_new_protected:Npn \@@_convert_to_str_seq:N #1
{
\seq_clear:N \l_tmpa_seq
\seq_map_inline:Nn #1
@@ -152,12 +152,12 @@
}
\seq_set_eq:NN #1 \l_tmpa_seq
}
-\cs_new_protected:Npn \__wa_set_seq_of_str_from_clist:Nn #1 #2
+\cs_new_protected:Npn \@@_set_seq_of_str_from_clist:Nn #1 #2
{
\seq_set_from_clist:Nn #1 { #2 }
- \__wa_convert_to_str_seq:N #1
+ \@@_convert_to_str_seq:N #1
}
-\cs_new_protected:Npn \__wa_save:N #1
+\cs_new_protected:Npn \@@_save:N #1
{
\seq_set_split:Nxx \l_tmpa_seq
{ \char_generate:nn { `_ } { 12 } }
@@ -173,7 +173,7 @@
\use:c { \l_tmpa_str _gset_eq:cN }
{ g _\seq_use:Nnnn \l_tmpa_seq _ _ _ } #1
}
-\cs_new_protected:Npn \__wa_restore:N #1
+\cs_new_protected:Npn \@@_restore:N #1
{
\seq_set_split:Nxx \l_tmpa_seq
{ \char_generate:nn { `_ } { 12 } }
@@ -185,21 +185,21 @@
}
\tikzset
{
- __wa_node_style / .style =
+ @@_node_style / .style =
{
- above = \l__wa_ystart_dim ,
+ above = \l_@@_ystart_dim ,
inner~sep = \c_zero_dim ,
minimum~width = \c_zero_dim ,
- minimum~height = \l__wa_ygap_dim
+ minimum~height = \l_@@_ygap_dim
}
}
\tikzset
{
- __wa_standard / .style =
+ @@_standard / .style =
{
remember~picture ,
overlay ,
- name~prefix = wa - \l__wa_prefix_str -
+ name~prefix = wa - \l_@@_prefix_str -
}
}
\tikzset
@@ -221,10 +221,10 @@
}
\AtBeginDocument
{
- \bool_if:NTF \c__wa_amsmath_loaded_bool
+ \bool_if:NTF \c_@@_amsmath_loaded_bool
{
- \seq_put_right:Nn \l__wa_options_WithArrowsOptions_seq { subequations }
- \seq_put_right:Nn \l__wa_options_DispWithArrows_seq { subequations }
+ \seq_put_right:Nn \l_@@_options_WithArrowsOptions_seq { subequations }
+ \seq_put_right:Nn \l_@@_options_DispWithArrows_seq { subequations }
}
{
\cs_new_protected:Npn \spread at equation
@@ -234,153 +234,155 @@
}
}
}
-\tl_new:N \l__wa_left_brace_tl
-\tl_set_eq:NN \l__wa_left_brace_tl \c_novalue_tl
-\bool_new:N \l__wa_in_WithArrows_bool
-\bool_new:N \l__wa_in_DispWithArrows_bool
-\bool_new:N \l__wa_in_code_after_bool
-\seq_new:N \g__wa_position_in_the_tree_seq
-\seq_gput_right:Nn \g__wa_position_in_the_tree_seq 1
-\int_new:N \g__wa_last_env_int
-\int_new:N \l__wa_pos_env_int
-\int_new:N \l__wa_pos_arrow_int
-\int_set:Nn \l__wa_pos_arrow_int 3
-\seq_new:N \g__wa_arrow_int_seq
-\int_new:N \g__wa_arrow_int
-\seq_new:N \g__wa_line_int_seq
-\int_new:N \g__wa_line_int
-\seq_new:N \g__wa_col_int_seq
-\int_new:N \g__wa_col_int
-\clist_new:N \l__wa_tags_clist
-\clist_set:Nn \l__wa_tags_clist { all }
-\cs_new_protected:Npn \__wa_test_if_to_tag:
+\tl_new:N \l_@@_left_brace_tl
+\tl_set_eq:NN \l_@@_left_brace_tl \c_novalue_tl
+\bool_new:N \l_@@_in_WithArrows_bool
+\bool_new:N \l_@@_in_DispWithArrows_bool
+\bool_new:N \l_@@_in_code_after_bool
+\seq_new:N \g_@@_position_in_the_tree_seq
+\seq_gput_right:Nn \g_@@_position_in_the_tree_seq 1
+\int_new:N \g_@@_last_env_int
+\int_new:N \l_@@_pos_env_int
+\int_new:N \l_@@_pos_arrow_int
+\int_set:Nn \l_@@_pos_arrow_int 3
+\seq_new:N \g_@@_arrow_int_seq
+\int_new:N \g_@@_arrow_int
+\seq_new:N \g_@@_line_int_seq
+\int_new:N \g_@@_line_int
+\seq_new:N \g_@@_col_int_seq
+\int_new:N \g_@@_col_int
+\seq_new:N \g_@@_static_col_int_seq
+\int_new:N \g_@@_static_col_int
+\clist_new:N \l_@@_tags_clist
+\clist_set:Nn \l_@@_tags_clist { all }
+\cs_new_protected:Npn \@@_test_if_to_tag:
{
- \clist_if_in:NVT \l__wa_tags_clist \g__wa_line_int
- { \clist_set:Nn \l__wa_tags_clist { all } }
+ \clist_if_in:NVT \l_@@_tags_clist \g_@@_line_int
+ { \clist_set:Nn \l_@@_tags_clist { all } }
}
-\str_new:N \l__wa_command_name_str
-\str_set:Nn \l__wa_command_name_str { Arrow }
-\str_new:N \l__wa_string_Arrow_for_msg_str
-\str_set:Nx \l__wa_string_Arrow_for_msg_str { \token_to_str:N \Arrow }
-\seq_new:N \g__wa_names_seq
-\bool_new:N \l__wa_sbwi_bool
-\bool_new:N \l__wa_tag_star_bool
-\bool_new:N \l__wa_tag_next_line_bool
-\bool_new:N \l__wa_qedhere_bool
-\bool_new:N \l__wa_in_first_columns_bool
-\bool_new:N \l__wa_new_group_bool
-\bool_new:N \l__wa_initial_r_bool
-\bool_new:N \l__wa_final_r_bool
-\tl_new:N \l__wa_initial_tl
-\tl_new:N \l__wa_final_tl
-\int_new:N \l__wa_nb_cols_int
-\str_new:N \l__wa_format_str
-\bool_new:N \l__wa_subequations_bool
-\cs_new_protected:Npn \__wa_eval_if_allowed:n #1
+\str_new:N \l_@@_command_name_str
+\str_set:Nn \l_@@_command_name_str { Arrow }
+\str_new:N \l_@@_string_Arrow_for_msg_str
+\str_set:Nx \l_@@_string_Arrow_for_msg_str { \token_to_str:N \Arrow }
+\seq_new:N \g_@@_names_seq
+\bool_new:N \l_@@_sbwi_bool
+\bool_new:N \l_@@_tag_star_bool
+\bool_new:N \l_@@_tag_next_line_bool
+\bool_new:N \l_@@_qedhere_bool
+\bool_new:N \l_@@_in_first_columns_bool
+\bool_new:N \l_@@_new_group_bool
+\bool_new:N \l_@@_initial_r_bool
+\bool_new:N \l_@@_final_r_bool
+\tl_new:N \l_@@_initial_tl
+\tl_new:N \l_@@_final_tl
+\int_new:N \l_@@_nb_cols_int
+\str_new:N \l_@@_format_str
+\bool_new:N \l_@@_subequations_bool
+\cs_new_protected:Npn \@@_eval_if_allowed:n #1
{
- \str_if_empty:NTF \l__wa_previous_key_str
+ \str_if_empty:NTF \l_@@_previous_key_str
{
- \str_set_eq:NN \l__wa_previous_key_str \l_keys_key_tl
+ \str_set_eq:NN \l_@@_previous_key_str \l_keys_key_tl
#1
}
- { \__wa_error:n { Incompatible~options } }
+ { \@@_error:n { Incompatible~options } }
}
-\cs_new_protected:Npn \__wa_fix_pos_option:n #1
- { \__wa_eval_if_allowed:n { \int_set:Nn \l__wa_pos_arrow_int { #1 } } }
+\cs_new_protected:Npn \@@_fix_pos_option:n #1
+ { \@@_eval_if_allowed:n { \int_set:Nn \l_@@_pos_arrow_int { #1 } } }
\keys_define:nn { WithArrows / Global }
{
- max-length-of-arrow .dim_set:N = \l__wa_max_length_of_arrow_dim ,
+ max-length-of-arrow .dim_set:N = \l_@@_max_length_of_arrow_dim ,
max-length-of-arrow .value_required:n = true ,
max-length-of-arrow .initial:n = 2 cm ,
- ygap .dim_set:N = \l__wa_ygap_dim ,
+ ygap .dim_set:N = \l_@@_ygap_dim ,
ygap .value_required:n = true ,
ygap .initial:n = 0.4 ex ,
- ystart .dim_set:N = \l__wa_ystart_dim ,
+ ystart .dim_set:N = \l_@@_ystart_dim ,
ystart .value_required:n = true ,
ystart .initial:n = 0.4 ex ,
more-columns .code:n =
- \__wa_msg_redirect_name:nn { Too~much~columns~in~WithArrows } { none } ,
+ \@@_msg_redirect_name:nn { Too~much~columns~in~WithArrows } { none } ,
more-columns .value_forbidden:n = true,
command-name .code:n =
- \str_set:Nn \l__wa_command_name_str { #1 }
- \str_set:Nx \l__wa_string_Arrow_for_msg_str
+ \str_set:Nn \l_@@_command_name_str { #1 }
+ \str_set:Nx \l_@@_string_Arrow_for_msg_str
{ \c_backslash_str Arrow~alias~\c_backslash_str #1 } ,
command-name .value_required:n = true ,
- tikz-code .tl_set:N = \l__wa_tikz_code_tl,
+ tikz-code .tl_set:N = \l_@@_tikz_code_tl,
tikz-code .initial:n = \draw~(#1)~to~node{#3}~(#2)~; ,
tikz-code .value_required:n = true ,
TikzCode .meta:n = { tikz-code = #1 } ,
- displaystyle .bool_set:N = \l__wa_displaystyle_bool ,
+ displaystyle .bool_set:N = \l_@@_displaystyle_bool ,
displaystyle .default:n = true ,
show-nodes .code:n =
- \tikzset { __wa_node_style / .append~style = { draw , red } } ,
+ \tikzset { @@_node_style / .append~style = { draw , red } } ,
show-nodes .value_forbidden:n = true,
- show-node-names .bool_set:N = \l__wa_show_node_names_bool ,
+ show-node-names .bool_set:N = \l_@@_show_node_names_bool ,
show-node-names .default:n = true ,
group .code:n =
- \str_if_empty:NTF \l__wa_previous_key_str
+ \str_if_empty:NTF \l_@@_previous_key_str
{
- \str_set:Nn \l__wa_previous_key_str { group }
- \seq_remove_all:Nn \l__wa_options_Arrow_seq { xoffset }
- \int_set:Nn \l__wa_pos_arrow_int 7
+ \str_set:Nn \l_@@_previous_key_str { group }
+ \seq_remove_all:Nn \l_@@_options_Arrow_seq { xoffset }
+ \int_set:Nn \l_@@_pos_arrow_int 7
}
- { \__wa_error:n { Incompatible~options } } ,
+ { \@@_error:n { Incompatible~options } } ,
group .value_forbidden:n = true ,
groups .code:n =
- \str_if_empty:NTF \l__wa_previous_key_str
+ \str_if_empty:NTF \l_@@_previous_key_str
{
- \str_set:Nn \l__wa_previous_key_str { groups }
- \seq_if_in:NnF \l__wa_options_Arrow_seq { new-group }
- { \seq_put_right:Nn \l__wa_options_Arrow_seq { new-group } }
- \seq_remove_all:Nn \l__wa_options_Arrow_seq { xoffset }
- \int_set:Nn \l__wa_pos_arrow_int 6
+ \str_set:Nn \l_@@_previous_key_str { groups }
+ \seq_if_in:NnF \l_@@_options_Arrow_seq { new-group }
+ { \seq_put_right:Nn \l_@@_options_Arrow_seq { new-group } }
+ \seq_remove_all:Nn \l_@@_options_Arrow_seq { xoffset }
+ \int_set:Nn \l_@@_pos_arrow_int 6
}
- { \__wa_error:n { Incompatible~options } } ,
+ { \@@_error:n { Incompatible~options } } ,
groups .value_forbidden:n = true ,
tikz .code:n = \tikzset { WithArrows / arrow / .append~style = { #1 } } ,
tikz .initial:n = \c_empty_tl ,
tikz .value_required:n = true ,
rr .value_forbidden:n = true ,
- rr .code:n = \__wa_fix_pos_option:n 3 ,
+ rr .code:n = \@@_fix_pos_option:n 3 ,
ll .value_forbidden:n = true ,
- ll .code:n = \__wa_fix_pos_option:n 1 ,
+ ll .code:n = \@@_fix_pos_option:n 1 ,
rl .value_forbidden:n = true ,
- rl .code:n = \__wa_fix_pos_option:n 2 ,
+ rl .code:n = \@@_fix_pos_option:n 2 ,
lr .value_forbidden:n = true ,
- lr .code:n = \__wa_fix_pos_option:n 0 ,
+ lr .code:n = \@@_fix_pos_option:n 0 ,
i .value_forbidden:n = true ,
- i .code:n = \__wa_fix_pos_option:n 5 ,
- xoffset .dim_set:N = \l__wa_xoffset_dim ,
+ i .code:n = \@@_fix_pos_option:n 5 ,
+ xoffset .dim_set:N = \l_@@_xoffset_dim ,
xoffset .value_required:n = true ,
xoffset .initial:n = 3 mm ,
jot .dim_set:N = \jot ,
jot .value_required:n = true ,
- interline .skip_set:N = \l__wa_interline_skip ,
+ interline .skip_set:N = \l_@@_interline_skip ,
interline .value_required:n = true ,
- start-adjust .dim_set:N = \l__wa_start_adjust_dim ,
+ start-adjust .dim_set:N = \l_@@_start_adjust_dim ,
start-adjust .value_required:n = true ,
start-adjust .initial:n = 0.4 ex ,
- end-adjust .dim_set:N = \l__wa_end_adjust_dim ,
+ end-adjust .dim_set:N = \l_@@_end_adjust_dim ,
end-adjust .value_required:n = true ,
end-adjust .initial:n = 0.4 ex ,
adjust .meta:n = { start-adjust = #1 , end-adjust = #1 } ,
adjust .value_required:n = true ,
no-arrows .code:n =
- \cs_set_eq:NN \__wa_draw_arrows:nn \use_none:nn
- \cs_set_eq:NN \__wa_draw_arrow:nnn \use_none:nnn ,
+ \cs_set_eq:NN \@@_draw_arrows:nn \use_none:nn
+ \cs_set_eq:NN \@@_draw_arrow:nnn \use_none:nnn ,
no-arrows .value_forbidden:n = true ,
}
\keys_define:nn { WithArrows / WithArrowsSpecific }
{
- t .code:n = \int_set:Nn \l__wa_pos_env_int O ,
+ t .code:n = \int_set:Nn \l_@@_pos_env_int O ,
t .value_forbidden:n = true ,
- c .code:n = \int_set:Nn \l__wa_pos_env_int 1 ,
+ c .code:n = \int_set:Nn \l_@@_pos_env_int 1 ,
c .value_forbidden:n = true ,
- b .code:n = \int_set:Nn \l__wa_pos_env_int 2 ,
+ b .code:n = \int_set:Nn \l_@@_pos_env_int 2 ,
b .value_forbidden:n = true
}
-\clist_new:N \c__wa_extensible_delimiters_clist
-\clist_set:Nn \c__wa_extensible_delimiters_clist
+\clist_new:N \c_@@_extensible_delimiters_clist
+\clist_set:Nn \c_@@_extensible_delimiters_clist
{
., \{, (, [, \lbrace, \lbrack, \lgroup, \langle, \lmoustache, \lceil, \lfloor
}
@@ -387,31 +389,31 @@
\AtBeginDocument
{
\bool_if:nT
- { \c__wa_amsmath_loaded_bool || \use:c { c__wa_unicode-math_loaded_bool } }
+ { \c_@@_amsmath_loaded_bool || \use:c { c_@@_unicode-math_loaded_bool } }
{
- \clist_put_right:Nn \c__wa_extensible_delimiters_clist { \lvert, \lVert }
+ \clist_put_right:Nn \c_@@_extensible_delimiters_clist { \lvert, \lVert }
}
}
\keys_define:nn { WithArrows / DispWithArrowsSpecific }
{
- fleqn .bool_set:N = \l__wa_fleqn_bool ,
+ fleqn .bool_set:N = \l_@@_fleqn_bool ,
fleqn .default:n = true ,
- mathindent .dim_set:N = \l__wa_mathindent_dim ,
+ mathindent .dim_set:N = \l_@@_mathindent_dim ,
mathindent .value_required:n = true ,
mathindent .initial:n = 25 pt ,
notag .code:n =
\str_if_eq:nnTF { #1 } { true }
- { \clist_clear:N \l__wa_tags_clist }
- { \clist_set:Nn \l__wa_tags_clist { all } } ,
+ { \clist_clear:N \l_@@_tags_clist }
+ { \clist_set:Nn \l_@@_tags_clist { all } } ,
notag .default:n = true ,
subequations .code:n =
- \bool_if:NTF \c__wa_amsmath_loaded_bool
- { \bool_set_true:N \l__wa_subequations_bool }
+ \bool_if:NTF \c_@@_amsmath_loaded_bool
+ { \bool_set_true:N \l_@@_subequations_bool }
{
- \__wa_error:n { amsmath~not~loaded }
+ \@@_error:n { amsmath~not~loaded }
\group_begin:
\globaldefs = 1
- \__wa_msg_redirect_name:nn { amsmath~not~loaded } { info }
+ \@@_msg_redirect_name:nn { amsmath~not~loaded } { info }
\group_end:
} ,
subequations .default:n = true ,
@@ -418,29 +420,29 @@
subequations .value_forbidden:n = true ,
nonumber .meta:n = notag ,
allow-multiple-labels .code:n =
- \__wa_msg_redirect_name:nn { Multiple~labels } { none } ,
+ \@@_msg_redirect_name:nn { Multiple~labels } { none } ,
allow-multiple-labels .value_forbidden:n = true ,
tagged-lines .code:n =
- \clist_set:Nn \l__wa_tags_clist { #1 }
- \clist_if_in:NnT \l__wa_tags_clist { first }
+ \clist_set:Nn \l_@@_tags_clist { #1 }
+ \clist_if_in:NnT \l_@@_tags_clist { first }
{
- \clist_remove_all:Nn \l__wa_tags_clist { first }
- \clist_put_left:Nn \l__wa_tags_clist \c_one_int
+ \clist_remove_all:Nn \l_@@_tags_clist { first }
+ \clist_put_left:Nn \l_@@_tags_clist \c_one_int
} ,
tagged-lines .value_required:n = true ,
- wrap-lines .bool_set:N = \l__wa_wrap_lines_bool ,
+ wrap-lines .bool_set:N = \l_@@_wrap_lines_bool ,
wrap-lines .default:n = true ,
replace-left-brace-by .code:n =
{
\tl_set:Nx \l_tmpa_tl { \tl_head:n { #1 } }
\clist_if_in:NVTF
- \c__wa_extensible_delimiters_clist
+ \c_@@_extensible_delimiters_clist
\l_tmpa_tl
- { \tl_set:Nn \l__wa_replace_left_brace_by_tl { #1 } }
- { \__wa_error:n { Bad~value~for~replace~brace~by } }
+ { \tl_set:Nn \l_@@_replace_left_brace_by_tl { #1 } }
+ { \@@_error:n { Bad~value~for~replace~brace~by } }
} ,
replace-left-brace-by .initial:n = \lbrace ,
- standard-behaviour-with-items .bool_set:N = \l__wa_sbwi_bool ,
+ standard-behaviour-with-items .bool_set:N = \l_@@_sbwi_bool ,
standard-behaviour-with-items .default:n = true
}
\keys_define:nn { WithArrows / Env }
@@ -447,24 +449,24 @@
{
name .code:n =
\str_set:Nn \l_tmpa_str { #1 }
- \seq_if_in:NVTF \g__wa_names_seq \l_tmpa_str
- { \__wa_error:n { Duplicate~name } }
- { \seq_gput_left:NV \g__wa_names_seq \l_tmpa_str }
- \str_set_eq:NN \l__wa_name_str \l_tmpa_str ,
+ \seq_if_in:NVTF \g_@@_names_seq \l_tmpa_str
+ { \@@_error:n { Duplicate~name } }
+ { \seq_gput_left:NV \g_@@_names_seq \l_tmpa_str }
+ \str_set_eq:NN \l_@@_name_str \l_tmpa_str ,
name .value_required:n = true ,
- code-before .code:n = \tl_put_right:Nn \l__wa_code_before_tl { #1 } ,
+ code-before .code:n = \tl_put_right:Nn \l_@@_code_before_tl { #1 } ,
code-before .value_required:n = true,
CodeBefore .meta:n = { code-before = #1 } ,
- code-after .code:n = \tl_put_right:Nn \l__wa_code_after_tl { #1 } ,
+ code-after .code:n = \tl_put_right:Nn \l_@@_code_after_tl { #1 } ,
code-after .value_required:n = true ,
CodeAfter .meta:n = { code-after = #1 } ,
format .code:n =
\tl_if_empty:nTF { #1 }
- { \__wa_error:n { Invalid~option~format } }
+ { \@@_error:n { Invalid~option~format } }
{
\regex_match:nnTF { \A[rcl]*\Z } { #1 }
- { \tl_set:Nn \l__wa_format_str { #1 } }
- { \__wa_error:n { Invalid~option~format } }
+ { \tl_set:Nn \l_@@_format_str { #1 } }
+ { \@@_error:n { Invalid~option~format } }
} ,
format .value_required:n = true ,
}
@@ -489,8 +491,8 @@
WithArrows / DispWithArrowsSpecific
}
}
-\seq_new:N \l__wa_options_WithArrows_seq
-\__wa_set_seq_of_str_from_clist:Nn \l__wa_options_WithArrows_seq
+\seq_new:N \l_@@_options_WithArrows_seq
+\@@_set_seq_of_str_from_clist:Nn \l_@@_options_WithArrows_seq
{
adjust, b, c, code-after, code-before, command-name,
displaystyle, end-adjust,
@@ -502,22 +504,22 @@
t, tikz, tikz-code,
xoffset, ygap, ystart
}
-\__wa_convert_to_str_seq:N \l__wa_options_WithArrows_seq
+\@@_convert_to_str_seq:N \l_@@_options_WithArrows_seq
\keys_define:nn { WithArrows / WithArrows }
{
unknown .code:n =
- \__wa_sort_seq:N \l__wa_options_WithArrows_seq
- \__wa_error:n { Unknown~option~WithArrows }
+ \@@_sort_seq:N \l_@@_options_WithArrows_seq
+ \@@_error:n { Unknown~option~WithArrows }
}
\keys_define:nn { WithArrows / DispWithArrows }
{
- left-brace .tl_set:N = \l__wa_left_brace_tl ,
+ left-brace .tl_set:N = \l_@@_left_brace_tl ,
unknown .code:n =
- \__wa_sort_seq:N \l__wa_options_DispWithArrows_seq
- \__wa_error:n { Unknown~option~DispWithArrows }
+ \@@_sort_seq:N \l_@@_options_DispWithArrows_seq
+ \@@_error:n { Unknown~option~DispWithArrows }
}
-\seq_new:N \l__wa_options_DispWithArrows_seq
-\__wa_set_seq_of_str_from_clist:Nn \l__wa_options_DispWithArrows_seq
+\seq_new:N \l_@@_options_DispWithArrows_seq
+\@@_set_seq_of_str_from_clist:Nn \l_@@_options_DispWithArrows_seq
{
code-after, code-before, command-name, tikz-code, adjust,
displaystyle, end-adjust, fleqn, group, format, groups, i, interline, jot,
@@ -529,14 +531,14 @@
\keys_define:nn { WithArrows / WithArrowsOptions }
{
allow-duplicate-names .code:n =
- \__wa_msg_redirect_name:nn { Duplicate~name } { none } ,
+ \@@_msg_redirect_name:nn { Duplicate~name } { none } ,
allow-duplicate-names .value_forbidden:n = true ,
unknown .code:n =
- \__wa_sort_seq:N \l__wa_options_WithArrowsOptions_seq
- \__wa_error:n { Unknown~option~WithArrowsOptions }
+ \@@_sort_seq:N \l_@@_options_WithArrowsOptions_seq
+ \@@_error:n { Unknown~option~WithArrowsOptions }
}
-\seq_new:N \l__wa_options_WithArrowsOptions_seq
-\__wa_set_seq_of_str_from_clist:Nn \l__wa_options_WithArrowsOptions_seq
+\seq_new:N \l_@@_options_WithArrowsOptions_seq
+\@@_set_seq_of_str_from_clist:Nn \l_@@_options_WithArrowsOptions_seq
{
allow-duplicate-names, b, c, command-name, more-columns, tikz-code, adjust,
displaystyle, end-adjust, fleqn, group, groups, i, interline, jot, ll, lr,
@@ -545,29 +547,29 @@
allow-multiple-labels, nonumber, notag, standard-behaviour-with-items,
tagged-lines
}
-\cs_new_protected:Npn \__wa_set_independent:
+\cs_new_protected:Npn \@@_set_independent:
{
- \str_if_empty:NTF \l__wa_previous_key_str
+ \str_if_empty:NTF \l_@@_previous_key_str
{
- \str_set_eq:NN \l__wa_previous_key_str \l_keys_key_tl
- \str_set:Nn \l__wa_status_arrow_str { independent }
+ \str_set_eq:NN \l_@@_previous_key_str \l_keys_key_tl
+ \str_set:Nn \l_@@_status_arrow_str { independent }
\str_if_eq:VnF \l_keys_value_tl { NoValue }
- { \__wa_error:n { Value~for~a~key } }
+ { \@@_error:n { Value~for~a~key } }
}
- { \__wa_error:n { Incompatible~options~in~Arrow } }
+ { \@@_error:n { Incompatible~options~in~Arrow } }
}
\keys_define:nn { WithArrows / Arrow / FirstPass }
{
jump .code:n =
\int_compare:nTF { #1 > 0 }
- { \int_set:Nn \l__wa_jump_int { #1 } }
- { \__wa_error:n { Negative~jump } } ,
+ { \int_set:Nn \l_@@_jump_int { #1 } }
+ { \@@_error:n { Negative~jump } } ,
jump .value_required:n = true,
- rr .code:n = \__wa_set_independent: ,
- ll .code:n = \__wa_set_independent: ,
- rl .code:n = \__wa_set_independent: ,
- lr .code:n = \__wa_set_independent: ,
- i .code:n = \__wa_set_independent: ,
+ rr .code:n = \@@_set_independent: ,
+ ll .code:n = \@@_set_independent: ,
+ rl .code:n = \@@_set_independent: ,
+ lr .code:n = \@@_set_independent: ,
+ i .code:n = \@@_set_independent: ,
rr .default:n = NoValue ,
ll .default:n = NoValue ,
rl .default:n = NoValue ,
@@ -575,9 +577,9 @@
i .default:n = NoValue ,
new-group .value_forbidden:n = true,
new-group .code:n =
- \int_compare:nTF { \l__wa_pos_arrow_int = 6 }
- { \str_set:Nn \l__wa_status_arrow_str { new-group } }
- { \__wa_error:n { new-group~without~groups } } ,
+ \int_compare:nTF { \l_@@_pos_arrow_int = 6 }
+ { \str_set:Nn \l_@@_status_arrow_str { new-group } }
+ { \@@_error:n { new-group~without~groups } } ,
tikz-code .code:n = \prg_do_nothing: ,
tikz-code .value_required:n = true ,
tikz .code:n = \prg_do_nothing: ,
@@ -590,211 +592,212 @@
adjust .value_required:n = true ,
xoffset .code:n = ,
unknown .code:n =
- \__wa_sort_seq:N \l__wa_options_Arrow_seq
- \seq_if_in:NVTF \l__wa_options_WithArrows_seq \l_keys_key_tl
+ \@@_sort_seq:N \l_@@_options_Arrow_seq
+ \seq_if_in:NVTF \l_@@_options_WithArrows_seq \l_keys_key_tl
{
\str_set:Nn \l_tmpa_str
{ ~However,~this~key~can~be~used~in~the~options~of~{WithArrows}. }
}
{ \str_clear:N \l_tmpa_str }
- \__wa_error:n { Unknown~option~in~Arrow }
+ \@@_error:n { Unknown~option~in~Arrow }
}
-\seq_new:N \l__wa_options_Arrow_seq
-\__wa_set_seq_of_str_from_clist:Nn \l__wa_options_Arrow_seq
+\seq_new:N \l_@@_options_Arrow_seq
+\@@_set_seq_of_str_from_clist:Nn \l_@@_options_Arrow_seq
{
adjust, end-adjust, i, jump, ll, lr, rl, rr, start-adjust, tikz, tikz-code,
xoffset
}
-\cs_new_protected:Npn \__wa_fix_pos_arrow:n #1
+\cs_new_protected:Npn \@@_fix_pos_arrow:n #1
{
- \str_if_empty:NT \l__wa_previous_key_str
+ \str_if_empty:NT \l_@@_previous_key_str
{
- \str_set_eq:NN \l__wa_previous_key_str \l_keys_key_tl
- \int_set:Nn \l__wa_pos_arrow_int { #1 }
+ \str_set_eq:NN \l_@@_previous_key_str \l_keys_key_tl
+ \int_set:Nn \l_@@_pos_arrow_int { #1 }
}
}
\keys_define:nn {WithArrows / Arrow / SecondPass }
{
- tikz-code .tl_set:N = \l__wa_tikz_code_tl ,
+ tikz-code .tl_set:N = \l_@@_tikz_code_tl ,
tikz-code .initial:n = \draw~(#1)~to~node{#3}~(#2)~; ,
tikz .code:n = \tikzset { WithArrows / arrow / .append~style = { #1 } } ,
tikz .initial:n = \c_empty_tl ,
- rr .code:n = \__wa_fix_pos_arrow:n 3 ,
- ll .code:n = \__wa_fix_pos_arrow:n 1 ,
- rl .code:n = \__wa_fix_pos_arrow:n 2 ,
- lr .code:n = \__wa_fix_pos_arrow:n 0 ,
- i .code:n = \__wa_fix_pos_arrow:n 5 ,
+ rr .code:n = \@@_fix_pos_arrow:n 3 ,
+ ll .code:n = \@@_fix_pos_arrow:n 1 ,
+ rl .code:n = \@@_fix_pos_arrow:n 2 ,
+ lr .code:n = \@@_fix_pos_arrow:n 0 ,
+ i .code:n = \@@_fix_pos_arrow:n 5 ,
xoffset .code:n =
\bool_if:nTF
{
- \int_compare_p:nNn \g__wa_arrow_int > 1
+ \int_compare_p:nNn \g_@@_arrow_int > 1
&&
- \int_compare_p:nNn \l__wa_pos_arrow_int > 5
+ \int_compare_p:nNn \l_@@_pos_arrow_int > 5
&&
- ! \str_if_eq_p:Vn \l__wa_status_arrow_str { independent }
+ ! \str_if_eq_p:Vn \l_@@_status_arrow_str { independent }
}
- { \__wa_error:n { Option~xoffset~forbidden } }
- { \dim_set:Nn \l__wa_xoffset_dim { #1 } } ,
+ { \@@_error:n { Option~xoffset~forbidden } }
+ { \dim_set:Nn \l_@@_xoffset_dim { #1 } } ,
xoffset .value_required:n = true ,
- start-adjust .dim_set:N = \l__wa_start_adjust_dim,
- end-adjust .dim_set:N = \l__wa_end_adjust_dim,
+ start-adjust .dim_set:N = \l_@@_start_adjust_dim,
+ end-adjust .dim_set:N = \l_@@_end_adjust_dim,
adjust .code:n =
- \dim_set:Nn \l__wa_start_adjust_dim { #1 }
- \dim_set:Nn \l__wa_end_adjust_dim { #1 } ,
+ \dim_set:Nn \l_@@_start_adjust_dim { #1 }
+ \dim_set:Nn \l_@@_end_adjust_dim { #1 } ,
}
\NewDocumentCommand \WithArrowsOptions { m }
{
- \str_clear_new:N \l__wa_previous_key_str
+ \str_clear_new:N \l_@@_previous_key_str
\keys_set:nn { WithArrows / WithArrowsOptions } { #1 }
}
-\NewDocumentCommand \__wa_Arrow { O { } m ! O { } }
+\NewDocumentCommand \@@_Arrow { O { } m ! O { } }
{
- \int_gincr:N \g__wa_arrow_int
- \str_clear_new:N \l__wa_previous_key_str
+ \int_gincr:N \g_@@_arrow_int
+ \str_clear_new:N \l_@@_previous_key_str
\keys_set:nn { WithArrows / Arrow / FirstPass } { #1 , #3 }
- \prop_put:NnV \l_tmpa_prop { initial } \g__wa_line_int
- \int_set:Nn \l_tmpa_int { \g__wa_line_int + \l__wa_jump_int }
+ \prop_put:NnV \l_tmpa_prop { initial } \g_@@_line_int
+ \int_set:Nn \l_tmpa_int { \g_@@_line_int + \l_@@_jump_int }
\prop_put:NnV \l_tmpa_prop { final } \l_tmpa_int
- \prop_put:NnV \l_tmpa_prop { status } \l__wa_status_arrow_str
+ \prop_put:NnV \l_tmpa_prop { status } \l_@@_status_arrow_str
\prop_put:Nnn \l_tmpa_prop { options } { #1 , #3 }
\prop_put:Nnn \l_tmpa_prop { label } { #2 }
\prop_put:Nnx \l_tmpa_prop { input-line } \msg_line_number:
\prop_gclear_new:c
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \g__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \g_@@_arrow_int _ prop }
\prop_gset_eq:cN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \g__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \g_@@_arrow_int _ prop }
\l_tmpa_prop
}
-\cs_new_protected:Npn \__wa_Arrow_first_columns:
- { \__wa_error:n { Arrow~not~in~last~column } \__wa_Arrow }
-\cs_new_protected:Npn \__wa_pre_halign:n #1
+\cs_new_protected:Npn \@@_Arrow_first_columns:
+ { \@@_error:n { Arrow~not~in~last~column } \@@_Arrow }
+\cs_new_protected:Npn \@@_pre_halign:n #1
{
- \str_clear_new:N \l__wa_type_env_str
- \str_set:NV \l__wa_type_env_str \@currenvir
+ \str_clear_new:N \l_@@_type_env_str
+ \str_set:NV \l_@@_type_env_str \@currenvir
\cs_if_exist:NT \tikz at library@external at loaded
{ \tikzset { external / export = false } }
- \str_clear_new:N \l__wa_name_str
- \str_clear_new:N \l__wa_status_arrow_str
- \dim_zero_new:N \l__wa_x_dim
- \str_clear_new:N \l__wa_input_line_str
- \seq_gput_right:NV \g__wa_arrow_int_seq \g__wa_arrow_int
- \int_gzero:N \g__wa_arrow_int
- \seq_gput_right:NV \g__wa_line_int_seq \g__wa_line_int
- \int_gzero:N \g__wa_line_int
- \seq_gput_right:NV \g__wa_col_int_seq \g__wa_col_int
- \int_gzero:N \g__wa_col_int
- \int_gzero_new:N \g__wa_static_col_int
- \seq_gput_right:Nn \g__wa_position_in_the_tree_seq 1
- \seq_set_eq:NN \l_tmpa_seq \g__wa_position_in_the_tree_seq
+ \str_clear_new:N \l_@@_name_str
+ \str_clear_new:N \l_@@_status_arrow_str
+ \dim_zero_new:N \l_@@_x_dim
+ \str_clear_new:N \l_@@_input_line_str
+ \seq_gput_right:NV \g_@@_arrow_int_seq \g_@@_arrow_int
+ \int_gzero:N \g_@@_arrow_int
+ \seq_gput_right:NV \g_@@_line_int_seq \g_@@_line_int
+ \int_gzero:N \g_@@_line_int
+ \seq_gput_right:NV \g_@@_col_int_seq \g_@@_col_int
+ \int_gzero:N \g_@@_col_int
+ \seq_gput_right:NV \g_@@_static_col_int_seq \g_@@_static_col_int
+ \int_gzero:N \g_@@_static_col_int
+ \seq_gput_right:Nn \g_@@_position_in_the_tree_seq 1
+ \seq_set_eq:NN \l_tmpa_seq \g_@@_position_in_the_tree_seq
\seq_pop_right:NN \l_tmpa_seq \l_tmpa_tl
- \str_clear_new:N \l__wa_prefix_str
- \str_set:Nx \l__wa_prefix_str { \seq_use:Nnnn \l_tmpa_seq - - - }
- \cs_set_eq:NN \\ \__wa_cr:
+ \str_clear_new:N \l_@@_prefix_str
+ \str_set:Nx \l_@@_prefix_str { \seq_use:Nnnn \l_tmpa_seq - - - }
+ \cs_set_eq:NN \\ \@@_cr:
\dim_zero:N \mathsurround
- \int_zero_new:N \l__wa_initial_int
- \int_zero_new:N \l__wa_final_int
- \int_zero_new:N \l__wa_arrow_int
- \int_zero_new:N \l__wa_pos_of_arrow_int
- \int_zero_new:N \l__wa_jump_int
- \int_set:Nn \l__wa_jump_int \c_one_int
- \str_set:Nn \l__wa_format_str { rl }
- \seq_clear_new:N \l__wa_labels_seq
- \bool_set_false:N \l__wa_tag_next_line_bool
- \skip_zero:N \l__wa_interline_skip
- \tl_clear_new:N \l__wa_code_before_tl
- \tl_clear_new:N \l__wa_code_after_tl
- \str_clear_new:N \l__wa_previous_key_str
- \bool_if:NT \l__wa_in_WithArrows_bool
+ \int_zero_new:N \l_@@_initial_int
+ \int_zero_new:N \l_@@_final_int
+ \int_zero_new:N \l_@@_arrow_int
+ \int_zero_new:N \l_@@_pos_of_arrow_int
+ \int_zero_new:N \l_@@_jump_int
+ \int_set:Nn \l_@@_jump_int \c_one_int
+ \str_set:Nn \l_@@_format_str { rl }
+ \seq_clear_new:N \l_@@_labels_seq
+ \bool_set_false:N \l_@@_tag_next_line_bool
+ \skip_zero:N \l_@@_interline_skip
+ \tl_clear_new:N \l_@@_code_before_tl
+ \tl_clear_new:N \l_@@_code_after_tl
+ \str_clear_new:N \l_@@_previous_key_str
+ \bool_if:NT \l_@@_in_WithArrows_bool
{ \keys_set:nn { WithArrows / WithArrows } { #1 } }
- \bool_if:NT \l__wa_in_DispWithArrows_bool
+ \bool_if:NT \l_@@_in_DispWithArrows_bool
{ \keys_set:nn { WithArrows / DispWithArrows } { #1 } }
- \cs_set_eq:cN \l__wa_command_name_str \__wa_Arrow_first_columns:
- \int_set:Nn \l__wa_nb_cols_int { \str_count:N \l__wa_format_str }
- \int_gset_eq:NN \g__wa_col_int \l__wa_nb_cols_int
- \seq_clear_new:N \l__wa_format_seq
- \seq_set_split:NnV \l__wa_format_seq { } \l__wa_format_str
- \bool_if:NT \g__wa_footnote_bool { \begin { savenotes } }
- \l__wa_code_before_tl
+ \cs_set_eq:cN \l_@@_command_name_str \@@_Arrow_first_columns:
+ \int_set:Nn \l_@@_nb_cols_int { \str_count:N \l_@@_format_str }
+ \int_gset_eq:NN \g_@@_col_int \l_@@_nb_cols_int
+ \seq_clear_new:N \l_@@_format_seq
+ \seq_set_split:NnV \l_@@_format_seq { } \l_@@_format_str
+ \bool_if:NT \g_@@_footnote_bool { \begin { savenotes } }
+ \l_@@_code_before_tl
\spread at equation
- \cs_set_eq:NN \notag \__wa_notag:
- \cs_set_eq:NN \nonumber \__wa_nonumber:
- \cs_set_eq:NN \tag \__wa_tag
- \cs_set_eq:NN \__wa_old_label \label
- \cs_set_eq:NN \label \__wa_label:n
- \cs_set_eq:NN \tagnextline \__wa_tagnextline:
+ \cs_set_eq:NN \notag \@@_notag:
+ \cs_set_eq:NN \nonumber \@@_nonumber:
+ \cs_set_eq:NN \tag \@@_tag
+ \cs_set_eq:NN \@@_old_label \label
+ \cs_set_eq:NN \label \@@_label:n
+ \cs_set_eq:NN \tagnextline \@@_tagnextline:
}
-\cs_new_protected:Npn \__wa_construct_halign:
+\cs_new_protected:Npn \@@_construct_halign:
{
- \seq_pop_right:NNTF \l__wa_format_seq \l__wa_type_col_str
+ \seq_pop_right:NNTF \l_@@_format_seq \l_@@_type_col_str
{
\use:x
{
- \int_gdecr:N \g__wa_col_int
- \__wa_construct_halign:
- \int_compare:nNnT \g__wa_col_int = \l__wa_nb_cols_int
+ \int_gdecr:N \g_@@_col_int
+ \@@_construct_halign:
+ \int_compare:nNnT \g_@@_col_int = \l_@@_nb_cols_int
{
- \cs_set_eq:cN { \l__wa_command_name_str } \__wa_Arrow
- \bool_if:NT \l__wa_in_DispWithArrows_bool
+ \cs_set_eq:cN { \l_@@_command_name_str } \@@_Arrow
+ \bool_if:NT \l_@@_in_DispWithArrows_bool
{
- \__wa_test_if_to_tag:
- \bool_if:NT \c__wa_amsthm_loaded_bool \__wa_set_qedhere:
+ \@@_test_if_to_tag:
+ \bool_if:NT \c_@@_amsthm_loaded_bool \@@_set_qedhere:
}
}
- \str_if_eq:VnT \l__wa_type_col_str { c } \hfil
- \str_if_eq:VnT \l__wa_type_col_str { r } \hfill
- \int_gincr:N \g__wa_col_int
- \int_gset:Nn \g__wa_static_col_int { \int_use:N \g__wa_col_int }
+ \str_if_eq:VnT \l_@@_type_col_str { c } \hfil
+ \str_if_eq:VnT \l_@@_type_col_str { r } \hfill
+ \int_gincr:N \g_@@_col_int
+ \int_gset:Nn \g_@@_static_col_int { \int_use:N \g_@@_col_int }
\c_math_toggle_token
{
{ }
- \bool_if:NT \l__wa_displaystyle_bool \displaystyle
+ \bool_if:NT \l_@@_displaystyle_bool \displaystyle
####
}
\c_math_toggle_token
- \int_compare:nNnTF \g__wa_col_int = \l__wa_nb_cols_int
- { \__wa_construct_nodes: }
+ \int_compare:nNnTF \g_@@_col_int = \l_@@_nb_cols_int
+ { \@@_construct_nodes: }
{
- \str_if_eq:VnT \l__wa_type_col_str { l } \hfil
- \str_if_eq:VnT \l__wa_type_col_str { c } \hfil
- \bool_if:NT \l__wa_in_DispWithArrows_bool { \tabskip = \c_zero_skip }
+ \str_if_eq:VnT \l_@@_type_col_str { l } \hfil
+ \str_if_eq:VnT \l_@@_type_col_str { c } \hfil
+ \bool_if:NT \l_@@_in_DispWithArrows_bool { \tabskip = \c_zero_skip }
&
}
}
}
{
- \bool_if:NTF \l__wa_in_WithArrows_bool
+ \bool_if:NTF \l_@@_in_WithArrows_bool
{
\ialign
\bgroup
}
{
- \halign to \l__wa_linewidth_dim
+ \halign to \l_@@_linewidth_dim
\bgroup
- \bool_if:NT \l__wa_fleqn_bool
- { \skip_horizontal:N \l__wa_mathindent_dim }
+ \bool_if:NT \l_@@_fleqn_bool
+ { \skip_horizontal:N \l_@@_mathindent_dim }
}
- \int_gincr:N \g__wa_line_int
- \int_gzero:N \g__wa_col_int
- \tl_if_eq:NNF \l__wa_left_brace_tl \c_novalue_tl
+ \int_gincr:N \g_@@_line_int
+ \int_gzero:N \g_@@_col_int
+ \tl_if_eq:NNF \l_@@_left_brace_tl \c_novalue_tl
{
\skip_horizontal:n
- { \box_wd:N \l__wa_left_brace_box + \l__wa_delim_wd_dim }
+ { \box_wd:N \l_@@_left_brace_box + \l_@@_delim_wd_dim }
}
\strut
}
}
-\cs_new_protected:Npn \__wa_construct_nodes:
+\cs_new_protected:Npn \@@_construct_nodes:
{
\tikz [ remember~picture , overlay ]
\node
[
node~contents = { } ,
- __wa_node_style ,
- name = wa - \l__wa_prefix_str - \int_use:N \g__wa_line_int - l ,
+ @@_node_style ,
+ name = wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - l ,
alias =
{
- \str_if_empty:NF \l__wa_name_str
- { \l__wa_name_str - \int_use:N \g__wa_line_int - l }
+ \str_if_empty:NF \l_@@_name_str
+ { \l_@@_name_str - \int_use:N \g_@@_line_int - l }
}
]
;
@@ -803,36 +806,36 @@
\node
[
node~contents = { } ,
- __wa_node_style ,
- name = wa - \l__wa_prefix_str - \int_use:N \g__wa_line_int - r ,
+ @@_node_style ,
+ name = wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - r ,
alias =
{
- \str_if_empty:NF \l__wa_name_str
- { \l__wa_name_str - \int_use:N \g__wa_line_int - r }
+ \str_if_empty:NF \l_@@_name_str
+ { \l_@@_name_str - \int_use:N \g_@@_line_int - r }
}
]
;
- \bool_if:NT \l__wa_show_node_names_bool
+ \bool_if:NT \l_@@_show_node_names_bool
{
\hbox_overlap_right:n
- { \small wa - \l__wa_prefix_str - \int_use:N \g__wa_line_int - r }
+ { \small wa - \l_@@_prefix_str - \int_use:N \g_@@_line_int - r }
}
}
\NewDocumentEnvironment { WithArrows } { ! O { } }
{
- \bool_set_true:N \l__wa_in_WithArrows_bool
- \bool_set_false:N \l__wa_in_DispWithArrows_bool
- \__wa_pre_halign:n { #1 }
+ \bool_set_true:N \l_@@_in_WithArrows_bool
+ \bool_set_false:N \l_@@_in_DispWithArrows_bool
+ \@@_pre_halign:n { #1 }
\if_mode_math: \else:
- \__wa_error:n { WithArrows~outside~math~mode }
+ \@@_error:n { WithArrows~outside~math~mode }
\fi:
- \int_case:nn \l__wa_pos_env_int { 0 \vtop 1 \vcenter 2 \vbox }
+ \int_case:nn \l_@@_pos_env_int { 0 \vtop 1 \vcenter 2 \vbox }
\bgroup
- \__wa_construct_halign:
+ \@@_construct_halign:
&&
- \__wa_error:n { Too~much~columns~in~WithArrows }
+ \@@_error:n { Too~much~columns~in~WithArrows }
\c_math_toggle_token
- \bool_if:NT \l__wa_displaystyle_bool \displaystyle
+ \bool_if:NT \l_@@_displaystyle_bool \displaystyle
{ ## }
\c_math_toggle_token
\cr
@@ -841,81 +844,84 @@
\\
\egroup
\egroup
- \__wa_post_halign:
- \bool_if:NT \g__wa_footnote_bool { \end { savenotes } }
+ \@@_post_halign:
+ \bool_if:NT \g_@@_footnote_bool { \end { savenotes } }
}
-\cs_new_protected:Npn \__wa_post_halign:
+\cs_new_protected:Npn \@@_post_halign:
{
- \cs_set:Npn \WithArrowsRightX { \g__wa_right_x_dim }
- \int_compare:nNnT \g__wa_arrow_int > 0
+ \cs_set:Npn \WithArrowsRightX { \g_@@_right_x_dim }
+ \normalbaselines
+ \int_compare:nNnT \g_@@_arrow_int > 0
{
- \int_compare:nNnT \g__wa_arrow_int = 1
+ \int_compare:nNnT \g_@@_arrow_int = 1
{
- \int_compare:nNnT \l__wa_pos_arrow_int > 5
- { \int_set:Nn \l__wa_pos_arrow_int 5 }
+ \int_compare:nNnT \l_@@_pos_arrow_int > 5
+ { \int_set:Nn \l_@@_pos_arrow_int 5 }
}
- \__wa_scan_arrows:
+ \@@_scan_arrows:
}
\group_begin:
- \tikzset { every~picture / .style = __wa_standard }
- \cs_set:Npn \WithArrowsNbLines { \int_use:N \g__wa_line_int }
- \cs_set_eq:NN \MultiArrow \__wa_MultiArrow:nn
- \cs_set_eq:cN \l__wa_command_name_str \__wa_Arrow_code_after
- \bool_set_true:N \l__wa_in_code_after_bool
- \l__wa_code_after_tl
+ \tikzset { every~picture / .style = @@_standard }
+ \cs_set:Npn \WithArrowsNbLines { \int_use:N \g_@@_line_int }
+ \cs_set_eq:NN \MultiArrow \@@_MultiArrow:nn
+ \cs_set_eq:cN \l_@@_command_name_str \@@_Arrow_code_after
+ \bool_set_true:N \l_@@_in_code_after_bool
+ \l_@@_code_after_tl
\group_end:
- \seq_gpop_right:NN \g__wa_position_in_the_tree_seq \l_tmpa_tl
- \seq_gpop_right:NN \g__wa_position_in_the_tree_seq \l_tmpa_tl
- \seq_gput_right:Nx \g__wa_position_in_the_tree_seq
+ \seq_gpop_right:NN \g_@@_position_in_the_tree_seq \l_tmpa_tl
+ \seq_gpop_right:NN \g_@@_position_in_the_tree_seq \l_tmpa_tl
+ \seq_gput_right:Nx \g_@@_position_in_the_tree_seq
{ \int_eval:n { \l_tmpa_tl + 1 } }
- \int_compare:nNnT { \seq_count:N \g__wa_position_in_the_tree_seq } = 1
- { \int_gincr:N \g__wa_last_env_int }
- \seq_gpop_right:NN \g__wa_arrow_int_seq \l_tmpa_tl
- \int_gset:Nn \g__wa_arrow_int \l_tmpa_tl
- \seq_gpop_right:NN \g__wa_line_int_seq \l_tmpa_tl
- \int_gset:Nn \g__wa_line_int \l_tmpa_tl
- \seq_gpop_right:NN \g__wa_col_int_seq \l_tmpa_tl
- \int_gset:Nn \g__wa_col_int \l_tmpa_tl
+ \int_compare:nNnT { \seq_count:N \g_@@_position_in_the_tree_seq } = 1
+ { \int_gincr:N \g_@@_last_env_int }
+ \seq_gpop_right:NN \g_@@_arrow_int_seq \l_tmpa_tl
+ \int_gset:Nn \g_@@_arrow_int \l_tmpa_tl
+ \seq_gpop_right:NN \g_@@_line_int_seq \l_tmpa_tl
+ \int_gset:Nn \g_@@_line_int \l_tmpa_tl
+ \seq_gpop_right:NN \g_@@_col_int_seq \l_tmpa_tl
+ \int_gset:Nn \g_@@_col_int \l_tmpa_tl
+ \seq_gpop_right:NN \g_@@_static_col_int_seq \l_tmpa_tl
+ \int_gset:Nn \g_@@_static_col_int \l_tmpa_tl
}
-\cs_new_protected:Npn \__wa_cr:
+\cs_new_protected:Npn \@@_cr:
{
\scan_stop:
- \int_compare:nNnF \g__wa_col_int = \g__wa_static_col_int
- { \__wa_error:n { omit~probably~used } }
- \prg_replicate:nn { \l__wa_nb_cols_int - \g__wa_static_col_int } { & { } }
+ \int_compare:nNnF \g_@@_col_int = \g_@@_static_col_int
+ { \@@_error:n { omit~probably~used } }
+ \prg_replicate:nn { \l_@@_nb_cols_int - \g_@@_static_col_int } { & { } }
\group_align_safe_begin:
- \peek_meaning_remove:NTF * \__wa_cr_i: \__wa_cr_i:
+ \peek_meaning_remove:NTF * \@@_cr_i: \@@_cr_i:
}
-\cs_new_protected:Npn \__wa_cr_i:
- { \peek_meaning:NTF [ \__wa_cr_ii: { \__wa_cr_ii: [ \c_zero_dim ] } }
-\cs_new_protected:Npn \__wa_cr_ii: [ #1 ]
+\cs_new_protected:Npn \@@_cr_i:
+ { \peek_meaning:NTF [ \@@_cr_ii: { \@@_cr_ii: [ \c_zero_dim ] } }
+\cs_new_protected:Npn \@@_cr_ii: [ #1 ]
{
\peek_meaning_ignore_spaces:NTF \end
{
- \__wa_cr_iii:n { #1 }
- \__wa_analyze_end:Nn
+ \@@_cr_iii:n { #1 }
+ \@@_analyze_end:Nn
}
- { \__wa_cr_iii:n { #1 } }
+ { \@@_cr_iii:n { #1 } }
}
-\cs_new_protected:Npn \__wa_cr_iii:n #1
+\cs_new_protected:Npn \@@_cr_iii:n #1
{
\group_align_safe_end:
- \bool_if:NT \l__wa_in_DispWithArrows_bool
+ \bool_if:NT \l_@@_in_DispWithArrows_bool
{
- \clist_if_in:NnTF \l__wa_tags_clist { all }
+ \clist_if_in:NnTF \l_@@_tags_clist { all }
{
- \tl_if_empty:NT \l__wa_tag_tl { \int_gincr:N \c at equation }
+ \tl_if_empty:NT \l_@@_tag_tl { \int_gincr:N \c at equation }
\cs_gset:Npx \g_tmpa_tl
- { \tl_if_empty:NTF \l__wa_tag_tl \theequation \l__wa_tag_tl }
- \seq_if_empty:NF \l__wa_labels_seq
+ { \tl_if_empty:NTF \l_@@_tag_tl \theequation \l_@@_tag_tl }
+ \seq_if_empty:NF \l_@@_labels_seq
{
\cs_set:Npx \@currentlabel { \p at equation \g_tmpa_tl }
- \bool_if:NT \c__wa_hyperref_loaded_bool
+ \bool_if:NT \c_@@_hyperref_loaded_bool
{
\str_set:Nn \This at name { equation }
\hyper at refstepcounter { equation }
}
- \bool_if:NT \c__wa_cleveref_loaded_bool
+ \bool_if:NT \c_@@_cleveref_loaded_bool
{
\cref at constructprefix { equation } \cref at result
\protected at edef \cref at currentlabel
@@ -929,78 +935,78 @@
\p at equation \g_tmpa_tl
}
}
- \seq_map_function:NN \l__wa_labels_seq \__wa_old_label
+ \seq_map_function:NN \l_@@_labels_seq \@@_old_label
}
- \__wa_save:N \l__wa_tag_star_bool
- \__wa_save:N \l__wa_qedhere_bool
- \bool_if:NT \l__wa_tag_next_line_bool
+ \@@_save:N \l_@@_tag_star_bool
+ \@@_save:N \l_@@_qedhere_bool
+ \bool_if:NT \l_@@_tag_next_line_bool
{
\openup -\jot
- \bool_set_false:N \l__wa_tag_next_line_bool
+ \bool_set_false:N \l_@@_tag_next_line_bool
\notag \\ &
}
&
- \__wa_restore:N \l__wa_tag_star_bool
- \__wa_restore:N \l__wa_qedhere_bool
- \bool_if:NT \l__wa_qedhere_bool
- { \hbox_overlap_left:n \__wa_qedhere_i: }
+ \@@_restore:N \l_@@_tag_star_bool
+ \@@_restore:N \l_@@_qedhere_bool
+ \bool_if:NT \l_@@_qedhere_bool
+ { \hbox_overlap_left:n \@@_qedhere_i: }
\cs_set_eq:NN \theequation \g_tmpa_tl
- \bool_if:NT \l__wa_tag_star_bool
+ \bool_if:NT \l_@@_tag_star_bool
{ \cs_set_eq:NN \tagform@ \prg_do_nothing: }
\hbox_overlap_left:n
{
- \bool_if:NF \c__wa_leqno_bool
+ \bool_if:NF \c_@@_leqno_bool
{
- \tikz [ __wa_standard ]
- \coordinate ( \int_use:N \g__wa_line_int - v ) ;
+ \tikz [ @@_standard ]
+ \coordinate ( \int_use:N \g_@@_line_int - v ) ;
}
\quad
\@eqnnum
}
- \bool_if:NT \c__wa_leqno_bool
+ \bool_if:NT \c_@@_leqno_bool
{
- \tikz [ __wa_standard ]
- \coordinate ( \int_use:N \g__wa_line_int - v ) ;
+ \tikz [ @@_standard ]
+ \coordinate ( \int_use:N \g_@@_line_int - v ) ;
}
}
{
- \__wa_save:N \l__wa_qedhere_bool
+ \@@_save:N \l_@@_qedhere_bool
&
- \__wa_restore:N \l__wa_qedhere_bool
- \bool_if:NT \l__wa_qedhere_bool
- { \hbox_overlap_left:n \__wa_qedhere_i: }
- \tikz [ __wa_standard ]
- \coordinate ( \int_use:N \g__wa_line_int - v ) ;
+ \@@_restore:N \l_@@_qedhere_bool
+ \bool_if:NT \l_@@_qedhere_bool
+ { \hbox_overlap_left:n \@@_qedhere_i: }
+ \tikz [ @@_standard ]
+ \coordinate ( \int_use:N \g_@@_line_int - v ) ;
}
}
\dim_compare:nNnT { #1 } < \c_zero_dim
- { \__wa_error:n { option~of~cr~negative } }
+ { \@@_error:n { option~of~cr~negative } }
\cr
\noalign
{
\dim_set:Nn \l_tmpa_dim { \dim_max:nn { #1 } \c_zero_dim }
- \skip_vertical:n { \l_tmpa_dim + \l__wa_interline_skip }
+ \skip_vertical:n { \l_tmpa_dim + \l_@@_interline_skip }
\scan_stop:
}
}
-\cs_new_protected:Npn \__wa_analyze_end:Nn #1 #2
+\cs_new_protected:Npn \@@_analyze_end:Nn #1 #2
{
- \exp_args:NV \str_if_eq:nnT \l__wa_type_env_str { #2 }
+ \exp_args:NV \str_if_eq:nnT \l_@@_type_env_str { #2 }
{
- \__wa_warning:n { newline~at~the~end~of~env }
+ \@@_error:n { newline~at~the~end~of~env }
\group_begin:
\globaldefs = 1
- \__wa_msg_redirect_name:nn { newline~at~the~end~of~env } { none }
+ \@@_msg_redirect_name:nn { newline~at~the~end~of~env } { none }
\group_end:
}
\end { #2 }
}
-\bool_new:N \l__wa_in_label_or_minipage_bool
+\bool_new:N \l_@@_in_label_or_minipage_bool
\NewDocumentEnvironment { DispWithArrows } { ! d < > ! O { } }
{
- \bool_set_true:N \l__wa_in_DispWithArrows_bool
- \bool_if:nT \c__wa_mathtools_loaded_bool
+ \bool_set_true:N \l_@@_in_DispWithArrows_bool
+ \bool_if:nT \c_@@_mathtools_loaded_bool
{
\MH_if_boolean:nT { show_only_refs }
{
@@ -1008,21 +1014,21 @@
\MH_set_boolean_T:n { show_only_refs }
}
}
- \bool_if:NT \c__wa_typedref_loaded_bool { \str_set:Nn \sr at name { equation } }
- \bool_if:NT \c__wa_amsmath_loaded_bool \intertext@
- \exp_args:No \tl_if_novalue:nF { #1 } { \tl_set:Nn \l__wa_left_brace_tl { #1 } }
- \__wa_pre_halign:n { #2 }
- \bool_if:NT \l__wa_subequations_bool { \begin { subequations } }
- \bool_if:NF \l__wa_sbwi_bool
+ \bool_if:NT \c_@@_typedref_loaded_bool { \str_set:Nn \sr at name { equation } }
+ \bool_if:NT \c_@@_amsmath_loaded_bool \intertext@
+ \exp_args:No \tl_if_novalue:nF { #1 } { \tl_set:Nn \l_@@_left_brace_tl { #1 } }
+ \@@_pre_halign:n { #2 }
+ \bool_if:NT \l_@@_subequations_bool { \begin { subequations } }
+ \bool_if:NF \l_@@_sbwi_bool
{
\if at inlabel
- \bool_set_true:N \l__wa_in_label_or_minipage_bool
+ \bool_set_true:N \l_@@_in_label_or_minipage_bool
\fi
\if at minipage
- \bool_set_true:N \l__wa_in_label_or_minipage_bool
+ \bool_set_true:N \l_@@_in_label_or_minipage_bool
\fi
}
- \tl_if_eq:NNF \l__wa_left_brace_tl \c_novalue_tl
+ \tl_if_eq:NNF \l_@@_left_brace_tl \c_novalue_tl
{
\hbox_set:Nn \l_tmpa_box
{
@@ -1029,32 +1035,32 @@
\group_begin:
\dim_set_eq:NN \nulldelimiterspace \c_zero_dim
\c_math_toggle_token
- \left \l__wa_replace_left_brace_by_tl \vcenter to 1 cm { } \right.
+ \left \l_@@_replace_left_brace_by_tl \vcenter to 1 cm { } \right.
\c_math_toggle_token
\group_end:
}
- \dim_zero_new:N \l__wa_delim_wd_dim
- \dim_set:Nn \l__wa_delim_wd_dim { \box_wd:N \l_tmpa_box }
- \box_clear_new:N \l__wa_left_brace_box
- \hbox_set:Nn \l__wa_left_brace_box
+ \dim_zero_new:N \l_@@_delim_wd_dim
+ \dim_set:Nn \l_@@_delim_wd_dim { \box_wd:N \l_tmpa_box }
+ \box_clear_new:N \l_@@_left_brace_box
+ \hbox_set:Nn \l_@@_left_brace_box
{
\group_begin:
- \cs_set_eq:NN \label \__wa_old_label
+ \cs_set_eq:NN \label \@@_old_label
\c_math_toggle_token
- \bool_if:NT \l__wa_displaystyle_bool \displaystyle
- \l__wa_left_brace_tl
+ \bool_if:NT \l_@@_displaystyle_bool \displaystyle
+ \l_@@_left_brace_tl
{ }
\c_math_toggle_token
\group_end:
}
}
- \tl_clear_new:N \l__wa_tag_tl
- \bool_set_false:N \l__wa_qedhere_bool
- \bool_set_false:N \l__wa_tag_star_bool
+ \tl_clear_new:N \l_@@_tag_tl
+ \bool_set_false:N \l_@@_qedhere_bool
+ \bool_set_false:N \l_@@_tag_star_bool
\if_mode_math:
- \__wa_fatal:n { DispWithArrows~in~math~mode }
+ \@@_fatal:n { DispWithArrows~in~math~mode }
\fi:
- \bool_if:NTF \l__wa_in_label_or_minipage_bool
+ \bool_if:NTF \l_@@_in_label_or_minipage_bool
{ \c_math_toggle_token }
{
\if_mode_vertical:
@@ -1063,29 +1069,29 @@
\fi:
\c_math_toggle_token \c_math_toggle_token
}
- \dim_zero_new:N \l__wa_linewidth_dim
- \bool_if:NTF \l__wa_in_label_or_minipage_bool
- { \dim_set_eq:NN \l__wa_linewidth_dim \linewidth }
- { \dim_set_eq:NN \l__wa_linewidth_dim \displaywidth }
- \box_clear_new:N \l__wa_halign_box
- \setbox \l__wa_halign_box \vtop \bgroup
+ \dim_zero_new:N \l_@@_linewidth_dim
+ \bool_if:NTF \l_@@_in_label_or_minipage_bool
+ { \dim_set_eq:NN \l_@@_linewidth_dim \linewidth }
+ { \dim_set_eq:NN \l_@@_linewidth_dim \displaywidth }
+ \box_clear_new:N \l_@@_halign_box
+ \setbox \l_@@_halign_box \vtop \bgroup
\tabskip =
- \bool_if:NTF \l__wa_fleqn_bool
+ \bool_if:NTF \l_@@_fleqn_bool
\c_zero_skip
{ 0 pt plus 1000 pt minus 1000 pt }
- \__wa_construct_halign:
+ \@@_construct_halign:
\tabskip = 0 pt plus 1000 pt minus 1000 pt
&
$ ## $
\tabskip = \c_zero_skip
&&
- \__wa_fatal:n { Too~much~columns~in~DispWithArrows }
+ \@@_fatal:n { Too~much~columns~in~DispWithArrows }
\bool_if:nT \c_false_bool { ## }
\cr
}
{
- \clist_if_in:NnT \l__wa_tags_clist { last }
- { \clist_set:Nn \l__wa_tags_clist { all } }
+ \clist_if_in:NnT \l_@@_tags_clist { last }
+ { \clist_set:Nn \l_@@_tags_clist { all } }
\\
\egroup
\unskip \unpenalty \unskip \unpenalty
@@ -1092,34 +1098,34 @@
\box_set_to_last:N \l_tmpa_box
\nointerlineskip
\box_use:N \l_tmpa_box
- \dim_gzero_new:N \g__wa_alignment_dim
- \dim_gset:Nn \g__wa_alignment_dim { \box_wd:N \l_tmpa_box }
- \box_clear_new:N \l__wa_new_box
- \hbox_set:Nn \l__wa_new_box { \hbox_unpack_clear:N \l_tmpa_box }
+ \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 }
\dim_compare:nNnT
- { \box_wd:N \l__wa_new_box } < \g__wa_alignment_dim
- { \dim_gset:Nn \g__wa_alignment_dim { \box_wd:N \l__wa_new_box } }
+ { \box_wd:N \l_@@_new_box } < \g_@@_alignment_dim
+ { \dim_gset:Nn \g_@@_alignment_dim { \box_wd:N \l_@@_new_box } }
\egroup
- \tl_if_eq:NNTF \l__wa_left_brace_tl \c_novalue_tl
- { \box_use_drop:N \l__wa_halign_box }
+ \tl_if_eq:NNTF \l_@@_left_brace_tl \c_novalue_tl
+ { \box_use_drop:N \l_@@_halign_box }
{
- \hbox_to_wd:nn \l__wa_linewidth_dim
+ \hbox_to_wd:nn \l_@@_linewidth_dim
{
- \bool_if:NTF \l__wa_fleqn_bool
- { \skip_horizontal:n \l__wa_mathindent_dim }
+ \bool_if:NTF \l_@@_fleqn_bool
+ { \skip_horizontal:n \l_@@_mathindent_dim }
\hfil
- \hbox_to_wd:nn \g__wa_alignment_dim
+ \hbox_to_wd:nn \g_@@_alignment_dim
{
- \box_use_drop:N \l__wa_left_brace_box
+ \box_use_drop:N \l_@@_left_brace_box
\dim_set:Nn \l_tmpa_dim
{
- \box_ht:N \l__wa_halign_box
- + \box_dp:N \l__wa_halign_box
+ \box_ht:N \l_@@_halign_box
+ + \box_dp:N \l_@@_halign_box
}
\group_begin:
\dim_set_eq:NN \nulldelimiterspace \c_zero_dim
\c_math_toggle_token
- \left \l__wa_replace_left_brace_by_tl
+ \left \l_@@_replace_left_brace_by_tl
\vcenter to \l_tmpa_dim { \vfil }
\right.
\c_math_toggle_token
@@ -1128,36 +1134,36 @@
}
\hfil
}
- \skip_horizontal:n { - \l__wa_linewidth_dim }
- \vcenter { \box_use_drop:N \l__wa_halign_box }
+ \skip_horizontal:n { - \l_@@_linewidth_dim }
+ \vcenter { \box_use_drop:N \l_@@_halign_box }
}
- \dim_gzero_new:N \g__wa_right_x_dim
- \dim_gset_eq:NN \g__wa_right_x_dim \c_max_dim
- \begin { tikzpicture } [ __wa_standard ]
- \int_step_variable:nNn \g__wa_line_int \l_tmpa_int
+ \dim_gzero_new:N \g_@@_right_x_dim
+ \dim_gset_eq:NN \g_@@_right_x_dim \c_max_dim
+ \begin { tikzpicture } [ @@_standard ]
+ \int_step_variable:nNn \g_@@_line_int \l_tmpa_int
{
\cs_if_free:cTF
- { pgf at sh@ns at wa - \l__wa_prefix_str - \l_tmpa_int - v }
- { \__wa_fatal:n { Inexistent~v-node } }
+ { pgf at sh@ns at wa - \l_@@_prefix_str - \l_tmpa_int - v }
+ { \@@_fatal:n { Inexistent~v-node } }
{
\tikz at parse@node\pgfutil at firstofone ( \l_tmpa_int - v )
\dim_set:Nn \l_tmpa_dim \pgf at x
- \dim_compare:nNnT \l_tmpa_dim < \g__wa_right_x_dim
- { \dim_gset:Nn \g__wa_right_x_dim \l_tmpa_dim }
+ \dim_compare:nNnT \l_tmpa_dim < \g_@@_right_x_dim
+ { \dim_gset:Nn \g_@@_right_x_dim \l_tmpa_dim }
}
}
\end { tikzpicture }
- \__wa_post_halign:
- \bool_if:nT \c__wa_mathtools_loaded_bool
+ \@@_post_halign:
+ \bool_if:nT \c_@@_mathtools_loaded_bool
{ \MH_if_boolean:nT { show_only_refs } \MT_showonlyrefs_true: }
- \bool_if:NTF \l__wa_in_label_or_minipage_bool
+ \bool_if:NTF \l_@@_in_label_or_minipage_bool
{
\c_math_toggle_token
\skip_vertical:N \belowdisplayskip
}
{ \c_math_toggle_token \c_math_toggle_token }
- \bool_if:NT \l__wa_subequations_bool { \end { subequations } }
- \bool_if:NT \g__wa_footnote_bool { \end { savenotes } }
+ \bool_if:NT \l_@@_subequations_bool { \end { subequations } }
+ \bool_if:NT \g_@@_footnote_bool { \end { savenotes } }
\ignorespacesafterend
}
\NewDocumentEnvironment { DispWithArrows* } { }
@@ -1166,77 +1172,77 @@
\DispWithArrows
}
\endDispWithArrows
-\cs_new_protected:Npn \__wa_if_in_last_col_of_disp:Nn #1 #2
+\cs_new_protected:Npn \@@_if_in_last_col_of_disp:Nn #1 #2
{
- \bool_if:NTF \l__wa_in_WithArrows_bool
- { \__wa_error:nn { Not~allowed~in~WithArrows } { #1 } }
+ \bool_if:NTF \l_@@_in_WithArrows_bool
+ { \@@_error:nn { Not~allowed~in~WithArrows } { #1 } }
{
- \int_compare:nNnTF \g__wa_col_int < \l__wa_nb_cols_int
- { \__wa_error:nn { Not~allowed~in~DispWithArrows } { #1 } }
+ \int_compare:nNnTF \g_@@_col_int < \l_@@_nb_cols_int
+ { \@@_error:nn { Not~allowed~in~DispWithArrows } { #1 } }
{ #2 }
}
}
-\cs_new_protected:Npn \__wa_notag:
- { \__wa_if_in_last_col_of_disp:Nn \notag { \clist_clear:N \l__wa_tags_clist } }
-\cs_new_protected:Npn \__wa_nonumber:
- { \__wa_if_in_last_col_of_disp:Nn \nonumber { \clist_clear:N \l__wa_tags_clist } }
-\NewDocumentCommand \__wa_tag { s m }
+\cs_new_protected:Npn \@@_notag:
+ { \@@_if_in_last_col_of_disp:Nn \notag { \clist_clear:N \l_@@_tags_clist } }
+\cs_new_protected:Npn \@@_nonumber:
+ { \@@_if_in_last_col_of_disp:Nn \nonumber { \clist_clear:N \l_@@_tags_clist } }
+\NewDocumentCommand \@@_tag { s m }
{
- \__wa_if_in_last_col_of_disp:Nn \tag
+ \@@_if_in_last_col_of_disp:Nn \tag
{
- \tl_if_empty:NF \l__wa_tag_tl
- { \__wa_error:nn { Multiple~tags } { #2 } }
- \clist_set:Nn \l__wa_tags_clist { all }
- \bool_if:nT \c__wa_mathtools_loaded_bool
+ \tl_if_empty:NF \l_@@_tag_tl
+ { \@@_error:nn { Multiple~tags } { #2 } }
+ \clist_set:Nn \l_@@_tags_clist { all }
+ \bool_if:nT \c_@@_mathtools_loaded_bool
{
\MH_if_boolean:nT { show_only_refs }
{
\MH_if_boolean:nF { show_manual_tags }
- { \clist_clear:N \l__wa_tags_clist }
+ { \clist_clear:N \l_@@_tags_clist }
}
}
- \tl_set:Nn \l__wa_tag_tl { #2 }
- \bool_set:Nn \l__wa_tag_star_bool { #1 }
- \bool_if:nT { #1 && ! \bool_if_p:N \c__wa_amsmath_loaded_bool }
- { \__wa_error:n { tag*~without~amsmath } }
+ \tl_set:Nn \l_@@_tag_tl { #2 }
+ \bool_set:Nn \l_@@_tag_star_bool { #1 }
+ \bool_if:nT { #1 && ! \bool_if_p:N \c_@@_amsmath_loaded_bool }
+ { \@@_error:n { tag*~without~amsmath } }
}
}
-\cs_new_protected:Npn \__wa_label:n #1
+\cs_new_protected:Npn \@@_label:n #1
{
- \__wa_if_in_last_col_of_disp:Nn \label
+ \@@_if_in_last_col_of_disp:Nn \label
{
- \seq_if_empty:NF \l__wa_labels_seq
+ \seq_if_empty:NF \l_@@_labels_seq
{
- \bool_if:NTF \c__wa_cleveref_loaded_bool
- { \__wa_error:n { Multiple~labels~with~cleveref } }
- { \__wa_error:n { Multiple~labels } }
+ \bool_if:NTF \c_@@_cleveref_loaded_bool
+ { \@@_error:n { Multiple~labels~with~cleveref } }
+ { \@@_error:n { Multiple~labels } }
}
- \seq_put_right:Nn \l__wa_labels_seq { #1 }
- \bool_if:nT \c__wa_mathtools_loaded_bool
+ \seq_put_right:Nn \l_@@_labels_seq { #1 }
+ \bool_if:nT \c_@@_mathtools_loaded_bool
{
\MH_if_boolean:nT { show_only_refs }
{
\cs_if_exist:cTF { MT_r_#1 }
- { \clist_set:Nn \l__wa_tags_clist { all } }
- { \clist_clear:N \l__wa_tags_clist }
+ { \clist_set:Nn \l_@@_tags_clist { all } }
+ { \clist_clear:N \l_@@_tags_clist }
}
}
- \bool_if:nT \c__wa_autonum_loaded_bool
+ \bool_if:nT \c_@@_autonum_loaded_bool
{
\cs_if_exist:cTF { autonum@#1Referenced }
- { \clist_set:Nn \l__wa_tags_clist { all } }
- { \clist_clear:N \l__wa_tags_clist }
+ { \clist_set:Nn \l_@@_tags_clist { all } }
+ { \clist_clear:N \l_@@_tags_clist }
}
}
}
-\cs_new_protected:Npn \__wa_tagnextline:
+\cs_new_protected:Npn \@@_tagnextline:
{
- \__wa_if_in_last_col_of_disp:Nn \tagnextline
- { \bool_set_true:N \l__wa_tag_next_line_bool }
+ \@@_if_in_last_col_of_disp:Nn \tagnextline
+ { \bool_set_true:N \l_@@_tag_next_line_bool }
}
-\cs_new_protected:Npn \__wa_qedhere: { \bool_set_true:N \l__wa_qedhere_bool }
-\cs_new_protected:Npn \__wa_set_qedhere: { \cs_set_eq:NN \qedhere \__wa_qedhere: }
-\cs_new_protected:Npn \__wa_qedhere_i:
+\cs_new_protected:Npn \@@_qedhere: { \bool_set_true:N \l_@@_qedhere_bool }
+\cs_new_protected:Npn \@@_set_qedhere: { \cs_set_eq:NN \qedhere \@@_qedhere: }
+\cs_new_protected:Npn \@@_qedhere_i:
{
\group_begin:
\cs_set_eq:NN \qed \qedsymbol
@@ -1244,233 +1250,233 @@
\QED at stack \relax \relax
\group_end:
}
-\cs_new_protected:Npn \__wa_scan_arrows:
+\cs_new_protected:Npn \@@_scan_arrows:
{
\group_begin:
- \int_compare:nNnT \l__wa_pos_arrow_int = 7
+ \int_compare:nNnT \l_@@_pos_arrow_int = 7
{
- \__wa_scan_arrows_i:
- \int_set:Nn \l__wa_pos_arrow_int 8
+ \@@_scan_arrows_i:
+ \int_set:Nn \l_@@_pos_arrow_int 8
}
- \__wa_scan_arrows_i:
+ \@@_scan_arrows_i:
\group_end:
}
-\cs_new_protected:Npn \__wa_scan_arrows_i:
+\cs_new_protected:Npn \@@_scan_arrows_i:
{
- \int_zero_new:N \l__wa_first_arrow_of_group_int
- \int_zero_new:N \l__wa_first_line_of_group_int
- \int_zero_new:N \l__wa_last_line_of_group_int
- \seq_clear_new:N \l__wa_first_arrows_seq
- \seq_clear_new:N \l__wa_last_arrows_seq
- \bool_set_true:N \l__wa_new_group_bool
- \int_set:Nn \l__wa_arrow_int \c_one_int
- \int_until_do:nNnn \l__wa_arrow_int > \g__wa_arrow_int
+ \int_zero_new:N \l_@@_first_arrow_of_group_int
+ \int_zero_new:N \l_@@_first_line_of_group_int
+ \int_zero_new:N \l_@@_last_line_of_group_int
+ \seq_clear_new:N \l_@@_first_arrows_seq
+ \seq_clear_new:N \l_@@_last_arrows_seq
+ \bool_set_true:N \l_@@_new_group_bool
+ \int_set:Nn \l_@@_arrow_int \c_one_int
+ \int_until_do:nNnn \l_@@_arrow_int > \g_@@_arrow_int
{
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
{ initial } \l_tmpa_tl
- \int_set:Nn \l__wa_initial_int \l_tmpa_tl
+ \int_set:Nn \l_@@_initial_int \l_tmpa_tl
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
{ final } \l_tmpa_tl
- \int_set:Nn \l__wa_final_int \l_tmpa_tl
+ \int_set:Nn \l_@@_final_int \l_tmpa_tl
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
- { status } \l__wa_status_arrow_str
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
+ { status } \l_@@_status_arrow_str
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
- { input-line } \l__wa_input_line_str
- \int_compare:nNnTF \l__wa_final_int > \g__wa_line_int
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
+ { input-line } \l_@@_input_line_str
+ \int_compare:nNnTF \l_@@_final_int > \g_@@_line_int
{
- \int_compare:nNnF \l__wa_pos_arrow_int = 8
- { \__wa_error:n { Too~few~lines~for~an~arrow } }
+ \int_compare:nNnF \l_@@_pos_arrow_int = 8
+ { \@@_error:n { Too~few~lines~for~an~arrow } }
}
- \__wa_code_for_possible_arrow:
- \int_incr:N \l__wa_arrow_int
+ \@@_code_for_possible_arrow:
+ \int_incr:N \l_@@_arrow_int
}
\bool_if:nT
{
- \int_compare_p:n { \l__wa_pos_arrow_int != 7 }
+ \int_compare_p:n { \l_@@_pos_arrow_int != 7 }
&&
- \int_compare_p:nNn \l__wa_first_arrow_of_group_int > 0
+ \int_compare_p:nNn \l_@@_first_arrow_of_group_int > 0
}
- { \__wa_draw_arrows:nn \l__wa_first_arrow_of_group_int \g__wa_arrow_int }
+ { \@@_draw_arrows:nn \l_@@_first_arrow_of_group_int \g_@@_arrow_int }
}
-\cs_new_protected:Npn \__wa_code_for_possible_arrow:
+\cs_new_protected:Npn \@@_code_for_possible_arrow:
{
\bool_if:nT
{
- \int_compare_p:nNn \l__wa_arrow_int > \c_one_int
+ \int_compare_p:nNn \l_@@_arrow_int > \c_one_int
&&
- ( \int_compare_p:n { \l__wa_initial_int > \l__wa_last_line_of_group_int }
+ ( \int_compare_p:n { \l_@@_initial_int > \l_@@_last_line_of_group_int }
&&
- \int_compare_p:n { \l__wa_pos_arrow_int != 7 }
+ \int_compare_p:n { \l_@@_pos_arrow_int != 7 }
||
- \str_if_eq_p:Vn \l__wa_status_arrow_str { new-group }
+ \str_if_eq_p:Vn \l_@@_status_arrow_str { new-group }
)
}
{
- \int_compare:nNnF \l__wa_first_arrow_of_group_int = \c_zero_int
+ \int_compare:nNnF \l_@@_first_arrow_of_group_int = \c_zero_int
{
- \__wa_draw_arrows:nn
- \l__wa_first_arrow_of_group_int
- { \l__wa_arrow_int - 1 }
+ \@@_draw_arrows:nn
+ \l_@@_first_arrow_of_group_int
+ { \l_@@_arrow_int - 1 }
}
- \bool_set_true:N \l__wa_new_group_bool
+ \bool_set_true:N \l_@@_new_group_bool
}
- \bool_if:nTF \l__wa_new_group_bool
+ \bool_if:nTF \l_@@_new_group_bool
{
- \bool_set_false:N \l__wa_new_group_bool
- \int_set_eq:NN \l__wa_first_arrow_of_group_int \l__wa_arrow_int
- \int_set_eq:NN \l__wa_first_line_of_group_int \l__wa_initial_int
- \int_set_eq:NN \l__wa_last_line_of_group_int \l__wa_final_int
- \seq_clear:N \l__wa_first_arrows_seq
- \seq_put_left:NV \l__wa_first_arrows_seq \l__wa_arrow_int
- \seq_clear:N \l__wa_last_arrows_seq
- \seq_put_left:NV \l__wa_last_arrows_seq \l__wa_arrow_int
- \int_compare:nT { \l__wa_pos_arrow_int != 8 }
- { \dim_set:Nn \l__wa_x_dim { - \c_max_dim } }
+ \bool_set_false:N \l_@@_new_group_bool
+ \int_set_eq:NN \l_@@_first_arrow_of_group_int \l_@@_arrow_int
+ \int_set_eq:NN \l_@@_first_line_of_group_int \l_@@_initial_int
+ \int_set_eq:NN \l_@@_last_line_of_group_int \l_@@_final_int
+ \seq_clear:N \l_@@_first_arrows_seq
+ \seq_put_left:NV \l_@@_first_arrows_seq \l_@@_arrow_int
+ \seq_clear:N \l_@@_last_arrows_seq
+ \seq_put_left:NV \l_@@_last_arrows_seq \l_@@_arrow_int
+ \int_compare:nT { \l_@@_pos_arrow_int != 8 }
+ { \dim_set:Nn \l_@@_x_dim { - \c_max_dim } }
}
{
\bool_if:nF
- { \str_if_eq_p:Vn \l__wa_status_arrow_str { independent } }
+ { \str_if_eq_p:Vn \l_@@_status_arrow_str { independent } }
{
\int_compare:nT
- { \l__wa_initial_int = \l__wa_first_line_of_group_int }
- { \seq_put_left:NV \l__wa_first_arrows_seq \l__wa_arrow_int }
- \int_compare:nNnTF \l__wa_final_int > \l__wa_last_line_of_group_int
+ { \l_@@_initial_int = \l_@@_first_line_of_group_int }
+ { \seq_put_left:NV \l_@@_first_arrows_seq \l_@@_arrow_int }
+ \int_compare:nNnTF \l_@@_final_int > \l_@@_last_line_of_group_int
{
- \int_set_eq:NN \l__wa_last_line_of_group_int \l__wa_final_int
- \seq_clear:N \l__wa_last_arrows_seq
- \seq_put_left:NV \l__wa_last_arrows_seq \l__wa_arrow_int
+ \int_set_eq:NN \l_@@_last_line_of_group_int \l_@@_final_int
+ \seq_clear:N \l_@@_last_arrows_seq
+ \seq_put_left:NV \l_@@_last_arrows_seq \l_@@_arrow_int
}
{
- \int_compare:nNnT \l__wa_final_int = \l__wa_last_line_of_group_int
- { \seq_put_left:NV \l__wa_last_arrows_seq \l__wa_arrow_int }
+ \int_compare:nNnT \l_@@_final_int = \l_@@_last_line_of_group_int
+ { \seq_put_left:NV \l_@@_last_arrows_seq \l_@@_arrow_int }
}
}
}
- \bool_if:nF { \str_if_eq_p:Vn \l__wa_status_arrow_str { independent } }
+ \bool_if:nF { \str_if_eq_p:Vn \l_@@_status_arrow_str { independent } }
{
- \int_compare:nT { \l__wa_pos_arrow_int != 8 }
- { \__wa_update_x:nn \l__wa_initial_int \l__wa_final_int }
+ \int_compare:nT { \l_@@_pos_arrow_int != 8 }
+ { \@@_update_x:nn \l_@@_initial_int \l_@@_final_int }
}
}
\cs_generate_variant:Nn \keys_set:nn { n o }
-\cs_new_protected:Npn \__wa_keys_set:
+\cs_new_protected:Npn \@@_keys_set:
{ \keys_set_known:no { WithArrows / Arrow / SecondPass } }
-\cs_new_protected:Npn \__wa_draw_arrows:nn #1 #2
+\cs_new_protected:Npn \@@_draw_arrows:nn #1 #2
{
\group_begin:
- \int_zero_new:N \l__wa_first_arrow_int
- \int_set:Nn \l__wa_first_arrow_int { #1 }
- \int_zero_new:N \l__wa_last_arrow_int
- \int_set:Nn \l__wa_last_arrow_int { #2 }
- \int_set:Nn \l__wa_arrow_int \l__wa_first_arrow_int
- \int_until_do:nNnn \l__wa_arrow_int > \l__wa_last_arrow_int
+ \int_zero_new:N \l_@@_first_arrow_int
+ \int_set:Nn \l_@@_first_arrow_int { #1 }
+ \int_zero_new:N \l_@@_last_arrow_int
+ \int_set:Nn \l_@@_last_arrow_int { #2 }
+ \int_set:Nn \l_@@_arrow_int \l_@@_first_arrow_int
+ \int_until_do:nNnn \l_@@_arrow_int > \l_@@_last_arrow_int
{
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
{ initial } \l_tmpa_tl
- \int_set:Nn \l__wa_initial_int \l_tmpa_tl
+ \int_set:Nn \l_@@_initial_int \l_tmpa_tl
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
{ final } \l_tmpa_tl
- \int_set:Nn \l__wa_final_int \l_tmpa_tl
- \int_compare:nT { \l__wa_final_int <= \g__wa_line_int } \__wa_draw_arrows_i:
- \int_incr:N \l__wa_arrow_int
+ \int_set:Nn \l_@@_final_int \l_tmpa_tl
+ \int_compare:nT { \l_@@_final_int <= \g_@@_line_int } \@@_draw_arrows_i:
+ \int_incr:N \l_@@_arrow_int
}
\group_end:
}
-\cs_new_protected:Npn \__wa_draw_arrows_i:
+\cs_new_protected:Npn \@@_draw_arrows_i:
{
\group_begin:
\prop_get:cnN
- { g__wa_arrow _\l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
+ { g_@@_arrow _\l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
{ options } \l_tmpa_tl
- \str_clear_new:N \l__wa_previous_key_str
+ \str_clear_new:N \l_@@_previous_key_str
\exp_args:NNo \exp_args:No
- \__wa_keys_set: { \l_tmpa_tl , tikz = { xshift = \l__wa_xoffset_dim } }
- \bool_set_false:N \l__wa_initial_r_bool
- \bool_set_false:N \l__wa_final_r_bool
- \int_case:nn \l__wa_pos_arrow_int
+ \@@_keys_set: { \l_tmpa_tl , tikz = { xshift = \l_@@_xoffset_dim } }
+ \bool_set_false:N \l_@@_initial_r_bool
+ \bool_set_false:N \l_@@_final_r_bool
+ \int_case:nn \l_@@_pos_arrow_int
{
- 0 { \bool_set_true:N \l__wa_final_r_bool }
- 2 { \bool_set_true:N \l__wa_initial_r_bool }
+ 0 { \bool_set_true:N \l_@@_final_r_bool }
+ 2 { \bool_set_true:N \l_@@_initial_r_bool }
3
{
- \bool_set_true:N \l__wa_initial_r_bool
- \bool_set_true:N \l__wa_final_r_bool
+ \bool_set_true:N \l_@@_initial_r_bool
+ \bool_set_true:N \l_@@_final_r_bool
}
}
- \int_compare:nNnT \l__wa_pos_arrow_int = 5
+ \int_compare:nNnT \l_@@_pos_arrow_int = 5
{
- \dim_set:Nn \l__wa_x_dim { - \c_max_dim }
- \__wa_update_x:nn \l__wa_initial_int \l__wa_final_int
+ \dim_set:Nn \l_@@_x_dim { - \c_max_dim }
+ \@@_update_x:nn \l_@@_initial_int \l_@@_final_int
}
- \tl_set:Nx \l__wa_initial_tl
+ \tl_set:Nx \l_@@_initial_tl
{
- \int_use:N \l__wa_initial_int - \bool_if:NTF \l__wa_initial_r_bool rl
+ \int_use:N \l_@@_initial_int - \bool_if:NTF \l_@@_initial_r_bool rl
.south
}
- \tl_set:Nx \l__wa_final_tl
- { \int_use:N \l__wa_final_int - \bool_if:NTF \l__wa_final_r_bool rl .north }
+ \tl_set:Nx \l_@@_final_tl
+ { \int_use:N \l_@@_final_int - \bool_if:NTF \l_@@_final_r_bool rl .north }
\prop_get:cnN
- { g__wa_arrow _ \l__wa_prefix_str _ \int_use:N \l__wa_arrow_int _ prop }
+ { g_@@_arrow _ \l_@@_prefix_str _ \int_use:N \l_@@_arrow_int _ prop }
{ label }
\l_tmpa_tl
- \seq_if_in:NxTF \l__wa_first_arrows_seq
- { \int_use:N \l__wa_arrow_int }
+ \seq_if_in:NxTF \l_@@_first_arrows_seq
+ { \int_use:N \l_@@_arrow_int }
{ \bool_set_true:N \l_tmpa_bool }
{ \bool_set_false:N \l_tmpa_bool }
- \seq_if_in:NxTF \l__wa_last_arrows_seq
- { \int_use:N \l__wa_arrow_int }
+ \seq_if_in:NxTF \l_@@_last_arrows_seq
+ { \int_use:N \l_@@_arrow_int }
{ \bool_set_true:N \l_tmpb_bool }
{ \bool_set_false:N \l_tmpb_bool }
- \int_compare:nNnT \l__wa_pos_arrow_int = 5
+ \int_compare:nNnT \l_@@_pos_arrow_int = 5
{
\bool_set_true:N \l_tmpa_bool
\bool_set_true:N \l_tmpb_bool
}
- \dim_gzero_new:N \g__wa_x_initial_dim
- \dim_gzero_new:N \g__wa_x_final_dim
- \dim_gzero_new:N \g__wa_y_initial_dim
- \dim_gzero_new:N \g__wa_y_final_dim
- \begin { tikzpicture } [ __wa_standard ]
- \tikz at scan@one at point \pgfutil at firstofone ( \l__wa_initial_tl )
- \dim_gset:Nn \g__wa_x_initial_dim \pgf at x
- \dim_gset:Nn \g__wa_y_initial_dim \pgf at y
- \tikz at scan@one at point \pgfutil at firstofone ( \l__wa_final_tl )
- \dim_gset:Nn \g__wa_x_final_dim \pgf at x
- \dim_gset:Nn \g__wa_y_final_dim \pgf at y
+ \dim_gzero_new:N \g_@@_x_initial_dim
+ \dim_gzero_new:N \g_@@_x_final_dim
+ \dim_gzero_new:N \g_@@_y_initial_dim
+ \dim_gzero_new:N \g_@@_y_final_dim
+ \begin { tikzpicture } [ @@_standard ]
+ \tikz at scan@one at point \pgfutil at firstofone ( \l_@@_initial_tl )
+ \dim_gset:Nn \g_@@_x_initial_dim \pgf at x
+ \dim_gset:Nn \g_@@_y_initial_dim \pgf at y
+ \tikz at scan@one at point \pgfutil at firstofone ( \l_@@_final_tl )
+ \dim_gset:Nn \g_@@_x_final_dim \pgf at x
+ \dim_gset:Nn \g_@@_y_final_dim \pgf at y
\end { tikzpicture }
\bool_if:nTF
- { \dim_compare_p:nNn { \g__wa_y_initial_dim - \g__wa_y_final_dim }
- > \l__wa_max_length_of_arrow_dim
+ { \dim_compare_p:nNn { \g_@@_y_initial_dim - \g_@@_y_final_dim }
+ > \l_@@_max_length_of_arrow_dim
&&
- \int_compare_p:nNn { \l__wa_final_int - \l__wa_initial_int } = 1
+ \int_compare_p:nNn { \l_@@_final_int - \l_@@_initial_int } = 1
}
{
\tl_gset:Nx \g_tmpa_tl
{
- \int_compare:nNnTF \l__wa_pos_arrow_int < 5
- { \dim_use:N \g__wa_x_initial_dim }
- { \dim_use:N \l__wa_x_dim } ,
+ \int_compare:nNnTF \l_@@_pos_arrow_int < 5
+ { \dim_use:N \g_@@_x_initial_dim }
+ { \dim_use:N \l_@@_x_dim } ,
\dim_eval:n
{
- ( \g__wa_y_initial_dim + \g__wa_y_final_dim ) / 2
- + ( \l__wa_max_length_of_arrow_dim / 2 )
+ ( \g_@@_y_initial_dim + \g_@@_y_final_dim ) / 2
+ + ( \l_@@_max_length_of_arrow_dim / 2 )
}
}
\tl_gset:Nx \g_tmpb_tl
{
- \int_compare:nNnTF \l__wa_pos_arrow_int < 5
- { \dim_use:N \g__wa_x_final_dim }
- { \dim_use:N \l__wa_x_dim } ,
+ \int_compare:nNnTF \l_@@_pos_arrow_int < 5
+ { \dim_use:N \g_@@_x_final_dim }
+ { \dim_use:N \l_@@_x_dim } ,
\dim_eval:n
{
- ( \g__wa_y_initial_dim + \g__wa_y_final_dim ) / 2
- - ( \l__wa_max_length_of_arrow_dim / 2 )
+ ( \g_@@_y_initial_dim + \g_@@_y_final_dim ) / 2
+ - ( \l_@@_max_length_of_arrow_dim / 2 )
}
}
}
@@ -1477,33 +1483,33 @@
{
\tl_gset:Nx \g_tmpa_tl
{
- \int_compare:nNnTF \l__wa_pos_arrow_int < 5
- { \dim_use:N \g__wa_x_initial_dim }
- { \dim_use:N \l__wa_x_dim } ,
+ \int_compare:nNnTF \l_@@_pos_arrow_int < 5
+ { \dim_use:N \g_@@_x_initial_dim }
+ { \dim_use:N \l_@@_x_dim } ,
\bool_if:NTF \l_tmpa_bool
- { \dim_eval:n { \g__wa_y_initial_dim + \l__wa_start_adjust_dim } }
- { \dim_use:N \g__wa_y_initial_dim }
+ { \dim_eval:n { \g_@@_y_initial_dim + \l_@@_start_adjust_dim } }
+ { \dim_use:N \g_@@_y_initial_dim }
}
\tl_gset:Nx \g_tmpb_tl
{
- \int_compare:nNnTF \l__wa_pos_arrow_int < 5
- { \dim_use:N \g__wa_x_final_dim }
- { \dim_use:N \l__wa_x_dim } ,
+ \int_compare:nNnTF \l_@@_pos_arrow_int < 5
+ { \dim_use:N \g_@@_x_final_dim }
+ { \dim_use:N \l_@@_x_dim } ,
\bool_if:NTF \l_tmpb_bool
- { \dim_eval:n { \g__wa_y_final_dim - \l__wa_end_adjust_dim } }
- { \dim_use:N \g__wa_y_final_dim }
+ { \dim_eval:n { \g_@@_y_final_dim - \l_@@_end_adjust_dim } }
+ { \dim_use:N \g_@@_y_final_dim }
}
}
- \__wa_draw_arrow:nno \g_tmpa_tl \g_tmpb_tl \l_tmpa_tl
+ \@@_draw_arrow:nno \g_tmpa_tl \g_tmpb_tl \l_tmpa_tl
\group_end:
}
-\cs_new_protected:Npn \__wa_def_function_tmpa:n #1
+\cs_new_protected:Npn \@@_def_function_tmpa:n #1
{
- \cs_set:Npn \__wa_tmpa:nnn ##1 ##2 ##3
+ \cs_set:Npn \@@_tmpa:nnn ##1 ##2 ##3
{
\begin{tikzpicture}
[
- __wa_standard ,
+ @@_standard ,
every~path / .style = WithArrows / arrow
]
#1
@@ -1510,20 +1516,20 @@
\end{tikzpicture}
}
}
-\cs_new_protected:Npn \__wa_draw_arrow:nnn #1 #2 #3
+\cs_new_protected:Npn \@@_draw_arrow:nnn #1 #2 #3
{
- \bool_if:nT { \l__wa_wrap_lines_bool && \l__wa_in_DispWithArrows_bool }
- { \tl_set_eq:NN \l__wa_tikz_code_tl \c__wa_tikz_code_wrap_lines_tl }
- \exp_args:NV \__wa_def_function_tmpa:n \l__wa_tikz_code_tl
- \__wa_tmpa:nnn { #1 } { #2 } { #3 }
+ \bool_if:nT { \l_@@_wrap_lines_bool && \l_@@_in_DispWithArrows_bool }
+ { \tl_set_eq:NN \l_@@_tikz_code_tl \c_@@_tikz_code_wrap_lines_tl }
+ \exp_args:NV \@@_def_function_tmpa:n \l_@@_tikz_code_tl
+ \@@_tmpa:nnn { #1 } { #2 } { #3 }
}
-\cs_generate_variant:Nn \__wa_draw_arrow:nnn { n n o }
-\tl_const:Nn \c__wa_tikz_code_wrap_lines_tl
+\cs_generate_variant:Nn \@@_draw_arrow:nnn { n n o }
+\tl_const:Nn \c_@@_tikz_code_wrap_lines_tl
{
- \draw ( #1 ) to node ( __wa_label ) { } ( #2 ) ;
- \tikz at parse@node \pgfutil at firstofone ( __wa_label.west )
+ \draw ( #1 ) to node ( @@_label ) { } ( #2 ) ;
+ \tikz at parse@node \pgfutil at firstofone ( @@_label.west )
\dim_set:Nn \l_tmpa_dim
- { \g__wa_right_x_dim - \pgf at x - \pgfkeysvalueof { / pgf / inner~xsep } }
+ { \g_@@_right_x_dim - \pgf at x - \pgfkeysvalueof { / pgf / inner~xsep } }
\path \pgfextra { \tl_gset:Nx \g_tmpa_tl \tikz at text@width } ;
\tl_if_empty:NF \g_tmpa_tl
{
@@ -1533,23 +1539,23 @@
}
\dim_compare:nNnT \l_tmpa_dim > \c_zero_dim
{
- \path ( __wa_label.west )
+ \path ( @@_label.west )
node [ anchor = west , text~width = \dim_use:N \l_tmpa_dim ]
{ #3 } ;
}
}
-\cs_new_protected:Npn \__wa_update_x:nn #1 #2
+\cs_new_protected:Npn \@@_update_x:nn #1 #2
{
\int_step_inline:nnn { #1 } { #2 }
{
- \begin { tikzpicture } [ __wa_standard ]
+ \begin { tikzpicture } [ @@_standard ]
\tikz at scan@one at point \pgfutil at firstofone ( ##1 - l )
- \dim_gset:Nn \g_tmpa_dim { \dim_max:nn \l__wa_x_dim \pgf at x }
+ \dim_gset:Nn \g_tmpa_dim { \dim_max:nn \l_@@_x_dim \pgf at x }
\end { tikzpicture }
- \dim_set_eq:NN \l__wa_x_dim \g_tmpa_dim
+ \dim_set_eq:NN \l_@@_x_dim \g_tmpa_dim
}
}
-\cs_new:Npn \WithArrowsLastEnv { \int_use:N \g__wa_last_env_int }
+\cs_new:Npn \WithArrowsLastEnv { \int_use:N \g_@@_last_env_int }
\keys_define:nn { WithArrows / Arrow / code-after }
{
tikz .code:n =
@@ -1556,57 +1562,57 @@
\tikzset { WithArrows / arrow / .append~style = { #1 } } ,
tikz .value_required:n = true ,
rr .value_forbidden:n = true ,
- rr .code:n = \__wa_fix_pos_option:n 0 ,
+ rr .code:n = \@@_fix_pos_option:n 0 ,
ll .value_forbidden:n = true,
- ll .code:n = \__wa_fix_pos_option:n 1 ,
+ ll .code:n = \@@_fix_pos_option:n 1 ,
rl .value_forbidden:n = true ,
- rl .code:n = \__wa_fix_pos_option:n 2 ,
+ rl .code:n = \@@_fix_pos_option:n 2 ,
lr .value_forbidden:n = true ,
- lr .code:n = \__wa_fix_pos_option:n 3 ,
+ lr .code:n = \@@_fix_pos_option:n 3 ,
v .value_forbidden:n = true ,
- v .code:n = \__wa_fix_pos_option:n 4 ,
- tikz-code .tl_set:N = \l__wa_tikz_code_tl ,
+ v .code:n = \@@_fix_pos_option:n 4 ,
+ tikz-code .tl_set:N = \l_@@_tikz_code_tl ,
tikz-code .value_required:n = true ,
- xoffset .dim_set:N = \l__wa_xoffset_dim ,
+ xoffset .dim_set:N = \l_@@_xoffset_dim ,
xoffset .value_required:n = true ,
unknown .code:n =
- \__wa_sort_seq:N \l__wa_options_Arrow_code_after_seq
- \__wa_error:n { Unknown~option~Arrow~in~code-after }
+ \@@_sort_seq:N \l_@@_options_Arrow_code_after_seq
+ \@@_error:n { Unknown~option~Arrow~in~code-after }
}
-\seq_new:N \l__wa_options_Arrow_code_after_seq
-\__wa_set_seq_of_str_from_clist:Nn \l__wa_options_Arrow_code_after_seq
+\seq_new:N \l_@@_options_Arrow_code_after_seq
+\@@_set_seq_of_str_from_clist:Nn \l_@@_options_Arrow_code_after_seq
{ ll, lr, rl, rr, tikz, tikz-code, v, x, offset }
-\NewDocumentCommand \__wa_Arrow_code_after { O { } m m m ! O { } }
+\NewDocumentCommand \@@_Arrow_code_after { O { } m m m ! O { } }
{
- \int_set:Nn \l__wa_pos_arrow_int 1
- \str_clear_new:N \l__wa_previous_key_str
+ \int_set:Nn \l_@@_pos_arrow_int 1
+ \str_clear_new:N \l_@@_previous_key_str
\group_begin:
\keys_set:nn { WithArrows / Arrow / code-after }
- { #1, #5, tikz = { xshift = \l__wa_xoffset_dim } }
- \bool_set_false:N \l__wa_initial_r_bool
- \bool_set_false:N \l__wa_final_r_bool
- \int_case:nn \l__wa_pos_arrow_int
+ { #1, #5, tikz = { xshift = \l_@@_xoffset_dim } }
+ \bool_set_false:N \l_@@_initial_r_bool
+ \bool_set_false:N \l_@@_final_r_bool
+ \int_case:nn \l_@@_pos_arrow_int
{
0
{
- \bool_set_true:N \l__wa_initial_r_bool
- \bool_set_true:N \l__wa_final_r_bool
+ \bool_set_true:N \l_@@_initial_r_bool
+ \bool_set_true:N \l_@@_final_r_bool
}
- 2 { \bool_set_true:N \l__wa_initial_r_bool }
- 3 { \bool_set_true:N \l__wa_final_r_bool }
+ 2 { \bool_set_true:N \l_@@_initial_r_bool }
+ 3 { \bool_set_true:N \l_@@_final_r_bool }
}
\tl_if_eq:nnTF { #2 } { #3 }
- { \__wa_error:nn { Both~lines~are~equal } { #2 } }
+ { \@@_error:nn { Both~lines~are~equal } { #2 } }
{
- \cs_if_free:cTF { pgf at sh@ns at wa - \l__wa_prefix_str - #2 - l }
- { \__wa_error:nx { Wrong~line~in~Arrow } { #2 } }
+ \cs_if_free:cTF { pgf at sh@ns at wa - \l_@@_prefix_str - #2 - l }
+ { \@@_error:nx { Wrong~line~in~Arrow } { #2 } }
{
- \cs_if_free:cTF { pgf at sh@ns at wa - \l__wa_prefix_str - #3 - l }
- { \__wa_error:nx { Wrong~line~in~Arrow } { #3 } }
+ \cs_if_free:cTF { pgf at sh@ns at wa - \l_@@_prefix_str - #3 - l }
+ { \@@_error:nx { Wrong~line~in~Arrow } { #3 } }
{
- \int_compare:nNnTF \l__wa_pos_arrow_int = 4
+ \int_compare:nNnTF \l_@@_pos_arrow_int = 4
{
- \begin { tikzpicture } [ __wa_standard ]
+ \begin { tikzpicture } [ @@_standard ]
\tikz at scan@one at point \pgfutil at firstofone (#2-l.south)
\dim_set_eq:NN \l_tmpa_dim \pgf at x
\dim_set_eq:NN \l_tmpb_dim \pgf at y
@@ -1620,42 +1626,42 @@
\end { tikzpicture }
}
{
- \begin { tikzpicture } [ __wa_standard ]
+ \begin { tikzpicture } [ @@_standard ]
\tikz at scan@one at point \pgfutil at firstofone
- ( #2-\bool_if:NTF\l__wa_initial_r_bool rl .south )
+ ( #2-\bool_if:NTF\l_@@_initial_r_bool rl .south )
\tl_gset:Nx \g_tmpa_tl
{ \dim_use:N \pgf at x , \dim_use:N \pgf at y }
\tikz at scan@one at point \pgfutil at firstofone
- ( #3-\bool_if:NTF\l__wa_final_r_bool rl .north )
+ ( #3-\bool_if:NTF\l_@@_final_r_bool rl .north )
\tl_gset:Nx \g_tmpb_tl
{ \dim_use:N \pgf at x , \dim_use:N \pgf at y }
\end { tikzpicture }
}
- \__wa_draw_arrow:nnn \g_tmpa_tl \g_tmpb_tl { #4 }
+ \@@_draw_arrow:nnn \g_tmpa_tl \g_tmpb_tl { #4 }
}
}
}
\group_end:
}
-\cs_new_protected:Npn \__wa_MultiArrow:nn #1 #2
+\cs_new_protected:Npn \@@_MultiArrow:nn #1 #2
{
\exp_args:Nnx
\regex_match:nnTF
{ \A \d+ (\,\d+)* ( \, \.\.\. (\,\d+)+ )* \Z }
{ #1 }
- { \__wa_MultiArrow_i:nn { #1 } { #2 } }
- { \__wa_error:nx { Invalid~specification~for~MultiArrow } { #1 } }
+ { \@@_MultiArrow_i:nn { #1 } { #2 } }
+ { \@@_error:nx { Invalid~specification~for~MultiArrow } { #1 } }
}
-\cs_new_protected:Npn \__wa_MultiArrow_i:nn #1 #2
+\cs_new_protected:Npn \@@_MultiArrow_i:nn #1 #2
{
\foreach \x in { #1 }
{
- \cs_if_free:cTF { pgf at sh@ns at wa - \l__wa_prefix_str - \x - l }
- { \__wa_error:nx { Wrong~line~specification~in~MultiArrow } \x }
+ \cs_if_free:cTF { pgf at sh@ns at wa - \l_@@_prefix_str - \x - l }
+ { \@@_error:nx { Wrong~line~specification~in~MultiArrow } \x }
{ \clist_gput_right:Nx \g_tmpa_clist \x }
}
\int_compare:nTF { \clist_count:N \g_tmpa_clist < 2 }
- { \__wa_error:n { Too~small~specification~for~MultiArrow } }
+ { \@@_error:n { Too~small~specification~for~MultiArrow } }
{
\clist_sort:Nn \g_tmpa_clist
{
@@ -1666,52 +1672,52 @@
\clist_pop:NN \g_tmpa_clist \l_tmpa_tl
\clist_reverse:N \g_tmpa_clist
\clist_pop:NN \g_tmpa_clist \l_tmpb_tl
- \exp_args:NV \__wa_MultiArrow_i:n \g_tmpa_clist
+ \exp_args:NV \@@_MultiArrow_i:n \g_tmpa_clist
\begin { tikzpicture }
[
- __wa_standard ,
+ @@_standard ,
every~path / .style = { WithArrows / arrow }
]
- \draw [<->] ([xshift = \l__wa_xoffset_dim]\l_tmpa_tl-r.south)
+ \draw [<->] ([xshift = \l_@@_xoffset_dim]\l_tmpa_tl-r.south)
-- ++(5mm,0)
- -- node (__wa_label) {}
- ([xshift = \l__wa_xoffset_dim+5mm]\l_tmpb_tl-r.south)
- -- ([xshift = \l__wa_xoffset_dim]\l_tmpb_tl-r.south) ;
- \tikz at parse@node \pgfutil at firstofone (__wa_label.west)
+ -- node (@@_label) {}
+ ([xshift = \l_@@_xoffset_dim+5mm]\l_tmpb_tl-r.south)
+ -- ([xshift = \l_@@_xoffset_dim]\l_tmpb_tl-r.south) ;
+ \tikz at parse@node \pgfutil at firstofone (@@_label.west)
\dim_set:Nn \l_tmpa_dim { 20 cm }
\path \pgfextra { \tl_gset:Nx \g_tmpa_tl \tikz at text@width } ;
\tl_if_empty:NF \g_tmpa_tl { \dim_set:Nn \l_tmpa_dim \g_tmpa_tl }
- \bool_if:nT { \l__wa_wrap_lines_bool && \l__wa_in_DispWithArrows_bool }
+ \bool_if:nT { \l_@@_wrap_lines_bool && \l_@@_in_DispWithArrows_bool }
{
\dim_set:Nn \l_tmpb_dim
- { \g__wa_right_x_dim - \pgf at x - 0.3333 em }
+ { \g_@@_right_x_dim - \pgf at x - 0.3333 em }
\dim_compare:nNnT \l_tmpb_dim < \l_tmpa_dim
{ \dim_set_eq:NN \l_tmpa_dim \l_tmpb_dim }
}
- \path (__wa_label.west)
+ \path (@@_label.west)
node [ anchor = west, text~width = \dim_use:N \l_tmpa_dim ] { #2 } ;
\end{tikzpicture}
}
}
-\cs_new_protected:Npn \__wa_MultiArrow_i:n #1
+\cs_new_protected:Npn \@@_MultiArrow_i:n #1
{
\begin { tikzpicture }
[
- __wa_standard ,
+ @@_standard ,
every~path / .style = { WithArrows / arrow }
]
\foreach \k in { #1 }
{
\draw [ <- ]
- ( [xshift = \l__wa_xoffset_dim]\k-r.south ) -- ++(5mm,0) ;
+ ( [xshift = \l_@@_xoffset_dim]\k-r.south ) -- ++(5mm,0) ;
} ;
\end{tikzpicture}
}
-\str_const:Nn \c__wa_option_ignored_str
+\str_const:Nn \c_@@_option_ignored_str
{ If~you~go~on,~this~option~will~be~ignored. }
-\str_const:Nn \c__wa_command_ignored_str
+\str_const:Nn \c_@@_command_ignored_str
{ If~you~go~on,~this~command~will~be~ignored. }
-\__wa_msg_new:nn { amsmath~not~loaded }
+\@@_msg_new:nn { amsmath~not~loaded }
{
You~can't~use~the~option~'\l_keys_key_tl'~because~the~
package~'amsmath'~has~not~been~loaded.\\
@@ -1718,7 +1724,7 @@
If~you~go~on,~this~option~will~be~ignored~in~the~rest~
of~the~document.
}
-\__wa_msg_new:nn { Bad~value~for~replace~brace~by }
+\@@_msg_new:nn { Bad~value~for~replace~brace~by }
{
Bad~value~for~the~option~'\l_keys_key_tl'.~The~value~must~begin~
with~an~extensible~left~delimiter.~The~possible~values~are:~.,
@@ -1728,213 +1734,214 @@
\token_to_str:N \lfloor\ and~\token_to_str:N \lceil\
(and~\token_to_str:N \lvert\ and~\token_to_str:N \lVert\
if~amsmath~or~unicode-math~is~loaded~in~LaTeX).\\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { option~of~cr~negative }
+\@@_msg_new:nn { option~of~cr~negative }
{
The~argument~of~the~command~\token_to_str:N\\~
- should~be~positive~in~the~row~\int_use:N \g__wa_line_int\
- of~your~environment~\{\l__wa_type_env_str\}.\\
- \c__wa_option_ignored_str
+ should~be~positive~in~the~row~\int_use:N \g_@@_line_int\
+ of~your~environment~\{\l_@@_type_env_str\}.\\
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { omit~probably~used }
+\@@_msg_new:nn { omit~probably~used }
{
There~is~a~problem.~Maybe~you~have~used~a~command~
- \token_to_str:N\omit\ in~the~line~\int_use:N \g__wa_line_int\
- (or~another~line)~of~your~environment~\{\l__wa_type_env_str\}.\\
+ \token_to_str:N\omit\ in~the~line~\int_use:N \g_@@_line_int\
+ (or~another~line)~of~your~environment~\{\l_@@_type_env_str\}.\\
You~can~go~on~but~you~may~have~others~errors.
}
-\__wa_msg_new:nn { newline~at~the~end~of~env }
+\@@_msg_new:nn { newline~at~the~end~of~env }
{
The~environments~of~witharrows~(\{WithArrows\}~and~
\{DispWithArrows\})~should~not~end~by~\token_to_str:N \\.\\
- This~warning~might~become~an~error~in~a~future~version.
+ However,~you~can~go~on~for~this~time.~No~similar~error~will~be~
+ raised~in~this~document.
}
-\__wa_msg_new:nn { Invalid~option~format }
+\@@_msg_new:nn { Invalid~option~format }
{
The~key~'format'~should~contain~only~letters~r,~c~and~l~and~
must~not~be~empty.\\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Value~for~a~key }
+\@@_msg_new:nn { Value~for~a~key }
{
The~key~'\l_keys_key_tl'~should~be~used~without~value. \\
However,~you~can~go~on~for~this~time.
}
-\__wa_msg_new:nnn { Unknown~option~in~Arrow }
+\@@_msg_new:nnn { Unknown~option~in~Arrow }
{
The~key~'\l_keys_key_tl'~is~unknown~for~the~command~
- \l__wa_string_Arrow_for_msg_str\ in~the~row~
- \int_use:N \g__wa_line_int\ of~your~environment~
- \{\l__wa_type_env_str\}. \l_tmpa_str \\
- \c__wa_option_ignored_str \\
+ \l_@@_string_Arrow_for_msg_str\ in~the~row~
+ \int_use:N \g_@@_line_int\ of~your~environment~
+ \{\l_@@_type_env_str\}. \l_tmpa_str \\
+ \c_@@_option_ignored_str \\
For~a~list~of~the~available~keys,~type~H~<return>.
}
{
The~available~keys~are~(in~alphabetic~order):~
- \seq_use:Nnnn \l__wa_options_Arrow_seq {~and~} {,~} {~and~}.
+ \seq_use:Nnnn \l_@@_options_Arrow_seq {~and~} {,~} {~and~}.
}
-\__wa_msg_new:nnn { Unknown~option~WithArrows }
+\@@_msg_new:nnn { Unknown~option~WithArrows }
{
- The~key~'\l_keys_key_tl'~is~unknown~in~\{\l__wa_type_env_str\}. \\
- \c__wa_option_ignored_str \\
+ The~key~'\l_keys_key_tl'~is~unknown~in~\{\l_@@_type_env_str\}. \\
+ \c_@@_option_ignored_str \\
For~a~list~of~the~available~keys,~type~H~<return>.
}
{
The~available~keys~are~(in~alphabetic~order):~
- \seq_use:Nnnn \l__wa_options_WithArrows_seq {~and~} {,~} {~and~}.
+ \seq_use:Nnnn \l_@@_options_WithArrows_seq {~and~} {,~} {~and~}.
}
-\__wa_msg_new:nnn { Unknown~option~DispWithArrows }
+\@@_msg_new:nnn { Unknown~option~DispWithArrows }
{
- The~key~'\l_keys_key_tl'~is~unknown~in~\{\l__wa_type_env_str\}. \\
- \c__wa_option_ignored_str \\
+ The~key~'\l_keys_key_tl'~is~unknown~in~\{\l_@@_type_env_str\}. \\
+ \c_@@_option_ignored_str \\
For~a~list~of~the~available~keys,~type~H~<return>.
}
{
The~available~keys~are~(in~alphabetic~order):~
- \seq_use:Nnnn \l__wa_options_DispWithArrows_seq {~and~} {,~} {~and~}.
+ \seq_use:Nnnn \l_@@_options_DispWithArrows_seq {~and~} {,~} {~and~}.
}
-\__wa_msg_new:nnn { Unknown~option~WithArrowsOptions }
+\@@_msg_new:nnn { Unknown~option~WithArrowsOptions }
{
The~key~'\l_keys_key_tl'~is~unknown~in~
\token_to_str:N \WithArrowsOptions. \\
- \c__wa_option_ignored_str \\
+ \c_@@_option_ignored_str \\
For~a~list~of~the~available~keys,~type~H~<return>.
}
{
The~available~keys~are~(in~alphabetic~order):~
- \seq_use:Nnnn \l__wa_options_WithArrowsOptions_seq {~and~} {,~} {~and~}.
+ \seq_use:Nnnn \l_@@_options_WithArrowsOptions_seq {~and~} {,~} {~and~}.
}
-\__wa_msg_new:nnn { Unknown~option~Arrow~in~code-after }
+\@@_msg_new:nnn { Unknown~option~Arrow~in~code-after }
{
The~key~'\l_keys_key_tl'~is~unknown~in~
\token_to_str:N \Arrow\ in~code-after. \\
- \c__wa_option_ignored_str \\
+ \c_@@_option_ignored_str \\
For~a~list~of~the~available~keys,~type~H~<return>.
}
{
The~available~keys~are~(in~alphabetic~order):~
- \seq_use:Nnnn \l__wa_options_Arrow_code_after_seq {~and~} {,~} {~and~}.
+ \seq_use:Nnnn \l_@@_options_Arrow_code_after_seq {~and~} {,~} {~and~}.
}
-\__wa_msg_new:nn { Too~much~columns~in~WithArrows }
+\@@_msg_new:nn { Too~much~columns~in~WithArrows }
{
- Your~environment~\{\l__wa_type_env_str\}~has~\int_use:N
- \l__wa_nb_cols_int\ columns~and~you~try~to~use~one~more.~
+ Your~environment~\{\l_@@_type_env_str\}~has~\int_use:N
+ \l_@@_nb_cols_int\ columns~and~you~try~to~use~one~more.~
Maybe~you~have~forgotten~a~\c_backslash_str\c_backslash_str.~
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.
}
-\__wa_msg_new:nn { Too~much~columns~in~DispWithArrows }
+\@@_msg_new:nn { Too~much~columns~in~DispWithArrows }
{
- Your~environment~\{\l__wa_type_env_str\}~has~\int_use:N
- \l__wa_nb_cols_int\ columns~and~you~try~to~use~one~more.~
+ Your~environment~\{\l_@@_type_env_str\}~has~\int_use:N
+ \l_@@_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__wa_line_int. \\
+ at~the~end~of~row~\int_use:N \g_@@_line_int. \\
This~error~is~fatal.
}
-\__wa_msg_new:nn { Negative~jump }
+\@@_msg_new:nn { Negative~jump }
{
You~can't~use~a~negative~value~for~the~option~'jump'~of~command~
- \l__wa_string_Arrow_for_msg_str\
- in~the~row~\int_use:N \g__wa_line_int\
- of~your~environment~\{\l__wa_type_env_str\}.~
+ \l_@@_string_Arrow_for_msg_str\
+ in~the~row~\int_use:N \g_@@_line_int\
+ of~your~environment~\{\l_@@_type_env_str\}.~
You~can~create~an~arrow~going~backwards~with~the~option~'<-'~of~Tikz. \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { new-group~without~groups }
+\@@_msg_new:nn { new-group~without~groups }
{
You~can't~use~the~option~'new-group'~for~the~command~
- \l__wa_string_Arrow_for_msg_str\
+ \l_@@_string_Arrow_for_msg_str\
because~you~are~not~in~'groups'~mode.~Try~to~use~the~option~
- 'groups'~in~your~environment~\{\l__wa_type_env_str\}. \\
- \c__wa_option_ignored_str
+ 'groups'~in~your~environment~\{\l_@@_type_env_str\}. \\
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn
+\@@_msg_new:nn
{ Too~few~lines~for~an~arrow }
{
- Line~\l__wa_input_line_str\
- :~an~arrow~specified~in~the~row~\int_use:N \l__wa_initial_int\
- of~your~environment~\{\l__wa_type_env_str\}~can't~be~drawn~
+ Line~\l_@@_input_line_str\
+ :~an~arrow~specified~in~the~row~\int_use:N \l_@@_initial_int\
+ of~your~environment~\{\l_@@_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.
}
-\__wa_msg_new:nn { WithArrows~outside~math~mode }
+\@@_msg_new:nn { WithArrows~outside~math~mode }
{
- The~environment~\{\l__wa_type_env_str\}~should~be~used~only~in~math~mode~
+ The~environment~\{\l_@@_type_env_str\}~should~be~used~only~in~math~mode~
like~the~environment~\{aligned\}~of~amsmath. \\
Nevertheless,~you~can~go~on.
}
-\__wa_msg_new:nn { DispWithArrows~in~math~mode }
+\@@_msg_new:nn { DispWithArrows~in~math~mode }
{
- The~environment~\{\l__wa_type_env_str\}~should~be~used~only~outside~math~
+ The~environment~\{\l_@@_type_env_str\}~should~be~used~only~outside~math~
mode~like~the~environment~\{align\}~of~amsmath. \\
This~error~is~fatal.
}
-\__wa_msg_new:nn { Incompatible~options~in~Arrow }
+\@@_msg_new:nn { Incompatible~options~in~Arrow }
{
You~try~to~use~the~option~'\l_keys_key_tl'~but~
this~option~is~incompatible~or~redundant~with~the~option~
- '\l__wa_previous_key_str'~set~in~the~same~command~
- \l__wa_string_Arrow_for_msg_str. \\
- \c__wa_option_ignored_str
+ '\l_@@_previous_key_str'~set~in~the~same~command~
+ \l_@@_string_Arrow_for_msg_str. \\
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Incompatible~options }
+\@@_msg_new:nn { Incompatible~options }
{ You~try~to~use~the~option~'\l_keys_key_tl'~but~
this~option~is~incompatible~or~redundant~with~the~option~
- '\l__wa_previous_key_str'~set~in~the~same~command~
- \bool_if:NT \l__wa_in_code_after_bool
+ '\l_@@_previous_key_str'~set~in~the~same~command~
+ \bool_if:NT \l_@@_in_code_after_bool
{
- \l__wa_string_Arrow_for_msg_str\
- in~the~code-after~of~your~environment~\{\l__wa_type_env_str\}
+ \l_@@_string_Arrow_for_msg_str\
+ in~the~code-after~of~your~environment~\{\l_@@_type_env_str\}
}. \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Arrow~not~in~last~column }
+\@@_msg_new:nn { Arrow~not~in~last~column }
{
- You~should~use~the~command~\l__wa_string_Arrow_for_msg_str\
- only~in~the~last~column~(column~\int_use:N\l__wa_nb_cols_int)~
- of~your~environment~\{\l__wa_type_env_str\}.\\
+ You~should~use~the~command~\l_@@_string_Arrow_for_msg_str\
+ only~in~the~last~column~(column~\int_use:N\l_@@_nb_cols_int)~
+ of~your~environment~\{\l_@@_type_env_str\}.\\
However~you~can~go~on~for~this~time.
}
-\__wa_msg_new:nn { Wrong~line~in~Arrow }
+\@@_msg_new:nn { Wrong~line~in~Arrow }
{
The~specification~of~line~'#1'~you~use~in~the~command~
- \l__wa_string_Arrow_for_msg_str\
- in~the~'code-after'~of~\{\l__wa_type_env_str\}~doesn't~exist. \\
- \c__wa_option_ignored_str
+ \l_@@_string_Arrow_for_msg_str\
+ in~the~'code-after'~of~\{\l_@@_type_env_str\}~doesn't~exist. \\
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Both~lines~are~equal }
+\@@_msg_new:nn { Both~lines~are~equal }
{
- In~the~'code-after'~of~\{\l__wa_type_env_str\}~you~try~to~
+ In~the~'code-after'~of~\{\l_@@_type_env_str\}~you~try~to~
draw~an~arrow~going~to~itself~from~the~line~'#1'.~This~is~not~possible. \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Wrong~line~specification~in~MultiArrow }
+\@@_msg_new:nn { Wrong~line~specification~in~MultiArrow }
{
The~specification~of~line~'#1'~doesn't~exist. \\
If~you~go~on,~it~will~be~ignored~for~\token_to_str:N \MultiArrow.
}
-\__wa_msg_new:nn { Too~small~specification~for~MultiArrow }
+\@@_msg_new:nn { Too~small~specification~for~MultiArrow }
{
The~specification~of~lines~you~gave~to~\token_to_str:N \MultiArrow\
is~too~small:~you~need~at~least~two~lines. \\
- \c__wa_command_ignored_str
+ \c_@@_command_ignored_str
}
-\__wa_msg_new:nn { Not~allowed~in~DispWithArrows }
+\@@_msg_new:nn { Not~allowed~in~DispWithArrows }
{
The~command~\token_to_str:N #1
is~allowed~only~in~the~last~column~
- (column~\int_use:N\l__wa_nb_cols_int)~of~\{\l__wa_type_env_str\}. \\
- \c__wa_option_ignored_str
+ (column~\int_use:N\l_@@_nb_cols_int)~of~\{\l_@@_type_env_str\}. \\
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Not~allowed~in~WithArrows }
+\@@_msg_new:nn { Not~allowed~in~WithArrows }
{
- The~command~\token_to_str:N #1 is~not~allowed~in~\{\l__wa_type_env_str\}~
+ The~command~\token_to_str:N #1 is~not~allowed~in~\{\l_@@_type_env_str\}~
(it's~allowed~in~the~last~column~of~\{DispWithArrows\}). \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { tag*~without~amsmath }
+\@@_msg_new:nn { tag*~without~amsmath }
{
We~can't~use~\token_to_str:N\tag*~because~you~haven't~loaded~amsmath~
(or~mathtools). \\
@@ -1941,49 +1948,49 @@
If~you~go~on,~the~command~\token_to_str:N\tag\
will~be~used~instead.
}
-\__wa_msg_new:nn { Multiple~tags }
+\@@_msg_new:nn { Multiple~tags }
{
You~can't~use~twice~the~command~\token_to_str:N\tag\
- in~a~line~of~the~environment~\{\l__wa_type_env_str\}. \\
+ in~a~line~of~the~environment~\{\l_@@_type_env_str\}. \\
If~you~go~on,~the~tag~'#1'~will~be~used.
}
-\__wa_msg_new:nn { Multiple~labels }
+\@@_msg_new:nn { Multiple~labels }
{
Normally,~we~can't~use~the~command~\token_to_str:N\label\
- twice~in~a~line~of~the~environment~\{\l__wa_type_env_str\}. \\
+ twice~in~a~line~of~the~environment~\{\l_@@_type_env_str\}. \\
However,~you~can~go~on.~
- \bool_if:NT \c__wa_showlabels_loaded_bool
+ \bool_if:NT \c_@@_showlabels_loaded_bool
{ However,~only~the~last~label~will~be~shown~by~showlabels.~ }
If~you~don't~want~to~see~this~message~again,~you~can~use~the~option~
'allow-multiple-labels'~at~the~global~or~environment~level.
}
-\__wa_msg_new:nn { Multiple~labels~with~cleveref }
+\@@_msg_new:nn { Multiple~labels~with~cleveref }
{
Since~you~use~cleveref,~you~can't~use~the~command~\token_to_str:N\label\
- twice~in~a~line~of~the~environment~\{\l__wa_type_env_str\}. \\
+ twice~in~a~line~of~the~environment~\{\l_@@_type_env_str\}. \\
If~you~go~on,~you~may~have~undefined~references.
}
-\__wa_msg_new:nn { Inexistent~v-node }
+\@@_msg_new:nn { Inexistent~v-node }
{
There~is~a~problem.~Maybe~you~have~put~a~command~\token_to_str:N\cr\
instead~of~a~command~\token_to_str:N\\~at~the~end~of~
the~row~\l_tmpa_int\
- of~your~environment~\{\l__wa_type_env_str\}. \\
+ of~your~environment~\{\l_@@_type_env_str\}. \\
This~error~is~fatal.
}
-\__wa_msg_new:nn { Option~xoffset~forbidden }
+\@@_msg_new:nn { Option~xoffset~forbidden }
{
You~can't~use~the~option~'xoffset'~in~the~command~
- \l__wa_string_Arrow_for_msg_str\ in~the~row~\int_use:N \g__wa_line_int\
- of~your~environment~\{\l__wa_type_env_str\}~
+ \l_@@_string_Arrow_for_msg_str\ in~the~row~\int_use:N \g_@@_line_int\
+ of~your~environment~\{\l_@@_type_env_str\}~
because~you~are~using~the~option~
- ' \int_compare:nNnTF \l__wa_pos_arrow_int = 7
+ ' \int_compare:nNnTF \l_@@_pos_arrow_int = 7
{ group }
{ groups } '.~It's~possible~for~an~independent~arrow~or~if~there~is~
only~one~arrow. \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nnn { Duplicate~name }
+\@@_msg_new:nnn { Duplicate~name }
{
The~name~'\l_keys_value_tl'~is~already~used~and~you~shouldn't~use~
the~same~environment~name~twice.~You~can~go~on,~but,~
@@ -1994,12 +2001,12 @@
}
{
The~names~already~defined~in~this~document~are:~
- \seq_use:Nnnn \g__wa_names_seq { ,~ } { ,~ } { ~and~ }.
+ \seq_use:Nnnn \g_@@_names_seq { ,~ } { ,~ } { ~and~ }.
}
\NewDocumentCommand \WithArrowsNewStyle { m m }
{
\keys_if_exist:nnTF { WithArrows / Global } { #1 }
- { \__wa_error:nn { Key~already~defined } { #1 } }
+ { \@@_error:nn { Key~already~defined } { #1 } }
{
\keys_define:nn { WithArrows / Global }
{
@@ -2006,10 +2013,10 @@
#1 .code:n =
{ \keys_set_known:nn { WithArrows / WithArrowsOptions } { #2 } }
}
- \seq_put_right:Nx \l__wa_options_WithArrows_seq { \tl_to_str:n { #1 } }
- \seq_put_right:Nx \l__wa_options_DispWithArrows_seq
+ \seq_put_right:Nx \l_@@_options_WithArrows_seq { \tl_to_str:n { #1 } }
+ \seq_put_right:Nx \l_@@_options_DispWithArrows_seq
{ \tl_to_str:n { #1 } }
- \seq_put_right:Nx \l__wa_options_WithArrowsOptions_seq
+ \seq_put_right:Nx \l_@@_options_WithArrowsOptions_seq
{ \tl_to_str:N { #1 } }
\group_begin:
\msg_set:nnn { witharrows } { Unknown~option~WithArrowsOptions }
@@ -2022,13 +2029,13 @@
\group_end:
}
}
-\__wa_msg_new:nn { Key~already~defined }
+\@@_msg_new:nn { Key~already~defined }
{
The~key~'#1'~is~already~defined. \\
If~you~go~on,~your~instruction~\token_to_str:N\WithArrowsNewStyle\
will~be~ignored.
}
-\tl_const:Nn \c__wa_tikz_code_up_tl
+\tl_const:Nn \c_@@_tikz_code_up_tl
{
\draw [ rounded~corners ]
let \p1 = (#1) ,
@@ -2042,7 +2049,7 @@
}
(\x2,\y1) -- (\p2) ;
}
-\tl_const:Nn \c__wa_tikz_code_down_tl
+\tl_const:Nn \c_@@_tikz_code_down_tl
{
\draw [ rounded~corners ]
let \p1 = (#1) ,
@@ -2059,8 +2066,8 @@
}
\keys_define:nn { WithArrows / Arrow / FirstPass }
{
- up .code:n = \__wa_set_independent: ,
- down .code:n = \__wa_set_independent: ,
+ up .code:n = \@@_set_independent: ,
+ down .code:n = \@@_set_independent: ,
up .default:n = NoValue ,
down .default:n = NoValue
}
@@ -2067,60 +2074,60 @@
\keys_define:nn { WithArrows / Arrow / SecondPass }
{
up .code:n =
- \str_if_empty:NT \l__wa_previous_key_str
+ \str_if_empty:NT \l_@@_previous_key_str
{
- \str_set:Nn \l__wa_previous_key_str { up }
- \bool_if:NTF \c__wa_varwidth_loaded_bool
+ \str_set:Nn \l_@@_previous_key_str { up }
+ \bool_if:NTF \c_@@_varwidth_loaded_bool
{
\cs_if_exist:cTF { tikz at library@calc at loaded }
{
- \int_set:Nn \l__wa_pos_arrow_int \c_one_int
- \bool_set_false:N \l__wa_wrap_lines_bool
- \tl_set_eq:NN \l__wa_tikz_code_tl
- \c__wa_tikz_code_up_tl
+ \int_set:Nn \l_@@_pos_arrow_int \c_one_int
+ \bool_set_false:N \l_@@_wrap_lines_bool
+ \tl_set_eq:NN \l_@@_tikz_code_tl
+ \c_@@_tikz_code_up_tl
}
- { \__wa_error:n { calc~not~loaded } }
+ { \@@_error:n { calc~not~loaded } }
}
- { \__wa_error:n { varwidth~not~loaded } }
+ { \@@_error:n { varwidth~not~loaded } }
} ,
down .code:n =
- \str_if_empty:NT \l__wa_previous_key_str
+ \str_if_empty:NT \l_@@_previous_key_str
{
- \str_set:Nn \l__wa_previous_key_str { down }
- \bool_if:NTF \c__wa_varwidth_loaded_bool
+ \str_set:Nn \l_@@_previous_key_str { down }
+ \bool_if:NTF \c_@@_varwidth_loaded_bool
{
\cs_if_exist:cTF { tikz at library@calc at loaded }
{
- \int_set:Nn \l__wa_pos_arrow_int \c_one_int
- \bool_set_false:N \l__wa_wrap_lines_bool
- \tl_set_eq:NN \l__wa_tikz_code_tl
- \c__wa_tikz_code_down_tl
+ \int_set:Nn \l_@@_pos_arrow_int \c_one_int
+ \bool_set_false:N \l_@@_wrap_lines_bool
+ \tl_set_eq:NN \l_@@_tikz_code_tl
+ \c_@@_tikz_code_down_tl
}
- { \__wa_error:n { calc~not~loaded } }
+ { \@@_error:n { calc~not~loaded } }
}
- { \__wa_error:n { varwidth~not~loaded } }
+ { \@@_error:n { varwidth~not~loaded } }
}
}
-\seq_put_right:Nn \l__wa_options_Arrow_seq { down }
-\seq_put_right:Nn \l__wa_options_Arrow_seq { up }
-\__wa_msg_new:nn { varwidth~not~loaded }
+\seq_put_right:Nn \l_@@_options_Arrow_seq { down }
+\seq_put_right:Nn \l_@@_options_Arrow_seq { up }
+\@@_msg_new:nn { varwidth~not~loaded }
{
You~can't~use~the~option~'\l_keys_key_tl'~because~
you~don't~have~loaded~the~package~'varwidth'. \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { calc~not~loaded }
+\@@_msg_new:nn { calc~not~loaded }
{
You~can't~use~the~option~'\l_keys_key_tl'~because~you~don't~have~loaded~the~
Tikz~library~'calc'.You~should~add~'\token_to_str:N\usetikzlibrary{calc}'~
~in~the~preamble~of~your~document. \\
- \c__wa_option_ignored_str
+ \c_@@_option_ignored_str
}
-\__wa_msg_new:nn { Invalid~specification~for~MultiArrow }
+\@@_msg_new:nn { Invalid~specification~for~MultiArrow }
{
The~specification~of~rows~for~\token_to_str:N\MultiArrow\
(i.e.~#1)~is~invalid. \\
- \c__wa_command_ignored_str
+ \c_@@_command_ignored_str
}
\endinput
%%
More information about the tex-live-commits
mailing list