summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-08-09 19:59:12 +0000
committerKarl Berry <karl@freefriends.org>2023-08-09 19:59:12 +0000
commit6a08f132a19953383c8f3bcf8e85d563f6f12130 (patch)
tree4060e8618b490c34e36587f55d6da3d8231deb94
parent531c968f388dfb9f1bfce158b6bb5aefd05726f2 (diff)
arraycols (9aug23)
git-svn-id: svn://tug.org/texlive/trunk@67862 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/arraycols/README.md4
-rw-r--r--Master/texmf-dist/doc/latex/arraycols/arraycols.pdfbin458546 -> 463229 bytes
-rw-r--r--Master/texmf-dist/source/latex/arraycols/arraycols.dtx293
-rw-r--r--Master/texmf-dist/source/latex/arraycols/arraycols.ins4
-rw-r--r--Master/texmf-dist/tex/latex/arraycols/arraycols.sty20
5 files changed, 165 insertions, 156 deletions
diff --git a/Master/texmf-dist/doc/latex/arraycols/README.md b/Master/texmf-dist/doc/latex/arraycols/README.md
index 5c316f85f8d..6cdafd4ee70 100644
--- a/Master/texmf-dist/doc/latex/arraycols/README.md
+++ b/Master/texmf-dist/doc/latex/arraycols/README.md
@@ -7,8 +7,8 @@ This small package provides new column types for array and tabular environments,
horizontally and vertically centered,
or with adjusted height for big mathematical expressions.
-The columns width can be fixed or calculated like in tabularx environments.
-Macros for drawing vertical and horizontal rules of variable thickness are also provided.
+The columns width can be either fixed or calculated, similar to tabularx environments.
+Column types or macro for drawing vertical and horizontal rules of variable thickness are also provided.
## Installation
diff --git a/Master/texmf-dist/doc/latex/arraycols/arraycols.pdf b/Master/texmf-dist/doc/latex/arraycols/arraycols.pdf
index e00a2109e35..d66dd231be1 100644
--- a/Master/texmf-dist/doc/latex/arraycols/arraycols.pdf
+++ b/Master/texmf-dist/doc/latex/arraycols/arraycols.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/arraycols/arraycols.dtx b/Master/texmf-dist/source/latex/arraycols/arraycols.dtx
index 9a62fa7f1cd..43dc0fe7eaa 100644
--- a/Master/texmf-dist/source/latex/arraycols/arraycols.dtx
+++ b/Master/texmf-dist/source/latex/arraycols/arraycols.dtx
@@ -1,6 +1,6 @@
% \iffalse meta-comment
%
-% Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+% Copyright (C) 2019-2023 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%
% This file may be distributed and/or modified under the conditions of
% the LaTeX Project Public License, either version 1.3 of this license
@@ -19,8 +19,8 @@
%</driver>
%<*package>
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
-\ProvidesPackage{arraycols}
- [2020/11/23 v1.1 .dtx arraycols file]
+\ProvidesPackage{arraycols}
+ [2023/08/09 v1.3 .dtx arraycols file]
%</package>
%<*driver>
\documentclass{ltxdoc}
@@ -29,23 +29,23 @@
\usepackage[french,english]{babel}
\usepackage{lmodern}
\usepackage{arraycols}
-\DisableCrossrefs
+\DisableCrossrefs
%\CodelineIndex
%\RecordChanges
\usepackage{hyperref}
\hypersetup{%
colorlinks,
- linkcolor=blue,
+ linkcolor=blue,
citecolor=blue,
- pdftitle={arraycols},
- pdfsubject={LaTeX package},
+ pdftitle={arraycols},
+ pdfsubject={LaTeX package},
pdfauthor={Antoine Missier}
}
-\MakeShortVerb{*}
+\MakeShortVerb{"}
\begin{document}
- \DocInput{arraycols.dtx}
- %\PrintChanges
- %\PrintIndex
+\DocInput{arraycols.dtx}
+%\PrintChanges
+%\PrintIndex
\end{document}
%</driver>
% \fi
@@ -73,52 +73,53 @@
% \changes{v1.0}{2019/06/17}{English translation by François Bastouil}
% \changes{v1.1}{2020/11/23}{Incompatibility with tablestyles mentioned,
% minor changes in documentation}
+% \changes{v1.2}{2021/09/20}{Incompatibility with siunitx package (called by pstricks-add) is solved}
+% \changes{v1.3}{2023/09/08}{Small changes in the documentation}
%
% \GetFileInfo{arraycols.sty}
%
% \title{The \textsf{arraycols} package\thanks{This document
% corresponds to \textsf{arraycols}~\fileversion, dated \filedate.
-% Thanks to François Bastouil for help in English translation.}}
+% Thanks to François Bastouil for assistance with the English translation.}}
% \author{Antoine Missier \\ \texttt{antoine.missier@ac-toulouse.fr}}
-% \date{November 23, 2020}
+% \date{August 9, 2023}
% \maketitle
%
% \section{Introduction}
%
-% This package provides new predefined column types to typeset tables in addition to
-% the \textsf{array} package by Frank Mittelbach and David Carlisle~\cite{ARRAY}
-% (loaded by \textsf{arraycols}) and also a command to draw wide horizontal rules.
-% Here is a summary of the column types and macro, defined by \textsf{arraycols},
-% which we detail in the next section.
+% This package introduces new predefined column types for tables, alongside
+% the \textsf{array} package by Frank Mittelbach and David Carlisle~\cite{ARRAY}. It also includes a command for wide horizontal rule drawing.
+% Below is a summary of the column types and macro defined by \textsf{arraycols},
+% with further to follow.
%
% \begin{center}\small \setlength{\extrarowheight}{1pt}
% \begin{tabular}{|cIm{7.9cm}|}
% \whline
% \multicolumn{2}{|c|}{\thead{Column definitions}} \\
% \Xhline{0.7pt}
-% \texttt{L} & Left adjusted column (LR mode in \texttt{array} environments
-% or math mode in \texttt{tabular} environment) \\
+% \texttt{L} & Left adjusted column (applicable in LR mode for \texttt{array} environments
+% or math mode for \texttt{tabular} environment) \\
% \hline
-% \texttt{C} & Centered adjusted column (idem) \\
+% \texttt{C} & Centered-adjusted column (similar to L but centered) \\
% \hline
-% \texttt{R} & Right adjusted column (idem) \\
+% \texttt{R} & Right-adjusted column (similar to L but right-adjusted) \\
% \hline
-% \texttt{t}\marg{width} & Text column (LR mode) of fixed \meta{width} like \texttt{p},
-% but horizontally and vertically centered \\
+% \texttt{t}\marg{width} & Text column of fixed \meta{width} (LR mode), similar to \texttt{p},
+% but with horizontal and vertical centering \\
% \hline
% \texttt{x} & Centered column in math mode with adjusted height to
% avoid touching the horizontal rules \\
% \hline
-% \texttt{y} & Left aligned column in math mode with adjusted height \\
+% \texttt{y} & Left-aligned column in math mode with adjusted height \\
% \hline
-% \texttt{z}\marg{width} & Centered column in math mode with adjusted height, like \texttt{x},
-% and fixed \meta{width} \\
+% \texttt{z}\marg{width} & Centered column in math mode, similar to \texttt{x}, with adjusted height,
+% but with fixed \meta{width} \\
% \hline
% \texttt{T} & Centered text column with adjusted width
% for \texttt{tabularx} environments (calculated like \texttt{X} column) \\
% \hline
-% \texttt{Z} & Centered column for \texttt{tabularx}, like \texttt{T},
-% but in math mode with adjusted height, like \texttt{x} and \texttt{z} \\
+% \texttt{Z} & Centered column for \texttt{tabularx}, similar to \texttt{T},
+% but in math mode with adjusted height, like \texttt{x} and \texttt{z} \\
% \hline
% \texttt{I} & Thick vertical rule (1\,pt) \\
% \hline
@@ -131,63 +132,64 @@
% \end{tabular}
% \end{center}
%
-% Note that if a column type has already been defined previously,
-% it will be overwritten with a warning message.
+% Note that if a column type has been previously defined,
+% using \textsf{arraycols} will overwrite it and display a warning message.
%
-% Besides \textsf{array}, \textsf{arraycols} loads the \textsf{cellspace} package~\cite{CELLSP},
-% necessary for the \texttt{x}, \texttt{y}, \texttt{z} and \texttt{Z} types of columns and
-% \textsf{tabularx}~\cite{TABX}, necessary for \texttt{T} and \texttt{Z},
-% as well as \textsf{makecell}~\cite{MKCELL} for various alignments of multilined table cells.
-% The \textsf{tablestyles} package~\cite{TBLSTY} defines also L, C, R, Z column types
-% but in a different way, nevertheless this package is incompatible with \textsf{makecell}
-% and therefore with \textsf{arraycols} too.
+% In addition to loading the \textsf{array} package, \textsf{arraycols} also requires the \textsf{cellspace} package~\cite{CELLSP},
+% which is necessary for the \texttt{x}, \texttt{y}, \texttt{z} and \texttt{Z} column types. Moreover it relies on
+% \textsf{tabularx}~\cite{TABX} for \texttt{T} and \texttt{Z} column types and
+% loads \textsf{makecell}~\cite{MKCELL} for creation of multilined tabular cells.
+% It's worth mentioning that the \textsf{tablestyles} package~\cite{TBLSTY}
+% also defines L, C, R and Z column types differently.
+% Nevertheless, \textsf{tablestyles} is incompatible with \textsf{makecell}
+% and consequently with \textsf{arraycols} as well.
%
-% With a very short code, this package does not claim to develop new macros.
-% Its main action is to combine and set features coming from other packages.
+% Despite its minimal code, this package does not aim to introduce new macros.
+% Its main purpose is to combine and configure features derived from other packages.
%
% \section{Usage}
%
%\medskip
% \DescribeEnv{L} \DescribeEnv{C} \DescribeEnv{R}
% Referring to an example from the \textsf{array} package documentation,
-% \textsf{arraycols} provides the |L|, |C|, |R| columns types
-% which reverse the mathematical mode.
-% Then we can use them to get centered, left-aligned or right-aligned
-% LR-mode in an \texttt{array} environment or math-mode in a \texttt{tabular} environment.
-% For instance, the declaration *\begin{tabular}{|l|C|r|}* sets centered mathematical mode
-% in the second column and declaration *\begin{array}{|L|c|c|}*
-% sets text mode, left aligned in the first column\footnote{The declarations
+% the |L|, |C| and |R| columns types, offered by \textsf{arraycols}, provide the convenience
+% of reversing the mathematical mode.
+% This allows to achieve centered, left-aligned or right-aligned
+% LR-mode in an \texttt{array} environment or an equivalent math-mode
+% in a \texttt{tabular} environment.
+% For instance, using the declaration "\begin{tabular}{|l|C|r|}" sets the second column
+% in centered mathematical mode. Similarly, using the declaration "\begin{array}{|L|c|c|}"
+% sets the first column\footnote{The declarations
% \texttt{L, C, R} do not work in a \texttt{tabularx} environment.
-% Note that the \textsf{tabulary} package by David Carlisle~\cite{TABY}
-% already defines the \texttt{L, C, R, J} column types for particular alignments
-% in tables of same type as \texttt{tabularx},
-% but there is no incompatibility because these column definitions
-% only apply in \texttt{tabulary} environments.
-% }.
+% Additionally, the \mbox{\textsf{tabulary}} package by David Carlisle~\cite{TABY}
+% already defines the \texttt{L, C, R} and \texttt{J} column types for specific alignments
+% in tables of the same type as \texttt{tabularx}.
+% However there is no incompatibility with \textsf{arraycols} because these column definitions
+% apply exclusively in \texttt{tabulary} environments.
+% } in text mode, left-aligned.
%
% \medskip
% \DescribeEnv{t\marg{width}}
-% The new column type definition \texttt{t}\{\meta{width}\} (text in LR-mode)
-% produces horizontal and vertical centering in the column unlike the classics
+% The newly introduced column type definition \texttt{t}\{\meta{width}\} (text in LR-mode)
+% achieves both horizontal and vertical centering within the column. It is distinct from the traditional
% \texttt{p}\marg{width} (in standard \LaTeX) and \texttt{m}\marg{width}
-% (from the \textsf{array} package) which produce left aligned text (visible when the column
-% is wider than the text inside).
+% (from the \textsf{array} package) column types, which are equivalent to
+% "\parbox[t]" or "\parbox".
%
% \medskip
% \DescribeEnv{x} \DescribeEnv{y}
-% To ensure sufficient height for rows, for instance in displaymath mode
-% formulas, we provide the columntypes \texttt{x} (centered)
+% In order to guarantee adequate row heights, especially for displaymath mode
+% formulas, the package includes the column types \texttt{x} (centered)
% and \texttt{y} (left aligned), based on the \textsf{cellspace} package
% by Josselin Noirel~\cite{CELLSP}.
-% They allow automatic adjustment of row heights to avoid touching the
-% horizontal rules when content is too high.
-% Although \textsf{cellspace} is defined \emph{a priori} for \texttt{tabular} environments,
-% the new \texttt{x} and \texttt{y} column types, defined by \textsf{arraycols},
-% produce a column in mathematical mode with good adjustment,
-% either in a \texttt{tabular} or in an \texttt{array} environment.
-%
-% Look at the following examples produced with
-% *\begin{array}{|c|}* and with *\begin{array}{|x|}*.
+% These column types allow automatic adjustment of row heights to prevent any overlap with
+% horizontal rules in cases where the content is too tall.
+% While \textsf{cellspace} is initially designed for \texttt{tabular} environments,
+% the new \texttt{x} and \texttt{y} column types, introduces by \mbox{\textsf{arraycols}},
+% generate mathematically well-adjusted columns.
+% They are applicable in both \texttt{tabular} and \texttt{array} environments.
+% Examine the following examples created using
+% "\begin{array}{|c|}" and "\begin{array}{|x|}".
% \[
% \begin{array}{|c|}
% \hline
@@ -220,46 +222,54 @@
% \og the \textsf{amsmath} package can be loaded beforehand with other
% packages (such as \texttt{empheq} or \texttt{mathtools}),
% were an incompatibility to arise from one’s loading it later\fg.}
-% for a good management of row heights in matrix tables.
+% to effectively manage row heights in matrix tables.
+% Another option of \textsf{cellspace}, \texttt{column=Q}
+% (with \texttt{S} being the default in \textsf{cellspace})\footnote{The
+% selection of the letter Q to substitute the default column modifier S of the \textsf{cellspace}
+% package is here arbitrary.}, was necessary to prevent any compatibility issues
+% with the \textsf{siunitx} package (also loaded by \textsf{pstricks-add}).
+% The \texttt{Q} column type serves as a \og modifier \fg{}
+% that, when combined with the traditional
+% column types \texttt{l, c, r}, permits the adjustment of cell height.
%
% \medskip
-% Notice that another package, \textsf{booktabs}~\cite{BOOK}, also provides
-% an excellent adjustment of row heights, but unfortunately, it doesn't handle height
-% of vertical separators *|*.
-% To get the same vertical adjustment as \textsf{booktabs},
-% we set the \textsf{cellspace} parameters as follows:\\
-% |\setlength{\cellspacetoplimit}{3pt}|, \\
-% |\setlength{\cellspacebottomlimit}{2pt}|.
+% Notice that another package, \textsf{booktabs}~\cite{BOOK}, also offers
+% excellent row height adjustment. However, regrettably, it doesn't handle the height
+% of vertical separators "|".
+% In order to achieve a similar vertical adjustment as \textsf{booktabs},
+% we configure the \textsf{cellspace} parameters as follows:\\
+% "\setlength{\cellspacetoplimit}{3pt}", \\
+% "\setlength{\cellspacebottomlimit}{2pt}".
%
-% We should also mention the \textsf{tabls} package by Donald Arneseau~\cite{TABLS}
+% Additionally, it's worth mentioning the \textsf{tabls} package by Donald Arneseau~\cite{TABLS}
% that makes a good adjustment of row heights as well, but it is incompatible
% with the \textsf{array} and \textsf{numprint} packages.
%
% \medskip
-% At last, it is also possible to make manual adjustments with the |\vstrut| command
-% from the \textsf{spacingtricks} package~\cite{SPA}, or |\gape| and |\Gape|
+% Finally, manual adjustments can also be achieved using the "\vstrut" command
+% from the \textsf{spacingtricks} package~\cite{SPA}, or by utilizing "\gape" and "\Gape"
% from the \textsf{makecell} package~\cite{MKCELL},
-% or |\bigstrut| from the \textsf{bigstrut} package~\cite{STRUT}.
+% as well as employing "\bigstrut" from the \textsf{bigstrut} package~\cite{STRUT}.
%
% \medskip
% \DescribeEnv{z\marg{width}}
-% The column type \texttt{z}\marg{width} enables to set the column width,
-% as \texttt{t}\marg{width},
-% but also activates the math mode and adjusts the row height,
-% as \texttt{x}.
+% The \texttt{z}\marg{width} column type allows you to define the column width,
+% just like \texttt{t}\marg{width},
+% and it also activates math mode and adjusts the row height,
+% similar to the \texttt{x} column type.
%
% \medskip
% \DescribeEnv{T} \DescribeEnv{Z}
-% The \textsf{tabularx} package by David Carlisle~\cite{TABX} provides
-% the \texttt{X} column definition whose width is calculated according
-% to the required width for the whole table, and with left alignment
-% as for \texttt{p}\marg{width}.
-% *\begin{tabularx}{8cm}{|c|X|X|}* adjusts the width of the \texttt{X} columns
-% for a total witdh of the table equals to 8\,cm. As a complement, we propose
-% the \texttt{T} declaration, doing the same thing but with horizontal centering
-% and \texttt{Z} which furthermore activates the mathematical mode and adjusts
-% line heights (as \texttt{x} or \texttt{z}). Here is an example with
-% *\begin{tabularx}{\linewidth}{|T|y|x|Z|T|}*.
+% The \textsf{tabularx} package by David Carlisle~\cite{TABX} introduces
+% the \texttt{X} column definition, which calculates its width based on
+% the required width for the entire table. It aligns text to the left
+% akin to \texttt{p}\marg{width}.
+% For instance, using "\begin{tabularx}{8cm}{|c|X|X|}" adjusts the width of the \texttt{X} columns
+% to achieve a total width of 8\,cm. To complement this, we offer
+% the \texttt{T} declaration, which performs a similar function but centers the content horizontally.
+% Additionally the \texttt{Z} declaration goes further by activating mathematical mode and adjusting
+% line heights, comparable to \texttt{x} or \texttt{z}). Here's an example with
+% "\begin{tabularx}{\linewidth}{|T|y|x|Z|T|}".
% \begin{center}
% \begin{tabularx}{\linewidth}{|T|y|x|Z|T|}
% \hline
@@ -267,44 +277,43 @@
% \displaystyle\lim_{\substack{x \to 1\\x>1}} \ln\left(\dfrac{x^2}{x-1}\right) &
% \dfrac{a}{b} &
% \dfrac{a}{b} + \displaystyle \int_{1}^{X} \frac{1}{t}\,\mathrm{d}t &
-% \makecell{a multiline \\ piece of text}\\
+% \makecell{a multi-line \\ piece of text}\\
% \hline
% \end{tabularx}
% \end{center}
-% To keep the perfect aligment of fraction bars in mathematical formulas,
-% cells are not vertically centered, however, to get a proper vertical positioning
-% in the last cell, we have used the powerfull |\makecell| command of
+% In order to maintain precise alignment of fraction bars within mathematical formulas,
+% cells are deliberately not vertically centered. Nevertheless, for achieving accurate vertical positioning
+% within the last cell, we have used the powerful "\makecell" command from
% the \textsf{makecell} package by Olga Lapko~\cite{MKCELL}:
-% |\makecell{a multiline \\ piece of text}|.
+% "\makecell{a multi-line \\ piece of text}".
%
-% \medskip
+% \bigskip
% \DescribeEnv{I} \DescribeEnv{V\marg{thickness}}
-% The column definition \texttt{I} is suggested in The \LaTeX\ Companion~\cite{COMP}
-% and enables to draw a thick vertical line (1\,pt thick) instead of the one obtained
-% with standard declaration *|*. To choose thickness, we propose further column
+% The column definition \texttt{I} is mentioned in The \LaTeX\ Companion~\cite{COMP}
+% and allows for drawing a thicker \emph{vertical} line (1\,pt thick) compared to the one achieved
+% with the standard declaration "|". For selecting the line thickness, we additionally provide the column
% definition \texttt{V}\marg{thickness}\footnote{The definition of \texttt{V}
-% would have been simplified by using an optional argument for \texttt{I}
-% but this way out is not working.}.
+% would have been simplified by utilizing an optional argument for \texttt{I}, but unfortunately, this approach doesn't function.}.
%
% \medskip
% \DescribeMacro{\whline}
-% Likewise, the |\whline| command, proposed in The \LaTeX\ Companion, enables to draw a
-% thick horizontal line (1\,pt thick) instead of the one obtained with |\hline|
-% and the \textsf{makecell} package provides further command |\Xhline|\marg{thickness}
-% enabling to choose the thickness of the horizontal rule.
+% Similarly, the "\whline" command, suggested in The \LaTeX\ Companion, allows for drawing a
+% thicker \emph{horizontal} line (1\,pt thick) compared to the line obtained with "\hline".
+% Moreover, the \textsf{makecell} package provides the command "\Xhline"\marg{thickness}
+% enabling the choice of horizontal rule thickness.
%
% \medskip
-% The introduction table has been typeset with a column declaration \texttt{I}
-% as separator between the two columns of text, and with |\whline| for the horizontal rules
-% at the begin and at the end of the table,
-% and |\Xhline{0.8pt}| for the one following the legend rows.
-% Formatting header lines has been done with |\thead| command from the \textsf{makecell}
-% package. For this command \textsf{arraycols} sets by default:\\
-% |\renewcommand\theadfont{\footnotesize\sffamily}| \\
-% (originally |\footnotesize| only, without |\sffamily|).
-% At last, according to a recommendation of the \textsf{array} package~\cite{ARRAY},
-% 1\,pt has been added to the normal height of every row of this table, with the command
-% |\setlength{\extrarowheight}{1pt}|\footnote{As mentioned
+% The introductory table has been typeset with a column declaration \texttt{I}
+% serving as a separator between the two text columns.
+% Horizontal rules at the beginning and end of the table are accomplished using "\whline",
+% while a "\Xhline{0.8pt}" rule is employed after the legend rows.
+% The formatting of header rows is achieved using the "\thead" command from the \textsf{makecell}
+% package. By default, \textsf{arraycols} sets:
+% "\renewcommand\theadfont{\footnotesize\sffamily}"
+% (initially |\footnotesize| only, without "\sffamily").
+% Lastly, following a recommendation of the \textsf{array} package~\cite{ARRAY},
+% an additional 1\,pt has been added to the standard height of each row within this table. This adjustment is implemented with the command
+% "\setlength{\extrarowheight}{1pt}"\footnote{As stated
% in the \textsf{array} package documentation:
% \og This is important for tables with horizontal lines because those
% lines normally touch the capital letters\fg.}.
@@ -314,7 +323,7 @@
% \section{Implementation}
% \begin{macrocode}
\RequirePackage{array}
-\RequirePackage[math]{cellspace}
+\RequirePackage[math,column=Q]{cellspace}
\RequirePackage{tabularx} % must be loaded after cellspace
\RequirePackage{makecell}
@@ -323,41 +332,41 @@
\newcolumntype{R}{>{$}r<{$}}
\newcolumntype{t}[1]{>{\centering\arraybackslash}m{#1}}
% \end{macrocode}
-% The \textsf{cellspace} package provides the \texttt{S} modifier enabling,
-% when placed before a column declaration, to adjust the height of the content of the cells
-% to avoid to touch horizontal rules. Spacing between the content and the rules
-% is controlled by the parameters
-% |\cellspacetoplimit| and |\cellspacebottomlimit|.
+% The \textsf{cellspace} package offers the \texttt{S} modifier (we used \texttt{Q} instead), which,
+% when placed before a column declaration, allows for the adjustment of cell content height
+% to prevent any overlap with horizontal rules. The spacing between the content and the rules
+% is governed by the parameters
+% "\cellspacetoplimit" and "\cellspacebottomlimit".
%
% \begin{macrocode}
-\newcolumntype{x}{>{$}Sc<{$}}
-\newcolumntype{y}{>{$}Sl<{$}}
+\newcolumntype{x}{>{$}Qc<{$}}
+\newcolumntype{y}{>{$}Ql<{$}}
\setlength{\cellspacetoplimit}{3pt}
\setlength{\cellspacebottomlimit}{2pt}
-\newcolumntype{z}[1]{>{$}S{>{\centering\arraybackslash}p{#1}}<{$}}
+\newcolumntype{z}[1]{>{$}Q{>{\centering\arraybackslash}p{#1}}<{$}}
% \end{macrocode}
-% For the \texttt{z} definition of column, we use \texttt{p} and not \texttt{m}
-% (which automatically centers) in order to keep a correct alignment for mathematical
-% expressions in the cells of a same row.
+% When defining the \texttt{z} column type, we employ the \texttt{p} column type instead of \texttt{m}
+% (which centers content automatically). This choice ensures proper alignment of mathematical
+% expressions within cells of the same row.
% \medskip
% \begin{macrocode}
\newcolumntype{T}{>{\centering\arraybackslash}X}
-\newcolumntype{Z}{>{$}ST<{$}}
+\newcolumntype{Z}{>{$}QT<{$}}
% \end{macrocode}
-% The \texttt{T} columns are not automatically centered. It would be possible to do it
-% with the command |\renewcommand{\tabularxcolumn}[1]{m{#1}}|
+% The \texttt{T} columns are not centered automatically. Although it's possible to achieve this
+% by using the command "\renewcommand{\tabularxcolumn}[1]{m{#1}}"
% (with \texttt{m} instead of default value \texttt{p}),
-% but unfortunately this has a global effect for all the declarations of columns based
-% on \texttt{X}, so \texttt{T} but also \texttt{Z}, and this would lead to disturb
-% alignment of mathematical expressions in the cells of a same row.
+% unfortunately, this approach has a global effect on all column declarations based
+% on \texttt{X}, including \texttt{T} and \texttt{Z}. As a result, it could disrupt the
+% alignment of mathematical expressions within cells of the same row.
% \begin{macrocode}
\newcolumntype{I}{!{\vrule width 1pt}}
\newcolumntype{V}[1]{!{\vrule width #1}}
\newlength\savedwidth
\newcommand{\whline}{%
- \noalign{\global\savedwidth\arrayrulewidth\global\arrayrulewidth 1pt}
- \hline
- \noalign{\global\arrayrulewidth\savedwidth}
+ \noalign{\global\savedwidth\arrayrulewidth\global\arrayrulewidth 1pt}
+ \hline
+ \noalign{\global\arrayrulewidth\savedwidth}
}
\renewcommand\theadfont{\footnotesize\sffamily}
% \end{macrocode}
@@ -378,7 +387,7 @@
% \bibitem{STRUT} \emph{The \textsf{multirow}, \textsf{bigstrut} and \textsf{bigdelim} packages},
% Piet van Oostrum, Øystein Bache, Jerry Leichter, CTAN, v2.4 2019/01/01.
% \bibitem{SPA} \emph{The \textsf{spacingtricks} package}, Antoine Missier,
-% CTAN, v1.0 2019/06/26.
+% CTAN, v1.3 2020/11/02.
% \bibitem{COMP} \emph{The \LaTeX\ Companion}. Frank Mittelbach, Michel Goossens,
% Johannes Braams, David Carlisle, Chris Rowley, 2nd edition, Pearson Education, 2004.
% \end{thebibliography}
diff --git a/Master/texmf-dist/source/latex/arraycols/arraycols.ins b/Master/texmf-dist/source/latex/arraycols/arraycols.ins
index 5c6a796f939..567b7a75400 100644
--- a/Master/texmf-dist/source/latex/arraycols/arraycols.ins
+++ b/Master/texmf-dist/source/latex/arraycols/arraycols.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+%% Copyright (C) 2019-2023 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -21,7 +21,7 @@
This is a generated file.
-Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+Copyright (C) 2019-2023 by Antoine Missier <antoine.missier@ac-toulouse.fr>
This file may be distributed and/or modified under the conditions of
the LaTeX Project Public License, either version 1.3 of this license
diff --git a/Master/texmf-dist/tex/latex/arraycols/arraycols.sty b/Master/texmf-dist/tex/latex/arraycols/arraycols.sty
index 400a13b4390..2a2a4a56d80 100644
--- a/Master/texmf-dist/tex/latex/arraycols/arraycols.sty
+++ b/Master/texmf-dist/tex/latex/arraycols/arraycols.sty
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2019-2020 by Antoine Missier <antoine.missier@ac-toulouse.fr>
+%% Copyright (C) 2019-2023 by Antoine Missier <antoine.missier@ac-toulouse.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -22,9 +22,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{arraycols}
- [2020/11/23 v1.1 .dtx arraycols file]
+ [2023/08/09 v1.3 .dtx arraycols file]
\RequirePackage{array}
-\RequirePackage[math]{cellspace}
+\RequirePackage[math,column=Q]{cellspace}
\RequirePackage{tabularx} % must be loaded after cellspace
\RequirePackage{makecell}
@@ -32,20 +32,20 @@
\newcolumntype{L}{>{$}l<{$}}
\newcolumntype{R}{>{$}r<{$}}
\newcolumntype{t}[1]{>{\centering\arraybackslash}m{#1}}
-\newcolumntype{x}{>{$}Sc<{$}}
-\newcolumntype{y}{>{$}Sl<{$}}
+\newcolumntype{x}{>{$}Qc<{$}}
+\newcolumntype{y}{>{$}Ql<{$}}
\setlength{\cellspacetoplimit}{3pt}
\setlength{\cellspacebottomlimit}{2pt}
-\newcolumntype{z}[1]{>{$}S{>{\centering\arraybackslash}p{#1}}<{$}}
+\newcolumntype{z}[1]{>{$}Q{>{\centering\arraybackslash}p{#1}}<{$}}
\newcolumntype{T}{>{\centering\arraybackslash}X}
-\newcolumntype{Z}{>{$}ST<{$}}
+\newcolumntype{Z}{>{$}QT<{$}}
\newcolumntype{I}{!{\vrule width 1pt}}
\newcolumntype{V}[1]{!{\vrule width #1}}
\newlength\savedwidth
\newcommand{\whline}{%
- \noalign{\global\savedwidth\arrayrulewidth\global\arrayrulewidth 1pt}
- \hline
- \noalign{\global\arrayrulewidth\savedwidth}
+ \noalign{\global\savedwidth\arrayrulewidth\global\arrayrulewidth 1pt}
+ \hline
+ \noalign{\global\arrayrulewidth\savedwidth}
}
\renewcommand\theadfont{\footnotesize\sffamily}