2021-02-17 13:33:00

9 files changed, 26 insertions, 19 deletions

diff --git a/tex/context/base/mkiv/anch-pgr.lua b/tex/context/base/mkiv/anch-pgr.lua
index 239b33010..8e400cd12 100644
--- a/tex/context/base/mkiv/anch-pgr.lua
+++ b/tex/context/base/mkiv/anch-pgr.lua
@@ -1210,7 +1210,7 @@ posregions[%s] := (%p,%p)--(%p,%p)--(%p,%p)--(%p,%p)--cycle ;
 implement {
     name      = "fetchposboxes",
     arguments = { "string", "string", "integer" },
-    actions   = function(tags,anchor,page)  -- no caching (yet) / todo: anchor, page
+    actions   = function(tags,anchor,page)  -- no caching (yet) / page
         local collected = jobpositions.collected
         if type(tags) == "string" then
             tags = utilities.parsers.settings_to_array(tags)
@@ -1222,6 +1222,9 @@ implement {
             local c = collected[tag]
             if c then
                 local r = c.r
+                if anchor ~= r then
+                    r = anchor
+                end
                 if r then
                     r = collected[r]
                     if r then
@@ -1231,7 +1234,7 @@ implement {
                         local rh = r.h
                         local rd = r.d
                         local cx = c.x - rx
-                        local cy = c.y
+                        local cy = c.y - ry
                         local cw = cx + c.w
                         local ch = cy + c.h
                         local cd = cy - c.d
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index a8c68be75..181bb0da5 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.02.14 16:11}
+\newcontextversion{2021.02.17 13:30}
 
 %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 57f0fc064..f63e4b1a6 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.02.14 16:11}
+\edef\contextversion{2021.02.17 13:30}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/luat-ini.lua b/tex/context/base/mkiv/luat-ini.lua
index cec0161e7..39453b44c 100644
--- a/tex/context/base/mkiv/luat-ini.lua
+++ b/tex/context/base/mkiv/luat-ini.lua
@@ -25,21 +25,15 @@ if not global then
     global  = _G
 end
 
-LUATEXVERSION       = status.luatex_version/100
-                    + tonumber(status.luatex_revision)/10000
-
-LUATEXENGINE        = status.luatex_engine and string.lower(status.luatex_engine)
-                   or (string.find(status.banner,"LuajitTeX",1,true) and "luajittex" or "luatex")
-
+LUATEXVERSION       = status.luatex_version/100 + tonumber(status.luatex_revision)/10000
+LUATEXENGINE        = status.luatex_engine and string.lower(status.luatex_engine) or "luametatex"
 LUATEXFUNCTIONALITY = status.development_id or 6346
-
 LUATEXFORMATID      = status.format_id or 0
+JITSUPPORTED        = false
+INITEXMODE          = status.run_state == 0 -- initializing updating production
+CONTEXTLMTXMODE     = 1
 
-JITSUPPORTED        = LUATEXENGINE == "luajittex" or jit
-
-INITEXMODE          = status.ini_version
-
-CONTEXTLMTXMODE     = CONTEXTLMTXMODE or (LUATEXENGINE == "luametatex" and 1) or 0
+status.ini_version = INITEXMODE -- for a while
 
 function os.setlocale()
     -- no need for a message
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index ca65934ba..a893d455c 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -73,7 +73,8 @@ return {
         "frozenadjustcode", "frozenprotrudecode", "frozentolerancecode", "frozenstretchcode",
         "frozenloosenesscode", "frozenlastlinecode", "frozenlinepenaltycode", "frozenclubpenaltycode",
         "frozenwidowpenaltycode", "frozendisplaypenaltycode", "frozenbrokenpenaltycode",
-        "frozendemeritscode", "frozenshapecode", "frozenlinecode",  "frozenallcode",
+        "frozendemeritscode", "frozenshapecode", "frozenlinecode", "frozenhyphenationcode",
+        "frozenallcode",
         --
         "activemathcharcode",
         --
@@ -162,6 +163,7 @@ return {
         "compoundhyphenationmodecode", "strictstarthyphenationmodecode", "strictendhyphenationmodecode",
         "automaticpenaltyhyphenationmodecode", "explicitpenaltyhyphenationmodecode",
         "permitgluehyphenationmodecode", "permitallhyphenationmodecode", "permitmathreplacehyphenationmodecode",
+        "forcecheckhyphenationmodecode", "lazyligatureshyphenationmodecode",
         --
         "normalizelinecode", "parindentskipcode", "swaphangindentcode", "swapparsshapecode", "breakafterdircode", "removemarginkernscode", "clipwidthcode",
         --
@@ -277,7 +279,7 @@ return {
         "next", "nexttoken",
         --
         "nextbox", "dowithnextbox", "dowithnextboxcs", "dowithnextboxcontent", "dowithnextboxcontentcs", "flushnextbox",
-        "boxisempty",
+        "boxisempty", "boxtostring", "contentostring", "prerolltostring",
         --
         "givenwidth", "givenheight", "givendepth", "scangivendimensions",
         --
@@ -519,6 +521,8 @@ return {
         "naturalhbox", "naturalvbox", "naturalvtop", "naturalhpack", "naturalvpack", "naturaltpack",
         "reversehbox", "reversevbox", "reversevtop", "reversehpack", "reversevpack", "reversetpack",
         --
+        "hcontainer", "vcontainer", "tcontainer",
+        --
         "frule",
         --
         "compoundhyphenpenalty",
@@ -548,7 +552,7 @@ return {
          --
         "futureletnexttoken", "defbackslashbreak", "letbackslashbreak",
         --
-        "pushoverloadmode", "popoverloadmode",
+        "pushoverloadmode", "popoverloadmode", "pushrunstate", "poprunstate",
         --
         "suggestedalias",
         --
diff --git a/tex/context/base/mkiv/mult-mes.lua b/tex/context/base/mkiv/mult-mes.lua
index 299f1a404..65ae022c0 100644
--- a/tex/context/base/mkiv/mult-mes.lua
+++ b/tex/context/base/mkiv/mult-mes.lua
@@ -1159,6 +1159,9 @@ return {
             no = "slutten av blokk %a (seksjon)",
             ro = "sfarsit de bloc sectiune %a",
         },
+        ["structures:3"] = {
+            en = "title to bookmark: %s",
+        },
         ["symbols:1"] = {
             cs = "nacita se soubor symbolu %a",
             de = "Lade Symboldatei %a",
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index c4ac7d938..f934bfab7 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 d91dbaebb..4ec3a9778 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-ini.mkiv b/tex/context/base/mkiv/syst-ini.mkiv
index 6b84d33df..aafbc787e 100644
--- a/tex/context/base/mkiv/syst-ini.mkiv
+++ b/tex/context/base/mkiv/syst-ini.mkiv
@@ -1174,6 +1174,9 @@
     %
     \let\pushoverloadmode\relax
     \let\popoverloadmode\relax
+
+    \let\pushrunstate\relax
+    \let\poprunstate \relax
 \fi
 
 %D Now we define a few helpers that we need in a very early stage. We have no