2021-05-20 11:04:00

19 files changed, 37 insertions, 45 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index c63412fe3..1df1ff3e9 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{2021.05.19 18:18}
+\newcontextversion{2021.05.20 11:01}
 
 %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 8bc3ae15f..67ee22705 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{2021.05.19 18:18}
+\edef\contextversion{2021.05.20 11:01}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii
index 742934cea..d67e993c4 100644
--- a/tex/context/base/mkii/mult-ro.mkii
+++ b/tex/context/base/mkii/mult-ro.mkii
@@ -141,6 +141,7 @@
 \setinterfacevariable{chemistry}{chemistry}
 \setinterfacevariable{cite}{cite}
 \setinterfacevariable{closed}{closed}
+\setinterfacevariable{collapsed}{collapsed}
 \setinterfacevariable{color}{culoare}
 \setinterfacevariable{column}{coloana}
 \setinterfacevariable{columns}{coloane}
@@ -392,6 +393,7 @@
 \setinterfacevariable{nostopper}{nostopper}
 \setinterfacevariable{not}{nu}
 \setinterfacevariable{notation}{notation}
+\setinterfacevariable{notcollapsed}{notcollapsed}
 \setinterfacevariable{note}{note}
 \setinterfacevariable{nothanging}{nothanging}
 \setinterfacevariable{nothyphenated}{nedespsilabe}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index b39d55d2c..9f8f0bebc 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.05.19 18:18}
+\newcontextversion{2021.05.20 11:01}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index a3e77c4cd..7a64a1e20 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -45,7 +45,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2021.05.19 18:18}
+\edef\contextversion{2021.05.20 11:01}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/node-nut.lua b/tex/context/base/mkiv/node-nut.lua
index e789fae2b..2f69a0f15 100644
--- a/tex/context/base/mkiv/node-nut.lua
+++ b/tex/context/base/mkiv/node-nut.lua
@@ -814,8 +814,8 @@ nuts.getstate = getstate
 local getscript = direct.getscript or function(n,v) end -- elsewhere
 local setscript = direct.setscript or function(n,v) end -- elsewhere
 
-nuts.setscript = getscript
-nuts.getscript = setscript
+nuts.setscript = setscript
+nuts.getscript = getscript
 
 function nuts.isdone(n,k)
     local p = propertydata[n]
diff --git a/tex/context/base/mkiv/scrp-ini.lua b/tex/context/base/mkiv/scrp-ini.lua
index 857d2ac6e..e19ca5b40 100644
--- a/tex/context/base/mkiv/scrp-ini.lua
+++ b/tex/context/base/mkiv/scrp-ini.lua
@@ -118,8 +118,8 @@ end
 
 local insertnodebefore, insertnodeafter  do
 
-    local insertafter      = nuts.insertnodeafter
-    local insertbefore     = nuts.insertnodebefore
+    local insertafter      = nuts.insertafter
+    local insertbefore     = nuts.insertbefore
     local setattributelist = nuts.setattributelist
 
     local function insertnodebefore(head,current,what) -- todo : lmtx
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 59d7fb57e..bb2027071 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 1cb90cb26..30eef15fe 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/syst-con.lua b/tex/context/base/mkiv/syst-con.lua
index 6e998bdfd..8f189d2f1 100644
--- a/tex/context/base/mkiv/syst-con.lua
+++ b/tex/context/base/mkiv/syst-con.lua
@@ -35,7 +35,7 @@ local f_uchexnumber  = formatters["%X"]
 local f_lchexnumbers = formatters["%02x"]
 local f_uchexnumbers = formatters["%02X"]
 local f_octnumber    = formatters["%03o"]
-local   nicenumber   = formatters["%0.6F"]
+local   nicenumber   = formatters["%0.6F"] -- or N
 
 local lchexnumber  = function(n) if n < 0 then n = 0x100000000 + n end return f_lchexnumber (n) end
 local uchexnumber  = function(n) if n < 0 then n = 0x100000000 + n end return f_uchexnumber (n) end
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 229b27d2b..a51da5498 100644
--- a/tex/context/base/mkxl/cont-new.mkxl
+++ b/tex/context/base/mkxl/cont-new.mkxl
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.05.19 18:18}
+\newcontextversion{2021.05.20 11:01}
 
 %D This file is loaded at runtime, thereby providing an excellent place for hacks,
 %D patches, extensions and new features. There can be local overloads in cont-loc
