2021-09-26 16:50:00

18 files changed, 87 insertions, 25 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index e195f4d40..15f593712 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.09.17 09:58}
+\newcontextversion{2021.09.26 16:48}
 
 %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 a64d97af7..4015da53a 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.09.17 09:58}
+\edef\contextversion{2021.09.26 16:48}
 
 %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 6996a3730..1aac09199 100644
--- a/tex/context/base/mkii/mult-nl.mkii
+++ b/tex/context/base/mkii/mult-nl.mkii
@@ -79,6 +79,7 @@
 \setinterfacevariable{anchor}{anker}
 \setinterfacevariable{and}{en}
 \setinterfacevariable{answerarea}{antwoordgebied}
+\setinterfacevariable{append}{append}
 \setinterfacevariable{appendices}{bijlagen}
 \setinterfacevariable{appendix}{bijlage}
 \setinterfacevariable{april}{april}
@@ -150,6 +151,7 @@
 \setinterfacevariable{commands}{commandos}
 \setinterfacevariable{comment}{commentaar}
 \setinterfacevariable{component}{onderdeel}
+\setinterfacevariable{compress}{comprimeer}
 \setinterfacevariable{compressseparator}{compressseparator}
 \setinterfacevariable{compressstopper}{compressstopper}
 \setinterfacevariable{concept}{concept}
@@ -436,6 +438,7 @@
 \setinterfacevariable{postscript}{postscript}
 \setinterfacevariable{precedingpage}{voorafgaandepagina}
 \setinterfacevariable{preference}{voorkeur}
+\setinterfacevariable{prepend}{prepend}
 \setinterfacevariable{preview}{preview}
 \setinterfacevariable{previous}{vorige}
 \setinterfacevariable{previousevenpage}{vorigeevenpagina}
@@ -1367,6 +1370,7 @@
 \setinterfaceelement{load}{laad}
 \setinterfaceelement{local}{lokale}
 \setinterfaceelement{makeup}{opmaak}
+\setinterfaceelement{namednotation}{namednotation}
 \setinterfaceelement{namedtyping}{namedtyping}
 \setinterfaceelement{next}{volgende}
 \setinterfaceelement{place}{plaats}
@@ -1536,6 +1540,7 @@
 \setinterfacecommand{definereferencelist}{definieerreferentielijst}
 \setinterfacecommand{defineregister}{definieerregister}
 \setinterfacecommand{definerule}{definieerlijn}
+\setinterfacecommand{definesavebuffer}{startsavebuffer}
 \setinterfacecommand{definesection}{definieersectie}
 \setinterfacecommand{definesectionblock}{definieersectieblok}
 \setinterfacecommand{definesorting}{definieersorteren}
@@ -1712,6 +1717,9 @@
 \setinterfacecommand{moveformula}{verplaatsformule}
 \setinterfacecommand{moveongrid}{verplaatsopgrid}
 \setinterfacecommand{movesidefloat}{verplaatszijblok}
+\setinterfacecommand{namedconstruction}{namedconstruction}
+\setinterfacecommand{nameddescription}{nameddescription}
+\setinterfacecommand{namedenumeration}{namedenumeration}
 \setinterfacecommand{navigating}{navigerend}
 \setinterfacecommand{nodimension}{geendimensie}
 \setinterfacecommand{noheaderandfooterlines}{geenhoofdenvoetregels}
@@ -2083,6 +2091,13 @@
 \setinterfacecommand{startmakeup}{startopmaak}
 \setinterfacecommand{startmarginblock}{startmargeblok}
 \setinterfacecommand{startmarginrule}{startkantlijn}
+\setinterfacecommand{startnamedconstruction}{startnamedconstruction}
+\setinterfacecommand{startnameddescription}{startnameddescription}
+\setinterfacecommand{startnamedenumeration}{startnamedenumeration}
+\setinterfacecommand{startnamedmatrix}{startnamedmatrix}
+\setinterfacecommand{startnamedsection}{startnamedsection}
+\setinterfacecommand{startnamedsubformulas}{startnamedsubformulas}
+\setinterfacecommand{startnamedtyping}{startnamedtyping}
 \setinterfacecommand{startnarrower}{startsmaller}
 \setinterfacecommand{startopposite}{startnaast}
 \setinterfacecommand{startoverlay}{startoverlay}
@@ -2126,6 +2141,13 @@
 \setinterfacecommand{stopmakeup}{stopopmaak}
 \setinterfacecommand{stopmarginblock}{stopmargeblok}
 \setinterfacecommand{stopmarginrule}{stopkantlijn}
