2021-03-21 21:08:00

14 files changed, 39 insertions, 21 deletions

diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index e182985f2..e0afd5492 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.03.20 01:03}
+\newcontextversion{2021.03.21 21:05}
 
 %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 f0ff9b363..f6100e4a7 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.03.20 01:03}
+\edef\contextversion{2021.03.21 21:05}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/lang-hyp.lua b/tex/context/base/mkiv/lang-hyp.lua
index ca9f519ce..01ffe2335 100644
--- a/tex/context/base/mkiv/lang-hyp.lua
+++ b/tex/context/base/mkiv/lang-hyp.lua
@@ -1014,7 +1014,7 @@ featureset.hyphenonly   = hyphenonly == v_yes
  --     [nodecodes.rule]    = true,
  --     [nodecodes.dir]     = true,
  --     [nodecodes.whatsit] = true,
- --     [nodecodes.ins]     = true,
+ --     [nodecodes.insert]  = true,
  --     [nodecodes.adjust]  = true,
  --
  --     [nodecodes.math]    = true,
diff --git a/tex/context/base/mkiv/luat-cnf.lua b/tex/context/base/mkiv/luat-cnf.lua
index f16908321..16448c429 100644
--- a/tex/context/base/mkiv/luat-cnf.lua
+++ b/tex/context/base/mkiv/luat-cnf.lua
@@ -27,8 +27,6 @@ texconfig.max_strings     =   500000
 texconfig.hash_extra      =   200000
 texconfig.function_size   =    32768
 texconfig.properties_size =    10000
-texconfig.level_max       =      500
-texconfig.level_chr       =       46 -- period
 
 if CONTEXTLMTXMODE > 0 then
 
