2020-11-23 18:39:00

30 files changed, 609 insertions, 548 deletions

diff --git a/tex/context/interface/mkiv/context-en.xml b/tex/context/interface/mkiv/context-en.xml
index 6cf0cfa0f..59ecba8ec 100644
--- a/tex/context/interface/mkiv/context-en.xml
+++ b/tex/context/interface/mkiv/context-en.xml
@@ -3089,6 +3089,14 @@
     <cd:content/>
    </cd:arguments>
   </cd:command>
+  <cd:command category="boxes" file="supp-box.lmt" level="system" name="reversevboxcontent">
+   <cd:arguments>
+    <cd:keywords delimiters="none">
+     <cd:constant type="cd:csname"/>
+     <cd:constant type="cd:number"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
  </cd:interface>
  <cd:interface file="i-buffer.xml">
   <cd:command category="buffer" file="buff-ini.mkiv" keywords="conditional" level="system" name="doifelsebuffer">
@@ -3796,7 +3804,7 @@
   <cd:command category="fonts" file="typo-cap.mkiv" level="document" name="randomized" type="environment"/>
  </cd:interface>
  <cd:interface file="i-catcodes.xml">
-  <cd:command category="catcode" file="catc-ctx.mkiv" level="system" name="texcode" type="environment"/>
+  <cd:command category="catcode" file="catc-ctx.mkxl" level="system" name="texcode" type="environment"/>
   <cd:command category="catcode" file="catc-ctx.mkiv" level="system" name="contextcode" type="environment"/>
   <cd:command category="catcode" file="catc-ctx.mkiv" level="system" name="contextdefinitioncode" type="environment"/>
   <cd:command begin="un" category="catcode" end="​" file="catc-def.mkiv" level="system" name="protect" type="environment"/>
@@ -5387,6 +5395,60 @@
    </cd:arguments>
   </cd:command>
  </cd:interface>
+ <cd:interface file="i-columns.xml">
+  <cd:command category="tables" file="page-mcl.mkxl" level="style" name="definemulticolumns">
+   <cd:arguments>
+    <cd:keywords>
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:keywords optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:assignments list="yes" optional="yes">
+     <cd:inherit name="setupmulticolumns"/>
+    </cd:assignments>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="columns" file="page-mcl.mkxl" level="style" name="setupmulticolumns">
+   <cd:arguments>
+    <cd:keywords list="yes" optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:assignments list="yes">
+     <cd:parameter name="n">
+      <cd:constant type="cd:number"/>
+     </cd:parameter>
+     <cd:parameter name="distance">
+      <cd:constant type="cd:dimension"/>
+     </cd:parameter>
+     <cd:parameter name="direction">
+      <cd:constant default="yes" type="right"/>
+      <cd:constant type="reverse"/>
+     </cd:parameter>
+     <cd:parameter name="balance">
+      <cd:constant default="yes" type="yes"/>
+      <cd:constant type="no"/>
+     </cd:parameter>
+     <cd:parameter name="blank">
+      <cd:inherit name="blank"/>
+     </cd:parameter>
+     <cd:parameter name="align">
+      <cd:inherit name="setupalign"/>
+     </cd:parameter>
+     <cd:parameter name="ntop">
+      <cd:constant type="cd:number"/>
+     </cd:parameter>
+    </cd:assignments>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="tables" file="page-mcl.mkxl" level="document" name="multicolumns" type="environment">
+   <cd:arguments>
+    <cd:assignments list="yes" optional="yes">
+     <cd:inherit name="setupmulticolumns"/>
+    </cd:assignments>
+   </cd:arguments>
+  </cd:command>
+ </cd:interface>
  <cd:interface file="i-combination.xml">
   <cd:command category="tables" file="pack-com.mkiv" level="style" name="definecombination">
    <cd:arguments>
@@ -7109,6 +7171,9 @@
      <cd:parameter name="start">
       <cd:constant type="cd:number"/>
      </cd:parameter>
+     <cd:parameter name="number">
+      <cd:constant type="cd:number"/>
+     </cd:parameter>
      <cd:parameter name="counter">
       <cd:constant type="cd:name"/>
      </cd:parameter>
@@ -8438,6 +8503,32 @@
   <cd:command category="structure" file="file-job.mkvi" level="system" name="currentcomponent"/>
   <cd:command category="structure" file="file-job.mkvi" level="document" name="document" type="environment">
    <cd:arguments>
+    <cd:keywords optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:assignments list="yes" optional="yes">
+     <cd:inherit name="setupdocument"/>
+    </cd:assignments>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="structure" file="file-job.mkvi" generated="yes" level="document" name="document" type="environment" variant="example">
+   <cd:arguments>
+    <cd:keywords optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:assignments list="yes" optional="yes">
+     <cd:inherit name="setupdocument"/>
+    </cd:assignments>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="structure" file="file-job.mkvi" level="style" name="definedocument">
+   <cd:arguments>
+    <cd:keywords>
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:keywords optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setupdocument"/>
     </cd:assignments>
@@ -8445,6 +8536,9 @@
   </cd:command>
   <cd:command category="structure" file="file-job.mkvi" level="style" name="setupdocument">
    <cd:arguments>
+    <cd:keywords list="yes" optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
     <cd:assignments list="yes">
      <cd:parameter name="before">
       <cd:constant type="cd:command"/>
@@ -8472,6 +8566,9 @@
   </cd:command>
   <cd:command category="structure" file="file-job.mkvi" level="style" name="presetdocument">
    <cd:arguments>
+    <cd:keywords optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
     <cd:assignments list="yes">
      <cd:inherit name="setupdocument"/>
     </cd:assignments>
@@ -10157,104 +10254,6 @@
    </cd:arguments>
   </cd:command>
   <cd:command category="rules" file="spac-flr.mkiv" level="document" name="dotfill"/>
-  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="definelinefiller">
-   <cd:arguments>
-    <cd:keywords>
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-    <cd:keywords optional="yes">
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-    <cd:assignments list="yes" optional="yes">
-     <cd:inherit name="setuplinefiller"/>
-    </cd:assignments>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="setuplinefiller">
-   <cd:arguments>
-    <cd:keywords list="yes" optional="yes">
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-    <cd:assignments list="yes">
-     <cd:parameter name="location">
-      <cd:constant type="left"/>
-      <cd:constant type="right"/>
-      <cd:constant default="yes" type="both"/>
-     </cd:parameter>
-     <cd:parameter name="scope">
-      <cd:constant type="left"/>
-      <cd:constant type="right"/>
-      <cd:constant default="yes" type="local"/>
-     </cd:parameter>
-     <cd:parameter name="mp">
-      <cd:constant type="cd:name"/>
-     </cd:parameter>
-     <cd:parameter name="height">
-      <cd:constant type="cd:dimension"/>
-     </cd:parameter>
-     <cd:parameter name="depth">
-      <cd:constant type="cd:dimension"/>
-     </cd:parameter>
-     <cd:parameter name="distance">
-      <cd:constant type="cd:dimension"/>
-     </cd:parameter>
-     <cd:parameter name="threshold">
-      <cd:constant type="cd:dimension"/>
-     </cd:parameter>
-     <cd:parameter name="rulethickness">
-      <cd:constant type="cd:dimension"/>
-     </cd:parameter>
-     <cd:parameter name="before">
-      <cd:constant type="cd:command"/>
-     </cd:parameter>
-     <cd:parameter name="after">
-      <cd:constant type="cd:command"/>
-     </cd:parameter>
-     <cd:parameter name="color">
-      <cd:constant type="cd:color"/>
-     </cd:parameter>
-     <cd:parameter name="textstyle">
-      <cd:constant type="cd:style"/>
-      <cd:constant type="cd:command"/>
-     </cd:parameter>
-     <cd:parameter name="textcolor">
-      <cd:constant type="cd:color"/>
-     </cd:parameter>
-     <cd:parameter name="align">
-      <cd:inherit name="setupalign"/>
-     </cd:parameter>
-    </cd:assignments>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="setuplinefillers">
-   <cd:arguments>
-    <cd:keywords list="yes" optional="yes">
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-    <cd:assignments list="yes">
-     <cd:inherit name="setuplinefiller"/>
-    </cd:assignments>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="linefiller" type="environment">
-   <cd:arguments>
-    <cd:keywords>
-     <cd:constant type="filler"/>
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-    <cd:assignments list="yes" optional="yes">
-     <cd:inherit name="setuplinefiller"/>
-    </cd:assignments>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="rules" file="node-rul.mkiv" keywords="metapost" level="style" name="setlinefiller">
-   <cd:arguments>
-    <cd:keywords>
-     <cd:constant type="filler"/>
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
  </cd:interface>
  <cd:interface file="i-fillinline.xml">
   <cd:command category="rules" file="pack-mrl.mkiv" level="style" name="setupfillinlines">