+\setinterfacecommand{stopnamedconstruction}{stopnamedconstruction}
+\setinterfacecommand{stopnameddescription}{stopnameddescription}
+\setinterfacecommand{stopnamedenumeration}{stopnamedenumeration}
+\setinterfacecommand{stopnamedmatrix}{stopnamedmatrix}
+\setinterfacecommand{stopnamedsection}{stopnamedsection}
+\setinterfacecommand{stopnamedsubformulas}{stopnamedsubformulas}
+\setinterfacecommand{stopnamedtyping}{stopnamedtyping}
 \setinterfacecommand{stopnarrower}{stopsmaller}
 \setinterfacecommand{stopopposite}{stopnaast}
 \setinterfacecommand{stopoverlay}{stopoverlay}
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index bc71d9e67..d7c2469e8 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.09.17 09:58}
+\newcontextversion{2021.09.26 16:48}
 
 %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 372e9b571..1a32832af 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.09.17 09:58}
+\edef\contextversion{2021.09.26 16:48}
 
 %D Kind of special:
 
diff --git a/tex/context/base/mkiv/font-sel.lua b/tex/context/base/mkiv/font-sel.lua
index 9a611f9fa..04dd4379b 100644
--- a/tex/context/base/mkiv/font-sel.lua
+++ b/tex/context/base/mkiv/font-sel.lua
@@ -466,7 +466,12 @@ function selectfont.registerfiles(index)
                     argument = method
                     method   = "name"
                 end
-                (extras[method] or methods[method] or methods[v_default])(data,alternative,argument)
+                if #entries == 1 and method == "features" then
+                    extras["features"](data,alternative,argument)
+                    methods[v_default](data,alternative)
+                else
+                    (extras[method] or methods[method] or methods[v_default])(data,alternative,argument)
+                end
             end
         else
             methods[v_default](data,alternative)
diff --git a/tex/context/base/mkiv/mult-mps.lua b/tex/context/base/mkiv/mult-mps.lua
index b4eba21a7..fa1aa22b3 100644
--- a/tex/context/base/mkiv/mult-mps.lua
+++ b/tex/context/base/mkiv/mult-mps.lua
@@ -117,7 +117,7 @@ return {
         --
         "red", "green", "blue", "cyan", "magenta", "yellow", "black", "white", "background",
         --
-        "mm", "pt", "dd", "bp", "cm", "pc", "cc", "in",
+        "mm", "pt", "dd", "bp", "cm", "pc", "cc", "in", "dk",
         --
         "triplet", "quadruplet", "totransform", "bymatrix", "closedcurve", "closedlines",
         --
diff --git a/tex/context/base/mkiv/publ-ini.lua b/tex/context/base/mkiv/publ-ini.lua
index ec36be89a..83f0ff9ac 100644
--- a/tex/context/base/mkiv/publ-ini.lua
+++ b/tex/context/base/mkiv/publ-ini.lua
@@ -54,6 +54,8 @@ local detailed           = publications.detailed
 local enhancer           = publications.enhancer
 local enhancers          = publications.enhancers
 
+if not publications.btx then publications.btx = { } end -- user space
+
 local tracers            = publications.tracers or { }
 publications.tracers     = tracers
 
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index a7e843f55..0eca85be1 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 50db78bcd..2fe879833 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 38433e8ea..5306b33b4 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.09.17 09:58}
+\newcontextversion{2021.09.26 16:48}
 
 %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 a51c7d895..c2b8528c1 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.09.17 09:58}
+\immutable\edef\contextversion{2021.09.26 16:48}
 
 %overloadmode 1 % check frozen / warning
 %overloadmode 2 % check frozen / error
diff --git a/tex/context/base/mkxl/driv-shp.lmt b/tex/context/base/mkxl/driv-shp.lmt
index f0d037564..fed58dacf 100644
--- a/tex/context/base/mkxl/driv-shp.lmt
+++ b/tex/context/base/mkxl/driv-shp.lmt
@@ -98,7 +98,7 @@ local fontcharacters = nil
 
 local magicconstants = tex.magicconstants
 local maxdimen       = magicconstants.maxdimen
-local running        = magicconstants.running
+local runningrule    = magicconstants.runningrule
 
 local pos_h          = 0
 local pos_v          = 0
@@ -696,10 +696,10 @@ cur_h = cur_h + wd -- see new tabulate alignment code
                             local width, height, depth = getwhd(leader)
                             if getid(leader) == rule_code then
                                 if gluewidth > 0 then
-                                    if height == running then
+                                    if height == runningrule then
                                         height = boxheight
                                     end
-                                    if depth == running then
+                                    if depth == runningrule then
                                         depth = boxdepth
                                     end
                                     local total = height + depth
@@ -873,10 +873,10 @@ cur_h = cur_h + wd -- see new tabulate alignment code
             elseif id == rule_code then
                 local width, height, depth = getwhd(current)
                 if width > 0 then
-                    if height == running then
+                    if height == runningrule then
                         height = boxheight
                     end
