summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-06-30 20:51:26 +0000
committerKarl Berry <karl@freefriends.org>2023-06-30 20:51:26 +0000
commit4f781dbd163d1420e48aa24bf2967ba2eee0af03 (patch)
tree2d0e4462a580026a5bcd7e6553a5c74f5eb9d74e /Master/texmf-dist/tex
parent709e4fef5d5ea4962dbf30b1e4628776edd963e0 (diff)
nicematrix (30jun23)
git-svn-id: svn://tug.org/texlive/trunk@67516 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty48
1 files changed, 35 insertions, 13 deletions
diff --git a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
index a04f78a423b..32575a9841a 100644
--- a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
+++ b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.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{6.20}
-\def\myfiledate{2023/06/04}
+\def\myfileversion{6.20a}
+\def\myfiledate{2023/06/30}
\RequirePackage{pgfcore}
\usepgfmodule{shapes}
\RequirePackage{l3keys2e}
@@ -593,8 +593,14 @@
\int_compare:nNnT \l_tmpa_int = \c@tabularnote
{ \int_gincr:N \c@tabularnote }
\seq_clear:N \l__nicematrix_notes_labels_seq
- \hbox_overlap_right:n { \box_use:N \l_tmpa_box }
- \skip_horizontal:n { \box_wd:N \l_tmpa_box }
+ \bool_lazy_or:nnTF
+ { \str_if_eq_p:Vn \l__nicematrix_hpos_cell_str { c } }
+ { \str_if_eq_p:Vn \l__nicematrix_hpos_cell_str { r } }
+ {
+ \hbox_overlap_right:n { \box_use:N \l_tmpa_box }
+ \skip_horizontal:n { \box_wd:N \l_tmpa_box }
+ }
+ { \box_use:N \l_tmpa_box }
}
}
\cs_new_protected:Npn \__nicematrix_tabularnote_caption:nn #1 #2
@@ -892,7 +898,7 @@
name .code:n =
\legacy_if:nF { measuring@ }
{
- \str_set:Nn \l_tmpa_str { #1 }
+ \str_set:Nx \l_tmpa_str { #1 }
\seq_if_in:NVTF \g__nicematrix_names_seq \l_tmpa_str
{ \__nicematrix_error:nn { Duplicate~name } { #1 } }
{ \seq_gput_left:NV \g__nicematrix_names_seq \l_tmpa_str }
@@ -1511,8 +1517,7 @@
{
\tl_if_empty:NF \l__nicematrix_note_in_caption_tl
{
- \int_gset_eq:NN \g__nicematrix_notes_caption_int
- { \l__nicematrix_note_in_caption_tl }
+ \int_gset_eq:NN \g__nicematrix_notes_caption_int \l__nicematrix_note_in_caption_tl
\int_gset:Nn \c@tabularnote { \l__nicematrix_note_in_caption_tl }
}
}
@@ -2140,7 +2145,7 @@
{
position = \int_eval:n { \c@jCol + 1 } ,
multiplicity = \int_use:N \l_tmpa_int ,
- total-width = \dim_use:N \l_tmpa_dim % added 2022-08-06
+ total-width = \dim_use:N \l_tmpa_dim
}
}
\int_zero:N \l_tmpa_int
@@ -2229,7 +2234,7 @@
{ \dim_eval:n { #1 } }
{
\str_if_eq:VnTF \l__nicematrix_hpos_col_str j
- { \str_set:Nn \exp_not:N \l__nicematrix_hpos_cell_str { c } }
+ { \str_set:Nn \exp_not:N \l__nicematrix_hpos_cell_str { } }
{
\str_set:Nn \exp_not:N \l__nicematrix_hpos_cell_str
{ \str_lowercase:V \l__nicematrix_hpos_col_str }
@@ -2896,6 +2901,12 @@
{ \caption }
{ \caption [ \l__nicematrix_short_caption_tl ] }
{ \l__nicematrix_caption_tl }
+ \bool_if:NF \g__nicematrix_caption_finished_bool % added 2023/06/30
+ {
+ \bool_gset_true:N \g__nicematrix_caption_finished_bool
+ \int_gset_eq:NN \g__nicematrix_notes_caption_int \c@tabularnote
+ \int_gzero:N \c@tabularnote
+ }
\tl_if_empty:NF \l__nicematrix_label_tl { \label { \l__nicematrix_label_tl } }
\group_end:
}
@@ -4259,8 +4270,11 @@
{
\int_compare:nNnT \l__nicematrix_initial_j_int = \g__nicematrix_col_total_int
{
- \dim_set_eq:NN \l_tmpa_dim \l__nicematrix_right_margin_dim
- \dim_add:Nn \l_tmpa_dim \l__nicematrix_extra_right_margin_dim
+ \dim_set:Nn \l_tmpa_dim
+ {
+ \l__nicematrix_right_margin_dim + \l__nicematrix_extra_right_margin_dim
+ + 2 mm
+ }
\dim_add:Nn \l__nicematrix_x_initial_dim \l_tmpa_dim
\dim_add:Nn \l__nicematrix_x_final_dim \l_tmpa_dim
}
@@ -4429,9 +4443,9 @@
}
\draw
[
- #1 ,
shorten~> = \l__nicematrix_xdots_shorten_end_dim ,
shorten~< = \l__nicematrix_xdots_shorten_start_dim ,
+ #1
]
( \l__nicematrix_x_initial_dim , \l__nicematrix_y_initial_dim )
-- node [ __nicematrix_node_above ] { $ \scriptstyle #2 $ }
@@ -4806,6 +4820,7 @@
\tl_set_rescan:Nno \l__nicematrix_argspec_tl { } \l__nicematrix_argspec_tl
\exp_args:NNV \NewDocumentCommand \__nicematrix_Vdotsfor: \l__nicematrix_argspec_tl
{
+ \bool_gset_true:N \g__nicematrix_empty_cell_bool % added
\tl_gput_right:Nx \g__nicematrix_HVdotsfor_lines_tl
{
\__nicematrix_Vdotsfor:nnnn
@@ -7423,6 +7438,11 @@
{
\group_begin:
\bool_set_true:N \l__nicematrix_Matrix_bool
+ \str_if_eq:nnT { #1 } { . }
+ {
+ \str_if_eq:nnT { #2 } { . }
+ { \bool_set_false:N \l__nicematrix_Matrix_bool }
+ }
\keys_set_known:nnN { NiceMatrix / Auto } { #6 } \l_tmpa_tl
\cs_set_eq:NN \__nicematrix_transform_preamble: \prg_do_nothing:
\use:x
@@ -7470,6 +7490,7 @@
{
\group_begin:
\bool_gset_true:N \g__nicematrix_NiceArray_bool
+ % \bool_set_true:N \l__nicematrix_Matrix_bool
\AutoNiceMatrixWithDelims . . { #2 } { #4 } [ #1 , #3 , #5 ]
\group_end:
}
@@ -9376,7 +9397,8 @@
if~you~use~'columns-width=auto'.~If~you~don't~want~to~see~this~
message~again,~use~the~key~'allow-duplicate-names'~in~
'\token_to_str:N \NiceMatrixOptions'.\\
- \c__nicematrix_available_keys_str
+ \bool_if:NF \c__nicematrix_messages_for_Overleaf_bool
+ { For~a~list~of~the~names~already~used,~type~H~<return>. }
}
{
The~names~already~defined~in~this~document~are:~