summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/generic
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-09-08 21:07:10 +0000
committerKarl Berry <karl@freefriends.org>2020-09-08 21:07:10 +0000
commit3741b8b40f8f8c90286ae327cb29eadc441fb84e (patch)
tree13d718edb6f3d277f7306f10cadfaa142b3fe7ac /Master/texmf-dist/tex/generic
parent8e729e92f045234de5911140817f9815cecc614f (diff)
witharrows (8sep20)
git-svn-id: svn://tug.org/texlive/trunk@56296 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/generic')
-rw-r--r--Master/texmf-dist/tex/generic/witharrows/witharrows.sty38
1 files changed, 26 insertions, 12 deletions
diff --git a/Master/texmf-dist/tex/generic/witharrows/witharrows.sty b/Master/texmf-dist/tex/generic/witharrows/witharrows.sty
index 0edf18a42e3..9f49ebbca2e 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.5.1}
-\def\myfiledate{2020/07/28}
+\def\myfileversion{2.6}
+\def\myfiledate{2020/09/08}
\RequirePackage{tikz}
\usetikzlibrary{arrows.meta,bending}
\RequirePackage{l3keys2e}
@@ -150,10 +150,19 @@
\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 }
- \seq_set_map:NNn #1 #1 { \tl_to_str:n { ##1 } }
+ \__witharrows_convert_to_str_seq:N #1
}
\cs_new_protected:Npn \__witharrows_save:N #1
{
@@ -469,7 +478,7 @@
\tl_if_empty:nTF { #1 }
{ \__witharrows_error:n { Invalid~option~format } }
{
- \regex_match:nnTF { \A[rcl]*\Z } { #1 }
+ \regex_match:nnTF { \A[rclRCL]*\Z } { #1 }
{ \tl_set:Nn \l__witharrows_format_str { #1 } }
{ \__witharrows_error:n { Invalid~option~format } }
} ,
@@ -727,7 +736,7 @@
\int_zero_new:N \l__witharrows_pos_of_arrow_int
\int_zero_new:N \l__witharrows_jump_int
\int_set:Nn \l__witharrows_jump_int 1
- \str_set:Nn \l__witharrows_format_str { rl }
+ \str_set:Nn \l__witharrows_format_str { rL }
\seq_clear_new:N \l__witharrows_labels_seq
\bool_set_false:N \l__witharrows_tag_next_line_bool
\skip_zero:N \l__witharrows_interline_skip
@@ -756,7 +765,7 @@
{
\seq_pop_right:NNTF \l__witharrows_format_seq \l__witharrows_type_col_str
{
- \use:x
+ \use:e
{
\int_gdecr:N \g__witharrows_col_int
\__witharrows_construct_halign:
@@ -770,21 +779,26 @@
}
}
\str_if_eq:VnT \l__witharrows_type_col_str { c } \hfil
+ \str_if_eq:VnT \l__witharrows_type_col_str { C } \hfil
\str_if_eq:VnT \l__witharrows_type_col_str { r } \hfill
+ \str_if_eq:VnT \l__witharrows_type_col_str { R } \hfill
\int_gincr:N \g__witharrows_col_int
\int_gset:Nn \g__witharrows_static_col_int { \int_use:N \g__witharrows_col_int }
\c_math_toggle_token
- {
- { }
- \bool_if:NT \l__witharrows_displaystyle_bool \displaystyle
- ####
- }
+ \str_if_eq:VnT \l__witharrows_type_col_str { C } { { } }
+ \str_if_eq:VnT \l__witharrows_type_col_str { L } { { } }
+ \bool_if:NT \l__witharrows_displaystyle_bool \displaystyle
+ ##
+ \str_if_eq:VnT \l__witharrows_type_col_str { C } { { } }
+ \str_if_eq:VnT \l__witharrows_type_col_str { R } { { } }
\c_math_toggle_token
\int_compare:nNnTF \g__witharrows_col_int = \l__witharrows_nb_cols_int
- { \__witharrows_construct_nodes: }
+ \__witharrows_construct_nodes:
{
\str_if_eq:VnT \l__witharrows_type_col_str { l } \hfil
+ \str_if_eq:VnT \l__witharrows_type_col_str { L } \hfil
\str_if_eq:VnT \l__witharrows_type_col_str { c } \hfil
+ \str_if_eq:VnT \l__witharrows_type_col_str { C } \hfil
\bool_if:NT \l__witharrows_in_DispWithArrows_bool { \tabskip = \c_zero_skip }
&
}