2016-10-14 17:25:00

47 files changed, 579 insertions, 176 deletions

diff --git a/tex/context/base/mkii/cont-new.mkii b/tex/context/base/mkii/cont-new.mkii
index d387d4ca9..da1efb7aa 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{2016.10.12 17:26}
+\newcontextversion{2016.10.14 17:19}
 
 %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 40904a978..7ea28a1a0 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{2016.10.12 17:26}
+\edef\contextversion{2016.10.14 17:19}
 
 %D For those who want to use this:
 
diff --git a/tex/context/base/mkii/mult-cs.mkii b/tex/context/base/mkii/mult-cs.mkii
index 947e9bbd8..621d80f52 100644
--- a/tex/context/base/mkii/mult-cs.mkii
+++ b/tex/context/base/mkii/mult-cs.mkii
@@ -1314,6 +1314,7 @@
 \setinterfacecommand{Words}{Slova}
 \setinterfacecommand{about}{oref}
 \setinterfacecommand{adaptlayout}{prizpusobvzhled}
+\setinterfacecommand{alignment}{alignment}
 \setinterfacecommand{arg}{arg}
 \setinterfacecommand{at}{pref}
 \setinterfacecommand{atleftmargin}{atleftmargin}
@@ -1530,11 +1531,13 @@
 \setinterfacecommand{leftmargindistance}{vzdalenostlevemarginalie}
 \setinterfacecommand{leftmarginwidth}{sirkalevemarginalie}
 \setinterfacecommand{leg}{leg}
+\setinterfacecommand{linecorrection}{linecorrection}
 \setinterfacecommand{linewidth}{tloustkacary}
 \setinterfacecommand{listheight}{vyskaseznamu}
 \setinterfacecommand{listlength}{delkaseznamu}
 \setinterfacecommand{listsymbol}{listsymbol}
 \setinterfacecommand{listwidth}{sirkaseznamu}
+\setinterfacecommand{localfootnotes}{localfootnotes}
 \setinterfacecommand{logfields}{zaznamovepole}
 \setinterfacecommand{lohi}{nivy}
 \setinterfacecommand{low}{nizky}
@@ -1543,6 +1546,7 @@
 \setinterfacecommand{makeupheight}{vyskasazby}
 \setinterfacecommand{makeupwidth}{sirkasazby}
 \setinterfacecommand{mar}{okr}
+\setinterfacecommand{marginblock}{marginblock}
 \setinterfacecommand{margindistance}{vzdalenostmarginalie}
 \setinterfacecommand{marginrule}{marginalnilinka}
 \setinterfacecommand{margintext}{marginalnitext}
@@ -1642,6 +1646,7 @@
 \setinterfacecommand{rightmarginwidth}{sirkapravemarginalie}
 \setinterfacecommand{romannumerals}{rimskecislice}
 \setinterfacecommand{rotate}{otocit}
+\setinterfacecommand{savebuffer}{savebuffer}
 \setinterfacecommand{scale}{meritko}
 \setinterfacecommand{screen}{obrazovka}
 \setinterfacecommand{selectblocks}{vyberbloky}
@@ -1677,7 +1682,9 @@
 \setinterfacecommand{setupcombinations}{nastavspojeni}
 \setinterfacecommand{setupcombinedlist}{nastavkombinovanyseznam}
 \setinterfacecommand{setupcomment}{nastavkomentar}
+\setinterfacecommand{setupdescription}{setupdescription}
 \setinterfacecommand{setupdescriptions}{nastavpopisy}
+\setinterfacecommand{setupenumeration}{setupenumeration}
 \setinterfacecommand{setupenumerations}{nastavvycty}
 \setinterfacecommand{setupexternalfigures}{nastavexterniobrazy}
 \setinterfacecommand{setupfield}{nastavpole}
@@ -1692,8 +1699,10 @@
 \setinterfacecommand{setupfootnotedefinition}{nastavdefinicipoznamekpodcarou}
 \setinterfacecommand{setupfootnotes}{nastavpoznamkypodcarou}
 \setinterfacecommand{setupforms}{setupforms}
+\setinterfacecommand{setupformula}{setupformula}
 \setinterfacecommand{setupformulas}{nastavrovnice}
 \setinterfacecommand{setupframed}{nastavoramovani}
+\setinterfacecommand{setupframedtext}{setupframedtext}
 \setinterfacecommand{setupframedtexts}{nastavoramovanetexty}
 \setinterfacecommand{setuphead}{nastavnadpis}
 \setinterfacecommand{setupheader}{nastavzahlavi}
@@ -1722,7 +1731,9 @@
 \setinterfacecommand{setuplinewidth}{nastavsirkucary}
 \setinterfacecommand{setuplist}{nastavseznam}
 \setinterfacecommand{setupmakeup}{nastavupravu}
+\setinterfacecommand{setupmarginblock}{setupmarginblock}
 \setinterfacecommand{setupmarginblocks}{nastavmarginalniblok}
+\setinterfacecommand{setupmargindata}{setupmargindata}
 \setinterfacecommand{setupmarginrules}{nastavmarginalnilinky}
 \setinterfacecommand{setupmarking}{nastavznaceni}
 \setinterfacecommand{setupmathalignment}{setupmathalignment}
@@ -1901,6 +1912,7 @@
 \setinterfacecommand{testcolumn}{testcolumn}
 \setinterfacecommand{testpage}{testpage}
 \setinterfacecommand{tex}{tex}
+\setinterfacecommand{textbackground}{textbackground}
 \setinterfacecommand{textheight}{vyskatextu}
 \setinterfacecommand{textreference}{odkaznatext}
 \setinterfacecommand{textrule}{textovalinka}
diff --git a/tex/context/base/mkii/mult-de.mkii b/tex/context/base/mkii/mult-de.mkii
index d579244e7..9b9f81c6c 100644
--- a/tex/context/base/mkii/mult-de.mkii
+++ b/tex/context/base/mkii/mult-de.mkii
@@ -1314,6 +1314,7 @@
 \setinterfacecommand{Words}{Woerter}
 \setinterfacecommand{about}{ueber}
 \setinterfacecommand{adaptlayout}{passelayoutan}
+\setinterfacecommand{alignment}{alignment}
 \setinterfacecommand{arg}{arg}
 \setinterfacecommand{at}{bei}
 \setinterfacecommand{atleftmargin}{atleftmargin}
@@ -1530,11 +1531,13 @@
 \setinterfacecommand{leftmargindistance}{linkemarginalafstand}
 \setinterfacecommand{leftmarginwidth}{linkemarginalbreite}
 \setinterfacecommand{leg}{leg}
+\setinterfacecommand{linecorrection}{linecorrection}
 \setinterfacecommand{linewidth}{liniendicke}
 \setinterfacecommand{listheight}{listenhoehe}
 \setinterfacecommand{listlength}{listenlaenge}
 \setinterfacecommand{listsymbol}{listsymbol}
 \setinterfacecommand{listwidth}{listenbreite}
+\setinterfacecommand{localfootnotes}{localfootnotes}
 \setinterfacecommand{logfields}{registrierefelder}
 \setinterfacecommand{lohi}{tiho}
 \setinterfacecommand{low}{tief}
@@ -1543,6 +1546,7 @@
 \setinterfacecommand{makeupheight}{satzhoehe}
 \setinterfacecommand{makeupwidth}{satzbreite}
 \setinterfacecommand{mar}{mar}
+\setinterfacecommand{marginblock}{marginblock}
 \setinterfacecommand{margindistance}{marginalafstand}
 \setinterfacecommand{marginrule}{marginallinie}
 \setinterfacecommand{margintext}{marginaltext}
@@ -1642,6 +1646,7 @@
 \setinterfacecommand{rightmarginwidth}{rechtemarginalbreite}
 \setinterfacecommand{romannumerals}{roemischezahlen}
 \setinterfacecommand{rotate}{drehen}
+\setinterfacecommand{savebuffer}{savebuffer}
 \setinterfacecommand{scale}{format}
 \setinterfacecommand{screen}{bildschirm}
 \setinterfacecommand{selectblocks}{waehlebloeckeaus}
@@ -1677,7 +1682,9 @@
 \setinterfacecommand{setupcombinations}{stellekombinationein}
 \setinterfacecommand{setupcombinedlist}{stellezusammengestelltelisteein}
 \setinterfacecommand{setupcomment}{stellekommentarein}
+\setinterfacecommand{setupdescription}{setupdescription}
 \setinterfacecommand{setupdescriptions}{definierebeschreibungen}
+\setinterfacecommand{setupenumeration}{setupenumeration}
 \setinterfacecommand{setupenumerations}{stellebeschreibungein}
 \setinterfacecommand{setupexternalfigures}{stelleexterneabbildungenein}
 \setinterfacecommand{setupfield}{stellefeldein}
@@ -1692,8 +1699,10 @@
 \setinterfacecommand{setupfootnotedefinition}{stellefussnotendefinitionein}
 \setinterfacecommand{setupfootnotes}{stellefussnotenein}
 \setinterfacecommand{setupforms}{setupforms}
+\setinterfacecommand{setupformula}{setupformula}
 \setinterfacecommand{setupformulas}{stelleformelnein}
 \setinterfacecommand{setupframed}{stelleumrahmtein}
+\setinterfacecommand{setupframedtext}{setupframedtext}
 \setinterfacecommand{setupframedtexts}{stelleumrahmtetexteein}
 \setinterfacecommand{setuphead}{stelleueberschriftein}
 \setinterfacecommand{setupheader}{stellekopfzeileein}
@@ -1722,7 +1731,9 @@
 \setinterfacecommand{setuplinewidth}{stellelinienbreiteein}
 \setinterfacecommand{setuplist}{stellelisteein}
 \setinterfacecommand{setupmakeup}{stelleumbruchein}
+\setinterfacecommand{setupmarginblock}{setupmarginblock}
 \setinterfacecommand{setupmarginblocks}{stellemarginalblockein}
+\setinterfacecommand{setupmargindata}{setupmargindata}
 \setinterfacecommand{setupmarginrules}{stellemarginallinieein}
 \setinterfacecommand{setupmarking}{stellebeschriftungein}
 \setinterfacecommand{setupmathalignment}{setupmathalignment}
@@ -1901,6 +1912,7 @@
 \setinterfacecommand{testcolumn}{testcolumn}
 \setinterfacecommand{testpage}{testpage}
 \setinterfacecommand{tex}{tex}
+\setinterfacecommand{textbackground}{textbackground}
 \setinterfacecommand{textheight}{texthoehe}
 \setinterfacecommand{textreference}{textreferenz}
 \setinterfacecommand{textrule}{textlinie}
diff --git a/tex/context/base/mkii/mult-en.mkii b/tex/context/base/mkii/mult-en.mkii
index 96d1500a8..221cdde4e 100644
--- a/tex/context/base/mkii/mult-en.mkii
+++ b/tex/context/base/mkii/mult-en.mkii
@@ -1314,6 +1314,7 @@
 \setinterfacecommand{Words}{Words}
 \setinterfacecommand{about}{about}
 \setinterfacecommand{adaptlayout}{adaptlayout}
+\setinterfacecommand{alignment}{alignment}
 \setinterfacecommand{arg}{arg}
 \setinterfacecommand{at}{at}
 \setinterfacecommand{atleftmargin}{atleftmargin}
@@ -1530,11 +1531,13 @@
 \setinterfacecommand{leftmargindistance}{leftmargindistance}
 \setinterfacecommand{leftmarginwidth}{leftmarginwidth}
 \setinterfacecommand{leg}{leg}
+\setinterfacecommand{linecorrection}{linecorrection}
 \setinterfacecommand{linewidth}{linethickness}
 \setinterfacecommand{listheight}{listheight}
 \setinterfacecommand{listlength}{listlength}
 \setinterfacecommand{listsymbol}{listsymbol}
 \setinterfacecommand{listwidth}{listwidth}
+\setinterfacecommand{localfootnotes}{localfootnotes}
 \setinterfacecommand{logfields}{logfields}
 \setinterfacecommand{lohi}{lohi}
 \setinterfacecommand{low}{low}
@@ -1543,6 +1546,7 @@
 \setinterfacecommand{makeupheight}{makeupheight}
 \setinterfacecommand{makeupwidth}{makeupwidth}
 \setinterfacecommand{mar}{mar}
+\setinterfacecommand{marginblock}{marginblock}
 \setinterfacecommand{margindistance}{margindistance}
 \setinterfacecommand{marginrule}{marginrule}
 \setinterfacecommand{margintext}{margintext}
@@ -1642,6 +1646,7 @@
 \setinterfacecommand{rightmarginwidth}{rightmarginwidth}
 \setinterfacecommand{romannumerals}{romannumerals}
 \setinterfacecommand{rotate}{rotate}
+\setinterfacecommand{savebuffer}{savebuffer}
 \setinterfacecommand{scale}{scale}
 \setinterfacecommand{screen}{screen}
 \setinterfacecommand{selectblocks}{selectblocks}
@@ -1677,7 +1682,9 @@
 \setinterfacecommand{setupcombinations}{setupcombinations}
 \setinterfacecommand{setupcombinedlist}{setupcombinedlist}
 \setinterfacecommand{setupcomment}{setupcomment}
+\setinterfacecommand{setupdescription}{setupdescription}
 \setinterfacecommand{setupdescriptions}{setupdescriptions}
+\setinterfacecommand{setupenumeration}{setupenumeration}
 \setinterfacecommand{setupenumerations}{setupenumerations}
 \setinterfacecommand{setupexternalfigures}{setupexternalfigures}
 \setinterfacecommand{setupfield}{setupfield}
@@ -1692,8 +1699,10 @@
 \setinterfacecommand{setupfootnotedefinition}{setupfootnotedefinition}
 \setinterfacecommand{setupfootnotes}{setupfootnotes}
 \setinterfacecommand{setupforms}{setupforms}
+\setinterfacecommand{setupformula}{setupformula}
 \setinterfacecommand{setupformulas}{setupformulae}
 \setinterfacecommand{setupframed}{setupframed}
+\setinterfacecommand{setupframedtext}{setupframedtext}
 \setinterfacecommand{setupframedtexts}{setupframedtexts}
 \setinterfacecommand{setuphead}{setuphead}
 \setinterfacecommand{setupheader}{setupheader}
@@ -1722,7 +1731,9 @@
 \setinterfacecommand{setuplinewidth}{setuplinewidth}
 \setinterfacecommand{setuplist}{setuplist}
 \setinterfacecommand{setupmakeup}{setupmakeup}
+\setinterfacecommand{setupmarginblock}{setupmarginblock}
 \setinterfacecommand{setupmarginblocks}{setupmarginblocks}
+\setinterfacecommand{setupmargindata}{setupmargindata}
 \setinterfacecommand{setupmarginrules}{setupmarginrules}
 \setinterfacecommand{setupmarking}{setupmarking}
 \setinterfacecommand{setupmathalignment}{setupmathalignment}
@@ -1901,6 +1912,7 @@
 \setinterfacecommand{testcolumn}{testcolumn}
 \setinterfacecommand{testpage}{testpage}
 \setinterfacecommand{tex}{tex}
+\setinterfacecommand{textbackground}{textbackground}
 \setinterfacecommand{textheight}{textheight}
 \setinterfacecommand{textreference}{textreference}
 \setinterfacecommand{textrule}{textrule}
diff --git a/tex/context/base/mkii/mult-fr.mkii b/tex/context/base/mkii/mult-fr.mkii
index c8a06bb0d..201a521f4 100644
--- a/tex/context/base/mkii/mult-fr.mkii
+++ b/tex/context/base/mkii/mult-fr.mkii
@@ -1314,6 +1314,7 @@
 \setinterfacecommand{Words}{Mots}
 \setinterfacecommand{about}{concernant}
 \setinterfacecommand{adaptlayout}{adaptedisposition}
+\setinterfacecommand{alignment}{alignment}
 \setinterfacecommand{arg}{arg}
 \setinterfacecommand{at}{a}
 \setinterfacecommand{atleftmargin}{atleftmargin}
@@ -1530,11 +1531,13 @@
 \setinterfacecommand{leftmargindistance}{distancemargegauche}
 \setinterfacecommand{leftmarginwidth}{largeurmargegauche}
 \setinterfacecommand{leg}{leg}
+\setinterfacecommand{linecorrection}{linecorrection}
 \setinterfacecommand{linewidth}{largeurligne}
 \setinterfacecommand{listheight}{hauteurliste}
 \setinterfacecommand{listlength}{llongueurliste}
 \setinterfacecommand{listsymbol}{listesymbole}
 \setinterfacecommand{listwidth}{largeurliste}
