2018-10-08 17:52:00

35 files changed, 473 insertions, 229 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 269f053f9..439cdf147 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.10.03 16:02}
+\newcontextversion{2018.10.08 17:44}
 
 %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 5fa5ed7d2..88a4cac8c 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.10.03 16:02}
+\edef\contextversion{2018.10.08 17:44}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-de.mkii b/tex/context/base/mkii/mult-de.mkii
index 6e30e12ad..0958b3464 100644
--- a/tex/context/base/mkii/mult-de.mkii
+++ b/tex/context/base/mkii/mult-de.mkii
@@ -1241,6 +1241,7 @@
 \setinterfaceconstant{textstyle}{textstil}
 \setinterfaceconstant{textwidth}{textbreite}
 \setinterfaceconstant{threshold}{threshold}
+\setinterfaceconstant{time}{time}
 \setinterfaceconstant{title}{titel}
 \setinterfaceconstant{titlecolor}{titelfarbe}
 \setinterfaceconstant{titlecommand}{titlecommand}
diff --git a/tex/context/base/mkii/mult-en.mkii b/tex/context/base/mkii/mult-en.mkii
index a9fffa0ea..bbe977f64 100644
--- a/tex/context/base/mkii/mult-en.mkii
+++ b/tex/context/base/mkii/mult-en.mkii
@@ -1241,6 +1241,7 @@
 \setinterfaceconstant{textstyle}{textstyle}
 \setinterfaceconstant{textwidth}{textwidth}
 \setinterfaceconstant{threshold}{threshold}
+\setinterfaceconstant{time}{time}
 \setinterfaceconstant{title}{title}
 \setinterfaceconstant{titlecolor}{titlecolor}
 \setinterfaceconstant{titlecommand}{titlecommand}
diff --git a/tex/context/base/mkiv/back-exp.lua b/tex/context/base/mkiv/back-exp.lua
index 10aca0a46..04f376d96 100644
--- a/tex/context/base/mkiv/back-exp.lua
+++ b/tex/context/base/mkiv/back-exp.lua
@@ -2950,6 +2950,7 @@ local collectresults  do -- too many locals otherwise
         local p
         local localparagraph
         local maybewrong
+        local pid
         for n, id, subtype in nextnode, head do
             if trace_detail then
                 showdetail(n,id,subtype)
@@ -3180,6 +3181,8 @@ end
                             if not keephyphens then
                                 nofcurrentcontent = nofcurrentcontent - 1
                             end
+                        elseif pid == disc_code then
+                            -- go on .. tricky: we should mark the glyhs as coming from a disc
                         elseif not somespace[r] then
                             local a = getattr(n,a_tagged) or pat
                             if a == last then
@@ -3288,7 +3291,8 @@ end
             elseif id == localpar_code then
                 localparagraph = getattr(n,a_taggedpar)
             end
-            p = n
+            p   = n
+            pid = id
         end
         if maybewrong then
             showmaybe(maybewrong)
diff --git a/tex/context/base/mkiv/back-swf.mkiv b/tex/context/base/mkiv/back-swf.mkiv
index 0a53a8fd2..20a94266a 100644
--- a/tex/context/base/mkiv/back-swf.mkiv
+++ b/tex/context/base/mkiv/back-swf.mkiv
@@ -11,6 +11,9 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+%D The question is: should I still document this in interaction.tex or just
+%D assume it's obsolete technology \unknown
+
 %D This is only a placeholder that demonstrates the usage of swf resources.
 %D There is no need to include this file into the format. The module was
 %D tested by Luigi and Willi and based on their suggestions the functionality
@@ -58,6 +61,8 @@
 %D   [file=test.mp4,
 %D    label=foo]
 %D
+%D \useJSscripts[vplayer] % or \useJSscripts[videoplayer]
+%D
 %D \goto{START} [JS(StartShockwave{foo})]
 %D \goto{REWIND}[JS(RewindShockwave{foo})]
 %D \goto{PAUSE} [JS(PauseShockwave{foo})]
@@ -84,100 +89,8 @@
 
 \unprotect
 
-\startluaparameterset[shockwave:display]
-    toolbar  = true,
- -- preview  = "somefile",
-    open     = "click",
-    close    = "focus",
-\stopluaparameterset
-
-% using vplayer9.swf from ctan:
-
-\useexternalfigure
-  [shockwave]
-  [vplayer9.swf]
-% [arguments=\luaparameterset{shockwave:arguments}{src="\externalfigureparameter\v!file",source="\externalfigureparameter\v!file"},
-  [\c!arguments=\luaparameterset{shockwave:arguments}{source="\externalfigureparameter\v!file",autoPlay=true},
-   \c!resources=\luaparameterset{shockwave:resources}{files={"\externalfigureparameter\v!file"}},
-   \c!display=shockwave:display]
-
-\startJSpreamble shockwave used now
-    function StartShockwave(label) {
-        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
-        if (rm.activated) {
-            // ok
-        } else {
-            rm.activated = true ;
-        }
-        rm.callAS("rewind") ;
-        rm.callAS("playPause") ;
-    }
-    function StopShockwave(label) {
-        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
-        if (rm.activated) {
-            rm.callAS("pause") ;
-            rm.callAS("rewind") ;
-        }
-    }
-    function RewindShockwave(label) {
-        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
-        if (rm.activated) {
-            rm.callAS("rewind") ;
-        }
-    }
-    function PauseShockwave(label) {
-        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
-        if (rm.activated) {
-            rm.callAS("playPause") ;
-        }
-    }
-\stopJSpreamble
-
-% using videoplayer.swf from adobe or strobemediaplayback.swf from sourceforge:
-
-%\useexternalfigure
-%  [shockwave]
-%  [videoplayer.swf]
-%  [\c!arguments=\luaparameterset{shockwave:arguments}{source="\externalfigureparameter\v!file"},
-%   \c!resources=\luaparameterset{shockwave:resources}{files={"\externalfigureparameter\v!file"}},
-%   \c!display=shockwave:display]
-
-\startJSpreamble shockwave used now
-    function StartShockwave(label) {
-        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
-        if (rm.activated) {
-            rm.callAS("multimedia_play") ;
-        } else {
-            rm.activated = true ;
-        }
-    }
-    function StopShockwave(label) {
-        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
-        if (rm.activated) {
-            rm.callAS("multimedia_pause") ;
-            rm.callAS("multimedia_rewind") ;
-        }
-    }
-    function RewindShockwave(label) {
-        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
-        if (rm.activated) {
-            rm.callAS("multimedia_rewind") ;
-        }
-    }
-    function PauseShockwave(label) {
-        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
-        if (rm.activated) {
-            rm.callAS("multimedia_pause") ;
-        }
-    }
-\stopJSpreamble
-
-% \useexternalfigure
-%   [shockwave]
-%   [strobemediaplayback.swf]
-%   [arguments=\luaparameterset{shockwave:arguments}{src="\externalfigureparameter\v!file"},
-%    resources=\luaparameterset{shockwave:resources}{files={"\externalfigureparameter\v!file"}},
-%    display=shockwave:display]
+%D The code has moved to the (explicitly loaded) \JAVASCRIPT\ modules. See there
+%D for more info.
 
 \protect \endinput
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 3e3ab3bde..c3c035160 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.10.03 16:02}
+\newcontextversion{2018.10.08 17:44}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
@@ -30,6 +30,8 @@
     \let\w\mathword
 \to \everymathematics
 