@@ -13166,7 +13165,6 @@
   <cd:command category="fonts" file="font-pre.mkiv" level="document" name="normal"/>
   <cd:command category="fonts" file="font-pre.mkiv" level="document" name="bold"/>
   <cd:command category="fonts" file="font-pre.mkiv" level="document" name="mono"/>
-  <cd:command category="fonts" file="font-pre.mkiv" level="document" name="monobold"/>
   <cd:command category="fonts" file="font-pre.mkiv" level="document" name="slanted"/>
   <cd:command category="fonts" file="font-pre.mkiv" level="document" name="italic"/>
   <cd:command category="fonts" file="font-pre.mkiv" level="document" name="boldslanted"/>
@@ -14511,6 +14509,9 @@
       <cd:constant type="frame"/>
       <cd:constant type="cd:dimension"/>
      </cd:parameter>
+     <cd:parameter name="backgroundcolor">
+      <cd:resolve name="cd:color"/>
+     </cd:parameter>
      <cd:parameter name="component">
       <cd:constant type="cd:name"/>
      </cd:parameter>
@@ -14636,6 +14637,10 @@
      <cd:parameter name="yanchor">
       <cd:constant type="cd:dimension"/>
      </cd:parameter>
+     <cd:parameter name="linedirection">
+      <cd:constant default="yes" type="normal"/>
+      <cd:constant type="reverse"/>
+     </cd:parameter>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
@@ -16229,7 +16234,6 @@
   <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="fixedspaces"/>
   <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="keepunwantedspaces"/>
   <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="removeunwantedspaces"/>
-  <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="thinspace"/>
   <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="negthinspace"/>
   <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="enspace"/>
   <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="negenspace"/>
@@ -16245,9 +16249,9 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="system" name="leftskipadaption"/>
-  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="system" name="rightskipadaption"/>
-  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="system" name="dosetleftskipadaption">
+  <cd:command category="whitespace" file="spac-hor.mkxl" keywords="layout" level="system" name="leftskipadaption"/>
+  <cd:command category="whitespace" file="spac-hor.mkxl" keywords="layout" level="system" name="rightskipadaption"/>
+  <cd:command category="whitespace" file="spac-hor.mkxl" keywords="layout" level="system" name="dosetleftskipadaption">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="yes"/>
@@ -16257,7 +16261,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="system" name="dosetrightskipadaption">
+  <cd:command category="whitespace" file="spac-hor.mkxl" keywords="layout" level="system" name="dosetrightskipadaption">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="yes"/>
@@ -16267,7 +16271,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="system" name="doadaptleftskip">
+  <cd:command category="whitespace" file="spac-hor.mkxl" keywords="layout" level="system" name="doadaptleftskip">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="yes"/>
@@ -16277,7 +16281,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace" file="spac-hor.mkiv" keywords="layout" level="system" name="doadaptrightskip">
+  <cd:command category="whitespace" file="spac-hor.mkxl" keywords="layout" level="system" name="doadaptrightskip">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="yes"/>
@@ -16287,7 +16291,7 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace" file="spac-hor.mkiv" level="system" name="activatespacehandler">
+  <cd:command category="whitespace" file="spac-hor.mkxl" level="system" name="activatespacehandler">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="on"/>
@@ -16297,30 +16301,30 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace" file="spac-hor.mkiv" level="style" name="quads">
+  <cd:command category="whitespace" file="spac-hor.mkxl" level="style" name="quads">
    <cd:arguments>
     <cd:keywords optional="yes">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace" file="spac/hor.mkiv" level="system" name="interwordspacebefore"/>
-  <cd:command category="whitespace" file="spac/hor.mkiv" level="system" name="interwordspaceafter"/>
-  <cd:command category="whitespace" file="spac/hor.mkiv" level="system" name="interwordspacesbefore">
+  <cd:command category="whitespace" file="spac-hor.mkxl" level="system" name="interwordspacebefore"/>
+  <cd:command category="whitespace" file="spac-hor.mkxl" level="system" name="interwordspaceafter"/>
+  <cd:command category="whitespace" file="spac-hor.mkxl" level="system" name="interwordspacesbefore">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace" file="spac/hor.mkiv" level="system" name="interwordspacesafter">
+  <cd:command category="whitespace" file="spac-hor.mkxl" level="system" name="interwordspacesafter">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="whitespace" file="spac/hor.mkiv" level="system" name="interwordspaces">
+  <cd:command category="whitespace" file="spac-hor.mkxl" level="system" name="interwordspaces">
    <cd:arguments>
     <cd:keywords delimiters="braces">
      <cd:constant type="cd:number"/>
@@ -16603,6 +16607,14 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
+  <cd:command category="language" file="lang-ini.mkxl" level="style" name="dohyphens"/>
+  <cd:command category="language" file="lang-ini.mkxl" level="style" name="nohyphens"/>
+  <cd:command category="language" file="lang-ini.mkxl" level="system" name="usehyphensparameter">
+   <cd:arguments>
+    <cd:csname _error_="&quot;"/>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="language" file="lang-mis.mkxl" level="system" name="compounddiscretionary"/>
  </cd:interface>
  <cd:interface file="i-imposition.xml">
   <cd:command category="layout" file="page-imp.mkiv" level="system" name="installshipoutmethod">
@@ -17981,181 +17993,6 @@
    </cd:arguments>
   </cd:command>
  </cd:interface>
- <cd:interface file="i-interlinespace.xml">
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="defineinterlinespace">
-   <cd:arguments>
-    <cd:keywords>
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-    <cd:keywords optional="yes">
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-    <cd:assignments list="yes" optional="yes">
-     <cd:inherit name="setupinterlinespace"/>
-    </cd:assignments>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupinterlinespace">
-   <cd:arguments>
-    <cd:keywords list="yes" optional="yes">
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-    <cd:assignments list="yes">
-     <cd:parameter name="line">
-      <cd:constant type="cd:dimension"/>
-     </cd:parameter>
-     <cd:parameter name="height">
-      <cd:constant type="cd:number"/>
-     </cd:parameter>
-     <cd:parameter name="depth">
-      <cd:constant type="cd:number"/>
-     </cd:parameter>
-     <cd:parameter name="minheight">
-      <cd:constant type="cd:number"/>
-     </cd:parameter>
-     <cd:parameter name="mindepth">
-      <cd:constant type="cd:number"/>
-     </cd:parameter>
-     <cd:parameter name="distance">
-      <cd:constant type="cd:dimension"/>
-     </cd:parameter>
-     <cd:parameter name="top">
-      <cd:constant type="cd:number"/>
-      <cd:constant type="height"/>
-     </cd:parameter>
-     <cd:parameter name="bottom">
-      <cd:constant type="cd:number"/>
-     </cd:parameter>
-     <cd:parameter name="stretch">
-      <cd:constant type="cd:number"/>
-     </cd:parameter>
-     <cd:parameter name="shrink">
-      <cd:constant type="cd:number"/>
-     </cd:parameter>
-    </cd:assignments>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="argument">
-   <cd:arguments>
-    <cd:keywords list="yes" optional="yes">
-     <cd:constant type="on"/>
-     <cd:constant type="off"/>
-     <cd:constant type="reset"/>
-     <cd:constant type="auto"/>
-     <cd:constant type="small"/>
-     <cd:constant type="medium"/>
-     <cd:constant type="big"/>
-     <cd:constant type="cd:number"/>
-     <cd:constant type="cd:dimension"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setupinterlinespace" variant="name">
-   <cd:arguments>
-    <cd:keywords>
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace">
-   <cd:arguments>
-    <cd:keywords list="yes" optional="yes">
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-    <cd:assignments list="yes">
-     <cd:inherit name="setupinterlinespace"/>
-    </cd:assignments>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="argument">
-   <cd:arguments>
-    <cd:keywords list="yes" optional="yes">
-     <cd:constant type="on"/>
-     <cd:constant type="off"/>
-     <cd:constant type="reset"/>
-     <cd:constant type="auto"/>
-     <cd:constant type="small"/>
-     <cd:constant type="medium"/>
-     <cd:constant type="big"/>
-     <cd:constant type="cd:number"/>
-     <cd:constant type="cd:dimension"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="setuplocalinterlinespace" variant="name">
-   <cd:arguments>
-    <cd:keywords>
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="switchtointerlinespace">
-   <cd:arguments>
-    <cd:keywords list="yes" optional="yes">
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-    <cd:assignments list="yes">
-     <cd:inherit name="setupinterlinespace"/>
-    </cd:assignments>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="switchtointerlinespace" variant="argument">
-   <cd:arguments>
-    <cd:keywords list="yes" optional="yes">
-     <cd:constant type="on"/>
-     <cd:constant type="off"/>
-     <cd:constant type="reset"/>
-     <cd:constant type="auto"/>
-     <cd:constant type="small"/>
-     <cd:constant type="medium"/>
-     <cd:constant type="big"/>
-     <cd:constant type="cd:number"/>
-     <cd:constant type="cd:dimension"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="style" name="switchtointerlinespace" variant="name">
-   <cd:arguments>
-    <cd:keywords>
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace">
-   <cd:arguments>
-    <cd:assignments delimiters="braces" list="yes">
-     <cd:inherit name="setupinterlinespace"/>
-    </cd:assignments>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="argument">
-   <cd:arguments>
-    <cd:keywords delimiters="braces" list="yes">
-     <cd:constant type="on"/>
-     <cd:constant type="off"/>
-     <cd:constant type="reset"/>
-     <cd:constant type="auto"/>
-     <cd:constant type="small"/>
-     <cd:constant type="medium"/>
-     <cd:constant type="big"/>
-     <cd:constant type="cd:number"/>
-     <cd:constant type="cd:dimension"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="dosetupcheckedinterlinespace" variant="name">
-   <cd:arguments>
-    <cd:keywords delimiters="braces">
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
-  <cd:command category="whitespace" file="spac-ver.mkiv" level="system" name="useinterlinespaceparameter">
-   <cd:arguments>
-    <cd:csname/>
-   </cd:arguments>
-  </cd:command>
- </cd:interface>
  <cd:interface file="i-italiccorrection.xml">
   <cd:command category="fonts" file="typo-itc.mkvi" level="system" name="setitaliccorrection">
    <cd:arguments>
