summaryrefslogtreecommitdiff
path: root/macros/generic
diff options
context:
space:
mode:
authorNorbert Preining <norbert@preining.info>2021-03-05 03:00:50 +0000
committerNorbert Preining <norbert@preining.info>2021-03-05 03:00:50 +0000
commitceb2b4332d87ef96a7c9e20b61a2ac9c9e524690 (patch)
tree0e7c043d4f54d89e524c093d81b68a1f765c6bd5 /macros/generic
parent467737fbb47c40688b7e8548099b6236b4196d6d (diff)
CTAN sync 202103050300
Diffstat (limited to 'macros/generic')
-rw-r--r--macros/generic/witharrows/witharrows-french.pdfbin270367 -> 271551 bytes
-rw-r--r--macros/generic/witharrows/witharrows-french.tex8
-rw-r--r--macros/generic/witharrows/witharrows.dtx82
-rw-r--r--macros/generic/witharrows/witharrows.pdfbin640821 -> 647631 bytes
4 files changed, 68 insertions, 22 deletions
diff --git a/macros/generic/witharrows/witharrows-french.pdf b/macros/generic/witharrows/witharrows-french.pdf
index 8ea76ae1de..2d9b238271 100644
--- a/macros/generic/witharrows/witharrows-french.pdf
+++ b/macros/generic/witharrows/witharrows-french.pdf
Binary files differ
diff --git a/macros/generic/witharrows/witharrows-french.tex b/macros/generic/witharrows/witharrows-french.tex
index 86b7f660f9..8c19fc72f8 100644
--- a/macros/generic/witharrows/witharrows-french.tex
+++ b/macros/generic/witharrows/witharrows-french.tex
@@ -1228,11 +1228,11 @@ $\begin{WithArrows}[code-after = \Arrow[v]{1-2}{2-2}{division par $2$} ]
\end{WithArrows}$
-\interitem
+\interitem
L'extension \pkg{witharrows} fournit une autre commande disponible dans le |code-after| : la commande
-|\MultiArrow|. Cette commande dessine un «rateau». La liste des rangées concernées par ce rateau
-est donnée dans le premier argument de la commande |\MultiArrow|. La syntaxe utilisée pour décrire cette liste
-est celle de la commande |\foreach| de \pkg{pgffor}.
+|\MultiArrow|. Cette commande dessine un «rateau». La liste des rangées concernées par ce rateau est donnée dans le
+premier argument de la commande |\MultiArrow|. La syntaxe utilisée pour décrire cette liste est celle de la
+commande |\foreach| de \pkg{pgffor}.
\begin{Verbatim}
$\begin{WithArrows}[tikz = rounded corners,
diff --git a/macros/generic/witharrows/witharrows.dtx b/macros/generic/witharrows/witharrows.dtx
index f14d21114a..2e6c4270ea 100644
--- a/macros/generic/witharrows/witharrows.dtx
+++ b/macros/generic/witharrows/witharrows.dtx
@@ -15,8 +15,8 @@
%
% \fi
% \iffalse
-\def\myfileversion{2.6b}
-\def\myfiledate{2021/01/31}
+\def\myfileversion{2.6c}
+\def\myfiledate{2021/03/04}
%
%
%<*batchfile>
@@ -2669,10 +2669,7 @@ version 2005/12/01 or later.
%
%
% \medskip
-% The version of 2020/02/08 of \pkg{expl3} has replaced |\l_keys_key_tl| by
-% |\l_keys_key_str|. We have immediatly changed in this file. Now, you test the
-% existence of |\l_keys_key_str| in order to detect if the version of LaTeX used
-% by the final user is up to date.
+% We use |\seq_set_map_x:NNn| which has been introduced the 2020/07/16.
% \begin{macrocode}
\msg_new:nnn { witharrows } { expl3~too~old }
{
@@ -2680,12 +2677,14 @@ version 2005/12/01 or later.
You~can~go~on~but~you~will~probably~have~other~errors~
if~you~use~the~functionalities~of~witharrows.
}
-\cs_if_exist:NF \l_keys_key_str
+\cs_if_exist:NF \seq_set_map_x:NNn
{ \msg_error:nn { witharrows } { expl3~too~old } }
% \end{macrocode}
%
% \bigskip
+% The package \pkg{xparse} is still loaded for use on Overleaf.
% \begin{macrocode}
+\RequirePackage { xparse }
\RequirePackage { varwidth }
%</LaTeX>
% \end{macrocode}
@@ -6824,6 +6823,33 @@ version 2005/12/01 or later.
% \bigskip
% \subsection{The error messages of the package}
%
+%
+% \begin{macrocode}
+\str_new:N \l_witharrows_body_str
+% \end{macrocode}
+%
+% The following commands must \emph{not} be protected since they will be used in
+% error messages.
+% \begin{macrocode}
+\cs_new:Npn \@@_potential_body_i:
+ {
+ \str_if_empty:NF \l_witharrows_body_str
+ { \\ If~you~want~to~see~the~body~of~the~environment,~type~H~<return>. }
+ }
+% \end{macrocode}
+%
+% \begin{macrocode}
+\cs_new:Npn \@@_potential_body_ii:
+ {
+ \str_if_empty:NTF \l_nicematrix_body_str
+ { No~further~help~available }
+ {
+ The~body~of~your~environment~was:\\
+ \l_witharrows_body_str
+ }
+ }
+% \end{macrocode}
+%
% \begin{macrocode}
\str_const:Nn \c_@@_option_ignored_str
{ If~you~go~on,~this~option~will~be~ignored. }
@@ -6880,40 +6906,48 @@ version 2005/12/01 or later.
%
% \begin{macrocode}
%<*LaTeX>
-\@@_msg_new:nn { newline~at~the~end~of~env }
+\@@_msg_new:nnn { newline~at~the~end~of~env }
{
The~environments~of~witharrows~(\{WithArrows\}~and~
\{DispWithArrows\})~should~not~end~by~\token_to_str:N \\.\\
However,~you~can~go~on~for~this~time.~No~similar~error~will~be~
- raised~in~this~document.
+ raised~in~this~document.
+ \@@_potential_body_i:
}
+ { \@@_potential_body_ii: }
%</LaTeX>
% \end{macrocode}
%
% \begin{macrocode}
-\@@_msg_new:nn { Invalid~option~format }
+\@@_msg_new:nnn { Invalid~option~format }
{
The~key~'format'~should~contain~only~letters~r,~c~and~l~and~
must~not~be~empty.\\
\c_@@_option_ignored_str
+ \@@_potential_body_i:
}
+ { \@@_potential_body_ii: }
% \end{macrocode}
%
% \begin{macrocode}
-\@@_msg_new:nn { invalid~key~o }
+\@@_msg_new:nnn { invalid~key~o }
{
The~key~'o'~for~individual~arrows~can~be~used~only~in~mode~
'group'~or~in~mode~'groups'.\\
\c_@@_option_ignored_str
+ \@@_potential_body_i:
}
+ { \@@_potential_body_ii: }
% \end{macrocode}
%
% \begin{macrocode}
-\@@_msg_new:nn { Value~for~a~key }
+\@@_msg_new:nnn { Value~for~a~key }
{
The~key~'\l_keys_key_str'~should~be~used~without~value. \\
However,~you~can~go~on~for~this~time.
+ \@@_potential_body_i:
}
+ { \@@_potential_body_ii: }
% \end{macrocode}
%
% \begin{macrocode}
@@ -6988,7 +7022,7 @@ version 2005/12/01 or later.
%
%
% \begin{macrocode}
-\@@_msg_new:nn { Too~much~columns~in~WithArrows }
+\@@_msg_new:nnn { Too~much~columns~in~WithArrows }
{
Your~environment~\{\l_@@_type_env_str\}~has~\int_use:N
\l_@@_nb_cols_int\ columns~and~you~try~to~use~one~more.~
@@ -6996,18 +7030,22 @@ version 2005/12/01 or later.
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.
+ \@@_potential_body_i:
}
+ { \@@_potential_body_ii: }
% \end{macrocode}
%
% \begin{macrocode}
-\@@_msg_new:nn { Too~much~columns~in~DispWithArrows }
+\@@_msg_new:nnn { Too~much~columns~in~DispWithArrows }
{
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_@@_line_int. \\
This~error~is~fatal.
+ \@@_potential_body_i:
}
+ { \@@_potential_body_ii: }
% \end{macrocode}
%
% \begin{macrocode}
@@ -7035,7 +7073,7 @@ version 2005/12/01 or later.
%
%
% \begin{macrocode}
-\@@_msg_new:nn
+\@@_msg_new:nnn
{ Too~few~lines~for~an~arrow }
{
Line~\l_@@_input_line_str\
@@ -7043,7 +7081,9 @@ version 2005/12/01 or later.
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.
+ \@@_potential_body_i:
}
+ { \@@_potential_body_ii: }
% \end{macrocode}
%
% \begin{macrocode}
@@ -7056,21 +7096,25 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \begin{macrocode}
-\@@_msg_new:nn { WithArrows~outside~math~mode }
+\@@_msg_new:nnn { WithArrows~outside~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.
+ \@@_potential_body_i:
}
+ { \@@_potential_body_ii: }
% \end{macrocode}
%
% \begin{macrocode}
-\@@_msg_new:nn { DispWithArrows~in~math~mode }
+\@@_msg_new:nnn { DispWithArrows~in~math~mode }
{
The~environment~\{\l_@@_type_env_str\}~should~be~used~only~outside~math~
mode~like~the~environments~\{align\}~and~\{align*\}~of~amsmath. \\
This~error~is~fatal.
+ \@@_potential_body_i:
}
+ { \@@_potential_body_ii: }
% \end{macrocode}
%
% \begin{macrocode}
@@ -7100,13 +7144,15 @@ version 2005/12/01 or later.
% \end{macrocode}
%
% \begin{macrocode}
-\@@_msg_new:nn { Arrow~not~in~last~column }
+\@@_msg_new:nnn { Arrow~not~in~last~column }
{
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.
+ \@@_potential_body_i:
}
+ { \@@_potential_body_ii: }
% \end{macrocode}
%
% \begin{macrocode}
diff --git a/macros/generic/witharrows/witharrows.pdf b/macros/generic/witharrows/witharrows.pdf
index 7727d27d1c..03a0cb1161 100644
--- a/macros/generic/witharrows/witharrows.pdf
+++ b/macros/generic/witharrows/witharrows.pdf
Binary files differ