+\setinterfacecommand{localfootnotes}{localfootnotes}
 \setinterfacecommand{logfields}{logchamp}
 \setinterfacecommand{lohi}{baha}
 \setinterfacecommand{low}{bas}
@@ -1543,6 +1546,7 @@
 \setinterfacecommand{makeupheight}{hauteurmakeup}
 \setinterfacecommand{makeupwidth}{largeurmakeup}
 \setinterfacecommand{mar}{mar}
+\setinterfacecommand{marginblock}{marginblock}
 \setinterfacecommand{margindistance}{distancemarge}
 \setinterfacecommand{marginrule}{margereglee}
 \setinterfacecommand{margintext}{textemarge}
@@ -1642,6 +1646,7 @@
 \setinterfacecommand{rightmarginwidth}{largeurmargedroite}
 \setinterfacecommand{romannumerals}{chiffresromains}
 \setinterfacecommand{rotate}{oriente}
+\setinterfacecommand{savebuffer}{savebuffer}
 \setinterfacecommand{scale}{echelle}
 \setinterfacecommand{screen}{ecran}
 \setinterfacecommand{selectblocks}{selectionneblocs}
@@ -1677,7 +1682,9 @@
 \setinterfacecommand{setupcombinations}{reglecombinaisons}
 \setinterfacecommand{setupcombinedlist}{reglelisteimbriquee}
 \setinterfacecommand{setupcomment}{reglecommentaire}
+\setinterfacecommand{setupdescription}{setupdescription}
 \setinterfacecommand{setupdescriptions}{regledescriptions}
+\setinterfacecommand{setupenumeration}{setupenumeration}
 \setinterfacecommand{setupenumerations}{regleenumerations}
 \setinterfacecommand{setupexternalfigures}{reglefiguresexternes}
 \setinterfacecommand{setupfield}{reglechamp}
@@ -1692,8 +1699,10 @@
 \setinterfacecommand{setupfootnotedefinition}{definitnotepdp}
 \setinterfacecommand{setupfootnotes}{reglenotepdp}
 \setinterfacecommand{setupforms}{regleformulaires}
+\setinterfacecommand{setupformula}{setupformula}
 \setinterfacecommand{setupformulas}{regleformules}
 \setinterfacecommand{setupframed}{regleencadre}
+\setinterfacecommand{setupframedtext}{setupframedtext}
 \setinterfacecommand{setupframedtexts}{setupframedtexts}
 \setinterfacecommand{setuphead}{regletete}
 \setinterfacecommand{setupheader}{regleentete}
@@ -1722,7 +1731,9 @@
 \setinterfacecommand{setuplinewidth}{regleepaisseurligne}
 \setinterfacecommand{setuplist}{regleliste}
 \setinterfacecommand{setupmakeup}{reglemakeup}
+\setinterfacecommand{setupmarginblock}{setupmarginblock}
 \setinterfacecommand{setupmarginblocks}{regleblocmarge}
+\setinterfacecommand{setupmargindata}{setupmargindata}
 \setinterfacecommand{setupmarginrules}{reglemargereglee}
 \setinterfacecommand{setupmarking}{reglemarquage}
 \setinterfacecommand{setupmathalignment}{setupmathalignment}
@@ -1901,6 +1912,7 @@
 \setinterfacecommand{testcolumn}{testcolumn}
 \setinterfacecommand{testpage}{testpage}
 \setinterfacecommand{tex}{tex}
+\setinterfacecommand{textbackground}{textbackground}
 \setinterfacecommand{textheight}{hauteurtexte}
 \setinterfacecommand{textreference}{referencetexte}
 \setinterfacecommand{textrule}{ligneregleetexte}
diff --git a/tex/context/base/mkii/mult-it.mkii b/tex/context/base/mkii/mult-it.mkii
index a6c0606a4..a6a6731d0 100644
--- a/tex/context/base/mkii/mult-it.mkii
+++ b/tex/context/base/mkii/mult-it.mkii
@@ -1314,6 +1314,7 @@
 \setinterfacecommand{Words}{Parole}
 \setinterfacecommand{about}{intorno}
 \setinterfacecommand{adaptlayout}{adattalayout}
+\setinterfacecommand{alignment}{alignment}
 \setinterfacecommand{arg}{arg}
 \setinterfacecommand{at}{al}
 \setinterfacecommand{atleftmargin}{atleftmargin}
@@ -1530,11 +1531,13 @@
 \setinterfacecommand{leftmargindistance}{distanzamarginesinistro}
 \setinterfacecommand{leftmarginwidth}{ampiezzamarginesinistro}
 \setinterfacecommand{leg}{leg}
+\setinterfacecommand{linecorrection}{linecorrection}
 \setinterfacecommand{linewidth}{spessoreriga}
 \setinterfacecommand{listheight}{altezzaelenco}
 \setinterfacecommand{listlength}{lunghezzaelenco}
 \setinterfacecommand{listsymbol}{listsymbol}
 \setinterfacecommand{listwidth}{ampiezzaelenco}
+\setinterfacecommand{localfootnotes}{localfootnotes}
 \setinterfacecommand{logfields}{logcampi}
 \setinterfacecommand{lohi}{pedap}
 \setinterfacecommand{low}{ped}
@@ -1543,6 +1546,7 @@
 \setinterfacecommand{makeupheight}{altezzamakeup}
 \setinterfacecommand{makeupwidth}{ampiezzamakeup}
 \setinterfacecommand{mar}{mar}
+\setinterfacecommand{marginblock}{marginblock}
 \setinterfacecommand{margindistance}{distanzamargine}
 \setinterfacecommand{marginrule}{lineamargine}
 \setinterfacecommand{margintext}{testoinmargine}
@@ -1642,6 +1646,7 @@
 \setinterfacecommand{rightmarginwidth}{ampiezzamarginedestro}
 \setinterfacecommand{romannumerals}{numeriromani}
 \setinterfacecommand{rotate}{ruota}
+\setinterfacecommand{savebuffer}{savebuffer}
 \setinterfacecommand{scale}{scala}
 \setinterfacecommand{screen}{schermo}
 \setinterfacecommand{selectblocks}{selezionablocchi}
@@ -1677,7 +1682,9 @@
 \setinterfacecommand{setupcombinations}{impostacombinazioni}
 \setinterfacecommand{setupcombinedlist}{impostaelencocombinato}
 \setinterfacecommand{setupcomment}{impostacommento}
+\setinterfacecommand{setupdescription}{setupdescription}
 \setinterfacecommand{setupdescriptions}{impostadescrizioni}
+\setinterfacecommand{setupenumeration}{setupenumeration}
 \setinterfacecommand{setupenumerations}{impostaenumerazioni}
 \setinterfacecommand{setupexternalfigures}{impostafigureesterne}
 \setinterfacecommand{setupfield}{impostacampo}
@@ -1692,8 +1699,10 @@
 \setinterfacecommand{setupfootnotedefinition}{impostadefinizionenotepdp}
 \setinterfacecommand{setupfootnotes}{impostanotepdp}
 \setinterfacecommand{setupforms}{impostaforms}
+\setinterfacecommand{setupformula}{setupformula}
 \setinterfacecommand{setupformulas}{impostaformule}
 \setinterfacecommand{setupframed}{impostaincorniciato}
+\setinterfacecommand{setupframedtext}{setupframedtext}
 \setinterfacecommand{setupframedtexts}{impostatestiincorniciati}
 \setinterfacecommand{setuphead}{impostatesta}
 \setinterfacecommand{setupheader}{impostainstestazione}
@@ -1722,7 +1731,9 @@
 \setinterfacecommand{setuplinewidth}{impostaampiezzariga}
 \setinterfacecommand{setuplist}{impostaelenco}
 \setinterfacecommand{setupmakeup}{impostamakeup}
+\setinterfacecommand{setupmarginblock}{setupmarginblock}
 \setinterfacecommand{setupmarginblocks}{impostablocchimargine}
+\setinterfacecommand{setupmargindata}{setupmargindata}
 \setinterfacecommand{setupmarginrules}{impostalineemargine}
 \setinterfacecommand{setupmarking}{impostamarcatura}
 \setinterfacecommand{setupmathalignment}{setupmathalignment}
@@ -1901,6 +1912,7 @@
 \setinterfacecommand{testcolumn}{testcolumn}
 \setinterfacecommand{testpage}{testpage}
 \setinterfacecommand{tex}{tex}
+\setinterfacecommand{textbackground}{textbackground}
 \setinterfacecommand{textheight}{altezzatesto}
 \setinterfacecommand{textreference}{riferimentotesto}
 \setinterfacecommand{textrule}{lineatesto}
diff --git a/tex/context/base/mkii/mult-nl.mkii b/tex/context/base/mkii/mult-nl.mkii
index 563afb912..c75d2a5a0 100644
--- a/tex/context/base/mkii/mult-nl.mkii
+++ b/tex/context/base/mkii/mult-nl.mkii
@@ -139,7 +139,7 @@
 \setinterfacevariable{color}{kleur}
 \setinterfacevariable{column}{kolom}
 \setinterfacevariable{columns}{kolommen}
-\setinterfacevariable{combination}{combination}
+\setinterfacevariable{combination}{combinatie}
 \setinterfacevariable{command}{commando}
 \setinterfacevariable{commands}{commandos}
 \setinterfacevariable{comment}{commentaar}
@@ -1314,6 +1314,7 @@
 \setinterfacecommand{Words}{Woorden}
 \setinterfacecommand{about}{about}
 \setinterfacecommand{adaptlayout}{paslayoutaan}
+\setinterfacecommand{alignment}{uitlijnen}
 \setinterfacecommand{arg}{arg}
 \setinterfacecommand{at}{op}
 \setinterfacecommand{atleftmargin}{oplinkermarge}
@@ -1530,11 +1531,13 @@
 \setinterfacecommand{leftmargindistance}{linkermargeafstand}
 \setinterfacecommand{leftmarginwidth}{linkermargebreedte}
 \setinterfacecommand{leg}{leg}
+\setinterfacecommand{linecorrection}{regelcorrectie}
 \setinterfacecommand{linewidth}{lijndikte}
 \setinterfacecommand{listheight}{lijsthoogte}
 \setinterfacecommand{listlength}{lijstlengte}
 \setinterfacecommand{listsymbol}{lijstsymbool}
 \setinterfacecommand{listwidth}{lijstbreedte}
+\setinterfacecommand{localfootnotes}{lokalevoetnoten}
 \setinterfacecommand{logfields}{registreervelden}
 \setinterfacecommand{lohi}{laho}
 \setinterfacecommand{low}{laag}
@@ -1543,6 +1546,7 @@
 \setinterfacecommand{makeupheight}{zethoogte}
 \setinterfacecommand{makeupwidth}{zetbreedte}
 \setinterfacecommand{mar}{mar}
+\setinterfacecommand{marginblock}{margeblok}
 \setinterfacecommand{margindistance}{margeafstand}
 \setinterfacecommand{marginrule}{kantlijn}
 \setinterfacecommand{margintext}{margetekst}
@@ -1642,6 +1646,7 @@
 \setinterfacecommand{rightmarginwidth}{rechtermargebreedte}
 \setinterfacecommand{romannumerals}{romeins}
 \setinterfacecommand{rotate}{roteer}
+\setinterfacecommand{savebuffer}{bewaarbuffer}
 \setinterfacecommand{scale}{schaal}
 \setinterfacecommand{screen}{scherm}
 \setinterfacecommand{selectblocks}{selecteerblokken}
@@ -1677,7 +1682,9 @@
 \setinterfacecommand{setupcombinations}{stelcombinatiesin}
 \setinterfacecommand{setupcombinedlist}{stelsamengesteldelijstin}
 \setinterfacecommand{setupcomment}{stelcommentaarin}
+\setinterfacecommand{setupdescription}{steldoordefinierenin}
 \setinterfacecommand{setupdescriptions}{steldoordefinierenin}
+\setinterfacecommand{setupenumeration}{steldoornummerenin}
 \setinterfacecommand{setupenumerations}{steldoornummerenin}
 \setinterfacecommand{setupexternalfigures}{stelexternefigurenin}
 \setinterfacecommand{setupfield}{stelveldin}
@@ -1692,8 +1699,10 @@
 \setinterfacecommand{setupfootnotedefinition}{stelvoetnootdefinitiein}
 \setinterfacecommand{setupfootnotes}{stelvoetnotenin}
 \setinterfacecommand{setupforms}{stelformulierenin}
+\setinterfacecommand{setupformula}{stelformulein}
 \setinterfacecommand{setupformulas}{stelformulesin}
 \setinterfacecommand{setupframed}{stelomlijndin}
+\setinterfacecommand{setupframedtext}{stelkadertekstin}
 \setinterfacecommand{setupframedtexts}{stelkadertekstenin}
 \setinterfacecommand{setuphead}{stelkopin}
 \setinterfacecommand{setupheader}{stelhoofdin}
@@ -1722,7 +1731,9 @@
 \setinterfacecommand{setuplinewidth}{stellijndiktein}
 \setinterfacecommand{setuplist}{stellijstin}
 \setinterfacecommand{setupmakeup}{stelopmaakin}
+\setinterfacecommand{setupmarginblock}{stelmargeblokkenin}
 \setinterfacecommand{setupmarginblocks}{stelmargeblokkenin}
+\setinterfacecommand{setupmargindata}{stelinmargein}
 \setinterfacecommand{setupmarginrules}{stelkantlijnin}
 \setinterfacecommand{setupmarking}{stelmarkeringin}
 \setinterfacecommand{setupmathalignment}{stelwiskundeuitlijnenin}
@@ -1901,6 +1912,7 @@
 \setinterfacecommand{testcolumn}{testkolom}
 \setinterfacecommand{testpage}{testpagina}
 \setinterfacecommand{tex}{tex}
+\setinterfacecommand{textbackground}{tekstachtergrond}
 \setinterfacecommand{textheight}{teksthoogte}
 \setinterfacecommand{textreference}{tekstreferentie}
 \setinterfacecommand{textrule}{tekstlijn}
diff --git a/tex/context/base/mkii/mult-pe.mkii b/tex/context/base/mkii/mult-pe.mkii
index a4cbb6b38..b0c10e385 100644
--- a/tex/context/base/mkii/mult-pe.mkii
+++ b/tex/context/base/mkii/mult-pe.mkii
@@ -1314,6 +1314,7 @@
 \setinterfacecommand{Words}{Words}
 \setinterfacecommand{about}{درمورد}
 \setinterfacecommand{adaptlayout}{تنظیم‌طرح‌بندی}
+\setinterfacecommand{alignment}{alignment}
 \setinterfacecommand{arg}{افزودن}
 \setinterfacecommand{at}{در}
 \setinterfacecommand{atleftmargin}{درحاشیه‌چپ}
@@ -1530,11 +1531,13 @@
 \setinterfacecommand{leftmargindistance}{فاصله‌حاشیه‌چپ}
 \setinterfacecommand{leftmarginwidth}{عرض‌حاشیه‌چپ}
 \setinterfacecommand{leg}{پا}
+\setinterfacecommand{linecorrection}{linecorrection}
 \setinterfacecommand{linewidth}{عرض‌خط}
 \setinterfacecommand{listheight}{ارتفاع‌خط}
 \setinterfacecommand{listlength}{طول‌لیست}
 \setinterfacecommand{listsymbol}{نمادلیست}
 \setinterfacecommand{listwidth}{عرض‌لیست}
+\setinterfacecommand{localfootnotes}{localfootnotes}
 \setinterfacecommand{logfields}{میدانهای‌گزارش}
 \setinterfacecommand{lohi}{پابا}
 \setinterfacecommand{low}{پایین}
@@ -1543,6 +1546,7 @@
 \setinterfacecommand{makeupheight}{ارتفاع‌آرایش}
 \setinterfacecommand{makeupwidth}{عرض‌آرایش}
 \setinterfacecommand{mar}{حاش}
+\setinterfacecommand{marginblock}{marginblock}
 \setinterfacecommand{margindistance}{فاصله‌حاشیه}
 \setinterfacecommand{marginrule}{خط‌حاشیه}
 \setinterfacecommand{margintext}{متن‌حاشیه}
@@ -1642,6 +1646,7 @@
 \setinterfacecommand{rightmarginwidth}{عرض‌حاشیه‌راست}
 \setinterfacecommand{romannumerals}{اعدادلاتین}
 \setinterfacecommand{rotate}{دوران}
+\setinterfacecommand{savebuffer}{savebuffer}
 \setinterfacecommand{scale}{مقیاس}
 \setinterfacecommand{screen}{پرده}
 \setinterfacecommand{selectblocks}{انتخاب‌بلوکها}
@@ -1677,7 +1682,9 @@
 \setinterfacecommand{setupcombinations}{بارگذاری‌ترکیب‌ها}
 \setinterfacecommand{setupcombinedlist}{بارگذاری‌لیست‌ترکیبی}
 \setinterfacecommand{setupcomment}{بارگذاری‌توضیح}