@@ -18380,6 +18217,8 @@
      <cd:parameter name="placestopper">
       <cd:constant default="yes" type="yes"/>
       <cd:constant type="no"/>
+      <cd:constant type="display"/>
+      <cd:constant type="inline"/>
      </cd:parameter>
      <cd:parameter name="style">
       <cd:constant type="cd:style"/>
@@ -18602,6 +18441,8 @@
      <cd:parameter name="placestopper">
       <cd:constant default="yes" type="yes"/>
       <cd:constant type="no"/>
+      <cd:constant type="display"/>
+      <cd:constant type="inline"/>
      </cd:parameter>
      <cd:parameter name="style">
       <cd:constant type="cd:style"/>
@@ -18824,6 +18665,8 @@
      <cd:parameter name="placestopper">
       <cd:constant default="yes" type="yes"/>
       <cd:constant type="no"/>
+      <cd:constant type="display"/>
+      <cd:constant type="inline"/>
      </cd:parameter>
      <cd:parameter name="style">
       <cd:constant type="cd:style"/>
@@ -19051,6 +18894,8 @@
      <cd:parameter name="placestopper">
       <cd:constant default="yes" type="yes"/>
       <cd:constant type="no"/>
+      <cd:constant type="display"/>
+      <cd:constant type="inline"/>
      </cd:parameter>
      <cd:parameter name="style">
       <cd:constant type="cd:style"/>
@@ -20955,8 +20800,8 @@
       <cd:constant default="yes" type="local"/>
       <cd:constant type="global"/>
      </cd:parameter>
-     <cd:parameter name="color">
-      <cd:constant type="cd:color"/>
+     <cd:parameter name="mp">
+      <cd:constant type="cd:name"/>
      </cd:parameter>
      <cd:parameter name="height">
       <cd:constant type="cd:dimension"/>
@@ -20973,6 +20818,15 @@
      <cd:parameter name="rulethickness">
       <cd:constant type="cd:dimension"/>
      </cd:parameter>
+     <cd:parameter name="before">
+      <cd:constant type="cd:command"/>
+     </cd:parameter>
+     <cd:parameter name="after">
+      <cd:constant type="cd:command"/>
+     </cd:parameter>
+     <cd:parameter name="color">
+      <cd:constant type="cd:color"/>
+     </cd:parameter>
      <cd:parameter name="textstyle">
       <cd:constant type="cd:style"/>
       <cd:constant type="cd:command"/>
@@ -20983,15 +20837,6 @@
      <cd:parameter name="align">
       <cd:inherit name="setupalign"/>
      </cd:parameter>
-     <cd:parameter name="mp">
-      <cd:constant type="cd:name"/>
-     </cd:parameter>
-     <cd:parameter name="before">
-      <cd:constant type="cd:command"/>
-     </cd:parameter>
-     <cd:parameter name="after">
-      <cd:constant type="cd:command"/>
-     </cd:parameter>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
@@ -22646,6 +22491,16 @@
     <cd:variable value="ctxfunctiondefinition"/>
    </cd:sequence>
   </cd:command>
+  <cd:command category="lua" file="luat-ini.mkiv" level="system" name="setctxluafunction">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:number"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
   <cd:command category="lua" file="luat-ini.mkiv" level="system" name="ctxfunction" type="environment">
    <cd:arguments>
     <cd:keywords delimiters="none">
@@ -22660,11 +22515,45 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
+  <cd:command category="lua" file="luat-ini.mkiv" level="system" name="installctxfunction">
+   <cd:arguments>
+    <cd:csname/>
+    <cd:content/>
+   </cd:arguments>
+  </cd:command>
   <cd:command category="lua" file="luat-ini.mkiv" generated="yes" level="system" name="ctxfunction" variant="example">
    <cd:sequence>
     <cd:variable value="ctxfunction"/>
    </cd:sequence>
   </cd:command>
+  <cd:command category="lua" file="luat-ini.mkiv" level="system" name="installctxscanner">
+   <cd:arguments>
+    <cd:csname/>
+    <cd:content/>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="lua" file="luat-ini.mkiv" generated="yes" level="system" name="ctxscanner" variant="example">
+   <cd:sequence>
+    <cd:variable value="ctxscanner"/>
+   </cd:sequence>
+  </cd:command>
+  <cd:command category="lua" file="luat-ini.mkiv" level="system" name="installprotectedctxfunction">
+   <cd:arguments>
+    <cd:csname/>
+    <cd:content/>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="lua" file="luat-ini.mkiv" level="system" name="installprotectedctxscanner">
+   <cd:arguments>
+    <cd:csname/>
+    <cd:content/>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="lua" file="luat-ini.mkiv" level="system" name="resetctxscanner">
+   <cd:arguments>
+    <cd:csname/>
+   </cd:arguments>
+  </cd:command>
  </cd:interface>
  <cd:interface file="i-luatable.xml">
   <cd:command category="lua" file="cldf-int.mkxl" level="system" name="newluatable">
@@ -23223,6 +23112,7 @@
   <cd:command category="structure" file="strc-mar.mkiv" level="system" name="resetmarking">
    <cd:arguments>
     <cd:keywords>
+     <cd:constant type="all"/>
      <cd:constant type="cd:mark"/>
     </cd:keywords>
    </cd:arguments>
@@ -24695,15 +24585,22 @@
    <cd:instances>
     <cd:constant value="matrix"/>
     <cd:constant value="mathmatrix"/>
+    <cd:constant value="thematrix"/>
    </cd:instances>
   </cd:command>
-  <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" keywords="tables" level="document" name="mathmatrix">
+  <cd:command category="mathematics" file="math-ali.mkiv" generated="yes" keywords="tables" level="document" name="mathmatrix" variant="instance">
    <cd:sequence>
-    <cd:variable value="mathmatrix"/>
+    <cd:instance value="mathmatrix"/>
    </cd:sequence>
    <cd:arguments>
+    <cd:assignments list="yes" optional="yes">
+     <cd:inherit name="setupmathmatrix"/>
+    </cd:assignments>
     <cd:content/>
    </cd:arguments>
+   <cd:instances>
+    <cd:constant value="thematrix"/>
+   </cd:instances>
   </cd:command>
   <cd:command category="mathematics" file="math-ali.mkiv" keywords="tables" level="document" name="matrices" type="environment">
    <cd:arguments>
@@ -27701,7 +27598,7 @@
     </cd:assignments>
    </cd:arguments>
   </cd:command>
