summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-07-29 21:34:43 +0000
committerKarl Berry <karl@freefriends.org>2020-07-29 21:34:43 +0000
commit47dcd2e2b5322254f57061c60596e7dda1c9054e (patch)
treea55d3b2897a0873b698443050b4ead1ff328c52c /Master/texmf-dist/tex/generic
parent36496123436944e870fec51acc0e50c79d2c81bc (diff)
witharrows (29jul20)
git-svn-id: svn://tug.org/texlive/trunk@55987 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/witharrows/witharrows.sty60
1 files changed, 25 insertions, 35 deletions
diff --git a/Master/texmf-dist/tex/generic/witharrows/witharrows.sty b/Master/texmf-dist/tex/generic/witharrows/witharrows.sty
index 1a7286bca41..0edf18a42e3 100644
--- a/Master/texmf-dist/tex/generic/witharrows/witharrows.sty
+++ b/Master/texmf-dist/tex/generic/witharrows/witharrows.sty
@@ -6,7 +6,7 @@
%%
%% witharrows.dtx (with options: `LaTeX')
%%
-%% Copyright (C) 2017-2019 by F. Pantigny
+%% Copyright (C) 2017-2020 by F. Pantigny
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -18,8 +18,8 @@
%% and version 1.3 or later is part of all distributions of
%% LaTeX version 2005/12/01 or later.
%%
-\def\myfileversion{2.5}
-\def\myfiledate{2020/06/22}
+\def\myfileversion{2.5.1}
+\def\myfiledate{2020/07/28}
\RequirePackage{tikz}
\usetikzlibrary{arrows.meta,bending}
\RequirePackage{l3keys2e}
@@ -38,8 +38,8 @@
{ \msg_error:nn { witharrows } { expl3~too~old } }
\RequirePackage { xparse } [ 2019-01-01 ]
\RequirePackage { varwidth }
-\bool_new:N \g__witharrows_footnotehyper_bool
-\bool_new:N \g__witharrows_footnote_bool
+\bool_new:N \c__witharrows_footnotehyper_bool
+\bool_new:N \c__witharrows_footnote_bool
\cs_new_protected:Npn \__witharrows_msg_new:nn { \msg_new:nnn { witharrows } }
\cs_new_protected:Npn \__witharrows_msg_new:nnn { \msg_new:nnnn { witharrows } }
\cs_new_protected:Npn \__witharrows_msg_redirect_name:nn
@@ -51,8 +51,8 @@
\cs_generate_variant:Nn \__witharrows_error:nn { n x }
\keys_define:nn { WithArrows / package }
{
- footnote .bool_gset:N = \g__witharrows_footnote_bool ,
- footnotehyper .bool_gset:N = \g__witharrows_footnotehyper_bool ,
+ footnote .bool_set:N = \c__witharrows_footnote_bool ,
+ footnotehyper .bool_set:N = \c__witharrows_footnotehyper_bool ,
unknown .code:n =
\__witharrows_fatal:n { Option~unknown~for~package }
}
@@ -86,7 +86,7 @@
of~the~package~footnote.\\
If~you~go~on,~the~package~footnotehyper~won't~be~loaded.
}
-\bool_if:NT \g__witharrows_footnote_bool
+\bool_if:NT \c__witharrows_footnote_bool
{
\@ifclassloaded { beamer }
{ \msg_info:nn { witharrows } { Option~incompatible~with~Beamer } }
@@ -96,7 +96,7 @@
{ \usepackage { footnote } }
}
}
-\bool_if:NT \g__witharrows_footnotehyper_bool
+\bool_if:NT \c__witharrows_footnotehyper_bool
{
\@ifclassloaded { beamer }
{ \__witharrows_info:n { Option~incompatible~with~Beamer } }
@@ -105,13 +105,12 @@
{ \__witharrows_error:n { footnotehyper~with~footnote~package } }
{ \usepackage { footnotehyper } }
}
- \bool_gset_true:N \g__witharrows_footnote_bool
+ \bool_set_true:N \c__witharrows_footnote_bool
}
\bool_new:N \c__witharrows_leqno_bool
\DeclareOption { leqno } { \bool_set_true:N \c__witharrows_leqno_bool }
\DeclareOption* { }
\ProcessOptions*
-\cs_generate_variant:Nn \tl_put_right:Nn { N v }
\cs_generate_variant:Nn \seq_set_split:Nnn { N x x }
\AtBeginDocument
{
@@ -151,19 +150,10 @@
\sort_return_same:
}
}
-\cs_new_protected:Npn \__witharrows_convert_to_str_seq:N #1
- {
- \seq_clear:N \l_tmpa_seq
- \seq_map_inline:Nn #1
- {
- \seq_put_left:Nx \l_tmpa_seq { \tl_to_str:n { ##1 } }
- }
- \seq_set_eq:NN #1 \l_tmpa_seq
- }
\cs_new_protected:Npn \__witharrows_set_seq_of_str_from_clist:Nn #1 #2
{
\seq_set_from_clist:Nn #1 { #2 }
- \__witharrows_convert_to_str_seq:N #1
+ \seq_set_map:NNn #1 #1 { \tl_to_str:n { ##1 } }
}
\cs_new_protected:Npn \__witharrows_save:N #1
{
@@ -522,7 +512,6 @@
t, tikz, tikz-code,
xoffset, ygap, ystart
}
-\__witharrows_convert_to_str_seq:N \l__witharrows_options_WithArrows_seq
\keys_define:nn { WithArrows / WithArrows }
{
unknown .code:n =
@@ -754,7 +743,7 @@
\int_gset_eq:NN \g__witharrows_col_int \l__witharrows_nb_cols_int
\seq_clear_new:N \l__witharrows_format_seq
\seq_set_split:NnV \l__witharrows_format_seq { } \l__witharrows_format_str
- \bool_if:NT \g__witharrows_footnote_bool { \begin { savenotes } }
+ \bool_if:NT \c__witharrows_footnote_bool { \begin { savenotes } }
\l__witharrows_code_before_tl
\cs_set_eq:NN \notag \__witharrows_notag:
\cs_set_eq:NN \nonumber \__witharrows_nonumber:
@@ -831,11 +820,6 @@
node~contents = { } ,
__witharrows_node_style ,
name = wa - \l__witharrows_prefix_str - \int_use:N \g__witharrows_line_int - l ,
- alias =
- {
- \str_if_empty:NF \l__witharrows_name_str
- { \l__witharrows_name_str - \int_use:N \g__witharrows_line_int - l }
- }
]
;
\hfil
@@ -845,13 +829,19 @@
node~contents = { } ,
__witharrows_node_style ,
name = wa - \l__witharrows_prefix_str - \int_use:N \g__witharrows_line_int - r ,
- alias =
- {
- \str_if_empty:NF \l__witharrows_name_str
- { \l__witharrows_name_str - \int_use:N \g__witharrows_line_int - r }
- }
]
;
+ \str_if_empty:NF \l__witharrows_name_str
+ {
+ \pgfpicture
+ \pgfnodealias
+ { \l__witharrows_name_str - \int_use:N \g__witharrows_line_int - l }
+ { wa - \l__witharrows_prefix_str - \int_use:N \g__witharrows_line_int - l }
+ \pgfnodealias
+ { \l__witharrows_name_str - \int_use:N \g__witharrows_line_int - r }
+ { wa - \l__witharrows_prefix_str - \int_use:N \g__witharrows_line_int - r }
+ \endpgfpicture
+ }
\bool_if:NT \l__witharrows_show_node_names_bool
{
\hbox_overlap_right:n
@@ -883,7 +873,7 @@
\egroup
\egroup
\__witharrows_post_halign:
- \bool_if:NT \g__witharrows_footnote_bool { \end { savenotes } }
+ \bool_if:NT \c__witharrows_footnote_bool { \end { savenotes } }
}
\cs_new_protected:Npn \__witharrows_post_halign:
{
@@ -1215,7 +1205,7 @@
}
{ \c_math_toggle_token \c_math_toggle_token }
\bool_if:NT \l__witharrows_subequations_bool { \end { subequations } }
- \bool_if:NT \g__witharrows_footnote_bool { \end { savenotes } }
+ \bool_if:NT \c__witharrows_footnote_bool { \end { savenotes } }
\ignorespacesafterend
}
\NewDocumentEnvironment { DispWithArrows* } { }