From f881cafce2416c2aee9afdfe9b50cb1040d67491 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 29 Oct 2018 20:24:37 +0000 Subject: nicematrix (29oct18) git-svn-id: svn://tug.org/texlive/trunk@49017 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/nicematrix/nicematrix.dtx | 53 +++++++++++++++------- 1 file changed, 36 insertions(+), 17 deletions(-) (limited to 'Master/texmf-dist/source/latex/nicematrix') diff --git a/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx b/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx index 5069c020944..4179d74c84e 100644 --- a/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx +++ b/Master/texmf-dist/source/latex/nicematrix/nicematrix.dtx @@ -15,8 +15,8 @@ % % \fi % \iffalse -\def\myfileversion{2.1.2} -\def\myfiledate{2018/10/05} +\def\myfileversion{2.1.3} +\def\myfiledate{2018/10/29} % % %<*batchfile> @@ -44,7 +44,7 @@ version 2005/12/01 or later. \endgroup % % -%<@@=nm> +%<@@=nicem> %<*driver> \documentclass[dvipsnames]{l3doc}% dvipsnames is for xcolor (loaded by Tikz, loaded by nicematrix) \VerbatimFootnotes @@ -1929,9 +1929,9 @@ version 2005/12/01 or later. % \subsection{Technical definitions} % % \begin{macrocode} -\cs_new_protected:Nn \@@_msg_error:n +\cs_new_protected:Nn \@@_error:n {\msg_error:nn {nicematrix} {#1}} -\cs_new_protected:Nn \@@_msg_error:nn +\cs_new_protected:Nn \@@_error:nn {\msg_error:nn {nicematrix} {#1} {#2}} % \end{macrocode} % @@ -2165,7 +2165,7 @@ version 2005/12/01 or later. % In |\NiceMatrixOptions|, the special value |auto| is not available. % \begin{macrocode} columns-width .code:n = \str_if_eq:nnTF {#1} {auto} - {\@@_msg_error:n {Option~auto~for~columns-width}} + {\@@_error:n {Option~auto~for~columns-width}} {\dim_set:Nn \l_@@_columns_width_dim {#1}}, % \end{macrocode} % @@ -2186,7 +2186,7 @@ version 2005/12/01 or later. % % \bigskip % \begin{macrocode} - unknown .code:n = \@@_msg_error:n {Unknown~key~for~NiceMatrixOptions}} + unknown .code:n = \@@_error:n {Unknown~key~for~NiceMatrixOptions}} % \end{macrocode} % \begin{macrocode} \msg_new:nnnn {nicematrix} @@ -2241,7 +2241,7 @@ version 2005/12/01 or later. \l_@@_auto_columns_width_bool} {\dim_set:Nn \l_@@_columns_width_dim {#1}}, name .code:n = {\seq_if_in:NnTF \g_@@_names_seq {#1} - {\@@_msg_error:nn {Duplicate~name} {#1}} + {\@@_error:nn {Duplicate~name} {#1}} {\seq_gput_left:Nn \g_@@_names_seq {#1}} \tl_set:Nn \l_@@_name_tl {#1}}, name .value_required:n = true, @@ -2264,7 +2264,7 @@ version 2005/12/01 or later. right-margin .default:n = \arraycolsep, extra-left-margin .dim_set:N = \l_@@_extra_left_margin_dim, extra-right-margin .dim_set:N = \l_@@_extra_right_margin_dim, - unknown .code:n = \@@_msg_error:n {Unknown~option~for~NiceMatrix}} + unknown .code:n = \@@_error:n {Unknown~option~for~NiceMatrix}} % \end{macrocode} % % \begin{macrocode} @@ -2315,7 +2315,7 @@ version 2005/12/01 or later. {\dim_set:Nn \l_@@_columns_width_dim {#1}}, columns-width .value_required:n = true, name .code:n = {\seq_if_in:NnTF \g_@@_names_seq {#1} - {\@@_msg_error:nn {Duplicate~name} {#1}} + {\@@_error:nn {Duplicate~name} {#1}} {\seq_gput_left:Nn \g_@@_names_seq {#1}} \tl_set:Nn \l_@@_name_tl {#1}}, name .value_required:n = true, @@ -2339,7 +2339,7 @@ version 2005/12/01 or later. right-margin .default:n = \arraycolsep, extra-left-margin .dim_set:N = \l_@@_extra_left_margin_dim, extra-right-margin .dim_set:N = \l_@@_extra_right_margin_dim, - unknown .code:n = \@@_msg_error:n {Unknown~option~for~NiceArray}} + unknown .code:n = \@@_error:n {Unknown~option~for~NiceArray}} % \end{macrocode} % % \begin{macrocode} @@ -2534,7 +2534,7 @@ version 2005/12/01 or later. % \begin{macrocode} \NewDocumentEnvironment {NiceArray} {O{} m O{}} {\cs_if_exist:NT \@@_in_NiceArray: - {\@@_msg_error:n {We~are~yet~in~an~environment~NiceArray}} + {\@@_error:n {We~are~yet~in~an~environment~NiceArray}} % \end{macrocode} % We deactivate Tikz externalization (since we use Tikz pictures with the options |overlay| and % |remember picture|, there would be errors). @@ -3010,7 +3010,14 @@ version 2005/12/01 or later. || \int_compare_p:nNn \l_@@_final_j_int < 1 || \int_compare_p:nNn - \l_@@_final_j_int > \g_@@_column_total_int} + \l_@@_final_j_int > \g_@@_column_total_int +% \end{macrocode} +% If you arrive in the column |C| of an environment with such columns (like |{pNiceArrayC}|), you must consider that +% we are \emph{outside} the matrix except if we are drawing a vertical line (included in the column |C|). +% \begin{macrocode} + || \int_compare_p:nNn + \l_@@_final_j_int > \g_@@_column_int + && \int_compare_p:nNn {#4} > 0 } % \end{macrocode} % If we are outside the matrix, we have found the extremity of the dotted line and it's a \emph{open} extremity. % \begin{macrocode} @@ -3608,7 +3615,7 @@ version 2005/12/01 or later. {\dim_set:Nn \l_@@_columns_width_dim {#1}}, columns-width .value_required:n = true, name .code:n = {\seq_if_in:NnTF \g_@@_names_seq {#1} - {\@@_msg_error:nn {Duplicate~name} {#1}} + {\@@_error:nn {Duplicate~name} {#1}} {\seq_gput_left:Nn \g_@@_names_seq {#1}} \tl_set:Nn \l_@@_name_tl {#1}}, name .value_required:n = true, @@ -3623,7 +3630,7 @@ version 2005/12/01 or later. right-margin .default:n = \arraycolsep, extra-left-margin .dim_set:N = \l_@@_extra_left_margin_dim, extra-right-margin .dim_set:N = \l_@@_extra_right_margin_dim, - unknown .code:n = \@@_msg_error:n {Unknown~option~for~NiceArrayC}} + unknown .code:n = \@@_error:n {Unknown~option~for~NiceArrayC}} % \end{macrocode} % % \begin{macrocode} @@ -3785,7 +3792,7 @@ version 2005/12/01 or later. {\dim_set:Nn \l_@@_columns_width_dim {#1}}, columns-width .value_required:n = true, name .code:n = {\seq_if_in:NnTF \g_@@_names_seq {#1} - {\@@_msg_error:nn {Duplicate~name} {#1}} + {\@@_error:nn {Duplicate~name} {#1}} {\seq_gput_left:Nn \g_@@_names_seq {#1}} \tl_set:Nn \l_@@_name_tl {#1}}, code-after .tl_set:N = \l_@@_code_after_tl, @@ -3797,7 +3804,7 @@ version 2005/12/01 or later. right-margin .default:n = \arraycolsep, extra-left-margin .dim_set:N = \l_@@_extra_left_margin_dim, extra-right-margin .dim_set:N = \l_@@_extra_right_margin_dim, - unknown .code:n = \@@_msg_error:n {Unknown~option~for~NiceArrayRC}} + unknown .code:n = \@@_error:n {Unknown~option~for~NiceArrayRC}} % \end{macrocode} % % \begin{macrocode} @@ -4202,6 +4209,18 @@ version 2005/12/01 or later. % \subsection{Changes between version 2.1 and 2.1.2} % Option |draft|: with this option, the dotted lines are not drawn (quicker). % +% \subsection{Changes between version 2.1 and 2.1.3} +% When searching the end of a dotted line from a command like |\Cdots| issued in the ``main matrix'' (not in the +% column |C|), the cells in the column |C| are considered as outside the matrix. That means that it's possible to +% do the following matrix with only a |\Cdots| command (and a single |\Vdots|). +% \[\begin{pNiceArrayRC}{wc{5mm}Cwc{5mm}} +% & C_j & \\ +% \mbox{\Large $0$} & \Vdots & \mbox{\Large $0$} \\ +% & \strut a & \Cdots & L_i \\ +% \mbox{\Large $0$} & & \mbox{\Large $0$} \\ +% \end{pNiceArrayRC}\] +% +% % \endinput % Local Variables: % TeX-fold-mode: nil -- cgit v1.2.3