@@ -72,8 +70,6 @@ local variablenames = CONTEXTLMTXMODE > 0 and {
     token_size      = true,
     node_size       = true,
     buffer_size     = true,
-    level_max       = true,
-    level_chr       = true,
 } or {
     error_line      = false,
     half_error_line = false,
@@ -89,8 +85,6 @@ local variablenames = CONTEXTLMTXMODE > 0 and {
     function_size   = true,
     properties_size = true,
     fix_mem_init    = true,
-    level_max       = true,
-    level_chr       = true,
 }
 
 local stub = [[
diff --git a/tex/context/base/mkiv/luat-cod.lua b/tex/context/base/mkiv/luat-cod.lua
index b3abecbba..25c716eeb 100644
--- a/tex/context/base/mkiv/luat-cod.lua
+++ b/tex/context/base/mkiv/luat-cod.lua
@@ -33,8 +33,6 @@ texconfig.stack_size      =   10000
 texconfig.function_size   =   32768
 texconfig.properties_size =   10000
 texconfig.fix_mem_init    = 1000000
-texconfig.level_max       =     500
-texconfig.level_chr       =      46 -- period
 
 -- registering bytecode chunks
 
diff --git a/tex/context/base/mkiv/mult-prm.lua b/tex/context/base/mkiv/mult-prm.lua
index 250a5dfc1..a6b81af7e 100644
--- a/tex/context/base/mkiv/mult-prm.lua
+++ b/tex/context/base/mkiv/mult-prm.lua
@@ -61,6 +61,7 @@ return {
   "tracingassigns",
   "tracinggroups",
   "tracingifs",
+  "tracinglevels",
   "tracingnesting",
   "unexpanded",
   "unless",
diff --git a/tex/context/base/mkiv/node-ini.lua b/tex/context/base/mkiv/node-ini.lua
index 701e3efa9..4c27357b7 100644
--- a/tex/context/base/mkiv/node-ini.lua
+++ b/tex/context/base/mkiv/node-ini.lua
@@ -168,8 +168,9 @@ literalvalues    = allocate(swapped(literalvalues,literalvalues))
 
 if not nodecodes.delimiter then
     -- as in luametatex / lmtx
-    nodecodes.delimiter = nodecodes.delim
-    nodecodes[nodecodes.delimiter] = "delimiter"
+    local d = nodecodes.delim
+    nodecodes.delimiter = d
+    nodecodes[d]        = "delimiter"
     nodecodes.delim     = nil
 end
 
@@ -180,6 +181,14 @@ if not nodecodes.par then
     nodecodes[p]  = "par"
 end
 
+if not nodecodes.insert then
+    -- as in luametatex / lmtx
+    local i = nodecodes.ins
+    nodecodes.insert = i
+    nodecodes[i]     = "insert"
+    nodecodes.ins    = nil
+end
+
 if not gluecodes.indentskip then
     gluecodes.indentskip       = gluecodes.userskip
     gluecodes.lefthangskip     = gluecodes.userskip
diff --git a/tex/context/base/mkiv/node-ltp.lua b/tex/context/base/mkiv/node-ltp.lua
index 6cb9e8d10..ecfd1fb6b 100644
--- a/tex/context/base/mkiv/node-ltp.lua
+++ b/tex/context/base/mkiv/node-ltp.lua
@@ -267,7 +267,7 @@ local gluecodes               = nodes.gluecodes
 
 local temp_code               = nodecodes.temp
 local glyph_code              = nodecodes.glyph
-local ins_code                = nodecodes.ins
+local insert_code             = nodecodes.insert
 local mark_code               = nodecodes.mark
 local adjust_code             = nodecodes.adjust
 local penalty_code            = nodecodes.penalty
@@ -2624,7 +2624,7 @@ par.head = head
                     par.internal_right_box       = getfield(current,"box_right")
                     par.internal_right_box_width = getfield(current,"box_right_width")
                 elseif trace_unsupported then
-                    if id == mark_code or id == ins_code or id == adjust_code then
+                    if id == mark_code or id == insert_code or id == adjust_code then
                         -- skip
                     else
                         report_parbuilders("node of type %a found in paragraph",type(id))
@@ -3098,7 +3098,7 @@ do
                         total_shrink [shrink_order]  = total_shrink[shrink_order]   + shrink
                         natural = natural + wd
                     end
-                elseif id == ins_code or id == mark_code then
+                elseif id == insert_code or id == mark_code then
                     local prev, next = getboth(current)
                     if adjust_tail then -- todo
                         setlink(prev,next)
diff --git a/tex/context/base/mkiv/page-mix.lua b/tex/context/base/mkiv/page-mix.lua
index dacc829d7..c1f93b4bb 100644
--- a/tex/context/base/mkiv/page-mix.lua
+++ b/tex/context/base/mkiv/page-mix.lua
@@ -33,7 +33,7 @@ local vlist_code          = nodecodes.vlist
 local kern_code           = nodecodes.kern
 local glue_code           = nodecodes.glue
 local penalty_code        = nodecodes.penalty
-local insert_code         = nodecodes.ins
+local insert_code         = nodecodes.insert
 local mark_code           = nodecodes.mark
 local rule_code           = nodecodes.rule
 
@@ -635,6 +635,7 @@ local function preparesplit(specification) -- a rather large function
     end
 
     local function process_list(current,nxt)
+-- print(nuts.getpre(current),nuts.getpost(current))
         local nxtid = nxt and getid(nxt)
         line = line + 1
         local inserts, insertskips, nextskips, inserttotal = nil, 0, 0, 0
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index b414d1c97..dc1553a92 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 097b6cbf0..560c58c4e 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-doc.lua b/tex/context/base/mkiv/strc-doc.lua
index 5cb207c38..9094446c1 100644
--- a/tex/context/base/mkiv/strc-doc.lua
+++ b/tex/context/base/mkiv/strc-doc.lua
@@ -772,6 +772,7 @@ function sections.typesetnumber(entry,kind,...)
                     applyprocessor(starter)
                 end
             end
+-- inspect(entry)
             if prefixlist and (kind == "section" or kind == "prefix" or kind == "direct") then
                 -- find valid set (problem: for sectionnumber we should pass the level)
                 -- no holes
@@ -780,6 +781,8 @@ function sections.typesetnumber(entry,kind,...)
                 local bb = 0
                 local ee = 0
                 -- find last valid number
+-- print("index >>",b,e)
+-- inspect(prefixlist)
                 for k=e,b,-1 do
                     local prefix = prefixlist[k]
                     local index  = sections.getlevel(prefix) or k
diff --git a/tex/context/base/mkiv/strc-mat.mkiv b/tex/context/base/mkiv/strc-mat.mkiv
index 15b00baae..976cb8c3a 100644
--- a/tex/context/base/mkiv/strc-mat.mkiv
+++ b/tex/context/base/mkiv/strc-mat.mkiv
@@ -1242,7 +1242,7 @@
    \getdummyparameters[#1]%
    \edef\currentplaceformulatitle    {\dummyparameter\c!title}%
    \edef\currentplaceformulareference{\dummyparameter\c!reference}%
-   \edef\currentplaceformulareference{\dummyparameter\c!reference}%
+   \edef\currentplaceformulalist     {\dummyparameter\c!list}%
    \edef\currentplaceformulabookmark {\dummyparameter\c!bookmark}%
    \edef\currentplaceformulasuffix   {\dummyparameter\c!suffix}%
    \ifx\currentplaceformulatitle\empty\else
diff --git a/tex/context/base/mkiv/strc-ref.lua b/tex/context/base/mkiv/strc-ref.lua
index bca36ccef..ba4ee9c5d 100644
--- a/tex/context/base/mkiv/strc-ref.lua
+++ b/tex/context/base/mkiv/strc-ref.lua
@@ -435,9 +435,21 @@ end
 references.synchronizepage = synchronizepage
 
 local function enhancereference(specification)
-    local l = tobesaved[specification.prefix][specification.tag]
-    if l then
-        synchronizepage(l.references)
+    local prefix = specification.prefix
+    if prefix then
+        local entry = tobesaved[prefix]
+        if entry then
+            entry = entry[specification.tag]
+            if entry then
+                synchronizepage(entry.references)
+            else
+                -- normally a bug
+            end
+        else
+            -- normally a bug
+        end
+    else
+        -- normally a bug
     end
 end