From 1f2d92185bee28d54f0df078d1ff30e702d96ea6 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 31 Jan 2021 21:34:46 +0000 Subject: witharrows (31jan21) git-svn-id: svn://tug.org/texlive/trunk@57576 c570f23f-e606-0410-a88d-b1316a301751 --- .../tex/generic/witharrows/witharrows.sty | 38 ++++------------------ 1 file changed, 7 insertions(+), 31 deletions(-) (limited to 'Master/texmf-dist/tex/generic') diff --git a/Master/texmf-dist/tex/generic/witharrows/witharrows.sty b/Master/texmf-dist/tex/generic/witharrows/witharrows.sty index 435b298dce7..3a9b68ff7fb 100644 --- a/Master/texmf-dist/tex/generic/witharrows/witharrows.sty +++ b/Master/texmf-dist/tex/generic/witharrows/witharrows.sty @@ -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.6a} -\def\myfiledate{2021/01/12} +\def\myfileversion{2.6b} +\def\myfiledate{2021/01/31} \RequirePackage{tikz} \usetikzlibrary{arrows.meta,bending} \RequirePackage{l3keys2e} @@ -36,7 +36,6 @@ } \cs_if_exist:NF \l_keys_key_str { \msg_error:nn { witharrows } { expl3~too~old } } -\RequirePackage { xparse } [ 2019-01-01 ] \RequirePackage { varwidth } \bool_new:N \c__witharrows_footnotehyper_bool \bool_new:N \c__witharrows_footnote_bool @@ -63,11 +62,6 @@ \token_to_str:N\WithArrowsOptions. } \ProcessKeysOptions { WithArrows / package } -\__witharrows_msg_new:nn { Option~incompatible~with~Beamer } - { - The~option~'\l_keys_key_str'\ is~incompatible~ - with~Beamer~because~Beamer~has~its~own~system~to~extract~footnotes. - } \__witharrows_msg_new:nn { footnote~with~footnotehyper~package } { You~can't~use~the~option~'footnote'~because~the~package~ @@ -89,7 +83,7 @@ \bool_if:NT \c__witharrows_footnote_bool { \@ifclassloaded { beamer } - { \msg_info:nn { witharrows } { Option~incompatible~with~Beamer } } + { \bool_set_false:N \c__witharrows_footnote_bool } { \@ifpackageloaded { footnotehyper } { \__witharrows_error:n { footnote~with~footnotehyper~package } } @@ -99,13 +93,13 @@ \bool_if:NT \c__witharrows_footnotehyper_bool { \@ifclassloaded { beamer } - { \__witharrows_info:n { Option~incompatible~with~Beamer } } + { \bool_set_false:N \c__witharrows_footnote_bool } { \@ifpackageloaded { footnote } { \__witharrows_error:n { footnotehyper~with~footnote~package } } { \usepackage { footnotehyper } } + \bool_set_true:N \c__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 } @@ -126,22 +120,13 @@ { } } } -\sys_if_engine_luatex:TF - { - \cs_new_protected:Npn \__witharrows_strcmp:nn #1 #2 - { \lua_now:e { l3kernel.strcmp('#1','#2') } } - } - { - \cs_new_protected:Npn \__witharrows_strcmp:nn #1 #2 - { \tex_strcmp:D { #1 } { #2 } } - } \cs_new_protected:Npn \__witharrows_sort_seq:N #1 { \seq_sort:Nn #1 { \int_compare:nNnTF { - \__witharrows_strcmp:nn + \tex_strcmp:D { \str_lower_case:n { ##1 } } { \str_lower_case:n { ##2 } } } @@ -150,19 +135,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_x:NNn #1 #1 { \tl_to_str:n { ##1 } } } \cs_new_protected:Npn \__witharrows_save:N #1 { -- cgit v1.2.3