2016-09-01 19:38:00

12 files changed, 82 insertions, 64 deletions

diff --git a/tex/context/base/mkiv/colo-ini.mkiv b/tex/context/base/mkiv/colo-ini.mkiv
index 4e6e58032..54ad1e9f9 100644
--- a/tex/context/base/mkiv/colo-ini.mkiv
+++ b/tex/context/base/mkiv/colo-ini.mkiv
@@ -484,7 +484,9 @@
 
 \def\colo_palet_prepare#1%
   {\edef\colo_palet_name{#1}%
-   \ifcsname\??paletlist\colo_palet_name\endcsname\else
+   \ifcsname\??paletlist\colo_palet_name\endcsname
+     \csname\??paletsize#1\endcsname\zerocount
+   \else
      \colo_palet_allocate\colo_palet_name
    \fi
    \edef\m_colo_palet{\begincsname\??paletlist\colo_palet_name\endcsname}%
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index fe4f9be2a..f796a920f 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.08.29 22:53}
+\newcontextversion{2016.09.01 19:33}
 
 %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/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 16de7726b..a0b600a16 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.08.29 22:53}
+\edef\contextversion{2016.09.01 19:33}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/l-lua.lua b/tex/context/base/mkiv/l-lua.lua
index b90f37e3d..357153836 100644
--- a/tex/context/base/mkiv/l-lua.lua
+++ b/tex/context/base/mkiv/l-lua.lua
@@ -198,3 +198,4 @@ if flush then
     local popen   = io.popen   if popen   then function io.popen  (...) flush() return popen  (...) end end
 
 end