-  <cd:command category="structure" file="strc-tnt.mkiv" generated="yes" keywords="notes" level="document" name="textnote">
+  <cd:command category="structure" file="strc-tnt.mkiv" generated="yes" keywords="notes" level="document" name="textnote" variant="example">
    <cd:arguments>
     <cd:assignments list="yes" optional="yes">
      <cd:inherit name="setuptextnote"/>
@@ -29117,6 +29014,7 @@
       <cd:constant type="inmargin"/>
       <cd:constant type="atmargin"/>
       <cd:constant type="marginedge"/>
+      <cd:constant type="none"/>
      </cd:parameter>
      <cd:parameter name="style">
       <cd:constant type="cd:style"/>
@@ -30253,6 +30151,82 @@
    </cd:arguments>
   </cd:command>
  </cd:interface>
+ <cd:interface file="i-parwrapper.xml">
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="freezeparagraphproperties"/>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="defrostparagraphproperties"/>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="updateparagraphproperties"/>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="updateparagraphpenalties"/>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="updateparagraphdemerits"/>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="updateparagraphshapes"/>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="setparagraphfreezing"/>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="forgetparagraphfreezing"/>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="registerparwrapper">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:content/>
+    <cd:content/>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="registerparwrapperreverse">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:content/>
+    <cd:content/>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="directparwrapper">
+   <cd:arguments>
+    <cd:content/>
+    <cd:content/>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="forgetparwrapper"/>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="unregisterparwrapper">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="doifelseparwrapper">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:true"/>
+    </cd:keywords>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:false"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="whitespace" file="spac-par.mkxl" level="system" name="showparwrapperstate">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="whitespace" file="spac-par.lmt" level="system" name="getparwrapper">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="whitespace" file="spac-par.lmt" level="system" name="lastparwrapper">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+ </cd:interface>
  <cd:interface file="i-pdf.xml">
   <cd:command category="pdf" file="back-pdf.mkiv" level="system" name="pdfbackendsetcatalog">
    <cd:arguments>
@@ -37024,7 +36998,7 @@
     <cd:keywords>
      <cd:constant type="cd:name"/>
     </cd:keywords>
-    <cd:keywords>
+    <cd:keywords optional="yes">
      <cd:constant type="cd:text"/>
     </cd:keywords>
     <cd:keywords>
@@ -37038,6 +37012,9 @@
      <cd:constant type="reset"/>
      <cd:constant type="cd:name"/>
     </cd:keywords>
+    <cd:keywords optional="yes">
+     <cd:constant type="cd:name"/>
+    </cd:keywords>
    </cd:arguments>
   </cd:command>
   <cd:command category="language" file="lang-rep.mkiv" level="style" name="resetreplacements"/>
@@ -39842,6 +39819,10 @@
      <cd:parameter name="inbetween">
       <cd:constant type="cd:command"/>
      </cd:parameter>
+     <cd:parameter name="hyphens">
+      <cd:constant default="yes" type="yes"/>
+      <cd:constant type="no"/>
+     </cd:parameter>
     </cd:assignments>
    </cd:arguments>
   </cd:command>
@@ -42230,7 +42211,6 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="catcode" file="syst-aux.mkiv" level="system" name="texcode" type="environment"/>
   <cd:command category="counter" file="syst-aux.mkiv" level="system" name="newcounter">
    <cd:arguments>
     <cd:csname/>
@@ -42463,6 +42443,20 @@
     <cd:delimiter name="fi"/>
    </cd:arguments>
   </cd:command>
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="validassignment">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:text"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="nonvalidassignment">
+   <cd:arguments>
+    <cd:keywords delimiters="braces">
+     <cd:constant type="cd:text"/>
+    </cd:keywords>
+   </cd:arguments>
+  </cd:command>
   <cd:command category="system" file="syst-aux.mkiv" keywords="conditional" level="system" name="doifelseassignmentcs">
    <cd:arguments>
     <cd:keywords delimiters="braces">
@@ -48848,6 +48842,16 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
+  <cd:command category="whitespace" file="spac-ver.mkxl" keywords="conditional" level="document" name="doifoutervmode">
+   <cd:arguments>
+    <cd:content/>
+   </cd:arguments>
+  </cd:command>
+  <cd:command category="whitespace" file="spac-ver.mkxl" level="document" name="dosomebreak">
+   <cd:arguments>
+    <cd:csname/>
+   </cd:arguments>
+  </cd:command>
   <cd:command category="whitespace" file="spac-ver.mkiv" level="document" name="godown">
    <cd:arguments>
     <cd:keywords>
@@ -49999,16 +50003,6 @@
     </cd:keywords>
    </cd:arguments>
   </cd:command>
-  <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlregisterns">
-   <cd:arguments>
-    <cd:keywords delimiters="braces">
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-    <cd:keywords delimiters="braces">
-     <cd:constant type="cd:name"/>
-    </cd:keywords>
-   </cd:arguments>
-  </cd:command>
   <cd:command category="xml" file="lxml-ini.mkiv" level="style" name="xmlremapname">
    <cd:arguments>
     <cd:keywords delimiters="braces">
diff --git a/tex/context/interface/mkiv/i-boxes.xml b/tex/context/interface/mkiv/i-boxes.xml
index e18243811..b13c8c3ab 100644
--- a/tex/context/interface/mkiv/i-boxes.xml
+++ b/tex/context/interface/mkiv/i-boxes.xml
@@ -1256,4 +1256,10 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="reversevboxcontent" level="system" category="boxes" file="supp-box.lmt">
+        <cd:arguments>
+            <cd:resolve name="string-box"/>
+        </cd:arguments>
+    </cd:command>
+
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-catcodes.xml b/tex/context/interface/mkiv/i-catcodes.xml
index 4e112c491..561cd9af6 100644
--- a/tex/context/interface/mkiv/i-catcodes.xml
+++ b/tex/context/interface/mkiv/i-catcodes.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="texcode" type="environment" level="system" category="catcode" file="catc-ctx.mkiv"/>
+    <cd:command name="texcode" type="environment" level="system" category="catcode" file="catc-ctx.mkxl"/>
 
     <cd:command name="contextcode" type="environment" level="system" category="catcode" file="catc-ctx.mkiv"/>
 
diff --git a/tex/context/interface/mkiv/i-columns.xml b/tex/context/interface/mkiv/i-columns.xml
index 72260b820..9890ec46f 100644
--- a/tex/context/interface/mkiv/i-columns.xml
+++ b/tex/context/interface/mkiv/i-columns.xml
@@ -4,8 +4,19 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="setupcolumns" level="style" category="columns" file="page-mul.mkiv">
+    <cd:command name="definemulticolumns" level="style" category="tables" file="page-mcl.mkxl">
         <cd:arguments>
+            <cd:resolve name="keyword-name"/>
+            <cd:resolve name="keyword-name-optional"/>
+            <cd:assignments optional="yes" list="yes">
+                <cd:inherit name="setupmulticolumns"/>
+            </cd:assignments>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="setupmulticolumns" level="style" category="columns" file="page-mcl.mkxl">
+        <cd:arguments>
+            <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
                 <cd:parameter name="n">
                     <cd:constant type="cd:number"/>
@@ -13,112 +24,31 @@
                 <cd:parameter name="distance">
                     <cd:constant type="cd:dimension"/>
                 </cd:parameter>
-                <cd:parameter name="option">
-                    <cd:constant type="background"/>
-                </cd:parameter>
-                <cd:parameter name="offset">
-                    <cd:constant type="cd:dimension"/>
-                </cd:parameter>
-                <cd:parameter name="command">
-                    <cd:constant type="cd:oneargument"/>
-                </cd:parameter>
-                <cd:parameter name="height">
-                    <cd:constant type="cd:dimension"/>
-                </cd:parameter>
                 <cd:parameter name="direction">
-                    <cd:constant type="left"/>
                     <cd:constant type="right" default="yes"/>
+                    <cd:constant type="reverse"/>
                 </cd:parameter>
                 <cd:parameter name="balance">
                     <cd:constant type="yes" default="yes"/>
                     <cd:constant type="no"/>
                 </cd:parameter>
-                <cd:parameter name="align">
-                    <cd:inherit name="setupalign"/>
-                </cd:parameter>
-                <cd:parameter name="tolerance">
-                    <cd:inherit name="setuptolerance"/>
-                </cd:parameter>
                 <cd:parameter name="blank">
                     <cd:inherit name="blank"/>
                 </cd:parameter>
