2020-12-03 18:59:00

13 files changed, 24 insertions, 54 deletions

diff --git a/tex/context/base/mkiv/back-exp.lua b/tex/context/base/mkiv/back-exp.lua
index 314d66eeb..983c6059f 100644
--- a/tex/context/base/mkiv/back-exp.lua
+++ b/tex/context/base/mkiv/back-exp.lua
@@ -552,7 +552,7 @@ do
         if not less_state then
             setattribute(di,"file",tex.jobname)
             if included.date then
-                setattribute(di,"date",backends.timestamp())
+                setattribute(di,"date",os.fulltime())
             end
             setattribute(di,"context",environment.version)
             setattribute(di,"version",exportversion)
@@ -3472,7 +3472,7 @@ local xmlpreamble = [[
         return replacetemplate(xmlpreamble, {
             standalone     = standalone and "yes" or "no",
             filename       = tex.jobname,
-            date           = included.date and backends.timestamp(),
+            date           = included.date and os.fulltime(),
             contextversion = environment.version,
             exportversion  = exportversion,
         })
diff --git a/tex/context/base/mkiv/back-ini.lua b/tex/context/base/mkiv/back-ini.lua
index ca6f6c1e5..d01be4a73 100644
--- a/tex/context/base/mkiv/back-ini.lua
+++ b/tex/context/base/mkiv/back-ini.lua
@@ -62,17 +62,6 @@ backends.tables         = { }  setmetatableindex(backends.tables,         tables
 
 backends.current = "unknown"
 
-local lmtx_mode  = nil
-
-local function lmtxmode()
-    if lmtx_mode == nil then
-        lmtx_mode = CONTEXTLMTXMODE > 0 and drivers and drivers.lmtxversion
-    end
-    return lmtx_mode
-end
-
-codeinjections.lmtxmode = lmtxmode
-
 function backends.install(what)
     if type(what) == "string" then
         local backend = backends[what]
@@ -100,13 +89,7 @@ end
 statistics.register("used backend", function()
     local bc = backends.current
     if bc ~= "unknown" then
-        local lmtx = lmtxmode()
-        local cmnt = backends[bc].comment or "no comment"
-        if lmtx then
-            return format("lmtx version %0.2f, %s (%s)",lmtx,bc,cmnt)
-        else
-            return format("%s (%s)",bc,cmnt)
-        end
+        return format("%s (%s)",bc,backends[bc].comment or "no comment")
     else
         return nil
     end
@@ -164,10 +147,8 @@ function codeinjections.setpagedimensions(paperwidth,paperheight)
     if paperheight then
         paper_height = paperheight
     end
-    if not lmtxmode() then
-        texset("global","pageheight",paper_height)
-        texset("global","pagewidth", paper_width)
-    end
+    texset("global","pageheight",paper_height)
+    texset("global","pagewidth", paper_width)
     return paper_width, paper_height
 end
 
@@ -178,11 +159,10 @@ end
 implement {
     name    = "shipoutoffset",
     actions = function()
-        context(lmtxmode() and "0pt" or "-1in") -- the old tex offset
+        context("-1in") -- the old tex offset
     end
 }
 
-
 local page_x_origin = 0
 local page_y_origin = 0
 
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index ee813411b..9483292ec 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{2020.12.01 17:48}
+\newcontextversion{2020.12.03 18:56}
 
 %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.lus b/tex/context/base/mkiv/context.lus
deleted file mode 100644
index 29c9b8301..000000000
--- a/tex/context/base/mkiv/context.lus
+++ /dev/null
@@ -1,15 +0,0 @@
-if not modules then modules = { } end modules ['context'] = {
-    version   = 1.001,
-    comment   = "companion to context.mkiv",
-    author    = "Hans Hagen, PRAGMA-ADE, Hasselt NL",
-    copyright = "PRAGMA ADE / ConTeXt Development Team",
-    license   = "see context related readme files"
-}
-
---[[<p>This table specifies what stub files are needed in order to create
-the format. These files are loaded before the format is made so that we
-bypass kpse. When the format itself is used, another stub is used (with
-suffix lui). The current format builder is to a large part determined by
-the way luatex evolved and the process will probaby change.</p>]]--
-
-return "luat-cod.lua"
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 5b566f070..0ae1b5027 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{2020.12.01 17:48}
+\edef\contextversion{2020.12.03 18:56}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/driv-ini.lua b/tex/context/base/mkiv/driv-ini.lua
index 316613b21..1e19fd5f8 100644
--- a/tex/context/base/mkiv/driv-ini.lua
+++ b/tex/context/base/mkiv/driv-ini.lua
@@ -6,6 +6,10 @@ if not modules then modules = { } end modules ['driv-ini'] = {
     license   = "see context related readme files"
 }
 
+-- This file is a bit overkill because it was meant for both luatex and luametatex
+-- but after the splti I decided not to simplify this one. It can only introduce
+-- issues.
+
 local type = type
 local addsuffix = file.addsuffix
 
diff --git a/tex/context/base/mkiv/lpdf-mis.lua b/tex/context/base/mkiv/lpdf-mis.lua
index a3f9789c8..94e9fc271 100644
--- a/tex/context/base/mkiv/lpdf-mis.lua
+++ b/tex/context/base/mkiv/lpdf-mis.lua
@@ -244,12 +244,6 @@ local function setupidentity()
         addtoinfo("ID", pdfstring(id), id) -- needed for pdf/x
         --
         addtoinfo("ConTeXt.Version",version)
-        --
-        local lmtx = codeinjections.lmtxmode()
-        if lmtx then
-            addtoinfo("ConTeXt.LMTX",formatters["%0.2f"](lmtx))
-        end
-        --
         addtoinfo("ConTeXt.Time",os.date("%Y-%m-%d %H:%M"))
         addtoinfo("ConTeXt.Jobname",jobname)
         addtoinfo("ConTeXt.Url","www.pragma-ade.com")
diff --git a/tex/context/base/mkiv/luat-fmt.lua b/tex/context/base/mkiv/luat-fmt.lua
index 30792931e..eb24378a4 100644
--- a/tex/context/base/mkiv/luat-fmt.lua
+++ b/tex/context/base/mkiv/luat-fmt.lua
@@ -11,7 +11,7 @@ if not modules then modules = { } end modules ['luat-fmt'] = {
 -- For instance, in the real beginning we had runtime loading because we had no
 -- bytecode registers yet. We also had multiple files as stubs and the context.lus
 -- file specified these. More than a decade only the third method was used, just
--- loading luat-cod, so in the end we cpould get rid of the lus file. In due time
+-- loading luat-cod, so in the end we could get rid of the lus file. In due time
 -- I'll strip the code here because something generic will never take of and we
 -- moved on to luametatex anyway.
 
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index ea407d533..b6aed6495 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 97cefc1a8..29161ec70 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/task-ini.lua b/tex/context/base/mkiv/task-ini.lua
index 45c0c3239..323ad4dc9 100644
--- a/tex/context/base/mkiv/task-ini.lua
+++ b/tex/context/base/mkiv/task-ini.lua
@@ -123,7 +123,12 @@ appendaction("math",         "builders",    "typesetters.directions.processmath"
 appendaction("math",         "builders",    "noads.handlers.makeup",                            nil, "nonut",  "disabled"  )
 appendaction("math",         "builders",    "noads.handlers.align",                             nil, "nonut",  "enabled"   )
 
+if CONTEXTLMTXMODE == 0 then
+
 appendaction("finalizers",   "lists",       "typesetters.paragraphs.normalize",                 nil, "nut",    "enabled"   ) -- "disabled"
+
+end
+
 appendaction("finalizers",   "lists",       "typesetters.margins.localhandler",                 nil, "nut",    "disabled"  )
 appendaction("finalizers",   "lists",       "builders.paragraphs.keeptogether",                 nil, "nut",    "disabled"  )
 appendaction("finalizers",   "fonts",       "builders.paragraphs.solutions.splitters.optimize", nil, "nonut",  "disabled"  )
diff --git a/tex/context/base/mkiv/type-ini.lua b/tex/context/base/mkiv/type-ini.lua
index a2e19725e..771cf39c0 100644
--- a/tex/context/base/mkiv/type-ini.lua
+++ b/tex/context/base/mkiv/type-ini.lua
@@ -17,9 +17,6 @@ local implement  = interfaces.implement
 
 local uselibrary = resolvers.uselibrary
 
-local name_one   = nil
-local name_two   = nil
-
 local p_strip    = Cs((P("type-") * (P("imp-")^0))^0/"" * P(1)^0)
 
 local report     = logs.reporter("fonts","typescripts")
@@ -29,6 +26,7 @@ local function action(name,foundname)
 end
 
 local patterns = {
+    "type-imp-%s.mkxl",
     "type-imp-%s.mkiv",
     "type-imp-%s.tex"
 }
@@ -56,6 +54,7 @@ implement {
 }
 
 local patterns = {
+    "type-imp-%s.mkxl",
     "type-imp-%s.mkiv",
     "type-imp-%s.tex",
     -- obsolete
@@ -63,6 +62,9 @@ local patterns = {
     "type-%s.tex"
 }
 
+-- local name_one   = nil
+-- local name_two   = nil
+--
 -- local function failure_two(name)
 --     report("unknown library %a or %a",name_one,name_two)
 -- end
diff --git a/tex/context/base/mkiv/typo-lin.lua b/tex/context/base/mkiv/typo-lin.lua
index 55fd08c5a..84d622e1e 100644
--- a/tex/context/base/mkiv/typo-lin.lua
+++ b/tex/context/base/mkiv/typo-lin.lua
@@ -484,7 +484,7 @@ function paragraphs.calculatedelta(n,width,delta,atleft,islocal,followshape,area
                 addanchortoline(line,setanchor(number))
                 line.hanchor = true
             end
-            local blob = getposition(s_anchor,number)
+            local blob = getposition("md:h",number)
             if blob then
                 local reference = getreserved(area,blob.c)
                 if reference then