2015-01-05 13:08:00

8 files changed, 20 insertions, 10 deletions

diff --git a/tex/context/base/cont-new.mkiv b/tex/context/base/cont-new.mkiv
index bc27a12af..5cd37e506 100644
--- a/tex/context/base/cont-new.mkiv
+++ b/tex/context/base/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2015.01.05 00:14}
+\newcontextversion{2015.01.05 13:06}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/context-version.pdf b/tex/context/base/context-version.pdf
index 6280b445f..ef148d573 100644
--- a/tex/context/base/context-version.pdf
+++ b/tex/context/base/context-version.pdf
diff --git a/tex/context/base/context.mkiv b/tex/context/base/context.mkiv
index 3dc0d8cec..91c8b9b5f 100644
--- a/tex/context/base/context.mkiv
+++ b/tex/context/base/context.mkiv
@@ -28,7 +28,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2015.01.05 00:14}
+\edef\contextversion{2015.01.05 13:06}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/status-files.pdf b/tex/context/base/status-files.pdf
index af48c623a..62908124d 100644
--- a/tex/context/base/status-files.pdf
+++ b/tex/context/base/status-files.pdf
diff --git a/tex/context/base/status-lua.pdf b/tex/context/base/status-lua.pdf
index 8d131e34a..7c35afdce 100644
--- a/tex/context/base/status-lua.pdf
+++ b/tex/context/base/status-lua.pdf
diff --git a/tex/context/base/tabl-ntb.mkiv b/tex/context/base/tabl-ntb.mkiv
index 34f893df7..2f5dd5566 100644
--- a/tex/context/base/tabl-ntb.mkiv
+++ b/tex/context/base/tabl-ntb.mkiv
@@ -351,7 +351,7 @@
 \newif\ifenableTBLbreak     \enableTBLbreakfalse
 \newif\ifmultipleTBLheads   \multipleTBLheadsfalse
 \newif\iftightTBLrowspan    \tightTBLrowspantrue
-%newif\iftightTBLcolspan    \tightTBLcolspantrue
+\newif\iftightTBLcolspan    \tightTBLcolspanfalse
 
 \newif\iftraceTABLE         \traceTABLEfalse
 
@@ -907,6 +907,10 @@
    \doifelse{\naturaltablelocalparameter\c!textwidth}\v!local
      {\hsize\availablehsize}
      {\hsize\naturaltablelocalparameter\c!textwidth}%
+   \enableTBLbreakfalse
+   \multipleTBLheadsfalse
+   \autoTBLspreadfalse
+   \tightTBLcolspanfalse
    \processaction
      [\naturaltablelocalparameter\c!split]
      [     \v!yes=>\enableTBLbreaktrue,
@@ -918,7 +922,8 @@
    \tabl_ntb_preset_parameters
    \processallactionsinset
      [\naturaltablelocalparameter\c!option]
-     [\v!stretch=>\autoTBLspreadtrue]%
+     [\v!stretch=>\autoTBLspreadtrue,%
+        \v!tight=>\tightTBLcolspantrue]%
    \linewidth\naturaltablelocalparameter\c!rulethickness % needs to be frozen
    \dontcomplain
    \c_tabl_ntb_running_col     \zerocount
@@ -1802,8 +1807,12 @@
        \fi
      \fi
      \tabl_ntb_spn_doifelse\c_tabl_ntb_col
-       {\edef\p_option{\naturaltablelocalparameter\c!option}%
-        \ifx\p_option\v!tight\donefalse\else\donetrue\fi}%
+       {\iftightTBLcolspan
+          \donefalse
+        \else
+          \edef\p_option{\naturaltablelocalparameter\c!option}%
+          \ifx\p_option\v!tight\donefalse\else\donetrue\fi
+        \fi}%
        \donetrue
      \ifdone
        \ifdim\tabl_ntb_get_wid\c_tabl_ntb_col<\wd\scratchbox
diff --git a/tex/context/base/tabl-xtb.lua b/tex/context/base/tabl-xtb.lua
index 9be8f9be0..7569b303a 100644
--- a/tex/context/base/tabl-xtb.lua
+++ b/tex/context/base/tabl-xtb.lua
@@ -212,7 +212,7 @@ function xtables.create(settings)
     data.criterium_v =   2 * data.settings.lineheight
     data.criterium_h = .75 * data.settings.textwidth
     --
-    data.tight = globaloptions[v_tight]
+    data.tight = globaloptions[v_tight] and true or false
 end
 
 function xtables.initialize_reflow_width(option,width)
@@ -265,11 +265,12 @@ function xtables.set_reflow_width()
         end
     else
         local options = data.options[r][c]
-        if not options then
+        if data.tight then
+            -- no check
+        elseif not options then
             if width > widths[c] then
                 widths[c] = width
             end
---         elseif not data.tight and not options[v_tight] then
         elseif not options[v_tight] then
             if width > widths[c] then
                 widths[c] = width
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 45d02e978..2d03f75cb 100644
--- a/tex/generic/context/luatex/luatex-fonts-merged.lua
+++ b/tex/generic/context/luatex/luatex-fonts-merged.lua
@@ -1,6 +1,6 @@
 -- merged file : luatex-fonts-merged.lua
 -- parent file : luatex-fonts.lua
--- merge date  : 01/05/15 00:14:00
+-- merge date  : 01/05/15 13:06:13
 
 do -- begin closure to overcome local limits and interference