diff --git a/tex/context/base/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index 18963a7ec..98a239c8f 100644
--- a/tex/context/base/mkxl/context.mkxl
+++ b/tex/context/base/mkxl/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \immutable\edef\contextformat {\jobname}
-\immutable\edef\contextversion{2021.05.19 18:18}
+\immutable\edef\contextversion{2021.05.20 11:01}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/font-chk.lmt b/tex/context/base/mkxl/font-chk.lmt
index 2beec268f..269e14e81 100644
--- a/tex/context/base/mkxl/font-chk.lmt
+++ b/tex/context/base/mkxl/font-chk.lmt
@@ -470,14 +470,17 @@ do
         for i=1,#fallbacks do
             local id = fallbacks[i]
             if type(id) == "string" then
-                id = definers.define { name = id }
-                fallbacks[i] = id
+                local fid = definers.define { name = id }
+                report("using fallback font %!font:name! (id: %i)",fid,fid)
+                fallbacks[i] = fid
+                id = fid
             end
             if type(id) == "number" then
                 local cid = fontcharacters[id]
                 if cid[c] then
                     local fc = fontcharacters[f]
                     local sc = (fc[reference].height / cid[reference].height) * (n.scale or 1000)
+                    report("character %C in font %!font:name! (id: %i) is taken from fallback font %!font:name! (id: %i)",c,f,f,id,id)
                     return { id, sc }
                 end
             end
@@ -491,6 +494,7 @@ do
         local cached = cache[f]
         local found  = cached[c]
         if found == nil then
+            -- we can use fonts.helpers.name(f) but we need the monospace flag anyway so:
             local metadata = fontdata[f].shared
             if metadata then
                 metadata = metadata.rawdata
diff --git a/tex/context/base/mkxl/math-noa.lmt b/tex/context/base/mkxl/math-noa.lmt
index 0b9b132e1..ee284ea88 100644
--- a/tex/context/base/mkxl/math-noa.lmt
+++ b/tex/context/base/mkxl/math-noa.lmt
@@ -2392,7 +2392,7 @@ function processors.mlisttohlist(head,style,penalties)
     return head
 end
 
-callbacks.register('mlisttohlist',processors.mlisttohlist,"preprocessing math list")
+callbacks.register('mlist_to_hlist',processors.mlisttohlist,"preprocessing math list")
 
 -- tracing
 
