From 32e6c720c4f84f112596c6b4a75193f99e9be158 Mon Sep 17 00:00:00 2001
From: Hans Hagen <pragma@wxs.nl>
Date: Tue, 16 Apr 2019 09:53:19 +0200
Subject: 2019-04-16 09:02:00

---
 tex/context/base/mkiv/tabl-tbl.mkiv | 43 +++++++++++++++++++++++++++----------
 1 file changed, 32 insertions(+), 11 deletions(-)

(limited to 'tex/context/base/mkiv/tabl-tbl.mkiv')

diff --git a/tex/context/base/mkiv/tabl-tbl.mkiv b/tex/context/base/mkiv/tabl-tbl.mkiv
index fb7e283cd..b18b5e618 100644
--- a/tex/context/base/mkiv/tabl-tbl.mkiv
+++ b/tex/context/base/mkiv/tabl-tbl.mkiv
@@ -1184,10 +1184,18 @@
       \singleexpandafter\tabl_start_defined_zero
    \fi}
 
+% \def\tabl_start_defined_one[#1][#2]%
+%   {\doifelseassignment{#1}
+%      {\setuptabulation[\currenttabulation][#1]}%
+%      {\edef\currenttabulation{\currenttabulation:#1}}%
+%    \tabl_tabulate_start_building}
+
 \def\tabl_start_defined_one[#1][#2]%
-  {\doifelseassignment{#1}
-     {\setuptabulation[\currenttabulation][#1]}%
-     {\edef\currenttabulation{\currenttabulation:#1}}%
+  {\ifcondition\validassignment{#1}%
+     \setuptabulation[\currenttabulation][#1]%
+   \else
+     \edef\currenttabulation{\currenttabulation:#1}%
+   \fi
    \tabl_tabulate_start_building}
 
 \def\tabl_start_defined_two[#1][#2]%
@@ -1215,15 +1223,28 @@
 
 \def\tabl_default_format{|l|p|}
 
+% \def\tabl_start_regular_one[#1][#2]%
+%   {\doifelseassignment{#1}
+%      {\lettabulationparameter\c!format\tabl_default_format
+%       \setupcurrenttabulation[#1]}
+%      {\def\p_format{#1}%
+%       \ifx\p_format\empty
+%         \def\p_format{|l|p|}%
+%       \fi
+%       \lettabulationparameter\c!format\p_format}%
+%    \tabl_tabulate_start_building}
+
 \def\tabl_start_regular_one[#1][#2]%
-  {\doifelseassignment{#1}
-     {\lettabulationparameter\c!format\tabl_default_format
-      \setupcurrenttabulation[#1]}
-     {\def\p_format{#1}%
-      \ifx\p_format\empty
-        \def\p_format{|l|p|}%
-      \fi
-      \lettabulationparameter\c!format\p_format}%
+  {\ifcondition\validassignment{#1}%
+     \lettabulationparameter\c!format\tabl_default_format
+     \setupcurrenttabulation[#1]%
+   \else
+     \def\p_format{#1}%
+     \ifx\p_format\empty
+       \def\p_format{|l|p|}%
+     \fi
+     \lettabulationparameter\c!format\p_format
+   \fi
    \tabl_tabulate_start_building}
 
 \def\tabl_start_regular_two[#1][#2]%
-- 
cgit v1.2.3