+\setinterfacecommand{setupdescription}{setupdescription}
 \setinterfacecommand{setupdescriptions}{بارگذاری‌شرح}
+\setinterfacecommand{setupenumeration}{setupenumeration}
 \setinterfacecommand{setupenumerations}{بارگذاری‌شماره‌گذاریها}
 \setinterfacecommand{setupexternalfigures}{بارگذاری‌شکلهای‌خارجی}
 \setinterfacecommand{setupfield}{بارگذاری‌میدان}
@@ -1692,8 +1699,10 @@
 \setinterfacecommand{setupfootnotedefinition}{بارگذاری‌تعریف‌پانوشت}
 \setinterfacecommand{setupfootnotes}{بارگذاری‌پانوشتها}
 \setinterfacecommand{setupforms}{بارگذاری‌طرح}
+\setinterfacecommand{setupformula}{setupformula}
 \setinterfacecommand{setupformulas}{بارگذاری‌فرمولها}
 \setinterfacecommand{setupframed}{بارگذاری‌قالبی}
+\setinterfacecommand{setupframedtext}{setupframedtext}
 \setinterfacecommand{setupframedtexts}{بارگذاری‌متن‌قالبی}
 \setinterfacecommand{setuphead}{بارگذاری‌سر}
 \setinterfacecommand{setupheader}{بارگذاری‌سربرگ}
@@ -1722,7 +1731,9 @@
 \setinterfacecommand{setuplinewidth}{بارگذاری‌عرض‌خط}
 \setinterfacecommand{setuplist}{بارگذاری‌لیست}
 \setinterfacecommand{setupmakeup}{بارگذاری‌آرایش}
+\setinterfacecommand{setupmarginblock}{setupmarginblock}
 \setinterfacecommand{setupmarginblocks}{بارگذاری‌بلوکهای‌حاشیه}
+\setinterfacecommand{setupmargindata}{setupmargindata}
 \setinterfacecommand{setupmarginrules}{بارگذاری‌خطهای‌حاشیه}
 \setinterfacecommand{setupmarking}{بارگذاری‌نشانه‌گذاری}
 \setinterfacecommand{setupmathalignment}{بارگذاری‌تنظیم‌ریاضی}
@@ -1901,6 +1912,7 @@
 \setinterfacecommand{testcolumn}{ستون‌امتحان}
 \setinterfacecommand{testpage}{صفحه‌تست}
 \setinterfacecommand{tex}{تک}
+\setinterfacecommand{textbackground}{textbackground}
 \setinterfacecommand{textheight}{ارتفاع‌متن}
 \setinterfacecommand{textreference}{مرجع‌متن}
 \setinterfacecommand{textrule}{خط‌متن}
diff --git a/tex/context/base/mkii/mult-ro.mkii b/tex/context/base/mkii/mult-ro.mkii
index a8c5e59f0..5c8ced81c 100644
--- a/tex/context/base/mkii/mult-ro.mkii
+++ b/tex/context/base/mkii/mult-ro.mkii
@@ -1314,6 +1314,7 @@
 \setinterfacecommand{Words}{Cuvinte}
 \setinterfacecommand{about}{despre}
 \setinterfacecommand{adaptlayout}{adapteazaaspect}
+\setinterfacecommand{alignment}{alignment}
 \setinterfacecommand{arg}{arg}
 \setinterfacecommand{at}{la}
 \setinterfacecommand{atleftmargin}{atleftmargin}
@@ -1530,11 +1531,13 @@
 \setinterfacecommand{leftmargindistance}{distantamarginestanga}
 \setinterfacecommand{leftmarginwidth}{latimemarginestanga}
 \setinterfacecommand{leg}{leg}
+\setinterfacecommand{linecorrection}{linecorrection}
 \setinterfacecommand{linewidth}{grosimelinie}
 \setinterfacecommand{listheight}{inaltimelista}
 \setinterfacecommand{listlength}{lungimelista}
 \setinterfacecommand{listsymbol}{listsymbol}
 \setinterfacecommand{listwidth}{latimelista}
+\setinterfacecommand{localfootnotes}{localfootnotes}
 \setinterfacecommand{logfields}{logcampuri}
 \setinterfacecommand{lohi}{jossus}
 \setinterfacecommand{low}{jos}
@@ -1543,6 +1546,7 @@
 \setinterfacecommand{makeupheight}{inaltimemakeup}
 \setinterfacecommand{makeupwidth}{latimemakeup}
 \setinterfacecommand{mar}{mar}
+\setinterfacecommand{marginblock}{marginblock}
 \setinterfacecommand{margindistance}{distantamargine}
 \setinterfacecommand{marginrule}{liniemargine}
 \setinterfacecommand{margintext}{textmarginal}
@@ -1642,6 +1646,7 @@
 \setinterfacecommand{rightmarginwidth}{latimemarginedreapta}
 \setinterfacecommand{romannumerals}{numereromane}
 \setinterfacecommand{rotate}{roteste}
+\setinterfacecommand{savebuffer}{savebuffer}
 \setinterfacecommand{scale}{scala}
 \setinterfacecommand{screen}{ecran}
 \setinterfacecommand{selectblocks}{selecteazablocuri}
@@ -1677,7 +1682,9 @@
 \setinterfacecommand{setupcombinations}{seteazacombinari}
 \setinterfacecommand{setupcombinedlist}{seteazalistacombinata}
 \setinterfacecommand{setupcomment}{seteazacomentariu}
+\setinterfacecommand{setupdescription}{setupdescription}
 \setinterfacecommand{setupdescriptions}{seteazadescriere}
+\setinterfacecommand{setupenumeration}{setupenumeration}
 \setinterfacecommand{setupenumerations}{seteazaenumerare}
 \setinterfacecommand{setupexternalfigures}{seteazafiguriexterne}
 \setinterfacecommand{setupfield}{seteazacamp}
@@ -1692,8 +1699,10 @@
 \setinterfacecommand{setupfootnotedefinition}{seteazadefinireanotasubsol}
 \setinterfacecommand{setupfootnotes}{seteazanotasubsol}
 \setinterfacecommand{setupforms}{seteazaformulare}
+\setinterfacecommand{setupformula}{setupformula}
 \setinterfacecommand{setupformulas}{seteazaformule}
 \setinterfacecommand{setupframed}{seteazainconjurat}
+\setinterfacecommand{setupframedtext}{setupframedtext}
 \setinterfacecommand{setupframedtexts}{definestetexteinconjurate}
 \setinterfacecommand{setuphead}{seteazatitlu}
 \setinterfacecommand{setupheader}{seteazaantet}
@@ -1722,7 +1731,9 @@
 \setinterfacecommand{setuplinewidth}{seteazagrosimelinie}
 \setinterfacecommand{setuplist}{seteazalista}
 \setinterfacecommand{setupmakeup}{seteazamakeup}
+\setinterfacecommand{setupmarginblock}{setupmarginblock}
 \setinterfacecommand{setupmarginblocks}{seteazablocurimarginale}
+\setinterfacecommand{setupmargindata}{setupmargindata}
 \setinterfacecommand{setupmarginrules}{seteazaliniimargine}
 \setinterfacecommand{setupmarking}{seteazamarcaje}
 \setinterfacecommand{setupmathalignment}{setupmathalignment}
@@ -1901,6 +1912,7 @@
 \setinterfacecommand{testcolumn}{testcolumn}
 \setinterfacecommand{testpage}{testpage}
 \setinterfacecommand{tex}{tex}
+\setinterfacecommand{textbackground}{textbackground}
 \setinterfacecommand{textheight}{inaltimetext}
 \setinterfacecommand{textreference}{referintatext}
 \setinterfacecommand{textrule}{riglatext}
diff --git a/tex/context/base/mkiv/anch-bck.mkvi b/tex/context/base/mkiv/anch-bck.mkvi
index cbdb90291..61f32eaa0 100644
--- a/tex/context/base/mkiv/anch-bck.mkvi
+++ b/tex/context/base/mkiv/anch-bck.mkvi
@@ -228,7 +228,8 @@
    \ifgridsnapping
      \spac_helpers_assign_skip\textbackgroundskip{\textbackgroundparameter\c!topoffset}%
      \ifdim\textbackgroundskip>\zeropoint
-       \struttedbox{\hpack{\raise\textbackgroundskip\hpack{\bpos\v_anch_backgrounds_text_current}}}%
+       \struttedbox % not always ok (e.g. setups)
+         {\hpack{\raise\textbackgroundskip\hpack{\bpos\v_anch_backgrounds_text_current}}}%
      \else
        \bpos\v_anch_backgrounds_text_current
      \fi
@@ -281,7 +282,8 @@
    \spac_helpers_assign_skip\textbackgroundskip{\textbackgroundparameter\c!bottomoffset}%
    \ifgridsnapping % experimental, pascal (todo: topoffset in same way)
      \ifdim\textbackgroundskip>\zeropoint
-       \struttedbox\plusone{\hpack{\lower\textbackgroundskip\hpack{\epos\v_anch_backgrounds_text_current}}}%
+       \struttedbox % not always ok (e.g. setups)
+         {\hpack{\lower\textbackgroundskip\hpack{\epos\v_anch_backgrounds_text_current}}}%
      \else
        \epos\v_anch_backgrounds_text_current
      \fi
diff --git a/tex/context/base/mkiv/cont-new.mkiv b/tex/context/base/mkiv/cont-new.mkiv
index 33fbbcd9d..2d14d1b1f 100644
--- a/tex/context/base/mkiv/cont-new.mkiv
+++ b/tex/context/base/mkiv/cont-new.mkiv
@@ -11,7 +11,7 @@
 %C therefore copyrighted by \PRAGMA. See mreadme.pdf for
 %C details.
 
-\newcontextversion{2016.10.12 17:26}
+\newcontextversion{2016.10.14 17:19}
 
 %D This file is loaded at runtime, thereby providing an excellent place for
 %D hacks, patches, extensions and new features.
diff --git a/tex/context/base/mkiv/context.mkiv b/tex/context/base/mkiv/context.mkiv
index 4442f266c..7a959952f 100644
--- a/tex/context/base/mkiv/context.mkiv
+++ b/tex/context/base/mkiv/context.mkiv
@@ -39,7 +39,7 @@
 %D up and the dependencies are more consistent.
 
 \edef\contextformat {\jobname}
-\edef\contextversion{2016.10.12 17:26}
+\edef\contextversion{2016.10.14 17:19}
 \edef\contextkind   {beta}
 
 %D For those who want to use this:
diff --git a/tex/context/base/mkiv/lang-hyp.lua b/tex/context/base/mkiv/lang-hyp.lua
index 3d166de40..b80bb003b 100644
--- a/tex/context/base/mkiv/lang-hyp.lua
+++ b/tex/context/base/mkiv/lang-hyp.lua
@@ -50,6 +50,34 @@ if not modules then modules = { } end modules ['lang-hyp'] = {
 
 -- todo: hjcodes (<32 == length) if i really want it
 
+-- start:
+--
+-- boundary  : yes when wordboundary
+-- hlist     : when hyphenationbounds 1 or 3
+-- vlist     : when hyphenationbounds 1 or 3
+-- rule      : when hyphenationbounds 1 or 3
+-- dir       : when hyphenationbounds 1 or 3
+-- whatsit   : when hyphenationbounds 1 or 3
+-- glue      : yes
+-- math      : skipped
+-- glyph     : exhyphenchar (one only) : yes (so no -- ---)
+-- otherwise : yes
+--
+-- end:
+--
+-- boundary  : yes
+-- glyph     : yes when different language
+-- glue      : yes
+-- penalty   : yes
+-- kern      : yes when not italic (for some historic reason)
+-- hlist     : when hyphenationbounds 2 or 3
+-- vlist     : when hyphenationbounds 2 or 3
+-- rule      : when hyphenationbounds 2 or 3
+-- dir       : when hyphenationbounds 2 or 3
+-- whatsit   : when hyphenationbounds 2 or 3
+-- ins       : when hyphenationbounds 2 or 3
+-- adjust    : when hyphenationbounds 2 or 3
+
 local type, rawset, tonumber, next = type, rawset, tonumber, next
 
 local P, R, S, Cg, Cf, Ct, Cc, C, Carg, Cs = lpeg.P, lpeg.R, lpeg.S, lpeg.Cg, lpeg.Cf, lpeg.Ct, lpeg.Cc, lpeg.C, lpeg.Carg, lpeg.Cs
diff --git a/tex/context/base/mkiv/lang-lab.mkiv b/tex/context/base/mkiv/lang-lab.mkiv
index 26c10086f..40845be4a 100644
--- a/tex/context/base/mkiv/lang-lab.mkiv
+++ b/tex/context/base/mkiv/lang-lab.mkiv
@@ -81,6 +81,8 @@
         \expandafter\noexpand\csname             #1texts\endcsname
         \expandafter\noexpand\csname              #1text\endcsname}}
 
+% hm, not interfaced
+
 \unexpanded\def\lang_labels_define_class_indeed#1#2#3#4#5#6#7#8#9%
   {\setuvalue{setup#1text}{\protecttextprefixes#2\def\currenttextprefixclass{#1}\dodoubleempty\lang_labels_text_prefix_setup}%
    \setuvalue{preset#1text}{\protecttextprefixes1\def\currenttextprefixclass{#1}\dodoubleempty\lang_labels_text_prefix_setup}%
diff --git a/tex/context/base/mkiv/mlib-run.lua b/tex/context/base/mkiv/mlib-run.lua
index 871889bbb..10adb7709 100644
--- a/tex/context/base/mkiv/mlib-run.lua
+++ b/tex/context/base/mkiv/mlib-run.lua
@@ -30,7 +30,8 @@ nears zero.</p>
 --ldx]]--
 
 local type, tostring, tonumber = type, tostring, tonumber
-local format, gsub, match, find = string.format, string.gsub, string.match, string.find
+local gsub, match, find = string.gsub, string.match, string.find
+local striplines = utilities.strings.striplines
 local concat, insert, remove = table.concat, table.insert, table.remove
 
 local emptystring = string.is_empty
@@ -160,14 +161,15 @@ function metapost.reporterror(result)
         report_metapost("error: no result object returned")
     elseif result.status > 0 then
         local t, e, l = result.term, result.error, result.log
+        local report = metapost.texerrors and texerrormessage or report_metapost
         if t and t ~= "" then
-            (metapost.texerrors and texerrormessage or report_metapost)("terminal: %s",t)
+            report("mp error: %s",striplines(t))
         end
         if e == "" or e == "no-error" then
             e = nil
         end
         if e then
-            (metapost.texerrors and texerrormessage or report_metapost)("error: %s",e)
+            report("mp error: %s",striplines(e))
         end
         if not t and not e and l then
             metapost.lastlog = metapost.lastlog .. "\n" .. l
@@ -416,75 +418,115 @@ function metapost.process(mpx, data, trialrun, flusher, multipass, isextrapass,
             end
             -- end of hacks
         end
-        if type(data) == "table" then
-            if trace_tracingall then
-                mpx:execute("tracingall;")
-            end
-         -- table.insert(data,2,"")
-            for i=1,#data do
-                local d = data[i]
-             -- d = string.gsub(d,"\r","")
-                if d then
-                    if trace_graphics then
+
+        local function process(d,i)
+         -- d = string.gsub(d,"\r","")
+            if d then
+                if trace_graphics then
+                    if i then
                         tra.inp:write(formatters["\n%% begin snippet %s\n"](i))
-                        tra.inp:write(d)
+                    end
+                    tra.inp:write(d)
+                    if i then
                         tra.inp:write(formatters["\n%% end snippet %s\n"](i))
                     end
-                    starttiming(metapost.exectime)
-                    result = mpx:execute(d) -- some day we wil use a coroutine with textexts
-                    stoptiming(metapost.exectime)
-                    if trace_graphics and result then
-                        local str = result.log or result.error
-                        if str and str ~= "" then
-                            tra.log:write(str)
-                        end
+                end
+                starttiming(metapost.exectime)
+                result = mpx:execute(d) -- some day we wil use a coroutine with textexts
+                stoptiming(metapost.exectime)
+                if trace_graphics and result then
+                    local str = result.log or result.error
+                    if str and str ~= "" then
+                        tra.log:write(str)
                     end
-                    if not metapost.reporterror(result) then
-                        if metapost.showlog then
-                            local str = result.term ~= "" and result.term or "no terminal output"
-                            if not emptystring(str) then
-                                metapost.lastlog = metapost.lastlog .. "\n" .. str
-                                report_metapost("log: %s",str)
-                            end
-                        end
-                        if result.fig then
-                            converted = metapost.convert(result, trialrun, flusher, multipass, askedfig)
+                end
+                if not metapost.reporterror(result) then
+                    if metapost.showlog then
+                        local str = result.term ~= "" and result.term or "no terminal output"
+                        if not emptystring(str) then
+                            metapost.lastlog = metapost.lastlog .. "\n" .. str
+                            report_metapost("log: %s",str)
                         end
                     end
-                else
-                    report_metapost("error: invalid graphic component %s",i)
+                    if result.fig then
+                        converted = metapost.convert(result, trialrun, flusher, multipass, askedfig)
+                    end
                 end
+            elseif i then
+                report_metapost("error: invalid graphic component %s",i)
+            else
+                report_metapost("error: invalid graphic")
             end
-       else
+        end
+
+        if type(data) == "table" then
             if trace_tracingall then
-                data = "tracingall;" .. data
-            end
-            if trace_graphics then
-                tra.inp:write(data)
+                mpx:execute("tracingall;")
             end
-            starttiming(metapost.exectime)
-            result = mpx:execute(data)
-            stoptiming(metapost.exectime)
-            if trace_graphics and result then
-                local str = result.log or result.error
-                if str and str ~= "" then
-                    tra.log:write(str)
-                end
+         -- table.insert(data,2,"")
+            for i=1,#data do
+                process(data[i],i)
+--                 local d = data[i]
+--              -- d = string.gsub(d,"\r","")
+--                 if d then
+--                     if trace_graphics then
+--                         tra.inp:write(formatters["\n%% begin snippet %s\n"](i))
+--                         tra.inp:write(d)
+--                         tra.inp:write(formatters["\n%% end snippet %s\n"](i))
+--                     end
+--                     starttiming(metapost.exectime)
+--                     result = mpx:execute(d) -- some day we wil use a coroutine with textexts
+--                     stoptiming(metapost.exectime)
+--                     if trace_graphics and result then
+--                         local str = result.log or result.error
+--                         if str and str ~= "" then
+--                             tra.log:write(str)
+--                         end
+--                     end
+--                     if not metapost.reporterror(result) then
+--                         if metapost.showlog then
+--                             local str = result.term ~= "" and result.term or "no terminal output"
+--                             if not emptystring(str) then
+--                                 metapost.lastlog = metapost.lastlog .. "\n" .. str
+--                                 report_metapost("log: %s",str)
+--                             end
+--                         end
+--                         if result.fig then
+--                             converted = metapost.convert(result, trialrun, flusher, multipass, askedfig)
+--                         end
+--                     end
+--                 else
+--                     report_metapost("error: invalid graphic component %s",i)
+--                 end
             end
-            -- todo: error message
-            if not result then
-                report_metapost("error: no result object returned")
-            elseif result.status > 0 then
-                report_metapost("error: %s",(result.term or "no-term") .. "\n" .. (result.error or "no-error"))
-            else
-                if metapost.showlog then
-                    metapost.lastlog = metapost.lastlog .. "\n" .. result.term
-                    report_metapost("info: %s",result.term or "no-term")
-                end
-                 if result.fig then
-                    converted = metapost.convert(result, trialrun, flusher, multipass, askedfig)
-                end
+       else
+            if trace_tracingall then
+                data = "tracingall;" .. data
             end
+            process(data)
+--             starttiming(metapost.exectime)
+--             result = mpx:execute(data)
+--             stoptiming(metapost.exectime)
+--             if trace_graphics and result then
+--                 local str = result.log or result.error
+--                 if str and str ~= "" then
+--                     tra.log:write(str)
+--                 end
+--             end
+--             -- todo: error message
+--             if not result then
+--                 report_metapost("error: no result object returned")
+--             elseif result.status > 0 then
+--                 report_metapost("error: %s",(result.term or "no-term") .. "\n" .. (result.error or "no-error"))
+--             else
+--                 if metapost.showlog then
+--                     metapost.lastlog = metapost.lastlog .. "\n" .. result.term
+--                     report_metapost("info: %s",result.term or "no-term")
+--                 end
+--                  if result.fig then
+--                     converted = metapost.convert(result, trialrun, flusher, multipass, askedfig)
+--                 end
+--             end
         end
         if trace_graphics then
             local banner = "\n% end graphic\n\n"
diff --git a/tex/context/base/mkiv/mult-def.lua b/tex/context/base/mkiv/mult-def.lua
index 7df4ec1ca..d1ed74b6e 100644
--- a/tex/context/base/mkiv/mult-def.lua
+++ b/tex/context/base/mkiv/mult-def.lua
@@ -3424,6 +3424,10 @@ return {
    ["pe"]="دوران",
    ["ro"]="roteste",
   },
+  ["savebuffer"]={
+   ["en"]="savebuffer",
+   ["nl"]="bewaarbuffer",
+  },
   ["scale"]={
    ["cs"]="meritko",
    ["de"]="format",
@@ -3784,6 +3788,10 @@ return {
    ["pe"]="بارگذاری‌شرح",
    ["ro"]="seteazadescriere",
   },
+  ["setupdescription"]={
+   ["en"]="setupdescription",
+   ["nl"]="steldoordefinierenin",
+  },
   ["setupenumerations"]={
    ["cs"]="nastavvycty",
    ["de"]="stellebeschreibungein",
@@ -3794,6 +3802,10 @@ return {
    ["pe"]="بارگذاری‌شماره‌گذاریها",
    ["ro"]="seteazaenumerare",
   },
+  ["setupenumeration"]={
+   ["en"]="setupenumeration",
+   ["nl"]="steldoornummerenin",
+  },
   ["setupexternalfigures"]={
    ["cs"]="nastavexterniobrazy",
    ["de"]="stelleexterneabbildungenein",
@@ -3934,6 +3946,10 @@ return {
    ["pe"]="بارگذاری‌فرمولها",
    ["ro"]="seteazaformule",
   },
+  ["setupformula"]={
+   ["en"]="setupformula",
+   ["nl"]="stelformulein",
+  },
   ["setupframed"]={
    ["cs"]="nastavoramovani",
    ["de"]="stelleumrahmtein",
@@ -3954,6 +3970,10 @@ return {
    ["pe"]="بارگذاری‌متن‌قالبی",
    ["ro"]="definestetexteinconjurate",
   },
+  ["setupframedtext"]={
+   ["en"]="setupframedtext",
+   ["nl"]="stelkadertekstin",
+  },
   ["setuphead"]={
    ["cs"]="nastavnadpis",
    ["de"]="stelleueberschriftein",
@@ -4228,6 +4248,14 @@ return {
    ["pe"]="بارگذاری‌بلوکهای‌حاشیه",
    ["ro"]="seteazablocurimarginale",
   },
+  ["setupmarginblock"]={
+   ["en"]="setupmarginblock",
+   ["nl"]="stelmargeblokkenin",
+  },
+  ["setupmargindata"]={
+   ["en"]="setupmargindata",
+   ["nl"]="stelinmargein",
+  },
   ["setupmarginrules"]={
    ["cs"]="nastavmarginalnilinky",
    ["de"]="stellemarginallinieein",
@@ -5032,6 +5060,10 @@ return {
    ["pe"]="شروع‌تنظیم",
    ["ro"]="startaliniere",
   },
+  ["alignment"]={
+   ["en"]="alignment",
+   ["nl"]="uitlijnen",
+  },
   ["startbackground"]={
    ["cs"]="startpozadi",
    ["de"]="starthintergrund",
@@ -5176,6 +5208,10 @@ return {
    ["pe"]="شروع‌تصحیح‌خط",
    ["ro"]="startcorectielinie",
   },
+  ["linecorrection"]={
+   ["en"]="linecorrection",
+   ["nl"]="regelcorrectie",
+  },
   ["startlinenumbering"]={
    ["cs"]="startcislovaniradku",
    ["de"]="startzeilennumerierung",
@@ -5216,6 +5252,10 @@ return {
    ["pe"]="شروع‌پانوشتهای‌موضعی",
    ["ro"]="startnotesubsollocale",
   },
+  ["localfootnotes"]={
+   ["en"]="localfootnotes",
+   ["nl"]="lokalevoetnoten",
+  },
   ["startmakeup"]={
    ["cs"]="startuprava",
    ["de"]="startumbruch",
@@ -5236,6 +5276,10 @@ return {
    ["pe"]="شروع‌بلوک‌حاشیه",
    ["ro"]="startblocmarginal",
   },
+  ["marginblock"]={
+   ["en"]="marginblock",
+   ["nl"]="margeblok",
+  },
   ["startmarginrule"]={
    ["cs"]="startmarginalnilinka",
    ["de"]="startmarginallinie",
@@ -5410,6 +5454,10 @@ return {
    ["en"]="starttextbackground",
    ["nl"]="starttekstachtergrond",
   },
+  ["textbackground"]={
+   ["en"]="textbackground",
+   ["nl"]="tekstachtergrond",
+  },
   ["starttextrule"]={
    ["cs"]="starttextovalinka",
    ["de"]="starttextlinie",
@@ -12921,6 +12969,7 @@ return {
   },
   ["combination"]={
    ["en"]="combination",
+   ["nl"]="combinatie",
   },
   ["command"]={
    ["cs"]="prikaz",
diff --git a/tex/context/base/mkiv/mult-fun.lua b/tex/context/base/mkiv/mult-fun.lua
index 299bcc0dd..d6685527c 100644
--- a/tex/context/base/mkiv/mult-fun.lua
+++ b/tex/context/base/mkiv/mult-fun.lua
@@ -15,6 +15,7 @@ return {
         "metapostversion",
         "maxdimensions",
         "drawoptionsfactor",
+        "dq", "sq",
     },
     commands = {
         "transparency",
@@ -126,7 +127,7 @@ return {
         --
         "decorated", "redecorated", "undecorated",
         --
-        "passvariable", "passarrayvariable", "tostring", "format", "formatted",
+        "passvariable", "passarrayvariable", "tostring", "topair", "format", "formatted", "quotation", "quote",
         "startpassingvariable", "stoppassingvariable",
         --
         "eofill", "eoclip", "nofill", "fillup", "eofillup",
diff --git a/tex/context/base/mkiv/mult-mps.lua b/tex/context/base/mkiv/mult-mps.lua
index a6bebc266..fb8ed3489 100644
--- a/tex/context/base/mkiv/mult-mps.lua
+++ b/tex/context/base/mkiv/mult-mps.lua
@@ -76,7 +76,7 @@ return {
         "arrowhead",
         "currentpen", "currentpicture", "cuttings",
         "defaultfont", "extra_beginfig", "extra_endfig",
-        "ditto", "EOF", "down",
+        "down",
         "evenly", "fullcircle", "halfcircle", "identity", "in", "left",
         "pensquare",  "penrazor",  "penspec",
         "origin", "quartercircle", "right",
@@ -129,6 +129,8 @@ return {
         "join_radius",
         "charscale", -- actually a mult-fun one
         --
+        "ditto", "EOF", -- maybe also down etc
+        --
         "pen_lft", "pen_rt", "pen_top", "pen_bot", -- "pen_count_",
     },
     metafont = {
diff --git a/tex/context/base/mkiv/page-mix.lua b/tex/context/base/mkiv/page-mix.lua
index 2df762b5b..725073f55 100644
--- a/tex/context/base/mkiv/page-mix.lua
+++ b/tex/context/base/mkiv/page-mix.lua
@@ -294,15 +294,15 @@ local function preparesplit(specification) -- a rather large function
         }
     end
 
-    local column        = 1
-    local line          = 0
-    local result        = results[1]
-    local lasthead      = nil
-    local rest          = nil
-    local lastlocked    = nil
-    local lastcurrent   = nil
-    local lastcontent   = nil
-    local backtracked   = false
+    local column      = 1
+    local line        = 0
+    local result      = results[1]
+    local lasthead    = nil
+    local rest        = nil
+    local lastlocked  = nil
+    local lastcurrent = nil
+    local lastcontent = nil
+    local backtracked = false
 
     if trace_state then
         report_state("setting collector to column %s",column)
@@ -408,12 +408,12 @@ local function preparesplit(specification) -- a rather large function
             result.height = height
             result.depth  = depth
         end
-        head    = current
-        height  = 0
-        depth   = 0
+        head   = current
+        height = 0
+        depth  = 0
         if column == nofcolumns then
             column = 0 -- nicer in trace
-            rest = head
+            rest   = head
             return false, 0
         else
             local skipped
@@ -434,7 +434,6 @@ local function preparesplit(specification) -- a rather large function
     local function checked(advance,where,locked)
         local total   = skip + height + depth + advance
         local delta   = total - target
--- - 65536*3
         local state   = "same"
         local okay    = false
         local skipped = 0
diff --git a/tex/context/base/mkiv/page-mix.mkiv b/tex/context/base/mkiv/page-mix.mkiv
index 5b3afc575..7bd30ceee 100644
--- a/tex/context/base/mkiv/page-mix.mkiv
+++ b/tex/context/base/mkiv/page-mix.mkiv
@@ -439,7 +439,8 @@
    \begincsname\??mixedcolumnsbefore\currentmixedcolumnsmethod\endcsname\relax
    \begingroup
    \page_mix_initialize_columns
-   \begincsname\??mixedcolumnsstart\currentmixedcolumnsmethod\endcsname}
+   \begincsname\??mixedcolumnsstart\currentmixedcolumnsmethod\endcsname
+   \let\stopmixedcolumns\page_mix_columns_stop_yes}
 
 \def\page_mix_start_columns_c_nop
   {\begingroup
diff --git a/tex/context/base/mkiv/publ-ini.mkiv b/tex/context/base/mkiv/publ-ini.mkiv
index f6500fdd7..5f9aaa692 100644
--- a/tex/context/base/mkiv/publ-ini.mkiv
+++ b/tex/context/base/mkiv/publ-ini.mkiv
@@ -79,6 +79,8 @@
 
 \definelabelclass[btxlabel][2]
 
+\clf_definelabels{btxlabel}{btx}\s!false\relax
+
 % It is not that trivial to come up with a proper organization of setup
 % and control commands for publications. This is because we have complex
 % inline as well as extensive list rendering. The rules are partially
diff --git a/tex/context/base/mkiv/spac-ver.lua b/tex/context/base/mkiv/spac-ver.lua
index 8b362f903..166bd0aa2 100644
--- a/tex/context/base/mkiv/spac-ver.lua
+++ b/tex/context/base/mkiv/spac-ver.lua
@@ -56,6 +56,33 @@ local texnest      = tex.nest
 local variables    = interfaces.variables
 local implement    = interfaces.implement
 
+local v_local      = variables["local"]
+local v_global     = variables["global"]
+local v_box        = variables.box
+local v_min        = variables.min
+local v_max        = variables.max
+local v_none       = variables.none
+local v_line       = variables.line
+local v_noheight   = variables.noheight
+local v_nodepth    = variables.nodepth
+local v_line       = variables.line
+local v_first      = variables.first
+local v_last       = variables.last
+local v_top        = variables.top
+local v_bottom     = variables.bottom
+local v_minheight  = variables.minheight
+local v_maxheight  = variables.maxheight
+local v_mindepth   = variables.mindepth
+local v_maxdepth   = variables.maxdepth
+local v_offset     = variables.offset
+local v_strut      = variables.strut
+
+local v_hfraction  = variables.hfraction
+local v_dfraction  = variables.dfraction
+local v_bfraction  = variables.bfraction
+local v_tlines     = variables.tlines
+local v_blines     = variables.blines
+
 -- vertical space handler
 
 local trace_vbox_vspacing    = false  trackers.register("vspacing.vbox",     function(v) trace_vbox_vspacing    = v end)
@@ -154,19 +181,19 @@ vspacingdata.snapmethods  = snapmethods
 storage.register("builders/vspacing/data/snapmethods", snapmethods, "builders.vspacing.data.snapmethods")
 
 local default = {
-    maxheight = true,
-    maxdepth  = true,
-    strut     = true,
-    hfraction = 1,
-    dfraction = 1,
-    bfraction = 0.25,
+    [v_maxheight] = true,
+    [v_maxdepth]  = true,
+    [v_strut]     = true,
+    [v_hfraction] = 1,
+    [v_dfraction] = 1,
+    [v_bfraction] = 0.25,
 }
 
 local fractions = {
-    minheight = "hfraction", maxheight = "hfraction",
-    mindepth  = "dfraction", maxdepth  = "dfraction",
-    box       = "bfraction",
-    top       = "tlines",    bottom    = "blines",
+    [v_minheight] = v_hfraction, [v_maxheight] = v_hfraction,
+    [v_mindepth]  = v_dfraction, [v_maxdepth]  = v_dfraction,
+    [v_box]       = v_bfraction,
+    [v_top]       = v_tlines,    [v_bottom]    = v_blines,
 }
 
 local values = {
@@ -202,13 +229,14 @@ local function listtohash(str)
         else
             detail = tonumber("0" .. key)
             if detail then
-                t.hfraction, t.dfraction = detail, detail
+                t[v_hfraction] = detail
+                t[v_dfraction] = detail
             end
         end
     end
     if next(t) then
-        t.hfraction = t.hfraction or 1
-        t.dfraction = t.dfraction or 1
+        t[v_hfraction] = t[v_hfraction] or 1
+        t[v_dfraction] = t[v_dfraction] or 1
         return t
     else
         return default
@@ -219,7 +247,8 @@ function vspacing.definesnapmethod(name,method)
     local n = #snapmethods + 1
     local t = listtohash(method)
     snapmethods[n] = t
-    t.name, t.specification = name, method
+    t.name          = name   -- not interfaced
+    t.specification = method -- not interfaced
     context(n)
 end
 
@@ -325,7 +354,7 @@ local function fixedprofile(current)
     return profiling and profiling.fixedprofile(current)
 end
 
-local function snap_hlist(where,current,method,height,depth) -- method.strut is default
+local function snap_hlist(where,current,method,height,depth) -- method[v_strut] is default
     if fixedprofile(current) then
         return
     end
@@ -334,18 +363,18 @@ local function snap_hlist(where,current,method,height,depth) -- method.strut is
     if t then
         t[#t+1] = formatters["list content: %s"](listtoutf(list))
         t[#t+1] = formatters["parent id: %s"](nodereference(current))
-        t[#t+1] = formatters["snap method: %s"](method.name)
-        t[#t+1] = formatters["specification: %s"](method.specification)
+        t[#t+1] = formatters["snap method: %s"](method.name) -- not interfaced
+        t[#t+1] = formatters["specification: %s"](method.specification) -- not interfaced
     end
     local snapht, snapdp
-    if method["local"] then
+    if method[v_local] then
         -- snapping is done immediately here
         snapht = texgetdimen("bodyfontstrutheight")
         snapdp = texgetdimen("bodyfontstrutdepth")
         if t then
             t[#t+1] = formatters["local: snapht %p snapdp %p"](snapht,snapdp)
         end
-    elseif method["global"] then
+    elseif method[v_global] then
         snapht = texgetdimen("globalbodyfontstrutheight")
         snapdp = texgetdimen("globalbodyfontstrutdepth")
         if t then
@@ -366,15 +395,15 @@ local function snap_hlist(where,current,method,height,depth) -- method.strut is
         end
     end
 
-    local h        = (method.noheight and 0) or height or getfield(current,"height")
-    local d        = (method.nodepth  and 0) or depth  or getfield(current,"depth")
-    local hr       = method.hfraction or 1
-    local dr       = method.dfraction or 1
-    local br       = method.bfraction or 0
+    local h        = (method[v_noheight] and 0) or height or getfield(current,"height")
+    local d        = (method[v_nodepth]  and 0) or depth  or getfield(current,"depth")
+    local hr       = method[v_hfraction] or 1
+    local dr       = method[v_dfraction] or 1
+    local br       = method[v_bfraction] or 0
     local ch       = h
     local cd       = d
-    local tlines   = method.tlines or 1
-    local blines   = method.blines or 1
+    local tlines   = method[v_tlines] or 1
+    local blines   = method[v_blines] or 1
     local done     = false
     local plusht   = snapht
     local plusdp   = snapdp
@@ -391,7 +420,7 @@ local function snap_hlist(where,current,method,height,depth) -- method.strut is
 --     }
 -- end
 
-    if method.box then
+    if method[v_box] then
         local br = 1 - br
         if br < 0 then
             br = 0
@@ -402,30 +431,30 @@ local function snap_hlist(where,current,method,height,depth) -- method.strut is
         local x = n * snaphtdp - h - d
         plusht = h + x / 2
         plusdp = d + x / 2
-    elseif method.max then
+    elseif method[v_max] then
         local n = ceiled((h+d)/snaphtdp)
         local x = n * snaphtdp - h - d
         plusht = h + x / 2
         plusdp = d + x / 2
-    elseif method.min then
+    elseif method[v_min] then
         local n = floored((h+d)/snaphtdp)
         local x = n * snaphtdp - h - d
         plusht = h + x / 2
         plusdp = d + x / 2
-    elseif method.none then
+    elseif method[v_none] then
         plusht, plusdp = 0, 0
         if t then
             t[#t+1] = "none: plusht 0pt plusdp 0pt"
         end
     end
-    if method.halfline then -- extra halfline
+    if method[v_halfline] then -- extra halfline
         plusht = plusht + snaphtdp/2
         plusdp = plusdp + snaphtdp/2
         if t then
             t[#t+1] = formatters["halfline: plusht %p plusdp %p"](plusht,plusdp)
         end
     end
-    if method.line then -- extra line
+    if method[v_line] then -- extra line
         plusht = plusht + snaphtdp
         plusdp = plusdp + snaphtdp
         if t then
@@ -433,7 +462,7 @@ local function snap_hlist(where,current,method,height,depth) -- method.strut is
         end
     end
 
-    if method.first then
+    if method[v_first] then
         local thebox = current
         local id = getid(thebox)
         if id == hlist_code then
@@ -471,7 +500,7 @@ local function snap_hlist(where,current,method,height,depth) -- method.strut is
         elseif t then
             t[#t+1] = "first: not done, no vbox"
         end
-    elseif method.last then
+    elseif method[v_last] then
         local thebox = current
         local id = getid(thebox)
         if id == hlist_code then
@@ -509,12 +538,12 @@ local function snap_hlist(where,current,method,height,depth) -- method.strut is
             t[#t+1] = "last: not done, no vbox"
         end
     end
-    if method.minheight then
+    if method[v_minheight] then
         ch = floored((h-hr*snapht)/snaphtdp)*snaphtdp + plusht
         if t then
             t[#t+1] = formatters["minheight: %p"](ch)
         end
-    elseif method.maxheight then
+    elseif method[v_maxheight] then
         ch = ceiled((h-hr*snapht)/snaphtdp)*snaphtdp + plusht
         if t then
             t[#t+1] = formatters["maxheight: %p"](ch)
@@ -525,12 +554,12 @@ local function snap_hlist(where,current,method,height,depth) -- method.strut is
             t[#t+1] = formatters["set height: %p"](ch)
         end
     end
-    if method.mindepth then
+    if method[v_mindepth] then
         cd = floored((d-dr*snapdp)/snaphtdp)*snaphtdp + plusdp
         if t then
             t[#t+1] = formatters["mindepth: %p"](cd)
         end
-    elseif method.maxdepth then
+    elseif method[v_maxdepth] then
         cd = ceiled((d-dr*snapdp)/snaphtdp)*snaphtdp + plusdp
         if t then
             t[#t+1] = formatters["maxdepth: %p"](cd)
@@ -541,20 +570,20 @@ local function snap_hlist(where,current,method,height,depth) -- method.strut is
             t[#t+1] = formatters["set depth: %p"](cd)
         end
     end
-    if method.top then
+    if method[v_top] then
         ch = ch + tlines * snaphtdp
         if t then
             t[#t+1] = formatters["top height: %p"](ch)
         end
     end
-    if method.bottom then
+    if method[v_bottom] then
         cd = cd + blines * snaphtdp
         if t then
             t[#t+1] = formatters["bottom depth: %p"](cd)
         end
     end
 
-    local offset = method.offset
+    local offset = method[v_offset]
     if offset then
         -- we need to set the attr
         if t then
diff --git a/tex/context/base/mkiv/status-files.pdf b/tex/context/base/mkiv/status-files.pdf
index 258056fb2..c60014f10 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 b7c59e744..247757915 100644
--- a/tex/context/base/mkiv/status-lua.pdf
+++ b/tex/context/base/mkiv/status-lua.pdf
diff --git a/tex/context/base/mkiv/strc-des.mkvi b/tex/context/base/mkiv/strc-des.mkvi
index 4376d9cdc..76f878f5f 100644
--- a/tex/context/base/mkiv/strc-des.mkvi
+++ b/tex/context/base/mkiv/strc-des.mkvi
@@ -21,11 +21,11 @@
 
 \let\setupdescriptions\setupdescription
 
-% \setupdescriptions % check with old
+% \setupdescription % check with old
 %   [\c!alternative=\descriptionparameter\c!location,
 %    \c!location=\v!left]
 
-\setupdescriptions % check with old
+\setupdescription % check with old
   [\c!alternative=\v!left,
    \c!headstyle=\v!bold,
    \c!titlestyle=\v!bold,
diff --git a/tex/context/base/mkiv/strc-enu.mkvi b/tex/context/base/mkiv/strc-enu.mkvi
index 832bdaf82..aaf735918 100644
--- a/tex/context/base/mkiv/strc-enu.mkvi
+++ b/tex/context/base/mkiv/strc-enu.mkvi
@@ -79,7 +79,7 @@
 
 \let\setupenumerations\setupenumeration
 
-\setupenumerations % check with old
+\setupenumeration % check with old
   [\c!alternative=\v!top,
    \c!headstyle=\v!bold,
    \c!titlestyle=\v!bold,
diff --git a/tex/context/base/mkiv/trac-deb.lua b/tex/context/base/mkiv/trac-deb.lua
index 9a0108368..3770f4189 100644
--- a/tex/context/base/mkiv/trac-deb.lua
+++ b/tex/context/base/mkiv/trac-deb.lua
@@ -185,6 +185,7 @@ local function processerror(offset)
     local lasttexerror = status.lasterrorstring or "?"
     local lastluaerror = status.lastluaerrorstring or lasttexerror
     local luaerrorline = match(lastluaerror,[[lua%]?:.-(%d+)]]) or (lastluaerror and find(lastluaerror,"?:0:",1,true) and 0)
+    local lastmpserror = match(lasttexerror,[[^.-mp%serror:%s*(.*)$]])
     resetmessages()
     lastluaerror = gsub(lastluaerror,"%[\\directlua%]","[ctxlua]")
     tracers.printerror {
@@ -192,6 +193,7 @@ local function processerror(offset)
         linenumber   = linenumber,
         offset       = tonumber(offset) or 10,
         lasttexerror = lasttexerror,
+        lastmpserror = lastmpserror,
         lastluaerror = lastluaerror,
         luaerrorline = luaerrorline,
         lastcontext  = lastcontext,
@@ -204,9 +206,11 @@ function tracers.printerror(specification)
     local filename     = specification.filename
     local linenumber   = specification.linenumber
     local lasttexerror = specification.lasttexerror
+    local lastmpserror = specification.lastmpserror
     local lastluaerror = specification.lastluaerror
     local lastcontext  = specification.lasterrorcontext
     local luaerrorline = specification.luaerrorline
+    local errortype    = specification.errortype
     local offset       = specification.offset
     local report       = errorreporter(luaerrorline)
     if not filename then
@@ -217,7 +221,8 @@ function tracers.printerror(specification)
         report_nl()
         if luaerrorline then
             report("lua error on line %s in file %s:\n\n%s",linenumber,filename,lastluaerror)
-         -- report("error on line %s in file %s:\n\n%s",linenumber,filename,lasttexerror)
+        elseif lastmpserror then
+            report("mp error on line %s in file %s:\n\n%s",linenumber,filename,lastmpserror)
         else
             report("tex error on line %s in file %s: %s",linenumber,filename,lasttexerror)
             if lastcontext then
diff --git a/tex/context/base/mkiv/typo-fkr.lua b/tex/context/base/mkiv/typo-fkr.lua
index 1de554b57..b235ff284 100644
--- a/tex/context/base/mkiv/typo-fkr.lua
+++ b/tex/context/base/mkiv/typo-fkr.lua
@@ -95,29 +95,33 @@ function typesetters.fontkerns.handler(head)
     return kepthead, done
 end
 
-local variables    = interfaces.variables
-local unsetvalue   = attributes.unsetvalue
-local enabled      = false
-local setattribute = tex.setattribute
+if context then
 
-local values       = {
-    [variables.none ] = 0,
-    [variables.min  ] = 1,
-    [variables.max  ] = 2,
-    [variables.mixed] = 3,
-    [variables.reset] = unsetvalue,
-}
+    local variables    = interfaces.variables
+    local unsetvalue   = attributes.unsetvalue
+    local enabled      = false
+    local setattribute = tex.setattribute
+
+    local values       = {
+        [variables.none ] = 0,
+        [variables.min  ] = 1,
+        [variables.max  ] = 2,
+        [variables.mixed] = 3,
+        [variables.reset] = unsetvalue,
+    }
 
-local function setextrafontkerns(str)
-    if not enabled then
-        nodes.tasks.enableaction("processors","typesetters.fontkerns.handler")
-        enabled = true
+    local function setextrafontkerns(str)
+        if not enabled then
+            nodes.tasks.enableaction("processors","typesetters.fontkerns.handler")
+            enabled = true
+        end
+        setattribute(a_extrakern,values[str] or unsetvalue)
     end
-    setattribute(a_extrakern,values[str] or unsetvalue)
-end
 
-interfaces.implement {
-    name      = "setextrafontkerns",
-    arguments = "string",
-    actions   = setextrafontkerns,
-}
+    interfaces.implement {
+        name      = "setextrafontkerns",
+        arguments = "string",
+        actions   = setextrafontkerns,
+    }
+
+end
diff --git a/tex/context/interface/mkii/cont-nl.xml b/tex/context/interface/mkii/cont-nl.xml
index ac955ae54..ac0b3a4dd 100644
--- a/tex/context/interface/mkii/cont-nl.xml
+++ b/tex/context/interface/mkii/cont-nl.xml
@@ -1211,7 +1211,7 @@
 
   <cd:command name="localfootnotes" type="environment" file="core-not.tex" category="footnotes">
     <cd:sequence>
-      <cd:string value="localfootnotes"/>
+      <cd:string value="lokalevoetnoten"/>
     </cd:sequence>
   </cd:command>
 
@@ -2740,7 +2740,7 @@
 
   <cd:command name="marginblock" type="environment" file="page-flt.tex">
     <cd:sequence>
-      <cd:string value="marginblock"/>
+      <cd:string value="margeblok"/>
     </cd:sequence>
   </cd:command>
 
@@ -7122,7 +7122,7 @@
 
   <cd:command name="linecorrection" type="environment">
     <cd:sequence>
-      <cd:string value="linecorrection"/>
+      <cd:string value="regelcorrectie"/>
     </cd:sequence>
   </cd:command>
 
@@ -7221,7 +7221,7 @@
 
   <cd:command name="alignment" type="environment" file="core-spa.tex">
     <cd:sequence>
-      <cd:string value="alignment"/>
+      <cd:string value="uitlijnen"/>
     </cd:sequence>
     <cd:arguments>
       <cd:keywords n="1" optional="yes" list="yes">
diff --git a/tex/context/interface/mkii/keys-cs.xml b/tex/context/interface/mkii/keys-cs.xml
index 9389f61ec..20e14f760 100644
--- a/tex/context/interface/mkii/keys-cs.xml
+++ b/tex/context/interface/mkii/keys-cs.xml
@@ -1326,6 +1326,7 @@
 		<cd:command name='Words' value='Slova'/>
 		<cd:command name='about' value='oref'/>
 		<cd:command name='adaptlayout' value='prizpusobvzhled'/>
+		<cd:command name='alignment' value='alignment'/>
 		<cd:command name='arg' value='arg'/>
 		<cd:command name='at' value='pref'/>
 		<cd:command name='atleftmargin' value='atleftmargin'/>
@@ -1542,11 +1543,13 @@
 		<cd:command name='leftmargindistance' value='vzdalenostlevemarginalie'/>
 		<cd:command name='leftmarginwidth' value='sirkalevemarginalie'/>
 		<cd:command name='leg' value='leg'/>
+		<cd:command name='linecorrection' value='linecorrection'/>
 		<cd:command name='linewidth' value='tloustkacary'/>
 		<cd:command name='listheight' value='vyskaseznamu'/>
 		<cd:command name='listlength' value='delkaseznamu'/>
 		<cd:command name='listsymbol' value='listsymbol'/>
 		<cd:command name='listwidth' value='sirkaseznamu'/>
+		<cd:command name='localfootnotes' value='localfootnotes'/>
 		<cd:command name='logfields' value='zaznamovepole'/>
 		<cd:command name='lohi' value='nivy'/>
 		<cd:command name='low' value='nizky'/>
@@ -1555,6 +1558,7 @@
 		<cd:command name='makeupheight' value='vyskasazby'/>
 		<cd:command name='makeupwidth' value='sirkasazby'/>
 		<cd:command name='mar' value='okr'/>
+		<cd:command name='marginblock' value='marginblock'/>
 		<cd:command name='margindistance' value='vzdalenostmarginalie'/>
 		<cd:command name='marginrule' value='marginalnilinka'/>
 		<cd:command name='margintext' value='marginalnitext'/>
@@ -1654,6 +1658,7 @@
 		<cd:command name='rightmarginwidth' value='sirkapravemarginalie'/>
 		<cd:command name='romannumerals' value='rimskecislice'/>
 		<cd:command name='rotate' value='otocit'/>
+		<cd:command name='savebuffer' value='savebuffer'/>
 		<cd:command name='scale' value='meritko'/>
 		<cd:command name='screen' value='obrazovka'/>
 		<cd:command name='selectblocks' value='vyberbloky'/>
@@ -1689,7 +1694,9 @@
 		<cd:command name='setupcombinations' value='nastavspojeni'/>
 		<cd:command name='setupcombinedlist' value='nastavkombinovanyseznam'/>
 		<cd:command name='setupcomment' value='nastavkomentar'/>
+		<cd:command name='setupdescription' value='setupdescription'/>
 		<cd:command name='setupdescriptions' value='nastavpopisy'/>
+		<cd:command name='setupenumeration' value='setupenumeration'/>
 		<cd:command name='setupenumerations' value='nastavvycty'/>
 		<cd:command name='setupexternalfigures' value='nastavexterniobrazy'/>
 		<cd:command name='setupfield' value='nastavpole'/>
@@ -1704,8 +1711,10 @@
 		<cd:command name='setupfootnotedefinition' value='nastavdefinicipoznamekpodcarou'/>
 		<cd:command name='setupfootnotes' value='nastavpoznamkypodcarou'/>
 		<cd:command name='setupforms' value='setupforms'/>
+		<cd:command name='setupformula' value='setupformula'/>
 		<cd:command name='setupformulas' value='nastavrovnice'/>
 		<cd:command name='setupframed' value='nastavoramovani'/>
+		<cd:command name='setupframedtext' value='setupframedtext'/>
 		<cd:command name='setupframedtexts' value='nastavoramovanetexty'/>
 		<cd:command name='setuphead' value='nastavnadpis'/>
 		<cd:command name='setupheader' value='nastavzahlavi'/>
@@ -1734,7 +1743,9 @@
 		<cd:command name='setuplinewidth' value='nastavsirkucary'/>
 		<cd:command name='setuplist' value='nastavseznam'/>
 		<cd:command name='setupmakeup' value='nastavupravu'/>
+		<cd:command name='setupmarginblock' value='setupmarginblock'/>
 		<cd:command name='setupmarginblocks' value='nastavmarginalniblok'/>
+		<cd:command name='setupmargindata' value='setupmargindata'/>
 		<cd:command name='setupmarginrules' value='nastavmarginalnilinky'/>
 		<cd:command name='setupmarking' value='nastavznaceni'/>
 		<cd:command name='setupmathalignment' value='setupmathalignment'/>
@@ -1913,6 +1924,7 @@
 		<cd:command name='testcolumn' value='testcolumn'/>
 		<cd:command name='testpage' value='testpage'/>
 		<cd:command name='tex' value='tex'/>
+		<cd:command name='textbackground' value='textbackground'/>
 		<cd:command name='textheight' value='vyskatextu'/>
 		<cd:command name='textreference' value='odkaznatext'/>
 		<cd:command name='textrule' value='textovalinka'/>
diff --git a/tex/context/interface/mkii/keys-de.xml b/tex/context/interface/mkii/keys-de.xml
index 685193fd7..c4bf99cff 100644
--- a/tex/context/interface/mkii/keys-de.xml
+++ b/tex/context/interface/mkii/keys-de.xml
@@ -1326,6 +1326,7 @@
 		<cd:command name='Words' value='Woerter'/>
 		<cd:command name='about' value='ueber'/>
 		<cd:command name='adaptlayout' value='passelayoutan'/>
+		<cd:command name='alignment' value='alignment'/>
 		<cd:command name='arg' value='arg'/>
 		<cd:command name='at' value='bei'/>
 		<cd:command name='atleftmargin' value='atleftmargin'/>
@@ -1542,11 +1543,13 @@
 		<cd:command name='leftmargindistance' value='linkemarginalafstand'/>
 		<cd:command name='leftmarginwidth' value='linkemarginalbreite'/>
 		<cd:command name='leg' value='leg'/>
+		<cd:command name='linecorrection' value='linecorrection'/>
 		<cd:command name='linewidth' value='liniendicke'/>
 		<cd:command name='listheight' value='listenhoehe'/>
 		<cd:command name='listlength' value='listenlaenge'/>
 		<cd:command name='listsymbol' value='listsymbol'/>
 		<cd:command name='listwidth' value='listenbreite'/>
+		<cd:command name='localfootnotes' value='localfootnotes'/>
 		<cd:command name='logfields' value='registrierefelder'/>
 		<cd:command name='lohi' value='tiho'/>
 		<cd:command name='low' value='tief'/>
@@ -1555,6 +1558,7 @@
 		<cd:command name='makeupheight' value='satzhoehe'/>
 		<cd:command name='makeupwidth' value='satzbreite'/>
 		<cd:command name='mar' value='mar'/>
+		<cd:command name='marginblock' value='marginblock'/>
 		<cd:command name='margindistance' value='marginalafstand'/>
 		<cd:command name='marginrule' value='marginallinie'/>
 		<cd:command name='margintext' value='marginaltext'/>
@@ -1654,6 +1658,7 @@
 		<cd:command name='rightmarginwidth' value='rechtemarginalbreite'/>
 		<cd:command name='romannumerals' value='roemischezahlen'/>
 		<cd:command name='rotate' value='drehen'/>
+		<cd:command name='savebuffer' value='savebuffer'/>
 		<cd:command name='scale' value='format'/>
 		<cd:command name='screen' value='bildschirm'/>
 		<cd:command name='selectblocks' value='waehlebloeckeaus'/>
@@ -1689,7 +1694,9 @@
 		<cd:command name='setupcombinations' value='stellekombinationein'/>
 		<cd:command name='setupcombinedlist' value='stellezusammengestelltelisteein'/>
 		<cd:command name='setupcomment' value='stellekommentarein'/>
+		<cd:command name='setupdescription' value='setupdescription'/>
 		<cd:command name='setupdescriptions' value='definierebeschreibungen'/>
+		<cd:command name='setupenumeration' value='setupenumeration'/>
 		<cd:command name='setupenumerations' value='stellebeschreibungein'/>
 		<cd:command name='setupexternalfigures' value='stelleexterneabbildungenein'/>
 		<cd:command name='setupfield' value='stellefeldein'/>
@@ -1704,8 +1711,10 @@
 		<cd:command name='setupfootnotedefinition' value='stellefussnotendefinitionein'/>
 		<cd:command name='setupfootnotes' value='stellefussnotenein'/>
 		<cd:command name='setupforms' value='setupforms'/>
+		<cd:command name='setupformula' value='setupformula'/>
 		<cd:command name='setupformulas' value='stelleformelnein'/>
 		<cd:command name='setupframed' value='stelleumrahmtein'/>
+		<cd:command name='setupframedtext' value='setupframedtext'/>
 		<cd:command name='setupframedtexts' value='stelleumrahmtetexteein'/>
 		<cd:command name='setuphead' value='stelleueberschriftein'/>
 		<cd:command name='setupheader' value='stellekopfzeileein'/>
@@ -1734,7 +1743,9 @@
 		<cd:command name='setuplinewidth' value='stellelinienbreiteein'/>
 		<cd:command name='setuplist' value='stellelisteein'/>
 		<cd:command name='setupmakeup' value='stelleumbruchein'/>
+		<cd:command name='setupmarginblock' value='setupmarginblock'/>
 		<cd:command name='setupmarginblocks' value='stellemarginalblockein'/>
+		<cd:command name='setupmargindata' value='setupmargindata'/>
 		<cd:command name='setupmarginrules' value='stellemarginallinieein'/>
 		<cd:command name='setupmarking' value='stellebeschriftungein'/>
 		<cd:command name='setupmathalignment' value='setupmathalignment'/>
@@ -1913,6 +1924,7 @@
 		<cd:command name='testcolumn' value='testcolumn'/>
 		<cd:command name='testpage' value='testpage'/>
 		<cd:command name='tex' value='tex'/>
+		<cd:command name='textbackground' value='textbackground'/>
 		<cd:command name='textheight' value='texthoehe'/>
 		<cd:command name='textreference' value='textreferenz'/>
 		<cd:command name='textrule' value='textlinie'/>
diff --git a/tex/context/interface/mkii/keys-en.xml b/tex/context/interface/mkii/keys-en.xml
index 825a0eea2..3a5d77e53 100644
--- a/tex/context/interface/mkii/keys-en.xml
+++ b/tex/context/interface/mkii/keys-en.xml
@@ -1326,6 +1326,7 @@
 		<cd:command name='Words' value='Words'/>
 		<cd:command name='about' value='about'/>
 		<cd:command name='adaptlayout' value='adaptlayout'/>
+		<cd:command name='alignment' value='alignment'/>
 		<cd:command name='arg' value='arg'/>
 		<cd:command name='at' value='at'/>
 		<cd:command name='atleftmargin' value='atleftmargin'/>
@@ -1542,11 +1543,13 @@
 		<cd:command name='leftmargindistance' value='leftmargindistance'/>
 		<cd:command name='leftmarginwidth' value='leftmarginwidth'/>
 		<cd:command name='leg' value='leg'/>
+		<cd:command name='linecorrection' value='linecorrection'/>
 		<cd:command name='linewidth' value='linethickness'/>
 		<cd:command name='listheight' value='listheight'/>
 		<cd:command name='listlength' value='listlength'/>
 		<cd:command name='listsymbol' value='listsymbol'/>
 		<cd:command name='listwidth' value='listwidth'/>
+		<cd:command name='localfootnotes' value='localfootnotes'/>
 		<cd:command name='logfields' value='logfields'/>
 		<cd:command name='lohi' value='lohi'/>
 		<cd:command name='low' value='low'/>
@@ -1555,6 +1558,7 @@
 		<cd:command name='makeupheight' value='makeupheight'/>
 		<cd:command name='makeupwidth' value='makeupwidth'/>
 		<cd:command name='mar' value='mar'/>
+		<cd:command name='marginblock' value='marginblock'/>
 		<cd:command name='margindistance' value='margindistance'/>
 		<cd:command name='marginrule' value='marginrule'/>
 		<cd:command name='margintext' value='margintext'/>
@@ -1654,6 +1658,7 @@
 		<cd:command name='rightmarginwidth' value='rightmarginwidth'/>
 		<cd:command name='romannumerals' value='romannumerals'/>
 		<cd:command name='rotate' value='rotate'/>
+		<cd:command name='savebuffer' value='savebuffer'/>
 		<cd:command name='scale' value='scale'/>
 		<cd:command name='screen' value='screen'/>
 		<cd:command name='selectblocks' value='selectblocks'/>
@@ -1689,7 +1694,9 @@
 		<cd:command name='setupcombinations' value='setupcombinations'/>
 		<cd:command name='setupcombinedlist' value='setupcombinedlist'/>
 		<cd:command name='setupcomment' value='setupcomment'/>
+		<cd:command name='setupdescription' value='setupdescription'/>
 		<cd:command name='setupdescriptions' value='setupdescriptions'/>
+		<cd:command name='setupenumeration' value='setupenumeration'/>
 		<cd:command name='setupenumerations' value='setupenumerations'/>
 		<cd:command name='setupexternalfigures' value='setupexternalfigures'/>
 		<cd:command name='setupfield' value='setupfield'/>
@@ -1704,8 +1711,10 @@
 		<cd:command name='setupfootnotedefinition' value='setupfootnotedefinition'/>
 		<cd:command name='setupfootnotes' value='setupfootnotes'/>
 		<cd:command name='setupforms' value='setupforms'/>
+		<cd:command name='setupformula' value='setupformula'/>
 		<cd:command name='setupformulas' value='setupformulae'/>
 		<cd:command name='setupframed' value='setupframed'/>
+		<cd:command name='setupframedtext' value='setupframedtext'/>
 		<cd:command name='setupframedtexts' value='setupframedtexts'/>
 		<cd:command name='setuphead' value='setuphead'/>
 		<cd:command name='setupheader' value='setupheader'/>
@@ -1734,7 +1743,9 @@
 		<cd:command name='setuplinewidth' value='setuplinewidth'/>
 		<cd:command name='setuplist' value='setuplist'/>
 		<cd:command name='setupmakeup' value='setupmakeup'/>
+		<cd:command name='setupmarginblock' value='setupmarginblock'/>
 		<cd:command name='setupmarginblocks' value='setupmarginblocks'/>
+		<cd:command name='setupmargindata' value='setupmargindata'/>
 		<cd:command name='setupmarginrules' value='setupmarginrules'/>
 		<cd:command name='setupmarking' value='setupmarking'/>
 		<cd:command name='setupmathalignment' value='setupmathalignment'/>
@@ -1913,6 +1924,7 @@
 		<cd:command name='testcolumn' value='testcolumn'/>
 		<cd:command name='testpage' value='testpage'/>
 		<cd:command name='tex' value='tex'/>
+		<cd:command name='textbackground' value='textbackground'/>
 		<cd:command name='textheight' value='textheight'/>
 		<cd:command name='textreference' value='textreference'/>
 		<cd:command name='textrule' value='textrule'/>
diff --git a/tex/context/interface/mkii/keys-fr.xml b/tex/context/interface/mkii/keys-fr.xml
index 17d564397..00a0864e8 100644
--- a/tex/context/interface/mkii/keys-fr.xml
+++ b/tex/context/interface/mkii/keys-fr.xml
@@ -1326,6 +1326,7 @@
 		<cd:command name='Words' value='Mots'/>
 		<cd:command name='about' value='concernant'/>
 		<cd:command name='adaptlayout' value='adaptedisposition'/>
+		<cd:command name='alignment' value='alignment'/>
 		<cd:command name='arg' value='arg'/>
 		<cd:command name='at' value='a'/>
 		<cd:command name='atleftmargin' value='atleftmargin'/>
@@ -1542,11 +1543,13 @@
 		<cd:command name='leftmargindistance' value='distancemargegauche'/>
 		<cd:command name='leftmarginwidth' value='largeurmargegauche'/>
 		<cd:command name='leg' value='leg'/>
+		<cd:command name='linecorrection' value='linecorrection'/>
 		<cd:command name='linewidth' value='largeurligne'/>
 		<cd:command name='listheight' value='hauteurliste'/>
 		<cd:command name='listlength' value='llongueurliste'/>
 		<cd:command name='listsymbol' value='listesymbole'/>
 		<cd:command name='listwidth' value='largeurliste'/>
+		<cd:command name='localfootnotes' value='localfootnotes'/>
 		<cd:command name='logfields' value='logchamp'/>
 		<cd:command name='lohi' value='baha'/>
 		<cd:command name='low' value='bas'/>
@@ -1555,6 +1558,7 @@
 		<cd:command name='makeupheight' value='hauteurmakeup'/>
 		<cd:command name='makeupwidth' value='largeurmakeup'/>
 		<cd:command name='mar' value='mar'/>
+		<cd:command name='marginblock' value='marginblock'/>
 		<cd:command name='margindistance' value='distancemarge'/>
 		<cd:command name='marginrule' value='margereglee'/>
 		<cd:command name='margintext' value='textemarge'/>
@@ -1654,6 +1658,7 @@
 		<cd:command name='rightmarginwidth' value='largeurmargedroite'/>
 		<cd:command name='romannumerals' value='chiffresromains'/>
 		<cd:command name='rotate' value='oriente'/>
+		<cd:command name='savebuffer' value='savebuffer'/>
 		<cd:command name='scale' value='echelle'/>
 		<cd:command name='screen' value='ecran'/>
 		<cd:command name='selectblocks' value='selectionneblocs'/>
@@ -1689,7 +1694,9 @@
 		<cd:command name='setupcombinations' value='reglecombinaisons'/>
 		<cd:command name='setupcombinedlist' value='reglelisteimbriquee'/>
 		<cd:command name='setupcomment' value='reglecommentaire'/>
+		<cd:command name='setupdescription' value='setupdescription'/>
 		<cd:command name='setupdescriptions' value='regledescriptions'/>
+		<cd:command name='setupenumeration' value='setupenumeration'/>
 		<cd:command name='setupenumerations' value='regleenumerations'/>
 		<cd:command name='setupexternalfigures' value='reglefiguresexternes'/>
 		<cd:command name='setupfield' value='reglechamp'/>
@@ -1704,8 +1711,10 @@
 		<cd:command name='setupfootnotedefinition' value='definitnotepdp'/>
 		<cd:command name='setupfootnotes' value='reglenotepdp'/>
 		<cd:command name='setupforms' value='regleformulaires'/>
+		<cd:command name='setupformula' value='setupformula'/>
 		<cd:command name='setupformulas' value='regleformules'/>
 		<cd:command name='setupframed' value='regleencadre'/>
+		<cd:command name='setupframedtext' value='setupframedtext'/>
 		<cd:command name='setupframedtexts' value='setupframedtexts'/>
 		<cd:command name='setuphead' value='regletete'/>
 		<cd:command name='setupheader' value='regleentete'/>
@@ -1734,7 +1743,9 @@
 		<cd:command name='setuplinewidth' value='regleepaisseurligne'/>
 		<cd:command name='setuplist' value='regleliste'/>
 		<cd:command name='setupmakeup' value='reglemakeup'/>
+		<cd:command name='setupmarginblock' value='setupmarginblock'/>
 		<cd:command name='setupmarginblocks' value='regleblocmarge'/>
+		<cd:command name='setupmargindata' value='setupmargindata'/>
 		<cd:command name='setupmarginrules' value='reglemargereglee'/>
 		<cd:command name='setupmarking' value='reglemarquage'/>
 		<cd:command name='setupmathalignment' value='setupmathalignment'/>
@@ -1913,6 +1924,7 @@
 		<cd:command name='testcolumn' value='testcolumn'/>
 		<cd:command name='testpage' value='testpage'/>
 		<cd:command name='tex' value='tex'/>
+		<cd:command name='textbackground' value='textbackground'/>
 		<cd:command name='textheight' value='hauteurtexte'/>
 		<cd:command name='textreference' value='referencetexte'/>
 		<cd:command name='textrule' value='ligneregleetexte'/>
diff --git a/tex/context/interface/mkii/keys-it.xml b/tex/context/interface/mkii/keys-it.xml
index 5e771719d..f15c27393 100644
--- a/tex/context/interface/mkii/keys-it.xml
+++ b/tex/context/interface/mkii/keys-it.xml
@@ -1326,6 +1326,7 @@
 		<cd:command name='Words' value='Parole'/>
 		<cd:command name='about' value='intorno'/>
 		<cd:command name='adaptlayout' value='adattalayout'/>
+		<cd:command name='alignment' value='alignment'/>
 		<cd:command name='arg' value='arg'/>
 		<cd:command name='at' value='al'/>
 		<cd:command name='atleftmargin' value='atleftmargin'/>
@@ -1542,11 +1543,13 @@
 		<cd:command name='leftmargindistance' value='distanzamarginesinistro'/>
 		<cd:command name='leftmarginwidth' value='ampiezzamarginesinistro'/>
 		<cd:command name='leg' value='leg'/>
+		<cd:command name='linecorrection' value='linecorrection'/>
 		<cd:command name='linewidth' value='spessoreriga'/>
 		<cd:command name='listheight' value='altezzaelenco'/>
 		<cd:command name='listlength' value='lunghezzaelenco'/>
 		<cd:command name='listsymbol' value='listsymbol'/>
 		<cd:command name='listwidth' value='ampiezzaelenco'/>
+		<cd:command name='localfootnotes' value='localfootnotes'/>
 		<cd:command name='logfields' value='logcampi'/>
 		<cd:command name='lohi' value='pedap'/>
 		<cd:command name='low' value='ped'/>
@@ -1555,6 +1558,7 @@
 		<cd:command name='makeupheight' value='altezzamakeup'/>
 		<cd:command name='makeupwidth' value='ampiezzamakeup'/>
 		<cd:command name='mar' value='mar'/>
+		<cd:command name='marginblock' value='marginblock'/>
 		<cd:command name='margindistance' value='distanzamargine'/>
 		<cd:command name='marginrule' value='lineamargine'/>
 		<cd:command name='margintext' value='testoinmargine'/>
@@ -1654,6 +1658,7 @@
 		<cd:command name='rightmarginwidth' value='ampiezzamarginedestro'/>
 		<cd:command name='romannumerals' value='numeriromani'/>
 		<cd:command name='rotate' value='ruota'/>
+		<cd:command name='savebuffer' value='savebuffer'/>
 		<cd:command name='scale' value='scala'/>
 		<cd:command name='screen' value='schermo'/>
 		<cd:command name='selectblocks' value='selezionablocchi'/>
@@ -1689,7 +1694,9 @@
 		<cd:command name='setupcombinations' value='impostacombinazioni'/>
 		<cd:command name='setupcombinedlist' value='impostaelencocombinato'/>
 		<cd:command name='setupcomment' value='impostacommento'/>
+		<cd:command name='setupdescription' value='setupdescription'/>
 		<cd:command name='setupdescriptions' value='impostadescrizioni'/>
+		<cd:command name='setupenumeration' value='setupenumeration'/>
 		<cd:command name='setupenumerations' value='impostaenumerazioni'/>
 		<cd:command name='setupexternalfigures' value='impostafigureesterne'/>
 		<cd:command name='setupfield' value='impostacampo'/>
@@ -1704,8 +1711,10 @@
 		<cd:command name='setupfootnotedefinition' value='impostadefinizionenotepdp'/>
 		<cd:command name='setupfootnotes' value='impostanotepdp'/>
 		<cd:command name='setupforms' value='impostaforms'/>
+		<cd:command name='setupformula' value='setupformula'/>
 		<cd:command name='setupformulas' value='impostaformule'/>
 		<cd:command name='setupframed' value='impostaincorniciato'/>
+		<cd:command name='setupframedtext' value='setupframedtext'/>
 		<cd:command name='setupframedtexts' value='impostatestiincorniciati'/>
 		<cd:command name='setuphead' value='impostatesta'/>
 		<cd:command name='setupheader' value='impostainstestazione'/>
@@ -1734,7 +1743,9 @@
 		<cd:command name='setuplinewidth' value='impostaampiezzariga'/>
 		<cd:command name='setuplist' value='impostaelenco'/>
 		<cd:command name='setupmakeup' value='impostamakeup'/>
+		<cd:command name='setupmarginblock' value='setupmarginblock'/>
 		<cd:command name='setupmarginblocks' value='impostablocchimargine'/>
+		<cd:command name='setupmargindata' value='setupmargindata'/>
 		<cd:command name='setupmarginrules' value='impostalineemargine'/>
 		<cd:command name='setupmarking' value='impostamarcatura'/>
 		<cd:command name='setupmathalignment' value='setupmathalignment'/>
@@ -1913,6 +1924,7 @@
 		<cd:command name='testcolumn' value='testcolumn'/>
 		<cd:command name='testpage' value='testpage'/>
 		<cd:command name='tex' value='tex'/>
+		<cd:command name='textbackground' value='textbackground'/>
 		<cd:command name='textheight' value='altezzatesto'/>
 		<cd:command name='textreference' value='riferimentotesto'/>
 		<cd:command name='textrule' value='lineatesto'/>
diff --git a/tex/context/interface/mkii/keys-nl.xml b/tex/context/interface/mkii/keys-nl.xml
index c3b3b5d78..df5485bbe 100644
--- a/tex/context/interface/mkii/keys-nl.xml
+++ b/tex/context/interface/mkii/keys-nl.xml
@@ -142,7 +142,7 @@
 		<cd:variable name='color' value='kleur'/>
 		<cd:variable name='column' value='kolom'/>
 		<cd:variable name='columns' value='kolommen'/>
-		<cd:variable name='combination' value='combination'/>
+		<cd:variable name='combination' value='combinatie'/>
 		<cd:variable name='command' value='commando'/>
 		<cd:variable name='commands' value='commandos'/>
 		<cd:variable name='comment' value='commentaar'/>
@@ -1326,6 +1326,7 @@
 		<cd:command name='Words' value='Woorden'/>
 		<cd:command name='about' value='about'/>
 		<cd:command name='adaptlayout' value='paslayoutaan'/>
+		<cd:command name='alignment' value='uitlijnen'/>
 		<cd:command name='arg' value='arg'/>
 		<cd:command name='at' value='op'/>
 		<cd:command name='atleftmargin' value='oplinkermarge'/>
@@ -1542,11 +1543,13 @@
 		<cd:command name='leftmargindistance' value='linkermargeafstand'/>
 		<cd:command name='leftmarginwidth' value='linkermargebreedte'/>
 		<cd:command name='leg' value='leg'/>
+		<cd:command name='linecorrection' value='regelcorrectie'/>
 		<cd:command name='linewidth' value='lijndikte'/>
 		<cd:command name='listheight' value='lijsthoogte'/>
 		<cd:command name='listlength' value='lijstlengte'/>
 		<cd:command name='listsymbol' value='lijstsymbool'/>
 		<cd:command name='listwidth' value='lijstbreedte'/>
+		<cd:command name='localfootnotes' value='lokalevoetnoten'/>
 		<cd:command name='logfields' value='registreervelden'/>
 		<cd:command name='lohi' value='laho'/>
 		<cd:command name='low' value='laag'/>
@@ -1555,6 +1558,7 @@
 		<cd:command name='makeupheight' value='zethoogte'/>
 		<cd:command name='makeupwidth' value='zetbreedte'/>
 		<cd:command name='mar' value='mar'/>
+		<cd:command name='marginblock' value='margeblok'/>
 		<cd:command name='margindistance' value='margeafstand'/>
 		<cd:command name='marginrule' value='kantlijn'/>
 		<cd:command name='margintext' value='margetekst'/>
@@ -1654,6 +1658,7 @@
 		<cd:command name='rightmarginwidth' value='rechtermargebreedte'/>
 		<cd:command name='romannumerals' value='romeins'/>
 		<cd:command name='rotate' value='roteer'/>
+		<cd:command name='savebuffer' value='bewaarbuffer'/>
 		<cd:command name='scale' value='schaal'/>
 		<cd:command name='screen' value='scherm'/>
 		<cd:command name='selectblocks' value='selecteerblokken'/>
@@ -1689,7 +1694,9 @@
 		<cd:command name='setupcombinations' value='stelcombinatiesin'/>
 		<cd:command name='setupcombinedlist' value='stelsamengesteldelijstin'/>
 		<cd:command name='setupcomment' value='stelcommentaarin'/>
+		<cd:command name='setupdescription' value='steldoordefinierenin'/>
 		<cd:command name='setupdescriptions' value='steldoordefinierenin'/>
+		<cd:command name='setupenumeration' value='steldoornummerenin'/>
 		<cd:command name='setupenumerations' value='steldoornummerenin'/>
 		<cd:command name='setupexternalfigures' value='stelexternefigurenin'/>
 		<cd:command name='setupfield' value='stelveldin'/>
@@ -1704,8 +1711,10 @@
 		<cd:command name='setupfootnotedefinition' value='stelvoetnootdefinitiein'/>
 		<cd:command name='setupfootnotes' value='stelvoetnotenin'/>
 		<cd:command name='setupforms' value='stelformulierenin'/>
+		<cd:command name='setupformula' value='stelformulein'/>
 		<cd:command name='setupformulas' value='stelformulesin'/>
 		<cd:command name='setupframed' value='stelomlijndin'/>
+		<cd:command name='setupframedtext' value='stelkadertekstin'/>
 		<cd:command name='setupframedtexts' value='stelkadertekstenin'/>
 		<cd:command name='setuphead' value='stelkopin'/>
 		<cd:command name='setupheader' value='stelhoofdin'/>
@@ -1734,7 +1743,9 @@
 		<cd:command name='setuplinewidth' value='stellijndiktein'/>
 		<cd:command name='setuplist' value='stellijstin'/>
 		<cd:command name='setupmakeup' value='stelopmaakin'/>
+		<cd:command name='setupmarginblock' value='stelmargeblokkenin'/>
 		<cd:command name='setupmarginblocks' value='stelmargeblokkenin'/>
+		<cd:command name='setupmargindata' value='stelinmargein'/>
 		<cd:command name='setupmarginrules' value='stelkantlijnin'/>
 		<cd:command name='setupmarking' value='stelmarkeringin'/>
 		<cd:command name='setupmathalignment' value='stelwiskundeuitlijnenin'/>
@@ -1913,6 +1924,7 @@
 		<cd:command name='testcolumn' value='testkolom'/>
 		<cd:command name='testpage' value='testpagina'/>
 		<cd:command name='tex' value='tex'/>
+		<cd:command name='textbackground' value='tekstachtergrond'/>
 		<cd:command name='textheight' value='teksthoogte'/>
 		<cd:command name='textreference' value='tekstreferentie'/>
 		<cd:command name='textrule' value='tekstlijn'/>
diff --git a/tex/context/interface/mkii/keys-pe.xml b/tex/context/interface/mkii/keys-pe.xml
index 9d86aa689..75d2d8772 100644
--- a/tex/context/interface/mkii/keys-pe.xml
+++ b/tex/context/interface/mkii/keys-pe.xml
@@ -1326,6 +1326,7 @@
 		<cd:command name='Words' value='Words'/>
 		<cd:command name='about' value='درمورد'/>
 		<cd:command name='adaptlayout' value='تنظیم‌طرح‌بندی'/>
+		<cd:command name='alignment' value='alignment'/>
 		<cd:command name='arg' value='افزودن'/>
 		<cd:command name='at' value='در'/>
 		<cd:command name='atleftmargin' value='درحاشیه‌چپ'/>
@@ -1542,11 +1543,13 @@
 		<cd:command name='leftmargindistance' value='فاصله‌حاشیه‌چپ'/>
 		<cd:command name='leftmarginwidth' value='عرض‌حاشیه‌چپ'/>
 		<cd:command name='leg' value='پا'/>
+		<cd:command name='linecorrection' value='linecorrection'/>
 		<cd:command name='linewidth' value='عرض‌خط'/>
 		<cd:command name='listheight' value='ارتفاع‌خط'/>
 		<cd:command name='listlength' value='طول‌لیست'/>
 		<cd:command name='listsymbol' value='نمادلیست'/>
 		<cd:command name='listwidth' value='عرض‌لیست'/>
+		<cd:command name='localfootnotes' value='localfootnotes'/>
 		<cd:command name='logfields' value='میدانهای‌گزارش'/>
 		<cd:command name='lohi' value='پابا'/>
 		<cd:command name='low' value='پایین'/>
@@ -1555,6 +1558,7 @@
 		<cd:command name='makeupheight' value='ارتفاع‌آرایش'/>
 		<cd:command name='makeupwidth' value='عرض‌آرایش'/>
 		<cd:command name='mar' value='حاش'/>
+		<cd:command name='marginblock' value='marginblock'/>
 		<cd:command name='margindistance' value='فاصله‌حاشیه'/>
 		<cd:command name='marginrule' value='خط‌حاشیه'/>
 		<cd:command name='margintext' value='متن‌حاشیه'/>
@@ -1654,6 +1658,7 @@
 		<cd:command name='rightmarginwidth' value='عرض‌حاشیه‌راست'/>
 		<cd:command name='romannumerals' value='اعدادلاتین'/>
 		<cd:command name='rotate' value='دوران'/>
+		<cd:command name='savebuffer' value='savebuffer'/>
 		<cd:command name='scale' value='مقیاس'/>
 		<cd:command name='screen' value='پرده'/>
 		<cd:command name='selectblocks' value='انتخاب‌بلوکها'/>
@@ -1689,7 +1694,9 @@
 		<cd:command name='setupcombinations' value='بارگذاری‌ترکیب‌ها'/>
 		<cd:command name='setupcombinedlist' value='بارگذاری‌لیست‌ترکیبی'/>
 		<cd:command name='setupcomment' value='بارگذاری‌توضیح'/>
+		<cd:command name='setupdescription' value='setupdescription'/>
 		<cd:command name='setupdescriptions' value='بارگذاری‌شرح'/>
+		<cd:command name='setupenumeration' value='setupenumeration'/>
 		<cd:command name='setupenumerations' value='بارگذاری‌شماره‌گذاریها'/>
 		<cd:command name='setupexternalfigures' value='بارگذاری‌شکلهای‌خارجی'/>
 		<cd:command name='setupfield' value='بارگذاری‌میدان'/>
@@ -1704,8 +1711,10 @@
 		<cd:command name='setupfootnotedefinition' value='بارگذاری‌تعریف‌پانوشت'/>
 		<cd:command name='setupfootnotes' value='بارگذاری‌پانوشتها'/>
 		<cd:command name='setupforms' value='بارگذاری‌طرح'/>
+		<cd:command name='setupformula' value='setupformula'/>
 		<cd:command name='setupformulas' value='بارگذاری‌فرمولها'/>
 		<cd:command name='setupframed' value='بارگذاری‌قالبی'/>
+		<cd:command name='setupframedtext' value='setupframedtext'/>
 		<cd:command name='setupframedtexts' value='بارگذاری‌متن‌قالبی'/>
 		<cd:command name='setuphead' value='بارگذاری‌سر'/>
 		<cd:command name='setupheader' value='بارگذاری‌سربرگ'/>
@@ -1734,7 +1743,9 @@
 		<cd:command name='setuplinewidth' value='بارگذاری‌عرض‌خط'/>
 		<cd:command name='setuplist' value='بارگذاری‌لیست'/>
 		<cd:command name='setupmakeup' value='بارگذاری‌آرایش'/>
+		<cd:command name='setupmarginblock' value='setupmarginblock'/>
 		<cd:command name='setupmarginblocks' value='بارگذاری‌بلوکهای‌حاشیه'/>
+		<cd:command name='setupmargindata' value='setupmargindata'/>
 		<cd:command name='setupmarginrules' value='بارگذاری‌خطهای‌حاشیه'/>
 		<cd:command name='setupmarking' value='بارگذاری‌نشانه‌گذاری'/>
 		<cd:command name='setupmathalignment' value='بارگذاری‌تنظیم‌ریاضی'/>
@@ -1913,6 +1924,7 @@
 		<cd:command name='testcolumn' value='ستون‌امتحان'/>
 		<cd:command name='testpage' value='صفحه‌تست'/>
 		<cd:command name='tex' value='تک'/>
+		<cd:command name='textbackground' value='textbackground'/>
 		<cd:command name='textheight' value='ارتفاع‌متن'/>
 		<cd:command name='textreference' value='مرجع‌متن'/>
 		<cd:command name='textrule' value='خط‌متن'/>
diff --git a/tex/context/interface/mkii/keys-ro.xml b/tex/context/interface/mkii/keys-ro.xml
index f810eaf57..45c2e0ce0 100644
--- a/tex/context/interface/mkii/keys-ro.xml
+++ b/tex/context/interface/mkii/keys-ro.xml
@@ -1326,6 +1326,7 @@
 		<cd:command name='Words' value='Cuvinte'/>
 		<cd:command name='about' value='despre'/>
 		<cd:command name='adaptlayout' value='adapteazaaspect'/>
+		<cd:command name='alignment' value='alignment'/>
 		<cd:command name='arg' value='arg'/>
 		<cd:command name='at' value='la'/>
 		<cd:command name='atleftmargin' value='atleftmargin'/>
@@ -1542,11 +1543,13 @@
 		<cd:command name='leftmargindistance' value='distantamarginestanga'/>
 		<cd:command name='leftmarginwidth' value='latimemarginestanga'/>
 		<cd:command name='leg' value='leg'/>
+		<cd:command name='linecorrection' value='linecorrection'/>
 		<cd:command name='linewidth' value='grosimelinie'/>
 		<cd:command name='listheight' value='inaltimelista'/>
 		<cd:command name='listlength' value='lungimelista'/>
 		<cd:command name='listsymbol' value='listsymbol'/>
 		<cd:command name='listwidth' value='latimelista'/>
+		<cd:command name='localfootnotes' value='localfootnotes'/>
 		<cd:command name='logfields' value='logcampuri'/>
 		<cd:command name='lohi' value='jossus'/>
 		<cd:command name='low' value='jos'/>
@@ -1555,6 +1558,7 @@
 		<cd:command name='makeupheight' value='inaltimemakeup'/>
 		<cd:command name='makeupwidth' value='latimemakeup'/>
 		<cd:command name='mar' value='mar'/>
+		<cd:command name='marginblock' value='marginblock'/>
 		<cd:command name='margindistance' value='distantamargine'/>
 		<cd:command name='marginrule' value='liniemargine'/>
 		<cd:command name='margintext' value='textmarginal'/>
@@ -1654,6 +1658,7 @@
 		<cd:command name='rightmarginwidth' value='latimemarginedreapta'/>
 		<cd:command name='romannumerals' value='numereromane'/>
 		<cd:command name='rotate' value='roteste'/>
+		<cd:command name='savebuffer' value='savebuffer'/>
 		<cd:command name='scale' value='scala'/>
 		<cd:command name='screen' value='ecran'/>
 		<cd:command name='selectblocks' value='selecteazablocuri'/>
@@ -1689,7 +1694,9 @@
 		<cd:command name='setupcombinations' value='seteazacombinari'/>
 		<cd:command name='setupcombinedlist' value='seteazalistacombinata'/>
 		<cd:command name='setupcomment' value='seteazacomentariu'/>
+		<cd:command name='setupdescription' value='setupdescription'/>
 		<cd:command name='setupdescriptions' value='seteazadescriere'/>
+		<cd:command name='setupenumeration' value='setupenumeration'/>
 		<cd:command name='setupenumerations' value='seteazaenumerare'/>
 		<cd:command name='setupexternalfigures' value='seteazafiguriexterne'/>
 		<cd:command name='setupfield' value='seteazacamp'/>
@@ -1704,8 +1711,10 @@
 		<cd:command name='setupfootnotedefinition' value='seteazadefinireanotasubsol'/>
 		<cd:command name='setupfootnotes' value='seteazanotasubsol'/>
 		<cd:command name='setupforms' value='seteazaformulare'/>
+		<cd:command name='setupformula' value='setupformula'/>
 		<cd:command name='setupformulas' value='seteazaformule'/>
 		<cd:command name='setupframed' value='seteazainconjurat'/>
+		<cd:command name='setupframedtext' value='setupframedtext'/>
 		<cd:command name='setupframedtexts' value='definestetexteinconjurate'/>
 		<cd:command name='setuphead' value='seteazatitlu'/>
 		<cd:command name='setupheader' value='seteazaantet'/>
@@ -1734,7 +1743,9 @@
 		<cd:command name='setuplinewidth' value='seteazagrosimelinie'/>
 		<cd:command name='setuplist' value='seteazalista'/>
 		<cd:command name='setupmakeup' value='seteazamakeup'/>
+		<cd:command name='setupmarginblock' value='setupmarginblock'/>
 		<cd:command name='setupmarginblocks' value='seteazablocurimarginale'/>
+		<cd:command name='setupmargindata' value='setupmargindata'/>
 		<cd:command name='setupmarginrules' value='seteazaliniimargine'/>
 		<cd:command name='setupmarking' value='seteazamarcaje'/>
 		<cd:command name='setupmathalignment' value='setupmathalignment'/>
@@ -1913,6 +1924,7 @@
 		<cd:command name='testcolumn' value='testcolumn'/>
 		<cd:command name='testpage' value='testpage'/>
 		<cd:command name='tex' value='tex'/>
+		<cd:command name='textbackground' value='textbackground'/>
 		<cd:command name='textheight' value='inaltimetext'/>
 		<cd:command name='textreference' value='referintatext'/>
 		<cd:command name='textrule' value='riglatext'/>
diff --git a/tex/context/interface/mkiv/i-common-definitions.xml b/tex/context/interface/mkiv/i-common-definitions.xml
index 5ca20c016..9f6d461f9 100644
--- a/tex/context/interface/mkiv/i-common-definitions.xml
+++ b/tex/context/interface/mkiv/i-common-definitions.xml
@@ -7,5 +7,6 @@
     <cd:interfacefile filename="i-common-keyword.xml"/>
     <cd:interfacefile filename="i-common-string.xml"/>
     <cd:interfacefile filename="i-common-value.xml"/>
+    <cd:interfacefile filename="i-common-instance.xml"/>
 
 </cd:interface>
diff --git a/tex/context/interface/mkiv/i-common-instance.xml b/tex/context/interface/mkiv/i-common-instance.xml
new file mode 100644
index 000000000..57591d3bb
--- /dev/null
+++ b/tex/context/interface/mkiv/i-common-instance.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
+
+    <cd:define name="instance-float">
+        <cd:constant value="chemical"/>
+        <cd:constant value="figure"/>
+        <cd:constant value="table"/>
+        <cd:constant value="intermezzo"/>
+        <cd:constant value="graphic"/>
+    </cd:define>
+
+</cd:interface>
diff --git a/tex/context/interface/mkiv/i-context.pdf b/tex/context/interface/mkiv/i-context.pdf
index 6caf60cc2..da61b5008 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-enumeration.xml b/tex/context/interface/mkiv/i-enumeration.xml
index 9ff9ed0e4..70823cff3 100644
--- a/tex/context/interface/mkiv/i-enumeration.xml
+++ b/tex/context/interface/mkiv/i-enumeration.xml
@@ -4,7 +4,7 @@
 
 <cd:interface xmlns:cd="http://www.pragma-ade.com/commands">
 
-    <cd:command name="defineenumerations" file="strc-enu.mkvi">
+    <cd:command name="defineenumeration" file="strc-enu.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-name"/>
             <cd:resolve name="keyword-name-optional"/>
diff --git a/tex/context/interface/mkiv/i-floats.xml b/tex/context/interface/mkiv/i-floats.xml
index 54d78adab..d53956355 100644
--- a/tex/context/interface/mkiv/i-floats.xml
+++ b/tex/context/interface/mkiv/i-floats.xml
@@ -12,6 +12,9 @@
                 <cd:inherit name="setupfloat"/>
             </cd:assignments>
         </cd:arguments>
+        <cd:instances>
+            <cd:resolve name="instance-float"/>
+        </cd:instances>
     </cd:command>
 
     <cd:command name="definefloat" variant="name" file="strc-flt.mkvi">
@@ -20,6 +23,9 @@
             <cd:resolve name="keyword-plural-optional"/>
             <cd:resolve name="keyword-singular-optional"/>
         </cd:arguments>
+        <cd:instances>
+            <cd:resolve name="instance-float"/>
+        </cd:instances>
     </cd:command>
 
     <cd:command name="setupfloat" file="strc-flt.mkvi">
@@ -337,11 +343,7 @@
             <cd:content/>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="chemical"/>
-            <cd:constant value="figure"/>
-            <cd:constant value="table"/>
-            <cd:constant value="intermezzo"/>
-            <cd:constant value="graphic"/>
+            <cd:resolve name="instance-float"/>
         </cd:instances>
     </cd:command>
 
@@ -365,14 +367,21 @@
             <cd:resolve name="assignment-userdata-list-optional"/>
         </cd:arguments>
         <cd:instances>
-            <cd:constant value="chemical"/>
-            <cd:constant value="figure"/>
-            <cd:constant value="table"/>
-            <cd:constant value="intermezzo"/>
-            <cd:constant value="graphic"/>
+            <cd:resolve name="instance-float"/>
         </cd:instances>
     </cd:command>
 
+    <cd:command name="placefloat" generated="yes" variant="instance" file="strc-flt.mkvi">
+        <cd:sequence>
+            <cd:string value="place"/>
+            <cd:instance/>
+        </cd:sequence>
+        <cd:arguments>
+            <cd:resolve name="assignment-floatdata-list-optional"/>
+            <cd:resolve name="assignment-userdata-list-optional"/>
+        </cd:arguments>
+    </cd:command>
+
     <cd:command name="placefloat" type="environment" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="keyword-singular"/>
@@ -465,7 +474,9 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="placefigure" file="strc-flt.mkvi">
+    <!--
+
+    <cd:command file="strc-flt.mkvi" name="placefigure">
         <cd:arguments>
             <cd:resolve name="keyword-floatlocation-list-optional"/>
             <cd:resolve name="keyword-reference-list-optional"/>
@@ -474,6 +485,8 @@
         </cd:arguments>
     </cd:command>
 
+    -->
+
     <cd:command name="placefigure" type="environment" file="strc-flt.mkvi">
         <cd:arguments>
             <cd:resolve name="assignment-floatdata-list-optional"/>
diff --git a/tex/context/interface/mkiv/i-indent.xml b/tex/context/interface/mkiv/i-indent.xml
index 0ad0b9a45..7e2fb5ca3 100644
--- a/tex/context/interface/mkiv/i-indent.xml
+++ b/tex/context/interface/mkiv/i-indent.xml
@@ -62,11 +62,11 @@
         </cd:arguments>
     </cd:command>
 
-    <cd:command name="indentation" file="spac-hor.mkiv"/>
+    <cd:command name="indentation" file="spac-hor.mkiv" coreprimitive="yes"/>
 
-    <cd:command name="noindentation" file="spac-hor.mkiv"/>
+    <cd:command name="noindentation" file="spac-hor.mkiv" coreprimitive="yes"/>
 
-    <cd:command name="doindentation" file="spac-hor.mkiv"/>
+    <cd:command name="doindentation" file="spac-hor.mkiv" coreprimitive="yes"/>
 
     <cd:command name="checknextindentation" file="spac-hor.mkiv">
         <cd:arguments>
diff --git a/tex/context/interface/mkiv/i-readme.pdf b/tex/context/interface/mkiv/i-readme.pdf
index 878a42111..d10fd15a6 100644
--- a/tex/context/interface/mkiv/i-readme.pdf
+++ b/tex/context/interface/mkiv/i-readme.pdf
diff --git a/tex/context/modules/mkiv/x-setups-basics.mkiv b/tex/context/modules/mkiv/x-setups-basics.mkiv
index b7004c51c..81c4e7cd2 100644
--- a/tex/context/modules/mkiv/x-setups-basics.mkiv
+++ b/tex/context/modules/mkiv/x-setups-basics.mkiv
@@ -45,7 +45,7 @@
   [\c!width=\hsize,
    \c!height=\v!fit,
    \c!align=\v!right,
-   \c!offset=0.75\emwidth]
+   \c!offset=0.75\emwidth] % \exheight
 
 \popmacro\setuptext
 
@@ -362,6 +362,10 @@
     \xmlatt{#1}{value}
 \stopxmlsetups
 
+\startxmlsetups xml:setups:make:instance
+    \m_cmd_instance
+\stopxmlsetups
+
 \startxmlsetups xml:setups:make:variable
     \setupintfont{\xmlatt{#1}{value}}
 \stopxmlsetups
@@ -372,6 +376,7 @@
 \let\m_cmd_name        \empty
 \let\m_cmd_start       \empty
 \let\m_cmd_stop        \empty
+\let\m_cmd_instance    \empty
 
 \startxmlsetups xml:setups:make:prepare
     \edef\m_cmd_current_hash{\xmlatt{#1}{hash}}
@@ -379,7 +384,7 @@
     \xmldoifelseempty{#1}{/sequence} {
         \edef\m_cmd_name{\xmlatt{#1}{name}}
     } {
-        \edef\m_cmd_name{\xmlfilter{#1}{/sequence/(string|variable)/command(xml:setups:make:*)}}
+        \edef\m_cmd_name{\xmlfilter{#1}{/sequence/(string|variable|instance)/command(xml:setups:make:*)}}
     }
     \doifelse {\xmlatt{#1}{type}} {environment} {
         \doifsomethingelse {\xmlatt{#1}{begin}} {
@@ -478,7 +483,11 @@
 \stopxmlsetups
 
 \startxmlsetups xml:setups:instance
-    \xmlatt{#1}{value}\enskip % we need a break
+    \doifelse {\xmltag{#1}} {resolve} {
+        \ctxlua{lxml.command(moduledata.setups.definitions['\xmlatt{#1}{name}'],"constant","xml:setups:instance")}
+    } {
+        \xmlatt{#1}{value}\enskip % we need a break
+    }
 \stopxmlsetups
 
 \startxmlsetups xml:setups:typeset:instances
@@ -486,7 +495,7 @@
         \godown[.75\lineheight]
         {\ttbf instances:}
         \enspace
-        \xmlfilter{#1}{/instances/constant/command(xml:setups:instance)}
+        \xmlfilter{#1}{/instances/(constant|resolve)/command(xml:setups:instance)}
         \removeunwantedspaces
     }
 \stopxmlsetups
@@ -917,6 +926,15 @@
 \let\cmdshortsetup\shortsetup
 \let\cmdfullsetup \showsetup
 
+\unexpanded\def\cmd_with_instance#1#2#3%
+  {\edef\m_cmd_instance{#3}%
+   #1{#2}%
+   \let\m_cmd_instance\empty}
+
+\unexpanded\def\cmdbasicsetupinstance{\cmd_with_instance\cmdbasicsetup}
+\unexpanded\def\cmdshortsetupinstance{\cmd_with_instance\cmdshortsetup}
+\unexpanded\def\cmdfullsetupinstance {\cmd_with_instance\cmdfullsetup }
+
 % bonus
 
 \definefloat
diff --git a/tex/generic/context/luatex/luatex-fonts-merged.lua b/tex/generic/context/luatex/luatex-fonts-merged.lua
index 39a574121..907e4e19a 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  : 10/12/16 17:26:31
+-- merge date  : 10/14/16 17:19:03
 
 do -- begin closure to overcome local limits and interference