diff options
Diffstat (limited to 'Master/texmf-dist/tex/latex')
3 files changed, 95 insertions, 58 deletions
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 |