diff --git a/tex/context/base/mkxl/node-nut.lmt b/tex/context/base/mkxl/node-nut.lmt
index d8dfbdb9e..c9903e4e3 100644
--- a/tex/context/base/mkxl/node-nut.lmt
+++ b/tex/context/base/mkxl/node-nut.lmt
@@ -119,7 +119,7 @@ local nuts = {
     getruledata             = direct.getdata, -- obsolete when we have the split
     getscale                = direct.getscale,
     getscales               = direct.getscales,
-    getscript               = direct.setscript,
+    getscript               = direct.getscript,
     getshift                = direct.getshift,
     getstate                = direct.getstate,
     getsub                  = direct.getsub,
@@ -216,7 +216,7 @@ local nuts = {
     setruledata             = direct.setdata, -- obsolete when we have the split
     setscale                = direct.setscale or direct.setscales,
     setscales               = direct.setscales,
-    setscript               = direct.getscript,
+    setscript               = direct.setscript,
     setshift                = direct.setshift,
     setsplit                = direct.setsplit,
     setstate                = direct.setstate,
diff --git a/tex/context/base/mkxl/node-pro.lmt b/tex/context/base/mkxl/node-pro.lmt
index c360aea4d..9dcb2ffa8 100644
--- a/tex/context/base/mkxl/node-pro.lmt
+++ b/tex/context/base/mkxl/node-pro.lmt
@@ -26,27 +26,10 @@ local actions = tasks.actions("processors")
 
 do
 
-    local isglyph = nuts.isglyph
-    local getnext = nuts.getnext
-
-    local utfchar = utf.char
-    local concat  = table.concat
-
     local n = 0
 
-    local function reconstruct(head) -- we probably have a better one
-        local t, n, h = { }, 0, head
-        while h do
-            n = n + 1
-            local char, id = isglyph(h)
-            if char then -- todo: disc etc
-                t[n] = utfchar(char)
-            else
-                t[n] = "[]"
-            end
-            h = getnext(h)
-        end
-        return concat(t)
+    local function reconstruct(head)
+        return nodes.listtoutf(head,"",false,nil,true)
     end
 
     function processors.tracer(what,head,groupcode,before,after,show)
@@ -144,7 +127,7 @@ do
             local after = count_nodes(head,true)
             tracer("glyph_run",head,groupcode,before,after,true)
         else
-            head = actions(head,groupcode)
+            head = actions(head,groupcode,direction)
         end
         return head
     end
diff --git a/tex/context/base/mkxl/scrp-ini.lmt b/tex/context/base/mkxl/scrp-ini.lmt
index 9d8a5d3d5..38687fe97 100644
--- a/tex/context/base/mkxl/scrp-ini.lmt
+++ b/tex/context/base/mkxl/scrp-ini.lmt
@@ -85,13 +85,13 @@ scripts.injectors       = handlers
 local splitters         = allocate()
 scripts.splitters       = splitters
 
-local helpers          = allocate()
-scripts.helpers        = helpers
+local helpers           = allocate()
+scripts.helpers         = helpers
 
 local insertnodebefore, insertnodeafter  do
 
-    local insertafter      = nuts.insertnodeafter
-    local insertbefore     = nuts.insertnodebefore
+    local insertafter      = nuts.insertafter
+    local insertbefore     = nuts.insertbefore
     local setattributelist = nuts.setattributelist
 
     local function insertnodebefore(head,current,what) -- todo : lmtx
@@ -515,7 +515,6 @@ function scripts.injectors.handler(head)
         while start do
             local char, id = isglyph(start)
             if char then
-             -- local a = getinjector(start)
                 local a = getscript(start)
                 if a then
                     if a ~= last_a then
@@ -534,11 +533,13 @@ function scripts.injectors.handler(head)
                             first, last = nil, nil
                         end
                         last_a = a
-                     -- normal_process = a
-                        normal_process = getinjector(start)
+                     -- normal_process = getinjector(start)
+                        normal_process = numbertohandler[a]
+                        if normal_process then
+                            normal_process = normal_process.injector
+                        end
                     end
                     if normal_process then
-                        -- id == font
                         if id ~= lastfont then
                             originals = fontdata[id].resources
                             if resources then
diff --git a/tex/context/interface/mkii/keys-ro.xml b/tex/context/interface/mkii/keys-ro.xml
index 9a01df165..d6ba17bde 100644
--- a/tex/context/interface/mkii/keys-ro.xml
+++ b/tex/context/interface/mkii/keys-ro.xml
@@ -144,6 +144,7 @@
 		<cd:variable name='chemistry' value='chemistry'/>
 		<cd:variable name='cite' value='cite'/>
 		<cd:variable name='closed' value='closed'/>
+		<cd:variable name='collapsed' value='collapsed'/>
 		<cd:variable name='color' value='culoare'/>
 		<cd:variable name='column' value='coloana'/>
 		<cd:variable name='columns' value='coloane'/>
@@ -395,6 +396,7 @@
 		<cd:variable name='nostopper' value='nostopper'/>
 		<cd:variable name='not' value='nu'/>
 		<cd:variable name='notation' value='notation'/>
+		<cd:variable name='notcollapsed' value='notcollapsed'/>
 		<cd:variable name='note' value='note'/>
 		<cd:variable name='nothanging' value='nothanging'/>
 		<cd:variable name='nothyphenated' value='nedespsilabe'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index f3af37815..3afd1a804 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  : 2021-05-19 18:18
+-- merge date  : 2021-05-20 11:01
 
 do -- begin closure to overcome local limits and interference