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 --- .../doc/generic/witharrows/witharrows-french.pdf | Bin 267392 -> 270367 bytes .../doc/generic/witharrows/witharrows.pdf | Bin 640153 -> 640821 bytes .../doc/generic/witharrows/witharrows.tex | 26 ++------ .../source/generic/witharrows/witharrows.dtx | 73 ++++++--------------- .../tex/generic/witharrows/witharrows.sty | 38 ++--------- 5 files changed, 31 insertions(+), 106 deletions(-) diff --git a/Master/texmf-dist/doc/generic/witharrows/witharrows-french.pdf b/Master/texmf-dist/doc/generic/witharrows/witharrows-french.pdf index 418b113d7f1..8ea76ae1de0 100644 Binary files a/Master/texmf-dist/doc/generic/witharrows/witharrows-french.pdf and b/Master/texmf-dist/doc/generic/witharrows/witharrows-french.pdf differ diff --git a/Master/texmf-dist/doc/generic/witharrows/witharrows.pdf b/Master/texmf-dist/doc/generic/witharrows/witharrows.pdf index bd8cdb7be49..7727d27d1ca 100644 Binary files a/Master/texmf-dist/doc/generic/witharrows/witharrows.pdf and b/Master/texmf-dist/doc/generic/witharrows/witharrows.pdf differ diff --git a/Master/texmf-dist/doc/generic/witharrows/witharrows.tex b/Master/texmf-dist/doc/generic/witharrows/witharrows.tex index d46f9a806d9..97cb5359466 100644 --- a/Master/texmf-dist/doc/generic/witharrows/witharrows.tex +++ b/Master/texmf-dist/doc/generic/witharrows/witharrows.tex @@ -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} \input tikz.tex \input expl3-generic.tex \usetikzlibrary{arrows.meta,bending} @@ -47,22 +47,13 @@ \bool_set_false:c { c__witharrows_#1_loaded_bool } } } -\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 } } } @@ -71,19 +62,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 { diff --git a/Master/texmf-dist/source/generic/witharrows/witharrows.dtx b/Master/texmf-dist/source/generic/witharrows/witharrows.dtx index 567911b1bca..f14d21114ab 100644 --- a/Master/texmf-dist/source/generic/witharrows/witharrows.dtx +++ b/Master/texmf-dist/source/generic/witharrows/witharrows.dtx @@ -15,8 +15,8 @@ % % \fi % \iffalse -\def\myfileversion{2.6a} -\def\myfiledate{2021/01/12} +\def\myfileversion{2.6b} +\def\myfiledate{2021/01/31} % % %<*batchfile> @@ -101,7 +101,7 @@ version 2005/12/01 or later. % see p.~\pageref{plain-TeX}). This package can be used with |xelatex|, % |lualatex|, |pdflatex| but also by the classical workflow % |latex|-|dvips|-|ps2pdf| (or Adobe Distiller). This package loads the packages -% \pkg{l3keys2e}, \pkg{xparse}, \pkg{varwidth}, \pkg{tikz} and the Tikz libraries +% \pkg{l3keys2e}, \pkg{varwidth}, \pkg{tikz} and the Tikz libraries % \pkg{arrows.meta} and \pkg{bending}. The arrows are drawn with Tikz and that's % why several compilations may be necessary. % @@ -2557,7 +2557,7 @@ version 2005/12/01 or later. % Assume we want to draw a loop of numbered arrows. In this purpose, it's % possible to write a dedicated command |\NumberedLoop| which will do the job % when used in |code-after|. In the following example, we write this command with -% |\NewDocumentCommand| of \pkg{xparse} and |\foreach| of \pkg{pgffor} (both +% |\NewDocumentCommand| (of \pkg{xparse}) and |\foreach| of \pkg{pgffor} (both % packages are loaded when \pkg{witharrows} is loaded). % % \begin{Verbatim} @@ -2686,7 +2686,6 @@ version 2005/12/01 or later. % % \bigskip % \begin{macrocode} -\RequirePackage { xparse } [ 2019-01-01 ] \RequirePackage { varwidth } % % \end{macrocode} @@ -2767,17 +2766,8 @@ version 2005/12/01 or later. \ProcessKeysOptions { WithArrows / package } % \end{macrocode} % -% % \medskip % \begin{macrocode} -\@@_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. - } -% \end{macrocode} -% -% \begin{macrocode} \@@_msg_new:nn { footnote~with~footnotehyper~package } { You~can't~use~the~option~'footnote'~because~the~package~ @@ -2805,8 +2795,12 @@ version 2005/12/01 or later. % \begin{macrocode} \bool_if:NT \c_@@_footnote_bool { +% \end{macrocode} +% The class \cls{beamer} has its own system to extract footnotes and that's why +% we have nothing to do if \cls{beamer} is used. +% \begin{macrocode} \@ifclassloaded { beamer } - { \msg_info:nn { witharrows } { Option~incompatible~with~Beamer } } + { \bool_set_false:N \c_@@_footnote_bool } { \@ifpackageloaded { footnotehyper } { \@@_error:n { footnote~with~footnotehyper~package } } @@ -2818,14 +2812,18 @@ version 2005/12/01 or later. % \begin{macrocode} \bool_if:NT \c_@@_footnotehyper_bool { +% \end{macrocode} +% The class \cls{beamer} has its own system to extract footnotes and that's why +% we have nothing to do if \cls{beamer} is used. +% \begin{macrocode} \@ifclassloaded { beamer } - { \@@_info:n { Option~incompatible~with~Beamer } } + { \bool_set_false:N \c_@@_footnote_bool } { \@ifpackageloaded { footnote } { \@@_error:n { footnotehyper~with~footnote~package } } { \usepackage { footnotehyper } } + \bool_set_true:N \c_@@_footnote_bool } - \bool_set_true:N \c_@@_footnote_bool } % \end{macrocode} % The flag |\c_@@_footnote_bool| is raised and so, we will only have to test @@ -2892,22 +2890,7 @@ version 2005/12/01 or later. % \end{macrocode} % % \bigskip -% We define a command |\@@_strcmp:nn| to compare two token lists. It will be -% available whether the engine is pdfTeX, XeTeX or LuaTeX. -% \begin{macrocode} -\sys_if_engine_luatex:TF - { - \cs_new_protected:Npn \@@_strcmp:nn #1 #2 - { \lua_now:e { l3kernel.strcmp('#1','#2') } } - } - { - \cs_new_protected:Npn \@@_strcmp:nn #1 #2 - { \tex_strcmp:D { #1 } { #2 } } - } -% \end{macrocode} -% -% \bigskip -% We can now define a command |\@@_sort_seq:N| which will sort a sequence. +% We define a command |\@@_sort_seq:N| which will sort a sequence. % \begin{macrocode} \cs_new_protected:Npn \@@_sort_seq:N #1 { @@ -2915,7 +2898,7 @@ version 2005/12/01 or later. { \int_compare:nNnTF { - \@@_strcmp:nn + \tex_strcmp:D { \str_lower_case:n { ##1 } } { \str_lower_case:n { ##2 } } } @@ -2929,27 +2912,11 @@ version 2005/12/01 or later. % \bigskip % The following command creates a sequence of strings (|str|) from a |clist|. % -% -% The following command converts all the elements of a sequence (which are token -% lists) into strings. -% \begin{macrocode} -\cs_new_protected:Npn \@@_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 - } -% \end{macrocode} -% -% The following command creates a sequence of strings (|str|) from a |clist|. % \begin{macrocode} \cs_new_protected:Npn \@@_set_seq_of_str_from_clist:Nn #1 #2 { \seq_set_from_clist:Nn #1 { #2 } - \@@_convert_to_str_seq:N #1 + \seq_set_map_x:NNn #1 #1 { \tl_to_str:n { ##1 } } } % \end{macrocode} % @@ -7926,10 +7893,10 @@ version 2005/12/01 or later. % % \subsection*{Changes between 2.5.1 and 2.6} % -% The key |format| now support the letters |R|, |C| and |L|. +% The key |format| now supports the letters |R|, |C| and |L|. % % -% \subsection*{Changes between 2.6 and 2.6a} +% \subsection*{Changes between 2.6 and 2.6a (and 2.6b)} % % Replacement of |\hbox_unpack_clear:N| by |\hbox_unpack_drop:N| since % |\hbox_unpack_clear:N| is now deprecated in \pkg{expl3}. 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