2021-05-25 17:56:00

8 files changed, 22 insertions, 11 deletions

diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index a513f273c..4da2120ac 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.05.21 15:02}
+\newcontextversion{2021.05.25 17:54}
 
 %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 6bdb7a44f..fc125ac9d 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.05.21 15:02}
+\edef\contextversion{2021.05.25 17:54}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/lxml-tex.lua b/tex/context/base/mkiv/lxml-tex.lua
index 7a79ee15f..73ad1b684 100644
--- a/tex/context/base/mkiv/lxml-tex.lua
+++ b/tex/context/base/mkiv/lxml-tex.lua
@@ -772,6 +772,8 @@ local tex_element
 
 if tokenizedxmlw then
 
+-- local expandmacro = token.expandmacro
+
     tex_element = function(e,handlers)
         if setfilename then
             syncfilename(e,"element")
@@ -793,6 +795,10 @@ if tokenizedxmlw then
                         addindex(rootname,false,true)
                         ix = e.ix
                     end
+-- lmtx only, same performance, a bit more immediate:
+--
+-- expandmacro(tokenizedxmlw,ctxcatcodes,true,command,true,rootname.."::"..ix)
+--
                     contextsprint(ctxcatcodes,tokenizedxmlw,"{",command,"}{",rootname,"::",ix,"}")
                 else
                     report_lxml("fatal error: no index for %a",command)
diff --git a/tex/context/base/mkiv/page-mix.lua b/tex/context/base/mkiv/page-mix.lua
index 443f25e56..374ba8866 100644
--- a/tex/context/base/mkiv/page-mix.lua
+++ b/tex/context/base/mkiv/page-mix.lua
@@ -59,7 +59,7 @@ local getnext             = nuts.getnext
 local getprev             = nuts.getprev
 local getid               = nuts.getid
 local getlist             = nuts.getlist
-local getsubtype          = nuts.getsubtype
+local getindex            = nuts.getindex
 local getbox              = nuts.getbox
 local getattr             = nuts.getattr
 local getwhd              = nuts.getwhd
@@ -121,7 +121,7 @@ local function collectinserts(result,nxt,nxtid)
             i = i + 1
             result.i = i
             inserttotal = inserttotal + getheight(nxt) -- height includes depth (hm, still? needs checking)
-            local s = getsubtype(nxt)
+            local s = getindex(nxt)
             local c = inserts[s]
             if trace_details then
                 report_state("insert of class %s found",s)
@@ -987,7 +987,8 @@ local function getsplit(result,n)
             setdepth(list[i],0)
         end
         local b = vpack(l)    -- multiple arguments, todo: fastvpack
-        setbox("global",c,b)  -- when we wrap in a box
+--         setbox("global",c,b)  -- when we wrap in a box
+        tex.setinsertcontent(c,tonode(b))  -- when we wrap in a box
         r.inserts[c] = nil
     end
 
diff --git a/tex/context/base/mkiv/publ-imp-apa.mkvi b/tex/context/base/mkiv/publ-imp-apa.mkvi
index c7c00fd14..b4ac74258 100644
--- a/tex/context/base/mkiv/publ-imp-apa.mkvi
+++ b/tex/context/base/mkiv/publ-imp-apa.mkvi
@@ -1078,8 +1078,10 @@
         \btxlabeltext{In}
         \btxspace
         \doifnot {\btxfoundname{author}} {editor} {
-            \texdefinition{btx:apa:author-or-editor} {ineditor}
-            \btxcomma
+            \btxdoif {ineditor} {
+                \texdefinition{btx:apa:author-or-editor} {ineditor}
+                \btxcomma
+            }
         }
         \texdefinition{btx:apa:composed-title}{booktitle}
         \btxperiod
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 2808e32c9..3d147ca42 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 40d298100..a334340d1 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-not.mkvi b/tex/context/base/mkiv/strc-not.mkvi
index f29cb38ba..469a57a15 100644
--- a/tex/context/base/mkiv/strc-not.mkvi
+++ b/tex/context/base/mkiv/strc-not.mkvi
@@ -24,9 +24,6 @@
 \ifdefined\dotagsetnotesymbol \else \let\dotagsetnotesymbol\relax \fi
 \ifdefined\dotagsetnotation   \else \let\dotagsetnotation  \relax \fi
 
-\unexpanded\def\unvboxed {\ifvmode\unvbox \else\box \fi} % will change or used more often
-\unexpanded\def\unvcopied{\ifvmode\unvcopy\else\copy\fi} % will change or used more often
-
 %D \LMTX\ testcase:
 %D
 %D \starttyping
@@ -1507,7 +1504,12 @@
         {\starthboxestohbox
            \iftrialtypesetting\unvcopy\else\unvbox\fi\currentnoteinsertionnumber
          \stophboxestohbox}}
-     {\iftrialtypesetting\unvcopied\else\unvboxed\fi\currentnoteinsertionnumber}%
+     {\iftrialtypesetting
+        \ifvmode\unvcopy\else\copy\fi
+      \else
+        \ifvmode\unvbox \else\box \fi
+      \fi
+      \currentnoteinsertionnumber}%
    \endgroup}
 
 %D Supporting end notes is surprisingly easy. Even better, we can combine this