2020-09-02 20:37:00

13 files changed, 28 insertions, 12 deletions

diff --git a/tex/context/base/mkiv/anch-pos.lua b/tex/context/base/mkiv/anch-pos.lua
index da95eeb1a..554f3fdc0 100644
--- a/tex/context/base/mkiv/anch-pos.lua
+++ b/tex/context/base/mkiv/anch-pos.lua
@@ -1307,7 +1307,7 @@ implement {
                 return
             end
             local p = jpi.p
-            if p then
+            if p and p ~= true then
                 context("page:" .. p)
             end
         end
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 70709ab75..5ad5c7eb6 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.31 22:01}
+\newcontextversion{2020.09.02 20:34}
 
 %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 ae883f927..02759e4fa 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.31 22:01}
+\edef\contextversion{2020.09.02 20:34}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/context.mkxl b/tex/context/base/mkiv/context.mkxl
index 2022db971..b2777ae60 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.31 22:01}
+\edef\contextversion{2020.09.02 20:34}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/grph-img.lua b/tex/context/base/mkiv/grph-img.lua
index 4b4bee1fc..49b082c58 100644
--- a/tex/context/base/mkiv/grph-img.lua
+++ b/tex/context/base/mkiv/grph-img.lua
@@ -602,8 +602,11 @@ do
                 local y = f:readcardinal4()
                 local u = f:readcardinal()
                 if u == 1 then -- meters
-                 -- x = round(0.0254 * x)
-                 -- y = round(0.0254 * y)
+                    -- there was a reason why this was commented
+                    x = round(0.0254 * x)
+                    y = round(0.0254 * y)
+                    if x == 0 then x = 1 end
+                    if y == 0 then y = 1 end
                 end
                 specification.xres = x
                 specification.yres = y
diff --git a/tex/context/base/mkiv/mult-low.lua b/tex/context/base/mkiv/mult-low.lua
index 51bb9e052..67efa8eff 100644
--- a/tex/context/base/mkiv/mult-low.lua
+++ b/tex/context/base/mkiv/mult-low.lua
@@ -325,7 +325,9 @@ return {
         --
         "removetoks", "appendtoks", "prependtoks", "appendtotoks", "prependtotoks", "to",
         --
-        "endgraf", "endpar", "everyendpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "emspace", "charspace", "nbsp", "crlf",
+        -- "everyendpar",
+        --
+        "endgraf", "endpar", "reseteverypar", "finishpar", "empty", "null", "space", "quad", "enspace", "emspace", "charspace", "nbsp", "crlf",
         "obeyspaces", "obeylines", "obeyedspace", "obeyedline", "obeyedtab", "obeyedpage",
         "normalspace",
         --
diff --git a/tex/context/base/mkiv/spac-par.mkxl b/tex/context/base/mkiv/spac-par.mkxl
index 73b1b267d..e0eef0c67 100644
--- a/tex/context/base/mkiv/spac-par.mkxl
+++ b/tex/context/base/mkiv/spac-par.mkxl
@@ -17,6 +17,8 @@
 
 \unprotect
 
+% TODO: \appendtoks \strut \wrapuppar{\strut}\to \everypar
+
 %D New experimental stuff:
 
 % this might move to syst-ini.mkxl
diff --git a/tex/context/base/mkiv/spac-ver.mkiv b/tex/context/base/mkiv/spac-ver.mkiv
index b14340c56..2c8c30bec 100644
--- a/tex/context/base/mkiv/spac-ver.mkiv
+++ b/tex/context/base/mkiv/spac-ver.mkiv
@@ -66,7 +66,7 @@
 
 \def\normalskipamount
   {\openlineheight
-     \ifgridsnapping \else \ifblankflexible
+     \ifgridsnapping \else \ifconditional\c_spac_whitespace_flexible
        \s!plus \skipgluefactor\openlineheight
        \s!minus\skipgluefactor\openlineheight
      \fi \fi
diff --git a/tex/context/base/mkiv/spac-ver.mkxl b/tex/context/base/mkiv/spac-ver.mkxl
index 7406ae143..4db32563f 100644
--- a/tex/context/base/mkiv/spac-ver.mkxl
+++ b/tex/context/base/mkiv/spac-ver.mkxl
@@ -66,7 +66,7 @@
 
 \def\normalskipamount
   {\openlineheight
-     \ifgridsnapping \orelse \ifblankflexible
+     \ifgridsnapping \orelse \ifconditional\c_spac_whitespace_flexible
        \s!plus \skipgluefactor\openlineheight
        \s!minus\skipgluefactor\openlineheight
      \fi
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 2ddcb6e4b..be5b71b82 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 ab31e3e72..6180c3fcb 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-sec.mkiv b/tex/context/base/mkiv/strc-sec.mkiv
index 4959ffc16..2a2384656 100644
--- a/tex/context/base/mkiv/strc-sec.mkiv
+++ b/tex/context/base/mkiv/strc-sec.mkiv
@@ -1298,6 +1298,14 @@
    \fi
    \glet\previoushead\currenthead}
 
+\def\strc_sectioning_depth_correction
+  {\ifvmode
+     \edef\p_depthcorrection{\headparameter\c!depthcorrection}%
+     \ifx\p_depthcorrection\v!strut
+       \prevdepth\strutdepth
+     \fi
+   \fi}
+
 \def\strc_sectioning_after_yes
   {\ifconditional\headisdisplay
      \ifconditional\c_strc_sectioning_auto_break
@@ -1305,6 +1313,7 @@
      \fi
      \strc_sectioning_empty_correction
      \headparameter\c!after
+     \strc_sectioning_depth_correction
    \fi}
 
 \unexpanded\def\strc_sectioning_prevent_page_break % see strc-con
diff --git a/tex/context/base/mkiv/trac-inf.lmt b/tex/context/base/mkiv/trac-inf.lmt
index 7cb168760..9207d5b45 100644
--- a/tex/context/base/mkiv/trac-inf.lmt
+++ b/tex/context/base/mkiv/trac-inf.lmt
@@ -177,11 +177,11 @@ function statistics.show()
             return format("%s version: %s, functionality level: %s, format id: %s, compiler: %s",
                 LUATEXENGINE, LUATEXVERSION, LUATEXFUNCTIONALITY, LUATEXFORMATID, status.used_compiler)
         end)
-        register("used hash slots", function()
+        register("tex properties", function()
             local t = status.gethashstate()
             local m = status.gettexstate()
-            return format("%s of %s with base %s, approximate memory usage: %i MB",
-                t.top, t.max, status.tex_hash_size, m.approximate // (1024 * 1024))
+            return format("%s hash slots used of %s, approximate memory usage: %i MB",
+                t.top, t.max, m.approximate // (1024 * 1024))
         end)
         register("callbacks", statistics.callbacks)
         -- so far