diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex/witharrows/witharrows.sty')
-rw-r--r-- | Master/texmf-dist/tex/latex/witharrows/witharrows.sty | 200 |
1 files changed, 123 insertions, 77 deletions
diff --git a/Master/texmf-dist/tex/latex/witharrows/witharrows.sty b/Master/texmf-dist/tex/latex/witharrows/witharrows.sty index d363263a6c0..e7809aa70b2 100644 --- a/Master/texmf-dist/tex/latex/witharrows/witharrows.sty +++ b/Master/texmf-dist/tex/latex/witharrows/witharrows.sty @@ -18,10 +18,11 @@ %% and version 1.3 or later is part of all distributions of %% LaTeX version 2005/12/01 or later. %% -\def\myfileversion{1.12} -\def\myfiledate{2018/11/26} +\def\myfileversion{1.13} +\def\myfiledate{2018/12/31} \RequirePackage{tikz} \usetikzlibrary{arrows.meta,bending} +\RequirePackage{expl3}[2018-01-01] \RequirePackage{l3keys2e} \ProvidesExplPackage {witharrows} @@ -89,6 +90,7 @@ {\msg_error:nn {witharrows} {#1}} \cs_new_protected:Nn \__wi_error:nn {\msg_error:nnn {witharrows} {#1} {#2}} +\cs_generate_variant:Nn \__wi_error:nn {nx} \cs_new_protected:Nn \__wi_bool_new:N {\bool_if_exist:NTF #1 {\bool_set_false:N #1} @@ -138,7 +140,7 @@ {\bool_if:NF \c__wi_amsmath_loaded_bool {\cs_set_protected:Npn \spread@equation {\openup\jot - \cs_set_protected:Npn \spread@equation {}}}} + \cs_set_eq:NN \spread@equation \prg_do_nothing:}}} \bool_new:N \l__wi_in_WithArrows_bool \bool_new:N \l__wi_in_DispWithArrows_bool \seq_new:N \g__wi_position_in_the_tree_seq @@ -149,6 +151,7 @@ \dim_new:N \l__wi_xoffset_dim \dim_set:Nn \l__wi_xoffset_dim {3mm} \int_new:N \l__wi_pos_arrows_int +\int_set:Nn \l__wi_pos_arrows_int 3 \int_new:N \l__wi_previous_pos_arrows_int \dim_new:N \l__wi_x_dim \seq_new:N \g__wi_arrow_int_seq @@ -167,6 +170,10 @@ \bool_new:N \l__wi_in_first_column_bool \bool_new:N \l__wi_initial_r_bool \bool_new:N \l__wi_initial_l_bool +\dim_new:N \l__wi_start_adjust_dim +\dim_set:Nn \l__wi_start_adjust_dim {0.4ex} +\dim_new:N \l__wi_end_adjust_dim +\dim_set:Nn \l__wi_end_adjust_dim {0.4ex} \int_set:Nn \l__wi_level_int 1 \keys_define:nn {WithArrows/GlobalOrEnv} { t .code:n = {\bool_if:NTF \l__wi_in_DispWithArrows_bool @@ -192,8 +199,7 @@ {Third~column~in~an~environment~{WithArrows}} {none} }, MoreColumns .value_forbidden:n = true, - AllowLineWithoutAmpersand .code:n = { \msg_error:nn - {witharrows} + AllowLineWithoutAmpersand .code:n = { \__wi_error:n {AllowLineWithoutAmpersand}}, AllowLineWithoutAmpersand .value_forbidden:n = true, CommandName .tl_set:N = \l__wi_CommandName_tl, @@ -210,13 +216,13 @@ shownodenames .initial:n = false, group .code:n = {\int_compare:nNnT \l__wi_previous_pos_arrows_int > {-1} {\__wi_error:n {Two~options~are~incompatible}} - \int_set:Nn \l__wi_previous_pos_arrows_int 6 - \int_set:Nn \l__wi_pos_arrows_int 6} , + \int_set:Nn \l__wi_previous_pos_arrows_int 7 + \int_set:Nn \l__wi_pos_arrows_int 7} , group .value_forbidden:n = true, groups .code:n = {\int_compare:nNnT \l__wi_previous_pos_arrows_int > {-1} {\__wi_error:n {Two~options~are~incompatible}} - \int_set:Nn \l__wi_previous_pos_arrows_int 7 - \int_set:Nn \l__wi_pos_arrows_int 7} , + \int_set:Nn \l__wi_previous_pos_arrows_int 6 + \int_set:Nn \l__wi_pos_arrows_int 6} , groups .value_forbidden:n = true, CodeBefore .code:n = {\int_compare:nNnTF \l__wi_level_int = 1 {\__wi_error:n {Option~will~be~ignored}} @@ -232,7 +238,7 @@ name .value_required:n = true, fleqn .code:n = {\bool_if:NTF \l__wi_in_WithArrows_bool {\__wi_error:n {Option~will~be~ignored}} - {\tl_if_eq:nnTF {#1} {true} + {\str_if_eq:nnTF {#1} {true} {\bool_set_true:N \l__wi_fleqn_bool} {\bool_set_false:N \l__wi_fleqn_bool}}}, fleqn .default:n = true, @@ -242,7 +248,7 @@ mathindent .value_required:n = true, notag .code:n = {\bool_if:NTF \l__wi_in_WithArrows_bool {\__wi_error:n {Option~will~be~ignored}} - {\tl_if_eq:nnTF {#1} {true} + {\str_if_eq:nnTF {#1} {true} {\clist_clear:N \l__wi_tags_clist} {\clist_set:Nn \l__wi_tags_clist {all}}}}, notag .default:n = true, @@ -255,7 +261,7 @@ AllowMultipleLabels .value_forbidden:n = true, wrap-lines .code:n = {\bool_if:NTF \l__wi_in_WithArrows_bool {\__wi_error:n {Option~will~be~ignored}} - {\tl_if_eq:nnTF {#1} {true} + {\str_if_eq:nnTF {#1} {true} {\bool_set_true:N \l__wi_wrap_lines_bool} {\bool_set_false:N \l__wi_wrap_lines_bool}}}, wrap-lines .default:n = true, @@ -273,13 +279,13 @@ tikz .initial:n = {}, tikz .value_required:n = true, rr .value_forbidden:n = true, - rr .code:n = \__wi_analyze_option_position:n 0 , + rr .code:n = \__wi_analyze_option_position:n 3 , ll .value_forbidden:n = true, ll .code:n = \__wi_analyze_option_position:n 1 , rl .value_forbidden:n = true, rl .code:n = \__wi_analyze_option_position:n 2 , lr .value_forbidden:n = true, - lr .code:n = \__wi_analyze_option_position:n 3 , + lr .code:n = \__wi_analyze_option_position:n 0 , i .value_forbidden:n = true, i .code:n = \__wi_analyze_option_position:n 5 , xoffset .code:n = {\bool_if:nTF {\int_compare_p:nNn \l__wi_level_int = 3 && @@ -295,6 +301,13 @@ {\skip_set:Nn \l__wi_interline_skip {#1}} {\__wi_error:n {Option~will~be~ignored}}} , interline .value_required:n = true, + start-adjust .dim_set:N = \l__wi_start_adjust_dim, + start-adjust .value_required:n = true, + end-adjust .dim_set:N = \l__wi_end_adjust_dim, + end-adjust .value_required:n = true, + adjust .code:n = {\dim_set:Nn \l__wi_start_adjust_dim {#1} + \dim_set:Nn \l__wi_end_adjust_dim {#1} }, + adjust .value_required:n = true, jump .code:n = {\int_compare:nNnF \l__wi_level_int = 3 {\__wi_error:n {Option~will~be~ignored}}} , unknown .code:n = \__wi_error:n {Option~unknown} @@ -305,13 +318,13 @@ {\__wi_error:n {The~option~"jump"~must~be~non~negative}}} , jump .value_required:n = true, rr .value_forbidden:n = true, - rr .code:n = \__wi_analyze_option_position:n 0 , + rr .code:n = \__wi_analyze_option_position:n 3 , ll .value_forbidden:n = true, ll .code:n = \__wi_analyze_option_position:n 1 , rl .value_forbidden:n = true, rl .code:n = \__wi_analyze_option_position:n 2 , lr .value_forbidden:n = true, - lr .code:n = \__wi_analyze_option_position:n 3 , + lr .code:n = \__wi_analyze_option_position:n 0 , i .value_forbidden:n = true, i .code:n = \__wi_analyze_option_position:n 5 } \cs_new_protected:Nn \__wi_analyze_option_position:n @@ -373,7 +386,7 @@ \int_set:Nn \l__wi_level_int 2 \keys_set_known:nnN {WithArrows/General} {#1} \l_tmpa_tl \keys_set:nV {WithArrows/GlobalOrEnv} \l_tmpa_tl - \bool_if:NT \g__wi_footnote_bool {\savenotes} + \bool_if:NT \g__wi_footnote_bool \savenotes \l__wi_code_before_tl \cs_set_eq:cN \l__wi_CommandName_tl \__wi_Arrow} \NewDocumentEnvironment {WithArrows} {O{}} @@ -420,18 +433,15 @@ $\bool_if:NT \l__wi_displaystyle_bool \displaystyle {##}$ \cr } - {\crcr + {\\ \egroup \egroup \__wi_post_environment: - \bool_if:NT \g__wi_footnote_bool {\endsavenotes} + \bool_if:NT \g__wi_footnote_bool \endsavenotes } \cs_new_protected:Nn \__wi_post_environment: {\cs_set:Npn \WithArrowsRightX {\g__wi_right_x_dim} - \int_compare:nNnT \g__wi_arrow_int > 0 - {\int_compare:nNnTF \l__wi_pos_arrows_int > 5 - \__wi_draw_arrows: - {\__wi_draw_arrows:nn 1 \g__wi_arrow_int}} + \int_compare:nNnT \g__wi_arrow_int > 0 \__wi_scan_arrows: \group_begin: \tikzset{every~picture/.style = __wi_standard} \cs_set:Npn \WithArrowsNbLines {\int_use:N \g__wi_line_int} @@ -452,7 +462,7 @@ } \cs_new_protected:Nn \__wi_cr: {\scan_stop: - \bool_if:NT \l__wi_in_first_column_bool {& {} } + \bool_if:NT \l__wi_in_first_column_bool { & {} } \group_align_safe_begin: \peek_meaning_remove:NTF * \__wi_cr_i: \__wi_cr_i:} \cs_new_protected:Nn \__wi_cr_i: @@ -494,7 +504,7 @@ & \__wi_restore:N \l__wi_tag_star_bool \__wi_restore:N \l__wi_qedhere_bool \bool_if:NT \l__wi_qedhere_bool - {\hbox_overlap_left:n {\__wi_qedhere_i:}} + {\hbox_overlap_left:n \__wi_qedhere_i:} \cs_set_eq:NN \theequation \g_tmpa_tl \bool_if:NT \l__wi_tag_star_bool {\cs_set:Npn \tagform@ {}} \hbox_overlap_left:n @@ -507,19 +517,17 @@ {\__wi_save:N \l__wi_qedhere_bool & \__wi_restore:N \l__wi_qedhere_bool \bool_if:NT \l__wi_qedhere_bool - {\hbox_overlap_left:n {\__wi_qedhere_i:}} + {\hbox_overlap_left:n \__wi_qedhere_i:} \tikz [__wi_standard] \coordinate (\int_use:N\g__wi_line_int-v) ; } } \cr\noalign{\skip_vertical:n {#1 + \l__wi_interline_skip} \scan_stop:}} \cs_new_protected:Nn \__wi_if_in_second_col_of_disp:nn {\bool_if:NTF \l__wi_in_WithArrows_bool - {\msg_error:nnn {witharrows} - {Command~not~allowed~in~{WithArrows}} + {\__wi_error:nn {Command~not~allowed~in~{WithArrows}} {#1}} {\bool_if:NTF \l__wi_in_first_column_bool - {\msg_error:nnn {witharrows} - {Command~not~allowed~in~{DispWithArrows}} + {\__wi_error:nn {Command~not~allowed~in~{DispWithArrows}} {#1}} {#2}}} \cs_new_protected:Nn \__wi_notag: @@ -528,7 +536,7 @@ \NewDocumentCommand \__wi_tag {sm} {\__wi_if_in_second_col_of_disp:nn {\tag} {\tl_if_empty:NF \l__wi_tag_tl - {\msg_error:nnn {witharrows} {Multiple~tags} {#2}} + {\__wi_error:nn {Multiple~tags} {#2}} \clist_set:Nn \l__wi_tags_clist {all} \bool_if:nT \c__wi_mathtools_loaded_bool {\MH_if_boolean:nT {show_only_refs} @@ -635,7 +643,7 @@ \egroup \bool_if:NT \l__wi_in_DispWithArrows_bool {\dim_gzero_new:N \g__wi_right_x_dim - \dim_gset:Nn \g__wi_right_x_dim \c_max_dim + \dim_gset_eq:NN \g__wi_right_x_dim \c_max_dim \begin{tikzpicture} [__wi_standard] \int_step_variable:nnnNn 1 1 \g__wi_line_int \l_tmpa_int {\tikz@parse@node\pgfutil@firstofone (\l_tmpa_int-v) @@ -648,18 +656,27 @@ {\MH_if_boolean:nT {show_only_refs} \MT_showonlyrefs_true:} $$ - \bool_if:NT \g__wi_footnote_bool {\endsavenotes} + \bool_if:NT \g__wi_footnote_bool \endsavenotes \ignorespacesafterend } \NewDocumentEnvironment {DispWithArrows*} {} {\WithArrowsOptions{notag} \DispWithArrows} {\endDispWithArrows} -\cs_new_protected:Nn \__wi_draw_arrows: - { \group_begin: +\cs_new_protected:Nn \__wi_scan_arrows: + { \group_begin: + \int_compare:nNnT \l__wi_pos_arrows_int = 7 + { \__wi_scan_arrows_i: + \int_set:Nn \l__wi_pos_arrows_int 8 } + \__wi_scan_arrows_i: + \group_end:} +\cs_new_protected:Nn \__wi_scan_arrows_i: + { \int_zero_new:N \l__wi_first_arrow_of_group_int \int_zero_new:N \l__wi_first_line_of_group_int \int_zero_new:N \l__wi_last_line_of_group_int + \seq_clear_new:N \l__wi_first_arrows_of_group_seq + \seq_clear_new:N \l__wi_last_arrows_of_group_seq \bool_set_true:N \l__wi_new_group_bool \int_set:Nn \l__wi_arrow_int 1 \int_until_do:nNnn \l__wi_arrow_int > \g__wi_arrow_int @@ -675,10 +692,12 @@ \int_set:Nn \l__wi_pos_of_arrow_int \l_tmpa_tl \int_compare:nNnTF \l__wi_final_int > \g__wi_line_int {\__wi_error:n {Too~few~lines~for~an~arrow}} - {\bool_if:nT { \int_compare_p:nNn \l__wi_pos_arrows_int = 7 - && \int_compare_p:nNn \l__wi_arrow_int > 1 - && \int_compare_p:nNn - \l__wi_initial_int > \l__wi_last_line_of_group_int} + {\bool_if:nT {\int_compare_p:nNn \l__wi_arrow_int > 1 + && + \int_compare_p:nNn + \l__wi_initial_int > \l__wi_last_line_of_group_int + && + \int_compare_p:n {\l__wi_pos_arrows_int != 7}} {\__wi_draw_arrows:nn \l__wi_first_arrow_of_group_int {\l__wi_arrow_int - 1} \bool_set_true:N \l__wi_new_group_bool} \bool_if:nTF \l__wi_new_group_bool @@ -686,17 +705,34 @@ \int_set:Nn \l__wi_first_arrow_of_group_int \l__wi_arrow_int \int_set:Nn \l__wi_first_line_of_group_int \l__wi_initial_int \int_set:Nn \l__wi_last_line_of_group_int \l__wi_final_int - \dim_set:Nn \l__wi_x_dim {-\c_max_dim} + \seq_clear:N \l__wi_first_arrows_of_group_seq + \seq_put_left:Nx \l__wi_first_arrows_of_group_seq + {\int_use:N \l__wi_arrow_int} + \seq_clear:N \l__wi_last_arrows_of_group_seq + \seq_put_left:Nx \l__wi_last_arrows_of_group_seq + {\int_use:N \l__wi_arrow_int} + \int_compare:nT {\l__wi_pos_arrows_int != 8} + {\dim_set:Nn \l__wi_x_dim {-\c_max_dim}} } {\int_compare:nNnT \l__wi_pos_of_arrow_int = {-1} - {\int_set:Nn \l__wi_last_line_of_group_int - {\int_max:nn \l__wi_last_line_of_group_int \l__wi_final_int}}} + {\int_compare:nNnT \l__wi_initial_int = \l__wi_first_line_of_group_int + {\seq_put_left:Nx \l__wi_first_arrows_of_group_seq + {\int_use:N \l__wi_arrow_int}} + \int_compare:nNnTF \l__wi_final_int > \l__wi_last_line_of_group_int + {\int_set_eq:NN \l__wi_last_line_of_group_int \l__wi_final_int + \seq_clear:N \l__wi_last_arrows_of_group_seq + \seq_put_left:Nx \l__wi_last_arrows_of_group_seq + {\int_use:N \l__wi_arrow_int}} + {\int_compare:nNnT \l__wi_final_int = \l__wi_last_line_of_group_int + {\seq_put_left:Nx \l__wi_last_arrows_of_group_seq + {\int_use:N \l__wi_arrow_int}}}}} \int_compare:nNnT \l__wi_pos_of_arrow_int = {-1} - {\__wi_update_x_value:nn \l__wi_initial_int \l__wi_final_int} } + { \int_compare:nT {\l__wi_pos_arrows_int != 8} + {\__wi_update_x_value:nn \l__wi_initial_int \l__wi_final_int}} } \int_incr:N \l__wi_arrow_int } - \__wi_draw_arrows:nn \l__wi_first_arrow_of_group_int \g__wi_arrow_int - \group_end: + \int_compare:nT {\l__wi_pos_arrows_int != 7} + {\__wi_draw_arrows:nn \l__wi_first_arrow_of_group_int \g__wi_arrow_int} } \cs_generate_variant:Nn \keys_set:nn {no} \cs_new_protected:Nn \__wi_keys_set: {\keys_set:no {WithArrows/General}} @@ -715,15 +751,13 @@ \prop_get:cnN {g__wi_arrow_\l__wi_prefix_str _\int_use:N\l__wi_arrow_int _prop} {final} \l_tmpa_tl \int_set:Nn \l__wi_final_int {\l_tmpa_tl} - \int_compare:nNnTF \l__wi_final_int > \g__wi_line_int - {\int_compare:nNnT \l__wi_pos_arrows_int < 6 - {\__wi_error:n {Too~few~lines~for~an~arrow}}} + \int_compare:nNnT \l__wi_final_int < {\g__wi_line_int + 1} \__wi_draw_arrows_i: \int_incr:N \l__wi_arrow_int } \group_end: } -\cs_new:Nn \__wi_draw_arrows_i: +\cs_new_protected:Nn \__wi_draw_arrows_i: {\group_begin: \int_set:Nn \l__wi_level_int 3 \prop_get:cnN {g__wi_arrow_\l__wi_prefix_str @@ -738,10 +772,10 @@ \bool_set_false:N \l__wi_initial_r_bool \bool_set_false:N \l__wi_final_r_bool \int_case:nn \l__wi_pos_arrows_int - {0 {\bool_set_true:N \l__wi_initial_r_bool - \bool_set_true:N \l__wi_final_r_bool} + {0 {\bool_set_true:N \l__wi_final_r_bool} 2 {\bool_set_true:N \l__wi_initial_r_bool} - 3 {\bool_set_true:N \l__wi_final_r_bool}} + 3 {\bool_set_true:N \l__wi_initial_r_bool + \bool_set_true:N \l__wi_final_r_bool}} \int_compare:nNnT \l__wi_pos_arrows_int = 5 { \dim_set:Nn \l__wi_x_dim {-\c_max_dim} \__wi_update_x_value:nn \l__wi_initial_int \l__wi_final_int } @@ -752,21 +786,34 @@ \prop_get:cnN {g__wi_arrow_\l__wi_prefix_str _\int_use:N\l__wi_arrow_int _prop} {label} \l_tmpa_tl - \int_compare:nNnTF \l__wi_pos_arrows_int < 5 - {\begin{tikzpicture} [__wi_standard] - \tikz@scan@one@point\pgfutil@firstofone(\l__wi_initial_tl) - \tl_gset:Nx \g_tmpa_tl {\dim_use:N\pgf@x,\dim_use:N\pgf@y} - \tikz@scan@one@point\pgfutil@firstofone(\l__wi_final_tl) - \tl_gset:Nx \g_tmpb_tl {\dim_use:N\pgf@x,\dim_use:N\pgf@y} - \end{tikzpicture} -} - {\begin{tikzpicture} [__wi_standard] - \tikz@scan@one@point\pgfutil@firstofone (\l__wi_initial_tl) - \tl_gset:Nx \g_tmpa_tl {\dim_use:N \l__wi_x_dim , \dim_use:N \pgf@y} - \tikz@scan@one@point\pgfutil@firstofone (\l__wi_final_tl) - \tl_gset:Nx \g_tmpb_tl {\dim_use:N \l__wi_x_dim , \dim_use:N \pgf@y} - \end{tikzpicture}} - \__wi_draw_arrow:nno {\g_tmpa_tl} {\g_tmpb_tl} {\l_tmpa_tl} + \seq_if_in:NxTF \l__wi_first_arrows_of_group_seq {\int_use:N \l__wi_arrow_int} + {\bool_set_true:N \l_tmpa_bool} + {\bool_set_false:N \l_tmpa_bool} + \seq_if_in:NxTF \l__wi_last_arrows_of_group_seq {\int_use:N \l__wi_arrow_int} + {\bool_set_true:N \l_tmpb_bool} + {\bool_set_false:N \l_tmpb_bool} + \int_compare:nNnT \l__wi_pos_arrows_int = 5 + {\bool_set_true:N \l_tmpa_bool + \bool_set_true:N \l_tmpb_bool} + \begin{tikzpicture} [__wi_standard] + \tikz@scan@one@point\pgfutil@firstofone (\l__wi_initial_tl) + \tl_gset:Nx \g_tmpa_tl + {\int_compare:nNnTF \l__wi_pos_arrows_int < 5 + { \dim_use:N \pgf@x } + { \dim_use:N \l__wi_x_dim } , + \bool_if:NTF \l_tmpa_bool + { \dim_eval:n {\pgf@y + \l__wi_start_adjust_dim }} + { \dim_use:N \pgf@y } } + \tikz@scan@one@point\pgfutil@firstofone (\l__wi_final_tl) + \tl_gset:Nx \g_tmpb_tl + {\int_compare:nNnTF \l__wi_pos_arrows_int < 5 + { \dim_use:N \pgf@x } + { \dim_use:N \l__wi_x_dim } , + \bool_if:NTF \l_tmpb_bool + { \dim_eval:n {\pgf@y - \l__wi_end_adjust_dim }} + { \dim_use:N \pgf@y }} + \end{tikzpicture} + \__wi_draw_arrow:nno \g_tmpa_tl \g_tmpb_tl \l_tmpa_tl \group_end: } \cs_new_protected:Nn \__wi_def_function_tmpa:n {\cs_set:Nn \__wi_tmpa:nnn @@ -798,7 +845,7 @@ {\int_step_inline:nnnn {#1} 1 {#2} {\begin{tikzpicture} [__wi_standard] \tikz@scan@one@point\pgfutil@firstofone (##1-l) - \dim_gset:Nn \g_tmpa_dim {\dim_max:nn \l__wi_x_dim \pgf@x} + \dim_gset:Nn \g_tmpa_dim {\dim_max:nn \l__wi_x_dim \pgf@x } \end{tikzpicture} \dim_set_eq:NN \l__wi_x_dim \g_tmpa_dim } } \cs_new:Npn \WithArrowsLastEnv {\int_use:N \g__wi_last_env_int} @@ -834,9 +881,9 @@ 2 {\bool_set_true:N \l__wi_initial_r_bool} 3 {\bool_set_true:N \l__wi_final_r_bool}} \cs_if_free:cTF {pgf@sh@ns@wa-\l__wi_prefix_str-#2-l} - {\msg_error:nnx {witharrows} {Wrong~line~specification~in~Arrow} {#2}} + {\__wi_error:nx {Wrong~line~specification~in~Arrow} {#2}} {\cs_if_free:cTF {pgf@sh@ns@wa-\l__wi_prefix_str-#3-l} - {\msg_error:nnx {witharrows} {Wrong~line~specification~in~Arrow} {#3}} + {\__wi_error:nx {Wrong~line~specification~in~Arrow} {#3}} {\int_compare:nNnTF \l__wi_pos_arrows_int = 4 {\begin{tikzpicture} [__wi_standard] \tikz@scan@one@point\pgfutil@firstofone(#2-l.south) @@ -863,10 +910,8 @@ \cs_new_protected:Nn \__wi_MultiArrow:nn { \foreach \x in {#1} {\cs_if_free:cTF {pgf@sh@ns@wa-\l__wi_prefix_str-\x-l} - {\msg_error:nnx {witharrows} - {Wrong~line~specification~in~MultiArrow} - {\x}} - {\clist_gput_right:Nx \g_tmpa_clist {\x}}} + {\__wi_error:nx {Wrong~line~specification~in~MultiArrow} \x } + {\clist_gput_right:Nx \g_tmpa_clist \x}} \int_compare:nNnTF {\clist_count:N \g_tmpa_clist} < 2 {\__wi_error:n {Too~small~specification~for~MultiArrow}} {\clist_sort:Nn \g_tmpa_clist @@ -951,8 +996,8 @@ 3 {lr} 4 {v} 5 {i} - 6 {group} - 7 {groups}}"~ + 6 {groups} + 7 {group}}"~ set~in~the~same~ \int_case:nn\l__wi_level_int {1 {command~\token_to_str:N\WithArrowsOptions} @@ -967,7 +1012,7 @@ \msg_new:nnn {witharrows} {Arrow~in~first~column} {You~should~not~use~the~command~\token_to_str:N\Arrow\ - \tl_if_eq:NNF \l__wi_CommandName_tl \l_tmpa_tl + \str_if_eq:NNF \l__wi_CommandName_tl \l_tmpa_tl {(renamed~in~\str_use:N \c_backslash_str \tl_use:N \l__wi_CommandName_tl)~} ~in~the~first~column~but~only~in~the~second~column.\\ @@ -1120,6 +1165,7 @@ \bool_if:nT \c__wi_mathtools_loaded_bool {\MH_if_boolean:nT {show_only_refs} \MT_showonlyrefs_true:} + \bool_if:NT \g__wi_footnote_bool \endsavenotes \ignorespacesafterend } \NewDocumentCommand \WithArrowsNewStyle {mm} |