summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/tex/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-07-19 21:11:25 +0000
committerKarl Berry <karl@freefriends.org>2018-07-19 21:11:25 +0000
commitb6d8bcb0726858b9b9e77624a875e495f38f602d (patch)
tree15251e5308a40b3094f27bfde1351226731254e0 /Master/texmf-dist/tex/latex
parentb2755ff8357a47e3679b78fa53889d2bd533e369 (diff)
cellprops (19jul18)
git-svn-id: svn://tug.org/texlive/trunk@48227 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/tex/latex')
-rw-r--r--Master/texmf-dist/tex/latex/cellprops/cellprops.sty70
1 files changed, 44 insertions, 26 deletions
diff --git a/Master/texmf-dist/tex/latex/cellprops/cellprops.sty b/Master/texmf-dist/tex/latex/cellprops/cellprops.sty
index 398b773c696..14e1bf5a17d 100644
--- a/Master/texmf-dist/tex/latex/cellprops/cellprops.sty
+++ b/Master/texmf-dist/tex/latex/cellprops/cellprops.sty
@@ -6,7 +6,7 @@
%%
%% cellprops.dtx (with options: `package')
%%
-%% File: cellprops.dtx (C) Copyright 2016 RIVAUD Julien
+%% File: cellprops.dtx (C) Copyright 2018 RIVAUD Julien
%%
%% It may be distributed and/or modified under the conditions of the
%% General Public License (GPL), either version 3 of this
@@ -15,8 +15,8 @@
\RequirePackage{expl3}[2016/01/19]
\def\ExplFileName{cellprops}
\def\ExplFileDescription{CSS-like cell and table properties}
-\def\ExplFileDate{2018/06/14}
-\def\ExplFileVersion{1.3}
+\def\ExplFileDate{2018/07/16}
+\def\ExplFileVersion{1.4}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -24,7 +24,6 @@
\RequirePackage{xcolor}
\RequirePackage{mdwtab}
\cs_set_nopar:Npn \tab@pop #1 { \tl_set:Nx #1 { \tl_tail:N #1 } }
-
\cs_new:Nn \__cellprops_generic_setter:nnn {
\exp_not:N \tl_set:Nn
\exp_not:c { l__cellprops_property_value_#2_tl }
@@ -485,7 +484,6 @@
\__cellprops_orig_LTarray:w [#1]{#2}
\__cellprops_array_startcontent:
}
-
\cs_new_protected_nopar:Nn \__cellprops_update_color:Nn {
\__cellprops_get_property:nN {#2} \l_tmpa_tl
\exp_args:NV \tl_if_eq:NNF \l_tmpa_tl \c__cellprops_inherit_color_tl {
@@ -577,6 +575,8 @@
}
}
}
+\cs_set_eq:NN \firsthline \hline
+\cs_set_eq:NN \lasthline \hline
\colpush{tabular}
@@ -652,27 +652,6 @@
\cs_new_protected_nopar:Nn \__cellprops_begincell:n {
\__cellprops_begin_raw_cell:n {
- \__cellprops_seq_nthchild:Nn \l_tmpa_seq { \g__cellprops_row_int }
- \__cellprops_seq_nthchild:Nn \l_tmpb_seq { \g__cellprops_col_int }
- \seq_map_inline:Nn \l_tmpa_seq {
- \__cellprops_recall_properties:n {tr:nth-child(##1)}
- }
- \__cellprops_update_colors:
- \__cellprops_recall_properties:n {td}
- \__cellprops_recall_properties:n {tr~td}
- \seq_map_inline:Nn \l_tmpb_seq {
- \__cellprops_recall_properties:n {td:nth-child(##1)}
- }
- \seq_map_inline:Nn \l_tmpa_seq {
- \__cellprops_recall_properties:n {tr:nth-child(##1)~td}
- }
- \seq_map_inline:Nn \l_tmpa_seq {
- \seq_map_inline:Nn \l_tmpb_seq {
- \__cellprops_recall_properties:n {tr:nth-child(##1)~
- td:nth-child(####1)}
- }
- }
- \__cellprops_update_colors:
#1
\hbox_set:Nw \l__cellprops_cell_box
\str_case_x:nnF {\__cellprops_get_property:n {math-mode}} {
@@ -708,7 +687,25 @@
\global\@minipagefalse
\everypar{}
}
+ \__cellprops_seq_nthchild:Nn \l_tmpa_seq { \g__cellprops_row_int }
+ \__cellprops_seq_nthchild:Nn \l_tmpb_seq { \g__cellprops_col_int }
\__cellprops_recall_properties:n {td~p}
+ \seq_map_inline:Nn \l_tmpa_seq {
+ \__cellprops_recall_properties:n {tr:nth-child(##1)~p}
+ }
+ \seq_map_inline:Nn \l_tmpb_seq {
+ \__cellprops_recall_properties:n {td:nth-child(##1)~p}
+ }
+ \__cellprops_recall_properties:n {tr~td~p}
+ \seq_map_inline:Nn \l_tmpa_seq {
+ \__cellprops_recall_properties:n {tr:nth-child(##1)~td~p}
+ }
+ \seq_map_inline:Nn \l_tmpa_seq {
+ \seq_map_inline:Nn \l_tmpb_seq {
+ \__cellprops_recall_properties:n {tr:nth-child(##1)~
+ td:nth-child(####1)~p}
+ }
+ }
}
}
\cs_new_protected_nopar:Nn \__cellprops_end_par_cell:n {
@@ -723,6 +720,27 @@
\cs_new_protected_nopar:Nn \__cellprops_begin_raw_cell:n {
\group_begin:
+ \__cellprops_seq_nthchild:Nn \l_tmpa_seq { \g__cellprops_row_int }
+ \__cellprops_seq_nthchild:Nn \l_tmpb_seq { \g__cellprops_col_int }
+ \seq_map_inline:Nn \l_tmpa_seq {
+ \__cellprops_recall_properties:n {tr:nth-child(##1)}
+ }
+ \__cellprops_update_colors:
+ \__cellprops_recall_properties:n {td}
+ \__cellprops_recall_properties:n {tr~td}
+ \seq_map_inline:Nn \l_tmpb_seq {
+ \__cellprops_recall_properties:n {td:nth-child(##1)}
+ }
+ \seq_map_inline:Nn \l_tmpa_seq {
+ \__cellprops_recall_properties:n {tr:nth-child(##1)~td}
+ }
+ \seq_map_inline:Nn \l_tmpa_seq {
+ \seq_map_inline:Nn \l_tmpb_seq {
+ \__cellprops_recall_properties:n {tr:nth-child(##1)~
+ td:nth-child(####1)}
+ }
+ }
+ \__cellprops_update_colors:
% Additional init code
#1
% Install the cell color