From d250c96cb182d3df2332b196e3a5b040e9fd50ad Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Mon, 11 Jun 2018 22:21:12 +0000 Subject: cellprops (11jun18) git-svn-id: svn://tug.org/texlive/trunk@47990 c570f23f-e606-0410-a88d-b1316a301751 --- .../source/latex/cellprops/cellprops.dtx | 866 +++++++++++++++++++++ .../source/latex/cellprops/cellprops.ins | 24 + 2 files changed, 890 insertions(+) create mode 100644 Master/texmf-dist/source/latex/cellprops/cellprops.dtx create mode 100644 Master/texmf-dist/source/latex/cellprops/cellprops.ins (limited to 'Master/texmf-dist/source/latex') diff --git a/Master/texmf-dist/source/latex/cellprops/cellprops.dtx b/Master/texmf-dist/source/latex/cellprops/cellprops.dtx new file mode 100644 index 00000000000..6786f616db4 --- /dev/null +++ b/Master/texmf-dist/source/latex/cellprops/cellprops.dtx @@ -0,0 +1,866 @@ +% \iffalse meta-comment +% vim: tw=80 spl=en +% +%% File: cellprops.dtx (C) Copyright 2016 RIVAUD Julien +%% +%% It may be distributed and/or modified under the conditions of the +%% General Public License (GPL), either version 3 of this +%% license or (at your option) any later version. +% +%<*driver|package> +% The version of expl3 required is tested as early as possible, as +% some really old versions do not define \ProvidesExplPackage. +\NeedsTeXFormat{LaTeX2e}[1995/12/01] +\RequirePackage{expl3}[2016/01/19] +\def\ExplFileName{cellprops} +\def\ExplFileDescription{CSS-like cell and table properties} +\def\ExplFileDate{2016/04/05} +\def\ExplFileVersion{1.0} +% +%<*driver> +\documentclass[full]{l3doc} +\usepackage{cellprops} +\begin{document} + \DocInput{\jobname.dtx} +\end{document} +% +% \fi +% +% \title{^^A +% The \textsf{\ExplFileName} package\\ \ExplFileDescription^^A +% \thanks{This file describes v\ExplFileVersion, +% last revised \ExplFileDate.}^^A +% } +% +% \author{^^A +% Julien ``\_FrnchFrgg\_'' \textsc{Rivaud}\thanks +% {^^A +% E-mail: +% \href{mailto:frnchfrgg@free.fr} +% {frnchfrgg@free.fr}^^A +% }^^A +% } +% +% \date{Released \ExplFileDate} +% +% \maketitle +% +% \begin{documentation} +% +% +% +% \section{\pkg{\ExplFileName} documentation} +% +% This package reworks the internals of \env{tabular}, \env{array}, and similar +% constructs, and adds a \cs{cellprops} command accepting CSS-like selectors and +% properties. +% +% It depends on \pkg{mdwtab}, \pkg{xcolor} and of course \pkg{expl3} and +% \pkg{xparse}. +% +% \subsection{Example} +% +% The code: +% +%\begin{verbatim} +% \[ +% \cellprops{ +% td { padding: 1ex; } +% td:nth-child(4) { color: red; } +% tr:nth-child(2) { color: red; } +% tr:nth-child(1) td:nth-child(4) { color: inherit; } +% td:nth-child(even) { background-color: black!5!white; } +% tr:nth-child(2n+1) { background-color: yellow!30!white; } +% tr:nth-child(odd) td:nth-child(even) { +% background-color: black!20!yellow!20!white; +% } +% } +% \begin{array}{Tlccc} +% \hline +% This is text & A_2 & A_3 & A_4 \\ +% \hline +% B1 & This is maths & B_3 & \\ +% C1 & C_2 & X & Y \\ +% D1 & D_2 & DX & v \\ +% E & F & \int_a^b f(t) dt & v \\ +% \hline +% \end{array}\] +%\end{verbatim} +% +% produces: +% +% \[ +% \cellprops{ +% td { padding: 1ex; } +% td:nth-child(4) { color: red; } +% tr:nth-child(2) { color: red; } +% tr:nth-child(1) td:nth-child(4) { color: inherit; } +% td:nth-child(even) { background-color: black!5!white; } +% tr:nth-child(2n+1) { background-color: yellow!30!white; } +% tr:nth-child(odd) td:nth-child(even) { +% background-color: black!20!yellow!20!white; +% } +% } +% \begin{array}{Tlccc} +% \hline +% This is text & A_2 & A_3 & A_4 \\ +% \hline +% B1 & This is maths & B_3 & \\ +% C1 & C_2 & X & Y \\ +% D1 & D_2 & DX & v \\ +% E & F & \int_a^b f(t) dt & v \\ +% \hline +% \end{array}\] +% +% +% +% +% \subsection{Usage guide} +% +% \def\OR{\string| } +% +% \def\bracket#1{\<#1>:} +% \def\<#1>{{\normalfont<\textsl{#1}>}} +% \begin{description}[format=\bracket, +% wide,leftmargin=9em,labelwidth=!,labelsep=0pt, +% ] +% \item[usage] "'\cellprops{'" [ \ "'{'" \ "'}'" ]* "'}'" +% \item[selectors] \ ["," \ ] +% \item[selector] [\ "' '"] \ +% \item[element1] +% "'table'" \OR +% "'tr'"[\] ["' '" \] \OR +% \ +% \item[element2] "'td'"[\] +% \item[pseudo-class] "':nth-child('"\"')" +% \item[nth] \ \OR "'odd'" \OR "'even'" \OR \"'n+'"\ +% \item[properties] [ \ "';'" ]* +% \item[property] +% "'padding: '" \ [ "' '" \ ]* \OR \\ +% "'padding-top: '" \ \OR \\ +% "'padding-left: '" \ \OR \\ +% "'padding-bottom: '" \ \OR \\ +% "'padding-right: '" \ \OR \\ +% "'min-height: '" \ \OR \\ +% "'min-depth: '" \ \OR \\ +% "'min-width: '" \ \OR \\ +% "'text-align: '" ( "'left'" \OR "'right'" \OR "'center'" ) \OR \\ +% "'math-mode: '" ( "'text'" \OR "'math'" \OR "'auto'" ) \OR \\ +% "'color: '" ( \ \OR "'inherit'" ) \OR \\ +% "'background-color: '" ( \ \OR "'transparent'" ) \\ +% \end{description} +% +% Most of these properties are straight-forward. Some explanations: +% +% Here are the supported column types: +% \begin{itemize} +% \item "n": The most basic cell type, hbox, honoring all properties. +% \item "l", "c", and "r": Same as "n" but with forced "text-align". +% \item "M"\: Same as \ but enforces "math-mode: math". The +% net effect is that "Mc" will create a centered column whose contents are +% in non-display math mode. +% \item "T"\: Same as \ but enforces "math-mode: text". +% \item "p{"\"}", "m"\ and "b"\: parbox cell with the +% corresponding vertical alignment (\cs{vtop}, \cs{vcenter} or \cs{vbox}). +% \item "*{"\"}{"\"}": same as in \pkg{array} or +% \pkg{mdwtab}. +% \item You can try to use constructs of \pkg{array} or \pkg{mdwtab}, but they +% might alter the function of \pkg{cellprops}. Most should be fine though. +% \end{itemize} +% The intended usage is to use "n"-type columns and set the properties with CSS, +% but \LaTeX-like columns in the preamble are often less verbose. +% +% Details for some properties: +% +% \begin{itemize} +% \item "math-mode: auto" means that the cell will be in math mode in +% environments \env{array}, \env{matrix}, \dots, and in text mode in +% environments like \env{tabular}, \dots +% \item "background-color" is only painted on the cell, and "transparent" +% actually means "inherit" except that if all values encountered are +% "inherit"/"transparent" no background is painted at all. That means that +% (currently) you cannot paint a row in some color and rely on +% transparency to have it bleed through a cell background. +% \item There are no columns in the CSS object model so you have to use +% "td:nth-child()" to select a column. Currently, cells spanning several +% columns actually increase the child count by the number of column they +% span, so that nth-child can still be used to select columns. +% This is not consistent with the CSS specification. +% \item Currently, only "2n", "2n+1", "3n", "3n+1" and "3n+2" are supported, +% without any space, as arguments of "nth-child()" other than a single +% number, "odd" or "even" without any space. Supporting others is trivial, +% but increase the running time. In a near-future release, I intend to +% detect which multiples are actually used and automatically support +% those. +% \end{itemize} +% +% \subsection{TODO} +% +% Add "border" properties. Add automatic support of ":nth-child(an+b)" for +% $"a"\ge 4$. +% +% \end{documentation} +% +% \begin{implementation} +% +% \section{\pkg{\ExplFileName} implementation} +% +% \begin{macrocode} +%<*package> +% \end{macrocode} +% +% \begin{macrocode} +%<@@=cellprops> +% \end{macrocode} +% +% \begin{macrocode} +\ProvidesExplPackage + {\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription} + +\RequirePackage{xparse} +\RequirePackage{xcolor} +% \end{macrocode} +% \subsection{Loading and fixing \pkg{mdwtab}} +% +% There is a bug in the command \cs{colpop} of \pkg{mdwtab}: instead of just +% popping one name in the stack of column sets currently used, it empties it +% completely because one \cs{expandafter} is missing. This is proof that not +% many package authors really use this API as recommended by Mark +% \textsc{Wooding}\ldots We thus load \pkg{mdwtab} and fix \cs{colpop}. +% \begin{macrocode} +\RequirePackage{mdwtab} +\cs_set_nopar:Npn \tab@pop #1 { \tl_set:Nx #1 { \tl_tail:N #1 } } + + +% \end{macrocode} +% +% \subsection{Parsing CSS properties} +% +% Properties are parsed once at setting time, by expandable parsers that leave +% definitions in the input stream. All these resulting definitions are saved +% in a token list that will be expanded when we need the values. The goal is +% to have multiple token lists for multiple contexts, yet not to do the full +% parsing dance once per cell. +% +% \begin{variable}{\l_@@_property_value__tl} +% \begin{macro}{\@@_generic_setter:nnn} +% \begin{macro}{\@@_get_property:n} +% \begin{macro}{\@@_get_property:nN} +% We first define a generic setter which just uses +% \cs{l_@@_property_value__tl} to store the value of the property. We +% define getters, one that leaves the value in the stream, and one saving the +% value in a token list. +% +% \begin{macrocode} +\cs_set:Nn \@@_generic_setter:nnn { + \exp_not:N \tl_set:Nn + \exp_not:c { l_@@_property_value_#2_tl } + {#1 {#3}} +} + +\cs_set_nopar:Nn \@@_get_property:n { + \tl_use:c { l_@@_property_value_#1_tl } +} + +\cs_set_protected_nopar:Nn \@@_get_property:nN { + \tl_set_eq:Nc #2 { l_@@_property_value_#1_tl } +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% \end{macro} +% \end{variable} +% +% \begin{macro}{\@@_property_type_:nn} +% \begin{macro}{\@@_define_properties:nn} +% The control sequence \cs{_@@_property_type_:nn} holds the setter for +% the property \meta{name}. It can be set by the following helper: +% \begin{macrocode} +\cs_set_protected:Nn \@@_define_properties:nn { + \clist_map_inline:nn {#2} { + \cs_set:cpn { _@@_property_type_##1:nn } {#1} + } +} +% \end{macrocode} +% \end{macro} +% \end{macro} +% +% \begin{macro}{\@@_use_setter:nn} +% Sometimes we need to use a setter right away rather than save its action +% somewhere. The following helper does that with an x-expansion. +% \begin{macrocode} +\cs_set_protected:Nn \@@_use_setter:nn { + \use:x { + \use:c {_@@_property_type_#1:nn} {#1} {#2} + } +} +% \end{macrocode} +% \end{macro} +% +% \begin{macrocode} +\cs_set_protected:Nn \@@_parse_properties:nn { + \tl_if_exist:cF { l_@@_property_group_#1_tl } { + \tl_clear:c { l_@@_property_group_#1_tl } + } + \seq_set_split:Nnn \l_tmpa_seq {;} {#2} + \seq_map_inline:Nn \l_tmpa_seq { + \tl_if_empty:nF {##1} { + \exp_args:NNV \seq_set_split:Nnn \l_tmpb_seq \c_colon_str {##1} + \int_compare:nNnTF {\seq_count:N \l_tmpb_seq} = \c_two { + \seq_get_left:NN \l_tmpb_seq \l_tmpa_tl + \exp_args:NNV \str_set:Nn \l_tmpa_str \l_tmpa_tl + \seq_get_right:NN \l_tmpb_seq \l_tmpa_tl + \cs_if_exist:cTF { _@@_property_type_\l_tmpa_str :nn } { + \tl_put_right:cx { l_@@_property_group_#1_tl } { + \exp_args:Nc \exp_args:NVV + { _@@_property_type_\l_tmpa_str :nn } + \l_tmpa_str \l_tmpa_tl + } + }{ + % TODO: ERROR-no property with that name + } + }{ + % TODO: ERROR-too many : or none at all + } + } + } +} + +\cs_set:Nn \@@_fourdim_setter:nn { + \@@_fourdim_setter_aux:w + {#1}#2~{\q_no_value}~{\q_no_value}~{\q_no_value}~\q_stop +} +\cs_set:Npn \@@_fourdim_setter_aux:w #1#2~#3~#4~#5~#6\q_stop { + \@@_generic_setter:nnn \exp_not:n {#1-top} {#2} + \quark_if_no_value:nTF {#3} { + \@@_generic_setter:nnn \exp_not:n {#1-right} {#2} + \@@_generic_setter:nnn \exp_not:n {#1-left} {#2} + }{ + \@@_generic_setter:nnn \exp_not:n {#1-right} {#3} + \quark_if_no_value:nTF {#5} { + \@@_generic_setter:nnn \exp_not:n {#1-left} {#3} + }{ + \@@_generic_setter:nnn \exp_not:n {#1-left} {#5} + } + } + \quark_if_no_value:nTF {#4} { + \@@_generic_setter:nnn \exp_not:n {#1-bottom} {#2} + }{ + \@@_generic_setter:nnn \exp_not:n {#1-bottom} {#4} + } +} + +\tl_const:Nn \c_@@_inherit_color_tl { \q_nil } + +\cs_new_nopar:Nn \@@_color_setter:nn { + \str_if_eq:nnTF {#2} {inherit} { + \@@_generic_setter:nnn \exp_not:n {#1} {\c_@@_inherit_color_tl} + }{ + \str_case_x:nnF { \str_range:nnn {#2} {1} {4} } { + {rgb(} { + \@@_generic_setter:nnn \use:n {#1} { + \exp_not:n {\color[RGB]} {\str_range:nnn {#2} {5} {-2}} + }} + {hsl(} { + \@@_generic_setter:nnn \use:n {#1} { + \exp_not:n {\color[Hsb]} {\str_range:nnn {#2} {5} {-2}} + }} + }{ + \@@_generic_setter:nnn \exp_not:n {#1} { + \color{#2} + } + } + } +} +\cs_new_nopar:Nn \@@_bgcolor_setter:nn { + \str_if_eq:nnTF {#2} {transparent} { + \@@_color_setter:nn {#1} {inherit} + }{ + \@@_color_setter:nn {#1} {#2} + } +} + + +\@@_define_properties:nn { + \@@_generic_setter:nnn \exp_not:n +}{ + padding-top, + padding-right, + padding-bottom, + padding-left, + min-height, + min-depth, + min-width, +} + +\@@_define_properties:nn { + \@@_fourdim_setter:nn +}{ + padding +} + +\@@_define_properties:nn { + \@@_generic_setter:nnn \tl_to_str:n +}{ + text-align, + math-mode, +} + +\@@_define_properties:nn { + \@@_color_setter:nn +}{ + color, +} + +\@@_define_properties:nn { + \@@_bgcolor_setter:nn +}{ + background-color, +} + + +% TODO: properties for array +\NewDocumentCommand \cellprops { m } { + \@@_parse_css:n {#1} +} + +\cs_new_protected:Nn \@@_parse_css:n { + \@@_parse_css:w #1 \q_mark {\q_nil} \q_stop +} +\NewDocumentCommand \@@_parse_css:w { lmu{\q_stop} } { + \quark_if_nil:nF {#2} { + \clist_map_inline:nn {#1} { + \@@_parse_properties:nn {##1} {#2} + } + \@@_parse_css:w #3 \q_stop + } +} + +\cs_set_protected:Nn \@@_recall_properties:n { + \tl_if_exist:cT { l_@@_property_group_#1_tl } { + \tl_use:c { l_@@_property_group_#1_tl } + } + \clist_map_inline:nn { \@currenvir } { + \tl_if_exist:cT { l_@@_property_group_##1~#1_tl } { + \tl_use:c { l_@@_property_group_##1~#1_tl } + } + } +} + +\dim_new:N \l_@@_colsep_dim +\ExplSyntaxOff +\cellprops{ + td { + padding: 0pt \csname l_@@_colsep_dim\endcsname; + min-height: 0pt; + min-depth: 0pt; + min-width: 0pt; + text-align: left; + math-mode: auto; + color: inherit; + background-color: transparent; + } + tr { + color: inherit; + background-color: transparent; + } + table { + padding: 0pt; % No change at load time + color: inherit; + background-color: transparent; + } +} +\ExplSyntaxOn + +\int_new:N \g_@@_row_int +\int_new:N \g_@@_col_int +\bool_new:N \g_@@_inrow_bool +\bool_gset_false:N \g_@@_inrow_bool + +\box_new:N \l_@@_cell_box +\skip_new:N \l_@@_left_skip +\skip_new:N \l_@@_right_skip +\dim_new:N \g_@@_ht_dim +\dim_new:N \g_@@_dp_dim + +\tl_new:N \l_@@_restore_tl + +\dim_new:N \l_@@_tablepadding_top_dim +\dim_new:N \l_@@_tablepadding_bottom_dim +\tl_new:N \l_@@_color_tl +\tl_new:N \l_@@_bgcolor_tl + +% To count rows and columns +\cs_set_eq:NN \@@_orig_array: \@array +\cs_set_protected_nopar:Npn \@array[#1]#2 { + \tl_set:Nx \l_@@_restore_tl { + \bool_if:NTF \g_@@_inrow_bool { + \exp_not:n {\bool_gset_true:N \g_@@_inrow_bool} + }{ + \exp_not:n {\bool_gset_false:N \g_@@_inrow_bool} + } + \exp_not:n { \int_gset:Nn \g_@@_row_int } + { \int_use:N \g_@@_row_int } + \exp_not:n { \int_gset:Nn \g_@@_col_int } + { \int_use:N \g_@@_col_int } + \exp_not:n { \dim_gset:Nn \g_@@_ht_dim } + { \dim_use:N \g_@@_ht_dim } + \exp_not:n { \dim_gset:Nn \g_@@_dp_dim } + { \dim_use:N \g_@@_dp_dim } + } + \int_gzero:N \g_@@_row_int + \bool_gset_false:N \g_@@_inrow_bool + \cs_set_eq:NN \@@_orig_tab@initread: \tab@initread + \cs_set_protected_nopar:Npn \tab@initread { + \cs_set_eq:NN \tab@initread \@@_orig_tab@initread: + \tab@initread + \tl_put_left:Nn \tab@tabtext {\int_gincr:N \g_@@_col_int} + } +% \end{macrocode} +% Zero \cs{col@sep} but remember its value for the default padding. +% \begin{macrocode} + \dim_set_eq:NN \l_@@_colsep_dim \col@sep + \dim_zero:N \col@sep +% \end{macrocode} +% Also ignore \cs{*extrasep} dimensions that are not part of cellprop +% interface and should be replaced by CSS equivalents. +% \begin{macrocode} + \dim_zero:N \tab@extrasep + \group_begin: + \@@_recall_properties:n {table} + \dim_gset:Nn \g_tmpa_dim { \@@_get_property:n {padding-top} } + \dim_gset:Nn \g_tmpb_dim { \@@_get_property:n {padding-bottom} } + \@@_update_colors: + \tl_gset_eq:NN \g_tmpa_tl \l_@@_color_tl + \tl_gset_eq:NN \g_tmpb_tl \l_@@_bgcolor_tl + \group_end: + \dim_set_eq:NN \l_@@_tablepadding_top_dim \g_tmpa_dim + \dim_set_eq:NN \l_@@_tablepadding_bottom_dim \g_tmpb_dim + \tl_set_eq:NN \l_@@_color_tl \g_tmpa_tl + \tl_set_eq:NN \l_@@_bgcolor_tl \g_tmpb_tl + \@@_recall_properties:n {tr} + \@@_orig_array:[{#1}]{#2} + \hlx{s[\l_@@_tablepadding_top_dim]} +} + +% \end{macrocode} +% The color inheritance is handled with \cs{l_@@_inherit_color_tl}, +% \cs{l_@@_color_tl} and \cs{l_@@_bgcolor_tl}. The role of +% \cs{@@_update_color:Nn} is to set the inherit fallback to the already +% existing value of \verb|#1| then set \verb|#1| to the CSS value, which can be +% the inherit variable. +% \begin{macrocode} + +\cs_new_protected_nopar:Nn \@@_update_color:Nn { + \@@_get_property:nN {#2} \l_tmpc_tl + \exp_args:NV \tl_if_eq:NNF \l_tmpc_tl \c_@@_inherit_color_tl { + \tl_set_eq:NN #1 \l_tmpc_tl + } +} + +\cs_set_protected_nopar:Nn \@@_update_colors: { + \@@_update_color:Nn \l_@@_color_tl {color} + \@@_update_color:Nn \l_@@_bgcolor_tl {background-color} +} + +\cs_set_eq:NN \@@_orig_endarray: \endarray +\cs_set_nopar:Npn \endarray { + \crcr + \hlx{s[\l_@@_tablepadding_bottom_dim]} + \@@_orig_endarray: + \tl_use:N \l_@@_restore_tl +} + +\cs_set_eq:NN \@@_orig_tab@startrow: \tab@startrow +\cs_set_nopar:Npn \tab@startrow { + \@@_orig_tab@startrow: + \bool_if:NF \g_@@_inrow_bool { + \bool_gset_true:N \g_@@_inrow_bool + \int_gincr:N \g_@@_row_int + \int_gset_eq:NN \g_@@_col_int \c_one + \dim_gzero:N \g_@@_ht_dim + \dim_gzero:N \g_@@_dp_dim + } +} + +\cs_set_eq:NN \@@_orig_tab@arraycr: \tab@arraycr +\cs_set_protected_nopar:Npn \tab@arraycr { + \bool_if:NT \g_@@_inrow_bool { + \bool_gset_false:N \g_@@_inrow_bool + \@@_fix_valign_end: + } + \@@_orig_tab@arraycr: +} + + + +\cs_set_eq:NN \@@_orig_multicolumn:w \multicolumn +\cs_set:Npn \multicolumn#1#2#3 { + \@@_orig_multicolumn:w {#1}{#2}{ + #3 + \int_gadd:Nn \g_@@_col_int {#1} + } +} + + +\cs_new_protected_nopar:Nn \@@_fix_valign_end: { + \exp_args:NV \tl_if_eq:nnTF \tab@hlstate {b} { + \dim_gadd:Nn \tab@endheight { + \g_@@_dp_dim - \box_dp:N \@arstrutbox + } + }{ + \int_compare:nNnT \g_@@_row_int = \c_one { + \dim_gadd:Nn \tab@endheight { + \g_@@_ht_dim - \box_ht:N \@arstrutbox + } + } + } +} + +\colpush{tabular} + +\coldef n{\tabcoltype{ + \@@_begincell:n{} +}{ + \@@_endcell: +}} +\coldef l{\tabcoltype{ + \@@_begincell:n + {\@@_use_setter:nn {text-align} {left}} +}{ + \@@_endcell: +}} +\coldef c{\tabcoltype{ + \@@_begincell:n + {\@@_use_setter:nn {text-align} {center}} +}{ + \@@_endcell: +}} +\coldef r{\tabcoltype{ + \@@_begincell:n + {\@@_use_setter:nn {text-align} {right}} +}{ + \@@_endcell: +}} +\coldef M#1{\@@_MTcol:nn {math}{#1}} +\coldef T#1{\@@_MTcol:nn {text}{#1}} +\cs_new_protected_nopar:Nn \@@_MTcol:nn { + % TODO: error if align not l, c, or r + \exp_args:Nx \tabcoltype { + \exp_not:N \@@_begincell:n { + \exp_not:n {\@@_use_setter:nn {math-mode} {#1} } + \exp_not:n {\@@_use_setter:nn {text-align}} { + \str_case:nn {#2} { + {l} {left} + {c} {center} + {r} {right} + } + } + } + }{ + \@@_endcell: + } +} + +\coldef p#1{\tabcoltype{ + \@@_begin_par_cell:nn \vtop {#1} +}{ + \@@_end_par_cell:n {} +}} +\coldef m#1{\tabcoltype{ + \@@_begin_par_cell:nn {\c_math_toggle_token\vcenter} {#1} +}{ + \@@_end_par_cell:n{\c_math_toggle_token} +}} +\coldef b#1{\tabcoltype{ + \@@_begin_par_cell:nn \vbox {#1} +}{ + \@@_end_par_cell:n {} +}} + + +\colpop + +% \end{macrocode} +% Handle various \verb|:nth-child()| forms. +% \begin{macrocode} + +\cs_new_protected_nopar:Nn \@@_nthchild_anb:Nnn { + \tl_set:Nx \l_tmpa_tl { +\int_eval:n{\int_mod:nn{#2}{#3}} } + \exp_args:NV \tl_if_eq:nnT \l_tmpa_tl { +0 } { + \tl_clear:N \l_tmpa_tl + } + \seq_put_right:Nx #1 { #3n\l_tmpa_tl } +} + +\cs_new_protected_nopar:Nn \@@_seq_nthchild:Nn { + \seq_clear:N #1 + \seq_put_right:Nx #1 { + \int_compare:nNnTF{\int_mod:nn{#2}{2}}={0}{even}{odd} + } + \@@_nthchild_anb:Nnn #1 {#2} {2} + \@@_nthchild_anb:Nnn #1 {#2} {3} + \seq_put_right:Nx #1 { \int_eval:n{#2} } +} + +\cs_new_protected_nopar:Nn \@@_begincell:n { + \@@_begin_raw_cell:n { + \@@_seq_nthchild:Nn \l_tmpa_seq { \g_@@_row_int } + \@@_seq_nthchild:Nn \l_tmpb_seq { \g_@@_col_int } + \seq_map_inline:Nn \l_tmpa_seq { + \@@_recall_properties:n {tr:nth-child(##1)} + } + \@@_update_colors: + \@@_recall_properties:n {td} + \@@_recall_properties:n {tr~td} + \seq_map_inline:Nn \l_tmpb_seq { + \@@_recall_properties:n {td:nth-child(##1)} + } + \seq_map_inline:Nn \l_tmpa_seq { + \@@_recall_properties:n {tr:nth-child(##1)~td} + } + \seq_map_inline:Nn \l_tmpa_seq { + \seq_map_inline:Nn \l_tmpb_seq { + \@@_recall_properties:n {tr:nth-child(##1)~ + td:nth-child(####1)} + } + } + \@@_update_colors: + #1 + \hbox_set:Nw \l_@@_cell_box + \str_case_x:nnF {\@@_get_property:n {math-mode}} { + { text } { \tab@btext } + { math } { \tab@bmaths } + }{% any other treated as |auto| + \tab@bgroup + } + } +} + +\cs_new_protected_nopar:Nn \@@_endcell: { + \str_case_x:nnF {\@@_get_property:n {math-mode}} { + { text } { \tab@etext } + { math } { \tab@emaths } + }{% any other treated as |auto| + \tab@egroup + } + \hbox_set_end: + \@@_end_raw_cell: +} + +\cs_new_protected_nopar:Nn \@@_begin_par_cell:nn { + \savenotes + \@@_begin_raw_cell:n{ + \hbox_set:Nw \l_@@_cell_box + #1 + \bgroup + \hsize#2\relax + \@arrayparboxrestore + \global\@minipagetrue + \everypar{ + \global\@minipagefalse + \everypar{} + } + \@@_recall_properties:n {td~p} + } +} +\cs_new_protected_nopar:Nn \@@_end_par_cell:n { + \ifhmode\@maybe@unskip\par\fi + \unskip + \egroup + #1 + \hbox_set_end: + \@@_end_raw_cell: + \spewnotes\hfil +} + +\cs_new_protected_nopar:Nn \@@_begin_raw_cell:n { + \group_begin: + % Additional init code + #1 + % Install the cell color + \@@_update_colors: + \tl_use:N \l_@@_color_tl +} + +\cs_new_protected_nopar:Nn \@@_end_raw_cell: { + % Here \l_@@_cell_box must contain the contents of the cell + % + % Handle vpadding and min-height/depth + \box_set_ht:Nn \l_@@_cell_box { + \dim_max:nn + {\box_ht:N \l_@@_cell_box} + {\@@_get_property:n {min-height}} + + (\@@_get_property:n {padding-top}) + } + \box_set_dp:Nn \l_@@_cell_box { + \dim_max:nn + {\box_dp:N \l_@@_cell_box} + {\@@_get_property:n {min-depth}} + + (\@@_get_property:n {padding-bottom}) + } + % To fix vertical alignment later + \dim_gset:Nn \g_@@_ht_dim { + \dim_max:nn + {\g_@@_ht_dim} + {\box_ht:N \l_@@_cell_box} + } + \dim_gset:Nn \g_@@_dp_dim { + \dim_max:nn + {\g_@@_dp_dim} + {\box_dp:N \l_@@_cell_box} + } + % Handle hpadding and halign + \skip_set:Nn \l_tmpa_skip { + \dim_max:nn + {0pt} + { (\@@_get_property:n {min-width}) + - \box_wd:N \l_@@_cell_box } + } + \skip_add:Nn \l_tmpa_skip { + 0pt plus 1fil + } + \skip_set:Nn \l_@@_left_skip + {\@@_get_property:n {padding-left}} + \skip_set:Nn \l_@@_right_skip + {\@@_get_property:n {padding-right}} + \str_case_x:nnF {\@@_get_property:n {text-align}} { + { right } { + \skip_add:Nn \l_@@_left_skip { \l_tmpa_skip } + } + { center } { + \skip_add:Nn \l_@@_left_skip { \l_tmpa_skip / 2 } + \skip_add:Nn \l_@@_right_skip { \l_tmpa_skip / 2 } + } + }{% any other treated as |left| + \skip_add:Nn \l_@@_right_skip { \l_tmpa_skip } + } + \kern\c_zero_dim + \tl_if_empty:NF \l_@@_bgcolor_tl { + \group_begin: + % Paint a background with leaders + \tl_use:N \l_@@_bgcolor_tl % install the color + \skip_set:Nn \l_tmpa_skip { + \l_@@_left_skip + + \box_wd:N \l_@@_cell_box + + \l_@@_right_skip + } + \leaders + \vrule + \skip_horizontal:N \l_tmpa_skip + \skip_horizontal:n {-\l_tmpa_skip} + \group_end: + } + \skip_horizontal:N \l_@@_left_skip + \box_use_clear:N \l_@@_cell_box + \skip_horizontal:N \l_@@_right_skip + \kern\c_zero_dim + \group_end: +} +% \end{macrocode} +% +% \begin{macrocode} +% +% \end{macrocode} +% +% \end{implementation} diff --git a/Master/texmf-dist/source/latex/cellprops/cellprops.ins b/Master/texmf-dist/source/latex/cellprops/cellprops.ins new file mode 100644 index 00000000000..6e7e57d725a --- /dev/null +++ b/Master/texmf-dist/source/latex/cellprops/cellprops.ins @@ -0,0 +1,24 @@ +\iffalse meta-comment + +File cellprops.ins (C) Copyright 2016 RIVAUD Julien + +It may be distributed and/or modified under the conditions of the +General Public License (GPL), either version 3 of this +license or (at your option) any later version. + +\fi + +\input l3docstrip.tex +\askforoverwritefalse + +\preamble +\endpreamble +% stop docstrip adding \endinput +\postamble +\endpostamble + +\keepsilent + +\generate{\file{cellprops.sty} {\from{cellprops.dtx} {package}}} + +\endbatchfile -- cgit v1.2.3