2020-08-28 13:58:00

12 files changed, 56 insertions, 10 deletions

diff --git a/doc/context/documents/general/manuals/luametatex.pdf b/doc/context/documents/general/manuals/luametatex.pdf
index 25bd874ae..6e0f969b6 100644
--- a/doc/context/documents/general/manuals/luametatex.pdf
+++ b/doc/context/documents/general/manuals/luametatex.pdf
diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 20642a907..e31e763e6 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{2020.08.27 19:25}
+\newcontextversion{2020.08.28 13:55}
 
 %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 16de426df..ae452602c 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{2020.08.27 19:25}
+\edef\contextversion{2020.08.28 13:55}
 
 %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 fc27b0538..47a7e253c 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.08.27 19:25}
+\newcontextversion{2020.08.28 13:55}
 
 %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 5164ea5dd..d7bc0b818 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.08.27 19:25}
+\edef\contextversion{2020.08.28 13:55}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index e7d0ffdfd..000d9f77c 100644
--- a/tex/context/base/mkiv/context.mkxl
+++ b/tex/context/base/mkiv/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2020.08.27 19:25}
+\edef\contextversion{2020.08.28 13:55}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/luat-run.lua b/tex/context/base/mkiv/luat-run.lua
index beec93088..cb947f318 100644
--- a/tex/context/base/mkiv/luat-run.lua
+++ b/tex/context/base/mkiv/luat-run.lua
@@ -293,3 +293,9 @@ end)
 --     end
 -- end)
 
+
+if environment.initex then
+
+    luatex.registerdumpactions(statistics.showmemory)
+
+end
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 56e1600c9..fc2fa9524 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 1b46f8863..864d7e5ac 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.mkxl b/tex/context/base/mkiv/syst-ini.mkxl
index 9b516f3c5..ce54b71e4 100644
--- a/tex/context/base/mkiv/syst-ini.mkxl
+++ b/tex/context/base/mkiv/syst-ini.mkxl
@@ -288,7 +288,7 @@
 
 \let\newfam\newfamily
 
-\firstvalidlanguage\plusone
+\firstvalidlanguage \plusone % so zero is ignored in hyphenation, this might becoem the default
 
 % Watch out, for the moment we disable the check for already being defined
 % later we will revert this but first all chardefs must be replaced.
diff --git a/tex/context/base/mkiv/trac-inf.lmt b/tex/context/base/mkiv/trac-inf.lmt
index 80bb3b2f6..de1f50051 100644
--- a/tex/context/base/mkiv/trac-inf.lmt
+++ b/tex/context/base/mkiv/trac-inf.lmt
@@ -262,7 +262,7 @@ end
 
 status.iocodes = setmetatableindex(tex.getiovalues(), function() return "unknown" end)
 
-local report = logs.reporter("usage")
+local report = logs.reporter("system")
 
 function statistics.showusage(when)
     local s = status.list()
@@ -287,8 +287,7 @@ function statistics.showusage(when)
     end
     report("")
     local list   = {
-        "stringstate", "poolstate",
-        "hashstate", "lookupstate",
+        "stringstate", "poolstate", "hashstate", "lookupstate",
         "nodestate", "extrastate", "tokenstate",
         "bufferstate", "inputstate", "filestate",
         "neststate", "parameterstate", "savestate",
@@ -357,6 +356,47 @@ function statistics.showusage(when)
     report("")
 end
 
+function statistics.showmemory(when)
+    local s = status.list()
+    --
+    report("")
+    report("memory configuration")
+    report("")
+    local list   = {
+        "stringstate", "poolstate", "hashstate", "lookupstate",
+        "nodestate", "tokenstate",
+        "bufferstate", "inputstate", "filestate",
+        "neststate", "parameterstate", "savestate",
+        "fontstate", "languagestate", "markstate",
+    }
+    local fields = { "max", "min", "set", "stp" }
+    local line   = rep("-",168)
+    do
+        local t = { }
+        for i=1,#list do
+            t[i] = gsub(list[i],"state","")
+        end
+        report("%w%s",2,line)
+        report("%w%11s%11s%11s%11s%11s%11s%11s%11s%11s%11s%11s%11s%11s%11s%11s",5,unpack(t))
+        report("%w%s",2,line)
+    end
+    for i=1,#fields do
+        local f = fields[i]
+        if f then
+            local t = { }
+            for i=1,#list do
+                local n = s[list[i]][f]
+                t[i] = n < 0 and formatters["%w"](11) or formatters["%11i"](n)
+            end
+            report("  %3s%11s%11s%11s%11s%11s%11s%11s%11s%11s%11s%11s%11s%11s%11s%11s",f,unpack(t))
+        else
+            report("")
+        end
+    end
+    report("%w%s",2,line)
+    report("")
+end
+
 local registered = false
 local enabled    = false
 
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index ff1b629b8..751624e93 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  : 2020-08-27 19:25
+-- merge date  : 2020-08-28 13:55
 
 do -- begin closure to overcome local limits and interference