summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2021-09-10 21:04:29 +0000
committerKarl Berry <karl@freefriends.org>2021-09-10 21:04:29 +0000
commitb582e1d5e47629b72df08ae41d3a31d619e29806 (patch)
treebb6423e527a49f98b4aba63926c5840d4129f037
parent004f3b9a898da969f640cecab1346df8c6118d78 (diff)
csvsimple (10sep21)
git-svn-id: svn://tug.org/texlive/trunk@60470 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/CHANGES.md20
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/README.md2
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty6
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdfbin75627 -> 75627 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex2
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdfbin1040357 -> 1069621 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex128
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdfbin810809 -> 810667 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex2
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdfbin309329 -> 309079 bytes
-rw-r--r--Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex2
-rw-r--r--Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty145
-rw-r--r--Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty4
-rw-r--r--Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty4
14 files changed, 233 insertions, 82 deletions
diff --git a/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md b/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md
index 391db06d65d..db4d888f5ba 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md
+++ b/Master/texmf-dist/doc/latex/csvsimple/CHANGES.md
@@ -16,6 +16,26 @@ and this project adheres to
### Security
+
+## [2.2.0] - 2021-09-09
+
+### Added
+- Configurable usage of tabular-like environments (issue #12)
+- Option `table centered`
+- Option `generic table`
+- Option `generic collected table`
+- Option `generic table options`
+
+### Changed
+- The implementation of all tabular-like environments uses the new
+ generic environments now internally. Should be unnoticeable for a user.
+
+### Fixed
+- documentation typo correction and small improvents (issue #15)
+- Option `long tabularray`
+
+
+
## [2.1.0] - 2021-07-06
### Added
diff --git a/Master/texmf-dist/doc/latex/csvsimple/README.md b/Master/texmf-dist/doc/latex/csvsimple/README.md
index 37316ec36e9..0aa089a1954 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/README.md
+++ b/Master/texmf-dist/doc/latex/csvsimple/README.md
@@ -1,4 +1,4 @@
-# The LaTeX package csvsimple - version 2.1.0 (2021/07/06)
+# The LaTeX package csvsimple - version 2.2.0 (2021/09/09)
> Copyright (c) 2008-2021 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty
index c4b2c0bb40e..dc0b054c61c 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-doc.sty
@@ -1,5 +1,5 @@
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 2.1.0 (2021/07/06)
+%% The LaTeX package csvsimple - version 2.2.0 (2021/09/09)
%% csvsimple-doc.sty: style file for the documentation
%%
%% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
%%
%% This work consists of all files listed in README.md
%%
-\def\version{2.1.0}%
-\def\datum{2021/07/06}%
+\def\version{2.2.0}%
+\def\datum{2021/09/09}%
\IfFileExists{csvsimple-doc.cfg}{\input{csvsimple-doc.cfg}}{}\providecommand\csvpkgprefix{}
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf
index 62a47111b60..f9fe37f1423 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex
index e6466807a3f..9cfce5bf2f4 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-example.tex
@@ -1,4 +1,4 @@
-%% The LaTeX package csvsimple - version 2.1.0 (2021/07/06)
+%% The LaTeX package csvsimple - version 2.2.0 (2021/09/09)
%% csvsimple-example.tex: an example for csvsimple
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf
index eec13b49b40..9cfe37716d4 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex
index fc8d82b903d..ec9dd0b47fe 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-l3.tex
@@ -1,6 +1,6 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 2.1.0 (2021/07/06)
+%% The LaTeX package csvsimple - version 2.2.0 (2021/09/09)
%% csvsimple.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -1379,12 +1379,15 @@ The following example displays the last three line numbers:
\clearpage
\subsection{Table Support}\label{subsec:tabsupport}%--------%[[
+\subsubsection{Predefined Tables}\label{subsubsec:table_predef}
+
\begin{docCsvKey}{tabular}{=\meta{table format}}{style, no default}
Surrounds the CSV processing with |\begin{tabular}|\marg{table format}
at begin and with |\end{tabular}| at end.
Additionally, the commands defined by the key values of
\refKey{/csvsim/before table}, \refKey{/csvsim/table head}, \refKey{/csvsim/table foot},
and \refKey{/csvsim/after table} are executed at the appropriate places.
+ \refKey{/csvsim/late after line} is set to \cs{}\cs{}.
\end{docCsvKey}
@@ -1419,40 +1422,128 @@ The following example displays the last three line numbers:
\end{docCsvKey}
+\begin{docCsvKey}[][doc new=2021-07-23]{long tabularray}{=\meta{table format}}{style, no default}
+ Like \refKey{/csvsim/tabularray} but using the |longtblr| environment
+ from the package \ctanpkg{tabularray} (not loaded automatically).
+\end{docCsvKey}
+
+
\begin{docCsvKey}[][doc new=2021-07-06]{centered tabularray}{=\meta{table format}}{style, no default}
Like \refKey{/csvsim/tabularray} but inside an additional |center| environment.
\end{docCsvKey}
\begin{docCsvKey}{no table}{}{style, no value}
- Deactivates |tabular|, |longtable|, and |tabbing|.
+ Deactivates |tabular|-like environments activated by
+ \refKey{/csvsim/tabular}, \refKey{/csvsim/longtable}, etc.
+ Note that not all settings of \refKey{/csvsim/tabularray} are reverted.
\end{docCsvKey}
+\clearpage
+\subsubsection{Additional Options for Tables}\label{subsubsec:table_options}
+
\begin{docCsvKey}{before table}{=\meta{code}}{no default, initially empty}
- Sets the \meta{code} to be executed before |\begin{tabular}| or before |\begin{longtable}|
- or before |\begin{tabbing}|, respectively.
+ Sets the \meta{code} to be executed before the begin of |tabular|-like environments,
+ i.e. immediately before |\begin{tabular}|, etc.
\end{docCsvKey}
\begin{docCsvKey}{table head}{=\meta{code}}{no default, initially empty}
- Sets the \meta{code} to be executed after |\begin{tabular}| or after |\begin{longtable}|
- or after |\begin{tabbing}|, respectively.
+ Sets the \meta{code} to be executed after the begin of |tabular|-like environments,
+ i.e. immediately after |\begin{tabular}|, etc.
\end{docCsvKey}
\begin{docCsvKey}{table foot}{=\meta{code}}{no default, initially empty}
- Sets the \meta{code} to be executed before |\end{tabular}| or before |\end{longtable}|
- or before |\end{tabbing}|, respectively.
+ Sets the \meta{code} to be executed before the end of |tabular|-like environments,
+ i.e. immediately before |\end{tabular}|, etc.
\end{docCsvKey}
\begin{docCsvKey}{after table}{=\meta{code}}{no default, initially empty}
- Sets the \meta{code} to be executed after |\end{tabular}| or after |\end{longtable}|
- or after |\end{tabbing}|, respectively.
+ Sets the \meta{code} to be executed after the end of |tabular|-like environments,
+ i.e. immediately after |\end{tabular}|, etc.
+\end{docCsvKey}
+
+
+\begin{docCsvKey}[][doc new=2021-09-09]{table centered}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
+ If |true|, the table is put inside an additional |center| environment.
+ This environment begins before \refKey{/csvsim/before table}
+ and ends after \refKey{/csvsim/after table}. The predefined |tabular|-like environments
+ from Section~\fullref{subsubsec:table_predef} use this option internally,
+ i.e. \mbox{|centered tabular={ccc}|} is identical to
+ \mbox{|tabular={ccc}, table centered|}.
\end{docCsvKey}
+
+\clearpage
+\subsubsection{Generic Tables}\label{subsubsec:table_generic}
+In Section~\fullref{subsubsec:table_predef}, several |tabular|-like environments
+are described with predefined keys. The following keys allow to use further
+|tabular|-like environments with configurable names and options.
+
+
+\begin{docCsvKey}[][doc new=2021-09-09]{generic table}{=\meta{name}}{no default, initially empty}
+ Surrounds the CSV processing with \cs{begin}\marg{name}
+ at begin and with \cs{end}\marg{name} at end.
+ Additionally, the commands defined by the key values of
+ \refKey{/csvsim/before table}, \refKey{/csvsim/table head}, \refKey{/csvsim/table foot},
+ and \refKey{/csvsim/after table} are executed at the appropriate places.
+ \refKey{/csvsim/late after line} is set to \cs{}\cs{}.\par
+ If the environment \meta{name} takes options, these have to be set using
+ \refKey{/csvsim/generic table options}.
+
+\begin{dispListing}
+ % The `tabular` environment would be used like the following example
+ ...
+ generic table = tabular,
+ generic table options = {{ccllrr}},
+ ...
+\end{dispListing}
+\end{docCsvKey}
+
+
+\begin{docCsvKey}[][doc new=2021-09-09]{generic collected table}{=\meta{name}}{no default, initially empty}
+ Like \refKey{/csvsim/generic table} but for environments which need
+ collected content, e.g. |tblr| from package \ctanpkg{tabularray}, see \Fullref{sec:datacollection}.
+ Note that \refKey{/csvsim/after reading} is set to use the collected
+ data immediately.
+
+\begin{dispListing}
+ % The `tblr` environment from package `tabularray` would be used
+ % like the following example
+ ...
+ generic collected table = tblr,
+ generic table options = {{rowsep=1mm, colsep=5mm}},
+ ...
+\end{dispListing}
+\end{docCsvKey}
+
+
+\begin{docCsvKey}[][doc new=2021-09-09]{generic table options}{=\marg{code}}{no default, initially empty}
+ Places \meta{code} immediately after \cs{begin}\marg{name} set up with
+ \refKey{/csvsim/generic table} or \refKey{/csvsim/generic collected table}.
+ \meta{code} may contain any parameters the environment \meta{name} needs to have.
+ \textbf{\color{red!50!black}You are strongly advised to use an extra pair of
+ curly brackets \marg{code} around \meta{code}}, because the outer pair of braces is
+ removed during option processing, see examples above.
+\begin{dispListing}
+ % Environment without parameters:
+ generic table options =,
+ % Environment with a mandatory parameter:
+ generic table options = {{parameter}},
+ % Environment with an optional and a mandatory parameter:
+ generic table options = {[optional]{mandatory}},
+ % Environment with two mandatory parameters:
+ generic table options = {{mandatory 1}{mandatory 2}},
+\end{dispListing}
+
+\end{docCsvKey}
+
+
\clearpage
+\subsubsection{General Survey Tables}\label{subsubsec:table_survey}
The following |auto| options are the counterparts for the respective quick
overview commands like \refCom{csvautotabular}. They are listed for
@@ -1977,39 +2068,39 @@ Sets the collection macro to an alternative for \refCom{csvdatacollection}.
\end{docCsvKey}
-\begin{docCommand}[doc new=2021-07-26]{csvdatacollection}{}
+\begin{docCommand}[doc new=2021-07-06]{csvdatacollection}{}
Macro which contains the collected data of a CSV file processed with
\refKey{/csvsim/collect data}. This macro name can be changed by
settiing \refKey{/csvsim/data collection}.
\end{docCommand}
-\begin{docCommand}[doc new=2021-07-26]{csvexpval}{\meta{macro}}
+\begin{docCommand}[doc new=2021-07-06]{csvexpval}{\meta{macro}}
Recovers the content of the given \meta{macro} and prevents further
expansion. This is a wrapper for \docAuxCommand*{exp_not:V}.
Alternatively, |\expandonce| from \ctanpkg{etoolbox} could be used.
\end{docCommand}
-\begin{docCommand}[doc new=2021-07-26]{csvexpnot}{\meta{macro}}
+\begin{docCommand}[doc new=2021-07-06]{csvexpnot}{\meta{macro}}
Prevents the expansion of the given \meta{macro}. This is a wrapper
for \docAuxCommand*{exp_not:N}.
Alternatively, |\noexpand| could be used.
\end{docCommand}
-\begin{docCommand}[doc new=2021-07-26]{csvcollectn}{\marg{code}}
+\begin{docCommand}[doc new=2021-07-06]{csvcollectn}{\marg{code}}
Appends the given \meta{code} to \refCom{csvdatacollection}.\\
This corresponds to \docAuxCommand*{tl_gput_right:Nn}.
\end{docCommand}
-\begin{docCommand}[doc new=2021-07-26]{csvcollectx}{\marg{code}}
+\begin{docCommand}[doc new=2021-07-06]{csvcollectx}{\marg{code}}
Appends the expansion of the given \meta{code} to \refCom{csvdatacollection}.\\
This corresponds to \docAuxCommand*{tl_gput_right:Nx}.
\end{docCommand}
-\begin{docCommand}[doc new=2021-07-26]{csvcollectV}{\meta{macro}}
+\begin{docCommand}[doc new=2021-07-06]{csvcollectV}{\meta{macro}}
Appends the content of the given \meta{macro} to \refCom{csvdatacollection}.\\
This corresponds to \docAuxCommand*{tl_gput_right:NV}.
\end{docCommand}
@@ -2537,7 +2628,7 @@ The following examples uses |data.csv| from \Fullref{sec:examgrapghpres}.
\csvexpval\land
& \csvexpval\group
& \csvexpval\amount
- & \csvexpnot\tablenum[exponent-mode=scientific, round-precision=3,
+ & \tablenum[exponent-mode=scientific, round-precision=3,
round-mode=places, table-format=1.3e1]{\fpeval{pi*\amount}}
}
\end{dispExample}
@@ -2555,6 +2646,9 @@ Note in the example above that
\refCom{csvexpval}.
\item |\ifcsvstrcmp| and |\fpeval| are \emph{expandable} and therefore the
results of these commands are \emph{collected}.
+ \item |\tablenum| from \ctanpkg{siunitx} is a robust command and therefore
+ needs no protection. If you are not sure, if a command is robust or not, it
+ does not hurt add the prefix \refCom{csvexpnot}, i.e. use |\csvexpnot\tablenum|.
\end{itemize}
\end{itemize}
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf
index d732b8d80c5..09ac043fd88 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex
index d38d3de3a77..4db0f7f875f 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple-legacy.tex
@@ -1,6 +1,6 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 2.1.0 (2021/07/06)
+%% The LaTeX package csvsimple - version 2.2.0 (2021/09/09)
%% csvsimple.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf b/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf
index 46cfca63250..fd2185cb6ff 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex b/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex
index 448e6698b08..968c43bc0cf 100644
--- a/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex
+++ b/Master/texmf-dist/doc/latex/csvsimple/csvsimple.tex
@@ -1,6 +1,6 @@
% \LaTeX-Main\
% !TeX encoding=UTF-8
-%% The LaTeX package csvsimple - version 2.1.0 (2021/07/06)
+%% The LaTeX package csvsimple - version 2.2.0 (2021/09/09)
%% csvsimple.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
diff --git a/Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty b/Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty
index cfaf0b98194..1d8e036ce7a 100644
--- a/Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty
+++ b/Master/texmf-dist/tex/latex/csvsimple/csvsimple-l3.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package csvsimple - version 2.1.0 (2021/07/06)
+%% The LaTeX package csvsimple - version 2.2.0 (2021/09/09)
%% csvsimple-l3.sty: Simple LaTeX CSV file processing (LaTeX3)
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README.md
%%
-\ProvidesExplPackage{csvsimple-l3}{2021/07/06}{2.1.0}
+\ProvidesExplPackage{csvsimple-l3}{2021/09/09}{2.2.0}
{LaTeX3 CSV file processing}
@@ -79,15 +79,18 @@
\tl_const:Nn \c__csvsim_par_tl { \par }
+
\tl_new:N \g__csvsim_after_table_tl
\tl_new:N \g__csvsim_before_table_tl
+\tl_new:N \g__csvsim_begin_table_center_tl
\tl_new:N \g__csvsim_body_tl
\tl_new:N \g__csvsim_catcode_tl
-
\tl_new:N \g__csvsim_collect_tl
\tl_new:N \g__csvsim_columnnames_tl
\tl_new:N \g__csvsim_data_collection_tl
+\tl_new:N \g__csvsim_end_table_center_tl
\tl_new:N \g__csvsim_filter_tl
+\tl_new:N \g__csvsim_generic_table_options_tl
\tl_new:N \g__csvsim_headname_prefix_tl
\tl_new:N \g__csvsim_hook_after_filter_tl
\tl_new:N \g__csvsim_hook_after_first_line_tl
@@ -1038,79 +1041,65 @@
\keys_define:nn { csvsim }
{
- before~table .tl_gset:N = \g__csvsim_before_table_tl,
- after~table .tl_gset:N = \g__csvsim_after_table_tl,
- table~head .tl_gset:N = \g__csvsim_table_head_tl,
- table~foot .tl_gset:N = \g__csvsim_table_foot_tl,
- _table_ .code:n = \__csvsim_key_table:nn #1,
- no~table .meta:n = { _table_={}{} },
- tabular .meta:n =
- {
- _table_ = { \g__csvsim_before_table_tl\begin{tabular}{#1}\g__csvsim_table_head_tl }
- { \g__csvsim_table_foot_tl\end{tabular}\g__csvsim_after_table_tl },
- late~after~line = \\
+ before~table .tl_gset:N = \g__csvsim_before_table_tl,
+ after~table .tl_gset:N = \g__csvsim_after_table_tl,
+ table~head .tl_gset:N = \g__csvsim_table_head_tl,
+ table~foot .tl_gset:N = \g__csvsim_table_foot_tl,
+ generic~table~options .tl_gset:N = \g__csvsim_generic_table_options_tl,
+ table~centered .choice:,
+ table~centered .default:n = true,
+ table~centered/true .code:n =
+ {
+ \tl_gset:Nn \g__csvsim_begin_table_center_tl {\begin{center}}
+ \tl_gset:Nn \g__csvsim_end_table_center_tl {\end{center}}
},
- centered~tabular .meta:n =
+ table~centered/false .code:n =
{
- _table_ = { \begin{center}\g__csvsim_before_table_tl\begin{tabular}{#1}\g__csvsim_table_head_tl }
- { \g__csvsim_table_foot_tl\end{tabular}\g__csvsim_after_table_tl\end{center} },
- late~after~line = \\
+ \tl_gclear:N \g__csvsim_begin_table_center_tl
+ \tl_gclear:N \g__csvsim_end_table_center_tl
},
- longtable .meta:n =
+ _table_ .code:n = \__csvsim_key_table:nn #1,
+ no~table .meta:n =
{
- _table_ = { \g__csvsim_before_table_tl\begin{longtable}{#1}\g__csvsim_table_head_tl }
- { \g__csvsim_table_foot_tl\end{longtable}\g__csvsim_after_table_tl },
- late~after~line = \\
- },
- tabbing .meta:n =
- {
- _table_ = { \g__csvsim_before_table_tl\begin{tabbing}\g__csvsim_table_head_tl }
- { \g__csvsim_table_foot_tl\end{tabbing}\g__csvsim_after_table_tl },
- late~after~line = \\,
- late~after~last~line =
- },
- centered~tabbing .meta:n =
- {
- _table_ = { \begin{center}\g__csvsim_before_table_tl\begin{tabbing}\g__csvsim_table_head_tl }
- { \g__csvsim_table_foot_tl\end{tabbing}\g__csvsim_after_table_tl\end{center} },
- late~after~line = \\,
- late~after~last~line =
+ _table_ = {}{},
+ generic~table~options = ,
+ table~centered = false,
},
- tabularray .meta:n =
+ generic~table .meta:n =
{
- collect~data,
_table_ =
{
- \tl_gput_right:NV \g__csvsim_collect_tl \g__csvsim_before_table_tl
- \tl_gput_right:Nn \g__csvsim_collect_tl { \begin{tblr}{#1} }
- \tl_gput_right:NV \g__csvsim_collect_tl \g__csvsim_table_head_tl
+ \g__csvsim_begin_table_center_tl
+ \g__csvsim_before_table_tl
+ \tl_gset:Nn \g_tmpa_tl {\begin{#1}}
+ \tl_gput_right:NV \g_tmpa_tl \g__csvsim_generic_table_options_tl
+ \g_tmpa_tl
+ \g__csvsim_table_head_tl
}
{
- \tl_gput_right:NV \g__csvsim_collect_tl \g__csvsim_table_foot_tl
- \tl_gput_right:Nn \g__csvsim_collect_tl { \end{tblr} }
- \tl_gput_right:NV \g__csvsim_collect_tl \g__csvsim_after_table_tl
- },
- late~after~line = \\,
- after~reading =
- {
- \tl_use:N \g__csvsim_collect_tl
+ \g__csvsim_table_foot_tl
+ \end{#1}
+ \g__csvsim_after_table_tl
+ \g__csvsim_end_table_center_tl
},
+ late~after~line = \\
},
- centered~tabularray .meta:n =
+ generic~collected~table .meta:n =
{
collect~data,
_table_ =
{
- \tl_gput_right:Nn \g__csvsim_collect_tl { \begin{center} }
+ \tl_gput_right:NV \g__csvsim_collect_tl \g__csvsim_begin_table_center_tl
\tl_gput_right:NV \g__csvsim_collect_tl \g__csvsim_before_table_tl
- \tl_gput_right:Nn \g__csvsim_collect_tl { \begin{tblr}{#1} }
+ \tl_gput_right:Nn \g__csvsim_collect_tl { \begin{#1} }
+ \tl_gput_right:NV \g__csvsim_collect_tl \g__csvsim_generic_table_options_tl
\tl_gput_right:NV \g__csvsim_collect_tl \g__csvsim_table_head_tl
}
{
\tl_gput_right:NV \g__csvsim_collect_tl \g__csvsim_table_foot_tl
- \tl_gput_right:Nn \g__csvsim_collect_tl { \end{tblr} }
+ \tl_gput_right:Nn \g__csvsim_collect_tl { \end{#1} }
\tl_gput_right:NV \g__csvsim_collect_tl \g__csvsim_after_table_tl
- \tl_gput_right:Nn \g__csvsim_collect_tl { \end{center} }
+ \tl_gput_right:NV \g__csvsim_collect_tl \g__csvsim_end_table_center_tl
},
late~after~line = \\,
after~reading =
@@ -1118,6 +1107,54 @@
\tl_use:N \g__csvsim_collect_tl
},
},
+ }
+
+
+\keys_define:nn { csvsim }
+ {
+ tabular .meta:n =
+ {
+ generic~table = tabular,
+ generic~table~options = {{#1}},
+ },
+ centered~tabular .meta:n =
+ {
+ tabular = {#1}, table~centered
+ },
+ longtable .meta:n =
+ {
+ generic~table = longtable,
+ generic~table~options = {{#1}},
+ },
+ tabbing .meta:n =
+ {
+ generic~table = tabbing,
+ generic~table~options =,
+ late~after~last~line =
+ },
+ centered tabbing .meta:n =
+ {
+ tabbing, table~centered
+ },
+ tabularray .meta:n =
+ {
+ generic~collected~table = tblr,
+ generic~table~options = {{#1}},
+ },
+ centered~tabularray .meta:n =
+ {
+ tabularray = {#1}, table~centered
+ },
+ long~tabularray .meta:n =
+ {
+ generic~collected~table = longtblr,
+ generic~table~options = {{#1}},
+ },
+ }
+
+
+\keys_define:nn { csvsim }
+ {
_autotab_ .meta:n =
{
file = #1,
diff --git a/Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty b/Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty
index 90be1ca2059..b25fc3b5165 100644
--- a/Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty
+++ b/Master/texmf-dist/tex/latex/csvsimple/csvsimple-legacy.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package csvsimple - version 2.1.0 (2021/07/06)
+%% The LaTeX package csvsimple - version 2.2.0 (2021/09/09)
%% csvsimple-legacy.sty: Simple LaTeX CSV file processing (LaTeX2e)
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README.md
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{csvsimple-legacy}[2021/07/06 version 2.1.0 LaTeX2e CSV file processing]
+\ProvidesPackage{csvsimple-legacy}[2021/09/09 version 2.2.0 LaTeX2e CSV file processing]
%---- check package
diff --git a/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty b/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty
index f4c8a1d503b..55a6b32498d 100644
--- a/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty
+++ b/Master/texmf-dist/tex/latex/csvsimple/csvsimple.sty
@@ -1,4 +1,4 @@
-%% The LaTeX package csvsimple - version 2.1.0 (2021/07/06)
+%% The LaTeX package csvsimple - version 2.2.0 (2021/09/09)
%% csvsimple.sty: Simple LaTeX CSV file processing
%%
%% -------------------------------------------------------------------------------------------
@@ -19,7 +19,7 @@
%%
\RequirePackage{l3keys2e}
-\ProvidesExplPackage{csvsimple}{2021/07/06}{2.1.0}
+\ProvidesExplPackage{csvsimple}{2021/09/09}{2.2.0}
{LaTeX CSV file processing}
\cs_if_exist:NT \c__csvsim_package_expl_bool