2018-12-19 19:30:00

11 files changed, 28 insertions, 20 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 38a56df30..fa6af8829 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.12.19 18:48}
+\newcontextversion{2018.12.19 19:22}
 
 %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 ba45fd7fd..bd22d80fe 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.12.19 18:48}
+\edef\contextversion{2018.12.19 19:22}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index fca09d204..8fe9caee7 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.12.19 18:48}
+\newcontextversion{2018.12.19 19:22}
 
 %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 26a200599..56dca3870 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.12.19 18:48}
+\edef\contextversion{2018.12.19 19:22}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/math-ini.mkiv b/tex/context/base/mkiv/math-ini.mkiv
index 02fbf7db5..2bc9817c1 100644
--- a/tex/context/base/mkiv/math-ini.mkiv
+++ b/tex/context/base/mkiv/math-ini.mkiv
@@ -2871,11 +2871,11 @@
 %D Experiment
 
 \unexpanded\def\math_scripts_stack
-  {\mathunstackattribute\attributeunsetvalue}
+  {\attribute\mathunstackattribute\attributeunsetvalue}
 
 \unexpanded\def\math_scripts_unstack
   {\clf_enablescriptunstacking
-   \mathunstackattribute\plusone}
+   \attribute\mathunstackattribute\plusone}
 
 \appendtoks
     \let\stackscripts  \math_scripts_stack
diff --git a/tex/context/base/mkiv/math-noa.lua b/tex/context/base/mkiv/math-noa.lua
index 5cf367fba..8d59b474b 100644
--- a/tex/context/base/mkiv/math-noa.lua
+++ b/tex/context/base/mkiv/math-noa.lua
@@ -64,6 +64,7 @@ local trace_kernpairs      = false  registertracker("math.kernpairs",   function
 local trace_domains        = false  registertracker("math.domains",     function(v) trace_domains     = v end)
 local trace_families       = false  registertracker("math.families",    function(v) trace_families    = v end)
 local trace_fences         = false  registertracker("math.fences",      function(v) trace_fences      = v end)
+local trace_unstacking     = false  registertracker("math.unstack",     function(v) trace_unstacking  = v end)
 
 local check_coverage       = true   registerdirective("math.checkcoverage",  function(v) check_coverage  = v end)
 
@@ -81,6 +82,7 @@ local report_kernpairs     = logreporter("mathematics","kernpairs")
 local report_domains       = logreporter("mathematics","domains")
 local report_families      = logreporter("mathematics","families")
 local report_fences        = logreporter("mathematics","fences")
+local report_unstacking    = logreporter("mathematics","unstack")
 
 local a_mathrendering      = privateattribute("mathrendering")
 local a_exportstatus       = privateattribute("exportstatus")
@@ -1152,19 +1154,25 @@ end
 
 do
 
-    local unstack = { }    noads.processors.unstack = unstack
-    local enabled = false
-
-    unstack[math_noad] = function(pointer,what,n,parent)
-        local sup = getsup(pointer)
-        local sub = getsub(pointer)
-        if sup and sub then
-            local nxt = getnext(pointer)
-            local new = new_noad(pointer)
-            setnucleus(new,new_submlist())
-            setsub(pointer)
-            setsub(new,sub)
-            setlink(pointer,new,nxt)
+    local unstack   = { }    noads.processors.unstack = unstack
+    local enabled   = false
+    local a_unstack = privateattribute("mathunstack")
+
+    unstack[math_noad] = function(pointer)
+        if getattr(pointer,a_unstack) then
+            local sup = getsup(pointer)
+            local sub = getsub(pointer)
+            if sup and sub then
+             -- if trace_unstacking then
+             --     report_unstacking() -- todo ... what to show ...
+             -- end
+                local nxt = getnext(pointer)
+                local new = new_noad(pointer)
+                setnucleus(new,new_submlist())
+                setsub(pointer)
+                setsub(new,sub)
+                setlink(pointer,new,nxt)
+            end
         end
     end
 
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 0a1fce1b6..b98120d35 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 d7867f11e..39ca462ff 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 972cfe4e4..06f7a694b 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 7e88b757a..7e234137e 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index f0ca93b49..0c9bfcc38 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  : 12/19/18 18:48:37
+-- merge date  : 12/19/18 19:22:22
 
 do -- begin closure to overcome local limits and interference