2021-05-26 09:59:00

14 files changed, 18 insertions, 10 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index 654d61e9d..f2a0b51c1 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{2021.05.25 17:54}
+\newcontextversion{2021.05.26 09:57}
 
 %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 22d51ebe5..991288c27 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{2021.05.25 17:54}
+\edef\contextversion{2021.05.26 09:57}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-nl.mkii b/tex/context/base/mkii/mult-nl.mkii
index 6a1b268c1..ce87e0b93 100644
--- a/tex/context/base/mkii/mult-nl.mkii
+++ b/tex/context/base/mkii/mult-nl.mkii
@@ -141,6 +141,7 @@
 \setinterfacevariable{chemistry}{chemie}
 \setinterfacevariable{cite}{cite}
 \setinterfacevariable{closed}{gesloten}
+\setinterfacevariable{collapsed}{collapsed}
 \setinterfacevariable{color}{kleur}
 \setinterfacevariable{column}{kolom}
 \setinterfacevariable{columns}{kolommen}
@@ -392,6 +393,7 @@
 \setinterfacevariable{nostopper}{geenafsluiter}
 \setinterfacevariable{not}{niet}
 \setinterfacevariable{notation}{notation}
+\setinterfacevariable{notcollapsed}{notcollapsed}
 \setinterfacevariable{note}{note}
 \setinterfacevariable{nothanging}{niethangend}
 \setinterfacevariable{nothyphenated}{nietafgebroken}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 4da2120ac..aac21a01b 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.25 17:54}
+\newcontextversion{2021.05.26 09:57}
 
 %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 fc125ac9d..68cb51afe 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.25 17:54}
+\edef\contextversion{2021.05.26 09:57}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/math-noa.lua b/tex/context/base/mkiv/math-noa.lua
index fdc2d0177..309642747 100644
--- a/tex/context/base/mkiv/math-noa.lua
+++ b/tex/context/base/mkiv/math-noa.lua
@@ -2375,7 +2375,7 @@ function processors.mlisttohlist(head,style,penalties)
     return head
 end
 
-callbacks.register('mlisttohlist',processors.mlisttohlist,"preprocessing math list")
+callbacks.register('mlist_to_hlist',processors.mlisttohlist,"preprocessing math list")
 
 -- tracing
 
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 3d147ca42..965fc11ee 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 a334340d1..f7532b9ac 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkxl/cont-new.mkxl b/tex/context/base/mkxl/cont-new.mkxl
index 3ed69d37f..73a869560 100644
--- a/tex/context/base/mkxl/cont-new.mkxl
+++ b/tex/context/base/mkxl/cont-new.mkxl
@@ -13,7 +13,7 @@
 
 % \normalend % uncomment this to get the real base runtime
 
-\newcontextversion{2021.05.25 17:54}
+\newcontextversion{2021.05.26 09:57}
 
 %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/mkxl/context.mkxl b/tex/context/base/mkxl/context.mkxl
index 415b20acd..ff9142c68 100644
--- a/tex/context/base/mkxl/context.mkxl
+++ b/tex/context/base/mkxl/context.mkxl
@@ -29,7 +29,7 @@
 %D {YYYY.MM.DD HH:MM} format.
 
 \immutable\edef\contextformat {\jobname}
-\immutable\edef\contextversion{2021.05.25 17:54}
+\immutable\edef\contextversion{2021.05.26 09:57}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/page-ins.mkxl b/tex/context/base/mkxl/page-ins.mkxl
index 9321b6eac..0a4faa7c0 100644
--- a/tex/context/base/mkxl/page-ins.mkxl
+++ b/tex/context/base/mkxl/page-ins.mkxl
@@ -141,6 +141,8 @@
     \protected\def\page_inserts_get_uncopied  {\insertuncopy}
 
     \protected\def\page_inserts_get_height    {\insertheight}
+    \protected\def\page_inserts_get_depth     {\insertdepth}
+    \protected\def\page_inserts_get_width     {\insertwidth}
 
 \else
 
@@ -158,6 +160,8 @@
     \protected\def\page_inserts_get_uncopied  {\unvcopy}
 
     \protected\def\page_inserts_get_height    {\ht}
+    \protected\def\page_inserts_get_depth     {\dp}
+    \protected\def\page_inserts_get_width     {\wd}
 
 \fi
 
diff --git a/tex/context/base/mkxl/typo-fln.lmt b/tex/context/base/mkxl/typo-fln.lmt
index 8d1553d4c..10d802cf3 100644
--- a/tex/context/base/mkxl/typo-fln.lmt
+++ b/tex/context/base/mkxl/typo-fln.lmt
@@ -238,7 +238,7 @@ actions[v_line] = function(head,setting)
             setglyphdata(start,dynamic)
         end
         setfont(start,font)
-        setcoloring(ma,ca,ta)
+        setcoloring(start,ma,ca,ta)
     end
 
     for i=1,noflines do
@@ -335,7 +335,7 @@ actions[v_word] = function(head,setting)
                 words = words + 1
                 ok = true
             end
-            setcoloring(ma,ca,ta)
+            setcoloring(start,ma,ca,ta)
             if dynamic > 0 then
                 setglyphdata(start,dynamic)
             end
diff --git a/tex/context/interface/mkii/keys-nl.xml b/tex/context/interface/mkii/keys-nl.xml
index 8c9a389f3..a0da8b763 100644
--- a/tex/context/interface/mkii/keys-nl.xml
+++ b/tex/context/interface/mkii/keys-nl.xml
@@ -144,6 +144,7 @@
 		<cd:variable name='chemistry' value='chemie'/>
 		<cd:variable name='cite' value='cite'/>
 		<cd:variable name='closed' value='gesloten'/>
+		<cd:variable name='collapsed' value='collapsed'/>
 		<cd:variable name='color' value='kleur'/>
 		<cd:variable name='column' value='kolom'/>
 		<cd:variable name='columns' value='kolommen'/>
@@ -395,6 +396,7 @@
 		<cd:variable name='nostopper' value='geenafsluiter'/>
 		<cd:variable name='not' value='niet'/>
 		<cd:variable name='notation' value='notation'/>
+		<cd:variable name='notcollapsed' value='notcollapsed'/>
 		<cd:variable name='note' value='note'/>
 		<cd:variable name='nothanging' value='niethangend'/>
 		<cd:variable name='nothyphenated' value='nietafgebroken'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 2162a8957..0721d5d77 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  : 2021-05-25 17:54
+-- merge date  : 2021-05-26 09:57
 
 do -- begin closure to overcome local limits and interference