-                <cd:parameter name="ntop">
-                    <cd:constant type="cd:number"/>
-                </cd:parameter>
-                <cd:parameter name="rule">
-                    <cd:constant type="on"/>
-                    <cd:constant type="off" default="yes"/>
-                    <cd:constant type="cd:command"/>
+                <cd:parameter name="align">
+                    <cd:inherit name="setupalign"/>
                 </cd:parameter>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="columns" type="environment" level="document" category="columns" file="page-mul.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupcolumns"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="setupcolumnspan" level="style" category="columns" file="page-mul.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes">
-                <cd:parameter name="n">
+                <cd:parameter name="ntop">
                     <cd:constant type="cd:number"/>
                 </cd:parameter>
-                <cd:inherit name="setupframed"/>
             </cd:assignments>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="columnspan" type="environment" level="document" category="columns" file="page-mul.mkiv">
+    <cd:command name="multicolumns" type="environment" level="document" category="tables" file="page-mcl.mkxl">
         <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setupcolumnspan"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <!--
-
-        <cd:command name="setsimplecolumnshsize" level="system" category="columns" file="page-mul.mkiv">
-            <cd:arguments>
-                <cd:assignments list="yes">
-                    <cd:parameter name="n">
-                        <cd:constant type="cd:number"/>
-                    </cd:parameter>
-                    <cd:parameter name="width">
-                        <cd:constant type="cd:dimension"/>
-                    </cd:parameter>
-                    <cd:parameter name="distance">
-                        <cd:constant type="cd:dimension"/>
-                    </cd:parameter>
-                    <cd:parameter name="lines">
-                        <cd:constant type="cd:number"/>
-                    </cd:parameter>
-                </cd:assignments>
-            </cd:arguments>
-        </cd:command>
-
-    -->
-
-    <cd:command name="simplecolumns" type="environment" level="system" category="columns" file="page-mul.mkiv">
-        <cd:arguments>
-            <cd:assignments list="yes" optional="yes">
-                <cd:parameter name="n">
-                    <cd:constant type="cd:number"/>
-                </cd:parameter>
-                <cd:parameter name="width">
-                    <cd:constant type="cd:dimension"/>
-                </cd:parameter>
-                <cd:parameter name="distance">
-                    <cd:constant type="cd:dimension"/>
-                </cd:parameter>
-                <cd:parameter name="lines">
-                    <cd:constant type="cd:number"/>
-                </cd:parameter>
+            <cd:assignments optional="yes" list="yes">
+                <cd:inherit name="setupmulticolumns"/>
             </cd:assignments>
         </cd:arguments>
     </cd:command>
diff --git a/tex/context/interface/mkiv/i-common-argument.xml b/tex/context/interface/mkiv/i-common-argument.xml
index 5741a1c8a..c1b2f8cb3 100644
--- a/tex/context/interface/mkiv/i-common-argument.xml
+++ b/tex/context/interface/mkiv/i-common-argument.xml
@@ -594,4 +594,15 @@
         </cd:keywords>
     </cd:define>
 
+    <!--        *   -->
+    <!-- \... {...} -->
+    <!--            -->
+    <!-- * URL      -->
+
+    <cd:define name="argument-url">
+        <cd:keywords delimiters="braces">
+            <cd:constant type="cd:url"/>
+        </cd:keywords>
+    </cd:define>
+
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-common-instance.xml b/tex/context/interface/mkiv/i-common-instance.xml
index 025dafc4a..07ca3ac15 100644
--- a/tex/context/interface/mkiv/i-common-instance.xml
+++ b/tex/context/interface/mkiv/i-common-instance.xml
@@ -182,6 +182,11 @@
     <cd:define name="instance-mathmatrix">
         <cd:constant value="matrix"/>
         <cd:constant value="mathmatrix"/>
+        <cd:constant value="thematrix"/>
+    </cd:define>
+
+    <cd:define name="instance-simplematrix">
+        <cd:constant value="thematrix"/>
     </cd:define>
 
     <cd:define name="instance-mixedcolumns">
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 7950faf9f..f1ee11be3 100644
--- a/tex/context/interface/mkiv/i-context.pdf
+++ b/tex/context/interface/mkiv/i-context.pdf
diff --git a/tex/context/interface/mkiv/i-context.xml b/tex/context/interface/mkiv/i-context.xml
index 2afbdfee2..a1f53f470 100644
--- a/tex/context/interface/mkiv/i-context.xml
+++ b/tex/context/interface/mkiv/i-context.xml
@@ -53,6 +53,7 @@
     <cd:interfacefile filename="i-clipping.xml"/>
     <cd:interfacefile filename="i-collector.xml"/>
     <cd:interfacefile filename="i-color.xml"/>
+    <cd:interfacefile filename="i-columns.xml"/>
     <cd:interfacefile filename="i-combination.xml"/>
     <cd:interfacefile filename="i-commandhandler.xml"/>
     <cd:interfacefile filename="i-comment.xml"/>
@@ -107,7 +108,6 @@
     <cd:interfacefile filename="i-interactionscreen.xml"/>
     <cd:interfacefile filename="i-interface.xml"/>
     <cd:interfacefile filename="i-interlinespace.xml"/>
-    <cd:interfacefile filename="i-interlinespace.xml"/>
     <cd:interfacefile filename="i-italiccorrection.xml"/>
     <cd:interfacefile filename="i-itemgroup.xml"/>
     <cd:interfacefile filename="i-items.xml"/>
@@ -177,6 +177,7 @@
     <cd:interfacefile filename="i-paragraphs.xml"/>
     <cd:interfacefile filename="i-parallel.xml"/>
     <cd:interfacefile filename="i-parbuilder.xml"/>
+    <cd:interfacefile filename="i-parwrapper.xml"/>
     <cd:interfacefile filename="i-pdf.xml"/>
     <cd:interfacefile filename="i-penalty.xml"/>
     <cd:interfacefile filename="i-periods.xml"/>
diff --git a/tex/context/interface/mkiv/i-counter.xml b/tex/context/interface/mkiv/i-counter.xml
index 7879fe27d..f3e622e5f 100644
--- a/tex/context/interface/mkiv/i-counter.xml
+++ b/tex/context/interface/mkiv/i-counter.xml
@@ -26,6 +26,9 @@
                 <cd:parameter name="start">
                     <cd:constant type="cd:number"/>
                 </cd:parameter>
+                <cd:parameter name="number">
+                    <cd:constant type="cd:number"/>
+                </cd:parameter>
                 <cd:parameter name="counter">
                     <cd:constant type="cd:name"/>
                 </cd:parameter>
diff --git a/tex/context/interface/mkiv/i-document.xml b/tex/context/interface/mkiv/i-document.xml
index 5886aa8eb..3ea0d0eeb 100644
--- a/tex/context/interface/mkiv/i-document.xml
+++ b/tex/context/interface/mkiv/i-document.xml
@@ -164,6 +164,26 @@
 
     <cd:command name="document" type="environment" level="document" category="structure" file="file-job.mkvi">
         <cd:arguments>
+            <cd:resolve name="keyword-name-optional"/>
+            <cd:assignments list="yes" optional="yes">
+                <cd:inherit name="setupdocument"/>
+            </cd:assignments>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="document" type="environment" generated="yes" variant="example" level="document" category="structure" file="file-job.mkvi">
+        <cd:arguments>
+            <cd:resolve name="keyword-name-optional"/>
+            <cd:assignments list="yes" optional="yes">
+                <cd:inherit name="setupdocument"/>
+            </cd:assignments>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="definedocument" level="style" category="structure" file="file-job.mkvi">
+        <cd:arguments>
+            <cd:resolve name="keyword-name"/>
+            <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setupdocument"/>
             </cd:assignments>
@@ -172,6 +192,7 @@
 
     <cd:command name="setupdocument" level="style" category="structure" file="file-job.mkvi">
         <cd:arguments>
+            <cd:resolve name="keyword-name-list-optional"/>
             <cd:assignments list="yes">
                 <cd:parameter name="before">
                     <cd:constant type="cd:command"/>
@@ -200,6 +221,7 @@
 
     <cd:command name="presetdocument" level="style" category="structure" file="file-job.mkvi">
         <cd:arguments>
+            <cd:resolve name="keyword-name-optional"/>
             <cd:assignments list="yes">
                 <cd:inherit name="setupdocument"/>
             </cd:assignments>
diff --git a/tex/context/interface/mkiv/i-filler.xml b/tex/context/interface/mkiv/i-filler.xml
index 078dc4b7a..2e425a3f7 100644
--- a/tex/context/interface/mkiv/i-filler.xml
+++ b/tex/context/interface/mkiv/i-filler.xml
@@ -129,98 +129,4 @@
 
     <cd:command name="dotfill" level="document" category="rules" file="spac-flr.mkiv"/>
 
