diff options
| -rw-r--r-- | doc/context/documents/general/manuals/xtables-mkiv.pdf | bin | 135389 -> 135910 bytes | |||
| -rw-r--r-- | doc/context/sources/general/manuals/xtables/xtables-mkiv.tex | 19 | ||||
| -rw-r--r-- | tex/context/base/cont-new.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/context-version.pdf | bin | 4380 -> 4384 bytes | |||
| -rw-r--r-- | tex/context/base/context.mkiv | 2 | ||||
| -rw-r--r-- | tex/context/base/status-files.pdf | bin | 24913 -> 24927 bytes | |||
| -rw-r--r-- | tex/context/base/status-lua.pdf | bin | 356714 -> 356715 bytes | |||
| -rw-r--r-- | tex/context/base/tabl-ntb.mkiv | 17 | ||||
| -rw-r--r-- | tex/context/base/tabl-xtb.lua | 7 | ||||
| -rw-r--r-- | tex/generic/context/luatex/luatex-fonts-merged.lua | 2 |
10 files changed, 39 insertions, 10 deletions
diff --git a/doc/context/documents/general/manuals/xtables-mkiv.pdf b/doc/context/documents/general/manuals/xtables-mkiv.pdf Binary files differindex 75cce413b..ba3f1b3e0 100644 --- a/doc/context/documents/general/manuals/xtables-mkiv.pdf +++ b/doc/context/documents/general/manuals/xtables-mkiv.pdf diff --git a/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex b/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex index a83484658..302f2880c 100644 --- a/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex +++ b/doc/context/sources/general/manuals/xtables/xtables-mkiv.tex @@ -754,6 +754,25 @@ But, if you want you can control the enforced width by setting an option: \typebuffer \getbuffer +There is also a global setting: + +\startbuffer +\startxtable[option=tight] + \startxrow + \startxcell[nx=3] + 1/2/3 + \stopxcell + \stopxrow + \startxrow + \startxcell 1 \stopxcell + \startxcell 2 \stopxcell + \startxcell 3 \stopxcell + \stopxrow +\stopxtable +\stopbuffer + +\typebuffer \getbuffer + \stopsection \startsection[title={Nesting}] 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 Binary files differindex 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 Binary files differindex 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 Binary files differindex 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 |