2018-08-16 10:24:00

14 files changed, 47 insertions, 16 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 1754d01bb..40286f161 100644
--- a/tex/context/base/mkii/cont-new.mkii
+++ b/tex/context/base/mkii/cont-new.mkii
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2018.08.15 18:45}
+\newcontextversion{2018.08.16 10:17}
 
 %D This file is loaded at runtime, thereby providing an
 %D excellent place for hacks, patches, extensions and new
diff --git a/tex/context/base/mkii/context.mkii b/tex/context/base/mkii/context.mkii
index 98ae174c2..290233d37 100644
--- a/tex/context/base/mkii/context.mkii
+++ b/tex/context/base/mkii/context.mkii
@@ -20,7 +20,7 @@
 %D your styles an modules.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2018.08.15 18:45}
+\edef\contextversion{2018.08.16 10:17}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/cldf-bas.lua b/tex/context/base/mkiv/cldf-bas.lua
index 0f9ef4e47..af698ac97 100644
--- a/tex/context/base/mkiv/cldf-bas.lua
+++ b/tex/context/base/mkiv/cldf-bas.lua
@@ -176,16 +176,46 @@ context.registers = {
     newchar   = function(name,u) context([[\chardef\%s=%s\relax]],name,u) end,
 }
 
-if LUATEXFUNCTIONALITY > 6780 then
+do
+
+    local ctx_flushnode = context.nodes.flush
 
     function context.latelua(f)
-        sprint(new_latelua(f)) -- maybe just context
+        ctx_flushnode(new_latelua(f))
     end
 
-else
+end
+-- yes or no
+
+do
+
+    local NC = ctxcore.NC
+    local BC = ctxcore.BC
+    local NR = ctxcore.NR
+
+    context.nc = setmetatable({ }, {
+        __call =
+            function(t,...)
+                NC()
+                return context(...)
+            end,
+        __index =
+            function(t,k)
+                NC()
+                return context[k]
+            end,
+        }
+    )
+
+    function context.bc(...)
+        BC()
+        return context(...)
+    end
 
-    function context.latelua(f)
-        context(new_latelua(f))
+    function context.nr(...)
+        NC()
+        NR()
     end
 
 end
+
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 1bc20c01a..fdf68f8d7 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{2018.08.15 18:45}
+\newcontextversion{2018.08.16 10:17}
 
 %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 c6262c682..f04ada119 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -42,7 +42,7 @@
 %D has to match \type {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2018.08.15 18:45}
+\edef\contextversion{2018.08.16 10:17}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/node-nut.lua b/tex/context/base/mkiv/node-nut.lua
index 0397f0607..55d292af7 100644
--- a/tex/context/base/mkiv/node-nut.lua
+++ b/tex/context/base/mkiv/node-nut.lua
@@ -236,7 +236,7 @@ if not direct.getdata then
             elseif subtype == pdf_literal_code then
                 return getfield(n,"data"), getfield(n,"mode")
             elseif subtype == late_lua_code then
-                return getfield(n,"data")
+                return getfield(n,"string")
             elseif subtype == pdf_setmatrix_code then
                 return getfield(n,"data")
             elseif subtype == special_code then
@@ -263,7 +263,7 @@ if not direct.getdata then
                     setfield(n,"mode",vv)
                 end
             elseif subtype == late_lua_code then
-                setfield(n,"data",v)
+                setfield(n,"string",v)
             elseif subtype == pdf_setmatrix_code then
                 setfield(n,"data",v)
             elseif subtype == special_code then
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 84771a875..5b0fd601e 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 e89ba0959..5a9ff773c 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/strc-lst.mkvi b/tex/context/base/mkiv/strc-lst.mkvi
index ae9e0c042..f082615bb 100644
--- a/tex/context/base/mkiv/strc-lst.mkvi
+++ b/tex/context/base/mkiv/strc-lst.mkvi
@@ -147,7 +147,7 @@
 % \unexpanded
 
 \def\strc_lists_inject_enhance#listindex#internal%
-  {\normalexpanded{\clf_deferredenhancelist#listindex}}
+  {\clf_deferredenhancelist#listindex\relax}
 
 \unexpanded\def\strc_lists_inject_yes[#settings][#userdata]% can be used directly
   {\setupcurrentlist[\c!type=userdata,\c!location=\v!none,#settings]% grouped (use \let...
diff --git a/tex/context/base/mkiv/util-sql-imp-ffi.lua b/tex/context/base/mkiv/util-sql-imp-ffi.lua
index 2a2bc6569..fededa63f 100644
--- a/tex/context/base/mkiv/util-sql-imp-ffi.lua
+++ b/tex/context/base/mkiv/util-sql-imp-ffi.lua
@@ -262,8 +262,6 @@ local mt = { __index = {
     }
 }
 
-local nt = setmetatable({},mt)
-
 -- session
 
 local function close(t)
@@ -297,7 +295,8 @@ local function execute(t,query)
                 }
                 return setmetatable(t,mt)
             else
-                return nt
+                return false
+             -- return setmetatable({},mt)
             end
         end
     end
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index dc007cc91..7e43ed9cb 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 915c8f545..c73529dcd 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/context/modules/mkiv/m-scite.mkiv b/tex/context/modules/mkiv/m-scite.mkiv
index f1a45574e..0c258a860 100644
--- a/tex/context/modules/mkiv/m-scite.mkiv
+++ b/tex/context/modules/mkiv/m-scite.mkiv
@@ -297,6 +297,7 @@ visualizers.register("cpp",   visualizer)
 visualizers.register("txt",   visualizer)
 visualizers.register("bnf",   visualizer)
 visualizers.register("sql",   visualizer)
+visualizers.register("json",  visualizer)
 
 \stopluacode
 
@@ -310,6 +311,7 @@ visualizers.register("sql",   visualizer)
 \definetyping[TXT] [option=txt]
 \definetyping[BNF] [option=bnf]    % I might use this in the metafun manual.
 \definetyping[SQL] [option=sql]    % To be tested in an upcoming manual.
+\definetyping[JSON][option=json]   % To be tested in an upcoming manual.
 \definetyping[NONE][option=none]
 
 % This is a preliminary interface.
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index e7ce88bfd..d37e64216 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 : c:/data/develop/context/sources/luatex-fonts-merged.lua
 -- parent file : c:/data/develop/context/sources/luatex-fonts.lua
--- merge date  : 08/15/18 18:45:58
+-- merge date  : 08/16/18 10:17:32
 
 do -- begin closure to overcome local limits and interference