+
diff --git a/tex/context/base/mkiv/publ-ini.mkiv b/tex/context/base/mkiv/publ-ini.mkiv
index 3e39dc770..f6500fdd7 100644
--- a/tex/context/base/mkiv/publ-ini.mkiv
+++ b/tex/context/base/mkiv/publ-ini.mkiv
@@ -1096,7 +1096,10 @@
 
 \unexpanded\def\currentbtxciteauthor % always author
   {\begingroup
-   \setbtxparameterset\s!cite\s!author
+   %\setbtxparameterset\s!cite\s!author
+   % the alternatives inherit from cite:author
+   % and APA distinguishes authoryears from authoryear ("and" vs. "&")
+   \setbtxparameterset\s!cite\currentbtxcitealternative
    \clf_btxauthor
         {\currentbtxdataset}%
         {\currentbtxtag}%
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index d9d58d670..4be380a83 100644
--- a/tex/context/base/mkiv/status-files.pdf
+++ b/tex/context/base/mkiv/status-files.pdf
diff --git a/tex/context/base/mkiv/status-lua.pdf b/tex/context/base/mkiv/status-lua.pdf
index cda7a8d2e..089686f63 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/tabl-ntb.mkiv b/tex/context/base/mkiv/tabl-ntb.mkiv
index aeef22326..3f3a1d04e 100644
--- a/tex/context/base/mkiv/tabl-ntb.mkiv
+++ b/tex/context/base/mkiv/tabl-ntb.mkiv
@@ -2047,37 +2047,57 @@
       \inheritednaturaltablelocalframed{\tabl_ntb_cell_start\tabl_ntb_char_align{#1}{#2}#4\tabl_ntb_cell_stop}}%
    \hskip\tabl_ntb_get_dis{#2}}
 
-\setupTABLE
-  [\c!frameoffset=.5\linewidth,
-   \c!backgroundoffset=\v!frame,
- % \c!framecolor=\s!black,
-   \c!width=\v!fit,
-   \c!height=\v!fit,
-   \c!autowidth=\v!yes,
-   \c!rulethickness=\linewidth,
-   \c!strut=\v!yes,
-   \c!autostrut=\v!no,
-   %
-   \c!color=,
-   \c!style=,
-   \c!headstyle=\v!bold,
-   \c!headcolor=,
-   \c!aligncharacter=\v!no,
-   \c!alignmentcharacter={,},
-   \c!option=, % \v!stretch
-   \c!header=,
-   \c!spaceinbetween=,
-   \c!maxwidth=8\emwidth,
-   \c!textwidth=\v!local, % was \hsize
-   \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=]
+\newtoks\everyresetTABLEyes
+\newtoks\everyresetTABLEnop
+
+\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,%
+        \c!width=\v!fit,%
+        \c!height=\v!fit,%
+        \c!autowidth=\v!yes,%
+        \c!rulethickness=\linewidth,%
+        \c!strut=\v!yes,%
+        \c!autostrut=\v!no,%
+        %
+        \c!color=,%
+        \c!style=,%
+        \c!headstyle=\v!bold,%
+        \c!headcolor=,%
+        \c!aligncharacter=\v!no,%
+        \c!alignmentcharacter={,},%
+        \c!option=,%                         \v!stretch
+        \c!header=,%
+        \c!spaceinbetween=,%
+        \c!maxwidth=8\emwidth,%
+        \c!textwidth=\v!local,%              was \hsize
+        \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=%
+    ]%
+\to \everyresetTABLEyes
+
+\appendtoks
+    \setupTABLE [%
+        \c!width=\v!fit,%
+        \c!height=\v!fit%
+    ]%
+\to \everyresetTABLEnop
+
+\the\everyresetTABLEyes
 
 % \bgroup
 % \setupTABLE[column][1][aligncharacter=yes, alignmentcharacter={,}]
@@ -2098,29 +2118,9 @@
 \def\tabl_ntb_parameters_reset % we can use setters instead
   {\ifnum\m_tabl_tbl_level>\plusone % in ieder geval
      \ifconditional\resetTABLEmode
-       % not ok yet
-       \setupTABLE
-         [\c!frameoffset=.5\linewidth,
-          \c!backgroundoffset=\v!frame,
-        % \c!framecolor=\s!black,
-          \c!width=\v!fit,
-          \c!height=\v!fit,
-          \c!autowidth=\v!yes,
-        % \c!rulethickness=\linewidth,
-          \c!strut=\v!no,
-          \c!strut=\v!yes, % needed for mathml, but ... maybe we need another resetTABLEmode
-          \c!autostrut=\v!no,
-          \c!color=,
-          \c!style=,
-          \c!headstyle=,
-          \c!headcolor=,
-          \c!aligncharacter=\v!no,
-          \c!alignmentcharacter={,},
-          \c!maxwidth=8\emwidth]%
+        \the\everyresetTABLEyes
      \else
-       \setupTABLE
-         [\c!width=\v!fit,
-          \c!height=\v!fit]%
+        \the\everyresetTABLEnop
      \fi
   \fi}
 
diff --git a/tex/context/base/mkiv/util-lua.lua b/tex/context/base/mkiv/util-lua.lua
index e1dcdc94d..d4020a1e9 100644
--- a/tex/context/base/mkiv/util-lua.lua
+++ b/tex/context/base/mkiv/util-lua.lua
@@ -158,3 +158,15 @@ end
 -- luautilities.registerdatatype(lpeg.P("!"),"lpeg")
 --
 -- print(luautilities.datatype(lpeg.P("oeps")))
+
+-- local finalizers = { }
+--
+-- function luautilities.registerfinalizer(f)
+--     finalizers[#finalizers+1] = f
+-- end
+--
+-- function luautilities.finalize()
+--     for i=1,#finalizers do
+--         pcall(finalizers[i])
+--     end
+-- end
diff --git a/tex/context/base/mkiv/util-sql-imp-client.lua b/tex/context/base/mkiv/util-sql-imp-client.lua
index 9a0fbc299..50b1e9dff 100644
--- a/tex/context/base/mkiv/util-sql-imp-client.lua
+++ b/tex/context/base/mkiv/util-sql-imp-client.lua
@@ -1,4 +1,4 @@
-if not modules then modules = { } end modules ['util-sql-client'] = {
+if not modules then modules = { } end modules ['util-sql-imp-client'] = {
     version   = 1.001,
     comment   = "companion to util-sql.lua",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
@@ -144,7 +144,7 @@ SET NOCOUNT ON;
     ]],
 }
 
-local function dataprepared(specification,client)
+local function dataprepared(specification)
     local query = preparetemplate(specification)
     if query then
         local preamble = t_preamble[getserver()] or t_preamble.mysql
@@ -165,7 +165,7 @@ local function dataprepared(specification,client)
     end
 end
 
-local function datafetched(specification,client)
+local function datafetched(specification)
     local runner  = t_runner[getserver()] or t_runner.mysql
     local command = replacetemplate(runner,specification)
     if trace_sql then
@@ -220,11 +220,11 @@ local function execute(specification)
         report_state("error in specification")
         return
     end
-    if not dataprepared(specification,methods.client) then
+    if not dataprepared(specification) then
         report_state("error in preparation")
         return
     end
-    if not datafetched(specification,methods.client) then
+    if not datafetched(specification) then
         report_state("error in fetching, query: %s",string.collapsespaces(io.loaddata(specification.queryfile)))
         return
     end
diff --git a/tex/context/base/mkiv/util-sql-imp-library.lua b/tex/context/base/mkiv/util-sql-imp-library.lua
index 15754e26a..6dbd5a4eb 100644
--- a/tex/context/base/mkiv/util-sql-imp-library.lua
+++ b/tex/context/base/mkiv/util-sql-imp-library.lua
@@ -1,4 +1,4 @@
-if not modules then modules = { } end modules ['util-sql-library'] = {
+if not modules then modules = { } end modules ['util-sql-imp-library'] = {
     version   = 1.001,
     comment   = "companion to util-sql.lua",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
diff --git a/tex/context/base/mkiv/util-sql-imp-swiglib.lua b/tex/context/base/mkiv/util-sql-imp-swiglib.lua
index e4bed183a..5ea5d7735 100644
--- a/tex/context/base/mkiv/util-sql-imp-swiglib.lua
+++ b/tex/context/base/mkiv/util-sql-imp-swiglib.lua
@@ -1,4 +1,4 @@
-if not modules then modules = { } end modules ['util-sql-swiglib'] = {
+if not modules then modules = { } end modules ['util-sql-imp-swiglib'] = {
     version   = 1.001,
     comment   = "companion to util-sql.lua",
     author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",