-                    if depth == running then
+                    if depth == runningrule then
                         depth = boxdepth
                     end
                     local total = height + depth
@@ -1031,7 +1031,7 @@ cur_h = cur_h + wd -- see new tabulate alignment code
                                 depth = 0 -- hm
                                 total = glueheight -- forgotten ... needs testing
                                 if total > 0 then
-                                    if width == running then
+                                    if width == runningrule then
                                         width = boxwidth
                                     end
                                     if width > 0 then
@@ -1176,7 +1176,7 @@ cur_h = cur_h + wd -- see new tabulate alignment code
                 local width, height, depth = getwhd(current)
                 local total = height + depth
                 if total > 0 then
-                    if width == running then
+                    if width == runningrule then
                         width = boxwidth
                     end
                     if width > 0 then
diff --git a/tex/context/base/mkxl/libs-imp-zint.mkxl b/tex/context/base/mkxl/libs-imp-zint.mkxl
index 208dd9d34..b2c364379 100644
--- a/tex/context/base/mkxl/libs-imp-zint.mkxl
+++ b/tex/context/base/mkxl/libs-imp-zint.mkxl
@@ -49,7 +49,9 @@
 
 \starttext
 
-% \dorecurse{1000}{
+\dontcomplain
+
+\dorecurse{1}{
     \startTEXpage
         \barcode[alternative=PDF417,text={Hans Hagen}]%
         \blank
@@ -60,11 +62,11 @@
         \barcode[alternative=isbn,text=9789490688011,width=3cm]%
         \blank
         \dontleavehmode
-        \barcode[alternative=qr code,text={This is ConTeXt MKIV}]
+        \barcode[alternative=qr code,text={This is ConTeXt MKIV : #1}]
         \barcode[alternative=qr code,text={This is ConTeXt LMTX}]
         \barcode[alternative=qr code,text={\cldloadfile{tufte}},width=3cm]
     \stopTEXpage
-% }
+}
 
 \stoptext
 
diff --git a/tex/context/base/mkxl/node-ini.lmt b/tex/context/base/mkxl/node-ini.lmt
index a0c447954..06e36147c 100644
--- a/tex/context/base/mkxl/node-ini.lmt
+++ b/tex/context/base/mkxl/node-ini.lmt
@@ -34,9 +34,19 @@ local getvalues     = node.values
 tex.magicconstants = { -- we use tex.constants for something else
     running  = -1073741824, -- null_flag
     maxdimen =  1073741823, -- max_dimen
-    trueinch =     4736286,
+ -- trueinch =     4736286, -- obsolete
 }
 
+do
+    local c = status.getconstants()
+    local t = { }
+    for k, v in next, c do
+        t[gsub(k,"_","")] = v
+    end
+
+    tex.magicconstants = table.setmetatableindex(t,c)
+end
+
 local listcodes     = mark(getsubtypes("list"))
 local rulecodes     = mark(getsubtypes("rule"))
 local dircodes      = mark(getsubtypes("dir"))
diff --git a/tex/context/base/mkxl/node-rul.lmt b/tex/context/base/mkxl/node-rul.lmt
index a1857bd6e..4931569a7 100644
--- a/tex/context/base/mkxl/node-rul.lmt
+++ b/tex/context/base/mkxl/node-rul.lmt
@@ -126,8 +126,7 @@ local dimenfactor        = fonts.helpers.dimenfactor
 local splitdimen         = number.splitdimen
 local setmetatableindex  = table.setmetatableindex
 
-local magicconstants     = tex.magicconstants
-local running            = magicconstants.running
+local runningrule        = tex.magicconstants.runningrule
 
 local striprange         = nuts.striprange
 local processwords       = nuts.processwords
@@ -706,9 +705,9 @@ interfaces.implement {
     },
     actions   = function(t)
         local n = new_rule(
-            t.width or running,
-            t.height or running,
-            t.depth or running
+            t.width or runningrule,
+            t.height or runningrule,
+            t.depth or runningrule
         )
         setattrlist(n,true)
         setoffsets(n,t.xoffset,t.yoffset) -- ,t.left, t.right
diff --git a/tex/context/interface/mkii/keys-nl.xml b/tex/context/interface/mkii/keys-nl.xml
index 7e3779cfe..c52ef7ab2 100644
--- a/tex/context/interface/mkii/keys-nl.xml
+++ b/tex/context/interface/mkii/keys-nl.xml
@@ -82,6 +82,7 @@
 		<cd:variable name='anchor' value='anker'/>
 		<cd:variable name='and' value='en'/>
 		<cd:variable name='answerarea' value='antwoordgebied'/>
+		<cd:variable name='append' value='append'/>
 		<cd:variable name='appendices' value='bijlagen'/>
 		<cd:variable name='appendix' value='bijlage'/>
 		<cd:variable name='april' value='april'/>
@@ -153,6 +154,7 @@
 		<cd:variable name='commands' value='commandos'/>
 		<cd:variable name='comment' value='commentaar'/>
 		<cd:variable name='component' value='onderdeel'/>
+		<cd:variable name='compress' value='comprimeer'/>
 		<cd:variable name='compressseparator' value='compressseparator'/>
 		<cd:variable name='compressstopper' value='compressstopper'/>
 		<cd:variable name='concept' value='concept'/>
@@ -439,6 +441,7 @@
 		<cd:variable name='postscript' value='postscript'/>
 		<cd:variable name='precedingpage' value='voorafgaandepagina'/>
 		<cd:variable name='preference' value='voorkeur'/>
+		<cd:variable name='prepend' value='prepend'/>
 		<cd:variable name='preview' value='preview'/>
 		<cd:variable name='previous' value='vorige'/>
 		<cd:variable name='previousevenpage' value='vorigeevenpagina'/>
@@ -1376,6 +1379,7 @@
 		<cd:element name='load' value='laad'/>
 		<cd:element name='local' value='lokale'/>
 		<cd:element name='makeup' value='opmaak'/>
+		<cd:element name='namednotation' value='namednotation'/>
 		<cd:element name='namedtyping' value='namedtyping'/>
 		<cd:element name='next' value='volgende'/>
 		<cd:element name='place' value='plaats'/>
@@ -1548,6 +1552,7 @@
 		<cd:command name='definereferencelist' value='definieerreferentielijst'/>
 		<cd:command name='defineregister' value='definieerregister'/>
 		<cd:command name='definerule' value='definieerlijn'/>
+		<cd:command name='definesavebuffer' value='startsavebuffer'/>
 		<cd:command name='definesection' value='definieersectie'/>
 		<cd:command name='definesectionblock' value='definieersectieblok'/>
 		<cd:command name='definesorting' value='definieersorteren'/>
@@ -1724,6 +1729,9 @@
 		<cd:command name='moveformula' value='verplaatsformule'/>
 		<cd:command name='moveongrid' value='verplaatsopgrid'/>
 		<cd:command name='movesidefloat' value='verplaatszijblok'/>
+		<cd:command name='namedconstruction' value='namedconstruction'/>
+		<cd:command name='nameddescription' value='nameddescription'/>
+		<cd:command name='namedenumeration' value='namedenumeration'/>
 		<cd:command name='navigating' value='navigerend'/>
 		<cd:command name='nodimension' value='geendimensie'/>
 		<cd:command name='noheaderandfooterlines' value='geenhoofdenvoetregels'/>
@@ -2095,6 +2103,13 @@
 		<cd:command name='startmakeup' value='startopmaak'/>
 		<cd:command name='startmarginblock' value='startmargeblok'/>
 		<cd:command name='startmarginrule' value='startkantlijn'/>
+		<cd:command name='startnamedconstruction' value='startnamedconstruction'/>
+		<cd:command name='startnameddescription' value='startnameddescription'/>
+		<cd:command name='startnamedenumeration' value='startnamedenumeration'/>
+		<cd:command name='startnamedmatrix' value='startnamedmatrix'/>
+		<cd:command name='startnamedsection' value='startnamedsection'/>
+		<cd:command name='startnamedsubformulas' value='startnamedsubformulas'/>
+		<cd:command name='startnamedtyping' value='startnamedtyping'/>
 		<cd:command name='startnarrower' value='startsmaller'/>
 		<cd:command name='startopposite' value='startnaast'/>
 		<cd:command name='startoverlay' value='startoverlay'/>
@@ -2138,6 +2153,13 @@
 		<cd:command name='stopmakeup' value='stopopmaak'/>
 		<cd:command name='stopmarginblock' value='stopmargeblok'/>
 		<cd:command name='stopmarginrule' value='stopkantlijn'/>
+		<cd:command name='stopnamedconstruction' value='stopnamedconstruction'/>
+		<cd:command name='stopnameddescription' value='stopnameddescription'/>
+		<cd:command name='stopnamedenumeration' value='stopnamedenumeration'/>
+		<cd:command name='stopnamedmatrix' value='stopnamedmatrix'/>
+		<cd:command name='stopnamedsection' value='stopnamedsection'/>
+		<cd:command name='stopnamedsubformulas' value='stopnamedsubformulas'/>
+		<cd:command name='stopnamedtyping' value='stopnamedtyping'/>
 		<cd:command name='stopnarrower' value='stopsmaller'/>
 		<cd:command name='stopopposite' value='stopnaast'/>
 		<cd:command name='stopoverlay' value='stopoverlay'/>
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index a81d7da49..ceb9fce8c 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-09-17 09:58
+-- merge date  : 2021-09-26 16:48
 
 do -- begin closure to overcome local limits and interference