1 files changed, 7 insertions, 8 deletions
diff --git a/tex/context/base/tabl-tab.mkiv b/tex/context/base/tabl-tab.mkiv
index f9ac27e70..5add1c684 100644
--- a/tex/context/base/tabl-tab.mkiv
+++ b/tex/context/base/tabl-tab.mkiv
@@ -1503,9 +1503,9 @@
    \global\setfalse\tableactionstatepermitted
    \global\setfalse\hassometablehead
    \global\setfalse\hassometabletail
-   \expanded{\doifinstringelse{|}{#1}}
+   \expanded{\doifelseinstring{|}{#1}}
      {\xdef\restarttable{\noexpand\dorestarttable{\noexpand\thirdstagestarttable{#1}}}}
-     {\doifdefinedelse{\??tabletemplate#1}
+     {\doifelsedefined{\??tabletemplate#1}
         {\gdef\restarttable{\getvalue{\??tabletemplate#1}}}
         {\gdef\restarttable{\dorestarttable{\getvalue{#1}}}}}%
    \egroup
@@ -1921,7 +1921,7 @@
   {\global\currenttablecolumn\zerocount}
 
 \def\dotablevrulecommand#1% global assignments
-  {\doifnumberelse{#1}
+  {\doifelsenumber{#1}
      {\global\tablevrulethicknessfactor#1\relax
       \global\multiply\tablevrulethicknessfactor\m_tabl_table_VLwidth\relax}
      {\xdef\tablecurrentvrulecolor{#1}}}
@@ -1955,7 +1955,7 @@
 \unexpanded\def\dotableVN#1{\global\noftablevrules#1\relax\VL}
 
 \def\dotablehrulecommand#1% global assignments
-  {\doifnumberelse{#1}
+  {\doifelsenumber{#1}
      {\global\tablehrulethicknessfactor#1\relax
       \global\multiply\tablehrulethicknessfactor\m_tabl_table_HLheight\relax}
      {\xdef\tablecurrenthrulecolor{#1}}}
@@ -2075,7 +2075,7 @@
    \fi}
 
 \def\dotabledrulecommand#1% global assignments
-  {\doifnumberelse{#1}
+  {\doifelsenumber{#1}
      {\ifcase\tabledrulespan
         \global\tabledrulespan#1\relax
       \else
@@ -2203,7 +2203,7 @@
 
 \def\dolocaltablesetup
   {\directtablesparameter\c!commands\relax
-   \doifsomething{\directtablesparameter\c!bodyfont}{\switchtobodyfont[\directtablesparameter\c!bodyfont]}%
+   \usebodyfontparameter\directtablesparameter
    \tablelinethicknessunit\dimexpr\directtablesparameter\c!rulethickness/\tablelinethicknessfactor\relax
    \edef\p_tabl_table_height{\directtablesparameter\c!height}%
    \edef\p_tabl_table_depth{\directtablesparameter\c!depth}%
@@ -2288,8 +2288,7 @@
    \c!distance=\v!medium,
    \c!bodyfont=,
    \c!commands=,
-   \c!background=\v!screen, % huh?
-   \c!backgroundscreen=\defaultbackgroundscreen,
+   \c!background=,
    \c!backgroundcolor=,
    \c!split=\v!auto]