summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2019-01-29 22:13:59 +0000
committerKarl Berry <karl@freefriends.org>2019-01-29 22:13:59 +0000
commit2a9521a76a96fe366f1a457019e95659d9464924 (patch)
tree01157c304444d6694fe8637b670baf3dd3584ab5 /Master/texmf-dist/tex
parent86b66441c6a9beb50462a4afe5daff114d70b0f8 (diff)
nicematrix (29jan19)
git-svn-id: svn://tug.org/texlive/trunk@49866 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex')
-rw-r--r--Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty35
1 files changed, 18 insertions, 17 deletions
diff --git a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
index 0774cd78404..d681eeb9ac4 100644
--- a/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
+++ b/Master/texmf-dist/tex/latex/nicematrix/nicematrix.sty
@@ -6,7 +6,7 @@
%%
%% nicematrix.dtx (with options: `package')
%%
-%% Copyright (C) 2017-2018 by F. Pantigny
+%% Copyright (C) 2017-2019 by F. Pantigny
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -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{2.1.3}
-\def\myfiledate{2018/10/29}
+\def\myfileversion{2.1.4}
+\def\myfiledate{2019/01/28}
\RequirePackage{tikz}
\usetikzlibrary{fit}
+\RequirePackage{expl3}[2018-01-01]
\RequirePackage{l3keys2e}
\ProvidesExplPackage
{nicematrix}
@@ -34,7 +35,7 @@
\ProcessOptions \relax
\RequirePackage{array}
\RequirePackage{amsmath}
-\RequirePackage{xparse}
+\RequirePackage{xparse}[2018-10-17]
\cs_new_protected:Nn \__nicem_error:n
{\msg_error:nn {nicematrix} {#1}}
\cs_new_protected:Nn \__nicem_error:nn
@@ -171,7 +172,7 @@
create-extra-nodes,~
extra-left-margin,~
extra-right-margin,~
- left~margin,~
+ left-margin,~
name,~
nullify-dots,~
parallelize-diags,~
@@ -273,7 +274,7 @@
\bgroup
\box_use:N \l_tmpa_box
\egroup ;}
-\NewDocumentEnvironment {NiceMatrix} {O{}}
+\NewDocumentEnvironment {NiceMatrix} {!O{}}
{\keys_set:nn {NiceMatrix/NiceMatrix} {#1}
\tl_set:Nn \l__nicem_pos_env_tl c
\bool_set_false:N \l__nicem_exterior_arraycolsep_bool
@@ -316,13 +317,13 @@
\cs_set_eq:NN \iddots \prg_do_nothing:
\cs_set_eq:NN \dots \prg_do_nothing:
\cs_set_eq:NN \hdotsfor \__nicem_Hdotsfor}}
-\NewDocumentEnvironment {NiceArray} {O{} m O{}}
+\NewDocumentEnvironment {NiceArray} {O{} m !O{}}
{\cs_if_exist:NT \__nicem_in_NiceArray:
{\__nicem_error:n {We~are~yet~in~an~environment~NiceArray}}
\cs_if_exist:NT \tikz@library@external@loaded
{\tikzset{external/export = false}}
\cs_set:Npn \__nicem_in_NiceArray: {--Void--}
- \aftergroup \__nicem_after_array:
+ \group_insert_after:N \__nicem_after_array:
\tl_gclear_new:N \g__nicem_lines_to_draw_tl
\int_gincr:N \g__nicem_env_int
\bool_if:NF \l__nicem_block_auto_columns_width_bool
@@ -332,7 +333,7 @@
\dim_gzero_new:N \g__nicem_max_ht_row_one_dim
\keys_set:nn {NiceMatrix/NiceArray} {#1,#3}
\bool_if:NT \l__nicem_auto_columns_width_bool
- {\aftergroup \__nicem_write_max_cell_width:
+ {\group_insert_after:N \__nicem_write_max_cell_width:
\cs_if_free:cTF {__nicem_max_cell_width_\int_use:N \g__nicem_env_int}
{\dim_set:Nn \l__nicem_columns_width_dim \c_zero_dim}
{\dim_set:Nx \l__nicem_columns_width_dim
@@ -747,7 +748,7 @@
{\__nicem_old_multicolumn{#1}{#2}{#3}
\int_compare:nNnT #1 > 1
{\seq_gput_left:Nx \g__nicem_multicolumn_cells_seq
- {\int_eval:n {\g__nicem_row_int} -
+ {\int_eval:n \g__nicem_row_int -
\int_use:N \g__nicem_column_int}
\seq_gput_left:Nn \g__nicem_multicolumn_sizes_seq {#1}}
\int_gadd:Nn \g__nicem_column_int {#1-1}}
@@ -805,17 +806,17 @@
{\bool_set_true:N \l__nicem_block_auto_columns_width_bool
\dim_gzero_new:N \g__nicem_max_cell_width_dim
\bool_set_true:N \l__nicem_auto_columns_width_bool}}
-\NewDocumentEnvironment {NiceMatrixBlock} {O{}}
+\NewDocumentEnvironment {NiceMatrixBlock} {!O{}}
{\keys_set:nn {NiceMatrix/NiceMatrixBlock} {#1}
\int_zero_new:N \l__nicem_first_env_block_int
\int_set:Nn \l__nicem_first_env_block_int {\g__nicem_env_int + 1}}
{\bool_if:NT \l__nicem_block_auto_columns_width_bool
- {\iow_now:Nn \@mainaux {\ExplSyntaxOn}
+ {\iow_now:Nn \@mainaux \ExplSyntaxOn
\int_step_inline:nnnn \l__nicem_first_env_block_int 1 \g__nicem_env_int
{\iow_now:Nx \@mainaux
{\cs_gset:cpn {__nicem_max_cell_width_##1}
{\dim_use:N \g__nicem_max_cell_width_dim}}}
- \iow_now:Nn \@mainaux {\ExplSyntaxOff}}}
+ \iow_now:Nn \@mainaux \ExplSyntaxOff}}
\keys_define:nn {NiceMatrix/NiceArrayC}
{parallelize-diags .bool_set:N = \l__nicem_parallelize_diags_bool,
parallelize-diags .default:n = true,
@@ -897,7 +898,7 @@
\int_use:N \g__nicem_row_int-
\int_use:N \g__nicem_column_int}]
{\box_use:N \l_tmpa_box} ; } }}}
-\NewDocumentEnvironment{NiceArrayCwithDelims} {mm O{} m O{}}
+\NewDocumentEnvironment{NiceArrayCwithDelims} {mm O{} m !O{}}
{\dim_gzero_new:N \g__nicem_width_last_col_dim
\keys_set:nn {NiceMatrix/NiceArrayC} {#3,#5}
\bool_set_false:N \l__nicem_exterior_arraycolsep_bool
@@ -967,13 +968,13 @@
create-extra-nodes,~
extra-left-margin,~
extra-right-margin,~
- left~margin,~
+ left-margin,~
name,~
nullify-dots,~
parallelize-diags,~
renew-dots~
- and~right~margin.}
-\NewDocumentEnvironment {NiceArrayRCwithDelims} {mm O{} m O{}}
+ and~right-margin.}
+\NewDocumentEnvironment {NiceArrayRCwithDelims} {mm O{} m !O{}}
{\int_zero:N \l__nicem_nb_first_row_int
\dim_gzero_new:N \g__nicem_width_last_col_dim
\keys_set:nn {NiceMatrix/NiceArrayRC} {#3,#5}