-    <cd:command name="definelinefiller" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-name"/>
-            <cd:resolve name="keyword-name-optional"/>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setuplinefiller"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="setuplinefiller" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-name-list-optional"/>
-            <cd:assignments list="yes">
-                <cd:parameter name="location">
-                    <cd:constant type="left"/>
-                    <cd:constant type="right"/>
-                    <cd:constant type="both" default="yes"/>
-                </cd:parameter>
-                <cd:parameter name="scope">
-                    <cd:constant type="left"/>
-                    <cd:constant type="right"/>
-                    <cd:constant type="local" default="yes"/>
-                </cd:parameter>
-                <cd:parameter name="mp">
-                    <cd:constant type="cd:name"/>
-                </cd:parameter>
-                <cd:parameter name="height">
-                    <cd:constant type="cd:dimension"/>
-                </cd:parameter>
-                <cd:parameter name="depth">
-                    <cd:constant type="cd:dimension"/>
-                </cd:parameter>
-                <cd:parameter name="distance">
-                    <cd:constant type="cd:dimension"/>
-                </cd:parameter>
-                <cd:parameter name="threshold">
-                    <cd:constant type="cd:dimension"/>
-                </cd:parameter>
-                <cd:parameter name="rulethickness">
-                    <cd:constant type="cd:dimension"/>
-                </cd:parameter>
-                <cd:parameter name="before">
-                    <cd:constant type="cd:command"/>
-                </cd:parameter>
-                <cd:parameter name="after">
-                    <cd:constant type="cd:command"/>
-                </cd:parameter>
-                <cd:parameter name="color">
-                    <cd:constant type="cd:color"/>
-                </cd:parameter>
-                <cd:parameter name="textstyle">
-                    <cd:resolve name="value-style"/>
-                </cd:parameter>
-                <cd:parameter name="textcolor">
-                    <cd:constant type="cd:color"/>
-                </cd:parameter>
-                <cd:parameter name="align">
-                    <cd:inherit name="setupalign"/>
-                </cd:parameter>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="setuplinefillers" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
-        <cd:arguments>
-            <cd:resolve name="keyword-name-list-optional"/>
-            <cd:assignments list="yes">
-                <cd:inherit name="setuplinefiller"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="linefiller" type="environment" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
-        <cd:arguments>
-            <cd:keywords>
-                <cd:constant type="filler"/>
-                <cd:constant type="cd:name"/>
-            </cd:keywords>
-            <cd:assignments list="yes" optional="yes">
-                <cd:inherit name="setuplinefiller"/>
-            </cd:assignments>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="setlinefiller" level="style" category="rules" keywords="metapost" file="node-rul.mkiv">
-        <cd:arguments>
-            <cd:keywords>
-                <cd:constant type="filler"/>
-                <cd:constant type="cd:name"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
-
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-fonts.xml b/tex/context/interface/mkiv/i-fonts.xml
index 7cb1cbe99..a32aa1672 100644
--- a/tex/context/interface/mkiv/i-fonts.xml
+++ b/tex/context/interface/mkiv/i-fonts.xml
@@ -1153,8 +1153,6 @@
 
     <cd:command name="mono" level="document" category="fonts" file="font-pre.mkiv"/>
 
-    <cd:command name="monobold" level="document" category="fonts" file="font-pre.mkiv"/>
-
     <cd:command name="slanted" level="document" category="fonts" file="font-pre.mkiv"/>
 
     <cd:command name="italic" level="document" category="fonts" file="font-pre.mkiv"/>
diff --git a/tex/context/interface/mkiv/i-framed.xml b/tex/context/interface/mkiv/i-framed.xml
index d57a66969..ad8080a9d 100644
--- a/tex/context/interface/mkiv/i-framed.xml
+++ b/tex/context/interface/mkiv/i-framed.xml
@@ -103,6 +103,9 @@
                     <cd:constant type="frame"/>
                     <cd:constant type="cd:dimension"/>
                 </cd:parameter>
+                <cd:parameter name="backgroundcolor">
+                    <cd:resolve name="cd:color"/>
+                </cd:parameter>
                 <cd:parameter name="component">
                     <cd:constant type="cd:name"/>
                 </cd:parameter>
@@ -234,6 +237,10 @@
                 <cd:parameter name="yanchor">
                     <cd:constant type="cd:dimension"/>
                 </cd:parameter>
+                <cd:parameter name="linedirection">
+                    <cd:constant type="normal" default="yes"/>
+                    <cd:constant type="reverse"/>
+                </cd:parameter>
             </cd:assignments>
         </cd:arguments>
     </cd:command>
diff --git a/tex/context/interface/mkiv/i-hspace.xml b/tex/context/interface/mkiv/i-hspace.xml
index 878063106..222317468 100644
--- a/tex/context/interface/mkiv/i-hspace.xml
+++ b/tex/context/interface/mkiv/i-hspace.xml
@@ -87,8 +87,6 @@
 
     <cd:command name="removeunwantedspaces" level="system" category="whitespace" file="spac-hor.mkiv"/>
 
-    <cd:command name="thinspace" level="style" category="whitespace" file="spac-hor.mkiv"/>
-
     <cd:command name="negthinspace" level="style" category="whitespace" file="spac-hor.mkiv"/>
 
     <cd:command name="enspace" level="style" category="whitespace" file="spac-hor.mkiv"/>
@@ -111,11 +109,11 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="leftskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkiv"/>
+    <cd:command name="leftskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkxl"/>
 
-    <cd:command name="rightskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkiv"/>
+    <cd:command name="rightskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkxl"/>
 
-    <cd:command name="dosetleftskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkiv">
+    <cd:command name="dosetleftskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkxl">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:resolve name="value-leftskip"/>
@@ -123,7 +121,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="dosetrightskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkiv">
+    <cd:command name="dosetrightskipadaption" level="system" category="whitespace" keywords="layout" file="spac-hor.mkxl">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:resolve name="value-rightskip"/>
@@ -131,7 +129,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doadaptleftskip" level="system" category="whitespace" keywords="layout" file="spac-hor.mkiv">
+    <cd:command name="doadaptleftskip" level="system" category="whitespace" keywords="layout" file="spac-hor.mkxl">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:resolve name="value-leftskip"/>
@@ -139,7 +137,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="doadaptrightskip" level="system" category="whitespace" keywords="layout" file="spac-hor.mkiv">
+    <cd:command name="doadaptrightskip" level="system" category="whitespace" keywords="layout" file="spac-hor.mkxl">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:resolve name="value-rightskip"/>
@@ -147,7 +145,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="activatespacehandler" level="system" category="whitespace" file="spac-hor.mkiv">
+    <cd:command name="activatespacehandler" level="system" category="whitespace" file="spac-hor.mkxl">
         <cd:arguments>
             <cd:keywords delimiters="braces">
                 <cd:constant type="on"/>
@@ -161,29 +159,29 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="quads" level="style" category="whitespace" file="spac-hor.mkiv">
+    <cd:command name="quads" level="style" category="whitespace" file="spac-hor.mkxl">
         <cd:arguments>
             <cd:resolve name="keyword-number-optional"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="interwordspacebefore" level="system" category="whitespace" file="spac/hor.mkiv"/>
+    <cd:command name="interwordspacebefore" level="system" category="whitespace" file="spac-hor.mkxl"/>
 
-    <cd:command name="interwordspaceafter" level="system" category="whitespace" file="spac/hor.mkiv"/>
+    <cd:command name="interwordspaceafter" level="system" category="whitespace" file="spac-hor.mkxl"/>
 
-    <cd:command name="interwordspacesbefore" level="system" category="whitespace" file="spac/hor.mkiv">
+    <cd:command name="interwordspacesbefore" level="system" category="whitespace" file="spac-hor.mkxl">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
         
-    <cd:command name="interwordspacesafter" level="system" category="whitespace" file="spac/hor.mkiv">
+    <cd:command name="interwordspacesafter" level="system" category="whitespace" file="spac-hor.mkxl">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="interwordspaces" level="system" category="whitespace" file="spac/hor.mkiv">
+    <cd:command name="interwordspaces" level="system" category="whitespace" file="spac-hor.mkxl">
         <cd:arguments>
             <cd:resolve name="argument-number"/>
         </cd:arguments>
