summaryrefslogtreecommitdiff
path: root/tex/context/base/tabl-ntb.mkiv
diff options
context:
space:
mode:
authorMarius <mariausol@gmail.com>2012-06-21 12:00:15 +0300
committerMarius <mariausol@gmail.com>2012-06-21 12:00:15 +0300
commit63fbc0df119d3ab18634ccc65eb9a6fa47b57ac0 (patch)
tree3298620ca6f5b3c4b4e7a424a94e7dd8970f033e /tex/context/base/tabl-ntb.mkiv
parentf4a7ea86b474561c07f0eb8cca0dfcc6a6bb5a8a (diff)
downloadcontext-63fbc0df119d3ab18634ccc65eb9a6fa47b57ac0.tar.gz
beta 2012.06.21 10:37
Diffstat (limited to 'tex/context/base/tabl-ntb.mkiv')
-rw-r--r--tex/context/base/tabl-ntb.mkiv13
1 files changed, 9 insertions, 4 deletions
diff --git a/tex/context/base/tabl-ntb.mkiv b/tex/context/base/tabl-ntb.mkiv
index 52cc09096..5045075db 100644
--- a/tex/context/base/tabl-ntb.mkiv
+++ b/tex/context/base/tabl-ntb.mkiv
@@ -82,7 +82,7 @@
\unexpanded\def\tabl_tnb_cell_start
{\inhibitblank
\dotagTABLEcell
- \tabl_tnb_next_level
+% \tabl_tnb_next_level
\usenaturaltablelocalstyleandcolor\c!style\c!color
\everypar{\naturaltablelocalparameter\c!left\delayedbegstrut}}
@@ -179,6 +179,10 @@
{\advance\c_tabl_level\plusone
\edef\m_tabl_tbl_level{\the\c_tabl_level}}
+\def\tabl_tnb_prev_level
+ {\advance\c_tabl_level\minusone
+ \edef\m_tabl_tbl_level{\the\c_tabl_level}}
+
\tabl_tnb_next_level % go to level 1
\installcorenamespace{naturaltable} % was tbl
@@ -277,7 +281,8 @@
% {\expandafter\def\expandafter\m_tabl_tbl_level\expandafter{\m_tabl_tbl_level}\tabl_ntb_cell_process{#3}{#4}[#5]{#6}}}
\unexpanded\def\tabl_ntb_set_txt_process#1#2#3#4#5#6%
- {\expandafter\def\csname\??naturaltabletxt\m_tabl_tbl_level:\number#1:\number#2\endcsname{\tabl_ntb_cell_process{#3}{#4}[#5]{#6}}}
+ {\expandafter\def\csname\??naturaltabletxt\m_tabl_tbl_level:\number#1:\number#2\endcsname
+ {\tabl_ntb_cell_process{#3}{#4}[#5]{\tabl_tnb_next_level#6\tabl_tnb_prev_level}}}
\def\tabl_ntb_get_txt#1#2%
{\csname\??naturaltabletxt\m_tabl_tbl_level:\number#1:\number#2\endcsname}
@@ -1221,8 +1226,8 @@
{\doifnotinset\localwidth{\v!fit,\v!broad}% user set
{\scratchdimen\tabl_ntb_get_aut\c_tabl_ntb_col\relax
\ifdim\localwidth>\scratchdimen
- \tabl_ntb_set_aut\c_tabl_ntb_col{\the\dimexpr\localwidth\relax}%
- \fi}}%
+ \tabl_ntb_set_aut\c_tabl_ntb_col{\the\dimexpr\localwidth}%
+ \fi}}
\def\tabl_ntb_table_stop
{\setbox\scratchbox\hbox