2016-09-01 21:16:00

1 files changed, 55 insertions, 23 deletions

diff --git a/tex/context/base/mkiv/tabl-ntb.mkiv b/tex/context/base/mkiv/tabl-ntb.mkiv
index 3f3a1d04e..eea743bfe 100644
--- a/tex/context/base/mkiv/tabl-ntb.mkiv
+++ b/tex/context/base/mkiv/tabl-ntb.mkiv
@@ -2052,41 +2052,73 @@
 
 \appendtoks
     \setupTABLE [%
-        \c!frameoffset=.5\linewidth,%
-        \c!backgroundoffset=\v!frame,%
-      % \c!framecolor=\s!black,%
-        \c!frame=\v!on,%
-        \c!leftframe=\v!on,%
-        \c!rightframe=\v!on,%
-        \c!topframe=\v!on,%
-        \c!bottomframe=\v!on,%
+        %
+        % framed defaults
+        %
         \c!width=\v!fit,%
         \c!height=\v!fit,%
-        \c!autowidth=\v!yes,%
+        \c!lines=,%
+        \c!offset=.25\exheight,%
+        \c!empty=\v!no,%
+        \c!frame=\v!on,%
+        \c!topframe=,%
+        \c!bottomframe=,%
+        \c!leftframe=,%
+        \c!rightframe=,%
+        \c!radius=.5\bodyfontsize,%
         \c!rulethickness=\linewidth,%
+        \c!corner=\v!rectangular,%
+        \c!depth=\zeropoint,%
+        \c!foregroundcolor=,%
+        \c!foregroundstyle=,%
+        \c!background=,%
+        \c!backgroundcolor=,%
+        \c!backgroundoffset=\v!frame,%
+        \c!framecolor=,%
+        \c!frameoffset=.5\linewidth,%
+      % \c!backgroundcorner=\framedparameter\c!corner,%
+      % \c!backgrounddepth=\framedparameter\c!depth,%
+      % \c!backgroundradius=\framedparameter\c!radius,%
+      % \c!framecorner=\framedparameter\c!corner,%
+      % \c!framedepth=\framedparameter\c!depth,%
+      % \c!frameradius=\framedparameter\c!radius,%
+        \c!component=,%
+        \c!region=,%
+        \c!align=,%
+        \c!bottom=\vss,%
+        \c!top=,%
         \c!strut=\v!yes,%
         \c!autostrut=\v!no,%
+        \c!location=\v!normal,%
+        \c!orientation=,%
+        \c!autowidth=\v!yes,%
+        \c!setups=,%
+        \c!loffset=\zeropoint,%
+        \c!roffset=\zeropoint,%
+        \c!toffset=\zeropoint,%
+        \c!boffset=\zeropoint,%
+        %
+        % table specific
         %
-        \c!color=,%
-        \c!style=,%
-        \c!headstyle=\v!bold,%
-        \c!headcolor=,%
         \c!aligncharacter=\v!no,%
         \c!alignmentcharacter={,},%
-        \c!option=,%                         \v!stretch
+        \c!color=,%
+        \c!columndistance=\zeropoint,%       each column (whole table)
+        \c!distance=\zeropoint,%             individual column
+        \c!headcolor=,%
         \c!header=,%
-        \c!spaceinbetween=,%
+        \c!headstyle=\v!bold,%
+        \c!left=,%
+        \c!leftmargindistance=\zeropoint,%   whole table
         \c!maxwidth=8\emwidth,%
-        \c!textwidth=\v!local,%              was \hsize
+        \c!option=,%                         \v!stretch
+        \c!right=,%
+        \c!rightmargindistance=\zeropoint,%  whole table
+        \c!spaceinbetween=,%
         \c!split=\v!auto,%
         \c!splitoffset=\zeropoint,%
-        \c!distance=\zeropoint,%             individual column
-        \c!columndistance=\zeropoint,%       each column (whole table)
-        \c!leftmargindistance=\zeropoint,%   whole table
-        \c!rightmargindistance=\zeropoint,%  whole table
-        \c!left=,%
-        \c!right=,%
-        \c!setups=%
+        \c!style=,%
+        \c!textwidth=\v!local,%              was \hsize
     ]%
 \to \everyresetTABLEyes