+\let\assumelongusagecs\relax
+
 % done
 
 \protect \endinput
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 5a944df23..9b166fb03 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.10.03 16:02}
+\edef\contextversion{2018.10.08 17:44}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/font-cff.lua b/tex/context/base/mkiv/font-cff.lua
index ecd49fa3a..2c7d61521 100644
--- a/tex/context/base/mkiv/font-cff.lua
+++ b/tex/context/base/mkiv/font-cff.lua
@@ -28,7 +28,7 @@ if not modules then modules = { } end modules ['font-cff'] = {
 
 local next, type, tonumber = next, type, tonumber
 local byte, char, gmatch = string.byte, string.char, string.gmatch
-local concat, remove = table.concat, table.remove
+local concat, remove, unpack = table.concat, table.remove, table.unpack
 local floor, abs, round, ceil, min, max = math.floor, math.abs, math.round, math.ceil, math.min, math.max
 local P, C, R, S, C, Cs, Ct = lpeg.P, lpeg.C, lpeg.R, lpeg.S, lpeg.C, lpeg.Cs, lpeg.Ct
 local lpegmatch = lpeg.match
diff --git a/tex/context/base/mkiv/font-one.lua b/tex/context/base/mkiv/font-one.lua
index 85b9d406e..48bf117fe 100644
--- a/tex/context/base/mkiv/font-one.lua
+++ b/tex/context/base/mkiv/font-one.lua
@@ -106,6 +106,7 @@ function afm.load(filename)
                 afmenhancers.apply(data,filename)
              -- otfreaders.addunicodetable(data) -- only when not done yet
                 fonts.mappings.addtounicode(data,filename)
+                otfreaders.stripredundant(data)
              -- otfreaders.extend(data)
                 otfreaders.pack(data)
                 data.size = size
diff --git a/tex/context/base/mkiv/font-oup.lua b/tex/context/base/mkiv/font-oup.lua
index 012b007d5..14df60822 100644
--- a/tex/context/base/mkiv/font-oup.lua
+++ b/tex/context/base/mkiv/font-oup.lua
@@ -715,7 +715,7 @@ local function checklookups(fontdata,missing,nofmissing)
             end
         end
         if next(done) then
-            report_unicode("not unicoded: % t",sortedkeys(done))
+            report_unicodes("not unicoded: % t",sortedkeys(done))
         end
     end
 end
@@ -916,12 +916,53 @@ local function unifyglyphs(fontdata,usenames)
     return indices, names
 end
 
-local p_bogusname = (
-    (P("uni") + P("UNI") + P("Uni") + P("U") + P("u")) * S("Xx")^0 * R("09","AF")^1
-  + (P("identity") + P("Identity") + P("IDENTITY")) * R("09","AF")^1
-  + (P("index") + P("Index") + P("INDEX")) * R("09")^1
-) * (P(-1) + P("."))
+local p_crappyname  do
+
+    local p_hex   = R("af","AF","09")
+    local p_digit = R("09")
+    local p_done  = S("._-")^0 + P(-1)
+    local p_alpha = R("az","AZ")
+    local p_ALPHA = R("AZ")
+
+    p_crappyname = (
+    -- (P("uni") + P("UNI") + P("Uni") + P("U") + P("u"))
+        lpeg.utfchartabletopattern({ "uni", "u" },true)
+      * S("Xx_")^0
+      * p_hex^1
+   -- + (P("identity") + P("Identity") + P("IDENTITY") + P("glyph") + P("jamo"))
+      + lpeg.utfchartabletopattern({ "identity", "glyph", "jamo" },true)
+      * p_hex^1
+   -- + (P("index") + P("Index") + P("INDEX")+ P("afii"))
+      + lpeg.utfchartabletopattern({ "index", "afii" }, true)
+      * p_digit^1
+      -- also happens l
+      + p_digit
+      * p_hex^3
+      + p_alpha
+      * p_digit^1
+      -- sort of special
+      + P("aj")
+      * p_digit^1
+      + P("eh_")
+      * (p_digit^1 + p_ALPHA * p_digit^1)
+      + (1-P("_"))^1
+      * P("_uni")
+      * p_hex^1
+      + P("_")
+      * P(1)^1
+    ) * p_done
 
+end
+
+-- In context we only keep glyph names because of tracing and access by name
+-- so weird names make no sense.
+
+local forcekeep = false -- only for testing something
+
+directives.register("otf.keepnames",function(v)
+    report_cleanup("keeping weird glyph names, expect larger files and more memory usage")
+    forcekeep = v
+end)
 
 local function stripredundant(fontdata)
     local descriptions = fontdata.descriptions
@@ -939,7 +980,7 @@ local function stripredundant(fontdata)
         else
             for unicode, d in next, descriptions do
                 local name = d.name
-                if name and lpegmatch(p_bogusname,name) then
+                if name and lpegmatch(p_crappyname,name) then
                     d.name = nil
                     n = n + 1
                 end
@@ -960,6 +1001,8 @@ local function stripredundant(fontdata)
     end
 end
 
+readers.stripredundant = stripredundant
+
 function readers.getcomponents(fontdata) -- handy for resolving ligatures when names are missing
     local resources = fontdata.resources
     if resources then
diff --git a/tex/context/base/mkiv/grph-inc.mkiv b/tex/context/base/mkiv/grph-inc.mkiv
index 62ac39864..371725271 100644
--- a/tex/context/base/mkiv/grph-inc.mkiv
+++ b/tex/context/base/mkiv/grph-inc.mkiv
@@ -204,7 +204,7 @@
            {\grph_include_use_indeed{#1}{#2}{#3}{#4}}}}}
 
 \def\grph_include_use_indeed#1#2#3#4%
-  {\setvalue{\??externalfigureinstance#1}{\grph_include_setup{#2}{#3}{#4}}%
+  {\dodoglobal\setvalue{\??externalfigureinstance#1}{\grph_include_setup{#2}{#3}{#4}}%
    \grph_include_analyze_collection[#2][#4]}
 
 % inclusion
diff --git a/tex/context/base/mkiv/java-imp-exa.mkiv b/tex/context/base/mkiv/java-imp-example.mkiv
index 584ee1351..82d5b0cb0 100644
--- a/tex/context/base/mkiv/java-imp-exa.mkiv
+++ b/tex/context/base/mkiv/java-imp-example.mkiv
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=java-exa,
+%D   [       file=java-imp-example, % was: java-exa
 %D        version=2002.??.??,
 %D          title=\CONTEXT\ JavaScript Macros,
 %D       subtitle=Example Support,
@@ -11,6 +11,9 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
+%D This code is just kept as an example of dealign with forms and submitting data to
+%D a server. We used this to create stepwise growing student test forms and such.
+
 % XFDF versus HTML
 % localhost versus remote versus set
 
diff --git a/tex/context/base/mkiv/java-imp-fld.mkiv b/tex/context/base/mkiv/java-imp-fields.mkiv
index 559ab01b3..5801c3216 100644
--- a/tex/context/base/mkiv/java-imp-fld.mkiv
+++ b/tex/context/base/mkiv/java-imp-fields.mkiv
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=java-fld,
+%D   [       file=java-imp-fields, % was java-fld
 %D        version=1998.05.20,
 %D          title=\CONTEXT\ JavaScript Macros,
 %D       subtitle=Field Support,
@@ -26,9 +26,9 @@
 %D Probably a \UNICODE\ issue. Beware, in \MKIV\ we have a
 %D different escaping of \type {\\}.
 %D
-%D Watch out: cf. the latest pdf specification we've changed
-%D On into Yes. Also, we've changed the test for the on value
-%D into !Off as we dón't know what value it gets in the reader.
+%D Watch out: cf. the latest pdf specification we've changed On into Yes. Also,
+%D we've changed the test for the on value into !Off as we dón't know what value it
+%D gets in the reader.
 
 % Is this still okay? We can have unicode now, can't we? Anyway it's kind of
 % messy and unneeded in these unicode times.
diff --git a/tex/context/base/mkiv/java-imp-rhh.mkiv b/tex/context/base/mkiv/java-imp-highlight.mkiv
index 5f057f550..b55628f4b 100644
--- a/tex/context/base/mkiv/java-imp-rhh.mkiv
+++ b/tex/context/base/mkiv/java-imp-highlight.mkiv
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=java-rhh,
+%D   [       file=java-imp-highlightm, % was: java-rhh
 %D        version=2010.02.01,
 %D          title=\CONTEXT\ JavaScript Macros,
 %D       subtitle=Runtime Highlight Hack,
diff --git a/tex/context/base/mkiv/java-imp-fil.mkiv b/tex/context/base/mkiv/java-imp-print.mkiv
index 808950f28..3d5325ff0 100644
--- a/tex/context/base/mkiv/java-imp-fil.mkiv
+++ b/tex/context/base/mkiv/java-imp-print.mkiv
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=java-fil,
+%D   [       file=java-imp-print, % was: java-fil
 %D        version=1998.06.01,
 %D          title=\CONTEXT\ JavaScript Macros,
 %D       subtitle=Filing and Printing,
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\startJSpreamble Auxiliary used now
+\startJSpreamble auxiliary used now
 
     function DocumentFileName() {
         var Paths = this.path.split("/") ;
diff --git a/tex/context/base/mkiv/java-imp-stp.mkiv b/tex/context/base/mkiv/java-imp-steps.mkiv
index 8ac5d58b8..3990e4d7a 100644
--- a/tex/context/base/mkiv/java-imp-stp.mkiv
+++ b/tex/context/base/mkiv/java-imp-steps.mkiv
@@ -1,5 +1,5 @@
 %D \module
-%D   [       file=java-stp,
+%D   [       file=java-imp-steps, % was: java-stp
 %D        version=2004.03.15,
 %D          title=\CONTEXT\ JavaScript Macros,
 %D       subtitle=Stepping,
diff --git a/tex/context/base/mkiv/java-imp-videoplayer.mkiv b/tex/context/base/mkiv/java-imp-videoplayer.mkiv
new file mode 100644
index 000000000..beda499a7
--- /dev/null
+++ b/tex/context/base/mkiv/java-imp-videoplayer.mkiv
@@ -0,0 +1,82 @@
+%D \module
+%D   [       file=java-imp-videoplayer,
+%D        version=2009.12.31,
+%D          title=\CONTEXT\ JavaScript Macros,
+%D       subtitle=Shockwave Support,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D As part of the interaction manual writing this code was moved here. It's
+%D kind of obsolete as shockwave is obsolete.
+
+% using videoplayer.swf from adobe or strobemediaplayback.swf from sourceforge:
+
+\startluaparameterset[shockwave:display]
+    toolbar  = true,
+ -- preview  = "somefile",
+    open     = "click",
+    close    = "focus",
+\stopluaparameterset
+
+\startJSpreamble shockwave used now
+
+    function StartShockwave(label) {
+        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
+        if (rm.activated) {
+            rm.callAS("multimedia_play") ;
+        } else {
+            rm.activated = true ;
+        }
+    }
+
+    function StopShockwave(label) {
+        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
+        if (rm.activated) {
+            rm.callAS("multimedia_pause") ;
+            rm.callAS("multimedia_rewind") ;
+        }
+    }
+
+    function RewindShockwave(label) {
+        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
+        if (rm.activated) {
+            rm.callAS("multimedia_rewind") ;
+        }
+    }
+
+    function PauseShockwave(label) {
+        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
+        if (rm.activated) {
+            rm.callAS("multimedia_pause") ;
+        }
+    }
+
+\stopJSpreamble
+
+\definereference[StartShockwave] [JS(StartShockwave)]
+\definereference[StopShockwave]  [JS(StopShockwave)]
+\definereference[RewindShockwave][JS(RewindShockwave)]
+\definereference[PauseShockwave] [JS(PauseShockwave)]
+
+\unprotect
+
+\doglobal \useexternalfigure
+  [shockwave]
+  [videoplayer.swf]
+  [\c!arguments=\luaparameterset{shockwave:arguments}{source="\externalfigureparameter\v!file"},
+   \c!resources=\luaparameterset{shockwave:resources}{files={"\externalfigureparameter\v!file"}},
+   \c!display=shockwave:display]
+
+% \doglobal \useexternalfigure
+%   [shockwave]
+%   [strobemediaplayback.swf]
+%   [arguments=\luaparameterset{shockwave:arguments}{src="\externalfigureparameter\v!file"},
+%    resources=\luaparameterset{shockwave:resources}{files={"\externalfigureparameter\v!file"}},
+%    display=shockwave:display]
+
+\protect \endinput
diff --git a/tex/context/base/mkiv/java-imp-vplayer.mkiv b/tex/context/base/mkiv/java-imp-vplayer.mkiv
new file mode 100644
index 000000000..4ed08cad6
--- /dev/null
+++ b/tex/context/base/mkiv/java-imp-vplayer.mkiv
@@ -0,0 +1,105 @@
+%D \module
+%D   [       file=java-imp-vplayer,
+%D        version=2009.12.31,
+%D          title=\CONTEXT\ JavaScript Macros,
+%D       subtitle=Shockwave Support,
+%D         author=Hans Hagen,
+%D           date=\currentdate,
+%D      copyright={PRAGMA ADE \& \CONTEXT\ Development Team}]
+%C
+%C This module is part of the \CONTEXT\ macro||package and is
+%C therefore copyrighted by \PRAGMA. See mreadme.pdf for
+%C details.
+
+%D As part of the interaction manual writing this code was moved here. It's
+%D kind of obsolete as shockwave is obsolete. Anywaym, here's how it works.
+%D One can actually set all kind of properties but let's not waste time on
+%D that. Maybe some day \PDF\ will have proper native video support.
+%D
+%D \starttyping
+%D \starttext
+%D
+%D     \useJSscripts[vplayer]
+%D
+%D     \setupinteraction
+%D       [state=start]
+%D
+%D     \externalfigure
+%D       [shockwave]
+%D       [frame=on,
+%D        width=480pt,
+%D        height=270pt,
+%D       %file=mathematics.mp4, % Hollie McNish, Martin Pyper & Jules Buckley (Metropole Orchestra)
+%D        file=bathtub.mp4,     % Jacob Collier & Becca Stevens
+%D        label=foo]
+%D
+%D     \goto{START} [JS(StartShockwave{foo})]
+%D     \goto{REWIND}[JS(RewindShockwave{foo})]
+%D     \goto{PAUSE} [JS(PauseShockwave{foo})]
+%D     \goto{STOP}  [JS(StopShockwave{foo})]
+%D
+%D \stoptext
+%D \stoptyping
+
+% using vplayer9.swf from ctan:
+
+\startluaparameterset[shockwave:display]
+    toolbar  = true,
+ -- preview  = "somefile",
+    open     = "click",
+    close    = "focus",
+\stopluaparameterset
+
+\startJSpreamble shockwave used now
+
+    function StartShockwave(label) {
+        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
+        if (rm.activated) {
+            // ok
+        } else {
+            rm.activated = true ;
+        }
+        rm.callAS("rewind") ;
+        rm.callAS("playPause") ;
+    }
+
+    function StopShockwave(label) {
+        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
+        if (rm.activated) {
+            rm.callAS("pause") ;
+            rm.callAS("rewind") ;
+        }
+    }
+
+    function RewindShockwave(label) {
+        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
+        if (rm.activated) {
+            rm.callAS("rewind") ;
+        }
+    }
+
+    function PauseShockwave(label) {
+        var rm = this.getAnnotsRichMedia(this.pageNum,label)[0] ;
+        if (rm.activated) {
+            rm.callAS("playPause") ;
+        }
+    }
+
+\stopJSpreamble
+
+\definereference[StartShockwave] [JS(StartShockwave)]
+\definereference[StopShockwave]  [JS(StopShockwave)]
+\definereference[RewindShockwave][JS(RewindShockwave)]
+\definereference[PauseShockwave] [JS(PauseShockwave)]
+
+\unprotect
+
+\doglobal \useexternalfigure
+  [shockwave]
+  [vplayer9.swf]
+ %[arguments=\luaparameterset{shockwave:arguments}{src="\externalfigureparameter\v!file",source="\externalfigureparameter\v!file"},
+  [\c!arguments=\luaparameterset{shockwave:arguments}{source="\externalfigureparameter\v!file",autoPlay=true},
+   \c!resources=\luaparameterset{shockwave:resources}{files={"\externalfigureparameter\v!file"}},
+   \c!display=shockwave:display]
+
+\protect \endinput
diff --git a/tex/context/base/mkiv/java-ini.mkiv b/tex/context/base/mkiv/java-ini.mkiv
index 1a131d9da..95c9c5220 100644
--- a/tex/context/base/mkiv/java-ini.mkiv
+++ b/tex/context/base/mkiv/java-ini.mkiv
@@ -38,7 +38,6 @@
 %D \goto{calculate total}[Sum(1.5,2.3)]
 %D \stoptyping
 
-
 %D \macros
 %D   {startJScode}
 %D
@@ -162,4 +161,12 @@
 \def\java_use_preamble[#1]%
   {\clf_usejavascriptpreamble{#1}}% so this one comes later
 
+%D Here:
+
+\definefilesynonym[java-imp-fld.mkiv] [java-imp-fields.mkiv]
+\definefilesynonym[java-imp-stp.mkiv] [java-imp-steps.mkiv]
+\definefilesynonym[java-imp-fil.mkiv] [java-imp-print.mkiv]
+\definefilesynonym[java-imp-rhh.mkiv] [java-imp-highlight.mkiv]
+\definefilesynonym[java-imp-exa.mkiv] [java-imp-example.mkiv]
+
 \protect \endinput
diff --git a/tex/context/base/mkiv/lang-dis.lua b/tex/context/base/mkiv/lang-dis.lua
index 1e46cbd36..a45e87e9c 100644
--- a/tex/context/base/mkiv/lang-dis.lua
+++ b/tex/context/base/mkiv/lang-dis.lua
@@ -181,7 +181,7 @@ function languages.nofflattened()
     return wiped -- handy for testing
 end
 
--- experiment
+-- experiment: for now not in not in export mode!
 
 local flatten = languages.flatten
 local getlist = nodes.getlist
@@ -196,6 +196,7 @@ function nodes.handlers.flatten(head,where)
 end
 
 directives.register("hyphenator.flatten",function(v)
+    -- use with care
     setaction("processors","nodes.handlers.flatten",v)
     setaction("contributers","nodes.handlers.flattenline",v)
 end)
diff --git a/tex/context/base/mkiv/lang-mis.mkiv b/tex/context/base/mkiv/lang-mis.mkiv
index f2c837f54..3ec29a782 100644
--- a/tex/context/base/mkiv/lang-mis.mkiv
+++ b/tex/context/base/mkiv/lang-mis.mkiv
@@ -145,7 +145,11 @@
 %D modules these can be tuned by a setup command. Watch the (maybe) better looking
 %D compound hyphen.
 
-\ifx\compoundhyphen    \undefined \unexpanded\def\compoundhyphen    {\hbox{-\kern-.25ex-}} \fi
+% hm why ex
+
+\ifx\compoundhyphen    \undefined
+    \unexpanded\def\compoundhyphen {\hbox{-\kern-.10775\emwidth-}} % .25\exheight
+\fi
 
 %D The last two variables are needed for subsentences |<|like this one|>| which we
 %D did not yet mention. We want to enable breaking but at the same time don't want
diff --git a/tex/context/base/mkiv/lpdf-pde.lua b/tex/context/base/mkiv/lpdf-pde.lua
index 819143a3b..d7aa9f40c 100644
--- a/tex/context/base/mkiv/lpdf-pde.lua
+++ b/tex/context/base/mkiv/lpdf-pde.lua
@@ -52,7 +52,13 @@ local setmetatableindex = table.setmetatableindex
 local lpegmatch, lpegpatterns = lpeg.match, lpeg.patterns
 local P, C, S, R, Ct, Cc, V, Carg, Cs, Cf, Cg = lpeg.P, lpeg.C, lpeg.S, lpeg.R, lpeg.Ct, lpeg.Cc, lpeg.V, lpeg.Carg, lpeg.Cs, lpeg.Cf, lpeg.Cg
 
-if not lpdf then require("lpdf-aux") end
+if not lpdf then
+    require("lpdf-aux")
+end
+
+if not (number and number.dimenfactors) then
+    require("util-dim")
+end
 
 local epdf              = pdfe
       lpdf              = lpdf or { }
@@ -343,12 +349,12 @@ end
 
 function resolvers.javascripts(document)
     local Names = document.Catalog.Names
-    return getnames(document,Names and Names.JS)
+    return getnames(document,Names and Names.JavaScript)
 end
 
 function resolvers.widgets(document)
-    local Names = document.Catalog.Names
-    return getnames(document,Names and Names.AcroForm)
+    local Names = document.Catalog.AcroForm
+    return Names and Names.Fields
 end
 
 function resolvers.embeddedfiles(document)
diff --git a/tex/context/base/mkiv/lpdf-swf.lua b/tex/context/base/mkiv/lpdf-swf.lua
index 0ac107f8b..7d76efc73 100644
--- a/tex/context/base/mkiv/lpdf-swf.lua
+++ b/tex/context/base/mkiv/lpdf-swf.lua
@@ -65,7 +65,10 @@ local function insertswf(spec)
     local preview   = checkedkey(display,"preview","string")
     local toolbar   = checkedkey(display,"toolbar","boolean")
 
-    local embeddedreference = codeinjections.embedfile { file = filename }
+    local embeddedreference = codeinjections.embedfile {
+        file     = filename,
+        compress = false,
+    }
 
     local flash = pdfdictionary {
         Subtype   = pdfconstant("RichMediaConfiguration"),
@@ -122,6 +125,7 @@ local function insertswf(spec)
                 file     = fullname,
                 usedname = usedname,
                 keepdir  = true,
+                compress = false,
             }
             names[#names+1] = pdfstring(filename)
             names[#names+1] = embeddedreference
diff --git a/tex/context/base/mkiv/lpdf-wid.lua b/tex/context/base/mkiv/lpdf-wid.lua
index 5793fc723..a929ed2ce 100644
--- a/tex/context/base/mkiv/lpdf-wid.lua
+++ b/tex/context/base/mkiv/lpdf-wid.lua
@@ -267,9 +267,13 @@ function codeinjections.embedfile(specification)
     local keepdir  = specification.keepdir -- can change
     local usedname = specification.usedname
     local filetype = specification.filetype
+    local compress = specification.compress
     if filename == "" then
         filename = nil
     end
+    if compress == nil then
+        compress = true
+    end
     if data then
         local r = filestreams[hash]
         if r == false then
@@ -324,7 +328,7 @@ function codeinjections.embedfile(specification)
         specification.data = true -- signal that still data but already flushed
     else
         local foundname = specification.foundname or filename
-        f = pdfflushstreamfileobject(foundname,a)
+        f = pdfflushstreamfileobject(foundname,a,compress)
     end
     local d = pdfdictionary {
         Type = pdfconstant("Filespec"),
@@ -663,6 +667,7 @@ local function insertrendering(specification)
             descriptor.EF = codeinjections.embedfile {
                 file     = filename,
                 mimetype = mimetype, -- yes or no
+                compress = false,
             }
         end
         local clip = pdfdictionary {
diff --git a/tex/context/base/mkiv/math-ini.lua b/tex/context/base/mkiv/math-ini.lua
index 5491078f3..66c08a76a 100644
--- a/tex/context/base/mkiv/math-ini.lua
+++ b/tex/context/base/mkiv/math-ini.lua
@@ -39,13 +39,6 @@ local mathematics           = mathematics
 mathematics.extrabase       = fonts.privateoffsets.mathextrabase -- here we push some virtuals
 mathematics.privatebase     = fonts.privateoffsets.mathbase      -- here we push the ex
 
-fonts.privateoffsets = {
-    textbase      = 0xF0000, -- used for hidden (opentype features)
-    textextrabase = 0xFD000, -- used for visible by name
-    mathextrabase = 0xFE000, -- used for visible by code
-    mathbase      = 0xFF000, -- used for hidden (virtual math)
-}
-
 local unsetvalue            = attributes.unsetvalue
 local allocate              = utilities.storage.allocate
 local chardata              = characters.data
diff --git a/tex/context/base/mkiv/pack-mrl.mkiv b/tex/context/base/mkiv/pack-mrl.mkiv
index 85aa3ad04..bef790536 100644
--- a/tex/context/base/mkiv/pack-mrl.mkiv
+++ b/tex/context/base/mkiv/pack-mrl.mkiv
@@ -39,7 +39,7 @@
 \installsimplecommandhandler \??blackrules {blackrules}
 
 \unexpanded\def\blackrule
-  {\hbox\bgroup
+  {\hpack\bgroup
    \doifelsenextoptionalcs\pack_black_rule_pickup\pack_black_rule_indeed}
 
 \def\pack_black_rule_pickup[#1]%
@@ -99,7 +99,7 @@
 %D would probably have taken more tokens.
 
 \unexpanded\def\blackrules % probably never used
-  {\hbox\bgroup
+  {\hpack\bgroup
    \doifelsenextoptionalcs\pack_black_rules_pickup\pack_black_rules_indeed}
 
 \def\pack_black_rules_pickup[#1]%
@@ -121,23 +121,25 @@
      \fi
    \fi
    \useblackrulesstyleandcolor\c!style\c!color
-   \edef\brule
-     {\ifcsname\??blackruletype\directblackrulesparameter\c!type\endcsname
-        \lastnamedcs
-      \else
-        \vrule
-      \fi}%
-   \dorecurse\scratchcounter % a typical case of where we can use a simple loop
-     {\brule
-        \s!width \scratchwidth
-        \s!height\scratchheight
-        \s!depth \scratchdepth
-      \ifzeropt\scratchdistance\else
-        \hskip\scratchdistance
-      \fi}%
+   % a typical case of where we can use a simple loop or even a leaders
+   \dorecurse\scratchcounter\pack_black_rules_step
    \unskip
    \egroup}
 
+\def\pack_black_rules_step
+  {\ifcsname\??blackruletype\directblackrulesparameter\c!type\endcsname
+     \lastnamedcs
+   \else
+     \vrule
+   \fi
+   \s!width \scratchwidth
+   \s!height\scratchheight
+   \s!depth \scratchdepth
+   \relax
+   \ifzeropt\scratchdistance\else
+     \hskip\scratchdistance
+   \fi}
+
 \installcorenamespace{blackruletype}
 
 \setvalue{\??blackruletype mp}%
@@ -578,14 +580,14 @@
   {\page[\v!preference] % interferes
    \directtextrulesparameter\c!before\relax
    \blank[\v!samepage,\v!nowhite]%
-   \pack_textrule_with_text{#1}%
+   \pack_textrule_with_text_yes{#1}%
    \blank[\v!samepage,\v!nowhite]%
    \directtextrulesparameter\c!inbetween\relax
    \endgraf}
 
 \setvalue{\??textrulealternatives\v!bottom}#1%
   {\blank[\v!samepage,\v!nowhite]%
-   \pack_textrule_following{#1}%
+   \pack_textrule_following_yes{#1}%
    \blank[\v!samepage,\v!nowhite]%
    \directtextrulesparameter\c!after\relax
    \page[\v!preference]}
@@ -593,14 +595,15 @@
 \setvalue{\??textrulealternatives\v!middle}#1%
   {\blank[\v!samepage,\v!nowhite]%
    \directtextrulesparameter\c!inbetween\relax
-   \pack_textrule_following{#1}%
+   \pack_textrule_following_yes{#1}%
    \blank[\v!samepage,\v!nowhite]%
    \directtextrulesparameter\c!inbetween\relax
    \page[\v!preference]}
 
-\def\pack_textrule_with_text#1%
-  {\bgroup
-   \setbox\scratchbox\hbox to \availablehsize
+\def\pack_textrule_with_text_yes#1%
+  {\noindent % this will force side floats to be calculated
+   \bgroup
+   \setbox\scratchbox\hpack to \availablehsize
      {\scratchwidth \directtextrulesparameter\c!rulethickness\relax
       \scratchheight\dimexpr .5\exheight+.5\scratchwidth\relax
       \scratchdepth \dimexpr-.5\exheight+.5\scratchwidth\relax
@@ -611,19 +614,41 @@
                #1%
                \hskip\leftmargindistance}}
            {\color[\directtextrulesparameter\c!rulecolor]
-              {\vrule\s!height\scratchheight\s!depth\scratchdepth\s!width\directtextrulesparameter\c!width}%
+              {\vrule
+                 \s!height\scratchheight
+                 \s!depth \scratchdepth
+                 \s!width \directtextrulesparameter\c!width}%
             \hbox spread 2\dimexpr\directtextrulesparameter\c!distance\relax
               {\hss
                \usetextrulesstyleandcolor\c!style\c!color
                \strut#1%
                \hss}}}%
       \color[\directtextrulesparameter\c!rulecolor]
-        {\leaders\hrule\s!height\scratchheight\s!depth\scratchdepth\hfill}}%
+        {\leaders\hrule
+           \s!height\scratchheight
+           \s!depth \scratchdepth
+           \hfill}}%
    \ht\scratchbox\strutht
    \dp\scratchbox\strutdp
-   \noindent\box\scratchbox
+   \box\scratchbox
+  %\carryoverpar
    \egroup}
 
+\def\pack_textrule_with_text_nop#1%
+  {\ifhmode
+     \endgraf
+   \fi
+   \doifelse{\directtextrulesparameter\c!depthcorrection}\v!on
+     \pack_textrule_correct_depth_yes
+     \pack_textrule_correct_depth_nop
+   \nointerlineskip
+   \noindent\vpack % was \dontleavehmode
+     {\color[\directtextrulesparameter\c!rulecolor]
+        {\hrule
+           \s!depth \directtextrulesparameter\c!rulethickness
+           \s!height\zeropoint
+           \s!width \availablehsize}}}
+
 \def\pack_textrule_correct_depth_yes
   {\vskip\dimexpr
      \strutdp +.5\exheight
@@ -643,15 +668,9 @@
 
 \def\pack_textrule_following#1%
   {\doifelsenothing{#1}
-     {\ifhmode
-        \endgraf
-      \fi
-      \doifelse{\directtextrulesparameter\c!depthcorrection}\v!on\pack_textrule_correct_depth_yes\pack_textrule_correct_depth_nop
-      \nointerlineskip
-      \noindent\vbox % was \dontleavehmode
-        {\color[\directtextrulesparameter\c!rulecolor]
-           {\hrule\s!depth\directtextrulesparameter\c!rulethickness\s!height\zeropoint\s!width\availablehsize}}}
-     {\pack_textrule_with_text{#1}}%
+     \pack_textrule_with_text_nop
+     \pack_textrule_with_text_yes
+     {#1}%
    \ifvmode
      \prevdepth\zeropoint
    \fi}
diff --git a/tex/context/base/mkiv/page-sid.mkiv b/tex/context/base/mkiv/page-sid.mkiv
index 812196e6f..303b77af2 100644
--- a/tex/context/base/mkiv/page-sid.mkiv
+++ b/tex/context/base/mkiv/page-sid.mkiv
@@ -81,6 +81,9 @@
 
 \newdimen       \d_page_sides_progression
 
+\newcount       \c_page_sides_m_of_lines
+\newconditional \c_page_sides_delayed
+
 \newif          \iftracesidefloats % public (might change)
 
 %D Defaults:
@@ -764,7 +767,7 @@
    \prevdepth\strutdp}
   %\ignoreparskip}
 
-\def\page_sides_handle_float#1% grid (4) is rather experimental
+\def\page_sides_handle_float#1%
   {\page_sides_initialize_checker
    \page_sides_check_horizontal_skips
    \page_sides_check_vertical_skips
@@ -776,8 +779,11 @@
    \page_sides_apply_vertical_shift
    \page_sides_analyse_space
    \ifconditional\c_page_floats_room
+     \global\setfalse\c_page_sides_delayed
      % we're ok
    \else
+     \global\settrue\c_page_sides_delayed
+     \global\c_page_sides_m_of_lines\c_page_sides_n_of_lines
      \ifcase\c_page_sides_page_method
        \page_otr_fill_and_eject_page
      \or
@@ -785,11 +791,13 @@
      \else
        \page_otr_fill_and_eject_page
      \fi
+     \global\c_page_sides_n_of_lines\c_page_sides_m_of_lines
      \page_sides_analyse_space
     %\page_sides_inject_before
      \page_sides_inject_dummy_lines
    \fi
    \page_sides_place_float
+   \global\setfalse\c_page_sides_delayed
    \page_sides_check_floats_reset
    \page_sides_wrapup}
 
@@ -797,8 +805,7 @@
   {% we need to do this aftergroup
    \aftergroup\par
    \aftergroup\ignoreparskip
-   \aftergroup\ignorespaces
-   }
+   \aftergroup\ignorespaces}
 
 \def\page_sides_check_floats_indeed
   {\page_sides_analyse_progress
@@ -857,6 +864,10 @@
 
 \unexpanded\def\page_sides_check_floats_set
   {\edef\p_sidethreshold{\floatparameter\c!sidethreshold}%
+   \ifconditional\c_page_sides_delayed
+     % For Alan's hanging right float that moved to the next page.
+     \d_page_sides_progress\zeropoint
+   \fi
    \ifx\p_sidethreshold\v!old
      \d_page_sides_progression\dimexpr\d_page_sides_progress+\strutht-\roundingeps\relax
      \c_page_sides_n_of_hang\d_page_sides_progression
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 7d9a44566..31155292e 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 5a886244b..b1227d969 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-ref.lua b/tex/context/base/mkiv/strc-ref.lua
index 0acfab7f7..8b0c5467e 100644
--- a/tex/context/base/mkiv/strc-ref.lua
+++ b/tex/context/base/mkiv/strc-ref.lua
@@ -1496,7 +1496,7 @@ local function identify_inner(set,var,prefix,collected,derived)
         end
     end
     -- we now ignore the split prefix and treat the whole inner as a potential
-    -- referenice into the global list
+    -- reference into the global list
     local i = collected[prefix]
     if i then
         i = i[inner]
@@ -1552,6 +1552,17 @@ local function identify_outer(set,var,i)
             end
             return v
         end
+-- weird too (we really need to check how this table is build
+        local v = identify_inner(set,var,var.outer,external)
+        if v then
+            v.kind = "outer with inner"
+            set.external = true
+            if trace_identifying then
+                report_identify_outer(set,v,i,"2c")
+            end
+            return v
+        end
+--
         -- somewhat rubish: we use outer as first step in the externals table so it makes no
         -- sense to have it as prefix so the next could be an option
         local external = external[""]
@@ -2556,10 +2567,19 @@ local function referencepagestate(position,detail,spread)
     if not actions then
         return 0
     else
-        if not actions.pagestate then
+        local pagestate = actions.pagestate
+        for i=1,#actions do
+            local a = actions[i]
+            if a.outer then
+                pagestate = 0
+                actions.pagestate = pagestate
+                break
+            end
+        end
+        if not pagestate then
             references.analyze(actions,position,spread) -- delayed unless explicitly asked for
+            pagestate = actions.pagestate
         end
-        local pagestate = actions.pagestate
         if detail then
             return pagestate
         elseif pagestate == 4 then
diff --git a/tex/context/base/mkiv/symb-imp-fontawesome.mkiv b/tex/context/base/mkiv/symb-imp-fontawesome.mkiv
index cae2e506b..13a8fc678 100644
--- a/tex/context/base/mkiv/symb-imp-fontawesome.mkiv
+++ b/tex/context/base/mkiv/symb-imp-fontawesome.mkiv
@@ -749,8 +749,27 @@
 
 \stopsymbolset
 
+
+\definefontsynonym [FontAwesomeBrands]  [file:fontawesome5brandsregular400.otf]
+\definefontsynonym [FontAwesomeRegular] [file:fontawesome5freeregular400.otf]
+\definefontsynonym [FontAwesomeSolid]   [file:fontawesome5freesolid900.otf]
+
+\startsymbolset [fontawesome-brands] [font=FontAwesomeBrands]
+    % Font Awesome Brands
+\stopsymbolset
+
+\startsymbolset [fontawesome-regular] [font=FontAwesomeRegular]
+    % Font Awesome Regular
+\stopsymbolset
+
+\startsymbolset [fontawesome-solid] [font=FontAwesomeSolid]
+    % Font Awesome Solid
+\stopsymbolset
+
 \continueifinputfile{symb-imp-fontawesome.mkiv}
 
+\usemodule[article-basic]
+
 \starttext
 
   % \usesymbols[fontawesome]
@@ -760,6 +779,18 @@
   % \symbol[fontawesome][angle right]
   % \symbol[fontawesome][angle_right]
 
-    \showsymbolset[fontawesome]
+  % \showsymbolset[fontawesome]
+
+    \startnamedsection [title] [title={Font Awesome Brands}]
+        \showsymbolset [fontawesome-brands]
+    \stopnamedsection
+
+    \startnamedsection [title] [title={Font Awesome Regular}]
+        \showsymbolset [fontawesome-regular]
+    \stopnamedsection
+
+    \startnamedsection [title] [title={Font Awesome Solid}]
+        \showsymbolset [fontawesome-solid]
+    \stopnamedsection
 
 \stoptext
diff --git a/tex/context/base/mkiv/tabl-ntb.mkiv b/tex/context/base/mkiv/tabl-ntb.mkiv
index 54eca6cd3..ca3d78800 100644
--- a/tex/context/base/mkiv/tabl-ntb.mkiv
+++ b/tex/context/base/mkiv/tabl-ntb.mkiv
@@ -1161,13 +1161,11 @@
 
 \def\tabl_ntb_row_stop_boxed
   {% \noindent % no, else double leftskip in narrower
-   \normalexpanded
-     {\t_tabl_ntb
-        {\the\t_tabl_ntb
-         % no need for init
-         \tabl_ntb_row_align_start
-         \the\t_tabl_ntb_row
-         \tabl_ntb_row_align_stop}}}
+   \etoksapp\t_tabl_ntb
+     {% no need for init
+      \tabl_ntb_row_align_start
+      \the\t_tabl_ntb_row
+      \tabl_ntb_row_align_stop}}
 
 \def\tabl_ntb_row_stop_split
   {\ifcsname\??naturaltableset\m_tabl_tbl_level:\c!y++\the\c_tabl_ntb_current_row\endcsname
@@ -1177,13 +1175,11 @@
    \fi}
 
 \def\tabl_ntb_row_stop_split_nop
-  {\normalexpanded
-     {\t_tabl_ntb
-        {\the\t_tabl_ntb
-         \tabl_ntb_row_align_reset
-         \tabl_ntb_row_align_start
-         \the\t_tabl_ntb_row
-         \tabl_ntb_row_align_stop}}}
+  {\etoksapp\t_tabl_ntb
+     {\tabl_ntb_row_align_reset
+      \tabl_ntb_row_align_start
+      \the\t_tabl_ntb_row
+      \tabl_ntb_row_align_stop}}
 
 \def\tabl_ntb_row_stop_split_yes
   {\begingroup
@@ -1192,13 +1188,11 @@
    \xdef\m_tabl_ntb_after_split {\naturaltablelocalparameter\c!after}% to be checked
    \xdef\m_tabl_ntb_same_page   {\naturaltablelocalparameter\c!samepage}%
    \endgroup
-   \normalexpanded
-     {\t_tabl_ntb
-        {\the\t_tabl_ntb
-         \tabl_ntb_row_align_set{\m_tabl_ntb_before_split}{\m_tabl_ntb_after_split}{\m_tabl_ntb_same_page}%
-         \tabl_ntb_row_align_start
-         \the\t_tabl_ntb_row
-         \tabl_ntb_row_align_stop}}}
+   \etoksapp\t_tabl_ntb
+     {\tabl_ntb_row_align_set{\m_tabl_ntb_before_split}{\m_tabl_ntb_after_split}{\m_tabl_ntb_same_page}%
+      \tabl_ntb_row_align_start
+      \the\t_tabl_ntb_row
+      \tabl_ntb_row_align_stop}}
 
 \unexpanded\def\tabl_ntb_row_align_set#1#2#3%
   {\xdef\m_tabl_ntb_before_split{#1}%
@@ -1225,12 +1219,10 @@
         \tabl_ntb_prelocate_error
       \fi}%
    \def\tabl_ntb_row_stop
-     {\normalexpanded
-        {\t_tabl_ntb
-           {\the\t_tabl_ntb
-            \tabl_ntb_row_align_start
-            \the\csname\??naturaltabletok\the\c_tabl_ntb_row\endcsname
-            \tabl_ntb_row_align_stop}}}%
+     {\etoksapp\t_tabl_ntb
+        {\tabl_ntb_row_align_start
+         \the\csname\??naturaltabletok\the\c_tabl_ntb_row\endcsname
+         \tabl_ntb_row_align_stop}}%
    \global\c_tabl_prelocated_rows#1\relax}
 
 \def\tabl_ntb_prelocate_okay
@@ -1344,37 +1336,23 @@
   {\global\advance\c_tabl_ntb_col\plusone
    \kern\d_tabl_ntb_columndistance}
 
-% \setvalue{\??naturaltablecell\the\c_tabl_ntb_none}#1#2%
-%   {\scratchcounter\tabl_ntb_get_col{#1}{#2}\relax
-%    \ifnum\scratchcounter>\zerocount
-%      \normalexpanded
-%        {\t_tabl_ntb_row
-%           {\the\t_tabl_ntb_row
-%            \tabl_ntb_span{\the\scratchcounter}%
-%            \tabl_ntb_plus}}%
-%    \fi}
-
 \setvalue{\??naturaltablecell\the\c_tabl_ntb_none}#1#2%
   {\scratchcounter\tabl_ntb_get_col{#1}{#2}\relax
    \ifnum\scratchcounter>\zerocount
-     \normalexpanded
-       {\t_tabl_ntb_row
-          {\the\t_tabl_ntb_row
-           \tabl_ntb_span{\the\scratchcounter}}}%
+     \etoksapp\t_tabl_ntb_row
+       {\tabl_ntb_span{\the\scratchcounter}}%
    \fi}
 
 \setvalue{\??naturaltablecell\the\c_tabl_ntb_cell}#1#2%
   {\toksapp\t_tabl_ntb_row{\tabl_ntb_pass #1 #2 }% space delimited -> less tokens
    \scratchcounter\tabl_ntb_get_col{#1}{#2}\relax
    \ifnum\scratchcounter>\zerocount
-     \normalexpanded
-       {\t_tabl_ntb_row
-          {\the\t_tabl_ntb_row
-           \ifnum\scratchcounter=\plusone
-             \tabl_ntb_plus
-           \else
-             \tabl_ntb_skip{\the\scratchcounter}%
-           \fi}}%
+     \etoksapp\t_tabl_ntb_row
+        {\ifnum\scratchcounter=\plusone
+           \tabl_ntb_plus
+         \else
+           \tabl_ntb_skip{\the\scratchcounter}%
+         \fi}%
    \fi}
 
 \unexpanded\def\tabl_ntb_cell#1#2%
diff --git a/tex/context/base/mkiv/trac-log.lua b/tex/context/base/mkiv/trac-log.lua
index 297d053ab..83b81c9b0 100644
--- a/tex/context/base/mkiv/trac-log.lua
+++ b/tex/context/base/mkiv/trac-log.lua
@@ -405,6 +405,15 @@ if runningtex then
     setlogfile  = ignore
     settimedlog = ignore
 
+ -- settimedlog = function()
+ --     local localtime = os.localtime
+ --     local writeline = write_nl
+ --     write_nl = function(f,...)
+ --         writeline(f,localtime() .. " | " .. concat { ... })
+ --     end
+ --     settimedlog = ignore
+ -- end
+
 else
 
     local report_yes, subreport_yes, status_yes
diff --git a/tex/context/base/mkiv/util-sql-imp-sqlite.lua b/tex/context/base/mkiv/util-sql-imp-sqlite.lua
index 04d5ced3a..cf4a3a8b0 100644
--- a/tex/context/base/mkiv/util-sql-imp-sqlite.lua
+++ b/tex/context/base/mkiv/util-sql-imp-sqlite.lua
@@ -132,7 +132,6 @@ setmetatable(cache, {
 local f_preamble = formatters[ [[
 ATTACH `%s` AS `%s` ;
 PRAGMA `%s`.synchronous = normal ;
-PRAGMA journal_mode = truncate ;
 ]] ]
 
 local function execute(specification)
@@ -211,17 +210,19 @@ local function execute(specification)
         else
             local column = { }
             callback = function(data,nofcolumns,values,fields)
-                for i=0,nofcolumns-1 do
+                for i=1,nofcolumns do
                     local field
                     if keysdone then
-                        field = keys[i+1]
+                        field = keys[i]
                     else
                      -- field = get_list_item(fields,i)
-                        field = ffi_tostring(fields[i])
+                        field = ffi_tostring(fields[i-1])
                         keys[i+1] = field
                     end
-                 -- column[field] = get_list_item(values,i)
-                    column[field] = ffi_tostring(values[i])
+                    if field then
+                     -- column[field] = get_list_item(values,i)
+                        column[field] = ffi_tostring(values[i-1])
+                    end
                 end
                 nofrows  = nofrows + 1
                 keysdone = true