diff --git a/tex/context/interface/mkiv/i-hyphenation.xml b/tex/context/interface/mkiv/i-hyphenation.xml
index 4ab4fe1d8..5437c81c0 100644
--- a/tex/context/interface/mkiv/i-hyphenation.xml
+++ b/tex/context/interface/mkiv/i-hyphenation.xml
@@ -261,4 +261,16 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="dohyphens" level="style" category="language" file="lang-ini.mkxl"/>
+
+    <cd:command name="nohyphens" level="style" category="language" file="lang-ini.mkxl"/>
+
+    <cd:command name="usehyphensparameter" level="system" category="language" file="lang-ini.mkxl">
+        <cd:arguments>
+            <cd:csname"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="compounddiscretionary" level="system" category="language" file="lang-mis.mkxl"/>
+
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-itemgroup.xml b/tex/context/interface/mkiv/i-itemgroup.xml
index 6d687f381..81fc3ba5a 100644
--- a/tex/context/interface/mkiv/i-itemgroup.xml
+++ b/tex/context/interface/mkiv/i-itemgroup.xml
@@ -163,6 +163,8 @@
             <cd:parameter name="placestopper">
                 <cd:constant type="yes" default="yes"/>
                 <cd:constant type="no"/>
+                <cd:constant type="display"/>
+                <cd:constant type="inline"/>
             </cd:parameter>
             <cd:parameter name="style">
                 <cd:resolve name="value-style"/>
@@ -353,6 +355,8 @@
             <cd:parameter name="placestopper">
                 <cd:constant type="yes" default="yes"/>
                 <cd:constant type="no"/>
+                <cd:constant type="display"/>
+                <cd:constant type="inline"/>
             </cd:parameter>
             <cd:parameter name="style">
                 <cd:resolve name="value-style"/>
diff --git a/tex/context/interface/mkiv/i-linefiller.xml b/tex/context/interface/mkiv/i-linefiller.xml
index aeb14046d..74803cbe5 100644
--- a/tex/context/interface/mkiv/i-linefiller.xml
+++ b/tex/context/interface/mkiv/i-linefiller.xml
@@ -29,9 +29,14 @@
                     <cd:constant type="local" default="yes"/>
                     <cd:constant type="global"/>
                 </cd:parameter>
-                <cd:parameter name="color">
-                    <cd:constant type="cd:color"/>
+                <cd:parameter name="mp">
+                    <cd:constant type="cd:name"/>
                 </cd:parameter>
+                <!--
+                    cd:parameter name="method">
+                        <cd:constant type="cd:number"/>
+                    </cd:parameter
+                -->
                 <cd:parameter name="height">
                     <cd:constant type="cd:dimension"/>
                 </cd:parameter>
@@ -47,9 +52,15 @@
                 <cd:parameter name="rulethickness">
                     <cd:constant type="cd:dimension"/>
                 </cd:parameter>
-                <!-- cd:parameter name="method">
-                    <cd:constant type="cd:number"/>
-                </cd:parameter -->
+                <cd:parameter name="before">
+                    <cd:constant type="cd:command"/>
+                </cd:parameter>
+                <cd:parameter name="after">
+                    <cd:constant type="cd:command"/>
+                </cd:parameter>
+                <cd:parameter name="color">
+                    <cd:constant type="cd:color"/>
+                </cd:parameter>
                 <cd:parameter name="textstyle">
                     <cd:resolve name="value-style"/>
                 </cd:parameter>
@@ -59,15 +70,6 @@
                 <cd:parameter name="align">
                     <cd:inherit name="setupalign"/>
                 </cd:parameter>
-                <cd:parameter name="mp">
-                    <cd:constant type="cd:name"/>
-                </cd:parameter>
-                <cd:parameter name="before">
-                    <cd:constant type="cd:command"/>
-                </cd:parameter>
-                <cd:parameter name="after">
-                    <cd:constant type="cd:command"/>
-                </cd:parameter>
             </cd:assignments>
         </cd:arguments>
     </cd:command>
diff --git a/tex/context/interface/mkiv/i-lua.xml b/tex/context/interface/mkiv/i-lua.xml
index 94f25d0f7..424622507 100644
--- a/tex/context/interface/mkiv/i-lua.xml
+++ b/tex/context/interface/mkiv/i-lua.xml
@@ -172,6 +172,13 @@
         </cd:sequence>
     </cd:command>
 
+    <cd:command name="setctxluafunction" level="system" category="lua" file="luat-ini.mkiv">
+        <cd:arguments>
+            <cd:resolve name="argument-name"/>
+            <cd:resolve name="argument-number"/>
+        </cd:arguments>
+    </cd:command>
+
     <cd:command name="ctxfunction" type="environment" level="system" category="lua" file="luat-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="string-name"/>
@@ -184,10 +191,50 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="installctxfunction" level="system" category="lua" file="luat-ini.mkiv">
+        <cd:arguments>
+            <cd:csname/>
+            <cd:content/>
+        </cd:arguments>
+    </cd:command>
+
     <cd:command name="ctxfunction" generated="yes" variant="example" level="system" category="lua" file="luat-ini.mkiv">
         <cd:sequence>
             <cd:variable value="ctxfunction"/>
         </cd:sequence>
     </cd:command>
 
+    <cd:command name="installctxscanner" level="system" category="lua" file="luat-ini.mkiv">
+        <cd:arguments>
+            <cd:csname/>
+            <cd:content/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="ctxscanner" generated="yes" variant="example" level="system" category="lua" file="luat-ini.mkiv">
+        <cd:sequence>
+            <cd:variable value="ctxscanner"/>
+        </cd:sequence>
+    </cd:command>
+
+    <cd:command name="installprotectedctxfunction" level="system" category="lua" file="luat-ini.mkiv">
+        <cd:arguments>
+            <cd:csname/>
+            <cd:content/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="installprotectedctxscanner" level="system" category="lua" file="luat-ini.mkiv">
+        <cd:arguments>
+            <cd:csname/>
+            <cd:content/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="resetctxscanner" level="system" category="lua" file="luat-ini.mkiv">
+        <cd:arguments>
+            <cd:csname/>
+        </cd:arguments>
+    </cd:command>
+
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-marking.xml b/tex/context/interface/mkiv/i-marking.xml
index 84273ee3b..8eb17f6ed 100644
--- a/tex/context/interface/mkiv/i-marking.xml
+++ b/tex/context/interface/mkiv/i-marking.xml
@@ -52,7 +52,10 @@
 
     <cd:command name="resetmarking" level="system" category="structure" file="strc-mar.mkiv">
         <cd:arguments>
-            <cd:resolve name="keyword-mark"/>
+            <cd:keywords>
+                <cd:constant type="all"/>
+                <cd:constant type="cd:mark"/>
+            </cd:keywords>
         </cd:arguments>
     </cd:command>
 
diff --git a/tex/context/interface/mkiv/i-mathmatrix.xml b/tex/context/interface/mkiv/i-mathmatrix.xml
index d22e8141f..3b8076407 100644
--- a/tex/context/interface/mkiv/i-mathmatrix.xml
+++ b/tex/context/interface/mkiv/i-mathmatrix.xml
@@ -70,13 +70,19 @@
         </cd:instances>
     </cd:command>
 
-    <cd:command name="mathmatrix" generated="yes" level="document" category="mathematics" keywords="tables" file="math-ali.mkiv">
+    <cd:command name="mathmatrix" generated="yes" variant="instance" level="document" category="mathematics" keywords="tables" file="math-ali.mkiv">
         <cd:sequence>
-            <cd:variable value="mathmatrix"/>
+            <cd:instance value="mathmatrix"/>
         </cd:sequence>
         <cd:arguments>
+            <cd:assignments list="yes" optional="yes">
+                <cd:inherit name="setupmathmatrix"/>
+            </cd:assignments>
             <cd:content/>
         </cd:arguments>
+        <cd:instances>
+            <cd:resolve name="instance-simplematrix"/>
+        </cd:instances>
     </cd:command>
 
     <cd:command name="matrices" type="environment" level="document" category="mathematics" keywords="tables" file="math-ali.mkiv">
diff --git a/tex/context/interface/mkiv/i-note.xml b/tex/context/interface/mkiv/i-note.xml
index b76335765..bd1ebca24 100644
--- a/tex/context/interface/mkiv/i-note.xml
+++ b/tex/context/interface/mkiv/i-note.xml
@@ -672,7 +672,7 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="textnote" generated="yes" level="document" category="structure" keywords="notes" file="strc-tnt.mkiv">
+    <cd:command name="textnote" generated="yes" variant="example" level="document" category="structure" keywords="notes" file="strc-tnt.mkiv">
         <cd:arguments>
             <cd:assignments list="yes" optional="yes">
                 <cd:inherit name="setuptextnote"/>
