diff options
| author | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-09-05 11:09:19 +0200 |
|---|---|---|
| committer | Context Git Mirror Bot <phg42.2a@gmail.com> | 2016-09-05 11:09:19 +0200 |
| commit | 3f59c56887a9a6c4bda68ab8d99e67d2afc902f9 (patch) | |
| tree | a9198041a82c94d3764733271e203edb8beb79a3 /tex/context/base/mkiv/tabl-tbl.mkiv | |
| parent | c209ed36b6aaaa992df8976789c8ba8112f8e5c5 (diff) | |
| download | context-3f59c56887a9a6c4bda68ab8d99e67d2afc902f9.tar.gz | |
2016-09-05 10:33:00
Diffstat (limited to 'tex/context/base/mkiv/tabl-tbl.mkiv')
| -rw-r--r-- | tex/context/base/mkiv/tabl-tbl.mkiv | 72 |
1 files changed, 65 insertions, 7 deletions
diff --git a/tex/context/base/mkiv/tabl-tbl.mkiv b/tex/context/base/mkiv/tabl-tbl.mkiv index 9e3f00ccc..a9ba36087 100644 --- a/tex/context/base/mkiv/tabl-tbl.mkiv +++ b/tex/context/base/mkiv/tabl-tbl.mkiv @@ -1213,16 +1213,74 @@ % todo: spacing around tabulate when bodyfont is set -\let\tabl_tabulate_inside_before \relax -\let\tabl_tabulate_inside_after \relax -\let\tabl_tabulate_inside_inbetween\relax +% \let\tabl_tabulate_inside_before \relax +% \let\tabl_tabulate_inside_after \relax +% \let\tabl_tabulate_inside_inbetween\relax +% +% \def\tabl_tabulate_outside_before +% {\whitespace +% \tabulationparameter\c!before} +% +% \def\tabl_tabulate_outside_after +% {\tabulationparameter\c!after} + +% \showboxes +% +% \startcombination +% {\insidefloattrue \starttabulate[|||] \NC test \NC test \NC \NR \stoptabulate} {} +% {\insidefloattrue \starttabulate[|||] \NC test \NC test \NC \NR \stoptabulate} {} +% \stopcombination +% +% \startcombination +% {\vbox{\starttabulate[|||] \NC test \NC test \NC \NR \stoptabulate}} {} +% {\vbox{\starttabulate[|||] \NC test \NC test \NC \NR \stoptabulate}} {} +% \stopcombination +% +% \startcombination +% {\starttabulate[|||] \NC test \NC test \NC \NR \stoptabulate} {} +% {\starttabulate[|||] \NC test \NC test \NC \NR \stoptabulate} {} +% \stopcombination + +\let\tabl_tabulate_inside_after \relax +\let\tabl_tabulate_outside_after\relax + +\def\tabl_tabulate_inside_before + {\ifhmode\par\fi + \ifhmode + \ifinsidesplitfloat + \let\tabl_tabulate_inside_after\relax + \else + \vbox\bgroup + \let\tabl_tabulate_inside_after\egroup + \fi + \else + \let\tabl_tabulate_inside_after\relax + \fi} \def\tabl_tabulate_outside_before - {\whitespace - \tabulationparameter\c!before} + {\ifhmode\par\fi + \ifhmode + \vbox\bgroup + \let\tabl_tabulate_outside_after \egroup + \let\tabl_tabulate_outside_inbetween\relax + \else\ifinner + \let\tabl_tabulate_outside_after \relax + \let\tabl_tabulate_outside_inbetween\relax + \else + \whitespace + \tabulationparameter\c!before + \let\tabl_tabulate_outside_after \tabl_tabulate_outside_after_indeed + \let\tabl_tabulate_outside_inbetween\tabl_tabulate_outside_inbetween_indeed + \fi\fi} -\def\tabl_tabulate_outside_after - {\tabulationparameter\c!after} +\def\tabl_tabulate_outside_after_indeed + {\tabulationparameter\c!after}% + +\def\tabl_tabulate_outside_inbetween_indeed + {\doifempty{\tabulationparameter\c!after} + {\vskip\strutdp + \verticalstrut + \vskip-\struttotal}} \def\tabl_tabulate_outside_inbetween {\doifempty{\tabulationparameter\c!after} |