diff --git a/tex/context/interface/mkiv/i-pagenumber.xml b/tex/context/interface/mkiv/i-pagenumber.xml
index 47563984e..ae3f38cd3 100644
--- a/tex/context/interface/mkiv/i-pagenumber.xml
+++ b/tex/context/interface/mkiv/i-pagenumber.xml
@@ -102,6 +102,7 @@
                     <cd:constant type="inmargin"/>
                     <cd:constant type="atmargin"/>
                     <cd:constant type="marginedge"/>
+                    <cd:constant type="none"/>
                 </cd:parameter>
                 <cd:parameter name="style">
                     <cd:resolve name="value-style"/>
diff --git a/tex/context/interface/mkiv/i-parwrapper.xml b/tex/context/interface/mkiv/i-parwrapper.xml
new file mode 100644
index 000000000..2cb5ee071
--- /dev/null
+++ b/tex/context/interface/mkiv/i-parwrapper.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?context-directive job ctxfile x-setups.ctx ?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
+
+    <cd:command name="freezeparagraphproperties" level="system" category="whitespace" file="spac-par.mkxl"/>
+
+    <cd:command name="defrostparagraphproperties" level="system" category="whitespace" file="spac-par.mkxl"/>
+
+    <cd:command name="updateparagraphproperties" level="system" category="whitespace" file="spac-par.mkxl"/>
+
+    <cd:command name="updateparagraphpenalties" level="system" category="whitespace" file="spac-par.mkxl"/>
+
+    <cd:command name="updateparagraphdemerits" level="system" category="whitespace" file="spac-par.mkxl"/>
+
+    <cd:command name="updateparagraphshapes" level="system" category="whitespace" file="spac-par.mkxl"/>
+
+    <cd:command name="setparagraphfreezing" level="system" category="whitespace" file="spac-par.mkxl"/>
+
+    <cd:command name="forgetparagraphfreezing" level="system" category="whitespace" file="spac-par.mkxl"/>
+
+    <cd:command name="registerparwrapper" level="system" category="whitespace" file="spac-par.mkxl">
+        <cd:arguments>
+            <cd:resolve name="argument-name"/>
+            <cd:content/>
+            <cd:content/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="registerparwrapperreverse" level="system" category="whitespace" file="spac-par.mkxl">
+        <cd:arguments>
+            <cd:resolve name="argument-name"/>
+            <cd:content/>
+            <cd:content/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="directparwrapper" level="system" category="whitespace" file="spac-par.mkxl">
+        <cd:arguments>
+            <cd:content/>
+            <cd:content/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="forgetparwrapper" level="system" category="whitespace" file="spac-par.mkxl"/>
+
+    <cd:command name="unregisterparwrapper" level="system" category="whitespace" file="spac-par.mkxl">
+        <cd:arguments>
+            <cd:resolve name="argument-name"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="doifelseparwrapper" level="system" category="whitespace" file="spac-par.mkxl">
+        <cd:arguments>
+            <cd:resolve name="argument-name"/>
+            <cd:resolve name="argument-true"/>
+            <cd:resolve name="argument-false"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="showparwrapperstate" level="system" category="whitespace" file="spac-par.mkxl">
+        <cd:arguments>
+            <cd:resolve name="argument-name"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="getparwrapper" level="system" category="whitespace" file="spac-par.lmt">
+        <cd:arguments>
+            <cd:resolve name="argument-name"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="lastparwrapper" level="system" category="whitespace" file="spac-par.lmt">
+        <cd:arguments>
+            <cd:resolve name="argument-name"/>
+        </cd:arguments>
+    </cd:command>
+
+</cd:interface>
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 97b40da43..2e51059b1 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/context/interface/mkiv/i-replacement.xml b/tex/context/interface/mkiv/i-replacement.xml
index 8e21c1f17..dec893bef 100644
--- a/tex/context/interface/mkiv/i-replacement.xml
+++ b/tex/context/interface/mkiv/i-replacement.xml
@@ -7,7 +7,7 @@
     <cd:command name="replaceword" level="style" category="language" file="lang-rep.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
-            <cd:resolve name="keyword-text"/>
+            <cd:resolve name="keyword-text-optional"/>
             <cd:resolve name="keyword-text"/>
         </cd:arguments>
     </cd:command>
@@ -18,6 +18,8 @@
                 <cd:constant type="reset"/>
                 <cd:constant type="cd:name"/>
             </cd:keywords>
+            <!-- command is overloaded in typo-ovl.mkiv with second argument -->
+            <cd:resolve name="keyword-name-optional"/>
         </cd:arguments>
     </cd:command>
 
diff --git a/tex/context/interface/mkiv/i-setup.xml b/tex/context/interface/mkiv/i-setup.xml
index fcfed31bf..0cfb216bd 100644
--- a/tex/context/interface/mkiv/i-setup.xml
+++ b/tex/context/interface/mkiv/i-setup.xml
@@ -167,4 +167,10 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="loadsetups" level="style" category="xml" file="x-setups-basics.mkiv">
+        <cd:arguments>
+            <cd:resolve name="keyword-file-optional"/>
+        </cd:arguments>
+    </cd:command>
+
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-synonym.xml b/tex/context/interface/mkiv/i-synonym.xml
index ca3053fe4..8bc9ed87e 100644
--- a/tex/context/interface/mkiv/i-synonym.xml
+++ b/tex/context/interface/mkiv/i-synonym.xml
@@ -91,6 +91,10 @@
                 <cd:parameter name="inbetween">
                     <cd:constant type="cd:command"/>
                 </cd:parameter>
+                <cd:parameter name="hyphens">
+                    <cd:constant type="yes" default="yes"/>
+                    <cd:constant type="no"/>
+                </cd:parameter>
             </cd:assignments>
         </cd:arguments>
     </cd:command>
diff --git a/tex/context/interface/mkiv/i-system.xml b/tex/context/interface/mkiv/i-system.xml
index 08a4a917d..72b51760d 100644
--- a/tex/context/interface/mkiv/i-system.xml
+++ b/tex/context/interface/mkiv/i-system.xml
@@ -1619,8 +1619,6 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="texcode" type="environment" level="system" category="catcode" file="syst-aux.mkiv"/>
-
     <cd:command name="newcounter" level="system" category="counter" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:csname/>
@@ -1834,6 +1832,18 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="validassignment" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
+        <cd:arguments>
+            <cd:resolve name="argument-text"/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="nonvalidassignment" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
+        <cd:arguments>
+            <cd:resolve name="argument-text"/>
+        </cd:arguments>
+    </cd:command>
+
     <cd:command name="doifelseassignmentcs" level="system" category="system" keywords="conditional" file="syst-aux.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-text"/>
diff --git a/tex/context/interface/mkiv/i-vspace.xml b/tex/context/interface/mkiv/i-vspace.xml
index e79e4e736..653ae169e 100644
--- a/tex/context/interface/mkiv/i-vspace.xml
+++ b/tex/context/interface/mkiv/i-vspace.xml
@@ -106,6 +106,18 @@
         </cd:arguments>
     </cd:command>
 
+    <cd:command name="doifoutervmode" level="document" category="whitespace" keywords="conditional" file="spac-ver.mkxl">
+        <cd:arguments>
+            <cd:content/>
+        </cd:arguments>
+    </cd:command>
+
+    <cd:command name="dosomebreak" level="document" category="whitespace" file="spac-ver.mkxl">
+        <cd:arguments>
+            <cd:csname/>
+        </cd:arguments>
+    </cd:command>
+
     <cd:command name="godown" level="document" category="whitespace" file="spac-ver.mkiv">
         <cd:arguments>
             <cd:resolve name="keyword-dimension"/>
diff --git a/tex/context/interface/mkiv/i-xml.xml b/tex/context/interface/mkiv/i-xml.xml
index d911b58c5..5c63416d7 100644
--- a/tex/context/interface/mkiv/i-xml.xml
+++ b/tex/context/interface/mkiv/i-xml.xml
@@ -726,16 +726,7 @@
     <cd:command name="xmlregisterns" level="style" category="xml" file="lxml-ini.mkiv">
         <cd:arguments>
             <cd:resolve name="argument-name"/>
-            <cd:keywords delimiters="braces">
-                <cd:constant type="cd:url"/>
-            </cd:keywords>
-        </cd:arguments>
-    </cd:command>
-
-    <cd:command name="xmlregisterns" level="style" category="xml" file="lxml-ini.mkiv">
-        <cd:arguments>
-            <cd:resolve name="argument-name"/>
-            <cd:resolve name="argument-name"/>
+            <cd:resolve name="argument-url"/>
         </cd:arguments>
     </cd:command>